diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 68e8fc714d..e4964e8909 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,97 +7,76 @@
     "workspaceFolder": "/workspace",
     "shutdownAction": "stopCompose",
     "postCreateCommand": "/docker-init.sh",
+    "postStartCommand": "/docker-start.sh",
     "containerEnv": {
         "EDITOR_VSCODE": "true"
     },
 
     "features": {
-        "docker-in-docker": {
-            "version": "latest"
-        }
     },
-    
-    // Set *default* container specific settings.json values on container create.
-    "settings": { 
-        "terminal.integrated.defaultProfile.linux": "zsh",
-        "python.pythonPath": "/usr/local/bin/python",
-        "python.languageServer": "Pylance",
-        "python.linting.enabled": true,
-        "python.linting.pylintEnabled": true,
-        "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-        "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-        "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-        "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-        "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-        "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-        "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-        "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-        "python.testing.pytestArgs": [
-            "ietf"
-        ],
-        "python.testing.unittestEnabled": true,
-        "python.testing.pytestEnabled": false,
-        "python.testing.unittestArgs": [
-            "-v",
-            "-s",
-            "./ietf",
-            "-p",
-            "test*.py"
-        ],
-        "sqltools.connections": [
-            // Default connection to dev DB container
-            {
-                "name": "Local Dev",
-                "server": "db",
-                "port": 3306,
-                "database": "ietf_utf8",
-                "username": "django",
-                "password": "RkTkDPFnKpko",
-                "driver": "MySQL",
-                "askForPassword": false,
-                "connectionTimeout": 60
+
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "arcanis.vscode-zipfs",
+                "batisteo.vscode-django",
+                "dbaeumer.vscode-eslint",
+                "eamodio.gitlens",
+                "editorconfig.editorconfig",
+                "vue.volar@2.2.10",
+                "mrmlnc.vscode-duplicate",
+                "ms-azuretools.vscode-docker",
+                "ms-playwright.playwright",
+                "ms-python.python",
+                "ms-python.vscode-pylance",
+                "mutantdino.resourcemonitor",
+                "oderwat.indent-rainbow",
+                "redhat.vscode-yaml",
+                "ms-python.pylint",
+                "charliermarsh.ruff"
+            ],
+            "settings": {
+                "terminal.integrated.defaultProfile.linux": "zsh",
+                "python.pythonPath": "/usr/local/bin/python",
+                "python.languageServer": "Default",
+                "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+                "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+                "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+                "python.testing.pytestArgs": [
+                    "ietf"
+                ],
+                "python.testing.unittestEnabled": true,
+                "python.testing.pytestEnabled": false,
+                "python.testing.unittestArgs": [
+                    "-v",
+                    "-s",
+                    "./ietf",
+                    "-p",
+                    "test*.py"
+                ]
             }
-        ]
-        // "python.envFile": "${workspaceFolder}/.devcontainer/dev.env"
+        }
     },
     
-    // Add the IDs of extensions you want installed when the container is created.
-    "extensions": [
-		"arcanis.vscode-zipfs",
-		"batisteo.vscode-django",
-        "dbaeumer.vscode-eslint",
-		"eamodio.gitlens",
-		"editorconfig.editorconfig",
-		"vue.volar",
-		"mrmlnc.vscode-duplicate",
-		"ms-azuretools.vscode-docker",
-		"ms-python.python",
-		"ms-python.vscode-pylance",
-		"mtxr.sqltools-driver-mysql",
-        "mtxr.sqltools",
-		"mutantdino.resourcemonitor",
-		"oderwat.indent-rainbow",
-		"redhat.vscode-yaml",
-		"spmeesseman.vscode-taskexplorer",
-		"visualstudioexptteam.vscodeintellicode"
-	],
-    
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "forwardPorts": [8000, 3306],
+    "forwardPorts": [3000, 5432, 8000],
     
     "portsAttributes": {
         "3000": {
             "label": "Vite",
             "onAutoForward": "silent"
         },
-        "3306": {
-            "label": "MariaDB",
+        "5432": {
+            "label": "PostgreSQL",
             "onAutoForward": "silent"
         },
         "8000": {
-            "label": "Datatracker",
+            "label": "NGINX",
             "onAutoForward": "notify"
+        },
+        "8001": {
+            "label": "Datatracker",
+            "onAutoForward": "ignore"
         }
     },
     
diff --git a/.devcontainer/docker-compose.extend.yml b/.devcontainer/docker-compose.extend.yml
index 3cab4ab870..ce1ce259fd 100644
--- a/.devcontainer/docker-compose.extend.yml
+++ b/.devcontainer/docker-compose.extend.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     app:
         environment:
@@ -11,9 +9,13 @@ services:
             - /workspace/.vite
             - /workspace/.yarn/unplugged
             - app-assets:/assets
-            - datatracker-vscode-ext:/root/.vscode-server/extensions
+            # - datatracker-vscode-ext:/root/.vscode-server/extensions
         # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
         network_mode: service:db
+    blobstore:
+        ports:
+            - '9000:9000'
+            - '9001:9001'
 
 volumes:
     datatracker-vscode-ext:
diff --git a/.editorconfig b/.editorconfig
index c8771b1e66..7e5ce6236a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -34,7 +34,7 @@ indent_size = 2
 [dev/**.js]
 indent_size = 2
 
-[{package.json,.eslintrc.js,.yarnrc.yml,vite.config.js,cypress.config.js}]
+[{package.json,.eslintrc.js,.yarnrc.yml,vite.config.js,jsconfig.json}]
 indent_size = 2
 
 # Settings for cypress tests
@@ -50,3 +50,9 @@ indent_size = 2
 
 [ietf/**.html]
 insert_final_newline = false
+
+# Settings for Kubernetes yaml
+# ---------------------------------------------------------
+# Use 2-space indents
+[k8s/**.yaml]
+indent_size = 2
diff --git a/.eslintrc.js b/.eslintrc.js
index 498d6e77de..538d51ba0c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,8 +9,7 @@ module.exports = {
   },
   extends: [
     // 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
-    'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
-    'plugin:cypress/recommended'
+    'plugin:vue/vue3-strongly-recommended' // Priority B: Strongly Recommended (Improving Readability)
   ],
   globals: {
     d3: true
diff --git a/.gitattributes b/.gitattributes
index 937c0eb379..62f4aae432 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,280 @@
-/.yarn/releases/** binary
-/.yarn/plugins/** binary
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# ---------------------------------------------------
+# Python Projects
+# ---------------------------------------------------
+
+# Source files
+*.pxd    text diff=python
+*.py     text diff=python
+*.py3    text diff=python
+*.pyw    text diff=python
+*.pyx    text diff=python
+*.pyz    text diff=python
+*.pyi    text diff=python
+
+# Binary files
+*.db     binary
+*.p      binary
+*.pkl    binary
+*.pickle binary
+*.pyc    binary export-ignore
+*.pyo    binary export-ignore
+*.pyd    binary
+
+# Jupyter notebook
+*.ipynb  text eol=lf
+
+# ---------------------------------------------------
+# Web Projects
+# ---------------------------------------------------
+
+# Source code
+*.bash            text eol=lf
+*.bat             text eol=crlf
+*.cmd             text eol=crlf
+*.coffee          text
+*.css             text diff=css
+*.htm             text diff=html
+*.html            text diff=html
+*.inc             text
+*.ini             text
+*.js              text
+*.mjs             text
+*.cjs             text
+*.json            text
+*.jsx             text
+*.less            text
+*.ls              text
+*.map             text -diff
+*.od              text
+*.onlydata        text
+*.php             text diff=php
+*.pl              text
+*.ps1             text eol=crlf
+*.py              text diff=python
+*.rb              text diff=ruby
+*.sass            text
+*.scm             text
+*.scss            text diff=css
+*.sh              text eol=lf
+.husky/*          text eol=lf
+*.sql             text
+*.styl            text
+*.tag             text
+*.ts              text
+*.tsx             text
+*.xml             text
+*.xhtml           text diff=html
+
+# Docker
+Dockerfile        text
+
+# Documentation
+*.ipynb           text eol=lf
+*.markdown        text diff=markdown
+*.md              text diff=markdown
+*.mdwn            text diff=markdown
+*.mdown           text diff=markdown
+*.mkd             text diff=markdown
+*.mkdn            text diff=markdown
+*.mdtxt           text
+*.mdtext          text
+*.txt             text
+AUTHORS           text
+CHANGELOG         text
+CHANGES           text
+CONTRIBUTING      text
+COPYING           text
+copyright         text
+*COPYRIGHT*       text
+INSTALL           text
+license           text
+LICENSE           text
+NEWS              text
+readme            text
+*README*          text
+TODO              text
+
+# Templates
+*.dot             text
+*.ejs             text
+*.erb             text
+*.haml            text
+*.handlebars      text
+*.hbs             text
+*.hbt             text
+*.jade            text
+*.latte           text
+*.mustache        text
+*.njk             text
+*.phtml           text
+*.pug             text
+*.svelte          text
+*.tmpl            text
+*.tpl             text
+*.twig            text
+*.vue             text
+
+# Configs
+*.cnf             text
+*.conf            text
+*.config          text
+.editorconfig     text
+.env              text
+.gitattributes    text
+.gitconfig        text
+.htaccess         text
+*.lock            text -diff
+package.json      text eol=lf
+package-lock.json text eol=lf -diff
+pnpm-lock.yaml    text eol=lf -diff
+.prettierrc       text
+yarn.lock         text -diff
+*.toml            text
+*.yaml            text
+*.yml             text
+browserslist      text
+Makefile          text
+makefile          text
+# Fixes syntax highlighting on GitHub to allow comments
+tsconfig.json     linguist-language=JSON-with-Comments
+
+# Heroku
+Procfile          text
+
+# Graphics
+*.ai              binary
+*.bmp             binary
+*.eps             binary
+*.gif             binary
+*.gifv            binary
+*.ico             binary
+*.jng             binary
+*.jp2             binary
+*.jpg             binary
+*.jpeg            binary
+*.jpx             binary
+*.jxr             binary
+*.pdf             binary
+*.png             binary
+*.psb             binary
+*.psd             binary
+*.svg             text
+*.svgz            binary
+*.tif             binary
+*.tiff            binary
+*.wbmp            binary
+*.webp            binary
+
+# Audio
+*.kar             binary
+*.m4a             binary
+*.mid             binary
+*.midi            binary
+*.mp3             binary
+*.ogg             binary
+*.ra              binary
+
+# Video
+*.3gpp            binary
+*.3gp             binary
+*.as              binary
+*.asf             binary
+*.asx             binary
+*.avi             binary
+*.fla             binary
+*.flv             binary
+*.m4v             binary
+*.mng             binary
+*.mov             binary
+*.mp4             binary
+*.mpeg            binary
+*.mpg             binary
+*.ogv             binary
+*.swc             binary
+*.swf             binary
+*.webm            binary
+
+# Archives
+*.7z              binary
+*.gz              binary
+*.jar             binary
+*.rar             binary
+*.tar             binary
+*.zip             binary
+
+# Fonts
+*.ttf             binary
+*.eot             binary
+*.otf             binary
+*.woff            binary
+*.woff2           binary
+
+# Executables
+*.exe             binary
+*.pyc             binary
+# Prevents massive diffs caused by vendored, minified files
+**/.yarn/releases/**   binary
+**/.yarn/plugins/**    binary
+
+# RC files (like .babelrc or .eslintrc)
+*.*rc             text
+
+# Ignore files (like .npmignore or .gitignore)
+*.*ignore         text
+
+# Prevents massive diffs from built files
+dist/*            binary
+
+# ---------------------------------------------------
+# Common
+# ---------------------------------------------------
+
+# Documents
+*.bibtex   text diff=bibtex
+*.doc      diff=astextplain
+*.DOC      diff=astextplain
+*.docx     diff=astextplain
+*.DOCX     diff=astextplain
+*.dot      diff=astextplain
+*.DOT      diff=astextplain
+*.pdf      diff=astextplain
+*.PDF      diff=astextplain
+*.rtf      diff=astextplain
+*.RTF      diff=astextplain
+*.md       text diff=markdown
+*.mdx      text diff=markdown
+*.tex      text diff=tex
+*.adoc     text
+*.textile  text
+*.mustache text
+*.csv      text eol=crlf
+*.tab      text
+*.tsv      text
+*.txt      text
+*.sql      text
+*.epub     diff=astextplain
+
+# Text files where line endings should be preserved
+*.patch    -text
+
+# ---------------------------------------------------
+# Vzic specific
+# ---------------------------------------------------
+
+*.pl text diff=perl
+*.pm text diff=perl
+
+# C/C++
+*.c     text diff=cpp
+*.cc    text diff=cpp
+*.cxx   text diff=cpp
+*.cpp   text diff=cpp
+*.cpi   text diff=cpp
+*.c++   text diff=cpp
+*.hpp   text diff=cpp
+*.h     text diff=cpp
+*.h++   text diff=cpp
+*.hh    text diff=cpp
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index ef8822f5b6..320614b17e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Help / Questions
-    url: https://github.com/ietf-tools/datatracker/discussions/categories/help-questions
-    about: Need help? Have a question on setting up the project or its usage?
-  - name: Discuss New Ideas
-    url: https://github.com/ietf-tools/datatracker/discussions/categories/ideas
-    about: Submit ideas for new features or improvements to be discussed.
+blank_issues_enabled: false
+contact_links:
+  - name: Help and questions
+    url: https://github.com/ietf-tools/datatracker/discussions/categories/help-questions
+    about: Need help? Have a question on setting up the project or its usage?
+  - name: Discuss new ideas
+    url: https://github.com/ietf-tools/datatracker/discussions/categories/ideas
+    about: Submit ideas for new features or improvements to be discussed.
diff --git a/.github/ISSUE_TEMPLATE/new-feature.yml b/.github/ISSUE_TEMPLATE/new-feature.yml
index cf67176892..285081e1c8 100644
--- a/.github/ISSUE_TEMPLATE/new-feature.yml
+++ b/.github/ISSUE_TEMPLATE/new-feature.yml
@@ -1,16 +1,17 @@
-name: New Feature / Enhancement
-description: Propose a new idea to be implemented
+name: Suggest new feature or enhancement
+description: Propose a new idea to be implemented.
 labels: ["enhancement"]
+type: Feature
 body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to propose a new feature / enhancement idea.
+        Thanks for taking the time to propose a new feature or enhancement idea.
   - type: textarea
     id: description
     attributes:
       label: Description
-      description: Include as much info as possible, including mockups / screenshots if available.
+      description: Include as much info as possible, including mockups or screenshots if available.
       placeholder: Description
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/report-a-bug.yml b/.github/ISSUE_TEMPLATE/report-a-bug.yml
index 0749f78956..47fa1185b4 100644
--- a/.github/ISSUE_TEMPLATE/report-a-bug.yml
+++ b/.github/ISSUE_TEMPLATE/report-a-bug.yml
@@ -1,6 +1,7 @@
-name: Report a Bug
-description: Something isn't right? File a bug report
+name: Report a Datatracker bug
+description: Something in the datatracker's behavior isn't right? File a bug report. Don't use this to report RFC errata or issues with the content of Internet-Drafts.
 labels: ["bug"]
+type: Bug
 body:
   - type: markdown
     attributes:
@@ -10,7 +11,7 @@ body:
     id: description
     attributes:
       label: Describe the issue
-      description: Include as much info as possible, including the current behavior, expected behavior, screenshots, etc. If this is a display / UX issue, make sure to list the browser(s) you're experiencing the issue on.
+      description: Include as much info as possible, including the current behavior, expected behavior, screenshots, etc. If this is a display or user interface issue, make sure to list the browser(s) you're experiencing the issue on.
       placeholder: Description
     validations:
       required: true
@@ -22,3 +23,11 @@ body:
       options:
         - label: I agree to follow the [IETF's Code of Conduct](https://github.com/ietf-tools/.github/blob/main/CODE_OF_CONDUCT.md)
           required: true
+  - type: markdown
+    attributes:
+      value: |
+        If you are having trouble logging into the datatracker, please do not open an issue here. Instead, please send email to support@ietf.org providing your name and username.
+  - type: markdown
+    attributes:
+      value: |
+        **Please do not report issues with the content of Internet-Drafts or RFCs using this repository. Send email to the relevant group instead. Some Internet-Drafts have their own github repositories where issues can be reported. See the datatracker's page for the I-D for links and email addresses. Errata for published RFCs are submitted at https://www.rfc-editor.org/errata.php#reportnew**
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..17d89f1aab
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,61 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "docker"
+    directory: "/docker"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    reviewers:
+      - "rjsparks"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      yarn:
+        patterns:
+          - "*"
+  - package-ecosystem: "npm"
+    directory: "/playwright"
+    schedule:
+      interval: "weekly"
+    groups:
+      npm:
+        patterns:
+          - "*"
+  - package-ecosystem: "npm"
+    directory: "/dev/coverage-action"
+    schedule:
+      interval: "weekly"
+    groups:
+      npm:
+        patterns:
+          - "*"
+  - package-ecosystem: "npm"
+    directory: "/dev/deploy-to-container"
+    schedule:
+      interval: "weekly"
+    groups:
+      npm:
+        patterns:
+          - "*"
+  - package-ecosystem: "npm"
+    directory: "/dev/diff"
+    schedule:
+      interval: "weekly"
+    groups:
+      npm:
+        patterns:
+          - "*"
diff --git a/.github/semantic.yml b/.github/semantic.yml
new file mode 100644
index 0000000000..be3439f6b9
--- /dev/null
+++ b/.github/semantic.yml
@@ -0,0 +1,3 @@
+enabled: true
+titleOnly: true
+targetUrl: "https://www.conventionalcommits.org/en/v1.0.0/#summary"
diff --git a/.github/workflows/build-base-app.yml b/.github/workflows/build-base-app.yml
index 6bc771def0..35172aa299 100644
--- a/.github/workflows/build-base-app.yml
+++ b/.github/workflows/build-base-app.yml
@@ -1,42 +1,67 @@
-name: Build Base App Docker Image
-
-on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - 'docker/base.Dockerfile'
-
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-    
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Docker Build & Push
-      uses: docker/build-push-action@v3
-      with:
-        context: .
-        file: docker/base.Dockerfile
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: ghcr.io/ietf-tools/datatracker-app-base:latest
+name: Build Base App Docker Image
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'docker/base.Dockerfile'
+      - 'requirements.txt'
+
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        token: ${{ secrets.GH_COMMON_TOKEN }}
+
+    - name: Set Version
+      run: |
+        printf -v CURDATE '%(%Y%m%dT%H%M)T' -1
+        echo "IMGVERSION=$CURDATE" >> $GITHUB_ENV
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v4
+    
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v4
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v4
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Docker Build & Push
+      uses: docker/build-push-action@v7
+      env:
+        DOCKER_BUILD_SUMMARY: false
+      with:
+        context: .
+        file: docker/base.Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: |
+          ghcr.io/ietf-tools/datatracker-app-base:${{ env.IMGVERSION }}
+          ghcr.io/ietf-tools/datatracker-app-base:py312
+          ${{ github.ref == 'refs/heads/main' && 'ghcr.io/ietf-tools/datatracker-app-base:latest' || '' }}
+
+    - name: Update version references
+      run: |
+        sed -i "1s/.*/FROM ghcr.io\/ietf-tools\/datatracker-app-base:${{ env.IMGVERSION }}/" dev/build/Dockerfile
+        echo "${{ env.IMGVERSION }}" > dev/build/TARGET_BASE
+
+    - name: Commit CHANGELOG.md
+      uses: stefanzweifel/git-auto-commit-action@v7
+      with:
+        branch: ${{ github.ref_name }}
+        commit_message: 'ci: update base image target version to ${{ env.IMGVERSION }}'
+        file_pattern: dev/build/Dockerfile dev/build/TARGET_BASE
diff --git a/.github/workflows/build-celery-worker.yml b/.github/workflows/build-celery-worker.yml
deleted file mode 100644
index 87a7d18517..0000000000
--- a/.github/workflows/build-celery-worker.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Build Celery Worker Docker Image
-
-on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - 'requirements.txt'
-      - 'dev/celery/**'
-      - '.github/workflows/build-celery-worker.yml'
-
-  workflow_dispatch: 
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-    
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Docker Build & Push
-      uses: docker/build-push-action@v3
-      with:
-        context: .
-        file: dev/celery/Dockerfile
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: ghcr.io/ietf-tools/datatracker-celery:latest
-
diff --git a/.github/workflows/build-devblobstore.yml b/.github/workflows/build-devblobstore.yml
new file mode 100644
index 0000000000..14c4b1a135
--- /dev/null
+++ b/.github/workflows/build-devblobstore.yml
@@ -0,0 +1,47 @@
+name: Build Dev/Test Blobstore Docker Image
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - '.github/workflows/build-devblobstore.yml'
+
+  workflow_dispatch: 
+
+env:
+  MINIO_VERSION: latest
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v6
+    
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v4
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v4
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Docker Build & Push
+      uses: docker/build-push-action@v7
+      env:
+        DOCKER_BUILD_SUMMARY: false
+      with:
+        context: .
+        file: docker/devblobstore.Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        build-args: MINIO_VERSION=${{ env.MINIO_VERSION }}
+        tags: |
+          ghcr.io/ietf-tools/datatracker-devblobstore:${{ env.MINIO_VERSION }}
+          ghcr.io/ietf-tools/datatracker-devblobstore:latest
diff --git a/.github/workflows/build-mq-broker.yml b/.github/workflows/build-mq-broker.yml
index 2ba41bb9c0..b297e34b47 100644
--- a/.github/workflows/build-mq-broker.yml
+++ b/.github/workflows/build-mq-broker.yml
@@ -8,7 +8,13 @@ on:
       - 'dev/mq/**'
       - '.github/workflows/build-mq-broker.yml'
 
-  workflow_dispatch: 
+  workflow_dispatch:
+    inputs:
+      rabbitmq_version:
+        description: 'RabbitMQ Version'
+        default: '3.13-alpine'
+        required: true
+        type: string
 
 jobs:
   publish:
@@ -18,27 +24,40 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v4
     
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v4
 
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v4
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Set rabbitmq version
+      id: rabbitmq-version
+      run: |
+        if [[ "${{ inputs.rabbitmq_version }}" == "" ]]; then
+          echo "RABBITMQ_VERSION=3.13-alpine" >> $GITHUB_OUTPUT
+        else
+          echo "RABBITMQ_VERSION=${{ inputs.rabbitmq_version }}" >> $GITHUB_OUTPUT
+        fi
+
     - name: Docker Build & Push
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v7
+      env:
+        DOCKER_BUILD_SUMMARY: false
       with:
         context: .
         file: dev/mq/Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
-        tags: ghcr.io/ietf-tools/datatracker-mq:latest
-
+        build-args: RABBITMQ_VERSION=${{ steps.rabbitmq-version.outputs.RABBITMQ_VERSION }}
+        tags: |
+          ghcr.io/ietf-tools/datatracker-mq:${{ steps.rabbitmq-version.outputs.RABBITMQ_VERSION }}
+          ghcr.io/ietf-tools/datatracker-mq:latest
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4cd9e625c6..49a0e5b53b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,23 +1,39 @@
 name: Build and Release
+run-name: ${{ github.ref_name == 'release' && '[Prod]' || '[Dev]' }} Build ${{ github.run_number }} of branch ${{ github.ref_name }} by @${{ github.actor }}
 
 on:
   push:
-    tags:
-      - '*'
-
+    branches: [release]
+    
   workflow_dispatch:
     inputs:
-      summary:
-        description: 'Release Summary'
-        required: false
-        type: string
-        default: ''
-      publish:
-        description: 'Create Production Release'
+      deploy:
+        description: 'Deploy to K8S'
+        default: 'Skip'
+        required: true
+        type: choice
+        options:
+          - Skip
+          - Staging Only
+          - Staging + Prod
+      dev:
+        description: 'Deploy to Dev'
+        default: true
+        required: true
+        type: boolean
+      devNoDbRefresh:
+        description: 'Dev Disable Daily DB Refresh'
+        default: false
         required: true
         type: boolean
       skiptests:
         description: 'Skip Tests'
+        default: false
+        required: true
+        type: boolean
+      skiparm:
+        description: 'Skip ARM64 Build'
+        default: false
         required: true
         type: boolean
       ignoreLowerCoverage:
@@ -30,10 +46,10 @@ on:
         default: false
         required: true
         type: boolean
-      dryrun:
-        description: 'Dry Run'
-        required: true
-        type: boolean
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   # -----------------------------------------------------------------
@@ -45,275 +61,149 @@ jobs:
     outputs:
       should_deploy: ${{ steps.buildvars.outputs.should_deploy }}
       pkg_version: ${{ steps.buildvars.outputs.pkg_version }}
+      from_tag: ${{ steps.semver.outputs.nextStrict }}
+      to_tag: ${{ steps.semver.outputs.current }}
+      base_image_version: ${{ steps.baseimgversion.outputs.base_image_version }}
 
-    steps:
-    - uses: actions/checkout@v3
+    steps:   
+    - uses: actions/checkout@v6
       with:
-        fetch-depth: 0
-        
-    - name: Dry Run Notify
-      if: ${{ github.event.inputs.dryrun == 'true' }}
-      run: |
-        echo "::notice::This is a DRY RUN of a production release. No release will be created."
+        fetch-depth: 1
+        fetch-tags: false
 
-    - name: Get Next Version
-      if: ${{ github.event.inputs.publish == 'true' || github.event.inputs.dryrun == 'true' }}
+    - name: Get Next Version (Prod)
+      if: ${{ github.ref_name == 'release' }}
       id: semver
       uses: ietf-tools/semver-action@v1
       with:
         token: ${{ github.token }}
-        branch: main
-        
-    - name: Set Next Version Env Var
-      if: ${{ github.event.inputs.publish == 'true' || github.event.inputs.dryrun == 'true' }}
+        branch: release
+        skipInvalidTags: true
+        patchList: fix, bugfix, perf, refactor, test, tests, chore
+
+    - name: Get Dev Version
+      if: ${{ github.ref_name != 'release' }}
+      id: semverdev
+      uses: ietf-tools/semver-action@v1
+      with:
+        token: ${{ github.token }}
+        branch: release
+        skipInvalidTags: true
+        noVersionBumpBehavior: 'current'
+        noNewCommitBehavior: 'current'
+      
+    - name: Set Release Flag
+      if: ${{ github.ref_name == 'release' }}
       run: |
-        echo "NEXT_VERSION=$nextStrict" >> $GITHUB_ENV
+        echo "IS_RELEASE=true" >> $GITHUB_ENV
         
     - name: Create Draft Release
-      uses: ncipollo/release-action@v1.11.1
-      if: ${{ github.event.inputs.publish == 'true' && github.event.inputs.dryrun == 'false' }}
+      uses: ncipollo/release-action@v1.21.0
+      if: ${{ github.ref_name == 'release' }}
       with:
         prerelease: true
         draft: false
         commit: ${{ github.sha }}
-        tag: ${{ env.NEXT_VERSION }}
-        name: ${{ env.NEXT_VERSION }}
+        tag: ${{ steps.semver.outputs.nextStrict }}
+        name: ${{ steps.semver.outputs.nextStrict }}
         body: '*pending*'
         token: ${{ secrets.GITHUB_TOKEN }}
     
     - name: Set Build Variables
       id: buildvars
       run: |
-        if [[ $NEXT_VERSION ]]; then
-          echo "Using AUTO SEMVER mode: $NEXT_VERSION"
-          echo "::set-output name=should_deploy::true"
-          echo "::set-output name=pkg_version::$NEXT_VERSION"
-          echo "::notice::Release $NEXT_VERSION created using branch $GITHUB_REF_NAME"
-        elif [[ "$GITHUB_REF" =~ ^refs/tags/* ]]; then
-          echo "Using TAG mode: $GITHUB_REF_NAME"
-          echo "::set-output name=should_deploy::true"
-          echo "::set-output name=pkg_version::$GITHUB_REF_NAME"
-          echo "::notice::Release $GITHUB_REF_NAME created using tag $GITHUB_REF_NAME"
+        if [[ $IS_RELEASE ]]; then
+          echo "Using AUTO SEMVER mode: ${{ steps.semver.outputs.nextStrict }}"
+          echo "should_deploy=true" >> $GITHUB_OUTPUT
+          echo "pkg_version=${{ steps.semver.outputs.nextStrict }}" >> $GITHUB_OUTPUT
+          echo "::notice::Release ${{ steps.semver.outputs.nextStrict }} created using branch $GITHUB_REF_NAME"
         else
-          echo "Using TEST mode: 8.0.0-dev.$GITHUB_RUN_NUMBER"
-          echo "::set-output name=should_deploy::false"
-          echo "::set-output name=pkg_version::8.0.0-dev.$GITHUB_RUN_NUMBER"
-          echo "::notice::Non-production build 8.0.0-dev.$GITHUB_RUN_NUMBER created using branch $GITHUB_REF_NAME"
+          echo "Using TEST mode: ${{ steps.semverdev.outputs.nextMajorStrict }}.0.0-dev.$GITHUB_RUN_NUMBER"
+          echo "should_deploy=false" >> $GITHUB_OUTPUT
+          echo "pkg_version=${{ steps.semverdev.outputs.nextMajorStrict }}.0.0-dev.$GITHUB_RUN_NUMBER" >> $GITHUB_OUTPUT
+          echo "::notice::Non-production build ${{ steps.semverdev.outputs.nextMajorStrict }}.0.0-dev.$GITHUB_RUN_NUMBER created using branch $GITHUB_REF_NAME"
         fi
 
+    - name: Get Base Image Target Version
+      id: baseimgversion
+      run: |
+        echo "base_image_version=$(sed -n '1p' dev/build/TARGET_BASE)" >> $GITHUB_OUTPUT
+
   # -----------------------------------------------------------------
   # TESTS
   # -----------------------------------------------------------------
-  tests-python:
-    name: Run Tests (Python)
-    if: ${{ github.event.inputs.skiptests == 'false' }}
+  
+  tests:
+    name: Run Tests
+    uses: ./.github/workflows/tests.yml
+    if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
     needs: [prepare]
-    runs-on: ubuntu-latest
-    container: ghcr.io/ietf-tools/datatracker-app-base:latest
-    
-    services:
-      db:
-        image: ghcr.io/ietf-tools/datatracker-db:latest
-        volumes:
-            - mariadb-data:/var/lib/mysql
-        env:
-            MYSQL_ROOT_PASSWORD: ietf
-            MYSQL_DATABASE: ietf_utf8
-            MYSQL_USER: django
-            MYSQL_PASSWORD: RkTkDPFnKpko
-    
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Prepare for tests
-      run: |
-        chmod +x ./dev/tests/prepare.sh
-        sh ./dev/tests/prepare.sh
-        
-    - name: Ensure DB is ready
-      run: |
-        /usr/local/bin/wait-for db:3306 -- echo "DB ready"
-        
-    - name: Run all tests
-      shell: bash
-      run: |
-        echo "Running checks..."
-        ./ietf/manage.py check
-        ./ietf/manage.py migrate
-        echo "Validating migrations..."
-        if ! ( ietf/manage.py makemigrations --dry-run --check --verbosity 3 ) ; then
-          echo "Model changes without migrations found."
-          exit 1
-        fi
-        echo "Running tests..."
-        if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
-          echo "Lower coverage failures will be ignored."
-          ./ietf/manage.py test --settings=settings_sqlitetest --ignore-lower-coverage
-        else
-          ./ietf/manage.py test --settings=settings_sqlitetest
-        fi
-        coverage xml
-
-    - name: Upload Coverage Results to Codecov
-      uses: codecov/codecov-action@v2.1.0
-      with:
-        files: coverage.xml
-        
-    - name: Convert Coverage Results
-      if: ${{ always() }}
-      run: |
-        mv latest-coverage.json coverage.json
-        
-    - name: Upload Coverage Results as Build Artifact
-      uses: actions/upload-artifact@v3
-      if: ${{ always() }}
-      with:
-        name: coverage
-        path: coverage.json
-
-  tests-playwright:
-    name: Run Tests (Playwright)
-    if: ${{ github.event.inputs.skiptests == 'false' }}
-    needs: [prepare]
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        project: [chromium, firefox]
-    
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '18'
-
-    - name: Run all tests
-      run: |
-        echo "Installing dependencies..."
-        yarn
-        echo "Installing Playwright..."
-        cd playwright
-        mkdir test-results
-        npm ci
-        npx playwright install --with-deps ${{ matrix.project }}
-        echo "Running tests..."
-        npx playwright test --project=${{ matrix.project }}
-        
-    - name: Upload Report
-      uses: actions/upload-artifact@v3
-      if: ${{ always() }}
-      continue-on-error: true
-      with:
-        name: playwright-results-${{ matrix.project }}
-        path: playwright/test-results/
-        if-no-files-found: ignore
+    secrets: inherit
+    with:
+      ignoreLowerCoverage: ${{ github.event.inputs.ignoreLowerCoverage == 'true' }}
+      skipSelenium: true
+      targetBaseVersion: ${{ needs.prepare.outputs.base_image_version }}
 
-  tests-cypress:
-    name: Run Tests (Cypress)
-    if: ${{ github.event.inputs.skiptests == 'false' }}
-    needs: [prepare]
-    runs-on: ubuntu-latest
-    container: ghcr.io/ietf-tools/datatracker-app-base:latest
-    
-    services:
-      db:
-        image: ghcr.io/ietf-tools/datatracker-db:latest
-        volumes:
-            - mariadb-data:/var/lib/mysql
-        env:
-            MYSQL_ROOT_PASSWORD: ietf
-            MYSQL_DATABASE: ietf_utf8
-            MYSQL_USER: django
-            MYSQL_PASSWORD: RkTkDPFnKpko
-    
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Prepare for tests
-      run: |
-        chmod +x ./dev/tests/prepare.sh
-        sh ./dev/tests/prepare.sh
-        
-    - name: Ensure DB is ready
-      run: |
-        /usr/local/bin/wait-for db:3306 -- echo "DB ready"
-        
-    - name: Start Datatracker
-      run: |
-        echo "Running checks..."
-        ./ietf/manage.py check
-        echo "Starting datatracker..."
-        ./ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local &
-        echo "Waiting for datatracker to be ready..."
-        /usr/local/bin/wait-for localhost:8000 -- echo "Datatracker ready"
-
-    - name: Run all tests
-      run: |
-        echo "Running tests..."
-        yarn cypress:legacy
-        
-    - name: Upload Video Recordings
-      uses: actions/upload-artifact@v3
-      if: ${{ always() }}
-      continue-on-error: true
-      with:
-        name: videos-legacy
-        path: cypress/videos/
-        if-no-files-found: ignore
-        
-    - name: Upload Screenshots
-      uses: actions/upload-artifact@v3
-      if: ${{ always() }}
-      continue-on-error: true
-      with:
-        name: screenshots-modern
-        path: cypress/screenshots/
-        if-no-files-found: ignore
-        
   # -----------------------------------------------------------------
   # RELEASE
   # -----------------------------------------------------------------
   release:
     name: Make Release
-    if: ${{ always() }}
-    needs: [tests-python, tests-playwright, tests-cypress, prepare]
-    runs-on: ubuntu-latest
+    if: ${{ !failure() && !cancelled() }}
+    needs: [tests, prepare]
+    runs-on:
+      group: hperf-8c32r
+    permissions:
+      contents: write
+      packages: write
     env:
       SHOULD_DEPLOY: ${{needs.prepare.outputs.should_deploy}}
       PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
+      FROM_TAG: ${{needs.prepare.outputs.from_tag}}
+      TO_TAG: ${{needs.prepare.outputs.to_tag}}
+      TARGET_BASE: ${{needs.prepare.outputs.base_image_version}}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
       with:
-        fetch-depth: 0
-        
-    - name: Setup Node.js
-      uses: actions/setup-node@v3
+        fetch-depth: 1
+        fetch-tags: false
+
+    - name: Setup Node.js environment
+      uses: actions/setup-node@v6
       with:
-        node-version: '16'
-    
+        node-version: 18.x
+
     - name: Setup Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v6
       with:
-        python-version: '3.x'
-        
+        python-version: "3.x"
+
+    - name: Setup AWS CLI
+      uses: unfor19/install-aws-cli-action@v1
+      with:
+        version: 2.22.35
+
     - name: Download a Coverage Results
-      if: ${{ github.event.inputs.skiptests == 'false' }}
-      uses: actions/download-artifact@v3.0.0
+      if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
+      uses: actions/download-artifact@v8.0.1
       with:
         name: coverage
 
     - name: Make Release Build
       env:
         DEBIAN_FRONTEND: noninteractive
+        BROWSERSLIST_IGNORE_OLD_DATA: 1
       run: |
         echo "PKG_VERSION: $PKG_VERSION"
         echo "GITHUB_SHA: $GITHUB_SHA"
         echo "GITHUB_REF_NAME: $GITHUB_REF_NAME"
-        echo "Running build script..."
-        chmod +x ./dev/deploy/build.sh
-        sh ./dev/deploy/build.sh
+        echo "Running frontend build script..."
+        echo "Compiling native node packages..."
+        yarn rebuild
+        echo "Packaging static assets..."
+        yarn build --base=https://static.ietf.org/dt/$PKG_VERSION/
+        yarn legacy:build
         echo "Setting version $PKG_VERSION..."
         sed -i -r -e "s|^__version__ += '.*'$|__version__ = '$PKG_VERSION'|" ietf/__init__.py
         sed -i -r -e "s|^__release_hash__ += '.*'$|__release_hash__ = '$GITHUB_SHA'|" ietf/__init__.py
@@ -331,41 +221,105 @@ jobs:
       run: |
         echo "Build release tarball..."
         mkdir -p /home/runner/work/release
-        tar -czf /home/runner/work/release/release.tar.gz -X dev/deploy/exclude-patterns.txt .
-        
+        tar -czf /home/runner/work/release/release.tar.gz -X dev/build/exclude-patterns.txt .
+
+    - name: Collect + Push Statics
+      env:
+        DEBIAN_FRONTEND: noninteractive
+        AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_STATIC_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_STATIC_KEY_SECRET }}
+        AWS_DEFAULT_REGION: auto
+        AWS_ENDPOINT_URL: ${{ secrets.CF_R2_ENDPOINT }}
+      run: |
+        echo "Collecting statics..."
+        echo "Using ghcr.io/ietf-tools/datatracker-app-base:${{ env.TARGET_BASE }}"
+        docker run --rm --name collectstatics -v $(pwd):/workspace ghcr.io/ietf-tools/datatracker-app-base:${{ env.TARGET_BASE }} sh dev/build/collectstatics.sh
+        echo "Pushing statics..."
+        cd static
+        aws s3 sync . s3://static/dt/$PKG_VERSION --only-show-errors
+
+    - name: Augment dockerignore for docker image build
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: |
+        cat >> .dockerignore <<EOL
+        .devcontainer
+        .github
+        .vscode
+        k8s
+        playwright
+        svn-history
+        docker-compose.yml
+        EOL
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v4
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v4
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Add feature-latest tag
+      if: ${{ startsWith(github.ref_name, 'feat/') }}
+      run: echo "FEATURE_LATEST_TAG=$(echo $GITHUB_REF_NAME | tr / -)" >> $GITHUB_ENV
+
+    - name: Build Images
+      uses: docker/build-push-action@v7
+      env:
+        DOCKER_BUILD_SUMMARY: false
+      with:
+        context: .
+        file: dev/build/Dockerfile
+        platforms: ${{ github.event.inputs.skiparm == 'true' && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
+        push: true
+        tags: |
+          ghcr.io/ietf-tools/datatracker:${{ env.PKG_VERSION }}
+          ${{ env.FEATURE_LATEST_TAG && format('ghcr.io/ietf-tools/datatracker:{0}-latest', env.FEATURE_LATEST_TAG) || null }}
+
     - name: Update CHANGELOG
       id: changelog
       uses: Requarks/changelog-action@v1
-      if: ${{ env.SHOULD_DEPLOY == 'true' && github.event.inputs.dryrun == 'false' }}
+      if: ${{ env.SHOULD_DEPLOY == 'true' }}
       with:
         token: ${{ github.token }}
-        tag: ${{ env.PKG_VERSION }}
+        fromTag: ${{ env.FROM_TAG }}
+        toTag: ${{ env.TO_TAG }}
         writeToFile: false
 
+    - name: Download Coverage Results
+      if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
+      uses: actions/download-artifact@v8.0.1
+      with:
+        name: coverage
+
     - name: Prepare Coverage Action
-      if: ${{ github.event.inputs.skiptests == 'false' }}
+      if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
       working-directory: ./dev/coverage-action
       run: npm install
         
     - name: Process Coverage Stats + Chart
       id: covprocess
       uses: ./dev/coverage-action/
-      if: ${{ github.event.inputs.skiptests == 'false' }}
+      if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
       with:
         token: ${{ github.token }}
         tokenCommon: ${{ secrets.GH_COMMON_TOKEN }}
         repoCommon: common
         version: ${{needs.prepare.outputs.pkg_version}}
         changelog: ${{ steps.changelog.outputs.changes }}
-        summary: ${{ github.event.inputs.summary }}
+        summary: ''
         coverageResultsPath: coverage.json
         histCoveragePath: historical-coverage.json
         
     - name: Create Release
-      uses: ncipollo/release-action@v1.11.1
-      if: ${{ env.SHOULD_DEPLOY == 'true' && github.event.inputs.dryrun == 'false' }}
+      uses: ncipollo/release-action@v1.21.0
+      if: ${{ env.SHOULD_DEPLOY == 'true' }}
       with:
         allowUpdates: true
+        makeLatest: true
         draft: false
         tag: ${{ env.PKG_VERSION }}
         name: ${{ env.PKG_VERSION }}
@@ -374,8 +328,8 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Update Baseline Coverage
-      uses: ncipollo/release-action@v1.11.1
-      if: ${{ github.event.inputs.updateCoverage == 'true' && github.event.inputs.dryrun == 'false' }}
+      uses: ncipollo/release-action@v1.21.0
+      if: ${{ github.event.inputs.updateCoverage == 'true' || github.ref_name == 'release' }}
       with:
         allowUpdates: true
         tag: baseline
@@ -387,19 +341,158 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         
     - name: Upload Build Artifacts
-      uses: actions/upload-artifact@v3
-      if: ${{ env.SHOULD_DEPLOY == 'false' || github.event.inputs.dryrun == 'true' }}
+      uses: actions/upload-artifact@v7
       with:
         name: release-${{ env.PKG_VERSION }}
         path: /home/runner/work/release/release.tar.gz
         
-    - name: Notify on Slack
-      uses: slackapi/slack-github-action@v1.23.0
+  # -----------------------------------------------------------------
+  # NOTIFY
+  # -----------------------------------------------------------------
+  notify:
+    name: Notify
+    if: ${{ always() }}
+    needs: [prepare, tests, release]
+    runs-on: ubuntu-latest
+    env:
+      PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
+        
+    steps:      
+    - name: Notify on Slack (Success)
+      if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
+      uses: slackapi/slack-github-action@v3
       with:
-        channel-id: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
+        token: ${{ secrets.SLACK_GH_BOT }}
+        method: chat.postMessage
         payload: |
-          {
-            "text": "Datatracker - Build <https://github.com/ietf-tools/datatracker/actions/runs/${{ github.run_id }}|${{ env.PKG_VERSION }}> by ${{ github.triggering_actor }} completed - <@${{ secrets.SLACK_UID_RJSPARKS }}>"
-          }
-      env:
-        SLACK_BOT_TOKEN: ${{ secrets.SLACK_GH_BOT }}
+          channel: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
+          text: "Datatracker Build <https://github.com/ietf-tools/datatracker/actions/runs/${{ github.run_id }}|${{ env.PKG_VERSION }}> by ${{ github.triggering_actor }}"
+          attachments:
+            - color: "28a745"
+              fields:
+                - title: "Status"
+                  short: true
+                  value: "Completed"
+    - name: Notify on Slack (Failure)
+      if: ${{ contains(join(needs.*.result, ','), 'failure') }}
+      uses: slackapi/slack-github-action@v3
+      with:
+        token: ${{ secrets.SLACK_GH_BOT }}
+        method: chat.postMessage
+        payload: |
+          channel: ${{ secrets.SLACK_GH_BUILDS_CHANNEL_ID }}
+          text: "Datatracker Build <https://github.com/ietf-tools/datatracker/actions/runs/${{ github.run_id }}|${{ env.PKG_VERSION }}> by ${{ github.triggering_actor }}"
+          attachments:
+            - color: "a82929"
+              fields:
+                - title: "Status"
+                  short: true
+                  value: "Failed"
+        
+  # -----------------------------------------------------------------
+  # DEV
+  # -----------------------------------------------------------------
+  dev:
+    name: Deploy to Dev
+    if: ${{ !failure() && !cancelled() && github.event.inputs.dev == 'true' }}
+    needs: [prepare, release]
+    runs-on: ubuntu-latest
+    environment:
+      name: dev
+    env:
+      PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
+      
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: main
+          
+      - name: Get Deploy Name
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          echo "Install Get Deploy Name CLI dependencies..."
+          cd dev/k8s-get-deploy-name
+          npm ci
+          echo "Get Deploy Name..."
+          echo "DEPLOY_NAMESPACE=$(node cli.js --branch ${{ github.ref_name }})" >> "$GITHUB_ENV"
+
+      - name: Deploy to dev
+        uses: the-actions-org/workflow-dispatch@v4
+        with:
+          workflow: deploy-dev.yml
+          repo: ietf-tools/infra-k8s
+          ref: main
+          token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
+          inputs: '{ "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}", "namespace":"${{ env.DEPLOY_NAMESPACE }}", "disableDailyDbRefresh":${{ inputs.devNoDbRefresh }} }'
+          wait-for-completion: true
+          wait-for-completion-timeout: 60m
+          wait-for-completion-interval: 30s
+          display-workflow-run-url: false
+
+  # -----------------------------------------------------------------
+  # STAGING
+  # -----------------------------------------------------------------
+  staging:
+    name: Deploy to Staging
+    if: ${{ !failure() && !cancelled() && (github.event.inputs.deploy == 'Staging Only' || github.event.inputs.deploy == 'Staging + Prod' || github.ref_name == 'release') }}
+    needs: [prepare, release]
+    runs-on: ubuntu-latest
+    environment:
+      name: staging
+    env:
+      PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
+      
+    steps:
+      - name: Refresh Staging DB
+        uses: the-actions-org/workflow-dispatch@v4
+        with:
+          workflow: deploy-db.yml
+          repo: ietf-tools/infra-k8s
+          ref: main
+          token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
+          inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "manifest":"postgres", "forceRecreate":true, "restoreToLastFullSnapshot":true, "waitClusterReady":true }'
+          wait-for-completion: true
+          wait-for-completion-timeout: 120m
+          wait-for-completion-interval: 20s
+          display-workflow-run-url: false
+
+      - name: Deploy to staging
+        uses: the-actions-org/workflow-dispatch@v4
+        with:
+          workflow: deploy.yml
+          repo: ietf-tools/infra-k8s
+          ref: main
+          token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
+          inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}" }'
+          wait-for-completion: true
+          wait-for-completion-timeout: 10m
+          wait-for-completion-interval: 30s
+          display-workflow-run-url: false
+
+  # -----------------------------------------------------------------
+  # PROD
+  # -----------------------------------------------------------------
+  prod:
+    name: Deploy to Production
+    if: ${{ !failure() && !cancelled() && (github.event.inputs.deploy == 'Staging + Prod' || github.ref_name == 'release') }}
+    needs: [prepare, staging]
+    runs-on: ubuntu-latest
+    environment:
+      name: production
+    env:
+      PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
+
+    steps:
+      - name: Deploy to production
+        uses: the-actions-org/workflow-dispatch@v4
+        with:
+          workflow: deploy.yml
+          repo: ietf-tools/infra-k8s
+          ref: main
+          token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
+          inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}" }'
+          wait-for-completion: true
+          wait-for-completion-timeout: 10m
+          wait-for-completion-interval: 30s
+          display-workflow-run-url: false
diff --git a/.github/workflows/ci-run-tests.yml b/.github/workflows/ci-run-tests.yml
index f2cc2debae..5349f1ac7a 100644
--- a/.github/workflows/ci-run-tests.yml
+++ b/.github/workflows/ci-run-tests.yml
@@ -1,107 +1,46 @@
-name: Run All Tests
+name: PR - Run All Tests
 
 on:
   pull_request:
     branches:
       - 'main'
+      - 'feat/rfc'
     paths:
+      - 'client/**'
       - 'ietf/**'
+      - 'playwright/**'
       - 'requirements.txt'
       - 'package.json'
 
 jobs:
-  tests-python:
-    name: Run Tests (Python)
+  # -----------------------------------------------------------------
+  # PREPARE
+  # -----------------------------------------------------------------
+  prepare:
+    name: Prepare
     runs-on: ubuntu-latest
-    container: ghcr.io/ietf-tools/datatracker-app-base:latest
-    
-    services:
-      db:
-        image: ghcr.io/ietf-tools/datatracker-db:latest
-        volumes:
-            - mariadb-data:/var/lib/mysql
-        env:
-            MYSQL_ROOT_PASSWORD: ietf
-            MYSQL_DATABASE: ietf_utf8
-            MYSQL_USER: django
-            MYSQL_PASSWORD: RkTkDPFnKpko
-    
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Prepare for tests
-      run: |
-        chmod +x ./dev/tests/prepare.sh
-        sh ./dev/tests/prepare.sh
-        
-    - name: Ensure DB is ready
-      run: |
-        /usr/local/bin/wait-for db:3306 -- echo "DB ready"
-        
-    - name: Run all tests
-      run: |
-        echo "Running checks..."
-        ./ietf/manage.py check
-        ./ietf/manage.py migrate
-        echo "Validating migrations..."
-        if ! ( ietf/manage.py makemigrations --dry-run --check --verbosity 3 ) ; then
-          echo "Model changes without migrations found."
-          echo ${MSG}
-          exit 1
-        fi
-        echo "Running tests..."
-        ./ietf/manage.py test --settings=settings_sqlitetest
-        coverage xml
+    outputs:
+      base_image_version: ${{ steps.baseimgversion.outputs.base_image_version }}
 
-    - name: Upload Coverage Results to Codecov
-      uses: codecov/codecov-action@v2.1.0
-      with:
-        files: coverage.xml
-        
-    - name: Convert Coverage Results
-      if: ${{ always() }}
-      run: |
-        mv latest-coverage.json coverage.json
-        
-    - name: Upload Coverage Results as Build Artifact
-      uses: actions/upload-artifact@v3.0.0
-      if: ${{ always() }}
+    steps:   
+    - uses: actions/checkout@v6
       with:
-        name: coverage
-        path: coverage.json
-        
-  tests-playwright:
-    name: Run Tests (Playwright)
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        project: [chromium, firefox]
-    
-    steps:
-    - uses: actions/checkout@v3
+        fetch-depth: 1
+        fetch-tags: false
 
-    - uses: actions/setup-node@v3
-      with:
-        node-version: '18'
-
-    - name: Run all tests
+    - name: Get Base Image Target Version
+      id: baseimgversion
       run: |
-        echo "Installing dependencies..."
-        yarn
-        echo "Installing Playwright..."
-        cd playwright
-        mkdir test-results
-        npm ci
-        npx playwright install --with-deps ${{ matrix.project }}
-        echo "Running tests..."
-        npx playwright test --project=${{ matrix.project }}
-        
-    - name: Upload Report
-      uses: actions/upload-artifact@v3.0.0
-      if: ${{ always() }}
-      continue-on-error: true
-      with:
-        name: playwright-results-${{ matrix.project }}
-        path: playwright/test-results/
-        if-no-files-found: ignore
+        echo "base_image_version=$(sed -n '1p' dev/build/TARGET_BASE)" >> $GITHUB_OUTPUT
+
+  # -----------------------------------------------------------------
+  # TESTS
+  # -----------------------------------------------------------------
+  tests:
+    name: Run Tests
+    uses: ./.github/workflows/tests.yml
+    needs: [prepare]
+    with:
+      ignoreLowerCoverage: false
+      skipSelenium: true
+      targetBaseVersion: ${{ needs.prepare.outputs.base_image_version }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2ed7034d6c..bc20779ae6 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,12 +26,12 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v6
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v4
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 0000000000..e255b270ff
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,22 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v6
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v4
+        with:
+          vulnerability-check: false
diff --git a/.github/workflows/dev-assets-sync-nightly.yml b/.github/workflows/dev-assets-sync-nightly.yml
new file mode 100644
index 0000000000..cd986f06f3
--- /dev/null
+++ b/.github/workflows/dev-assets-sync-nightly.yml
@@ -0,0 +1,49 @@
+# GITHUB ACTIONS - WORKFLOW
+
+# RSync the assets in the shared assets volume
+
+name: Nightly Dev Shared Assets Sync
+
+# Controls when the workflow will run
+on:
+  # Run every night
+  schedule:
+    - cron: '0 1 * * *'
+
+  # Run on app-rsync-extras.sh changes
+  push:
+    branches:
+      - main
+    paths:
+      - 'docker/scripts/app-rsync-extras.sh'
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build Docker Image
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'schedule' }}
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker Build & Push
+        uses: docker/build-push-action@v7
+        env:
+          DOCKER_BUILD_SUMMARY: false
+        with:
+          context: .
+          file: dev/shared-assets-sync/Dockerfile
+          push: true
+          tags: ghcr.io/ietf-tools/datatracker-rsync-assets:latest
diff --git a/.github/workflows/dev-db-nightly.yml b/.github/workflows/dev-db-nightly.yml
deleted file mode 100644
index 33e4163385..0000000000
--- a/.github/workflows/dev-db-nightly.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-# GITHUB ACTIONS - WORKFLOW
-
-# Build the database dev docker image with the latest database dump every night
-# so that developers don't have to manually build it themselves.
-
-# DB dump becomes available at around 0700 UTC, so schedule is set to 0800 UTC
-# to account for variations.
-
-name: Nightly Dev DB Image
-
-# Controls when the workflow will run
-on:
-  # Run every night
-  schedule:
-    - cron: '0 8 * * *'
-
-  # Run on db.Dockerfile changes
-  push:
-    branches:
-      - main
-    paths:
-      - 'docker/db.Dockerfile'
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build Docker Images
-    runs-on: ubuntu-latest
-    if: ${{ github.ref == 'refs/heads/main' }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        include:
-          - platform: "linux/arm64"
-            docker: "arm64"
-          - platform: "linux/amd64"
-            docker: "x64"
-    steps:
-      - uses: actions/checkout@v2
-        
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Docker Build & Push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/db.Dockerfile
-          platforms: ${{ matrix.platform }}
-          push: true
-          tags: ghcr.io/ietf-tools/datatracker-db:latest-${{ matrix.docker }}
-          
-  combine:
-    name: Create Docker Manifests
-    runs-on: ubuntu-latest
-    needs: [build]
-    permissions:
-      packages: write
-    steps:
-      - uses: actions/checkout@v2
-      
-      - name: Get Current Date as Tag
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y%m%d')"
-        
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        
-      - name: Create and Push Manifests
-        run: |
-          echo "Creating the manifests..."
-          docker manifest create ghcr.io/ietf-tools/datatracker-db:nightly-${{ steps.date.outputs.date }} ghcr.io/ietf-tools/datatracker-db:latest-x64 ghcr.io/ietf-tools/datatracker-db:latest-arm64
-          docker manifest create ghcr.io/ietf-tools/datatracker-db:latest ghcr.io/ietf-tools/datatracker-db:latest-x64 ghcr.io/ietf-tools/datatracker-db:latest-arm64
-          echo "Pushing the manifests..."
-          docker manifest push -p ghcr.io/ietf-tools/datatracker-db:nightly-${{ steps.date.outputs.date }}
-          docker manifest push -p ghcr.io/ietf-tools/datatracker-db:latest
diff --git a/.github/workflows/lock-threads.yml b/.github/workflows/lock-threads.yml
index 7ce1f411e1..22652dab88 100644
--- a/.github/workflows/lock-threads.yml
+++ b/.github/workflows/lock-threads.yml
@@ -16,7 +16,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: ietf-tools/lock-threads@v3.1.1
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: 7
diff --git a/.github/workflows/tests-az.yml b/.github/workflows/tests-az.yml
new file mode 100644
index 0000000000..833ca89bef
--- /dev/null
+++ b/.github/workflows/tests-az.yml
@@ -0,0 +1,109 @@
+name: Tests (Azure Test)
+
+on:
+  workflow_dispatch:
+
+jobs:
+  main:
+    name: Run Tests on Azure temp VM
+    runs-on: ubuntu-latest
+    
+    permissions:
+      contents: read
+      
+    steps:
+    - name: Launch VM on Azure
+      id: azlaunch
+      run: |
+        echo "Authenticating to Azure..."
+        az login --service-principal -u ${{ secrets.AZ_TESTS_APP_ID }} -p ${{ secrets.AZ_TESTS_PWD }} --tenant ${{ secrets.AZ_TESTS_TENANT_ID }}
+        echo "Creating VM..."
+        vminfo=$(az vm create \
+          --resource-group ghaDatatrackerTests \
+          --name tmpGhaVM2 \
+          --image Ubuntu2204 \
+          --admin-username azureuser \
+          --generate-ssh-keys \
+          --priority Spot \
+          --size Standard_D4as_v5 \
+          --max-price -1 \
+          --os-disk-size-gb 30 \
+          --eviction-policy Delete \
+          --nic-delete-option Delete \
+          --output tsv \
+          --query "publicIpAddress")
+        echo "ipaddr=$vminfo" >> "$GITHUB_OUTPUT"
+        echo "VM Public IP: $vminfo"
+        cat ~/.ssh/id_rsa > ${{ github.workspace }}/prvkey.key
+        ssh-keyscan -t rsa $vminfo >> ~/.ssh/known_hosts
+
+    - name: Remote SSH into VM
+      uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        host: ${{ steps.azlaunch.outputs.ipaddr }}
+        port: 22
+        username: azureuser
+        command_timeout: 60m
+        key_path: ${{ github.workspace }}/prvkey.key
+        envs: GITHUB_TOKEN
+        script_stop: true
+        script: |
+          export DEBIAN_FRONTEND=noninteractive
+          lsb_release -a
+          sudo apt-get update
+          sudo apt-get upgrade -y
+          
+          echo "Installing Docker..."
+          curl -fsSL https://get.docker.com -o get-docker.sh
+          sudo sh get-docker.sh
+          
+          echo "Starting Containers..."
+          sudo docker network create dtnet
+          sudo docker run -d --name db --network=dtnet ghcr.io/ietf-tools/datatracker-db:latest &
+          sudo docker run -d --name app --network=dtnet ghcr.io/ietf-tools/datatracker-app-base:latest sleep infinity &
+          wait
+
+          echo "Cloning datatracker repo..."
+          sudo docker exec app git clone --depth=1 https://github.com/ietf-tools/datatracker.git .
+          echo "Prepare tests..."
+          sudo docker exec app chmod +x ./dev/tests/prepare.sh
+          sudo docker exec app sh ./dev/tests/prepare.sh
+          echo "Running checks..."
+          sudo docker exec app ietf/manage.py check
+          sudo docker exec app ietf/manage.py migrate --fake-initial
+          echo "Running tests..."
+          sudo docker exec app ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
+
+    - name: Destroy VM + resources
+      if: always()
+      shell: pwsh
+      run: |
+        echo "Destroying VM..."        
+        az vm delete -g ghaDatatrackerTests -n tmpGhaVM2 --yes --force-deletion true
+
+        $resourceOrderRemovalOrder = [ordered]@{
+            "Microsoft.Compute/virtualMachines" = 0
+            "Microsoft.Compute/disks" = 1
+            "Microsoft.Network/networkInterfaces" = 2
+            "Microsoft.Network/publicIpAddresses" = 3
+            "Microsoft.Network/networkSecurityGroups" = 4
+            "Microsoft.Network/virtualNetworks" = 5
+        }
+        echo "Fetching remaining resources..."
+        $resources = az resource list --resource-group ghaDatatrackerTests | ConvertFrom-Json
+
+        $orderedResources = $resources 
+            | Sort-Object @{
+                Expression = {$resourceOrderRemovalOrder[$_.type]}
+                Descending = $False
+            }
+
+        echo "Deleting remaining resources..."
+        $orderedResources | ForEach-Object {
+            az resource delete --resource-group ghaDatatrackerTests --ids $_.id --verbose
+        }
+
+        echo "Logout from Azure..."
+        az logout
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000000..ad2e35408d
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,190 @@
+name: Reusable Tests Workflow
+
+on:
+  workflow_call:
+    inputs:
+      ignoreLowerCoverage:
+        description: 'Ignore Lower Coverage'
+        default: false
+        required: true
+        type: boolean
+      skipSelenium:
+        description: 'Skip Selenium Tests'
+        default: false
+        required: false
+        type: boolean
+      targetBaseVersion:
+        description: 'Target Base Image Version'
+        default: latest
+        required: false
+        type: string
+
+jobs:
+  tests-python:
+    name: Python Tests
+    runs-on: ubuntu-latest
+    container: ghcr.io/ietf-tools/datatracker-app-base:${{ inputs.targetBaseVersion }}
+    
+    services:
+      db:
+        image: ghcr.io/ietf-tools/datatracker-db:latest
+      blobstore:
+        image: ghcr.io/ietf-tools/datatracker-devblobstore:latest
+    
+    steps:
+    - uses: actions/checkout@v6
+    
+    - name: Prepare for tests
+      run: |
+        chmod +x ./dev/tests/prepare.sh
+        sh ./dev/tests/prepare.sh
+        
+    - name: Ensure DB is ready
+      run: |
+        /usr/local/bin/wait-for db:5432 -- echo "DB ready"
+        
+    - name: Run all tests
+      shell: bash
+      run: |
+        echo "Running checks..."
+        ./ietf/manage.py check
+        ./ietf/manage.py migrate --fake-initial
+        echo "Validating migrations..."
+        if ! ( ietf/manage.py makemigrations --dry-run --check --verbosity 3 ) ; then
+          echo "Model changes without migrations found."
+          exit 1
+        fi
+        if [[ "x${{ inputs.skipSelenium }}" == "xtrue" ]]; then
+          echo "Disable selenium tests..."
+          rm /usr/bin/geckodriver
+        fi
+        echo "Running tests..."
+        if [[ "x${{ inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
+          echo "Lower coverage failures will be ignored."
+          HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test --ignore-lower-coverage
+        else
+          HOME=/root ./ietf/manage.py test -v2 --validate-html-harder --settings=settings_test
+        fi
+        coverage xml
+
+    - name: Upload geckodriver.log
+      uses: actions/upload-artifact@v7
+      if: ${{ failure() }}
+      with:
+        name: geckodriverlog
+        path: geckodriver.log
+
+    - name: Upload Coverage Results to Codecov
+      uses: codecov/codecov-action@v6
+      with:
+        disable_search: true
+        files: coverage.xml
+        token: ${{ secrets.CODECOV_TOKEN }}
+        
+    - name: Convert Coverage Results
+      if: ${{ always() }}
+      run: |
+        mv latest-coverage.json coverage.json
+        
+    - name: Upload Coverage Results as Build Artifact
+      uses: actions/upload-artifact@v7
+      if: ${{ always() }}
+      with:
+        name: coverage
+        path: coverage.json
+
+  tests-playwright:
+    name: Playwright Tests
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        project: [chromium, firefox]
+    
+    steps:
+    - uses: actions/checkout@v6
+
+    - uses: actions/setup-node@v6
+      with:
+        node-version: '18'
+
+    - name: Run all tests
+      run: |
+        echo "Installing dependencies..."
+        yarn
+        echo "Installing Playwright..."
+        cd playwright
+        mkdir test-results
+        npm ci
+        npx playwright install --with-deps ${{ matrix.project }}
+        echo "Running tests..."
+        npx playwright test --project=${{ matrix.project }}
+        
+    - name: Upload Report
+      uses: actions/upload-artifact@v7
+      if: ${{ always() }}
+      continue-on-error: true
+      with:
+        name: playwright-results-${{ matrix.project }}
+        path: playwright/test-results/
+        if-no-files-found: ignore
+
+  tests-playwright-legacy:
+    if: ${{ false }}  # disable until we sort out suspected test runner issue
+    name: Playwright Legacy Tests
+    runs-on: ubuntu-latest
+    container: ghcr.io/ietf-tools/datatracker-app-base:${{ inputs.targetBaseVersion }}
+    strategy:
+      fail-fast: false
+      matrix:
+        project: [chromium, firefox]
+    
+    services:
+      db:
+        image: ghcr.io/ietf-tools/datatracker-db:latest
+    
+    steps:
+    - uses: actions/checkout@v6
+    
+    - name: Prepare for tests
+      run: |
+        chmod +x ./dev/tests/prepare.sh
+        sh ./dev/tests/prepare.sh
+        
+    - name: Ensure DB is ready
+      run: |
+        /usr/local/bin/wait-for db:5432 -- echo "DB ready"
+        
+    - name: Start Datatracker
+      run: |
+        echo "Running checks..."
+        ./ietf/manage.py check
+        ./ietf/manage.py migrate --fake-initial
+        echo "Starting datatracker..."
+        ./ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local &
+        echo "Waiting for datatracker to be ready..."
+        /usr/local/bin/wait-for localhost:8000 -- echo "Datatracker ready"
+
+    - name: Run all tests
+      env:
+        # Required to get firefox to run as root:
+        HOME: ""
+      run: |
+        echo "Installing dependencies..."
+        yarn
+        echo "Installing Playwright..."
+        cd playwright
+        mkdir test-results
+        npm ci
+        npx playwright install --with-deps ${{ matrix.project }}
+        echo "Running tests..."
+        npx playwright test --project=${{ matrix.project }} -c playwright-legacy.config.js
+        
+    - name: Upload Report
+      uses: actions/upload-artifact@v7
+      if: ${{ always() }}
+      continue-on-error: true
+      with:
+        name: playwright-legacy-results-${{ matrix.project }}
+        path: playwright/test-results/
+        if-no-files-found: ignore
diff --git a/.gitignore b/.gitignore
index 80e5f0228b..ccc7a46b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_store
 datatracker.sublime-project
 datatracker.sublime-workspace
+/.claude
 /.coverage
 /.factoryboy_random_state
 /.mypy_cache
@@ -17,14 +18,17 @@ datatracker.sublime-workspace
 /docker/docker-compose.extend-custom.yml
 /env
 /ghostdriver.log
+/geckodriver.log
 /htmlcov
 /ietf/static/dist-neue
 /latest-coverage.json
 /media
 /node_modules
 /release-coverage.json
+/static
 /tmp-*
 /.testresult
+*.swp
 *.pyc
 __pycache__
 .yarn/*
diff --git a/.pnp.cjs b/.pnp.cjs
index 44d3124b11..5fcce34d2f 100644
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -33,73 +33,84 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         [null, {\
           "packageLocation": "./",\
           "packageDependencies": [\
-            ["@faker-js/faker", "npm:7.5.0"],\
-            ["@fullcalendar/bootstrap5", "npm:5.11.3"],\
-            ["@fullcalendar/core", "npm:5.11.3"],\
-            ["@fullcalendar/daygrid", "npm:5.11.3"],\
-            ["@fullcalendar/interaction", "npm:5.11.3"],\
-            ["@fullcalendar/list", "npm:5.11.3"],\
-            ["@fullcalendar/luxon2", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.11.3"],\
-            ["@fullcalendar/timegrid", "npm:5.11.3"],\
-            ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.11.2"],\
-            ["@parcel/transformer-sass", "npm:2.7.0"],\
-            ["@percy/cli", "npm:1.10.4"],\
-            ["@percy/cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.1.2"],\
-            ["@popperjs/core", "npm:2.11.6"],\
-            ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.3.4"],\
-            ["@vue/test-utils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.0"],\
-            ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.2.2"],\
-            ["bootstrap-icons", "npm:1.9.1"],\
-            ["browser-fs-access", "npm:0.31.0"],\
+            ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/luxon3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@parcel/optimizer-data-url", "npm:2.12.0"],\
+            ["@parcel/transformer-inline-string", "npm:2.12.0"],\
+            ["@parcel/transformer-sass", "npm:2.12.0"],\
+            ["@popperjs/core", "npm:2.11.8"],\
+            ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.1.0"],\
+            ["@twuni/emojify", "npm:1.0.2"],\
+            ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.6.2"],\
+            ["@vue/language-plugin-pug", "npm:2.0.7"],\
+            ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.3.3"],\
+            ["bootstrap-icons", "npm:1.11.3"],\
+            ["browser-fs-access", "npm:0.35.0"],\
             ["browserlist", "npm:1.0.1"],\
-            ["c8", "npm:7.12.0"],\
-            ["caniuse-lite", "npm:1.0.30001414"],\
-            ["cypress", "npm:10.9.0"],\
-            ["cypress-real-events", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.7.1"],\
-            ["d3", "npm:7.6.1"],\
-            ["eslint", "npm:8.24.0"],\
-            ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.0.0"],\
-            ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.1"],\
-            ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.26.0"],\
-            ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.3.0"],\
+            ["c8", "npm:9.1.0"],\
+            ["caniuse-lite", "npm:1.0.30001603"],\
+            ["d3", "npm:7.9.0"],\
+            ["eslint", "npm:8.57.0"],\
+            ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.1.0"],\
+            ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.15.1"],\
+            ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1"],\
+            ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2"],\
             ["eslint-plugin-node", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:11.1.0"],\
-            ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.0.1"],\
-            ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.5.1"],\
+            ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"],\
+            ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.24.0"],\
             ["file-saver", "npm:2.0.5"],\
-            ["highcharts", "npm:10.2.1"],\
-            ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.5.0"],\
-            ["jquery", "npm:3.6.1"],\
-            ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.0"],\
-            ["jquery-ui-dist", "npm:1.13.2"],\
-            ["js-cookie", "npm:3.0.1"],\
+            ["highcharts", "npm:11.4.0"],\
+            ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:8.18.1"],\
+            ["ical.js", "npm:1.5.0"],\
+            ["jquery", "npm:3.7.1"],\
+            ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1"],\
+            ["js-cookie", "npm:3.0.5"],\
             ["list.js", "npm:2.3.1"],\
             ["lodash", "npm:4.17.21"],\
             ["lodash-es", "npm:4.17.21"],\
-            ["luxon", "npm:3.0.4"],\
-            ["moment", "npm:2.29.4"],\
-            ["moment-timezone", "npm:0.5.37"],\
+            ["luxon", "npm:3.4.4"],\
+            ["moment", "npm:2.30.1"],\
+            ["moment-timezone", "npm:0.5.45"],\
             ["ms", "npm:2.1.3"],\
             ["murmurhash-js", "npm:1.0.0"],\
-            ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.33.3"],\
-            ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.7.0"],\
-            ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.22"],\
+            ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.38.1"],\
+            ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.0"],\
+            ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7"],\
             ["pinia-plugin-persist", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.0.0"],\
             ["pug", "npm:3.0.2"],\
-            ["sass", "npm:1.55.0"],\
+            ["sass", "npm:1.72.0"],\
             ["seedrandom", "npm:3.0.5"],\
             ["select2", "npm:4.1.0-rc.0"],\
             ["select2-bootstrap-5-theme", "npm:1.3.0"],\
             ["send", "npm:0.18.0"],\
-            ["slugify", "npm:1.6.5"],\
-            ["sortablejs", "npm:1.15.0"],\
-            ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.9.15"],\
-            ["vue", "npm:3.2.40"],\
-            ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.1.5"],\
+            ["shepherd.js", "npm:11.2.0"],\
+            ["slugify", "npm:1.6.6"],\
+            ["sortablejs", "npm:1.15.2"],\
+            ["vanillajs-datepicker", "npm:1.3.4"],\
+            ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3"],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\
+            ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.0"],\
             ["zxcvbn", "npm:4.4.2"]\
           ],\
           "linkType": "SOFT"\
         }]\
       ]],\
+      ["@aashutoshrathi/word-wrap", [\
+        ["npm:1.2.6", {\
+          "packageLocation": "./.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip/node_modules/@aashutoshrathi/word-wrap/",\
+          "packageDependencies": [\
+            ["@aashutoshrathi/word-wrap", "npm:1.2.6"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["@babel/code-frame", [\
         ["npm:7.16.7", {\
           "packageLocation": "./.yarn/cache/@babel-code-frame-npm-7.16.7-093eb9e124-db2f7faa31.zip/node_modules/@babel/code-frame/",\
@@ -139,6 +150,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@babel/types", "npm:7.18.4"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:7.23.9", {\
+          "packageLocation": "./.yarn/cache/@babel-parser-npm-7.23.9-720a0b56cb-e7cd4960ac.zip/node_modules/@babel/parser/",\
+          "packageDependencies": [\
+            ["@babel/parser", "npm:7.23.9"],\
+            ["@babel/types", "npm:7.18.4"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@babel/runtime", [\
+        ["npm:7.23.2", {\
+          "packageLocation": "./.yarn/cache/@babel-runtime-npm-7.23.2-d013d6cf7e-6c4df4839e.zip/node_modules/@babel/runtime/",\
+          "packageDependencies": [\
+            ["@babel/runtime", "npm:7.23.2"],\
+            ["regenerator-runtime", "npm:0.14.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@babel/types", [\
@@ -161,29 +190,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@colors/colors", [\
-        ["npm:1.5.0", {\
-          "packageLocation": "./.yarn/cache/@colors-colors-npm-1.5.0-875af3a8b4-d64d5260be.zip/node_modules/@colors/colors/",\
-          "packageDependencies": [\
-            ["@colors/colors", "npm:1.5.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["@css-render/plugin-bem", [\
-        ["npm:0.15.10", {\
-          "packageLocation": "./.yarn/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip/node_modules/@css-render/plugin-bem/",\
+        ["npm:0.15.12", {\
+          "packageLocation": "./.yarn/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip/node_modules/@css-render/plugin-bem/",\
           "packageDependencies": [\
-            ["@css-render/plugin-bem", "npm:0.15.10"]\
+            ["@css-render/plugin-bem", "npm:0.15.12"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.15.10", {\
-          "packageLocation": "./.yarn/__virtual__/@css-render-plugin-bem-virtual-58011a1e27/0/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip/node_modules/@css-render/plugin-bem/",\
+        ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12", {\
+          "packageLocation": "./.yarn/__virtual__/@css-render-plugin-bem-virtual-105b1b654b/0/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip/node_modules/@css-render/plugin-bem/",\
           "packageDependencies": [\
-            ["@css-render/plugin-bem", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.15.10"],\
+            ["@css-render/plugin-bem", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12"],\
             ["@types/css-render", null],\
-            ["css-render", "npm:0.15.10"]\
+            ["css-render", "npm:0.15.12"]\
           ],\
           "packagePeers": [\
             "@types/css-render",\
@@ -200,12 +220,32 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.15.10", {\
-          "packageLocation": "./.yarn/__virtual__/@css-render-vue3-ssr-virtual-04011a7971/0/cache/@css-render-vue3-ssr-npm-0.15.10-b8526cc313-7977e0c440.zip/node_modules/@css-render/vue3-ssr/",\
+        ["npm:0.15.12", {\
+          "packageLocation": "./.yarn/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip/node_modules/@css-render/vue3-ssr/",\
+          "packageDependencies": [\
+            ["@css-render/vue3-ssr", "npm:0.15.12"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:2366be83ef58a728ebb5a5e9ed4600f4465f98b2a844262fcfbe89415361d5d5f9e964ec3b9a72d6a5004f37c1024d017c65e67473dd9cc39cd61f51768c65e6#npm:0.15.10", {\
+          "packageLocation": "./.yarn/__virtual__/@css-render-vue3-ssr-virtual-8cb63dbe2e/0/cache/@css-render-vue3-ssr-npm-0.15.10-b8526cc313-7977e0c440.zip/node_modules/@css-render/vue3-ssr/",\
           "packageDependencies": [\
-            ["@css-render/vue3-ssr", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.15.10"],\
+            ["@css-render/vue3-ssr", "virtual:2366be83ef58a728ebb5a5e9ed4600f4465f98b2a844262fcfbe89415361d5d5f9e964ec3b9a72d6a5004f37c1024d017c65e67473dd9cc39cd61f51768c65e6#npm:0.15.10"],\
             ["@types/vue", null],\
-            ["vue", "npm:3.2.40"]\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
+          ],\
+          "packagePeers": [\
+            "@types/vue",\
+            "vue"\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12", {\
+          "packageLocation": "./.yarn/__virtual__/@css-render-vue3-ssr-virtual-18db73fb22/0/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip/node_modules/@css-render/vue3-ssr/",\
+          "packageDependencies": [\
+            ["@css-render/vue3-ssr", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12"],\
+            ["@types/vue", null],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -214,62 +254,261 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@cypress/request", [\
-        ["npm:2.88.10", {\
-          "packageLocation": "./.yarn/cache/@cypress-request-npm-2.88.10-44c588c8fc-69c3e3b332.zip/node_modules/@cypress/request/",\
+      ["@emotion/hash", [\
+        ["npm:0.8.0", {\
+          "packageLocation": "./.yarn/cache/@emotion-hash-npm-0.8.0-0104f4bbf3-4b35d88a97.zip/node_modules/@emotion/hash/",\
           "packageDependencies": [\
-            ["@cypress/request", "npm:2.88.10"],\
-            ["aws-sign2", "npm:0.7.0"],\
-            ["aws4", "npm:1.11.0"],\
-            ["caseless", "npm:0.12.0"],\
-            ["combined-stream", "npm:1.0.8"],\
-            ["extend", "npm:3.0.2"],\
-            ["forever-agent", "npm:0.6.1"],\
-            ["form-data", "npm:2.3.3"],\
-            ["http-signature", "npm:1.3.6"],\
-            ["is-typedarray", "npm:1.0.0"],\
-            ["isstream", "npm:0.1.2"],\
-            ["json-stringify-safe", "npm:5.0.1"],\
-            ["mime-types", "npm:2.1.35"],\
-            ["performance-now", "npm:2.1.0"],\
-            ["qs", "npm:6.5.3"],\
-            ["safe-buffer", "npm:5.2.1"],\
-            ["tough-cookie", "npm:2.5.0"],\
-            ["tunnel-agent", "npm:0.6.0"],\
-            ["uuid", "npm:8.3.2"]\
+            ["@emotion/hash", "npm:0.8.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@cypress/xvfb", [\
-        ["npm:1.2.4", {\
-          "packageLocation": "./.yarn/cache/@cypress-xvfb-npm-1.2.4-396a3691f7-7bdcdaeb1b.zip/node_modules/@cypress/xvfb/",\
+      ["@esbuild/android-arm", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-android-arm-npm-0.18.20-a30c33e9ed/node_modules/@esbuild/android-arm/",\
           "packageDependencies": [\
-            ["@cypress/xvfb", "npm:1.2.4"],\
-            ["debug", "virtual:396a3691f7b25accf085fe2fff1f56eb7540eff3f2e928a7572ca1de9b831ff8f22136404f236aaed35d90369918dfc34392844d0f822a310563f34746dfb015#npm:3.2.7"],\
-            ["lodash.once", "npm:4.1.1"]\
+            ["@esbuild/android-arm", "npm:0.18.20"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@emotion/hash", [\
-        ["npm:0.8.0", {\
-          "packageLocation": "./.yarn/cache/@emotion-hash-npm-0.8.0-0104f4bbf3-4b35d88a97.zip/node_modules/@emotion/hash/",\
+      ["@esbuild/android-arm64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-android-arm64-npm-0.18.20-fd4fb45ae7/node_modules/@esbuild/android-arm64/",\
           "packageDependencies": [\
-            ["@emotion/hash", "npm:0.8.0"]\
+            ["@esbuild/android-arm64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/android-x64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-android-x64-npm-0.18.20-22b610e3f4/node_modules/@esbuild/android-x64/",\
+          "packageDependencies": [\
+            ["@esbuild/android-x64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/darwin-arm64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-darwin-arm64-npm-0.18.20-00b3504077/node_modules/@esbuild/darwin-arm64/",\
+          "packageDependencies": [\
+            ["@esbuild/darwin-arm64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/darwin-x64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b/node_modules/@esbuild/darwin-x64/",\
+          "packageDependencies": [\
+            ["@esbuild/darwin-x64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/freebsd-arm64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-arm64-npm-0.18.20-797e8c8987/node_modules/@esbuild/freebsd-arm64/",\
+          "packageDependencies": [\
+            ["@esbuild/freebsd-arm64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/freebsd-x64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-x64-npm-0.18.20-f7563ff3dd/node_modules/@esbuild/freebsd-x64/",\
+          "packageDependencies": [\
+            ["@esbuild/freebsd-x64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-arm", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm-npm-0.18.20-06b400b09e/node_modules/@esbuild/linux-arm/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-arm", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-arm64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe/node_modules/@esbuild/linux-arm64/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-arm64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-ia32", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-ia32-npm-0.18.20-2f5a035f9e/node_modules/@esbuild/linux-ia32/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-ia32", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-loong64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-loong64-npm-0.18.20-e91b93ee90/node_modules/@esbuild/linux-loong64/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-loong64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-mips64el", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-mips64el-npm-0.18.20-a5e9429f2a/node_modules/@esbuild/linux-mips64el/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-mips64el", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-ppc64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-ppc64-npm-0.18.20-218f398134/node_modules/@esbuild/linux-ppc64/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-ppc64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-riscv64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-riscv64-npm-0.18.20-6a2972f753/node_modules/@esbuild/linux-riscv64/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-riscv64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-s390x", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-s390x-npm-0.18.20-ff9d596142/node_modules/@esbuild/linux-s390x/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-s390x", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/linux-x64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-linux-x64-npm-0.18.20-de8e99b449/node_modules/@esbuild/linux-x64/",\
+          "packageDependencies": [\
+            ["@esbuild/linux-x64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/netbsd-x64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-netbsd-x64-npm-0.18.20-39b460150f/node_modules/@esbuild/netbsd-x64/",\
+          "packageDependencies": [\
+            ["@esbuild/netbsd-x64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/openbsd-x64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-openbsd-x64-npm-0.18.20-90ab921595/node_modules/@esbuild/openbsd-x64/",\
+          "packageDependencies": [\
+            ["@esbuild/openbsd-x64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/sunos-x64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-sunos-x64-npm-0.18.20-d18b46b343/node_modules/@esbuild/sunos-x64/",\
+          "packageDependencies": [\
+            ["@esbuild/sunos-x64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/win32-arm64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3/node_modules/@esbuild/win32-arm64/",\
+          "packageDependencies": [\
+            ["@esbuild/win32-arm64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/win32-ia32", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-win32-ia32-npm-0.18.20-d7ee926338/node_modules/@esbuild/win32-ia32/",\
+          "packageDependencies": [\
+            ["@esbuild/win32-ia32", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@esbuild/win32-x64", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda/node_modules/@esbuild/win32-x64/",\
+          "packageDependencies": [\
+            ["@esbuild/win32-x64", "npm:0.18.20"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@eslint-community/eslint-utils", [\
+        ["npm:4.4.0", {\
+          "packageLocation": "./.yarn/cache/@eslint-community-eslint-utils-npm-4.4.0-d1791bd5a3-cdfe3ae42b.zip/node_modules/@eslint-community/eslint-utils/",\
+          "packageDependencies": [\
+            ["@eslint-community/eslint-utils", "npm:4.4.0"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0", {\
+          "packageLocation": "./.yarn/__virtual__/@eslint-community-eslint-utils-virtual-1c7da85a1a/0/cache/@eslint-community-eslint-utils-npm-4.4.0-d1791bd5a3-cdfe3ae42b.zip/node_modules/@eslint-community/eslint-utils/",\
+          "packageDependencies": [\
+            ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\
+            ["@types/eslint", null],\
+            ["eslint", "npm:8.57.0"],\
+            ["eslint-visitor-keys", "npm:3.3.0"]\
+          ],\
+          "packagePeers": [\
+            "@types/eslint",\
+            "eslint"\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@eslint-community/regexpp", [\
+        ["npm:4.10.0", {\
+          "packageLocation": "./.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip/node_modules/@eslint-community/regexpp/",\
+          "packageDependencies": [\
+            ["@eslint-community/regexpp", "npm:4.10.0"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:4.8.0", {\
+          "packageLocation": "./.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip/node_modules/@eslint-community/regexpp/",\
+          "packageDependencies": [\
+            ["@eslint-community/regexpp", "npm:4.8.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@eslint/eslintrc", [\
-        ["npm:1.3.2", {\
-          "packageLocation": "./.yarn/cache/@eslint-eslintrc-npm-1.3.2-fd8de37609-2074dca47d.zip/node_modules/@eslint/eslintrc/",\
+        ["npm:2.1.4", {\
+          "packageLocation": "./.yarn/cache/@eslint-eslintrc-npm-2.1.4-1ff4b5f908-10957c7592.zip/node_modules/@eslint/eslintrc/",\
           "packageDependencies": [\
-            ["@eslint/eslintrc", "npm:1.3.2"],\
+            ["@eslint/eslintrc", "npm:2.1.4"],\
             ["ajv", "npm:6.12.6"],\
             ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\
-            ["espree", "npm:9.4.0"],\
-            ["globals", "npm:13.15.0"],\
+            ["espree", "npm:9.6.1"],\
+            ["globals", "npm:13.19.0"],\
             ["ignore", "npm:5.2.0"],\
             ["import-fresh", "npm:3.3.0"],\
             ["js-yaml", "npm:4.1.0"],\
@@ -279,99 +518,189 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@faker-js/faker", [\
-        ["npm:7.5.0", {\
-          "packageLocation": "./.yarn/cache/@faker-js-faker-npm-7.5.0-1dcb36d85a-6f2c48a801.zip/node_modules/@faker-js/faker/",\
+      ["@eslint/js", [\
+        ["npm:8.57.0", {\
+          "packageLocation": "./.yarn/cache/@eslint-js-npm-8.57.0-00ead3710a-315dc65b0e.zip/node_modules/@eslint/js/",\
           "packageDependencies": [\
-            ["@faker-js/faker", "npm:7.5.0"]\
+            ["@eslint/js", "npm:8.57.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@fullcalendar/bootstrap5", [\
-        ["npm:5.11.3", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-bootstrap5-npm-5.11.3-3e86f39d7d-a63a500d72.zip/node_modules/@fullcalendar/bootstrap5/",\
+      ["@floating-ui/core", [\
+        ["npm:1.4.1", {\
+          "packageLocation": "./.yarn/cache/@floating-ui-core-npm-1.4.1-fe89c45d92-be4ab864fe.zip/node_modules/@floating-ui/core/",\
           "packageDependencies": [\
-            ["@fullcalendar/bootstrap5", "npm:5.11.3"],\
-            ["@fullcalendar/common", "npm:5.11.3"],\
-            ["tslib", "npm:2.4.0"]\
+            ["@floating-ui/core", "npm:1.4.1"],\
+            ["@floating-ui/utils", "npm:0.1.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@fullcalendar/common", [\
-        ["npm:5.11.3", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-common-npm-5.11.3-6268994b76-be4b365dca.zip/node_modules/@fullcalendar/common/",\
+      ["@floating-ui/dom", [\
+        ["npm:1.5.2", {\
+          "packageLocation": "./.yarn/cache/@floating-ui-dom-npm-1.5.2-f1b8ca0c30-3c71eed50b.zip/node_modules/@floating-ui/dom/",\
           "packageDependencies": [\
-            ["@fullcalendar/common", "npm:5.11.3"],\
-            ["tslib", "npm:2.4.0"]\
+            ["@floating-ui/dom", "npm:1.5.2"],\
+            ["@floating-ui/core", "npm:1.4.1"],\
+            ["@floating-ui/utils", "npm:0.1.2"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@floating-ui/utils", [\
+        ["npm:0.1.2", {\
+          "packageLocation": "./.yarn/cache/@floating-ui-utils-npm-0.1.2-22eefe56f0-3e29fd3c69.zip/node_modules/@floating-ui/utils/",\
+          "packageDependencies": [\
+            ["@floating-ui/utils", "npm:0.1.2"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@fullcalendar/bootstrap5", [\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip/node_modules/@fullcalendar/bootstrap5/",\
+          "packageDependencies": [\
+            ["@fullcalendar/bootstrap5", "npm:6.1.11"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\
+          "packageLocation": "./.yarn/__virtual__/@fullcalendar-bootstrap5-virtual-50942c1c6f/0/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip/node_modules/@fullcalendar/bootstrap5/",\
+          "packageDependencies": [\
+            ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@types/fullcalendar__core", null]\
+          ],\
+          "packagePeers": [\
+            "@fullcalendar/core",\
+            "@types/fullcalendar__core"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@fullcalendar/core", [\
-        ["npm:5.11.3", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-core-npm-5.11.3-ed98a1ea9f-2774d0fa18.zip/node_modules/@fullcalendar/core/",\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-core-npm-6.1.11-ae049c8ace-0078a6f96b.zip/node_modules/@fullcalendar/core/",\
           "packageDependencies": [\
-            ["@fullcalendar/core", "npm:5.11.3"],\
-            ["@fullcalendar/common", "npm:5.11.3"],\
-            ["preact", "npm:10.7.2"],\
-            ["tslib", "npm:2.4.0"]\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["preact", "npm:10.12.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@fullcalendar/daygrid", [\
-        ["npm:5.11.3", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-daygrid-npm-5.11.3-b387dff934-426b53c5bb.zip/node_modules/@fullcalendar/daygrid/",\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip/node_modules/@fullcalendar/daygrid/",\
           "packageDependencies": [\
-            ["@fullcalendar/daygrid", "npm:5.11.3"],\
-            ["@fullcalendar/common", "npm:5.11.3"],\
-            ["tslib", "npm:2.4.0"]\
+            ["@fullcalendar/daygrid", "npm:6.1.11"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\
+          "packageLocation": "./.yarn/__virtual__/@fullcalendar-daygrid-virtual-b91d1ffe14/0/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip/node_modules/@fullcalendar/daygrid/",\
+          "packageDependencies": [\
+            ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@types/fullcalendar__core", null]\
+          ],\
+          "packagePeers": [\
+            "@fullcalendar/core",\
+            "@types/fullcalendar__core"\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@fullcalendar/icalendar", [\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip/node_modules/@fullcalendar/icalendar/",\
+          "packageDependencies": [\
+            ["@fullcalendar/icalendar", "npm:6.1.11"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\
+          "packageLocation": "./.yarn/__virtual__/@fullcalendar-icalendar-virtual-636a290006/0/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip/node_modules/@fullcalendar/icalendar/",\
+          "packageDependencies": [\
+            ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@types/fullcalendar__core", null],\
+            ["@types/ical.js", null],\
+            ["ical.js", "npm:1.5.0"]\
+          ],\
+          "packagePeers": [\
+            "@fullcalendar/core",\
+            "@types/fullcalendar__core",\
+            "@types/ical.js",\
+            "ical.js"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@fullcalendar/interaction", [\
-        ["npm:5.11.3", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-interaction-npm-5.11.3-15335cb10a-e8a1b49f2f.zip/node_modules/@fullcalendar/interaction/",\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip/node_modules/@fullcalendar/interaction/",\
           "packageDependencies": [\
-            ["@fullcalendar/interaction", "npm:5.11.3"],\
-            ["@fullcalendar/common", "npm:5.11.3"],\
-            ["tslib", "npm:2.4.0"]\
+            ["@fullcalendar/interaction", "npm:6.1.11"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\
+          "packageLocation": "./.yarn/__virtual__/@fullcalendar-interaction-virtual-3ebf8b0646/0/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip/node_modules/@fullcalendar/interaction/",\
+          "packageDependencies": [\
+            ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@types/fullcalendar__core", null]\
+          ],\
+          "packagePeers": [\
+            "@fullcalendar/core",\
+            "@types/fullcalendar__core"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@fullcalendar/list", [\
-        ["npm:5.11.3", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-list-npm-5.11.3-6174d0e1da-976da49b12.zip/node_modules/@fullcalendar/list/",\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip/node_modules/@fullcalendar/list/",\
           "packageDependencies": [\
-            ["@fullcalendar/list", "npm:5.11.3"],\
-            ["@fullcalendar/common", "npm:5.11.3"],\
-            ["tslib", "npm:2.4.0"]\
+            ["@fullcalendar/list", "npm:6.1.11"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\
+          "packageLocation": "./.yarn/__virtual__/@fullcalendar-list-virtual-1c555df506/0/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip/node_modules/@fullcalendar/list/",\
+          "packageDependencies": [\
+            ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@types/fullcalendar__core", null]\
+          ],\
+          "packagePeers": [\
+            "@fullcalendar/core",\
+            "@types/fullcalendar__core"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@fullcalendar/luxon2", [\
-        ["npm:5.11.3", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-luxon2-npm-5.11.3-ccde7500a8-7533018590.zip/node_modules/@fullcalendar/luxon2/",\
+      ["@fullcalendar/luxon3", [\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip/node_modules/@fullcalendar/luxon3/",\
           "packageDependencies": [\
-            ["@fullcalendar/luxon2", "npm:5.11.3"]\
+            ["@fullcalendar/luxon3", "npm:6.1.11"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.11.3", {\
-          "packageLocation": "./.yarn/__virtual__/@fullcalendar-luxon2-virtual-efa9fdf749/0/cache/@fullcalendar-luxon2-npm-5.11.3-ccde7500a8-7533018590.zip/node_modules/@fullcalendar/luxon2/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\
+          "packageLocation": "./.yarn/__virtual__/@fullcalendar-luxon3-virtual-38643019c2/0/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip/node_modules/@fullcalendar/luxon3/",\
           "packageDependencies": [\
-            ["@fullcalendar/luxon2", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.11.3"],\
-            ["@fullcalendar/common", "npm:5.11.3"],\
+            ["@fullcalendar/luxon3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@types/fullcalendar__core", null],\
             ["@types/luxon", null],\
-            ["luxon", "npm:3.0.4"],\
-            ["tslib", "npm:2.4.0"]\
+            ["luxon", "npm:3.4.4"]\
           ],\
           "packagePeers": [\
+            "@fullcalendar/core",\
+            "@types/fullcalendar__core",\
             "@types/luxon",\
             "luxon"\
           ],\
@@ -379,35 +708,48 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@fullcalendar/timegrid", [\
-        ["npm:5.11.3", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-timegrid-npm-5.11.3-4075b09051-ce675eca7d.zip/node_modules/@fullcalendar/timegrid/",\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip/node_modules/@fullcalendar/timegrid/",\
           "packageDependencies": [\
-            ["@fullcalendar/timegrid", "npm:5.11.3"],\
-            ["@fullcalendar/common", "npm:5.11.3"],\
-            ["@fullcalendar/daygrid", "npm:5.11.3"],\
-            ["tslib", "npm:2.4.0"]\
+            ["@fullcalendar/timegrid", "npm:6.1.11"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\
+          "packageLocation": "./.yarn/__virtual__/@fullcalendar-timegrid-virtual-5e951d78a6/0/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip/node_modules/@fullcalendar/timegrid/",\
+          "packageDependencies": [\
+            ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@types/fullcalendar__core", null]\
+          ],\
+          "packagePeers": [\
+            "@fullcalendar/core",\
+            "@types/fullcalendar__core"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@fullcalendar/vue3", [\
-        ["npm:5.11.2", {\
-          "packageLocation": "./.yarn/cache/@fullcalendar-vue3-npm-5.11.2-77392161df-779f4d8d85.zip/node_modules/@fullcalendar/vue3/",\
+        ["npm:6.1.11", {\
+          "packageLocation": "./.yarn/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip/node_modules/@fullcalendar/vue3/",\
           "packageDependencies": [\
-            ["@fullcalendar/vue3", "npm:5.11.2"]\
+            ["@fullcalendar/vue3", "npm:6.1.11"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.11.2", {\
-          "packageLocation": "./.yarn/__virtual__/@fullcalendar-vue3-virtual-d75f6c58de/0/cache/@fullcalendar-vue3-npm-5.11.2-77392161df-779f4d8d85.zip/node_modules/@fullcalendar/vue3/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11", {\
+          "packageLocation": "./.yarn/__virtual__/@fullcalendar-vue3-virtual-cb317bc2d1/0/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip/node_modules/@fullcalendar/vue3/",\
           "packageDependencies": [\
-            ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.11.2"],\
-            ["@fullcalendar/core", "npm:5.11.3"],\
+            ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@types/fullcalendar__core", null],\
             ["@types/vue", null],\
-            ["tslib", "npm:2.4.0"],\
-            ["vue", "npm:3.2.40"]\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
+            "@fullcalendar/core",\
+            "@types/fullcalendar__core",\
             "@types/vue",\
             "vue"\
           ],\
@@ -424,36 +766,27 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@html-validate/stylish", [\
-        ["npm:3.0.0", {\
-          "packageLocation": "./.yarn/cache/@html-validate-stylish-npm-3.0.0-6d9dccafda-818efd25ac.zip/node_modules/@html-validate/stylish/",\
+        ["npm:4.1.0", {\
+          "packageLocation": "./.yarn/cache/@html-validate-stylish-npm-4.1.0-aba0cf2d6c-4af90db4f9.zip/node_modules/@html-validate/stylish/",\
           "packageDependencies": [\
-            ["@html-validate/stylish", "npm:3.0.0"],\
+            ["@html-validate/stylish", "npm:4.1.0"],\
             ["kleur", "npm:4.1.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@humanwhocodes/config-array", [\
-        ["npm:0.10.7", {\
-          "packageLocation": "./.yarn/cache/@humanwhocodes-config-array-npm-0.10.7-81c0f4b5e6-009d64be8d.zip/node_modules/@humanwhocodes/config-array/",\
+        ["npm:0.11.14", {\
+          "packageLocation": "./.yarn/cache/@humanwhocodes-config-array-npm-0.11.14-94a02fcc87-861ccce9ea.zip/node_modules/@humanwhocodes/config-array/",\
           "packageDependencies": [\
-            ["@humanwhocodes/config-array", "npm:0.10.7"],\
-            ["@humanwhocodes/object-schema", "npm:1.2.1"],\
+            ["@humanwhocodes/config-array", "npm:0.11.14"],\
+            ["@humanwhocodes/object-schema", "npm:2.0.2"],\
             ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\
             ["minimatch", "npm:3.1.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@humanwhocodes/gitignore-to-minimatch", [\
-        ["npm:1.0.2", {\
-          "packageLocation": "./.yarn/cache/@humanwhocodes-gitignore-to-minimatch-npm-1.0.2-247ae8a408-aba5c40c9e.zip/node_modules/@humanwhocodes/gitignore-to-minimatch/",\
-          "packageDependencies": [\
-            ["@humanwhocodes/gitignore-to-minimatch", "npm:1.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["@humanwhocodes/module-importer", [\
         ["npm:1.0.1", {\
           "packageLocation": "./.yarn/cache/@humanwhocodes-module-importer-npm-1.0.1-9d07ed2e4a-0fd22007db.zip/node_modules/@humanwhocodes/module-importer/",\
@@ -464,10 +797,34 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@humanwhocodes/object-schema", [\
-        ["npm:1.2.1", {\
-          "packageLocation": "./.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip/node_modules/@humanwhocodes/object-schema/",\
+        ["npm:2.0.2", {\
+          "packageLocation": "./.yarn/cache/@humanwhocodes-object-schema-npm-2.0.2-77b42018f9-2fc1150336.zip/node_modules/@humanwhocodes/object-schema/",\
+          "packageDependencies": [\
+            ["@humanwhocodes/object-schema", "npm:2.0.2"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@isaacs/cliui", [\
+        ["npm:8.0.2", {\
+          "packageLocation": "./.yarn/cache/@isaacs-cliui-npm-8.0.2-f4364666d5-4a473b9b32.zip/node_modules/@isaacs/cliui/",\
           "packageDependencies": [\
-            ["@humanwhocodes/object-schema", "npm:1.2.1"]\
+            ["@isaacs/cliui", "npm:8.0.2"],\
+            ["string-width", "npm:5.1.2"],\
+            ["string-width-cjs", [\
+              "string-width",\
+              "npm:4.2.3"\
+            ]],\
+            ["strip-ansi", "npm:7.0.1"],\
+            ["strip-ansi-cjs", [\
+              "strip-ansi",\
+              "npm:6.0.1"\
+            ]],\
+            ["wrap-ansi", "npm:8.1.0"],\
+            ["wrap-ansi-cjs", [\
+              "wrap-ansi",\
+              "npm:7.0.0"\
+            ]]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -497,6 +854,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@jridgewell/sourcemap-codec", "npm:1.4.14"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.4.15", {\
+          "packageLocation": "./.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip/node_modules/@jridgewell/sourcemap-codec/",\
+          "packageDependencies": [\
+            ["@jridgewell/sourcemap-codec", "npm:1.4.15"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@jridgewell/trace-mapping", [\
@@ -545,6 +909,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@lmdb/lmdb-darwin-arm64", "npm:2.5.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.8.5", {\
+          "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-darwin-arm64-npm-2.8.5-a9ab00615c/node_modules/@lmdb/lmdb-darwin-arm64/",\
+          "packageDependencies": [\
+            ["@lmdb/lmdb-darwin-arm64", "npm:2.8.5"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@lmdb/lmdb-darwin-x64", [\
@@ -554,6 +925,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@lmdb/lmdb-darwin-x64", "npm:2.5.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.8.5", {\
+          "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-darwin-x64-npm-2.8.5-080b8c9329/node_modules/@lmdb/lmdb-darwin-x64/",\
+          "packageDependencies": [\
+            ["@lmdb/lmdb-darwin-x64", "npm:2.8.5"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@lmdb/lmdb-linux-arm", [\
@@ -563,6 +941,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@lmdb/lmdb-linux-arm", "npm:2.5.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.8.5", {\
+          "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-linux-arm-npm-2.8.5-081004004c/node_modules/@lmdb/lmdb-linux-arm/",\
+          "packageDependencies": [\
+            ["@lmdb/lmdb-linux-arm", "npm:2.8.5"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@lmdb/lmdb-linux-arm64", [\
@@ -572,6 +957,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@lmdb/lmdb-linux-arm64", "npm:2.5.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.8.5", {\
+          "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-linux-arm64-npm-2.8.5-9dfda9f24f/node_modules/@lmdb/lmdb-linux-arm64/",\
+          "packageDependencies": [\
+            ["@lmdb/lmdb-linux-arm64", "npm:2.8.5"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@lmdb/lmdb-linux-x64", [\
@@ -581,6 +973,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@lmdb/lmdb-linux-x64", "npm:2.5.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.8.5", {\
+          "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-linux-x64-npm-2.8.5-0f668ba9a7/node_modules/@lmdb/lmdb-linux-x64/",\
+          "packageDependencies": [\
+            ["@lmdb/lmdb-linux-x64", "npm:2.8.5"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@lmdb/lmdb-win32-x64", [\
@@ -590,6 +989,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@lmdb/lmdb-win32-x64", "npm:2.5.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.8.5", {\
+          "packageLocation": "./.yarn/unplugged/@lmdb-lmdb-win32-x64-npm-2.8.5-3702de4edb/node_modules/@lmdb/lmdb-win32-x64/",\
+          "packageDependencies": [\
+            ["@lmdb/lmdb-win32-x64", "npm:2.8.5"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@mischnic/json-sourcemap", [\
@@ -611,6 +1017,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@msgpackr-extract/msgpackr-extract-darwin-arm64", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:3.0.2", {\
+          "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4/node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64/",\
+          "packageDependencies": [\
+            ["@msgpackr-extract/msgpackr-extract-darwin-arm64", "npm:3.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@msgpackr-extract/msgpackr-extract-darwin-x64", [\
@@ -620,6 +1033,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@msgpackr-extract/msgpackr-extract-darwin-x64", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:3.0.2", {\
+          "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a/node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64/",\
+          "packageDependencies": [\
+            ["@msgpackr-extract/msgpackr-extract-darwin-x64", "npm:3.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@msgpackr-extract/msgpackr-extract-linux-arm", [\
@@ -629,6 +1049,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@msgpackr-extract/msgpackr-extract-linux-arm", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:3.0.2", {\
+          "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-linux-arm-npm-3.0.2-808a652e0b/node_modules/@msgpackr-extract/msgpackr-extract-linux-arm/",\
+          "packageDependencies": [\
+            ["@msgpackr-extract/msgpackr-extract-linux-arm", "npm:3.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@msgpackr-extract/msgpackr-extract-linux-arm64", [\
@@ -638,6 +1065,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@msgpackr-extract/msgpackr-extract-linux-arm64", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:3.0.2", {\
+          "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-linux-arm64-npm-3.0.2-cfbf50d4c6/node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64/",\
+          "packageDependencies": [\
+            ["@msgpackr-extract/msgpackr-extract-linux-arm64", "npm:3.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@msgpackr-extract/msgpackr-extract-linux-x64", [\
@@ -647,6 +1081,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@msgpackr-extract/msgpackr-extract-linux-x64", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:3.0.2", {\
+          "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-linux-x64-npm-3.0.2-262fca760d/node_modules/@msgpackr-extract/msgpackr-extract-linux-x64/",\
+          "packageDependencies": [\
+            ["@msgpackr-extract/msgpackr-extract-linux-x64", "npm:3.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@msgpackr-extract/msgpackr-extract-win32-x64", [\
@@ -656,6 +1097,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@msgpackr-extract/msgpackr-extract-win32-x64", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:3.0.2", {\
+          "packageLocation": "./.yarn/unplugged/@msgpackr-extract-msgpackr-extract-win32-x64-npm-3.0.2-c627beab89/node_modules/@msgpackr-extract/msgpackr-extract-win32-x64/",\
+          "packageDependencies": [\
+            ["@msgpackr-extract/msgpackr-extract-win32-x64", "npm:3.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@nodelib/fs.scandir", [\
@@ -712,44 +1160,45 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/bundler-default", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-bundler-default-npm-2.7.0-dfa79458ce-0efb78be2e.zip/node_modules/@parcel/bundler-default/",\
-          "packageDependencies": [\
-            ["@parcel/bundler-default", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/hash", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-bundler-default-npm-2.12.0-9ba57d919c-f211a76f55.zip/node_modules/@parcel/bundler-default/",\
+          "packageDependencies": [\
+            ["@parcel/bundler-default", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/graph", "npm:3.2.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/cache", [\
-        ["npm:2.6.2", {\
-          "packageLocation": "./.yarn/cache/@parcel-cache-npm-2.6.2-7c97030a45-e7b540fe10.zip/node_modules/@parcel/cache/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip/node_modules/@parcel/cache/",\
           "packageDependencies": [\
-            ["@parcel/cache", "npm:2.6.2"]\
+            ["@parcel/cache", "npm:2.12.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-cache-npm-2.7.0-186e1a509a-7aa6a6883b.zip/node_modules/@parcel/cache/",\
+        ["npm:2.6.2", {\
+          "packageLocation": "./.yarn/cache/@parcel-cache-npm-2.6.2-7c97030a45-e7b540fe10.zip/node_modules/@parcel/cache/",\
           "packageDependencies": [\
-            ["@parcel/cache", "npm:2.7.0"]\
+            ["@parcel/cache", "npm:2.6.2"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-2c42297436/0/cache/@parcel-cache-npm-2.7.0-186e1a509a-7aa6a6883b.zip/node_modules/@parcel/cache/",\
-          "packageDependencies": [\
-            ["@parcel/cache", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@parcel/fs", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-a2e9499dbb/0/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip/node_modules/@parcel/cache/",\
+          "packageDependencies": [\
+            ["@parcel/cache", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["@types/parcel__core", null],\
-            ["lmdb", "npm:2.5.2"]\
+            ["lmdb", "npm:2.8.5"]\
           ],\
           "packagePeers": [\
             "@parcel/core",\
@@ -773,16 +1222,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-c8839c0c17/0/cache/@parcel-cache-npm-2.7.0-186e1a509a-7aa6a6883b.zip/node_modules/@parcel/cache/",\
+        ["virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-cache-virtual-6f5cc88243/0/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip/node_modules/@parcel/cache/",\
           "packageDependencies": [\
-            ["@parcel/cache", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
+            ["@parcel/cache", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
             ["@parcel/core", "npm:2.6.2"],\
-            ["@parcel/fs", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["@types/parcel__core", null],\
-            ["lmdb", "npm:2.5.2"]\
+            ["lmdb", "npm:2.8.5"]\
           ],\
           "packagePeers": [\
             "@types/parcel__core"\
@@ -791,76 +1240,77 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/codeframe", [\
-        ["npm:2.6.2", {\
-          "packageLocation": "./.yarn/cache/@parcel-codeframe-npm-2.6.2-39f0ef1504-3253f42b90.zip/node_modules/@parcel/codeframe/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-codeframe-npm-2.12.0-aa8027940e-265c4d7ebe.zip/node_modules/@parcel/codeframe/",\
           "packageDependencies": [\
-            ["@parcel/codeframe", "npm:2.6.2"],\
+            ["@parcel/codeframe", "npm:2.12.0"],\
             ["chalk", "npm:4.1.2"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-codeframe-npm-2.7.0-e522fa3c25-169f305518.zip/node_modules/@parcel/codeframe/",\
+        ["npm:2.6.2", {\
+          "packageLocation": "./.yarn/cache/@parcel-codeframe-npm-2.6.2-39f0ef1504-3253f42b90.zip/node_modules/@parcel/codeframe/",\
           "packageDependencies": [\
-            ["@parcel/codeframe", "npm:2.7.0"],\
+            ["@parcel/codeframe", "npm:2.6.2"],\
             ["chalk", "npm:4.1.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/compressor-raw", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-compressor-raw-npm-2.7.0-bd243714a1-6b9c009fe4.zip/node_modules/@parcel/compressor-raw/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-compressor-raw-npm-2.12.0-19f313c172-16c56704f3.zip/node_modules/@parcel/compressor-raw/",\
           "packageDependencies": [\
-            ["@parcel/compressor-raw", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"]\
+            ["@parcel/compressor-raw", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/config-default", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-config-default-npm-2.7.0-e780ef54db-165d4ec089.zip/node_modules/@parcel/config-default/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip/node_modules/@parcel/config-default/",\
           "packageDependencies": [\
-            ["@parcel/config-default", "npm:2.7.0"]\
+            ["@parcel/config-default", "npm:2.12.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:bcb488f8b8250e5c85d3772e5fa550abe484ff9840e593701a7579e0abb144159115a0fa5f3ac34f44ce442a40199ab4adf60b37365fe9f111ed0533e0f21c0e#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-config-default-virtual-0f7f791242/0/cache/@parcel-config-default-npm-2.7.0-e780ef54db-165d4ec089.zip/node_modules/@parcel/config-default/",\
-          "packageDependencies": [\
-            ["@parcel/config-default", "virtual:bcb488f8b8250e5c85d3772e5fa550abe484ff9840e593701a7579e0abb144159115a0fa5f3ac34f44ce442a40199ab4adf60b37365fe9f111ed0533e0f21c0e#npm:2.7.0"],\
-            ["@parcel/bundler-default", "npm:2.7.0"],\
-            ["@parcel/compressor-raw", "npm:2.7.0"],\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@parcel/namer-default", "npm:2.7.0"],\
-            ["@parcel/optimizer-css", "npm:2.7.0"],\
-            ["@parcel/optimizer-htmlnano", "npm:2.7.0"],\
-            ["@parcel/optimizer-image", "npm:2.7.0"],\
-            ["@parcel/optimizer-svgo", "npm:2.7.0"],\
-            ["@parcel/optimizer-terser", "npm:2.7.0"],\
-            ["@parcel/packager-css", "npm:2.7.0"],\
-            ["@parcel/packager-html", "npm:2.7.0"],\
-            ["@parcel/packager-js", "npm:2.7.0"],\
-            ["@parcel/packager-raw", "npm:2.7.0"],\
-            ["@parcel/packager-svg", "npm:2.7.0"],\
-            ["@parcel/reporter-dev-server", "npm:2.7.0"],\
-            ["@parcel/resolver-default", "npm:2.7.0"],\
-            ["@parcel/runtime-browser-hmr", "npm:2.7.0"],\
-            ["@parcel/runtime-js", "npm:2.7.0"],\
-            ["@parcel/runtime-react-refresh", "npm:2.7.0"],\
-            ["@parcel/runtime-service-worker", "npm:2.7.0"],\
-            ["@parcel/transformer-babel", "npm:2.7.0"],\
-            ["@parcel/transformer-css", "npm:2.7.0"],\
-            ["@parcel/transformer-html", "npm:2.7.0"],\
-            ["@parcel/transformer-image", "virtual:0f7f7912427957d1cc194056771435c115b507814a356101fcd5f30da5bfd00fdec7d9cafac2677130129fbed9f1e794c894a43171645772ddd913a9c5fe12e6#npm:2.7.0"],\
-            ["@parcel/transformer-js", "virtual:0f7f7912427957d1cc194056771435c115b507814a356101fcd5f30da5bfd00fdec7d9cafac2677130129fbed9f1e794c894a43171645772ddd913a9c5fe12e6#npm:2.7.0"],\
-            ["@parcel/transformer-json", "npm:2.7.0"],\
-            ["@parcel/transformer-postcss", "npm:2.7.0"],\
-            ["@parcel/transformer-posthtml", "npm:2.7.0"],\
-            ["@parcel/transformer-raw", "npm:2.7.0"],\
-            ["@parcel/transformer-react-refresh-wrap", "npm:2.7.0"],\
-            ["@parcel/transformer-svg", "npm:2.7.0"],\
+        ["virtual:fdd74b573cf769bcde15fb47c39fbe0d73f59838182900fd59d3d43b2214ea01b1d45084fb49d0c192fc3e8a49adea5782afcb7fe14e09c63bedaf09f4939e35#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-config-default-virtual-284acdc258/0/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip/node_modules/@parcel/config-default/",\
+          "packageDependencies": [\
+            ["@parcel/config-default", "virtual:fdd74b573cf769bcde15fb47c39fbe0d73f59838182900fd59d3d43b2214ea01b1d45084fb49d0c192fc3e8a49adea5782afcb7fe14e09c63bedaf09f4939e35#npm:2.12.0"],\
+            ["@parcel/bundler-default", "npm:2.12.0"],\
+            ["@parcel/compressor-raw", "npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/namer-default", "npm:2.12.0"],\
+            ["@parcel/optimizer-css", "npm:2.12.0"],\
+            ["@parcel/optimizer-htmlnano", "npm:2.12.0"],\
+            ["@parcel/optimizer-image", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\
+            ["@parcel/optimizer-svgo", "npm:2.12.0"],\
+            ["@parcel/optimizer-swc", "npm:2.12.0"],\
+            ["@parcel/packager-css", "npm:2.12.0"],\
+            ["@parcel/packager-html", "npm:2.12.0"],\
+            ["@parcel/packager-js", "npm:2.12.0"],\
+            ["@parcel/packager-raw", "npm:2.12.0"],\
+            ["@parcel/packager-svg", "npm:2.12.0"],\
+            ["@parcel/packager-wasm", "npm:2.12.0"],\
+            ["@parcel/reporter-dev-server", "npm:2.12.0"],\
+            ["@parcel/resolver-default", "npm:2.12.0"],\
+            ["@parcel/runtime-browser-hmr", "npm:2.12.0"],\
+            ["@parcel/runtime-js", "npm:2.12.0"],\
+            ["@parcel/runtime-react-refresh", "npm:2.12.0"],\
+            ["@parcel/runtime-service-worker", "npm:2.12.0"],\
+            ["@parcel/transformer-babel", "npm:2.12.0"],\
+            ["@parcel/transformer-css", "npm:2.12.0"],\
+            ["@parcel/transformer-html", "npm:2.12.0"],\
+            ["@parcel/transformer-image", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\
+            ["@parcel/transformer-js", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\
+            ["@parcel/transformer-json", "npm:2.12.0"],\
+            ["@parcel/transformer-postcss", "npm:2.12.0"],\
+            ["@parcel/transformer-posthtml", "npm:2.12.0"],\
+            ["@parcel/transformer-raw", "npm:2.12.0"],\
+            ["@parcel/transformer-react-refresh-wrap", "npm:2.12.0"],\
+            ["@parcel/transformer-svg", "npm:2.12.0"],\
             ["@types/parcel__core", null]\
           ],\
           "packagePeers": [\
@@ -871,6 +1321,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/core", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-core-npm-2.12.0-8f08b883d4-5bf6746308.zip/node_modules/@parcel/core/",\
+          "packageDependencies": [\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@mischnic/json-sourcemap", "npm:0.1.0"],\
+            ["@parcel/cache", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/events", "npm:2.12.0"],\
+            ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/graph", "npm:3.2.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/package-manager", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/profiler", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["abortcontroller-polyfill", "npm:1.7.3"],\
+            ["base-x", "npm:3.0.9"],\
+            ["browserslist", "npm:4.20.3"],\
+            ["clone", "npm:2.1.2"],\
+            ["dotenv", "npm:7.0.0"],\
+            ["dotenv-expand", "npm:5.1.0"],\
+            ["json5", "npm:2.2.1"],\
+            ["msgpackr", "npm:1.10.1"],\
+            ["nullthrows", "npm:1.1.1"],\
+            ["semver", "npm:7.5.4"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
         ["npm:2.6.2", {\
           "packageLocation": "./.yarn/cache/@parcel-core-npm-2.6.2-f04091cfa7-f550cbbd5e.zip/node_modules/@parcel/core/",\
           "packageDependencies": [\
@@ -901,143 +1383,22 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:5.7.1"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-core-npm-2.7.0-929a47eb0e-615903871f.zip/node_modules/@parcel/core/",\
-          "packageDependencies": [\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@mischnic/json-sourcemap", "npm:0.1.0"],\
-            ["@parcel/cache", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/events", "npm:2.7.0"],\
-            ["@parcel/fs", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/graph", "npm:2.7.0"],\
-            ["@parcel/hash", "npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/package-manager", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/workers", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["abortcontroller-polyfill", "npm:1.7.3"],\
-            ["base-x", "npm:3.0.9"],\
-            ["browserslist", "npm:4.20.3"],\
-            ["clone", "npm:2.1.2"],\
-            ["dotenv", "npm:7.0.0"],\
-            ["dotenv-expand", "npm:5.1.0"],\
-            ["json5", "npm:2.2.1"],\
-            ["msgpackr", "npm:1.6.0"],\
-            ["nullthrows", "npm:1.1.1"],\
-            ["semver", "npm:5.7.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/cache/@parcel-css-npm-1.13.1-1321cb5236-c2f4183b71.zip/node_modules/@parcel/css/",\
-          "packageDependencies": [\
-            ["@parcel/css", "npm:1.13.1"],\
-            ["@parcel/css-darwin-arm64", "npm:1.13.1"],\
-            ["@parcel/css-darwin-x64", "npm:1.13.1"],\
-            ["@parcel/css-linux-arm-gnueabihf", "npm:1.13.1"],\
-            ["@parcel/css-linux-arm64-gnu", "npm:1.13.1"],\
-            ["@parcel/css-linux-arm64-musl", "npm:1.13.1"],\
-            ["@parcel/css-linux-x64-gnu", "npm:1.13.1"],\
-            ["@parcel/css-linux-x64-musl", "npm:1.13.1"],\
-            ["@parcel/css-win32-x64-msvc", "npm:1.13.1"],\
-            ["detect-libc", "npm:1.0.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css-darwin-arm64", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-css-darwin-arm64-npm-1.13.1-dc4db97e9d/node_modules/@parcel/css-darwin-arm64/",\
-          "packageDependencies": [\
-            ["@parcel/css-darwin-arm64", "npm:1.13.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css-darwin-x64", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-css-darwin-x64-npm-1.13.1-734e2fbb2a/node_modules/@parcel/css-darwin-x64/",\
-          "packageDependencies": [\
-            ["@parcel/css-darwin-x64", "npm:1.13.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css-linux-arm-gnueabihf", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-css-linux-arm-gnueabihf-npm-1.13.1-ce16fb3582/node_modules/@parcel/css-linux-arm-gnueabihf/",\
-          "packageDependencies": [\
-            ["@parcel/css-linux-arm-gnueabihf", "npm:1.13.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css-linux-arm64-gnu", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-css-linux-arm64-gnu-npm-1.13.1-d097b3d36a/node_modules/@parcel/css-linux-arm64-gnu/",\
-          "packageDependencies": [\
-            ["@parcel/css-linux-arm64-gnu", "npm:1.13.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css-linux-arm64-musl", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-css-linux-arm64-musl-npm-1.13.1-17aca4bc5c/node_modules/@parcel/css-linux-arm64-musl/",\
-          "packageDependencies": [\
-            ["@parcel/css-linux-arm64-musl", "npm:1.13.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css-linux-x64-gnu", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-css-linux-x64-gnu-npm-1.13.1-05bca71ce8/node_modules/@parcel/css-linux-x64-gnu/",\
-          "packageDependencies": [\
-            ["@parcel/css-linux-x64-gnu", "npm:1.13.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css-linux-x64-musl", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-css-linux-x64-musl-npm-1.13.1-5f1190588a/node_modules/@parcel/css-linux-x64-musl/",\
-          "packageDependencies": [\
-            ["@parcel/css-linux-x64-musl", "npm:1.13.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@parcel/css-win32-x64-msvc", [\
-        ["npm:1.13.1", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-css-win32-x64-msvc-npm-1.13.1-6b3efa989f/node_modules/@parcel/css-win32-x64-msvc/",\
-          "packageDependencies": [\
-            ["@parcel/css-win32-x64-msvc", "npm:1.13.1"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/diagnostic", [\
-        ["npm:2.6.2", {\
-          "packageLocation": "./.yarn/cache/@parcel-diagnostic-npm-2.6.2-ad66c9d460-c20c7b12c4.zip/node_modules/@parcel/diagnostic/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-diagnostic-npm-2.12.0-6e89ddad28-a4b918c1a0.zip/node_modules/@parcel/diagnostic/",\
           "packageDependencies": [\
-            ["@parcel/diagnostic", "npm:2.6.2"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
             ["@mischnic/json-sourcemap", "npm:0.1.0"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-diagnostic-npm-2.7.0-ddb7ee3ca8-a41cc65cb1.zip/node_modules/@parcel/diagnostic/",\
+        ["npm:2.6.2", {\
+          "packageLocation": "./.yarn/cache/@parcel-diagnostic-npm-2.6.2-ad66c9d460-c20c7b12c4.zip/node_modules/@parcel/diagnostic/",\
           "packageDependencies": [\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
+            ["@parcel/diagnostic", "npm:2.6.2"],\
             ["@mischnic/json-sourcemap", "npm:0.1.0"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
@@ -1045,46 +1406,46 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/events", [\
-        ["npm:2.6.2", {\
-          "packageLocation": "./.yarn/cache/@parcel-events-npm-2.6.2-c1dc15633e-272898db0c.zip/node_modules/@parcel/events/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-events-npm-2.12.0-e6eff18c8c-136a8a2921.zip/node_modules/@parcel/events/",\
           "packageDependencies": [\
-            ["@parcel/events", "npm:2.6.2"]\
+            ["@parcel/events", "npm:2.12.0"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-events-npm-2.7.0-d85646e00d-9477cc8eef.zip/node_modules/@parcel/events/",\
+        ["npm:2.6.2", {\
+          "packageLocation": "./.yarn/cache/@parcel-events-npm-2.6.2-c1dc15633e-272898db0c.zip/node_modules/@parcel/events/",\
           "packageDependencies": [\
-            ["@parcel/events", "npm:2.7.0"]\
+            ["@parcel/events", "npm:2.6.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/fs", [\
-        ["npm:2.6.2", {\
-          "packageLocation": "./.yarn/cache/@parcel-fs-npm-2.6.2-1670f601e3-b5e324d93b.zip/node_modules/@parcel/fs/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip/node_modules/@parcel/fs/",\
           "packageDependencies": [\
-            ["@parcel/fs", "npm:2.6.2"]\
+            ["@parcel/fs", "npm:2.12.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-fs-npm-2.7.0-11bf4f60b3-176c21f4a9.zip/node_modules/@parcel/fs/",\
+        ["npm:2.6.2", {\
+          "packageLocation": "./.yarn/cache/@parcel-fs-npm-2.6.2-1670f601e3-b5e324d93b.zip/node_modules/@parcel/fs/",\
           "packageDependencies": [\
-            ["@parcel/fs", "npm:2.7.0"]\
+            ["@parcel/fs", "npm:2.6.2"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-68f800307d/0/cache/@parcel-fs-npm-2.7.0-11bf4f60b3-176c21f4a9.zip/node_modules/@parcel/fs/",\
-          "packageDependencies": [\
-            ["@parcel/fs", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@parcel/fs-search", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/watcher", "npm:2.0.5"],\
-            ["@parcel/workers", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
+        ["virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-762e5c5add/0/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip/node_modules/@parcel/fs/",\
+          "packageDependencies": [\
+            ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/watcher", "npm:2.0.7"],\
+            ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
             ["@types/parcel__core", null]\
           ],\
           "packagePeers": [\
@@ -1110,16 +1471,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-a098db55e1/0/cache/@parcel-fs-npm-2.7.0-11bf4f60b3-176c21f4a9.zip/node_modules/@parcel/fs/",\
+        ["virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-fs-virtual-ae7dde1116/0/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip/node_modules/@parcel/fs/",\
           "packageDependencies": [\
-            ["@parcel/fs", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
+            ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
             ["@parcel/core", "npm:2.6.2"],\
-            ["@parcel/fs-search", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/watcher", "npm:2.0.5"],\
-            ["@parcel/workers", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/watcher", "npm:2.0.7"],\
+            ["@parcel/workers", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
             ["@types/parcel__core", null]\
           ],\
           "packagePeers": [\
@@ -1136,14 +1497,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["detect-libc", "npm:1.0.3"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-fs-search-npm-2.7.0-1e65507e08/node_modules/@parcel/fs-search/",\
-          "packageDependencies": [\
-            ["@parcel/fs-search", "npm:2.7.0"],\
-            ["detect-libc", "npm:1.0.3"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/graph", [\
@@ -1156,11 +1509,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-graph-npm-2.7.0-4fa217e6e2-55db3972df.zip/node_modules/@parcel/graph/",\
+        ["npm:3.2.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-graph-npm-3.2.0-92821d4289-b4d31624fc.zip/node_modules/@parcel/graph/",\
           "packageDependencies": [\
-            ["@parcel/graph", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/graph", "npm:3.2.0"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
@@ -1175,18 +1527,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["xxhash-wasm", "npm:0.4.2"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-hash-npm-2.7.0-d360c9a7bc/node_modules/@parcel/hash/",\
-          "packageDependencies": [\
-            ["@parcel/hash", "npm:2.7.0"],\
-            ["detect-libc", "npm:1.0.3"],\
-            ["xxhash-wasm", "npm:0.4.2"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/logger", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-logger-npm-2.12.0-7d2f85a906-be3fe9d9ea.zip/node_modules/@parcel/logger/",\
+          "packageDependencies": [\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/events", "npm:2.12.0"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
         ["npm:2.6.2", {\
           "packageLocation": "./.yarn/cache/@parcel-logger-npm-2.6.2-d7fe563ebb-d3536408da.zip/node_modules/@parcel/logger/",\
           "packageDependencies": [\
@@ -1195,83 +1547,90 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@parcel/events", "npm:2.6.2"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-logger-npm-2.7.0-0515c8453c-85e959a8ed.zip/node_modules/@parcel/logger/",\
-          "packageDependencies": [\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/events", "npm:2.7.0"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/markdown-ansi", [\
-        ["npm:2.6.2", {\
-          "packageLocation": "./.yarn/cache/@parcel-markdown-ansi-npm-2.6.2-16ce118d53-742c64c5db.zip/node_modules/@parcel/markdown-ansi/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-markdown-ansi-npm-2.12.0-6b0fe453df-850ee665d9.zip/node_modules/@parcel/markdown-ansi/",\
           "packageDependencies": [\
-            ["@parcel/markdown-ansi", "npm:2.6.2"],\
+            ["@parcel/markdown-ansi", "npm:2.12.0"],\
             ["chalk", "npm:4.1.2"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-markdown-ansi-npm-2.7.0-b98fb6a466-a9f19091c5.zip/node_modules/@parcel/markdown-ansi/",\
+        ["npm:2.6.2", {\
+          "packageLocation": "./.yarn/cache/@parcel-markdown-ansi-npm-2.6.2-16ce118d53-742c64c5db.zip/node_modules/@parcel/markdown-ansi/",\
           "packageDependencies": [\
-            ["@parcel/markdown-ansi", "npm:2.7.0"],\
+            ["@parcel/markdown-ansi", "npm:2.6.2"],\
             ["chalk", "npm:4.1.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/namer-default", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-namer-default-npm-2.7.0-2c2525eb55-0012b78fc9.zip/node_modules/@parcel/namer-default/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-namer-default-npm-2.12.0-28980cfd47-dc92ec0945.zip/node_modules/@parcel/namer-default/",\
           "packageDependencies": [\
-            ["@parcel/namer-default", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
+            ["@parcel/namer-default", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/node-resolver-core", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-node-resolver-core-npm-2.7.0-f00f25661b-bc0a94ce3c.zip/node_modules/@parcel/node-resolver-core/",\
+        ["npm:3.3.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-node-resolver-core-npm-3.3.0-53804df663-acc3721678.zip/node_modules/@parcel/node-resolver-core/",\
           "packageDependencies": [\
-            ["@parcel/node-resolver-core", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/node-resolver-core", "npm:3.3.0"],\
+            ["@mischnic/json-sourcemap", "npm:0.1.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/optimizer-css", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-optimizer-css-npm-2.7.0-9744cf2546-3799e128cb.zip/node_modules/@parcel/optimizer-css/",\
-          "packageDependencies": [\
-            ["@parcel/optimizer-css", "npm:2.7.0"],\
-            ["@parcel/css", "npm:1.13.1"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-optimizer-css-npm-2.12.0-f95bd4d060-abcdf58c29.zip/node_modules/@parcel/optimizer-css/",\
+          "packageDependencies": [\
+            ["@parcel/optimizer-css", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["browserslist", "npm:4.20.3"],\
+            ["lightningcss", "npm:1.17.1"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
+      ["@parcel/optimizer-data-url", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-optimizer-data-url-npm-2.12.0-dad3731170-0397293961.zip/node_modules/@parcel/optimizer-data-url/",\
+          "packageDependencies": [\
+            ["@parcel/optimizer-data-url", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["isbinaryfile", "npm:4.0.10"],\
+            ["mime", "npm:2.6.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["@parcel/optimizer-htmlnano", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-optimizer-htmlnano-npm-2.7.0-6f46846f28-a5fa890bc3.zip/node_modules/@parcel/optimizer-htmlnano/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-optimizer-htmlnano-npm-2.12.0-cdd2835c12-64e571f56f.zip/node_modules/@parcel/optimizer-htmlnano/",\
           "packageDependencies": [\
-            ["@parcel/optimizer-htmlnano", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["htmlnano", "virtual:6f46846f2837974f1f04e7445cb84368b1fd0134f7a4d9c278b0b5de3a2fe26944076688bad306f35ea6023238d3a9854bdb184351a49bf42819322529da8650#npm:2.0.2"],\
+            ["@parcel/optimizer-htmlnano", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["htmlnano", "virtual:cdd2835c1202e86fad55b2266578ff3755267672440481af37bdfff670fd205f561469a10385c20d1ff403af7fad49006bc71ffff21d12592a8ebd0c8be79c0c#npm:2.0.2"],\
             ["nullthrows", "npm:1.1.1"],\
             ["posthtml", "npm:0.16.6"],\
             ["svgo", "npm:2.8.0"]\
@@ -1280,76 +1639,90 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/optimizer-image", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-optimizer-image-npm-2.7.0-711eb014aa/node_modules/@parcel/optimizer-image/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip/node_modules/@parcel/optimizer-image/",\
           "packageDependencies": [\
-            ["@parcel/optimizer-image", "npm:2.7.0"],\
-            ["@parcel/core", "npm:2.6.2"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/workers", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
-            ["detect-libc", "npm:1.0.3"]\
+            ["@parcel/optimizer-image", "npm:2.12.0"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-optimizer-image-virtual-8c3b1760b5/0/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip/node_modules/@parcel/optimizer-image/",\
+          "packageDependencies": [\
+            ["@parcel/optimizer-image", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@types/parcel__core", null]\
+          ],\
+          "packagePeers": [\
+            "@parcel/core",\
+            "@types/parcel__core"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/optimizer-svgo", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-optimizer-svgo-npm-2.7.0-02b64b51d9-305024d23c.zip/node_modules/@parcel/optimizer-svgo/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-optimizer-svgo-npm-2.12.0-08c0f1b17f-d3a4d2de9f.zip/node_modules/@parcel/optimizer-svgo/",\
           "packageDependencies": [\
-            ["@parcel/optimizer-svgo", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/optimizer-svgo", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["svgo", "npm:2.8.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@parcel/optimizer-terser", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-optimizer-terser-npm-2.7.0-17770c458c-20eddbcaa9.zip/node_modules/@parcel/optimizer-terser/",\
+      ["@parcel/optimizer-swc", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-optimizer-swc-npm-2.12.0-fb535e4283-0b7fdf3df1.zip/node_modules/@parcel/optimizer-swc/",\
           "packageDependencies": [\
-            ["@parcel/optimizer-terser", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["nullthrows", "npm:1.1.1"],\
-            ["terser", "npm:5.13.1"]\
+            ["@parcel/optimizer-swc", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@swc/core", "virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62"],\
+            ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/package-manager", [\
-        ["npm:2.6.2", {\
-          "packageLocation": "./.yarn/cache/@parcel-package-manager-npm-2.6.2-41edbfb7da-0c7dfce953.zip/node_modules/@parcel/package-manager/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip/node_modules/@parcel/package-manager/",\
           "packageDependencies": [\
-            ["@parcel/package-manager", "npm:2.6.2"]\
+            ["@parcel/package-manager", "npm:2.12.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-package-manager-npm-2.7.0-ec67893806-f4817d1aae.zip/node_modules/@parcel/package-manager/",\
+        ["npm:2.6.2", {\
+          "packageLocation": "./.yarn/cache/@parcel-package-manager-npm-2.6.2-41edbfb7da-0c7dfce953.zip/node_modules/@parcel/package-manager/",\
           "packageDependencies": [\
-            ["@parcel/package-manager", "npm:2.7.0"]\
+            ["@parcel/package-manager", "npm:2.6.2"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-e2c4b379cf/0/cache/@parcel-package-manager-npm-2.7.0-ec67893806-f4817d1aae.zip/node_modules/@parcel/package-manager/",\
-          "packageDependencies": [\
-            ["@parcel/package-manager", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/fs", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/workers", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
+        ["virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-8612c9adea/0/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip/node_modules/@parcel/package-manager/",\
+          "packageDependencies": [\
+            ["@parcel/package-manager", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/node-resolver-core", "npm:3.3.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@swc/core", "virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62"],\
             ["@types/parcel__core", null],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"]\
           ],\
           "packagePeers": [\
             "@parcel/core",\
@@ -1376,19 +1749,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-0b890b8bab/0/cache/@parcel-package-manager-npm-2.7.0-ec67893806-f4817d1aae.zip/node_modules/@parcel/package-manager/",\
+        ["virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-package-manager-virtual-5f8211ac5f/0/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip/node_modules/@parcel/package-manager/",\
           "packageDependencies": [\
-            ["@parcel/package-manager", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
+            ["@parcel/package-manager", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
             ["@parcel/core", "npm:2.6.2"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/fs", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/workers", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/node-resolver-core", "npm:3.3.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/workers", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
+            ["@swc/core", "virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62"],\
             ["@types/parcel__core", null],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"]\
           ],\
           "packagePeers": [\
             "@types/parcel__core"\
@@ -1397,26 +1772,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/packager-css", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-packager-css-npm-2.7.0-1f68e1330e-0a7fbedb88.zip/node_modules/@parcel/packager-css/",\
-          "packageDependencies": [\
-            ["@parcel/packager-css", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-packager-css-npm-2.12.0-b1c27a8323-684aaa1d85.zip/node_modules/@parcel/packager-css/",\
+          "packageDependencies": [\
+            ["@parcel/packager-css", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["lightningcss", "npm:1.17.1"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/packager-html", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-packager-html-npm-2.7.0-a137850a6d-9ca4f91112.zip/node_modules/@parcel/packager-html/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-packager-html-npm-2.12.0-ad361b1265-ee558ad616.zip/node_modules/@parcel/packager-html/",\
           "packageDependencies": [\
-            ["@parcel/packager-html", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/packager-html", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"],\
             ["posthtml", "npm:0.16.6"]\
           ],\
@@ -1424,15 +1801,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/packager-js", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-packager-js-npm-2.7.0-1132724f15-8a65b8f82c.zip/node_modules/@parcel/packager-js/",\
-          "packageDependencies": [\
-            ["@parcel/packager-js", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/hash", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-packager-js-npm-2.12.0-093e3200cd-2189b7ff15.zip/node_modules/@parcel/packager-js/",\
+          "packageDependencies": [\
+            ["@parcel/packager-js", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["globals", "npm:13.15.0"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
@@ -1440,29 +1818,47 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/packager-raw", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-packager-raw-npm-2.7.0-8a5c5b3c92-d895ed703e.zip/node_modules/@parcel/packager-raw/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-packager-raw-npm-2.12.0-b7f15635f8-39ce2fc7ae.zip/node_modules/@parcel/packager-raw/",\
           "packageDependencies": [\
-            ["@parcel/packager-raw", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"]\
+            ["@parcel/packager-raw", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/packager-svg", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-packager-svg-npm-2.7.0-9d46f657cd-9b2c4e4cee.zip/node_modules/@parcel/packager-svg/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-packager-svg-npm-2.12.0-fa921ce522-436ac9ea39.zip/node_modules/@parcel/packager-svg/",\
           "packageDependencies": [\
-            ["@parcel/packager-svg", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/packager-svg", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["posthtml", "npm:0.16.6"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
+      ["@parcel/packager-wasm", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-packager-wasm-npm-2.12.0-ec551a9e29-a10e1cd988.zip/node_modules/@parcel/packager-wasm/",\
+          "packageDependencies": [\
+            ["@parcel/packager-wasm", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["@parcel/plugin", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-plugin-npm-2.12.0-947dec85d3-0b52f1dd06.zip/node_modules/@parcel/plugin/",\
+          "packageDependencies": [\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/types", "npm:2.12.0"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
         ["npm:2.6.2", {\
           "packageLocation": "./.yarn/cache/@parcel-plugin-npm-2.6.2-d1ea2dda44-23da0fa372.zip/node_modules/@parcel/plugin/",\
           "packageDependencies": [\
@@ -1470,24 +1866,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@parcel/types", "npm:2.6.2"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-plugin-npm-2.7.0-90dfe30ed4-930befafa0.zip/node_modules/@parcel/plugin/",\
+        }]\
+      ]],\
+      ["@parcel/profiler", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-profiler-npm-2.12.0-69720a23ab-b683b74e10.zip/node_modules/@parcel/profiler/",\
           "packageDependencies": [\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"]\
+            ["@parcel/profiler", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/events", "npm:2.12.0"],\
+            ["chrome-trace-event", "npm:1.0.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/reporter-cli", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-reporter-cli-npm-2.7.0-2b488e1e16-eff35a2ee3.zip/node_modules/@parcel/reporter-cli/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-reporter-cli-npm-2.12.0-b3e4c5fe19-8cc524fa15.zip/node_modules/@parcel/reporter-cli/",\
           "packageDependencies": [\
-            ["@parcel/reporter-cli", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/reporter-cli", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["chalk", "npm:4.1.2"],\
             ["term-size", "npm:2.2.1"]\
           ],\
@@ -1495,57 +1895,71 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/reporter-dev-server", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-reporter-dev-server-npm-2.7.0-e6045e8f3d-e315689d8d.zip/node_modules/@parcel/reporter-dev-server/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-reporter-dev-server-npm-2.12.0-aed1d2c68c-43957b4656.zip/node_modules/@parcel/reporter-dev-server/",\
+          "packageDependencies": [\
+            ["@parcel/reporter-dev-server", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@parcel/reporter-tracer", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-reporter-tracer-npm-2.12.0-5cec9ab2d5-24cddacd19.zip/node_modules/@parcel/reporter-tracer/",\
           "packageDependencies": [\
-            ["@parcel/reporter-dev-server", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"]\
+            ["@parcel/reporter-tracer", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["chrome-trace-event", "npm:1.0.3"],\
+            ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/resolver-default", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-resolver-default-npm-2.7.0-6a30d41e3e-5bc64bea95.zip/node_modules/@parcel/resolver-default/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-resolver-default-npm-2.12.0-8da790891c-f3652eea09.zip/node_modules/@parcel/resolver-default/",\
           "packageDependencies": [\
-            ["@parcel/resolver-default", "npm:2.7.0"],\
-            ["@parcel/node-resolver-core", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"]\
+            ["@parcel/resolver-default", "npm:2.12.0"],\
+            ["@parcel/node-resolver-core", "npm:3.3.0"],\
+            ["@parcel/plugin", "npm:2.12.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/runtime-browser-hmr", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-runtime-browser-hmr-npm-2.7.0-a096585411-ad736bab69.zip/node_modules/@parcel/runtime-browser-hmr/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-runtime-browser-hmr-npm-2.12.0-6f0da66673-bbba57ecee.zip/node_modules/@parcel/runtime-browser-hmr/",\
           "packageDependencies": [\
-            ["@parcel/runtime-browser-hmr", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"]\
+            ["@parcel/runtime-browser-hmr", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/runtime-js", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-runtime-js-npm-2.7.0-4239941924-3a22c78ce1.zip/node_modules/@parcel/runtime-js/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-runtime-js-npm-2.12.0-e21acc0f42-6afa3e7eb2.zip/node_modules/@parcel/runtime-js/",\
           "packageDependencies": [\
-            ["@parcel/runtime-js", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/runtime-js", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/runtime-react-refresh", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-runtime-react-refresh-npm-2.7.0-630a596870-ea4c240185.zip/node_modules/@parcel/runtime-react-refresh/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-runtime-react-refresh-npm-2.12.0-2b09615691-41aee9a874.zip/node_modules/@parcel/runtime-react-refresh/",\
           "packageDependencies": [\
-            ["@parcel/runtime-react-refresh", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/runtime-react-refresh", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["react-error-overlay", "npm:6.0.9"],\
             ["react-refresh", "npm:0.9.0"]\
           ],\
@@ -1553,17 +1967,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/runtime-service-worker", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-runtime-service-worker-npm-2.7.0-356c846b9a-13eb0ba276.zip/node_modules/@parcel/runtime-service-worker/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-runtime-service-worker-npm-2.12.0-7d227ff0bf-c71246428e.zip/node_modules/@parcel/runtime-service-worker/",\
           "packageDependencies": [\
-            ["@parcel/runtime-service-worker", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/runtime-service-worker", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
+      ["@parcel/rust", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/unplugged/@parcel-rust-npm-2.12.0-0cf943f3e5/node_modules/@parcel/rust/",\
+          "packageDependencies": [\
+            ["@parcel/rust", "npm:2.12.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["@parcel/source-map", [\
         ["npm:2.0.5", {\
           "packageLocation": "./.yarn/unplugged/@parcel-source-map-npm-2.0.5-2444d2c092/node_modules/@parcel/source-map/",\
@@ -1572,74 +1995,83 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["detect-libc", "npm:1.0.3"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.1.1", {\
+          "packageLocation": "./.yarn/unplugged/@parcel-source-map-npm-2.1.1-09e4d79db4/node_modules/@parcel/source-map/",\
+          "packageDependencies": [\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["detect-libc", "npm:1.0.3"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-babel", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-babel-npm-2.7.0-2f75dd9e80-aa269b1291.zip/node_modules/@parcel/transformer-babel/",\
-          "packageDependencies": [\
-            ["@parcel/transformer-babel", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-babel-npm-2.12.0-953de52432-b8c457c0be.zip/node_modules/@parcel/transformer-babel/",\
+          "packageDependencies": [\
+            ["@parcel/transformer-babel", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["browserslist", "npm:4.20.3"],\
             ["json5", "npm:2.2.1"],\
             ["nullthrows", "npm:1.1.1"],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-css", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-css-npm-2.7.0-25da3f73ab-47cf7cd9a4.zip/node_modules/@parcel/transformer-css/",\
-          "packageDependencies": [\
-            ["@parcel/transformer-css", "npm:2.7.0"],\
-            ["@parcel/css", "npm:1.13.1"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-css-npm-2.12.0-24ddc31ae3-3a6f16321d.zip/node_modules/@parcel/transformer-css/",\
+          "packageDependencies": [\
+            ["@parcel/transformer-css", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["browserslist", "npm:4.20.3"],\
+            ["lightningcss", "npm:1.17.1"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-html", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-html-npm-2.7.0-08c6020320-4028ffa5ec.zip/node_modules/@parcel/transformer-html/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-html-npm-2.12.0-be2b9ee40c-7fcfac62ca.zip/node_modules/@parcel/transformer-html/",\
           "packageDependencies": [\
-            ["@parcel/transformer-html", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/hash", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
+            ["@parcel/transformer-html", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"],\
             ["posthtml", "npm:0.16.6"],\
             ["posthtml-parser", "npm:0.10.2"],\
             ["posthtml-render", "npm:3.0.0"],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"],\
+            ["srcset", "npm:4.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-image", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-image-npm-2.7.0-e0f900b613-1decacc1a4.zip/node_modules/@parcel/transformer-image/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip/node_modules/@parcel/transformer-image/",\
           "packageDependencies": [\
-            ["@parcel/transformer-image", "npm:2.7.0"]\
+            ["@parcel/transformer-image", "npm:2.12.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:0f7f7912427957d1cc194056771435c115b507814a356101fcd5f30da5bfd00fdec7d9cafac2677130129fbed9f1e794c894a43171645772ddd913a9c5fe12e6#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-transformer-image-virtual-461835f303/0/cache/@parcel-transformer-image-npm-2.7.0-e0f900b613-1decacc1a4.zip/node_modules/@parcel/transformer-image/",\
-          "packageDependencies": [\
-            ["@parcel/transformer-image", "virtual:0f7f7912427957d1cc194056771435c115b507814a356101fcd5f30da5bfd00fdec7d9cafac2677130129fbed9f1e794c894a43171645772ddd913a9c5fe12e6#npm:2.7.0"],\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/workers", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
+        ["virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-transformer-image-virtual-acc9c20c9c/0/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip/node_modules/@parcel/transformer-image/",\
+          "packageDependencies": [\
+            ["@parcel/transformer-image", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
             ["@types/parcel__core", null],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
@@ -1650,31 +2082,41 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["@parcel/transformer-inline-string", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-inline-string-npm-2.12.0-a33f10bafa-5f63c08695.zip/node_modules/@parcel/transformer-inline-string/",\
+          "packageDependencies": [\
+            ["@parcel/transformer-inline-string", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["@parcel/transformer-js", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-transformer-js-virtual-d2d49542a0/node_modules/@parcel/transformer-js/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip/node_modules/@parcel/transformer-js/",\
           "packageDependencies": [\
-            ["@parcel/transformer-js", "npm:2.7.0"]\
+            ["@parcel/transformer-js", "npm:2.12.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:0f7f7912427957d1cc194056771435c115b507814a356101fcd5f30da5bfd00fdec7d9cafac2677130129fbed9f1e794c894a43171645772ddd913a9c5fe12e6#npm:2.7.0", {\
-          "packageLocation": "./.yarn/unplugged/@parcel-transformer-js-virtual-d2d49542a0/node_modules/@parcel/transformer-js/",\
-          "packageDependencies": [\
-            ["@parcel/transformer-js", "virtual:0f7f7912427957d1cc194056771435c115b507814a356101fcd5f30da5bfd00fdec7d9cafac2677130129fbed9f1e794c894a43171645772ddd913a9c5fe12e6#npm:2.7.0"],\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/workers", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@swc/helpers", "npm:0.4.3"],\
+        ["virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-transformer-js-virtual-567f83ac24/0/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip/node_modules/@parcel/transformer-js/",\
+          "packageDependencies": [\
+            ["@parcel/transformer-js", "virtual:284acdc258f2328e304855ff98dec9e5e8952a2bd7797a2e11c082f6cad2e0d3068e07fb498d46b810d8efae36becee510ac53186a75e438e809dc472f832ab2#npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@swc/helpers", "npm:0.5.1"],\
             ["@types/parcel__core", null],\
             ["browserslist", "npm:4.20.3"],\
-            ["detect-libc", "npm:1.0.3"],\
             ["nullthrows", "npm:1.1.1"],\
             ["regenerator-runtime", "npm:0.13.9"],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"]\
           ],\
           "packagePeers": [\
             "@parcel/core",\
@@ -1684,101 +2126,115 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@parcel/transformer-json", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-json-npm-2.7.0-618a3ec3da-d9d82148ee.zip/node_modules/@parcel/transformer-json/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-json-npm-2.12.0-652d8d99d2-a711cb65a8.zip/node_modules/@parcel/transformer-json/",\
           "packageDependencies": [\
-            ["@parcel/transformer-json", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
+            ["@parcel/transformer-json", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
             ["json5", "npm:2.2.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-postcss", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-postcss-npm-2.7.0-4c66e12663-15bd9ac051.zip/node_modules/@parcel/transformer-postcss/",\
-          "packageDependencies": [\
-            ["@parcel/transformer-postcss", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/hash", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-postcss-npm-2.12.0-f0cfb95fac-b210044a7f.zip/node_modules/@parcel/transformer-postcss/",\
+          "packageDependencies": [\
+            ["@parcel/transformer-postcss", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["clone", "npm:2.1.2"],\
             ["nullthrows", "npm:1.1.1"],\
             ["postcss-value-parser", "npm:4.2.0"],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-posthtml", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-posthtml-npm-2.7.0-8bf2259ce3-04642838ce.zip/node_modules/@parcel/transformer-posthtml/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-posthtml-npm-2.12.0-41c570db12-b62582ae7e.zip/node_modules/@parcel/transformer-posthtml/",\
           "packageDependencies": [\
-            ["@parcel/transformer-posthtml", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/transformer-posthtml", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"],\
             ["posthtml", "npm:0.16.6"],\
             ["posthtml-parser", "npm:0.10.2"],\
             ["posthtml-render", "npm:3.0.0"],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-raw", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-raw-npm-2.7.0-648170650b-942a5ddbed.zip/node_modules/@parcel/transformer-raw/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-raw-npm-2.12.0-bd2cb66ddf-de6681e2e7.zip/node_modules/@parcel/transformer-raw/",\
           "packageDependencies": [\
-            ["@parcel/transformer-raw", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"]\
+            ["@parcel/transformer-raw", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-react-refresh-wrap", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.7.0-f38de269bf-d193b9552b.zip/node_modules/@parcel/transformer-react-refresh-wrap/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.12.0-59ed68910f-9aba8c1ab0.zip/node_modules/@parcel/transformer-react-refresh-wrap/",\
           "packageDependencies": [\
-            ["@parcel/transformer-react-refresh-wrap", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/transformer-react-refresh-wrap", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["react-refresh", "npm:0.9.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-sass", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-sass-npm-2.7.0-69e02a5ece-8d53b8fcdb.zip/node_modules/@parcel/transformer-sass/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-sass-npm-2.12.0-ef787eef35-ce6b4d329b.zip/node_modules/@parcel/transformer-sass/",\
           "packageDependencies": [\
-            ["@parcel/transformer-sass", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
+            ["@parcel/transformer-sass", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
             ["sass", "npm:1.52.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/transformer-svg", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-transformer-svg-npm-2.7.0-25a0624742-19026a39f9.zip/node_modules/@parcel/transformer-svg/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-transformer-svg-npm-2.12.0-f41b181676-92b7c65894.zip/node_modules/@parcel/transformer-svg/",\
           "packageDependencies": [\
-            ["@parcel/transformer-svg", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/hash", "npm:2.7.0"],\
-            ["@parcel/plugin", "npm:2.7.0"],\
+            ["@parcel/transformer-svg", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/plugin", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
             ["nullthrows", "npm:1.1.1"],\
             ["posthtml", "npm:0.16.6"],\
             ["posthtml-parser", "npm:0.10.2"],\
             ["posthtml-render", "npm:3.0.0"],\
-            ["semver", "npm:5.7.1"]\
+            ["semver", "npm:7.5.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/types", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-types-npm-2.12.0-ffe47febbf-250f95580c.zip/node_modules/@parcel/types/",\
+          "packageDependencies": [\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/cache", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/fs", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
+            ["@parcel/package-manager", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["@parcel/workers", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
+            ["utility-types", "npm:3.10.0"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
         ["npm:2.6.2", {\
           "packageLocation": "./.yarn/cache/@parcel-types-npm-2.6.2-aa1797faca-16f3c3ac36.zip/node_modules/@parcel/types/",\
           "packageDependencies": [\
@@ -1792,23 +2248,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["utility-types", "npm:3.10.0"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-types-npm-2.7.0-abdd37dd38-cf28c56d3e.zip/node_modules/@parcel/types/",\
-          "packageDependencies": [\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/cache", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/fs", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
-            ["@parcel/package-manager", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["@parcel/workers", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
-            ["utility-types", "npm:3.10.0"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/utils", [\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-utils-npm-2.12.0-d8a9a48a66-ba80a60fed.zip/node_modules/@parcel/utils/",\
+          "packageDependencies": [\
+            ["@parcel/utils", "npm:2.12.0"],\
+            ["@parcel/codeframe", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/markdown-ansi", "npm:2.12.0"],\
+            ["@parcel/rust", "npm:2.12.0"],\
+            ["@parcel/source-map", "npm:2.1.1"],\
+            ["chalk", "npm:4.1.2"],\
+            ["nullthrows", "npm:1.1.1"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
         ["npm:2.6.2", {\
           "packageLocation": "./.yarn/cache/@parcel-utils-npm-2.6.2-cab87aed21-a74fdca966.zip/node_modules/@parcel/utils/",\
           "packageDependencies": [\
@@ -1822,20 +2279,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["chalk", "npm:4.1.2"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-utils-npm-2.7.0-db7c9fa872-2645b3379d.zip/node_modules/@parcel/utils/",\
-          "packageDependencies": [\
-            ["@parcel/utils", "npm:2.7.0"],\
-            ["@parcel/codeframe", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/hash", "npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/markdown-ansi", "npm:2.7.0"],\
-            ["@parcel/source-map", "npm:2.0.5"],\
-            ["chalk", "npm:4.1.2"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/watcher", [\
@@ -1848,34 +2291,44 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["node-gyp-build", "npm:4.4.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.0.7", {\
+          "packageLocation": "./.yarn/unplugged/@parcel-watcher-npm-2.0.7-8a0c8cf0fd/node_modules/@parcel/watcher/",\
+          "packageDependencies": [\
+            ["@parcel/watcher", "npm:2.0.7"],\
+            ["node-addon-api", "npm:3.2.1"],\
+            ["node-gyp", "npm:9.0.0"],\
+            ["node-gyp-build", "npm:4.4.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@parcel/workers", [\
-        ["npm:2.6.2", {\
-          "packageLocation": "./.yarn/cache/@parcel-workers-npm-2.6.2-a30e38db52-92b65cd3fd.zip/node_modules/@parcel/workers/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip/node_modules/@parcel/workers/",\
           "packageDependencies": [\
-            ["@parcel/workers", "npm:2.6.2"]\
+            ["@parcel/workers", "npm:2.12.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/@parcel-workers-npm-2.7.0-7ae287b100-e3621c4030.zip/node_modules/@parcel/workers/",\
+        ["npm:2.6.2", {\
+          "packageLocation": "./.yarn/cache/@parcel-workers-npm-2.6.2-a30e38db52-92b65cd3fd.zip/node_modules/@parcel/workers/",\
           "packageDependencies": [\
-            ["@parcel/workers", "npm:2.7.0"]\
+            ["@parcel/workers", "npm:2.6.2"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-289b931859/0/cache/@parcel-workers-npm-2.7.0-7ae287b100-e3621c4030.zip/node_modules/@parcel/workers/",\
-          "packageDependencies": [\
-            ["@parcel/workers", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-fbd6240557/0/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip/node_modules/@parcel/workers/",\
+          "packageDependencies": [\
+            ["@parcel/workers", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/profiler", "npm:2.12.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["@types/parcel__core", null],\
-            ["chrome-trace-event", "npm:1.0.3"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "packagePeers": [\
@@ -1902,17 +2355,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-7dd6ace2fb/0/cache/@parcel-workers-npm-2.7.0-7ae287b100-e3621c4030.zip/node_modules/@parcel/workers/",\
+        ["virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/@parcel-workers-virtual-0f6ac1cb6e/0/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip/node_modules/@parcel/workers/",\
           "packageDependencies": [\
-            ["@parcel/workers", "virtual:abdd37dd383d84c30bc50ccc39b00e4b82d372931da5c06fcd88a575bf5e4bc7e797bfd6f5893d17bb496f18726410e0902e9ea44d39df482ac15c13e51e3816#npm:2.7.0"],\
+            ["@parcel/workers", "virtual:ffe47febbf7847f9b64454e506be514f3cbd8bbd1821ba64e8e762685b5100c3f7867a926c2aa7f5349f2a1370184e7d2f8f70428bcab9b21701f56d9632c378#npm:2.12.0"],\
             ["@parcel/core", "npm:2.6.2"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/types", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/profiler", "npm:2.12.0"],\
+            ["@parcel/types", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["@types/parcel__core", null],\
-            ["chrome-trace-event", "npm:1.0.3"],\
             ["nullthrows", "npm:1.1.1"]\
           ],\
           "packagePeers": [\
@@ -1921,252 +2374,207 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/cli", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-cli-npm-1.10.4-acb199a834-3164e88bbc.zip/node_modules/@percy/cli/",\
+      ["@pkgjs/parseargs", [\
+        ["npm:0.11.0", {\
+          "packageLocation": "./.yarn/cache/@pkgjs-parseargs-npm-0.11.0-cd2a3fe948-6ad6a00fc4.zip/node_modules/@pkgjs/parseargs/",\
           "packageDependencies": [\
-            ["@percy/cli", "npm:1.10.4"],\
-            ["@percy/cli-app", "npm:1.10.4"],\
-            ["@percy/cli-build", "npm:1.10.4"],\
-            ["@percy/cli-command", "npm:1.10.4"],\
-            ["@percy/cli-config", "npm:1.10.4"],\
-            ["@percy/cli-exec", "npm:1.10.4"],\
-            ["@percy/cli-snapshot", "npm:1.10.4"],\
-            ["@percy/cli-upload", "npm:1.10.4"],\
-            ["@percy/client", "npm:1.10.4"],\
-            ["@percy/logger", "npm:1.10.4"]\
+            ["@pkgjs/parseargs", "npm:0.11.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/cli-app", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-cli-app-npm-1.10.4-06b84c2fa7-81db381f2e.zip/node_modules/@percy/cli-app/",\
+      ["@popperjs/core", [\
+        ["npm:2.11.5", {\
+          "packageLocation": "./.yarn/cache/@popperjs-core-npm-2.11.5-a338f16bd4-fd7f9dca3f.zip/node_modules/@popperjs/core/",\
           "packageDependencies": [\
-            ["@percy/cli-app", "npm:1.10.4"],\
-            ["@percy/cli-command", "npm:1.10.4"],\
-            ["@percy/cli-exec", "npm:1.10.4"]\
+            ["@popperjs/core", "npm:2.11.5"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@percy/cli-build", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-cli-build-npm-1.10.4-aea75ba7bd-c6aa64bbb3.zip/node_modules/@percy/cli-build/",\
+        }],\
+        ["npm:2.11.8", {\
+          "packageLocation": "./.yarn/cache/@popperjs-core-npm-2.11.8-f1692e11a0-e5c69fdebf.zip/node_modules/@popperjs/core/",\
           "packageDependencies": [\
-            ["@percy/cli-build", "npm:1.10.4"],\
-            ["@percy/cli-command", "npm:1.10.4"]\
+            ["@popperjs/core", "npm:2.11.8"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/cli-command", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-cli-command-npm-1.10.4-9b894aa1cf-d96a572e24.zip/node_modules/@percy/cli-command/",\
+      ["@rollup/pluginutils", [\
+        ["npm:5.1.0", {\
+          "packageLocation": "./.yarn/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip/node_modules/@rollup/pluginutils/",\
           "packageDependencies": [\
-            ["@percy/cli-command", "npm:1.10.4"],\
-            ["@percy/config", "npm:1.10.4"],\
-            ["@percy/core", "npm:1.10.4"],\
-            ["@percy/logger", "npm:1.10.4"]\
+            ["@rollup/pluginutils", "npm:5.1.0"]\
           ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@percy/cli-config", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-cli-config-npm-1.10.4-9177c0305d-901df758d4.zip/node_modules/@percy/cli-config/",\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.1.0", {\
+          "packageLocation": "./.yarn/__virtual__/@rollup-pluginutils-virtual-e968017249/0/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip/node_modules/@rollup/pluginutils/",\
           "packageDependencies": [\
-            ["@percy/cli-config", "npm:1.10.4"],\
-            ["@percy/cli-command", "npm:1.10.4"]\
+            ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.1.0"],\
+            ["@types/estree", "npm:1.0.0"],\
+            ["@types/rollup", null],\
+            ["estree-walker", "npm:2.0.2"],\
+            ["picomatch", "npm:2.3.1"],\
+            ["rollup", null]\
+          ],\
+          "packagePeers": [\
+            "@types/rollup",\
+            "rollup"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/cli-exec", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-cli-exec-npm-1.10.4-df1853a356-d1c77ce6c9.zip/node_modules/@percy/cli-exec/",\
+      ["@sidvind/better-ajv-errors", [\
+        ["npm:2.1.3", {\
+          "packageLocation": "./.yarn/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip/node_modules/@sidvind/better-ajv-errors/",\
           "packageDependencies": [\
-            ["@percy/cli-exec", "npm:1.10.4"],\
-            ["@percy/cli-command", "npm:1.10.4"],\
-            ["cross-spawn", "npm:7.0.3"],\
-            ["which", "npm:2.0.2"]\
+            ["@sidvind/better-ajv-errors", "npm:2.1.3"]\
           ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@percy/cli-snapshot", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-cli-snapshot-npm-1.10.4-12fbaf9321-51542704a0.zip/node_modules/@percy/cli-snapshot/",\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:640261ed3b7a9880a388cc504caacf8ea790dd52f1cb31fbc3be445cb2adc6e73fc87097de620863105eb917510145ef2457d30000c7361456ab67ec0b895136#npm:2.1.3", {\
+          "packageLocation": "./.yarn/__virtual__/@sidvind-better-ajv-errors-virtual-ff98ba00e3/0/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip/node_modules/@sidvind/better-ajv-errors/",\
           "packageDependencies": [\
-            ["@percy/cli-snapshot", "npm:1.10.4"],\
-            ["@percy/cli-command", "npm:1.10.4"],\
-            ["yaml", "npm:2.1.1"]\
+            ["@sidvind/better-ajv-errors", "virtual:640261ed3b7a9880a388cc504caacf8ea790dd52f1cb31fbc3be445cb2adc6e73fc87097de620863105eb917510145ef2457d30000c7361456ab67ec0b895136#npm:2.1.3"],\
+            ["@babel/code-frame", "npm:7.16.7"],\
+            ["@types/ajv", null],\
+            ["ajv", "npm:8.11.0"],\
+            ["chalk", "npm:4.1.2"]\
+          ],\
+          "packagePeers": [\
+            "@types/ajv",\
+            "ajv"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/cli-upload", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-cli-upload-npm-1.10.4-cf4deabe63-518e3e2414.zip/node_modules/@percy/cli-upload/",\
+      ["@swc/core", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-virtual-8fda1c3f9b/node_modules/@swc/core/",\
           "packageDependencies": [\
-            ["@percy/cli-upload", "npm:1.10.4"],\
-            ["@percy/cli-command", "npm:1.10.4"],\
-            ["fast-glob", "npm:3.2.11"],\
-            ["image-size", "npm:1.0.2"]\
+            ["@swc/core", "npm:1.3.62"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-virtual-8fda1c3f9b/node_modules/@swc/core/",\
+          "packageDependencies": [\
+            ["@swc/core", "virtual:5f8211ac5fe0096c8679c8fc747f0917af84ce168460ce1b592cb42613ababf55139691f5b329cd10e1e2b99af39861401c7b9633ed396447c506b02a80144b0#npm:1.3.62"],\
+            ["@swc/core-darwin-arm64", "npm:1.3.62"],\
+            ["@swc/core-darwin-x64", "npm:1.3.62"],\
+            ["@swc/core-linux-arm-gnueabihf", "npm:1.3.62"],\
+            ["@swc/core-linux-arm64-gnu", "npm:1.3.62"],\
+            ["@swc/core-linux-arm64-musl", "npm:1.3.62"],\
+            ["@swc/core-linux-x64-gnu", "npm:1.3.62"],\
+            ["@swc/core-linux-x64-musl", "npm:1.3.62"],\
+            ["@swc/core-win32-arm64-msvc", "npm:1.3.62"],\
+            ["@swc/core-win32-ia32-msvc", "npm:1.3.62"],\
+            ["@swc/core-win32-x64-msvc", "npm:1.3.62"],\
+            ["@swc/helpers", null],\
+            ["@types/swc__helpers", null]\
+          ],\
+          "packagePeers": [\
+            "@swc/helpers",\
+            "@types/swc__helpers"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/client", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-client-npm-1.10.4-a8afab3bcb-8970cb0fee.zip/node_modules/@percy/client/",\
+      ["@swc/core-darwin-arm64", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-darwin-arm64-npm-1.3.62-b4af5d9b32/node_modules/@swc/core-darwin-arm64/",\
           "packageDependencies": [\
-            ["@percy/client", "npm:1.10.4"],\
-            ["@percy/env", "npm:1.10.4"],\
-            ["@percy/logger", "npm:1.10.4"]\
+            ["@swc/core-darwin-arm64", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/config", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-config-npm-1.10.4-b58233e905-545e2fd4ab.zip/node_modules/@percy/config/",\
+      ["@swc/core-darwin-x64", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-darwin-x64-npm-1.3.62-7d7bc99502/node_modules/@swc/core-darwin-x64/",\
           "packageDependencies": [\
-            ["@percy/config", "npm:1.10.4"],\
-            ["@percy/logger", "npm:1.10.4"],\
-            ["ajv", "npm:8.11.0"],\
-            ["cosmiconfig", "npm:7.0.1"],\
-            ["yaml", "npm:2.1.1"]\
+            ["@swc/core-darwin-x64", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/core", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/unplugged/@percy-core-npm-1.10.4-0c5deaa690/node_modules/@percy/core/",\
+      ["@swc/core-linux-arm-gnueabihf", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-linux-arm-gnueabihf-npm-1.3.62-2528581a9c/node_modules/@swc/core-linux-arm-gnueabihf/",\
           "packageDependencies": [\
-            ["@percy/core", "npm:1.10.4"],\
-            ["@percy/client", "npm:1.10.4"],\
-            ["@percy/config", "npm:1.10.4"],\
-            ["@percy/dom", "npm:1.10.4"],\
-            ["@percy/logger", "npm:1.10.4"],\
-            ["content-disposition", "npm:0.5.4"],\
-            ["cross-spawn", "npm:7.0.3"],\
-            ["extract-zip", "npm:2.0.1"],\
-            ["fast-glob", "npm:3.2.11"],\
-            ["micromatch", "npm:4.0.5"],\
-            ["mime-types", "npm:2.1.35"],\
-            ["path-to-regexp", "npm:6.2.1"],\
-            ["rimraf", "npm:3.0.2"],\
-            ["ws", "virtual:0c5deaa690b86b9f32697bfbf90e21328e17355764642819d8c4b25d34b724d506965cb4b20efaea0d964823dbbbf99d8cb3e40f839343bccb1bf76ef74acb5e#npm:8.8.1"]\
+            ["@swc/core-linux-arm-gnueabihf", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/cypress", [\
-        ["npm:3.1.2", {\
-          "packageLocation": "./.yarn/cache/@percy-cypress-npm-3.1.2-b10a40bb3c-576b14c076.zip/node_modules/@percy/cypress/",\
-          "packageDependencies": [\
-            ["@percy/cypress", "npm:3.1.2"]\
-          ],\
-          "linkType": "SOFT"\
-        }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.1.2", {\
-          "packageLocation": "./.yarn/__virtual__/@percy-cypress-virtual-0d3cc2f790/0/cache/@percy-cypress-npm-3.1.2-b10a40bb3c-576b14c076.zip/node_modules/@percy/cypress/",\
+      ["@swc/core-linux-arm64-gnu", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-linux-arm64-gnu-npm-1.3.62-7b527a3356/node_modules/@swc/core-linux-arm64-gnu/",\
           "packageDependencies": [\
-            ["@percy/cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.1.2"],\
-            ["@percy/sdk-utils", "npm:1.10.0"],\
-            ["@types/cypress", null],\
-            ["cypress", "npm:10.9.0"]\
-          ],\
-          "packagePeers": [\
-            "@types/cypress",\
-            "cypress"\
+            ["@swc/core-linux-arm64-gnu", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/dom", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-dom-npm-1.10.4-ced497b448-2c1b4da7fa.zip/node_modules/@percy/dom/",\
+      ["@swc/core-linux-arm64-musl", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-linux-arm64-musl-npm-1.3.62-5faf35783f/node_modules/@swc/core-linux-arm64-musl/",\
           "packageDependencies": [\
-            ["@percy/dom", "npm:1.10.4"]\
+            ["@swc/core-linux-arm64-musl", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/env", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-env-npm-1.10.4-d5bfdc729b-c2a9f6b384.zip/node_modules/@percy/env/",\
+      ["@swc/core-linux-x64-gnu", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-linux-x64-gnu-npm-1.3.62-1fc43a8907/node_modules/@swc/core-linux-x64-gnu/",\
           "packageDependencies": [\
-            ["@percy/env", "npm:1.10.4"]\
+            ["@swc/core-linux-x64-gnu", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/logger", [\
-        ["npm:1.10.4", {\
-          "packageLocation": "./.yarn/cache/@percy-logger-npm-1.10.4-34e93e31f1-4c6ade3902.zip/node_modules/@percy/logger/",\
+      ["@swc/core-linux-x64-musl", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-linux-x64-musl-npm-1.3.62-ffabf9bf27/node_modules/@swc/core-linux-x64-musl/",\
           "packageDependencies": [\
-            ["@percy/logger", "npm:1.10.4"]\
+            ["@swc/core-linux-x64-musl", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@percy/sdk-utils", [\
-        ["npm:1.10.0", {\
-          "packageLocation": "./.yarn/cache/@percy-sdk-utils-npm-1.10.0-bb3a5e31d6-9880758111.zip/node_modules/@percy/sdk-utils/",\
+      ["@swc/core-win32-arm64-msvc", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-win32-arm64-msvc-npm-1.3.62-f4199145ca/node_modules/@swc/core-win32-arm64-msvc/",\
           "packageDependencies": [\
-            ["@percy/sdk-utils", "npm:1.10.0"]\
+            ["@swc/core-win32-arm64-msvc", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@popperjs/core", [\
-        ["npm:2.11.5", {\
-          "packageLocation": "./.yarn/cache/@popperjs-core-npm-2.11.5-a338f16bd4-fd7f9dca3f.zip/node_modules/@popperjs/core/",\
-          "packageDependencies": [\
-            ["@popperjs/core", "npm:2.11.5"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
-        ["npm:2.11.6", {\
-          "packageLocation": "./.yarn/cache/@popperjs-core-npm-2.11.6-5bcdc104bd-47fb328cec.zip/node_modules/@popperjs/core/",\
+      ["@swc/core-win32-ia32-msvc", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-win32-ia32-msvc-npm-1.3.62-56dc98262c/node_modules/@swc/core-win32-ia32-msvc/",\
           "packageDependencies": [\
-            ["@popperjs/core", "npm:2.11.6"]\
+            ["@swc/core-win32-ia32-msvc", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@sidvind/better-ajv-errors", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip/node_modules/@sidvind/better-ajv-errors/",\
-          "packageDependencies": [\
-            ["@sidvind/better-ajv-errors", "npm:2.0.0"]\
-          ],\
-          "linkType": "SOFT"\
-        }],\
-        ["virtual:8e7539f97f71b16d7ab6f294853f15fb557920a44f2e2471eacfef222d17c2f70842a99750898bac2a20010053e55b95d3c419aeb55ec8bcd0bbefe3c53dd674#npm:2.0.0", {\
-          "packageLocation": "./.yarn/__virtual__/@sidvind-better-ajv-errors-virtual-8d0f59d7e4/0/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip/node_modules/@sidvind/better-ajv-errors/",\
+      ["@swc/core-win32-x64-msvc", [\
+        ["npm:1.3.62", {\
+          "packageLocation": "./.yarn/unplugged/@swc-core-win32-x64-msvc-npm-1.3.62-200450bac0/node_modules/@swc/core-win32-x64-msvc/",\
           "packageDependencies": [\
-            ["@sidvind/better-ajv-errors", "virtual:8e7539f97f71b16d7ab6f294853f15fb557920a44f2e2471eacfef222d17c2f70842a99750898bac2a20010053e55b95d3c419aeb55ec8bcd0bbefe3c53dd674#npm:2.0.0"],\
-            ["@babel/code-frame", "npm:7.16.7"],\
-            ["@types/ajv", null],\
-            ["ajv", "npm:8.11.0"],\
-            ["chalk", "npm:4.1.2"]\
-          ],\
-          "packagePeers": [\
-            "@types/ajv",\
-            "ajv"\
+            ["@swc/core-win32-x64-msvc", "npm:1.3.62"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@swc/helpers", [\
-        ["npm:0.4.3", {\
-          "packageLocation": "./.yarn/cache/@swc-helpers-npm-0.4.3-5d4bea11d2-5c2f173e95.zip/node_modules/@swc/helpers/",\
+        ["npm:0.5.1", {\
+          "packageLocation": "./.yarn/cache/@swc-helpers-npm-0.5.1-424376f311-71e0e27234.zip/node_modules/@swc/helpers/",\
           "packageDependencies": [\
-            ["@swc/helpers", "npm:0.4.3"],\
+            ["@swc/helpers", "npm:0.5.1"],\
             ["tslib", "npm:2.4.0"]\
           ],\
           "linkType": "HARD"\
@@ -2190,22 +2598,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@types/istanbul-lib-coverage", [\
-        ["npm:2.0.4", {\
-          "packageLocation": "./.yarn/cache/@types-istanbul-lib-coverage-npm-2.0.4-734954bb56-a25d7589ee.zip/node_modules/@types/istanbul-lib-coverage/",\
+      ["@twuni/emojify", [\
+        ["npm:1.0.2", {\
+          "packageLocation": "./.yarn/cache/@twuni-emojify-npm-1.0.2-a45d6eb0a7-0044c83b05.zip/node_modules/@twuni/emojify/",\
           "packageDependencies": [\
-            ["@types/istanbul-lib-coverage", "npm:2.0.4"]\
+            ["@twuni/emojify", "npm:1.0.2"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@types/estree", [\
+        ["npm:1.0.0", {\
+          "packageLocation": "./.yarn/cache/@types-estree-npm-1.0.0-eddde5b631-910d97fb70.zip/node_modules/@types/estree/",\
+          "packageDependencies": [\
+            ["@types/estree", "npm:1.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@types/jest", [\
-        ["npm:27.4.1", {\
-          "packageLocation": "./.yarn/cache/@types-jest-npm-27.4.1-31d07cd0d8-5184f3eef4.zip/node_modules/@types/jest/",\
+      ["@types/istanbul-lib-coverage", [\
+        ["npm:2.0.4", {\
+          "packageLocation": "./.yarn/cache/@types-istanbul-lib-coverage-npm-2.0.4-734954bb56-a25d7589ee.zip/node_modules/@types/istanbul-lib-coverage/",\
           "packageDependencies": [\
-            ["@types/jest", "npm:27.4.1"],\
-            ["jest-matcher-utils", "npm:27.5.1"],\
-            ["pretty-format", "npm:27.5.1"]\
+            ["@types/istanbul-lib-coverage", "npm:2.0.4"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -2219,6 +2634,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["@types/katex", [\
+        ["npm:0.16.5", {\
+          "packageLocation": "./.yarn/cache/@types-katex-npm-0.16.5-ff9336f176-a1ce22cd87.zip/node_modules/@types/katex/",\
+          "packageDependencies": [\
+            ["@types/katex", "npm:0.16.5"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["@types/lodash", [\
         ["npm:4.14.182", {\
           "packageLocation": "./.yarn/cache/@types-lodash-npm-4.14.182-1073aac722-7dd137aa9d.zip/node_modules/@types/lodash/",\
@@ -2226,26 +2650,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@types/lodash", "npm:4.14.182"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:4.14.200", {\
+          "packageLocation": "./.yarn/cache/@types-lodash-npm-4.14.200-8559f51fce-6471f8bb5d.zip/node_modules/@types/lodash/",\
+          "packageDependencies": [\
+            ["@types/lodash", "npm:4.14.200"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["@types/lodash-es", [\
-        ["npm:4.17.6", {\
-          "packageLocation": "./.yarn/cache/@types-lodash-es-npm-4.17.6-fd5abbdc74-9bd239dd52.zip/node_modules/@types/lodash-es/",\
+        ["npm:4.17.10", {\
+          "packageLocation": "./.yarn/cache/@types-lodash-es-npm-4.17.10-a7dae21818-129e9dde83.zip/node_modules/@types/lodash-es/",\
           "packageDependencies": [\
-            ["@types/lodash-es", "npm:4.17.6"],\
+            ["@types/lodash-es", "npm:4.17.10"],\
             ["@types/lodash", "npm:4.14.182"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@types/node", [\
-        ["npm:14.18.18", {\
-          "packageLocation": "./.yarn/cache/@types-node-npm-14.18.18-2f8f733938-a165225cd2.zip/node_modules/@types/node/",\
-          "packageDependencies": [\
-            ["@types/node", "npm:14.18.18"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["npm:17.0.29", {\
           "packageLocation": "./.yarn/cache/@types-node-npm-17.0.29-0de8e6d3d0-bb9d7bce9d.zip/node_modules/@types/node/",\
           "packageDependencies": [\
@@ -2263,193 +2687,213 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@types/sinonjs__fake-timers", [\
-        ["npm:8.1.1", {\
-          "packageLocation": "./.yarn/cache/@types-sinonjs__fake-timers-npm-8.1.1-95ac9b59b5-ca09d54d47.zip/node_modules/@types/sinonjs__fake-timers/",\
+      ["@ungap/structured-clone", [\
+        ["npm:1.2.0", {\
+          "packageLocation": "./.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip/node_modules/@ungap/structured-clone/",\
+          "packageDependencies": [\
+            ["@ungap/structured-clone", "npm:1.2.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@vitejs/plugin-vue", [\
+        ["npm:4.6.2", {\
+          "packageLocation": "./.yarn/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip/node_modules/@vitejs/plugin-vue/",\
+          "packageDependencies": [\
+            ["@vitejs/plugin-vue", "npm:4.6.2"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.6.2", {\
+          "packageLocation": "./.yarn/__virtual__/@vitejs-plugin-vue-virtual-090b584a9c/0/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip/node_modules/@vitejs/plugin-vue/",\
           "packageDependencies": [\
-            ["@types/sinonjs__fake-timers", "npm:8.1.1"]\
+            ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.6.2"],\
+            ["@types/vite", null],\
+            ["@types/vue", null],\
+            ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3"],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
+          ],\
+          "packagePeers": [\
+            "@types/vite",\
+            "@types/vue",\
+            "vite",\
+            "vue"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@types/sizzle", [\
-        ["npm:2.3.3", {\
-          "packageLocation": "./.yarn/cache/@types-sizzle-npm-2.3.3-9403924950-586a9fb1f6.zip/node_modules/@types/sizzle/",\
+      ["@volar/language-core", [\
+        ["npm:2.1.4", {\
+          "packageLocation": "./.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip/node_modules/@volar/language-core/",\
           "packageDependencies": [\
-            ["@types/sizzle", "npm:2.3.3"]\
+            ["@volar/language-core", "npm:2.1.4"],\
+            ["@volar/source-map", "npm:2.1.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@types/yauzl", [\
-        ["npm:2.10.0", {\
-          "packageLocation": "./.yarn/cache/@types-yauzl-npm-2.10.0-7b242343cb-55d27ae5d3.zip/node_modules/@types/yauzl/",\
+      ["@volar/language-service", [\
+        ["npm:2.1.4", {\
+          "packageLocation": "./.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip/node_modules/@volar/language-service/",\
           "packageDependencies": [\
-            ["@types/yauzl", "npm:2.10.0"],\
-            ["@types/node", "npm:14.18.18"]\
+            ["@volar/language-service", "npm:2.1.4"],\
+            ["@volar/language-core", "npm:2.1.4"],\
+            ["vscode-languageserver-protocol", "npm:3.17.5"],\
+            ["vscode-languageserver-textdocument", "npm:1.0.11"],\
+            ["vscode-uri", "npm:3.0.8"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@vitejs/plugin-vue", [\
-        ["npm:2.3.4", {\
-          "packageLocation": "./.yarn/cache/@vitejs-plugin-vue-npm-2.3.4-05d77ad5d1-1203eda14a.zip/node_modules/@vitejs/plugin-vue/",\
+      ["@volar/source-map", [\
+        ["npm:2.1.4", {\
+          "packageLocation": "./.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip/node_modules/@volar/source-map/",\
           "packageDependencies": [\
-            ["@vitejs/plugin-vue", "npm:2.3.4"]\
+            ["@volar/source-map", "npm:2.1.4"],\
+            ["muggle-string", "npm:0.4.1"]\
           ],\
-          "linkType": "SOFT"\
-        }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.3.4", {\
-          "packageLocation": "./.yarn/__virtual__/@vitejs-plugin-vue-virtual-7ffa9ddb12/0/cache/@vitejs-plugin-vue-npm-2.3.4-05d77ad5d1-1203eda14a.zip/node_modules/@vitejs/plugin-vue/",\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["@vscode/l10n", [\
+        ["npm:0.0.18", {\
+          "packageLocation": "./.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip/node_modules/@vscode/l10n/",\
           "packageDependencies": [\
-            ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.3.4"],\
-            ["@types/vite", null],\
-            ["@types/vue", null],\
-            ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.9.15"],\
-            ["vue", "npm:3.2.40"]\
-          ],\
-          "packagePeers": [\
-            "@types/vite",\
-            "@types/vue",\
-            "vite",\
-            "vue"\
+            ["@vscode/l10n", "npm:0.0.18"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@vue/compiler-core", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-compiler-core-npm-3.2.40-f464645db3-2683bf13ef.zip/node_modules/@vue/compiler-core/",\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-compiler-core-npm-3.4.21-ec7f24d7f5-0d6b7732bc.zip/node_modules/@vue/compiler-core/",\
           "packageDependencies": [\
-            ["@vue/compiler-core", "npm:3.2.40"],\
-            ["@babel/parser", "npm:7.18.4"],\
-            ["@vue/shared", "npm:3.2.40"],\
+            ["@vue/compiler-core", "npm:3.4.21"],\
+            ["@babel/parser", "npm:7.23.9"],\
+            ["@vue/shared", "npm:3.4.21"],\
+            ["entities", "npm:4.5.0"],\
             ["estree-walker", "npm:2.0.2"],\
-            ["source-map", "npm:0.6.1"]\
+            ["source-map-js", "npm:1.0.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@vue/compiler-dom", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-compiler-dom-npm-3.2.40-df00f2f10c-d928a16ebd.zip/node_modules/@vue/compiler-dom/",\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-compiler-dom-npm-3.4.21-3d49f99020-f53e4f4e0a.zip/node_modules/@vue/compiler-dom/",\
           "packageDependencies": [\
-            ["@vue/compiler-dom", "npm:3.2.40"],\
-            ["@vue/compiler-core", "npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"]\
+            ["@vue/compiler-dom", "npm:3.4.21"],\
+            ["@vue/compiler-core", "npm:3.4.21"],\
+            ["@vue/shared", "npm:3.4.21"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@vue/compiler-sfc", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-compiler-sfc-npm-3.2.40-7a8032e16c-96cbfd078a.zip/node_modules/@vue/compiler-sfc/",\
-          "packageDependencies": [\
-            ["@vue/compiler-sfc", "npm:3.2.40"],\
-            ["@babel/parser", "npm:7.18.4"],\
-            ["@vue/compiler-core", "npm:3.2.40"],\
-            ["@vue/compiler-dom", "npm:3.2.40"],\
-            ["@vue/compiler-ssr", "npm:3.2.40"],\
-            ["@vue/reactivity-transform", "npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"],\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-compiler-sfc-npm-3.4.21-c2b76ee1ff-226dc404be.zip/node_modules/@vue/compiler-sfc/",\
+          "packageDependencies": [\
+            ["@vue/compiler-sfc", "npm:3.4.21"],\
+            ["@babel/parser", "npm:7.23.9"],\
+            ["@vue/compiler-core", "npm:3.4.21"],\
+            ["@vue/compiler-dom", "npm:3.4.21"],\
+            ["@vue/compiler-ssr", "npm:3.4.21"],\
+            ["@vue/shared", "npm:3.4.21"],\
             ["estree-walker", "npm:2.0.2"],\
-            ["magic-string", "npm:0.25.9"],\
-            ["postcss", "npm:8.4.12"],\
-            ["source-map", "npm:0.6.1"]\
+            ["magic-string", "npm:0.30.7"],\
+            ["postcss", "npm:8.4.35"],\
+            ["source-map-js", "npm:1.0.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@vue/compiler-ssr", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-compiler-ssr-npm-3.2.40-76cabde3f1-026461fcee.zip/node_modules/@vue/compiler-ssr/",\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-compiler-ssr-npm-3.4.21-e6f043341e-c510bee68b.zip/node_modules/@vue/compiler-ssr/",\
           "packageDependencies": [\
-            ["@vue/compiler-ssr", "npm:3.2.40"],\
-            ["@vue/compiler-dom", "npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"]\
+            ["@vue/compiler-ssr", "npm:3.4.21"],\
+            ["@vue/compiler-dom", "npm:3.4.21"],\
+            ["@vue/shared", "npm:3.4.21"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@vue/devtools-api", [\
-        ["npm:6.1.4", {\
-          "packageLocation": "./.yarn/cache/@vue-devtools-api-npm-6.1.4-4ee2c9cc71-027bb138b0.zip/node_modules/@vue/devtools-api/",\
+        ["npm:6.5.0", {\
+          "packageLocation": "./.yarn/cache/@vue-devtools-api-npm-6.5.0-0dc0468299-ec819ef3a4.zip/node_modules/@vue/devtools-api/",\
           "packageDependencies": [\
-            ["@vue/devtools-api", "npm:6.1.4"]\
+            ["@vue/devtools-api", "npm:6.5.0"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:6.2.1", {\
-          "packageLocation": "./.yarn/cache/@vue-devtools-api-npm-6.2.1-252fdd4f01-34765af0be.zip/node_modules/@vue/devtools-api/",\
+        ["npm:6.6.1", {\
+          "packageLocation": "./.yarn/cache/@vue-devtools-api-npm-6.6.1-ef3c82703e-cf12b5ebcc.zip/node_modules/@vue/devtools-api/",\
           "packageDependencies": [\
-            ["@vue/devtools-api", "npm:6.2.1"]\
+            ["@vue/devtools-api", "npm:6.6.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@vue/reactivity", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-reactivity-npm-3.2.40-d9155c50c7-927d22b424.zip/node_modules/@vue/reactivity/",\
+      ["@vue/language-plugin-pug", [\
+        ["npm:2.0.7", {\
+          "packageLocation": "./.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip/node_modules/@vue/language-plugin-pug/",\
           "packageDependencies": [\
-            ["@vue/reactivity", "npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"]\
+            ["@vue/language-plugin-pug", "npm:2.0.7"],\
+            ["@volar/source-map", "npm:2.1.4"],\
+            ["volar-service-pug", "npm:0.0.34"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["@vue/reactivity-transform", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-reactivity-transform-npm-3.2.40-c8706743e9-b86fc29b52.zip/node_modules/@vue/reactivity-transform/",\
+      ["@vue/reactivity", [\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-reactivity-npm-3.4.21-fd3e254d08-79c7ebe3ec.zip/node_modules/@vue/reactivity/",\
           "packageDependencies": [\
-            ["@vue/reactivity-transform", "npm:3.2.40"],\
-            ["@babel/parser", "npm:7.18.4"],\
-            ["@vue/compiler-core", "npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"],\
-            ["estree-walker", "npm:2.0.2"],\
-            ["magic-string", "npm:0.25.9"]\
+            ["@vue/reactivity", "npm:3.4.21"],\
+            ["@vue/shared", "npm:3.4.21"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@vue/runtime-core", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-runtime-core-npm-3.2.40-62158afe79-47c4918c12.zip/node_modules/@vue/runtime-core/",\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-runtime-core-npm-3.4.21-7bf985040b-4eb9b5d91f.zip/node_modules/@vue/runtime-core/",\
           "packageDependencies": [\
-            ["@vue/runtime-core", "npm:3.2.40"],\
-            ["@vue/reactivity", "npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"]\
+            ["@vue/runtime-core", "npm:3.4.21"],\
+            ["@vue/reactivity", "npm:3.4.21"],\
+            ["@vue/shared", "npm:3.4.21"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@vue/runtime-dom", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-runtime-dom-npm-3.2.40-1bb705cd21-4615d00cc4.zip/node_modules/@vue/runtime-dom/",\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-runtime-dom-npm-3.4.21-40f99cf9a2-ebfdaa081f.zip/node_modules/@vue/runtime-dom/",\
           "packageDependencies": [\
-            ["@vue/runtime-dom", "npm:3.2.40"],\
-            ["@vue/runtime-core", "npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"],\
-            ["csstype", "npm:2.6.20"]\
+            ["@vue/runtime-dom", "npm:3.4.21"],\
+            ["@vue/runtime-core", "npm:3.4.21"],\
+            ["@vue/shared", "npm:3.4.21"],\
+            ["csstype", "npm:3.1.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["@vue/server-renderer", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-server-renderer-npm-3.2.40-b8eff98a5b-f9d53aefca.zip/node_modules/@vue/server-renderer/",\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip/node_modules/@vue/server-renderer/",\
           "packageDependencies": [\
-            ["@vue/server-renderer", "npm:3.2.40"]\
+            ["@vue/server-renderer", "npm:3.4.21"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:ee1b0f06d22c7073f87fcc94e688c4d6a5316dd1aa1770a54121d2942b302f08768362afc7b1370cd6826afa7582fad4a548059bae34f23d21a4fef21024b7a3#npm:3.2.40", {\
-          "packageLocation": "./.yarn/__virtual__/@vue-server-renderer-virtual-ae692772cb/0/cache/@vue-server-renderer-npm-3.2.40-b8eff98a5b-f9d53aefca.zip/node_modules/@vue/server-renderer/",\
+        ["virtual:b79af6274dddda2b283f42be2b827e30c3e5389bce2938ee73bdb74ee9781811fc079c6836719e57940708d59b3beeb14d9e3c12f37f2d22582a53e6c32e4c97#npm:3.4.21", {\
+          "packageLocation": "./.yarn/__virtual__/@vue-server-renderer-virtual-4c61378d94/0/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip/node_modules/@vue/server-renderer/",\
           "packageDependencies": [\
-            ["@vue/server-renderer", "virtual:ee1b0f06d22c7073f87fcc94e688c4d6a5316dd1aa1770a54121d2942b302f08768362afc7b1370cd6826afa7582fad4a548059bae34f23d21a4fef21024b7a3#npm:3.2.40"],\
+            ["@vue/server-renderer", "virtual:b79af6274dddda2b283f42be2b827e30c3e5389bce2938ee73bdb74ee9781811fc079c6836719e57940708d59b3beeb14d9e3c12f37f2d22582a53e6c32e4c97#npm:3.4.21"],\
             ["@types/vue", null],\
-            ["@vue/compiler-ssr", "npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"],\
-            ["vue", "npm:3.2.40"]\
+            ["@vue/compiler-ssr", "npm:3.4.21"],\
+            ["@vue/shared", "npm:3.4.21"],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -2459,32 +2903,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["@vue/shared", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/@vue-shared-npm-3.2.40-6b1329b2bd-d91a1e12ff.zip/node_modules/@vue/shared/",\
-          "packageDependencies": [\
-            ["@vue/shared", "npm:3.2.40"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["@vue/test-utils", [\
-        ["npm:2.1.0", {\
-          "packageLocation": "./.yarn/cache/@vue-test-utils-npm-2.1.0-c3d34439bb-4612568209.zip/node_modules/@vue/test-utils/",\
-          "packageDependencies": [\
-            ["@vue/test-utils", "npm:2.1.0"]\
-          ],\
-          "linkType": "SOFT"\
-        }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.0", {\
-          "packageLocation": "./.yarn/__virtual__/@vue-test-utils-virtual-cd080f2035/0/cache/@vue-test-utils-npm-2.1.0-c3d34439bb-4612568209.zip/node_modules/@vue/test-utils/",\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/@vue-shared-npm-3.4.21-2aee4ae0bc-5f30a40891.zip/node_modules/@vue/shared/",\
           "packageDependencies": [\
-            ["@vue/test-utils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.0"],\
-            ["@types/vue", null],\
-            ["vue", "npm:3.2.40"]\
-          ],\
-          "packagePeers": [\
-            "@types/vue",\
-            "vue"\
+            ["@vue/shared", "npm:3.4.21"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -2515,17 +2937,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:8.7.1", {\
-          "packageLocation": "./.yarn/cache/acorn-npm-8.7.1-7c7a019990-aca0aabf98.zip/node_modules/acorn/",\
+        ["npm:8.10.0", {\
+          "packageLocation": "./.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip/node_modules/acorn/",\
           "packageDependencies": [\
-            ["acorn", "npm:8.7.1"]\
+            ["acorn", "npm:8.10.0"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:8.8.0", {\
-          "packageLocation": "./.yarn/cache/acorn-npm-8.8.0-9ef399ab45-7270ca82b2.zip/node_modules/acorn/",\
+        ["npm:8.7.1", {\
+          "packageLocation": "./.yarn/cache/acorn-npm-8.7.1-7c7a019990-aca0aabf98.zip/node_modules/acorn/",\
           "packageDependencies": [\
-            ["acorn", "npm:8.8.0"]\
+            ["acorn", "npm:8.7.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -2538,12 +2960,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:0371ef3614c1182c8fcb05e5954a5fd9c124be4b821bd43f5ef7bdb1bf9603ab5ec16aa2a2a1de93fa397b424774f98f00c5e66d99eec56be0bd9f2a1ab2c75f#npm:5.3.2", {\
-          "packageLocation": "./.yarn/__virtual__/acorn-jsx-virtual-c72fe04f43/0/cache/acorn-jsx-npm-5.3.2-d7594599ea-c3d3b2a89c.zip/node_modules/acorn-jsx/",\
+        ["virtual:a50722a5a9326b6a5f12350c494c4db3aa0f4caeac45e3e9e5fe071da20014ecfe738fe2ebe2c9c98abae81a4ea86b42f56d776b3bd5ec37f9ad3670c242b242#npm:5.3.2", {\
+          "packageLocation": "./.yarn/__virtual__/acorn-jsx-virtual-834321b202/0/cache/acorn-jsx-npm-5.3.2-d7594599ea-c3d3b2a89c.zip/node_modules/acorn-jsx/",\
           "packageDependencies": [\
-            ["acorn-jsx", "virtual:0371ef3614c1182c8fcb05e5954a5fd9c124be4b821bd43f5ef7bdb1bf9603ab5ec16aa2a2a1de93fa397b424774f98f00c5e66d99eec56be0bd9f2a1ab2c75f#npm:5.3.2"],\
+            ["acorn-jsx", "virtual:a50722a5a9326b6a5f12350c494c4db3aa0f4caeac45e3e9e5fe071da20014ecfe738fe2ebe2c9c98abae81a4ea86b42f56d776b3bd5ec37f9ad3670c242b242#npm:5.3.2"],\
             ["@types/acorn", null],\
-            ["acorn", "npm:8.8.0"]\
+            ["acorn", "npm:8.10.0"]\
           ],\
           "packagePeers": [\
             "@types/acorn",\
@@ -2565,15 +2987,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["acorn-walk", [\
-        ["npm:8.2.0", {\
-          "packageLocation": "./.yarn/cache/acorn-walk-npm-8.2.0-2f2cac3177-1715e76c01.zip/node_modules/acorn-walk/",\
-          "packageDependencies": [\
-            ["acorn-walk", "npm:8.2.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["agent-base", [\
         ["npm:6.0.2", {\
           "packageLocation": "./.yarn/cache/agent-base-npm-6.0.2-428f325a93-f52b6872cc.zip/node_modules/agent-base/",\
@@ -2631,25 +3044,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["ansi-colors", [\
-        ["npm:4.1.3", {\
-          "packageLocation": "./.yarn/cache/ansi-colors-npm-4.1.3-8ffd0ae6c7-a9c2ec8420.zip/node_modules/ansi-colors/",\
-          "packageDependencies": [\
-            ["ansi-colors", "npm:4.1.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["ansi-escapes", [\
-        ["npm:4.3.2", {\
-          "packageLocation": "./.yarn/cache/ansi-escapes-npm-4.3.2-3ad173702f-93111c4218.zip/node_modules/ansi-escapes/",\
-          "packageDependencies": [\
-            ["ansi-escapes", "npm:4.3.2"],\
-            ["type-fest", "npm:0.21.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["ansi-regex", [\
         ["npm:5.0.1", {\
           "packageLocation": "./.yarn/cache/ansi-regex-npm-5.0.1-c963a48615-2aa4bb54ca.zip/node_modules/ansi-regex/",\
@@ -2657,6 +3051,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["ansi-regex", "npm:5.0.1"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:6.0.1", {\
+          "packageLocation": "./.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip/node_modules/ansi-regex/",\
+          "packageDependencies": [\
+            ["ansi-regex", "npm:6.0.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["ansi-styles", [\
@@ -2676,10 +3077,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:5.2.0", {\
-          "packageLocation": "./.yarn/cache/ansi-styles-npm-5.2.0-72fc7003e3-d7f4e97ce0.zip/node_modules/ansi-styles/",\
+        ["npm:6.2.1", {\
+          "packageLocation": "./.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip/node_modules/ansi-styles/",\
           "packageDependencies": [\
-            ["ansi-styles", "npm:5.2.0"]\
+            ["ansi-styles", "npm:6.2.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -2704,15 +3105,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["arch", [\
-        ["npm:2.2.0", {\
-          "packageLocation": "./.yarn/cache/arch-npm-2.2.0-34797684d8-e21b763502.zip/node_modules/arch/",\
-          "packageDependencies": [\
-            ["arch", "npm:2.2.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["are-we-there-yet", [\
         ["npm:3.0.0", {\
           "packageLocation": "./.yarn/cache/are-we-there-yet-npm-3.0.0-1391430190-348edfdd93.zip/node_modules/are-we-there-yet/",\
@@ -2733,138 +3125,119 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["array-includes", [\
-        ["npm:3.1.4", {\
-          "packageLocation": "./.yarn/cache/array-includes-npm-3.1.4-79bb883109-69967c38c5.zip/node_modules/array-includes/",\
+      ["array-buffer-byte-length", [\
+        ["npm:1.0.0", {\
+          "packageLocation": "./.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip/node_modules/array-buffer-byte-length/",\
           "packageDependencies": [\
-            ["array-includes", "npm:3.1.4"],\
+            ["array-buffer-byte-length", "npm:1.0.0"],\
             ["call-bind", "npm:1.0.2"],\
-            ["define-properties", "npm:1.1.4"],\
-            ["es-abstract", "npm:1.19.5"],\
-            ["get-intrinsic", "npm:1.1.1"],\
-            ["is-string", "npm:1.0.7"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["array-union", [\
-        ["npm:2.1.0", {\
-          "packageLocation": "./.yarn/cache/array-union-npm-2.1.0-4e4852b221-5bee12395c.zip/node_modules/array-union/",\
-          "packageDependencies": [\
-            ["array-union", "npm:2.1.0"]\
+            ["is-array-buffer", "npm:3.0.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["array.prototype.flat", [\
-        ["npm:1.3.0", {\
-          "packageLocation": "./.yarn/cache/array.prototype.flat-npm-1.3.0-6c5c4292bd-2a652b3e8d.zip/node_modules/array.prototype.flat/",\
+      ["array-includes", [\
+        ["npm:3.1.7", {\
+          "packageLocation": "./.yarn/cache/array-includes-npm-3.1.7-d32a5ee179-06f9e4598f.zip/node_modules/array-includes/",\
           "packageDependencies": [\
-            ["array.prototype.flat", "npm:1.3.0"],\
+            ["array-includes", "npm:3.1.7"],\
             ["call-bind", "npm:1.0.2"],\
-            ["define-properties", "npm:1.1.4"],\
-            ["es-abstract", "npm:1.19.5"],\
-            ["es-shim-unscopables", "npm:1.0.0"]\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"],\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["is-string", "npm:1.0.7"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["asap", [\
-        ["npm:2.0.6", {\
-          "packageLocation": "./.yarn/cache/asap-npm-2.0.6-36714d439d-b296c92c4b.zip/node_modules/asap/",\
+      ["array.prototype.findlastindex", [\
+        ["npm:1.2.3", {\
+          "packageLocation": "./.yarn/cache/array.prototype.findlastindex-npm-1.2.3-2a36f4417b-31f35d7b37.zip/node_modules/array.prototype.findlastindex/",\
           "packageDependencies": [\
-            ["asap", "npm:2.0.6"]\
+            ["array.prototype.findlastindex", "npm:1.2.3"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"],\
+            ["es-shim-unscopables", "npm:1.0.0"],\
+            ["get-intrinsic", "npm:1.2.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["asn1", [\
-        ["npm:0.2.6", {\
-          "packageLocation": "./.yarn/cache/asn1-npm-0.2.6-bdd07356c4-39f2ae343b.zip/node_modules/asn1/",\
+      ["array.prototype.flat", [\
+        ["npm:1.3.2", {\
+          "packageLocation": "./.yarn/cache/array.prototype.flat-npm-1.3.2-350729f7f4-5d6b4bf102.zip/node_modules/array.prototype.flat/",\
           "packageDependencies": [\
-            ["asn1", "npm:0.2.6"],\
-            ["safer-buffer", "npm:2.1.2"]\
+            ["array.prototype.flat", "npm:1.3.2"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"],\
+            ["es-shim-unscopables", "npm:1.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["assert-never", [\
-        ["npm:1.2.1", {\
-          "packageLocation": "./.yarn/cache/assert-never-npm-1.2.1-d423b480cd-ea4f1756d9.zip/node_modules/assert-never/",\
+      ["array.prototype.flatmap", [\
+        ["npm:1.3.2", {\
+          "packageLocation": "./.yarn/cache/array.prototype.flatmap-npm-1.3.2-5c6a4af226-ce09fe21dc.zip/node_modules/array.prototype.flatmap/",\
           "packageDependencies": [\
-            ["assert-never", "npm:1.2.1"]\
+            ["array.prototype.flatmap", "npm:1.3.2"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"],\
+            ["es-shim-unscopables", "npm:1.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["assert-plus", [\
-        ["npm:1.0.0", {\
-          "packageLocation": "./.yarn/cache/assert-plus-npm-1.0.0-cac95ef098-19b4340cb8.zip/node_modules/assert-plus/",\
+      ["arraybuffer.prototype.slice", [\
+        ["npm:1.0.2", {\
+          "packageLocation": "./.yarn/cache/arraybuffer.prototype.slice-npm-1.0.2-4eda52ad8c-c200faf437.zip/node_modules/arraybuffer.prototype.slice/",\
           "packageDependencies": [\
-            ["assert-plus", "npm:1.0.0"]\
+            ["arraybuffer.prototype.slice", "npm:1.0.2"],\
+            ["array-buffer-byte-length", "npm:1.0.0"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"],\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["is-array-buffer", "npm:3.0.2"],\
+            ["is-shared-array-buffer", "npm:1.0.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["astral-regex", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/astral-regex-npm-2.0.0-f30d866aab-876231688c.zip/node_modules/astral-regex/",\
+      ["asap", [\
+        ["npm:2.0.6", {\
+          "packageLocation": "./.yarn/cache/asap-npm-2.0.6-36714d439d-b296c92c4b.zip/node_modules/asap/",\
           "packageDependencies": [\
-            ["astral-regex", "npm:2.0.0"]\
+            ["asap", "npm:2.0.6"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["async", [\
-        ["npm:3.2.3", {\
-          "packageLocation": "./.yarn/cache/async-npm-3.2.3-e9d6b79c88-c4bee57ab2.zip/node_modules/async/",\
+      ["assert-never", [\
+        ["npm:1.2.1", {\
+          "packageLocation": "./.yarn/cache/assert-never-npm-1.2.1-d423b480cd-ea4f1756d9.zip/node_modules/assert-never/",\
           "packageDependencies": [\
-            ["async", "npm:3.2.3"]\
+            ["assert-never", "npm:1.2.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["async-validator", [\
-        ["npm:4.1.1", {\
-          "packageLocation": "./.yarn/cache/async-validator-npm-4.1.1-470b8d5b59-88590ab8ad.zip/node_modules/async-validator/",\
-          "packageDependencies": [\
-            ["async-validator", "npm:4.1.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["asynckit", [\
-        ["npm:0.4.0", {\
-          "packageLocation": "./.yarn/cache/asynckit-npm-0.4.0-c718858525-7b78c451df.zip/node_modules/asynckit/",\
-          "packageDependencies": [\
-            ["asynckit", "npm:0.4.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["at-least-node", [\
-        ["npm:1.0.0", {\
-          "packageLocation": "./.yarn/cache/at-least-node-npm-1.0.0-2b36e661fa-463e2f8e43.zip/node_modules/at-least-node/",\
-          "packageDependencies": [\
-            ["at-least-node", "npm:1.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["aws-sign2", [\
-        ["npm:0.7.0", {\
-          "packageLocation": "./.yarn/cache/aws-sign2-npm-0.7.0-656c6cb84d-b148b0bb07.zip/node_modules/aws-sign2/",\
+        ["npm:4.2.5", {\
+          "packageLocation": "./.yarn/cache/async-validator-npm-4.2.5-4d61110c66-3e3d891a2e.zip/node_modules/async-validator/",\
           "packageDependencies": [\
-            ["aws-sign2", "npm:0.7.0"]\
+            ["async-validator", "npm:4.2.5"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["aws4", [\
-        ["npm:1.11.0", {\
-          "packageLocation": "./.yarn/cache/aws4-npm-1.11.0-283476ad94-5a00d045fd.zip/node_modules/aws4/",\
+      ["available-typed-arrays", [\
+        ["npm:1.0.5", {\
+          "packageLocation": "./.yarn/cache/available-typed-arrays-npm-1.0.5-88f321e4d3-20eb47b3ce.zip/node_modules/available-typed-arrays/",\
           "packageDependencies": [\
-            ["aws4", "npm:1.11.0"]\
+            ["available-typed-arrays", "npm:1.0.5"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -2898,25 +3271,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["base64-js", [\
-        ["npm:1.5.1", {\
-          "packageLocation": "./.yarn/cache/base64-js-npm-1.5.1-b2f7275641-669632eb37.zip/node_modules/base64-js/",\
-          "packageDependencies": [\
-            ["base64-js", "npm:1.5.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["bcrypt-pbkdf", [\
-        ["npm:1.0.2", {\
-          "packageLocation": "./.yarn/cache/bcrypt-pbkdf-npm-1.0.2-80db8b16ed-4edfc9fe7d.zip/node_modules/bcrypt-pbkdf/",\
-          "packageDependencies": [\
-            ["bcrypt-pbkdf", "npm:1.0.2"],\
-            ["tweetnacl", "npm:0.14.5"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["binary-extensions", [\
         ["npm:2.2.0", {\
           "packageLocation": "./.yarn/cache/binary-extensions-npm-2.2.0-180c33fec7-ccd267956c.zip/node_modules/binary-extensions/",\
@@ -2926,24 +3280,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["blob-util", [\
-        ["npm:2.0.2", {\
-          "packageLocation": "./.yarn/cache/blob-util-npm-2.0.2-8026c830fe-d543e6b92e.zip/node_modules/blob-util/",\
-          "packageDependencies": [\
-            ["blob-util", "npm:2.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["bluebird", [\
-        ["npm:3.7.2", {\
-          "packageLocation": "./.yarn/cache/bluebird-npm-3.7.2-6a54136ee3-869417503c.zip/node_modules/bluebird/",\
-          "packageDependencies": [\
-            ["bluebird", "npm:3.7.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["boolbase", [\
         ["npm:1.0.0", {\
           "packageLocation": "./.yarn/cache/boolbase-npm-1.0.0-965fe9af6d-3e25c80ef6.zip/node_modules/boolbase/",\
@@ -2961,10 +3297,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["npm:5.2.2", {\
-          "packageLocation": "./.yarn/cache/bootstrap-npm-5.2.2-8effda7631-14e6df28fe.zip/node_modules/bootstrap/",\
+        ["npm:5.3.3", {\
+          "packageLocation": "./.yarn/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip/node_modules/bootstrap/",\
           "packageDependencies": [\
-            ["bootstrap", "npm:5.2.2"]\
+            ["bootstrap", "npm:5.3.3"]\
           ],\
           "linkType": "SOFT"\
         }],\
@@ -2981,11 +3317,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.2.2", {\
-          "packageLocation": "./.yarn/__virtual__/bootstrap-virtual-b64c38c4a2/0/cache/bootstrap-npm-5.2.2-8effda7631-14e6df28fe.zip/node_modules/bootstrap/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.3.3", {\
+          "packageLocation": "./.yarn/__virtual__/bootstrap-virtual-2c24090b13/0/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip/node_modules/bootstrap/",\
           "packageDependencies": [\
-            ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.2.2"],\
-            ["@popperjs/core", "npm:2.11.6"],\
+            ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.3.3"],\
+            ["@popperjs/core", "npm:2.11.8"],\
             ["@types/popperjs__core", null]\
           ],\
           "packagePeers": [\
@@ -2996,10 +3332,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["bootstrap-icons", [\
-        ["npm:1.9.1", {\
-          "packageLocation": "./.yarn/cache/bootstrap-icons-npm-1.9.1-69d14bd4a0-b388264719.zip/node_modules/bootstrap-icons/",\
+        ["npm:1.11.3", {\
+          "packageLocation": "./.yarn/cache/bootstrap-icons-npm-1.11.3-8d5387bef2-d5cdb90fe3.zip/node_modules/bootstrap-icons/",\
           "packageDependencies": [\
-            ["bootstrap-icons", "npm:1.9.1"]\
+            ["bootstrap-icons", "npm:1.11.3"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -3034,10 +3370,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["browser-fs-access", [\
-        ["npm:0.31.0", {\
-          "packageLocation": "./.yarn/cache/browser-fs-access-npm-0.31.0-0e9a01c010-d1b6682415.zip/node_modules/browser-fs-access/",\
+        ["npm:0.35.0", {\
+          "packageLocation": "./.yarn/cache/browser-fs-access-npm-0.35.0-1577b5a7ba-5f3bf1ec17.zip/node_modules/browser-fs-access/",\
           "packageDependencies": [\
-            ["browser-fs-access", "npm:0.31.0"]\
+            ["browser-fs-access", "npm:0.35.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -3057,7 +3393,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageLocation": "./.yarn/cache/browserslist-npm-4.20.3-d7ff9d00b4-1e4b719ac2.zip/node_modules/browserslist/",\
           "packageDependencies": [\
             ["browserslist", "npm:4.20.3"],\
-            ["caniuse-lite", "npm:1.0.30001340"],\
+            ["caniuse-lite", "npm:1.0.30001430"],\
             ["electron-to-chromium", "npm:1.4.137"],\
             ["escalade", "npm:3.1.1"],\
             ["node-releases", "npm:2.0.4"],\
@@ -3066,31 +3402,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["buffer", [\
-        ["npm:5.7.1", {\
-          "packageLocation": "./.yarn/cache/buffer-npm-5.7.1-513ef8259e-e2cf8429e1.zip/node_modules/buffer/",\
-          "packageDependencies": [\
-            ["buffer", "npm:5.7.1"],\
-            ["base64-js", "npm:1.5.1"],\
-            ["ieee754", "npm:1.2.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["buffer-crc32", [\
-        ["npm:0.2.13", {\
-          "packageLocation": "./.yarn/cache/buffer-crc32-npm-0.2.13-c4b6fceac1-06252347ae.zip/node_modules/buffer-crc32/",\
-          "packageDependencies": [\
-            ["buffer-crc32", "npm:0.2.13"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["buffer-from", [\
-        ["npm:1.1.2", {\
-          "packageLocation": "./.yarn/cache/buffer-from-npm-1.1.2-03d2f20d7e-0448524a56.zip/node_modules/buffer-from/",\
+      ["builtin-modules", [\
+        ["npm:3.3.0", {\
+          "packageLocation": "./.yarn/cache/builtin-modules-npm-3.3.0-db4f3d32de-db021755d7.zip/node_modules/builtin-modules/",\
           "packageDependencies": [\
-            ["buffer-from", "npm:1.1.2"]\
+            ["builtin-modules", "npm:3.3.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -3106,22 +3422,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["c8", [\
-        ["npm:7.12.0", {\
-          "packageLocation": "./.yarn/cache/c8-npm-7.12.0-c808cac509-3b7fa9ad7c.zip/node_modules/c8/",\
+        ["npm:9.1.0", {\
+          "packageLocation": "./.yarn/cache/c8-npm-9.1.0-92c3d37f46-c5249bf9c3.zip/node_modules/c8/",\
           "packageDependencies": [\
-            ["c8", "npm:7.12.0"],\
+            ["c8", "npm:9.1.0"],\
             ["@bcoe/v8-coverage", "npm:0.2.3"],\
             ["@istanbuljs/schema", "npm:0.1.3"],\
             ["find-up", "npm:5.0.0"],\
-            ["foreground-child", "npm:2.0.0"],\
+            ["foreground-child", "npm:3.1.1"],\
             ["istanbul-lib-coverage", "npm:3.2.0"],\
-            ["istanbul-lib-report", "npm:3.0.0"],\
-            ["istanbul-reports", "npm:3.1.4"],\
-            ["rimraf", "npm:3.0.2"],\
+            ["istanbul-lib-report", "npm:3.0.1"],\
+            ["istanbul-reports", "npm:3.1.6"],\
             ["test-exclude", "npm:6.0.0"],\
             ["v8-to-istanbul", "npm:9.0.1"],\
-            ["yargs", "npm:16.2.0"],\
-            ["yargs-parser", "npm:20.2.9"]\
+            ["yargs", "npm:17.7.2"],\
+            ["yargs-parser", "npm:21.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -3153,15 +3468,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["cachedir", [\
-        ["npm:2.3.0", {\
-          "packageLocation": "./.yarn/cache/cachedir-npm-2.3.0-640dc16bbb-ec90cb0f2e.zip/node_modules/cachedir/",\
-          "packageDependencies": [\
-            ["cachedir", "npm:2.3.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["call-bind", [\
         ["npm:1.0.2", {\
           "packageLocation": "./.yarn/cache/call-bind-npm-1.0.2-c957124861-f8e31de9d1.zip/node_modules/call-bind/",\
@@ -3171,6 +3477,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["get-intrinsic", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.0.5", {\
+          "packageLocation": "./.yarn/cache/call-bind-npm-1.0.5-65600fae47-449e83ecbd.zip/node_modules/call-bind/",\
+          "packageDependencies": [\
+            ["call-bind", "npm:1.0.5"],\
+            ["function-bind", "npm:1.1.2"],\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["set-function-length", "npm:1.1.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["callsites", [\
@@ -3183,26 +3499,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["caniuse-lite", [\
-        ["npm:1.0.30001340", {\
-          "packageLocation": "./.yarn/cache/caniuse-lite-npm-1.0.30001340-5ba8569de6-5b419c93cb.zip/node_modules/caniuse-lite/",\
+        ["npm:1.0.30001430", {\
+          "packageLocation": "./.yarn/cache/caniuse-lite-npm-1.0.30001430-c181064805-15200fe265.zip/node_modules/caniuse-lite/",\
           "packageDependencies": [\
-            ["caniuse-lite", "npm:1.0.30001340"]\
+            ["caniuse-lite", "npm:1.0.30001430"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:1.0.30001414", {\
-          "packageLocation": "./.yarn/cache/caniuse-lite-npm-1.0.30001414-91010a4bbf-97210cfd15.zip/node_modules/caniuse-lite/",\
-          "packageDependencies": [\
-            ["caniuse-lite", "npm:1.0.30001414"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["caseless", [\
-        ["npm:0.12.0", {\
-          "packageLocation": "./.yarn/cache/caseless-npm-0.12.0-e83bc5df83-b43bd4c440.zip/node_modules/caseless/",\
+        ["npm:1.0.30001603", {\
+          "packageLocation": "./.yarn/cache/caniuse-lite-npm-1.0.30001603-77af81f60b-e66e0d24b8.zip/node_modules/caniuse-lite/",\
           "packageDependencies": [\
-            ["caseless", "npm:0.12.0"]\
+            ["caniuse-lite", "npm:1.0.30001603"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -3238,15 +3545,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["check-more-types", [\
-        ["npm:2.24.0", {\
-          "packageLocation": "./.yarn/cache/check-more-types-npm-2.24.0-fa2e491b27-b09080ec34.zip/node_modules/check-more-types/",\
-          "packageDependencies": [\
-            ["check-more-types", "npm:2.24.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["chokidar", [\
         ["npm:3.5.3", {\
           "packageLocation": "./.yarn/cache/chokidar-npm-3.5.3-c5f9b0a56a-b49fcde401.zip/node_modules/chokidar/",\
@@ -3282,15 +3580,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["ci-info", [\
-        ["npm:3.3.1", {\
-          "packageLocation": "./.yarn/cache/ci-info-npm-3.3.1-c80845db6d-244546317c.zip/node_modules/ci-info/",\
-          "packageDependencies": [\
-            ["ci-info", "npm:3.3.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["clean-stack", [\
         ["npm:2.2.0", {\
           "packageLocation": "./.yarn/cache/clean-stack-npm-2.2.0-a8ce435a5c-2ac8cd2b2f.zip/node_modules/clean-stack/",\
@@ -3300,43 +3589,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["cli-cursor", [\
-        ["npm:3.1.0", {\
-          "packageLocation": "./.yarn/cache/cli-cursor-npm-3.1.0-fee1e46b5e-2692784c6c.zip/node_modules/cli-cursor/",\
-          "packageDependencies": [\
-            ["cli-cursor", "npm:3.1.0"],\
-            ["restore-cursor", "npm:3.1.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["cli-table3", [\
-        ["npm:0.6.2", {\
-          "packageLocation": "./.yarn/cache/cli-table3-npm-0.6.2-dff919b99d-2f82391698.zip/node_modules/cli-table3/",\
-          "packageDependencies": [\
-            ["cli-table3", "npm:0.6.2"],\
-            ["@colors/colors", "npm:1.5.0"],\
-            ["string-width", "npm:4.2.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["cli-truncate", [\
-        ["npm:2.1.0", {\
-          "packageLocation": "./.yarn/cache/cli-truncate-npm-2.1.0-72184d3467-bf1e4e6195.zip/node_modules/cli-truncate/",\
-          "packageDependencies": [\
-            ["cli-truncate", "npm:2.1.0"],\
-            ["slice-ansi", "npm:3.0.0"],\
-            ["string-width", "npm:4.2.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["cliui", [\
-        ["npm:7.0.4", {\
-          "packageLocation": "./.yarn/cache/cliui-npm-7.0.4-d6b8a9edb6-ce2e8f578a.zip/node_modules/cliui/",\
+        ["npm:8.0.1", {\
+          "packageLocation": "./.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip/node_modules/cliui/",\
           "packageDependencies": [\
-            ["cliui", "npm:7.0.4"],\
+            ["cliui", "npm:8.0.1"],\
             ["string-width", "npm:4.2.3"],\
             ["strip-ansi", "npm:6.0.1"],\
             ["wrap-ansi", "npm:7.0.0"]\
@@ -3396,40 +3653,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["colorette", [\
-        ["npm:2.0.16", {\
-          "packageLocation": "./.yarn/cache/colorette-npm-2.0.16-7b996485d7-cd55596a3a.zip/node_modules/colorette/",\
-          "packageDependencies": [\
-            ["colorette", "npm:2.0.16"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["combined-stream", [\
-        ["npm:1.0.8", {\
-          "packageLocation": "./.yarn/cache/combined-stream-npm-1.0.8-dc14d4a63a-49fa4aeb49.zip/node_modules/combined-stream/",\
-          "packageDependencies": [\
-            ["combined-stream", "npm:1.0.8"],\
-            ["delayed-stream", "npm:1.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["commander", [\
-        ["npm:2.20.3", {\
-          "packageLocation": "./.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip/node_modules/commander/",\
-          "packageDependencies": [\
-            ["commander", "npm:2.20.3"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
-        ["npm:5.1.0", {\
-          "packageLocation": "./.yarn/cache/commander-npm-5.1.0-7e939e7832-0b7fec1712.zip/node_modules/commander/",\
-          "packageDependencies": [\
-            ["commander", "npm:5.1.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["npm:7.2.0", {\
           "packageLocation": "./.yarn/cache/commander-npm-7.2.0-19178180f8-53501cbeee.zip/node_modules/commander/",\
           "packageDependencies": [\
@@ -3438,15 +3662,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["common-tags", [\
-        ["npm:1.8.2", {\
-          "packageLocation": "./.yarn/cache/common-tags-npm-1.8.2-2c30ba69b3-767a6255a8.zip/node_modules/common-tags/",\
-          "packageDependencies": [\
-            ["common-tags", "npm:1.8.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["concat-map", [\
         ["npm:0.0.1", {\
           "packageLocation": "./.yarn/cache/concat-map-npm-0.0.1-85a921b7ee-902a9f5d89.zip/node_modules/concat-map/",\
@@ -3470,18 +3685,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageLocation": "./.yarn/cache/constantinople-npm-4.0.1-925d9c26ce-8f70f16ddf.zip/node_modules/constantinople/",\
           "packageDependencies": [\
             ["constantinople", "npm:4.0.1"],\
-            ["@babel/parser", "npm:7.18.4"],\
-            ["@babel/types", "npm:7.18.4"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["content-disposition", [\
-        ["npm:0.5.4", {\
-          "packageLocation": "./.yarn/cache/content-disposition-npm-0.5.4-2d93678616-afb9d545e2.zip/node_modules/content-disposition/",\
-          "packageDependencies": [\
-            ["content-disposition", "npm:0.5.4"],\
-            ["safe-buffer", "npm:5.2.1"]\
+            ["@babel/parser", "npm:7.18.4"],\
+            ["@babel/types", "npm:7.18.4"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -3496,15 +3701,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["core-util-is", [\
-        ["npm:1.0.2", {\
-          "packageLocation": "./.yarn/cache/core-util-is-npm-1.0.2-9fc2b94dc3-7a4c925b49.zip/node_modules/core-util-is/",\
-          "packageDependencies": [\
-            ["core-util-is", "npm:1.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["cosmiconfig", [\
         ["npm:7.0.1", {\
           "packageLocation": "./.yarn/cache/cosmiconfig-npm-7.0.1-dd19ae2403-4be63e7117.zip/node_modules/cosmiconfig/",\
@@ -3541,6 +3737,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["csstype", "npm:3.0.11"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:0.15.12", {\
+          "packageLocation": "./.yarn/cache/css-render-npm-0.15.12-ff93ab2bdd-80265c5055.zip/node_modules/css-render/",\
+          "packageDependencies": [\
+            ["css-render", "npm:0.15.12"],\
+            ["@emotion/hash", "npm:0.8.0"],\
+            ["csstype", "npm:3.0.11"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["css-select", [\
@@ -3597,99 +3802,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["csstype", [\
-        ["npm:2.6.20", {\
-          "packageLocation": "./.yarn/cache/csstype-npm-2.6.20-7c929732a1-cb5d5ded49.zip/node_modules/csstype/",\
-          "packageDependencies": [\
-            ["csstype", "npm:2.6.20"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["npm:3.0.11", {\
           "packageLocation": "./.yarn/cache/csstype-npm-3.0.11-b49897178d-95e56abfe9.zip/node_modules/csstype/",\
           "packageDependencies": [\
             ["csstype", "npm:3.0.11"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["cypress", [\
-        ["npm:10.9.0", {\
-          "packageLocation": "./.yarn/unplugged/cypress-npm-10.9.0-7807fe85fd/node_modules/cypress/",\
-          "packageDependencies": [\
-            ["cypress", "npm:10.9.0"],\
-            ["@cypress/request", "npm:2.88.10"],\
-            ["@cypress/xvfb", "npm:1.2.4"],\
-            ["@types/node", "npm:14.18.18"],\
-            ["@types/sinonjs__fake-timers", "npm:8.1.1"],\
-            ["@types/sizzle", "npm:2.3.3"],\
-            ["arch", "npm:2.2.0"],\
-            ["blob-util", "npm:2.0.2"],\
-            ["bluebird", "npm:3.7.2"],\
-            ["buffer", "npm:5.7.1"],\
-            ["cachedir", "npm:2.3.0"],\
-            ["chalk", "npm:4.1.2"],\
-            ["check-more-types", "npm:2.24.0"],\
-            ["cli-cursor", "npm:3.1.0"],\
-            ["cli-table3", "npm:0.6.2"],\
-            ["commander", "npm:5.1.0"],\
-            ["common-tags", "npm:1.8.2"],\
-            ["dayjs", "npm:1.11.2"],\
-            ["debug", "virtual:7807fe85fd2477d9e43a07a30de1135e6610e1a27055ecdb897fbd62c62175147205ba7dcf7a3c3c9c46c380ac7ee0bd64cc1901788ce9b481d88c2411eb16f2#npm:4.3.4"],\
-            ["enquirer", "npm:2.3.6"],\
-            ["eventemitter2", "npm:6.4.7"],\
-            ["execa", "npm:4.1.0"],\
-            ["executable", "npm:4.1.1"],\
-            ["extract-zip", "npm:2.0.1"],\
-            ["figures", "npm:3.2.0"],\
-            ["fs-extra", "npm:9.1.0"],\
-            ["getos", "npm:3.2.1"],\
-            ["is-ci", "npm:3.0.1"],\
-            ["is-installed-globally", "npm:0.4.0"],\
-            ["lazy-ass", "npm:1.6.0"],\
-            ["listr2", "virtual:7807fe85fd2477d9e43a07a30de1135e6610e1a27055ecdb897fbd62c62175147205ba7dcf7a3c3c9c46c380ac7ee0bd64cc1901788ce9b481d88c2411eb16f2#npm:3.14.0"],\
-            ["lodash", "npm:4.17.21"],\
-            ["log-symbols", "npm:4.1.0"],\
-            ["minimist", "npm:1.2.6"],\
-            ["ospath", "npm:1.2.2"],\
-            ["pretty-bytes", "npm:5.6.0"],\
-            ["proxy-from-env", "npm:1.0.0"],\
-            ["request-progress", "npm:3.0.0"],\
-            ["semver", "npm:7.3.7"],\
-            ["supports-color", "npm:8.1.1"],\
-            ["tmp", "npm:0.2.1"],\
-            ["untildify", "npm:4.0.0"],\
-            ["yauzl", "npm:2.10.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["cypress-real-events", [\
-        ["npm:1.7.1", {\
-          "packageLocation": "./.yarn/cache/cypress-real-events-npm-1.7.1-6d5a866c0e-b31c2facfa.zip/node_modules/cypress-real-events/",\
-          "packageDependencies": [\
-            ["cypress-real-events", "npm:1.7.1"]\
-          ],\
-          "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.7.1", {\
-          "packageLocation": "./.yarn/__virtual__/cypress-real-events-virtual-b344eb5fcd/0/cache/cypress-real-events-npm-1.7.1-6d5a866c0e-b31c2facfa.zip/node_modules/cypress-real-events/",\
+        ["npm:3.1.3", {\
+          "packageLocation": "./.yarn/cache/csstype-npm-3.1.3-e9a1c85013-8db785cc92.zip/node_modules/csstype/",\
           "packageDependencies": [\
-            ["cypress-real-events", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.7.1"],\
-            ["@types/cypress", null],\
-            ["cypress", "npm:10.9.0"]\
-          ],\
-          "packagePeers": [\
-            "@types/cypress",\
-            "cypress"\
+            ["csstype", "npm:3.1.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["d3", [\
-        ["npm:7.6.1", {\
-          "packageLocation": "./.yarn/cache/d3-npm-7.6.1-9545deaa85-af883cfeaf.zip/node_modules/d3/",\
+        ["npm:7.9.0", {\
+          "packageLocation": "./.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip/node_modules/d3/",\
           "packageDependencies": [\
-            ["d3", "npm:7.6.1"],\
+            ["d3", "npm:7.9.0"],\
             ["d3-array", "npm:3.1.6"],\
             ["d3-axis", "npm:3.0.0"],\
             ["d3-brush", "npm:3.0.0"],\
@@ -4055,39 +4187,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["dashdash", [\
-        ["npm:1.14.1", {\
-          "packageLocation": "./.yarn/cache/dashdash-npm-1.14.1-be8f10a286-3634c24957.zip/node_modules/dashdash/",\
-          "packageDependencies": [\
-            ["dashdash", "npm:1.14.1"],\
-            ["assert-plus", "npm:1.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["date-fns", [\
-        ["npm:2.28.0", {\
-          "packageLocation": "./.yarn/cache/date-fns-npm-2.28.0-c19c5add1b-a0516b2e4f.zip/node_modules/date-fns/",\
+        ["npm:2.30.0", {\
+          "packageLocation": "./.yarn/cache/date-fns-npm-2.30.0-895c790e0f-f7be015232.zip/node_modules/date-fns/",\
           "packageDependencies": [\
-            ["date-fns", "npm:2.28.0"]\
+            ["date-fns", "npm:2.30.0"],\
+            ["@babel/runtime", "npm:7.23.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["date-fns-tz", [\
-        ["npm:1.3.3", {\
-          "packageLocation": "./.yarn/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip/node_modules/date-fns-tz/",\
+        ["npm:2.0.0", {\
+          "packageLocation": "./.yarn/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip/node_modules/date-fns-tz/",\
           "packageDependencies": [\
-            ["date-fns-tz", "npm:1.3.3"]\
+            ["date-fns-tz", "npm:2.0.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:1.3.3", {\
-          "packageLocation": "./.yarn/__virtual__/date-fns-tz-virtual-e4fd8a7e2a/0/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip/node_modules/date-fns-tz/",\
+        ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:2.0.0", {\
+          "packageLocation": "./.yarn/__virtual__/date-fns-tz-virtual-6610d5adee/0/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip/node_modules/date-fns-tz/",\
           "packageDependencies": [\
-            ["date-fns-tz", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:1.3.3"],\
+            ["date-fns-tz", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:2.0.0"],\
             ["@types/date-fns", null],\
-            ["date-fns", "npm:2.28.0"]\
+            ["date-fns", "npm:2.30.0"]\
           ],\
           "packagePeers": [\
             "@types/date-fns",\
@@ -4096,15 +4219,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["dayjs", [\
-        ["npm:1.11.2", {\
-          "packageLocation": "./.yarn/cache/dayjs-npm-1.11.2-644b12fe04-78f8bd04a9.zip/node_modules/dayjs/",\
-          "packageDependencies": [\
-            ["dayjs", "npm:1.11.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["debug", [\
         ["npm:2.6.9", {\
           "packageLocation": "./.yarn/cache/debug-npm-2.6.9-7d4cb597dc-d2f51589ca.zip/node_modules/debug/",\
@@ -4127,10 +4241,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:396a3691f7b25accf085fe2fff1f56eb7540eff3f2e928a7572ca1de9b831ff8f22136404f236aaed35d90369918dfc34392844d0f822a310563f34746dfb015#npm:3.2.7", {\
-          "packageLocation": "./.yarn/__virtual__/debug-virtual-507f12afb6/0/cache/debug-npm-3.2.7-754e818c7a-b3d8c59407.zip/node_modules/debug/",\
+        ["virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7", {\
+          "packageLocation": "./.yarn/__virtual__/debug-virtual-d2345003b7/0/cache/debug-npm-3.2.7-754e818c7a-b3d8c59407.zip/node_modules/debug/",\
           "packageDependencies": [\
-            ["debug", "virtual:396a3691f7b25accf085fe2fff1f56eb7540eff3f2e928a7572ca1de9b831ff8f22136404f236aaed35d90369918dfc34392844d0f822a310563f34746dfb015#npm:3.2.7"],\
+            ["debug", "virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7"],\
             ["@types/supports-color", null],\
             ["ms", "npm:2.1.2"],\
             ["supports-color", null]\
@@ -4141,20 +4255,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["virtual:7807fe85fd2477d9e43a07a30de1135e6610e1a27055ecdb897fbd62c62175147205ba7dcf7a3c3c9c46c380ac7ee0bd64cc1901788ce9b481d88c2411eb16f2#npm:4.3.4", {\
-          "packageLocation": "./.yarn/__virtual__/debug-virtual-de68173bb9/0/cache/debug-npm-4.3.4-4513954577-3dbad3f94e.zip/node_modules/debug/",\
-          "packageDependencies": [\
-            ["debug", "virtual:7807fe85fd2477d9e43a07a30de1135e6610e1a27055ecdb897fbd62c62175147205ba7dcf7a3c3c9c46c380ac7ee0bd64cc1901788ce9b481d88c2411eb16f2#npm:4.3.4"],\
-            ["@types/supports-color", null],\
-            ["ms", "npm:2.1.2"],\
-            ["supports-color", "npm:8.1.1"]\
-          ],\
-          "packagePeers": [\
-            "@types/supports-color",\
-            "supports-color"\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4", {\
           "packageLocation": "./.yarn/__virtual__/debug-virtual-4488998e89/0/cache/debug-npm-4.3.4-4513954577-3dbad3f94e.zip/node_modules/debug/",\
           "packageDependencies": [\
@@ -4194,10 +4294,22 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["deepmerge", [\
-        ["npm:4.2.2", {\
-          "packageLocation": "./.yarn/cache/deepmerge-npm-4.2.2-112165ced2-a8c43a1ed8.zip/node_modules/deepmerge/",\
+        ["npm:4.3.1", {\
+          "packageLocation": "./.yarn/cache/deepmerge-npm-4.3.1-4f751a0844-2024c6a980.zip/node_modules/deepmerge/",\
+          "packageDependencies": [\
+            ["deepmerge", "npm:4.3.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["define-data-property", [\
+        ["npm:1.1.1", {\
+          "packageLocation": "./.yarn/cache/define-data-property-npm-1.1.1-2b5156d112-a29855ad3f.zip/node_modules/define-data-property/",\
           "packageDependencies": [\
-            ["deepmerge", "npm:4.2.2"]\
+            ["define-data-property", "npm:1.1.1"],\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["gopd", "npm:1.0.1"],\
+            ["has-property-descriptors", "npm:1.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -4211,6 +4323,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["object-keys", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.2.0", {\
+          "packageLocation": "./.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip/node_modules/define-properties/",\
+          "packageDependencies": [\
+            ["define-properties", "npm:1.2.0"],\
+            ["has-property-descriptors", "npm:1.0.0"],\
+            ["object-keys", "npm:1.1.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["delaunator", [\
@@ -4223,15 +4344,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["delayed-stream", [\
-        ["npm:1.0.0", {\
-          "packageLocation": "./.yarn/cache/delayed-stream-npm-1.0.0-c5a4c4cc02-46fe6e83e2.zip/node_modules/delayed-stream/",\
-          "packageDependencies": [\
-            ["delayed-stream", "npm:1.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["delegates", [\
         ["npm:1.0.0", {\
           "packageLocation": "./.yarn/cache/delegates-npm-1.0.0-9b1942d75f-a51744d9b5.zip/node_modules/delegates/",\
@@ -4273,23 +4385,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["detect-libc", "npm:1.0.3"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["diff-sequences", [\
-        ["npm:27.5.1", {\
-          "packageLocation": "./.yarn/cache/diff-sequences-npm-27.5.1-29338362fa-a00db5554c.zip/node_modules/diff-sequences/",\
-          "packageDependencies": [\
-            ["diff-sequences", "npm:27.5.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["dir-glob", [\
-        ["npm:3.0.1", {\
-          "packageLocation": "./.yarn/cache/dir-glob-npm-3.0.1-1aea628b1b-fa05e18324.zip/node_modules/dir-glob/",\
+        }],\
+        ["npm:2.0.2", {\
+          "packageLocation": "./.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip/node_modules/detect-libc/",\
           "packageDependencies": [\
-            ["dir-glob", "npm:3.0.1"],\
-            ["path-type", "npm:4.0.0"]\
+            ["detect-libc", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -4377,388 +4477,233 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         ["npm:5.1.0", {\
           "packageLocation": "./.yarn/cache/dotenv-expand-npm-5.1.0-c3fff50eb5-8017675b7f.zip/node_modules/dotenv-expand/",\
           "packageDependencies": [\
-            ["dotenv-expand", "npm:5.1.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["ecc-jsbn", [\
-        ["npm:0.1.2", {\
-          "packageLocation": "./.yarn/cache/ecc-jsbn-npm-0.1.2-85b7a7be89-22fef4b620.zip/node_modules/ecc-jsbn/",\
-          "packageDependencies": [\
-            ["ecc-jsbn", "npm:0.1.2"],\
-            ["jsbn", "npm:0.1.1"],\
-            ["safer-buffer", "npm:2.1.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["ee-first", [\
-        ["npm:1.1.1", {\
-          "packageLocation": "./.yarn/cache/ee-first-npm-1.1.1-33f8535b39-1b4cac778d.zip/node_modules/ee-first/",\
-          "packageDependencies": [\
-            ["ee-first", "npm:1.1.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["electron-to-chromium", [\
-        ["npm:1.4.137", {\
-          "packageLocation": "./.yarn/cache/electron-to-chromium-npm-1.4.137-35182e6efc-639d7b9490.zip/node_modules/electron-to-chromium/",\
-          "packageDependencies": [\
-            ["electron-to-chromium", "npm:1.4.137"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["emoji-regex", [\
-        ["npm:8.0.0", {\
-          "packageLocation": "./.yarn/cache/emoji-regex-npm-8.0.0-213764015c-d4c5c39d5a.zip/node_modules/emoji-regex/",\
-          "packageDependencies": [\
-            ["emoji-regex", "npm:8.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["encodeurl", [\
-        ["npm:1.0.2", {\
-          "packageLocation": "./.yarn/cache/encodeurl-npm-1.0.2-f8c8454c41-e50e3d508c.zip/node_modules/encodeurl/",\
-          "packageDependencies": [\
-            ["encodeurl", "npm:1.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["encoding", [\
-        ["npm:0.1.13", {\
-          "packageLocation": "./.yarn/cache/encoding-npm-0.1.13-82a1837d30-bb98632f8f.zip/node_modules/encoding/",\
-          "packageDependencies": [\
-            ["encoding", "npm:0.1.13"],\
-            ["iconv-lite", "npm:0.6.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["end-of-stream", [\
-        ["npm:1.4.4", {\
-          "packageLocation": "./.yarn/cache/end-of-stream-npm-1.4.4-497fc6dee1-530a5a5a1e.zip/node_modules/end-of-stream/",\
-          "packageDependencies": [\
-            ["end-of-stream", "npm:1.4.4"],\
-            ["once", "npm:1.4.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["enquirer", [\
-        ["npm:2.3.6", {\
-          "packageLocation": "./.yarn/cache/enquirer-npm-2.3.6-7899175762-1c0911e14a.zip/node_modules/enquirer/",\
-          "packageDependencies": [\
-            ["enquirer", "npm:2.3.6"],\
-            ["ansi-colors", "npm:4.1.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["entities", [\
-        ["npm:2.2.0", {\
-          "packageLocation": "./.yarn/cache/entities-npm-2.2.0-0fc8d5b2f7-19010dacaf.zip/node_modules/entities/",\
-          "packageDependencies": [\
-            ["entities", "npm:2.2.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
-        ["npm:3.0.1", {\
-          "packageLocation": "./.yarn/cache/entities-npm-3.0.1-21eeb201ba-aaf7f12033.zip/node_modules/entities/",\
-          "packageDependencies": [\
-            ["entities", "npm:3.0.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["env-paths", [\
-        ["npm:2.2.1", {\
-          "packageLocation": "./.yarn/cache/env-paths-npm-2.2.1-7c7577428c-65b5df55a8.zip/node_modules/env-paths/",\
-          "packageDependencies": [\
-            ["env-paths", "npm:2.2.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["err-code", [\
-        ["npm:2.0.3", {\
-          "packageLocation": "./.yarn/cache/err-code-npm-2.0.3-082e0ff9a7-8b7b1be20d.zip/node_modules/err-code/",\
-          "packageDependencies": [\
-            ["err-code", "npm:2.0.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["error-ex", [\
-        ["npm:1.3.2", {\
-          "packageLocation": "./.yarn/cache/error-ex-npm-1.3.2-5654f80c0f-c1c2b8b65f.zip/node_modules/error-ex/",\
-          "packageDependencies": [\
-            ["error-ex", "npm:1.3.2"],\
-            ["is-arrayish", "npm:0.2.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["es-abstract", [\
-        ["npm:1.19.5", {\
-          "packageLocation": "./.yarn/cache/es-abstract-npm-1.19.5-524a87d262-55199b0f17.zip/node_modules/es-abstract/",\
-          "packageDependencies": [\
-            ["es-abstract", "npm:1.19.5"],\
-            ["call-bind", "npm:1.0.2"],\
-            ["es-to-primitive", "npm:1.2.1"],\
-            ["function-bind", "npm:1.1.1"],\
-            ["get-intrinsic", "npm:1.1.1"],\
-            ["get-symbol-description", "npm:1.0.0"],\
-            ["has", "npm:1.0.3"],\
-            ["has-symbols", "npm:1.0.3"],\
-            ["internal-slot", "npm:1.0.3"],\
-            ["is-callable", "npm:1.2.4"],\
-            ["is-negative-zero", "npm:2.0.2"],\
-            ["is-regex", "npm:1.1.4"],\
-            ["is-shared-array-buffer", "npm:1.0.2"],\
-            ["is-string", "npm:1.0.7"],\
-            ["is-weakref", "npm:1.0.2"],\
-            ["object-inspect", "npm:1.12.0"],\
-            ["object-keys", "npm:1.1.1"],\
-            ["object.assign", "npm:4.1.2"],\
-            ["string.prototype.trimend", "npm:1.0.4"],\
-            ["string.prototype.trimstart", "npm:1.0.4"],\
-            ["unbox-primitive", "npm:1.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["es-shim-unscopables", [\
-        ["npm:1.0.0", {\
-          "packageLocation": "./.yarn/cache/es-shim-unscopables-npm-1.0.0-06186593f1-83e95cadbb.zip/node_modules/es-shim-unscopables/",\
-          "packageDependencies": [\
-            ["es-shim-unscopables", "npm:1.0.0"],\
-            ["has", "npm:1.0.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["es-to-primitive", [\
-        ["npm:1.2.1", {\
-          "packageLocation": "./.yarn/cache/es-to-primitive-npm-1.2.1-b7a7eac6c5-4ead6671a2.zip/node_modules/es-to-primitive/",\
-          "packageDependencies": [\
-            ["es-to-primitive", "npm:1.2.1"],\
-            ["is-callable", "npm:1.2.4"],\
-            ["is-date-object", "npm:1.0.5"],\
-            ["is-symbol", "npm:1.0.4"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["esbuild", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-npm-0.14.38-04b78ffe2b/node_modules/esbuild/",\
-          "packageDependencies": [\
-            ["esbuild", "npm:0.14.38"],\
-            ["esbuild-android-64", "npm:0.14.38"],\
-            ["esbuild-android-arm64", "npm:0.14.38"],\
-            ["esbuild-darwin-64", "npm:0.14.38"],\
-            ["esbuild-darwin-arm64", "npm:0.14.38"],\
-            ["esbuild-freebsd-64", "npm:0.14.38"],\
-            ["esbuild-freebsd-arm64", "npm:0.14.38"],\
-            ["esbuild-linux-32", "npm:0.14.38"],\
-            ["esbuild-linux-64", "npm:0.14.38"],\
-            ["esbuild-linux-arm", "npm:0.14.38"],\
-            ["esbuild-linux-arm64", "npm:0.14.38"],\
-            ["esbuild-linux-mips64le", "npm:0.14.38"],\
-            ["esbuild-linux-ppc64le", "npm:0.14.38"],\
-            ["esbuild-linux-riscv64", "npm:0.14.38"],\
-            ["esbuild-linux-s390x", "npm:0.14.38"],\
-            ["esbuild-netbsd-64", "npm:0.14.38"],\
-            ["esbuild-openbsd-64", "npm:0.14.38"],\
-            ["esbuild-sunos-64", "npm:0.14.38"],\
-            ["esbuild-windows-32", "npm:0.14.38"],\
-            ["esbuild-windows-64", "npm:0.14.38"],\
-            ["esbuild-windows-arm64", "npm:0.14.38"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["esbuild-android-64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-android-64-npm-0.14.38-6b82ed658f/node_modules/esbuild-android-64/",\
-          "packageDependencies": [\
-            ["esbuild-android-64", "npm:0.14.38"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["esbuild-android-arm64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-android-arm64-npm-0.14.38-64ce8c8c5a/node_modules/esbuild-android-arm64/",\
-          "packageDependencies": [\
-            ["esbuild-android-arm64", "npm:0.14.38"]\
+            ["dotenv-expand", "npm:5.1.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-darwin-64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-darwin-64-npm-0.14.38-fee9a60d9b/node_modules/esbuild-darwin-64/",\
+      ["eastasianwidth", [\
+        ["npm:0.2.0", {\
+          "packageLocation": "./.yarn/cache/eastasianwidth-npm-0.2.0-c37eb16bd1-7d00d7cd8e.zip/node_modules/eastasianwidth/",\
           "packageDependencies": [\
-            ["esbuild-darwin-64", "npm:0.14.38"]\
+            ["eastasianwidth", "npm:0.2.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-darwin-arm64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-darwin-arm64-npm-0.14.38-b37de966bb/node_modules/esbuild-darwin-arm64/",\
+      ["ee-first", [\
+        ["npm:1.1.1", {\
+          "packageLocation": "./.yarn/cache/ee-first-npm-1.1.1-33f8535b39-1b4cac778d.zip/node_modules/ee-first/",\
           "packageDependencies": [\
-            ["esbuild-darwin-arm64", "npm:0.14.38"]\
+            ["ee-first", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-freebsd-64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-freebsd-64-npm-0.14.38-aca18c247d/node_modules/esbuild-freebsd-64/",\
+      ["electron-to-chromium", [\
+        ["npm:1.4.137", {\
+          "packageLocation": "./.yarn/cache/electron-to-chromium-npm-1.4.137-35182e6efc-639d7b9490.zip/node_modules/electron-to-chromium/",\
           "packageDependencies": [\
-            ["esbuild-freebsd-64", "npm:0.14.38"]\
+            ["electron-to-chromium", "npm:1.4.137"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-freebsd-arm64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-freebsd-arm64-npm-0.14.38-7d463e95c8/node_modules/esbuild-freebsd-arm64/",\
+      ["emoji-regex", [\
+        ["npm:8.0.0", {\
+          "packageLocation": "./.yarn/cache/emoji-regex-npm-8.0.0-213764015c-d4c5c39d5a.zip/node_modules/emoji-regex/",\
           "packageDependencies": [\
-            ["esbuild-freebsd-arm64", "npm:0.14.38"]\
+            ["emoji-regex", "npm:8.0.0"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["esbuild-linux-32", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-linux-32-npm-0.14.38-5412bd9f4a/node_modules/esbuild-linux-32/",\
+        }],\
+        ["npm:9.2.2", {\
+          "packageLocation": "./.yarn/cache/emoji-regex-npm-9.2.2-e6fac8d058-8487182da7.zip/node_modules/emoji-regex/",\
           "packageDependencies": [\
-            ["esbuild-linux-32", "npm:0.14.38"]\
+            ["emoji-regex", "npm:9.2.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-linux-64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-linux-64-npm-0.14.38-c39b94428f/node_modules/esbuild-linux-64/",\
+      ["encodeurl", [\
+        ["npm:1.0.2", {\
+          "packageLocation": "./.yarn/cache/encodeurl-npm-1.0.2-f8c8454c41-e50e3d508c.zip/node_modules/encodeurl/",\
           "packageDependencies": [\
-            ["esbuild-linux-64", "npm:0.14.38"]\
+            ["encodeurl", "npm:1.0.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-linux-arm", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-linux-arm-npm-0.14.38-d3961a7850/node_modules/esbuild-linux-arm/",\
+      ["encoding", [\
+        ["npm:0.1.13", {\
+          "packageLocation": "./.yarn/cache/encoding-npm-0.1.13-82a1837d30-bb98632f8f.zip/node_modules/encoding/",\
           "packageDependencies": [\
-            ["esbuild-linux-arm", "npm:0.14.38"]\
+            ["encoding", "npm:0.1.13"],\
+            ["iconv-lite", "npm:0.6.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-linux-arm64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-linux-arm64-npm-0.14.38-cef31fba53/node_modules/esbuild-linux-arm64/",\
+      ["entities", [\
+        ["npm:2.2.0", {\
+          "packageLocation": "./.yarn/cache/entities-npm-2.2.0-0fc8d5b2f7-19010dacaf.zip/node_modules/entities/",\
           "packageDependencies": [\
-            ["esbuild-linux-arm64", "npm:0.14.38"]\
+            ["entities", "npm:2.2.0"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["esbuild-linux-mips64le", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-linux-mips64le-npm-0.14.38-892bc61b4a/node_modules/esbuild-linux-mips64le/",\
+        }],\
+        ["npm:3.0.1", {\
+          "packageLocation": "./.yarn/cache/entities-npm-3.0.1-21eeb201ba-aaf7f12033.zip/node_modules/entities/",\
           "packageDependencies": [\
-            ["esbuild-linux-mips64le", "npm:0.14.38"]\
+            ["entities", "npm:3.0.1"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["esbuild-linux-ppc64le", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-linux-ppc64le-npm-0.14.38-2a6c85c3a6/node_modules/esbuild-linux-ppc64le/",\
+        }],\
+        ["npm:4.5.0", {\
+          "packageLocation": "./.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip/node_modules/entities/",\
           "packageDependencies": [\
-            ["esbuild-linux-ppc64le", "npm:0.14.38"]\
+            ["entities", "npm:4.5.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-linux-riscv64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-linux-riscv64-npm-0.14.38-914b778d99/node_modules/esbuild-linux-riscv64/",\
+      ["env-paths", [\
+        ["npm:2.2.1", {\
+          "packageLocation": "./.yarn/cache/env-paths-npm-2.2.1-7c7577428c-65b5df55a8.zip/node_modules/env-paths/",\
           "packageDependencies": [\
-            ["esbuild-linux-riscv64", "npm:0.14.38"]\
+            ["env-paths", "npm:2.2.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-linux-s390x", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-linux-s390x-npm-0.14.38-849986d7ae/node_modules/esbuild-linux-s390x/",\
+      ["err-code", [\
+        ["npm:2.0.3", {\
+          "packageLocation": "./.yarn/cache/err-code-npm-2.0.3-082e0ff9a7-8b7b1be20d.zip/node_modules/err-code/",\
           "packageDependencies": [\
-            ["esbuild-linux-s390x", "npm:0.14.38"]\
+            ["err-code", "npm:2.0.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-netbsd-64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-netbsd-64-npm-0.14.38-dbbf2ab36f/node_modules/esbuild-netbsd-64/",\
+      ["error-ex", [\
+        ["npm:1.3.2", {\
+          "packageLocation": "./.yarn/cache/error-ex-npm-1.3.2-5654f80c0f-c1c2b8b65f.zip/node_modules/error-ex/",\
           "packageDependencies": [\
-            ["esbuild-netbsd-64", "npm:0.14.38"]\
+            ["error-ex", "npm:1.3.2"],\
+            ["is-arrayish", "npm:0.2.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-openbsd-64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-openbsd-64-npm-0.14.38-017edcbe34/node_modules/esbuild-openbsd-64/",\
-          "packageDependencies": [\
-            ["esbuild-openbsd-64", "npm:0.14.38"]\
+      ["es-abstract", [\
+        ["npm:1.22.3", {\
+          "packageLocation": "./.yarn/cache/es-abstract-npm-1.22.3-15a58832e5-b1bdc96285.zip/node_modules/es-abstract/",\
+          "packageDependencies": [\
+            ["es-abstract", "npm:1.22.3"],\
+            ["array-buffer-byte-length", "npm:1.0.0"],\
+            ["arraybuffer.prototype.slice", "npm:1.0.2"],\
+            ["available-typed-arrays", "npm:1.0.5"],\
+            ["call-bind", "npm:1.0.5"],\
+            ["es-set-tostringtag", "npm:2.0.1"],\
+            ["es-to-primitive", "npm:1.2.1"],\
+            ["function.prototype.name", "npm:1.1.6"],\
+            ["get-intrinsic", "npm:1.2.2"],\
+            ["get-symbol-description", "npm:1.0.0"],\
+            ["globalthis", "npm:1.0.3"],\
+            ["gopd", "npm:1.0.1"],\
+            ["has-property-descriptors", "npm:1.0.0"],\
+            ["has-proto", "npm:1.0.1"],\
+            ["has-symbols", "npm:1.0.3"],\
+            ["hasown", "npm:2.0.0"],\
+            ["internal-slot", "npm:1.0.5"],\
+            ["is-array-buffer", "npm:3.0.2"],\
+            ["is-callable", "npm:1.2.7"],\
+            ["is-negative-zero", "npm:2.0.2"],\
+            ["is-regex", "npm:1.1.4"],\
+            ["is-shared-array-buffer", "npm:1.0.2"],\
+            ["is-string", "npm:1.0.7"],\
+            ["is-typed-array", "npm:1.1.12"],\
+            ["is-weakref", "npm:1.0.2"],\
+            ["object-inspect", "npm:1.13.1"],\
+            ["object-keys", "npm:1.1.1"],\
+            ["object.assign", "npm:4.1.4"],\
+            ["regexp.prototype.flags", "npm:1.5.1"],\
+            ["safe-array-concat", "npm:1.0.1"],\
+            ["safe-regex-test", "npm:1.0.0"],\
+            ["string.prototype.trim", "npm:1.2.8"],\
+            ["string.prototype.trimend", "npm:1.0.7"],\
+            ["string.prototype.trimstart", "npm:1.0.7"],\
+            ["typed-array-buffer", "npm:1.0.0"],\
+            ["typed-array-byte-length", "npm:1.0.0"],\
+            ["typed-array-byte-offset", "npm:1.0.0"],\
+            ["typed-array-length", "npm:1.0.4"],\
+            ["unbox-primitive", "npm:1.0.2"],\
+            ["which-typed-array", "npm:1.1.13"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-sunos-64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-sunos-64-npm-0.14.38-904aa7cde2/node_modules/esbuild-sunos-64/",\
+      ["es-set-tostringtag", [\
+        ["npm:2.0.1", {\
+          "packageLocation": "./.yarn/cache/es-set-tostringtag-npm-2.0.1-c87b5de872-ec416a1294.zip/node_modules/es-set-tostringtag/",\
           "packageDependencies": [\
-            ["esbuild-sunos-64", "npm:0.14.38"]\
+            ["es-set-tostringtag", "npm:2.0.1"],\
+            ["get-intrinsic", "npm:1.2.0"],\
+            ["has", "npm:1.0.3"],\
+            ["has-tostringtag", "npm:1.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-windows-32", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-windows-32-npm-0.14.38-21ba7ca13b/node_modules/esbuild-windows-32/",\
+      ["es-shim-unscopables", [\
+        ["npm:1.0.0", {\
+          "packageLocation": "./.yarn/cache/es-shim-unscopables-npm-1.0.0-06186593f1-83e95cadbb.zip/node_modules/es-shim-unscopables/",\
           "packageDependencies": [\
-            ["esbuild-windows-32", "npm:0.14.38"]\
+            ["es-shim-unscopables", "npm:1.0.0"],\
+            ["has", "npm:1.0.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-windows-64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-windows-64-npm-0.14.38-67094dd963/node_modules/esbuild-windows-64/",\
+      ["es-to-primitive", [\
+        ["npm:1.2.1", {\
+          "packageLocation": "./.yarn/cache/es-to-primitive-npm-1.2.1-b7a7eac6c5-4ead6671a2.zip/node_modules/es-to-primitive/",\
           "packageDependencies": [\
-            ["esbuild-windows-64", "npm:0.14.38"]\
+            ["es-to-primitive", "npm:1.2.1"],\
+            ["is-callable", "npm:1.2.4"],\
+            ["is-date-object", "npm:1.0.5"],\
+            ["is-symbol", "npm:1.0.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["esbuild-windows-arm64", [\
-        ["npm:0.14.38", {\
-          "packageLocation": "./.yarn/unplugged/esbuild-windows-arm64-npm-0.14.38-9693d16298/node_modules/esbuild-windows-arm64/",\
-          "packageDependencies": [\
-            ["esbuild-windows-arm64", "npm:0.14.38"]\
+      ["esbuild", [\
+        ["npm:0.18.20", {\
+          "packageLocation": "./.yarn/unplugged/esbuild-npm-0.18.20-004a76d281/node_modules/esbuild/",\
+          "packageDependencies": [\
+            ["esbuild", "npm:0.18.20"],\
+            ["@esbuild/android-arm", "npm:0.18.20"],\
+            ["@esbuild/android-arm64", "npm:0.18.20"],\
+            ["@esbuild/android-x64", "npm:0.18.20"],\
+            ["@esbuild/darwin-arm64", "npm:0.18.20"],\
+            ["@esbuild/darwin-x64", "npm:0.18.20"],\
+            ["@esbuild/freebsd-arm64", "npm:0.18.20"],\
+            ["@esbuild/freebsd-x64", "npm:0.18.20"],\
+            ["@esbuild/linux-arm", "npm:0.18.20"],\
+            ["@esbuild/linux-arm64", "npm:0.18.20"],\
+            ["@esbuild/linux-ia32", "npm:0.18.20"],\
+            ["@esbuild/linux-loong64", "npm:0.18.20"],\
+            ["@esbuild/linux-mips64el", "npm:0.18.20"],\
+            ["@esbuild/linux-ppc64", "npm:0.18.20"],\
+            ["@esbuild/linux-riscv64", "npm:0.18.20"],\
+            ["@esbuild/linux-s390x", "npm:0.18.20"],\
+            ["@esbuild/linux-x64", "npm:0.18.20"],\
+            ["@esbuild/netbsd-x64", "npm:0.18.20"],\
+            ["@esbuild/openbsd-x64", "npm:0.18.20"],\
+            ["@esbuild/sunos-x64", "npm:0.18.20"],\
+            ["@esbuild/win32-arm64", "npm:0.18.20"],\
+            ["@esbuild/win32-ia32", "npm:0.18.20"],\
+            ["@esbuild/win32-x64", "npm:0.18.20"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -4798,73 +4743,94 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["eslint", [\
-        ["npm:8.24.0", {\
-          "packageLocation": "./.yarn/cache/eslint-npm-8.24.0-40a0bdeb6e-ca293ce711.zip/node_modules/eslint/",\
-          "packageDependencies": [\
-            ["eslint", "npm:8.24.0"],\
-            ["@eslint/eslintrc", "npm:1.3.2"],\
-            ["@humanwhocodes/config-array", "npm:0.10.7"],\
-            ["@humanwhocodes/gitignore-to-minimatch", "npm:1.0.2"],\
+        ["npm:8.57.0", {\
+          "packageLocation": "./.yarn/cache/eslint-npm-8.57.0-4286e12a3a-3a48d7ff85.zip/node_modules/eslint/",\
+          "packageDependencies": [\
+            ["eslint", "npm:8.57.0"],\
+            ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\
+            ["@eslint-community/regexpp", "npm:4.8.0"],\
+            ["@eslint/eslintrc", "npm:2.1.4"],\
+            ["@eslint/js", "npm:8.57.0"],\
+            ["@humanwhocodes/config-array", "npm:0.11.14"],\
             ["@humanwhocodes/module-importer", "npm:1.0.1"],\
+            ["@nodelib/fs.walk", "npm:1.2.8"],\
+            ["@ungap/structured-clone", "npm:1.2.0"],\
             ["ajv", "npm:6.12.6"],\
             ["chalk", "npm:4.1.2"],\
             ["cross-spawn", "npm:7.0.3"],\
             ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\
             ["doctrine", "npm:3.0.0"],\
             ["escape-string-regexp", "npm:4.0.0"],\
-            ["eslint-scope", "npm:7.1.1"],\
-            ["eslint-utils", "virtual:40a0bdeb6e3621efdf631788743b8ec8d771c56d9272b2284a5a1f514c5e160af34a3f6e3e8774da7ef77f162da73d63d5eea0dc2cdd80235dd3ca050e14a6e0#npm:3.0.0"],\
-            ["eslint-visitor-keys", "npm:3.3.0"],\
-            ["espree", "npm:9.4.0"],\
-            ["esquery", "npm:1.4.0"],\
+            ["eslint-scope", "npm:7.2.2"],\
+            ["eslint-visitor-keys", "npm:3.4.3"],\
+            ["espree", "npm:9.6.1"],\
+            ["esquery", "npm:1.5.0"],\
             ["esutils", "npm:2.0.3"],\
             ["fast-deep-equal", "npm:3.1.3"],\
             ["file-entry-cache", "npm:6.0.1"],\
             ["find-up", "npm:5.0.0"],\
             ["glob-parent", "npm:6.0.2"],\
-            ["globals", "npm:13.15.0"],\
-            ["globby", "npm:11.1.0"],\
-            ["grapheme-splitter", "npm:1.0.4"],\
+            ["globals", "npm:13.19.0"],\
+            ["graphemer", "npm:1.4.0"],\
             ["ignore", "npm:5.2.0"],\
-            ["import-fresh", "npm:3.3.0"],\
             ["imurmurhash", "npm:0.1.4"],\
             ["is-glob", "npm:4.0.3"],\
-            ["js-sdsl", "npm:4.1.5"],\
+            ["is-path-inside", "npm:3.0.3"],\
             ["js-yaml", "npm:4.1.0"],\
             ["json-stable-stringify-without-jsonify", "npm:1.0.1"],\
             ["levn", "npm:0.4.1"],\
             ["lodash.merge", "npm:4.6.2"],\
             ["minimatch", "npm:3.1.2"],\
             ["natural-compare", "npm:1.4.0"],\
-            ["optionator", "npm:0.9.1"],\
-            ["regexpp", "npm:3.2.0"],\
+            ["optionator", "npm:0.9.3"],\
             ["strip-ansi", "npm:6.0.1"],\
-            ["strip-json-comments", "npm:3.1.1"],\
             ["text-table", "npm:0.2.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
+      ["eslint-compat-utils", [\
+        ["npm:0.1.2", {\
+          "packageLocation": "./.yarn/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip/node_modules/eslint-compat-utils/",\
+          "packageDependencies": [\
+            ["eslint-compat-utils", "npm:0.1.2"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:ff64d06f93654b25d9cae47199e62d111efde9ee7d408664ae44397cd2ddf7906aefd54fcc2557f4d5619d92da3af68c7898126469c2a57c381e05b06491f0da#npm:0.1.2", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-compat-utils-virtual-a5f7e6147b/0/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip/node_modules/eslint-compat-utils/",\
+          "packageDependencies": [\
+            ["eslint-compat-utils", "virtual:ff64d06f93654b25d9cae47199e62d111efde9ee7d408664ae44397cd2ddf7906aefd54fcc2557f4d5619d92da3af68c7898126469c2a57c381e05b06491f0da#npm:0.1.2"],\
+            ["@types/eslint", null],\
+            ["eslint", "npm:8.57.0"]\
+          ],\
+          "packagePeers": [\
+            "@types/eslint",\
+            "eslint"\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["eslint-config-standard", [\
-        ["npm:17.0.0", {\
-          "packageLocation": "./.yarn/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip/node_modules/eslint-config-standard/",\
+        ["npm:17.1.0", {\
+          "packageLocation": "./.yarn/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip/node_modules/eslint-config-standard/",\
           "packageDependencies": [\
-            ["eslint-config-standard", "npm:17.0.0"]\
+            ["eslint-config-standard", "npm:17.1.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.0.0", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-config-standard-virtual-5de208ba69/0/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip/node_modules/eslint-config-standard/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.1.0", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-config-standard-virtual-a273ec9ea6/0/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip/node_modules/eslint-config-standard/",\
           "packageDependencies": [\
-            ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.0.0"],\
+            ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.1.0"],\
             ["@types/eslint", null],\
             ["@types/eslint-plugin-import", null],\
             ["@types/eslint-plugin-n", null],\
             ["@types/eslint-plugin-promise", null],\
-            ["eslint", "npm:8.24.0"],\
-            ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.26.0"],\
-            ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.3.0"],\
-            ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.0.1"]\
+            ["eslint", "npm:8.57.0"],\
+            ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1"],\
+            ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2"],\
+            ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"]\
           ],\
           "packagePeers": [\
             "@types/eslint-plugin-import",\
@@ -4880,67 +4846,71 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["eslint-import-resolver-node", [\
-        ["npm:0.3.6", {\
-          "packageLocation": "./.yarn/cache/eslint-import-resolver-node-npm-0.3.6-d9426786c6-6266733af1.zip/node_modules/eslint-import-resolver-node/",\
+        ["npm:0.3.9", {\
+          "packageLocation": "./.yarn/cache/eslint-import-resolver-node-npm-0.3.9-2a426afc4b-439b912712.zip/node_modules/eslint-import-resolver-node/",\
           "packageDependencies": [\
-            ["eslint-import-resolver-node", "npm:0.3.6"],\
-            ["debug", "virtual:396a3691f7b25accf085fe2fff1f56eb7540eff3f2e928a7572ca1de9b831ff8f22136404f236aaed35d90369918dfc34392844d0f822a310563f34746dfb015#npm:3.2.7"],\
-            ["resolve", "patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=07638b"]\
+            ["eslint-import-resolver-node", "npm:0.3.9"],\
+            ["debug", "virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7"],\
+            ["is-core-module", "npm:2.13.0"],\
+            ["resolve", "patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=07638b"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["eslint-module-utils", [\
-        ["npm:2.7.3", {\
-          "packageLocation": "./.yarn/cache/eslint-module-utils-npm-2.7.3-ccd32fe6fd-77048263f3.zip/node_modules/eslint-module-utils/",\
+        ["npm:2.8.0", {\
+          "packageLocation": "./.yarn/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip/node_modules/eslint-module-utils/",\
           "packageDependencies": [\
-            ["eslint-module-utils", "npm:2.7.3"]\
+            ["eslint-module-utils", "npm:2.8.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:c0858ad0a599e687a7d876de5591e3b098ca550f5c1ad46e7d0e2b6f5720a919cb228a47405daf7d626be1747e41a5b93e4b4d748f16d5e7c36c433aed618452#npm:2.7.3", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-module-utils-virtual-e944405700/0/cache/eslint-module-utils-npm-2.7.3-ccd32fe6fd-77048263f3.zip/node_modules/eslint-module-utils/",\
+        ["virtual:caddce79266c9767570f5c081ff9adaab1d8b040965749cfca6a3f3f4fbd011bf36f7d755f18ef80e67a5402a33b10c9e1ffc34efb6909461044fc5d60cfbcd0#npm:2.8.0", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-module-utils-virtual-d80573de1e/0/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip/node_modules/eslint-module-utils/",\
           "packageDependencies": [\
-            ["eslint-module-utils", "virtual:c0858ad0a599e687a7d876de5591e3b098ca550f5c1ad46e7d0e2b6f5720a919cb228a47405daf7d626be1747e41a5b93e4b4d748f16d5e7c36c433aed618452#npm:2.7.3"],\
+            ["eslint-module-utils", "virtual:caddce79266c9767570f5c081ff9adaab1d8b040965749cfca6a3f3f4fbd011bf36f7d755f18ef80e67a5402a33b10c9e1ffc34efb6909461044fc5d60cfbcd0#npm:2.8.0"],\
+            ["@types/eslint", null],\
             ["@types/eslint-import-resolver-node", null],\
             ["@types/eslint-import-resolver-typescript", null],\
             ["@types/eslint-import-resolver-webpack", null],\
             ["@types/typescript-eslint__parser", null],\
             ["@typescript-eslint/parser", null],\
-            ["debug", "virtual:396a3691f7b25accf085fe2fff1f56eb7540eff3f2e928a7572ca1de9b831ff8f22136404f236aaed35d90369918dfc34392844d0f822a310563f34746dfb015#npm:3.2.7"],\
-            ["eslint-import-resolver-node", "npm:0.3.6"],\
+            ["debug", "virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7"],\
+            ["eslint", "npm:8.57.0"],\
+            ["eslint-import-resolver-node", "npm:0.3.9"],\
             ["eslint-import-resolver-typescript", null],\
-            ["eslint-import-resolver-webpack", null],\
-            ["find-up", "npm:2.1.0"]\
+            ["eslint-import-resolver-webpack", null]\
           ],\
           "packagePeers": [\
             "@types/eslint-import-resolver-node",\
             "@types/eslint-import-resolver-typescript",\
             "@types/eslint-import-resolver-webpack",\
+            "@types/eslint",\
             "@types/typescript-eslint__parser",\
             "@typescript-eslint/parser",\
             "eslint-import-resolver-node",\
             "eslint-import-resolver-typescript",\
-            "eslint-import-resolver-webpack"\
+            "eslint-import-resolver-webpack",\
+            "eslint"\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["eslint-plugin-cypress", [\
-        ["npm:2.12.1", {\
-          "packageLocation": "./.yarn/cache/eslint-plugin-cypress-npm-2.12.1-6681f582fa-1f1c36e149.zip/node_modules/eslint-plugin-cypress/",\
+        ["npm:2.15.1", {\
+          "packageLocation": "./.yarn/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip/node_modules/eslint-plugin-cypress/",\
           "packageDependencies": [\
-            ["eslint-plugin-cypress", "npm:2.12.1"]\
+            ["eslint-plugin-cypress", "npm:2.15.1"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.1", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-plugin-cypress-virtual-3210db2eaa/0/cache/eslint-plugin-cypress-npm-2.12.1-6681f582fa-1f1c36e149.zip/node_modules/eslint-plugin-cypress/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.15.1", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-plugin-cypress-virtual-33ce75aabf/0/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip/node_modules/eslint-plugin-cypress/",\
           "packageDependencies": [\
-            ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.1"],\
+            ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.15.1"],\
             ["@types/eslint", null],\
-            ["eslint", "npm:8.24.0"],\
-            ["globals", "npm:11.12.0"]\
+            ["eslint", "npm:8.57.0"],\
+            ["globals", "npm:13.21.0"]\
           ],\
           "packagePeers": [\
             "@types/eslint",\
@@ -4957,19 +4927,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["npm:4.1.0", {\
-          "packageLocation": "./.yarn/cache/eslint-plugin-es-npm-4.1.0-a4cf26d3cd-26b87a216d.zip/node_modules/eslint-plugin-es/",\
-          "packageDependencies": [\
-            ["eslint-plugin-es", "npm:4.1.0"]\
-          ],\
-          "linkType": "SOFT"\
-        }],\
         ["virtual:5cccaf00e87dfff96dbbb5eaf7a3055373358b8114d6a1adfb32f54ed6b40ba06068d3aa1fdd8062899a0cad040f68c17cc6b72bac2cdbe9700f3d6330d112f3#npm:3.0.1", {\
           "packageLocation": "./.yarn/__virtual__/eslint-plugin-es-virtual-9a126af2f5/0/cache/eslint-plugin-es-npm-3.0.1-95e8015220-e57592c523.zip/node_modules/eslint-plugin-es/",\
           "packageDependencies": [\
             ["eslint-plugin-es", "virtual:5cccaf00e87dfff96dbbb5eaf7a3055373358b8114d6a1adfb32f54ed6b40ba06068d3aa1fdd8062899a0cad040f68c17cc6b72bac2cdbe9700f3d6330d112f3#npm:3.0.1"],\
             ["@types/eslint", null],\
-            ["eslint", "npm:8.24.0"],\
+            ["eslint", "npm:8.57.0"],\
             ["eslint-utils", "npm:2.1.0"],\
             ["regexpp", "npm:3.2.0"]\
           ],\
@@ -4978,15 +4941,25 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             "eslint"\
           ],\
           "linkType": "HARD"\
+        }]\
+      ]],\
+      ["eslint-plugin-es-x", [\
+        ["npm:7.5.0", {\
+          "packageLocation": "./.yarn/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip/node_modules/eslint-plugin-es-x/",\
+          "packageDependencies": [\
+            ["eslint-plugin-es-x", "npm:7.5.0"]\
+          ],\
+          "linkType": "SOFT"\
         }],\
-        ["virtual:89f3e82ea7c0f47e53189d7220caa30767abd955c3aa3ed5b22a9aecd1765eb70d6dd893f1601561da97348b2c855a7de297e56b0d58d84fa985790426ec79dd#npm:4.1.0", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-plugin-es-virtual-d383247f51/0/cache/eslint-plugin-es-npm-4.1.0-a4cf26d3cd-26b87a216d.zip/node_modules/eslint-plugin-es/",\
+        ["virtual:e72a0a9306438b1033938dd0da350cf9f4ec062648c9360382edaa21499b6290430f07b640481cdb3f67c818af79a821eb8f3071ebf7284ab09c47cb982d8502#npm:7.5.0", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-plugin-es-x-virtual-ff64d06f93/0/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip/node_modules/eslint-plugin-es-x/",\
           "packageDependencies": [\
-            ["eslint-plugin-es", "virtual:89f3e82ea7c0f47e53189d7220caa30767abd955c3aa3ed5b22a9aecd1765eb70d6dd893f1601561da97348b2c855a7de297e56b0d58d84fa985790426ec79dd#npm:4.1.0"],\
+            ["eslint-plugin-es-x", "virtual:e72a0a9306438b1033938dd0da350cf9f4ec062648c9360382edaa21499b6290430f07b640481cdb3f67c818af79a821eb8f3071ebf7284ab09c47cb982d8502#npm:7.5.0"],\
+            ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\
+            ["@eslint-community/regexpp", "npm:4.10.0"],\
             ["@types/eslint", null],\
-            ["eslint", "npm:8.24.0"],\
-            ["eslint-utils", "npm:2.1.0"],\
-            ["regexpp", "npm:3.2.0"]\
+            ["eslint", "npm:8.57.0"],\
+            ["eslint-compat-utils", "virtual:ff64d06f93654b25d9cae47199e62d111efde9ee7d408664ae44397cd2ddf7906aefd54fcc2557f4d5619d92da3af68c7898126469c2a57c381e05b06491f0da#npm:0.1.2"]\
           ],\
           "packagePeers": [\
             "@types/eslint",\
@@ -4996,34 +4969,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["eslint-plugin-import", [\
-        ["npm:2.26.0", {\
-          "packageLocation": "./.yarn/cache/eslint-plugin-import-npm-2.26.0-959fe14a01-0bf77ad803.zip/node_modules/eslint-plugin-import/",\
+        ["npm:2.29.1", {\
+          "packageLocation": "./.yarn/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip/node_modules/eslint-plugin-import/",\
           "packageDependencies": [\
-            ["eslint-plugin-import", "npm:2.26.0"]\
+            ["eslint-plugin-import", "npm:2.29.1"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.26.0", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-plugin-import-virtual-c0858ad0a5/0/cache/eslint-plugin-import-npm-2.26.0-959fe14a01-0bf77ad803.zip/node_modules/eslint-plugin-import/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-plugin-import-virtual-caddce7926/0/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip/node_modules/eslint-plugin-import/",\
           "packageDependencies": [\
-            ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.26.0"],\
+            ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1"],\
             ["@types/eslint", null],\
             ["@types/typescript-eslint__parser", null],\
             ["@typescript-eslint/parser", null],\
-            ["array-includes", "npm:3.1.4"],\
-            ["array.prototype.flat", "npm:1.3.0"],\
-            ["debug", "virtual:faadf6353f98b703db6d695690b392666015d2aab4b710ea086196f4598c68e2b84944d3717503cadb554811494ac27c376eca728086556897f6a7cdb35eaef5#npm:2.6.9"],\
+            ["array-includes", "npm:3.1.7"],\
+            ["array.prototype.findlastindex", "npm:1.2.3"],\
+            ["array.prototype.flat", "npm:1.3.2"],\
+            ["array.prototype.flatmap", "npm:1.3.2"],\
+            ["debug", "virtual:2a426afc4b2eef43db12a540d29c2b5476640459bfcd5c24f86bb401cf8cce97e63bd81794d206a5643057e7f662643afd5ce3dfc4d4bfd8e706006c6309c5fa#npm:3.2.7"],\
             ["doctrine", "npm:2.1.0"],\
-            ["eslint", "npm:8.24.0"],\
-            ["eslint-import-resolver-node", "npm:0.3.6"],\
-            ["eslint-module-utils", "virtual:c0858ad0a599e687a7d876de5591e3b098ca550f5c1ad46e7d0e2b6f5720a919cb228a47405daf7d626be1747e41a5b93e4b4d748f16d5e7c36c433aed618452#npm:2.7.3"],\
-            ["has", "npm:1.0.3"],\
-            ["is-core-module", "npm:2.9.0"],\
+            ["eslint", "npm:8.57.0"],\
+            ["eslint-import-resolver-node", "npm:0.3.9"],\
+            ["eslint-module-utils", "virtual:caddce79266c9767570f5c081ff9adaab1d8b040965749cfca6a3f3f4fbd011bf36f7d755f18ef80e67a5402a33b10c9e1ffc34efb6909461044fc5d60cfbcd0#npm:2.8.0"],\
+            ["hasown", "npm:2.0.0"],\
+            ["is-core-module", "npm:2.13.1"],\
             ["is-glob", "npm:4.0.3"],\
             ["minimatch", "npm:3.1.2"],\
-            ["object.values", "npm:1.1.5"],\
-            ["resolve", "patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=07638b"],\
-            ["tsconfig-paths", "npm:3.14.1"]\
+            ["object.fromentries", "npm:2.0.7"],\
+            ["object.groupby", "npm:1.0.1"],\
+            ["object.values", "npm:1.1.7"],\
+            ["semver", "npm:6.3.1"],\
+            ["tsconfig-paths", "npm:3.15.0"]\
           ],\
           "packagePeers": [\
             "@types/eslint",\
@@ -5035,27 +5012,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["eslint-plugin-n", [\
-        ["npm:15.3.0", {\
-          "packageLocation": "./.yarn/cache/eslint-plugin-n-npm-15.3.0-63b77d751e-a5a4c77880.zip/node_modules/eslint-plugin-n/",\
+        ["npm:16.6.2", {\
+          "packageLocation": "./.yarn/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip/node_modules/eslint-plugin-n/",\
           "packageDependencies": [\
-            ["eslint-plugin-n", "npm:15.3.0"]\
+            ["eslint-plugin-n", "npm:16.6.2"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.3.0", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-plugin-n-virtual-89f3e82ea7/0/cache/eslint-plugin-n-npm-15.3.0-63b77d751e-a5a4c77880.zip/node_modules/eslint-plugin-n/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-plugin-n-virtual-e72a0a9306/0/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip/node_modules/eslint-plugin-n/",\
           "packageDependencies": [\
-            ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.3.0"],\
+            ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2"],\
+            ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\
             ["@types/eslint", null],\
             ["builtins", "npm:5.0.1"],\
-            ["eslint", "npm:8.24.0"],\
-            ["eslint-plugin-es", "virtual:89f3e82ea7c0f47e53189d7220caa30767abd955c3aa3ed5b22a9aecd1765eb70d6dd893f1601561da97348b2c855a7de297e56b0d58d84fa985790426ec79dd#npm:4.1.0"],\
-            ["eslint-utils", "virtual:40a0bdeb6e3621efdf631788743b8ec8d771c56d9272b2284a5a1f514c5e160af34a3f6e3e8774da7ef77f162da73d63d5eea0dc2cdd80235dd3ca050e14a6e0#npm:3.0.0"],\
-            ["ignore", "npm:5.2.0"],\
-            ["is-core-module", "npm:2.10.0"],\
+            ["eslint", "npm:8.57.0"],\
+            ["eslint-plugin-es-x", "virtual:e72a0a9306438b1033938dd0da350cf9f4ec062648c9360382edaa21499b6290430f07b640481cdb3f67c818af79a821eb8f3071ebf7284ab09c47cb982d8502#npm:7.5.0"],\
+            ["get-tsconfig", "npm:4.7.2"],\
+            ["globals", "npm:13.24.0"],\
+            ["ignore", "npm:5.2.4"],\
+            ["is-builtin-module", "npm:3.2.1"],\
+            ["is-core-module", "npm:2.12.1"],\
             ["minimatch", "npm:3.1.2"],\
-            ["resolve", "patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"],\
-            ["semver", "npm:7.3.7"]\
+            ["resolve", "patch:resolve@npm%3A1.22.3#~builtin<compat/resolve>::version=1.22.3&hash=07638b"],\
+            ["semver", "npm:7.5.3"]\
           ],\
           "packagePeers": [\
             "@types/eslint",\
@@ -5077,7 +5057,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageDependencies": [\
             ["eslint-plugin-node", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:11.1.0"],\
             ["@types/eslint", null],\
-            ["eslint", "npm:8.24.0"],\
+            ["eslint", "npm:8.57.0"],\
             ["eslint-plugin-es", "virtual:5cccaf00e87dfff96dbbb5eaf7a3055373358b8114d6a1adfb32f54ed6b40ba06068d3aa1fdd8062899a0cad040f68c17cc6b72bac2cdbe9700f3d6330d112f3#npm:3.0.1"],\
             ["eslint-utils", "npm:2.1.0"],\
             ["ignore", "npm:5.2.0"],\
@@ -5093,19 +5073,19 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["eslint-plugin-promise", [\
-        ["npm:6.0.1", {\
-          "packageLocation": "./.yarn/cache/eslint-plugin-promise-npm-6.0.1-44f44fa21c-c1bb3c2e59.zip/node_modules/eslint-plugin-promise/",\
+        ["npm:6.1.1", {\
+          "packageLocation": "./.yarn/cache/eslint-plugin-promise-npm-6.1.1-8928fc7781-46b9a4f79d.zip/node_modules/eslint-plugin-promise/",\
           "packageDependencies": [\
-            ["eslint-plugin-promise", "npm:6.0.1"]\
+            ["eslint-plugin-promise", "npm:6.1.1"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.0.1", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-plugin-promise-virtual-b4b8d68f56/0/cache/eslint-plugin-promise-npm-6.0.1-44f44fa21c-c1bb3c2e59.zip/node_modules/eslint-plugin-promise/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-plugin-promise-virtual-0f58c94022/0/cache/eslint-plugin-promise-npm-6.1.1-8928fc7781-46b9a4f79d.zip/node_modules/eslint-plugin-promise/",\
           "packageDependencies": [\
-            ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.0.1"],\
+            ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"],\
             ["@types/eslint", null],\
-            ["eslint", "npm:8.24.0"]\
+            ["eslint", "npm:8.57.0"]\
           ],\
           "packagePeers": [\
             "@types/eslint",\
@@ -5115,25 +5095,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["eslint-plugin-vue", [\
-        ["npm:9.5.1", {\
-          "packageLocation": "./.yarn/cache/eslint-plugin-vue-npm-9.5.1-71da965834-3643332871.zip/node_modules/eslint-plugin-vue/",\
+        ["npm:9.24.0", {\
+          "packageLocation": "./.yarn/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip/node_modules/eslint-plugin-vue/",\
           "packageDependencies": [\
-            ["eslint-plugin-vue", "npm:9.5.1"]\
+            ["eslint-plugin-vue", "npm:9.24.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.5.1", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-plugin-vue-virtual-41761eba42/0/cache/eslint-plugin-vue-npm-9.5.1-71da965834-3643332871.zip/node_modules/eslint-plugin-vue/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.24.0", {\
+          "packageLocation": "./.yarn/__virtual__/eslint-plugin-vue-virtual-e080dd5dc6/0/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip/node_modules/eslint-plugin-vue/",\
           "packageDependencies": [\
-            ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.5.1"],\
+            ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.24.0"],\
+            ["@eslint-community/eslint-utils", "virtual:4286e12a3a0f74af013bc8f16c6d8fdde823cfbf6389660266b171e551f576c805b0a7a8eb2a7087a5cee7dfe6ebb6e1ea3808d93daf915edc95656907a381bb#npm:4.4.0"],\
             ["@types/eslint", null],\
-            ["eslint", "npm:8.24.0"],\
-            ["eslint-utils", "virtual:40a0bdeb6e3621efdf631788743b8ec8d771c56d9272b2284a5a1f514c5e160af34a3f6e3e8774da7ef77f162da73d63d5eea0dc2cdd80235dd3ca050e14a6e0#npm:3.0.0"],\
+            ["eslint", "npm:8.57.0"],\
+            ["globals", "npm:13.24.0"],\
             ["natural-compare", "npm:1.4.0"],\
             ["nth-check", "npm:2.1.1"],\
-            ["postcss-selector-parser", "npm:6.0.10"],\
-            ["semver", "npm:7.3.7"],\
-            ["vue-eslint-parser", "virtual:41761eba42069ecb6be73faa307f189ba0d5c9af01717c2323df7e068d4f8d14beffe0b524e6cd617c9e470be0a5f68634e5374290061c832301227d0d0b697a#npm:9.0.3"],\
+            ["postcss-selector-parser", "npm:6.0.15"],\
+            ["semver", "npm:7.6.0"],\
+            ["vue-eslint-parser", "virtual:e080dd5dc65fb3541eb98fd929c3a1d3733f3aff4bb24b09a6b5cce9fba4a29aca07e286ef93079f2144caa0fd33bb6545549286d3a9f2b9a211caa1f4b68ff9#npm:9.4.2"],\
             ["xml-name-validator", "npm:4.0.0"]\
           ],\
           "packagePeers": [\
@@ -5152,6 +5133,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["estraverse", "npm:5.3.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:7.2.2", {\
+          "packageLocation": "./.yarn/cache/eslint-scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip/node_modules/eslint-scope/",\
+          "packageDependencies": [\
+            ["eslint-scope", "npm:7.2.2"],\
+            ["esrecurse", "npm:4.3.0"],\
+            ["estraverse", "npm:5.3.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["eslint-utils", [\
@@ -5162,27 +5152,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["eslint-visitor-keys", "npm:1.3.0"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:3.0.0", {\
-          "packageLocation": "./.yarn/cache/eslint-utils-npm-3.0.0-630b3a4013-0668fe02f5.zip/node_modules/eslint-utils/",\
-          "packageDependencies": [\
-            ["eslint-utils", "npm:3.0.0"]\
-          ],\
-          "linkType": "SOFT"\
-        }],\
-        ["virtual:40a0bdeb6e3621efdf631788743b8ec8d771c56d9272b2284a5a1f514c5e160af34a3f6e3e8774da7ef77f162da73d63d5eea0dc2cdd80235dd3ca050e14a6e0#npm:3.0.0", {\
-          "packageLocation": "./.yarn/__virtual__/eslint-utils-virtual-e02a81b972/0/cache/eslint-utils-npm-3.0.0-630b3a4013-0668fe02f5.zip/node_modules/eslint-utils/",\
-          "packageDependencies": [\
-            ["eslint-utils", "virtual:40a0bdeb6e3621efdf631788743b8ec8d771c56d9272b2284a5a1f514c5e160af34a3f6e3e8774da7ef77f162da73d63d5eea0dc2cdd80235dd3ca050e14a6e0#npm:3.0.0"],\
-            ["@types/eslint", null],\
-            ["eslint", "npm:8.24.0"],\
-            ["eslint-visitor-keys", "npm:2.1.0"]\
-          ],\
-          "packagePeers": [\
-            "@types/eslint",\
-            "eslint"\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["eslint-visitor-keys", [\
@@ -5193,17 +5162,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:2.1.0", {\
-          "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-2.1.0-c31806b6b9-e3081d7dd2.zip/node_modules/eslint-visitor-keys/",\
+        ["npm:3.3.0", {\
+          "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.3.0-d329af7c8c-d59e68a7c5.zip/node_modules/eslint-visitor-keys/",\
           "packageDependencies": [\
-            ["eslint-visitor-keys", "npm:2.1.0"]\
+            ["eslint-visitor-keys", "npm:3.3.0"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:3.3.0", {\
-          "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.3.0-d329af7c8c-d59e68a7c5.zip/node_modules/eslint-visitor-keys/",\
+        ["npm:3.4.1", {\
+          "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.4.1-a5d0a58208-f05121d868.zip/node_modules/eslint-visitor-keys/",\
           "packageDependencies": [\
-            ["eslint-visitor-keys", "npm:3.3.0"]\
+            ["eslint-visitor-keys", "npm:3.4.1"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:3.4.3", {\
+          "packageLocation": "./.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip/node_modules/eslint-visitor-keys/",\
+          "packageDependencies": [\
+            ["eslint-visitor-keys", "npm:3.4.3"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -5219,13 +5195,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:9.4.0", {\
-          "packageLocation": "./.yarn/cache/espree-npm-9.4.0-0371ef3614-2e3020dde6.zip/node_modules/espree/",\
+        ["npm:9.6.1", {\
+          "packageLocation": "./.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip/node_modules/espree/",\
           "packageDependencies": [\
-            ["espree", "npm:9.4.0"],\
-            ["acorn", "npm:8.8.0"],\
-            ["acorn-jsx", "virtual:0371ef3614c1182c8fcb05e5954a5fd9c124be4b821bd43f5ef7bdb1bf9603ab5ec16aa2a2a1de93fa397b424774f98f00c5e66d99eec56be0bd9f2a1ab2c75f#npm:5.3.2"],\
-            ["eslint-visitor-keys", "npm:3.3.0"]\
+            ["espree", "npm:9.6.1"],\
+            ["acorn", "npm:8.10.0"],\
+            ["acorn-jsx", "virtual:a50722a5a9326b6a5f12350c494c4db3aa0f4caeac45e3e9e5fe071da20014ecfe738fe2ebe2c9c98abae81a4ea86b42f56d776b3bd5ec37f9ad3670c242b242#npm:5.3.2"],\
+            ["eslint-visitor-keys", "npm:3.4.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -5238,6 +5214,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["estraverse", "npm:5.3.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.5.0", {\
+          "packageLocation": "./.yarn/cache/esquery-npm-1.5.0-d8f8a06879-aefb0d2596.zip/node_modules/esquery/",\
+          "packageDependencies": [\
+            ["esquery", "npm:1.5.0"],\
+            ["estraverse", "npm:5.3.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["esrecurse", [\
@@ -5286,15 +5270,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["eventemitter2", [\
-        ["npm:6.4.7", {\
-          "packageLocation": "./.yarn/cache/eventemitter2-npm-6.4.7-ad2467adaa-1b36a77e13.zip/node_modules/eventemitter2/",\
-          "packageDependencies": [\
-            ["eventemitter2", "npm:6.4.7"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["evtd", [\
         ["npm:0.2.3", {\
           "packageLocation": "./.yarn/cache/evtd-npm-0.2.3-51a4edcda1-5ddded6263.zip/node_modules/evtd/",\
@@ -5311,65 +5286,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["execa", [\
-        ["npm:4.1.0", {\
-          "packageLocation": "./.yarn/cache/execa-npm-4.1.0-cc675b4189-e30d298934.zip/node_modules/execa/",\
-          "packageDependencies": [\
-            ["execa", "npm:4.1.0"],\
-            ["cross-spawn", "npm:7.0.3"],\
-            ["get-stream", "npm:5.2.0"],\
-            ["human-signals", "npm:1.1.1"],\
-            ["is-stream", "npm:2.0.1"],\
-            ["merge-stream", "npm:2.0.0"],\
-            ["npm-run-path", "npm:4.0.1"],\
-            ["onetime", "npm:5.1.2"],\
-            ["signal-exit", "npm:3.0.7"],\
-            ["strip-final-newline", "npm:2.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["executable", [\
-        ["npm:4.1.1", {\
-          "packageLocation": "./.yarn/cache/executable-npm-4.1.1-c06d32cd1b-f01927ce59.zip/node_modules/executable/",\
-          "packageDependencies": [\
-            ["executable", "npm:4.1.1"],\
-            ["pify", "npm:2.3.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["extend", [\
-        ["npm:3.0.2", {\
-          "packageLocation": "./.yarn/cache/extend-npm-3.0.2-e1ca07ac54-a50a8309ca.zip/node_modules/extend/",\
-          "packageDependencies": [\
-            ["extend", "npm:3.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["extract-zip", [\
-        ["npm:2.0.1", {\
-          "packageLocation": "./.yarn/cache/extract-zip-npm-2.0.1-92a28e392b-8cbda9debd.zip/node_modules/extract-zip/",\
-          "packageDependencies": [\
-            ["extract-zip", "npm:2.0.1"],\
-            ["@types/yauzl", "npm:2.10.0"],\
-            ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\
-            ["get-stream", "npm:5.2.0"],\
-            ["yauzl", "npm:2.10.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["extsprintf", [\
-        ["npm:1.3.0", {\
-          "packageLocation": "./.yarn/cache/extsprintf-npm-1.3.0-61a92b324c-cee7a4a1e3.zip/node_modules/extsprintf/",\
-          "packageDependencies": [\
-            ["extsprintf", "npm:1.3.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["fast-deep-equal", [\
         ["npm:3.1.3", {\
           "packageLocation": "./.yarn/cache/fast-deep-equal-npm-3.1.3-790edcfcf5-e21a9d8d84.zip/node_modules/fast-deep-equal/",\
@@ -5379,20 +5295,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["fast-glob", [\
-        ["npm:3.2.11", {\
-          "packageLocation": "./.yarn/cache/fast-glob-npm-3.2.11-bc01135fef-f473105324.zip/node_modules/fast-glob/",\
-          "packageDependencies": [\
-            ["fast-glob", "npm:3.2.11"],\
-            ["@nodelib/fs.stat", "npm:2.0.5"],\
-            ["@nodelib/fs.walk", "npm:1.2.8"],\
-            ["glob-parent", "npm:5.1.2"],\
-            ["merge2", "npm:1.4.1"],\
-            ["micromatch", "npm:4.0.5"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["fast-json-stable-stringify", [\
         ["npm:2.1.0", {\
           "packageLocation": "./.yarn/cache/fast-json-stable-stringify-npm-2.1.0-02e8905fda-b191531e36.zip/node_modules/fast-json-stable-stringify/",\
@@ -5421,26 +5323,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["fd-slicer", [\
-        ["npm:1.1.0", {\
-          "packageLocation": "./.yarn/cache/fd-slicer-npm-1.1.0-3cade0050a-c8585fd571.zip/node_modules/fd-slicer/",\
-          "packageDependencies": [\
-            ["fd-slicer", "npm:1.1.0"],\
-            ["pend", "npm:1.2.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["figures", [\
-        ["npm:3.2.0", {\
-          "packageLocation": "./.yarn/cache/figures-npm-3.2.0-85d357e955-85a6ad29e9.zip/node_modules/figures/",\
-          "packageDependencies": [\
-            ["figures", "npm:3.2.0"],\
-            ["escape-string-regexp", "npm:1.0.5"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["file-entry-cache", [\
         ["npm:6.0.1", {\
           "packageLocation": "./.yarn/cache/file-entry-cache-npm-6.0.1-31965cf0af-f49701feaa.zip/node_modules/file-entry-cache/",\
@@ -5471,14 +5353,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["find-up", [\
-        ["npm:2.1.0", {\
-          "packageLocation": "./.yarn/cache/find-up-npm-2.1.0-9f6cb1765c-43284fe4da.zip/node_modules/find-up/",\
-          "packageDependencies": [\
-            ["find-up", "npm:2.1.0"],\
-            ["locate-path", "npm:2.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["npm:5.0.0", {\
           "packageLocation": "./.yarn/cache/find-up-npm-5.0.0-e03e9b796d-07955e3573.zip/node_modules/find-up/",\
           "packageDependencies": [\
@@ -5509,34 +5383,23 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["foreground-child", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/foreground-child-npm-2.0.0-80c976b61e-f77ec9aff6.zip/node_modules/foreground-child/",\
-          "packageDependencies": [\
-            ["foreground-child", "npm:2.0.0"],\
-            ["cross-spawn", "npm:7.0.3"],\
-            ["signal-exit", "npm:3.0.7"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["forever-agent", [\
-        ["npm:0.6.1", {\
-          "packageLocation": "./.yarn/cache/forever-agent-npm-0.6.1-01dae53bf9-766ae6e220.zip/node_modules/forever-agent/",\
+      ["for-each", [\
+        ["npm:0.3.3", {\
+          "packageLocation": "./.yarn/cache/for-each-npm-0.3.3-0010ca8cdd-6c48ff2bc6.zip/node_modules/for-each/",\
           "packageDependencies": [\
-            ["forever-agent", "npm:0.6.1"]\
+            ["for-each", "npm:0.3.3"],\
+            ["is-callable", "npm:1.2.7"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["form-data", [\
-        ["npm:2.3.3", {\
-          "packageLocation": "./.yarn/cache/form-data-npm-2.3.3-c016cc11c0-10c1780fa1.zip/node_modules/form-data/",\
+      ["foreground-child", [\
+        ["npm:3.1.1", {\
+          "packageLocation": "./.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip/node_modules/foreground-child/",\
           "packageDependencies": [\
-            ["form-data", "npm:2.3.3"],\
-            ["asynckit", "npm:0.4.0"],\
-            ["combined-stream", "npm:1.0.8"],\
-            ["mime-types", "npm:2.1.35"]\
+            ["foreground-child", "npm:3.1.1"],\
+            ["cross-spawn", "npm:7.0.3"],\
+            ["signal-exit", "npm:4.0.2"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -5545,20 +5408,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         ["npm:0.5.2", {\
           "packageLocation": "./.yarn/cache/fresh-npm-0.5.2-ad2bb4c0a2-13ea8b08f9.zip/node_modules/fresh/",\
           "packageDependencies": [\
-            ["fresh", "npm:0.5.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["fs-extra", [\
-        ["npm:9.1.0", {\
-          "packageLocation": "./.yarn/cache/fs-extra-npm-9.1.0-983c2ddb4c-ba71ba32e0.zip/node_modules/fs-extra/",\
-          "packageDependencies": [\
-            ["fs-extra", "npm:9.1.0"],\
-            ["at-least-node", "npm:1.0.0"],\
-            ["graceful-fs", "npm:4.2.10"],\
-            ["jsonfile", "npm:6.1.0"],\
-            ["universalify", "npm:2.0.0"]\
+            ["fresh", "npm:0.5.2"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -5599,6 +5449,35 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["function-bind", "npm:1.1.1"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.1.2", {\
+          "packageLocation": "./.yarn/cache/function-bind-npm-1.1.2-7a55be9b03-2b0ff4ce70.zip/node_modules/function-bind/",\
+          "packageDependencies": [\
+            ["function-bind", "npm:1.1.2"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["function.prototype.name", [\
+        ["npm:1.1.6", {\
+          "packageLocation": "./.yarn/cache/function.prototype.name-npm-1.1.6-fd3a6a5cdd-7a3f9bd98a.zip/node_modules/function.prototype.name/",\
+          "packageDependencies": [\
+            ["function.prototype.name", "npm:1.1.6"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"],\
+            ["functions-have-names", "npm:1.2.3"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["functions-have-names", [\
+        ["npm:1.2.3", {\
+          "packageLocation": "./.yarn/cache/functions-have-names-npm-1.2.3-e5cf1e2208-c3f1f5ba20.zip/node_modules/functions-have-names/",\
+          "packageDependencies": [\
+            ["functions-have-names", "npm:1.2.3"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["gauge", [\
@@ -5637,6 +5516,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["has-symbols", "npm:1.0.3"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.2.0", {\
+          "packageLocation": "./.yarn/cache/get-intrinsic-npm-1.2.0-eb08ea9b1d-78fc0487b7.zip/node_modules/get-intrinsic/",\
+          "packageDependencies": [\
+            ["get-intrinsic", "npm:1.2.0"],\
+            ["function-bind", "npm:1.1.1"],\
+            ["has", "npm:1.0.3"],\
+            ["has-symbols", "npm:1.0.3"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:1.2.1", {\
+          "packageLocation": "./.yarn/cache/get-intrinsic-npm-1.2.1-ae857fd610-5b61d88552.zip/node_modules/get-intrinsic/",\
+          "packageDependencies": [\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["function-bind", "npm:1.1.1"],\
+            ["has", "npm:1.0.3"],\
+            ["has-proto", "npm:1.0.1"],\
+            ["has-symbols", "npm:1.0.3"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:1.2.2", {\
+          "packageLocation": "./.yarn/cache/get-intrinsic-npm-1.2.2-3f446d8847-447ff0724d.zip/node_modules/get-intrinsic/",\
+          "packageDependencies": [\
+            ["get-intrinsic", "npm:1.2.2"],\
+            ["function-bind", "npm:1.1.2"],\
+            ["has-proto", "npm:1.0.1"],\
+            ["has-symbols", "npm:1.0.3"],\
+            ["hasown", "npm:2.0.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["get-port", [\
@@ -5648,16 +5559,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["get-stream", [\
-        ["npm:5.2.0", {\
-          "packageLocation": "./.yarn/cache/get-stream-npm-5.2.0-2cfd3b452b-8bc1a23174.zip/node_modules/get-stream/",\
-          "packageDependencies": [\
-            ["get-stream", "npm:5.2.0"],\
-            ["pump", "npm:3.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["get-symbol-description", [\
         ["npm:1.0.0", {\
           "packageLocation": "./.yarn/cache/get-symbol-description-npm-1.0.0-9c95a4bc1f-9ceff8fe96.zip/node_modules/get-symbol-description/",\
@@ -5669,27 +5570,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["getos", [\
-        ["npm:3.2.1", {\
-          "packageLocation": "./.yarn/cache/getos-npm-3.2.1-620c03aa34-42fd78a66d.zip/node_modules/getos/",\
+      ["get-tsconfig", [\
+        ["npm:4.7.2", {\
+          "packageLocation": "./.yarn/cache/get-tsconfig-npm-4.7.2-8fbccd9fcf-1723589032.zip/node_modules/get-tsconfig/",\
           "packageDependencies": [\
-            ["getos", "npm:3.2.1"],\
-            ["async", "npm:3.2.3"]\
+            ["get-tsconfig", "npm:4.7.2"],\
+            ["resolve-pkg-maps", "npm:1.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["getpass", [\
-        ["npm:0.1.7", {\
-          "packageLocation": "./.yarn/cache/getpass-npm-0.1.7-519164a3be-ab18d55661.zip/node_modules/getpass/",\
+      ["glob", [\
+        ["npm:10.2.4", {\
+          "packageLocation": "./.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip/node_modules/glob/",\
           "packageDependencies": [\
-            ["getpass", "npm:0.1.7"],\
-            ["assert-plus", "npm:1.0.0"]\
+            ["glob", "npm:10.2.4"],\
+            ["foreground-child", "npm:3.1.1"],\
+            ["jackspeak", "npm:2.2.0"],\
+            ["minimatch", "npm:9.0.0"],\
+            ["minipass", "npm:6.0.1"],\
+            ["path-scurry", "npm:1.9.1"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["glob", [\
+        }],\
         ["npm:7.2.3", {\
           "packageLocation": "./.yarn/cache/glob-npm-7.2.3-2d866d17a5-29452e97b3.zip/node_modules/glob/",\
           "packageDependencies": [\
@@ -5734,44 +5637,56 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["global-dirs", [\
-        ["npm:3.0.0", {\
-          "packageLocation": "./.yarn/cache/global-dirs-npm-3.0.0-45faebeb68-953c17cf14.zip/node_modules/global-dirs/",\
+      ["globals", [\
+        ["npm:13.15.0", {\
+          "packageLocation": "./.yarn/cache/globals-npm-13.15.0-c0b0c83a7a-383ade0873.zip/node_modules/globals/",\
           "packageDependencies": [\
-            ["global-dirs", "npm:3.0.0"],\
-            ["ini", "npm:2.0.0"]\
+            ["globals", "npm:13.15.0"],\
+            ["type-fest", "npm:0.20.2"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["globals", [\
-        ["npm:11.12.0", {\
-          "packageLocation": "./.yarn/cache/globals-npm-11.12.0-1fa7f41a6c-67051a45ec.zip/node_modules/globals/",\
+        }],\
+        ["npm:13.19.0", {\
+          "packageLocation": "./.yarn/cache/globals-npm-13.19.0-a63c75a2dd-a000dbd00b.zip/node_modules/globals/",\
           "packageDependencies": [\
-            ["globals", "npm:11.12.0"]\
+            ["globals", "npm:13.19.0"],\
+            ["type-fest", "npm:0.20.2"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:13.15.0", {\
-          "packageLocation": "./.yarn/cache/globals-npm-13.15.0-c0b0c83a7a-383ade0873.zip/node_modules/globals/",\
+        ["npm:13.21.0", {\
+          "packageLocation": "./.yarn/cache/globals-npm-13.21.0-c0829ce1cb-86c92ca8a0.zip/node_modules/globals/",\
           "packageDependencies": [\
-            ["globals", "npm:13.15.0"],\
+            ["globals", "npm:13.21.0"],\
+            ["type-fest", "npm:0.20.2"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:13.24.0", {\
+          "packageLocation": "./.yarn/cache/globals-npm-13.24.0-cc7713139c-56066ef058.zip/node_modules/globals/",\
+          "packageDependencies": [\
+            ["globals", "npm:13.24.0"],\
             ["type-fest", "npm:0.20.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["globby", [\
-        ["npm:11.1.0", {\
-          "packageLocation": "./.yarn/cache/globby-npm-11.1.0-bdcdf20c71-b4be8885e0.zip/node_modules/globby/",\
+      ["globalthis", [\
+        ["npm:1.0.3", {\
+          "packageLocation": "./.yarn/cache/globalthis-npm-1.0.3-96cd56020d-fbd7d760dc.zip/node_modules/globalthis/",\
           "packageDependencies": [\
-            ["globby", "npm:11.1.0"],\
-            ["array-union", "npm:2.1.0"],\
-            ["dir-glob", "npm:3.0.1"],\
-            ["fast-glob", "npm:3.2.11"],\
-            ["ignore", "npm:5.2.0"],\
-            ["merge2", "npm:1.4.1"],\
-            ["slash", "npm:3.0.0"]\
+            ["globalthis", "npm:1.0.3"],\
+            ["define-properties", "npm:1.1.4"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["gopd", [\
+        ["npm:1.0.1", {\
+          "packageLocation": "./.yarn/cache/gopd-npm-1.0.1-10c1d0b534-a5ccfb8806.zip/node_modules/gopd/",\
+          "packageDependencies": [\
+            ["gopd", "npm:1.0.1"],\
+            ["get-intrinsic", "npm:1.2.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -5785,11 +5700,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["grapheme-splitter", [\
-        ["npm:1.0.4", {\
-          "packageLocation": "./.yarn/cache/grapheme-splitter-npm-1.0.4-648f2bf509-0c22ec54de.zip/node_modules/grapheme-splitter/",\
+      ["graphemer", [\
+        ["npm:1.4.0", {\
+          "packageLocation": "./.yarn/cache/graphemer-npm-1.4.0-0627732d35-bab8f0be9b.zip/node_modules/graphemer/",\
           "packageDependencies": [\
-            ["grapheme-splitter", "npm:1.0.4"]\
+            ["graphemer", "npm:1.4.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -5839,6 +5754,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["has-proto", [\
+        ["npm:1.0.1", {\
+          "packageLocation": "./.yarn/cache/has-proto-npm-1.0.1-631ea9d820-febc5b5b53.zip/node_modules/has-proto/",\
+          "packageDependencies": [\
+            ["has-proto", "npm:1.0.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["has-symbols", [\
         ["npm:1.0.3", {\
           "packageLocation": "./.yarn/cache/has-symbols-npm-1.0.3-1986bff2c4-a054c40c63.zip/node_modules/has-symbols/",\
@@ -5867,20 +5791,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["hasown", [\
+        ["npm:2.0.0", {\
+          "packageLocation": "./.yarn/cache/hasown-npm-2.0.0-78b794ceef-6151c75ca1.zip/node_modules/hasown/",\
+          "packageDependencies": [\
+            ["hasown", "npm:2.0.0"],\
+            ["function-bind", "npm:1.1.2"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["highcharts", [\
-        ["npm:10.2.1", {\
-          "packageLocation": "./.yarn/cache/highcharts-npm-10.2.1-f359bb778a-86c63d6e88.zip/node_modules/highcharts/",\
+        ["npm:11.4.0", {\
+          "packageLocation": "./.yarn/cache/highcharts-npm-11.4.0-8a1f46b545-873e661914.zip/node_modules/highcharts/",\
           "packageDependencies": [\
-            ["highcharts", "npm:10.2.1"]\
+            ["highcharts", "npm:11.4.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["highlight.js", [\
-        ["npm:11.5.1", {\
-          "packageLocation": "./.yarn/cache/highlight.js-npm-11.5.1-0fb1167640-bff556101d.zip/node_modules/highlight.js/",\
+        ["npm:11.9.0", {\
+          "packageLocation": "./.yarn/cache/highlight.js-npm-11.9.0-ec99f7b12f-4043d31c5d.zip/node_modules/highlight.js/",\
           "packageDependencies": [\
-            ["highlight.js", "npm:11.5.1"]\
+            ["highlight.js", "npm:11.9.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -5895,44 +5829,46 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["html-validate", [\
-        ["npm:7.5.0", {\
-          "packageLocation": "./.yarn/cache/html-validate-npm-7.5.0-ad3a30b92f-04d73c5173.zip/node_modules/html-validate/",\
+        ["npm:8.18.1", {\
+          "packageLocation": "./.yarn/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip/node_modules/html-validate/",\
           "packageDependencies": [\
-            ["html-validate", "npm:7.5.0"]\
+            ["html-validate", "npm:8.18.1"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.5.0", {\
-          "packageLocation": "./.yarn/__virtual__/html-validate-virtual-8e7539f97f/0/cache/html-validate-npm-7.5.0-ad3a30b92f-04d73c5173.zip/node_modules/html-validate/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:8.18.1", {\
+          "packageLocation": "./.yarn/__virtual__/html-validate-virtual-640261ed3b/0/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip/node_modules/html-validate/",\
           "packageDependencies": [\
-            ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.5.0"],\
+            ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:8.18.1"],\
             ["@babel/code-frame", "npm:7.16.7"],\
-            ["@html-validate/stylish", "npm:3.0.0"],\
-            ["@sidvind/better-ajv-errors", "virtual:8e7539f97f71b16d7ab6f294853f15fb557920a44f2e2471eacfef222d17c2f70842a99750898bac2a20010053e55b95d3c419aeb55ec8bcd0bbefe3c53dd674#npm:2.0.0"],\
+            ["@html-validate/stylish", "npm:4.1.0"],\
+            ["@sidvind/better-ajv-errors", "virtual:640261ed3b7a9880a388cc504caacf8ea790dd52f1cb31fbc3be445cb2adc6e73fc87097de620863105eb917510145ef2457d30000c7361456ab67ec0b895136#npm:2.1.3"],\
             ["@types/jest", null],\
             ["@types/jest-diff", null],\
             ["@types/jest-snapshot", null],\
-            ["acorn-walk", "npm:8.2.0"],\
+            ["@types/vitest", null],\
             ["ajv", "npm:8.11.0"],\
-            ["deepmerge", "npm:4.2.2"],\
-            ["espree", "npm:9.3.2"],\
-            ["glob", "npm:8.0.3"],\
-            ["ignore", "npm:5.2.0"],\
+            ["deepmerge", "npm:4.3.1"],\
+            ["glob", "npm:10.2.4"],\
+            ["ignore", "npm:5.3.1"],\
             ["jest", null],\
             ["jest-diff", null],\
             ["jest-snapshot", null],\
             ["kleur", "npm:4.1.4"],\
             ["minimist", "npm:1.2.6"],\
             ["prompts", "npm:2.4.2"],\
-            ["semver", "npm:7.3.7"]\
+            ["semver", "npm:7.3.7"],\
+            ["vitest", null]\
           ],\
           "packagePeers": [\
             "@types/jest-diff",\
             "@types/jest-snapshot",\
             "@types/jest",\
+            "@types/vitest",\
             "jest-diff",\
             "jest-snapshot",\
-            "jest"\
+            "jest",\
+            "vitest"\
           ],\
           "linkType": "HARD"\
         }]\
@@ -5945,10 +5881,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:6f46846f2837974f1f04e7445cb84368b1fd0134f7a4d9c278b0b5de3a2fe26944076688bad306f35ea6023238d3a9854bdb184351a49bf42819322529da8650#npm:2.0.2", {\
-          "packageLocation": "./.yarn/__virtual__/htmlnano-virtual-da9d5e52da/0/cache/htmlnano-npm-2.0.2-a89803bfeb-41f9e0c0e5.zip/node_modules/htmlnano/",\
+        ["virtual:cdd2835c1202e86fad55b2266578ff3755267672440481af37bdfff670fd205f561469a10385c20d1ff403af7fad49006bc71ffff21d12592a8ebd0c8be79c0c#npm:2.0.2", {\
+          "packageLocation": "./.yarn/__virtual__/htmlnano-virtual-d2bb6df599/0/cache/htmlnano-npm-2.0.2-a89803bfeb-41f9e0c0e5.zip/node_modules/htmlnano/",\
           "packageDependencies": [\
-            ["htmlnano", "virtual:6f46846f2837974f1f04e7445cb84368b1fd0134f7a4d9c278b0b5de3a2fe26944076688bad306f35ea6023238d3a9854bdb184351a49bf42819322529da8650#npm:2.0.2"],\
+            ["htmlnano", "virtual:cdd2835c1202e86fad55b2266578ff3755267672440481af37bdfff670fd205f561469a10385c20d1ff403af7fad49006bc71ffff21d12592a8ebd0c8be79c0c#npm:2.0.2"],\
             ["@types/cssnano", null],\
             ["@types/postcss", null],\
             ["@types/purgecss", null],\
@@ -6004,10 +5940,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["http-cache-semantics", [\
-        ["npm:4.1.0", {\
-          "packageLocation": "./.yarn/cache/http-cache-semantics-npm-4.1.0-860520a31f-974de94a81.zip/node_modules/http-cache-semantics/",\
+        ["npm:4.1.1", {\
+          "packageLocation": "./.yarn/cache/http-cache-semantics-npm-4.1.1-1120131375-83ac0bc60b.zip/node_modules/http-cache-semantics/",\
           "packageDependencies": [\
-            ["http-cache-semantics", "npm:4.1.0"]\
+            ["http-cache-semantics", "npm:4.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -6038,18 +5974,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["http-signature", [\
-        ["npm:1.3.6", {\
-          "packageLocation": "./.yarn/cache/http-signature-npm-1.3.6-5b2eff4373-10be2af476.zip/node_modules/http-signature/",\
-          "packageDependencies": [\
-            ["http-signature", "npm:1.3.6"],\
-            ["assert-plus", "npm:1.0.0"],\
-            ["jsprim", "npm:2.0.2"],\
-            ["sshpk", "npm:1.17.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["https-proxy-agent", [\
         ["npm:5.0.1", {\
           "packageLocation": "./.yarn/cache/https-proxy-agent-npm-5.0.1-42d65f358e-571fccdf38.zip/node_modules/https-proxy-agent/",\
@@ -6061,15 +5985,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["human-signals", [\
-        ["npm:1.1.1", {\
-          "packageLocation": "./.yarn/cache/human-signals-npm-1.1.1-616b2586c2-d587647c9e.zip/node_modules/human-signals/",\
-          "packageDependencies": [\
-            ["human-signals", "npm:1.1.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["humanize-ms", [\
         ["npm:1.2.1", {\
           "packageLocation": "./.yarn/cache/humanize-ms-npm-1.2.1-e942bd7329-9c7a74a282.zip/node_modules/humanize-ms/",\
@@ -6080,21 +5995,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["iconv-lite", [\
-        ["npm:0.6.3", {\
-          "packageLocation": "./.yarn/cache/iconv-lite-npm-0.6.3-24b8aae27e-3f60d47a5c.zip/node_modules/iconv-lite/",\
+      ["ical.js", [\
+        ["npm:1.5.0", {\
+          "packageLocation": "./.yarn/cache/ical.js-npm-1.5.0-5ba1c69420-51df7a01f4.zip/node_modules/ical.js/",\
           "packageDependencies": [\
-            ["iconv-lite", "npm:0.6.3"],\
-            ["safer-buffer", "npm:2.1.2"]\
+            ["ical.js", "npm:1.5.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["ieee754", [\
-        ["npm:1.2.1", {\
-          "packageLocation": "./.yarn/cache/ieee754-npm-1.2.1-fb63b3caeb-5144c0c981.zip/node_modules/ieee754/",\
+      ["iconv-lite", [\
+        ["npm:0.6.3", {\
+          "packageLocation": "./.yarn/cache/iconv-lite-npm-0.6.3-24b8aae27e-3f60d47a5c.zip/node_modules/iconv-lite/",\
           "packageDependencies": [\
-            ["ieee754", "npm:1.2.1"]\
+            ["iconv-lite", "npm:0.6.3"],\
+            ["safer-buffer", "npm:2.1.2"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -6106,14 +6021,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["ignore", "npm:5.2.0"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["image-size", [\
-        ["npm:1.0.2", {\
-          "packageLocation": "./.yarn/cache/image-size-npm-1.0.2-ed5424d843-01745fdb47.zip/node_modules/image-size/",\
+        }],\
+        ["npm:5.2.4", {\
+          "packageLocation": "./.yarn/cache/ignore-npm-5.2.4-fbe6e989e5-3d4c309c60.zip/node_modules/ignore/",\
+          "packageDependencies": [\
+            ["ignore", "npm:5.2.4"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:5.3.1", {\
+          "packageLocation": "./.yarn/cache/ignore-npm-5.3.1-f6947c5df7-71d7bb4c1d.zip/node_modules/ignore/",\
           "packageDependencies": [\
-            ["image-size", "npm:1.0.2"],\
-            ["queue", "npm:6.0.2"]\
+            ["ignore", "npm:5.3.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -6185,21 +6104,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["ini", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/ini-npm-2.0.0-28f7426761-e7aadc5fb2.zip/node_modules/ini/",\
-          "packageDependencies": [\
-            ["ini", "npm:2.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["internal-slot", [\
-        ["npm:1.0.3", {\
-          "packageLocation": "./.yarn/cache/internal-slot-npm-1.0.3-9e05eea002-1944f92e98.zip/node_modules/internal-slot/",\
+        ["npm:1.0.5", {\
+          "packageLocation": "./.yarn/cache/internal-slot-npm-1.0.5-a2241f3e66-97e84046bf.zip/node_modules/internal-slot/",\
           "packageDependencies": [\
-            ["internal-slot", "npm:1.0.3"],\
-            ["get-intrinsic", "npm:1.1.1"],\
+            ["internal-slot", "npm:1.0.5"],\
+            ["get-intrinsic", "npm:1.2.1"],\
             ["has", "npm:1.0.3"],\
             ["side-channel", "npm:1.0.4"]\
           ],\
@@ -6224,6 +6134,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["is-array-buffer", [\
+        ["npm:3.0.1", {\
+          "packageLocation": "./.yarn/cache/is-array-buffer-npm-3.0.1-3e93b14326-f26ab87448.zip/node_modules/is-array-buffer/",\
+          "packageDependencies": [\
+            ["is-array-buffer", "npm:3.0.1"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["get-intrinsic", "npm:1.2.0"],\
+            ["is-typed-array", "npm:1.1.10"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:3.0.2", {\
+          "packageLocation": "./.yarn/cache/is-array-buffer-npm-3.0.2-0dec897785-dcac9dda66.zip/node_modules/is-array-buffer/",\
+          "packageDependencies": [\
+            ["is-array-buffer", "npm:3.0.2"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["is-typed-array", "npm:1.1.10"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["is-arrayish", [\
         ["npm:0.2.1", {\
           "packageLocation": "./.yarn/cache/is-arrayish-npm-0.2.1-23927dfb15-eef4417e3c.zip/node_modules/is-arrayish/",\
@@ -6264,6 +6196,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["is-builtin-module", [\
+        ["npm:3.2.1", {\
+          "packageLocation": "./.yarn/cache/is-builtin-module-npm-3.2.1-2f92a5d353-e8f0ffc19a.zip/node_modules/is-builtin-module/",\
+          "packageDependencies": [\
+            ["is-builtin-module", "npm:3.2.1"],\
+            ["builtin-modules", "npm:3.3.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["is-callable", [\
         ["npm:1.2.4", {\
           "packageLocation": "./.yarn/cache/is-callable-npm-1.2.4-03fc17459c-1a28d57dc4.zip/node_modules/is-callable/",\
@@ -6271,27 +6213,40 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["is-callable", "npm:1.2.4"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["is-ci", [\
-        ["npm:3.0.1", {\
-          "packageLocation": "./.yarn/cache/is-ci-npm-3.0.1-d9aea361e1-192c66dc78.zip/node_modules/is-ci/",\
+        }],\
+        ["npm:1.2.7", {\
+          "packageLocation": "./.yarn/cache/is-callable-npm-1.2.7-808a303e61-61fd57d03b.zip/node_modules/is-callable/",\
           "packageDependencies": [\
-            ["is-ci", "npm:3.0.1"],\
-            ["ci-info", "npm:3.3.1"]\
+            ["is-callable", "npm:1.2.7"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["is-core-module", [\
-        ["npm:2.10.0", {\
-          "packageLocation": "./.yarn/cache/is-core-module-npm-2.10.0-6dff9310aa-0f3f77811f.zip/node_modules/is-core-module/",\
+        ["npm:2.12.1", {\
+          "packageLocation": "./.yarn/cache/is-core-module-npm-2.12.1-ce74e89160-f04ea30533.zip/node_modules/is-core-module/",\
+          "packageDependencies": [\
+            ["is-core-module", "npm:2.12.1"],\
+            ["has", "npm:1.0.3"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:2.13.0", {\
+          "packageLocation": "./.yarn/cache/is-core-module-npm-2.13.0-e444c50225-053ab101fb.zip/node_modules/is-core-module/",\
           "packageDependencies": [\
-            ["is-core-module", "npm:2.10.0"],\
+            ["is-core-module", "npm:2.13.0"],\
             ["has", "npm:1.0.3"]\
           ],\
           "linkType": "HARD"\
         }],\
+        ["npm:2.13.1", {\
+          "packageLocation": "./.yarn/cache/is-core-module-npm-2.13.1-36e17434f9-256559ee8a.zip/node_modules/is-core-module/",\
+          "packageDependencies": [\
+            ["is-core-module", "npm:2.13.1"],\
+            ["hasown", "npm:2.0.0"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
         ["npm:2.9.0", {\
           "packageLocation": "./.yarn/cache/is-core-module-npm-2.9.0-5ba77c35ae-b27034318b.zip/node_modules/is-core-module/",\
           "packageDependencies": [\
@@ -6350,17 +6305,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["is-installed-globally", [\
-        ["npm:0.4.0", {\
-          "packageLocation": "./.yarn/cache/is-installed-globally-npm-0.4.0-a30dd056c7-3359840d59.zip/node_modules/is-installed-globally/",\
-          "packageDependencies": [\
-            ["is-installed-globally", "npm:0.4.0"],\
-            ["global-dirs", "npm:3.0.0"],\
-            ["is-path-inside", "npm:3.0.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["is-json", [\
         ["npm:2.0.1", {\
           "packageLocation": "./.yarn/cache/is-json-npm-2.0.1-a385cacc72-29efc4f82e.zip/node_modules/is-json/",\
@@ -6446,15 +6390,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["is-stream", [\
-        ["npm:2.0.1", {\
-          "packageLocation": "./.yarn/cache/is-stream-npm-2.0.1-c802db55e7-b8e05ccdf9.zip/node_modules/is-stream/",\
-          "packageDependencies": [\
-            ["is-stream", "npm:2.0.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["is-string", [\
         ["npm:1.0.7", {\
           "packageLocation": "./.yarn/cache/is-string-npm-1.0.7-9f7066daed-323b3d0462.zip/node_modules/is-string/",\
@@ -6475,20 +6410,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["is-typedarray", [\
-        ["npm:1.0.0", {\
-          "packageLocation": "./.yarn/cache/is-typedarray-npm-1.0.0-bbd99de5b6-3508c6cd0a.zip/node_modules/is-typedarray/",\
+      ["is-typed-array", [\
+        ["npm:1.1.10", {\
+          "packageLocation": "./.yarn/cache/is-typed-array-npm-1.1.10-fe4ef83cdc-aac6ecb59d.zip/node_modules/is-typed-array/",\
           "packageDependencies": [\
-            ["is-typedarray", "npm:1.0.0"]\
+            ["is-typed-array", "npm:1.1.10"],\
+            ["available-typed-arrays", "npm:1.0.5"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["for-each", "npm:0.3.3"],\
+            ["gopd", "npm:1.0.1"],\
+            ["has-tostringtag", "npm:1.0.0"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["is-unicode-supported", [\
-        ["npm:0.1.0", {\
-          "packageLocation": "./.yarn/cache/is-unicode-supported-npm-0.1.0-0833e1bbfb-a2aab86ee7.zip/node_modules/is-unicode-supported/",\
+        }],\
+        ["npm:1.1.12", {\
+          "packageLocation": "./.yarn/cache/is-typed-array-npm-1.1.12-6135c91b1a-4c89c4a3be.zip/node_modules/is-typed-array/",\
           "packageDependencies": [\
-            ["is-unicode-supported", "npm:0.1.0"]\
+            ["is-typed-array", "npm:1.1.12"],\
+            ["which-typed-array", "npm:1.1.13"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -6503,20 +6442,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["isexe", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/isexe-npm-2.0.0-b58870bd2e-26bf6c5480.zip/node_modules/isexe/",\
+      ["isarray", [\
+        ["npm:2.0.5", {\
+          "packageLocation": "./.yarn/cache/isarray-npm-2.0.5-4ba522212d-bd5bbe4104.zip/node_modules/isarray/",\
           "packageDependencies": [\
-            ["isexe", "npm:2.0.0"]\
+            ["isarray", "npm:2.0.5"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["isstream", [\
-        ["npm:0.1.2", {\
-          "packageLocation": "./.yarn/cache/isstream-npm-0.1.2-8581c75385-1eb2fe63a7.zip/node_modules/isstream/",\
+      ["isbinaryfile", [\
+        ["npm:4.0.10", {\
+          "packageLocation": "./.yarn/cache/isbinaryfile-npm-4.0.10-91d1251522-a6b28db7e2.zip/node_modules/isbinaryfile/",\
+          "packageDependencies": [\
+            ["isbinaryfile", "npm:4.0.10"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["isexe", [\
+        ["npm:2.0.0", {\
+          "packageLocation": "./.yarn/cache/isexe-npm-2.0.0-b58870bd2e-26bf6c5480.zip/node_modules/isexe/",\
           "packageDependencies": [\
-            ["isstream", "npm:0.1.2"]\
+            ["isexe", "npm:2.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -6540,84 +6488,63 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["supports-color", "npm:7.2.0"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["istanbul-reports", [\
-        ["npm:3.1.4", {\
-          "packageLocation": "./.yarn/cache/istanbul-reports-npm-3.1.4-5faaa9636c-2132983355.zip/node_modules/istanbul-reports/",\
-          "packageDependencies": [\
-            ["istanbul-reports", "npm:3.1.4"],\
-            ["html-escaper", "npm:2.0.2"],\
-            ["istanbul-lib-report", "npm:3.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["jest-diff", [\
-        ["npm:27.5.1", {\
-          "packageLocation": "./.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip/node_modules/jest-diff/",\
+        }],\
+        ["npm:3.0.1", {\
+          "packageLocation": "./.yarn/cache/istanbul-lib-report-npm-3.0.1-b17446ab24-fd17a1b879.zip/node_modules/istanbul-lib-report/",\
           "packageDependencies": [\
-            ["jest-diff", "npm:27.5.1"],\
-            ["chalk", "npm:4.1.2"],\
-            ["diff-sequences", "npm:27.5.1"],\
-            ["jest-get-type", "npm:27.5.1"],\
-            ["pretty-format", "npm:27.5.1"]\
+            ["istanbul-lib-report", "npm:3.0.1"],\
+            ["istanbul-lib-coverage", "npm:3.2.0"],\
+            ["make-dir", "npm:4.0.0"],\
+            ["supports-color", "npm:7.2.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["jest-get-type", [\
-        ["npm:27.5.1", {\
-          "packageLocation": "./.yarn/cache/jest-get-type-npm-27.5.1-980fbf7a43-63064ab701.zip/node_modules/jest-get-type/",\
+      ["istanbul-reports", [\
+        ["npm:3.1.6", {\
+          "packageLocation": "./.yarn/cache/istanbul-reports-npm-3.1.6-66918eb97f-44c4c0582f.zip/node_modules/istanbul-reports/",\
           "packageDependencies": [\
-            ["jest-get-type", "npm:27.5.1"]\
+            ["istanbul-reports", "npm:3.1.6"],\
+            ["html-escaper", "npm:2.0.2"],\
+            ["istanbul-lib-report", "npm:3.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["jest-matcher-utils", [\
-        ["npm:27.5.1", {\
-          "packageLocation": "./.yarn/cache/jest-matcher-utils-npm-27.5.1-0c47b071fb-bb2135fc48.zip/node_modules/jest-matcher-utils/",\
+      ["jackspeak", [\
+        ["npm:2.2.0", {\
+          "packageLocation": "./.yarn/cache/jackspeak-npm-2.2.0-5383861524-d8cd5be4f0.zip/node_modules/jackspeak/",\
           "packageDependencies": [\
-            ["jest-matcher-utils", "npm:27.5.1"],\
-            ["chalk", "npm:4.1.2"],\
-            ["jest-diff", "npm:27.5.1"],\
-            ["jest-get-type", "npm:27.5.1"],\
-            ["pretty-format", "npm:27.5.1"]\
+            ["jackspeak", "npm:2.2.0"],\
+            ["@isaacs/cliui", "npm:8.0.2"],\
+            ["@pkgjs/parseargs", "npm:0.11.0"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["jquery", [\
-        ["npm:3.6.0", {\
-          "packageLocation": "./.yarn/cache/jquery-npm-3.6.0-ca7872bdbb-8fd5fef4aa.zip/node_modules/jquery/",\
-          "packageDependencies": [\
-            ["jquery", "npm:3.6.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
-        ["npm:3.6.1", {\
-          "packageLocation": "./.yarn/cache/jquery-npm-3.6.1-6f29087f48-6177d866a7.zip/node_modules/jquery/",\
+        ["npm:3.7.1", {\
+          "packageLocation": "./.yarn/cache/jquery-npm-3.7.1-eeeac0f21e-4370b8139d.zip/node_modules/jquery/",\
           "packageDependencies": [\
-            ["jquery", "npm:3.6.1"]\
+            ["jquery", "npm:3.7.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["jquery-migrate", [\
-        ["npm:3.4.0", {\
-          "packageLocation": "./.yarn/cache/jquery-migrate-npm-3.4.0-88c209e61f-7431685c56.zip/node_modules/jquery-migrate/",\
+        ["npm:3.4.1", {\
+          "packageLocation": "./.yarn/cache/jquery-migrate-npm-3.4.1-c842b6adb7-d2cb17d055.zip/node_modules/jquery-migrate/",\
           "packageDependencies": [\
-            ["jquery-migrate", "npm:3.4.0"]\
+            ["jquery-migrate", "npm:3.4.1"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.0", {\
-          "packageLocation": "./.yarn/__virtual__/jquery-migrate-virtual-68c5ec0b7a/0/cache/jquery-migrate-npm-3.4.0-88c209e61f-7431685c56.zip/node_modules/jquery-migrate/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1", {\
+          "packageLocation": "./.yarn/__virtual__/jquery-migrate-virtual-e23c9912e5/0/cache/jquery-migrate-npm-3.4.1-c842b6adb7-d2cb17d055.zip/node_modules/jquery-migrate/",\
           "packageDependencies": [\
-            ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.0"],\
+            ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1"],\
             ["@types/jquery", null],\
-            ["jquery", "npm:3.6.1"]\
+            ["jquery", "npm:3.7.1"]\
           ],\
           "packagePeers": [\
             "@types/jquery",\
@@ -6626,30 +6553,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["jquery-ui-dist", [\
-        ["npm:1.13.2", {\
-          "packageLocation": "./.yarn/cache/jquery-ui-dist-npm-1.13.2-86225c0ce7-4f3a3a2ff8.zip/node_modules/jquery-ui-dist/",\
-          "packageDependencies": [\
-            ["jquery-ui-dist", "npm:1.13.2"],\
-            ["jquery", "npm:3.6.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["js-cookie", [\
-        ["npm:3.0.1", {\
-          "packageLocation": "./.yarn/cache/js-cookie-npm-3.0.1-04c7177de1-bb48de67e2.zip/node_modules/js-cookie/",\
-          "packageDependencies": [\
-            ["js-cookie", "npm:3.0.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["js-sdsl", [\
-        ["npm:4.1.5", {\
-          "packageLocation": "./.yarn/cache/js-sdsl-npm-4.1.5-66fcf4f580-695f657ddc.zip/node_modules/js-sdsl/",\
+        ["npm:3.0.5", {\
+          "packageLocation": "./.yarn/cache/js-cookie-npm-3.0.5-8fc8fcc9b4-2dbd2809c6.zip/node_modules/js-cookie/",\
           "packageDependencies": [\
-            ["js-sdsl", "npm:4.1.5"]\
+            ["js-cookie", "npm:3.0.5"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -6676,17 +6584,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         ["npm:4.1.0", {\
           "packageLocation": "./.yarn/cache/js-yaml-npm-4.1.0-3606f32312-c7830dfd45.zip/node_modules/js-yaml/",\
           "packageDependencies": [\
-            ["js-yaml", "npm:4.1.0"],\
-            ["argparse", "npm:2.0.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["jsbn", [\
-        ["npm:0.1.1", {\
-          "packageLocation": "./.yarn/cache/jsbn-npm-0.1.1-0eb7132404-e5ff29c1b8.zip/node_modules/jsbn/",\
-          "packageDependencies": [\
-            ["jsbn", "npm:0.1.1"]\
+            ["js-yaml", "npm:4.1.0"],\
+            ["argparse", "npm:2.0.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -6700,15 +6599,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["json-schema", [\
-        ["npm:0.4.0", {\
-          "packageLocation": "./.yarn/cache/json-schema-npm-0.4.0-e776313070-66389434c3.zip/node_modules/json-schema/",\
-          "packageDependencies": [\
-            ["json-schema", "npm:0.4.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["json-schema-traverse", [\
         ["npm:0.4.1", {\
           "packageLocation": "./.yarn/cache/json-schema-traverse-npm-0.4.1-4759091693-7486074d3b.zip/node_modules/json-schema-traverse/",\
@@ -6734,20 +6624,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["json-stringify-safe", [\
-        ["npm:5.0.1", {\
-          "packageLocation": "./.yarn/cache/json-stringify-safe-npm-5.0.1-064ddd6ab4-48ec0adad5.zip/node_modules/json-stringify-safe/",\
-          "packageDependencies": [\
-            ["json-stringify-safe", "npm:5.0.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["json5", [\
-        ["npm:1.0.1", {\
-          "packageLocation": "./.yarn/cache/json5-npm-1.0.1-647fc8794b-e76ea23dbb.zip/node_modules/json5/",\
+        ["npm:1.0.2", {\
+          "packageLocation": "./.yarn/cache/json5-npm-1.0.2-9607f93e30-866458a8c5.zip/node_modules/json5/",\
           "packageDependencies": [\
-            ["json5", "npm:1.0.1"],\
+            ["json5", "npm:1.0.2"],\
             ["minimist", "npm:1.2.6"]\
           ],\
           "linkType": "HARD"\
@@ -6760,30 +6641,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["jsonfile", [\
-        ["npm:6.1.0", {\
-          "packageLocation": "./.yarn/cache/jsonfile-npm-6.1.0-20a4796cee-7af3b8e1ac.zip/node_modules/jsonfile/",\
-          "packageDependencies": [\
-            ["jsonfile", "npm:6.1.0"],\
-            ["graceful-fs", "npm:4.2.10"],\
-            ["universalify", "npm:2.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["jsprim", [\
-        ["npm:2.0.2", {\
-          "packageLocation": "./.yarn/cache/jsprim-npm-2.0.2-8c40f3719c-d175f6b199.zip/node_modules/jsprim/",\
-          "packageDependencies": [\
-            ["jsprim", "npm:2.0.2"],\
-            ["assert-plus", "npm:1.0.0"],\
-            ["extsprintf", "npm:1.3.0"],\
-            ["json-schema", "npm:0.4.0"],\
-            ["verror", "npm:1.10.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["jstransformer", [\
         ["npm:1.0.0", {\
           "packageLocation": "./.yarn/cache/jstransformer-npm-1.0.0-41a47d180a-1e019fde17.zip/node_modules/jstransformer/",\
@@ -6811,15 +6668,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["lazy-ass", [\
-        ["npm:1.6.0", {\
-          "packageLocation": "./.yarn/cache/lazy-ass-npm-1.6.0-5cda93b8cb-5a3ebb1791.zip/node_modules/lazy-ass/",\
-          "packageDependencies": [\
-            ["lazy-ass", "npm:1.6.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["levn", [\
         ["npm:0.4.1", {\
           "packageLocation": "./.yarn/cache/levn-npm-0.4.1-d183b2d7bb-12c5021c85.zip/node_modules/levn/",\
@@ -6831,6 +6679,96 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["lightningcss", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/cache/lightningcss-npm-1.17.1-7428f2d516-0bf9d5c932.zip/node_modules/lightningcss/",\
+          "packageDependencies": [\
+            ["lightningcss", "npm:1.17.1"],\
+            ["detect-libc", "npm:1.0.3"],\
+            ["lightningcss-darwin-arm64", "npm:1.17.1"],\
+            ["lightningcss-darwin-x64", "npm:1.17.1"],\
+            ["lightningcss-linux-arm-gnueabihf", "npm:1.17.1"],\
+            ["lightningcss-linux-arm64-gnu", "npm:1.17.1"],\
+            ["lightningcss-linux-arm64-musl", "npm:1.17.1"],\
+            ["lightningcss-linux-x64-gnu", "npm:1.17.1"],\
+            ["lightningcss-linux-x64-musl", "npm:1.17.1"],\
+            ["lightningcss-win32-x64-msvc", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["lightningcss-darwin-arm64", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/unplugged/lightningcss-darwin-arm64-npm-1.17.1-a84f0d052c/node_modules/lightningcss-darwin-arm64/",\
+          "packageDependencies": [\
+            ["lightningcss-darwin-arm64", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["lightningcss-darwin-x64", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/unplugged/lightningcss-darwin-x64-npm-1.17.1-131957b733/node_modules/lightningcss-darwin-x64/",\
+          "packageDependencies": [\
+            ["lightningcss-darwin-x64", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["lightningcss-linux-arm-gnueabihf", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/unplugged/lightningcss-linux-arm-gnueabihf-npm-1.17.1-bbf7f4f213/node_modules/lightningcss-linux-arm-gnueabihf/",\
+          "packageDependencies": [\
+            ["lightningcss-linux-arm-gnueabihf", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["lightningcss-linux-arm64-gnu", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/unplugged/lightningcss-linux-arm64-gnu-npm-1.17.1-5b0e0aecb4/node_modules/lightningcss-linux-arm64-gnu/",\
+          "packageDependencies": [\
+            ["lightningcss-linux-arm64-gnu", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["lightningcss-linux-arm64-musl", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/unplugged/lightningcss-linux-arm64-musl-npm-1.17.1-4da73a58bf/node_modules/lightningcss-linux-arm64-musl/",\
+          "packageDependencies": [\
+            ["lightningcss-linux-arm64-musl", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["lightningcss-linux-x64-gnu", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/unplugged/lightningcss-linux-x64-gnu-npm-1.17.1-39d6988913/node_modules/lightningcss-linux-x64-gnu/",\
+          "packageDependencies": [\
+            ["lightningcss-linux-x64-gnu", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["lightningcss-linux-x64-musl", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/unplugged/lightningcss-linux-x64-musl-npm-1.17.1-84311b8bf8/node_modules/lightningcss-linux-x64-musl/",\
+          "packageDependencies": [\
+            ["lightningcss-linux-x64-musl", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["lightningcss-win32-x64-msvc", [\
+        ["npm:1.17.1", {\
+          "packageLocation": "./.yarn/unplugged/lightningcss-win32-x64-msvc-npm-1.17.1-849d8d151b/node_modules/lightningcss-win32-x64-msvc/",\
+          "packageDependencies": [\
+            ["lightningcss-win32-x64-msvc", "npm:1.17.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["lines-and-columns", [\
         ["npm:1.2.4", {\
           "packageLocation": "./.yarn/cache/lines-and-columns-npm-1.2.4-d6c7cc5799-0c37f9f7fa.zip/node_modules/lines-and-columns/",\
@@ -6850,36 +6788,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["listr2", [\
-        ["npm:3.14.0", {\
-          "packageLocation": "./.yarn/cache/listr2-npm-3.14.0-446f504112-fdb8b2d6bd.zip/node_modules/listr2/",\
-          "packageDependencies": [\
-            ["listr2", "npm:3.14.0"]\
-          ],\
-          "linkType": "SOFT"\
-        }],\
-        ["virtual:7807fe85fd2477d9e43a07a30de1135e6610e1a27055ecdb897fbd62c62175147205ba7dcf7a3c3c9c46c380ac7ee0bd64cc1901788ce9b481d88c2411eb16f2#npm:3.14.0", {\
-          "packageLocation": "./.yarn/__virtual__/listr2-virtual-31096c7478/0/cache/listr2-npm-3.14.0-446f504112-fdb8b2d6bd.zip/node_modules/listr2/",\
-          "packageDependencies": [\
-            ["listr2", "virtual:7807fe85fd2477d9e43a07a30de1135e6610e1a27055ecdb897fbd62c62175147205ba7dcf7a3c3c9c46c380ac7ee0bd64cc1901788ce9b481d88c2411eb16f2#npm:3.14.0"],\
-            ["@types/enquirer", null],\
-            ["cli-truncate", "npm:2.1.0"],\
-            ["colorette", "npm:2.0.16"],\
-            ["enquirer", "npm:2.3.6"],\
-            ["log-update", "npm:4.0.0"],\
-            ["p-map", "npm:4.0.0"],\
-            ["rfdc", "npm:1.3.0"],\
-            ["rxjs", "npm:7.5.5"],\
-            ["through", "npm:2.3.8"],\
-            ["wrap-ansi", "npm:7.0.0"]\
-          ],\
-          "packagePeers": [\
-            "@types/enquirer",\
-            "enquirer"\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["lmdb", [\
         ["npm:2.5.2", {\
           "packageLocation": "./.yarn/unplugged/lmdb-npm-2.5.2-76ec56235a/node_modules/lmdb/",\
@@ -6899,18 +6807,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["weak-lru-cache", "npm:1.2.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:2.8.5", {\
+          "packageLocation": "./.yarn/unplugged/lmdb-npm-2.8.5-e5fdd937dd/node_modules/lmdb/",\
+          "packageDependencies": [\
+            ["lmdb", "npm:2.8.5"],\
+            ["@lmdb/lmdb-darwin-arm64", "npm:2.8.5"],\
+            ["@lmdb/lmdb-darwin-x64", "npm:2.8.5"],\
+            ["@lmdb/lmdb-linux-arm", "npm:2.8.5"],\
+            ["@lmdb/lmdb-linux-arm64", "npm:2.8.5"],\
+            ["@lmdb/lmdb-linux-x64", "npm:2.8.5"],\
+            ["@lmdb/lmdb-win32-x64", "npm:2.8.5"],\
+            ["msgpackr", "npm:1.9.9"],\
+            ["node-addon-api", "npm:6.1.0"],\
+            ["node-gyp", "npm:9.0.0"],\
+            ["node-gyp-build-optional-packages", "npm:5.1.1"],\
+            ["ordered-binary", "npm:1.4.1"],\
+            ["weak-lru-cache", "npm:1.2.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["locate-path", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/locate-path-npm-2.0.0-673d28b0ea-02d581edbb.zip/node_modules/locate-path/",\
-          "packageDependencies": [\
-            ["locate-path", "npm:2.0.0"],\
-            ["p-locate", "npm:2.0.0"],\
-            ["path-exists", "npm:3.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["npm:6.0.0", {\
           "packageLocation": "./.yarn/cache/locate-path-npm-6.0.0-06a1e4c528-72eb661788.zip/node_modules/locate-path/",\
           "packageDependencies": [\
@@ -6947,48 +6865,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["lodash.once", [\
-        ["npm:4.1.1", {\
-          "packageLocation": "./.yarn/cache/lodash.once-npm-4.1.1-d8ba329ead-d768fa9f9b.zip/node_modules/lodash.once/",\
-          "packageDependencies": [\
-            ["lodash.once", "npm:4.1.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["lodash.sortby", [\
-        ["npm:4.7.0", {\
-          "packageLocation": "./.yarn/cache/lodash.sortby-npm-4.7.0-fda8ab950d-db170c9396.zip/node_modules/lodash.sortby/",\
-          "packageDependencies": [\
-            ["lodash.sortby", "npm:4.7.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["log-symbols", [\
-        ["npm:4.1.0", {\
-          "packageLocation": "./.yarn/cache/log-symbols-npm-4.1.0-0a13492d8b-fce1497b31.zip/node_modules/log-symbols/",\
-          "packageDependencies": [\
-            ["log-symbols", "npm:4.1.0"],\
-            ["chalk", "npm:4.1.2"],\
-            ["is-unicode-supported", "npm:0.1.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["log-update", [\
-        ["npm:4.0.0", {\
-          "packageLocation": "./.yarn/cache/log-update-npm-4.0.0-9d0554261c-ae2f85bbab.zip/node_modules/log-update/",\
-          "packageDependencies": [\
-            ["log-update", "npm:4.0.0"],\
-            ["ansi-escapes", "npm:4.3.2"],\
-            ["cli-cursor", "npm:3.1.0"],\
-            ["slice-ansi", "npm:4.0.0"],\
-            ["wrap-ansi", "npm:6.2.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["lru-cache", [\
         ["npm:6.0.0", {\
           "packageLocation": "./.yarn/cache/lru-cache-npm-6.0.0-b4c8668fe1-f97f499f89.zip/node_modules/lru-cache/",\
@@ -7004,23 +6880,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["lru-cache", "npm:7.10.1"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:9.1.1", {\
+          "packageLocation": "./.yarn/cache/lru-cache-npm-9.1.1-765199cb01-4d703bb9b6.zip/node_modules/lru-cache/",\
+          "packageDependencies": [\
+            ["lru-cache", "npm:9.1.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["luxon", [\
-        ["npm:3.0.4", {\
-          "packageLocation": "./.yarn/cache/luxon-npm-3.0.4-402f9149bc-d0908c3951.zip/node_modules/luxon/",\
+        ["npm:3.4.4", {\
+          "packageLocation": "./.yarn/cache/luxon-npm-3.4.4-c93f95dde8-36c1f99c47.zip/node_modules/luxon/",\
           "packageDependencies": [\
-            ["luxon", "npm:3.0.4"]\
+            ["luxon", "npm:3.4.4"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["magic-string", [\
-        ["npm:0.25.9", {\
-          "packageLocation": "./.yarn/cache/magic-string-npm-0.25.9-0b51c0ea50-9a0e55a15c.zip/node_modules/magic-string/",\
+        ["npm:0.30.7", {\
+          "packageLocation": "./.yarn/cache/magic-string-npm-0.30.7-0bb5819095-bdf102e36a.zip/node_modules/magic-string/",\
           "packageDependencies": [\
-            ["magic-string", "npm:0.25.9"],\
-            ["sourcemap-codec", "npm:1.4.8"]\
+            ["magic-string", "npm:0.30.7"],\
+            ["@jridgewell/sourcemap-codec", "npm:1.4.15"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -7033,6 +6916,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["semver", "npm:6.3.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:4.0.0", {\
+          "packageLocation": "./.yarn/cache/make-dir-npm-4.0.0-ec3cd921cc-bf0731a2dd.zip/node_modules/make-dir/",\
+          "packageDependencies": [\
+            ["make-dir", "npm:4.0.0"],\
+            ["semver", "npm:7.5.3"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["make-fetch-happen", [\
@@ -7042,7 +6933,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["make-fetch-happen", "npm:10.1.5"],\
             ["agentkeepalive", "npm:4.2.1"],\
             ["cacache", "npm:16.1.0"],\
-            ["http-cache-semantics", "npm:4.1.0"],\
+            ["http-cache-semantics", "npm:4.1.1"],\
             ["http-proxy-agent", "npm:5.0.0"],\
             ["https-proxy-agent", "npm:5.0.1"],\
             ["is-lambda", "npm:1.0.1"],\
@@ -7069,35 +6960,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["merge-stream", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/merge-stream-npm-2.0.0-2ac83efea5-6fa4dcc8d8.zip/node_modules/merge-stream/",\
-          "packageDependencies": [\
-            ["merge-stream", "npm:2.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["merge2", [\
-        ["npm:1.4.1", {\
-          "packageLocation": "./.yarn/cache/merge2-npm-1.4.1-a2507bd06c-7268db63ed.zip/node_modules/merge2/",\
-          "packageDependencies": [\
-            ["merge2", "npm:1.4.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["micromatch", [\
-        ["npm:4.0.5", {\
-          "packageLocation": "./.yarn/cache/micromatch-npm-4.0.5-cfab5d7669-02a17b671c.zip/node_modules/micromatch/",\
-          "packageDependencies": [\
-            ["micromatch", "npm:4.0.5"],\
-            ["braces", "npm:3.0.2"],\
-            ["picomatch", "npm:2.3.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["mime", [\
         ["npm:1.6.0", {\
           "packageLocation": "./.yarn/cache/mime-npm-1.6.0-60ae95038a-fef25e3926.zip/node_modules/mime/",\
@@ -7105,32 +6967,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["mime", "npm:1.6.0"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["mime-db", [\
-        ["npm:1.52.0", {\
-          "packageLocation": "./.yarn/cache/mime-db-npm-1.52.0-b5371d6fd2-0d99a03585.zip/node_modules/mime-db/",\
-          "packageDependencies": [\
-            ["mime-db", "npm:1.52.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["mime-types", [\
-        ["npm:2.1.35", {\
-          "packageLocation": "./.yarn/cache/mime-types-npm-2.1.35-dd9ea9f3e2-89a5b7f1de.zip/node_modules/mime-types/",\
-          "packageDependencies": [\
-            ["mime-types", "npm:2.1.35"],\
-            ["mime-db", "npm:1.52.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["mimic-fn", [\
-        ["npm:2.1.0", {\
-          "packageLocation": "./.yarn/cache/mimic-fn-npm-2.1.0-4fbeb3abb4-d2421a3444.zip/node_modules/mimic-fn/",\
+        }],\
+        ["npm:2.6.0", {\
+          "packageLocation": "./.yarn/cache/mime-npm-2.6.0-88b89d8de0-1497ba7b9f.zip/node_modules/mime/",\
           "packageDependencies": [\
-            ["mimic-fn", "npm:2.1.0"]\
+            ["mime", "npm:2.6.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -7151,6 +6992,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["brace-expansion", "npm:2.0.1"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:9.0.0", {\
+          "packageLocation": "./.yarn/cache/minimatch-npm-9.0.0-c6737cb1be-7bd57899ed.zip/node_modules/minimatch/",\
+          "packageDependencies": [\
+            ["minimatch", "npm:9.0.0"],\
+            ["brace-expansion", "npm:2.0.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["minimist", [\
@@ -7170,6 +7019,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["yallist", "npm:4.0.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:6.0.1", {\
+          "packageLocation": "./.yarn/cache/minipass-npm-6.0.1-634723433e-1df70bb565.zip/node_modules/minipass/",\
+          "packageDependencies": [\
+            ["minipass", "npm:6.0.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["minipass-collect", [\
@@ -7246,27 +7102,27 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["moment", [\
-        ["npm:2.29.3", {\
-          "packageLocation": "./.yarn/cache/moment-npm-2.29.3-fe4ba99bae-2e780e36d9.zip/node_modules/moment/",\
+        ["npm:2.29.4", {\
+          "packageLocation": "./.yarn/cache/moment-npm-2.29.4-902943305d-0ec3f9c2bc.zip/node_modules/moment/",\
           "packageDependencies": [\
-            ["moment", "npm:2.29.3"]\
+            ["moment", "npm:2.29.4"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:2.29.4", {\
-          "packageLocation": "./.yarn/cache/moment-npm-2.29.4-902943305d-0ec3f9c2bc.zip/node_modules/moment/",\
+        ["npm:2.30.1", {\
+          "packageLocation": "./.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip/node_modules/moment/",\
           "packageDependencies": [\
-            ["moment", "npm:2.29.4"]\
+            ["moment", "npm:2.30.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["moment-timezone", [\
-        ["npm:0.5.37", {\
-          "packageLocation": "./.yarn/cache/moment-timezone-npm-0.5.37-cb6e7487a6-b3fc24848a.zip/node_modules/moment-timezone/",\
+        ["npm:0.5.45", {\
+          "packageLocation": "./.yarn/cache/moment-timezone-npm-0.5.45-2df3ad72a4-a22e9f983f.zip/node_modules/moment-timezone/",\
           "packageDependencies": [\
-            ["moment-timezone", "npm:0.5.37"],\
-            ["moment", "npm:2.29.3"]\
+            ["moment-timezone", "npm:0.5.45"],\
+            ["moment", "npm:2.29.4"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -7295,6 +7151,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["msgpackr", [\
+        ["npm:1.10.1", {\
+          "packageLocation": "./.yarn/cache/msgpackr-npm-1.10.1-5c5ff5c553-e422d18b01.zip/node_modules/msgpackr/",\
+          "packageDependencies": [\
+            ["msgpackr", "npm:1.10.1"],\
+            ["msgpackr-extract", "npm:3.0.2"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
         ["npm:1.6.0", {\
           "packageLocation": "./.yarn/cache/msgpackr-npm-1.6.0-de9303a46e-7f94acbe93.zip/node_modules/msgpackr/",\
           "packageDependencies": [\
@@ -7302,6 +7166,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["msgpackr-extract", "npm:2.0.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.9.9", {\
+          "packageLocation": "./.yarn/cache/msgpackr-npm-1.9.9-75b366d55f-b63182d99f.zip/node_modules/msgpackr/",\
+          "packageDependencies": [\
+            ["msgpackr", "npm:1.9.9"],\
+            ["msgpackr-extract", "npm:3.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["msgpackr-extract", [\
@@ -7319,6 +7191,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["node-gyp-build-optional-packages", "npm:5.0.2"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:3.0.2", {\
+          "packageLocation": "./.yarn/unplugged/msgpackr-extract-npm-3.0.2-93e8773fad/node_modules/msgpackr-extract/",\
+          "packageDependencies": [\
+            ["msgpackr-extract", "npm:3.0.2"],\
+            ["@msgpackr-extract/msgpackr-extract-darwin-arm64", "npm:3.0.2"],\
+            ["@msgpackr-extract/msgpackr-extract-darwin-x64", "npm:3.0.2"],\
+            ["@msgpackr-extract/msgpackr-extract-linux-arm", "npm:3.0.2"],\
+            ["@msgpackr-extract/msgpackr-extract-linux-arm64", "npm:3.0.2"],\
+            ["@msgpackr-extract/msgpackr-extract-linux-x64", "npm:3.0.2"],\
+            ["@msgpackr-extract/msgpackr-extract-win32-x64", "npm:3.0.2"],\
+            ["node-gyp", "npm:9.0.0"],\
+            ["node-gyp-build-optional-packages", "npm:5.0.7"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["muggle-string", [\
+        ["npm:0.4.1", {\
+          "packageLocation": "./.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip/node_modules/muggle-string/",\
+          "packageDependencies": [\
+            ["muggle-string", "npm:0.4.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["murmurhash-js", [\
@@ -7331,36 +7227,38 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["naive-ui", [\
-        ["npm:2.33.3", {\
-          "packageLocation": "./.yarn/cache/naive-ui-npm-2.33.3-b741bf7169-772373981b.zip/node_modules/naive-ui/",\
+        ["npm:2.38.1", {\
+          "packageLocation": "./.yarn/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip/node_modules/naive-ui/",\
           "packageDependencies": [\
-            ["naive-ui", "npm:2.33.3"]\
+            ["naive-ui", "npm:2.38.1"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.33.3", {\
-          "packageLocation": "./.yarn/__virtual__/naive-ui-virtual-d12b0f0271/0/cache/naive-ui-npm-2.33.3-b741bf7169-772373981b.zip/node_modules/naive-ui/",\
-          "packageDependencies": [\
-            ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.33.3"],\
-            ["@css-render/plugin-bem", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.15.10"],\
-            ["@css-render/vue3-ssr", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.15.10"],\
-            ["@types/lodash", "npm:4.14.182"],\
-            ["@types/lodash-es", "npm:4.17.6"],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.38.1", {\
+          "packageLocation": "./.yarn/__virtual__/naive-ui-virtual-32fd9c861d/0/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip/node_modules/naive-ui/",\
+          "packageDependencies": [\
+            ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.38.1"],\
+            ["@css-render/plugin-bem", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12"],\
+            ["@css-render/vue3-ssr", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.15.12"],\
+            ["@types/katex", "npm:0.16.5"],\
+            ["@types/lodash", "npm:4.14.200"],\
+            ["@types/lodash-es", "npm:4.17.10"],\
             ["@types/vue", null],\
-            ["async-validator", "npm:4.1.1"],\
-            ["css-render", "npm:0.15.10"],\
-            ["date-fns", "npm:2.28.0"],\
-            ["date-fns-tz", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:1.3.3"],\
+            ["async-validator", "npm:4.2.5"],\
+            ["css-render", "npm:0.15.12"],\
+            ["csstype", "npm:3.1.3"],\
+            ["date-fns", "npm:2.30.0"],\
+            ["date-fns-tz", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:2.0.0"],\
             ["evtd", "npm:0.2.4"],\
-            ["highlight.js", "npm:11.5.1"],\
+            ["highlight.js", "npm:11.9.0"],\
             ["lodash", "npm:4.17.21"],\
             ["lodash-es", "npm:4.17.21"],\
-            ["seemly", "npm:0.3.6"],\
+            ["seemly", "npm:0.3.8"],\
             ["treemate", "npm:0.3.11"],\
-            ["vdirs", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.1.8"],\
-            ["vooks", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.2.12"],\
-            ["vue", "npm:3.2.40"],\
-            ["vueuc", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.4.47"]\
+            ["vdirs", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.1.8"],\
+            ["vooks", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.2.12"],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\
+            ["vueuc", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.4.58"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -7370,17 +7268,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["nanoid", [\
-        ["npm:3.3.3", {\
-          "packageLocation": "./.yarn/cache/nanoid-npm-3.3.3-25d865be84-ada019402a.zip/node_modules/nanoid/",\
-          "packageDependencies": [\
-            ["nanoid", "npm:3.3.3"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
-        ["npm:3.3.4", {\
-          "packageLocation": "./.yarn/cache/nanoid-npm-3.3.4-3d250377d6-2fddd6dee9.zip/node_modules/nanoid/",\
+        ["npm:3.3.7", {\
+          "packageLocation": "./.yarn/cache/nanoid-npm-3.3.7-98824ba130-d36c427e53.zip/node_modules/nanoid/",\
           "packageDependencies": [\
-            ["nanoid", "npm:3.3.4"]\
+            ["nanoid", "npm:3.3.7"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -7419,6 +7310,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["node-gyp", "npm:9.0.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:6.1.0", {\
+          "packageLocation": "./.yarn/unplugged/node-addon-api-npm-6.1.0-634c545b39/node_modules/node-addon-api/",\
+          "packageDependencies": [\
+            ["node-addon-api", "npm:6.1.0"],\
+            ["node-gyp", "npm:9.0.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["node-gyp", [\
@@ -7463,6 +7362,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["node-gyp-build-optional-packages", "npm:5.0.3"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:5.0.7", {\
+          "packageLocation": "./.yarn/cache/node-gyp-build-optional-packages-npm-5.0.7-40f21a5d68-bcb4537af1.zip/node_modules/node-gyp-build-optional-packages/",\
+          "packageDependencies": [\
+            ["node-gyp-build-optional-packages", "npm:5.0.7"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:5.1.1", {\
+          "packageLocation": "./.yarn/cache/node-gyp-build-optional-packages-npm-5.1.1-ff11e179dd-f3cb197862.zip/node_modules/node-gyp-build-optional-packages/",\
+          "packageDependencies": [\
+            ["node-gyp-build-optional-packages", "npm:5.1.1"],\
+            ["detect-libc", "npm:2.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["node-releases", [\
@@ -7493,16 +7407,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["npm-run-path", [\
-        ["npm:4.0.1", {\
-          "packageLocation": "./.yarn/cache/npm-run-path-npm-4.0.1-7aebd8bab3-5374c0cea4.zip/node_modules/npm-run-path/",\
-          "packageDependencies": [\
-            ["npm-run-path", "npm:4.0.1"],\
-            ["path-key", "npm:3.1.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["npmlog", [\
         ["npm:6.0.2", {\
           "packageLocation": "./.yarn/cache/npmlog-npm-6.0.2-e0e69455c7-ae238cd264.zip/node_modules/npmlog/",\
@@ -7551,38 +7455,70 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["object-inspect", "npm:1.12.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:1.13.1", {\
+          "packageLocation": "./.yarn/cache/object-inspect-npm-1.13.1-fd038a2f0a-7d9fa9221d.zip/node_modules/object-inspect/",\
+          "packageDependencies": [\
+            ["object-inspect", "npm:1.13.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["object-keys", [\
+        ["npm:1.1.1", {\
+          "packageLocation": "./.yarn/cache/object-keys-npm-1.1.1-1bf2f1be93-b363c5e764.zip/node_modules/object-keys/",\
+          "packageDependencies": [\
+            ["object-keys", "npm:1.1.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["object.assign", [\
+        ["npm:4.1.4", {\
+          "packageLocation": "./.yarn/cache/object.assign-npm-4.1.4-fb3deb1c3a-76cab513a5.zip/node_modules/object.assign/",\
+          "packageDependencies": [\
+            ["object.assign", "npm:4.1.4"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.1.4"],\
+            ["has-symbols", "npm:1.0.3"],\
+            ["object-keys", "npm:1.1.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
-      ["object-keys", [\
-        ["npm:1.1.1", {\
-          "packageLocation": "./.yarn/cache/object-keys-npm-1.1.1-1bf2f1be93-b363c5e764.zip/node_modules/object-keys/",\
+      ["object.fromentries", [\
+        ["npm:2.0.7", {\
+          "packageLocation": "./.yarn/cache/object.fromentries-npm-2.0.7-2e38392540-7341ce246e.zip/node_modules/object.fromentries/",\
           "packageDependencies": [\
-            ["object-keys", "npm:1.1.1"]\
+            ["object.fromentries", "npm:2.0.7"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["object.assign", [\
-        ["npm:4.1.2", {\
-          "packageLocation": "./.yarn/cache/object.assign-npm-4.1.2-d52edada1c-d621d832ed.zip/node_modules/object.assign/",\
+      ["object.groupby", [\
+        ["npm:1.0.1", {\
+          "packageLocation": "./.yarn/cache/object.groupby-npm-1.0.1-fc268391fe-d7959d6eaa.zip/node_modules/object.groupby/",\
           "packageDependencies": [\
-            ["object.assign", "npm:4.1.2"],\
+            ["object.groupby", "npm:1.0.1"],\
             ["call-bind", "npm:1.0.2"],\
-            ["define-properties", "npm:1.1.4"],\
-            ["has-symbols", "npm:1.0.3"],\
-            ["object-keys", "npm:1.1.1"]\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"],\
+            ["get-intrinsic", "npm:1.2.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["object.values", [\
-        ["npm:1.1.5", {\
-          "packageLocation": "./.yarn/cache/object.values-npm-1.1.5-f1de7f3742-0f17e99741.zip/node_modules/object.values/",\
+        ["npm:1.1.7", {\
+          "packageLocation": "./.yarn/cache/object.values-npm-1.1.7-deae619f88-f3e4ae4f21.zip/node_modules/object.values/",\
           "packageDependencies": [\
-            ["object.values", "npm:1.1.5"],\
+            ["object.values", "npm:1.1.7"],\
             ["call-bind", "npm:1.0.2"],\
-            ["define-properties", "npm:1.1.4"],\
-            ["es-abstract", "npm:1.19.5"]\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -7607,27 +7543,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["onetime", [\
-        ["npm:5.1.2", {\
-          "packageLocation": "./.yarn/cache/onetime-npm-5.1.2-3ed148fa42-2478859ef8.zip/node_modules/onetime/",\
-          "packageDependencies": [\
-            ["onetime", "npm:5.1.2"],\
-            ["mimic-fn", "npm:2.1.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["optionator", [\
-        ["npm:0.9.1", {\
-          "packageLocation": "./.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip/node_modules/optionator/",\
+        ["npm:0.9.3", {\
+          "packageLocation": "./.yarn/cache/optionator-npm-0.9.3-56c3a4bf80-0928199944.zip/node_modules/optionator/",\
           "packageDependencies": [\
-            ["optionator", "npm:0.9.1"],\
+            ["optionator", "npm:0.9.3"],\
+            ["@aashutoshrathi/word-wrap", "npm:1.2.6"],\
             ["deep-is", "npm:0.1.4"],\
             ["fast-levenshtein", "npm:2.0.6"],\
             ["levn", "npm:0.4.1"],\
             ["prelude-ls", "npm:1.2.1"],\
-            ["type-check", "npm:0.4.0"],\
-            ["word-wrap", "npm:1.2.3"]\
+            ["type-check", "npm:0.4.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -7639,26 +7565,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["ordered-binary", "npm:1.2.5"]\
           ],\
           "linkType": "HARD"\
-        }]\
-      ]],\
-      ["ospath", [\
-        ["npm:1.2.2", {\
-          "packageLocation": "./.yarn/cache/ospath-npm-1.2.2-c8f45523a8-505f48a4f4.zip/node_modules/ospath/",\
+        }],\
+        ["npm:1.4.1", {\
+          "packageLocation": "./.yarn/cache/ordered-binary-npm-1.4.1-9ad6b7c6b5-274940b4ef.zip/node_modules/ordered-binary/",\
           "packageDependencies": [\
-            ["ospath", "npm:1.2.2"]\
+            ["ordered-binary", "npm:1.4.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["p-limit", [\
-        ["npm:1.3.0", {\
-          "packageLocation": "./.yarn/cache/p-limit-npm-1.3.0-fdb471d864-281c1c0b8c.zip/node_modules/p-limit/",\
-          "packageDependencies": [\
-            ["p-limit", "npm:1.3.0"],\
-            ["p-try", "npm:1.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["npm:3.1.0", {\
           "packageLocation": "./.yarn/cache/p-limit-npm-3.1.0-05d2ede37f-7c3690c4db.zip/node_modules/p-limit/",\
           "packageDependencies": [\
@@ -7669,14 +7585,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["p-locate", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/p-locate-npm-2.0.0-3a2ee263dd-e2dceb9b49.zip/node_modules/p-locate/",\
-          "packageDependencies": [\
-            ["p-locate", "npm:2.0.0"],\
-            ["p-limit", "npm:1.3.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["npm:5.0.0", {\
           "packageLocation": "./.yarn/cache/p-locate-npm-5.0.0-92cc7c7a3e-1623088f36.zip/node_modules/p-locate/",\
           "packageDependencies": [\
@@ -7696,42 +7604,33 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["p-try", [\
-        ["npm:1.0.0", {\
-          "packageLocation": "./.yarn/cache/p-try-npm-1.0.0-7373139e40-3b5303f77e.zip/node_modules/p-try/",\
-          "packageDependencies": [\
-            ["p-try", "npm:1.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["parcel", [\
-        ["npm:2.7.0", {\
-          "packageLocation": "./.yarn/cache/parcel-npm-2.7.0-bc3b2a7745-0584bc59da.zip/node_modules/parcel/",\
+        ["npm:2.12.0", {\
+          "packageLocation": "./.yarn/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip/node_modules/parcel/",\
           "packageDependencies": [\
-            ["parcel", "npm:2.7.0"]\
+            ["parcel", "npm:2.12.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.7.0", {\
-          "packageLocation": "./.yarn/__virtual__/parcel-virtual-bcb488f8b8/0/cache/parcel-npm-2.7.0-bc3b2a7745-0584bc59da.zip/node_modules/parcel/",\
-          "packageDependencies": [\
-            ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.7.0"],\
-            ["@parcel/config-default", "virtual:bcb488f8b8250e5c85d3772e5fa550abe484ff9840e593701a7579e0abb144159115a0fa5f3ac34f44ce442a40199ab4adf60b37365fe9f111ed0533e0f21c0e#npm:2.7.0"],\
-            ["@parcel/core", "npm:2.7.0"],\
-            ["@parcel/diagnostic", "npm:2.7.0"],\
-            ["@parcel/events", "npm:2.7.0"],\
-            ["@parcel/fs", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/logger", "npm:2.7.0"],\
-            ["@parcel/package-manager", "virtual:929a47eb0e400331195d1c182253d7b73462f97106c3f69f0ff955a868b7d4520e5e5d2555ac812ecb0bea843b4d80f2f29ebe0f9141ae21c0afaac8ac5c7b3e#npm:2.7.0"],\
-            ["@parcel/reporter-cli", "npm:2.7.0"],\
-            ["@parcel/reporter-dev-server", "npm:2.7.0"],\
-            ["@parcel/utils", "npm:2.7.0"],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.0", {\
+          "packageLocation": "./.yarn/__virtual__/parcel-virtual-fdd74b573c/0/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip/node_modules/parcel/",\
+          "packageDependencies": [\
+            ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.0"],\
+            ["@parcel/config-default", "virtual:fdd74b573cf769bcde15fb47c39fbe0d73f59838182900fd59d3d43b2214ea01b1d45084fb49d0c192fc3e8a49adea5782afcb7fe14e09c63bedaf09f4939e35#npm:2.12.0"],\
+            ["@parcel/core", "npm:2.12.0"],\
+            ["@parcel/diagnostic", "npm:2.12.0"],\
+            ["@parcel/events", "npm:2.12.0"],\
+            ["@parcel/fs", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/logger", "npm:2.12.0"],\
+            ["@parcel/package-manager", "virtual:8f08b883d4cc438aa2ec719eb5cec278f9ea627197c55f35530bcaf9cd4e4738e04be8abe946bd2702b3f5c94b812f529f1b87c05c7d6de04e1ade9b3f3e00f6#npm:2.12.0"],\
+            ["@parcel/reporter-cli", "npm:2.12.0"],\
+            ["@parcel/reporter-dev-server", "npm:2.12.0"],\
+            ["@parcel/reporter-tracer", "npm:2.12.0"],\
+            ["@parcel/utils", "npm:2.12.0"],\
             ["@types/parcel__core", null],\
             ["chalk", "npm:4.1.2"],\
             ["commander", "npm:7.2.0"],\
-            ["get-port", "npm:4.2.0"],\
-            ["v8-compile-cache", "npm:2.3.0"]\
+            ["get-port", "npm:4.2.0"]\
           ],\
           "packagePeers": [\
             "@types/parcel__core"\
@@ -7763,13 +7662,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["path-exists", [\
-        ["npm:3.0.0", {\
-          "packageLocation": "./.yarn/cache/path-exists-npm-3.0.0-e80371aa68-96e92643aa.zip/node_modules/path-exists/",\
-          "packageDependencies": [\
-            ["path-exists", "npm:3.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
         ["npm:4.0.0", {\
           "packageLocation": "./.yarn/cache/path-exists-npm-4.0.0-e9e4f63eb0-505807199d.zip/node_modules/path-exists/",\
           "packageDependencies": [\
@@ -7805,11 +7697,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["path-to-regexp", [\
-        ["npm:6.2.1", {\
-          "packageLocation": "./.yarn/cache/path-to-regexp-npm-6.2.1-8ebfe03654-f0227af828.zip/node_modules/path-to-regexp/",\
+      ["path-scurry", [\
+        ["npm:1.9.1", {\
+          "packageLocation": "./.yarn/cache/path-scurry-npm-1.9.1-b9d6b1c5bf-28caa788f1.zip/node_modules/path-scurry/",\
           "packageDependencies": [\
-            ["path-to-regexp", "npm:6.2.1"]\
+            ["path-scurry", "npm:1.9.1"],\
+            ["lru-cache", "npm:9.1.1"],\
+            ["minipass", "npm:6.0.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -7823,24 +7717,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["pend", [\
-        ["npm:1.2.0", {\
-          "packageLocation": "./.yarn/cache/pend-npm-1.2.0-7a13d93266-6c72f52433.zip/node_modules/pend/",\
-          "packageDependencies": [\
-            ["pend", "npm:1.2.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["performance-now", [\
-        ["npm:2.1.0", {\
-          "packageLocation": "./.yarn/cache/performance-now-npm-2.1.0-45e3ce7e49-534e641aa8.zip/node_modules/performance-now/",\
-          "packageDependencies": [\
-            ["performance-now", "npm:2.1.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["picocolors", [\
         ["npm:1.0.0", {\
           "packageLocation": "./.yarn/cache/picocolors-npm-1.0.0-d81e0b1927-a2e8092dd8.zip/node_modules/picocolors/",\
@@ -7859,35 +7735,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["pify", [\
-        ["npm:2.3.0", {\
-          "packageLocation": "./.yarn/cache/pify-npm-2.3.0-8b63310934-9503aaeaf4.zip/node_modules/pify/",\
-          "packageDependencies": [\
-            ["pify", "npm:2.3.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["pinia", [\
-        ["npm:2.0.22", {\
-          "packageLocation": "./.yarn/cache/pinia-npm-2.0.22-1c768f6f87-3949063267.zip/node_modules/pinia/",\
+        ["npm:2.1.7", {\
+          "packageLocation": "./.yarn/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip/node_modules/pinia/",\
           "packageDependencies": [\
-            ["pinia", "npm:2.0.22"]\
+            ["pinia", "npm:2.1.7"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.22", {\
-          "packageLocation": "./.yarn/__virtual__/pinia-virtual-bbd3463175/0/cache/pinia-npm-2.0.22-1c768f6f87-3949063267.zip/node_modules/pinia/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7", {\
+          "packageLocation": "./.yarn/__virtual__/pinia-virtual-cf6f7439ee/0/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip/node_modules/pinia/",\
           "packageDependencies": [\
-            ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.22"],\
+            ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7"],\
             ["@types/typescript", null],\
             ["@types/vue", null],\
             ["@types/vue__composition-api", null],\
             ["@vue/composition-api", null],\
-            ["@vue/devtools-api", "npm:6.2.1"],\
+            ["@vue/devtools-api", "npm:6.5.0"],\
             ["typescript", null],\
-            ["vue", "npm:3.2.40"],\
-            ["vue-demi", "virtual:bbd346317539b32aff4888ec925a05ad71c439b9d2fdb7878763afa885dc4d8eada02316fe87f186f8039ac2592a29df12da3fb6e8ef2abc33fa209844767ee8#npm:0.13.1"]\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\
+            ["vue-demi", "virtual:cf6f7439ee76dfd2e7f8f2565ae847d76901434fc49c65702190cdf3d1c61e61c701a5c45b514c4bdeacb8f4bcac9c8a98bd4db3d0bc8e403d9e8db2cf14372a#npm:0.14.5"]\
           ],\
           "packagePeers": [\
             "@types/typescript",\
@@ -7916,8 +7783,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@types/vue", null],\
             ["@types/vue__composition-api", null],\
             ["@vue/composition-api", null],\
-            ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.22"],\
-            ["vue", "npm:3.2.40"],\
+            ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7"],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\
             ["vue-demi", "virtual:f56fcf19bbebc2ada1b28955da8cc216b1e9a569a1a7337d2d1926c1ebd1bc7a5bd91aedae1d05c15c8562f33caf7c59bd3020a667340f6bdc6a7b13fc2ba847#npm:0.12.5"]\
           ],\
           "packagePeers": [\
@@ -7932,21 +7799,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["postcss", [\
-        ["npm:8.4.12", {\
-          "packageLocation": "./.yarn/cache/postcss-npm-8.4.12-e941d78a98-248e3d0f9b.zip/node_modules/postcss/",\
+        ["npm:8.4.33", {\
+          "packageLocation": "./.yarn/cache/postcss-npm-8.4.33-6ba8157009-6f98b2af4b.zip/node_modules/postcss/",\
           "packageDependencies": [\
-            ["postcss", "npm:8.4.12"],\
-            ["nanoid", "npm:3.3.3"],\
+            ["postcss", "npm:8.4.33"],\
+            ["nanoid", "npm:3.3.7"],\
             ["picocolors", "npm:1.0.0"],\
             ["source-map-js", "npm:1.0.2"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:8.4.14", {\
-          "packageLocation": "./.yarn/cache/postcss-npm-8.4.14-c0d448b728-fe58766ff3.zip/node_modules/postcss/",\
+        ["npm:8.4.35", {\
+          "packageLocation": "./.yarn/cache/postcss-npm-8.4.35-6bc1848fff-cf3c3124d3.zip/node_modules/postcss/",\
           "packageDependencies": [\
-            ["postcss", "npm:8.4.14"],\
-            ["nanoid", "npm:3.3.4"],\
+            ["postcss", "npm:8.4.35"],\
+            ["nanoid", "npm:3.3.7"],\
             ["picocolors", "npm:1.0.0"],\
             ["source-map-js", "npm:1.0.2"]\
           ],\
@@ -7954,10 +7821,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["postcss-selector-parser", [\
-        ["npm:6.0.10", {\
-          "packageLocation": "./.yarn/cache/postcss-selector-parser-npm-6.0.10-a4d7aaa270-46afaa60e3.zip/node_modules/postcss-selector-parser/",\
+        ["npm:6.0.15", {\
+          "packageLocation": "./.yarn/cache/postcss-selector-parser-npm-6.0.15-0ec4819b4e-57decb9415.zip/node_modules/postcss-selector-parser/",\
           "packageDependencies": [\
-            ["postcss-selector-parser", "npm:6.0.10"],\
+            ["postcss-selector-parser", "npm:6.0.15"],\
             ["cssesc", "npm:3.0.0"],\
             ["util-deprecate", "npm:1.0.2"]\
           ],\
@@ -8013,10 +7880,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["preact", [\
-        ["npm:10.7.2", {\
-          "packageLocation": "./.yarn/cache/preact-npm-10.7.2-dffb68bd4b-2f0655e043.zip/node_modules/preact/",\
+        ["npm:10.12.1", {\
+          "packageLocation": "./.yarn/cache/preact-npm-10.12.1-fdb903e9a5-0de99f4775.zip/node_modules/preact/",\
           "packageDependencies": [\
-            ["preact", "npm:10.7.2"]\
+            ["preact", "npm:10.12.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -8030,27 +7897,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["pretty-bytes", [\
-        ["npm:5.6.0", {\
-          "packageLocation": "./.yarn/cache/pretty-bytes-npm-5.6.0-0061079c9f-9c082500d1.zip/node_modules/pretty-bytes/",\
-          "packageDependencies": [\
-            ["pretty-bytes", "npm:5.6.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["pretty-format", [\
-        ["npm:27.5.1", {\
-          "packageLocation": "./.yarn/cache/pretty-format-npm-27.5.1-cd7d49696f-cf610cffcb.zip/node_modules/pretty-format/",\
-          "packageDependencies": [\
-            ["pretty-format", "npm:27.5.1"],\
-            ["ansi-regex", "npm:5.0.1"],\
-            ["ansi-styles", "npm:5.2.0"],\
-            ["react-is", "npm:17.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["promise", [\
         ["npm:7.3.1", {\
           "packageLocation": "./.yarn/cache/promise-npm-7.3.1-5d81d474c0-475bb06913.zip/node_modules/promise/",\
@@ -8105,24 +7951,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["proxy-from-env", [\
-        ["npm:1.0.0", {\
-          "packageLocation": "./.yarn/cache/proxy-from-env-npm-1.0.0-679b82b4ec-292e28d1de.zip/node_modules/proxy-from-env/",\
-          "packageDependencies": [\
-            ["proxy-from-env", "npm:1.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["psl", [\
-        ["npm:1.8.0", {\
-          "packageLocation": "./.yarn/cache/psl-npm-1.8.0-226099d70e-6150048ed2.zip/node_modules/psl/",\
-          "packageDependencies": [\
-            ["psl", "npm:1.8.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["pug", [\
         ["npm:3.0.2", {\
           "packageLocation": "./.yarn/cache/pug-npm-3.0.2-a900d45f03-3e1a3d4889.zip/node_modules/pug/",\
@@ -8265,17 +8093,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["pump", [\
-        ["npm:3.0.0", {\
-          "packageLocation": "./.yarn/cache/pump-npm-3.0.0-0080bf6a7a-e42e9229fb.zip/node_modules/pump/",\
-          "packageDependencies": [\
-            ["pump", "npm:3.0.0"],\
-            ["end-of-stream", "npm:1.4.4"],\
-            ["once", "npm:1.4.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["punycode", [\
         ["npm:2.1.1", {\
           "packageLocation": "./.yarn/cache/punycode-npm-2.1.1-26eb3e15cf-823bf443c6.zip/node_modules/punycode/",\
@@ -8285,25 +8102,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["qs", [\
-        ["npm:6.5.3", {\
-          "packageLocation": "./.yarn/cache/qs-npm-6.5.3-90b2635484-6f20bf08ca.zip/node_modules/qs/",\
-          "packageDependencies": [\
-            ["qs", "npm:6.5.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["queue", [\
-        ["npm:6.0.2", {\
-          "packageLocation": "./.yarn/cache/queue-npm-6.0.2-ebbcf599cf-ebc2363924.zip/node_modules/queue/",\
-          "packageDependencies": [\
-            ["queue", "npm:6.0.2"],\
-            ["inherits", "npm:2.0.4"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["queue-microtask", [\
         ["npm:1.2.3", {\
           "packageLocation": "./.yarn/cache/queue-microtask-npm-1.2.3-fcc98e4e2d-b676f8c040.zip/node_modules/queue-microtask/",\
@@ -8331,15 +8129,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["react-is", [\
-        ["npm:17.0.2", {\
-          "packageLocation": "./.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip/node_modules/react-is/",\
-          "packageDependencies": [\
-            ["react-is", "npm:17.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["react-refresh", [\
         ["npm:0.9.0", {\
           "packageLocation": "./.yarn/cache/react-refresh-npm-0.9.0-02c61ee045-6440146176.zip/node_modules/react-refresh/",\
@@ -8378,23 +8167,32 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["regenerator-runtime", "npm:0.13.9"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:0.14.0", {\
+          "packageLocation": "./.yarn/cache/regenerator-runtime-npm-0.14.0-e060897cf7-1c977ad82a.zip/node_modules/regenerator-runtime/",\
+          "packageDependencies": [\
+            ["regenerator-runtime", "npm:0.14.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
-      ["regexpp", [\
-        ["npm:3.2.0", {\
-          "packageLocation": "./.yarn/cache/regexpp-npm-3.2.0-2513f32cfc-a78dc5c715.zip/node_modules/regexpp/",\
+      ["regexp.prototype.flags", [\
+        ["npm:1.5.1", {\
+          "packageLocation": "./.yarn/cache/regexp.prototype.flags-npm-1.5.1-b8faeee306-869edff002.zip/node_modules/regexp.prototype.flags/",\
           "packageDependencies": [\
-            ["regexpp", "npm:3.2.0"]\
+            ["regexp.prototype.flags", "npm:1.5.1"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.2.0"],\
+            ["set-function-name", "npm:2.0.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["request-progress", [\
-        ["npm:3.0.0", {\
-          "packageLocation": "./.yarn/cache/request-progress-npm-3.0.0-f79f1c9e67-6ea1761dcc.zip/node_modules/request-progress/",\
+      ["regexpp", [\
+        ["npm:3.2.0", {\
+          "packageLocation": "./.yarn/cache/regexpp-npm-3.2.0-2513f32cfc-a78dc5c715.zip/node_modules/regexpp/",\
           "packageDependencies": [\
-            ["request-progress", "npm:3.0.0"],\
-            ["throttleit", "npm:1.0.0"]\
+            ["regexpp", "npm:3.2.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -8428,11 +8226,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b", {\
-          "packageLocation": "./.yarn/cache/resolve-patch-46f9469d0d-5656f4d0be.zip/node_modules/resolve/",\
+        ["patch:resolve@npm%3A1.22.3#~builtin<compat/resolve>::version=1.22.3&hash=07638b", {\
+          "packageLocation": "./.yarn/cache/resolve-patch-8df1eb26d0-ad59734723.zip/node_modules/resolve/",\
+          "packageDependencies": [\
+            ["resolve", "patch:resolve@npm%3A1.22.3#~builtin<compat/resolve>::version=1.22.3&hash=07638b"],\
+            ["is-core-module", "npm:2.12.1"],\
+            ["path-parse", "npm:1.0.7"],\
+            ["supports-preserve-symlinks-flag", "npm:1.0.0"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=07638b", {\
+          "packageLocation": "./.yarn/cache/resolve-patch-f6b5304cab-5479b7d431.zip/node_modules/resolve/",\
           "packageDependencies": [\
-            ["resolve", "patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"],\
-            ["is-core-module", "npm:2.10.0"],\
+            ["resolve", "patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=07638b"],\
+            ["is-core-module", "npm:2.13.0"],\
             ["path-parse", "npm:1.0.7"],\
             ["supports-preserve-symlinks-flag", "npm:1.0.0"]\
           ],\
@@ -8448,13 +8256,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["restore-cursor", [\
-        ["npm:3.1.0", {\
-          "packageLocation": "./.yarn/cache/restore-cursor-npm-3.1.0-52c5a4c98f-f877dd8741.zip/node_modules/restore-cursor/",\
+      ["resolve-pkg-maps", [\
+        ["npm:1.0.0", {\
+          "packageLocation": "./.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-1012afc566.zip/node_modules/resolve-pkg-maps/",\
           "packageDependencies": [\
-            ["restore-cursor", "npm:3.1.0"],\
-            ["onetime", "npm:5.1.2"],\
-            ["signal-exit", "npm:3.0.7"]\
+            ["resolve-pkg-maps", "npm:1.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -8477,15 +8283,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["rfdc", [\
-        ["npm:1.3.0", {\
-          "packageLocation": "./.yarn/cache/rfdc-npm-1.3.0-272f288ad8-fb2ba8512e.zip/node_modules/rfdc/",\
-          "packageDependencies": [\
-            ["rfdc", "npm:1.3.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["rimraf", [\
         ["npm:3.0.2", {\
           "packageLocation": "./.yarn/cache/rimraf-npm-3.0.2-2cb7dac69a-87f4164e39.zip/node_modules/rimraf/",\
@@ -8506,10 +8303,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["rollup", [\
-        ["npm:2.77.3", {\
-          "packageLocation": "./.yarn/cache/rollup-npm-2.77.3-be523d3443-b179c68249.zip/node_modules/rollup/",\
+        ["npm:3.29.4", {\
+          "packageLocation": "./.yarn/cache/rollup-npm-3.29.4-5e5e5f2087-8bb20a39c8.zip/node_modules/rollup/",\
           "packageDependencies": [\
-            ["rollup", "npm:2.77.3"],\
+            ["rollup", "npm:3.29.4"],\
             ["fsevents", "patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"]\
           ],\
           "linkType": "HARD"\
@@ -8520,68 +8317,70 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageLocation": "./",\
           "packageDependencies": [\
             ["root-workspace-0b6124", "workspace:."],\
-            ["@faker-js/faker", "npm:7.5.0"],\
-            ["@fullcalendar/bootstrap5", "npm:5.11.3"],\
-            ["@fullcalendar/core", "npm:5.11.3"],\
-            ["@fullcalendar/daygrid", "npm:5.11.3"],\
-            ["@fullcalendar/interaction", "npm:5.11.3"],\
-            ["@fullcalendar/list", "npm:5.11.3"],\
-            ["@fullcalendar/luxon2", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.11.3"],\
-            ["@fullcalendar/timegrid", "npm:5.11.3"],\
-            ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.11.2"],\
-            ["@parcel/transformer-sass", "npm:2.7.0"],\
-            ["@percy/cli", "npm:1.10.4"],\
-            ["@percy/cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.1.2"],\
-            ["@popperjs/core", "npm:2.11.6"],\
-            ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.3.4"],\
-            ["@vue/test-utils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.0"],\
-            ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.2.2"],\
-            ["bootstrap-icons", "npm:1.9.1"],\
-            ["browser-fs-access", "npm:0.31.0"],\
+            ["@fullcalendar/bootstrap5", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/core", "npm:6.1.11"],\
+            ["@fullcalendar/daygrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/icalendar", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/interaction", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/list", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/luxon3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/timegrid", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@fullcalendar/vue3", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.11"],\
+            ["@parcel/optimizer-data-url", "npm:2.12.0"],\
+            ["@parcel/transformer-inline-string", "npm:2.12.0"],\
+            ["@parcel/transformer-sass", "npm:2.12.0"],\
+            ["@popperjs/core", "npm:2.11.8"],\
+            ["@rollup/pluginutils", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.1.0"],\
+            ["@twuni/emojify", "npm:1.0.2"],\
+            ["@vitejs/plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.6.2"],\
+            ["@vue/language-plugin-pug", "npm:2.0.7"],\
+            ["bootstrap", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:5.3.3"],\
+            ["bootstrap-icons", "npm:1.11.3"],\
+            ["browser-fs-access", "npm:0.35.0"],\
             ["browserlist", "npm:1.0.1"],\
-            ["c8", "npm:7.12.0"],\
-            ["caniuse-lite", "npm:1.0.30001414"],\
-            ["cypress", "npm:10.9.0"],\
-            ["cypress-real-events", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.7.1"],\
-            ["d3", "npm:7.6.1"],\
-            ["eslint", "npm:8.24.0"],\
-            ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.0.0"],\
-            ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.1"],\
-            ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.26.0"],\
-            ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:15.3.0"],\
+            ["c8", "npm:9.1.0"],\
+            ["caniuse-lite", "npm:1.0.30001603"],\
+            ["d3", "npm:7.9.0"],\
+            ["eslint", "npm:8.57.0"],\
+            ["eslint-config-standard", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:17.1.0"],\
+            ["eslint-plugin-cypress", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.15.1"],\
+            ["eslint-plugin-import", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.29.1"],\
+            ["eslint-plugin-n", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:16.6.2"],\
             ["eslint-plugin-node", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:11.1.0"],\
-            ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.0.1"],\
-            ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.5.1"],\
+            ["eslint-plugin-promise", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:6.1.1"],\
+            ["eslint-plugin-vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:9.24.0"],\
             ["file-saver", "npm:2.0.5"],\
-            ["highcharts", "npm:10.2.1"],\
-            ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.5.0"],\
-            ["jquery", "npm:3.6.1"],\
-            ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.0"],\
-            ["jquery-ui-dist", "npm:1.13.2"],\
-            ["js-cookie", "npm:3.0.1"],\
+            ["highcharts", "npm:11.4.0"],\
+            ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:8.18.1"],\
+            ["ical.js", "npm:1.5.0"],\
+            ["jquery", "npm:3.7.1"],\
+            ["jquery-migrate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.1"],\
+            ["js-cookie", "npm:3.0.5"],\
             ["list.js", "npm:2.3.1"],\
             ["lodash", "npm:4.17.21"],\
             ["lodash-es", "npm:4.17.21"],\
-            ["luxon", "npm:3.0.4"],\
-            ["moment", "npm:2.29.4"],\
-            ["moment-timezone", "npm:0.5.37"],\
+            ["luxon", "npm:3.4.4"],\
+            ["moment", "npm:2.30.1"],\
+            ["moment-timezone", "npm:0.5.45"],\
             ["ms", "npm:2.1.3"],\
             ["murmurhash-js", "npm:1.0.0"],\
-            ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.33.3"],\
-            ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.7.0"],\
-            ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.0.22"],\
+            ["naive-ui", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.38.1"],\
+            ["parcel", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.12.0"],\
+            ["pinia", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.1.7"],\
             ["pinia-plugin-persist", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.0.0"],\
             ["pug", "npm:3.0.2"],\
-            ["sass", "npm:1.55.0"],\
+            ["sass", "npm:1.72.0"],\
             ["seedrandom", "npm:3.0.5"],\
             ["select2", "npm:4.1.0-rc.0"],\
             ["select2-bootstrap-5-theme", "npm:1.3.0"],\
             ["send", "npm:0.18.0"],\
-            ["slugify", "npm:1.6.5"],\
-            ["sortablejs", "npm:1.15.0"],\
-            ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.9.15"],\
-            ["vue", "npm:3.2.40"],\
-            ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.1.5"],\
+            ["shepherd.js", "npm:11.2.0"],\
+            ["slugify", "npm:1.6.6"],\
+            ["sortablejs", "npm:1.15.2"],\
+            ["vanillajs-datepicker", "npm:1.3.4"],\
+            ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3"],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\
+            ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.0"],\
             ["zxcvbn", "npm:4.4.2"]\
           ],\
           "linkType": "SOFT"\
@@ -8606,12 +8405,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["rxjs", [\
-        ["npm:7.5.5", {\
-          "packageLocation": "./.yarn/cache/rxjs-npm-7.5.5-d0546b1ccb-e034f60805.zip/node_modules/rxjs/",\
+      ["safe-array-concat", [\
+        ["npm:1.0.1", {\
+          "packageLocation": "./.yarn/cache/safe-array-concat-npm-1.0.1-8a42907bbf-001ecf1d8a.zip/node_modules/safe-array-concat/",\
           "packageDependencies": [\
-            ["rxjs", "npm:7.5.5"],\
-            ["tslib", "npm:2.4.0"]\
+            ["safe-array-concat", "npm:1.0.1"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["has-symbols", "npm:1.0.3"],\
+            ["isarray", "npm:2.0.5"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -8632,6 +8434,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["safe-regex-test", [\
+        ["npm:1.0.0", {\
+          "packageLocation": "./.yarn/cache/safe-regex-test-npm-1.0.0-e94a09b84e-bc566d8beb.zip/node_modules/safe-regex-test/",\
+          "packageDependencies": [\
+            ["safe-regex-test", "npm:1.0.0"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["get-intrinsic", "npm:1.2.0"],\
+            ["is-regex", "npm:1.1.4"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["safer-buffer", [\
         ["npm:2.1.2", {\
           "packageLocation": "./.yarn/cache/safer-buffer-npm-2.1.2-8d5c0b705e-cab8f25ae6.zip/node_modules/safer-buffer/",\
@@ -8652,10 +8466,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:1.55.0", {\
-          "packageLocation": "./.yarn/cache/sass-npm-1.55.0-594c748a96-7d769ed08e.zip/node_modules/sass/",\
+        ["npm:1.72.0", {\
+          "packageLocation": "./.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip/node_modules/sass/",\
           "packageDependencies": [\
-            ["sass", "npm:1.55.0"],\
+            ["sass", "npm:1.72.0"],\
             ["chokidar", "npm:3.5.3"],\
             ["immutable", "npm:4.0.0"],\
             ["source-map-js", "npm:1.0.2"]\
@@ -8673,18 +8487,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["seemly", [\
-        ["npm:0.3.3", {\
-          "packageLocation": "./.yarn/cache/seemly-npm-0.3.3-1df3254399-b6445553f8.zip/node_modules/seemly/",\
+        ["npm:0.3.6", {\
+          "packageLocation": "./.yarn/cache/seemly-npm-0.3.6-87ae398976-56d0472d99.zip/node_modules/seemly/",\
           "packageDependencies": [\
-            ["seemly", "npm:0.3.3"],\
-            ["@types/jest", "npm:27.4.1"]\
+            ["seemly", "npm:0.3.6"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:0.3.6", {\
-          "packageLocation": "./.yarn/cache/seemly-npm-0.3.6-87ae398976-56d0472d99.zip/node_modules/seemly/",\
+        ["npm:0.3.8", {\
+          "packageLocation": "./.yarn/cache/seemly-npm-0.3.8-4940336497-98171fd4d9.zip/node_modules/seemly/",\
           "packageDependencies": [\
-            ["seemly", "npm:0.3.6"]\
+            ["seemly", "npm:0.3.8"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -8724,6 +8537,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "HARD"\
         }],\
+        ["npm:6.3.1", {\
+          "packageLocation": "./.yarn/cache/semver-npm-6.3.1-bcba31fdbe-ae47d06de2.zip/node_modules/semver/",\
+          "packageDependencies": [\
+            ["semver", "npm:6.3.1"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
         ["npm:7.3.7", {\
           "packageLocation": "./.yarn/cache/semver-npm-7.3.7-3bfe704194-2fa3e87756.zip/node_modules/semver/",\
           "packageDependencies": [\
@@ -8731,6 +8551,30 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["lru-cache", "npm:6.0.0"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:7.5.3", {\
+          "packageLocation": "./.yarn/cache/semver-npm-7.5.3-275095dbf3-9d58db1652.zip/node_modules/semver/",\
+          "packageDependencies": [\
+            ["semver", "npm:7.5.3"],\
+            ["lru-cache", "npm:6.0.0"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:7.5.4", {\
+          "packageLocation": "./.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip/node_modules/semver/",\
+          "packageDependencies": [\
+            ["semver", "npm:7.5.4"],\
+            ["lru-cache", "npm:6.0.0"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:7.6.0", {\
+          "packageLocation": "./.yarn/cache/semver-npm-7.6.0-f4630729f6-7427f05b70.zip/node_modules/semver/",\
+          "packageDependencies": [\
+            ["semver", "npm:7.6.0"],\
+            ["lru-cache", "npm:6.0.0"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["send", [\
@@ -8764,6 +8608,31 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["set-function-length", [\
+        ["npm:1.1.1", {\
+          "packageLocation": "./.yarn/cache/set-function-length-npm-1.1.1-d362bf8221-c131d7569c.zip/node_modules/set-function-length/",\
+          "packageDependencies": [\
+            ["set-function-length", "npm:1.1.1"],\
+            ["define-data-property", "npm:1.1.1"],\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["gopd", "npm:1.0.1"],\
+            ["has-property-descriptors", "npm:1.0.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["set-function-name", [\
+        ["npm:2.0.1", {\
+          "packageLocation": "./.yarn/cache/set-function-name-npm-2.0.1-a9f970eea0-4975d17d90.zip/node_modules/set-function-name/",\
+          "packageDependencies": [\
+            ["set-function-name", "npm:2.0.1"],\
+            ["define-data-property", "npm:1.1.1"],\
+            ["functions-have-names", "npm:1.2.3"],\
+            ["has-property-descriptors", "npm:1.0.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["setprototypeof", [\
         ["npm:1.2.0", {\
           "packageLocation": "./.yarn/cache/setprototypeof-npm-1.2.0-0fedbdcd3a-be18cbbf70.zip/node_modules/setprototypeof/",\
@@ -8792,6 +8661,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["shepherd.js", [\
+        ["npm:11.2.0", {\
+          "packageLocation": "./.yarn/cache/shepherd.js-npm-11.2.0-94b9af1487-0e71e63e51.zip/node_modules/shepherd.js/",\
+          "packageDependencies": [\
+            ["shepherd.js", "npm:11.2.0"],\
+            ["@floating-ui/dom", "npm:1.5.2"],\
+            ["deepmerge", "npm:4.3.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["side-channel", [\
         ["npm:1.0.4", {\
           "packageLocation": "./.yarn/cache/side-channel-npm-1.0.4-e1f38b9e06-351e41b947.zip/node_modules/side-channel/",\
@@ -8811,6 +8691,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["signal-exit", "npm:3.0.7"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:4.0.2", {\
+          "packageLocation": "./.yarn/cache/signal-exit-npm-4.0.2-e3f0e8ed25-41f5928431.zip/node_modules/signal-exit/",\
+          "packageDependencies": [\
+            ["signal-exit", "npm:4.0.2"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["sisteransi", [\
@@ -8822,42 +8709,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["slash", [\
-        ["npm:3.0.0", {\
-          "packageLocation": "./.yarn/cache/slash-npm-3.0.0-b87de2279a-94a93fff61.zip/node_modules/slash/",\
-          "packageDependencies": [\
-            ["slash", "npm:3.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["slice-ansi", [\
-        ["npm:3.0.0", {\
-          "packageLocation": "./.yarn/cache/slice-ansi-npm-3.0.0-d9999864af-5ec6d022d1.zip/node_modules/slice-ansi/",\
-          "packageDependencies": [\
-            ["slice-ansi", "npm:3.0.0"],\
-            ["ansi-styles", "npm:4.3.0"],\
-            ["astral-regex", "npm:2.0.0"],\
-            ["is-fullwidth-code-point", "npm:3.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }],\
-        ["npm:4.0.0", {\
-          "packageLocation": "./.yarn/cache/slice-ansi-npm-4.0.0-6eeca1d10e-4a82d7f085.zip/node_modules/slice-ansi/",\
-          "packageDependencies": [\
-            ["slice-ansi", "npm:4.0.0"],\
-            ["ansi-styles", "npm:4.3.0"],\
-            ["astral-regex", "npm:2.0.0"],\
-            ["is-fullwidth-code-point", "npm:3.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["slugify", [\
-        ["npm:1.6.5", {\
-          "packageLocation": "./.yarn/cache/slugify-npm-1.6.5-6db25d7016-a955a1b600.zip/node_modules/slugify/",\
+        ["npm:1.6.6", {\
+          "packageLocation": "./.yarn/cache/slugify-npm-1.6.6-7ce458677d-04773c2d3b.zip/node_modules/slugify/",\
           "packageDependencies": [\
-            ["slugify", "npm:1.6.5"]\
+            ["slugify", "npm:1.6.6"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -8895,10 +8751,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["sortablejs", [\
-        ["npm:1.15.0", {\
-          "packageLocation": "./.yarn/cache/sortablejs-npm-1.15.0-f3a393abcc-bb82223a66.zip/node_modules/sortablejs/",\
+        ["npm:1.15.2", {\
+          "packageLocation": "./.yarn/cache/sortablejs-npm-1.15.2-73347ae85a-36b20b144f.zip/node_modules/sortablejs/",\
           "packageDependencies": [\
-            ["sortablejs", "npm:1.15.0"]\
+            ["sortablejs", "npm:1.15.2"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -8910,14 +8766,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["source-map", "npm:0.6.1"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:0.8.0-beta.0", {\
-          "packageLocation": "./.yarn/cache/source-map-npm-0.8.0-beta.0-688a309e94-e94169be64.zip/node_modules/source-map/",\
-          "packageDependencies": [\
-            ["source-map", "npm:0.8.0-beta.0"],\
-            ["whatwg-url", "npm:7.1.0"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["source-map-js", [\
@@ -8929,40 +8777,11 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["source-map-support", [\
-        ["npm:0.5.21", {\
-          "packageLocation": "./.yarn/cache/source-map-support-npm-0.5.21-09ca99e250-43e98d700d.zip/node_modules/source-map-support/",\
-          "packageDependencies": [\
-            ["source-map-support", "npm:0.5.21"],\
-            ["buffer-from", "npm:1.1.2"],\
-            ["source-map", "npm:0.6.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["sourcemap-codec", [\
-        ["npm:1.4.8", {\
-          "packageLocation": "./.yarn/cache/sourcemap-codec-npm-1.4.8-3a1a9e60b1-b57981c056.zip/node_modules/sourcemap-codec/",\
-          "packageDependencies": [\
-            ["sourcemap-codec", "npm:1.4.8"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["sshpk", [\
-        ["npm:1.17.0", {\
-          "packageLocation": "./.yarn/cache/sshpk-npm-1.17.0-95f17f597f-ba109f65c8.zip/node_modules/sshpk/",\
+      ["srcset", [\
+        ["npm:4.0.0", {\
+          "packageLocation": "./.yarn/cache/srcset-npm-4.0.0-4e99d43236-aceb898c92.zip/node_modules/srcset/",\
           "packageDependencies": [\
-            ["sshpk", "npm:1.17.0"],\
-            ["asn1", "npm:0.2.6"],\
-            ["assert-plus", "npm:1.0.0"],\
-            ["bcrypt-pbkdf", "npm:1.0.2"],\
-            ["dashdash", "npm:1.14.1"],\
-            ["ecc-jsbn", "npm:0.1.2"],\
-            ["getpass", "npm:0.1.7"],\
-            ["jsbn", "npm:0.1.1"],\
-            ["safer-buffer", "npm:2.1.2"],\
-            ["tweetnacl", "npm:0.14.5"]\
+            ["srcset", "npm:4.0.0"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -9008,32 +8827,56 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         ["npm:4.2.3", {\
           "packageLocation": "./.yarn/cache/string-width-npm-4.2.3-2c27177bae-e52c10dc3f.zip/node_modules/string-width/",\
           "packageDependencies": [\
-            ["string-width", "npm:4.2.3"],\
-            ["emoji-regex", "npm:8.0.0"],\
-            ["is-fullwidth-code-point", "npm:3.0.0"],\
-            ["strip-ansi", "npm:6.0.1"]\
+            ["string-width", "npm:4.2.3"],\
+            ["emoji-regex", "npm:8.0.0"],\
+            ["is-fullwidth-code-point", "npm:3.0.0"],\
+            ["strip-ansi", "npm:6.0.1"]\
+          ],\
+          "linkType": "HARD"\
+        }],\
+        ["npm:5.1.2", {\
+          "packageLocation": "./.yarn/cache/string-width-npm-5.1.2-bf60531341-7369deaa29.zip/node_modules/string-width/",\
+          "packageDependencies": [\
+            ["string-width", "npm:5.1.2"],\
+            ["eastasianwidth", "npm:0.2.0"],\
+            ["emoji-regex", "npm:9.2.2"],\
+            ["strip-ansi", "npm:7.0.1"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["string.prototype.trim", [\
+        ["npm:1.2.8", {\
+          "packageLocation": "./.yarn/cache/string.prototype.trim-npm-1.2.8-7ed4517ce8-49eb1a862a.zip/node_modules/string.prototype.trim/",\
+          "packageDependencies": [\
+            ["string.prototype.trim", "npm:1.2.8"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["string.prototype.trimend", [\
-        ["npm:1.0.4", {\
-          "packageLocation": "./.yarn/cache/string.prototype.trimend-npm-1.0.4-a656b8fe24-17e5aa45c3.zip/node_modules/string.prototype.trimend/",\
+        ["npm:1.0.7", {\
+          "packageLocation": "./.yarn/cache/string.prototype.trimend-npm-1.0.7-159b9dcfbc-2375516272.zip/node_modules/string.prototype.trimend/",\
           "packageDependencies": [\
-            ["string.prototype.trimend", "npm:1.0.4"],\
+            ["string.prototype.trimend", "npm:1.0.7"],\
             ["call-bind", "npm:1.0.2"],\
-            ["define-properties", "npm:1.1.4"]\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["string.prototype.trimstart", [\
-        ["npm:1.0.4", {\
-          "packageLocation": "./.yarn/cache/string.prototype.trimstart-npm-1.0.4-b31f5e7c85-3fb06818d3.zip/node_modules/string.prototype.trimstart/",\
+        ["npm:1.0.7", {\
+          "packageLocation": "./.yarn/cache/string.prototype.trimstart-npm-1.0.7-ae2f803b78-13d0c2cb0d.zip/node_modules/string.prototype.trimstart/",\
           "packageDependencies": [\
-            ["string.prototype.trimstart", "npm:1.0.4"],\
+            ["string.prototype.trimstart", "npm:1.0.7"],\
             ["call-bind", "npm:1.0.2"],\
-            ["define-properties", "npm:1.1.4"]\
+            ["define-properties", "npm:1.2.0"],\
+            ["es-abstract", "npm:1.22.3"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -9056,6 +8899,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["ansi-regex", "npm:5.0.1"]\
           ],\
           "linkType": "HARD"\
+        }],\
+        ["npm:7.0.1", {\
+          "packageLocation": "./.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip/node_modules/strip-ansi/",\
+          "packageDependencies": [\
+            ["strip-ansi", "npm:7.0.1"],\
+            ["ansi-regex", "npm:6.0.1"]\
+          ],\
+          "linkType": "HARD"\
         }]\
       ]],\
       ["strip-bom", [\
@@ -9067,15 +8918,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["strip-final-newline", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/strip-final-newline-npm-2.0.0-340c4f7c66-69412b5e25.zip/node_modules/strip-final-newline/",\
-          "packageDependencies": [\
-            ["strip-final-newline", "npm:2.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["strip-json-comments", [\
         ["npm:3.1.1", {\
           "packageLocation": "./.yarn/cache/strip-json-comments-npm-3.1.1-dcb2324823-492f73e272.zip/node_modules/strip-json-comments/",\
@@ -9101,14 +8943,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["has-flag", "npm:4.0.0"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:8.1.1", {\
-          "packageLocation": "./.yarn/cache/supports-color-npm-8.1.1-289e937149-c052193a7e.zip/node_modules/supports-color/",\
-          "packageDependencies": [\
-            ["supports-color", "npm:8.1.1"],\
-            ["has-flag", "npm:4.0.0"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["supports-preserve-symlinks-flag", [\
@@ -9160,19 +8994,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["terser", [\
-        ["npm:5.13.1", {\
-          "packageLocation": "./.yarn/cache/terser-npm-5.13.1-c7df10bd07-0b1f5043cf.zip/node_modules/terser/",\
-          "packageDependencies": [\
-            ["terser", "npm:5.13.1"],\
-            ["acorn", "npm:8.7.1"],\
-            ["commander", "npm:2.20.3"],\
-            ["source-map", "npm:0.8.0-beta.0"],\
-            ["source-map-support", "npm:0.5.21"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["test-exclude", [\
         ["npm:6.0.0", {\
           "packageLocation": "./.yarn/cache/test-exclude-npm-6.0.0-3fb03d69df-3b34a3d771.zip/node_modules/test-exclude/",\
@@ -9194,24 +9015,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["throttleit", [\
-        ["npm:1.0.0", {\
-          "packageLocation": "./.yarn/cache/throttleit-npm-1.0.0-6cbcfe7b7b-1b2db4d245.zip/node_modules/throttleit/",\
-          "packageDependencies": [\
-            ["throttleit", "npm:1.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["through", [\
-        ["npm:2.3.8", {\
-          "packageLocation": "./.yarn/cache/through-npm-2.3.8-df5f72a16e-a38c3e0598.zip/node_modules/through/",\
-          "packageDependencies": [\
-            ["through", "npm:2.3.8"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["timsort", [\
         ["npm:0.3.0", {\
           "packageLocation": "./.yarn/cache/timsort-npm-0.3.0-868a28166c-1a66cb897d.zip/node_modules/timsort/",\
@@ -9221,16 +9024,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["tmp", [\
-        ["npm:0.2.1", {\
-          "packageLocation": "./.yarn/cache/tmp-npm-0.2.1-a9c8d9c0ca-8b12146541.zip/node_modules/tmp/",\
-          "packageDependencies": [\
-            ["tmp", "npm:0.2.1"],\
-            ["rimraf", "npm:3.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["to-fast-properties", [\
         ["npm:2.0.0", {\
           "packageLocation": "./.yarn/cache/to-fast-properties-npm-2.0.0-0dc60cc481-be2de62fe5.zip/node_modules/to-fast-properties/",\
@@ -9268,27 +9061,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["tough-cookie", [\
-        ["npm:2.5.0", {\
-          "packageLocation": "./.yarn/cache/tough-cookie-npm-2.5.0-79a2fe43fe-16a8cd0902.zip/node_modules/tough-cookie/",\
-          "packageDependencies": [\
-            ["tough-cookie", "npm:2.5.0"],\
-            ["psl", "npm:1.8.0"],\
-            ["punycode", "npm:2.1.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["tr46", [\
-        ["npm:1.0.1", {\
-          "packageLocation": "./.yarn/cache/tr46-npm-1.0.1-9547f343a4-96d4ed46bc.zip/node_modules/tr46/",\
-          "packageDependencies": [\
-            ["tr46", "npm:1.0.1"],\
-            ["punycode", "npm:2.1.1"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["treemate", [\
         ["npm:0.3.11", {\
           "packageLocation": "./.yarn/cache/treemate-npm-0.3.11-7be66c23fc-0c6ccbc6c5.zip/node_modules/treemate/",\
@@ -9299,12 +9071,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["tsconfig-paths", [\
-        ["npm:3.14.1", {\
-          "packageLocation": "./.yarn/cache/tsconfig-paths-npm-3.14.1-17a815b5c5-8afa01c673.zip/node_modules/tsconfig-paths/",\
+        ["npm:3.15.0", {\
+          "packageLocation": "./.yarn/cache/tsconfig-paths-npm-3.15.0-ff68930e0e-59f35407a3.zip/node_modules/tsconfig-paths/",\
           "packageDependencies": [\
-            ["tsconfig-paths", "npm:3.14.1"],\
+            ["tsconfig-paths", "npm:3.15.0"],\
             ["@types/json5", "npm:0.0.29"],\
-            ["json5", "npm:1.0.1"],\
+            ["json5", "npm:1.0.2"],\
             ["minimist", "npm:1.2.6"],\
             ["strip-bom", "npm:3.0.0"]\
           ],\
@@ -9320,47 +9092,72 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["tunnel-agent", [\
-        ["npm:0.6.0", {\
-          "packageLocation": "./.yarn/cache/tunnel-agent-npm-0.6.0-64345ab7eb-05f6510358.zip/node_modules/tunnel-agent/",\
+      ["type-check", [\
+        ["npm:0.4.0", {\
+          "packageLocation": "./.yarn/cache/type-check-npm-0.4.0-60565800ce-ec688ebfc9.zip/node_modules/type-check/",\
           "packageDependencies": [\
-            ["tunnel-agent", "npm:0.6.0"],\
-            ["safe-buffer", "npm:5.2.1"]\
+            ["type-check", "npm:0.4.0"],\
+            ["prelude-ls", "npm:1.2.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["tweetnacl", [\
-        ["npm:0.14.5", {\
-          "packageLocation": "./.yarn/cache/tweetnacl-npm-0.14.5-a3f766c0d1-6061daba17.zip/node_modules/tweetnacl/",\
+      ["type-fest", [\
+        ["npm:0.20.2", {\
+          "packageLocation": "./.yarn/cache/type-fest-npm-0.20.2-b36432617f-4fb3272df2.zip/node_modules/type-fest/",\
           "packageDependencies": [\
-            ["tweetnacl", "npm:0.14.5"]\
+            ["type-fest", "npm:0.20.2"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["type-check", [\
-        ["npm:0.4.0", {\
-          "packageLocation": "./.yarn/cache/type-check-npm-0.4.0-60565800ce-ec688ebfc9.zip/node_modules/type-check/",\
+      ["typed-array-buffer", [\
+        ["npm:1.0.0", {\
+          "packageLocation": "./.yarn/cache/typed-array-buffer-npm-1.0.0-95cb610310-3e0281c79b.zip/node_modules/typed-array-buffer/",\
           "packageDependencies": [\
-            ["type-check", "npm:0.4.0"],\
-            ["prelude-ls", "npm:1.2.1"]\
+            ["typed-array-buffer", "npm:1.0.0"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["get-intrinsic", "npm:1.2.1"],\
+            ["is-typed-array", "npm:1.1.10"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
-      ["type-fest", [\
-        ["npm:0.20.2", {\
-          "packageLocation": "./.yarn/cache/type-fest-npm-0.20.2-b36432617f-4fb3272df2.zip/node_modules/type-fest/",\
+      ["typed-array-byte-length", [\
+        ["npm:1.0.0", {\
+          "packageLocation": "./.yarn/cache/typed-array-byte-length-npm-1.0.0-94d79975ca-b03db16458.zip/node_modules/typed-array-byte-length/",\
           "packageDependencies": [\
-            ["type-fest", "npm:0.20.2"]\
+            ["typed-array-byte-length", "npm:1.0.0"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["for-each", "npm:0.3.3"],\
+            ["has-proto", "npm:1.0.1"],\
+            ["is-typed-array", "npm:1.1.10"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:0.21.3", {\
-          "packageLocation": "./.yarn/cache/type-fest-npm-0.21.3-5ff2a9c6fd-e6b32a3b38.zip/node_modules/type-fest/",\
+        }]\
+      ]],\
+      ["typed-array-byte-offset", [\
+        ["npm:1.0.0", {\
+          "packageLocation": "./.yarn/cache/typed-array-byte-offset-npm-1.0.0-8cbb911cf5-04f6f02d0e.zip/node_modules/typed-array-byte-offset/",\
+          "packageDependencies": [\
+            ["typed-array-byte-offset", "npm:1.0.0"],\
+            ["available-typed-arrays", "npm:1.0.5"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["for-each", "npm:0.3.3"],\
+            ["has-proto", "npm:1.0.1"],\
+            ["is-typed-array", "npm:1.1.10"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["typed-array-length", [\
+        ["npm:1.0.4", {\
+          "packageLocation": "./.yarn/cache/typed-array-length-npm-1.0.4-92771b81fc-2228febc93.zip/node_modules/typed-array-length/",\
           "packageDependencies": [\
-            ["type-fest", "npm:0.21.3"]\
+            ["typed-array-length", "npm:1.0.4"],\
+            ["call-bind", "npm:1.0.2"],\
+            ["for-each", "npm:0.3.3"],\
+            ["is-typed-array", "npm:1.1.10"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -9398,24 +9195,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["universalify", [\
-        ["npm:2.0.0", {\
-          "packageLocation": "./.yarn/cache/universalify-npm-2.0.0-03b8b418a8-2406a4edf4.zip/node_modules/universalify/",\
-          "packageDependencies": [\
-            ["universalify", "npm:2.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["untildify", [\
-        ["npm:4.0.0", {\
-          "packageLocation": "./.yarn/cache/untildify-npm-4.0.0-4a8b569825-39ced9c418.zip/node_modules/untildify/",\
-          "packageDependencies": [\
-            ["untildify", "npm:4.0.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["uri-js", [\
         ["npm:4.4.1", {\
           "packageLocation": "./.yarn/cache/uri-js-npm-4.4.1-66d11cbcaf-7167432de6.zip/node_modules/uri-js/",\
@@ -9444,24 +9223,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["uuid", [\
-        ["npm:8.3.2", {\
-          "packageLocation": "./.yarn/cache/uuid-npm-8.3.2-eca0baba53-5575a8a75c.zip/node_modules/uuid/",\
-          "packageDependencies": [\
-            ["uuid", "npm:8.3.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["v8-compile-cache", [\
-        ["npm:2.3.0", {\
-          "packageLocation": "./.yarn/cache/v8-compile-cache-npm-2.3.0-961375f150-adb0a271ea.zip/node_modules/v8-compile-cache/",\
-          "packageDependencies": [\
-            ["v8-compile-cache", "npm:2.3.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["v8-to-istanbul", [\
         ["npm:9.0.1", {\
           "packageLocation": "./.yarn/cache/v8-to-istanbul-npm-9.0.1-58bbce7857-a49c34bf0a.zip/node_modules/v8-to-istanbul/",\
@@ -9474,6 +9235,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["vanillajs-datepicker", [\
+        ["npm:1.3.4", {\
+          "packageLocation": "./.yarn/cache/vanillajs-datepicker-npm-1.3.4-bc86e15a9c-830958f8af.zip/node_modules/vanillajs-datepicker/",\
+          "packageDependencies": [\
+            ["vanillajs-datepicker", "npm:1.3.4"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["vdirs", [\
         ["npm:0.1.8", {\
           "packageLocation": "./.yarn/cache/vdirs-npm-0.1.8-59a32a98d6-a7be8ccad3.zip/node_modules/vdirs/",\
@@ -9482,13 +9252,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.1.8", {\
-          "packageLocation": "./.yarn/__virtual__/vdirs-virtual-8164011a8b/0/cache/vdirs-npm-0.1.8-59a32a98d6-a7be8ccad3.zip/node_modules/vdirs/",\
+        ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.1.8", {\
+          "packageLocation": "./.yarn/__virtual__/vdirs-virtual-6e8e27ef7d/0/cache/vdirs-npm-0.1.8-59a32a98d6-a7be8ccad3.zip/node_modules/vdirs/",\
           "packageDependencies": [\
-            ["vdirs", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.1.8"],\
+            ["vdirs", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.1.8"],\
             ["@types/vue", null],\
             ["evtd", "npm:0.2.3"],\
-            ["vue", "npm:3.2.40"]\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -9497,49 +9267,50 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["verror", [\
-        ["npm:1.10.0", {\
-          "packageLocation": "./.yarn/cache/verror-npm-1.10.0-c3f839c579-c431df0bed.zip/node_modules/verror/",\
-          "packageDependencies": [\
-            ["verror", "npm:1.10.0"],\
-            ["assert-plus", "npm:1.0.0"],\
-            ["core-util-is", "npm:1.0.2"],\
-            ["extsprintf", "npm:1.3.0"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["vite", [\
-        ["npm:2.9.15", {\
-          "packageLocation": "./.yarn/cache/vite-npm-2.9.15-da673a6d8d-5edf8afc13.zip/node_modules/vite/",\
+        ["npm:4.5.3", {\
+          "packageLocation": "./.yarn/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip/node_modules/vite/",\
           "packageDependencies": [\
-            ["vite", "npm:2.9.15"]\
+            ["vite", "npm:4.5.3"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.9.15", {\
-          "packageLocation": "./.yarn/__virtual__/vite-virtual-f1f5bbd459/0/cache/vite-npm-2.9.15-da673a6d8d-5edf8afc13.zip/node_modules/vite/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3", {\
+          "packageLocation": "./.yarn/__virtual__/vite-virtual-69c30fd9fd/0/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip/node_modules/vite/",\
           "packageDependencies": [\
-            ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:2.9.15"],\
+            ["vite", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.5.3"],\
             ["@types/less", null],\
+            ["@types/lightningcss", null],\
+            ["@types/node", null],\
             ["@types/sass", null],\
             ["@types/stylus", null],\
-            ["esbuild", "npm:0.14.38"],\
+            ["@types/sugarss", null],\
+            ["@types/terser", null],\
+            ["esbuild", "npm:0.18.20"],\
             ["fsevents", "patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"],\
             ["less", null],\
-            ["postcss", "npm:8.4.14"],\
-            ["resolve", "patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=07638b"],\
-            ["rollup", "npm:2.77.3"],\
-            ["sass", "npm:1.55.0"],\
-            ["stylus", null]\
+            ["lightningcss", null],\
+            ["postcss", "npm:8.4.33"],\
+            ["rollup", "npm:3.29.4"],\
+            ["sass", "npm:1.72.0"],\
+            ["stylus", null],\
+            ["sugarss", null],\
+            ["terser", null]\
           ],\
           "packagePeers": [\
             "@types/less",\
+            "@types/lightningcss",\
+            "@types/node",\
             "@types/sass",\
             "@types/stylus",\
+            "@types/sugarss",\
+            "@types/terser",\
             "less",\
+            "lightningcss",\
             "sass",\
-            "stylus"\
+            "stylus",\
+            "sugarss",\
+            "terser"\
           ],\
           "linkType": "HARD"\
         }]\
@@ -9553,6 +9324,46 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["volar-service-html", [\
+        ["npm:0.0.34", {\
+          "packageLocation": "./.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip/node_modules/volar-service-html/",\
+          "packageDependencies": [\
+            ["volar-service-html", "npm:0.0.34"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:6f5429e17c4ecd390af605a4e97ecc7b34f2f1374a5e30c21f0a978cbdc904738a42d0d6f5d44d2e969250218b3c205853d6afefd88b87bcda877286d12bef83#npm:0.0.34", {\
+          "packageLocation": "./.yarn/__virtual__/volar-service-html-virtual-5a9107a24d/0/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip/node_modules/volar-service-html/",\
+          "packageDependencies": [\
+            ["volar-service-html", "virtual:6f5429e17c4ecd390af605a4e97ecc7b34f2f1374a5e30c21f0a978cbdc904738a42d0d6f5d44d2e969250218b3c205853d6afefd88b87bcda877286d12bef83#npm:0.0.34"],\
+            ["@types/volar__language-service", null],\
+            ["@volar/language-service", "npm:2.1.4"],\
+            ["vscode-html-languageservice", "npm:5.1.2"],\
+            ["vscode-languageserver-textdocument", "npm:1.0.11"],\
+            ["vscode-uri", "npm:3.0.8"]\
+          ],\
+          "packagePeers": [\
+            "@types/volar__language-service",\
+            "@volar/language-service"\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["volar-service-pug", [\
+        ["npm:0.0.34", {\
+          "packageLocation": "./.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip/node_modules/volar-service-pug/",\
+          "packageDependencies": [\
+            ["volar-service-pug", "npm:0.0.34"],\
+            ["@volar/language-service", "npm:2.1.4"],\
+            ["pug-lexer", "npm:5.0.1"],\
+            ["pug-parser", "npm:6.0.0"],\
+            ["volar-service-html", "virtual:6f5429e17c4ecd390af605a4e97ecc7b34f2f1374a5e30c21f0a978cbdc904738a42d0d6f5d44d2e969250218b3c205853d6afefd88b87bcda877286d12bef83#npm:0.0.34"],\
+            ["vscode-html-languageservice", "npm:5.1.2"],\
+            ["vscode-languageserver-textdocument", "npm:1.0.11"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["vooks", [\
         ["npm:0.2.12", {\
           "packageLocation": "./.yarn/cache/vooks-npm-0.2.12-0d1a2d856b-e6841ec5b6.zip/node_modules/vooks/",\
@@ -9561,13 +9372,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.2.12", {\
-          "packageLocation": "./.yarn/__virtual__/vooks-virtual-e746160826/0/cache/vooks-npm-0.2.12-0d1a2d856b-e6841ec5b6.zip/node_modules/vooks/",\
+        ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.2.12", {\
+          "packageLocation": "./.yarn/__virtual__/vooks-virtual-ca0a47c4bf/0/cache/vooks-npm-0.2.12-0d1a2d856b-e6841ec5b6.zip/node_modules/vooks/",\
           "packageDependencies": [\
-            ["vooks", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.2.12"],\
+            ["vooks", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.2.12"],\
             ["@types/vue", null],\
             ["evtd", "npm:0.2.3"],\
-            ["vue", "npm:3.2.40"]\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -9576,16 +9387,89 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["vscode-html-languageservice", [\
+        ["npm:5.1.2", {\
+          "packageLocation": "./.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip/node_modules/vscode-html-languageservice/",\
+          "packageDependencies": [\
+            ["vscode-html-languageservice", "npm:5.1.2"],\
+            ["@vscode/l10n", "npm:0.0.18"],\
+            ["vscode-languageserver-textdocument", "npm:1.0.11"],\
+            ["vscode-languageserver-types", "npm:3.17.5"],\
+            ["vscode-uri", "npm:3.0.8"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["vscode-jsonrpc", [\
+        ["npm:8.2.0", {\
+          "packageLocation": "./.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip/node_modules/vscode-jsonrpc/",\
+          "packageDependencies": [\
+            ["vscode-jsonrpc", "npm:8.2.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["vscode-languageserver-protocol", [\
+        ["npm:3.17.5", {\
+          "packageLocation": "./.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip/node_modules/vscode-languageserver-protocol/",\
+          "packageDependencies": [\
+            ["vscode-languageserver-protocol", "npm:3.17.5"],\
+            ["vscode-jsonrpc", "npm:8.2.0"],\
+            ["vscode-languageserver-types", "npm:3.17.5"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["vscode-languageserver-textdocument", [\
+        ["npm:1.0.11", {\
+          "packageLocation": "./.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip/node_modules/vscode-languageserver-textdocument/",\
+          "packageDependencies": [\
+            ["vscode-languageserver-textdocument", "npm:1.0.11"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["vscode-languageserver-types", [\
+        ["npm:3.17.5", {\
+          "packageLocation": "./.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip/node_modules/vscode-languageserver-types/",\
+          "packageDependencies": [\
+            ["vscode-languageserver-types", "npm:3.17.5"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
+      ["vscode-uri", [\
+        ["npm:3.0.8", {\
+          "packageLocation": "./.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip/node_modules/vscode-uri/",\
+          "packageDependencies": [\
+            ["vscode-uri", "npm:3.0.8"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["vue", [\
-        ["npm:3.2.40", {\
-          "packageLocation": "./.yarn/cache/vue-npm-3.2.40-ee1b0f06d2-fb5ca87c16.zip/node_modules/vue/",\
+        ["npm:3.4.21", {\
+          "packageLocation": "./.yarn/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip/node_modules/vue/",\
+          "packageDependencies": [\
+            ["vue", "npm:3.4.21"]\
+          ],\
+          "linkType": "SOFT"\
+        }],\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21", {\
+          "packageLocation": "./.yarn/__virtual__/vue-virtual-b79af6274d/0/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip/node_modules/vue/",\
           "packageDependencies": [\
-            ["vue", "npm:3.2.40"],\
-            ["@vue/compiler-dom", "npm:3.2.40"],\
-            ["@vue/compiler-sfc", "npm:3.2.40"],\
-            ["@vue/runtime-dom", "npm:3.2.40"],\
-            ["@vue/server-renderer", "virtual:ee1b0f06d22c7073f87fcc94e688c4d6a5316dd1aa1770a54121d2942b302f08768362afc7b1370cd6826afa7582fad4a548059bae34f23d21a4fef21024b7a3#npm:3.2.40"],\
-            ["@vue/shared", "npm:3.2.40"]\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"],\
+            ["@types/typescript", null],\
+            ["@vue/compiler-dom", "npm:3.4.21"],\
+            ["@vue/compiler-sfc", "npm:3.4.21"],\
+            ["@vue/runtime-dom", "npm:3.4.21"],\
+            ["@vue/server-renderer", "virtual:b79af6274dddda2b283f42be2b827e30c3e5389bce2938ee73bdb74ee9781811fc079c6836719e57940708d59b3beeb14d9e3c12f37f2d22582a53e6c32e4c97#npm:3.4.21"],\
+            ["@vue/shared", "npm:3.4.21"],\
+            ["typescript", null]\
+          ],\
+          "packagePeers": [\
+            "@types/typescript",\
+            "typescript"\
           ],\
           "linkType": "HARD"\
         }]\
@@ -9598,21 +9482,21 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           ],\
           "linkType": "SOFT"\
         }],\
-        ["npm:0.13.1", {\
-          "packageLocation": "./.yarn/unplugged/vue-demi-virtual-e03f937105/node_modules/vue-demi/",\
+        ["npm:0.14.5", {\
+          "packageLocation": "./.yarn/unplugged/vue-demi-virtual-b0e571907e/node_modules/vue-demi/",\
           "packageDependencies": [\
-            ["vue-demi", "npm:0.13.1"]\
+            ["vue-demi", "npm:0.14.5"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:bbd346317539b32aff4888ec925a05ad71c439b9d2fdb7878763afa885dc4d8eada02316fe87f186f8039ac2592a29df12da3fb6e8ef2abc33fa209844767ee8#npm:0.13.1", {\
-          "packageLocation": "./.yarn/unplugged/vue-demi-virtual-e03f937105/node_modules/vue-demi/",\
+        ["virtual:cf6f7439ee76dfd2e7f8f2565ae847d76901434fc49c65702190cdf3d1c61e61c701a5c45b514c4bdeacb8f4bcac9c8a98bd4db3d0bc8e403d9e8db2cf14372a#npm:0.14.5", {\
+          "packageLocation": "./.yarn/unplugged/vue-demi-virtual-b0e571907e/node_modules/vue-demi/",\
           "packageDependencies": [\
-            ["vue-demi", "virtual:bbd346317539b32aff4888ec925a05ad71c439b9d2fdb7878763afa885dc4d8eada02316fe87f186f8039ac2592a29df12da3fb6e8ef2abc33fa209844767ee8#npm:0.13.1"],\
+            ["vue-demi", "virtual:cf6f7439ee76dfd2e7f8f2565ae847d76901434fc49c65702190cdf3d1c61e61c701a5c45b514c4bdeacb8f4bcac9c8a98bd4db3d0bc8e403d9e8db2cf14372a#npm:0.14.5"],\
             ["@types/vue", null],\
             ["@types/vue__composition-api", null],\
             ["@vue/composition-api", null],\
-            ["vue", "npm:3.2.40"]\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -9629,7 +9513,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["@types/vue", null],\
             ["@types/vue__composition-api", null],\
             ["@vue/composition-api", null],\
-            ["vue", "npm:3.2.40"]\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -9641,20 +9525,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["vue-eslint-parser", [\
-        ["npm:9.0.3", {\
-          "packageLocation": "./.yarn/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip/node_modules/vue-eslint-parser/",\
+        ["npm:9.4.2", {\
+          "packageLocation": "./.yarn/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip/node_modules/vue-eslint-parser/",\
           "packageDependencies": [\
-            ["vue-eslint-parser", "npm:9.0.3"]\
+            ["vue-eslint-parser", "npm:9.4.2"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:41761eba42069ecb6be73faa307f189ba0d5c9af01717c2323df7e068d4f8d14beffe0b524e6cd617c9e470be0a5f68634e5374290061c832301227d0d0b697a#npm:9.0.3", {\
-          "packageLocation": "./.yarn/__virtual__/vue-eslint-parser-virtual-3fae3cad6e/0/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip/node_modules/vue-eslint-parser/",\
+        ["virtual:e080dd5dc65fb3541eb98fd929c3a1d3733f3aff4bb24b09a6b5cce9fba4a29aca07e286ef93079f2144caa0fd33bb6545549286d3a9f2b9a211caa1f4b68ff9#npm:9.4.2", {\
+          "packageLocation": "./.yarn/__virtual__/vue-eslint-parser-virtual-f703c550a2/0/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip/node_modules/vue-eslint-parser/",\
           "packageDependencies": [\
-            ["vue-eslint-parser", "virtual:41761eba42069ecb6be73faa307f189ba0d5c9af01717c2323df7e068d4f8d14beffe0b524e6cd617c9e470be0a5f68634e5374290061c832301227d0d0b697a#npm:9.0.3"],\
+            ["vue-eslint-parser", "virtual:e080dd5dc65fb3541eb98fd929c3a1d3733f3aff4bb24b09a6b5cce9fba4a29aca07e286ef93079f2144caa0fd33bb6545549286d3a9f2b9a211caa1f4b68ff9#npm:9.4.2"],\
             ["@types/eslint", null],\
             ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\
-            ["eslint", "npm:8.24.0"],\
+            ["eslint", "npm:8.57.0"],\
             ["eslint-scope", "npm:7.1.1"],\
             ["eslint-visitor-keys", "npm:3.3.0"],\
             ["espree", "npm:9.3.2"],\
@@ -9670,20 +9554,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["vue-router", [\
-        ["npm:4.1.5", {\
-          "packageLocation": "./.yarn/cache/vue-router-npm-4.1.5-8f6d1df911-cafa2f4e14.zip/node_modules/vue-router/",\
+        ["npm:4.3.0", {\
+          "packageLocation": "./.yarn/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip/node_modules/vue-router/",\
           "packageDependencies": [\
-            ["vue-router", "npm:4.1.5"]\
+            ["vue-router", "npm:4.3.0"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.1.5", {\
-          "packageLocation": "./.yarn/__virtual__/vue-router-virtual-7a665cc2bd/0/cache/vue-router-npm-4.1.5-8f6d1df911-cafa2f4e14.zip/node_modules/vue-router/",\
+        ["virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.0", {\
+          "packageLocation": "./.yarn/__virtual__/vue-router-virtual-82f54143bf/0/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip/node_modules/vue-router/",\
           "packageDependencies": [\
-            ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.1.5"],\
+            ["vue-router", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:4.3.0"],\
             ["@types/vue", null],\
-            ["@vue/devtools-api", "npm:6.1.4"],\
-            ["vue", "npm:3.2.40"]\
+            ["@vue/devtools-api", "npm:6.6.1"],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -9693,26 +9577,26 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["vueuc", [\
-        ["npm:0.4.47", {\
-          "packageLocation": "./.yarn/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip/node_modules/vueuc/",\
+        ["npm:0.4.58", {\
+          "packageLocation": "./.yarn/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip/node_modules/vueuc/",\
           "packageDependencies": [\
-            ["vueuc", "npm:0.4.47"]\
+            ["vueuc", "npm:0.4.58"]\
           ],\
           "linkType": "SOFT"\
         }],\
-        ["virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.4.47", {\
-          "packageLocation": "./.yarn/__virtual__/vueuc-virtual-d79d3c60e6/0/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip/node_modules/vueuc/",\
+        ["virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.4.58", {\
+          "packageLocation": "./.yarn/__virtual__/vueuc-virtual-2366be83ef/0/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip/node_modules/vueuc/",\
           "packageDependencies": [\
-            ["vueuc", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.4.47"],\
-            ["@css-render/vue3-ssr", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.15.10"],\
+            ["vueuc", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.4.58"],\
+            ["@css-render/vue3-ssr", "virtual:2366be83ef58a728ebb5a5e9ed4600f4465f98b2a844262fcfbe89415361d5d5f9e964ec3b9a72d6a5004f37c1024d017c65e67473dd9cc39cd61f51768c65e6#npm:0.15.10"],\
             ["@juggle/resize-observer", "npm:3.3.1"],\
             ["@types/vue", null],\
             ["css-render", "npm:0.15.10"],\
-            ["evtd", "npm:0.2.3"],\
-            ["seemly", "npm:0.3.3"],\
-            ["vdirs", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.1.8"],\
-            ["vooks", "virtual:d12b0f0271a112a5d0a038910108c75b2992181aea8f5989bc8be4be1cbdedc34712ffef869884101e9decf86f19ffb484e57875eeeae8f198d23699ff5afb5b#npm:0.2.12"],\
-            ["vue", "npm:3.2.40"]\
+            ["evtd", "npm:0.2.4"],\
+            ["seemly", "npm:0.3.6"],\
+            ["vdirs", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.1.8"],\
+            ["vooks", "virtual:32fd9c861d759cd42dabb479e4fd652286369e629cc7ef63c9cf4f1af5387c64be25fafc985023ea8534b1ec1f4cc92e6c918c7f3b594aa0f8acad026c671a6a#npm:0.2.12"],\
+            ["vue", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:3.4.21"]\
           ],\
           "packagePeers": [\
             "@types/vue",\
@@ -9730,27 +9614,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["webidl-conversions", [\
-        ["npm:4.0.2", {\
-          "packageLocation": "./.yarn/cache/webidl-conversions-npm-4.0.2-1d159e6409-c93d8dfe90.zip/node_modules/webidl-conversions/",\
-          "packageDependencies": [\
-            ["webidl-conversions", "npm:4.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["whatwg-url", [\
-        ["npm:7.1.0", {\
-          "packageLocation": "./.yarn/cache/whatwg-url-npm-7.1.0-d6cae01571-fecb07c872.zip/node_modules/whatwg-url/",\
-          "packageDependencies": [\
-            ["whatwg-url", "npm:7.1.0"],\
-            ["lodash.sortby", "npm:4.7.0"],\
-            ["tr46", "npm:1.0.1"],\
-            ["webidl-conversions", "npm:4.0.2"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["which", [\
         ["npm:2.0.2", {\
           "packageLocation": "./.yarn/cache/which-npm-2.0.2-320ddf72f7-1a5c563d3c.zip/node_modules/which/",\
@@ -9775,6 +9638,20 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
+      ["which-typed-array", [\
+        ["npm:1.1.13", {\
+          "packageLocation": "./.yarn/cache/which-typed-array-npm-1.1.13-92c18b4878-3828a0d5d7.zip/node_modules/which-typed-array/",\
+          "packageDependencies": [\
+            ["which-typed-array", "npm:1.1.13"],\
+            ["available-typed-arrays", "npm:1.0.5"],\
+            ["call-bind", "npm:1.0.5"],\
+            ["for-each", "npm:0.3.3"],\
+            ["gopd", "npm:1.0.1"],\
+            ["has-tostringtag", "npm:1.0.0"]\
+          ],\
+          "linkType": "HARD"\
+        }]\
+      ]],\
       ["wide-align", [\
         ["npm:1.1.5", {\
           "packageLocation": "./.yarn/cache/wide-align-npm-1.1.5-889d77e592-d5fc37cd56.zip/node_modules/wide-align/",\
@@ -9798,33 +9675,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["word-wrap", [\
-        ["npm:1.2.3", {\
-          "packageLocation": "./.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip/node_modules/word-wrap/",\
-          "packageDependencies": [\
-            ["word-wrap", "npm:1.2.3"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["wrap-ansi", [\
-        ["npm:6.2.0", {\
-          "packageLocation": "./.yarn/cache/wrap-ansi-npm-6.2.0-439a7246d8-6cd96a4101.zip/node_modules/wrap-ansi/",\
+        ["npm:7.0.0", {\
+          "packageLocation": "./.yarn/cache/wrap-ansi-npm-7.0.0-ad6e1a0554-a790b846fd.zip/node_modules/wrap-ansi/",\
           "packageDependencies": [\
-            ["wrap-ansi", "npm:6.2.0"],\
+            ["wrap-ansi", "npm:7.0.0"],\
             ["ansi-styles", "npm:4.3.0"],\
             ["string-width", "npm:4.2.3"],\
             ["strip-ansi", "npm:6.0.1"]\
           ],\
           "linkType": "HARD"\
         }],\
-        ["npm:7.0.0", {\
-          "packageLocation": "./.yarn/cache/wrap-ansi-npm-7.0.0-ad6e1a0554-a790b846fd.zip/node_modules/wrap-ansi/",\
+        ["npm:8.1.0", {\
+          "packageLocation": "./.yarn/cache/wrap-ansi-npm-8.1.0-26a4e6ae28-371733296d.zip/node_modules/wrap-ansi/",\
           "packageDependencies": [\
-            ["wrap-ansi", "npm:7.0.0"],\
-            ["ansi-styles", "npm:4.3.0"],\
-            ["string-width", "npm:4.2.3"],\
-            ["strip-ansi", "npm:6.0.1"]\
+            ["wrap-ansi", "npm:8.1.0"],\
+            ["ansi-styles", "npm:6.2.1"],\
+            ["string-width", "npm:5.1.2"],\
+            ["strip-ansi", "npm:7.0.1"]\
           ],\
           "linkType": "HARD"\
         }]\
@@ -9838,32 +9706,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD"\
         }]\
       ]],\
-      ["ws", [\
-        ["npm:8.8.1", {\
-          "packageLocation": "./.yarn/cache/ws-npm-8.8.1-955e8c9f58-2152cf862c.zip/node_modules/ws/",\
-          "packageDependencies": [\
-            ["ws", "npm:8.8.1"]\
-          ],\
-          "linkType": "SOFT"\
-        }],\
-        ["virtual:0c5deaa690b86b9f32697bfbf90e21328e17355764642819d8c4b25d34b724d506965cb4b20efaea0d964823dbbbf99d8cb3e40f839343bccb1bf76ef74acb5e#npm:8.8.1", {\
-          "packageLocation": "./.yarn/__virtual__/ws-virtual-feecea688c/0/cache/ws-npm-8.8.1-955e8c9f58-2152cf862c.zip/node_modules/ws/",\
-          "packageDependencies": [\
-            ["ws", "virtual:0c5deaa690b86b9f32697bfbf90e21328e17355764642819d8c4b25d34b724d506965cb4b20efaea0d964823dbbbf99d8cb3e40f839343bccb1bf76ef74acb5e#npm:8.8.1"],\
-            ["@types/bufferutil", null],\
-            ["@types/utf-8-validate", null],\
-            ["bufferutil", null],\
-            ["utf-8-validate", null]\
-          ],\
-          "packagePeers": [\
-            "@types/bufferutil",\
-            "@types/utf-8-validate",\
-            "bufferutil",\
-            "utf-8-validate"\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
       ["xml-name-validator", [\
         ["npm:4.0.0", {\
           "packageLocation": "./.yarn/cache/xml-name-validator-npm-4.0.0-0857c21729-af100b79c2.zip/node_modules/xml-name-validator/",\
@@ -9907,47 +9749,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["yaml", "npm:1.10.2"]\
           ],\
           "linkType": "HARD"\
-        }],\
-        ["npm:2.1.1", {\
-          "packageLocation": "./.yarn/cache/yaml-npm-2.1.1-e717f9b915-f48bb20991.zip/node_modules/yaml/",\
-          "packageDependencies": [\
-            ["yaml", "npm:2.1.1"]\
-          ],\
-          "linkType": "HARD"\
         }]\
       ]],\
       ["yargs", [\
-        ["npm:16.2.0", {\
-          "packageLocation": "./.yarn/cache/yargs-npm-16.2.0-547873d425-b14afbb51e.zip/node_modules/yargs/",\
+        ["npm:17.7.2", {\
+          "packageLocation": "./.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip/node_modules/yargs/",\
           "packageDependencies": [\
-            ["yargs", "npm:16.2.0"],\
-            ["cliui", "npm:7.0.4"],\
+            ["yargs", "npm:17.7.2"],\
+            ["cliui", "npm:8.0.1"],\
             ["escalade", "npm:3.1.1"],\
             ["get-caller-file", "npm:2.0.5"],\
             ["require-directory", "npm:2.1.1"],\
             ["string-width", "npm:4.2.3"],\
             ["y18n", "npm:5.0.8"],\
-            ["yargs-parser", "npm:20.2.9"]\
+            ["yargs-parser", "npm:21.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
       ]],\
       ["yargs-parser", [\
-        ["npm:20.2.9", {\
-          "packageLocation": "./.yarn/cache/yargs-parser-npm-20.2.9-a1d19e598d-8bb69015f2.zip/node_modules/yargs-parser/",\
-          "packageDependencies": [\
-            ["yargs-parser", "npm:20.2.9"]\
-          ],\
-          "linkType": "HARD"\
-        }]\
-      ]],\
-      ["yauzl", [\
-        ["npm:2.10.0", {\
-          "packageLocation": "./.yarn/cache/yauzl-npm-2.10.0-72e70ea021-7f21fe0bba.zip/node_modules/yauzl/",\
+        ["npm:21.1.1", {\
+          "packageLocation": "./.yarn/cache/yargs-parser-npm-21.1.1-8fdc003314-ed2d96a616.zip/node_modules/yargs-parser/",\
           "packageDependencies": [\
-            ["yauzl", "npm:2.10.0"],\
-            ["buffer-crc32", "npm:0.2.13"],\
-            ["fd-slicer", "npm:1.1.0"]\
+            ["yargs-parser", "npm:21.1.1"]\
           ],\
           "linkType": "HARD"\
         }]\
diff --git a/.pylintrc b/.pylintrc
index c9a33fcec2..008f89e454 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -405,4 +405,4 @@ analyse-fallback-blocks=no
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8dfc1b9b7a..227eb8f615 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,7 +12,7 @@
             "program": "${workspaceFolder}/ietf/manage.py",
             "args": [
                 "runserver",
-                "0.0.0.0:8000",
+                "0.0.0.0:8001",
                 "--settings=settings_local"
             ],
             "django": true,
@@ -30,7 +30,7 @@
             "program": "${workspaceFolder}/ietf/manage.py",
             "args": [
                 "runserver",
-                "0.0.0.0:8000",
+                "0.0.0.0:8001",
                 "--settings=settings_local_vite"
             ],
             "django": true,
@@ -48,7 +48,7 @@
             "program": "${workspaceFolder}/ietf/manage.py",
             "args": [
                 "runserver",
-                "0.0.0.0:8000",
+                "0.0.0.0:8001",
                 "--settings=settings_local_debug"
             ],
             "django": true,
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6acc641264..b323cd02f7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,55 +1,61 @@
 {
-  "taskExplorer.exclude": [
-    "**/.vscode-test/**",
-    "**/bin/**",
-    "**/build/**",
-    "**/CompiledOutput/**",
-    "**/dist/**",
-    "**/doc/**",
-    "**/ext/**",
-    "**/out/**",
-    "**/output/**",
-    "**/packages/**",
-    "**/release/**",
-    "**/releases/**",
-    "**/samples/**",
-    "**/sdks/**",
-    "**/static/**",
-    "**/target/**",
-    "**/test/**",
-    "**/third_party/**",
-    "**/vendor/**",
-    "**/work/**",
-    "/workspace/bootstrap/nuget/MyGet.ps1"
-  ],
-  "taskExplorer.enableAnt": false,
-  "taskExplorer.enableAppPublisher": false,
-  "taskExplorer.enablePipenv": false,
-  "taskExplorer.enableBash": false,
-  "taskExplorer.enableBatch": false,
-  "taskExplorer.enableGradle": false,
-  "taskExplorer.enableGrunt": false,
-  "taskExplorer.enableGulp": false,
-  "taskExplorer.enablePerl": false,
-  "taskExplorer.enableMake": false,
-  "taskExplorer.enableMaven": false,
-  "taskExplorer.enableNsis": false,
-  "taskExplorer.enableNpm": false,
-  "taskExplorer.enablePowershell": false,
-  "taskExplorer.enablePython": false,
-  "taskExplorer.enableRuby": false,
-  "taskExplorer.enableTsc": false,
-  "taskExplorer.enableWorkspace": true,
-  "taskExplorer.enableExplorerView": false,
-  "taskExplorer.enableSideBar": true,
-  "search.exclude": {
-    "**/.yarn": true,
-    "**/.pnp.*": true
-  },
-  "eslint.nodePath": ".yarn/sdks",
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "vue"
-  ]
+    "taskExplorer.exclude": [
+        "**/.vscode-test/**",
+        "**/bin/**",
+        "**/build/**",
+        "**/CompiledOutput/**",
+        "**/dist/**",
+        "**/doc/**",
+        "**/ext/**",
+        "**/out/**",
+        "**/output/**",
+        "**/packages/**",
+        "**/release/**",
+        "**/releases/**",
+        "**/samples/**",
+        "**/sdks/**",
+        "**/static/**",
+        "**/target/**",
+        "**/test/**",
+        "**/third_party/**",
+        "**/vendor/**",
+        "**/work/**",
+        "/workspace/bootstrap/nuget/MyGet.ps1"
+    ],
+    "taskExplorer.enabledTasks": {
+        "ant": false,
+        "bash": false,
+        "batch": false,
+        "composer": false,
+        "gradle": false,
+        "grunt": false,
+        "gulp": false,
+        "make": false,
+        "maven": false,
+        "npm": false,
+        "perl": false,
+        "pipenv": false,
+        "powershell": false,
+        "python": false,
+        "ruby": false,
+        "tsc": false
+    },
+    "taskExplorer.enableExplorerView": false,
+    "taskExplorer.enableSideBar": true,
+    "taskExplorer.showLastTasks": false,
+    "search.exclude": {
+        "**/.yarn": true,
+        "**/.pnp.*": true
+    },
+    "eslint.nodePath": ".yarn/sdks",
+    "eslint.validate": [
+        "javascript",
+        "javascriptreact",
+        "vue"
+    ],
+    "python.linting.pylintArgs": ["--load-plugins", "pylint_django"],
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": false,
+    "python.linting.enabled": true,
+    "python.terminal.shellIntegration.enabled": false
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 5490af335c..8b36b0e6ac 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -48,7 +48,7 @@
             "args": [
                 "${workspaceFolder}/ietf/manage.py",
                 "test",
-                "--settings=settings_local_sqlitetest"
+                "--settings=settings_test"
             ],
             "group": "test",
             "presentation": {
@@ -68,7 +68,7 @@
             "args": [
                 "${workspaceFolder}/ietf/manage.py",
                 "test",
-                "--settings=settings_local_sqlitetest",
+                "--settings=settings_test",
                 "--pattern=tests_js.py"
             ],
             "group": "test",
@@ -105,10 +105,11 @@
             "command": "/usr/local/bin/python",
             "args": [
                 "-m",
-                "smtpd",
+                "aiosmtpd",
                 "-n",
                 "-c",
-                "DebuggingServer",
+                "ietf.utils.aiosmtpd.DevDebuggingHandler",
+                "-l",
                 "localhost:2025"
             ],
             "presentation": {
diff --git a/.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip b/.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip
new file mode 100644
index 0000000000..9334304c2a
Binary files /dev/null and b/.yarn/cache/@aashutoshrathi-word-wrap-npm-1.2.6-5b1d95e487-ada901b9e7.zip differ
diff --git a/.yarn/cache/@babel-parser-npm-7.23.9-720a0b56cb-e7cd4960ac.zip b/.yarn/cache/@babel-parser-npm-7.23.9-720a0b56cb-e7cd4960ac.zip
new file mode 100644
index 0000000000..7b6c44fc3f
Binary files /dev/null and b/.yarn/cache/@babel-parser-npm-7.23.9-720a0b56cb-e7cd4960ac.zip differ
diff --git a/.yarn/cache/@babel-runtime-npm-7.23.2-d013d6cf7e-6c4df4839e.zip b/.yarn/cache/@babel-runtime-npm-7.23.2-d013d6cf7e-6c4df4839e.zip
new file mode 100644
index 0000000000..f0d4497857
Binary files /dev/null and b/.yarn/cache/@babel-runtime-npm-7.23.2-d013d6cf7e-6c4df4839e.zip differ
diff --git a/.yarn/cache/@colors-colors-npm-1.5.0-875af3a8b4-d64d5260be.zip b/.yarn/cache/@colors-colors-npm-1.5.0-875af3a8b4-d64d5260be.zip
deleted file mode 100644
index c1edd324f6..0000000000
Binary files a/.yarn/cache/@colors-colors-npm-1.5.0-875af3a8b4-d64d5260be.zip and /dev/null differ
diff --git a/.yarn/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip b/.yarn/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip
deleted file mode 100644
index 7df7772871..0000000000
Binary files a/.yarn/cache/@css-render-plugin-bem-npm-0.15.10-41ccecaa2f-cbab72a7b5.zip and /dev/null differ
diff --git a/.yarn/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip b/.yarn/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip
new file mode 100644
index 0000000000..7145fae118
Binary files /dev/null and b/.yarn/cache/@css-render-plugin-bem-npm-0.15.12-bf8b43dc1f-9fa7ddd62b.zip differ
diff --git a/.yarn/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip b/.yarn/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip
new file mode 100644
index 0000000000..0e75f8a4c7
Binary files /dev/null and b/.yarn/cache/@css-render-vue3-ssr-npm-0.15.12-a130f4db3a-a5505ae161.zip differ
diff --git a/.yarn/cache/@cypress-request-npm-2.88.10-44c588c8fc-69c3e3b332.zip b/.yarn/cache/@cypress-request-npm-2.88.10-44c588c8fc-69c3e3b332.zip
deleted file mode 100644
index 981577f3f3..0000000000
Binary files a/.yarn/cache/@cypress-request-npm-2.88.10-44c588c8fc-69c3e3b332.zip and /dev/null differ
diff --git a/.yarn/cache/@cypress-xvfb-npm-1.2.4-396a3691f7-7bdcdaeb1b.zip b/.yarn/cache/@cypress-xvfb-npm-1.2.4-396a3691f7-7bdcdaeb1b.zip
deleted file mode 100644
index f5fc2cdbc1..0000000000
Binary files a/.yarn/cache/@cypress-xvfb-npm-1.2.4-396a3691f7-7bdcdaeb1b.zip and /dev/null differ
diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.18.20-00b3504077-8.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.18.20-00b3504077-8.zip
new file mode 100644
index 0000000000..dfd7b76554
Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-arm64-npm-0.18.20-00b3504077-8.zip differ
diff --git a/.yarn/cache/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b-8.zip b/.yarn/cache/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b-8.zip
new file mode 100644
index 0000000000..432802b69e
Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-x64-npm-0.18.20-767fe27d1b-8.zip differ
diff --git a/.yarn/cache/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe-8.zip b/.yarn/cache/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe-8.zip
new file mode 100644
index 0000000000..6eb51fcc99
Binary files /dev/null and b/.yarn/cache/@esbuild-linux-arm64-npm-0.18.20-7b48b328fe-8.zip differ
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.18.20-de8e99b449-8.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.18.20-de8e99b449-8.zip
new file mode 100644
index 0000000000..bcbc77a84f
Binary files /dev/null and b/.yarn/cache/@esbuild-linux-x64-npm-0.18.20-de8e99b449-8.zip differ
diff --git a/.yarn/cache/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3-8.zip b/.yarn/cache/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3-8.zip
new file mode 100644
index 0000000000..cf9c15613b
Binary files /dev/null and b/.yarn/cache/@esbuild-win32-arm64-npm-0.18.20-a58fe6c6a3-8.zip differ
diff --git a/.yarn/cache/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda-8.zip b/.yarn/cache/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda-8.zip
new file mode 100644
index 0000000000..768cc68f13
Binary files /dev/null and b/.yarn/cache/@esbuild-win32-x64-npm-0.18.20-37a9ab2bda-8.zip differ
diff --git a/.yarn/cache/@eslint-community-eslint-utils-npm-4.4.0-d1791bd5a3-cdfe3ae42b.zip b/.yarn/cache/@eslint-community-eslint-utils-npm-4.4.0-d1791bd5a3-cdfe3ae42b.zip
new file mode 100644
index 0000000000..4e48357020
Binary files /dev/null and b/.yarn/cache/@eslint-community-eslint-utils-npm-4.4.0-d1791bd5a3-cdfe3ae42b.zip differ
diff --git a/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip b/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip
new file mode 100644
index 0000000000..7ef5a48973
Binary files /dev/null and b/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip differ
diff --git a/.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip b/.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip
new file mode 100644
index 0000000000..0cbfbf8d84
Binary files /dev/null and b/.yarn/cache/@eslint-community-regexpp-npm-4.8.0-92ece47e3d-601e6d033d.zip differ
diff --git a/.yarn/cache/@eslint-eslintrc-npm-1.3.2-fd8de37609-2074dca47d.zip b/.yarn/cache/@eslint-eslintrc-npm-1.3.2-fd8de37609-2074dca47d.zip
deleted file mode 100644
index c2a4a6d81c..0000000000
Binary files a/.yarn/cache/@eslint-eslintrc-npm-1.3.2-fd8de37609-2074dca47d.zip and /dev/null differ
diff --git a/.yarn/cache/@eslint-eslintrc-npm-2.1.4-1ff4b5f908-10957c7592.zip b/.yarn/cache/@eslint-eslintrc-npm-2.1.4-1ff4b5f908-10957c7592.zip
new file mode 100644
index 0000000000..58788ff7a6
Binary files /dev/null and b/.yarn/cache/@eslint-eslintrc-npm-2.1.4-1ff4b5f908-10957c7592.zip differ
diff --git a/.yarn/cache/@eslint-js-npm-8.57.0-00ead3710a-315dc65b0e.zip b/.yarn/cache/@eslint-js-npm-8.57.0-00ead3710a-315dc65b0e.zip
new file mode 100644
index 0000000000..82eab16e7c
Binary files /dev/null and b/.yarn/cache/@eslint-js-npm-8.57.0-00ead3710a-315dc65b0e.zip differ
diff --git a/.yarn/cache/@faker-js-faker-npm-7.5.0-1dcb36d85a-6f2c48a801.zip b/.yarn/cache/@faker-js-faker-npm-7.5.0-1dcb36d85a-6f2c48a801.zip
deleted file mode 100644
index 87061eb400..0000000000
Binary files a/.yarn/cache/@faker-js-faker-npm-7.5.0-1dcb36d85a-6f2c48a801.zip and /dev/null differ
diff --git a/.yarn/cache/@floating-ui-core-npm-1.4.1-fe89c45d92-be4ab864fe.zip b/.yarn/cache/@floating-ui-core-npm-1.4.1-fe89c45d92-be4ab864fe.zip
new file mode 100644
index 0000000000..e8ce36ae61
Binary files /dev/null and b/.yarn/cache/@floating-ui-core-npm-1.4.1-fe89c45d92-be4ab864fe.zip differ
diff --git a/.yarn/cache/@floating-ui-dom-npm-1.5.2-f1b8ca0c30-3c71eed50b.zip b/.yarn/cache/@floating-ui-dom-npm-1.5.2-f1b8ca0c30-3c71eed50b.zip
new file mode 100644
index 0000000000..a984181e2c
Binary files /dev/null and b/.yarn/cache/@floating-ui-dom-npm-1.5.2-f1b8ca0c30-3c71eed50b.zip differ
diff --git a/.yarn/cache/@floating-ui-utils-npm-0.1.2-22eefe56f0-3e29fd3c69.zip b/.yarn/cache/@floating-ui-utils-npm-0.1.2-22eefe56f0-3e29fd3c69.zip
new file mode 100644
index 0000000000..ada2c49e44
Binary files /dev/null and b/.yarn/cache/@floating-ui-utils-npm-0.1.2-22eefe56f0-3e29fd3c69.zip differ
diff --git a/.yarn/cache/@fullcalendar-bootstrap5-npm-5.11.3-3e86f39d7d-a63a500d72.zip b/.yarn/cache/@fullcalendar-bootstrap5-npm-5.11.3-3e86f39d7d-a63a500d72.zip
deleted file mode 100644
index 8571502c87..0000000000
Binary files a/.yarn/cache/@fullcalendar-bootstrap5-npm-5.11.3-3e86f39d7d-a63a500d72.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip b/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip
new file mode 100644
index 0000000000..edc7da3b25
Binary files /dev/null and b/.yarn/cache/@fullcalendar-bootstrap5-npm-6.1.11-6e0fbf281a-a0c3b94346.zip differ
diff --git a/.yarn/cache/@fullcalendar-common-npm-5.11.3-6268994b76-be4b365dca.zip b/.yarn/cache/@fullcalendar-common-npm-5.11.3-6268994b76-be4b365dca.zip
deleted file mode 100644
index 2e6ed4393f..0000000000
Binary files a/.yarn/cache/@fullcalendar-common-npm-5.11.3-6268994b76-be4b365dca.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-core-npm-5.11.3-ed98a1ea9f-2774d0fa18.zip b/.yarn/cache/@fullcalendar-core-npm-5.11.3-ed98a1ea9f-2774d0fa18.zip
deleted file mode 100644
index c6ee2043b4..0000000000
Binary files a/.yarn/cache/@fullcalendar-core-npm-5.11.3-ed98a1ea9f-2774d0fa18.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-core-npm-6.1.11-ae049c8ace-0078a6f96b.zip b/.yarn/cache/@fullcalendar-core-npm-6.1.11-ae049c8ace-0078a6f96b.zip
new file mode 100644
index 0000000000..c9eee67d63
Binary files /dev/null and b/.yarn/cache/@fullcalendar-core-npm-6.1.11-ae049c8ace-0078a6f96b.zip differ
diff --git a/.yarn/cache/@fullcalendar-daygrid-npm-5.11.3-b387dff934-426b53c5bb.zip b/.yarn/cache/@fullcalendar-daygrid-npm-5.11.3-b387dff934-426b53c5bb.zip
deleted file mode 100644
index f8b5af4de7..0000000000
Binary files a/.yarn/cache/@fullcalendar-daygrid-npm-5.11.3-b387dff934-426b53c5bb.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip b/.yarn/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip
new file mode 100644
index 0000000000..3a7449a3a8
Binary files /dev/null and b/.yarn/cache/@fullcalendar-daygrid-npm-6.1.11-2187ca1b8f-6eb5606de5.zip differ
diff --git a/.yarn/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip b/.yarn/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip
new file mode 100644
index 0000000000..861ed1b366
Binary files /dev/null and b/.yarn/cache/@fullcalendar-icalendar-npm-6.1.11-73807e790d-4e6eff15a8.zip differ
diff --git a/.yarn/cache/@fullcalendar-interaction-npm-5.11.3-15335cb10a-e8a1b49f2f.zip b/.yarn/cache/@fullcalendar-interaction-npm-5.11.3-15335cb10a-e8a1b49f2f.zip
deleted file mode 100644
index be7b594e35..0000000000
Binary files a/.yarn/cache/@fullcalendar-interaction-npm-5.11.3-15335cb10a-e8a1b49f2f.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip b/.yarn/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip
new file mode 100644
index 0000000000..b04343467b
Binary files /dev/null and b/.yarn/cache/@fullcalendar-interaction-npm-6.1.11-39630596c7-c67d4cfa0b.zip differ
diff --git a/.yarn/cache/@fullcalendar-list-npm-5.11.3-6174d0e1da-976da49b12.zip b/.yarn/cache/@fullcalendar-list-npm-5.11.3-6174d0e1da-976da49b12.zip
deleted file mode 100644
index 089e8d7c95..0000000000
Binary files a/.yarn/cache/@fullcalendar-list-npm-5.11.3-6174d0e1da-976da49b12.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip b/.yarn/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip
new file mode 100644
index 0000000000..93cd34af81
Binary files /dev/null and b/.yarn/cache/@fullcalendar-list-npm-6.1.11-8f1846f302-84a8cd6e63.zip differ
diff --git a/.yarn/cache/@fullcalendar-luxon2-npm-5.11.3-ccde7500a8-7533018590.zip b/.yarn/cache/@fullcalendar-luxon2-npm-5.11.3-ccde7500a8-7533018590.zip
deleted file mode 100644
index bb23c44bf3..0000000000
Binary files a/.yarn/cache/@fullcalendar-luxon2-npm-5.11.3-ccde7500a8-7533018590.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip b/.yarn/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip
new file mode 100644
index 0000000000..6e717b3495
Binary files /dev/null and b/.yarn/cache/@fullcalendar-luxon3-npm-6.1.11-3e90656a71-8e7f45aab2.zip differ
diff --git a/.yarn/cache/@fullcalendar-timegrid-npm-5.11.3-4075b09051-ce675eca7d.zip b/.yarn/cache/@fullcalendar-timegrid-npm-5.11.3-4075b09051-ce675eca7d.zip
deleted file mode 100644
index ebe13b989a..0000000000
Binary files a/.yarn/cache/@fullcalendar-timegrid-npm-5.11.3-4075b09051-ce675eca7d.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip b/.yarn/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip
new file mode 100644
index 0000000000..917beeda69
Binary files /dev/null and b/.yarn/cache/@fullcalendar-timegrid-npm-6.1.11-1d43455bfd-4a11e6dd90.zip differ
diff --git a/.yarn/cache/@fullcalendar-vue3-npm-5.11.2-77392161df-779f4d8d85.zip b/.yarn/cache/@fullcalendar-vue3-npm-5.11.2-77392161df-779f4d8d85.zip
deleted file mode 100644
index 57422a12a2..0000000000
Binary files a/.yarn/cache/@fullcalendar-vue3-npm-5.11.2-77392161df-779f4d8d85.zip and /dev/null differ
diff --git a/.yarn/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip b/.yarn/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip
new file mode 100644
index 0000000000..3054aa761f
Binary files /dev/null and b/.yarn/cache/@fullcalendar-vue3-npm-6.1.11-f6b8b48da4-5891a596e9.zip differ
diff --git a/.yarn/cache/@html-validate-stylish-npm-3.0.0-6d9dccafda-818efd25ac.zip b/.yarn/cache/@html-validate-stylish-npm-3.0.0-6d9dccafda-818efd25ac.zip
deleted file mode 100644
index 5ed78286fb..0000000000
Binary files a/.yarn/cache/@html-validate-stylish-npm-3.0.0-6d9dccafda-818efd25ac.zip and /dev/null differ
diff --git a/.yarn/cache/@html-validate-stylish-npm-4.1.0-aba0cf2d6c-4af90db4f9.zip b/.yarn/cache/@html-validate-stylish-npm-4.1.0-aba0cf2d6c-4af90db4f9.zip
new file mode 100644
index 0000000000..d56d9f34cf
Binary files /dev/null and b/.yarn/cache/@html-validate-stylish-npm-4.1.0-aba0cf2d6c-4af90db4f9.zip differ
diff --git a/.yarn/cache/@humanwhocodes-config-array-npm-0.10.7-81c0f4b5e6-009d64be8d.zip b/.yarn/cache/@humanwhocodes-config-array-npm-0.10.7-81c0f4b5e6-009d64be8d.zip
deleted file mode 100644
index 9bcc70f2c1..0000000000
Binary files a/.yarn/cache/@humanwhocodes-config-array-npm-0.10.7-81c0f4b5e6-009d64be8d.zip and /dev/null differ
diff --git a/.yarn/cache/@humanwhocodes-config-array-npm-0.11.14-94a02fcc87-861ccce9ea.zip b/.yarn/cache/@humanwhocodes-config-array-npm-0.11.14-94a02fcc87-861ccce9ea.zip
new file mode 100644
index 0000000000..166fee4b82
Binary files /dev/null and b/.yarn/cache/@humanwhocodes-config-array-npm-0.11.14-94a02fcc87-861ccce9ea.zip differ
diff --git a/.yarn/cache/@humanwhocodes-gitignore-to-minimatch-npm-1.0.2-247ae8a408-aba5c40c9e.zip b/.yarn/cache/@humanwhocodes-gitignore-to-minimatch-npm-1.0.2-247ae8a408-aba5c40c9e.zip
deleted file mode 100644
index 2636f8c631..0000000000
Binary files a/.yarn/cache/@humanwhocodes-gitignore-to-minimatch-npm-1.0.2-247ae8a408-aba5c40c9e.zip and /dev/null differ
diff --git a/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip b/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip
deleted file mode 100644
index 2b79104af5..0000000000
Binary files a/.yarn/cache/@humanwhocodes-object-schema-npm-1.2.1-eb622b5d0e-a824a1ec31.zip and /dev/null differ
diff --git a/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.2-77b42018f9-2fc1150336.zip b/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.2-77b42018f9-2fc1150336.zip
new file mode 100644
index 0000000000..cf6847cf44
Binary files /dev/null and b/.yarn/cache/@humanwhocodes-object-schema-npm-2.0.2-77b42018f9-2fc1150336.zip differ
diff --git a/.yarn/cache/@isaacs-cliui-npm-8.0.2-f4364666d5-4a473b9b32.zip b/.yarn/cache/@isaacs-cliui-npm-8.0.2-f4364666d5-4a473b9b32.zip
new file mode 100644
index 0000000000..d19176fadd
Binary files /dev/null and b/.yarn/cache/@isaacs-cliui-npm-8.0.2-f4364666d5-4a473b9b32.zip differ
diff --git a/.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip b/.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip
new file mode 100644
index 0000000000..402f52b7ae
Binary files /dev/null and b/.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.15-a055fb62cf-b881c7e503.zip differ
diff --git a/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.8.5-a9ab00615c-8.zip b/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.8.5-a9ab00615c-8.zip
new file mode 100644
index 0000000000..6df931b4af
Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.8.5-a9ab00615c-8.zip differ
diff --git a/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.8.5-080b8c9329-8.zip b/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.8.5-080b8c9329-8.zip
new file mode 100644
index 0000000000..db77cafaea
Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.8.5-080b8c9329-8.zip differ
diff --git a/.yarn/cache/@lmdb-lmdb-linux-arm64-npm-2.8.5-9dfda9f24f-8.zip b/.yarn/cache/@lmdb-lmdb-linux-arm64-npm-2.8.5-9dfda9f24f-8.zip
new file mode 100644
index 0000000000..d4522df85e
Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-linux-arm64-npm-2.8.5-9dfda9f24f-8.zip differ
diff --git a/.yarn/cache/@lmdb-lmdb-linux-x64-npm-2.8.5-0f668ba9a7-8.zip b/.yarn/cache/@lmdb-lmdb-linux-x64-npm-2.8.5-0f668ba9a7-8.zip
new file mode 100644
index 0000000000..8820ec421f
Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-linux-x64-npm-2.8.5-0f668ba9a7-8.zip differ
diff --git a/.yarn/cache/@lmdb-lmdb-win32-x64-npm-2.8.5-3702de4edb-8.zip b/.yarn/cache/@lmdb-lmdb-win32-x64-npm-2.8.5-3702de4edb-8.zip
new file mode 100644
index 0000000000..201d7cb1f1
Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-win32-x64-npm-2.8.5-3702de4edb-8.zip differ
diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip
new file mode 100644
index 0000000000..06cbbf0cff
Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip differ
diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip
new file mode 100644
index 0000000000..110c956115
Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip differ
diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-arm64-npm-3.0.2-cfbf50d4c6-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-arm64-npm-3.0.2-cfbf50d4c6-8.zip
new file mode 100644
index 0000000000..ab2c36a442
Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-arm64-npm-3.0.2-cfbf50d4c6-8.zip differ
diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-x64-npm-3.0.2-262fca760d-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-x64-npm-3.0.2-262fca760d-8.zip
new file mode 100644
index 0000000000..2fa6ef4f77
Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-linux-x64-npm-3.0.2-262fca760d-8.zip differ
diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-win32-x64-npm-3.0.2-c627beab89-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-win32-x64-npm-3.0.2-c627beab89-8.zip
new file mode 100644
index 0000000000..b63546421d
Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-win32-x64-npm-3.0.2-c627beab89-8.zip differ
diff --git a/.yarn/cache/@parcel-bundler-default-npm-2.12.0-9ba57d919c-f211a76f55.zip b/.yarn/cache/@parcel-bundler-default-npm-2.12.0-9ba57d919c-f211a76f55.zip
new file mode 100644
index 0000000000..024e036391
Binary files /dev/null and b/.yarn/cache/@parcel-bundler-default-npm-2.12.0-9ba57d919c-f211a76f55.zip differ
diff --git a/.yarn/cache/@parcel-bundler-default-npm-2.7.0-dfa79458ce-0efb78be2e.zip b/.yarn/cache/@parcel-bundler-default-npm-2.7.0-dfa79458ce-0efb78be2e.zip
deleted file mode 100644
index 41bb95974c..0000000000
Binary files a/.yarn/cache/@parcel-bundler-default-npm-2.7.0-dfa79458ce-0efb78be2e.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip b/.yarn/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip
new file mode 100644
index 0000000000..a358668eb7
Binary files /dev/null and b/.yarn/cache/@parcel-cache-npm-2.12.0-3389909f2c-a45e799809.zip differ
diff --git a/.yarn/cache/@parcel-cache-npm-2.7.0-186e1a509a-7aa6a6883b.zip b/.yarn/cache/@parcel-cache-npm-2.7.0-186e1a509a-7aa6a6883b.zip
deleted file mode 100644
index 0e612734f3..0000000000
Binary files a/.yarn/cache/@parcel-cache-npm-2.7.0-186e1a509a-7aa6a6883b.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-codeframe-npm-2.12.0-aa8027940e-265c4d7ebe.zip b/.yarn/cache/@parcel-codeframe-npm-2.12.0-aa8027940e-265c4d7ebe.zip
new file mode 100644
index 0000000000..f4239d8ba7
Binary files /dev/null and b/.yarn/cache/@parcel-codeframe-npm-2.12.0-aa8027940e-265c4d7ebe.zip differ
diff --git a/.yarn/cache/@parcel-codeframe-npm-2.7.0-e522fa3c25-169f305518.zip b/.yarn/cache/@parcel-codeframe-npm-2.7.0-e522fa3c25-169f305518.zip
deleted file mode 100644
index ef60f13f2d..0000000000
Binary files a/.yarn/cache/@parcel-codeframe-npm-2.7.0-e522fa3c25-169f305518.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-compressor-raw-npm-2.12.0-19f313c172-16c56704f3.zip b/.yarn/cache/@parcel-compressor-raw-npm-2.12.0-19f313c172-16c56704f3.zip
new file mode 100644
index 0000000000..da57625381
Binary files /dev/null and b/.yarn/cache/@parcel-compressor-raw-npm-2.12.0-19f313c172-16c56704f3.zip differ
diff --git a/.yarn/cache/@parcel-compressor-raw-npm-2.7.0-bd243714a1-6b9c009fe4.zip b/.yarn/cache/@parcel-compressor-raw-npm-2.7.0-bd243714a1-6b9c009fe4.zip
deleted file mode 100644
index f125115097..0000000000
Binary files a/.yarn/cache/@parcel-compressor-raw-npm-2.7.0-bd243714a1-6b9c009fe4.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip b/.yarn/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip
new file mode 100644
index 0000000000..a4934d017e
Binary files /dev/null and b/.yarn/cache/@parcel-config-default-npm-2.12.0-aefd3c699e-72877c5dc4.zip differ
diff --git a/.yarn/cache/@parcel-config-default-npm-2.7.0-e780ef54db-165d4ec089.zip b/.yarn/cache/@parcel-config-default-npm-2.7.0-e780ef54db-165d4ec089.zip
deleted file mode 100644
index dd870bf67f..0000000000
Binary files a/.yarn/cache/@parcel-config-default-npm-2.7.0-e780ef54db-165d4ec089.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-core-npm-2.12.0-8f08b883d4-5bf6746308.zip b/.yarn/cache/@parcel-core-npm-2.12.0-8f08b883d4-5bf6746308.zip
new file mode 100644
index 0000000000..42c39ebe36
Binary files /dev/null and b/.yarn/cache/@parcel-core-npm-2.12.0-8f08b883d4-5bf6746308.zip differ
diff --git a/.yarn/cache/@parcel-core-npm-2.7.0-929a47eb0e-615903871f.zip b/.yarn/cache/@parcel-core-npm-2.7.0-929a47eb0e-615903871f.zip
deleted file mode 100644
index f6af1a8e51..0000000000
Binary files a/.yarn/cache/@parcel-core-npm-2.7.0-929a47eb0e-615903871f.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-css-darwin-arm64-npm-1.13.1-dc4db97e9d-8.zip b/.yarn/cache/@parcel-css-darwin-arm64-npm-1.13.1-dc4db97e9d-8.zip
deleted file mode 100644
index 001529f79d..0000000000
Binary files a/.yarn/cache/@parcel-css-darwin-arm64-npm-1.13.1-dc4db97e9d-8.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-css-darwin-x64-npm-1.13.1-734e2fbb2a-8.zip b/.yarn/cache/@parcel-css-darwin-x64-npm-1.13.1-734e2fbb2a-8.zip
deleted file mode 100644
index f2aaeba920..0000000000
Binary files a/.yarn/cache/@parcel-css-darwin-x64-npm-1.13.1-734e2fbb2a-8.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-css-linux-arm64-gnu-npm-1.13.1-d097b3d36a-8.zip b/.yarn/cache/@parcel-css-linux-arm64-gnu-npm-1.13.1-d097b3d36a-8.zip
deleted file mode 100644
index 3116819216..0000000000
Binary files a/.yarn/cache/@parcel-css-linux-arm64-gnu-npm-1.13.1-d097b3d36a-8.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-css-linux-x64-gnu-npm-1.13.1-05bca71ce8-8.zip b/.yarn/cache/@parcel-css-linux-x64-gnu-npm-1.13.1-05bca71ce8-8.zip
deleted file mode 100644
index 87230a807c..0000000000
Binary files a/.yarn/cache/@parcel-css-linux-x64-gnu-npm-1.13.1-05bca71ce8-8.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-css-npm-1.13.1-1321cb5236-c2f4183b71.zip b/.yarn/cache/@parcel-css-npm-1.13.1-1321cb5236-c2f4183b71.zip
deleted file mode 100644
index e7930ee9bd..0000000000
Binary files a/.yarn/cache/@parcel-css-npm-1.13.1-1321cb5236-c2f4183b71.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-css-win32-x64-msvc-npm-1.13.1-6b3efa989f-8.zip b/.yarn/cache/@parcel-css-win32-x64-msvc-npm-1.13.1-6b3efa989f-8.zip
deleted file mode 100644
index 29e73e793f..0000000000
Binary files a/.yarn/cache/@parcel-css-win32-x64-msvc-npm-1.13.1-6b3efa989f-8.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-diagnostic-npm-2.12.0-6e89ddad28-a4b918c1a0.zip b/.yarn/cache/@parcel-diagnostic-npm-2.12.0-6e89ddad28-a4b918c1a0.zip
new file mode 100644
index 0000000000..a8e890bf5c
Binary files /dev/null and b/.yarn/cache/@parcel-diagnostic-npm-2.12.0-6e89ddad28-a4b918c1a0.zip differ
diff --git a/.yarn/cache/@parcel-diagnostic-npm-2.7.0-ddb7ee3ca8-a41cc65cb1.zip b/.yarn/cache/@parcel-diagnostic-npm-2.7.0-ddb7ee3ca8-a41cc65cb1.zip
deleted file mode 100644
index c4bed95a4f..0000000000
Binary files a/.yarn/cache/@parcel-diagnostic-npm-2.7.0-ddb7ee3ca8-a41cc65cb1.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-events-npm-2.12.0-e6eff18c8c-136a8a2921.zip b/.yarn/cache/@parcel-events-npm-2.12.0-e6eff18c8c-136a8a2921.zip
new file mode 100644
index 0000000000..b806eb99ac
Binary files /dev/null and b/.yarn/cache/@parcel-events-npm-2.12.0-e6eff18c8c-136a8a2921.zip differ
diff --git a/.yarn/cache/@parcel-events-npm-2.7.0-d85646e00d-9477cc8eef.zip b/.yarn/cache/@parcel-events-npm-2.7.0-d85646e00d-9477cc8eef.zip
deleted file mode 100644
index c147878df4..0000000000
Binary files a/.yarn/cache/@parcel-events-npm-2.7.0-d85646e00d-9477cc8eef.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip b/.yarn/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip
new file mode 100644
index 0000000000..52cbc5f7f1
Binary files /dev/null and b/.yarn/cache/@parcel-fs-npm-2.12.0-3c46842e62-43d454d55d.zip differ
diff --git a/.yarn/cache/@parcel-fs-npm-2.7.0-11bf4f60b3-176c21f4a9.zip b/.yarn/cache/@parcel-fs-npm-2.7.0-11bf4f60b3-176c21f4a9.zip
deleted file mode 100644
index 411eb12b80..0000000000
Binary files a/.yarn/cache/@parcel-fs-npm-2.7.0-11bf4f60b3-176c21f4a9.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-fs-search-npm-2.7.0-1e65507e08-ed49a19d86.zip b/.yarn/cache/@parcel-fs-search-npm-2.7.0-1e65507e08-ed49a19d86.zip
deleted file mode 100644
index 2ec2620597..0000000000
Binary files a/.yarn/cache/@parcel-fs-search-npm-2.7.0-1e65507e08-ed49a19d86.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-graph-npm-2.7.0-4fa217e6e2-55db3972df.zip b/.yarn/cache/@parcel-graph-npm-2.7.0-4fa217e6e2-55db3972df.zip
deleted file mode 100644
index 16f55af8a1..0000000000
Binary files a/.yarn/cache/@parcel-graph-npm-2.7.0-4fa217e6e2-55db3972df.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-graph-npm-3.2.0-92821d4289-b4d31624fc.zip b/.yarn/cache/@parcel-graph-npm-3.2.0-92821d4289-b4d31624fc.zip
new file mode 100644
index 0000000000..27f3718928
Binary files /dev/null and b/.yarn/cache/@parcel-graph-npm-3.2.0-92821d4289-b4d31624fc.zip differ
diff --git a/.yarn/cache/@parcel-hash-npm-2.7.0-d360c9a7bc-42cad499e6.zip b/.yarn/cache/@parcel-hash-npm-2.7.0-d360c9a7bc-42cad499e6.zip
deleted file mode 100644
index 4c873a5dc8..0000000000
Binary files a/.yarn/cache/@parcel-hash-npm-2.7.0-d360c9a7bc-42cad499e6.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-logger-npm-2.12.0-7d2f85a906-be3fe9d9ea.zip b/.yarn/cache/@parcel-logger-npm-2.12.0-7d2f85a906-be3fe9d9ea.zip
new file mode 100644
index 0000000000..7231e4c65d
Binary files /dev/null and b/.yarn/cache/@parcel-logger-npm-2.12.0-7d2f85a906-be3fe9d9ea.zip differ
diff --git a/.yarn/cache/@parcel-logger-npm-2.7.0-0515c8453c-85e959a8ed.zip b/.yarn/cache/@parcel-logger-npm-2.7.0-0515c8453c-85e959a8ed.zip
deleted file mode 100644
index 6b3aa1a87e..0000000000
Binary files a/.yarn/cache/@parcel-logger-npm-2.7.0-0515c8453c-85e959a8ed.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-markdown-ansi-npm-2.12.0-6b0fe453df-850ee665d9.zip b/.yarn/cache/@parcel-markdown-ansi-npm-2.12.0-6b0fe453df-850ee665d9.zip
new file mode 100644
index 0000000000..22582b46fa
Binary files /dev/null and b/.yarn/cache/@parcel-markdown-ansi-npm-2.12.0-6b0fe453df-850ee665d9.zip differ
diff --git a/.yarn/cache/@parcel-markdown-ansi-npm-2.7.0-b98fb6a466-a9f19091c5.zip b/.yarn/cache/@parcel-markdown-ansi-npm-2.7.0-b98fb6a466-a9f19091c5.zip
deleted file mode 100644
index 05d35175fa..0000000000
Binary files a/.yarn/cache/@parcel-markdown-ansi-npm-2.7.0-b98fb6a466-a9f19091c5.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-namer-default-npm-2.12.0-28980cfd47-dc92ec0945.zip b/.yarn/cache/@parcel-namer-default-npm-2.12.0-28980cfd47-dc92ec0945.zip
new file mode 100644
index 0000000000..7db7fb405c
Binary files /dev/null and b/.yarn/cache/@parcel-namer-default-npm-2.12.0-28980cfd47-dc92ec0945.zip differ
diff --git a/.yarn/cache/@parcel-namer-default-npm-2.7.0-2c2525eb55-0012b78fc9.zip b/.yarn/cache/@parcel-namer-default-npm-2.7.0-2c2525eb55-0012b78fc9.zip
deleted file mode 100644
index 79bc8483f1..0000000000
Binary files a/.yarn/cache/@parcel-namer-default-npm-2.7.0-2c2525eb55-0012b78fc9.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-node-resolver-core-npm-2.7.0-f00f25661b-bc0a94ce3c.zip b/.yarn/cache/@parcel-node-resolver-core-npm-2.7.0-f00f25661b-bc0a94ce3c.zip
deleted file mode 100644
index ed9b6d4bcf..0000000000
Binary files a/.yarn/cache/@parcel-node-resolver-core-npm-2.7.0-f00f25661b-bc0a94ce3c.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-node-resolver-core-npm-3.3.0-53804df663-acc3721678.zip b/.yarn/cache/@parcel-node-resolver-core-npm-3.3.0-53804df663-acc3721678.zip
new file mode 100644
index 0000000000..76a69962a6
Binary files /dev/null and b/.yarn/cache/@parcel-node-resolver-core-npm-3.3.0-53804df663-acc3721678.zip differ
diff --git a/.yarn/cache/@parcel-optimizer-css-npm-2.12.0-f95bd4d060-abcdf58c29.zip b/.yarn/cache/@parcel-optimizer-css-npm-2.12.0-f95bd4d060-abcdf58c29.zip
new file mode 100644
index 0000000000..f1c61749b9
Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-css-npm-2.12.0-f95bd4d060-abcdf58c29.zip differ
diff --git a/.yarn/cache/@parcel-optimizer-css-npm-2.7.0-9744cf2546-3799e128cb.zip b/.yarn/cache/@parcel-optimizer-css-npm-2.7.0-9744cf2546-3799e128cb.zip
deleted file mode 100644
index 3f4409a81e..0000000000
Binary files a/.yarn/cache/@parcel-optimizer-css-npm-2.7.0-9744cf2546-3799e128cb.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-optimizer-data-url-npm-2.12.0-dad3731170-0397293961.zip b/.yarn/cache/@parcel-optimizer-data-url-npm-2.12.0-dad3731170-0397293961.zip
new file mode 100644
index 0000000000..28497d3327
Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-data-url-npm-2.12.0-dad3731170-0397293961.zip differ
diff --git a/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.12.0-cdd2835c12-64e571f56f.zip b/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.12.0-cdd2835c12-64e571f56f.zip
new file mode 100644
index 0000000000..4089a870fb
Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.12.0-cdd2835c12-64e571f56f.zip differ
diff --git a/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.7.0-6f46846f28-a5fa890bc3.zip b/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.7.0-6f46846f28-a5fa890bc3.zip
deleted file mode 100644
index 8cf596b16c..0000000000
Binary files a/.yarn/cache/@parcel-optimizer-htmlnano-npm-2.7.0-6f46846f28-a5fa890bc3.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip b/.yarn/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip
new file mode 100644
index 0000000000..8b0a44e756
Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-image-npm-2.12.0-4cbc56f72d-7d28379bf1.zip differ
diff --git a/.yarn/cache/@parcel-optimizer-image-npm-2.7.0-711eb014aa-ca12701e1c.zip b/.yarn/cache/@parcel-optimizer-image-npm-2.7.0-711eb014aa-ca12701e1c.zip
deleted file mode 100644
index d08150cb02..0000000000
Binary files a/.yarn/cache/@parcel-optimizer-image-npm-2.7.0-711eb014aa-ca12701e1c.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-optimizer-svgo-npm-2.12.0-08c0f1b17f-d3a4d2de9f.zip b/.yarn/cache/@parcel-optimizer-svgo-npm-2.12.0-08c0f1b17f-d3a4d2de9f.zip
new file mode 100644
index 0000000000..441bead99b
Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-svgo-npm-2.12.0-08c0f1b17f-d3a4d2de9f.zip differ
diff --git a/.yarn/cache/@parcel-optimizer-svgo-npm-2.7.0-02b64b51d9-305024d23c.zip b/.yarn/cache/@parcel-optimizer-svgo-npm-2.7.0-02b64b51d9-305024d23c.zip
deleted file mode 100644
index 38105428e2..0000000000
Binary files a/.yarn/cache/@parcel-optimizer-svgo-npm-2.7.0-02b64b51d9-305024d23c.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-optimizer-swc-npm-2.12.0-fb535e4283-0b7fdf3df1.zip b/.yarn/cache/@parcel-optimizer-swc-npm-2.12.0-fb535e4283-0b7fdf3df1.zip
new file mode 100644
index 0000000000..8b137cf673
Binary files /dev/null and b/.yarn/cache/@parcel-optimizer-swc-npm-2.12.0-fb535e4283-0b7fdf3df1.zip differ
diff --git a/.yarn/cache/@parcel-optimizer-terser-npm-2.7.0-17770c458c-20eddbcaa9.zip b/.yarn/cache/@parcel-optimizer-terser-npm-2.7.0-17770c458c-20eddbcaa9.zip
deleted file mode 100644
index 63e9086db8..0000000000
Binary files a/.yarn/cache/@parcel-optimizer-terser-npm-2.7.0-17770c458c-20eddbcaa9.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip b/.yarn/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip
new file mode 100644
index 0000000000..1e757bdf2f
Binary files /dev/null and b/.yarn/cache/@parcel-package-manager-npm-2.12.0-fc90aacf70-a517e9efe1.zip differ
diff --git a/.yarn/cache/@parcel-package-manager-npm-2.7.0-ec67893806-f4817d1aae.zip b/.yarn/cache/@parcel-package-manager-npm-2.7.0-ec67893806-f4817d1aae.zip
deleted file mode 100644
index a0f784b185..0000000000
Binary files a/.yarn/cache/@parcel-package-manager-npm-2.7.0-ec67893806-f4817d1aae.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-packager-css-npm-2.12.0-b1c27a8323-684aaa1d85.zip b/.yarn/cache/@parcel-packager-css-npm-2.12.0-b1c27a8323-684aaa1d85.zip
new file mode 100644
index 0000000000..4cf7815f57
Binary files /dev/null and b/.yarn/cache/@parcel-packager-css-npm-2.12.0-b1c27a8323-684aaa1d85.zip differ
diff --git a/.yarn/cache/@parcel-packager-css-npm-2.7.0-1f68e1330e-0a7fbedb88.zip b/.yarn/cache/@parcel-packager-css-npm-2.7.0-1f68e1330e-0a7fbedb88.zip
deleted file mode 100644
index 1e30ccb5de..0000000000
Binary files a/.yarn/cache/@parcel-packager-css-npm-2.7.0-1f68e1330e-0a7fbedb88.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-packager-html-npm-2.12.0-ad361b1265-ee558ad616.zip b/.yarn/cache/@parcel-packager-html-npm-2.12.0-ad361b1265-ee558ad616.zip
new file mode 100644
index 0000000000..989402a62c
Binary files /dev/null and b/.yarn/cache/@parcel-packager-html-npm-2.12.0-ad361b1265-ee558ad616.zip differ
diff --git a/.yarn/cache/@parcel-packager-html-npm-2.7.0-a137850a6d-9ca4f91112.zip b/.yarn/cache/@parcel-packager-html-npm-2.7.0-a137850a6d-9ca4f91112.zip
deleted file mode 100644
index 85e2f3f97d..0000000000
Binary files a/.yarn/cache/@parcel-packager-html-npm-2.7.0-a137850a6d-9ca4f91112.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-packager-js-npm-2.12.0-093e3200cd-2189b7ff15.zip b/.yarn/cache/@parcel-packager-js-npm-2.12.0-093e3200cd-2189b7ff15.zip
new file mode 100644
index 0000000000..461ec50d28
Binary files /dev/null and b/.yarn/cache/@parcel-packager-js-npm-2.12.0-093e3200cd-2189b7ff15.zip differ
diff --git a/.yarn/cache/@parcel-packager-js-npm-2.7.0-1132724f15-8a65b8f82c.zip b/.yarn/cache/@parcel-packager-js-npm-2.7.0-1132724f15-8a65b8f82c.zip
deleted file mode 100644
index 81cb80dea2..0000000000
Binary files a/.yarn/cache/@parcel-packager-js-npm-2.7.0-1132724f15-8a65b8f82c.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-packager-raw-npm-2.12.0-b7f15635f8-39ce2fc7ae.zip b/.yarn/cache/@parcel-packager-raw-npm-2.12.0-b7f15635f8-39ce2fc7ae.zip
new file mode 100644
index 0000000000..e27b5ed1e3
Binary files /dev/null and b/.yarn/cache/@parcel-packager-raw-npm-2.12.0-b7f15635f8-39ce2fc7ae.zip differ
diff --git a/.yarn/cache/@parcel-packager-raw-npm-2.7.0-8a5c5b3c92-d895ed703e.zip b/.yarn/cache/@parcel-packager-raw-npm-2.7.0-8a5c5b3c92-d895ed703e.zip
deleted file mode 100644
index e83552561a..0000000000
Binary files a/.yarn/cache/@parcel-packager-raw-npm-2.7.0-8a5c5b3c92-d895ed703e.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-packager-svg-npm-2.12.0-fa921ce522-436ac9ea39.zip b/.yarn/cache/@parcel-packager-svg-npm-2.12.0-fa921ce522-436ac9ea39.zip
new file mode 100644
index 0000000000..f3d37303b0
Binary files /dev/null and b/.yarn/cache/@parcel-packager-svg-npm-2.12.0-fa921ce522-436ac9ea39.zip differ
diff --git a/.yarn/cache/@parcel-packager-svg-npm-2.7.0-9d46f657cd-9b2c4e4cee.zip b/.yarn/cache/@parcel-packager-svg-npm-2.7.0-9d46f657cd-9b2c4e4cee.zip
deleted file mode 100644
index 3f3f03812c..0000000000
Binary files a/.yarn/cache/@parcel-packager-svg-npm-2.7.0-9d46f657cd-9b2c4e4cee.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-packager-wasm-npm-2.12.0-ec551a9e29-a10e1cd988.zip b/.yarn/cache/@parcel-packager-wasm-npm-2.12.0-ec551a9e29-a10e1cd988.zip
new file mode 100644
index 0000000000..5b569f2004
Binary files /dev/null and b/.yarn/cache/@parcel-packager-wasm-npm-2.12.0-ec551a9e29-a10e1cd988.zip differ
diff --git a/.yarn/cache/@parcel-plugin-npm-2.12.0-947dec85d3-0b52f1dd06.zip b/.yarn/cache/@parcel-plugin-npm-2.12.0-947dec85d3-0b52f1dd06.zip
new file mode 100644
index 0000000000..667d7230e6
Binary files /dev/null and b/.yarn/cache/@parcel-plugin-npm-2.12.0-947dec85d3-0b52f1dd06.zip differ
diff --git a/.yarn/cache/@parcel-plugin-npm-2.7.0-90dfe30ed4-930befafa0.zip b/.yarn/cache/@parcel-plugin-npm-2.7.0-90dfe30ed4-930befafa0.zip
deleted file mode 100644
index 2845128dcd..0000000000
Binary files a/.yarn/cache/@parcel-plugin-npm-2.7.0-90dfe30ed4-930befafa0.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-profiler-npm-2.12.0-69720a23ab-b683b74e10.zip b/.yarn/cache/@parcel-profiler-npm-2.12.0-69720a23ab-b683b74e10.zip
new file mode 100644
index 0000000000..1cacc84571
Binary files /dev/null and b/.yarn/cache/@parcel-profiler-npm-2.12.0-69720a23ab-b683b74e10.zip differ
diff --git a/.yarn/cache/@parcel-reporter-cli-npm-2.12.0-b3e4c5fe19-8cc524fa15.zip b/.yarn/cache/@parcel-reporter-cli-npm-2.12.0-b3e4c5fe19-8cc524fa15.zip
new file mode 100644
index 0000000000..f6e625d396
Binary files /dev/null and b/.yarn/cache/@parcel-reporter-cli-npm-2.12.0-b3e4c5fe19-8cc524fa15.zip differ
diff --git a/.yarn/cache/@parcel-reporter-cli-npm-2.7.0-2b488e1e16-eff35a2ee3.zip b/.yarn/cache/@parcel-reporter-cli-npm-2.7.0-2b488e1e16-eff35a2ee3.zip
deleted file mode 100644
index 8a92eb2c84..0000000000
Binary files a/.yarn/cache/@parcel-reporter-cli-npm-2.7.0-2b488e1e16-eff35a2ee3.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-reporter-dev-server-npm-2.12.0-aed1d2c68c-43957b4656.zip b/.yarn/cache/@parcel-reporter-dev-server-npm-2.12.0-aed1d2c68c-43957b4656.zip
new file mode 100644
index 0000000000..f1fb1818e9
Binary files /dev/null and b/.yarn/cache/@parcel-reporter-dev-server-npm-2.12.0-aed1d2c68c-43957b4656.zip differ
diff --git a/.yarn/cache/@parcel-reporter-dev-server-npm-2.7.0-e6045e8f3d-e315689d8d.zip b/.yarn/cache/@parcel-reporter-dev-server-npm-2.7.0-e6045e8f3d-e315689d8d.zip
deleted file mode 100644
index 89f5008d60..0000000000
Binary files a/.yarn/cache/@parcel-reporter-dev-server-npm-2.7.0-e6045e8f3d-e315689d8d.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-reporter-tracer-npm-2.12.0-5cec9ab2d5-24cddacd19.zip b/.yarn/cache/@parcel-reporter-tracer-npm-2.12.0-5cec9ab2d5-24cddacd19.zip
new file mode 100644
index 0000000000..2196f5407c
Binary files /dev/null and b/.yarn/cache/@parcel-reporter-tracer-npm-2.12.0-5cec9ab2d5-24cddacd19.zip differ
diff --git a/.yarn/cache/@parcel-resolver-default-npm-2.12.0-8da790891c-f3652eea09.zip b/.yarn/cache/@parcel-resolver-default-npm-2.12.0-8da790891c-f3652eea09.zip
new file mode 100644
index 0000000000..8022d04651
Binary files /dev/null and b/.yarn/cache/@parcel-resolver-default-npm-2.12.0-8da790891c-f3652eea09.zip differ
diff --git a/.yarn/cache/@parcel-resolver-default-npm-2.7.0-6a30d41e3e-5bc64bea95.zip b/.yarn/cache/@parcel-resolver-default-npm-2.7.0-6a30d41e3e-5bc64bea95.zip
deleted file mode 100644
index 273dc50af9..0000000000
Binary files a/.yarn/cache/@parcel-resolver-default-npm-2.7.0-6a30d41e3e-5bc64bea95.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.12.0-6f0da66673-bbba57ecee.zip b/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.12.0-6f0da66673-bbba57ecee.zip
new file mode 100644
index 0000000000..f71de2152b
Binary files /dev/null and b/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.12.0-6f0da66673-bbba57ecee.zip differ
diff --git a/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.7.0-a096585411-ad736bab69.zip b/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.7.0-a096585411-ad736bab69.zip
deleted file mode 100644
index 6515da05d3..0000000000
Binary files a/.yarn/cache/@parcel-runtime-browser-hmr-npm-2.7.0-a096585411-ad736bab69.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-runtime-js-npm-2.12.0-e21acc0f42-6afa3e7eb2.zip b/.yarn/cache/@parcel-runtime-js-npm-2.12.0-e21acc0f42-6afa3e7eb2.zip
new file mode 100644
index 0000000000..be9c7d7e4b
Binary files /dev/null and b/.yarn/cache/@parcel-runtime-js-npm-2.12.0-e21acc0f42-6afa3e7eb2.zip differ
diff --git a/.yarn/cache/@parcel-runtime-js-npm-2.7.0-4239941924-3a22c78ce1.zip b/.yarn/cache/@parcel-runtime-js-npm-2.7.0-4239941924-3a22c78ce1.zip
deleted file mode 100644
index 10b07ad646..0000000000
Binary files a/.yarn/cache/@parcel-runtime-js-npm-2.7.0-4239941924-3a22c78ce1.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-runtime-react-refresh-npm-2.12.0-2b09615691-41aee9a874.zip b/.yarn/cache/@parcel-runtime-react-refresh-npm-2.12.0-2b09615691-41aee9a874.zip
new file mode 100644
index 0000000000..8dc8e5281c
Binary files /dev/null and b/.yarn/cache/@parcel-runtime-react-refresh-npm-2.12.0-2b09615691-41aee9a874.zip differ
diff --git a/.yarn/cache/@parcel-runtime-react-refresh-npm-2.7.0-630a596870-ea4c240185.zip b/.yarn/cache/@parcel-runtime-react-refresh-npm-2.7.0-630a596870-ea4c240185.zip
deleted file mode 100644
index 5e098e646b..0000000000
Binary files a/.yarn/cache/@parcel-runtime-react-refresh-npm-2.7.0-630a596870-ea4c240185.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-runtime-service-worker-npm-2.12.0-7d227ff0bf-c71246428e.zip b/.yarn/cache/@parcel-runtime-service-worker-npm-2.12.0-7d227ff0bf-c71246428e.zip
new file mode 100644
index 0000000000..18682c22ae
Binary files /dev/null and b/.yarn/cache/@parcel-runtime-service-worker-npm-2.12.0-7d227ff0bf-c71246428e.zip differ
diff --git a/.yarn/cache/@parcel-runtime-service-worker-npm-2.7.0-356c846b9a-13eb0ba276.zip b/.yarn/cache/@parcel-runtime-service-worker-npm-2.7.0-356c846b9a-13eb0ba276.zip
deleted file mode 100644
index e216fafc14..0000000000
Binary files a/.yarn/cache/@parcel-runtime-service-worker-npm-2.7.0-356c846b9a-13eb0ba276.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-rust-npm-2.12.0-0cf943f3e5-51c5b67b9e.zip b/.yarn/cache/@parcel-rust-npm-2.12.0-0cf943f3e5-51c5b67b9e.zip
new file mode 100644
index 0000000000..d5fe4206c9
Binary files /dev/null and b/.yarn/cache/@parcel-rust-npm-2.12.0-0cf943f3e5-51c5b67b9e.zip differ
diff --git a/.yarn/cache/@parcel-source-map-npm-2.1.1-09e4d79db4-1fa27a7047.zip b/.yarn/cache/@parcel-source-map-npm-2.1.1-09e4d79db4-1fa27a7047.zip
new file mode 100644
index 0000000000..d659e3fc29
Binary files /dev/null and b/.yarn/cache/@parcel-source-map-npm-2.1.1-09e4d79db4-1fa27a7047.zip differ
diff --git a/.yarn/cache/@parcel-transformer-babel-npm-2.12.0-953de52432-b8c457c0be.zip b/.yarn/cache/@parcel-transformer-babel-npm-2.12.0-953de52432-b8c457c0be.zip
new file mode 100644
index 0000000000..9286325c9e
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-babel-npm-2.12.0-953de52432-b8c457c0be.zip differ
diff --git a/.yarn/cache/@parcel-transformer-babel-npm-2.7.0-2f75dd9e80-aa269b1291.zip b/.yarn/cache/@parcel-transformer-babel-npm-2.7.0-2f75dd9e80-aa269b1291.zip
deleted file mode 100644
index 6ef5440f27..0000000000
Binary files a/.yarn/cache/@parcel-transformer-babel-npm-2.7.0-2f75dd9e80-aa269b1291.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-css-npm-2.12.0-24ddc31ae3-3a6f16321d.zip b/.yarn/cache/@parcel-transformer-css-npm-2.12.0-24ddc31ae3-3a6f16321d.zip
new file mode 100644
index 0000000000..f3e0520c71
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-css-npm-2.12.0-24ddc31ae3-3a6f16321d.zip differ
diff --git a/.yarn/cache/@parcel-transformer-css-npm-2.7.0-25da3f73ab-47cf7cd9a4.zip b/.yarn/cache/@parcel-transformer-css-npm-2.7.0-25da3f73ab-47cf7cd9a4.zip
deleted file mode 100644
index 2de4dbb451..0000000000
Binary files a/.yarn/cache/@parcel-transformer-css-npm-2.7.0-25da3f73ab-47cf7cd9a4.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-html-npm-2.12.0-be2b9ee40c-7fcfac62ca.zip b/.yarn/cache/@parcel-transformer-html-npm-2.12.0-be2b9ee40c-7fcfac62ca.zip
new file mode 100644
index 0000000000..3628f3f90d
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-html-npm-2.12.0-be2b9ee40c-7fcfac62ca.zip differ
diff --git a/.yarn/cache/@parcel-transformer-html-npm-2.7.0-08c6020320-4028ffa5ec.zip b/.yarn/cache/@parcel-transformer-html-npm-2.7.0-08c6020320-4028ffa5ec.zip
deleted file mode 100644
index 97cc751dd8..0000000000
Binary files a/.yarn/cache/@parcel-transformer-html-npm-2.7.0-08c6020320-4028ffa5ec.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip b/.yarn/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip
new file mode 100644
index 0000000000..3a78e4e070
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-image-npm-2.12.0-53f04e21c0-0a1581eacc.zip differ
diff --git a/.yarn/cache/@parcel-transformer-image-npm-2.7.0-e0f900b613-1decacc1a4.zip b/.yarn/cache/@parcel-transformer-image-npm-2.7.0-e0f900b613-1decacc1a4.zip
deleted file mode 100644
index f9cba3eb92..0000000000
Binary files a/.yarn/cache/@parcel-transformer-image-npm-2.7.0-e0f900b613-1decacc1a4.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-inline-string-npm-2.12.0-a33f10bafa-5f63c08695.zip b/.yarn/cache/@parcel-transformer-inline-string-npm-2.12.0-a33f10bafa-5f63c08695.zip
new file mode 100644
index 0000000000..0c4f3341c8
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-inline-string-npm-2.12.0-a33f10bafa-5f63c08695.zip differ
diff --git a/.yarn/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip b/.yarn/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip
new file mode 100644
index 0000000000..1ce667ac8d
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-js-npm-2.12.0-404d54db18-b9fe4c887b.zip differ
diff --git a/.yarn/cache/@parcel-transformer-js-npm-2.7.0-fc3e2edf8a-76669ef593.zip b/.yarn/cache/@parcel-transformer-js-npm-2.7.0-fc3e2edf8a-76669ef593.zip
deleted file mode 100644
index db25726e84..0000000000
Binary files a/.yarn/cache/@parcel-transformer-js-npm-2.7.0-fc3e2edf8a-76669ef593.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-json-npm-2.12.0-652d8d99d2-a711cb65a8.zip b/.yarn/cache/@parcel-transformer-json-npm-2.12.0-652d8d99d2-a711cb65a8.zip
new file mode 100644
index 0000000000..926c01eb81
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-json-npm-2.12.0-652d8d99d2-a711cb65a8.zip differ
diff --git a/.yarn/cache/@parcel-transformer-json-npm-2.7.0-618a3ec3da-d9d82148ee.zip b/.yarn/cache/@parcel-transformer-json-npm-2.7.0-618a3ec3da-d9d82148ee.zip
deleted file mode 100644
index 6f4cbbf035..0000000000
Binary files a/.yarn/cache/@parcel-transformer-json-npm-2.7.0-618a3ec3da-d9d82148ee.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-postcss-npm-2.12.0-f0cfb95fac-b210044a7f.zip b/.yarn/cache/@parcel-transformer-postcss-npm-2.12.0-f0cfb95fac-b210044a7f.zip
new file mode 100644
index 0000000000..3bbacafa81
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-postcss-npm-2.12.0-f0cfb95fac-b210044a7f.zip differ
diff --git a/.yarn/cache/@parcel-transformer-postcss-npm-2.7.0-4c66e12663-15bd9ac051.zip b/.yarn/cache/@parcel-transformer-postcss-npm-2.7.0-4c66e12663-15bd9ac051.zip
deleted file mode 100644
index 90b42f974a..0000000000
Binary files a/.yarn/cache/@parcel-transformer-postcss-npm-2.7.0-4c66e12663-15bd9ac051.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-posthtml-npm-2.12.0-41c570db12-b62582ae7e.zip b/.yarn/cache/@parcel-transformer-posthtml-npm-2.12.0-41c570db12-b62582ae7e.zip
new file mode 100644
index 0000000000..e912a09713
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-posthtml-npm-2.12.0-41c570db12-b62582ae7e.zip differ
diff --git a/.yarn/cache/@parcel-transformer-posthtml-npm-2.7.0-8bf2259ce3-04642838ce.zip b/.yarn/cache/@parcel-transformer-posthtml-npm-2.7.0-8bf2259ce3-04642838ce.zip
deleted file mode 100644
index 23030ed4f9..0000000000
Binary files a/.yarn/cache/@parcel-transformer-posthtml-npm-2.7.0-8bf2259ce3-04642838ce.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-raw-npm-2.12.0-bd2cb66ddf-de6681e2e7.zip b/.yarn/cache/@parcel-transformer-raw-npm-2.12.0-bd2cb66ddf-de6681e2e7.zip
new file mode 100644
index 0000000000..40b7e2d3c4
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-raw-npm-2.12.0-bd2cb66ddf-de6681e2e7.zip differ
diff --git a/.yarn/cache/@parcel-transformer-raw-npm-2.7.0-648170650b-942a5ddbed.zip b/.yarn/cache/@parcel-transformer-raw-npm-2.7.0-648170650b-942a5ddbed.zip
deleted file mode 100644
index da5184ac55..0000000000
Binary files a/.yarn/cache/@parcel-transformer-raw-npm-2.7.0-648170650b-942a5ddbed.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.12.0-59ed68910f-9aba8c1ab0.zip b/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.12.0-59ed68910f-9aba8c1ab0.zip
new file mode 100644
index 0000000000..23210becb7
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.12.0-59ed68910f-9aba8c1ab0.zip differ
diff --git a/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.7.0-f38de269bf-d193b9552b.zip b/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.7.0-f38de269bf-d193b9552b.zip
deleted file mode 100644
index e84be2516d..0000000000
Binary files a/.yarn/cache/@parcel-transformer-react-refresh-wrap-npm-2.7.0-f38de269bf-d193b9552b.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-sass-npm-2.12.0-ef787eef35-ce6b4d329b.zip b/.yarn/cache/@parcel-transformer-sass-npm-2.12.0-ef787eef35-ce6b4d329b.zip
new file mode 100644
index 0000000000..d62c342067
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-sass-npm-2.12.0-ef787eef35-ce6b4d329b.zip differ
diff --git a/.yarn/cache/@parcel-transformer-sass-npm-2.7.0-69e02a5ece-8d53b8fcdb.zip b/.yarn/cache/@parcel-transformer-sass-npm-2.7.0-69e02a5ece-8d53b8fcdb.zip
deleted file mode 100644
index 9db0d7828c..0000000000
Binary files a/.yarn/cache/@parcel-transformer-sass-npm-2.7.0-69e02a5ece-8d53b8fcdb.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-transformer-svg-npm-2.12.0-f41b181676-92b7c65894.zip b/.yarn/cache/@parcel-transformer-svg-npm-2.12.0-f41b181676-92b7c65894.zip
new file mode 100644
index 0000000000..01af21f6a3
Binary files /dev/null and b/.yarn/cache/@parcel-transformer-svg-npm-2.12.0-f41b181676-92b7c65894.zip differ
diff --git a/.yarn/cache/@parcel-transformer-svg-npm-2.7.0-25a0624742-19026a39f9.zip b/.yarn/cache/@parcel-transformer-svg-npm-2.7.0-25a0624742-19026a39f9.zip
deleted file mode 100644
index b46f900ecd..0000000000
Binary files a/.yarn/cache/@parcel-transformer-svg-npm-2.7.0-25a0624742-19026a39f9.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-types-npm-2.12.0-ffe47febbf-250f95580c.zip b/.yarn/cache/@parcel-types-npm-2.12.0-ffe47febbf-250f95580c.zip
new file mode 100644
index 0000000000..ea6decc566
Binary files /dev/null and b/.yarn/cache/@parcel-types-npm-2.12.0-ffe47febbf-250f95580c.zip differ
diff --git a/.yarn/cache/@parcel-types-npm-2.7.0-abdd37dd38-cf28c56d3e.zip b/.yarn/cache/@parcel-types-npm-2.7.0-abdd37dd38-cf28c56d3e.zip
deleted file mode 100644
index 87985af50a..0000000000
Binary files a/.yarn/cache/@parcel-types-npm-2.7.0-abdd37dd38-cf28c56d3e.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-utils-npm-2.12.0-d8a9a48a66-ba80a60fed.zip b/.yarn/cache/@parcel-utils-npm-2.12.0-d8a9a48a66-ba80a60fed.zip
new file mode 100644
index 0000000000..8eda598941
Binary files /dev/null and b/.yarn/cache/@parcel-utils-npm-2.12.0-d8a9a48a66-ba80a60fed.zip differ
diff --git a/.yarn/cache/@parcel-utils-npm-2.7.0-db7c9fa872-2645b3379d.zip b/.yarn/cache/@parcel-utils-npm-2.7.0-db7c9fa872-2645b3379d.zip
deleted file mode 100644
index dfda9da9ea..0000000000
Binary files a/.yarn/cache/@parcel-utils-npm-2.7.0-db7c9fa872-2645b3379d.zip and /dev/null differ
diff --git a/.yarn/cache/@parcel-watcher-npm-2.0.7-8a0c8cf0fd-9cf92fbf44.zip b/.yarn/cache/@parcel-watcher-npm-2.0.7-8a0c8cf0fd-9cf92fbf44.zip
new file mode 100644
index 0000000000..bbb57c377e
Binary files /dev/null and b/.yarn/cache/@parcel-watcher-npm-2.0.7-8a0c8cf0fd-9cf92fbf44.zip differ
diff --git a/.yarn/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip b/.yarn/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip
new file mode 100644
index 0000000000..53f28c9470
Binary files /dev/null and b/.yarn/cache/@parcel-workers-npm-2.12.0-3ddd4664bc-e19c3c0a66.zip differ
diff --git a/.yarn/cache/@parcel-workers-npm-2.7.0-7ae287b100-e3621c4030.zip b/.yarn/cache/@parcel-workers-npm-2.7.0-7ae287b100-e3621c4030.zip
deleted file mode 100644
index fb5a0d14b5..0000000000
Binary files a/.yarn/cache/@parcel-workers-npm-2.7.0-7ae287b100-e3621c4030.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cli-app-npm-1.10.4-06b84c2fa7-81db381f2e.zip b/.yarn/cache/@percy-cli-app-npm-1.10.4-06b84c2fa7-81db381f2e.zip
deleted file mode 100644
index 1a89d4f7d2..0000000000
Binary files a/.yarn/cache/@percy-cli-app-npm-1.10.4-06b84c2fa7-81db381f2e.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cli-build-npm-1.10.4-aea75ba7bd-c6aa64bbb3.zip b/.yarn/cache/@percy-cli-build-npm-1.10.4-aea75ba7bd-c6aa64bbb3.zip
deleted file mode 100644
index 9c13128035..0000000000
Binary files a/.yarn/cache/@percy-cli-build-npm-1.10.4-aea75ba7bd-c6aa64bbb3.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cli-command-npm-1.10.4-9b894aa1cf-d96a572e24.zip b/.yarn/cache/@percy-cli-command-npm-1.10.4-9b894aa1cf-d96a572e24.zip
deleted file mode 100644
index 7bf0b76005..0000000000
Binary files a/.yarn/cache/@percy-cli-command-npm-1.10.4-9b894aa1cf-d96a572e24.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cli-config-npm-1.10.4-9177c0305d-901df758d4.zip b/.yarn/cache/@percy-cli-config-npm-1.10.4-9177c0305d-901df758d4.zip
deleted file mode 100644
index 36fdf26e5d..0000000000
Binary files a/.yarn/cache/@percy-cli-config-npm-1.10.4-9177c0305d-901df758d4.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cli-exec-npm-1.10.4-df1853a356-d1c77ce6c9.zip b/.yarn/cache/@percy-cli-exec-npm-1.10.4-df1853a356-d1c77ce6c9.zip
deleted file mode 100644
index 827d06ca9e..0000000000
Binary files a/.yarn/cache/@percy-cli-exec-npm-1.10.4-df1853a356-d1c77ce6c9.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cli-npm-1.10.4-acb199a834-3164e88bbc.zip b/.yarn/cache/@percy-cli-npm-1.10.4-acb199a834-3164e88bbc.zip
deleted file mode 100644
index 229fcbacdf..0000000000
Binary files a/.yarn/cache/@percy-cli-npm-1.10.4-acb199a834-3164e88bbc.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cli-snapshot-npm-1.10.4-12fbaf9321-51542704a0.zip b/.yarn/cache/@percy-cli-snapshot-npm-1.10.4-12fbaf9321-51542704a0.zip
deleted file mode 100644
index 4a66210582..0000000000
Binary files a/.yarn/cache/@percy-cli-snapshot-npm-1.10.4-12fbaf9321-51542704a0.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cli-upload-npm-1.10.4-cf4deabe63-518e3e2414.zip b/.yarn/cache/@percy-cli-upload-npm-1.10.4-cf4deabe63-518e3e2414.zip
deleted file mode 100644
index 7327fe07e5..0000000000
Binary files a/.yarn/cache/@percy-cli-upload-npm-1.10.4-cf4deabe63-518e3e2414.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-client-npm-1.10.4-a8afab3bcb-8970cb0fee.zip b/.yarn/cache/@percy-client-npm-1.10.4-a8afab3bcb-8970cb0fee.zip
deleted file mode 100644
index 922e0e21cd..0000000000
Binary files a/.yarn/cache/@percy-client-npm-1.10.4-a8afab3bcb-8970cb0fee.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-config-npm-1.10.4-b58233e905-545e2fd4ab.zip b/.yarn/cache/@percy-config-npm-1.10.4-b58233e905-545e2fd4ab.zip
deleted file mode 100644
index c096c7445a..0000000000
Binary files a/.yarn/cache/@percy-config-npm-1.10.4-b58233e905-545e2fd4ab.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-core-npm-1.10.4-0c5deaa690-39f6de1cf5.zip b/.yarn/cache/@percy-core-npm-1.10.4-0c5deaa690-39f6de1cf5.zip
deleted file mode 100644
index 5f0f2d6a9f..0000000000
Binary files a/.yarn/cache/@percy-core-npm-1.10.4-0c5deaa690-39f6de1cf5.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-cypress-npm-3.1.2-b10a40bb3c-576b14c076.zip b/.yarn/cache/@percy-cypress-npm-3.1.2-b10a40bb3c-576b14c076.zip
deleted file mode 100644
index b5c56c64bb..0000000000
Binary files a/.yarn/cache/@percy-cypress-npm-3.1.2-b10a40bb3c-576b14c076.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-dom-npm-1.10.4-ced497b448-2c1b4da7fa.zip b/.yarn/cache/@percy-dom-npm-1.10.4-ced497b448-2c1b4da7fa.zip
deleted file mode 100644
index e99c528eb4..0000000000
Binary files a/.yarn/cache/@percy-dom-npm-1.10.4-ced497b448-2c1b4da7fa.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-env-npm-1.10.4-d5bfdc729b-c2a9f6b384.zip b/.yarn/cache/@percy-env-npm-1.10.4-d5bfdc729b-c2a9f6b384.zip
deleted file mode 100644
index 25462b4b91..0000000000
Binary files a/.yarn/cache/@percy-env-npm-1.10.4-d5bfdc729b-c2a9f6b384.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-logger-npm-1.10.4-34e93e31f1-4c6ade3902.zip b/.yarn/cache/@percy-logger-npm-1.10.4-34e93e31f1-4c6ade3902.zip
deleted file mode 100644
index 1dd77647ef..0000000000
Binary files a/.yarn/cache/@percy-logger-npm-1.10.4-34e93e31f1-4c6ade3902.zip and /dev/null differ
diff --git a/.yarn/cache/@percy-sdk-utils-npm-1.10.0-bb3a5e31d6-9880758111.zip b/.yarn/cache/@percy-sdk-utils-npm-1.10.0-bb3a5e31d6-9880758111.zip
deleted file mode 100644
index e1793c8b16..0000000000
Binary files a/.yarn/cache/@percy-sdk-utils-npm-1.10.0-bb3a5e31d6-9880758111.zip and /dev/null differ
diff --git a/.yarn/cache/@pkgjs-parseargs-npm-0.11.0-cd2a3fe948-6ad6a00fc4.zip b/.yarn/cache/@pkgjs-parseargs-npm-0.11.0-cd2a3fe948-6ad6a00fc4.zip
new file mode 100644
index 0000000000..96f576f7de
Binary files /dev/null and b/.yarn/cache/@pkgjs-parseargs-npm-0.11.0-cd2a3fe948-6ad6a00fc4.zip differ
diff --git a/.yarn/cache/@popperjs-core-npm-2.11.6-5bcdc104bd-47fb328cec.zip b/.yarn/cache/@popperjs-core-npm-2.11.6-5bcdc104bd-47fb328cec.zip
deleted file mode 100644
index e372ae30af..0000000000
Binary files a/.yarn/cache/@popperjs-core-npm-2.11.6-5bcdc104bd-47fb328cec.zip and /dev/null differ
diff --git a/.yarn/cache/@popperjs-core-npm-2.11.8-f1692e11a0-e5c69fdebf.zip b/.yarn/cache/@popperjs-core-npm-2.11.8-f1692e11a0-e5c69fdebf.zip
new file mode 100644
index 0000000000..a5eef4b227
Binary files /dev/null and b/.yarn/cache/@popperjs-core-npm-2.11.8-f1692e11a0-e5c69fdebf.zip differ
diff --git a/.yarn/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip b/.yarn/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip
new file mode 100644
index 0000000000..923a7a91a8
Binary files /dev/null and b/.yarn/cache/@rollup-pluginutils-npm-5.1.0-6939820ef8-3cc5a6d914.zip differ
diff --git a/.yarn/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip b/.yarn/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip
deleted file mode 100644
index 5990cc7604..0000000000
Binary files a/.yarn/cache/@sidvind-better-ajv-errors-npm-2.0.0-3531bddef9-12b0d87855.zip and /dev/null differ
diff --git a/.yarn/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip b/.yarn/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip
new file mode 100644
index 0000000000..ad36770e19
Binary files /dev/null and b/.yarn/cache/@sidvind-better-ajv-errors-npm-2.1.3-e3d1c524a8-949cb805a1.zip differ
diff --git a/.yarn/cache/@swc-core-darwin-arm64-npm-1.3.62-b4af5d9b32-8.zip b/.yarn/cache/@swc-core-darwin-arm64-npm-1.3.62-b4af5d9b32-8.zip
new file mode 100644
index 0000000000..ad2ff12c7f
Binary files /dev/null and b/.yarn/cache/@swc-core-darwin-arm64-npm-1.3.62-b4af5d9b32-8.zip differ
diff --git a/.yarn/cache/@swc-core-darwin-x64-npm-1.3.62-7d7bc99502-8.zip b/.yarn/cache/@swc-core-darwin-x64-npm-1.3.62-7d7bc99502-8.zip
new file mode 100644
index 0000000000..7edd14afd0
Binary files /dev/null and b/.yarn/cache/@swc-core-darwin-x64-npm-1.3.62-7d7bc99502-8.zip differ
diff --git a/.yarn/cache/@swc-core-linux-arm64-gnu-npm-1.3.62-7b527a3356-8.zip b/.yarn/cache/@swc-core-linux-arm64-gnu-npm-1.3.62-7b527a3356-8.zip
new file mode 100644
index 0000000000..87afaa9285
Binary files /dev/null and b/.yarn/cache/@swc-core-linux-arm64-gnu-npm-1.3.62-7b527a3356-8.zip differ
diff --git a/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.62-1fc43a8907-8.zip b/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.62-1fc43a8907-8.zip
new file mode 100644
index 0000000000..a1aa6dbae5
Binary files /dev/null and b/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.62-1fc43a8907-8.zip differ
diff --git a/.yarn/cache/@swc-core-npm-1.3.62-9a4c32739d-a7a0d9ffdb.zip b/.yarn/cache/@swc-core-npm-1.3.62-9a4c32739d-a7a0d9ffdb.zip
new file mode 100644
index 0000000000..dc6b151bf1
Binary files /dev/null and b/.yarn/cache/@swc-core-npm-1.3.62-9a4c32739d-a7a0d9ffdb.zip differ
diff --git a/.yarn/cache/@swc-core-win32-arm64-msvc-npm-1.3.62-f4199145ca-8.zip b/.yarn/cache/@swc-core-win32-arm64-msvc-npm-1.3.62-f4199145ca-8.zip
new file mode 100644
index 0000000000..bb62885e7f
Binary files /dev/null and b/.yarn/cache/@swc-core-win32-arm64-msvc-npm-1.3.62-f4199145ca-8.zip differ
diff --git a/.yarn/cache/@swc-core-win32-x64-msvc-npm-1.3.62-200450bac0-8.zip b/.yarn/cache/@swc-core-win32-x64-msvc-npm-1.3.62-200450bac0-8.zip
new file mode 100644
index 0000000000..f306c1e943
Binary files /dev/null and b/.yarn/cache/@swc-core-win32-x64-msvc-npm-1.3.62-200450bac0-8.zip differ
diff --git a/.yarn/cache/@swc-helpers-npm-0.4.3-5d4bea11d2-5c2f173e95.zip b/.yarn/cache/@swc-helpers-npm-0.4.3-5d4bea11d2-5c2f173e95.zip
deleted file mode 100644
index a6e2cc58d4..0000000000
Binary files a/.yarn/cache/@swc-helpers-npm-0.4.3-5d4bea11d2-5c2f173e95.zip and /dev/null differ
diff --git a/.yarn/cache/@swc-helpers-npm-0.5.1-424376f311-71e0e27234.zip b/.yarn/cache/@swc-helpers-npm-0.5.1-424376f311-71e0e27234.zip
new file mode 100644
index 0000000000..36ed12e7cb
Binary files /dev/null and b/.yarn/cache/@swc-helpers-npm-0.5.1-424376f311-71e0e27234.zip differ
diff --git a/.yarn/cache/@twuni-emojify-npm-1.0.2-a45d6eb0a7-0044c83b05.zip b/.yarn/cache/@twuni-emojify-npm-1.0.2-a45d6eb0a7-0044c83b05.zip
new file mode 100644
index 0000000000..4bcf04a90a
Binary files /dev/null and b/.yarn/cache/@twuni-emojify-npm-1.0.2-a45d6eb0a7-0044c83b05.zip differ
diff --git a/.yarn/cache/@types-estree-npm-1.0.0-eddde5b631-910d97fb70.zip b/.yarn/cache/@types-estree-npm-1.0.0-eddde5b631-910d97fb70.zip
new file mode 100644
index 0000000000..8b03b040a6
Binary files /dev/null and b/.yarn/cache/@types-estree-npm-1.0.0-eddde5b631-910d97fb70.zip differ
diff --git a/.yarn/cache/@types-jest-npm-27.4.1-31d07cd0d8-5184f3eef4.zip b/.yarn/cache/@types-jest-npm-27.4.1-31d07cd0d8-5184f3eef4.zip
deleted file mode 100644
index 28e1c1b124..0000000000
Binary files a/.yarn/cache/@types-jest-npm-27.4.1-31d07cd0d8-5184f3eef4.zip and /dev/null differ
diff --git a/.yarn/cache/@types-katex-npm-0.16.5-ff9336f176-a1ce22cd87.zip b/.yarn/cache/@types-katex-npm-0.16.5-ff9336f176-a1ce22cd87.zip
new file mode 100644
index 0000000000..92aafc4818
Binary files /dev/null and b/.yarn/cache/@types-katex-npm-0.16.5-ff9336f176-a1ce22cd87.zip differ
diff --git a/.yarn/cache/@types-lodash-es-npm-4.17.10-a7dae21818-129e9dde83.zip b/.yarn/cache/@types-lodash-es-npm-4.17.10-a7dae21818-129e9dde83.zip
new file mode 100644
index 0000000000..d0043c3a60
Binary files /dev/null and b/.yarn/cache/@types-lodash-es-npm-4.17.10-a7dae21818-129e9dde83.zip differ
diff --git a/.yarn/cache/@types-lodash-es-npm-4.17.6-fd5abbdc74-9bd239dd52.zip b/.yarn/cache/@types-lodash-es-npm-4.17.6-fd5abbdc74-9bd239dd52.zip
deleted file mode 100644
index 3bd29bcbad..0000000000
Binary files a/.yarn/cache/@types-lodash-es-npm-4.17.6-fd5abbdc74-9bd239dd52.zip and /dev/null differ
diff --git a/.yarn/cache/@types-lodash-npm-4.14.200-8559f51fce-6471f8bb5d.zip b/.yarn/cache/@types-lodash-npm-4.14.200-8559f51fce-6471f8bb5d.zip
new file mode 100644
index 0000000000..ae8b2ba4c0
Binary files /dev/null and b/.yarn/cache/@types-lodash-npm-4.14.200-8559f51fce-6471f8bb5d.zip differ
diff --git a/.yarn/cache/@types-node-npm-14.18.18-2f8f733938-a165225cd2.zip b/.yarn/cache/@types-node-npm-14.18.18-2f8f733938-a165225cd2.zip
deleted file mode 100644
index ffdc271bf1..0000000000
Binary files a/.yarn/cache/@types-node-npm-14.18.18-2f8f733938-a165225cd2.zip and /dev/null differ
diff --git a/.yarn/cache/@types-sinonjs__fake-timers-npm-8.1.1-95ac9b59b5-ca09d54d47.zip b/.yarn/cache/@types-sinonjs__fake-timers-npm-8.1.1-95ac9b59b5-ca09d54d47.zip
deleted file mode 100644
index f862c6baad..0000000000
Binary files a/.yarn/cache/@types-sinonjs__fake-timers-npm-8.1.1-95ac9b59b5-ca09d54d47.zip and /dev/null differ
diff --git a/.yarn/cache/@types-sizzle-npm-2.3.3-9403924950-586a9fb1f6.zip b/.yarn/cache/@types-sizzle-npm-2.3.3-9403924950-586a9fb1f6.zip
deleted file mode 100644
index 52a4f8df23..0000000000
Binary files a/.yarn/cache/@types-sizzle-npm-2.3.3-9403924950-586a9fb1f6.zip and /dev/null differ
diff --git a/.yarn/cache/@types-yauzl-npm-2.10.0-7b242343cb-55d27ae5d3.zip b/.yarn/cache/@types-yauzl-npm-2.10.0-7b242343cb-55d27ae5d3.zip
deleted file mode 100644
index 0d3bbb8f9f..0000000000
Binary files a/.yarn/cache/@types-yauzl-npm-2.10.0-7b242343cb-55d27ae5d3.zip and /dev/null differ
diff --git a/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip b/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip
new file mode 100644
index 0000000000..598a36e085
Binary files /dev/null and b/.yarn/cache/@ungap-structured-clone-npm-1.2.0-648f0b82e0-4f656b7b46.zip differ
diff --git a/.yarn/cache/@vitejs-plugin-vue-npm-2.3.4-05d77ad5d1-1203eda14a.zip b/.yarn/cache/@vitejs-plugin-vue-npm-2.3.4-05d77ad5d1-1203eda14a.zip
deleted file mode 100644
index 19e36f25e1..0000000000
Binary files a/.yarn/cache/@vitejs-plugin-vue-npm-2.3.4-05d77ad5d1-1203eda14a.zip and /dev/null differ
diff --git a/.yarn/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip b/.yarn/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip
new file mode 100644
index 0000000000..7cf07fbe2d
Binary files /dev/null and b/.yarn/cache/@vitejs-plugin-vue-npm-4.6.2-d7ace53203-01bc4ed643.zip differ
diff --git a/.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip b/.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip
new file mode 100644
index 0000000000..25e6d3f94d
Binary files /dev/null and b/.yarn/cache/@volar-language-core-npm-2.1.4-18ee1a037d-7430f65143.zip differ
diff --git a/.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip b/.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip
new file mode 100644
index 0000000000..5f494d902e
Binary files /dev/null and b/.yarn/cache/@volar-language-service-npm-2.1.4-2d34cb628f-06cdcfacf0.zip differ
diff --git a/.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip b/.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip
new file mode 100644
index 0000000000..0ea96c4d97
Binary files /dev/null and b/.yarn/cache/@volar-source-map-npm-2.1.4-5963b1701f-e2f65bcfd6.zip differ
diff --git a/.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip b/.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip
new file mode 100644
index 0000000000..2d6533a204
Binary files /dev/null and b/.yarn/cache/@vscode-l10n-npm-0.0.18-8a12efe4b5-c33876cebd.zip differ
diff --git a/.yarn/cache/@vue-compiler-core-npm-3.2.40-f464645db3-2683bf13ef.zip b/.yarn/cache/@vue-compiler-core-npm-3.2.40-f464645db3-2683bf13ef.zip
deleted file mode 100644
index b675b66c05..0000000000
Binary files a/.yarn/cache/@vue-compiler-core-npm-3.2.40-f464645db3-2683bf13ef.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-compiler-core-npm-3.4.21-ec7f24d7f5-0d6b7732bc.zip b/.yarn/cache/@vue-compiler-core-npm-3.4.21-ec7f24d7f5-0d6b7732bc.zip
new file mode 100644
index 0000000000..ba6ec89e54
Binary files /dev/null and b/.yarn/cache/@vue-compiler-core-npm-3.4.21-ec7f24d7f5-0d6b7732bc.zip differ
diff --git a/.yarn/cache/@vue-compiler-dom-npm-3.2.40-df00f2f10c-d928a16ebd.zip b/.yarn/cache/@vue-compiler-dom-npm-3.2.40-df00f2f10c-d928a16ebd.zip
deleted file mode 100644
index 9b77cb24df..0000000000
Binary files a/.yarn/cache/@vue-compiler-dom-npm-3.2.40-df00f2f10c-d928a16ebd.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-compiler-dom-npm-3.4.21-3d49f99020-f53e4f4e0a.zip b/.yarn/cache/@vue-compiler-dom-npm-3.4.21-3d49f99020-f53e4f4e0a.zip
new file mode 100644
index 0000000000..4d0c8cd01f
Binary files /dev/null and b/.yarn/cache/@vue-compiler-dom-npm-3.4.21-3d49f99020-f53e4f4e0a.zip differ
diff --git a/.yarn/cache/@vue-compiler-sfc-npm-3.2.40-7a8032e16c-96cbfd078a.zip b/.yarn/cache/@vue-compiler-sfc-npm-3.2.40-7a8032e16c-96cbfd078a.zip
deleted file mode 100644
index 23867e7521..0000000000
Binary files a/.yarn/cache/@vue-compiler-sfc-npm-3.2.40-7a8032e16c-96cbfd078a.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-compiler-sfc-npm-3.4.21-c2b76ee1ff-226dc404be.zip b/.yarn/cache/@vue-compiler-sfc-npm-3.4.21-c2b76ee1ff-226dc404be.zip
new file mode 100644
index 0000000000..95e0d0d70c
Binary files /dev/null and b/.yarn/cache/@vue-compiler-sfc-npm-3.4.21-c2b76ee1ff-226dc404be.zip differ
diff --git a/.yarn/cache/@vue-compiler-ssr-npm-3.2.40-76cabde3f1-026461fcee.zip b/.yarn/cache/@vue-compiler-ssr-npm-3.2.40-76cabde3f1-026461fcee.zip
deleted file mode 100644
index 67c6dfd468..0000000000
Binary files a/.yarn/cache/@vue-compiler-ssr-npm-3.2.40-76cabde3f1-026461fcee.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-compiler-ssr-npm-3.4.21-e6f043341e-c510bee68b.zip b/.yarn/cache/@vue-compiler-ssr-npm-3.4.21-e6f043341e-c510bee68b.zip
new file mode 100644
index 0000000000..f03e17b080
Binary files /dev/null and b/.yarn/cache/@vue-compiler-ssr-npm-3.4.21-e6f043341e-c510bee68b.zip differ
diff --git a/.yarn/cache/@vue-devtools-api-npm-6.1.4-4ee2c9cc71-027bb138b0.zip b/.yarn/cache/@vue-devtools-api-npm-6.1.4-4ee2c9cc71-027bb138b0.zip
deleted file mode 100644
index f958639b26..0000000000
Binary files a/.yarn/cache/@vue-devtools-api-npm-6.1.4-4ee2c9cc71-027bb138b0.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-devtools-api-npm-6.2.1-252fdd4f01-34765af0be.zip b/.yarn/cache/@vue-devtools-api-npm-6.2.1-252fdd4f01-34765af0be.zip
deleted file mode 100644
index 99cb8f052a..0000000000
Binary files a/.yarn/cache/@vue-devtools-api-npm-6.2.1-252fdd4f01-34765af0be.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-devtools-api-npm-6.5.0-0dc0468299-ec819ef3a4.zip b/.yarn/cache/@vue-devtools-api-npm-6.5.0-0dc0468299-ec819ef3a4.zip
new file mode 100644
index 0000000000..c8a187e6d2
Binary files /dev/null and b/.yarn/cache/@vue-devtools-api-npm-6.5.0-0dc0468299-ec819ef3a4.zip differ
diff --git a/.yarn/cache/@vue-devtools-api-npm-6.6.1-ef3c82703e-cf12b5ebcc.zip b/.yarn/cache/@vue-devtools-api-npm-6.6.1-ef3c82703e-cf12b5ebcc.zip
new file mode 100644
index 0000000000..f14e2cdac7
Binary files /dev/null and b/.yarn/cache/@vue-devtools-api-npm-6.6.1-ef3c82703e-cf12b5ebcc.zip differ
diff --git a/.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip b/.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip
new file mode 100644
index 0000000000..e637e5f556
Binary files /dev/null and b/.yarn/cache/@vue-language-plugin-pug-npm-2.0.7-547300c7e0-11cc96eb5f.zip differ
diff --git a/.yarn/cache/@vue-reactivity-npm-3.2.40-d9155c50c7-927d22b424.zip b/.yarn/cache/@vue-reactivity-npm-3.2.40-d9155c50c7-927d22b424.zip
deleted file mode 100644
index 09e2871157..0000000000
Binary files a/.yarn/cache/@vue-reactivity-npm-3.2.40-d9155c50c7-927d22b424.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-reactivity-npm-3.4.21-fd3e254d08-79c7ebe3ec.zip b/.yarn/cache/@vue-reactivity-npm-3.4.21-fd3e254d08-79c7ebe3ec.zip
new file mode 100644
index 0000000000..adc965a473
Binary files /dev/null and b/.yarn/cache/@vue-reactivity-npm-3.4.21-fd3e254d08-79c7ebe3ec.zip differ
diff --git a/.yarn/cache/@vue-reactivity-transform-npm-3.2.40-c8706743e9-b86fc29b52.zip b/.yarn/cache/@vue-reactivity-transform-npm-3.2.40-c8706743e9-b86fc29b52.zip
deleted file mode 100644
index dbdde7fff3..0000000000
Binary files a/.yarn/cache/@vue-reactivity-transform-npm-3.2.40-c8706743e9-b86fc29b52.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-runtime-core-npm-3.2.40-62158afe79-47c4918c12.zip b/.yarn/cache/@vue-runtime-core-npm-3.2.40-62158afe79-47c4918c12.zip
deleted file mode 100644
index 223f9c4238..0000000000
Binary files a/.yarn/cache/@vue-runtime-core-npm-3.2.40-62158afe79-47c4918c12.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-runtime-core-npm-3.4.21-7bf985040b-4eb9b5d91f.zip b/.yarn/cache/@vue-runtime-core-npm-3.4.21-7bf985040b-4eb9b5d91f.zip
new file mode 100644
index 0000000000..ffb48a907a
Binary files /dev/null and b/.yarn/cache/@vue-runtime-core-npm-3.4.21-7bf985040b-4eb9b5d91f.zip differ
diff --git a/.yarn/cache/@vue-runtime-dom-npm-3.2.40-1bb705cd21-4615d00cc4.zip b/.yarn/cache/@vue-runtime-dom-npm-3.2.40-1bb705cd21-4615d00cc4.zip
deleted file mode 100644
index b04368ba3b..0000000000
Binary files a/.yarn/cache/@vue-runtime-dom-npm-3.2.40-1bb705cd21-4615d00cc4.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-runtime-dom-npm-3.4.21-40f99cf9a2-ebfdaa081f.zip b/.yarn/cache/@vue-runtime-dom-npm-3.4.21-40f99cf9a2-ebfdaa081f.zip
new file mode 100644
index 0000000000..c65601f0a9
Binary files /dev/null and b/.yarn/cache/@vue-runtime-dom-npm-3.4.21-40f99cf9a2-ebfdaa081f.zip differ
diff --git a/.yarn/cache/@vue-server-renderer-npm-3.2.40-b8eff98a5b-f9d53aefca.zip b/.yarn/cache/@vue-server-renderer-npm-3.2.40-b8eff98a5b-f9d53aefca.zip
deleted file mode 100644
index 1d9478b94f..0000000000
Binary files a/.yarn/cache/@vue-server-renderer-npm-3.2.40-b8eff98a5b-f9d53aefca.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip b/.yarn/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip
new file mode 100644
index 0000000000..4da755254b
Binary files /dev/null and b/.yarn/cache/@vue-server-renderer-npm-3.4.21-bf6b2daebb-faa3dc4876.zip differ
diff --git a/.yarn/cache/@vue-shared-npm-3.2.40-6b1329b2bd-d91a1e12ff.zip b/.yarn/cache/@vue-shared-npm-3.2.40-6b1329b2bd-d91a1e12ff.zip
deleted file mode 100644
index c7098a6b4c..0000000000
Binary files a/.yarn/cache/@vue-shared-npm-3.2.40-6b1329b2bd-d91a1e12ff.zip and /dev/null differ
diff --git a/.yarn/cache/@vue-shared-npm-3.4.21-2aee4ae0bc-5f30a40891.zip b/.yarn/cache/@vue-shared-npm-3.4.21-2aee4ae0bc-5f30a40891.zip
new file mode 100644
index 0000000000..01c52809b3
Binary files /dev/null and b/.yarn/cache/@vue-shared-npm-3.4.21-2aee4ae0bc-5f30a40891.zip differ
diff --git a/.yarn/cache/@vue-test-utils-npm-2.1.0-c3d34439bb-4612568209.zip b/.yarn/cache/@vue-test-utils-npm-2.1.0-c3d34439bb-4612568209.zip
deleted file mode 100644
index 72ef0fd3ea..0000000000
Binary files a/.yarn/cache/@vue-test-utils-npm-2.1.0-c3d34439bb-4612568209.zip and /dev/null differ
diff --git a/.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip b/.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip
new file mode 100644
index 0000000000..6820207002
Binary files /dev/null and b/.yarn/cache/acorn-npm-8.10.0-2230c9e83e-538ba38af0.zip differ
diff --git a/.yarn/cache/acorn-npm-8.8.0-9ef399ab45-7270ca82b2.zip b/.yarn/cache/acorn-npm-8.8.0-9ef399ab45-7270ca82b2.zip
deleted file mode 100644
index b5376b1392..0000000000
Binary files a/.yarn/cache/acorn-npm-8.8.0-9ef399ab45-7270ca82b2.zip and /dev/null differ
diff --git a/.yarn/cache/acorn-walk-npm-8.2.0-2f2cac3177-1715e76c01.zip b/.yarn/cache/acorn-walk-npm-8.2.0-2f2cac3177-1715e76c01.zip
deleted file mode 100644
index f140c4ab5c..0000000000
Binary files a/.yarn/cache/acorn-walk-npm-8.2.0-2f2cac3177-1715e76c01.zip and /dev/null differ
diff --git a/.yarn/cache/ansi-colors-npm-4.1.3-8ffd0ae6c7-a9c2ec8420.zip b/.yarn/cache/ansi-colors-npm-4.1.3-8ffd0ae6c7-a9c2ec8420.zip
deleted file mode 100644
index cad48c8f0e..0000000000
Binary files a/.yarn/cache/ansi-colors-npm-4.1.3-8ffd0ae6c7-a9c2ec8420.zip and /dev/null differ
diff --git a/.yarn/cache/ansi-escapes-npm-4.3.2-3ad173702f-93111c4218.zip b/.yarn/cache/ansi-escapes-npm-4.3.2-3ad173702f-93111c4218.zip
deleted file mode 100644
index 6b90effb51..0000000000
Binary files a/.yarn/cache/ansi-escapes-npm-4.3.2-3ad173702f-93111c4218.zip and /dev/null differ
diff --git a/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip b/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip
new file mode 100644
index 0000000000..088e552d0f
Binary files /dev/null and b/.yarn/cache/ansi-regex-npm-6.0.1-8d663a607d-1ff8b7667c.zip differ
diff --git a/.yarn/cache/ansi-styles-npm-5.2.0-72fc7003e3-d7f4e97ce0.zip b/.yarn/cache/ansi-styles-npm-5.2.0-72fc7003e3-d7f4e97ce0.zip
deleted file mode 100644
index 62c09039bd..0000000000
Binary files a/.yarn/cache/ansi-styles-npm-5.2.0-72fc7003e3-d7f4e97ce0.zip and /dev/null differ
diff --git a/.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip b/.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip
new file mode 100644
index 0000000000..aa1bdfde18
Binary files /dev/null and b/.yarn/cache/ansi-styles-npm-6.2.1-d43647018c-ef940f2f0c.zip differ
diff --git a/.yarn/cache/arch-npm-2.2.0-34797684d8-e21b763502.zip b/.yarn/cache/arch-npm-2.2.0-34797684d8-e21b763502.zip
deleted file mode 100644
index e0f407e8c4..0000000000
Binary files a/.yarn/cache/arch-npm-2.2.0-34797684d8-e21b763502.zip and /dev/null differ
diff --git a/.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip b/.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip
new file mode 100644
index 0000000000..d2d609a667
Binary files /dev/null and b/.yarn/cache/array-buffer-byte-length-npm-1.0.0-331671f28a-044e101ce1.zip differ
diff --git a/.yarn/cache/array-includes-npm-3.1.4-79bb883109-69967c38c5.zip b/.yarn/cache/array-includes-npm-3.1.4-79bb883109-69967c38c5.zip
deleted file mode 100644
index c88aec7c23..0000000000
Binary files a/.yarn/cache/array-includes-npm-3.1.4-79bb883109-69967c38c5.zip and /dev/null differ
diff --git a/.yarn/cache/array-includes-npm-3.1.7-d32a5ee179-06f9e4598f.zip b/.yarn/cache/array-includes-npm-3.1.7-d32a5ee179-06f9e4598f.zip
new file mode 100644
index 0000000000..1f7fc2c577
Binary files /dev/null and b/.yarn/cache/array-includes-npm-3.1.7-d32a5ee179-06f9e4598f.zip differ
diff --git a/.yarn/cache/array-union-npm-2.1.0-4e4852b221-5bee12395c.zip b/.yarn/cache/array-union-npm-2.1.0-4e4852b221-5bee12395c.zip
deleted file mode 100644
index b51da2ed38..0000000000
Binary files a/.yarn/cache/array-union-npm-2.1.0-4e4852b221-5bee12395c.zip and /dev/null differ
diff --git a/.yarn/cache/array.prototype.findlastindex-npm-1.2.3-2a36f4417b-31f35d7b37.zip b/.yarn/cache/array.prototype.findlastindex-npm-1.2.3-2a36f4417b-31f35d7b37.zip
new file mode 100644
index 0000000000..8aaa4a956a
Binary files /dev/null and b/.yarn/cache/array.prototype.findlastindex-npm-1.2.3-2a36f4417b-31f35d7b37.zip differ
diff --git a/.yarn/cache/array.prototype.flat-npm-1.3.0-6c5c4292bd-2a652b3e8d.zip b/.yarn/cache/array.prototype.flat-npm-1.3.0-6c5c4292bd-2a652b3e8d.zip
deleted file mode 100644
index 66f81fb0ab..0000000000
Binary files a/.yarn/cache/array.prototype.flat-npm-1.3.0-6c5c4292bd-2a652b3e8d.zip and /dev/null differ
diff --git a/.yarn/cache/array.prototype.flat-npm-1.3.2-350729f7f4-5d6b4bf102.zip b/.yarn/cache/array.prototype.flat-npm-1.3.2-350729f7f4-5d6b4bf102.zip
new file mode 100644
index 0000000000..7720137d70
Binary files /dev/null and b/.yarn/cache/array.prototype.flat-npm-1.3.2-350729f7f4-5d6b4bf102.zip differ
diff --git a/.yarn/cache/array.prototype.flatmap-npm-1.3.2-5c6a4af226-ce09fe21dc.zip b/.yarn/cache/array.prototype.flatmap-npm-1.3.2-5c6a4af226-ce09fe21dc.zip
new file mode 100644
index 0000000000..2553a317f1
Binary files /dev/null and b/.yarn/cache/array.prototype.flatmap-npm-1.3.2-5c6a4af226-ce09fe21dc.zip differ
diff --git a/.yarn/cache/arraybuffer.prototype.slice-npm-1.0.2-4eda52ad8c-c200faf437.zip b/.yarn/cache/arraybuffer.prototype.slice-npm-1.0.2-4eda52ad8c-c200faf437.zip
new file mode 100644
index 0000000000..559e55f81a
Binary files /dev/null and b/.yarn/cache/arraybuffer.prototype.slice-npm-1.0.2-4eda52ad8c-c200faf437.zip differ
diff --git a/.yarn/cache/asn1-npm-0.2.6-bdd07356c4-39f2ae343b.zip b/.yarn/cache/asn1-npm-0.2.6-bdd07356c4-39f2ae343b.zip
deleted file mode 100644
index a6463962d7..0000000000
Binary files a/.yarn/cache/asn1-npm-0.2.6-bdd07356c4-39f2ae343b.zip and /dev/null differ
diff --git a/.yarn/cache/assert-plus-npm-1.0.0-cac95ef098-19b4340cb8.zip b/.yarn/cache/assert-plus-npm-1.0.0-cac95ef098-19b4340cb8.zip
deleted file mode 100644
index 30c557d687..0000000000
Binary files a/.yarn/cache/assert-plus-npm-1.0.0-cac95ef098-19b4340cb8.zip and /dev/null differ
diff --git a/.yarn/cache/astral-regex-npm-2.0.0-f30d866aab-876231688c.zip b/.yarn/cache/astral-regex-npm-2.0.0-f30d866aab-876231688c.zip
deleted file mode 100644
index 1af622c047..0000000000
Binary files a/.yarn/cache/astral-regex-npm-2.0.0-f30d866aab-876231688c.zip and /dev/null differ
diff --git a/.yarn/cache/async-npm-3.2.3-e9d6b79c88-c4bee57ab2.zip b/.yarn/cache/async-npm-3.2.3-e9d6b79c88-c4bee57ab2.zip
deleted file mode 100644
index 21eb18386d..0000000000
Binary files a/.yarn/cache/async-npm-3.2.3-e9d6b79c88-c4bee57ab2.zip and /dev/null differ
diff --git a/.yarn/cache/async-validator-npm-4.1.1-470b8d5b59-88590ab8ad.zip b/.yarn/cache/async-validator-npm-4.1.1-470b8d5b59-88590ab8ad.zip
deleted file mode 100644
index 71730f2e23..0000000000
Binary files a/.yarn/cache/async-validator-npm-4.1.1-470b8d5b59-88590ab8ad.zip and /dev/null differ
diff --git a/.yarn/cache/async-validator-npm-4.2.5-4d61110c66-3e3d891a2e.zip b/.yarn/cache/async-validator-npm-4.2.5-4d61110c66-3e3d891a2e.zip
new file mode 100644
index 0000000000..36bedd6286
Binary files /dev/null and b/.yarn/cache/async-validator-npm-4.2.5-4d61110c66-3e3d891a2e.zip differ
diff --git a/.yarn/cache/asynckit-npm-0.4.0-c718858525-7b78c451df.zip b/.yarn/cache/asynckit-npm-0.4.0-c718858525-7b78c451df.zip
deleted file mode 100644
index bb08c24f1b..0000000000
Binary files a/.yarn/cache/asynckit-npm-0.4.0-c718858525-7b78c451df.zip and /dev/null differ
diff --git a/.yarn/cache/at-least-node-npm-1.0.0-2b36e661fa-463e2f8e43.zip b/.yarn/cache/at-least-node-npm-1.0.0-2b36e661fa-463e2f8e43.zip
deleted file mode 100644
index bc549750e6..0000000000
Binary files a/.yarn/cache/at-least-node-npm-1.0.0-2b36e661fa-463e2f8e43.zip and /dev/null differ
diff --git a/.yarn/cache/available-typed-arrays-npm-1.0.5-88f321e4d3-20eb47b3ce.zip b/.yarn/cache/available-typed-arrays-npm-1.0.5-88f321e4d3-20eb47b3ce.zip
new file mode 100644
index 0000000000..62f8601d5b
Binary files /dev/null and b/.yarn/cache/available-typed-arrays-npm-1.0.5-88f321e4d3-20eb47b3ce.zip differ
diff --git a/.yarn/cache/aws-sign2-npm-0.7.0-656c6cb84d-b148b0bb07.zip b/.yarn/cache/aws-sign2-npm-0.7.0-656c6cb84d-b148b0bb07.zip
deleted file mode 100644
index 6d41947851..0000000000
Binary files a/.yarn/cache/aws-sign2-npm-0.7.0-656c6cb84d-b148b0bb07.zip and /dev/null differ
diff --git a/.yarn/cache/aws4-npm-1.11.0-283476ad94-5a00d045fd.zip b/.yarn/cache/aws4-npm-1.11.0-283476ad94-5a00d045fd.zip
deleted file mode 100644
index 41cb9dfbb6..0000000000
Binary files a/.yarn/cache/aws4-npm-1.11.0-283476ad94-5a00d045fd.zip and /dev/null differ
diff --git a/.yarn/cache/base64-js-npm-1.5.1-b2f7275641-669632eb37.zip b/.yarn/cache/base64-js-npm-1.5.1-b2f7275641-669632eb37.zip
deleted file mode 100644
index a49ec87ac2..0000000000
Binary files a/.yarn/cache/base64-js-npm-1.5.1-b2f7275641-669632eb37.zip and /dev/null differ
diff --git a/.yarn/cache/bcrypt-pbkdf-npm-1.0.2-80db8b16ed-4edfc9fe7d.zip b/.yarn/cache/bcrypt-pbkdf-npm-1.0.2-80db8b16ed-4edfc9fe7d.zip
deleted file mode 100644
index 75152520d6..0000000000
Binary files a/.yarn/cache/bcrypt-pbkdf-npm-1.0.2-80db8b16ed-4edfc9fe7d.zip and /dev/null differ
diff --git a/.yarn/cache/blob-util-npm-2.0.2-8026c830fe-d543e6b92e.zip b/.yarn/cache/blob-util-npm-2.0.2-8026c830fe-d543e6b92e.zip
deleted file mode 100644
index a750b13446..0000000000
Binary files a/.yarn/cache/blob-util-npm-2.0.2-8026c830fe-d543e6b92e.zip and /dev/null differ
diff --git a/.yarn/cache/bluebird-npm-3.7.2-6a54136ee3-869417503c.zip b/.yarn/cache/bluebird-npm-3.7.2-6a54136ee3-869417503c.zip
deleted file mode 100644
index f49f62c71b..0000000000
Binary files a/.yarn/cache/bluebird-npm-3.7.2-6a54136ee3-869417503c.zip and /dev/null differ
diff --git a/.yarn/cache/bootstrap-icons-npm-1.11.3-8d5387bef2-d5cdb90fe3.zip b/.yarn/cache/bootstrap-icons-npm-1.11.3-8d5387bef2-d5cdb90fe3.zip
new file mode 100644
index 0000000000..e20ab2ecb3
Binary files /dev/null and b/.yarn/cache/bootstrap-icons-npm-1.11.3-8d5387bef2-d5cdb90fe3.zip differ
diff --git a/.yarn/cache/bootstrap-icons-npm-1.9.1-69d14bd4a0-b388264719.zip b/.yarn/cache/bootstrap-icons-npm-1.9.1-69d14bd4a0-b388264719.zip
deleted file mode 100644
index 967f9533f6..0000000000
Binary files a/.yarn/cache/bootstrap-icons-npm-1.9.1-69d14bd4a0-b388264719.zip and /dev/null differ
diff --git a/.yarn/cache/bootstrap-npm-5.2.2-8effda7631-14e6df28fe.zip b/.yarn/cache/bootstrap-npm-5.2.2-8effda7631-14e6df28fe.zip
deleted file mode 100644
index de4f882766..0000000000
Binary files a/.yarn/cache/bootstrap-npm-5.2.2-8effda7631-14e6df28fe.zip and /dev/null differ
diff --git a/.yarn/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip b/.yarn/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip
new file mode 100644
index 0000000000..ca3961acc1
Binary files /dev/null and b/.yarn/cache/bootstrap-npm-5.3.3-da08e2f0fe-537b68db30.zip differ
diff --git a/.yarn/cache/browser-fs-access-npm-0.31.0-0e9a01c010-d1b6682415.zip b/.yarn/cache/browser-fs-access-npm-0.31.0-0e9a01c010-d1b6682415.zip
deleted file mode 100644
index 02f11f9674..0000000000
Binary files a/.yarn/cache/browser-fs-access-npm-0.31.0-0e9a01c010-d1b6682415.zip and /dev/null differ
diff --git a/.yarn/cache/browser-fs-access-npm-0.35.0-1577b5a7ba-5f3bf1ec17.zip b/.yarn/cache/browser-fs-access-npm-0.35.0-1577b5a7ba-5f3bf1ec17.zip
new file mode 100644
index 0000000000..2202ffed8e
Binary files /dev/null and b/.yarn/cache/browser-fs-access-npm-0.35.0-1577b5a7ba-5f3bf1ec17.zip differ
diff --git a/.yarn/cache/buffer-crc32-npm-0.2.13-c4b6fceac1-06252347ae.zip b/.yarn/cache/buffer-crc32-npm-0.2.13-c4b6fceac1-06252347ae.zip
deleted file mode 100644
index 96da9d8111..0000000000
Binary files a/.yarn/cache/buffer-crc32-npm-0.2.13-c4b6fceac1-06252347ae.zip and /dev/null differ
diff --git a/.yarn/cache/buffer-from-npm-1.1.2-03d2f20d7e-0448524a56.zip b/.yarn/cache/buffer-from-npm-1.1.2-03d2f20d7e-0448524a56.zip
deleted file mode 100644
index efe1b76380..0000000000
Binary files a/.yarn/cache/buffer-from-npm-1.1.2-03d2f20d7e-0448524a56.zip and /dev/null differ
diff --git a/.yarn/cache/buffer-npm-5.7.1-513ef8259e-e2cf8429e1.zip b/.yarn/cache/buffer-npm-5.7.1-513ef8259e-e2cf8429e1.zip
deleted file mode 100644
index 15c7810bc9..0000000000
Binary files a/.yarn/cache/buffer-npm-5.7.1-513ef8259e-e2cf8429e1.zip and /dev/null differ
diff --git a/.yarn/cache/builtin-modules-npm-3.3.0-db4f3d32de-db021755d7.zip b/.yarn/cache/builtin-modules-npm-3.3.0-db4f3d32de-db021755d7.zip
new file mode 100644
index 0000000000..c7e20444c6
Binary files /dev/null and b/.yarn/cache/builtin-modules-npm-3.3.0-db4f3d32de-db021755d7.zip differ
diff --git a/.yarn/cache/c8-npm-7.12.0-c808cac509-3b7fa9ad7c.zip b/.yarn/cache/c8-npm-7.12.0-c808cac509-3b7fa9ad7c.zip
deleted file mode 100644
index 4558e5b9f9..0000000000
Binary files a/.yarn/cache/c8-npm-7.12.0-c808cac509-3b7fa9ad7c.zip and /dev/null differ
diff --git a/.yarn/cache/c8-npm-9.1.0-92c3d37f46-c5249bf9c3.zip b/.yarn/cache/c8-npm-9.1.0-92c3d37f46-c5249bf9c3.zip
new file mode 100644
index 0000000000..1e5812b784
Binary files /dev/null and b/.yarn/cache/c8-npm-9.1.0-92c3d37f46-c5249bf9c3.zip differ
diff --git a/.yarn/cache/cachedir-npm-2.3.0-640dc16bbb-ec90cb0f2e.zip b/.yarn/cache/cachedir-npm-2.3.0-640dc16bbb-ec90cb0f2e.zip
deleted file mode 100644
index 016740008c..0000000000
Binary files a/.yarn/cache/cachedir-npm-2.3.0-640dc16bbb-ec90cb0f2e.zip and /dev/null differ
diff --git a/.yarn/cache/call-bind-npm-1.0.5-65600fae47-449e83ecbd.zip b/.yarn/cache/call-bind-npm-1.0.5-65600fae47-449e83ecbd.zip
new file mode 100644
index 0000000000..29854c129a
Binary files /dev/null and b/.yarn/cache/call-bind-npm-1.0.5-65600fae47-449e83ecbd.zip differ
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001340-5ba8569de6-5b419c93cb.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001340-5ba8569de6-5b419c93cb.zip
deleted file mode 100644
index a2d4de4449..0000000000
Binary files a/.yarn/cache/caniuse-lite-npm-1.0.30001340-5ba8569de6-5b419c93cb.zip and /dev/null differ
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001414-91010a4bbf-97210cfd15.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001414-91010a4bbf-97210cfd15.zip
deleted file mode 100644
index 3dd03a9c96..0000000000
Binary files a/.yarn/cache/caniuse-lite-npm-1.0.30001414-91010a4bbf-97210cfd15.zip and /dev/null differ
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001430-c181064805-15200fe265.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001430-c181064805-15200fe265.zip
new file mode 100644
index 0000000000..b219e6fd1b
Binary files /dev/null and b/.yarn/cache/caniuse-lite-npm-1.0.30001430-c181064805-15200fe265.zip differ
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001603-77af81f60b-e66e0d24b8.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001603-77af81f60b-e66e0d24b8.zip
new file mode 100644
index 0000000000..f3bd2d06bc
Binary files /dev/null and b/.yarn/cache/caniuse-lite-npm-1.0.30001603-77af81f60b-e66e0d24b8.zip differ
diff --git a/.yarn/cache/caseless-npm-0.12.0-e83bc5df83-b43bd4c440.zip b/.yarn/cache/caseless-npm-0.12.0-e83bc5df83-b43bd4c440.zip
deleted file mode 100644
index a12be75cdb..0000000000
Binary files a/.yarn/cache/caseless-npm-0.12.0-e83bc5df83-b43bd4c440.zip and /dev/null differ
diff --git a/.yarn/cache/check-more-types-npm-2.24.0-fa2e491b27-b09080ec34.zip b/.yarn/cache/check-more-types-npm-2.24.0-fa2e491b27-b09080ec34.zip
deleted file mode 100644
index 6f5e29aaa8..0000000000
Binary files a/.yarn/cache/check-more-types-npm-2.24.0-fa2e491b27-b09080ec34.zip and /dev/null differ
diff --git a/.yarn/cache/ci-info-npm-3.3.1-c80845db6d-244546317c.zip b/.yarn/cache/ci-info-npm-3.3.1-c80845db6d-244546317c.zip
deleted file mode 100644
index a4232b35f9..0000000000
Binary files a/.yarn/cache/ci-info-npm-3.3.1-c80845db6d-244546317c.zip and /dev/null differ
diff --git a/.yarn/cache/cli-cursor-npm-3.1.0-fee1e46b5e-2692784c6c.zip b/.yarn/cache/cli-cursor-npm-3.1.0-fee1e46b5e-2692784c6c.zip
deleted file mode 100644
index 2a8723c64e..0000000000
Binary files a/.yarn/cache/cli-cursor-npm-3.1.0-fee1e46b5e-2692784c6c.zip and /dev/null differ
diff --git a/.yarn/cache/cli-table3-npm-0.6.2-dff919b99d-2f82391698.zip b/.yarn/cache/cli-table3-npm-0.6.2-dff919b99d-2f82391698.zip
deleted file mode 100644
index d6059a7bfa..0000000000
Binary files a/.yarn/cache/cli-table3-npm-0.6.2-dff919b99d-2f82391698.zip and /dev/null differ
diff --git a/.yarn/cache/cli-truncate-npm-2.1.0-72184d3467-bf1e4e6195.zip b/.yarn/cache/cli-truncate-npm-2.1.0-72184d3467-bf1e4e6195.zip
deleted file mode 100644
index f8c20f3651..0000000000
Binary files a/.yarn/cache/cli-truncate-npm-2.1.0-72184d3467-bf1e4e6195.zip and /dev/null differ
diff --git a/.yarn/cache/cliui-npm-7.0.4-d6b8a9edb6-ce2e8f578a.zip b/.yarn/cache/cliui-npm-7.0.4-d6b8a9edb6-ce2e8f578a.zip
deleted file mode 100644
index 24f58564e4..0000000000
Binary files a/.yarn/cache/cliui-npm-7.0.4-d6b8a9edb6-ce2e8f578a.zip and /dev/null differ
diff --git a/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip b/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip
new file mode 100644
index 0000000000..a90643c5e5
Binary files /dev/null and b/.yarn/cache/cliui-npm-8.0.1-3b029092cf-79648b3b00.zip differ
diff --git a/.yarn/cache/colorette-npm-2.0.16-7b996485d7-cd55596a3a.zip b/.yarn/cache/colorette-npm-2.0.16-7b996485d7-cd55596a3a.zip
deleted file mode 100644
index 0d086dd378..0000000000
Binary files a/.yarn/cache/colorette-npm-2.0.16-7b996485d7-cd55596a3a.zip and /dev/null differ
diff --git a/.yarn/cache/combined-stream-npm-1.0.8-dc14d4a63a-49fa4aeb49.zip b/.yarn/cache/combined-stream-npm-1.0.8-dc14d4a63a-49fa4aeb49.zip
deleted file mode 100644
index 89c8caa0fd..0000000000
Binary files a/.yarn/cache/combined-stream-npm-1.0.8-dc14d4a63a-49fa4aeb49.zip and /dev/null differ
diff --git a/.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip b/.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip
deleted file mode 100644
index 6a14adf507..0000000000
Binary files a/.yarn/cache/commander-npm-2.20.3-d8dcbaa39b-ab8c07884e.zip and /dev/null differ
diff --git a/.yarn/cache/commander-npm-5.1.0-7e939e7832-0b7fec1712.zip b/.yarn/cache/commander-npm-5.1.0-7e939e7832-0b7fec1712.zip
deleted file mode 100644
index ceec307a3d..0000000000
Binary files a/.yarn/cache/commander-npm-5.1.0-7e939e7832-0b7fec1712.zip and /dev/null differ
diff --git a/.yarn/cache/common-tags-npm-1.8.2-2c30ba69b3-767a6255a8.zip b/.yarn/cache/common-tags-npm-1.8.2-2c30ba69b3-767a6255a8.zip
deleted file mode 100644
index 3b1eefb4c3..0000000000
Binary files a/.yarn/cache/common-tags-npm-1.8.2-2c30ba69b3-767a6255a8.zip and /dev/null differ
diff --git a/.yarn/cache/content-disposition-npm-0.5.4-2d93678616-afb9d545e2.zip b/.yarn/cache/content-disposition-npm-0.5.4-2d93678616-afb9d545e2.zip
deleted file mode 100644
index 5f9dc26d3d..0000000000
Binary files a/.yarn/cache/content-disposition-npm-0.5.4-2d93678616-afb9d545e2.zip and /dev/null differ
diff --git a/.yarn/cache/core-util-is-npm-1.0.2-9fc2b94dc3-7a4c925b49.zip b/.yarn/cache/core-util-is-npm-1.0.2-9fc2b94dc3-7a4c925b49.zip
deleted file mode 100644
index 00b0792a3b..0000000000
Binary files a/.yarn/cache/core-util-is-npm-1.0.2-9fc2b94dc3-7a4c925b49.zip and /dev/null differ
diff --git a/.yarn/cache/css-render-npm-0.15.12-ff93ab2bdd-80265c5055.zip b/.yarn/cache/css-render-npm-0.15.12-ff93ab2bdd-80265c5055.zip
new file mode 100644
index 0000000000..a23ef5e7b9
Binary files /dev/null and b/.yarn/cache/css-render-npm-0.15.12-ff93ab2bdd-80265c5055.zip differ
diff --git a/.yarn/cache/csstype-npm-2.6.20-7c929732a1-cb5d5ded49.zip b/.yarn/cache/csstype-npm-2.6.20-7c929732a1-cb5d5ded49.zip
deleted file mode 100644
index 59ddf4f69f..0000000000
Binary files a/.yarn/cache/csstype-npm-2.6.20-7c929732a1-cb5d5ded49.zip and /dev/null differ
diff --git a/.yarn/cache/csstype-npm-3.1.3-e9a1c85013-8db785cc92.zip b/.yarn/cache/csstype-npm-3.1.3-e9a1c85013-8db785cc92.zip
new file mode 100644
index 0000000000..9853f0cf0b
Binary files /dev/null and b/.yarn/cache/csstype-npm-3.1.3-e9a1c85013-8db785cc92.zip differ
diff --git a/.yarn/cache/cypress-npm-10.9.0-7807fe85fd-79e3dccbb8.zip b/.yarn/cache/cypress-npm-10.9.0-7807fe85fd-79e3dccbb8.zip
deleted file mode 100644
index 53ed3f6157..0000000000
Binary files a/.yarn/cache/cypress-npm-10.9.0-7807fe85fd-79e3dccbb8.zip and /dev/null differ
diff --git a/.yarn/cache/cypress-real-events-npm-1.7.1-6d5a866c0e-b31c2facfa.zip b/.yarn/cache/cypress-real-events-npm-1.7.1-6d5a866c0e-b31c2facfa.zip
deleted file mode 100644
index 3f5f427160..0000000000
Binary files a/.yarn/cache/cypress-real-events-npm-1.7.1-6d5a866c0e-b31c2facfa.zip and /dev/null differ
diff --git a/.yarn/cache/d3-npm-7.6.1-9545deaa85-af883cfeaf.zip b/.yarn/cache/d3-npm-7.6.1-9545deaa85-af883cfeaf.zip
deleted file mode 100644
index e42149bd4f..0000000000
Binary files a/.yarn/cache/d3-npm-7.6.1-9545deaa85-af883cfeaf.zip and /dev/null differ
diff --git a/.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip b/.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip
new file mode 100644
index 0000000000..e78ffffee5
Binary files /dev/null and b/.yarn/cache/d3-npm-7.9.0-d293821ce6-1c0e9135f1.zip differ
diff --git a/.yarn/cache/dashdash-npm-1.14.1-be8f10a286-3634c24957.zip b/.yarn/cache/dashdash-npm-1.14.1-be8f10a286-3634c24957.zip
deleted file mode 100644
index 108f90531a..0000000000
Binary files a/.yarn/cache/dashdash-npm-1.14.1-be8f10a286-3634c24957.zip and /dev/null differ
diff --git a/.yarn/cache/date-fns-npm-2.28.0-c19c5add1b-a0516b2e4f.zip b/.yarn/cache/date-fns-npm-2.28.0-c19c5add1b-a0516b2e4f.zip
deleted file mode 100644
index 1e88493b72..0000000000
Binary files a/.yarn/cache/date-fns-npm-2.28.0-c19c5add1b-a0516b2e4f.zip and /dev/null differ
diff --git a/.yarn/cache/date-fns-npm-2.30.0-895c790e0f-f7be015232.zip b/.yarn/cache/date-fns-npm-2.30.0-895c790e0f-f7be015232.zip
new file mode 100644
index 0000000000..f51ffd3ec9
Binary files /dev/null and b/.yarn/cache/date-fns-npm-2.30.0-895c790e0f-f7be015232.zip differ
diff --git a/.yarn/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip b/.yarn/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip
deleted file mode 100644
index 856e44240d..0000000000
Binary files a/.yarn/cache/date-fns-tz-npm-1.3.3-4b42de3dcf-52111dffb4.zip and /dev/null differ
diff --git a/.yarn/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip b/.yarn/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip
new file mode 100644
index 0000000000..337d3f2fd4
Binary files /dev/null and b/.yarn/cache/date-fns-tz-npm-2.0.0-9b7996f292-a6553603a9.zip differ
diff --git a/.yarn/cache/dayjs-npm-1.11.2-644b12fe04-78f8bd04a9.zip b/.yarn/cache/dayjs-npm-1.11.2-644b12fe04-78f8bd04a9.zip
deleted file mode 100644
index 9e09205510..0000000000
Binary files a/.yarn/cache/dayjs-npm-1.11.2-644b12fe04-78f8bd04a9.zip and /dev/null differ
diff --git a/.yarn/cache/deepmerge-npm-4.2.2-112165ced2-a8c43a1ed8.zip b/.yarn/cache/deepmerge-npm-4.2.2-112165ced2-a8c43a1ed8.zip
deleted file mode 100644
index 3e07a61c47..0000000000
Binary files a/.yarn/cache/deepmerge-npm-4.2.2-112165ced2-a8c43a1ed8.zip and /dev/null differ
diff --git a/.yarn/cache/deepmerge-npm-4.3.1-4f751a0844-2024c6a980.zip b/.yarn/cache/deepmerge-npm-4.3.1-4f751a0844-2024c6a980.zip
new file mode 100644
index 0000000000..93a5246287
Binary files /dev/null and b/.yarn/cache/deepmerge-npm-4.3.1-4f751a0844-2024c6a980.zip differ
diff --git a/.yarn/cache/define-data-property-npm-1.1.1-2b5156d112-a29855ad3f.zip b/.yarn/cache/define-data-property-npm-1.1.1-2b5156d112-a29855ad3f.zip
new file mode 100644
index 0000000000..75936e2374
Binary files /dev/null and b/.yarn/cache/define-data-property-npm-1.1.1-2b5156d112-a29855ad3f.zip differ
diff --git a/.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip b/.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip
new file mode 100644
index 0000000000..bcbfcf6e68
Binary files /dev/null and b/.yarn/cache/define-properties-npm-1.2.0-3547cd0fd2-e60aee6a19.zip differ
diff --git a/.yarn/cache/delayed-stream-npm-1.0.0-c5a4c4cc02-46fe6e83e2.zip b/.yarn/cache/delayed-stream-npm-1.0.0-c5a4c4cc02-46fe6e83e2.zip
deleted file mode 100644
index 71514340e4..0000000000
Binary files a/.yarn/cache/delayed-stream-npm-1.0.0-c5a4c4cc02-46fe6e83e2.zip and /dev/null differ
diff --git a/.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip b/.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip
new file mode 100644
index 0000000000..1db92146ba
Binary files /dev/null and b/.yarn/cache/detect-libc-npm-2.0.2-03afa59137-2b2cd3649b.zip differ
diff --git a/.yarn/cache/diff-sequences-npm-27.5.1-29338362fa-a00db5554c.zip b/.yarn/cache/diff-sequences-npm-27.5.1-29338362fa-a00db5554c.zip
deleted file mode 100644
index ddfadea458..0000000000
Binary files a/.yarn/cache/diff-sequences-npm-27.5.1-29338362fa-a00db5554c.zip and /dev/null differ
diff --git a/.yarn/cache/dir-glob-npm-3.0.1-1aea628b1b-fa05e18324.zip b/.yarn/cache/dir-glob-npm-3.0.1-1aea628b1b-fa05e18324.zip
deleted file mode 100644
index e292fec5bd..0000000000
Binary files a/.yarn/cache/dir-glob-npm-3.0.1-1aea628b1b-fa05e18324.zip and /dev/null differ
diff --git a/.yarn/cache/eastasianwidth-npm-0.2.0-c37eb16bd1-7d00d7cd8e.zip b/.yarn/cache/eastasianwidth-npm-0.2.0-c37eb16bd1-7d00d7cd8e.zip
new file mode 100644
index 0000000000..10385995a6
Binary files /dev/null and b/.yarn/cache/eastasianwidth-npm-0.2.0-c37eb16bd1-7d00d7cd8e.zip differ
diff --git a/.yarn/cache/ecc-jsbn-npm-0.1.2-85b7a7be89-22fef4b620.zip b/.yarn/cache/ecc-jsbn-npm-0.1.2-85b7a7be89-22fef4b620.zip
deleted file mode 100644
index 80e362ad73..0000000000
Binary files a/.yarn/cache/ecc-jsbn-npm-0.1.2-85b7a7be89-22fef4b620.zip and /dev/null differ
diff --git a/.yarn/cache/emoji-regex-npm-9.2.2-e6fac8d058-8487182da7.zip b/.yarn/cache/emoji-regex-npm-9.2.2-e6fac8d058-8487182da7.zip
new file mode 100644
index 0000000000..e6b0ab4d80
Binary files /dev/null and b/.yarn/cache/emoji-regex-npm-9.2.2-e6fac8d058-8487182da7.zip differ
diff --git a/.yarn/cache/end-of-stream-npm-1.4.4-497fc6dee1-530a5a5a1e.zip b/.yarn/cache/end-of-stream-npm-1.4.4-497fc6dee1-530a5a5a1e.zip
deleted file mode 100644
index fecd2286f2..0000000000
Binary files a/.yarn/cache/end-of-stream-npm-1.4.4-497fc6dee1-530a5a5a1e.zip and /dev/null differ
diff --git a/.yarn/cache/enquirer-npm-2.3.6-7899175762-1c0911e14a.zip b/.yarn/cache/enquirer-npm-2.3.6-7899175762-1c0911e14a.zip
deleted file mode 100644
index 22c981f2bc..0000000000
Binary files a/.yarn/cache/enquirer-npm-2.3.6-7899175762-1c0911e14a.zip and /dev/null differ
diff --git a/.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip b/.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip
new file mode 100644
index 0000000000..3772a4510c
Binary files /dev/null and b/.yarn/cache/entities-npm-4.5.0-7cdb83b832-853f8ebd5b.zip differ
diff --git a/.yarn/cache/es-abstract-npm-1.19.5-524a87d262-55199b0f17.zip b/.yarn/cache/es-abstract-npm-1.19.5-524a87d262-55199b0f17.zip
deleted file mode 100644
index 9c6cf6749b..0000000000
Binary files a/.yarn/cache/es-abstract-npm-1.19.5-524a87d262-55199b0f17.zip and /dev/null differ
diff --git a/.yarn/cache/es-abstract-npm-1.22.3-15a58832e5-b1bdc96285.zip b/.yarn/cache/es-abstract-npm-1.22.3-15a58832e5-b1bdc96285.zip
new file mode 100644
index 0000000000..f72f30d6f5
Binary files /dev/null and b/.yarn/cache/es-abstract-npm-1.22.3-15a58832e5-b1bdc96285.zip differ
diff --git a/.yarn/cache/es-set-tostringtag-npm-2.0.1-c87b5de872-ec416a1294.zip b/.yarn/cache/es-set-tostringtag-npm-2.0.1-c87b5de872-ec416a1294.zip
new file mode 100644
index 0000000000..af638f13cd
Binary files /dev/null and b/.yarn/cache/es-set-tostringtag-npm-2.0.1-c87b5de872-ec416a1294.zip differ
diff --git a/.yarn/cache/esbuild-darwin-64-npm-0.14.38-fee9a60d9b-8.zip b/.yarn/cache/esbuild-darwin-64-npm-0.14.38-fee9a60d9b-8.zip
deleted file mode 100644
index 41fc558ae2..0000000000
Binary files a/.yarn/cache/esbuild-darwin-64-npm-0.14.38-fee9a60d9b-8.zip and /dev/null differ
diff --git a/.yarn/cache/esbuild-darwin-arm64-npm-0.14.38-b37de966bb-8.zip b/.yarn/cache/esbuild-darwin-arm64-npm-0.14.38-b37de966bb-8.zip
deleted file mode 100644
index d991ac3858..0000000000
Binary files a/.yarn/cache/esbuild-darwin-arm64-npm-0.14.38-b37de966bb-8.zip and /dev/null differ
diff --git a/.yarn/cache/esbuild-linux-64-npm-0.14.38-c39b94428f-8.zip b/.yarn/cache/esbuild-linux-64-npm-0.14.38-c39b94428f-8.zip
deleted file mode 100644
index 17f433ffb1..0000000000
Binary files a/.yarn/cache/esbuild-linux-64-npm-0.14.38-c39b94428f-8.zip and /dev/null differ
diff --git a/.yarn/cache/esbuild-linux-arm64-npm-0.14.38-cef31fba53-8.zip b/.yarn/cache/esbuild-linux-arm64-npm-0.14.38-cef31fba53-8.zip
deleted file mode 100644
index 16e3d33968..0000000000
Binary files a/.yarn/cache/esbuild-linux-arm64-npm-0.14.38-cef31fba53-8.zip and /dev/null differ
diff --git a/.yarn/cache/esbuild-npm-0.14.38-04b78ffe2b-d7523a36bd.zip b/.yarn/cache/esbuild-npm-0.14.38-04b78ffe2b-d7523a36bd.zip
deleted file mode 100644
index 9487a6d5c5..0000000000
Binary files a/.yarn/cache/esbuild-npm-0.14.38-04b78ffe2b-d7523a36bd.zip and /dev/null differ
diff --git a/.yarn/cache/esbuild-npm-0.18.20-004a76d281-5d253614e5.zip b/.yarn/cache/esbuild-npm-0.18.20-004a76d281-5d253614e5.zip
new file mode 100644
index 0000000000..74931c9be3
Binary files /dev/null and b/.yarn/cache/esbuild-npm-0.18.20-004a76d281-5d253614e5.zip differ
diff --git a/.yarn/cache/esbuild-windows-64-npm-0.14.38-67094dd963-8.zip b/.yarn/cache/esbuild-windows-64-npm-0.14.38-67094dd963-8.zip
deleted file mode 100644
index 84dfc50bbb..0000000000
Binary files a/.yarn/cache/esbuild-windows-64-npm-0.14.38-67094dd963-8.zip and /dev/null differ
diff --git a/.yarn/cache/esbuild-windows-arm64-npm-0.14.38-9693d16298-8.zip b/.yarn/cache/esbuild-windows-arm64-npm-0.14.38-9693d16298-8.zip
deleted file mode 100644
index 9ad725f42e..0000000000
Binary files a/.yarn/cache/esbuild-windows-arm64-npm-0.14.38-9693d16298-8.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip b/.yarn/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip
new file mode 100644
index 0000000000..505e336b08
Binary files /dev/null and b/.yarn/cache/eslint-compat-utils-npm-0.1.2-361c6992b1-2315d9db81.zip differ
diff --git a/.yarn/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip b/.yarn/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip
deleted file mode 100644
index 0cb3ae760a..0000000000
Binary files a/.yarn/cache/eslint-config-standard-npm-17.0.0-2803f6a79a-dc0ed51e18.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip b/.yarn/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip
new file mode 100644
index 0000000000..1cc26fbd86
Binary files /dev/null and b/.yarn/cache/eslint-config-standard-npm-17.1.0-e72fd623cc-8ed14ffe42.zip differ
diff --git a/.yarn/cache/eslint-import-resolver-node-npm-0.3.6-d9426786c6-6266733af1.zip b/.yarn/cache/eslint-import-resolver-node-npm-0.3.6-d9426786c6-6266733af1.zip
deleted file mode 100644
index a4588dad43..0000000000
Binary files a/.yarn/cache/eslint-import-resolver-node-npm-0.3.6-d9426786c6-6266733af1.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-import-resolver-node-npm-0.3.9-2a426afc4b-439b912712.zip b/.yarn/cache/eslint-import-resolver-node-npm-0.3.9-2a426afc4b-439b912712.zip
new file mode 100644
index 0000000000..f2e17574bd
Binary files /dev/null and b/.yarn/cache/eslint-import-resolver-node-npm-0.3.9-2a426afc4b-439b912712.zip differ
diff --git a/.yarn/cache/eslint-module-utils-npm-2.7.3-ccd32fe6fd-77048263f3.zip b/.yarn/cache/eslint-module-utils-npm-2.7.3-ccd32fe6fd-77048263f3.zip
deleted file mode 100644
index 647dc49600..0000000000
Binary files a/.yarn/cache/eslint-module-utils-npm-2.7.3-ccd32fe6fd-77048263f3.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip b/.yarn/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip
new file mode 100644
index 0000000000..964bee4e4d
Binary files /dev/null and b/.yarn/cache/eslint-module-utils-npm-2.8.0-05e42bcab0-74c6dfea76.zip differ
diff --git a/.yarn/cache/eslint-npm-8.24.0-40a0bdeb6e-ca293ce711.zip b/.yarn/cache/eslint-npm-8.24.0-40a0bdeb6e-ca293ce711.zip
deleted file mode 100644
index f4ca6e8233..0000000000
Binary files a/.yarn/cache/eslint-npm-8.24.0-40a0bdeb6e-ca293ce711.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-npm-8.57.0-4286e12a3a-3a48d7ff85.zip b/.yarn/cache/eslint-npm-8.57.0-4286e12a3a-3a48d7ff85.zip
new file mode 100644
index 0000000000..73f8f9dff6
Binary files /dev/null and b/.yarn/cache/eslint-npm-8.57.0-4286e12a3a-3a48d7ff85.zip differ
diff --git a/.yarn/cache/eslint-plugin-cypress-npm-2.12.1-6681f582fa-1f1c36e149.zip b/.yarn/cache/eslint-plugin-cypress-npm-2.12.1-6681f582fa-1f1c36e149.zip
deleted file mode 100644
index 53d6f880de..0000000000
Binary files a/.yarn/cache/eslint-plugin-cypress-npm-2.12.1-6681f582fa-1f1c36e149.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip b/.yarn/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip
new file mode 100644
index 0000000000..13724ec234
Binary files /dev/null and b/.yarn/cache/eslint-plugin-cypress-npm-2.15.1-90f777d9bd-3e66fa9a94.zip differ
diff --git a/.yarn/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip b/.yarn/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip
new file mode 100644
index 0000000000..1d334e0a10
Binary files /dev/null and b/.yarn/cache/eslint-plugin-es-x-npm-7.5.0-77e84d6e5d-e770e57df7.zip differ
diff --git a/.yarn/cache/eslint-plugin-import-npm-2.26.0-959fe14a01-0bf77ad803.zip b/.yarn/cache/eslint-plugin-import-npm-2.26.0-959fe14a01-0bf77ad803.zip
deleted file mode 100644
index 62c5e22fd6..0000000000
Binary files a/.yarn/cache/eslint-plugin-import-npm-2.26.0-959fe14a01-0bf77ad803.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip b/.yarn/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip
new file mode 100644
index 0000000000..bc424a6a64
Binary files /dev/null and b/.yarn/cache/eslint-plugin-import-npm-2.29.1-b94305f7dc-e65159aef8.zip differ
diff --git a/.yarn/cache/eslint-plugin-n-npm-15.3.0-63b77d751e-a5a4c77880.zip b/.yarn/cache/eslint-plugin-n-npm-15.3.0-63b77d751e-a5a4c77880.zip
deleted file mode 100644
index fe7e019d24..0000000000
Binary files a/.yarn/cache/eslint-plugin-n-npm-15.3.0-63b77d751e-a5a4c77880.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip b/.yarn/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip
new file mode 100644
index 0000000000..9c7224993f
Binary files /dev/null and b/.yarn/cache/eslint-plugin-n-npm-16.6.2-77775852d0-3b468da003.zip differ
diff --git a/.yarn/cache/eslint-plugin-promise-npm-6.0.1-44f44fa21c-c1bb3c2e59.zip b/.yarn/cache/eslint-plugin-promise-npm-6.0.1-44f44fa21c-c1bb3c2e59.zip
deleted file mode 100644
index 554218df07..0000000000
Binary files a/.yarn/cache/eslint-plugin-promise-npm-6.0.1-44f44fa21c-c1bb3c2e59.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-plugin-promise-npm-6.1.1-8928fc7781-46b9a4f79d.zip b/.yarn/cache/eslint-plugin-promise-npm-6.1.1-8928fc7781-46b9a4f79d.zip
new file mode 100644
index 0000000000..15173dcf62
Binary files /dev/null and b/.yarn/cache/eslint-plugin-promise-npm-6.1.1-8928fc7781-46b9a4f79d.zip differ
diff --git a/.yarn/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip b/.yarn/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip
new file mode 100644
index 0000000000..285d11da2d
Binary files /dev/null and b/.yarn/cache/eslint-plugin-vue-npm-9.24.0-4c6dba51bf-2309b919d8.zip differ
diff --git a/.yarn/cache/eslint-plugin-vue-npm-9.5.1-71da965834-3643332871.zip b/.yarn/cache/eslint-plugin-vue-npm-9.5.1-71da965834-3643332871.zip
deleted file mode 100644
index 57f39a7ff3..0000000000
Binary files a/.yarn/cache/eslint-plugin-vue-npm-9.5.1-71da965834-3643332871.zip and /dev/null differ
diff --git a/.yarn/cache/eslint-scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip b/.yarn/cache/eslint-scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip
new file mode 100644
index 0000000000..29b002eb98
Binary files /dev/null and b/.yarn/cache/eslint-scope-npm-7.2.2-53cb0df8e8-ec97dbf5fb.zip differ
diff --git a/.yarn/cache/eslint-visitor-keys-npm-3.4.1-a5d0a58208-f05121d868.zip b/.yarn/cache/eslint-visitor-keys-npm-3.4.1-a5d0a58208-f05121d868.zip
new file mode 100644
index 0000000000..e442ca3b41
Binary files /dev/null and b/.yarn/cache/eslint-visitor-keys-npm-3.4.1-a5d0a58208-f05121d868.zip differ
diff --git a/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip b/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip
new file mode 100644
index 0000000000..7c61b814bf
Binary files /dev/null and b/.yarn/cache/eslint-visitor-keys-npm-3.4.3-a356ac7e46-36e9ef87fc.zip differ
diff --git a/.yarn/cache/espree-npm-9.4.0-0371ef3614-2e3020dde6.zip b/.yarn/cache/espree-npm-9.4.0-0371ef3614-2e3020dde6.zip
deleted file mode 100644
index 95a79f462f..0000000000
Binary files a/.yarn/cache/espree-npm-9.4.0-0371ef3614-2e3020dde6.zip and /dev/null differ
diff --git a/.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip b/.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip
new file mode 100644
index 0000000000..0014c0574a
Binary files /dev/null and b/.yarn/cache/espree-npm-9.6.1-a50722a5a9-eb8c149c7a.zip differ
diff --git a/.yarn/cache/esquery-npm-1.5.0-d8f8a06879-aefb0d2596.zip b/.yarn/cache/esquery-npm-1.5.0-d8f8a06879-aefb0d2596.zip
new file mode 100644
index 0000000000..6006b96052
Binary files /dev/null and b/.yarn/cache/esquery-npm-1.5.0-d8f8a06879-aefb0d2596.zip differ
diff --git a/.yarn/cache/eventemitter2-npm-6.4.7-ad2467adaa-1b36a77e13.zip b/.yarn/cache/eventemitter2-npm-6.4.7-ad2467adaa-1b36a77e13.zip
deleted file mode 100644
index 1e3458afb7..0000000000
Binary files a/.yarn/cache/eventemitter2-npm-6.4.7-ad2467adaa-1b36a77e13.zip and /dev/null differ
diff --git a/.yarn/cache/execa-npm-4.1.0-cc675b4189-e30d298934.zip b/.yarn/cache/execa-npm-4.1.0-cc675b4189-e30d298934.zip
deleted file mode 100644
index bffd898183..0000000000
Binary files a/.yarn/cache/execa-npm-4.1.0-cc675b4189-e30d298934.zip and /dev/null differ
diff --git a/.yarn/cache/executable-npm-4.1.1-c06d32cd1b-f01927ce59.zip b/.yarn/cache/executable-npm-4.1.1-c06d32cd1b-f01927ce59.zip
deleted file mode 100644
index 63ff61c87c..0000000000
Binary files a/.yarn/cache/executable-npm-4.1.1-c06d32cd1b-f01927ce59.zip and /dev/null differ
diff --git a/.yarn/cache/extend-npm-3.0.2-e1ca07ac54-a50a8309ca.zip b/.yarn/cache/extend-npm-3.0.2-e1ca07ac54-a50a8309ca.zip
deleted file mode 100644
index a33fb285f4..0000000000
Binary files a/.yarn/cache/extend-npm-3.0.2-e1ca07ac54-a50a8309ca.zip and /dev/null differ
diff --git a/.yarn/cache/extract-zip-npm-2.0.1-92a28e392b-8cbda9debd.zip b/.yarn/cache/extract-zip-npm-2.0.1-92a28e392b-8cbda9debd.zip
deleted file mode 100644
index 2169ae4912..0000000000
Binary files a/.yarn/cache/extract-zip-npm-2.0.1-92a28e392b-8cbda9debd.zip and /dev/null differ
diff --git a/.yarn/cache/extsprintf-npm-1.3.0-61a92b324c-cee7a4a1e3.zip b/.yarn/cache/extsprintf-npm-1.3.0-61a92b324c-cee7a4a1e3.zip
deleted file mode 100644
index e72ea1cf44..0000000000
Binary files a/.yarn/cache/extsprintf-npm-1.3.0-61a92b324c-cee7a4a1e3.zip and /dev/null differ
diff --git a/.yarn/cache/fast-glob-npm-3.2.11-bc01135fef-f473105324.zip b/.yarn/cache/fast-glob-npm-3.2.11-bc01135fef-f473105324.zip
deleted file mode 100644
index 2bd4bfc03a..0000000000
Binary files a/.yarn/cache/fast-glob-npm-3.2.11-bc01135fef-f473105324.zip and /dev/null differ
diff --git a/.yarn/cache/fd-slicer-npm-1.1.0-3cade0050a-c8585fd571.zip b/.yarn/cache/fd-slicer-npm-1.1.0-3cade0050a-c8585fd571.zip
deleted file mode 100644
index 13159628cb..0000000000
Binary files a/.yarn/cache/fd-slicer-npm-1.1.0-3cade0050a-c8585fd571.zip and /dev/null differ
diff --git a/.yarn/cache/figures-npm-3.2.0-85d357e955-85a6ad29e9.zip b/.yarn/cache/figures-npm-3.2.0-85d357e955-85a6ad29e9.zip
deleted file mode 100644
index eac0ef7226..0000000000
Binary files a/.yarn/cache/figures-npm-3.2.0-85d357e955-85a6ad29e9.zip and /dev/null differ
diff --git a/.yarn/cache/find-up-npm-2.1.0-9f6cb1765c-43284fe4da.zip b/.yarn/cache/find-up-npm-2.1.0-9f6cb1765c-43284fe4da.zip
deleted file mode 100644
index 6b2c2d9da4..0000000000
Binary files a/.yarn/cache/find-up-npm-2.1.0-9f6cb1765c-43284fe4da.zip and /dev/null differ
diff --git a/.yarn/cache/for-each-npm-0.3.3-0010ca8cdd-6c48ff2bc6.zip b/.yarn/cache/for-each-npm-0.3.3-0010ca8cdd-6c48ff2bc6.zip
new file mode 100644
index 0000000000..7ba7b1639b
Binary files /dev/null and b/.yarn/cache/for-each-npm-0.3.3-0010ca8cdd-6c48ff2bc6.zip differ
diff --git a/.yarn/cache/foreground-child-npm-2.0.0-80c976b61e-f77ec9aff6.zip b/.yarn/cache/foreground-child-npm-2.0.0-80c976b61e-f77ec9aff6.zip
deleted file mode 100644
index d947311d1e..0000000000
Binary files a/.yarn/cache/foreground-child-npm-2.0.0-80c976b61e-f77ec9aff6.zip and /dev/null differ
diff --git a/.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip b/.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip
new file mode 100644
index 0000000000..a288850fbb
Binary files /dev/null and b/.yarn/cache/foreground-child-npm-3.1.1-77e78ed774-139d270bc8.zip differ
diff --git a/.yarn/cache/forever-agent-npm-0.6.1-01dae53bf9-766ae6e220.zip b/.yarn/cache/forever-agent-npm-0.6.1-01dae53bf9-766ae6e220.zip
deleted file mode 100644
index 8250de6b49..0000000000
Binary files a/.yarn/cache/forever-agent-npm-0.6.1-01dae53bf9-766ae6e220.zip and /dev/null differ
diff --git a/.yarn/cache/form-data-npm-2.3.3-c016cc11c0-10c1780fa1.zip b/.yarn/cache/form-data-npm-2.3.3-c016cc11c0-10c1780fa1.zip
deleted file mode 100644
index 9e2c84d844..0000000000
Binary files a/.yarn/cache/form-data-npm-2.3.3-c016cc11c0-10c1780fa1.zip and /dev/null differ
diff --git a/.yarn/cache/fs-extra-npm-9.1.0-983c2ddb4c-ba71ba32e0.zip b/.yarn/cache/fs-extra-npm-9.1.0-983c2ddb4c-ba71ba32e0.zip
deleted file mode 100644
index 4a760ba0f6..0000000000
Binary files a/.yarn/cache/fs-extra-npm-9.1.0-983c2ddb4c-ba71ba32e0.zip and /dev/null differ
diff --git a/.yarn/cache/function-bind-npm-1.1.2-7a55be9b03-2b0ff4ce70.zip b/.yarn/cache/function-bind-npm-1.1.2-7a55be9b03-2b0ff4ce70.zip
new file mode 100644
index 0000000000..55fbdad3a3
Binary files /dev/null and b/.yarn/cache/function-bind-npm-1.1.2-7a55be9b03-2b0ff4ce70.zip differ
diff --git a/.yarn/cache/function.prototype.name-npm-1.1.6-fd3a6a5cdd-7a3f9bd98a.zip b/.yarn/cache/function.prototype.name-npm-1.1.6-fd3a6a5cdd-7a3f9bd98a.zip
new file mode 100644
index 0000000000..9c6ff345f9
Binary files /dev/null and b/.yarn/cache/function.prototype.name-npm-1.1.6-fd3a6a5cdd-7a3f9bd98a.zip differ
diff --git a/.yarn/cache/functions-have-names-npm-1.2.3-e5cf1e2208-c3f1f5ba20.zip b/.yarn/cache/functions-have-names-npm-1.2.3-e5cf1e2208-c3f1f5ba20.zip
new file mode 100644
index 0000000000..931661976f
Binary files /dev/null and b/.yarn/cache/functions-have-names-npm-1.2.3-e5cf1e2208-c3f1f5ba20.zip differ
diff --git a/.yarn/cache/get-intrinsic-npm-1.2.0-eb08ea9b1d-78fc0487b7.zip b/.yarn/cache/get-intrinsic-npm-1.2.0-eb08ea9b1d-78fc0487b7.zip
new file mode 100644
index 0000000000..2ed7c8918f
Binary files /dev/null and b/.yarn/cache/get-intrinsic-npm-1.2.0-eb08ea9b1d-78fc0487b7.zip differ
diff --git a/.yarn/cache/get-intrinsic-npm-1.2.1-ae857fd610-5b61d88552.zip b/.yarn/cache/get-intrinsic-npm-1.2.1-ae857fd610-5b61d88552.zip
new file mode 100644
index 0000000000..687f611165
Binary files /dev/null and b/.yarn/cache/get-intrinsic-npm-1.2.1-ae857fd610-5b61d88552.zip differ
diff --git a/.yarn/cache/get-intrinsic-npm-1.2.2-3f446d8847-447ff0724d.zip b/.yarn/cache/get-intrinsic-npm-1.2.2-3f446d8847-447ff0724d.zip
new file mode 100644
index 0000000000..510eb5f0ed
Binary files /dev/null and b/.yarn/cache/get-intrinsic-npm-1.2.2-3f446d8847-447ff0724d.zip differ
diff --git a/.yarn/cache/get-stream-npm-5.2.0-2cfd3b452b-8bc1a23174.zip b/.yarn/cache/get-stream-npm-5.2.0-2cfd3b452b-8bc1a23174.zip
deleted file mode 100644
index f5e0b29aa2..0000000000
Binary files a/.yarn/cache/get-stream-npm-5.2.0-2cfd3b452b-8bc1a23174.zip and /dev/null differ
diff --git a/.yarn/cache/get-tsconfig-npm-4.7.2-8fbccd9fcf-1723589032.zip b/.yarn/cache/get-tsconfig-npm-4.7.2-8fbccd9fcf-1723589032.zip
new file mode 100644
index 0000000000..6580ce4351
Binary files /dev/null and b/.yarn/cache/get-tsconfig-npm-4.7.2-8fbccd9fcf-1723589032.zip differ
diff --git a/.yarn/cache/getos-npm-3.2.1-620c03aa34-42fd78a66d.zip b/.yarn/cache/getos-npm-3.2.1-620c03aa34-42fd78a66d.zip
deleted file mode 100644
index ff87b0c5d2..0000000000
Binary files a/.yarn/cache/getos-npm-3.2.1-620c03aa34-42fd78a66d.zip and /dev/null differ
diff --git a/.yarn/cache/getpass-npm-0.1.7-519164a3be-ab18d55661.zip b/.yarn/cache/getpass-npm-0.1.7-519164a3be-ab18d55661.zip
deleted file mode 100644
index c0a0abf62c..0000000000
Binary files a/.yarn/cache/getpass-npm-0.1.7-519164a3be-ab18d55661.zip and /dev/null differ
diff --git a/.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip b/.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip
new file mode 100644
index 0000000000..f9f2284bf1
Binary files /dev/null and b/.yarn/cache/glob-npm-10.2.4-49f715fccc-29845faaa1.zip differ
diff --git a/.yarn/cache/global-dirs-npm-3.0.0-45faebeb68-953c17cf14.zip b/.yarn/cache/global-dirs-npm-3.0.0-45faebeb68-953c17cf14.zip
deleted file mode 100644
index 3f2995afe6..0000000000
Binary files a/.yarn/cache/global-dirs-npm-3.0.0-45faebeb68-953c17cf14.zip and /dev/null differ
diff --git a/.yarn/cache/globals-npm-11.12.0-1fa7f41a6c-67051a45ec.zip b/.yarn/cache/globals-npm-11.12.0-1fa7f41a6c-67051a45ec.zip
deleted file mode 100644
index 306b5aacad..0000000000
Binary files a/.yarn/cache/globals-npm-11.12.0-1fa7f41a6c-67051a45ec.zip and /dev/null differ
diff --git a/.yarn/cache/globals-npm-13.19.0-a63c75a2dd-a000dbd00b.zip b/.yarn/cache/globals-npm-13.19.0-a63c75a2dd-a000dbd00b.zip
new file mode 100755
index 0000000000..ab24c0d57c
Binary files /dev/null and b/.yarn/cache/globals-npm-13.19.0-a63c75a2dd-a000dbd00b.zip differ
diff --git a/.yarn/cache/globals-npm-13.21.0-c0829ce1cb-86c92ca8a0.zip b/.yarn/cache/globals-npm-13.21.0-c0829ce1cb-86c92ca8a0.zip
new file mode 100644
index 0000000000..597f67a92e
Binary files /dev/null and b/.yarn/cache/globals-npm-13.21.0-c0829ce1cb-86c92ca8a0.zip differ
diff --git a/.yarn/cache/globals-npm-13.24.0-cc7713139c-56066ef058.zip b/.yarn/cache/globals-npm-13.24.0-cc7713139c-56066ef058.zip
new file mode 100644
index 0000000000..c8cb0244af
Binary files /dev/null and b/.yarn/cache/globals-npm-13.24.0-cc7713139c-56066ef058.zip differ
diff --git a/.yarn/cache/globalthis-npm-1.0.3-96cd56020d-fbd7d760dc.zip b/.yarn/cache/globalthis-npm-1.0.3-96cd56020d-fbd7d760dc.zip
new file mode 100644
index 0000000000..b82d79dbac
Binary files /dev/null and b/.yarn/cache/globalthis-npm-1.0.3-96cd56020d-fbd7d760dc.zip differ
diff --git a/.yarn/cache/globby-npm-11.1.0-bdcdf20c71-b4be8885e0.zip b/.yarn/cache/globby-npm-11.1.0-bdcdf20c71-b4be8885e0.zip
deleted file mode 100644
index 8cd2b28583..0000000000
Binary files a/.yarn/cache/globby-npm-11.1.0-bdcdf20c71-b4be8885e0.zip and /dev/null differ
diff --git a/.yarn/cache/gopd-npm-1.0.1-10c1d0b534-a5ccfb8806.zip b/.yarn/cache/gopd-npm-1.0.1-10c1d0b534-a5ccfb8806.zip
new file mode 100644
index 0000000000..cafca67758
Binary files /dev/null and b/.yarn/cache/gopd-npm-1.0.1-10c1d0b534-a5ccfb8806.zip differ
diff --git a/.yarn/cache/grapheme-splitter-npm-1.0.4-648f2bf509-0c22ec54de.zip b/.yarn/cache/grapheme-splitter-npm-1.0.4-648f2bf509-0c22ec54de.zip
deleted file mode 100644
index 1eb26cc6a9..0000000000
Binary files a/.yarn/cache/grapheme-splitter-npm-1.0.4-648f2bf509-0c22ec54de.zip and /dev/null differ
diff --git a/.yarn/cache/graphemer-npm-1.4.0-0627732d35-bab8f0be9b.zip b/.yarn/cache/graphemer-npm-1.4.0-0627732d35-bab8f0be9b.zip
new file mode 100644
index 0000000000..e04f8d3724
Binary files /dev/null and b/.yarn/cache/graphemer-npm-1.4.0-0627732d35-bab8f0be9b.zip differ
diff --git a/.yarn/cache/has-proto-npm-1.0.1-631ea9d820-febc5b5b53.zip b/.yarn/cache/has-proto-npm-1.0.1-631ea9d820-febc5b5b53.zip
new file mode 100644
index 0000000000..78afc3de42
Binary files /dev/null and b/.yarn/cache/has-proto-npm-1.0.1-631ea9d820-febc5b5b53.zip differ
diff --git a/.yarn/cache/hasown-npm-2.0.0-78b794ceef-6151c75ca1.zip b/.yarn/cache/hasown-npm-2.0.0-78b794ceef-6151c75ca1.zip
new file mode 100644
index 0000000000..5454406288
Binary files /dev/null and b/.yarn/cache/hasown-npm-2.0.0-78b794ceef-6151c75ca1.zip differ
diff --git a/.yarn/cache/highcharts-npm-10.2.1-f359bb778a-86c63d6e88.zip b/.yarn/cache/highcharts-npm-10.2.1-f359bb778a-86c63d6e88.zip
deleted file mode 100644
index 7ac11e9a7f..0000000000
Binary files a/.yarn/cache/highcharts-npm-10.2.1-f359bb778a-86c63d6e88.zip and /dev/null differ
diff --git a/.yarn/cache/highcharts-npm-11.4.0-8a1f46b545-873e661914.zip b/.yarn/cache/highcharts-npm-11.4.0-8a1f46b545-873e661914.zip
new file mode 100644
index 0000000000..9c2f2df154
Binary files /dev/null and b/.yarn/cache/highcharts-npm-11.4.0-8a1f46b545-873e661914.zip differ
diff --git a/.yarn/cache/highlight.js-npm-11.5.1-0fb1167640-bff556101d.zip b/.yarn/cache/highlight.js-npm-11.5.1-0fb1167640-bff556101d.zip
deleted file mode 100644
index efbd98ed5d..0000000000
Binary files a/.yarn/cache/highlight.js-npm-11.5.1-0fb1167640-bff556101d.zip and /dev/null differ
diff --git a/.yarn/cache/highlight.js-npm-11.9.0-ec99f7b12f-4043d31c5d.zip b/.yarn/cache/highlight.js-npm-11.9.0-ec99f7b12f-4043d31c5d.zip
new file mode 100644
index 0000000000..7a740063fa
Binary files /dev/null and b/.yarn/cache/highlight.js-npm-11.9.0-ec99f7b12f-4043d31c5d.zip differ
diff --git a/.yarn/cache/html-validate-npm-7.5.0-ad3a30b92f-04d73c5173.zip b/.yarn/cache/html-validate-npm-7.5.0-ad3a30b92f-04d73c5173.zip
deleted file mode 100644
index fb22581d7e..0000000000
Binary files a/.yarn/cache/html-validate-npm-7.5.0-ad3a30b92f-04d73c5173.zip and /dev/null differ
diff --git a/.yarn/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip b/.yarn/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip
new file mode 100644
index 0000000000..b2f855af03
Binary files /dev/null and b/.yarn/cache/html-validate-npm-8.18.1-c5271a0fb9-53479bf75b.zip differ
diff --git a/.yarn/cache/http-cache-semantics-npm-4.1.0-860520a31f-974de94a81.zip b/.yarn/cache/http-cache-semantics-npm-4.1.0-860520a31f-974de94a81.zip
deleted file mode 100644
index ed85c1c4c7..0000000000
Binary files a/.yarn/cache/http-cache-semantics-npm-4.1.0-860520a31f-974de94a81.zip and /dev/null differ
diff --git a/.yarn/cache/http-cache-semantics-npm-4.1.1-1120131375-83ac0bc60b.zip b/.yarn/cache/http-cache-semantics-npm-4.1.1-1120131375-83ac0bc60b.zip
new file mode 100644
index 0000000000..19f1e0a201
Binary files /dev/null and b/.yarn/cache/http-cache-semantics-npm-4.1.1-1120131375-83ac0bc60b.zip differ
diff --git a/.yarn/cache/http-signature-npm-1.3.6-5b2eff4373-10be2af476.zip b/.yarn/cache/http-signature-npm-1.3.6-5b2eff4373-10be2af476.zip
deleted file mode 100644
index 44966300c2..0000000000
Binary files a/.yarn/cache/http-signature-npm-1.3.6-5b2eff4373-10be2af476.zip and /dev/null differ
diff --git a/.yarn/cache/human-signals-npm-1.1.1-616b2586c2-d587647c9e.zip b/.yarn/cache/human-signals-npm-1.1.1-616b2586c2-d587647c9e.zip
deleted file mode 100644
index 1dcc5877fe..0000000000
Binary files a/.yarn/cache/human-signals-npm-1.1.1-616b2586c2-d587647c9e.zip and /dev/null differ
diff --git a/.yarn/cache/ical.js-npm-1.5.0-5ba1c69420-51df7a01f4.zip b/.yarn/cache/ical.js-npm-1.5.0-5ba1c69420-51df7a01f4.zip
new file mode 100644
index 0000000000..7aa64acf00
Binary files /dev/null and b/.yarn/cache/ical.js-npm-1.5.0-5ba1c69420-51df7a01f4.zip differ
diff --git a/.yarn/cache/ieee754-npm-1.2.1-fb63b3caeb-5144c0c981.zip b/.yarn/cache/ieee754-npm-1.2.1-fb63b3caeb-5144c0c981.zip
deleted file mode 100644
index 74128ad8f2..0000000000
Binary files a/.yarn/cache/ieee754-npm-1.2.1-fb63b3caeb-5144c0c981.zip and /dev/null differ
diff --git a/.yarn/cache/ignore-npm-5.2.4-fbe6e989e5-3d4c309c60.zip b/.yarn/cache/ignore-npm-5.2.4-fbe6e989e5-3d4c309c60.zip
new file mode 100644
index 0000000000..50627d8e10
Binary files /dev/null and b/.yarn/cache/ignore-npm-5.2.4-fbe6e989e5-3d4c309c60.zip differ
diff --git a/.yarn/cache/ignore-npm-5.3.1-f6947c5df7-71d7bb4c1d.zip b/.yarn/cache/ignore-npm-5.3.1-f6947c5df7-71d7bb4c1d.zip
new file mode 100644
index 0000000000..75ba53a270
Binary files /dev/null and b/.yarn/cache/ignore-npm-5.3.1-f6947c5df7-71d7bb4c1d.zip differ
diff --git a/.yarn/cache/image-size-npm-1.0.2-ed5424d843-01745fdb47.zip b/.yarn/cache/image-size-npm-1.0.2-ed5424d843-01745fdb47.zip
deleted file mode 100644
index a50468605f..0000000000
Binary files a/.yarn/cache/image-size-npm-1.0.2-ed5424d843-01745fdb47.zip and /dev/null differ
diff --git a/.yarn/cache/ini-npm-2.0.0-28f7426761-e7aadc5fb2.zip b/.yarn/cache/ini-npm-2.0.0-28f7426761-e7aadc5fb2.zip
deleted file mode 100644
index 377051d248..0000000000
Binary files a/.yarn/cache/ini-npm-2.0.0-28f7426761-e7aadc5fb2.zip and /dev/null differ
diff --git a/.yarn/cache/internal-slot-npm-1.0.3-9e05eea002-1944f92e98.zip b/.yarn/cache/internal-slot-npm-1.0.3-9e05eea002-1944f92e98.zip
deleted file mode 100644
index 18c6edaa91..0000000000
Binary files a/.yarn/cache/internal-slot-npm-1.0.3-9e05eea002-1944f92e98.zip and /dev/null differ
diff --git a/.yarn/cache/internal-slot-npm-1.0.5-a2241f3e66-97e84046bf.zip b/.yarn/cache/internal-slot-npm-1.0.5-a2241f3e66-97e84046bf.zip
new file mode 100644
index 0000000000..18fccd3ac2
Binary files /dev/null and b/.yarn/cache/internal-slot-npm-1.0.5-a2241f3e66-97e84046bf.zip differ
diff --git a/.yarn/cache/is-array-buffer-npm-3.0.1-3e93b14326-f26ab87448.zip b/.yarn/cache/is-array-buffer-npm-3.0.1-3e93b14326-f26ab87448.zip
new file mode 100644
index 0000000000..4fb5eb3634
Binary files /dev/null and b/.yarn/cache/is-array-buffer-npm-3.0.1-3e93b14326-f26ab87448.zip differ
diff --git a/.yarn/cache/is-array-buffer-npm-3.0.2-0dec897785-dcac9dda66.zip b/.yarn/cache/is-array-buffer-npm-3.0.2-0dec897785-dcac9dda66.zip
new file mode 100644
index 0000000000..7556381d45
Binary files /dev/null and b/.yarn/cache/is-array-buffer-npm-3.0.2-0dec897785-dcac9dda66.zip differ
diff --git a/.yarn/cache/is-builtin-module-npm-3.2.1-2f92a5d353-e8f0ffc19a.zip b/.yarn/cache/is-builtin-module-npm-3.2.1-2f92a5d353-e8f0ffc19a.zip
new file mode 100644
index 0000000000..be908976b5
Binary files /dev/null and b/.yarn/cache/is-builtin-module-npm-3.2.1-2f92a5d353-e8f0ffc19a.zip differ
diff --git a/.yarn/cache/is-callable-npm-1.2.7-808a303e61-61fd57d03b.zip b/.yarn/cache/is-callable-npm-1.2.7-808a303e61-61fd57d03b.zip
new file mode 100644
index 0000000000..0e383ae51f
Binary files /dev/null and b/.yarn/cache/is-callable-npm-1.2.7-808a303e61-61fd57d03b.zip differ
diff --git a/.yarn/cache/is-ci-npm-3.0.1-d9aea361e1-192c66dc78.zip b/.yarn/cache/is-ci-npm-3.0.1-d9aea361e1-192c66dc78.zip
deleted file mode 100644
index 6e9e3af364..0000000000
Binary files a/.yarn/cache/is-ci-npm-3.0.1-d9aea361e1-192c66dc78.zip and /dev/null differ
diff --git a/.yarn/cache/is-core-module-npm-2.10.0-6dff9310aa-0f3f77811f.zip b/.yarn/cache/is-core-module-npm-2.10.0-6dff9310aa-0f3f77811f.zip
deleted file mode 100644
index 42dc0c31eb..0000000000
Binary files a/.yarn/cache/is-core-module-npm-2.10.0-6dff9310aa-0f3f77811f.zip and /dev/null differ
diff --git a/.yarn/cache/is-core-module-npm-2.12.1-ce74e89160-f04ea30533.zip b/.yarn/cache/is-core-module-npm-2.12.1-ce74e89160-f04ea30533.zip
new file mode 100644
index 0000000000..9512b2ef2b
Binary files /dev/null and b/.yarn/cache/is-core-module-npm-2.12.1-ce74e89160-f04ea30533.zip differ
diff --git a/.yarn/cache/is-core-module-npm-2.13.0-e444c50225-053ab101fb.zip b/.yarn/cache/is-core-module-npm-2.13.0-e444c50225-053ab101fb.zip
new file mode 100644
index 0000000000..636775cb5e
Binary files /dev/null and b/.yarn/cache/is-core-module-npm-2.13.0-e444c50225-053ab101fb.zip differ
diff --git a/.yarn/cache/is-core-module-npm-2.13.1-36e17434f9-256559ee8a.zip b/.yarn/cache/is-core-module-npm-2.13.1-36e17434f9-256559ee8a.zip
new file mode 100644
index 0000000000..897f505685
Binary files /dev/null and b/.yarn/cache/is-core-module-npm-2.13.1-36e17434f9-256559ee8a.zip differ
diff --git a/.yarn/cache/is-installed-globally-npm-0.4.0-a30dd056c7-3359840d59.zip b/.yarn/cache/is-installed-globally-npm-0.4.0-a30dd056c7-3359840d59.zip
deleted file mode 100644
index f94dbc064b..0000000000
Binary files a/.yarn/cache/is-installed-globally-npm-0.4.0-a30dd056c7-3359840d59.zip and /dev/null differ
diff --git a/.yarn/cache/is-stream-npm-2.0.1-c802db55e7-b8e05ccdf9.zip b/.yarn/cache/is-stream-npm-2.0.1-c802db55e7-b8e05ccdf9.zip
deleted file mode 100644
index c5699a4eeb..0000000000
Binary files a/.yarn/cache/is-stream-npm-2.0.1-c802db55e7-b8e05ccdf9.zip and /dev/null differ
diff --git a/.yarn/cache/is-typed-array-npm-1.1.10-fe4ef83cdc-aac6ecb59d.zip b/.yarn/cache/is-typed-array-npm-1.1.10-fe4ef83cdc-aac6ecb59d.zip
new file mode 100644
index 0000000000..b3a4495f94
Binary files /dev/null and b/.yarn/cache/is-typed-array-npm-1.1.10-fe4ef83cdc-aac6ecb59d.zip differ
diff --git a/.yarn/cache/is-typed-array-npm-1.1.12-6135c91b1a-4c89c4a3be.zip b/.yarn/cache/is-typed-array-npm-1.1.12-6135c91b1a-4c89c4a3be.zip
new file mode 100644
index 0000000000..4a35c2e95f
Binary files /dev/null and b/.yarn/cache/is-typed-array-npm-1.1.12-6135c91b1a-4c89c4a3be.zip differ
diff --git a/.yarn/cache/is-typedarray-npm-1.0.0-bbd99de5b6-3508c6cd0a.zip b/.yarn/cache/is-typedarray-npm-1.0.0-bbd99de5b6-3508c6cd0a.zip
deleted file mode 100644
index 09d0014a47..0000000000
Binary files a/.yarn/cache/is-typedarray-npm-1.0.0-bbd99de5b6-3508c6cd0a.zip and /dev/null differ
diff --git a/.yarn/cache/is-unicode-supported-npm-0.1.0-0833e1bbfb-a2aab86ee7.zip b/.yarn/cache/is-unicode-supported-npm-0.1.0-0833e1bbfb-a2aab86ee7.zip
deleted file mode 100644
index 7425daa366..0000000000
Binary files a/.yarn/cache/is-unicode-supported-npm-0.1.0-0833e1bbfb-a2aab86ee7.zip and /dev/null differ
diff --git a/.yarn/cache/isarray-npm-2.0.5-4ba522212d-bd5bbe4104.zip b/.yarn/cache/isarray-npm-2.0.5-4ba522212d-bd5bbe4104.zip
new file mode 100644
index 0000000000..f46224f1cc
Binary files /dev/null and b/.yarn/cache/isarray-npm-2.0.5-4ba522212d-bd5bbe4104.zip differ
diff --git a/.yarn/cache/isbinaryfile-npm-4.0.10-91d1251522-a6b28db7e2.zip b/.yarn/cache/isbinaryfile-npm-4.0.10-91d1251522-a6b28db7e2.zip
new file mode 100644
index 0000000000..33eb2b8444
Binary files /dev/null and b/.yarn/cache/isbinaryfile-npm-4.0.10-91d1251522-a6b28db7e2.zip differ
diff --git a/.yarn/cache/isstream-npm-0.1.2-8581c75385-1eb2fe63a7.zip b/.yarn/cache/isstream-npm-0.1.2-8581c75385-1eb2fe63a7.zip
deleted file mode 100644
index 7c1a1e1718..0000000000
Binary files a/.yarn/cache/isstream-npm-0.1.2-8581c75385-1eb2fe63a7.zip and /dev/null differ
diff --git a/.yarn/cache/istanbul-lib-report-npm-3.0.1-b17446ab24-fd17a1b879.zip b/.yarn/cache/istanbul-lib-report-npm-3.0.1-b17446ab24-fd17a1b879.zip
new file mode 100644
index 0000000000..b946848afd
Binary files /dev/null and b/.yarn/cache/istanbul-lib-report-npm-3.0.1-b17446ab24-fd17a1b879.zip differ
diff --git a/.yarn/cache/istanbul-reports-npm-3.1.4-5faaa9636c-2132983355.zip b/.yarn/cache/istanbul-reports-npm-3.1.4-5faaa9636c-2132983355.zip
deleted file mode 100644
index c9a9a9c949..0000000000
Binary files a/.yarn/cache/istanbul-reports-npm-3.1.4-5faaa9636c-2132983355.zip and /dev/null differ
diff --git a/.yarn/cache/istanbul-reports-npm-3.1.6-66918eb97f-44c4c0582f.zip b/.yarn/cache/istanbul-reports-npm-3.1.6-66918eb97f-44c4c0582f.zip
new file mode 100644
index 0000000000..4a337c3397
Binary files /dev/null and b/.yarn/cache/istanbul-reports-npm-3.1.6-66918eb97f-44c4c0582f.zip differ
diff --git a/.yarn/cache/jackspeak-npm-2.2.0-5383861524-d8cd5be4f0.zip b/.yarn/cache/jackspeak-npm-2.2.0-5383861524-d8cd5be4f0.zip
new file mode 100644
index 0000000000..224a2f61a9
Binary files /dev/null and b/.yarn/cache/jackspeak-npm-2.2.0-5383861524-d8cd5be4f0.zip differ
diff --git a/.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip b/.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip
deleted file mode 100644
index de55e34a9c..0000000000
Binary files a/.yarn/cache/jest-diff-npm-27.5.1-818e549196-8be27c1e1e.zip and /dev/null differ
diff --git a/.yarn/cache/jest-get-type-npm-27.5.1-980fbf7a43-63064ab701.zip b/.yarn/cache/jest-get-type-npm-27.5.1-980fbf7a43-63064ab701.zip
deleted file mode 100644
index 50167f4d8d..0000000000
Binary files a/.yarn/cache/jest-get-type-npm-27.5.1-980fbf7a43-63064ab701.zip and /dev/null differ
diff --git a/.yarn/cache/jest-matcher-utils-npm-27.5.1-0c47b071fb-bb2135fc48.zip b/.yarn/cache/jest-matcher-utils-npm-27.5.1-0c47b071fb-bb2135fc48.zip
deleted file mode 100644
index f4bc56be0f..0000000000
Binary files a/.yarn/cache/jest-matcher-utils-npm-27.5.1-0c47b071fb-bb2135fc48.zip and /dev/null differ
diff --git a/.yarn/cache/jquery-migrate-npm-3.4.0-88c209e61f-7431685c56.zip b/.yarn/cache/jquery-migrate-npm-3.4.0-88c209e61f-7431685c56.zip
deleted file mode 100644
index 04eb1cbaab..0000000000
Binary files a/.yarn/cache/jquery-migrate-npm-3.4.0-88c209e61f-7431685c56.zip and /dev/null differ
diff --git a/.yarn/cache/jquery-migrate-npm-3.4.1-c842b6adb7-d2cb17d055.zip b/.yarn/cache/jquery-migrate-npm-3.4.1-c842b6adb7-d2cb17d055.zip
new file mode 100644
index 0000000000..b59ac0e1a3
Binary files /dev/null and b/.yarn/cache/jquery-migrate-npm-3.4.1-c842b6adb7-d2cb17d055.zip differ
diff --git a/.yarn/cache/jquery-npm-3.6.0-ca7872bdbb-8fd5fef4aa.zip b/.yarn/cache/jquery-npm-3.6.0-ca7872bdbb-8fd5fef4aa.zip
deleted file mode 100644
index 2c23cc857b..0000000000
Binary files a/.yarn/cache/jquery-npm-3.6.0-ca7872bdbb-8fd5fef4aa.zip and /dev/null differ
diff --git a/.yarn/cache/jquery-npm-3.6.1-6f29087f48-6177d866a7.zip b/.yarn/cache/jquery-npm-3.6.1-6f29087f48-6177d866a7.zip
deleted file mode 100644
index 3ace5cee52..0000000000
Binary files a/.yarn/cache/jquery-npm-3.6.1-6f29087f48-6177d866a7.zip and /dev/null differ
diff --git a/.yarn/cache/jquery-npm-3.7.1-eeeac0f21e-4370b8139d.zip b/.yarn/cache/jquery-npm-3.7.1-eeeac0f21e-4370b8139d.zip
new file mode 100644
index 0000000000..dda19f270f
Binary files /dev/null and b/.yarn/cache/jquery-npm-3.7.1-eeeac0f21e-4370b8139d.zip differ
diff --git a/.yarn/cache/jquery-ui-dist-npm-1.13.2-86225c0ce7-4f3a3a2ff8.zip b/.yarn/cache/jquery-ui-dist-npm-1.13.2-86225c0ce7-4f3a3a2ff8.zip
deleted file mode 100644
index 61d92e7f7b..0000000000
Binary files a/.yarn/cache/jquery-ui-dist-npm-1.13.2-86225c0ce7-4f3a3a2ff8.zip and /dev/null differ
diff --git a/.yarn/cache/js-cookie-npm-3.0.1-04c7177de1-bb48de67e2.zip b/.yarn/cache/js-cookie-npm-3.0.1-04c7177de1-bb48de67e2.zip
deleted file mode 100644
index 3c0bf5db17..0000000000
Binary files a/.yarn/cache/js-cookie-npm-3.0.1-04c7177de1-bb48de67e2.zip and /dev/null differ
diff --git a/.yarn/cache/js-cookie-npm-3.0.5-8fc8fcc9b4-2dbd2809c6.zip b/.yarn/cache/js-cookie-npm-3.0.5-8fc8fcc9b4-2dbd2809c6.zip
new file mode 100644
index 0000000000..a8eacc4b1a
Binary files /dev/null and b/.yarn/cache/js-cookie-npm-3.0.5-8fc8fcc9b4-2dbd2809c6.zip differ
diff --git a/.yarn/cache/js-sdsl-npm-4.1.5-66fcf4f580-695f657ddc.zip b/.yarn/cache/js-sdsl-npm-4.1.5-66fcf4f580-695f657ddc.zip
deleted file mode 100644
index c581e91e64..0000000000
Binary files a/.yarn/cache/js-sdsl-npm-4.1.5-66fcf4f580-695f657ddc.zip and /dev/null differ
diff --git a/.yarn/cache/jsbn-npm-0.1.1-0eb7132404-e5ff29c1b8.zip b/.yarn/cache/jsbn-npm-0.1.1-0eb7132404-e5ff29c1b8.zip
deleted file mode 100644
index 8ec54a26c5..0000000000
Binary files a/.yarn/cache/jsbn-npm-0.1.1-0eb7132404-e5ff29c1b8.zip and /dev/null differ
diff --git a/.yarn/cache/json-schema-npm-0.4.0-e776313070-66389434c3.zip b/.yarn/cache/json-schema-npm-0.4.0-e776313070-66389434c3.zip
deleted file mode 100644
index 1946e3075a..0000000000
Binary files a/.yarn/cache/json-schema-npm-0.4.0-e776313070-66389434c3.zip and /dev/null differ
diff --git a/.yarn/cache/json-stringify-safe-npm-5.0.1-064ddd6ab4-48ec0adad5.zip b/.yarn/cache/json-stringify-safe-npm-5.0.1-064ddd6ab4-48ec0adad5.zip
deleted file mode 100644
index bda01edf7c..0000000000
Binary files a/.yarn/cache/json-stringify-safe-npm-5.0.1-064ddd6ab4-48ec0adad5.zip and /dev/null differ
diff --git a/.yarn/cache/json5-npm-1.0.1-647fc8794b-e76ea23dbb.zip b/.yarn/cache/json5-npm-1.0.1-647fc8794b-e76ea23dbb.zip
deleted file mode 100644
index cc70df5220..0000000000
Binary files a/.yarn/cache/json5-npm-1.0.1-647fc8794b-e76ea23dbb.zip and /dev/null differ
diff --git a/.yarn/cache/json5-npm-1.0.2-9607f93e30-866458a8c5.zip b/.yarn/cache/json5-npm-1.0.2-9607f93e30-866458a8c5.zip
new file mode 100644
index 0000000000..aa52eb0458
Binary files /dev/null and b/.yarn/cache/json5-npm-1.0.2-9607f93e30-866458a8c5.zip differ
diff --git a/.yarn/cache/jsonfile-npm-6.1.0-20a4796cee-7af3b8e1ac.zip b/.yarn/cache/jsonfile-npm-6.1.0-20a4796cee-7af3b8e1ac.zip
deleted file mode 100644
index eaf6e09e67..0000000000
Binary files a/.yarn/cache/jsonfile-npm-6.1.0-20a4796cee-7af3b8e1ac.zip and /dev/null differ
diff --git a/.yarn/cache/jsprim-npm-2.0.2-8c40f3719c-d175f6b199.zip b/.yarn/cache/jsprim-npm-2.0.2-8c40f3719c-d175f6b199.zip
deleted file mode 100644
index 6a0140011f..0000000000
Binary files a/.yarn/cache/jsprim-npm-2.0.2-8c40f3719c-d175f6b199.zip and /dev/null differ
diff --git a/.yarn/cache/lazy-ass-npm-1.6.0-5cda93b8cb-5a3ebb1791.zip b/.yarn/cache/lazy-ass-npm-1.6.0-5cda93b8cb-5a3ebb1791.zip
deleted file mode 100644
index 8c28def5d3..0000000000
Binary files a/.yarn/cache/lazy-ass-npm-1.6.0-5cda93b8cb-5a3ebb1791.zip and /dev/null differ
diff --git a/.yarn/cache/lightningcss-darwin-arm64-npm-1.17.1-a84f0d052c-8.zip b/.yarn/cache/lightningcss-darwin-arm64-npm-1.17.1-a84f0d052c-8.zip
new file mode 100644
index 0000000000..dfd4d7360f
Binary files /dev/null and b/.yarn/cache/lightningcss-darwin-arm64-npm-1.17.1-a84f0d052c-8.zip differ
diff --git a/.yarn/cache/lightningcss-darwin-x64-npm-1.17.1-131957b733-8.zip b/.yarn/cache/lightningcss-darwin-x64-npm-1.17.1-131957b733-8.zip
new file mode 100644
index 0000000000..b91f791ace
Binary files /dev/null and b/.yarn/cache/lightningcss-darwin-x64-npm-1.17.1-131957b733-8.zip differ
diff --git a/.yarn/cache/lightningcss-linux-arm64-gnu-npm-1.17.1-5b0e0aecb4-8.zip b/.yarn/cache/lightningcss-linux-arm64-gnu-npm-1.17.1-5b0e0aecb4-8.zip
new file mode 100644
index 0000000000..d19b0a5749
Binary files /dev/null and b/.yarn/cache/lightningcss-linux-arm64-gnu-npm-1.17.1-5b0e0aecb4-8.zip differ
diff --git a/.yarn/cache/lightningcss-linux-x64-gnu-npm-1.17.1-39d6988913-8.zip b/.yarn/cache/lightningcss-linux-x64-gnu-npm-1.17.1-39d6988913-8.zip
new file mode 100644
index 0000000000..b517903671
Binary files /dev/null and b/.yarn/cache/lightningcss-linux-x64-gnu-npm-1.17.1-39d6988913-8.zip differ
diff --git a/.yarn/cache/lightningcss-npm-1.17.1-7428f2d516-0bf9d5c932.zip b/.yarn/cache/lightningcss-npm-1.17.1-7428f2d516-0bf9d5c932.zip
new file mode 100644
index 0000000000..0c9e0adc53
Binary files /dev/null and b/.yarn/cache/lightningcss-npm-1.17.1-7428f2d516-0bf9d5c932.zip differ
diff --git a/.yarn/cache/lightningcss-win32-x64-msvc-npm-1.17.1-849d8d151b-8.zip b/.yarn/cache/lightningcss-win32-x64-msvc-npm-1.17.1-849d8d151b-8.zip
new file mode 100644
index 0000000000..4a9444797f
Binary files /dev/null and b/.yarn/cache/lightningcss-win32-x64-msvc-npm-1.17.1-849d8d151b-8.zip differ
diff --git a/.yarn/cache/listr2-npm-3.14.0-446f504112-fdb8b2d6bd.zip b/.yarn/cache/listr2-npm-3.14.0-446f504112-fdb8b2d6bd.zip
deleted file mode 100644
index b78302771a..0000000000
Binary files a/.yarn/cache/listr2-npm-3.14.0-446f504112-fdb8b2d6bd.zip and /dev/null differ
diff --git a/.yarn/cache/lmdb-npm-2.8.5-e5fdd937dd-b1ec76650d.zip b/.yarn/cache/lmdb-npm-2.8.5-e5fdd937dd-b1ec76650d.zip
new file mode 100644
index 0000000000..1fe6a6f48d
Binary files /dev/null and b/.yarn/cache/lmdb-npm-2.8.5-e5fdd937dd-b1ec76650d.zip differ
diff --git a/.yarn/cache/locate-path-npm-2.0.0-673d28b0ea-02d581edbb.zip b/.yarn/cache/locate-path-npm-2.0.0-673d28b0ea-02d581edbb.zip
deleted file mode 100644
index 0841fd1c17..0000000000
Binary files a/.yarn/cache/locate-path-npm-2.0.0-673d28b0ea-02d581edbb.zip and /dev/null differ
diff --git a/.yarn/cache/lodash.once-npm-4.1.1-d8ba329ead-d768fa9f9b.zip b/.yarn/cache/lodash.once-npm-4.1.1-d8ba329ead-d768fa9f9b.zip
deleted file mode 100644
index 8d6432ca31..0000000000
Binary files a/.yarn/cache/lodash.once-npm-4.1.1-d8ba329ead-d768fa9f9b.zip and /dev/null differ
diff --git a/.yarn/cache/lodash.sortby-npm-4.7.0-fda8ab950d-db170c9396.zip b/.yarn/cache/lodash.sortby-npm-4.7.0-fda8ab950d-db170c9396.zip
deleted file mode 100644
index 915d1f2fcc..0000000000
Binary files a/.yarn/cache/lodash.sortby-npm-4.7.0-fda8ab950d-db170c9396.zip and /dev/null differ
diff --git a/.yarn/cache/log-symbols-npm-4.1.0-0a13492d8b-fce1497b31.zip b/.yarn/cache/log-symbols-npm-4.1.0-0a13492d8b-fce1497b31.zip
deleted file mode 100644
index 6a7e076159..0000000000
Binary files a/.yarn/cache/log-symbols-npm-4.1.0-0a13492d8b-fce1497b31.zip and /dev/null differ
diff --git a/.yarn/cache/log-update-npm-4.0.0-9d0554261c-ae2f85bbab.zip b/.yarn/cache/log-update-npm-4.0.0-9d0554261c-ae2f85bbab.zip
deleted file mode 100644
index 66a2c50de7..0000000000
Binary files a/.yarn/cache/log-update-npm-4.0.0-9d0554261c-ae2f85bbab.zip and /dev/null differ
diff --git a/.yarn/cache/lru-cache-npm-9.1.1-765199cb01-4d703bb9b6.zip b/.yarn/cache/lru-cache-npm-9.1.1-765199cb01-4d703bb9b6.zip
new file mode 100644
index 0000000000..5d688f763c
Binary files /dev/null and b/.yarn/cache/lru-cache-npm-9.1.1-765199cb01-4d703bb9b6.zip differ
diff --git a/.yarn/cache/luxon-npm-3.0.4-402f9149bc-d0908c3951.zip b/.yarn/cache/luxon-npm-3.0.4-402f9149bc-d0908c3951.zip
deleted file mode 100644
index a835bce110..0000000000
Binary files a/.yarn/cache/luxon-npm-3.0.4-402f9149bc-d0908c3951.zip and /dev/null differ
diff --git a/.yarn/cache/luxon-npm-3.4.4-c93f95dde8-36c1f99c47.zip b/.yarn/cache/luxon-npm-3.4.4-c93f95dde8-36c1f99c47.zip
new file mode 100644
index 0000000000..ed7709ee9e
Binary files /dev/null and b/.yarn/cache/luxon-npm-3.4.4-c93f95dde8-36c1f99c47.zip differ
diff --git a/.yarn/cache/magic-string-npm-0.25.9-0b51c0ea50-9a0e55a15c.zip b/.yarn/cache/magic-string-npm-0.25.9-0b51c0ea50-9a0e55a15c.zip
deleted file mode 100644
index caa6d6b49e..0000000000
Binary files a/.yarn/cache/magic-string-npm-0.25.9-0b51c0ea50-9a0e55a15c.zip and /dev/null differ
diff --git a/.yarn/cache/magic-string-npm-0.30.7-0bb5819095-bdf102e36a.zip b/.yarn/cache/magic-string-npm-0.30.7-0bb5819095-bdf102e36a.zip
new file mode 100644
index 0000000000..7d9e6ff1d3
Binary files /dev/null and b/.yarn/cache/magic-string-npm-0.30.7-0bb5819095-bdf102e36a.zip differ
diff --git a/.yarn/cache/make-dir-npm-4.0.0-ec3cd921cc-bf0731a2dd.zip b/.yarn/cache/make-dir-npm-4.0.0-ec3cd921cc-bf0731a2dd.zip
new file mode 100644
index 0000000000..2a141eff65
Binary files /dev/null and b/.yarn/cache/make-dir-npm-4.0.0-ec3cd921cc-bf0731a2dd.zip differ
diff --git a/.yarn/cache/merge-stream-npm-2.0.0-2ac83efea5-6fa4dcc8d8.zip b/.yarn/cache/merge-stream-npm-2.0.0-2ac83efea5-6fa4dcc8d8.zip
deleted file mode 100644
index 1cf9d57dce..0000000000
Binary files a/.yarn/cache/merge-stream-npm-2.0.0-2ac83efea5-6fa4dcc8d8.zip and /dev/null differ
diff --git a/.yarn/cache/merge2-npm-1.4.1-a2507bd06c-7268db63ed.zip b/.yarn/cache/merge2-npm-1.4.1-a2507bd06c-7268db63ed.zip
deleted file mode 100644
index 76aa4f0b4e..0000000000
Binary files a/.yarn/cache/merge2-npm-1.4.1-a2507bd06c-7268db63ed.zip and /dev/null differ
diff --git a/.yarn/cache/micromatch-npm-4.0.5-cfab5d7669-02a17b671c.zip b/.yarn/cache/micromatch-npm-4.0.5-cfab5d7669-02a17b671c.zip
deleted file mode 100644
index 060612a944..0000000000
Binary files a/.yarn/cache/micromatch-npm-4.0.5-cfab5d7669-02a17b671c.zip and /dev/null differ
diff --git a/.yarn/cache/mime-db-npm-1.52.0-b5371d6fd2-0d99a03585.zip b/.yarn/cache/mime-db-npm-1.52.0-b5371d6fd2-0d99a03585.zip
deleted file mode 100644
index 8db7263574..0000000000
Binary files a/.yarn/cache/mime-db-npm-1.52.0-b5371d6fd2-0d99a03585.zip and /dev/null differ
diff --git a/.yarn/cache/mime-npm-2.6.0-88b89d8de0-1497ba7b9f.zip b/.yarn/cache/mime-npm-2.6.0-88b89d8de0-1497ba7b9f.zip
new file mode 100644
index 0000000000..644ef2b53f
Binary files /dev/null and b/.yarn/cache/mime-npm-2.6.0-88b89d8de0-1497ba7b9f.zip differ
diff --git a/.yarn/cache/mime-types-npm-2.1.35-dd9ea9f3e2-89a5b7f1de.zip b/.yarn/cache/mime-types-npm-2.1.35-dd9ea9f3e2-89a5b7f1de.zip
deleted file mode 100644
index 166d33254d..0000000000
Binary files a/.yarn/cache/mime-types-npm-2.1.35-dd9ea9f3e2-89a5b7f1de.zip and /dev/null differ
diff --git a/.yarn/cache/mimic-fn-npm-2.1.0-4fbeb3abb4-d2421a3444.zip b/.yarn/cache/mimic-fn-npm-2.1.0-4fbeb3abb4-d2421a3444.zip
deleted file mode 100644
index 1cc2414f46..0000000000
Binary files a/.yarn/cache/mimic-fn-npm-2.1.0-4fbeb3abb4-d2421a3444.zip and /dev/null differ
diff --git a/.yarn/cache/minimatch-npm-9.0.0-c6737cb1be-7bd57899ed.zip b/.yarn/cache/minimatch-npm-9.0.0-c6737cb1be-7bd57899ed.zip
new file mode 100644
index 0000000000..ef764d9b78
Binary files /dev/null and b/.yarn/cache/minimatch-npm-9.0.0-c6737cb1be-7bd57899ed.zip differ
diff --git a/.yarn/cache/minipass-npm-6.0.1-634723433e-1df70bb565.zip b/.yarn/cache/minipass-npm-6.0.1-634723433e-1df70bb565.zip
new file mode 100644
index 0000000000..db17726e14
Binary files /dev/null and b/.yarn/cache/minipass-npm-6.0.1-634723433e-1df70bb565.zip differ
diff --git a/.yarn/cache/moment-npm-2.29.3-fe4ba99bae-2e780e36d9.zip b/.yarn/cache/moment-npm-2.29.3-fe4ba99bae-2e780e36d9.zip
deleted file mode 100644
index 8db6d8b80b..0000000000
Binary files a/.yarn/cache/moment-npm-2.29.3-fe4ba99bae-2e780e36d9.zip and /dev/null differ
diff --git a/.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip b/.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip
new file mode 100644
index 0000000000..7454cc21af
Binary files /dev/null and b/.yarn/cache/moment-npm-2.30.1-1c51a5c631-859236bab1.zip differ
diff --git a/.yarn/cache/moment-timezone-npm-0.5.37-cb6e7487a6-b3fc24848a.zip b/.yarn/cache/moment-timezone-npm-0.5.37-cb6e7487a6-b3fc24848a.zip
deleted file mode 100644
index aecc304106..0000000000
Binary files a/.yarn/cache/moment-timezone-npm-0.5.37-cb6e7487a6-b3fc24848a.zip and /dev/null differ
diff --git a/.yarn/cache/moment-timezone-npm-0.5.45-2df3ad72a4-a22e9f983f.zip b/.yarn/cache/moment-timezone-npm-0.5.45-2df3ad72a4-a22e9f983f.zip
new file mode 100644
index 0000000000..4cd7864ca5
Binary files /dev/null and b/.yarn/cache/moment-timezone-npm-0.5.45-2df3ad72a4-a22e9f983f.zip differ
diff --git a/.yarn/cache/msgpackr-extract-npm-3.0.2-93e8773fad-5adb809b96.zip b/.yarn/cache/msgpackr-extract-npm-3.0.2-93e8773fad-5adb809b96.zip
new file mode 100644
index 0000000000..b9af6cd241
Binary files /dev/null and b/.yarn/cache/msgpackr-extract-npm-3.0.2-93e8773fad-5adb809b96.zip differ
diff --git a/.yarn/cache/msgpackr-npm-1.10.1-5c5ff5c553-e422d18b01.zip b/.yarn/cache/msgpackr-npm-1.10.1-5c5ff5c553-e422d18b01.zip
new file mode 100644
index 0000000000..12aaa36344
Binary files /dev/null and b/.yarn/cache/msgpackr-npm-1.10.1-5c5ff5c553-e422d18b01.zip differ
diff --git a/.yarn/cache/msgpackr-npm-1.9.9-75b366d55f-b63182d99f.zip b/.yarn/cache/msgpackr-npm-1.9.9-75b366d55f-b63182d99f.zip
new file mode 100644
index 0000000000..ce927778aa
Binary files /dev/null and b/.yarn/cache/msgpackr-npm-1.9.9-75b366d55f-b63182d99f.zip differ
diff --git a/.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip b/.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip
new file mode 100644
index 0000000000..4cec1b177d
Binary files /dev/null and b/.yarn/cache/muggle-string-npm-0.4.1-fe3c825cc2-85fe1766d1.zip differ
diff --git a/.yarn/cache/naive-ui-npm-2.33.3-b741bf7169-772373981b.zip b/.yarn/cache/naive-ui-npm-2.33.3-b741bf7169-772373981b.zip
deleted file mode 100644
index 47ff1f79af..0000000000
Binary files a/.yarn/cache/naive-ui-npm-2.33.3-b741bf7169-772373981b.zip and /dev/null differ
diff --git a/.yarn/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip b/.yarn/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip
new file mode 100644
index 0000000000..fb6dc789a1
Binary files /dev/null and b/.yarn/cache/naive-ui-npm-2.38.1-0edd2e5816-88a8f981de.zip differ
diff --git a/.yarn/cache/nanoid-npm-3.3.3-25d865be84-ada019402a.zip b/.yarn/cache/nanoid-npm-3.3.3-25d865be84-ada019402a.zip
deleted file mode 100644
index d28e91f1ff..0000000000
Binary files a/.yarn/cache/nanoid-npm-3.3.3-25d865be84-ada019402a.zip and /dev/null differ
diff --git a/.yarn/cache/nanoid-npm-3.3.4-3d250377d6-2fddd6dee9.zip b/.yarn/cache/nanoid-npm-3.3.4-3d250377d6-2fddd6dee9.zip
deleted file mode 100644
index 740fd4c336..0000000000
Binary files a/.yarn/cache/nanoid-npm-3.3.4-3d250377d6-2fddd6dee9.zip and /dev/null differ
diff --git a/.yarn/cache/nanoid-npm-3.3.7-98824ba130-d36c427e53.zip b/.yarn/cache/nanoid-npm-3.3.7-98824ba130-d36c427e53.zip
new file mode 100644
index 0000000000..7b2fd6e1b5
Binary files /dev/null and b/.yarn/cache/nanoid-npm-3.3.7-98824ba130-d36c427e53.zip differ
diff --git a/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-3a539510e6.zip b/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-3a539510e6.zip
new file mode 100644
index 0000000000..012df449c0
Binary files /dev/null and b/.yarn/cache/node-addon-api-npm-6.1.0-634c545b39-3a539510e6.zip differ
diff --git a/.yarn/cache/node-gyp-build-optional-packages-npm-5.0.7-40f21a5d68-bcb4537af1.zip b/.yarn/cache/node-gyp-build-optional-packages-npm-5.0.7-40f21a5d68-bcb4537af1.zip
new file mode 100644
index 0000000000..d023f1a69d
Binary files /dev/null and b/.yarn/cache/node-gyp-build-optional-packages-npm-5.0.7-40f21a5d68-bcb4537af1.zip differ
diff --git a/.yarn/cache/node-gyp-build-optional-packages-npm-5.1.1-ff11e179dd-f3cb197862.zip b/.yarn/cache/node-gyp-build-optional-packages-npm-5.1.1-ff11e179dd-f3cb197862.zip
new file mode 100644
index 0000000000..840821996d
Binary files /dev/null and b/.yarn/cache/node-gyp-build-optional-packages-npm-5.1.1-ff11e179dd-f3cb197862.zip differ
diff --git a/.yarn/cache/npm-run-path-npm-4.0.1-7aebd8bab3-5374c0cea4.zip b/.yarn/cache/npm-run-path-npm-4.0.1-7aebd8bab3-5374c0cea4.zip
deleted file mode 100644
index 18ef7040d5..0000000000
Binary files a/.yarn/cache/npm-run-path-npm-4.0.1-7aebd8bab3-5374c0cea4.zip and /dev/null differ
diff --git a/.yarn/cache/object-inspect-npm-1.13.1-fd038a2f0a-7d9fa9221d.zip b/.yarn/cache/object-inspect-npm-1.13.1-fd038a2f0a-7d9fa9221d.zip
new file mode 100644
index 0000000000..1e1bbfbcfa
Binary files /dev/null and b/.yarn/cache/object-inspect-npm-1.13.1-fd038a2f0a-7d9fa9221d.zip differ
diff --git a/.yarn/cache/object.assign-npm-4.1.2-d52edada1c-d621d832ed.zip b/.yarn/cache/object.assign-npm-4.1.2-d52edada1c-d621d832ed.zip
deleted file mode 100644
index 0031b97816..0000000000
Binary files a/.yarn/cache/object.assign-npm-4.1.2-d52edada1c-d621d832ed.zip and /dev/null differ
diff --git a/.yarn/cache/object.assign-npm-4.1.4-fb3deb1c3a-76cab513a5.zip b/.yarn/cache/object.assign-npm-4.1.4-fb3deb1c3a-76cab513a5.zip
new file mode 100644
index 0000000000..8a1fef0557
Binary files /dev/null and b/.yarn/cache/object.assign-npm-4.1.4-fb3deb1c3a-76cab513a5.zip differ
diff --git a/.yarn/cache/object.fromentries-npm-2.0.7-2e38392540-7341ce246e.zip b/.yarn/cache/object.fromentries-npm-2.0.7-2e38392540-7341ce246e.zip
new file mode 100644
index 0000000000..a976cc8e0e
Binary files /dev/null and b/.yarn/cache/object.fromentries-npm-2.0.7-2e38392540-7341ce246e.zip differ
diff --git a/.yarn/cache/object.groupby-npm-1.0.1-fc268391fe-d7959d6eaa.zip b/.yarn/cache/object.groupby-npm-1.0.1-fc268391fe-d7959d6eaa.zip
new file mode 100644
index 0000000000..c67f462cfb
Binary files /dev/null and b/.yarn/cache/object.groupby-npm-1.0.1-fc268391fe-d7959d6eaa.zip differ
diff --git a/.yarn/cache/object.values-npm-1.1.5-f1de7f3742-0f17e99741.zip b/.yarn/cache/object.values-npm-1.1.5-f1de7f3742-0f17e99741.zip
deleted file mode 100644
index e03d02d7dd..0000000000
Binary files a/.yarn/cache/object.values-npm-1.1.5-f1de7f3742-0f17e99741.zip and /dev/null differ
diff --git a/.yarn/cache/object.values-npm-1.1.7-deae619f88-f3e4ae4f21.zip b/.yarn/cache/object.values-npm-1.1.7-deae619f88-f3e4ae4f21.zip
new file mode 100644
index 0000000000..4c12832e02
Binary files /dev/null and b/.yarn/cache/object.values-npm-1.1.7-deae619f88-f3e4ae4f21.zip differ
diff --git a/.yarn/cache/onetime-npm-5.1.2-3ed148fa42-2478859ef8.zip b/.yarn/cache/onetime-npm-5.1.2-3ed148fa42-2478859ef8.zip
deleted file mode 100644
index 958e05b7dd..0000000000
Binary files a/.yarn/cache/onetime-npm-5.1.2-3ed148fa42-2478859ef8.zip and /dev/null differ
diff --git a/.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip b/.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip
deleted file mode 100644
index 6e6efe345b..0000000000
Binary files a/.yarn/cache/optionator-npm-0.9.1-577e397aae-dbc6fa0656.zip and /dev/null differ
diff --git a/.yarn/cache/optionator-npm-0.9.3-56c3a4bf80-0928199944.zip b/.yarn/cache/optionator-npm-0.9.3-56c3a4bf80-0928199944.zip
new file mode 100644
index 0000000000..06266323c5
Binary files /dev/null and b/.yarn/cache/optionator-npm-0.9.3-56c3a4bf80-0928199944.zip differ
diff --git a/.yarn/cache/ordered-binary-npm-1.4.1-9ad6b7c6b5-274940b4ef.zip b/.yarn/cache/ordered-binary-npm-1.4.1-9ad6b7c6b5-274940b4ef.zip
new file mode 100644
index 0000000000..35ea485c2b
Binary files /dev/null and b/.yarn/cache/ordered-binary-npm-1.4.1-9ad6b7c6b5-274940b4ef.zip differ
diff --git a/.yarn/cache/ospath-npm-1.2.2-c8f45523a8-505f48a4f4.zip b/.yarn/cache/ospath-npm-1.2.2-c8f45523a8-505f48a4f4.zip
deleted file mode 100644
index 0c1524ce41..0000000000
Binary files a/.yarn/cache/ospath-npm-1.2.2-c8f45523a8-505f48a4f4.zip and /dev/null differ
diff --git a/.yarn/cache/p-limit-npm-1.3.0-fdb471d864-281c1c0b8c.zip b/.yarn/cache/p-limit-npm-1.3.0-fdb471d864-281c1c0b8c.zip
deleted file mode 100644
index 96906babdc..0000000000
Binary files a/.yarn/cache/p-limit-npm-1.3.0-fdb471d864-281c1c0b8c.zip and /dev/null differ
diff --git a/.yarn/cache/p-locate-npm-2.0.0-3a2ee263dd-e2dceb9b49.zip b/.yarn/cache/p-locate-npm-2.0.0-3a2ee263dd-e2dceb9b49.zip
deleted file mode 100644
index f6f9f09b9e..0000000000
Binary files a/.yarn/cache/p-locate-npm-2.0.0-3a2ee263dd-e2dceb9b49.zip and /dev/null differ
diff --git a/.yarn/cache/p-try-npm-1.0.0-7373139e40-3b5303f77e.zip b/.yarn/cache/p-try-npm-1.0.0-7373139e40-3b5303f77e.zip
deleted file mode 100644
index e12bd247e1..0000000000
Binary files a/.yarn/cache/p-try-npm-1.0.0-7373139e40-3b5303f77e.zip and /dev/null differ
diff --git a/.yarn/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip b/.yarn/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip
new file mode 100644
index 0000000000..965ad65ddc
Binary files /dev/null and b/.yarn/cache/parcel-npm-2.12.0-96a4bb6cc3-d8e6cb690a.zip differ
diff --git a/.yarn/cache/parcel-npm-2.7.0-bc3b2a7745-0584bc59da.zip b/.yarn/cache/parcel-npm-2.7.0-bc3b2a7745-0584bc59da.zip
deleted file mode 100644
index f4a2c95737..0000000000
Binary files a/.yarn/cache/parcel-npm-2.7.0-bc3b2a7745-0584bc59da.zip and /dev/null differ
diff --git a/.yarn/cache/path-exists-npm-3.0.0-e80371aa68-96e92643aa.zip b/.yarn/cache/path-exists-npm-3.0.0-e80371aa68-96e92643aa.zip
deleted file mode 100644
index bdaa46fd30..0000000000
Binary files a/.yarn/cache/path-exists-npm-3.0.0-e80371aa68-96e92643aa.zip and /dev/null differ
diff --git a/.yarn/cache/path-scurry-npm-1.9.1-b9d6b1c5bf-28caa788f1.zip b/.yarn/cache/path-scurry-npm-1.9.1-b9d6b1c5bf-28caa788f1.zip
new file mode 100644
index 0000000000..3d6b3d39e4
Binary files /dev/null and b/.yarn/cache/path-scurry-npm-1.9.1-b9d6b1c5bf-28caa788f1.zip differ
diff --git a/.yarn/cache/path-to-regexp-npm-6.2.1-8ebfe03654-f0227af828.zip b/.yarn/cache/path-to-regexp-npm-6.2.1-8ebfe03654-f0227af828.zip
deleted file mode 100644
index 60fcee2759..0000000000
Binary files a/.yarn/cache/path-to-regexp-npm-6.2.1-8ebfe03654-f0227af828.zip and /dev/null differ
diff --git a/.yarn/cache/pend-npm-1.2.0-7a13d93266-6c72f52433.zip b/.yarn/cache/pend-npm-1.2.0-7a13d93266-6c72f52433.zip
deleted file mode 100644
index 03b6b6dec0..0000000000
Binary files a/.yarn/cache/pend-npm-1.2.0-7a13d93266-6c72f52433.zip and /dev/null differ
diff --git a/.yarn/cache/performance-now-npm-2.1.0-45e3ce7e49-534e641aa8.zip b/.yarn/cache/performance-now-npm-2.1.0-45e3ce7e49-534e641aa8.zip
deleted file mode 100644
index fa9ee04fea..0000000000
Binary files a/.yarn/cache/performance-now-npm-2.1.0-45e3ce7e49-534e641aa8.zip and /dev/null differ
diff --git a/.yarn/cache/pify-npm-2.3.0-8b63310934-9503aaeaf4.zip b/.yarn/cache/pify-npm-2.3.0-8b63310934-9503aaeaf4.zip
deleted file mode 100644
index 4cbc70a0ab..0000000000
Binary files a/.yarn/cache/pify-npm-2.3.0-8b63310934-9503aaeaf4.zip and /dev/null differ
diff --git a/.yarn/cache/pinia-npm-2.0.22-1c768f6f87-3949063267.zip b/.yarn/cache/pinia-npm-2.0.22-1c768f6f87-3949063267.zip
deleted file mode 100644
index ac07a46048..0000000000
Binary files a/.yarn/cache/pinia-npm-2.0.22-1c768f6f87-3949063267.zip and /dev/null differ
diff --git a/.yarn/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip b/.yarn/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip
new file mode 100644
index 0000000000..352e0a2f9f
Binary files /dev/null and b/.yarn/cache/pinia-npm-2.1.7-195409c154-1b7882aab2.zip differ
diff --git a/.yarn/cache/postcss-npm-8.4.12-e941d78a98-248e3d0f9b.zip b/.yarn/cache/postcss-npm-8.4.12-e941d78a98-248e3d0f9b.zip
deleted file mode 100644
index 4f940728b9..0000000000
Binary files a/.yarn/cache/postcss-npm-8.4.12-e941d78a98-248e3d0f9b.zip and /dev/null differ
diff --git a/.yarn/cache/postcss-npm-8.4.14-c0d448b728-fe58766ff3.zip b/.yarn/cache/postcss-npm-8.4.14-c0d448b728-fe58766ff3.zip
deleted file mode 100644
index 63ace659e3..0000000000
Binary files a/.yarn/cache/postcss-npm-8.4.14-c0d448b728-fe58766ff3.zip and /dev/null differ
diff --git a/.yarn/cache/postcss-npm-8.4.33-6ba8157009-6f98b2af4b.zip b/.yarn/cache/postcss-npm-8.4.33-6ba8157009-6f98b2af4b.zip
new file mode 100644
index 0000000000..57638cbd81
Binary files /dev/null and b/.yarn/cache/postcss-npm-8.4.33-6ba8157009-6f98b2af4b.zip differ
diff --git a/.yarn/cache/postcss-npm-8.4.35-6bc1848fff-cf3c3124d3.zip b/.yarn/cache/postcss-npm-8.4.35-6bc1848fff-cf3c3124d3.zip
new file mode 100644
index 0000000000..888dccea0c
Binary files /dev/null and b/.yarn/cache/postcss-npm-8.4.35-6bc1848fff-cf3c3124d3.zip differ
diff --git a/.yarn/cache/postcss-selector-parser-npm-6.0.10-a4d7aaa270-46afaa60e3.zip b/.yarn/cache/postcss-selector-parser-npm-6.0.10-a4d7aaa270-46afaa60e3.zip
deleted file mode 100644
index 496c72f70c..0000000000
Binary files a/.yarn/cache/postcss-selector-parser-npm-6.0.10-a4d7aaa270-46afaa60e3.zip and /dev/null differ
diff --git a/.yarn/cache/postcss-selector-parser-npm-6.0.15-0ec4819b4e-57decb9415.zip b/.yarn/cache/postcss-selector-parser-npm-6.0.15-0ec4819b4e-57decb9415.zip
new file mode 100644
index 0000000000..c6d454663e
Binary files /dev/null and b/.yarn/cache/postcss-selector-parser-npm-6.0.15-0ec4819b4e-57decb9415.zip differ
diff --git a/.yarn/cache/preact-npm-10.12.1-fdb903e9a5-0de99f4775.zip b/.yarn/cache/preact-npm-10.12.1-fdb903e9a5-0de99f4775.zip
new file mode 100644
index 0000000000..86131908d7
Binary files /dev/null and b/.yarn/cache/preact-npm-10.12.1-fdb903e9a5-0de99f4775.zip differ
diff --git a/.yarn/cache/preact-npm-10.7.2-dffb68bd4b-2f0655e043.zip b/.yarn/cache/preact-npm-10.7.2-dffb68bd4b-2f0655e043.zip
deleted file mode 100644
index 40a53d7f1c..0000000000
Binary files a/.yarn/cache/preact-npm-10.7.2-dffb68bd4b-2f0655e043.zip and /dev/null differ
diff --git a/.yarn/cache/pretty-bytes-npm-5.6.0-0061079c9f-9c082500d1.zip b/.yarn/cache/pretty-bytes-npm-5.6.0-0061079c9f-9c082500d1.zip
deleted file mode 100644
index 767e74fc05..0000000000
Binary files a/.yarn/cache/pretty-bytes-npm-5.6.0-0061079c9f-9c082500d1.zip and /dev/null differ
diff --git a/.yarn/cache/pretty-format-npm-27.5.1-cd7d49696f-cf610cffcb.zip b/.yarn/cache/pretty-format-npm-27.5.1-cd7d49696f-cf610cffcb.zip
deleted file mode 100644
index 8d28efe3e1..0000000000
Binary files a/.yarn/cache/pretty-format-npm-27.5.1-cd7d49696f-cf610cffcb.zip and /dev/null differ
diff --git a/.yarn/cache/proxy-from-env-npm-1.0.0-679b82b4ec-292e28d1de.zip b/.yarn/cache/proxy-from-env-npm-1.0.0-679b82b4ec-292e28d1de.zip
deleted file mode 100644
index 8015209887..0000000000
Binary files a/.yarn/cache/proxy-from-env-npm-1.0.0-679b82b4ec-292e28d1de.zip and /dev/null differ
diff --git a/.yarn/cache/psl-npm-1.8.0-226099d70e-6150048ed2.zip b/.yarn/cache/psl-npm-1.8.0-226099d70e-6150048ed2.zip
deleted file mode 100644
index 1611ec10a3..0000000000
Binary files a/.yarn/cache/psl-npm-1.8.0-226099d70e-6150048ed2.zip and /dev/null differ
diff --git a/.yarn/cache/pump-npm-3.0.0-0080bf6a7a-e42e9229fb.zip b/.yarn/cache/pump-npm-3.0.0-0080bf6a7a-e42e9229fb.zip
deleted file mode 100644
index 0585683621..0000000000
Binary files a/.yarn/cache/pump-npm-3.0.0-0080bf6a7a-e42e9229fb.zip and /dev/null differ
diff --git a/.yarn/cache/qs-npm-6.5.3-90b2635484-6f20bf08ca.zip b/.yarn/cache/qs-npm-6.5.3-90b2635484-6f20bf08ca.zip
deleted file mode 100644
index 6714c3cff9..0000000000
Binary files a/.yarn/cache/qs-npm-6.5.3-90b2635484-6f20bf08ca.zip and /dev/null differ
diff --git a/.yarn/cache/queue-npm-6.0.2-ebbcf599cf-ebc2363924.zip b/.yarn/cache/queue-npm-6.0.2-ebbcf599cf-ebc2363924.zip
deleted file mode 100644
index df189658cd..0000000000
Binary files a/.yarn/cache/queue-npm-6.0.2-ebbcf599cf-ebc2363924.zip and /dev/null differ
diff --git a/.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip b/.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip
deleted file mode 100644
index 8b0c3e5460..0000000000
Binary files a/.yarn/cache/react-is-npm-17.0.2-091bbb8db6-9d6d111d89.zip and /dev/null differ
diff --git a/.yarn/cache/regenerator-runtime-npm-0.14.0-e060897cf7-1c977ad82a.zip b/.yarn/cache/regenerator-runtime-npm-0.14.0-e060897cf7-1c977ad82a.zip
new file mode 100644
index 0000000000..743dca6a4e
Binary files /dev/null and b/.yarn/cache/regenerator-runtime-npm-0.14.0-e060897cf7-1c977ad82a.zip differ
diff --git a/.yarn/cache/regexp.prototype.flags-npm-1.5.1-b8faeee306-869edff002.zip b/.yarn/cache/regexp.prototype.flags-npm-1.5.1-b8faeee306-869edff002.zip
new file mode 100644
index 0000000000..d73fb5c3df
Binary files /dev/null and b/.yarn/cache/regexp.prototype.flags-npm-1.5.1-b8faeee306-869edff002.zip differ
diff --git a/.yarn/cache/request-progress-npm-3.0.0-f79f1c9e67-6ea1761dcc.zip b/.yarn/cache/request-progress-npm-3.0.0-f79f1c9e67-6ea1761dcc.zip
deleted file mode 100644
index 422169abe6..0000000000
Binary files a/.yarn/cache/request-progress-npm-3.0.0-f79f1c9e67-6ea1761dcc.zip and /dev/null differ
diff --git a/.yarn/cache/resolve-npm-1.22.1-3980488690-07af5fc1e8.zip b/.yarn/cache/resolve-npm-1.22.1-3980488690-07af5fc1e8.zip
deleted file mode 100644
index d41402c877..0000000000
Binary files a/.yarn/cache/resolve-npm-1.22.1-3980488690-07af5fc1e8.zip and /dev/null differ
diff --git a/.yarn/cache/resolve-npm-1.22.3-f7dee15274-fb834b8134.zip b/.yarn/cache/resolve-npm-1.22.3-f7dee15274-fb834b8134.zip
new file mode 100644
index 0000000000..f3daae8bc8
Binary files /dev/null and b/.yarn/cache/resolve-npm-1.22.3-f7dee15274-fb834b8134.zip differ
diff --git a/.yarn/cache/resolve-npm-1.22.8-098f379dfe-f8a26958aa.zip b/.yarn/cache/resolve-npm-1.22.8-098f379dfe-f8a26958aa.zip
new file mode 100644
index 0000000000..87b2b21978
Binary files /dev/null and b/.yarn/cache/resolve-npm-1.22.8-098f379dfe-f8a26958aa.zip differ
diff --git a/.yarn/cache/resolve-patch-46f9469d0d-5656f4d0be.zip b/.yarn/cache/resolve-patch-46f9469d0d-5656f4d0be.zip
deleted file mode 100644
index c3066c3608..0000000000
Binary files a/.yarn/cache/resolve-patch-46f9469d0d-5656f4d0be.zip and /dev/null differ
diff --git a/.yarn/cache/resolve-patch-8df1eb26d0-ad59734723.zip b/.yarn/cache/resolve-patch-8df1eb26d0-ad59734723.zip
new file mode 100644
index 0000000000..7d4960beb5
Binary files /dev/null and b/.yarn/cache/resolve-patch-8df1eb26d0-ad59734723.zip differ
diff --git a/.yarn/cache/resolve-patch-f6b5304cab-5479b7d431.zip b/.yarn/cache/resolve-patch-f6b5304cab-5479b7d431.zip
new file mode 100644
index 0000000000..84c63abe59
Binary files /dev/null and b/.yarn/cache/resolve-patch-f6b5304cab-5479b7d431.zip differ
diff --git a/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-1012afc566.zip b/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-1012afc566.zip
new file mode 100644
index 0000000000..53ff3fc69e
Binary files /dev/null and b/.yarn/cache/resolve-pkg-maps-npm-1.0.0-135b70c854-1012afc566.zip differ
diff --git a/.yarn/cache/restore-cursor-npm-3.1.0-52c5a4c98f-f877dd8741.zip b/.yarn/cache/restore-cursor-npm-3.1.0-52c5a4c98f-f877dd8741.zip
deleted file mode 100644
index f11afe99bb..0000000000
Binary files a/.yarn/cache/restore-cursor-npm-3.1.0-52c5a4c98f-f877dd8741.zip and /dev/null differ
diff --git a/.yarn/cache/rfdc-npm-1.3.0-272f288ad8-fb2ba8512e.zip b/.yarn/cache/rfdc-npm-1.3.0-272f288ad8-fb2ba8512e.zip
deleted file mode 100644
index c6d5d0c944..0000000000
Binary files a/.yarn/cache/rfdc-npm-1.3.0-272f288ad8-fb2ba8512e.zip and /dev/null differ
diff --git a/.yarn/cache/rollup-npm-2.77.3-be523d3443-b179c68249.zip b/.yarn/cache/rollup-npm-2.77.3-be523d3443-b179c68249.zip
deleted file mode 100644
index 03496bf4fc..0000000000
Binary files a/.yarn/cache/rollup-npm-2.77.3-be523d3443-b179c68249.zip and /dev/null differ
diff --git a/.yarn/cache/rollup-npm-3.29.4-5e5e5f2087-8bb20a39c8.zip b/.yarn/cache/rollup-npm-3.29.4-5e5e5f2087-8bb20a39c8.zip
new file mode 100644
index 0000000000..9f6628aa42
Binary files /dev/null and b/.yarn/cache/rollup-npm-3.29.4-5e5e5f2087-8bb20a39c8.zip differ
diff --git a/.yarn/cache/rxjs-npm-7.5.5-d0546b1ccb-e034f60805.zip b/.yarn/cache/rxjs-npm-7.5.5-d0546b1ccb-e034f60805.zip
deleted file mode 100644
index c7a67f4714..0000000000
Binary files a/.yarn/cache/rxjs-npm-7.5.5-d0546b1ccb-e034f60805.zip and /dev/null differ
diff --git a/.yarn/cache/safe-array-concat-npm-1.0.1-8a42907bbf-001ecf1d8a.zip b/.yarn/cache/safe-array-concat-npm-1.0.1-8a42907bbf-001ecf1d8a.zip
new file mode 100644
index 0000000000..6789308b81
Binary files /dev/null and b/.yarn/cache/safe-array-concat-npm-1.0.1-8a42907bbf-001ecf1d8a.zip differ
diff --git a/.yarn/cache/safe-regex-test-npm-1.0.0-e94a09b84e-bc566d8beb.zip b/.yarn/cache/safe-regex-test-npm-1.0.0-e94a09b84e-bc566d8beb.zip
new file mode 100644
index 0000000000..9e9dbfc637
Binary files /dev/null and b/.yarn/cache/safe-regex-test-npm-1.0.0-e94a09b84e-bc566d8beb.zip differ
diff --git a/.yarn/cache/sass-npm-1.55.0-594c748a96-7d769ed08e.zip b/.yarn/cache/sass-npm-1.55.0-594c748a96-7d769ed08e.zip
deleted file mode 100644
index 385f41b412..0000000000
Binary files a/.yarn/cache/sass-npm-1.55.0-594c748a96-7d769ed08e.zip and /dev/null differ
diff --git a/.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip b/.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip
new file mode 100644
index 0000000000..a3aea4e668
Binary files /dev/null and b/.yarn/cache/sass-npm-1.72.0-fb38bb530c-f420079c7d.zip differ
diff --git a/.yarn/cache/seemly-npm-0.3.3-1df3254399-b6445553f8.zip b/.yarn/cache/seemly-npm-0.3.3-1df3254399-b6445553f8.zip
deleted file mode 100644
index 5265b57083..0000000000
Binary files a/.yarn/cache/seemly-npm-0.3.3-1df3254399-b6445553f8.zip and /dev/null differ
diff --git a/.yarn/cache/seemly-npm-0.3.8-4940336497-98171fd4d9.zip b/.yarn/cache/seemly-npm-0.3.8-4940336497-98171fd4d9.zip
new file mode 100644
index 0000000000..03ae0a8f50
Binary files /dev/null and b/.yarn/cache/seemly-npm-0.3.8-4940336497-98171fd4d9.zip differ
diff --git a/.yarn/cache/semver-npm-6.3.1-bcba31fdbe-ae47d06de2.zip b/.yarn/cache/semver-npm-6.3.1-bcba31fdbe-ae47d06de2.zip
new file mode 100644
index 0000000000..91f42cf845
Binary files /dev/null and b/.yarn/cache/semver-npm-6.3.1-bcba31fdbe-ae47d06de2.zip differ
diff --git a/.yarn/cache/semver-npm-7.5.3-275095dbf3-9d58db1652.zip b/.yarn/cache/semver-npm-7.5.3-275095dbf3-9d58db1652.zip
new file mode 100644
index 0000000000..79b7d4718c
Binary files /dev/null and b/.yarn/cache/semver-npm-7.5.3-275095dbf3-9d58db1652.zip differ
diff --git a/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip b/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip
new file mode 100644
index 0000000000..f8689471f5
Binary files /dev/null and b/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip differ
diff --git a/.yarn/cache/semver-npm-7.6.0-f4630729f6-7427f05b70.zip b/.yarn/cache/semver-npm-7.6.0-f4630729f6-7427f05b70.zip
new file mode 100644
index 0000000000..a5494e10ac
Binary files /dev/null and b/.yarn/cache/semver-npm-7.6.0-f4630729f6-7427f05b70.zip differ
diff --git a/.yarn/cache/set-function-length-npm-1.1.1-d362bf8221-c131d7569c.zip b/.yarn/cache/set-function-length-npm-1.1.1-d362bf8221-c131d7569c.zip
new file mode 100644
index 0000000000..024add469c
Binary files /dev/null and b/.yarn/cache/set-function-length-npm-1.1.1-d362bf8221-c131d7569c.zip differ
diff --git a/.yarn/cache/set-function-name-npm-2.0.1-a9f970eea0-4975d17d90.zip b/.yarn/cache/set-function-name-npm-2.0.1-a9f970eea0-4975d17d90.zip
new file mode 100644
index 0000000000..f18d53b599
Binary files /dev/null and b/.yarn/cache/set-function-name-npm-2.0.1-a9f970eea0-4975d17d90.zip differ
diff --git a/.yarn/cache/shepherd.js-npm-11.2.0-94b9af1487-0e71e63e51.zip b/.yarn/cache/shepherd.js-npm-11.2.0-94b9af1487-0e71e63e51.zip
new file mode 100644
index 0000000000..6bd0d1e294
Binary files /dev/null and b/.yarn/cache/shepherd.js-npm-11.2.0-94b9af1487-0e71e63e51.zip differ
diff --git a/.yarn/cache/signal-exit-npm-4.0.2-e3f0e8ed25-41f5928431.zip b/.yarn/cache/signal-exit-npm-4.0.2-e3f0e8ed25-41f5928431.zip
new file mode 100644
index 0000000000..60c1f70c3a
Binary files /dev/null and b/.yarn/cache/signal-exit-npm-4.0.2-e3f0e8ed25-41f5928431.zip differ
diff --git a/.yarn/cache/slash-npm-3.0.0-b87de2279a-94a93fff61.zip b/.yarn/cache/slash-npm-3.0.0-b87de2279a-94a93fff61.zip
deleted file mode 100644
index 40d6b51143..0000000000
Binary files a/.yarn/cache/slash-npm-3.0.0-b87de2279a-94a93fff61.zip and /dev/null differ
diff --git a/.yarn/cache/slice-ansi-npm-3.0.0-d9999864af-5ec6d022d1.zip b/.yarn/cache/slice-ansi-npm-3.0.0-d9999864af-5ec6d022d1.zip
deleted file mode 100644
index 0129e70bff..0000000000
Binary files a/.yarn/cache/slice-ansi-npm-3.0.0-d9999864af-5ec6d022d1.zip and /dev/null differ
diff --git a/.yarn/cache/slice-ansi-npm-4.0.0-6eeca1d10e-4a82d7f085.zip b/.yarn/cache/slice-ansi-npm-4.0.0-6eeca1d10e-4a82d7f085.zip
deleted file mode 100644
index ef2012f373..0000000000
Binary files a/.yarn/cache/slice-ansi-npm-4.0.0-6eeca1d10e-4a82d7f085.zip and /dev/null differ
diff --git a/.yarn/cache/slugify-npm-1.6.5-6db25d7016-a955a1b600.zip b/.yarn/cache/slugify-npm-1.6.5-6db25d7016-a955a1b600.zip
deleted file mode 100644
index 3cea733dfa..0000000000
Binary files a/.yarn/cache/slugify-npm-1.6.5-6db25d7016-a955a1b600.zip and /dev/null differ
diff --git a/.yarn/cache/slugify-npm-1.6.6-7ce458677d-04773c2d3b.zip b/.yarn/cache/slugify-npm-1.6.6-7ce458677d-04773c2d3b.zip
new file mode 100644
index 0000000000..0630a8498b
Binary files /dev/null and b/.yarn/cache/slugify-npm-1.6.6-7ce458677d-04773c2d3b.zip differ
diff --git a/.yarn/cache/sortablejs-npm-1.15.0-f3a393abcc-bb82223a66.zip b/.yarn/cache/sortablejs-npm-1.15.0-f3a393abcc-bb82223a66.zip
deleted file mode 100644
index 9028b71d1c..0000000000
Binary files a/.yarn/cache/sortablejs-npm-1.15.0-f3a393abcc-bb82223a66.zip and /dev/null differ
diff --git a/.yarn/cache/sortablejs-npm-1.15.2-73347ae85a-36b20b144f.zip b/.yarn/cache/sortablejs-npm-1.15.2-73347ae85a-36b20b144f.zip
new file mode 100644
index 0000000000..b303125761
Binary files /dev/null and b/.yarn/cache/sortablejs-npm-1.15.2-73347ae85a-36b20b144f.zip differ
diff --git a/.yarn/cache/source-map-npm-0.8.0-beta.0-688a309e94-e94169be64.zip b/.yarn/cache/source-map-npm-0.8.0-beta.0-688a309e94-e94169be64.zip
deleted file mode 100644
index 877220ab43..0000000000
Binary files a/.yarn/cache/source-map-npm-0.8.0-beta.0-688a309e94-e94169be64.zip and /dev/null differ
diff --git a/.yarn/cache/source-map-support-npm-0.5.21-09ca99e250-43e98d700d.zip b/.yarn/cache/source-map-support-npm-0.5.21-09ca99e250-43e98d700d.zip
deleted file mode 100644
index 5fc27c8438..0000000000
Binary files a/.yarn/cache/source-map-support-npm-0.5.21-09ca99e250-43e98d700d.zip and /dev/null differ
diff --git a/.yarn/cache/sourcemap-codec-npm-1.4.8-3a1a9e60b1-b57981c056.zip b/.yarn/cache/sourcemap-codec-npm-1.4.8-3a1a9e60b1-b57981c056.zip
deleted file mode 100644
index de84f79779..0000000000
Binary files a/.yarn/cache/sourcemap-codec-npm-1.4.8-3a1a9e60b1-b57981c056.zip and /dev/null differ
diff --git a/.yarn/cache/srcset-npm-4.0.0-4e99d43236-aceb898c92.zip b/.yarn/cache/srcset-npm-4.0.0-4e99d43236-aceb898c92.zip
new file mode 100644
index 0000000000..2c5170b494
Binary files /dev/null and b/.yarn/cache/srcset-npm-4.0.0-4e99d43236-aceb898c92.zip differ
diff --git a/.yarn/cache/sshpk-npm-1.17.0-95f17f597f-ba109f65c8.zip b/.yarn/cache/sshpk-npm-1.17.0-95f17f597f-ba109f65c8.zip
deleted file mode 100644
index f3b155f79a..0000000000
Binary files a/.yarn/cache/sshpk-npm-1.17.0-95f17f597f-ba109f65c8.zip and /dev/null differ
diff --git a/.yarn/cache/string-width-npm-5.1.2-bf60531341-7369deaa29.zip b/.yarn/cache/string-width-npm-5.1.2-bf60531341-7369deaa29.zip
new file mode 100644
index 0000000000..bd88405658
Binary files /dev/null and b/.yarn/cache/string-width-npm-5.1.2-bf60531341-7369deaa29.zip differ
diff --git a/.yarn/cache/string.prototype.trim-npm-1.2.8-7ed4517ce8-49eb1a862a.zip b/.yarn/cache/string.prototype.trim-npm-1.2.8-7ed4517ce8-49eb1a862a.zip
new file mode 100644
index 0000000000..543f676ced
Binary files /dev/null and b/.yarn/cache/string.prototype.trim-npm-1.2.8-7ed4517ce8-49eb1a862a.zip differ
diff --git a/.yarn/cache/string.prototype.trimend-npm-1.0.4-a656b8fe24-17e5aa45c3.zip b/.yarn/cache/string.prototype.trimend-npm-1.0.4-a656b8fe24-17e5aa45c3.zip
deleted file mode 100644
index 3a6cb8db61..0000000000
Binary files a/.yarn/cache/string.prototype.trimend-npm-1.0.4-a656b8fe24-17e5aa45c3.zip and /dev/null differ
diff --git a/.yarn/cache/string.prototype.trimend-npm-1.0.7-159b9dcfbc-2375516272.zip b/.yarn/cache/string.prototype.trimend-npm-1.0.7-159b9dcfbc-2375516272.zip
new file mode 100644
index 0000000000..93f30c147e
Binary files /dev/null and b/.yarn/cache/string.prototype.trimend-npm-1.0.7-159b9dcfbc-2375516272.zip differ
diff --git a/.yarn/cache/string.prototype.trimstart-npm-1.0.4-b31f5e7c85-3fb06818d3.zip b/.yarn/cache/string.prototype.trimstart-npm-1.0.4-b31f5e7c85-3fb06818d3.zip
deleted file mode 100644
index 477439a720..0000000000
Binary files a/.yarn/cache/string.prototype.trimstart-npm-1.0.4-b31f5e7c85-3fb06818d3.zip and /dev/null differ
diff --git a/.yarn/cache/string.prototype.trimstart-npm-1.0.7-ae2f803b78-13d0c2cb0d.zip b/.yarn/cache/string.prototype.trimstart-npm-1.0.7-ae2f803b78-13d0c2cb0d.zip
new file mode 100644
index 0000000000..187509d052
Binary files /dev/null and b/.yarn/cache/string.prototype.trimstart-npm-1.0.7-ae2f803b78-13d0c2cb0d.zip differ
diff --git a/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip b/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip
new file mode 100644
index 0000000000..84c011395c
Binary files /dev/null and b/.yarn/cache/strip-ansi-npm-7.0.1-668c121204-257f78fa43.zip differ
diff --git a/.yarn/cache/strip-final-newline-npm-2.0.0-340c4f7c66-69412b5e25.zip b/.yarn/cache/strip-final-newline-npm-2.0.0-340c4f7c66-69412b5e25.zip
deleted file mode 100644
index 9253442347..0000000000
Binary files a/.yarn/cache/strip-final-newline-npm-2.0.0-340c4f7c66-69412b5e25.zip and /dev/null differ
diff --git a/.yarn/cache/supports-color-npm-8.1.1-289e937149-c052193a7e.zip b/.yarn/cache/supports-color-npm-8.1.1-289e937149-c052193a7e.zip
deleted file mode 100644
index 3fd0d6c6a4..0000000000
Binary files a/.yarn/cache/supports-color-npm-8.1.1-289e937149-c052193a7e.zip and /dev/null differ
diff --git a/.yarn/cache/terser-npm-5.13.1-c7df10bd07-0b1f5043cf.zip b/.yarn/cache/terser-npm-5.13.1-c7df10bd07-0b1f5043cf.zip
deleted file mode 100644
index b8f30c7eff..0000000000
Binary files a/.yarn/cache/terser-npm-5.13.1-c7df10bd07-0b1f5043cf.zip and /dev/null differ
diff --git a/.yarn/cache/throttleit-npm-1.0.0-6cbcfe7b7b-1b2db4d245.zip b/.yarn/cache/throttleit-npm-1.0.0-6cbcfe7b7b-1b2db4d245.zip
deleted file mode 100644
index f020328c0c..0000000000
Binary files a/.yarn/cache/throttleit-npm-1.0.0-6cbcfe7b7b-1b2db4d245.zip and /dev/null differ
diff --git a/.yarn/cache/through-npm-2.3.8-df5f72a16e-a38c3e0598.zip b/.yarn/cache/through-npm-2.3.8-df5f72a16e-a38c3e0598.zip
deleted file mode 100644
index 425b87ec87..0000000000
Binary files a/.yarn/cache/through-npm-2.3.8-df5f72a16e-a38c3e0598.zip and /dev/null differ
diff --git a/.yarn/cache/tmp-npm-0.2.1-a9c8d9c0ca-8b12146541.zip b/.yarn/cache/tmp-npm-0.2.1-a9c8d9c0ca-8b12146541.zip
deleted file mode 100644
index d47a2298ad..0000000000
Binary files a/.yarn/cache/tmp-npm-0.2.1-a9c8d9c0ca-8b12146541.zip and /dev/null differ
diff --git a/.yarn/cache/tough-cookie-npm-2.5.0-79a2fe43fe-16a8cd0902.zip b/.yarn/cache/tough-cookie-npm-2.5.0-79a2fe43fe-16a8cd0902.zip
deleted file mode 100644
index 74e27e7464..0000000000
Binary files a/.yarn/cache/tough-cookie-npm-2.5.0-79a2fe43fe-16a8cd0902.zip and /dev/null differ
diff --git a/.yarn/cache/tr46-npm-1.0.1-9547f343a4-96d4ed46bc.zip b/.yarn/cache/tr46-npm-1.0.1-9547f343a4-96d4ed46bc.zip
deleted file mode 100644
index 3130815a0d..0000000000
Binary files a/.yarn/cache/tr46-npm-1.0.1-9547f343a4-96d4ed46bc.zip and /dev/null differ
diff --git a/.yarn/cache/tsconfig-paths-npm-3.14.1-17a815b5c5-8afa01c673.zip b/.yarn/cache/tsconfig-paths-npm-3.14.1-17a815b5c5-8afa01c673.zip
deleted file mode 100644
index 98a7ab1f87..0000000000
Binary files a/.yarn/cache/tsconfig-paths-npm-3.14.1-17a815b5c5-8afa01c673.zip and /dev/null differ
diff --git a/.yarn/cache/tsconfig-paths-npm-3.15.0-ff68930e0e-59f35407a3.zip b/.yarn/cache/tsconfig-paths-npm-3.15.0-ff68930e0e-59f35407a3.zip
new file mode 100644
index 0000000000..abfe8dd47e
Binary files /dev/null and b/.yarn/cache/tsconfig-paths-npm-3.15.0-ff68930e0e-59f35407a3.zip differ
diff --git a/.yarn/cache/tunnel-agent-npm-0.6.0-64345ab7eb-05f6510358.zip b/.yarn/cache/tunnel-agent-npm-0.6.0-64345ab7eb-05f6510358.zip
deleted file mode 100644
index 5256e20085..0000000000
Binary files a/.yarn/cache/tunnel-agent-npm-0.6.0-64345ab7eb-05f6510358.zip and /dev/null differ
diff --git a/.yarn/cache/tweetnacl-npm-0.14.5-a3f766c0d1-6061daba17.zip b/.yarn/cache/tweetnacl-npm-0.14.5-a3f766c0d1-6061daba17.zip
deleted file mode 100644
index 2811987dbb..0000000000
Binary files a/.yarn/cache/tweetnacl-npm-0.14.5-a3f766c0d1-6061daba17.zip and /dev/null differ
diff --git a/.yarn/cache/type-fest-npm-0.21.3-5ff2a9c6fd-e6b32a3b38.zip b/.yarn/cache/type-fest-npm-0.21.3-5ff2a9c6fd-e6b32a3b38.zip
deleted file mode 100644
index 89f3fd57a9..0000000000
Binary files a/.yarn/cache/type-fest-npm-0.21.3-5ff2a9c6fd-e6b32a3b38.zip and /dev/null differ
diff --git a/.yarn/cache/typed-array-buffer-npm-1.0.0-95cb610310-3e0281c79b.zip b/.yarn/cache/typed-array-buffer-npm-1.0.0-95cb610310-3e0281c79b.zip
new file mode 100644
index 0000000000..7e8dc8f1ed
Binary files /dev/null and b/.yarn/cache/typed-array-buffer-npm-1.0.0-95cb610310-3e0281c79b.zip differ
diff --git a/.yarn/cache/typed-array-byte-length-npm-1.0.0-94d79975ca-b03db16458.zip b/.yarn/cache/typed-array-byte-length-npm-1.0.0-94d79975ca-b03db16458.zip
new file mode 100644
index 0000000000..9cd6f34788
Binary files /dev/null and b/.yarn/cache/typed-array-byte-length-npm-1.0.0-94d79975ca-b03db16458.zip differ
diff --git a/.yarn/cache/typed-array-byte-offset-npm-1.0.0-8cbb911cf5-04f6f02d0e.zip b/.yarn/cache/typed-array-byte-offset-npm-1.0.0-8cbb911cf5-04f6f02d0e.zip
new file mode 100644
index 0000000000..2318610bbc
Binary files /dev/null and b/.yarn/cache/typed-array-byte-offset-npm-1.0.0-8cbb911cf5-04f6f02d0e.zip differ
diff --git a/.yarn/cache/typed-array-length-npm-1.0.4-92771b81fc-2228febc93.zip b/.yarn/cache/typed-array-length-npm-1.0.4-92771b81fc-2228febc93.zip
new file mode 100644
index 0000000000..f68a3c2c96
Binary files /dev/null and b/.yarn/cache/typed-array-length-npm-1.0.4-92771b81fc-2228febc93.zip differ
diff --git a/.yarn/cache/universalify-npm-2.0.0-03b8b418a8-2406a4edf4.zip b/.yarn/cache/universalify-npm-2.0.0-03b8b418a8-2406a4edf4.zip
deleted file mode 100644
index fa6b36b077..0000000000
Binary files a/.yarn/cache/universalify-npm-2.0.0-03b8b418a8-2406a4edf4.zip and /dev/null differ
diff --git a/.yarn/cache/untildify-npm-4.0.0-4a8b569825-39ced9c418.zip b/.yarn/cache/untildify-npm-4.0.0-4a8b569825-39ced9c418.zip
deleted file mode 100644
index a88f9ac1d5..0000000000
Binary files a/.yarn/cache/untildify-npm-4.0.0-4a8b569825-39ced9c418.zip and /dev/null differ
diff --git a/.yarn/cache/uuid-npm-8.3.2-eca0baba53-5575a8a75c.zip b/.yarn/cache/uuid-npm-8.3.2-eca0baba53-5575a8a75c.zip
deleted file mode 100644
index 9b583288f2..0000000000
Binary files a/.yarn/cache/uuid-npm-8.3.2-eca0baba53-5575a8a75c.zip and /dev/null differ
diff --git a/.yarn/cache/v8-compile-cache-npm-2.3.0-961375f150-adb0a271ea.zip b/.yarn/cache/v8-compile-cache-npm-2.3.0-961375f150-adb0a271ea.zip
deleted file mode 100644
index 0e04423cd8..0000000000
Binary files a/.yarn/cache/v8-compile-cache-npm-2.3.0-961375f150-adb0a271ea.zip and /dev/null differ
diff --git a/.yarn/cache/vanillajs-datepicker-npm-1.3.4-bc86e15a9c-830958f8af.zip b/.yarn/cache/vanillajs-datepicker-npm-1.3.4-bc86e15a9c-830958f8af.zip
new file mode 100644
index 0000000000..151d4c9230
Binary files /dev/null and b/.yarn/cache/vanillajs-datepicker-npm-1.3.4-bc86e15a9c-830958f8af.zip differ
diff --git a/.yarn/cache/verror-npm-1.10.0-c3f839c579-c431df0bed.zip b/.yarn/cache/verror-npm-1.10.0-c3f839c579-c431df0bed.zip
deleted file mode 100644
index e81972bdea..0000000000
Binary files a/.yarn/cache/verror-npm-1.10.0-c3f839c579-c431df0bed.zip and /dev/null differ
diff --git a/.yarn/cache/vite-npm-2.9.15-da673a6d8d-5edf8afc13.zip b/.yarn/cache/vite-npm-2.9.15-da673a6d8d-5edf8afc13.zip
deleted file mode 100644
index dd78245cd5..0000000000
Binary files a/.yarn/cache/vite-npm-2.9.15-da673a6d8d-5edf8afc13.zip and /dev/null differ
diff --git a/.yarn/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip b/.yarn/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip
new file mode 100644
index 0000000000..c6bb0e4ef7
Binary files /dev/null and b/.yarn/cache/vite-npm-4.5.3-5cedc7cb8f-fd3f512ce4.zip differ
diff --git a/.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip b/.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip
new file mode 100644
index 0000000000..0f1e9805f7
Binary files /dev/null and b/.yarn/cache/volar-service-html-npm-0.0.34-32b6d24136-83b50cd805.zip differ
diff --git a/.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip b/.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip
new file mode 100644
index 0000000000..d53f3521ee
Binary files /dev/null and b/.yarn/cache/volar-service-pug-npm-0.0.34-6f5429e17c-4691aa1c8e.zip differ
diff --git a/.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip b/.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip
new file mode 100644
index 0000000000..d83607888b
Binary files /dev/null and b/.yarn/cache/vscode-html-languageservice-npm-5.1.2-2ea2618bdd-3a2a5ee5ad.zip differ
diff --git a/.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip b/.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip
new file mode 100644
index 0000000000..75e2c086b6
Binary files /dev/null and b/.yarn/cache/vscode-jsonrpc-npm-8.2.0-b7d2e5b553-f302a01e59.zip differ
diff --git a/.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip b/.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip
new file mode 100644
index 0000000000..bcb5ae5b4e
Binary files /dev/null and b/.yarn/cache/vscode-languageserver-protocol-npm-3.17.5-2b07e16989-dfb42d276d.zip differ
diff --git a/.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip b/.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip
new file mode 100644
index 0000000000..b1edfda12d
Binary files /dev/null and b/.yarn/cache/vscode-languageserver-textdocument-npm-1.0.11-6fc94d2b7b-ea7cdc9d4f.zip differ
diff --git a/.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip b/.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip
new file mode 100644
index 0000000000..ec214b2903
Binary files /dev/null and b/.yarn/cache/vscode-languageserver-types-npm-3.17.5-aca3b71a5a-79b420e757.zip differ
diff --git a/.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip b/.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip
new file mode 100644
index 0000000000..6dadd110c9
Binary files /dev/null and b/.yarn/cache/vscode-uri-npm-3.0.8-56f46b9d24-5142491268.zip differ
diff --git a/.yarn/cache/vue-demi-npm-0.13.1-a467bc3a9a-d26b060258.zip b/.yarn/cache/vue-demi-npm-0.13.1-a467bc3a9a-d26b060258.zip
deleted file mode 100644
index 570ed5bd38..0000000000
Binary files a/.yarn/cache/vue-demi-npm-0.13.1-a467bc3a9a-d26b060258.zip and /dev/null differ
diff --git a/.yarn/cache/vue-demi-npm-0.14.5-6e9e31189b-ff44b9372b.zip b/.yarn/cache/vue-demi-npm-0.14.5-6e9e31189b-ff44b9372b.zip
new file mode 100644
index 0000000000..413aac531f
Binary files /dev/null and b/.yarn/cache/vue-demi-npm-0.14.5-6e9e31189b-ff44b9372b.zip differ
diff --git a/.yarn/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip b/.yarn/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip
deleted file mode 100644
index 175f3e8846..0000000000
Binary files a/.yarn/cache/vue-eslint-parser-npm-9.0.3-1d52721799-61248eb504.zip and /dev/null differ
diff --git a/.yarn/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip b/.yarn/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip
new file mode 100644
index 0000000000..9ec85e189e
Binary files /dev/null and b/.yarn/cache/vue-eslint-parser-npm-9.4.2-3e4e696025-67f14c8ea1.zip differ
diff --git a/.yarn/cache/vue-npm-3.2.40-ee1b0f06d2-fb5ca87c16.zip b/.yarn/cache/vue-npm-3.2.40-ee1b0f06d2-fb5ca87c16.zip
deleted file mode 100644
index e4d41c715b..0000000000
Binary files a/.yarn/cache/vue-npm-3.2.40-ee1b0f06d2-fb5ca87c16.zip and /dev/null differ
diff --git a/.yarn/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip b/.yarn/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip
new file mode 100644
index 0000000000..c48b4e5dfe
Binary files /dev/null and b/.yarn/cache/vue-npm-3.4.21-02110aa6d9-3c477982a0.zip differ
diff --git a/.yarn/cache/vue-router-npm-4.1.5-8f6d1df911-cafa2f4e14.zip b/.yarn/cache/vue-router-npm-4.1.5-8f6d1df911-cafa2f4e14.zip
deleted file mode 100644
index 1bb343f57f..0000000000
Binary files a/.yarn/cache/vue-router-npm-4.1.5-8f6d1df911-cafa2f4e14.zip and /dev/null differ
diff --git a/.yarn/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip b/.yarn/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip
new file mode 100644
index 0000000000..6b93953624
Binary files /dev/null and b/.yarn/cache/vue-router-npm-4.3.0-b765d40138-0059261d39.zip differ
diff --git a/.yarn/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip b/.yarn/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip
deleted file mode 100644
index 0a267b628a..0000000000
Binary files a/.yarn/cache/vueuc-npm-0.4.47-ad081ddd15-b82b77a882.zip and /dev/null differ
diff --git a/.yarn/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip b/.yarn/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip
new file mode 100644
index 0000000000..f62e5e32e8
Binary files /dev/null and b/.yarn/cache/vueuc-npm-0.4.58-be5584770c-fb0b9a69be.zip differ
diff --git a/.yarn/cache/webidl-conversions-npm-4.0.2-1d159e6409-c93d8dfe90.zip b/.yarn/cache/webidl-conversions-npm-4.0.2-1d159e6409-c93d8dfe90.zip
deleted file mode 100644
index a75f5ee65f..0000000000
Binary files a/.yarn/cache/webidl-conversions-npm-4.0.2-1d159e6409-c93d8dfe90.zip and /dev/null differ
diff --git a/.yarn/cache/whatwg-url-npm-7.1.0-d6cae01571-fecb07c872.zip b/.yarn/cache/whatwg-url-npm-7.1.0-d6cae01571-fecb07c872.zip
deleted file mode 100644
index 9f21814850..0000000000
Binary files a/.yarn/cache/whatwg-url-npm-7.1.0-d6cae01571-fecb07c872.zip and /dev/null differ
diff --git a/.yarn/cache/which-typed-array-npm-1.1.13-92c18b4878-3828a0d5d7.zip b/.yarn/cache/which-typed-array-npm-1.1.13-92c18b4878-3828a0d5d7.zip
new file mode 100644
index 0000000000..0d9d2479da
Binary files /dev/null and b/.yarn/cache/which-typed-array-npm-1.1.13-92c18b4878-3828a0d5d7.zip differ
diff --git a/.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip b/.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip
deleted file mode 100644
index 518977eb88..0000000000
Binary files a/.yarn/cache/word-wrap-npm-1.2.3-7fb15ab002-30b48f91fc.zip and /dev/null differ
diff --git a/.yarn/cache/wrap-ansi-npm-6.2.0-439a7246d8-6cd96a4101.zip b/.yarn/cache/wrap-ansi-npm-6.2.0-439a7246d8-6cd96a4101.zip
deleted file mode 100644
index aa06055f0b..0000000000
Binary files a/.yarn/cache/wrap-ansi-npm-6.2.0-439a7246d8-6cd96a4101.zip and /dev/null differ
diff --git a/.yarn/cache/wrap-ansi-npm-8.1.0-26a4e6ae28-371733296d.zip b/.yarn/cache/wrap-ansi-npm-8.1.0-26a4e6ae28-371733296d.zip
new file mode 100644
index 0000000000..2ee78f31c8
Binary files /dev/null and b/.yarn/cache/wrap-ansi-npm-8.1.0-26a4e6ae28-371733296d.zip differ
diff --git a/.yarn/cache/ws-npm-8.8.1-955e8c9f58-2152cf862c.zip b/.yarn/cache/ws-npm-8.8.1-955e8c9f58-2152cf862c.zip
deleted file mode 100644
index 120d3587cd..0000000000
Binary files a/.yarn/cache/ws-npm-8.8.1-955e8c9f58-2152cf862c.zip and /dev/null differ
diff --git a/.yarn/cache/yaml-npm-2.1.1-e717f9b915-f48bb20991.zip b/.yarn/cache/yaml-npm-2.1.1-e717f9b915-f48bb20991.zip
deleted file mode 100644
index b2d8391c8a..0000000000
Binary files a/.yarn/cache/yaml-npm-2.1.1-e717f9b915-f48bb20991.zip and /dev/null differ
diff --git a/.yarn/cache/yargs-npm-16.2.0-547873d425-b14afbb51e.zip b/.yarn/cache/yargs-npm-16.2.0-547873d425-b14afbb51e.zip
deleted file mode 100644
index d11c27d510..0000000000
Binary files a/.yarn/cache/yargs-npm-16.2.0-547873d425-b14afbb51e.zip and /dev/null differ
diff --git a/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip b/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip
new file mode 100644
index 0000000000..54c49dc9c6
Binary files /dev/null and b/.yarn/cache/yargs-npm-17.7.2-80b62638e1-73b572e863.zip differ
diff --git a/.yarn/cache/yargs-parser-npm-20.2.9-a1d19e598d-8bb69015f2.zip b/.yarn/cache/yargs-parser-npm-20.2.9-a1d19e598d-8bb69015f2.zip
deleted file mode 100644
index f230038cfc..0000000000
Binary files a/.yarn/cache/yargs-parser-npm-20.2.9-a1d19e598d-8bb69015f2.zip and /dev/null differ
diff --git a/.yarn/cache/yargs-parser-npm-21.1.1-8fdc003314-ed2d96a616.zip b/.yarn/cache/yargs-parser-npm-21.1.1-8fdc003314-ed2d96a616.zip
new file mode 100644
index 0000000000..d68ba748e7
Binary files /dev/null and b/.yarn/cache/yargs-parser-npm-21.1.1-8fdc003314-ed2d96a616.zip differ
diff --git a/.yarn/cache/yauzl-npm-2.10.0-72e70ea021-7f21fe0bba.zip b/.yarn/cache/yauzl-npm-2.10.0-72e70ea021-7f21fe0bba.zip
deleted file mode 100644
index 7a5f10caf5..0000000000
Binary files a/.yarn/cache/yauzl-npm-2.10.0-72e70ea021-7f21fe0bba.zip and /dev/null differ
diff --git a/LICENSE b/LICENSE
index aaed0ef57d..dc6e0c5663 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2008-2022, The IETF Trust
+Copyright (c) 2008-2024, The IETF Trust
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -26,4 +26,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index f7af1034ce..baffc311e7 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,11 @@
 
 [![Release](https://img.shields.io/github/release/ietf-tools/datatracker.svg?style=flat&maxAge=300)](https://github.com/ietf-tools/datatracker/releases)
 [![License](https://img.shields.io/github/license/ietf-tools/datatracker)](https://github.com/ietf-tools/datatracker/blob/main/LICENSE)
-[![Code Coverage](https://codecov.io/gh/ietf-tools/datatracker/branch/feat/bs5/graph/badge.svg?token=V4DXB0Q28C)](https://codecov.io/gh/ietf-tools/datatracker)
-[![Nightly Dev DB Image](https://github.com/ietf-tools/datatracker/actions/workflows/dev-db-nightly.yml/badge.svg)](https://github.com/ietf-tools/datatracker/pkgs/container/datatracker-db)  
-[![Python Version](https://img.shields.io/badge/python-3.9-blue?logo=python&logoColor=white)](#prerequisites)
-[![Django Version](https://img.shields.io/badge/django-2.x-51be95?logo=django&logoColor=white)](#prerequisites)
+[![Code Coverage](https://codecov.io/gh/ietf-tools/datatracker/branch/feat/bs5/graph/badge.svg?token=V4DXB0Q28C)](https://codecov.io/gh/ietf-tools/datatracker)  
+[![Python Version](https://img.shields.io/badge/python-3.12-blue?logo=python&logoColor=white)](#prerequisites)
+[![Django Version](https://img.shields.io/badge/django-4.x-51be95?logo=django&logoColor=white)](#prerequisites)
 [![Node Version](https://img.shields.io/badge/node.js-16.x-green?logo=node.js&logoColor=white)](#prerequisites)
-[![MariaDB Version](https://img.shields.io/badge/mariadb-10-blue?logo=mariadb&logoColor=white)](#prerequisites)
+[![MariaDB Version](https://img.shields.io/badge/postgres-17-blue?logo=postgresql&logoColor=white)](#prerequisites)
 
 ##### The day-to-day front-end to the IETF database for people who work on IETF standards.
 
@@ -18,7 +17,8 @@
 - [**Production Website**](https://datatracker.ietf.org)
 - [Changelog](https://github.com/ietf-tools/datatracker/releases)
 - [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md)
-- [Getting Started](#getting-started)
+- [Getting Started](#getting-started) - *[ tl;dr ](#the-tldr-to-get-going)*
+    - [Creating a Fork](#creating-a-fork)
     - [Git Cloning Tips](#git-cloning-tips)
     - [Docker Dev Environment](docker/README.md)
 - [Database & Assets](#database--assets)
@@ -44,14 +44,24 @@
 
 This project is following the standard **Git Feature Workflow** development model. Learn about all the various steps of the development workflow, from creating a fork to submitting a pull request, in the [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) guide.
 
+> [!TIP]  
 > Make sure to read the [Styleguides](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md#styleguides) section to ensure a cohesive code format across the project.
 
 You can submit bug reports, enhancement and new feature requests in the [discussions](https://github.com/ietf-tools/datatracker/discussions) area. Accepted tickets will be converted to issues.
 
+#### Creating a Fork
+
+Click the <kbd>Fork</kbd> button in the top-right corner of the repository to create a personal copy that you can work on.
+
+> [!NOTE]  
+> Some GitHub Actions might be enabled by default in your fork. You should disable them by going to **Settings** > **Actions** > **General** and selecting **Disable actions** (then Save).
+
 #### Git Cloning Tips
 
 As outlined in the [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) guide, you will first want to create a fork of the datatracker project in your personal GitHub account before cloning it.
 
+Windows developers: [Start with WSL2 from the beginning](https://github.com/ietf-tools/.github/blob/main/docs/windows-dev.md).
+
 Because of the extensive history of this project, cloning the datatracker project locally can take a long time / disk space. You can speed up the cloning process by limiting the history depth, for example *(replace `USERNAME` with your GitHub username)*:
 
 - To fetch only up to the 10 latest commits:
@@ -63,6 +73,25 @@ Because of the extensive history of this project, cloning the datatracker projec
     git clone --shallow-since=DATE https://github.com/USERNAME/datatracker.git
     ```
 
+#### The tl;dr to get going
+
+Note that you will have to have cloned the datatracker code locally - please read the above sections.
+
+Datatracker development is performed using Docker containers. You will need to be able to run docker (and docker-compose) on your machine to effectively develop. It is possible to get a purely native install working, but it is _very complicated_ and typically takes a first time datatracker developer a full day of setup, where the docker setup completes in a small number of minutes.
+
+Many developers are using [VS Code](https://code.visualstudio.com/) and taking advantage of VS Code's ability to start a project in a set of containers. If you are using VS Code, simply start VS Code in your clone and inside VS Code choose `Restart in container`.
+
+If VS Code is not available to you, in your clone, type `cd docker; ./run`
+
+Once the containers are started, run the tests to make sure your checkout is a good place to start from (all tests should pass - if any fail, ask for help at tools-help@). Inside the app container's shell type:
+```sh
+ietf/manage.py test --settings=settings_test
+```
+
+Note that we recently moved the datatracker onto PostgreSQL - you may still find older documentation that suggests testing with settings_sqlitetest. That will no longer work.
+
+For a more detailed description of getting going, see [docker/README.md](docker/README.md).
+
 #### Overview of the datatracker models
 
 A beginning of a [walkthrough of the datatracker models](https://notes.ietf.org/iab-aid-datatracker-database-overview) was prepared for the IAB AID workshop.
@@ -75,10 +104,27 @@ Read the [Docker Dev Environment](docker/README.md) guide to get started.
 
 ### Database & Assets
 
-Nightly database dumps of the datatracker are available at  
-https://www.ietf.org/lib/dt/sprint/ietf_utf8.sql.gz
+Nightly database dumps of the datatracker are available as Docker images: `ghcr.io/ietf-tools/datatracker-db:latest`  
+
+> [!TIP]  
+> In order to update the database in your dev environment to the latest version, you should run the `docker/cleandb` script.
+
+### Blob storage for dev/test
+
+The dev and test environments use [minio](https://github.com/minio/minio) to provide local blob storage. See the settings files for how the app container communicates with the blobstore container. If you need to work with minio directly from outside the containers (to interact with its api or console), use `docker compose` from the top level directory of your clone to expose it at an ephemeral port.
+
+```
+$ docker compose port blobstore 9001
+0.0.0.0:<some ephemeral port>
+
+$ curl -I http://localhost:<some ephemeral port>
+HTTP/1.1 200 OK
+...
+```
+
+
+The minio container exposes the minio api at port 9000 and the minio console at port 9001
 
-> Note that this link is provided as reference only. To update the database in your dev environment to the latest version, you should instead run the `docker/cleandb` script!
 
 ### Frontend Development
 
@@ -96,7 +142,7 @@ Pages will gradually be updated to Vue 3 components. These components are locate
 
 Each Vue 3 app has its own sub-directory. For example, the agenda app is located under `/client/agenda`.
 
-The datatracker makes use of the Django-Vite plugin to point to either the Vite.js server or the precompiled production files. The `DJANGO_VITE_DEV_MODE` flag, found in the `ietf/settings_local.py` file determines whether the Vite.js server is used or not.
+The datatracker makes use of the Django-Vite plugin to point to either the Vite.js server or the precompiled production files. The `DJANGO_VITE["default"]["dev_mode"]` flag, found in the `ietf/settings_local.py` file determines whether the Vite.js server is used or not.
 
 In development mode, you must start the Vite.js development server, in addition to the usual Datatracker server:
 
@@ -116,10 +162,10 @@ This will create packages under `ietf/static/dist-neue`, which are then served b
 
 #### Parcel *(Legacy/jQuery)*
 
-The Datatracker includes these packages from the various Javascript and CSS files in `ietf/static/js` and `ietf/static/css`, respectively.
+The Datatracker includes these packages from the various Javascript and CSS files in `ietf/static/js` and `ietf/static/css` respectively, bundled using Parcel.
 Static images are likewise in `ietf/static/images`.
 
-Whenever changes are made to the files under `ietf/static`, you must re-run `parcel` to package them:
+Whenever changes are made to the files under `ietf/static`, you must re-run the build command to package them:
 
 ``` shell
 yarn legacy:build
@@ -202,28 +248,31 @@ before activating a new release.
 
 From a datatracker container, run the command:
 ```sh
-./ietf/manage.py test --settings=settings_local_sqlitetest
+./ietf/manage.py test --settings=settings_test
 ```
 
+> [!TIP]  
 > You can limit the run to specific tests using the `--pattern` argument.
 
 ### Frontend Tests
 
-Frontend tests are done via Cypress. There're 2 different type of tests:
+Frontend tests are done via Playwright. There're 2 different type of tests:
 
 - Tests that test Vue pages / components and run natively without any external dependency.
 - Tests that require a running datatracker instance to test against (usually legacy views).
 
+> [!IMPORTANT]  
 > Make sure you have Node.js 16.x or later installed on your machine.
 
 #### Run Vue Tests
 
-> :warning: All commands below **MUST** be run from the `./playwright` directory, unless noted otherwise.
+> [!WARNING]  
+> All commands below **MUST** be run from the `./playwright` directory, unless noted otherwise.
 
 1. Run **once** to install dependencies on your system:
     ```sh
     npm install
-    npx playwright install --with-deps
+    npm run install-deps
     ```
 
 2. Run in a **separate process**, from the **project root directory**:
@@ -251,15 +300,20 @@ Frontend tests are done via Cypress. There're 2 different type of tests:
 
 First, you need to start a datatracker instance (dev or prod), ideally from a docker container, exposing the 8000 port.
 
-To run the tests headlessly (command line mode):
+> [!WARNING]  
+> All commands below **MUST** be run from the `./playwright` directory.
+
+1. Run **once** to install dependencies on your system:
 ```sh
-yarn cypress:legacy
+npm install
+npm run install-deps
 ```
-To run the tests visually **(CANNOT run in docker)**:
+
+2. Run the tests headlessly (command line mode):
 ```sh
-yarn cypress:legacy:open
+npm run test:legacy
 ```
-> It can take a few seconds before the tests start or the GUI opens.
+
 
 ### Diff Tool
 
diff --git a/bin/add-old-drafts-from-archive.py b/bin/add-old-drafts-from-archive.py
deleted file mode 100755
index e169ecdcfc..0000000000
--- a/bin/add-old-drafts-from-archive.py
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/env python
-# Copyright The IETF Trust 2017-2019, All Rights Reserved
-
-import datetime
-import os
-import sys
-from pathlib import Path
-from contextlib import closing
-
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-import django
-django.setup()
-
-from django.conf import settings
-from django.core.validators import validate_email, ValidationError
-from ietf.utils.draft import PlaintextDraft
-from ietf.submit.utils import update_authors
-
-import debug                            # pyflakes:ignore
-
-from ietf.doc.models import Document, NewRevisionDocEvent, DocEvent, State
-from ietf.person.models import Person
-
-system = Person.objects.get(name="(System)")
-expired = State.objects.get(type='draft',slug='expired')
-
-names = set()
-print 'collecting draft names ...'
-versions = 0
-for p in Path(settings.INTERNET_DRAFT_PATH).glob('draft*.txt'):
-    n = str(p).split('/')[-1].split('-')
-    if n[-1][:2].isdigit():
-        name = '-'.join(n[:-1])
-        if '--' in name  or '.txt' in name or '[' in name or '=' in name or '&' in name:
-            continue
-        if name.startswith('draft-draft-'):
-            continue
-        if name == 'draft-ietf-trade-iotp-v1_0-dsig':
-            continue
-        if len(n[-1]) != 6:
-            continue
-        if name.startswith('draft-mlee-'):
-            continue
-        names.add('-'.join(n[:-1]))
-
-count=0
-print 'iterating through names ...'
-for name in sorted(names):
-    if not Document.objects.filter(name=name).exists():
-        paths = list(Path(settings.INTERNET_DRAFT_PATH).glob('%s-??.txt'%name))
-        paths.sort()
-        doc = None
-        for p in paths:
-            n = str(p).split('/')[-1].split('-')
-            rev = n[-1][:2]
-            with open(str(p)) as txt_file:
-                raw = txt_file.read()
-                try:
-                    text = raw.decode('utf8')
-                except UnicodeDecodeError:
-                    text = raw.decode('latin1')
-                try:
-                    draft = PlaintextDraft(text, txt_file.name, name_from_source=True)
-                except Exception as e:
-                    print name, rev, "Can't parse", p,":",e
-                    continue
-            if draft.errors and draft.errors.keys()!=['draftname',]:
-                print "Errors - could not process", name, rev, datetime.datetime.fromtimestamp(p.stat().st_mtime), draft.errors, draft.get_title().encode('utf8')
-            else:
-                time = datetime.datetime.fromtimestamp(p.stat().st_mtime)
-                if not doc:
-                    doc = Document.objects.create(name=name,
-                                                  time=time,
-                                                  type_id='draft',
-                                                  title=draft.get_title(),
-                                                  abstract=draft.get_abstract(),
-                                                  rev = rev,
-                                                  pages=draft.get_pagecount(),
-                                                  words=draft.get_wordcount(),
-                                                  expires=time+datetime.timedelta(settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
-                                                 )
-                    DocAlias.objects.create(name=doc.name).docs.add(doc)
-                    doc.states.add(expired)
-                # update authors
-                authors = []
-                for author in draft.get_author_list():
-                    full_name, first_name, middle_initial, last_name, name_suffix, email, country, company = author
-
-                    author_name = full_name.replace("\n", "").replace("\r", "").replace("<", "").replace(">", "").strip()
-
-                    if email:
-                        try:
-                            validate_email(email)
-                        except ValidationError:
-                            email = ""
-
-                    def turn_into_unicode(s):
-                        if s is None:
-                            return u""
-
-                        if isinstance(s, unicode):
-                            return s
-                        else:
-                            try:
-                                return s.decode("utf-8")
-                            except UnicodeDecodeError:
-                                try:
-                                    return s.decode("latin-1")
-                                except UnicodeDecodeError:
-                                    return ""
-
-                    author_name = turn_into_unicode(author_name)
-                    email = turn_into_unicode(email)
-                    company = turn_into_unicode(company)
-
-                    authors.append({
-                        "name": author_name,
-                        "email": email,
-                        "affiliation": company,
-                        "country": country
-                    })
-                dummysubmission=type('', (), {})() #https://stackoverflow.com/questions/19476816/creating-an-empty-object-in-python
-                dummysubmission.authors = authors
-                update_authors(doc,dummysubmission)
-                
-                # add a docevent with words explaining where this came from
-                events = []
-                e = NewRevisionDocEvent.objects.create(
-                        type="new_revision",
-                        doc=doc,
-                        rev=rev,
-                        by=system,
-                        desc="New version available: <b>%s-%s.txt</b>" % (doc.name, doc.rev),
-                        time=time,
-                )
-                events.append(e)
-                e = DocEvent.objects.create(
-                        type="comment",
-                        doc = doc,
-                        rev = rev,
-                        by = system,
-                        desc = "Revision added from id-archive on %s by %s"%(datetime.date.today(),sys.argv[0]),
-                        time=time,
-                )
-                events.append(e)
-                doc.time = time
-                doc.rev = rev
-                doc.save_with_history(events)
-                print "Added",name, rev
diff --git a/bin/check-copyright b/bin/check-copyright
deleted file mode 100755
index 6698e3fda3..0000000000
--- a/bin/check-copyright
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/usr/bin/env python3.7
-# -*- mode: python; coding: utf-8 -*-
-# Copyright The IETF Trust 2019, All Rights Reserved
-"""
-NAME
-	$program - Check for current copyright notice in given files
-
-SYNOPSIS
-	$program [OPTIONS] ARGS
-
-DESCRIPTION
-	Given a list of files or filename wildcard patterns, check all for
-	an IETF Trust copyright notice with the current year.  Optionally
-        generate a diff on standard out which can be used by 'patch'.
-
-        An invocation similar to the following can be particularly useful with
-        a set of changed version-controlled files, as it will fix up the
-        Copyright statements of any python files with pending changes:
-
-        $ check-copyright -p $(svn st | cut -c 9- | grep '\.py$' ) | patch -p0
-
-
-%(options)s
-
-AUTHOR
-	Written by Henrik Levkowetz, <henrik@tools.ietf.org>
-
-COPYRIGHT
-	Copyright 2019 the IETF Trust
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the Simplified BSD license as published by the
-        Open Source Initiative at http://opensource.org/licenses/BSD-2-Clause.
-
-"""
-
-
-import datetime
-import os
-import sys
-import time
-
-path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-if not path in sys.path:
-    sys.path.insert(0, path)
-
-import getopt
-import re
-import pytz
-import tzparse
-import debug
-
-version = "1.0.0"
-program = os.path.basename(sys.argv[0])
-progdir = os.path.dirname(sys.argv[0])
-
-debug.debug = True
-
-# ----------------------------------------------------------------------
-# Parse options
-
-options = ""
-for line in re.findall("\n +(if|elif) +opt in \[(.+)\]:\s+#(.+)\n", open(sys.argv[0]).read()):
-    if not options:
-        options += "OPTIONS\n"
-    options += "        %-16s %s\n" % (line[1].replace('"', ''), line[2])
-options = options.strip()
-
-# with ' < 1:' on the next line, this is a no-op:
-if len(sys.argv) < 1:
-    print(__doc__ % locals())
-    sys.exit(1)
-
-try:
-    opts, files = getopt.gnu_getopt(sys.argv[1:], "hC:pvV", ["help", "copyright=", "patch", "version", "verbose",])
-except Exception as e:
-    print( "%s: %s" % (program, e))
-    sys.exit(1)
-
-# ----------------------------------------------------------------------
-# Handle options
-
-# set default values, if any
-opt_verbose = 0
-opt_patch = False
-opt_copyright = "Copyright The IETF Trust {years}, All Rights Reserved"
-
-# handle individual options
-for opt, value in opts:
-    if   opt in ["-h", "--help"]: # Output this help, then exit
-        print( __doc__ % locals() )
-        sys.exit(1)
-    elif opt in ["-p", "--patch"]: # Generate patch output rather than error messages
-        opt_patch = True
-    elif opt in ["-C", "--copyright"]: # Copyright line pattern using {years} for years
-        opt_copyright = value
-    elif opt in ["-V", "--version"]: # Output version information, then exit
-        print( program, version )
-        sys.exit(0)
-    elif opt in ["-v", "--verbose"]: # Be more verbose
-        opt_verbose += 1
-
-# ----------------------------------------------------------------------
-def say(s):
-    sys.stderr.write("%s\n" % (s))
-
-# ----------------------------------------------------------------------
-def note(s):
-    if opt_verbose:
-        sys.stderr.write("%s\n" % (s))
-
-# ----------------------------------------------------------------------
-def die(s, error=1):
-    sys.stderr.write("\n%s: Error: %s\n\n" % (program, s))
-    sys.exit(error)
-
-# ----------------------------------------------------------------------
-
-def pipe(cmd, inp=None):
-    import shlex
-    from subprocess import Popen, PIPE
-    args = shlex.split(cmd)
-    bufsize = 4096
-    stdin = PIPE if inp else None
-    pipe = Popen(args, stdin=stdin, stdout=PIPE, stderr=PIPE, bufsize=bufsize, encoding='utf-8', universal_newlines=True)
-    out, err = pipe.communicate(inp)
-    code = pipe.returncode
-    if code != 0:
-        raise OSError(err)
-    return out
-
-# ----------------------------------------------------------------------
-def split_loginfo(line):
-    try:
-        parts = line.split()
-        rev  = parts[0][1:]
-        who  = parts[2]
-        date = parts[4]
-        time = parts[5]
-        tz   = parts[6]
-        when = tzparse.tzparse(" ".join(parts[4:7]), "%Y-%m-%d %H:%M:%S %Z")
-        when = when.astimezone(pytz.utc)
-    except ValueError as e:
-        sys.stderr.write("Bad log line format: %s\n  %s\n" % (line, e))
-
-    return rev, who, when
-
-# ----------------------------------------------------------------------
-def get_first_commit(path):
-    note("Getting first commit for '%s'" % path)
-    cmd = 'svn log %s' % path
-    if opt_verbose > 1:
-        note("Running '%s' ..." % cmd)
-    try:
-        commit_log = pipe(cmd)
-        commit_log = commit_log.splitlines()
-        commit_log.reverse()
-        for line in commit_log:
-            if re.search(loginfo_format, line):
-                rev, who, when = split_loginfo(line)
-                break
-            else:
-                pass
-    except OSError:
-        rev, who, when = None, None, datetime.datetime.now()
-    return { path: { 'rev': rev, 'who': who, 'date': when.strftime('%Y-%m-%d %H:%M:%S'), }, }
-
-
-# ----------------------------------------------------------------------
-# The program itself    
-
-import os
-import json
-
-cwd = os.getcwd()
-
-# Get current initinfo from cache and svn
-cachefn = os.path.join(os.environ.get('HOME', '.'), '.initinfo')
-
-if os.path.exists(cachefn):
-    note("Reading initinfo cache file %s" % cachefn)
-    with open(cachefn, "r") as file:
-        cache = json.load(file)
-else:
-    sys.stderr.write("No  initinfo cache file found -- will have to extract all information from SVN.\n"+
-        "This may take some time.\n\n")
-    cache = {}
-initinfo = cache
-
-merged_revs = {}
-write_cache = False
-loginfo_format = r'^r[0-9]+ \| [^@]+@[^@]+ \| \d\d\d\d-\d\d-\d\d '
-
-year = time.strftime('%Y')
-copyright_re = "(?i)"+opt_copyright.format(years=r"(\d+-)?\d+")
-for path in files:
-    try:
-        if not os.path.exists(path):
-            note("File does not exist: %s" % path)
-            continue
-        note("Checking path %s" % path)
-        if not path in initinfo:
-            initinfo.update(get_first_commit(path))
-            write_cache = True
-        date = initinfo[path]['date']
-        init = date[:4]
-        
-        copyright_year_re = "(?i)"+opt_copyright.format(years=r"({init}-)?{year}".format(init=init, year=year))
-        with open(path) as file:
-            try:
-                chunk = file.read(4000)
-            except UnicodeDecodeError as e:
-                sys.stderr.write(f'Error when reading {file.name}: {e}\n')
-                raise
-            if os.path.basename(path) == '__init__.py' and len(chunk)==0:
-                continue
-            if not re.search(copyright_year_re, chunk):
-                if year == init:
-                    copyright = opt_copyright.format(years=year)
-                else:
-                    copyright = opt_copyright.format(years=f"{init}-{year}")
-                if opt_patch:
-                    print(f"--- {file.name}\t(original)")
-                    print(f"+++ {file.name}\t(modified)")
-                    if not re.search(copyright_re, chunk):
-                        # Simple case, just insert copyright at the top
-                        print( "@@ -1,3 +1,4 @@")
-                        print(f"+# {copyright}")
-                        for i, line in list(enumerate(chunk.splitlines()))[:3]:
-                            print(f" {line}")
-                    else:
-                        # Find old copyright, then emit preceding lines,
-                        # change, and following lines.
-                        pos = None
-                        for i, line in enumerate(chunk.splitlines(), start=1):
-                            if re.search(copyright_re, line):
-                                pos = i
-                                break
-                        if not pos:
-                            raise RuntimeError("Unexpected state: Expected a copyright line, but found none")
-                        print(f"@@ -1,{pos+3} +1,{pos+3} @@")
-                        for i, line in list(enumerate(chunk.splitlines(), start=1))[:pos+3]:
-                            if i == pos:
-                                print(f"-{line}")
-                                print(f"+# {copyright}")
-                            else:
-                                print(f" {line}")
-                else:
-                    sys.stderr.write(f"{path}(1): Error: Missing or bad copyright.  Expected: {copyright}")
-    except Exception:
-        if write_cache:
-            cache = initinfo
-            with open(cachefn, "w") as file:
-                json.dump(cache, file, indent=2, sort_keys=True)
-        raise
-
-if write_cache:
-    cache = initinfo
-    with open(cachefn, "w") as file:
-        json.dump(cache, file, indent=2, sort_keys=True)
-
diff --git a/bin/count.c b/bin/count.c
deleted file mode 100644
index 786f15eb97..0000000000
--- a/bin/count.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <stdio.h>
-
-int main( void )
-{
-    int c;
-    int count = 0;
-
-    //turn off buffering
-    setvbuf(stdin, NULL, _IONBF, 0);
-    setvbuf(stdout, NULL, _IONBF, 0);
-    setvbuf(stderr, NULL, _IONBF, 0);
-
-    c = fgetc(stdin);
-    while(c != EOF)
-    {
-	if (c=='.' || c=='E' || c=='F' || c=='s') count++; else count=0;
-	fputc(c, stdout);
-	fflush(stdout);
-	if (count && count % 76 == 0) {
-	    fprintf(stderr, "%4d\n", count);
-	    fflush(stderr);
-	}
-	c = fgetc(stdin);
-    }
-    return 0;
-}
diff --git a/bin/daily b/bin/daily
deleted file mode 100755
index 40cf3fd2be..0000000000
--- a/bin/daily
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# Nightly datatracker jobs.
-# 
-# This script is expected to be triggered by cron from
-# /etc/cron.d/datatracker
-export LANG=en_US.UTF-8
-export PYTHONIOENCODING=utf-8
-
-# Make sure we stop if something goes wrong:
-program=${0##*/}
-trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR
-
-# Datatracker directory
-DTDIR=/a/www/ietf-datatracker/web
-cd $DTDIR/
-
-logger -p user.info -t cron "Running $DTDIR/bin/daily"
-
-# Run the hourly jobs first
-$DTDIR/bin/hourly
-
-# Set up the virtual environment
-source $DTDIR/env/bin/activate
-
-
-# Update our information about the current version of some commands we use
-$DTDIR/ietf/manage.py update_external_command_info
-
-# Get IANA-registered yang models
-#YANG_IANA_DIR=$(python -c 'import ietf.settings; print ietf.settings.SUBMIT_YANG_IANA_MODEL_DIR')
-# Hardcode the rsync target to avoid any unwanted deletes:
-# rsync -avzq --delete rsync.ietf.org::iana/yang-parameters/ /a/www/ietf-ftp/yang/ianamod/
-rsync -avzq --delete /a/www/ietf-ftp/iana/yang-parameters/ /a/www/ietf-ftp/yang/ianamod/
-
-# Get Yang models from Yangcatalog.
-rsync -avzq rsync://yangcatalog.org:10873/yangdeps /a/www/ietf-ftp/yang/catalogmod/
-
-# Populate the yang repositories
-$DTDIR/ietf/manage.py populate_yang_model_dirs -v0
-
-# Re-run yang checks on active documents
-$DTDIR/ietf/manage.py run_yang_model_checks -v0
-
-# Expire internet drafts
-# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
-$DTDIR/ietf/bin/expire-ids
-
-# Send nomcom reminders about nomination acceptance and questionnaires
-$DTDIR/ietf/manage.py send_reminders
-
-# Expire last calls
-# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
-$DTDIR/ietf/bin/expire-last-calls
-
-# Run an extended version of the rfc editor update, to catch changes
-# with backdated timestamps
-# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
-$DTDIR/ietf/bin/rfc-editor-index-updates -d 1969-01-01
-
-# Fetch meeting attendance data from ietf.org/registration/attendees
-$DTDIR/ietf/manage.py fetch_meeting_attendance --latest 2
-
-# Send reminders originating from the review app
-$DTDIR/ietf/bin/send-review-reminders
-
-# Purge older PersonApiKeyEvents
-$DTDIR/ietf/manage.py purge_old_personal_api_key_events 14
diff --git a/bin/drop-new-tables b/bin/drop-new-tables
deleted file mode 100755
index ec1594ae26..0000000000
--- a/bin/drop-new-tables
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Drop tables which don't exist in the database dump.
-
-[ -n "$1" ] || { echo -e "\nUsage: $0 DUMPFILE\n\nError: No database dump file given"; exit 1; }
-
-zcat $1 | head | grep "Database: ietf_utf8" || { echo "Is this a database dump?  Expected to see 'Database: ietf_utf8' "; exit 1; }
-
-echo -e "\nSQL commands:\n"
-
-diff <(zcat $1 | grep '^DROP TABLE IF EXISTS' | tr -d '`;' | field 5) <(ietf/manage.py dbshell <<< 'show tables;' | tail -n +2) | grep '^>' | awk '{print "drop table if exists", $2, ";";}' | tee /dev/stderr | ietf/manage.py dbshell
-
-echo -e "\nDone"
diff --git a/bin/dump-to-names-json b/bin/dump-to-names-json
deleted file mode 100644
index 9c7dfac07d..0000000000
--- a/bin/dump-to-names-json
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# This script provides a limited selected dump of database content with the
-# purpose of generating a test fixture that provides the test data needed
-# by the test suite.
-#
-# The generated data fixture is sorted and normalized in order to produce
-# minimal commit diffs which reflect only actual changes in the fixture data,
-# without apparent changes resulting only from ordering changes.
-
-set -x
-ietf/manage.py dumpdata --indent 1 doc.State doc.BallotType doc.StateType       \
-        mailtrigger.MailTrigger mailtrigger.Recipient name utils.VersionInfo    \
-        group.GroupFeatures stats.CountryAlias dbtemplate.DBTemplate            \
-        | jq --sort-keys "sort_by(.model, .pk)"                                 \
-        | jq '[.[] | select(.model!="dbtemplate.dbtemplate" or .pk==354)]' > ietf/name/fixtures/names.json
diff --git a/bin/every15m b/bin/every15m
deleted file mode 100755
index c0b0752f6a..0000000000
--- a/bin/every15m
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# datatracker jobs to run every 15 minutes
-# 
-# This script is expected to be triggered by cron from
-# /etc/cron.d/datatracker
-
-export LANG=en_US.UTF-8
-export PYTHONIOENCODING=utf-8
-
-DTDIR=/a/www/ietf-datatracker/web
-cd $DTDIR/
-
-# Set up the virtual environment
-source $DTDIR/env/bin/activate
-
-logger -p user.info -t cron "Running $DTDIR/bin/every15m"
-
-# Send mail scheduled to go out at certain times
-$DTDIR/ietf/bin/send-scheduled-mail all
-
-# Reparse the last _year_ of RFC index entries 
-# (which is the default if -d is not provided)
-# until https://github.com/ietf-tools/datatracker/issues/3734
-# is addressed.
-# This takes about 20s on production as of 2022-08-11
-$DTDIR/ietf/bin/rfc-editor-index-updates
-
diff --git a/bin/hourly b/bin/hourly
deleted file mode 100755
index 77310302ce..0000000000
--- a/bin/hourly
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-# Hourly datatracker jobs
-# 
-# This script is expected to be triggered by cron from
-# /etc/cron.d/datatracker
-export LANG=en_US.UTF-8
-export PYTHONIOENCODING=utf-8
-
-# Make sure we stop if something goes wrong:
-program=${0##*/}
-trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR
-
-DTDIR=/a/www/ietf-datatracker/web
-cd $DTDIR/
-
-# Set up the virtual environment
-source $DTDIR/env/bin/activate
-
-logger -p user.info -t cron "Running $DTDIR/bin/hourly"
-
-# *** Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: ***
-
-# # Update community lists.  Remove once the community rewrite (will be around 6.20.0 )
-# $DTDIR/ietf/manage.py update_community_lists
-# 
-# # Polling backup for iana and rfc-editory post APIs
-$DTDIR/ietf/bin/iana-changes-updates
-$DTDIR/ietf/bin/iana-protocols-updates
-# $DTDIR/ietf/bin/rfc-editor-index-updates
-# $DTDIR/ietf/bin/rfc-editor-queue-updates
-# 
-# # Generate alias and virtual files for draft email aliases
-# $DTDIR/ietf/bin/generate-draft-aliases && \
-# 	( cd /a/postfix; /usr/sbin/postalias -o draft-aliases; ) && \
-# 	( cd /a/postfix; /usr/sbin/postmap -o draft-virtual; )
-# 
-# # Generate alias and virtual files for group email aliases
-# $DTDIR/ietf/bin/generate-wg-aliases && \
-# 	( cd /a/postfix; /usr/sbin/postalias -o group-aliases; ) && \
-# 	( cd /a/postfix; /usr/sbin/postmap -o group-virtual; )
-# 
-# Generate some static files 
-ID=/a/ietfdata/doc/draft/repository
-DERIVED=/a/ietfdata/derived
-DOWNLOAD=/a/www/www6s/download
-
-export TMPDIR=/a/tmp
-
-TMPFILE1=`mktemp` || exit 1
-TMPFILE2=`mktemp` || exit 1
-TMPFILE3=`mktemp` || exit 1
-TMPFILE4=`mktemp` || exit 1
-TMPFILE5=`mktemp` || exit 1
-TMPFILE6=`mktemp` || exit 1
-TMPFILE7=`mktemp` || exit 1
-TMPFILE8=`mktemp` || exit 1
-TMPFILE9=`mktemp` || exit 1
-TMPFILEA=`mktemp` || exit 1
-TMPFILEB=`mktemp` || exit 1
-
-chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7 $TMPFILE8 $TMPFILE9 $TMPFILEA $TMPFILEB
-
-python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1
-python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2
-python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3
-cp $TMPFILE1 $TMPFILE4
-cp $TMPFILE2 $TMPFILE5
-cp $TMPFILE3 $TMPFILE6
-cp $TMPFILE1 $TMPFILE8
-cp $TMPFILE2 $TMPFILE9
-cp $TMPFILE3 $TMPFILEA
-python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7
-cp $TMPFILE7 $TMPFILEB
-
-mv $TMPFILE1 $ID/all_id.txt
-mv $TMPFILE2 $ID/1id-index.txt
-mv $TMPFILE3 $ID/1id-abstracts.txt
-mv $TMPFILE4 $DOWNLOAD/id-all.txt
-mv $TMPFILE5 $DOWNLOAD/id-index.txt
-mv $TMPFILE6 $DOWNLOAD/id-abstract.txt
-mv $TMPFILE7 $ID/all_id2.txt
-mv $TMPFILE8 $DERIVED/all_id.txt
-mv $TMPFILE9 $DERIVED/1id-index.txt
-mv $TMPFILEA $DERIVED/1id-abstracts.txt
-mv $TMPFILEB $DERIVED/all_id2.txt
-
-$DTDIR/ietf/manage.py generate_idnits2_rfc_status
-$DTDIR/ietf/manage.py generate_idnits2_rfcs_obsoleted
-
-CHARTER=/a/www/ietf-ftp/charter
-wget -q https://datatracker.ietf.org/wg/1wg-charters-by-acronym.txt -O $CHARTER/1wg-charters-by-acronym.txt
-wget -q https://datatracker.ietf.org/wg/1wg-charters.txt            -O $CHARTER/1wg-charters.txt
-
-# Regenerate the last week of bibxml-ids
-$DTDIR/ietf/manage.py generate_draft_bibxml_files
-
-# Create and update group wikis
-#$DTDIR/ietf/manage.py create_group_wikis
-
-# exit 0
diff --git a/bin/mkdiagram b/bin/mkdiagram
deleted file mode 100755
index 4f015c0abe..0000000000
--- a/bin/mkdiagram
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# assume we're in bin/, sibling to ietf/
-
-cd ${0%/*}/../ietf || { echo "CD to ietf directory failed, bailing out"; exit; }
-
-trap 'echo "$program($LINENO): Command failed with error code $? ($0 $*)"; exit 1' ERR
-
-if [ "$*" ]; then apps="$@"; graph="${1%.*}"; else apps=$(ls */models.py | sed 's!/models.py!!'); graph="models"; fi
-
-newapps="doc group meeting message person name"
-legacyapps="announcements idindex idrfc idtracker iesg ietfauth ipr liaisons mailinglists proceedings redirects submit wgcharter wginfo"
-
-proxy="$(grep ^class */proxy.py | tr '()' '  ' | awk '{printf $2 ","}')"
-names="$(grep ^class name/models.py | tr '()' '  ' | awk '{printf $2 ","}')"
-legacy="$(for app in $legacyapps; do grep ^class $app/models.py | tr '()' '  '; done | grep -v ' Meeting\\(' | awk '{printf $2 ","}')"
-events="$(egrep '^class .+DocEvent' doc/models.py | tr '()' '  ' | awk '{printf $2 ","}')"
-
-echo -e "proxy: $proxy\n"
-echo -e "names: $names\n"
-echo -e "legacy:$legacy\n"
-echo -e "events:$events\n"
-
-exclude="--exclude=$proxy,$names,$legacy"
-
-export PYTHONPATH="$PWD/.."
-
-echo "Validating..."
-./manage.py validate
-
-export PYTHONPATH=`dirname $PWD`
-module=${PWD##*/}
-export DJANGO_SETTINGS_MODULE=$module.settings
-export graph
-export title
-
-echo "Generate model graph"
-graph="models-with-names-and-events"
-title="New IETF Database schema"
-${0%/*}/../ietf/manage.py graph_models --exclude="$proxy,$legacy" --title "$title" $apps > $graph.dot && dot -Tpng $graph.dot > $graph.png
-
-echo "Generate new model without names"
-graph="models-with-names"
-title="New IETF Database schema, without name tables"
-modelviz.py --exclude="$proxy,$legacy,$names" --title "$title" $apps > $graph.dot && dot -Tpng $graph.dot > $graph.png
-
-echo "Generate new model without names and subevents"
-graph="models"
-title="New IETF Database schema, without name tables and subevents"
-modelviz.py --exclude="$proxy,$legacy,$names,$events" --title "$title" $apps > $graph.dot && dot -Tpng $graph.dot > $graph.png
diff --git a/bin/mm_hourly b/bin/mm_hourly
deleted file mode 100755
index 0d1da2e572..0000000000
--- a/bin/mm_hourly
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Hourly datatracker jobs, ***run as mailman***
-# 
-# This script is expected to be triggered by cron from
-# $DTDIR/etc/cron.d/datatracker which should be symlinked from
-# /etc/cron.d/
-
-export LANG=en_US.UTF-8
-export PYTHONIOENCODING=utf-8
-
-# Make sure we stop if something goes wrong:
-program=${0##*/}
-trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR
-
-DTDIR=/a/www/ietf-datatracker/web
-cd $DTDIR/
-
-# Set up the virtual environment
-source $DTDIR/env/bin/activate
-
-logger -p user.info -t cron "Running $DTDIR/bin/mm_hourly"
-
-$DTDIR/ietf/manage.py import_mailman_listinfo
diff --git a/bin/monthly b/bin/monthly
deleted file mode 100755
index 1d36abc210..0000000000
--- a/bin/monthly
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Weekly datatracker jobs.
-# 
-# This script is expected to be triggered by cron from
-# /etc/cron.d/datatracker
-export LANG=en_US.UTF-8
-export PYTHONIOENCODING=utf-8
-
-DTDIR=/a/www/ietf-datatracker/web
-cd $DTDIR/
-
-# Set up the virtual environment
-source $DTDIR/env/bin/activate
-
-logger -p user.info -t cron "Running $DTDIR/bin/monthly"
-
diff --git a/bin/release-coverage b/bin/release-coverage
deleted file mode 100755
index 22177c17a6..0000000000
--- a/bin/release-coverage
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-zcat release-coverage.json.gz | jq 'to_entries[] | [.value.time, .key, .value.code.coverage, .value.template.coverage, .value.url.coverage] ' 2>/dev/null | tr "\n][" "	 \n" | tr -d ' "Z' | tr ",T" " " | sort -n | cut -c 2- | sed -n '/2015-03-10/,$p'
diff --git a/bin/setupenv b/bin/setupenv
deleted file mode 100755
index b9f0f72da0..0000000000
--- a/bin/setupenv
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python
-
-
-import os
-import subprocess
-import requests
-import sys
-import stat
-import shutil
-
-basedir = os.path.dirname(os.path.dirname(__file__))
-
-sys.path.append(basedir)
-
-shutil.copyfile(os.path.join(basedir, 'docker/settings_local.py'), os.path.join(basedir, 'settings_local.py'))
-
-from ietf.settings_sqlitetest import *             # we don't import from django.conf here, on purpose
-
-for dir in [ AGENDA_PATH, IDSUBMIT_REPOSITORY_PATH, IDSUBMIT_STAGING_PATH,
-    INTERNET_DRAFT_ARCHIVE_DIR, os.path.dirname(DRAFT_ALIASES_PATH), PHOTOS_DIR,
-    os.path.dirname(os.path.abspath(TEST_GHOSTDRIVER_LOG_PATH)), ]:
-    if not os.path.exists(dir):
-        print("Creating %s" % dir)
-        os.makedirs(dir)
-
-for path in [ DRAFT_ALIASES_PATH, DRAFT_VIRTUAL_PATH, GROUP_ALIASES_PATH, GROUP_VIRTUAL_PATH, ]:
-    if not os.path.exists(path):
-        print("Setting up %s" % path)
-        dir, fn = os.path.split(path)
-        url = "https://zinfandel.tools.ietf.org/src/db/tmp/%s" % fn
-        r = requests.get(url)
-        if r.status_code == 200:
-            with open(path, "w") as of:
-                of.write(r.text)
-        else:
-            print("Error %s fetching '%s'" % (r.status_code, url))
-
-path = IDSUBMIT_IDNITS_BINARY
-if not os.path.exists(path):
-    print("Setting up %s" % path)    
-    r = requests.get('https://tools.ietf.org/tools/idnits/idnits')
-    with open(path, 'w') as idnits:
-        idnits.write(r.text)
-        os.chmod(path, 0755)
-        
\ No newline at end of file
diff --git a/bin/update b/bin/update
deleted file mode 100755
index bcb6e8b129..0000000000
--- a/bin/update
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/bin/bash
-
-version="0.34"
-program=$(basename $0)
-
-NEW=""		# If there are more than $NEW % new lines, skip update
-OLD=""		# If there are more than $OLD % deleted lines, skip update
-FILE=""
-verbose=""
-silent=""
-
-# ----------------------------------------------------------------------
-function usage() {
-cat <<EOF
-NAME
-    $program -  conditionally update target file.
-
-SYNOPSIS
-    $program [OPTIONS] FILE
-
-DESCRIPTION
-    $program reads input from a pipe or file and saves it to a target
-    (FILE) if there are changes. If the new content is the same as the
-    old, the target is left untouched. By default, the target is also
-    left untouched if the new content is empty. There are options to
-    also abstain from applying an update if the changes are too large,
-    and to back up the previous version.
-
-    The purpose is to handle files with dynamically generated content in
-    such a manner that timestamps don't change if the content doesn't change,
-    and mistakes in content generation doesn't unnecessarily propagate to
-    the target.
-    
-OPTIONS
-EOF
-    if   [ "$(uname)" = "Linux" ]; then
-        egrep "^[	]+[-][A-Za-z| -]+\*?\)[	]+[A-Za-z].+#" $0 | tr -s "\t|" "\t," | sed -r -e 's/\)[ \t]+([A-Z]+)="\$2"[^#]*#/=\1\t/' -e 's/\)[^#]*#/\t/'
-    else
-        egrep "^[	]+[-][A-Za-z| -]+\*?\)[	]+[A-Za-z].+#" $0 | sed 's/\|.*"\$2"[^#]*#/	/'| sed -E 's/\|.*\)[^#]*#/	/' 
-    fi
-    cat <<EOF
-
-AUTHOR
-    Henrik Levkowetz <henrik@levkowetz.com>
-EOF
-exit
-}
-
-
-# ----------------------------------------------------------------------
-function note() {
-    if [ -n "$verbose" ]; then
-	echo -e "$program: $*"
-    fi
-}
-
-# ----------------------------------------------------------------------
-function warn() {
-    [ "$QUIET" ] || echo -e "$program: $*"
-}
-
-# ----------------------------------------------------------------------
-function err() {
-    echo -e "$program: $*" > /dev/stderr
-}
-
-# -----------------------------------------------------------------------------
-function leave() {
-   errcode=$1; shift
-   if [ "$errcode" -ge "2" ]; then warn "$*"; else note "$*"; fi
-   if [ -f "$tempfile" ]; then rm $tempfile; fi
-   if [ -f "$difffile" ]; then rm $difffile; fi
-   if [ "$errcode" = "1" -a "$RESULT" = "0" ]; then exit 0; else exit $errcode; fi
-}
-
-# ----------------------------------------------------------------------
-# Set up error trap
-trap 'leave 127 "$program($LINENO): Command failed with error code $? while processing '$origfile'."' ERR
-
-# exit with a message if a command fails
-set -e
-
-# ----------------------------------------------------------------------
-#	Get any options
-#
-
-# Default values
-PAT="\$path\$base.%Y-%m-%d_%H%M"
-RESULT="0"
-QUIET=""
-
-# Based on the sample code in /usr/share/doc/util-linux/examples/parse.bash.gz
-if   [ "$(uname)" = "Linux" ]; then
-    GETOPT_RESULT=$(getopt -o bc:ef:hn:o:p:qrvV --long backup,maxchg:,empty,file:,help,maxnew:,maxold:,prefix:,report,quiet,verbose,version  -n "$program" -- "$@")
-else
-    GETOPT_RESULT=$(getopt bc:ef:hn:o:p:qrvV "$@")
-fi 
-
-if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-
-note "GETOPT_RESULT: $GETOPT_RESULT"
-eval set -- "$GETOPT_RESULT"
-
-while true ; do
-	case "$1" in
-		-b|--backup)	backup=1;	shift ;;	# Back up earlier versions by creating a backup file
-		-c|--maxchg)	CHG="$2";	shift 2 ;;	# Limit on percentage of changed lines
-		-e|--empty)	empty=1;	shift ;;	# Permit the update to be empty (default: discard)
-		-f|--file)	FILE="$2";	shift 2 ;;	# Read input from FILE instead of standard input
-		-h|--help)	usage;		shift ;;	# Show this text and exit
-		-n|--maxnew)	NEW="$2";	shift 2 ;;	# Limit on percentage of new (added) lines
-		-o|--maxold)	OLD="$2";	shift 2 ;;	# Limit on percentage of old (deleted) lines
-		-p|--pat*)	PAT="$2";	shift 2 ;;	# Backup name base ('$path$base.%Y%m%d_%H%M')
-		-q|--quiet)	QUIET=1;	shift;;		# Be less verbose
-		-r|--result)	RESULT=1;	shift ;;	# Return 1 if update not done
-		-v|--verbose)	verbose=1;	shift ;;	# Be more verbose about what's happening
-		-V|--version)	echo -e "$program\t$version"; exit;;	# Show version and exit
-		--) shift ; break ;;					
-		*) echo "$program: Internal error, inconsistent option specification." ; exit 1 ;;
-	esac
-done
-
-if [ $CHG ]; then OLD=$CHG; NEW=$CHG; fi
-
-if [ $# -lt 1 ]; then echo -e "$program: Missing output filename\n"; usage; fi
-
-origfile=$1
-tempfile=$(mktemp)
-difffile=$(mktemp)
-
-if [ -e "$origfile" ]; then
-    cp -p $origfile $tempfile		# For ownership and permissions
-    cat $FILE > $tempfile
-    [ "$FILE" ] && touch -r $FILE $tempfile
-    # This won't work if we don't have sufficient privileges:
-    #chown --reference=$origfile $tempfile
-    #chmod --reference=$origfile $tempfile
-else
-    cat $FILE > $origfile
-    [ "$FILE" ] && touch -r $FILE $tempfile
-    leave 0 "Created file '$origfile'"
-fi
-
-origlen=$(wc -c < $origfile)
-newlen=$(wc -c < $tempfile)
-
-if [ $origlen = 0 -a $newlen = 0 ]; then
-    rm $tempfile
-    leave 1 "New content is identical (and void) - not updating '$origfile'."
-fi
-if [ $newlen = 0 -a -z "$empty" ]; then
-    leave 1 "New content is void - not updating '$origfile'."
-fi
-
-diff $origfile $tempfile > $difffile || [ $? -le 1 ] && true # suppress the '1' error code on differences
-difflen=$(wc -l < $difffile)
-if [ $difflen = 0 ]; then
-    leave 1 "New content is identical - not updating '$origfile'."
-fi
-
-if [ "$OLD" -o "$NEW" ]; then
-
-    if [ "$NEW" ]; then maxnew=$(( $origlen * $NEW / 100 )); fi
-    if [ "$OLD" ]; then maxdel=$(( $origlen * $OLD / 100 )); fi
-
-    newcount=$(grep "^> " $difffile | wc -c)
-    outcount=$(grep "^< " $difffile | wc -c)
-    delcount=$(grep "^! " $difffile | wc -c)
-    delcount=$(( $outcount + $delcount ))
-    rm $difffile
-
-    if [ "$OLD" ]; then
-	if [ "$delcount" -ge "$maxdel" ]; then
-	    cp $tempfile $origfile.update
-	    leave 2 "New content has too many removed lines ($delcount/$origlen)\n - not updating '$origfile'.\nNew content placed in '$origfile.update' instead"
-	fi
-    fi
-    if [ "$NEW" ]; then
-	if [ "$newcount" -ge "$maxnew" ]; then
-	    cp $tempfile $origfile.update
-	    leave 2 "New content has too many added lines ($newcount/$origlen)\n - not updating '$origfile'.\nNew content placed in '$origfile.update' instead"
-	fi
-    fi
-fi
-
-if [ "$backup" ]; then
-
-    path=${origfile%/*}
-    name=${origfile##*/}
-    base=${name%.*}
-    ext=${origfile##*.}
-
-    if [ "$ext" = "$origfile" ]; then
-	ext=""
-    elif [ ! "${ext%/*}" = "$ext" ]; then
-	ext=""
-    else
-	ext=".$ext"
-    fi
-
-    if [ "$path" = "$origfile" ]; then
-	path=""
-    else
-	path="$path/"
-    fi
-
-    ver=1
-    backfile=$(eval date +"$PAT")
-    backpath="${backfile%/*}"
-    if [ "$backpath" = "$backfile" ]; then
-	backpath="."
-    fi
-    if [ ! -d $backpath ]; then
-	if [ -e $backpath ]; then
-	    leave 3 "The backup path '$backpath' exists but isn't a directory"
-	else
-	    mkdir -p $backpath
-	fi
-    fi
-    while [ -e "$backfile,$ver$ext" ]; do
-       ver=$(( $ver+1 ))
-    done
-    note "Saving backup: $backfile,$ver$ext"
-    cp -p "$origfile" "$backfile,$ver$ext"
-    chmod -w "$backfile,$ver$ext" || true
-fi
-
-if ! mv $tempfile $origfile; then cp -p $tempfile $origfile; fi
-leave 0 "Updated file '$origfile'"
diff --git a/bin/vnu.jar b/bin/vnu.jar
index 776d5836ba..1766224071 100644
Binary files a/bin/vnu.jar and b/bin/vnu.jar differ
diff --git a/bin/weekly b/bin/weekly
deleted file mode 100755
index cca8403fd4..0000000000
--- a/bin/weekly
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Weekly datatracker jobs.
-# 
-# This script is expected to be triggered by cron from
-# /etc/cron.d/datatracker
-export LANG=en_US.UTF-8
-export PYTHONIOENCODING=utf-8
-
-DTDIR=/a/www/ietf-datatracker/web
-cd $DTDIR/
-
-# Set up the virtual environment
-source $DTDIR/env/bin/activate
-
-logger -p user.info -t cron "Running $DTDIR/bin/weekly"
-
-
-# Send out weekly summaries of apikey usage
-
-$DTDIR/ietf/manage.py send_apikey_usage_emails
-
-# Send notifications about coming expirations
-$DTDIR/ietf/bin/notify-expirations
-
diff --git a/client/App.vue b/client/App.vue
index 7f2763a5dc..7750674296 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -4,6 +4,8 @@ n-theme
     .app-error(v-if='siteStore.criticalError')
       i.bi.bi-x-octagon-fill.me-2
       span {{siteStore.criticalError}}
+    .app-error-link(v-if='siteStore.criticalError && siteStore.criticalErrorLink')
+      a(:href='siteStore.criticalErrorLink') {{siteStore.criticalErrorLinkText}} #[i.bi.bi-arrow-right-square-fill.ms-2]
     .app-container(ref='appContainer')
       router-view.meeting
 </template>
@@ -24,6 +26,28 @@ const siteStore = useSiteStore()
 
 const appContainer = ref(null)
 
+// --------------------------------------------------------------------
+// Set user theme
+// --------------------------------------------------------------------
+
+function updateTheme() {
+  const desiredTheme = window.localStorage?.getItem('theme')
+  if (desiredTheme === 'dark') {
+    siteStore.theme = 'dark'
+  } else if (desiredTheme === 'light') {
+    siteStore.theme = 'light'
+  } else if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+    siteStore.theme = 'dark'
+  } else {
+    siteStore.theme = 'light'
+  }
+}
+
+updateTheme()
+
+// this change event fires for either light or dark changes
+window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', updateTheme)
+
 // --------------------------------------------------------------------
 // Handle browser resize
 // --------------------------------------------------------------------
@@ -56,4 +80,23 @@ onBeforeUnmount(() => {
   padding: 1rem;
   text-align: center;
 }
+
+.app-error-link {
+  background-color: lighten($red-100, 5%);
+  border-radius: 0 0 5px 5px;
+  color: #FFF;
+  font-weight: 500;
+  font-size: .9em;
+  padding: .7rem 1rem;
+  text-align: center;
+
+  a {
+    color: $red-700;
+    text-decoration: none;
+
+    &:hover, &:focus {
+      text-decoration: underline;
+    }
+  }
+}
 </style>
diff --git a/client/Embedded.vue b/client/Embedded.vue
index a0f0d2831e..80b105dc15 100644
--- a/client/Embedded.vue
+++ b/client/Embedded.vue
@@ -1,12 +1,13 @@
 <template lang="pug">
 n-theme
-  n-message-provider
-    component(:is='currentComponent', :component-id='props.componentId')
+  n-notification-provider
+    n-message-provider
+      component(:is='currentComponent', :component-id='props.componentId')
 </template>
 
 <script setup>
 import { defineAsyncComponent, markRaw, onMounted, ref } from 'vue'
-import { NMessageProvider } from 'naive-ui'
+import { NMessageProvider, NNotificationProvider } from 'naive-ui'
 
 import NTheme from './components/n-theme.vue'
 
@@ -15,6 +16,7 @@ import NTheme from './components/n-theme.vue'
 const availableComponents = {
   ChatLog: defineAsyncComponent(() => import('./components/ChatLog.vue')),
   Polls: defineAsyncComponent(() => import('./components/Polls.vue')),
+  Status: defineAsyncComponent(() => import('./components/Status.vue'))
 }
 
 // PROPS
diff --git a/client/agenda/Agenda.vue b/client/agenda/Agenda.vue
index bd9cddb05f..99a46f4fe9 100644
--- a/client/agenda/Agenda.vue
+++ b/client/agenda/Agenda.vue
@@ -9,17 +9,32 @@
       span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
   h4
     span {{agendaStore.meeting.city}}, {{ meetingDate }}
-    h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-muted Updated:] {{ meetingUpdated }}
+    h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-body-secondary Updated:] {{ meetingUpdated }}
 
   .agenda-topnav.my-3
     meeting-navigation
-    n-button.d-none.d-sm-flex(
-      quaternary
-      @click='toggleSettings'
-      )
-      template(#icon)
-        i.bi.bi-gear
-      span Settings
+    .agenda-topnav-right.d-none.d-md-flex
+      n-button(
+        quaternary
+        @click='startTour'
+        )
+        template(#icon)
+          i.bi.bi-question-square
+        span Help
+      n-button(
+        quaternary
+        @click='toggleShare'
+        )
+        template(#icon)
+          i.bi.bi-share
+        span Share
+      n-button(
+        quaternary
+        @click='toggleSettings'
+        )
+        template(#icon)
+          i.bi.bi-gear
+        span Settings
 
   .row
     .col
@@ -34,7 +49,7 @@
           n-popover(v-if='!agendaStore.infoNoteShown')
             template(#trigger)
               n-button.ms-2(text, @click='toggleInfoNote')
-                i.bi.bi-info-circle.text-muted
+                i.bi.bi-info-circle.text-body-secondary
             span Show Info Note
         .col-12.col-sm-auto.d-flex.align-items-center
           i.bi.bi-globe.me-2
@@ -43,14 +58,17 @@
             n-button(
               :type='agendaStore.isTimezoneMeeting ? `primary` : `default`'
               @click='setTimezone(`meeting`)'
+              :text-color='agendaStore.isTimezoneMeeting ? `#FFF` : null'
               ) Meeting
             n-button(
               :type='agendaStore.isTimezoneLocal ? `primary` : `default`'
               @click='setTimezone(`local`)'
+              :text-color='agendaStore.isTimezoneLocal ? `#FFF` : null'
               ) Local
             n-button(
               :type='agendaStore.timezone === `UTC` ? `primary` : `default`'
               @click='setTimezone(`UTC`)'
+              :text-color='agendaStore.timezone === `UTC` ? `#FFF` : null'
               ) UTC
           n-select.agenda-timezone-ddn(
             v-if='siteStore.viewport > 1250'
@@ -137,6 +155,7 @@
       agenda-quick-access
 
   agenda-mobile-bar
+  agenda-share-modal(v-model:shown='state.shareModalShown')
 </template>
 
 <script setup>
@@ -159,10 +178,12 @@ import AgendaScheduleList from './AgendaScheduleList.vue'
 import AgendaScheduleCalendar from './AgendaScheduleCalendar.vue'
 import AgendaQuickAccess from './AgendaQuickAccess.vue'
 import AgendaSettings from './AgendaSettings.vue'
+import AgendaShareModal from './AgendaShareModal.vue'
 import AgendaMobileBar from './AgendaMobileBar.vue'
 import MeetingNavigation from './MeetingNavigation.vue'
 
 import timezones from '../shared/timezones'
+import { initTour } from './tour'
 
 import { useAgendaStore } from './store'
 import { useSiteStore } from '../shared/store'
@@ -187,6 +208,7 @@ const route = useRoute()
 
 const state = reactive({
   searchText: '',
+  shareModalShown: false
 })
 
 // REFS
@@ -219,8 +241,19 @@ watch(() => agendaStore.meetingDays, () => {
 })
 
 watch(() => agendaStore.isLoaded, () => {
+  let resetQuery = false
+  if (route.query.filters) {
+    // Handle ?filters= parameter
+    const keywords = route.query.filters.split(',').map(k => k.trim()).filter(k => !!k)
+    if (keywords?.length > 0) {
+      agendaStore.$patch({
+        selectedCatSubs: keywords
+      })
+    }
+    resetQuery = true
+  }
   if (route.query.show) {
-    // Handle legacy ?show= parameter
+    // Handle ?show= parameter
     const keywords = route.query.show.split(',').map(k => k.trim()).filter(k => !!k)
     if (keywords?.length > 0) {
       const pickedIds = []
@@ -235,13 +268,23 @@ watch(() => agendaStore.isLoaded, () => {
           pickerModeView: true,
           pickedEvents: pickedIds
         })
-        agendaStore.persistMeetingPreferences()
       }
     }
+    resetQuery = true
   }
   if (route.query.pick) {
     // Handle legacy /personalize path (open picker mode)
     agendaStore.$patch({ pickerMode: true })
+    resetQuery = true
+  }
+  if (route.query.tz) {
+    // Handle tz param
+    agendaStore.$patch({ timezone: route.query.tz })
+    resetQuery = true
+  }
+
+  if (resetQuery) {
+    agendaStore.persistMeetingPreferences()
     router.replace({ query: null })
   }
 
@@ -258,8 +301,18 @@ const titleExtra = computed(() => {
   return title
 })
 const meetingDate = computed(() => {
-  const start = DateTime.fromISO(agendaStore.meeting.startDate, { zone: agendaStore.meeting.timezone }).setZone(agendaStore.timezone)
-  const end = DateTime.fromISO(agendaStore.meeting.endDate, { zone: agendaStore.meeting.timezone }).setZone(agendaStore.timezone)
+  // Adjust to first meeting start time (to ensure proper start date when switching timezones)
+  const firstEventStartTime = { hour: 0, minute: 0 }
+  if (agendaStore.schedule.length > 0) {
+    const evStartObj = DateTime.fromISO(agendaStore.schedule[0].startDateTime, { zone: agendaStore.meeting.timezone }).toObject()
+    firstEventStartTime.hour = evStartObj.hour
+    firstEventStartTime.minute = evStartObj.minute
+  }
+
+  // Adjust start and end dates for current timezone
+  const start = DateTime.fromISO(agendaStore.meeting.startDate, { zone: agendaStore.meeting.timezone }).set(firstEventStartTime).setZone(agendaStore.timezone)
+  const end = DateTime.fromISO(agendaStore.meeting.endDate, { zone: agendaStore.meeting.timezone }).set({ hour: 23, minute: 59}).setZone(agendaStore.timezone)
+
   if (start.month === end.month) {
     return `${start.toFormat('MMMM d')} - ${end.toFormat('d, y')}`
   } else {
@@ -267,7 +320,14 @@ const meetingDate = computed(() => {
   }
 })
 const meetingUpdated = computed(() => {
-  return agendaStore.meeting.updated ? DateTime.fromISO(agendaStore.meeting.updated).setZone(agendaStore.timezone).toFormat(`DD 'at' tt ZZZZ`) : false
+  if (!agendaStore.meeting.updated) { return false }
+  
+  const updatedDatetime = DateTime.fromISO(agendaStore.meeting.updated).setZone(agendaStore.timezone)
+  if (!updatedDatetime.isValid) {
+    return false
+  }
+  
+  return updatedDatetime.toFormat(`DD 'at' T ZZZZ`)
 })
 const colorLegendShown = computed(() => {
   return agendaStore.colorPickerVisible || (agendaStore.colorLegendShown && Object.keys(agendaStore.colorAssignments).length > 0)
@@ -313,6 +373,18 @@ function toggleSettings () {
   })
 }
 
+function toggleShare () {
+  state.shareModalShown = !state.shareModalShown
+}
+
+function startTour () {
+  const tour = initTour({
+    mobileMode: siteStore.viewport < 990,
+    pickerMode: agendaStore.pickerMode
+  })
+  tour.start()
+}
+
 // -> Go to current meeting if not provided
 function handleCurrentMeetingRedirect () {
   if (!route.params.meetingNumber && agendaStore.meeting.number) {
@@ -362,7 +434,7 @@ function reconnectScrollObservers () {
   scrollObserver.disconnect()
   visibleDays.length = 0
   for (const mDay of agendaStore.meetingDays) {
-    const el = document.getElementById(`agenda-day-${mDay.slug}`)
+    const el = document.getElementById(mDay.slug)
     el.dataset.dayId = mDay.slug.toString()
     el.dataset.dayTs = mDay.ts
     scrollObserver.observe(el)
@@ -394,15 +466,6 @@ onMounted(() => {
   }
 })
 
-// CREATED
-
-// -> Handle loading tab directly based on URL
-if (window.location.pathname.indexOf('-utc') >= 0) {
-  agendaStore.$patch({ timezone: 'UTC' })
-} else if (window.location.pathname.indexOf('personalize') >= 0) {
-  // state.currentTab = 'personalize'
-}
-
 </script>
 
 <style lang="scss">
@@ -421,18 +484,25 @@ if (window.location.pathname.indexOf('-utc') >= 0) {
   &-topnav {
     position: relative;
 
-    > button {
+    &-right {
       position: absolute;
       top: 5px;
       right: 0;
+      display: flex;
 
-      .bi {
-        transition: transform 1s ease;
+      button + button {
+        margin-left: 5px;
       }
 
-      &:hover {
+      > button:last-child {
         .bi {
-          transform: rotate(180deg);
+          transition: transform 1s ease;
+        }
+
+        &:hover {
+          .bi {
+            transform: rotate(180deg);
+          }
         }
       }
     }
@@ -466,6 +536,13 @@ if (window.location.pathname.indexOf('-utc') >= 0) {
     color: $blue-700;
     position: relative;
 
+    @at-root .theme-dark & {
+      border: 1px solid $blue-800;
+      background: linear-gradient(to top, lighten($blue-900, 2%), lighten($blue-900, 5%));
+      color: $blue-100;
+      box-shadow: inset 0 0 0 1px #000;
+    }
+
     > button {
       position: absolute;
       top: 15px;
diff --git a/client/agenda/AgendaDetailsModal.vue b/client/agenda/AgendaDetailsModal.vue
index a58e8f83f2..69c8ef8b53 100644
--- a/client/agenda/AgendaDetailsModal.vue
+++ b/client/agenda/AgendaDetailsModal.vue
@@ -152,6 +152,7 @@ import {
 } from 'naive-ui'
 
 import { useAgendaStore } from './store'
+import { getUrl } from '../shared/urls'
 
 // PROPS
 
@@ -205,10 +206,22 @@ const eventDetails = computed(() => {
     title: props.event.type === 'regular' ? `${props.event.groupName} (${props.event.acronym})` : props.event.name,
     showAgenda: props.event.flags.showAgenda,
     materialsUrl: materialsUrl,
-    detailsUrl: `/meeting/${agendaStore.meeting.number}/session/${props.event.acronym}/`,
-    tarUrl: `/meeting/${agendaStore.meeting.number}/agenda/${props.event.acronym}-drafts.tgz`,
-    pdfUrl: `/meeting/${agendaStore.meeting.number}/agenda/${props.event.acronym}-drafts.pdf`,
-    notepadUrl: `https://notes.ietf.org/notes-ietf-${agendaStore.meeting.number}-${props.event.type === 'plenary' ? 'plenary' : props.event.acronym}`,
+    detailsUrl: getUrl('meetingDetails', {
+      meetingNumber: agendaStore.meeting.number,
+      eventAcronym: props.event.acronym
+    }),
+    tarUrl: getUrl('meetingMaterialsTar', {
+      meetingNumber: agendaStore.meeting.number,
+      eventAcronym: props.event.acronym
+    }),
+    pdfUrl: getUrl('meetingMaterialsPdf', {
+      meetingNumber: agendaStore.meeting.number,
+      eventAcronym: props.event.acronym
+    }),
+    notepadUrl: getUrl('meetingNotes', {
+      meetingNumber: agendaStore.meeting.number,
+      eventAcronym: props.event.type === 'plenary' ? 'plenary' : props.event.acronym
+    })
   }
 })
 
@@ -261,6 +274,7 @@ async function fetchSessionMaterials () {
 <style lang="scss">
 @import "bootstrap/scss/functions";
 @import "bootstrap/scss/variables";
+@import "../shared/breakpoints";
 
 .agenda-eventdetails {
   width: 90vw;
@@ -269,6 +283,10 @@ async function fetchSessionMaterials () {
   .bi {
     font-size: 20px;
     color: $indigo;
+
+    @at-root .theme-dark & {
+      color: $indigo-300;
+    }
   }
 
   .detail-header {
@@ -310,7 +328,6 @@ async function fetchSessionMaterials () {
     border-radius: 5px;
 
     .badge {
-      width: 30px;
       font-size: .7em;
       background-color: $yellow-200;
       border-bottom: 1px solid $yellow-500;
@@ -330,6 +347,11 @@ async function fetchSessionMaterials () {
     border-radius: 5px;
     font-weight: 500;
 
+    @at-root .theme-dark & {
+      background-color: $gray-900;
+      border-color: $gray-700;
+    }
+
     a {
       cursor: pointer;
 
@@ -352,6 +374,11 @@ async function fetchSessionMaterials () {
     margin-top: 12px;
     border-radius: 5px;
 
+    @at-root .theme-dark & {
+      background-color: $gray-900;
+      border-color: $gray-700;
+    }
+
     .bi {
       color: $blue;
     }
@@ -364,6 +391,10 @@ async function fetchSessionMaterials () {
       border: none;
       border-radius: 5px;
       display: block;
+
+      @at-root .theme-dark & {
+        background-color: $gray-900;
+      }
     }
   }
 
@@ -373,5 +404,29 @@ async function fetchSessionMaterials () {
       font-size: 16px;
     }
   }
+
+  .n-card-header {
+    @media screen and (max-width: $bs5-break-sm) {
+      display: block;
+      padding: 1em;
+    }
+  }
+
+  .n-card__content {
+    @media screen and (max-width: $bs5-break-sm) {
+      padding: 1em;
+
+      .detail-title {
+        display: block;
+      }
+
+      .nav-link,
+      .nav-link.active {
+        display: grid;
+        width: 1em;
+        border-width: 1em;
+      }
+    }
+  }
 }
 </style>
diff --git a/client/agenda/AgendaFilter.vue b/client/agenda/AgendaFilter.vue
index 5209b174ac..b1f1065708 100644
--- a/client/agenda/AgendaFilter.vue
+++ b/client/agenda/AgendaFilter.vue
@@ -60,11 +60,11 @@ n-drawer(v-model:show='state.isShown', placement='bottom', :height='state.drawer
                 )
                 template(#trigger)
                   span.badge BoF
-                span #[a(href='https://www.ietf.org/how/bofs/', target='_blank') Birds of a Feather] sessions (BoFs) are initial discussions about a particular topic of interest to the IETF community.
+                span #[a(:href='getUrl(`bofDefinition`)', target='_blank') Birds of a Feather] sessions (BoFs) are initial discussions about a particular topic of interest to the IETF community.
 </template>
 
 <script setup>
-import { reactive, ref, unref, watch } from 'vue'
+import { nextTick, reactive, ref, unref, watch } from 'vue'
 import intersection from 'lodash/intersection'
 import difference from 'lodash/difference'
 import union from 'lodash/union'
@@ -77,6 +77,7 @@ import {
 } from 'naive-ui'
 
 import { useAgendaStore } from './store'
+import { getUrl } from '../shared/urls'
 
 // STORES
 
@@ -113,8 +114,15 @@ function cancelFilter () {
 }
 
 function saveFilter () {
-  agendaStore.$patch({ selectedCatSubs: state.pendingSelection })
-  state.isShown = false
+  const applyLoadingMsg = message.create('Applying filters...', { type: 'loading', duration: 0 })
+  setTimeout(() => {
+    agendaStore.$patch({ selectedCatSubs: state.pendingSelection })
+    agendaStore.persistMeetingPreferences()
+    state.isShown = false
+    nextTick(() => {
+      applyLoadingMsg.destroy()
+    })
+  }, 500)
 }
 
 function clearFilter () {
@@ -209,30 +217,58 @@ function toggleFilterGroup (key) {
     padding: 5px;
     border-radius: 10px;
 
+    @at-root .theme-dark & {
+      background-color: $gray-800;
+    }
+
     &:nth-child(2) {
       background-color: $blue-100;
 
+      @at-root .theme-dark & {
+        background-color: $gray-800;
+      }
+
       .agenda-personalize-areamain {
         button {
           color: $blue-600;
+
+          @at-root .theme-dark & {
+            color: $blue-100;
+          }
         }
       }
 
       .agenda-personalize-groups {
         background-color: lighten($blue-100, 7%);
+
+        @at-root .theme-dark & {
+          background-color: $gray-700;
+        }
       }
     }
     &:nth-child(3) {
       background-color: $orange-100;
 
+      @at-root .theme-dark & {
+        background-color: $gray-800;
+      }
+
       .agenda-personalize-areamain {
         button {
           color: $orange-600;
+
+          @at-root .theme-dark & {
+            color: $orange-100;
+          }
         }
       }
 
       .agenda-personalize-groups {
         background-color: lighten($orange-100, 7%);
+
+        @at-root .theme-dark & {
+          background-color: $gray-700;
+        }
       }
     }
 
@@ -268,6 +304,12 @@ function toggleFilterGroup (key) {
       transition: background-color .5s ease;
       position: relative;
 
+      @at-root .theme-dark & {
+        background-color: $gray-600;
+        border-color: $gray-700;
+        color: #FFF;
+      }
+
       > .bi {
         margin-right: .5rem;
       }
@@ -302,6 +344,10 @@ function toggleFilterGroup (key) {
     flex: 1;
     display: flex;
     flex-wrap: wrap;
+
+    @at-root .theme-dark & {
+      background-color: $gray-700;
+    }
   }
 
   &-group {
@@ -316,6 +362,12 @@ function toggleFilterGroup (key) {
     color: $gray-600;
     margin-right: 0px;
 
+    @at-root .theme-dark & {
+      background-color: $gray-600;
+      border-color: $gray-700;
+      color: #FFF;
+    }
+
     @media screen and (max-width: $bs5-break-sm) {
       font-size: .9em;
     }
diff --git a/client/agenda/AgendaMobileBar.vue b/client/agenda/AgendaMobileBar.vue
index 08a28d451b..43480bedd3 100644
--- a/client/agenda/AgendaMobileBar.vue
+++ b/client/agenda/AgendaMobileBar.vue
@@ -1,12 +1,21 @@
 <template lang="pug">
 .agenda-mobile-bar(v-if='siteStore.viewport < 990')
+  n-dropdown(
+    :options='jumpToDayOptions'
+    size='huge'
+    :show='isDropdownOpenRef'
+    :show-arrow='true'
+    trigger='click'
+    @select='jumpToDay'
+    @clickoutside='handleCloseDropdown'
+    )
+    button(@click='handleOpenDropdown')
+      i.bi.bi-arrow-down-circle
   button(@click='agendaStore.$patch({ filterShown: true })')
-    i.bi.bi-filter-square-fill.me-2
-    span Filters
+    i.bi.bi-funnel
     n-badge.ms-2(:value='agendaStore.selectedCatSubs.length', processing)
   button(@click='agendaStore.$patch({ calendarShown: true })')
-    i.bi.bi-calendar3.me-2
-    span Cal
+    i.bi.bi-calendar3
   n-dropdown(
     :options='downloadIcsOptions'
     size='huge'
@@ -15,15 +24,13 @@
     @select='downloadIcs'
     )
     button
-      i.bi.bi-calendar-check.me-2
-      span .ics
+      i.bi.bi-download
   button(@click='agendaStore.$patch({ settingsShown: !agendaStore.settingsShown })')
     i.bi.bi-gear
 </template>
 
 <script setup>
-import { h } from 'vue'
-
+import { computed, h, ref } from 'vue'
 import {
   NBadge,
   NDropdown,
@@ -31,7 +38,8 @@ import {
 } from 'naive-ui'
 
 import { useAgendaStore } from './store'
-import { useSiteStore } from '../shared/store';
+import { useSiteStore } from '../shared/store'
+import { getUrl } from '../shared/urls'
 
 // MESSAGE PROVIDER
 
@@ -42,13 +50,68 @@ const message = useMessage()
 const agendaStore = useAgendaStore()
 const siteStore = useSiteStore()
 
+// Meeting Days
+
+function optionToLink(opts){
+  const { key, label, icon } = opts
+
+  return {
+    ...opts,
+    type: 'render',
+    render: () => h(
+      'a',
+      {
+        class: 'dropdown-link',
+        'data-testid': 'mobile-link',
+        href: `#${key}`,
+        onClick: () => jumpToDay(key)
+      },
+      [
+        h(
+          'span',
+          icon()
+        ),
+        h(
+          'span',
+          label
+        )
+      ]
+    )
+  }
+}
+
+const isDropdownOpenRef = ref(false)
+
+const handleOpenDropdown = () => isDropdownOpenRef.value = true
+
+const handleCloseDropdown = () => isDropdownOpenRef.value = false
+
+const jumpToDayOptions = computed(() => {
+  const days = []
+  if (agendaStore.isMeetingLive) {
+    days.push(optionToLink({
+      label: 'Jump to Now',
+      key: 'now',
+      icon: () => h('i', { class: 'bi bi-arrow-down-right-square text-red' })
+    }))
+  }
+  for (const day of agendaStore.meetingDays) {
+    days.push(optionToLink({
+      label: `Jump to ${day.label}`,
+      key: day.slug,
+      icon: () => h('i', { class: 'bi bi-arrow-down-right-square' })
+    }))
+  }
+  return days
+})
+
 // Download Ics Options
 
 const downloadIcsOptions = [
   {
     label: 'Subscribe... (webcal)',
     key: 'subscribe',
-    icon: () => h('i', { class: 'bi bi-calendar-week text-blue' })
+    icon: () => h('i', { class: 'bi bi-calendar-week' })
   },
   {
     label: 'Download... (.ics)',
@@ -59,16 +122,30 @@ const downloadIcsOptions = [
 
 // METHODS
 
+function jumpToDay (dayId) {
+  if (dayId === 'now') {
+    const nowEventId = agendaStore.findNowEventId()
+    if (nowEventId) {
+      document.getElementById(`agenda-rowid-${nowEventId}`)?.scrollIntoView(true)
+    } else {
+      message.warning('There is no event happening right now or in the future.')
+    }
+  } else {
+    document.getElementById(dayId)?.scrollIntoView(true)
+  }
+  isDropdownOpenRef.value = false
+}
+
 function downloadIcs (key) {
   message.loading('Generating calendar file... Download will begin shortly.')
   let icsUrl = ''
   if (agendaStore.pickerMode) {
     const sessionKeywords = agendaStore.scheduleAdjusted.map(s => s.sessionKeyword)
-    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${sessionKeywords.join(',')}`
+    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${sessionKeywords.join(',')}`
   } else if (agendaStore.selectedCatSubs.length > 0) {
-    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${agendaStore.selectedCatSubs.join(',')}`
+    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${agendaStore.selectedCatSubs.join(',')}`
   } else {
-    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics`
+    icsUrl = `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}`
   }
   if (key === 'subscribe') {
     window.location.assign(`webcal://${window.location.host}${icsUrl}`)
@@ -101,6 +178,8 @@ function downloadIcs (key) {
     color: #FFF;
     padding: 0 15px;
     transition: all .4s ease;
+    text-align: center;
+    flex: 1 1;
 
     & + button {
       margin-left: 1px;
@@ -118,4 +197,19 @@ function downloadIcs (key) {
     }
   }
 }
+
+.dropdown-link {
+  display: flex;
+  text-decoration:none;
+  gap: 0.2rem 0.5rem;
+  padding: 0.5em;
+  color: var(--bs-body-color);
+  
+  &:hover,
+  &:focus {
+    background-color: var(--bs-dark-bg-subtle);
+    text-decoration: underline;
+  }
+}
+
 </style>
diff --git a/client/agenda/AgendaQuickAccess.vue b/client/agenda/AgendaQuickAccess.vue
index 326d78f911..c9412f6663 100644
--- a/client/agenda/AgendaQuickAccess.vue
+++ b/client/agenda/AgendaQuickAccess.vue
@@ -58,11 +58,12 @@
             )
             i.bi.bi-x-square.me-2
             span Discard
-        n-divider: small.text-muted Calendar
+        n-divider: small.text-body-secondary Calendar
         n-button.mt-2(
           id='agenda-quickaccess-calview-btn'
           block
-          color='#6c757d'
+          color='#6f42c1'
+          text-color='#FFF'
           size='large'
           strong
           @click='agendaStore.$patch({ calendarShown: true })'
@@ -74,20 +75,19 @@
           size='large'
           :show-arrow='true'
           trigger='click'
-          @select='downloadIcs'
           )
           n-button.mt-2(
             id='agenda-quickaccess-addtocal-btn'
             block
-            secondary
-            color='#6c757d'
+            :color='siteStore.theme === `dark` ? `rgba(111, 66, 193, .3)` : `#e2d9f3`'
+            :text-color='siteStore.theme === `dark` ? `#e2d9f3` : `#59359a`'
             size='large'
             strong
             )
             i.bi.bi-calendar-check.me-2
             span {{ shortMode ? '.ics' : 'Add to your calendar...' }}
         template(v-if='agendaStore.meetingDays.length > 0')
-          n-divider: small.text-muted Jump to...
+          n-divider: small.text-body-secondary Jump to...
           ul.nav.nav-pills.flex-column.small.agenda-quickaccess-jumpto
             li.nav-item(v-if='agendaStore.isMeetingLive')
               a.nav-link(
@@ -99,7 +99,7 @@
             li.nav-item(v-for='day of agendaStore.meetingDays')
               a.nav-link(
                 :class='agendaStore.dayIntersectId === day.slug ? `active` : ``'
-                :href='`#slot-` + day.slug'
+                :href='`#${day.slug}`'
                 @click='scrollToDay(day.slug, $event)'
                 )
                 i.bi.bi-arrow-right-short.d-none.d-xxl-inline.me-2
@@ -109,7 +109,6 @@
 <script setup>
 import { computed, h } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { DateTime } from 'luxon'
 import {
   NAffix,
   NBadge,
@@ -120,7 +119,8 @@ import {
 } from 'naive-ui'
 
 import { useAgendaStore } from './store'
-import { useSiteStore } from '../shared/store';
+import { useSiteStore } from '../shared/store'
+import { getUrl } from '../shared/urls'
 
 // MESSAGE PROVIDER
 
@@ -140,14 +140,26 @@ const route = useRoute()
 
 const downloadIcsOptions = [
   {
-    label: 'Subscribe... (webcal)',
     key: 'subscribe',
-    icon: () => h('i', { class: 'bi bi-calendar-week text-blue' })
+    type: 'render',
+    render: () => h('a', {
+      class: 'agenda-quickaccess-callinks',
+      href: `webcal://${window.location.host}${icsLink.value}`
+    }, [
+      h('i', { class: 'bi bi-calendar-week text-blue' }),
+      h('span', 'Subscribe... (webcal)')
+    ])
   },
   {
-    label: 'Download... (.ics)',
     key: 'download',
-    icon: () => h('i', { class: 'bi bi-arrow-down-square' })
+    type: 'render',
+    render: () => h('a', {
+      class: 'agenda-quickaccess-callinks',
+      href: icsLink.value
+    }, [
+      h('i', { class: 'bi bi-arrow-down-square' }),
+      h('span', 'Download... (.ics)')
+    ])
   }
 ]
 
@@ -157,6 +169,17 @@ const shortMode = computed(() => {
   return siteStore.viewport <= 1350
 })
 
+const icsLink = computed(() => {
+  if (agendaStore.pickerMode) {
+    const sessionKeywords = agendaStore.scheduleAdjusted.map(s => s.sessionKeyword)
+    return `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${sessionKeywords.join(',')}`
+  } else if (agendaStore.selectedCatSubs.length > 0) {
+    return `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}?show=${agendaStore.selectedCatSubs.join(',')}`
+  } else {
+    return `${getUrl('meetingCalIcs', { meetingNumber: agendaStore.meeting.number })}`
+  }
+})
+
 // METHODS
 
 function pickerStart () {
@@ -176,44 +199,26 @@ function pickerDiscard () {
   }
 }
 
-function downloadIcs (key) {
-  message.loading('Generating calendar file... Download will begin shortly.')
-  let icsUrl = ''
-  if (agendaStore.pickerMode) {
-    const sessionKeywords = agendaStore.scheduleAdjusted.map(s => s.sessionKeyword)
-    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${sessionKeywords.join(',')}`
-  } else if (agendaStore.selectedCatSubs.length > 0) {
-    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics?show=${agendaStore.selectedCatSubs.join(',')}`
-  } else {
-    icsUrl = `/meeting/${agendaStore.meeting.number}/agenda.ics`
-  }
-  if (key === 'subscribe') {
-    window.location.assign(`webcal://${window.location.host}${icsUrl}`)
-  } else {
-    window.location.assign(icsUrl)
-  }
-}
-
-function scrollToDay (dayId, ev) {
-  ev.preventDefault()
-  document.getElementById(`agenda-day-${dayId}`)?.scrollIntoView(true)
+function scrollToDay (daySlug, ev) {
+  document.getElementById(daySlug)?.scrollIntoView(true)
 }
 
 function scrollToNow (ev) {
-  ev.preventDefault()
-
-  const lastEventId = agendaStore.findCurrentEventId()
+  const nowEventId = agendaStore.findNowEventId()
 
-  if (lastEventId) {
-    document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
+  if (nowEventId) {
+    document.getElementById(`agenda-rowid-${nowEventId}`)?.scrollIntoView(true)
   } else {
-    message.warning('There is no event happening right now.')
+    message.warning('There is no event happening right now or in the future.')
   }
 }
 
 </script>
 
 <style lang="scss">
+@import "bootstrap/scss/functions";
+@import "bootstrap/scss/variables";
+
 .agenda-quickaccess {
   width: 300px;
 
@@ -247,6 +252,10 @@ function scrollToNow (ev) {
     text-align: center;
     margin-top: 12px;
 
+    @at-root .theme-dark & {
+      border-color: $secondary;
+    }
+
     @media screen and (max-width: 1350px) {
       flex-direction: column;
     }
@@ -262,6 +271,11 @@ function scrollToNow (ev) {
       background-color: #FFF;
       transform: translate(-50%, 0);
       text-transform: uppercase;
+
+      @at-root .theme-dark & {
+        background-color: $gray-900;
+        color: #FFF;
+      }
     }
 
     button {
@@ -283,5 +297,24 @@ function scrollToNow (ev) {
     margin-top: 15px;
     margin-bottom: 15px;
   }
+
+  &-callinks {
+    padding: 8px 16px;
+    display: flex;
+    text-decoration: none;
+    align-items: center;
+
+    &:hover, &:focus {
+      text-decoration: underline;
+    }
+
+    > i {
+      font-size: var(--n-font-size);
+    }
+
+    > span {
+      margin-left: 12px;
+    }
+  }
 }
 </style>
diff --git a/client/agenda/AgendaScheduleCalendar.vue b/client/agenda/AgendaScheduleCalendar.vue
index 0dbea168ab..9863296341 100644
--- a/client/agenda/AgendaScheduleCalendar.vue
+++ b/client/agenda/AgendaScheduleCalendar.vue
@@ -11,14 +11,17 @@ n-drawer(v-model:show='isShown', placement='bottom', :height='state.drawerHeight
             n-button(
               :type='agendaStore.isTimezoneMeeting ? `primary` : `default`'
               @click='setTimezone(`meeting`)'
+              :text-color='agendaStore.isTimezoneMeeting ? `#FFF` : null'
               ) Meeting
             n-button(
               :type='agendaStore.isTimezoneLocal ? `primary` : `default`'
               @click='setTimezone(`local`)'
+              :text-color='agendaStore.isTimezoneLocal ? `#FFF` : null'
               ) Local
             n-button(
               :type='agendaStore.timezone === `UTC` ? `primary` : `default`'
               @click='setTimezone(`UTC`)'
+              :text-color='agendaStore.timezone === `UTC` ? `#FFF` : null'
               ) UTC
           n-divider(vertical)
         n-button.me-2(
@@ -32,7 +35,7 @@ n-drawer(v-model:show='isShown', placement='bottom', :height='state.drawerHeight
           n-badge.ms-2(:value='agendaStore.selectedCatSubs.length', processing)
         n-button(
           ghost
-          color='gray'
+          :color='siteStore.theme === `dark` ? `#e35d6a` : `gray`'
           strong
           @click='close'
           )
@@ -81,11 +84,10 @@ import {
   NPopover
 } from 'naive-ui'
 
-import '@fullcalendar/core/vdom' // solves problem with Vite
 import FullCalendar from '@fullcalendar/vue3'
 import timeGridPlugin from '@fullcalendar/timegrid'
 import interactionPlugin from '@fullcalendar/interaction'
-import luxonPlugin from '@fullcalendar/luxon2'
+import luxonPlugin from '@fullcalendar/luxon3'
 import bootstrap5Plugin from '@fullcalendar/bootstrap5'
 
 import AgendaDetailsModal from './AgendaDetailsModal.vue'
@@ -185,6 +187,7 @@ function refreshData () {
   let earliestDate = DateTime.fromISO('2200-01-01')
   let latestDate = DateTime.fromISO('1990-01-01')
   let nowDate = DateTime.now()
+  let hasCrossDayEvents = false
 
   calendarOptions.events = agendaStore.scheduleAdjusted.map(ev => {
     // -> Determine boundaries
@@ -200,6 +203,9 @@ function refreshData () {
     if (ev.adjustedEnd < latestDate) {
       latestDate = ev.adjustedEnd
     }
+    if (ev.adjustedStart.day !== ev.adjustedEnd.day) {
+      hasCrossDayEvents = true
+    }
     // -> Build event object
     return {
       id: ev.id,
@@ -212,8 +218,8 @@ function refreshData () {
   })
 
   // -> Display settings
-  calendarOptions.slotMinTime = `${earliestHour.toString().padStart(2, '0')}:00:00`
-  calendarOptions.slotMaxTime = `${latestHour.toString().padStart(2, '0')}:00:00`
+  calendarOptions.slotMinTime = hasCrossDayEvents ? '00:00:00' : `${earliestHour.toString().padStart(2, '0')}:00:00`
+  calendarOptions.slotMaxTime = hasCrossDayEvents ? '23:59:59' : `${latestHour.toString().padStart(2, '0')}:00:00`
   calendarOptions.validRange.start = earliestDate.minus({ days: 1 }).toISODate()
   calendarOptions.validRange.end = latestDate.plus({ days: 1 }).toISODate()
   // calendarOptions.scrollTime = `${earliestHour.toString().padStart(2, '0')}:00:00`
@@ -324,7 +330,6 @@ function close () {
     }
 
     .badge {
-      width: 30px;
       font-size: .7em;
       border: 1px solid #CCC;
       text-transform: uppercase;
diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue
index e3356913c0..bbe5dfee8b 100644
--- a/client/agenda/AgendaScheduleList.vue
+++ b/client/agenda/AgendaScheduleList.vue
@@ -15,6 +15,7 @@
           td(:colspan='pickerModeActive ? 6 : 5')
             i.bi.bi-exclamation-triangle.me-2
             span(v-if='agendaStore.searchVisible && agendaStore.searchText') No event matching your search query.
+            span(v-else-if='agendaStore.meeting.prelimAgendaDate') A preliminary agenda is expected to be released on {{ agendaStore.meeting.prelimAgendaDate }}
             span(v-else) Nothing to display
         tr(
           v-for='item of meetingEvents'
@@ -24,7 +25,7 @@
           )
           //- ROW - DAY HEADING -----------------------
           template(v-if='item.displayType === `day`')
-            td(:id='`agenda-day-` + item.id', :colspan='pickerModeActive ? 6 : 5') {{item.date}}
+            td(:id='item.slug', :colspan='pickerModeActive ? 6 : 5') {{item.date}}
           //- ROW - SESSION HEADING -------------------
           template(v-else-if='item.displayType === `session-head`')
             td.agenda-table-cell-check(v-if='pickerModeActive') &nbsp;
@@ -83,6 +84,14 @@
                 template(#trigger)
                   span.badge.is-bof BoF
                 span #[a(href='https://www.ietf.org/how/bofs/', target='_blank') Birds of a Feather] sessions (BoFs) are initial discussions about a particular topic of interest to the IETF community.
+              n-popover(
+                v-if='item.isProposed'
+                trigger='hover'
+                :width='250'
+                )
+                template(#trigger)
+                  span.badge.is-proposed Proposed
+                span #[a(href='https://www.ietf.org/process/wgs/', target='_blank') Proposed WGs] are groups in the process of being chartered. If the charter is not approved by the IESG before the IETF meeting, the session may be canceled.
               .agenda-table-note(v-if='item.note')
                 i.bi.bi-arrow-return-right.me-1
                 span {{item.note}}
@@ -112,20 +121,12 @@
                     :options='item.links'
                     key-field='id'
                     :render-icon='renderLinkIcon'
-                    @select='goToSessionLink'
+                    :render-label='renderLink'
                     )
                     n-button(size='tiny')
                       i.bi.bi-three-dots
                 .agenda-table-cell-links-buttons(v-else-if='item.links && item.links.length > 0')
-                    template(v-if='item.flags.agenda')
-                      n-popover
-                        template(#trigger)
-                          i.bi.bi-collection(
-                            :id='`btn-lnk-` + item.key + `-mat`'
-                            @click='showMaterials(item.key)'
-                            )
-                        span Show meeting materials
-                    template(v-else-if='item.type === `regular`')
+                    template(v-if='!item.flags.agenda && item.type === `regular`')
                       n-popover
                         template(#trigger)
                           i.no-meeting-materials
@@ -134,7 +135,16 @@
                         span No meeting materials yet.
                     n-popover(v-for='lnk of item.links', :key='lnk.id')
                       template(#trigger)
+                        button(
+                          v-if="lnk.click"
+                          type="button"
+                          :id='`btn-` + lnk.id'
+                          @click='lnk.click'
+                          :aria-label='lnk.label'
+                          :class='`border-0 bg-transparent text-` + lnk.color'
+                          ): i.bi(:class='`bi-` + lnk.icon')
                         a(
+                          v-else
                           :id='`btn-` + lnk.id'
                           :href='lnk.href'
                           :aria-label='lnk.label'
@@ -200,8 +210,9 @@ import {
 
 import AgendaDetailsModal from './AgendaDetailsModal.vue'
 
-import { useAgendaStore } from './store'
+import { useAgendaStore, daySlugPrefix, daySlug } from './store'
 import { useSiteStore } from '../shared/store'
+import { getUrl } from '../shared/urls'
 
 // MESSAGE PROVIDER
 
@@ -244,54 +255,96 @@ const meetingEvents = computed(() => {
 
     // -> Add date row
     const itemDate = DateTime.fromISO(item.adjustedStartDate)
+    let willRenderDateRow = false
     if (itemDate.toISODate() !== acc.lastDate) {
       acc.result.push({
         id: item.id,
+        slug: daySlug(item),
         key: `day-${itemDate.toISODate()}`,
         displayType: 'day',
         date: itemDate.toLocaleString(DateTime.DATE_HUGE),
         cssClasses: 'agenda-table-display-day'
       })
+      willRenderDateRow = true
     }
     acc.lastDate = itemDate.toISODate()
 
     // -> Add session header row
-    if (item.type === 'regular' && acc.lastTypeName !== `${item.type}-${item.name}`) {
+    const typeName = `${item.type}-${item.slotName}`
+    if (item.type === 'regular' && (acc.lastTypeName !== typeName || willRenderDateRow)) {
       acc.result.push({
         key: `sesshd-${item.id}`,
         displayType: 'session-head',
         timeslot: itemTimeSlot,
-        name: `${item.adjustedStart.toFormat('cccc')} ${item.name}`,
+        name: `${item.adjustedStart.setZone(agendaStore.meeting.timezone).toFormat('cccc')} ${item.slotName}`,
         cssClasses: 'agenda-table-display-session-head' + (isLive ? ' agenda-table-live' : '')
       })
     }
-    acc.lastTypeName = `${item.type}-${item.name}`
-
-    // -> Populate event links
+    acc.lastTypeName = typeName
+
+    // 
+    /**
+     * -> Populate event menu items
+     * 
+     * links is an array of either,
+     * 1. { href: "...",        click: undefined, ...sharedProps }
+     * 2. { click: () => {...}, href: undefined,  ...sharedProps }
+     */
     const links = []
-    if (item.flags.showAgenda || ['regular', 'plenary'].includes(item.type)) {
+    const typesWithLinks = ['regular', 'plenary', 'other']
+    const purposesWithoutLinks = ['admin', 'closed_meeting', 'officehours', 'social']
+    if (item.flags.showAgenda || (typesWithLinks.includes(item.type) && !purposesWithoutLinks.includes(item.purpose))) {
       if (item.flags.agenda) {
+        // -> Meeting Materials
+        links.push({
+          id: `btn-${item.id}-mat`,
+          label: 'Show meeting materials',
+          icon: 'collection',
+          href: undefined,
+          click: () => showMaterials(item.id),
+          color: 'darkgray'
+        })
         links.push({
           id: `lnk-${item.id}-tar`,
           label: 'Download meeting materials as .tar archive',
           icon: 'file-zip',
-          href: `/meeting/${agendaStore.meeting.number}/agenda/${item.acronym}-drafts.tgz`,
+          href: getUrl('meetingMaterialsTar', {
+            meetingNumber: agendaStore.meeting.number,
+            eventAcronym: item.acronym
+          }),
           color: 'brown'
         })
         links.push({
           id: `lnk-${item.id}-pdf`,
           label: 'Download meeting materials as PDF file',
           icon: 'file-pdf',
-          href: `/meeting/${agendaStore.meeting.number}/agenda/${item.acronym}-drafts.pdf`,
+          href: getUrl('meetingMaterialsPdf', {
+            meetingNumber: agendaStore.meeting.number,
+            eventAcronym: item.acronym
+          }),
           color: 'red'
         })
       }
-      if (agendaStore.useHedgeDoc) {
+      // -> Point to Wiki for Hackathon sessions, HedgeDocs otherwise
+      if (item.groupAcronym === 'hackathon') {
+        links.push({
+          id: `lnk-${item.id}-wiki`,
+          label: 'Wiki',
+          icon: 'book',
+          href: getUrl('hackathonWiki', {
+            meetingNumber: agendaStore.meeting.number
+          }),
+          color: 'blue'
+        })
+      } else if (agendaStore.usesNotes) {
         links.push({
           id: `lnk-${item.id}-note`,
           label: 'Notepad for note-takers',
           icon: 'journal-text',
-          href: `https://notes.ietf.org/notes-ietf-${agendaStore.meeting.number}-${item.type === 'plenary' ? 'plenary' : item.acronym}`,
+          href: getUrl('meetingNotes', {
+            meetingNumber: agendaStore.meeting.number,
+            eventAcronym: item.type === 'plenary' ? 'plenary' : item.acronym
+          }),
           color: 'blue'
         })
       }
@@ -345,16 +398,6 @@ const meetingEvents = computed(() => {
             color: 'teal'
           })
         }
-        // -> Calendar item
-        if (item.links.calendar) {
-          links.push({
-            id: `lnk-${item.id}-calendar`,
-            label: isMobile.value ? `Calendar (.ics) entry for this session` : `Calendar (.ics) entry for ${item.acronym} session on ${item.adjustedStart.toFormat('fff')}`,
-            icon: 'calendar-check',
-            href: item.links.calendar,
-            color: 'pink'
-          })
-        }
       } else {
         // -> Post event
         if (meetingNumberInt >= 60) {
@@ -404,13 +447,43 @@ const meetingEvents = computed(() => {
               id: `lnk-${item.id}-rec`,
               label: 'Session recording',
               icon: 'film',
-              href: `https://www.meetecho.com/ietf${agendaStore.meeting.number}/recordings#${item.acronym.toUpperCase()}`,
+              href: getUrl('meetingMeetechoRecordings', {
+                meetingNumber: agendaStore.meeting.number,
+                eventAcronym: item.acronym.toUpperCase()
+              }),
               color: 'purple'
             })
           }
+          // -> Keep showing video client / on-site tool for Plenary until end of day, in case it goes over the planned time range
+          if (item.type === 'plenary' && item.adjustedEnd.day === current.day) {
+            links.push({
+              id: `lnk-${item.id}-video`,
+              label: 'Full Client with Video',
+              icon: 'camera-video',
+              href: item.links.videoStream,
+              color: 'purple'
+            })
+            links.push({
+              id: `lnk-${item.id}-onsitetool`,
+              label: 'Onsite tool',
+              icon: 'telephone-outbound',
+              href: item.links.onsiteTool,
+              color: 'teal'
+            })
+          }
         }
       }
     }
+    // Add Calendar item for all events that has a calendar link
+    if (item.adjustedEnd > current && item.links.calendar) {
+      links.push({
+        id: `lnk-${item.id}-calendar`,
+        label: 'Calendar (.ics) entry for this session',
+        icon: 'calendar-check',
+        href: item.links.calendar,
+        color: 'pink'
+      })
+    }
 
     // Event icon
     let icon = null
@@ -424,7 +497,7 @@ const meetingEvents = computed(() => {
       case 'other':
         if (item.name.toLowerCase().indexOf('office hours') >= 0) {
           icon = 'bi-building'
-        } else if (item.name.toLowerCase().indexOf('hackathon') >= 0) {
+        } else if (item.groupAcronym === 'hackathon') {
           icon = 'bi-command bi-pink'
         }
         break
@@ -451,6 +524,7 @@ const meetingEvents = computed(() => {
       // groupParentName: item.groupParent?.name,
       icon,
       isBoF: item.isBoF,
+      isProposed: item.isProposed,
       isSessionEvent: item.type === 'regular',
       links,
       location: item.location,
@@ -544,17 +618,53 @@ function renderLinkIcon (opt) {
   return h('i', { class: `bi bi-${opt.icon} text-${opt.color}` })
 }
 
+function renderLink (opt) {
+  if (opt.click) {
+    return h('button', { type: 'button', class: 'overflow-button', onClick: opt.click }, opt.label)
+  }
+
+  return h('a', { href: opt.href, target: '_blank' }, opt.label)
+}
+
 function recalculateRedLine () {
   state.currentMinute = DateTime.local().minute
-  const lastEventId = agendaStore.findCurrentEventId()
+  const currentEventId = agendaStore.findCurrentEventId()
 
-  if (lastEventId) {
-    state.redhandOffset = document.getElementById(`agenda-rowid-${lastEventId}`)?.offsetTop || 0
+  if (currentEventId) {
+    state.redhandOffset = document.getElementById(`agenda-rowid-${currentEventId}`)?.offsetTop || 0
   } else {
     state.redhandOffset = 0
   }
 }
 
+/**
+ * On page load when browser location hash contains '#now' or '#agenda-day-*' then scroll accordingly
+ */
+;(function scrollToHashInit() {
+  if (!window.location.hash) {
+    return
+  }
+  if (!(window.location.hash === "#now" || window.location.hash.startsWith(`#${daySlugPrefix}`))) {
+    return
+  }
+  const unsubscribe = agendaStore.$subscribe((_mutation, agendaStoreState) => {
+    if (agendaStoreState.schedule.length === 0) {
+      return
+    }
+    unsubscribe() // we only need to scroll once, so unsubscribe from future updates
+    if (window.location.hash === "#now") {
+      const nowEventId = agendaStore.findNowEvent()
+      if (nowEventId) {
+        document.getElementById(`agenda-rowid-${nowEventId}`)?.scrollIntoView(true)
+      } else {
+        message.warning('There is no event happening right now or in the future.')
+      }
+    } else if(window.location.hash.startsWith(`#${daySlugPrefix}`)) {
+      document.getElementById(window.location.hash.substring(1))?.scrollIntoView(true)
+    }
+  })
+})()
+
 // MOUNTED
 
 onMounted(() => {
@@ -664,6 +774,10 @@ onBeforeUnmount(() => {
     border-radius: 5px;
     border-collapse: separate;
     border-spacing: 0;
+
+    @at-root .theme-dark & {
+      border-color: #000;
+    }
   }
 
   // -> Table HEADER
@@ -683,6 +797,11 @@ onBeforeUnmount(() => {
     font-weight: 600;
     border-right: 1px solid #FFF;
 
+    @at-root .theme-dark & {
+      border-bottom-color: #000;
+      border-right-color: #000;
+    }
+
     @media screen and (max-width: $bs5-break-md) {
       font-size: .8em;
       padding: 0 6px;
@@ -737,6 +856,10 @@ onBeforeUnmount(() => {
 
   tr:nth-child(odd) td {
     background-color: #F9F9F9;
+
+    @at-root .theme-dark & {
+      background-color: darken($gray-900, 5%);
+    }
   }
 
   &-display-noresult > td {
@@ -746,6 +869,12 @@ onBeforeUnmount(() => {
     color: $gray-800;
     text-shadow: 1px 1px 0 #FFF;
     font-weight: 600;
+
+    @at-root .theme-dark & {
+      background: linear-gradient(to bottom, $gray-900, $gray-800);
+      color: #FFF;
+      text-shadow: 1px 1px 0 $gray-900;
+    }
   }
 
   &-display-day > td {
@@ -757,6 +886,10 @@ onBeforeUnmount(() => {
     font-weight: 600;
     scroll-margin-top: 25px;
 
+    @at-root .theme-dark & {
+      border-bottom-color: #000;
+    }
+
     @media screen and (max-width: $bs5-break-md) {
       font-size: .9em;
     }
@@ -769,6 +902,11 @@ onBeforeUnmount(() => {
     padding: 0 12px;
     color: #333;
 
+    @at-root .theme-dark & {
+      background: linear-gradient(to top, lighten($blue-900, 8%), lighten($blue-900, 4%)) !important;
+      color: $blue-100;
+    }
+
     @media screen and (max-width: $bs5-break-md) {
       padding: 0 6px;
     }
@@ -776,12 +914,21 @@ onBeforeUnmount(() => {
     &.agenda-table-cell-ts {
       border-right: 1px solid $blue-200 !important;
       color: $blue-700;
+
+      @at-root .theme-dark & {
+        border-right-color: $blue-700 !important;
+        color: $blue-200;
+      }
     }
 
     &.agenda-table-cell-name {
       color: $blue-700;
       font-weight: 600;
 
+      @at-root .theme-dark & {
+        color: $blue-200;
+      }
+
       @media screen and (max-width: $bs5-break-md) {
         font-size: .9em;
       }
@@ -793,6 +940,10 @@ onBeforeUnmount(() => {
     padding: 0 12px;
     color: #333;
 
+    @at-root .theme-dark & {
+      color: #FFF;
+    }
+
     @media screen and (max-width: $bs5-break-md) {
       padding: 2px 6px;
     }
@@ -801,6 +952,11 @@ onBeforeUnmount(() => {
       background-color: desaturate($blue-700, 50%) !important;
       border-bottom: 1px solid #FFF;
       padding-bottom: 2px;
+
+      @at-root .theme-dark & {
+        background-color: $gray-800 !important;
+        border-bottom-color: #000;
+      }
     }
 
     &.agenda-table-cell-ts {
@@ -809,6 +965,13 @@ onBeforeUnmount(() => {
         border-right: 1px solid $blue-200 !important;
         color: $blue-200;
         border-bottom: 1px solid #FFF;
+
+        @at-root .theme-dark & {
+          background: linear-gradient(to right, rgba(lighten($blue-900, 8%), .1), lighten($blue-900, 5%));
+          border-right-color: $blue-700 !important;
+          border-bottom-color: $blue-700;
+          color: $blue-700;
+        }
       }
     }
 
@@ -817,6 +980,11 @@ onBeforeUnmount(() => {
       border-right: 1px solid $gray-300 !important;
       white-space: nowrap;
 
+      @at-root .theme-dark & {
+        color: $yellow-100;
+        border-right-color: $gray-700 !important;
+      }
+
       @media screen and (max-width: 1300px) {
         font-size: .85rem;
       }
@@ -860,6 +1028,11 @@ onBeforeUnmount(() => {
       border-right: 1px solid $gray-300 !important;
       white-space: nowrap;
 
+      @at-root .theme-dark & {
+        color: $gray-400;
+        border-right-color: $gray-700 !important;
+      }
+
       @media screen and (max-width: $bs5-break-md) {
         font-size: .7rem;
         word-break: break-all;
@@ -886,6 +1059,14 @@ onBeforeUnmount(() => {
         border-top-left-radius: 0;
         border-bottom-left-radius: 0;
         margin-right: 6px;
+
+        @at-root .theme-dark & {
+          background-color: $gray-700;
+          border-bottom-color: $gray-600;
+          border-right-color: $gray-600;
+          color: $gray-200;
+          text-shadow: 1px 1px $gray-800;
+        }
       }
     }
 
@@ -896,13 +1077,26 @@ onBeforeUnmount(() => {
         word-wrap: break-word;
       }
 
-      .badge.is-bof {
-        background-color: $teal-500;
+      .badge {
         margin: 0 8px;
 
+        &.is-bof {
+          background-color: $teal-500;
+
+          @at-root .theme-dark & {
+            background-color: $teal-700;
+          }
+        }
+
+        &.is-proposed {
+          background-color: $gray-500;
+
+          @at-root .theme-dark & {
+            background-color: $gray-700;
+          }
+        }
+
         @media screen and (max-width: $bs5-break-md) {
-          width: 30px;
-          display: block;
           margin: 2px 0 0 0;
         }
       }
@@ -917,6 +1111,10 @@ onBeforeUnmount(() => {
         }
         &.bi-green {
           color: $green-500;
+
+          @at-root .theme-dark & {
+            color: $green-300;
+          }
         }
         &.bi-pink {
           color: $pink-500;
@@ -957,7 +1155,7 @@ onBeforeUnmount(() => {
       .agenda-table-cell-links-buttons {
         white-space: nowrap;
 
-        > a, > i {
+        > a, > i, > button {
           margin-left: 3px;
           color: #666;
           cursor: pointer;
@@ -966,6 +1164,11 @@ onBeforeUnmount(() => {
           padding: 2px 3px;
           transition: background-color .6s ease;
 
+          @at-root .theme-dark & {
+            background-color: rgba(0, 0, 0, .2);
+            color: $gray-200;
+          }
+
           &:hover, &:focus {
             color: $blue;
           }
@@ -974,6 +1177,10 @@ onBeforeUnmount(() => {
             color: $red-500;
             background-color: rgba($red-500, .1);
 
+            @at-root .theme-dark & {
+              color: $red-400;
+            }
+
             &:hover, &:focus {
               background-color: rgba($red-500, .3);
             }
@@ -982,14 +1189,34 @@ onBeforeUnmount(() => {
             color: $orange-700;
             background-color: rgba($orange-500, .1);
 
+            @at-root .theme-dark & {
+              color: $orange-400;
+            }
+
             &:hover, &:focus {
               background-color: rgba($orange-500, .3);
             }
           }
+          &.text-darkgray {
+            color: $gray-900;
+            background-color: rgba($gray-700, .1);
+
+            @at-root .theme-dark & {
+              color: $gray-100;
+            }
+
+            &:hover, &:focus {
+              background-color: rgba($gray-700, .3);
+            }
+          }
           &.text-blue {
             color: $blue-600;
             background-color: rgba($blue-300, .1);
 
+            @at-root .theme-dark & {
+              color: $blue-300;
+            }
+
             &:hover, &:focus {
               background-color: rgba($blue-300, .3);
             }
@@ -998,6 +1225,10 @@ onBeforeUnmount(() => {
             color: $green-500;
             background-color: rgba($green-300, .1);
 
+            @at-root .theme-dark & {
+              color: $green-300;
+            }
+
             &:hover, &:focus {
               background-color: rgba($green-300, .3);
             }
@@ -1006,6 +1237,10 @@ onBeforeUnmount(() => {
             color: $purple-500;
             background-color: rgba($purple-400, .1);
 
+            @at-root .theme-dark & {
+              color: $purple-300;
+            }
+
             &:hover, &:focus {
               background-color: rgba($purple-400, .3);
             }
@@ -1014,6 +1249,10 @@ onBeforeUnmount(() => {
             color: $pink-500;
             background-color: rgba($pink-400, .1);
 
+            @at-root .theme-dark & {
+              color: $pink-400;
+            }
+
             &:hover, &:focus {
               background-color: rgba($pink-400, .3);
             }
@@ -1022,6 +1261,10 @@ onBeforeUnmount(() => {
             color: $teal-600;
             background-color: rgba($teal-400, .1);
 
+            @at-root .theme-dark & {
+              color: $teal-300;
+            }
+
             &:hover, &:focus {
               background-color: rgba($teal-400, .3);
             }
@@ -1041,13 +1284,17 @@ onBeforeUnmount(() => {
 
   &-cell-ts {
     border-right: 1px solid $gray-300 !important;
-    // -> Use system font instead of Montserrat so that all digits align vertically
+    // -> Use system font instead of Inter so that all digits align vertically
     font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
     font-size: 1rem;
     font-weight: 700;
     text-align: right;
     white-space: nowrap;
 
+    @at-root .theme-dark & {
+      border-right-color: $gray-700 !important;
+    }
+
     @media screen and (max-width: 1300px) {
       font-size: .9rem;
     }
@@ -1073,8 +1320,22 @@ onBeforeUnmount(() => {
       border-bottom: none;
     }
 
+    &.agenda-table-cell-ts.is-session-event {
+      @at-root .theme-dark & {
+        background: transparent;
+        color: $red-300;
+        border-top: 1px solid darken($red-100, 5%);
+        border-bottom-color: darken($red-100, 5%);
+      }
+    }
+
     &.agenda-table-cell-room {
       border-right: 1px solid darken($red-100, 5%) !important;
+      text-decoration: line-through;
+    }
+
+    &.agenda-table-cell-name > a, &.agenda-table-cell-name > span {
+      text-decoration: line-through;
     }
 
     &:last-child {
@@ -1091,8 +1352,22 @@ onBeforeUnmount(() => {
       border-bottom: none;
     }
 
+    &.agenda-table-cell-ts.is-session-event {
+      @at-root .theme-dark & {
+        background: transparent;
+        color: $orange-300;
+        border-top: 1px solid darken($orange-100, 5%);
+        border-bottom-color: darken($orange-100, 5%);
+      }
+    }
+
     &.agenda-table-cell-room {
       border-right: 1px solid darken($orange-100, 5%) !important;
+      text-decoration: line-through;
+    }
+
+    &.agenda-table-cell-name > a, &.agenda-table-cell-name > span {
+      text-decoration: line-through;
     }
 
     &:last-child {
@@ -1104,10 +1379,21 @@ onBeforeUnmount(() => {
     border-top: 1px solid darken($indigo-100, 5%);
     border-bottom: 1px solid darken($indigo-100, 5%);
 
+    @at-root .theme-dark & {
+      color: $indigo-100;
+      // border-bottom-color: #000;
+    }
+
     &.agenda-table-cell-ts {
       background: linear-gradient(to right, lighten($indigo-100, 8%), lighten($indigo-100, 5%));
       color: $indigo-700;
       border-right: 1px solid $indigo-100 !important;
+
+      @at-root .theme-dark & {
+        background: rgba($indigo, .1) !important;
+        color: $indigo-100;
+        border-right-color: $indigo-500 !important;
+      }
     }
 
     &.agenda-table-cell-room {
@@ -1117,10 +1403,18 @@ onBeforeUnmount(() => {
     &.agenda-table-cell-name {
       color: $indigo-700;
       font-style: italic;
+
+      @at-root .theme-dark & {
+        color: $indigo-200;
+      }
     }
 
     &.agenda-table-cell-links {
       background: linear-gradient(to right, lighten($indigo-100, 5%), lighten($indigo-100, 8%));
+
+      @at-root .theme-dark & {
+        background: rgba($indigo, .1) !important;
+      }
     }
   }
   &-type-plenary td {
@@ -1129,9 +1423,19 @@ onBeforeUnmount(() => {
     border-top: 1px solid darken($teal-100, 5%);
     border-bottom: 1px solid darken($teal-100, 5%);
 
+    @at-root .theme-dark & {
+      background: rgba($teal, .15) !important;
+      color: $teal-100;
+      border-bottom: 1px solid darken($teal-600, 5%);
+    }
+
     &.agenda-table-cell-ts {
       background: linear-gradient(to right, lighten($teal-100, 8%), lighten($teal-100, 2%));
       border-right: 1px solid $teal-200 !important;
+
+      @at-root .theme-dark & {
+        border-right-color: $teal-700 !important;
+      }
     }
 
     &.agenda-table-cell-room {
@@ -1141,10 +1445,18 @@ onBeforeUnmount(() => {
     &.agenda-table-cell-name {
       font-weight: 600;
       color: $teal-700;
+
+      @at-root .theme-dark & {
+        color: $teal-200;
+      }
     }
 
     &.agenda-table-cell-links {
       background: linear-gradient(to right, rgba(lighten($teal, 54%), 0), lighten($teal, 54%));
+
+      @at-root .theme-dark & {
+        background: rgba($teal, .15) !important;
+      }
     }
   }
 
@@ -1309,6 +1621,22 @@ onBeforeUnmount(() => {
   }
 }
 
+.overflow-button {
+  font-size: inherit;
+  padding: 0;
+  border: 0;
+  background: transparent;
+
+  &:before {
+    content: "";
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+  }
+}
+
 @keyframes fadeInAnim {
   0% {
     opacity: 0;
diff --git a/client/agenda/AgendaSettings.vue b/client/agenda/AgendaSettings.vue
index 41cd226b6c..b074bc3247 100644
--- a/client/agenda/AgendaSettings.vue
+++ b/client/agenda/AgendaSettings.vue
@@ -457,6 +457,14 @@ onMounted(() => {
     font-size: .8rem;
     color: $gray-700;
     text-shadow: 1px 1px 0 #FFF;
+
+    @at-root .theme-dark & {
+      background-color: $gray-900;
+      text-shadow: none;
+      border-bottom-color: $gray-700;
+      border-right-color: $gray-700;
+      color: #FFF;
+    }
   }
 
   &-calcoffset {
diff --git a/client/agenda/AgendaShareModal.vue b/client/agenda/AgendaShareModal.vue
new file mode 100644
index 0000000000..a71938673b
--- /dev/null
+++ b/client/agenda/AgendaShareModal.vue
@@ -0,0 +1,173 @@
+<template lang="pug">
+n-modal(v-model:show='modalShown')
+  n-card.agenda-share(
+    :bordered='false'
+    segmented
+    role='dialog'
+    aria-modal='true'
+    )
+    template(#header-extra)
+      .agenda-share-header
+        n-button.ms-4.agenda-share-close(
+          ghost
+          color='gray'
+          strong
+          @click='modalShown = false'
+          )
+          i.bi.bi-x
+    template(#header)
+      .agenda-share-header
+        i.bi.bi-share
+        span Share this view
+    .agenda-share-content
+      .text-body-secondary.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
+      n-input-group
+        n-input(
+          ref='filteredUrlIpt'
+          size='large'
+          readonly 
+          v-model:value='state.filteredUrl'
+          )
+        n-button(
+          type='primary'
+          primary
+          strong
+          size='large'
+          @click='copyFilteredUrl'
+          )
+          template(#icon)
+            i.bi.bi-clipboard-check.me-1
+          span Copy
+</template>
+
+<script setup>
+import { computed, reactive, ref, watch } from 'vue'
+import { find } from 'lodash-es'
+import {
+  NButton,
+  NCard,
+  NModal,
+  NInputGroup,
+  NInput,
+  useMessage
+} from 'naive-ui'
+
+import { useAgendaStore } from './store'
+
+// PROPS
+
+const props = defineProps({
+  shown: {
+    type: Boolean,
+    required: true,
+    default: false
+  }
+})
+
+// MESSAGE PROVIDER
+
+const message = useMessage()
+
+// STORES
+
+const agendaStore = useAgendaStore()
+
+// EMIT
+
+const emit = defineEmits(['update:shown'])
+
+// STATE
+
+const state = reactive({
+  isLoading: false,
+  filteredUrl: window.location.href
+})
+const filteredUrlIpt = ref(null)
+
+// COMPUTED
+
+const modalShown = computed({
+  get () {
+    return props.shown
+  },
+  set(value) {
+    emit('update:shown', value)
+  }
+})
+
+// WATCHERS
+
+watch(() => props.shown, (newValue) => {
+  if (newValue) {
+    generateUrl()
+  }
+})
+
+// METHODS
+
+function generateUrl () {
+  const newUrl = new URL(window.location.href)
+  const queryParams = []
+  if (agendaStore.selectedCatSubs.length > 0 ) {
+    queryParams.push(`filters=${agendaStore.selectedCatSubs.join(',')}`)
+  }
+  if (agendaStore.pickerMode && agendaStore.pickedEvents.length > 0 ) {
+    const kwds = []
+    for (const id of agendaStore.pickedEvents) {
+      const session = find(agendaStore.scheduleAdjusted, ['id', id])
+      if (session) {
+        const suffix = session.sessionToken ? `-${session.sessionToken}` : ''
+        kwds.push(`${session.acronym}${suffix}`)
+      }
+    }
+    queryParams.push(`show=${kwds.join(',')}`)
+  }
+  newUrl.search = queryParams.length > 0 ? `?${queryParams.join('&')}` : ''
+  state.filteredUrl = newUrl.toString()
+}
+
+async function copyFilteredUrl () {
+  filteredUrlIpt.value?.select()
+
+  try {
+    if (navigator.clipboard) {
+      await navigator.clipboard.writeText(state.filteredUrl)
+    } else {
+      if (!document.execCommand('copy')) {
+        throw new Error('Copy failed')
+      }
+    }
+    message.success('URL copied to clipboard successfully.')
+  } catch (err) {
+    message.error('Failed to copy URL to clipboard.')
+  }
+}
+
+</script>
+
+<style lang="scss">
+@import "bootstrap/scss/functions";
+@import "bootstrap/scss/variables";
+
+.agenda-share {
+  width: 90vw;
+  max-width: 1000px;
+
+  &-header {
+    font-size: 20px;
+    display: flex;
+    align-items: center;
+
+    > .bi {
+      margin-right: 12px;
+      font-size: 20px;
+      color: $indigo;
+    }
+  }
+
+  &-close .bi {
+    font-size: 20px;
+    color: inherit;
+  }
+}
+</style>
diff --git a/client/agenda/FloorPlan.vue b/client/agenda/FloorPlan.vue
index 3586294095..eccd59aeaa 100644
--- a/client/agenda/FloorPlan.vue
+++ b/client/agenda/FloorPlan.vue
@@ -5,7 +5,6 @@
       span #[strong IETF {{agendaStore.meeting.number}}] Floor Plan
       .meeting-h1-badges.d-none.d-sm-flex
         span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
-        span.meeting-beta BETA
     h4
       span {{agendaStore.meeting.city}}, {{ meetingDate }}
 
@@ -188,10 +187,10 @@ function handleDesiredRoom () {
       if (rm) {
         state.currentFloor = fl.id
         state.currentRoom = rm.id
+        state.desiredRoom = null
         break
       }
     }
-    state.desiredRoom = null
   }
 }
 
@@ -259,6 +258,11 @@ onMounted(() => {
     border-radius: 5px;
     font-weight: 500;
 
+    @at-root .theme-dark & {
+      background-color: darken($gray-900, 5%);
+      border-color: $gray-700;
+    }
+
     a {
       cursor: pointer;
 
diff --git a/client/agenda/agenda.scss b/client/agenda/agenda.scss
index 6d5cd634b5..e3e46d14f0 100644
--- a/client/agenda/agenda.scss
+++ b/client/agenda/agenda.scss
@@ -10,6 +10,10 @@
     justify-content: space-between;
     align-items: center;
 
+    @at-root .theme-dark & {
+      color: $gray-300;
+    }
+
     @media screen and (max-width: $bs5-break-sm) {
       justify-content: center;
 
@@ -25,6 +29,10 @@
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
       box-decoration-break: clone;
+
+      @at-root .theme-dark & {
+        background-image: linear-gradient(220deg, $yellow-200 20%, $orange-400 70%);
+      }
     }
   }
 
diff --git a/client/agenda/store.js b/client/agenda/store.js
index b0d42734cb..b5498303a6 100644
--- a/client/agenda/store.js
+++ b/client/agenda/store.js
@@ -4,6 +4,7 @@ import uniqBy from 'lodash/uniqBy'
 import murmur from 'murmurhash-js/murmurhash3_gc'
 
 import { useSiteStore } from '../shared/store'
+import { storageAvailable } from '../shared/feature-detect'
 
 const urlRe = /http[s]?:\/\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+/
 const conferenceDomains = ['webex.com', 'zoom.us', 'jitsi.org', 'meetecho.com', 'gather.town']
@@ -49,7 +50,7 @@ export const useAgendaStore = defineStore('agenda', {
     selectedCatSubs: [],
     settingsShown: false,
     timezone: DateTime.local().zoneName,
-    useHedgeDoc: false,
+    usesNotes: false,
     visibleDays: []
   }),
   getters: {
@@ -120,7 +121,7 @@ export const useAgendaStore = defineStore('agenda', {
     meetingDays () {
       const siteStore = useSiteStore()
       return uniqBy(this.scheduleAdjusted, 'adjustedStartDate').sort().map(s => ({
-        slug: s.id.toString(),
+        slug: daySlug(s),
         ts: s.adjustedStartDate,
         label: siteStore.viewport < 1350 ? DateTime.fromISO(s.adjustedStartDate).toFormat('ccc LLL d') : DateTime.fromISO(s.adjustedStartDate).toLocaleString(DateTime.DATE_HUGE)
       }))
@@ -140,14 +141,18 @@ export const useAgendaStore = defineStore('agenda', {
           meetingNumber = meetingData.meetingNumber
         }
 
-        const resp = await fetch(`/api/meeting/${meetingNumber}/agenda-data`, { credentials: 'omit' })
+        const resp = await fetch(`/api/meeting/${meetingNumber}/agenda-data`)
         if (!resp.ok) {
           throw new Error(resp.statusText)
         }
         const agendaData = await resp.json()
 
         // -> Switch to meeting timezone
-        this.timezone = window.localStorage.getItem(`agenda.${agendaData.meeting.number}.timezone`) || agendaData.meeting.timezone
+        if (storageAvailable('localStorage')) {
+          this.timezone = window.localStorage.getItem(`agenda.${agendaData.meeting.number}.timezone`) || agendaData.meeting.timezone
+        } else {
+          this.timezone = agendaData.meeting.timezone
+        }
 
         // -> Load meeting data
         this.categories = agendaData.categories
@@ -155,34 +160,47 @@ export const useAgendaStore = defineStore('agenda', {
         this.isCurrentMeeting = agendaData.isCurrentMeeting
         this.meeting = agendaData.meeting
         this.schedule = agendaData.schedule
-        this.useHedgeDoc = agendaData.useHedgeDoc
+        this.usesNotes = agendaData.usesNotes
 
         // -> Compute current info note hash
         this.infoNoteHash = murmur(agendaData.meeting.infoNote, 0).toString()
 
         // -> Load meeting-specific preferences
-        this.infoNoteShown = !(window.localStorage.getItem(`agenda.${agendaData.meeting.number}.hideInfo`) === this.infoNoteHash)
-        this.colorAssignments = JSON.parse(window.localStorage.getItem(`agenda.${agendaData.meeting.number}.colorAssignments`) || '{}')
-        this.pickedEvents = JSON.parse(window.localStorage.getItem(`agenda.${agendaData.meeting.number}.pickedEvents`) || '[]')
+        if (storageAvailable('localStorage')) {
+          this.infoNoteShown = !(window.localStorage.getItem(`agenda.${agendaData.meeting.number}.hideInfo`) === this.infoNoteHash)
+          this.colorAssignments = JSON.parse(window.localStorage.getItem(`agenda.${agendaData.meeting.number}.colorAssignments`) || '{}')
+          this.selectedCatSubs = JSON.parse(window.localStorage.getItem(`agenda.${agendaData.meeting.number}.filters`) || '[]')
+          this.pickedEvents = JSON.parse(window.localStorage.getItem(`agenda.${agendaData.meeting.number}.pickedEvents`) || '[]')
+        } else {
+          this.infoNoteShown = true
+          this.colorAssignments = {}
+          this.selectedCatSubs = []
+          this.pickedEvents = []
+        }
 
         this.isLoaded = true
       } catch (err) {
         console.error(err)
         const siteStore = useSiteStore()
         siteStore.$patch({
-          criticalError: `Failed to load this meeting: ${err.message}`
+          criticalError: `Failed to load this meeting: ${err.message}`,
+          criticalErrorLink: meetingNumber ? `/meeting/${meetingNumber}/agenda.txt` : `/meeting/agenda.txt`,
+          criticalErrorLinkText: 'Switch to text-only agenda version'
         })
       }
 
       this.hideLoadingScreen()
     },
     persistMeetingPreferences () {
+      if (!storageAvailable('localStorage')) { return }
+      
       if (this.infoNoteShown) {
         window.localStorage.removeItem(`agenda.${this.meeting.number}.hideInfo`)
       } else {
         window.localStorage.setItem(`agenda.${this.meeting.number}.hideInfo`, this.infoNoteHash)
       }
       window.localStorage.setItem(`agenda.${this.meeting.number}.colorAssignments`, JSON.stringify(this.colorAssignments))
+      window.localStorage.setItem(`agenda.${this.meeting.number}.filters`, JSON.stringify(this.selectedCatSubs))
       window.localStorage.setItem(`agenda.${this.meeting.number}.pickedEvents`, JSON.stringify(this.pickedEvents))
       window.localStorage.setItem(`agenda.${this.meeting.number}.timezone`, this.timezone)
     },
@@ -212,6 +230,28 @@ export const useAgendaStore = defineStore('agenda', {
 
       return lastEvent.id || null
     },
+    findNowEventId () {
+      const currentEventId = this.findCurrentEventId()
+      
+      if (currentEventId) {
+        return currentEventId
+      }
+
+      // if there isn't a current event then instead find the next event
+
+      const current = (this.nowDebugDiff ? DateTime.local().minus(this.nowDebugDiff) : DateTime.local()).setZone(this.timezone)
+
+      // -> Find next event after current time
+      let nextEventId = undefined
+      for(const sh of this.scheduleAdjusted) {
+        if (sh.adjustedStart > current) {
+          nextEventId = sh.id
+          break
+        }
+      }
+
+      return nextEventId || null
+    },
     hideLoadingScreen () {
       // -> Hide loading screen
       const loadingRef = document.querySelector('#app-loading')
@@ -221,10 +261,10 @@ export const useAgendaStore = defineStore('agenda', {
     }
   },
   persist: {
-    enabled: true,
+    enabled: storageAvailable('localStorage'),
     strategies: [
       {
-        storage: localStorage,
+        storage: storageAvailable('localStorage') ? localStorage : null,
         paths: [
           'areaIndicatorsShown',
           'bolderText',
@@ -274,3 +314,8 @@ function findFirstConferenceUrl (txt) {
   } catch (err) { }
   return null
 }
+
+export const daySlugPrefix = 'agenda-day-'
+export function daySlug(s) {
+  return `${daySlugPrefix}${s.adjustedStartDate}` // eg 'agenda-day-2024-08-13'
+}
diff --git a/client/agenda/tour.js b/client/agenda/tour.js
new file mode 100644
index 0000000000..27b2a8b0dd
--- /dev/null
+++ b/client/agenda/tour.js
@@ -0,0 +1,113 @@
+import Shepherd from 'shepherd.js'
+import 'shepherd.js/dist/css/shepherd.css'
+
+export function initTour ({ mobileMode, pickerMode }) {
+  const tour = new Shepherd.Tour({
+    useModalOverlay: true,
+    defaultStepOptions: {
+      classes: 'shepherd-theme-custom',
+      scrollTo: false,
+      modalOverlayOpeningPadding: 8,
+      modalOverlayOpeningRadius: 4,
+      popperOptions: {
+        modifiers: [
+          {
+            name: 'offset', 
+            options: {
+              offset: [0,20]
+            }
+          }
+        ]
+      }
+    }
+  })
+  const defaultButtons = [
+    {
+      text: 'Exit',
+      action: tour.cancel,
+      secondary: true
+    },
+    {
+      text: 'Next',
+      action: tour.next
+    }
+  ]
+
+  // STEPS
+
+  tour.addSteps([
+    {
+      title: 'Filter Areas + Groups',
+      text: 'You can filter the list of sessions by areas or working groups you\'re interested in. The filters you select here also apply to the <strong>Calendar View</strong> and persist even if you come back to this page later.',
+      attachTo: {
+        element: mobileMode ? '.agenda-mobile-bar > button:first-child' : '#agenda-quickaccess-filterbyareagroups-btn',
+        on: mobileMode ? 'top' : 'left'
+      },
+      buttons: defaultButtons
+    },
+    {
+      title: 'Pick Sessions',
+      text: 'Alternatively select <strong>individual sessions</strong> from the list to build your own schedule.',
+      attachTo: {
+        element: pickerMode ? '.agenda-quickaccess-btnrow' : '#agenda-quickaccess-picksessions-btn',
+        on: 'left'
+      },
+      buttons: defaultButtons,
+      showOn: () => !mobileMode
+    },
+    {
+      title: 'Calendar View',
+      text: 'View the current list of sessions in a <strong>calendar view</strong>, by week or by day. The filters you selected above also apply in this view.',
+      attachTo: {
+        element: mobileMode ? '.agenda-mobile-bar > button:nth-child(2)' : '#agenda-quickaccess-calview-btn',
+        on: mobileMode ? 'top' : 'left'
+      },
+      buttons: defaultButtons
+    },
+    {
+      title: 'Add to your calendar',
+      text: 'Add the current list of sessions to your personal calendar application, in either <strong>webcal</strong> or <strong>ics</strong> format.',
+      attachTo: {
+        element: mobileMode ? '.agenda-mobile-bar > button:nth-child(3)' : '#agenda-quickaccess-addtocal-btn',
+        on: mobileMode ? 'top' : 'left'
+      },
+      buttons: defaultButtons
+    },
+    {
+      title: 'Search Events',
+      text: 'Filter the list of sessions by searching for <strong>specific keywords</strong> in the title, location, acronym, notes or group name. Click the button again to close the search and discard its filtering.',
+      attachTo: {
+        element: '.agenda-table-search',
+        on: 'top'
+      },
+      buttons: defaultButtons
+    },
+    {
+      title: 'Assign Colors to Events',
+      text: 'Assign colors to individual events to keep track of those you find interesting, wish to attend or define your own colors / descriptions from the <strong>Settings</strong> panel.',
+      attachTo: {
+        element: '.agenda-table-colorpicker',
+        on: 'top'
+      },
+      buttons: defaultButtons
+    },
+    {
+      title: 'Sessions',
+      text: 'View the session materials by either clicking on its title or using the <strong>Show meeting materials</strong> button on the right. You can locate the room holding this event on the floor plan by clicking on the location name.',
+      attachTo: {
+        element: () => document.querySelector('.agenda-table-display-event'),
+        on: 'top'
+      },
+      buttons: [
+        {
+          text: 'Finish',
+          action: tour.next
+        }
+      ],
+      modalOverlayOpeningPadding: 0,
+      modalOverlayOpeningRadius: 2
+    }
+  ])
+
+  return tour
+}
diff --git a/client/components/ChatLog.vue b/client/components/ChatLog.vue
index 779734f919..b3a4f7b40f 100644
--- a/client/components/ChatLog.vue
+++ b/client/components/ChatLog.vue
@@ -15,13 +15,15 @@
       )
       template(#default)
         div(v-html='item.text')
-  span.text-muted(v-else)
+  span.text-body-secondary(v-else)
     em No chat log available.
 </template>
   
 <script setup>
 import { onMounted, reactive } from 'vue'
 import { DateTime } from 'luxon'
+import { emojify } from '@twuni/emojify'
+import uniq from 'lodash-es/uniq'
 import {
   NTimeline,
   NTimelineItem
@@ -61,9 +63,12 @@ const colors = [
 
 onMounted(() => {
   const authorColors = {}
+
   // Get chat log data from embedded json tag
   const chatLog = JSON.parse(document.getElementById(`${props.componentId}-data`).textContent || '[]')
   if (chatLog.length > 0) {
+    const authorNames = uniq(chatLog.map(l => l.author))
+
     let idx = 1
     let colorIdx = 0
     for (const logItem of chatLog) {
@@ -75,12 +80,22 @@ onMounted(() => {
           colorIdx = 0
         }
       }
+
+      // -> Format text
+      let txt = emojify(logItem.text)
+      if (txt.indexOf('@') >= 0) {
+        for (const authorName of authorNames) {
+          txt = txt.replaceAll(`@${authorName}`, `<span class="user-mention">${authorName}</span>`)
+        }
+      }
+      txt = txt.replaceAll('href="/user_uploads/', 'href="https://zulip.ietf.org/user_uploads/')
+
       // -> Generate log item
       state.items.push({
         id: `logitem-${idx}`,
         color: authorColors[logItem.author],
         author: logItem.author,
-        text: logItem.text,
+        text: txt,
         time: DateTime.fromISO(logItem.time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ')
       })
       idx++
@@ -90,9 +105,72 @@ onMounted(() => {
 </script>
 
 <style lang="scss">
+@import '../shared/colors.scss';
+
 .chatlog {
-  .n-timeline-item-content__content > div > p {
-    margin-bottom: 0;
+  .n-timeline-item-content__content {
+    > div > p:last-child {
+      margin-bottom: 0;
+    }
+
+    blockquote {
+      background-color: $gray-100;
+      border-radius: 5px;
+      padding: 8px;
+      margin-top: -8px;
+
+      > p:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    .message_inline_image {
+      display: none;
+    }
+
+    // Manual user mention
+    .user-mention {
+      display: inline-block;
+      padding: 1px 5px;
+      background-color: rgba($purple, .05);
+      color: $purple;
+      font-weight: 500;
+      border-radius: 4px;
+
+      > .user-mention {
+        padding: 0;
+
+        &::before {
+          display: none;
+        }
+      }
+
+      &::before {
+        content: '@';
+      }
+    }
+
+    // User reply mention
+    .user-mention + a {
+      text-decoration: none;
+      color: $purple;
+      font-style: italic;
+      cursor: default;
+    }
+  }
+}
+
+[data-bs-theme="dark"] .chatlog {
+  .n-timeline-item-content__title {
+    color: #d63384 !important;
+  }
+  
+  .n-timeline-item-content__content {
+    color: #fff !important;
+  }
+
+  .n-timeline-item-content__meta {
+    color: #0569ffd9 !important;
   }
 }
 </style>
diff --git a/client/components/Polls.vue b/client/components/Polls.vue
index 72c8e1c633..0846d4ed16 100644
--- a/client/components/Polls.vue
+++ b/client/components/Polls.vue
@@ -3,19 +3,20 @@
   n-data-table(
     v-if='state.items.length > 0'
     :data='state.items'
-    :columns='columns'
+    :columns='state.columns'
     striped
     )
-  span.text-muted(v-else)
+  span.text-danger(v-else-if='state.errMessage')
+    em {{ state.errMessage }}
+  span.text-body-secondary(v-else)
     em No polls available.
 </template>
   
 <script setup>
 import { onMounted, reactive } from 'vue'
 import { DateTime } from 'luxon'
-import {
-  NDataTable
-} from 'naive-ui'
+import { cloneDeep, startCase } from 'lodash-es'
+import { NDataTable } from 'naive-ui'
 
 // PROPS
 
@@ -29,13 +30,15 @@ const props = defineProps({
 // STATE
 
 const state = reactive({
-  items: []
+  items: [],
+  colums: [],
+  errMessage: null
 })
 
-const columns = [
+const defaultColumns = [
   {
     title: 'Question',
-    key: 'question'
+    key: 'text'
   },
   {
     title: 'Start Time',
@@ -44,14 +47,6 @@ const columns = [
   {
     title: 'End Time',
     key: 'end_time'
-  },
-  {
-    title: 'Raise Hand',
-    key: 'raise_hand'
-  },
-  {
-    title: 'Do Not Raise Hand',
-    key: 'do_not_raise_hand'
   }
 ]
 
@@ -59,21 +54,57 @@ const columns = [
 
 onMounted(() => {
   // Get polls from embedded json tag
-  const polls = JSON.parse(document.getElementById(`${props.componentId}-data`).textContent || '[]')
-  if (polls.length > 0) {
-    let idx = 1
-    for (const poll of polls) {
-      state.items.push({
-        id: `poll-${idx}`,
-        question: poll.text,
-        start_time: DateTime.fromISO(poll.start_time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ'),
-        end_time: DateTime.fromISO(poll.end_time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ'),
-        raise_hand: poll.raise_hand,
-        do_not_raise_hand: poll.do_not_raise_hand
-      })
-      idx++
+  try {
+    const polls = JSON.parse(document.getElementById(`${props.componentId}-data`).textContent || '[]')
+    if (polls.length > 0) {
+      // Populate columns
+      state.columns = cloneDeep(defaultColumns)
+      for (const col in polls[0]) {
+        if (!['text', 'start_time', 'end_time'].includes(col)) {
+          state.columns.push({
+            title: startCase(col),
+            key: col,
+            minWidth: 100,
+            titleAlign: 'center',
+            align: 'center'
+          })
+        }
+      }
+
+      // Populate rows
+      let idx = 1
+      for (const poll of polls) {
+        state.items.push({
+          ...poll,
+          id: `poll-${idx}`,
+          start_time: DateTime.fromISO(poll.start_time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ'),
+          end_time: DateTime.fromISO(poll.end_time).toFormat('dd LLLL yyyy \'at\' HH:mm:ss a ZZZZ')
+        })
+        idx++
+      }
     }
+  } catch (err) {
+    console.warn(err)
+    state.errMessage = 'Failed to load poll results.'
   }
 })
 </script>
 
+<style lang="scss">
+@import '../shared/colors.scss';
+
+[data-bs-theme="dark"] .polls {
+    tr,
+    th, 
+    td {
+        background-color: $gray-900 !important;
+        color: $gray-300 !important;
+        border-color: $gray-500 !important;
+        border-width: 0.05 !important;
+    }
+
+    td:hover {
+      background-color: $cyan-600 !important;
+    }
+}
+</style>
diff --git a/client/components/Status.vue b/client/components/Status.vue
new file mode 100644
index 0000000000..4fded5bbe4
--- /dev/null
+++ b/client/components/Status.vue
@@ -0,0 +1,80 @@
+<script setup>
+  import { h, onMounted } from 'vue'
+  import { useNotification } from 'naive-ui'
+  import { localStorageWrapper } from '../shared/local-storage-wrapper'
+  import { JSONWrapper } from '../shared/json-wrapper'
+  import { STATUS_STORAGE_KEY, generateStatusTestId } from '../shared/status-common'
+
+  const getDismissedStatuses = () => {
+    const jsonString = localStorageWrapper.getItem(STATUS_STORAGE_KEY)
+    const jsonValue = JSONWrapper.parse(jsonString, [])
+    if(Array.isArray(jsonValue)) {
+      return jsonValue
+    }
+    return []
+  }
+
+  const dismissStatus = (id) => {
+    const dissmissed = [id, ...getDismissedStatuses()]
+    localStorageWrapper.setItem(STATUS_STORAGE_KEY, JSONWrapper.stringify(dissmissed))
+    return true
+  }
+
+  let notificationInstances = {} // keyed by status.id
+  let notification
+
+  const pollStatusAPI = () => {
+    fetch('/status/latest.json')
+        .then(resp => resp.json())
+        .then(status => {
+            if(status === null || status.hasMessage === false) {
+                console.debug("No status message")
+                return
+            }
+            const dismissedStatuses = getDismissedStatuses()
+            if(dismissedStatuses.includes(status.id)) {
+              console.debug(`Not showing site status ${status.id} because it was already dismissed. Dismissed Ids:`, dismissedStatuses)
+              return
+            }
+
+            const isSameStatusPage = Boolean(document.querySelector(`[data-status-id="${status.id}"]`))
+
+            if(isSameStatusPage) {
+              console.debug(`Not showing site status ${status.id} because we're on the target page`)
+              return
+            }
+
+            if(notificationInstances[status.id]) {
+              console.debug(`Not showing site status ${status.id} because it's already been displayed`)
+              return
+            }
+
+            notificationInstances[status.id] = notification.create({
+              title: status.title,
+              content: status.body,
+              meta: `${status.date}`,
+              action: () =>
+                h(
+                  'a',
+                  {
+                    'data-testid': generateStatusTestId(status.id),
+                    href: status.url,
+                    'aria-label': `Read more about ${status.title}`
+                  },
+                  "Read more"
+                ),
+              onClose: () => {
+                return dismissStatus(status.id)
+              }
+            })
+        })
+        .catch(e => {
+            console.error(e)
+        })
+  }
+  
+  onMounted(() => {
+      notification = useNotification()
+      pollStatusAPI(notification)
+  })
+</script>
diff --git a/client/components/n-theme.vue b/client/components/n-theme.vue
index 9fff81671e..b55c9772b9 100644
--- a/client/components/n-theme.vue
+++ b/client/components/n-theme.vue
@@ -1,24 +1,45 @@
 <template lang='pug'>
-n-config-provider(:theme-overrides='themeOverrides')
+n-config-provider(
+  :theme='currentTheme'
+  :theme-overrides='state.themeOverrides'
+  )
   slot
 </template>
 
-<script>
-import { NConfigProvider } from 'naive-ui'
-
-export default {
-  components: {
-    NConfigProvider
-  },
-  data () {
-    return {
-      themeOverrides: {
-        common: {
-          primaryColor: '#0d6efd',
-          primaryColorHover: '#0d6efd'
-        }
-      }
+<script setup>
+import { computed, reactive, watch } from 'vue'
+import { darkTheme, NConfigProvider } from 'naive-ui'
+
+import { useSiteStore } from '../shared/store'
+
+// STORES
+
+const siteStore = useSiteStore()
+
+// DATA
+
+const state = reactive({
+  themeOverrides: {
+    common: {
+      primaryColor: '#0d6efd',
+      primaryColorHover: '#0d6efd'
     }
   }
-}
+})
+
+// COMPUTED
+
+const currentTheme = computed(() => {
+  return siteStore.theme === 'dark' ? darkTheme : null
+})
+
+// APPLY BODY THEME CLASS
+
+watch(() => siteStore.theme, (newValue) => {
+  if (newValue === 'dark') {
+    document.body.classList.add('theme-dark')
+  } else {
+    document.body.classList.remove('theme-dark')
+  }
+}, { immediate: true })
 </script>
diff --git a/client/embedded.js b/client/embedded.js
index f3b01f68f5..0509c0aecf 100644
--- a/client/embedded.js
+++ b/client/embedded.js
@@ -1,5 +1,12 @@
 import { createApp } from 'vue'
+import piniaPersist from 'pinia-plugin-persist'
 import Embedded from './Embedded.vue'
+import { createPiniaSingleton } from './shared/create-pinia-singleton'
+
+// Initialize store (Pinia)
+
+const pinia = createPiniaSingleton()
+pinia.use(piniaPersist)
 
 // Mount App
 
@@ -9,5 +16,6 @@ for (const mnt of mountEls) {
     componentName: mnt.dataset.component,
     componentId: mnt.dataset.componentId
   })
+  app.use(pinia)
   app.mount(mnt)
 }
diff --git a/client/index.html b/client/index.html
index e6c1648def..75d6f77727 100644
--- a/client/index.html
+++ b/client/index.html
@@ -8,8 +8,11 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.3/font/bootstrap-icons.css">
+    <link href="https://static.ietf.org/fonts/inter/import.css" rel="stylesheet">
+    <link href="https://static.ietf.org/fonts/noto-sans-mono/import.css" rel="stylesheet">
   </head>
   <body>
+    <div class="vue-embed" data-component="Status"></div>
     <div class="pt-3 container-fluid">
       <div class="row">
         <div class="col mx-lg-3" id="content">
@@ -18,5 +21,6 @@
       </div>
     </div>
     <script type="module" src="./main.js"></script>
+    <script type="module" src="./embedded.js"></script>
   </body>
 </html>
diff --git a/client/main.js b/client/main.js
index 0dc5cf32e0..3fbad907b1 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,14 +1,14 @@
 import { createApp } from 'vue'
-import { createPinia } from 'pinia'
 import piniaPersist from 'pinia-plugin-persist'
 import App from './App.vue'
 import router from './router'
+import { createPiniaSingleton } from './shared/create-pinia-singleton'
 
 const app = createApp(App, {})
 
 // Initialize store (Pinia)
 
-const pinia = createPinia()
+const pinia = createPiniaSingleton()
 pinia.use(piniaPersist)
 app.use(pinia)
 
diff --git a/client/router.js b/client/router.js
index 0599f02f3d..d5c07101c8 100644
--- a/client/router.js
+++ b/client/router.js
@@ -23,6 +23,18 @@ export default createRouter({
       }
     },
     // -> Redirects
+    {
+      path: '/meeting/:meetingNumber(\\d+)?/agenda.html',
+      redirect: to => {
+        return { name: 'agenda' }
+      }
+    },
+    {
+      path: '/meeting/:meetingNumber(\\d+)?/agenda-utc',
+      redirect: to => {
+        return { name: 'agenda', query: { ...to.query, tz: 'UTC' } }
+      }
+    },
     {
       path: '/meeting/:meetingNumber(\\d+)?/agenda/personalize',
       redirect: to => {
diff --git a/client/shared/colors.scss b/client/shared/colors.scss
new file mode 100644
index 0000000000..e34c459e91
--- /dev/null
+++ b/client/shared/colors.scss
@@ -0,0 +1,139 @@
+// Bootstrap 5 Color Variables
+// Extracted from https://github.com/twbs/bootstrap/blob/main/scss/_variables.scss
+// Copyright (c) 2011-2022 Twitter, Inc.
+// Copyright (c) 2011-2022 The Bootstrap Authors
+
+// Tint a color: mix a color with white
+@function tint-color($color, $weight) {
+  @return mix(white, $color, $weight);
+}
+
+// Shade a color: mix a color with black
+@function shade-color($color, $weight) {
+  @return mix(black, $color, $weight);
+}
+
+// Color system
+
+$white:    #fff !default;
+$gray-100: #f8f9fa !default;
+$gray-200: #e9ecef !default;
+$gray-300: #dee2e6 !default;
+$gray-400: #ced4da !default;
+$gray-500: #adb5bd !default;
+$gray-600: #6c757d !default;
+$gray-700: #495057 !default;
+$gray-800: #343a40 !default;
+$gray-900: #212529 !default;
+$black:    #000 !default;
+
+$blue:    #0d6efd !default;
+$indigo:  #6610f2 !default;
+$purple:  #6f42c1 !default;
+$pink:    #d63384 !default;
+$red:     #dc3545 !default;
+$orange:  #fd7e14 !default;
+$yellow:  #ffc107 !default;
+$green:   #198754 !default;
+$teal:    #20c997 !default;
+$cyan:    #0dcaf0 !default;
+
+$blue-100: tint-color($blue, 80%) !default;
+$blue-200: tint-color($blue, 60%) !default;
+$blue-300: tint-color($blue, 40%) !default;
+$blue-400: tint-color($blue, 20%) !default;
+$blue-500: $blue !default;
+$blue-600: shade-color($blue, 20%) !default;
+$blue-700: shade-color($blue, 40%) !default;
+$blue-800: shade-color($blue, 60%) !default;
+$blue-900: shade-color($blue, 80%) !default;
+
+$indigo-100: tint-color($indigo, 80%) !default;
+$indigo-200: tint-color($indigo, 60%) !default;
+$indigo-300: tint-color($indigo, 40%) !default;
+$indigo-400: tint-color($indigo, 20%) !default;
+$indigo-500: $indigo !default;
+$indigo-600: shade-color($indigo, 20%) !default;
+$indigo-700: shade-color($indigo, 40%) !default;
+$indigo-800: shade-color($indigo, 60%) !default;
+$indigo-900: shade-color($indigo, 80%) !default;
+
+$purple-100: tint-color($purple, 80%) !default;
+$purple-200: tint-color($purple, 60%) !default;
+$purple-300: tint-color($purple, 40%) !default;
+$purple-400: tint-color($purple, 20%) !default;
+$purple-500: $purple !default;
+$purple-600: shade-color($purple, 20%) !default;
+$purple-700: shade-color($purple, 40%) !default;
+$purple-800: shade-color($purple, 60%) !default;
+$purple-900: shade-color($purple, 80%) !default;
+
+$pink-100: tint-color($pink, 80%) !default;
+$pink-200: tint-color($pink, 60%) !default;
+$pink-300: tint-color($pink, 40%) !default;
+$pink-400: tint-color($pink, 20%) !default;
+$pink-500: $pink !default;
+$pink-600: shade-color($pink, 20%) !default;
+$pink-700: shade-color($pink, 40%) !default;
+$pink-800: shade-color($pink, 60%) !default;
+$pink-900: shade-color($pink, 80%) !default;
+
+$red-100: tint-color($red, 80%) !default;
+$red-200: tint-color($red, 60%) !default;
+$red-300: tint-color($red, 40%) !default;
+$red-400: tint-color($red, 20%) !default;
+$red-500: $red !default;
+$red-600: shade-color($red, 20%) !default;
+$red-700: shade-color($red, 40%) !default;
+$red-800: shade-color($red, 60%) !default;
+$red-900: shade-color($red, 80%) !default;
+
+$orange-100: tint-color($orange, 80%) !default;
+$orange-200: tint-color($orange, 60%) !default;
+$orange-300: tint-color($orange, 40%) !default;
+$orange-400: tint-color($orange, 20%) !default;
+$orange-500: $orange !default;
+$orange-600: shade-color($orange, 20%) !default;
+$orange-700: shade-color($orange, 40%) !default;
+$orange-800: shade-color($orange, 60%) !default;
+$orange-900: shade-color($orange, 80%) !default;
+
+$yellow-100: tint-color($yellow, 80%) !default;
+$yellow-200: tint-color($yellow, 60%) !default;
+$yellow-300: tint-color($yellow, 40%) !default;
+$yellow-400: tint-color($yellow, 20%) !default;
+$yellow-500: $yellow !default;
+$yellow-600: shade-color($yellow, 20%) !default;
+$yellow-700: shade-color($yellow, 40%) !default;
+$yellow-800: shade-color($yellow, 60%) !default;
+$yellow-900: shade-color($yellow, 80%) !default;
+
+$green-100: tint-color($green, 80%) !default;
+$green-200: tint-color($green, 60%) !default;
+$green-300: tint-color($green, 40%) !default;
+$green-400: tint-color($green, 20%) !default;
+$green-500: $green !default;
+$green-600: shade-color($green, 20%) !default;
+$green-700: shade-color($green, 40%) !default;
+$green-800: shade-color($green, 60%) !default;
+$green-900: shade-color($green, 80%) !default;
+
+$teal-100: tint-color($teal, 80%) !default;
+$teal-200: tint-color($teal, 60%) !default;
+$teal-300: tint-color($teal, 40%) !default;
+$teal-400: tint-color($teal, 20%) !default;
+$teal-500: $teal !default;
+$teal-600: shade-color($teal, 20%) !default;
+$teal-700: shade-color($teal, 40%) !default;
+$teal-800: shade-color($teal, 60%) !default;
+$teal-900: shade-color($teal, 80%) !default;
+
+$cyan-100: tint-color($cyan, 80%) !default;
+$cyan-200: tint-color($cyan, 60%) !default;
+$cyan-300: tint-color($cyan, 40%) !default;
+$cyan-400: tint-color($cyan, 20%) !default;
+$cyan-500: $cyan !default;
+$cyan-600: shade-color($cyan, 20%) !default;
+$cyan-700: shade-color($cyan, 40%) !default;
+$cyan-800: shade-color($cyan, 60%) !default;
+$cyan-900: shade-color($cyan, 80%) !default;
diff --git a/client/shared/create-pinia-singleton.js b/client/shared/create-pinia-singleton.js
new file mode 100644
index 0000000000..f0013245a1
--- /dev/null
+++ b/client/shared/create-pinia-singleton.js
@@ -0,0 +1,6 @@
+import { createPinia } from 'pinia'
+
+export function createPiniaSingleton(){
+  window.pinia = window.pinia ?? createPinia()
+  return window.pinia
+}
diff --git a/client/shared/feature-detect.js b/client/shared/feature-detect.js
new file mode 100644
index 0000000000..4b8232643e
--- /dev/null
+++ b/client/shared/feature-detect.js
@@ -0,0 +1,19 @@
+const cache = {}
+
+export function storageAvailable(type) {
+  if (Object.prototype.hasOwnProperty.call(cache, type)) {
+    return cache[type]
+  }
+  try {
+    let storage = window[type]
+    const x = '__storage_test__'
+    storage.setItem(x, x)
+    storage.removeItem(x)
+    cache[type] = true
+    return true
+  }
+  catch (e) {
+    cache[type] = false
+    return false
+  }
+}
diff --git a/client/shared/json-wrapper.js b/client/shared/json-wrapper.js
new file mode 100644
index 0000000000..e080b5a479
--- /dev/null
+++ b/client/shared/json-wrapper.js
@@ -0,0 +1,20 @@
+export const JSONWrapper = {
+  parse(jsonString, defaultValue) {
+    if(typeof jsonString !== "string") {
+      return defaultValue
+    }
+    try {
+      return JSON.parse(jsonString);
+    } catch (e) {
+      console.error(e);
+    }
+    return defaultValue
+  },
+  stringify(data) {
+    try {
+      return JSON.stringify(data);
+    } catch (e) {
+      console.error(e)
+    }
+  },
+}
diff --git a/client/shared/local-storage-wrapper.js b/client/shared/local-storage-wrapper.js
new file mode 100644
index 0000000000..88cd3dc589
--- /dev/null
+++ b/client/shared/local-storage-wrapper.js
@@ -0,0 +1,42 @@
+
+/*
+ *  DEVELOPER NOTE
+ *
+ *  Some browsers can block storage (localStorage, sessionStorage)
+ *  access for privacy reasons, and all browsers can have storage
+ *  that's full, and then they throw exceptions.
+ *
+ *  See https://michalzalecki.com/why-using-localStorage-directly-is-a-bad-idea/
+ *
+ *  Exceptions can even be thrown when testing if localStorage
+ *  even exists. This can throw:
+ * 
+ *      if (window.localStorage)
+ *
+ *  Also localStorage/sessionStorage can be enabled after DOMContentLoaded
+ *  so we handle it gracefully.
+ *
+ *  1) we need to wrap all usage in try/catch
+ *  2) we need to defer actual usage of these until
+ *     necessary,
+ *    
+ */
+
+export const localStorageWrapper = {
+  getItem: (key) => {
+    try {
+      return localStorage.getItem(key)
+    } catch (e) {
+      console.error(e); 
+    }
+    return null;
+  },
+  setItem: (key, value) => {
+    try {
+      return localStorage.setItem(key, value)
+    } catch (e) {
+      console.error(e); 
+    }
+    return;
+  },
+}
diff --git a/client/shared/status-common.js b/client/shared/status-common.js
new file mode 100644
index 0000000000..6503bfbf63
--- /dev/null
+++ b/client/shared/status-common.js
@@ -0,0 +1,5 @@
+// Used in Playwright Status and components
+
+export const STATUS_STORAGE_KEY = "status-dismissed"
+
+export const generateStatusTestId = (id) => `status-${id}`
diff --git a/client/shared/store.js b/client/shared/store.js
index 835a465753..5dd57f2c81 100644
--- a/client/shared/store.js
+++ b/client/shared/store.js
@@ -3,7 +3,10 @@ import { defineStore } from 'pinia'
 export const useSiteStore = defineStore('site', {
   state: () => ({
     criticalError: null,
+    criticalErrorLink: null,
+    criticalErrorLinkText: null,
     isMobile: /Mobi/i.test(navigator.userAgent),
-    viewport: Math.round(window.innerWidth)
+    viewport: Math.round(window.innerWidth),
+    theme: null
   })
 })
diff --git a/client/shared/timezones.js b/client/shared/timezones.js
index c3bc473000..8239c1f98e 100644
--- a/client/shared/timezones.js
+++ b/client/shared/timezones.js
@@ -1,252 +1,252 @@
 export default [
-  { label: '(GMT-11:00) Niue', value: 'Pacific/Niue' },
-  { label: '(GMT-11:00) Pago Pago', value: 'Pacific/Pago_Pago' },
-  { label: '(GMT-10:00) Hawaii Time', value: 'Pacific/Honolulu' },
-  { label: '(GMT-10:00) Rarotonga', value: 'Pacific/Rarotonga' },
-  { label: '(GMT-10:00) Tahiti', value: 'Pacific/Tahiti' },
-  { label: '(GMT-09:30) Marquesas', value: 'Pacific/Marquesas' },
-  { label: '(GMT-09:00) Alaska Time', value: 'America/Anchorage' },
-  { label: '(GMT-09:00) Gambier', value: 'Pacific/Gambier' },
-  { label: '(GMT-08:00) Pacific Time - Los Angeles', value: 'America/Los_Angeles' },
-  { label: '(GMT-08:00) Pacific Time - Tijuana', value: 'America/Tijuana' },
-  { label: '(GMT-08:00) Pacific Time - Vancouver', value: 'America/Vancouver' },
-  { label: '(GMT-08:00) Pacific Time - Whitehorse', value: 'America/Whitehorse' },
-  { label: '(GMT-08:00) Pitcairn', value: 'Pacific/Pitcairn' },
-  { label: '(GMT-07:00) Mountain Time - Arizona', value: 'America/Phoenix' },
-  { label: '(GMT-07:00) Mountain Time - Chihuahua, Mazatlan', value: 'America/Mazatlan' },
-  { label: '(GMT-07:00) Mountain Time - Dawson Creek', value: 'America/Dawson_Creek' },
-  { label: '(GMT-07:00) Mountain Time - Denver', value: 'America/Denver' },
-  { label: '(GMT-07:00) Mountain Time - Edmonton', value: 'America/Edmonton' },
-  { label: '(GMT-07:00) Mountain Time - Hermosillo', value: 'America/Hermosillo' },
-  { label: '(GMT-07:00) Mountain Time - Yellowknife', value: 'America/Yellowknife' },
-  { label: '(GMT-06:00) Belize', value: 'America/Belize' },
-  { label: '(GMT-06:00) Central Time - Chicago', value: 'America/Chicago' },
-  { label: '(GMT-06:00) Central Time - Mexico City', value: 'America/Mexico_City' },
-  { label: '(GMT-06:00) Central Time - Regina', value: 'America/Regina' },
-  { label: '(GMT-06:00) Central Time - Tegucigalpa', value: 'America/Tegucigalpa' },
-  { label: '(GMT-06:00) Central Time - Winnipeg', value: 'America/Winnipeg' },
-  { label: '(GMT-06:00) Costa Rica', value: 'America/Costa_Rica' },
-  { label: '(GMT-06:00) El Salvador', value: 'America/El_Salvador' },
-  { label: '(GMT-06:00) Galapagos', value: 'Pacific/Galapagos' },
-  { label: '(GMT-06:00) Guatemala', value: 'America/Guatemala' },
-  { label: '(GMT-06:00) Managua', value: 'America/Managua' },
-  { label: '(GMT-05:00) America Cancun', value: 'America/Cancun' },
-  { label: '(GMT-05:00) Bogota', value: 'America/Bogota' },
-  { label: '(GMT-05:00) Easter Island', value: 'Pacific/Easter' },
-  { label: '(GMT-05:00) Eastern Time - New York', value: 'America/New_York' },
-  { label: '(GMT-05:00) Eastern Time - Iqaluit', value: 'America/Iqaluit' },
-  { label: '(GMT-05:00) Eastern Time - Toronto', value: 'America/Toronto' },
-  { label: '(GMT-05:00) Guayaquil', value: 'America/Guayaquil' },
-  { label: '(GMT-05:00) Havana', value: 'America/Havana' },
-  { label: '(GMT-05:00) Jamaica', value: 'America/Jamaica' },
-  { label: '(GMT-05:00) Lima', value: 'America/Lima' },
-  { label: '(GMT-05:00) Nassau', value: 'America/Nassau' },
-  { label: '(GMT-05:00) Panama', value: 'America/Panama' },
-  { label: '(GMT-05:00) Port-au-Prince', value: 'America/Port-au-Prince' },
-  { label: '(GMT-05:00) Rio Branco', value: 'America/Rio_Branco' },
-  { label: '(GMT-04:00) Atlantic Time - Halifax', value: 'America/Halifax' },
-  { label: '(GMT-04:00) Barbados', value: 'America/Barbados' },
-  { label: '(GMT-04:00) Bermuda', value: 'Atlantic/Bermuda' },
-  { label: '(GMT-04:00) Boa Vista', value: 'America/Boa_Vista' },
-  { label: '(GMT-04:00) Caracas', value: 'America/Caracas' },
-  { label: '(GMT-04:00) Curacao', value: 'America/Curacao' },
-  { label: '(GMT-04:00) Grand Turk', value: 'America/Grand_Turk' },
-  { label: '(GMT-04:00) Guyana', value: 'America/Guyana' },
-  { label: '(GMT-04:00) La Paz', value: 'America/La_Paz' },
-  { label: '(GMT-04:00) Manaus', value: 'America/Manaus' },
-  { label: '(GMT-04:00) Martinique', value: 'America/Martinique' },
-  { label: '(GMT-04:00) Port of Spain', value: 'America/Port_of_Spain' },
-  { label: '(GMT-04:00) Porto Velho', value: 'America/Porto_Velho' },
-  { label: '(GMT-04:00) Puerto Rico', value: 'America/Puerto_Rico' },
-  { label: '(GMT-04:00) Santo Domingo', value: 'America/Santo_Domingo' },
-  { label: '(GMT-04:00) Thule', value: 'America/Thule' },
-  { label: '(GMT-03:30) Newfoundland Time - St. Johns', value: 'America/St_Johns' },
-  { label: '(GMT-03:00) Araguaina', value: 'America/Araguaina' },
-  { label: '(GMT-03:00) Asuncion', value: 'America/Asuncion' },
-  { label: '(GMT-03:00) Belem', value: 'America/Belem' },
-  { label: '(GMT-03:00) Buenos Aires', value: 'America/Argentina/Buenos_Aires' },
-  { label: '(GMT-03:00) Campo Grande', value: 'America/Campo_Grande' },
-  { label: '(GMT-03:00) Cayenne', value: 'America/Cayenne' },
-  { label: '(GMT-03:00) Cuiaba', value: 'America/Cuiaba' },
-  { label: '(GMT-03:00) Fortaleza', value: 'America/Fortaleza' },
-  { label: '(GMT-03:00) Godthab', value: 'America/Godthab' },
-  { label: '(GMT-03:00) Maceio', value: 'America/Maceio' },
-  { label: '(GMT-03:00) Miquelon', value: 'America/Miquelon' },
-  { label: '(GMT-03:00) Montevideo', value: 'America/Montevideo' },
-  { label: '(GMT-03:00) Palmer', value: 'Antarctica/Palmer' },
-  { label: '(GMT-03:00) Paramaribo', value: 'America/Paramaribo' },
-  { label: '(GMT-03:00) Punta Arenas', value: 'America/Punta_Arenas' },
-  { label: '(GMT-03:00) Recife', value: 'America/Recife' },
-  { label: '(GMT-03:00) Rothera', value: 'Antarctica/Rothera' },
-  { label: '(GMT-03:00) Salvador', value: 'America/Bahia' },
-  { label: '(GMT-03:00) Santiago', value: 'America/Santiago' },
-  { label: '(GMT-03:00) Stanley', value: 'Atlantic/Stanley' },
-  { label: '(GMT-02:00) Noronha', value: 'America/Noronha' },
-  { label: '(GMT-02:00) Sao Paulo', value: 'America/Sao_Paulo' },
-  { label: '(GMT-02:00) South Georgia', value: 'Atlantic/South_Georgia' },
-  { label: '(GMT-01:00) Azores', value: 'Atlantic/Azores' },
-  { label: '(GMT-01:00) Cape Verde', value: 'Atlantic/Cape_Verde' },
-  { label: '(GMT-01:00) Scoresbysund', value: 'America/Scoresbysund' },
-  { label: '(GMT+00:00) Abidjan', value: 'Africa/Abidjan' },
-  { label: '(GMT+00:00) Accra', value: 'Africa/Accra' },
-  { label: '(GMT+00:00) Bissau', value: 'Africa/Bissau' },
-  { label: '(GMT+00:00) Canary Islands', value: 'Atlantic/Canary' },
-  { label: '(GMT+00:00) Casablanca', value: 'Africa/Casablanca' },
-  { label: '(GMT+00:00) Danmarkshavn', value: 'America/Danmarkshavn' },
-  { label: '(GMT+00:00) Dublin', value: 'Europe/Dublin' },
-  { label: '(GMT+00:00) El Aaiun', value: 'Africa/El_Aaiun' },
-  { label: '(GMT+00:00) Faeroe', value: 'Atlantic/Faroe' },
-  { label: '(GMT+00:00) UTC / GMT', value: 'UTC' },
-  { label: '(GMT+00:00) Lisbon', value: 'Europe/Lisbon' },
-  { label: '(GMT+00:00) London', value: 'Europe/London' },
-  { label: '(GMT+00:00) Monrovia', value: 'Africa/Monrovia' },
-  { label: '(GMT+00:00) Reykjavik', value: 'Atlantic/Reykjavik' },
-  { label: '(GMT+01:00) Algiers', value: 'Africa/Algiers' },
-  { label: '(GMT+01:00) Amsterdam', value: 'Europe/Amsterdam' },
-  { label: '(GMT+01:00) Andorra', value: 'Europe/Andorra' },
-  { label: '(GMT+01:00) Berlin', value: 'Europe/Berlin' },
-  { label: '(GMT+01:00) Brussels', value: 'Europe/Brussels' },
-  { label: '(GMT+01:00) Budapest', value: 'Europe/Budapest' },
-  { label: '(GMT+01:00) Central European Time - Belgrade', value: 'Europe/Belgrade' },
-  { label: '(GMT+01:00) Central European Time - Prague', value: 'Europe/Prague' },
-  { label: '(GMT+01:00) Ceuta', value: 'Africa/Ceuta' },
-  { label: '(GMT+01:00) Copenhagen', value: 'Europe/Copenhagen' },
-  { label: '(GMT+01:00) Gibraltar', value: 'Europe/Gibraltar' },
-  { label: '(GMT+01:00) Lagos', value: 'Africa/Lagos' },
-  { label: '(GMT+01:00) Luxembourg', value: 'Europe/Luxembourg' },
-  { label: '(GMT+01:00) Madrid', value: 'Europe/Madrid' },
-  { label: '(GMT+01:00) Malta', value: 'Europe/Malta' },
-  { label: '(GMT+01:00) Monaco', value: 'Europe/Monaco' },
-  { label: '(GMT+01:00) Ndjamena', value: 'Africa/Ndjamena' },
-  { label: '(GMT+01:00) Oslo', value: 'Europe/Oslo' },
-  { label: '(GMT+01:00) Paris', value: 'Europe/Paris' },
-  { label: '(GMT+01:00) Rome', value: 'Europe/Rome' },
-  { label: '(GMT+01:00) Stockholm', value: 'Europe/Stockholm' },
-  { label: '(GMT+01:00) Tirane', value: 'Europe/Tirane' },
-  { label: '(GMT+01:00) Tunis', value: 'Africa/Tunis' },
-  { label: '(GMT+01:00) Vienna', value: 'Europe/Vienna' },
-  { label: '(GMT+01:00) Warsaw', value: 'Europe/Warsaw' },
-  { label: '(GMT+01:00) Zurich', value: 'Europe/Zurich' },
-  { label: '(GMT+02:00) Amman', value: 'Asia/Amman' },
-  { label: '(GMT+02:00) Athens', value: 'Europe/Athens' },
-  { label: '(GMT+02:00) Beirut', value: 'Asia/Beirut' },
-  { label: '(GMT+02:00) Bucharest', value: 'Europe/Bucharest' },
-  { label: '(GMT+02:00) Cairo', value: 'Africa/Cairo' },
-  { label: '(GMT+02:00) Chisinau', value: 'Europe/Chisinau' },
-  { label: '(GMT+02:00) Damascus', value: 'Asia/Damascus' },
-  { label: '(GMT+02:00) Gaza', value: 'Asia/Gaza' },
-  { label: '(GMT+02:00) Helsinki', value: 'Europe/Helsinki' },
-  { label: '(GMT+02:00) Jerusalem', value: 'Asia/Jerusalem' },
-  { label: '(GMT+02:00) Johannesburg', value: 'Africa/Johannesburg' },
-  { label: '(GMT+02:00) Khartoum', value: 'Africa/Khartoum' },
-  { label: '(GMT+02:00) Kiev', value: 'Europe/Kiev' },
-  { label: '(GMT+02:00) Maputo', value: 'Africa/Maputo' },
-  { label: '(GMT+02:00) Moscow-01 - Kaliningrad', value: 'Europe/Kaliningrad' },
-  { label: '(GMT+02:00) Nicosia', value: 'Asia/Nicosia' },
-  { label: '(GMT+02:00) Riga', value: 'Europe/Riga' },
-  { label: '(GMT+02:00) Sofia', value: 'Europe/Sofia' },
-  { label: '(GMT+02:00) Tallinn', value: 'Europe/Tallinn' },
-  { label: '(GMT+02:00) Tripoli', value: 'Africa/Tripoli' },
-  { label: '(GMT+02:00) Vilnius', value: 'Europe/Vilnius' },
-  { label: '(GMT+02:00) Windhoek', value: 'Africa/Windhoek' },
-  { label: '(GMT+03:00) Baghdad', value: 'Asia/Baghdad' },
-  { label: '(GMT+03:00) Istanbul', value: 'Europe/Istanbul' },
-  { label: '(GMT+03:00) Minsk', value: 'Europe/Minsk' },
-  { label: '(GMT+03:00) Moscow+00 - Moscow', value: 'Europe/Moscow' },
-  { label: '(GMT+03:00) Nairobi', value: 'Africa/Nairobi' },
-  { label: '(GMT+03:00) Qatar', value: 'Asia/Qatar' },
-  { label: '(GMT+03:00) Riyadh', value: 'Asia/Riyadh' },
-  { label: '(GMT+03:00) Syowa', value: 'Antarctica/Syowa' },
-  { label: '(GMT+03:30) Tehran', value: 'Asia/Tehran' },
-  { label: '(GMT+04:00) Baku', value: 'Asia/Baku' },
-  { label: '(GMT+04:00) Dubai', value: 'Asia/Dubai' },
-  { label: '(GMT+04:00) Mahe', value: 'Indian/Mahe' },
-  { label: '(GMT+04:00) Mauritius', value: 'Indian/Mauritius' },
-  { label: '(GMT+04:00) Moscow+01 - Samara', value: 'Europe/Samara' },
-  { label: '(GMT+04:00) Reunion', value: 'Indian/Reunion' },
-  { label: '(GMT+04:00) Tbilisi', value: 'Asia/Tbilisi' },
-  { label: '(GMT+04:00) Yerevan', value: 'Asia/Yerevan' },
-  { label: '(GMT+04:30) Kabul', value: 'Asia/Kabul' },
-  { label: '(GMT+05:00) Aqtau', value: 'Asia/Aqtau' },
-  { label: '(GMT+05:00) Aqtobe', value: 'Asia/Aqtobe' },
-  { label: '(GMT+05:00) Ashgabat', value: 'Asia/Ashgabat' },
-  { label: '(GMT+05:00) Dushanbe', value: 'Asia/Dushanbe' },
-  { label: '(GMT+05:00) Karachi', value: 'Asia/Karachi' },
-  { label: '(GMT+05:00) Kerguelen', value: 'Indian/Kerguelen' },
-  { label: '(GMT+05:00) Maldives', value: 'Indian/Maldives' },
-  { label: '(GMT+05:00) Mawson', value: 'Antarctica/Mawson' },
-  { label: '(GMT+05:00) Moscow+02 - Yekaterinburg', value: 'Asia/Yekaterinburg' },
-  { label: '(GMT+05:00) Tashkent', value: 'Asia/Tashkent' },
-  { label: '(GMT+05:30) Colombo', value: 'Asia/Colombo' },
-  { label: '(GMT+05:30) India Standard Time', value: 'Asia/Kolkata' },
-  { label: '(GMT+05:45) Kathmandu', value: 'Asia/Kathmandu' },
-  { label: '(GMT+06:00) Almaty', value: 'Asia/Almaty' },
-  { label: '(GMT+06:00) Bishkek', value: 'Asia/Bishkek' },
-  { label: '(GMT+06:00) Chagos', value: 'Indian/Chagos' },
-  { label: '(GMT+06:00) Dhaka', value: 'Asia/Dhaka' },
-  { label: '(GMT+06:00) Moscow+03 - Omsk', value: 'Asia/Omsk' },
-  { label: '(GMT+06:00) Thimphu', value: 'Asia/Thimphu' },
-  { label: '(GMT+06:00) Vostok', value: 'Antarctica/Vostok' },
-  { label: '(GMT+06:30) Cocos', value: 'Indian/Cocos' },
-  { label: '(GMT+06:30) Rangoon', value: 'Asia/Yangon' },
-  { label: '(GMT+07:00) Bangkok', value: 'Asia/Bangkok' },
-  { label: '(GMT+07:00) Christmas', value: 'Indian/Christmas' },
-  { label: '(GMT+07:00) Davis', value: 'Antarctica/Davis' },
-  { label: '(GMT+07:00) Hanoi', value: 'Asia/Saigon' },
-  { label: '(GMT+07:00) Hovd', value: 'Asia/Hovd' },
-  { label: '(GMT+07:00) Jakarta', value: 'Asia/Jakarta' },
-  { label: '(GMT+07:00) Moscow+04 - Krasnoyarsk', value: 'Asia/Krasnoyarsk' },
-  { label: '(GMT+08:00) Brunei', value: 'Asia/Brunei' },
-  { label: '(GMT+08:00) China Time - Beijing', value: 'Asia/Shanghai' },
-  { label: '(GMT+08:00) Choibalsan', value: 'Asia/Choibalsan' },
-  { label: '(GMT+08:00) Hong Kong', value: 'Asia/Hong_Kong' },
-  { label: '(GMT+08:00) Kuala Lumpur', value: 'Asia/Kuala_Lumpur' },
-  { label: '(GMT+08:00) Macau', value: 'Asia/Macau' },
-  { label: '(GMT+08:00) Makassar', value: 'Asia/Makassar' },
-  { label: '(GMT+08:00) Manila', value: 'Asia/Manila' },
-  { label: '(GMT+08:00) Moscow+05 - Irkutsk', value: 'Asia/Irkutsk' },
-  { label: '(GMT+08:00) Singapore', value: 'Asia/Singapore' },
-  { label: '(GMT+08:00) Taipei', value: 'Asia/Taipei' },
-  { label: '(GMT+08:00) Ulaanbaatar', value: 'Asia/Ulaanbaatar' },
-  { label: '(GMT+08:00) Western Time - Perth', value: 'Australia/Perth' },
-  { label: '(GMT+08:30) Pyongyang', value: 'Asia/Pyongyang' },
-  { label: '(GMT+09:00) Dili', value: 'Asia/Dili' },
-  { label: '(GMT+09:00) Jayapura', value: 'Asia/Jayapura' },
-  { label: '(GMT+09:00) Moscow+06 - Yakutsk', value: 'Asia/Yakutsk' },
-  { label: '(GMT+09:00) Palau', value: 'Pacific/Palau' },
-  { label: '(GMT+09:00) Seoul', value: 'Asia/Seoul' },
-  { label: '(GMT+09:00) Tokyo', value: 'Asia/Tokyo' },
-  { label: '(GMT+09:30) Central Time - Darwin', value: 'Australia/Darwin' },
-  { label: '(GMT+10:00) Dumont D\'Urville', value: 'Antarctica/DumontDUrville' },
-  { label: '(GMT+10:00) Eastern Time - Brisbane', value: 'Australia/Brisbane' },
-  { label: '(GMT+10:00) Guam', value: 'Pacific/Guam' },
-  { label: '(GMT+10:00) Moscow+07 - Vladivostok', value: 'Asia/Vladivostok' },
-  { label: '(GMT+10:00) Port Moresby', value: 'Pacific/Port_Moresby' },
-  { label: '(GMT+10:00) Truk', value: 'Pacific/Chuuk' },
-  { label: '(GMT+10:30) Central Time - Adelaide', value: 'Australia/Adelaide' },
-  { label: '(GMT+11:00) Casey', value: 'Antarctica/Casey' },
-  { label: '(GMT+11:00) Eastern Time - Hobart', value: 'Australia/Hobart' },
-  { label: '(GMT+11:00) Eastern Time - Melbourne, Sydney', value: 'Australia/Sydney' },
-  { label: '(GMT+11:00) Efate', value: 'Pacific/Efate' },
-  { label: '(GMT+11:00) Guadalcanal', value: 'Pacific/Guadalcanal' },
-  { label: '(GMT+11:00) Kosrae', value: 'Pacific/Kosrae' },
-  { label: '(GMT+11:00) Moscow+08 - Magadan', value: 'Asia/Magadan' },
-  { label: '(GMT+11:00) Norfolk', value: 'Pacific/Norfolk' },
-  { label: '(GMT+11:00) Noumea', value: 'Pacific/Noumea' },
-  { label: '(GMT+11:00) Ponape', value: 'Pacific/Pohnpei' },
-  { label: '(GMT+12:00) Funafuti', value: 'Pacific/Funafuti' },
-  { label: '(GMT+12:00) Kwajalein', value: 'Pacific/Kwajalein' },
-  { label: '(GMT+12:00) Majuro', value: 'Pacific/Majuro' },
-  { label: '(GMT+12:00) Moscow+09 - Petropavlovsk-Kamchatskiy', value: 'Asia/Kamchatka' },
-  { label: '(GMT+12:00) Nauru', value: 'Pacific/Nauru' },
-  { label: '(GMT+12:00) Tarawa', value: 'Pacific/Tarawa' },
-  { label: '(GMT+12:00) Wake', value: 'Pacific/Wake' },
-  { label: '(GMT+12:00) Wallis', value: 'Pacific/Wallis' },
-  { label: '(GMT+13:00) Auckland', value: 'Pacific/Auckland' },
-  { label: '(GMT+13:00) Enderbury', value: 'Pacific/Enderbury' },
-  { label: '(GMT+13:00) Fakaofo', value: 'Pacific/Fakaofo' },
-  { label: '(GMT+13:00) Fiji', value: 'Pacific/Fiji' },
-  { label: '(GMT+13:00) Tongatapu', value: 'Pacific/Tongatapu' },
-  { label: '(GMT+14:00) Apia', value: 'Pacific/Apia' },
-  { label: '(GMT+14:00) Kiritimati', value: 'Pacific/Kiritimati' }
+  { label: 'Pacific - Niue', value: 'Pacific/Niue' },
+  { label: 'Pacific - Pago Pago', value: 'Pacific/Pago_Pago' },
+  { label: 'Pacific - Hawaii Time', value: 'Pacific/Honolulu' },
+  { label: 'Pacific - Rarotonga', value: 'Pacific/Rarotonga' },
+  { label: 'Pacific - Tahiti', value: 'Pacific/Tahiti' },
+  { label: 'Pacific - Marquesas', value: 'Pacific/Marquesas' },
+  { label: 'America - Alaska Time', value: 'America/Anchorage' },
+  { label: 'Pacific - Gambier', value: 'Pacific/Gambier' },
+  { label: 'America - Pacific Time - Los Angeles', value: 'America/Los_Angeles' },
+  { label: 'America - Pacific Time - Tijuana', value: 'America/Tijuana' },
+  { label: 'America - Pacific Time - Vancouver', value: 'America/Vancouver' },
+  { label: 'America - Pacific Time - Whitehorse', value: 'America/Whitehorse' },
+  { label: 'Pacific - Pitcairn', value: 'Pacific/Pitcairn' },
+  { label: 'America - Mountain Time - Arizona', value: 'America/Phoenix' },
+  { label: 'America - Mountain Time - Chihuahua, Mazatlan', value: 'America/Mazatlan' },
+  { label: 'America - Mountain Time - Dawson Creek', value: 'America/Dawson_Creek' },
+  { label: 'America - Mountain Time - Denver', value: 'America/Denver' },
+  { label: 'America - Mountain Time - Edmonton', value: 'America/Edmonton' },
+  { label: 'America - Mountain Time - Hermosillo', value: 'America/Hermosillo' },
+  { label: 'America - Mountain Time - Yellowknife', value: 'America/Yellowknife' },
+  { label: 'America - Belize', value: 'America/Belize' },
+  { label: 'America - Central Time - Chicago', value: 'America/Chicago' },
+  { label: 'America - Central Time - Mexico City', value: 'America/Mexico_City' },
+  { label: 'America - Central Time - Regina', value: 'America/Regina' },
+  { label: 'America - Central Time - Tegucigalpa', value: 'America/Tegucigalpa' },
+  { label: 'America - Central Time - Winnipeg', value: 'America/Winnipeg' },
+  { label: 'America - Costa Rica', value: 'America/Costa_Rica' },
+  { label: 'America - El Salvador', value: 'America/El_Salvador' },
+  { label: 'Pacific - Galapagos', value: 'Pacific/Galapagos' },
+  { label: 'America - Guatemala', value: 'America/Guatemala' },
+  { label: 'America - Managua', value: 'America/Managua' },
+  { label: 'America - America Cancun', value: 'America/Cancun' },
+  { label: 'America - Bogota', value: 'America/Bogota' },
+  { label: 'Pacific - Easter Island', value: 'Pacific/Easter' },
+  { label: 'America - Eastern Time - New York', value: 'America/New_York' },
+  { label: 'America - Eastern Time - Iqaluit', value: 'America/Iqaluit' },
+  { label: 'America - Eastern Time - Toronto', value: 'America/Toronto' },
+  { label: 'America - Guayaquil', value: 'America/Guayaquil' },
+  { label: 'America - Havana', value: 'America/Havana' },
+  { label: 'America - Jamaica', value: 'America/Jamaica' },
+  { label: 'America - Lima', value: 'America/Lima' },
+  { label: 'America - Nassau', value: 'America/Nassau' },
+  { label: 'America - Panama', value: 'America/Panama' },
+  { label: 'America - Port-au-Prince', value: 'America/Port-au-Prince' },
+  { label: 'America - Rio Branco', value: 'America/Rio_Branco' },
+  { label: 'America - Atlantic Time - Halifax', value: 'America/Halifax' },
+  { label: 'America - Barbados', value: 'America/Barbados' },
+  { label: 'Atlantic - Bermuda', value: 'Atlantic/Bermuda' },
+  { label: 'America - Boa Vista', value: 'America/Boa_Vista' },
+  { label: 'America - Caracas', value: 'America/Caracas' },
+  { label: 'America - Curacao', value: 'America/Curacao' },
+  { label: 'America - Grand Turk', value: 'America/Grand_Turk' },
+  { label: 'America - Guyana', value: 'America/Guyana' },
+  { label: 'America - La Paz', value: 'America/La_Paz' },
+  { label: 'America - Manaus', value: 'America/Manaus' },
+  { label: 'America - Martinique', value: 'America/Martinique' },
+  { label: 'America - Port of Spain', value: 'America/Port_of_Spain' },
+  { label: 'America - Porto Velho', value: 'America/Porto_Velho' },
+  { label: 'America - Puerto Rico', value: 'America/Puerto_Rico' },
+  { label: 'America - Santo Domingo', value: 'America/Santo_Domingo' },
+  { label: 'America - Thule', value: 'America/Thule' },
+  { label: 'America - Newfoundland Time - St. Johns', value: 'America/St_Johns' },
+  { label: 'America - Araguaina', value: 'America/Araguaina' },
+  { label: 'America - Asuncion', value: 'America/Asuncion' },
+  { label: 'America - Belem', value: 'America/Belem' },
+  { label: 'America - Buenos Aires', value: 'America/Argentina/Buenos_Aires' },
+  { label: 'America - Campo Grande', value: 'America/Campo_Grande' },
+  { label: 'America - Cayenne', value: 'America/Cayenne' },
+  { label: 'America - Cuiaba', value: 'America/Cuiaba' },
+  { label: 'America - Fortaleza', value: 'America/Fortaleza' },
+  { label: 'America - Godthab', value: 'America/Godthab' },
+  { label: 'America - Maceio', value: 'America/Maceio' },
+  { label: 'America - Miquelon', value: 'America/Miquelon' },
+  { label: 'America - Montevideo', value: 'America/Montevideo' },
+  { label: 'Antarctica - Palmer', value: 'Antarctica/Palmer' },
+  { label: 'America - Paramaribo', value: 'America/Paramaribo' },
+  { label: 'America - Punta Arenas', value: 'America/Punta_Arenas' },
+  { label: 'America - Recife', value: 'America/Recife' },
+  { label: 'Antarctica - Rothera', value: 'Antarctica/Rothera' },
+  { label: 'America - Salvador', value: 'America/Bahia' },
+  { label: 'America - Santiago', value: 'America/Santiago' },
+  { label: 'Atlantic - Stanley', value: 'Atlantic/Stanley' },
+  { label: 'America - Noronha', value: 'America/Noronha' },
+  { label: 'America - Sao Paulo', value: 'America/Sao_Paulo' },
+  { label: 'Atlantic - South Georgia', value: 'Atlantic/South_Georgia' },
+  { label: 'Atlantic - Azores', value: 'Atlantic/Azores' },
+  { label: 'Atlantic - Cape Verde', value: 'Atlantic/Cape_Verde' },
+  { label: 'America - Scoresbysund', value: 'America/Scoresbysund' },
+  { label: 'Africa - Abidjan', value: 'Africa/Abidjan' },
+  { label: 'Africa - Accra', value: 'Africa/Accra' },
+  { label: 'Africa - Bissau', value: 'Africa/Bissau' },
+  { label: 'Atlantic - Canary Islands', value: 'Atlantic/Canary' },
+  { label: 'Africa - Casablanca', value: 'Africa/Casablanca' },
+  { label: 'America - Danmarkshavn', value: 'America/Danmarkshavn' },
+  { label: 'Europe - Dublin', value: 'Europe/Dublin' },
+  { label: 'Africa - El Aaiun', value: 'Africa/El_Aaiun' },
+  { label: 'Atlantic - Faeroe', value: 'Atlantic/Faroe' },
+  { label: 'UTC / GMT', value: 'UTC' },
+  { label: 'Europe - Lisbon', value: 'Europe/Lisbon' },
+  { label: 'Europe - London', value: 'Europe/London' },
+  { label: 'Africa - Monrovia', value: 'Africa/Monrovia' },
+  { label: 'Atlantic - Reykjavik', value: 'Atlantic/Reykjavik' },
+  { label: 'Africa - Algiers', value: 'Africa/Algiers' },
+  { label: 'Europe - Amsterdam', value: 'Europe/Amsterdam' },
+  { label: 'Europe - Andorra', value: 'Europe/Andorra' },
+  { label: 'Europe - Berlin', value: 'Europe/Berlin' },
+  { label: 'Europe - Brussels', value: 'Europe/Brussels' },
+  { label: 'Europe - Budapest', value: 'Europe/Budapest' },
+  { label: 'Europe - Central European Time - Belgrade', value: 'Europe/Belgrade' },
+  { label: 'Europe - Central European Time - Prague', value: 'Europe/Prague' },
+  { label: 'Africa - Ceuta', value: 'Africa/Ceuta' },
+  { label: 'Europe - Copenhagen', value: 'Europe/Copenhagen' },
+  { label: 'Europe - Gibraltar', value: 'Europe/Gibraltar' },
+  { label: 'Africa - Lagos', value: 'Africa/Lagos' },
+  { label: 'Europe - Luxembourg', value: 'Europe/Luxembourg' },
+  { label: 'Europe - Madrid', value: 'Europe/Madrid' },
+  { label: 'Europe - Malta', value: 'Europe/Malta' },
+  { label: 'Europe - Monaco', value: 'Europe/Monaco' },
+  { label: 'Africa - Ndjamena', value: 'Africa/Ndjamena' },
+  { label: 'Europe - Oslo', value: 'Europe/Oslo' },
+  { label: 'Europe - Paris', value: 'Europe/Paris' },
+  { label: 'Europe - Rome', value: 'Europe/Rome' },
+  { label: 'Europe - Stockholm', value: 'Europe/Stockholm' },
+  { label: 'Europe - Tirane', value: 'Europe/Tirane' },
+  { label: 'Africa - Tunis', value: 'Africa/Tunis' },
+  { label: 'Europe - Vienna', value: 'Europe/Vienna' },
+  { label: 'Europe - Warsaw', value: 'Europe/Warsaw' },
+  { label: 'Europe - Zurich', value: 'Europe/Zurich' },
+  { label: 'Asia - Amman', value: 'Asia/Amman' },
+  { label: 'Europe - Athens', value: 'Europe/Athens' },
+  { label: 'Asia - Beirut', value: 'Asia/Beirut' },
+  { label: 'Europe - Bucharest', value: 'Europe/Bucharest' },
+  { label: 'Africa - Cairo', value: 'Africa/Cairo' },
+  { label: 'Europe - Chisinau', value: 'Europe/Chisinau' },
+  { label: 'Asia - Damascus', value: 'Asia/Damascus' },
+  { label: 'Asia - Gaza', value: 'Asia/Gaza' },
+  { label: 'Europe - Helsinki', value: 'Europe/Helsinki' },
+  { label: 'Asia - Jerusalem', value: 'Asia/Jerusalem' },
+  { label: 'Africa - Johannesburg', value: 'Africa/Johannesburg' },
+  { label: 'Africa - Khartoum', value: 'Africa/Khartoum' },
+  { label: 'Europe - Kiev', value: 'Europe/Kiev' },
+  { label: 'Africa - Maputo', value: 'Africa/Maputo' },
+  { label: 'Europe - Moscow-01 - Kaliningrad', value: 'Europe/Kaliningrad' },
+  { label: 'Asia - Nicosia', value: 'Asia/Nicosia' },
+  { label: 'Europe - Riga', value: 'Europe/Riga' },
+  { label: 'Europe - Sofia', value: 'Europe/Sofia' },
+  { label: 'Europe - Tallinn', value: 'Europe/Tallinn' },
+  { label: 'Africa - Tripoli', value: 'Africa/Tripoli' },
+  { label: 'Europe - Vilnius', value: 'Europe/Vilnius' },
+  { label: 'Africa - Windhoek', value: 'Africa/Windhoek' },
+  { label: 'Asia - Baghdad', value: 'Asia/Baghdad' },
+  { label: 'Europe - Istanbul', value: 'Europe/Istanbul' },
+  { label: 'Europe - Minsk', value: 'Europe/Minsk' },
+  { label: 'Europe - Moscow+00 - Moscow', value: 'Europe/Moscow' },
+  { label: 'Africa - Nairobi', value: 'Africa/Nairobi' },
+  { label: 'Asia - Qatar', value: 'Asia/Qatar' },
+  { label: 'Asia - Riyadh', value: 'Asia/Riyadh' },
+  { label: 'Antarctica - Syowa', value: 'Antarctica/Syowa' },
+  { label: 'Asia - Tehran', value: 'Asia/Tehran' },
+  { label: 'Asia - Baku', value: 'Asia/Baku' },
+  { label: 'Asia - Dubai', value: 'Asia/Dubai' },
+  { label: 'Indian - Mahe', value: 'Indian/Mahe' },
+  { label: 'Indian - Mauritius', value: 'Indian/Mauritius' },
+  { label: 'Europe - Moscow+01 - Samara', value: 'Europe/Samara' },
+  { label: 'Indian - Reunion', value: 'Indian/Reunion' },
+  { label: 'Asia - Tbilisi', value: 'Asia/Tbilisi' },
+  { label: 'Asia - Yerevan', value: 'Asia/Yerevan' },
+  { label: 'Asia - Kabul', value: 'Asia/Kabul' },
+  { label: 'Asia - Aqtau', value: 'Asia/Aqtau' },
+  { label: 'Asia - Aqtobe', value: 'Asia/Aqtobe' },
+  { label: 'Asia - Ashgabat', value: 'Asia/Ashgabat' },
+  { label: 'Asia - Dushanbe', value: 'Asia/Dushanbe' },
+  { label: 'Asia - Karachi', value: 'Asia/Karachi' },
+  { label: 'Indian - Kerguelen', value: 'Indian/Kerguelen' },
+  { label: 'Indian - Maldives', value: 'Indian/Maldives' },
+  { label: 'Antarctica - Mawson', value: 'Antarctica/Mawson' },
+  { label: 'Asia - Moscow+02 - Yekaterinburg', value: 'Asia/Yekaterinburg' },
+  { label: 'Asia - Tashkent', value: 'Asia/Tashkent' },
+  { label: 'Asia - Colombo', value: 'Asia/Colombo' },
+  { label: 'Asia - India Standard Time', value: 'Asia/Kolkata' },
+  { label: 'Asia - Kathmandu', value: 'Asia/Kathmandu' },
+  { label: 'Asia - Almaty', value: 'Asia/Almaty' },
+  { label: 'Asia - Bishkek', value: 'Asia/Bishkek' },
+  { label: 'Indian - Chagos', value: 'Indian/Chagos' },
+  { label: 'Asia - Dhaka', value: 'Asia/Dhaka' },
+  { label: 'Asia - Moscow+03 - Omsk', value: 'Asia/Omsk' },
+  { label: 'Asia - Thimphu', value: 'Asia/Thimphu' },
+  { label: 'Antarctica - Vostok', value: 'Antarctica/Vostok' },
+  { label: 'Indian - Cocos', value: 'Indian/Cocos' },
+  { label: 'Asia - Rangoon', value: 'Asia/Yangon' },
+  { label: 'Asia - Bangkok', value: 'Asia/Bangkok' },
+  { label: 'Indian - Christmas', value: 'Indian/Christmas' },
+  { label: 'Antarctica - Davis', value: 'Antarctica/Davis' },
+  { label: 'Asia - Hanoi', value: 'Asia/Saigon' },
+  { label: 'Asia - Hovd', value: 'Asia/Hovd' },
+  { label: 'Asia - Jakarta', value: 'Asia/Jakarta' },
+  { label: 'Asia - Moscow+04 - Krasnoyarsk', value: 'Asia/Krasnoyarsk' },
+  { label: 'Asia - Brunei', value: 'Asia/Brunei' },
+  { label: 'Asia - China Time - Beijing', value: 'Asia/Shanghai' },
+  { label: 'Asia - Choibalsan', value: 'Asia/Choibalsan' },
+  { label: 'Asia - Hong Kong', value: 'Asia/Hong_Kong' },
+  { label: 'Asia - Kuala Lumpur', value: 'Asia/Kuala_Lumpur' },
+  { label: 'Asia - Macau', value: 'Asia/Macau' },
+  { label: 'Asia - Makassar', value: 'Asia/Makassar' },
+  { label: 'Asia - Manila', value: 'Asia/Manila' },
+  { label: 'Asia - Moscow+05 - Irkutsk', value: 'Asia/Irkutsk' },
+  { label: 'Asia - Singapore', value: 'Asia/Singapore' },
+  { label: 'Asia - Taipei', value: 'Asia/Taipei' },
+  { label: 'Asia - Ulaanbaatar', value: 'Asia/Ulaanbaatar' },
+  { label: 'Australia - Western Time - Perth', value: 'Australia/Perth' },
+  { label: 'Asia - Pyongyang', value: 'Asia/Pyongyang' },
+  { label: 'Asia - Dili', value: 'Asia/Dili' },
+  { label: 'Asia - Jayapura', value: 'Asia/Jayapura' },
+  { label: 'Asia - Moscow+06 - Yakutsk', value: 'Asia/Yakutsk' },
+  { label: 'Pacific - Palau', value: 'Pacific/Palau' },
+  { label: 'Asia - Seoul', value: 'Asia/Seoul' },
+  { label: 'Asia - Tokyo', value: 'Asia/Tokyo' },
+  { label: 'Australia - Central Time - Darwin', value: 'Australia/Darwin' },
+  { label: 'Antarctica - Dumont D\'Urville', value: 'Antarctica/DumontDUrville' },
+  { label: 'Australia - Eastern Time - Brisbane', value: 'Australia/Brisbane' },
+  { label: 'Pacific - Guam', value: 'Pacific/Guam' },
+  { label: 'Asia - Moscow+07 - Vladivostok', value: 'Asia/Vladivostok' },
+  { label: 'Pacific - Port Moresby', value: 'Pacific/Port_Moresby' },
+  { label: 'Pacific - Truk', value: 'Pacific/Chuuk' },
+  { label: 'Australia - Central Time - Adelaide', value: 'Australia/Adelaide' },
+  { label: 'Antarctica - Casey', value: 'Antarctica/Casey' },
+  { label: 'Australia - Eastern Time - Hobart', value: 'Australia/Hobart' },
+  { label: 'Australia - Eastern Time - Melbourne, Sydney', value: 'Australia/Sydney' },
+  { label: 'Pacific - Efate', value: 'Pacific/Efate' },
+  { label: 'Pacific - Guadalcanal', value: 'Pacific/Guadalcanal' },
+  { label: 'Pacific - Kosrae', value: 'Pacific/Kosrae' },
+  { label: 'Asia - Moscow+08 - Magadan', value: 'Asia/Magadan' },
+  { label: 'Pacific - Norfolk', value: 'Pacific/Norfolk' },
+  { label: 'Pacific - Noumea', value: 'Pacific/Noumea' },
+  { label: 'Pacific - Ponape', value: 'Pacific/Pohnpei' },
+  { label: 'Pacific - Funafuti', value: 'Pacific/Funafuti' },
+  { label: 'Pacific - Kwajalein', value: 'Pacific/Kwajalein' },
+  { label: 'Pacific - Majuro', value: 'Pacific/Majuro' },
+  { label: 'Asia - Moscow+09 - Petropavlovsk-Kamchatskiy', value: 'Asia/Kamchatka' },
+  { label: 'Pacific - Nauru', value: 'Pacific/Nauru' },
+  { label: 'Pacific - Tarawa', value: 'Pacific/Tarawa' },
+  { label: 'Pacific - Wake', value: 'Pacific/Wake' },
+  { label: 'Pacific - Wallis', value: 'Pacific/Wallis' },
+  { label: 'Pacific - Auckland', value: 'Pacific/Auckland' },
+  { label: 'Pacific - Enderbury', value: 'Pacific/Enderbury' },
+  { label: 'Pacific - Fakaofo', value: 'Pacific/Fakaofo' },
+  { label: 'Pacific - Fiji', value: 'Pacific/Fiji' },
+  { label: 'Pacific - Tongatapu', value: 'Pacific/Tongatapu' },
+  { label: 'Pacific - Apia', value: 'Pacific/Apia' },
+  { label: 'Pacific - Kiritimati', value: 'Pacific/Kiritimati' }
 ]
diff --git a/client/shared/urls.js b/client/shared/urls.js
new file mode 100644
index 0000000000..ba84dc2ffc
--- /dev/null
+++ b/client/shared/urls.js
@@ -0,0 +1,18 @@
+/**
+ * DO NOT add the urls here directly. Edit the urls.json file instead.
+ * The urls are automatically precompiled into the variable below at build time.
+ */
+const urls = { /* __COMPILED_URLS__ */ }
+
+/**
+ * Get an URL and replace tokens with provided values.
+ *
+ * @param {string} key The key of the URL template to use.
+ * @param {Object} [tokens] An object of tokens to replace in the URL template.
+ * @returns {string} URL with tokens replaced with the provided values.
+ */
+export const getUrl = (key, tokens = {}) => {
+  if (!key) { throw new Error('Must provide a key for getUrl()') }
+  if (!urls[key]) { throw new Error('Invalid getUrl() key') }
+  return urls[key](tokens)
+}
diff --git a/client/shared/urls.json b/client/shared/urls.json
new file mode 100644
index 0000000000..15410d68df
--- /dev/null
+++ b/client/shared/urls.json
@@ -0,0 +1,10 @@
+{
+  "bofDefinition": "https://www.ietf.org/how/bofs/",
+  "hackathonWiki": "https://wiki.ietf.org/meeting/{meetingNumber}/hackathon",
+  "meetingCalIcs": "/meeting/{meetingNumber}/agenda.ics",
+  "meetingDetails": "/meeting/{meetingNumber}/session/{eventAcronym}/",
+  "meetingMaterialsPdf": "/meeting/{meetingNumber}/agenda/{eventAcronym}-drafts.pdf",
+  "meetingMaterialsTar": "/meeting/{meetingNumber}/agenda/{eventAcronym}-drafts.tgz",
+  "meetingMeetechoRecordings": "https://www.meetecho.com/ietf{meetingNumber}/recordings#{eventAcronym}",
+  "meetingNotes": "https://notes.ietf.org/notes-ietf-{meetingNumber}-{eventAcronym}"
+}
diff --git a/client/shared/xslugify.js b/client/shared/xslugify.js
index daf0bdf2ba..e1ac556ddf 100644
--- a/client/shared/xslugify.js
+++ b/client/shared/xslugify.js
@@ -1,5 +1,5 @@
 import slugify from 'slugify'
 
 export default (str) => {
-  return slugify(str.replace('/', '-'), { lower: true })
+  return slugify(str.replaceAll('/', '-').replaceAll(/['&]/g, ''), { lower: true })
 }
diff --git a/cypress/.gitignore b/cypress/.gitignore
deleted file mode 100644
index e2c6387186..0000000000
--- a/cypress/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-downloads
-screenshots
-videos
diff --git a/cypress/configs/legacy.config.js b/cypress/configs/legacy.config.js
deleted file mode 100644
index 30ecce3592..0000000000
--- a/cypress/configs/legacy.config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const { defineConfig } = require('cypress')
-
-module.exports = defineConfig({
-  chromeWebSecurity: false,
-  e2e: {
-    baseUrl: 'http://localhost:8000',
-    specPattern: 'cypress/e2e-legacy/**/*.cy.{js,jsx,ts,tsx}',
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    }
-  },
-  numTestsKeptInMemory: 10,
-  viewportWidth: 1280,
-  viewportHeight: 800
-})
diff --git a/cypress/configs/modern.config.js b/cypress/configs/modern.config.js
deleted file mode 100644
index ee5d414e3e..0000000000
--- a/cypress/configs/modern.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const { defineConfig } = require('cypress')
-
-module.exports = defineConfig({
-  chromeWebSecurity: false,
-  component: {
-    devServer: {
-      framework: 'vue',
-      bundler: 'vite',
-    }
-  },
-  e2e: {
-    baseUrl: 'http://localhost:3000',
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    }
-  },
-  numTestsKeptInMemory: 10,
-  viewportWidth: 1280,
-  viewportHeight: 800
-})
diff --git a/cypress/e2e-legacy/nomcom/expertise.cy.js b/cypress/e2e-legacy/nomcom/expertise.cy.js
deleted file mode 100644
index f6a075291f..0000000000
--- a/cypress/e2e-legacy/nomcom/expertise.cy.js
+++ /dev/null
@@ -1,25 +0,0 @@
-describe('expertise', () => {
-  before(() => {
-    cy.visit('/nomcom/2021/expertise/')
-  })
-
-  it('expertises with expandable panels should expand', () => {
-    cy.get('.nomcom-req-positions-tabs > li > button').each($tab => {
-      cy.wrap($tab).click()
-      cy.wrap($tab).should('have.class', 'active')
-
-      cy.wrap($tab).invoke('attr', 'data-bs-target').then($tabId => {
-        cy.get($tabId).should('have.class', 'tab-pane').and('have.class', 'active').and('be.visible')
-
-        cy.get($tabId).then($tabContent => {
-          if ($tabContent.find('.generic_iesg_reqs_header').length) {
-            cy.wrap($tabContent).find('.generic_iesg_reqs_header').click()
-            cy.wrap($tabContent).find('.generic_iesg_reqs_header').invoke('attr', 'href').then($expandId => {
-              cy.get($expandId).should('be.visible')
-            })
-          }
-        })
-      })
-    })
-  })
-})
diff --git a/cypress/e2e-legacy/nomcom/questionnaires.cy.js b/cypress/e2e-legacy/nomcom/questionnaires.cy.js
deleted file mode 100644
index 839b5d7d37..0000000000
--- a/cypress/e2e-legacy/nomcom/questionnaires.cy.js
+++ /dev/null
@@ -1,16 +0,0 @@
-describe('questionnaires', () => {
-  before(() => {
-    cy.visit('/nomcom/2021/questionnaires/')
-  })
-
-  it('position tabs should display the appropriate panel on click', () => {
-    cy.get('.nomcom-questnr-positions-tabs > li > button').each($tab => {
-      cy.wrap($tab).click()
-      cy.wrap($tab).should('have.class', 'active')
-
-      cy.wrap($tab).invoke('attr', 'data-bs-target').then($tabId => {
-        cy.get($tabId).should('have.class', 'tab-pane').and('have.class', 'active').and('be.visible')
-      })
-    })
-  })
-})
diff --git a/cypress/fixtures/users.json b/cypress/fixtures/users.json
deleted file mode 100644
index 79b699aa77..0000000000
--- a/cypress/fixtures/users.json
+++ /dev/null
@@ -1,232 +0,0 @@
-[
-  {
-    "id": 1,
-    "name": "Leanne Graham",
-    "username": "Bret",
-    "email": "Sincere@april.biz",
-    "address": {
-      "street": "Kulas Light",
-      "suite": "Apt. 556",
-      "city": "Gwenborough",
-      "zipcode": "92998-3874",
-      "geo": {
-        "lat": "-37.3159",
-        "lng": "81.1496"
-      }
-    },
-    "phone": "1-770-736-8031 x56442",
-    "website": "hildegard.org",
-    "company": {
-      "name": "Romaguera-Crona",
-      "catchPhrase": "Multi-layered client-server neural-net",
-      "bs": "harness real-time e-markets"
-    }
-  },
-  {
-    "id": 2,
-    "name": "Ervin Howell",
-    "username": "Antonette",
-    "email": "Shanna@melissa.tv",
-    "address": {
-      "street": "Victor Plains",
-      "suite": "Suite 879",
-      "city": "Wisokyburgh",
-      "zipcode": "90566-7771",
-      "geo": {
-        "lat": "-43.9509",
-        "lng": "-34.4618"
-      }
-    },
-    "phone": "010-692-6593 x09125",
-    "website": "anastasia.net",
-    "company": {
-      "name": "Deckow-Crist",
-      "catchPhrase": "Proactive didactic contingency",
-      "bs": "synergize scalable supply-chains"
-    }
-  },
-  {
-    "id": 3,
-    "name": "Clementine Bauch",
-    "username": "Samantha",
-    "email": "Nathan@yesenia.net",
-    "address": {
-      "street": "Douglas Extension",
-      "suite": "Suite 847",
-      "city": "McKenziehaven",
-      "zipcode": "59590-4157",
-      "geo": {
-        "lat": "-68.6102",
-        "lng": "-47.0653"
-      }
-    },
-    "phone": "1-463-123-4447",
-    "website": "ramiro.info",
-    "company": {
-      "name": "Romaguera-Jacobson",
-      "catchPhrase": "Face to face bifurcated interface",
-      "bs": "e-enable strategic applications"
-    }
-  },
-  {
-    "id": 4,
-    "name": "Patricia Lebsack",
-    "username": "Karianne",
-    "email": "Julianne.OConner@kory.org",
-    "address": {
-      "street": "Hoeger Mall",
-      "suite": "Apt. 692",
-      "city": "South Elvis",
-      "zipcode": "53919-4257",
-      "geo": {
-        "lat": "29.4572",
-        "lng": "-164.2990"
-      }
-    },
-    "phone": "493-170-9623 x156",
-    "website": "kale.biz",
-    "company": {
-      "name": "Robel-Corkery",
-      "catchPhrase": "Multi-tiered zero tolerance productivity",
-      "bs": "transition cutting-edge web services"
-    }
-  },
-  {
-    "id": 5,
-    "name": "Chelsey Dietrich",
-    "username": "Kamren",
-    "email": "Lucio_Hettinger@annie.ca",
-    "address": {
-      "street": "Skiles Walks",
-      "suite": "Suite 351",
-      "city": "Roscoeview",
-      "zipcode": "33263",
-      "geo": {
-        "lat": "-31.8129",
-        "lng": "62.5342"
-      }
-    },
-    "phone": "(254)954-1289",
-    "website": "demarco.info",
-    "company": {
-      "name": "Keebler LLC",
-      "catchPhrase": "User-centric fault-tolerant solution",
-      "bs": "revolutionize end-to-end systems"
-    }
-  },
-  {
-    "id": 6,
-    "name": "Mrs. Dennis Schulist",
-    "username": "Leopoldo_Corkery",
-    "email": "Karley_Dach@jasper.info",
-    "address": {
-      "street": "Norberto Crossing",
-      "suite": "Apt. 950",
-      "city": "South Christy",
-      "zipcode": "23505-1337",
-      "geo": {
-        "lat": "-71.4197",
-        "lng": "71.7478"
-      }
-    },
-    "phone": "1-477-935-8478 x6430",
-    "website": "ola.org",
-    "company": {
-      "name": "Considine-Lockman",
-      "catchPhrase": "Synchronised bottom-line interface",
-      "bs": "e-enable innovative applications"
-    }
-  },
-  {
-    "id": 7,
-    "name": "Kurtis Weissnat",
-    "username": "Elwyn.Skiles",
-    "email": "Telly.Hoeger@billy.biz",
-    "address": {
-      "street": "Rex Trail",
-      "suite": "Suite 280",
-      "city": "Howemouth",
-      "zipcode": "58804-1099",
-      "geo": {
-        "lat": "24.8918",
-        "lng": "21.8984"
-      }
-    },
-    "phone": "210.067.6132",
-    "website": "elvis.io",
-    "company": {
-      "name": "Johns Group",
-      "catchPhrase": "Configurable multimedia task-force",
-      "bs": "generate enterprise e-tailers"
-    }
-  },
-  {
-    "id": 8,
-    "name": "Nicholas Runolfsdottir V",
-    "username": "Maxime_Nienow",
-    "email": "Sherwood@rosamond.me",
-    "address": {
-      "street": "Ellsworth Summit",
-      "suite": "Suite 729",
-      "city": "Aliyaview",
-      "zipcode": "45169",
-      "geo": {
-        "lat": "-14.3990",
-        "lng": "-120.7677"
-      }
-    },
-    "phone": "586.493.6943 x140",
-    "website": "jacynthe.com",
-    "company": {
-      "name": "Abernathy Group",
-      "catchPhrase": "Implemented secondary concept",
-      "bs": "e-enable extensible e-tailers"
-    }
-  },
-  {
-    "id": 9,
-    "name": "Glenna Reichert",
-    "username": "Delphine",
-    "email": "Chaim_McDermott@dana.io",
-    "address": {
-      "street": "Dayna Park",
-      "suite": "Suite 449",
-      "city": "Bartholomebury",
-      "zipcode": "76495-3109",
-      "geo": {
-        "lat": "24.6463",
-        "lng": "-168.8889"
-      }
-    },
-    "phone": "(775)976-6794 x41206",
-    "website": "conrad.com",
-    "company": {
-      "name": "Yost and Sons",
-      "catchPhrase": "Switchable contextually-based project",
-      "bs": "aggregate real-time technologies"
-    }
-  },
-  {
-    "id": 10,
-    "name": "Clementina DuBuque",
-    "username": "Moriah.Stanton",
-    "email": "Rey.Padberg@karina.biz",
-    "address": {
-      "street": "Kattie Turnpike",
-      "suite": "Suite 198",
-      "city": "Lebsackbury",
-      "zipcode": "31428-2261",
-      "geo": {
-        "lat": "-38.2386",
-        "lng": "57.2232"
-      }
-    },
-    "phone": "024-648-3804",
-    "website": "ambrose.net",
-    "company": {
-      "name": "Hoeger LLC",
-      "catchPhrase": "Centralized empowering task-force",
-      "bs": "target end-to-end models"
-    }
-  }
-]
\ No newline at end of file
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
deleted file mode 100644
index 666399dfe2..0000000000
--- a/cypress/plugins/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-// eslint-disable-next-line no-unused-vars
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-  on('before:browser:launch', (browser = {}, args) => {
-    if (browser.name === 'chrome') {
-      args.push('--disable-dev-shm-usage')
-    } else if (browser.name === 'electron') {
-      args['disable-dev-shm-usage'] = true
-    }
-
-    return args
-  })
-}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
deleted file mode 100644
index 8424c9f6cf..0000000000
--- a/cypress/support/commands.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-
-Cypress.Commands.add('any', { prevSubject: 'element' }, (subject, size = 1) => {
-  cy.wrap(subject).then(elementList => {
-    elementList = (elementList.jquery) ? elementList.get() : elementList
-    elementList = Cypress._.sampleSize(elementList, size)
-    elementList = (elementList.length > 1) ? elementList : elementList[0]
-    cy.wrap(elementList)
-  })
-})
-
-Cypress.Commands.add('take', { prevSubject: 'element' }, (subject, size = 1) => {
-  cy.wrap(subject).then(elementList => {
-    elementList = (elementList.jquery) ? elementList.get() : elementList
-    elementList = Cypress._.take(elementList, size)
-    elementList = (elementList.length > 1) ? elementList : elementList[0]
-    cy.wrap(elementList)
-  })
-})
-
-Cypress.Commands.add('isInViewport', { prevSubject: 'element' }, subject => {
-  cy.get(subject).should(($el) => {
-    const bottom = Cypress.$(cy.state("window")).height()
-    const rect = $el[0].getBoundingClientRect()
-
-    expect(rect.top).not.to.be.greaterThan(bottom, `Expected element not to be below the visible scrolled area`)
-    expect(rect.top).to.be.greaterThan(0 - rect.height, `Expected element not to be above the visible scrolled area`)
-  })
-})
diff --git a/cypress/support/component-index.html b/cypress/support/component-index.html
deleted file mode 100644
index ac6e79fd83..0000000000
--- a/cypress/support/component-index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>Components App</title>
-  </head>
-  <body>
-    <div data-cy-root></div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/cypress/support/component.js b/cypress/support/component.js
deleted file mode 100644
index b091808fa5..0000000000
--- a/cypress/support/component.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// ***********************************************************
-// This example support/component.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
-
-import { mount } from 'cypress/vue'
-
-Cypress.Commands.add('mount', mount)
-
-// Example use:
-// cy.mount(MyComponent)
\ No newline at end of file
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
deleted file mode 100644
index 56ef24933e..0000000000
--- a/cypress/support/e2e.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// ***********************************************************
-// This example support/e2e.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
-
-import 'cypress-real-events/support'
-import '@percy/cypress'
-
-// Handle ResizeObserver loop errors
-// See https://github.com/quasarframework/quasar/issues/2233
-Cypress.on('uncaught:exception', (err) => {
-  if (err.message.includes('ResizeObserver loop limit exceeded')) {
-    return false
-  }
-})
diff --git a/cypress/support/index.js b/cypress/support/index.js
deleted file mode 100644
index 33bd59c13a..0000000000
--- a/cypress/support/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
-
-import 'cypress-real-events/support'
diff --git a/debug.py b/debug.py
index bf34367cce..4f0d64bae2 100644
--- a/debug.py
+++ b/debug.py
@@ -3,15 +3,7 @@
 import sys
 import time as timeutils
 import inspect
-from typing import Callable
 
-try:
-    import syslog
-    logger = syslog.syslog              # type: Callable
-except ImportError:                     # import syslog will fail on Windows boxes
-    import logging
-    logging.basicConfig(filename='tracker.log',level=logging.INFO)
-    logger = logging.info
 
 try:
     from pprint import pformat
@@ -55,7 +47,7 @@ def fix(s,n=64):
         if len(s) > n+3:
             s = s[:n]+"..."
         return s
-    def wrap(fn, *params,**kwargs):
+    def wrap(*params,**kwargs):
         call = wrap.callcount = wrap.callcount + 1
 
         indent = ' ' * _report_indent[0]
@@ -81,8 +73,8 @@ def wrap(fn, *params,**kwargs):
         return ret
     wrap.callcount = 0
     if debug:
-        from decorator import decorator
-        return decorator(wrap, fn)
+        from functools import update_wrapper
+        return update_wrapper(wrap, fn)
     else:
         return fn
 
@@ -119,7 +111,7 @@ def clock(s):
 def time(fn):
     """Decorator to print timing information about a function call.
     """
-    def wrap(fn, *params,**kwargs):
+    def wrap(*params,**kwargs):
 
         indent = ' ' * _report_indent[0]
         fc = "%s.%s()" % (fn.__module__, fn.__name__,)
@@ -132,8 +124,8 @@ def wrap(fn, *params,**kwargs):
         return ret
     wrap.callcount = 0
     if debug:
-        from decorator import decorator
-        return decorator(wrap, fn)
+        from functools import update_wrapper
+        return update_wrapper(wrap, fn)
     else:
         return fn
 
@@ -155,13 +147,6 @@ def showpos(name):
         indent = ' ' * (_report_indent[0])
         sys.stderr.write("%s%s:%s: %s: '%s'\n" % (indent, fn, line, name, value))
 
-def log(name):
-    if debug:
-        frame = inspect.stack()[1][0]
-        value = eval(name, frame.f_globals, frame.f_locals)
-        indent = ' ' * (_report_indent[0])
-        logger("%s%s: %s" % (indent, name, value))
-
 def pprint(name):
     if debug:
         frame = inspect.stack()[1][0]
@@ -190,7 +175,7 @@ def type(name):
         value = eval(name, frame.f_globals, frame.f_locals)
         indent = ' ' * (_report_indent[0])
         sys.stderr.write("%s%s: %s\n" % (indent, name, value))
-            
+
 def say(s):
     if debug:
         indent = ' ' * (_report_indent[0])
@@ -205,11 +190,11 @@ def wrapper(*args, **kwargs):
         prof.dump_stats(datafn)
         return retval
     if debug:
-        from decorator import decorator
-        return decorator(wrapper, fn)
+        from functools import update_wrapper
+        return update_wrapper(wrapper, fn)
     else:
         return fn
-    
+
 def traceback(levels=None):
     if debug:
         indent = ' ' * (_report_indent[0])
diff --git a/dev/INSTALL b/dev/INSTALL
deleted file mode 100644
index 15c7472972..0000000000
--- a/dev/INSTALL
+++ /dev/null
@@ -1,155 +0,0 @@
-==============================================================================
-			       IETF Datatracker
-==============================================================================
-
-------------------------------------------------------------------------------
-     Installation Instructions
-------------------------------------------------------------------------------
-
-General Instructions for Deployment of a New Release
-====================================================
-
- 0. Prepare to hold different roles at different stages of the instructions below.
-    You will need to be root, wwwrun, and some user in group docker. 
-    Consider using separate shells for the wwwrun and other roles. These instructions 
-    are written assuming you will only use one shell.
-
- 1. Make a directory to hold the new release as wwwrun::
-      sudo su - -s /bin/bash wwwrun
-      mkdir /a/www/ietf-datatracker/${releasenumber}
-      cd /a/www/ietf-datatracker/${releasenumber}
-
- 2. Fetch the release tarball from github 
-    (see https://github.com/ietf-tools/datatracker/releases)::
-
-      wget https://github.com/ietf-tools/datatracker/releases/download/${releasenumber}/release.tar.gz
-      tar xzvf release.tar.gz
-  
- 3. Copy ietf/settings_local.py from previous release::
-
-      cp ../web/ietf/settings_local.py ietf/
-
- 4. Setup a new virtual environment and install requirements::
-
-      python3.9 -mvenv env
-      source env/bin/activate
-      pip install -r requirements.txt
-      pip freeze > frozen-requirements.txt
-
-    (The pip freeze command records the exact versions of the Python libraries that pip installed.
-     This is used by the celery docker container to ensure it uses the same library versions as
-     the datatracker service.)
-
- 5. Move static files into place for CDN (/a/www/www6s/lib/dt):
-
-      ietf/manage.py collectstatic
-
- 6. Run system checks (which patches the just installed modules)::
-
-      ietf/manage.py check
-
- 7. Switch to the docker directory and update images as a user in group docker:
-
-      exit
-      cd /a/docker/datatracker
-      docker image tag ghcr.io/ietf-tools/datatracker-celery:latest datatracker-celery-fallback
-      docker image tag ghcr.io/ietf-tools/datatracker-mq:latest datatracker-mq-fallback
-      docker-compose pull
-
- 8. Stop and remove the async task containers:
-    Wait for this to finish cleanly. Usually this will only be a few seconds, but it may take up 
-    to about 10 minutes for the 'down' command to complete if a long-running task is in progress.
-
-      docker-compose down
-
- 9. Stop the datatracker 
-
-      sudo systemctl stop datatracker.socket datatracker.service
-
- 10. Return to the release directory and run migrations as wwwrun:
-
-      sudo su - -s /bin/bash wwwrun
-      cd /a/www/ietf-datatracker/${releasenumber}
-      ietf/manage.py migrate
-
-      Take note if any migrations were executed.
- 
- 11. Back out one directory level, then re-point the 'web' symlink::
-
-      cd ..
-      rm ./web; ln -s ${releasenumber} web
-
- 12. Start the datatracker service (it is no longer necessary to restart apache) ::
-
-      exit 
-      sudo systemctl start datatracker.service datatracker.socket
-
- 13. Start async task worker and message broker:
-
-      cd /a/docker/datatracker
-      bash startcommand
-
- 14. Verify operation:
-
-      http://datatracker.ietf.org/
-
- 15. If install failed and there were no migrations at step 9, revert web symlink and docker update and repeat the
-     restart in steps 11 and 12. To revert the docker update:
-
-          cd /a/docker/datatracker
-          docker-compose down
-          docker image rm ghcr.io/ietf-tools/datatracker-celery:latest ghcr.io/ietf-tools/datatracker-mq:latest
-          docker image tag datatracker-celery-fallback ghcr.io/ietf-tools/datatracker-celery:latest
-          docker image tag datatracker-mq-fallback ghcr.io/ietf-tools/datatracker-mq:latest
-          cd -
-
-     If there were migrations at step 10, they will need to be reversed before the restart at step 12.
-     If it's not obvious what to do to reverse the migrations, contact the dev team.
-
- 
-Patching a Production Release
-=============================
-
-Sometimes it can prove necessary to patch an existing release.
-The following process should be used:
-
- 1. Code and test the patch on an copy of the release with any
-    previously applied patches put in place.
-
- 2. Produce a patch file, named with date and subject::
-
-      $ git diff > 2013-03-25-ballot-calculation.patch
-
- 3. Move the patch file to the production server, and place it in 
-    '/a/www/ietf-datatracker/patches/'
-
- 4. Make a recursive copy of the production code to a new directory, named with a patch number.  
-
-      /a/www/ietf-datatracker $ rsync -a web/ ${releasenumber}.p1/
-
- 5. Apply the patch::
-
-      /a/www/ietf-datatracker $ cd ${releasenumber}.p1/      
-      /a/www/ietf-datatracker/${releasnumber}.p1 $ patch -p1 \
-			< ../patches/2013-03-25-ballot-calculation.patch
-
-    This must not produce any messages about failing to apply any chunks;
-    if it does, go back to 1. and figure out why.
-
- 6. Edit ``.../ietf/__init__.py`` in the new patched release to indicate the patch
-    version in the ``__patch__`` string.
-
- 7. Stop the async task container (this may take a few minutes if tasks are in progress):
-
-      cd /a/docker/datatracker
-      docker-compose down
-
- 8. Change the 'web' symlink, reload etc. as described in
-    `General Instructions for Deployment of a New Release`_.
-
- 9. Start async task worker:
-
-      cd /a/docker/datatracker
-      bash startcommand
-
-
diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile
new file mode 100644
index 0000000000..e57fecd5f2
--- /dev/null
+++ b/dev/build/Dockerfile
@@ -0,0 +1,41 @@
+FROM ghcr.io/ietf-tools/datatracker-app-base:20260410T1557
+LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# uid 498 = wwwrun and gid 496 = www on ietfa
+RUN groupadd -g 1000 datatracker && \
+    useradd -c "Datatracker User" -u 1000 -g datatracker -m -s /bin/false datatracker
+
+RUN apt-get purge -y imagemagick imagemagick-6-common
+
+# Install libreoffice (needed via PPT2PDF_COMMAND)
+RUN apt-get update && \
+    apt-get -qy install libreoffice-nogui
+
+COPY . .
+COPY ./dev/build/start.sh ./start.sh
+COPY ./dev/build/datatracker-start.sh ./datatracker-start.sh
+COPY ./dev/build/migration-start.sh ./migration-start.sh
+COPY ./dev/build/celery-start.sh ./celery-start.sh
+COPY ./dev/build/gunicorn.conf.py ./gunicorn.conf.py
+
+RUN pip3 --disable-pip-version-check --no-cache-dir install -r requirements.txt && \
+    echo '# empty' > ietf/settings_local.py && \
+    ietf/manage.py patch_libraries && \
+    rm -f ietf/settings_local.py
+
+RUN chmod +x start.sh && \
+    chmod +x datatracker-start.sh && \
+    chmod +x migration-start.sh && \
+    chmod +x celery-start.sh && \
+    chmod +x docker/scripts/app-create-dirs.sh && \
+    sh ./docker/scripts/app-create-dirs.sh
+
+RUN mkdir -p /a
+
+VOLUME [ "/a" ]
+
+EXPOSE 8000
+
+CMD ["./start.sh"]
diff --git a/dev/build/TARGET_BASE b/dev/build/TARGET_BASE
new file mode 100644
index 0000000000..f430037c09
--- /dev/null
+++ b/dev/build/TARGET_BASE
@@ -0,0 +1 @@
+20260410T1557
diff --git a/dev/build/celery-start.sh b/dev/build/celery-start.sh
new file mode 100644
index 0000000000..69dcd7bbda
--- /dev/null
+++ b/dev/build/celery-start.sh
@@ -0,0 +1,52 @@
+#!/bin/bash -e
+#
+# Run a celery worker
+#
+echo "Running Datatracker checks..."
+./ietf/manage.py check
+
+# Check whether the blobdb database exists - inspectdb will return a false
+# status if not.
+if ietf/manage.py inspectdb --database blobdb > /dev/null 2>&1; then
+    HAVE_BLOBDB="yes"
+fi
+
+migrations_applied_for () {
+    local DATABASE=${1:-default}
+    ietf/manage.py migrate --check --database "$DATABASE"
+}
+
+migrations_all_applied () {
+    if [[ "$HAVE_BLOBDB" == "yes" ]]; then
+        migrations_applied_for default && migrations_applied_for blobdb
+    else
+        migrations_applied_for default
+    fi
+}
+
+if ! migrations_all_applied; then
+    echo "Unapplied migrations found, waiting to start..."
+    sleep 5
+    while ! migrations_all_applied ; do 
+        echo "... still waiting for migrations..."
+        sleep 5
+    done
+fi
+
+echo "Starting Celery..."
+
+cleanup () {
+  # Cleanly terminate the celery app by sending it a TERM, then waiting for it to exit.
+  if [[ -n "${celery_pid}" ]]; then
+    echo "Gracefully terminating celery worker. This may take a few minutes if tasks are in progress..."
+    kill -TERM "${celery_pid}"
+    wait "${celery_pid}"
+  fi
+}
+
+trap 'trap "" TERM; cleanup' TERM
+
+# start celery in the background so we can trap the TERM signal
+celery "$@" &
+celery_pid=$!
+wait "${celery_pid}"
diff --git a/dev/build/collectstatics.sh b/dev/build/collectstatics.sh
new file mode 100644
index 0000000000..44f1c608a9
--- /dev/null
+++ b/dev/build/collectstatics.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Copy temp local settings
+cp dev/build/settings_local_collectstatics.py ietf/settings_local.py
+
+# Install Python dependencies
+pip --disable-pip-version-check --no-cache-dir install -r requirements.txt
+
+# Collect statics
+ietf/manage.py collectstatic
+
+# Delete temp local settings
+rm ietf/settings_local.py
\ No newline at end of file
diff --git a/dev/build/datatracker-start.sh b/dev/build/datatracker-start.sh
new file mode 100644
index 0000000000..a676415a26
--- /dev/null
+++ b/dev/build/datatracker-start.sh
@@ -0,0 +1,60 @@
+#!/bin/bash -e
+
+echo "Running Datatracker checks..."
+./ietf/manage.py check
+
+# Check whether the blobdb database exists - inspectdb will return a false
+# status if not.
+if ietf/manage.py inspectdb --database blobdb > /dev/null 2>&1; then
+    HAVE_BLOBDB="yes"
+fi
+
+migrations_applied_for () {
+    local DATABASE=${1:-default}
+    ietf/manage.py migrate --check --database "$DATABASE"
+}
+
+migrations_all_applied () {
+    if [[ "$HAVE_BLOBDB" == "yes" ]]; then
+        migrations_applied_for default && migrations_applied_for blobdb
+    else
+        migrations_applied_for default
+    fi
+}
+
+if ! migrations_all_applied; then
+    echo "Unapplied migrations found, waiting to start..."
+    sleep 5
+    while ! migrations_all_applied ; do 
+        echo "... still waiting for migrations..."
+        sleep 5
+    done
+fi
+
+echo "Starting Datatracker..."
+
+# trap TERM and shut down gunicorn
+cleanup () {
+    if [[ -n "${gunicorn_pid}" ]]; then
+        echo "Terminating gunicorn..."
+        kill -TERM "${gunicorn_pid}"
+        wait "${gunicorn_pid}"
+    fi
+}
+
+trap 'trap "" TERM; cleanup' TERM
+
+# start gunicorn in the background so we can trap the TERM signal
+gunicorn \
+          -c /workspace/gunicorn.conf.py \
+          --workers "${DATATRACKER_GUNICORN_WORKERS:-9}" \
+          --max-requests "${DATATRACKER_GUNICORN_MAX_REQUESTS:-32768}" \
+          --timeout "${DATATRACKER_GUNICORN_TIMEOUT:-180}" \
+          --bind :8000 \
+          --log-level "${DATATRACKER_GUNICORN_LOG_LEVEL:-info}" \
+          --capture-output \
+          --access-logfile -\
+          ${DATATRACKER_GUNICORN_EXTRA_ARGS} \
+          ietf.wsgi:application &
+gunicorn_pid=$!
+wait "${gunicorn_pid}"
diff --git a/dev/deploy/exclude-patterns.txt b/dev/build/exclude-patterns.txt
similarity index 100%
rename from dev/deploy/exclude-patterns.txt
rename to dev/build/exclude-patterns.txt
diff --git a/dev/build/gunicorn.conf.py b/dev/build/gunicorn.conf.py
new file mode 100644
index 0000000000..9af4478685
--- /dev/null
+++ b/dev/build/gunicorn.conf.py
@@ -0,0 +1,164 @@
+# Copyright The IETF Trust 2024-2025, All Rights Reserved
+
+import os
+import ietf
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.instrumentation.django import DjangoInstrumentor
+from opentelemetry.instrumentation.psycopg2 import Psycopg2Instrumentor
+from opentelemetry.instrumentation.pymemcache import PymemcacheInstrumentor
+from opentelemetry.instrumentation.requests import RequestsInstrumentor
+
+# Configure security scheme headers for forwarded requests. Cloudflare sets X-Forwarded-Proto 
+# for us. Don't trust any of the other similar headers. Only trust the header if it's coming
+# from localhost, as all legitimate traffic will reach gunicorn via co-located nginx.
+secure_scheme_headers = {"X-FORWARDED-PROTO": "https"}
+forwarded_allow_ips = "127.0.0.1, ::1"  # this is the default 
+
+# Log as JSON on stdout (to distinguish from Django's logs on stderr)
+#
+# This is applied as an update to gunicorn's glogging.CONFIG_DEFAULTS.
+logconfig_dict = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "root": {"level": "INFO", "handlers": ["console"]},
+    "loggers": {
+        "gunicorn.error": {
+            "level": "INFO",
+            "handlers": ["console"],
+            "propagate": False,
+            "qualname": "gunicorn.error",
+        },
+        "gunicorn.access": {
+            "level": "INFO",
+            "handlers": ["access_console"],
+            "propagate": False,
+            "qualname": "gunicorn.access",
+        },
+    },
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+            "formatter": "json",
+            "stream": "ext://sys.stdout",
+        },
+        "access_console": {
+            "class": "logging.StreamHandler",
+            "formatter": "access_json",
+            "stream": "ext://sys.stdout",
+        },
+    },
+    "formatters": {
+        "json": {
+            "class": "ietf.utils.jsonlogger.DatatrackerJsonFormatter",
+            "style": "{",
+            "format": "{asctime}{levelname}{message}{name}{process}",
+        },
+        "access_json": {
+            "class": "ietf.utils.jsonlogger.GunicornRequestJsonFormatter",
+            "style": "{",
+            "format": "{asctime}{levelname}{message}{name}{process}",
+        },
+    },
+}
+
+# Track in-flight requests and emit a list of what was happeningwhen a worker is terminated.
+# For the default sync worker, there will only be one request per PID, but allow for the
+# possibility of multiple requests in case we switch to a different worker class.
+#
+# This dict is only visible within a single worker, but key by pid to guarantee no conflicts.
+#
+# Use a list rather than a set to allow for the possibility of overlapping identical requests.
+in_flight_by_pid: dict[str, list[str]] = {}  # pid -> list of in-flight requests
+
+
+def _describe_request(req):
+    """Generate a consistent description of a request
+
+    The return value is used identify in-flight requests, so it must not vary between the
+    start and end of handling a request. E.g., do not include a timestamp.
+    """
+    client_ip = "-"
+    asn = "-"
+    cf_ray = "-"
+    for header, value in req.headers:
+        header = header.lower()
+        if header == "cf-connecting-ip":
+            client_ip = value
+        elif header == "x-ip-src-asnum":
+            asn = value
+        elif header == "cf-ray":
+            cf_ray = value
+    if req.query:
+        path = f"{req.path}?{req.query}"
+    else:
+        path = req.path
+    return f"{req.method} {path} (client_ip={client_ip}, asn={asn}, cf_ray={cf_ray})"
+
+
+def pre_request(worker, req):
+    """Log the start of a request and add it to the in-flight list"""
+    request_description = _describe_request(req)
+    worker.log.info(f"gunicorn starting to process {request_description}")
+    in_flight = in_flight_by_pid.setdefault(worker.pid, [])
+    in_flight.append(request_description)
+
+
+def worker_abort(worker):
+    """Emit an error log if any requests were in-flight"""
+    in_flight = in_flight_by_pid.get(worker.pid, [])
+    if len(in_flight) > 0:
+        worker.log.error(
+            f"Aborted worker {worker.pid} with in-flight requests: {', '.join(in_flight)}"
+        )
+
+
+def worker_int(worker):
+    """Emit an error log if any requests were in-flight"""
+    in_flight = in_flight_by_pid.get(worker.pid, [])
+    if len(in_flight) > 0:
+        worker.log.error(
+            f"Interrupted worker {worker.pid} with in-flight requests: {', '.join(in_flight)}"
+        )
+
+
+def post_request(worker, req, environ, resp):
+    """Remove request from in-flight list when we finish handling it"""
+    request_description = _describe_request(req)
+    in_flight = in_flight_by_pid.get(worker.pid, [])
+    if request_description in in_flight:
+        in_flight.remove(request_description)
+
+def post_fork(server, worker):
+    server.log.info("Worker spawned (pid: %s)", worker.pid)
+
+    # Setting DATATRACKER_OPENTELEMETRY_ENABLE=all in the environment will enable all
+    # opentelemetry instrumentations. Individual instrumentations can be selected by
+    # using a space-separated list. See the code below for available instrumentations.
+    telemetry_env = os.environ.get("DATATRACKER_OPENTELEMETRY_ENABLE", "").strip()
+    if telemetry_env != "":
+        enabled_telemetry = [tok.strip().lower() for tok in telemetry_env.split()]
+        resource = Resource.create(attributes={
+            "service.name": "datatracker",
+            "service.version": ietf.__version__,
+            "service.instance.id": worker.pid,
+            "service.namespace": "datatracker",
+            "deployment.environment.name": os.environ.get("DATATRACKER_SERVICE_ENV", "dev")
+        })
+        trace.set_tracer_provider(TracerProvider(resource=resource))
+        otlp_exporter = OTLPSpanExporter(endpoint="https://heimdall-otlp.ietf.org/v1/traces")
+    
+        trace.get_tracer_provider().add_span_processor(BatchSpanProcessor(otlp_exporter))
+    
+        # Instrumentations
+        if "all" in enabled_telemetry or "django" in enabled_telemetry: 
+            DjangoInstrumentor().instrument()
+        if "all" in enabled_telemetry or "psycopg2" in enabled_telemetry: 
+            Psycopg2Instrumentor().instrument()
+        if "all" in enabled_telemetry or "pymemcache" in enabled_telemetry: 
+            PymemcacheInstrumentor().instrument()
+        if "all" in enabled_telemetry or "requests" in enabled_telemetry: 
+            RequestsInstrumentor().instrument()
diff --git a/dev/build/migration-start.sh b/dev/build/migration-start.sh
new file mode 100644
index 0000000000..578daf5cef
--- /dev/null
+++ b/dev/build/migration-start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+echo "Running Datatracker migrations..."
+./ietf/manage.py migrate --settings=settings_local
+
+# Check whether the blobdb database exists - inspectdb will return a false
+# status if not.
+if ./ietf/manage.py inspectdb --database blobdb > /dev/null 2>&1; then
+    echo "Running Blobdb migrations ..."
+    ./ietf/manage.py migrate --settings=settings_local --database=blobdb
+fi
+
+echo "Done!"
diff --git a/dev/build/settings_local_collectstatics.py b/dev/build/settings_local_collectstatics.py
new file mode 100644
index 0000000000..ccb4b33979
--- /dev/null
+++ b/dev/build/settings_local_collectstatics.py
@@ -0,0 +1,8 @@
+# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from ietf import __version__
+from ietf.settings import *                                          # pyflakes:ignore
+
+STATIC_URL = "https://static.ietf.org/dt/%s/"%__version__
+STATIC_ROOT = os.path.abspath(BASE_DIR + "/../static/")
diff --git a/dev/build/start.sh b/dev/build/start.sh
new file mode 100644
index 0000000000..3b03637068
--- /dev/null
+++ b/dev/build/start.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Environment config:
+#
+#  CONTAINER_ROLE - datatracker, celery, beat, migrations, or replicator (defaults to datatracker)
+#
+case "${CONTAINER_ROLE:-datatracker}" in
+    auth)
+        exec ./datatracker-start.sh
+        ;;
+    beat)
+        exec ./celery-start.sh --app=ietf beat
+        ;;
+    celery)
+        exec ./celery-start.sh --app=ietf worker
+        ;;
+    datatracker)
+        exec ./datatracker-start.sh
+        ;;
+    migrations)
+        exec ./migration-start.sh
+        ;;
+    replicator)
+        exec ./celery-start.sh --app=ietf worker --queues=blobdb --concurrency=1
+        ;;
+    *)
+        echo "Unknown role '${CONTAINER_ROLE}'"
+        exit 255       
+esac
diff --git a/dev/celery/Dockerfile b/dev/celery/Dockerfile
index 91f2949a6b..e69de29bb2 100644
--- a/dev/celery/Dockerfile
+++ b/dev/celery/Dockerfile
@@ -1,20 +0,0 @@
-# Dockerfile for celery worker
-#
-FROM ghcr.io/ietf-tools/datatracker-app-base:latest
-LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get purge -y imagemagick imagemagick-6-common
-
-# Copy the startup file
-COPY dev/celery/docker-init.sh /docker-init.sh
-RUN sed -i 's/\r$//' /docker-init.sh && \
-    chmod +x /docker-init.sh
-
-# Install current datatracker python dependencies
-COPY requirements.txt /tmp/pip-tmp/
-RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt
-RUN rm -rf /tmp/pip-tmp
-
-ENTRYPOINT [ "/docker-init.sh" ]
\ No newline at end of file
diff --git a/dev/celery/docker-init.sh b/dev/celery/docker-init.sh
deleted file mode 100755
index 7e2b68425d..0000000000
--- a/dev/celery/docker-init.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash -e
-#
-# Environment parameters:
-#
-#   CELERY_APP - name of application to pass to celery (defaults to ietf)
-#
-#   CELERY_ROLE - 'worker' or 'beat' (defaults to 'worker')
-#
-#   CELERY_UID - numeric uid for the celery worker process
-#
-#   CELERY_GID - numeric gid for the celery worker process
-#
-#   UPDATES_REQUIREMENTS_FROM - path, relative to /workspace mount, to a pip requirements
-#       file that should be installed at container startup. Default is no package install/update.
-#
-#   DEBUG_TERM_TIMING - if non-empty, writes debug messages during shutdown after a TERM signal
-#
-WORKSPACEDIR="/workspace"
-CELERY_ROLE="${CELERY_ROLE:-worker}"
-
-cd "$WORKSPACEDIR" || exit 255
-
-if [[ -n "${UPDATE_REQUIREMENTS_FROM}" ]]; then
-  # Need to run as root in the container for this
-  reqs_file="${WORKSPACEDIR}/${UPDATE_REQUIREMENTS_FROM}"
-  echo "Updating requirements from ${reqs_file}..."
-  pip install --upgrade -r "${reqs_file}"
-fi
-
-CELERY_OPTS=( "${CELERY_ROLE}" )
-if [[ -n "${CELERY_UID}" ]]; then
-  # ensure that a user with the necessary UID exists in container
-  if ! id "${CELERY_UID}" ; then
-    adduser --system --uid "${CELERY_UID}" --no-create-home --disabled-login "celery-user-${CELERY_UID}"
-  fi
-  CELERY_OPTS+=("--uid=${CELERY_UID}")
-  CELERY_USERNAME="$(id -nu ${CELERY_UID})"
-fi
-
-if [[ -n "${CELERY_GID}" ]]; then
-  # ensure that some group with the necessary GID exists in container
-  if ! getent group "${CELERY_GID}" ; then
-    addgroup --gid "${CELERY_GID}" "celery-group-${CELERY_GID}"
-  fi
-  CELERY_OPTS+=("--gid=${CELERY_GID}")
-  CELERY_GROUP="$(getent group ${CELERY_GID} | awk -F: '{print $1}')"
-fi
-
-run_as_celery_uid () {
-  SU_OPTS=()
-  if [[ -n "${CELERY_GROUP}" ]]; then
-    SU_OPTS+=("-g" "${CELERY_GROUP}")
-  fi
-  su "${SU_OPTS[@]}" "${CELERY_USERNAME:-root}" -s /bin/sh -c "$@"
-}
-
-log_term_timing_msgs () {
-  # output periodic debug message
-  while true; do
-    echo "Waiting for celery worker shutdown ($(date --utc --iso-8601=ns))"
-    sleep 0.5s
-  done
-}
-
-cleanup () {
-  # Cleanly terminate the celery app by sending it a TERM, then waiting for it to exit.
-  if [[ -n "${celery_pid}" ]]; then
-    echo "Gracefully terminating celery worker. This may take a few minutes if tasks are in progress..."
-    kill -TERM "${celery_pid}"
-    if [[ -n "${DEBUG_TERM_TIMING}" ]]; then
-      log_term_timing_msgs &
-    fi
-    wait "${celery_pid}"
-  fi
-}
-
-if [[ "${CELERY_ROLE}" == "worker" ]]; then
-    echo "Running initial checks..."
-    # Run checks as celery worker if one was specified
-    run_as_celery_uid /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check
-fi
-
-trap 'trap "" TERM; cleanup' TERM
-# start celery in the background so we can trap the TERM signal
-celery --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" "$@" &
-celery_pid=$!
-wait "${celery_pid}"
diff --git a/dev/codecov.yml b/dev/codecov.yml
index 8e51bc54ea..7ec1def6c5 100644
--- a/dev/codecov.yml
+++ b/dev/codecov.yml
@@ -4,5 +4,8 @@ coverage:
       default:
         target: auto
         threshold: 1%
+    patch:
+      default:
+        informational: true
 github_checks:
   annotations: false
diff --git a/dev/coverage-action/action.yml b/dev/coverage-action/action.yml
index b8d732a534..60c8de2d92 100644
--- a/dev/coverage-action/action.yml
+++ b/dev/coverage-action/action.yml
@@ -35,7 +35,7 @@ outputs:
   changelog:
     description: Changelog with headers prepended and coverage stats + chart appended
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'index.js'
 branding:
   icon: layers
diff --git a/dev/coverage-action/index.js b/dev/coverage-action/index.js
index 57249bfdb1..5a1c690be3 100644
--- a/dev/coverage-action/index.js
+++ b/dev/coverage-action/index.js
@@ -5,20 +5,20 @@ const find = require('lodash/find')
 const round = require('lodash/round')
 const fs = require('fs/promises')
 const { DateTime } = require('luxon')
-const isPlainObject = require('lodash/isPlainObject')
+// const isPlainObject = require('lodash/isPlainObject')
 
 const dec = new TextDecoder()
 
 async function main () {
   const token = core.getInput('token')
-  const tokenCommon = core.getInput('tokenCommon')
+  // const tokenCommon = core.getInput('tokenCommon')
   const inputCovPath = core.getInput('coverageResultsPath') // 'data/coverage-raw.json'
   const outputCovPath = core.getInput('coverageResultsPath') // 'data/coverage.json'
   const outputHistPath = core.getInput('histCoveragePath') // 'data/historical-coverage.json'
   const relVersionRaw = core.getInput('version') // 'v7.47.0'
   const relVersion = relVersionRaw.indexOf('v') === 0 ? relVersionRaw.substring(1) : relVersionRaw
   const gh = github.getOctokit(token)
-  const ghCommon = github.getOctokit(tokenCommon)
+  // const ghCommon = github.getOctokit(tokenCommon)
   const owner = github.context.repo.owner // 'ietf-tools'
   const repo = github.context.repo.repo // 'datatracker'
   const sender = github.context.payload.sender.login // 'rjsparks'
@@ -116,137 +116,137 @@ async function main () {
   }
 
   // -> Coverage Chart
-  if (chartsDirListing.some(c => c.name === `${newRelease.id}.svg`)) {
-    console.info(`Chart SVG already exists for ${newRelease.name}, skipping...`)
-  } else {
-    console.info(`Generating chart SVG for ${newRelease.name}...`)
+  // if (chartsDirListing.some(c => c.name === `${newRelease.id}.svg`)) {
+  //   console.info(`Chart SVG already exists for ${newRelease.name}, skipping...`)
+  // } else {
+  //   console.info(`Generating chart SVG for ${newRelease.name}...`)
 
-    const { ChartJSNodeCanvas } = require('chartjs-node-canvas')
-    const chartJSNodeCanvas = new ChartJSNodeCanvas({ type: 'svg', width: 850, height: 300, backgroundColour: '#FFFFFF' })
+  //   const { ChartJSNodeCanvas } = require('chartjs-node-canvas')
+  //   const chartJSNodeCanvas = new ChartJSNodeCanvas({ type: 'svg', width: 850, height: 300, backgroundColour: '#FFFFFF' })
 
-    // -> Reorder versions
-    const versions = []
-    for (const [key, value] of Object.entries(covData)) {
-      if (isPlainObject(value)) {
-        const vRel = find(releases, r => r.tag_name === key || r.tag_name === `v${key}`)
-        if (!vRel) {
-          continue
-        }
-        versions.push({
-          tag: key,
-          time: vRel.created_at,
-          stats: {
-            code: round(value.code * 100, 2),
-            template: round(value.template * 100, 2),
-            url: round(value.url * 100, 2)
-          }
-        })
-      }
-    }
-    const roVersions = orderBy(versions, ['time', 'tag'], ['asc', 'asc'])
+  //   // -> Reorder versions
+  //   const versions = []
+  //   for (const [key, value] of Object.entries(covData)) {
+  //     if (isPlainObject(value)) {
+  //       const vRel = find(releases, r => r.tag_name === key || r.tag_name === `v${key}`)
+  //       if (!vRel) {
+  //         continue
+  //       }
+  //       versions.push({
+  //         tag: key,
+  //         time: vRel.created_at,
+  //         stats: {
+  //           code: round(value.code * 100, 2),
+  //           template: round(value.template * 100, 2),
+  //           url: round(value.url * 100, 2)
+  //         }
+  //       })
+  //     }
+  //   }
+  //   const roVersions = orderBy(versions, ['time', 'tag'], ['asc', 'asc'])
 
-    // -> Fill axis + data points
-    const labels = []
-    const datasetCode = []
-    const datasetTemplate = []
-    const datasetUrl = []
+  //   // -> Fill axis + data points
+  //   const labels = []
+  //   const datasetCode = []
+  //   const datasetTemplate = []
+  //   const datasetUrl = []
 
-    for (const ver of roVersions) {
-      labels.push(ver.tag)
-      datasetCode.push(ver.stats.code)
-      datasetTemplate.push(ver.stats.template)
-      datasetUrl.push(ver.stats.url)
-    }
+  //   for (const ver of roVersions) {
+  //     labels.push(ver.tag)
+  //     datasetCode.push(ver.stats.code)
+  //     datasetTemplate.push(ver.stats.template)
+  //     datasetUrl.push(ver.stats.url)
+  //   }
 
-    // -> Generate chart SVG
-    const outputStream = chartJSNodeCanvas.renderToBufferSync({
-      type: 'line',
-      options: {
-        borderColor: '#CCC',
-        layout: {
-          padding: 20
-        },
-        plugins: {
-          legend: {
-            position: 'bottom',
-            labels: {
-              font: {
-                size: 11
-              }
-            }
-          }
-        },
-        scales: {
-          x: {
-            ticks: {
-              font: {
-                size: 10
-              }
-            }
-          },
-          y: {
-            ticks: {
-              callback: (value) => {
-                return `${value}%`
-              },
-              font: {
-                size: 10
-              }
-            }
-          }
-        }
-      },
-      data: {
-        labels,
-        datasets: [
-          {
-            label: 'Code',
-            data: datasetCode,
-            borderWidth: 2,
-            borderColor: '#E53935',
-            backgroundColor: '#C6282833',
-            fill: false,
-            cubicInterpolationMode: 'monotone',
-            tension: 0.4,
-            pointRadius: 0
-          },
-          {
-            label: 'Templates',
-            data: datasetTemplate,
-            borderWidth: 2,
-            borderColor: '#039BE5',
-            backgroundColor: '#0277BD33',
-            fill: false,
-            cubicInterpolationMode: 'monotone',
-            tension: 0.4,
-            pointRadius: 0
-          },
-          {
-            label: 'URLs',
-            data: datasetUrl,
-            borderWidth: 2,
-            borderColor: '#7CB342',
-            backgroundColor: '#558B2F33',
-            fill: false,
-            cubicInterpolationMode: 'monotone',
-            tension: 0.4,
-            pointRadius: 0
-          }
-        ]
-      }
-    }, 'image/svg+xml')
-    const svg = Buffer.from(outputStream).toString('base64')
+  //   // -> Generate chart SVG
+  //   const outputStream = chartJSNodeCanvas.renderToBufferSync({
+  //     type: 'line',
+  //     options: {
+  //       borderColor: '#CCC',
+  //       layout: {
+  //         padding: 20
+  //       },
+  //       plugins: {
+  //         legend: {
+  //           position: 'bottom',
+  //           labels: {
+  //             font: {
+  //               size: 11
+  //             }
+  //           }
+  //         }
+  //       },
+  //       scales: {
+  //         x: {
+  //           ticks: {
+  //             font: {
+  //               size: 10
+  //             }
+  //           }
+  //         },
+  //         y: {
+  //           ticks: {
+  //             callback: (value) => {
+  //               return `${value}%`
+  //             },
+  //             font: {
+  //               size: 10
+  //             }
+  //           }
+  //         }
+  //       }
+  //     },
+  //     data: {
+  //       labels,
+  //       datasets: [
+  //         {
+  //           label: 'Code',
+  //           data: datasetCode,
+  //           borderWidth: 2,
+  //           borderColor: '#E53935',
+  //           backgroundColor: '#C6282833',
+  //           fill: false,
+  //           cubicInterpolationMode: 'monotone',
+  //           tension: 0.4,
+  //           pointRadius: 0
+  //         },
+  //         {
+  //           label: 'Templates',
+  //           data: datasetTemplate,
+  //           borderWidth: 2,
+  //           borderColor: '#039BE5',
+  //           backgroundColor: '#0277BD33',
+  //           fill: false,
+  //           cubicInterpolationMode: 'monotone',
+  //           tension: 0.4,
+  //           pointRadius: 0
+  //         },
+  //         {
+  //           label: 'URLs',
+  //           data: datasetUrl,
+  //           borderWidth: 2,
+  //           borderColor: '#7CB342',
+  //           backgroundColor: '#558B2F33',
+  //           fill: false,
+  //           cubicInterpolationMode: 'monotone',
+  //           tension: 0.4,
+  //           pointRadius: 0
+  //         }
+  //       ]
+  //     }
+  //   }, 'image/svg+xml')
+  //   const svg = Buffer.from(outputStream).toString('base64')
 
-    // -> Upload to common repo
-    console.info(`Uploading chart SVG for ${newRelease.name}...`)
-    await ghCommon.rest.repos.createOrUpdateFileContents({
-      owner,
-      repo: repoCommon,
-      path: `assets/graphs/datatracker/${newRelease.id}.svg`,
-      message: `chore: update datatracker release chart for release ${newRelease.name}`,
-      content: svg
-    })
-  }
+    // // -> Upload to common repo
+    // console.info(`Uploading chart SVG for ${newRelease.name}...`)
+    // await ghCommon.rest.repos.createOrUpdateFileContents({
+    //   owner,
+    //   repo: repoCommon,
+    //   path: `assets/graphs/datatracker/${newRelease.id}.svg`,
+    //   message: `chore: update datatracker release chart for release ${newRelease.name}`,
+    //   content: svg
+    // })
+  // }
 
   // -> Add to changelog body
   let formattedBody = ''
@@ -265,7 +265,7 @@ async function main () {
   formattedBody += `![](https://img.shields.io/badge/Code-${covInfo.code}%25-${getCoverageColor(covInfo.code)}?style=flat-square)`
   formattedBody += `![](https://img.shields.io/badge/Templates-${covInfo.template}%25-${getCoverageColor(covInfo.template)}?style=flat-square)`
   formattedBody += `![](https://img.shields.io/badge/URLs-${covInfo.url}%25-${getCoverageColor(covInfo.url)}?style=flat-square)\n\n`
-  formattedBody += `![chart](https://raw.githubusercontent.com/${owner}/${repoCommon}/main/assets/graphs/datatracker/${newRelease.id}.svg)`
+  // formattedBody += `![chart](https://raw.githubusercontent.com/${owner}/${repoCommon}/main/assets/graphs/datatracker/${newRelease.id}.svg)`
 
   core.setOutput('changelog', formattedBody)
 }
diff --git a/dev/coverage-action/package-lock.json b/dev/coverage-action/package-lock.json
index 8841a57fe2..09570ee0e4 100644
--- a/dev/coverage-action/package-lock.json
+++ b/dev/coverage-action/package-lock.json
@@ -9,4679 +9,510 @@
       "version": "1.0.0",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@actions/core": "1.9.1",
-        "@actions/github": "5.0.0",
-        "chart.js": "3.7.1",
-        "chartjs-node-canvas": "4.1.6",
+        "@actions/core": "1.11.1",
+        "@actions/github": "6.0.1",
         "lodash": "4.17.21",
-        "luxon": "2.3.1"
-      },
-      "devDependencies": {
-        "eslint": "7.32.0",
-        "eslint-config-standard": "16.0.3",
-        "eslint-plugin-import": "2.25.4",
-        "eslint-plugin-node": "11.1.0",
-        "eslint-plugin-promise": "5.2.0"
+        "luxon": "3.7.1"
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
       "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
       }
     },
-    "node_modules/@actions/core/node_modules/@actions/http-client": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
       "dependencies": {
-        "tunnel": "^0.0.6"
+        "@actions/io": "^1.0.1"
       }
     },
     "node_modules/@actions/github": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
-      "integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz",
+      "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==",
+      "license": "MIT",
       "dependencies": {
-        "@actions/http-client": "^1.0.11",
-        "@octokit/core": "^3.4.0",
-        "@octokit/plugin-paginate-rest": "^2.13.3",
-        "@octokit/plugin-rest-endpoint-methods": "^5.1.1"
+        "@actions/http-client": "^2.2.0",
+        "@octokit/core": "^5.0.1",
+        "@octokit/plugin-paginate-rest": "^9.2.2",
+        "@octokit/plugin-rest-endpoint-methods": "^10.4.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "undici": "^5.28.5"
       }
     },
     "node_modules/@actions/http-client": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
-      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz",
+      "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==",
       "dependencies": {
-        "tunnel": "0.0.6"
+        "tunnel": "^0.0.6",
+        "undici": "^5.25.4"
       }
     },
-    "node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
+    "node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q=="
     },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
+    "node_modules/@fastify/busboy": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz",
+      "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=14"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
+    "node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 18"
       }
     },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
+    "node_modules/@octokit/core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz",
+      "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.1.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 18"
       }
     },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+    "node_modules/@octokit/endpoint": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
+      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+        "node": ">= 18"
       }
     },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+    "node_modules/@octokit/graphql": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
+      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@octokit/request": "^8.4.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 18"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
+    "node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "license": "MIT"
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
+      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "license": "MIT",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "@octokit/types": "^12.6.0"
       },
       "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@mapbox/node-pre-gyp": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz",
-      "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==",
-      "dependencies": {
-        "detect-libc": "^1.0.3",
-        "https-proxy-agent": "^5.0.0",
-        "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.5",
-        "nopt": "^5.0.0",
-        "npmlog": "^5.0.1",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.11"
+        "node": ">= 18"
       },
-      "bin": {
-        "node-pre-gyp": "bin/node-pre-gyp"
-      }
-    },
-    "node_modules/@octokit/auth-token": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
-      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
-      "dependencies": {
-        "@octokit/types": "^6.0.3"
-      }
-    },
-    "node_modules/@octokit/core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
-      "dependencies": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
+      "peerDependencies": {
+        "@octokit/core": "5"
       }
     },
-    "node_modules/@octokit/endpoint": {
-      "version": "6.0.12",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
-      "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      }
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "license": "MIT"
     },
-    "node_modules/@octokit/graphql": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
-      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "license": "MIT",
       "dependencies": {
-        "@octokit/request": "^5.6.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/openapi-types": "^20.0.0"
       }
     },
-    "node_modules/@octokit/openapi-types": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="
-    },
-    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
-      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.34.0"
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
       },
       "peerDependencies": {
-        "@octokit/core": ">=2"
+        "@octokit/core": "5"
       }
     },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz",
-      "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==",
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.34.0",
-        "deprecation": "^2.3.1"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=3"
+        "@octokit/openapi-types": "^20.0.0"
       }
     },
     "node_modules/@octokit/request": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-      "dependencies": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
+      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^9.0.6",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.1.0",
         "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
-      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
+      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.0.3",
+        "@octokit/types": "^13.1.0",
         "deprecation": "^2.0.0",
         "once": "^1.4.0"
-      }
-    },
-    "node_modules/@octokit/types": {
-      "version": "6.34.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
-      "dependencies": {
-        "@octokit/openapi-types": "^11.2.0"
-      }
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dependencies": {
-        "debug": "4"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 18"
       }
     },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
+    "node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+        "@octokit/openapi-types": "^24.2.0"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "license": "Apache-2.0"
     },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "license": "ISC"
     },
-    "node_modules/aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      },
+    "node_modules/luxon": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
       "dependencies": {
-        "sprintf-js": "~1.0.2"
+        "wrappy": "1"
       }
     },
-    "node_modules/array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
-      "dev": true,
+    "node_modules/undici": {
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
+      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "@fastify/busboy": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=14.0"
       }
     },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/universal-user-agent": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "license": "ISC"
     },
-    "node_modules/balanced-match": {
+    "node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/before-after-hook": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
-      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "license": "ISC"
+    }
+  },
+  "dependencies": {
+    "@actions/core": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "requires": {
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "requires": {
+        "@actions/io": "^1.0.1"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+    "@actions/github": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz",
+      "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==",
+      "requires": {
+        "@actions/http-client": "^2.2.0",
+        "@octokit/core": "^5.0.1",
+        "@octokit/plugin-paginate-rest": "^9.2.2",
+        "@octokit/plugin-rest-endpoint-methods": "^10.4.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "undici": "^5.28.5"
       }
     },
-    "node_modules/canvas": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.9.1.tgz",
-      "integrity": "sha512-vSQti1uG/2gjv3x6QLOZw7TctfufaerTWbVe+NSduHxxLGB+qf3kFgQ6n66DSnuoINtVUjrLLIK2R+lxrBG07A==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "nan": "^2.15.0",
-        "simple-get": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=6"
+    "@actions/http-client": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz",
+      "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==",
+      "requires": {
+        "tunnel": "^0.0.6",
+        "undici": "^5.25.4"
       }
     },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
+    "@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q=="
     },
-    "node_modules/chart.js": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.1.tgz",
-      "integrity": "sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA=="
+    "@fastify/busboy": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz",
+      "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ=="
     },
-    "node_modules/chartjs-node-canvas": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/chartjs-node-canvas/-/chartjs-node-canvas-4.1.6.tgz",
-      "integrity": "sha512-UQJbPWrvqB/FoLclGA9BaLQmZbzSYlujF4w8NZd6Xzb+sqgACBb2owDX6m7ifCXLjUW5Nz0Qx0qqrTtQkkSoYw==",
-      "dependencies": {
-        "canvas": "^2.8.0",
-        "tslib": "^2.3.1"
-      },
-      "peerDependencies": {
-        "chart.js": "^3.5.1"
-      }
+    "@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA=="
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "engines": {
-        "node": ">=10"
+    "@octokit/core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz",
+      "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==",
+      "requires": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.1.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+    "@octokit/endpoint": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
+      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "requires": {
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "bin": {
-        "color-support": "bin.js"
+    "@octokit/graphql": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
+      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "requires": {
+        "@octokit/request": "^8.4.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    "@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg=="
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+    "@octokit/plugin-paginate-rest": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
+      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "requires": {
+        "@octokit/types": "^12.6.0"
       },
-      "engines": {
-        "node": ">= 8"
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "20.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+          "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA=="
+        },
+        "@octokit/types": {
+          "version": "12.6.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+          "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+          "requires": {
+            "@octokit/openapi-types": "^20.0.0"
+          }
+        }
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
+    "@octokit/plugin-rest-endpoint-methods": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "requires": {
+        "@octokit/types": "^12.6.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "20.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+          "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA=="
+        },
+        "@octokit/types": {
+          "version": "12.6.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+          "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+          "requires": {
+            "@octokit/openapi-types": "^20.0.0"
+          }
         }
       }
     },
-    "node_modules/decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "dependencies": {
-        "mimic-response": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+    "@octokit/request": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
+      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "requires": {
+        "@octokit/endpoint": "^9.0.6",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+    "@octokit/request-error": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
+      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "requires": {
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
     },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
+    "@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "requires": {
+        "@octokit/openapi-types": "^24.2.0"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    "before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
     },
-    "node_modules/deprecation": {
+    "deprecation": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
       "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
     },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    "luxon": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg=="
     },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-standard": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz",
-      "integrity": "sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peerDependencies": {
-        "eslint": "^7.12.1",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^4.2.1 || ^5.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
-      "dev": true,
-      "dependencies": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.25.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
-      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.2",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.5",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.12.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "dependencies": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=5.16.0"
-      }
-    },
-    "node_modules/eslint-plugin-node/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/eslint-plugin-node/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint-plugin-promise": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
-      "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==",
-      "dev": true,
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-      "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globals": {
-      "version": "13.13.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
-      "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/luxon": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz",
-      "integrity": "sha512-I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "node_modules/minipass": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
-      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/nan": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
-      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "dependencies": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/simple-get": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
-      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
-      "dependencies": {
-        "decompress-response": "^4.2.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/table": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-      "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-    },
-    "node_modules/tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "dependencies": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  },
-  "dependencies": {
-    "@actions/core": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz",
-      "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==",
-      "requires": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      },
-      "dependencies": {
-        "@actions/http-client": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-          "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
-          "requires": {
-            "tunnel": "^0.0.6"
-          }
-        }
-      }
-    },
-    "@actions/github": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
-      "integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
-      "requires": {
-        "@actions/http-client": "^1.0.11",
-        "@octokit/core": "^3.4.0",
-        "@octokit/plugin-paginate-rest": "^2.13.3",
-        "@octokit/plugin-rest-endpoint-methods": "^5.1.1"
-      }
-    },
-    "@actions/http-client": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
-      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
-      "requires": {
-        "tunnel": "0.0.6"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true
-    },
-    "@babel/highlight": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      }
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "@mapbox/node-pre-gyp": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz",
-      "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==",
-      "requires": {
-        "detect-libc": "^1.0.3",
-        "https-proxy-agent": "^5.0.0",
-        "make-dir": "^3.1.0",
-        "node-fetch": "^2.6.5",
-        "nopt": "^5.0.0",
-        "npmlog": "^5.0.1",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.11"
-      }
-    },
-    "@octokit/auth-token": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
-      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
-      "requires": {
-        "@octokit/types": "^6.0.3"
-      }
-    },
-    "@octokit/core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
-      "requires": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/endpoint": {
-      "version": "6.0.12",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
-      "requires": {
-        "@octokit/types": "^6.0.3",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/graphql": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
-      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
-      "requires": {
-        "@octokit/request": "^5.6.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/openapi-types": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="
-    },
-    "@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
-      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
-      "requires": {
-        "@octokit/types": "^6.34.0"
-      }
-    },
-    "@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz",
-      "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==",
-      "requires": {
-        "@octokit/types": "^6.34.0",
-        "deprecation": "^2.3.1"
-      }
-    },
-    "@octokit/request": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-      "requires": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/request-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
-      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
-      "requires": {
-        "@octokit/types": "^6.0.3",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      }
-    },
-    "@octokit/types": {
-      "version": "6.34.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
-      "requires": {
-        "@octokit/openapi-types": "^11.2.0"
-      }
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-    },
-    "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "requires": {
-        "debug": "4"
-      }
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "aproba": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
-    },
-    "are-we-there-yet": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      }
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
-      }
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "before-after-hook": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
-      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "canvas": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.9.1.tgz",
-      "integrity": "sha512-vSQti1uG/2gjv3x6QLOZw7TctfufaerTWbVe+NSduHxxLGB+qf3kFgQ6n66DSnuoINtVUjrLLIK2R+lxrBG07A==",
-      "requires": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "nan": "^2.15.0",
-        "simple-get": "^3.0.3"
-      }
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "chart.js": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.7.1.tgz",
-      "integrity": "sha512-8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA=="
-    },
-    "chartjs-node-canvas": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/chartjs-node-canvas/-/chartjs-node-canvas-4.1.6.tgz",
-      "integrity": "sha512-UQJbPWrvqB/FoLclGA9BaLQmZbzSYlujF4w8NZd6Xzb+sqgACBb2owDX6m7ifCXLjUW5Nz0Qx0qqrTtQkkSoYw==",
-      "requires": {
-        "canvas": "^2.8.0",
-        "tslib": "^2.3.1"
-      }
-    },
-    "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-      "requires": {
-        "mimic-response": "^2.0.0"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
-    },
-    "deprecation": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
-    },
-    "detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^4.1.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true
-    },
-    "eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      }
-    },
-    "eslint-config-standard": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz",
-      "integrity": "sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
-      "dev": true,
-      "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.25.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
-      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.2",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.5",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.12.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "requires": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-promise": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
-      "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true
-    },
-    "espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        }
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "requires": {
-        "locate-path": "^2.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-      "requires": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
-      }
-    },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "globals": {
-      "version": "13.13.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz",
-      "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
-    },
-    "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true
-    },
-    "is-core-module": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true
-    },
-    "is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "luxon": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz",
-      "integrity": "sha512-I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "requires": {
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "minipass": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
-      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      }
-    },
-    "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "nan": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
-      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "requires": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
-      }
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "requires": {
-        "p-try": "^1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "requires": {
-        "p-limit": "^1.1.0"
-      }
-    },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true
-    },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
-    },
-    "simple-get": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
-      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
-      "requires": {
-        "decompress-response": "^4.2.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
-    },
-    "slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "table": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-      "dev": true,
-      "requires": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        }
-      }
-    },
-    "tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
-      "requires": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-    },
     "tunnel": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
       "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
     },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true
-    },
-    "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
+    "undici": {
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
+      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
+        "@fastify/busboy": "^2.0.0"
       }
     },
     "universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
-    "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "wide-align": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-      "requires": {
-        "string-width": "^1.0.2 || 2 || 3 || 4"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ=="
     },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     }
   }
 }
diff --git a/dev/coverage-action/package.json b/dev/coverage-action/package.json
index 9e7417fe65..3f72b78028 100644
--- a/dev/coverage-action/package.json
+++ b/dev/coverage-action/package.json
@@ -6,18 +6,9 @@
   "author": "IETF Trust",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@actions/core": "1.9.1",
-    "@actions/github": "5.0.0",
-    "chart.js": "3.7.1",
-    "chartjs-node-canvas": "4.1.6",
+    "@actions/core": "1.11.1",
+    "@actions/github": "6.0.1",
     "lodash": "4.17.21",
-    "luxon": "2.3.1"
-  },
-  "devDependencies": {
-    "eslint": "7.32.0",
-    "eslint-config-standard": "16.0.3",
-    "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "5.2.0"
+    "luxon": "3.7.1"
   }
 }
diff --git a/dev/del-old-packages/README.md b/dev/del-old-packages/README.md
new file mode 100644
index 0000000000..5f8f88e09e
--- /dev/null
+++ b/dev/del-old-packages/README.md
@@ -0,0 +1,15 @@
+## Tool to delete old versions in GitHub Packages container registry
+
+This tool will fetch all versions for packages `datatracker-db` and `datatracker-db-pg` and delete all versions that are not latest and older than 7 days.
+
+### Requirements
+
+- Node 18.x or later
+- Must provide a valid token in ENV variable `GITHUB_TOKEN` with read and delete packages permissions.
+
+### Usage
+
+```sh
+npm install
+node index
+```
\ No newline at end of file
diff --git a/dev/del-old-packages/index.js b/dev/del-old-packages/index.js
new file mode 100644
index 0000000000..ff5ab649a2
--- /dev/null
+++ b/dev/del-old-packages/index.js
@@ -0,0 +1,54 @@
+import { Octokit } from '@octokit/core'
+import { setTimeout } from 'node:timers/promises'
+import { DateTime } from 'luxon'
+
+const octokit = new Octokit({
+  auth: process.env.GITHUB_TOKEN
+})
+
+const oldestDate = DateTime.utc().minus({ days: 7 })
+
+for (const pkgName of ['datatracker-db']) {
+  let hasMore = true
+  let currentPage = 1
+
+  while (hasMore) {
+    try {
+      console.info(`Fetching page ${currentPage}...`)
+      const versions = await octokit.request('GET /orgs/{org}/packages/{package_type}/{package_name}/versions{?page,per_page,state}', {
+        package_type: 'container',
+        package_name: pkgName,
+        org: 'ietf-tools',
+        page: currentPage,
+        per_page: 100
+      })
+      if (versions?.data?.length > 0) {
+        for (const ver of versions?.data) {
+          const verDate = DateTime.fromISO(ver.created_at)
+          if (ver?.metadata?.container?.tags?.includes('latest') || ver?.metadata?.container?.tags?.includes('latest-arm64') || ver?.metadata?.container?.tags?.includes('latest-x64')) {
+            console.info(`Latest package (${ver.id})... Skipping...`)
+          } else if (verDate > oldestDate) {
+            console.info(`Recent package (${ver.id}, ${verDate.toRelative()})... Skipping...`)
+          } else {
+            console.info(`Deleting package version ${ver.id}...`)
+            await octokit.request('DELETE /orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}', {
+              package_type: 'container',
+              package_name: pkgName,
+              org: 'ietf-tools',
+              package_version_id: ver.id
+            })
+            await setTimeout(250)
+          }
+        }
+        currentPage++
+        hasMore = true
+      } else {
+        hasMore = false
+        console.info('No more versions for this package.')
+      }
+    } catch (err) {
+      console.error(err)
+      hasMore = false
+    }
+  }
+}
diff --git a/dev/del-old-packages/package-lock.json b/dev/del-old-packages/package-lock.json
new file mode 100644
index 0000000000..9899b290fb
--- /dev/null
+++ b/dev/del-old-packages/package-lock.json
@@ -0,0 +1,368 @@
+{
+  "name": "del-packages",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "del-packages",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@octokit/core": "^4.2.4",
+        "luxon": "^3.4.4"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.2.tgz",
+      "integrity": "sha512-pq7CwIMV1kmzkFTimdwjAINCXKTajZErLB4wMLYapR2nuB/Jpr66+05wOTZMSCBXP6n4DdDWT2W19Bm17vU69Q==",
+      "dependencies": {
+        "@octokit/types": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz",
+      "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==",
+      "dependencies": {
+        "@octokit/auth-token": "^3.0.0",
+        "@octokit/graphql": "^5.0.0",
+        "@octokit/request": "^6.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^9.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.3.tgz",
+      "integrity": "sha512-57gRlb28bwTsdNXq+O3JTQ7ERmBTuik9+LelgcLIVfYwf235VHbN9QNo4kXExtp/h8T423cR5iJThKtFYxC7Lw==",
+      "dependencies": {
+        "@octokit/types": "^8.0.0",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.4.tgz",
+      "integrity": "sha512-amO1M5QUQgYQo09aStR/XO7KAl13xpigcy/kI8/N1PnZYSS69fgte+xA4+c2DISKqUZfsh0wwjc2FaCt99L41A==",
+      "dependencies": {
+        "@octokit/request": "^6.0.0",
+        "@octokit/types": "^8.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz",
+      "integrity": "sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="
+    },
+    "node_modules/@octokit/request": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.2.tgz",
+      "integrity": "sha512-6VDqgj0HMc2FUX2awIs+sM6OwLgwHvAi4KCK3mT2H2IKRt6oH9d0fej5LluF5mck1lRR/rFWN0YIDSYXYSylbw==",
+      "dependencies": {
+        "@octokit/endpoint": "^7.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^8.0.0",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.2.tgz",
+      "integrity": "sha512-WMNOFYrSaX8zXWoJg9u/pKgWPo94JXilMLb2VManNOby9EZxrQaBe/QSC4a1TzpAlpxofg2X/jMnCyZgL6y7eg==",
+      "dependencies": {
+        "@octokit/types": "^8.0.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-8.1.0.tgz",
+      "integrity": "sha512-N4nLjzkiWBqVQqljTTsCrbvHGoWdWfcCeZjbHdggw7a9HbJMnxbK8A+UWdqwR4out30JarlSa3eqKyVK0n5aBg==",
+      "dependencies": {
+        "@octokit/openapi-types": "^14.0.0"
+      }
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/luxon": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
+      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    }
+  },
+  "dependencies": {
+    "@octokit/auth-token": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.2.tgz",
+      "integrity": "sha512-pq7CwIMV1kmzkFTimdwjAINCXKTajZErLB4wMLYapR2nuB/Jpr66+05wOTZMSCBXP6n4DdDWT2W19Bm17vU69Q==",
+      "requires": {
+        "@octokit/types": "^8.0.0"
+      }
+    },
+    "@octokit/core": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz",
+      "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==",
+      "requires": {
+        "@octokit/auth-token": "^3.0.0",
+        "@octokit/graphql": "^5.0.0",
+        "@octokit/request": "^6.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^9.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
+      }
+    },
+    "@octokit/endpoint": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.3.tgz",
+      "integrity": "sha512-57gRlb28bwTsdNXq+O3JTQ7ERmBTuik9+LelgcLIVfYwf235VHbN9QNo4kXExtp/h8T423cR5iJThKtFYxC7Lw==",
+      "requires": {
+        "@octokit/types": "^8.0.0",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/graphql": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.4.tgz",
+      "integrity": "sha512-amO1M5QUQgYQo09aStR/XO7KAl13xpigcy/kI8/N1PnZYSS69fgte+xA4+c2DISKqUZfsh0wwjc2FaCt99L41A==",
+      "requires": {
+        "@octokit/request": "^6.0.0",
+        "@octokit/types": "^8.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/openapi-types": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz",
+      "integrity": "sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="
+    },
+    "@octokit/request": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.2.tgz",
+      "integrity": "sha512-6VDqgj0HMc2FUX2awIs+sM6OwLgwHvAi4KCK3mT2H2IKRt6oH9d0fej5LluF5mck1lRR/rFWN0YIDSYXYSylbw==",
+      "requires": {
+        "@octokit/endpoint": "^7.0.0",
+        "@octokit/request-error": "^3.0.0",
+        "@octokit/types": "^8.0.0",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/request-error": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.2.tgz",
+      "integrity": "sha512-WMNOFYrSaX8zXWoJg9u/pKgWPo94JXilMLb2VManNOby9EZxrQaBe/QSC4a1TzpAlpxofg2X/jMnCyZgL6y7eg==",
+      "requires": {
+        "@octokit/types": "^8.0.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "@octokit/types": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-8.1.0.tgz",
+      "integrity": "sha512-N4nLjzkiWBqVQqljTTsCrbvHGoWdWfcCeZjbHdggw7a9HbJMnxbK8A+UWdqwR4out30JarlSa3eqKyVK0n5aBg==",
+      "requires": {
+        "@octokit/openapi-types": "^14.0.0"
+      }
+    },
+    "before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ=="
+    },
+    "deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
+    },
+    "is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+    },
+    "luxon": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
+      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA=="
+    },
+    "node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    }
+  }
+}
diff --git a/dev/del-old-packages/package.json b/dev/del-old-packages/package.json
new file mode 100644
index 0000000000..c0b57b7f7b
--- /dev/null
+++ b/dev/del-old-packages/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "del-packages",
+  "version": "1.0.0",
+  "description": "",
+  "type": "module",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@octokit/core": "^4.2.4",
+    "luxon": "^3.4.4"
+  }
+}
diff --git a/dev/deploy-to-container/.editorconfig b/dev/deploy-to-container/.editorconfig
new file mode 100644
index 0000000000..fec5c66519
--- /dev/null
+++ b/dev/deploy-to-container/.editorconfig
@@ -0,0 +1,7 @@
+[*]
+indent_size = 2
+indent_style = space
+charset = utf-8
+trim_trailing_whitespace = false
+end_of_line = lf
+insert_final_newline = true
diff --git a/dev/deploy-to-container/.gitignore b/dev/deploy-to-container/.gitignore
new file mode 100644
index 0000000000..07e6e472cc
--- /dev/null
+++ b/dev/deploy-to-container/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/dev/deploy-to-container/.npmrc b/dev/deploy-to-container/.npmrc
new file mode 100644
index 0000000000..580a68c499
--- /dev/null
+++ b/dev/deploy-to-container/.npmrc
@@ -0,0 +1,3 @@
+audit = false
+fund = false
+save-exact = true
diff --git a/dev/deploy-to-container/README.md b/dev/deploy-to-container/README.md
new file mode 100644
index 0000000000..35f7b56f84
--- /dev/null
+++ b/dev/deploy-to-container/README.md
@@ -0,0 +1,22 @@
+# Datatracker Deploy to Container Tool
+
+This tool takes a release.tar.gz build file and deploys it as a container, along with its own database container.
+
+## Requirements
+
+- Node `16.x` or later
+- Docker
+
+## Usage
+
+1. From the `dev/deploy-to-container` directory, run the command:
+```sh
+npm install
+```
+2. Make sure you have a `release.tar.gz` tarball in the project root directory.
+3. From the project root directory (back up 2 levels), run the command: (replacing the `branch` and `domain` arguments)
+```sh
+node ./dev/deploy-to-container/cli.js --branch main --domain something.com
+```
+
+A container named `dt-app-BRANCH` and `dt-db-BRANCH` (where BRANCH is the argument provided above) will be created.
diff --git a/dev/deploy-to-container/cli.js b/dev/deploy-to-container/cli.js
new file mode 100644
index 0000000000..1a2d993ac4
--- /dev/null
+++ b/dev/deploy-to-container/cli.js
@@ -0,0 +1,308 @@
+#!/usr/bin/env node
+
+import Docker from 'dockerode'
+import path from 'path'
+import fs from 'fs-extra'
+import * as tar from 'tar'
+import yargs from 'yargs/yargs'
+import { hideBin } from 'yargs/helpers'
+import slugify from 'slugify'
+import { nanoid, customAlphabet } from 'nanoid'
+import { alphanumeric } from 'nanoid-dictionary'
+
+const nanoidAlphaNum = customAlphabet(alphanumeric, 16)
+
+async function main () {
+  const basePath = process.cwd()
+  const releasePath = path.join(basePath, 'release')
+  const argv = yargs(hideBin(process.argv)).argv
+
+  // Parse branch argument
+  let branch = argv.branch
+  if (!branch) {
+    throw new Error('Missing --branch argument!')
+  }
+  if (branch.indexOf('/') >= 0) {
+    branch = branch.split('/').slice(1).join('-')
+  }
+  branch = slugify(branch, { lower: true, strict: true })
+  if (branch.length < 1) {
+    throw new Error('Branch name is empty!')
+  }
+  console.info(`Will use branch name "${branch}"`)
+
+  // Parse domain argument
+  const domain = argv.domain
+  if (!domain) {
+    throw new Error('Missing --domain argument!')
+  }
+  const hostname = `dt-${branch}.${domain}`
+  console.info(`Will use hostname "${hostname}"`)
+
+  // Connect to Docker Engine API
+  console.info('Connecting to Docker Engine API...')
+  const dock = new Docker()
+  await dock.ping()
+  console.info('Connected to Docker Engine API.')
+
+  // Extract release artifact
+  console.info('Extracting release artifact...')
+  if (!(await fs.pathExists(path.join(basePath, 'release.tar.gz')))) {
+    throw new Error('Missing release.tar.gz file!')
+  }
+  await fs.emptyDir(releasePath)
+  await tar.x({
+    cwd: releasePath,
+    file: 'release.tar.gz'
+  })
+  console.info('Extracted release artifact successfully.')
+
+  // Update the settings_local.py file
+  console.info('Setting configuration files...')
+  const mqKey = nanoidAlphaNum()
+  const settingsPath = path.join(releasePath, 'ietf/settings_local.py')
+  const cfgRaw = await fs.readFile(path.join(basePath, 'dev/deploy-to-container/settings_local.py'), 'utf8')
+  await fs.outputFile(settingsPath,
+    cfgRaw
+      .replace('__DBHOST__', `dt-db-${branch}`)
+      .replace('__SECRETKEY__', nanoid(36))
+      .replace('__MQCONNSTR__', `amqp://datatracker:${mqKey}@dt-mq-${branch}/dt`)
+      .replace('__HOSTNAME__', hostname)
+  )
+  await fs.copy(path.join(basePath, 'docker/scripts/app-create-dirs.sh'), path.join(releasePath, 'app-create-dirs.sh'))
+  await fs.copy(path.join(basePath, 'docker/scripts/app-init-celery.sh'), path.join(releasePath, 'app-init-celery.sh'))
+  await fs.copy(path.join(basePath, 'dev/deploy-to-container/start.sh'), path.join(releasePath, 'start.sh'))
+  await fs.copy(path.join(basePath, 'test/data'), path.join(releasePath, 'test/data'))
+  console.info('Updated configuration files.')
+
+  // Pull latest DB image
+  console.info('Pulling latest DB docker image...')
+  const dbImagePullStream = await dock.pull('ghcr.io/ietf-tools/datatracker-db:latest')
+  await new Promise((resolve, reject) => {
+    dock.modem.followProgress(dbImagePullStream, (err, res) => err ? reject(err) : resolve(res))
+  })
+  console.info('Pulled latest DB docker image successfully.')
+  
+  // Pull latest Datatracker Base image
+  console.info('Pulling latest Datatracker base docker image...')
+  const appImagePullStream = await dock.pull('ghcr.io/ietf-tools/datatracker-app-base:latest')
+  await new Promise((resolve, reject) => {
+    dock.modem.followProgress(appImagePullStream, (err, res) => err ? reject(err) : resolve(res))
+  })
+  console.info('Pulled latest Datatracker base docker image.')
+
+  // Pull latest MQ image
+  console.info('Pulling latest MQ docker image...')
+  const mqImagePullStream = await dock.pull('ghcr.io/ietf-tools/datatracker-mq:latest')
+  await new Promise((resolve, reject) => {
+    dock.modem.followProgress(mqImagePullStream, (err, res) => err ? reject(err) : resolve(res))
+  })
+  console.info('Pulled latest MQ docker image.')
+
+  // Terminate existing containers
+  console.info('Ensuring existing containers with same name are terminated...')
+  const containers = await dock.listContainers({ all: true })
+  for (const container of containers) {
+    if (
+      container.Names.includes(`/dt-db-${branch}`) ||
+      container.Names.includes(`/dt-app-${branch}`) ||
+      container.Names.includes(`/dt-mq-${branch}`) ||
+      container.Names.includes(`/dt-celery-${branch}`) ||
+      container.Names.includes(`/dt-beat-${branch}`)
+      ) {
+      console.info(`Terminating old container ${container.Id}...`)
+      const oldContainer = dock.getContainer(container.Id)
+      if (container.State === 'running') {
+        await oldContainer.stop({ t: 5 })
+      }
+      await oldContainer.remove({
+        force: true,
+        v: true
+      })
+    }
+  }
+  console.info('Existing containers with same name have been terminated.')
+
+  // Get shared docker network
+  console.info('Querying shared docker network...')
+  const networks = await dock.listNetworks()
+  if (!networks.some(n => n.Name === 'shared')) {
+    console.info('No shared docker network found, creating a new one...')
+    await dock.createNetwork({
+      Name: 'shared',
+      CheckDuplicate: true
+    })
+    console.info('Created shared docker network successfully.')
+  } else {
+    console.info('Existing shared docker network found.')
+  }
+
+  // Get assets docker volume
+  console.info('Querying assets docker volume...')
+  const assetsVolume = await dock.getVolume('dt-assets')
+  if (!assetsVolume) {
+    console.info('No assets docker volume found, creating a new one...')
+    await dock.createVolume({
+      Name: 'dt-assets'
+    })
+    console.info('Created assets docker volume successfully.')
+  } else {
+    console.info('Existing assets docker volume found.')
+  }
+  
+  // Get shared test docker volume
+  console.info('Querying shared test docker volume...')
+  try {
+    const testVolume = await dock.getVolume(`dt-test-${branch}`)
+    console.info('Attempting to delete any existing shared test docker volume...')
+    await testVolume.remove({ force: true })
+  } catch (err) {}
+  console.info('Creating new shared test docker volume...')
+  await dock.createVolume({
+    Name: `dt-test-${branch}`
+  })
+  console.info('Created shared test docker volume successfully.')
+
+  // Create DB container
+  console.info(`Creating DB docker container... [dt-db-${branch}]`)
+  const dbContainer = await dock.createContainer({
+    Image: 'ghcr.io/ietf-tools/datatracker-db:latest',
+    name: `dt-db-${branch}`,
+    Hostname: `dt-db-${branch}`,
+    Labels: {
+      ...argv.nodbrefresh === 'true' && { nodbrefresh: '1' }
+    },
+    HostConfig: {
+      NetworkMode: 'shared',
+      RestartPolicy: {
+        Name: 'unless-stopped'
+      }
+    }
+  })
+  await dbContainer.start()
+  console.info('Created and started DB docker container successfully.')
+
+  // Create MQ container
+  console.info(`Creating MQ docker container... [dt-mq-${branch}]`)
+  const mqContainer = await dock.createContainer({
+    Image: 'ghcr.io/ietf-tools/datatracker-mq:latest',
+    name: `dt-mq-${branch}`,
+    Hostname: `dt-mq-${branch}`,
+    Env: [
+      `CELERY_PASSWORD=${mqKey}`
+    ],
+    Labels: {
+      ...argv.nodbrefresh === 'true' && { nodbrefresh: '1' }
+    },
+    HostConfig: {
+      Memory: 4 * (1024 ** 3), // in bytes
+      NetworkMode: 'shared',
+      RestartPolicy: {
+        Name: 'unless-stopped'
+      }
+    }
+  })
+  await mqContainer.start()
+  console.info('Created and started MQ docker container successfully.')
+
+  // Create Celery containers
+  console.info(`Creating Celery docker containers... [dt-celery-${branch}, dt-beat-${branch}]`)
+  const conConfs = [
+    { name: 'celery', role: 'worker' },
+    { name: 'beat', role: 'beat' }
+  ]
+  const celeryContainers = {}
+  for (const conConf of conConfs) {
+    celeryContainers[conConf.name] = await dock.createContainer({
+      Image: 'ghcr.io/ietf-tools/datatracker-app-base:latest',
+      name: `dt-${conConf.name}-${branch}`,
+      Hostname: `dt-${conConf.name}-${branch}`,
+      Env: [
+        'CELERY_APP=ietf',
+        `CELERY_ROLE=${conConf.role}`,
+        'UPDATE_REQUIREMENTS_FROM=requirements.txt'
+      ],
+      Labels: {
+        ...argv.nodbrefresh === 'true' && { nodbrefresh: '1' }
+      },
+      HostConfig: {
+        Binds: [
+          'dt-assets:/assets',
+          `dt-test-${branch}:/test`
+        ],
+        Init: true,
+        NetworkMode: 'shared',
+        RestartPolicy: {
+          Name: 'unless-stopped'
+        }
+      },
+      Entrypoint: ['bash', '-c', 'chmod +x ./app-init-celery.sh && ./app-init-celery.sh']
+    })
+  }
+  console.info('Created Celery docker containers successfully.')
+
+  // Create Datatracker container
+  console.info(`Creating Datatracker docker container... [dt-app-${branch}]`)
+  const appContainer = await dock.createContainer({
+    Image: 'ghcr.io/ietf-tools/datatracker-app-base:latest',
+    name: `dt-app-${branch}`,
+    Hostname: `dt-app-${branch}`,
+    Env: [
+      // `LETSENCRYPT_HOST=${hostname}`,
+      `VIRTUAL_HOST=${hostname}`,
+      `VIRTUAL_PORT=8000`,
+      `PGHOST=dt-db-${branch}`
+    ],
+    Labels: {
+      appversion: `${argv.appversion}` ?? '0.0.0',
+      commit: `${argv.commit}` ?? 'unknown',
+      ghrunid: `${argv.ghrunid}` ?? '0',
+      hostname,
+      ...argv.nodbrefresh === 'true' && { nodbrefresh: '1' }
+    },
+    HostConfig: {
+      Binds: [
+        'dt-assets:/assets',
+        `dt-test-${branch}:/test`
+      ],
+      NetworkMode: 'shared',
+      RestartPolicy: {
+        Name: 'unless-stopped'
+      }
+    },
+    Entrypoint: ['bash', '-c', 'chmod +x ./start.sh && ./start.sh']
+  })
+  console.info(`Created Datatracker docker container successfully.`)
+
+  // Inject updated release into container
+  console.info('Building updated release tarball to inject into containers...')
+  const tgzPath = path.join(basePath, 'import.tgz')
+  await tar.c({
+    gzip: true,
+    file: tgzPath,
+    cwd: releasePath,
+    filter (path) {
+      if (path.includes('.git') || path.includes('node_modules')) { return false }
+      return true
+    }
+  }, ['.'])
+  console.info('Injecting archive into Datatracker + Celery docker containers...')
+  await celeryContainers.celery.putArchive(tgzPath, { path: '/workspace' })
+  await celeryContainers.beat.putArchive(tgzPath, { path: '/workspace' })
+  await appContainer.putArchive(tgzPath, { path: '/workspace' })
+  await fs.remove(tgzPath)
+  console.info(`Imported working files into Datatracker + Celery docker containers successfully.`)
+
+  console.info('Starting Celery containers...')
+  await celeryContainers.celery.start()
+  await celeryContainers.beat.start()
+  console.info('Celery containers started successfully.')
+
+  console.info('Starting Datatracker container...')
+  await appContainer.start()
+  console.info('Datatracker container started successfully.')
+
+  process.exit(0)
+}
+
+main()
diff --git a/dev/deploy-to-container/package-lock.json b/dev/deploy-to-container/package-lock.json
new file mode 100644
index 0000000000..5d5bef5604
--- /dev/null
+++ b/dev/deploy-to-container/package-lock.json
@@ -0,0 +1,1355 @@
+{
+  "name": "deploy-to-container",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "deploy-to-container",
+      "dependencies": {
+        "dockerode": "^4.0.10",
+        "fs-extra": "^11.3.4",
+        "nanoid": "5.1.7",
+        "nanoid-dictionary": "5.0.0",
+        "slugify": "1.6.9",
+        "tar": "^7.5.13",
+        "yargs": "^17.7.2"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@balena/dockerignore": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
+      "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q=="
+    },
+    "node_modules/@grpc/grpc-js": {
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz",
+      "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==",
+      "dependencies": {
+        "@grpc/proto-loader": "^0.7.13",
+        "@js-sdsl/ordered-map": "^4.4.2"
+      },
+      "engines": {
+        "node": ">=12.10.0"
+      }
+    },
+    "node_modules/@grpc/proto-loader": {
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+      "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
+      "dependencies": {
+        "lodash.camelcase": "^4.3.0",
+        "long": "^5.0.0",
+        "protobufjs": "^7.2.5",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@js-sdsl/ordered-map": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+    },
+    "node_modules/@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "node_modules/@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "node_modules/@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+    },
+    "node_modules/@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "node_modules/@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+    },
+    "node_modules/@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+    },
+    "node_modules/@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+    },
+    "node_modules/@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+    },
+    "node_modules/@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+    },
+    "node_modules/@types/node": {
+      "version": "22.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
+      "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buildcheck": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.7.tgz",
+      "integrity": "sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==",
+      "optional": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/cpu-features": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
+      "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "buildcheck": "~0.0.6",
+        "nan": "^2.19.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/docker-modem": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.7.tgz",
+      "integrity": "sha512-XJgGhoR/CLpqshm4d3L7rzH6t8NgDFUIIpztYlLHIApeJjMZKYJMz2zxPsYxnejq5h3ELYSw/RBsi3t5h7gNTA==",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "readable-stream": "^3.5.0",
+        "split-ca": "^1.0.1",
+        "ssh2": "^1.15.0"
+      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
+    "node_modules/dockerode": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.10.tgz",
+      "integrity": "sha512-8L/P9JynLBiG7/coiA4FlQXegHltRqS0a+KqI44P1zgQh8QLHTg7FKOwhkBgSJwZTeHsq30WRoVFLuwkfK0YFg==",
+      "dependencies": {
+        "@balena/dockerignore": "^1.0.2",
+        "@grpc/grpc-js": "^1.11.1",
+        "@grpc/proto-loader": "^0.7.13",
+        "docker-modem": "^5.0.7",
+        "protobufjs": "^7.3.2",
+        "tar-fs": "^2.1.4",
+        "uuid": "^10.0.0"
+      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+    "node_modules/fs-extra": {
+      "version": "11.3.4",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
+      "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
+    },
+    "node_modules/long": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz",
+      "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg=="
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/nan": {
+      "version": "2.26.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
+      "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
+      "optional": true
+    },
+    "node_modules/nanoid": {
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.7.tgz",
+      "integrity": "sha512-ua3NDgISf6jdwezAheMOk4mbE1LXjm1DfMUDMuJf4AqxLFK3ccGpgWizwa5YV7Yz9EpXwEaWoRXSb/BnV0t5dQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.js"
+      },
+      "engines": {
+        "node": "^18 || >=20"
+      }
+    },
+    "node_modules/nanoid-dictionary": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nanoid-dictionary/-/nanoid-dictionary-5.0.0.tgz",
+      "integrity": "sha512-/iCyQHwt36XkaIvSE9fcC8p6DiMPCZMTSMj9UT56Cv6T7f5CuxvOMhpNncaNieQ4z4d32p7ruEtAfRsb7Ya8Gw==",
+      "license": "MIT"
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/protobufjs": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
+      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
+      "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/slugify": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.9.tgz",
+      "integrity": "sha512-vZ7rfeehZui7wQs438JXBckYLkIIdfHOXsaVEUMyS5fHo1483l1bMdo0EDSWYclY0yZKFOipDy4KHuKs6ssvdg==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/split-ca": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz",
+      "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ=="
+    },
+    "node_modules/ssh2": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.17.0.tgz",
+      "integrity": "sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "asn1": "^0.2.6",
+        "bcrypt-pbkdf": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=10.16.0"
+      },
+      "optionalDependencies": {
+        "cpu-features": "~0.0.10",
+        "nan": "^2.23.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar": {
+      "version": "7.5.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz",
+      "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==",
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.1.0",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+    },
+    "node_modules/undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "engines": {
+        "node": ">=12"
+      }
+    }
+  },
+  "dependencies": {
+    "@balena/dockerignore": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
+      "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q=="
+    },
+    "@grpc/grpc-js": {
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz",
+      "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==",
+      "requires": {
+        "@grpc/proto-loader": "^0.7.13",
+        "@js-sdsl/ordered-map": "^4.4.2"
+      }
+    },
+    "@grpc/proto-loader": {
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+      "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
+      "requires": {
+        "lodash.camelcase": "^4.3.0",
+        "long": "^5.0.0",
+        "protobufjs": "^7.2.5",
+        "yargs": "^17.7.2"
+      }
+    },
+    "@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "requires": {
+        "minipass": "^7.0.4"
+      }
+    },
+    "@js-sdsl/ordered-map": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw=="
+    },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+    },
+    "@types/node": {
+      "version": "22.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
+      "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
+      "requires": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buildcheck": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.7.tgz",
+      "integrity": "sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==",
+      "optional": true
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "cpu-features": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
+      "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
+      "optional": true,
+      "requires": {
+        "buildcheck": "~0.0.6",
+        "nan": "^2.19.0"
+      }
+    },
+    "debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "requires": {
+        "ms": "^2.1.3"
+      }
+    },
+    "docker-modem": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.7.tgz",
+      "integrity": "sha512-XJgGhoR/CLpqshm4d3L7rzH6t8NgDFUIIpztYlLHIApeJjMZKYJMz2zxPsYxnejq5h3ELYSw/RBsi3t5h7gNTA==",
+      "requires": {
+        "debug": "^4.1.1",
+        "readable-stream": "^3.5.0",
+        "split-ca": "^1.0.1",
+        "ssh2": "^1.15.0"
+      }
+    },
+    "dockerode": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.10.tgz",
+      "integrity": "sha512-8L/P9JynLBiG7/coiA4FlQXegHltRqS0a+KqI44P1zgQh8QLHTg7FKOwhkBgSJwZTeHsq30WRoVFLuwkfK0YFg==",
+      "requires": {
+        "@balena/dockerignore": "^1.0.2",
+        "@grpc/grpc-js": "^1.11.1",
+        "@grpc/proto-loader": "^0.7.13",
+        "docker-modem": "^5.0.7",
+        "protobufjs": "^7.3.2",
+        "tar-fs": "^2.1.4",
+        "uuid": "^10.0.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "end-of-stream": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+    "fs-extra": {
+      "version": "11.3.4",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
+      "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      }
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+    },
+    "graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+    },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
+      }
+    },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
+    },
+    "long": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz",
+      "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg=="
+    },
+    "minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="
+    },
+    "minizlib": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
+      "requires": {
+        "minipass": "^7.1.2"
+      }
+    },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "nan": {
+      "version": "2.26.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
+      "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
+      "optional": true
+    },
+    "nanoid": {
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.7.tgz",
+      "integrity": "sha512-ua3NDgISf6jdwezAheMOk4mbE1LXjm1DfMUDMuJf4AqxLFK3ccGpgWizwa5YV7Yz9EpXwEaWoRXSb/BnV0t5dQ=="
+    },
+    "nanoid-dictionary": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nanoid-dictionary/-/nanoid-dictionary-5.0.0.tgz",
+      "integrity": "sha512-/iCyQHwt36XkaIvSE9fcC8p6DiMPCZMTSMj9UT56Cv6T7f5CuxvOMhpNncaNieQ4z4d32p7ruEtAfRsb7Ya8Gw=="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "protobufjs": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
+      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      }
+    },
+    "pump": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
+      "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "slugify": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.9.tgz",
+      "integrity": "sha512-vZ7rfeehZui7wQs438JXBckYLkIIdfHOXsaVEUMyS5fHo1483l1bMdo0EDSWYclY0yZKFOipDy4KHuKs6ssvdg=="
+    },
+    "split-ca": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz",
+      "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ=="
+    },
+    "ssh2": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.17.0.tgz",
+      "integrity": "sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==",
+      "requires": {
+        "asn1": "^0.2.6",
+        "bcrypt-pbkdf": "^1.0.2",
+        "cpu-features": "~0.0.10",
+        "nan": "^2.23.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "tar": {
+      "version": "7.5.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz",
+      "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==",
+      "requires": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.1.0",
+        "yallist": "^5.0.0"
+      },
+      "dependencies": {
+        "chownr": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+          "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="
+        }
+      }
+    },
+    "tar-fs": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
+      "requires": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "requires": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+    },
+    "undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
+    },
+    "universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ=="
+    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+    },
+    "yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="
+    },
+    "yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "requires": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      }
+    },
+    "yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+    }
+  }
+}
diff --git a/dev/deploy-to-container/package.json b/dev/deploy-to-container/package.json
new file mode 100644
index 0000000000..ccc78fc63b
--- /dev/null
+++ b/dev/deploy-to-container/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "deploy-to-container",
+  "type": "module",
+  "dependencies": {
+    "dockerode": "^4.0.10",
+    "fs-extra": "^11.3.4",
+    "nanoid": "5.1.7",
+    "nanoid-dictionary": "5.0.0",
+    "slugify": "1.6.9",
+    "tar": "^7.5.13",
+    "yargs": "^17.7.2"
+  },
+  "engines": {
+    "node": ">=16"
+  }
+}
diff --git a/dev/deploy-to-container/refresh.js b/dev/deploy-to-container/refresh.js
new file mode 100644
index 0000000000..7ea13c885a
--- /dev/null
+++ b/dev/deploy-to-container/refresh.js
@@ -0,0 +1,84 @@
+#!/usr/bin/env node
+
+import Docker from 'dockerode'
+
+async function main () {
+  // Connect to Docker Engine API
+  console.info('Connecting to Docker Engine API...')
+  const dock = new Docker()
+  await dock.ping()
+  console.info('Connected to Docker Engine API.')
+
+  // Pull latest DB image
+  console.info('Pulling latest DB docker image...')
+  const dbImagePullStream = await dock.pull('ghcr.io/ietf-tools/datatracker-db:latest')
+  await new Promise((resolve, reject) => {
+    dock.modem.followProgress(dbImagePullStream, (err, res) => err ? reject(err) : resolve(res))
+  })
+  console.info('Pulled latest DB docker image successfully.')
+
+  // Terminate existing containers
+  console.info('Terminating DB containers and stopping app containers...')
+  const containers = await dock.listContainers({ all: true })
+  const dbContainersToCreate = []
+  const containersToRestart = []
+  for (const container of containers) {
+    if (
+      container.Names.some(n => n.startsWith('/dt-db-')) &&
+      container.Labels?.nodbrefresh !== '1'
+      ) {
+      console.info(`Terminating DB container ${container.Id}...`)
+      dbContainersToCreate.push(container.Names.find(n => n.startsWith('/dt-db-')).substring(1))
+      const oldContainer = dock.getContainer(container.Id)
+      if (container.State === 'running') {
+        await oldContainer.stop({ t: 5 })
+      }
+      await oldContainer.remove({
+        force: true,
+        v: true
+      })
+    } else if (
+      (
+        container.Names.some(n => n.startsWith('/dt-app-')) ||
+        container.Names.some(n => n.startsWith('/dt-celery-')) ||
+        container.Names.some(n => n.startsWith('/dt-beat-'))
+      ) && container.Labels?.nodbrefresh !== '1'
+    ) {
+      if (container.State === 'running') {
+        const appContainer = dock.getContainer(container.Id)
+        containersToRestart.push(appContainer)
+        console.info(`Stopping app / celery container ${container.Id}...`)
+        await appContainer.stop({ t: 5 })
+      }
+    }
+  }
+  console.info('DB containers have been terminated.')
+
+  // Create DB containers
+  for (const dbContainerName of dbContainersToCreate) {
+    console.info(`Recreating DB docker container... [${dbContainerName}]`)
+    const dbContainer = await dock.createContainer({
+      Image: 'ghcr.io/ietf-tools/datatracker-db:latest',
+      name: dbContainerName,
+      Hostname: dbContainerName,
+      HostConfig: {
+        NetworkMode: 'shared',
+        RestartPolicy: {
+          Name: 'unless-stopped'
+        }
+      }
+    })
+    await dbContainer.start()
+  }
+  console.info('Recreated and started DB docker containers successfully.')
+
+  console.info('Restarting app / celery containers...')
+  for (const appContainer of containersToRestart) {
+    await appContainer.start()
+  }
+  console.info('Done.')
+
+  process.exit(0)
+}
+
+main()
diff --git a/dev/deploy-to-container/settings_local.py b/dev/deploy-to-container/settings_local.py
new file mode 100644
index 0000000000..055b48d0f5
--- /dev/null
+++ b/dev/deploy-to-container/settings_local.py
@@ -0,0 +1,81 @@
+# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from ietf.settings import *   # pyflakes:ignore
+
+ALLOWED_HOSTS = ['*']
+
+DATABASES = {
+    'default': {
+        'HOST': '__DBHOST__',
+        'PORT': 5432,
+        'NAME': 'datatracker',
+        'ENGINE': 'django.db.backends.postgresql',
+        'USER': 'django',
+        'PASSWORD': 'RkTkDPFnKpko',
+    },
+}
+
+SECRET_KEY = "__SECRETKEY__"
+
+CELERY_BROKER_URL = '__MQCONNSTR__'
+
+IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
+IDSUBMIT_REPOSITORY_PATH = "/test/id/"
+IDSUBMIT_STAGING_PATH = "/test/staging/"
+
+AGENDA_PATH = '/assets/www6s/proceedings/'
+MEETINGHOST_LOGO_PATH = AGENDA_PATH
+
+USING_DEBUG_EMAIL_SERVER=True
+EMAIL_HOST='localhost'
+EMAIL_PORT=2025
+
+MEDIA_BASE_DIR = '/assets'
+MEDIA_ROOT = MEDIA_BASE_DIR + '/media/'
+MEDIA_URL = '/media/'
+
+PHOTOS_DIRNAME = 'photo'
+PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME
+
+SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/'
+SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/'
+SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/'
+SUBMIT_YANG_RFC_MODEL_DIR   = '/assets/ietf-ftp/yang/rfcmod/'
+
+# Set INTERNAL_IPS for use within Docker. See https://knasmueller.net/fix-djangos-debug-toolbar-not-showing-inside-docker
+import socket
+hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
+INTERNAL_IPS = [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
+
+# DEV_TEMPLATE_CONTEXT_PROCESSORS = [
+#    'ietf.context_processors.sql_debug',
+# ]
+
+DOCUMENT_PATH_PATTERN = '/assets/ietfdata/doc/{doc.type_id}/'
+INTERNET_DRAFT_PATH = '/assets/ietf-ftp/internet-drafts/'
+RFC_PATH = '/assets/ietf-ftp/rfc/'
+CHARTER_PATH = '/assets/ietf-ftp/charter/'
+BOFREQ_PATH = '/assets/ietf-ftp/bofreq/'
+CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/'
+STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
+INTERNET_DRAFT_ARCHIVE_DIR = '/assets/collection/draft-archive'
+INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/archive/id'
+BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
+IDSUBMIT_REPOSITORY_PATH = INTERNET_DRAFT_PATH
+FTP_DIR = '/assets/ftp'
+NFS_METRICS_TMP_DIR = '/assets/tmp'
+
+NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
+SLIDE_STAGING_PATH = '/test/staging/'
+
+DE_GFM_BINARY = '/usr/local/bin/de-gfm'
+
+APP_API_TOKENS = {
+  "ietf.api.red_api" : ["devtoken", "redtoken"],  # Not a real secret
+  "ietf.api.views.ingest_email_test": ["ingestion-test-token"],  # Not a real secret
+  "ietf.api.views_rpc" : ["devtoken"],  # Not a real secret
+}
+
+# OIDC configuration
+SITE_URL = 'https://__HOSTNAME__'
diff --git a/dev/deploy-to-container/start.sh b/dev/deploy-to-container/start.sh
new file mode 100644
index 0000000000..5d976f80ea
--- /dev/null
+++ b/dev/deploy-to-container/start.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+echo "Creating /test directories..."
+for sub in \
+    /test/id \
+    /test/staging \
+    /test/archive \
+    /test/rfc \
+    /test/media \
+    /test/wiki/ietf \
+    ; do
+    if [ ! -d "$sub"  ]; then
+        echo "Creating dir $sub"
+        mkdir -p "$sub";
+    fi
+done
+echo "Fixing permissions..."
+chmod -R 777 ./
+echo "Ensure all requirements.txt packages are installed..."
+pip --disable-pip-version-check --no-cache-dir install -r requirements.txt
+echo "Creating data directories..."
+chmod +x ./app-create-dirs.sh
+./app-create-dirs.sh
+
+if [ -n "$PGHOST" ]; then
+    echo "Altering PG search path..."
+    psql -U django -h $PGHOST -d datatracker -v ON_ERROR_STOP=1 -c '\x' -c 'ALTER USER django set search_path=datatracker,public;'
+fi
+
+echo "Starting memcached..."
+/usr/bin/memcached -d -u root
+
+echo "Running Datatracker checks..."
+./ietf/manage.py check
+
+# Migrate, adjusting to what the current state of the underlying database might be:
+
+# On production, the blobdb tables are in a separate database. Manipulate migration
+# history to ensure that they're created for the sandbox environment that runs it
+# all from a single database.
+echo "Ensuring blobdb relations exist..."
+/usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local --fake blobdb zero
+if ! /usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local blobdb; then
+  # If we are restarting a sandbox, the migration may already have run and re-running
+  # it will fail. Assume that happened and fake it.
+  /usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local --fake blobdb
+fi
+
+# Now run the migrations for real
+echo "Running Datatracker migrations..."
+/usr/local/bin/python ./ietf/manage.py migrate --settings=settings_local
+
+echo "Starting Datatracker..."
+./ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local
diff --git a/dev/deploy/build.sh b/dev/deploy/build.sh
deleted file mode 100644
index a802acb46b..0000000000
--- a/dev/deploy/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-echo "Compiling native node packages..."
-yarn rebuild
-echo "Packaging static assets..."
-if [ "${SHOULD_DEPLOY}" = "true" ]; then
-    yarn build --base=https://www.ietf.org/lib/dt/$PKG_VERSION/
-else
-    yarn build
-fi
-yarn legacy:build
diff --git a/dev/diff/package-lock.json b/dev/diff/package-lock.json
index 96ce2b5481..d1c2fbd763 100644
--- a/dev/diff/package-lock.json
+++ b/dev/diff/package-lock.json
@@ -6,24 +6,243 @@
     "": {
       "name": "diff",
       "dependencies": {
-        "chalk": "^5.0.1",
-        "dockerode": "^3.3.3",
-        "enquirer": "^2.3.6",
+        "chalk": "^5.4.1",
+        "dockerode": "^4.0.6",
+        "enquirer": "^2.4.1",
         "extract-zip": "^2.0.1",
-        "fs-extra": "^10.1.0",
-        "got": "^12.3.1",
+        "fs-extra": "^11.3.0",
+        "got": "^13.0.0",
         "keypress": "^0.2.1",
-        "listr2": "^5.0.2",
+        "listr2": "^6.6.1",
         "lodash-es": "^4.17.21",
-        "luxon": "^3.0.1",
-        "pretty-bytes": "^6.0.0",
-        "tar": "^6.1.11",
-        "yargs": "^17.5.1"
+        "luxon": "^3.6.1",
+        "pretty-bytes": "^6.1.1",
+        "tar": "^7.4.3",
+        "yargs": "^17.7.2"
       },
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/@balena/dockerignore": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
+      "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q=="
+    },
+    "node_modules/@grpc/grpc-js": {
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz",
+      "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@grpc/proto-loader": "^0.7.13",
+        "@js-sdsl/ordered-map": "^4.4.2"
+      },
+      "engines": {
+        "node": ">=12.10.0"
+      }
+    },
+    "node_modules/@grpc/proto-loader": {
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+      "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lodash.camelcase": "^4.3.0",
+        "long": "^5.0.0",
+        "protobufjs": "^7.2.5",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@js-sdsl/ordered-map": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "node_modules/@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@sindresorhus/is": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz",
@@ -46,48 +265,16 @@
         "node": ">=14.16"
       }
     },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
-      }
-    },
     "node_modules/@types/http-cache-semantics": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
       "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
     },
-    "node_modules/@types/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ=="
-    },
-    "node_modules/@types/keyv": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/node": {
       "version": "18.6.5",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz",
       "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw=="
     },
-    "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
@@ -97,41 +284,63 @@
         "@types/node": "*"
       }
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz",
+      "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==",
       "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
+        "type-fest": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=12"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": "~2.1.0"
       }
     },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
@@ -150,16 +359,61 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tweetnacl": "^0.14.3"
       }
     },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -169,65 +423,44 @@
       }
     },
     "node_modules/buildcheck": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz",
-      "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz",
+      "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==",
       "optional": true,
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/cacheable-lookup": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz",
-      "integrity": "sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
       "engines": {
-        "node": ">=10.6.0"
+        "node": ">=14.16"
       }
     },
     "node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "version": "10.2.8",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.8.tgz",
+      "integrity": "sha512-IDVO5MJ4LItE6HKFQTqT2ocAQsisOoCTUDu1ddCmnhyiwFQjXNPp4081Xj23N4tO+AFEFNzGuNEf/c8Gwwt15A==",
       "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@types/http-cache-semantics": "^4.0.1",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.2",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
       }
     },
     "node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
+      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
+      "license": "MIT",
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
@@ -238,154 +471,95 @@
     "node_modules/chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "license": "ISC"
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+    "node_modules/cli-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
+      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+      "dependencies": {
+        "restore-cursor": "^4.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cli-truncate/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/cli-truncate/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
     },
     "node_modules/cli-truncate/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cli-truncate/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dependencies": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
         "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/cliui/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=12"
       }
     },
     "node_modules/color-convert": {
@@ -405,34 +579,35 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
-    "node_modules/compress-brotli": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz",
-      "integrity": "sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==",
+    "node_modules/cpu-features": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
+      "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
+      "hasInstallScript": true,
+      "optional": true,
       "dependencies": {
-        "@types/json-buffer": "~3.0.0",
-        "json-buffer": "~3.0.1"
+        "buildcheck": "~0.0.6",
+        "nan": "^2.19.0"
       },
       "engines": {
-        "node": ">= 12"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/cpu-features": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz",
-      "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==",
-      "hasInstallScript": true,
-      "optional": true,
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dependencies": {
-        "buildcheck": "0.0.3",
-        "nan": "^2.15.0"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">= 8"
       }
     },
     "node_modules/debug": {
@@ -485,31 +660,48 @@
       }
     },
     "node_modules/docker-modem": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-3.0.5.tgz",
-      "integrity": "sha512-x1E6jxWdtoK3+ifAUWj4w5egPdTDGBpesSCErm+aKET5BnnEOvDtTP6GxcnMB1zZiv2iQ0qJZvJie+1wfIRg6Q==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz",
+      "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "debug": "^4.1.1",
         "readable-stream": "^3.5.0",
         "split-ca": "^1.0.1",
-        "ssh2": "^1.4.0"
+        "ssh2": "^1.15.0"
       },
       "engines": {
         "node": ">= 8.0"
       }
     },
     "node_modules/dockerode": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.3.tgz",
-      "integrity": "sha512-lvKV6/NGf2/CYLt5V4c0fd6Fl9XZSCo1Z2HBT9ioKrKLMB2o+gA62Uza8RROpzGvYv57KJx2dKu+ZwSpB//OIA==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.6.tgz",
+      "integrity": "sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "docker-modem": "^3.0.0",
-        "tar-fs": "~2.0.1"
+        "@balena/dockerignore": "^1.0.2",
+        "@grpc/grpc-js": "^1.11.1",
+        "@grpc/proto-loader": "^0.7.13",
+        "docker-modem": "^5.0.6",
+        "protobufjs": "^7.3.2",
+        "tar-fs": "~2.1.2",
+        "uuid": "^10.0.0"
       },
       "engines": {
         "node": ">= 8.0"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -519,11 +711,12 @@
       }
     },
     "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8.6"
@@ -537,6 +730,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -578,10 +776,36 @@
         "pend": "~1.2.0"
       }
     },
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/form-data-encoder": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.0.1.tgz",
-      "integrity": "sha512-Oy+P9w5mnO4TWXVgUiQvggNKPI9/ummcSt5usuIV6HkaLKigwzPpoenhEqmGmx3zHqm6ZLJ+CR/99N8JLinaEw==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
+      "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
       "engines": {
         "node": ">= 14.17"
       }
@@ -589,30 +813,21 @@
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "license": "MIT"
     },
     "node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
+      "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
         "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
+        "node": ">=14.14"
       }
     },
     "node_modules/get-caller-file": {
@@ -634,27 +849,46 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/glob": {
+      "version": "10.3.12",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
+      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.6",
+        "minimatch": "^9.0.1",
+        "minipass": "^7.0.4",
+        "path-scurry": "^1.10.2"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/got": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-12.3.1.tgz",
-      "integrity": "sha512-tS6+JMhBh4iXMSXF6KkIsRxmloPln31QHDlcb6Ec3bzxjjFJFr/8aXdpyuLmVc9I4i2HyBHYw1QU5K1ruUdpkw==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz",
+      "integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==",
       "dependencies": {
         "@sindresorhus/is": "^5.2.0",
         "@szmarczak/http-timer": "^5.0.1",
-        "@types/cacheable-request": "^6.0.2",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^6.0.4",
-        "cacheable-request": "^7.0.2",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.8",
         "decompress-response": "^6.0.0",
-        "form-data-encoder": "^2.0.1",
+        "form-data-encoder": "^2.1.2",
         "get-stream": "^6.0.1",
         "http2-wrapper": "^2.1.10",
         "lowercase-keys": "^3.0.0",
         "p-cancelable": "^3.0.0",
-        "responselike": "^2.0.0"
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": ">=14.16"
+        "node": ">=16"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/got?sponsor=1"
@@ -666,9 +900,9 @@
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
     },
     "node_modules/http2-wrapper": {
       "version": "2.1.11",
@@ -699,15 +933,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "engines": {
-        "node": ">=8"
-      }
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/inherits": {
       "version": "2.0.4",
@@ -722,6 +949,28 @@
         "node": ">=8"
       }
     },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -744,30 +993,27 @@
       "integrity": "sha512-HjorDJFNhnM4SicvaUXac0X77NiskggxJdesG72+O5zBKpSqKFCrqmndKVqpu3pFqkla0St6uGk8Ju0sCurrmg=="
     },
     "node_modules/keyv": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.3.3.tgz",
-      "integrity": "sha512-AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
+      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
       "dependencies": {
-        "compress-brotli": "^1.3.8",
         "json-buffer": "3.0.1"
       }
     },
     "node_modules/listr2": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.2.tgz",
-      "integrity": "sha512-/yIYitiJgIkzVIKqQc+Dpcpwaj4PjeW/hSi7/xoGJ5mil7vQYedr5kKuEyLhANlnifCcumafnIR6azpb8loODw==",
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.19",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz",
+      "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==",
+      "dependencies": {
+        "cli-truncate": "^3.1.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^5.0.1",
         "rfdc": "^1.3.0",
-        "rxjs": "^7.5.6",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
+        "wrap-ansi": "^8.1.0"
       },
       "engines": {
-        "node": "^14.13.1 || >=16.0.0"
+        "node": ">=16.0.0"
       },
       "peerDependencies": {
         "enquirer": ">= 2.3.0 < 3"
@@ -779,67 +1025,73 @@
       }
     },
     "node_modules/listr2/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/listr2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/listr2/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
     },
     "node_modules/listr2/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/listr2/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/listr2/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -850,150 +1102,108 @@
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
+      "license": "MIT"
+    },
     "node_modules/log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz",
+      "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==",
       "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "ansi-escapes": "^5.0.0",
+        "cli-cursor": "^4.0.0",
+        "slice-ansi": "^5.0.0",
+        "strip-ansi": "^7.0.1",
+        "wrap-ansi": "^8.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
+    "node_modules/log-update/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/log-update/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/log-update/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/log-update/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
     },
-    "node_modules/log-update/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+    "node_modules/log-update/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+    "node_modules/log-update/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/log-update/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/log-update/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log-update/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/long": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz",
+      "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg==",
+      "license": "Apache-2.0"
     },
     "node_modules/lowercase-keys": {
       "version": "3.0.0",
@@ -1006,10 +1216,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
     "node_modules/luxon": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.0.1.tgz",
-      "integrity": "sha512-hF3kv0e5gwHQZKz4wtm4c+inDtyc7elkanAsBq+fundaCdUBNJB1dHEGUZIM6SfSBUlbVFduPwEtNjFK8wLtcw==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
+      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       }
@@ -1023,51 +1242,69 @@
       }
     },
     "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
       "engines": {
-        "node": ">=4"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/minipass": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+    "node_modules/minimatch": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
+      "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 18"
       }
     },
     "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
       "bin": {
-        "mkdirp": "bin/cmd.js"
+        "mkdirp": "dist/cjs/src/bin.js"
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "license": "MIT"
     },
     "node_modules/ms": {
       "version": "2.1.2",
@@ -1075,17 +1312,18 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+      "license": "MIT",
       "optional": true
     },
     "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz",
+      "integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==",
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -1121,18 +1359,27 @@
         "node": ">=12.20"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
+      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/pend": {
@@ -1141,9 +1388,9 @@
       "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "node_modules/pretty-bytes": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz",
-      "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.1.tgz",
+      "integrity": "sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==",
       "engines": {
         "node": "^14.13.1 || >=16.0.0"
       },
@@ -1151,6 +1398,30 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/protobufjs": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
+      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+      "hasInstallScript": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -1198,22 +1469,32 @@
       "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
     },
     "node_modules/responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
       "dependencies": {
-        "lowercase-keys": "^2.0.0"
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/responselike/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+    "node_modules/restore-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
+      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/rfdc": {
@@ -1221,12 +1502,21 @@
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
     },
-    "node_modules/rxjs": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
+    "node_modules/rimraf": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
+      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/safe-buffer": {
@@ -1251,7 +1541,27 @@
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
@@ -1259,52 +1569,63 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/split-ca": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz",
-      "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ=="
+      "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==",
+      "license": "ISC"
     },
     "node_modules/ssh2": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz",
-      "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz",
+      "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==",
       "hasInstallScript": true,
       "dependencies": {
-        "asn1": "^0.2.4",
+        "asn1": "^0.2.6",
         "bcrypt-pbkdf": "^1.0.2"
       },
       "engines": {
         "node": ">=10.16.0"
       },
       "optionalDependencies": {
-        "cpu-features": "~0.0.4",
-        "nan": "^2.16.0"
+        "cpu-features": "~0.0.10",
+        "nan": "^2.20.0"
       }
     },
     "node_modules/string_decoder": {
@@ -1315,37 +1636,89 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=18"
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz",
-      "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz",
+      "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==",
+      "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
+        "tar-stream": "^2.1.4"
       }
     },
     "node_modules/tar-stream": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "license": "MIT",
       "dependencies": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -1357,61 +1730,30 @@
         "node": ">=6"
       }
     },
-    "node_modules/tar-stream/node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/tar-stream/node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "node_modules/tar/node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-    },
-    "node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
     "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "license": "Unlicense"
+    },
+    "node_modules/type-fest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/universalify": {
       "version": "2.0.0",
@@ -1426,6 +1768,66 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -1440,22 +1842,25 @@
       }
     },
     "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/yargs": {
-      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dependencies": {
-        "cliui": "^7.0.2",
+        "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
         "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^21.0.0"
+        "yargs-parser": "^21.1.1"
       },
       "engines": {
         "node": ">=12"
@@ -1469,43 +1874,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/yargs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
@@ -1517,6 +1885,162 @@
     }
   },
   "dependencies": {
+    "@balena/dockerignore": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
+      "integrity": "sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q=="
+    },
+    "@grpc/grpc-js": {
+      "version": "1.12.5",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz",
+      "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==",
+      "requires": {
+        "@grpc/proto-loader": "^0.7.13",
+        "@js-sdsl/ordered-map": "^4.4.2"
+      }
+    },
+    "@grpc/proto-loader": {
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+      "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
+      "requires": {
+        "lodash.camelcase": "^4.3.0",
+        "long": "^5.0.0",
+        "protobufjs": "^7.2.5",
+        "yargs": "^17.7.2"
+      }
+    },
+    "@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "requires": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
+        },
+        "ansi-styles": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+        },
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+          "requires": {
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        },
+        "wrap-ansi": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+          "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+          "requires": {
+            "ansi-styles": "^6.1.0",
+            "string-width": "^5.0.1",
+            "strip-ansi": "^7.0.1"
+          }
+        }
+      }
+    },
+    "@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "requires": {
+        "minipass": "^7.0.4"
+      }
+    },
+    "@js-sdsl/ordered-map": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw=="
+    },
+    "@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "optional": true
+    },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+    },
     "@sindresorhus/is": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz",
@@ -1530,48 +2054,16 @@
         "defer-to-connect": "^2.0.1"
       }
     },
-    "@types/cacheable-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-      "requires": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
-      }
-    },
     "@types/http-cache-semantics": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
       "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
     },
-    "@types/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ=="
-    },
-    "@types/keyv": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/node": {
       "version": "18.6.5",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz",
       "integrity": "sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw=="
     },
-    "@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
@@ -1581,20 +2073,32 @@
         "@types/node": "*"
       }
     },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
     "ansi-colors": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
       "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="
     },
+    "ansi-escapes": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz",
+      "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==",
+      "requires": {
+        "type-fest": "^1.0.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
     "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -1603,22 +2107,49 @@
         "safer-buffer": "~2.1.0"
       }
     },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "requires": {
-        "tweetnacl": "^0.14.3"
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
     "buffer-crc32": {
@@ -1627,163 +2158,95 @@
       "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
     },
     "buildcheck": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz",
-      "integrity": "sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz",
+      "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==",
       "optional": true
     },
     "cacheable-lookup": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz",
-      "integrity": "sha512-KJ/Dmo1lDDhmW2XDPMo+9oiy/CeqosPguPCrgcVzKyZrL6pM1gU2GmPY/xo6OQPTUaA/c0kwHuywB4E6nmT9ww=="
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w=="
     },
     "cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "version": "10.2.8",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.8.tgz",
+      "integrity": "sha512-IDVO5MJ4LItE6HKFQTqT2ocAQsisOoCTUDu1ddCmnhyiwFQjXNPp4081Xj23N4tO+AFEFNzGuNEf/c8Gwwt15A==",
       "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
-        }
+        "@types/http-cache-semantics": "^4.0.1",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.2",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
       }
     },
     "chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
+      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="
     },
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
     },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
+    "cli-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
+      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+      "requires": {
+        "restore-cursor": "^4.0.0"
+      }
     },
     "cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "requires": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
         },
         "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
         },
         "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
           }
         },
         "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
           "requires": {
-            "ansi-regex": "^5.0.1"
+            "ansi-regex": "^6.0.1"
           }
         }
       }
     },
     "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "requires": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
         "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
-    "clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "requires": {
-        "mimic-response": "^1.0.0"
       }
     },
     "color-convert": {
@@ -1800,27 +2263,28 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
-    "compress-brotli": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz",
-      "integrity": "sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==",
+    "cpu-features": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
+      "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
+      "optional": true,
       "requires": {
-        "@types/json-buffer": "~3.0.0",
-        "json-buffer": "~3.0.1"
+        "buildcheck": "~0.0.6",
+        "nan": "^2.19.0"
       }
     },
-    "cpu-features": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz",
-      "integrity": "sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==",
-      "optional": true,
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "requires": {
-        "buildcheck": "0.0.3",
-        "nan": "^2.15.0"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
     "debug": {
@@ -1852,25 +2316,40 @@
       "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="
     },
     "docker-modem": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-3.0.5.tgz",
-      "integrity": "sha512-x1E6jxWdtoK3+ifAUWj4w5egPdTDGBpesSCErm+aKET5BnnEOvDtTP6GxcnMB1zZiv2iQ0qJZvJie+1wfIRg6Q==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-5.0.6.tgz",
+      "integrity": "sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==",
       "requires": {
         "debug": "^4.1.1",
         "readable-stream": "^3.5.0",
         "split-ca": "^1.0.1",
-        "ssh2": "^1.4.0"
+        "ssh2": "^1.15.0"
       }
     },
     "dockerode": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.3.tgz",
-      "integrity": "sha512-lvKV6/NGf2/CYLt5V4c0fd6Fl9XZSCo1Z2HBT9ioKrKLMB2o+gA62Uza8RROpzGvYv57KJx2dKu+ZwSpB//OIA==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-4.0.6.tgz",
+      "integrity": "sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==",
       "requires": {
-        "docker-modem": "^3.0.0",
-        "tar-fs": "~2.0.1"
+        "@balena/dockerignore": "^1.0.2",
+        "@grpc/grpc-js": "^1.11.1",
+        "@grpc/proto-loader": "^0.7.13",
+        "docker-modem": "^5.0.6",
+        "protobufjs": "^7.3.2",
+        "tar-fs": "~2.1.2",
+        "uuid": "^10.0.0"
       }
     },
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -1880,11 +2359,12 @@
       }
     },
     "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "requires": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       }
     },
     "escalade": {
@@ -1892,6 +2372,11 @@
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
+    "eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+    },
     "extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -1921,10 +2406,26 @@
         "pend": "~1.2.0"
       }
     },
+    "foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "requires": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="
+        }
+      }
+    },
     "form-data-encoder": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.0.1.tgz",
-      "integrity": "sha512-Oy+P9w5mnO4TWXVgUiQvggNKPI9/ummcSt5usuIV6HkaLKigwzPpoenhEqmGmx3zHqm6ZLJ+CR/99N8JLinaEw=="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
+      "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw=="
     },
     "fs-constants": {
       "version": "1.0.0",
@@ -1932,23 +2433,15 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
     "fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
+      "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
       "requires": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
         "universalify": "^2.0.0"
       }
     },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -1959,24 +2452,34 @@
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
     },
+    "glob": {
+      "version": "10.3.12",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
+      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+      "requires": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.6",
+        "minimatch": "^9.0.1",
+        "minipass": "^7.0.4",
+        "path-scurry": "^1.10.2"
+      }
+    },
     "got": {
-      "version": "12.3.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-12.3.1.tgz",
-      "integrity": "sha512-tS6+JMhBh4iXMSXF6KkIsRxmloPln31QHDlcb6Ec3bzxjjFJFr/8aXdpyuLmVc9I4i2HyBHYw1QU5K1ruUdpkw==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz",
+      "integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==",
       "requires": {
         "@sindresorhus/is": "^5.2.0",
         "@szmarczak/http-timer": "^5.0.1",
-        "@types/cacheable-request": "^6.0.2",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^6.0.4",
-        "cacheable-request": "^7.0.2",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.8",
         "decompress-response": "^6.0.0",
-        "form-data-encoder": "^2.0.1",
+        "form-data-encoder": "^2.1.2",
         "get-stream": "^6.0.1",
         "http2-wrapper": "^2.1.10",
         "lowercase-keys": "^3.0.0",
         "p-cancelable": "^3.0.0",
-        "responselike": "^2.0.0"
+        "responselike": "^3.0.0"
       }
     },
     "graceful-fs": {
@@ -1985,9 +2488,9 @@
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
     },
     "http2-wrapper": {
       "version": "2.1.11",
@@ -2003,11 +2506,6 @@
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-    },
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -2018,6 +2516,20 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "requires": {
+        "@isaacs/cliui": "^8.0.2",
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -2038,73 +2550,67 @@
       "integrity": "sha512-HjorDJFNhnM4SicvaUXac0X77NiskggxJdesG72+O5zBKpSqKFCrqmndKVqpu3pFqkla0St6uGk8Ju0sCurrmg=="
     },
     "keyv": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.3.3.tgz",
-      "integrity": "sha512-AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
+      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
       "requires": {
-        "compress-brotli": "^1.3.8",
         "json-buffer": "3.0.1"
       }
     },
     "listr2": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.2.tgz",
-      "integrity": "sha512-/yIYitiJgIkzVIKqQc+Dpcpwaj4PjeW/hSi7/xoGJ5mil7vQYedr5kKuEyLhANlnifCcumafnIR6azpb8loODw==",
-      "requires": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.19",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz",
+      "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==",
+      "requires": {
+        "cli-truncate": "^3.1.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^5.0.1",
         "rfdc": "^1.3.0",
-        "rxjs": "^7.5.6",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
+        "wrap-ansi": "^8.1.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
         },
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
         },
         "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
         },
         "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
           }
         },
         "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
           "requires": {
-            "ansi-regex": "^5.0.1"
+            "ansi-regex": "^6.0.1"
           }
         },
         "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+          "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
           "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
+            "ansi-styles": "^6.1.0",
+            "string-width": "^5.0.1",
+            "strip-ansi": "^7.0.1"
           }
         }
       }
@@ -2114,114 +2620,87 @@
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
+    },
     "log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz",
+      "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==",
       "requires": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "ansi-escapes": "^5.0.0",
+        "cli-cursor": "^4.0.0",
+        "slice-ansi": "^5.0.0",
+        "strip-ansi": "^7.0.1",
+        "wrap-ansi": "^8.0.1"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-          "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-          "requires": {
-            "type-fest": "^0.21.3"
-          }
-        },
         "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
         },
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "cli-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-          "requires": {
-            "restore-cursor": "^3.1.0"
-          }
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
         },
         "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "restore-cursor": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-          "requires": {
-            "onetime": "^5.1.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "slice-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
-          }
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
         },
         "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
           }
         },
         "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
           "requires": {
-            "ansi-regex": "^5.0.1"
+            "ansi-regex": "^6.0.1"
           }
         },
-        "type-fest": {
-          "version": "0.21.3",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
-        },
         "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+          "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
           "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
+            "ansi-styles": "^6.1.0",
+            "string-width": "^5.0.1",
+            "strip-ansi": "^7.0.1"
           }
         }
       }
     },
+    "long": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz",
+      "integrity": "sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg=="
+    },
     "lowercase-keys": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
       "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ=="
     },
+    "lru-cache": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ=="
+    },
     "luxon": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.0.1.tgz",
-      "integrity": "sha512-hF3kv0e5gwHQZKz4wtm4c+inDtyc7elkanAsBq+fundaCdUBNJB1dHEGUZIM6SfSBUlbVFduPwEtNjFK8wLtcw=="
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz",
+      "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ=="
     },
     "mimic-fn": {
       "version": "2.1.0",
@@ -2229,31 +2708,36 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg=="
     },
-    "minipass": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+    "minimatch": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
+      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
       "requires": {
-        "yallist": "^4.0.0"
+        "brace-expansion": "^2.0.1"
       }
     },
+    "minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="
+    },
     "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
+      "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
       "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "minipass": "^7.0.4",
+        "rimraf": "^5.0.5"
       }
     },
     "mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="
     },
     "mkdirp-classic": {
       "version": "0.5.3",
@@ -2266,15 +2750,15 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
       "optional": true
     },
     "normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz",
+      "integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw=="
     },
     "once": {
       "version": "1.4.0",
@@ -2297,12 +2781,18 @@
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
       "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw=="
     },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+    },
+    "path-scurry": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
+      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
       "requires": {
-        "aggregate-error": "^3.0.0"
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       }
     },
     "pend": {
@@ -2311,9 +2801,28 @@
       "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "pretty-bytes": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz",
-      "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg=="
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.1.tgz",
+      "integrity": "sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ=="
+    },
+    "protobufjs": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
+      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      }
     },
     "pump": {
       "version": "3.0.0",
@@ -2350,18 +2859,20 @@
       "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
     },
     "responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
       "requires": {
-        "lowercase-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
-        }
+        "lowercase-keys": "^3.0.0"
+      }
+    },
+    "restore-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
+      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
       }
     },
     "rfdc": {
@@ -2369,12 +2880,12 @@
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
     },
-    "rxjs": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
+    "rimraf": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
+      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
       "requires": {
-        "tslib": "^2.1.0"
+        "glob": "^10.3.7"
       }
     },
     "safe-buffer": {
@@ -2387,28 +2898,42 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+    },
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+          "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="
         }
       }
     },
@@ -2418,14 +2943,14 @@
       "integrity": "sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ=="
     },
     "ssh2": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz",
-      "integrity": "sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz",
+      "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==",
       "requires": {
-        "asn1": "^0.2.4",
+        "asn1": "^0.2.6",
         "bcrypt-pbkdf": "^1.0.2",
-        "cpu-features": "~0.0.4",
-        "nan": "^2.16.0"
+        "cpu-features": "~0.0.10",
+        "nan": "^2.20.0"
       }
     },
     "string_decoder": {
@@ -2436,35 +2961,71 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "string-width-cjs": {
+      "version": "npm:string-width@4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-ansi-cjs": {
+      "version": "npm:strip-ansi@6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
     "tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
       "requires": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
       },
       "dependencies": {
         "chownr": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+          "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="
         }
       }
     },
     "tar-fs": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz",
-      "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.2.tgz",
+      "integrity": "sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==",
       "requires": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
+        "tar-stream": "^2.1.4"
       }
     },
     "tar-stream": {
@@ -2477,44 +3038,18 @@
         "fs-constants": "^1.0.0",
         "inherits": "^2.0.3",
         "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "bl": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-          "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-          "requires": {
-            "buffer": "^5.5.0",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0"
-          }
-        },
-        "buffer": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-          "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.1.13"
-          }
-        }
       }
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-    },
-    "tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
     },
+    "type-fest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="
+    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -2525,6 +3060,39 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ=="
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "wrap-ansi-cjs": {
+      "version": "npm:wrap-ansi@7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -2536,52 +3104,22 @@
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
     "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="
     },
     "yargs": {
-      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "requires": {
-        "cliui": "^7.0.2",
+        "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
         "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^21.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "string-width": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
+        "yargs-parser": "^21.1.1"
       }
     },
     "yargs-parser": {
diff --git a/dev/diff/package.json b/dev/diff/package.json
index 43d37545f9..a5a7beb0df 100644
--- a/dev/diff/package.json
+++ b/dev/diff/package.json
@@ -2,19 +2,19 @@
   "name": "diff",
   "type": "module",
   "dependencies": {
-    "chalk": "^5.0.1",
-    "dockerode": "^3.3.3",
-    "enquirer": "^2.3.6",
+    "chalk": "^5.4.1",
+    "dockerode": "^4.0.6",
+    "enquirer": "^2.4.1",
     "extract-zip": "^2.0.1",
-    "fs-extra": "^10.1.0",
-    "got": "^12.3.1",
+    "fs-extra": "^11.3.0",
+    "got": "^13.0.0",
     "keypress": "^0.2.1",
-    "listr2": "^5.0.2",
+    "listr2": "^6.6.1",
     "lodash-es": "^4.17.21",
-    "luxon": "^3.0.1",
-    "pretty-bytes": "^6.0.0",
-    "tar": "^6.1.11",
-    "yargs": "^17.5.1"
+    "luxon": "^3.6.1",
+    "pretty-bytes": "^6.1.1",
+    "tar": "^7.4.3",
+    "yargs": "^17.7.2"
   },
   "engines": {
     "node": ">=16"
diff --git a/dev/diff/prepare.sh b/dev/diff/prepare.sh
index c18684fc79..5fce2b0564 100644
--- a/dev/diff/prepare.sh
+++ b/dev/diff/prepare.sh
@@ -12,5 +12,7 @@ yarn legacy:build
 echo "Creating data directories..."
 chmod +x ./docker/scripts/app-create-dirs.sh
 ./docker/scripts/app-create-dirs.sh
+
 ./ietf/manage.py check
-./ietf/manage.py migrate
+./ietf/manage.py migrate --fake-initial
+
diff --git a/dev/diff/settings_local.py b/dev/diff/settings_local.py
index 902fc54d14..c255cac23d 100644
--- a/dev/diff/settings_local.py
+++ b/dev/diff/settings_local.py
@@ -1,35 +1,25 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-from ietf.settings import *                                          # pyflakes:ignore
+from ietf.settings import *  # pyflakes:ignore
 
 ALLOWED_HOSTS = ['*']
 
 DATABASES = {
     'default': {
         'HOST': '__DBHOST__',
-        'PORT': 3306,
-        'NAME': 'ietf_utf8',
-        'ENGINE': 'django.db.backends.mysql',
+        'PORT': 5432,
+        'NAME': 'datatracker',
+        'ENGINE': 'django.db.backends.postgresql',
         'USER': 'django',
         'PASSWORD': 'RkTkDPFnKpko',
-        'OPTIONS': {
-            'sql_mode': 'STRICT_TRANS_TABLES',
-            'init_command': 'SET storage_engine=InnoDB; SET names "utf8"',
-        },
     },
 }
 
-DATABASE_TEST_OPTIONS = {
-    'init_command': 'SET storage_engine=InnoDB',
-}
 
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
 IDSUBMIT_REPOSITORY_PATH = "test/id/"
 IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
 
 AGENDA_PATH = '/assets/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -47,7 +37,6 @@
 
 SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/'
 SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/'
-SUBMIT_YANG_INVAL_MODEL_DIR = '/assets/ietf-ftp/yang/invalmod/'
 SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/'
 SUBMIT_YANG_RFC_MODEL_DIR   = '/assets/ietf-ftp/yang/rfcmod/'
 
@@ -67,8 +56,11 @@
 BOFREQ_PATH = '/assets/ietf-ftp/bofreq/'
 CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/'
 STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
-INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
+INTERNET_DRAFT_ARCHIVE_DIR = '/assets/collection/draft-archive'
 INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
+BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
+FTP_DIR = '/assets/ftp'
+NFS_METRICS_TMP_DIR = '/assets/tmp'
 
 NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
 SLIDE_STAGING_PATH = 'test/staging/'
diff --git a/dev/k8s-get-deploy-name/.editorconfig b/dev/k8s-get-deploy-name/.editorconfig
new file mode 100644
index 0000000000..fec5c66519
--- /dev/null
+++ b/dev/k8s-get-deploy-name/.editorconfig
@@ -0,0 +1,7 @@
+[*]
+indent_size = 2
+indent_style = space
+charset = utf-8
+trim_trailing_whitespace = false
+end_of_line = lf
+insert_final_newline = true
diff --git a/dev/k8s-get-deploy-name/.gitignore b/dev/k8s-get-deploy-name/.gitignore
new file mode 100644
index 0000000000..07e6e472cc
--- /dev/null
+++ b/dev/k8s-get-deploy-name/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/dev/k8s-get-deploy-name/.npmrc b/dev/k8s-get-deploy-name/.npmrc
new file mode 100644
index 0000000000..580a68c499
--- /dev/null
+++ b/dev/k8s-get-deploy-name/.npmrc
@@ -0,0 +1,3 @@
+audit = false
+fund = false
+save-exact = true
diff --git a/dev/k8s-get-deploy-name/README.md b/dev/k8s-get-deploy-name/README.md
new file mode 100644
index 0000000000..a6605e4dd2
--- /dev/null
+++ b/dev/k8s-get-deploy-name/README.md
@@ -0,0 +1,16 @@
+# Datatracker Get Deploy Name
+
+This tool process and slugify a git branch into an appropriate subdomain name.
+
+## Usage
+
+1. From the `dev/k8s-get-deploy-name` directory, install the dependencies:
+```sh
+npm install
+```
+2. Run the command: (replacing the `branch` argument)
+```sh
+node /cli.js --branch feat/fooBar-123
+```
+
+The subdomain name will be output. It can then be used in a workflow as a namespace name and subdomain value.
diff --git a/dev/k8s-get-deploy-name/cli.js b/dev/k8s-get-deploy-name/cli.js
new file mode 100644
index 0000000000..b6c3b5119e
--- /dev/null
+++ b/dev/k8s-get-deploy-name/cli.js
@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+
+import yargs from 'yargs/yargs'
+import { hideBin } from 'yargs/helpers'
+import slugify from 'slugify'
+
+const argv = yargs(hideBin(process.argv)).argv
+
+let branch = argv.branch
+if (!branch) {
+  throw new Error('Missing --branch argument!')
+}
+if (branch.indexOf('/') >= 0) {
+  branch = branch.split('/').slice(1).join('-')
+}
+branch = slugify(branch, { lower: true, strict: true })
+if (branch.length < 1) {
+  throw new Error('Branch name is empty!')
+}
+process.stdout.write(`dt-${branch}`)
+
+process.exit(0)
diff --git a/dev/k8s-get-deploy-name/package-lock.json b/dev/k8s-get-deploy-name/package-lock.json
new file mode 100644
index 0000000000..e492a4cd38
--- /dev/null
+++ b/dev/k8s-get-deploy-name/package-lock.json
@@ -0,0 +1,303 @@
+{
+  "name": "k8s-get-deploy-name",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "k8s-get-deploy-name",
+      "dependencies": {
+        "slugify": "1.6.6",
+        "yargs": "17.7.2"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/slugify": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz",
+      "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "engines": {
+        "node": ">=12"
+      }
+    }
+  },
+  "dependencies": {
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+    },
+    "slugify": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz",
+      "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw=="
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+    },
+    "yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "requires": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      }
+    },
+    "yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+    }
+  }
+}
diff --git a/dev/k8s-get-deploy-name/package.json b/dev/k8s-get-deploy-name/package.json
new file mode 100644
index 0000000000..849f5d9b8d
--- /dev/null
+++ b/dev/k8s-get-deploy-name/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "k8s-get-deploy-name",
+  "type": "module",
+  "dependencies": {
+    "slugify": "1.6.6",
+    "yargs": "17.7.2"
+  }
+}
diff --git a/dev/legacy/add-old-drafts-from-archive.py b/dev/legacy/add-old-drafts-from-archive.py
new file mode 100644
index 0000000000..f09c3b4558
--- /dev/null
+++ b/dev/legacy/add-old-drafts-from-archive.py
@@ -0,0 +1,157 @@
+#!/usr/bin/env python
+import sys
+
+print("This is only here as documention - please read the file")
+sys.exit(0)
+
+# #!/usr/bin/env python
+# # Copyright The IETF Trust 2017-2019, All Rights Reserved
+
+# import datetime
+# import os
+# import sys
+# from pathlib import Path
+# from contextlib import closing
+
+# os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
+
+# import django
+# django.setup()
+
+# from django.conf import settings
+# from django.core.validators import validate_email, ValidationError
+# from ietf.utils.draft import PlaintextDraft
+# from ietf.submit.utils import update_authors
+# from ietf.utils.timezone import date_today
+
+# import debug                            # pyflakes:ignore
+
+# from ietf.doc.models import Document, NewRevisionDocEvent, DocEvent, State
+# from ietf.person.models import Person
+
+# system = Person.objects.get(name="(System)")
+# expired = State.objects.get(type='draft',slug='expired')
+
+# names = set()
+# print 'collecting draft names ...'
+# versions = 0
+# for p in Path(settings.INTERNET_DRAFT_PATH).glob('draft*.txt'):
+#     n = str(p).split('/')[-1].split('-')
+#     if n[-1][:2].isdigit():
+#         name = '-'.join(n[:-1])
+#         if '--' in name  or '.txt' in name or '[' in name or '=' in name or '&' in name:
+#             continue
+#         if name.startswith('draft-draft-'):
+#             continue
+#         if name == 'draft-ietf-trade-iotp-v1_0-dsig':
+#             continue
+#         if len(n[-1]) != 6:
+#             continue
+#         if name.startswith('draft-mlee-'):
+#             continue
+#         names.add('-'.join(n[:-1]))
+
+# count=0
+# print 'iterating through names ...'
+# for name in sorted(names):
+#     if not Document.objects.filter(name=name).exists():
+#         paths = list(Path(settings.INTERNET_DRAFT_PATH).glob('%s-??.txt'%name))
+#         paths.sort()
+#         doc = None
+#         for p in paths:
+#             n = str(p).split('/')[-1].split('-')
+#             rev = n[-1][:2]
+#             with open(str(p)) as txt_file:
+#                 raw = txt_file.read()
+#                 try:
+#                     text = raw.decode('utf8')
+#                 except UnicodeDecodeError:
+#                     text = raw.decode('latin1')
+#                 try:
+#                     draft = PlaintextDraft(text, txt_file.name, name_from_source=True)
+#                 except Exception as e:
+#                     print name, rev, "Can't parse", p,":",e
+#                     continue
+#             if draft.errors and draft.errors.keys()!=['draftname',]:
+#                 print "Errors - could not process", name, rev, datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc), draft.errors, draft.get_title().encode('utf8')
+#             else:
+#                 time = datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc)
+#                 if not doc:
+#                     doc = Document.objects.create(name=name,
+#                                                   time=time,
+#                                                   type_id='draft',
+#                                                   title=draft.get_title(),
+#                                                   abstract=draft.get_abstract(),
+#                                                   rev = rev,
+#                                                   pages=draft.get_pagecount(),
+#                                                   words=draft.get_wordcount(),
+#                                                   expires=time+datetime.timedelta(settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
+#                                                  )
+#                     DocAlias.objects.create(name=doc.name).docs.add(doc)
+#                     doc.states.add(expired)
+#                 # update authors
+#                 authors = []
+#                 for author in draft.get_author_list():
+#                     full_name, first_name, middle_initial, last_name, name_suffix, email, country, company = author
+
+#                     author_name = full_name.replace("\n", "").replace("\r", "").replace("<", "").replace(">", "").strip()
+
+#                     if email:
+#                         try:
+#                             validate_email(email)
+#                         except ValidationError:
+#                             email = ""
+
+#                     def turn_into_unicode(s):
+#                         if s is None:
+#                             return u""
+
+#                         if isinstance(s, unicode):
+#                             return s
+#                         else:
+#                             try:
+#                                 return s.decode("utf-8")
+#                             except UnicodeDecodeError:
+#                                 try:
+#                                     return s.decode("latin-1")
+#                                 except UnicodeDecodeError:
+#                                     return ""
+
+#                     author_name = turn_into_unicode(author_name)
+#                     email = turn_into_unicode(email)
+#                     company = turn_into_unicode(company)
+
+#                     authors.append({
+#                         "name": author_name,
+#                         "email": email,
+#                         "affiliation": company,
+#                         "country": country
+#                     })
+#                 dummysubmission=type('', (), {})() #https://stackoverflow.com/questions/19476816/creating-an-empty-object-in-python
+#                 dummysubmission.authors = authors
+#                 update_authors(doc,dummysubmission)
+                
+#                 # add a docevent with words explaining where this came from
+#                 events = []
+#                 e = NewRevisionDocEvent.objects.create(
+#                         type="new_revision",
+#                         doc=doc,
+#                         rev=rev,
+#                         by=system,
+#                         desc="New version available: <b>%s-%s.txt</b>" % (doc.name, doc.rev),
+#                         time=time,
+#                 )
+#                 events.append(e)
+#                 e = DocEvent.objects.create(
+#                         type="comment",
+#                         doc = doc,
+#                         rev = rev,
+#                         by = system,
+#                         desc = "Revision added from id-archive on %s by %s"%(date_today(),sys.argv[0]),
+#                         time=time,
+#                 )
+#                 events.append(e)
+#                 doc.time = time
+#                 doc.rev = rev
+#                 doc.save_with_history(events)
+#                 print "Added",name, rev
diff --git a/dev/legacy/notes/notes.html b/dev/legacy/notes/notes.html
index 85980a5b1b..cb10a18689 100644
--- a/dev/legacy/notes/notes.html
+++ b/dev/legacy/notes/notes.html
@@ -355,7 +355,7 @@ <h1>Introduction</h1>
 in one place.</p>
 <p>With my recent investigations of code analysis tools, I thought it might be
 a good idea to start collecting these in one place for the project.</p>
-<blockquote>
+<blockquote style="border-left: 0">
 <cite>Henrik &lt;henrik&#64;levkowetz.com&gt;, 23 Mar 2014</cite></blockquote>
 </div>
 <div class="section" id="code-analysis-tools">
@@ -398,8 +398,9 @@ <h2>PyChecker</h2>
 do the right thing, but once it was made to run on the datatracker code, and
 ignore the django code, it didn't report anything that PyFlakes hadn't already
 caught.</p>
-<blockquote>
-<cite>Henrik &lt;henrik&#64;levkowetz.com&gt;, 23 Mar 2014</cite></blockquote>
+<blockquote style="border-left: 0">
+    <cite>Henrik &lt;henrik&#64;levkowetz.com&gt;, 23 Mar 2014</cite>
+</blockquote>
 </div>
 </div>
 </div>
diff --git a/dev/legacy/recalculate-rfc-authors-snapshot b/dev/legacy/recalculate-rfc-authors-snapshot
new file mode 100644
index 0000000000..cbe7a7a2f3
--- /dev/null
+++ b/dev/legacy/recalculate-rfc-authors-snapshot
@@ -0,0 +1,8346 @@
+#!/bin/sh
+
+echo "This is only here as documentation. Please read the file"
+exit
+
+# #!/usr/bin/env python
+
+# """DANGER, WILL ROBINSON
+
+# This code was used in the construction of person migrations 0016 through 0019
+# and doc migration 0029 The original intent was to provide a utility that could
+# be run periodically, but the need for manual inspection of the results was too
+# great. It is here as a _starting point_ for future exploration of updating rfc
+# documentauthor sets. Be careful to check that assumptions haven't changed in
+# the interim.
+
+# """
+
+# import os, sys
+# import django
+# import argparse
+# from collections import namedtuple
+# import subprocess
+# from tempfile import mkstemp
+
+# basedir = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../..'))
+# sys.path.insert(0, basedir)
+# os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
+
+# django.setup()
+
+# from ietf.person.models import Email, Person
+# from ietf.doc.models import Document
+# from ietf import settings
+
+# import debug
+
+# # This is a snapshot dump from the RFC Editor in late April 2017
+# rfced_data = """RFC1          ||      S. Crocker         ||         
+#   RFC2          ||       B. Duvall         ||         
+#   RFC3          ||       S.D. Crocker         ||         
+#   RFC4          ||       E.B. Shapiro         ||         
+#   RFC5          ||      J. Rulifson         ||       
+#   RFC6          ||       S.D. Crocker         ||         
+#   RFC7          ||       G. Deloche         ||         
+#   RFC8          ||      G. Deloche         ||       
+#   RFC9          ||      G. Deloche         ||       
+#   RFC10          ||       S.D. Crocker         ||         
+#   RFC11          ||      G. Deloche         ||       
+#   RFC12          ||       M. Wingfield         ||         
+#   RFC13          ||       V. Cerf         ||         
+#   RFC14          ||               ||         
+#   RFC15          ||       C.S. Carr         ||         
+#   RFC16          ||       S. Crocker         ||         
+#   RFC17          ||       J.E. Kreznar         ||         
+#   RFC18          ||       V. Cerf         ||         
+#   RFC19          ||       J.E. Kreznar         ||         
+#   RFC20          ||      V.G. Cerf         ||       
+#   RFC21          ||       V.G. Cerf         ||         
+#   RFC22          ||       V.G. Cerf         ||         
+#   RFC23          ||       G. Gregg         ||         
+#   RFC24          ||       S.D. Crocker         ||         
+#   RFC25          ||       S.D. Crocker         ||         
+#   RFC26          ||               ||         
+#   RFC27          ||       S.D. Crocker         ||         
+#   RFC28          ||       W.K. English         ||         
+#   RFC29          ||       R.E. Kahn         ||         
+#   RFC30          ||       S.D. Crocker         ||         
+#   RFC31          ||      D. Bobrow, W.R. Sutherland         ||         
+#   RFC32          ||       J. Cole         ||         
+#   RFC33          ||       S.D. Crocker         ||         
+#   RFC34          ||       W.K. English         ||         
+#   RFC35          ||       S.D. Crocker         ||         
+#   RFC36          ||       S.D. Crocker         ||         
+#   RFC37          ||       S.D. Crocker         ||         
+#   RFC38          ||       S.M. Wolfe         ||         
+#   RFC39          ||       E. Harslem, J.F. Heafner         ||         
+#   RFC40          ||       E. Harslem, J.F. Heafner         ||         
+#   RFC41          ||       J.T. Melvin         ||         
+#   RFC42          ||       E. Ancona         ||         
+#   RFC43          ||       A.G. Nemeth         ||         
+#   RFC44          ||       A. Shoshani, R. Long, A. Landsberg         ||         
+#   RFC45          ||       J. Postel, S.D. Crocker         ||         
+#   RFC46          ||       E. Meyer         ||         
+#   RFC47          ||       J. Postel, S. Crocker         ||         
+#   RFC48          ||       J. Postel, S.D. Crocker         ||         
+#   RFC49          ||       E. Meyer         ||         
+#   RFC50          ||       E. Harslen, J. Heafner         ||         
+#   RFC51          ||      M. Elie         ||       
+#   RFC52          ||       J. Postel, S.D. Crocker         ||         
+#   RFC53          ||       S.D. Crocker         ||         
+#   RFC54          ||       S.D. Crocker, J. Postel, J. Newkirk, M. Kraley         ||         
+#   RFC55          ||       J. Newkirk, M. Kraley, J. Postel, S.D. Crocker         ||         
+#   RFC56          ||       E. Belove, D. Black, R. Flegal, L.G. Farquar         ||         
+#   RFC57          ||       M. Kraley, J. Newkirk         ||         
+#   RFC58          ||       T.P. Skinner         ||         
+#   RFC59          ||       E. Meyer         ||         
+#   RFC60          ||      R. Kalin         ||       
+#   RFC61          ||       D.C. Walden         ||         
+#   RFC62          ||       D.C. Walden         ||         
+#   RFC63          ||       V.G. Cerf         ||         
+#   RFC64          ||       M. Elie         ||         
+#   RFC65          ||       D.C. Walden         ||         
+#   RFC66          ||       S.D. Crocker         ||         
+#   RFC67          ||       W.R. Crowther         ||         
+#   RFC68          ||       M. Elie         ||         
+#   RFC69          ||       A.K. Bhushan         ||         
+#   RFC70          ||       S.D. Crocker         ||         
+#   RFC71          ||       T. Schipper         ||         
+#   RFC72          ||       R.D. Bressler         ||         
+#   RFC73          ||       S.D. Crocker         ||         
+#   RFC74          ||      J.E. White         ||       
+#   RFC75          ||       S.D. Crocker         ||         
+#   RFC76          ||       J. Bouknight, J. Madden, G.R. Grossman         ||         
+#   RFC77          ||       J. Postel         ||         
+#   RFC78          ||       E. Harslem, J.F. Heafner, J.E. White         ||         
+#   RFC79          ||       E. Meyer         ||         
+#   RFC80          ||       E. Harslem, J.F. Heafner         ||         
+#   RFC81          ||       J. Bouknight         ||         
+#   RFC82          ||       E. Meyer         ||         
+#   RFC83          ||       R.H. Anderson, E. Harslem, J.F. Heafner         ||         
+#   RFC84          ||       J.B. North         ||         
+#   RFC85          ||       S.D. Crocker         ||         
+#   RFC86          ||      S.D. Crocker         ||       
+#   RFC87          ||       A. Vezza         ||         
+#   RFC88          ||       R.T. Braden, S.M. Wolfe         ||         
+#   RFC89          ||       R.M. Metcalfe         ||         
+#   RFC90          ||       R.T. Braden         ||         
+#   RFC91          ||       G.H. Mealy         ||         
+#   RFC92          ||               ||         
+#   RFC93          ||       A.M. McKenzie         ||         
+#   RFC94          ||       E. Harslem, J.F. Heafner         ||         
+#   RFC95          ||      S. Crocker         ||       
+#   RFC96          ||       R.W. Watson         ||         
+#   RFC97          ||      J.T. Melvin, R.W. Watson         ||       
+#   RFC98          ||       E. Meyer, T. Skinner         ||         
+#   RFC99          ||       P.M. Karp         ||         
+#   RFC100          ||       P.M. Karp         ||         
+#   RFC101          ||       R.W. Watson         ||         
+#   RFC102          ||       S.D. Crocker         ||         
+#   RFC103          ||       R.B. Kalin         ||         
+#   RFC104          ||       J.B. Postel, S.D. Crocker         ||         
+#   RFC105          ||       J.E. White         ||         
+#   RFC106          ||       T.C. O'Sullivan         ||         
+#   RFC107          ||       R.D. Bressler, S.D. Crocker, W.R. Crowther, G.R. Grossman, R.S. Tomlinson, J.E. White         ||         
+#   RFC108          ||       R.W. Watson         ||         
+#   RFC109          ||      J. Winett         ||       
+#   RFC110          ||      J. Winett         ||       
+#   RFC111          ||       S.D. Crocker         ||         
+#   RFC112          ||      T.C. O'Sullivan         ||       
+#   RFC113          ||       E. Harslem, J.F. Heafner, J.E. White         ||         
+#   RFC114          ||       A.K. Bhushan         ||         
+#   RFC115          ||       R.W. Watson, J.B. North         ||         
+#   RFC116          ||       S.D. Crocker         ||         
+#   RFC117          ||       J. Wong         ||         
+#   RFC118          ||       R.W. Watson         ||         
+#   RFC119          ||      M. Krilanovich         ||       
+#   RFC120          ||       M. Krilanovich         ||         
+#   RFC121          ||       M. Krilanovich         ||         
+#   RFC122          ||       J.E. White         ||         
+#   RFC123          ||       S.D. Crocker         ||         
+#   RFC124          ||       J.T. Melvin         ||         
+#   RFC125          ||       J. McConnell         ||         
+#   RFC126          ||       J. McConnell         ||         
+#   RFC127          ||       J. Postel         ||         
+#   RFC128          ||       J. Postel         ||         
+#   RFC129          ||       E. Harslem, J. Heafner, E. Meyer         ||         
+#   RFC130          ||       J.F. Heafner         ||         
+#   RFC131          ||       E. Harslem, J.F. Heafner         ||         
+#   RFC132          ||       J.E. White         ||         
+#   RFC133          ||       R.L. Sunberg         ||         
+#   RFC134          ||       A. Vezza         ||         
+#   RFC135          ||       W. Hathaway         ||         
+#   RFC136          ||       R.E. Kahn         ||         
+#   RFC137          ||       T.C. O'Sullivan         ||         
+#   RFC138          ||       R.H. Anderson, V.G. Cerf, E. Harslem, J.F. Heafner, J. Madden, R.M. Metcalfe, A. Shoshani, J.E. White, D.C.M. Wood         ||         
+#   RFC139          ||       T.C. O'Sullivan         ||         
+#   RFC140          ||       S.D. Crocker         ||         
+#   RFC141          ||       E. Harslem, J.F. Heafner         ||         
+#   RFC142          ||       C. Kline, J. Wong         ||         
+#   RFC143          ||       W. Naylor, J. Wong, C. Kline, J. Postel         ||         
+#   RFC144          ||       A. Shoshani         ||         
+#   RFC145          ||       J. Postel         ||         
+#   RFC146          ||       P.M. Karp, D.B. McKay, D.C.M. Wood         ||         
+#   RFC147          ||       J.M. Winett         ||         
+#   RFC148          ||       A.K. Bhushan         ||         
+#   RFC149          ||       S.D. Crocker         ||         
+#   RFC150          ||       R.B. Kalin         ||         
+#   RFC151          ||       A. Shoshani         ||         
+#   RFC152          ||       M. Wilber         ||         
+#   RFC153          ||       J.T. Melvin, R.W. Watson         ||         
+#   RFC154          ||       S.D. Crocker         ||         
+#   RFC155          ||       J.B. North         ||         
+#   RFC156          ||       J. Bouknight         ||         
+#   RFC157          ||       V.G. Cerf         ||         
+#   RFC158          ||      T.C. O'Sullivan         ||       
+#   RFC159          ||               ||         
+#   RFC160          ||       Network Information Center. Stanford Research Institute         ||         
+#   RFC161          ||       A. Shoshani         ||         
+#   RFC162          ||       M. Kampe         ||         
+#   RFC163          ||       V.G. Cerf         ||         
+#   RFC164          ||       J.F. Heafner         ||         
+#   RFC165          ||      J. Postel         ||       
+#   RFC166          ||       R.H. Anderson, V.G. Cerf, E. Harslem, J.F. Heafner, J. Madden, R.M. Metcalfe, A. Shoshani, J.E. White, D.C.M. Wood         ||         
+#   RFC167          ||       A.K. Bhushan, R.M. Metcalfe, J.M. Winett         ||         
+#   RFC168          ||       J.B. North         ||         
+#   RFC169          ||      S.D. Crocker         ||       
+#   RFC170          ||       Network Information Center. Stanford Research Institute         ||         
+#   RFC171          ||       A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenize, J. Melvin, B. Sundberg, D. Watson, J. White         ||         
+#   RFC172          ||       A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenzie, J. Melvin, B. Sundberg, D. Watson, J. White         ||         
+#   RFC173          ||       P.M. Karp, D.B. McKay         ||         
+#   RFC174          ||       J. Postel, V.G. Cerf         ||         
+#   RFC175          ||       E. Harslem, J.F. Heafner         ||         
+#   RFC176          ||       A.K. Bhushan, R. Kanodia, R.M. Metcalfe, J. Postel         ||         
+#   RFC177          ||       J. McConnell         ||         
+#   RFC178          ||       I.W. Cotton         ||         
+#   RFC179          ||       A.M. McKenzie         ||         
+#   RFC180          ||       A.M. McKenzie         ||         
+#   RFC181          ||       J. McConnell         ||         
+#   RFC182          ||       J.B. North         ||         
+#   RFC183          ||      J.M. Winett         ||       
+#   RFC184          ||       K.C. Kelley         ||         
+#   RFC185          ||       J.B. North         ||         
+#   RFC186          ||       J.C. Michener         ||         
+#   RFC187          ||       D.B. McKay, D.P. Karp         ||         
+#   RFC188          ||       P.M. Karp, D.B. McKay         ||         
+#   RFC189          ||       R.T. Braden         ||         
+#   RFC190          ||       L.P. Deutsch         ||         
+#   RFC191          ||       C.H. Irby         ||         
+#   RFC192          ||       R.W. Watson         ||         
+#   RFC193          ||       E. Harslem, J.F. Heafner         ||         
+#   RFC194          ||       V. Cerf, E. Harslem, J. Heafner, B. Metcalfe, J. White         ||         
+#   RFC195          ||       G.H. Mealy         ||         
+#   RFC196          ||       R.W. Watson         ||         
+#   RFC197          ||       A. Shoshani, E. Harslem         ||         
+#   RFC198          ||       J.F. Heafner         ||         
+#   RFC199          ||      T. Williams         ||       
+#   RFC200          ||       J.B. North         ||         
+#   RFC201          ||               ||         
+#   RFC202          ||       S.M. Wolfe, J. Postel         ||         
+#   RFC203          ||       R.B. Kalin         ||         
+#   RFC204          ||       J. Postel         ||         
+#   RFC205          ||       R.T. Braden         ||         
+#   RFC206          ||      J. White         ||       
+#   RFC207          ||       A. Vezza         ||         
+#   RFC208          ||       A.M. McKenzie         ||         
+#   RFC209          ||       B. Cosell         ||         
+#   RFC210          ||       W. Conrad         ||         
+#   RFC211          ||      J.B. North         ||       
+#   RFC212          ||       Information Sciences Institute University of Southern California         ||         
+#   RFC213          ||       B. Cosell         ||         
+#   RFC214          ||       E. Harslem         ||         
+#   RFC215          ||       A.M. McKenzie         ||         
+#   RFC216          ||      J.E. White         ||       
+#   RFC217          ||       J.E. White         ||         
+#   RFC218          ||       B. Cosell         ||         
+#   RFC219          ||       R. Winter         ||         
+#   RFC220          ||               ||         
+#   RFC221          ||       R.W. Watson         ||         
+#   RFC222          ||       R.M. Metcalfe         ||         
+#   RFC223          ||       J.T. Melvin, R.W. Watson         ||         
+#   RFC224          ||       A.M. McKenzie         ||         
+#   RFC225          ||       E. Harslem, R. Stoughton         ||         
+#   RFC226          ||       P.M. Karp         ||         
+#   RFC227          ||       J.F. Heafner, E. Harslem         ||         
+#   RFC228          ||       D.C. Walden         ||         
+#   RFC229          ||       J. Postel         ||         
+#   RFC230          ||       T. Pyke         ||         
+#   RFC231          ||       J.F. Heafner, E. Harslem         ||         
+#   RFC232          ||       A. Vezza         ||         
+#   RFC233          ||       A. Bhushan, R. Metcalfe         ||         
+#   RFC234          ||       A. Vezza         ||         
+#   RFC235          ||       E. Westheimer         ||         
+#   RFC236          ||       J. Postel         ||         
+#   RFC237          ||       R.W. Watson         ||         
+#   RFC238          ||       R.T. Braden         ||         
+#   RFC239          ||       R.T. Braden         ||         
+#   RFC240          ||       A.M. McKenzie         ||         
+#   RFC241          ||       A.M. McKenzie         ||         
+#   RFC242          ||       L. Haibt, A.P. Mullery         ||         
+#   RFC243          ||       A.P. Mullery         ||         
+#   RFC244          ||               ||         
+#   RFC245          ||       C. Falls         ||         
+#   RFC246          ||       A. Vezza         ||         
+#   RFC247          ||       P.M. Karp         ||         
+#   RFC248          ||               ||         
+#   RFC249          ||       R.F. Borelli         ||         
+#   RFC250          ||       H. Brodie         ||         
+#   RFC251          ||       D. Stern         ||         
+#   RFC252          ||       E. Westheimer         ||         
+#   RFC253          ||       J.A. Moorer         ||         
+#   RFC254          ||      A. Bhushan         ||       
+#   RFC255          ||       E. Westheimer         ||         
+#   RFC256          ||      B. Cosell         ||       
+#   RFC257          ||               ||         
+#   RFC258          ||               ||         
+#   RFC259          ||               ||         
+#   RFC260          ||               ||         
+#   RFC261          ||               ||         
+#   RFC262          ||               ||         
+#   RFC263          ||       A.M. McKenzie         ||         
+#   RFC264          ||       A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenize, B. Sundberg, D. Watson, J. White         ||         
+#   RFC265          ||       A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenzie, J. Melvin, B. Sundberg, D. Watson, J. White         ||         
+#   RFC266          ||       E. Westheimer         ||         
+#   RFC267          ||       E. Westheimer         ||         
+#   RFC268          ||       J. Postel         ||         
+#   RFC269          ||       H. Brodie         ||         
+#   RFC270          ||       A.M. McKenzie         ||         
+#   RFC271          ||       B. Cosell         ||         
+#   RFC272          ||               ||         
+#   RFC273          ||       R.W. Watson         ||         
+#   RFC274          ||       E. Forman         ||         
+#   RFC275          ||               ||         
+#   RFC276          ||       R.W. Watson         ||         
+#   RFC277          ||               ||         
+#   RFC278          ||       A.K. Bhushan, R.T. Braden, E. Harslem, J.F. Heafner, A.M. McKenzie, J.T. Melvin, R.L. Sundberg, R.W. Watson, J.E. White         ||         
+#   RFC279          ||               ||         
+#   RFC280          ||       R.W. Watson         ||         
+#   RFC281          ||       A.M. McKenzie         ||         
+#   RFC282          ||       M.A. Padlipsky         ||         
+#   RFC283          ||       R.T. Braden         ||         
+#   RFC284          ||               ||         
+#   RFC285          ||       D. Huff         ||         
+#   RFC286          ||       E. Forman         ||         
+#   RFC287          ||       E. Westheimer         ||         
+#   RFC288          ||       E. Westheimer         ||         
+#   RFC289          ||       R.W. Watson         ||         
+#   RFC290          ||       A.P. Mullery         ||         
+#   RFC291          ||       D.B. McKay         ||         
+#   RFC292          ||      J.C. Michener, I.W. Cotton, K.C. Kelley, D.E. Liddle, E. Meyer         ||       
+#   RFC293          ||       E. Westheimer         ||         
+#   RFC294          ||       A.K. Bhushan         ||         
+#   RFC295          ||       J. Postel         ||         
+#   RFC296          ||      D.E. Liddle         ||       
+#   RFC297          ||       D.C. Walden         ||         
+#   RFC298          ||       E. Westheimer         ||         
+#   RFC299          ||       D. Hopkin         ||         
+#   RFC300          ||       J.B. North         ||         
+#   RFC301          ||       R. Alter         ||         
+#   RFC302          ||       R.F. Bryan         ||         
+#   RFC303          ||       Network Information Center. Stanford Research Institute         ||         
+#   RFC304          ||      D.B. McKay         ||       
+#   RFC305          ||       R. Alter         ||         
+#   RFC306          ||       E. Westheimer         ||         
+#   RFC307          ||       E. Harslem         ||         
+#   RFC308          ||       M. Seriff         ||         
+#   RFC309          ||       A.K. Bhushan         ||         
+#   RFC310          ||       A.K. Bhushan         ||         
+#   RFC311          ||       R.F. Bryan         ||         
+#   RFC312          ||       A.M. McKenzie         ||         
+#   RFC313          ||       T.C. O'Sullivan         ||         
+#   RFC314          ||       I.W. Cotton         ||         
+#   RFC315          ||       E. Westheimer         ||         
+#   RFC316          ||       D.B. McKay, A.P. Mullery         ||         
+#   RFC317          ||       J. Postel         ||         
+#   RFC318          ||       J. Postel         ||         
+#   RFC319          ||       E. Westheimer         ||         
+#   RFC320          ||      R. Reddy         ||       
+#   RFC321          ||       P.M. Karp         ||         
+#   RFC322          ||       V. Cerf, J. Postel         ||         
+#   RFC323          ||       V. Cerf         ||         
+#   RFC324          ||       J. Postel         ||         
+#   RFC325          ||       G. Hicks         ||         
+#   RFC326          ||       E. Westheimer         ||         
+#   RFC327          ||       A.K. Bhushan         ||         
+#   RFC328          ||       J. Postel         ||         
+#   RFC329          ||       Network Information Center. Stanford Research Institute         ||         
+#   RFC330          ||       E. Westheimer         ||         
+#   RFC331          ||       J.M. McQuillan         ||         
+#   RFC332          ||       E. Westheimer         ||         
+#   RFC333          ||       R.D. Bressler, D. Murphy, D.C. Walden         ||         
+#   RFC334          ||       A.M. McKenzie         ||         
+#   RFC335          ||       R.F. Bryan         ||         
+#   RFC336          ||       I.W. Cotton         ||         
+#   RFC337          ||               ||         
+#   RFC338          ||       R.T. Braden         ||         
+#   RFC339          ||       R. Thomas         ||         
+#   RFC340          ||       T.C. O'Sullivan         ||         
+#   RFC341          ||               ||         
+#   RFC342          ||       E. Westheimer         ||         
+#   RFC343          ||       A.M. McKenzie         ||         
+#   RFC344          ||       E. Westheimer         ||         
+#   RFC345          ||       K.C. Kelley         ||         
+#   RFC346          ||       J. Postel         ||         
+#   RFC347          ||       J. Postel         ||         
+#   RFC348          ||       J. Postel         ||         
+#   RFC349          ||       J. Postel         ||         
+#   RFC350          ||       R. Stoughton         ||         
+#   RFC351          ||       D. Crocker         ||         
+#   RFC352          ||       D. Crocker         ||         
+#   RFC353          ||       E. Westheimer         ||         
+#   RFC354          ||       A.K. Bhushan         ||         
+#   RFC355          ||       J. Davidson         ||         
+#   RFC356          ||       R. Alter         ||         
+#   RFC357          ||       J. Davidson         ||         
+#   RFC358          ||               ||         
+#   RFC359          ||       D.C. Walden         ||         
+#   RFC360          ||      C. Holland         ||       
+#   RFC361          ||       R.D. Bressler         ||         
+#   RFC362          ||       E. Westheimer         ||         
+#   RFC363          ||       Network Information Center. Stanford Research Institute         ||         
+#   RFC364          ||       M.D. Abrams         ||         
+#   RFC365          ||       D.C. Walden         ||         
+#   RFC366          ||       E. Westheimer         ||         
+#   RFC367          ||       E. Westheimer         ||         
+#   RFC368          ||       R.T. Braden         ||         
+#   RFC369          ||       J.R. Pickens         ||         
+#   RFC370          ||       E. Westheimer         ||         
+#   RFC371          ||       R.E. Kahn         ||         
+#   RFC372          ||       R.W. Watson         ||         
+#   RFC373          ||       J. McCarthy         ||         
+#   RFC374          ||       A.M. McKenzie         ||         
+#   RFC375          ||               ||         
+#   RFC376          ||       E. Westheimer         ||         
+#   RFC377          ||       R.T. Braden         ||         
+#   RFC378          ||       A.M. McKenzie         ||         
+#   RFC379          ||       R. Braden         ||         
+#   RFC380          ||               ||         
+#   RFC381          ||       J.M. McQuillan         ||         
+#   RFC382          ||       L. McDaniel         ||         
+#   RFC383          ||               ||         
+#   RFC384          ||       J.B. North         ||         
+#   RFC385          ||       A.K. Bhushan         ||         
+#   RFC386          ||       B. Cosell, D.C. Walden         ||         
+#   RFC387          ||       K.C. Kelley, J. Meir         ||         
+#   RFC388          ||       V. Cerf         ||         
+#   RFC389          ||       B. Noble         ||         
+#   RFC390          ||       R.T. Braden         ||         
+#   RFC391          ||       A.M. McKenzie         ||         
+#   RFC392          ||       G. Hicks, B.D. Wessler         ||         
+#   RFC393          ||       J.M. Winett         ||         
+#   RFC394          ||       J.M. McQuillan         ||         
+#   RFC395          ||       J.M. McQuillan         ||         
+#   RFC396          ||       S. Bunch         ||         
+#   RFC397          ||               ||         
+#   RFC398          ||      J.R. Pickens, E. Faeh         ||       
+#   RFC399          ||       M. Krilanovich         ||         
+#   RFC400          ||       A.M. McKenzie         ||         
+#   RFC401          ||       J. Hansen         ||         
+#   RFC402          ||       J.B. North         ||         
+#   RFC403          ||      G. Hicks         ||       
+#   RFC404          ||       A.M. McKenzie         ||         
+#   RFC405          ||       A.M. McKenzie         ||         
+#   RFC406          ||       J.M. McQuillan         ||         
+#   RFC407          ||       R.D. Bressler, R. Guida, A.M. McKenzie         ||         
+#   RFC408          ||       A.D. Owen, J. Postel         ||         
+#   RFC409          ||       J.E. White         ||         
+#   RFC410          ||       J.M. McQuillan         ||         
+#   RFC411          ||       M.A. Padlipsky         ||         
+#   RFC412          ||       G. Hicks         ||         
+#   RFC413          ||       A.M. McKenzie         ||         
+#   RFC414          ||       A.K. Bhushan         ||         
+#   RFC415          ||       H. Murray         ||         
+#   RFC416          ||       J.C. Norton         ||         
+#   RFC417          ||       J. Postel, C. Kline         ||         
+#   RFC418          ||      W. Hathaway         ||       
+#   RFC419          ||       A. Vezza         ||         
+#   RFC420          ||       H. Murray         ||         
+#   RFC421          ||       A.M. McKenzie         ||         
+#   RFC422          ||       A.M. McKenzie         ||         
+#   RFC423          ||       B. Noble         ||         
+#   RFC424          ||               ||         
+#   RFC425          ||       R.D. Bressler         ||         
+#   RFC426          ||       R. Thomas         ||         
+#   RFC427          ||               ||         
+#   RFC428          ||               ||         
+#   RFC429          ||       J. Postel         ||         
+#   RFC430          ||       R.T. Braden         ||         
+#   RFC431          ||       M. Krilanovich         ||         
+#   RFC432          ||       N. Neigus         ||         
+#   RFC433          ||       J. Postel         ||         
+#   RFC434          ||       A.M. McKenzie         ||         
+#   RFC435          ||       B. Cosell, D.C. Walden         ||         
+#   RFC436          ||       M. Krilanovich         ||         
+#   RFC437          ||       E. Faeh         ||         
+#   RFC438          ||       R. Thomas, R. Clements         ||         
+#   RFC439          ||       V. Cerf         ||         
+#   RFC440          ||       D.C. Walden         ||         
+#   RFC441          ||       R.D. Bressler, R. Thomas         ||         
+#   RFC442          ||       V. Cerf         ||         
+#   RFC443          ||       A.M. McKenzie         ||         
+#   RFC444          ||               ||         
+#   RFC445          ||       A.M. McKenzie         ||         
+#   RFC446          ||       L.P. Deutsch         ||         
+#   RFC447          ||       A.M. McKenzie         ||         
+#   RFC448          ||       R.T. Braden         ||         
+#   RFC449          ||       D.C. Walden         ||         
+#   RFC450          ||       M.A. Padlipsky         ||         
+#   RFC451          ||       M.A. Padlipsky         ||         
+#   RFC452          ||      J. Winett         ||       
+#   RFC453          ||       M.D. Kudlick         ||         
+#   RFC454          ||       A.M. McKenzie         ||         
+#   RFC455          ||       A.M. McKenzie         ||         
+#   RFC456          ||       M.D. Kudlick         ||         
+#   RFC457          ||       D.C. Walden         ||         
+#   RFC458          ||       R.D. Bressler, R. Thomas         ||         
+#   RFC459          ||       W. Kantrowitz         ||         
+#   RFC460          ||       C. Kline         ||         
+#   RFC461          ||       A.M. McKenzie         ||         
+#   RFC462          ||       J. Iseli, D. Crocker         ||         
+#   RFC463          ||       A.K. Bhushan         ||         
+#   RFC464          ||       M.D. Kudlick         ||         
+#   RFC465          ||               ||         
+#   RFC466          ||       J.M. Winett         ||         
+#   RFC467          ||       J.D. Burchfiel, R.S. Tomlinson         ||         
+#   RFC468          ||       R.T. Braden         ||         
+#   RFC469          ||       M.D. Kudlick         ||         
+#   RFC470          ||       R. Thomas         ||         
+#   RFC471          ||       R. Thomas         ||         
+#   RFC472          ||       S. Bunch         ||         
+#   RFC473          ||       D.C. Walden         ||         
+#   RFC474          ||       S. Bunch         ||         
+#   RFC475          ||      A.K. Bhushan         ||       
+#   RFC476          ||       A.M. McKenzie         ||         
+#   RFC477          ||       M. Krilanovich         ||         
+#   RFC478          ||       R.D. Bressler, R. Thomas         ||         
+#   RFC479          ||       J.E. White         ||         
+#   RFC480          ||       J.E. White         ||         
+#   RFC481          ||               ||         
+#   RFC482          ||      A.M. McKenzie         ||       
+#   RFC483          ||       M.D. Kudlick         ||         
+#   RFC484          ||               ||         
+#   RFC485          ||       J.R. Pickens         ||         
+#   RFC486          ||       R.D. Bressler         ||         
+#   RFC487          ||       R.D. Bressler         ||         
+#   RFC488          ||       M.F. Auerbach         ||         
+#   RFC489          ||       J. Postel         ||         
+#   RFC490          ||       J.R. Pickens         ||         
+#   RFC491          ||       M.A. Padlipsky         ||         
+#   RFC492          ||       E. Meyer         ||         
+#   RFC493          ||      J.C. Michener, I.W. Cotton, K.C. Kelley, D.E. Liddle, E. Meyer         ||       
+#   RFC494          ||       D.C. Walden         ||         
+#   RFC495          ||      A.M. McKenzie         ||       
+#   RFC496          ||       M.F. Auerbach         ||         
+#   RFC497          ||      A.M. McKenzie         ||       
+#   RFC498          ||       R.T. Braden         ||         
+#   RFC499          ||      B.R. Reussow         ||       
+#   RFC500          ||      A. Shoshani, I. Spiegler         ||       
+#   RFC501          ||       K.T. Pogran         ||         
+#   RFC502          ||               ||         
+#   RFC503          ||       N. Neigus, J. Postel         ||         
+#   RFC504          ||       R. Thomas         ||         
+#   RFC505          ||       M.A. Padlipsky         ||         
+#   RFC506          ||       M.A. Padlipsky         ||         
+#   RFC507          ||               ||         
+#   RFC508          ||       L. Pfeifer, J. McAfee         ||         
+#   RFC509          ||       A.M. McKenzie         ||         
+#   RFC510          ||       J.E. White         ||         
+#   RFC511          ||       J.B. North         ||         
+#   RFC512          ||       W. Hathaway         ||         
+#   RFC513          ||       W. Hathaway         ||         
+#   RFC514          ||       W. Kantrowitz         ||         
+#   RFC515          ||       R. Winter         ||         
+#   RFC516          ||       J. Postel         ||         
+#   RFC517          ||               ||         
+#   RFC518          ||       N. Vaughan, E.J. Feinler         ||         
+#   RFC519          ||      J.R. Pickens         ||       
+#   RFC520          ||       J.D. Day         ||         
+#   RFC521          ||       A.M. McKenzie         ||         
+#   RFC522          ||      A.M. McKenzie         ||       
+#   RFC523          ||       A.K. Bhushan         ||         
+#   RFC524          ||       J.E. White         ||         
+#   RFC525          ||       W. Parrish, J.R. Pickens         ||         
+#   RFC526          ||       W.K. Pratt         ||         
+#   RFC527          ||       R. Merryman         ||         
+#   RFC528          ||       J.M. McQuillan         ||         
+#   RFC529          ||       A.M. McKenzie, R. Thomas, R.S. Tomlinson, K.T. Pogran         ||         
+#   RFC530          ||      A.K. Bhushan         ||       
+#   RFC531          ||       M.A. Padlipsky         ||         
+#   RFC532          ||       R.G. Merryman         ||         
+#   RFC533          ||       D.C. Walden         ||         
+#   RFC534          ||       D.C. Walden         ||         
+#   RFC535          ||      R. Thomas         ||       
+#   RFC536          ||               ||         
+#   RFC537          ||       S. Bunch         ||         
+#   RFC538          ||      A.M. McKenzie         ||       
+#   RFC539          ||       D. Crocker, J. Postel         ||         
+#   RFC540          ||               ||         
+#   RFC541          ||               ||         
+#   RFC542          ||      N. Neigus         ||       
+#   RFC543          ||       N.D. Meyer         ||         
+#   RFC544          ||       N.D. Meyer, K. Kelley         ||         
+#   RFC545          ||       J.R. Pickens         ||         
+#   RFC546          ||       R. Thomas         ||         
+#   RFC547          ||       D.C. Walden         ||         
+#   RFC548          ||       D.C. Walden         ||         
+#   RFC549          ||       J.C. Michener         ||         
+#   RFC550          ||       L.P. Deutsch         ||         
+#   RFC551          ||      Y. Feinroth, R. Fink         ||       
+#   RFC552          ||       A.D. Owen         ||         
+#   RFC553          ||       C.H. Irby, K. Victor         ||         
+#   RFC554          ||               ||         
+#   RFC555          ||       J.E. White         ||         
+#   RFC556          ||      A.M. McKenzie         ||       
+#   RFC557          ||      B.D. Wessler         ||       
+#   RFC558          ||               ||         
+#   RFC559          ||       A.K. Bushan         ||         
+#   RFC560          ||      D. Crocker, J. Postel         ||       
+#   RFC561          ||      A.K. Bhushan, K.T. Pogran, R.S. Tomlinson, J.E. White         ||       
+#   RFC562          ||      A.M. McKenzie         ||       
+#   RFC563          ||       J. Davidson         ||         
+#   RFC564          ||               ||         
+#   RFC565          ||       D. Cantor         ||         
+#   RFC566          ||      A.M. McKenzie         ||       
+#   RFC567          ||       L.P. Deutsch         ||         
+#   RFC568          ||       J.M. McQuillan         ||         
+#   RFC569          ||       M.A. Padlipsky         ||         
+#   RFC570          ||       J.R. Pickens         ||         
+#   RFC571          ||      R. Braden         ||       
+#   RFC572          ||               ||         
+#   RFC573          ||      A. Bhushan         ||       
+#   RFC574          ||      M. Krilanovich         ||       
+#   RFC575          ||               ||         
+#   RFC576          ||      K. Victor         ||       
+#   RFC577          ||      D. Crocker         ||       
+#   RFC578          ||      A.K. Bhushan, N.D. Ryan         ||       
+#   RFC579          ||      A.M. McKenzie         ||       
+#   RFC580          ||       J. Postel         ||         
+#   RFC581          ||      D. Crocker, J. Postel         ||       
+#   RFC582          ||       R. Clements         ||         
+#   RFC583          ||               ||         
+#   RFC584          ||       J. Iseli, D. Crocker, N. Neigus         ||         
+#   RFC585          ||       D. Crocker, N. Neigus, E.J. Feinler, J. Iseli         ||         
+#   RFC586          ||      A.M. McKenzie         ||       
+#   RFC587          ||      J. Postel         ||       
+#   RFC588          ||      A. Stokes         ||       
+#   RFC589          ||       R.T. Braden         ||         
+#   RFC590          ||       M.A. Padlipsky         ||         
+#   RFC591          ||       D.C. Walden         ||         
+#   RFC592          ||      R.W. Watson         ||       
+#   RFC593          ||       A.M. McKenzie, J. Postel         ||         
+#   RFC594          ||      J.D. Burchfiel         ||       
+#   RFC595          ||       W. Hathaway         ||         
+#   RFC596          ||       E.A. Taft         ||         
+#   RFC597          ||       N. Neigus, E.J. Feinler         ||         
+#   RFC598          ||      Network Information Center. Stanford Research Institute         ||       
+#   RFC599          ||       R.T. Braden         ||         
+#   RFC600          ||      A. Berggreen         ||       
+#   RFC601          ||       A.M. McKenzie         ||         
+#   RFC602          ||       R.M. Metcalfe         ||         
+#   RFC603          ||       J.D. Burchfiel         ||         
+#   RFC604          ||       J. Postel         ||         
+#   RFC605          ||               ||         
+#   RFC606          ||       L.P. Deutsch         ||         
+#   RFC607          ||       M. Krilanovich, G. Gregg         ||         
+#   RFC608          ||       M.D. Kudlick         ||         
+#   RFC609          ||       B. Ferguson         ||         
+#   RFC610          ||       R. Winter, J. Hill, W. Greiff         ||         
+#   RFC611          ||       D.C. Walden         ||         
+#   RFC612          ||       A.M. McKenzie         ||         
+#   RFC613          ||       A.M. McKenzie         ||         
+#   RFC614          ||       K.T. Pogran, N. Neigus         ||         
+#   RFC615          ||      D. Crocker         ||       
+#   RFC616          ||      D. Walden         ||       
+#   RFC617          ||       E.A. Taft         ||         
+#   RFC618          ||       E.A. Taft         ||         
+#   RFC619          ||       W. Naylor, H. Opderbeck         ||         
+#   RFC620          ||       B. Ferguson         ||         
+#   RFC621          ||       M.D. Kudlick         ||         
+#   RFC622          ||       A.M. McKenzie         ||         
+#   RFC623          ||       M. Krilanovich         ||         
+#   RFC624          ||       M. Krilanovich, G. Gregg, W. Hathaway, J.E. White         ||         
+#   RFC625          ||       M.D. Kudlick, E.J. Feinler         ||         
+#   RFC626          ||       L. Kleinrock, H. Opderbeck         ||         
+#   RFC627          ||       M.D. Kudlick, E.J. Feinler         ||         
+#   RFC628          ||       M.L. Keeney         ||         
+#   RFC629          ||       J.B. North         ||         
+#   RFC630          ||       J. Sussman         ||         
+#   RFC631          ||       A. Danthine         ||         
+#   RFC632          ||       H. Opderbeck         ||         
+#   RFC633          ||       A.M. McKenzie         ||         
+#   RFC634          ||       A.M. McKenzie         ||         
+#   RFC635          ||       V. Cerf         ||         
+#   RFC636          ||       J.D. Burchfiel, B. Cosell, R.S. Tomlinson, D.C. Walden         ||         
+#   RFC637          ||       A.M. McKenzie         ||         
+#   RFC638          ||       A.M. McKenzie         ||         
+#   RFC639          ||               ||         
+#   RFC640          ||       J. Postel         ||         
+#   RFC641          ||               ||         
+#   RFC642          ||       J.D. Burchfiel         ||         
+#   RFC643          ||       E. Mader         ||         
+#   RFC644          ||       R. Thomas         ||         
+#   RFC645          ||      D. Crocker         ||       
+#   RFC646          ||               ||         
+#   RFC647          ||      M.A. Padlipsky         ||       
+#   RFC648          ||               ||         
+#   RFC649          ||               ||         
+#   RFC650          ||               ||         
+#   RFC651          ||       D. Crocker         ||         
+#   RFC652          ||       D. Crocker         ||         
+#   RFC653          ||       D. Crocker         ||         
+#   RFC654          ||       D. Crocker         ||         
+#   RFC655          ||       D. Crocker         ||         
+#   RFC656          ||       D. Crocker         ||         
+#   RFC657          ||       D. Crocker         ||         
+#   RFC658          ||       D. Crocker         ||         
+#   RFC659          ||       J. Postel         ||         
+#   RFC660          ||       D.C. Walden         ||         
+#   RFC661          ||      J. Postel         ||       
+#   RFC662          ||       R. Kanodia         ||         
+#   RFC663          ||       R. Kanodia         ||         
+#   RFC664          ||               ||         
+#   RFC665          ||               ||         
+#   RFC666          ||       M.A. Padlipsky         ||         
+#   RFC667          ||      S.G. Chipman         ||       
+#   RFC668          ||               ||         
+#   RFC669          ||      D.W. Dodds         ||       
+#   RFC670          ||               ||         
+#   RFC671          ||      R. Schantz         ||       
+#   RFC672          ||       R. Schantz         ||         
+#   RFC673          ||               ||         
+#   RFC674          ||       J. Postel, J.E. White         ||         
+#   RFC675          ||      V. Cerf, Y. Dalal, C. Sunshine         ||       
+#   RFC676          ||               ||         
+#   RFC677          ||       P.R. Johnson, R. Thomas         ||         
+#   RFC678          ||       J. Postel         ||         
+#   RFC679          ||      D.W. Dodds         ||       
+#   RFC680          ||       T.H. Myer, D.A. Henderson         ||         
+#   RFC681          ||       S. Holmgren         ||         
+#   RFC682          ||               ||         
+#   RFC683          ||       R. Clements         ||         
+#   RFC684          ||       R. Schantz         ||         
+#   RFC685          ||       M. Beeler         ||         
+#   RFC686          ||       B. Harvey         ||         
+#   RFC687          ||       D.C. Walden         ||         
+#   RFC688          ||       D.C. Walden         ||         
+#   RFC689          ||       R. Clements         ||         
+#   RFC690          ||       J. Postel         ||         
+#   RFC691          ||       B. Harvey         ||         
+#   RFC692          ||       S.M. Wolfe         ||         
+#   RFC693          ||               ||         
+#   RFC694          ||      J. Postel         ||       
+#   RFC695          ||       M. Krilanovich         ||         
+#   RFC696          ||      V.G. Cerf         ||       
+#   RFC697          ||       J. Lieb         ||         
+#   RFC698          ||      T. Mock         ||       
+#   RFC699          ||       J. Postel, J. Vernon         ||         
+#   RFC700          ||      E. Mader, W.W. Plummer, R.S. Tomlinson         ||       
+#   RFC701          ||      D.W. Dodds         ||       
+#   RFC702          ||      D.W. Dodds         ||       
+#   RFC703          ||      D.W. Dodds         ||       
+#   RFC704          ||       P.J. Santos         ||         
+#   RFC705          ||       R.F. Bryan         ||         
+#   RFC706          ||       J. Postel         ||         
+#   RFC707          ||       J.E. White         ||         
+#   RFC708          ||       J.E. White         ||         
+#   RFC709          ||               ||         
+#   RFC710          ||               ||         
+#   RFC711          ||               ||       
+#   RFC712          ||      J.E. Donnelley         ||       
+#   RFC713          ||       J. Haverty         ||         
+#   RFC714          ||      A.M. McKenzie         ||       
+#   RFC715          ||               ||       
+#   RFC716          ||       D.C. Walden, J. Levin         ||         
+#   RFC717          ||       J. Postel         ||         
+#   RFC718          ||       J. Postel         ||         
+#   RFC719          ||       J. Postel         ||         
+#   RFC720          ||       D. Crocker         ||         
+#   RFC721          ||      L.L. Garlick         ||       
+#   RFC722          ||       J. Haverty         ||         
+#   RFC723          ||               ||       
+#   RFC724          ||       D. Crocker, K.T. Pogran, J. Vittal, D.A. Henderson         ||         
+#   RFC725          ||       J.D. Day, G.R. Grossman         ||         
+#   RFC726          ||       J. Postel, D. Crocker         ||         
+#   RFC727          ||       M.R. Crispin         ||         
+#   RFC728          ||       J.D. Day         ||         
+#   RFC729          ||       D. Crocker         ||         
+#   RFC730          ||       J. Postel         ||         
+#   RFC731          ||       J.D. Day         ||         
+#   RFC732          ||       J.D. Day         ||         
+#   RFC733          ||       D. Crocker, J. Vittal, K.T. Pogran, D.A. Henderson         ||         
+#   RFC734          ||      M.R. Crispin         ||       
+#   RFC735          ||       D. Crocker, R.H. Gumpertz         ||         
+#   RFC736          ||       M.R. Crispin         ||         
+#   RFC737          ||       K. Harrenstien         ||         
+#   RFC738          ||       K. Harrenstien         ||         
+#   RFC739          ||       J. Postel         ||         
+#   RFC740          ||       R.T. Braden         ||         
+#   RFC741          ||       D. Cohen         ||         
+#   RFC742          ||       K. Harrenstien         ||         
+#   RFC743          ||       K. Harrenstien         ||         
+#   RFC744          ||       J. Sattley         ||         
+#   RFC745          ||       M. Beeler         ||         
+#   RFC746          ||       R. Stallman         ||         
+#   RFC747          ||       M.R. Crispin         ||         
+#   RFC748          ||       M.R. Crispin         ||         
+#   RFC749          ||       B. Greenberg         ||         
+#   RFC750          ||       J. Postel         ||         
+#   RFC751          ||       P.D. Lebling         ||         
+#   RFC752          ||       M.R. Crispin         ||         
+#   RFC753          ||       J. Postel         ||         
+#   RFC754          ||       J. Postel         ||         
+#   RFC755          ||       J. Postel         ||         
+#   RFC756          ||       J.R. Pickens, E.J. Feinler, J.E. Mathis         ||         
+#   RFC757          ||       D.P. Deutsch         ||         
+#   RFC758          ||       J. Postel         ||         
+#   RFC759          ||       J. Postel         ||         
+#   RFC760          ||       J. Postel         ||         
+#   RFC761          ||      J. Postel         ||       
+#   RFC762          ||       J. Postel         ||         
+#   RFC763          ||       M.D. Abrams         ||         
+#   RFC764          ||       J. Postel         ||         
+#   RFC765          ||       J. Postel         ||         
+#   RFC766          ||       J. Postel         ||         
+#   RFC767          ||       J. Postel         ||         
+#   RFC768          ||       J. Postel         ||         
+#   RFC769          ||       J. Postel         ||         
+#   RFC770          ||       J. Postel         ||         
+#   RFC771          ||       V.G. Cerf, J. Postel         ||         
+#   RFC772          ||      S. Sluizer, J. Postel         ||       
+#   RFC773          ||       V.G. Cerf         ||         
+#   RFC774          ||       J. Postel         ||         
+#   RFC775          ||       D. Mankins, D. Franklin, A.D. Owen         ||         
+#   RFC776          ||       J. Postel         ||         
+#   RFC777          ||      J. Postel         ||       
+#   RFC778          ||       D.L. Mills         ||         
+#   RFC779          ||      E. Killian         ||       
+#   RFC780          ||      S. Sluizer, J. Postel         ||       
+#   RFC781          ||       Z. Su         ||         
+#   RFC782          ||       J. Nabielsky, A.P. Skelton         ||         
+#   RFC783          ||       K.R. Sollins         ||         
+#   RFC784          ||       S. Sluizer, J. Postel         ||         
+#   RFC785          ||       S. Sluizer, J. Postel         ||         
+#   RFC786          ||       S. Sluizer, J. Postel         ||         
+#   RFC787          ||       A.L. Chapin         ||         
+#   RFC788          ||      J. Postel         ||       
+#   RFC789          ||       E.C. Rosen         ||         
+#   RFC790          ||       J. Postel         ||         
+#   RFC791          ||      J. Postel         ||       
+#   RFC792          ||      J. Postel         ||       
+#   RFC793          ||      J. Postel         ||       
+#   RFC794          ||      V.G. Cerf         ||       
+#   RFC795          ||       J. Postel         ||         
+#   RFC796          ||      J. Postel         ||       
+#   RFC797          ||       A.R. Katz         ||         
+#   RFC798          ||       A.R. Katz         ||         
+#   RFC799          ||       D.L. Mills         ||         
+#   RFC800          ||       J. Postel, J. Vernon         ||         
+#   RFC801          ||       J. Postel         ||         
+#   RFC802          ||       A.G. Malis         ||         
+#   RFC803          ||       A. Agarwal, M.J. O'Connor, D.L. Mills         ||         
+#   RFC804          ||       International Telegraph and Telephone Consultative Committee of the International Telecommunication Union         ||         
+#   RFC805          ||       J. Postel         ||         
+#   RFC806          ||       National Bureau of Standards         ||         
+#   RFC807          ||       J. Postel         ||         
+#   RFC808          ||       J. Postel         ||         
+#   RFC809          ||       T. Chang         ||         
+#   RFC810          ||       E.J. Feinler, K. Harrenstien, Z. Su, V. White         ||         
+#   RFC811          ||       K. Harrenstien, V. White, E.J. Feinler         ||         
+#   RFC812          ||       K. Harrenstien, V. White         ||         
+#   RFC813          ||      D.D. Clark         ||       
+#   RFC814          ||      D.D. Clark         ||       
+#   RFC815          ||       D.D. Clark         ||         
+#   RFC816          ||      D.D. Clark         ||       
+#   RFC817          ||      D.D. Clark         ||       
+#   RFC818          ||       J. Postel         ||         
+#   RFC819          ||      Z. Su, J. Postel         ||       
+#   RFC820          ||       J. Postel         ||         
+#   RFC821          ||       J. Postel         ||         
+#   RFC822          ||       D. Crocker         ||         
+#   RFC823          ||      R.M. Hinden, A. Sheltzer         ||       bob.hinden@gmail.com
+#   RFC824          ||       W.I. MacGregor, D.C. Tappan         ||         
+#   RFC825          ||       J. Postel         ||         
+#   RFC826          ||      D. Plummer         ||       
+#   RFC827          ||       E.C. Rosen         ||         
+#   RFC828          ||       K. Owen         ||         
+#   RFC829          ||       V.G. Cerf         ||         
+#   RFC830          ||       Z. Su         ||         
+#   RFC831          ||       R.T. Braden         ||         
+#   RFC832          ||       D. Smallberg         ||         
+#   RFC833          ||       D. Smallberg         ||         
+#   RFC834          ||       D. Smallberg         ||         
+#   RFC835          ||       D. Smallberg         ||         
+#   RFC836          ||       D. Smallberg         ||         
+#   RFC837          ||       D. Smallberg         ||         
+#   RFC838          ||       D. Smallberg         ||         
+#   RFC839          ||       D. Smallberg         ||         
+#   RFC840          ||       J. Postel         ||         
+#   RFC841          ||       National Bureau of Standards         ||         
+#   RFC842          ||       D. Smallberg         ||         
+#   RFC843          ||       D. Smallberg         ||         
+#   RFC844          ||       R. Clements         ||         
+#   RFC845          ||       D. Smallberg         ||         
+#   RFC846          ||       D. Smallberg         ||         
+#   RFC847          ||       A. Westine, D. Smallberg, J. Postel         ||         
+#   RFC848          ||       D. Smallberg         ||         
+#   RFC849          ||       M.R. Crispin         ||         
+#   RFC850          ||       M.R. Horton         ||         
+#   RFC851          ||       A.G. Malis         ||         
+#   RFC852          ||      A.G. Malis         ||       
+#   RFC853          ||               ||       
+#   RFC854          ||      J. Postel, J.K. Reynolds         ||       
+#   RFC855          ||       J. Postel, J.K. Reynolds         ||         
+#   RFC856          ||      J. Postel, J. Reynolds         ||         
+#   RFC857          ||      J. Postel, J. Reynolds         ||         
+#   RFC858          ||       J. Postel, J. Reynolds         ||         
+#   RFC859          ||       J. Postel, J. Reynolds         ||         
+#   RFC860          ||       J. Postel, J. Reynolds         ||         
+#   RFC861          ||      J. Postel, J. Reynolds         ||       
+#   RFC862          ||       J. Postel         ||         
+#   RFC863          ||       J. Postel         ||         
+#   RFC864          ||       J. Postel         ||         
+#   RFC865          ||       J. Postel         ||         
+#   RFC866          ||       J. Postel         ||         
+#   RFC867          ||       J. Postel         ||         
+#   RFC868          ||       J. Postel, K. Harrenstien         ||         
+#   RFC869          ||      R. Hinden         ||       bob.hinden@gmail.com
+#   RFC870          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC871          ||       M.A. Padlipsky         ||         
+#   RFC872          ||      M.A. Padlipsky         ||       
+#   RFC873          ||       M.A. Padlipsky         ||         
+#   RFC874          ||       M.A. Padlipsky         ||         
+#   RFC875          ||       M.A. Padlipsky         ||         
+#   RFC876          ||       D. Smallberg         ||         
+#   RFC877          ||       J.T. Korb         ||         
+#   RFC878          ||       A.G. Malis         ||         
+#   RFC879          ||      J. Postel         ||       
+#   RFC880          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC881          ||       J. Postel         ||         
+#   RFC882          ||       P.V. Mockapetris         ||         
+#   RFC883          ||       P.V. Mockapetris         ||         
+#   RFC884          ||       M. Solomon, E. Wimmers         ||         
+#   RFC885          ||       J. Postel         ||         
+#   RFC886          ||       M.T. Rose         ||         
+#   RFC887          ||       M. Accetta         ||         
+#   RFC888          ||       L. Seamonson, E.C. Rosen         ||         
+#   RFC889          ||      D.L. Mills         ||       
+#   RFC890          ||       J. Postel         ||         
+#   RFC891          ||       D.L. Mills         ||         
+#   RFC892          ||       International Organization for Standardization         ||         
+#   RFC893          ||      S. Leffler, M.J. Karels         ||       
+#   RFC894          ||      C. Hornig         ||       
+#   RFC895          ||      J. Postel         ||       
+#   RFC896          ||      J. Nagle         ||       
+#   RFC897          ||       J. Postel         ||         
+#   RFC898          ||      R.M. Hinden, J. Postel, M. Muuss, J.K. Reynolds         ||       bob.hinden@gmail.com
+#   RFC899          ||       J. Postel, A. Westine         ||         
+#   RFC900          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC901          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC902          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC903          ||      R. Finlayson, T. Mann, J.C. Mogul, M. Theimer         ||       
+#   RFC904          ||      D.L. Mills         ||       
+#   RFC905          ||      ISO         ||       
+#   RFC906          ||       R. Finlayson         ||         
+#   RFC907          ||      Bolt Beranek and Newman Laboratories         ||         
+#   RFC908          ||      D. Velten, R.M. Hinden, J. Sax         ||       bob.hinden@gmail.com
+#   RFC909          ||       C. Welles, W. Milliken         ||         
+#   RFC910          ||       H.C. Forsdick         ||         
+#   RFC911          ||       P. Kirton         ||         
+#   RFC912          ||       M. St. Johns         ||         
+#   RFC913          ||       M. Lottor         ||         
+#   RFC914          ||       D.J. Farber, G. Delp, T.M. Conte         ||         
+#   RFC915          ||       M.A. Elvy, R. Nedved         ||         
+#   RFC916          ||       G.G. Finn         ||         
+#   RFC917          ||       J.C. Mogul         ||         
+#   RFC918          ||       J.K. Reynolds         ||         
+#   RFC919          ||       J.C. Mogul         ||         
+#   RFC920          ||       J. Postel, J.K. Reynolds         ||         
+#   RFC921          ||       J. Postel         ||         
+#   RFC922          ||       J.C. Mogul         ||         
+#   RFC923          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC924          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC925          ||       J. Postel         ||         
+#   RFC926          ||       International Organization for Standardization         ||         
+#   RFC927          ||       B.A. Anderson         ||         
+#   RFC928          ||       M.A. Padlipsky         ||         
+#   RFC929          ||       J. Lilienkamp, R. Mandell, M.A. Padlipsky         ||         
+#   RFC930          ||       M. Solomon, E. Wimmers         ||         
+#   RFC931          ||       M. St. Johns         ||         
+#   RFC932          ||       D.D. Clark         ||         
+#   RFC933          ||       S. Silverman         ||         
+#   RFC934          ||       M.T. Rose, E.A. Stefferud         ||         
+#   RFC935          ||       J.G. Robinson         ||         
+#   RFC936          ||       M.J. Karels         ||         
+#   RFC937          ||       M. Butler, J. Postel, D. Chase, J. Goldberger, J.K. Reynolds         ||         
+#   RFC938          ||       T. Miller         ||         
+#   RFC939          ||       National Research Council         ||         
+#   RFC940          ||      Gateway Algorithms and Data Structures Task Force         ||       
+#   RFC941          ||      International Organization for Standardization         ||       
+#   RFC942          ||       National Research Council         ||         
+#   RFC943          ||      J.K. Reynolds, J. Postel         ||       
+#   RFC944          ||      J.K. Reynolds, J. Postel         ||       
+#   RFC945          ||       J. Postel         ||         
+#   RFC946          ||       R. Nedved         ||         
+#   RFC947          ||       K. Lebowitz, D. Mankins         ||         
+#   RFC948          ||       I. Winston         ||         
+#   RFC949          ||       M.A. Padlipsky         ||         
+#   RFC950          ||      J.C. Mogul, J. Postel         ||       
+#   RFC951          ||      W.J. Croft, J. Gilmore         ||       
+#   RFC952          ||      K. Harrenstien, M.K. Stahl, E.J. Feinler         ||       
+#   RFC953          ||       K. Harrenstien, M.K. Stahl, E.J. Feinler         ||         
+#   RFC954          ||       K. Harrenstien, M.K. Stahl, E.J. Feinler         ||         
+#   RFC955          ||       R.T. Braden         ||         
+#   RFC956          ||       D.L. Mills         ||         
+#   RFC957          ||       D.L. Mills         ||         
+#   RFC958          ||       D.L. Mills         ||         
+#   RFC959          ||      J. Postel, J. Reynolds         ||       
+#   RFC960          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC961          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC962          ||       M.A. Padlipsky         ||         
+#   RFC963          ||       D.P. Sidhu         ||         
+#   RFC964          ||      D.P. Sidhu, T. Blumer         ||       
+#   RFC965          ||       L. Aguilar         ||         
+#   RFC966          ||       S.E. Deering, D.R. Cheriton         ||         
+#   RFC967          ||       M.A. Padlipsky         ||         
+#   RFC968          ||       V.G. Cerf         ||         
+#   RFC969          ||       D.D. Clark, M.L. Lambert, L. Zhang         ||         
+#   RFC970          ||      J. Nagle         ||       
+#   RFC971          ||       A.L. DeSchon         ||         
+#   RFC972          ||       F.J. Wancho         ||         
+#   RFC973          ||       P.V. Mockapetris         ||         
+#   RFC974          ||      C. Partridge         ||       
+#   RFC975          ||       D.L. Mills         ||         
+#   RFC976          ||       M.R. Horton         ||         
+#   RFC977          ||       B. Kantor, P. Lapsley         ||         
+#   RFC978          ||       J.K. Reynolds, R. Gillman, W.A. Brackenridge, A. Witkowski, J. Postel         ||         
+#   RFC979          ||       A.G. Malis         ||         
+#   RFC980          ||       O.J. Jacobsen, J. Postel         ||         
+#   RFC981          ||       D.L. Mills         ||         
+#   RFC982          ||      H.W. Braun         ||       
+#   RFC983          ||      D.E. Cass, M.T. Rose         ||       
+#   RFC984          ||       D.D. Clark, M.L. Lambert         ||         
+#   RFC985          ||       National Science Foundation, Network Technical Advisory Group         ||         
+#   RFC986          ||       R.W. Callon, H.W. Braun         ||         
+#   RFC987          ||       S.E. Kille         ||         
+#   RFC988          ||       S.E. Deering         ||         
+#   RFC989          ||       J. Linn         ||         
+#   RFC990          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC991          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC992          ||       K.P. Birman, T.A. Joseph         ||         
+#   RFC993          ||       D.D. Clark, M.L. Lambert         ||         
+#   RFC994          ||       International Organization for Standardization         ||         
+#   RFC995          ||      International Organization for Standardization         ||       
+#   RFC996          ||       D.L. Mills         ||         
+#   RFC997          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC998          ||       D.D. Clark, M.L. Lambert, L. Zhang         ||         
+#   RFC999          ||      A. Westine, J. Postel         ||       
+#   RFC1000          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC1001          ||       NetBIOS Working Group in the Defense Advanced Research Projects Agency, Internet Activities Board, End-to-End Services Task Force         ||         
+#   RFC1002          ||       NetBIOS Working Group in the Defense Advanced Research Projects Agency, Internet Activities Board, End-to-End Services Task Force         ||         
+#   RFC1003          ||       A.R. Katz         ||         
+#   RFC1004          ||      D.L. Mills         ||       
+#   RFC1005          ||       A. Khanna, A.G. Malis         ||         
+#   RFC1006          ||       M.T. Rose, D.E. Cass         ||         
+#   RFC1007          ||       W. McCoy         ||         
+#   RFC1008          ||       W. McCoy         ||         
+#   RFC1009          ||       R.T. Braden, J. Postel         ||         
+#   RFC1010          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC1011          ||      J.K. Reynolds, J. Postel         ||       
+#   RFC1012          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC1013          ||       R.W. Scheifler         ||         
+#   RFC1014          ||       Sun Microsystems         ||         
+#   RFC1015          ||       B.M. Leiner         ||         
+#   RFC1016          ||      W. Prue, J. Postel         ||       
+#   RFC1017          ||       B.M. Leiner         ||         
+#   RFC1018          ||      A.M. McKenzie         ||       
+#   RFC1019          ||       D. Arnon         ||         
+#   RFC1020          ||       S. Romano, M.K. Stahl         ||         
+#   RFC1021          ||       C. Partridge, G. Trewitt         ||         
+#   RFC1022          ||       C. Partridge, G. Trewitt         ||         
+#   RFC1023          ||       G. Trewitt, C. Partridge         ||         
+#   RFC1024          ||       C. Partridge, G. Trewitt         ||         
+#   RFC1025          ||       J. Postel         ||         
+#   RFC1026          ||       S.E. Kille         ||         
+#   RFC1027          ||       S. Carl-Mitchell, J.S. Quarterman         ||         
+#   RFC1028          ||       J. Davin, J.D. Case, M. Fedor, M.L. Schoffstall         ||         
+#   RFC1029          ||       G. Parr         ||         
+#   RFC1030          ||       M.L. Lambert         ||         
+#   RFC1031          ||       W.D. Lazear         ||         
+#   RFC1032          ||       M.K. Stahl         ||         
+#   RFC1033          ||      M. Lottor         ||       
+#   RFC1034          ||      P.V. Mockapetris         ||       
+#   RFC1035          ||      P.V. Mockapetris         ||       
+#   RFC1036          ||      M.R. Horton, R. Adams         ||       
+#   RFC1037          ||       B. Greenberg, S. Keene         ||         
+#   RFC1038          ||       M. St. Johns         ||         
+#   RFC1039          ||       D. Latham         ||         
+#   RFC1040          ||       J. Linn         ||         
+#   RFC1041          ||      Y. Rekhter         ||       
+#   RFC1042          ||       J. Postel, J.K. Reynolds         ||         
+#   RFC1043          ||       A. Yasuda, T. Thompson         ||         
+#   RFC1044          ||      K. Hardwick, J. Lekashman         ||       
+#   RFC1045          ||       D.R. Cheriton         ||         
+#   RFC1046          ||       W. Prue, J. Postel         ||         
+#   RFC1047          ||       C. Partridge         ||         
+#   RFC1048          ||       P.A. Prindeville         ||         
+#   RFC1049          ||       M.A. Sirbu         ||         
+#   RFC1050          ||      Sun Microsystems         ||       
+#   RFC1051          ||       P.A. Prindeville         ||         
+#   RFC1052          ||      V.G. Cerf         ||       
+#   RFC1053          ||      S. Levy, T. Jacobson         ||       
+#   RFC1054          ||       S.E. Deering         ||         
+#   RFC1055          ||       J.L. Romkey         ||         
+#   RFC1056          ||       M.L. Lambert         ||         
+#   RFC1057          ||       Sun Microsystems         ||         
+#   RFC1058          ||       C.L. Hedrick         ||         
+#   RFC1059          ||       D.L. Mills         ||         
+#   RFC1060          ||       J.K. Reynolds, J. Postel         ||         
+#   RFC1061          ||               ||       
+#   RFC1062          ||       S. Romano, M.K. Stahl, M. Recker         ||         
+#   RFC1063          ||       J.C. Mogul, C.A. Kent, C. Partridge, K. McCloghrie         ||         
+#   RFC1064          ||       M.R. Crispin         ||         
+#   RFC1065          ||       K. McCloghrie, M.T. Rose         ||         
+#   RFC1066          ||       K. McCloghrie, M.T. Rose         ||         
+#   RFC1067          ||       J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin         ||         
+#   RFC1068          ||       A.L. DeSchon, R.T. Braden         ||         
+#   RFC1069          ||       R.W. Callon, H.W. Braun         ||         
+#   RFC1070          ||       R.A. Hagens, N.E. Hall, M.T. Rose         ||        hagens@cs.wisc.edu, nhall@cs.wisc.edu 
+#   RFC1071          ||      R.T. Braden, D.A. Borman, C. Partridge         ||       
+#   RFC1072          ||      V. Jacobson, R.T. Braden         ||       
+#   RFC1073          ||       D. Waitzman         ||         
+#   RFC1074          ||       J. Rekhter         ||         
+#   RFC1075          ||       D. Waitzman, C. Partridge, S.E. Deering         ||         
+#   RFC1076          ||       G. Trewitt, C. Partridge         ||         
+#   RFC1077          ||       B.M. Leiner         ||         
+#   RFC1078          ||      M. Lottor         ||       
+#   RFC1079          ||       C.L. Hedrick         ||         
+#   RFC1080          ||       C.L. Hedrick         ||         
+#   RFC1081          ||       M.T. Rose         ||         
+#   RFC1082          ||       M.T. Rose         ||         
+#   RFC1083          ||       Defense Advanced Research Projects Agency, Internet Activities Board         ||         
+#   RFC1084          ||       J.K. Reynolds         ||        JKREYNOLDS@ISI.EDU 
+#   RFC1085          ||       M.T. Rose         ||       mrose17@gmail.com
+#   RFC1086          ||       J.P. Onions, M.T. Rose         ||        JPO@CS.NOTT.AC.UK, mrose17@gmail.com
+#   RFC1087          ||       Defense Advanced Research Projects Agency, Internet Activities Board         ||         
+#   RFC1088          ||       L.J. McLaughlin         ||        ljm@TWG.COM 
+#   RFC1089          ||       M. Schoffstall, C. Davin, M. Fedor, J. Case         ||        schoff@stonewall.nyser.net, jrd@ptt.lcs.mit.edu, fedor@patton.NYSER.NET, case@UTKUX1.UTK.EDU 
+#   RFC1090          ||       R. Ullmann         ||         
+#   RFC1091          ||       J. VanBokkelen         ||         
+#   RFC1092          ||       J. Rekhter         ||         
+#   RFC1093          ||       H.W. Braun         ||         
+#   RFC1094          ||      B. Nowicki         ||       
+#   RFC1095          ||      U.S. Warrier, L. Besaw         ||       
+#   RFC1096          ||       G.A. Marcy         ||         
+#   RFC1097          ||       B. Miller         ||         
+#   RFC1098          ||       J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin         ||        jrd@ptt.lcs.mit.edu 
+#   RFC1099          ||       J. Reynolds         ||        JKREY@ISI.EDU 
+#   RFC1100          ||      Defense Advanced Research Projects Agency, Internet Activities Board         ||       
+#   RFC1101          ||      P.V. Mockapetris         ||       
+#   RFC1102          ||       D.D. Clark         ||         
+#   RFC1103          ||       D. Katz         ||         
+#   RFC1104          ||       H.W. Braun         ||        hwb@merit.edu 
+#   RFC1105          ||       K. Lougheed, Y. Rekhter         ||         
+#   RFC1106          ||      R. Fox         ||       rfox@tandem.com
+#   RFC1107          ||       K.R. Sollins         ||        SOLLINS@XX.LCS.MIT.EDU 
+#   RFC1108          ||       S. Kent         ||         
+#   RFC1109          ||       V.G. Cerf         ||        CERF@A.ISI.EDU 
+#   RFC1110          ||      A.M. McKenzie         ||       MCKENZIE@BBN.COM
+#   RFC1111          ||       J. Postel         ||        POSTEL@ISI.EDU 
+#   RFC1112          ||       S.E. Deering         ||        deering@PESCADERO.STANFORD.EDU 
+#   RFC1113          ||      J. Linn         ||       Linn@ultra.enet.dec.com
+#   RFC1114          ||       S.T. Kent, J. Linn         ||        kent@BBN.COM, Linn@ultra.enet.dec.com 
+#   RFC1115          ||       J. Linn         ||        Linn@ultra.enet.dec.com 
+#   RFC1116          ||       D.A. Borman         ||        dab@CRAY.COM 
+#   RFC1117          ||       S. Romano, M.K. Stahl, M. Recker         ||         
+#   RFC1118          ||       E. Krol         ||        Krol@UXC.CSO.UIUC.EDU 
+#   RFC1119          ||      D.L. Mills         ||       
+#   RFC1120          ||       V. Cerf         ||        VCERF@NRI.RESTON.VA.US 
+#   RFC1121          ||       J. Postel, L. Kleinrock, V.G. Cerf, B. Boehm         ||        Postel@ISI.EDU, lk@CS.UCLA.EDU, VCerf@NRI.RESTON.VA.US, boehm@CS.UCLA.EDU 
+#   RFC1122          ||      R. Braden, Ed.         ||       Braden@ISI.EDU
+#   RFC1123          ||      R. Braden, Ed.         ||       Braden@ISI.EDU
+#   RFC1124          ||       B.M. Leiner         ||         
+#   RFC1125          ||       D. Estrin         ||         
+#   RFC1126          ||       M. Little         ||        little@SAIC.COM 
+#   RFC1127          ||       R.T. Braden         ||        Braden@ISI.EDU 
+#   RFC1128          ||       D.L. Mills         ||         
+#   RFC1129          ||       D.L. Mills         ||         
+#   RFC1130          ||       Defense Advanced Research Projects Agency, Internet Activities Board         ||         
+#   RFC1131          ||      J. Moy         ||       
+#   RFC1132          ||      L.J. McLaughlin         ||       ljm@TWG.COM
+#   RFC1133          ||       J.Y. Yu, H.W. Braun         ||        jyy@merit.edu, hwb@merit.edu 
+#   RFC1134          ||       D. Perkins         ||        rdhobby@ucdavis.edu 
+#   RFC1135          ||       J.K. Reynolds         ||        JKREY@ISI.EDU 
+#   RFC1136          ||       S. Hares, D. Katz         ||         
+#   RFC1137          ||       S. Kille         ||        S.Kille@Cs.Ucl.AC.UK 
+#   RFC1138          ||       S.E. Kille         ||        S.Kille@Cs.Ucl.AC.UK 
+#   RFC1139          ||       R.A. Hagens         ||        hagens@CS.WISC.EDU 
+#   RFC1140          ||       Defense Advanced Research Projects Agency, Internet Activities Board         ||         
+#   RFC1141          ||      T. Mallory, A. Kullberg         ||       tmallory@CCV.BBN.COM, akullberg@BBN.COM
+#   RFC1142          ||      D. Oran, Ed.         ||       
+#   RFC1143          ||       D.J. Bernstein         ||         
+#   RFC1144          ||       V. Jacobson         ||         
+#   RFC1145          ||      J. Zweig, C. Partridge         ||       zweig@CS.UIUC.EDU, craig@BBN.COM
+#   RFC1146          ||      J. Zweig, C. Partridge         ||       zweig@CS.UIUC.EDU, craig@BBN.COM
+#   RFC1147          ||      R.H. Stine         ||       STINE@SPARTA.COM
+#   RFC1148          ||       S.E. Kille         ||       S.Kille@Cs.Ucl.AC.UK 
+#   RFC1149          ||      D. Waitzman         ||       dwaitzman@BBN.COM
+#   RFC1150          ||      G.S. Malkin, J.K. Reynolds         ||       gmalkin@proteon.com, jkrey@isi.edu
+#   RFC1151          ||      C. Partridge, R.M. Hinden         ||       craig@BBN.COM, bob.hinden@gmail.com
+#   RFC1152          ||      C. Partridge         ||       craig@BBN.COM
+#   RFC1153          ||      F.J. Wancho         ||       
+#   RFC1154          ||      D. Robinson, R. Ullmann         ||       
+#   RFC1155          ||       M.T. Rose, K. McCloghrie         ||       mrose17@gmail.com
+#   RFC1156          ||       K. McCloghrie, M.T. Rose         ||       mrose17@gmail.com
+#   RFC1157          ||      J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin         ||       jrd@ptt.lcs.mit.edu
+#   RFC1158          ||       M.T. Rose         ||         
+#   RFC1159          ||       R. Nelson         ||        nelson@sun.soe.clarkson.edu 
+#   RFC1160          ||       V. Cerf         ||        VCERF@NRI.RESTON.VA.US 
+#   RFC1161          ||       M.T. Rose         ||         
+#   RFC1162          ||       G. Satz         ||         
+#   RFC1163          ||       K. Lougheed, Y. Rekhter         ||         
+#   RFC1164          ||       J.C. Honig, D. Katz, M. Mathis, Y. Rekhter, J.Y. Yu         ||         
+#   RFC1165          ||       J. Crowcroft, J.P. Onions         ||        JON@CS.UCL.AC.UK, JPO@CS.NOTT.AC.UK 
+#   RFC1166          ||      S. Kirkpatrick, M.K. Stahl, M. Recker         ||       
+#   RFC1167          ||       V.G. Cerf         ||        vcerf@NRI.Reston.VA.US 
+#   RFC1168          ||       A. Westine, A.L. DeSchon, J. Postel, C.E. Ward         ||         
+#   RFC1169          ||       V.G. Cerf, K.L. Mills         ||        vcerf@nri.reston.va.us, MILLS@ECF.NCSL.NIST.GOV 
+#   RFC1170          ||       R.B. Fougner         ||         
+#   RFC1171          ||       D. Perkins         ||        ddp@andrew.cmu.edu 
+#   RFC1172          ||       D. Perkins, R. Hobby         ||        rdhobby@ucdavis.edu, ddp@andrew.cmu.edu 
+#   RFC1173          ||       J. VanBokkelen         ||        jbvb@ftp.com 
+#   RFC1174          ||       V.G. Cerf         ||        vcerf@nri.reston.va.us 
+#   RFC1175          ||       K.L. Bowers, T.L. LaQuey, J.K. Reynolds, K. Roubicek, M.K. Stahl, A. Yuan         ||         
+#   RFC1176          ||       M.R. Crispin         ||        mrc@Tomobiki-Cho.CAC.Washington.EDU 
+#   RFC1177          ||       G.S. Malkin, A.N. Marine, J.K. Reynolds         ||        gmalkin@ftp.com, APRIL@NIC.DDN.MIL, jkrey@isi.edu 
+#   RFC1178          ||       D. Libes         ||        libes@cme.nist.gov 
+#   RFC1179          ||       L. McLaughlin         ||        ljm@twg.com 
+#   RFC1180          ||       T.J. Socolofsky, C.J. Kale         ||        TEDS@SPIDER.CO.UK, CLAUDIAK@SPIDER.CO.UK 
+#   RFC1181          ||       R. Blokzijl         ||        k13@nikhef.nl 
+#   RFC1182          ||               ||       
+#   RFC1183          ||      C.F. Everhart, L.A. Mamakos, R. Ullmann, P.V. Mockapetris         ||       Craig_Everhart@transarc.com, pvm@isi.edu
+#   RFC1184          ||       D.A. Borman         ||        dab@CRAY.COM 
+#   RFC1185          ||       V. Jacobson, R.T. Braden, L. Zhang         ||        van@CSAM.LBL.GOV, Braden@ISI.EDU, lixia@PARC.XEROX.COM 
+#   RFC1186          ||       R.L. Rivest         ||        rivest@theory.lcs.mit.edu 
+#   RFC1187          ||       M.T. Rose, K. McCloghrie, J.R. Davin         ||       mrose17@gmail.com,  KZM@HLS.COM,  jrd@ptt.lcs.mit.edu 
+#   RFC1188          ||       D. Katz         ||        dkatz@merit.edu 
+#   RFC1189          ||       U.S. Warrier, L. Besaw, L. LaBarre, B.D. Handspicker         ||         
+#   RFC1190          ||      C. Topolcic         ||       Casner@ISI.Edu, CLynn@BBN.Com, ppark@BBN.COM, Schroder@BBN.Com, Topolcic@BBN.Com
+#   RFC1191          ||       J.C. Mogul, S.E. Deering         ||        mogul@decwrl.dec.com, deering@xerox.com 
+#   RFC1192          ||       B. Kahin         ||        kahin@hulaw.harvard.edu 
+#   RFC1193          ||       D. Ferrari         ||        ferrari@UCBVAX.BERKELEY.EDU 
+#   RFC1194          ||       D.P. Zimmerman         ||        dpz@dimacs.rutgers.edu 
+#   RFC1195          ||      R.W. Callon         ||       
+#   RFC1196          ||       D.P. Zimmerman         ||        dpz@dimacs.rutgers.edu 
+#   RFC1197          ||       M. Sherman         ||         
+#   RFC1198          ||       R.W. Scheifler         ||        rws@expo.lcs.mit.edu 
+#   RFC1199          ||       J. Reynolds         ||        JKREY@ISI.EDU 
+#   RFC1200          ||      Defense Advanced Research Projects Agency, Internet Activities Board         ||       
+#   RFC1201          ||       D. Provan         ||        donp@Novell.Com 
+#   RFC1202          ||       M.T. Rose         ||       mrose17@gmail.com
+#   RFC1203          ||       J. Rice         ||        RICE@SUMEX-AIM.STANFORD.EDU 
+#   RFC1204          ||       S. Yeh, D. Lee         ||        dlee@netix.com 
+#   RFC1205          ||       P. Chmielewski         ||        paulc@rchland.iinus1.ibm.com 
+#   RFC1206          ||       G.S. Malkin, A.N. Marine         ||        gmalkin@ftp.com, APRIL@nic.ddn.mil 
+#   RFC1207          ||       G.S. Malkin, A.N. Marine, J.K. Reynolds         ||        gmalkin@ftp.com, APRIL@nic.ddn.mil, jkrey@isi.edu 
+#   RFC1208          ||      O.J. Jacobsen, D.C. Lynch         ||       OLE@CSLI.STANFORD.EDU, Lynch@ISI.EDU
+#   RFC1209          ||      D. Piscitello, J. Lawrence         ||       dave@sabre.bellcore.com, jcl@sabre.bellcore.com
+#   RFC1210          ||       V.G. Cerf, P.T. Kirstein, B. Randell         ||         
+#   RFC1211          ||       A. Westine, J. Postel         ||        Westine@ISI.EDU, Postel@ISI.EDU 
+#   RFC1212          ||       M.T. Rose, K. McCloghrie         ||       mrose17@gmail.com,  kzm@hls.com 
+#   RFC1213          ||      K. McCloghrie, M. Rose         ||       kzm@hls.com, mrose17@gmail.com
+#   RFC1214          ||      L. LaBarre         ||       cel@mbunix.mitre.org
+#   RFC1215          ||       M.T. Rose         ||       mrose17@gmail.com
+#   RFC1216          ||       P. Richard, P. Kynikos         ||         
+#   RFC1217          ||       V.G. Cerf         ||        CERF@NRI.RESTON.VA.US 
+#   RFC1218          ||      North American Directory Forum         ||       
+#   RFC1219          ||      P.F. Tsuchiya         ||       tsuchiya@thumper.bellcore.com
+#   RFC1220          ||      F. Baker         ||       fbaker@ACC.COM
+#   RFC1221          ||      W. Edmond         ||       wbe@bbn.com
+#   RFC1222          ||       H.W. Braun, Y. Rekhter         ||        HWB@SDSC.EDU, Yakov@Watson.IBM.COM 
+#   RFC1223          ||       J.M. Halpern         ||         
+#   RFC1224          ||       L. Steinberg         ||        LOUISS@IBM.COM 
+#   RFC1225          ||       M.T. Rose         ||       mrose17@gmail.com
+#   RFC1226          ||       B. Kantor         ||        brian@UCSD.EDU 
+#   RFC1227          ||       M.T. Rose         ||       mrose17@gmail.com
+#   RFC1228          ||       G. Carpenter, B. Wijnen         ||         
+#   RFC1229          ||       K. McCloghrie         ||        kzm@hls.com 
+#   RFC1230          ||       K. McCloghrie, R. Fox         ||        kzm@hls.com, rfox@synoptics.com 
+#   RFC1231          ||       K. McCloghrie, R. Fox, E. Decker         ||        kzm@hls.com, rfox@synoptics.com, cire@cisco.com 
+#   RFC1232          ||       F. Baker, C.P. Kolb         ||        fbaker@acc.com, kolb@psi.com 
+#   RFC1233          ||       T.A. Cox, K. Tesink         ||        tacox@sabre.bellcore.com, kaj@nvuxr.cc.bellcore.com 
+#   RFC1234          ||       D. Provan         ||        donp@Novell.Com 
+#   RFC1235          ||       J. Ioannidis, G. Maguire         ||        ji@cs.columbia.edu, maguire@cs.columbia.edu 
+#   RFC1236          ||       L. Morales, P. Hasse         ||        lmorales@huachuca-emh8.army.mil, phasse@huachuca-emh8.army.mil 
+#   RFC1237          ||       R. Colella, E. Gardner, R. Callon         ||        colella@osi3.ncsl.nist.gov, epg@gateway.mitre.org 
+#   RFC1238          ||       G. Satz         ||         
+#   RFC1239          ||       J.K. Reynolds         ||        jkrey@isi.edu 
+#   RFC1240          ||       C. Shue, W. Haggerty, K. Dobbins         ||        chi@osf.org, bill@comm.wang.com 
+#   RFC1241          ||       R.A. Woodburn, D.L. Mills         ||        woody@cseic.saic.com, mills@udel.edu 
+#   RFC1242          ||      S. Bradner         ||       SOB@HARVARD.HARVARD.EDU
+#   RFC1243          ||       S. Waldbusser         ||        waldbusser@andrew.cmu.edu 
+#   RFC1244          ||       J.P. Holbrook, J.K. Reynolds         ||        holbrook@cic.net, JKREY@ISI.EDU 
+#   RFC1245          ||       J. Moy         ||         
+#   RFC1246          ||       J. Moy         ||         
+#   RFC1247          ||       J. Moy         ||        jmoy@proteon.com 
+#   RFC1248          ||       F. Baker, R. Coltun         ||        fbaker@acc.com, rcoltun@ni.umd.edu 
+#   RFC1249          ||       T. Howes, M. Smith, B. Beecher         ||        tim@umich.edu, mcs@umich.edu, bryan@umich.edu 
+#   RFC1250          ||       J. Postel         ||         
+#   RFC1251          ||       G. Malkin         ||        gmalkin@ftp.com 
+#   RFC1252          ||       F. Baker, R. Coltun         ||        fbaker@acc.com, rcoltun@ni.umd.edu 
+#   RFC1253          ||       F. Baker, R. Coltun         ||        fbaker@acc.com, rcoltun@ni.umd.edu 
+#   RFC1254          ||       A. Mankin, K. Ramakrishnan         ||         
+#   RFC1255          ||       The North American Directory Forum         ||         
+#   RFC1256          ||      S. Deering, Ed.         ||       deering@xerox.com
+#   RFC1257          ||       C. Partridge         ||        craig@SICS.SE 
+#   RFC1258          ||      B. Kantor         ||       brian@UCSD.EDU
+#   RFC1259          ||       M. Kapor         ||        mkapor@eff.org 
+#   RFC1260          ||               ||       
+#   RFC1261          ||       S. Williamson, L. Nobile         ||        scottw@DIIS.DDN.MIL 
+#   RFC1262          ||       V.G. Cerf         ||         
+#   RFC1263          ||       S. O'Malley, L.L. Peterson         ||        llp@cs.arizona.edu, sean@cs.arizona.edu 
+#   RFC1264          ||      R.M. Hinden         ||       bob.hinden@gmail.com
+#   RFC1265          ||       Y. Rekhter         ||        yakov@watson.ibm.com 
+#   RFC1266          ||       Y. Rekhter         ||        yakov@watson.ibm.com 
+#   RFC1267          ||       K. Lougheed, Y. Rekhter         ||         
+#   RFC1268          ||       Y. Rekhter, P. Gross         ||        yakov@watson.ibm.com 
+#   RFC1269          ||       S. Willis, J.W. Burruss         ||         
+#   RFC1270          ||       F. Kastenholz         ||         
+#   RFC1271          ||       S. Waldbusser         ||        waldbusser@andrew.cmu.edu 
+#   RFC1272          ||       C. Mills, D. Hirsh, G.R. Ruth         ||         
+#   RFC1273          ||       M.F. Schwartz         ||        schwartz@cs.colorado.edu 
+#   RFC1274          ||       P. Barker, S. Kille         ||        P.Barker@cs.ucl.ac.uk, S.Kille@cs.ucl.ac.uk 
+#   RFC1275          ||      S.E. Hardcastle-Kille         ||       S.Kille@CS.UCL.AC.UK
+#   RFC1276          ||       S.E. Hardcastle-Kille         ||        S.Kille@CS.UCL.AC.UK 
+#   RFC1277          ||       S.E. Hardcastle-Kille         ||        S.Kille@CS.UCL.AC.UK 
+#   RFC1278          ||       S.E. Hardcastle-Kille         ||        S.Kille@CS.UCL.AC.UK 
+#   RFC1279          ||      S.E. Hardcastle-Kille         ||       S.Kille@CS.UCL.AC.UK
+#   RFC1280          ||       J. Postel         ||         
+#   RFC1281          ||       R. Pethia, S. Crocker, B. Fraser         ||        rdp@cert.sei.cmu.edu, crocker@tis.com, byf@cert.sei.cmu.edu 
+#   RFC1282          ||      B. Kantor         ||       brian@UCSD.EDU
+#   RFC1283          ||       M. Rose         ||         
+#   RFC1284          ||       J. Cook, Ed.         ||        kasten@europa.clearpoint.com 
+#   RFC1285          ||       J. Case         ||        case@CS.UTK.EDU 
+#   RFC1286          ||       E. Decker, P. Langille, A. Rijsinghani, K. McCloghrie         ||        langille@edwin.enet.dec.com, anil@levers.enet.dec.com, kzm@hls.com 
+#   RFC1287          ||       D. Clark, L. Chapin, V. Cerf, R. Braden, R. Hobby         ||        ddc@LCS.MIT.EDU, vcerf@nri.reston.va.us, lyman@BBN.COM, braden@isi.edu, rdhobby@ucdavis.edu 
+#   RFC1288          ||       D. Zimmerman         ||        dpz@dimacs.rutgers.edu 
+#   RFC1289          ||       J. Saperia         ||        saperia@enet.dec.com 
+#   RFC1290          ||       J. Martin         ||        jmartin@magnus.acs.ohio-state.edu 
+#   RFC1291          ||       V. Aggarwal         ||         
+#   RFC1292          ||       R. Lang, R. Wright         ||         
+#   RFC1293          ||       T. Bradley, C. Brown         ||         
+#   RFC1294          ||       T. Bradley, C. Brown, A. Malis         ||         
+#   RFC1295          ||       The North American Directory Forum         ||        0004454742@mcimail.com 
+#   RFC1296          ||       M. Lottor         ||        mkl@nisc.sri.com 
+#   RFC1297          ||       D. Johnson         ||         
+#   RFC1298          ||       R. Wormley, S. Bostock         ||        bwormley@novell.com, steveb@novell.com 
+#   RFC1299          ||       M. Kennedy         ||        MKENNEDY@ISI.EDU 
+#   RFC1300          ||       S. Greenfield         ||        0004689513@mcimail.com 
+#   RFC1301          ||       S. Armstrong, A. Freier, K. Marzullo         ||        armstrong@wrc.xerox.com, freier@apple.com, marzullo@cs.cornell.edu 
+#   RFC1302          ||       D. Sitzler, P. Smith, A. Marine         ||         
+#   RFC1303          ||       K. McCloghrie, M. Rose         ||        kzm@hls.com, mrose17@gmail.com
+#   RFC1304          ||      T. Cox, Ed., K. Tesink, Ed.         ||       tacox@sabre.bellcore.com, kaj@nvuxr.cc.bellcore.com
+#   RFC1305          ||      D. Mills         ||       
+#   RFC1306          ||       A. Nicholson, J. Young         ||        droid@cray.com, jsy@cray.com 
+#   RFC1307          ||       J. Young, A. Nicholson         ||        jsy@cray.com, droid@cray.com 
+#   RFC1308          ||       C. Weider, J. Reynolds         ||         
+#   RFC1309          ||       C. Weider, J. Reynolds, S. Heker         ||        jkrey@isi.edu 
+#   RFC1310          ||       L. Chapin         ||         
+#   RFC1311          ||       J. Postel         ||         
+#   RFC1312          ||       R. Nelson, G. Arnold         ||        nelson@crynwr.com, geoff@east.sun.com 
+#   RFC1313          ||       C. Partridge         ||        craig@aland.bbn.com 
+#   RFC1314          ||       A. Katz, D. Cohen         ||        Katz@ISI.Edu, Cohen@ISI.Edu 
+#   RFC1315          ||       C. Brown, F. Baker, C. Carvalho         ||        cbrown@wellfleet.com, fbaker@acc.com, charles@acc.com 
+#   RFC1316          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
+#   RFC1317          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
+#   RFC1318          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
+#   RFC1319          ||      B. Kaliski         ||       burt@rsa.com
+#   RFC1320          ||      R. Rivest         ||       rivest@theory.lcs.mit.edu
+#   RFC1321          ||      R. Rivest         ||       rivest@theory.lcs.mit.edu
+#   RFC1322          ||       D. Estrin, Y. Rekhter, S. Hotz         ||        estrin@usc.edu, yakov@ibm.com, hotz@usc.edu 
+#   RFC1323          ||      V. Jacobson, R. Braden, D. Borman         ||       van@CSAM.LBL.GOV, Braden@ISI.EDU
+#   RFC1324          ||       D. Reed         ||         
+#   RFC1325          ||       G. Malkin, A. Marine         ||        gmalkin@Xylogics.COM, april@nisc.sri.com 
+#   RFC1326          ||       P. Tsuchiya         ||        tsuchiya@thumper.bellcore.com 
+#   RFC1327          ||       S. Hardcastle-Kille         ||         
+#   RFC1328          ||       S. Hardcastle-Kille         ||        S.Kille@CS.UCL.AC.UK 
+#   RFC1329          ||      P. Kuehn         ||       thimmela@sniabg.wa.sni.de
+#   RFC1330          ||       ESCC X.500/X.400 Task Force, ESnet Site Coordinating Comittee (ESCC), Energy Sciences Network (ESnet)         ||         
+#   RFC1331          ||       W. Simpson         ||        bsimpson@ray.lloyd.com 
+#   RFC1332          ||       G. McGregor         ||        Glenn.McGregor@Merit.edu 
+#   RFC1333          ||       W. Simpson         ||        bsimpson@ray.lloyd.com 
+#   RFC1334          ||       B. Lloyd, W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
+#   RFC1335          ||       Z. Wang, J. Crowcroft         ||        z.wang@cs.ucl.ac.uk, j.crowcroft@cs.ucl.ac.uk 
+#   RFC1336          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
+#   RFC1337          ||       R. Braden         ||        Braden@ISI.EDU 
+#   RFC1338          ||       V. Fuller, T. Li, J. Yu, K. Varadhan         ||         
+#   RFC1339          ||      S. Dorner, P. Resnick         ||       s-dorner@uiuc.edu, presnick@qti.qualcomm.com
+#   RFC1340          ||       J. Reynolds, J. Postel         ||         
+#   RFC1341          ||       N. Borenstein, N. Freed         ||         
+#   RFC1342          ||       K. Moore         ||        moore@cs.utk.edu 
+#   RFC1343          ||       N. Borenstein         ||         
+#   RFC1344          ||       N. Borenstein         ||         
+#   RFC1345          ||       K. Simonsen         ||         
+#   RFC1346          ||       P. Jones         ||         
+#   RFC1347          ||       R. Callon         ||         
+#   RFC1348          ||       B. Manning         ||        bmanning@rice.edu 
+#   RFC1349          ||       P. Almquist         ||         
+#   RFC1350          ||       K. Sollins         ||        SOLLINS@LCS.MIT.EDU 
+#   RFC1351          ||       J. Davin, J. Galvin, K. McCloghrie         ||        jrd@ptt.lcs.mit.edu, galvin@tis.com, kzm@hls.com 
+#   RFC1352          ||       J. Galvin, K. McCloghrie, J. Davin         ||        galvin@tis.com, kzm@hls.com, jrd@ptt.lcs.mit.edu 
+#   RFC1353          ||       K. McCloghrie, J. Davin, J. Galvin         ||        kzm@hls.com, jrd@ptt.lcs.mit.edu, galvin@tis.com 
+#   RFC1354          ||       F. Baker         ||        fbaker@acc.com 
+#   RFC1355          ||       J. Curran, A. Marine         ||        jcurran@nnsc.nsf.net, april@nisc.sri.com 
+#   RFC1356          ||       A. Malis, D. Robinson, R. Ullmann         ||         
+#   RFC1357          ||       D. Cohen         ||        Cohen@ISI.EDU 
+#   RFC1358          ||       L. Chapin         ||        lyman@BBN.COM 
+#   RFC1359          ||       ACM SIGUCCS         ||        martyne@nr-tech.cit.cornell.edu 
+#   RFC1360          ||       J. Postel         ||         
+#   RFC1361          ||       D. Mills         ||        mills@udel.edu 
+#   RFC1362          ||       M. Allen         ||        MALLEN@NOVELL.COM, brian@ray.lloyd.com 
+#   RFC1363          ||       C. Partridge         ||        craig@aland.bbn.com 
+#   RFC1364          ||       K. Varadhan         ||        kannan@oar.net 
+#   RFC1365          ||       K. Siyan         ||        72550.1634@compuserve.com 
+#   RFC1366          ||       E. Gerich         ||        epg@MERIT.EDU 
+#   RFC1367          ||       C. Topolcic         ||        topolcic@NRI.Reston.VA.US 
+#   RFC1368          ||       D. McMaster, K. McCloghrie         ||        mcmaster@synoptics.com, kzm@hls.com 
+#   RFC1369          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1370          ||       Internet Architecture Board, L. Chapin         ||         
+#   RFC1371          ||       P. Gross         ||        pgross@ans.net 
+#   RFC1372          ||       C. Hedrick, D. Borman         ||         
+#   RFC1373          ||       T. Tignor         ||        tpt2@isi.edu 
+#   RFC1374          ||       J. Renwick, A. Nicholson         ||        jkr@CRAY.COM, droid@CRAY.COM 
+#   RFC1375          ||       P. Robinson         ||         
+#   RFC1376          ||       S. Senum         ||        sjs@network.com 
+#   RFC1377          ||       D. Katz         ||        dkatz@cisco.com 
+#   RFC1378          ||       B. Parker         ||        brad@cayman.com 
+#   RFC1379          ||      R. Braden         ||       Braden@ISI.EDU
+#   RFC1380          ||       P. Gross, P. Almquist         ||        pgross@ans.net, Almquist@JESSICA.STANFORD.EDU 
+#   RFC1381          ||       D. Throop, F. Baker         ||        throop@dg-rtp.dg.com, fbaker@acc.com 
+#   RFC1382          ||       D. Throop, Ed.         ||        throop@dg-rtp.dg.com 
+#   RFC1383          ||       C. Huitema         ||        Christian.Huitema@MIRSA.INRIA.FR 
+#   RFC1384          ||       P. Barker, S.E. Hardcastle-Kille         ||        P.Barker@CS.UCL.AC.UK, S.Kille@ISODE.COM 
+#   RFC1385          ||      Z. Wang         ||       z.wang@cs.ucl.ac.uk
+#   RFC1386          ||       A. Cooper, J. Postel         ||         
+#   RFC1387          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
+#   RFC1388          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
+#   RFC1389          ||       G. Malkin, F. Baker         ||        gmalkin@Xylogics.COM, fbaker@acc.com 
+#   RFC1390          ||       D. Katz         ||        dkatz@cisco.com 
+#   RFC1391          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
+#   RFC1392          ||       G. Malkin, T. LaQuey Parker         ||        gmalkin@Xylogics.COM, tracy@utexas.edu 
+#   RFC1393          ||      G. Malkin         ||       gmalkin@Xylogics.COM
+#   RFC1394          ||       P. Robinson         ||         
+#   RFC1395          ||       J. Reynolds         ||        jkrey@isi.edu 
+#   RFC1396          ||       S. Crocker         ||         
+#   RFC1397          ||       D. Haskin         ||         
+#   RFC1398          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1399          ||       J. Elliott         ||        elliott@isi.edu 
+#   RFC1400          ||       S. Williamson         ||        scottw@internic.net 
+#   RFC1401          ||       Internet Architecture Board         ||         
+#   RFC1402          ||       J. Martin         ||        nic@osu.edu 
+#   RFC1403          ||       K. Varadhan         ||         
+#   RFC1404          ||       B. Stockman         ||         
+#   RFC1405          ||       C. Allocchio         ||        Claudio.Allocchio@elettra.Trieste.it 
+#   RFC1406          ||      F. Baker, Ed., J. Watt, Ed.         ||       fbaker@acc.com, james@newbridge.com
+#   RFC1407          ||       T. Cox, K. Tesink         ||        tacox@mail.bellcore.com, kaj@cc.bellcore.com 
+#   RFC1408          ||       D. Borman, Ed.         ||        dab@CRAY.COM, stevea@isc.com 
+#   RFC1409          ||       D. Borman, Ed.         ||        dab@CRAY.COM, stevea@isc.com 
+#   RFC1410          ||       J. Postel, Ed.         ||         
+#   RFC1411          ||       D. Borman, Ed.         ||        dab@CRAY.COM, stevea@isc.com 
+#   RFC1412          ||       K. Alagappan         ||        kannan@sejour.lkg.dec.com, stevea@isc.com 
+#   RFC1413          ||       M. St. Johns         ||        stjohns@DARPA.MIL 
+#   RFC1414          ||       M. St. Johns, M. Rose         ||        stjohns@DARPA.MIL, mrose17@gmail.com
+#   RFC1415          ||       J. Mindel, R. Slaski         ||         
+#   RFC1416          ||       D. Borman, Ed.         ||        dab@CRAY.COM, stevea@isc.com 
+#   RFC1417          ||       The North American Directory Forum         ||        0004454742@mcimail.com 
+#   RFC1418          ||       M. Rose         ||       mrose17@gmail.com
+#   RFC1419          ||       G. Minshall, M. Ritter         ||        minshall@wc.novell.com, MWRITTER@applelink.apple.com 
+#   RFC1420          ||       S. Bostock         ||         
+#   RFC1421          ||      J. Linn         ||       104-8456@mcimail.com
+#   RFC1422          ||       S. Kent         ||        kent@BBN.COM 
+#   RFC1423          ||      D. Balenson         ||       balenson@tis.com
+#   RFC1424          ||       B. Kaliski         ||        burt@rsa.com 
+#   RFC1425          ||       J. Klensin, WG Chair, N. Freed, Ed., M. Rose, E. Stefferud, D. Crocker         ||         
+#   RFC1426          ||       J. Klensin, WG Chair, N. Freed, Ed., M. Rose, E. Stefferud, D. Crocker         ||         
+#   RFC1427          ||       J. Klensin, WG Chair, N. Freed, Ed., K. Moore         ||         
+#   RFC1428          ||       G. Vaudreuil         ||        GVaudre@CNRI.Reston.VA.US 
+#   RFC1429          ||       E. Thomas         ||         
+#   RFC1430          ||       S. Hardcastle-Kille, E. Huizer, V. Cerf, R. Hobby, S. Kent         ||        S.Kille@isode.com, vcerf@cnri.reston.va.us, rdhobby@ucdavis.edu, skent@bbn.com 
+#   RFC1431          ||       P. Barker         ||         
+#   RFC1432          ||       J. Quarterman         ||        jsq@tic.com, mids@tic.com 
+#   RFC1433          ||       J. Garrett, J. Hagan, J. Wong         ||        jwg@garage.att.com, Hagan@UPENN.EDU, jwong@garage.att.com 
+#   RFC1434          ||       R. Dixon, D. Kushi         ||        rcdixon@ralvmg.vnet.ibm.com, kushi@watson.ibm.com 
+#   RFC1435          ||       S. Knowles         ||        stev@ftp.com 
+#   RFC1436          ||       F. Anklesaria, M. McCahill, P. Lindner, D. Johnson, D. Torrey, B. Albert         ||        fxa@boombox.micro.umn.edu, mpm@boombox.micro.umn.edu, lindner@boombox.micro.umn.edu, dmj@boombox.micro.umn.edu, daniel@boombox.micro.umn.edu, alberti@boombox.micro.umn.edu 
+#   RFC1437          ||       N. Borenstein, M. Linimon         ||        nsb@bellcore.com, linimon@LONESOME.COM 
+#   RFC1438          ||       A. Lyman Chapin, C. Huitema         ||        Lyman@BBN.COM, Christian.Huitema@MIRSA.INRIA.FR 
+#   RFC1439          ||       C. Finseth         ||        Craig.A.Finseth-1@umn.edu 
+#   RFC1440          ||       R. Troth         ||        troth@rice.edu 
+#   RFC1441          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1442          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1443          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1444          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1445          ||       J. Galvin, K. McCloghrie         ||        galvin@tis.com 
+#   RFC1446          ||       J. Galvin, K. McCloghrie         ||        galvin@tis.com 
+#   RFC1447          ||       K. McCloghrie, J. Galvin         ||        galvin@tis.com 
+#   RFC1448          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1449          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1450          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1451          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1452          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1453          ||       W. Chimiak         ||        chim@relito.medeng.wfu.edu 
+#   RFC1454          ||       T. Dixon         ||        dixon@rare.nl 
+#   RFC1455          ||       D. Eastlake 3rd         ||         
+#   RFC1456          ||       Vietnamese Standardization Working Group         ||         
+#   RFC1457          ||       R. Housley         ||        Housley.McLean_CSD@Xerox.COM 
+#   RFC1458          ||       R. Braudes, S. Zabele         ||        rebraudes@tasc.com, gszabele@tasc.com 
+#   RFC1459          ||      J. Oikarinen, D. Reed         ||       
+#   RFC1460          ||       M. Rose         ||       mrose17@gmail.com
+#   RFC1461          ||       D. Throop         ||        throop@dg-rtp.dg.com 
+#   RFC1462          ||       E. Krol, E. Hoffman         ||        e-krol@uiuc.edu, ellen@merit.edu 
+#   RFC1463          ||       E. Hoffman, L. Jackson         ||         
+#   RFC1464          ||       R. Rosenbaum         ||         
+#   RFC1465          ||       D. Eppenberger         ||        Eppenberger@switch.ch 
+#   RFC1466          ||       E. Gerich         ||        epg@MERIT.EDU 
+#   RFC1467          ||       C. Topolcic         ||        topolcic@CNRI.Reston.VA.US 
+#   RFC1468          ||       J. Murai, M. Crispin, E. van der Poel         ||        jun@wide.ad.jp, MRC@PANDA.COM, erik@poel.juice.or.jp 
+#   RFC1469          ||       T. Pusateri         ||        pusateri@cs.duke.edu 
+#   RFC1470          ||       R. Enger, J. Reynolds         ||        enger@reston.ans.net 
+#   RFC1471          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1472          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1473          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1474          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1475          ||      R. Ullmann         ||       
+#   RFC1476          ||       R. Ullmann         ||         
+#   RFC1477          ||      M. Steenstrup         ||       
+#   RFC1478          ||       M. Steenstrup         ||         
+#   RFC1479          ||       M. Steenstrup         ||         
+#   RFC1480          ||       A. Cooper, J. Postel         ||         
+#   RFC1481          ||       C. Huitema         ||        Christian.Huitema@MIRSA.INRIA.FR 
+#   RFC1482          ||       M. Knopper, S. Richardson         ||         
+#   RFC1483          ||       Juha Heinanen         ||         
+#   RFC1484          ||       S. Hardcastle-Kille         ||        S.Kille@ISODE.COM 
+#   RFC1485          ||       S. Hardcastle-Kille         ||        S.Kille@ISODE.COM 
+#   RFC1486          ||       M. Rose, C. Malamud         ||       mrose17@gmail.com,  carl@malamud.com 
+#   RFC1487          ||       W. Yeong, T. Howes, S. Kille         ||        yeongw@psilink.com, tim@umich.edu, S.Kille@isode.com 
+#   RFC1488          ||       T. Howes, S. Kille, W. Yeong, C. Robbins         ||        tim@umich.edu, S.Kille@isode.com, yeongw@psilink.com 
+#   RFC1489          ||       A. Chernov         ||        ache@astral.msk.su 
+#   RFC1490          ||       T. Bradley, C. Brown, A. Malis         ||         
+#   RFC1491          ||       C. Weider, R. Wright         ||        clw@merit.edu, wright@lbl.gov 
+#   RFC1492          ||       C. Finseth         ||        Craig.A.Finseth-1@umn.edu 
+#   RFC1493          ||       E. Decker, P. Langille, A. Rijsinghani, K. McCloghrie         ||        langille@edwin.enet.dec.com, anil@levers.enet.dec.com, kzm@hls.com 
+#   RFC1494          ||       H. Alvestrand, S. Thompson         ||        Harald.Alvestrand@delab.sintef.no, sjt@gateway.ssw.com 
+#   RFC1495          ||       H. Alvestrand, S. Kille, R. Miles, M. Rose, S. Thompson         ||        Harald.Alvestrand@delab.sintef.no,  S.Kille@ISODE.COM,  rsm@spyder.ssw.com, mrose17@gmail.com,  sjt@gateway.ssw.com 
+#   RFC1496          ||       H. Alvestrand, J. Romaguera, K. Jordan         ||        Harald.T.Alvestrand@delab.sintef.no, Kevin.E.Jordan@mercury.oss.arh.cpg.cdc.com, Romaguera@netconsult.ch 
+#   RFC1497          ||       J. Reynolds         ||        jkrey@isi.edu 
+#   RFC1498          ||       J. Saltzer         ||        Saltzer@MIT.EDU 
+#   RFC1499          ||       J. Elliott         ||        elliott@isi.edu 
+#   RFC1500          ||       J. Postel         ||         
+#   RFC1501          ||       E. Brunsen         ||        BRUNSENE@EMAIL.ENMU.EDU 
+#   RFC1502          ||       H. Alvestrand         ||        Harald.Alvestrand@delab.sintef.no 
+#   RFC1503          ||       K. McCloghrie, M. Rose         ||        kzm@hls.com, mrose17@gmail.com
+#   RFC1504          ||       A. Oppenheimer         ||        Oppenheime1@applelink.apple.com 
+#   RFC1505          ||       A. Costanzo, D. Robinson, R. Ullmann         ||         
+#   RFC1506          ||       J. Houttuin         ||         
+#   RFC1507          ||       C. Kaufman         ||         
+#   RFC1508          ||       J. Linn         ||         
+#   RFC1509          ||       J. Wray         ||        Wray@tuxedo.enet.dec.com 
+#   RFC1510          ||      J. Kohl, C. Neuman         ||       jtkohl@zk3.dec.com, bcn@isi.edu
+#   RFC1511          ||       J. Linn         ||         
+#   RFC1512          ||       J. Case, A. Rijsinghani         ||        case@CS.UTK.EDU, anil@levers.enet.dec.com 
+#   RFC1513          ||       S. Waldbusser         ||        waldbusser@cmu.edu 
+#   RFC1514          ||       P. Grillo, S. Waldbusser         ||        pl0143@mail.psi.net, waldbusser@cmu.edu 
+#   RFC1515          ||       D. McMaster, K. McCloghrie, S. Roberts         ||        mcmaster@synoptics.com, kzm@hls.com, sroberts@farallon.com 
+#   RFC1516          ||       D. McMaster, K. McCloghrie         ||        mcmaster@synoptics.com, kzm@hls.com 
+#   RFC1517          ||      Internet Engineering Steering Group, R. Hinden         ||       bob.hinden@gmail.com
+#   RFC1518          ||       Y. Rekhter, T. Li         ||        yakov@watson.ibm.com, tli@cisco.com 
+#   RFC1519          ||       V. Fuller, T. Li, J. Yu, K. Varadhan         ||        vaf@Stanford.EDU, tli@cisco.com, jyy@merit.edu, kannan@oar.net 
+#   RFC1520          ||       Y. Rekhter, C. Topolcic         ||        yakov@watson.ibm.com, topolcic@CNRI.Reston.VA.US 
+#   RFC1521          ||       N. Borenstein, N. Freed         ||        gvaudre@cnri.reston.va.us 
+#   RFC1522          ||       K. Moore         ||        moore@cs.utk.edu 
+#   RFC1523          ||       N. Borenstein         ||        nsb@bellcore.com 
+#   RFC1524          ||       N. Borenstein         ||        nsb@bellcore.com 
+#   RFC1525          ||       E. Decker, K. McCloghrie, P. Langille, A. Rijsinghani         ||        kzm@hls.com, langille@edwin.enet.dec.com, anil@levers.enet.dec.com 
+#   RFC1526          ||       D. Piscitello         ||        dave@mail.bellcore.com 
+#   RFC1527          ||       G. Cook         ||        cook@path.net 
+#   RFC1528          ||       C. Malamud, M. Rose         ||         
+#   RFC1529          ||       C. Malamud, M. Rose         ||         
+#   RFC1530          ||       C. Malamud, M. Rose         ||         
+#   RFC1531          ||       R. Droms         ||        droms@bucknell.edu 
+#   RFC1532          ||       W. Wimer         ||        Walter.Wimer@CMU.EDU 
+#   RFC1533          ||       S. Alexander, R. Droms         ||        stevea@lachman.com, droms@bucknell.edu 
+#   RFC1534          ||       R. Droms         ||        droms@bucknell.edu 
+#   RFC1535          ||       E. Gavron         ||        gavron@aces.com 
+#   RFC1536          ||       A. Kumar, J. Postel, C. Neuman, P. Danzig, S. Miller         ||        anant@isi.edu, postel@isi.edu, bcn@isi.edu, danzig@caldera.usc.edu, smiller@caldera.usc.edu 
+#   RFC1537          ||       P. Beertema         ||        Piet.Beertema@cwi.nl, anant@isi.edu 
+#   RFC1538          ||       W. Behl, B. Sterling, W. Teskey         ||         
+#   RFC1539          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
+#   RFC1540          ||       J. Postel         ||         
+#   RFC1541          ||       R. Droms         ||        droms@bucknell.edu 
+#   RFC1542          ||      W. Wimer         ||       Walter.Wimer@CMU.EDU
+#   RFC1543          ||      J. Postel         ||       Postel@ISI.EDU, dwaitzman@BBN.COM
+#   RFC1544          ||       M. Rose         ||       mrose17@gmail.com
+#   RFC1545          ||       D. Piscitello         ||        dave@mail.bellcore.com 
+#   RFC1546          ||      C. Partridge, T. Mendez, W. Milliken         ||       craig@bbn.com, tmendez@bbn.com, milliken@bbn.com
+#   RFC1547          ||       D. Perkins         ||        Bill.Simpson@um.cc.umich.edu 
+#   RFC1548          ||       W. Simpson         ||         
+#   RFC1549          ||       W. Simpson, Ed.         ||         
+#   RFC1550          ||       S. Bradner, A. Mankin         ||        sob@harvard.edu, mankin@cmf.nrl.navy.mil 
+#   RFC1551          ||       M. Allen         ||        mallen@novell.com, fbaker@acc.com 
+#   RFC1552          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
+#   RFC1553          ||       S. Mathur, M. Lewis         ||        mathur@telebit.com, Mark.S.Lewis@telebit.com 
+#   RFC1554          ||       M. Ohta, K. Handa         ||        mohta@cc.titech.ac.jp, handa@etl.go.jp 
+#   RFC1555          ||       H. Nussbacher, Y. Bourvine         ||        hank@vm.tau.ac.il, yehavi@vms.huji.ac.il 
+#   RFC1556          ||       H. Nussbacher         ||        hank@vm.tau.ac.il 
+#   RFC1557          ||       U. Choi, K. Chon, H. Park         ||        uhhyung@kaist.ac.kr, chon@cosmos.kaist.ac.kr, hjpark@dino.media.co.kr 
+#   RFC1558          ||       T. Howes         ||        tim@umich.edu 
+#   RFC1559          ||       J. Saperia         ||        saperia@tay.dec.com 
+#   RFC1560          ||       B. Leiner, Y. Rekhter         ||        leiner@nsipo.nasa.gov, yakov@watson.ibm.com 
+#   RFC1561          ||       D. Piscitello         ||        wk04464@worldlink.com 
+#   RFC1562          ||       G. Michaelson, M. Prior         ||        G.Michaelson@cc.uq.oz.au, mrp@itd.adelaide.edu.au 
+#   RFC1563          ||       N. Borenstein         ||        nsb@bellcore.com 
+#   RFC1564          ||       P. Barker, R. Hedberg         ||        P.Barker@cs.ucl.ac.uk, Roland.Hedberg@rc.tudelft.nl, Roland.Hedberg@umdac.umu.se 
+#   RFC1565          ||       S. Kille, N. Freed         ||        S.Kille@isode.com, ned@innosoft.com 
+#   RFC1566          ||       S. Kille, N. Freed         ||        S.Kille@isode.com, ned@innosoft.com 
+#   RFC1567          ||       G. Mansfield, S. Kille         ||        glenn@aic.co.jp, S.Kille@isode.com 
+#   RFC1568          ||       A. Gwinn         ||        allen@mail.cox.smu.edu 
+#   RFC1569          ||       M. Rose         ||       mrose17@gmail.com
+#   RFC1570          ||       W. Simpson, Ed.         ||         
+#   RFC1571          ||       D. Borman         ||        dab@CRAY.COM 
+#   RFC1572          ||       S. Alexander, Ed.         ||         
+#   RFC1573          ||       K. McCloghrie, F. Kastenholz         ||        kzm@hls.com, kasten@ftp.com 
+#   RFC1574          ||       S. Hares, C. Wittbrodt         ||        skh@merit.edu, cjw@magnolia.Stanford.EDU 
+#   RFC1575          ||       S. Hares, C. Wittbrodt         ||        skh@merit.edu, cjw@magnolia.Stanford.EDU 
+#   RFC1576          ||       J. Penner         ||        jjp@bscs.com 
+#   RFC1577          ||       M. Laubach         ||        laubach@hpl.hp.com 
+#   RFC1578          ||       J. Sellers         ||        sellers@quest.arc.nasa.gov 
+#   RFC1579          ||       S. Bellovin         ||        smb@research.att.com 
+#   RFC1580          ||       EARN Staff         ||        earndoc@earncc.earn.net 
+#   RFC1581          ||       G. Meyer         ||        gerry@spider.co.uk 
+#   RFC1582          ||       G. Meyer         ||        gerry@spider.co.uk 
+#   RFC1583          ||       J. Moy         ||         
+#   RFC1584          ||      J. Moy         ||       
+#   RFC1585          ||       J. Moy         ||        jmoy@proteon.com 
+#   RFC1586          ||       O. deSouza, M. Rodrigues         ||        osmund.desouza@att.com, manoel.rodrigues@att.com 
+#   RFC1587          ||       R. Coltun, V. Fuller         ||        rcoltun@rainbow-bridge.com, vaf@Valinor.Stanford.EDU 
+#   RFC1588          ||       J. Postel, C. Anderson         ||         
+#   RFC1589          ||       D. Mills         ||        mills@udel.edu 
+#   RFC1590          ||       J. Postel         ||        Postel@ISI.EDU 
+#   RFC1591          ||       J. Postel         ||        Postel@ISI.EDU 
+#   RFC1592          ||       B. Wijnen, G. Carpenter, K. Curran, A. Sehgal, G. Waters         ||         
+#   RFC1593          ||       W. McKenzie, J. Cheng         ||        mckenzie@ralvma.vnet.ibm.com, cheng@ralvm6.vnet.ibm.com 
+#   RFC1594          ||       A. Marine, J. Reynolds, G. Malkin         ||        amarine@atlas.arc.nasa.gov, jkrey@isi.edu, gmalkin@Xylogics.COM 
+#   RFC1595          ||       T. Brown, K. Tesink         ||        tacox@mail.bellcore.com, kaj@cc.bellcore.com 
+#   RFC1596          ||       T. Brown, Ed.         ||        tacox@mail.bellcore.com 
+#   RFC1597          ||       Y. Rekhter, B. Moskowitz, D. Karrenberg, G. de Groot         ||        yakov@watson.ibm.com, 3858921@mcimail.com, Daniel.Karrenberg@ripe.net, GeertJan.deGroot@ripe.net 
+#   RFC1598          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
+#   RFC1599          ||       M. Kennedy         ||        MKENNEDY@ISI.EDU 
+#   RFC1600          ||       J. Postel         ||         
+#   RFC1601          ||       C. Huitema         ||        Christian.Huitema@sophia.inria.fr 
+#   RFC1602          ||      Internet Architecture Board, Internet Engineering Steering Group         ||       Christian.Huitema@MIRSA.INRIA.FR, 0006423401@mcimail.com
+#   RFC1603          ||       E. Huizer, D. Crocker         ||         
+#   RFC1604          ||       T. Brown, Ed.         ||        tacox@mail.bellcore.com 
+#   RFC1605          ||       W. Shakespeare         ||         
+#   RFC1606          ||       J. Onions         ||        j.onions@nexor.co.uk 
+#   RFC1607          ||       V. Cerf         ||        vcerf@isoc.org, vinton_cerf@mcimail.com 
+#   RFC1608          ||       T. Johannsen, G. Mansfield, M. Kosters, S. Sataluri         ||        Thomas.Johannsen@ifn.et.tu-dresden.de, glenn@aic.co.jp, markk@internic.net, sri@qsun.att.com 
+#   RFC1609          ||       G. Mansfield, T. Johannsen, M. Knopper         ||        glenn@aic.co.jp, Thomas.Johannsen@ifn.et.tu-dresden.de, mak@merit.edu 
+#   RFC1610          ||       J. Postel         ||         
+#   RFC1611          ||       R. Austein, J. Saperia         ||        sra@epilogue.com, saperia@zko.dec.com 
+#   RFC1612          ||       R. Austein, J. Saperia         ||        sra@epilogue.com, saperia@zko.dec.com 
+#   RFC1613          ||       J. Forster, G. Satz, G. Glick, R. Day         ||        forster@cisco.com, satz@cisco.com, gglick@cisco.com, R.Day@jnt.ac.uk 
+#   RFC1614          ||       C. Adie         ||        C.J.Adie@edinburgh.ac.uk 
+#   RFC1615          ||       J. Houttuin, J. Craigie         ||         
+#   RFC1616          ||      RARE WG-MSG Task Force 88, E. Huizer, Ed., J. Romaguera, Ed.         ||       
+#   RFC1617          ||       P. Barker, S. Kille, T. Lenggenhager         ||        p.barker@cs.ucl.ac.uk, s.kille@isode.com, lenggenhager@switch.ch 
+#   RFC1618          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
+#   RFC1619          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
+#   RFC1620          ||       B. Braden, J. Postel, Y. Rekhter         ||        Braden@ISI.EDU, Postel@ISI.EDU, Yakov@WATSON.IBM.COM 
+#   RFC1621          ||       P. Francis         ||        francis@cactus.ntt.jp 
+#   RFC1622          ||       P. Francis         ||        francis@cactus.ntt.jp 
+#   RFC1623          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1624          ||       A. Rijsinghani, Ed.         ||        anil@levers.enet.dec.com 
+#   RFC1625          ||       M. St. Pierre, J. Fullton, K. Gamiel, J. Goldman, B. Kahle, J. Kunze, H. Morris, F. Schiettecatte         ||        saint@wais.com, jim.fullton@cnidr.org, kevin.gamiel@cnidr.org, jonathan@think.com, brewster@wais.com, jak@violet.berkeley.edu, morris@wais.com, francois@wais.com 
+#   RFC1626          ||       R. Atkinson         ||        atkinson@itd.nrl.navy.mil 
+#   RFC1627          ||       E. Lear, E. Fair, D. Crocker, T. Kessler         ||         
+#   RFC1628          ||       J. Case, Ed.         ||        case@SNMP.COM 
+#   RFC1629          ||       R. Colella, R. Callon, E. Gardner, Y. Rekhter         ||        colella@nist.gov, callon@wellfleet.com, epg@gateway.mitre.org, yakov@watson.ibm.com 
+#   RFC1630          ||       T. Berners-Lee         ||        timbl@info.cern.ch 
+#   RFC1631          ||       K. Egevang, P. Francis         ||        kbe@craycom.dk, francis@cactus.ntt.jp 
+#   RFC1632          ||      A. Getchell, Ed., S. Sataluri, Ed.         ||       
+#   RFC1633          ||       R. Braden, D. Clark, S. Shenker         ||        Braden@ISI.EDU, ddc@LCS.MIT.EDU, Shenker@PARC.XEROX.COM 
+#   RFC1634          ||       M. Allen         ||        mallen@novell.com, fbaker@acc.com 
+#   RFC1635          ||       P. Deutsch, A. Emtage, A. Marine         ||        peterd@bunyip.com, bajan@bunyip.com, amarine@atlas.arc.nasa.gov 
+#   RFC1636          ||       R. Braden, D. Clark, S. Crocker, C. Huitema         ||        Braden@ISI.EDU, ddc@lcs.mit.edu, crocker@tis.com, Christian.Huitema@MIRSA.INRIA.FR 
+#   RFC1637          ||       B. Manning, R. Colella         ||        bmanning@rice.edu, colella@nist.gov 
+#   RFC1638          ||       F. Baker, R. Bowen         ||        Rich_Bowen@vnet.ibm.com 
+#   RFC1639          ||       D. Piscitello         ||        dave@corecom.com 
+#   RFC1640          ||       S. Crocker         ||        crocker@TIS.COM 
+#   RFC1641          ||       D. Goldsmith, M. Davis         ||        david_goldsmith@taligent.com, mark_davis@taligent.com 
+#   RFC1642          ||       D. Goldsmith, M. Davis         ||        david_goldsmith@taligent.com, mark_davis@taligent.com 
+#   RFC1643          ||      F. Kastenholz         ||       kasten@ftp.com
+#   RFC1644          ||      R. Braden         ||       Braden@ISI.EDU
+#   RFC1645          ||       A. Gwinn         ||        allen@mail.cox.smu.edu 
+#   RFC1646          ||       C. Graves, T. Butts, M. Angel         ||        cvg@oc.com, tom@oc.com, angel@oc.com 
+#   RFC1647          ||       B. Kelly         ||        kellywh@mail.auburn.edu 
+#   RFC1648          ||       A. Cargille         ||         
+#   RFC1649          ||       R. Hagens, A. Hansen         ||        hagens@ans.net, Alf.Hansen@uninett.no 
+#   RFC1650          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1651          ||       J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker         ||        klensin@mci.net,  ned@innosoft.com, mrose17@gmail.com,  stef@nma.com,  dcrocker@sgi.com 
+#   RFC1652          ||      J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker         ||       klensin@mci.net, ned@innosoft.com, mrose17@gmail.com, stef@nma.com, dcrocker@sgi.com
+#   RFC1653          ||       J. Klensin, N. Freed, K. Moore         ||        klensin@mci.net, ned@innosoft.com, moore@cs.utk.edu 
+#   RFC1654          ||      Y. Rekhter, Ed., T. Li, Ed.         ||       
+#   RFC1655          ||      Y. Rekhter, Ed., P. Gross, Ed.         ||       yakov@watson.ibm.com, 0006423401@mcimail.com
+#   RFC1656          ||      P. Traina         ||       pst@cisco.com
+#   RFC1657          ||       S. Willis, J. Burruss, J. Chu, Ed.         ||        swillis@wellfleet.com, jburruss@wellfleet.com, jychu@watson.ibm.com 
+#   RFC1658          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
+#   RFC1659          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
+#   RFC1660          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
+#   RFC1661          ||       W. Simpson, Ed.         ||         
+#   RFC1662          ||       W. Simpson, Ed.         ||         
+#   RFC1663          ||       D. Rand         ||        dave_rand@novell.com 
+#   RFC1664          ||       C. Allocchio, A. Bonito, B. Cole, S. Giordano, R. Hagens         ||         
+#   RFC1665          ||      Z. Kielczewski, Ed., D. Kostick, Ed., K. Shih, Ed.         ||       zbig@eicon.qc.ca, dck2@mail.bellcore.com, kmshih@novell.com
+#   RFC1666          ||      Z. Kielczewski, Ed., D. Kostick, Ed., K. Shih, Ed.         ||       zbig@eicon.qc.ca, dck2@mail.bellcore.com, kmshih@novell.com
+#   RFC1667          ||       S. Symington, D. Wood, M. Pullen         ||        susan@gateway.mitre.org, wood@mitre.org, mpullen@cs.gmu.edu 
+#   RFC1668          ||       D. Estrin, T. Li, Y. Rekhter         ||        estrin@usc.edu, tli@cisco.com, yakov@watson.ibm.com 
+#   RFC1669          ||       J. Curran         ||        jcurran@near.net 
+#   RFC1670          ||       D. Heagerty         ||        denise@dxcoms.cern.ch 
+#   RFC1671          ||       B. Carpenter         ||        brian@dxcoms.cern.ch 
+#   RFC1672          ||       N. Brownlee         ||        n.brownlee@auckland.ac.nz 
+#   RFC1673          ||       R. Skelton         ||        RSKELTON@msm.epri.com 
+#   RFC1674          ||       M. Taylor         ||        mark.s.taylor@airdata.com 
+#   RFC1675          ||       S. Bellovin         ||        smb@research.att.com 
+#   RFC1676          ||       A. Ghiselli, D. Salomoni, C. Vistoli         ||        Salomoni@infn.it, Vistoli@infn.it, Ghiselli@infn.it 
+#   RFC1677          ||       B. Adamson         ||        adamson@itd.nrl.navy.mil 
+#   RFC1678          ||       E. Britton, J. Tavs         ||        brittone@vnet.ibm.com, tavs@vnet.ibm.com 
+#   RFC1679          ||       D. Green, P. Irey, D. Marlow, K. O'Donoghue         ||        dtgreen@relay.nswc.navy.mil, pirey@relay.nswc.navy.mil, dmarlow@relay.nswc.navy.mil, kodonog@relay.nswc.navy.mil 
+#   RFC1680          ||       C. Brazdziunas         ||        crb@faline.bellcore.com 
+#   RFC1681          ||       S. Bellovin         ||        smb@research.att.com 
+#   RFC1682          ||       J. Bound         ||        bound@zk3.dec.com 
+#   RFC1683          ||       R. Clark, M. Ammar, K. Calvert         ||        rjc@cc.gatech.edu, ammar@cc.gatech.edu, calvert@cc.gatech.edu 
+#   RFC1684          ||       P. Jurg         ||         
+#   RFC1685          ||       H. Alvestrand         ||         
+#   RFC1686          ||       M. Vecchi         ||        mpvecchi@twcable.com 
+#   RFC1687          ||       E. Fleischman         ||        ericf@atc.boeing.com 
+#   RFC1688          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
+#   RFC1689          ||       J. Foster, Ed.         ||         
+#   RFC1690          ||       G. Huston         ||        Geoff.Huston@aarnet.edu.au 
+#   RFC1691          ||       W. Turner         ||        wrt1@cornell.edu 
+#   RFC1692          ||       P. Cameron, D. Crocker, D. Cohen, J. Postel         ||        cameron@xylint.co.uk, dcrocker@sgi.com, Cohen@myricom.com, Postel@ISI.EDU 
+#   RFC1693          ||      T.  Connolly, P. Amer, P. Conrad         ||       connolly@udel.edu, amer@udel.edu, pconrad@udel.edu
+#   RFC1694          ||      T. Brown, Ed., K. Tesink, Ed.         ||       tacox@mail.bellcore.com, kaj@cc.bellcore.com
+#   RFC1695          ||      M. Ahmed, Ed., K. Tesink, Ed.         ||       mxa@mail.bellcore.com, kaj@cc.bellcore.com
+#   RFC1696          ||       J. Barnes, L. Brown, R. Royston, S. Waldbusser         ||        barnes@xylogics.com, brown_l@msm.cdx.mot.com, rroyston@usr.com, swol@andrew.cmu.edu 
+#   RFC1697          ||       D. Brower, Ed., B. Purvy, A. Daniel, M. Sinykin, J. Smith         ||        daveb@ingres.com, bpurvy@us.oracle.com, anthony@informix.com, msinykin@us.oracle.com, jaysmith@us.oracle.com 
+#   RFC1698          ||       P. Furniss         ||        P.Furniss@ulcc.ac.uk 
+#   RFC1699          ||       J. Elliott         ||        elliott@isi.edu 
+#   RFC1700          ||      J. Reynolds, J. Postel         ||       jkrey@isi.edu, postel@isi.edu
+#   RFC1701          ||       S. Hanks, T. Li, D. Farinacci, P. Traina         ||        stan@netsmiths.com, tli@cisco.com, dino@cisco.com, pst@cisco.com 
+#   RFC1702          ||       S. Hanks, T. Li, D. Farinacci, P. Traina         ||        stan@netsmiths.com, tli@cisco.com, dino@cisco.com, pst@cisco.com 
+#   RFC1703          ||       M. Rose         ||       mrose17@gmail.com
+#   RFC1704          ||       N. Haller, R. Atkinson         ||         
+#   RFC1705          ||       R. Carlson, D. Ficarella         ||        RACarlson@anl.gov, ficarell@cpdmfg.cig.mot.com 
+#   RFC1706          ||       B. Manning, R. Colella         ||        bmanning@isi.edu, colella@nist.gov 
+#   RFC1707          ||       M. McGovern, R. Ullmann         ||        scrivner@world.std.com, rullmann@crd.lotus.com 
+#   RFC1708          ||       D. Gowin         ||        drg508@crane-ns.nwscc.sea06.navy.MIL 
+#   RFC1709          ||       J. Gargano, D. Wasley         ||        jcgargano@ucdavis.edu, dlw@berkeley.edu 
+#   RFC1710          ||      R. Hinden         ||       bob.hinden@gmail.com
+#   RFC1711          ||       J. Houttuin         ||        houttuin@rare.nl 
+#   RFC1712          ||       C. Farrell, M. Schulze, S. Pleitner, D. Baldoni         ||        craig@cs.curtin.edu.au, mike@cs.curtin.edu.au, pleitner@cs.curtin.edu.au, flint@cs.curtin.edu.au 
+#   RFC1713          ||       A. Romao         ||        artur@fct.unl.pt 
+#   RFC1714          ||       S. Williamson, M. Kosters         ||        scottw@internic.net, markk@internic.net 
+#   RFC1715          ||       C. Huitema         ||        Christian.Huitema@MIRSA.INRIA.FR 
+#   RFC1716          ||       P. Almquist, F. Kastenholz         ||         
+#   RFC1717          ||       K. Sklower, B. Lloyd, G. McGregor, D. Carr         ||        sklower@CS.Berkeley.EDU, brian@lloyd.com, glenn@lloyd.com, dcarr@Newbridge.COM 
+#   RFC1718          ||       IETF Secretariat, G. Malkin         ||        ietf-info@cnri.reston.va.us, gmalkin@Xylogics.COM 
+#   RFC1719          ||       P. Gross         ||        phill_gross@mcimail.com 
+#   RFC1720          ||       J. Postel         ||         
+#   RFC1721          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
+#   RFC1722          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
+#   RFC1723          ||      G. Malkin         ||       gmalkin@Xylogics.COM
+#   RFC1724          ||       G. Malkin, F. Baker         ||        gmalkin@Xylogics.COM, fred@cisco.com 
+#   RFC1725          ||      J. Myers, M. Rose         ||       mrose17@gmail.com
+#   RFC1726          ||       C. Partridge, F. Kastenholz         ||        craig@aland.bbn.com, kasten@ftp.com 
+#   RFC1727          ||       C. Weider, P. Deutsch         ||        clw@bunyip.com, peterd@bunyip.com 
+#   RFC1728          ||       C. Weider         ||        clw@bunyip.com 
+#   RFC1729          ||       C. Lynch         ||        clifford.lynch@ucop.edu 
+#   RFC1730          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
+#   RFC1731          ||       J. Myers         ||         
+#   RFC1732          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
+#   RFC1733          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
+#   RFC1734          ||      J. Myers         ||       
+#   RFC1735          ||       J. Heinanen, R. Govindan         ||        Juha.Heinanen@datanet.tele.fi, govindan@isi.edu 
+#   RFC1736          ||      J. Kunze         ||       jak@violet.berkeley.edu
+#   RFC1737          ||       K. Sollins, L. Masinter         ||        masinter@parc.xerox.com, sollins@lcs.mit.edu 
+#   RFC1738          ||      T. Berners-Lee, L. Masinter, M. McCahill         ||       
+#   RFC1739          ||       G. Kessler, S. Shepard         ||        kumquat@hill.com, sds@hill.com 
+#   RFC1740          ||       P. Faltstrom, D. Crocker, E. Fair         ||        paf@nada.kth.se, dcrocker@mordor.stanford.edu, fair@apple.com 
+#   RFC1741          ||       P. Faltstrom, D. Crocker, E. Fair         ||        paf@nada.kth.se, dcrocker@mordor.stanford.edu, fair@apple.com 
+#   RFC1742          ||       S. Waldbusser, K. Frisa         ||        waldbusser@cmu.edu, kfrisa@fore.com 
+#   RFC1743          ||       K. McCloghrie, E. Decker         ||        kzm@cisco.com, cire@cisco.com 
+#   RFC1744          ||       G. Huston         ||        Geoff.Huston@aarnet.edu.au 
+#   RFC1745          ||       K. Varadhan, S. Hares, Y. Rekhter         ||        kannan@isi.edu, skh@merit.edu, yakov@watson.ibm.com 
+#   RFC1746          ||       B. Manning, D. Perkins         ||        bmanning@isi.edu, dperkins@tenet.edu 
+#   RFC1747          ||       J. Hilgeman, Chair, S. Nix, A. Bartky, W. Clark, Ed.         ||        jeffh@apertus.com, snix@metaplex.com, alan@sync.com, wclark@cisco.com 
+#   RFC1748          ||       K. McCloghrie, E. Decker         ||        kzm@cisco.com, cire@cisco.com 
+#   RFC1749          ||       K. McCloghrie, F. Baker, E. Decker         ||        kzm@cisco.com, fred@cisco.com, cire@cisco.com 
+#   RFC1750          ||       D. Eastlake 3rd, S. Crocker, J. Schiller         ||        dee@lkg.dec.com, crocker@cybercash.com, jis@mit.edu 
+#   RFC1751          ||       D. McDonald         ||        danmcd@itd.nrl.navy.mil 
+#   RFC1752          ||       S. Bradner, A. Mankin         ||        sob@harvard.edu, mankin@isi.edu 
+#   RFC1753          ||       N. Chiappa         ||        jnc@lcs.mit.edu 
+#   RFC1754          ||       M. Laubach         ||        laubach@com21.com 
+#   RFC1755          ||       M. Perez, F. Liaw, A. Mankin, E. Hoffman, D. Grossman, A. Malis         ||        perez@isi.edu, fong@fore.com, mankin@isi.edu, hoffman@isi.edu, dan@merlin.dev.cdx.mot.com, malis@maelstrom.timeplex.com 
+#   RFC1756          ||       T. Rinne         ||        Timo.Rinne@hut.fi 
+#   RFC1757          ||       S. Waldbusser         ||        waldbusser@cmu.edu 
+#   RFC1758          ||       The North American Directory Forum         ||        0004454742@mcimail.com 
+#   RFC1759          ||      R. Smith, F. Wright, T. Hastings, S. Zilles, J. Gyllenskog         ||       rlsmith@nb.ppd.ti.com, don@lexmark.com, tom.hastings@alum.mit.edu, szilles@mv.us.adobe.com, jgyllens@hpdmd48.boi.hp.com
+#   RFC1760          ||       N. Haller         ||        nmh@bellcore.com 
+#   RFC1761          ||       B. Callaghan, R. Gilligan         ||        brent.callaghan@eng.sun.com, bob.gilligan@eng.sun.com 
+#   RFC1762          ||       S. Senum         ||        sjs@digibd.com 
+#   RFC1763          ||       S. Senum         ||        sjs@digibd.com 
+#   RFC1764          ||       S. Senum         ||        sjs@digibd.com 
+#   RFC1765          ||       J. Moy         ||        jmoy@casc.com 
+#   RFC1766          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
+#   RFC1767          ||       D. Crocker         ||         
+#   RFC1768          ||       D. Marlow         ||        dmarlow@relay.nswc.navy.mil 
+#   RFC1769          ||       D. Mills         ||        mills@udel.edu 
+#   RFC1770          ||      C. Graff         ||       bud@fotlan5.fotlan.army.mil
+#   RFC1771          ||       Y. Rekhter, T. Li         ||         
+#   RFC1772          ||       Y. Rekhter, P. Gross         ||        yakov@watson.ibm.com, 0006423401@mcimail.com 
+#   RFC1773          ||       P. Traina         ||        pst@cisco.com 
+#   RFC1774          ||       P. Traina, Ed.         ||         
+#   RFC1775          ||       D. Crocker         ||        dcrocker@mordor.stanford.edu 
+#   RFC1776          ||       S. Crocker         ||        crocker@cybercash.com 
+#   RFC1777          ||       W. Yeong, T. Howes, S. Kille         ||        yeongw@psilink.com, tim@umich.edu, S.Kille@isode.com 
+#   RFC1778          ||       T. Howes, S. Kille, W. Yeong, C. Robbins         ||        tim@umich.edu, S.Kille@isode.com, yeongw@psilink.com 
+#   RFC1779          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC1780          ||       J. Postel, Ed.         ||         
+#   RFC1781          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC1782          ||       G. Malkin, A. Harkin         ||        gmalkin@xylogics.com, ash@cup.hp.com 
+#   RFC1783          ||       G. Malkin, A. Harkin         ||        gmalkin@xylogics.com, ash@cup.hp.com 
+#   RFC1784          ||       G. Malkin, A. Harkin         ||        gmalkin@xylogics.com, ash@cup.hp.com 
+#   RFC1785          ||       G. Malkin, A. Harkin         ||        gmalkin@xylogics.com, ash@cup.hp.com 
+#   RFC1786          ||       T. Bates, E. Gerich, L. Joncheray, J-M. Jouanigot, D. Karrenberg, M. Terpstra, J. Yu         ||         
+#   RFC1787          ||       Y. Rekhter         ||         
+#   RFC1788          ||      W. Simpson         ||       
+#   RFC1789          ||       C. Yang         ||        cqyang@cs.unt.edu 
+#   RFC1790          ||       V. Cerf         ||        vcerf@isoc.org 
+#   RFC1791          ||       T. Sung         ||        tae@novell.Com 
+#   RFC1792          ||       T. Sung         ||        tae@novell.Com 
+#   RFC1793          ||       J. Moy         ||        jmoy@casc.com 
+#   RFC1794          ||       T. Brisco         ||        brisco@rutgers.edu 
+#   RFC1795          ||       L. Wells, Chair, A. Bartky, Ed.         ||         
+#   RFC1796          ||       C. Huitema, J. Postel, S. Crocker         ||        Christian.Huitema@MIRSA.INRIA.FR, Postel@ISI.EDU, crocker@cybercash.com 
+#   RFC1797          ||       Internet Assigned Numbers Authority (IANA)         ||        iana@isi.edu 
+#   RFC1798          ||       A. Young         ||        A.Young@isode.com 
+#   RFC1799          ||       M. Kennedy         ||        MKENNEDY@ISI.EDU 
+#   RFC1800          ||       J. Postel, Ed.         ||         
+#   RFC1801          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC1802          ||       H. Alvestrand, K. Jordan, S. Langlois, J. Romaguera         ||        Harald.T.Alvestrand@uninett.no, Kevin.E.Jordan@cdc.com, Sylvain.Langlois@der.edf.fr, Romaguera@NetConsult.ch 
+#   RFC1803          ||       R. Wright, A. Getchell, T. Howes, S. Sataluri, P. Yee, W. Yeong         ||         
+#   RFC1804          ||       G. Mansfield, P. Rajeev, S. Raghavan, T. Howes         ||        glenn@aic.co.jp, rajeev%hss@lando.hns.com, svr@iitm.ernet.in, tim@umich.edu 
+#   RFC1805          ||       A. Rubin         ||        rubin@bellcore.com 
+#   RFC1806          ||      R. Troost, S. Dorner         ||       rens@century.com, sdorner@qualcomm.com
+#   RFC1807          ||       R. Lasher, D. Cohen         ||        rlasher@forsythe.stanford.edu, Cohen@myri.com 
+#   RFC1808          ||       R. Fielding         ||        fielding@ics.uci.edu 
+#   RFC1809          ||       C. Partridge         ||        craig@aland.bbn.com 
+#   RFC1810          ||       J. Touch         ||        touch@isi.edu 
+#   RFC1811          ||       Federal Networking Council         ||        execdir@fnc.gov 
+#   RFC1812          ||      F. Baker, Ed.         ||       
+#   RFC1813          ||       B. Callaghan, B. Pawlowski, P. Staubach         ||        brent.callaghan@eng.sun.com, beepy@netapp.com, peter.staubach@eng.sun.com 
+#   RFC1814          ||       E. Gerich         ||        epg@merit.edu 
+#   RFC1815          ||       M. Ohta         ||        mohta@cc.titech.ac.jp 
+#   RFC1816          ||       Federal Networking Council         ||        execdir@fnc.gov 
+#   RFC1817          ||       Y. Rekhter         ||        yakov@cisco.com 
+#   RFC1818          ||       J. Postel, T. Li, Y. Rekhter         ||        postel@isi.edu, yakov@cisco.com, tli@cisco.com 
+#   RFC1819          ||      L. Delgrossi, Ed., L. Berger, Ed.         ||       lberger@bbn.com, luca@andersen.fr, dat@bbn.com, stevej@syzygycomm.com, schaller@heidelbg.ibm.com
+#   RFC1820          ||       E. Huizer         ||        Erik.Huizer@SURFnet.nl 
+#   RFC1821          ||       M. Borden, E. Crawley, B. Davie, S. Batsell         ||         
+#   RFC1822          ||       J. Lowe         ||         
+#   RFC1823          ||       T. Howes, M. Smith         ||        tim@umich.edu, mcs@umich.edu 
+#   RFC1824          ||       H. Danisch         ||        danisch@ira.uka.de 
+#   RFC1825          ||       R. Atkinson         ||         
+#   RFC1826          ||       R. Atkinson         ||         
+#   RFC1827          ||       R. Atkinson         ||         
+#   RFC1828          ||      P. Metzger, W. Simpson         ||       
+#   RFC1829          ||       P. Karn, P. Metzger, W. Simpson         ||         
+#   RFC1830          ||       G. Vaudreuil         ||        Greg.Vaudreuil@Octel.com 
+#   RFC1831          ||      R. Srinivasan         ||       raj@eng.sun.com
+#   RFC1832          ||       R. Srinivasan         ||        raj@eng.sun.com 
+#   RFC1833          ||      R. Srinivasan         ||       raj@eng.sun.com
+#   RFC1834          ||       J. Gargano, K. Weiss         ||        jcgargano@ucdavis.edu, krweiss@ucdavis.edu 
+#   RFC1835          ||       P. Deutsch, R. Schoultz, P. Faltstrom, C. Weider         ||        peterd@bunyip.com, schoultz@sunet.se, paf@bunyip.com, clw@bunyip.com 
+#   RFC1836          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC1837          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC1838          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC1839          ||               ||         
+#   RFC1840          ||               ||         
+#   RFC1841          ||       J. Chapman, D. Coli, A. Harvey, B. Jensen, K. Rowett         ||        joelle@cisco.com, dcoli@cisco.com, agh@cisco.com, bent@cisco.com, krowett@cisco.com 
+#   RFC1842          ||       Y. Wei, Y. Zhang, J. Li, J. Ding, Y. Jiang         ||        HZRFC@usai.asiainfo.com, zhang@orion.harvard.edu, jian@is.rice.edu, ding@Beijing.AsiaInfo.com, yjj@eng.umd.edu 
+#   RFC1843          ||       F. Lee         ||        lee@csl.stanford.edu 
+#   RFC1844          ||       E. Huizer         ||        Erik.Huizer@SURFnet.nl 
+#   RFC1845          ||       D. Crocker, N. Freed, A. Cargille         ||        dcrocker@mordor.stanford.edu, ned@innosoft.com 
+#   RFC1846          ||      A. Durand, F. Dupont         ||       Alain.Durand@imag.fr, Francis.Dupont@inria.fr
+#   RFC1847          ||       J. Galvin, S. Murphy, S. Crocker, N. Freed         ||        galvin@tis.com, sandy@tis.com, crocker@cybercash.com, ned@innosoft.com 
+#   RFC1848          ||       S. Crocker, N. Freed, J. Galvin, S. Murphy         ||        crocker@cybercash.com, galvin@tis.com, murphy@tis.com, ned@innosoft.com 
+#   RFC1849          ||      H. Spencer         ||       henry@zoo.utoronto.ca
+#   RFC1850          ||       F. Baker, R. Coltun         ||        fred@cisco.com, rcoltun@rainbow-bridge.com 
+#   RFC1851          ||       P. Karn, P. Metzger, W. Simpson         ||         
+#   RFC1852          ||       P. Metzger, W. Simpson         ||         
+#   RFC1853          ||       W. Simpson         ||         
+#   RFC1854          ||       N. Freed         ||        ned@innosoft.com 
+#   RFC1855          ||       S. Hambridge         ||        sallyh@ludwig.sc.intel.com 
+#   RFC1856          ||       H. Clark         ||        henryc@bbnplanet.com 
+#   RFC1857          ||       M. Lambert         ||        lambert@psc.edu 
+#   RFC1858          ||       G. Ziemba, D. Reed, P. Traina         ||        paul@alantec.com, darrenr@cyber.com.au, pst@cisco.com 
+#   RFC1859          ||       Y. Pouffary         ||        pouffary@taec.enet.dec.com 
+#   RFC1860          ||       T. Pummill, B. Manning         ||        trop@alantec.com, bmanning@isi.edu 
+#   RFC1861          ||       A. Gwinn         ||        allen@mail.cox.smu.edu 
+#   RFC1862          ||       M. McCahill, J. Romkey, M. Schwartz, K. Sollins, T. Verschuren, C. Weider         ||        mpm@boombox.micro.umn.edu, romkey@apocalypse.org, schwartz@cs.colorado.edu, sollins@lcs.mit.edu, Ton.Verschuren@surfnet.nl, clw@bunyip.com 
+#   RFC1863          ||       D. Haskin         ||        dhaskin@baynetworks.com 
+#   RFC1864          ||       J. Myers, M. Rose         ||       mrose17@gmail.com
+#   RFC1865          ||       W. Houser, J. Griffin, C. Hage         ||        houser.walt@forum.va.gov, agriffin@cpcug.org, carl@chage.com 
+#   RFC1866          ||       T. Berners-Lee, D. Connolly         ||        timbl@w3.org, connolly@w3.org 
+#   RFC1867          ||       E. Nebel, L. Masinter         ||        masinter@parc.xerox.com, nebel@xsoft.sd.xerox.com 
+#   RFC1868          ||       G. Malkin         ||        gmalkin@xylogics.com 
+#   RFC1869          ||       J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker         ||        klensin@mci.net,  ned@innosoft.com, mrose17@gmail.com,  stef@nma.com,  dcrocker@mordor.stanford.edu 
+#   RFC1870          ||       J. Klensin, N. Freed, K. Moore         ||        klensin@mci.net, ned@innosoft.com, moore@cs.utk.edu 
+#   RFC1871          ||       J. Postel         ||        postel@isi.edu 
+#   RFC1872          ||       E. Levinson         ||        ELevinson@Accurate.com 
+#   RFC1873          ||       E. Levinson         ||         
+#   RFC1874          ||       E. Levinson         ||        ELevinson@Accurate.com 
+#   RFC1875          ||       N. Berge         ||        Nils.Harald.Berge@nr.no 
+#   RFC1876          ||       C. Davis, P. Vixie, T. Goodwin, I. Dickinson         ||        ckd@kei.com, paul@vix.com, tim@pipex.net, idickins@fore.co.uk 
+#   RFC1877          ||       S. Cobb         ||        stevec@microsoft.com 
+#   RFC1878          ||       T. Pummill, B. Manning         ||        trop@alantec.com, bmanning@isi.edu 
+#   RFC1879          ||       B. Manning, Ed.         ||         
+#   RFC1880          ||       J. Postel, Ed.         ||         
+#   RFC1881          ||       IAB, IESG         ||         
+#   RFC1882          ||       B. Hancock         ||        hancock@network-1.com 
+#   RFC1883          ||      S. Deering, R. Hinden         ||       bob.hinden@gmail.com
+#   RFC1884          ||      R. Hinden, Ed., S. Deering, Ed.         ||       bob.hinden@gmail.com
+#   RFC1885          ||       A. Conta, S. Deering         ||        deering@parc.xerox.com 
+#   RFC1886          ||       S. Thomson, C. Huitema         ||        set@thumper.bellcore.com, Christian.Huitema@MIRSA.INRIA.FR 
+#   RFC1887          ||      Y. Rekhter, Ed., T. Li, Ed.         ||       
+#   RFC1888          ||       J. Bound, B. Carpenter, D. Harrington, J. Houldsworth, A. Lloyd         ||         
+#   RFC1889          ||       Audio-Video Transport Working Group, H. Schulzrinne, S. Casner, R. Frederick, V. Jacobson         ||        schulzrinne@fokus.gmd.de, casner@precept.com, frederic@parc.xerox.com, van@ee.lbl.gov 
+#   RFC1890          ||       Audio-Video Transport Working Group, H. Schulzrinne         ||        schulzrinne@fokus.gmd.de 
+#   RFC1891          ||       K. Moore         ||        moore@cs.utk.edu 
+#   RFC1892          ||       G. Vaudreuil         ||        Greg.Vaudreuil@Octel.com 
+#   RFC1893          ||       G. Vaudreuil         ||        Greg.Vaudreuil@Octel.com 
+#   RFC1894          ||       K. Moore, G. Vaudreuil         ||        moore@cs.utk.edu, Greg.Vaudreuil@Octel.Com 
+#   RFC1895          ||       E. Levinson         ||        ELevinson@Accurate.com 
+#   RFC1896          ||      P. Resnick, A. Walker         ||       presnick@qti.qualcomm.com, amanda@intercon.com
+#   RFC1897          ||      R. Hinden, J. Postel         ||       bob.hinden@gmail.com, postel@isi.edu
+#   RFC1898          ||       D. Eastlake 3rd, B. Boesch, S. Crocker, M. Yesil         ||        dee@cybercash.com, boesch@cybercash.com, crocker@cybercash.com, magdalen@cybercash.com 
+#   RFC1899          ||       J. Elliott         ||        elliott@isi.edu 
+#   RFC1900          ||       B. Carpenter, Y. Rekhter         ||        brian@dxcoms.cern.ch, yakov@cisco.com 
+#   RFC1901          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1902          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1903          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1904          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1905          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1906          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1907          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1908          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
+#   RFC1909          ||       K. McCloghrie, Ed.         ||         
+#   RFC1910          ||       G. Waters, Ed.         ||         
+#   RFC1911          ||       G. Vaudreuil         ||        Greg.Vaudreuil@Octel.Com 
+#   RFC1912          ||       D. Barr         ||        barr@math.psu.edu 
+#   RFC1913          ||       C. Weider, J. Fullton, S. Spero         ||        clw@bunyip.com, fullton@cnidr.org, ses@eit.com 
+#   RFC1914          ||       P. Faltstrom, R. Schoultz, C. Weider         ||        paf@bunyip.com, schoultz@sunet.se, clw@bunyip.com 
+#   RFC1915          ||       F. Kastenholz         ||        kasten@ftp.com 
+#   RFC1916          ||       H. Berkowitz, P. Ferguson, W. Leland, P. Nesser         ||        hcb@clark.net, pferguso@cisco.com, wel@bellcore.com, pjnesser@rocket.com 
+#   RFC1917          ||       P. Nesser II         ||        pjnesser@martigny.ai.mit.edu 
+#   RFC1918          ||      Y. Rekhter, B. Moskowitz, D. Karrenberg, G. J. de Groot, E. Lear         ||       yakov@cisco.com, rgm3@is.chrysler.com, Daniel.Karrenberg@ripe.net, GeertJan.deGroot@ripe.net, lear@sgi.com
+#   RFC1919          ||       M. Chatel         ||        mchatel@pax.eunet.ch 
+#   RFC1920          ||       J. Postel         ||         
+#   RFC1921          ||       J. Dujonc         ||        J.Y.Dujonc@frcl.bull.fr 
+#   RFC1922          ||       HF. Zhu, DY. Hu, ZG. Wang, TC. Kao, WCH. Chang, M. Crispin         ||        zhf@net.tsinghua.edu.cn, hdy@tsinghua.edu.cn, tckao@iiidns.iii.org.tw, chung@iiidns.iii.org.tw, MRC@CAC.Washington.EDU 
+#   RFC1923          ||       J. Halpern, S. Bradner         ||        jhalpern@newbridge.com, sob@harvard.edu 
+#   RFC1924          ||       R. Elz         ||        kre@munnari.OZ.AU 
+#   RFC1925          ||       R. Callon         ||        rcallon@baynetworks.com 
+#   RFC1926          ||       J. Eriksson         ||        bygg@sunet.se 
+#   RFC1927          ||       C. Rogers         ||        rogers@isi.edu 
+#   RFC1928          ||       M. Leech, M. Ganis, Y. Lee, R. Kuris, D. Koblas, L. Jones         ||        mleech@bnr.ca 
+#   RFC1929          ||       M. Leech         ||        mleech@bnr.ca 
+#   RFC1930          ||      J. Hawkinson, T. Bates         ||       jhawk@bbnplanet.com, Tony.Bates@mci.net
+#   RFC1931          ||       D. Brownell         ||        dbrownell@sun.com 
+#   RFC1932          ||       R. Cole, D. Shur, C. Villamizar         ||        rgc@qsun.att.com, d.shur@att.com, curtis@ans.net 
+#   RFC1933          ||       R. Gilligan, E. Nordmark         ||        Bob.Gilligan@Eng.Sun.COM, Erik.Nordmark@Eng.Sun.COM 
+#   RFC1934          ||       K. Smith         ||        ksmith@ascend.com 
+#   RFC1935          ||       J. Quarterman, S. Carl-Mitchell         ||        tic@tic.com 
+#   RFC1936          ||       J. Touch, B. Parham         ||        touch@isi.edu, bparham@isi.edu 
+#   RFC1937          ||       Y. Rekhter, D. Kandlur         ||        yakov@cisco.com, kandlur@watson.ibm.com 
+#   RFC1938          ||       N. Haller, C. Metz         ||         
+#   RFC1939          ||      J. Myers, M. Rose         ||       mrose17@gmail.com
+#   RFC1940          ||       D. Estrin, T. Li, Y. Rekhter, K. Varadhan, D. Zappala         ||        estrin@isi.edu, tli@cisco.com, yakov@cisco.com, kannan@isi.edu, daniel@isi.edu 
+#   RFC1941          ||       J. Sellers, J. Robichaux         ||        julier@internic.net, sellers@quest.arc.nasa.gov 
+#   RFC1942          ||       D. Raggett         ||        dsr@w3.org 
+#   RFC1943          ||       B. Jennings         ||        jennings@sandia.gov 
+#   RFC1944          ||       S. Bradner, J. McQuaid         ||         
+#   RFC1945          ||       T. Berners-Lee, R. Fielding, H. Frystyk         ||        timbl@w3.org, fielding@ics.uci.edu, frystyk@w3.org 
+#   RFC1946          ||       S. Jackowski         ||        Stevej@NetManage.com 
+#   RFC1947          ||       D. Spinellis         ||        D.Spinellis@senanet.com 
+#   RFC1948          ||      S. Bellovin         ||       smb@research.att.com
+#   RFC1949          ||       A. Ballardie         ||        A.Ballardie@cs.ucl.ac.uk 
+#   RFC1950          ||       P. Deutsch, J-L. Gailly         ||         
+#   RFC1951          ||       P. Deutsch         ||         
+#   RFC1952          ||       P. Deutsch         ||         
+#   RFC1953          ||      P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall         ||       bob.hinden@gmail.com
+#   RFC1954          ||      P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall         ||       bob.hinden@gmail.com
+#   RFC1955          ||      R. Hinden         ||       bob.hinden@gmail.com
+#   RFC1956          ||       D. Engebretson, R. Plzak         ||        engebred@ncr.disa.mil, plzak@nic.ddn.mil 
+#   RFC1957          ||       R. Nelson         ||        nelson@crynwr.com 
+#   RFC1958          ||       B. Carpenter, Ed.         ||         
+#   RFC1959          ||       T. Howes, M. Smith         ||        tim@umich.edu, mcs@umich.edu 
+#   RFC1960          ||       T. Howes         ||        tim@umich.edu 
+#   RFC1961          ||       P. McMahon         ||        p.v.mcmahon@rea0803.wins.icl.co.uk 
+#   RFC1962          ||       D. Rand         ||        dlr@daver.bungi.com 
+#   RFC1963          ||       K. Schneider, S. Venters         ||        kevin@adtran.com, sventers@adtran.com 
+#   RFC1964          ||      J. Linn         ||       
+#   RFC1965          ||       P. Traina         ||        pst@cisco.com 
+#   RFC1966          ||       T. Bates, R. Chandra         ||        tbates@cisco.com, rchandra@cisco.com 
+#   RFC1967          ||       K. Schneider, R. Friend         ||        kschneider@adtran.com, rfriend@stac.com 
+#   RFC1968          ||       G. Meyer         ||        gerry@spider.co.uk 
+#   RFC1969          ||       K. Sklower, G. Meyer         ||        sklower@CS.Berkeley.EDU, gerry@spider.co.uk 
+#   RFC1970          ||       T. Narten, E. Nordmark, W. Simpson         ||         
+#   RFC1971          ||       S. Thomson, T. Narten         ||         
+#   RFC1972          ||       M. Crawford         ||        crawdad@fnal.gov 
+#   RFC1973          ||       W. Simpson         ||         
+#   RFC1974          ||       R. Friend, W. Simpson         ||        rfriend@stac.com 
+#   RFC1975          ||       D. Schremp, J. Black, J. Weiss         ||        dhs@magna.telco.com, jtb@magna.telco.com, jaw@magna.telco.com 
+#   RFC1976          ||       K. Schneider, S. Venters         ||        kevin@adtran.com, sventers@adtran.com 
+#   RFC1977          ||       V. Schryver         ||        vjs@rhyolite.com 
+#   RFC1978          ||       D. Rand         ||        dave_rand@novell.com 
+#   RFC1979          ||       J. Woods         ||        jfw@funhouse.com 
+#   RFC1980          ||      J. Seidman         ||       jim@spyglass.com
+#   RFC1981          ||       J. McCann, S. Deering, J. Mogul         ||        deering@parc.xerox.com, mogul@pa.dec.com 
+#   RFC1982          ||       R. Elz, R. Bush         ||        randy@psg.com 
+#   RFC1983          ||       G. Malkin, Ed.         ||         
+#   RFC1984          ||      IAB, IESG         ||       brian@dxcoms.cern.ch, fred@cisco.com
+#   RFC1985          ||       J. De Winter         ||        jack@wildbear.on.ca 
+#   RFC1986          ||       W. Polites, W. Wollman, D. Woo, R. Langan         ||         
+#   RFC1987          ||      P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall         ||       bob.hinden@gmail.com
+#   RFC1988          ||       G. McAnally, D. Gilbert, J. Flick         ||        johnf@hprnd.rose.hp.com 
+#   RFC1989          ||       W. Simpson         ||         
+#   RFC1990          ||       K. Sklower, B. Lloyd, G. McGregor, D. Carr, T. Coradetti         ||        sklower@CS.Berkeley.EDU, brian@lloyd.com, glenn@lloyd.com, dcarr@Newbridge.COM, 70761.1664@compuserve.com 
+#   RFC1991          ||      D. Atkins, W. Stallings, P. Zimmermann         ||       warlord@MIT.EDU, stallings@ACM.org, prz@acm.org
+#   RFC1992          ||       I. Castineyra, N. Chiappa, M. Steenstrup         ||        isidro@bbn.com, gnc@ginger.lcs.mit.edu, msteenst@bbn.com 
+#   RFC1993          ||       A. Barbir, D. Carr, W. Simpson         ||         
+#   RFC1994          ||       W. Simpson         ||         
+#   RFC1995          ||       M. Ohta         ||        mohta@necom830.hpcl.titech.ac.jp 
+#   RFC1996          ||       P. Vixie         ||        paul@vix.com 
+#   RFC1997          ||      R. Chandra, P. Traina, T. Li         ||       pst@cisco.com, rchandra@cisco.com, tli@skat.usc.edu
+#   RFC1998          ||       E. Chen, T. Bates         ||        enke@mci.net, tbates@cisco.com 
+#   RFC1999          ||       J. Elliott         ||        elliott@isi.edu 
+#   RFC2000          ||       J. Postel, Ed.         ||         
+#   RFC2001          ||       W. Stevens         ||        rstevens@noao.edu 
+#   RFC2002          ||       C. Perkins, Ed.         ||         
+#   RFC2003          ||      C. Perkins         ||       perk@watson.ibm.com, solomon@comm.mot.com
+#   RFC2004          ||       C. Perkins         ||        perk@watson.ibm.com, solomon@comm.mot.com 
+#   RFC2005          ||       J. Solomon         ||        solomon@comm.mot.com 
+#   RFC2006          ||       D. Cong, M. Hamlen, C. Perkins         ||         
+#   RFC2007          ||       J. Foster, M. Isaacs, M. Prior         ||        Jill.Foster@newcastle.ac.uk, mmi@dcs.gla.ac.uk, mrp@connect.com.au 
+#   RFC2008          ||       Y. Rekhter, T. Li         ||        yakov@cisco.com, tli@cisco.com 
+#   RFC2009          ||       T. Imielinski, J. Navas         ||         
+#   RFC2010          ||       B. Manning, P. Vixie         ||        bmanning@isi.edu, paul@vix.com 
+#   RFC2011          ||       K. McCloghrie, Ed.         ||         
+#   RFC2012          ||       K. McCloghrie, Ed.         ||         
+#   RFC2013          ||       K. McCloghrie, Ed.         ||         
+#   RFC2014          ||      A. Weinrib, J. Postel         ||       
+#   RFC2015          ||       M. Elkins         ||         
+#   RFC2016          ||       L. Daigle, P. Deutsch, B. Heelan, C. Alpaugh, M. Maclachlan         ||        ura-bunyip@bunyip.com 
+#   RFC2017          ||       N. Freed, K. Moore, A. Cargille         ||        ned@innosoft.com, moore@cs.utk.edu 
+#   RFC2018          ||       M. Mathis, J. Mahdavi, S. Floyd, A. Romanow         ||         
+#   RFC2019          ||       M. Crawford         ||        crawdad@fnal.gov 
+#   RFC2020          ||       J. Flick         ||         
+#   RFC2021          ||       S. Waldbusser         ||        waldbusser@ins.com 
+#   RFC2022          ||       G. Armitage         ||        gja@thumper.bellcore.com 
+#   RFC2023          ||       D. Haskin, E. Allen         ||         
+#   RFC2024          ||       D. Chen, Ed., P. Gayek, S. Nix         ||        dchen@vnet.ibm.com, gayek@vnet.ibm.com, snix@metaplex.com 
+#   RFC2025          ||       C. Adams         ||        cadams@bnr.ca 
+#   RFC2026          ||      S. Bradner         ||       
+#   RFC2027          ||       J. Galvin         ||         
+#   RFC2028          ||       R. Hovey, S. Bradner         ||        hovey@wnpv01.enet.dec.com, sob@harvard.edu 
+#   RFC2029          ||       M. Speer, D. Hoffman         ||        michael.speer@eng.sun.com, don.hoffman@eng.sun.com 
+#   RFC2030          ||       D. Mills         ||         
+#   RFC2031          ||       E. Huizer         ||         
+#   RFC2032          ||       T. Turletti, C. Huitema         ||        turletti@sophia.inria.fr, huitema@bellcore.com 
+#   RFC2033          ||       J. Myers         ||         
+#   RFC2034          ||       N. Freed         ||         
+#   RFC2035          ||       L. Berc, W. Fenner, R. Frederick, S. McCanne         ||        berc@pa.dec.com, fenner@cmf.nrl.navy.mil, frederick@parc.xerox.com, mccanne@ee.lbl.gov 
+#   RFC2036          ||       G. Huston         ||         
+#   RFC2037          ||       K. McCloghrie, A. Bierman         ||        kzm@cisco.com, andy@yumaworks.com
+#   RFC2038          ||       D. Hoffman, G. Fernando, V. Goyal         ||        gerard.fernando@eng.sun.com, goyal@precept.com, don.hoffman@eng.sun.com 
+#   RFC2039          ||       C. Kalbfleisch         ||         
+#   RFC2040          ||       R. Baldwin, R. Rivest         ||        baldwin@rsa.com, rivest@theory.lcs.mit.edu 
+#   RFC2041          ||      B. Noble, G. Nguyen, M. Satyanarayanan, R. Katz         ||       bnoble@cs.cmu.edu, gnguyen@cs.berkeley.edu, satya@cs.cmu.edu, randy@cs.berkeley.edu
+#   RFC2042          ||       B. Manning         ||        bmanning@isi.edu 
+#   RFC2043          ||       A. Fuqua         ||        fuqua@vnet.ibm.com 
+#   RFC2044          ||       F. Yergeau         ||        fyergeau@alis.com 
+#   RFC2045          ||      N. Freed, N. Borenstein         ||       ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com
+#   RFC2046          ||      N. Freed, N. Borenstein         ||       ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com
+#   RFC2047          ||       K. Moore         ||        moore@cs.utk.edu 
+#   RFC2048          ||       N. Freed, J. Klensin, J. Postel         ||        ned@innosoft.com, klensin@mci.net, Postel@ISI.EDU 
+#   RFC2049          ||       N. Freed, N. Borenstein         ||        ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com 
+#   RFC2050          ||      K. Hubbard, M. Kosters, D. Conrad, D. Karrenberg, J. Postel         ||       kimh@internic.net, markk@internic.net, davidc@APNIC.NET, dfk@RIPE.NET, Postel@ISI.EDU
+#   RFC2051          ||       M. Allen, B. Clouston, Z. Kielczewski, W. Kwan, B. Moore         ||        mallen@hq.walldata.com, clouston@cisco.com, zbig@cisco.com, billk@jti.com, remoore@ralvm6.vnet.ibm.com 
+#   RFC2052          ||       A. Gulbrandsen, P. Vixie         ||        agulbra@troll.no, paul@vix.com 
+#   RFC2053          ||       E. Der-Danieliantz         ||        edd@acm.org 
+#   RFC2054          ||       B. Callaghan         ||        brent.callaghan@eng.sun.com 
+#   RFC2055          ||       B. Callaghan         ||        brent.callaghan@eng.sun.com 
+#   RFC2056          ||       R. Denenberg, J. Kunze, D. Lynch         ||         
+#   RFC2057          ||       S. Bradner         ||        sob@harvard.edu 
+#   RFC2058          ||       C. Rigney, A. Rubens, W. Simpson, S. Willens         ||        cdr@livingston.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com 
+#   RFC2059          ||       C. Rigney         ||        cdr@livingston.com 
+#   RFC2060          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
+#   RFC2061          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
+#   RFC2062          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
+#   RFC2063          ||       N. Brownlee, C. Mills, G. Ruth         ||        cmills@bbn.com, gruth@gte.com 
+#   RFC2064          ||       N. Brownlee         ||         
+#   RFC2065          ||       D. Eastlake 3rd, C. Kaufman         ||        dee@cybercash.com, charlie_kaufman@iris.com 
+#   RFC2066          ||       R. Gellens         ||        Randy@MV.Unisys.Com 
+#   RFC2067          ||       J. Renwick         ||        jkr@NetStar.com 
+#   RFC2068          ||       R. Fielding, J. Gettys, J. Mogul, H. Frystyk, T. Berners-Lee         ||        fielding@ics.uci.edu, jg@w3.org, mogul@wrl.dec.com, frystyk@w3.org, timbl@w3.org 
+#   RFC2069          ||       J. Franks, P. Hallam-Baker, J. Hostetler, P. Leach, A. Luotonen, E. Sink, L. Stewart         ||        john@math.nwu.edu, hallam@w3.org, jeff@spyglass.com, paulle@microsoft.com, luotonen@netscape.com, eric@spyglass.com, stewart@OpenMarket.com 
+#   RFC2070          ||       F. Yergeau, G. Nicol, G. Adams, M. Duerst         ||        fyergeau@alis.com, gtn@ebt.com, glenn@spyglass.com, mduerst@ifi.unizh.ch 
+#   RFC2071          ||       P. Ferguson, H. Berkowitz         ||        pferguso@cisco.com, hcb@clark.net 
+#   RFC2072          ||       H. Berkowitz         ||        hcb@clark.net 
+#   RFC2073          ||      Y. Rekhter, P. Lothberg, R. Hinden, S. Deering, J. Postel         ||       bob.hinden@gmail.com
+#   RFC2074          ||       A. Bierman, R. Iddon         ||       andy@yumaworks.com, robin_iddon@3mail.3com.com 
+#   RFC2075          ||       C. Partridge         ||        craig@bbn.com 
+#   RFC2076          ||       J. Palme         ||         
+#   RFC2077          ||       S. Nelson, C. Parks, Mitra         ||         
+#   RFC2078          ||       J. Linn         ||        John.Linn@ov.com 
+#   RFC2079          ||       M. Smith         ||        mcs@netscape.com 
+#   RFC2080          ||       G. Malkin, R. Minnear         ||        gmalkin@Xylogics.COM, minnear@ipsilon.com 
+#   RFC2081          ||       G. Malkin         ||        gmalkin@xylogics.com 
+#   RFC2082          ||       F. Baker, R. Atkinson         ||        rja@cisco.com 
+#   RFC2083          ||       T. Boutell         ||        boutell@boutell.com 
+#   RFC2084          ||       G. Bossert, S. Cooper, W. Drummond         ||        bossert@corp.sgi.com, sc@corp.sgi.com, drummond@ieee.org 
+#   RFC2085          ||       M. Oehler, R. Glenn         ||        mjo@tycho.ncsc.mil, rob.glenn@nist.gov 
+#   RFC2086          ||       J. Myers         ||         
+#   RFC2087          ||       J. Myers         ||         
+#   RFC2088          ||      J. Myers         ||       
+#   RFC2089          ||       B. Wijnen, D. Levi         ||         
+#   RFC2090          ||       A. Emberson         ||        tom@lanworks.com 
+#   RFC2091          ||       G. Meyer, S. Sherry         ||         
+#   RFC2092          ||       S. Sherry, G. Meyer         ||         
+#   RFC2093          ||       H. Harney, C. Muckenhirn         ||         
+#   RFC2094          ||       H. Harney, C. Muckenhirn         ||         
+#   RFC2095          ||       J. Klensin, R. Catoe, P. Krumviede         ||        klensin@mci.net, randy@mci.net, paul@mci.net 
+#   RFC2096          ||       F. Baker         ||        fred@cisco.com 
+#   RFC2097          ||       G. Pall         ||        gurdeep@microsoft.com 
+#   RFC2098          ||       Y. Katsube, K. Nagami, H. Esaki         ||         
+#   RFC2099          ||       J. Elliott         ||        elliott@isi.edu 
+#   RFC2100          ||       J. Ashworth         ||        jra@scfn.thpl.lib.fl.us 
+#   RFC2101          ||       B. Carpenter, J. Crowcroft, Y. Rekhter         ||        brian@dxcoms.cern.ch, j.crowcroft@cs.ucl.ac.uk, yakov@cisco.com 
+#   RFC2102          ||       R. Ramanathan         ||        ramanath@bbn.com 
+#   RFC2103          ||       R. Ramanathan         ||         
+#   RFC2104          ||      H. Krawczyk, M. Bellare, R. Canetti         ||       hugo@watson.ibm.com, mihir@cs.ucsd.edu, canetti@watson.ibm.com
+#   RFC2105          ||       Y. Rekhter, B. Davie, D. Katz, E. Rosen, G. Swallow         ||        yakov@cisco.com, bsd@cisco.com, dkatz@cisco.com, erosen@cisco.com, swallow@cisco.com 
+#   RFC2106          ||       S. Chiang, J. Lee, H. Yasuda         ||        schiang@cisco.com, jolee@cisco.com, yasuda@eme068.cow.melco.co.jp 
+#   RFC2107          ||       K. Hamzeh         ||        kory@ascend.com 
+#   RFC2108          ||       K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie         ||        kdegraaf@isd.3com.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com 
+#   RFC2109          ||      D. Kristol, L. Montulli         ||       
+#   RFC2110          ||       J. Palme, A. Hopmann         ||         
+#   RFC2111          ||       E. Levinson         ||         
+#   RFC2112          ||       E. Levinson         ||         
+#   RFC2113          ||      D. Katz         ||       
+#   RFC2114          ||       S. Chiang, J. Lee, H. Yasuda         ||        schiang@cisco.com, jolee@cisco.com, yasuda@eme068.cow.melco.co.jp 
+#   RFC2115          ||       C. Brown, F. Baker         ||         
+#   RFC2116          ||       C. Apple, K. Rossen         ||         
+#   RFC2117          ||       D. Estrin, D. Farinacci, A. Helmy, D. Thaler, S. Deering, M. Handley, V. Jacobson, C. Liu, P. Sharma, L. Wei         ||         
+#   RFC2118          ||       G. Pall         ||         
+#   RFC2119          ||      S. Bradner         ||       
+#   RFC2120          ||       D. Chadwick         ||         
+#   RFC2121          ||       G. Armitage         ||        gja@thumper.bellcore.com 
+#   RFC2122          ||       D. Mavrakis, H. Layec, K. Kartmann         ||         
+#   RFC2123          ||       N. Brownlee         ||         
+#   RFC2124          ||       P. Amsden, J. Amweg, P. Calato, S. Bensley, G. Lyons         ||        amsden@ctron.com, amsden@ctron.com, amsden@ctron.com, amsden@ctron.com, amsden@ctron.com 
+#   RFC2125          ||       C. Richards, K. Smith         ||         
+#   RFC2126          ||       Y. Pouffary, A. Young         ||        pouffary@taec.enet.dec.com, A.Young@isode.com 
+#   RFC2127          ||       G. Roeck, Ed.         ||        groeck@cisco.com 
+#   RFC2128          ||       G. Roeck, Ed.         ||        groeck@cisco.com 
+#   RFC2129          ||      K. Nagami, Y. Katsube, Y. Shobatake, A. Mogi, S. Matsuzawa, T. Jinmei, H. Esaki         ||       
+#   RFC2130          ||      C. Weider, C. Preston, K. Simonsen, H. Alvestrand, R. Atkinson, M. Crispin, P. Svanberg         ||       cweider@microsoft.com, cecilia@well.com, Keld@dkuug.dk, Harald.T.Alvestrand@uninett.no, rja@cisco.com, mrc@cac.washington.edu, psv@nada.kth.se
+#   RFC2131          ||      R. Droms         ||       droms@bucknell.edu
+#   RFC2132          ||      S. Alexander, R. Droms         ||       sca@engr.sgi.com, droms@bucknell.edu
+#   RFC2133          ||       R. Gilligan, S. Thomson, J. Bound, W. Stevens         ||        gilligan@freegate.net, set@thumper.bellcore.com, rstevens@kohala.com 
+#   RFC2134          ||       ISOC Board of Trustees         ||         
+#   RFC2135          ||       ISOC Board of Trustees         ||         
+#   RFC2136          ||      P. Vixie, Ed., S. Thomson, Y. Rekhter, J. Bound         ||       yakov@cisco.com, set@thumper.bellcore.com, bound@zk3.dec.com, paul@vix.com 
+#   RFC2137          ||       D. Eastlake 3rd         ||        dee@cybercash.com 
+#   RFC2138          ||       C. Rigney, A. Rubens, W. Simpson, S. Willens         ||        cdr@livingston.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com 
+#   RFC2139          ||       C. Rigney         ||        cdr@livingston.com 
+#   RFC2140          ||       J. Touch         ||         
+#   RFC2141          ||       R. Moats         ||         
+#   RFC2142          ||       D. Crocker         ||         
+#   RFC2143          ||       B. Elliston         ||         
+#   RFC2144          ||       C. Adams         ||         
+#   RFC2145          ||      J. C. Mogul, R. Fielding, J. Gettys, H. Frystyk         ||       
+#   RFC2146          ||       Federal Networking Council         ||        execdir@fnc.gov 
+#   RFC2147          ||       D. Borman         ||         
+#   RFC2148          ||       H. Alvestrand, P. Jurg         ||         
+#   RFC2149          ||       R. Talpade, M. Ammar         ||         
+#   RFC2150          ||       J. Max, W. Stickle         ||        jlm@rainfarm.com, wls@rainfarm.com 
+#   RFC2151          ||       G. Kessler, S. Shepard         ||         
+#   RFC2152          ||       D. Goldsmith, M. Davis         ||        goldsmith@apple.com, mark_davis@taligent.com 
+#   RFC2153          ||      W. Simpson         ||       
+#   RFC2154          ||       S. Murphy, M. Badger, B. Wellington         ||         
+#   RFC2155          ||       B. Clouston, B. Moore         ||         
+#   RFC2156          ||       S. Kille         ||         
+#   RFC2157          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
+#   RFC2158          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
+#   RFC2159          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
+#   RFC2160          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
+#   RFC2161          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
+#   RFC2162          ||       C. Allocchio         ||        Claudio.Allocchio@elettra.Trieste.it 
+#   RFC2163          ||       C. Allocchio         ||         
+#   RFC2164          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC2165          ||       J. Veizades, E. Guttman, C. Perkins, S. Kaplan         ||        cperkins@Corp.sun.com 
+#   RFC2166          ||       D. Bryant, P. Brittain         ||         
+#   RFC2167          ||       S. Williamson, M. Kosters, D. Blacka, J. Singh, K. Zeilstra         ||         
+#   RFC2168          ||       R. Daniel, M. Mealling         ||         
+#   RFC2169          ||       R. Daniel         ||         
+#   RFC2170          ||       W. Almesberger, J. Le Boudec, P. Oechslin         ||         
+#   RFC2171          ||       K. Murakami, M. Maruyama         ||         
+#   RFC2172          ||       M. Maruyama, K. Murakami         ||         
+#   RFC2173          ||       K. Murakami, M. Maruyama         ||         
+#   RFC2174          ||       K. Murakami, M. Maruyama         ||         
+#   RFC2175          ||       K. Murakami, M. Maruyama         ||         
+#   RFC2176          ||      K. Murakami, M. Maruyama         ||       
+#   RFC2177          ||       B. Leiba         ||         
+#   RFC2178          ||      J. Moy         ||       jmoy@casc.com
+#   RFC2179          ||       A. Gwinn         ||        allen@mail.cox.smu.edu, ssh@wwsi.com 
+#   RFC2180          ||       M. Gahrns         ||        mikega@microsoft.com 
+#   RFC2181          ||      R. Elz, R. Bush         ||       kre@munnari.OZ.AU, randy@psg.com
+#   RFC2182          ||       R. Elz, R. Bush, S. Bradner, M. Patton         ||        kre@munnari.OZ.AU, randy@psg.com, sob@harvard.edu, MAP@POBOX.COM 
+#   RFC2183          ||      R. Troost, S. Dorner, K. Moore, Ed.         ||       rens@century.com, sdorner@qualcomm.com
+#   RFC2184          ||       N. Freed, K. Moore         ||         
+#   RFC2185          ||       R. Callon, D. Haskin         ||         
+#   RFC2186          ||       D. Wessels, K. Claffy         ||        wessels@nlanr.net, kc@nlanr.net 
+#   RFC2187          ||       D. Wessels, K. Claffy         ||        wessels@nlanr.net, kc@nlanr.net 
+#   RFC2188          ||       M. Banan, M. Taylor, J. Cheng         ||         
+#   RFC2189          ||      A. Ballardie         ||       
+#   RFC2190          ||       C. Zhu         ||        czhu@ibeam.intel.com 
+#   RFC2191          ||       G. Armitage         ||        gja@dnrc.bell-labs.com 
+#   RFC2192          ||      C. Newman         ||       chris.newman@innosoft.com
+#   RFC2193          ||       M. Gahrns         ||        mikega@microsoft.com 
+#   RFC2194          ||       B. Aboba, J. Lu, J. Alsop, J. Ding, W. Wang         ||        bernarda@microsoft.com, juanlu@aimnet.net, jalsop@ipass.com, ding@bjai.asiainfo.com, weiwang@merit.edu 
+#   RFC2195          ||       J. Klensin, R. Catoe, P. Krumviede         ||        klensin@mci.net, randy@mci.net, paul@mci.net 
+#   RFC2196          ||       B. Fraser         ||         
+#   RFC2197          ||       N. Freed         ||        ned.freed@innosoft.com 
+#   RFC2198          ||      C. Perkins, I. Kouvelas, O. Hodson, V. Hardman, M. Handley, J.C. Bolot, A. Vega-Garcia, S. Fosse-Parisis         ||       mjh@isi.edu
+#   RFC2199          ||       A. Ramos         ||        ramos@isi.edu 
+#   RFC2200          ||       J. Postel         ||         
+#   RFC2201          ||      A. Ballardie         ||       
+#   RFC2202          ||       P. Cheng, R. Glenn         ||        pau@watson.ibm.com, rob.glenn@nist.gov 
+#   RFC2203          ||      M. Eisler, A. Chiu, L. Ling         ||       mre@eng.sun.com, hacker@eng.sun.com, lling@eng.sun.com
+#   RFC2204          ||      D. Nash         ||       dnash@ford.com
+#   RFC2205          ||      R. Braden, Ed., L. Zhang, S. Berson, S. Herzog, S. Jamin         ||       Braden@ISI.EDU, lixia@cs.ucla.edu, Berson@ISI.EDU, Herzog@WATSON.IBM.COM, jamin@EECS.UMICH.EDU
+#   RFC2206          ||       F. Baker, J. Krawczyk, A. Sastry         ||        fred@cisco.com, jjk@tiac.net, arun@cisco.com 
+#   RFC2207          ||       L. Berger, T. O'Malley         ||        timo@bbn.com 
+#   RFC2208          ||      A. Mankin, Ed., F. Baker, B. Braden, S. Bradner, M. O'Dell, A. Romanow, A. Weinrib, L. Zhang         ||       aweinrib@ibeam.intel.com, braden@isi.edu, lixia@cs.ucla.edu, allyn@eng.sun.com, mo@uu.net
+#   RFC2209          ||       R. Braden, L. Zhang         ||        Braden@ISI.EDU, lixia@cs.ucla.edu 
+#   RFC2210          ||       J. Wroclawski         ||        jtw@lcs.mit.edu 
+#   RFC2211          ||       J. Wroclawski         ||        jtw@lcs.mit.edu 
+#   RFC2212          ||       S. Shenker, C. Partridge, R. Guerin         ||        shenker@parc.xerox.com, craig@bbn.com, guerin@watson.ibm.com 
+#   RFC2213          ||       F. Baker, J. Krawczyk, A. Sastry         ||        fred@cisco.com, jjk@tiac.net, arun@cisco.com 
+#   RFC2214          ||       F. Baker, J. Krawczyk, A. Sastry         ||        fred@cisco.com, jjk@tiac.net, arun@cisco.com 
+#   RFC2215          ||       S. Shenker, J. Wroclawski         ||        shenker@parc.xerox.com, jtw@lcs.mit.edu 
+#   RFC2216          ||       S. Shenker, J. Wroclawski         ||        shenker@parc.xerox.com, jtw@lcs.mit.edu 
+#   RFC2217          ||       G. Clark         ||        glenc@cisco.com 
+#   RFC2218          ||       T. Genovese, B. Jennings         ||        TonyG@Microsoft.com, jennings@sandia.gov 
+#   RFC2219          ||       M. Hamilton, R. Wright         ||        m.t.hamilton@lut.ac.uk, wright@lbl.gov 
+#   RFC2220          ||       R. Guenther         ||        rgue@loc.gov 
+#   RFC2221          ||       M. Gahrns         ||        mikega@microsoft.com 
+#   RFC2222          ||       J. Myers         ||        jgmyers@netscape.com 
+#   RFC2223          ||      J. Postel, J. Reynolds         ||       Postel@ISI.EDU, jkrey@isi.edu, dwaitzman@BBN.COM
+#   RFC2224          ||       B. Callaghan         ||        brent.callaghan@eng.sun.com 
+#   RFC2225          ||      M. Laubach, J. Halpern         ||       
+#   RFC2226          ||       T. Smith, G. Armitage         ||        tjsmith@vnet.ibm.com, gja@lucent.com 
+#   RFC2227          ||       J. Mogul, P. Leach         ||        mogul@wrl.dec.com, paulle@microsoft.com 
+#   RFC2228          ||       M. Horowitz, S. Lunt         ||        marc@cygnus.com 
+#   RFC2229          ||       R. Faith, B. Martin         ||        faith@cs.unc.edu, bamartin@miranda.org 
+#   RFC2230          ||       R. Atkinson         ||         
+#   RFC2231          ||      N. Freed, K. Moore         ||       ned.freed@innosoft.com, moore@cs.utk.edu
+#   RFC2232          ||       B. Clouston, Ed., B. Moore, Ed.         ||        clouston@cisco.com, remoore@ralvm6.vnet.ibm.com 
+#   RFC2233          ||       K. McCloghrie, F. Kastenholz         ||        kzm@cisco.com, kasten@ftp.com 
+#   RFC2234          ||      D. Crocker, Ed., P. Overell         ||       dcrocker@bbiw.net, paul@bayleaf.org.uk
+#   RFC2235          ||       R. Zakon         ||        zakon@info.isoc.org 
+#   RFC2236          ||      W. Fenner         ||       fenner@parc.xerox.com
+#   RFC2237          ||       K. Tamaru         ||        kenzat@microsoft.com 
+#   RFC2238          ||       B. Clouston, Ed., B. Moore, Ed.         ||        clouston@cisco.com, remoore@ralvm6.vnet.ibm.com 
+#   RFC2239          ||       K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie, S. Roberts         ||        kdegraaf@isd.3com.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com, sroberts@farallon.com 
+#   RFC2240          ||       O. Vaughan         ||        owain@vaughan.com 
+#   RFC2241          ||       D. Provan         ||        donp@Novell.Com 
+#   RFC2242          ||       R. Droms, K. Fong         ||         
+#   RFC2243          ||       C. Metz         ||         
+#   RFC2244          ||      C. Newman, J. G. Myers         ||       
+#   RFC2245          ||       C. Newman         ||         
+#   RFC2246          ||      T. Dierks, C. Allen         ||       tdierks@certicom.com, pck@netcom.com, relyea@netscape.com, jar@netscape.com, msabin@netcom.com, dansimon@microsoft.com, tomw@netscape.com, hugo@watson.ibm.com
+#   RFC2247          ||       S. Kille, M. Wahl, A. Grimstad, R. Huber, S. Sataluri         ||        S.Kille@ISODE.COM, M.Wahl@critical-angle.com, alg@att.com, rvh@att.com, sri@att.com 
+#   RFC2248          ||       N. Freed, S. Kille         ||        ned.freed@innosoft.com, S.Kille@isode.com 
+#   RFC2249          ||       N. Freed, S. Kille         ||        ned.freed@innosoft.com, S.Kille@isode.com 
+#   RFC2250          ||       D. Hoffman, G. Fernando, V. Goyal, M. Civanlar         ||        gerard.fernando@eng.sun.com, goyal@precept.com, don.hoffman@eng.sun.com, civanlar@research.att.com 
+#   RFC2251          ||       M. Wahl, T. Howes, S. Kille         ||        M.Wahl@critical-angle.com, howes@netscape.com, S.Kille@isode.com 
+#   RFC2252          ||       M. Wahl, A. Coulbeck, T. Howes, S. Kille         ||        M.Wahl@critical-angle.com, A.Coulbeck@isode.com, howes@netscape.com, S.Kille@isode.com 
+#   RFC2253          ||       M. Wahl, S. Kille, T. Howes         ||        M.Wahl@critical-angle.com, S.Kille@ISODE.COM, howes@netscape.com 
+#   RFC2254          ||       T. Howes         ||        howes@netscape.com 
+#   RFC2255          ||       T. Howes, M. Smith         ||        howes@netscape.com, mcs@netscape.com 
+#   RFC2256          ||       M. Wahl         ||        M.Wahl@critical-angle.com 
+#   RFC2257          ||       M. Daniele, B. Wijnen, D. Francisco         ||        daniele@zk3.dec.com, wijnen@vnet.ibm.com, dfrancis@cisco.com 
+#   RFC2258          ||       J. Ordille         ||        joann@bell-labs.com 
+#   RFC2259          ||       J. Elliott, J. Ordille         ||        jim@apocalypse.org, joann@bell-labs.com 
+#   RFC2260          ||       T. Bates, Y. Rekhter         ||        tbates@cisco.com, yakov@cisco.com 
+#   RFC2261          ||       D. Harrington, R. Presuhn, B. Wijnen         ||         
+#   RFC2262          ||       J. Case, D. Harrington, R. Presuhn, B. Wijnen         ||         
+#   RFC2263          ||       D. Levi, P. Meyer, B. Stewart         ||         
+#   RFC2264          ||       U. Blumenthal, B. Wijnen         ||         
+#   RFC2265          ||       B. Wijnen, R. Presuhn, K. McCloghrie         ||         
+#   RFC2266          ||       J. Flick         ||         
+#   RFC2267          ||       P. Ferguson, D. Senie         ||        ferguson@cisco.com, dts@senie.com 
+#   RFC2268          ||       R. Rivest         ||        rsa-labs@rsa.com 
+#   RFC2269          ||       G. Armitage         ||        gja@lucent.com 
+#   RFC2270          ||       J. Stewart, T. Bates, R. Chandra, E. Chen         ||        jstewart@isi.edu, tbates@cisco.com, rchandra@cisco.com, enkechen@cisco.com 
+#   RFC2271          ||       D. Harrington, R. Presuhn, B. Wijnen         ||         
+#   RFC2272          ||       J. Case, D. Harrington, R. Presuhn, B. Wijnen         ||         
+#   RFC2273          ||       D. Levi, P. Meyer, B. Stewart         ||         
+#   RFC2274          ||       U. Blumenthal, B. Wijnen         ||         
+#   RFC2275          ||       B. Wijnen, R. Presuhn, K. McCloghrie         ||         
+#   RFC2276          ||       K. Sollins         ||        sollins@lcs.mit.edu 
+#   RFC2277          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
+#   RFC2278          ||       N. Freed, J. Postel         ||        ned.freed@innosoft.com, Postel@ISI.EDU 
+#   RFC2279          ||       F. Yergeau         ||        fyergeau@alis.com 
+#   RFC2280          ||       C. Alaettinoglu, T. Bates, E. Gerich, D. Karrenberg, D. Meyer, M. Terpstra, C. Villamizar         ||        cengiz@isi.edu, tbates@cisco.com, epg@home.net, dfk@ripe.net, meyer@antc.uoregon.edu, marten@BayNetworks.com, curtis@ans.net 
+#   RFC2281          ||       T. Li, B. Cole, P. Morton, D. Li         ||        tli@juniper.net, cole@juniper.net, pmorton@cisco.com, dawnli@cisco.com 
+#   RFC2282          ||       J. Galvin         ||         
+#   RFC2283          ||       T. Bates, R. Chandra, D. Katz, Y. Rekhter         ||         
+#   RFC2284          ||       L. Blunk, J. Vollbrecht         ||        ljb@merit.edu, jrv@merit.edu 
+#   RFC2285          ||       R. Mandeville         ||        bob.mandeville@eunet.fr 
+#   RFC2286          ||       J. Kapp         ||        skapp@reapertech.com 
+#   RFC2287          ||       C. Krupczak, J. Saperia         ||        cheryl@empiretech.com 
+#   RFC2288          ||       C. Lynch, C. Preston, R. Daniel         ||        cliff@cni.org, cecilia@well.com, rdaniel@acl.lanl.gov 
+#   RFC2289          ||       N. Haller, C. Metz, P. Nesser, M. Straw         ||         
+#   RFC2290          ||       J. Solomon, S. Glass         ||        solomon@comm.mot.com, glass@ftp.com 
+#   RFC2291          ||       J. Slein, F. Vitali, E. Whitehead, D. Durand         ||        slein@wrc.xerox.com, fabio@cs.unibo.it, ejw@ics.uci.edu, dgd@cs.bu.edu 
+#   RFC2292          ||       W. Stevens, M. Thomas         ||        rstevens@kohala.com, matt.thomas@altavista-software.com 
+#   RFC2293          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC2294          ||       S. Kille         ||        S.Kille@ISODE.COM 
+#   RFC2295          ||       K. Holtman, A. Mutz         ||        koen@win.tue.nl, mutz@hpl.hp.com 
+#   RFC2296          ||       K. Holtman, A. Mutz         ||        koen@win.tue.nl, mutz@hpl.hp.com 
+#   RFC2297          ||      P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall         ||       bob.hinden@gmail.com
+#   RFC2298          ||       R. Fajman         ||        raf@cu.nih.gov 
+#   RFC2299          ||       A. Ramos         ||        ramos@isi.edu 
+#   RFC2300          ||       J. Postel         ||        Postel@ISI.EDU 
+#   RFC2301          ||       L. McIntyre, S. Zilles, R. Buckley, D. Venable, G. Parsons, J. Rafferty         ||         
+#   RFC2302          ||       G. Parsons, J. Rafferty, S. Zilles         ||         
+#   RFC2303          ||       C. Allocchio         ||         
+#   RFC2304          ||       C. Allocchio         ||         
+#   RFC2305          ||       K. Toyoda, H. Ohno, J. Murai, D. Wing         ||         
+#   RFC2306          ||       G. Parsons, J. Rafferty         ||         
+#   RFC2307          ||       L. Howard         ||        lukeh@xedoc.com 
+#   RFC2308          ||      M. Andrews         ||       Mark.Andrews@cmis.csiro.au
+#   RFC2309          ||      B. Braden, D. Clark, J. Crowcroft, B. Davie, S. Deering, D. Estrin, S. Floyd, V. Jacobson, G. Minshall, C. Partridge, L. Peterson, K. Ramakrishnan, S. Shenker, J. Wroclawski, L. Zhang         ||       Braden@ISI.EDU, DDC@lcs.mit.edu, Jon.Crowcroft@cs.ucl.ac.uk, bdavie@cisco.com, deering@cisco.com, Estrin@usc.edu, Floyd@ee.lbl.gov, Van@ee.lbl.gov, Minshall@fiberlane.com, craig@bbn.com, LLP@cs.arizona.edu, KKRama@research.att.com, Shenker@parc.xerox.com, JTW@lcs.mit.edu, Lixia@cs.ucla.edu
+#   RFC2310          ||       K. Holtman         ||        koen@win.tue.nl 
+#   RFC2311          ||      S. Dusse, P. Hoffman, B. Ramsdell, L. Lundblade, L. Repka         ||       spock@rsa.com, phoffman@imc.org, blaker@deming.com, lgl@qualcomm.com, repka@netscape.com
+#   RFC2312          ||      S. Dusse, P. Hoffman, B. Ramsdell, J. Weinstein         ||       spock@rsa.com, phoffman@imc.org, blaker@deming.com, jsw@netscape.com
+#   RFC2313          ||       B. Kaliski         ||        burt@rsa.com 
+#   RFC2314          ||       B. Kaliski         ||        burt@rsa.com 
+#   RFC2315          ||       B. Kaliski         ||        burt@rsa.com 
+#   RFC2316          ||       S. Bellovin         ||         
+#   RFC2317          ||       H. Eidnes, G. de Groot, P. Vixie         ||        Havard.Eidnes@runit.sintef.no, GeertJan.deGroot@bsdi.com, paul@vix.com 
+#   RFC2318          ||       H. Lie, B. Bos, C. Lilley         ||        howcome@w3.org, bert@w3.org, chris@w3.org 
+#   RFC2319          ||      KOI8-U Working Group         ||       
+#   RFC2320          ||       M. Greene, J. Luciani, K. White, T. Kuo         ||        maria@xedia.com, luciani@baynetworks.com, kennethw@vnet.ibm.com, ted_kuo@Baynetworks.com 
+#   RFC2321          ||       A. Bressen         ||        bressen@leftbank.com 
+#   RFC2322          ||       K. van den Hout, A. Koopal, R. van Mook         ||        koos@cetis.hvu.nl, andre@NL.net, remco@sateh.com 
+#   RFC2323          ||       A. Ramos         ||        ramos@isi.edu 
+#   RFC2324          ||      L. Masinter         ||       masinter@parc.xerox.com
+#   RFC2325          ||       M. Slavitch         ||        slavitch@loran.com 
+#   RFC2326          ||      H. Schulzrinne, A. Rao, R. Lanphier         ||       schulzrinne@cs.columbia.edu, anup@netscape.com, robla@real.com
+#   RFC2327          ||       M. Handley, V. Jacobson         ||         
+#   RFC2328          ||      J. Moy         ||       jmoy@casc.com
+#   RFC2329          ||       J. Moy         ||        jmoy@casc.com 
+#   RFC2330          ||      V. Paxson, G. Almes, J. Mahdavi, M. Mathis         ||       vern@ee.lbl.gov, almes@advanced.org, mahdavi@psc.edu, mathis@psc.edu
+#   RFC2331          ||       M. Maher         ||        maher@isi.edu 
+#   RFC2332          ||       J. Luciani, D. Katz, D. Piscitello, B. Cole, N. Doraswamy         ||        dkatz@cisco.com, luciani@baynetworks.com, bcole@jnx.com, naganand@baynetworks.com 
+#   RFC2333          ||       D. Cansever         ||        dcansever@gte.com 
+#   RFC2334          ||       J. Luciani, G. Armitage, J. Halpern, N. Doraswamy         ||        luciani@baynetworks.com, gja@lucent.com, jhalpern@Newbridge.COM, naganand@baynetworks.com 
+#   RFC2335          ||       J. Luciani         ||        luciani@baynetworks.com 
+#   RFC2336          ||      J. Luciani         ||       
+#   RFC2337          ||       D. Farinacci, D. Meyer, Y. Rekhter         ||         
+#   RFC2338          ||      S. Knight, D. Weaver, D. Whipple, R. Hinden, D. Mitzel, P. Hunt, P. Higginson, M. Shand, A. Lindem         ||       Steven.Knight@ascend.com, Doug.Weaver@ascend.com, dwhipple@microsoft.com, bob.hinden@gmail.com, mitzel@iprg.nokia.com, hunt@iprg.nokia.com, higginson@mail.dec.com, shand@mail.dec.com
+#   RFC2339          ||       The Internet Society, Sun Microsystems         ||         
+#   RFC2340          ||       B. Jamoussi, D. Jamieson, D. Williston, S. Gabe         ||        jamoussi@Nortel.ca, djamies@Nortel.ca, danwil@Nortel.ca, spgabe@Nortel.ca 
+#   RFC2341          ||       A. Valencia, M. Littlewood, T. Kolar         ||        tkolar@cisco.com, littlewo@cisco.com, valencia@cisco.com 
+#   RFC2342          ||       M. Gahrns, C. Newman         ||        mikega@microsoft.com, chris.newman@innosoft.com 
+#   RFC2343          ||       M. Civanlar, G. Cash, B. Haskell         ||        civanlar@research.att.com, glenn@research.att.com, bgh@research.att.com 
+#   RFC2344          ||       G. Montenegro, Ed.         ||         
+#   RFC2345          ||       J. Klensin, T. Wolf, G. Oglesby         ||        klensin@mci.net, ted@usa.net, gary@mci.net 
+#   RFC2346          ||       J. Palme         ||        jpalme@dsv.su.se 
+#   RFC2347          ||       G. Malkin, A. Harkin         ||        gmalkin@baynetworks.com, ash@cup.hp.com 
+#   RFC2348          ||       G. Malkin, A. Harkin         ||        gmalkin@baynetworks.com, ash@cup.hp.com 
+#   RFC2349          ||       G. Malkin, A. Harkin         ||        gmalkin@baynetworks.com, ash@cup.hp.com 
+#   RFC2350          ||       N. Brownlee, E. Guttman         ||        n.brownlee@auckland.ac.nz, Erik.Guttman@sun.com 
+#   RFC2351          ||       A. Robert         ||        arobert@par1.par.sita.int 
+#   RFC2352          ||       O. Vaughan         ||        owain@vaughan.com 
+#   RFC2353          ||       G. Dudley         ||        dudleyg@us.ibm.com 
+#   RFC2354          ||       C. Perkins, O. Hodson         ||        c.perkins@cs.ucl.ac.uk, o.hodson@cs.ucl.ac.uk 
+#   RFC2355          ||      B. Kelly         ||       kellywh@mail.auburn.edu
+#   RFC2356          ||       G. Montenegro, V. Gupta         ||        gabriel.montenegro@Eng.Sun.COM, vipul.gupta@Eng.Sun.COM 
+#   RFC2357          ||       A. Mankin, A. Romanow, S. Bradner, V. Paxson         ||        mankin@east.isi.edu, allyn@mci.net, sob@harvard.edu, vern@ee.lbl.gov 
+#   RFC2358          ||       J. Flick, J. Johnson         ||        johnf@hprnd.rose.hp.com, jeff@redbacknetworks.com 
+#   RFC2359          ||       J. Myers         ||        jgmyers@netscape.com 
+#   RFC2360          ||       G. Scott         ||         
+#   RFC2361          ||       E. Fleischman         ||        ericfl@microsoft.com, Eric.Fleischman@PSS.Boeing.com 
+#   RFC2362          ||      D. Estrin, D. Farinacci, A. Helmy, D. Thaler, S. Deering, M. Handley, V. Jacobson, C. Liu, P. Sharma, L. Wei         ||       estrin@usc.edu, dino@cisco.com, ahelmy@catarina.usc.edu, thalerd@eecs.umich.edu, deering@parc.xerox.com, m.handley@cs.ucl.ac.uk, van@ee.lbl.gov, charley@catarina.usc.edu, puneet@catarina.usc.edu, lwei@cisco.com
+#   RFC2363          ||       G. Gross, M. Kaycee, A. Li, A. Malis, J. Stephens         ||        gmgross@lucent.com, mjk@nj.paradyne.com, alin@shastanets.com, malis@ascend.com, john@cayman.com 
+#   RFC2364          ||       G. Gross, M. Kaycee, A. Li, A. Malis, J. Stephens         ||        gmgross@lucent.com, mjk@nj.paradyne.com, alin@shastanets.com, malis@ascend.com, john@cayman.com 
+#   RFC2365          ||       D. Meyer         ||        dmm@cisco.com 
+#   RFC2366          ||       C. Chung, M. Greene         ||        cchung@tieo.saic.com 
+#   RFC2367          ||       D. McDonald, C. Metz, B. Phan         ||        danmcd@eng.sun.com, cmetz@inner.net, phan@itd.nrl.navy.mil 
+#   RFC2368          ||      P. Hoffman, L. Masinter, J. Zawinski         ||       
+#   RFC2369          ||       G. Neufeld, J. Baer         ||         
+#   RFC2370          ||      R. Coltun         ||       
+#   RFC2371          ||       J. Lyon, K. Evans, J. Klein         ||        JimLyon@Microsoft.Com, Keith.Evans@Tandem.Com, Johannes.Klein@Tandem.Com 
+#   RFC2372          ||       K. Evans, J. Klein, J. Lyon         ||        Keith.Evans@Tandem.Com, Johannes.Klein@Tandem.Com, JimLyon@Microsoft.Com 
+#   RFC2373          ||      R. Hinden, S. Deering         ||       bob.hinden@gmail.com
+#   RFC2374          ||      R. Hinden, M. O'Dell, S. Deering         ||       bob.hinden@gmail.com, mo@uunet.uu.net, deering@cisco.com
+#   RFC2375          ||      R. Hinden, S. Deering         ||       bob.hinden@gmail.com, deering@cisco.com
+#   RFC2376          ||       E. Whitehead, M. Murata         ||         
+#   RFC2377          ||       A. Grimstad, R. Huber, S. Sataluri, M. Wahl         ||        alg@att.com, rvh@att.com, srs@lucent.com, M.Wahl@critical-angle.com 
+#   RFC2378          ||       R. Hedberg, P. Pomes         ||        Roland.Hedberg@umdac.umu.se, ppomes@qualcomm.com 
+#   RFC2379          ||       L. Berger         ||        lberger@fore.com 
+#   RFC2380          ||       L. Berger         ||        lberger@fore.com 
+#   RFC2381          ||       M. Garrett, M. Borden         ||        mwg@bellcore.com, mborden@baynetworks.com 
+#   RFC2382          ||       E. Crawley, Ed., L. Berger, S. Berson, F. Baker, M. Borden, J. Krawczyk         ||        esc@argon.com, lberger@fore.com, berson@isi.edu, fred@cisco.com, mborden@baynetworks.com, jj@arrowpoint.com 
+#   RFC2383          ||       M. Suzuki         ||        suzuki@nal.ecl.net 
+#   RFC2384          ||       R. Gellens         ||        Randy@Qualcomm.Com 
+#   RFC2385          ||      A. Heffernan         ||       ahh@cisco.com
+#   RFC2386          ||       E. Crawley, R. Nair, B. Rajagopalan, H. Sandick         ||         
+#   RFC2387          ||       E. Levinson         ||        XIson@cnj.digex.com 
+#   RFC2388          ||      L. Masinter         ||       masinter@parc.xerox.com
+#   RFC2389          ||       P. Hethmon, R. Elz         ||         
+#   RFC2390          ||       T. Bradley, C. Brown, A. Malis         ||        tbradley@avici.com, cbrown@juno.com, malis@ascend.com 
+#   RFC2391          ||       P. Srisuresh, D. Gan         ||        suresh@ra.lucent.com, dhg@juniper.net 
+#   RFC2392          ||       E. Levinson         ||        XIson@cnj.digex.net 
+#   RFC2393          ||       A. Shacham, R. Monsour, R. Pereira, M. Thomas         ||        shacham@cisco.com, rmonsour@hifn.com, rpereira@timestep.com, matt.thomas@altavista-software.com, naganand@baynetworks.com 
+#   RFC2394          ||       R. Pereira         ||         
+#   RFC2395          ||       R. Friend, R. Monsour         ||        rfriend@hifn.com, rmonsour@hifn.com 
+#   RFC2396          ||       T. Berners-Lee, R. Fielding, L. Masinter         ||        timbl@w3.org, fielding@ics.uci.edu, masinter@parc.xerox.com 
+#   RFC2397          ||      L. Masinter         ||       
+#   RFC2398          ||       S. Parker, C. Schmechel         ||        sparker@eng.sun.com, cschmec@eng.sun.com 
+#   RFC2399          ||       A. Ramos         ||        ramos@isi.edu 
+#   RFC2400          ||       J. Postel, J. Reynolds         ||        Postel@ISI.EDU, JKRey@ISI.EDU 
+#   RFC2401          ||       S. Kent, R. Atkinson         ||         
+#   RFC2402          ||       S. Kent, R. Atkinson         ||         
+#   RFC2403          ||       C. Madson, R. Glenn         ||         
+#   RFC2404          ||       C. Madson, R. Glenn         ||         
+#   RFC2405          ||       C. Madson, N. Doraswamy         ||         
+#   RFC2406          ||       S. Kent, R. Atkinson         ||         
+#   RFC2407          ||       D. Piper         ||        ddp@network-alchemy.com 
+#   RFC2408          ||       D. Maughan, M. Schertler, M. Schneider, J. Turner         ||        wdm@tycho.ncsc.mil, mss@tycho.ncsc.mil, mjs@securify.com, jeff.turner@raba.com 
+#   RFC2409          ||       D. Harkins, D. Carrel         ||        dharkins@cisco.com, carrel@ipsec.org 
+#   RFC2410          ||       R. Glenn, S. Kent         ||         
+#   RFC2411          ||      R. Thayer, N. Doraswamy, R. Glenn         ||       naganand@baynetworks.com, rob.glenn@nist.gov
+#   RFC2412          ||       H. Orman         ||        ho@darpa.mil 
+#   RFC2413          ||      S. Weibel, J. Kunze, C. Lagoze, M. Wolf         ||       weibel@oclc.org, jak@ckm.ucsf.edu, lagoze@cs.cornell.edu, misha.wolf@reuters.com
+#   RFC2414          ||       M. Allman, S. Floyd, C. Partridge         ||        mallman@lerc.nasa.gov, floyd@ee.lbl.gov, craig@bbn.com 
+#   RFC2415          ||       K. Poduri, K. Nichols         ||        kpoduri@Baynetworks.com, knichols@baynetworks.com 
+#   RFC2416          ||       T. Shepard, C. Partridge         ||        shep@alum.mit.edu, craig@bbn.com 
+#   RFC2417          ||       C. Chung, M. Greene         ||        chihschung@aol.com, maria@xedia.com 
+#   RFC2418          ||      S. Bradner         ||       
+#   RFC2419          ||       K. Sklower, G. Meyer         ||        sklower@CS.Berkeley.EDU 
+#   RFC2420          ||       H. Kummert         ||        kummert@nentec.de 
+#   RFC2421          ||       G. Vaudreuil, G. Parsons         ||        Glenn.Parsons@Nortel.ca, GregV@Lucent.Com 
+#   RFC2422          ||       G. Vaudreuil, G. Parsons         ||        Glenn.Parsons@Nortel.ca, GregV@Lucent.Com 
+#   RFC2423          ||       G. Vaudreuil, G. Parsons         ||        Glenn.Parsons@Nortel.ca, GregV@Lucent.Com 
+#   RFC2424          ||       G. Vaudreuil, G. Parsons         ||        Glenn.Parsons@Nortel.ca, GregV@Lucent.Com 
+#   RFC2425          ||      T. Howes, M. Smith, F. Dawson         ||       howes@netscape.com, mcs@netscape.com, frank_dawson@lotus.com
+#   RFC2426          ||      F. Dawson, T. Howes         ||       
+#   RFC2427          ||       C. Brown, A. Malis         ||        cbrown@juno.com, malis@ascend.com 
+#   RFC2428          ||       M. Allman, S. Ostermann, C. Metz         ||        mallman@lerc.nasa.gov, ostermann@cs.ohiou.edu, cmetz@inner.net 
+#   RFC2429          ||       C. Bormann, L. Cline, G. Deisher, T. Gardos, C. Maciocco, D. Newell, J. Ott, G. Sullivan, S. Wenger, C. Zhu         ||         
+#   RFC2430          ||       T. Li, Y. Rekhter         ||        tli@juniper.net, yakov@cisco.com 
+#   RFC2431          ||       D. Tynan         ||        dtynan@claddagh.ie 
+#   RFC2432          ||       K. Dubray         ||        kdubray@ironbridgenetworks.com 
+#   RFC2433          ||       G. Zorn, S. Cobb         ||        glennz@microsoft.com, stevec@microsoft.com 
+#   RFC2434          ||      T. Narten, H. Alvestrand         ||       narten@raleigh.ibm.com, Harald@Alvestrand.no
+#   RFC2435          ||       L. Berc, W. Fenner, R. Frederick, S. McCanne, P. Stewart         ||        berc@pa.dec.com, fenner@parc.xerox.com, frederick@parc.xerox.com, mccanne@cs.berkeley.edu, stewart@parc.xerox.com 
+#   RFC2436          ||       R. Brett, S. Bradner, G. Parsons         ||        rfbrett@nortel.ca, sob@harvard.edu, Glenn.Parsons@Nortel.ca 
+#   RFC2437          ||       B. Kaliski, J. Staddon         ||        burt@rsa.com, jstaddon@rsa.com 
+#   RFC2438          ||       M. O'Dell, H. Alvestrand, B. Wijnen, S. Bradner         ||        mo@uu.net, Harald.Alvestrand@maxware.no, wijnen@vnet.ibm.com, sob@harvard.edu 
+#   RFC2439          ||       C. Villamizar, R. Chandra, R. Govindan         ||        curtis@ans.net, rchandra@cisco.com, govindan@isi.edu 
+#   RFC2440          ||      J. Callas, L. Donnerhacke, H. Finney, R. Thayer         ||       
+#   RFC2441          ||       D. Cohen         ||        cohen@myri.com 
+#   RFC2442          ||       N. Freed, D. Newman, J. Belissent, M. Hoy         ||        ned.freed@innosoft.com, dan.newman@innosoft.com, jacques.belissent@eng.sun.com 
+#   RFC2443          ||       J. Luciani, A. Gallo         ||        luciani@baynetworks.com, gallo@raleigh.ibm.com 
+#   RFC2444          ||       C. Newman         ||        chris.newman@innosoft.com 
+#   RFC2445          ||      F. Dawson, D. Stenerson         ||       
+#   RFC2446          ||      S. Silverberg, S. Mansour, F. Dawson, R. Hopson         ||       
+#   RFC2447          ||      F. Dawson, S. Mansour, S. Silverberg         ||       
+#   RFC2448          ||       M. Civanlar, G. Cash, B. Haskell         ||        civanlar@research.att.com, glenn@research.att.com, bgh@research.att.com 
+#   RFC2449          ||      R. Gellens, C. Newman, L. Lundblade         ||       randy@qualcomm.com, chris.newman@innosoft.com, lgl@qualcomm.com
+#   RFC2450          ||      R. Hinden         ||       bob.hinden@gmail.com
+#   RFC2451          ||       R. Pereira, R. Adams         ||         
+#   RFC2452          ||      M. Daniele         ||       daniele@zk3.dec.com
+#   RFC2453          ||       G. Malkin         ||        gmalkin@baynetworks.com 
+#   RFC2454          ||      M. Daniele         ||       daniele@zk3.dec.com
+#   RFC2455          ||       B. Clouston, B. Moore         ||        clouston@cisco.com, remoore@us.ibm.com 
+#   RFC2456          ||       B. Clouston, B. Moore         ||        clouston@cisco.com, remoore@us.ibm.com 
+#   RFC2457          ||       B. Clouston, B. Moore         ||        clouston@cisco.com, remoore@us.ibm.com 
+#   RFC2458          ||       H. Lu, M. Krishnaswamy, L. Conroy, S. Bellovin, F. Burg, A. DeSimone, K. Tewani, P. Davidson, H. Schulzrinne, K. Vishwanathan         ||        smb@research.att.com, fburg@hogpb.att.com, lwc@roke.co.uk, pauldav@nortel.ca, murali@bell-labs.com, hui-lan.lu@bell-labs.com, schulzrinne@cs.columbia.edu, tewani@att.com, kumar@isochrone.com 
+#   RFC2459          ||       R. Housley, W. Ford, W. Polk, D. Solo         ||        housley@spyrus.com, wford@verisign.com, wpolk@nist.gov, david.solo@citicorp.com 
+#   RFC2460          ||      S. Deering, R. Hinden         ||       deering@cisco.com, bob.hinden@gmail.com
+#   RFC2461          ||      T. Narten, E. Nordmark, W. Simpson         ||       narten@raleigh.ibm.com, nordmark@sun.com, Bill.Simpson@um.cc.umich.edu
+#   RFC2462          ||      S. Thomson, T. Narten         ||       
+#   RFC2463          ||       A. Conta, S. Deering         ||        aconta@lucent.com, deering@cisco.com 
+#   RFC2464          ||      M. Crawford         ||       crawdad@fnal.gov
+#   RFC2465          ||      D. Haskin, S. Onishi         ||       dhaskin@baynetworks.com, sonishi@baynetworks.com
+#   RFC2466          ||      D. Haskin, S. Onishi         ||       dhaskin@baynetworks.com, sonishi@baynetworks.com
+#   RFC2467          ||      M. Crawford         ||       crawdad@fnal.gov
+#   RFC2468          ||       V. Cerf         ||        vcerf@mci.net 
+#   RFC2469          ||       T. Narten, C. Burton         ||        narten@raleigh.ibm.com, burton@rtp.vnet.ibm.com 
+#   RFC2470          ||      M. Crawford, T. Narten, S. Thomas         ||       crawdad@fnal.gov, narten@raleigh.ibm.com, stephen.thomas@transnexus.com
+#   RFC2471          ||      R. Hinden, R. Fink, J. Postel         ||       bob.hinden@gmail.com, rlfink@lbl.gov
+#   RFC2472          ||      D. Haskin, E. Allen         ||       dhaskin@baynetworks.com, eallen@baynetworks.com
+#   RFC2473          ||       A. Conta, S. Deering         ||        aconta@lucent.com, deering@cisco.com 
+#   RFC2474          ||      K. Nichols, S. Blake, F. Baker, D. Black         ||       kmn@cisco.com, slblake@torrentnet.com, fred@cisco.com, black_david@emc.com
+#   RFC2475          ||      S. Blake, D. Black, M. Carlson, E. Davies, Z. Wang, W. Weiss         ||       slblake@torrentnet.com, black_david@emc.com, mark.carlson@sun.com, elwynd@nortel.co.uk, zhwang@bell-labs.com, wweiss@lucent.com
+#   RFC2476          ||       R. Gellens, J. Klensin         ||        Randy@Qualcomm.Com, klensin@mci.net 
+#   RFC2477          ||       B. Aboba, G. Zorn         ||        bernarda@microsoft.com, glennz@microsoft.com 
+#   RFC2478          ||       E. Baize, D. Pinkas         ||         
+#   RFC2479          ||       C. Adams         ||        cadams@entrust.com 
+#   RFC2480          ||       N. Freed         ||        ned.freed@innosoft.com 
+#   RFC2481          ||       K. Ramakrishnan, S. Floyd         ||         
+#   RFC2482          ||      K. Whistler, G. Adams         ||       kenw@sybase.com, glenn@spyglass.com
+#   RFC2483          ||       M. Mealling, R. Daniel         ||        michaelm@rwhois.net, rdaniel@lanl.gov 
+#   RFC2484          ||       G. Zorn         ||        glennz@microsoft.com 
+#   RFC2485          ||       S. Drach         ||        drach@sun.com 
+#   RFC2486          ||       B. Aboba, M. Beadles         ||        bernarda@microsoft.com, mbeadles@wcom.net 
+#   RFC2487          ||       P. Hoffman         ||        phoffman@imc.org 
+#   RFC2488          ||       M. Allman, D. Glover, L. Sanchez         ||        mallman@lerc.nasa.gov, Daniel.R.Glover@lerc.nasa.gov, lsanchez@ir.bbn.com 
+#   RFC2489          ||       R. Droms         ||        droms@bucknell.edu 
+#   RFC2490          ||       M. Pullen, R. Malghan, L. Lavu, G. Duan, J. Ma, H. Nah         ||        mpullen@gmu.edu, rmalghan@bacon.gmu.edu, llavu@bacon.gmu.edu, gduan@us.oracle.com, jma@newbridge.com, hnah@bacon.gmu.edu 
+#   RFC2491          ||      G. Armitage, P. Schulter, M. Jork, G. Harter         ||       gja@lucent.com, paschulter@acm.org, jork@kar.dec.com, harter@zk3.dec.com
+#   RFC2492          ||      G. Armitage, P. Schulter, M. Jork         ||       gja@lucent.com, paschulter@acm.org, jork@kar.dec.com
+#   RFC2493          ||       K. Tesink, Ed.         ||        kaj@bellcore.com 
+#   RFC2494          ||       D. Fowler, Ed.         ||        davef@newbridge.com 
+#   RFC2495          ||       D. Fowler, Ed.         ||        davef@newbridge.com 
+#   RFC2496          ||       D. Fowler, Ed.         ||        davef@newbridge.com 
+#   RFC2497          ||      I. Souvatzis         ||       is@netbsd.org
+#   RFC2498          ||       J. Mahdavi, V. Paxson         ||        mahdavi@psc.edu, vern@ee.lbl.gov 
+#   RFC2499          ||       A. Ramos         ||        ramos@isi.edu 
+#   RFC2500          ||       J. Reynolds, R. Braden         ||         
+#   RFC2501          ||       S. Corson, J. Macker         ||        corson@isr.umd.edu, macker@itd.nrl.navy.mil 
+#   RFC2502          ||       M. Pullen, M. Myjak, C. Bouwens         ||        mpullen@gmu.edu, mmyjak@virtualworkshop.com, christina.bouwens@cpmx.mail.saic.com 
+#   RFC2503          ||       R. Moulton, M. Needleman         ||        ruth@muswell.demon.co.uk 
+#   RFC2504          ||       E. Guttman, L. Leong, G. Malkin         ||        erik.guttman@sun.com, lorna@colt.net, gmalkin@baynetworks.com 
+#   RFC2505          ||       G. Lindberg         ||         
+#   RFC2506          ||       K. Holtman, A. Mutz, T. Hardie         ||        koen@win.tue.nl, andy_mutz@hp.com, hardie@equinix.com 
+#   RFC2507          ||       M. Degermark, B. Nordgren, S. Pink         ||        micke@sm.luth.se, bcn@lulea.trab.se, steve@sm.luth.se 
+#   RFC2508          ||       S. Casner, V. Jacobson         ||        casner@cisco.com, van@cisco.com 
+#   RFC2509          ||       M. Engan, S. Casner, C. Bormann         ||        engan@effnet.com, casner@cisco.com, cabo@tzi.org 
+#   RFC2510          ||       C. Adams, S. Farrell         ||        cadams@entrust.com, stephen.farrell@sse.ie 
+#   RFC2511          ||       M. Myers, C. Adams, D. Solo, D. Kemp         ||        mmyers@verisign.com, cadams@entrust.com, david.solo@citicorp.com, dpkemp@missi.ncsc.mil 
+#   RFC2512          ||       K. McCloghrie, J. Heinanen, W. Greene, A. Prasad         ||        kzm@cisco.com, jh@telia.fi, wedge.greene@mci.com, aprasad@cisco.com 
+#   RFC2513          ||       K. McCloghrie, J. Heinanen, W. Greene, A. Prasad         ||        kzm@cisco.com, jh@telia.fi, wedge.greene@mci.com, aprasad@cisco.com 
+#   RFC2514          ||       M. Noto, E. Spiegel, K. Tesink         ||        mspiegel@cisco.com, kaj@bellcore.com 
+#   RFC2515          ||       K. Tesink, Ed         ||        kaj@bellcore.com 
+#   RFC2516          ||       L. Mamakos, K. Lidl, J. Evarts, D. Carrel, D. Simone, R. Wheeler         ||        louie@uu.net, lidl@uu.net, jde@uu.net, carrel@RedBack.net, dan@RedBack.net, ross@routerware.com 
+#   RFC2517          ||       R. Moats, R. Huber         ||        jayhawk@att.com, rvh@att.com 
+#   RFC2518          ||      Y. Goland, E. Whitehead, A. Faizi, S. Carter, D. Jensen         ||       yarong@microsoft.com, ejw@ics.uci.edu, asad@netscape.com, srcarter@novell.com, dcjensen@novell.com
+#   RFC2519          ||       E. Chen, J. Stewart         ||        enkechen@cisco.com, jstewart@juniper.net 
+#   RFC2520          ||       J. Luciani, H. Suzuki, N. Doraswamy, D. Horton         ||        luciani@baynetworks.com, hsuzuki@cisco.com, naganand@baynetworks.com, d.horton@citr.com.au 
+#   RFC2521          ||       P. Karn, W. Simpson         ||         
+#   RFC2522          ||       P. Karn, W. Simpson         ||         
+#   RFC2523          ||       P. Karn, W. Simpson         ||         
+#   RFC2524          ||       M. Banan         ||         
+#   RFC2525          ||       V. Paxson, M. Allman, S. Dawson, W. Fenner, J. Griner, I. Heavens, K. Lahey, J. Semke, B. Volz         ||        vern@aciri.org, sdawson@eecs.umich.edu, fenner@parc.xerox.com, jgriner@grc.nasa.gov, ian@spider.com, kml@nas.nasa.gov, semke@psc.edu, volz@process.com 
+#   RFC2526          ||       D. Johnson, S. Deering         ||        dbj@cs.cmu.edu, deering@cisco.com 
+#   RFC2527          ||       S. Chokhani, W. Ford         ||         
+#   RFC2528          ||       R. Housley, W. Polk         ||        housley@spyrus.com, wpolk@nist.gov 
+#   RFC2529          ||       B. Carpenter, C. Jung         ||        brian@hursley.ibm.com, cmj@3Com.com 
+#   RFC2530          ||       D. Wing         ||        dwing-ietf@fuggles.com 
+#   RFC2531          ||       G. Klyne, L. McIntyre         ||        GK@ACM.ORG, Lloyd.McIntyre@pahv.xerox.com 
+#   RFC2532          ||       L. Masinter, D. Wing         ||        masinter@parc.xerox.com, dwing-ietf@fuggles.com 
+#   RFC2533          ||       G. Klyne         ||        GK@ACM.ORG 
+#   RFC2534          ||       L. Masinter, D. Wing, A. Mutz, K. Holtman         ||        masinter@parc.xerox.com, dwing-ietf@fuggles.com, koen@win.tue.nl 
+#   RFC2535          ||       D. Eastlake 3rd         ||        dee3@us.ibm.com 
+#   RFC2536          ||      D. Eastlake 3rd         ||       dee3@us.ibm.com
+#   RFC2537          ||       D. Eastlake 3rd         ||        dee3@us.ibm.com 
+#   RFC2538          ||       D. Eastlake 3rd, O. Gudmundsson         ||        dee3@us.ibm.com, ogud@tislabs.com 
+#   RFC2539          ||      D. Eastlake 3rd         ||       dee3@us.ibm.com
+#   RFC2540          ||       D. Eastlake 3rd         ||        dee3@us.ibm.com 
+#   RFC2541          ||       D. Eastlake 3rd         ||        dee3@us.ibm.com 
+#   RFC2542          ||       L. Masinter         ||        masinter@parc.xerox.com 
+#   RFC2543          ||      M. Handley, H. Schulzrinne, E. Schooler, J. Rosenberg         ||       
+#   RFC2544          ||      S. Bradner, J. McQuaid         ||       
+#   RFC2545          ||       P. Marques, F. Dupont         ||         
+#   RFC2546          ||       A. Durand, B. Buclin         ||        Alain.Durand@imag.fr, Bertrand.Buclin@ch.att.com 
+#   RFC2547          ||       E. Rosen, Y. Rekhter         ||        erosen@cisco.com, yakov@cisco.com 
+#   RFC2548          ||       G. Zorn         ||         
+#   RFC2549          ||       D. Waitzman         ||        djw@vineyard.net 
+#   RFC2550          ||       S. Glassman, M. Manasse, J. Mogul         ||        steveg@pa.dec.com, msm@pa.dec.com, mogul@pa.dec.com 
+#   RFC2551          ||       S. Bradner         ||         
+#   RFC2552          ||       M. Blinov, M. Bessonov, C. Clissmann         ||        mch@net-cs.ucd.ie, mikeb@net-cs.ucd.ie, ciaranc@net-cs.ucd.ie 
+#   RFC2553          ||       R. Gilligan, S. Thomson, J. Bound, W. Stevens         ||        gilligan@freegate.com, set@thumper.bellcore.com, bound@zk3.dec.com, rstevens@kohala.com 
+#   RFC2554          ||      J. Myers         ||       jgmyers@netscape.com
+#   RFC2555          ||       RFC Editor, et al.         ||        braden@isi.edu, jkrey@isi.edu, crocker@mbl.edu, vcerf@mci.net, feinler@juno.com, celeste@isi.edu 
+#   RFC2556          ||       S. Bradner         ||        sob@harvard.edu 
+#   RFC2557          ||       J. Palme, A. Hopmann, N. Shelness         ||        jpalme@dsv.su.se, alexhop@microsoft.com, Shelness@lotus.com, stef@nma.com 
+#   RFC2558          ||       K. Tesink         ||        kaj@research.telcordia.com 
+#   RFC2559          ||       S. Boeyen, T. Howes, P. Richard         ||        sharon.boeyen@entrust.com, howes@netscape.com, patr@xcert.com 
+#   RFC2560          ||      M. Myers, R. Ankney, A. Malpani, S. Galperin, C. Adams         ||       mmyers@verisign.com, rankney@erols.com, ambarish@valicert.com, galperin@mycfo.com, cadams@entrust.com
+#   RFC2561          ||       K. White, R. Moore         ||        kennethw@vnet.ibm.com, remoore@us.ibm.com 
+#   RFC2562          ||       K. White, R. Moore         ||        kennethw@vnet.ibm.com, remoore@us.ibm.com 
+#   RFC2563          ||       R. Troll         ||        rtroll@corp.home.net 
+#   RFC2564          ||       C. Kalbfleisch, C. Krupczak, R. Presuhn, J. Saperia         ||        cwk@verio.net, cheryl@empiretech.com, randy_presuhn@bmc.com, saperia@mediaone.net 
+#   RFC2565          ||       R. Herriot, Ed., S. Butler, P. Moore, R. Turner         ||        rherriot@pahv.xerox.com, sbutler@boi.hp.com, paulmo@microsoft.com, rturner@sharplabs.com, rherriot@pahv.xerox.com 
+#   RFC2566          ||      R. deBry, T. Hastings, R. Herriot, S. Isaacson, P. Powell         ||       sisaacson@novell.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com, debryro@uvsc.edu, papowell@astart.com
+#   RFC2567          ||       F. Wright         ||         
+#   RFC2568          ||       S. Zilles         ||         
+#   RFC2569          ||      R. Herriot, Ed., T. Hastings, N. Jacobs, J. Martin         ||       rherriot@pahv.xerox.com, Norm.Jacobs@Central.sun.com, tom.hastings@alum.mit.edu, jkm@underscore.com
+#   RFC2570          ||       J. Case, R. Mundy, D. Partain, B. Stewart         ||         
+#   RFC2571          ||       B. Wijnen, D. Harrington, R. Presuhn         ||         
+#   RFC2572          ||       J. Case, D. Harrington, R. Presuhn, B. Wijnen         ||         
+#   RFC2573          ||       D. Levi, P. Meyer, B. Stewart         ||         
+#   RFC2574          ||       U. Blumenthal, B. Wijnen         ||         
+#   RFC2575          ||       B. Wijnen, R. Presuhn, K. McCloghrie         ||         
+#   RFC2576          ||       R. Frye, D. Levi, S. Routhier, B. Wijnen         ||         
+#   RFC2577          ||       M. Allman, S. Ostermann         ||        mallman@grc.nasa.gov, ostermann@cs.ohiou.edu 
+#   RFC2578          ||      K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed.         ||       
+#   RFC2579          ||      K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed.         ||       
+#   RFC2580          ||      K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed.         ||       
+#   RFC2581          ||      M. Allman, V. Paxson, W. Stevens         ||       mallman@grc.nasa.gov, vern@aciri.org, rstevens@kohala.com
+#   RFC2582          ||       S. Floyd, T. Henderson         ||         
+#   RFC2583          ||       R. Carlson, L. Winkler         ||        RACarlson@anl.gov, lwinkler@anl.gov 
+#   RFC2584          ||       B. Clouston, B. Moore         ||        clouston@cisco.com, remoore@us.ibm.com 
+#   RFC2585          ||      R. Housley, P. Hoffman         ||       housley@spyrus.com, phoffman@imc.org 
+#   RFC2586          ||       J. Salsman, H. Alvestrand         ||        James@bovik.org, Harald.T.Alvestrand@uninett.no 
+#   RFC2587          ||       S. Boeyen, T. Howes, P. Richard         ||        sharon.boeyen@entrust.com, howes@netscape.com, patr@xcert.com 
+#   RFC2588          ||       R. Finlayson         ||        finlayson@live.com 
+#   RFC2589          ||       Y. Yaacovi, M. Wahl, T. Genovese         ||        yoramy@microsoft.com, tonyg@microsoft.com 
+#   RFC2590          ||      A. Conta, A. Malis, M. Mueller         ||       aconta@lucent.com, malis@ascend.com, memueller@lucent.com
+#   RFC2591          ||       D. Levi, J. Schoenwaelder         ||         
+#   RFC2592          ||       D. Levi, J. Schoenwaelder         ||         
+#   RFC2593          ||       J. Schoenwaelder, J. Quittek         ||        schoenw@ibr.cs.tu-bs.de, quittek@ccrle.nec.de 
+#   RFC2594          ||       H. Hazewinkel, C. Kalbfleisch, J. Schoenwaelder         ||         
+#   RFC2595          ||      C. Newman         ||       chris.newman@innosoft.com
+#   RFC2596          ||       M. Wahl, T. Howes         ||        M.Wahl@innosoft.com, howes@netscape.com 
+#   RFC2597          ||       J. Heinanen, F. Baker, W. Weiss, J. Wroclawski         ||        jh@telia.fi, fred@cisco.com, wweiss@lucent.com, jtw@lcs.mit.edu 
+#   RFC2598          ||       V. Jacobson, K. Nichols, K. Poduri         ||        van@cisco.com, kmn@cisco.com, kpoduri@baynetworks.com 
+#   RFC2599          ||       A. DeLaCruz         ||        delacruz@isi.edu 
+#   RFC2600          ||       J. Reynolds, R. Braden         ||         
+#   RFC2601          ||       M. Davison         ||        mike.davison@cisco.com 
+#   RFC2602          ||       M. Davison         ||        mike.davison@cisco.com 
+#   RFC2603          ||       M. Davison         ||        mike.davison@cisco.com 
+#   RFC2604          ||       R. Gellens         ||        randy@qualcomm.com 
+#   RFC2605          ||       G. Mansfield, S. Kille         ||        glenn@cysols.com, Steve.Kille@MessagingDirect.com 
+#   RFC2606          ||      D. Eastlake 3rd, A. Panitz         ||       dee3@us.ibm.com, buglady@fuschia.net
+#   RFC2607          ||       B. Aboba, J. Vollbrecht         ||        bernarda@microsoft.com, jrv@merit.edu 
+#   RFC2608          ||       E. Guttman, C. Perkins, J. Veizades, M. Day         ||        Erik.Guttman@sun.com, cperkins@sun.com, veizades@home.net, mday@vinca.com 
+#   RFC2609          ||       E. Guttman, C. Perkins, J. Kempf         ||        erik.guttman@sun.com, cperkins@sun.com, james.kempf@sun.com 
+#   RFC2610          ||       C. Perkins, E. Guttman         ||        Charles.Perkins@Sun.Com, Erik.Guttman@Sun.Com 
+#   RFC2611          ||      L. Daigle, D. van Gulik, R. Iannella, P. Faltstrom         ||       leslie@thinkingcat.com, Dirk.vanGulik@jrc.it, renato@dstc.edu.au, paf@swip.net
+#   RFC2612          ||       C. Adams, J. Gilchrist         ||        carlisle.adams@entrust.com, jeff.gilchrist@entrust.com 
+#   RFC2613          ||       R. Waterman, B. Lahaye, D. Romascanu, S. Waldbusser         ||        rich@allot.com, dromasca@gmail.com , waldbusser@ins.com 
+#   RFC2614          ||       J. Kempf, E. Guttman         ||        james.kempf@sun.com, erik.guttman@sun.com 
+#   RFC2615          ||       A. Malis, W. Simpson         ||        malis@ascend.com, wsimpson@GreenDragon.com 
+#   RFC2616          ||      R. Fielding, J. Gettys, J. Mogul, H. Frystyk, L. Masinter, P. Leach, T. Berners-Lee         ||       fielding@ics.uci.edu, jg@w3.org, mogul@wrl.dec.com, frystyk@w3.org, masinter@parc.xerox.com, paulle@microsoft.com, timbl@w3.org
+#   RFC2617          ||      J. Franks, P. Hallam-Baker, J. Hostetler, S. Lawrence, P. Leach, A. Luotonen, L. Stewart         ||       john@math.nwu.edu, pbaker@verisign.com, jeff@AbiSource.com, lawrence@agranat.com, paulle@microsoft.com, stewart@OpenMarket.com
+#   RFC2618          ||       B. Aboba, G. Zorn         ||        bernarda@microsoft.com, glennz@microsoft.com 
+#   RFC2619          ||       G. Zorn, B. Aboba         ||        bernarda@microsoft.com, glennz@microsoft.com 
+#   RFC2620          ||       B. Aboba, G. Zorn         ||        bernarda@microsoft.com, glennz@microsoft.com 
+#   RFC2621          ||       G. Zorn, B. Aboba         ||        bernarda@microsoft.com, glennz@microsoft.com 
+#   RFC2622          ||      C. Alaettinoglu, C. Villamizar, E. Gerich, D. Kessens, D. Meyer, T. Bates, D. Karrenberg, M. Terpstra         ||       cengiz@isi.edu, curtis@avici.com, epg@home.net, David.Kessens@qwest.net, meyer@antc.uoregon.edu, tbates@cisco.com, dfk@ripe.net, marten@BayNetworks.com
+#   RFC2623          ||      M. Eisler         ||       mre@eng.sun.com
+#   RFC2624          ||       S. Shepler         ||        spencer.shepler@eng.sun.com 
+#   RFC2625          ||       M. Rajagopal, R. Bhagwat, W. Rickard         ||        murali@gadzoox.com, raj@gadzoox.com, wayne@gadzoox.com 
+#   RFC2626          ||       P. Nesser II         ||         
+#   RFC2627          ||       D. Wallner, E. Harder, R. Agee         ||        dmwalln@orion.ncsc.mil, ejh@tycho.ncsc.mil 
+#   RFC2628          ||       V. Smyslov         ||        svan@trustworks.com 
+#   RFC2629          ||      M. Rose         ||       mrose17@gmail.com
+#   RFC2630          ||       R. Housley         ||        housley@spyrus.com 
+#   RFC2631          ||       E. Rescorla         ||        ekr@rtfm.com 
+#   RFC2632          ||       B. Ramsdell, Ed.         ||         
+#   RFC2633          ||       B. Ramsdell, Ed.         ||         
+#   RFC2634          ||      P. Hoffman, Ed.         ||       phoffman@imc.org
+#   RFC2635          ||       S. Hambridge, A. Lunde         ||         
+#   RFC2636          ||       R. Gellens         ||        randy@qualcomm.com 
+#   RFC2637          ||       K. Hamzeh, G. Pall, W. Verthein, J. Taarud, W. Little, G. Zorn         ||        kory@ascend.com, gurdeep@microsoft.com, glennz@microsoft.com 
+#   RFC2638          ||      K. Nichols, V. Jacobson, L. Zhang         ||       kmn@cisco.com, van@cisco.com, lixia@cs.ucla.edu
+#   RFC2639          ||      T. Hastings, C. Manros         ||       tom.hastings@alum.mit.edu, manros@cp10.es.xerox.com
+#   RFC2640          ||       B. Curtin         ||        curtinw@ftm.disa.mil 
+#   RFC2641          ||       D. Hamilton, D. Ruffen         ||        daveh@ctron.com, ruffen@ctron.com 
+#   RFC2642          ||       L. Kane         ||        lkane@ctron.com 
+#   RFC2643          ||      D. Ruffen, T. Len, J. Yanacek         ||       ruffen@ctron.com, len@ctron.com, jyanacek@ctron.com
+#   RFC2644          ||       D. Senie         ||        dts@senie.com 
+#   RFC2645          ||       R. Gellens         ||        randy@qualcomm.com 
+#   RFC2646          ||       R. Gellens, Ed.         ||         
+#   RFC2647          ||       D. Newman         ||         
+#   RFC2648          ||      R. Moats         ||       jayhawk@att.com
+#   RFC2649          ||       B. Greenblatt, P. Richard         ||        bgreenblatt@directory-applications.com, patr@xcert.com 
+#   RFC2650          ||       D. Meyer, J. Schmitz, C. Orange, M. Prior, C. Alaettinoglu         ||        dmm@cisco.com, SchmitzJo@aol.com, orange@spiritone.com, mrp@connect.com.au, cengiz@isi.edu 
+#   RFC2651          ||       J. Allen, M. Mealling         ||        jeff.allen@acm.org, michael.mealling@RWhois.net 
+#   RFC2652          ||       J. Allen, M. Mealling         ||        jeff.allen@acm.org, michael.mealling@RWhois.net 
+#   RFC2653          ||       J. Allen, P. Leach, R. Hedberg         ||        jeff.allen@acm.org, paulle@microsoft.com, roland@catalogix.ac.se 
+#   RFC2654          ||       R. Hedberg, B. Greenblatt, R. Moats, M. Wahl         ||        roland@catalogix.ac.se, bgreenblatt@directory-applications.com, jayhawk@att.com 
+#   RFC2655          ||       T. Hardie, M. Bowman, D. Hardy, M. Schwartz, D. Wessels         ||        hardie@equinix.com, mic@transarc.com, dhardy@netscape.com, wessels@nlanr.net 
+#   RFC2656          ||       T. Hardie         ||        hardie@equinix.com 
+#   RFC2657          ||       R. Hedberg         ||        roland@catalogix.ac.se 
+#   RFC2658          ||       K. McKay         ||        kylem@qualcomm.com 
+#   RFC2659          ||       E. Rescorla, A. Schiffman         ||        ekr@rtfm.com, ams@terisa.com 
+#   RFC2660          ||       E. Rescorla, A. Schiffman         ||        ekr@rtfm.com, ams@terisa.com 
+#   RFC2661          ||       W. Townsley, A. Valencia, A. Rubens, G. Pall, G. Zorn, B. Palter         ||        gurdeep@microsoft.com, palter@zev.net, acr@del.com, townsley@cisco.com, vandys@cisco.com, gwz@acm.org 
+#   RFC2662          ||       G. Bathrick, F. Ly         ||        bathricg@agcs.com, faye@coppermountain.com 
+#   RFC2663          ||       P. Srisuresh, M. Holdrege         ||        srisuresh@lucent.com, holdrege@lucent.com 
+#   RFC2664          ||       R. Plzak, A. Wells, E. Krol         ||        plzakr@saic.com, awel@cs.wisc.edu, krol@uiuc.edu 
+#   RFC2665          ||       J. Flick, J. Johnson         ||        johnf@rose.hp.com, jeff@redbacknetworks.com 
+#   RFC2666          ||       J. Flick         ||        johnf@rose.hp.com 
+#   RFC2667          ||       D. Thaler         ||        dthaler@microsoft.com 
+#   RFC2668          ||       A. Smith, J. Flick, K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie, S. Roberts         ||        andrew@extremenetworks.com, johnf@rose.hp.com, kdegraaf@argon.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com, sroberts@farallon.com 
+#   RFC2669          ||       M. St. Johns, Ed.         ||        stjohns@corp.home.net 
+#   RFC2670          ||       M. St. Johns, Ed.         ||        stjohns@corp.home.net 
+#   RFC2671          ||      P. Vixie         ||       vixie@isc.org
+#   RFC2672          ||      M. Crawford         ||       crawdad@fnal.gov
+#   RFC2673          ||      M. Crawford         ||       crawdad@fnal.gov
+#   RFC2674          ||       E. Bell, A. Smith, P. Langille, A. Rijhsinghani, K. McCloghrie         ||        Les_Bell@3Com.com, andrew@extremenetworks.com, langille@newbridge.com, anil@cabletron.com, kzm@cisco.com 
+#   RFC2675          ||      D. Borman, S. Deering, R. Hinden         ||       dab@bsdi.com, deering@cisco.com, bob.hinden@gmail.com
+#   RFC2676          ||       G. Apostolopoulos, S. Kama, D. Williams, R. Guerin, A. Orda, T. Przygienda         ||        georgeap@watson.ibm.com, guerin@ee.upenn.edu, ariel@ee.technion.ac.il, dougw@watson.ibm.com 
+#   RFC2677          ||       M. Greene, J. Cucchiara, J. Luciani         ||        luciani@baynetworks.com, maria@xedia.com, joan@ironbridgenetworks.com 
+#   RFC2678          ||       J. Mahdavi, V. Paxson         ||        mahdavi@psc.edu, vern@ee.lbl.gov 
+#   RFC2679          ||      G. Almes, S. Kalidindi, M. Zekauskas         ||       almes@advanced.org, kalidindi@advanced.org, matt@advanced.org
+#   RFC2680          ||      G. Almes, S. Kalidindi, M. Zekauskas         ||       almes@advanced.org, kalidindi@advanced.org, matt@advanced.org
+#   RFC2681          ||       G. Almes, S. Kalidindi, M. Zekauskas         ||        almes@advanced.org, kalidindi@advanced.org, matt@advanced.org 
+#   RFC2682          ||       I. Widjaja, A. Elwalid         ||        indra.widjaja@fnc.fujitsu.com, anwar@lucent.com 
+#   RFC2683          ||      B. Leiba         ||       leiba@watson.ibm.com
+#   RFC2684          ||       D. Grossman, J. Heinanen         ||        dan@dma.isg.mot.com, jh@telia.fi 
+#   RFC2685          ||       B. Fox, B. Gleeson         ||        barbarafox@lucent.com, bgleeson@shastanets.com 
+#   RFC2686          ||       C. Bormann         ||        cabo@tzi.org 
+#   RFC2687          ||       C. Bormann         ||        cabo@tzi.org 
+#   RFC2688          ||       S. Jackowski, D. Putzolu, E. Crawley, B. Davie         ||        stevej@DeterministicNetworks.com, David.Putzolu@intel.com, esc@argon.com, bdavie@cisco.com 
+#   RFC2689          ||       C. Bormann         ||        cabo@tzi.org 
+#   RFC2690          ||       S. Bradner         ||         
+#   RFC2691          ||       S. Bradner         ||         
+#   RFC2692          ||       C. Ellison         ||        carl.m.ellison@intel.com 
+#   RFC2693          ||       C. Ellison, B. Frantz, B. Lampson, R. Rivest, B. Thomas, T. Ylonen         ||        carl.m.ellison@intel.com, frantz@netcom.com, blampson@microsoft.com, rivest@theory.lcs.mit.edu, bt0008@sbc.com, ylo@ssh.fi 
+#   RFC2694          ||       P. Srisuresh, G. Tsirtsis, P. Akkiraju, A. Heffernan         ||        srisuresh@yahoo.com, george@gideon.bt.co.uk, spa@cisco.com, ahh@juniper.net 
+#   RFC2695          ||       A. Chiu         ||         
+#   RFC2696          ||       C. Weider, A. Herron, A. Anantha, T. Howes         ||        cweider@microsoft.com, andyhe@microsoft.com, anoopa@microsoft.com, howes@netscape.com 
+#   RFC2697          ||       J. Heinanen, R. Guerin         ||        jh@telia.fi, guerin@ee.upenn.edu 
+#   RFC2698          ||       J. Heinanen, R. Guerin         ||        jh@telia.fi, guerin@ee.upenn.edu 
+#   RFC2699          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC2700          ||       J. Reynolds, R. Braden         ||         
+#   RFC2701          ||       G. Malkin         ||         
+#   RFC2702          ||       D. Awduche, J. Malcolm, J. Agogbua, M. O'Dell, J. McManus         ||        awduche@uu.net, jmalcolm@uu.net, ja@uu.net, mo@uu.net, jmcmanus@uu.net 
+#   RFC2703          ||       G. Klyne         ||        GK@ACM.ORG 
+#   RFC2704          ||       M. Blaze, J. Feigenbaum, J. Ioannidis, A. Keromytis         ||        mab@research.att.com, jf@research.att.com, ji@research.att.com, angelos@dsl.cis.upenn.edu 
+#   RFC2705          ||       M. Arango, A. Dugan, I. Elliott, C. Huitema, S. Pickett         ||        marango@rslcom.com, andrew.dugan@l3.com, ike.elliott@l3.com, huitema@research.telcordia.com, ScottP@vertical.com 
+#   RFC2706          ||       D. Eastlake 3rd, T. Goldstein         ||        dee3@us.ibm.com, tgoldstein@brodia.com 
+#   RFC2707          ||      R. Bergman, T. Hastings, S. Isaacson, H. Lewis         ||       rbergma@dpc.com, tom.hastings@alum.mit.edu, scott_isaacson@novell.com, harryl@us.ibm.com
+#   RFC2708          ||      R. Bergman         ||       rbergman@dpc.com, tom.hastings@alum.mit.edu, scott_isaacson@novell.com, harryl@us.ibm.com, bpenteco@boi.hp.com
+#   RFC2709          ||       P. Srisuresh         ||        srisuresh@lucent.com 
+#   RFC2710          ||       S. Deering, W. Fenner, B. Haberman         ||        deering@cisco.com, fenner@research.att.com, haberman@raleigh.ibm.com 
+#   RFC2711          ||      C. Partridge, A. Jackson         ||       craig@bbn.com, awjacks@bbn.com
+#   RFC2712          ||       A. Medvinsky, M. Hur         ||        amedvins@excitecorp.com, matt.hur@cybersafe.com 
+#   RFC2713          ||       V. Ryan, S. Seligman, R. Lee         ||        vincent.ryan@ireland.sun.com, scott.seligman@eng.sun.com, rosanna.lee@eng.sun.com 
+#   RFC2714          ||       V. Ryan, R. Lee, S. Seligman         ||        vincent.ryan@ireland.sun.com, rosanna.lee@eng.sun.com, scott.seligman@eng.sun.com 
+#   RFC2715          ||       D. Thaler         ||        dthaler@microsoft.com 
+#   RFC2716          ||      B. Aboba, D. Simon         ||       bernarda@microsoft.com, dansimon@microsoft.com
+#   RFC2717          ||      R. Petke, I. King         ||       rpetke@wcom.net, iking@microsoft.com
+#   RFC2718          ||       L. Masinter, H. Alvestrand, D. Zigmond, R. Petke         ||        masinter@parc.xerox.com, harald.alvestrand@maxware.no, djz@corp.webtv.net, rpetke@wcom.net 
+#   RFC2719          ||       L. Ong, I. Rytina, M. Garcia, H. Schwarzbauer, L. Coene, H. Lin, I. Juhasz, M. Holdrege, C. Sharp         ||        long@nortelnetworks.com, ian.rytina@ericsson.com, holdrege@lucent.com, lode.coene@siemens.atea.be, Miguel.A.Garcia@ericsson.com, chsharp@cisco.com, imre.i.juhasz@telia.se, hlin@research.telcordia.com, HannsJuergen.Schwarzbauer@icn.siemens.de 
+#   RFC2720          ||       N. Brownlee         ||        n.brownlee@auckland.ac.nz 
+#   RFC2721          ||       N. Brownlee         ||        n.brownlee@auckland.ac.nz 
+#   RFC2722          ||       N. Brownlee, C. Mills, G. Ruth         ||        n.brownlee@auckland.ac.nz, cmills@gte.com, gruth@bbn.com 
+#   RFC2723          ||       N. Brownlee         ||        n.brownlee@auckland.ac.nz 
+#   RFC2724          ||       S. Handelman, S. Stibler, N. Brownlee, G. Ruth         ||        swhandel@us.ibm.com, stibler@us.ibm.com, n.brownlee@auckland.ac.nz, gruth@bbn.com 
+#   RFC2725          ||       C. Villamizar, C. Alaettinoglu, D. Meyer, S. Murphy         ||        curtis@avici.com, cengiz@ISI.EDU, dmm@cisco.com, sandy@tis.com 
+#   RFC2726          ||       J. Zsako         ||        zsako@banknet.net 
+#   RFC2727          ||       J. Galvin         ||         
+#   RFC2728          ||       R. Panabaker, S. Wegerif, D. Zigmond         ||         
+#   RFC2729          ||       P. Bagnall, R. Briscoe, A. Poppitt         ||        pete@surfaceeffect.com, bob.briscoe@bt.com, apoppitt@jungle.bt.co.uk 
+#   RFC2730          ||       S. Hanna, B. Patel, M. Shah         ||        steve.hanna@sun.com, baiju.v.patel@intel.com, munils@microsoft.com 
+#   RFC2731          ||      J. Kunze         ||       jak@ckm.ucsf.edu
+#   RFC2732          ||      R. Hinden, B. Carpenter, L. Masinter         ||       bob.hinden@gmail.com, brian@icair.org, LMM@acm.org
+#   RFC2733          ||      J. Rosenberg, H. Schulzrinne         ||       schulzrinne@cs.columbia.edu
+#   RFC2734          ||       P. Johansson         ||         
+#   RFC2735          ||       B. Fox, B. Petri         ||        bfox@equipecom.com, bernhard.petri@icn.siemens.de 
+#   RFC2736          ||       M. Handley, C. Perkins         ||        mjh@aciri.org, C.Perkins@cs.ucl.ac.uk 
+#   RFC2737          ||       K. McCloghrie, A. Bierman         ||        kzm@cisco.com, andy@yumaworks.com
+#   RFC2738          ||       G. Klyne         ||        GK@ACM.ORG 
+#   RFC2739          ||      T. Small, D. Hennessy, F. Dawson         ||       
+#   RFC2740          ||      R. Coltun, D. Ferguson, J. Moy         ||       rcoltun@siara.com, dennis@juniper.com, jmoy@sycamorenet.com
+#   RFC2741          ||       M. Daniele, B. Wijnen, M. Ellison, D. Francisco         ||        daniele@zk3.dec.com, wijnen@vnet.ibm.com, ellison@world.std.com, dfrancis@cisco.com 
+#   RFC2742          ||       L. Heintz, S. Gudur, M. Ellison         ||        lheintz@cisco.com, sgudur@hotmail.com 
+#   RFC2743          ||      J. Linn         ||       
+#   RFC2744          ||       J. Wray         ||        John_Wray@Iris.com 
+#   RFC2745          ||       A. Terzis, B. Braden, S. Vincent, L. Zhang         ||        terzis@cs.ucla.edu, braden@isi.edu, svincent@cisco.com, lixia@cs.ucla.edu 
+#   RFC2746          ||       A. Terzis, J. Krawczyk, J. Wroclawski, L. Zhang         ||        jj@arrowpoint.com, jtw@lcs.mit.edu, lixia@cs.ucla.edu, terzis@cs.ucla.edu 
+#   RFC2747          ||       F. Baker, B. Lindell, M. Talwar         ||        fred@cisco.com, lindell@ISI.EDU, mohitt@microsoft.com 
+#   RFC2748          ||       D. Durham, Ed., J. Boyle, R. Cohen, S. Herzog, R. Rajan, A. Sastry         ||         
+#   RFC2749          ||       S. Herzog, Ed., J. Boyle, R. Cohen, D. Durham, R. Rajan, A. Sastry         ||         
+#   RFC2750          ||       S. Herzog         ||         
+#   RFC2751          ||       S. Herzog         ||         
+#   RFC2752          ||       S. Yadav, R. Yavatkar, R. Pabbati, P. Ford, T. Moore, S. Herzog         ||         
+#   RFC2753          ||       R. Yavatkar, D. Pendarakis, R. Guerin         ||        raj.yavatkar@intel.com, dimitris@watson.ibm.com, guerin@ee.upenn.edu 
+#   RFC2754          ||      C. Alaettinoglu, C. Villamizar, R. Govindan         ||       cengiz@isi.edu, curtis@avici.com, govindan@isi.edu
+#   RFC2755          ||       A. Chiu, M. Eisler, B. Callaghan         ||        alex.chiu@Eng.sun.com, michael.eisler@Eng.sun.com, brent.callaghan@Eng.sun.com 
+#   RFC2756          ||       P. Vixie, D. Wessels         ||        vixie@isc.org, wessels@nlanr.net 
+#   RFC2757          ||       G. Montenegro, S. Dawkins, M. Kojo, V. Magret, N. Vaidya         ||        gab@sun.com, sdawkins@nortel.com, kojo@cs.helsinki.fi, vincent.magret@aud.alcatel.com, vaidya@cs.tamu.edu 
+#   RFC2758          ||       K. White         ||        wkenneth@us.ibm.com 
+#   RFC2759          ||       G. Zorn         ||        gwz@acm.org 
+#   RFC2760          ||       M. Allman, Ed., S. Dawkins, D. Glover, J. Griner, D. Tran, T. Henderson, J. Heidemann, J. Touch, H. Kruse, S. Ostermann, K. Scott, J. Semke         ||        mallman@grc.nasa.gov, Spencer.Dawkins.sdawkins@nt.com, Daniel.R.Glover@grc.nasa.gov, jgriner@grc.nasa.gov, dtran@grc.nasa.gov, tomh@cs.berkeley.edu, johnh@isi.edu, touch@isi.edu, hkruse1@ohiou.edu, ostermann@cs.ohiou.edu, kscott@mitre.org, semke@psc.edu 
+#   RFC2761          ||       J. Dunn, C. Martin         ||         
+#   RFC2762          ||       J. Rosenberg, H. Schulzrinne         ||        jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu 
+#   RFC2763          ||      N. Shen, H. Smit         ||       naiming@siara.com, hsmit@cisco.com
+#   RFC2764          ||       B. Gleeson, A. Lin, J. Heinanen, G. Armitage, A. Malis         ||         
+#   RFC2765          ||      E. Nordmark         ||       nordmark@sun.com
+#   RFC2766          ||      G. Tsirtsis, P. Srisuresh         ||       george.tsirtsis@bt.com, srisuresh@yahoo.com
+#   RFC2767          ||      K. Tsuchiya, H. Higuchi, Y. Atarashi         ||       tsuchi@ebina.hitachi.co.jp, h-higuti@ebina.hitachi.co.jp, atarashi@ebina.hitachi.co.jp
+#   RFC2768          ||       B. Aiken, J. Strassner, B. Carpenter, I. Foster, C. Lynch, J. Mambretti, R. Moore, B. Teitelbaum         ||        raiken@cisco.com, raiken@cisco.com, johns@cisco.com, brian@hursley.ibm.com, foster@mcs.anl.gov, cliff@cni.org, j-mambretti@nwu.edu, moore@sdsc.edu, ben@internet2.edu 
+#   RFC2769          ||       C. Villamizar, C. Alaettinoglu, R. Govindan, D. Meyer         ||        curtis@avici.com, cengiz@ISI.EDU, govindan@ISI.EDU, dmm@cisco.com 
+#   RFC2770          ||       D. Meyer, P. Lothberg         ||        dmm@cisco.com, roll@sprint.net 
+#   RFC2771          ||       R. Finlayson         ||        finlayson@live.com 
+#   RFC2772          ||       R. Rockell, R. Fink         ||        rrockell@sprint.net, fink@es.net 
+#   RFC2773          ||       R. Housley, P. Yee, W. Nace         ||        housley@spyrus.com, yee@spyrus.com 
+#   RFC2774          ||       H. Nielsen, P. Leach, S. Lawrence         ||        frystyk@microsoft.com, paulle@microsoft.com, lawrence@agranat.com 
+#   RFC2775          ||       B. Carpenter         ||        brian@icair.org 
+#   RFC2776          ||      M. Handley, D. Thaler, R. Kermode         ||       mjh@aciri.org, dthaler@microsoft.com, Roger.Kermode@motorola.com
+#   RFC2777          ||       D. Eastlake 3rd         ||        Donald.Eastlake@motorola.com 
+#   RFC2778          ||       M. Day, J. Rosenberg, H. Sugano         ||        mday@alum.mit.edu, suga@flab.fujitsu.co.jp 
+#   RFC2779          ||       M. Day, S. Aggarwal, G. Mohr, J. Vincent         ||        mday@alum.mit.edu, sonuag@microsoft.com, gojomo@usa.net, jesse@intonet.com 
+#   RFC2780          ||      S. Bradner, V. Paxson         ||       sob@harvard.edu, vern@aciri.org
+#   RFC2781          ||       P. Hoffman, F. Yergeau         ||        phoffman@imc.org, fyergeau@alis.com 
+#   RFC2782          ||      A. Gulbrandsen, P. Vixie, L. Esibov         ||       arnt@troll.no, levone@microsoft.com
+#   RFC2783          ||       J. Mogul, D. Mills, J. Brittenson, J. Stone, U. Windl         ||        mogul@wrl.dec.com, mills@udel.edu, jonathan@dsg.stanford.edu, ulrich.windl@rz.uni-regensburg.de 
+#   RFC2784          ||      D. Farinacci, T. Li, S. Hanks, D. Meyer, P. Traina         ||       dino@procket.com, tony1@home.net, stan_hanks@enron.net, dmm@cisco.com, pst@juniper.net
+#   RFC2785          ||       R. Zuccherato         ||        robert.zuccherato@entrust.com 
+#   RFC2786          ||       M. St. Johns         ||        stjohns@corp.home.net 
+#   RFC2787          ||      B. Jewell, D. Chuang         ||       bjewell@coppermountain.com, david_chuang@cosinecom.com
+#   RFC2788          ||       N. Freed, S. Kille         ||        ned.freed@innosoft.com, Steve.Kille@MessagingDirect.com 
+#   RFC2789          ||       N. Freed, S. Kille         ||        ned.freed@innosoft.com, Steve.Kille@MessagingDirect.com 
+#   RFC2790          ||       S. Waldbusser, P. Grillo         ||        waldbusser@ins.com 
+#   RFC2791          ||       J. Yu         ||        jyy@cosinecom.com 
+#   RFC2792          ||       M. Blaze, J. Ioannidis, A. Keromytis         ||         
+#   RFC2793          ||       G. Hellstrom         ||        gunnar.hellstrom@omnitor.se 
+#   RFC2794          ||       P. Calhoun, C. Perkins         ||         
+#   RFC2795          ||       S. Christey         ||        steqve@shore.net 
+#   RFC2796          ||       T. Bates, R. Chandra, E. Chen         ||        tbates@cisco.com, rchandra@redback.com, enke@redback.com 
+#   RFC2797          ||      M. Myers, X. Liu, J. Schaad, J. Weinstein         ||       mmyers@verisign.com, xliu@cisco.com, jimsch@nwlink.com, jsw@meer.net
+#   RFC2798          ||       M. Smith         ||        mcs@netscape.com 
+#   RFC2799          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC2800          ||       J. Reynolds, R. Braden, S. Ginoza         ||         
+#   RFC2801          ||       D. Burdett         ||        david.burdett@commerceone.com 
+#   RFC2802          ||       K. Davidson, Y. Kawatsura         ||        kent@differential.com, kawatura@bisd.hitachi.co.jp 
+#   RFC2803          ||       H. Maruyama, K. Tamura, N. Uramoto         ||        maruyama@jp.ibm.com, kent@trl.ibm.co.jp, uramoto@jp.ibm.com 
+#   RFC2804          ||      IAB, IESG         ||       fred@cisco.com, brian@icair.org
+#   RFC2805          ||       N. Greene, M. Ramalho, B. Rosen         ||        ngreene@nortelnetworks.com, mramalho@cisco.com, brosen@eng.fore.com 
+#   RFC2806          ||       A. Vaha-Sipila         ||        avs@iki.fi 
+#   RFC2807          ||       J. Reagle         ||        reagle@w3.org 
+#   RFC2808          ||       M. Nystrom         ||        magnus@rsasecurity.com 
+#   RFC2809          ||       B. Aboba, G. Zorn         ||        bernarda@microsoft.com, gwz@cisco.com 
+#   RFC2810          ||      C. Kalt         ||       Christophe.Kalt@gmail.com
+#   RFC2811          ||      C. Kalt         ||       Christophe.Kalt@gmail.com
+#   RFC2812          ||      C. Kalt         ||       Christophe.Kalt@gmail.com
+#   RFC2813          ||      C. Kalt         ||       Christophe.Kalt@gmail.com
+#   RFC2814          ||       R. Yavatkar, D. Hoffman, Y. Bernet, F. Baker, M. Speer         ||        yavatkar@ibeam.intel.com, yoramb@microsoft.com, fred@cisco.com, speer@Eng.Sun.COM 
+#   RFC2815          ||       M. Seaman, A. Smith, E. Crawley, J. Wroclawski         ||        andrew@extremenetworks.com, jtw@lcs.mit.edu 
+#   RFC2816          ||       A. Ghanwani, J. Pace, V. Srinivasan, A. Smith, M. Seaman         ||        aghanwan@nortelnetworks.com, pacew@us.ibm.com, vijay@cosinecom.com, andrew@extremenetworks.com 
+#   RFC2817          ||      R. Khare, S. Lawrence         ||       rohit@4K-associates.com, lawrence@agranat.com
+#   RFC2818          ||      E. Rescorla         ||       ekr@rtfm.com
+#   RFC2819          ||       S. Waldbusser         ||         
+#   RFC2820          ||      E. Stokes, D. Byrne, B. Blakley, P. Behera         ||       blakley@dascom.com, stokes@austin.ibm.com, djbyrne@us.ibm.com, prasanta@netscape.com
+#   RFC2821          ||      J. Klensin, Ed.         ||       
+#   RFC2822          ||      P. Resnick, Ed.         ||       presnick@qti.qualcomm.com
+#   RFC2823          ||       J. Carlson, P. Langner, E. Hernandez-Valencia, J. Manchester         ||        james.d.carlson@sun.com, plangner@lucent.com, enrique@lucent.com, sterling@hotair.hobl.lucent.com 
+#   RFC2824          ||       J. Lennox, H. Schulzrinne         ||        lennox@cs.columbia.edu, schulzrinne@cs.columbia.edu 
+#   RFC2825          ||       IAB, L. Daigle, Ed.         ||        iab@iab.org 
+#   RFC2826          ||       Internet Architecture Board         ||        iab@iab.org 
+#   RFC2827          ||      P. Ferguson, D. Senie         ||       ferguson@cisco.com, dts@senie.com
+#   RFC2828          ||      R. Shirey         ||       rshirey@bbn.com
+#   RFC2829          ||       M. Wahl, H. Alvestrand, J. Hodges, R. Morgan         ||        M.Wahl@innosoft.com, Harald@Alvestrand.no, JHodges@oblix.com, rlmorgan@washington.edu 
+#   RFC2830          ||       J. Hodges, R. Morgan, M. Wahl         ||        JHodges@oblix.com, rlmorgan@washington.edu, M.Wahl@innosoft.com 
+#   RFC2831          ||      P. Leach, C. Newman         ||       paulle@microsoft.com, chris.newman@innosoft.com
+#   RFC2832          ||       S. Hollenbeck, M. Srivastava         ||        shollenb@netsol.com, manojs@netsol.com 
+#   RFC2833          ||       H. Schulzrinne, S. Petrack         ||        schulzrinne@cs.columbia.edu, scott.petrack@metatel.com 
+#   RFC2834          ||      J.-M. Pittet         ||       jmp@sgi.com
+#   RFC2835          ||      J.-M. Pittet         ||       jmp@sgi.com
+#   RFC2836          ||       S. Brim, B. Carpenter, F. Le Faucheur         ||        sbrim@cisco.com, brian@icair.org, flefauch@cisco.com 
+#   RFC2837          ||       K. Teow         ||         
+#   RFC2838          ||       D. Zigmond, M. Vickers         ||        djz@corp.webtv.net, mav@liberate.com 
+#   RFC2839          ||       F. da Cruz, J. Altman         ||         
+#   RFC2840          ||       J. Altman, F. da Cruz         ||         
+#   RFC2841          ||       P. Metzger, W. Simpson         ||         
+#   RFC2842          ||       R. Chandra, J. Scudder         ||        rchandra@redback.com, jgs@cisco.com 
+#   RFC2843          ||       P. Droz, T. Przygienda         ||        dro@zurich.ibm.com, prz@siara.com 
+#   RFC2844          ||       T. Przygienda, P. Droz, R. Haas         ||        prz@siara.com, dro@zurich.ibm.com, rha@zurich.ibm.com 
+#   RFC2845          ||      P. Vixie, O. Gudmundsson, D. Eastlake 3rd, B. Wellington         ||       vixie@isc.org, ogud@tislabs.com, dee3@torque.pothole.com, Brian.Wellington@nominum.com
+#   RFC2846          ||       C. Allocchio         ||         
+#   RFC2847          ||       M. Eisler         ||        mike@eisler.com 
+#   RFC2848          ||       S. Petrack, L. Conroy         ||        scott.petrack@metatel.com, lwc@roke.co.uk 
+#   RFC2849          ||      G. Good         ||       ggood@netscape.com
+#   RFC2850          ||       Internet Architecture Board, B. Carpenter, Ed.         ||        brian@icair.org 
+#   RFC2851          ||       M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder         ||        daniele@zk3.dec.com, haberman@nortelnetworks.com, sar@epilogue.com, schoenw@ibr.cs.tu-bs.de 
+#   RFC2852          ||       D. Newman         ||        dan.newman@sun.com 
+#   RFC2853          ||      J. Kabat, M. Upadhyay         ||       jackk@valicert.com, mdu@eng.sun.com
+#   RFC2854          ||       D. Connolly, L. Masinter         ||        connolly@w3.org, LM@att.com 
+#   RFC2855          ||       K. Fujisawa         ||        fujisawa@sm.sony.co.jp 
+#   RFC2856          ||       A. Bierman, K. McCloghrie, R. Presuhn         ||       andy@yumaworks.com, kzm@cisco.com, rpresuhn@bmc.com 
+#   RFC2857          ||       A. Keromytis, N. Provos         ||        angelos@dsl.cis.upenn.edu, provos@citi.umich.edu, rgm@icsa.net, tytso@valinux.com 
+#   RFC2858          ||      T. Bates, Y. Rekhter, R. Chandra, D. Katz         ||       tbates@cisco.com, rchandra@redback.com, dkatz@jnx.com, yakov@cisco.com
+#   RFC2859          ||       W. Fang, N. Seddigh, B. Nandy         ||        wfang@cs.princeton.edu, nseddigh@nortelnetworks.com, bnandy@nortelnetworks.com 
+#   RFC2860          ||       B. Carpenter, F. Baker, M. Roberts         ||        brian@icair.org, fred@cisco.com, roberts@icann.org 
+#   RFC2861          ||      M. Handley, J. Padhye, S. Floyd         ||       mjh@aciri.org, padhye@aciri.org, floyd@aciri.org
+#   RFC2862          ||       M. Civanlar, G. Cash         ||        civanlar@research.att.com, glenn@research.att.com 
+#   RFC2863          ||       K. McCloghrie, F. Kastenholz         ||        kzm@cisco.com, kasten@argon.com 
+#   RFC2864          ||       K. McCloghrie, G. Hanson         ||        kzm@cisco.com, gary_hanson@adc.com 
+#   RFC2865          ||      C. Rigney, S. Willens, A. Rubens, W. Simpson         ||       cdr@telemancy.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com
+#   RFC2866          ||      C. Rigney         ||       cdr@telemancy.com
+#   RFC2867          ||       G. Zorn, B. Aboba, D. Mitton         ||        gwz@cisco.com, dmitton@nortelnetworks.com, aboba@internaut.com 
+#   RFC2868          ||      G. Zorn, D. Leifer, A. Rubens, J. Shriver, M. Holdrege, I. Goyret         ||       gwz@cisco.com, leifer@del.com, John.Shriver@intel.com, acr@del.com, matt@ipverse.com, igoyret@lucent.com
+#   RFC2869          ||      C. Rigney, W. Willats, P. Calhoun         ||       cdr@telemancy.com, ward@cyno.com, pcalhoun@eng.sun.com, arubens@tutsys.com, bernarda@microsoft.com
+#   RFC2870          ||      R. Bush, D. Karrenberg, M. Kosters, R. Plzak         ||       randy@psg.com, daniel.karrenberg@ripe.net, markk@netsol.com, plzakr@saic.com
+#   RFC2871          ||       J. Rosenberg, H. Schulzrinne         ||         
+#   RFC2872          ||       Y. Bernet, R. Pabbati         ||        yoramb@microsoft.com, rameshpa@microsoft.com 
+#   RFC2873          ||       X. Xiao, A. Hannan, V. Paxson, E. Crabbe         ||        xipeng@gblx.net, alan@ivmg.net, edc@explosive.net, vern@aciri.org 
+#   RFC2874          ||      M. Crawford, C. Huitema         ||       crawdad@fnal.gov, huitema@microsoft.com
+#   RFC2875          ||      H. Prafullchandra, J. Schaad         ||       hemma@cp.net, jimsch@exmsft.com
+#   RFC2876          ||       J. Pawling         ||        john.pawling@wang.com 
+#   RFC2877          ||      T. Murphy Jr., P. Rieth, J. Stevens         ||       murphyte@us.ibm.com, rieth@us.ibm.com, jssteven@us.ibm.com
+#   RFC2878          ||       M. Higashiyama, F. Baker         ||        Mitsuru.Higashiyama@yy.anritsu.co.jp, fred.baker@cisco.com 
+#   RFC2879          ||       G. Klyne, L. McIntyre         ||        GK@ACM.ORG, Lloyd.McIntyre@pahv.xerox.com 
+#   RFC2880          ||       L. McIntyre, G. Klyne         ||        Lloyd.McIntyre@pahv.xerox.com, GK@ACM.ORG 
+#   RFC2881          ||       D. Mitton, M. Beadles         ||        dmitton@nortelnetworks.com, mbeadles@smartpipes.com 
+#   RFC2882          ||       D. Mitton         ||        dmitton@nortelnetworks.com 
+#   RFC2883          ||       S. Floyd, J. Mahdavi, M. Mathis, M. Podolsky         ||        floyd@aciri.org, mahdavi@novell.com, mathis@psc.edu, podolsky@eecs.berkeley.edu 
+#   RFC2884          ||       J. Hadi Salim, U. Ahmed         ||        hadi@nortelnetworks.com, ahmed@sce.carleton.ca 
+#   RFC2885          ||       F. Cuervo, N. Greene, C. Huitema, A. Rayhan, B. Rosen, J. Segers         ||         
+#   RFC2886          ||      T. Taylor         ||       tom.taylor.stds@gmail.com
+#   RFC2887          ||       M. Handley, S. Floyd, B. Whetten, R. Kermode, L. Vicisano, M. Luby         ||        mjh@aciri.org, floyd@aciri.org, whetten@talarian.com, Roger.Kermode@motorola.com, lorenzo@cisco.com, luby@digitalfountain.com 
+#   RFC2888          ||       P. Srisuresh         ||        srisuresh@yahoo.com 
+#   RFC2889          ||       R. Mandeville, J. Perser         ||        bob@cqos.com, jerry_perser@netcomsystems.com 
+#   RFC2890          ||      G. Dommety         ||       gdommety@cisco.com
+#   RFC2891          ||       T. Howes, M. Wahl, A. Anantha         ||        anoopa@microsoft.com, howes@loudcloud.com, Mark.Wahl@sun.com 
+#   RFC2892          ||       D. Tsiang, G. Suwala         ||        tsiang@cisco.com, gsuwala@cisco.com 
+#   RFC2893          ||       R. Gilligan, E. Nordmark         ||        gilligan@freegate.com, nordmark@eng.sun.com 
+#   RFC2894          ||       M. Crawford         ||        crawdad@fnal.gov 
+#   RFC2895          ||       A. Bierman, C. Bucci, R. Iddon         ||       andy@yumaworks.com, cbucci@cisco.com 
+#   RFC2896          ||       A. Bierman, C. Bucci, R. Iddon         ||        andy@yumaworks.com, cbucci@cisco.com 
+#   RFC2897          ||       D. Cromwell         ||        cromwell@nortelnetworks.com 
+#   RFC2898          ||      B. Kaliski         ||       bkaliski@rsasecurity.com
+#   RFC2899          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC2900          ||       J. Reynolds, R. Braden, S. Ginoza         ||         
+#   RFC2901          ||       Z. Wenzel, J. Klensin, R. Bush, S. Huter         ||        zita@nsrc.org, klensin@nsrc.org, randy@nsrc.org, sghuter@nsrc.org 
+#   RFC2902          ||       S. Deering, S. Hares, C. Perkins, R. Perlman         ||        deering@cisco.com, skh@nexthop.com, Radia.Perlman@sun.com, Charles.Perkins@nokia.com 
+#   RFC2903          ||       C. de Laat, G. Gross, L. Gommans, J. Vollbrecht, D. Spence         ||        delaat@phys.uu.nl, gmgross@lucent.com, jrv@interlinknetworks.com, dspence@interlinknetworks.com 
+#   RFC2904          ||       J. Vollbrecht, P. Calhoun, S. Farrell, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence         ||        pcalhoun@eng.sun.com, stephen.farrell@baltimore.ie, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com 
+#   RFC2905          ||       J. Vollbrecht, P. Calhoun, S. Farrell, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence         ||        jrv@interlinknetworks.com, pcalhoun@eng.sun.com, stephen.farrell@baltimore.ie, gmgross@lucent.com, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com 
+#   RFC2906          ||       S. Farrell, J. Vollbrecht, P. Calhoun, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence         ||        stephen.farrell@baltimore.ie, jrv@interlinknetworks.com, pcalhoun@eng.sun.com, gmgross@lucent.com, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com 
+#   RFC2907          ||       R. Kermode         ||        Roger.Kermode@motorola.com 
+#   RFC2908          ||      D. Thaler, M. Handley, D. Estrin         ||       dthaler@microsoft.com, mjh@aciri.org, estrin@usc.edu
+#   RFC2909          ||      P. Radoslavov, D. Estrin, R. Govindan, M. Handley, S. Kumar, D. Thaler         ||       pavlin@catarina.usc.edu, estrin@isi.edu, govindan@isi.edu, mjh@aciri.org, kkumar@usc.edu, dthaler@microsoft.com
+#   RFC2910          ||      R. Herriot, Ed., S. Butler, P. Moore, R. Turner, J. Wenn         ||       robert.herriot@pahv.xerox.com, sbutler@boi.hp.com, pmoore@peerless.com, jwenn@cp10.es.xerox.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com
+#   RFC2911          ||      T. Hastings, Ed., R. Herriot, R. deBry, S. Isaacson, P. Powell         ||       sisaacson@novell.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com, debryro@uvsc.edu, papowell@astart.com
+#   RFC2912          ||       G. Klyne         ||        GK@ACM.ORG 
+#   RFC2913          ||       G. Klyne         ||        GK@ACM.ORG 
+#   RFC2914          ||      S. Floyd         ||       
+#   RFC2915          ||       M. Mealling, R. Daniel         ||        michaelm@netsol.com, rdaniel@datafusion.net 
+#   RFC2916          ||      P. Faltstrom         ||       paf@cisco.com
+#   RFC2917          ||       K. Muthukrishnan, A. Malis         ||        mkarthik@lucent.com, Andy.Malis@vivacenetworks.com 
+#   RFC2918          ||      E. Chen         ||       enke@redback.com
+#   RFC2919          ||      R. Chandhok, G. Wenger         ||       chandhok@qualcomm.com, gwenger@qualcomm.com
+#   RFC2920          ||       N. Freed         ||        ned.freed@innosoft.com 
+#   RFC2921          ||       B. Fink         ||        fink@es.net 
+#   RFC2922          ||       A. Bierman, K. Jones         ||       andy@yumaworks.com, kejones@nortelnetworks.com 
+#   RFC2923          ||       K. Lahey         ||         
+#   RFC2924          ||       N. Brownlee, A. Blount         ||        n.brownlee@auckland.ac.nz, blount@alum.mit.edu 
+#   RFC2925          ||       K. White         ||        wkenneth@us.ibm.com 
+#   RFC2926          ||       J. Kempf, R. Moats, P. St. Pierre         ||        james.kempf@sun.com, rmoats@coreon.net, Pete.StPierre@Eng.Sun.COM 
+#   RFC2927          ||       M. Wahl         ||        Mark.Wahl@sun.com 
+#   RFC2928          ||      R. Hinden, S. Deering, R. Fink, T. Hain         ||       bob.hinden@gmail.com, deering@cisco.com, rlfink@lbl.gov, tonyhain@microsoft.com
+#   RFC2929          ||      D. Eastlake 3rd, E. Brunner-Williams, B. Manning         ||       Donald.Eastlake@motorola.com, brunner@engage.com, bmanning@isi.edu
+#   RFC2930          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC2931          ||       D. Eastlake 3rd         ||        Donald.Eastlake@motorola.com 
+#   RFC2932          ||      K. McCloghrie, D. Farinacci, D. Thaler         ||       kzm@cisco.com, dthaler@microsoft.com
+#   RFC2933          ||      K. McCloghrie, D. Farinacci, D. Thaler         ||       kzm@cisco.com, dthaler@microsoft.com
+#   RFC2934          ||       K. McCloghrie, D. Farinacci, D. Thaler, B. Fenner         ||        kzm@cisco.com, dthaler@microsoft.com, fenner@research.att.com 
+#   RFC2935          ||       D. Eastlake 3rd, C. Smith         ||        Donald.Eastlake@motorola.com, chris.smith@royalbank.com 
+#   RFC2936          ||       D. Eastlake 3rd, C. Smith, D. Soroka         ||        Donald.Eastlake@motorola.com, chris.smith@royalbank.com, dsoroka@us.ibm.com 
+#   RFC2937          ||       C. Smith         ||        cs@Eng.Sun.COM 
+#   RFC2938          ||       G. Klyne, L. Masinter         ||        GK@ACM.ORG, LMM@acm.org 
+#   RFC2939          ||      R. Droms         ||       droms@bucknell.edu
+#   RFC2940          ||       A. Smith, D. Partain, J. Seligson         ||        David.Partain@ericsson.com, jseligso@nortelnetworks.com 
+#   RFC2941          ||       T. Ts'o, Ed., J. Altman         ||        tytso@mit.edu, jaltman@columbia.edu 
+#   RFC2942          ||       T. Ts'o         ||         
+#   RFC2943          ||       R. Housley, T. Horting, P. Yee         ||        housley@spyrus.com, thorting@spyrus.com, yee@spyrus.com 
+#   RFC2944          ||       T. Wu         ||        tjw@cs.Stanford.EDU 
+#   RFC2945          ||       T. Wu         ||        tjw@cs.Stanford.EDU 
+#   RFC2946          ||       T. Ts'o         ||        tytso@mit.edu 
+#   RFC2947          ||       J. Altman         ||        jaltman@columbia.edu 
+#   RFC2948          ||       J. Altman         ||        jaltman@columbia.edu 
+#   RFC2949          ||       J. Altman         ||        jaltman@columbia.edu 
+#   RFC2950          ||       J. Altman         ||        jaltman@columbia.edu 
+#   RFC2951          ||       R. Housley, T. Horting, P. Yee         ||        housley@spyrus.com, thorting@spyrus.com, yee@spyrus.com 
+#   RFC2952          ||       T. Ts'o         ||        tytso@mit.edu 
+#   RFC2953          ||       T. Ts'o         ||        tytso@mit.edu 
+#   RFC2954          ||       K. Rehbehn, D. Fowler         ||        krehbehn@megisto.com, fowler@syndesis.com 
+#   RFC2955          ||       K. Rehbehn, O. Nicklass, G. Mouradian         ||        krehbehn@megisto.com, orly_n@rad.co.il, gvm@att.com 
+#   RFC2956          ||       M. Kaat         ||        Marijke.Kaat@surfnet.nl 
+#   RFC2957          ||       L. Daigle, P. Faltstrom         ||        paf@cisco.com 
+#   RFC2958          ||       L. Daigle, P. Faltstrom         ||        paf@cisco.com 
+#   RFC2959          ||       M. Baugher, B. Strahm, I. Suconick         ||        mbaugher@passedge.com, Bill.Strahm@intel.com, irina@ennovatenetworks.com 
+#   RFC2960          ||      R. Stewart, Q. Xie, K. Morneault, C. Sharp, H. Schwarzbauer, T. Taylor, I. Rytina, M. Kalla, L. Zhang, V. Paxson         ||       randall@lakerest.net, qxie1@email.mot.com, kmorneau@cisco.com, chsharp@cisco.com, HannsJuergen.Schwarzbauer@icn.siemens.de, tom.taylor.stds@gmail.com, ian.rytina@ericsson.com, mkalla@telcordia.com, lixia@cs.ucla.edu, vern@aciri.org
+#   RFC2961          ||      L. Berger, D. Gan, G. Swallow, P. Pan, F. Tommasi, S. Molendini         ||       lberger@labn.net, swallow@cisco.com, franco.tommasi@unile.it, molendini@ultra5.unile.it
+#   RFC2962          ||       D. Raz, J. Schoenwaelder, B. Sugla         ||        raz@lucent.com, schoenw@ibr.cs.tu-bs.de, sugla@ispsoft.com 
+#   RFC2963          ||       O. Bonaventure, S. De Cnodder         ||        Olivier.Bonaventure@info.fundp.ac.be, stefaan.de_cnodder@alcatel.be 
+#   RFC2964          ||       K. Moore, N. Freed         ||        moore@cs.utk.edu, ned.freed@innosoft.com 
+#   RFC2965          ||      D. Kristol, L. Montulli         ||       
+#   RFC2966          ||      T. Li, T. Przygienda, H. Smit         ||       tli@procket.com, prz@redback.com, henk@procket.com
+#   RFC2967          ||       L. Daigle, R. Hedberg         ||        leslie@thinkingcat.com, Roland@catalogix.se 
+#   RFC2968          ||       L. Daigle, T. Eklof         ||        leslie@thinkingcat.com, thommy.eklof@hotsip.com 
+#   RFC2969          ||       T. Eklof, L. Daigle         ||        thommy.eklof@hotsip.com, leslie@thinkingcat.com 
+#   RFC2970          ||       L. Daigle, T. Eklof         ||        leslie@thinkingcat.com, thommy.eklof@hotsip.com 
+#   RFC2971          ||       T. Showalter         ||        tjs@mirapoint.com 
+#   RFC2972          ||       N. Popp, M. Mealling, L. Masinter, K. Sollins         ||        LMM@acm.org, michaelm@netsol.com, nico@realnames.com, sollins@lcs.mit.edu 
+#   RFC2973          ||       R. Balay, D. Katz, J. Parker         ||        Rajesh.Balay@cosinecom.com, dkatz@juniper.net, jparker@axiowave.com 
+#   RFC2974          ||       M. Handley, C. Perkins, E. Whelan         ||        mjh@aciri.org, csp@isi.edu, e.whelan@cs.ucl.ac.uk 
+#   RFC2975          ||       B. Aboba, J. Arkko, D. Harrington         ||        bernarda@microsoft.com, Jari.Arkko@ericsson.com, dbh@cabletron.com 
+#   RFC2976          ||      S. Donovan         ||       
+#   RFC2977          ||       S. Glass, T. Hiller, S. Jacobs, C. Perkins         ||         
+#   RFC2978          ||       N. Freed, J. Postel         ||        ned.freed@innosoft.com 
+#   RFC2979          ||       N. Freed         ||        ned.freed@innosoft.com 
+#   RFC2980          ||      S. Barber         ||       sob@academ.com
+#   RFC2981          ||      R. Kavasseri, Ed.         ||       ramk@cisco.com 
+#   RFC2982          ||      R. Kavasseri, Ed.         ||       ramk@cisco.com 
+#   RFC2983          ||       D. Black         ||        black_david@emc.com 
+#   RFC2984          ||       C. Adams         ||        cadams@entrust.com 
+#   RFC2985          ||       M. Nystrom, B. Kaliski         ||        magnus@rsasecurity.com, bkaliski@rsasecurity.com 
+#   RFC2986          ||      M. Nystrom, B. Kaliski         ||       magnus@rsasecurity.com, bkaliski@rsasecurity.com
+#   RFC2987          ||       P. Hoffman         ||        phoffman@imc.org 
+#   RFC2988          ||      V. Paxson, M. Allman         ||       vern@aciri.org, mallman@grc.nasa.gov
+#   RFC2989          ||      B. Aboba, P. Calhoun, S. Glass, T. Hiller, P. McCann, H. Shiino, P. Walsh, G. Zorn, G. Dommety, C. Perkins, B. Patil, D. Mitton, S. Manning, M. Beadles, X. Chen, S. Sivalingham, A. Hameed, M. Munson, S. Jacobs, B. Lim, B. Hirschman, R. Hsu, H. Koo, M. Lipford, E. Campbell, Y. Xu, S. Baba, E. Jaques         ||       bernarda@microsoft.com, pcalhoun@eng.sun.com, steven.glass@sun.com, tom.hiller@lucent.com, mccap@lucent.com, hshiino@lucent.com, walshp@lucent.com, gwz@cisco.com, gdommety@cisco.com, charliep@iprg.nokia.com, Basavaraj.Patil@nokia.com, dmitton@nortelnetworks.com, smanning@nortelnetworks.com, mbeadles@smartpipes.com, xing.chen@usa.alcatel.com, s.sivalingham@ericsson.com, none, mmunson@mobilnet.gte.com, sjacobs@gte.com, bklim@lgic.co.kr, qa4053@email.mot.com, rhsu@qualcomm.com, hskoo@sta.samsung.com, mlipfo01@sprintspectrum.com, ed_campbell@3com.com, yxu@watercove.com, sbaba@tari.toshiba.com, ejaques@akamail.com
+#   RFC2990          ||       G. Huston         ||        gih@telstra.net 
+#   RFC2991          ||       D. Thaler, C. Hopps         ||        dthaler@dthaler.microsoft.com, chopps@nexthop.com 
+#   RFC2992          ||       C. Hopps         ||        chopps@nexthop.com 
+#   RFC2993          ||       T. Hain         ||        tonyhain@microsoft.com 
+#   RFC2994          ||       H. Ohta, M. Matsui         ||        hidenori@iss.isl.melco.co.jp, matsui@iss.isl.melco.co.jp 
+#   RFC2995          ||       H. Lu, Ed., I. Faynberg, J. Voelker, M. Weissman, W. Zhang, S. Rhim, J. Hwang, S. Ago, S. Moeenuddin, S. Hadvani, S. Nyckelgard, J. Yoakum, L. Robart         ||        faynberg@lucent.com, huilanlu@lucent.com, jvoelker@lucent.com, maw1@lucent.com, wzz@lucent.com, syrhim@kt.co.kr, jkhwang@kt.co.kr, ago@ssf.abk.nec.co.jp, moeen@asl.dl.nec.com, hadvani@asl.dl.nec.com, soren.m.nyckelgard@telia.se, yoakum@nortelnetworks.com, robart@nortelnetworks.com 
+#   RFC2996          ||       Y. Bernet         ||        yoramb@microsoft.com 
+#   RFC2997          ||       Y. Bernet, A. Smith, B. Davie         ||        Yoramb@microsoft.com, bsd@cisco.com 
+#   RFC2998          ||       Y. Bernet, P. Ford, R. Yavatkar, F. Baker, L. Zhang, M. Speer, R. Braden, B. Davie, J. Wroclawski, E. Felstaine         ||        yoramb@microsoft.com, raj.yavatkar@intel.com, peterf@microsoft.com, fred@cisco.com, lixia@cs.ucla.edu, speer@Eng.Sun.COM, braden@isi.edu, bsd@cisco.com, jtw@lcs.mit.edu 
+#   RFC2999          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC3000          ||      J. Reynolds, R. Braden, S. Ginoza, L. Shiota         ||       
+#   RFC3001          ||       M. Mealling         ||        michaelm@netsol.com 
+#   RFC3002          ||       D. Mitzel         ||        mitzel@iprg.nokia.com 
+#   RFC3003          ||       M. Nilsson         ||        nilsson@id3.org 
+#   RFC3004          ||       G. Stump, R. Droms, Y. Gu, R. Vyaghrapuri, A. Demirtjis, B. Beser, J. Privat         ||        stumpga@us.ibm.com, rdroms@cisco.com, yegu@microsoft.com, rameshv@microsoft.com, annd@microsoft.com 
+#   RFC3005          ||       S. Harris         ||        srh@merit.edu 
+#   RFC3006          ||       B. Davie, C. Iturralde, D. Oran, S. Casner, J. Wroclawski         ||        bsd@cisco.com, cei@cisco.com, oran@cisco.com, casner@acm.org, jtw@lcs.mit.edu 
+#   RFC3007          ||      B. Wellington         ||       Brian.Wellington@nominum.com
+#   RFC3008          ||       B. Wellington         ||        Brian.Wellington@nominum.com 
+#   RFC3009          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu
+#   RFC3010          ||       S. Shepler, B. Callaghan, D. Robinson, R. Thurlow, C. Beame, M. Eisler, D. Noveck         ||        beame@bws.com, brent.callaghan@sun.com, mike@eisler.com, david.robinson@sun.com, robert.thurlow@sun.com 
+#   RFC3011          ||       G. Waters         ||         
+#   RFC3012          ||       C. Perkins, P. Calhoun         ||         
+#   RFC3013          ||       T. Killalea         ||        tomk@neart.org 
+#   RFC3014          ||       R. Kavasseri         ||        ramk@cisco.com 
+#   RFC3015          ||       F. Cuervo, N. Greene, A. Rayhan, C. Huitema, B. Rosen, J. Segers         ||         
+#   RFC3016          ||      Y. Kikuchi, T. Nomura, S. Fukunaga, Y. Matsui, H. Kimata         ||       yoshihiro.kikuchi@toshiba.co.jp, matsui@drl.mei.co.jp, t-nomura@ccm.cl.nec.co.jp, fukunaga444@oki.co.jp, kimata@nttvdt.hil.ntt.co.jp
+#   RFC3017          ||       M. Riegel, G. Zorn         ||        maximilian.riegel@icn.siemens.de, gwz@cisco.com 
+#   RFC3018          ||       A. Bogdanov         ||        a_bogdanov@iname.ru 
+#   RFC3019          ||      B. Haberman, R. Worzella         ||       haberman@nortelnetworks.com, worzella@us.ibm.com
+#   RFC3020          ||       P. Pate, B. Lynch, K. Rehbehn         ||        prayson.pate@overturenetworks.com, bob.lynch@overturenetworks.com, krehbehn@megisto.com 
+#   RFC3021          ||       A. Retana, R. White, V. Fuller, D. McPherson         ||        aretana@cisco.com, riw@cisco.com, vaf@valinor.barrnet.net, danny@ambernetworks.com 
+#   RFC3022          ||       P. Srisuresh, K. Egevang         ||        srisuresh@yahoo.com, kjeld.egevang@intel.com 
+#   RFC3023          ||      M. Murata, S. St. Laurent, D. Kohn         ||       mmurata@trl.ibm.co.jp, simonstl@simonstl.com, dan@dankohn.com
+#   RFC3024          ||       G. Montenegro, Ed.         ||         
+#   RFC3025          ||       G. Dommety, K. Leung         ||        gdommety@cisco.com, kleung@cisco.com 
+#   RFC3026          ||       R. Blane         ||        Roy_Blane@inmarsat.com 
+#   RFC3027          ||       M. Holdrege, P. Srisuresh         ||        matt@ipverse.com, srisuresh@yahoo.com 
+#   RFC3028          ||      T. Showalter         ||       tjs@mirapoint.com
+#   RFC3029          ||       C. Adams, P. Sylvester, M. Zolotarev, R. Zuccherato         ||        cadams@entrust.com, mzolotarev@baltimore.com, peter.sylvester@edelweb.fr, robert.zuccherato@entrust.com 
+#   RFC3030          ||       G. Vaudreuil         ||        GregV@ieee.org 
+#   RFC3031          ||      E. Rosen, A. Viswanathan, R. Callon         ||       erosen@cisco.com, arun@force10networks.com, rcallon@juniper.net
+#   RFC3032          ||      E. Rosen, D. Tappan, G. Fedorkow, Y. Rekhter, D. Farinacci, T. Li, A. Conta         ||       erosen@cisco.com, tappan@cisco.com, yakov@juniper.net, fedorkow@cisco.com, dino@procket.com, tli@procket.com, aconta@txc.com
+#   RFC3033          ||       M. Suzuki         ||        suzuki.muneyoshi@lab.ntt.co.jp 
+#   RFC3034          ||       A. Conta, P. Doolan, A. Malis         ||        aconta@txc.com, pdoolan@ennovatenetworks.com, Andy.Malis@vivacenetworks.com 
+#   RFC3035          ||       B. Davie, J. Lawrence, K. McCloghrie, E. Rosen, G. Swallow, Y. Rekhter, P. Doolan         ||        bsd@cisco.com, pdoolan@ennovatenetworks.com, jlawrenc@cisco.com, kzm@cisco.com, yakov@juniper.net, erosen@cisco.com, swallow@cisco.com 
+#   RFC3036          ||      L. Andersson, P. Doolan, N. Feldman, A. Fredette, B. Thomas         ||       loa.andersson@nortelnetworks.com, pdoolan@ennovatenetworks.com, nkf@us.ibm.com, fredette@photonex.com, rhthomas@cisco.com
+#   RFC3037          ||       B. Thomas, E. Gray         ||        ewgray@mindspring.com, rhthomas@cisco.com 
+#   RFC3038          ||      K. Nagami, Y. Katsube, N. Demizu, H. Esaki, P. Doolan         ||       ken.nagami@toshiba.co.jp, demizu@dd.iij4u.or.jp, hiroshi@wide.ad.jp, yasuhiro.katsube@toshiba.co.jp, pdoolan@ennovatenetworks.com
+#   RFC3039          ||       S. Santesson, W. Polk, P. Barzin, M. Nystrom         ||        stefan@addtrust.com, wpolk@nist.gov, barzin@secude.com, magnus@rsasecurity.com 
+#   RFC3040          ||       I. Cooper, I. Melve, G. Tomlinson         ||        icooper@equinix.com, Ingrid.Melve@uninett.no, gary.tomlinson@cacheflow.com 
+#   RFC3041          ||      T. Narten, R. Draves         ||       narten@raleigh.ibm.com, richdr@microsoft.com
+#   RFC3042          ||       M. Allman, H. Balakrishnan, S. Floyd         ||        mallman@grc.nasa.gov, hari@lcs.mit.edu, floyd@aciri.org 
+#   RFC3043          ||       M. Mealling         ||        michaelm@netsol.com 
+#   RFC3044          ||       S. Rozenfeld         ||         
+#   RFC3045          ||       M. Meredith         ||        mark_meredith@novell.com 
+#   RFC3046          ||      M. Patrick         ||       michael.patrick@motorola.com
+#   RFC3047          ||      P. Luthi         ||       luthip@pictel.com
+#   RFC3048          ||       B. Whetten, L. Vicisano, R. Kermode, M. Handley, S. Floyd, M. Luby         ||        whetten@talarian.com, lorenzo@cisco.com, Roger.Kermode@motorola.com, mjh@aciri.org, luby@digitalfountain.com 
+#   RFC3049          ||       J. Naugle, K. Kasthurirangan, G. Ledford         ||        jnaugle@us.ibm.com, kasthuri@us.ibm.com, gledford@zephyrcorp.com 
+#   RFC3050          ||       J. Lennox, H. Schulzrinne, J. Rosenberg         ||        lennox@cs.columbia.edu, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu 
+#   RFC3051          ||       J. Heath, J. Border         ||        jheath@hns.com, border@hns.com 
+#   RFC3052          ||       M. Eder, S. Nag         ||        michael.eder@nokia.com, thinker@monmouth.com 
+#   RFC3053          ||       A. Durand, P. Fasano, I. Guardini, D. Lento         ||        Alain.Durand@sun.com, paolo.fasano@cselt.it, ivano.guardini@cselt.it, dlento@mail.tim.it 
+#   RFC3054          ||       P. Blatherwick, R. Bell, P. Holland         ||        blather@nortelnetworks.com, rtbell@cisco.com, phil.holland@circa.ca 
+#   RFC3055          ||       M. Krishnaswamy, D. Romascanu         ||        murali@lucent.com, dromasca@gmail.com  
+#   RFC3056          ||       B. Carpenter, K. Moore         ||        brian@icair.org, moore@cs.utk.edu 
+#   RFC3057          ||       K. Morneault, S. Rengasami, M. Kalla, G. Sidebottom         ||        kmorneau@cisco.com, mkalla@telcordia.com, srengasa@telcordia.com, gregside@nortelnetworks.com 
+#   RFC3058          ||       S. Teiwes, P. Hartmann, D. Kuenzi         ||        stephan.teiwes@it-sec.com, peter.hartmann@it-sec.com, dkuenzi@724.com 
+#   RFC3059          ||       E. Guttman         ||        Erik.Guttman@sun.com 
+#   RFC3060          ||       B. Moore, E. Ellesson, J. Strassner, A. Westerinen         ||        eellesson@lboard.com, remoore@us.ibm.com, johns@cisco.com, andreaw@cisco.com 
+#   RFC3061          ||       M. Mealling         ||        michaelm@netsol.com 
+#   RFC3062          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
+#   RFC3063          ||       Y. Ohba, Y. Katsube, E. Rosen, P. Doolan         ||        yoshihiro.ohba@toshiba.co.jp, yasuhiro.katsube@toshiba.co.jp, erosen@cisco.com, pdoolan@ennovatenetworks.com 
+#   RFC3064          ||       B. Foster         ||        bfoster@cisco.com 
+#   RFC3065          ||      P. Traina, D. McPherson, J. Scudder         ||       danny@ambernetworks.com, jgs@cisco.com
+#   RFC3066          ||       H. Alvestrand         ||        Harald@Alvestrand.no 
+#   RFC3067          ||       J. Arvidsson, A. Cormack, Y. Demchenko, J. Meijer         ||        Jimmy.J.Arvidsson@telia.se, Andrew.Cormack@ukerna.ac.uk, demch@terena.nl, jan.meijer@surfnet.nl 
+#   RFC3068          ||      C. Huitema         ||       huitema@microsoft.com
+#   RFC3069          ||       D. McPherson, B. Dykes         ||        danny@ambernetworks.com, bdykes@onesecure.com 
+#   RFC3070          ||       V. Rawat, R. Tio, S. Nanji, R. Verma         ||        vrawat@oni.com, tor@redback.com, rverma@dc.com, suhail@redback.com 
+#   RFC3071          ||       J. Klensin         ||        klensin@jck.com 
+#   RFC3072          ||       M. Wildgrube         ||        max@wildgrube.com 
+#   RFC3073          ||       J. Collins         ||        jcollins@bitstream.com 
+#   RFC3074          ||       B. Volz, S. Gonczi, T. Lemon, R. Stevens         ||        bernie.volz@ericsson.com, steve.gonczi@networkengines.com, ted.lemon@nominum.com, robs@join.com 
+#   RFC3075          ||       D. Eastlake 3rd, J. Reagle, D. Solo         ||        Donald.Eastlake@motorola.com, reagle@w3.org, dsolo@alum.mit.edu 
+#   RFC3076          ||       J. Boyer         ||        jboyer@PureEdge.com 
+#   RFC3077          ||       E. Duros, W. Dabbous, H. Izumiyama, N. Fujii, Y. Zhang         ||         
+#   RFC3078          ||       G. Pall, G. Zorn         ||        gurdeep@microsoft.com, gwz@cisco.com 
+#   RFC3079          ||       G. Zorn         ||        gwz@cisco.com 
+#   RFC3080          ||      M. Rose         ||       mrose17@gmail.com
+#   RFC3081          ||       M. Rose         ||       mrose17@gmail.com
+#   RFC3082          ||       J. Kempf, J. Goldschmidt         ||        james.kempf@sun.com, jason.goldschmidt@sun.com 
+#   RFC3083          ||       R. Woundy         ||        rwoundy@cisco.com 
+#   RFC3084          ||      K. Chan, J. Seligson, D. Durham, S. Gai, K. McCloghrie, S. Herzog, F. Reichmeyer, R. Yavatkar, A. Smith         ||       khchan@nortelnetworks.com, sgai@cisco.com, Herzog@iphighway.com, kzm@cisco.com, franr@pfn.com, raj.yavatkar@intel.com, andrew@allegronetworks.com
+#   RFC3085          ||       A. Coates, D. Allen, D. Rivers-Moore         ||        tony.coates@reuters.com, ho73@dial.pipex.com, daniel.rivers-moore@rivcom.com 
+#   RFC3086          ||       K. Nichols, B. Carpenter         ||        nichols@packetdesign.com, brian@icair.org 
+#   RFC3087          ||       B. Campbell, R. Sparks         ||        bcampbell@dynamicsoft.com, rsparks@dynamicsoft.com 
+#   RFC3088          ||       K. Zeilenga         ||        kurt@openldap.org 
+#   RFC3089          ||       H. Kitamura         ||        kitamura@da.jp.nec.com 
+#   RFC3090          ||       E. Lewis         ||        lewis@tislabs.com 
+#   RFC3091          ||       H. Kennedy         ||        kennedyh@engin.umich.edu 
+#   RFC3092          ||      D. Eastlake 3rd, C. Manros, E. Raymond         ||       Donald.Eastlake@motorola.com, manros@cp10.es.xerox.com, esr@thyrsus.com
+#   RFC3093          ||       M. Gaynor, S. Bradner         ||         
+#   RFC3094          ||       D. Sprague, R. Benedyk, D. Brendes, J. Keller         ||        david.sprague@tekelec.com, dan.brendes@tekelec.com, robby.benedyk@tekelec.com, joe.keller@tekelec.com 
+#   RFC3095          ||       C. Bormann, C. Burmeister, M. Degermark, H. Fukushima, H. Hannu, L-E. Jonsson, R. Hakenberg, T. Koren, K. Le, Z. Liu, A. Martensson, A. Miyazaki, K. Svanbro, T. Wiebke, T. Yoshimura, H. Zheng         ||        cabo@tzi.org, burmeister@panasonic.de, micke@cs.arizona.edu, fukusima@isl.mei.co.jp, hans.hannu@ericsson.com, lars-erik.jonsson@ericsson.com, hakenberg@panasonic.de, tmima@cisco.com, khiem.le@nokia.com, zhigang.liu@nokia.com, anton.martensson@era.ericsson.se, akihiro@isl.mei.co.jp, krister.svanbro@ericsson.com, wiebke@panasonic.de, yoshi@spg.yrp.nttdocomo.co.jp, haihong.zheng@nokia.com 
+#   RFC3096          ||       M. Degermark, Ed.         ||         
+#   RFC3097          ||       R. Braden, L. Zhang         ||        Braden@ISI.EDU, lixia@cs.ucla.edu 
+#   RFC3098          ||       T. Gavin, D. Eastlake 3rd, S. Hambridge         ||        tedgavin@newsguy.com, Donald.Eastlake@motorola.com, sallyh@ludwig.sc.intel.com 
+#   RFC3099          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC3100          ||               ||         
+#   RFC3101          ||       P. Murphy         ||        pmurphy@noc.usgs.net 
+#   RFC3102          ||       M. Borella, J. Lo, D. Grabelsky, G. Montenegro         ||        mike_borella@commworks.com, yidarlo@yahoo.com, david_grabelsky@commworks.com, gab@sun.com 
+#   RFC3103          ||       M. Borella, D. Grabelsky, J. Lo, K. Taniguchi         ||        mike_borella@commworks.com, david_grabelsky@commworks.com, yidarlo@yahoo.com, taniguti@ccrl.sj.nec.com 
+#   RFC3104          ||       G. Montenegro, M. Borella         ||        gab@sun.com, mike_borella@commworks.com 
+#   RFC3105          ||       J. Kempf, G. Montenegro         ||        gab@sun.com 
+#   RFC3106          ||       D. Eastlake 3rd, T. Goldstein         ||        Donald.Eastlake@motorola.com, tgoldstein@brodia.com 
+#   RFC3107          ||      Y. Rekhter, E. Rosen         ||       yakov@juniper.net, erosen@cisco.com
+#   RFC3108          ||       R. Kumar, M. Mostafa         ||        rkumar@cisco.com, mmostafa@cisco.com 
+#   RFC3109          ||       R. Braden, R. Bush, J. Klensin         ||        braden@isi.edu, randy@psg.com, klensin@jck.com 
+#   RFC3110          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC3111          ||       E. Guttman         ||        Erik.Guttman@germany.sun.com 
+#   RFC3112          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
+#   RFC3113          ||       K. Rosenbrock, R. Sanmugam, S. Bradner, J. Klensin         ||        rosenbrock@etsi.fr, sob@harvard.edu, 3GPPContact@etsi.fr 
+#   RFC3114          ||      W. Nicolls         ||       wnicolls@forsythesolutions.com
+#   RFC3115          ||       G. Dommety, K. Leung         ||        gdommety@cisco.com, kleung@cisco.com 
+#   RFC3116          ||       J. Dunn, C. Martin         ||        Jeffrey.Dunn@worldnet.att.net, Cynthia.E.Martin@worldnet.att.net 
+#   RFC3117          ||       M. Rose         ||       mrose17@gmail.com
+#   RFC3118          ||      R. Droms, Ed., W. Arbaugh, Ed.         ||       
+#   RFC3119          ||      R. Finlayson         ||       finlayson@live.com
+#   RFC3120          ||       K. Best, N. Walsh         ||        karl.best@oasis-open.org, Norman.Walsh@East.Sun.COM 
+#   RFC3121          ||       K. Best, N. Walsh         ||        karl.best@oasis-open.org, Norman.Walsh@East.Sun.COM 
+#   RFC3122          ||       A. Conta         ||        aconta@txc.com 
+#   RFC3123          ||       P. Koch         ||        pk@TechFak.Uni-Bielefeld.DE 
+#   RFC3124          ||       H. Balakrishnan, S. Seshan         ||        hari@lcs.mit.edu, srini@cmu.edu 
+#   RFC3125          ||       J. Ross, D. Pinkas, N. Pope         ||        harri.rasilainen@etsi.fr, ross@secstan.com, Denis.Pinkas@bull.net, pope@secstan.com 
+#   RFC3126          ||      D. Pinkas, J. Ross, N. Pope         ||       harri.rasilainen@etsi.fr, Denis.Pinkas@bull.net, ross@secstan.com, pope@secstan.com
+#   RFC3127          ||       D. Mitton, M. St.Johns, S. Barkley, D. Nelson, B. Patil, M. Stevens, B. Wolff         ||        dmitton@nortelnetworks.com, stjohns@rainmakertechnologies.com, stuartb@uu.net, dnelson@enterasys.com, Basavaraj.Patil@nokia.com, mstevens@ellacoya.com, barney@databus.com 
+#   RFC3128          ||       I. Miller         ||        Ian_Miller@singularis.ltd.uk 
+#   RFC3129          ||       M. Thomas         ||        mat@cisco.com 
+#   RFC3130          ||       E. Lewis         ||         
+#   RFC3131          ||       S. Bradner, P. Calhoun, H. Cuschieri, S. Dennett, G. Flynn, M. Lipford, M. McPheters         ||        sob@harvard.edu, pcalhoun@eng.sun.com, hcuschie@tia.eia.org, S.Dennett@motorola.com, gerry.flynn@verizonwireless.com, mjmcpheters@lucent.com 
+#   RFC3132          ||       J. Kempf         ||         
+#   RFC3133          ||       J. Dunn, C. Martin         ||         
+#   RFC3134          ||       J. Dunn, C. Martin         ||         
+#   RFC3135          ||       J. Border, M. Kojo, J. Griner, G. Montenegro, Z. Shelby         ||        border@hns.com, kojo@cs.helsinki.fi, jgriner@grc.nasa.gov, gab@sun.com, zach.shelby@ee.oulu.fi 
+#   RFC3136          ||       L. Slutsman, Ed., I. Faynberg, H. Lu, M. Weissman         ||        faynberg@lucent.com, huilanlu@lucent.com, maw1@lucent.com, lslutsman@att.com 
+#   RFC3137          ||      A. Retana, L. Nguyen, R. White, A. Zinin, D. McPherson         ||       aretana@cisco.com, lhnguyen@cisco.com, riw@cisco.com, azinin@nexsi.com, danny@ambernetworks.com
+#   RFC3138          ||      D. Meyer         ||       dmm@sprint.net
+#   RFC3139          ||       L. Sanchez, K. McCloghrie, J. Saperia         ||        kzm@cisco.com, lsanchez@megisto.com, saperia@jdscons.com 
+#   RFC3140          ||       D. Black, S. Brim, B. Carpenter, F. Le Faucheur         ||        black_david@emc.com, sbrim@cisco.com, brian@icair.org, flefauch@cisco.com 
+#   RFC3141          ||       T. Hiller, P. Walsh, X. Chen, M. Munson, G. Dommety, S. Sivalingham, B. Lim, P. McCann, H. Shiino, B. Hirschman, S. Manning, R. Hsu, H. Koo, M. Lipford, P. Calhoun, C. Lo, E. Jaques, E. Campbell, Y.Xu,S.Baba,T.Ayaki,T.Seki,A.Hameed         ||        pcalhoun@eng.sun.com, gdommety@cisco.com, tom.hiller@lucent.com, rhsu@qualcomm.com, mlipfo01@sprintspectrum.com, serge@awardsolutions.com, mccap@lucent.com, mmunson@gte.net, hskoo@sta.samsung.com, walshp@lucent.com, yxu@watercove.com, qa4053@email.mot.com, ejaques@akamail.com, s.sivalingham@ericsson.com, xing.chen@usa.alcatel.com, bklim@lge.com, hshiino@lucent.com, sbaba@tari.toshiba.com, ayaki@ddi.co.jp, Charles.Lo@vodafone-us.com, t-seki@kddi.com 
+#   RFC3142          ||       J. Hagino, K. Yamamoto         ||        itojun@iijlab.net, kazu@iijlab.net 
+#   RFC3143          ||       I. Cooper, J. Dilley         ||        icooper@equinix.com, jad@akamai.com 
+#   RFC3144          ||       D. Romascanu         ||        dromasca@gmail.com  
+#   RFC3145          ||       R. Verma, M. Verma, J. Carlson         ||        rverma@dc.com, Madhvi_Verma@3com.com, james.d.carlson@sun.com 
+#   RFC3146          ||      K. Fujisawa, A. Onoe         ||       fujisawa@sm.sony.co.jp, onoe@sm.sony.co.jp
+#   RFC3147          ||       P. Christian         ||        christi@nortelnetworks.com 
+#   RFC3148          ||       M. Mathis, M. Allman         ||        mathis@psc.edu, mallman@bbn.com 
+#   RFC3149          ||       A. Srinath, G. Levendel, K. Fritz, R. Kalyanaram         ||        Ashok.Srinath@sylantro.com, Gil.Levendel@sylantro.com, Kent.Fritz@sylantro.com, Raghuraman.Kal@wipro.com 
+#   RFC3150          ||       S. Dawkins, G. Montenegro, M. Kojo, V. Magret         ||        spencer.dawkins@fnc.fujitsu.com, gab@sun.com, kojo@cs.helsinki.fi, vincent.magret@alcatel.com 
+#   RFC3151          ||       N. Walsh, J. Cowan, P. Grosso         ||        Norman.Walsh@East.Sun.COM, jcowan@reutershealth.com, pgrosso@arbortext.com 
+#   RFC3152          ||       R. Bush         ||        randy@psg.com 
+#   RFC3153          ||       R. Pazhyannur, I. Ali, C. Fox         ||        pazhynnr@cig.mot.com, fia225@email.mot.com, fox@cisco.com 
+#   RFC3154          ||       J. Kempf, C. Castelluccia, P. Mutaf, N. Nakajima, Y. Ohba, R. Ramjee, Y. Saifullah, B. Sarikaya, X. Xu         ||        James.Kempf@Sun.COM, pars.mutaf@inria.fr, claude.castelluccia@inria.fr, nnakajima@tari.toshiba.com, yohba@tari.toshiba.com, ramjee@bell-labs.com, Yousuf.Saifullah@nokia.com, Behcet.Sarikaya@usa.alcatel.com 
+#   RFC3155          ||       S. Dawkins, G. Montenegro, M. Kojo, V. Magret, N. Vaidya         ||        spencer.dawkins@fnc.fujitsu.com, gab@sun.com, kojo@cs.helsinki.fi, vincent.magret@alcatel.com 
+#   RFC3156          ||       M. Elkins, D. Del Torto, R. Levien, T. Roessler         ||         
+#   RFC3157          ||       A. Arsenault, S. Farrell         ||        aarsenault@dvnet.com, stephen.farrell@baltimore.ie 
+#   RFC3158          ||       C. Perkins, J. Rosenberg, H. Schulzrinne         ||        csp@isi.edu, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu 
+#   RFC3159          ||      K. McCloghrie, M. Fine, J. Seligson, K. Chan, S. Hahn, R. Sahita, A. Smith, F. Reichmeyer         ||       mfine@cisco.com, jseligso@nortelnetworks.com, khchan@nortelnetworks.com, scott.hahn@intel.com, ravi.sahita@intel.com, andrew@allegronetworks.com, franr@pfn.com
+#   RFC3160          ||      S. Harris         ||       
+#   RFC3161          ||      C. Adams, P. Cain, D. Pinkas, R. Zuccherato         ||       cadams@entrust.com, pcain@bbn.com, Denis.Pinkas@bull.net, robert.zuccherato@entrust.com
+#   RFC3162          ||      B. Aboba, G. Zorn, D. Mitton         ||       bernarda@microsoft.com, gwz@cisco.com
+#   RFC3163          ||       R. Zuccherato, M. Nystrom         ||        robert.zuccherato@entrust.com, magnus@rsasecurity.com 
+#   RFC3164          ||      C. Lonvick         ||       clonvick@cisco.com
+#   RFC3165          ||       D. Levi, J. Schoenwaelder         ||         
+#   RFC3166          ||       D. Meyer, J. Scudder         ||        dmm@sprint.net, jgs@cisco.com 
+#   RFC3167          ||       D. Meyer, J. Scudder         ||        dmm@sprint.net, jgs@cisco.com 
+#   RFC3168          ||      K. Ramakrishnan, S. Floyd, D. Black         ||       kk@teraoptic.com, floyd@aciri.org, black_david@emc.com
+#   RFC3169          ||       M. Beadles, D. Mitton         ||        dmitton@nortelnetworks.com 
+#   RFC3170          ||       B. Quinn, K. Almeroth         ||        bquinn@celoxnetworks.com, almeroth@cs.ucsb.edu 
+#   RFC3171          ||      Z. Albanna, K. Almeroth, D. Meyer, M. Schipper         ||       zaid@juniper.net, almeroth@cs.ucsb.edu, dmm@sprint.net, iana@iana.org
+#   RFC3172          ||       G. Huston, Ed.         ||         
+#   RFC3173          ||       A. Shacham, B. Monsour, R. Pereira, M. Thomas         ||        shacham@shacham.net, bob@bobmonsour.com, royp@cisco.com, matt@3am-software.com 
+#   RFC3174          ||      D. Eastlake 3rd, P. Jones         ||       Donald.Eastlake@motorola.com, paulej@packetizer.com
+#   RFC3175          ||      F. Baker, C. Iturralde, F. Le Faucheur, B. Davie         ||       fred@cisco.com, cei@cisco.com, flefauch@cisco.com, bdavie@cisco.com
+#   RFC3176          ||       P. Phaal, S. Panchen, N. McKee         ||        peter_phaal@INMON.COM, sonia_panchen@INMON.COM, neil_mckee@INMON.COM 
+#   RFC3177          ||      IAB, IESG         ||       
+#   RFC3178          ||       J. Hagino, H. Snyder         ||        itojun@iijlab.net, hal@vailsys.com 
+#   RFC3179          ||       J. Schoenwaelder, J. Quittek         ||        schoenw@ibr.cs.tu-bs.de, quittek@ccrle.nec.de 
+#   RFC3180          ||       D. Meyer, P. Lothberg         ||        dmm@sprint.net, roll@sprint.net 
+#   RFC3181          ||       S. Herzog         ||        herzog@policyconsulting.com 
+#   RFC3182          ||       S. Yadav, R. Yavatkar, R. Pabbati, P. Ford, T. Moore, S. Herzog, R. Hess         ||        Satyendra.Yadav@intel.com, Raj.Yavatkar@intel.com, rameshpa@microsoft.com, peterf@microsoft.com, timmoore@microsoft.com, herzog@policyconsulting.com, rodney.hess@intel.com 
+#   RFC3183          ||       T. Dean, W. Ottaway         ||        tbdean@QinetiQ.com, wjottaway@QinetiQ.com 
+#   RFC3184          ||      S. Harris         ||       srh@merit.edu
+#   RFC3185          ||       S. Farrell, S. Turner         ||        stephen.farrell@baltimore.ie, turners@ieca.com 
+#   RFC3186          ||       S. Shimizu, T. Kawano, K. Murakami, E. Beier         ||        shimizu@ntt-20.ecl.net, kawano@core.ecl.net, murakami@ntt-20.ecl.net, Beier@bina.de 
+#   RFC3187          ||       J. Hakala, H. Walravens         ||        juha.hakala@helsinki.fi, hartmut.walravens@sbb.spk-berlin.de 
+#   RFC3188          ||       J. Hakala         ||        juha.hakala@helsinki.fi 
+#   RFC3189          ||      K. Kobayashi, A. Ogawa, S. Casner, C. Bormann         ||       ikob@koganei.wide.ad.jp, akimichi@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org
+#   RFC3190          ||       K. Kobayashi, A. Ogawa, S. Casner, C. Bormann         ||        ikob@koganei.wide.ad.jp, akimichi@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org 
+#   RFC3191          ||       C. Allocchio         ||         
+#   RFC3192          ||       C. Allocchio         ||         
+#   RFC3193          ||       B. Patel, B. Aboba, W. Dixon, G. Zorn, S. Booth         ||        baiju.v.patel@intel.com, bernarda@microsoft.com, wdixon@microsoft.com, gwz@cisco.com, ebooth@cisco.com 
+#   RFC3194          ||       A. Durand, C. Huitema         ||         
+#   RFC3195          ||       D. New, M. Rose         ||        dnew@san.rr.com, mrose17@gmail.com
+#   RFC3196          ||      T. Hastings, C. Manros, P. Zehler, C. Kugler, H. Holst         ||       tom.hastings@alum.mit.edu, Kugler@us.ibm.com, hh@I-data.com, Peter.Zehler@xerox.com
+#   RFC3197          ||       R. Austein         ||        sra@hactrn.net 
+#   RFC3198          ||      A. Westerinen, J. Schnizlein, J. Strassner, M. Scherling, B. Quinn, S. Herzog, A. Huynh, M. Carlson, J. Perry, S. Waldbusser         ||       andreaw@cisco.com, john.schnizlein@cisco.com, john.strassner@intelliden.com, mscherling@xcert.com, bquinn@celoxnetworks.com, jay.perry@netapp.com, herzog@PolicyConsulting.com, mark.carlson@sun.com, waldbusser@nextbeacon.com
+#   RFC3199          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC3200          ||               ||         
+#   RFC3201          ||       R. Steinberger, O. Nicklass         ||        robert.steinberger@fnc.fujitsu.com, Orly_n@rad.co.il 
+#   RFC3202          ||       R. Steinberger, O. Nicklass         ||        robert.steinberger@fnc.fujitsu.com, Orly_n@rad.co.il 
+#   RFC3203          ||      Y. T'Joens, C. Hublet, P. De Schrijver         ||       yves.tjoens@alcatel.be, p2@mind.be, Christian.Hublet@alcatel.be
+#   RFC3204          ||      E. Zimmerer, J. Peterson, A. Vemuri, L. Ong, F. Audet, M. Watson, M. Zonoun         ||       eric_zimmerer@yahoo.com, Aparna.Vemuri@Qwest.com, jon.peterson@neustar.com, lyndon_ong@yahoo.com, mzonoun@nortelnetworks.com, audet@nortelnetworks.com, mwatson@nortelnetworks.com
+#   RFC3205          ||       K. Moore         ||        moore@cs.utk.edu 
+#   RFC3206          ||       R. Gellens         ||        randy@qualcomm.com 
+#   RFC3207          ||      P. Hoffman         ||       phoffman@imc.org
+#   RFC3208          ||       T. Speakman, J. Crowcroft, J. Gemmell, D. Farinacci, S. Lin, D. Leshchiner, M. Luby, T. Montgomery, L. Rizzo, A. Tweedly, N. Bhaskar, R. Edmonstone, R. Sumanasekera, L. Vicisano         ||        speakman@cisco.com, dino@procket.com, steven@juniper.net, agt@cisco.com, nbhaskar@cisco.com, redmonst@cisco.com, rajitha@cisco.com, lorenzo@cisco.com, j.crowcroft@cs.ucl.ac.uk, jgemmell@microsoft.com, dleshc@tibco.com, luby@digitalfountain.com, todd@talarian.com, luigi@iet.unipi.it 
+#   RFC3209          ||      D. Awduche, L. Berger, D. Gan, T. Li, V. Srinivasan, G. Swallow         ||       awduche@movaz.com, lberger@movaz.com, dhg@juniper.net, tli@procket.com, vsriniva@cosinecom.com, swallow@cisco.com
+#   RFC3210          ||      D. Awduche, A. Hannan, X. Xiao         ||       awduche@movaz.com, alan@routingloop.com, xxiao@photuris.com 
+#   RFC3211          ||       P. Gutmann         ||        pgut001@cs.auckland.ac.nz 
+#   RFC3212          ||      B. Jamoussi, Ed., L. Andersson, R. Callon, R. Dantu, L. Wu, P. Doolan, T. Worster, N. Feldman, A. Fredette, M. Girish, E. Gray, J. Heinanen, T. Kilty, A. Malis         ||       loa.andersson@utfors.se, rcallon@juniper.net, rdantu@netrake.com, pdoolan@acm.org, Nkf@us.ibm.com, afredette@charter.net, eric.gray@sandburst.com, jh@song.fi, tim-kilty@mediaone.net, Andy.Malis@vivacenetworks.com, muckai@atoga.com, fsb@thefsb.org, liwwu@cisco.com
+#   RFC3213          ||       J. Ash, M. Girish, E. Gray, B. Jamoussi, G. Wright         ||        gash@att.com, eric.gray@sandburst.com, gwright@nortelnetworks.com, muckai@atoga.com, Jamoussi@nortelnetworks.com 
+#   RFC3214          ||       J. Ash, Y. Lee, P. Ashwood-Smith, B. Jamoussi, D. Fedyk, D. Skalecki, L. Li         ||        gash@att.com, jamoussi@NortelNetworks.com, petera@NortelNetworks.com, dareks@nortelnetworks.com, ylee@ceterusnetworks.com, lili@ss8networks.com, dwfedyk@nortelnetworks.com 
+#   RFC3215          ||       C. Boscher, P. Cheval, L. Wu, E. Gray         ||        christophe.boscher@alcatel.fr, pierrick.cheval@space.alcatel.fr, liwwu@cisco.com, eric.gray@sandburst.com 
+#   RFC3216          ||       C. Elliott, D. Harrington, J. Jason, J. Schoenwaelder, F. Strauss, W. Weiss         ||        chelliot@cisco.com, dbh@enterasys.com, jamie.jason@intel.com, schoenw@ibr.cs.tu-bs.de, strauss@ibr.cs.tu-bs.de, wweiss@ellacoya.com 
+#   RFC3217          ||       R. Housley         ||        rhousley@rsasecurity.com 
+#   RFC3218          ||       E. Rescorla         ||        ekr@rtfm.com 
+#   RFC3219          ||       J. Rosenberg, H. Salama, M. Squire         ||        jdrosen@dynamicsoft.com, hsalama@cisco.com, mattsquire@acm.org 
+#   RFC3220          ||      C. Perkins, Ed.         ||       charliep@iprg.nokia.com
+#   RFC3221          ||       G. Huston         ||         
+#   RFC3222          ||       G. Trotter         ||        Guy_Trotter@agilent.com 
+#   RFC3223          ||               ||         
+#   RFC3224          ||       E. Guttman         ||        erik.guttman@sun.com 
+#   RFC3225          ||       D. Conrad         ||        david.conrad@nominum.com 
+#   RFC3226          ||       O. Gudmundsson         ||        ogud@ogud.com 
+#   RFC3227          ||       D. Brezinski, T. Killalea         ||        dbrezinski@In-Q-Tel.org, tomk@neart.org 
+#   RFC3228          ||       B. Fenner         ||        fenner@research.att.com 
+#   RFC3229          ||       J. Mogul, B. Krishnamurthy, F. Douglis, A. Feldmann, Y. Goland, A. van Hoff, D. Hellerstein         ||         
+#   RFC3230          ||       J. Mogul, A. Van Hoff         ||        JeffMogul@acm.org, avh@marimba.com 
+#   RFC3231          ||       D. Levi, J. Schoenwaelder         ||         
+#   RFC3232          ||       J. Reynolds, Ed.         ||        rfc-editor@rfc-editor.org 
+#   RFC3233          ||       P. Hoffman, S. Bradner         ||         
+#   RFC3234          ||       B. Carpenter, S. Brim         ||        brian@hursley.ibm.com, sbrim@cisco.com 
+#   RFC3235          ||       D. Senie         ||        dts@senie.com 
+#   RFC3236          ||       M. Baker, P. Stark         ||        mbaker@planetfred.com, distobj@acm.org, Peter.Stark@ecs.ericsson.com 
+#   RFC3237          ||       M. Tuexen, Q. Xie, R. Stewart, M. Shore, L. Ong, J. Loughney, M. Stillman         ||       Michael.Tuexen@icn.siemens.de, qxie1@email.mot.com, randall@lakerest.net, mshore@cisco.com, lyong@ciena.com, john.loughney@nokia.com, maureen.stillman@nokia.com
+#   RFC3238          ||       S. Floyd, L. Daigle         ||        iab@iab.org 
+#   RFC3239          ||      C. Kugler, H. Lewis, T. Hastings         ||       kugler@us.ibm.com, tom.hastings@alum.mit.edu, harryl@us.ibm.com
+#   RFC3240          ||       D. Clunie, E. Cordonnier         ||        dclunie@dclunie.com, emmanuel.cordonnier@etiam.com 
+#   RFC3241          ||      C. Bormann         ||       cabo@tzi.org
+#   RFC3242          ||       L-E. Jonsson, G. Pelletier         ||        lars-erik.jonsson@ericsson.com, ghyslain.pelletier@epl.ericsson.se 
+#   RFC3243          ||       L-E. Jonsson         ||        lars-erik.jonsson@ericsson.com 
+#   RFC3244          ||       M. Swift, J. Trostle, J. Brezak         ||        mikesw@cs.washington.edu, john3725@world.std.com, jbrezak@microsoft.com 
+#   RFC3245          ||      J. Klensin, Ed., IAB         ||       iab@iab.org, sob@harvard.edu, paf@cisco.com
+#   RFC3246          ||      B. Davie, A. Charny, J.C.R. Bennet, K. Benson, J.Y. Le Boudec, W. Courtney, S. Davari, V. Firoiu, D. Stiliadis         ||       bsd@cisco.com, acharny@cisco.com, jcrb@motorola.com, Kent.Benson@tellabs.com, jean-yves.leboudec@epfl.ch, bill.courtney@trw.com, shahram_davari@pmc-sierra.com, vfiroiu@nortelnetworks.com, stiliadi@bell-labs.com
+#   RFC3247          ||      A. Charny, J. Bennet, K. Benson, J. Boudec, A. Chiu, W. Courtney, S. Davari, V. Firoiu, C. Kalmanek, K. Ramakrishnan         ||       acharny@cisco.com, jcrb@motorola.com, Kent.Benson@tellabs.com, jean-yves.leboudec@epfl.ch, angela.chiu@celion.com, bill.courtney@trw.com, shahram_davari@pmc-sierra.com, vfiroiu@nortelnetworks.com, crk@research.att.com, kk@teraoptic.com
+#   RFC3248          ||      G. Armitage, B. Carpenter, A. Casati, J. Crowcroft, J. Halpern, B. Kumar, J. Schnizlein         ||       
+#   RFC3249          ||       V. Cancio, M. Moldovan, H. Tamura, D. Wing         ||        vcancio@pacbell.net, mmoldovan@g3nova.com, tamura@toda.ricoh.co.jp, dwing-ietf@fuggles.com 
+#   RFC3250          ||      L. McIntyre, G. Parsons, J. Rafferty         ||       lmcintyre@pahv.xerox.com, gparsons@nortelnetworks.com, jraff@brooktrout.com
+#   RFC3251          ||       B. Rajagopalan         ||        braja@tellium.com 
+#   RFC3252          ||       H. Kennedy         ||        kennedyh@engin.umich.edu 
+#   RFC3253          ||      G. Clemm, J. Amsden, T. Ellison, C. Kaler, J. Whitehead         ||       geoffrey.clemm@rational.com, jamsden@us.ibm.com, tim_ellison@uk.ibm.com, ckaler@microsoft.com, ejw@cse.ucsc.edu
+#   RFC3254          ||       H. Alvestrand         ||        Harald@alvestrand.no 
+#   RFC3255          ||       N. Jones, C. Murton         ||        nrjones@agere.com, murton@nortelnetworks.com 
+#   RFC3256          ||       D. Jones, R. Woundy         ||        doug@yas.com, rwoundy@broadband.att.com 
+#   RFC3257          ||       L. Coene         ||         
+#   RFC3258          ||       T. Hardie         ||        Ted.Hardie@nominum.com 
+#   RFC3259          ||       J. Ott, C. Perkins, D. Kutscher         ||        jo@tzi.uni-bremen.de, csp@isi.edu, dku@tzi.uni-bremen.de 
+#   RFC3260          ||       D. Grossman         ||        dan@dma.isg.mot.com 
+#   RFC3261          ||      J. Rosenberg, H. Schulzrinne, G. Camarillo, A. Johnston, J. Peterson, R. Sparks, M. Handley, E. Schooler         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com, alan.johnston@wcom.com, jon.peterson@neustar.com, rsparks@dynamicsoft.com, mjh@icir.org, schooler@research.att.com
+#   RFC3262          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu
+#   RFC3263          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu
+#   RFC3264          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu
+#   RFC3265          ||      A. B. Roach         ||       adam@dynamicsoft.com
+#   RFC3266          ||      S. Olson, G. Camarillo, A. B. Roach         ||       seanol@microsoft.com, Gonzalo.Camarillo@ericsson.com, adam@dynamicsoft.com
+#   RFC3267          ||      J. Sjoberg, M. Westerlund, A. Lakaniemi, Q. Xie         ||       Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, qxie1@email.mot.com
+#   RFC3268          ||      P. Chown         ||       pc@skygate.co.uk
+#   RFC3269          ||       R. Kermode, L. Vicisano         ||        Roger.Kermode@motorola.com, lorenzo@cisco.com 
+#   RFC3270          ||      F. Le Faucheur, L. Wu, B. Davie, S. Davari, P. Vaananen, R. Krishnan, P. Cheval, J. Heinanen         ||       flefauch@cisco.com, liwwu@cisco.com, bsd@cisco.com, davari@ieee.org, pasi.vaananen@nokia.com, ram@axiowave.com, pierrick.cheval@space.alcatel.fr, jh@song.fi
+#   RFC3271          ||      V. Cerf         ||       vinton.g.cerf@wcom.com
+#   RFC3272          ||      D. Awduche, A. Chiu, A. Elwalid, I. Widjaja, X. Xiao         ||       awduche@movaz.com, angela.chiu@celion.com, anwar@lucent.com, iwidjaja@research.bell-labs.com, xipeng@redback.com
+#   RFC3273          ||      S. Waldbusser         ||       waldbusser@nextbeacon.com
+#   RFC3274          ||      P. Gutmann         ||       pgut001@cs.auckland.ac.nz
+#   RFC3275          ||      D. Eastlake 3rd, J. Reagle, D. Solo         ||       Donald.Eastlake@motorola.com, reagle@w3.org, dsolo@alum.mit.edu
+#   RFC3276          ||      B. Ray, R. Abbi         ||       rray@pesa.com, Rajesh.Abbi@alcatel.com
+#   RFC3277          ||       D. McPherson         ||        danny@tcb.net 
+#   RFC3278          ||      S. Blake-Wilson, D. Brown, P. Lambert         ||       sblakewi@certicom.com, dbrown@certicom.com, plambert@sprintmail.com
+#   RFC3279          ||      L. Bassham, W. Polk, R. Housley         ||       tim.polk@nist.gov, rhousley@rsasecurity.com, lbassham@nist.gov
+#   RFC3280          ||      R. Housley, W. Polk, W. Ford, D. Solo         ||       rhousley@rsasecurity.com, wford@verisign.com, wpolk@nist.gov, dsolo@alum.mit.edu
+#   RFC3281          ||      S. Farrell, R. Housley         ||       stephen.farrell@baltimore.ie, rhousley@rsasecurity.com
+#   RFC3282          ||      H. Alvestrand         ||       Harald@Alvestrand.no
+#   RFC3283          ||      B. Mahoney, G. Babics, A. Taler         ||       bobmah@mit.edu, georgeb@steltor.com, alex@0--0.org
+#   RFC3284          ||      D. Korn, J. MacDonald, J. Mogul, K. Vo         ||       kpv@research.att.com, dgk@research.att.com, JeffMogul@acm.org, jmacd@cs.berkeley.edu
+#   RFC3285          ||      M. Gahrns, T. Hain         ||       mikega@microsoft.com, ahain@cisco.com
+#   RFC3286          ||      L. Ong, J. Yoakum         ||       lyong@ciena.com, yoakum@nortelnetworks.com
+#   RFC3287          ||      A. Bierman         ||       andy@yumaworks.com
+#   RFC3288          ||      E. O'Tuathail, M. Rose         ||       eamon.otuathail@clipcode.com, mrose17@gmail.com
+#   RFC3289          ||      F. Baker, K. Chan, A. Smith         ||       fred@cisco.com, khchan@nortelnetworks.com, ah_smith@acm.org
+#   RFC3290          ||      Y. Bernet, S. Blake, D. Grossman, A. Smith         ||       ybernet@msn.com, steven.blake@ericsson.com, dan@dma.isg.mot.com, ah_smith@acm.org
+#   RFC3291          ||      M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder         ||       md@world.std.com, bkhabs@nc.rr.com, sar@epilogue.com, schoenw@ibr.cs.tu-bs.de
+#   RFC3292          ||      A. Doria, F. Hellstrand, K. Sundell, T. Worster         ||       avri@acm.org, fiffi@nortelnetworks.com, ksundell@nortelnetworks.com, fsb@thefsb.org
+#   RFC3293          ||      T. Worster, A. Doria, J. Buerkle         ||       fsb@thefsb.org, avri@acm.com, Joachim.Buerkle@nortelnetworks.com
+#   RFC3294          ||      A. Doria, K. Sundell         ||       avri@acm.org, sundell@nortelnetworks.com
+#   RFC3295          ||      H. Sjostrand, J. Buerkle, B. Srinivasan         ||       hans@ipunplugged.com, joachim.buerkle@nortelnetworks.com, balaji@cplane.com
+#   RFC3296          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC3297          ||      G. Klyne, R. Iwazaki, D. Crocker         ||       GK@ACM.ORG, iwa@rdl.toshibatec.co.jp, dcrocker@brandenburg.com
+#   RFC3298          ||       I. Faynberg, J. Gato, H. Lu, L. Slutsman         ||        lslutsman@att.com, faynberg@lucent.com, jgato@airtel.es, huilanlu@lucent.com 
+#   RFC3299          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC3300          ||      J. Reynolds, R. Braden, S. Ginoza, A. De La Cruz         ||       
+#   RFC3301          ||      Y. T'Joens, P. Crivellari, B. Sales         ||       paolo.crivellari@belgacom.be
+#   RFC3302          ||      G. Parsons, J. Rafferty         ||       gparsons@nortelnetworks.com, jraff@brooktrout.com
+#   RFC3303          ||       P. Srisuresh, J. Kuthan, J. Rosenberg, A. Molitor, A. Rayhan         ||        srisuresh@yahoo.com, kuthan@fokus.fhg.de, jdrosen@dynamicsoft.com, amolitor@visi.com, rayhan@ee.ryerson.ca 
+#   RFC3304          ||       R. P. Swale, P. A. Mart, P. Sijben, S. Brim, M. Shore         ||        richard.swale@bt.com, paul.sijben@picopoint.com, philip.mart@marconi.com, sbrim@cisco.com, mshore@cisco.com 
+#   RFC3305          ||      M. Mealling, Ed., R. Denenberg, Ed.         ||       michael@verisignlabs.com, rden@loc.gov
+#   RFC3306          ||      B. Haberman, D. Thaler         ||       bkhabs@nc.rr.com, dthaler@microsoft.com
+#   RFC3307          ||      B. Haberman         ||       bkhabs@nc.rr.com
+#   RFC3308          ||      P. Calhoun, W. Luo, D. McPherson, K. Peirce         ||       pcalhoun@bstormnetworks.com, luo@cisco.com, danny@tcb.net, Ken@malibunetworks.com
+#   RFC3309          ||      J. Stone, R. Stewart, D. Otis         ||       jonathan@dsg.stanford.edu, randall@lakerest.net, dotis@sanlight.net
+#   RFC3310          ||      A. Niemi, J. Arkko, V. Torvinen         ||       aki.niemi@nokia.com, jari.arkko@ericsson.com, vesa.torvinen@ericsson.fi
+#   RFC3311          ||      J. Rosenberg         ||       jdrosen@dynamicsoft.com
+#   RFC3312          ||      G. Camarillo, Ed., W. Marshall, Ed., J. Rosenberg         ||       Gonzalo.Camarillo@ericsson.com, wtm@research.att.com, jdrosen@dynamicsoft.com
+#   RFC3313          ||      W. Marshall, Ed.         ||       
+#   RFC3314          ||      M. Wasserman, Ed.         ||       
+#   RFC3315          ||      R. Droms, Ed., J. Bound, B. Volz, T. Lemon, C. Perkins, M. Carney         ||       Jim.Bound@hp.com, volz@metrocast.net, Ted.Lemon@nominum.com, charles.perkins@nokia.com, michael.carney@sun.com
+#   RFC3316          ||      J. Arkko, G. Kuijpers, H. Soliman, J. Loughney, J. Wiljakka         ||       jari.arkko@ericsson.com, gerben.a.kuijpers@ted.ericsson.se, john.loughney@nokia.com, hesham.soliman@era.ericsson.se, juha.wiljakka@nokia.com
+#   RFC3317          ||      K. Chan, R. Sahita, S. Hahn, K. McCloghrie         ||       khchan@nortelnetworks.com, ravi.sahita@intel.com, scott.hahn@intel.com, kzm@cisco.com
+#   RFC3318          ||      R. Sahita, Ed., S. Hahn, K. Chan, K. McCloghrie         ||       ravi.sahita@intel.com, scott.hahn@intel.com, khchan@nortelnetworks.com, kzm@cisco.com
+#   RFC3319          ||       H. Schulzrinne, B. Volz         ||        schulzrinne@cs.columbia.edu, volz@metrocast.net 
+#   RFC3320          ||      R. Price, C. Bormann, J. Christoffersson, H. Hannu, Z. Liu, J. Rosenberg         ||       richard.price@roke.co.uk, cabo@tzi.org, jan.christoffersson@epl.ericsson.se, hans.hannu@epl.ericsson.se, zhigang.c.liu@nokia.com, jdrosen@dynamicsoft.com
+#   RFC3321          ||      H. Hannu, J. Christoffersson, S. Forsgren, K.-C. Leung, Z. Liu, R. Price         ||       hans.hannu@epl.ericsson.se, jan.christoffersson@epl.ericsson.se, StefanForsgren@alvishagglunds.se, kcleung@cs.ttu.edu, zhigang.c.liu@nokia.com, richard.price@roke.co.uk
+#   RFC3322          ||      H. Hannu         ||       hans.hannu@epl.ericsson.se
+#   RFC3323          ||      J. Peterson         ||       jon.peterson@neustar.biz
+#   RFC3324          ||      M. Watson         ||       mwatson@nortelnetworks.com
+#   RFC3325          ||      C. Jennings, J. Peterson, M. Watson         ||       fluffy@cisco.com, Jon.Peterson@NeuStar.biz, mwatson@nortelnetworks.com
+#   RFC3326          ||      H. Schulzrinne, D. Oran, G. Camarillo         ||       schulzrinne@cs.columbia.edu, oran@cisco.com, Gonzalo.Camarillo@ericsson.com
+#   RFC3327          ||      D. Willis, B. Hoeneisen         ||       dean.willis@softarmor.com, hoeneisen@switch.ch
+#   RFC3328          ||               ||         
+#   RFC3329          ||      J. Arkko, V. Torvinen, G. Camarillo, A. Niemi, T. Haukka         ||       jari.arkko@ericsson.com, vesa.torvinen@ericsson.fi, Gonzalo.Camarillo@ericsson.com, aki.niemi@nokia.com, tao.haukka@nokia.com
+#   RFC3330          ||      IANA         ||       iana@iana.org
+#   RFC3331          ||      K. Morneault, R. Dantu, G. Sidebottom, B. Bidulock, J. Heitz         ||       kmorneau@cisco.com, rdantu@netrake.com, greg@signatustechnologies.com, bidulock@openss7.org, jheitz@lucent.com
+#   RFC3332          ||      G. Sidebottom, Ed., K. Morneault, Ed., J. Pastor-Balbas, Ed.         ||       
+#   RFC3334          ||       T. Zseby, S. Zander, C. Carle         ||        zseby@fokus.fhg.de, zander@fokus.fhg.de, carle@fokus.fhg.de 
+#   RFC3335          ||      T. Harding, R. Drummond, C. Shih         ||       tharding@cyclonecommerce.com, chuck.shih@gartner.com, rik@drummondgroup.com
+#   RFC3336          ||      B. Thompson, T. Koren, B. Buffam         ||       brucet@cisco.com, tmima@cisco.com, bruce@seawaynetworks.com
+#   RFC3337          ||      B. Thompson, T. Koren, B. Buffam         ||       brucet@cisco.com, bruce@seawaynetworks.com, tmima@cisco.com
+#   RFC3338          ||      S. Lee, M-K. Shin, Y-J. Kim, E. Nordmark, A. Durand         ||       syl@pec.etri.re.kr, mkshin@pec.etri.re.kr, yjkim@pec.etri.re.kr, Alain.Durand@sun.com, erik.nordmark@sun.com
+#   RFC3339          ||      G. Klyne, C. Newman         ||       chris.newman@sun.com, GK@ACM.ORG
+#   RFC3340          ||      M. Rose, G. Klyne, D. Crocker         ||       mrose17@gmail.com, Graham.Klyne@MIMEsweeper.com, dcrocker@brandenburg.com
+#   RFC3341          ||      M. Rose, G. Klyne, D. Crocker         ||       mrose17@gmail.com, Graham.Klyne@MIMEsweeper.com, dcrocker@brandenburg.com
+#   RFC3342          ||      E. Dixon, H. Franklin, J. Kint, G. Klyne, D. New, S. Pead, M. Rose, M. Schwartz         ||       Graham.Klyne@MIMEsweeper.com, mrose17@gmail.com, schwartz@CodeOnTheRoad.com, edixon@myrealbox.com, huston@franklin.ro, d20@icosahedron.org, dnew@san.rr.com, spead@fiber.net
+#   RFC3343          ||      M. Rose, G. Klyne, D. Crocker         ||       mrose17@gmail.com, gk@ninebynine.org, dcrocker@brandenburg.com
+#   RFC3344          ||      C. Perkins, Ed.         ||       Basavaraj.Patil@nokia.com, PRoberts@MEGISTO.com, charliep@iprg.nokia.com
+#   RFC3345          ||      D. McPherson, V. Gill, D. Walton, A. Retana         ||       danny@tcb.net, vijay@umbc.edu, dwalton@cisco.com, aretana@cisco.com
+#   RFC3346          ||      J. Boyle, V. Gill, A. Hannan, D. Cooper, D. Awduche, B. Christian, W.S. Lai         ||       jboyle@pdnets.com, vijay@umbc.edu, alan@routingloop.com, dcooper@gblx.net, awduche@movaz.com, blaine@uu.net, wlai@att.com
+#   RFC3347          ||      M. Krueger, R. Haagens         ||       marjorie_krueger@hp.com, Randy_Haagens@hp.com, csapuntz@stanford.edu, mbakke@cisco.com
+#   RFC3348          ||      M. Gahrns, R. Cheng         ||       mikega@microsoft.com, raych@microsoft.com
+#   RFC3349          ||      M. Rose         ||       mrose17@gmail.com
+#   RFC3351          ||      N. Charlton, M. Gasson, G. Gybels, M. Spanner, A. van Wijk         ||       nathan@millpark.com, michael.gasson@korusolutions.com, Guido.Gybels@rnid.org.uk, mike.spanner@rnid.org.uk, Arnoud.van.Wijk@eln.ericsson.se
+#   RFC3352          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
+#   RFC3353          ||      D. Ooms, B. Sales, W. Livens, A. Acharya, F. Griffoul, F. Ansari         ||       Dirk.Ooms@alcatel.be, Bernard.Sales@alcatel.be, WLivens@colt-telecom.be, arup@us.ibm.com, griffoul@ulticom.com, furquan@dnrc.bell-labs.com
+#   RFC3354          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC3355          ||      A. Singh, R. Turner, R. Tio, S. Nanji         ||       rturner@eng.paradyne.com, tor@redback.com, asingh1@motorola.com, suhail@redback.com
+#   RFC3356          ||      G. Fishman, S. Bradner         ||       
+#   RFC3357          ||      R. Koodli, R. Ravikanth         ||       rajeev.koodli@nokia.com, rravikanth@axiowave.com
+#   RFC3358          ||      T. Przygienda         ||       prz@xebeo.com
+#   RFC3359          ||      T. Przygienda         ||       
+#   RFC3360          ||       S. Floyd         ||        floyd@icir.org 
+#   RFC3361          ||      H. Schulzrinne         ||       schulzrinne@cs.columbia.edu
+#   RFC3362          ||       G. Parsons         ||        gparsons@nortelnetworks.com 
+#   RFC3363          ||      R. Bush, A. Durand, B. Fink, O. Gudmundsson, T. Hain         ||       
+#   RFC3364          ||      R. Austein         ||       sra@hactrn.net
+#   RFC3365          ||       J. Schiller         ||        jis@mit.edu 
+#   RFC3366          ||      G. Fairhurst, L. Wood         ||       gorry@erg.abdn.ac.uk, lwood@cisco.com
+#   RFC3367          ||       N. Popp, M. Mealling, M. Moseley         ||        npopp@verisign.com, michael@verisignlabs.com, marshall@netword.com 
+#   RFC3368          ||       M. Mealling         ||        michael@verisignlabs.com 
+#   RFC3369          ||      R. Housley         ||       rhousley@rsasecurity.com
+#   RFC3370          ||      R. Housley         ||       rhousley@rsasecurity.com
+#   RFC3371          ||      E. Caves, P. Calhoun, R. Wheeler         ||       evan@occamnetworks.com, pcalhoun@bstormnetworks.com
+#   RFC3372          ||      A. Vemuri, J. Peterson         ||       Aparna.Vemuri@Qwest.com, jon.peterson@neustar.biz
+#   RFC3373          ||      D. Katz, R. Saluja         ||       dkatz@juniper.net, rajesh.saluja@tenetindia.com
+#   RFC3374          ||      J. Kempf, Ed.         ||       henrik@levkowetz.com, pcalhoun@bstormnetworks.com, kempf@docomolabs-usa.com, gkenward@nortelnetworks.com, hmsyed@nortelnetworks.com, jmanner@cs.helsinki.fi, madjid.nakhjiri@motorola.com, govind.krishnamurthi@nokia.com, rajeev.koodli@nokia.com, kulwinder.atwal@zucotto.com, mat@cisco.com, mat.horan@comdev.cc, phil_neumiller@3com.com
+#   RFC3375          ||      S. Hollenbeck         ||       
+#   RFC3376          ||      B. Cain, S. Deering, I. Kouvelas, B. Fenner, A. Thyagarajan         ||       deering@cisco.com, fenner@research.att.com, kouvelas@cisco.com
+#   RFC3377          ||      J. Hodges, R. Morgan         ||       Jeff.Hodges@sun.com, rlmorgan@washington.edu
+#   RFC3378          ||       R. Housley, S. Hollenbeck         ||        rhousley@rsasecurity.com, shollenbeck@verisign.com 
+#   RFC3379          ||      D. Pinkas, R. Housley         ||       Denis.Pinkas@bull.net, rhousley@rsasecurity.com
+#   RFC3380          ||      T. Hastings, R. Herriot, C. Kugler, H. Lewis         ||       kugler@us.ibm.com, tom.hastings@alum.mit.edu, bob@Herriot.com, harryl@us.ibm.com
+#   RFC3381          ||      T. Hastings, H. Lewis, R. Bergman         ||       tom.hastings@alum.mit.edu, harryl@us.ibm.com, rbergma@hitachi-hkis.com
+#   RFC3382          ||      R. deBry, T. Hastings, R. Herriot, K. Ocke, P. Zehler         ||       debryro@uvsc.edu, tom.hastings@alum.mit.edu, bob@herriot.com, KOcke@crt.xerox.com, Peter.Zehler@xerox.com
+#   RFC3383          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC3384          ||      E. Stokes, R. Weiser, R. Moats, R. Huber         ||       rweiser@trustdst.com, stokese@us.ibm.com, rmoats@lemurnetworks.net, rvh@att.com
+#   RFC3385          ||       D. Sheinwald, J. Satran, P. Thaler, V. Cavanna         ||        julian_satran@il.ibm.com, Dafna_Sheinwald@il.ibm.com, pat_thaler@agilent.com, vince_cavanna@agilent.com 
+#   RFC3386          ||      W. Lai, Ed., D. McDysan, Ed.         ||       
+#   RFC3387          ||       M. Eder, H. Chaskar, S. Nag         ||        Michael.eder@nokia.com, thinker@monmouth.com, hemant.chaskar@nokia.com 
+#   RFC3388          ||      G. Camarillo, G. Eriksson, J. Holler, H. Schulzrinne         ||       Gonzalo.Camarillo@ericsson.com, Jan.Holler@era.ericsson.se, Goran.AP.Eriksson@era.ericsson.se, schulzrinne@cs.columbia.edu
+#   RFC3389          ||      R. Zopf         ||       zopf@lucent.com
+#   RFC3390          ||      M. Allman, S. Floyd, C. Partridge         ||       mallman@bbn.com, floyd@icir.org, craig@bbn.com
+#   RFC3391          ||       R. Herriot         ||        bob@herriot.com 
+#   RFC3392          ||      R. Chandra, J. Scudder         ||       rchandra@redback.com, jgs@cisco.com
+#   RFC3393          ||      C. Demichelis, P. Chimento         ||       carlo.demichelis@tilab.com, chimento@torrentnet.com
+#   RFC3394          ||      J. Schaad, R. Housley         ||       jimsch@exmsft.com, rhousley@rsasecurity.com
+#   RFC3395          ||      A. Bierman, C. Bucci, R. Dietz, A. Warth         ||       andy@yumaworks.com, cbucci@cisco.com, rdietz@hifn.com, dahoss@earthlink.net
+#   RFC3396          ||      T. Lemon, S. Cheshire         ||       mellon@nominum.com, rfc@stuartcheshire.org
+#   RFC3397          ||      B. Aboba, S. Cheshire         ||       bernarda@microsoft.com, rfc@stuartcheshire.org
+#   RFC3398          ||      G. Camarillo, A. B. Roach, J. Peterson, L. Ong         ||       Gonzalo.Camarillo@Ericsson.com, adam@dynamicsoft.com, jon.peterson@neustar.biz, lyOng@ciena.com
+#   RFC3400          ||               ||         
+#   RFC3401          ||      M. Mealling         ||       michael@neonym.net
+#   RFC3402          ||      M. Mealling         ||       michael@neonym.net
+#   RFC3403          ||      M. Mealling         ||       michael@neonym.net
+#   RFC3404          ||      M. Mealling         ||       michael@neonym.net
+#   RFC3405          ||      M. Mealling         ||       michael@neonym.net
+#   RFC3406          ||      L. Daigle, D. van Gulik, R. Iannella, P. Faltstrom         ||       leslie@thinkingcat.com, renato@iprsystems.com, paf@cisco.com
+#   RFC3407          ||      F. Andreasen         ||       fandreas@cisco.com
+#   RFC3408          ||      Z. Liu, K. Le         ||       khiem.le@nokia.com
+#   RFC3409          ||       K. Svanbro         ||        krister.svanbro@ericsson.com 
+#   RFC3410          ||       J. Case, R. Mundy, D. Partain, B. Stewart         ||         
+#   RFC3411          ||      D. Harrington, R. Presuhn, B. Wijnen         ||       
+#   RFC3412          ||      J. Case, D. Harrington, R. Presuhn, B. Wijnen         ||       
+#   RFC3413          ||       D. Levi, P. Meyer, B. Stewart         ||         
+#   RFC3414          ||      U. Blumenthal, B. Wijnen         ||       
+#   RFC3415          ||       B. Wijnen, R. Presuhn, K. McCloghrie         ||         
+#   RFC3416          ||       R. Presuhn, Ed.         ||         
+#   RFC3417          ||      R. Presuhn, Ed.         ||       
+#   RFC3418          ||       R. Presuhn, Ed.         ||         
+#   RFC3419          ||       M. Daniele, J. Schoenwaelder         ||        md@world.std.com, schoenw@ibr.cs.tu-bs.de 
+#   RFC3420          ||      R. Sparks         ||       rsparks@dynamicsoft.com
+#   RFC3421          ||      W. Zhao, H. Schulzrinne, E. Guttman, C. Bisdikian, W. Jerome         ||       zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com, bisdik@us.ibm.com, wfj@us.ibm.com
+#   RFC3422          ||      O. Okamoto, M. Maruyama, T. Sajima         ||       okamoto.osamu@lab.ntt.co.jp, mitsuru@core.ecl.net, tjs@sun.com
+#   RFC3423          ||       K. Zhang, E. Elkin         ||        kevinzhang@ieee.org, eitan@xacct.com 
+#   RFC3424          ||      L. Daigle, Ed., IAB         ||       iab@iab.org
+#   RFC3425          ||      D. Lawrence         ||       tale@nominum.com
+#   RFC3426          ||      S. Floyd         ||       iab@iab.org
+#   RFC3427          ||      A. Mankin, S. Bradner, R. Mahy, D. Willis, J. Ott, B. Rosen         ||       mankin@psg.com, sob@harvard.edu, rohan@cisco.com, dean.willis@softarmor.com, brian.rosen@marconi.com, jo@ipdialog.com
+#   RFC3428          ||       B. Campbell, Ed., J. Rosenberg, H. Schulzrinne, C. Huitema, D. Gurle         ||        bcampbell@dynamicsoft.com, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, huitema@microsoft.com, dgurle@microsoft.com 
+#   RFC3429          ||      H. Ohta         ||       ohta.hiroshi@lab.ntt.co.jp
+#   RFC3430          ||      J. Schoenwaelder         ||       schoenw@ibr.cs.tu-bs.de
+#   RFC3431          ||      W. Segmuller         ||       whs@watson.ibm.com
+#   RFC3432          ||      V. Raisanen, G. Grotefeld, A. Morton         ||       Vilho.Raisanen@nokia.com, g.grotefeld@motorola.com, acmorton@att.com
+#   RFC3433          ||      A. Bierman, D. Romascanu, K.C. Norseth         ||       andy@yumaworks.com, dromasca@gmail.com , kenyon.c.norseth@L-3com.com
+#   RFC3434          ||      A. Bierman, K. McCloghrie         ||       andy@yumaworks.com, kzm@cisco.com
+#   RFC3435          ||      F. Andreasen, B. Foster         ||       fandreas@cisco.com, bfoster@cisco.com
+#   RFC3436          ||      A. Jungmaier, E. Rescorla, M. Tuexen         ||       ajung@exp-math.uni-essen.de, ekr@rtfm.com, Michael.Tuexen@siemens.com
+#   RFC3437          ||      W. Palter, W. Townsley         ||       mark@townsley.net, palter.ietf@zev.net
+#   RFC3438          ||      W. Townsley         ||       mark@townsley.net
+#   RFC3439          ||      R. Bush, D. Meyer         ||       randy@psg.com, dmm@maoz.com
+#   RFC3440          ||      F. Ly, G. Bathrick         ||       faye@pedestalnetworks.com, greg.bathrick@nokia.com
+#   RFC3441          ||      R. Kumar         ||       rkumar@cisco.com
+#   RFC3442          ||      T. Lemon, S. Cheshire, B. Volz         ||       Ted.Lemon@nominum.com, rfc@stuartcheshire.org, bernie.volz@ericsson.com
+#   RFC3443          ||      P. Agarwal, B. Akyol         ||       puneet@acm.org, bora@cisco.com
+#   RFC3444          ||      A. Pras, J. Schoenwaelder         ||       pras@ctit.utwente.nl, schoenw@informatik.uni-osnabrueck.de
+#   RFC3445          ||      D. Massey, S. Rose         ||       masseyd@isi.edu, scott.rose@nist.gov
+#   RFC3446          ||      D. Kim, D. Meyer, H. Kilmer, D. Farinacci         ||       dorian@blackrose.org, hank@rem.com, dino@procket.com, dmm@maoz.com
+#   RFC3447          ||      J. Jonsson, B. Kaliski         ||       jonsson@mathematik.uni-marburg.de, bkaliski@rsasecurity.com
+#   RFC3448          ||      M. Handley, S. Floyd, J. Padhye, J. Widmer         ||       mjh@icir.org, floyd@icir.org, padhye@microsoft.com, widmer@informatik.uni-mannheim.de
+#   RFC3449          ||      H. Balakrishnan, V. Padmanabhan, G. Fairhurst, M. Sooriyabandara         ||       hari@lcs.mit.edu, padmanab@microsoft.com, gorry@erg.abdn.ac.uk, mahesh@erg.abdn.ac.uk
+#   RFC3450          ||      M. Luby, J. Gemmell, L. Vicisano, L. Rizzo, J. Crowcroft         ||       luby@digitalfountain.com, jgemmell@microsoft.com, lorenzo@cisco.com, luigi@iet.unipi.it, Jon.Crowcroft@cl.cam.ac.uk
+#   RFC3451          ||      M. Luby, J. Gemmell, L. Vicisano, L. Rizzo, M. Handley, J. Crowcroft         ||       luby@digitalfountain.com, jgemmell@microsoft.com, lorenzo@cisco.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk
+#   RFC3452          ||      M. Luby, L. Vicisano, J. Gemmell, L. Rizzo, M. Handley, J. Crowcroft         ||       luby@digitalfountain.com, lorenzo@cisco.com, jgemmell@microsoft.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk
+#   RFC3453          ||      M. Luby, L. Vicisano, J. Gemmell, L. Rizzo, M. Handley, J. Crowcroft         ||       luby@digitalfountain.com, lorenzo@cisco.com, jgemmell@microsoft.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk
+#   RFC3454          ||      P. Hoffman, M. Blanchet         ||       paul.hoffman@imc.org, Marc.Blanchet@viagenie.qc.ca
+#   RFC3455          ||      M. Garcia-Martin, E. Henrikson, D. Mills         ||       miguel.a.garcia@ericsson.com, ehenrikson@lucent.com, duncan.mills@vf.vodafone.co.uk
+#   RFC3456          ||      B. Patel, B. Aboba, S. Kelly, V. Gupta         ||       baiju.v.patel@intel.com, bernarda@microsoft.com, scott@hyperthought.com, vipul.gupta@sun.com
+#   RFC3457          ||      S. Kelly, S. Ramamoorthi         ||       
+#   RFC3458          ||      E. Burger, E. Candell, C. Eliot, G. Klyne         ||       e.burger@ieee.org, emily.candell@comverse.com, GK-IETF@ninebynine.org, charle@Microsoft.com
+#   RFC3459          ||      E. Burger         ||       e.burger@ieee.org
+#   RFC3460          ||      B. Moore, Ed.         ||       remoore@us.ibm.com
+#   RFC3461          ||      K. Moore         ||       moore@cs.utk.edu
+#   RFC3462          ||      G. Vaudreuil         ||       GregV@ieee.org
+#   RFC3463          ||      G. Vaudreuil         ||       GregV@ieee.org
+#   RFC3464          ||      K. Moore, G. Vaudreuil         ||       moore@cs.utk.edu, GregV@ieee.org
+#   RFC3465          ||      M. Allman         ||       mallman@bbn.com
+#   RFC3466          ||      M. Day, B. Cain, G. Tomlinson, P. Rzewski         ||       mday@alum.mit.edu, bcain@storigen.com, gary@tomlinsongroup.net, philrz@yahoo.com
+#   RFC3467          ||      J. Klensin         ||       
+#   RFC3468          ||      L. Andersson, G. Swallow         ||       loa@pi.se, swallow@cisco.com
+#   RFC3469          ||      V. Sharma, Ed., F. Hellstrand, Ed.         ||       
+#   RFC3470          ||      S. Hollenbeck, M. Rose, L. Masinter         ||       shollenbeck@verisign.com, mrose17@gmail.com,  LMM@acm.org
+#   RFC3471          ||      L. Berger, Ed.         ||       lberger@movaz.com
+#   RFC3472          ||      P. Ashwood-Smith, Ed., L. Berger, Ed.         ||       petera@nortelnetworks.com, lberger@movaz.com
+#   RFC3473          ||      L. Berger, Ed.         ||       lberger@movaz.com
+#   RFC3474          ||      Z. Lin, D. Pendarakis         ||       zhiwlin@nyct.com, dpendarakis@tellium.com
+#   RFC3475          ||      O. Aboul-Magd         ||       osama@nortelnetworks.com
+#   RFC3476          ||      B. Rajagopalan         ||       braja@tellium.com
+#   RFC3477          ||      K. Kompella, Y. Rekhter         ||       kireeti@juniper.net, yakov@juniper.net
+#   RFC3478          ||      M. Leelanivas, Y. Rekhter, R. Aggarwal         ||       manoj@juniper.net, yakov@juniper.net, rahul@redback.com
+#   RFC3479          ||      A. Farrel, Ed.         ||       afarrel@movaz.com, pjb@dataconnection.com, pmatthews@hyperchip.com, ewgray@GraIyMage.com, jack.shaio@vivacenetworks.com, tob@laurelnetworks.com, andy.malis@vivacenetworks.com
+#   RFC3480          ||      K. Kompella, Y. Rekhter, A. Kullberg         ||       kireeti@juniper.net, yakov@juniper.net, akullber@netplane.com
+#   RFC3481          ||      H. Inamura, Ed., G. Montenegro, Ed., R. Ludwig, A. Gurtov, F. Khafizov         ||       inamura@mml.yrp.nttdocomo.co.jp, gab@sun.com, Reiner.Ludwig@Ericsson.com, andrei.gurtov@sonera.com, faridk@nortelnetworks.com
+#   RFC3482          ||      M. Foster, T. McGarry, J. Yu         ||       mark.foster@neustar.biz, tom.mcgarry@neustar.biz, james.yu@neustar.biz
+#   RFC3483          ||       D. Rawlins, A. Kulkarni, M. Bokaemper, K. Chan         ||        Diana.Rawlins@wcom.com, amol.kulkarni@intel.com, khchan@nortelnetworks.com, mbokaemper@juniper.net 
+#   RFC3484          ||      R. Draves         ||       richdr@microsoft.com
+#   RFC3485          ||       M. Garcia-Martin, C. Bormann, J. Ott, R. Price, A. B. Roach         ||        miguel.a.garcia@ericsson.com, cabo@tzi.org, jo@tzi.org, richard.price@roke.co.uk, adam@dynamicsoft.com 
+#   RFC3486          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC3487          ||       H. Schulzrinne         ||        schulzrinne@cs.columbia.edu 
+#   RFC3488          ||       I. Wu, T. Eckert         ||        iwu@cisco.com 
+#   RFC3489          ||      J. Rosenberg, J. Weinberger, C. Huitema, R. Mahy         ||       jdrosen@dynamicsoft.com, jweinberger@dynamicsoft.com, huitema@microsoft.com, rohan@cisco.com
+#   RFC3490          ||      P. Faltstrom, P. Hoffman, A. Costello         ||       paf@cisco.com, phoffman@imc.org
+#   RFC3491          ||      P. Hoffman, M. Blanchet         ||       paul.hoffman@imc.org, Marc.Blanchet@viagenie.qc.ca
+#   RFC3492          ||      A. Costello         ||       
+#   RFC3493          ||       R. Gilligan, S. Thomson, J. Bound, J. McCann, W. Stevens         ||        gilligan@intransa.com, sethomso@cisco.com, Jim.Bound@hp.com, Jack.McCann@hp.com 
+#   RFC3494          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
+#   RFC3495          ||       B. Beser, P. Duffy, Ed.         ||        burcak@juniper.net, paduffy@cisco.com 
+#   RFC3496          ||       A. G. Malis, T. Hsiao         ||        Andy.Malis@vivacenetworks.com, Tony.Hsiao@VivaceNetworks.com 
+#   RFC3497          ||       L. Gharai, C. Perkins, G. Goncher, A. Mankin         ||        ladan@isi.edu, csp@csperkins.org, mankin@psg.com, Gary.Goncher@tek.com 
+#   RFC3498          ||       J. Kuhfeld, J. Johnson, M. Thatcher         ||         
+#   RFC3499          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC3500          ||               ||         
+#   RFC3501          ||      M. Crispin         ||       MRC@CAC.Washington.EDU
+#   RFC3502          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
+#   RFC3503          ||       A. Melnikov         ||        mel@messagingdirect.com 
+#   RFC3504          ||       D. Eastlake         ||        Donald.Eastlake@motorola.com 
+#   RFC3505          ||       D. Eastlake         ||        Donald.Eastlake@motorola.com 
+#   RFC3506          ||       K. Fujimura, D. Eastlake         ||        fujimura@isl.ntt.co.jp, Donald.Eastlake@motorola.com 
+#   RFC3507          ||       J. Elson, A. Cerpa         ||        jelson@cs.ucla.edu, cerpa@cs.ucla.edu 
+#   RFC3508          ||       O. Levin         ||        orit@radvision.com 
+#   RFC3509          ||       A. Zinin, A. Lindem, D. Yeung         ||        zinin@psg.com, myeung@procket.com, acee@redback.com 
+#   RFC3510          ||       R. Herriot, I. McDonald         ||        bob@herriot.com, imcdonald@sharplabs.com 
+#   RFC3511          ||       B. Hickman, D. Newman, S. Tadjudin, T. Martin         ||        brooks.hickman@spirentcom.com, dnewman@networktest.com, Saldju.Tadjudin@spirentcom.com, tmartin@gvnw.com 
+#   RFC3512          ||       M. MacFaden, D. Partain, J. Saperia, W. Tackabury         ||         
+#   RFC3513          ||      R. Hinden, S. Deering         ||       bob.hinden@gmail.com, deering@cisco.com
+#   RFC3514          ||       S. Bellovin         ||        bellovin@acm.org 
+#   RFC3515          ||      R. Sparks         ||       rsparks@dynamicsoft.com
+#   RFC3516          ||       L. Nerenberg         ||        lyndon@orthanc.ab.ca 
+#   RFC3517          ||      E. Blanton, M. Allman, K. Fall, L. Wang         ||       eblanton@cs.purdue.edu, mallman@bbn.com, kfall@intel-research.net, lwang0@uky.edu
+#   RFC3518          ||       M. Higashiyama, F. Baker, T. Liao         ||        Mitsuru.Higashiyama@yy.anritsu.co.jp, fred@cisco.com, tawei@cisco.com 
+#   RFC3519          ||      H. Levkowetz, S. Vaarala         ||       henrik@levkowetz.com, sami.vaarala@iki.fi
+#   RFC3520          ||       L-N. Hamer, B. Gage, B. Kosinski, H. Shieh         ||        nhamer@nortelnetworks.com, brettk@invidi.com, gageb@nortelnetworks.com, hugh.shieh@attws.com 
+#   RFC3521          ||       L-N. Hamer, B. Gage, H. Shieh         ||        nhamer@nortelnetworks.com, gageb@nortelnetworks.com, hugh.shieh@attws.com 
+#   RFC3522          ||       R. Ludwig, M. Meyer         ||        Reiner.Ludwig@eed.ericsson.se, Michael.Meyer@eed.ericsson.se 
+#   RFC3523          ||       J. Polk         ||        jmpolk@cisco.com 
+#   RFC3524          ||       G. Camarillo, A. Monrad         ||        Gonzalo.Camarillo@ericsson.com, atle.monrad@ericsson.com 
+#   RFC3525          ||      C. Groves, Ed., M. Pantaleo, Ed., T. Anderson, Ed., T. Taylor, Ed.         ||       tlatla@verizon.net, Christian.Groves@ericsson.com.au, Marcello.Pantaleo@eed.ericsson.se, tom.taylor.stds@gmail.com
+#   RFC3526          ||       T. Kivinen, M. Kojo         ||        kivinen@ssh.fi, mika.kojo@helsinki.fi 
+#   RFC3527          ||       K. Kinnear, M. Stapp, R. Johnson, J. Kumarasamy         ||        kkinnear@cisco.com, mjs@cisco.com, jayk@cisco.com, raj@cisco.com 
+#   RFC3528          ||       W. Zhao, H. Schulzrinne, E. Guttman         ||        zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com 
+#   RFC3529          ||       W. Harold         ||        wharold@us.ibm.com 
+#   RFC3530          ||      S. Shepler, B. Callaghan, D. Robinson, R. Thurlow, C. Beame, M. Eisler, D. Noveck         ||       beame@bws.com, brent.callaghan@sun.com, mike@eisler.com, dnoveck@netapp.com, david.robinson@sun.com, robert.thurlow@sun.com
+#   RFC3531          ||       M. Blanchet         ||        Marc.Blanchet@viagenie.qc.ca 
+#   RFC3532          ||       T. Anderson, J. Buerkle         ||        todd.a.anderson@intel.com, joachim.buerkle@nortelnetworks.com 
+#   RFC3533          ||       S. Pfeiffer         ||        Silvia.Pfeiffer@csiro.au 
+#   RFC3534          ||      L. Walleij         ||       triad@df.lth.se
+#   RFC3535          ||       J. Schoenwaelder         ||        j.schoenwaelder@iu-bremen.de 
+#   RFC3536          ||      P. Hoffman         ||       paul.hoffman@imc.org
+#   RFC3537          ||       J. Schaad, R. Housley         ||        jimsch@exmsft.com, housley@vigilsec.com 
+#   RFC3538          ||       Y. Kawatsura         ||        kawatura@bisd.hitachi.co.jp 
+#   RFC3539          ||       B. Aboba, J. Wood         ||        bernarda@microsoft.com, jonwood@speakeasy.net 
+#   RFC3540          ||       N. Spring, D. Wetherall, D. Ely         ||        nspring@cs.washington.edu, djw@cs.washington.edu, ely@cs.washington.edu 
+#   RFC3541          ||       A. Walsh         ||        aaron@mantiscorp.com 
+#   RFC3542          ||       W. Stevens, M. Thomas, E. Nordmark, T. Jinmei         ||        matt@3am-software.com, Erik.Nordmark@sun.com, jinmei@isl.rdc.toshiba.co.jp 
+#   RFC3543          ||       S. Glass, M. Chandra         ||        steven.glass@sun.com, mchandra@cisco.com 
+#   RFC3544          ||      T. Koren, S. Casner, C. Bormann         ||       tmima@cisco.com, casner@packetdesign.com, cabo@tzi.org
+#   RFC3545          ||       T. Koren, S. Casner, J. Geevarghese, B. Thompson, P. Ruddy         ||        tmima@cisco.com, casner@acm.org, geevjohn@hotmail.com, brucet@cisco.com, pruddy@cisco.com 
+#   RFC3546          ||       S. Blake-Wilson, M. Nystrom, D. Hopwood, J. Mikkelsen, T. Wright         ||        sblakewilson@bcisse.com, magnus@rsasecurity.com, david.hopwood@zetnet.co.uk, janm@transactionware.com, timothy.wright@vodafone.com 
+#   RFC3547          ||      M. Baugher, B. Weis, T. Hardjono, H. Harney         ||       mbaugher@cisco.com, thardjono@verisign.com, hh@sparta.com, bew@cisco.com
+#   RFC3548          ||       S. Josefsson, Ed.         ||         
+#   RFC3549          ||       J. Salim, H. Khosravi, A. Kleen, A. Kuznetsov         ||        hadi@znyx.com, hormuzd.m.khosravi@intel.com, ak@suse.de, kuznet@ms2.inr.ac.ru 
+#   RFC3550          ||      H. Schulzrinne, S. Casner, R. Frederick, V. Jacobson         ||       schulzrinne@cs.columbia.edu, casner@acm.org, ronf@bluecoat.com, van@packetdesign.com
+#   RFC3551          ||      H. Schulzrinne, S. Casner         ||       schulzrinne@cs.columbia.edu, casner@acm.org
+#   RFC3552          ||       E. Rescorla, B. Korver         ||        ekr@rtfm.com, briank@xythos.com, iab@iab.org 
+#   RFC3553          ||       M. Mealling, L. Masinter, T. Hardie, G. Klyne         ||        michael@verisignlabs.com, LMM@acm.org, hardie@qualcomm.com, GK-IETF@ninebynine.org 
+#   RFC3554          ||       S. Bellovin, J. Ioannidis, A. Keromytis, R. Stewart         ||       smb@research.att.com, ji@research.att.com, angelos@cs.columbia.edu, randall@lakerest.net
+#   RFC3555          ||       S. Casner, P. Hoschka         ||        casner@acm.org, ph@w3.org 
+#   RFC3556          ||       S. Casner         ||        casner@acm.org 
+#   RFC3557          ||       Q. Xie, Ed.         ||        bdp003@motorola.com, Senaka.Balasuriya@motorola.com, yoonie@verbaltek.com, stephane.maes@oracle.com, hgarudad@qualcomm.com, Qiaobing.Xie@motorola.com 
+#   RFC3558          ||       A. Li         ||        adamli@icsl.ucla.edu 
+#   RFC3559          ||       D. Thaler         ||        dthaler@microsoft.com 
+#   RFC3560          ||       R. Housley         ||        housley@vigilsec.com 
+#   RFC3561          ||       C. Perkins, E. Belding-Royer, S. Das         ||        Charles.Perkins@nokia.com, ebelding@cs.ucsb.edu, sdas@ececs.uc.edu 
+#   RFC3562          ||       M. Leech         ||        mleech@nortelnetworks.com 
+#   RFC3563          ||      A. Zinin         ||       zinin@psg.com
+#   RFC3564          ||      F. Le Faucheur, W. Lai         ||       
+#   RFC3565          ||       J. Schaad         ||        jimsch@exmsft.com 
+#   RFC3566          ||       S. Frankel, H. Herbert         ||        sheila.frankel@nist.gov, howard.c.herbert@intel.com 
+#   RFC3567          ||      T. Li, R. Atkinson         ||       tli@procket.net, rja@extremenetworks.com
+#   RFC3568          ||       A. Barbir, B. Cain, R. Nair, O. Spatscheck         ||        abbieb@nortelnetworks.com, bcain@storigen.com, nair_raj@yahoo.com, spatsch@research.att.com 
+#   RFC3569          ||       S. Bhattacharyya, Ed.         ||         
+#   RFC3570          ||      P. Rzewski, M. Day, D. Gilletti         ||       mday@alum.mit.edu, dgilletti@yahoo.com, philrz@yahoo.com
+#   RFC3571          ||      D. Rawlins, A. Kulkarni, K. Ho Chan, M. Bokaemper, D. Dutt         ||       Diana.Rawlins@mci.com, amol.kulkarni@intel.com, khchan@nortelnetworks.com, mbokaemper@juniper.net, ddutt@cisco.com
+#   RFC3572          ||      T. Ogura, M. Maruyama, T. Yoshida         ||       ogura@core.ecl.net, mitsuru@core.ecl.net, yoshida@peta.arch.ecl.net
+#   RFC3573          ||       I. Goyret         ||        igoyret@lucent.com 
+#   RFC3574          ||       J. Soininen, Ed.         ||         
+#   RFC3575          ||      B. Aboba         ||       bernarda@microsoft.com
+#   RFC3576          ||      M. Chiba, G. Dommety, M. Eklund, D. Mitton, B. Aboba         ||       mchiba@cisco.com, gdommety@cisco.com, meklund@cisco.com, david@mitton.com, bernarda@microsoft.com
+#   RFC3577          ||       S. Waldbusser, R. Cole, C. Kalbfleisch, D. Romascanu         ||        waldbusser@nextbeacon.com, cwk@verio.net, rgcole@att.com, dromasca@gmail.com  
+#   RFC3578          ||       G. Camarillo, A. B. Roach, J. Peterson, L. Ong         ||        Gonzalo.Camarillo@ericsson.com, adam@dynamicsoft.com, jon.peterson@neustar.biz, lyong@ciena.com 
+#   RFC3579          ||      B. Aboba, P. Calhoun         ||       bernarda@microsoft.com, pcalhoun@airespace.com
+#   RFC3580          ||      P. Congdon, B. Aboba, A. Smith, G. Zorn, J. Roese         ||       paul_congdon@hp.com, bernarda@microsoft.com, ah_smith@acm.org, jjr@enterasys.com, gwz@cisco.com
+#   RFC3581          ||       J. Rosenberg, H. Schulzrinne         ||        jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu 
+#   RFC3582          ||       J. Abley, B. Black, V. Gill         ||        jabley@isc.org, ben@layer8.net, vijaygill9@aol.com 
+#   RFC3583          ||       H. Chaskar, Ed.         ||        john.loughney@nokia.com, hemant.chaskar@nokia.com 
+#   RFC3584          ||       R. Frye, D. Levi, S. Routhier, B. Wijnen         ||         
+#   RFC3585          ||       J. Jason, L. Rafalow, E. Vyncke         ||        jamie.jason@intel.com, rafalow@watson.ibm.com, evyncke@cisco.com 
+#   RFC3586          ||       M. Blaze, A. Keromytis, M. Richardson, L. Sanchez         ||        mab@crypto.com, angelos@cs.columbia.edu, mcr@sandelman.ottawa.on.ca, lsanchez@xapiens.com 
+#   RFC3587          ||      R. Hinden, S. Deering, E. Nordmark         ||       bob.hinden@gmail.com, erik.nordmark@sun.com
+#   RFC3588          ||      P. Calhoun, J. Loughney, E. Guttman, G. Zorn, J. Arkko         ||       pcalhoun@airespace.com, john.Loughney@nokia.com, Jari.Arkko@ericsson.com, erik.guttman@sun.com
+#   RFC3589          ||       J. Loughney         ||        john.Loughney@Nokia.com 
+#   RFC3590          ||       B. Haberman         ||        brian@innovationslab.net 
+#   RFC3591          ||       H-K. Lam, M. Stewart, A. Huynh         ||        mstewart1@nc.rr.com, a_n_huynh@yahoo.com, hklam@lucent.com 
+#   RFC3592          ||       K. Tesink         ||        kaj@research.telcordia.com 
+#   RFC3593          ||       K. Tesink, Ed.         ||         
+#   RFC3594          ||       P. Duffy         ||        paduffy@cisco.com 
+#   RFC3595          ||       B. Wijnen         ||        bwijnen@lucent.com 
+#   RFC3596          ||       S. Thomson, C. Huitema, V. Ksinant, M. Souissi         ||        sethomso@cisco.com, huitema@microsoft.com, vladimir.ksinant@6wind.com, Mohsen.Souissi@nic.fr 
+#   RFC3597          ||      A. Gustafsson         ||       gson@nominum.com
+#   RFC3598          ||      K. Murchison         ||       ken@oceana.com
+#   RFC3599          ||       S. Ginoza         ||        ginoza@isi.edu 
+#   RFC3600          ||      J. Reynolds, Ed., S. Ginoza, Ed.         ||       
+#   RFC3601          ||       C. Allocchio         ||        Claudio.Allocchio@garr.it 
+#   RFC3602          ||       S. Frankel, R. Glenn, S. Kelly         ||        sheila.frankel@nist.gov, scott@hyperthought.com, rob.glenn@nist.gov 
+#   RFC3603          ||      W. Marshall, Ed., F. Andreasen, Ed.         ||       
+#   RFC3604          ||       H. Khosravi, G. Kullgren, S. Shew, J. Sadler, A. Watanabe         ||        hormuzd.m.khosravi@intel.com, geku@nortelnetworks.com, Jonathan.Sadler@tellabs.com, sdshew@nortelnetworks.com, Shiomoto.Kohei@lab.ntt.co.jp, atsushi@exa.onlab.ntt.co.jp, okamoto@exa.onlab.ntt.co.jp 
+#   RFC3605          ||       C. Huitema         ||        huitema@microsoft.com 
+#   RFC3606          ||       F. Ly, M. Noto, A. Smith, E. Spiegel, K. Tesink         ||        faye@pedestalnetworks.com, mnoto@cisco.com, ah_smith@acm.org, mspiegel@cisco.com, kaj@research.telcordia.com 
+#   RFC3607          ||       M. Leech         ||        mleech@nortelnetworks.com 
+#   RFC3608          ||      D. Willis, B. Hoeneisen         ||       dean.willis@softarmor.com, hoeneisen@switch.ch
+#   RFC3609          ||       R. Bonica, K. Kompella, D. Meyer         ||        ronald.p.bonica@mci.com, kireeti@juniper.net, dmm@maoz.com 
+#   RFC3610          ||       D. Whiting, R. Housley, N. Ferguson         ||        dwhiting@hifn.com, housley@vigilsec.com, niels@macfergus.com 
+#   RFC3611          ||       T. Friedman, Ed., R. Caceres, Ed., A. Clark, Ed.         ||        almeroth@cs.ucsb.edu, caceres@watson.ibm.com, alan@telchemy.com, robert.cole@jhuapl.edu, duffield@research.att.com, timur.friedman@lip6.fr, khedayat@brixnet.com, ksarac@utdallas.edu, magnus.westerlund@ericsson.com 
+#   RFC3612          ||       A. Farrel         ||        adrian@olddog.co.uk 
+#   RFC3613          ||       R. Morgan, K. Hazelton         ||        rlmorgan@washington.edu, hazelton@doit.wisc.edu 
+#   RFC3614          ||       J. Smith         ||        jrsmith@watson.ibm.com 
+#   RFC3615          ||       J. Gustin, A. Goyens         ||        jean-marc.gustin@swift.com, andre.goyens@swift.com 
+#   RFC3616          ||       F. Bellifemine, I. Constantinescu, S. Willmott         ||        Fabio.Bellifemine@TILAB.COM, ion.constantinescu@epfl.ch, steve@lsi.upc.es 
+#   RFC3617          ||       E. Lear         ||        lear@cisco.com 
+#   RFC3618          ||       B. Fenner, Ed., D. Meyer, Ed.         ||         
+#   RFC3619          ||       S. Shah, M. Yip         ||        sshah@extremenetworks.com, my@extremenetworks.com 
+#   RFC3620          ||       D. New         ||        dnew@san.rr.com 
+#   RFC3621          ||       A. Berger, D. Romascanu         ||        avib@PowerDsine.com, dromasca@gmail.com  
+#   RFC3622          ||       M. Mealling         ||        michael@neonym.net 
+#   RFC3623          ||       J. Moy, P. Pillay-Esnault, A. Lindem         ||        jmoy@sycamorenet.com, padma@juniper.net, acee@redback.com 
+#   RFC3624          ||       B. Foster, D. Auerbach, F. Andreasen         ||        fandreas@cisco.com, dea@cisco.com, bfoster@cisco.com 
+#   RFC3625          ||       R. Gellens, H. Garudadri         ||         
+#   RFC3626          ||       T. Clausen, Ed., P. Jacquet, Ed.         ||        T.Clausen@computer.org, Philippe.Jacquet@inria.fr 
+#   RFC3627          ||      P. Savola         ||       psavola@funet.fi
+#   RFC3628          ||       D. Pinkas, N. Pope, J. Ross         ||        Denis.Pinkas@bull.net, pope@secstan.com, ross@secstan.com, claire.desclercs@etsi.org 
+#   RFC3629          ||       F. Yergeau         ||        fyergeau@alis.com 
+#   RFC3630          ||      D. Katz, K. Kompella, D. Yeung         ||       dkatz@juniper.net, myeung@procket.com, kireeti@juniper.net
+#   RFC3631          ||       S. Bellovin, Ed., J. Schiller, Ed., C. Kaufman, Ed.         ||         
+#   RFC3632          ||       S. Hollenbeck, S. Veeramachaneni, S. Yalamanchilli         ||        shollenbeck@verisign.com, sveerama@verisign.com, syalamanchilli@verisign.com 
+#   RFC3633          ||      O. Troan, R. Droms         ||       ot@cisco.com, rdroms@cisco.com
+#   RFC3634          ||       K. Luehrs, R. Woundy, J. Bevilacqua, N. Davoust         ||        k.luehrs@cablelabs.com, richard_woundy@cable.comcast.com, john@yas.com, nancy@yas.com 
+#   RFC3635          ||       J. Flick         ||        johnf@rose.hp.com 
+#   RFC3636          ||       J. Flick         ||        johnf@rose.hp.com 
+#   RFC3637          ||       C.M. Heard, Ed.         ||         
+#   RFC3638          ||       J. Flick, C. M. Heard         ||        johnf@rose.hp.com, heard@pobox.com 
+#   RFC3639          ||       M. St. Johns, Ed., G. Huston, Ed., IAB         ||         
+#   RFC3640          ||      J. van der Meer, D. Mackie, V. Swaminathan, D. Singer, P. Gentric         ||       jan.vandermeer@philips.com, dmackie@apple.com, viswanathan.swaminathan@sun.com, singer@apple.com, philippe.gentric@philips.com
+#   RFC3641          ||       S. Legg         ||        steven.legg@adacel.com.au 
+#   RFC3642          ||       S. Legg         ||        steven.legg@adacel.com.au 
+#   RFC3643          ||       R. Weber, M. Rajagopal, F. Travostino, M. O'Donnell, C. Monia, M. Merhar         ||        roweber@ieee.org, muralir@broadcom.com, travos@nortelnetworks.com, cmonia@pacbell.net, milan.merhar@sun.com 
+#   RFC3644          ||       Y. Snir, Y. Ramberg, J. Strassner, R. Cohen, B. Moore         ||        yramberg@cisco.com, ysnir@cisco.com, john.strassner@intelliden.com, ronc@lyciumnetworks.com, remoore@us.ibm.com 
+#   RFC3645          ||       S. Kwan, P. Garg, J. Gilroy, L. Esibov, J. Westhead, R. Hall         ||        skwan@microsoft.com, praeritg@microsoft.com, jamesg@microsoft.com, levone@microsoft.com, randyhall@lucent.com, jwesth@microsoft.com 
+#   RFC3646          ||       R. Droms, Ed.         ||        rdroms@cisco.com 
+#   RFC3647          ||       S. Chokhani, W. Ford, R. Sabett, C. Merrill, S. Wu         ||        chokhani@orionsec.com, wford@verisign.com, rsabett@cooley.com, cmerrill@mccarter.com, swu@infoliance.com 
+#   RFC3648          ||       J. Whitehead, J. Reschke, Ed.         ||        ejw@cse.ucsc.edu, julian.reschke@greenbytes.de 
+#   RFC3649          ||       S. Floyd         ||        floyd@acm.org 
+#   RFC3650          ||       S. Sun, L. Lannom, B. Boesch         ||        ssun@cnri.reston.va.us, llannom@cnri.reston.va.us, bboesch@cnri.reston.va.us 
+#   RFC3651          ||       S. Sun, S. Reilly, L. Lannom         ||        ssun@cnri.reston.va.us, sreilly@cnri.reston.va.us, llannom@cnri.reston.va.us 
+#   RFC3652          ||       S. Sun, S. Reilly, L. Lannom, J. Petrone         ||        ssun@cnri.reston.va.us, sreilly@cnri.reston.va.us, llannom@cnri.reston.va.us, jpetrone@cnri.reston.va.us 
+#   RFC3653          ||       J. Boyer, M. Hughes, J. Reagle         ||        jboyer@PureEdge.com, Merlin.Hughes@betrusted.com, reagle@mit.edu 
+#   RFC3654          ||       H. Khosravi, Ed., T. Anderson, Ed.         ||        edbowen@us.ibm.com, rdantu@unt.edu, avri@acm.org, ram.gopal@nokia.com, hadi@znyx.com, muneyb@avaya.com, margaret.wasserman@nokia.com, hormuzd.m.khosravi@intel.com, todd.a.anderson@intel.com 
+#   RFC3655          ||       B. Wellington, O. Gudmundsson         ||        Brian.Wellington@nominum.com, ogud@ogud.com 
+#   RFC3656          ||       R. Siemborski         ||         
+#   RFC3657          ||       S. Moriai, A. Kato         ||        camellia@isl.ntt.co.jp, akato@po.ntts.co.jp 
+#   RFC3658          ||       O. Gudmundsson         ||        ds-rfc@ogud.com 
+#   RFC3659          ||      P. Hethmon         ||       phethmon@hethmon.com
+#   RFC3660          ||       B. Foster, F. Andreasen         ||        bfoster@cisco.com, fandreas@cisco.com 
+#   RFC3661          ||       B. Foster, C. Sivachelvan         ||        chelliah@cisco.com, bfoster@cisco.com 
+#   RFC3662          ||       R. Bless, K. Nichols, K. Wehrle         ||        bless@tm.uka.de, knichols@ieee.org, Klaus.Wehrle@uni-tuebingen.de 
+#   RFC3663          ||       A. Newton         ||        anewton@verisignlabs.com 
+#   RFC3664          ||       P. Hoffman         ||        paul.hoffman@vpnc.org 
+#   RFC3665          ||       A. Johnston, S. Donovan, R. Sparks, C. Cunningham, K. Summers         ||        alan.johnston@mci.com, sdonovan@dynamicsoft.com, rsparks@dynamicsoft.com, ccunningham@dynamicsoft.com, kevin.summers@sonusnet.com 
+#   RFC3666          ||       A. Johnston, S. Donovan, R. Sparks, C. Cunningham, K. Summers         ||        alan.johnston@mci.com, sdonovan@dynamicsoft.com, rsparks@dynamicsoft.com, ccunningham@dynamicsoft.com, kevin.summers@sonusnet.com 
+#   RFC3667          ||       S. Bradner         ||         
+#   RFC3668          ||      S. Bradner         ||       
+#   RFC3669          ||       S. Brim         ||        sbrim@cisco.com 
+#   RFC3670          ||       B. Moore, D. Durham, J. Strassner, A. Westerinen, W. Weiss         ||        remoore@us.ibm.com, david.durham@intel.com, john.strassner@intelliden.com, andreaw@cisco.com, walterweiss@attbi.com 
+#   RFC3671          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
+#   RFC3672          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org, steven.legg@adacel.com.au 
+#   RFC3673          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
+#   RFC3674          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
+#   RFC3675          ||       D. Eastlake 3rd         ||        dee3@torque.pothole.com 
+#   RFC3676          ||       R. Gellens         ||        randy@qualcomm.com 
+#   RFC3677          ||      L. Daigle, Ed., Internet Architecture Board         ||       iab@iab.org
+#   RFC3678          ||       D. Thaler, B. Fenner, B. Quinn         ||        dthaler@microsoft.com, fenner@research.att.com, rcq@ipmulticast.com 
+#   RFC3679          ||       R. Droms         ||        rdroms@cisco.com 
+#   RFC3680          ||      J. Rosenberg         ||       jdrosen@dynamicsoft.com
+#   RFC3681          ||       R. Bush, R. Fink         ||        randy@psg.com, bob@thefinks.com 
+#   RFC3682          ||      V. Gill, J. Heasley, D. Meyer         ||       vijay@umbc.edu, heas@shrubbery.net, dmm@1-4-5.net
+#   RFC3683          ||       M. Rose         ||       mrose17@gmail.com
+#   RFC3684          ||       R. Ogier, F. Templin, M. Lewis         ||        ogier@erg.sri.com, ftemplin@iprg.nokia.com, lewis@erg.sri.com 
+#   RFC3685          ||      C. Daboo         ||       daboo@cyrusoft.com
+#   RFC3686          ||       R. Housley         ||        housley@vigilsec.com 
+#   RFC3687          ||       S. Legg         ||        steven.legg@adacel.com.au 
+#   RFC3688          ||       M. Mealling         ||        michael@verisignlabs.com 
+#   RFC3689          ||       K. Carlberg, R. Atkinson         ||        k.carlberg@cs.ucl.ac.uk, rja@extremenetworks.com 
+#   RFC3690          ||       K. Carlberg, R. Atkinson         ||        k.carlberg@cs.ucl.ac.uk, rja@extremenetworks.com 
+#   RFC3691          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
+#   RFC3692          ||       T. Narten         ||        narten@us.ibm.com 
+#   RFC3693          ||      J. Cuellar, J. Morris, D. Mulligan, J. Peterson, J. Polk         ||       Jorge.Cuellar@siemens.com, jmorris@cdt.org, dmulligan@law.berkeley.edu, jon.peterson@neustar.biz, jmpolk@cisco.com
+#   RFC3694          ||      M. Danley, D. Mulligan, J. Morris, J. Peterson         ||       mre213@nyu.edu, dmulligan@law.berkeley.edu, jmorris@cdt.org, jon.peterson@neustar.biz
+#   RFC3695          ||      M. Luby, L. Vicisano         ||       luby@digitalfountain.com, lorenzo@cisco.com
+#   RFC3696          ||       J. Klensin         ||        john-ietf@jck.com 
+#   RFC3697          ||      J. Rajahalme, A. Conta, B. Carpenter, S. Deering         ||       jarno.rajahalme@nokia.com, aconta@txc.com, brc@zurich.ibm.com
+#   RFC3698          ||       K. Zeilenga, Ed.         ||        Kurt@OpenLDAP.org 
+#   RFC3700          ||      J. Reynolds, Ed., S. Ginoza, Ed.         ||       
+#   RFC3701          ||      R. Fink, R. Hinden         ||       bob@thefinks.com, bob.hinden@gmail.com
+#   RFC3702          ||       J. Loughney, G. Camarillo         ||        John.Loughney@nokia.com, Gonzalo.Camarillo@ericsson.com 
+#   RFC3703          ||       J. Strassner, B. Moore, R. Moats, E. Ellesson         ||        john.strassner@intelliden.com, remoore@us.ibm.com, rmoats@lemurnetworks.net, ellesson@mindspring.com 
+#   RFC3704          ||       F. Baker, P. Savola         ||        fred@cisco.com, psavola@funet.fi 
+#   RFC3705          ||       B. Ray, R. Abbi         ||        rray@pesa.com, Rajesh.Abbi@alcatel.com 
+#   RFC3706          ||       G. Huang, S. Beaulieu, D. Rochefort         ||         
+#   RFC3707          ||       A. Newton         ||        anewton@verisignlabs.com 
+#   RFC3708          ||       E. Blanton, M. Allman         ||        eblanton@cs.purdue.edu, mallman@icir.org 
+#   RFC3709          ||      S. Santesson, R. Housley, T. Freeman         ||       stefans@microsoft.com, housley@vigilsec.com, trevorf@microsoft.com
+#   RFC3710          ||      H. Alvestrand         ||       harald@alvestrand.no
+#   RFC3711          ||      M. Baugher, D. McGrew, M. Naslund, E. Carrara, K. Norrman         ||       mbaugher@cisco.com, elisabetta.carrara@ericsson.com, mcgrew@cisco.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com
+#   RFC3712          ||      P. Fleming, I. McDonald         ||       flemingp@us.ibm.com, flemingp@us.ibm.com, flemingp@us.ibm.com
+#   RFC3713          ||       M. Matsui, J. Nakajima, S. Moriai         ||        matsui@iss.isl.melco.co.jp, june15@iss.isl.melco.co.jp, shiho@rd.scei.sony.co.jp 
+#   RFC3714          ||      S. Floyd, Ed., J. Kempf, Ed.         ||       iab@iab.org
+#   RFC3715          ||       B. Aboba, W. Dixon         ||        bernarda@microsoft.com, ietf-wd@v6security.com 
+#   RFC3716          ||       IAB Advisory Committee         ||        iab@iab.org 
+#   RFC3717          ||       B. Rajagopalan, J. Luciani, D. Awduche         ||        braja@tellium.com, james_luciani@mindspring.com, awduche@awduche.com 
+#   RFC3718          ||       R. McGowan         ||         
+#   RFC3719          ||       J. Parker, Ed.         ||        jparker@axiowave.com 
+#   RFC3720          ||      J. Satran, K. Meth, C. Sapuntzakis, M. Chadalapaka, E. Zeidner         ||       Julian_Satran@il.ibm.com, meth@il.ibm.com, csapuntz@alum.mit.edu, efri@xiv.co.il, cbm@rose.hp.com
+#   RFC3721          ||      M. Bakke, J. Hafner, J. Hufferd, K. Voruganti, M. Krueger         ||       kaladhar@us.ibm.com, mbakke@cisco.com, hafner@almaden.ibm.com, hufferd@us.ibm.com, marjorie_krueger@hp.com
+#   RFC3722          ||       M. Bakke         ||        mbakke@cisco.com 
+#   RFC3723          ||      B. Aboba, J. Tseng, J. Walker, V. Rangan, F. Travostino         ||       bernarda@microsoft.com, joshtseng@yahoo.com, jesse.walker@intel.com, vrangan@brocade.com, travos@nortelnetworks.com
+#   RFC3724          ||      J. Kempf, Ed., R. Austein, Ed., IAB         ||       
+#   RFC3725          ||       J. Rosenberg, J. Peterson, H. Schulzrinne, G. Camarillo         ||        jdrosen@dynamicsoft.com, jon.peterson@neustar.biz, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com 
+#   RFC3726          ||       M. Brunner, Ed.         ||        brunner@netlab.nec.de, robert.hancock@roke.co.uk, eleanor.hepworth@roke.co.uk, cornelia.kappler@siemens.com, Hannes.Tschofenig@mchp.siemens.de 
+#   RFC3727          ||       S. Legg         ||        steven.legg@adacel.com.au 
+#   RFC3728          ||       B. Ray, R. Abbi         ||        rray@pesa.com, Rajesh.Abbi@alcatel.com 
+#   RFC3729          ||       S. Waldbusser         ||        waldbusser@nextbeacon.com 
+#   RFC3730          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC3731          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC3732          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC3733          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC3734          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC3735          ||       S. Hollenbeck         ||        shollenbeck@verisign.com 
+#   RFC3736          ||       R. Droms         ||        rdroms@cisco.com 
+#   RFC3737          ||       B. Wijnen, A. Bierman         ||        bwijnen@lucent.com, andy@yumaworks.com
+#   RFC3738          ||       M. Luby, V. Goyal         ||        luby@digitalfountain.com, v.goyal@ieee.org 
+#   RFC3739          ||       S. Santesson, M. Nystrom, T. Polk         ||        stefans@microsoft.com, wpolk@nist.gov, magnus@rsasecurity.com 
+#   RFC3740          ||       T. Hardjono, B. Weis         ||        thardjono@verisign.com, bew@cisco.com 
+#   RFC3741          ||       J. Boyer, D. Eastlake 3rd, J. Reagle         ||        jboyer@PureEdge.com, Donald.Eastlake@motorola.com, reagle@mit.edu 
+#   RFC3742          ||       S. Floyd         ||        floyd@icir.org 
+#   RFC3743          ||       K. Konishi, K. Huang, H. Qian, Y. Ko         ||        konishi@jp.apan.net, huangk@alum.sinica.edu, Hlqian@cnnic.net.cn, yw@mrko.pe.kr, jseng@pobox.org.sg, rickard@rickardgroup.com 
+#   RFC3744          ||       G. Clemm, J. Reschke, E. Sedlar, J. Whitehead         ||        geoffrey.clemm@us.ibm.com, julian.reschke@greenbytes.de, eric.sedlar@oracle.com, ejw@cse.ucsc.edu 
+#   RFC3745          ||       D. Singer, R. Clark, D. Lee         ||        singer@apple.com, richard@elysium.ltd.uk, dlee@yahoo-inc.com 
+#   RFC3746          ||       L. Yang, R. Dantu, T. Anderson, R. Gopal         ||        lily.l.yang@intel.com, rdantu@unt.edu, todd.a.anderson@intel.com, ram.gopal@nokia.com 
+#   RFC3747          ||       H. Hazewinkel, Ed., D. Partain, Ed.         ||         
+#   RFC3748          ||      B. Aboba, L. Blunk, J. Vollbrecht, J. Carlson, H. Levkowetz, Ed.         ||       bernarda@microsoft.com, ljb@merit.edu, jrv@umich.edu, james.d.carlson@sun.com, henrik@levkowetz.com
+#   RFC3749          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC3750          ||       C. Huitema, R. Austein, S. Satapati, R. van der Pol         ||        huitema@microsoft.com, sra@isc.org, satapati@cisco.com, Ronald.vanderPol@nlnetlabs.nl 
+#   RFC3751          ||      S. Bradner         ||       sob@harvard.edu
+#   RFC3752          ||       A. Barbir, E. Burger, R. Chen, S. McHenry, H. Orman, R. Penno         ||        abbieb@nortelnetworks.com, e.burger@ieee.org, chen@research.att.com, stephen@mchenry.net, ho@alum.mit.edu, rpenno@nortelnetworks.com 
+#   RFC3753          ||       J. Manner, Ed., M. Kojo, Ed.         ||        jmanner@cs.helsinki.fi, kojo@cs.helsinki.fi 
+#   RFC3754          ||       R. Bless, K. Wehrle         ||        bless@tm.uka.de, Klaus.Wehrle@uni-tuebingen.de 
+#   RFC3755          ||      S. Weiler         ||       weiler@tislabs.com
+#   RFC3756          ||       P. Nikander, Ed., J. Kempf, E. Nordmark         ||        pekka.nikander@nomadiclab.com, kempf@docomolabs-usa.com, erik.nordmark@sun.com 
+#   RFC3757          ||       O. Kolkman, J. Schlyter, E. Lewis         ||        olaf@ripe.net, jakob@nic.se, edlewis@arin.net 
+#   RFC3758          ||       R. Stewart, M. Ramalho, Q. Xie, M. Tuexen, P. Conrad         ||       randall@lakerest.net, mramalho@cisco.com, qxie1@email.mot.com, tuexen@fh-muenster.de, conrad@acm.org
+#   RFC3759          ||      L-E. Jonsson         ||       lars-erik.jonsson@ericsson.com
+#   RFC3760          ||      D. Gustafson, M. Just, M. Nystrom         ||       degustafson@comcast.net, Just.Mike@tbs-sct.gc.ca, magnus@rsasecurity.com
+#   RFC3761          ||      P. Faltstrom, M. Mealling         ||       paf@cisco.com
+#   RFC3762          ||      O. Levin         ||       oritl@microsoft.com
+#   RFC3763          ||       S. Shalunov, B. Teitelbaum         ||        shalunov@internet2.edu, ben@internet2.edu 
+#   RFC3764          ||      J. Peterson         ||       jon.peterson@neustar.biz
+#   RFC3765          ||       G. Huston         ||        gih@telstra.net 
+#   RFC3766          ||       H. Orman, P. Hoffman         ||        hilarie@purplestreak.com, paul.hoffman@vpnc.org 
+#   RFC3767          ||       S. Farrell, Ed.         ||         
+#   RFC3768          ||      R. Hinden, Ed.         ||       bob.hinden@gmail.com
+#   RFC3769          ||       S. Miyakawa, R. Droms         ||        miyakawa@nttv6.jp, rdroms@cisco.com 
+#   RFC3770          ||       R. Housley, T. Moore         ||        housley@vigilsec.com, timmoore@microsoft.com 
+#   RFC3771          ||       R. Harrison, K. Zeilenga         ||        roger_harrison@novell.com, Kurt@OpenLDAP.org 
+#   RFC3772          ||       J. Carlson, R. Winslow         ||         
+#   RFC3773          ||       E. Candell         ||        emily.candell@comverse.com 
+#   RFC3774          ||       E. Davies, Ed.         ||         
+#   RFC3775          ||      D. Johnson, C. Perkins, J. Arkko         ||       dbj@cs.rice.edu, charliep@iprg.nokia.com, jari.arkko@ericsson.com
+#   RFC3776          ||       J. Arkko, V. Devarapalli, F. Dupont         ||        jari.arkko@ericsson.com, vijayd@iprg.nokia.com, Francis.Dupont@enst-bretagne.fr 
+#   RFC3777          ||      J. Galvin, Ed.         ||       galvin+ietf@elistx.com
+#   RFC3778          ||      E. Taft, J. Pravetz, S. Zilles, L. Masinter         ||       taft@adobe.com, jpravetz@adobe.com, szilles@adobe.com, LMM@acm.org
+#   RFC3779          ||       C. Lynn, S. Kent, K. Seo         ||        CLynn@BBN.Com, Kent@BBN.Com, KSeo@BBN.Com 
+#   RFC3780          ||       F. Strauss, J. Schoenwaelder         ||        strauss@ibr.cs.tu-bs.de, j.schoenwaelder@iu-bremen.de 
+#   RFC3781          ||       F. Strauss, J. Schoenwaelder         ||        strauss@ibr.cs.tu-bs.de, j.schoenwaelder@iu-bremen.de 
+#   RFC3782          ||      S. Floyd, T. Henderson, A. Gurtov         ||       floyd@acm.org, thomas.r.henderson@boeing.com, andrei.gurtov@teliasonera.com
+#   RFC3783          ||       M. Chadalapaka, R. Elliott         ||        cbm@rose.hp.com, elliott@hp.com 
+#   RFC3784          ||      H. Smit, T. Li         ||       hhwsmit@xs4all.nl, tony.li@tony.li
+#   RFC3785          ||       F. Le Faucheur, R. Uppili, A. Vedrenne, P. Merckx, T. Telkamp         ||        flefauch@cisco.com, alain.vedrenne@equant.com, pierre.merckx@equant.com, telkamp@gblx.net 
+#   RFC3786          ||      A. Hermelin, S. Previdi, M. Shand         ||       amir@montilio.com, sprevidi@cisco.com, mshand@cisco.com
+#   RFC3787          ||       J. Parker, Ed.         ||        jparker@axiowave.com 
+#   RFC3788          ||       J. Loughney, M. Tuexen, Ed., J. Pastor-Balbas         ||        john.loughney@nokia.com, tuexen@fh-muenster.de, j.javier.pastor@ericsson.com 
+#   RFC3789          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
+#   RFC3790          ||       C. Mickles, Ed., P. Nesser, II         ||        cmickles.ee88@gtalumni.org, phil@nesser.com 
+#   RFC3791          ||       C. Olvera, P. Nesser, II         ||        cesar.olvera@consulintel.es, phil@nesser.com 
+#   RFC3792          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
+#   RFC3793          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
+#   RFC3794          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
+#   RFC3795          ||       R. Sofia, P. Nesser, II         ||        rsofia@zmail.pt, phil@nesser.com 
+#   RFC3796          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
+#   RFC3797          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC3798          ||      T. Hansen, Ed., G. Vaudreuil, Ed.         ||       GregV@ieee.org
+#   RFC3801          ||       G. Vaudreuil, G. Parsons         ||        gregv@ieee.org, GParsons@NortelNetworks.com 
+#   RFC3802          ||       G. Vaudreuil, G. Parsons         ||        gregv@ieee.org, gparsons@nortelnetworks.com 
+#   RFC3803          ||       G. Vaudreuil, G. Parsons         ||        gregv@ieee.org, gparsons@nortelnetworks.com 
+#   RFC3804          ||       G. Parsons         ||        gparsons@nortelnetworks.com 
+#   RFC3805          ||      R. Bergman, H. Lewis, I. McDonald         ||       Ron.Bergman@hitachi-ps.us, harryl@us.ibm.com, imcdonald@sharplabs.com
+#   RFC3806          ||       R. Bergman, H. Lewis, I. McDonald         ||        Ron.Bergman@hitachi-ps.us, harryl@us.ibm.com, imcdonald@sharplabs.com 
+#   RFC3807          ||       E. Weilandt, N. Khanchandani, S. Rao         ||        eva.weilandt@temic.com, rsanjay@nortelnetworks.com, neerajk@nortelnetworks.com 
+#   RFC3808          ||       I. McDonald         ||        imcdonald@sharplabs.com, iana@iana.org 
+#   RFC3809          ||       A. Nagarajan, Ed.         ||         
+#   RFC3810          ||       R. Vida, Ed., L. Costa, Ed.         ||        Rolland.Vida@lip6.fr, Luis.Costa@lip6.fr, Serge.Fdida@lip6.fr, deering@cisco.com, fenner@research.att.com, kouvelas@cisco.com, brian@innovationslab.net 
+#   RFC3811          ||      T. Nadeau, Ed., J. Cucchiara, Ed.         ||       tnadeau@cisco.com, jcucchiara@mindspring.com
+#   RFC3812          ||       C. Srinivasan, A. Viswanathan, T. Nadeau         ||        cheenu@bloomberg.net, arunv@force10networks.com, tnadeau@cisco.com 
+#   RFC3813          ||       C. Srinivasan, A. Viswanathan, T. Nadeau         ||        cheenu@bloomberg.net, arunv@force10networks.com, tnadeau@cisco.com 
+#   RFC3814          ||       T. Nadeau, C. Srinivasan, A. Viswanathan         ||        tnadeau@cisco.com, cheenu@bloomberg.net, arunv@force10networks.com 
+#   RFC3815          ||       J. Cucchiara, H. Sjostrand, J. Luciani         ||        james_luciani@mindspring.com, hans@ipunplugged.com, jcucchiara@mindspring.com 
+#   RFC3816          ||       J. Quittek, M. Stiemerling, H. Hartenstein         ||        quittek@netlab.nec.de, stiemerling@netlab.nec.de, hartenstein@rz.uni-karlsruhe.de 
+#   RFC3817          ||       W. Townsley, R. da Silva         ||        mark@townsley.net, rdasilva@va.rr.com 
+#   RFC3818          ||       V. Schryver         ||        vjs@rhyolite.com 
+#   RFC3819          ||       P. Karn, Ed., C. Bormann, G. Fairhurst, D. Grossman, R. Ludwig, J. Mahdavi, G. Montenegro, J. Touch, L. Wood         ||        karn@qualcomm.com, cabo@tzi.org, gorry@erg.abdn.ac.uk, Dan.Grossman@motorola.com, Reiner.Ludwig@ericsson.com, jmahdavi@earthlink.net, gab@sun.com, touch@isi.edu, lwood@cisco.com 
+#   RFC3820          ||       S. Tuecke, V. Welch, D. Engert, L. Pearlman, M. Thompson         ||        tuecke@mcs.anl.gov, vwelch@ncsa.uiuc.edu, deengert@anl.gov, laura@isi.edu, mrthompson@lbl.gov 
+#   RFC3821          ||      M. Rajagopal, E. Rodriguez, R. Weber         ||       
+#   RFC3822          ||      D. Peterson         ||       dap@cnt.com
+#   RFC3823          ||       B. Kovitz         ||        bkovitz@caltech.edu 
+#   RFC3824          ||       J. Peterson, H. Liu, J. Yu, B. Campbell         ||        jon.peterson@neustar.biz, hong.liu@neustar.biz, james.yu@neustar.biz, bcampbell@dynamicsoft.com 
+#   RFC3825          ||      J. Polk, J. Schnizlein, M. Linsner         ||       jmpolk@cisco.com, john.schnizlein@cisco.com, marc.linsner@cisco.com
+#   RFC3826          ||       U. Blumenthal, F. Maino, K. McCloghrie         ||        uri@bell-labs.com, fmaino@andiamo.com, kzm@cisco.com 
+#   RFC3827          ||       K. Sarcar         ||        kanoj.sarcar@sun.com 
+#   RFC3828          ||      L-A. Larzon, M. Degermark, S. Pink, L-E. Jonsson, Ed., G. Fairhurst, Ed.         ||       lln@csee.ltu.se, micke@cs.arizona.edu, steve@cs.arizona.edu, lars-erik.jonsson@ericsson.com, gorry@erg.abdn.ac.uk
+#   RFC3829          ||       R. Weltman, M. Smith, M. Wahl         ||        robw@worldspot.com, mcs@pearlcrescent.com 
+#   RFC3830          ||      J. Arkko, E. Carrara, F. Lindholm, M. Naslund, K. Norrman         ||       jari.arkko@ericsson.com, elisabetta.carrara@ericsson.com, fredrik.lindholm@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com
+#   RFC3831          ||      C. DeSanti         ||       cds@cisco.com
+#   RFC3832          ||       W. Zhao, H. Schulzrinne, E. Guttman, C. Bisdikian, W. Jerome         ||        zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com, bisdik@us.ibm.com, wfj@us.ibm.com 
+#   RFC3833          ||       D. Atkins, R. Austein         ||        derek@ihtfp.com, sra@isc.org 
+#   RFC3834          ||      K. Moore         ||       moore@cs.utk.edu
+#   RFC3835          ||       A. Barbir, R. Penno, R. Chen, M. Hofmann, H. Orman         ||        abbieb@nortelnetworks.com, chen@research.att.com, hofmann@bell-labs.com, ho@alum.mit.edu, rpenno@nortelnetworks.com 
+#   RFC3836          ||       A. Beck, M. Hofmann, H. Orman, R. Penno, A. Terzis         ||        abeck@bell-labs.com, hofmann@bell-labs.com, ho@alum.mit.edu, rpenno@nortelnetworks.com, terzis@cs.jhu.edu 
+#   RFC3837          ||       A. Barbir, O. Batuner, B. Srinivas, M. Hofmann, H. Orman         ||        abbieb@nortelnetworks.com, batuner@attbi.com, bindignavile.srinivas@nokia.com, hofmann@bell-labs.com, ho@alum.mit.edu 
+#   RFC3838          ||       A. Barbir, O. Batuner, A. Beck, T. Chan, H. Orman         ||        abbieb@nortelnetworks.com, batuner@attbi.com, abeck@bell-labs.com, Tat.Chan@nokia.com, ho@alum.mit.edu 
+#   RFC3839          ||      R. Castagno, D. Singer         ||       
+#   RFC3840          ||       J. Rosenberg, H. Schulzrinne, P. Kyzivat         ||        jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, pkyzivat@cisco.com 
+#   RFC3841          ||       J. Rosenberg, H. Schulzrinne, P. Kyzivat         ||        jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, pkyzivat@cisco.com 
+#   RFC3842          ||       R. Mahy         ||        rohan@cisco.com 
+#   RFC3843          ||       L-E. Jonsson, G. Pelletier         ||        lars-erik.jonsson@ericsson.com, ghyslain.pelletier@ericsson.com 
+#   RFC3844          ||      E. Davies, Ed., J. Hofmann, Ed.         ||       elwynd@nortelnetworks.com, jeanette@wz-berlin.de
+#   RFC3845          ||       J. Schlyter, Ed.         ||        jakob@nic.se 
+#   RFC3846          ||      F. Johansson, T. Johansson         ||       fredrik@ipunplugged.com, tony.johansson@bytemobile.com
+#   RFC3847          ||      M. Shand, L. Ginsberg         ||       mshand@cisco.com, ginsberg@cisco.com
+#   RFC3848          ||      C. Newman         ||       chris.newman@sun.com
+#   RFC3849          ||      G. Huston, A. Lord, P. Smith         ||       gih@apnic.net, anne@apnic.net, pfs@cisco.com
+#   RFC3850          ||      B. Ramsdell, Ed.         ||       
+#   RFC3851          ||      B. Ramsdell, Ed.         ||       
+#   RFC3852          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC3853          ||       J. Peterson         ||        jon.peterson@neustar.biz 
+#   RFC3854          ||       P. Hoffman, C. Bonatti, A. Eggen         ||         
+#   RFC3855          ||       P. Hoffman, C. Bonatti         ||        phoffman@imc.org, bonattic@ieca.com 
+#   RFC3856          ||       J. Rosenberg         ||        jdrosen@dynamicsoft.com 
+#   RFC3857          ||       J. Rosenberg         ||        jdrosen@dynamicsoft.com 
+#   RFC3858          ||       J. Rosenberg         ||        jdrosen@dynamicsoft.com 
+#   RFC3859          ||       J. Peterson         ||        jon.peterson@neustar.biz 
+#   RFC3860          ||       J. Peterson         ||        jon.peterson@neustar.biz 
+#   RFC3861          ||       J. Peterson         ||        jon.peterson@neustar.biz 
+#   RFC3862          ||       G. Klyne, D. Atkins         ||        GK-IETF@ninebynine.org, derek@ihtfp.com 
+#   RFC3863          ||       H. Sugano, S. Fujimoto, G. Klyne, A. Bateman, W. Carr, J. Peterson         ||        sugano.h@jp.fujitsu.com, shingo_fujimoto@jp.fujitsu.com, GK@ninebynine.org, bateman@acm.org, wayne.carr@intel.com, jon.peterson@neustar.biz 
+#   RFC3864          ||       G. Klyne, M. Nottingham, J. Mogul         ||        GK-IETF@ninebynine.org, mnot@pobox.com, JeffMogul@acm.org 
+#   RFC3865          ||       C. Malamud         ||        carl@media.org 
+#   RFC3866          ||       K. Zeilenga, Ed.         ||         
+#   RFC3867          ||       Y. Kawatsura, M. Hiroya, H. Beykirch         ||        ykawatsu@itg.hitachi.co.jp, hiroya@st.rim.or.jp, hbbeykirch@web.de 
+#   RFC3868          ||       J. Loughney, Ed., G. Sidebottom, L. Coene, G. Verwimp, J. Keller, B. Bidulock         ||        john.Loughney@nokia.com, greg@signatustechnologies.com, lode.coene@siemens.com, gery.verwimp@siemens.com, joe.keller@tekelec.com, bidulock@openss7.org 
+#   RFC3869          ||       R. Atkinson, Ed., S. Floyd, Ed., Internet Architecture Board         ||        iab@iab.org, iab@iab.org, iab@iab.org 
+#   RFC3870          ||       A. Swartz         ||        me@aaronsw.com 
+#   RFC3871          ||       G. Jones, Ed.         ||        gmj3871@pobox.com 
+#   RFC3872          ||       D. Zinman, D. Walker, J. Jiang         ||        dzinman@rogers.com, david.walker@sedna-wireless.com, jjiang@syndesis.com 
+#   RFC3873          ||       J. Pastor, M. Belinchon         ||        J.Javier.Pastor@ericsson.com, maria.carmen.belinchon@ericsson.com 
+#   RFC3874          ||       R. Housley         ||        housley@vigilsec.com 
+#   RFC3875          ||       D. Robinson, K. Coar         ||        drtr@apache.org, coar@apache.org 
+#   RFC3876          ||       D. Chadwick, S. Mullan         ||        d.w.chadwick@salford.ac.uk, sean.mullan@sun.com 
+#   RFC3877          ||       S. Chisholm, D. Romascanu         ||        schishol@nortelnetworks.com, dromasca@gmail.com  
+#   RFC3878          ||       H. Lam, A. Huynh, D. Perkins         ||        hklam@lucent.com, a_n_huynh@yahoo.com, dperkins@snmpinfo.com 
+#   RFC3879          ||       C. Huitema, B. Carpenter         ||        huitema@microsoft.com, brc@zurich.ibm.com 
+#   RFC3880          ||       J. Lennox, X. Wu, H. Schulzrinne         ||        lennox@cs.columbia.edu, xiaotaow@cs.columbia.edu, schulzrinne@cs.columbia.edu 
+#   RFC3881          ||       G. Marshall         ||        glen.f.marshall@siemens.com 
+#   RFC3882          ||       D. Turk         ||        doughan.turk@bell.ca 
+#   RFC3883          ||       S. Rao, A. Zinin, A. Roy         ||        siraprao@hotmail.com, zinin@psg.com, akr@cisco.com 
+#   RFC3884          ||      J. Touch, L. Eggert, Y. Wang         ||       touch@isi.edu, lars.eggert@netlab.nec.de, yushunwa@isi.edu
+#   RFC3885          ||       E. Allman, T. Hansen         ||        eric@Sendmail.COM, tony+msgtrk@maillennium.att.com 
+#   RFC3886          ||       E. Allman         ||        eric@Sendmail.COM 
+#   RFC3887          ||       T. Hansen         ||        tony+msgtrk@maillennium.att.com 
+#   RFC3888          ||       T. Hansen         ||        tony+msgtrk@maillennium.att.com 
+#   RFC3889          ||               ||       
+#   RFC3890          ||       M. Westerlund         ||        Magnus.Westerlund@ericsson.com 
+#   RFC3891          ||       R. Mahy, B. Biggs, R. Dean         ||        rohan@cisco.com, bbiggs@dumbterm.net, rfc@fdd.com 
+#   RFC3892          ||       R. Sparks         ||        RjS@xten.com 
+#   RFC3893          ||       J. Peterson         ||        jon.peterson@neustar.biz 
+#   RFC3894          ||       J. Degener         ||        jutta@sendmail.com 
+#   RFC3895          ||      O. Nicklass, Ed.         ||       orly_n@rad.com
+#   RFC3896          ||       O. Nicklass, Ed.         ||        orly_n@rad.com 
+#   RFC3897          ||       A. Barbir         ||        abbieb@nortelnetworks.com 
+#   RFC3898          ||       V. Kalusivalingam         ||        vibhaska@cisco.com 
+#   RFC3901          ||       A. Durand, J. Ihren         ||        Alain.Durand@sun.com, johani@autonomica.se 
+#   RFC3902          ||       M. Baker, M. Nottingham         ||        distobj@acm.org, mnot@pobox.com 
+#   RFC3903          ||       A. Niemi, Ed.         ||        aki.niemi@nokia.com 
+#   RFC3904          ||       C. Huitema, R. Austein, S. Satapati, R. van der Pol         ||        huitema@microsoft.com, sra@isc.org, satapati@cisco.com, Ronald.vanderPol@nlnetlabs.nl 
+#   RFC3905          ||       V. See, Ed.         ||        vsee@microsoft.com 
+#   RFC3906          ||       N. Shen, H. Smit         ||        naiming@redback.com, hhwsmit@xs4all.nl 
+#   RFC3909          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
+#   RFC3910          ||      V. Gurbani, Ed., A. Brusilovsky, I. Faynberg, J. Gato, H. Lu, M. Unmehopa         ||       vkg@lucent.com, abrusilovsky@lucent.com, faynberg@lucent.com, jorge.gato@vodafone.com, huilanlu@lucent.com, unmehopa@lucent.com
+#   RFC3911          ||       R. Mahy, D. Petrie         ||        rohan@airespace.com, dpetrie@pingtel.com 
+#   RFC3912          ||       L. Daigle         ||        leslie@verisignlabs.com 
+#   RFC3913          ||      D. Thaler         ||       dthaler@microsoft.com
+#   RFC3914          ||       A. Barbir, A. Rousskov         ||        abbieb@nortelnetworks.com, rousskov@measurement-factory.com 
+#   RFC3915          ||       S. Hollenbeck         ||        shollenbeck@verisign.com 
+#   RFC3916          ||       X. Xiao, Ed., D. McPherson, Ed., P. Pate, Ed.         ||        xxiao@riverstonenet.com, danny@arbor.net, prayson.pate@overturenetworks.com 
+#   RFC3917          ||       J. Quittek, T. Zseby, B. Claise, S. Zander         ||        quittek@netlab.nec.de, zseby@fokus.fhg.de, bclaise@cisco.com, szander@swin.edu.au 
+#   RFC3918          ||       D. Stopp, B. Hickman         ||        debby@ixiacom.com, brooks.hickman@spirentcom.com 
+#   RFC3919          ||       E. Stephan, J. Palet         ||        emile.stephan@francetelecom.com, jordi.palet@consulintel.es 
+#   RFC3920          ||      P. Saint-Andre, Ed.         ||       ietf@stpeter.im
+#   RFC3921          ||      P. Saint-Andre, Ed.         ||       ietf@stpeter.im
+#   RFC3922          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC3923          ||       P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC3924          ||       F. Baker, B. Foster, C. Sharp         ||        fred@cisco.com, bfoster@cisco.com, chsharp@cisco.com 
+#   RFC3925          ||       J. Littlefield         ||        joshl@cisco.com 
+#   RFC3926          ||      T. Paila, M. Luby, R. Lehtonen, V. Roca, R. Walsh         ||       toni.paila@nokia.com, luby@digitalfountain.com, rami.lehtonen@teliasonera.com, vincent.roca@inrialpes.fr, rod.walsh@nokia.com
+#   RFC3927          ||      S. Cheshire, B. Aboba, E. Guttman         ||       rfc@stuartcheshire.org, bernarda@microsoft.com, erik@spybeam.org
+#   RFC3928          ||       R. Megginson, Ed., M. Smith, O. Natkovich, J. Parham         ||        rmegginson0224@aol.com, olgan@yahoo-inc.com, mcs@pearlcrescent.com, jeffparh@microsoft.com 
+#   RFC3929          ||       T. Hardie         ||        hardie@qualcomm.com 
+#   RFC3930          ||       D. Eastlake 3rd         ||        Donald.Eastlake@motorola.com 
+#   RFC3931          ||      J. Lau, Ed., M. Townsley, Ed., I. Goyret, Ed.         ||       jedlau@cisco.com, mark@townsley.net, igoyret@lucent.com
+#   RFC3932          ||      H. Alvestrand         ||       harald@alvestrand.no
+#   RFC3933          ||       J. Klensin, S. Dawkins         ||        john-ietf@jck.com, spencer@mcsr-labs.org 
+#   RFC3934          ||      M. Wasserman         ||       margaret@thingmagic.com
+#   RFC3935          ||       H. Alvestrand         ||        harald@alvestrand.no 
+#   RFC3936          ||       K. Kompella, J. Lang         ||        kireeti@juniper.net, jplang@ieee.org 
+#   RFC3937          ||       M. Steidl         ||        mdirector@iptc.org 
+#   RFC3938          ||       T. Hansen         ||        tony+msgctxt@maillennium.att.com 
+#   RFC3939          ||       G. Parsons, J. Maruszak         ||        gparsons@nortelnetworks.com, jjmaruszak@sympatico.ca 
+#   RFC3940          ||      B. Adamson, C. Bormann, M. Handley, J. Macker         ||       adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil
+#   RFC3941          ||      B. Adamson, C. Bormann, M. Handley, J. Macker         ||       adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil
+#   RFC3942          ||      B. Volz         ||       volz@cisco.com
+#   RFC3943          ||       R. Friend         ||        rfriend@hifn.com 
+#   RFC3944          ||       T. Johnson, S. Okubo, S. Campos         ||        Tyler_Johnson@unc.edu, sokubo@waseda.jp, simao.campos@itu.int 
+#   RFC3945          ||      E. Mannie, Ed.         ||       eric_mannie@hotmail.com
+#   RFC3946          ||       E. Mannie, D. Papadimitriou         ||        eric_mannie@hotmail.com, dimitri.papadimitriou@alcatel.be 
+#   RFC3947          ||       T. Kivinen, B. Swander, A. Huttunen, V. Volpe         ||        kivinen@safenet-inc.com, Ari.Huttunen@F-Secure.com, briansw@microsoft.com, vvolpe@cisco.com 
+#   RFC3948          ||       A. Huttunen, B. Swander, V. Volpe, L. DiBurro, M. Stenberg         ||        Ari.Huttunen@F-Secure.com, briansw@microsoft.com, vvolpe@cisco.com, ldiburro@nortelnetworks.com, markus.stenberg@iki.fi 
+#   RFC3949          ||      R. Buckley, D. Venable, L. McIntyre, G. Parsons, J. Rafferty         ||        rbuckley@crt.xerox.com, dvenable@crt.xerox.com, lloyd10328@pacbell.net, gparsons@nortel.com, jraff@brooktrout.com 
+#   RFC3950          ||      L. McIntyre, G. Parsons, J. Rafferty         ||        lloyd10328@pacbell.net, gparsons@nortel.com, jraff@brooktrout.com 
+#   RFC3951          ||       S. Andersen, A. Duric, H. Astrom, R. Hagen, W. Kleijn, J. Linden         ||        sva@kom.auc.dk, alan.duric@telio.no, henrik.astrom@globalipsound.com, roar.hagen@globalipsound.com, bastiaan.kleijn@globalipsound.com, jan.linden@globalipsound.com 
+#   RFC3952          ||       A. Duric, S. Andersen         ||        alan.duric@telio.no, sva@kom.auc.dk 
+#   RFC3953          ||      J. Peterson         ||       jon.peterson@neustar.biz
+#   RFC3954          ||      B. Claise, Ed.         ||       bclaise@cisco.com
+#   RFC3955          ||       S. Leinen         ||        simon@switch.ch 
+#   RFC3956          ||      P. Savola, B. Haberman         ||       psavola@funet.fi, brian@innovationslab.net
+#   RFC3957          ||       C. Perkins, P. Calhoun         ||        charles.perkins@nokia.com, pcalhoun@airespace.com 
+#   RFC3958          ||       L. Daigle, A. Newton         ||        leslie@thinkingcat.com, anewton@verisignlabs.com 
+#   RFC3959          ||       G. Camarillo         ||        Gonzalo.Camarillo@ericsson.com 
+#   RFC3960          ||       G. Camarillo, H. Schulzrinne         ||        Gonzalo.Camarillo@ericsson.com, schulzrinne@cs.columbia.edu 
+#   RFC3961          ||       K. Raeburn         ||        raeburn@mit.edu 
+#   RFC3962          ||       K. Raeburn         ||        raeburn@mit.edu 
+#   RFC3963          ||       V. Devarapalli, R. Wakikawa, A. Petrescu, P. Thubert         ||        vijay.devarapalli@nokia.com, ryuji@sfc.wide.ad.jp, Alexandru.Petrescu@motorola.com, pthubert@cisco.com 
+#   RFC3964          ||       P. Savola, C. Patel         ||        psavola@funet.fi, chirayu@chirayu.org 
+#   RFC3965          ||      K. Toyoda, H. Ohno, J. Murai, D. Wing         ||       toyoda.kiyoshi@jp.panasonic.com, hohno@ohnolab.org, jun@wide.ad.jp, dwing-ietf@fuggles.com
+#   RFC3966          ||      H. Schulzrinne         ||       hgs@cs.columbia.edu
+#   RFC3967          ||      R. Bush, T. Narten         ||       randy@psg.com, narten@us.ibm.com
+#   RFC3968          ||       G. Camarillo         ||        Gonzalo.Camarillo@ericsson.com 
+#   RFC3969          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC3970          ||      K. Kompella         ||       kireeti@juniper.net
+#   RFC3971          ||      J. Arkko, Ed., J. Kempf, B. Zill, P. Nikander         ||       jari.arkko@ericsson.com, kempf@docomolabs-usa.com, bzill@microsoft.com, Pekka.Nikander@nomadiclab.com
+#   RFC3972          ||      T. Aura         ||       tuomaura@microsoft.com
+#   RFC3973          ||       A. Adams, J. Nicholas, W. Siadak         ||        ala@nexthop.com, jonathan.nicholas@itt.com, wfs@nexthop.com 
+#   RFC3974          ||      M. Nakamura, J. Hagino         ||       motonori@media.kyoto-u.ac.jp, itojun@iijlab.net
+#   RFC3975          ||       G. Huston, Ed., I. Leuca, Ed.         ||        execd@iab.org, ileana.leuca@Cingular.com 
+#   RFC3976          ||       V. K. Gurbani, F. Haerens, V. Rastogi         ||        vkg@lucent.com, frans.haerens@alcatel.be, vidhi.rastogi@wipro.com 
+#   RFC3977          ||      C. Feather         ||       clive@davros.org
+#   RFC3978          ||       S. Bradner, Ed.         ||        sob@harvard.edu 
+#   RFC3979          ||      S. Bradner, Ed.         ||       sob@harvard.edu
+#   RFC3980          ||      M. Krueger, M. Chadalapaka, R. Elliott         ||       marjorie_krueger@hp.com, cbm@rose.hp.com, elliott@hp.com
+#   RFC3981          ||      A. Newton, M. Sanz         ||       anewton@verisignlabs.com, sanz@denic.de
+#   RFC3982          ||       A. Newton, M. Sanz         ||        anewton@verisignlabs.com, sanz@denic.de 
+#   RFC3983          ||       A. Newton, M. Sanz         ||        anewton@verisignlabs.com, sanz@denic.de 
+#   RFC3984          ||      S. Wenger, M.M. Hannuksela, T. Stockhammer, M. Westerlund, D. Singer         ||       stewe@stewe.org, miska.hannuksela@nokia.com, stockhammer@nomor.de, magnus.westerlund@ericsson.com, singer@apple.com
+#   RFC3985          ||      S. Bryant, Ed., P. Pate, Ed.         ||       stbryant@cisco.com, prayson.pate@overturenetworks.com
+#   RFC3986          ||      T. Berners-Lee, R. Fielding, L. Masinter         ||       timbl@w3.org, fielding@gbiv.com, LMM@acm.org
+#   RFC3987          ||      M. Duerst, M. Suignard         ||       duerst@w3.org, michelsu@microsoft.com
+#   RFC3988          ||       B. Black, K. Kompella         ||        ben@layer8.net, kireeti@juniper.net 
+#   RFC3989          ||      M. Stiemerling, J. Quittek, T. Taylor         ||       stiemerling@netlab.nec.de, quittek@netlab.nec.de, tom.taylor.stds@gmail.com
+#   RFC3990          ||       B. O'Hara, P. Calhoun, J. Kempf         ||        bob@airespace.com, pcalhoun@airespace.com, kempf@docomolabs-usa.com 
+#   RFC3991          ||       B. Foster, F. Andreasen         ||        bfoster@cisco.com, fandreas@cisco.com 
+#   RFC3992          ||       B. Foster, F. Andreasen         ||        bfoster@cisco.com, fandreas@cisco.com 
+#   RFC3993          ||       R. Johnson, T. Palaniappan, M. Stapp         ||        raj@cisco.com, athenmoz@cisco.com, mjs@cisco.com 
+#   RFC3994          ||       H. Schulzrinne         ||        hgs@cs.columbia.edu 
+#   RFC3995          ||       R. Herriot, T. Hastings         ||       bob@herriot.com, tom.hastings@alum.mit.edu
+#   RFC3996          ||      R. Herriot, T. Hastings, H. Lewis         ||       bob@herriot.com, tom.hastings@alum.mit.edu, harryl@us.ibm.com
+#   RFC3997          ||      T. Hastings, Ed., R. K. deBry, H. Lewis         ||       tom.hastings@alum.mit.edu, debryro@uvsc.edu, harryl@us.ibm.com
+#   RFC3998          ||      C. Kugler, H. Lewis, T. Hastings, Ed.         ||       kugler@us.ibm.com, harryl@us.ibm.com, tom.hastings@alum.mit.edu
+#   RFC4001          ||       M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder         ||       michael.daniele@syamsoftware.com, brian@innovationslab.net, shawn.routhier@windriver.com, j.schoenwaelder@iu-bremen.de
+#   RFC4002          ||      R. Brandner, L. Conroy, R. Stastny         ||       rudolf.brandner@siemens.com, lwc@roke.co.uk, richard.stastny@oefeg.at
+#   RFC4003          ||      L. Berger         ||       lberger@movaz.com
+#   RFC4004          ||      P. Calhoun, T. Johansson, C. Perkins, T. Hiller, Ed., P. McCann         ||       pcalhoun@cisco.com, tony.johansson@bytemobile.com, Charles.Perkins@nokia.com, tomhiller@lucent.com, mccap@lucent.com
+#   RFC4005          ||      P. Calhoun, G. Zorn, D. Spence, D. Mitton         ||       pcalhoun@cisco.com, gwz@cisco.com, dspence@computer.org, dmitton@circularnetworks.com
+#   RFC4006          ||      H. Hakala, L. Mattila, J-P. Koskinen, M. Stura, J. Loughney         ||       Harri.Hakala@ericsson.com, Leena.Mattila@ericsson.com, juha-pekka.koskinen@nokia.com, marco.stura@nokia.com, John.Loughney@nokia.com
+#   RFC4007          ||      S. Deering, B. Haberman, T. Jinmei, E. Nordmark, B. Zill         ||       none, brian@innovationslab.net, jinmei@isl.rdc.toshiba.co.jp, Erik.Nordmark@sun.com, bzill@microsoft.com
+#   RFC4008          ||      R. Rohit, P. Srisuresh, R. Raghunarayan, N. Pai, C. Wang         ||       rrohit74@hotmail.com, srisuresh@yahoo.com, raraghun@cisco.com, npai@cisco.com, cliffwang2000@yahoo.com
+#   RFC4009          ||       J. Park, S. Lee, J. Kim, J. Lee         ||       khopri@kisa.or.kr, sjlee@kisa.or.kr, jykim@kisa.or.kr, jilee@kisa.or.kr
+#   RFC4010          ||       J. Park, S. Lee, J. Kim, J. Lee         ||       khopri@kisa.or.kr, sjlee@kisa.or.kr, jykim@kisa.or.kr, jilee@kisa.or.kr
+#   RFC4011          ||      S. Waldbusser, J. Saperia, T. Hongal         ||       waldbusser@nextbeacon.com, saperia@jdscons.com, hongal@riverstonenet.com
+#   RFC4012          ||      L. Blunk, J. Damas, F. Parent, A. Robachevsky         ||       ljb@merit.edu, Joao_Damas@isc.org, Florent.Parent@hexago.com, andrei@ripe.net
+#   RFC4013          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4014          ||      R. Droms, J. Schnizlein         ||       rdroms@cisco.com, jschnizl@cisco.com
+#   RFC4015          ||       R. Ludwig, A. Gurtov         ||       Reiner.Ludwig@ericsson.com, andrei.gurtov@cs.helsinki.fi
+#   RFC4016          ||      M. Parthasarathy         ||       mohanp@sbcglobal.net
+#   RFC4017          ||       D. Stanley, J. Walker, B. Aboba         ||       dstanley@agere.com, jesse.walker@intel.com, bernarda@microsoft.com
+#   RFC4018          ||      M. Bakke, J. Hufferd, K. Voruganti, M. Krueger, T. Sperry         ||       mbakke@cisco.com, jlhufferd@comcast.net, kaladhar@us.ibm.com, marjorie_krueger@hp.com, todd_sperry@adaptec.com
+#   RFC4019          ||      G. Pelletier         ||       ghyslain.pelletier@ericsson.com
+#   RFC4020          ||      K. Kompella, A. Zinin         ||       kireeti@juniper.net, zinin@psg.com
+#   RFC4021          ||      G. Klyne, J. Palme         ||       GK-IETF@ninebynine.org, jpalme@dsv.su.se
+#   RFC4022          ||       R. Raghunarayan, Ed.         ||       raraghun@cisco.com
+#   RFC4023          ||      T. Worster, Y. Rekhter, E. Rosen, Ed.         ||       tom.worster@motorola.com, yakov@juniper.net, erosen@cisco.com
+#   RFC4024          ||      G. Parsons, J. Maruszak         ||       gparsons@nortel.com, jjmaruszak@sympatico.ca
+#   RFC4025          ||      M. Richardson         ||       mcr@sandelman.ottawa.on.ca
+#   RFC4026          ||       L. Andersson, T. Madsen         ||       loa@pi.se, tove.madsen@acreo.se
+#   RFC4027          ||      S. Josefsson         ||       simon@josefsson.org
+#   RFC4028          ||      S. Donovan, J. Rosenberg         ||       srd@cisco.com, jdrosen@cisco.com
+#   RFC4029          ||      M. Lind, V. Ksinant, S. Park, A. Baudot, P. Savola         ||       mikael.lind@teliasonera.com, vladimir.ksinant@fr.thalesgroup.com, soohong.park@samsung.com, alain.baudot@francetelecom.com, psavola@funet.fi
+#   RFC4030          ||      M. Stapp, T. Lemon         ||       mjs@cisco.com, Ted.Lemon@nominum.com
+#   RFC4031          ||      M. Carugi, Ed., D. McDysan, Ed.         ||       marco.carugi@nortel.com, dave.mcdysan@mci.com
+#   RFC4032          ||       G. Camarillo, P. Kyzivat         ||       Gonzalo.Camarillo@ericsson.com, pkyzivat@cisco.com
+#   RFC4033          ||      R. Arends, R. Austein, M. Larson, D. Massey, S. Rose         ||       roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov
+#   RFC4034          ||      R. Arends, R. Austein, M. Larson, D. Massey, S. Rose         ||       roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov
+#   RFC4035          ||      R. Arends, R. Austein, M. Larson, D. Massey, S. Rose         ||       roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov
+#   RFC4036          ||      W. Sawyer         ||       wsawyer@ieee.org
+#   RFC4037          ||       A. Rousskov         ||       rousskov@measurement-factory.com
+#   RFC4038          ||       M-K. Shin, Ed., Y-G. Hong, J. Hagino, P. Savola, E. M. Castro         ||       mshin@nist.gov, yghong@pec.etri.re.kr, itojun@iijlab.net, psavola@funet.fi, eva@gsyc.escet.urjc.es
+#   RFC4039          ||       S. Park, P. Kim, B. Volz         ||       soohong.park@samsung.com, kimps@samsung.com, volz@cisco.com
+#   RFC4040          ||      R. Kreuter         ||       ruediger.kreuter@siemens.com
+#   RFC4041          ||      A. Farrel         ||       adrian@olddog.co.uk
+#   RFC4042          ||      M. Crispin         ||       UTF9@Lingling.Panda.COM
+#   RFC4043          ||      D. Pinkas, T. Gindin         ||       Denis.Pinkas@bull.net, tgindin@us.ibm.com
+#   RFC4044          ||      K. McCloghrie         ||       kzm@cisco.com
+#   RFC4045          ||      G. Bourdon         ||       gilles.bourdon@francetelecom.com
+#   RFC4046          ||      M. Baugher, R. Canetti, L. Dondeti, F. Lindholm         ||       mbaugher@cisco.com, canetti@watson.ibm.com, ldondeti@qualcomm.com, fredrik.lindholm@ericsson.com
+#   RFC4047          ||      S. Allen, D. Wells         ||       sla@ucolick.org, dwells@nrao.edu
+#   RFC4048          ||      B. Carpenter         ||       brc@zurich.ibm.com
+#   RFC4049          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC4050          ||      S. Blake-Wilson, G. Karlinger, T. Kobayashi, Y. Wang         ||       sblakewilson@bcisse.com, gregor.karlinger@cio.gv.at, kotetsu@isl.ntt.co.jp, yonwang@uncc.edu
+#   RFC4051          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC4052          ||      L. Daigle, Ed., Internet Architecture Board         ||       iab@iab.org, iab@iab.org
+#   RFC4053          ||      S. Trowbridge, S. Bradner, F. Baker         ||       sjtrowbridge@lucent.com, sob@harvard.edu, fred@cisco.com
+#   RFC4054          ||      J. Strand, Ed.,  A. Chiu, Ed.         ||       jls@research.att.com, chiu@research.att.com
+#   RFC4055          ||      J. Schaad, B. Kaliski, R. Housley         ||       jimsch@exmsft.com, bkaliski@rsasecurity.com, housley@vigilsec.com
+#   RFC4056          ||      J. Schaad         ||       jimsch@exmsft.com
+#   RFC4057          ||      J. Bound, Ed.         ||       jim.bound@hp.com
+#   RFC4058          ||      A. Yegin, Ed., Y. Ohba, R. Penno, G. Tsirtsis, C. Wang         ||       alper.yegin@samsung.com, yohba@tari.toshiba.com, rpenno@juniper.net, G.Tsirtsis@Flarion.com, cliffwangmail@yahoo.com
+#   RFC4059          ||      D. Linsenbardt, S. Pontius, A. Sturgeon         ||       dlinsenbardt@spyrus.com, spontius@spyrus.com, asturgeon@spyrus.com
+#   RFC4060          ||      Q. Xie, D. Pearce         ||       qxie1@email.mot.com, bdp003@motorola.com
+#   RFC4061          ||      V. Manral, R. White, A. Shaikh         ||       vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com
+#   RFC4062          ||      V. Manral, R. White, A. Shaikh         ||       vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com
+#   RFC4063          ||      V. Manral, R. White, A. Shaikh         ||       vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com
+#   RFC4064          ||      A. Patel, K. Leung         ||       alpesh@cisco.com, kleung@cisco.com
+#   RFC4065          ||      J. Kempf         ||       kempf@docomolabs-usa.com
+#   RFC4066          ||      M. Liebsch, Ed., A. Singh, Ed., H. Chaskar, D. Funato, E. Shim         ||       marco.liebsch@netlab.nec.de, asingh1@email.mot.com, hemant.chaskar@airtightnetworks.net, funato@mlab.yrp.nttdocomo.co.jp, eunsoo@research.panasonic.com
+#   RFC4067          ||      J. Loughney, Ed., M. Nakhjiri, C. Perkins, R. Koodli         ||       john.loughney@nokia.com, madjid.nakhjiri@motorola.com, charles.perkins@.nokia.com, rajeev.koodli@nokia.com
+#   RFC4068          ||      R. Koodli, Ed.         ||       Rajeev.Koodli@nokia.com
+#   RFC4069          ||      M. Dodge, B. Ray         ||       mbdodge@ieee.org, rray@pesa.com
+#   RFC4070          ||      M. Dodge, B. Ray         ||       mbdodge@ieee.org, rray@pesa.com
+#   RFC4071          ||      R. Austein, Ed., B. Wijnen, Ed.         ||       sra@isc.org, bwijnen@lucent.com
+#   RFC4072          ||      P. Eronen, Ed., T. Hiller, G. Zorn         ||       pe@iki.fi, tomhiller@lucent.com, gwz@cisco.com
+#   RFC4073          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC4074          ||      Y. Morishita, T. Jinmei         ||       yasuhiro@jprs.co.jp, jinmei@isl.rdc.toshiba.co.jp
+#   RFC4075          ||      V. Kalusivalingam         ||       vibhaska@cisco.com
+#   RFC4076          ||      T. Chown, S. Venaas, A. Vijayabhaskar         ||       tjc@ecs.soton.ac.uk, venaas@uninett.no, vibhaska@cisco.com
+#   RFC4077          ||      A.B. Roach         ||       adam@estacado.net
+#   RFC4078          ||      N. Earnshaw, S. Aoki, A. Ashley, W. Kameyama         ||       nigel.earnshaw@rd.bbc.co.uk, shig@center.jfn.co.jp, aashley@ndsuk.com, wataru@waseda.jp
+#   RFC4079          ||      J. Peterson         ||       jon.peterson@neustar.biz
+#   RFC4080          ||      R. Hancock, G. Karagiannis, J. Loughney, S. Van den Bosch         ||       robert.hancock@roke.co.uk, g.karagiannis@ewi.utwente.nl, john.loughney@nokia.com, sven.van_den_bosch@alcatel.be
+#   RFC4081          ||      H. Tschofenig, D. Kroeselberg         ||       Hannes.Tschofenig@siemens.com, Dirk.Kroeselberg@siemens.com
+#   RFC4082          ||      A. Perrig, D. Song, R. Canetti, J. D. Tygar, B. Briscoe         ||       perrig@cmu.edu, dawnsong@cmu.edu, canetti@watson.ibm.com, doug.tygar@gmail.com, bob.briscoe@bt.com
+#   RFC4083          ||      M. Garcia-Martin         ||       miguel.an.garcia@nokia.com
+#   RFC4084          ||      J. Klensin         ||       john-ietf@jck.com
+#   RFC4085          ||      D. Plonka         ||       plonka@doit.wisc.edu
+#   RFC4086          ||      D. Eastlake 3rd, J. Schiller, S. Crocker         ||       Donald.Eastlake@motorola.com, jis@mit.edu, steve@stevecrocker.com
+#   RFC4087          ||      D. Thaler         ||       dthaler@microsoft.com
+#   RFC4088          ||      D. Black, K. McCloghrie, J. Schoenwaelder         ||       black_david@emc.com, kzm@cisco.com, j.schoenwaelder@iu-bremen.de
+#   RFC4089          ||      S. Hollenbeck, Ed., IAB and IESG         ||       sah@428cobrajet.net, none, none
+#   RFC4090          ||      P. Pan, Ed., G. Swallow, Ed., A. Atlas, Ed.         ||       ppan@hammerheadsystems.com, swallow@cisco.com, aatlas@avici.com
+#   RFC4091          ||      G. Camarillo, J. Rosenberg         ||       Gonzalo.Camarillo@ericsson.com, jdrosen@cisco.com
+#   RFC4092          ||      G. Camarillo, J. Rosenberg         ||       Gonzalo.Camarillo@ericsson.com, jdrosen@cisco.com
+#   RFC4093          ||      F. Adrangi, Ed., H. Levkowetz, Ed.         ||       farid.adrangi@intel.com, henrik@levkowetz.com
+#   RFC4094          ||      J. Manner, X. Fu         ||       jmanner@cs.helsinki.fi, fu@cs.uni-goettingen.de
+#   RFC4095          ||      C. Malamud         ||       carl@media.org
+#   RFC4096          ||      C. Malamud         ||       carl@media.org
+#   RFC4097          ||      M. Barnes, Ed.         ||       mary.barnes@nortel.com
+#   RFC4098          ||      H. Berkowitz, E. Davies, Ed., S. Hares, P. Krishnaswamy, M. Lepp         ||       hcb@gettcomm.com, elwynd@dial.pipex.com, skh@nexthop.com, padma.krishnaswamy@saic.com, mlepp@lepp.com
+#   RFC4101          ||      E. Rescorla, IAB         ||       ekr@rtfm.com, iab@iab.org
+#   RFC4102          ||      P. Jones         ||       paulej@packetizer.com
+#   RFC4103          ||      G. Hellstrom, P. Jones         ||       gunnar.hellstrom@omnitor.se, paulej@packetizer.com
+#   RFC4104          ||      M. Pana, Ed., A. Reyes, A. Barba, D. Moron, M. Brunner         ||       mpana@metasolv.com, mreyes@ac.upc.edu, telabm@mat.upc.es, dmor4477@hotmail.com, brunner@netlab.nec.de
+#   RFC4105          ||      J.-L. Le Roux, Ed., J.-P. Vasseur, Ed., J. Boyle, Ed.         ||       jeanlouis.leroux@francetelecom.com, jpv@cisco.com, jboyle@pdnets.com
+#   RFC4106          ||      J. Viega, D. McGrew         ||       viega@securesoftware.com, mcgrew@cisco.com
+#   RFC4107          ||      S. Bellovin, R. Housley         ||       bellovin@acm.org, housley@vigilsec.com
+#   RFC4108          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC4109          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC4110          ||      R. Callon, M. Suzuki         ||       rcallon@juniper.net, suzuki.muneyoshi@lab.ntt.co.jp
+#   RFC4111          ||      L. Fang, Ed.         ||       luyuanfang@att.com
+#   RFC4112          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC4113          ||      B. Fenner, J. Flick         ||       fenner@research.att.com, john.flick@hp.com
+#   RFC4114          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC4115          ||      O. Aboul-Magd, S. Rabie         ||       osama@nortel.com, rabie@nortel.com
+#   RFC4116          ||      J. Abley, K. Lindqvist, E. Davies, B. Black, V. Gill         ||       jabley@isc.org, kurtis@kurtis.pp.se, elwynd@dial.pipex.com, ben@layer8.net, vgill@vijaygill.com
+#   RFC4117          ||      G. Camarillo, E. Burger, H. Schulzrinne, A. van Wijk         ||       Gonzalo.Camarillo@ericsson.com, eburger@brooktrout.com, schulzrinne@cs.columbia.edu, a.vwijk@viataal.nl
+#   RFC4118          ||      L. Yang, P. Zerfos, E. Sadot         ||       lily.l.yang@intel.com, pzerfos@cs.ucla.edu, esadot@avaya.com
+#   RFC4119          ||      J. Peterson         ||       jon.peterson@neustar.biz
+#   RFC4120          ||      C. Neuman, T. Yu, S. Hartman, K. Raeburn         ||       bcn@isi.edu, tlyu@mit.edu, hartmans-ietf@mit.edu, raeburn@mit.edu
+#   RFC4121          ||      L. Zhu, K. Jaganathan, S. Hartman         ||       LZhu@microsoft.com, karthikj@microsoft.com, hartmans-ietf@mit.edu
+#   RFC4122          ||      P. Leach, M. Mealling, R. Salz         ||       paulle@microsoft.com, michael@refactored-networks.com, rsalz@datapower.com
+#   RFC4123          ||      H. Schulzrinne, C. Agboh         ||       hgs@cs.columbia.edu, charles.agboh@packetizer.com
+#   RFC4124          ||      F. Le Faucheur, Ed.         ||       flefauch@cisco.com
+#   RFC4125          ||      F. Le Faucheur, W. Lai         ||       flefauch@cisco.com, wlai@att.com
+#   RFC4126          ||      J. Ash         ||       gash@att.com
+#   RFC4127          ||      F. Le Faucheur, Ed.         ||       flefauch@cisco.com
+#   RFC4128          ||      W. Lai         ||       wlai@att.com
+#   RFC4129          ||      R. Mukundan, K. Morneault, N. Mangalpally         ||       ranjith.mukundan@wipro.com, kmorneau@cisco.com, narsim@nortelnetworks.com
+#   RFC4130          ||      D. Moberg, R. Drummond         ||       dmoberg@cyclonecommerce.com, rvd2@drummondgroup.com
+#   RFC4131          ||      S. Green, K. Ozawa, E. Cardona, Ed., A. Katsnelson         ||       rubbersoul3@yahoo.com, Kazuyoshi.Ozawa@toshiba.co.jp, katsnelson6@peoplepc.com, e.cardona@cablelabs.com
+#   RFC4132          ||      S. Moriai, A. Kato, M. Kanda         ||       shiho@rd.scei.sony.co.jp, akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp
+#   RFC4133          ||      A. Bierman, K. McCloghrie         ||       andy@yumaworks.com, kzm@cisco.com
+#   RFC4134          ||      P. Hoffman, Ed.         ||       phoffman@imc.org
+#   RFC4135          ||      JH. Choi, G. Daley         ||       jinchoe@samsung.com, greg.daley@eng.monash.edu.au
+#   RFC4136          ||      P. Pillay-Esnault         ||       ppe@cisco.com
+#   RFC4137          ||      J. Vollbrecht, P. Eronen, N. Petroni, Y. Ohba         ||       jrv@mtghouse.com, pe@iki.fi, npetroni@cs.umd.edu, yohba@tari.toshiba.com
+#   RFC4138          ||      P. Sarolahti, M. Kojo         ||       pasi.sarolahti@nokia.com, kojo@cs.helsinki.fi
+#   RFC4139          ||      D. Papadimitriou, J. Drake, J. Ash, A. Farrel, L. Ong         ||       dimitri.papadimitriou@alcatel.be, John.E.Drake2@boeing.com, gash@att.com, adrian@olddog.co.uk, lyong@ciena.com
+#   RFC4140          ||      H. Soliman, C. Castelluccia, K. El Malki, L. Bellier         ||       h.soliman@flarion.com, claude.castelluccia@inria.fr, karim@elmalki.homeip.net, ludovic.bellier@inria.fr
+#   RFC4141          ||      K. Toyoda, D. Crocker         ||       toyoda.kiyoshi@jp.panasonic.com, dcrocker@bbiw.net
+#   RFC4142          ||      D. Crocker, G. Klyne         ||       dcrocker@bbiw.net, GK-IETF@ninebynine.org
+#   RFC4143          ||      K. Toyoda, D. Crocker         ||       toyoda.kiyoshi@jp.panasonic.com, dcrocker@bbiw.net
+#   RFC4144          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC4145          ||      D. Yon, G. Camarillo         ||       yon-comedia@rfdsoftware.com, Gonzalo.Camarillo@ericsson.com
+#   RFC4146          ||      R. Gellens         ||       randy@qualcomm.com
+#   RFC4147          ||      G. Huston         ||       gih@apnic.net
+#   RFC4148          ||      E. Stephan         ||       emile.stephan@francetelecom.com
+#   RFC4149          ||      C. Kalbfleisch, R. Cole, D. Romascanu         ||       ietf@kalbfleisch.us, robert.cole@jhuapl.edu, dromasca@gmail.com 
+#   RFC4150          ||      R. Dietz, R. Cole         ||       rdietz@hifn.com, robert.cole@jhuapl.edu
+#   RFC4151          ||      T. Kindberg, S. Hawke         ||       timothy@hpl.hp.com, sandro@w3.org
+#   RFC4152          ||      K. Tesink, R. Fox         ||       kaj@research.telcordia.com, rfox@telcordia.com
+#   RFC4153          ||      K. Fujimura, M. Terada, D. Eastlake 3rd         ||       fujimura.ko@lab.ntt.co.jp, te@rex.yrp.nttdocomo.co.jp, Donald.Eastlake@motorola.com
+#   RFC4154          ||      M. Terada, K. Fujimura         ||       te@rex.yrp.nttdocomo.co.jp, fujimura.ko@lab.ntt.co.jp
+#   RFC4155          ||      E. Hall         ||       ehall@ntrg.com
+#   RFC4156          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC4157          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC4158          ||      M. Cooper, Y. Dzambasow, P. Hesse, S. Joseph, R. Nicholas         ||       mcooper@orionsec.com, yuriy@anassoc.com, pmhesse@geminisecurity.com, susan.joseph@vdtg.com, richard.nicholas@it.baesystems.com
+#   RFC4159          ||      G. Huston         ||       gih@apnic.net
+#   RFC4160          ||      K. Mimura, K. Yokoyama, T. Satoh, C. Kanaide, C. Allocchio         ||       mimu@miyabi-labo.net, keiyoko@msn.com, zsatou@t-ns.co.jp, icemilk77@yahoo.co.jp, Claudio.Allocchio@garr.it
+#   RFC4161          ||      K. Mimura, K. Yokoyama, T. Satoh, K. Watanabe, C. Kanaide         ||       mimu@miyabi-labo.net, keiyoko@msn.com, zsatou@t-ns.co.jp, knabe@ad.cyberhome.ne.jp, icemilk77@yahoo.co.jp
+#   RFC4162          ||      H.J. Lee, J.H. Yoon, J.I. Lee         ||       jiinii@kisa.or.kr, jhyoon@kisa.or.kr, jilee@kisa.or.kr
+#   RFC4163          ||      L-E. Jonsson         ||       lars-erik.jonsson@ericsson.com
+#   RFC4164          ||      G. Pelletier         ||       ghyslain.pelletier@ericsson.com
+#   RFC4165          ||      T. George, B. Bidulock, R. Dantu, H. Schwarzbauer, K. Morneault         ||       tgeorge_tx@verizon.net, bidulock@openss7.org, rdantu@unt.edu, HannsJuergen.Schwarzbauer@Siemens.com, kmorneau@cisco.com
+#   RFC4166          ||      L. Coene, J. Pastor-Balbas         ||       lode.coene@siemens.com, J.Javier.Pastor@ericsson.com
+#   RFC4167          ||      A. Lindem         ||       acee@cisco.com
+#   RFC4168          ||      J. Rosenberg, H. Schulzrinne, G. Camarillo         ||       jdrosen@cisco.com, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com
+#   RFC4169          ||      V. Torvinen, J. Arkko, M. Naslund         ||       vesa.torvinen@turkuamk.fi, jari.arkko@ericsson.com, mats.naslund@ericsson.com
+#   RFC4170          ||      B. Thompson, T. Koren, D. Wing         ||       brucet@cisco.com, tmima@cisco.com, dwing-ietf@fuggles.com
+#   RFC4171          ||      J. Tseng, K. Gibbons, F. Travostino, C. Du Laney, J. Souza         ||       joshtseng@yahoo.com, kevin.gibbons@mcdata.com, travos@nortel.com, cdl@rincon.com, joes@exmsft.com
+#   RFC4172          ||      C. Monia, R. Mullendore, F. Travostino, W. Jeong, M. Edwards         ||       charles_monia@yahoo.com, Rod.Mullendore@MCDATA.com, travos@nortel.com, wayland@TroikaNetworks.com, mark_edwards@adaptec.com
+#   RFC4173          ||      P. Sarkar, D. Missimer, C. Sapuntzakis         ||       psarkar@almaden.ibm.com, duncan.missimer@ieee.org, csapuntz@alum.mit.edu
+#   RFC4174          ||      C. Monia, J. Tseng, K. Gibbons         ||       charles_monia@yahoo.com, joshtseng@yahoo.com, kevin.gibbons@mcdata.com
+#   RFC4175          ||      L. Gharai, C. Perkins         ||       ladan@isi.edu, csp@csperkins.org
+#   RFC4176          ||      Y. El Mghazli, Ed., T. Nadeau, M. Boucadair, K. Chan, A. Gonguet         ||       yacine.el_mghazli@alcatel.fr, tnadeau@cisco.com, mohamed.boucadair@francetelecom.com, khchan@nortel.com, arnaud.gonguet@alcatel.fr
+#   RFC4177          ||      G. Huston         ||       gih@apnic.net
+#   RFC4178          ||      L. Zhu, P. Leach, K. Jaganathan, W. Ingersoll         ||       lzhu@microsoft.com, paulle@microsoft.com, karthikj@microsoft.com, wyllys.ingersoll@sun.com
+#   RFC4179          ||      S. Kang         ||       sukang@nca.or.kr
+#   RFC4180          ||      Y. Shafranovich         ||       ietf@shaftek.org
+#   RFC4181          ||      C. Heard, Ed.         ||       heard@pobox.com
+#   RFC4182          ||      E. Rosen         ||       erosen@cisco.com
+#   RFC4183          ||      E. Warnicke         ||       eaw@cisco.com
+#   RFC4184          ||      B. Link, T. Hager, J. Flaks         ||       bdl@dolby.com, thh@dolby.com, jasonfl@microsoft.com
+#   RFC4185          ||      J. Klensin         ||       john-ietf@jck.com
+#   RFC4186          ||      H. Haverinen, Ed., J. Salowey, Ed.         ||       henry.haverinen@nokia.com, jsalowey@cisco.com
+#   RFC4187          ||      J. Arkko, H. Haverinen         ||       jari.Arkko@ericsson.com, henry.haverinen@nokia.com
+#   RFC4188          ||      K. Norseth, Ed., E. Bell, Ed.         ||       kenyon.c.norseth@L-3com.com, elbell@ntlworld.com
+#   RFC4189          ||      K. Ono, S. Tachimoto         ||       ono.kumiko@lab.ntt.co.jp, kumiko@cs.columbia.edu, tachimoto.shinya@lab.ntt.co.jp
+#   RFC4190          ||      K. Carlberg, I. Brown, C. Beard         ||       k.carlberg@cs.ucl.ac.uk, I.Brown@cs.ucl.ac.uk, BeardC@umkc.edu
+#   RFC4191          ||      R. Draves, D. Thaler         ||       richdr@microsoft.com, dthaler@microsoft.com
+#   RFC4192          ||      F. Baker, E. Lear, R. Droms         ||       fred@cisco.com, lear@cisco.com, rdroms@cisco.com
+#   RFC4193          ||      R. Hinden, B. Haberman         ||       bob.hinden@gmail.com, brian@innovationslab.net
+#   RFC4194          ||      J. Strombergson, L. Walleij, P. Faltstrom         ||       Joachim.Strombergson@InformAsic.com, triad@df.lth.se, paf@cisco.com
+#   RFC4195          ||      W. Kameyama         ||       wataru@waseda.jp
+#   RFC4196          ||      H.J. Lee, J.H. Yoon, S.L. Lee, J.I. Lee         ||       jiinii@kisa.or.kr, jhyoon@kisa.or.kr, sllee@kisa.or.kr, jilee@kisa.or.kr
+#   RFC4197          ||      M. Riegel, Ed.         ||       maximilian.riegel@siemens.com
+#   RFC4198          ||      D. Tessman         ||       dtessman@zelestra.com
+#   RFC4201          ||      K. Kompella, Y. Rekhter, L. Berger         ||       kireeti@juniper.net, yakov@juniper.net, lberger@movaz.com
+#   RFC4202          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
+#   RFC4203          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
+#   RFC4204          ||      J. Lang, Ed.         ||       jplang@ieee.org
+#   RFC4205          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
+#   RFC4206          ||      K. Kompella, Y. Rekhter         ||       kireeti@juniper.net, yakov@juniper.net
+#   RFC4207          ||      J. Lang, D. Papadimitriou         ||       jplang@ieee.org, dimitri.papadimitriou@alcatel.be
+#   RFC4208          ||      G. Swallow, J. Drake, H. Ishimatsu, Y. Rekhter         ||       swallow@cisco.com, John.E.Drake2@boeing.com, hirokazu.ishimatsu@g1m.jp, yakov@juniper.net
+#   RFC4209          ||      A. Fredette, Ed., J. Lang, Ed.         ||       Afredette@HatterasNetworks.com, jplang@ieee.org
+#   RFC4210          ||      C. Adams, S. Farrell, T. Kause, T. Mononen         ||       cadams@site.uottawa.ca, stephen.farrell@cs.tcd.ie, toka@ssh.com, tmononen@safenet-inc.com
+#   RFC4211          ||      J. Schaad         ||       jimsch@exmsft.com
+#   RFC4212          ||      M. Blinov, C. Adams         ||       mikblinov@online.ie, cadams@site.uottawa.ca
+#   RFC4213          ||      E. Nordmark, R. Gilligan         ||       erik.nordmark@sun.com, bob.gilligan@acm.org
+#   RFC4214          ||      F. Templin, T. Gleeson, M. Talwar, D. Thaler         ||       fltemplin@acm.org, tgleeson@cisco.com, mohitt@microsoft.com, dthaler@microsoft.com
+#   RFC4215          ||      J. Wiljakka, Ed.         ||       juha.wiljakka@nokia.com
+#   RFC4216          ||      R. Zhang, Ed., J.-P. Vasseur, Ed.         ||       raymond_zhang@infonet.com, jpv@cisco.com
+#   RFC4217          ||      P. Ford-Hutchinson         ||       rfc4217@ford-hutchinson.com
+#   RFC4218          ||      E. Nordmark, T. Li         ||       erik.nordmark@sun.com, Tony.Li@tony.li
+#   RFC4219          ||      E. Lear         ||       lear@cisco.com
+#   RFC4220          ||      M. Dubuc, T. Nadeau, J. Lang         ||       mdubuc@ncf.ca, tnadeau@cisco.com, jplang@ieee.org
+#   RFC4221          ||      T. Nadeau, C. Srinivasan, A. Farrel         ||       tnadeau@cisco.com, cheenu@bloomberg.net, adrian@olddog.co.uk
+#   RFC4222          ||      G. Choudhury, Ed.         ||       gchoudhury@att.com
+#   RFC4223          ||      P. Savola         ||       psavola@funet.fi
+#   RFC4224          ||      G. Pelletier, L-E. Jonsson, K. Sandlund         ||       ghyslain.pelletier@ericsson.com, lars-erik.jonsson@ericsson.com, kristofer.sandlund@ericsson.com
+#   RFC4225          ||      P. Nikander, J. Arkko, T. Aura, G. Montenegro, E. Nordmark         ||       pekka.nikander@nomadiclab.com, jari.arkko@ericsson.com, Tuomaura@microsoft.com, gabriel_montenegro_2000@yahoo.com, erik.nordmark@sun.com
+#   RFC4226          ||      D. M'Raihi, M. Bellare, F. Hoornaert, D. Naccache, O. Ranen         ||       davidietf@gmail.com, mihir@cs.ucsd.edu, frh@vasco.com, david.naccache@gemplus.com, Ohad.Ranen@ealaddin.com
+#   RFC4227          ||      E. O'Tuathail, M. Rose         ||       eamon.otuathail@clipcode.com, mrose17@gmail.com
+#   RFC4228          ||      A. Rousskov         ||       rousskov@measurement-factory.com
+#   RFC4229          ||      M. Nottingham, J. Mogul         ||       mnot@pobox.com, JeffMogul@acm.org
+#   RFC4230          ||      H. Tschofenig, R. Graveman         ||       Hannes.Tschofenig@siemens.com, rfg@acm.org
+#   RFC4231          ||      M. Nystrom         ||       magnus@rsasecurity.com
+#   RFC4233          ||      K. Morneault, S. Rengasami, M. Kalla, G. Sidebottom         ||       kmorneau@cisco.com, mkalla@telcordia.com, selvam@trideaworks.com, greg@signatustechnologies.com
+#   RFC4234          ||      D. Crocker, Ed., P. Overell         ||       dcrocker@bbiw.net, paul@bayleaf.org.uk
+#   RFC4235          ||      J. Rosenberg, H. Schulzrinne, R. Mahy, Ed.         ||       jdrosen@cisco.com, schulzrinne@cs.columbia.edu, rohan@ekabal.com
+#   RFC4236          ||      A. Rousskov, M. Stecher         ||       rousskov@measurement-factory.com, martin.stecher@webwasher.com
+#   RFC4237          ||      G. Vaudreuil         ||       GregV@ieee.org
+#   RFC4238          ||      G. Vaudreuil         ||       GregV@ieee.org
+#   RFC4239          ||      S. McRae, G. Parsons         ||       stuart.mcrae@uk.ibm.com, gparsons@nortel.com
+#   RFC4240          ||      E. Burger, Ed., J. Van Dyke, A. Spitzer         ||       eburger@brooktrout.com, jvandyke@brooktrout.com, woof@brooktrout.com
+#   RFC4241          ||      Y. Shirasaki, S. Miyakawa, T. Yamasaki, A. Takenouchi         ||       yasuhiro@nttv6.jp, miyakawa@nttv6.jp, t.yamasaki@ntt.com, takenouchi.ayako@lab.ntt.co.jp
+#   RFC4242          ||      S. Venaas, T. Chown, B. Volz         ||       venaas@uninett.no, tjc@ecs.soton.ac.uk, volz@cisco.com
+#   RFC4243          ||      M. Stapp, R. Johnson, T. Palaniappan         ||       mjs@cisco.com, raj@cisco.com, athenmoz@cisco.com
+#   RFC4244          ||      M. Barnes, Ed.         ||       mary.barnes@nortel.com
+#   RFC4245          ||      O. Levin, R. Even         ||       oritl@microsoft.com, roni.even@polycom.co.il
+#   RFC4246          ||      M. Dolan         ||       md.1@newtbt.com
+#   RFC4247          ||      J. Ash, B. Goode, J. Hand, R. Zhang         ||       gash@att.com, bgoode@att.com, jameshand@att.com, raymond.zhang@bt.infonet.com
+#   RFC4248          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC4249          ||      B. Lilly         ||       blilly@erols.com
+#   RFC4250          ||      S. Lehtinen, C. Lonvick, Ed.         ||       sjl@ssh.com, clonvick@cisco.com
+#   RFC4251          ||      T. Ylonen, C. Lonvick, Ed.         ||       ylo@ssh.com, clonvick@cisco.com
+#   RFC4252          ||      T. Ylonen, C. Lonvick, Ed.         ||       ylo@ssh.com, clonvick@cisco.com
+#   RFC4253          ||      T. Ylonen, C. Lonvick, Ed.         ||       ylo@ssh.com, clonvick@cisco.com
+#   RFC4254          ||      T. Ylonen, C. Lonvick, Ed.         ||       ylo@ssh.com, clonvick@cisco.com
+#   RFC4255          ||      J. Schlyter, W. Griffin         ||       jakob@openssh.com, wgriffin@sparta.com
+#   RFC4256          ||      F. Cusack, M. Forssen         ||       frank@savecore.net, maf@appgate.com
+#   RFC4257          ||      G. Bernstein, E. Mannie, V. Sharma, E. Gray         ||       gregb@grotto-networking.com, eric.mannie@perceval.net, v.sharma@ieee.org, Eric.Gray@Marconi.com
+#   RFC4258          ||      D. Brungard, Ed.         ||       dbrungard@att.com
+#   RFC4259          ||      M.-J. Montpetit, G. Fairhurst, H. Clausen, B. Collini-Nocker, H. Linder         ||       mmontpetit@motorola.com, gorry@erg.abdn.ac.uk, h.d.clausen@ieee.org, bnocker@cosy.sbg.ac.at, hlinder@cosy.sbg.ac.at
+#   RFC4260          ||      P. McCann         ||       mccap@lucent.com
+#   RFC4261          ||      J. Walker, A. Kulkarni, Ed.         ||       jesse.walker@intel.com, amol.kulkarni@intel.com
+#   RFC4262          ||      S. Santesson         ||       stefans@microsoft.com
+#   RFC4263          ||      B. Lilly         ||       blilly@erols.com
+#   RFC4264          ||      T. Griffin, G. Huston         ||       Timothy.Griffin@cl.cam.ac.uk, gih@apnic.net
+#   RFC4265          ||      B. Schliesser, T. Nadeau         ||       bensons@savvis.net, tnadeau@cisco.com
+#   RFC4266          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC4267          ||      M. Froumentin         ||       mf@w3.org
+#   RFC4268          ||      S. Chisholm, D. Perkins         ||       schishol@nortel.com, dperkins@snmpinfo.com
+#   RFC4269          ||      H.J. Lee, S.J. Lee, J.H. Yoon, D.H. Cheon, J.I. Lee         ||       jiinii@kisa.or.kr, sjlee@kisa.or.kr, jhyoon@kisa.or.kr, dhcheon@mmaa.or.kr, jilee@kisa.or.kr
+#   RFC4270          ||      P. Hoffman, B. Schneier         ||       paul.hoffman@vpnc.org, schneier@counterpane.com
+#   RFC4271          ||      Y. Rekhter, Ed., T. Li, Ed., S. Hares, Ed.         ||       yakov@juniper.net, tony.li@tony.li, skh@nexthop.com
+#   RFC4272          ||      S. Murphy         ||       Sandy@tislabs.com
+#   RFC4273          ||      J. Haas, Ed., S. Hares, Ed.         ||       jhaas@nexthop.com, skh@nexthop.com
+#   RFC4274          ||      D. Meyer, K. Patel         ||       dmm@1-4-5.net, keyupate@cisco.com
+#   RFC4275          ||      S. Hares, D. Hares         ||       skh@nexthop.com, dhares@hickoryhill-consulting.com
+#   RFC4276          ||      S. Hares, A. Retana         ||       skh@nexthop.com, aretana@cisco.com
+#   RFC4277          ||      D. McPherson, K. Patel         ||       danny@arbor.net, keyupate@cisco.com
+#   RFC4278          ||      S. Bellovin, A. Zinin         ||       bellovin@acm.org, zinin@psg.com
+#   RFC4279          ||      P. Eronen, Ed., H. Tschofenig, Ed.         ||       pe@iki.fi, Hannes.Tschofenig@siemens.com
+#   RFC4280          ||      K. Chowdhury, P. Yegani, L. Madour         ||       kchowdhury@starentnetworks.com, pyegani@cisco.com, Lila.Madour@ericsson.com
+#   RFC4281          ||      R. Gellens, D. Singer, P. Frojdh         ||       randy@qualcomm.com, singer@apple.com, Per.Frojdh@ericsson.com
+#   RFC4282          ||      B. Aboba, M. Beadles, J. Arkko, P. Eronen         ||       bernarda@microsoft.com, mbeadles@endforce.com, jari.arkko@ericsson.com, pe@iki.fi
+#   RFC4283          ||      A. Patel, K. Leung, M. Khalil, H. Akhtar, K. Chowdhury         ||       alpesh@cisco.com, kleung@cisco.com, mkhalil@nortel.com, haseebak@nortel.com, kchowdhury@starentnetworks.com
+#   RFC4284          ||      F. Adrangi, V. Lortz, F. Bari, P. Eronen         ||       farid.adrangi@intel.com, victor.lortz@intel.com, farooq.bari@cingular.com, pe@iki.fi
+#   RFC4285          ||      A. Patel, K. Leung, M. Khalil, H. Akhtar, K. Chowdhury         ||       alpesh@cisco.com, kleung@cisco.com, mkhalil@nortel.com, haseebak@nortel.com, kchowdhury@starentnetworks.com
+#   RFC4286          ||      B. Haberman, J. Martin         ||       brian@innovationslab.net, jim@netzwert.ag
+#   RFC4287          ||      M. Nottingham, Ed., R. Sayre, Ed.         ||       mnot@pobox.com, rfsayre@boswijck.com
+#   RFC4288          ||      N. Freed, J. Klensin         ||       ned.freed@mrochek.com, klensin+ietf@jck.com
+#   RFC4289          ||      N. Freed, J. Klensin         ||       ned.freed@mrochek.com, klensin+ietf@jck.com
+#   RFC4290          ||      J. Klensin         ||       john-ietf@jck.com
+#   RFC4291          ||      R. Hinden, S. Deering         ||       bob.hinden@gmail.com
+#   RFC4292          ||      B. Haberman         ||       brian@innovationslab.net
+#   RFC4293          ||      S. Routhier, Ed.         ||       sar@iwl.com
+#   RFC4294          ||      J. Loughney, Ed.         ||       john.loughney@nokia.com
+#   RFC4295          ||      G. Keeni, K. Koide, K. Nagami, S. Gundavelli         ||       glenn@cysols.com, koide@shiratori.riec.tohoku.ac.jp, nagami@inetcore.com, sgundave@cisco.com
+#   RFC4296          ||      S. Bailey, T. Talpey         ||       steph@sandburst.com, thomas.talpey@netapp.com
+#   RFC4297          ||      A. Romanow, J. Mogul, T. Talpey, S. Bailey         ||       allyn@cisco.com, JeffMogul@acm.org, thomas.talpey@netapp.com, steph@sandburst.com
+#   RFC4298          ||      J.-H. Chen, W. Lee, J. Thyssen         ||       rchen@broadcom.com, wlee@broadcom.com, jthyssen@broadcom.com
+#   RFC4301          ||      S. Kent, K. Seo         ||       kent@bbn.com, kseo@bbn.com
+#   RFC4302          ||      S. Kent         ||       kent@bbn.com
+#   RFC4303          ||      S. Kent         ||       kent@bbn.com
+#   RFC4304          ||      S. Kent         ||       kent@bbn.com
+#   RFC4305          ||      D. Eastlake 3rd         ||       Donald.Eastlake@Motorola.com
+#   RFC4306          ||      C. Kaufman, Ed.         ||       charliek@microsoft.com
+#   RFC4307          ||      J. Schiller         ||       jis@mit.edu
+#   RFC4308          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC4309          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC4310          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC4311          ||      R. Hinden, D. Thaler         ||       bob.hinden@gmail.com, dthaler@microsoft.com
+#   RFC4312          ||      A. Kato, S. Moriai, M. Kanda         ||       akato@po.ntts.co.jp, shiho@rd.scei.sony.co.jp, kanda@isl.ntt.co.jp
+#   RFC4313          ||      D. Oran         ||       oran@cisco.com
+#   RFC4314          ||      A. Melnikov         ||       alexey.melnikov@isode.com
+#   RFC4315          ||       M. Crispin         ||       MRC@CAC.Washington.EDU
+#   RFC4316          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC4317          ||      A. Johnston, R. Sparks         ||       ajohnston@tello.com, rjsparks@estacado.net
+#   RFC4318          ||      D. Levi, D. Harrington         ||       dlevi@nortel.com, ietfdbh@comcast.net
+#   RFC4319          ||      C. Sikes, B. Ray, R. Abbi         ||       csikes@zhone.com, rray@pesa.com, Rajesh.Abbi@alcatel.com
+#   RFC4320          ||      R. Sparks         ||       rjsparks@estacado.net
+#   RFC4321          ||      R. Sparks         ||       rjsparks@estacado.net
+#   RFC4322          ||      M. Richardson, D.H. Redelmeier         ||       mcr@sandelman.ottawa.on.ca, hugh@mimosa.com
+#   RFC4323          ||      M. Patrick, W. Murwin         ||       michael.patrick@motorola.com, w.murwin@motorola.com
+#   RFC4324          ||      D. Royer, G. Babics, S. Mansour         ||       Doug@IntelliCal.com, george.babics@oracle.com, smansour@ebay.com
+#   RFC4325          ||      S. Santesson, R. Housley         ||       stefans@microsoft.com, housley@vigilsec.com
+#   RFC4326          ||      G. Fairhurst, B. Collini-Nocker         ||       gorry@erg.abdn.ac.uk, bnocker@cosy.sbg.ac.at
+#   RFC4327          ||      M. Dubuc, T. Nadeau, J. Lang, E. McGinnis         ||       dubuc.consulting@sympatico.ca, tnadeau@cisco.com, jplang@ieee.org, emcginnis@hammerheadsystems.com
+#   RFC4328          ||      D. Papadimitriou, Ed.         ||       dimitri.papadimitriou@alcatel.be
+#   RFC4329          ||      B. Hoehrmann         ||       bjoern@hoehrmann.de
+#   RFC4330          ||      D. Mills         ||       mills@udel.edu
+#   RFC4331          ||      B. Korver, L. Dusseault         ||       briank@networkresonance.com, lisa.dusseault@gmail.com
+#   RFC4332          ||      K. Leung, A. Patel, G. Tsirtsis, E. Klovning         ||       kleung@cisco.com, alpesh@cisco.com, g.tsirtsis@flarion.com, espen@birdstep.com
+#   RFC4333          ||      G. Huston, Ed., B. Wijnen, Ed.         ||       gih@apnic.net, bwijnen@lucent.com
+#   RFC4334          ||      R. Housley, T. Moore         ||       housley@vigilsec.com, timmoore@microsoft.com
+#   RFC4335          ||      J. Galbraith, P. Remaker         ||       galb-list@vandyke.com, remaker@cisco.com
+#   RFC4336          ||      S. Floyd, M. Handley, E. Kohler         ||       floyd@icir.org, M.Handley@cs.ucl.ac.uk, kohler@cs.ucla.edu
+#   RFC4337          ||      Y Lim, D. Singer         ||       young@netntv.co.kr, singer@apple.com
+#   RFC4338          ||      C. DeSanti, C. Carlson, R. Nixon         ||       cds@cisco.com, craig.carlson@qlogic.com, bob.nixon@emulex.com
+#   RFC4339          ||      J. Jeong, Ed.         ||       jjeong@cs.umn.edu
+#   RFC4340          ||      E. Kohler, M. Handley, S. Floyd         ||       kohler@cs.ucla.edu, M.Handley@cs.ucl.ac.uk, floyd@icir.org
+#   RFC4341          ||      S. Floyd, E. Kohler         ||       floyd@icir.org, kohler@cs.ucla.edu
+#   RFC4342          ||      S. Floyd, E. Kohler, J. Padhye         ||       floyd@icir.org, kohler@cs.ucla.edu, padhye@microsoft.com
+#   RFC4343          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC4344          ||      M. Bellare, T. Kohno, C. Namprempre         ||       mihir@cs.ucsd.edu, tkohno@cs.ucsd.edu, meaw@alum.mit.edu
+#   RFC4345          ||      B. Harris         ||       bjh21@bjh21.me.uk
+#   RFC4346          ||      T. Dierks, E. Rescorla         ||       tim@dierks.org, ekr@rtfm.com
+#   RFC4347          ||      E. Rescorla, N. Modadugu         ||       ekr@rtfm.com, nagendra@cs.stanford.edu
+#   RFC4348          ||      S. Ahmadi         ||       sassan.ahmadi@ieee.org
+#   RFC4349          ||      C. Pignataro, M. Townsley         ||       cpignata@cisco.com, mark@townsley.net
+#   RFC4350          ||      F. Hendrikx, C. Wallis         ||       ferry.hendrikx@ssc.govt.nz, colin.wallis@ssc.govt.nz
+#   RFC4351          ||      G. Hellstrom, P. Jones         ||       gunnar.hellstrom@omnitor.se, paulej@packetizer.com
+#   RFC4352          ||      J. Sjoberg, M. Westerlund, A. Lakaniemi, S. Wenger         ||       Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, Stephan.Wenger@nokia.com
+#   RFC4353          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC4354          ||      M. Garcia-Martin         ||       miguel.an.garcia@nokia.com
+#   RFC4355          ||      R. Brandner, L. Conroy, R. Stastny         ||       rudolf.brandner@siemens.com, lwc@roke.co.uk, Richard.stastny@oefeg.at
+#   RFC4356          ||      R. Gellens         ||       randy@qualcomm.com
+#   RFC4357          ||      V. Popov, I. Kurepkin, S. Leontiev         ||       vpopov@cryptopro.ru, kure@cryptopro.ru, lse@cryptopro.ru
+#   RFC4358          ||      D. Smith         ||       dwight.smith@motorola.com
+#   RFC4359          ||      B. Weis         ||       bew@cisco.com
+#   RFC4360          ||      S. Sangli, D. Tappan, Y. Rekhter         ||       rsrihari@cisco.com, tappan@cisco.com, yakov@juniper.net
+#   RFC4361          ||      T. Lemon, B. Sommerfeld         ||       mellon@nominum.com, sommerfeld@sun.com
+#   RFC4362          ||      L-E. Jonsson, G. Pelletier, K. Sandlund         ||       lars-erik.jonsson@ericsson.com, ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com
+#   RFC4363          ||      D. Levi, D. Harrington         ||       dlevi@nortel.com, ietfdbh@comcast.net
+#   RFC4364          ||      E. Rosen, Y. Rekhter         ||       erosen@cisco.com, yakov@juniper.net
+#   RFC4365          ||      E. Rosen         ||       erosen@cisco.com
+#   RFC4366          ||      S. Blake-Wilson, M. Nystrom, D. Hopwood, J. Mikkelsen, T. Wright         ||       sblakewilson@bcisse.com, magnus@rsasecurity.com, david.hopwood@blueyonder.co.uk, janm@transactionware.com, timothy.wright@vodafone.com
+#   RFC4367          ||      J. Rosenberg, Ed., IAB         ||       jdrosen@cisco.com
+#   RFC4368          ||      T. Nadeau, S. Hegde         ||       tnadeau@cisco.com, subrah@cisco.com
+#   RFC4369          ||      K. Gibbons, C. Monia, J. Tseng, F. Travostino         ||       kevin.gibbons@mcdata.com, charles_monia@yahoo.com, joshtseng@yahoo.com, travos@nortel.com
+#   RFC4370          ||      R. Weltman         ||       robw@worldspot.com
+#   RFC4371          ||      B. Carpenter, Ed., L. Lynch, Ed.         ||       brc@zurich.ibm.com, llynch@darkwing.uoregon.edu
+#   RFC4372          ||      F. Adrangi, A. Lior, J. Korhonen, J. Loughney         ||       farid.adrangi@intel.com, avi@bridgewatersystems.com, jouni.korhonen@teliasonera.com, john.loughney@nokia.com
+#   RFC4373          ||      R. Harrison, J. Sermersheim, Y. Dong         ||       rharrison@novell.com, jimse@novell.com, yulindong@gmail.com
+#   RFC4374          ||      G. McCobb         ||       mccobb@us.ibm.com
+#   RFC4375          ||      K. Carlberg         ||       carlberg@g11.org.uk
+#   RFC4376          ||      P. Koskelainen, J. Ott, H. Schulzrinne, X. Wu         ||       petri.koskelainen@nokia.com, jo@netlab.hut.fi, hgs@cs.columbia.edu, xiaotaow@cs.columbia.edu
+#   RFC4377          ||      T. Nadeau, M. Morrow, G. Swallow, D. Allan, S. Matsushima         ||       tnadeau@cisco.com, mmorrow@cisco.com, swallow@cisco.com, dallan@nortel.com, satoru@ft.solteria.net
+#   RFC4378          ||      D. Allan, Ed., T. Nadeau, Ed.         ||       dallan@nortel.com, tnadeau@cisco.com
+#   RFC4379          ||      K. Kompella, G. Swallow         ||       kireeti@juniper.net, swallow@cisco.com
+#   RFC4380          ||      C. Huitema         ||       huitema@microsoft.com
+#   RFC4381          ||      M. Behringer         ||       mbehring@cisco.com
+#   RFC4382          ||      T. Nadeau, Ed., H. van der Linde, Ed.         ||       tnadeau@cisco.com, havander@cisco.com
+#   RFC4383          ||      M. Baugher, E. Carrara         ||       mbaugher@cisco.com, carrara@kth.se
+#   RFC4384          ||      D. Meyer         ||       dmm@1-4-5.net
+#   RFC4385          ||      S. Bryant, G. Swallow, L. Martini, D. McPherson         ||       stbryant@cisco.com, swallow@cisco.com, lmartini@cisco.com, danny@arbor.net
+#   RFC4386          ||      S. Boeyen, P. Hallam-Baker         ||       sharon.boeyen@entrust.com, pbaker@VeriSign.com
+#   RFC4387          ||      P. Gutmann, Ed.         ||       pgut001@cs.auckland.ac.nz
+#   RFC4388          ||      R. Woundy, K. Kinnear         ||       richard_woundy@cable.comcast.com, kkinnear@cisco.com
+#   RFC4389          ||      D. Thaler, M. Talwar, C. Patel         ||       dthaler@microsoft.com, mohitt@microsoft.com, chirayu@chirayu.org
+#   RFC4390          ||      V. Kashyap         ||       vivk@us.ibm.com
+#   RFC4391          ||      J. Chu, V. Kashyap         ||       jerry.chu@sun.com, vivk@us.ibm.com
+#   RFC4392          ||      V. Kashyap         ||       vivk@us.ibm.com
+#   RFC4393          ||      H. Garudadri         ||       hgarudadri@qualcomm.com
+#   RFC4394          ||      D. Fedyk, O. Aboul-Magd, D. Brungard, J. Lang, D. Papadimitriou         ||       dwfedyk@nortel.com, osama@nortel.com, dbrungard@att.com, jplang@ieee.org, dimitri.papadimitriou@alcatel.be
+#   RFC4395          ||      T. Hansen, T. Hardie, L. Masinter         ||       tony+urireg@maillennium.att.com, hardie@qualcomm.com, LMM@acm.org
+#   RFC4396          ||      J. Rey, Y. Matsui         ||       jose.rey@eu.panasonic.com, matsui.yoshinori@jp.panasonic.com
+#   RFC4397          ||      I. Bryskin, A. Farrel         ||       i_bryskin@yahoo.com, adrian@olddog.co.uk
+#   RFC4398          ||      S. Josefsson         ||       simon@josefsson.org
+#   RFC4401          ||      N. Williams         ||       Nicolas.Williams@sun.com
+#   RFC4402          ||      N. Williams         ||       Nicolas.Williams@sun.com
+#   RFC4403          ||      B. Bergeson, K. Boogert, V. Nanjundaswamy         ||       bruce.bergeson@novell.com, kent.boogert@novell.com, vijay.nanjundaswamy@oracle.com
+#   RFC4404          ||      R. Natarajan, A. Rijhsinghani         ||       anil@charter.net, r.natarajan@f5.com
+#   RFC4405          ||      E. Allman, H. Katz         ||       eric@sendmail.com, hkatz@microsoft.com
+#   RFC4406          ||      J. Lyon, M. Wong         ||       jimlyon@microsoft.com, mengwong@dumbo.pobox.com
+#   RFC4407          ||      J. Lyon         ||       jimlyon@microsoft.com
+#   RFC4408          ||      M. Wong, W. Schlitt         ||       mengwong+spf@pobox.com, wayne@schlitt.net
+#   RFC4409          ||      R. Gellens, J. Klensin         ||       g+ietf@qualcomm.com, john+ietf@jck.com
+#   RFC4410          ||      M. Pullen, F. Zhao, D. Cohen         ||       mpullen@gmu.edu, fzhao@netlab.gmu.edu, danny.cohen@sun.com
+#   RFC4411          ||      J. Polk         ||       jmpolk@cisco.com
+#   RFC4412          ||      H. Schulzrinne, J. Polk         ||       hgs@cs.columbia.edu, jmpolk@cisco.com
+#   RFC4413          ||      M. West, S. McCann         ||       mark.a.west@roke.co.uk, stephen.mccann@roke.co.uk
+#   RFC4414          ||       A. Newton         ||       andy@hxr.us
+#   RFC4415          ||      R. Brandner, L. Conroy, R. Stastny         ||       rudolf.brandner@siemens.com, lwc@roke.co.uk, Richard.stastny@oefeg.at
+#   RFC4416          ||      J. Wong, Ed.         ||       j.k.wong@sympatico.ca
+#   RFC4417          ||      P. Resnick, Ed., P. Saint-Andre, Ed.         ||       presnick@qti.qualcomm.com, ietf@stpeter.im
+#   RFC4418          ||      T. Krovetz, Ed.         ||       tdk@acm.org
+#   RFC4419          ||      M. Friedl, N. Provos, W. Simpson         ||       markus@openbsd.org, provos@citi.umich.edu, wsimpson@greendragon.com
+#   RFC4420          ||      A. Farrel, Ed., D. Papadimitriou, J.-P. Vasseur, A. Ayyangar         ||       adrian@olddog.co.uk, dimitri.papadimitriou@alcatel.be, jpv@cisco.com, arthi@juniper.net
+#   RFC4421          ||      C. Perkins         ||       csp@csperkins.org
+#   RFC4422          ||      A. Melnikov, Ed.,  K. Zeilenga, Ed.         ||       Alexey.Melnikov@isode.com, Kurt@OpenLDAP.org
+#   RFC4423          ||      R. Moskowitz, P. Nikander         ||       rgm@icsalabs.com, pekka.nikander@nomadiclab.com
+#   RFC4424          ||      S. Ahmadi         ||       sassan.ahmadi@ieee.org
+#   RFC4425          ||      A. Klemets         ||       Anders.Klemets@microsoft.com
+#   RFC4426          ||      J. Lang, Ed., B. Rajagopalan, Ed., D. Papadimitriou, Ed.         ||       jplang@ieee.org, balar@microsoft.com, dimitri.papadimitriou@alcatel.be
+#   RFC4427          ||      E. Mannie, Ed., D. Papadimitriou, Ed.         ||       eric.mannie@perceval.net, dimitri.papadimitriou@alcatel.be
+#   RFC4428          ||      D. Papadimitriou, Ed., E. Mannie, Ed.         ||       dimitri.papadimitriou@alcatel.be, eric.mannie@perceval.net
+#   RFC4429          ||      N. Moore         ||       sharkey@zoic.org
+#   RFC4430          ||      S. Sakane, K. Kamada, M. Thomas, J. Vilhuber         ||       Shouichi.Sakane@jp.yokogawa.com, Ken-ichi.Kamada@jp.yokogawa.com, mat@cisco.com, vilhuber@cisco.com
+#   RFC4431          ||      M. Andrews, S. Weiler         ||       Mark_Andrews@isc.org,  weiler@tislabs.com
+#   RFC4432          ||      B. Harris         ||       bjh21@bjh21.me.uk
+#   RFC4433          ||      M. Kulkarni, A. Patel, K. Leung         ||       mkulkarn@cisco.com, alpesh@cisco.com, kleung@cisco.com
+#   RFC4434          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC4435          ||      Y. Nomura, R. Walsh, J-P. Luoma, H. Asaeda, H. Schulzrinne         ||       nom@flab.fujitsu.co.jp, rod.walsh@nokia.com, juha-pekka.luoma@nokia.com, asaeda@wide.ad.jp, schulzrinne@cs.columbia.edu
+#   RFC4436          ||      B. Aboba, J. Carlson, S. Cheshire         ||       bernarda@microsoft.com, james.d.carlson@sun.com, rfc@stuartcheshire.org
+#   RFC4437          ||      J. Whitehead, G. Clemm, J. Reschke, Ed.         ||       ejw@cse.ucsc.edu, julian.reschke@greenbytes.degeoffrey.clemm@us.ibm.com, 
+#   RFC4438          ||      C. DeSanti, V. Gaonkar, H.K. Vivek, K. McCloghrie, S. Gai         ||       cds@cisco.com, vgaonkar@cisco.com, hvivek@cisco.com, kzm@cisco.com, none
+#   RFC4439          ||      C. DeSanti, V. Gaonkar, K. McCloghrie, S. Gai         ||       cds@cisco.com, vgaonkar@cisco.com, kzm@cisco.com, none
+#   RFC4440          ||      S. Floyd, Ed., V. Paxson, Ed., A. Falk, Ed., IAB         ||       floyd@acm.org, vern@icir.org, falk@isi.edu
+#   RFC4441          ||      B. Aboba, Ed.         ||       bernarda@microsoft.com
+#   RFC4442          ||      S. Fries, H. Tschofenig         ||       steffen.fries@siemens.com, Hannes.Tschofenig@siemens.com
+#   RFC4443          ||      A. Conta, S. Deering, M. Gupta, Ed.         ||       aconta@txc.com, none, mukesh.gupta@tropos.com
+#   RFC4444          ||      J. Parker, Ed.         ||       jeffp@middlebury.edu
+#   RFC4445          ||      J. Welch, J. Clark         ||       Jim.Welch@ineoquest.com, jiclark@cisco.com
+#   RFC4446          ||      L. Martini         ||       lmartini@cisco.com
+#   RFC4447          ||      L. Martini, Ed., E. Rosen, N. El-Aawar, T. Smith, G. Heron         ||       lmartini@cisco.com, nna@level3.net, giles.heron@tellabs.com, erosen@cisco.com, tob@netapp.com
+#   RFC4448          ||      L. Martini, Ed., E. Rosen, N. El-Aawar, G. Heron         ||       lmartini@cisco.com, nna@level3.net, giles.heron@tellabs.com, erosen@cisco.com
+#   RFC4449          ||      C. Perkins         ||       charles.perkins@nokia.com
+#   RFC4450          ||      E. Lear, H. Alvestrand         ||       lear@cisco.com, harald@alvestrand.no
+#   RFC4451          ||      D. McPherson, V. Gill         ||       danny@arbor.net, VijayGill9@aol.com
+#   RFC4452          ||      H. Van de Sompel, T. Hammond, E. Neylon, S. Weibel         ||       herbertv@lanl.gov, t.hammond@nature.com, eneylon@manifestsolutions.com, weibel@oclc.org
+#   RFC4453          ||      J. Rosenberg, G. Camarillo, Ed., D. Willis         ||       jdrosen@cisco.com, Gonzalo.Camarillo@ericsson.com, dean.willis@softarmor.com
+#   RFC4454          ||      S. Singh, M. Townsley, C. Pignataro         ||       sanjeevs@cisco.com, mark@townsley.net, cpignata@cisco.com
+#   RFC4455          ||      M. Hallak-Stamler, M. Bakke, Y. Lederman, M. Krueger, K. McCloghrie         ||       michele@sanrad.com, mbakke@cisco.com, yaronled@bezeqint.net, marjorie_krueger@hp.com, kzm@cisco.com
+#   RFC4456          ||      T. Bates, E. Chen, R. Chandra         ||       tbates@cisco.com, enkechen@cisco.com, rchandra@sonoasystems.com
+#   RFC4457          ||      G. Camarillo, G. Blanco         ||       Gonzalo.Camarillo@ericsson.com, german.blanco@ericsson.com
+#   RFC4458          ||      C. Jennings, F. Audet, J. Elwell         ||       fluffy@cisco.com, audet@nortel.com, john.elwell@siemens.com
+#   RFC4459          ||      P. Savola         ||       psavola@funet.fi
+#   RFC4460          ||      R. Stewart, I. Arias-Rodriguez, K. Poon, A. Caro, M. Tuexen         ||       randall@lakerest.net, ivan.arias-rodriguez@nokia.com, kacheong.poon@sun.com, acaro@bbn.com, tuexen@fh-muenster.de
+#   RFC4461          ||      S. Yasukawa, Ed.         ||       yasukawa.seisho@lab.ntt.co.jp
+#   RFC4462          ||      J. Hutzelman, J. Salowey, J. Galbraith, V. Welch         ||       jhutz+@cmu.edu, jsalowey@cisco.com, galb@vandyke.com, welch@mcs.anl.gov
+#   RFC4463          ||      S. Shanmugham, P. Monaco, B. Eberman         ||       sarvi@cisco.com, peter.monaco@nuasis.com, brian.eberman@speechworks.com
+#   RFC4464          ||      A. Surtees, M. West         ||       abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk
+#   RFC4465          ||      A. Surtees, M. West         ||       abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk
+#   RFC4466          ||      A. Melnikov, C. Daboo         ||       Alexey.Melnikov@isode.com, cyrus@daboo.name
+#   RFC4467          ||      M. Crispin         ||       MRC@CAC.Washington.EDU
+#   RFC4468          ||      C. Newman         ||       chris.newman@sun.com
+#   RFC4469          ||      P. Resnick         ||       presnick@qti.qualcomm.com
+#   RFC4470          ||      S. Weiler, J. Ihren         ||       weiler@tislabs.com, johani@autonomica.se
+#   RFC4471          ||      G. Sisson, B. Laurie         ||       geoff@nominet.org.uk, ben@algroup.co.uk
+#   RFC4472          ||      A. Durand, J. Ihren, P. Savola         ||       Alain_Durand@cable.comcast.com, johani@autonomica.se, psavola@funet.fi
+#   RFC4473          ||      Y. Nomura, R. Walsh, J-P. Luoma, J. Ott, H. Schulzrinne         ||       nom@flab.fujitsu.co.jp, rod.walsh@nokia.com, juha-pekka.luoma@nokia.com, jo@netlab.tkk.fi, schulzrinne@cs.columbia.edu
+#   RFC4474          ||      J. Peterson,  C. Jennings         ||       jon.peterson@neustar.biz, fluffy@cisco.com
+#   RFC4475          ||      R. Sparks, Ed., A. Hawrylyshen, A. Johnston, J. Rosenberg, H. Schulzrinne         ||       RjS@estacado.net, ahawrylyshen@ditechnetworks.com, alan@sipstation.com, jdrosen@cisco.com, hgs@cs.columbia.edu
+#   RFC4476          ||      C. Francis, D. Pinkas         ||       Chris_S_Francis@Raytheon.com, Denis.Pinkas@bull.net
+#   RFC4477          ||      T. Chown, S. Venaas, C. Strauf         ||       tjc@ecs.soton.ac.uk, venaas@uninett.no, strauf@rz.tu-clausthal.de
+#   RFC4478          ||      Y. Nir         ||       ynir@checkpoint.com
+#   RFC4479          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC4480          ||      H. Schulzrinne, V. Gurbani, P. Kyzivat, J. Rosenberg         ||       hgs+simple@cs.columbia.edu, vkg@lucent.com, pkyzivat@cisco.com, jdrosen@cisco.com
+#   RFC4481          ||      H. Schulzrinne         ||       hgs+simple@cs.columbia.edu
+#   RFC4482          ||      H. Schulzrinne         ||       hgs+simple@cs.columbia.edu
+#   RFC4483          ||      E. Burger, Ed.         ||       eburger@cantata.com
+#   RFC4484          ||      J. Peterson, J. Polk, D. Sicker, H. Tschofenig         ||       jon.peterson@neustar.biz, jmpolk@cisco.com, douglas.sicker@colorado.edu, Hannes.Tschofenig@siemens.com
+#   RFC4485          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@cisco.com, schulzrinne@cs.columbia.edu
+#   RFC4486          ||      E. Chen, V. Gillet         ||       enkechen@cisco.com, vgi@opentransit.net
+#   RFC4487          ||      F. Le, S. Faccin, B. Patil, H. Tschofenig         ||       franckle@cmu.edu, sfaccinstd@gmail.com, Basavaraj.Patil@nokia.com, Hannes.Tschofenig@siemens.com
+#   RFC4488          ||      O. Levin         ||       oritl@microsoft.com
+#   RFC4489          ||      J-S. Park, M-K. Shin, H-J. Kim         ||       pjs@etri.re.kr, myungki.shin@gmail.com, khj@etri.re.kr
+#   RFC4490          ||      S. Leontiev, Ed., G. Chudov, Ed.         ||       lse@cryptopro.ru, chudov@cryptopro.ru
+#   RFC4491          ||      S. Leontiev, Ed., D. Shefanovski, Ed.         ||       lse@cryptopro.ru, dbs@mts.ru
+#   RFC4492          ||      S. Blake-Wilson, N. Bolyard, V. Gupta, C. Hawk, B. Moeller         ||       sblakewilson@safenet-inc.com, nelson@bolyard.com, vipul.gupta@sun.com, chris@corriente.net, bodo@openssl.org
+#   RFC4493          ||      JH. Song, R. Poovendran, J. Lee, T. Iwata         ||       songlee@ee.washington.edu, radha@ee.washington.edu, icheol.lee@samsung.com, iwata@cse.nagoya-u.ac.jp
+#   RFC4494          ||      JH. Song, R. Poovendran, J. Lee         ||       songlee@ee.washington.edu, radha@ee.washington.edu, jicheol.lee@samsung.com
+#   RFC4495          ||      J. Polk, S. Dhesikan         ||       jmpolk@cisco.com, sdhesika@cisco.com
+#   RFC4496          ||      M. Stecher, A. Barbir         ||       martin.stecher@webwasher.com, abbieb@nortel.com
+#   RFC4497          ||      J. Elwell, F. Derks, P. Mourot, O. Rousseau         ||       john.elwell@siemens.com, frank.derks@nec-philips.com, Patrick.Mourot@alcatel.fr, Olivier.Rousseau@alcatel.fr 
+#   RFC4498          ||      G. Keeni         ||       glenn@cysols.com
+#   RFC4501          ||      S. Josefsson         ||       simon@josefsson.org
+#   RFC4502          ||      S. Waldbusser         ||       waldbusser@nextbeacon.com
+#   RFC4503          ||      M. Boesgaard, M. Vesterager, E. Zenner         ||       mab@cryptico.com, mvp@cryptico.com, ez@cryptico.com
+#   RFC4504          ||      H. Sinnreich, Ed.,  S. Lass, C. Stredicke         ||       henry@pulver.com, steven.lass@verizonbusiness.com, cs@snom.de
+#   RFC4505          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4506          ||      M. Eisler, Ed.         ||       email2mre-rfc4506@yahoo.com
+#   RFC4507          ||      J. Salowey, H. Zhou, P. Eronen, H. Tschofenig         ||       jsalowey@cisco.com, hzhou@cisco.com, pe@iki.fi, Hannes.Tschofenig@siemens.com
+#   RFC4508          ||      O. Levin, A. Johnston         ||       oritl@microsoft.com, ajohnston@ipstation.com
+#   RFC4509          ||      W. Hardaker         ||       hardaker@tislabs.com
+#   RFC4510          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
+#   RFC4511          ||      J. Sermersheim, Ed.         ||       jimse@novell.com
+#   RFC4512          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
+#   RFC4513          ||      R. Harrison, Ed.         ||       roger_harrison@novell.com
+#   RFC4514          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
+#   RFC4515          ||      M. Smith, Ed., T. Howes         ||       mcs@pearlcrescent.com, howes@opsware.com
+#   RFC4516          ||      M. Smith, Ed., T. Howes         ||       mcs@pearlcrescent.com, howes@opsware.com
+#   RFC4517          ||      S. Legg, Ed.         ||       steven.legg@eb2bcom.com
+#   RFC4518          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4519          ||      A. Sciberras, Ed.         ||       andrew.sciberras@eb2bcom.com
+#   RFC4520          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4521          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4522          ||      S. Legg         ||       steven.legg@eb2bcom.com
+#   RFC4523          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4524          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
+#   RFC4525          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4526          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4527          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4528          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4529          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4530          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4531          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4532          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
+#   RFC4533          ||      K. Zeilenga, J.H. Choi         ||       Kurt@OpenLDAP.org, jongchoi@us.ibm.com
+#   RFC4534          ||      A Colegrove, H Harney         ||       acc@sparta.com, hh@sparta.com
+#   RFC4535          ||      H. Harney, U. Meth, A. Colegrove, G. Gross         ||       hh@sparta.com, umeth@sparta.com, acc@sparta.com, gmgross@identaware.com
+#   RFC4536          ||      P. Hoschka         ||       ph@w3.org
+#   RFC4537          ||      L. Zhu, P. Leach, K. Jaganathan         ||       lzhu@microsoft.com, paulle@microsoft.com, karthikj@microsoft.com
+#   RFC4538          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC4539          ||      T. Edwards         ||       tedwards@pbs.org
+#   RFC4540          ||      M. Stiemerling, J. Quittek, C. Cadar         ||       stiemerling@netlab.nec.de, quittek@netlab.nec.de, ccadar2@yahoo.com
+#   RFC4541          ||      M. Christensen, K. Kimball, F. Solensky         ||       mjc@tt.dk, karen.kimball@hp.com, frank.solensky@calix.com
+#   RFC4542          ||      F. Baker, J. Polk         ||       fred@cisco.com, jmpolk@cisco.com
+#   RFC4543          ||      D. McGrew, J. Viega         ||       mcgrew@cisco.com, viega@list.org
+#   RFC4544          ||      M. Bakke, M. Krueger, T. McSweeney, J. Muchow         ||       mbakke@cisco.com, marjorie_krueger@hp.com, tommcs@us.ibm.com, james.muchow@qlogic.com
+#   RFC4545          ||      M. Bakke, J. Muchow         ||       mbakke@cisco.com, james.muchow@qlogic.com
+#   RFC4546          ||      D. Raftus, E. Cardona         ||       david.raftus@ati.com, e.cardona@cablelabs.com
+#   RFC4547          ||      A. Ahmad, G. Nakanishi         ||       azlina@cisco.com, gnakanishi@motorola.com
+#   RFC4548          ||      E. Gray, J. Rutemiller, G. Swallow         ||       Eric.Gray@Marconi.com, John.Rutemiller@Marconi.com, swallow@cisco.com
+#   RFC4549          ||      A. Melnikov, Ed.         ||       alexey.melnikov@isode.com
+#   RFC4550          ||      S. Maes, A. Melnikov         ||       stephane.maes@oracle.com, Alexey.melnikov@isode.com
+#   RFC4551          ||      A. Melnikov, S. Hole         ||       Alexey.Melnikov@isode.com, Steve.Hole@messagingdirect.com
+#   RFC4552          ||      M. Gupta, N. Melam         ||       mukesh.gupta@tropos.com, nmelam@juniper.net
+#   RFC4553          ||      A. Vainshtein, Ed., YJ. Stein, Ed.         ||       sasha@axerra.com, yaakov_s@rad.com
+#   RFC4554          ||      T. Chown         ||       tjc@ecs.soton.ac.uk
+#   RFC4555          ||      P. Eronen         ||       pe@iki.fi
+#   RFC4556          ||      L. Zhu, B. Tung         ||       lzhu@microsoft.com, brian@aero.org
+#   RFC4557          ||      L. Zhu, K. Jaganathan, N. Williams         ||       lzhu@microsoft.com, karthikj@microsoft.com, Nicolas.Williams@sun.com
+#   RFC4558          ||      Z. Ali, R. Rahman, D. Prairie, D. Papadimitriou         ||       zali@cisco.com, rrahman@cisco.com, dprairie@cisco.com, dimitri.papadimitriou@alcatel.be
+#   RFC4559          ||      K. Jaganathan, L. Zhu, J. Brezak         ||       karthikj@microsoft.com, lzhu@microsoft.com, jbrezak@microsoft.com
+#   RFC4560          ||      J. Quittek, Ed., K. White, Ed.         ||       quittek@netlab.nec.de, wkenneth@us.ibm.com
+#   RFC4561          ||      J.-P. Vasseur, Ed., Z. Ali, S. Sivabalan         ||       jpv@cisco.com, zali@cisco.com, msiva@cisco.com
+#   RFC4562          ||      T. Melsen, S. Blake         ||       Torben.Melsen@ericsson.com, steven.blake@ericsson.com
+#   RFC4563          ||      E. Carrara, V. Lehtovirta, K. Norrman         ||       carrara@kth.se, vesa.lehtovirta@ericsson.com, karl.norrman@ericsson.com
+#   RFC4564          ||      S. Govindan, Ed., H. Cheng, ZH. Yao, WH. Zhou, L. Yang         ||       saravanan.govindan@sg.panasonic.com, hong.cheng@sg.panasonic.com, yaoth@huawei.com, zhouwenhui@chinamobile.com, lily.l.yang@intel.com
+#   RFC4565          ||      D. Loher, D. Nelson, O. Volinsky, B. Sarikaya         ||       dplore@gmail.com, dnelson@enterasys.com, ovolinsky@colubris.com, sarikaya@ieee.org
+#   RFC4566          ||      M. Handley, V. Jacobson, C. Perkins         ||       M.Handley@cs.ucl.ac.uk, van@packetdesign.com, csp@csperkins.org
+#   RFC4567          ||      J. Arkko, F. Lindholm, M. Naslund, K. Norrman, E. Carrara         ||       jari.arkko@ericsson.com, fredrik.lindholm@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com, carrara@kth.se
+#   RFC4568          ||      F. Andreasen, M. Baugher, D. Wing         ||       fandreas@cisco.com, mbaugher@cisco.com, dwing-ietf@fuggles.com
+#   RFC4569          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC4570          ||      B. Quinn, R. Finlayson         ||       rcq@boxnarrow.com, finlayson@live555.com
+#   RFC4571          ||      J. Lazzaro         ||       lazzaro@cs.berkeley.edu
+#   RFC4572          ||      J. Lennox         ||       lennox@cs.columbia.edu
+#   RFC4573          ||      R. Even, A. Lochbaum         ||        roni.even@polycom.co.il, alochbaum@polycom.com
+#   RFC4574          ||      O. Levin, G. Camarillo         ||       oritl@microsoft.com, Gonzalo.Camarillo@ericsson.com
+#   RFC4575          ||      J. Rosenberg, H. Schulzrinne, O. Levin, Ed.         ||       jdrosen@cisco.com, schulzrinne@cs.columbia.edu, oritl@microsoft.com
+#   RFC4576          ||      E. Rosen, P. Psenak, P. Pillay-Esnault         ||       erosen@cisco.com, ppsenak@cisco.com, ppe@cisco.com
+#   RFC4577          ||      E. Rosen, P. Psenak, P. Pillay-Esnault         ||       erosen@cisco.com, ppsenak@cisco.com, ppe@cisco.com
+#   RFC4578          ||      M. Johnston, S. Venaas, Ed.         ||       michael.johnston@intel.com, venaas@uninett.no
+#   RFC4579          ||      A. Johnston, O. Levin         ||       alan@sipstation.com, oritl@microsoft.com
+#   RFC4580          ||      B. Volz         ||       volz@cisco.com
+#   RFC4581          ||      M. Bagnulo, J. Arkko         ||       marcelo@it.uc3m.es, jari.arkko@ericsson.com
+#   RFC4582          ||      G. Camarillo, J. Ott, K. Drage         ||       Gonzalo.Camarillo@ericsson.com, jo@netlab.hut.fi, drage@lucent.com
+#   RFC4583          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC4584          ||      S. Chakrabarti, E. Nordmark         ||       samitac2@gmail.com, erik.nordmark@sun.com
+#   RFC4585          ||      J. Ott, S. Wenger, N. Sato, C. Burmeister, J. Rey         ||       jo@acm.org, stewe@stewe.org, sato652@oki.com, carsten.burmeister@eu.panasonic.com, jose.rey@eu.panasonic.com
+#   RFC4586          ||      C. Burmeister, R. Hakenberg, A. Miyazaki, J. Ott, N. Sato, S. Fukunaga         ||       carsten.burmeister@eu.panasonic.com, rolf.hakenberg@eu.panasonic.com, miyazaki.akihiro@jp.panasonic.com, jo@acm.org, sato652@oki.com, fukunaga444@oki.com
+#   RFC4587          ||      R. Even         ||       roni.even@polycom.co.il
+#   RFC4588          ||      J. Rey, D. Leon, A. Miyazaki, V. Varsa, R. Hakenberg         ||       jose.rey@eu.panasonic.com, davidleon123@yahoo.com, miyazaki.akihiro@jp.panasonic.com, viktor.varsa@nokia.com, rolf.hakenberg@eu.panasonic.com
+#   RFC4589          ||      H. Schulzrinne, H. Tschofenig         ||       schulzrinne@cs.columbia.edu, Hannes.Tschofenig@siemens.com
+#   RFC4590          ||      B. Sterman, D. Sadolevsky, D. Schwartz, D. Williams, W. Beck         ||       baruch@kayote.com, dscreat@dscreat.com, david@kayote.com, dwilli@cisco.com, beckw@t-systems.com
+#   RFC4591          ||      M. Townsley, G. Wilkie, S. Booth, S. Bryant, J. Lau         ||       mark@townsley.net, gwilkie@cisco.com, jebooth@cisco.com, stbryant@cisco.com, jedlau@gmail.com
+#   RFC4592          ||      E. Lewis         ||       ed.lewis@neustar.biz
+#   RFC4593          ||      A. Barbir, S. Murphy, Y. Yang         ||       abbieb@nortel.com, sandy@sparta.com, yiya@cisco.com
+#   RFC4594          ||      J. Babiarz, K. Chan, F. Baker         ||       babiarz@nortel.com, khchan@nortel.com, fred@cisco.com
+#   RFC4595          ||      F. Maino, D. Black         ||       fmaino@cisco.com, black_david@emc.com
+#   RFC4596          ||      J. Rosenberg, P. Kyzivat         ||       jdrosen@cisco.com, pkyzivat@cisco.com
+#   RFC4597          ||      R. Even, N. Ismail         ||       roni.even@polycom.co.il, nismail@cisco.com
+#   RFC4598          ||      B. Link         ||       bdl@dolby.com
+#   RFC4601          ||      B. Fenner, M. Handley, H. Holbrook, I. Kouvelas         ||       fenner@research.att.com, M.Handley@cs.ucl.ac.uk, holbrook@arastra.com, kouvelas@cisco.com
+#   RFC4602          ||      T. Pusateri         ||       pusateri@juniper.net
+#   RFC4603          ||      G. Zorn, G. Weber, R. Foltak         ||       gwz@cisco.com, gdweber@cisco.com, rfoltak@cisco.com
+#   RFC4604          ||      H. Holbrook, B. Cain, B. Haberman         ||       holbrook@cisco.com, bcain99@gmail.com, brian@innovationslab.net
+#   RFC4605          ||      B. Fenner, H. He, B. Haberman, H. Sandick         ||       fenner@research.att.com, haixiang@nortelnetworks.com, brian@innovationslab.net, sandick@nc.rr.com
+#   RFC4606          ||      E. Mannie, D. Papadimitriou         ||       eric.mannie@perceval.net, dimitri.papadimitriou@alcatel.be
+#   RFC4607          ||      H. Holbrook, B. Cain         ||       holbrook@arastra.com, bcain99@gmail.com
+#   RFC4608          ||      D. Meyer, R. Rockell, G. Shepherd         ||       dmm@1-4-5.net, rrockell@sprint.net, gjshep@gmail.com
+#   RFC4609          ||      P. Savola, R. Lehtonen, D. Meyer         ||       psavola@funet.fi, rami.lehtonen@teliasonera.com, dmm@1-4-5.net
+#   RFC4610          ||      D. Farinacci, Y. Cai         ||       dino@cisco.com, ycai@cisco.com
+#   RFC4611          ||      M. McBride, J. Meylor, D. Meyer         ||       mcbride@cisco.com, jmeylor@cisco.com, dmm@1-4-5.net
+#   RFC4612          ||      P. Jones, H. Tamura         ||       paulej@packetizer.com, tamura@cs.ricoh.co.jp
+#   RFC4613          ||      P. Frojdh, U. Lindgren, M. Westerlund         ||       per.frojdh@ericsson.com, ulf.a.lindgren@ericsson.com, magnus.westerlund@ericsson.com
+#   RFC4614          ||      M. Duke, R. Braden, W. Eddy, E. Blanton         ||       martin.duke@boeing.com, braden@isi.edu, weddy@grc.nasa.gov, eblanton@cs.purdue.edu
+#   RFC4615          ||      J. Song, R. Poovendran, J. Lee, T. Iwata         ||       junhyuk.song@gmail.com, radha@ee.washington.edu, jicheol.lee@samsung.com, iwata@cse.nagoya-u.ac.jp
+#   RFC4616          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
+#   RFC4617          ||      J. Kornijenko         ||       j.kornienko@abcsoftware.lv
+#   RFC4618          ||      L. Martini, E. Rosen, G. Heron, A. Malis         ||       lmartini@cisco.com, erosen@cisco.com, giles.heron@tellabs.com, Andy.Malis@tellabs.com
+#   RFC4619          ||      L. Martini, Ed., C. Kawa, Ed., A. Malis, Ed.         ||       lmartini@cisco.com, claude.kawa@oz.com, Andy.Malis@tellabs.com
+#   RFC4620          ||      M. Crawford,  B. Haberman, Ed.         ||       crawdad@fnal.gov, brian@innovationslab.net
+#   RFC4621          ||      T. Kivinen, H. Tschofenig         ||       kivinen@safenet-inc.com, Hannes.Tschofenig@siemens.com
+#   RFC4622          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC4623          ||      A. Malis, M. Townsley         ||       Andy.Malis@tellabs.com, mark@townsley.net
+#   RFC4624          ||      B. Fenner, D. Thaler         ||       fenner@research.att.com, dthaler@microsoft.com
+#   RFC4625          ||      C. DeSanti, K. McCloghrie, S. Kode, S. Gai         ||       cds@cisco.com, srinikode@yahoo.com, kzm@cisco.com, none
+#   RFC4626          ||      C. DeSanti, V. Gaonkar, K. McCloghrie, S. Gai         ||       cds@cisco.com, vgaonkar@cisco.com, kzm@cisco.com, none
+#   RFC4627          ||      D. Crockford         ||       douglas@crockford.com
+#   RFC4628          ||      R. Even         ||       roni.even@polycom.co.il
+#   RFC4629          ||      J. Ott, C. Bormann, G. Sullivan, S. Wenger, R. Even, Ed.         ||       jo@netlab.tkk.fi, cabo@tzi.org, garysull@microsoft.com, stewe@stewe.org, roni.even@polycom.co.il
+#   RFC4630          ||      R. Housley, S. Santesson         ||       housley@vigilsec.com, stefans@microsoft.com
+#   RFC4631          ||      M. Dubuc, T. Nadeau, J. Lang, E. McGinnis, A. Farrel         ||       dubuc.consulting@sympatico.ca, tnadeau@cisco.com, jplang@ieee.org, emcginnis@hammerheadsystems.com, adrian@olddog.co.uk
+#   RFC4632          ||      V. Fuller, T. Li         ||       vaf@cisco.com, tli@tropos.com
+#   RFC4633          ||      S. Hartman         ||       hartmans-ietf@mit.edu
+#   RFC4634          ||      D. Eastlake 3rd, T. Hansen         ||       donald.eastlake@motorola.com, tony+shs@maillennium.att.com
+#   RFC4635          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
+#   RFC4636          ||      C. Perkins         ||       charles.perkins@nokia.com
+#   RFC4637          ||               ||       
+#   RFC4638          ||      P. Arberg, D. Kourkouzelis, M. Duckett, T. Anschutz, J. Moisand         ||       parberg@redback.com, diamondk@redback.com, mike.duckett@bellsouth.com, tom.anschutz@bellsouth.com, jmoisand@juniper.net
+#   RFC4639          ||      R. Woundy, K. Marez         ||       richard_woundy@cable.comcast.com, kevin.marez@motorola.com
+#   RFC4640          ||      A. Patel, Ed., G. Giaretta, Ed.         ||       alpesh@cisco.com, gerardo.giaretta@telecomitalia.it
+#   RFC4641          ||      O. Kolkman, R. Gieben         ||       olaf@nlnetlabs.nl, miek@miek.nl
+#   RFC4642          ||      K. Murchison, J. Vinocur, C. Newman         ||       murch@andrew.cmu.edu, vinocur@cs.cornell.edu, Chris.Newman@sun.com
+#   RFC4643          ||      J. Vinocur, K. Murchison         ||       vinocur@cs.cornell.edu, murch@andrew.cmu.edu
+#   RFC4644          ||      J. Vinocur, K. Murchison         ||       vinocur@cs.cornell.edu, murch@andrew.cmu.edu
+#   RFC4645          ||      D. Ewell         ||       dewell@adelphia.net
+#   RFC4646          ||      A. Phillips, M. Davis         ||       addison@inter-locale.com, mark.davis@macchiato.com
+#   RFC4647          ||      A. Phillips, M. Davis         ||       addison@inter-locale.com, mark.davis@macchiato.com
+#   RFC4648          ||      S. Josefsson         ||       simon@josefsson.org
+#   RFC4649          ||      B. Volz         ||       volz@cisco.com
+#   RFC4650          ||      M. Euchner         ||       martin_euchner@hotmail.com
+#   RFC4651          ||      C. Vogt, J. Arkko         ||       chvogt@tm.uka.de, jari.arkko@ericsson.com
+#   RFC4652          ||      D. Papadimitriou, Ed., L.Ong, J. Sadler, S. Shew, D. Ward         ||       dimitri.papadimitriou@alcatel.be, lyong@ciena.com, jonathan.sadler@tellabs.com, sdshew@nortel.com, dward@cisco.com
+#   RFC4653          ||      S. Bhandarkar, A. L. N. Reddy, M. Allman, E. Blanton         ||       sumitha@tamu.edu, reddy@ee.tamu.edu, mallman@icir.org, eblanton@cs.purdue.edu
+#   RFC4654          ||      J. Widmer, M. Handley         ||       widmer@acm.org, m.handley@cs.ucl.ac.uk
+#   RFC4655          ||      A. Farrel, J.-P. Vasseur, J. Ash         ||       adrian@olddog.co.uk, jpv@cisco.com, gash@att.com
+#   RFC4656          ||      S. Shalunov, B. Teitelbaum, A. Karp, J. Boote, M. Zekauskas         ||       shalunov@internet2.edu, ben@internet2.edu, akarp@cs.wisc.edu, boote@internet2.edu, matt@internet2.edu
+#   RFC4657          ||      J. Ash, Ed., J.L. Le Roux, Ed.         ||       gash@att.com, jeanlouis.leroux@orange-ft.com
+#   RFC4659          ||      J. De Clercq, D. Ooms, M. Carugi, F. Le Faucheur         ||       jeremy.de_clercq@alcatel.be, dirk@onesparrow.com, marco.carugi@nortel.com, flefauch@cisco.com
+#   RFC4660          ||      H. Khartabil, E. Leppanen, M. Lonnfors, J. Costa-Requena         ||       hisham.khartabil@telio.no, eva-maria.leppanen@nokia.com, mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com
+#   RFC4661          ||      H. Khartabil, E. Leppanen, M. Lonnfors, J. Costa-Requena         ||       hisham.khartabil@telio.no, eva-maria.leppanen@nokia.com, mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com
+#   RFC4662          ||      A. B. Roach, B. Campbell, J. Rosenberg         ||       adam@estacado.net,  ben@estacado.net, jdrosen@cisco.com
+#   RFC4663          ||      D. Harrington         ||       dbharrington@comcast.net
+#   RFC4664          ||      L. Andersson, Ed., E. Rosen, Ed.         ||       loa@pi.se, erosen@cisco.com
+#   RFC4665          ||      W. Augustyn, Ed., Y. Serbest, Ed.         ||       waldemar@wdmsys.com, yetik_serbest@labs.att.com
+#   RFC4666          ||      K. Morneault, Ed., J. Pastor-Balbas, Ed.         ||       kmorneau@cisco.com, j.javier.pastor@ericsson.com
+#   RFC4667          ||      W. Luo         ||       luo@cisco.com
+#   RFC4668          ||      D. Nelson         ||       dnelson@enterasys.com
+#   RFC4669          ||      D. Nelson         ||       dnelson@enterasys.com
+#   RFC4670          ||      D. Nelson         ||       dnelson@enterasys.com
+#   RFC4671          ||      D. Nelson         ||       dnelson@enterasys.com
+#   RFC4672          ||      S. De Cnodder, N. Jonnala, M. Chiba         ||       stefaan.de_cnodder@alcatel.be, njonnala@cisco.com, mchiba@cisco.com
+#   RFC4673          ||      S. De Cnodder, N. Jonnala, M. Chiba         ||       stefaan.de_cnodder@alcatel.be, njonnala@cisco.com, mchiba@cisco.com
+#   RFC4674          ||      J.L. Le Roux, Ed.         ||       jeanlouis.leroux@francetelecom.com
+#   RFC4675          ||      P. Congdon, M. Sanchez, B. Aboba         ||       paul.congdon@hp.com, mauricio.sanchez@hp.com, bernarda@microsoft.com
+#   RFC4676          ||      H. Schulzrinne         ||       hgs+geopriv@cs.columbia.edu
+#   RFC4677          ||      P. Hoffman, S. Harris         ||       paul.hoffman@vpnc.org, srh@umich.edu
+#   RFC4678          ||      A. Bivens         ||       jbivens@us.ibm.com
+#   RFC4679          ||      V. Mammoliti, G. Zorn, P. Arberg, R. Rennison         ||       vince@cisco.com, gwz@cisco.com, parberg@redback.com, robert.rennison@ecitele.com
+#   RFC4680          ||      S. Santesson         ||       stefans@microsoft.com
+#   RFC4681          ||      S. Santesson, A. Medvinsky, J. Ball         ||       stefans@microsoft.com, arimed@microsoft.com, joshball@microsoft.com
+#   RFC4682          ||      E. Nechamkin, J-F. Mule         ||       enechamkin@broadcom.com, jf.mule@cablelabs.com
+#   RFC4683          ||      J. Park, J. Lee, H.. Lee, S. Park, T. Polk         ||       khopri@kisa.or.kr, jilee@kisa.or.kr, hslee@kisa.or.kr, sjpark@bcqre.com, tim.polk@nist.gov
+#   RFC4684          ||      P. Marques, R. Bonica, L. Fang, L. Martini, R. Raszuk, K. Patel, J. Guichard         ||       roque@juniper.net, rbonica@juniper.net, luyuanfang@att.com, lmartini@cisco.com, rraszuk@cisco.com, keyupate@cisco.com, jguichar@cisco.com
+#   RFC4685          ||      J. Snell         ||       jasnell@gmail.com
+#   RFC4686          ||      J. Fenton         ||       fenton@bluepopcorn.net
+#   RFC4687          ||      S. Yasukawa, A. Farrel, D. King, T. Nadeau         ||       s.yasukawa@hco.ntt.co.jp, adrian@olddog.co.uk, daniel.king@aria-networks.com, tnadeau@cisco.com
+#   RFC4688          ||      S. Rushing         ||       srushing@inmedius.com
+#   RFC4689          ||      S. Poretsky, J. Perser, S. Erramilli, S. Khurana         ||       sporetsky@reefpoint.com, jerry@perser.org, shobha@research.telcordia.com, skhurana@motorola.com
+#   RFC4690          ||      J. Klensin, P. Faltstrom, C. Karp, IAB         ||       john-ietf@jck.com, paf@cisco.com, ck@nic.museum, iab@iab.org
+#   RFC4691          ||      L. Andersson, Ed.         ||       loa@pi.se
+#   RFC4692          ||      G. Huston         ||       gih@apnic.net
+#   RFC4693          ||      H. Alvestrand         ||       harald@alvestrand.no
+#   RFC4694          ||      J. Yu         ||       james.yu@neustar.biz
+#   RFC4695          ||      J. Lazzaro, J. Wawrzynek         ||       lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu
+#   RFC4696          ||      J. Lazzaro, J. Wawrzynek         ||       lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu
+#   RFC4697          ||       M. Larson, P. Barber         ||       mlarson@verisign.com, pbarber@verisign.com
+#   RFC4698          ||      E. Gunduz, A. Newton, S. Kerr         ||       e.gunduz@computer.org, andy@hxr.us, shane@time-travellers.org
+#   RFC4701          ||      M. Stapp, T. Lemon, A. Gustafsson         ||       mjs@cisco.com, mellon@nominum.com, gson@araneus.fi
+#   RFC4702          ||      M. Stapp, B. Volz, Y. Rekhter         ||       mjs@cisco.com, volz@cisco.com, yakov@juniper.net
+#   RFC4703          ||      M. Stapp, B. Volz         ||       mjs@cisco.com, volz@cisco.com
+#   RFC4704          ||      B. Volz         ||       volz@cisco.com
+#   RFC4705          ||      R. Housley, A. Corry         ||       housley@vigilsec.com, publications@gigabeam.com
+#   RFC4706          ||      M. Morgenstern, M. Dodge, S. Baillie, U. Bonollo         ||       moti.Morgenstern@ecitele.com, mbdodge@ieee.org, scott.baillie@nec.com.au, umberto.bonollo@nec.com.au
+#   RFC4707          ||      P. Grau, V. Heinau, H. Schlichting, R. Schuettler         ||       nas@fu-berlin.de, nas@fu-berlin.de, nas@fu-berlin.de, nas@fu-berlin.de
+#   RFC4708          ||      A. Miller         ||       ak.miller@auckland.ac.nz
+#   RFC4709          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC4710          ||      A. Siddiqui, D. Romascanu, E. Golovinsky         ||       anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net
+#   RFC4711          ||      A. Siddiqui, D. Romascanu, E. Golovinsky         ||       anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net
+#   RFC4712          ||      A. Siddiqui, D. Romascanu, E. Golovinsky, M. Rahman,Y. Kim         ||       anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net, none, ybkim@broadcom.com
+#   RFC4713          ||      X. Lee, W. Mao, E. Chen, N. Hsu, J. Klensin         ||       lee@cnnic.cn, mao@cnnic.cn, erin@twnic.net.tw, snw@twnic.net.tw, john+ietf@jck.com
+#   RFC4714          ||      A. Mankin, S. Hayes         ||       mankin@psg.com, stephen.hayes@ericsson.com
+#   RFC4715          ||      M. Munakata, S. Schubert, T. Ohba         ||       munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp
+#   RFC4716          ||      J. Galbraith, R. Thayer         ||       galb@vandyke.com, rodney@canola-jones.com
+#   RFC4717          ||      L. Martini, J. Jayakumar, M. Bocci, N. El-Aawar, J. Brayley, G. Koleyni         ||       lmartini@cisco.com, jjayakum@cisco.com, matthew.bocci@alcatel.co.uk, nna@level3.net, jeremy.brayley@ecitele.com, ghassem@nortelnetworks.com
+#   RFC4718          ||      P. Eronen, P. Hoffman         ||       pe@iki.fi, paul.hoffman@vpnc.org
+#   RFC4719          ||      R. Aggarwal, Ed., M. Townsley, Ed., M. Dos Santos, Ed.         ||       rahul@juniper.net, mark@townsley.net, mariados@cisco.com
+#   RFC4720          ||      A. Malis, D. Allan, N. Del Regno         ||       Andy.Malis@tellabs.com, dallan@nortelnetworks.com, nick.delregno@mci.com
+#   RFC4721          ||      C. Perkins, P. Calhoun, J. Bharatia         ||       charles.perkins@nokia.com, pcalhoun@cisco.com, jayshree@nortel.com
+#   RFC4722          ||      J. Van Dyke, E. Burger, Ed., A. Spitzer         ||       jvandyke@cantata.com, eburger@cantata.com, woof@pingtel.com
+#   RFC4723          ||      T. Kosonen, T. White         ||       timo.kosonen@nokia.com, twhite@midi.org
+#   RFC4724          ||      S. Sangli, E. Chen, R. Fernando, J. Scudder, Y. Rekhter         ||       rsrihari@cisco.com, enkechen@cisco.com, rex@juniper.net, jgs@juniper.net, yakov@juniper.net
+#   RFC4725          ||      A. Mayrhofer, B. Hoeneisen         ||       alexander.mayrhofer@enum.at, b.hoeneisen@ieee.org
+#   RFC4726          ||      A. Farrel, J.-P. Vasseur, A. Ayyangar         ||       adrian@olddog.co.uk, jpv@cisco.com, arthi@nuovasystems.com
+#   RFC4727          ||      B. Fenner         ||       fenner@research.att.com
+#   RFC4728          ||      D. Johnson, Y. Hu, D. Maltz         ||       dbj@cs.rice.edu, yihchun@uiuc.edu, dmaltz@cs.cmu.edu
+#   RFC4729          ||      M. Abel         ||       TPM@nfc-forum.org
+#   RFC4730          ||      E. Burger, M. Dolly         ||       eburger@cantata.com, mdolly@att.com
+#   RFC4731          ||      A. Melnikov, D. Cridland         ||       Alexey.Melnikov@isode.com, dave.cridland@inventuresystems.co.uk
+#   RFC4732          ||      M. Handley, Ed., E. Rescorla, Ed., IAB         ||       M.Handley@cs.ucl.ac.uk, ekr@networkresonance.com, iab@ietf.org
+#   RFC4733          ||      H. Schulzrinne, T. Taylor         ||       schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com
+#   RFC4734          ||      H. Schulzrinne, T. Taylor         ||       schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com
+#   RFC4735          ||      T. Taylor         ||       tom.taylor.stds@gmail.com
+#   RFC4736          ||      JP. Vasseur, Ed., Y. Ikejiri, R. Zhang         ||       jpv@cisco.com, y.ikejiri@ntt.com, raymond_zhang@bt.infonet.com
+#   RFC4737          ||      A. Morton, L. Ciavattone, G. Ramachandran, S. Shalunov, J. Perser         ||       acmorton@att.com, lencia@att.com, gomathi@att.com, shalunov@internet2.edu, jperser@veriwave.com
+#   RFC4738          ||      D. Ignjatic, L. Dondeti, F. Audet, P. Lin         ||       dignjatic@polycom.com, dondeti@qualcomm.com,  audet@nortel.com, linping@nortel.com
+#   RFC4739          ||      P. Eronen, J. Korhonen         ||       pe@iki.fi, jouni.korhonen@teliasonera.com
+#   RFC4740          ||      M. Garcia-Martin, Ed., M. Belinchon, M. Pallares-Lopez, C. Canales-Valenzuela, K. Tammi         ||       miguel.an.garcia@nokia.com, maria.carmen.belinchon@ericsson.com, miguel-angel.pallares@ericsson.com, carolina.canales@ericsson.com, kalle.tammi@nokia.com
+#   RFC4741          ||      R. Enns, Ed.         ||       rpe@juniper.net
+#   RFC4742          ||      M. Wasserman, T. Goddard         ||       margaret@thingmagic.com, ted.goddard@icesoft.com
+#   RFC4743          ||      T. Goddard         ||       ted.goddard@icesoft.com
+#   RFC4744          ||      E. Lear, K. Crozier         ||       lear@cisco.com, ken.crozier@gmail.com
+#   RFC4745          ||      H. Schulzrinne, H. Tschofenig, J. Morris, J. Cuellar, J. Polk, J. Rosenberg         ||       schulzrinne@cs.columbia.edu, Hannes.Tschofenig@siemens.com, jmorris@cdt.org, Jorge.Cuellar@siemens.com, jmpolk@cisco.com, jdrosen@cisco.com
+#   RFC4746          ||      T. Clancy, W. Arbaugh         ||       clancy@ltsnet.net, waa@cs.umd.edu
+#   RFC4747          ||      S. Kipp, G. Ramkumar, K. McCloghrie         ||       scott.kipp@mcdata.com, gramkumar@stanfordalumni.org, kzm@cisco.com
+#   RFC4748          ||      S. Bradner, Ed.         ||       sob@harvard.edu
+#   RFC4749          ||      A. Sollaud         ||       aurelien.sollaud@orange-ft.com
+#   RFC4750          ||      D. Joyal, Ed., P. Galecki, Ed., S. Giacalone, Ed., R. Coltun, F. Baker         ||       djoyal@nortel.com, pgalecki@airvana.com, spencer.giacalone@gmail.com, fred@cisco.com
+#   RFC4752          ||      A. Melnikov, Ed.         ||       Alexey.Melnikov@isode.com
+#   RFC4753          ||      D. Fu, J. Solinas         ||       defu@orion.ncsc.mil, jasolin@orion.ncsc.mil
+#   RFC4754          ||      D. Fu, J. Solinas         ||       defu@orion.ncsc.mil, jasolin@orion.ncsc.mil
+#   RFC4755          ||      V. Kashyap         ||       vivk@us.ibm.com
+#   RFC4756          ||      A. Li         ||       adamli@hyervision.com
+#   RFC4757          ||      K. Jaganathan, L. Zhu, J. Brezak         ||       karthikj@microsoft.com, lzhu@microsoft.com, jbrezak@microsoft.com
+#   RFC4758          ||      M. Nystroem         ||       magnus@rsasecurity.com
+#   RFC4759          ||      R. Stastny, R. Shockey, L. Conroy         ||       Richard.stastny@oefeg.at, richard.shockey@neustar.biz, lconroy@insensate.co.uk
+#   RFC4760          ||      T. Bates, R. Chandra, D. Katz, Y. Rekhter         ||       tbates@cisco.com, rchandra@sonoasystems.com, dkatz@juniper.com, yakov@juniper.com
+#   RFC4761          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
+#   RFC4762          ||      M. Lasserre, Ed., V. Kompella, Ed.         ||       mlasserre@alcatel-lucent.com, vach.kompella@alcatel-lucent.com
+#   RFC4763          ||      M. Vanderveen, H. Soliman         ||       mvandervn@yahoo.com, solimanhs@gmail.com
+#   RFC4764          ||      F. Bersani, H. Tschofenig         ||       bersani_florent@yahoo.fr, Hannes.Tschofenig@siemens.com
+#   RFC4765          ||      H. Debar, D. Curry, B. Feinstein         ||       herve.debar@orange-ftgroup.com, david_a_curry@glic.com, feinstein@acm.org
+#   RFC4766          ||      M. Wood, M. Erlinger         ||       mark1@iss.net, mike@cs.hmc.edu
+#   RFC4767          ||      B. Feinstein, G. Matthews         ||       bfeinstein@acm.org, gmatthew@nas.nasa.gov
+#   RFC4768          ||      S. Hartman         ||       hartmans-ietf@mit.edu
+#   RFC4769          ||      J. Livingood, R. Shockey         ||       jason_livingood@cable.comcast.com, richard.shockey@neustar.biz
+#   RFC4770          ||      C. Jennings, J. Reschke, Ed.         ||       fluffy@cisco.com, julian.reschke@greenbytes.de
+#   RFC4771          ||      V. Lehtovirta, M. Naslund, K. Norrman         ||       vesa.lehtovirta@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com
+#   RFC4772          ||      S. Kelly         ||       scott@hyperthought.com
+#   RFC4773          ||      G. Huston         ||       gih@apnic.net
+#   RFC4774          ||      S. Floyd         ||       floyd@icir.org
+#   RFC4775          ||      S. Bradner, B. Carpenter, Ed., T. Narten         ||       sob@harvard.edu, brc@zurich.ibm.com, narten@us.ibm.com
+#   RFC4776          ||      H. Schulzrinne         ||       hgs+geopriv@cs.columbia.edu
+#   RFC4777          ||      T. Murphy Jr., P. Rieth, J. Stevens         ||       murphyte@us.ibm.com, rieth@us.ibm.com, jssteven@us.ibm.com
+#   RFC4778          ||      M. Kaeo         ||       merike@doubleshotsecurity.com
+#   RFC4779          ||      S. Asadullah, A. Ahmed, C. Popoviciu, P. Savola, J. Palet         ||       sasad@cisco.com, adahmed@cisco.com, cpopovic@cisco.com, psavola@funet.fi, jordi.palet@consulintel.es
+#   RFC4780          ||      K. Lingle, J-F. Mule, J. Maeng, D. Walker         ||       klingle@cisco.com, jf.mule@cablelabs.com, jmaeng@austin.rr.com, drwalker@rogers.com
+#   RFC4781          ||      Y. Rekhter, R. Aggarwal         ||        yakov@juniper.net, rahul@juniper.net
+#   RFC4782          ||      S. Floyd, M. Allman, A. Jain, P. Sarolahti         ||       floyd@icir.org, mallman@icir.org, a.jain@f5.com, pasi.sarolahti@iki.fi
+#   RFC4783          ||      L. Berger, Ed.         ||       lberger@labn.net
+#   RFC4784          ||      C. Carroll, F. Quick         ||       Christopher.Carroll@ropesgray.com, fquick@qualcomm.com
+#   RFC4785          ||      U. Blumenthal, P. Goel         ||       urimobile@optonline.net, Purushottam.Goel@intel.com
+#   RFC4786          ||      J. Abley, K. Lindqvist         ||       jabley@ca.afilias.info, kurtis@kurtis.pp.se
+#   RFC4787          ||      F. Audet, Ed., C. Jennings         ||       audet@nortel.com, fluffy@cisco.com
+#   RFC4788          ||      Q. Xie, R. Kapoor         ||       Qiaobing.Xie@Motorola.com, rkapoor@qualcomm.com
+#   RFC4789          ||      J. Schoenwaelder, T. Jeffree         ||       j.schoenwaelder@iu-bremen.de, tony@jeffree.co.uk
+#   RFC4790          ||      C. Newman, M. Duerst,  A. Gulbrandsen         ||       chris.newman@sun.com, duerst@it.aoyama.ac.jp, arnt@oryx.com
+#   RFC4791          ||      C. Daboo, B. Desruisseaux, L. Dusseault         ||       cyrus@daboo.name, bernard.desruisseaux@oracle.com, lisa.dusseault@gmail.com
+#   RFC4792          ||      S. Legg         ||       steven.legg@eb2bcom.com
+#   RFC4793          ||      M. Nystroem         ||       magnus@rsasecurity.com
+#   RFC4794          ||      B. Fenner         ||       fenner@research.att.com
+#   RFC4795          ||      B. Aboba, D. Thaler, L. Esibov         ||       bernarda@microsoft.com, dthaler@microsoft.com, levone@microsoft.com
+#   RFC4796          ||      J. Hautakorpi, G. Camarillo         ||       Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com
+#   RFC4797          ||      Y. Rekhter, R. Bonica, E. Rosen         ||       yakov@juniper.net, rbonica@juniper.net, erosen@cisco.com
+#   RFC4798          ||      J. De Clercq, D. Ooms, S. Prevost, F. Le Faucheur         ||       jeremy.de_clercq@alcatel-lucent.be, dirk@onesparrow.com, stuart.prevost@bt.com, flefauch@cisco.com
+#   RFC4801          ||      T. Nadeau, Ed., A. Farrel, Ed.         ||       tnadeau@cisco.com, adrian@olddog.co.uk
+#   RFC4802          ||      T. Nadeau, Ed., A. Farrel,  Ed.         ||       tnadeau@cisco.com, adrian@olddog.co.uk
+#   RFC4803          ||      T. Nadeau, Ed., A. Farrel, Ed.         ||       tnadeau@cisco.com, adrian@olddog.co.uk
+#   RFC4804          ||      F. Le Faucheur, Ed.         ||       flefauch@cisco.com
+#   RFC4805          ||      O. Nicklass, Ed.         ||       orly_n@rad.com
+#   RFC4806          ||      M. Myers, H. Tschofenig         ||       mmyers@fastq.com, Hannes.Tschofenig@siemens.com
+#   RFC4807          ||      M. Baer, R. Charlet, W. Hardaker, R. Story, C. Wang         ||       baerm@tislabs.com, rcharlet@alumni.calpoly.edu, hardaker@tislabs.com, rstory@ipsp.revelstone.com, cliffwangmail@yahoo.com
+#   RFC4808          ||      S. Bellovin         ||       bellovin@acm.org
+#   RFC4809          ||      C. Bonatti, Ed., S. Turner, Ed., G. Lebovitz, Ed.         ||       Bonattic@ieca.com, Turners@ieca.com, gregory.ietf@gmail.com
+#   RFC4810          ||      C. Wallace, U. Pordesch, R. Brandner         ||       cwallace@cygnacom.com, ulrich.pordesch@zv.fraunhofer.de, ralf.brandner@intercomponentware.com
+#   RFC4811          ||      L. Nguyen, A. Roy, A. Zinin         ||       lhnguyen@cisco.com, akr@cisco.com, alex.zinin@alcatel-lucent.com
+#   RFC4812          ||      L. Nguyen, A. Roy, A. Zinin         ||       lhnguyen@cisco.com, akr@cisco.com, alex.zinin@alcatel-lucent.com
+#   RFC4813          ||      B. Friedman, L. Nguyen, A. Roy, D. Yeung, A. Zinin         ||       friedman@cisco.com, lhnguyen@cisco.com, akr@cisco.com, myeung@cisco.com, alex.zinin@alcatel-lucent.com
+#   RFC4814          ||      D. Newman, T. Player         ||       dnewman@networktest.com, timmons.player@spirent.com
+#   RFC4815          ||      L-E. Jonsson, K. Sandlund, G. Pelletier, P. Kremer         ||       lars-erik.jonsson@ericsson.com, kristofer.sandlund@ericsson.com, ghyslain.pelletier@ericsson.com, peter.kremer@ericsson.com
+#   RFC4816          ||      A. Malis, L. Martini, J. Brayley, T. Walsh         ||       andrew.g.malis@verizon.com, lmartini@cisco.com, jeremy.brayley@ecitele.com, twalsh@juniper.net
+#   RFC4817          ||      M. Townsley, C. Pignataro, S. Wainner, T. Seely, J. Young         ||       mark@townsley.net, cpignata@cisco.com, swainner@cisco.com, tseely@sprint.net, young@jsyoung.net
+#   RFC4818          ||      J. Salowey, R. Droms         ||       jsalowey@cisco.com, rdroms@cisco.com
+#   RFC4819          ||      J. Galbraith, J. Van Dyke, J. Bright         ||       galb@vandyke.com, jpv@vandyke.com, jon@siliconcircus.com
+#   RFC4820          ||      M. Tuexen, R. Stewart, P. Lei         ||       tuexen@fh-muenster.de, randall@lakerest.net, peterlei@cisco.com
+#   RFC4821          ||      M. Mathis, J. Heffner         ||       mathis@psc.edu, jheffner@psc.edu
+#   RFC4822          ||      R. Atkinson, M. Fanto         ||       rja@extremenetworks.com, mattjf@umd.edu
+#   RFC4823          ||      T. Harding, R. Scott         ||       tharding@us.axway.com, rscott@us.axway.com
+#   RFC4824          ||      J. Hofmueller, Ed., A. Bachmann, Ed., IO. zmoelnig, Ed.         ||       ip-sfs@mur.at, ip-sfs@mur.at, ip-sfs@mur.at
+#   RFC4825          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC4826          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC4827          ||      M. Isomaki, E. Leppanen         ||       markus.isomaki@nokia.com, eva-maria.leppanen@nokia.com
+#   RFC4828          ||      S. Floyd, E. Kohler         ||       floyd@icir.org, kohler@cs.ucla.edu
+#   RFC4829          ||      J. de Oliveira, Ed., JP. Vasseur, Ed., L. Chen, C. Scoglio         ||       jau@ece.drexel.edu, jpv@cisco.com, leonardo.c.chen@verizon.com, caterina@eece.ksu.edu
+#   RFC4830          ||      J. Kempf, Ed.         ||       kempf@docomolabs-usa.com
+#   RFC4831          ||      J. Kempf, Ed.         ||       kempf@docomolabs-usa.com
+#   RFC4832          ||      C. Vogt, J. Kempf         ||       chvogt@tm.uka.de, kempf@docomolabs-usa.com
+#   RFC4833          ||      E. Lear, P. Eggert         ||       lear@cisco.com, eggert@cs.ucla.edu
+#   RFC4834          ||      T. Morin, Ed.         ||       thomas.morin@orange-ftgroup.com
+#   RFC4835          ||      V. Manral         ||       vishwas@ipinfusion.com
+#   RFC4836          ||      E. Beili         ||       edward.beili@actelis.com
+#   RFC4837          ||      L. Khermosh         ||       lior_khermosh@pmc-sierra.com
+#   RFC4838          ||      V. Cerf, S. Burleigh, A. Hooke, L. Torgerson, R. Durst, K. Scott, K. Fall, H. Weiss         ||       vint@google.com, Scott.Burleigh@jpl.nasa.gov, Adrian.Hooke@jpl.nasa.gov, ltorgerson@jpl.nasa.gov, durst@mitre.org, kscott@mitre.org, kfall@intel.com, howard.weiss@sparta.com
+#   RFC4839          ||      G. Conboy, J. Rivlin, J. Ferraiolo         ||       gc@ebooktechnologies.com, john@ebooktechnologies.com, jferrai@us.ibm.com
+#   RFC4840          ||      B. Aboba, Ed., E. Davies, D. Thaler         ||       bernarda@microsoft.com, elwynd@dial.pipex.com, dthaler@microsoft.com
+#   RFC4841          ||      C. Heard, Ed.         ||       heard@pobox.com
+#   RFC4842          ||      A. Malis, P. Pate, R. Cohen, Ed., D. Zelig         ||       andrew.g.malis@verizon.com, prayson.pate@overturenetworks.com, ronc@resolutenetworks.com, davidz@corrigent.com
+#   RFC4843          ||      P. Nikander, J. Laganier, F. Dupont         ||       pekka.nikander@nomadiclab.com, julien.ietf@laposte.net, Francis.Dupont@fdupont.fr
+#   RFC4844          ||      L. Daigle, Ed., Internet Architecture Board         ||       leslie@thinkingcat.com, iab@iab.org
+#   RFC4845          ||      L. Daigle, Ed., Internet Architecture Board         ||       leslie@thinkingcat.com, iab@iab.org
+#   RFC4846          ||      J. Klensin, Ed., D. Thaler, Ed.         ||       john-ietf@jck.com, dthaler@microsoft.com
+#   RFC4847          ||      T. Takeda, Ed.         ||       takeda.tomonori@lab.ntt.co.jp
+#   RFC4848          ||      L. Daigle         ||       leslie@thinkingcat.com
+#   RFC4849          ||      P. Congdon, M. Sanchez, B. Aboba         ||       paul.congdon@hp.com, mauricio.sanchez@hp.com, bernarda@microsoft.com
+#   RFC4850          ||      D. Wysochanski         ||       wysochanski@pobox.com
+#   RFC4851          ||      N. Cam-Winget, D. McGrew, J. Salowey, H. Zhou         ||       ncamwing@cisco.com, mcgrew@cisco.com, jsalowey@cisco.com, hzhou@cisco.com
+#   RFC4852          ||      J. Bound, Y. Pouffary, S. Klynsma, T. Chown, D. Green         ||       jim.bound@hp.com, Yanick.pouffary@hp.com, tjc@ecs.soton.ac.uk, green@commandinformation.com, sklynsma@mitre.org
+#   RFC4853          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC4854          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC4855          ||      S. Casner         ||       casner@acm.org
+#   RFC4856          ||      S. Casner         ||       casner@acm.org
+#   RFC4857          ||      E. Fogelstroem, A. Jonsson, C. Perkins         ||       eva.fogelstrom@ericsson.com, annika.jonsson@ericsson.com, charles.perkins@nsn.com
+#   RFC4858          ||      H. Levkowetz, D. Meyer, L. Eggert, A. Mankin         ||       henrik@levkowetz.com, dmm@1-4-5.net, lars.eggert@nokia.com, mankin@psg.com
+#   RFC4859          ||      A. Farrel         ||       adrian@olddog.co.uk
+#   RFC4860          ||      F. Le Faucheur, B. Davie, P. Bose, C. Christou, M. Davenport         ||       flefauch@cisco.com, bds@cisco.com, pratik.bose@lmco.com, christou_chris@bah.com, davenport_michael@bah.com
+#   RFC4861          ||      T. Narten, E. Nordmark, W. Simpson, H. Soliman         ||       narten@us.ibm.com, erik.nordmark@sun.com, william.allen.simpson@gmail.com, hesham@elevatemobile.com
+#   RFC4862          ||      S. Thomson, T. Narten, T. Jinmei         ||       sethomso@cisco.com, narten@us.ibm.com, jinmei@isl.rdc.toshiba.co.jp
+#   RFC4863          ||      L. Martini, G. Swallow         ||       lmartini@cisco.com, swallow@cisco.com
+#   RFC4864          ||      G. Van de Velde, T. Hain, R. Droms, B. Carpenter, E. Klein         ||       gunter@cisco.com, alh-ietf@tndh.net, rdroms@cisco.com, brc@zurich.ibm.com, ericlklein.ipv6@gmail.com
+#   RFC4865          ||      G. White, G. Vaudreuil         ||       g.a.white@comcast.net, GregV@ieee.org
+#   RFC4866          ||      J. Arkko, C. Vogt, W. Haddad         ||       jari.arkko@ericsson.com, chvogt@tm.uka.de, wassim.haddad@ericsson.com
+#   RFC4867          ||      J. Sjoberg, M. Westerlund, A. Lakaniemi, Q. Xie         ||       Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, Qiaobing.Xie@motorola.com
+#   RFC4868          ||      S. Kelly, S. Frankel         ||       scott@hyperthought.com, sheila.frankel@nist.gov
+#   RFC4869          ||      L. Law, J. Solinas         ||       lelaw@orion.ncsc.mil, jasolin@orion.ncsc.mil
+#   RFC4870          ||      M. Delany         ||       markd+domainkeys@yahoo-inc.com
+#   RFC4871          ||      E. Allman, J. Callas, M. Delany, M. Libbey, J. Fenton, M. Thomas         ||       eric+dkim@sendmail.org, jon@pgp.com, markd+dkim@yahoo-inc.com, mlibbeymail-mailsig@yahoo.com, fenton@bluepopcorn.net, mat@cisco.com
+#   RFC4872          ||      J.P. Lang, Ed., Y. Rekhter, Ed., D. Papadimitriou, Ed.         ||       jplang@ieee.org, yakov@juniper.net, dimitri.papadimitriou@alcatel-lucent.be
+#   RFC4873          ||      L. Berger, I. Bryskin, D. Papadimitriou, A. Farrel         ||       lberger@labn.net, IBryskin@advaoptical.com, dimitri.papadimitriou@alcatel-lucent.be, adrian@olddog.co.uk
+#   RFC4874          ||      CY. Lee, A. Farrel, S. De Cnodder         ||       c.yin.lee@gmail.com, adrian@olddog.co.uk, stefaan.de_cnodder@alcatel-lucent.be
+#   RFC4875          ||      R. Aggarwal, Ed., D. Papadimitriou, Ed., S. Yasukawa, Ed.         ||       rahul@juniper.net, yasukawa.seisho@lab.ntt.co.jp, Dimitri.Papadimitriou@alcatel-lucent.be
+#   RFC4876          ||      B. Neal-Joslin, Ed., L. Howard, M. Ansari         ||       bob_joslin@hp.com, lukeh@padl.com, morteza@infoblox.com
+#   RFC4877          ||      V. Devarapalli, F. Dupont         ||       vijay.devarapalli@azairenet.com, Francis.Dupont@fdupont.fr
+#   RFC4878          ||      M. Squire         ||       msquire@hatterasnetworks.com
+#   RFC4879          ||      T. Narten         ||       narten@us.ibm.com
+#   RFC4880          ||      J. Callas, L. Donnerhacke, H. Finney, D. Shaw, R. Thayer         ||       jon@callas.org, lutz@iks-jena.de, hal@finney.org, dshaw@jabberwocky.com, rodney@canola-jones.com
+#   RFC4881          ||      K. El Malki, Ed.         ||       karim@athonet.com
+#   RFC4882          ||      R. Koodli         ||       rajeev.koodli@nokia.com
+#   RFC4883          ||      G. Feher, K. Nemeth, A. Korn, I. Cselenyi         ||       Gabor.Feher@tmit.bme.hu, Krisztian.Nemeth@tmit.bme.hu, Andras.Korn@tmit.bme.hu, Istvan.Cselenyi@teliasonera.com
+#   RFC4884          ||      R. Bonica, D. Gan, D. Tappan, C. Pignataro         ||       rbonica@juniper.net, derhwagan@yahoo.com, Dan.Tappan@gmail.com, cpignata@cisco.com
+#   RFC4885          ||      T. Ernst, H-Y. Lach         ||       thierry.ernst@inria.fr, hong-yon.lach@motorola.com
+#   RFC4886          ||      T. Ernst         ||       thierry.ernst@inria.fr
+#   RFC4887          ||      P. Thubert, R. Wakikawa, V. Devarapalli         ||       pthubert@cisco.com, ryuji@sfc.wide.ad.jp, vijay.devarapalli@azairenet.com
+#   RFC4888          ||      C. Ng, P. Thubert, M. Watari, F. Zhao         ||       chanwah.ng@sg.panasonic.com, pthubert@cisco.com, watari@kddilabs.jp, fanzhao@ucdavis.edu
+#   RFC4889          ||      C. Ng, F. Zhao, M. Watari, P. Thubert         ||       chanwah.ng@sg.panasonic.com, fanzhao@ucdavis.edu, watari@kddilabs.jp, pthubert@cisco.com
+#   RFC4890          ||      E. Davies, J. Mohacsi         ||       elwynd@dial.pipex.com, mohacsi@niif.hu
+#   RFC4891          ||      R. Graveman, M. Parthasarathy, P. Savola, H. Tschofenig         ||       rfg@acm.org, mohanp@sbcglobal.net, psavola@funet.fi, Hannes.Tschofenig@nsn.com
+#   RFC4892          ||      S. Woolf, D. Conrad         ||       woolf@isc.org, david.conrad@icann.org
+#   RFC4893          ||      Q. Vohra, E. Chen         ||       quaizar.vohra@gmail.com, enkechen@cisco.com
+#   RFC4894          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC4895          ||      M. Tuexen, R. Stewart, P. Lei, E. Rescorla         ||       tuexen@fh-muenster.de, randall@lakerest.net, peterlei@cisco.com, ekr@rtfm.com
+#   RFC4896          ||      A. Surtees, M. West, A.B. Roach         ||       abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk, adam@estacado.net
+#   RFC4897          ||      J. Klensin, S. Hartman         ||       john-ietf@jck.com, hartmans-ietf@mit.edu
+#   RFC4898          ||      M. Mathis, J. Heffner, R. Raghunarayan         ||       mathis@psc.edu, jheffner@psc.edu, raraghun@cisco.com
+#   RFC4901          ||      J. Ash, Ed., J. Hand, Ed., A. Malis, Ed.         ||       gash5107@yahoo.com, jameshand@att.com, andrew.g.malis@verizon.com
+#   RFC4902          ||      M. Stecher         ||        martin.stecher@webwasher.com
+#   RFC4903          ||      D. Thaler         ||       dthaler@microsoft.com
+#   RFC4904          ||      V. Gurbani, C. Jennings         ||       vkg@alcatel-lucent.com, fluffy@cisco.com
+#   RFC4905          ||      L. Martini, Ed., E. Rosen, Ed., N. El-Aawar, Ed.         ||       lmartini@cisco.com, erosen@cisco.com, nna@level3.net
+#   RFC4906          ||      L. Martini, Ed., E. Rosen, Ed., N. El-Aawar, Ed.         ||       lmartini@cisco.com, erosen@cisco.com, nna@level3.net
+#   RFC4907          ||      B. Aboba, Ed.         ||       bernarda@microsoft.com
+#   RFC4908          ||      K. Nagami, S. Uda, N. Ogashiwa, H. Esaki, R. Wakikawa, H. Ohnishi         ||       nagami@inetcore.com, zin@jaist.ac.jp, ogashiwa@wide.ad.jp, hiroshi@wide.ad.jp, ryuji@sfc.wide.ad.jp, ohnishi.hiroyuki@lab.ntt.co.jp
+#   RFC4909          ||      L. Dondeti, Ed., D. Castleford, F. Hartung         ||       ldondeti@qualcomm.com, david.castleford@orange-ftgroup.com, frank.hartung@ericsson.com
+#   RFC4910          ||      S. Legg, D. Prager         ||       steven.legg@eb2bcom.com, dap@austhink.com
+#   RFC4911          ||      S. Legg         ||       steven.legg@eb2bcom.com
+#   RFC4912          ||      S. Legg         ||       steven.legg@eb2bcom.com
+#   RFC4913          ||      S. Legg         ||       steven.legg@eb2bcom.com
+#   RFC4914          ||      S. Legg         ||       steven.legg@eb2bcom.com
+#   RFC4915          ||      P. Psenak, S. Mirtorabi, A. Roy, L. Nguyen, P. Pillay-Esnault         ||       ppsenak@cisco.com, sina@force10networks.com, akr@cisco.com, lhnguyen@cisco.com, ppe@cisco.com
+#   RFC4916          ||      J. Elwell         ||       john.elwell@siemens.com
+#   RFC4917          ||      V. Sastry, K. Leung, A. Patel         ||       venkat.s@samsung.com, kleung@cisco.com, alpesh@cisco.com
+#   RFC4918          ||      L. Dusseault, Ed.         ||       lisa.dusseault@gmail.com
+#   RFC4919          ||      N. Kushalnagar, G. Montenegro, C. Schumacher         ||       nandakishore.kushalnagar@intel.com, gabriel.montenegro@microsoft.com, schumacher@danfoss.com
+#   RFC4920          ||      A. Farrel, Ed., A. Satyanarayana, A. Iwata, N. Fujita, G. Ash         ||       adrian@olddog.co.uk, asatyana@cisco.com, a-iwata@ah.jp.nec.com, n-fujita@bk.jp.nec.com, gash5107@yahoo.com
+#   RFC4923          ||      F. Baker, P. Bose         ||       fred@cisco.com, pratik.bose@lmco.com
+#   RFC4924          ||      B. Aboba, Ed., E. Davies         ||       bernarda@microsoft.com, elwynd@dial.pipex.com
+#   RFC4925          ||      X. Li, Ed., S. Dawkins, Ed., D. Ward, Ed., A. Durand, Ed.         ||       xing@cernet.edu.cn, spencer@mcsr-labs.org, dward@cisco.com, alain_durand@cable.comcast.com
+#   RFC4926          ||      T.Kalin, M.Molina         ||       tomaz.kalin@dante.org.uk, maurizio.molina@dante.org.uk
+#   RFC4927          ||      J.-L. Le Roux, Ed.         ||       jeanlouis.leroux@orange-ftgroup.com
+#   RFC4928          ||      G. Swallow, S. Bryant, L. Andersson         ||       stbryant@cisco.com, swallow@cisco.com, loa@pi.se
+#   RFC4929          ||      L. Andersson, Ed., A. Farrel, Ed.         ||       loa@pi.se, adrian@olddog.co.uk
+#   RFC4930          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC4931          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC4932          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC4933          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC4934          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC4935          ||      C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai         ||       cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com
+#   RFC4936          ||      C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai         ||       cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com
+#   RFC4937          ||      P. Arberg, V. Mammoliti         ||       parberg@redback.com, vince@cisco.com
+#   RFC4938          ||      B. Berry, H. Holgate         ||       bberry@cisco.com, hholgate@cisco.com
+#   RFC4939          ||      K. Gibbons, G. Ramkumar, S. Kipp         ||       kgibbons@yahoo.com, gramkumar@stanfordalumni.org, skipp@brocade.com
+#   RFC4940          ||      K. Kompella, B. Fenner         ||       kireeti@juniper.net, fenner@research.att.com
+#   RFC4941          ||      T. Narten, R. Draves, S. Krishnan         ||       narten@us.ibm.com, richdr@microsoft.com, suresh.krishnan@ericsson.com
+#   RFC4942          ||      E. Davies, S. Krishnan, P. Savola         ||       elwynd@dial.pipex.com, suresh.krishnan@ericsson.com, psavola@funet.fi
+#   RFC4943          ||      S. Roy, A. Durand, J. Paugh         ||       sebastien.roy@sun.com, alain_durand@cable.comcast.com, jim.paugh@nominum.com
+#   RFC4944          ||      G. Montenegro, N. Kushalnagar, J. Hui, D. Culler         ||       gabriel.montenegro@microsoft.com, nandakishore.kushalnagar@intel.com, jhui@archrock.com, dculler@archrock.com
+#   RFC4945          ||      B. Korver         ||       briank@networkresonance.com
+#   RFC4946          ||      J. Snell         ||       jasnell@gmail.com
+#   RFC4947          ||      G. Fairhurst, M. Montpetit         ||       gorry@erg.abdn.ac.uk, mmontpetit@motorola.com
+#   RFC4948          ||      L. Andersson, E. Davies, L. Zhang         ||       loa@pi.se, elwynd@dial.pipex.com, lixia@cs.ucla.edu
+#   RFC4949          ||      R. Shirey         ||       rwshirey4949@verizon.net
+#   RFC4950          ||      R. Bonica, D. Gan, D. Tappan, C. Pignataro         ||       rbonica@juniper.net, derhwagan@yahoo.com, dan.tappan@gmail.com, cpignata@cisco.com
+#   RFC4951          ||      V. Jain, Ed.         ||       vipinietf@yahoo.com
+#   RFC4952          ||      J. Klensin, Y. Ko         ||       john-ietf@jck.com, yw@mrko.pe.kr
+#   RFC4953          ||      J. Touch         ||       touch@isi.edu
+#   RFC4954          ||      R. Siemborski, Ed., A. Melnikov, Ed.         ||       robsiemb@google.com, Alexey.Melnikov@isode.com
+#   RFC4955          ||      D. Blacka         ||       davidb@verisign.com
+#   RFC4956          ||      R. Arends, M. Kosters, D. Blacka         ||       roy@nominet.org.uk, markk@verisign.com, davidb@verisign.com
+#   RFC4957          ||      S. Krishnan, Ed., N. Montavont, E. Njedjou, S. Veerepalli, A. Yegin, Ed.         ||       suresh.krishnan@ericsson.com, nicolas.montavont@enst-bretagne.fr, eric.njedjou@orange-ftgroup.com, sivav@qualcomm.com, a.yegin@partner.samsung.com
+#   RFC4958          ||      K. Carlberg         ||       carlberg@g11.org.uk
+#   RFC4959          ||      R. Siemborski, A. Gulbrandsen         ||       robsiemb@google.com, arnt@oryx.com
+#   RFC4960          ||      R. Stewart, Ed.         ||       randall@lakerest.net
+#   RFC4961          ||      D. Wing         ||       dwing-ietf@fuggles.com
+#   RFC4962          ||      R. Housley, B. Aboba         ||       housley@vigilsec.com, bernarda@microsoft.com
+#   RFC4963          ||      J. Heffner, M. Mathis, B. Chandler         ||       jheffner@psc.edu, mathis@psc.edu, bchandle@gmail.com
+#   RFC4964          ||      A. Allen, Ed., J. Holm, T. Hallin         ||       aallen@rim.com, Jan.Holm@ericsson.com, thallin@motorola.com
+#   RFC4965          ||      J-F. Mule, W. Townsley         ||       jf.mule@cablelabs.com, mark@townsley.net
+#   RFC4966          ||      C. Aoun, E. Davies         ||       ietf@energizeurnet.com, elwynd@dial.pipex.com
+#   RFC4967          ||      B. Rosen         ||       br@brianrosen.net
+#   RFC4968          ||      S. Madanapalli, Ed.         ||       smadanapalli@gmail.com
+#   RFC4969          ||      A. Mayrhofer         ||       alexander.mayrhofer@enum.at
+#   RFC4970          ||      A. Lindem, Ed., N. Shen, JP. Vasseur, R. Aggarwal, S. Shaffer         ||       acee@redback.com, naiming@cisco.com, jpv@cisco.com, rahul@juniper.net, sshaffer@bridgeport-networks.com
+#   RFC4971          ||      JP. Vasseur, Ed., N. Shen, Ed., R. Aggarwal, Ed.         ||       jpv@cisco.com, naiming@cisco.com, rahul@juniper.net
+#   RFC4972          ||      JP. Vasseur, Ed., JL. Leroux, Ed., S. Yasukawa, S. Previdi, P. Psenak, P. Mabbey         ||       jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com, s.yasukawa@hco.ntt.co.jp, sprevidi@cisco.com, ppsenak@cisco.com, Paul_Mabey@cable.comcast.com
+#   RFC4973          ||      P. Srisuresh, P. Joseph         ||       srisuresh@yahoo.com, paul_95014@yahoo.com
+#   RFC4974          ||      D. Papadimitriou, A. Farrel         ||       dimitri.papadimitriou@alcatel-lucent.be, adrian@olddog.co.uk
+#   RFC4975          ||      B. Campbell, Ed., R. Mahy, Ed., C. Jennings, Ed.         ||       ben@estacado.net, rohan@ekabal.com, fluffy@cisco.com
+#   RFC4976          ||      C. Jennings, R. Mahy, A. B. Roach         ||       fluffy@cisco.com, rohan@ekabal.com, adam@estacado.net
+#   RFC4977          ||      G. Tsirtsis, H. Soliman         ||       tsirtsis@qualcomm.com, hesham@elevatemobile.com
+#   RFC4978          ||      A. Gulbrandsen         ||       arnt@oryx.com
+#   RFC4979          ||      A. Mayrhofer         ||       alexander.mayrhofer@enum.at
+#   RFC4980          ||      C. Ng, T. Ernst, E. Paik, M. Bagnulo         ||       chanwah.ng@sg.panasonic.com, thierry.ernst@inria.fr, euna@kt.co.kr, marcelo@it.uc3m.es
+#   RFC4981          ||      J. Risson, T. Moors         ||       jr@tuffit.com, t.moors@unsw.edu.au
+#   RFC4982          ||      M. Bagnulo, J. Arkko         ||       marcelo@it.uc3m.es, jari.arkko@ericsson.com
+#   RFC4983          ||      C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai         ||       cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com
+#   RFC4984          ||      D. Meyer, Ed., L. Zhang, Ed., K. Fall, Ed.         ||       dmm@1-4-5.net, lixia@cs.ucla.edu, kfall@intel.com
+#   RFC4985          ||      S. Santesson         ||       stefans@microsoft.com
+#   RFC4986          ||      H. Eland, R. Mundy, S. Crocker, S. Krishnaswamy         ||       heland@afilias.info, mundy@sparta.com, steve@shinkuro.com, suresh@sparta.com
+#   RFC4987          ||      W. Eddy         ||       weddy@grc.nasa.gov
+#   RFC4988          ||      R. Koodli, C. Perkins         ||       rajeev.koodli@nokia.com, charles.perkins@nokia.com
+#   RFC4990          ||      K. Shiomoto, R. Papneja, R. Rabbat         ||       shiomoto.kohei@lab.ntt.co.jp, rabbat@alum.mit.edu, rpapneja@isocore.com
+#   RFC4991          ||      A. Newton         ||       andy@hxr.us
+#   RFC4992          ||      A. Newton         ||       andy@hxr.us
+#   RFC4993          ||      A. Newton         ||       andy@hxr.us
+#   RFC4994          ||      S. Zeng, B. Volz, K. Kinnear, J. Brzozowski         ||       szeng@cisco.com, volz@cisco.com, kkinnear@cisco.com, john_brzozowski@cable.comcast.com
+#   RFC4995          ||      L-E. Jonsson, G. Pelletier, K. Sandlund         ||       lars-erik@lejonsson.com, ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com
+#   RFC4996          ||      G. Pelletier, K. Sandlund, L-E. Jonsson, M. West         ||       ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com, lars-erik@lejonsson.com, mark.a.west@roke.co.uk
+#   RFC4997          ||      R. Finking, G. Pelletier         ||       robert.finking@roke.co.uk, ghyslain.pelletier@ericsson.com
+#   RFC4998          ||      T. Gondrom, R. Brandner, U. Pordesch         ||       tobias.gondrom@opentext.com, ralf.brandner@intercomponentware.com, ulrich.pordesch@zv.fraunhofer.de
+#   RFC5000          ||      RFC Editor         ||       rfc-editor@rfc-editor.org
+#   RFC5001          ||      R. Austein         ||       sra@isc.org
+#   RFC5002          ||      G. Camarillo, G. Blanco         ||       Gonzalo.Camarillo@ericsson.com, German.Blanco@ericsson.com
+#   RFC5003          ||      C. Metz, L. Martini, F. Balus, J. Sugimoto         ||       chmetz@cisco.com, lmartini@cisco.com, florin.balus@alcatel-lucent.com, sugimoto@nortel.com
+#   RFC5004          ||      E. Chen, S. Sangli         ||       enkechen@cisco.com, rsrihari@cisco.com
+#   RFC5005          ||      M. Nottingham         ||       mnot@pobox.com
+#   RFC5006          ||      J. Jeong, Ed., S. Park, L. Beloeil, S. Madanapalli         ||       jjeong@cs.umn.edu, soohong.park@samsung.com, luc.beloeil@orange-ftgroup.com, smadanapalli@gmail.com
+#   RFC5007          ||      J. Brzozowski, K. Kinnear, B. Volz, S. Zeng         ||       john_brzozowski@cable.comcast.com, kkinnear@cisco.com, volz@cisco.com, szeng@cisco.com
+#   RFC5008          ||      R. Housley, J. Solinas         ||       housley@vigilsec.com, jasolin@orion.ncsc.mil
+#   RFC5009          ||      R. Ejza         ||       ejzak@alcatel-lucent.com
+#   RFC5010          ||      K. Kinnear, M. Normoyle, M. Stapp         ||       kkinnear@cisco.com, mnormoyle@cisco.com, mjs@cisco.com
+#   RFC5011          ||      M. StJohns         ||       mstjohns@comcast.net
+#   RFC5012          ||      H. Schulzrinne, R. Marshall, Ed.         ||       hgs+ecrit@cs.columbia.edu, rmarshall@telecomsys.com
+#   RFC5013          ||      J. Kunze, T. Baker         ||       jak@ucop.edu, tbaker@tbaker.de
+#   RFC5014          ||      E. Nordmark, S. Chakrabarti, J. Laganier         ||       Erik.Nordmark@Sun.com, samitac2@gmail.com, julien.IETF@laposte.net
+#   RFC5015          ||      M. Handley, I. Kouvelas, T. Speakman, L. Vicisano         ||       M.Handley@cs.ucl.ac.uk, kouvelas@cisco.com, speakman@cisco.com, lorenzo@digitalfountain.com
+#   RFC5016          ||      M. Thomas         ||       mat@cisco.com
+#   RFC5017          ||      D. McWalter, Ed.         ||       dmcw@dataconnection.com
+#   RFC5018          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC5019          ||      A. Deacon, R. Hurst         ||       alex@verisign.com, rmh@microsoft.com
+#   RFC5020          ||      K. Zeilenga         ||       Kurt.Zeilenga@Isode.COM
+#   RFC5021          ||      S. Josefsson         ||       simon@josefsson.org
+#   RFC5022          ||      J. Van Dyke, E. Burger, Ed., A. Spitzer         ||       jvandyke@cantata.com, eburger@standardstrack.com, woof@pingtel.com
+#   RFC5023          ||      J. Gregorio, Ed., B. de hOra, Ed.         ||       joe@bitworking.org, bill@dehora.net
+#   RFC5024          ||      I. Friend         ||       ieuan.friend@dip.co.uk
+#   RFC5025          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC5026          ||      G. Giaretta, Ed., J. Kempf, V. Devarapalli, Ed.         ||       gerardog@qualcomm.com, kempf@docomolabs-usa.com, vijay.devarapalli@azairenet.com
+#   RFC5027          ||      F. Andreasen, D. Wing         ||       fandreas@cisco.com, dwing-ietf@fuggles.com
+#   RFC5028          ||      R. Mahy         ||       rohan@ekabal.com
+#   RFC5029          ||      JP. Vasseur, S. Previdi         ||       jpv@cisco.com, sprevidi@cisco.com
+#   RFC5030          ||      M. Nakhjiri, Ed., K. Chowdhury, A. Lior, K. Leung         ||       madjid.nakhjiri@motorola.com, kchowdhury@starentnetworks.com, avi@bridgewatersystems.com, kleung@cisco.com
+#   RFC5031          ||      H. Schulzrinne         ||       hgs+ecrit@cs.columbia.edu
+#   RFC5032          ||      E. Burger, Ed.         ||       eric.burger@bea.com
+#   RFC5033          ||      S. Floyd, M. Allman         ||       floyd@icir.org, mallman@icir.org
+#   RFC5034          ||      R. Siemborski, A. Menon-Sen         ||       robsiemb@google.com, ams@oryx.com
+#   RFC5035          ||      J. Schaad         ||       jimsch@exmsft.com
+#   RFC5036          ||      L. Andersson, Ed., I. Minei, Ed., B. Thomas, Ed.         ||       loa@pi.se, ina@juniper.net, rhthomas@cisco.com
+#   RFC5037          ||      L. Andersson, Ed., I. Minei, Ed., B. Thomas, Ed.         ||       loa@pi.se, ina@juniper.net, rhthomas@cisco.com
+#   RFC5038          ||      B. Thomas, L. Andersson         ||       loa@pi.se, rhthomas@cisco.com
+#   RFC5039          ||      J. Rosenberg, C. Jennings         ||       jdrosen@cisco.com, fluffy@cisco.com
+#   RFC5040          ||      R. Recio, B. Metzler, P. Culley, J. Hilland, D. Garcia         ||       recio@us.ibm.com, bmt@zurich.ibm.com, paul.culley@hp.com, jeff.hilland@hp.com, Dave.Garcia@StanfordAlumni.org
+#   RFC5041          ||      H. Shah, J. Pinkerton, R. Recio, P. Culley         ||       hemal@broadcom.com, jpink@microsoft.com, recio@us.ibm.com, paul.culley@hp.com
+#   RFC5042          ||      J. Pinkerton, E. Deleganes         ||       jpink@windows.microsoft.com, deleganes@yahoo.com
+#   RFC5043          ||      C. Bestler, Ed., R. Stewart, Ed.         ||       caitlin.bestler@neterion.com, randall@lakerest.net
+#   RFC5044          ||      P. Culley, U. Elzur, R. Recio, S. Bailey, J. Carrier         ||       paul.culley@hp.com, uri@broadcom.com, recio@us.ibm.com, steph@sandburst.com, carrier@cray.com
+#   RFC5045          ||      C. Bestler, Ed., L. Coene         ||       caitlin.bestler@neterion.com, lode.coene@nsn.com
+#   RFC5046          ||      M. Ko, M. Chadalapaka, J. Hufferd, U. Elzur, H. Shah, P. Thaler         ||       mako@us.ibm.com, cbm@rose.hp.com, jhufferd@brocade.com, Uri@Broadcom.com, hemal@broadcom.com, pthaler@broadcom.com
+#   RFC5047          ||      M. Chadalapaka, J. Hufferd, J. Satran, H. Shah         ||       cbm@rose.hp.com, jhufferd@brocade.com, Julian_Satran@il.ibm.com, hemal@broadcom.com
+#   RFC5048          ||      M. Chadalapaka, Ed.         ||       cbm@rose.hp.com
+#   RFC5049          ||      C. Bormann, Z. Liu, R. Price, G. Camarillo, Ed.         ||       cabo@tzi.org, zhigang.c.liu@nokia.com, richard.price@eads.com, Gonzalo.Camarillo@ericsson.com
+#   RFC5050          ||      K. Scott, S. Burleigh         ||       kscott@mitre.org, Scott.Burleigh@jpl.nasa.gov
+#   RFC5051          ||      M. Crispin         ||       MRC@CAC.Washington.EDU
+#   RFC5052          ||      M. Watson, M. Luby, L. Vicisano         ||       mark@digitalfountain.com, luby@digitalfountain.com, lorenzo@digitalfountain.com
+#   RFC5053          ||      M. Luby, A. Shokrollahi, M. Watson, T. Stockhammer         ||       luby@digitalfountain.com, amin.shokrollahi@epfl.ch, mark@digitalfountain.com, stockhammer@nomor.de
+#   RFC5054          ||      D. Taylor, T. Wu, N. Mavrogiannopoulos, T. Perrin         ||       dtaylor@gnutls.org, thomwu@cisco.com, nmav@gnutls.org, trevp@trevp.net
+#   RFC5055          ||      T. Freeman, R. Housley, A. Malpani, D. Cooper, W. Polk         ||       trevorf@microsoft.com, housley@vigilsec.com, ambarish@yahoo.com, david.cooper@nist.gov, wpolk@nist.gov
+#   RFC5056          ||      N. Williams         ||       Nicolas.Williams@sun.com
+#   RFC5057          ||      R. Sparks         ||       RjS@estacado.net
+#   RFC5058          ||      R. Boivie, N. Feldman, Y. Imai, W. Livens, D. Ooms         ||       rhboivie@us.ibm.com, nkfeldman@yahoo.com, ug@xcast.jp, wim@livens.net, dirk@onesparrow.com
+#   RFC5059          ||      N. Bhaskar, A. Gall, J. Lingard, S. Venaas         ||       nidhi@arastra.com, alexander.gall@switch.ch, jchl@arastra.com, venaas@uninett.no
+#   RFC5060          ||      R. Sivaramu, J. Lingard, D. McWalter, B. Joshi, A. Kessler         ||       raghava@cisco.com, jchl@arastra.com, dmcw@dataconnection.com, bharat_joshi@infosys.com, kessler@cisco.com
+#   RFC5061          ||      R. Stewart, Q. Xie, M. Tuexen, S. Maruyama, M. Kozuka         ||       randall@lakerest.net, Qiaobing.Xie@motorola.com, tuexen@fh-muenster.de, mail@marushin.gr.jp, ma-kun@kozuka.jp
+#   RFC5062          ||      R. Stewart, M. Tuexen, G. Camarillo         ||       randall@lakerest.net, tuexen@fh-muenster.de, Gonzalo.Camarillo@ericsson.com
+#   RFC5063          ||      A. Satyanarayana, Ed., R. Rahman, Ed.         ||       asatyana@cisco.com, rrahman@cisco.com
+#   RFC5064          ||      M. Duerst         ||       duerst@it.aoyama.ac.jp
+#   RFC5065          ||      P. Traina, D. McPherson, J. Scudder         ||       bgp-confederations@st04.pst.org, danny@arbor.net, jgs@juniper.net
+#   RFC5066          ||      E. Beili         ||       edward.beili@actelis.com
+#   RFC5067          ||      S. Lind, P. Pfautz         ||       sdlind@att.com, ppfautz@att.com
+#   RFC5068          ||      C. Hutzler, D. Crocker, P. Resnick, E. Allman, T. Finch         ||       cdhutzler@aol.com, dcrocker@bbiw.net, presnick@qti.qualcomm.com, eric+ietf-smtp@sendmail.org, dot@dotat.at
+#   RFC5069          ||      T. Taylor, Ed., H. Tschofenig, H. Schulzrinne, M. Shanmugam         ||       tom.taylor.stds@gmail.com, Hannes.Tschofenig@nsn.com, hgs+ecrit@cs.columbia.edu, murugaraj.shanmugam@detecon.com
+#   RFC5070          ||      R. Danyliw, J. Meijer, Y. Demchenko         ||       rdd@cert.org, jan@flyingcloggies.nl, demch@chello.nl
+#   RFC5071          ||      D. Hankins         ||       David_Hankins@isc.org
+#   RFC5072          ||      S. Varada, Ed., D. Haskins, E. Allen         ||       varada@txc.com
+#   RFC5073          ||      J.P. Vasseur, Ed., J.L. Le Roux, Ed.         ||       jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com
+#   RFC5074          ||      S. Weiler         ||       weiler@tislabs.com
+#   RFC5075          ||      B. Haberman, Ed., R. Hinden         ||       brian@innovationslab.net, bob.hinden@gmail.com
+#   RFC5076          ||      B. Hoeneisen         ||       hoeneisen@switch.ch
+#   RFC5077          ||      J. Salowey, H. Zhou, P. Eronen, H. Tschofenig         ||       jsalowey@cisco.com, hzhou@cisco.com, pe@iki.fi, Hannes.Tschofenig@nsn.com
+#   RFC5078          ||      S. Dawkins         ||       spencer@mcsr-labs.org
+#   RFC5079          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC5080          ||      D. Nelson, A. DeKok         ||       dnelson@elbrysnetworks.com, aland@freeradius.org
+#   RFC5081          ||      N. Mavrogiannopoulos         ||       nmav@gnutls.org
+#   RFC5082          ||      V. Gill, J. Heasley, D. Meyer, P. Savola, Ed., C. Pignataro         ||       vijay@umbc.edu, heas@shrubbery.net, dmm@1-4-5.net, psavola@funet.fi, cpignata@cisco.com
+#   RFC5083          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC5084          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC5085          ||      T. Nadeau, Ed., C. Pignataro, Ed.         ||       tnadeau@lucidvision.com, cpignata@cisco.com
+#   RFC5086          ||      A. Vainshtein, Ed., I. Sasson, E. Metz, T. Frost, P. Pate         ||       sasha@axerra.com, israel@axerra.com, e.t.metz@telecom.tno.nl, tfrost@symmetricom.com, prayson.pate@overturenetworks.com
+#   RFC5087          ||      Y(J). Stein, R. Shashoua, R. Insler, M. Anavi         ||       yaakov_s@rad.com, ronen_s@rad.com, ron_i@rad.com, motty@radusa.com
+#   RFC5088          ||      JL. Le Roux, Ed., JP. Vasseur, Ed., Y. Ikejiri, R. Zhang         ||       jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, y.ikejiri@ntt.com, raymond.zhang@bt.com
+#   RFC5089          ||      JL. Le Roux, Ed., JP. Vasseur, Ed., Y. Ikejiri, R. Zhang         ||       jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, y.ikejiri@ntt.com, raymond.zhang@bt.com
+#   RFC5090          ||      B. Sterman, D. Sadolevsky, D. Schwartz, D. Williams, W. Beck         ||       baruch@kayote.com, dscreat@dscreat.com, david@kayote.com, dwilli@cisco.com, beckw@t-systems.com
+#   RFC5091          ||      X. Boyen, L. Martin         ||       xavier@voltage.com, martin@voltage.com
+#   RFC5092          ||      A. Melnikov, Ed., C. Newman         ||       Alexey.Melnikov@isode.com, chris.newman@sun.com
+#   RFC5093          ||      G. Hunt         ||       geoff.hunt@bt.com
+#   RFC5094          ||      V. Devarapalli, A. Patel, K. Leung         ||       vijay.devarapalli@azairenet.com, alpesh@cisco.com, kleung@cisco.com
+#   RFC5095          ||      J. Abley, P. Savola, G. Neville-Neil         ||       jabley@ca.afilias.info, psavola@funet.fi, gnn@neville-neil.com
+#   RFC5096          ||      V. Devarapalli         ||       vijay.devarapalli@azairenet.com
+#   RFC5097          ||      G. Renker, G. Fairhurst         ||       gerrit@erg.abdn.ac.uk, gorry@erg.abdn.ac.uk
+#   RFC5098          ||      G. Beacham, S. Kumar, S. Channabasappa         ||       gordon.beacham@motorola.com, satish.kumar@ti.com, Sumanth@cablelabs.com
+#   RFC5101          ||      B. Claise, Ed.         ||       bclaise@cisco.com
+#   RFC5102          ||      J. Quittek, S. Bryant, B. Claise, P. Aitken, J. Meyer         ||       quittek@netlab.nec.de, stbryant@cisco.com, bclaise@cisco.com, paitken@cisco.com, jemeyer@paypal.com
+#   RFC5103          ||      B. Trammell, E. Boschi         ||       bht@cert.org, elisa.boschi@hitachi-eu.com
+#   RFC5104          ||      S. Wenger, U. Chandra, M. Westerlund, B. Burman         ||       stewe@stewe.org, Umesh.1.Chandra@nokia.com, magnus.westerlund@ericsson.com, bo.burman@ericsson.com
+#   RFC5105          ||      O. Lendl         ||       otmar.lendl@enum.at
+#   RFC5106          ||      H. Tschofenig, D. Kroeselberg, A. Pashalidis, Y. Ohba, F. Bersani         ||       Hannes.Tschofenig@nsn.com, Dirk.Kroeselberg@nsn.com, pashalidis@nw.neclab.eu, yohba@tari.toshiba.com, florent.ftrd@gmail.com
+#   RFC5107          ||      R. Johnson, J. Kumarasamy, K. Kinnear, M. Stapp         ||       raj@cisco.com, jayk@cisco.com, kkinnear@cisco.com, mjs@cisco.com
+#   RFC5109          ||      A. Li, Ed.         ||       adamli@hyervision.com
+#   RFC5110          ||      P. Savola         ||       psavola@funet.fi
+#   RFC5111          ||      B. Aboba, L. Dondeti         ||       bernarda@microsoft.com, ldondeti@qualcomm.com
+#   RFC5112          ||      M. Garcia-Martin         ||       miguel.garcia@nsn.com
+#   RFC5113          ||      J. Arkko, B. Aboba, J. Korhonen, Ed., F. Bari         ||       jari.arkko@ericsson.com, bernarda@microsoft.com, jouni.korhonen@teliasonera.com, farooq.bari@att.com
+#   RFC5114          ||      M. Lepinski, S. Kent         ||       mlepinski@bbn.com, kent@bbn.com
+#   RFC5115          ||      K. Carlberg, P. O'Hanlon         ||       carlberg@g11.org.uk, p.ohanlon@cs.ucl.ac.uk
+#   RFC5116          ||      D. McGrew         ||       mcgrew@cisco.com
+#   RFC5117          ||      M. Westerlund, S. Wenger         ||       magnus.westerlund@ericsson.com, stewe@stewe.org
+#   RFC5118          ||      V. Gurbani, C. Boulton, R. Sparks         ||       vkg@alcatel-lucent.com, cboulton@ubiquitysoftware.com, RjS@estacado.net
+#   RFC5119          ||      T. Edwards         ||       thomas.edwards@fox.com
+#   RFC5120          ||      T. Przygienda, N. Shen, N. Sheth         ||       prz@net4u.ch, naiming@cisco.com, nsheth@juniper.net
+#   RFC5121          ||      B. Patil, F. Xia, B. Sarikaya, JH. Choi, S. Madanapalli         ||       basavaraj.patil@nsn.com, xiayangsong@huawei.com, sarikaya@ieee.org, jinchoe@samsung.com, smadanapalli@gmail.com
+#   RFC5122          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC5123          ||      R. White, B. Akyol         ||       riw@cisco.com, bora@cisco.com
+#   RFC5124          ||      J. Ott, E. Carrara         ||       jo@comnet.tkk.fi, carrara@kth.se
+#   RFC5125          ||      T. Taylor         ||       tom.taylor.stds@gmail.com
+#   RFC5126          ||      D. Pinkas, N. Pope, J. Ross         ||       Denis.Pinkas@bull.net, nick.pope@thales-esecurity.com, ross@secstan.com
+#   RFC5127          ||      K. Chan, J. Babiarz, F. Baker         ||       khchan@nortel.com, babiarz@nortel.com, fred@cisco.com
+#   RFC5128          ||      P. Srisuresh, B. Ford, D. Kegel         ||       srisuresh@yahoo.com, baford@mit.edu, dank06@kegel.com
+#   RFC5129          ||      B. Davie, B. Briscoe, J. Tay         ||       bsd@cisco.com, bob.briscoe@bt.com, june.tay@bt.com
+#   RFC5130          ||      S. Previdi, M. Shand, Ed., C. Martin         ||       sprevidi@cisco.com, mshand@cisco.com, chris@ipath.net
+#   RFC5131          ||      D. McWalter, Ed.         ||       dmcw@dataconnection.com
+#   RFC5132          ||      D. McWalter, D. Thaler, A. Kessler         ||       dmcw@dataconnection.com, dthaler@windows.microsoft.com, kessler@cisco.com
+#   RFC5133          ||      M. Tuexen, K. Morneault         ||       tuexen@fh-muenster.de, kmorneau@cisco.com
+#   RFC5134          ||      M. Mealling         ||       michael@refactored-networks.com
+#   RFC5135          ||      D. Wing, T. Eckert         ||       dwing-ietf@fuggles.com, eckert@cisco.com
+#   RFC5136          ||      P. Chimento, J. Ishac         ||       Philip.Chimento@jhuapl.edu, jishac@nasa.gov
+#   RFC5137          ||      J. Klensin         ||       john-ietf@jck.com
+#   RFC5138          ||      S. Cox         ||       Simon.Cox@csiro.au
+#   RFC5139          ||      M. Thomson, J. Winterbottom         ||       martin.thomson@andrew.com, james.winterbottom@andrew.com
+#   RFC5140          ||      M. Bangalore, R. Kumar, J. Rosenberg, H. Salama, D.N. Shah         ||       manjax@cisco.com, rajneesh@cisco.com, jdrosen@cisco.com, hsalama@citexsoftware.com, dhaval@moowee.tv
+#   RFC5141          ||      J. Goodwin, H. Apel         ||       goodwin@iso.org, apel@iso.org
+#   RFC5142          ||      B. Haley, V. Devarapalli, H. Deng, J. Kempf         ||       brian.haley@hp.com, vijay.devarapalli@azairenet.com, kempf@docomolabs-usa.com, denghui@chinamobile.com
+#   RFC5143          ||      A. Malis, J. Brayley, J. Shirron, L. Martini, S. Vogelsang         ||       andrew.g.malis@verizon.com, jeremy.brayley@ecitele.com, john.shirron@ecitele.com, lmartini@cisco.com, steve.vogelsang@alcatel-lucent.com
+#   RFC5144          ||      A. Newton, M. Sanz         ||       andy@arin.net, sanz@denic.de
+#   RFC5145          ||      K. Shiomoto, Ed.         ||       shiomoto.kohei@lab.ntt.co.jp
+#   RFC5146          ||      K. Kumaki, Ed.         ||       ke-kumaki@kddi.com
+#   RFC5147          ||      E. Wilde, M. Duerst         ||       dret@berkeley.edu, duerst@it.aoyama.ac.jp
+#   RFC5148          ||      T. Clausen, C. Dearlove, B. Adamson         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com, adamson@itd.nrl.navy.mil
+#   RFC5149          ||      J. Korhonen, U. Nilsson, V. Devarapalli         ||       jouni.korhonen@teliasonera.com, ulf.s.nilsson@teliasonera.com, vijay.devarapalli@azairenet.com
+#   RFC5150          ||      A. Ayyangar, K. Kompella, JP. Vasseur, A. Farrel         ||       arthi@juniper.net, kireeti@juniper.net, jpv@cisco.com, adrian@olddog.co.uk
+#   RFC5151          ||      A. Farrel, Ed., A. Ayyangar, JP. Vasseur         ||       adrian@olddog.co.uk, arthi@juniper.net, jpv@cisco.com
+#   RFC5152          ||      JP. Vasseur, Ed., A. Ayyangar, Ed., R. Zhang         ||       jpv@cisco.com, arthi@juniper.net, raymond.zhang@bt.com
+#   RFC5153          ||      E. Boschi, L. Mark, J. Quittek, M. Stiemerling, P. Aitken         ||       elisa.boschi@hitachi-eu.com, lutz.mark@fokus.fraunhofer.de, quittek@nw.neclab.eu, stiemerling@nw.neclab.eu, paitken@cisco.com
+#   RFC5154          ||      J. Jee, Ed., S. Madanapalli, J. Mandin         ||       jhjee@etri.re.kr, smadanapalli@gmail.com, j_mandin@yahoo.com
+#   RFC5155          ||      B. Laurie, G. Sisson, R. Arends, D. Blacka         ||       ben@links.org, geoff-s@panix.com, roy@nominet.org.uk, davidb@verisign.com
+#   RFC5156          ||      M. Blanchet         ||       Marc.Blanchet@viagenie.ca
+#   RFC5157          ||      T. Chown         ||       tjc@ecs.soton.ac.uk
+#   RFC5158          ||      G. Huston         ||       gih@apnic.net
+#   RFC5159          ||      L. Dondeti, Ed., A. Jerichow         ||       ldondeti@qualcomm.com, anja.jerichow@nsn.com
+#   RFC5160          ||      P. Levis, M. Boucadair         ||       pierre.levis@orange-ftgroup.com, mohamed.boucadair@orange-ftgroup.com
+#   RFC5161          ||      A. Gulbrandsen, Ed., A. Melnikov, Ed.         ||       arnt@oryx.com, Alexey.Melnikov@isode.com
+#   RFC5162          ||      A. Melnikov, D. Cridland, C. Wilson         ||       Alexey.Melnikov@isode.com, dave.cridland@isode.com, corby@computer.org
+#   RFC5163          ||      G. Fairhurst, B. Collini-Nocker         ||       gorry@erg.abdn.ac.uk, bnocker@cosy.sbg.ac.at
+#   RFC5164          ||      T. Melia, Ed.         ||       tmelia@cisco.com
+#   RFC5165          ||      C. Reed         ||       creed@opengeospatial.org
+#   RFC5166          ||      S. Floyd, Ed.         ||       floyd@icir.org
+#   RFC5167          ||      M. Dolly, R. Even         ||       mdolly@att.com, roni.even@polycom.co.il
+#   RFC5168          ||      O. Levin, R. Even, P. Hagendorf         ||       oritl@microsoft.com, roni.even@polycom.co.il, pierre@radvision.com
+#   RFC5169          ||      T. Clancy, M. Nakhjiri, V. Narayanan, L. Dondeti         ||       clancy@LTSnet.net, madjid.nakhjiri@motorola.com, vidyan@qualcomm.com, ldondeti@qualcomm.com
+#   RFC5170          ||      V. Roca, C. Neumann, D. Furodet         ||       vincent.roca@inria.fr, christoph.neumann@thomson.net, david.furodet@st.com
+#   RFC5171          ||      M. Foschiano         ||       foschia@cisco.com
+#   RFC5172          ||      S. Varada, Ed.         ||       varada@ieee.org
+#   RFC5173          ||      J. Degener, P. Guenther         ||       jutta@pobox.com, guenther@sendmail.com
+#   RFC5174          ||      J-P. Evain         ||       evain@ebu.ch
+#   RFC5175          ||      B. Haberman, Ed., R. Hinden         ||       brian@innovationslab.net, bob.hinden@gmail.com
+#   RFC5176          ||      M. Chiba, G. Dommety, M. Eklund, D. Mitton, B. Aboba         ||       mchiba@cisco.com, gdommety@cisco.com, meklund@cisco.com, david@mitton.com, bernarda@microsoft.com
+#   RFC5177          ||      K. Leung, G. Dommety, V. Narayanan, A. Petrescu         ||       kleung@cisco.com, gdommety@cisco.com, vidyan@qualcomm.com, alexandru.petrescu@motorola.com
+#   RFC5178          ||      N. Williams, A. Melnikov         ||       Nicolas.Williams@sun.com, Alexey.Melnikov@isode.com
+#   RFC5179          ||      N. Williams         ||       Nicolas.Williams@sun.com
+#   RFC5180          ||      C. Popoviciu, A. Hamza, G. Van de Velde, D. Dugatkin         ||       cpopovic@cisco.com, ahamza@cisco.com, gunter@cisco.com, diego@fastsoft.com
+#   RFC5181          ||      M-K. Shin, Ed., Y-H. Han, S-E. Kim, D. Premec         ||       myungki.shin@gmail.com, yhhan@kut.ac.kr, sekim@kt.co.kr, domagoj.premec@siemens.com
+#   RFC5182          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
+#   RFC5183          ||      N. Freed         ||       ned.freed@mrochek.com
+#   RFC5184          ||      F. Teraoka, K. Gogo, K. Mitsuya, R. Shibui, K. Mitani         ||       tera@ics.keio.ac.jp, gogo@tera.ics.keio.ac.jp, mitsuya@sfc.wide.ad.jp, shibrie@tera.ics.keio.ac.jp, koki@tera.ics.keio.ac.jp, rajeev_koodli@yahoo.com
+#   RFC5185          ||      S. Mirtorabi, P. Psenak, A. Lindem, Ed., A. Oswal         ||       sina@nuovasystems.com, ppsenak@cisco.com, acee@redback.com, aoswal@redback.com
+#   RFC5186          ||      B. Haberman, J. Martin         ||       brian@innovationslab.net, jim@wovensystems.com
+#   RFC5187          ||      P. Pillay-Esnault, A. Lindem         ||       ppe@cisco.com, acee@redback.com
+#   RFC5188          ||      H. Desineni, Q. Xie         ||       hd@qualcomm.com, Qiaobing.Xie@Gmail.com
+#   RFC5189          ||      M. Stiemerling, J. Quittek, T. Taylor         ||       stiemerling@nw.neclab.eu, quittek@nw.neclab.eu, tom.taylor.stds@gmail.com
+#   RFC5190          ||      J. Quittek, M. Stiemerling, P. Srisuresh         ||       quittek@nw.neclab.eu, stiemerling@nw.neclab.eu, srisuresh@yahoo.com
+#   RFC5191          ||      D. Forsberg, Y. Ohba, Ed., B. Patil, H. Tschofenig, A. Yegin         ||       dan.forsberg@nokia.com, yohba@tari.toshiba.com, basavaraj.patil@nsn.com, hannes.tschofenig@nsn.com, a.yegin@partner.samsung.com
+#   RFC5192          ||      L. Morand, A. Yegin, S. Kumar, S. Madanapalli         ||       lionel.morand@orange-ftgroup.com, a.yegin@partner.samsung.com, surajk@techmahindra.com, syam@samsung.com
+#   RFC5193          ||      P. Jayaraman, R. Lopez, Y. Ohba, Ed., M. Parthasarathy, A. Yegin         ||       prakash_jayaraman@net.com, rafa@um.es, yohba@tari.toshiba.com, mohanp@sbcglobal.net, a.yegin@partner.samsung.com
+#   RFC5194          ||      A. van Wijk, Ed., G. Gybels, Ed.         ||       guido.gybels@rnid.org.uk, arnoud@realtimetext.org
+#   RFC5195          ||      H. Ould-Brahim, D. Fedyk, Y. Rekhter         ||       hbrahim@nortel.com, yakov@juniper.net, dwfedyk@nortel.com
+#   RFC5196          ||      M. Lonnfors, K. Kiss         ||       mikko.lonnfors@nokia.com, krisztian.kiss@nokia.com
+#   RFC5197          ||      S. Fries, D. Ignjatic         ||       steffen.fries@siemens.com, dignjatic@polycom.com
+#   RFC5198          ||      J. Klensin, M. Padlipsky         ||       john-ietf@jck.com, the.map@alum.mit.edu
+#   RFC5201          ||      R. Moskowitz, P. Nikander, P. Jokela, Ed., T. Henderson         ||       rgm@icsalabs.com, pekka.nikander@nomadiclab.com, petri.jokela@nomadiclab.com, thomas.r.henderson@boeing.com
+#   RFC5202          ||      P. Jokela, R. Moskowitz, P. Nikander         ||       petri.jokela@nomadiclab.com, rgm@icsalabs.com, pekka.nikander@nomadiclab.com
+#   RFC5203          ||      J. Laganier, T. Koponen, L. Eggert         ||       julien.ietf@laposte.net, teemu.koponen@iki.fi, lars.eggert@nokia.com
+#   RFC5204          ||      J. Laganier, L. Eggert         ||       julien.ietf@laposte.net, lars.eggert@nokia.com
+#   RFC5205          ||      P. Nikander, J. Laganier         ||       pekka.nikander@nomadiclab.com, julien.ietf@laposte.net
+#   RFC5206          ||      P. Nikander, T. Henderson, Ed., C. Vogt, J. Arkko         ||       pekka.nikander@nomadiclab.com, thomas.r.henderson@boeing.com, christian.vogt@ericsson.com, jari.arkko@ericsson.com
+#   RFC5207          ||      M. Stiemerling, J. Quittek, L. Eggert         ||       stiemerling@netlab.nec.de, quittek@nw.neclab.eu, lars.eggert@nokia.com
+#   RFC5208          ||      B. Kaliski         ||       kaliski_burt@emc.com
+#   RFC5209          ||      P. Sangster, H. Khosravi, M. Mani, K. Narayan, J. Tardo         ||       Paul_Sangster@symantec.com, hormuzd.m.khosravi@intel.com, mmani@avaya.com, kaushik@cisco.com, joseph.tardo@nevisnetworks.com
+#   RFC5210          ||      J. Wu, J. Bi, X. Li, G. Ren, K. Xu, M. Williams         ||       jianping@cernet.edu.cn, junbi@cernet.edu.cn, xing@cernet.edu.cn, rg03@mails.tsinghua.edu.cn, xuke@csnet1.cs.tsinghua.edu.cn, miw@juniper.net
+#   RFC5211          ||      J. Curran         ||       jcurran@istaff.org
+#   RFC5212          ||      K. Shiomoto, D. Papadimitriou, JL. Le Roux, M. Vigoureux, D. Brungard         ||       shiomoto.kohei@lab.ntt.co.jp, dimitri.papadimitriou@alcatel-lucent.be, jeanlouis.leroux@orange-ftgroup.com, martin.vigoureux@alcatel-lucent.fr, dbrungard@att.com
+#   RFC5213          ||      S. Gundavelli, Ed., K. Leung, V. Devarapalli, K. Chowdhury, B. Patil         ||       sgundave@cisco.com, kleung@cisco.com, vijay@wichorus.com, kchowdhury@starentnetworks.com, basavaraj.patil@nokia.com
+#   RFC5214          ||      F. Templin, T. Gleeson, D. Thaler         ||       fred.l.templin@boeing.com, tgleeson@cisco.com, dthaler@microsoft.com
+#   RFC5215          ||      L. Barbato         ||       lu_zero@gentoo.org
+#   RFC5216          ||      D. Simon, B. Aboba, R. Hurst         ||       dansimon@microsoft.com, bernarda@microsoft.com, rmh@microsoft.com
+#   RFC5217          ||      M. Shimaoka, Ed., N. Hastings, R. Nielsen         ||       m-shimaoka@secom.co.jp, nelson.hastings@nist.gov, nielsen_rebecca@bah.com
+#   RFC5218          ||      D. Thaler, B. Aboba         ||       dthaler@microsoft.com, bernarda@microsoft.com
+#   RFC5219          ||      R. Finlayson         ||       finlayson@live555.com
+#   RFC5220          ||      A. Matsumoto, T. Fujisaki, R. Hiromi, K. Kanayama         ||       arifumi@nttv6.net, fujisaki@nttv6.net, hiromi@inetcore.com, kanayama_kenichi@intec-si.co.jp
+#   RFC5221          ||      A. Matsumoto, T. Fujisaki, R. Hiromi, K. Kanayama         ||       arifumi@nttv6.net, fujisaki@nttv6.net, hiromi@inetcore.com, kanayama_kenichi@intec-si.co.jp
+#   RFC5222          ||      T. Hardie, A. Newton, H. Schulzrinne, H. Tschofenig         ||       hardie@qualcomm.com, andy@hxr.us, hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@nsn.com
+#   RFC5223          ||      H. Schulzrinne, J. Polk, H. Tschofenig         ||       hgs+ecrit@cs.columbia.edu, jmpolk@cisco.com, Hannes.Tschofenig@nsn.com
+#   RFC5224          ||      M. Brenner         ||       mrbrenner@alcatel-lucent.com
+#   RFC5225          ||      G. Pelletier, K. Sandlund         ||       ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com
+#   RFC5226          ||      T. Narten, H. Alvestrand         ||       narten@us.ibm.com, Harald@Alvestrand.no
+#   RFC5227          ||      S. Cheshire         ||       rfc@stuartcheshire.org
+#   RFC5228          ||      P. Guenther, Ed., T. Showalter, Ed.         ||       guenther@sendmail.com, tjs@psaux.com
+#   RFC5229          ||      K. Homme         ||       kjetilho@ifi.uio.no
+#   RFC5230          ||      T. Showalter, N. Freed, Ed.         ||       tjs@psaux.com, ned.freed@mrochek.com
+#   RFC5231          ||      W. Segmuller, B. Leiba         ||       werewolf@us.ibm.com, leiba@watson.ibm.com
+#   RFC5232          ||      A. Melnikov         ||       alexey.melnikov@isode.com
+#   RFC5233          ||      K. Murchison         ||       murch@andrew.cmu.edu
+#   RFC5234          ||      D. Crocker, Ed., P. Overell         ||       dcrocker@bbiw.net, paul@bayleaf.org.uk
+#   RFC5235          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC5236          ||      A. Jayasumana, N. Piratla, T. Banka, A. Bare, R. Whitner         ||       Anura.Jayasumana@colostate.edu, Nischal.Piratla@telekom.de, Tarun.Banka@colostate.edu, abhijit_bare@agilent.com, rick_whitner@agilent.com
+#   RFC5237          ||      J. Arkko, S. Bradner         ||       jari.arkko@piuha.net, sob@harvard.edu
+#   RFC5238          ||      T. Phelan         ||       tphelan@sonusnet.com
+#   RFC5239          ||      M. Barnes, C. Boulton, O. Levin         ||       mary.barnes@nortel.com, cboulton@avaya.com, oritl@microsoft.com
+#   RFC5240          ||      B. Joshi, R. Bijlani         ||       bharat_joshi@infosys.com, rainab@gmail.com
+#   RFC5241          ||      A. Falk, S. Bradner         ||       falk@bbn.com, sob@harvard.edu
+#   RFC5242          ||      J. Klensin, H. Alvestrand         ||       john+ietf@jck.com, harald@alvestrand.no
+#   RFC5243          ||      R. Ogier         ||       rich.ogier@earthlink.net
+#   RFC5244          ||      H. Schulzrinne, T. Taylor         ||       schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com
+#   RFC5245          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
+#   RFC5246          ||      T. Dierks, E. Rescorla         ||       tim@dierks.org, ekr@rtfm.com
+#   RFC5247          ||      B. Aboba, D. Simon, P. Eronen         ||       bernarda@microsoft.com, dansimon@microsoft.com, pe@iki.fi
+#   RFC5248          ||      T. Hansen, J. Klensin         ||       tony+mailesc@maillennium.att.com, john+ietf@jck.com
+#   RFC5249          ||      D. Harrington, Ed.         ||       dharrington@huawei.com
+#   RFC5250          ||      L. Berger, I. Bryskin, A. Zinin, R. Coltun         ||       lberger@labn.net, ibryskin@advaoptical.com, alex.zinin@alcatel-lucent.com, none
+#   RFC5251          ||      D. Fedyk, Ed., Y. Rekhter, Ed., D. Papadimitriou, R. Rabbat, L. Berger         ||       dwfedyk@nortel.com, yakov@juniper.net, Dimitri.Papadimitriou@alcatel-lucent.be, rabbat@alum.mit.edu, lberger@labn.net
+#   RFC5252          ||      I. Bryskin, L. Berger         ||       ibryskin@advaoptical.com, lberger@labn.net
+#   RFC5253          ||      T. Takeda, Ed.         ||       takeda.tomonori@lab.ntt.co.jp
+#   RFC5254          ||      N. Bitar, Ed., M. Bocci, Ed., L. Martini, Ed.         ||       nabil.bitar@verizon.com, matthew.bocci@alcatel-lucent.co.uk, lmartini@cisco.com
+#   RFC5255          ||      C. Newman, A. Gulbrandsen, A. Melnikov         ||       chris.newman@sun.com, arnt@oryx.com, Alexey.Melnikov@isode.com
+#   RFC5256          ||      M. Crispin, K. Murchison         ||       IMAP+SORT+THREAD@Lingling.Panda.COM, murch@andrew.cmu.edu
+#   RFC5257          ||      C. Daboo, R. Gellens         ||       cyrus@daboo.name, randy@qualcomm.com
+#   RFC5258          ||      B. Leiba, A. Melnikov         ||       leiba@watson.ibm.com, Alexey.Melnikov@isode.com
+#   RFC5259          ||      A. Melnikov, Ed., P. Coates, Ed.         ||       Alexey.Melnikov@isode.com, peter.coates@Sun.COM
+#   RFC5260          ||      N. Freed         ||       ned.freed@mrochek.com
+#   RFC5261          ||      J. Urpalainen         ||       jari.urpalainen@nokia.com
+#   RFC5262          ||      M. Lonnfors, E. Leppanen, H. Khartabil, J. Urpalainen         ||       mikko.lonnfors@nokia.com, eva.leppanen@saunalahti.fi, hisham.khartabil@gmail.com, jari.urpalainen@nokia.com
+#   RFC5263          ||      M. Lonnfors, J. Costa-Requena, E. Leppanen, H. Khartabil         ||       mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com, eva.leppanen@saunalahti.fi, hisham.khartabil@gmail.com
+#   RFC5264          ||      A. Niemi, M. Lonnfors, E. Leppanen         ||       aki.niemi@nokia.com, mikko.lonnfors@nokia.com, eva.leppanen@saunalaht.fi
+#   RFC5265          ||      S. Vaarala, E. Klovning         ||       sami.vaarala@iki.fi, espen@birdstep.com
+#   RFC5266          ||      V. Devarapalli, P. Eronen         ||       vijay@wichorus.com, pe@iki.fi
+#   RFC5267          ||      D. Cridland, C. King         ||       dave.cridland@isode.com, cking@mumbo.ca
+#   RFC5268          ||      R. Koodli, Ed.         ||       rkoodli@starentnetworks.com[
+#   RFC5269          ||      J. Kempf, R. Koodli         ||       kempf@docomolabs-usa.com, rkoodli@starentnetworks.com
+#   RFC5270          ||      H. Jang, J. Jee, Y. Han, S. Park, J. Cha         ||       heejin.jang@gmail.com, jhjee@etri.re.kr, yhhan@kut.ac.kr, soohong.park@samsung.com, jscha@etri.re.kr
+#   RFC5271          ||      H. Yokota, G. Dommety         ||       yokota@kddilabs.jp, gdommety@cisco.com
+#   RFC5272          ||      J. Schaad, M. Myers         ||       jimsch@nwlink.com, mmyers@fastq.com
+#   RFC5273          ||      J. Schaad, M. Myers         ||       jimsch@nwlink.com, mmyers@fastq.com
+#   RFC5274          ||      J. Schaad, M. Myers         ||       jimsch@nwlink.com, mmyers@fastq.com
+#   RFC5275          ||      S. Turner         ||       turners@ieca.com
+#   RFC5276          ||      C. Wallace         ||       cwallace@cygnacom.com
+#   RFC5277          ||      S. Chisholm, H. Trevino         ||       schishol@nortel.com, htrevino@cisco.com
+#   RFC5278          ||      J. Livingood, D. Troshynski         ||       jason_livingood@cable.comcast.com, dtroshynski@acmepacket.com
+#   RFC5279          ||      A. Monrad, S. Loreto         ||       atle.monrad@ericsson.com, Salvatore.Loreto@ericsson.com
+#   RFC5280          ||      D. Cooper, S. Santesson, S. Farrell, S. Boeyen, R. Housley, W. Polk         ||       david.cooper@nist.gov, stefans@microsoft.com, stephen.farrell@cs.tcd.ie, sharon.boeyen@entrust.com, housley@vigilsec.com, wpolk@nist.gov
+#   RFC5281          ||      P. Funk, S. Blake-Wilson         ||       PaulFunk@alum.mit.edu, sblakewilson@nl.safenet-inc.com
+#   RFC5282          ||      D. Black, D. McGrew         ||       black_david@emc.com, mcgrew@cisco.com
+#   RFC5283          ||      B. Decraene, JL. Le Roux, I. Minei         ||       bruno.decraene@orange-ftgroup.com, jeanlouis.leroux@orange-ftgroup.com, ina@juniper.net
+#   RFC5284          ||      G. Swallow, A. Farrel         ||       swallow@cisco.com, adrian@olddog.co.uk
+#   RFC5285          ||      D. Singer, H. Desineni         ||       singer@apple.com, hd@qualcomm.com
+#   RFC5286          ||      A. Atlas, Ed., A. Zinin, Ed.         ||       alia.atlas@bt.com, alex.zinin@alcatel-lucent.com
+#   RFC5287          ||      A. Vainshtein, Y(J). Stein         ||       Alexander.Vainshtein@ecitele.com, yaakov_s@rad.com
+#   RFC5288          ||      J. Salowey, A. Choudhury, D. McGrew         ||       jsalowey@cisco.com, abhijitc@cisco.com, mcgrew@cisco.com
+#   RFC5289          ||      E. Rescorla         ||       ekr@rtfm.com
+#   RFC5290          ||      S. Floyd, M. Allman         ||       floyd@icir.org, mallman@icir.org
+#   RFC5291          ||      E. Chen, Y. Rekhter         ||       enkechen@cisco.com, yakov@juniper.net
+#   RFC5292          ||      E. Chen, S. Sangli         ||       enkechen@cisco.com, rsrihari@cisco.com
+#   RFC5293          ||      J. Degener, P. Guenther         ||       jutta@pobox.com, guenther@sendmail.com
+#   RFC5294          ||      P. Savola, J. Lingard         ||       psavola@funet.fi, jchl@arastra.com
+#   RFC5295          ||      J. Salowey, L. Dondeti, V. Narayanan, M. Nakhjiri         ||       jsalowey@cisco.com, ldondeti@qualcomm.com, vidyan@qualcomm.com, madjid.nakhjiri@motorola.com
+#   RFC5296          ||      V. Narayanan, L. Dondeti         ||       vidyan@qualcomm.com, ldondeti@qualcomm.com
+#   RFC5297          ||      D. Harkins         ||       dharkins@arubanetworks.com
+#   RFC5298          ||      T. Takeda, Ed., A. Farrel, Ed., Y. Ikejiri, JP. Vasseur         ||       takeda.tomonori@lab.ntt.co.jp, y.ikejiri@ntt.com, adrian@olddog.co.uk, jpv@cisco.com
+#   RFC5301          ||      D. McPherson, N. Shen         ||       danny@arbor.net, naiming@cisco.com
+#   RFC5302          ||      T. Li, H. Smit, T. Przygienda         ||       tony.li@tony.li, hhw.smit@xs4all.nl, prz@net4u.ch
+#   RFC5303          ||      D. Katz, R. Saluja, D. Eastlake 3rd         ||       dkatz@juniper.net, rajesh.saluja@tenetindia.com, d3e3e3@gmail.com
+#   RFC5304          ||      T. Li, R. Atkinson         ||       tony.li@tony.li, rja@extremenetworks.com
+#   RFC5305          ||      T. Li, H. Smit         ||       tony.li@tony.li, hhwsmit@xs4all.nl
+#   RFC5306          ||      M. Shand, L. Ginsberg         ||       mshand@cisco.com, ginsberg@cisco.com
+#   RFC5307          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
+#   RFC5308          ||      C. Hopps         ||       chopps@cisco.com
+#   RFC5309          ||      N. Shen, Ed., A. Zinin, Ed.         ||       naiming@cisco.com, alex.zinin@alcatel-lucent.com
+#   RFC5310          ||      M. Bhatia, V. Manral, T. Li, R. Atkinson, R. White, M. Fanto         ||       manav@alcatel-lucent.com, vishwas@ipinfusion.com, tony.li@tony.li, rja@extremenetworks.com, riw@cisco.com, mfanto@aegisdatasecurity.com
+#   RFC5311          ||      D. McPherson, Ed., L. Ginsberg, S. Previdi, M. Shand         ||       danny@arbor.net, ginsberg@cisco.com, sprevidi@cisco.com, mshand@cisco.com
+#   RFC5316          ||      M. Chen, R. Zhang, X. Duan         ||       mach@huawei.com, zhangrenhai@huawei.com, duanxiaodong@chinamobile.com
+#   RFC5317          ||      S. Bryant, Ed., L. Andersson, Ed.         ||       stbryant@cisco.com, loa@pi.nu
+#   RFC5318          ||      J. Hautakorpi, G. Camarillo         ||       Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com
+#   RFC5320          ||      F. Templin, Ed.         ||       fltemplin@acm.org
+#   RFC5321          ||      J. Klensin         ||       john+smtp@jck.com
+#   RFC5322          ||      P. Resnick, Ed.         ||       presnick@qti.qualcomm.com
+#   RFC5323          ||      J. Reschke, Ed., S. Reddy, J. Davis, A. Babich         ||       julian.reschke@greenbytes.de, Surendra.Reddy@mitrix.com, jrd3@alum.mit.edu, ababich@us.ibm.com
+#   RFC5324          ||      C. DeSanti, F. Maino, K. McCloghrie         ||       cds@cisco.com, fmaino@cisco.com, kzm@cisco.com
+#   RFC5325          ||      S. Burleigh, M. Ramadas, S. Farrell         ||       Scott.Burleigh@jpl.nasa.gov, mramadas@gmail.com, stephen.farrell@cs.tcd.ie
+#   RFC5326          ||      M. Ramadas, S. Burleigh, S. Farrell         ||       mramadas@gmail.com, Scott.Burleigh@jpl.nasa.gov, stephen.farrell@cs.tcd.ie
+#   RFC5327          ||      S. Farrell, M. Ramadas, S. Burleigh         ||       stephen.farrell@cs.tcd.ie, mramadas@gmail.com, Scott.Burleigh@jpl.nasa.gov
+#   RFC5328          ||      A. Adolf, P. MacAvock         ||       alexander.adolf@micronas.com, macavock@dvb.org
+#   RFC5329          ||      K. Ishiguro, V. Manral, A. Davey, A. Lindem, Ed.         ||       kunihiro@ipinfusion.com, vishwas@ipinfusion.com, Alan.Davey@dataconnection.com, acee@redback.com
+#   RFC5330          ||      JP. Vasseur, Ed., M. Meyer, K. Kumaki, A. Bonda         ||       jpv@cisco.com, matthew.meyer@bt.com, ke-kumaki@kddi.com, alberto.tempiabonda@telecomitalia.it
+#   RFC5331          ||      R. Aggarwal, Y. Rekhter, E. Rosen         ||       rahul@juniper.net, yakov@juniper.net, erosen@cisco.com
+#   RFC5332          ||      T. Eckert, E. Rosen, Ed., R. Aggarwal, Y. Rekhter         ||       eckert@cisco.com, erosen@cisco.com, rahul@juniper.net, yakov@juniper.net
+#   RFC5333          ||      R. Mahy, B. Hoeneisen         ||       rohan@ekabal.com, bernie@ietf.hoeneisen.ch
+#   RFC5334          ||      I. Goncalves, S. Pfeiffer, C. Montgomery         ||       justivo@gmail.com, silvia@annodex.net, monty@xiph.org
+#   RFC5335          ||      A. Yang, Ed.         ||       abelyang@twnic.net.tw
+#   RFC5336          ||      J. Yao, Ed., W. Mao, Ed.         ||       yaojk@cnnic.cn, maowei_ietf@cnnic.cn
+#   RFC5337          ||      C. Newman, A. Melnikov, Ed.         ||       chris.newman@sun.com, Alexey.Melnikov@isode.com
+#   RFC5338          ||      T. Henderson, P. Nikander, M. Komu         ||       thomas.r.henderson@boeing.com, pekka.nikander@nomadiclab.com, miika@iki.fi
+#   RFC5339          ||      JL. Le Roux, Ed., D. Papadimitriou, Ed.         ||       jeanlouis.leroux@orange-ftgroup.com, dimitri.papadimitriou@alcatel-lucent.be
+#   RFC5340          ||      R. Coltun, D. Ferguson, J. Moy, A. Lindem         ||       none, dennis@juniper.net, jmoy@sycamorenet.com, acee@redback.com
+#   RFC5341          ||      C. Jennings, V. Gurbani         ||       fluffy@cisco.com, vkg@alcatel-lucent.com
+#   RFC5342          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC5343          ||      J. Schoenwaelder         ||       j.schoenwaelder@jacobs-university.de
+#   RFC5344          ||      A. Houri, E. Aoki, S. Parameswar         ||       avshalom@il.ibm.com, aoki@aol.net, Sriram.Parameswar@microsoft.com
+#   RFC5345          ||      J. Schoenwaelder         ||       j.schoenwaelder@jacobs-university.de
+#   RFC5346          ||      J. Lim, W. Kim, C. Park, L. Conroy         ||       jhlim@nida.or.kr, wkim@nida.or.kr, ckp@nida.or.kr, lconroy@insensate.co.uk
+#   RFC5347          ||      F. Andreasen, D. Hancock         ||       fandreas@cisco.com, d.hancock@cablelabs.com
+#   RFC5348          ||      S. Floyd, M. Handley, J. Padhye, J. Widmer         ||       floyd@icir.org, M.Handley@cs.ucl.ac.uk, padhye@microsoft.com, widmer@acm.org
+#   RFC5349          ||      L. Zhu, K. Jaganathan, K. Lauter         ||       lzhu@microsoft.com, karthikj@microsoft.com, klauter@microsoft.com
+#   RFC5350          ||      J. Manner, A. McDonald         ||       jukka.manner@tkk.fi, andrew.mcdonald@roke.co.uk
+#   RFC5351          ||      P. Lei, L. Ong, M. Tuexen, T. Dreibholz         ||       peterlei@cisco.com, Lyong@Ciena.com, tuexen@fh-muenster.de, dreibh@iem.uni-due.de
+#   RFC5352          ||      R. Stewart, Q. Xie, M. Stillman, M. Tuexen         ||       randall@lakerest.net, Qiaobing.Xie@gmail.org, maureen.stillman@nokia.com, tuexen@fh-muenster.de
+#   RFC5353          ||      Q. Xie, R. Stewart, M. Stillman, M. Tuexen, A. Silverton         ||       Qiaobing.Xie@gmail.org, randall@lakerest.net, maureen.stillman@nokia.com, tuexen@fh-muenster.de, ajs.ietf@gmail.com
+#   RFC5354          ||      R. Stewart, Q. Xie, M. Stillman, M. Tuexen         ||       randall@lakerest.net, Qiaobing.Xie@gmail.org, maureen.stillman@nokia.com, tuexen@fh-muenster.de
+#   RFC5355          ||      M. Stillman, Ed., R. Gopal, E. Guttman, S. Sengodan, M. Holdrege         ||       maureen.stillman@nokia.com, ram.gopal@nsn.com, Erik.Guttman@sun.com, Senthil.sengodan@nsn.com, Holdrege@gmail.com
+#   RFC5356          ||      T. Dreibholz, M. Tuexen         ||       dreibh@iem.uni-due.de, tuexen@fh-muenster.de
+#   RFC5357          ||      K. Hedayat, R. Krzanowski, A. Morton, K. Yum, J. Babiarz         ||       khedayat@brixnet.com, roman.krzanowski@verizon.com, acmorton@att.com, kyum@juniper.net, babiarz@nortel.com
+#   RFC5358          ||      J. Damas, F. Neves         ||       Joao_Damas@isc.org, fneves@registro.br
+#   RFC5359          ||      A. Johnston, Ed., R. Sparks, C. Cunningham, S. Donovan, K. Summers         ||       alan@sipstation.com, RjS@nostrum.com, chrcunni@cisco.com, srd@cisco.com, ksummers@sonusnet.com
+#   RFC5360          ||      J. Rosenberg, G. Camarillo, Ed., D. Willis         ||       jdrosen@cisco.com, Gonzalo.Camarillo@ericsson.com, dean.willis@softarmor.com
+#   RFC5361          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC5362          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC5363          ||      G. Camarillo, A.B. Roach         ||       Gonzalo.Camarillo@ericsson.com, Adam.Roach@tekelec.com
+#   RFC5364          ||      M. Garcia-Martin, G. Camarillo         ||       miguel.a.garcia@ericsson.com, Gonzalo.Camarillo@ericsson.com
+#   RFC5365          ||      M. Garcia-Martin, G. Camarillo         ||       miguel.a.garcia@ericsson.com, Gonzalo.Camarillo@ericsson.com
+#   RFC5366          ||      G. Camarillo, A. Johnston         ||       Gonzalo.Camarillo@ericsson.com, alan@sipstation.com
+#   RFC5367          ||      G. Camarillo, A.B. Roach, O. Levin         ||       Gonzalo.Camarillo@ericsson.com, Adam.Roach@tekelec.com, oritl@microsoft.com
+#   RFC5368          ||      G. Camarillo, A. Niemi, M. Isomaki, M. Garcia-Martin, H. Khartabil         ||       Gonzalo.Camarillo@ericsson.com, Aki.Niemi@nokia.com, markus.isomaki@nokia.com, miguel.a.garcia@ericsson.com, hisham.khartabil@gmail.com
+#   RFC5369          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC5370          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC5371          ||      S. Futemma, E. Itakura, A. Leung         ||       satosi-f@sm.sony.co.jp, itakura@sm.sony.co.jp, andrew@ualberta.net
+#   RFC5372          ||      A. Leung, S. Futemma, E. Itakura         ||       andrew@ualberta.net, satosi-f@sm.sony.co.jp, itakura@sm.sony.co.jp
+#   RFC5373          ||      D. Willis, Ed., A. Allen         ||       dean.willis@softarmor.com, aallen@rim.com
+#   RFC5374          ||      B. Weis, G. Gross, D. Ignjatic         ||       bew@cisco.com, gmgross@securemulticast.net, dignjatic@polycom.com
+#   RFC5375          ||      G. Van de Velde, C. Popoviciu, T. Chown, O. Bonness, C. Hahn         ||       gunter@cisco.com, cpopovic@cisco.com, tjc@ecs.soton.ac.uk, Olaf.Bonness@t-systems.com, HahnC@t-systems.com
+#   RFC5376          ||      N. Bitar, R. Zhang, K. Kumaki         ||       nabil.n.bitar@verizon.com, ke-kumaki@kddi.com, Raymond.zhang@bt.com
+#   RFC5377          ||      J. Halpern, Ed.         ||       jmh@joelhalpern.com
+#   RFC5378          ||      S. Bradner, Ed., J. Contreras, Ed.         ||       sob@harvard.edu, jorge.contreras@wilmerhale.com
+#   RFC5379          ||      M. Munakata, S. Schubert, T. Ohba         ||       munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp
+#   RFC5380          ||      H. Soliman, C. Castelluccia, K. ElMalki, L. Bellier         ||       hesham@elevatemobile.com, claude.castelluccia@inria.fr, karim@athonet.com, ludovic.bellier@inria.fr
+#   RFC5381          ||      T. Iijima, Y. Atarashi, H. Kimura, M. Kitani, H. Okita         ||       tomoyuki.iijima@alaxala.com, atarashi@alaxala.net, h-kimura@alaxala.net, makoto.kitani@alaxala.com, hideki.okita.pf@hitachi.com
+#   RFC5382          ||      S. Guha, Ed., K. Biswas, B. Ford, S. Sivakumar, P. Srisuresh         ||       saikat@cs.cornell.edu, kbiswas@cisco.com, baford@mpi-sws.org, ssenthil@cisco.com, srisuresh@yahoo.com
+#   RFC5383          ||      R. Gellens         ||       randy@qualcomm.com
+#   RFC5384          ||      A. Boers, I. Wijnands, E. Rosen         ||       aboers@cisco.com, ice@cisco.com, erosen@cisco.com
+#   RFC5385          ||      J. Touch         ||       touch@isi.edu
+#   RFC5386          ||      N. Williams, M. Richardson         ||       Nicolas.Williams@sun.com, mcr@sandelman.ottawa.on.ca
+#   RFC5387          ||      J. Touch, D. Black, Y. Wang         ||       touch@isi.edu, black_david@emc.com, yu-shun.wang@microsoft.com
+#   RFC5388          ||      S. Niccolini, S. Tartarelli, J. Quittek, T. Dietz, M. Swany         ||       saverio.niccolini@nw.neclab.eu, sandra.tartarelli@nw.neclab.eu, quittek@nw.neclab.eu, thomas.dietz@nw.neclab.eu, swany@UDel.Edu
+#   RFC5389          ||      J. Rosenberg, R. Mahy, P. Matthews, D. Wing         ||       jdrosen@cisco.com, rohan@ekabal.com, philip_matthews@magma.ca, dwing-ietf@fuggles.com
+#   RFC5390          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC5391          ||      A. Sollaud         ||       aurelien.sollaud@orange-ftgroup.com
+#   RFC5392          ||      M. Chen, R. Zhang, X. Duan         ||       mach@huawei.com, zhangrenhai@huawei.com, duanxiaodong@chinamobile.com
+#   RFC5393          ||      R. Sparks, Ed., S. Lawrence, A. Hawrylyshen, B. Campen         ||       RjS@nostrum.com, scott.lawrence@nortel.com, alan.ietf@polyphase.ca, bcampen@estacado.net
+#   RFC5394          ||      I. Bryskin, D. Papadimitriou, L. Berger, J. Ash         ||       ibryskin@advaoptical.com, dimitri.papadimitriou@alcatel.be, lberger@labn.net, gash5107@yahoo.com
+#   RFC5395          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC5396          ||      G. Huston, G. Michaelson         ||       gih@apnic.net, ggm@apnic.net
+#   RFC5397          ||      W. Sanchez, C. Daboo         ||       wsanchez@wsanchez.net, cyrus@daboo.name
+#   RFC5398          ||      G. Huston         ||       gih@apnic.net
+#   RFC5401          ||      B. Adamson, C. Bormann, M. Handley, J. Macker         ||       adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil
+#   RFC5402          ||      T. Harding, Ed.         ||       tharding@us.axway.com
+#   RFC5403          ||      M. Eisler         ||       mike@eisler.com
+#   RFC5404          ||      M. Westerlund, I. Johansson         ||       magnus.westerlund@ericsson.com, ingemar.s.johansson@ericsson.com
+#   RFC5405          ||      L. Eggert, G. Fairhurst         ||       lars.eggert@nokia.com, gorry@erg.abdn.ac.uk
+#   RFC5406          ||      S. Bellovin         ||       bellovin@acm.org
+#   RFC5407          ||      M. Hasebe, J. Koshiko, Y. Suzuki, T. Yoshikawa, P. Kyzivat         ||       hasebe.miki@east.ntt.co.jp, j.koshiko@east.ntt.co.jp, suzuki.yasushi@lab.ntt.co.jp, tomoyuki.yoshikawa@east.ntt.co.jp, pkyzivat@cisco.com
+#   RFC5408          ||      G. Appenzeller, L. Martin, M. Schertler         ||       appenz@cs.stanford.edu, martin@voltage.com, mschertler@us.axway.com
+#   RFC5409          ||      L. Martin, M. Schertler         ||       martin@voltage.com, mschertler@us.axway.com
+#   RFC5410          ||      A. Jerichow, Ed., L. Piron         ||       anja.jerichow@nsn.com, laurent.piron@nagravision.com
+#   RFC5411          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC5412          ||      P. Calhoun, R. Suri, N. Cam-Winget, M. Williams, S. Hares, B. O'Hara, S. Kelly         ||       pcalhoun@cisco.com, rsuri@cisco.com, ncamwing@cisco.com, gwhiz@gwhiz.com, shares@ndzh.com, bob.ohara@computer.org, scott@hyperthought.com
+#   RFC5413          ||      P. Narasimhan, D. Harkins, S. Ponnuswamy         ||       partha@arubanetworks.com, dharkins@arubanetworks.com, subbu@arubanetworks.com
+#   RFC5414          ||      S. Iino, S. Govindan, M. Sugiura, H. Cheng         ||       iino.satoshi@jp.panasonic.com, saravanan.govindan@sg.panasonic.com, sugiura.mikihito@jp.panasonic.com, hong.cheng@sg.panasonic.com
+#   RFC5415          ||      P. Calhoun, Ed., M. Montemurro, Ed., D. Stanley, Ed.         ||       pcalhoun@cisco.com, mmontemurro@rim.com, dstanley@arubanetworks.com
+#   RFC5416          ||      P. Calhoun, Ed., M. Montemurro, Ed., D. Stanley, Ed.         ||       pcalhoun@cisco.com, mmontemurro@rim.com, dstanley@arubanetworks.com
+#   RFC5417          ||      P. Calhoun         ||       pcalhoun@cisco.com
+#   RFC5418          ||      S. Kelly, T. Clancy         ||       scott@hyperthought.com, clancy@LTSnet.net
+#   RFC5419          ||      B. Patil, G. Dommety         ||       basavaraj.patil@nokia.com, gdommety@cisco.com
+#   RFC5420          ||      A. Farrel, Ed., D. Papadimitriou, JP. Vasseur, A. Ayyangarps         ||       adrian@olddog.co.uk, dimitri.papadimitriou@alcatel.be, jpv@cisco.com, arthi@juniper.net
+#   RFC5421          ||      N. Cam-Winget, H. Zhou         ||       ncamwing@cisco.com, hzhou@cisco.com
+#   RFC5422          ||      N. Cam-Winget, D. McGrew, J. Salowey, H. Zhou         ||       ncamwing@cisco.com, mcgrew@cisco.com, jsalowey@cisco.com, hzhou@cisco.com
+#   RFC5423          ||      R. Gellens, C. Newman         ||       rg+ietf@qualcomm.com, chris.newman@sun.com
+#   RFC5424          ||      R. Gerhards         ||       rgerhards@adiscon.com
+#   RFC5425          ||      F. Miao, Ed., Y. Ma, Ed., J. Salowey, Ed.         ||       miaofy@huawei.com, myz@huawei.com, jsalowey@cisco.com
+#   RFC5426          ||      A. Okmianski         ||       aokmians@cisco.com
+#   RFC5427          ||      G. Keeni         ||       glenn@cysols.com
+#   RFC5428          ||      S. Channabasappa, W. De Ketelaere, E. Nechamkin         ||       Sumanth@cablelabs.com, deketelaere@tComLabs.com, enechamkin@broadcom.com
+#   RFC5429          ||      A. Stone, Ed.         ||       aaron@serendipity.palo-alto.ca.us
+#   RFC5430          ||      M. Salter, E. Rescorla, R. Housley         ||       msalter@restarea.ncsc.mil, ekr@rtfm.com, housley@vigilsec.com
+#   RFC5431          ||      D. Sun         ||       dongsun@alcatel-lucent.com
+#   RFC5432          ||      J. Polk, S. Dhesikan, G. Camarillo         ||       jmpolk@cisco.com, sdhesika@cisco.com, Gonzalo.Camarillo@ericsson.com
+#   RFC5433          ||      T. Clancy, H. Tschofenig         ||       clancy@ltsnet.net, Hannes.Tschofenig@gmx.net
+#   RFC5434          ||      T. Narten         ||       narten@us.ibm.com
+#   RFC5435          ||      A. Melnikov, Ed., B. Leiba, Ed., W. Segmuller, T. Martin         ||       Alexey.Melnikov@isode.com, leiba@watson.ibm.com, werewolf@us.ibm.com, timmartin@alumni.cmu.edu
+#   RFC5436          ||      B. Leiba, M. Haardt         ||       leiba@watson.ibm.com, michael.haardt@freenet.ag
+#   RFC5437          ||      P. Saint-Andre, A. Melnikov         ||       ietf@stpeter.im, Alexey.Melnikov@isode.com
+#   RFC5438          ||      E. Burger, H. Khartabil         ||       eburger@standardstrack.com, hisham.khartabil@gmail.com
+#   RFC5439          ||      S. Yasukawa, A. Farrel, O. Komolafe         ||       s.yasukawa@hco.ntt.co.jp, adrian@olddog.co.uk, femi@cisco.com
+#   RFC5440          ||      JP. Vasseur, Ed., JL. Le Roux, Ed.         ||       jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com
+#   RFC5441          ||      JP. Vasseur, Ed., R. Zhang, N. Bitar, JL. Le Roux         ||       jpv@cisco.com, raymond.zhang@bt.com, nabil.n.bitar@verizon.com, jeanlouis.leroux@orange-ftgroup.com
+#   RFC5442          ||      E. Burger, G. Parsons         ||       eburger@standardstrack.com, gparsons@nortel.com
+#   RFC5443          ||      M. Jork, A. Atlas, L. Fang         ||       Markus.Jork@genband.com, alia.atlas@bt.com, lufang@cisco.com
+#   RFC5444          ||      T. Clausen, C. Dearlove, J. Dean, C. Adjih         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com, jdean@itd.nrl.navy.mil, Cedric.Adjih@inria.fr
+#   RFC5445          ||      M. Watson         ||       mark@digitalfountain.com
+#   RFC5446          ||      J. Korhonen, U. Nilsson         ||       jouni.nospam@gmail.com, ulf.s.nilsson@teliasonera.com
+#   RFC5447          ||      J. Korhonen, Ed., J. Bournelle, H. Tschofenig, C. Perkins, K. Chowdhury         ||       jouni.nospam@gmail.com, julien.bournelle@orange-ftgroup.com, Hannes.Tschofenig@nsn.com, charliep@wichorus.com, kchowdhury@starentnetworks.com
+#   RFC5448          ||      J. Arkko, V. Lehtovirta, P. Eronen         ||       jari.arkko@piuha.net, vesa.lehtovirta@ericsson.com, pe@iki.fi
+#   RFC5449          ||      E. Baccelli, P. Jacquet, D. Nguyen, T. Clausen         ||       Emmanuel.Baccelli@inria.fr, Philippe.Jacquet@inria.fr, dang.nguyen@crc.ca, T.Clausen@computer.org
+#   RFC5450          ||      D. Singer, H. Desineni         ||       singer@apple.com, hd@qualcomm.com
+#   RFC5451          ||      M. Kucherawy         ||       msk+ietf@sendmail.com
+#   RFC5452          ||      A. Hubert, R. van Mook         ||       bert.hubert@netherlabs.nl, remco@eu.equinix.com
+#   RFC5453          ||      S. Krishnan         ||       suresh.krishnan@ericsson.com
+#   RFC5454          ||      G. Tsirtsis, V. Park, H. Soliman         ||       tsirtsis@googlemail.com, vpark@qualcomm.com, hesham@elevatemobile.com
+#   RFC5455          ||      S. Sivabalan, Ed., J. Parker, S. Boutros, K. Kumaki         ||       msiva@cisco.com, jdparker@cisco.com, sboutros@cisco.com, ke-kumaki@kddi.com
+#   RFC5456          ||      M. Spencer, B. Capouch, E. Guy, Ed., F. Miller, K. Shumard         ||       markster@digium.com, brianc@saintjoe.edu, edguy@emcsw.com, mail@frankwmiller.net, kshumard@gmail.com
+#   RFC5457          ||      E. Guy, Ed.         ||       edguy@emcsw.com
+#   RFC5458          ||      H. Cruickshank, P. Pillai, M. Noisternig, S. Iyengar         ||       h.cruickshank@surrey.ac.uk, p.pillai@bradford.ac.uk, mnoist@cosy.sbg.ac.at, sunil.iyengar@logica.com
+#   RFC5459          ||      A. Sollaud         ||       aurelien.sollaud@orange-ftgroup.com
+#   RFC5460          ||      M. Stapp         ||       mjs@cisco.com
+#   RFC5461          ||      F. Gont         ||       fernando@gont.com.ar
+#   RFC5462          ||      L. Andersson, R. Asati         ||       loa@pi.nu, rajiva@cisco.com
+#   RFC5463          ||      N. Freed         ||       ned.freed@mrochek.com
+#   RFC5464          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC5465          ||      A. Gulbrandsen, C. King, A. Melnikov         ||       arnt@oryx.com, Curtis.King@isode.com, Alexey.Melnikov@isode.com
+#   RFC5466          ||      A. Melnikov, C. King         ||       Alexey.Melnikov@isode.com, Curtis.King@isode.com
+#   RFC5467          ||      L. Berger, A. Takacs, D. Caviglia, D. Fedyk, J. Meuric         ||       lberger@labn.net, attila.takacs@ericsson.com, diego.caviglia@ericsson.com, dwfedyk@nortel.com, julien.meuric@orange-ftgroup.com
+#   RFC5468          ||      S. Dasgupta, J. de Oliveira, JP. Vasseur         ||       sukrit@ece.drexel.edu, jau@ece.drexel.edu, jpv@cisco.com
+#   RFC5469          ||      P. Eronen, Ed.         ||       pe@iki.fi
+#   RFC5470          ||      G. Sadasivan, N. Brownlee, B. Claise, J. Quittek         ||       gsadasiv@rohati.com, n.brownlee@auckland.ac.nz, bclaise@cisco.com, quittek@nw.neclab.eu
+#   RFC5471          ||      C. Schmoll, P. Aitken, B. Claise         ||       carsten.schmoll@fokus.fraunhofer.de, paitken@cisco.com, bclaise@cisco.com
+#   RFC5472          ||      T. Zseby, E. Boschi, N. Brownlee, B. Claise         ||       tanja.zseby@fokus.fraunhofer.de, elisa.boschi@hitachi-eu.com, nevil@caida.org, bclaise@cisco.com
+#   RFC5473          ||      E. Boschi, L. Mark, B. Claise         ||       elisa.boschi@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, bclaise@cisco.com
+#   RFC5474          ||      N. Duffield, Ed., D. Chiou, B. Claise, A. Greenberg, M. Grossglauser, J. Rexford         ||       duffield@research.att.com, Derek@ece.utexas.edu, bclaise@cisco.com, albert@microsoft.com, matthias.grossglauser@epfl.ch, jrex@cs.princeton.edu
+#   RFC5475          ||      T. Zseby, M. Molina, N. Duffield, S. Niccolini, F. Raspall         ||       tanja.zseby@fokus.fraunhofer.de, maurizio.molina@dante.org.uk, duffield@research.att.com, saverio.niccolini@netlab.nec.de, fredi@entel.upc.es
+#   RFC5476          ||      B. Claise, Ed., A. Johnson, J. Quittek         ||       bclaise@cisco.com, andrjohn@cisco.com, quittek@nw.neclab.eu
+#   RFC5477          ||      T. Dietz, B. Claise, P. Aitken, F. Dressler, G. Carle         ||       Thomas.Dietz@nw.neclab.eu, bclaise@cisco.com, paitken@cisco.com, dressler@informatik.uni-erlangen.de, carle@informatik.uni-tuebingen.de
+#   RFC5478          ||      J. Polk         ||       jmpolk@cisco.com
+#   RFC5479          ||      D. Wing, Ed., S. Fries, H. Tschofenig, F. Audet         ||       dwing-ietf@fuggles.com, steffen.fries@siemens.com, Hannes.Tschofenig@nsn.com, audet@nortel.com
+#   RFC5480          ||      S. Turner, D. Brown, K. Yiu, R. Housley, T. Polk         ||       turners@ieca.com, kelviny@microsoft.com, dbrown@certicom.com, housley@vigilsec.com, wpolk@nist.gov
+#   RFC5481          ||      A. Morton, B. Claise         ||       acmorton@att.com, bclaise@cisco.com
+#   RFC5482          ||      L. Eggert, F. Gont         ||       lars.eggert@nokia.com, fernando@gont.com.ar
+#   RFC5483          ||      L. Conroy, K. Fujiwara         ||       lconroy@insensate.co.uk, fujiwara@jprs.co.jp
+#   RFC5484          ||      D. Singer         ||       singer@apple.com
+#   RFC5485          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC5486          ||      D. Malas, Ed., D. Meyer, Ed.         ||       d.malas@cablelabs.com, dmm@1-4-5.net
+#   RFC5487          ||      M. Badra         ||       badra@isima.fr
+#   RFC5488          ||      S. Gundavelli, G. Keeni, K. Koide, K. Nagami         ||       sgundave@cisco.com, glenn@cysols.com, ka-koide@kddi.com, nagami@inetcore.com
+#   RFC5489          ||      M. Badra, I. Hajjeh         ||       badra@isima.fr, ibrahim.hajjeh@ineovation.fr
+#   RFC5490          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
+#   RFC5491          ||      J. Winterbottom, M. Thomson, H. Tschofenig         ||       james.winterbottom@andrew.com, martin.thomson@andrew.com, Hannes.Tschofenig@gmx.net
+#   RFC5492          ||      J. Scudder, R. Chandra         ||       jgs@juniper.net, rchandra@sonoasystems.com
+#   RFC5493          ||      D. Caviglia, D. Bramanti, D. Li, D. McDysan         ||       diego.caviglia@ericsson.com, dino.bramanti@ericsson.com, danli@huawei.com, dave.mcdysan@verizon.com
+#   RFC5494          ||      J. Arkko, C. Pignataro         ||       jari.arkko@piuha.net, cpignata@cisco.com
+#   RFC5495          ||      D. Li, J. Gao, A. Satyanarayana, S. Bardalai         ||       danli@huawei.com, gjhhit@huawei.com, asatyana@cisco.com, snigdho.bardalai@us.fujitsu.com
+#   RFC5496          ||      IJ. Wijnands, A. Boers, E. Rosen         ||       ice@cisco.com, aboers@cisco.com, erosen@cisco.com
+#   RFC5497          ||      T. Clausen, C. Dearlove         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com
+#   RFC5498          ||      I. Chakeres         ||       ian.chakeres@gmail.com
+#   RFC5501          ||      Y. Kamite, Ed., Y. Wada, Y. Serbest, T. Morin, L. Fang         ||       y.kamite@ntt.com, wada.yuichiro@lab.ntt.co.jp, yetik_serbest@labs.att.com, thomas.morin@francetelecom.com, lufang@cisco.com
+#   RFC5502          ||      J. van Elburg         ||       HansErik.van.Elburg@ericsson.com
+#   RFC5503          ||      F. Andreasen, B. McKibben, B. Marshall         ||       fandreas@cisco.com, B.McKibben@cablelabs.com, wtm@research.att.com
+#   RFC5504          ||      K. Fujiwara, Ed., Y. Yoneya, Ed.         ||       fujiwara@jprs.co.jp, yone@jprs.co.jp
+#   RFC5505          ||      B. Aboba, D. Thaler, L. Andersson, S. Cheshire         ||       bernarda@microsoft.com, dthaler@microsoft.com, loa.andersson@ericsson.com, cheshire@apple.com
+#   RFC5506          ||      I. Johansson, M. Westerlund         ||       ingemar.s.johansson@ericsson.com, magnus.westerlund@ericsson.com
+#   RFC5507          ||      IAB, P. Faltstrom, Ed., R. Austein, Ed., P. Koch, Ed.         ||       iab@iab.org, paf@cisco.com, sra@isc.org, pk@denic.de
+#   RFC5508          ||      P. Srisuresh, B. Ford, S. Sivakumar, S. Guha         ||       srisuresh@yahoo.com, baford@mpi-sws.org, ssenthil@cisco.com, saikat@cs.cornell.edu
+#   RFC5509          ||      S. Loreto         ||       Salvatore.Loreto@ericsson.com
+#   RFC5510          ||      J. Lacan, V. Roca, J. Peltotalo, S. Peltotalo         ||       jerome.lacan@isae.fr, vincent.roca@inria.fr, jani.peltotalo@tut.fi, sami.peltotalo@tut.fi
+#   RFC5511          ||      A. Farrel         ||       adrian@olddog.co.uk
+#   RFC5512          ||      P. Mohapatra, E. Rosen         ||       pmohapat@cisco.com, erosen@cisco.com
+#   RFC5513          ||      A. Farrel         ||       adrian@olddog.co.uk
+#   RFC5514          ||      E. Vyncke         ||       evyncke@cisco.com
+#   RFC5515          ||      V. Mammoliti, C. Pignataro, P. Arberg, J. Gibbons, P. Howard         ||       vince@cisco.com, cpignata@cisco.com, parberg@redback.com, jgibbons@juniper.net, howsoft@mindspring.com
+#   RFC5516          ||      M. Jones, L. Morand         ||       mark.jones@bridgewatersystems.com, lionel.morand@orange-ftgroup.com
+#   RFC5517          ||      S. HomChaudhuri, M. Foschiano         ||       sanjibhc@gmail.com, foschia@cisco.com
+#   RFC5518          ||      P. Hoffman, J. Levine, A. Hathcock         ||       paul.hoffman@domain-assurance.org, john.levine@domain-assurance.org, arvel.hathcock@altn.com
+#   RFC5519          ||      J. Chesterfield, B. Haberman, Ed.         ||       julian.chesterfield@cl.cam.ac.uk, brian@innovationslab.net
+#   RFC5520          ||      R. Bradford, Ed., JP. Vasseur, A. Farrel         ||       rbradfor@cisco.com, jpv@cisco.com, adrian@olddog.co.uk
+#   RFC5521          ||      E. Oki, T. Takeda, A. Farrel         ||       oki@ice.uec.ac.jp, takeda.tomonori@lab.ntt.co.jp, adrian@olddog.co.uk
+#   RFC5522          ||      W. Eddy, W. Ivancic, T. Davis         ||       weddy@grc.nasa.gov, William.D.Ivancic@grc.nasa.gov, Terry.L.Davis@boeing.com
+#   RFC5523          ||      L. Berger         ||       lberger@labn.net
+#   RFC5524          ||      D. Cridland         ||       dave.cridland@isode.com
+#   RFC5525          ||      T. Dreibholz, J. Mulik         ||       dreibh@iem.uni-due.de, jaiwant@mulik.com
+#   RFC5526          ||      J. Livingood, P. Pfautz, R. Stastny         ||       jason_livingood@cable.comcast.com, ppfautz@att.com, richard.stastny@gmail.com
+#   RFC5527          ||      M. Haberler, O. Lendl, R. Stastny         ||       ietf@mah.priv.at, otmar.lendl@enum.at, richardstastny@gmail.com
+#   RFC5528          ||      A. Kato, M. Kanda, S. Kanno         ||       akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno-s@po.ntts.co.jp
+#   RFC5529          ||      A. Kato, M. Kanda, S. Kanno         ||       akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno-s@po.ntts.co.jp
+#   RFC5530          ||      A. Gulbrandsen         ||       arnt@oryx.com
+#   RFC5531          ||      R. Thurlow         ||       robert.thurlow@sun.com
+#   RFC5532          ||      T. Talpey, C. Juszczak         ||       tmtalpey@gmail.com, chetnh@earthlink.net
+#   RFC5533          ||      E. Nordmark, M. Bagnulo         ||       erik.nordmark@sun.com, marcelo@it.uc3m.es
+#   RFC5534          ||      J. Arkko, I. van Beijnum         ||       jari.arkko@ericsson.com, iljitsch@muada.com
+#   RFC5535          ||      M. Bagnulo         ||       marcelo@it.uc3m.es
+#   RFC5536          ||      K. Murchison, Ed., C. Lindsey, D. Kohn         ||       murch@andrew.cmu.edu, chl@clerew.man.ac.uk, dan@dankohn.com
+#   RFC5537          ||      R. Allbery, Ed., C. Lindsey         ||       rra@stanford.edu, chl@clerew.man.ac.uk
+#   RFC5538          ||      F. Ellermann         ||       hmdmhdfmhdjmzdtjmzdtzktdkztdjz@gmail.com
+#   RFC5539          ||      M. Badra         ||       badra@isima.fr
+#   RFC5540          ||      RFC Editor         ||       rfc-editor@rfc-editor.org
+#   RFC5541          ||      JL. Le Roux, JP. Vasseur, Y. Lee         ||       jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, ylee@huawei.com
+#   RFC5542          ||      T. Nadeau, Ed., D. Zelig, Ed., O. Nicklass, Ed.         ||       tom.nadeau@bt.com, davidz@oversi.com, orlyn@radvision.com
+#   RFC5543          ||      H. Ould-Brahim, D. Fedyk, Y. Rekhter         ||       hbrahim@nortel.com, donald.fedyk@alcatel-lucent.com, yakov@juniper.com
+#   RFC5544          ||      A. Santoni         ||       adriano.santoni@actalis.it
+#   RFC5545          ||      B. Desruisseaux, Ed.         ||       bernard.desruisseaux@oracle.com
+#   RFC5546          ||      C. Daboo, Ed.         ||       cyrus@daboo.name
+#   RFC5547          ||      M. Garcia-Martin, M. Isomaki, G. Camarillo, S. Loreto, P. Kyzivat         ||       miguel.a.garcia@ericsson.com, markus.isomaki@nokia.com, Gonzalo.Camarillo@ericsson.com, Salvatore.Loreto@ericsson.com, pkyzivat@cisco.com
+#   RFC5548          ||      M. Dohler, Ed., T. Watteyne, Ed., T. Winter, Ed., D. Barthel, Ed.         ||       mischa.dohler@cttc.es, watteyne@eecs.berkeley.edu, wintert@acm.org, Dominique.Barthel@orange-ftgroup.com
+#   RFC5549          ||      F. Le Faucheur, E. Rosen         ||       flefauch@cisco.com, erosen@cisco.com
+#   RFC5550          ||      D. Cridland, Ed., A. Melnikov, Ed., S. Maes, Ed.         ||       dave.cridland@isode.com, Alexey.Melnikov@isode.com, stephane.maes@oracle.com
+#   RFC5551          ||      R. Gellens, Ed.         ||       rg+ietf@qualcomm.com
+#   RFC5552          ||      D. Burke, M. Scott         ||       daveburke@google.com, Mark.Scott@genesyslab.com
+#   RFC5553          ||      A. Farrel, Ed., R. Bradford, JP. Vasseur         ||       adrian@olddog.co.uk, rbradfor@cisco.com, jpv@cisco.com
+#   RFC5554          ||      N. Williams         ||       Nicolas.Williams@sun.com
+#   RFC5555          ||      H. Soliman, Ed.         ||       hesham@elevatemobile.com
+#   RFC5556          ||      J. Touch, R. Perlman         ||       touch@isi.edu, Radia.Perlman@sun.com
+#   RFC5557          ||      Y. Lee, JL. Le Roux, D. King, E. Oki         ||       ylee@huawei.com, jeanlouis.leroux@orange-ftgroup.com, daniel@olddog.co.uk, oki@ice.uec.ac.jp
+#   RFC5558          ||      F. Templin, Ed.         ||       fltemplin@acm.org
+#   RFC5559          ||      P. Eardley, Ed.         ||       philip.eardley@bt.com
+#   RFC5560          ||      H. Uijterwaal         ||       henk@ripe.net
+#   RFC5561          ||      B. Thomas, K. Raza, S. Aggarwal, R. Aggarwal, JL. Le Roux         ||       bobthomas@alum.mit.edu, skraza@cisco.com, shivani@juniper.net, rahul@juniper.net, jeanlouis.leroux@orange-ftgroup.com
+#   RFC5562          ||      A. Kuzmanovic, A. Mondal, S. Floyd, K. Ramakrishnan         ||       akuzma@northwestern.edu, a-mondal@northwestern.edu, floyd@icir.org, kkrama@research.att.com
+#   RFC5563          ||      K. Leung, G. Dommety, P. Yegani, K. Chowdhury         ||       kleung@cisco.com, gdommety@cisco.com, pyegani@cisco.com, kchowdhury@starentnetworks.com
+#   RFC5564          ||      A. El-Sherbiny, M. Farah, I. Oueichek, A. Al-Zoman         ||       El-sherbiny@un.org, farah14@un.org, oueichek@scs-net.org, azoman@citc.gov.sa
+#   RFC5565          ||      J. Wu, Y. Cui, C. Metz, E. Rosen         ||       jianping@cernet.edu.cn, yong@csnet1.cs.tsinghua.edu.cn, chmetz@cisco.com, erosen@cisco.com
+#   RFC5566          ||      L. Berger, R. White, E. Rosen         ||       lberger@labn.net, riw@cisco.com, erosen@cisco.com
+#   RFC5567          ||      T. Melanchuk, Ed.         ||       tim.melanchuk@gmail.com
+#   RFC5568          ||      R. Koodli, Ed.         ||       rkoodli@starentnetworks.com
+#   RFC5569          ||      R. Despres         ||       remi.despres@free.fr
+#   RFC5570          ||      M. StJohns, R. Atkinson, G. Thomas         ||       mstjohns@comcast.net, rja@extremenetworks.com, none
+#   RFC5571          ||      B. Storer, C. Pignataro, Ed., M. Dos Santos, B. Stevant, Ed., L. Toutain, J. Tremblay         ||       bstorer@cisco.com, cpignata@cisco.com, mariados@cisco.com, bruno.stevant@telecom-bretagne.eu, laurent.toutain@telecom-bretagne.eu, jf@jftremblay.com
+#   RFC5572          ||      M. Blanchet, F. Parent         ||       Marc.Blanchet@viagenie.ca, Florent.Parent@beon.ca
+#   RFC5573          ||      M. Thomson         ||       martin.thomson@andrew.com
+#   RFC5574          ||      G. Herlein, J. Valin, A. Heggestad, A. Moizard         ||       gherlein@herlein.com, jean-marc.valin@usherbrooke.ca, aeh@db.org, jack@atosc.org
+#   RFC5575          ||      P. Marques, N. Sheth, R. Raszuk, B. Greene, J. Mauch, D. McPherson         ||       roque@cisco.com, nsheth@juniper.net, raszuk@cisco.com, bgreene@juniper.net, jmauch@us.ntt.net, danny@arbor.net
+#   RFC5576          ||      J. Lennox, J. Ott, T. Schierl         ||       jonathan@vidyo.com, jo@acm.org, ts@thomas-schierl.de
+#   RFC5577          ||      P. Luthi, R. Even         ||       patrick.luthi@tandberg.no, ron.even.tlv@gmail.com
+#   RFC5578          ||      B. Berry, Ed., S. Ratliff, E. Paradise, T. Kaiser, M. Adams         ||       bberry@cisco.com, sratliff@cisco.com, pdice@cisco.com, timothy.kaiser@harris.com, Michael.D.Adams@L-3com.com
+#   RFC5579          ||      F. Templin, Ed.         ||       fltemplin@acm.org
+#   RFC5580          ||      H. Tschofenig, Ed., F. Adrangi, M. Jones, A. Lior, B. Aboba         ||       Hannes.Tschofenig@gmx.net, farid.adrangi@intel.com, mark.jones@bridgewatersystems.com, avi@bridgewatersystems.com, bernarda@microsoft.com
+#   RFC5581          ||      D. Shaw         ||       dshaw@jabberwocky.com
+#   RFC5582          ||      H. Schulzrinne         ||       hgs+ecrit@cs.columbia.edu
+#   RFC5583          ||      T. Schierl, S. Wenger         ||       ts@thomas-schierl.de, stewe@stewe.org
+#   RFC5584          ||      M. Hatanaka, J. Matsumoto         ||       actech@jp.sony.com, actech@jp.sony.com
+#   RFC5585          ||      T. Hansen, D. Crocker, P. Hallam-Baker         ||       tony+dkimov@maillennium.att.com, dcrocker@bbiw.net, phillip@hallambaker.com
+#   RFC5586          ||      M. Bocci, Ed., M. Vigoureux, Ed., S. Bryant, Ed.         ||       matthew.bocci@alcatel-lucent.com, martin.vigoureux@alcatel-lucent.com, stbryant@cisco.com
+#   RFC5587          ||      N. Williams         ||       Nicolas.Williams@sun.com
+#   RFC5588          ||      N. Williams         ||       Nicolas.Williams@sun.com
+#   RFC5589          ||      R. Sparks, A. Johnston, Ed., D. Petrie         ||       RjS@nostrum.com, alan@sipstation.com, dan.ietf@SIPez.com
+#   RFC5590          ||      D. Harrington, J. Schoenwaelder         ||       ietfdbh@comcast.net, j.schoenwaelder@jacobs-university.de
+#   RFC5591          ||      D. Harrington, W. Hardaker         ||       ietfdbh@comcast.net, ietf@hardakers.net
+#   RFC5592          ||      D. Harrington, J. Salowey, W. Hardaker         ||       ietfdbh@comcast.net, jsalowey@cisco.com, ietf@hardakers.net
+#   RFC5593          ||      N. Cook         ||       neil.cook@noware.co.uk
+#   RFC5594          ||      J. Peterson, A. Cooper         ||       jon.peterson@neustar.biz, acooper@cdt.org
+#   RFC5595          ||      G. Fairhurst         ||       gorry@erg.abdn.ac.uk
+#   RFC5596          ||      G. Fairhurst         ||       gorry@erg.abdn.ac.uk
+#   RFC5597          ||      R. Denis-Courmont         ||       rem@videolan.org
+#   RFC5598          ||      D. Crocker         ||       dcrocker@bbiw.net
+#   RFC5601          ||      T. Nadeau, Ed., D. Zelig, Ed.         ||       thomas.nadeau@bt.com, davidz@oversi.com
+#   RFC5602          ||      D. Zelig, Ed., T. Nadeau, Ed.         ||       davidz@oversi.com, tom.nadeau@bt.com
+#   RFC5603          ||      D. Zelig, Ed., T. Nadeau, Ed.         ||       davidz@oversi.com, tom.nadeau@bt.com
+#   RFC5604          ||      O. Nicklass         ||       orlyn@radvision.com
+#   RFC5605          ||      O. Nicklass, T. Nadeau         ||       orlyn@radvision.com, tom.nadeau@bt.com
+#   RFC5606          ||      J. Peterson, T. Hardie, J. Morris         ||       jon.peterson@neustar.biz, hardie@qualcomm.com, jmorris@cdt.org
+#   RFC5607          ||      D. Nelson, G. Weber         ||       dnelson@elbrysnetworks.com, gdweber@gmail.com
+#   RFC5608          ||      K. Narayan, D. Nelson         ||       kaushik_narayan@yahoo.com, dnelson@elbrysnetworks.com
+#   RFC5609          ||      V. Fajardo, Ed., Y. Ohba, R. Marin-Lopez         ||       vfajardo@research.telcordia.com, yoshihiro.ohba@toshiba.co.jp, rafa@um.es
+#   RFC5610          ||      E. Boschi, B. Trammell, L. Mark, T. Zseby         ||       elisa.boschi@hitachi-eu.com, brian.trammell@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, tanja.zseby@fokus.fraunhofer.de
+#   RFC5611          ||      A. Vainshtein, S. Galtzur         ||       Alexander.Vainshtein@ecitele.com, sharon.galtzur@rebellion.co.uk
+#   RFC5612          ||      P. Eronen, D. Harrington         ||       pe@iki.fi, dharrington@huawei.com
+#   RFC5613          ||      A. Zinin, A. Roy, L. Nguyen, B. Friedman, D. Yeung         ||       alex.zinin@alcatel-lucent.com, akr@cisco.com, lhnguyen@cisco.com, barryf@google.com, myeung@cisco.com
+#   RFC5614          ||      R. Ogier, P. Spagnolo         ||       rich.ogier@earthlink.net, phillipspagnolo@gmail.com
+#   RFC5615          ||      C. Groves, Y. Lin         ||       Christian.Groves@nteczone.com, linyangbo@huawei.com
+#   RFC5616          ||      N. Cook         ||       neil.cook@noware.co.uk
+#   RFC5617          ||      E. Allman, J. Fenton, M. Delany, J. Levine         ||       eric+dkim@sendmail.org, fenton@bluepopcorn.net, markd+dkim@yahoo-inc.com, standards@taugh.com
+#   RFC5618          ||      A. Morton, K. Hedayat         ||       acmorton@att.com, kaynam.hedayat@exfo.com
+#   RFC5619          ||      S. Yamamoto, C. Williams, H. Yokota, F. Parent         ||       shu@nict.go.jp, carlw@mcsr-labs.org, yokota@kddilabs.jp, Florent.Parent@beon.ca
+#   RFC5620          ||      O. Kolkman, Ed., IAB         ||       olaf@nlnetlabs.nl, iab@iab.org
+#   RFC5621          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
+#   RFC5622          ||      S. Floyd, E. Kohler         ||       floyd@icir.org, kohler@cs.ucla.edu
+#   RFC5623          ||      E. Oki, T. Takeda, JL. Le Roux, A. Farrel         ||       oki@ice.uec.ac.jp, takeda.tomonori@lab.ntt.co.jp, jeanlouis.leroux@orange-ftgroup.com, adrian@olddog.co.uk
+#   RFC5624          ||      J. Korhonen, Ed., H. Tschofenig, E. Davies         ||       jouni.korhonen@nsn.com, Hannes.Tschofenig@gmx.net, elwynd@dial.pipex.com
+#   RFC5625          ||      R. Bellis         ||       ray.bellis@nominet.org.uk
+#   RFC5626          ||      C. Jennings, Ed., R. Mahy, Ed., F. Audet, Ed.         ||       fluffy@cisco.com, rohan@ekabal.com, francois.audet@skypelabs.com
+#   RFC5627          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC5628          ||      P. Kyzivat         ||       pkyzivat@cisco.com
+#   RFC5629          ||      J. Rosenberg         ||       jdrosen@cisco.com
+#   RFC5630          ||      F. Audet         ||       francois.audet@skypelabs.com
+#   RFC5631          ||      R. Shacham, H. Schulzrinne, S. Thakolsri, W. Kellerer         ||       shacham@cs.columbia.edu, hgs@cs.columbia.edu, thakolsri@docomolab-euro.com, kellerer@docomolab-euro.com
+#   RFC5632          ||      C. Griffiths, J. Livingood, L. Popkin, R. Woundy, Y. Yang         ||       chris_griffiths@cable.comcast.com, jason_livingood@cable.comcast.com, laird@pando.com, richard_woundy@cable.comcast.com, yry@cs.yale.edu
+#   RFC5633          ||      S. Dawkins, Ed.         ||       spencer@wonderhamster.org
+#   RFC5634          ||      G. Fairhurst, A. Sathiaseelan         ||       gorry@erg.abdn.ac.uk, arjuna@erg.abdn.ac.uk
+#   RFC5635          ||      W. Kumari, D. McPherson         ||       warren@kumari.net, danny@arbor.net
+#   RFC5636          ||      S. Park, H. Park, Y. Won, J. Lee, S. Kent         ||       shpark@kisa.or.kr, hrpark@kisa.or.kr, yjwon@kisa.or.kr, jilee@kisa.or.kr, kent@bbn.com
+#   RFC5637          ||      G. Giaretta, I. Guardini, E. Demaria, J. Bournelle, R. Lopez         ||       gerardo@qualcomm.com, ivano.guardini@telecomitalia.it, elena.demaria@telecomitalia.it, julien.bournelle@gmail.com, rafa@dif.um.es
+#   RFC5638          ||      H. Sinnreich, Ed., A. Johnston, E. Shim, K. Singh         ||       henrys@adobe.com, alan@sipstation.com, eunsooshim@gmail.com, kns10@cs.columbia.edu
+#   RFC5639          ||      M. Lochter, J. Merkle         ||       manfred.lochter@bsi.bund.de, johannes.merkle@secunet.com
+#   RFC5640          ||      C. Filsfils, P. Mohapatra, C. Pignataro         ||       cfilsfil@cisco.com, pmohapat@cisco.com, cpignata@cisco.com
+#   RFC5641          ||      N. McGill, C. Pignataro         ||       nmcgill@cisco.com, cpignata@cisco.com
+#   RFC5642          ||      S. Venkata, S. Harwani, C. Pignataro, D. McPherson         ||       svenkata@google.com, sharwani@cisco.com, cpignata@cisco.com, danny@arbor.net
+#   RFC5643          ||      D. Joyal, Ed., V. Manral, Ed.         ||       djoyal@nortel.com, vishwas@ipinfusion.com
+#   RFC5644          ||      E. Stephan, L. Liang, A. Morton         ||       emile.stephan@orange-ftgroup.com, L.Liang@surrey.ac.uk, acmorton@att.com
+#   RFC5645          ||      D. Ewell, Ed.         ||       doug@ewellic.org
+#   RFC5646          ||      A. Phillips, Ed., M. Davis, Ed.         ||       addison@inter-locale.com, markdavis@google.com
+#   RFC5647          ||      K. Igoe, J. Solinas         ||       kmigoe@nsa.gov, jasolin@orion.ncsc.mil
+#   RFC5648          ||      R. Wakikawa, Ed., V. Devarapalli, G. Tsirtsis, T. Ernst, K. Nagami         ||       ryuji.wakikawa@gmail.com, vijay@wichorus.com, Tsirtsis@gmail.com, thierry.ernst@inria.fr, nagami@inetcore.com
+#   RFC5649          ||      R. Housley, M. Dworkin         ||       housley@vigilsec.com, dworkin@nist.gov
+#   RFC5650          ||      M. Morgenstern, S. Baillie, U. Bonollo         ||       moti.Morgenstern@ecitele.com, scott.baillie@nec.com.au, umberto.bonollo@nec.com.au
+#   RFC5651          ||      M. Luby, M. Watson, L. Vicisano         ||       luby@qti.qualcomm.com, watson@qualcomm.com, vicisano@qualcomm.com
+#   RFC5652          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC5653          ||      M. Upadhyay, S. Malkani         ||       m.d.upadhyay+ietf@gmail.com, Seema.Malkani@gmail.com
+#   RFC5654          ||      B. Niven-Jenkins, Ed., D. Brungard, Ed., M. Betts, Ed., N. Sprecher, S. Ueno         ||       benjamin.niven-jenkins@bt.com, dbrungard@att.com, malcolm.betts@huawei.com, nurit.sprecher@nsn.com, satoshi.ueno@ntt.com
+#   RFC5655          ||      B. Trammell, E. Boschi, L. Mark, T. Zseby, A. Wagner         ||       brian.trammell@hitachi-eu.com, elisa.boschi@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, tanja.zseby@fokus.fraunhofer.de, arno@wagner.name
+#   RFC5656          ||      D. Stebila, J. Green         ||       douglas@stebila.ca, jonathan.green@queensu.ca
+#   RFC5657          ||      L. Dusseault, R. Sparks         ||       lisa.dusseault@gmail.com, RjS@nostrum.com
+#   RFC5658          ||      T. Froment, C. Lebel, B. Bonnaerens         ||       thomas.froment@tech-invite.com, Christophe.Lebel@alcatel-lucent.fr, ben.bonnaerens@alcatel-lucent.be
+#   RFC5659          ||      M. Bocci, S. Bryant         ||       matthew.bocci@alcatel-lucent.com, stbryant@cisco.com
+#   RFC5660          ||      N. Williams         ||       Nicolas.Williams@sun.com
+#   RFC5661          ||      S. Shepler, Ed., M. Eisler, Ed., D. Noveck, Ed.         ||       shepler@storspeed.com, mike@eisler.com, dnoveck@netapp.com
+#   RFC5662          ||      S. Shepler, Ed., M. Eisler, Ed., D. Noveck, Ed.         ||       shepler@storspeed.com, mike@eisler.com, dnoveck@netapp.com
+#   RFC5663          ||      D. Black, S. Fridella, J. Glasgow         ||       black_david@emc.com, stevef@nasuni.com, jglasgow@aya.yale.edu
+#   RFC5664          ||      B. Halevy, B. Welch, J. Zelenka         ||       bhalevy@panasas.com, welch@panasas.com, jimz@panasas.com
+#   RFC5665          ||      M. Eisler         ||       mike@eisler.com
+#   RFC5666          ||      T. Talpey, B. Callaghan         ||       tmtalpey@gmail.com, brentc@apple.com
+#   RFC5667          ||      T. Talpey, B. Callaghan         ||       tmtalpey@gmail.com, brentc@apple.com
+#   RFC5668          ||      Y. Rekhter, S. Sangli, D. Tappan         ||       yakov@juniper.net, rsrihari@cisco.com, Dan.Tappan@Gmail.com
+#   RFC5669          ||      S. Yoon, J. Kim, H. Park, H. Jeong, Y. Won         ||       seokung@kisa.or.kr, seopo@kisa.or.kr, hrpark@kisa.or.kr, hcjung@kisa.or.kr, yjwon@kisa.or.kr
+#   RFC5670          ||      P. Eardley, Ed.         ||       philip.eardley@bt.com
+#   RFC5671          ||      S. Yasukawa, A. Farrel, Ed.         ||       yasukawa.seisho@lab.ntt.co.jp, adrian@olddog.co.uk
+#   RFC5672          ||      D. Crocker, Ed.         ||       dcrocker@bbiw.net
+#   RFC5673          ||      K. Pister, Ed., P. Thubert, Ed., S. Dwars, T. Phinney         ||       kpister@dustnetworks.com, pthubert@cisco.com, sicco.dwars@shell.com, tom.phinney@cox.net
+#   RFC5674          ||      S. Chisholm, R. Gerhards         ||       schishol@nortel.com, rgerhards@adiscon.com
+#   RFC5675          ||      V. Marinov, J. Schoenwaelder         ||       v.marinov@jacobs-university.de, j.schoenwaelder@jacobs-university.de
+#   RFC5676          ||      J. Schoenwaelder, A. Clemm, A. Karmakar         ||       j.schoenwaelder@jacobs-university.de, alex@cisco.com, akarmaka@cisco.com
+#   RFC5677          ||      T. Melia, Ed., G. Bajko, S. Das, N. Golmie, JC. Zuniga         ||       telemaco.melia@alcatel-lucent.com, Gabor.Bajko@nokia.com, subir@research.telcordia.com, nada.golmie@nist.gov, j.c.zuniga@ieee.org
+#   RFC5678          ||      G. Bajko, S. Das         ||       gabor.bajko@nokia.com, subir@research.telcordia.com
+#   RFC5679          ||      G. Bajko         ||       gabor.bajko@nokia.com
+#   RFC5680          ||      S. Dawkins, Ed.         ||       spencer@wonderhamster.org
+#   RFC5681          ||      M. Allman, V. Paxson, E. Blanton         ||       mallman@icir.org, vern@icir.org, eblanton@cs.purdue.edu
+#   RFC5682          ||      P. Sarolahti, M. Kojo, K. Yamamoto, M. Hata         ||       pasi.sarolahti@iki.fi, kojo@cs.helsinki.fi, yamamotokaz@nttdocomo.co.jp, hatama@s1.nttdocomo.co.jp
+#   RFC5683          ||      A. Brusilovsky, I. Faynberg, Z. Zeltsan, S. Patel         ||       Alec.Brusilovsky@alcatel-lucent.com, igor.faynberg@alcatel-lucent.com, zeltsan@alcatel-lucent.com, sarvar@google.com
+#   RFC5684          ||      P. Srisuresh, B. Ford         ||       srisuresh@yahoo.com, bryan.ford@yale.edu
+#   RFC5685          ||      V. Devarapalli, K. Weniger         ||       vijay@wichorus.com, kilian.weniger@googlemail.com
+#   RFC5686          ||      Y. Hiwasaki, H. Ohmuro         ||       hiwasaki.yusuke@lab.ntt.co.jp, ohmuro.hitoshi@lab.ntt.co.jp
+#   RFC5687          ||      H. Tschofenig, H. Schulzrinne         ||       Hannes.Tschofenig@gmx.net, hgs+ecrit@cs.columbia.edu
+#   RFC5688          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
+#   RFC5689          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC5690          ||      S. Floyd, A. Arcia, D. Ros, J. Iyengar         ||       floyd@icir.org, ae.arcia@telecom-bretagne.eu, David.Ros@telecom-bretagne.eu, jiyengar@fandm.edu
+#   RFC5691          ||      F. de Bont, S. Doehla, M. Schmidt, R. Sperschneider         ||       frans.de.bont@philips.com, stefan.doehla@iis.fraunhofer.de, malte.schmidt@dolby.com, ralph.sperschneider@iis.fraunhofer.de
+#   RFC5692          ||      H. Jeon, S. Jeong, M. Riegel         ||       hongseok.jeon@gmail.com, sjjeong@etri.re.kr, maximilian.riegel@nsn.com
+#   RFC5693          ||      J. Seedorf, E. Burger         ||       jan.seedorf@nw.neclab.eu, eburger@standardstrack.com
+#   RFC5694          ||      G. Camarillo, Ed., IAB         ||       Gonzalo.Camarillo@ericsson.com, iab@iab.org
+#   RFC5695          ||      A. Akhter, R. Asati, C. Pignataro         ||       aakhter@cisco.com, rajiva@cisco.com, cpignata@cisco.com
+#   RFC5696          ||      T. Moncaster, B. Briscoe, M. Menth         ||       toby.moncaster@bt.com, bob.briscoe@bt.com, menth@informatik.uni-wuerzburg.de
+#   RFC5697          ||      S. Farrell         ||       stephen.farrell@cs.tcd.ie
+#   RFC5698          ||      T. Kunz, S. Okunick, U. Pordesch         ||       thomas.kunz@sit.fraunhofer.de, susanne.okunick@pawisda.de, ulrich.pordesch@zv.fraunhofer.de
+#   RFC5701          ||      Y. Rekhter         ||       yakov@juniper.net
+#   RFC5702          ||      J. Jansen         ||       jelte@NLnetLabs.nl
+#   RFC5703          ||      T. Hansen, C. Daboo         ||       tony+sieveloop@maillennium.att.com, cyrus@daboo.name
+#   RFC5704          ||      S. Bryant, Ed., M. Morrow, Ed., IAB         ||       stbryant@cisco.com, mmorrow@cisco.com, iab@iab.org
+#   RFC5705          ||      E. Rescorla         ||       ekr@rtfm.com
+#   RFC5706          ||      D. Harrington         ||       ietfdbh@comcast.net
+#   RFC5707          ||      A. Saleem, Y. Xin, G. Sharratt         ||       adnan.saleem@RadiSys.com, yong.xin@RadiSys.com, garland.sharratt@gmail.com
+#   RFC5708          ||      A. Keromytis         ||       angelos@cs.columbia.edu
+#   RFC5709          ||      M. Bhatia, V. Manral, M. Fanto, R. White, M. Barnes, T. Li, R. Atkinson         ||       manav@alcatel-lucent.com, vishwas@ipinfusion.com, mfanto@aegisdatasecurity.com, riw@cisco.com, mjbarnes@cisco.com, tony.li@tony.li, rja@extremenetworks.com
+#   RFC5710          ||      L. Berger, D. Papadimitriou, JP. Vasseur         ||       lberger@labn.net, Dimitri.Papadimitriou@alcatel-lucent.be, jpv@cisco.com
+#   RFC5711          ||      JP. Vasseur, Ed., G. Swallow, I. Minei         ||       jpv@cisco.com, swallow@cisco.com, ina@juniper.net
+#   RFC5712          ||      M. Meyer, Ed., JP. Vasseur, Ed.         ||       matthew.meyer@bt.com, jpv@cisco.com
+#   RFC5713          ||      H. Moustafa, H. Tschofenig, S. De Cnodder         ||       hassnaa.moustafa@orange-ftgroup.com, Hannes.Tschofenig@gmx.net, stefaan.de_cnodder@alcatel-lucent.com
+#   RFC5714          ||      M. Shand, S. Bryant         ||       mshand@cisco.com, stbryant@cisco.com
+#   RFC5715          ||      M. Shand, S. Bryant         ||       mshand@cisco.com, stbryant@cisco.com
+#   RFC5716          ||      J. Lentini, C. Everhart, D. Ellard, R. Tewari, M. Naik         ||       jlentini@netapp.com, everhart@netapp.com, dellard@bbn.com, tewarir@us.ibm.com, manoj@almaden.ibm.com
+#   RFC5717          ||      B. Lengyel, M. Bjorklund         ||       balazs.lengyel@ericsson.com, mbj@tail-f.com
+#   RFC5718          ||      D. Beller, A. Farrel         ||       dieter.beller@alcatel-lucent.com, adrian@olddog.co.uk
+#   RFC5719          ||      D. Romascanu, H. Tschofenig         ||       dromasca@gmail.com , Hannes.Tschofenig@gmx.net
+#   RFC5720          ||      F. Templin         ||       fltemplin@acm.org
+#   RFC5721          ||      R. Gellens, C. Newman         ||       rg+ietf@qualcomm.com, chris.newman@sun.com
+#   RFC5722          ||      S. Krishnan         ||       suresh.krishnan@ericsson.com
+#   RFC5723          ||      Y. Sheffer, H. Tschofenig         ||       yaronf@checkpoint.com, Hannes.Tschofenig@gmx.net
+#   RFC5724          ||      E. Wilde, A. Vaha-Sipila         ||       dret@berkeley.edu, antti.vaha-sipila@nokia.com
+#   RFC5725          ||      A. Begen, D. Hsu, M. Lague         ||       abegen@cisco.com, dohsu@cisco.com, mlague@cisco.com
+#   RFC5726          ||      Y. Qiu, F. Zhao, Ed., R. Koodli         ||       qiuying@i2r.a-star.edu.sg, fanzhao@google.com, rkoodli@cisco.com
+#   RFC5727          ||      J. Peterson, C. Jennings, R. Sparks         ||       jon.peterson@neustar.biz, fluffy@cisco.com, rjsparks@nostrum.com
+#   RFC5728          ||      S. Combes, P. Amundsen, M. Lambert, H-P. Lexow         ||       stephane.combes@esa.int, pca@verisat.no, micheline.lambert@advantechamt.com, hlexow@stmi.com
+#   RFC5729          ||      J. Korhonen, Ed., M. Jones, L. Morand, T. Tsou         ||       jouni.nospam@gmail.com, Mark.Jones@bridgewatersystems.com, Lionel.morand@orange-ftgroup.com, tena@huawei.com
+#   RFC5730          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC5731          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC5732          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC5733          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC5734          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC5735          ||      M. Cotton, L. Vegoda         ||       michelle.cotton@icann.org, leo.vegoda@icann.org
+#   RFC5736          ||      G. Huston, M. Cotton, L. Vegoda         ||       gih@apnic.net, michelle.cotton@icann.org, leo.vegoda@icann.org
+#   RFC5737          ||      J. Arkko, M. Cotton, L. Vegoda         ||       jari.arkko@piuha.net, michelle.cotton@icann.org, leo.vegoda@icann.org
+#   RFC5738          ||      P. Resnick, C. Newman         ||       presnick@qti.qualcomm.com, chris.newman@sun.com
+#   RFC5739          ||      P. Eronen, J. Laganier, C. Madson         ||       pe@iki.fi, julienl@qualcomm.com, cmadson@cisco.com
+#   RFC5740          ||      B. Adamson, C. Bormann, M. Handley, J. Macker         ||       adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil
+#   RFC5741          ||      L. Daigle, Ed., O. Kolkman, Ed., IAB         ||       leslie@thinkingcat.com, olaf@nlnetlabs.nl, iab@iab.org
+#   RFC5742          ||      H. Alvestrand, R. Housley         ||       harald@alvestrand.no, housley@vigilsec.com
+#   RFC5743          ||      A. Falk         ||       falk@bbn.com
+#   RFC5744          ||      R. Braden, J. Halpern         ||       braden@isi.edu, jhalpern@redback.com
+#   RFC5745          ||      A. Malis, Ed., IAB         ||       andrew.g.malis@verizon.com, iab@iab.org
+#   RFC5746          ||      E. Rescorla, M. Ray, S. Dispensa, N. Oskov         ||       ekr@rtfm.com, marsh@extendedsubset.com, dispensa@phonefactor.com, nasko.oskov@microsoft.com
+#   RFC5747          ||      J. Wu, Y. Cui, X. Li, M. Xu, C. Metz         ||       jianping@cernet.edu.cn, cy@csnet1.cs.tsinghua.edu.cn, xing@cernet.edu.cn, xmw@csnet1.cs.tsinghua.edu.cn, chmetz@cisco.com
+#   RFC5748          ||      S. Yoon, J. Jeong, H. Kim, H. Jeong, Y. Won         ||       seokung@kisa.or.kr, jijeong@kisa.or.kr, rinyfeel@kisa.or.kr, hcjung@kisa.or.kr, yjwon@kisa.or.kr
+#   RFC5749          ||      K. Hoeper, Ed., M. Nakhjiri, Y. Ohba, Ed.         ||       khoeper@motorola.com, madjid.nakhjiri@motorola.com, yoshihiro.ohba@toshiba.co.jp
+#   RFC5750          ||      B. Ramsdell, S. Turner         ||       blaker@gmail.com, turners@ieca.com
+#   RFC5751          ||      B. Ramsdell, S. Turner         ||       blaker@gmail.com, turners@ieca.com
+#   RFC5752          ||      S. Turner, J. Schaad         ||       turners@ieca.com, jimsch@exmsft.com
+#   RFC5753          ||      S. Turner, D. Brown         ||       turners@ieca.com, dbrown@certicom.com
+#   RFC5754          ||      S. Turner         ||       turners@ieca.com
+#   RFC5755          ||      S. Farrell, R. Housley, S. Turner         ||       stephen.farrell@cs.tcd.ie, housley@vigilsec.com, turners@ieca.com
+#   RFC5756          ||      S. Turner, D. Brown, K. Yiu, R. Housley, T. Polk         ||       turners@ieca.com, dbrown@certicom.com, kelviny@microsoft.com, housley@vigilsec.com, wpolk@nist.gov
+#   RFC5757          ||      T. Schmidt, M. Waehlisch, G. Fairhurst         ||       schmidt@informatik.haw-hamburg.de, mw@link-lab.net, gorry@erg.abdn.ac.uk
+#   RFC5758          ||      Q. Dang, S. Santesson, K. Moriarty, D. Brown, T. Polk         ||       quynh.dang@nist.gov, sts@aaa-sec.com, Moriarty_Kathleen@emc.com, dbrown@certicom.com, tim.polk@nist.gov
+#   RFC5759          ||      J. Solinas, L. Zieglar         ||       jasolin@orion.ncsc.mil, llziegl@tycho.ncsc.mil
+#   RFC5760          ||      J. Ott, J. Chesterfield, E. Schooler         ||       jo@acm.org, julianchesterfield@cantab.net, eve_schooler@acm.org
+#   RFC5761          ||      C. Perkins, M. Westerlund         ||       csp@csperkins.org, magnus.westerlund@ericsson.com
+#   RFC5762          ||      C. Perkins         ||       csp@csperkins.org
+#   RFC5763          ||      J. Fischl, H. Tschofenig, E. Rescorla         ||       jason.fischl@skype.net, Hannes.Tschofenig@gmx.net, ekr@rtfm.com
+#   RFC5764          ||      D. McGrew, E. Rescorla         ||       mcgrew@cisco.com, ekr@rtfm.com
+#   RFC5765          ||      H. Schulzrinne, E. Marocco, E. Ivov         ||       hgs@cs.columbia.edu, enrico.marocco@telecomitalia.it, emcho@sip-communicator.org
+#   RFC5766          ||      R. Mahy, P. Matthews, J. Rosenberg         ||       rohan@ekabal.com, philip_matthews@magma.ca, jdrosen@jdrosen.net
+#   RFC5767          ||      M. Munakata, S. Schubert, T. Ohba         ||       munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp
+#   RFC5768          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
+#   RFC5769          ||      R. Denis-Courmont         ||       remi.denis-courmont@nokia.com
+#   RFC5770          ||      M. Komu, T. Henderson, H. Tschofenig, J. Melen, A. Keranen, Ed.         ||       miika@iki.fi, thomas.r.henderson@boeing.com, Hannes.Tschofenig@gmx.net, jan.melen@ericsson.com, ari.keranen@ericsson.com
+#   RFC5771          ||      M. Cotton, L. Vegoda, D. Meyer         ||       michelle.cotton@icann.org, leo.vegoda@icann.org, dmm@1-4-5.net
+#   RFC5772          ||      A. Doria, E. Davies, F. Kastenholz         ||       avri@ltu.se, elwynd@dial.pipex.com, frank@bbn.com
+#   RFC5773          ||      E. Davies, A. Doria         ||       elwynd@dial.pipex.com, avri@acm.org
+#   RFC5774          ||      K. Wolf, A. Mayrhofer         ||       karlheinz.wolf@nic.at, alexander.mayrhofer@nic.at
+#   RFC5775          ||      M. Luby, M. Watson, L. Vicisano         ||       luby@qti.qualcomm.com, watson@qualcomm.com, vicisano@qualcomm.com
+#   RFC5776          ||      V. Roca, A. Francillon, S. Faurite         ||       vincent.roca@inria.fr, aurelien.francillon@inria.fr, faurite@lcpc.fr
+#   RFC5777          ||      J. Korhonen, H. Tschofenig, M. Arumaithurai, M. Jones, Ed., A. Lior         ||       jouni.korhonen@nsn.com, Hannes.Tschofenig@gmx.net, mayutan.arumaithurai@gmail.com, mark.jones@bridgewatersystems.com, avi@bridgewatersystems.com
+#   RFC5778          ||      J. Korhonen, Ed., H. Tschofenig, J. Bournelle, G. Giaretta, M. Nakhjiri         ||       jouni.nospam@gmail.com, Hannes.Tschofenig@gmx.net, julien.bournelle@orange-ftgroup.com, gerardo.giaretta@gmail.com, madjid.nakhjiri@motorola.com
+#   RFC5779          ||      J. Korhonen, Ed., J. Bournelle, K. Chowdhury, A. Muhanna, U. Meyer         ||       jouni.nospam@gmail.com, julien.bournelle@orange-ftgroup.com, kchowdhury@cisco.com, Ahmad.muhanna@ericsson.com, meyer@umic.rwth-aachen.de
+#   RFC5780          ||      D. MacDonald, B. Lowekamp         ||       derek.macdonald@gmail.com, bbl@lowekamp.net
+#   RFC5781          ||      S. Weiler, D. Ward, R. Housley         ||       weiler@tislabs.com, dward@juniper.net, housley@vigilsec.com
+#   RFC5782          ||      J. Levine         ||       standards@taugh.com
+#   RFC5783          ||      M. Welzl, W. Eddy         ||       michawe@ifi.uio.no, wes@mti-systems.com
+#   RFC5784          ||      N. Freed, S. Vedam         ||       ned.freed@mrochek.com, Srinivas.Sv@Sun.COM
+#   RFC5785          ||      M. Nottingham, E. Hammer-Lahav         ||       mnot@mnot.net, eran@hueniverse.com
+#   RFC5786          ||      R. Aggarwal, K. Kompella         ||       rahul@juniper.net, kireeti@juniper.net
+#   RFC5787          ||      D. Papadimitriou         ||       dimitri.papadimitriou@alcatel-lucent.be
+#   RFC5788          ||      A. Melnikov, D. Cridland         ||       Alexey.Melnikov@isode.com, dave.cridland@isode.com
+#   RFC5789          ||      L. Dusseault, J. Snell         ||       lisa.dusseault@gmail.com, jasnell@gmail.com
+#   RFC5790          ||      H. Liu, W. Cao, H. Asaeda         ||       Liuhui47967@huawei.com, caowayne@huawei.com, asaeda@wide.ad.jp
+#   RFC5791          ||      J. Reschke, J. Kunze         ||       julian.reschke@greenbytes.de, jak@ucop.edu
+#   RFC5792          ||      P. Sangster, K. Narayan         ||       Paul_Sangster@symantec.com, kaushik@cisco.com
+#   RFC5793          ||      R. Sahita, S. Hanna, R. Hurst, K. Narayan         ||       Ravi.Sahita@intel.com, shanna@juniper.net, Ryan.Hurst@microsoft.com, kaushik@cisco.com
+#   RFC5794          ||      J. Lee, J. Lee, J. Kim, D. Kwon, C. Kim         ||       jklee@ensec.re.kr, jlee05@ensec.re.kr, jaeheon@ensec.re.kr, ds_kwon@ensec.re.kr, jbr@ensec.re.kr
+#   RFC5795          ||      K. Sandlund, G. Pelletier, L-E. Jonsson         ||       kristofer.sandlund@ericsson.com, ghyslain.pelletier@ericsson.com, lars-erik@lejonsson.com
+#   RFC5796          ||      W. Atwood, S. Islam, M. Siami         ||       bill@cse.concordia.ca, Salekul.Islam@emt.inrs.ca, mzrsm@yahoo.ca
+#   RFC5797          ||      J. Klensin, A. Hoenes         ||       john+ietf@jck.com, ah@TR-Sys.de
+#   RFC5798          ||      S. Nadas, Ed.         ||       stephen.nadas@ericsson.com
+#   RFC5801          ||      S. Josefsson, N. Williams         ||       simon@josefsson.org, Nicolas.Williams@oracle.com
+#   RFC5802          ||      C. Newman, A. Menon-Sen, A. Melnikov, N. Williams         ||       chris.newman@oracle.com, ams@toroid.org, Alexey.Melnikov@isode.com, Nicolas.Williams@oracle.com
+#   RFC5803          ||      A. Melnikov         ||       alexey.melnikov@isode.com
+#   RFC5804          ||      A. Melnikov, Ed., T. Martin         ||       Alexey.Melnikov@isode.com, timmartin@alumni.cmu.edu
+#   RFC5805          ||      K. Zeilenga         ||       Kurt.Zeilenga@Isode.COM
+#   RFC5806          ||      S. Levy, M. Mohali, Ed.         ||       stlevy@cisco.com, marianne.mohali@orange-ftgroup.com
+#   RFC5807          ||      Y. Ohba, A. Yegin         ||       yoshihiro.ohba@toshiba.co.jp, alper.yegin@yegin.org
+#   RFC5808          ||      R. Marshall, Ed.         ||       rmarshall@telecomsys.com
+#   RFC5810          ||      A. Doria, Ed., J. Hadi Salim, Ed., R. Haas, Ed., H. Khosravi, Ed., W. Wang, Ed., L. Dong, R. Gopal, J. Halpern         ||       avri@ltu.se, hadi@mojatatu.com, rha@zurich.ibm.com, hormuzd.m.khosravi@intel.com, wmwang@mail.zjgsu.edu.cn, donglg@zjgsu.edu.cn, ram.gopal@nsn.com, jmh@joelhalpern.com
+#   RFC5811          ||      J. Hadi Salim, K. Ogawa         ||       hadi@mojatatu.com, ogawa.kentaro@lab.ntt.co.jp
+#   RFC5812          ||      J. Halpern, J. Hadi Salim         ||       jmh@joelhalpern.com, hadi@mojatatu.com
+#   RFC5813          ||      R. Haas         ||       rha@zurich.ibm.com
+#   RFC5814          ||      W. Sun, Ed., G. Zhang, Ed.         ||       sunwq@mit.edu, zhangguoying@mail.ritt.com.cn
+#   RFC5815          ||      T. Dietz, Ed., A. Kobayashi, B. Claise, G. Muenz         ||       Thomas.Dietz@nw.neclab.eu, akoba@nttv6.net, bclaise@cisco.com, muenz@net.in.tum.de
+#   RFC5816          ||      S. Santesson, N. Pope         ||       sts@aaa-sec.com, nick.pope@thales-esecurity.com
+#   RFC5817          ||      Z. Ali, JP. Vasseur, A. Zamfir, J. Newton         ||       zali@cisco.com, jpv@cisco.com, ancaz@cisco.com, jonathan.newton@cw.com
+#   RFC5818          ||      D. Li, H. Xu, S. Bardalai, J. Meuric, D. Caviglia         ||       danli@huawei.com, xuhuiying@huawei.com, snigdho.bardalai@us.fujitsu.com, julien.meuric@orange-ftgroup.com, diego.caviglia@ericsson.com
+#   RFC5819          ||      A. Melnikov, T. Sirainen         ||       Alexey.Melnikov@isode.com, tss@iki.fi
+#   RFC5820          ||      A. Roy, Ed., M. Chandra, Ed.         ||       akr@cisco.com, mw.chandra@gmail.com
+#   RFC5824          ||      K. Kumaki, Ed., R. Zhang, Y. Kamite         ||       ke-kumaki@kddi.com, raymond.zhang@bt.com, y.kamite@ntt.com
+#   RFC5825          ||      K. Fujiwara, B. Leiba         ||       fujiwara@jprs.co.jp, barryleiba@computer.org
+#   RFC5826          ||      A. Brandt, J. Buron, G. Porcu         ||       abr@sdesigns.dk, jbu@sdesigns.dk, gporcu@gmail.com
+#   RFC5827          ||      M. Allman, K. Avrachenkov, U. Ayesta, J. Blanton, P. Hurtig         ||       mallman@icir.org, k.avrachenkov@sophia.inria.fr, urtzi@laas.fr, jblanton@irg.cs.ohiou.edu, per.hurtig@kau.se
+#   RFC5828          ||      D. Fedyk, L. Berger, L. Andersson         ||       donald.fedyk@alcatel-lucent.com, lberger@labn.net, loa.andersson@ericsson.com
+#   RFC5829          ||      A. Brown, G. Clemm, J. Reschke, Ed.         ||       albertcbrown@us.ibm.com, geoffrey.clemm@us.ibm.com, julian.reschke@greenbytes.de
+#   RFC5830          ||      V. Dolmatov, Ed.         ||       dol@cryptocom.ru
+#   RFC5831          ||      V. Dolmatov, Ed.         ||       dol@cryptocom.ru
+#   RFC5832          ||      V. Dolmatov, Ed.         ||       dol@cryptocom.ru
+#   RFC5833          ||      Y. Shi, Ed., D. Perkins, Ed., C. Elliott, Ed., Y. Zhang, Ed.         ||       rishyang@gmail.com, dperkins@dsperkins.com, chelliot@pobox.com, yzhang@fortinet.com
+#   RFC5834          ||      Y. Shi, Ed., D. Perkins, Ed., C. Elliott, Ed., Y. Zhang, Ed.         ||       rishyang@gmail.com, dperkins@dsperkins.com, chelliot@pobox.com, yzhang@fortinet.com
+#   RFC5835          ||      A. Morton, Ed., S. Van den Berghe, Ed.         ||       acmorton@att.com, steven.van_den_berghe@alcatel-lucent.com
+#   RFC5836          ||      Y. Ohba, Ed., Q. Wu, Ed., G. Zorn, Ed.         ||       oshihiro.ohba@toshiba.co.jp, sunseawq@huawei.com, gwz@net-zen.net
+#   RFC5837          ||      A. Atlas, Ed., R. Bonica, Ed., C. Pignataro, Ed., N. Shen, JR. Rivers         ||       alia.atlas@bt.com, rbonica@juniper.net, cpignata@cisco.com, naiming@cisco.com, jrrivers@yahoo.com
+#   RFC5838          ||      A. Lindem, Ed., S. Mirtorabi, A. Roy, M. Barnes, R. Aggarwal         ||       acee.lindem@ericsson.com, smirtora@cisco.com, akr@cisco.com, mjbarnes@cisco.com, rahul@juniper.net
+#   RFC5839          ||      A. Niemi, D. Willis, Ed.         ||       aki.niemi@nokia.com, dean.willis@softarmor.com
+#   RFC5840          ||      K. Grewal, G. Montenegro, M. Bhatia         ||       ken.grewal@intel.com, gabriel.montenegro@microsoft.com, manav.bhatia@alcatel-lucent.com
+#   RFC5841          ||      R. Hay, W. Turkal         ||       rhay@google.com, turkal@google.com
+#   RFC5842          ||      G. Clemm, J. Crawford, J. Reschke, Ed., J. Whitehead         ||       geoffrey.clemm@us.ibm.com, ccjason@us.ibm.com, julian.reschke@greenbytes.de, ejw@cse.ucsc.edu
+#   RFC5843          ||      A. Bryan         ||       anthonybryan@gmail.com
+#   RFC5844          ||      R. Wakikawa, S. Gundavelli         ||       ryuji@us.toyota-itc.com, sgundave@cisco.com
+#   RFC5845          ||      A. Muhanna, M. Khalil, S. Gundavelli, K. Leung         ||       ahmad.muhanna@ericsson.com, Mohamed.khalil@ericsson.com, sgundave@cisco.com, kleung@cisco.com
+#   RFC5846          ||      A. Muhanna, M. Khalil, S. Gundavelli, K. Chowdhury, P. Yegani         ||       ahmad.muhanna@ericsson.com, mohamed.khalil@ericsson.com, sgundave@cisco.com, kchowdhu@cisco.com, pyegani@juniper.net
+#   RFC5847          ||      V. Devarapalli, Ed., R. Koodli, Ed., H. Lim, N. Kant, S. Krishnan, J. Laganier         ||       vijay@wichorus.com, rkoodli@cisco.com, hlim@stoke.com, nishi@stoke.com, suresh.krishnan@ericsson.com, julienl@qualcomm.com
+#   RFC5848          ||      J. Kelsey, J. Callas, A. Clemm         ||       john.kelsey@nist.gov, jon@callas.org, alex@cisco.com
+#   RFC5849          ||      E. Hammer-Lahav, Ed.         ||       eran@hueniverse.com
+#   RFC5850          ||      R. Mahy, R. Sparks, J. Rosenberg, D. Petrie, A. Johnston, Ed.         ||       rohan@ekabal.com, rjsparks@nostrum.com, jdrosen@jdrosen.net, dpetrie@sipez.com, alan@sipstation.com
+#   RFC5851          ||      S. Ooghe, N. Voigt, M. Platnic, T. Haag, S. Wadhwa         ||       sven.ooghe@alcatel-lucent.com, norbert.voigt@nsn.com, mplatnic@gmail.com, haagt@telekom.de, swadhwa@juniper.net
+#   RFC5852          ||      D. Caviglia, D. Ceccarelli, D. Bramanti, D. Li, S. Bardalai         ||       diego.caviglia@ericsson.com, daniele.ceccarelli@ericsson.com, none, danli@huawei.com, sbardalai@gmail.com
+#   RFC5853          ||      J. Hautakorpi, Ed., G. Camarillo, R. Penfield, A. Hawrylyshen, M. Bhatia         ||       Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com, bpenfield@acmepacket.com, alan.ietf@polyphase.ca, mbhatia@3clogic.com
+#   RFC5854          ||      A. Bryan, T. Tsujikawa, N. McNab, P. Poeml         ||       anthonybryan@gmail.com, tatsuhiro.t@gmail.com, neil@nabber.org, peter@poeml.de
+#   RFC5855          ||      J. Abley, T. Manderson         ||       joe.abley@icann.org, terry.manderson@icann.org
+#   RFC5856          ||      E. Ertekin, R. Jasani, C. Christou, C. Bormann         ||       ertekin_emre@bah.com, ro@breakcheck.com, christou_chris@bah.com, cabo@tzi.org
+#   RFC5857          ||      E. Ertekin, C. Christou, R. Jasani, T. Kivinen, C. Bormann         ||       ertekin_emre@bah.com, christou_chris@bah.com, ro@breakcheck.com, kivinen@iki.fi, cabo@tzi.org
+#   RFC5858          ||      E. Ertekin, C. Christou, C. Bormann         ||       ertekin_emre@bah.com, christou_chris@bah.com, cabo@tzi.org
+#   RFC5859          ||      R. Johnson         ||       raj@cisco.com
+#   RFC5860          ||      M. Vigoureux, Ed., D. Ward, Ed., M. Betts, Ed.         ||       martin.vigoureux@alcatel-lucent.com, dward@juniper.net, malcolm.betts@rogers.com
+#   RFC5861          ||      M. Nottingham         ||       mnot@yahoo-inc.com
+#   RFC5862          ||      S. Yasukawa, A. Farrel         ||       yasukawa.seisho@lab.ntt.co.jp, adrian@olddog.co.uk
+#   RFC5863          ||      T. Hansen, E. Siegel, P. Hallam-Baker, D. Crocker         ||       tony+dkimov@maillennium.att.com, dkim@esiegel.net, phillip@hallambaker.com, dcrocker@bbiw.net
+#   RFC5864          ||      R. Allbery         ||       rra@stanford.edu
+#   RFC5865          ||      F. Baker, J. Polk, M. Dolly         ||       fred@cisco.com, jmpolk@cisco.com, mdolly@att.com
+#   RFC5866          ||      D. Sun, Ed., P. McCann, H. Tschofenig, T. Tsou, A. Doria, G. Zorn, Ed.         ||       d.sun@alcatel-lucent.com, pete.mccann@motorola.com, Hannes.Tschofenig@gmx.net, tena@huawei.com, avri@ltu.se, gwz@net-zen.net
+#   RFC5867          ||      J. Martocci, Ed., P. De Mil, N. Riou, W. Vermeylen         ||       jerald.p.martocci@jci.com, pieter.demil@intec.ugent.be, nicolas.riou@fr.schneider-electric.com, wouter@vooruit.be
+#   RFC5868          ||      S. Sakane, K. Kamada, S. Zrelli, M. Ishiyama         ||       Shouichi.Sakane@jp.yokogawa.com, Ken-ichi.Kamada@jp.yokogawa.com, Saber.Zrelli@jp.yokogawa.com, masahiro@isl.rdc.toshiba.co.jp
+#   RFC5869          ||      H. Krawczyk, P. Eronen         ||       hugokraw@us.ibm.com, pe@iki.fi
+#   RFC5870          ||      A. Mayrhofer, C. Spanring         ||       alexander.mayrhofer@ipcom.at, christian@spanring.eu
+#   RFC5871          ||      J. Arkko, S. Bradner         ||       jari.arkko@piuha.net, sob@harvard.edu
+#   RFC5872          ||      J. Arkko, A. Yegin         ||       jari.arkko@piuha.net, alper.yegin@yegin.org
+#   RFC5873          ||      Y. Ohba, A. Yegin         ||       yoshihiro.ohba@toshiba.co.jp, alper.yegin@yegin.org
+#   RFC5874          ||      J. Rosenberg, J. Urpalainen         ||       jdrosen.net, jari.urpalainen@nokia.com
+#   RFC5875          ||      J. Urpalainen, D. Willis, Ed.         ||       jari.urpalainen@nokia.com, dean.willis@softarmor.com
+#   RFC5876          ||      J. Elwell         ||       john.elwell@siemens-enterprise.com
+#   RFC5877          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC5878          ||      M. Brown, R. Housley         ||       mark@redphonesecurity.com, housley@vigilsec.com
+#   RFC5879          ||      T. Kivinen, D. McDonald         ||       kivinen@iki.fi, danmcd@opensolaris.org
+#   RFC5880          ||      D. Katz, D. Ward         ||       dkatz@juniper.net, dward@juniper.net
+#   RFC5881          ||      D. Katz, D. Ward         ||       dkatz@juniper.net, dward@juniper.net
+#   RFC5882          ||      D. Katz, D. Ward         ||       dkatz@juniper.net, dward@juniper.net
+#   RFC5883          ||      D. Katz, D. Ward         ||       dkatz@juniper.net, dward@juniper.net
+#   RFC5884          ||      R. Aggarwal, K. Kompella, T. Nadeau, G. Swallow         ||       rahul@juniper.net, kireeti@juniper.net, tom.nadeau@bt.com, swallow@cisco.com
+#   RFC5885          ||      T. Nadeau, Ed., C. Pignataro, Ed.         ||       tom.nadeau@bt.com, cpignata@cisco.com
+#   RFC5886          ||      JP. Vasseur, Ed., JL. Le Roux, Y. Ikejiri         ||       jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com, y.ikejiri@ntt.com
+#   RFC5887          ||      B. Carpenter, R. Atkinson, H. Flinck         ||       brian.e.carpenter@gmail.com, rja@extremenetworks.com, hannu.flinck@nsn.com
+#   RFC5888          ||      G. Camarillo, H. Schulzrinne         ||       Gonzalo.Camarillo@ericsson.com, schulzrinne@cs.columbia.edu
+#   RFC5889          ||      E. Baccelli, Ed., M. Townsley, Ed.         ||       Emmanuel.Baccelli@inria.fr, mark@townsley.net
+#   RFC5890          ||      J. Klensin         ||       john+ietf@jck.com
+#   RFC5891          ||      J. Klensin         ||       john+ietf@jck.com
+#   RFC5892          ||      P. Faltstrom, Ed.         ||       paf@cisco.com
+#   RFC5893          ||      H. Alvestrand, Ed., C. Karp         ||       harald@alvestrand.no, ck@nic.museum
+#   RFC5894          ||      J. Klensin         ||       john+ietf@jck.com
+#   RFC5895          ||      P. Resnick, P. Hoffman         ||       presnick@qti.qualcomm.com, paul.hoffman@vpnc.org
+#   RFC5896          ||      L. Hornquist Astrand, S. Hartman         ||       lha@apple.com, hartmans-ietf@mit.edu
+#   RFC5897          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
+#   RFC5898          ||      F. Andreasen, G. Camarillo, D. Oran, D. Wing         ||       fandreas@cisco.com, Gonzalo.Camarillo@ericsson.com, oran@cisco.com, dwing-ietf@fuggles.com
+#   RFC5901          ||      P. Cain, D. Jevans         ||       pcain@coopercain.com, dave.jevans@antiphishing.org
+#   RFC5902          ||      D. Thaler, L. Zhang, G. Lebovitz         ||       dthaler@microsoft.com, lixia@cs.ucla.edu, gregory.ietf@gmail.com, iab@iab.org
+#   RFC5903          ||      D. Fu, J. Solinas         ||       defu@orion.ncsc.mil, jasolin@orion.ncsc.mil
+#   RFC5904          ||      G. Zorn         ||       gwz@net-zen.net
+#   RFC5905          ||      D. Mills, J. Martin, Ed., J. Burbank, W. Kasch         ||       mills@udel.edu, jrmii@isc.org, jack.burbank@jhuapl.edu, william.kasch@jhuapl.edu
+#   RFC5906          ||      B. Haberman, Ed., D. Mills         ||       brian@innovationslab.net, mills@udel.edu
+#   RFC5907          ||      H. Gerstung, C. Elliott, B. Haberman, Ed.         ||       heiko.gerstung@meinberg.de, chelliot@pobox.com, brian@innovationslab.net
+#   RFC5908          ||      R. Gayraud, B. Lourdelet         ||       richard.gayraud@free.fr, blourdel@cisco.com
+#   RFC5909          ||      J-M. Combes, S. Krishnan, G. Daley         ||       jeanmichel.combes@orange-ftgroup.com, Suresh.Krishnan@ericsson.com, hoskuld@hotmail.com
+#   RFC5910          ||      J. Gould, S. Hollenbeck         ||       jgould@verisign.com, shollenbeck@verisign.com
+#   RFC5911          ||      P. Hoffman, J. Schaad         ||       paul.hoffman@vpnc.org, jimsch@exmsft.com
+#   RFC5912          ||      P. Hoffman, J. Schaad         ||       paul.hoffman@vpnc.org, jimsch@exmsft.com
+#   RFC5913          ||      S. Turner, S. Chokhani         ||       turners@ieca.com, SChokhani@cygnacom.com
+#   RFC5914          ||      R. Housley, S. Ashmore, C. Wallace         ||       housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com
+#   RFC5915          ||      S. Turner, D. Brown         ||       turners@ieca.com, dbrown@certicom.com
+#   RFC5916          ||      S. Turner         ||       turners@ieca.com
+#   RFC5917          ||      S. Turner         ||       turners@ieca.com
+#   RFC5918          ||      R. Asati, I. Minei, B. Thomas         ||       rajiva@cisco.com, ina@juniper.net, bobthomas@alum.mit.edu
+#   RFC5919          ||      R. Asati, P. Mohapatra, E. Chen, B. Thomas         ||       rajiva@cisco.com, pmohapat@cisco.com, chenying220@huawei.com, bobthomas@alum.mit.edu
+#   RFC5920          ||      L. Fang, Ed.         ||       lufang@cisco.com
+#   RFC5921          ||      M. Bocci, Ed., S. Bryant, Ed., D. Frost, Ed., L. Levrau, L. Berger         ||       matthew.bocci@alcatel-lucent.com, stbryant@cisco.com, danfrost@cisco.com, lieven.levrau@alcatel-lucent.com, lberger@labn.net
+#   RFC5922          ||      V. Gurbani, S. Lawrence, A. Jeffrey         ||       vkg@alcatel-lucent.com, scott-ietf@skrb.org, ajeffrey@alcatel-lucent.com
+#   RFC5923          ||      V. Gurbani, Ed., R. Mahy, B. Tate         ||       vkg@alcatel-lucent.com, rohan@ekabal.com, brett@broadsoft.com
+#   RFC5924          ||      S. Lawrence, V. Gurbani         ||       scott-ietf@skrb.org, vkg@bell-labs.com
+#   RFC5925          ||      J. Touch, A. Mankin, R. Bonica         ||       touch@isi.edu, mankin@psg.com, rbonica@juniper.net
+#   RFC5926          ||      G. Lebovitz, E. Rescorla         ||       gregory.ietf@gmail.com, ekr@rtfm.com
+#   RFC5927          ||      F. Gont         ||       fernando@gont.com.ar
+#   RFC5928          ||      M. Petit-Huguenin         ||       petithug@acm.org
+#   RFC5929          ||      J. Altman, N. Williams, L. Zhu         ||       jaltman@secure-endpoints.com, Nicolas.Williams@oracle.com, larry.zhu@microsoft.com
+#   RFC5930          ||      S. Shen, Y. Mao, NSS. Murthy         ||       shenshuo@cnnic.cn, yumao9@gmail.com, ssmurthy.nittala@freescale.com
+#   RFC5931          ||      D. Harkins, G. Zorn         ||       dharkins@arubanetworks.com, gwz@net-zen.net
+#   RFC5932          ||      A. Kato, M. Kanda, S. Kanno         ||       kato.akihiro@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno.satoru@po.ntts.co.jp
+#   RFC5933          ||      V. Dolmatov, Ed., A. Chuprina, I. Ustinov         ||       dol@cryptocom.ru, ran@cryptocom.ru, igus@cryptocom.ru
+#   RFC5934          ||      R. Housley, S. Ashmore, C. Wallace         ||       housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com
+#   RFC5935          ||      M. Ellison, B. Natale         ||       ietf@ellisonsoftware.com, rnatale@mitre.org
+#   RFC5936          ||      E. Lewis, A. Hoenes, Ed.         ||       ed.lewis@neustar.biz, ah@TR-Sys.de
+#   RFC5937          ||      S. Ashmore, C. Wallace         ||       srashmo@radium.ncsc.mil, cwallace@cygnacom.com
+#   RFC5938          ||      A. Morton, M. Chiba         ||       acmorton@att.com, mchiba@cisco.com
+#   RFC5939          ||      F. Andreasen         ||       fandreas@cisco.com
+#   RFC5940          ||      S. Turner, R. Housley         ||       turners@ieca.com, housley@vigilsec.com
+#   RFC5941          ||      D. M'Raihi, S. Boeyen, M. Grandcolas, S. Bajaj         ||       davidietf@gmail.com, sharon.boeyen@entrust.com, michael.grandcolas@hotmail.com, sbajaj@verisign.com
+#   RFC5942          ||      H. Singh, W. Beebee, E. Nordmark         ||       shemant@cisco.com, wbeebee@cisco.com, erik.nordmark@oracle.com
+#   RFC5943          ||      B. Haberman, Ed.         ||       brian@innovationslab.net
+#   RFC5944          ||      C. Perkins, Ed.         ||       charliep@computer.org
+#   RFC5945          ||      F. Le Faucheur, J. Manner, D. Wing, A. Guillou         ||       flefauch@cisco.com, jukka.manner@tkk.fi, dwing-ietf@fuggles.com, allan.guillou@sfr.com
+#   RFC5946          ||      F. Le Faucheur, J. Manner, A. Narayanan, A. Guillou, H. Malik         ||       flefauch@cisco.com, jukka.manner@tkk.fi, ashokn@cisco.com, allan.guillou@sfr.com, Hemant.Malik@airtel.in
+#   RFC5947          ||      J. Elwell, H. Kaplan         ||       john.elwell@siemens-enterprise.com, hkaplan@acmepacket.com
+#   RFC5948          ||      S. Madanapalli, S. Park, S. Chakrabarti, G. Montenegro         ||       smadanapalli@gmail.com, soohong.park@samsung.com, samitac@ipinfusion.com, gabriel.montenegro@microsoft.com
+#   RFC5949          ||      H. Yokota, K. Chowdhury, R. Koodli, B. Patil, F. Xia         ||       yokota@kddilabs.jp, kchowdhu@cisco.com, rkoodli@cisco.com, basavaraj.patil@nokia.com, xiayangsong@huawei.com
+#   RFC5950          ||      S. Mansfield, Ed., E. Gray, Ed., K. Lam, Ed.         ||       scott.mansfield@ericsson.com, eric.gray@ericsson.com, Kam.Lam@alcatel-lucent.com
+#   RFC5951          ||      K. Lam, S. Mansfield, E. Gray         ||       Kam.Lam@Alcatel-Lucent.com, Scott.Mansfield@Ericsson.com, Kam.Lam@Alcatel-Lucent.com
+#   RFC5952          ||      S. Kawamura, M. Kawashima         ||       kawamucho@mesh.ad.jp, kawashimam@vx.jp.nec.com
+#   RFC5953          ||      W. Hardaker         ||       ietf@hardakers.net
+#   RFC5954          ||      V. Gurbani, Ed., B. Carpenter, Ed., B. Tate, Ed.         ||       vkg@bell-labs.com, brian.e.carpenter@gmail.com, brett@broadsoft.com
+#   RFC5955          ||      A. Santoni         ||       adriano.santoni@actalis.it
+#   RFC5956          ||      A. Begen         ||       abegen@cisco.com
+#   RFC5957          ||      D. Karp         ||       dkarp@zimbra.com
+#   RFC5958          ||      S. Turner         ||       turners@ieca.com
+#   RFC5959          ||      S. Turner         ||       turners@ieca.com
+#   RFC5960          ||      D. Frost, Ed., S. Bryant, Ed., M. Bocci, Ed.         ||       danfrost@cisco.com, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com
+#   RFC5961          ||      A. Ramaiah, R. Stewart, M. Dalal         ||       ananth@cisco.com, randall@lakerest.net, mdalal@cisco.com
+#   RFC5962          ||      H. Schulzrinne, V. Singh, H. Tschofenig, M. Thomson         ||       hgs@cs.columbia.edu, vs2140@cs.columbia.edu, Hannes.Tschofenig@gmx.net, martin.thomson@andrew.com
+#   RFC5963          ||      R. Gagliano         ||       rogaglia@cisco.com
+#   RFC5964          ||      J. Winterbottom, M. Thomson         ||       james.winterbottom@andrew.com, martin.thomson@andrew.com
+#   RFC5965          ||      Y. Shafranovich, J. Levine, M. Kucherawy         ||       ietf@shaftek.org, standards@taugh.com, msk@cloudmark.com
+#   RFC5966          ||      R. Bellis         ||       ray.bellis@nominet.org.uk
+#   RFC5967          ||      S. Turner         ||       turners@ieca.com
+#   RFC5968          ||      J. Ott, C. Perkins         ||       jo@netlab.tkk.fi, csp@csperkins.org
+#   RFC5969          ||      W. Townsley, O. Troan         ||       mark@townsley.net, ot@cisco.com
+#   RFC5970          ||      T. Huth, J. Freimann, V. Zimmer, D. Thaler         ||       thuth@de.ibm.com, jfrei@de.ibm.com, vincent.zimmer@intel.com, dthaler@microsoft.com
+#   RFC5971          ||      H. Schulzrinne, R. Hancock         ||       hgs+nsis@cs.columbia.edu, robert.hancock@roke.co.uk
+#   RFC5972          ||      T. Tsenov, H. Tschofenig, X. Fu, Ed., C. Aoun, E. Davies         ||       tseno.tsenov@mytum.de, Hannes.Tschofenig@nsn.com, fu@cs.uni-goettingen.de, cedaoun@yahoo.fr, elwynd@dial.pipex.com
+#   RFC5973          ||      M. Stiemerling, H. Tschofenig, C. Aoun, E. Davies         ||       Martin.Stiemerling@neclab.eu, Hannes.Tschofenig@nsn.com, cedaoun@yahoo.fr, elwynd@dial.pipex.com
+#   RFC5974          ||      J. Manner, G. Karagiannis, A. McDonald         ||       jukka.manner@tkk.fi, karagian@cs.utwente.nl, andrew.mcdonald@roke.co.uk
+#   RFC5975          ||      G. Ash, Ed., A. Bader, Ed., C. Kappler, Ed., D. Oran, Ed.         ||       gash5107@yahoo.com, Attila.Bader@ericsson.com, cornelia.kappler@cktecc.de, oran@cisco.com
+#   RFC5976          ||      G. Ash, A. Morton, M. Dolly, P. Tarapore, C. Dvorak, Y. El Mghazli         ||       gash5107@yahoo.com, acmorton@att.com, mdolly@att.com, tarapore@att.com, cdvorak@att.com, yacine.el_mghazli@alcatel.fr
+#   RFC5977          ||      A. Bader, L. Westberg, G. Karagiannis, C. Kappler, T. Phelan         ||       Attila.Bader@ericsson.com, Lars.Westberg@ericsson.com, g.karagiannis@ewi.utwente.nl, cornelia.kappler@cktecc.de, tphelan@sonusnet.com
+#   RFC5978          ||      J. Manner, R. Bless, J. Loughney, E. Davies, Ed.         ||       jukka.manner@tkk.fi, bless@kit.edu, john.loughney@nokia.com, elwynd@folly.org.uk
+#   RFC5979          ||      C. Shen, H. Schulzrinne, S. Lee, J. Bang         ||       charles@cs.columbia.edu, hgs@cs.columbia.edu, sung1.lee@samsung.com, jh0278.bang@samsung.com
+#   RFC5980          ||      T. Sanda, Ed., X. Fu, S. Jeong, J. Manner, H. Tschofenig         ||       sanda.takako@jp.panasonic.com, fu@cs.uni-goettingen.de, shjeong@hufs.ac.kr, jukka.manner@tkk.fi, Hannes.Tschofenig@nsn.com
+#   RFC5981          ||      J. Manner, M. Stiemerling, H. Tschofenig, R. Bless, Ed.         ||       jukka.manner@tkk.fi, martin.stiemerling@neclab.eu, Hannes.Tschofenig@gmx.net, roland.bless@kit.edu
+#   RFC5982          ||      A. Kobayashi, Ed., B. Claise, Ed.         ||       akoba@nttv6.net, bclaise@cisco.com
+#   RFC5983          ||      R. Gellens         ||       rg+ietf@qualcomm.com
+#   RFC5984          ||      K-M. Moller         ||       kalle@tankesaft.se
+#   RFC5985          ||      M. Barnes, Ed.         ||       mary.ietf.barnes@gmail.com
+#   RFC5986          ||      M. Thomson, J. Winterbottom         ||       martin.thomson@andrew.com, james.winterbottom@andrew.com
+#   RFC5987          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC5988          ||      M. Nottingham         ||       mnot@mnot.net
+#   RFC5989          ||      A.B. Roach         ||       adam@nostrum.com
+#   RFC5990          ||      J. Randall, B. Kaliski, J. Brainard, S. Turner         ||       jdrandall@comcast.net, kaliski_burt@emc.com, jbrainard@rsa.com, turners@ieca.com
+#   RFC5991          ||      D. Thaler, S. Krishnan, J. Hoagland         ||       dthaler@microsoft.com, suresh.krishnan@ericsson.com, Jim_Hoagland@symantec.com
+#   RFC5992          ||      S. Sharikov, D. Miloshevic, J. Klensin         ||       s.shar@regtime.net, dmiloshevic@afilias.info, john-ietf@jck.com
+#   RFC5993          ||      X. Duan, S. Wang, M. Westerlund, K. Hellwig, I. Johansson         ||       duanxiaodong@chinamobile.com, wangshuaiyu@chinamobile.com, magnus.westerlund@ericsson.com, karl.hellwig@ericsson.com, ingemar.s.johansson@ericsson.com
+#   RFC5994          ||      S. Bryant, Ed., M. Morrow, G. Swallow, R. Cherukuri, T. Nadeau, N. Harrison, B. Niven-Jenkins         ||       stbryant@cisco.com, mmorrow@cisco.com, swallow@cisco.com, cherukuri@juniper.net, thomas.nadeau@huawei.com, neil.2.harrison@bt.com, ben@niven-jenkins.co.uk
+#   RFC5995          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC5996          ||      C. Kaufman, P. Hoffman, Y. Nir, P. Eronen         ||       charliek@microsoft.com, paul.hoffman@vpnc.org, ynir@checkpoint.com, pe@iki.fi
+#   RFC5997          ||      A. DeKok         ||       aland@freeradius.org
+#   RFC5998          ||      P. Eronen, H. Tschofenig, Y. Sheffer         ||       pe@iki.fi, Hannes.Tschofenig@gmx.net, yaronf.ietf@gmail.com
+#   RFC6001          ||      D. Papadimitriou, M. Vigoureux, K. Shiomoto, D. Brungard, JL. Le Roux         ||       dimitri.papadimitriou@alcatel-lucent.com, martin.vigoureux@alcatel-lucent.fr, shiomoto.kohei@lab.ntt.co.jp, dbrungard@att.com, jean-louis.leroux@rd.francetelecom.com
+#   RFC6002          ||      L. Berger, D. Fedyk         ||       lberger@labn.net, donald.fedyk@alcatel-lucent.com
+#   RFC6003          ||      D. Papadimitriou         ||       dimitri.papadimitriou@alcatel-lucent.be
+#   RFC6004          ||      L. Berger, D. Fedyk         ||       lberger@labn.net, donald.fedyk@alcatel-lucent.com
+#   RFC6005          ||      L. Berger, D. Fedyk         ||       lberger@labn.net, donald.fedyk@alcatel-lucent.com
+#   RFC6006          ||      Q. Zhao, Ed., D. King, Ed., F. Verhaeghe, T. Takeda, Z. Ali, J. Meuric         ||       qzhao@huawei.com, daniel@olddog.co.uk, fabien.verhaeghe@gmail.com, takeda.tomonori@lab.ntt.co.jp, zali@cisco.com, julien.meuric@orange-ftgroup.com
+#   RFC6007          ||      I. Nishioka, D. King         ||       i-nishioka@cb.jp.nec.com, daniel@olddog.co.uk
+#   RFC6008          ||      M. Kucherawy         ||       msk@cloudmark.com
+#   RFC6009          ||      N. Freed         ||       ned.freed@mrochek.com
+#   RFC6010          ||      R. Housley, S. Ashmore, C. Wallace         ||       housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com
+#   RFC6011          ||      S. Lawrence, Ed., J. Elwell         ||       scott-ietf@skrb.org, john.elwell@siemens-enterprise.com
+#   RFC6012          ||      J. Salowey, T. Petch, R. Gerhards, H. Feng         ||       jsalowey@cisco.com, tomSecurity@network-engineer.co.uk, rgerhards@adiscon.com, fhyfeng@gmail.com
+#   RFC6013          ||      W. Simpson         ||       William.Allen.Simpson@Gmail.com
+#   RFC6014          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC6015          ||      A. Begen         ||       abegen@cisco.com
+#   RFC6016          ||      B. Davie, F. Le Faucheur, A. Narayanan         ||       bsd@cisco.com, flefauch@cisco.com, ashokn@cisco.com
+#   RFC6017          ||      K. Meadors, Ed.         ||       kyle@drummondgroup.com
+#   RFC6018          ||      F. Baker, W. Harrop, G. Armitage         ||       fred@cisco.com, wazz@bud.cc.swin.edu.au, garmitage@swin.edu.au
+#   RFC6019          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC6020          ||      M. Bjorklund, Ed.         ||       mbj@tail-f.com
+#   RFC6021          ||      J. Schoenwaelder, Ed.         ||       j.schoenwaelder@jacobs-university.de
+#   RFC6022          ||      M. Scott, M. Bjorklund         ||       mark.scott@ericsson.com, mbj@tail-f.com
+#   RFC6023          ||      Y. Nir, H. Tschofenig, H. Deng, R. Singh         ||       ynir@checkpoint.com, Hannes.Tschofenig@gmx.net, denghui02@gmail.com, rsj@cisco.com
+#   RFC6024          ||      R. Reddy, C. Wallace         ||       r.reddy@radium.ncsc.mil, cwallace@cygnacom.com
+#   RFC6025          ||      C. Wallace, C. Gardiner         ||       cwallace@cygnacom.com, gardiner@bbn.com
+#   RFC6026          ||      R. Sparks, T. Zourzouvillys         ||       RjS@nostrum.com, theo@crazygreek.co.uk
+#   RFC6027          ||      Y. Nir         ||       ynir@checkpoint.com
+#   RFC6028          ||      G. Camarillo, A. Keranen         ||       Gonzalo.Camarillo@ericsson.com, Ari.Keranen@ericsson.com
+#   RFC6029          ||      I. Rimac, V. Hilt, M. Tomsu, V. Gurbani, E. Marocco         ||       rimac@bell-labs.com, volkerh@bell-labs.com, marco.tomsu@alcatel-lucent.com, vkg@bell-labs.com, enrico.marocco@telecomitalia.it
+#   RFC6030          ||      P. Hoyer, M. Pei, S. Machani         ||       phoyer@actividentity.com, mpei@verisign.com, smachani@diversinet.com
+#   RFC6031          ||      S. Turner, R. Housley         ||       turners@ieca.com, housley@vigilsec.com
+#   RFC6032          ||      S. Turner, R. Housley         ||       turners@ieca.com, housley@vigilsec.com
+#   RFC6033          ||      S. Turner         ||       turners@ieca.com
+#   RFC6034          ||      D. Thaler         ||       dthaler@microsoft.com
+#   RFC6035          ||      A. Pendleton, A. Clark, A. Johnston, H. Sinnreich         ||       aspen@telchemy.com, alan.d.clark@telchemy.com, alan.b.johnston@gmail.com, henry.sinnreich@gmail.com
+#   RFC6036          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, shengjiang@huawei.com
+#   RFC6037          ||      E. Rosen, Ed., Y. Cai, Ed., IJ. Wijnands         ||       erosen@cisco.com, ycai@cisco.com, ice@cisco.com
+#   RFC6038          ||      A. Morton, L. Ciavattone         ||       acmorton@att.com, lencia@att.com
+#   RFC6039          ||      V. Manral, M. Bhatia, J. Jaeggli, R. White         ||       vishwas@ipinfusion.com, manav.bhatia@alcatel-lucent.com, joel.jaeggli@nokia.com, riw@cisco.com
+#   RFC6040          ||      B. Briscoe         ||       bob.briscoe@bt.com
+#   RFC6041          ||      A. Crouch, H. Khosravi, A. Doria, Ed., X. Wang, K. Ogawa         ||       alan.crouch@intel.com, hormuzd.m.khosravi@intel.com, avri@acm.org, carly.wang@huawei.com, ogawa.kentaro@lab.ntt.co.jp
+#   RFC6042          ||      A. Keromytis         ||       angelos@cs.columbia.edu
+#   RFC6043          ||      J. Mattsson, T. Tian         ||       john.mattsson@ericsson.com, tian.tian1@zte.com.cn
+#   RFC6044          ||      M. Mohali         ||       marianne.mohali@orange-ftgroup.com
+#   RFC6045          ||      K. Moriarty         ||       Moriarty_Kathleen@EMC.com
+#   RFC6046          ||      K. Moriarty, B. Trammell         ||       Moriarty_Kathleen@EMC.com, trammell@tik.ee.ethz.ch
+#   RFC6047          ||      A. Melnikov, Ed.         ||       Alexey.Melnikov@isode.com
+#   RFC6048          ||      J. Elie         ||       julien@trigofacile.com
+#   RFC6049          ||      A. Morton, E. Stephan         ||       acmorton@att.com, emile.stephan@orange-ftgroup.com
+#   RFC6050          ||      K. Drage         ||       drage@alcatel-lucent.com
+#   RFC6051          ||      C. Perkins, T. Schierl         ||       csp@csperkins.org, ts@thomas-schierl.de
+#   RFC6052          ||      C. Bao, C. Huitema, M. Bagnulo, M. Boucadair, X. Li         ||       congxiao@cernet.edu.cn, huitema@microsoft.com, marcelo@it.uc3m.es, mohamed.boucadair@orange-ftgroup.com, xing@cernet.edu.cn
+#   RFC6053          ||      E. Haleplidis, K. Ogawa, W. Wang, J. Hadi Salim         ||       ehalep@ece.upatras.gr, ogawa.kentaro@lab.ntt.co.jp, wmwang@mail.zjgsu.edu.cn, hadi@mojatatu.com
+#   RFC6054          ||      D. McGrew, B. Weis         ||       mcgrew@cisco.com, bew@cisco.com
+#   RFC6055          ||      D. Thaler, J. Klensin, S. Cheshire         ||       dthaler@microsoft.com, john+ietf@jck.com, cheshire@apple.com
+#   RFC6056          ||      M. Larsen, F. Gont         ||       michael.larsen@tieto.com, fernando@gont.com.ar
+#   RFC6057          ||      C. Bastian, T. Klieber, J. Livingood, J. Mills, R. Woundy         ||       chris_bastian@cable.comcast.com, tom_klieber@cable.comcast.com, jason_livingood@cable.comcast.com, jim_mills@cable.comcast.com, richard_woundy@cable.comcast.com
+#   RFC6058          ||      M. Liebsch, Ed., A. Muhanna, O. Blume         ||       marco.liebsch@neclab.eu, ahmad.muhanna@ericsson.com, oliver.blume@alcatel-lucent.de
+#   RFC6059          ||      S. Krishnan, G. Daley         ||       suresh.krishnan@ericsson.com, hoskuld@hotmail.com
+#   RFC6060          ||      D. Fedyk, H. Shah, N. Bitar, A. Takacs         ||       donald.fedyk@alcatel-lucent.com, hshah@ciena.com, nabil.n.bitar@verizon.com, attila.takacs@ericsson.com
+#   RFC6061          ||      B. Rosen         ||       br@brianrosen.net
+#   RFC6062          ||      S. Perreault, Ed., J. Rosenberg         ||       simon.perreault@viagenie.ca, jdrosen@jdrosen.net
+#   RFC6063          ||      A. Doherty, M. Pei, S. Machani, M. Nystrom         ||       andrea.doherty@rsa.com, mpei@verisign.com, smachani@diversinet.com, mnystrom@microsoft.com
+#   RFC6064          ||      M. Westerlund, P. Frojdh         ||       magnus.westerlund@ericsson.com, per.frojdh@ericsson.com
+#   RFC6065          ||      K. Narayan, D. Nelson, R. Presuhn, Ed.         ||       kaushik_narayan@yahoo.com, d.b.nelson@comcast.net, randy_presuhn@mindspring.com
+#   RFC6066          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC6067          ||      M. Davis, A. Phillips, Y. Umaoka         ||       mark@macchiato.com, addison@lab126.com, yoshito_umaoka@us.ibm.com
+#   RFC6068          ||      M. Duerst, L. Masinter, J. Zawinski         ||       duerst@it.aoyama.ac.jp, LMM@acm.org, jwz@jwz.org
+#   RFC6069          ||      A. Zimmermann, A. Hannemann         ||       zimmermann@cs.rwth-aachen.de, hannemann@nets.rwth-aachen.de
+#   RFC6070          ||      S. Josefsson         ||       simon@josefsson.org
+#   RFC6071          ||      S. Frankel, S. Krishnan         ||       sheila.frankel@nist.gov, suresh.krishnan@ericsson.com
+#   RFC6072          ||      C. Jennings, J. Fischl, Ed.         ||       fluffy@cisco.com, jason.fischl@skype.net
+#   RFC6073          ||      L. Martini, C. Metz, T. Nadeau, M. Bocci, M. Aissaoui         ||       lmartini@cisco.com, chmetz@cisco.com, tnadeau@lucidvision.com, matthew.bocci@alcatel-lucent.co.uk, mustapha.aissaoui@alcatel-lucent.com
+#   RFC6074          ||      E. Rosen, B. Davie, V. Radoaca, W. Luo         ||       erosen@cisco.com, bsd@cisco.com, vasile.radoaca@alcatel-lucent.com, luo@weiluo.net
+#   RFC6075          ||      D. Cridland         ||       dave.cridland@isode.com
+#   RFC6076          ||      D. Malas, A. Morton         ||       d.malas@cablelabs.com, acmorton@att.com
+#   RFC6077          ||      D. Papadimitriou, Ed., M. Welzl, M. Scharf, B. Briscoe         ||       dimitri.papadimitriou@alcatel-lucent.be, michawe@ifi.uio.no, michael.scharf@googlemail.com, bob.briscoe@bt.com
+#   RFC6078          ||      G. Camarillo, J. Melen         ||       Gonzalo.Camarillo@ericsson.com, Jan.Melen@ericsson.com
+#   RFC6079          ||      G. Camarillo, P. Nikander, J. Hautakorpi, A. Keranen, A. Johnston         ||       Gonzalo.Camarillo@ericsson.com, Pekka.Nikander@ericsson.com, Jani.Hautakorpi@ericsson.com, Ari.Keranen@ericsson.com, alan.b.johnston@gmail.com
+#   RFC6080          ||      D. Petrie, S. Channabasappa, Ed.         ||       dan.ietf@SIPez.com, sumanth@cablelabs.com
+#   RFC6081          ||      D. Thaler         ||       dthaler@microsoft.com
+#   RFC6082          ||      K. Whistler, G. Adams, M. Duerst, R. Presuhn, Ed., J. Klensin         ||       kenw@sybase.com, glenn@skynav.com, duerst@it.aoyama.ac.jp, randy_presuhn@mindspring.com, john+ietf@jck.com
+#   RFC6083          ||      M. Tuexen, R. Seggelmann, E. Rescorla         ||       tuexen@fh-muenster.de, seggelmann@fh-muenster.de, ekr@networkresonance.com
+#   RFC6084          ||      X. Fu, C. Dickmann, J. Crowcroft         ||       fu@cs.uni-goettingen.de, mail@christian-dickmann.de, jon.crowcroft@cl.cam.ac.uk
+#   RFC6085          ||      S. Gundavelli, M. Townsley, O. Troan, W. Dec         ||       sgundave@cisco.com, townsley@cisco.com, ot@cisco.com, wdec@cisco.com
+#   RFC6086          ||      C. Holmberg, E. Burger, H. Kaplan         ||       christer.holmberg@ericsson.com, eburger@standardstrack.com, hkaplan@acmepacket.com
+#   RFC6087          ||      A. Bierman         ||       andy@yumaworks.com
+#   RFC6088          ||      G. Tsirtsis, G. Giarreta, H. Soliman, N. Montavont         ||       tsirtsis@qualcomm.com, gerardog@qualcomm.com, hesham@elevatemobile.com, nicolas.montavont@telecom-bretagne.eu
+#   RFC6089          ||      G. Tsirtsis, H. Soliman, N. Montavont, G. Giaretta, K. Kuladinithi         ||       tsirtsis@qualcomm.com, hesham@elevatemobile.com, nicolas.montavont@telecom-bretagne.eu, gerardog@qualcomm.com, koo@comnets.uni-bremen.de
+#   RFC6090          ||      D. McGrew, K. Igoe, M. Salter         ||       mcgrew@cisco.com, kmigoe@nsa.gov, msalter@restarea.ncsc.mil
+#   RFC6091          ||      N. Mavrogiannopoulos, D. Gillmor         ||       nikos.mavrogiannopoulos@esat.kuleuven.be, dkg@fifthhorseman.net
+#   RFC6092          ||      J. Woodyatt, Ed.         ||       jhw@apple.com
+#   RFC6093          ||      F. Gont, A. Yourtchenko         ||       fernando@gont.com.ar, ayourtch@cisco.com
+#   RFC6094          ||      M. Bhatia, V. Manral         ||       manav.bhatia@alcatel-lucent.com, vishwas@ipinfusion.com
+#   RFC6095          ||      B. Linowski, M. Ersue, S. Kuryla         ||       bernd.linowski.ext@nsn.com, mehmet.ersue@nsn.com, s.kuryla@gmail.com
+#   RFC6096          ||      M. Tuexen, R. Stewart         ||       tuexen@fh-muenster.de, randall@lakerest.net
+#   RFC6097          ||      J. Korhonen, V. Devarapalli         ||       jouni.nospam@gmail.com, dvijay@gmail.com
+#   RFC6098          ||      H. Deng, H. Levkowetz, V. Devarapalli, S. Gundavelli, B. Haley         ||       denghui02@gmail.com, henrik@levkowetz.com, dvijay@gmail.com, sgundave@cisco.com, brian.haley@hp.com
+#   RFC6101          ||      A. Freier, P. Karlton, P. Kocher         ||       nikos.mavrogiannopoulos@esat.kuleuven.be
+#   RFC6104          ||      T. Chown, S. Venaas         ||       tjc@ecs.soton.ac.uk, stig@cisco.com
+#   RFC6105          ||      E. Levy-Abegnoli, G. Van de Velde, C. Popoviciu, J. Mohacsi         ||       elevyabe@cisco.com, gunter@cisco.com, chip@technodyne.com, mohacsi@niif.hu
+#   RFC6106          ||      J. Jeong, S. Park, L. Beloeil, S. Madanapalli         ||       pjeong@brocade.com, soohong.park@samsung.com, luc.beloeil@orange-ftgroup.com, smadanapalli@gmail.com
+#   RFC6107          ||      K. Shiomoto, Ed., A. Farrel, Ed.         ||       shiomoto.kohei@lab.ntt.co.jp, adrian@olddog.co.uk
+#   RFC6108          ||      C. Chung, A. Kasyanov, J. Livingood, N. Mody, B. Van Lieu         ||       chae_chung@cable.comcast.com, alexander_kasyanov@cable.comcast.com, jason_livingood@cable.comcast.com, nirmal_mody@cable.comcast.com, brian@vanlieu.net
+#   RFC6109          ||      C. Petrucci, F. Gennai, A. Shahin, A. Vinciarelli         ||       petrucci@digitpa.gov.it, francesco.gennai@isti.cnr.it, alba.shahin@isti.cnr.it, alessandro.vinciarelli@gmail.com
+#   RFC6110          ||      L. Lhotka, Ed.         ||       ladislav@lhotka.name
+#   RFC6111          ||      L. Zhu         ||       lzhu@microsoft.com
+#   RFC6112          ||      L. Zhu, P. Leach, S. Hartman         ||       larry.zhu@microsoft.com, paulle@microsoft.com, hartmans-ietf@mit.edu
+#   RFC6113          ||      S. Hartman, L. Zhu         ||       hartmans-ietf@mit.edu, larry.zhu@microsoft.com
+#   RFC6114          ||      M. Katagi, S. Moriai         ||       Masanobu.Katagi@jp.sony.com, clefia-q@jp.sony.com
+#   RFC6115          ||      T. Li, Ed.         ||       tony.li@tony.li
+#   RFC6116          ||      S. Bradner, L. Conroy, K. Fujiwara         ||       sob@harvard.edu, lconroy@insensate.co.uk, fujiwara@jprs.co.jp
+#   RFC6117          ||      B. Hoeneisen, A. Mayrhofer, J. Livingood         ||       bernie@ietf.hoeneisen.ch, alexander.mayrhofer@enum.at, jason_livingood@cable.comcast.com
+#   RFC6118          ||      B. Hoeneisen, A. Mayrhofer         ||       bernie@ietf.hoeneisen.ch, alexander.mayrhofer@enum.at
+#   RFC6119          ||      J. Harrison, J. Berger, M. Bartlett         ||       jon.harrison@metaswitch.com, jon.berger@metaswitch.com, mike.bartlett@metaswitch.com
+#   RFC6120          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC6121          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC6122          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC6123          ||      A. Farrel         ||       adrian@olddog.co.uk
+#   RFC6124          ||      Y. Sheffer, G. Zorn, H. Tschofenig, S. Fluhrer         ||       yaronf.ietf@gmail.com, gwz@net-zen.net, Hannes.Tschofenig@gmx.net, sfluhrer@cisco.com
+#   RFC6125          ||      P. Saint-Andre, J. Hodges         ||       ietf@stpeter.im, Jeff.Hodges@PayPal.com
+#   RFC6126          ||      J. Chroboczek         ||       jch@pps.jussieu.fr
+#   RFC6127          ||      J. Arkko, M. Townsley         ||       jari.arkko@piuha.net, townsley@cisco.com
+#   RFC6128          ||      A. Begen         ||       abegen@cisco.com
+#   RFC6129          ||      L. Romary, S. Lundberg         ||       laurent.romary@inria.fr, slu@kb.dk
+#   RFC6130          ||      T. Clausen, C. Dearlove, J. Dean         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com, jdean@itd.nrl.navy.mil
+#   RFC6131          ||      R. George, B. Leiba         ||       robinsgv@gmail.com, barryleiba@computer.org
+#   RFC6132          ||      R. George, B. Leiba         ||       robinsgv@gmail.com, barryleiba@computer.org
+#   RFC6133          ||      R. George, B. Leiba, A. Melnikov         ||       robinsgv@gmail.com, barryleiba@computer.org, Alexey.Melnikov@isode.com
+#   RFC6134          ||      A. Melnikov, B. Leiba         ||       Alexey.Melnikov@isode.com, barryleiba@computer.org
+#   RFC6135          ||      C. Holmberg, S. Blau         ||       christer.holmberg@ericsson.com, staffan.blau@ericsson.com
+#   RFC6136          ||      A. Sajassi, Ed., D. Mohan, Ed.         ||       sajassi@cisco.com, mohand@nortel.com
+#   RFC6137          ||      D. Zisiadis, Ed., S. Kopsidas, Ed., M. Tsavli, Ed., G. Cessieux, Ed.         ||       dzisiadis@iti.gr, spyros@uth.gr, sttsavli@uth.gr, Guillaume.Cessieux@cc.in2p3.fr
+#   RFC6138          ||      S. Kini, Ed., W. Lu, Ed.         ||       sriganesh.kini@ericsson.com, wenhu.lu@ericsson.com
+#   RFC6139          ||      S. Russert, Ed., E. Fleischman, Ed., F. Templin, Ed.         ||       russerts@hotmail.com, eric.fleischman@boeing.com, fltemplin@acm.org
+#   RFC6140          ||      A.B. Roach         ||       adam@nostrum.com
+#   RFC6141          ||      G. Camarillo, Ed., C. Holmberg, Y. Gao         ||       Gonzalo.Camarillo@ericsson.com, Christer.Holmberg@ericsson.com, gao.yang2@zte.com.cn
+#   RFC6142          ||      A. Moise, J. Brodkin         ||       avy@fdos.ca, jonathan.brodkin@fdos.ca
+#   RFC6143          ||      T. Richardson, J. Levine         ||       standards@realvnc.com, standards@taugh.com
+#   RFC6144          ||      F. Baker, X. Li, C. Bao, K. Yin         ||       fred@cisco.com, xing@cernet.edu.cn, congxiao@cernet.edu.cn, kyin@cisco.com
+#   RFC6145          ||      X. Li, C. Bao, F. Baker         ||       xing@cernet.edu.cn, congxiao@cernet.edu.cn, fred@cisco.com
+#   RFC6146          ||      M. Bagnulo, P. Matthews, I. van Beijnum         ||       marcelo@it.uc3m.es, philip_matthews@magma.ca, iljitsch@muada.com
+#   RFC6147          ||      M. Bagnulo, A. Sullivan, P. Matthews, I. van Beijnum         ||       marcelo@it.uc3m.es, ajs@shinkuro.com, philip_matthews@magma.ca, iljitsch@muada.com
+#   RFC6148          ||      P. Kurapati, R. Desetti, B. Joshi         ||       kurapati@juniper.net, ramakrishnadtv@infosys.com, bharat_joshi@infosys.com
+#   RFC6149          ||      S. Turner, L. Chen         ||       turners@ieca.com, lily.chen@nist.gov
+#   RFC6150          ||      S. Turner, L. Chen         ||       turners@ieca.com, lily.chen@nist.gov
+#   RFC6151          ||      S. Turner, L. Chen         ||       turners@ieca.com, lily.chen@nist.gov
+#   RFC6152          ||      J. Klensin, N. Freed, M. Rose, D. Crocker, Ed.         ||       john+ietf@jck.com, ned.freed@mrochek.com, mrose17@gmail.com, dcrocker@bbiw.net
+#   RFC6153          ||      S. Das, G. Bajko         ||       subir@research.Telcordia.com, gabor.bajko@nokia.com
+#   RFC6154          ||      B. Leiba, J. Nicolson         ||       barryleiba@computer.org, nicolson@google.com
+#   RFC6155          ||      J. Winterbottom, M. Thomson, H. Tschofenig, R. Barnes         ||       james.winterbottom@andrew.com, martin.thomson@andrew.com, Hannes.Tschofenig@gmx.net, rbarnes@bbn.com
+#   RFC6156          ||      G. Camarillo, O. Novo, S. Perreault, Ed.         ||       Gonzalo.Camarillo@ericsson.com, Oscar.Novo@ericsson.com, simon.perreault@viagenie.ca
+#   RFC6157          ||      G. Camarillo, K. El Malki, V. Gurbani         ||       Gonzalo.Camarillo@ericsson.com, karim@athonet.com, vkg@bell-labs.com
+#   RFC6158          ||      A. DeKok, Ed., G. Weber         ||       aland@freeradius.org, gdweber@gmail.com
+#   RFC6159          ||      T. Tsou, G. Zorn, T. Taylor, Ed.         ||       tena@huawei.com, gwz@net-zen.net, tom.taylor.stds@gmail.com
+#   RFC6160          ||      S. Turner         ||       turners@ieca.com
+#   RFC6161          ||      S. Turner         ||       turners@ieca.com
+#   RFC6162          ||      S. Turner         ||       turners@ieca.com
+#   RFC6163          ||      Y. Lee, Ed., G. Bernstein, Ed., W. Imajuku         ||       ylee@huawei.com, gregb@grotto-networking.com, imajuku.wataru@lab.ntt.co.jp
+#   RFC6164          ||      M. Kohno, B. Nitzan, R. Bush, Y. Matsuzaki, L. Colitti, T. Narten         ||       mkohno@juniper.net, nitzan@juniper.net, randy@psg.com, maz@iij.ad.jp, lorenzo@google.com, narten@us.ibm.com
+#   RFC6165          ||      A. Banerjee, D. Ward         ||       ayabaner@cisco.com, dward@juniper.net
+#   RFC6166          ||      S. Venaas         ||       stig@cisco.com
+#   RFC6167          ||      M. Phillips, P. Adams, D. Rokicki, E. Johnson         ||       m8philli@uk.ibm.com, phil_adams@us.ibm.com, derek.rokicki@softwareag.com, eric@tibco.com
+#   RFC6168          ||      W. Hardaker         ||       ietf@hardakers.net
+#   RFC6169          ||      S. Krishnan, D. Thaler, J. Hoagland         ||       suresh.krishnan@ericsson.com, dthaler@microsoft.com, Jim_Hoagland@symantec.com
+#   RFC6170          ||      S. Santesson, R. Housley, S. Bajaj, L. Rosenthol         ||       sts@aaa-sec.com, housley@vigilsec.com, siddharthietf@gmail.com, leonardr@adobe.com
+#   RFC6171          ||      K. Zeilenga         ||       Kurt.Zeilenga@Isode.COM
+#   RFC6172          ||      D. Black, D. Peterson         ||       david.black@emc.com, david.peterson@brocade.com
+#   RFC6173          ||      P. Venkatesen, Ed.         ||       prakashvn@hcl.com
+#   RFC6174          ||      E. Juskevicius         ||       edj.etc@gmail.com
+#   RFC6175          ||      E. Juskevicius         ||       edj.etc@gmail.com
+#   RFC6176          ||      S. Turner, T. Polk         ||       turners@ieca.com, tim.polk@nist.gov
+#   RFC6177          ||      T. Narten, G. Huston, L. Roberts         ||       narten@us.ibm.com, gih@apnic.net, lea.roberts@stanford.edu
+#   RFC6178          ||      D. Smith, J. Mullooly, W. Jaeger, T. Scholl         ||       djsmith@cisco.com, jmullool@cisco.com, wjaeger@att.com, tscholl@nlayer.net
+#   RFC6179          ||      F. Templin, Ed.         ||       fltemplin@acm.org
+#   RFC6180          ||      J. Arkko, F. Baker         ||       jari.arkko@piuha.net, fred@cisco.com
+#   RFC6181          ||      M. Bagnulo         ||       marcelo@it.uc3m.es
+#   RFC6182          ||      A. Ford, C. Raiciu, M. Handley, S. Barre, J. Iyengar         ||       alan.ford@roke.co.uk, c.raiciu@cs.ucl.ac.uk, m.handley@cs.ucl.ac.uk, sebastien.barre@uclouvain.be, jiyengar@fandm.edu
+#   RFC6183          ||      A. Kobayashi, B. Claise, G. Muenz, K. Ishibashi         ||       akoba@orange.plala.or.jp, bclaise@cisco.com, muenz@net.in.tum.de, ishibashi.keisuke@lab.ntt.co.jp
+#   RFC6184          ||      Y.-K. Wang, R. Even, T. Kristensen, R. Jesup         ||       yekuiwang@huawei.com, even.roni@huawei.com, tom.kristensen@tandberg.com, rjesup@wgate.com
+#   RFC6185          ||      T. Kristensen, P. Luthi         ||       tom.kristensen@tandberg.com, patrick.luthi@tandberg.com
+#   RFC6186          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC6187          ||      K. Igoe, D. Stebila         ||       kmigoe@nsa.gov, douglas@stebila.ca
+#   RFC6188          ||      D. McGrew         ||       mcgrew@cisco.com
+#   RFC6189          ||      P. Zimmermann, A. Johnston, Ed., J. Callas         ||       prz@mit.edu, alan.b.johnston@gmail.com, jon@callas.org
+#   RFC6190          ||      S. Wenger, Y.-K. Wang, T. Schierl, A. Eleftheriadis         ||       stewe@stewe.org, yekui.wang@huawei.com, ts@thomas-schierl.de, alex@vidyo.com
+#   RFC6191          ||      F. Gont         ||       fernando@gont.com.ar
+#   RFC6192          ||      D. Dugal, C. Pignataro, R. Dunn         ||       dave@juniper.net, cpignata@cisco.com, rodunn@cisco.com
+#   RFC6193          ||      M. Saito, D. Wing, M. Toyama         ||       ma.saito@nttv6.jp, dwing-ietf@fuggles.com, toyama.masashi@lab.ntt.co.jp
+#   RFC6194          ||      T. Polk, L. Chen, S. Turner, P. Hoffman         ||       tim.polk@nist.gov, lily.chen@nist.gov, turners@ieca.com, paul.hoffman@vpnc.org
+#   RFC6195          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC6196          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
+#   RFC6197          ||      K. Wolf         ||       karlheinz.wolf@nic.at
+#   RFC6198          ||      B. Decraene, P. Francois, C. Pelsser, Z. Ahmad, A.J. Elizondo Armengol, T. Takeda         ||       bruno.decraene@orange-ftgroup.com, francois@info.ucl.ac.be, cristel@iij.ad.jp, zubair.ahmad@orange-ftgroup.com, ajea@tid.es, takeda.tomonori@lab.ntt.co.jp
+#   RFC6201          ||      R. Asati, C. Pignataro, F. Calabria, C. Olvera         ||       rajiva@cisco.com, cpignata@cisco.com, fcalabri@cisco.com, cesar.olvera@consulintel.es
+#   RFC6202          ||      S. Loreto, P. Saint-Andre, S. Salsano, G. Wilkins         ||       salvatore.loreto@ericsson.com, ietf@stpeter.im, stefano.salsano@uniroma2.it, gregw@webtide.com
+#   RFC6203          ||      T. Sirainen         ||       tss@iki.fi
+#   RFC6204          ||      H. Singh, W. Beebee, C. Donley, B. Stark, O. Troan, Ed.         ||       shemant@cisco.com, wbeebee@cisco.com, c.donley@cablelabs.com, barbara.stark@att.com, ot@cisco.com
+#   RFC6205          ||      T. Otani, Ed., D. Li, Ed.         ||       tm-otani@kddi.com, danli@huawei.com
+#   RFC6206          ||      P. Levis, T. Clausen, J. Hui, O. Gnawali, J. Ko         ||       pal@cs.stanford.edu, T.Clausen@computer.org, jhui@archrock.com, gnawali@cs.stanford.edu, jgko@cs.jhu.edu
+#   RFC6207          ||      R. Denenberg, Ed.         ||       rden@loc.gov
+#   RFC6208          ||      K. Sankar, Ed., A. Jones         ||       ksankar@cisco.com, arnold.jones@snia.org
+#   RFC6209          ||      W. Kim, J. Lee, J. Park, D. Kwon         ||       whkim5@ensec.re.kr, jklee@ensec.re.kr, jhpark@ensec.re.kr, ds_kwon@ensec.re.kr
+#   RFC6210          ||      J. Schaad         ||       ietf@augustcellars.com
+#   RFC6211          ||      J. Schaad         ||       ietf@augustcellars.com
+#   RFC6212          ||      M. Kucherawy         ||       msk@cloudmark.com
+#   RFC6213          ||      C. Hopps, L. Ginsberg         ||       chopps@cisco.com, ginsberg@cisco.com
+#   RFC6214          ||      B. Carpenter, R. Hinden         ||       brian.e.carpenter@gmail.com, bob.hinden@gmail.com
+#   RFC6215          ||      M. Bocci, L. Levrau, D. Frost         ||       matthew.bocci@alcatel-lucent.com, lieven.levrau@alcatel-lucent.com, danfrost@cisco.com
+#   RFC6216          ||      C. Jennings, K. Ono, R. Sparks, B. Hibbard, Ed.         ||       fluffy@cisco.com, kumiko@cs.columbia.edu, Robert.Sparks@tekelec.com, Brian.Hibbard@tekelec.com
+#   RFC6217          ||      T. Ritter         ||       tom@ritter.vg
+#   RFC6218          ||      G. Zorn, T. Zhang, J. Walker, J. Salowey         ||       gwz@net-zen.net, tzhang@advistatech.com, jesse.walker@intel.com, jsalowey@cisco.com
+#   RFC6219          ||      X. Li, C. Bao, M. Chen, H. Zhang, J. Wu         ||       xing@cernet.edu.cn, congxiao@cernet.edu.cn, fibrib@gmail.com, neilzh@gmail.com, jianping@cernet.edu.cn
+#   RFC6220          ||      D. McPherson, Ed., O. Kolkman, Ed., J. Klensin, Ed., G. Huston, Ed., Internet Architecture Board         ||       dmcpherson@verisign.com, olaf@NLnetLabs.nl, john+ietf@jck.com, gih@apnic.net
+#   RFC6221          ||      D. Miles, Ed., S. Ooghe, W. Dec, S. Krishnan, A. Kavanagh         ||       david.miles@alcatel-lucent.com, sven.ooghe@alcatel-lucent.com, wdec@cisco.com, suresh.krishnan@ericsson.com, alan.kavanagh@ericsson.com
+#   RFC6222          ||      A. Begen, C. Perkins, D. Wing         ||       abegen@cisco.com, csp@csperkins.org, dwing-ietf@fuggles.com
+#   RFC6223          ||      C. Holmberg         ||       christer.holmberg@ericsson.com
+#   RFC6224          ||      T. Schmidt, M. Waehlisch, S. Krishnan         ||       schmidt@informatik.haw-hamburg.de, mw@link-lab.net, suresh.krishnan@ericsson.com
+#   RFC6225          ||      J. Polk, M. Linsner, M. Thomson, B. Aboba, Ed.         ||       jmpolk@cisco.com, marc.linsner@cisco.com, martin.thomson@andrew.com, bernard_aboba@hotmail.com
+#   RFC6226          ||      B. Joshi, A. Kessler, D. McWalter         ||       bharat_joshi@infosys.com, kessler@cisco.com, david@mcwalter.eu
+#   RFC6227          ||      T. Li, Ed.         ||       tli@cisco.com
+#   RFC6228          ||      C. Holmberg         ||       christer.holmberg@ericsson.com
+#   RFC6229          ||      J. Strombergson, S. Josefsson         ||       joachim@secworks.se, simon@josefsson.org
+#   RFC6230          ||      C. Boulton, T. Melanchuk, S. McGlashan         ||       chris@ns-technologies.com, timm@rainwillow.com, smcg.stds01@mcglashan.org
+#   RFC6231          ||      S. McGlashan, T. Melanchuk, C. Boulton         ||       smcg.stds01@mcglashan.org, timm@rainwillow.com, chris@ns-technologies.com
+#   RFC6232          ||      F. Wei, Y. Qin, Z. Li, T. Li, J. Dong         ||       weifang@chinamobile.com, qinyue@chinamobile.com, lizhenqiang@chinamobile.com, tony.li@tony.li, dongjie_dj@huawei.com
+#   RFC6233          ||      T. Li, L. Ginsberg         ||       tony.li@tony.li, ginsberg@cisco.com
+#   RFC6234          ||      D. Eastlake 3rd, T. Hansen         ||       d3e3e3@gmail.com, tony+shs@maillennium.att.com
+#   RFC6235          ||      E. Boschi, B. Trammell         ||       boschie@tik.ee.ethz.ch, trammell@tik.ee.ethz.ch
+#   RFC6236          ||      I. Johansson, K. Jung         ||       ingemar.s.johansson@ericsson.com, kyunghun.jung@samsung.com
+#   RFC6237          ||      B. Leiba, A. Melnikov         ||       barryleiba@computer.org, Alexey.Melnikov@isode.com
+#   RFC6238          ||      D. M'Raihi, S. Machani, M. Pei, J. Rydell         ||       davidietf@gmail.com, smachani@diversinet.com, Mingliang_Pei@symantec.com, johanietf@gmail.com
+#   RFC6239          ||      K. Igoe         ||       kmigoe@nsa.gov
+#   RFC6240          ||      D. Zelig, Ed., R. Cohen, Ed., T. Nadeau, Ed.         ||       david_zelig@pmc-sierra.com, ronc@resolutenetworks.com, Thomas.Nadeau@ca.com
+#   RFC6241          ||      R. Enns, Ed., M. Bjorklund, Ed., J. Schoenwaelder, Ed., A. Bierman, Ed.         ||       rob.enns@gmail.com, mbj@tail-f.com, j.schoenwaelder@jacobs-university.de, andy@yumaworks.com
+#   RFC6242          ||      M. Wasserman         ||       mrw@painless-security.com
+#   RFC6243          ||      A. Bierman, B. Lengyel         ||       andy@yumaworks.com, balazs.lengyel@ericsson.com
+#   RFC6244          ||      P. Shafer         ||       phil@juniper.net
+#   RFC6245          ||      P. Yegani, K. Leung, A. Lior, K. Chowdhury, J. Navali         ||       pyegani@juniper.net, kleung@cisco.com, avi@bridgewatersystems.com, kchowdhu@cisco.com, jnavali@cisco.com
+#   RFC6246          ||      A. Sajassi, Ed., F. Brockners, D. Mohan, Ed., Y. Serbest         ||       sajassi@cisco.com, fbrockne@cisco.com, dinmohan@hotmail.com, yetik_serbest@labs.att.com
+#   RFC6247          ||      L. Eggert         ||       lars.eggert@nokia.com
+#   RFC6248          ||      A. Morton         ||       acmorton@att.com
+#   RFC6249          ||      A. Bryan, N. McNab, T. Tsujikawa, P. Poeml, H. Nordstrom         ||       anthonybryan@gmail.com, neil@nabber.org, tatsuhiro.t@gmail.com, peter@poeml.de, henrik@henriknordstrom.net
+#   RFC6250          ||      D. Thaler         ||       dthaler@microsoft.com
+#   RFC6251          ||      S. Josefsson         ||       simon@josefsson.org
+#   RFC6252          ||      A. Dutta, Ed., V. Fajardo, Y. Ohba, K. Taniuchi, H. Schulzrinne         ||       ashutosh.dutta@ieee.org, vf0213@gmail.com, yoshihiro.ohba@toshiba.co.jp, kenichi.taniuchi@toshiba.co.jp, hgs@cs.columbia.edu
+#   RFC6253          ||      T. Heer, S. Varjonen         ||       heer@cs.rwth-aachen.de, samu.varjonen@hiit.fi
+#   RFC6254          ||      M. McFadden         ||       mark.mcfadden@icann.org
+#   RFC6255          ||      M. Blanchet         ||       Marc.Blanchet@viagenie.ca
+#   RFC6256          ||      W. Eddy, E. Davies         ||       wes@mti-systems.com, elwynd@folly.org.uk
+#   RFC6257          ||      S. Symington, S. Farrell, H. Weiss, P. Lovell         ||       susan@mitre.org, stephen.farrell@cs.tcd.ie, howard.weiss@sparta.com, dtnbsp@gmail.com
+#   RFC6258          ||      S. Symington         ||       susan@mitre.org
+#   RFC6259          ||      S. Symington         ||       susan@mitre.org
+#   RFC6260          ||      S. Burleigh         ||       Scott.C.Burleigh@jpl.nasa.gov
+#   RFC6261          ||      A. Keranen         ||       ari.keranen@ericsson.com
+#   RFC6262          ||      S. Ikonin         ||       ikonin@spiritdsp.com
+#   RFC6263          ||      X. Marjou, A. Sollaud         ||       xavier.marjou@orange-ftgroup.com, aurelien.sollaud@orange-ftgroup.com
+#   RFC6264          ||      S. Jiang, D. Guo, B. Carpenter         ||       jiangsheng@huawei.com, guoseu@huawei.com, brian.e.carpenter@gmail.com
+#   RFC6265          ||      A. Barth         ||       abarth@eecs.berkeley.edu
+#   RFC6266          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC6267          ||      V. Cakulev, G. Sundaram         ||       violeta.cakulev@alcatel-lucent.com, ganesh.sundaram@alcatel-lucent.com
+#   RFC6268          ||      J. Schaad, S. Turner         ||       ietf@augustcellars.com, turners@ieca.com
+#   RFC6269          ||      M. Ford, Ed., M. Boucadair, A. Durand, P. Levis, P. Roberts         ||       ford@isoc.org, mohamed.boucadair@orange-ftgroup.com, adurand@juniper.net, pierre.levis@orange-ftgroup.com, roberts@isoc.org
+#   RFC6270          ||      M. Yevstifeyev         ||       evnikita2@gmail.com
+#   RFC6271          ||      J-F. Mule         ||       jf.mule@cablelabs.com
+#   RFC6272          ||      F. Baker, D. Meyer         ||       fred@cisco.com, dmm@cisco.com
+#   RFC6273          ||      A. Kukec, S. Krishnan, S. Jiang         ||       ana.kukec@fer.hr, suresh.krishnan@ericsson.com, jiangsheng@huawei.com
+#   RFC6274          ||      F. Gont         ||       fernando@gont.com.ar
+#   RFC6275          ||      C. Perkins, Ed., D. Johnson, J. Arkko         ||       charliep@computer.org, dbj@cs.rice.edu, jari.arkko@ericsson.com
+#   RFC6276          ||      R. Droms, P. Thubert, F. Dupont, W. Haddad, C. Bernardos         ||       rdroms@cisco.com, pthubert@cisco.com, fdupont@isc.org, Wassim.Haddad@ericsson.com, cjbc@it.uc3m.es
+#   RFC6277          ||      S. Santesson, P. Hallam-Baker         ||       sts@aaa-sec.com, hallam@gmail.com
+#   RFC6278          ||      J. Herzog, R. Khazan         ||       jherzog@ll.mit.edu, rkh@ll.mit.edu
+#   RFC6279          ||      M. Liebsch, Ed., S. Jeong, Q. Wu         ||       liebsch@neclab.eu, sjjeong@etri.re.kr, sunseawq@huawei.com
+#   RFC6280          ||      R. Barnes, M. Lepinski, A. Cooper, J. Morris, H. Tschofenig, H. Schulzrinne         ||       rbarnes@bbn.com, mlepinski@bbn.com, acooper@cdt.org, jmorris@cdt.org, Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu
+#   RFC6281          ||      S. Cheshire, Z. Zhu, R. Wakikawa, L. Zhang         ||       cheshire@apple.com, zhenkai@ucla.edu, ryuji@jp.toyota-itc.com, lixia@cs.ucla.edu
+#   RFC6282          ||      J. Hui, Ed., P. Thubert         ||       jhui@archrock.com, pthubert@cisco.com
+#   RFC6283          ||      A. Jerman Blazic, S. Saljic, T. Gondrom         ||       aljosa@setcce.si, svetlana.saljic@setcce.si, tobias.gondrom@gondrom.org
+#   RFC6284          ||      A. Begen, D. Wing, T. Van Caenegem         ||       abegen@cisco.com, dwing-ietf@fuggles.com, Tom.Van_Caenegem@alcatel-lucent.com
+#   RFC6285          ||      B. Ver Steeg, A. Begen, T. Van Caenegem, Z. Vax         ||       billvs@cisco.com, abegen@cisco.com, Tom.Van_Caenegem@alcatel-lucent.be, zeevvax@microsoft.com
+#   RFC6286          ||      E. Chen, J. Yuan         ||       enkechen@cisco.com, jenny@cisco.com
+#   RFC6287          ||      D. M'Raihi, J. Rydell, S. Bajaj, S. Machani, D. Naccache         ||       davidietf@gmail.com, johanietf@gmail.com, siddharthietf@gmail.com, smachani@diversinet.com, david.naccache@ens.fr
+#   RFC6288          ||      C. Reed         ||       creed@opengeospatial.org
+#   RFC6289          ||      E. Cardona, S. Channabasappa, J-F. Mule         ||       e.cardona@cablelabs.com, sumanth@cablelabs.com, jf.mule@cablelabs.com
+#   RFC6290          ||      Y. Nir, Ed., D. Wierbowski, F. Detienne, P. Sethi         ||       ynir@checkpoint.com, wierbows@us.ibm.com, fd@cisco.com, psethi@cisco.com
+#   RFC6291          ||      L. Andersson, H. van Helvoort, R. Bonica, D. Romascanu, S. Mansfield         ||       loa.andersson@ericsson.com, huub.van.helvoort@huawei.com, rbonica@juniper.net, dromasca@gmail.com , scott.mansfield@ericsson.com
+#   RFC6292          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC6293          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC6294          ||      Q. Hu, B. Carpenter         ||       qhu009@aucklanduni.ac.nz, brian.e.carpenter@gmail.com
+#   RFC6295          ||      J. Lazzaro, J. Wawrzynek         ||       lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu
+#   RFC6296          ||      M. Wasserman, F. Baker         ||       mrw@painless-security.com, fred@cisco.com
+#   RFC6297          ||      M. Welzl, D. Ros         ||       michawe@ifi.uio.no, david.ros@telecom-bretagne.eu
+#   RFC6298          ||      V. Paxson, M. Allman, J. Chu, M. Sargent         ||       vern@icir.org, mallman@icir.org, hkchu@google.com, mts71@case.edu
+#   RFC6301          ||      Z. Zhu, R. Wakikawa, L. Zhang         ||       zhenkai@cs.ucla.edu, ryuji.wakikawa@gmail.com, lixia@cs.ucla.edu
+#   RFC6302          ||      A. Durand, I. Gashinsky, D. Lee, S. Sheppard         ||       adurand@juniper.net, igor@yahoo-inc.com, donn@fb.com, Scott.Sheppard@att.com
+#   RFC6303          ||      M. Andrews         ||       marka@isc.org
+#   RFC6304          ||      J. Abley, W. Maton         ||       joe.abley@icann.org, wmaton@ryouko.imsb.nrc.ca
+#   RFC6305          ||      J. Abley, W. Maton         ||       joe.abley@icann.org, wmaton@ryouko.imsb.nrc.ca
+#   RFC6306          ||      P. Frejborg         ||       pfrejborg@gmail.com
+#   RFC6307          ||      D. Black, Ed., L. Dunbar, Ed., M. Roth, R. Solomon         ||       david.black@emc.com, ldunbar@huawei.com, MRoth@infinera.com, ronens@corrigent.com
+#   RFC6308          ||      P. Savola         ||       psavola@funet.fi
+#   RFC6309          ||      J. Arkko, A. Keranen, J. Mattsson         ||       jari.arkko@piuha.net, ari.keranen@ericsson.com, john.mattsson@ericsson.com
+#   RFC6310          ||      M. Aissaoui, P. Busschbach, L. Martini, M. Morrow, T. Nadeau, Y(J). Stein         ||       mustapha.aissaoui@alcatel-lucent.com, busschbach@alcatel-lucent.com, lmartini@cisco.com, mmorrow@cisco.com, Thomas.Nadeau@ca.com, yaakov_s@rad.com
+#   RFC6311          ||      R. Singh, Ed., G. Kalyani, Y. Nir, Y. Sheffer, D. Zhang         ||       rsj@cisco.com, kagarigi@cisco.com, ynir@checkpoint.com, yaronf.ietf@gmail.com, zhangdacheng@huawei.com
+#   RFC6312          ||      R. Koodli         ||       rkoodli@cisco.com
+#   RFC6313          ||      B. Claise, G. Dhandapani, P. Aitken, S. Yates         ||       bclaise@cisco.com, gowri@cisco.com, paitken@cisco.com, syates@cisco.com
+#   RFC6314          ||      C. Boulton, J. Rosenberg, G. Camarillo, F. Audet         ||       chris@ns-technologies.com, jdrosen@jdrosen.net, Gonzalo.Camarillo@ericsson.com, francois.audet@skype.net
+#   RFC6315          ||      E. Guy, K. Darilion         ||       edguy@CleverSpoke.com, klaus.darilion@nic.at
+#   RFC6316          ||      M. Komu, M. Bagnulo, K. Slavov, S. Sugimoto, Ed.         ||       miika@iki.fi, marcelo@it.uc3m.es, kristian.slavov@ericsson.com, shinta@sfc.wide.ad.jp
+#   RFC6317          ||      M. Komu, T. Henderson         ||       miika@iki.fi, thomas.r.henderson@boeing.com
+#   RFC6318          ||      R. Housley, J. Solinas         ||       housley@vigilsec.com, jasolin@orion.ncsc.mil
+#   RFC6319          ||      M. Azinger, L. Vegoda         ||       marla.azinger@ftr.com, leo.vegoda@icann.org
+#   RFC6320          ||      S. Wadhwa, J. Moisand, T. Haag, N. Voigt, T. Taylor, Ed.         ||       sanjay.wadhwa@alcatel-lucent.com, jmoisand@juniper.net, haagt@telekom.de, norbert.voigt@nsn.com, tom.taylor.stds@gmail.com
+#   RFC6321          ||      C. Daboo, M. Douglass, S. Lees         ||       cyrus@daboo.name, douglm@rpi.edu, steven.lees@microsoft.com
+#   RFC6322          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC6323          ||      G. Renker, G. Fairhurst         ||       gerrit@erg.abdn.ac.uk, gorry@erg.abdn.ac.uk
+#   RFC6324          ||      G. Nakibly, F. Templin         ||       gnakibly@yahoo.com, fltemplin@acm.org
+#   RFC6325          ||      R. Perlman, D. Eastlake 3rd, D. Dutt, S. Gai, A. Ghanwani         ||       Radia@alum.mit.edu, d3e3e3@gmail.com, ddutt@cisco.com, silvano@ip6.com, anoop@alumni.duke.edu
+#   RFC6326          ||      D. Eastlake, A. Banerjee, D. Dutt, R. Perlman, A. Ghanwani         ||       d3e3e3@gmail.com, ayabaner@cisco.com, ddutt@cisco.com, Radia@alum.mit.edu, anoop@alumni.duke.edu
+#   RFC6327          ||      D. Eastlake 3rd, R. Perlman, A. Ghanwani, D. Dutt, V. Manral         ||       d3e3e3@gmail.com, Radia@alum.mit.edu, anoop@alumni.duke.edu, ddutt@cisco.com, vishwas.manral@hp.com
+#   RFC6328          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC6329          ||      D. Fedyk, Ed., P. Ashwood-Smith, Ed., D. Allan, A. Bragg, P. Unbehagen         ||       Donald.Fedyk@alcatel-lucent.com, Peter.AshwoodSmith@huawei.com, david.i.allan@ericsson.com, nbragg@ciena.com, unbehagen@avaya.com
+#   RFC6330          ||      M. Luby, A. Shokrollahi, M. Watson, T. Stockhammer, L. Minder         ||       luby@qti.qualcomm.com, amin.shokrollahi@epfl.ch, watsonm@netflix.com, stockhammer@nomor.de, lminder@qualcomm.com
+#   RFC6331          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
+#   RFC6332          ||      A. Begen, E. Friedrich         ||       abegen@cisco.com, efriedri@cisco.com
+#   RFC6333          ||      A. Durand, R. Droms, J. Woodyatt, Y. Lee         ||       adurand@juniper.net, rdroms@cisco.com, jhw@apple.com, yiu_lee@cable.comcast.com
+#   RFC6334          ||      D. Hankins, T. Mrugalski         ||       dhankins@google.com, tomasz.mrugalski@eti.pg.gda.pl
+#   RFC6335          ||      M. Cotton, L. Eggert, J. Touch, M. Westerlund, S. Cheshire         ||       michelle.cotton@icann.org, lars.eggert@nokia.com, touch@isi.edu, magnus.westerlund@ericsson.com, cheshire@apple.com
+#   RFC6336          ||      M. Westerlund, C. Perkins         ||       magnus.westerlund@ericsson.com, csp@csperkins.org
+#   RFC6337          ||      S. Okumura, T. Sawada, P. Kyzivat         ||       shinji.okumura@softfront.jp, tu-sawada@kddi.com, pkyzivat@alum.mit.edu
+#   RFC6338          ||      V. Giralt, R. McDuff         ||       victoriano@uma.es, r.mcduff@uq.edu.au
+#   RFC6339          ||      S. Josefsson, L. Hornquist Astrand         ||       simon@josefsson.org, lha@apple.com
+#   RFC6340          ||      R. Presuhn         ||       randy_presuhn@mindspring.com
+#   RFC6341          ||      K. Rehor, Ed., L. Portman, Ed., A. Hutton, R. Jain         ||       krehor@cisco.com, leon.portman@nice.com, andrew.hutton@siemens-enterprise.com, rajnish.jain@ipc.com
+#   RFC6342          ||      R. Koodli         ||       rkoodli@cisco.com
+#   RFC6343          ||      B. Carpenter         ||       brian.e.carpenter@gmail.com
+#   RFC6344          ||      G. Bernstein, Ed., D. Caviglia, R. Rabbat, H. van Helvoort         ||       gregb@grotto-networking.com, diego.caviglia@ericsson.com, rabbat@alum.mit.edu, hhelvoort@huawei.com
+#   RFC6345          ||      P. Duffy, S. Chakrabarti, R. Cragie, Y. Ohba, Ed., A. Yegin         ||       paduffy@cisco.com, samita.chakrabarti@ericsson.com, robert.cragie@gridmerge.com, yoshihiro.ohba@toshiba.co.jp, a.yegin@partner.samsung.com
+#   RFC6346          ||      R. Bush, Ed.         ||       randy@psg.com
+#   RFC6347          ||      E. Rescorla, N. Modadugu         ||       ekr@rtfm.com, nagendra@cs.stanford.edu
+#   RFC6348          ||      JL. Le Roux, Ed., T. Morin, Ed.         ||       jeanlouis.leroux@orange-ftgroup.com, thomas.morin@orange-ftgroup.com
+#   RFC6349          ||      B. Constantine, G. Forget, R. Geib, R. Schrage         ||       barry.constantine@jdsu.com, gilles.forget@sympatico.ca, Ruediger.Geib@telekom.de, reinhard@schrageconsult.com
+#   RFC6350          ||      S. Perreault         ||       simon.perreault@viagenie.ca
+#   RFC6351          ||      S. Perreault         ||       simon.perreault@viagenie.ca
+#   RFC6352          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC6353          ||      W. Hardaker         ||       ietf@hardakers.net
+#   RFC6354          ||      Q. Xie         ||       Qiaobing.Xie@gmail.com
+#   RFC6355          ||      T. Narten, J. Johnson         ||       narten@us.ibm.com, jarrod.b.johnson@gmail.com
+#   RFC6356          ||      C. Raiciu, M. Handley, D. Wischik         ||       costin.raiciu@cs.pub.ro, m.handley@cs.ucl.ac.uk, d.wischik@cs.ucl.ac.uk
+#   RFC6357          ||      V. Hilt, E. Noel, C. Shen, A. Abdelal         ||       volker.hilt@alcatel-lucent.com, eric.noel@att.com, charles@cs.columbia.edu, aabdelal@sonusnet.com
+#   RFC6358          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC6359          ||      S. Ginoza, M. Cotton, A. Morris         ||       sginoza@amsl.com, michelle.cotton@icann.org, amorris@amsl.com
+#   RFC6360          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC6361          ||      J. Carlson, D. Eastlake 3rd         ||       carlsonj@workingcode.com, d3e3e3@gmail.com
+#   RFC6362          ||      K. Meadors, Ed.         ||       kyle@drummondgroup.com
+#   RFC6363          ||      M. Watson, A. Begen, V. Roca         ||       watsonm@netflix.com, abegen@cisco.com, vincent.roca@inria.fr
+#   RFC6364          ||      A. Begen         ||       abegen@cisco.com
+#   RFC6365          ||      P. Hoffman, J. Klensin         ||       paul.hoffman@vpnc.org, john+ietf@jck.com
+#   RFC6366          ||      J. Valin, K. Vos         ||       jmvalin@jmvalin.ca, koen.vos@skype.net
+#   RFC6367          ||      S. Kanno, M. Kanda         ||       kanno.satoru@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp
+#   RFC6368          ||      P. Marques, R. Raszuk, K. Patel, K. Kumaki, T. Yamagata         ||       pedro.r.marques@gmail.com, robert@raszuk.net, keyupate@cisco.com, ke-kumaki@kddi.com, to-yamagata@kddi.com
+#   RFC6369          ||      E. Haleplidis, O. Koufopavlou, S. Denazis         ||       ehalep@ece.upatras.gr, odysseas@ece.upatras.gr, sdena@upatras.gr
+#   RFC6370          ||      M. Bocci, G. Swallow, E. Gray         ||       matthew.bocci@alcatel-lucent.com, swallow@cisco.com, eric.gray@ericsson.com
+#   RFC6371          ||      I. Busi, Ed., D. Allan, Ed.         ||       Italo.Busi@alcatel-lucent.com, david.i.allan@ericsson.com
+#   RFC6372          ||      N. Sprecher, Ed., A. Farrel, Ed.         ||       nurit.sprecher@nsn.com, adrian@olddog.co.uk
+#   RFC6373          ||      L. Andersson, Ed., L. Berger, Ed., L. Fang, Ed., N. Bitar, Ed., E. Gray, Ed.         ||       loa.andersson@ericsson.com, lberger@labn.net, lufang@cisco.com, nabil.n.bitar@verizon.com, Eric.Gray@Ericsson.com
+#   RFC6374          ||      D. Frost, S. Bryant         ||       danfrost@cisco.com, stbryant@cisco.com
+#   RFC6375          ||      D. Frost, Ed., S. Bryant, Ed.         ||       danfrost@cisco.com, stbryant@cisco.com
+#   RFC6376          ||      D. Crocker, Ed., T. Hansen, Ed., M. Kucherawy, Ed.         ||       dcrocker@bbiw.net, tony+dkimov@maillennium.att.com, msk@cloudmark.com
+#   RFC6377          ||      M. Kucherawy         ||       msk@cloudmark.com
+#   RFC6378          ||      Y. Weingarten, Ed., S. Bryant, E. Osborne, N. Sprecher, A. Fulignoli, Ed.         ||       yaacov.weingarten@nsn.com, stbryant@cisco.com, eosborne@cisco.com, nurit.sprecher@nsn.com, annamaria.fulignoli@ericsson.com
+#   RFC6379          ||      L. Law, J. Solinas         ||       lelaw@orion.ncsc.mil, jasolin@orion.ncsc.mil
+#   RFC6380          ||      K. Burgin, M. Peck         ||       kwburgi@tycho.ncsc.mil, mpeck@mitre.org
+#   RFC6381          ||      R. Gellens, D. Singer, P. Frojdh         ||       rg+ietf@qualcomm.com, singer@apple.com, Per.Frojdh@ericsson.com
+#   RFC6382          ||      D. McPherson, R. Donnelly, F. Scalzo         ||       dmcpherson@verisign.com, rdonnelly@verisign.com, fscalzo@verisign.com
+#   RFC6383          ||      K. Shiomoto, A. Farrel         ||       shiomoto.kohei@lab.ntt.co.jp, adrian@olddog.co.uk
+#   RFC6384          ||      I. van Beijnum         ||       iljitsch@muada.com
+#   RFC6385          ||      M. Barnes, A. Doria, H. Alvestrand, B. Carpenter         ||       mary.ietf.barnes@gmail.com, avri@acm.org, harald@alvestrand.no, brian.e.carpenter@gmail.com
+#   RFC6386          ||      J. Bankoski, J. Koleszar, L. Quillio, J. Salonen, P. Wilkins, Y. Xu         ||       jimbankoski@google.com, jkoleszar@google.com, louquillio@google.com, jsalonen@google.com, paulwilkins@google.com, yaowu@google.com
+#   RFC6387          ||      A. Takacs, L. Berger, D. Caviglia, D. Fedyk, J. Meuric         ||       attila.takacs@ericsson.com, lberger@labn.net, diego.caviglia@ericsson.com, donald.fedyk@alcatel-lucent.com, julien.meuric@orange.com
+#   RFC6388          ||      IJ. Wijnands, Ed., I. Minei, Ed., K. Kompella, B. Thomas         ||       ice@cisco.com, ina@juniper.net, kireeti@juniper.net, bobthomas@alum.mit.edu
+#   RFC6389          ||      R. Aggarwal, JL. Le Roux         ||       raggarwa_1@yahoo.com, jeanlouis.leroux@orange-ftgroup.com
+#   RFC6390          ||      A. Clark, B. Claise         ||       alan.d.clark@telchemy.com, bclaise@cisco.com
+#   RFC6391          ||      S. Bryant, Ed., C. Filsfils, U. Drafz, V. Kompella, J. Regan, S. Amante         ||       stbryant@cisco.com, cfilsfil@cisco.com, Ulrich.Drafz@telekom.de, vach.kompella@alcatel-lucent.com, joe.regan@alcatel-lucent.com, shane@level3.net
+#   RFC6392          ||      R. Alimi, Ed., A. Rahman, Ed., Y. Yang, Ed.         ||       ralimi@google.com, Akbar.Rahman@InterDigital.com, yry@cs.yale.edu
+#   RFC6393          ||      M. Yevstifeyev         ||       evnikita2@gmail.com
+#   RFC6394          ||      R. Barnes         ||       rbarnes@bbn.com
+#   RFC6395          ||      S. Gulrajani, S. Venaas         ||       sameerg@cisco.com, stig@cisco.com
+#   RFC6396          ||      L. Blunk, M. Karir, C. Labovitz         ||       ljb@merit.edu, mkarir@merit.edu, labovit@deepfield.net
+#   RFC6397          ||      T. Manderson         ||       terry.manderson@icann.org
+#   RFC6398          ||      F. Le Faucheur, Ed.         ||       flefauch@cisco.com
+#   RFC6401          ||      F. Le Faucheur, J. Polk, K. Carlberg         ||       flefauch@cisco.com, jmpolk@cisco.com, carlberg@g11.org.uk
+#   RFC6402          ||      J. Schaad         ||       jimsch@augustcellars.com
+#   RFC6403          ||      L. Zieglar, S. Turner, M. Peck         ||       llziegl@tycho.ncsc.mil, turners@ieca.com, mpeck@alumni.virginia.edu
+#   RFC6404          ||      J. Seedorf, S. Niccolini, E. Chen, H. Scholz         ||       jan.seedorf@nw.neclab.eu, saverio.niccolini@.neclab.eu, eric.chen@lab.ntt.co.jp, hendrik.scholz@voipfuture.com
+#   RFC6405          ||      A. Uzelac, Ed., Y. Lee, Ed.         ||       adam.uzelac@globalcrossing.com, yiu_lee@cable.comcast.com
+#   RFC6406          ||      D. Malas, Ed., J. Livingood, Ed.         ||       d.malas@cablelabs.com, Jason_Livingood@cable.comcast.com
+#   RFC6407          ||      B. Weis, S. Rowles, T. Hardjono         ||       bew@cisco.com, sheela@cisco.com, hardjono@mit.edu
+#   RFC6408          ||      M. Jones, J. Korhonen, L. Morand         ||       mark@azu.ca, jouni.nospam@gmail.com, lionel.morand@orange-ftgroup.com
+#   RFC6409          ||      R. Gellens, J. Klensin         ||       rg+ietf@qualcomm.com, john-ietf@jck.com
+#   RFC6410          ||      R. Housley, D. Crocker, E. Burger         ||       housley@vigilsec.com, dcrocker@bbiw.net, eburger@standardstrack.com
+#   RFC6411          ||      M. Behringer, F. Le Faucheur, B. Weis         ||       mbehring@cisco.com, flefauch@cisco.com, bew@cisco.com
+#   RFC6412          ||      S. Poretsky, B. Imhoff, K. Michielsen         ||       sporetsky@allot.com, bimhoff@planetspork.com, kmichiel@cisco.com
+#   RFC6413          ||      S. Poretsky, B. Imhoff, K. Michielsen         ||       sporetsky@allot.com, bimhoff@planetspork.com, kmichiel@cisco.com
+#   RFC6414          ||      S. Poretsky, R. Papneja, J. Karthik, S. Vapiwala         ||       sporetsky@allot.com, rajiv.papneja@huawei.com, jkarthik@cisco.com, svapiwal@cisco.com
+#   RFC6415          ||      E. Hammer-Lahav, Ed., B. Cook         ||       eran@hueniverse.com, romeda@gmail.com
+#   RFC6416          ||      M. Schmidt, F. de Bont, S. Doehla, J. Kim         ||       malte.schmidt@dolby.com, frans.de.bont@philips.com, stefan.doehla@iis.fraunhofer.de, kjh1905m@naver.com
+#   RFC6417          ||      P. Eardley, L. Eggert, M. Bagnulo, R. Winter         ||       philip.eardley@bt.com, lars.eggert@nokia.com, marcelo@it.uc3m.es, rolf.winter@neclab.eu
+#   RFC6418          ||      M. Blanchet, P. Seite         ||       Marc.Blanchet@viagenie.ca, pierrick.seite@orange.com
+#   RFC6419          ||      M. Wasserman, P. Seite         ||       mrw@painless-security.com, pierrick.seite@orange-ftgroup.com
+#   RFC6420          ||      Y. Cai, H. Ou         ||       ycai@cisco.com, hou@cisco.com
+#   RFC6421          ||      D. Nelson, Ed.         ||       d.b.nelson@comcast.net
+#   RFC6422          ||      T. Lemon, Q. Wu         ||       mellon@nominum.com, sunseawq@huawei.com
+#   RFC6423          ||      H. Li, L. Martini, J. He, F. Huang         ||       lihan@chinamobile.com, lmartini@cisco.com, hejia@huawei.com, feng.f.huang@alcatel-sbell.com.cn
+#   RFC6424          ||      N. Bahadur, K. Kompella, G. Swallow         ||       nitinb@juniper.net, kireeti@juniper.net, swallow@cisco.com
+#   RFC6425          ||      S. Saxena, Ed., G. Swallow, Z. Ali, A. Farrel, S. Yasukawa, T. Nadeau         ||       ssaxena@cisco.com, swallow@cisco.com, zali@cisco.com, adrian@olddog.co.uk, yasukawa.seisho@lab.ntt.co.jp, thomas.nadeau@ca.com
+#   RFC6426          ||      E. Gray, N. Bahadur, S. Boutros, R. Aggarwal         ||       eric.gray@ericsson.com, nitinb@juniper.net, sboutros@cisco.com, raggarwa_1@yahoo.com
+#   RFC6427          ||      G. Swallow, Ed., A. Fulignoli, Ed., M. Vigoureux, Ed., S. Boutros, D. Ward         ||       swallow@cisco.com, annamaria.fulignoli@ericsson.com, martin.vigoureux@alcatel-lucent.com, sboutros@cisco.com, dward@juniper.net
+#   RFC6428          ||      D. Allan, Ed., G. Swallow, Ed., J. Drake, Ed.         ||       david.i.allan@ericsson.com, swallow@cisco.com, jdrake@juniper.net
+#   RFC6429          ||      M. Bashyam, M. Jethanandani, A. Ramaiah         ||       mbashyam@ocarinanetworks.com, mjethanandani@gmail.com, ananth@cisco.com
+#   RFC6430          ||      K. Li, B. Leiba         ||       likepeng@huawei.com, barryleiba@computer.org
+#   RFC6431          ||      M. Boucadair, P. Levis, G. Bajko, T. Savolainen, T. Tsou         ||       mohamed.boucadair@orange.com, pierre.levis@orange.com, gabor.bajko@nokia.com, teemu.savolainen@nokia.com, tina.tsou.zouting@huawei.com
+#   RFC6432          ||      R. Jesske, L. Liess         ||       r.jesske@telekom.de, L.Liess@telekom.de
+#   RFC6433          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
+#   RFC6434          ||      E. Jankiewicz, J. Loughney, T. Narten         ||       edward.jankiewicz@sri.com, john.loughney@nokia.com, narten@us.ibm.com
+#   RFC6435          ||      S. Boutros, Ed., S. Sivabalan, Ed., R. Aggarwal, Ed., M. Vigoureux, Ed., X. Dai, Ed.         ||       sboutros@cisco.com, msiva@cisco.com, raggarwa_1@yahoo.com, martin.vigoureux@alcatel-lucent.com, dai.xuehui@zte.com.cn
+#   RFC6436          ||      S. Amante, B. Carpenter, S. Jiang         ||       shane@level3.net, brian.e.carpenter@gmail.com, shengjiang@huawei.com
+#   RFC6437          ||      S. Amante, B. Carpenter, S. Jiang, J. Rajahalme         ||       shane@level3.net, brian.e.carpenter@gmail.com, jiangsheng@huawei.com, jarno.rajahalme@nsn.com
+#   RFC6438          ||      B. Carpenter, S. Amante         ||       brian.e.carpenter@gmail.com, shane@level3.net
+#   RFC6439          ||      R. Perlman, D. Eastlake, Y. Li, A. Banerjee, F. Hu         ||       Radia@alum.mit.edu, d3e3e3@gmail.com, liyizhou@huawei.com, ayabaner@cisco.com, hu.fangwei@zte.com.cn
+#   RFC6440          ||      G. Zorn, Q. Wu, Y. Wang         ||       gwz@net-zen.net, sunseawq@huawei.com, w52006@huawei.com
+#   RFC6441          ||      L. Vegoda         ||       leo.vegoda@icann.org
+#   RFC6442          ||      J. Polk, B. Rosen, J. Peterson         ||       jmpolk@cisco.com, br@brianrosen.net, jon.peterson@neustar.biz
+#   RFC6443          ||      B. Rosen, H. Schulzrinne, J. Polk, A. Newton         ||       br@brianrosen.net, hgs@cs.columbia.edu, jmpolk@cisco.com, andy@hxr.us
+#   RFC6444          ||      H. Schulzrinne, L. Liess, H. Tschofenig, B. Stark, A. Kuett         ||       hgs+ecrit@cs.columbia.edu, L.Liess@telekom.de, Hannes.Tschofenig@gmx.net, barbara.stark@att.com, andres.kytt@skype.net
+#   RFC6445          ||      T. Nadeau, Ed., A. Koushik, Ed., R. Cetin, Ed.         ||       thomas.nadeau@ca.com, kkoushik@cisco.com, riza.cetin@alcatel.be
+#   RFC6446          ||      A. Niemi, K. Kiss, S. Loreto         ||       aki.niemi@nokia.com, krisztian.kiss@nokia.com, salvatore.loreto@ericsson.com
+#   RFC6447          ||      R. Mahy, B. Rosen, H. Tschofenig         ||       rohan@ekabal.com, br@brianrosen.net, Hannes.Tschofenig@gmx.net
+#   RFC6448          ||      R. Yount         ||       rjy@cmu.edu
+#   RFC6449          ||      J. Falk, Ed.         ||       ietf@cybernothing.org
+#   RFC6450          ||      S. Venaas         ||       stig@cisco.com
+#   RFC6451          ||      A. Forte, H. Schulzrinne         ||       forte@att.com, hgs@cs.columbia.edu
+#   RFC6452          ||      P. Faltstrom, Ed., P. Hoffman, Ed.         ||       paf@cisco.com, paul.hoffman@vpnc.org
+#   RFC6453          ||      F. Dijkstra, R. Hughes-Jones         ||       Freek.Dijkstra@sara.nl, Richard.Hughes-Jones@dante.net
+#   RFC6454          ||      A. Barth         ||       ietf@adambarth.com
+#   RFC6455          ||      I. Fette, A. Melnikov         ||       ifette+ietf@google.com, Alexey.Melnikov@isode.com
+#   RFC6456          ||      H. Li, R. Zheng, A. Farrel         ||       hongyu.lihongyu@huawei.com, robin@huawei.com, adrian@olddog.co.uk
+#   RFC6457          ||      T. Takeda, Ed., A. Farrel         ||       takeda.tomonori@lab.ntt.co.jp, adrian@olddog.co.uk
+#   RFC6458          ||      R. Stewart, M. Tuexen, K. Poon, P. Lei, V. Yasevich         ||       randall@lakerest.net, tuexen@fh-muenster.de, ka-cheong.poon@oracle.com, peterlei@cisco.com, vladislav.yasevich@hp.com
+#   RFC6459          ||      J. Korhonen, Ed., J. Soininen, B. Patil, T. Savolainen, G. Bajko, K. Iisakkila         ||       jouni.nospam@gmail.com, jonne.soininen@renesasmobile.com, basavaraj.patil@nokia.com, teemu.savolainen@nokia.com, gabor.bajko@nokia.com, kaisu.iisakkila@renesasmobile.com
+#   RFC6460          ||      M. Salter, R. Housley         ||       misalte@nsa.gov, housley@vigilsec.com
+#   RFC6461          ||      S. Channabasappa, Ed.         ||       sumanth@cablelabs.com
+#   RFC6462          ||      A. Cooper         ||       acooper@cdt.org
+#   RFC6463          ||      J. Korhonen, Ed., S. Gundavelli, H. Yokota, X. Cui         ||       jouni.nospam@gmail.com, sri.gundavelli@cisco.com, yokota@kddilabs.jp, Xiangsong.Cui@huawei.com
+#   RFC6464          ||      J. Lennox, Ed., E. Ivov, E. Marocco         ||       jonathan@vidyo.com, emcho@jitsi.org, enrico.marocco@telecomitalia.it
+#   RFC6465          ||      E. Ivov, Ed., E. Marocco, Ed., J. Lennox         ||       emcho@jitsi.org, enrico.marocco@telecomitalia.it, jonathan@vidyo.com
+#   RFC6466          ||      G. Salgueiro         ||       gsalguei@cisco.com
+#   RFC6467          ||      T. Kivinen         ||       kivinen@iki.fi
+#   RFC6468          ||      A. Melnikov, B. Leiba, K. Li         ||       Alexey.Melnikov@isode.com, barryleiba@computer.org, likepeng@huawei.com
+#   RFC6469          ||      K. Kobayashi, K. Mishima, S. Casner, C. Bormann         ||       ikob@riken.jp, three@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org
+#   RFC6470          ||      A. Bierman         ||       andy@yumaworks.com
+#   RFC6471          ||      C. Lewis, M. Sergeant         ||       clewisbcp@cauce.org, matt@sergeant.org
+#   RFC6472          ||      W. Kumari, K. Sriram         ||       warren@kumari.net, ksriram@nist.gov
+#   RFC6473          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC6474          ||      K. Li, B. Leiba         ||       likepeng@huawei.com, barryleiba@computer.org
+#   RFC6475          ||      G. Keeni, K. Koide, S. Gundavelli, R. Wakikawa         ||       glenn@cysols.com, ka-koide@kddi.com, sgundave@cisco.com, ryuji@us.toyota-itc.com
+#   RFC6476          ||      P. Gutmann         ||       pgut001@cs.auckland.ac.nz
+#   RFC6477          ||      A. Melnikov, G. Lunt         ||       Alexey.Melnikov@isode.com, graeme.lunt@smhs.co.uk
+#   RFC6478          ||      L. Martini, G. Swallow, G. Heron, M. Bocci         ||       lmartini@cisco.com, swallow@cisco.com, giheron@cisco.com, matthew.bocci@alcatel-lucent.com
+#   RFC6479          ||      X. Zhang, T. Tsou         ||       xiangyang.zhang@huawei.com, tena@huawei.com
+#   RFC6480          ||      M. Lepinski, S. Kent         ||       mlepinski@bbn.com, kent@bbn.com
+#   RFC6481          ||      G. Huston, R. Loomans, G. Michaelson         ||       gih@apnic.net, robertl@apnic.net, ggm@apnic.net
+#   RFC6482          ||      M. Lepinski, S. Kent, D. Kong         ||       mlepinski@bbn.com, skent@bbn.com, dkong@bbn.com
+#   RFC6483          ||      G. Huston, G. Michaelson         ||       gih@apnic.net, ggm@apnic.net
+#   RFC6484          ||      S. Kent, D. Kong, K. Seo, R. Watro         ||       skent@bbn.com, dkong@bbn.com, kseo@bbn.com, rwatro@bbn.com
+#   RFC6485          ||      G. Huston         ||       gih@apnic.net
+#   RFC6486          ||      R. Austein, G. Huston, S. Kent, M. Lepinski         ||       sra@isc.org, gih@apnic.net, kent@bbn.com, mlepinski@bbn.com
+#   RFC6487          ||      G. Huston, G. Michaelson, R. Loomans         ||       gih@apnic.net, ggm@apnic.net, robertl@apnic.net
+#   RFC6488          ||      M. Lepinski, A. Chi, S. Kent         ||       mlepinski@bbn.com, achi@bbn.com, kent@bbn.com
+#   RFC6489          ||      G. Huston, G. Michaelson, S. Kent         ||       gih@apnic.net, ggm@apnic.net, kent@bbn.com
+#   RFC6490          ||      G. Huston, S. Weiler, G. Michaelson, S. Kent         ||       gih@apnic.net, weiler@sparta.com, ggm@apnic.net, kent@bbn.com
+#   RFC6491          ||      T. Manderson, L. Vegoda, S. Kent         ||       terry.manderson@icann.org, leo.vegoda@icann.org, kent@bbn.com
+#   RFC6492          ||      G. Huston, R. Loomans, B. Ellacott, R. Austein         ||       gih@apnic.net, robertl@apnic.net, bje@apnic.net, sra@hactrn.net
+#   RFC6493          ||      R. Bush         ||       randy@psg.com
+#   RFC6494          ||      R. Gagliano, S. Krishnan, A. Kukec         ||       rogaglia@cisco.com, suresh.krishnan@ericsson.com, ana.kukec@enterprisearchitects.com
+#   RFC6495          ||      R. Gagliano, S. Krishnan, A. Kukec         ||       rogaglia@cisco.com, suresh.krishnan@ericsson.com, ana.kukec@enterprisearchitects.com
+#   RFC6496          ||      S. Krishnan, J. Laganier, M. Bonola, A. Garcia-Martinez         ||       suresh.krishnan@ericsson.com, julien.ietf@gmail.com, marco.bonola@gmail.com, alberto@it.uc3m.es
+#   RFC6497          ||      M. Davis, A. Phillips, Y. Umaoka, C. Falk         ||       mark@macchiato.com, addison@lab126.com, yoshito_umaoka@us.ibm.com, court@infiauto.com
+#   RFC6498          ||      J. Stone, R. Kumar, F. Andreasen         ||       joestone@cisco.com, rkumar@cisco.com, fandreas@cisco.com
+#   RFC6501          ||      O. Novo, G. Camarillo, D. Morgan, J. Urpalainen         ||       Oscar.Novo@ericsson.com, Gonzalo.Camarillo@ericsson.com, Dave.Morgan@fmr.com, jari.urpalainen@nokia.com
+#   RFC6502          ||      G. Camarillo, S. Srinivasan, R. Even, J. Urpalainen         ||       Gonzalo.Camarillo@ericsson.com, srivatsa.srinivasan@gmail.com, ron.even.tlv@gmail.com, jari.urpalainen@nokia.com
+#   RFC6503          ||      M. Barnes, C. Boulton, S. Romano, H. Schulzrinne         ||       mary.ietf.barnes@gmail.com, chris@ns-technologies.com, spromano@unina.it, hgs+xcon@cs.columbia.edu
+#   RFC6504          ||      M. Barnes, L. Miniero, R. Presta, S P. Romano         ||       mary.ietf.barnes@gmail.com, lorenzo@meetecho.com, roberta.presta@unina.it, spromano@unina.it
+#   RFC6505          ||      S. McGlashan, T. Melanchuk, C. Boulton         ||       smcg.stds01@mcglashan.org, timm@rainwillow.com, chris@ns-technologies.com
+#   RFC6506          ||      M. Bhatia, V. Manral, A. Lindem         ||       manav.bhatia@alcatel-lucent.com, vishwas.manral@hp.com, acee.lindem@ericsson.com
+#   RFC6507          ||      M. Groves         ||       Michael.Groves@cesg.gsi.gov.uk
+#   RFC6508          ||      M. Groves         ||       Michael.Groves@cesg.gsi.gov.uk
+#   RFC6509          ||      M. Groves         ||       Michael.Groves@cesg.gsi.gov.uk
+#   RFC6510          ||      L. Berger, G. Swallow         ||       lberger@labn.net, swallow@cisco.com
+#   RFC6511          ||      Z. Ali, G. Swallow, R. Aggarwal         ||       zali@cisco.com, swallow@cisco.com, raggarwa_1@yahoo.com
+#   RFC6512          ||      IJ. Wijnands, E. Rosen, M. Napierala, N. Leymann         ||       ice@cisco.com, erosen@cisco.com, mnapierala@att.com, n.leymann@telekom.de
+#   RFC6513          ||      E. Rosen, Ed., R. Aggarwal, Ed.         ||       erosen@cisco.com, raggarwa_1@yahoo.com
+#   RFC6514          ||      R. Aggarwal, E. Rosen, T. Morin, Y. Rekhter         ||       raggarwa_1@yahoo.com, erosen@cisco.com, thomas.morin@orange-ftgroup.com, yakov@juniper.net
+#   RFC6515          ||      R. Aggarwal, E. Rosen         ||       raggarwa_1@yahoo.com, erosen@cisco.com
+#   RFC6516          ||      Y. Cai, E. Rosen, Ed., I. Wijnands         ||       ycai@cisco.com, erosen@cisco.com, ice@cisco.com
+#   RFC6517          ||      T. Morin, Ed., B. Niven-Jenkins, Ed., Y. Kamite, R. Zhang, N. Leymann, N. Bitar         ||       thomas.morin@orange.com, ben@niven-jenkins.co.uk, y.kamite@ntt.com, raymond.zhang@alcatel-lucent.com, n.leymann@telekom.de, nabil.n.bitar@verizon.com
+#   RFC6518          ||      G. Lebovitz, M. Bhatia         ||       gregory.ietf@gmail.com, manav.bhatia@alcatel-lucent.com
+#   RFC6519          ||      R. Maglione, A. Durand         ||       roberta.maglione@telecomitalia.it, adurand@juniper.net
+#   RFC6520          ||      R. Seggelmann, M. Tuexen, M. Williams         ||       seggelmann@fh-muenster.de, tuexen@fh-muenster.de, michael.glenn.williams@gmail.com
+#   RFC6521          ||      A. Makela, J. Korhonen         ||       antti.t.makela@iki.fi, jouni.nospam@gmail.com
+#   RFC6522          ||      M. Kucherawy, Ed.         ||       msk@cloudmark.com
+#   RFC6525          ||      R. Stewart, M. Tuexen, P. Lei         ||       randall@lakerest.net, tuexen@fh-muenster.de, peterlei@cisco.com
+#   RFC6526          ||      B. Claise, P. Aitken, A. Johnson, G. Muenz         ||       bclaise@cisco.com, paitken@cisco.com, andrjohn@cisco.com, muenz@net.in.tum.de
+#   RFC6527          ||      K. Tata         ||       tata_kalyan@yahoo.com
+#   RFC6528          ||      F. Gont, S. Bellovin         ||       fgont@si6networks.com, bellovin@acm.org
+#   RFC6529          ||      A. McKenzie, S. Crocker         ||       amckenzie3@yahoo.com, steve@stevecrocker.com
+#   RFC6530          ||      J. Klensin, Y. Ko         ||       john-ietf@jck.com, yangwooko@gmail.com
+#   RFC6531          ||      J. Yao, W. Mao         ||       yaojk@cnnic.cn, maowei_ietf@cnnic.cn
+#   RFC6532          ||      A. Yang, S. Steele, N. Freed         ||       abelyang@twnic.net.tw, Shawn.Steele@microsoft.com, ned+ietf@mrochek.com
+#   RFC6533          ||      T. Hansen, Ed., C. Newman, A. Melnikov         ||       tony+eaidsn@maillennium.att.com, chris.newman@oracle.com, Alexey.Melnikov@isode.com
+#   RFC6534          ||      N. Duffield, A. Morton, J. Sommers         ||       duffield@research.att.com, acmorton@att.com, jsommers@colgate.edu
+#   RFC6535          ||      B. Huang, H. Deng, T. Savolainen         ||       bill.huang@chinamobile.com, denghui@chinamobile.com, teemu.savolainen@nokia.com
+#   RFC6536          ||      A. Bierman, M. Bjorklund         ||       andy@yumaworks.com, mbj@tail-f.com
+#   RFC6537          ||      J. Ahrenholz         ||       jeffrey.m.ahrenholz@boeing.com
+#   RFC6538          ||      T. Henderson, A. Gurtov         ||       thomas.r.henderson@boeing.com, gurtov@ee.oulu.fi
+#   RFC6539          ||      V. Cakulev, G. Sundaram, I. Broustis         ||       violeta.cakulev@alcatel-lucent.com, ganesh.sundaram@alcatel-lucent.com, ioannis.broustis@alcatel-lucent.com
+#   RFC6540          ||      W. George, C. Donley, C. Liljenstolpe, L. Howard         ||       wesley.george@twcable.com, C.Donley@cablelabs.com, cdl@asgaard.org, lee.howard@twcable.com
+#   RFC6541          ||      M. Kucherawy         ||       msk@cloudmark.com
+#   RFC6542          ||      S. Emery         ||       shawn.emery@oracle.com
+#   RFC6543          ||      S. Gundavelli         ||       sgundave@cisco.com
+#   RFC6544          ||      J. Rosenberg, A. Keranen, B. B. Lowekamp, A. B. Roach         ||       jdrosen@jdrosen.net, ari.keranen@ericsson.com, bbl@lowekamp.net, adam@nostrum.com
+#   RFC6545          ||      K. Moriarty         ||       Kathleen.Moriarty@emc.com
+#   RFC6546          ||      B. Trammell         ||       trammell@tik.ee.ethz.ch
+#   RFC6547          ||      W. George         ||       wesley.george@twcable.com
+#   RFC6548          ||      N. Brownlee, Ed., IAB         ||       n.brownlee@auckland.ac.nz, iab@iab.org
+#   RFC6549          ||      A. Lindem, A. Roy, S. Mirtorabi         ||       acee.lindem@ericsson.com, akr@cisco.com, sina@cisco.com
+#   RFC6550          ||      T. Winter, Ed., P. Thubert, Ed., A. Brandt, J. Hui, R. Kelsey, P. Levis, K. Pister, R. Struik, JP. Vasseur, R. Alexander         ||       wintert@acm.org, pthubert@cisco.com, abr@sdesigns.dk, jhui@archrock.com, kelsey@ember.com, pal@cs.stanford.edu, kpister@dustnetworks.com, rstruik.ext@gmail.com, jpv@cisco.com, roger.alexander@cooperindustries.com
+#   RFC6551          ||      JP. Vasseur, Ed., M. Kim, Ed., K. Pister, N. Dejean, D. Barthel         ||       jpv@cisco.com, mjkim@kt.com, kpister@dustnetworks.com, nicolas.dejean@coronis.com, dominique.barthel@orange-ftgroup.com
+#   RFC6552          ||      P. Thubert, Ed.         ||       pthubert@cisco.com
+#   RFC6553          ||      J. Hui, JP. Vasseur         ||       jonhui@cisco.com, jpv@cisco.com
+#   RFC6554          ||      J. Hui, JP. Vasseur, D. Culler, V. Manral         ||       jonhui@cisco.com, jpv@cisco.com, culler@cs.berkeley.edu, vishwas.manral@hp.com
+#   RFC6555          ||      D. Wing, A. Yourtchenko         ||       dwing-ietf@fuggles.com, ayourtch@cisco.com
+#   RFC6556          ||      F. Baker         ||       fred@cisco.com
+#   RFC6557          ||      E. Lear, P. Eggert         ||       lear@cisco.com, eggert@cs.ucla.edu
+#   RFC6558          ||      A. Melnikov, B. Leiba, K. Li         ||       Alexey.Melnikov@isode.com, barryleiba@computer.org, likepeng@huawei.com
+#   RFC6559          ||      D. Farinacci, IJ. Wijnands, S. Venaas, M. Napierala         ||       dino@cisco.com, ice@cisco.com, stig@cisco.com, mnapierala@att.com
+#   RFC6560          ||      G. Richards         ||       gareth.richards@rsa.com
+#   RFC6561          ||      J. Livingood, N. Mody, M. O'Reirdan         ||       jason_livingood@cable.comcast.com, nirmal_mody@cable.comcast.com, michael_oreirdan@cable.comcast.com
+#   RFC6562          ||      C. Perkins, JM. Valin         ||       csp@csperkins.org, jmvalin@jmvalin.ca
+#   RFC6563          ||      S. Jiang, D. Conrad, B. Carpenter         ||       jiangsheng@huawei.com, drc@cloudflare.com, brian.e.carpenter@gmail.com
+#   RFC6564          ||      S. Krishnan, J. Woodyatt, E. Kline, J. Hoagland, M. Bhatia         ||       suresh.krishnan@ericsson.com, jhw@apple.com, ek@google.com, Jim_Hoagland@symantec.com, manav.bhatia@alcatel-lucent.com
+#   RFC6565          ||      P. Pillay-Esnault, P. Moyer, J. Doyle, E. Ertekin, M. Lundberg         ||       ppe@cisco.com, pete@pollere.net, jdoyle@doyleassociates.net, ertekin_emre@bah.com, lundberg_michael@bah.com
+#   RFC6566          ||      Y. Lee, Ed., G. Bernstein, Ed., D. Li, G. Martinelli         ||       leeyoung@huawei.com, gregb@grotto-networking.com, danli@huawei.com, giomarti@cisco.com
+#   RFC6567          ||      A. Johnston, L. Liess         ||       alan.b.johnston@gmail.com, laura.liess.dt@gmail.com
+#   RFC6568          ||      E. Kim, D. Kaspar, JP. Vasseur         ||       eunah.ietf@gmail.com, dokaspar.ietf@gmail.com, jpv@cisco.com
+#   RFC6569          ||      JM. Valin, S. Borilin, K. Vos, C. Montgomery, R. Chen         ||       jmvalin@jmvalin.ca, borilin@spiritdsp.net, koen.vos@skype.net, xiphmont@xiph.org, rchen@broadcom.com
+#   RFC6570          ||      J. Gregorio, R. Fielding, M. Hadley, M. Nottingham, D. Orchard         ||       joe@bitworking.org, fielding@gbiv.com, mhadley@mitre.org, mnot@mnot.net, orchard@pacificspirit.com
+#   RFC6571          ||      C. Filsfils, Ed., P. Francois, Ed., M. Shand, B. Decraene, J. Uttaro, N. Leymann, M. Horneffer         ||       cf@cisco.com, pierre.francois@imdea.org, imc.shand@googlemail.com, bruno.decraene@orange.com, uttaro@att.com, N.Leymann@telekom.de, Martin.Horneffer@telekom.de
+#   RFC6572          ||      F. Xia, B. Sarikaya, J. Korhonen, Ed., S. Gundavelli, D. Damic         ||       xiayangsong@huawei.com, sarikaya@ieee.org, jouni.nospam@gmail.com, sgundave@cisco.com, damjan.damic@siemens.com
+#   RFC6573          ||      M. Amundsen         ||       mca@amundsen.com
+#   RFC6574          ||      H. Tschofenig, J. Arkko         ||       Hannes.Tschofenig@gmx.net, jari.arkko@piuha.net
+#   RFC6575          ||      H. Shah, Ed., E. Rosen, Ed., G. Heron, Ed., V. Kompella, Ed.         ||       hshah@ciena.com, erosen@cisco.com, giheron@cisco.com, vach.kompella@alcatel-lucent.com
+#   RFC6576          ||      R. Geib, Ed., A. Morton, R. Fardid, A. Steinmitz         ||       Ruediger.Geib@telekom.de, acmorton@att.com, rfardid@cariden.com, Alexander.Steinmitz@telekom.de
+#   RFC6577          ||      M. Kucherawy         ||       msk@cloudmark.com
+#   RFC6578          ||      C. Daboo, A. Quillaud         ||       cyrus@daboo.name, arnaud.quillaud@oracle.com
+#   RFC6579          ||      M. Yevstifeyev         ||       evnikita2@gmail.com
+#   RFC6580          ||      M. Ko, D. Black         ||       mkosjc@gmail.com, david.black@emc.com
+#   RFC6581          ||      A. Kanevsky, Ed., C. Bestler, Ed., R. Sharp, S. Wise         ||       arkady.kanevsky@gmail.com, Caitlin.Bestler@nexenta.com, robert.o.sharp@intel.com, swise@opengridcomputing.com
+#   RFC6582          ||      T. Henderson, S. Floyd, A. Gurtov, Y. Nishida         ||       thomas.r.henderson@boeing.com, floyd@acm.org, gurtov@ee.oulu.fi, nishida@wide.ad.jp
+#   RFC6583          ||      I. Gashinsky, J. Jaeggli, W. Kumari         ||       igor@yahoo-inc.com, jjaeggli@zynga.com, warren@kumari.net
+#   RFC6584          ||      V. Roca         ||       vincent.roca@inria.fr
+#   RFC6585          ||      M. Nottingham, R. Fielding         ||       mnot@mnot.net, fielding@gbiv.com
+#   RFC6586          ||      J. Arkko, A. Keranen         ||       jari.arkko@piuha.net, ari.keranen@ericsson.com
+#   RFC6587          ||      R. Gerhards, C. Lonvick         ||       rgerhards@adiscon.com, clonvick@cisco.com
+#   RFC6588          ||      C. Ishikawa         ||       chiaki.ishikawa@ubin.jp
+#   RFC6589          ||      J. Livingood         ||       jason_livingood@cable.comcast.com
+#   RFC6590          ||      J. Falk, Ed., M. Kucherawy, Ed.         ||       ietf@cybernothing.org, msk@cloudmark.com
+#   RFC6591          ||      H. Fontana         ||       hilda@hfontana.com
+#   RFC6592          ||      C. Pignataro         ||       cpignata@cisco.com
+#   RFC6593          ||      C. Pignataro, J. Clarke, G. Salgueiro         ||       cpignata@cisco.com, jclarke@cisco.com, gsalguei@cisco.com
+#   RFC6594          ||      O. Sury         ||       ondrej.sury@nic.cz
+#   RFC6595          ||      K. Wierenga, E. Lear, S. Josefsson         ||       klaas@cisco.com, lear@cisco.com, simon@josefsson.org
+#   RFC6596          ||      M. Ohye, J. Kupke         ||       maileohye@gmail.com, joachim@kupke.za.net
+#   RFC6597          ||      J. Downs, Ed., J. Arbeiter, Ed.         ||       jeff_downs@partech.com, jimsgti@gmail.com
+#   RFC6598          ||      J. Weil, V. Kuarsingh, C. Donley, C. Liljenstolpe, M. Azinger         ||       jason.weil@twcable.com, victor.kuarsingh@gmail.com, c.donley@cablelabs.com, cdl@asgaard.org, marla.azinger@frontiercorp.com
+#   RFC6601          ||      G. Ash, Ed., D. McDysan         ||       gash5107@yahoo.com, dave.mcdysan@verizon.com
+#   RFC6602          ||      F. Abinader, Ed., S. Gundavelli, Ed., K. Leung, S. Krishnan, D. Premec         ||       fabinader@gmail.com, sgundave@cisco.com, kleung@cisco.com, suresh.krishnan@ericsson.com, domagoj.premec@gmail.com
+#   RFC6603          ||      J. Korhonen, Ed., T. Savolainen, S. Krishnan, O. Troan         ||       jouni.nospam@gmail.com, teemu.savolainen@nokia.com, suresh.krishnan@ericsson.com, ot@cisco.com
+#   RFC6604          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC6605          ||      P. Hoffman, W.C.A. Wijngaards         ||       paul.hoffman@vpnc.org, wouter@nlnetlabs.nl
+#   RFC6606          ||      E. Kim, D. Kaspar, C. Gomez, C. Bormann         ||       eunah.ietf@gmail.com, dokaspar.ietf@gmail.com, carlesgo@entel.upc.edu, cabo@tzi.org
+#   RFC6607          ||      K. Kinnear, R. Johnson, M. Stapp         ||       kkinnear@cisco.com, raj@cisco.com, mjs@cisco.com
+#   RFC6608          ||      J. Dong, M. Chen, A. Suryanarayana         ||       jie.dong@huawei.com, mach.chen@huawei.com, asuryana@cisco.com
+#   RFC6609          ||      C. Daboo, A. Stone         ||       cyrus@daboo.name, aaron@serendipity.cx
+#   RFC6610          ||      H. Jang, A. Yegin, K. Chowdhury, J. Choi, T. Lemon         ||       heejin.jang@gmail.com, alper.yegin@yegin.org, kc@radiomobiles.com, jinchoe@gmail.com, Ted.Lemon@nominum.com
+#   RFC6611          ||      K. Chowdhury, Ed., A. Yegin         ||       kc@radiomobiles.com, alper.yegin@yegin.org
+#   RFC6612          ||      G. Giaretta, Ed.         ||       gerardog@qualcomm.com
+#   RFC6613          ||      A. DeKok         ||       aland@freeradius.org
+#   RFC6614          ||      S. Winter, M. McCauley, S. Venaas, K. Wierenga         ||       stefan.winter@restena.lu, mikem@open.com.au, stig@cisco.com, klaas@cisco.com
+#   RFC6615          ||      T. Dietz, Ed., A. Kobayashi, B. Claise, G. Muenz         ||       Thomas.Dietz@neclab.eu, akoba@nttv6.net, bclaise@cisco.com, muenz@net.in.tum.de
+#   RFC6616          ||      E. Lear, H. Tschofenig, H. Mauldin, S. Josefsson         ||       lear@cisco.com, Hannes.Tschofenig@gmx.net, hmauldin@cisco.com, simon@josefsson.org
+#   RFC6617          ||      D. Harkins         ||       dharkins@arubanetworks.com
+#   RFC6618          ||      J. Korhonen, Ed., B. Patil, H. Tschofenig, D. Kroeselberg         ||       jouni.nospam@gmail.com, basavaraj.patil@nokia.com, Hannes.Tschofenig@gmx.net, dirk.kroeselberg@siemens.com
+#   RFC6619          ||      J. Arkko, L. Eggert, M. Townsley         ||       jari.arkko@piuha.net, lars@netapp.com, townsley@cisco.com
+#   RFC6620          ||      E. Nordmark, M. Bagnulo, E. Levy-Abegnoli         ||       nordmark@acm.org, marcelo@it.uc3m.es, elevyabe@cisco.com
+#   RFC6621          ||      J. Macker, Ed.         ||       macker@itd.nrl.navy.mil
+#   RFC6622          ||      U. Herberg, T. Clausen         ||       ulrich@herberg.name, T.Clausen@computer.org
+#   RFC6623          ||      E. Burger         ||       eburger@standardstrack.com
+#   RFC6624          ||      K. Kompella, B. Kothari, R. Cherukuri         ||       kireeti@juniper.net, bhupesh@cisco.com, cherukuri@juniper.net
+#   RFC6625          ||      E. Rosen, Ed., Y. Rekhter, Ed., W. Hendrickx, R. Qiu         ||       erosen@cisco.com, yakov@juniper.net, wim.henderickx@alcatel-lucent.be, rayq@huawei.com
+#   RFC6626          ||      G. Tsirtsis, V. Park, V. Narayanan, K. Leung         ||       tsirtsis@googlemail.com, vpark@qualcomm.com, vidyan@qualcomm.com, kleung@cisco.com
+#   RFC6627          ||      G. Karagiannis, K. Chan, T. Moncaster, M. Menth, P. Eardley, B. Briscoe         ||       g.karagiannis@utwente.nl, khchan.work@gmail.com, Toby.Moncaster@cl.cam.ac.uk, menth@informatik.uni-tuebingen.de, philip.eardley@bt.com, bob.briscoe@bt.com
+#   RFC6628          ||      S. Shin, K. Kobara         ||       seonghan.shin@aist.go.jp, kobara_conf@m.aist.go.jp
+#   RFC6629          ||      J. Abley, M. Bagnulo, A. Garcia-Martinez         ||       joe.abley@icann.org, marcelo@it.uc3m.es, alberto@it.uc3m.es
+#   RFC6630          ||      Z. Cao, H. Deng, Q. Wu, G. Zorn, Ed.         ||       zehn.cao@gmail.com, denghui02@gmail.com, sunseawq@huawei.com, glenzorn@gmail.com
+#   RFC6631          ||      D. Kuegler, Y. Sheffer         ||       dennis.kuegler@bsi.bund.de, yaronf.ietf@gmail.com
+#   RFC6632          ||      M. Ersue, Ed., B. Claise         ||       mehmet.ersue@nsn.com, bclaise@cisco.com
+#   RFC6633          ||      F. Gont         ||       fgont@si6networks.com
+#   RFC6635          ||      O. Kolkman, Ed., J. Halpern, Ed., IAB         ||       olaf@nlnetlabs.nl, joel.halpern@ericsson.com, iab@iab.org
+#   RFC6636          ||      H. Asaeda, H. Liu, Q. Wu         ||       asaeda@wide.ad.jp, helen.liu@huawei.com, bill.wu@huawei.com
+#   RFC6637          ||      A. Jivsov         ||       Andrey_Jivsov@symantec.com
+#   RFC6638          ||      C. Daboo, B. Desruisseaux         ||       cyrus@daboo.name, bernard.desruisseaux@oracle.com
+#   RFC6639          ||      D. King, Ed., M. Venkatesan, Ed.         ||       daniel@olddog.co.uk, venkat.mahalingams@gmail.com
+#   RFC6640          ||      W. George         ||       wesley.george@twcable.com
+#   RFC6641          ||      C. Everhart, W. Adamson, J. Zhang         ||       everhart@netapp.com, andros@netapp.com, jiayingz@google.com
+#   RFC6642          ||      Q. Wu, Ed., F. Xia, R. Even         ||       sunseawq@huawei.com, xiayangsong@huawei.com, even.roni@huawei.com
+#   RFC6643          ||      J. Schoenwaelder         ||       j.schoenwaelder@jacobs-university.de
+#   RFC6644          ||      D. Evans, R. Droms, S. Jiang         ||       N7DR@ipfonix.com, rdroms@cisco.com, jiangsheng@huawei.com
+#   RFC6645          ||      J. Novak         ||       janovak@cisco.com
+#   RFC6646          ||      H. Song, N. Zong, Y. Yang, R. Alimi         ||       haibin.song@huawei.com, zongning@huawei.com, yry@cs.yale.edu, ralimi@google.com
+#   RFC6647          ||      M. Kucherawy, D. Crocker         ||       superuser@gmail.com, dcrocker@bbiw.net
+#   RFC6648          ||      P. Saint-Andre, D. Crocker, M. Nottingham         ||       ietf@stpeter.im, dcrocker@bbiw.net, mnot@mnot.net
+#   RFC6649          ||      L. Hornquist Astrand, T. Yu         ||       lha@apple.com, tlyu@mit.edu
+#   RFC6650          ||      J. Falk, M. Kucherawy, Ed.         ||       none, superuser@gmail.com
+#   RFC6651          ||      M. Kucherawy         ||       superuser@gmail.com
+#   RFC6652          ||      S. Kitterman         ||       scott@kitterman.com
+#   RFC6653          ||      B. Sarikaya, F. Xia, T. Lemon         ||       sarikaya@ieee.org, xiayangsong@huawei.com, mellon@nominum.com
+#   RFC6654          ||      T. Tsou, C. Zhou, T. Taylor, Q. Chen         ||       Tina.Tsou.Zouting@huawei.com, cathy.zhou@huawei.com, tom.taylor.stds@gmail.com, chenqi.0819@gmail.com
+#   RFC6655          ||      D. McGrew, D. Bailey         ||       mcgrew@cisco.com, dbailey@rsa.com
+#   RFC6656          ||      R. Johnson, K. Kinnear, M. Stapp         ||       raj@cisco.com, kkinnear@cisco.com, mjs@cisco.com
+#   RFC6657          ||      A. Melnikov, J. Reschke         ||       Alexey.Melnikov@isode.com, julian.reschke@greenbytes.de
+#   RFC6658          ||      S. Bryant, Ed., L. Martini, G. Swallow, A. Malis         ||       stbryant@cisco.com, lmartini@cisco.com, swallow@cisco.com, andrew.g.malis@verizon.com
+#   RFC6659          ||      A. Begen         ||       abegen@cisco.com
+#   RFC6660          ||      B. Briscoe, T. Moncaster, M. Menth         ||       bob.briscoe@bt.com, toby.moncaster@cl.cam.ac.uk, menth@uni-tuebingen.de
+#   RFC6661          ||      A. Charny, F. Huang, G. Karagiannis, M. Menth, T. Taylor, Ed.         ||       anna@mwsm.com, huangfuqing@huawei.com, g.karagiannis@utwente.nl, menth@uni-tuebingen.de, tom.taylor.stds@gmail.com
+#   RFC6662          ||      A. Charny, J. Zhang, G. Karagiannis, M. Menth, T. Taylor, Ed.         ||       anna@mwsm.com, joyzhang@cisco.com, g.karagiannis@utwente.nl, menth@uni-tuebingen.de, tom.taylor.stds@gmail.com
+#   RFC6663          ||      G. Karagiannis, T. Taylor, K. Chan, M. Menth, P. Eardley         ||       g.karagiannis@utwente.nl, tom.taylor.stds@gmail.com, khchan.work@gmail.com, menth@uni-tuebingen.de, philip.eardley@bt.com
+#   RFC6664          ||      J. Schaad         ||       ietf@augustcellars.com
+#   RFC6665          ||      A.B. Roach         ||       adam@nostrum.com
+#   RFC6666          ||      N. Hilliard, D. Freedman         ||       nick@inex.ie, david.freedman@uk.clara.net
+#   RFC6667          ||      K. Raza, S. Boutros, C. Pignataro         ||       skraza@cisco.com, sboutros@cisco.com, cpignata@cisco.com
+#   RFC6668          ||      D. Bider, M. Baushke         ||       ietf-ssh2@denisbider.com, mdb@juniper.net
+#   RFC6669          ||      N. Sprecher, L. Fang         ||       nurit.sprecher@nsn.com, lufang@cisco.com
+#   RFC6670          ||      N. Sprecher, KY. Hong         ||       nurit.sprecher@nsn.com, hongk@cisco.com
+#   RFC6671          ||      M. Betts         ||       malcolm.betts@zte.com.cn
+#   RFC6672          ||      S. Rose, W. Wijngaards         ||       scott.rose@nist.gov, wouter@nlnetlabs.nl
+#   RFC6673          ||      A. Morton         ||       acmorton@att.com
+#   RFC6674          ||      F. Brockners, S. Gundavelli, S. Speicher, D. Ward         ||       fbrockne@cisco.com, sgundave@cisco.com, sebastian.speicher@telekom.de, wardd@cisco.com
+#   RFC6675          ||      E. Blanton, M. Allman, L. Wang, I. Jarvinen, M. Kojo, Y. Nishida         ||       elb@psg.com, mallman@icir.org, liliw@juniper.net, ilpo.jarvinen@helsinki.fi, kojo@cs.helsinki.fi, nishida@wide.ad.jp
+#   RFC6676          ||      S. Venaas, R. Parekh, G. Van de Velde, T. Chown, M. Eubanks         ||       stig@cisco.com, riparekh@cisco.com, gvandeve@cisco.com, tjc@ecs.soton.ac.uk, marshall.eubanks@iformata.com
+#   RFC6677          ||      S. Hartman, Ed., T. Clancy, K. Hoeper         ||       hartmans-ietf@mit.edu, tcc@vt.edu, khoeper@motorolasolutions.com
+#   RFC6678          ||      K. Hoeper, S. Hanna, H. Zhou, J. Salowey, Ed.         ||       khoeper@motorolasolutions.com, shanna@juniper.net, hzhou@cisco.com, jsalowey@cisco.com
+#   RFC6679          ||      M. Westerlund, I. Johansson, C. Perkins, P. O'Hanlon, K. Carlberg         ||       magnus.westerlund@ericsson.com, ingemar.s.johansson@ericsson.com, csp@csperkins.org, piers.ohanlon@oii.ox.ac.uk, carlberg@g11.org.uk
+#   RFC6680          ||      N. Williams, L. Johansson, S. Hartman, S. Josefsson         ||       nico@cryptonector.com, leifj@sunet.se, hartmans-ietf@mit.edu, simon@josefsson.org
+#   RFC6681          ||      M. Watson, T. Stockhammer, M. Luby         ||       watsonm@netflix.com, stockhammer@nomor.de, luby@qti.qualcomm.com
+#   RFC6682          ||      M. Watson, T. Stockhammer, M. Luby         ||       watsonm@netflix.com, stockhammer@nomor.de, luby@qti.qualcomm.com
+#   RFC6683          ||      A. Begen, T. Stockhammer         ||       abegen@cisco.com, stockhammer@nomor.de
+#   RFC6684          ||      B. Trammell         ||       trammell@tik.ee.ethz.ch
+#   RFC6685          ||      B. Trammell         ||       trammell@tik.ee.ethz.ch
+#   RFC6686          ||      M. Kucherawy         ||       superuser@gmail.com
+#   RFC6687          ||      J. Tripathi, Ed., J. de Oliveira, Ed., JP. Vasseur, Ed.         ||       jt369@drexel.edu, jau@coe.drexel.edu, jpv@cisco.com
+#   RFC6688          ||      D. Black, Ed., J. Glasgow, S. Faibish         ||       david.black@emc.com, jglasgow@google.com, sfaibish@emc.com
+#   RFC6689          ||      L. Berger         ||       lberger@labn.net
+#   RFC6690          ||      Z. Shelby         ||       zach@sensinode.com
+#   RFC6691          ||      D. Borman         ||       david.borman@quantum.com
+#   RFC6692          ||      R. Clayton, M. Kucherawy         ||       richard.clayton@cl.cam.ac.uk, superuser@gmail.com
+#   RFC6693          ||      A. Lindgren, A. Doria, E. Davies, S. Grasic         ||       andersl@sics.se, avri@acm.org, elwynd@folly.org.uk, samo.grasic@ltu.se
+#   RFC6694          ||      S. Moonesamy, Ed.         ||       sm+ietf@elandsys.com
+#   RFC6695          ||      R. Asati         ||       rajiva@cisco.com
+#   RFC6696          ||      Z. Cao, B. He, Y. Shi, Q. Wu, Ed., G. Zorn, Ed.         ||       caozhen@chinamobile.com, hebaohong@catr.cn, shiyang1@huawei.com, bill.wu@huawei.com, glenzorn@gmail.com
+#   RFC6697          ||      G. Zorn, Ed., Q. Wu, T. Taylor, Y. Nir, K. Hoeper, S. Decugis         ||       glenzorn@gmail.com, bill.wu@huawei.com, tom.taylor.stds@gmail.com, ynir@checkpoint.com, khoeper@motorolasolutions.com, sdecugis@freediameter.net
+#   RFC6698          ||      P. Hoffman, J. Schlyter         ||       paul.hoffman@vpnc.org, jakob@kirei.se
+#   RFC6701          ||      A. Farrel, P. Resnick         ||       adrian@olddog.co.uk, presnick@qti.qualcomm.com
+#   RFC6702          ||      T. Polk, P. Saint-Andre         ||       tim.polk@nist.gov, ietf@stpeter.im
+#   RFC6703          ||      A. Morton, G. Ramachandran, G. Maguluri         ||       acmorton@att.com, gomathi@att.com, gmaguluri@att.com
+#   RFC6704          ||      D. Miles, W. Dec, J. Bristow, R. Maglione         ||       davidmiles@google.com, wdec@cisco.com, James.Bristow@swisscom.com, roberta.maglione@telecomitalia.it
+#   RFC6705          ||      S. Krishnan, R. Koodli, P. Loureiro, Q. Wu, A. Dutta         ||       suresh.krishnan@ericsson.com, rkoodli@cisco.com, loureiro@neclab.eu, Sunseawq@huawei.com, adutta@niksun.com
+#   RFC6706          ||      F. Templin, Ed.         ||       fltemplin@acm.org
+#   RFC6707          ||      B. Niven-Jenkins, F. Le Faucheur, N. Bitar         ||       ben@velocix.com, flefauch@cisco.com, nabil.n.bitar@verizon.com
+#   RFC6708          ||      S. Kiesel, Ed., S. Previdi, M. Stiemerling, R. Woundy, Y. Yang         ||       ietf-alto@skiesel.de, sprevidi@cisco.com, martin.stiemerling@neclab.eu, Richard_Woundy@cable.comcast.com, yry@cs.yale.edu
+#   RFC6709          ||      B. Carpenter, B. Aboba, Ed., S. Cheshire         ||       brian.e.carpenter@gmail.com, bernard_aboba@hotmail.com, cheshire@apple.com
+#   RFC6710          ||      A. Melnikov, K. Carlberg         ||       Alexey.Melnikov@isode.com, carlberg@g11.org.uk
+#   RFC6711          ||      L. Johansson         ||       leifj@nordu.net
+#   RFC6712          ||      T. Kause, M. Peylo         ||       toka@ssh.com, martin.peylo@nsn.com
+#   RFC6713          ||      J. Levine         ||       standards@taugh.com
+#   RFC6714          ||      C. Holmberg, S. Blau, E. Burger         ||       christer.holmberg@ericsson.com, staffan.blau@ericsson.com, eburger@standardstrack.com
+#   RFC6715          ||      D. Cauchie, B. Leiba, K. Li         ||       dany.cauchie@orange.com, barryleiba@computer.org, likepeng@huawei.com
+#   RFC6716          ||      JM. Valin, K. Vos, T. Terriberry         ||       jmvalin@jmvalin.ca, koenvos74@gmail.com, tterriberry@mozilla.com
+#   RFC6717          ||      H. Hotz, R. Allbery         ||       hotz@jpl.nasa.gov, rra@stanford.edu
+#   RFC6718          ||      P. Muley, M. Aissaoui, M. Bocci         ||       praveen.muley@alcatel-lucent.com, mustapha.aissaoui@alcatel-lucent.com, matthew.bocci@alcatel-lucent.com
+#   RFC6719          ||      O. Gnawali, P. Levis         ||       gnawali@cs.uh.edu, pal@cs.stanford.edu
+#   RFC6720          ||      C. Pignataro, R. Asati         ||       cpignata@cisco.com, rajiva@cisco.com
+#   RFC6721          ||      J. Snell         ||       jasnell@us.ibm.com
+#   RFC6722          ||      P. Hoffman, Ed.         ||       paul.hoffman@vpnc.org
+#   RFC6723          ||      L. Jin, Ed., R. Key, Ed., S. Delord, T. Nadeau, S. Boutros         ||       lizhong.jin@zte.com.cn, raymond.key@ieee.org, simon.delord@gmail.com, tnadeau@juniper.net, sboutros@cisco.com
+#   RFC6724          ||      D. Thaler, Ed., R. Draves, A. Matsumoto, T. Chown         ||       dthaler@microsoft.com, richdr@microsoft.com, arifumi@nttv6.net, tjc@ecs.soton.ac.uk
+#   RFC6725          ||      S. Rose         ||       scottr.nist@gmail.com
+#   RFC6726          ||      T. Paila, R. Walsh, M. Luby, V. Roca, R. Lehtonen         ||       toni.paila@gmail.com, roderick.walsh@tut.fi, luby@qti.qualcomm.com, vincent.roca@inria.fr, rami.lehtonen@teliasonera.com
+#   RFC6727          ||      T. Dietz, Ed., B. Claise, J. Quittek         ||       dietz@neclab.eu, bclaise@cisco.com, quittek@neclab.eu
+#   RFC6728          ||      G. Muenz, B. Claise, P. Aitken         ||       muenz@net.in.tum.de, bclaise@cisco.com, paitken@cisco.com
+#   RFC6729          ||      D. Crocker, M. Kucherawy         ||       dcrocker@bbiw.net, superuser@gmail.com
+#   RFC6730          ||      S. Krishnan, J. Halpern         ||       suresh.krishnan@ericsson.com, joel.halpern@ericsson.com
+#   RFC6731          ||      T. Savolainen, J. Kato, T. Lemon         ||       teemu.savolainen@nokia.com, kato@syce.net, Ted.Lemon@nominum.com
+#   RFC6732          ||      V. Kuarsingh, Ed., Y. Lee, O. Vautrin         ||       victor.kuarsingh@gmail.com, yiu_lee@cable.comcast.com, olivier@juniper.net
+#   RFC6733          ||      V. Fajardo, Ed., J. Arkko, J. Loughney, G. Zorn, Ed.         ||       vf0213@gmail.com, jari.arkko@ericsson.com, john.loughney@nokia.com, glenzorn@gmail.com
+#   RFC6734          ||      G. Zorn, Q. Wu, V. Cakulev         ||       glenzorn@gmail.com, sunseawq@huawei.com, violeta.cakulev@alcatel-lucent.com
+#   RFC6735          ||      K. Carlberg, Ed., T. Taylor         ||       carlberg@g11.org.uk, tom.taylor.stds@gmail.com
+#   RFC6736          ||      F. Brockners, S. Bhandari, V. Singh, V. Fajardo         ||       fbrockne@cisco.com, shwethab@cisco.com, vaneeta.singh@gmail.com, vf0213@gmail.com
+#   RFC6737          ||      K. Jiao, G. Zorn         ||       kangjiao@huawei.com, gwz@net-zen.net
+#   RFC6738          ||      V. Cakulev, A. Lior, S. Mizikovsky         ||       violeta.cakulev@alcatel-lucent.com, avi.ietf@lior.org, Simon.Mizikovsky@alcatel-lucent.com
+#   RFC6739          ||      H. Schulzrinne, H. Tschofenig         ||       hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@gmx.net
+#   RFC6740          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
+#   RFC6741          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
+#   RFC6742          ||      RJ Atkinson, SN Bhatti, S. Rose         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk, scottr.nist@gmail.com
+#   RFC6743          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
+#   RFC6744          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
+#   RFC6745          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
+#   RFC6746          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
+#   RFC6747          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
+#   RFC6748          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
+#   RFC6749          ||      D. Hardt, Ed.         ||       dick.hardt@gmail.com
+#   RFC6750          ||      M. Jones, D. Hardt         ||       mbj@microsoft.com, dick.hardt@gmail.com
+#   RFC6751          ||      R. Despres, Ed., B. Carpenter, D. Wing, S. Jiang         ||       despres.remi@laposte.net, brian.e.carpenter@gmail.com, dwing-ietf@fuggles.com, shengjiang@huawei.com
+#   RFC6752          ||      A. Kirkham         ||       tkirkham@paloaltonetworks.com
+#   RFC6753          ||      J. Winterbottom, H. Tschofenig, H. Schulzrinne, M. Thomson         ||       james.winterbottom@commscope.com, Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu, martin.thomson@skype.net
+#   RFC6754          ||      Y. Cai, L. Wei, H. Ou, V. Arya, S. Jethwani         ||       yiqunc@microsoft.com, lwei@cisco.com, hou@cisco.com, varya@directv.com, sjethwani@directv.com
+#   RFC6755          ||      B. Campbell, H. Tschofenig         ||       brian.d.campbell@gmail.com, hannes.tschofenig@gmx.net
+#   RFC6756          ||      S. Trowbridge, Ed., E. Lear, Ed., G. Fishman, Ed., S. Bradner, Ed.         ||       steve.trowbridge@alcatel-lucent.com, lear@cisco.com, gryfishman@aol.com, sob@harvard.edu
+#   RFC6757          ||      S. Gundavelli, Ed., J. Korhonen, Ed., M. Grayson, K. Leung, R. Pazhyannur         ||       sgundave@cisco.com, jouni.nospam@gmail.com, mgrayson@cisco.com, kleung@cisco.com, rpazhyan@cisco.com
+#   RFC6758          ||      A. Melnikov, K. Carlberg         ||       Alexey.Melnikov@isode.com, carlberg@g11.org.uk
+#   RFC6759          ||      B. Claise, P. Aitken, N. Ben-Dvora         ||       bclaise@cisco.com, paitken@cisco.com, nirbd@cisco.com
+#   RFC6760          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
+#   RFC6761          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
+#   RFC6762          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
+#   RFC6763          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
+#   RFC6764          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC6765          ||      E. Beili, M. Morgenstern         ||       edward.beili@actelis.com, moti.morgenstern@ecitele.com
+#   RFC6766          ||      E. Beili         ||       edward.beili@actelis.com
+#   RFC6767          ||      E. Beili, M. Morgenstern         ||       edward.beili@actelis.com, moti.morgenstern@ecitele.com
+#   RFC6768          ||      E. Beili         ||       edward.beili@actelis.com
+#   RFC6769          ||      R. Raszuk, J. Heitz, A. Lo, L. Zhang, X. Xu         ||       robert@raszuk.net, jakob.heitz@ericsson.com, altonlo@aristanetworks.com, lixia@cs.ucla.edu, xuxh@huawei.com
+#   RFC6770          ||      G. Bertrand, Ed., E. Stephan, T. Burbridge, P. Eardley, K. Ma, G. Watson         ||       gilles.bertrand@orange.com, emile.stephan@orange.com, trevor.burbridge@bt.com, philip.eardley@bt.com, kevin.ma@azukisystems.com, gwatson@velocix.com
+#   RFC6771          ||      L. Eggert, G. Camarillo         ||       lars@netapp.com, Gonzalo.Camarillo@ericsson.com
+#   RFC6772          ||      H. Schulzrinne, Ed., H. Tschofenig, Ed., J. Cuellar, J. Polk, J. Morris, M. Thomson         ||       schulzrinne@cs.columbia.edu, Hannes.Tschofenig@gmx.net, Jorge.Cuellar@siemens.com, jmpolk@cisco.com, ietf@jmorris.org, martin.thomson@gmail.com
+#   RFC6773          ||      T. Phelan, G. Fairhurst, C. Perkins         ||       tphelan@sonusnet.com, gorry@erg.abdn.ac.uk, csp@csperkins.org
+#   RFC6774          ||      R. Raszuk, Ed., R. Fernando, K. Patel, D. McPherson, K. Kumaki         ||       robert@raszuk.net, rex@cisco.com, keyupate@cisco.com, dmcpherson@verisign.com, ke-kumaki@kddi.com
+#   RFC6775          ||      Z. Shelby, Ed., S. Chakrabarti, E. Nordmark, C. Bormann         ||       zach@sensinode.com, samita.chakrabarti@ericsson.com, nordmark@cisco.com, cabo@tzi.org
+#   RFC6776          ||      A. Clark, Q. Wu         ||       alan.d.clark@telchemy.com, sunseawq@huawei.com
+#   RFC6777          ||      W. Sun, Ed., G. Zhang, Ed., J. Gao, G. Xie, R. Papneja         ||       sun.weiqiang@gmail.com, zhangguoying@catr.cn, gjhhit@huawei.com, xieg@cs.ucr.edu, rajiv.papneja@huawei.com
+#   RFC6778          ||      R. Sparks         ||       RjS@nostrum.com
+#   RFC6779          ||      U. Herberg, R. Cole, I. Chakeres         ||       ulrich@herberg.name, robert.g.cole@us.army.mil, ian.chakeres@gmail.com
+#   RFC6780          ||      L. Berger, F. Le Faucheur, A. Narayanan         ||       lberger@labn.net, flefauch@cisco.com, ashokn@cisco.com
+#   RFC6781          ||      O. Kolkman, W. Mekking, R. Gieben         ||       olaf@nlnetlabs.nl, matthijs@nlnetlabs.nl, miek.gieben@sidn.nl
+#   RFC6782          ||      V. Kuarsingh, Ed., L. Howard         ||       victor.kuarsingh@gmail.com, lee.howard@twcable.com
+#   RFC6783          ||      J. Levine, R. Gellens         ||       standards@taugh.com, rg+ietf@qti.qualcomm.com
+#   RFC6784          ||      S. Sakane, M. Ishiyama         ||       ssakane@cisco.com, masahiro.ishiyama@toshiba.co.jp
+#   RFC6785          ||      B. Leiba         ||       barryleiba@computer.org
+#   RFC6786          ||      A. Yegin, R. Cragie         ||       alper.yegin@yegin.org, robert.cragie@gridmerge.com
+#   RFC6787          ||      D. Burnett, S. Shanmugham         ||       dburnett@voxeo.com, sarvi@cisco.com
+#   RFC6788          ||      S. Krishnan, A. Kavanagh, B. Varga, S. Ooghe, E. Nordmark         ||       suresh.krishnan@ericsson.com, alan.kavanagh@ericsson.com, balazs.a.varga@ericsson.com, sven.ooghe@alcatel-lucent.com, nordmark@cisco.com
+#   RFC6789          ||      B. Briscoe, Ed., R. Woundy, Ed., A. Cooper, Ed.         ||       bob.briscoe@bt.com, richard_woundy@cable.comcast.com, acooper@cdt.org
+#   RFC6790          ||      K. Kompella, J. Drake, S. Amante, W. Henderickx, L. Yong         ||       kireeti.kompella@gmail.com, jdrake@juniper.net, shane@level3.net, wim.henderickx@alcatel-lucent.com, lucy.yong@huawei.com
+#   RFC6791          ||      X. Li, C. Bao, D. Wing, R. Vaithianathan, G. Huston         ||       xing@cernet.edu.cn, congxiao@cernet.edu.cn, dwing-ietf@fuggles.com, rvaithia@cisco.com, gih@apnic.net
+#   RFC6792          ||      Q. Wu, Ed., G. Hunt, P. Arden         ||       sunseawq@huawei.com, r.geoff.hunt@gmail.com, philip.arden@bt.com
+#   RFC6793          ||      Q. Vohra, E. Chen         ||       quaizar.vohra@gmail.com, enkechen@cisco.com
+#   RFC6794          ||      V. Hilt, G. Camarillo, J. Rosenberg         ||       volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com, jdrosen@jdrosen.net
+#   RFC6795          ||      V. Hilt, G. Camarillo         ||       volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com
+#   RFC6796          ||      V. Hilt, G. Camarillo, J. Rosenberg, D. Worley         ||       volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com, jdrosen@jdrosen.net, worley@ariadne.com
+#   RFC6797          ||      J. Hodges, C. Jackson, A. Barth         ||       Jeff.Hodges@PayPal.com, collin.jackson@sv.cmu.edu, ietf@adambarth.com
+#   RFC6798          ||      A. Clark, Q. Wu         ||       alan.d.clark@telchemy.com, sunseawq@huawei.com
+#   RFC6801          ||      U. Kozat, A. Begen         ||       kozat@docomolabs-usa.com, abegen@cisco.com
+#   RFC6802          ||      S. Baillargeon, C. Flinta, A. Johnsson         ||       steve.baillargeon@ericsson.com, christofer.flinta@ericsson.com, andreas.a.johnsson@ericsson.com
+#   RFC6803          ||      G. Hudson         ||       ghudson@mit.edu
+#   RFC6804          ||      B. Manning         ||       bmanning@sfc.keio.ac.jp
+#   RFC6805          ||      D. King, Ed., A. Farrel, Ed.         ||       daniel@olddog.co.uk, adrian@olddog.co.uk
+#   RFC6806          ||      S. Hartman, Ed., K. Raeburn, L. Zhu         ||       hartmans-ietf@mit.edu, raeburn@mit.edu, lzhu@microsoft.com
+#   RFC6807          ||      D. Farinacci, G. Shepherd, S. Venaas, Y. Cai         ||       dino@cisco.com, gjshep@gmail.com, stig@cisco.com, yiqunc@microsoft.com
+#   RFC6808          ||      L. Ciavattone, R. Geib, A. Morton, M. Wieser         ||       lencia@att.com, Ruediger.Geib@telekom.de, acmorton@att.com, matthias_michael.wieser@stud.tu-darmstadt.de
+#   RFC6809          ||      C. Holmberg, I. Sedlacek, H. Kaplan         ||       christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com, hkaplan@acmepacket.com
+#   RFC6810          ||      R. Bush, R. Austein         ||       randy@psg.com, sra@hactrn.net
+#   RFC6811          ||      P. Mohapatra, J. Scudder, D. Ward, R. Bush, R. Austein         ||       pmohapat@cisco.com, jgs@juniper.net, dward@cisco.com, randy@psg.com, sra@hactrn.net
+#   RFC6812          ||      M. Chiba, A. Clemm, S. Medley, J. Salowey, S. Thombare, E. Yedavalli         ||       mchiba@cisco.com, alex@cisco.com, stmedley@cisco.com, jsalowey@cisco.com, thombare@cisco.com, eshwar@cisco.com
+#   RFC6813          ||      J. Salowey, S. Hanna         ||       jsalowey@cisco.com, shanna@juniper.net
+#   RFC6814          ||      C. Pignataro, F. Gont         ||       cpignata@cisco.com, fgont@si6networks.com
+#   RFC6815          ||      S. Bradner, K. Dubray, J. McQuaid, A. Morton         ||       sob@harvard.edu, kdubray@juniper.net, jim@turnipvideo.com, acmorton@att.com
+#   RFC6816          ||      V. Roca, M. Cunche, J. Lacan         ||       vincent.roca@inria.fr, mathieu.cunche@inria.fr, jerome.lacan@isae.fr
+#   RFC6817          ||      S. Shalunov, G. Hazel, J. Iyengar, M. Kuehlewind         ||       shalunov@shlang.com, greg@bittorrent.com, jiyengar@fandm.edu, mirja.kuehlewind@ikr.uni-stuttgart.de
+#   RFC6818          ||      P. Yee         ||       peter@akayla.com
+#   RFC6819          ||      T. Lodderstedt, Ed., M. McGloin, P. Hunt         ||       torsten@lodderstedt.net, mark.mcgloin@ie.ibm.com, phil.hunt@yahoo.com
+#   RFC6820          ||      T. Narten, M. Karir, I. Foo         ||       narten@us.ibm.com, mkarir@merit.edu, Ian.Foo@huawei.com
+#   RFC6821          ||      E. Marocco, A. Fusco, I. Rimac, V. Gurbani         ||       enrico.marocco@telecomitalia.it, antonio2.fusco@telecomitalia.it, rimac@bell-labs.com, vkg@bell-labs.com
+#   RFC6822          ||      S. Previdi, Ed., L. Ginsberg, M. Shand, A. Roy, D. Ward         ||       sprevidi@cisco.com, ginsberg@cisco.com, imc.shand@gmail.com, akr@cisco.com, wardd@cisco.com
+#   RFC6823          ||      L. Ginsberg, S. Previdi, M. Shand         ||       ginsberg@cisco.com, sprevidi@cisco.com, imc.shand@gmail.com
+#   RFC6824          ||      A. Ford, C. Raiciu, M. Handley, O. Bonaventure         ||       alanford@cisco.com, costin.raiciu@cs.pub.ro, m.handley@cs.ucl.ac.uk, olivier.bonaventure@uclouvain.be
+#   RFC6825          ||      M. Miyazawa, T. Otani, K. Kumaki, T. Nadeau         ||       ma-miyazawa@kddilabs.jp, Tm-otani@kddi.com, ke-kumaki@kddi.com, tnadeau@juniper.net
+#   RFC6826          ||      IJ. Wijnands, Ed., T. Eckert, N. Leymann, M. Napierala         ||       ice@cisco.com, eckert@cisco.com, n.leymann@telekom.de, mnapierala@att.com
+#   RFC6827          ||      A. Malis, Ed., A. Lindem, Ed., D. Papadimitriou, Ed.         ||       andrew.g.malis@verizon.com, acee.lindem@ericsson.com, dimitri.papadimitriou@alcatel-lucent.com
+#   RFC6828          ||      J. Xia         ||       xiajinwei@huawei.com
+#   RFC6829          ||      M. Chen, P. Pan, C. Pignataro, R. Asati         ||       mach@huawei.com, ppan@infinera.com, cpignata@cisco.com, rajiva@cisco.com
+#   RFC6830          ||      D. Farinacci, V. Fuller, D. Meyer, D. Lewis         ||       farinacci@gmail.com, vaf@vaf.net, dmm@1-4-5.net, darlewis@cisco.com
+#   RFC6831          ||      D. Farinacci, D. Meyer, J. Zwiebel, S. Venaas         ||       farinacci@gmail.com, dmm@cisco.com, jzwiebel@cruzio.com, stig@cisco.com
+#   RFC6832          ||      D. Lewis, D. Meyer, D. Farinacci, V. Fuller         ||       darlewis@cisco.com, dmm@1-4-5.net, farinacci@gmail.com, vaf@vaf.net
+#   RFC6833          ||      V. Fuller, D. Farinacci         ||       vaf@vaf.net, farinacci@gmail.com
+#   RFC6834          ||      L. Iannone, D. Saucez, O. Bonaventure         ||       luigi.iannone@telecom-paristech.fr, damien.saucez@inria.fr, olivier.bonaventure@uclouvain.be
+#   RFC6835          ||      D. Farinacci, D. Meyer         ||       farinacci@gmail.com, dmm@cisco.com
+#   RFC6836          ||      V. Fuller, D. Farinacci, D. Meyer, D. Lewis         ||       vaf@vaf.net, farinacci@gmail.com, dmm@1-4-5.net, darlewis@cisco.com
+#   RFC6837          ||      E. Lear         ||       lear@cisco.com
+#   RFC6838          ||      N. Freed, J. Klensin, T. Hansen         ||       ned+ietf@mrochek.com, john+ietf@jck.com, tony+mtsuffix@maillennium.att.com
+#   RFC6839          ||      T. Hansen, A. Melnikov         ||       tony+sss@maillennium.att.com, Alexey.Melnikov@isode.com
+#   RFC6840          ||      S. Weiler, Ed., D. Blacka, Ed.         ||       weiler@tislabs.com, davidb@verisign.com
+#   RFC6841          ||      F. Ljunggren, AM. Eklund Lowinder, T. Okubo         ||       fredrik@kirei.se, amel@iis.se, tomofumi.okubo@icann.org
+#   RFC6842          ||      N. Swamy, G. Halwasia, P. Jhingran         ||       nn.swamy@samsung.com, ghalwasi@cisco.com, pjhingra@cisco.com
+#   RFC6843          ||      A. Clark, K. Gross, Q. Wu         ||       alan.d.clark@telchemy.com, kevin.gross@avanw.com, sunseawq@huawei.com
+#   RFC6844          ||      P. Hallam-Baker, R. Stradling         ||       philliph@comodo.com, rob.stradling@comodo.com
+#   RFC6845          ||      N. Sheth, L. Wang, J. Zhang         ||       nsheth@contrailsystems.com, liliw@juniper.net, zzhang@juniper.net
+#   RFC6846          ||      G. Pelletier, K. Sandlund, L-E. Jonsson, M. West         ||       ghyslain.pelletier@interdigital.com, kristofer.sandlund@ericsson.com, lars-erik@lejonsson.com, mark.a.west@roke.co.uk
+#   RFC6847          ||      D. Melman, T. Mizrahi, D. Eastlake 3rd         ||       davidme@marvell.com, talmi@marvell.com, d3e3e3@gmail.com
+#   RFC6848          ||      J. Winterbottom, M. Thomson, R. Barnes, B. Rosen, R. George         ||       james.winterbottom@commscope.com, martin.thomson@gmail.com, rbarnes@bbn.com, br@brianrosen.net, robinsgv@gmail.com
+#   RFC6849          ||      H. Kaplan, Ed., K. Hedayat, N. Venna, P. Jones, N. Stratton         ||       hkaplan@acmepacket.com, kh274@cornell.edu, vnagarjuna@saperix.com, paulej@packetizer.com, nathan@robotics.net
+#   RFC6850          ||      A. Rijhsinghani, K. Zebrose         ||       anil@charter.net, zebrose@alum.mit.edu
+#   RFC6851          ||      A. Gulbrandsen, N. Freed, Ed.         ||       arnt@gulbrandsen.priv.no, ned+ietf@mrochek.com
+#   RFC6852          ||      R. Housley, S. Mills, J. Jaffe, B. Aboba, L. St.Amour         ||       housley@vigilsec.com, s.mills@ieee.org, jeff@w3.org, bernard_aboba@hotmail.com, st.amour@isoc.org
+#   RFC6853          ||      J. Brzozowski, J. Tremblay, J. Chen, T. Mrugalski         ||       john_brzozowski@cable.comcast.com, jf@jftremblay.com, jack.chen@twcable.com, tomasz.mrugalski@gmail.com
+#   RFC6854          ||      B. Leiba         ||       barryleiba@computer.org
+#   RFC6855          ||      P. Resnick, Ed., C. Newman, Ed., S. Shen, Ed.         ||       presnick@qti.qualcomm.com, chris.newman@oracle.com, shenshuo@cnnic.cn
+#   RFC6856          ||      R. Gellens, C. Newman, J. Yao, K. Fujiwara         ||       rg+ietf@qualcomm.com, chris.newman@oracle.com, yaojk@cnnic.cn, fujiwara@jprs.co.jp
+#   RFC6857          ||      K. Fujiwara         ||       fujiwara@jprs.co.jp
+#   RFC6858          ||      A. Gulbrandsen         ||       arnt@gulbrandsen.priv.no
+#   RFC6859          ||      B. Leiba         ||       barryleiba@computer.org
+#   RFC6860          ||      Y. Yang, A. Retana, A. Roy         ||       yiya@cisco.com, aretana@cisco.com, akr@cisco.com
+#   RFC6861          ||      I. Dzmanashvili         ||       ioseb.dzmanashvili@gmail.com
+#   RFC6862          ||      G. Lebovitz, M. Bhatia, B. Weis         ||       gregory.ietf@gmail.com, manav.bhatia@alcatel-lucent.com, bew@cisco.com
+#   RFC6863          ||      S. Hartman, D. Zhang         ||       hartmans-ietf@mit.edu, zhangdacheng@huawei.com
+#   RFC6864          ||      J. Touch         ||       touch@isi.edu
+#   RFC6865          ||      V. Roca, M. Cunche, J. Lacan, A. Bouabdallah, K. Matsuzono         ||       vincent.roca@inria.fr, mathieu.cunche@inria.fr, jerome.lacan@isae.fr, abouabdallah@cdta.dz, kazuhisa@sfc.wide.ad.jp
+#   RFC6866          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com
+#   RFC6867          ||      Y. Nir, Q. Wu         ||       ynir@checkpoint.com, sunseawq@huawei.com
+#   RFC6868          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC6869          ||      G. Salgueiro, J. Clarke, P. Saint-Andre         ||       gsalguei@cisco.com, jclarke@cisco.com, ietf@stpeter.im
+#   RFC6870          ||      P. Muley, Ed., M. Aissaoui, Ed.         ||       praveen.muley@alcatel-lucent.com, mustapha.aissaoui@alcatel-lucent.com
+#   RFC6871          ||      R. Gilman, R. Even, F. Andreasen         ||       bob_gilman@comcast.net, roni.even@mail01.huawei.com, fandreas@cisco.com
+#   RFC6872          ||      V. Gurbani, Ed., E. Burger, Ed., T. Anjali, H. Abdelnur, O. Festor         ||       vkg@bell-labs.com, eburger@standardstrack.com, tricha@ece.iit.edu, humbol@gmail.com, Olivier.Festor@loria.fr
+#   RFC6873          ||      G. Salgueiro, V. Gurbani, A. B. Roach         ||       gsalguei@cisco.com, vkg@bell-labs.com, adam@nostrum.com
+#   RFC6874          ||      B. Carpenter, S. Cheshire, R. Hinden         ||       brian.e.carpenter@gmail.com, cheshire@apple.com, bob.hinden@gmail.com
+#   RFC6875          ||      S. Kamei, T. Momose, T. Inoue, T. Nishitani         ||       skame@nttv6.jp, tmomose@cisco.com, inoue@jp.ntt.net, tomohiro.nishitani@ntt.com
+#   RFC6876          ||      P. Sangster, N. Cam-Winget, J. Salowey         ||       paul_sangster@symantec.com, ncamwing@cisco.com, jsalowey@cisco.com
+#   RFC6877          ||      M. Mawatari, M. Kawashima, C. Byrne         ||       mawatari@jpix.ad.jp, kawashimam@vx.jp.nec.com, cameron.byrne@t-mobile.com
+#   RFC6878          ||      A.B. Roach         ||       adam@nostrum.com
+#   RFC6879          ||      S. Jiang, B. Liu, B. Carpenter         ||       jiangsheng@huawei.com, leo.liubing@huawei.com, brian.e.carpenter@gmail.com
+#   RFC6880          ||      L. Johansson         ||       leifj@sunet.se
+#   RFC6881          ||      B. Rosen, J. Polk         ||       br@brianrosen.net, jmpolk@cisco.com
+#   RFC6882          ||      K. Kumaki, Ed., T. Murai, D. Cheng, S. Matsushima, P. Jiang         ||       ke-kumaki@kddi.com, murai@fnsc.co.jp, dean.cheng@huawei.com, satoru.matsushima@g.softbank.co.jp, pe-jiang@kddi.com
+#   RFC6883          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com
+#   RFC6884          ||      Z. Fang         ||       zfang@qualcomm.com
+#   RFC6885          ||      M. Blanchet, A. Sullivan         ||       Marc.Blanchet@viagenie.ca, asullivan@dyn.com
+#   RFC6886          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
+#   RFC6887          ||      D. Wing, Ed., S. Cheshire, M. Boucadair, R. Penno, P. Selkirk         ||       dwing-ietf@fuggles.com, cheshire@apple.com, mohamed.boucadair@orange.com, repenno@cisco.com, pselkirk@isc.org
+#   RFC6888          ||      S. Perreault, Ed., I. Yamagata, S. Miyakawa, A. Nakagawa, H. Ashida         ||       simon.perreault@viagenie.ca, ikuhei@nttv6.jp, miyakawa@nttv6.jp, a-nakagawa@jpix.ad.jp, hiashida@cisco.com
+#   RFC6889          ||      R. Penno, T. Saxena, M. Boucadair, S. Sivakumar         ||       rpenno@juniper.net, tasaxena@cisco.com, mohamed.boucadair@orange.com, ssenthil@cisco.com
+#   RFC6890          ||      M. Cotton, L. Vegoda, R. Bonica, Ed., B. Haberman         ||       michelle.cotton@icann.org, leo.vegoda@icann.org, rbonica@juniper.net, brian@innovationslab.net
+#   RFC6891          ||      J. Damas, M. Graff, P. Vixie         ||       joao@bondis.org, explorer@flame.org, vixie@isc.org
+#   RFC6892          ||      E. Wilde         ||       erik.wilde@emc.com
+#   RFC6893          ||      P. Higgs, P. Szucs         ||       paul.higgs@ericsson.com, paul.szucs@eu.sony.com
+#   RFC6894          ||      R. Papneja, S. Vapiwala, J. Karthik, S. Poretsky, S. Rao, JL. Le Roux         ||       rajiv.papneja@huawei.com, svapiwal@cisco.com, jkarthik@cisco.com, sporetsky@allot.com, shankar.rao@du.edu, jeanlouis.leroux@orange.com
+#   RFC6895          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC6896          ||      S. Barbato, S. Dorigotti, T. Fossati, Ed.         ||       tat@koanlogic.com, stewy@koanlogic.com, tho@koanlogic.com
+#   RFC6897          ||      M. Scharf, A. Ford         ||       michael.scharf@alcatel-lucent.com, alanford@cisco.com
+#   RFC6898          ||      D. Li, D. Ceccarelli, L. Berger         ||       huawei.danli@huawei.com, daniele.ceccarelli@ericsson.com, lberger@labn.net
+#   RFC6901          ||      P. Bryan, Ed., K. Zyp, M. Nottingham, Ed.         ||       pbryan@anode.ca, kris@sitepen.com, mnot@mnot.net
+#   RFC6902          ||      P. Bryan, Ed., M. Nottingham, Ed.         ||       pbryan@anode.ca, mnot@mnot.net
+#   RFC6903          ||      J. Snell         ||       jasnell@gmail.com
+#   RFC6904          ||      J. Lennox         ||       jonathan@vidyo.com
+#   RFC6905          ||      T. Senevirathne, D. Bond, S. Aldrin, Y. Li, R. Watve         ||       tsenevir@cisco.com, mokon@mokon.net, aldrin.ietf@gmail.com, liyizhou@huawei.com, rwatve@cisco.com
+#   RFC6906          ||      E. Wilde         ||       erik.wilde@emc.com
+#   RFC6907          ||      T. Manderson, K. Sriram, R. White         ||       terry.manderson@icann.org, ksriram@nist.gov, russ@riw.us
+#   RFC6908          ||      Y. Lee, R. Maglione, C. Williams, C. Jacquenet, M. Boucadair         ||       yiu_lee@cable.comcast.com, robmgl@cisco.com, carlw@mcsr-labs.org, christian.jacquenet@orange.com, mohamed.boucadair@orange.com
+#   RFC6909          ||      S. Gundavelli, Ed., X. Zhou, J. Korhonen, G. Feige, R. Koodli         ||       sgundave@cisco.com, zhou.xingyue@zte.com.cn, jouni.nospam@gmail.com, gfeige@cisco.com, rkoodli@cisco.com
+#   RFC6910          ||      D. Worley, M. Huelsemann, R. Jesske, D. Alexeitsev         ||       worley@ariadne.com, martin.huelsemann@telekom.de, r.jesske@telekom.de, alexeitsev@teleflash.com
+#   RFC6911          ||      W. Dec, Ed., B. Sarikaya, G. Zorn, Ed., D. Miles, B. Lourdelet         ||       wdec@cisco.com, sarikaya@ieee.org, glenzorn@gmail.com, davidmiles@google.com, blourdel@juniper.net
+#   RFC6912          ||      A. Sullivan, D. Thaler, J. Klensin, O. Kolkman         ||       asullivan@dyn.com, dthaler@microsoft.com, john-ietf@jck.com, olaf@NLnetLabs.nl
+#   RFC6913          ||      D. Hanes, G. Salgueiro, K. Fleming         ||       dhanes@cisco.com, gsalguei@cisco.com, kevin@kpfleming.us
+#   RFC6914          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
+#   RFC6915          ||      R. Bellis         ||       ray.bellis@nominet.org.uk
+#   RFC6916          ||      R. Gagliano, S. Kent, S. Turner         ||       rogaglia@cisco.com, kent@bbn.com, turners@ieca.com
+#   RFC6917          ||      C. Boulton, L. Miniero, G. Munson         ||       chris@ns-technologies.com, lorenzo@meetecho.com, gamunson@gmail.com
+#   RFC6918          ||      F. Gont, C. Pignataro         ||       fgont@si6networks.com, cpignata@cisco.com
+#   RFC6919          ||      R. Barnes, S. Kent, E. Rescorla         ||       rlb@ipv.sx, kent@bbn.com, ekr@rtfm.com
+#   RFC6920          ||      S. Farrell, D. Kutscher, C. Dannewitz, B. Ohlman, A. Keranen, P. Hallam-Baker         ||       stephen.farrell@cs.tcd.ie, kutscher@neclab.eu, cdannewitz@googlemail.com, Borje.Ohlman@ericsson.com, ari.keranen@ericsson.com, philliph@comodo.com
+#   RFC6921          ||      R. Hinden         ||       bob.hinden@gmail.com
+#   RFC6922          ||      Y. Shafranovich         ||       ietf@shaftek.org
+#   RFC6923          ||      R. Winter, E. Gray, H. van Helvoort, M. Betts         ||       rolf.winter@neclab.eu, eric.gray@ericsson.com, huub.van.helvoort@huawei.com, malcolm.betts@zte.com.cn
+#   RFC6924          ||      B. Leiba         ||       barryleiba@computer.org
+#   RFC6925          ||      B. Joshi, R. Desetti, M. Stapp         ||       bharat_joshi@infosys.com, ramakrishnadtv@infosys.com, mjs@cisco.com
+#   RFC6926          ||      K. Kinnear, M. Stapp, R. Desetti, B. Joshi, N. Russell, P. Kurapati, B. Volz         ||       kkinnear@cisco.com, mjs@cisco.com, ramakrishnadtv@infosys.com, bharat_joshi@infosys.com, neil.e.russell@gmail.com, kurapati@juniper.net, volz@cisco.com
+#   RFC6927          ||      J. Levine, P. Hoffman         ||       standards@taugh.com, paul.hoffman@vpnc.org
+#   RFC6928          ||      J. Chu, N. Dukkipati, Y. Cheng, M. Mathis         ||       hkchu@google.com, nanditad@google.com, ycheng@google.com, mattmathis@google.com
+#   RFC6929          ||      A. DeKok, A. Lior         ||       aland@networkradius.com, avi.ietf@lior.org
+#   RFC6930          ||      D. Guo, S. Jiang, Ed., R. Despres, R. Maglione         ||       guoseu@huawei.com, jiangsheng@huawei.com, despres.remi@laposte.net, robmgl@cisco.com
+#   RFC6931          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC6932          ||      D. Harkins, Ed.         ||       dharkins@arubanetworks.com
+#   RFC6933          ||      A. Bierman, D. Romascanu, J. Quittek, M. Chandramouli         ||       andy@yumaworks.com, dromasca@gmail.com , quittek@neclab.eu, moulchan@cisco.com
+#   RFC6934          ||      N. Bitar, Ed., S. Wadhwa, Ed., T. Haag, H. Li         ||       nabil.n.bitar@verizon.com, sanjay.wadhwa@alcatel-lucent.com, HaagT@telekom.de, hongyu.lihongyu@huawei.com
+#   RFC6935          ||      M. Eubanks, P. Chimento, M. Westerlund         ||       marshall.eubanks@gmail.com, Philip.Chimento@jhuapl.edu, magnus.westerlund@ericsson.com
+#   RFC6936          ||      G. Fairhurst, M. Westerlund         ||       gorry@erg.abdn.ac.uk, magnus.westerlund@ericsson.com
+#   RFC6937          ||      M. Mathis, N. Dukkipati, Y. Cheng         ||       mattmathis@google.com, nanditad@google.com, ycheng@google.com
+#   RFC6938          ||      J. Scudder         ||       jgs@juniper.net
+#   RFC6939          ||      G. Halwasia, S. Bhandari, W. Dec         ||       ghalwasi@cisco.com, shwethab@cisco.com, wdec@cisco.com
+#   RFC6940          ||      C. Jennings, B. Lowekamp, Ed., E. Rescorla, S. Baset, H. Schulzrinne         ||       fluffy@cisco.com, bbl@lowekamp.net, ekr@rtfm.com, salman@cs.columbia.edu, hgs@cs.columbia.edu
+#   RFC6941          ||      L. Fang, Ed., B. Niven-Jenkins, Ed., S. Mansfield, Ed., R. Graveman, Ed.         ||       lufang@cisco.com, ben@niven-jenkins.co.uk, scott.mansfield@ericsson.com, rfg@acm.org
+#   RFC6942          ||      J. Bournelle, L. Morand, S. Decugis, Q. Wu, G. Zorn         ||       julien.bournelle@orange.com, lionel.morand@orange.com, sdecugis@freediameter.net, sunseawq@huawei.com, glenzorn@gmail.com
+#   RFC6943          ||      D. Thaler, Ed.         ||       dthaler@microsoft.com
+#   RFC6944          ||      S. Rose         ||       scottr.nist@gmail.com
+#   RFC6945          ||      R. Bush, B. Wijnen, K. Patel, M. Baer         ||       randy@psg.com, bertietf@bwijnen.net, keyupate@cisco.com, baerm@tislabs.com
+#   RFC6946          ||      F. Gont         ||       fgont@si6networks.com
+#   RFC6947          ||      M. Boucadair, H. Kaplan, R. Gilman, S. Veikkolainen         ||       mohamed.boucadair@orange.com, hkaplan@acmepacket.com, bob_gilman@comcast.net, Simo.Veikkolainen@nokia.com
+#   RFC6948          ||      A. Keranen, J. Arkko         ||       ari.keranen@ericsson.com, jari.arkko@piuha.net
+#   RFC6949          ||      H. Flanagan, N. Brownlee         ||       rse@rfc-editor.org, rfc-ise@rfc-editor.org
+#   RFC6950          ||      J. Peterson, O. Kolkman, H. Tschofenig, B. Aboba         ||       jon.peterson@neustar.biz, olaf@nlnetlabs.nl, Hannes.Tschofenig@gmx.net, Bernard_aboba@hotmail.com
+#   RFC6951          ||      M. Tuexen, R. Stewart         ||       tuexen@fh-muenster.de, randall@lakerest.net
+#   RFC6952          ||      M. Jethanandani, K. Patel, L. Zheng         ||       mjethanandani@gmail.com, keyupate@cisco.com, vero.zheng@huawei.com
+#   RFC6953          ||      A. Mancuso, Ed., S. Probasco, B. Patil         ||       amancuso@google.com, scott@probasco.me, basavpat@cisco.com
+#   RFC6954          ||      J. Merkle, M. Lochter         ||       johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de
+#   RFC6955          ||      J. Schaad, H. Prafullchandra         ||       ietf@augustcellars.com, HPrafullchandra@hytrust.com
+#   RFC6956          ||      W. Wang, E. Haleplidis, K. Ogawa, C. Li, J. Halpern         ||       wmwang@zjsu.edu.cn, ehalep@ece.upatras.gr, ogawa.kentaro@lab.ntt.co.jp, chuanhuang_li@zjsu.edu.cn, joel.halpern@ericsson.com
+#   RFC6957          ||      F. Costa, J-M. Combes, Ed., X. Pougnard, H. Li         ||       fabio.costa@orange.com, jeanmichel.combes@orange.com, xavier.pougnard@orange.com, lihy@huawei.com
+#   RFC6958          ||      A. Clark, S. Zhang, J. Zhao, Q. Wu, Ed.         ||       alan.d.clark@telchemy.com, zhangyx@sttri.com.cn, zhaojing@sttri.com.cn, sunseawq@huawei.com
+#   RFC6959          ||      D. McPherson, F. Baker, J. Halpern         ||       dmcpherson@verisign.com, fred@cisco.com, joel.halpern@ericsson.com
+#   RFC6960          ||      S. Santesson, M. Myers, R. Ankney, A. Malpani, S. Galperin, C. Adams         ||       sts@aaa-sec.com, mmyers@fastq.com, none, ambarish@gmail.com, slava.galperin@gmail.com, cadams@eecs.uottawa.ca
+#   RFC6961          ||      Y. Pettersen         ||       yngve@spec-work.net
+#   RFC6962          ||      B. Laurie, A. Langley, E. Kasper         ||       benl@google.com, agl@google.com, ekasper@google.com
+#   RFC6963          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC6964          ||      F. Templin         ||       fltemplin@acm.org
+#   RFC6965          ||      L. Fang, Ed., N. Bitar, R. Zhang, M. Daikoku, P. Pan         ||       lufang@cisco.com, nabil.bitar@verizon.com, raymond.zhang@alcatel-lucent.com, ms-daikoku@kddi.com, ppan@infinera.com
+#   RFC6967          ||      M. Boucadair, J. Touch, P. Levis, R. Penno         ||       mohamed.boucadair@orange.com, touch@isi.edu, pierre.levis@orange.com, repenno@cisco.com
+#   RFC6968          ||      V. Roca, B. Adamson         ||       vincent.roca@inria.fr, adamson@itd.nrl.navy.mil
+#   RFC6969          ||      A. Retana, D. Cheng         ||       aretana@cisco.com, dean.cheng@huawei.com
+#   RFC6970          ||      M. Boucadair, R. Penno, D. Wing         ||       mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com
+#   RFC6971          ||      U. Herberg, Ed., A. Cardenas, T. Iwao, M. Dow, S. Cespedes         ||       ulrich.herberg@us.fujitsu.com, alvaro.cardenas@me.com, smartnetpro-iwao_std@ml.css.fujitsu.com, m.dow@freescale.com, scespedes@icesi.edu.co
+#   RFC6972          ||      Y. Zhang, N. Zong         ||       hishigh@gmail.com, zongning@huawei.com
+#   RFC6973          ||      A. Cooper, H. Tschofenig, B. Aboba, J. Peterson, J. Morris, M. Hansen, R. Smith         ||       acooper@cdt.org, Hannes.Tschofenig@gmx.net, bernard_aboba@hotmail.com, jon.peterson@neustar.biz, ietf@jmorris.org, marit.hansen@datenschutzzentrum.de, rhys.smith@ja.net
+#   RFC6974          ||      Y. Weingarten, S. Bryant, D. Ceccarelli, D. Caviglia, F. Fondelli, M. Corsi, B. Wu, X. Dai         ||       wyaacov@gmail.com, stbryant@cisco.com, daniele.ceccarelli@ericsson.com, diego.caviglia@ericsson.com, francesco.fondelli@ericsson.com, corsi.marco@gmail.com, wu.bo@zte.com.cn, dai.xuehui@zte.com.cn
+#   RFC6975          ||      S. Crocker, S. Rose         ||       steve@shinkuro.com, scottr.nist@gmail.com
+#   RFC6976          ||      M. Shand, S. Bryant, S. Previdi, C. Filsfils, P. Francois, O. Bonaventure         ||       imc.shand@googlemail.com, stbryant@cisco.com, sprevidi@cisco.com, cfilsfil@cisco.com, pierre.francois@imdea.org, Olivier.Bonaventure@uclouvain.be
+#   RFC6977          ||      M. Boucadair, X. Pougnard         ||       mohamed.boucadair@orange.com, xavier.pougnard@orange.com
+#   RFC6978          ||      J. Touch         ||       touch@isi.edu
+#   RFC6979          ||      T. Pornin         ||       pornin@bolet.org
+#   RFC6980          ||      F. Gont         ||       fgont@si6networks.com
+#   RFC6981          ||      S. Bryant, S. Previdi, M. Shand         ||       stbryant@cisco.com, sprevidi@cisco.com, imc.shand@googlemail.com
+#   RFC6982          ||      Y. Sheffer, A. Farrel         ||       yaronf.ietf@gmail.com, adrian@olddog.co.uk
+#   RFC6983          ||      R. van Brandenburg, O. van Deventer, F. Le Faucheur, K. Leung         ||       ray.vanbrandenburg@tno.nl, oskar.vandeventer@tno.nl, flefauch@cisco.com, kleung@cisco.com
+#   RFC6984          ||      W. Wang, K. Ogawa, E. Haleplidis, M. Gao, J. Hadi Salim         ||       wmwang@zjsu.edu.cn, ogawa.kentaro@lab.ntt.co.jp, ehalep@ece.upatras.gr, gaoming@mail.zjgsu.edu.cn, hadi@mojatatu.com
+#   RFC6985          ||      A. Morton         ||       acmorton@att.com
+#   RFC6986          ||      V. Dolmatov, Ed., A. Degtyarev         ||       dol@cryptocom.ru, alexey@renatasystems.org
+#   RFC6987          ||      A. Retana, L. Nguyen, A. Zinin, R. White, D. McPherson         ||       aretana@cisco.com, lhnguyen@cisco.com, alex.zinin@gmail.com, Russ.White@vce.com, dmcpherson@verisign.com
+#   RFC6988          ||      J. Quittek, Ed., M. Chandramouli, R. Winter, T. Dietz, B. Claise         ||       quittek@neclab.eu, moulchan@cisco.com, Rolf.Winter@neclab.eu, Thomas.Dietz@neclab.eu, bclaise@cisco.com
+#   RFC6989          ||      Y. Sheffer, S. Fluhrer         ||       yaronf.ietf@gmail.com, sfluhrer@cisco.com
+#   RFC6990          ||      R. Huang, Q. Wu, H. Asaeda, G. Zorn         ||       rachel.huang@huawei.com, bill.wu@huawei.com, asaeda@nict.go.jp, glenzorn@gmail.com
+#   RFC6991          ||      J. Schoenwaelder, Ed.         ||       j.schoenwaelder@jacobs-university.de
+#   RFC6992          ||      D. Cheng, M. Boucadair, A. Retana         ||       dean.cheng@huawei.com, mohamed.boucadair@orange.com, aretana@cisco.com
+#   RFC6993          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC6994          ||      J. Touch         ||       touch@isi.edu
+#   RFC6996          ||      J. Mitchell         ||       Jon.Mitchell@microsoft.com
+#   RFC6997          ||      M. Goyal, Ed., E. Baccelli, M. Philipp, A. Brandt, J. Martocci         ||       mukul@uwm.edu, Emmanuel.Baccelli@inria.fr, matthias-philipp@gmx.de, abr@sdesigns.dk, jerald.p.martocci@jci.com
+#   RFC6998          ||      M. Goyal, Ed., E. Baccelli, A. Brandt, J. Martocci         ||       mukul@uwm.edu, Emmanuel.Baccelli@inria.fr, abr@sdesigns.dk, jerald.p.martocci@jci.com
+#   RFC7001          ||      M. Kucherawy         ||       superuser@gmail.com
+#   RFC7002          ||      A. Clark, G. Zorn, Q. Wu         ||       alan.d.clark@telchemy.com, glenzorn@gmail.com, sunseawq@huawei.com
+#   RFC7003          ||      A. Clark, R. Huang, Q. Wu, Ed.         ||       alan.d.clark@telchemy.com, Rachel@huawei.com, sunseawq@huawei.com
+#   RFC7004          ||      G. Zorn, R. Schott, Q. Wu, Ed., R. Huang         ||       glenzorn@gmail.com, Roland.Schott@telekom.de, sunseawq@huawei.com, Rachel@huawei.com
+#   RFC7005          ||      A. Clark, V. Singh, Q. Wu         ||       alan.d.clark@telchemy.com, varun@comnet.tkk.fi, sunseawq@huawei.com
+#   RFC7006          ||      M. Garcia-Martin, S. Veikkolainen, R. Gilman         ||       miguel.a.garcia@ericsson.com, simo.veikkolainen@nokia.com, bob_gilman@comcast.net
+#   RFC7007          ||      T. Terriberry         ||       tterribe@xiph.org
+#   RFC7008          ||      S. Kiyomoto, W. Shin         ||       kiyomoto@kddilabs.jp, ohpato@hanmail.net
+#   RFC7009          ||      T. Lodderstedt, Ed., S. Dronia, M. Scurtescu         ||       torsten@lodderstedt.net, sdronia@gmx.de, mscurtescu@google.com
+#   RFC7010          ||      B. Liu, S. Jiang, B. Carpenter, S. Venaas, W. George         ||       leo.liubing@huawei.com, jiangsheng@huawei.com, brian.e.carpenter@gmail.com, stig@cisco.com, wesley.george@twcable.com
+#   RFC7011          ||      B. Claise, Ed., B. Trammell, Ed., P. Aitken         ||       bclaise@cisco.com, trammell@tik.ee.ethz.ch, paitken@cisco.com
+#   RFC7012          ||      B. Claise, Ed., B. Trammell, Ed.         ||       bclaise@cisco.com, trammell@tik.ee.ethz.ch
+#   RFC7013          ||      B. Trammell, B. Claise         ||       trammell@tik.ee.ethz.ch, bclaise@cisco.com
+#   RFC7014          ||      S. D'Antonio, T. Zseby, C. Henke, L. Peluso         ||       salvatore.dantonio@uniparthenope.it, tanja@caida.org, christian.henke@tektronix.com, lorenzo.peluso@unina.it
+#   RFC7015          ||      B. Trammell, A. Wagner, B. Claise         ||       trammell@tik.ee.ethz.ch, arno@wagner.name, bclaise@cisco.com
+#   RFC7016          ||      M. Thornburgh         ||       mthornbu@adobe.com
+#   RFC7017          ||      R. Sparks         ||       rjsparks@nostrum.com
+#   RFC7018          ||      V. Manral, S. Hanna         ||       vishwas.manral@hp.com, shanna@juniper.net
+#   RFC7019          ||      J. Buford, M. Kolberg, Ed.         ||       buford@avaya.com, mkolberg@ieee.org
+#   RFC7020          ||      R. Housley, J. Curran, G. Huston, D. Conrad         ||       housley@vigilsec.com, jcurran@arin.net, gih@apnic.net, drc@virtualized.org
+#   RFC7021          ||      C. Donley, Ed., L. Howard, V. Kuarsingh, J. Berg, J. Doshi         ||       c.donley@cablelabs.com, william.howard@twcable.com, victor@jvknet.com, j.berg@cablelabs.com, jineshd@juniper.net
+#   RFC7022          ||      A. Begen, C. Perkins, D. Wing, E. Rescorla         ||       abegen@cisco.com, csp@csperkins.org, dwing-ietf@fuggles.com, ekr@rtfm.com
+#   RFC7023          ||      D. Mohan, Ed., N. Bitar, Ed., A. Sajassi, Ed., S. DeLord, P. Niger, R. Qiu         ||       dinmohan@hotmail.com, nabil.n.bitar@verizon.com, sajassi@cisco.com, simon.delord@gmail.com, philippe.niger@orange.com, rqiu@juniper.net
+#   RFC7024          ||      H. Jeng, J. Uttaro, L. Jalil, B. Decraene, Y. Rekhter, R. Aggarwal         ||       hj2387@att.com, ju1738@att.com, luay.jalil@verizon.com, bruno.decraene@orange.com, yakov@juniper.net, raggarwa_1@yahoo.com
+#   RFC7025          ||      T. Otani, K. Ogaki, D. Caviglia, F. Zhang, C. Margaria         ||       tm-otani@kddi.com, ke-oogaki@kddi.com, diego.caviglia@ericsson.com, zhangfatai@huawei.com, cyril.margaria@coriant.com
+#   RFC7026          ||      A. Farrel, S. Bryant         ||       adrian@olddog.co.uk, stbryant@cisco.com
+#   RFC7027          ||      J. Merkle, M. Lochter         ||       johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de
+#   RFC7028          ||      JC. Zuniga, LM. Contreras, CJ. Bernardos, S. Jeon, Y. Kim         ||       JuanCarlos.Zuniga@InterDigital.com, lmcm@tid.es, cjbc@it.uc3m.es, seiljeon@av.it.pt, yhkim@dcn.ssu.ac.kr
+#   RFC7029          ||      S. Hartman, M. Wasserman, D. Zhang         ||       hartmans-ietf@mit.edu, mrw@painless-security.com, zhangdacheng@huawei.com
+#   RFC7030          ||      M. Pritikin, Ed., P. Yee, Ed., D. Harkins, Ed.         ||       pritikin@cisco.com, peter@akayla.com, dharkins@arubanetworks.com
+#   RFC7031          ||      T. Mrugalski, K. Kinnear         ||       tomasz.mrugalski@gmail.com, kkinnear@cisco.com
+#   RFC7032          ||      T. Beckhaus, Ed., B. Decraene, K. Tiruveedhula, M. Konstantynowicz, Ed., L. Martini         ||       thomas.beckhaus@telekom.de, bruno.decraene@orange.com, kishoret@juniper.net, maciek@cisco.com, lmartini@cisco.com
+#   RFC7033          ||      P. Jones, G. Salgueiro, M. Jones, J. Smarr         ||       paulej@packetizer.com, gsalguei@cisco.com, mbj@microsoft.com, jsmarr@google.com
+#   RFC7034          ||      D. Ross, T. Gondrom         ||       dross@microsoft.com, tobias.gondrom@gondrom.org
+#   RFC7035          ||      M. Thomson, B. Rosen, D. Stanley, G. Bajko, A. Thomson         ||       martin.thomson@skype.net, br@brianrosen.net, dstanley@arubanetworks.com, Gabor.Bajko@nokia.com, athomson@lgscout.com
+#   RFC7036          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC7037          ||      L. Yeh, M. Boucadair         ||       leaf.yeh.sdo@gmail.com, mohamed.boucadair@orange.com
+#   RFC7038          ||      R. Ogier         ||       ogier@earthlink.net
+#   RFC7039          ||      J. Wu, J. Bi, M. Bagnulo, F. Baker, C. Vogt, Ed.         ||       jianping@cernet.edu.cn, junbi@tsinghua.edu.cn, marcelo@it.uc3m.es, fred@cisco.com, mail@christianvogt.net
+#   RFC7040          ||      Y. Cui, J. Wu, P. Wu, O. Vautrin, Y. Lee         ||       yong@csnet1.cs.tsinghua.edu.cn, jianping@cernet.edu.cn, pengwu.thu@gmail.com, Olivier@juniper.net, yiu_lee@cable.comcast.com
+#   RFC7041          ||      F. Balus, Ed., A. Sajassi, Ed., N. Bitar, Ed.         ||       florin.balus@alcatel-lucent.com, sajassi@cisco.com, nabil.n.bitar@verizon.com
+#   RFC7042          ||      D. Eastlake 3rd, J. Abley         ||       d3e3e3@gmail.com, jabley@dyn.com
+#   RFC7043          ||      J. Abley         ||       jabley@dyn.com
+#   RFC7044          ||      M. Barnes, F. Audet, S. Schubert, J. van Elburg, C. Holmberg         ||       mary.ietf.barnes@gmail.com, francois.audet@skype.net, shida@ntt-at.com, ietf.hanserik@gmail.com, christer.holmberg@ericsson.com
+#   RFC7045          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com
+#   RFC7046          ||      M. Waehlisch, T. Schmidt, S. Venaas         ||       mw@link-lab.net, Schmidt@informatik.haw-hamburg.de, stig@cisco.com
+#   RFC7047          ||      B. Pfaff, B. Davie, Ed.         ||       blp@nicira.com, bsd@nicira.com
+#   RFC7048          ||      E. Nordmark, I. Gashinsky         ||       nordmark@acm.org, igor@yahoo-inc.com
+#   RFC7049          ||      C. Bormann, P. Hoffman         ||       cabo@tzi.org, paul.hoffman@vpnc.org
+#   RFC7050          ||      T. Savolainen, J. Korhonen, D. Wing         ||       teemu.savolainen@nokia.com, jouni.nospam@gmail.com, dwing-ietf@fuggles.com
+#   RFC7051          ||      J. Korhonen, Ed., T. Savolainen, Ed.         ||       jouni.nospam@gmail.com, teemu.savolainen@nokia.com
+#   RFC7052          ||      G. Schudel, A. Jain, V. Moreno         ||       gschudel@cisco.com, atjain@juniper.net, vimoreno@cisco.com
+#   RFC7053          ||      M. Tuexen, I. Ruengeler, R. Stewart         ||       tuexen@fh-muenster.de, i.ruengeler@fh-muenster.de, randall@lakerest.net
+#   RFC7054          ||      A. Farrel, H. Endo, R. Winter, Y. Koike, M. Paul         ||       adrian@olddog.co.uk, hideki.endo.es@hitachi.com, rolf.winter@neclab.eu, koike.yoshinori@lab.ntt.co.jp, Manuel.Paul@telekom.de
+#   RFC7055          ||      S. Hartman, Ed., J. Howlett         ||       hartmans-ietf@mit.edu, josh.howlett@ja.net
+#   RFC7056          ||      S. Hartman, J. Howlett         ||       hartmans-ietf@mit.edu, josh.howlett@ja.net
+#   RFC7057          ||      S. Winter, J. Salowey         ||       stefan.winter@restena.lu, jsalowey@cisco.com
+#   RFC7058          ||      A. Amirante, T. Castaldi, L. Miniero, S P. Romano         ||       alessandro.amirante@unina.it, tcastaldi@meetecho.com, lorenzo@meetecho.com, spromano@unina.it
+#   RFC7059          ||      S. Steffann, I. van Beijnum, R. van Rein         ||       sander@steffann.nl, iljitsch@muada.com, rick@openfortress.nl
+#   RFC7060          ||      M. Napierala, E. Rosen, IJ. Wijnands         ||       mnapierala@att.com, erosen@cisco.com, ice@cisco.com
+#   RFC7061          ||      R. Sinnema, E. Wilde         ||       remon.sinnema@emc.com, erik.wilde@emc.com
+#   RFC7062          ||      F. Zhang, Ed., D. Li, H. Li, S. Belotti, D. Ceccarelli         ||       zhangfatai@huawei.com, huawei.danli@huawei.com, lihan@chinamobile.com, sergio.belotti@alcatel-lucent.it, daniele.ceccarelli@ericsson.com
+#   RFC7063          ||      L. Zheng, J. Zhang, R. Parekh         ||       vero.zheng@huawei.com, zzhang@juniper.net, riparekh@cisco.com
+#   RFC7064          ||      S. Nandakumar, G. Salgueiro, P. Jones, M. Petit-Huguenin         ||       snandaku@cisco.com, gsalguei@cisco.com, paulej@packetizer.com, petithug@acm.org
+#   RFC7065          ||      M. Petit-Huguenin, S. Nandakumar, G. Salgueiro, P. Jones         ||       petithug@acm.org, snandaku@cisco.com, gsalguei@cisco.com, paulej@packetizer.com
+#   RFC7066          ||      J. Korhonen, Ed., J. Arkko, Ed., T. Savolainen, S. Krishnan         ||       jouni.nospam@gmail.com, jari.arkko@piuha.net, teemu.savolainen@nokia.com, suresh.krishnan@ericsson.com
+#   RFC7067          ||      L. Dunbar, D. Eastlake 3rd, R. Perlman, I. Gashinsky         ||       ldunbar@huawei.com, d3e3e3@gmail.com, Radia@alum.mit.edu, igor@yahoo-inc.com
+#   RFC7068          ||      E. McMurry, B. Campbell         ||       emcmurry@computer.org, ben@nostrum.com
+#   RFC7069          ||      R. Alimi, A. Rahman, D. Kutscher, Y. Yang, H. Song, K. Pentikousis         ||       ralimi@google.com, Akbar.Rahman@InterDigital.com, dirk.kutscher@neclab.eu, yry@cs.yale.edu, haibin.song@huawei.com, k.pentikousis@eict.de
+#   RFC7070          ||      N. Borenstein, M. Kucherawy         ||       nsb@guppylake.com, superuser@gmail.com
+#   RFC7071          ||      N. Borenstein, M. Kucherawy         ||       nsb@guppylake.com, superuser@gmail.com
+#   RFC7072          ||      N. Borenstein, M. Kucherawy         ||       nsb@guppylake.com, superuser@gmail.com
+#   RFC7073          ||      N. Borenstein, M. Kucherawy         ||       nsb@guppylake.com, superuser@gmail.com
+#   RFC7074          ||      L. Berger, J. Meuric         ||       lberger@labn.net, julien.meuric@orange.com
+#   RFC7075          ||      T. Tsou, R. Hao, T. Taylor, Ed.         ||       tina.tsou.zouting@huawei.com, ruibing_hao@cable.comcast.com, tom.taylor.stds@gmail.com
+#   RFC7076          ||      M. Joseph, J. Susoy         ||       mark@p6r.com, jim@p6r.com
+#   RFC7077          ||      S. Krishnan, S. Gundavelli, M. Liebsch, H. Yokota, J. Korhonen         ||       suresh.krishnan@ericsson.com, sgundave@cisco.com, marco.liebsch@neclab.eu, yokota@kddilabs.jp, jouni.nospam@gmail.com
+#   RFC7078          ||      A. Matsumoto, T. Fujisaki, T. Chown         ||       arifumi@nttv6.net, fujisaki@nttv6.net, tjc@ecs.soton.ac.uk
+#   RFC7079          ||      N. Del Regno, Ed., A. Malis, Ed.         ||       nick.delregno@verizon.com, amalis@gmail.com
+#   RFC7080          ||      A. Sajassi, S. Salam, N. Bitar, F. Balus         ||       sajassi@cisco.com, ssalam@cisco.com, nabil.n.bitar@verizon.com, florin.balus@nuagenetworks.net
+#   RFC7081          ||      E. Ivov, P. Saint-Andre, E. Marocco         ||       emcho@jitsi.org, ietf@stpeter.im, enrico.marocco@telecomitalia.it
+#   RFC7082          ||      R. Shekh-Yusef, M. Barnes         ||       rifaat.ietf@gmail.com, mary.ietf.barnes@gmail.com
+#   RFC7083          ||      R. Droms         ||       rdroms@cisco.com
+#   RFC7084          ||      H. Singh, W. Beebee, C. Donley, B. Stark         ||       shemant@cisco.com, wbeebee@cisco.com, c.donley@cablelabs.com, barbara.stark@att.com
+#   RFC7085          ||      J. Levine, P. Hoffman         ||       standards@taugh.com, paul.hoffman@cybersecurity.org
+#   RFC7086          ||      A. Keranen, G. Camarillo, J. Maenpaa         ||       Ari.Keranen@ericsson.com, Gonzalo.Camarillo@ericsson.com, Jouni.Maenpaa@ericsson.com
+#   RFC7087          ||      H. van Helvoort, Ed., L. Andersson, Ed., N. Sprecher, Ed.         ||       Huub.van.Helvoort@huawei.com, loa@mail01.huawei.com, nurit.sprecher@nsn.com
+#   RFC7088          ||      D. Worley         ||       worley@ariadne.com
+#   RFC7089          ||      H. Van de Sompel, M. Nelson, R. Sanderson         ||       hvdsomp@gmail.com, mln@cs.odu.edu, azaroth42@gmail.com
+#   RFC7090          ||      H. Schulzrinne, H. Tschofenig, C. Holmberg, M. Patel         ||       hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@gmx.net, christer.holmberg@ericsson.com, Milan.Patel@huawei.com
+#   RFC7091          ||      V. Dolmatov, Ed., A. Degtyarev         ||       dol@cryptocom.ru, alexey@renatasystems.org
+#   RFC7092          ||      H. Kaplan, V. Pascual         ||       hadriel.kaplan@oracle.com, victor.pascual@quobis.com
+#   RFC7093          ||      S. Turner, S. Kent, J. Manger         ||       turners@ieca.com, kent@bbn.com, james.h.manger@team.telstra.com
+#   RFC7094          ||      D. McPherson, D. Oran, D. Thaler, E. Osterweil         ||       dmcpherson@verisign.com, oran@cisco.com, dthaler@microsoft.com, eosterweil@verisign.com
+#   RFC7095          ||      P. Kewisch         ||       mozilla@kewis.ch
+#   RFC7096          ||      S. Belotti, Ed., P. Grandi, D. Ceccarelli, Ed., D. Caviglia, F. Zhang, D. Li         ||       sergio.belotti@alcatel-lucent.com, pietro_vittorio.grandi@alcatel-lucent.com, daniele.ceccarelli@ericsson.com, diego.caviglia@ericsson.com, zhangfatai@huawei.com, danli@huawei.com
+#   RFC7097          ||      J. Ott, V. Singh, Ed., I. Curcio         ||       jo@comnet.tkk.fi, varun@comnet.tkk.fi, igor.curcio@nokia.com
+#   RFC7098          ||      B. Carpenter, S. Jiang, W. Tarreau         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com, willy@haproxy.com
+#   RFC7100          ||      P. Resnick         ||       presnick@qti.qualcomm.com
+#   RFC7101          ||      S. Ginoza         ||       sginoza@amsl.com
+#   RFC7102          ||      JP. Vasseur         ||       jpv@cisco.com
+#   RFC7103          ||      M. Kucherawy, G. Shapiro, N. Freed         ||       superuser@gmail.com, gshapiro@proofpoint.com, ned.freed@mrochek.com
+#   RFC7104          ||      A. Begen, Y. Cai, H. Ou         ||       abegen@cisco.com, yiqunc@microsoft.com, hou@cisco.com
+#   RFC7105          ||      M. Thomson, J. Winterbottom         ||       martin.thomson@gmail.com, a.james.winterbottom@gmail.com
+#   RFC7106          ||      E. Ivov         ||       emcho@jitsi.org
+#   RFC7107          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC7108          ||      J. Abley, T. Manderson         ||       jabley@dyn.com, terry.manderson@icann.org
+#   RFC7109          ||      H. Yokota, D. Kim, B. Sarikaya, F. Xia         ||       yokota@kddilabs.jp, dskim@jejutp.or.kr, sarikaya@ieee.org, xiayangsong@huawei.com
+#   RFC7110          ||      M. Chen, W. Cao, S. Ning, F. Jounay, S. Delord         ||       mach.chen@huawei.com, wayne.caowei@huawei.com, ning.so@tatacommunications.com, frederic.jounay@orange.ch, simon.delord@alcatel-lucent.com
+#   RFC7111          ||      M. Hausenblas, E. Wilde, J. Tennison         ||       mhausenblas@maprtech.com, dret@berkeley.edu, jeni@jenitennison.com
+#   RFC7112          ||      F. Gont, V. Manral, R. Bonica         ||       fgont@si6networks.com, vishwas@ionosnetworks.com, rbonica@juniper.net
+#   RFC7113          ||      F. Gont         ||       fgont@si6networks.com
+#   RFC7114          ||      B. Leiba         ||       barryleiba@computer.org
+#   RFC7115          ||      R. Bush         ||       randy@psg.com
+#   RFC7116          ||      K. Scott, M. Blanchet         ||       kscott@mitre.org, marc.blanchet@viagenie.ca
+#   RFC7117          ||      R. Aggarwal, Ed., Y. Kamite, L. Fang, Y. Rekhter, C. Kodeboniya         ||       raggarwa_1@yahoo.com, y.kamite@ntt.com, lufang@microsoft.com, yakov@juniper.net, chaitk@yahoo.com
+#   RFC7118          ||      I. Baz Castillo, J. Millan Villegas, V. Pascual         ||       ibc@aliax.net, jmillan@aliax.net, victor.pascual@quobis.com
+#   RFC7119          ||      B. Claise, A. Kobayashi, B. Trammell         ||       bclaise@cisco.com, akoba@nttv6.net, trammell@tik.ee.ethz.ch
+#   RFC7120          ||      M. Cotton         ||       michelle.cotton@icann.org
+#   RFC7121          ||      K. Ogawa, W. Wang, E. Haleplidis, J. Hadi Salim         ||       k.ogawa@ntt.com, wmwang@mail.zjgsu.edu.cn, ehalep@ece.upatras.gr, hadi@mojatatu.com
+#   RFC7122          ||      H. Kruse, S. Jero, S. Ostermann         ||       kruse@ohio.edu, sjero@purdue.edu, ostermann@eecs.ohiou.edu
+#   RFC7123          ||      F. Gont, W. Liu         ||       fgont@si6networks.com, liushucheng@huawei.com
+#   RFC7124          ||      E. Beili         ||       edward.beili@actelis.com
+#   RFC7125          ||      B. Trammell, P. Aitken         ||       trammell@tik.ee.ethz.ch, paitken@cisco.com
+#   RFC7126          ||      F. Gont, R. Atkinson, C. Pignataro         ||       fgont@si6networks.com, rja.lists@gmail.com, cpignata@cisco.com
+#   RFC7127          ||      O. Kolkman, S. Bradner, S. Turner         ||       olaf@nlnetlabs.nl, sob@harvard.edu, turners@ieca.com
+#   RFC7128          ||      R. Bush, R. Austein, K. Patel, H. Gredler, M. Waehlisch         ||       randy@psg.com, sra@hactrn.net, keyupate@cisco.com, hannes@juniper.net, waehlisch@ieee.org
+#   RFC7129          ||      R. Gieben, W. Mekking         ||       miek@google.com, matthijs@nlnetlabs.nl
+#   RFC7130          ||      M. Bhatia, Ed., M. Chen, Ed., S. Boutros, Ed., M. Binderberger, Ed., J. Haas, Ed.         ||       manav.bhatia@alcatel-lucent.com, mach@huawei.com, sboutros@cisco.com, mbinderb@cisco.com, jhaas@juniper.net
+#   RFC7131          ||      M. Barnes, F. Audet, S. Schubert, H. van Elburg, C. Holmberg         ||       mary.ietf.barnes@gmail.com, francois.audet@skype.net, shida@ntt-at.com, ietf.hanserik@gmail.com, christer.holmberg@ericsson.com
+#   RFC7132          ||      S. Kent, A. Chi         ||       kent@bbn.com, achi@cs.unc.edu
+#   RFC7133          ||      S. Kashima, A. Kobayashi, Ed., P. Aitken         ||       kashima@nttv6.net, akoba@nttv6.net, paitken@cisco.com
+#   RFC7134          ||      B. Rosen         ||       br@brianrosen.net
+#   RFC7135          ||      J. Polk         ||       jmpolk@cisco.com
+#   RFC7136          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com
+#   RFC7137          ||      A. Retana, S. Ratliff         ||       aretana@cisco.com, sratliff@cisco.com
+#   RFC7138          ||      D. Ceccarelli, Ed., F. Zhang, S. Belotti, R. Rao, J. Drake         ||       daniele.ceccarelli@ericsson.com, zhangfatai@huawei.com, sergio.belotti@alcatel-lucent.com, rrao@infinera.com, jdrake@juniper.net
+#   RFC7139          ||      F. Zhang, Ed., G. Zhang, S. Belotti, D. Ceccarelli, K. Pithewan         ||       zhangfatai@huawei.com, zhangguoying@mail.ritt.com.cn, sergio.belotti@alcatel-lucent.it, daniele.ceccarelli@ericsson.com, kpithewan@infinera.com
+#   RFC7140          ||      L. Jin, F. Jounay, IJ. Wijnands, N. Leymann         ||       lizho.jin@gmail.com, frederic.jounay@orange.ch, ice@cisco.com, n.leymann@telekom.de
+#   RFC7141          ||      B. Briscoe, J. Manner         ||       bob.briscoe@bt.com, jukka.manner@aalto.fi
+#   RFC7142          ||      M. Shand, L. Ginsberg         ||       imc.shand@googlemail.com, ginsberg@cisco.com
+#   RFC7143          ||      M. Chadalapaka, J. Satran, K. Meth, D. Black         ||       cbm@chadalapaka.com, julians@infinidat.com, meth@il.ibm.com, david.black@emc.com
+#   RFC7144          ||      F. Knight, M. Chadalapaka         ||       knight@netapp.com, cbm@chadalapaka.com
+#   RFC7145          ||      M. Ko, A. Nezhinsky         ||       mkosjc@gmail.com, alexandern@mellanox.com
+#   RFC7146          ||      D. Black, P. Koning         ||       david.black@emc.com, paul_koning@Dell.com
+#   RFC7147          ||      M. Bakke, P. Venkatesen         ||       mark_bakke@dell.com, prakashvn@hcl.com
+#   RFC7148          ||      X. Zhou, J. Korhonen, C. Williams, S. Gundavelli, CJ. Bernardos         ||       zhou.xingyue@zte.com.cn, jouni.nospam@gmail.com, carlw@mcsr-labs.org, sgundave@cisco.com, cjbc@it.uc3m.es
+#   RFC7149          ||      M. Boucadair, C. Jacquenet         ||       mohamed.boucadair@orange.com, christian.jacquenet@orange.com
+#   RFC7150          ||      F. Zhang, A. Farrel         ||       zhangfatai@huawei.com, adrian@olddog.co.uk
+#   RFC7151          ||      P. Hethmon, R. McMurray         ||       phethmon@hethmon.com, robmcm@microsoft.com
+#   RFC7152          ||      R. Key, Ed., S. DeLord, F. Jounay, L. Huang, Z. Liu, M. Paul         ||       raymond.key@ieee.org, simon.delord@gmail.com, frederic.jounay@orange.ch, huanglu@chinamobile.com, zhliu@gsta.com, manuel.paul@telekom.de
+#   RFC7153          ||      E. Rosen, Y. Rekhter         ||       erosen@cisco.com, yakov@juniper.net
+#   RFC7154          ||      S. Moonesamy, Ed.         ||       sm+ietf@elandsys.com
+#   RFC7155          ||      G. Zorn, Ed.         ||       glenzorn@gmail.com
+#   RFC7156          ||      G. Zorn, Q. Wu, J. Korhonen         ||       glenzorn@gmail.com, bill.wu@huawei.com, jouni.nospam@gmail.com
+#   RFC7157          ||      O. Troan, Ed., D. Miles, S. Matsushima, T. Okimoto, D. Wing         ||       ot@cisco.com, davidmiles@google.com, satoru.matsushima@g.softbank.co.jp, t.okimoto@west.ntt.co.jp, dwing-ietf@fuggles.com
+#   RFC7158          ||      T. Bray, Ed.         ||       tbray@textuality.com
+#   RFC7159          ||      T. Bray, Ed.         ||       tbray@textuality.com
+#   RFC7160          ||      M. Petit-Huguenin, G. Zorn, Ed.         ||       petithug@acm.org, glenzorn@gmail.com
+#   RFC7161          ||      LM. Contreras, CJ. Bernardos, I. Soto         ||       lmcm@tid.es, cjbc@it.uc3m.es, isoto@it.uc3m.es
+#   RFC7162          ||      A. Melnikov, D. Cridland         ||       Alexey.Melnikov@isode.com, dave.cridland@surevine.com
+#   RFC7163          ||      C. Holmberg, I. Sedlacek         ||       christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com
+#   RFC7164          ||      K. Gross, R. Brandenburg         ||       kevin.gross@avanw.com, ray.vanbrandenburg@tno.nl
+#   RFC7165          ||      R. Barnes         ||       rlb@ipv.sx
+#   RFC7166          ||      M. Bhatia, V. Manral, A. Lindem         ||       manav.bhatia@alcatel-lucent.com, vishwas@ionosnetworks.com, acee.lindem@ericsson.com
+#   RFC7167          ||      D. Frost, S. Bryant, M. Bocci, L. Berger         ||       frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com, lberger@labn.net
+#   RFC7168          ||      I. Nazar         ||       inazar@deviantart.com
+#   RFC7169          ||      S. Turner         ||       turners@ieca.com
+#   RFC7170          ||      H. Zhou, N. Cam-Winget, J. Salowey, S. Hanna         ||       hzhou@cisco.com, ncamwing@cisco.com, jsalowey@cisco.com, steve.hanna@infineon.com
+#   RFC7171          ||      N. Cam-Winget, P. Sangster         ||       ncamwing@cisco.com, paul_sangster@symantec.com
+#   RFC7172          ||      D. Eastlake 3rd, M. Zhang, P. Agarwal, R. Perlman, D. Dutt         ||       d3e3e3@gmail.com, zhangmingui@huawei.com, pagarwal@broadcom.com, Radia@alum.mit.edu, ddutt.ietf@hobbesdutt.com
+#   RFC7173          ||      L. Yong, D. Eastlake 3rd, S. Aldrin, J. Hudson         ||       lucy.yong@huawei.com, d3e3e3@gmail.com, sam.aldrin@huawei.com, jon.hudson@gmail.com
+#   RFC7174          ||      S. Salam, T. Senevirathne, S. Aldrin, D. Eastlake 3rd         ||       ssalam@cisco.com, tsenevir@cisco.com, sam.aldrin@gmail.com, d3e3e3@gmail.com
+#   RFC7175          ||      V. Manral, D. Eastlake 3rd, D. Ward, A. Banerjee         ||       vishwas@ionosnetworks.com, d3e3e3@gmail.com, dward@cisco.com, ayabaner@gmail.com
+#   RFC7176          ||      D. Eastlake 3rd, T. Senevirathne, A. Ghanwani, D. Dutt, A. Banerjee         ||       d3e3e3@gmail.com, tsenevir@cisco.com, anoop@alumni.duke.edu, ddutt.ietf@hobbesdutt.com, ayabaner@gmail.com
+#   RFC7177          ||      D. Eastlake 3rd, R. Perlman, A. Ghanwani, H. Yang, V. Manral         ||       d3e3e3@gmail.com, radia@alum.mit.edu, anoop@alumni.duke.edu, howardy@cisco.com, vishwas@ionosnetworks.com
+#   RFC7178          ||      D. Eastlake 3rd, V. Manral, Y. Li, S. Aldrin, D. Ward         ||       d3e3e3@gmail.com, vishwas@ionosnetworks.com, liyizhou@huawei.com, sam.aldrin@huawei.com, dward@cisco.com
+#   RFC7179          ||      D. Eastlake 3rd, A. Ghanwani, V. Manral, Y. Li, C. Bestler         ||       d3e3e3@gmail.com, anoop@alumni.duke.edu, vishwas@ionosnetworks.com, liyizhou@huawei.com, caitlin.bestler@nexenta.com
+#   RFC7180          ||      D. Eastlake 3rd, M. Zhang, A. Ghanwani, V. Manral, A. Banerjee         ||       d3e3e3@gmail.com, zhangmingui@huawei.com, anoop@alumni.duke.edu, vishwas@ionosnetworks.com, ayabaner@gmail.com
+#   RFC7181          ||      T. Clausen, C. Dearlove, P. Jacquet, U. Herberg         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com, philippe.jacquet@alcatel-lucent.com, ulrich@herberg.name
+#   RFC7182          ||      U. Herberg, T. Clausen, C. Dearlove         ||       ulrich@herberg.name, T.Clausen@computer.org, chris.dearlove@baesystems.com
+#   RFC7183          ||      U. Herberg, C. Dearlove, T. Clausen         ||       ulrich@herberg.name, chris.dearlove@baesystems.com, T.Clausen@computer.org
+#   RFC7184          ||      U. Herberg, R. Cole, T. Clausen         ||       ulrich@herberg.name, robert.g.cole@us.army.mil, T.Clausen@computer.org
+#   RFC7185          ||      C. Dearlove, T. Clausen, P. Jacquet         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org, philippe.jacquet@alcatel-lucent.com
+#   RFC7186          ||      J. Yi, U. Herberg, T. Clausen         ||       jiazi@jiaziyi.com, ulrich@herberg.name, T.Clausen@computer.org
+#   RFC7187          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
+#   RFC7188          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
+#   RFC7189          ||      G. Mirsky         ||       gregory.mirsky@ericsson.com
+#   RFC7190          ||      C. Villamizar         ||       curtis@occnc.com
+#   RFC7191          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC7192          ||      S. Turner         ||       turners@ieca.com
+#   RFC7193          ||      S. Turner, R. Housley, J. Schaad         ||       turners@ieca.com, housley@vigilsec.com, ietf@augustcellars.com
+#   RFC7194          ||      R. Hartmann         ||       richih.mailinglist@gmail.com
+#   RFC7195          ||      M. Garcia-Martin, S. Veikkolainen         ||       miguel.a.garcia@ericsson.com, simo.veikkolainen@nokia.com
+#   RFC7196          ||      C. Pelsser, R. Bush, K. Patel, P. Mohapatra, O. Maennel         ||       cristel@iij.ad.jp, randy@psg.com, keyupate@cisco.com, mpradosh@yahoo.com, o@maennel.net
+#   RFC7197          ||      A. Begen, Y. Cai, H. Ou         ||       abegen@cisco.com, yiqunc@microsoft.com, hou@cisco.com
+#   RFC7198          ||      A. Begen, C. Perkins         ||       abegen@cisco.com, csp@csperkins.org
+#   RFC7199          ||      R. Barnes, M. Thomson, J. Winterbottom, H. Tschofenig         ||       rlb@ipv.sx, martin.thomson@gmail.com, a.james.winterbottom@gmail.com, Hannes.Tschofenig@gmx.net
+#   RFC7200          ||      C. Shen, H. Schulzrinne, A. Koike         ||       charles@cs.columbia.edu, schulzrinne@cs.columbia.edu, koike.arata@lab.ntt.co.jp
+#   RFC7201          ||      M. Westerlund, C. Perkins         ||       magnus.westerlund@ericsson.com, csp@csperkins.org
+#   RFC7202          ||      C. Perkins, M. Westerlund         ||       csp@csperkins.org, magnus.westerlund@ericsson.com
+#   RFC7203          ||      T. Takahashi, K. Landfield, Y. Kadobayashi         ||       takeshi_takahashi@nict.go.jp, kent_landfield@mcafee.com, youki-k@is.aist-nara.ac.jp
+#   RFC7204          ||      T. Haynes         ||       tdh@excfb.com
+#   RFC7205          ||      A. Romanow, S. Botzko, M. Duckworth, R. Even, Ed.         ||       allyn@cisco.com, stephen.botzko@polycom.com, mark.duckworth@polycom.com, roni.even@mail01.huawei.com
+#   RFC7206          ||      P. Jones, G. Salgueiro, J. Polk, L. Liess, H. Kaplan         ||       paulej@packetizer.com, gsalguei@cisco.com, jmpolk@cisco.com, laura.liess.dt@gmail.com, hadriel.kaplan@oracle.com
+#   RFC7207          ||      M. Ortseifen, G. Dickfeld         ||       iso20022@bundesbank.de, iso20022@bundesbank.de
+#   RFC7208          ||      S. Kitterman         ||       scott@kitterman.com
+#   RFC7209          ||      A. Sajassi, R. Aggarwal, J. Uttaro, N. Bitar, W. Henderickx, A. Isaac         ||       sajassi@cisco.com, raggarwa_1@yahoo.com, uttaro@att.com, nabil.n.bitar@verizon.com, wim.henderickx@alcatel-lucent.com, aisaac71@bloomberg.net
+#   RFC7210          ||      R. Housley, T. Polk, S. Hartman, D. Zhang         ||       housley@vigilsec.com, tim.polk@nist.gov, hartmans-ietf@mit.edu, zhangdacheng@huawei.com
+#   RFC7211          ||      S. Hartman, D. Zhang         ||       hartmans-ietf@mit.edu, zhangdacheng@huawei.com
+#   RFC7212          ||      D. Frost, S. Bryant, M. Bocci         ||       frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com
+#   RFC7213          ||      D. Frost, S. Bryant, M. Bocci         ||       frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com
+#   RFC7214          ||      L. Andersson, C. Pignataro         ||       loa@mail01.huawei.com, cpignata@cisco.com
+#   RFC7215          ||      L. Jakab, A. Cabellos-Aparicio, F. Coras, J. Domingo-Pascual, D. Lewis         ||       lojakab@cisco.com, acabello@ac.upc.edu, fcoras@ac.upc.edu, jordi.domingo@ac.upc.edu, darlewis@cisco.com
+#   RFC7216          ||      M. Thomson, R. Bellis         ||       martin.thomson@gmail.com, ray.bellis@nominet.org.uk
+#   RFC7217          ||      F. Gont         ||       fgont@si6networks.com
+#   RFC7218          ||      O. Gudmundsson         ||       ogud@ogud.com
+#   RFC7219          ||      M. Bagnulo, A. Garcia-Martinez         ||       marcelo@it.uc3m.es, alberto@it.uc3m.es
+#   RFC7220          ||      M. Boucadair, R. Penno, D. Wing         ||       mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com
+#   RFC7221          ||      A. Farrel, D. Crocker, Ed.         ||       adrian@olddog.co.uk, dcrocker@bbiw.net
+#   RFC7222          ||      M. Liebsch, P. Seite, H. Yokota, J. Korhonen, S. Gundavelli         ||       liebsch@neclab.eu, pierrick.seite@orange.com, yokota@kddilabs.jp, jouni.nospam@gmail.com, sgundave@cisco.com
+#   RFC7223          ||      M. Bjorklund         ||       mbj@tail-f.com
+#   RFC7224          ||      M. Bjorklund         ||       mbj@tail-f.com
+#   RFC7225          ||      M. Boucadair         ||       mohamed.boucadair@orange.com
+#   RFC7226          ||      C. Villamizar, Ed., D. McDysan, Ed., S. Ning, A. Malis, L. Yong         ||       curtis@occnc.com, dave.mcdysan@verizon.com, ning.so@tatacommunications.com, agmalis@gmail.com, lucy.yong@huawei.com
+#   RFC7227          ||      D. Hankins, T. Mrugalski, M. Siodelski, S. Jiang, S. Krishnan         ||       dhankins@google.com, tomasz.mrugalski@gmail.com, msiodelski@gmail.com, jiangsheng@huawei.com, suresh.krishnan@ericsson.com
+#   RFC7228          ||      C. Bormann, M. Ersue, A. Keranen         ||       cabo@tzi.org, mehmet.ersue@nsn.com, ari.keranen@ericsson.com
+#   RFC7229          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC7230          ||      R. Fielding, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, julian.reschke@greenbytes.de
+#   RFC7231          ||      R. Fielding, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, julian.reschke@greenbytes.de
+#   RFC7232          ||      R. Fielding, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, julian.reschke@greenbytes.de
+#   RFC7233          ||      R. Fielding, Ed., Y. Lafon, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, ylafon@w3.org, julian.reschke@greenbytes.de
+#   RFC7234          ||      R. Fielding, Ed., M. Nottingham, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, mnot@mnot.net, julian.reschke@greenbytes.de
+#   RFC7235          ||      R. Fielding, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, julian.reschke@greenbytes.de
+#   RFC7236          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC7237          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC7238          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC7239          ||      A. Petersson, M. Nilsson         ||       andreas@sbin.se, nilsson@opera.com
+#   RFC7240          ||      J. Snell         ||       jasnell@gmail.com
+#   RFC7241          ||      S. Dawkins, P. Thaler, D. Romascanu, B. Aboba, Ed.         ||       spencerdawkins.ietf@gmail.com, pthaler@broadcom.com, dromasca@gmail.com , bernard_aboba@hotmail.com
+#   RFC7242          ||      M. Demmer, J. Ott, S. Perreault         ||       demmer@cs.berkeley.edu, jo@netlab.tkk.fi, simon@per.reau.lt
+#   RFC7243          ||      V. Singh, Ed., J. Ott, I. Curcio         ||       varun@comnet.tkk.fi, jo@comnet.tkk.fi, igor.curcio@nokia.com
+#   RFC7244          ||      H. Asaeda, Q. Wu, R. Huang         ||       asaeda@nict.go.jp, bill.wu@huawei.com, Rachel@huawei.com
+#   RFC7245          ||      A. Hutton, Ed., L. Portman, Ed., R. Jain, K. Rehor         ||       andrew.hutton@unify.com, leon.portman@gmail.com, rajnish.jain@outlook.com, krehor@cisco.com
+#   RFC7246          ||      IJ. Wijnands, Ed., P. Hitchen, N. Leymann, W. Henderickx, A. Gulko, J. Tantsura         ||       ice@cisco.com, paul.hitchen@bt.com, n.leymann@telekom.de, wim.henderickx@alcatel-lucent.com, arkadiy.gulko@thomsonreuters.com, jeff.tantsura@ericsson.com
+#   RFC7247          ||      P. Saint-Andre, A. Houri, J. Hildebrand         ||       ietf@stpeter.im, avshalom@il.ibm.com, jhildebr@cisco.com
+#   RFC7248          ||      P. Saint-Andre, A. Houri, J. Hildebrand         ||       ietf@stpeter.im, avshalom@il.ibm.com, jhildebr@cisco.com
+#   RFC7249          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC7250          ||      P. Wouters, Ed., H. Tschofenig, Ed., J. Gilmore, S. Weiler, T. Kivinen         ||       pwouters@redhat.com, Hannes.Tschofenig@gmx.net, gnu@toad.com, weiler@tislabs.com, kivinen@iki.fi
+#   RFC7251          ||      D. McGrew, D. Bailey, M. Campagna, R. Dugal         ||       mcgrew@cisco.com, danbailey@sth.rub.de, mcampagna@gmail.com, rdugal@certicom.com
+#   RFC7252          ||      Z. Shelby, K. Hartke, C. Bormann         ||       zach.shelby@arm.com, hartke@tzi.org, cabo@tzi.org
+#   RFC7253          ||      T. Krovetz, P. Rogaway         ||       ted@krovetz.net, rogaway@cs.ucdavis.edu
+#   RFC7254          ||      M. Montemurro, Ed., A. Allen, D. McDonald, P. Gosden         ||       mmontemurro@blackberry.com, aallen@blackberry.com, david.mcdonald@meteor.ie, pgosden@gsma.com
+#   RFC7255          ||      A. Allen, Ed.         ||       aallen@blackberry.com
+#   RFC7256          ||      F. Le Faucheur, R. Maglione, T. Taylor         ||       flefauch@cisco.com, robmgl@cisco.com, tom.taylor.stds@gmail.com
+#   RFC7257          ||      T. Nadeau, Ed., A. Kiran Koushik, Ed., R. Mediratta, Ed.         ||       tnadeau@lucidvision.com, kkoushik@brocade.com, romedira@cisco.com
+#   RFC7258          ||      S. Farrell, H. Tschofenig         ||       stephen.farrell@cs.tcd.ie, Hannes.Tschofenig@gmx.net
+#   RFC7259          ||      P. Saint-Andre         ||       ietf@stpeter.im
+#   RFC7260          ||      A. Takacs, D. Fedyk, J. He         ||       attila.takacs@ericsson.com, don.fedyk@hp.com, hejia@huawei.com
+#   RFC7261          ||      M. Perumal, P. Ravindran         ||       mperumal@cisco.com, partha@parthasarathi.co.in
+#   RFC7262          ||      A. Romanow, S. Botzko, M. Barnes         ||       allyn@cisco.com, stephen.botzko@polycom.com, mary.ietf.barnes@gmail.com
+#   RFC7263          ||      N. Zong, X. Jiang, R. Even, Y. Zhang         ||       zongning@huawei.com, jiang.x.f@huawei.com, roni.even@mail01.huawei.com, hishigh@gmail.com
+#   RFC7264          ||      N. Zong, X. Jiang, R. Even, Y. Zhang         ||       zongning@huawei.com, jiang.x.f@huawei.com, roni.even@mail01.huawei.com, hishigh@gmail.com
+#   RFC7265          ||      P. Kewisch, C. Daboo, M. Douglass         ||       mozilla@kewis.ch, cyrus@daboo.name, douglm@rpi.edu
+#   RFC7266          ||      A. Clark, Q. Wu, R. Schott, G. Zorn         ||       alan.d.clark@telchemy.com, sunseawq@huawei.com, Roland.Schott@telekom.de, gwz@net-zen.net
+#   RFC7267          ||      L. Martini, Ed., M. Bocci, Ed., F. Balus, Ed.         ||       lmartini@cisco.com, matthew.bocci@alcatel-lucent.com, florin@nuagenetworks.net
+#   RFC7268          ||      B. Aboba, J. Malinen, P. Congdon, J. Salowey, M. Jones         ||       Bernard_Aboba@hotmail.com, j@w1.fi, paul.congdon@tallac.com, jsalowey@cisco.com, mark@azu.ca
+#   RFC7269          ||      G. Chen, Z. Cao, C. Xie, D. Binet         ||       chengang@chinamobile.com, caozhen@chinamobile.com, xiechf@ctbri.com.cn, david.binet@orange.com
+#   RFC7270          ||      A. Yourtchenko, P. Aitken, B. Claise         ||       ayourtch@cisco.com, paitken@cisco.com, bclaise@cisco.com
+#   RFC7271          ||      J. Ryoo, Ed., E. Gray, Ed., H. van Helvoort, A. D'Alessandro, T. Cheung, E. Osborne         ||       ryoo@etri.re.kr, eric.gray@ericsson.com, huub.van.helvoort@huawei.com, alessandro.dalessandro@telecomitalia.it, cts@etri.re.kr, eric.osborne@notcom.com
+#   RFC7272          ||      R. van Brandenburg, H. Stokking, O. van Deventer, F. Boronat, M. Montagud, K. Gross         ||       ray.vanbrandenburg@tno.nl, hans.stokking@tno.nl, oskar.vandeventer@tno.nl, fboronat@dcom.upv.es, mamontor@posgrado.upv.es, kevin.gross@avanw.com
+#   RFC7273          ||      A. Williams, K. Gross, R. van Brandenburg, H. Stokking         ||       aidan.williams@audinate.com, kevin.gross@avanw.com, ray.vanbrandenburg@tno.nl, hans.stokking@tno.nl
+#   RFC7274          ||      K. Kompella, L. Andersson, A. Farrel         ||       kireeti.kompella@gmail.com, loa@mail01.huawei.com, adrian@olddog.co.uk
+#   RFC7275          ||      L. Martini, S. Salam, A. Sajassi, M. Bocci, S. Matsushima, T. Nadeau         ||       lmartini@cisco.com, ssalam@cisco.com, sajassi@cisco.com, matthew.bocci@alcatel-lucent.com, satoru.matsushima@gmail.com, tnadeau@brocade.com
+#   RFC7276          ||      T. Mizrahi, N. Sprecher, E. Bellagamba, Y. Weingarten         ||       talmi@marvell.com, nurit.sprecher@nsn.com, elisa.bellagamba@ericsson.com, wyaacov@gmail.com
+#   RFC7277          ||      M. Bjorklund         ||       mbj@tail-f.com
+#   RFC7278          ||      C. Byrne, D. Drown, A. Vizdal         ||       cameron.byrne@t-mobile.com, dan@drown.org, ales.vizdal@t-mobile.cz
+#   RFC7279          ||      M. Shore, C. Pignataro         ||       melinda.shore@nomountain.net, cpignata@cisco.com
+#   RFC7280          ||      G. Fairhurst         ||       gorry@erg.abdn.ac.uk
+#   RFC7281          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
+#   RFC7282          ||      P. Resnick         ||       presnick@qti.qualcomm.com
+#   RFC7283          ||      Y. Cui, Q. Sun, T. Lemon         ||       yong@csnet1.cs.tsinghua.edu.cn, sunqi@csnet1.cs.tsinghua.edu.cn, Ted.Lemon@nominum.com
+#   RFC7284          ||      M. Lanthaler         ||       mail@markus-lanthaler.com
+#   RFC7285          ||      R. Alimi, Ed., R. Penno, Ed., Y. Yang, Ed., S. Kiesel, S. Previdi, W. Roome, S. Shalunov, R. Woundy         ||       ralimi@google.com, repenno@cisco.com, yry@cs.yale.edu, ietf-alto@skiesel.de, sprevidi@cisco.com, w.roome@alcatel-lucent.com, shalunov@shlang.com, Richard_Woundy@cable.comcast.com
+#   RFC7286          ||      S. Kiesel, M. Stiemerling, N. Schwan, M. Scharf, H. Song         ||       ietf-alto@skiesel.de, mls.ietf@gmail.com, ietf@nico-schwan.de, michael.scharf@alcatel-lucent.com, haibin.song@huawei.com
+#   RFC7287          ||      T. Schmidt, Ed., S. Gao, H. Zhang, M. Waehlisch         ||       Schmidt@informatik.haw-hamburg.de, shgao@bjtu.edu.cn, hkzhang@bjtu.edu.cn, mw@link-lab.net
+#   RFC7288          ||      D. Thaler         ||       dthaler@microsoft.com
+#   RFC7289          ||      V. Kuarsingh, Ed., J. Cianfarani         ||       victor@jvknet.com, john.cianfarani@rci.rogers.com
+#   RFC7290          ||      L. Ciavattone, R. Geib, A. Morton, M. Wieser         ||       lencia@att.com, Ruediger.Geib@telekom.de, acmorton@att.com, matthias_michael.wieser@stud.tu-darmstadt.de
+#   RFC7291          ||      M. Boucadair, R. Penno, D. Wing         ||       mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com
+#   RFC7292          ||      K. Moriarty, Ed., M. Nystrom, S. Parkinson, A. Rusch, M. Scott         ||       Kathleen.Moriarty@emc.com, mnystrom@microsoft.com, sean.parkinson@rsa.com, andreas.rusch@rsa.com, michael2.scott@rsa.com
+#   RFC7293          ||      W. Mills, M. Kucherawy         ||       wmills_92105@yahoo.com, msk@fb.com
+#   RFC7294          ||      A. Clark, G. Zorn, C. Bi, Q. Wu         ||       alan.d.clark@telchemy.com, gwz@net-zen.net, bijy@sttri.com.cn, sunseawq@huawei.com
+#   RFC7295          ||      H. Tschofenig, L. Eggert, Z. Sarker         ||       Hannes.Tschofenig@gmx.net, lars@netapp.com, Zaheduzzaman.Sarker@ericsson.com
+#   RFC7296          ||      C. Kaufman, P. Hoffman, Y. Nir, P. Eronen, T. Kivinen         ||       charliekaufman@outlook.com, paul.hoffman@vpnc.org, nir.ietf@gmail.com, pe@iki.fi, kivinen@iki.fi
+#   RFC7297          ||      M. Boucadair, C. Jacquenet, N. Wang         ||       mohamed.boucadair@orange.com, christian.jacquenet@orange.com, n.wang@surrey.ac.uk
+#   RFC7298          ||      D. Ovsienko         ||       infrastation@yandex.ru
+#   RFC7299          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC7300          ||      J. Haas, J. Mitchell         ||       jhaas@juniper.net, jon.mitchell@microsoft.com
+#   RFC7301          ||      S. Friedl, A. Popov, A. Langley, E. Stephan         ||       sfriedl@cisco.com, andreipo@microsoft.com, agl@google.com, emile.stephan@orange.com
+#   RFC7302          ||      P. Lemieux         ||       pal@sandflow.com
+#   RFC7303          ||      H. Thompson, C. Lilley         ||       ht@inf.ed.ac.uk, chris@w3.org
+#   RFC7304          ||      W. Kumari         ||       warren@kumari.net
+#   RFC7305          ||      E. Lear, Ed.         ||       lear@cisco.com
+#   RFC7306          ||      H. Shah, F. Marti, W. Noureddine, A. Eiriksson, R. Sharp         ||       hemal@broadcom.com, felix@chelsio.com, asgeir@chelsio.com, wael@chelsio.com, robert.o.sharp@intel.com
+#   RFC7307          ||      Q. Zhao, K. Raza, C. Zhou, L. Fang, L. Li, D. King         ||       quintin.zhao@huawei.com, skraza@cisco.com, czhou@cisco.com, lufang@microsoft.com, lilianyuan@chinamobile.com, daniel@olddog.co.uk
+#   RFC7308          ||      E. Osborne         ||       none
+#   RFC7309          ||      Z. Liu, L. Jin, R. Chen, D. Cai, S. Salam         ||       zhliu@gsta.com, lizho.jin@gmail.com, chen.ran@zte.com.cn, dcai@cisco.com, ssalam@cisco.com
+#   RFC7310          ||      J. Lindsay, H. Foerster         ||       lindsay@worldcastsystems.com, foerster@worldcastsystems.com
+#   RFC7311          ||      P. Mohapatra, R. Fernando, E. Rosen, J. Uttaro         ||       mpradosh@yahoo.com, rex@cisco.com, erosen@cisco.com, uttaro@att.com
+#   RFC7312          ||      J. Fabini, A. Morton         ||       joachim.fabini@tuwien.ac.at, acmorton@att.com
+#   RFC7313          ||      K. Patel, E. Chen, B. Venkatachalapathy         ||       keyupate@cisco.com, enkechen@cisco.com, balaji_pv@hotmail.com
+#   RFC7314          ||      M. Andrews         ||       marka@isc.org
+#   RFC7315          ||      R. Jesske, K. Drage, C. Holmberg         ||       r.jesske@telekom.de, drage@alcatel-lucent.com, christer.holmberg@ericsson.com
+#   RFC7316          ||      J. van Elburg, K. Drage, M. Ohsugi, S. Schubert, K. Arai         ||       ietf.hanserik@gmail.com, drage@alcatel-lucent.com, mayumi.ohsugi@ntt-at.co.jp, shida@ntt-at.com, arai.kenjiro@lab.ntt.co.jp
+#   RFC7317          ||      A. Bierman, M. Bjorklund         ||       andy@yumaworks.com, mbj@tail-f.com
+#   RFC7318          ||      A. Newton, G. Huston         ||       andy@arin.net, gih@apnic.net
+#   RFC7319          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
+#   RFC7320          ||      M. Nottingham         ||       mnot@mnot.net
+#   RFC7321          ||      D. McGrew, P. Hoffman         ||       mcgrew@cisco.com, paul.hoffman@vpnc.org
+#   RFC7322          ||      H. Flanagan, S. Ginoza         ||       rse@rfc-editor.org, rfc-editor@rfc-editor.org
+#   RFC7323          ||      D. Borman, B. Braden, V. Jacobson, R. Scheffenegger, Ed.         ||       david.borman@quantum.com, braden@isi.edu, vanj@google.com, rs@netapp.com
+#   RFC7324          ||      E. Osborne         ||       eric.osborne@notcom.com
+#   RFC7325          ||      C. Villamizar, Ed., K. Kompella, S. Amante, A. Malis, C. Pignataro         ||       curtis@occnc.com, kireeti@juniper.net, amante@apple.com, agmalis@gmail.com, cpignata@cisco.com
+#   RFC7326          ||      J. Parello, B. Claise, B. Schoening, J. Quittek         ||       jparello@cisco.com, bclaise@cisco.com, brad.schoening@verizon.net, quittek@netlab.nec.de
+#   RFC7328          ||      R. Gieben         ||       miek@google.com
+#   RFC7329          ||      H. Kaplan         ||       hadrielk@yahoo.com
+#   RFC7330          ||      T. Nadeau, Z. Ali, N. Akiya         ||       tnadeau@lucidvision.com, zali@cisco.com, nobo@cisco.com
+#   RFC7331          ||      T. Nadeau, Z. Ali, N. Akiya         ||       tnadeau@lucidvision.com, zali@cisco.com, nobo@cisco.com
+#   RFC7332          ||      H. Kaplan, V. Pascual         ||       hadrielk@yahoo.com, victor.pascual@quobis.com
+#   RFC7333          ||      H. Chan, Ed., D. Liu, P. Seite, H. Yokota, J. Korhonen         ||       h.a.chan@ieee.org, liudapeng@chinamobile.com, pierrick.seite@orange.com, hidetoshi.yokota@landisgyr.com, jouni.nospam@gmail.com
+#   RFC7334          ||      Q. Zhao, D. Dhody, D. King, Z. Ali, R. Casellas         ||       quintin.zhao@huawei.com, dhruv.dhody@huawei.com, daniel@olddog.co.uk, zali@cisco.com, ramon.casellas@cttc.es
+#   RFC7335          ||      C. Byrne         ||       cameron.byrne@t-mobile.com
+#   RFC7336          ||      L. Peterson, B. Davie, R. van Brandenburg, Ed.         ||       lapeters@akamai.com, bdavie@vmware.com, ray.vanbrandenburg@tno.nl
+#   RFC7337          ||      K. Leung, Ed., Y. Lee, Ed.         ||       kleung@cisco.com, yiu_lee@cable.comcast.com
+#   RFC7338          ||      F. Jounay, Ed., Y. Kamite, Ed., G. Heron, M. Bocci         ||       frederic.jounay@orange.ch, y.kamite@ntt.com, giheron@cisco.com, Matthew.Bocci@alcatel-lucent.com
+#   RFC7339          ||      V. Gurbani, Ed., V. Hilt, H. Schulzrinne         ||       vkg@bell-labs.com, volker.hilt@bell-labs.com, hgs@cs.columbia.edu
+#   RFC7340          ||      J. Peterson, H. Schulzrinne, H. Tschofenig         ||       jon.peterson@neustar.biz, hgs@cs.columbia.edu, Hannes.Tschofenig@gmx.net
+#   RFC7341          ||      Q. Sun, Y. Cui, M. Siodelski, S. Krishnan, I. Farrer         ||       sunqi@csnet1.cs.tsinghua.edu.cn, yong@csnet1.cs.tsinghua.edu.cn, msiodelski@gmail.com, suresh.krishnan@ericsson.com, ian.farrer@telekom.de
+#   RFC7342          ||      L. Dunbar, W. Kumari, I. Gashinsky         ||       ldunbar@huawei.com, warren@kumari.net, igor@yahoo-inc.com
+#   RFC7343          ||      J. Laganier, F. Dupont         ||       julien.ietf@gmail.com, fdupont@isc.org
+#   RFC7344          ||      W. Kumari, O. Gudmundsson, G. Barwood         ||       warren@kumari.net, ogud@ogud.com, george.barwood@blueyonder.co.uk
+#   RFC7345          ||      C. Holmberg, I. Sedlacek, G. Salgueiro         ||       christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com, gsalguei@cisco.com
+#   RFC7346          ||      R. Droms         ||       rdroms.ietf@gmail.com
+#   RFC7347          ||      H. van Helvoort, Ed., J. Ryoo, Ed., H. Zhang, F. Huang, H. Li, A. D'Alessandro         ||       huub@van-helvoort.eu, ryoo@etri.re.kr, zhanghaiyan@huawei.com, feng.huang@philips.com, lihan@chinamobile.com, alessandro.dalessandro@telecomitalia.it
+#   RFC7348          ||      M. Mahalingam, D. Dutt, K. Duda, P. Agarwal, L. Kreeger, T. Sridhar, M. Bursell, C. Wright         ||       mallik_mahalingam@yahoo.com, ddutt.ietf@hobbesdutt.com, kduda@arista.com, pagarwal@broadcom.com, kreeger@cisco.com, tsridhar@vmware.com, mike.bursell@intel.com, chrisw@redhat.com
+#   RFC7349          ||      L. Zheng, M. Chen, M. Bhatia         ||       vero.zheng@huawei.com, mach.chen@huawei.com, manav@ionosnetworks.com
+#   RFC7350          ||      M. Petit-Huguenin, G. Salgueiro         ||       marcph@getjive.com, gsalguei@cisco.com
+#   RFC7351          ||      E. Wilde         ||       dret@berkeley.edu
+#   RFC7352          ||      S. Bosch         ||       stephan@rename-it.nl
+#   RFC7353          ||      S. Bellovin, R. Bush, D. Ward         ||       bellovin@acm.org, randy@psg.com, dward@cisco.com
+#   RFC7354          ||      A. Adolf, P. Siebert         ||       alexander.adolf@condition-alpha.com, dvb@dvb.org
+#   RFC7355          ||      G. Salgueiro, V. Pascual, A. Roman, S. Garcia         ||       gsalguei@cisco.com, victor.pascual@quobis.com, anton.roman@quobis.com, sergio.garcia@quobis.com
+#   RFC7356          ||      L. Ginsberg, S. Previdi, Y. Yang         ||       ginsberg@cisco.com, sprevidi@cisco.com, yiya@cisco.com
+#   RFC7357          ||      H. Zhai, F. Hu, R. Perlman, D. Eastlake 3rd, O. Stokes         ||       zhai.hongjun@zte.com.cn, hu.fangwei@zte.com.cn, Radia@alum.mit.edu, d3e3e3@gmail.com, ostokes@extremenetworks.com
+#   RFC7358          ||      K. Raza, S. Boutros, L. Martini, N. Leymann         ||       skraza@cisco.com, sboutros@cisco.com, lmartini@cisco.com, n.leymann@telekom.de
+#   RFC7359          ||      F. Gont         ||       fgont@si6networks.com
+#   RFC7360          ||      A. DeKok         ||       aland@freeradius.org
+#   RFC7361          ||      P. Dutta, F. Balus, O. Stokes, G. Calvignac, D. Fedyk         ||       pranjal.dutta@alcatel-lucent.com, florin.balus@alcatel-lucent.com, ostokes@extremenetworks.com, geraldine.calvignac@orange.com, don.fedyk@hp.com
+#   RFC7362          ||      E. Ivov, H. Kaplan, D. Wing         ||       emcho@jitsi.org, hadrielk@yahoo.com, dwing-ietf@fuggles.com
+#   RFC7363          ||      J. Maenpaa, G. Camarillo         ||       Jouni.Maenpaa@ericsson.com, Gonzalo.Camarillo@ericsson.com
+#   RFC7364          ||      T. Narten, Ed., E. Gray, Ed., D. Black, L. Fang, L. Kreeger, M. Napierala         ||       narten@us.ibm.com, Eric.Gray@Ericsson.com, david.black@emc.com, lufang@microsoft.com, kreeger@cisco.com, mnapierala@att.com
+#   RFC7365          ||      M. Lasserre, F. Balus, T. Morin, N. Bitar, Y. Rekhter         ||       marc.lasserre@alcatel-lucent.com, florin.balus@alcatel-lucent.com, thomas.morin@orange.com, nabil.n.bitar@verizon.com, yakov@juniper.net
+#   RFC7366          ||      P. Gutmann         ||       pgut001@cs.auckland.ac.nz
+#   RFC7367          ||      R. Cole, J. Macker, B. Adamson         ||       robert.g.cole@us.army.mil, macker@itd.nrl.navy.mil, adamson@itd.nrl.navy.mil
+#   RFC7368          ||      T. Chown, Ed., J. Arkko, A. Brandt, O. Troan, J. Weil         ||       tjc@ecs.soton.ac.uk, jari.arkko@piuha.net, Anders_Brandt@sigmadesigns.com, ot@cisco.com, jason.weil@twcable.com
+#   RFC7369          ||      A. Takacs, B. Gero, H. Long         ||       attila.takacs@ericsson.com, balazs.peter.gero@ericsson.com, lonho@huawei.com
+#   RFC7370          ||      L. Ginsberg         ||       ginsberg@cisco.com
+#   RFC7371          ||      M. Boucadair, S. Venaas         ||       mohamed.boucadair@orange.com, stig@cisco.com
+#   RFC7372          ||      M. Kucherawy         ||       superuser@gmail.com
+#   RFC7373          ||      B. Trammell         ||       ietf@trammell.ch
+#   RFC7374          ||      J. Maenpaa, G. Camarillo         ||       Jouni.Maenpaa@ericsson.com, gonzalo.camarillo@ericsson.com
+#   RFC7375          ||      J. Peterson         ||       jon.peterson@neustar.biz
+#   RFC7376          ||      T. Reddy, R. Ravindranath, M. Perumal, A. Yegin         ||       tireddy@cisco.com, rmohanr@cisco.com, muthu.arul@gmail.com, alper.yegin@yegin.org
+#   RFC7377          ||      B. Leiba, A. Melnikov         ||       barryleiba@computer.org, alexey.melnikov@isode.com
+#   RFC7378          ||      H. Tschofenig, H. Schulzrinne, B. Aboba, Ed.         ||       Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu, Bernard_Aboba@hotmail.com
+#   RFC7379          ||      Y. Li, W. Hao, R. Perlman, J. Hudson, H. Zhai         ||       liyizhou@huawei.com, haoweiguo@huawei.com, radia@alum.mit.edu, jon.hudson@gmail.com, honjun.zhai@tom.com
+#   RFC7380          ||      J. Tong, C. Bi, Ed., R. Even, Q. Wu, Ed., R. Huang         ||       tongjg@sttri.com.cn, bijy@sttri.com.cn, roni.even@mail01.huawei.com, bill.wu@huawei.com, rachel.huang@huawei.com
+#   RFC7381          ||      K. Chittimaneni, T. Chown, L. Howard, V. Kuarsingh, Y. Pouffary, E. Vyncke         ||       kk@dropbox.com, tjc@ecs.soton.ac.uk, lee.howard@twcable.com, victor@jvknet.com, yanick.pouffary@hp.com, evyncke@cisco.com
+#   RFC7382          ||      S. Kent, D. Kong, K. Seo         ||       skent@bbn.com, dkong@bbn.com, kseo@bbn.com
+#   RFC7383          ||      V. Smyslov         ||       svan@elvis.ru
+#   RFC7384          ||      T. Mizrahi         ||       talmi@marvell.com
+#   RFC7385          ||      L. Andersson, G. Swallow         ||       loa@mail01.huawei.com, swallow@cisco.com
+#   RFC7386          ||      P. Hoffman, J. Snell         ||       paul.hoffman@vpnc.org, jasnell@gmail.com
+#   RFC7387          ||      R. Key, Ed., L. Yong, Ed., S. Delord, F. Jounay, L. Jin         ||       raymond.key@ieee.org, lucy.yong@huawei.com, simon.delord@gmail.com, frederic.jounay@orange.ch, lizho.jin@gmail.com
+#   RFC7388          ||      J. Schoenwaelder, A. Sehgal, T. Tsou, C. Zhou         ||       j.schoenwaelder@jacobs-university.de, s.anuj@jacobs-university.de, tina.tsou.zouting@huawei.com, cathyzhou@huawei.com
+#   RFC7389          ||      R. Wakikawa, R. Pazhyannur, S. Gundavelli, C. Perkins         ||       ryuji.wakikawa@gmail.com, rpazhyan@cisco.com, sgundave@cisco.com, charliep@computer.org
+#   RFC7390          ||      A. Rahman, Ed., E. Dijk, Ed.         ||       Akbar.Rahman@InterDigital.com, esko.dijk@philips.com
+#   RFC7391          ||      J. Hadi Salim         ||       hadi@mojatatu.com
+#   RFC7392          ||      P. Dutta, M. Bocci, L. Martini         ||       pranjal.dutta@alcatel-lucent.com, matthew.bocci@alcatel-lucent.com, lmartini@cisco.com
+#   RFC7393          ||      X. Deng, M. Boucadair, Q. Zhao, J. Huang, C. Zhou         ||       dxhbupt@gmail.com, mohamed.boucadair@orange.com, zhaoqin.bupt@gmail.com, james.huang@huawei.com, cathy.zhou@huawei.com
+#   RFC7394          ||      S. Boutros, S. Sivabalan, G. Swallow, S. Saxena, V. Manral, S. Aldrin         ||       sboutros@cisco.com, msiva@cisco.com, swallow@cisco.com, ssaxena@cisco.com, vishwas@ionosnetworks.com, aldrin.ietf@gmail.com
+#   RFC7395          ||      L. Stout, Ed., J. Moffitt, E. Cestari         ||       lance@andyet.net, jack@metajack.im, eric@cstar.io
+#   RFC7396          ||      P. Hoffman, J. Snell         ||       paul.hoffman@vpnc.org, jasnell@gmail.com
+#   RFC7397          ||      J. Gilger, H. Tschofenig         ||       Gilger@ITSec.RWTH-Aachen.de, Hannes.tschofenig@gmx.net
+#   RFC7398          ||      M. Bagnulo, T. Burbridge, S. Crawford, P. Eardley, A. Morton         ||       marcelo@it.uc3m.es, trevor.burbridge@bt.com, sam@samknows.com, philip.eardley@bt.com, acmorton@att.com
+#   RFC7399          ||      A. Farrel, D. King         ||       adrian@olddog.co.uk, daniel@olddog.co.uk
+#   RFC7400          ||      C. Bormann         ||       cabo@tzi.org
+#   RFC7401          ||      R. Moskowitz, Ed., T. Heer, P. Jokela, T. Henderson         ||       rgm@labs.htt-consult.com, tobias.heer@belden.com, petri.jokela@nomadiclab.com, tomhend@u.washington.edu
+#   RFC7402          ||      P. Jokela, R. Moskowitz, J. Melen         ||       petri.jokela@nomadiclab.com, rgm@labs.htt-consult.com, jan.melen@nomadiclab.com
+#   RFC7403          ||      H. Kaplan         ||       hadrielk@yahoo.com
+#   RFC7404          ||      M. Behringer, E. Vyncke         ||       mbehring@cisco.com, evyncke@cisco.com
+#   RFC7405          ||      P. Kyzivat         ||       pkyzivat@alum.mit.edu
+#   RFC7406          ||      H. Schulzrinne, S. McCann, G. Bajko, H. Tschofenig, D. Kroeselberg         ||       hgs+ecrit@cs.columbia.edu, smccann@blackberry.com, gabor.bajko@mediatek.com, Hannes.Tschofenig@gmx.net, dirk.kroeselberg@siemens.com
+#   RFC7407          ||      M. Bjorklund, J. Schoenwaelder         ||       mbj@tail-f.com, j.schoenwaelder@jacobs-university.de
+#   RFC7408          ||      E. Haleplidis         ||       ehalep@ece.upatras.gr
+#   RFC7409          ||      E. Haleplidis, J. Halpern         ||       ehalep@ece.upatras.gr, joel.halpern@ericsson.com
+#   RFC7410          ||      M. Kucherawy         ||       superuser@gmail.com
+#   RFC7411          ||      T. Schmidt, Ed., M. Waehlisch, R. Koodli, G. Fairhurst, D. Liu         ||       t.schmidt@haw-hamburg.de, mw@link-lab.net, rajeev.koodli@intel.com, gorry@erg.abdn.ac.uk, liudapeng@chinamobile.com
+#   RFC7412          ||      Y. Weingarten, S. Aldrin, P. Pan, J. Ryoo, G. Mirsky         ||       wyaacov@gmail.com, aldrin.ietf@gmail.com, ppan@infinera.com, ryoo@etri.re.kr, gregory.mirsky@ericsson.com
+#   RFC7413          ||      Y. Cheng, J. Chu, S. Radhakrishnan, A. Jain         ||       ycheng@google.com, hkchu@google.com, sivasankar@cs.ucsd.edu, arvind@google.com
+#   RFC7414          ||      M. Duke, R. Braden, W. Eddy, E. Blanton, A. Zimmermann         ||       m.duke@f5.com, braden@isi.edu, wes@mti-systems.com, elb@interruptsciences.com, alexander.zimmermann@netapp.com
+#   RFC7415          ||      E. Noel, P. Williams         ||       ecnoel@att.com, phil.m.williams@bt.com
+#   RFC7416          ||      T. Tsao, R. Alexander, M. Dohler, V. Daza, A. Lozano, M. Richardson, Ed.         ||       tzetatsao@eaton.com, rogeralexander@eaton.com, mischa.dohler@kcl.ac.uk, vanesa.daza@upf.edu, angel.lozano@upf.edu, mcr+ietf@sandelman.ca
+#   RFC7417          ||      G. Karagiannis, A. Bhargava         ||       georgios.karagiannis@huawei.com, anuragb@cisco.com
+#   RFC7418          ||      S. Dawkins, Ed.         ||       spencerdawkins.ietf@gmail.com
+#   RFC7419          ||      N. Akiya, M. Binderberger, G. Mirsky         ||       nobo@cisco.com, mbinderb@cisco.com, gregory.mirsky@ericsson.com
+#   RFC7420          ||      A. Koushik, E. Stephan, Q. Zhao, D. King, J. Hardwick         ||       kkoushik@brocade.com, emile.stephan@orange.com, qzhao@huawei.com, daniel@olddog.co.uk, jonathan.hardwick@metaswitch.com
+#   RFC7421          ||      B. Carpenter, Ed., T. Chown, F. Gont, S. Jiang, A. Petrescu, A. Yourtchenko         ||       brian.e.carpenter@gmail.com, tjc@ecs.soton.ac.uk, fgont@si6networks.com, jiangsheng@huawei.com, alexandru.petrescu@cea.fr, ayourtch@cisco.com
+#   RFC7422          ||      C. Donley, C. Grundemann, V. Sarawat, K. Sundaresan, O. Vautrin         ||       c.donley@cablelabs.com, cgrundemann@gmail.com, v.sarawat@cablelabs.com, k.sundaresan@cablelabs.com, Olivier@juniper.net
+#   RFC7423          ||      L. Morand, Ed., V. Fajardo, H. Tschofenig         ||       lionel.morand@orange.com, vf0213@gmail.com, Hannes.Tschofenig@gmx.net
+#   RFC7424          ||      R. Krishnan, L. Yong, A. Ghanwani, N. So, B. Khasnabish         ||       ramkri123@gmail.com, lucy.yong@huawei.com, anoop@alumni.duke.edu, ningso@yahoo.com, vumip1@gmail.com
+#   RFC7425          ||      M. Thornburgh         ||       mthornbu@adobe.com
+#   RFC7426          ||      E. Haleplidis, Ed., K. Pentikousis, Ed., S. Denazis, J. Hadi Salim, D. Meyer, O. Koufopavlou         ||       ehalep@ece.upatras.gr, k.pentikousis@eict.de, sdena@upatras.gr, hadi@mojatatu.com, dmm@1-4-5.net, odysseas@ece.upatras.gr
+#   RFC7427          ||      T. Kivinen, J. Snyder         ||       kivinen@iki.fi, jms@opus1.com
+#   RFC7428          ||      A. Brandt, J. Buron         ||       anders_brandt@sigmadesigns.com, jakob_buron@sigmadesigns.com
+#   RFC7429          ||      D. Liu, Ed., JC. Zuniga, Ed., P. Seite, H. Chan, CJ. Bernardos         ||       liudapeng@chinamobile.com, JuanCarlos.Zuniga@InterDigital.com, pierrick.seite@orange.com, h.a.chan@ieee.org, cjbc@it.uc3m.es
+#   RFC7430          ||      M. Bagnulo, C. Paasch, F. Gont, O. Bonaventure, C. Raiciu         ||       marcelo@it.uc3m.es, christoph.paasch@gmail.com, fgont@si6networks.com, Olivier.Bonaventure@uclouvain.be, costin.raiciu@cs.pub.ro
+#   RFC7431          ||      A. Karan, C. Filsfils, IJ. Wijnands, Ed., B. Decraene         ||       apoorva@cisco.com, cfilsfil@cisco.com, ice@cisco.com, bruno.decraene@orange.com
+#   RFC7432          ||      A. Sajassi, Ed., R. Aggarwal, N. Bitar, A. Isaac, J. Uttaro, J. Drake, W. Henderickx         ||       sajassi@cisco.com, raggarwa_1@yahoo.com, nabil.n.bitar@verizon.com, aisaac71@bloomberg.net, uttaro@att.com, jdrake@juniper.net, wim.henderickx@alcatel-lucent.com
+#   RFC7433          ||      A. Johnston, J. Rafferty         ||       alan.b.johnston@gmail.com, jay@humancomm.com
+#   RFC7434          ||      K. Drage, Ed., A. Johnston         ||       keith.drage@alcatel-lucent.com, alan.b.johnston@gmail.com
+#   RFC7435          ||      V. Dukhovni         ||       ietf-dane@dukhovni.org
+#   RFC7436          ||      H. Shah, E. Rosen, F. Le Faucheur, G. Heron         ||       hshah@ciena.com, erosen@juniper.net, flefauch@cisco.com, giheron@cisco.com
+#   RFC7437          ||      M. Kucherawy, Ed.         ||       superuser@gmail.com
+#   RFC7438          ||      IJ. Wijnands, Ed., E. Rosen, A. Gulko, U. Joorde, J. Tantsura         ||       ice@cisco.com, erosen@juniper.net, arkadiy.gulko@thomsonreuters.com, uwe.joorde@telekom.de, jeff.tantsura@ericsson.com
+#   RFC7439          ||      W. George, Ed., C. Pignataro, Ed.         ||       wesley.george@twcable.com, cpignata@cisco.com
+#   RFC7440          ||      P. Masotta         ||       patrick.masotta.ietf@vercot.com
+#   RFC7441          ||      IJ. Wijnands, E. Rosen, U. Joorde         ||       ice@cisco.com, erosen@juniper.net, uwe.joorde@telekom.de
+#   RFC7442          ||      Y. Rekhter, R. Aggarwal, N. Leymann, W. Henderickx, Q. Zhao, R. Li         ||       yakov@juniper.net, raggarwa_1@yahoo.com, N.Leymann@telekom.de, wim.henderickx@alcatel-lucent.com, quintin.zhao@huawei.com, renwei.li@huawei.com
+#   RFC7443          ||      P. Patil, T. Reddy, G. Salgueiro, M. Petit-Huguenin         ||       praspati@cisco.com, tireddy@cisco.com, gsalguei@cisco.com, marc@petit-huguenin.org
+#   RFC7444          ||      K. Zeilenga, A. Melnikov         ||       kurt.zeilenga@isode.com, alexey.melnikov@isode.com
+#   RFC7445          ||      G. Chen, H. Deng, D. Michaud, J. Korhonen, M. Boucadair         ||       phdgang@gmail.com, denghui@chinamobile.com, dave.michaud@rci.rogers.com, jouni.nospam@gmail.com, mohamed.boucadair@orange.com
+#   RFC7446          ||      Y. Lee, Ed., G. Bernstein, Ed., D. Li, W. Imajuku         ||       leeyoung@huawei.com, gregb@grotto-networking.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp
+#   RFC7447          ||      J. Scudder, K. Kompella         ||       jgs@juniper.net, kireeti@juniper.net
+#   RFC7448          ||      T. Taylor, Ed., D. Romascanu         ||       tom.taylor.stds@gmail.com, dromasca@gmail.com 
+#   RFC7449          ||      Y. Lee, Ed., G. Bernstein, Ed., J. Martensson, T. Takeda, T. Tsuritani, O. Gonzalez de Dios         ||       leeyoung@huawei.com, gregb@grotto-networking.com, jonas.martensson@acreo.se, tomonori.takeda@ntt.com, tsuri@kddilabs.jp, oscar.gonzalezdedios@telefonica.com
+#   RFC7450          ||      G. Bumgardner         ||       gbumgard@gmail.com
+#   RFC7451          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
+#   RFC7452          ||      H. Tschofenig, J. Arkko, D. Thaler, D. McPherson         ||       Hannes.Tschofenig@gmx.net, jari.arkko@piuha.net, dthaler@microsoft.com, dmcpherson@verisign.com
+#   RFC7453          ||      V. Mahalingam, K. Sampath, S. Aldrin, T. Nadeau         ||       venkat.mahalingams@gmail.com, kannankvs@gmail.com, aldrin.ietf@gmail.com, tnadeau@lucidvision.com
+#   RFC7454          ||      J. Durand, I. Pepelnjak, G. Doering         ||       jerduran@cisco.com, ip@ipspace.net, gert@space.net
+#   RFC7455          ||      T. Senevirathne, N. Finn, S. Salam, D. Kumar, D. Eastlake 3rd, S. Aldrin, Y. Li         ||       tsenevir@cisco.com, nfinn@cisco.com, ssalam@cisco.com, dekumar@cisco.com, d3e3e3@gmail.com, aldrin.ietf@gmail.com, liyizhou@huawei.com
+#   RFC7456          ||      T. Mizrahi, T. Senevirathne, S. Salam, D. Kumar, D. Eastlake 3rd         ||       talmi@marvell.com, tsenevir@cisco.com, ssalam@cisco.com, dekumar@cisco.com, d3e3e3@gmail.com
+#   RFC7457          ||      Y. Sheffer, R. Holz, P. Saint-Andre         ||       yaronf.ietf@gmail.com, holz@net.in.tum.de, peter@andyet.com
+#   RFC7458          ||      R. Valmikam, R. Koodli         ||       valmikam@gmail.com, rajeev.koodli@intel.com
+#   RFC7459          ||      M. Thomson, J. Winterbottom         ||       martin.thomson@gmail.com, a.james.winterbottom@gmail.com
+#   RFC7460          ||      M. Chandramouli, B. Claise, B. Schoening, J. Quittek, T. Dietz         ||       moulchan@cisco.com, bclaise@cisco.com, brad.schoening@verizon.net, quittek@neclab.eu, Thomas.Dietz@neclab.eu
+#   RFC7461          ||      J. Parello, B. Claise, M. Chandramouli         ||       jparello@cisco.com, bclaise@cisco.com, moulchan@cisco.com
+#   RFC7462          ||      L. Liess, Ed., R. Jesske, A. Johnston, D. Worley, P. Kyzivat         ||       laura.liess.dt@gmail.com, r.jesske@telekom.de, alan.b.johnston@gmail.com, worley@ariadne.com, pkyzivat@alum.mit.edu
+#   RFC7463          ||      A. Johnston, Ed., M. Soroushnejad, Ed., V. Venkataramanan         ||       alan.b.johnston@gmail.com, msoroush@gmail.com, vvenkatar@gmail.com
+#   RFC7464          ||      N. Williams         ||       nico@cryptonector.com
+#   RFC7465          ||      A. Popov         ||       andreipo@microsoft.com
+#   RFC7466          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
+#   RFC7467          ||      A. Murdock         ||       Aidan.murdock@ncia.nato.int
+#   RFC7468          ||      S. Josefsson, S. Leonard         ||       simon@josefsson.org, dev+ietf@seantek.com
+#   RFC7469          ||      C. Evans, C. Palmer, R. Sleevi         ||       cevans@google.com, palmer@google.com, sleevi@google.com
+#   RFC7470          ||      F. Zhang, A. Farrel         ||       zhangfatai@huawei.com, adrian@olddog.co.uk
+#   RFC7471          ||      S. Giacalone, D. Ward, J. Drake, A. Atlas, S. Previdi         ||       spencer.giacalone@gmail.com, dward@cisco.com, jdrake@juniper.net, akatlas@juniper.net, sprevidi@cisco.com
+#   RFC7472          ||      I. McDonald, M. Sweet         ||       blueroofmusic@gmail.com, msweet@apple.com
+#   RFC7473          ||      K. Raza, S. Boutros         ||       skraza@cisco.com, sboutros@cisco.com
+#   RFC7474          ||      M. Bhatia, S. Hartman, D. Zhang, A. Lindem, Ed.         ||       manav@ionosnetworks.com, hartmans-ietf@mit.edu, dacheng.zhang@gmail.com, acee@cisco.com
+#   RFC7475          ||      S. Dawkins         ||       spencerdawkins.ietf@gmail.com
+#   RFC7476          ||      K. Pentikousis, Ed., B. Ohlman, D. Corujo, G. Boggia, G. Tyson, E. Davies, A. Molinaro, S. Eum         ||       k.pentikousis@eict.de, Borje.Ohlman@ericsson.com, dcorujo@av.it.pt, g.boggia@poliba.it, gareth.tyson@eecs.qmul.ac.uk, davieseb@scss.tcd.ie, antonella.molinaro@unirc.it, suyong@nict.go.jp
+#   RFC7477          ||      W. Hardaker         ||       ietf@hardakers.net
+#   RFC7478          ||      C. Holmberg, S. Hakansson, G. Eriksson         ||       christer.holmberg@ericsson.com, stefan.lk.hakansson@ericsson.com, goran.ap.eriksson@ericsson.com
+#   RFC7479          ||      S. Moonesamy         ||       sm+ietf@elandsys.com
+#   RFC7480          ||      A. Newton, B. Ellacott, N. Kong         ||       andy@arin.net, bje@apnic.net, nkong@cnnic.cn
+#   RFC7481          ||      S. Hollenbeck, N. Kong         ||       shollenbeck@verisign.com, nkong@cnnic.cn
+#   RFC7482          ||      A. Newton, S. Hollenbeck         ||       andy@arin.net, shollenbeck@verisign.com
+#   RFC7483          ||      A. Newton, S. Hollenbeck         ||       andy@arin.net, shollenbeck@verisign.com
+#   RFC7484          ||      M. Blanchet         ||       Marc.Blanchet@viagenie.ca
+#   RFC7485          ||      L. Zhou, N. Kong, S. Shen, S. Sheng, A. Servin         ||       zhoulinlin@cnnic.cn, nkong@cnnic.cn, shenshuo@cnnic.cn, steve.sheng@icann.org, arturo.servin@gmail.com
+#   RFC7486          ||      S. Farrell, P. Hoffman, M. Thomas         ||       stephen.farrell@cs.tcd.ie, paul.hoffman@vpnc.org, mike@phresheez.com
+#   RFC7487          ||      E. Bellagamba, A. Takacs, G. Mirsky, L. Andersson, P. Skoldstrom, D. Ward         ||       elisa.bellagamba@ericsson.com, attila.takacs@ericsson.com, gregory.mirsky@ericsson.com, loa@mail01.huawei.com, pontus.skoldstrom@acreo.se, dward@cisco.com
+#   RFC7488          ||      M. Boucadair, R. Penno, D. Wing, P. Patil, T. Reddy         ||       mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com, tireddy@cisco.com
+#   RFC7489          ||      M. Kucherawy, Ed., E. Zwicky, Ed.         ||       superuser@gmail.com, zwicky@yahoo-inc.com
+#   RFC7490          ||      S. Bryant, C. Filsfils, S. Previdi, M. Shand, N. So         ||       stbryant@cisco.com, cfilsfil@cisco.com, sprevidi@cisco.com, imc.shand@gmail.com, ningso@vinci-systems.com
+#   RFC7491          ||      D. King, A. Farrel         ||       daniel@olddog.co.uk, adrian@olddog.co.uk
+#   RFC7492          ||      M. Bhatia, D. Zhang, M. Jethanandani         ||       manav@ionosnetworks.com, dacheng.zhang@gmail.com, mjethanandani@gmail.com
+#   RFC7493          ||      T. Bray, Ed.         ||       tbray@textuality.com
+#   RFC7494          ||      C. Shao, H. Deng, R. Pazhyannur, F. Bari, R. Zhang, S. Matsushima         ||       shaochunju@chinamobile.com, denghui@chinamobile.com, rpazhyan@cisco.com, farooq.bari@att.com, zhangr@gsta.com, satoru.matsushima@g.softbank.co.jp
+#   RFC7495          ||      A. Montville, D. Black         ||       adam.w.montville@gmail.com, david.black@emc.com
+#   RFC7496          ||      M. Tuexen, R. Seggelmann, R. Stewart, S. Loreto         ||       tuexen@fh-muenster.de, rfc@robin-seggelmann.com, randall@lakerest.net, Salvatore.Loreto@ericsson.com
+#   RFC7497          ||      A. Morton         ||       acmorton@att.com
+#   RFC7498          ||      P. Quinn, Ed., T. Nadeau, Ed.         ||       paulq@cisco.com, tnadeau@lucidvision.com
+#   RFC7499          ||      A. Perez-Mendez, Ed., R. Marin-Lopez, F. Pereniguez-Garcia, G. Lopez-Millan, D. Lopez, A. DeKok         ||       alex@um.es, rafa@um.es, pereniguez@um.es, gabilm@um.es, diego@tid.es, aland@networkradius.com
+#   RFC7500          ||      R. Housley, Ed., O. Kolkman, Ed.         ||       housley@vigilsec.com, kolkman@isoc.org
+#   RFC7501          ||      C. Davids, V. Gurbani, S. Poretsky         ||       davids@iit.edu, vkg@bell-labs.com, sporetsky@allot.com
+#   RFC7502          ||      C. Davids, V. Gurbani, S. Poretsky         ||       davids@iit.edu, vkg@bell-labs.com, sporetsky@allot.com
+#   RFC7503          ||      A. Lindem, J. Arkko         ||       acee@cisco.com, jari.arkko@piuha.net
+#   RFC7504          ||      J. Klensin         ||       john-ietf@jck.com
+#   RFC7505          ||      J. Levine, M. Delany         ||       standards@taugh.com, mx0dot@yahoo.com
+#   RFC7506          ||      K. Raza, N. Akiya, C. Pignataro         ||       skraza@cisco.com, nobo.akiya.dev@gmail.com, cpignata@cisco.com
+#   RFC7507          ||      B. Moeller, A. Langley         ||       bmoeller@acm.org, agl@google.com
+#   RFC7508          ||      L. Cailleux, C. Bonatti         ||       laurent.cailleux@intradef.gouv.fr, bonatti252@ieca.com
+#   RFC7509          ||      R. Huang, V. Singh         ||       rachel.huang@huawei.com, varun@comnet.tkk.fi
+#   RFC7510          ||      X. Xu, N. Sheth, L. Yong, R. Callon, D. Black         ||       xuxiaohu@huawei.com, nsheth@juniper.net, lucy.yong@huawei.com, rcallon@juniper.net, david.black@emc.com
+#   RFC7511          ||      M. Wilhelm         ||       max@rfc2324.org
+#   RFC7512          ||      J. Pechanec, D. Moffat         ||       Jan.Pechanec@Oracle.COM, Darren.Moffat@Oracle.COM
+#   RFC7513          ||      J. Bi, J. Wu, G. Yao, F. Baker         ||       junbi@tsinghua.edu.cn, jianping@cernet.edu.cn, yaoguang@cernet.edu.cn, fred@cisco.com
+#   RFC7514          ||      M. Luckie         ||       mjl@caida.org
+#   RFC7515          ||      M. Jones, J. Bradley, N. Sakimura         ||       mbj@microsoft.com, ve7jtb@ve7jtb.com, n-sakimura@nri.co.jp
+#   RFC7516          ||      M. Jones, J. Hildebrand         ||       mbj@microsoft.com, jhildebr@cisco.com
+#   RFC7517          ||      M. Jones         ||       mbj@microsoft.com
+#   RFC7518          ||      M. Jones         ||       mbj@microsoft.com
+#   RFC7519          ||      M. Jones, J. Bradley, N. Sakimura         ||       mbj@microsoft.com, ve7jtb@ve7jtb.com, n-sakimura@nri.co.jp
+#   RFC7520          ||      M. Miller         ||       mamille2@cisco.com
+#   RFC7521          ||      B. Campbell, C. Mortimore, M. Jones, Y. Goland         ||       brian.d.campbell@gmail.com, cmortimore@salesforce.com, mbj@microsoft.com, yarong@microsoft.com
+#   RFC7522          ||      B. Campbell, C. Mortimore, M. Jones         ||       brian.d.campbell@gmail.com, cmortimore@salesforce.com, mbj@microsoft.com
+#   RFC7523          ||      M. Jones, B. Campbell, C. Mortimore         ||       mbj@microsoft.com, brian.d.campbell@gmail.com, cmortimore@salesforce.com
+#   RFC7524          ||      Y. Rekhter, E. Rosen, R. Aggarwal, T. Morin, I. Grosclaude, N. Leymann, S. Saad         ||       yakov@juniper.net, erosen@juniper.net, raggarwa_1@yahoo.com, thomas.morin@orange.com, irene.grosclaude@orange.com, n.leymann@telekom.de, samirsaad1@outlook.com
+#   RFC7525          ||      Y. Sheffer, R. Holz, P. Saint-Andre         ||       yaronf.ietf@gmail.com, ralph.ietf@gmail.com, peter@andyet.com
+#   RFC7526          ||      O. Troan, B. Carpenter, Ed.         ||       ot@cisco.com, brian.e.carpenter@gmail.com
+#   RFC7527          ||      R. Asati, H. Singh, W. Beebee, C. Pignataro, E. Dart, W. George         ||       rajiva@cisco.com, shemant@cisco.com, wbeebee@cisco.com, cpignata@cisco.com, dart@es.net, wesley.george@twcable.com
+#   RFC7528          ||      P. Higgs, J. Piesing         ||       paul.higgs@ericsson.com, jon.piesing@tpvision.com
+#   RFC7529          ||      C. Daboo, G. Yakushev         ||       cyrus@daboo.name, gyakushev@yahoo.com
+#   RFC7530          ||      T. Haynes, Ed., D. Noveck, Ed.         ||       thomas.haynes@primarydata.com, dave_noveck@dell.com
+#   RFC7531          ||      T. Haynes, Ed., D. Noveck, Ed.         ||       thomas.haynes@primarydata.com, dave_noveck@dell.com
+#   RFC7532          ||      J. Lentini, R. Tewari, C. Lever, Ed.         ||       jlentini@netapp.com, tewarir@us.ibm.com, chuck.lever@oracle.com
+#   RFC7533          ||      J. Lentini, R. Tewari, C. Lever, Ed.         ||       jlentini@netapp.com, tewarir@us.ibm.com, chuck.lever@oracle.com
+#   RFC7534          ||      J. Abley, W. Sotomayor         ||       jabley@dyn.com, wfms@ottix.net
+#   RFC7535          ||      J. Abley, B. Dickson, W. Kumari, G. Michaelson         ||       jabley@dyn.com, bdickson@twitter.com, warren@kumari.net, ggm@apnic.net
+#   RFC7536          ||      M. Linsner, P. Eardley, T. Burbridge, F. Sorensen         ||       mlinsner@cisco.com, philip.eardley@bt.com, trevor.burbridge@bt.com, frode.sorensen@nkom.no
+#   RFC7537          ||      B. Decraene, N. Akiya, C. Pignataro, L. Andersson, S. Aldrin         ||       bruno.decraene@orange.com, nobo.akiya.dev@gmail.com, cpignata@cisco.com, loa@mail01.huawei.com, aldrin.ietf@gmail.com
+#   RFC7538          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC7539          ||      Y. Nir, A. Langley         ||       ynir.ietf@gmail.com, agl@google.com
+#   RFC7540          ||      M. Belshe, R. Peon, M. Thomson, Ed.         ||       mike@belshe.com, fenix@google.com, martin.thomson@gmail.com
+#   RFC7541          ||      R. Peon, H. Ruellan         ||       fenix@google.com, herve.ruellan@crf.canon.fr
+#   RFC7542          ||      A. DeKok         ||       aland@freeradius.org
+#   RFC7543          ||      H. Jeng, L. Jalil, R. Bonica, K. Patel, L. Yong         ||       hj2387@att.com, luay.jalil@verizon.com, rbonica@juniper.net, keyupate@cisco.com, lucy.yong@huawei.com
+#   RFC7544          ||      M. Mohali         ||       marianne.mohali@orange.com
+#   RFC7545          ||      V. Chen, Ed., S. Das, L. Zhu, J. Malyar, P. McCann         ||       vchen@google.com, sdas@appcomsci.com, lei.zhu@huawei.com, jmalyar@iconectiv.com, peter.mccann@huawei.com
+#   RFC7546          ||      B. Kaduk         ||       kaduk@mit.edu
+#   RFC7547          ||      M. Ersue, Ed., D. Romascanu, J. Schoenwaelder, U. Herberg         ||       mehmet.ersue@nsn.com, dromasca@gmail.com , j.schoenwaelder@jacobs-university.de, ulrich@herberg.name
+#   RFC7548          ||      M. Ersue, Ed., D. Romascanu, J. Schoenwaelder, A. Sehgal         ||       mehmet.ersue@nsn.com, dromasca@gmail.com , j.schoenwaelder@jacobs-university.de, s.anuj@jacobs-university.de
+#   RFC7549          ||      C. Holmberg, J. Holm, R. Jesske, M. Dolly         ||       christer.holmberg@ericsson.com, jan.holm@ericsson.com, r.jesske@telekom.de, md3135@att.com
+#   RFC7550          ||      O. Troan, B. Volz, M. Siodelski         ||       ot@cisco.com, volz@cisco.com, msiodelski@gmail.com
+#   RFC7551          ||      F. Zhang, Ed., R. Jing, R. Gandhi, Ed.         ||       zhangfei7@huawei.com, jingrq@ctbri.com.cn, rgandhi@cisco.com
+#   RFC7552          ||      R. Asati, C. Pignataro, K. Raza, V. Manral, R. Papneja         ||       rajiva@cisco.com, cpignata@cisco.com, skraza@cisco.com, vishwas@ionosnetworks.com, rajiv.papneja@huawei.com
+#   RFC7553          ||      P. Faltstrom, O. Kolkman         ||       paf@netnod.se, kolkman@isoc.org
+#   RFC7554          ||      T. Watteyne, Ed., M. Palattella, L. Grieco         ||       twatteyne@linear.com, maria-rita.palattella@uni.lu, a.grieco@poliba.it
+#   RFC7555          ||      G. Swallow, V. Lim, S. Aldrin         ||       swallow@cisco.com, vlim@cisco.com, aldrin.ietf@gmail.com
+#   RFC7556          ||      D. Anipko, Ed.         ||       dmitry.anipko@gmail.com
+#   RFC7557          ||      J. Chroboczek         ||       jch@pps.univ-paris-diderot.fr
+#   RFC7558          ||      K. Lynn, S. Cheshire, M. Blanchet, D. Migault         ||       kerry.lynn@verizon.com, cheshire@apple.com, Marc.Blanchet@viagenie.ca, daniel.migault@ericsson.com
+#   RFC7559          ||      S. Krishnan, D. Anipko, D. Thaler         ||       suresh.krishnan@ericsson.com, dmitry.anipko@gmail.com, dthaler@microsoft.com
+#   RFC7560          ||      M. Kuehlewind, Ed., R. Scheffenegger, B. Briscoe         ||       mirja.kuehlewind@tik.ee.ethz.ch, rs@netapp.com, ietf@bobbriscoe.net
+#   RFC7561          ||      J. Kaippallimalil, R. Pazhyannur, P. Yegani         ||       john.kaippallimalil@huawei.com, rpazhyan@cisco.com, pyegani@juniper.net
+#   RFC7562          ||      D. Thakore         ||       d.thakore@cablelabs.com
+#   RFC7563          ||      R. Pazhyannur, S. Speicher, S. Gundavelli, J. Korhonen, J. Kaippallimalil         ||       rpazhyan@cisco.com, sespeich@cisco.com, sgundave@cisco.com, jouni.nospam@gmail.com, john.kaippallimalil@huawei.com
+#   RFC7564          ||      P. Saint-Andre, M. Blanchet         ||       peter@andyet.com, Marc.Blanchet@viagenie.ca
+#   RFC7565          ||      P. Saint-Andre         ||       peter@andyet.com
+#   RFC7566          ||      L. Goix, K. Li         ||       laurent.goix@econocom-osiatis.com, kepeng.likp@gmail.com
+#   RFC7567          ||      F. Baker, Ed., G. Fairhurst, Ed.         ||       fred@cisco.com, gorry@erg.abdn.ac.uk
+#   RFC7568          ||      R. Barnes, M. Thomson, A. Pironti, A. Langley         ||       rlb@ipv.sx, martin.thomson@gmail.com, alfredo@pironti.eu, agl@google.com
+#   RFC7569          ||      D. Quigley, J. Lu, T. Haynes         ||       dpquigl@davequigley.com, Jarrett.Lu@oracle.com, thomas.haynes@primarydata.com
+#   RFC7570          ||      C. Margaria, Ed., G. Martinelli, S. Balls, B. Wright         ||       cmargaria@juniper.net, giomarti@cisco.com, steve.balls@metaswitch.com, ben.wright@metaswitch.com
+#   RFC7571          ||      J. Dong, M. Chen, Z. Li, D. Ceccarelli         ||       jie.dong@huawei.com, mach.chen@huawei.com, lizhenqiang@chinamobile.com, daniele.ceccarelli@ericsson.com
+#   RFC7572          ||      P. Saint-Andre, A. Houri, J. Hildebrand         ||       peter@andyet.com, avshalom@il.ibm.com, jhildebr@cisco.com
+#   RFC7573          ||      P. Saint-Andre, S. Loreto         ||       peter@andyet.com, Salvatore.Loreto@ericsson.com
+#   RFC7574          ||      A. Bakker, R. Petrocco, V. Grishchenko         ||       arno@cs.vu.nl, r.petrocco@gmail.com, victor.grishchenko@gmail.com
+#   RFC7575          ||      M. Behringer, M. Pritikin, S. Bjarnason, A. Clemm, B. Carpenter, S. Jiang, L. Ciavaglia         ||       mbehring@cisco.com, pritikin@cisco.com, sbjarnas@cisco.com, alex@cisco.com, brian.e.carpenter@gmail.com, jiangsheng@huawei.com, Laurent.Ciavaglia@alcatel-lucent.com
+#   RFC7576          ||      S. Jiang, B. Carpenter, M. Behringer         ||       jiangsheng@huawei.com, brian.e.carpenter@gmail.com, mbehring@cisco.com
+#   RFC7577          ||      J. Quittek, R. Winter, T. Dietz         ||       quittek@neclab.eu, rolf.winter@neclab.eu, Thomas.Dietz@neclab.eu
+#   RFC7578          ||      L. Masinter         ||       masinter@adobe.com
+#   RFC7579          ||      G. Bernstein, Ed., Y. Lee, Ed., D. Li, W. Imajuku, J. Han         ||       gregb@grotto-networking.com, ylee@huawei.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp, hanjianrui@huawei.com
+#   RFC7580          ||      F. Zhang, Y. Lee, J. Han, G. Bernstein, Y. Xu         ||       zhangfatai@huawei.com, leeyoung@huawei.com, hanjianrui@huawei.com, gregb@grotto-networking.com, xuyunbin@mail.ritt.com.cn
+#   RFC7581          ||      G. Bernstein, Ed., Y. Lee, Ed., D. Li, W. Imajuku, J. Han         ||       gregb@grotto-networking.com, leeyoung@huawei.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp, hanjianrui@huawei.com
+#   RFC7582          ||      E. Rosen, IJ. Wijnands, Y. Cai, A. Boers         ||       erosen@juniper.net, ice@cisco.com, yiqunc@microsoft.com, arjen@boers.com
+#   RFC7583          ||      S. Morris, J. Ihren, J. Dickinson, W. Mekking         ||       stephen@isc.org, johani@netnod.se, jad@sinodun.com, mmekking@dyn.com
+#   RFC7584          ||      R. Ravindranath, T. Reddy, G. Salgueiro         ||       rmohanr@cisco.com, tireddy@cisco.com, gsalguei@cisco.com
+#   RFC7585          ||      S. Winter, M. McCauley         ||       stefan.winter@restena.lu, mikem@airspayce.com
+#   RFC7586          ||      Y. Nachum, L. Dunbar, I. Yerushalmi, T. Mizrahi         ||       youval.nachum@gmail.com, ldunbar@huawei.com, yilan@marvell.com, talmi@marvell.com
+#   RFC7587          ||      J. Spittka, K. Vos, JM. Valin         ||       jspittka@gmail.com, koenvos74@gmail.com, jmvalin@jmvalin.ca
+#   RFC7588          ||      R. Bonica, C. Pignataro, J. Touch         ||       rbonica@juniper.net, cpignata@cisco.com, touch@isi.edu
+#   RFC7589          ||      M. Badra, A. Luchuk, J. Schoenwaelder         ||       mohamad.badra@zu.ac.ae, luchuk@snmp.com, j.schoenwaelder@jacobs-university.de
+#   RFC7590          ||      P. Saint-Andre, T. Alkemade         ||       peter@andyet.com, me@thijsalkema.de
+#   RFC7591          ||      J. Richer, Ed., M. Jones, J. Bradley, M. Machulak, P. Hunt         ||       ietf@justin.richer.org, mbj@microsoft.com, ve7jtb@ve7jtb.com, maciej.machulak@gmail.com, phil.hunt@yahoo.com
+#   RFC7592          ||      J. Richer, Ed., M. Jones, J. Bradley, M. Machulak         ||       ietf@justin.richer.org, mbj@microsoft.com, ve7jtb@ve7jtb.com, maciej.machulak@gmail.com
+#   RFC7593          ||      K. Wierenga, S. Winter, T. Wolniewicz         ||       klaas@cisco.com, stefan.winter@restena.lu, twoln@umk.pl
+#   RFC7594          ||      P. Eardley, A. Morton, M. Bagnulo, T. Burbridge, P. Aitken, A. Akhter         ||       philip.eardley@bt.com, acmorton@att.com, marcelo@it.uc3m.es, trevor.burbridge@bt.com, paitken@brocade.com, aakhter@gmail.com
+#   RFC7595          ||      D. Thaler, Ed., T. Hansen, T. Hardie         ||       dthaler@microsoft.com, tony+urireg@maillennium.att.com, ted.ietf@gmail.com
+#   RFC7596          ||      Y. Cui, Q. Sun, M. Boucadair, T. Tsou, Y. Lee, I. Farrer         ||       yong@csnet1.cs.tsinghua.edu.cn, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com, tena@huawei.com, yiu_lee@cable.comcast.com, ian.farrer@telekom.de
+#   RFC7597          ||      O. Troan, Ed., W. Dec, X. Li, C. Bao, S. Matsushima, T. Murakami, T. Taylor, Ed.         ||       ot@cisco.com, wdec@cisco.com, xing@cernet.edu.cn, congxiao@cernet.edu.cn, satoru.matsushima@g.softbank.co.jp, tetsuya@ipinfusion.com, tom.taylor.stds@gmail.com
+#   RFC7598          ||      T. Mrugalski, O. Troan, I. Farrer, S. Perreault, W. Dec, C. Bao, L. Yeh, X. Deng         ||       tomasz.mrugalski@gmail.com, ot@cisco.com, ian.farrer@telekom.de, sperreault@jive.com, wdec@cisco.com, congxiao@cernet.edu.cn, leaf.y.yeh@hotmail.com, dxhbupt@gmail.com
+#   RFC7599          ||      X. Li, C. Bao, W. Dec, Ed., O. Troan, S. Matsushima, T. Murakami         ||       xing@cernet.edu.cn, congxiao@cernet.edu.cn, wdec@cisco.com, ot@cisco.com, satoru.matsushima@g.softbank.co.jp, tetsuya@ipinfusion.com
+#   RFC7600          ||      R. Despres, S. Jiang, Ed., R. Penno, Y. Lee, G. Chen, M. Chen         ||       despres.remi@laposte.net, jiangsheng@huawei.com, repenno@cisco.com, yiu_lee@cable.comcast.com, phdgang@gmail.com, maoke@bbix.net
+#   RFC7601          ||      M. Kucherawy         ||       superuser@gmail.com
+#   RFC7602          ||      U. Chunduri, W. Lu, A. Tian, N. Shen         ||       uma.chunduri@ericsson.com, wenhu.lu@ericsson.com, albert.tian@ericsson.com, naiming@cisco.com
+#   RFC7603          ||      B. Schoening, M. Chandramouli, B. Nordman         ||       brad.schoening@verizon.net, moulchan@cisco.com, bnordman@lbl.gov
+#   RFC7604          ||      M. Westerlund, T. Zeng         ||       magnus.westerlund@ericsson.com, thomas.zeng@gmail.com
+#   RFC7605          ||      J. Touch         ||       touch@isi.edu
+#   RFC7606          ||      E. Chen, Ed., J. Scudder, Ed., P. Mohapatra, K. Patel         ||       enkechen@cisco.com, jgs@juniper.net, mpradosh@yahoo.com, keyupate@cisco.com
+#   RFC7607          ||      W. Kumari, R. Bush, H. Schiller, K. Patel         ||       warren@kumari.net, randy@psg.com, has@google.com, keyupate@cisco.com
+#   RFC7608          ||      M. Boucadair, A. Petrescu, F. Baker         ||       mohamed.boucadair@orange.com, alexandre.petrescu@cea.fr, fred@cisco.com
+#   RFC7609          ||      M. Fox, C. Kassimis, J. Stevens         ||       mjfox@us.ibm.com, kassimis@us.ibm.com, sjerry@us.ibm.com
+#   RFC7610          ||      F. Gont, W. Liu, G. Van de Velde         ||       fgont@si6networks.com, liushucheng@huawei.com, gunter.van_de_velde@alcatel-lucent.com
+#   RFC7611          ||      J. Uttaro, P. Mohapatra, D. Smith, R. Raszuk, J. Scudder         ||       uttaro@att.com, mpradosh@yahoo.com, djsmith@cisco.com, robert@raszuk.net, jgs@juniper.net
+#   RFC7612          ||      P. Fleming, I. McDonald         ||       patfleminghtc@gmail.com, blueroofmusic@gmail.com
+#   RFC7613          ||      P. Saint-Andre, A. Melnikov         ||       peter@andyet.com, alexey.melnikov@isode.com
+#   RFC7614          ||      R. Sparks         ||       rjsparks@nostrum.com
+#   RFC7615          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC7616          ||      R. Shekh-Yusef, Ed., D. Ahrens, S. Bremer         ||       rifaat.ietf@gmail.com, ahrensdc@gmail.com, sophie.bremer@netzkonform.de
+#   RFC7617          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC7618          ||      Y. Cui, Q. Sun, I. Farrer, Y. Lee, Q. Sun, M. Boucadair         ||       yong@csnet1.cs.tsinghua.edu.cn, sunqi.ietf@gmail.com, ian.farrer@telekom.de, yiu_lee@cable.comcast.com, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com
+#   RFC7619          ||      V. Smyslov, P. Wouters         ||       svan@elvis.ru, pwouters@redhat.com
+#   RFC7620          ||      M. Boucadair, Ed., B. Chatras, T. Reddy, B. Williams, B. Sarikaya         ||       mohamed.boucadair@orange.com, bruno.chatras@orange.com, tireddy@cisco.com, brandon.williams@akamai.com, sarikaya@ieee.org
+#   RFC7621          ||      A.B. Roach         ||       adam@nostrum.com
+#   RFC7622          ||      P. Saint-Andre         ||       peter@andyet.com
+#   RFC7623          ||      A. Sajassi, Ed., S. Salam, N. Bitar, A. Isaac, W. Henderickx         ||       sajassi@cisco.com, ssalam@cisco.com, nabil.n.bitar@verizon.com, aisaac@juniper.net, wim.henderickx@alcatel-lucent.com
+#   RFC7624          ||      R. Barnes, B. Schneier, C. Jennings, T. Hardie, B. Trammell, C. Huitema, D. Borkmann         ||       rlb@ipv.sx, schneier@schneier.com, fluffy@cisco.com, ted.ietf@gmail.com, ietf@trammell.ch, huitema@huitema.net, daniel@iogearbox.net
+#   RFC7625          ||      J. T. Hao, P. Maheshwari, R. Huang, L. Andersson, M. Chen         ||       haojiangtao@huawei.com, praveen.maheshwari@in.airtel.com, river.huang@huawei.com, loa@mail01.huawei.com, mach.chen@huawei.com
+#   RFC7626          ||      S. Bortzmeyer         ||       bortzmeyer+ietf@nic.fr
+#   RFC7627          ||      K. Bhargavan, Ed., A. Delignat-Lavaud, A. Pironti, A. Langley, M. Ray         ||       karthikeyan.bhargavan@inria.fr, antoine.delignat-lavaud@inria.fr, alfredo.pironti@inria.fr, agl@google.com, maray@microsoft.com
+#   RFC7628          ||      W. Mills, T. Showalter, H. Tschofenig         ||       wmills_92105@yahoo.com, tjs@psaux.com, Hannes.Tschofenig@gmx.net
+#   RFC7629          ||      S. Gundavelli, Ed., K. Leung, G. Tsirtsis, A. Petrescu         ||       sgundave@cisco.com, kleung@cisco.com, tsirtsis@qualcomm.com, alexandru.petrescu@cea.fr
+#   RFC7630          ||      J. Merkle, Ed., M. Lochter         ||       johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de
+#   RFC7631          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
+#   RFC7632          ||      D. Waltermire, D. Harrington         ||       david.waltermire@nist.gov, ietfdbh@gmail.com
+#   RFC7633          ||      P. Hallam-Baker         ||       philliph@comodo.com
+#   RFC7634          ||      Y. Nir         ||       ynir.ietf@gmail.com
+#   RFC7635          ||      T. Reddy, P. Patil, R. Ravindranath, J. Uberti         ||       tireddy@cisco.com, praspati@cisco.com, rmohanr@cisco.com, justin@uberti.name
+#   RFC7636          ||      N. Sakimura, Ed., J. Bradley, N. Agarwal         ||       n-sakimura@nri.co.jp, ve7jtb@ve7jtb.com, naa@google.com
+#   RFC7637          ||      P. Garg, Ed., Y. Wang, Ed.         ||       pankajg@microsoft.com, yushwang@microsoft.com
+#   RFC7638          ||      M. Jones, N. Sakimura         ||       mbj@microsoft.com, n-sakimura@nri.co.jp
+#   RFC7639          ||      A. Hutton, J. Uberti, M. Thomson         ||       andrew.hutton@unify.com, justin@uberti.name, martin.thomson@gmail.com
+#   RFC7640          ||      B. Constantine, R. Krishnan         ||       barry.constantine@jdsu.com, ramkri123@gmail.com
+#   RFC7641          ||      K. Hartke         ||       hartke@tzi.org
+#   RFC7642          ||      K. LI, Ed., P. Hunt, B. Khasnabish, A. Nadalin, Z. Zeltsan         ||       kepeng.lkp@alibaba-inc.com, phil.hunt@oracle.com, vumip1@gmail.com, tonynad@microsoft.com, zachary.zeltsan@gmail.com
+#   RFC7643          ||      P. Hunt, Ed., K. Grizzle, E. Wahlstroem, C. Mortimore         ||       phil.hunt@yahoo.com, kelly.grizzle@sailpoint.com, erik.wahlstrom@nexusgroup.com, cmortimore@salesforce.com
+#   RFC7644          ||      P. Hunt, Ed., K. Grizzle, M. Ansari, E. Wahlstroem, C. Mortimore         ||       phil.hunt@yahoo.com, kelly.grizzle@sailpoint.com, morteza.ansari@cisco.com, erik.wahlstrom@nexusgroup.com, cmortimore@salesforce.com
+#   RFC7645          ||      U. Chunduri, A. Tian, W. Lu         ||       uma.chunduri@ericsson.com, albert.tian@ericsson.com, wenhu.lu@ericsson.com
+#   RFC7646          ||      P. Ebersman, W. Kumari, C. Griffiths, J. Livingood, R. Weber         ||       ebersman-ietf@dragon.net, warren@kumari.net, cgriffiths@gmail.com, jason_livingood@cable.comcast.com, ralf.weber@nominum.com
+#   RFC7647          ||      R. Sparks, A.B. Roach         ||       rjsparks@nostrum.com, adam@nostrum.com
+#   RFC7648          ||      S. Perreault, M. Boucadair, R. Penno, D. Wing, S. Cheshire         ||       sperreault@jive.com, mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com, cheshire@apple.com
+#   RFC7649          ||      P. Saint-Andre, D. York         ||       peter@andyet.com, york@isoc.org
+#   RFC7650          ||      J. Jimenez, J. Lopez-Vega, J. Maenpaa, G. Camarillo         ||       jaime.jimenez@ericsson.com, jmlvega@ugr.es, jouni.maenpaa@ericsson.com, gonzalo.camarillo@ericsson.com
+#   RFC7651          ||      A. Dodd-Noble, S. Gundavelli, J. Korhonen, F. Baboescu, B. Weis         ||       noblea@cisco.com, sgundave@cisco.com, jouni.nospam@gmail.com, baboescu@broadcom.com, bew@cisco.com
+#   RFC7652          ||      M. Cullen, S. Hartman, D. Zhang, T. Reddy         ||       margaret@painless-security.com, hartmans@painless-security.com, zhang_dacheng@hotmail.com, tireddy@cisco.com
+#   RFC7653          ||      D. Raghuvanshi, K. Kinnear, D. Kukrety         ||       draghuva@cisco.com, kkinnear@cisco.com, dkukrety@cisco.com
+#   RFC7654          ||      S. Banks, F. Calabria, G. Czirjak, R. Machat         ||       sbanks@encrypted.net, fcalabri@cisco.com, gczirjak@juniper.net, rmachat@juniper.net
+#   RFC7655          ||      M. Ramalho, Ed., P. Jones, N. Harada, M. Perumal, L. Miao         ||       mramalho@cisco.com, paulej@packetizer.com, harada.noboru@lab.ntt.co.jp, muthu.arul@gmail.com, lei.miao@huawei.com
+#   RFC7656          ||      J. Lennox, K. Gross, S. Nandakumar, G. Salgueiro, B. Burman, Ed.         ||       jonathan@vidyo.com, kevin.gross@avanw.com, snandaku@cisco.com, gsalguei@cisco.com, bo.burman@ericsson.com
+#   RFC7657          ||      D. Black, Ed., P. Jones         ||       david.black@emc.com, paulej@packetizer.com
+#   RFC7658          ||      S. Perreault, T. Tsou, S. Sivakumar, T. Taylor         ||       sperreault@jive.com, tina.tsou.zouting@huawei.com, ssenthil@cisco.com, tom.taylor.stds@gmail.com
+#   RFC7659          ||      S. Perreault, T. Tsou, S. Sivakumar, T. Taylor         ||       sperreault@jive.com, tina.tsou.zouting@huawei.com, ssenthil@cisco.com, tom.taylor.stds@gmail.com
+#   RFC7660          ||      L. Bertz, S. Manning, B. Hirschman         ||       lyleb551144@gmail.com, sergem913@gmail.com, Brent.Hirschman@gmail.com
+#   RFC7661          ||      G. Fairhurst, A. Sathiaseelan, R. Secchi         ||       gorry@erg.abdn.ac.uk, arjuna@erg.abdn.ac.uk, raffaello@erg.abdn.ac.uk
+#   RFC7662          ||      J. Richer, Ed.         ||       ietf@justin.richer.org
+#   RFC7663          ||      B. Trammell, Ed., M. Kuehlewind, Ed.         ||       ietf@trammell.ch, mirja.kuehlewind@tik.ee.ethz.ch
+#   RFC7664          ||      D. Harkins, Ed.         ||       dharkins@arubanetworks.com
+#   RFC7665          ||      J. Halpern, Ed., C. Pignataro, Ed.         ||       jmh@joelhalpern.com, cpignata@cisco.com
+#   RFC7666          ||      H. Asai, M. MacFaden, J. Schoenwaelder, K. Shima, T. Tsou         ||       panda@hongo.wide.ad.jp, mrm@vmware.com, j.schoenwaelder@jacobs-university.de, keiichi@iijlab.net, tina.tsou.zouting@huawei.com
+#   RFC7667          ||      M. Westerlund, S. Wenger         ||       magnus.westerlund@ericsson.com, stewe@stewe.org
+#   RFC7668          ||      J. Nieminen, T. Savolainen, M. Isomaki, B. Patil, Z. Shelby, C. Gomez         ||       johannamaria.nieminen@gmail.com, teemu.savolainen@nokia.com, markus.isomaki@nokia.com, basavaraj.patil@att.com, zach.shelby@arm.com, carlesgo@entel.upc.edu
+#   RFC7669          ||      J. Levine         ||       standards@taugh.com
+#   RFC7670          ||      T. Kivinen, P. Wouters, H. Tschofenig         ||       kivinen@iki.fi, pwouters@redhat.com, Hannes.Tschofenig@gmx.net
+#   RFC7671          ||      V. Dukhovni, W. Hardaker         ||       ietf-dane@dukhovni.org, ietf@hardakers.net
+#   RFC7672          ||      V. Dukhovni, W. Hardaker         ||       ietf-dane@dukhovni.org, ietf@hardakers.net
+#   RFC7673          ||      T. Finch, M. Miller, P. Saint-Andre         ||       dot@dotat.at, mamille2@cisco.com, peter@andyet.com
+#   RFC7674          ||      J. Haas, Ed.         ||       jhaas@juniper.net
+#   RFC7675          ||      M. Perumal, D. Wing, R. Ravindranath, T. Reddy, M. Thomson         ||       muthu.arul@gmail.com, dwing-ietf@fuggles.com, rmohanr@cisco.com, tireddy@cisco.com, martin.thomson@gmail.com
+#   RFC7676          ||      C. Pignataro, R. Bonica, S. Krishnan         ||       cpignata@cisco.com, rbonica@juniper.net, suresh.krishnan@ericsson.com
+#   RFC7677          ||      T. Hansen         ||       tony+scramsha256@maillennium.att.com
+#   RFC7678          ||      C. Zhou, T. Taylor, Q. Sun, M. Boucadair         ||       cathy.zhou@huawei.com, tom.taylor.stds@gmail.com, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com
+#   RFC7679          ||      G. Almes, S. Kalidindi, M. Zekauskas, A. Morton, Ed.         ||       almes@acm.org, skalidindi@ixiacom.com, matt@internet2.edu, acmorton@att.com
+#   RFC7680          ||      G. Almes, S. Kalidindi, M. Zekauskas, A. Morton, Ed.         ||       almes@acm.org, skalidindi@ixiacom.com, matt@internet2.edu, acmorton@att.com
+#   RFC7681          ||      J. Davin         ||       info@eesst.org
+#   RFC7682          ||      D. McPherson, S. Amante, E. Osterweil, L. Blunk, D. Mitchell         ||       dmcpherson@verisign.com, amante@apple.com, eosterweil@verisign.com, ljb@merit.edu, dave@singularity.cx
+#   RFC7683          ||      J. Korhonen, Ed., S. Donovan, Ed., B. Campbell, L. Morand         ||       jouni.nospam@gmail.com, srdonovan@usdonovans.com, ben@nostrum.com, lionel.morand@orange.com
+#   RFC7684          ||      P. Psenak, H. Gredler, R. Shakir, W. Henderickx, J. Tantsura, A. Lindem         ||       ppsenak@cisco.com, hannes@gredler.at, rjs@rob.sh, wim.henderickx@alcatel-lucent.com, jeff.tantsura@ericsson.com, acee@cisco.com
+#   RFC7685          ||      A. Langley         ||       agl@google.com
+#   RFC7686          ||      J. Appelbaum, A. Muffett         ||       jacob@appelbaum.net, alecm@fb.com
+#   RFC7687          ||      S. Farrell, R. Wenning, B. Bos, M. Blanchet, H. Tschofenig         ||       stephen.farrell@cs.tcd.ie, rigo@w3.org, bert@w3.org, Marc.Blanchet@viagenie.ca, Hannes.Tschofenig@gmx.net
+#   RFC7688          ||      Y. Lee, Ed., G. Bernstein, Ed.         ||       leeyoung@huawei.com, gregb@grotto-networking.com
+#   RFC7689          ||      G. Bernstein, Ed., S. Xu, Y. Lee, Ed., G. Martinelli, H. Harai         ||       gregb@grotto-networking.com, xsg@nict.go.jp, leeyoung@huawei.com, giomarti@cisco.com, harai@nict.go.jp
+#   RFC7690          ||      M. Byerly, M. Hite, J. Jaeggli         ||       suckawha@gmail.com, mhite@hotmail.com, joelja@gmail.com
+#   RFC7691          ||      S. Bradner, Ed.         ||       sob@harvard.edu
+#   RFC7692          ||      T. Yoshino         ||       tyoshino@google.com
+#   RFC7693          ||      M-J. Saarinen, Ed., J-P. Aumasson         ||       m.saarinen@qub.ac.uk, jean-philippe.aumasson@nagra.com
+#   RFC7694          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC7695          ||      P. Pfister, B. Paterson, J. Arkko         ||       pierre.pfister@darou.fr, paterson.b@gmail.com, jari.arkko@piuha.net
+#   RFC7696          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC7697          ||      P. Pan, S. Aldrin, M. Venkatesan, K. Sampath, T. Nadeau, S. Boutros         ||       none, aldrin.ietf@gmail.com, venkat.mahalingams@gmail.com, kannankvs@gmail.com, tnadeau@lucidvision.com, sboutros@vmware.com
+#   RFC7698          ||      O. Gonzalez de Dios, Ed., R. Casellas, Ed., F. Zhang, X. Fu, D. Ceccarelli, I. Hussain         ||       oscar.gonzalezdedios@telefonica.com, ramon.casellas@cttc.es, zhangfatai@huawei.com, fu.xihua@stairnote.com, daniele.ceccarelli@ericsson.com, ihussain@infinera.com
+#   RFC7699          ||      A. Farrel, D. King, Y. Li, F. Zhang         ||       adrian@olddog.co.uk, daniel@olddog.co.uk, wsliguotou@hotmail.com, zhangfatai@huawei.com
+#   RFC7700          ||      P. Saint-Andre         ||       peter@andyet.com
+#   RFC7701          ||      A. Niemi, M. Garcia-Martin, G. Sandbakken         ||       aki.niemi@iki.fi, miguel.a.garcia@ericsson.com, geirsand@cisco.com
+#   RFC7702          ||      P. Saint-Andre, S. Ibarra, S. Loreto         ||       peter@andyet.com, saul@ag-projects.com, Salvatore.Loreto@ericsson.com
+#   RFC7703          ||      E. Cordeiro, R. Carnier, A. Moreiras         ||       edwin@scordeiro.net, rodrigocarnier@gmail.com, moreiras@nic.br
+#   RFC7704          ||      D. Crocker, N. Clark         ||       dcrocker@bbiw.net, narelle.clark@pavonis.com.au
+#   RFC7705          ||      W. George, S. Amante         ||       wesley.george@twcable.com, amante@apple.com
+#   RFC7706          ||      W. Kumari, P. Hoffman         ||       warren@kumari.net, paul.hoffman@icann.org
+#   RFC7707          ||      F. Gont, T. Chown         ||       fgont@si6networks.com, tim.chown@jisc.ac.uk
+#   RFC7708          ||      T. Nadeau, L. Martini, S. Bryant         ||       tnadeau@lucidvision.com, lmartini@cisco.com, stewart.bryant@gmail.com
+#   RFC7709          ||      A. Malis, Ed., B. Wilson, G. Clapp, V. Shukla         ||       agmalis@gmail.com, bwilson@appcomsci.com, clapp@research.att.com, vishnu.shukla@verizon.com
+#   RFC7710          ||      W. Kumari, O. Gudmundsson, P. Ebersman, S. Sheng         ||       warren@kumari.net, olafur@cloudflare.com, ebersman-ietf@dragon.net, steve.sheng@icann.org
+#   RFC7711          ||      M. Miller, P. Saint-Andre         ||       mamille2@cisco.com, peter@andyet.com
+#   RFC7712          ||      P. Saint-Andre, M. Miller, P. Hancke         ||       peter@andyet.com, mamille2@cisco.com, fippo@andyet.com
+#   RFC7713          ||      M. Mathis, B. Briscoe         ||       mattmathis@google.com, ietf@bobbriscoe.net
+#   RFC7714          ||      D. McGrew, K. Igoe         ||       mcgrew@cisco.com, mythicalkevin@yahoo.com
+#   RFC7715          ||      IJ. Wijnands, Ed., K. Raza, A. Atlas, J. Tantsura, Q. Zhao         ||       ice@cisco.com, skraza@cisco.com, akatlas@juniper.net, jeff.tantsura@ericsson.com, quintin.zhao@huawei.com
+#   RFC7716          ||      J. Zhang, L. Giuliano, E. Rosen, Ed., K. Subramanian, D. Pacella         ||       zzhang@juniper.net, lenny@juniper.net, erosen@juniper.net, kartsubr@cisco.com, dante.j.pacella@verizonbusiness.com
+#   RFC7717          ||      K. Pentikousis, Ed., E. Zhang, Y. Cui         ||       k.pentikousis@eict.de, emma.zhanglijia@huawei.com, cuiyang@huawei.com
+#   RFC7718          ||      A. Morton         ||       acmorton@att.com
+#   RFC7719          ||      P. Hoffman, A. Sullivan, K. Fujiwara         ||       paul.hoffman@icann.org, asullivan@dyn.com, fujiwara@jprs.co.jp
+#   RFC7720          ||      M. Blanchet, L-J. Liman         ||       Marc.Blanchet@viagenie.ca, liman@netnod.se
+#   RFC7721          ||      A. Cooper, F. Gont, D. Thaler         ||       alcoop@cisco.com, fgont@si6networks.com, dthaler@microsoft.com
+#   RFC7722          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
+#   RFC7723          ||      S. Kiesel, R. Penno         ||       ietf-pcp@skiesel.de, repenno@cisco.com
+#   RFC7724          ||      K. Kinnear, M. Stapp, B. Volz, N. Russell         ||       kkinnear@cisco.com, mjs@cisco.com, volz@cisco.com, neil.e.russell@gmail.com
+#   RFC7725          ||      T. Bray         ||       tbray@textuality.com
+#   RFC7726          ||      V. Govindan, K. Rajaraman, G. Mirsky, N. Akiya, S. Aldrin         ||       venggovi@cisco.com, kalyanir@cisco.com, gregory.mirsky@ericsson.com, nobo.akiya.dev@gmail.com, aldrin.ietf@gmail.com
+#   RFC7727          ||      M. Zhang, H. Wen, J. Hu         ||       zhangmingui@huawei.com, wenhuafeng@huawei.com, hujie@ctbri.com.cn
+#   RFC7728          ||      B. Burman, A. Akram, R. Even, M. Westerlund         ||       bo.burman@ericsson.com, akram.muhammadazam@gmail.com, roni.even@mail01.huawei.com, magnus.westerlund@ericsson.com
+#   RFC7729          ||      B. Khasnabish, E. Haleplidis, J. Hadi Salim, Ed.         ||       vumip1@gmail.com, ehalep@ece.upatras.gr, hadi@mojatatu.com
+#   RFC7730          ||      G. Huston, S. Weiler, G. Michaelson, S. Kent         ||       gih@apnic.net, weiler@tislabs.com, ggm@apnic.net, kent@bbn.com
+#   RFC7731          ||      J. Hui, R. Kelsey         ||       jonhui@nestlabs.com, richard.kelsey@silabs.com
+#   RFC7732          ||      P. van der Stok, R. Cragie         ||       consultancy@vanderstok.org, robert.cragie@arm.com
+#   RFC7733          ||      A. Brandt, E. Baccelli, R. Cragie, P. van der Stok         ||       anders_brandt@sigmadesigns.com, Emmanuel.Baccelli@inria.fr, robert.cragie@arm.com, consultancy@vanderstok.org
+#   RFC7734          ||      D. Allan, Ed., J. Tantsura, D. Fedyk, A. Sajassi         ||       david.i.allan@ericsson.com, jeff.tantsura@ericsson.com, don.fedyk@hpe.com, sajassi@cisco.com
+#   RFC7735          ||      R. Sparks, T. Kivinen         ||       rjsparks@nostrum.com, kivinen@iki.fi
+#   RFC7736          ||      K. Ma         ||       kevin.j.ma@ericsson.com
+#   RFC7737          ||      N. Akiya, G. Swallow, C. Pignataro, L. Andersson, M. Chen         ||       nobo.akiya.dev@gmail.com, swallow@cisco.com, cpignata@cisco.com, loa@mail01.huawei.com, mach.chen@huawei.com
+#   RFC7738          ||      M. Blanchet, A. Schiltknecht, P. Shames         ||       Marc.Blanchet@viagenie.ca, audric.schiltknecht@viagenie.ca, peter.m.shames@jpl.nasa.gov
+#   RFC7739          ||      F. Gont         ||       fgont@si6networks.com
+#   RFC7740          ||      Z. Zhang, Y. Rekhter, A. Dolganow         ||       zzhang@juniper.net, none, andrew.dolganow@alcatel-lucent.com
+#   RFC7741          ||      P. Westin, H. Lundin, M. Glover, J. Uberti, F. Galligan         ||       patrik.westin@gmail.com, hlundin@google.com, michaelglover262@gmail.com, justin@uberti.name, fgalligan@google.com
+#   RFC7742          ||      A.B. Roach         ||       adam@nostrum.com
+#   RFC7743          ||      J. Luo, Ed., L. Jin, Ed., T. Nadeau, Ed., G. Swallow, Ed.         ||       luo.jian@zte.com.cn, lizho.jin@gmail.com, tnadeau@lucidvision.com, swallow@cisco.com
+#   RFC7744          ||      L. Seitz, Ed., S. Gerdes, Ed., G. Selander, M. Mani, S. Kumar         ||       ludwig@sics.se, gerdes@tzi.org, goran.selander@ericsson.com, mehdi.mani@itron.com, sandeep.kumar@philips.com
+#   RFC7745          ||      T. Manderson         ||       terry.manderson@icann.org
+#   RFC7746          ||      R. Bonica, I. Minei, M. Conn, D. Pacella, L. Tomotaki         ||       rbonica@juniper.net, inaminei@google.com, meconn26@gmail.com, dante.j.pacella@verizon.com, luis.tomotaki@verizon.com
+#   RFC7747          ||      R. Papneja, B. Parise, S. Hares, D. Lee, I. Varlashkin         ||       rajiv.papneja@huawei.com, bparise@skyportsystems.com, shares@ndzh.com, dlee@ixiacom.com, ilya@nobulus.com
+#   RFC7748          ||      A. Langley, M. Hamburg, S. Turner         ||       agl@google.com, mike@shiftleft.org, sean@sn3rd.com
+#   RFC7749          ||      J. Reschke         ||       julian.reschke@greenbytes.de
+#   RFC7750          ||      J. Hedin, G. Mirsky, S. Baillargeon         ||       jonas.hedin@ericsson.com, gregory.mirsky@ericsson.com, steve.baillargeon@ericsson.com
+#   RFC7751          ||      S. Sorce, T. Yu         ||       ssorce@redhat.com, tlyu@mit.edu
+#   RFC7752          ||      H. Gredler, Ed., J. Medved, S. Previdi, A. Farrel, S. Ray         ||       hannes@gredler.at, jmedved@cisco.com, sprevidi@cisco.com, adrian@olddog.co.uk, raysaikat@gmail.com
+#   RFC7753          ||      Q. Sun, M. Boucadair, S. Sivakumar, C. Zhou, T. Tsou, S. Perreault         ||       sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com, ssenthil@cisco.com, cathy.zhou@huawei.com, tina.tsou@philips.com, sperreault@jive.com
+#   RFC7754          ||      R. Barnes, A. Cooper, O. Kolkman, D. Thaler, E. Nordmark         ||       rlb@ipv.sx, alcoop@cisco.com, kolkman@isoc.org, dthaler@microsoft.com, nordmark@arista.com
+#   RFC7755          ||      T. Anderson         ||       tore@redpill-linpro.com
+#   RFC7756          ||      T. Anderson, S. Steffann         ||       tore@redpill-linpro.com, sander@steffann.nl
+#   RFC7757          ||      T. Anderson, A. Leiva Popper         ||       tore@redpill-linpro.com, ydahhrk@gmail.com
+#   RFC7758          ||      T. Mizrahi, Y. Moses         ||       dew@tx.technion.ac.il, moses@ee.technion.ac.il
+#   RFC7759          ||      E. Bellagamba, G. Mirsky, L. Andersson, P. Skoldstrom, D. Ward, J. Drake         ||       elisa.bellagamba@gmail.com, gregory.mirsky@ericsson.com, loa@mail01.huawei.com, pontus.skoldstrom@acreo.se, dward@cisco.com, jdrake@juniper.net
+#   RFC7760          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC7761          ||      B. Fenner, M. Handley, H. Holbrook, I. Kouvelas, R. Parekh, Z. Zhang, L. Zheng         ||       fenner@arista.com, m.handley@cs.ucl.ac.uk, holbrook@arista.com, kouvelas@arista.com, riparekh@cisco.com, zzhang@juniper.net, vero.zheng@huawei.com
+#   RFC7762          ||      M. West         ||       mkwst@google.com
+#   RFC7763          ||      S. Leonard         ||       dev+ietf@seantek.com
+#   RFC7764          ||      S. Leonard         ||       dev+ietf@seantek.com
+#   RFC7765          ||      P. Hurtig, A. Brunstrom, A. Petlund, M. Welzl         ||       per.hurtig@kau.se, anna.brunstrom@kau.se, apetlund@simula.no, michawe@ifi.uio.no
+#   RFC7766          ||      J. Dickinson, S. Dickinson, R. Bellis, A. Mankin, D. Wessels         ||       jad@sinodun.com, sara@sinodun.com, ray@isc.org, allison.mankin@gmail.com, dwessels@verisign.com
+#   RFC7767          ||      S. Vinapamula, S. Sivakumar, M. Boucadair, T. Reddy         ||       sureshk@juniper.net, ssenthil@cisco.com, mohamed.boucadair@orange.com, tireddy@cisco.com
+#   RFC7768          ||      T. Tsou, W. Li, T. Taylor, J. Huang         ||       tina.tsou@philips.com, mweiboli@gmail.com, tom.taylor.stds@gmail.com, james.huang@huawei.com
+#   RFC7769          ||      S. Sivabalan, S. Boutros, H. Shah, S. Aldrin, M. Venkatesan         ||       msiva@cisco.com, sboutros@cisco.com, hshah@ciena.com, aldrin.ietf@gmail.com, mannan_venkatesan@cable.comcast.com
+#   RFC7770          ||      A. Lindem, Ed., N. Shen, JP. Vasseur, R. Aggarwal, S. Shaffer         ||       acee@cisco.com, naiming@cisco.com, jpv@cisco.com, raggarwa_1@yahoo.com, sshaffer@akamai.com
+#   RFC7771          ||      A. Malis, Ed., L. Andersson, H. van Helvoort, J. Shin, L. Wang, A. D'Alessandro         ||       agmalis@gmail.com, loa@mail01.huawei.com, huubatwork@gmail.com, jongyoon.shin@sk.com, wangleiyj@chinamobile.com, alessandro.dalessandro@telecomitalia.it
+#   RFC7772          ||      A. Yourtchenko, L. Colitti         ||       ayourtch@cisco.com, lorenzo@google.com
+#   RFC7773          ||      S. Santesson         ||       sts@aaa-sec.com
+#   RFC7774          ||      Y. Doi, M. Gillmore         ||       yusuke.doi@toshiba.co.jp, matthew.gillmore@itron.com
+#   RFC7775          ||      L. Ginsberg, S. Litkowski, S. Previdi         ||       ginsberg@cisco.com, stephane.litkowski@orange.com, sprevidi@cisco.com
+#   RFC7776          ||      P. Resnick, A. Farrel         ||       presnick@qti.qualcomm.com, adrian@olddog.co.uk
+#   RFC7777          ||      S. Hegde, R. Shakir, A. Smirnov, Z. Li, B. Decraene         ||       shraddha@juniper.net, rjs@rob.sh, as@cisco.com, lizhenbin@huawei.com, bruno.decraene@orange.com
+#   RFC7778          ||      D. Kutscher, F. Mir, R. Winter, S. Krishnan, Y. Zhang, CJ. Bernardos         ||       kutscher@neclab.eu, faisal.mir@gmail.com, rolf.winter@neclab.eu, suresh.krishnan@ericsson.com, ying.zhang13@hp.com, cjbc@it.uc3m.es
+#   RFC7779          ||      H. Rogge, E. Baccelli         ||       henning.rogge@fkie.fraunhofer.de, Emmanuel.Baccelli@inria.fr
+#   RFC7780          ||      D. Eastlake 3rd, M. Zhang, R. Perlman, A. Banerjee, A. Ghanwani, S. Gupta         ||       d3e3e3@gmail.com, zhangmingui@huawei.com, radia@alum.mit.edu, ayabaner@cisco.com, anoop@alumni.duke.edu, sujay.gupta@ipinfusion.com
+#   RFC7781          ||      H. Zhai, T. Senevirathne, R. Perlman, M. Zhang, Y. Li         ||       honjun.zhai@tom.com, tsenevir@gmail.com, radia@alum.mit.edu, zhangmingui@huawei.com, liyizhou@huawei.com
+#   RFC7782          ||      M. Zhang, R. Perlman, H. Zhai, M. Durrani, S. Gupta         ||       zhangmingui@huawei.com, radia@alum.mit.edu, honjun.zhai@tom.com, mdurrani@cisco.com, sujay.gupta@ipinfusion.com
+#   RFC7783          ||      T. Senevirathne, J. Pathangi, J. Hudson         ||       tsenevir@gmail.com, pathangi_janardhanan@dell.com, jon.hudson@gmail.com
+#   RFC7784          ||      D. Kumar, S. Salam, T. Senevirathne         ||       dekumar@cisco.com, ssalam@cisco.com, tsenevir@gmail.com
+#   RFC7785          ||      S. Vinapamula, M. Boucadair         ||       sureshk@juniper.net, mohamed.boucadair@orange.com
+#   RFC7786          ||      M. Kuehlewind, Ed., R. Scheffenegger         ||       mirja.kuehlewind@tik.ee.ethz.ch, rs.ietf@gmx.at
+#   RFC7787          ||      M. Stenberg, S. Barth         ||       markus.stenberg@iki.fi, cyrus@openwrt.org
+#   RFC7788          ||      M. Stenberg, S. Barth, P. Pfister         ||       markus.stenberg@iki.fi, cyrus@openwrt.org, pierre.pfister@darou.fr
+#   RFC7789          ||      C. Cardona, P. Francois, P. Lucente         ||       juancamilo.cardona@imdea.org, pifranco@cisco.com, plucente@cisco.com
+#   RFC7790          ||      Y. Yoneya, T. Nemoto         ||       yoshiro.yoneya@jprs.co.jp, t.nemo10@kmd.keio.ac.jp
+#   RFC7791          ||      D. Migault, Ed., V. Smyslov         ||       daniel.migault@ericsson.com, svan@elvis.ru
+#   RFC7792          ||      F. Zhang, X. Zhang, A. Farrel, O. Gonzalez de Dios, D. Ceccarelli         ||       zhangfatai@huawei.com, zhang.xian@huawei.com, adrian@olddog.co.uk, oscar.gonzalezdedios@telefonica.com, daniele.ceccarelli@ericsson.com
+#   RFC7793          ||      M. Andrews         ||       marka@isc.org
+#   RFC7794          ||      L. Ginsberg, Ed., B. Decraene, S. Previdi, X. Xu, U. Chunduri         ||       ginsberg@cisco.com, bruno.decraene@orange.com, sprevidi@cisco.com, xuxiaohu@huawei.com, uma.chunduri@ericsson.com
+#   RFC7795          ||      J. Dong, H. Wang         ||       jie.dong@huawei.com, rainsword.wang@huawei.com
+#   RFC7796          ||      Y. Jiang, Ed., L. Yong, M. Paul         ||       jiangyuanlong@huawei.com, lucyyong@huawei.com, Manuel.Paul@telekom.de
+#   RFC7797          ||      M. Jones         ||       mbj@microsoft.com
+#   RFC7798          ||      Y.-K. Wang, Y. Sanchez, T. Schierl, S. Wenger, M. M. Hannuksela         ||       yekui.wang@gmail.com, yago.sanchez@hhi.fraunhofer.de, thomas.schierl@hhi.fraunhofer.de, stewe@stewe.org, miska.hannuksela@nokia.com
+#   RFC7799          ||      A. Morton         ||       acmorton@att.com
+#   RFC7800          ||      M. Jones, J. Bradley, H. Tschofenig         ||       mbj@microsoft.com, ve7jtb@ve7jtb.com, Hannes.Tschofenig@gmx.net
+#   RFC7801          ||      V. Dolmatov, Ed.         ||       dol@srcc.msu.ru
+#   RFC7802          ||      S. Emery, N. Williams         ||       shawn.emery@oracle.com, nico@cryptonector.com
+#   RFC7803          ||      B. Leiba         ||       barryleiba@computer.org
+#   RFC7804          ||      A. Melnikov         ||       alexey.melnikov@isode.com
+#   RFC7805          ||      A. Zimmermann, W. Eddy, L. Eggert         ||       alexander@zimmermann.eu.com, wes@mti-systems.com, lars@netapp.com
+#   RFC7806          ||      F. Baker, R. Pan         ||       fred@cisco.com, ropan@cisco.com
+#   RFC7807          ||      M. Nottingham, E. Wilde         ||       mnot@mnot.net, erik.wilde@dret.net
+#   RFC7808          ||      M. Douglass, C. Daboo         ||       mdouglass@sphericalcowgroup.com, cyrus@daboo.name
+#   RFC7809          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC7810          ||      S. Previdi, Ed., S. Giacalone, D. Ward, J. Drake, Q. Wu         ||       sprevidi@cisco.com, spencer.giacalone@gmail.com, wardd@cisco.com, jdrake@juniper.net, sunseawq@huawei.com
+#   RFC7811          ||      G. Enyedi, A. Csaszar, A. Atlas, C. Bowers, A. Gopalan         ||       Gabor.Sandor.Enyedi@ericsson.com, Andras.Csaszar@ericsson.com, akatlas@juniper.net, cbowers@juniper.net, abishek@ece.arizona.edu
+#   RFC7812          ||      A. Atlas, C. Bowers, G. Enyedi         ||       akatlas@juniper.net, cbowers@juniper.net, Gabor.Sandor.Enyedi@ericsson.com
+#   RFC7813          ||      J. Farkas, Ed., N. Bragg, P. Unbehagen, G. Parsons, P. Ashwood-Smith, C. Bowers         ||       janos.farkas@ericsson.com, nbragg@ciena.com, unbehagen@avaya.com, glenn.parsons@ericsson.com, Peter.AshwoodSmith@huawei.com, cbowers@juniper.net
+#   RFC7814          ||      X. Xu, C. Jacquenet, R. Raszuk, T. Boyes, B. Fee         ||       xuxiaohu@huawei.com, christian.jacquenet@orange.com, robert@raszuk.net, tboyes@bloomberg.net, bfee@extremenetworks.com
+#   RFC7815          ||      T. Kivinen         ||       kivinen@iki.fi
+#   RFC7816          ||      S. Bortzmeyer         ||       bortzmeyer+ietf@nic.fr
+#   RFC7817          ||      A. Melnikov         ||       alexey.melnikov@isode.com
+#   RFC7818          ||      M. Jethanandani         ||       mjethanandani@gmail.com
+#   RFC7819          ||      S. Jiang, S. Krishnan, T. Mrugalski         ||       jiangsheng@huawei.com, suresh.krishnan@ericsson.com, tomasz.mrugalski@gmail.com
+#   RFC7820          ||      T. Mizrahi         ||       talmi@marvell.com
+#   RFC7821          ||      T. Mizrahi         ||       talmi@marvell.com
+#   RFC7822          ||      T. Mizrahi, D. Mayer         ||       talmi@marvell.com, mayer@ntp.org
+#   RFC7823          ||      A. Atlas, J. Drake, S. Giacalone, S. Previdi         ||       akatlas@juniper.net, jdrake@juniper.net, spencer.giacalone@gmail.com, sprevidi@cisco.com
+#   RFC7824          ||      S. Krishnan, T. Mrugalski, S. Jiang         ||       suresh.krishnan@ericsson.com, tomasz.mrugalski@gmail.com, jiangsheng@huawei.com
+#   RFC7825          ||      J. Goldberg, M. Westerlund, T. Zeng         ||       jgoldber@cisco.com, magnus.westerlund@ericsson.com, thomas.zeng@gmail.com
+#   RFC7826          ||      H. Schulzrinne, A. Rao, R. Lanphier, M. Westerlund, M. Stiemerling, Ed.         ||       schulzrinne@cs.columbia.edu, anrao@cisco.com, robla@robla.net, magnus.westerlund@ericsson.com, mls.ietf@gmail.com
+#   RFC7827          ||      L. Eggert         ||       lars@netapp.com
+#   RFC7828          ||      P. Wouters, J. Abley, S. Dickinson, R. Bellis         ||       pwouters@redhat.com, jabley@dyn.com, sara@sinodun.com, ray@isc.org
+#   RFC7829          ||      Y. Nishida, P. Natarajan, A. Caro, P. Amer, K. Nielsen         ||       nishida@wide.ad.jp, prenatar@cisco.com, acaro@bbn.com, amer@udel.edu, karen.nielsen@tieto.com
+#   RFC7830          ||      A. Mayrhofer         ||       alex.mayrhofer.ietf@gmail.com
+#   RFC7831          ||      J. Howlett, S. Hartman, H. Tschofenig, J. Schaad         ||       josh.howlett@ja.net, hartmans-ietf@mit.edu, Hannes.Tschofenig@gmx.net, ietf@augustcellars.com
+#   RFC7832          ||      R. Smith, Ed.         ||       rhys.smith@jisc.ac.uk
+#   RFC7833          ||      J. Howlett, S. Hartman, A. Perez-Mendez, Ed.         ||       josh.howlett@ja.net, hartmans-ietf@mit.edu, alex@um.es
+#   RFC7834          ||      D. Saucez, L. Iannone, A. Cabellos, F. Coras         ||       damien.saucez@inria.fr, ggx@gigix.net, acabello@ac.upc.edu, fcoras@ac.upc.edu
+#   RFC7835          ||      D. Saucez, L. Iannone, O. Bonaventure         ||       damien.saucez@inria.fr, ggx@gigix.net, Olivier.Bonaventure@uclouvain.be
+#   RFC7836          ||      S. Smyshlyaev, Ed., E. Alekseev, I. Oshkin, V. Popov, S. Leontiev, V. Podobaev, D. Belyavsky         ||       svs@cryptopro.ru, alekseev@cryptopro.ru, oshkin@cryptopro.ru, vpopov@cryptopro.ru, lse@CryptoPro.ru, v_podobaev@factor-ts.ru, beldmit@gmail.com
+#   RFC7837          ||      S. Krishnan, M. Kuehlewind, B. Briscoe, C. Ralli         ||       suresh.krishnan@ericsson.com, mirja.kuehlewind@tik.ee.ethz.ch, ietf@bobbriscoe.net, ralli@tid.es
+#   RFC7838          ||      M. Nottingham, P. McManus, J. Reschke         ||       mnot@mnot.net, mcmanus@ducksong.com, julian.reschke@greenbytes.de
+#   RFC7839          ||      S. Bhandari, S. Gundavelli, M. Grayson, B. Volz, J. Korhonen         ||       shwethab@cisco.com, sgundave@cisco.com, mgrayson@cisco.com, volz@cisco.com, jouni.nospam@gmail.com
+#   RFC7840          ||      J. Winterbottom, H. Tschofenig, L. Liess         ||       a.james.winterbottom@gmail.com, Hannes.Tschofenig@gmx.net, L.Liess@telekom.de
+#   RFC7841          ||      J. Halpern, Ed., L. Daigle, Ed., O. Kolkman, Ed.         ||       jmh@joelhalpern.com, ldaigle@thinkingcat.com, kolkman@isoc.org
+#   RFC7842          ||      R. Sparks         ||       rjsparks@nostrum.com
+#   RFC7843          ||      A. Ripke, R. Winter, T. Dietz, J. Quittek, R. da Silva         ||       ripke@neclab.eu, winter@neclab.eu, dietz@neclab.eu, quittek@neclab.eu, rafaelalejandro.lopezdasilva@telefonica.com
+#   RFC7844          ||      C. Huitema, T. Mrugalski, S. Krishnan         ||       huitema@microsoft.com, tomasz.mrugalski@gmail.com, suresh.krishnan@ericsson.com
+#   RFC7845          ||      T. Terriberry, R. Lee, R. Giles         ||       tterribe@xiph.org, ron@debian.org, giles@xiph.org
+#   RFC7846          ||      R. Cruz, M. Nunes, J. Xia, R. Huang, Ed., J. Taveira, D. Lingli         ||       rui.cruz@ieee.org, mario.nunes@inov.pt, xiajinwei@huawei.com, rachel.huang@huawei.com, joao.silva@inov.pt, denglingli@chinamobile.com
+#   RFC7847          ||      T. Melia, Ed., S. Gundavelli, Ed.         ||       telemaco.melia@gmail.com, sgundave@cisco.com
+#   RFC7848          ||      G. Lozano         ||       gustavo.lozano@icann.org
+#   RFC7849          ||      D. Binet, M. Boucadair, A. Vizdal, G. Chen, N. Heatley, R. Chandler, D. Michaud, D. Lopez, W. Haeffner         ||       david.binet@orange.com, mohamed.boucadair@orange.com, Ales.Vizdal@T-Mobile.cz, phdgang@gmail.com, nick.heatley@ee.co.uk, ross@eircom.net, dave.michaud@rci.rogers.com, diego.r.lopez@telefonica.com, walter.haeffner@vodafone.com
+#   RFC7850          ||      S. Nandakumar         ||       snandaku@cisco.com
+#   RFC7851          ||      H. Song, X. Jiang, R. Even, D. Bryan, Y. Sun         ||       haibin.song@huawei.com, jiangxingfeng@huawei.com, ron.even.tlv@gmail.com, dbryan@ethernot.org, sunyi@ict.ac.cn
+#   RFC7852          ||      R. Gellens, B. Rosen, H. Tschofenig, R. Marshall, J. Winterbottom         ||       rg+ietf@randy.pensive.org, br@brianrosen.net, Hannes.Tschofenig@gmx.net, rmarshall@telecomsys.com, a.james.winterbottom@gmail.com
+#   RFC7853          ||      S. Martin, S. Tuecke, B. McCollam, M. Lidman         ||       sjmartin@uchicago.edu, tuecke@globus.org, bmccollam@uchicago.edu, mattias@uchicago.edu<
+#   RFC7854          ||      J. Scudder, Ed., R. Fernando, S. Stuart         ||       jgs@juniper.net, rex@cisco.com, sstuart@google.com
+#   RFC7855          ||      S. Previdi, Ed., C. Filsfils, Ed., B. Decraene, S. Litkowski, M. Horneffer, R. Shakir         ||       sprevidi@cisco.com, cfilsfil@cisco.com, bruno.decraene@orange.com, stephane.litkowski@orange.com, Martin.Horneffer@telekom.de, rjs@rob.sh
+#   RFC7856          ||      Y. Cui, J. Dong, P. Wu, M. Xu, A. Yla-Jaaski         ||       yong@csnet1.cs.tsinghua.edu.cn, knight.dongjiang@gmail.com, weapon9@gmail.com, xmw@cernet.edu.cn, antti.yla-jaaski@aalto.fi
+#   RFC7857          ||      R. Penno, S. Perreault, M. Boucadair, Ed., S. Sivakumar, K. Naito         ||       repenno@cisco.com, sperreault@jive.com, mohamed.boucadair@orange.com, ssenthil@cisco.com, k.naito@nttv6.jp
+#   RFC7858          ||      Z. Hu, L. Zhu, J. Heidemann, A. Mankin, D. Wessels, P. Hoffman         ||       zihu@outlook.com, liangzhu@usc.edu, johnh@isi.edu, allison.mankin@gmail.com, dwessels@verisign.com, paul.hoffman@icann.org
+#   RFC7859          ||      C. Dearlove         ||       chris.dearlove@baesystems.com
+#   RFC7860          ||      J. Merkle, Ed., M. Lochter         ||       johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de
+#   RFC7861          ||      A. Adamson, N. Williams         ||       andros@netapp.com, nico@cryptonector.com
+#   RFC7862          ||      T. Haynes         ||       thomas.haynes@primarydata.com
+#   RFC7863          ||      T. Haynes         ||       thomas.haynes@primarydata.com
+#   RFC7864          ||      CJ. Bernardos, Ed.         ||       cjbc@it.uc3m.es
+#   RFC7865          ||      R. Ravindranath, P. Ravindran, P. Kyzivat         ||       rmohanr@cisco.com, partha@parthasarathi.co.in, pkyzivat@alum.mit.edu
+#   RFC7866          ||      L. Portman, H. Lum, Ed., C. Eckel, A. Johnston, A. Hutton         ||       leon.portman@gmail.com, henry.lum@genesyslab.com, eckelcu@cisco.com, alan.b.johnston@gmail.com, andrew.hutton@unify.com
+#   RFC7867          ||      R. Huang         ||       rachel.huang@huawei.com
+#   RFC7868          ||      D. Savage, J. Ng, S. Moore, D. Slice, P. Paluch, R. White         ||       dsavage@cisco.com, jamng@cisco.com, smoore@cisco.com, dslice@cumulusnetworks.com, peter.paluch@fri.uniza.sk, russ@riw.us
+#   RFC7869          ||      D. Warden, I. Iordanov         ||       david_warden@dell.com, iiordanov@gmail.com
+#   RFC7870          ||      Y. Fu, S. Jiang, J. Dong, Y. Chen         ||       fuyu@cnnic.cn, jiangsheng@huawei.com, knight.dongjiang@gmail.com, flashfoxmx@gmail.com
+#   RFC7871          ||      C. Contavalli, W. van der Gaast, D. Lawrence, W. Kumari         ||       ccontavalli@google.com, wilmer@google.com, tale@akamai.com, warren@kumari.net
+#   RFC7872          ||      F. Gont, J. Linkova, T. Chown, W. Liu         ||       fgont@si6networks.com, furry@google.com, tim.chown@jisc.ac.uk, liushucheng@huawei.com
+#   RFC7873          ||      D. Eastlake 3rd, M. Andrews         ||       d3e3e3@gmail.com, marka@isc.org
+#   RFC7874          ||      JM. Valin, C. Bran         ||       jmvalin@jmvalin.ca, cary.bran@plantronics.com
+#   RFC7875          ||      S. Proust, Ed.         ||       stephane.proust@orange.com
+#   RFC7876          ||      S. Bryant, S. Sivabalan, S. Soni         ||       stewart.bryant@gmail.com, msiva@cisco.com, sagsoni@cisco.com
+#   RFC7877          ||      K. Cartwright, V. Bhatia, S. Ali, D. Schwartz         ||       kcartwright@tnsi.com, vbhatia@tnsi.com, syed.ali@neustar.biz, dschwartz@xconnect.net
+#   RFC7878          ||      K. Cartwright, V. Bhatia, J-F. Mule, A. Mayrhofer         ||       kcartwright@tnsi.com, vbhatia@tnsi.com, jfmule@apple.com, alexander.mayrhofer@nic.at
+#   RFC7879          ||      R. Ravindranath, T. Reddy, G. Salgueiro, V. Pascual, P. Ravindran         ||       rmohanr@cisco.com, tireddy@cisco.com, gsalguei@cisco.com, victor.pascual.avila@oracle.com, partha@parthasarathi.co.in
+#   RFC7880          ||      C. Pignataro, D. Ward, N. Akiya, M. Bhatia, S. Pallagatti         ||       cpignata@cisco.com, wardd@cisco.com, nobo.akiya.dev@gmail.com, manav@ionosnetworks.com, santosh.pallagatti@gmail.com
+#   RFC7881          ||      C. Pignataro, D. Ward, N. Akiya         ||       cpignata@cisco.com, wardd@cisco.com, nobo.akiya.dev@gmail.com
+#   RFC7882          ||      S. Aldrin, C. Pignataro, G. Mirsky, N. Kumar         ||       aldrin.ietf@gmail.com, cpignata@cisco.com, gregory.mirsky@ericsson.com, naikumar@cisco.com
+#   RFC7883          ||      L. Ginsberg, N. Akiya, M. Chen         ||       ginsberg@cisco.com, nobo.akiya.dev@gmail.com, mach.chen@huawei.com
+#   RFC7884          ||      C. Pignataro, M. Bhatia, S. Aldrin, T. Ranganath         ||       cpignata@cisco.com, manav@ionosnetworks.com, aldrin.ietf@gmail.com, trilok.ranganatha@nokia.com
+#   RFC7885          ||      V. Govindan, C. Pignataro         ||       venggovi@cisco.com, cpignata@cisco.com
+#   RFC7886          ||      V. Govindan, C. Pignataro         ||       venggovi@cisco.com, cpignata@cisco.com
+#   RFC7887          ||      S. Venaas, J. Arango, I. Kouvelas         ||       stig@cisco.com, jearango@cisco.com, kouvelas@arista.com
+#   RFC7888          ||      A. Melnikov, Ed.         ||       alexey.melnikov@isode.com
+#   RFC7889          ||      J. SrimushnamBoovaraghamoorthy, N. Bisht         ||       jayantheesh.sb@gmail.com, narendrasingh.bisht@gmail.com
+#   RFC7890          ||      D. Bryan, P. Matthews, E. Shim, D. Willis, S. Dawkins         ||       dbryan@ethernot.org, philip_matthews@magma.ca, eunsooshim@gmail.com, dean.willis@softarmor.com, spencerdawkins.ietf@gmail.com
+#   RFC7891          ||      J. Asghar, IJ. Wijnands, Ed., S. Krishnaswamy, A. Karan, V. Arya         ||       jasghar@cisco.com, ice@cisco.com, sowkrish@cisco.com, apoorva@cisco.com, varya@directv.com
+#   RFC7892          ||      Z. Ali, A. Bonfanti, M. Hartley, F. Zhang         ||       zali@cisco.com, abonfant@cisco.com, mhartley@cisco.com, zhangfatai@huawei.com
+#   RFC7893          ||      Y(J) Stein, D. Black, B. Briscoe         ||       yaakov_s@rad.com, david.black@emc.com, ietf@bobbriscoe.net
+#   RFC7894          ||      M. Pritikin, C. Wallace         ||       pritikin@cisco.com, carl@redhoundsoftware.com
+#   RFC7895          ||      A. Bierman, M. Bjorklund, K. Watsen         ||       andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net
+#   RFC7896          ||      D. Dhody         ||       dhruv.ietf@gmail.com
+#   RFC7897          ||      D. Dhody, U. Palle, R. Casellas         ||       dhruv.ietf@gmail.com, udayasree.palle@huawei.com, ramon.casellas@cttc.es
+#   RFC7898          ||      D. Dhody, U. Palle, V. Kondreddy, R. Casellas         ||       dhruv.ietf@gmail.com, udayasree.palle@huawei.com, venugopalreddyk@huawei.com, ramon.casellas@cttc.es
+#   RFC7899          ||      T. Morin, Ed., S. Litkowski, K. Patel, Z. Zhang, R. Kebler, J. Haas         ||       thomas.morin@orange.com, stephane.litkowski@orange.com, keyupate@cisco.com, zzhang@juniper.net, rkebler@juniper.net, jhaas@juniper.net
+#   RFC7900          ||      Y. Rekhter, Ed., E. Rosen, Ed., R. Aggarwal, Y. Cai, T. Morin         ||       none, erosen@juniper.net, raggarwa_1@yahoo.com, yiqun.cai@alibaba-inc.com, thomas.morin@orange.com
+#   RFC7901          ||      P. Wouters         ||       pwouters@redhat.com
+#   RFC7902          ||      E. Rosen, T. Morin         ||       erosen@juniper.net, thomas.morin@orange.com
+#   RFC7903          ||      S. Leonard         ||       dev+ietf@seantek.com
+#   RFC7904          ||      C. Jennings, B. Lowekamp, E. Rescorla, S. Baset, H. Schulzrinne, T. Schmidt, Ed.         ||       fluffy@cisco.com, bbl@lowekamp.net, ekr@rtfm.com, sabaset@us.ibm.com, hgs@cs.columbia.edu, t.schmidt@haw-hamburg.de
+#   RFC7905          ||      A. Langley, W. Chang, N. Mavrogiannopoulos, J. Strombergson, S. Josefsson         ||       agl@google.com, wtc@google.com, nmav@redhat.com, joachim@secworks.se, simon@josefsson.org
+#   RFC7906          ||      P. Timmel, R. Housley, S. Turner         ||       pstimme@nsa.gov, housley@vigilsec.com, turners@ieca.com
+#   RFC7908          ||      K. Sriram, D. Montgomery, D. McPherson, E. Osterweil, B. Dickson         ||       ksriram@nist.gov, dougm@nist.gov, dmcpherson@verisign.com, eosterweil@verisign.com, brian.peter.dickson@gmail.com
+#   RFC7909          ||      R. Kisteleki, B. Haberman         ||       robert@ripe.net, brian@innovationslab.net
+#   RFC7910          ||      W. Zhou         ||       zhouweiisu@gmail.com
+#   RFC7911          ||      D. Walton, A. Retana, E. Chen, J. Scudder         ||       dwalton@cumulusnetworks.com, aretana@cisco.com, enkechen@cisco.com, jgs@juniper.net
+#   RFC7912          ||      A. Melnikov         ||       alexey.melnikov@isode.com
+#   RFC7913          ||      C. Holmberg         ||       christer.holmberg@ericsson.com
+#   RFC7914          ||      C. Percival, S. Josefsson         ||       cperciva@tarsnap.com, simon@josefsson.org
+#   RFC7915          ||      C. Bao, X. Li, F. Baker, T. Anderson, F. Gont         ||       congxiao@cernet.edu.cn, xing@cernet.edu.cn, fred@cisco.com, tore@redpill-linpro.com, fgont@si6networks.com
+#   RFC7916          ||      S. Litkowski, Ed., B. Decraene, C. Filsfils, K. Raza, M. Horneffer, P. Sarkar         ||       stephane.litkowski@orange.com, bruno.decraene@orange.com, cfilsfil@cisco.com, skraza@cisco.com, Martin.Horneffer@telekom.de, pushpasis.ietf@gmail.com
+#   RFC7917          ||      P. Sarkar, Ed., H. Gredler, S. Hegde, S. Litkowski, B. Decraene         ||       pushpasis.ietf@gmail.com, hannes@rtbrick.com, shraddha@juniper.net, stephane.litkowski@orange.com, bruno.decraene@orange.com
+#   RFC7918          ||      A. Langley, N. Modadugu, B. Moeller         ||       agl@google.com, nagendra@cs.stanford.edu, bmoeller@acm.org
+#   RFC7919          ||      D. Gillmor         ||       dkg@fifthhorseman.net
+#   RFC7920          ||      A. Atlas, Ed., T. Nadeau, Ed., D. Ward         ||       akatlas@juniper.net, tnadeau@lucidvision.com, wardd@cisco.com
+#   RFC7921          ||      A. Atlas, J. Halpern, S. Hares, D. Ward, T. Nadeau         ||       akatlas@juniper.net, joel.halpern@ericsson.com, shares@ndzh.com, wardd@cisco.com, tnadeau@lucidvision.com
+#   RFC7922          ||      J. Clarke, G. Salgueiro, C. Pignataro         ||       jclarke@cisco.com, gsalguei@cisco.com, cpignata@cisco.com
+#   RFC7923          ||      E. Voit, A. Clemm, A. Gonzalez Prieto         ||       evoit@cisco.com, alex@cisco.com, albertgo@cisco.com
+#   RFC7924          ||      S. Santesson, H. Tschofenig         ||       sts@aaa-sec.com, Hannes.Tschofenig@gmx.net
+#   RFC7925          ||      H. Tschofenig, Ed., T. Fossati         ||       Hannes.Tschofenig@gmx.net, thomas.fossati@nokia.com
+#   RFC7926          ||      A. Farrel, Ed., J. Drake, N. Bitar, G. Swallow, D. Ceccarelli, X. Zhang         ||       adrian@olddog.co.uk, jdrake@juniper.net, nbitar40@gmail.com, swallow@cisco.com, daniele.ceccarelli@ericsson.com, zhang.xian@huawei.com
+#   RFC7927          ||      D. Kutscher, Ed., S. Eum, K. Pentikousis, I. Psaras, D. Corujo, D. Saucez, T. Schmidt, M. Waehlisch         ||       kutscher@neclab.eu, suyong@ist.osaka-u.ac.jp, k.pentikousis@travelping.com, i.psaras@ucl.ac.uk, dcorujo@av.it.pt, damien.saucez@inria.fr, t.schmidt@haw-hamburg.de, waehlisch@ieee.org
+#   RFC7928          ||      N. Kuhn, Ed., P. Natarajan, Ed., N. Khademi, Ed., D. Ros         ||       nicolas.kuhn@cnes.fr, prenatar@cisco.com, naeemk@ifi.uio.no, dros@simula.no
+#   RFC7929          ||      P. Wouters         ||       pwouters@redhat.com
+#   RFC7930          ||      S. Hartman         ||       hartmans-ietf@mit.edu
+#   RFC7931          ||      D. Noveck, Ed., P. Shivam, C. Lever, B. Baker         ||       davenoveck@gmail.com, piyush.shivam@oracle.com, chuck.lever@oracle.com, bill.baker@oracle.com
+#   RFC7932          ||      J. Alakuijala, Z. Szabadka         ||       jyrki@google.com, szabadka@google.com
+#   RFC7933          ||      C. Westphal, Ed., S. Lederer, D. Posch, C. Timmerer, A. Azgin, W. Liu, C. Mueller, A. Detti, D. Corujo, J. Wang, M. Montpetit, N. Murray         ||       Cedric.Westphal@huawei.com, stefan.lederer@itec.aau.at, daniel.posch@itec.aau.at, christian.timmerer@itec.aau.at, aytac.azgin@huawei.com, liushucheng@huawei.com, christopher.mueller@bitmovin.net, andrea.detti@uniroma2.it, dcorujo@av.it.pt, jianwang@cityu.edu.hk, marie@mjmontpetit.com, nmurray@research.ait.ie
+#   RFC7934          ||      L. Colitti, V. Cerf, S. Cheshire, D. Schinazi         ||       lorenzo@google.com, vint@google.com, cheshire@apple.com, dschinazi@apple.com
+#   RFC7935          ||      G. Huston, G. Michaelson, Ed.         ||       gih@apnic.net, ggm@apnic.net
+#   RFC7936          ||      T. Hardie         ||       ted.ietf@gmail.com
+#   RFC7937          ||      F. Le Faucheur, Ed., G. Bertrand, Ed., I. Oprescu, Ed., R. Peterkofsky         ||       flefauch@gmail.com, gilbertrand@gmail.com, iuniana.oprescu@gmail.com, peterkofsky@google.com
+#   RFC7938          ||      P. Lapukhov, A. Premji, J. Mitchell, Ed.         ||       petr@fb.com, ariff@arista.com, jrmitche@puck.nether.net
+#   RFC7939          ||      U. Herberg, R. Cole, I. Chakeres, T. Clausen         ||       ulrich@herberg.name, rgcole01@comcast.net, ian.chakeres@gmail.com, T.Clausen@computer.org
+#   RFC7940          ||      K. Davies, A. Freytag         ||       kim.davies@icann.org, asmus@unicode.org
+#   RFC7941          ||      M. Westerlund, B. Burman, R. Even, M. Zanaty         ||       magnus.westerlund@ericsson.com, bo.burman@ericsson.com, roni.even@mail01.huawei.com, mzanaty@cisco.com
+#   RFC7942          ||      Y. Sheffer, A. Farrel         ||       yaronf.ietf@gmail.com, adrian@olddog.co.uk
+#   RFC7943          ||      F. Gont, W. Liu         ||       fgont@si6networks.com, liushucheng@huawei.com
+#   RFC7944          ||      S. Donovan         ||       srdonovan@usdonovans.com
+#   RFC7945          ||      K. Pentikousis, Ed., B. Ohlman, E. Davies, S. Spirou, G. Boggia         ||       k.pentikousis@travelping.com, Borje.Ohlman@ericsson.com, davieseb@scss.tcd.ie, spis@intracom-telecom.com, g.boggia@poliba.it
+#   RFC7946          ||      H. Butler, M. Daly, A. Doyle, S. Gillies, S. Hagen, T. Schaub         ||       howard@hobu.co, martin.daly@cadcorp.com, adoyle@intl-interfaces.com, sean.gillies@gmail.com, stefan@hagen.link, tim.schaub@gmail.com
+#   RFC7947          ||      E. Jasinska, N. Hilliard, R. Raszuk, N. Bakker         ||       elisa@bigwaveit.org, nick@inex.ie, robert@raszuk.net, nbakker@akamai.com
+#   RFC7948          ||      N. Hilliard, E. Jasinska, R. Raszuk, N. Bakker         ||       nick@inex.ie, elisa@bigwaveit.org, robert@raszuk.net, nbakker@akamai.com
+#   RFC7949          ||      I. Chen, A. Lindem, R. Atkinson         ||       ichen@kuatrotech.com, acee@cisco.com, rja.lists@gmail.com
+#   RFC7950          ||      M. Bjorklund, Ed.         ||       mbj@tail-f.com
+#   RFC7951          ||      L. Lhotka         ||       lhotka@nic.cz
+#   RFC7952          ||      L. Lhotka         ||       lhotka@nic.cz
+#   RFC7953          ||      C. Daboo, M. Douglass         ||       cyrus@daboo.name, mdouglass@sphericalcowgroup.com
+#   RFC7954          ||      L. Iannone, D. Lewis, D. Meyer, V. Fuller         ||       ggx@gigix.net, darlewis@cisco.com, dmm@1-4-5.net, vaf@vaf.net
+#   RFC7955          ||      L. Iannone, R. Jorgensen, D. Conrad, G. Huston         ||       ggx@gigix.net, rogerj@gmail.com, drc@virtualized.org, gih@apnic.net
+#   RFC7956          ||      W. Hao, Y. Li, A. Qu, M. Durrani, P. Sivamurugan         ||       haoweiguo@huawei.com, liyizhou@huawei.com, laodulaodu@gmail.com, mdurrani@equinix.com, ponkarthick.sivamurugan@ipinfusion.com
+#   RFC7957          ||      B. Campbell, Ed., A. Cooper, B. Leiba         ||       ben@nostrum.com, alcoop@cisco.com, barryleiba@computer.org
+#   RFC7958          ||      J. Abley, J. Schlyter, G. Bailey, P. Hoffman         ||       jabley@dyn.com, jakob@kirei.se, guillaumebailey@outlook.com, paul.hoffman@icann.org
+#   RFC7959          ||      C. Bormann, Z. Shelby, Ed.         ||       cabo@tzi.org, zach.shelby@arm.com
+#   RFC7960          ||      F. Martin, Ed., E. Lear, Ed., T. Draegen. Ed., E. Zwicky, Ed., K. Andersen, Ed.         ||       fmartin@linkedin.com, lear@cisco.com, tim@dmarcian.com, zwicky@yahoo-inc.com, kandersen@linkedin.com
+#   RFC7961          ||      D. Eastlake 3rd, L. Yizhou         ||       d3e3e3@gmail.com, liyizhou@huawei.com
+#   RFC7962          ||      J. Saldana, Ed., A. Arcia-Moret, B. Braem, E. Pietrosemoli, A. Sathiaseelan, M. Zennaro         ||       jsaldana@unizar.es, andres.arcia@cl.cam.ac.uk, bart.braem@iminds.be, ermanno@ictp.it, arjuna.sathiaseelan@cl.cam.ac.uk, mzennaro@ictp.it
+#   RFC7963          ||      Z. Ali, A. Bonfanti, M. Hartley, F. Zhang         ||       zali@cisco.com, abonfant@cisco.com, mhartley@cisco.com, zhangfatai@huawei.com
+#   RFC7964          ||      D. Walton, A. Retana, E. Chen, J. Scudder         ||       dwalton@cumulusnetworks.com, aretana@cisco.com, enkechen@cisco.com, jgs@juniper.net
+#   RFC7965          ||      M. Chen, W. Cao, A. Takacs, P. Pan         ||       mach.chen@huawei.com, wayne.caowei@huawei.com, attila.takacs@ericsson.com, none
+#   RFC7966          ||      H. Tschofenig, J. Korhonen, Ed., G. Zorn, K. Pillay         ||       Hannes.tschofenig@gmx.net, jouni.nospam@gmail.com, glenzorn@gmail.com, kervin.pillay@gmail.com
+#   RFC7967          ||      A. Bhattacharyya, S. Bandyopadhyay, A. Pal, T. Bose         ||       abhijan.bhattacharyya@tcs.com, soma.bandyopadhyay@tcs.com, arpan.pal@tcs.com, tulika.bose@tcs.com
+#   RFC7968          ||      Y. Li, D. Eastlake 3rd, W. Hao, H. Chen, S. Chatterjee         ||       liyizhou@huawei.com, d3e3e3@gmail.com, haoweiguo@huawei.com, philips.chenhao@huawei.com, somnath.chatterjee01@gmail.com
+#   RFC7969          ||      T. Lemon, T. Mrugalski         ||       ted.lemon@nominum.com, tomasz.mrugalski@gmail.com
+#   RFC7970          ||      R. Danyliw         ||       rdd@cert.org
+#   RFC7971          ||      M. Stiemerling, S. Kiesel, M. Scharf, H. Seidel, S. Previdi         ||       mls.ietf@gmail.com, ietf-alto@skiesel.de, michael.scharf@nokia.com, hseidel@benocs.com, sprevidi@cisco.com
+#   RFC7972          ||      P. Lemieux         ||       pal@sandflow.com
+#   RFC7973          ||      R. Droms, P. Duffy         ||       rdroms.ietf@gmail.com, paduffy@cisco.com
+#   RFC7974          ||      B. Williams, M. Boucadair, D. Wing         ||       brandon.williams@akamai.com, mohamed.boucadair@orange.com, dwing-ietf@fuggles.com
+#   RFC7975          ||      B. Niven-Jenkins, Ed., R. van Brandenburg, Ed.         ||       ben.niven-jenkins@nokia.com, ray.vanbrandenburg@tno.nl
+#   RFC7976          ||      C. Holmberg, N. Biondic, G. Salgueiro         ||       christer.holmberg@ericsson.com, nevenka.biondic@ericsson.com, gsalguei@cisco.com
+#   RFC7977          ||      P. Dunkley, G. Llewellyn, V. Pascual, G. Salgueiro, R. Ravindranath         ||       peter.dunkley@xura.com, gavin.llewellyn@xura.com, victor.pascual.avila@oracle.com, gsalguei@cisco.com, rmohanr@cisco.com
+#   RFC7978          ||      D. Eastlake 3rd, M. Umair, Y. Li         ||       d3e3e3@gmail.com, mohammed.umair2@gmail.com, liyizhou@huawei.com
+#   RFC7979          ||      E. Lear, Ed., R. Housley, Ed.         ||       lear@cisco.com, housley@vigilsec.com
+#   RFC7980          ||      M. Behringer, A. Retana, R. White, G. Huston         ||       mbehring@cisco.com, aretana@cisco.com, russw@riw.us, gih@apnic.net
+#   RFC7981          ||      L. Ginsberg, S. Previdi, M. Chen         ||       ginsberg@cisco.com, sprevidi@cisco.com, mach.chen@huawei.com
+#   RFC7982          ||      P. Martinsen, T. Reddy, D. Wing, V. Singh         ||       palmarti@cisco.com, tireddy@cisco.com, dwing-ietf@fuggles.com, varun@callstats.io
+#   RFC7983          ||      M. Petit-Huguenin, G. Salgueiro         ||       marc@petit-huguenin.org, gsalguei@cisco.com
+#   RFC7984          ||      O. Johansson, G. Salgueiro, V. Gurbani, D. Worley, Ed.         ||       oej@edvina.net, gsalguei@cisco.com, vkg@bell-labs.com, worley@ariadne.com
+#   RFC7985          ||      J. Yi, T. Clausen, U. Herberg         ||       jiazi@jiaziyi.com, T.Clausen@computer.org, ulrich@herberg.name
+#   RFC7986          ||      C. Daboo         ||       cyrus@daboo.name
+#   RFC7987          ||      L. Ginsberg, P. Wells, B. Decraene, T. Przygienda, H. Gredler         ||       ginsberg@cisco.com, pauwells@cisco.com, bruno.decraene@orange.com, prz@juniper.net, hannes@rtbrick.com
+#   RFC7988          ||      E. Rosen, Ed., K. Subramanian, Z. Zhang         ||       erosen@juniper.net, karthik@sproute.com, zzhang@juniper.net
+#   RFC7989          ||      P. Jones, G. Salgueiro, C. Pearce, P. Giralt         ||       paulej@packetizer.com, gsalguei@cisco.com, chrep@cisco.com, pgiralt@cisco.com
+#   RFC7990          ||      H. Flanagan         ||       rse@rfc-editor.org
+#   RFC7991          ||      P. Hoffman         ||       paul.hoffman@icann.org
+#   RFC7992          ||      J. Hildebrand, Ed., P. Hoffman         ||       joe-ietf@cursive.net, paul.hoffman@icann.org
+#   RFC7993          ||      H. Flanagan         ||       rse@rfc-editor.org
+#   RFC7994          ||      H. Flanagan         ||       rse@rfc-editor.org
+#   RFC7995          ||      T. Hansen, Ed., L. Masinter, M. Hardy         ||       tony@att.com, masinter@adobe.com, mahardy@adobe.com
+#   RFC7996          ||      N. Brownlee         ||       n.brownlee@auckland.ac.nz
+#   RFC7997          ||      H. Flanagan, Ed.         ||       rse@rfc-editor.org
+#   RFC7998          ||      P. Hoffman, J. Hildebrand         ||       paul.hoffman@icann.org, joe-ietf@cursive.net
+#   RFC7999          ||      T. King, C. Dietzel, J. Snijders, G. Doering, G. Hankins         ||       thomas.king@de-cix.net, christoph.dietzel@de-cix.net, job@ntt.net, gert@space.net, greg.hankins@nokia.com
+#   RFC8000          ||      A. Adamson, N. Williams         ||       andros@netapp.com, nico@cryptonector.com
+#   RFC8001          ||      F. Zhang, Ed., O. Gonzalez de Dios, Ed., C. Margaria, M. Hartley, Z. Ali         ||       zhangfatai@huawei.com, oscar.gonzalezdedios@telefonica.com, cmargaria@juniper.net, mhartley@cisco.com, zali@cisco.com
+#   RFC8002          ||      T. Heer, S. Varjonen         ||       heer@hs-albsig.de, samu.varjonen@helsinki.fi
+#   RFC8003          ||      J. Laganier, L. Eggert         ||       julien.ietf@gmail.com, lars@netapp.com
+#   RFC8004          ||      J. Laganier, L. Eggert         ||       julien.ietf@gmail.com, lars@netapp.com
+#   RFC8005          ||      J. Laganier         ||       julien.ietf@gmail.com
+#   RFC8006          ||      B. Niven-Jenkins, R. Murray, M. Caulfield, K. Ma         ||       ben.niven-jenkins@nokia.com, rob.murray@nokia.com, mcaulfie@cisco.com, kevin.j.ma@ericsson.com
+#   RFC8007          ||      R. Murray, B. Niven-Jenkins         ||       rob.murray@nokia.com, ben.niven-jenkins@nokia.com
+#   RFC8008          ||      J. Seedorf, J. Peterson, S. Previdi, R. van Brandenburg, K. Ma         ||       jan.seedorf@hft-stuttgart.de, jon.peterson@neustar.biz, sprevidi@cisco.com, ray.vanbrandenburg@tno.nl, kevin.j.ma@ericsson.com
+#   RFC8009          ||      M. Jenkins, M. Peck, K. Burgin         ||       mjjenki@tycho.ncsc.mil, mpeck@mitre.org, kelley.burgin@gmail.com
+#   RFC8010          ||      M. Sweet, I. McDonald         ||       msweet@apple.com, blueroofmusic@gmail.com
+#   RFC8011          ||      M. Sweet, I. McDonald         ||       msweet@apple.com, blueroofmusic@gmail.com
+#   RFC8012          ||      N. Akiya, G. Swallow, C. Pignataro, A. Malis, S. Aldrin         ||       nobo.akiya.dev@gmail.com, swallow@cisco.com, cpignata@cisco.com, agmalis@gmail.com, aldrin.ietf@gmail.com
+#   RFC8013          ||      D. Joachimpillai, J. Hadi Salim         ||       damascene.joachimpillai@verizon.com, hadi@mojatatu.com
+#   RFC8014          ||      D. Black, J. Hudson, L. Kreeger, M. Lasserre, T. Narten         ||       david.black@dell.com, jon.hudson@gmail.com, lkreeger@gmail.com, mmlasserre@gmail.com, narten@us.ibm.com
+#   RFC8015          ||      V. Singh, C. Perkins, A. Clark, R. Huang         ||       varun@callstats.io, csp@csperkins.org, alan.d.clark@telchemy.com, Rachel@huawei.com
+#   RFC8016          ||      T. Reddy, D. Wing, P. Patil, P. Martinsen         ||       tireddy@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com, palmarti@cisco.com
+#   RFC8017          ||      K. Moriarty, Ed., B. Kaliski, J. Jonsson, A. Rusch         ||       Kathleen.Moriarty@emc.com, bkaliski@verisign.com, jakob.jonsson@subset.se, andreas.rusch@rsa.com
+#   RFC8018          ||      K. Moriarty, Ed., B. Kaliski, A. Rusch         ||       Kathleen.Moriarty@Dell.com, bkaliski@verisign.com, andreas.rusch@rsa.com
+#   RFC8019          ||      Y. Nir, V. Smyslov         ||       ynir.ietf@gmail.com, svan@elvis.ru
+#   RFC8020          ||      S. Bortzmeyer, S. Huque         ||       bortzmeyer+ietf@nic.fr, shuque@verisign.com
+#   RFC8021          ||      F. Gont, W. Liu, T. Anderson         ||       fgont@si6networks.com, liushucheng@huawei.com, tore@redpill-linpro.com
+#   RFC8022          ||      L. Lhotka, A. Lindem         ||       lhotka@nic.cz, acee@cisco.com
+#   RFC8023          ||      M. Thomas, A. Mankin, L. Zhang         ||       mthomas@verisign.com, allison.mankin@gmail.com, lixia@cs.ucla.edu
+#   RFC8024          ||      Y. Jiang, Ed., Y. Luo, E. Mallette, Ed., Y. Shen, W. Cheng         ||       jiangyuanlong@huawei.com, dennis.luoyong@huawei.com, edwin.mallette@gmail.com, yshen@juniper.net, chengweiqiang@chinamobile.com
+#   RFC8025          ||      P. Thubert, Ed., R. Cragie         ||       pthubert@cisco.com, robert.cragie@gridmerge.com
+#   RFC8026          ||      M. Boucadair, I. Farrer         ||       mohamed.boucadair@orange.com, ian.farrer@telekom.de
+#   RFC8027          ||      W. Hardaker, O. Gudmundsson, S. Krishnaswamy         ||       ietf@hardakers.net, olafur+ietf@cloudflare.com, suresh@tislabs.com
+#   RFC8028          ||      F. Baker, B. Carpenter         ||       fredbaker.ietf@gmail.com, brian.e.carpenter@gmail.com
+#   RFC8029          ||      K. Kompella, G. Swallow, C. Pignataro, Ed., N. Kumar, S. Aldrin, M. Chen         ||       kireeti.kompella@gmail.com, swallow.ietf@gmail.com, cpignata@cisco.com, naikumar@cisco.com, aldrin.ietf@gmail.com, mach.chen@huawei.com
+#   RFC8030          ||      M. Thomson, E. Damaggio, B. Raymor, Ed.         ||       martin.thomson@gmail.com, elioda@microsoft.com, brian.raymor@microsoft.com
+#   RFC8031          ||      Y. Nir, S. Josefsson         ||       ynir.ietf@gmail.com, simon@josefsson.org
+#   RFC8032          ||      S. Josefsson, I. Liusvaara         ||       simon@josefsson.org, ilariliusvaara@welho.com
+#   RFC8033          ||      R. Pan, P. Natarajan, F. Baker, G. White         ||       ropan@cisco.com, prenatar@cisco.com, fredbaker.ietf@gmail.com, g.white@cablelabs.com
+#   RFC8034          ||      G. White, R. Pan         ||       g.white@cablelabs.com, ropan@cisco.com
+#   RFC8035          ||      C. Holmberg         ||       christer.holmberg@ericsson.com
+#   RFC8036          ||      N. Cam-Winget, Ed., J. Hui, D. Popa         ||       ncamwing@cisco.com, jonhui@nestlabs.com, daniel.popa@itron.com
+#   RFC8037          ||      I. Liusvaara         ||       ilariliusvaara@welho.com
+#   RFC8039          ||      A. Shpiner, R. Tse, C. Schelp, T. Mizrahi         ||       alexshp@mellanox.com, Richard.Tse@microsemi.com, craig.schelp@oracle.com, talmi@marvell.com
+#   RFC8040          ||      A. Bierman, M. Bjorklund, K. Watsen         ||       andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net
+#   RFC8041          ||      O. Bonaventure, C. Paasch, G. Detal         ||       Olivier.Bonaventure@uclouvain.be, cpaasch@apple.com, gregory.detal@tessares.net
+#   RFC8042          ||      Z. Zhang, L. Wang, A. Lindem         ||       zzhang@juniper.net, liliw@juniper.net, acee@cisco.com
+#   RFC8043          ||      B. Sarikaya, M. Boucadair         ||       sarikaya@ieee.org, mohamed.boucadair@orange.com
+#   RFC8044          ||      A. DeKok         ||       aland@freeradius.org
+#   RFC8045          ||      D. Cheng, J. Korhonen, M. Boucadair, S. Sivakumar         ||       dean.cheng@huawei.com, jouni.nospam@gmail.com, mohamed.boucadair@orange.com, ssenthil@cisco.com
+#   RFC8046          ||      T. Henderson, Ed., C. Vogt, J. Arkko         ||       tomhend@u.washington.edu, mail@christianvogt.net, jari.arkko@piuha.net
+#   RFC8047          ||      T. Henderson, Ed., C. Vogt, J. Arkko         ||       tomhend@u.washington.edu, mail@christianvogt.net, jari.arkko@piuha.net
+#   RFC8048          ||      P. Saint-Andre         ||       peter@filament.com
+#   RFC8049          ||      S. Litkowski, L. Tomotaki, K. Ogaki         ||       stephane.litkowski@orange.com, luis.tomotaki@verizon.com, ke-oogaki@kddi.com
+#   RFC8051          ||      X. Zhang, Ed., I. Minei, Ed.         ||       zhang.xian@huawei.com, inaminei@google.com
+#   RFC8053          ||      Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku         ||       y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, maeda@lepidum.co.jp, hayashi@lepidum.co.jp, mutual-work@ioku.org
+#   RFC8054          ||      K. Murchison, J. Elie         ||       murch@andrew.cmu.edu, julien@trigofacile.com
+#   RFC8055          ||      C. Holmberg, Y. Jiang         ||       christer.holmberg@ericsson.com, jiangyi@chinamobile.com
+#   RFC8056          ||      J. Gould         ||       jgould@verisign.com
+#   RFC8057          ||      B. Stark, D. Sinicrope, W. Lupton         ||       barbara.stark@att.com, david.sinicrope@ericsson.com, wlupton@broadband-forum.org
+#   RFC8058          ||      J. Levine, T. Herkula         ||       standards@taugh.com, t.herkula@optivo.com
+#   RFC8059          ||      J. Arango, S. Venaas, I. Kouvelas, D. Farinacci         ||       jearango@cisco.com, stig@cisco.com, kouvelas@arista.com, farinacci@gmail.com
+#   RFC8060          ||      D. Farinacci, D. Meyer, J. Snijders         ||       farinacci@gmail.com, dmm@1-4-5.net, job@ntt.net
+#   RFC8061          ||      D. Farinacci, B. Weis         ||       farinacci@gmail.com, bew@cisco.com
+#   RFC8062          ||      L. Zhu, P. Leach, S. Hartman, S. Emery, Ed.         ||       larry.zhu@microsoft.com, pauljleach@msn.com, hartmans-ietf@mit.edu, shawn.emery@gmail.com
+#   RFC8063          ||      H.W. Ribbers, M.W. Groeneweg, R. Gieben, A.L.J. Verschuren         ||       rik.ribbers@sidn.nl, marc.groeneweg@sidn.nl, miek@miek.nl, ietf@antoin.nl
+#   RFC8064          ||      F. Gont, A. Cooper, D. Thaler, W. Liu         ||       fgont@si6networks.com, alcoop@cisco.com, dthaler@microsoft.com, liushucheng@huawei.com
+#   RFC8065          ||      D. Thaler         ||       dthaler@microsoft.com
+#   RFC8066          ||      S. Chakrabarti, G. Montenegro, R. Droms, J. Woodyatt         ||       samitac.ietf@gmail.com, Gabriel.Montenegro@microsoft.com, rdroms.ietf@gmail.com, jhw@google.com
+#   RFC8067          ||      B. Leiba         ||       barryleiba@computer.org
+#   RFC8068          ||      R. Ravindranath, P. Ravindran, P. Kyzivat         ||       rmohanr@cisco.com, partha@parthasarathi.co.in, pkyzivat@alum.mit.edu
+#   RFC8069          ||      A. Thomas         ||       a.n.thomas@ieee.org
+#   RFC8070          ||      M. Short, Ed., S. Moore, P. Miller         ||       michikos@microsoft.com, sethmo@microsoft.com, paumil@microsoft.com
+#   RFC8071          ||      K. Watsen         ||       kwatsen@juniper.net
+#   RFC8072          ||      A. Bierman, M. Bjorklund, K. Watsen         ||       andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net
+#   RFC8073          ||      K. Moriarty, M. Ford         ||       Kathleen.Moriarty@dell.com, ford@isoc.org
+#   RFC8074          ||      J. Bi, G. Yao, J. Halpern, E. Levy-Abegnoli, Ed.         ||       junbi@tsinghua.edu.cn, yaoguang.china@gmail.com, joel.halpern@ericsson.com, elevyabe@cisco.com
+#   RFC8075          ||      A. Castellani, S. Loreto, A. Rahman, T. Fossati, E. Dijk         ||       angelo@castellani.net, Salvatore.Loreto@ericsson.com, Akbar.Rahman@InterDigital.com, thomas.fossati@nokia.com, esko.dijk@philips.com
+#   RFC8076          ||      A. Knauf, T. Schmidt, Ed., G. Hege, M. Waehlisch         ||       alexanderknauf@gmail.com, t.schmidt@haw-hamburg.de, hege@daviko.com, mw@link-lab.net
+#   RFC8077          ||      L. Martini, Ed., G. Heron, Ed.         ||       lmartini@monoski.com, giheron@cisco.com
+#   RFC8078          ||      O. Gudmundsson, P. Wouters         ||       olafur+ietf@cloudflare.com, pwouters@redhat.com
+#   RFC8079          ||      L. Miniero, S. Garcia Murillo, V. Pascual         ||       lorenzo@meetecho.com, sergio.garcia.murillo@gmail.com, victor.pascual.avila@oracle.com
+#   RFC8080          ||      O. Sury, R. Edmonds         ||       ondrej.sury@nic.cz, edmonds@mycre.ws
+#   RFC8081          ||      C. Lilley         ||       chris@w3.org
+#   RFC8082          ||      S. Wenger, J. Lennox, B. Burman, M. Westerlund         ||       stewe@stewe.org, jonathan@vidyo.com, bo.burman@ericsson.com, magnus.westerlund@ericsson.com
+#   RFC8083          ||      C. Perkins, V. Singh         ||       csp@csperkins.org, varun@callstats.io
+#   RFC8084          ||      G. Fairhurst         ||       gorry@erg.abdn.ac.uk
+#   RFC8085          ||      L. Eggert, G. Fairhurst, G. Shepherd         ||       lars@netapp.com, gorry@erg.abdn.ac.uk, gjshep@gmail.com
+#   RFC8086          ||      L. Yong, Ed., E. Crabbe, X. Xu, T. Herbert         ||       lucy.yong@huawei.com, edward.crabbe@gmail.com, xuxiaohu@huawei.com, tom@herbertland.com
+#   RFC8087          ||      G. Fairhurst, M. Welzl         ||       gorry@erg.abdn.ac.uk, michawe@ifi.uio.no
+#   RFC8089          ||      M. Kerwin         ||       matthew.kerwin@qut.edu.au
+#   RFC8090          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC8091          ||      E. Wilde         ||       erik.wilde@dret.net
+#   RFC8092          ||      J. Heitz, Ed., J. Snijders, Ed., K. Patel, I. Bagdonas, N. Hilliard         ||       jheitz@cisco.com, job@ntt.net, keyur@arrcus.com, ibagdona.ietf@gmail.com, nick@inex.ie
+#   RFC8093          ||      J. Snijders         ||       job@ntt.net
+#   RFC8094          ||      T. Reddy, D. Wing, P. Patil         ||       tireddy@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com
+#   RFC8095          ||      G. Fairhurst, Ed., B. Trammell, Ed., M. Kuehlewind, Ed.         ||       gorry@erg.abdn.ac.uk, ietf@trammell.ch, mirja.kuehlewind@tik.ee.ethz.ch
+#   RFC8096          ||      B. Fenner         ||       fenner@fenron.com
+#   RFC8097          ||      P. Mohapatra, K. Patel, J. Scudder, D. Ward, R. Bush         ||       mpradosh@yahoo.com, keyur@arrcus.com, jgs@juniper.net, dward@cisco.com, randy@psg.com
+#   RFC8098          ||      T. Hansen, Ed., A. Melnikov, Ed.         ||       tony@att.com, alexey.melnikov@isode.com
+#   RFC8099          ||      H. Chen, R. Li, A. Retana, Y. Yang, Z. Liu         ||       huaimo.chen@huawei.com, renwei.li@huawei.com, aretana@cisco.com, yyang1998@gmail.com, liu.cmri@gmail.com
+#   RFC8100          ||      R. Geib, Ed., D. Black         ||       Ruediger.Geib@telekom.de, david.black@dell.com
+#   RFC8101          ||      C. Holmberg, J. Axell         ||       christer.holmberg@ericsson.com, jorgen.axell@ericsson.com
+#   RFC8102          ||      P. Sarkar, Ed., S. Hegde, C. Bowers, H. Gredler, S. Litkowski         ||       pushpasis.ietf@gmail.com, shraddha@juniper.net, cbowers@juniper.net, hannes@rtbrick.com, stephane.litkowski@orange.com
+#   RFC8103          ||      R. Housley         ||       housley@vigilsec.com
+#   RFC8104          ||      Y. Shen, R. Aggarwal, W. Henderickx, Y. Jiang         ||       yshen@juniper.net, raggarwa_1@yahoo.com, wim.henderickx@nokia.com, jiangyuanlong@huawei.com
+#   RFC8106          ||      J. Jeong, S. Park, L. Beloeil, S. Madanapalli         ||       pauljeong@skku.edu, soohong.park@samsung.com, luc.beloeil@orange.com, smadanapalli@gmail.com
+#   RFC8107          ||      J. Wold         ||       jwold@ad-id.org
+#   RFC8108          ||      J. Lennox, M. Westerlund, Q. Wu, C. Perkins         ||       jonathan@vidyo.com, magnus.westerlund@ericsson.com, bill.wu@huawei.com, csp@csperkins.org
+#   RFC8109          ||      P. Koch, M. Larson, P. Hoffman         ||       pk@DENIC.DE, matt.larson@icann.org, paul.hoffman@icann.org
+#   RFC8110          ||      D. Harkins, Ed., W. Kumari, Ed.         ||       dharkins@arubanetworks.com, warren@kumari.net
+#   RFC8113          ||      M. Boucadair, C. Jacquenet         ||       mohamed.boucadair@orange.com, christian.jacquenet@orange.com
+#   RFC8114          ||      M. Boucadair, C. Qin, C. Jacquenet, Y. Lee, Q. Wang         ||       mohamed.boucadair@orange.com, jacni@jacni.com, christian.jacquenet@orange.com, yiu_lee@cable.comcast.com, 13301168516@189.cn
+#   RFC8115          ||      M. Boucadair, J. Qin, T. Tsou, X. Deng         ||       mohamed.boucadair@orange.com, jacni@jacni.com, tina.tsou@philips.com, dxhbupt@gmail.com
+#   RFC8117          ||      C. Huitema, D. Thaler, R. Winter         ||       huitema@huitema.net, dthaler@microsoft.com, rolf.winter@hs-augsburg.de
+#   RFC8118          ||      M. Hardy, L. Masinter, D. Markovic, D. Johnson, M. Bailey         ||       mahardy@adobe.com, masinter@adobe.com, dmarkovi@adobe.com, duff.johnson@pdfa.org, martin.bailey@globalgraphics.com
+#   RFC8119          ||      M. Mohali, M. Barnes         ||       marianne.mohali@orange.com, mary.ietf.barnes@gmail.com
+#   RFC8120          ||      Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku         ||       y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, kaorumaeda.ml@gmail.com, hayashi@lepidum.co.jp, mutual-work@ioku.org
+#   RFC8121          ||      Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku         ||       y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, kaorumaeda.ml@gmail.com, hayashi@lepidum.co.jp, mutual-work@ioku.org
+#   RFC8122          ||      J. Lennox, C. Holmberg         ||       jonathan@vidyo.com, christer.holmberg@ericsson.com
+#   RFC8123          ||      P. Dawes, C. Arunachalam         ||       peter.dawes@vodafone.com, carunach@cisco.com
+#   RFC8124          ||      R. Ravindranath, G. Salgueiro         ||       rmohanr@cisco.com, gsalguei@cisco.com
+#   RFC8128          ||      C. Morgan         ||       cmorgan@amsl.com
+#   RFC8129          ||      A. Jain, N. Kinder, N. McCallum         ||       ajain323@gatech.edu, nkinder@redhat.com, npmccallum@redhat.com
+#   RFC8130          ||      V. Demjanenko, D. Satterlee         ||       victor.demjanenko@vocal.com, david.satterlee@vocal.com
+#   RFC8131          ||      X. Zhang, H. Zheng, Ed., R. Gandhi, Ed., Z. Ali, P. Brzozowski         ||       zhang.xian@huawei.com, zhenghaomian@huawei.com, rgandhi@cisco.com, zali@cisco.com, pbrzozowski@advaoptical.com
+#   RFC8132          ||      P. van der Stok, C. Bormann, A. Sehgal         ||       consultancy@vanderstok.org, cabo@tzi.org, anuj.sehgal@navomi.com
+#   RFC8133          ||      S. Smyshlyaev. Ed., E. Alekseev, I. Oshkin, V. Popov         ||       svs@cryptopro.ru, alekseev@cryptopro.ru, oshkin@cryptopro.ru, vpopov@cryptopro.ru
+#   RFC8135          ||      M. Danielson, M. Nilsson         ||       magda@netinsight.net, mansaxel@besserwisser.org
+#   RFC8136          ||      B. Carpenter, R. Hinden         ||       brian.e.carpenter@gmail.com, bob.hinden@gmail.com
+#   RFC8138          ||      P. Thubert, Ed., C. Bormann, L. Toutain, R. Cragie         ||       pthubert@cisco.com, cabo@tzi.org, Laurent.Toutain@IMT-Atlantique.fr, robert.cragie@arm.com
+#   RFC8140          ||      A. Farrel         ||       adrian@olddog.co.uk
+#   RFC8144          ||      K. Murchison         ||       murch@andrew.cmu.edu
+#   RFC8145          ||      D. Wessels, W. Kumari, P. Hoffman         ||       dwessels@verisign.com, warren@kumari.net, paul.hoffman@icann.org""".split('\n')
+
+
+# # Many of these are addresses that the draft parser found incorrectly
+# ignore_addresses =[
+# '0004454742@mcimail.com',
+# '0006423401@mcimail.com',
+# 'cabo@tzi.orgemail',
+# 'california@san',
+# 'cdl@rincon.com',
+# 'hss@lando.hns.com',
+# 'ietf-info@cnri.reston.va.us',
+# 'illinois@urbana-champaign',
+# 'jasdips@rwhois.net',
+# 'labs@network',
+# 'member@the',
+# 'park@mit',
+# 'research@icsi',
+# 'research@isci',
+# 'technopark@chaichee',
+# 'texas@arlington',
+# 'ura-bunyip@bunyip.com',
+# ]
+
+# def get_rfc_data():
+#     author_names = dict()
+#     author_emails = dict()
+#     for line in rfced_data:
+#         (rfc,names,emails) = line.split('||')
+#         rfc = int(rfc.lower().strip()[3:])
+#         author_names[rfc] = [ x for x in map(str.lower,map(str.strip,names.split(','))) if x not in ['Ed.', 'ed.', '' ] ]
+#         author_emails[rfc] = [ x for x in map(unicode,map(str.lower,map(str.strip,emails.split(',')))) if x not in [ '', ] ]
+#     return author_names, author_emails
+
+# def get_all_the_email():
+#     all_the_email = Email.objects.all()
+#     for e in all_the_email:
+#         e.l_address = e.address.lower()
+#     return all_the_email
+
+# def get_matching_emails(all_the_email,addrlist):
+#     """ Find Email objects with addresses case-insensitively matching things in the supplied list (for lack of __iin) """
+#     l_addrlist = map(unicode.lower,addrlist)
+#     return [ e for e in all_the_email if e.l_address in l_addrlist ]
+
+# def show_verbose(rfc_num,*args):
+#     print "rfc%-4d :"%rfc_num,' '.join(map(str,args))
+
+# ParsedAuthor = namedtuple('ParsedAuthor',['name','address'])
+
+# def get_parsed_authors(rfc_num):
+#     h,n = mkstemp()
+#     os.close(h)
+#     f = open(n,"w")
+#     f.write('%s/rfc%d.txt\n'%(settings.RFC_PATH,rfc_num))
+#     f.close()
+#     lines = subprocess.check_output(['ietf/utils/draft.py','-a',n])
+#     os.unlink(n)
+#     if not 'docauthors ' in lines:
+#         return []
+#     authorline = [l for l in lines.split('\n') if l.startswith('docauthors ')][0]
+#     authstrings = authorline.split(':')[1].split(',')
+#     retval = []
+#     for a in authstrings:
+#         if '<' in a:
+#             retval.append(ParsedAuthor(a[:a.find('<')].strip(),a[a.find('<'):a.find('>')][1:]))
+#         else:
+#             retval.append(ParsedAuthor(a.strip(),None))
+    
+#     return retval
+
+# def calculate_changes(tracker_persons,tracker_emails,names,emails):
+#     adds = set()
+#     deletes = set()
+#     for email in emails:
+#         if email and email!='none' and email not in ignore_addresses:
+#             p = Person.objects.filter(email__address=email).first()
+#             if p:
+#                 if not set(map(unicode.lower,p.email_set.values_list('address',flat=True))).intersection(tracker_emails):
+#                     adds.add(email)
+#             else:
+#                 #person_name = names[emails.index(email)]
+#                 adds.add(email)
+#     for person in tracker_persons:
+#         if not set(map(unicode.lower,person.email_set.values_list('address',flat=True))).intersection(emails):
+#             match = False
+#             for index in [i for i,j in enumerate(emails) if j=='none' or not j]:
+#                 if names[index].split()[-1].lower()==person.last_name().lower():
+#                     match = True
+#             if not match:
+#                     deletes.add(person) 
+#     return adds, deletes
+
+# def _main():
+
+#     parser = argparse.ArgumentParser(description="Recalculate RFC documentauthor_set"+'\n\n'+__doc__,
+#                                     formatter_class=argparse.RawDescriptionHelpFormatter,)
+#     parser.add_argument('-v','--verbose',help="Show the action taken for each RFC",action='store_true') 
+#     parser.add_argument('--rfc',type=int, nargs='*',help="Only recalculate the given rfc numbers",dest='rfcnumberlist')
+#     args = parser.parse_args()
+
+#     probable_email_match = set()
+#     probable_duplicates = []
+    
+#     all_the_email = get_all_the_email()
+#     author_names, author_emails = get_rfc_data()
+    
+#     stats = { 'rfc not in tracker'                           :0,
+#               'same addresses'                               :0,
+#               'different addresses belonging to same people' :0,
+#               'same names, rfced emails do not match'        :0,
+#               'rfced data is unusable'                       :0,
+#               "data doesn't match but no changes found"      :0,
+#               'changed authors'                              :0, }
+
+#     for rfc_num in args.rfcnumberlist or sorted(author_names.keys()):
+    
+#         rfc = Document.objects.filter(docalias__name='rfc%s'%rfc_num).first()
+    
+#         if not rfc:
+#             if args.verbose:
+#                 show_verbose(rfc_num,'rfc not in tracker')
+#             stats['rfc not in tracker'] += 1
+#             continue
+    
+#         rfced_emails = set(author_emails[rfc_num])
+#         tracker_emails = set(map(unicode.lower,rfc.authors.values_list('address',flat=True)))
+#         tracker_persons = set([x.person for x in rfc.authors.all()])
+#         matching_emails = get_matching_emails(all_the_email,rfced_emails)
+#         rfced_persons = set([x.person for x in matching_emails])
+#         known_emails = set([e.l_address for e in matching_emails])
+#         unknown_emails = rfced_emails - known_emails
+#         unknown_persons = tracker_persons-rfced_persons
+    
+#         rfced_lastnames = sorted([n.split()[-1].lower() for n in author_names[rfc_num]])
+#         tracker_lastnames = sorted([p.last_name().lower() for p in tracker_persons])
+    
+#         if rfced_emails == tracker_emails:
+#             if args.verbose:
+#                 show_verbose(rfc_num,'tracker and rfc editor have the same addresses')
+#             stats['same addresses'] += 1
+#             continue
+    
+#         if len(rfced_emails)==len(tracker_emails) and not 'none' in author_emails[rfc_num]:
+#             if tracker_persons == rfced_persons:
+#                 if args.verbose:
+#                     show_verbose(rfc_num,'tracker and rfc editor have the different addresses belonging to same people')
+#                 stats['different addresses belonging to same people'] += 1
+#                 continue
+#             else:
+#                 if len(unknown_emails)==1 and len(tracker_persons-rfced_persons)==1:
+#                     p = list(tracker_persons-rfced_persons)[0]
+#                     probable_email_match.add(u"%s is probably %s (%s) : %s "%(list(unknown_emails)[0], p, p.pk, rfc_num))
+#                 elif len(unknown_emails)==len(unknown_persons):
+#                     probable_email_match.add(u"%s are probably %s : %s"%(unknown_emails,[(p.ascii,p.pk) for p in unknown_persons],rfc_num))
+#                 else:
+#                     probable_duplicates.append((tracker_persons^rfced_persons,rfc_num))
+    
+#         if tracker_lastnames == rfced_lastnames:
+#             if args.verbose:
+#                 show_verbose(rfc_num,"emails don't match up, but person names appear to be the same")
+#             stats[ 'same names, rfced emails do not match'] += 1
+#             continue
+    
+#         use_rfc_data = bool(len(author_emails[rfc_num])==len(author_names[rfc_num]))
+#         if not use_rfc_data:
+#             if args.verbose:
+#                 print 'Ignoring rfc database for rfc%d'%rfc_num
+#             stats[ 'rfced data is unusable'] += 1
+
+#         if use_rfc_data:
+#             adds, deletes = calculate_changes(tracker_persons,tracker_emails,author_names[rfc_num],author_emails[rfc_num])
+#         parsed_authors=get_parsed_authors(rfc_num)
+#         parsed_adds, parsed_deletes = calculate_changes(tracker_persons,tracker_emails,[x.name for x in parsed_authors],[x.address for x in parsed_authors])
+
+#         for e in adds.union(parsed_adds) if use_rfc_data else parsed_adds:
+#             if not e or e in ignore_addresses:
+#                 continue
+#             if not Person.objects.filter(email__address=e).exists():
+#                 if e not in parsed_adds:
+#                     #print rfc_num,"Would add",e,"as",author_names[rfc_num][author_emails[rfc_num].index(e)],"(rfced database)"
+#                     print "(address='%s',name='%s'),"%(e,author_names[rfc_num][author_emails[rfc_num].index(e)]),"# (rfced %d)"%rfc_num
+#                     for p in Person.objects.filter(name__iendswith=author_names[rfc_num][author_emails[rfc_num].index(e)].split(' ')[-1]):
+#                         print "\t", p.pk, p.ascii
+#                 else:
+#                     name = [x.name for x in parsed_authors if x.address==e][0]
+#                     p = Person.objects.filter(name=name).first()
+#                     if p:
+#                         #print e,"is probably",p.pk,p
+#                         print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num)
+
+#                     else:
+#                         p = Person.objects.filter(ascii=name).first()
+#                         if p:
+#                             print e,"is probably",p.pk,p
+#                             print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num)
+#                         else:
+#                             p = Person.objects.filter(ascii_short=name).first()
+#                             if p:
+#                                 print e,"is probably",p.pk,p
+#                                 print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num)
+#                     #print rfc_num,"Would add",e,"as",name,"(parsed)"
+#                     print "(address='%s',name='%s'),"%(e,name),"# (parsed %d)"%rfc_num
+#                     for p in Person.objects.filter(name__iendswith=name.split(' ')[-1]):
+#                         print "\t", p.pk, p.ascii
+
+#         if False: # This was a little useful, but the noise in the rfc_ed file keeps it from being completely useful
+#             for p in deletes:
+#                 for n in author_names[rfc_num]:
+#                     if p.last_name().lower()==n.split()[-1].lower():
+#                         email_candidate = author_emails[rfc_num][author_names[rfc_num].index(n)]
+#                         email_found = Email.objects.filter(address=email_candidate).first()
+#                         if email_found:    
+#                             probable_duplicates.append((set([p,email_found.person]),rfc_num))
+#                         else:
+#                             probable_email_match.add(u"%s is probably %s (%s) : %s"%(email_candidate, p, p.pk, rfc_num))
+             
+#         if args.verbose:
+#             if use_rfc_data:
+#                 working_adds = parsed_adds
+#                 seen_people = set(Email.objects.get(address=e).person for e in parsed_adds)
+#                 for addr in adds:
+#                     person = Email.objects.get(address=addr).person
+#                     if person not in seen_people:
+#                         working_adds.add(addr)
+#                         seen_people.add(person)
+#                 working_deletes = deletes.union(parsed_deletes)
+#             else:
+#                 working_adds = parsed_adds
+#                 working_deletes = parsed_deletes
+#             # unique_adds = set() # TODO don't add different addresses for the same person from the two sources
+#             if working_adds or working_deletes:
+#                 show_verbose(rfc_num,"Changing original list",tracker_persons,"by adding",working_adds," and deleting",working_deletes)
+#                 print "(",rfc_num,",",[e for e in working_adds],",",[p.pk for p in working_deletes],"), #",[p.ascii for p in working_deletes]
+#             else:
+#                 stats["data doesn't match but no changes found"] += 1
+#                 show_verbose(rfc_num,"Couldn't figure out what to change")
+
+#         if False:
+#         #if tracker_persons:
+#         #if any(['iab@' in e for e in adds]) or any(['iesg@' in e for e in adds]) or any(['IESG'==p.name for p in deletes]) or any(['IAB'==p.name for p in deletes]):
+#             print rfc_num
+#             print "tracker_persons",tracker_persons
+#             print "author_names",author_names[rfc_num]
+#             print "author_emails",author_emails[rfc_num]
+#             print "Adds:", adds
+#             print "Deletes:", deletes
+        
+#         stats['changed authors'] += 1
+    
+#         if False:
+#             debug.show('rfc_num')
+#             debug.show('rfced_emails')
+#             debug.show('tracker_emails')
+#             debug.show('known_emails')
+#             debug.show('unknown_emails')
+#             debug.show('tracker_persons')
+#             debug.show('rfced_persons')
+#             debug.show('tracker_persons==rfced_persons')
+#             debug.show('[p.id for p in tracker_persons]')
+#             debug.show('[p.id for p in rfced_persons]')
+#             exit()
+    
+#     if True:
+#         for p in sorted(list(probable_email_match)):
+#             print p
+#     if True:
+#         print "Probable duplicate persons"
+#         for d,r in sorted(probable_duplicates):
+#             print [(p,p.pk) for p in d], r
+#     else:
+#         print len(probable_duplicates)," probable duplicate persons"
+
+#     print stats
+
+# if __name__ == "__main__":
+#     _main()
+
diff --git a/dev/mq/Dockerfile b/dev/mq/Dockerfile
index e8871c30a9..1738c4b3d2 100644
--- a/dev/mq/Dockerfile
+++ b/dev/mq/Dockerfile
@@ -1,6 +1,8 @@
 # Dockerfile for RabbitMQ worker
 #
-FROM rabbitmq:3-alpine
+ARG RABBITMQ_VERSION=3.11-alpine
+
+FROM rabbitmq:${RABBITMQ_VERSION}
 LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
 
 # Copy the startup file
diff --git a/dev/shared-assets-sync/Dockerfile b/dev/shared-assets-sync/Dockerfile
new file mode 100644
index 0000000000..46541a77ac
--- /dev/null
+++ b/dev/shared-assets-sync/Dockerfile
@@ -0,0 +1,9 @@
+FROM alpine:3
+
+RUN apk add --no-cache wget rsync
+COPY docker/scripts/app-rsync-extras.sh /workspace/app-rsync-extras.sh
+RUN chmod +x /workspace/app-rsync-extras.sh
+
+WORKDIR /workspace
+
+CMD ["sh", "app-rsync-extras.sh"]
diff --git a/dev/tests/debug.sh b/dev/tests/debug.sh
new file mode 100644
index 0000000000..d87c504bb9
--- /dev/null
+++ b/dev/tests/debug.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# This script recreate the same environment used during tests on GitHub Actions
+# and drops you into a terminal at the point where the actual tests would be run.
+#
+# Refer to https://github.com/ietf-tools/datatracker/blob/main/.github/workflows/tests.yml#L47-L66
+# for the commands to run next.
+#
+# Simply type "exit" + ENTER to exit and shutdown this test environment.
+
+echo "Fetching latest images..."
+docker pull ghcr.io/ietf-tools/datatracker-app-base:latest
+docker pull ghcr.io/ietf-tools/datatracker-db:latest
+echo "Starting containers..."
+docker compose -f docker-compose.debug.yml -p dtdebug --compatibility up -d
+echo "Copying working directory into container..."
+docker compose -p dtdebug cp ../../. app:/__w/datatracker/datatracker/
+echo "Run prepare script..."
+docker compose -p dtdebug exec app chmod +x ./dev/tests/prepare.sh
+docker compose -p dtdebug exec app sh ./dev/tests/prepare.sh
+docker compose -p dtdebug exec app /usr/local/bin/wait-for db:5432 -- echo "DB ready"
+echo "================================================================="
+echo "Launching zsh terminal:"
+docker compose -p dtdebug exec app /bin/zsh
+echo "Shutting down containers..."
+docker compose -p dtdebug down -v
diff --git a/dev/tests/docker-compose.debug.yml b/dev/tests/docker-compose.debug.yml
new file mode 100644
index 0000000000..8117b92375
--- /dev/null
+++ b/dev/tests/docker-compose.debug.yml
@@ -0,0 +1,35 @@
+# This docker-compose replicates the test workflow happening on GitHub during a PR / build check.
+# To be used from the debug.sh script.
+
+version: '3.8'
+
+services:
+    app:
+        image: ghcr.io/ietf-tools/datatracker-app-base:latest
+        command: -f /dev/null
+        working_dir: /__w/datatracker/datatracker
+        entrypoint: tail
+        hostname: app
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock
+        environment:
+            CI: 'true'
+            GITHUB_ACTIONS: 'true'
+            HOME: /github/home
+        deploy:    
+            resources:
+                limits:
+                    cpus: '2'
+                    memory: '7GB'
+
+    db:
+        image: ghcr.io/ietf-tools/datatracker-db:latest
+        restart: unless-stopped
+        volumes:
+            - postgresdb-data:/var/lib/postgresql/data
+
+    blobstore:
+      image: ghcr.io/ietf-tools/datatracker-devblobstore:latest
+
+volumes:
+    postgresdb-data:
diff --git a/dev/tests/prepare.sh b/dev/tests/prepare.sh
index 2fb7cf7c95..dd8e3d6b4d 100644
--- a/dev/tests/prepare.sh
+++ b/dev/tests/prepare.sh
@@ -18,3 +18,4 @@ chmod +x ./docker/scripts/app-create-dirs.sh
 ./docker/scripts/app-create-dirs.sh
 echo "Fetching latest coverage results file..."
 curl -fsSL https://github.com/ietf-tools/datatracker/releases/download/baseline/coverage.json -o release-coverage.json
+psql -U django -h db -d datatracker -v ON_ERROR_STOP=1 -c '\x' -c 'ALTER USER django set search_path=datatracker,public;'
diff --git a/dev/tests/settings_local.py b/dev/tests/settings_local.py
index 2b3d541387..e1ffd60edb 100644
--- a/dev/tests/settings_local.py
+++ b/dev/tests/settings_local.py
@@ -1,35 +1,24 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-from ietf.settings import *                                          # pyflakes:ignore
+from ietf.settings import *  # pyflakes:ignore
 
 ALLOWED_HOSTS = ['*']
 
 DATABASES = {
     'default': {
         'HOST': 'db',
-        'PORT': 3306,
-        'NAME': 'ietf_utf8',
-        'ENGINE': 'django.db.backends.mysql',
+        'PORT': 5432,
+        'NAME': 'datatracker',
+        'ENGINE': 'django.db.backends.postgresql',
         'USER': 'django',
         'PASSWORD': 'RkTkDPFnKpko',
-        'OPTIONS': {
-            'sql_mode': 'STRICT_TRANS_TABLES',
-            'init_command': 'SET storage_engine=InnoDB; SET names "utf8"',
-        },
     },
 }
 
-DATABASE_TEST_OPTIONS = {
-    'init_command': 'SET storage_engine=InnoDB',
-}
-
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
-IDSUBMIT_REPOSITORY_PATH = "test/id/"
-IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
+IDSUBMIT_REPOSITORY_PATH = "/assets/ietfdata/doc/draft/repository"
+IDSUBMIT_STAGING_PATH = "/assets/www6s/staging/"
 
 AGENDA_PATH = '/assets/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -47,7 +36,6 @@
 
 SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/'
 SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/'
-SUBMIT_YANG_INVAL_MODEL_DIR = '/assets/ietf-ftp/yang/invalmod/'
 SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/'
 SUBMIT_YANG_RFC_MODEL_DIR   = '/assets/ietf-ftp/yang/rfcmod/'
 
@@ -67,8 +55,11 @@
 BOFREQ_PATH = '/assets/ietf-ftp/bofreq/'
 CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/'
 STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
-INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
+INTERNET_DRAFT_ARCHIVE_DIR = '/assets/collection/draft-archive'
 INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
+BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
+FTP_DIR = '/assets/ftp'
+NFS_METRICS_TMP_DIR = '/assets/tmp'
 
 NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
 SLIDE_STAGING_PATH = 'test/staging/'
diff --git a/dev/vite-plugins/precompile-lodash-templates.js b/dev/vite-plugins/precompile-lodash-templates.js
new file mode 100644
index 0000000000..2b2b7d54fe
--- /dev/null
+++ b/dev/vite-plugins/precompile-lodash-templates.js
@@ -0,0 +1,28 @@
+import { createFilter } from '@rollup/pluginutils'
+import template from 'lodash/template'
+import transform from 'lodash/transform'
+import fs from 'fs/promises'
+
+export default function precompileLodashTemplates(options = {}) {
+  const filter = createFilter(options.include, options.exclude)
+  return {
+    name: 'precompile-lodash-templates',
+    enforce: 'pre',
+    async transform(code, id) {
+      if (!filter(id)) { return }
+
+      const jsonPath = `${id}on`
+      const urls = JSON.parse(await fs.readFile(jsonPath, { encoding: 'utf8' }))
+
+      const interpolate = /{([\s\S]+?)}/g
+      const compiledUrls = transform(urls, (result, value, key) => {
+        result.push(`"${key}": ${template(value.replaceAll('{', '{data.'), { interpolate, variable: 'data' }).source.replace('function(obj)', '(obj) =>')}`)
+      }, [])
+
+      return {
+        code: code.replace('/* __COMPILED_URLS__ */', compiledUrls.join(',\n')),
+        map: null
+      }
+    }
+  }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b7b45709f..073d04b896 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     app:
         build:
@@ -15,17 +13,20 @@ services:
         # network_mode: service:db
 
         depends_on:
+            - blobdb
+            - blobstore
             - db
             - mq
 
         ipc: host
 
-        # environment:
+        environment:
+            DISPLAY: host.docker.internal:0
             # USER: django
             # UID: 1001
             # GID: 1001
             # DATADIR: data
-            # DJANGO_SETTINGS_MODULE: settings_sqlitetest
+            # DJANGO_SETTINGS_MODULE: settings_test
         
         # Uncomment the next line to use a non-root user for all processes.
         # user: dev
@@ -36,55 +37,118 @@ services:
     db:
         image: ghcr.io/ietf-tools/datatracker-db:latest
         #  build:
-        #      context: ..
+        #      context: .
         #      dockerfile: docker/db.Dockerfile
         restart: unless-stopped
         volumes:
-            - mariadb-data:/var/lib/mysql
-        environment:
-            MYSQL_ROOT_PASSWORD: RkTkDPFnKpko
-            MYSQL_DATABASE: ietf_utf8
-            MYSQL_USER: django
-            MYSQL_PASSWORD: RkTkDPFnKpko
-        command:
-            - '--character-set-server=utf8'
-            - '--collation-server=utf8_unicode_ci'
-            - '--innodb-buffer-pool-size=1G'
-            - '--innodb-log-buffer-size=128M'
-            - '--innodb-log-file-size=256M'
-            - '--innodb-write-io-threads=8'
-            - '--innodb-flush-log-at-trx-commit=0'
-            - '--performance-schema=1'
+            - postgresdb-data:/var/lib/postgresql/data
             
     # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
+    pgadmin:
+        image: dpage/pgadmin4:latest
+        restart: unless-stopped
+        environment:
+            - PGADMIN_DEFAULT_EMAIL=dev@ietf.org
+            - PGADMIN_DEFAULT_PASSWORD=dev
+            - PGADMIN_CONFIG_LOGIN_BANNER="Login with dev@ietf.org / dev"
+            - PGADMIN_DISABLE_POSTFIX=True
+            - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
+            - SCRIPT_NAME=/pgadmin
+        volumes:
+            - ./docker/configs/pgadmin-servers.json:/pgadmin4/servers.json
+
+    static:
+        image: ghcr.io/ietf-tools/static:latest
+        restart: unless-stopped
+
     mq:
         image: rabbitmq:3-alpine
         restart: unless-stopped
 
     celery:
-        image: ghcr.io/ietf-tools/datatracker-celery:latest
+        build:
+            context: .
+            dockerfile: docker/celery.Dockerfile
         init: true
         environment:
             CELERY_APP: ietf
             CELERY_ROLE: worker
             UPDATE_REQUIREMENTS_FROM: requirements.txt
+            DEV_MODE: "yes"
         command:
             - '--loglevel=INFO'
         depends_on:
+            - blobdb
+            - blobstore
             - db
+            - mq
         restart: unless-stopped
         stop_grace_period: 1m
         volumes:
             - .:/workspace
             - app-assets:/assets
 
+    replicator:
+        build:
+            context: .
+            dockerfile: docker/celery.Dockerfile
+        init: true
+        environment:
+            CELERY_APP: ietf
+            CELERY_ROLE: worker
+            UPDATE_REQUIREMENTS_FROM: requirements.txt
+            DEV_MODE: "yes"
+        command:
+            - '--loglevel=INFO'
+            - '--queues=blobdb'
+            - '--concurrency=1'
+                 
+        depends_on:
+            - blobdb
+            - blobstore
+            - db
+            - mq
+        restart: unless-stopped
+        stop_grace_period: 1m
+        volumes:
+            - .:/workspace
+            - app-assets:/assets
+
+    blobstore:
+        image: ghcr.io/ietf-tools/datatracker-devblobstore:latest
+        restart: unless-stopped
+        volumes:
+            - "minio-data:/data"
+
+    blobdb:
+        image: postgres:17
+        restart: unless-stopped
+        environment:
+            POSTGRES_DB: blob
+            POSTGRES_USER: dt
+            POSTGRES_PASSWORD: abcd1234
+        volumes:
+            - blobdb-data:/var/lib/postgresql/data
+
+#    typesense:
+#        image: typesense/typesense:30.1
+#        restart: on-failure
+#        ports:
+#            - "8108:8108"
+#        volumes:
+#            - ./typesense-data:/data
+#        command:
+#            - '--data-dir=/data'
+#            - '--api-key=typesense-api-key'
+#            - '--enable-cors'
+
 #  Celery Beat is a periodic task runner. It is not normally needed for development,
 #  but can be enabled by uncommenting the following.
 #
 #    beat:
-#        image: ghcr.io/ietf-tools/datatracker-celery:latest
+#        image: "${COMPOSE_PROJECT_NAME}-celery"
 #        init: true
 #        environment:
 #            CELERY_APP: ietf
@@ -98,7 +162,10 @@ services:
 #        stop_grace_period: 1m
 #        volumes:
 #            - .:/workspace
+#            - app-assets:/assets
 
 volumes:
-    mariadb-data:
+    postgresdb-data:
     app-assets:
+    minio-data:
+    blobdb-data:
diff --git a/docker/README.md b/docker/README.md
index 227a74a338..0ca79a6e89 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,14 +1,28 @@
 # Datatracker Development in Docker
 
+- [Getting started](#getting-started)
+- [Using Visual Studio Code](#using-visual-studio-code)
+    - [Initial Setup](#initial-setup)
+    - [Subsequent Launch](#subsequent-launch)
+    - [Usage](#usage)
+- [Using Other Editors / Generic](#using-other-editors--generic)
+    - [Exit Environment](#exit-environment)
+    - [Accessing PostgreSQL Port](#accessing-postgresql-port)
+- [Clean and Rebuild DB from latest image](#clean-and-rebuild-db-from-latest-image)
+- [Clean all](#clean-all)
+- [Updating an older environment](#updating-an-older-environment)
+- [Notes / Troubleshooting](#notes--troubleshooting)
+
 ## Getting started
 
 1. [Set up Docker](https://docs.docker.com/get-started/) on your preferred platform. On Windows, it is highly recommended to use the [WSL 2 *(Windows Subsystem for Linux)*](https://docs.docker.com/desktop/windows/wsl/) backend.
 
+> [!IMPORTANT]  
 > See the [IETF Tools Windows Dev guide](https://github.com/ietf-tools/.github/blob/main/docs/windows-dev.md) on how to get started when using Windows.
 
-2. On Linux, you must also install [Docker Compose](https://docs.docker.com/compose/install/). Docker Desktop for Mac and Windows already include Docker Compose.
+2. On Linux, you must [install Docker Compose manually](https://docs.docker.com/compose/install/linux/#install-the-plugin-manually) and not install Docker Desktop. On Mac and Windows install Docker Desktop which already includes Docker Compose.
 
-2. If you have a copy of the datatracker code checked out already, simply `cd` to the top-level directory.
+3. If you have a copy of the datatracker code checked out already, simply `cd` to the top-level directory.
 
    If not, check out a datatracker branch as usual. We'll check out `main` below, but you can use any branch:
 
@@ -18,7 +32,7 @@
     git checkout main
     ```
 
-3. Follow the instructions for your preferred editor:
+4. Follow the instructions for your preferred editor:
     - [Visual Studio Code](#using-visual-studio-code)
     - [Other Editors / Generic](#using-other-editors--generic)
 
@@ -27,9 +41,11 @@
 This project includes a devcontainer configuration which automates the setup of the development environment with all the required dependencies.
 
 ### Initial Setup
-        
+
 1. Launch [VS Code](https://code.visualstudio.com/)
-2. Under the **Extensions** tab, ensure you have the **Remote - Containers** ([ms-vscode-remote.remote-containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)) extension installed. On Windows, you also need the **Remote - WSL** ([ms-vscode-remote.remote-wsl](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl)) extension to take advantage of the WSL 2 *(Windows Subsystem for Linux)* native integration.
+2. Under the **Extensions** tab, ensure you have the **Dev Containers** ([ms-vscode-remote.remote-containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)) extension installed.
+  * On Linux, note that the Snap installation of VS Code is [incompatible with this plugin](https://code.visualstudio.com/docs/devcontainers/containers#_system-requirements:~:text=snap%20package%20is%20not%20supported). 
+  * On Windows, you also need the **WSL** ([ms-vscode-remote.remote-wsl](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl)) extension to take advantage of the WSL 2 *(Windows Subsystem for Linux)* native integration.
 2. Open the top-level directory of the datatracker code you fetched above.
 3. A prompt inviting you to reopen the project in containers will appear in the bottom-right corner. Click the **Reopen in Container** button. If you missed the prompt, you can press `F1`, start typing `reopen in container` task and launch it.
 4. VS Code will relaunch in the dev environment and create the containers automatically.
@@ -43,9 +59,9 @@ You can also open the datatracker project folder and click the **Reopen in conta
 
 ### Usage
 
-- Under the **Run and Debug** tab, you can run the server with the debugger attached using **Run Server** (F5). Once the server is ready to accept connections, you'll be prompted to open in a browser. You can also open [http://localhost:8000](http://localhost:8000) in a browser.
-    
-    > An alternate profile **Run Server with Debug Toolbar** is also available from the dropdown menu, which displays various tools 
+- Under the **Run and Debug** tab, you can run the server with the debugger attached using **Run Server** (F5). Once the server is ready to accept connections, you'll be prompted to open in a browser. Navigate to [http://localhost:8000](http://localhost:8000) in your preferred browser.
+
+    > An alternate profile **Run Server with Debug Toolbar** is also available from the dropdown menu, which displays various tools
     on top of the webpage. However, note that this configuration has a significant performance impact.
 
     To add a **Breakpoint**, simply click to the left of the line gutter you wish to stop at. You can also add **Conditional Breakpoints** and **Logpoint** by right-clicking at the same location.
@@ -62,11 +78,7 @@ You can also open the datatracker project folder and click the **Reopen in conta
 
     ![](assets/vscode-terminal-new.png)
 
-- Under the **SQL Tools** tab, a connection **Local Dev** is preconfigured to connect to the DB container. Using this tool, you can list tables, view records and execute SQL queries directly from VS Code.
-
-    > The port `3306` is also exposed to the host automatically, should you prefer to use your own SQL tool.
-
-    ![](assets/vscode-sqltools.png)
+- The pgAdmin web interface, a PostgreSQL DB browser / management UI, is available at [http://localhost:8000/pgadmin/](http://localhost:8000/pgadmin/).
 
 - Under the **Task Explorer** tab, a list of available preconfigured tasks is displayed. *(You may need to expand the tree to `src > vscode` to see it.)* These are common scritps you can run *(e.g. run tests, fetch assets, etc.)*.
 
@@ -85,11 +97,10 @@ You can also open the datatracker project folder and click the **Reopen in conta
     On Linux / macOS:
 
     ```sh
-    cd docker
-    ./run
+    ./docker/run # or whatever path you need
     ```
-    
-    > Note that you can pass the `-r` flag to `./run` to force a rebuild of the containers. This is useful if you switched branches and that the existing containers still contain configurations from the old branch. You should also use this if you don't regularly keep up with main and your containers reflect a much older version of the branch.
+
+    > Note that you can pass the `-r` flag to `run` to force a rebuild of the containers. This is useful if you switched branches and that the existing containers still contain configurations from the old branch. You should also use this if you don't regularly keep up with main and your containers reflect a much older version of the branch.
 
     On Windows *(using Powershell)*:
     ```sh
@@ -102,7 +113,7 @@ You can also open the datatracker project folder and click the **Reopen in conta
 2. Wait for the containers to initialize. Upon completion, you will be dropped into a shell from which you can start the datatracker and execute related commands as usual, for example
 
     ```
-    ietf/manage.py runserver 0.0.0.0:8000
+    ietf/manage.py runserver 8001
     ```
 
     to start the datatracker.
@@ -125,7 +136,14 @@ docker compose down
 
 to terminate the containers.
 
-### Clean and Rebuild DB from latest image
+### Accessing PostgreSQL Port
+
+The port is exposed but not automatically mapped to `5432` to avoid potential conflicts with the host. To get the mapped port, run the command *(from the project `/docker` directory)*:
+```sh
+docker compose port db 5432
+```
+
+## Clean and Rebuild DB from latest image
 
 To delete the active DB container, its volume and get the latest image / DB dump, simply run the following command:
 
@@ -143,7 +161,7 @@ docker compose pull db
 docker compose build --no-cache db
 ```
 
-### Clean all
+## Clean all
 
 To delete all containers for this project, its associated images and purge any remaining dangling images, simply run the following command:
 
@@ -157,14 +175,22 @@ cd docker
 On Windows:
 ```sh
 docker compose down -v --rmi all
-docker image prune 
+docker image prune
 ```
 
-### Accessing MariaDB Port
+## Updating an older environment
+
+If you already have a clone, such as from a previous codesprint, and are updating that clone, before starting the datatracker from the updated image:
+1. `rm ietf/settings_local.py` *(The startup script will put a new one, appropriate to the current release, in place)*
+1. Execute the [Clean all](#clean-all) sequence above.
+
+If the dev environment fails to start, even after running the [Clean all](#clean-all) sequence above, you can fully purge all docker cache, containers, images and volumes by running the command below.
+
+> [!CAUTION]
+> Note that this will delete everything docker-related, including non-datatracker docker resources you might have.
 
-The port is exposed but not mapped to `3306` to avoid potential conflicts with the host. To get the mapped port, run the command *(from the project `/docker` directory)*:
 ```sh
-docker compose port db 3306
+docker system prune -a --volumes
 ```
 
 ## Notes / Troubleshooting
@@ -186,3 +212,17 @@ The content of the source files will be copied into the target `.ics` files. Mak
 ### Missing assets in the data folder
 
 Because including all assets in the image would significantly increase the file size, they are not included by default. You can however fetch them by running the **Fetch assets via rsync** task in VS Code or run manually the script `docker/scripts/app-rsync-extras.sh`
+
+### Linux file permissions leaking to the host system
+
+If on the host filesystem you have permissions that look like this,
+
+```bash
+$ ls -la
+total 4624
+drwxrwxr-x   2  100999  100999    4096 May 25 07:56 bin
+drwxrwxr-x   5  100999  100999    4096 May 25 07:56 client
+(etc...)
+```
+
+Try uninstalling Docker Desktop and installing Docker Compose manually. The Docker Compose bundled with Docker Desktop is incompatible with our software. See also [Rootless Docker: file ownership changes #3343](https://github.com/lando/lando/issues/3343), [Docker context desktop-linux has container permission issues #75](https://github.com/docker/desktop-linux/issues/75).
diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile
index 6d539b1a56..dd4cf72ffd 100644
--- a/docker/app.Dockerfile
+++ b/docker/app.Dockerfile
@@ -9,6 +9,7 @@ ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 COPY docker/scripts/app-setup-debian.sh /tmp/library-scripts/docker-setup-debian.sh
 RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-debian.sh && chmod +x /tmp/library-scripts/docker-setup-debian.sh
+
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
     && apt-get purge -y imagemagick imagemagick-6-common \
@@ -24,12 +25,21 @@ COPY docker/scripts/app-setup-python.sh /tmp/library-scripts/docker-setup-python
 RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-python.sh && chmod +x /tmp/library-scripts/docker-setup-python.sh
 RUN bash /tmp/library-scripts/docker-setup-python.sh "none" "/usr/local" "${PIPX_HOME}" "${USERNAME}"
 
+# Setup nginx
+COPY docker/scripts/app-setup-nginx.sh /tmp/library-scripts/docker-setup-nginx.sh
+RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-nginx.sh && chmod +x /tmp/library-scripts/docker-setup-nginx.sh
+RUN bash /tmp/library-scripts/docker-setup-nginx.sh
+COPY docker/configs/nginx-proxy.conf /etc/nginx/sites-available/default
+COPY docker/configs/nginx-502.html /var/www/html/502.html
+
 # Remove library scripts for final image
 RUN rm -rf /tmp/library-scripts
 
 # Copy the startup file
 COPY docker/scripts/app-init.sh /docker-init.sh
-RUN sed -i 's/\r$//' /docker-init.sh && chmod +x /docker-init.sh
+COPY docker/scripts/app-start.sh /docker-start.sh
+RUN sed -i 's/\r$//' /docker-init.sh && chmod +rx /docker-init.sh
+RUN sed -i 's/\r$//' /docker-start.sh && chmod +rx /docker-start.sh
 
 # Fix user UID / GID to match host
 RUN groupmod --gid $USER_GID $USERNAME \
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index 97604e62f9..2501636049 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -1,132 +1,159 @@
-FROM python:3.9-bullseye
-LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Update system packages
-RUN apt-get update \
-    && apt-get -qy upgrade \
-    && apt-get -y install --no-install-recommends apt-utils dialog 2>&1
-
-# Add Node.js Source
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
-
-# Add Docker Source
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
-    $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-
-# Install the packages we need
-RUN apt-get update --fix-missing && apt-get install -qy \
-	apache2-utils \
-	apt-file \
-	bash \
-	build-essential \
-	curl \
-    default-jdk \
-    docker-ce-cli \
-	enscript \
-	gawk \
-    g++ \
-	gcc \
-	ghostscript \
-	git \
-	gnupg \
-	jq \
-	less \
-    libcairo2-dev \
-    libgtk2.0-0 \
-    libgtk-3-0 \
-    libnotify-dev \
-    libgconf-2-4 \
-    libgbm-dev \
-    libnss3 \
-    libxss1 \
-    libasound2 \
-    libxtst6 \
-	libmagic-dev \
-	libmariadb-dev \
-    libmemcached-tools \
-	locales \
-    make \
-	mariadb-client \
-    memcached \
-    nano \
-    netcat \
-    nodejs \
-	pigz \
-	pv \
-	python3-ipython \
-	ripgrep \
-	rsync \
-	rsyslog \
-    ruby \
-    ruby-rubygems \
-	unzip \
-	wget \
-    xauth \
-    xvfb \
-    yang-tools \
-    zsh
-
-# Install kramdown-rfc2629 (ruby)
-RUN gem install kramdown-rfc2629
-
-# Install chromedriver
-COPY docker/scripts/app-install-chromedriver.sh /tmp/app-install-chromedriver.sh
-RUN sed -i 's/\r$//' /tmp/app-install-chromedriver.sh && \
-    chmod +x /tmp/app-install-chromedriver.sh
-RUN /tmp/app-install-chromedriver.sh
-
-# Fix /dev/shm permissions for chromedriver
-RUN chmod 1777 /dev/shm
-
-# Activate Yarn
-RUN corepack enable
-
-# Get rid of installation files we don't need in the image, to reduce size
-RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
-
-# "fake" dbus address to prevent errors
-# https://github.com/SeleniumHQ/docker-selenium/issues/87
-ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
-
-# avoid million NPM install messages
-ENV npm_config_loglevel warn
-# allow installing when the main user is root
-ENV npm_config_unsafe_perm true
-# disable NPM funding messages
-ENV npm_config_fund false
-
-# Set locale to en_US.UTF-8
-RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment && \
-    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
-    echo "LANG=en_US.UTF-8" > /etc/locale.conf && \
-    dpkg-reconfigure locales && \
-    locale-gen en_US.UTF-8 && \
-    update-locale LC_ALL en_US.UTF-8
-ENV LC_ALL en_US.UTF-8
-
-# Install idnits
-ADD https://raw.githubusercontent.com/ietf-tools/idnits-mirror/main/idnits /usr/local/bin/
-RUN chmod +rx /usr/local/bin/idnits
-
-# Turn off rsyslog kernel logging (doesn't work in Docker)
-RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
-
-# Colorize the bash shell
-RUN sed -i 's/#force_color_prompt=/force_color_prompt=/' /root/.bashrc
-
-# Turn off rsyslog kernel logging (doesn't work in Docker)
-RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
-
-# Fetch wait-for utility
-ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/
-RUN chmod +rx /usr/local/bin/wait-for
-
-# Create assets directory
-RUN mkdir -p /assets
-
-# Create workspace
-RUN mkdir -p /workspace
-WORKDIR /workspace
+FROM python:3.12-bookworm
+LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV NODE_MAJOR=16
+
+# Update system packages
+RUN apt-get update \
+    && apt-get -qy upgrade \
+    && apt-get -y install --no-install-recommends apt-utils dialog 2>&1
+
+# Add Node.js Source
+RUN apt-get install -y --no-install-recommends ca-certificates curl gnupg \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN echo "Package: nodejs" >> /etc/apt/preferences.d/preferences \
+    && echo "Pin: origin deb.nodesource.com" >> /etc/apt/preferences.d/preferences \
+    && echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/preferences
+
+# Add Docker Source
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker-archive-keyring.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list
+
+# Add PostgreSQL Source
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/apt.postgresql.org.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/apt.postgresql.org.gpg] https://apt.postgresql.org/pub/repos/apt $(. /etc/os-release && echo "$VERSION_CODENAME")-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
+
+# Install the packages we need
+RUN apt-get update --fix-missing && apt-get install -qy --no-install-recommends \
+	apache2-utils \
+	apt-file \
+	bash \
+	build-essential \
+	curl \
+	default-jdk \
+	docker-ce-cli \
+	enscript \
+	firefox-esr \
+	gawk \
+	g++ \
+	gcc \
+	ghostscript \
+	git \
+	gnupg \
+	jq \
+	less \
+	libcairo2-dev \
+	libgtk2.0-0 \
+	libgtk-3-0 \
+	libnotify-dev \
+	libgconf-2-4 \
+	libgbm-dev \
+	libnss3 \
+	libxss1 \
+	libasound2 \
+	libxtst6 \
+	libmagic-dev \
+	libmariadb-dev \
+	libmemcached-tools \
+	libyang2-tools \
+	locales \
+	make \
+	mariadb-client \
+	memcached \
+	nano \
+	netcat-traditional \
+	nodejs \
+	pgloader \
+	pigz \
+	postgresql-client-17 \
+	pv \
+	python3-ipython \
+	ripgrep \
+	rsync \
+	rsyslog \
+	ruby \
+	ruby-rubygems \
+	unzip \
+	wget \
+	xauth \
+	xvfb \
+	zsh
+
+# Install kramdown-rfc2629 (ruby)
+RUN gem install kramdown-rfc2629
+
+# GeckoDriver
+ARG GECKODRIVER_VERSION=latest
+RUN GK_VERSION=$(if [ ${GECKODRIVER_VERSION:-latest} = "latest" ]; then echo "0.34.0"; else echo $GECKODRIVER_VERSION; fi) \
+  && echo "Using GeckoDriver version: "$GK_VERSION \
+  && wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GK_VERSION/geckodriver-v$GK_VERSION-linux64.tar.gz \
+  && rm -rf /opt/geckodriver \
+  && tar -C /opt -zxf /tmp/geckodriver.tar.gz \
+  && rm /tmp/geckodriver.tar.gz \
+  && mv /opt/geckodriver /opt/geckodriver-$GK_VERSION \
+  && chmod 755 /opt/geckodriver-$GK_VERSION \
+  && ln -fs /opt/geckodriver-$GK_VERSION /usr/bin/geckodriver
+
+# Activate Yarn
+RUN corepack enable
+
+# Get rid of installation files we don't need in the image, to reduce size
+RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+# "fake" dbus address to prevent errors
+# https://github.com/SeleniumHQ/docker-selenium/issues/87
+ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
+
+# avoid million NPM install messages
+ENV npm_config_loglevel=warn
+# allow installing when the main user is root
+ENV npm_config_unsafe_perm=true
+# disable NPM funding messages
+ENV npm_config_fund=false
+
+# Set locale to en_US.UTF-8
+RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment && \
+    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
+    echo "LANG=en_US.UTF-8" > /etc/locale.conf && \
+    dpkg-reconfigure locales && \
+    locale-gen en_US.UTF-8 && \
+    update-locale LC_ALL en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+
+# Install idnits
+ADD https://raw.githubusercontent.com/ietf-tools/idnits-mirror/main/idnits /usr/local/bin/
+RUN chmod +rx /usr/local/bin/idnits
+
+# Install required fonts
+RUN mkdir -p /tmp/fonts && \
+    wget -q -O /tmp/fonts.tar.gz https://github.com/ietf-tools/xml2rfc-fonts/archive/refs/tags/3.22.0.tar.gz && \
+    tar zxf /tmp/fonts.tar.gz -C /tmp/fonts && \
+    mv /tmp/fonts/*/noto/* /usr/local/share/fonts/ && \
+    mv /tmp/fonts/*/roboto_mono/* /usr/local/share/fonts/ && \
+    rm -rf /tmp/fonts.tar.gz /tmp/fonts/ && \
+    fc-cache -f
+
+# Turn off rsyslog kernel logging (doesn't work in Docker)
+RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
+
+# Colorize the bash shell
+RUN sed -i 's/#force_color_prompt=/force_color_prompt=/' /root/.bashrc
+
+# Turn off rsyslog kernel logging (doesn't work in Docker)
+RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
+
+# Fetch wait-for utility
+ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/
+RUN chmod +rx /usr/local/bin/wait-for
+
+# Create assets directory
+RUN mkdir -p /assets
+
+# Create workspace
+RUN mkdir -p /workspace
+WORKDIR /workspace
diff --git a/docker/celery.Dockerfile b/docker/celery.Dockerfile
new file mode 100644
index 0000000000..e93ca3cf77
--- /dev/null
+++ b/docker/celery.Dockerfile
@@ -0,0 +1,55 @@
+FROM ghcr.io/ietf-tools/datatracker-app-base:latest
+LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install needed packages and setup non-root user.
+ARG USERNAME=dev
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+COPY docker/scripts/app-setup-debian.sh /tmp/library-scripts/docker-setup-debian.sh
+RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-debian.sh && chmod +x /tmp/library-scripts/docker-setup-debian.sh
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
+    && apt-get purge -y imagemagick imagemagick-6-common \
+    # Install common packages, non-root user
+    # Syntax: ./docker-setup-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag] [install Oh My Zsh! flag] [Add non-free packages]
+    && bash /tmp/library-scripts/docker-setup-debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "false" "true" "true"
+
+# Setup default python tools in a venv via pipx to avoid conflicts
+ENV PIPX_HOME=/usr/local/py-utils \
+    PIPX_BIN_DIR=/usr/local/py-utils/bin
+ENV PATH=${PATH}:${PIPX_BIN_DIR}
+COPY docker/scripts/app-setup-python.sh /tmp/library-scripts/docker-setup-python.sh
+RUN sed -i 's/\r$//' /tmp/library-scripts/docker-setup-python.sh && chmod +x /tmp/library-scripts/docker-setup-python.sh
+RUN bash /tmp/library-scripts/docker-setup-python.sh "none" "/usr/local" "${PIPX_HOME}" "${USERNAME}"
+
+# Remove library scripts for final image
+RUN rm -rf /tmp/library-scripts
+
+# Copy the startup file
+COPY docker/scripts/app-init-celery.sh /docker-init.sh
+RUN sed -i 's/\r$//' /docker-init.sh && \
+    chmod +x /docker-init.sh
+
+ENTRYPOINT [ "/docker-init.sh" ]
+
+# Fix user UID / GID to match host
+RUN groupmod --gid $USER_GID $USERNAME \
+    && usermod --uid $USER_UID --gid $USER_GID $USERNAME \
+    && chown -R $USER_UID:$USER_GID /home/$USERNAME \
+    || exit 0
+
+# Switch to local dev user
+USER dev:dev
+
+# Install current datatracker python dependencies
+COPY requirements.txt /tmp/pip-tmp/
+RUN pip3 --disable-pip-version-check --no-cache-dir install --user --no-warn-script-location -r /tmp/pip-tmp/requirements.txt
+RUN pip3 --disable-pip-version-check --no-cache-dir install --user --no-warn-script-location watchdog[watchmedo]
+
+RUN sudo rm -rf /tmp/pip-tmp
+
+VOLUME [ "/assets" ]
+
diff --git a/docker/cleanall b/docker/cleanall
index 91eac1764b..c6104aaef9 100755
--- a/docker/cleanall
+++ b/docker/cleanall
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if test $(basename $PWD ) != "docker"
+then
+    echo "Run this from the docker directory" 1>&2
+    exit 1
+fi
+
 read -p "Stop and remove all containers, volumes and images for this project? [y/N] " -n 1 -r
 echo 
 if [[ $REPLY =~ ^[Yy]$ ]]
@@ -7,6 +13,5 @@ then
     cd ..
     echo "Shutting down any instance still running and purge images..."
     docker compose down -v --rmi all
-    cd docker
     echo "Done!"
 fi
diff --git a/docker/cleandb b/docker/cleandb
index f772ebce39..c881503eae 100755
--- a/docker/cleandb
+++ b/docker/cleandb
@@ -1,13 +1,19 @@
 #!/bin/bash
 
+if test $(basename $PWD ) != "docker"
+then
+    echo "Run this from the docker directory" 1>&2
+    exit 1
+fi
+
 cd ..
 echo "Shutting down any instance still running..."
 docker compose down
 echo "Removing DB volume..."
 PROJNAME=$(basename $PWD)
-docker volume rm -f "${PROJNAME}_mariadb-data"
+docker volume rm -f "${PROJNAME}_postgresdb-data"
 echo "Rebuilding the DB image..."
 docker compose pull db
 docker compose build --no-cache db
-cd docker
+
 echo "Done!"
diff --git a/docker/configs/nginx-502.html b/docker/configs/nginx-502.html
new file mode 100644
index 0000000000..b5577d3e17
--- /dev/null
+++ b/docker/configs/nginx-502.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Datatracker DEV</title>
+        <style>
+            body {
+                background-color: #111;
+                color: #FFF;
+                font-family: Arial, Helvetica, sans-serif;
+                text-align: center;
+                padding: 50px;
+                font-size: 16px;
+            }
+            img {
+                height: 80px;
+            }
+            h1 {
+                color: #CCC;
+            }
+            div {
+                background-color: #222;
+                border-radius: 10px;
+                padding: 10px 50px;
+            }
+            i {
+                font-size: 64px;
+                line-height: 16px;
+                vertical-align: text-bottom;
+                margin-right: 5px;
+            }
+            code {
+                background-color: #444;
+                padding: 3px 6px;
+                border-radius: 5px;
+                margin: 0 5px;
+            }
+            .mt {
+                margin-top: 15px;
+            }
+            a {
+                color: #31CCEC;
+            }
+        </style>
+    </head>
+    <body>
+        <img src="/_static/logos/ietf-inverted.svg" alt="IETF" />
+        <h1>Datatracker</h1>
+        <h2>Could not connect to dev server.</h2>
+        <div>
+            <p>Is the datatracker server running?</p>
+            <p class="mt">Using <strong>VS Code</strong>, open the <strong>Run and Debug</strong> tab on the left and click the <i>&#x2023;</i> symbol (Run Server) to start the server.</p>
+            <p>Otherwise, run the command <code>ietf/manage.py runserver 8001</code> from the terminal.</p>
+        </div>
+        <div class="mt">
+            <p>You can manage the database at <a href="/pgadmin">/pgadmin</a>.</p>
+        </div>
+        <p class="mt">For more information, check out the <a href="https://github.com/ietf-tools/datatracker/blob/main/docker/README.md" target="_blank">Datatracker Development in Docker</a> guide.</p>
+    </body>
+</html>
diff --git a/docker/configs/nginx-proxy.conf b/docker/configs/nginx-proxy.conf
new file mode 100644
index 0000000000..5a9ae31ad0
--- /dev/null
+++ b/docker/configs/nginx-proxy.conf
@@ -0,0 +1,35 @@
+server {
+    listen 8000 default_server;
+    listen [::]:8000 default_server;
+
+    proxy_read_timeout 1d;
+    proxy_send_timeout 1d;
+    client_max_body_size 0;  # disable checking
+    
+    root /var/www/html;
+    index index.html index.htm index.nginx-debian.html;
+
+    server_name _;
+
+    location /_static/ {
+        proxy_pass http://static/;
+    }
+
+    location /pgadmin/ {
+        proxy_set_header X-Script-Name /pgadmin;
+        proxy_set_header Host $host;
+        proxy_pass http://pgadmin;
+        proxy_redirect off;
+    }
+
+    location / {
+        error_page 502 /502.html;
+        proxy_pass http://localhost:8001/;
+        proxy_set_header Host localhost:8000;
+    }
+
+    location /502.html {
+        root /var/www/html;
+        internal;
+    }
+}
diff --git a/docker/configs/pgadmin-servers.json b/docker/configs/pgadmin-servers.json
new file mode 100644
index 0000000000..b4458af923
--- /dev/null
+++ b/docker/configs/pgadmin-servers.json
@@ -0,0 +1,22 @@
+{
+  "Servers": {
+      "1": {
+          "Name": "Local Dev",
+          "Group": "Servers",
+          "Host": "db",
+          "Port": 5432,
+          "MaintenanceDB": "postgres",
+          "Username": "django",
+          "UseSSHTunnel": 0,
+          "TunnelPort": "22",
+          "TunnelAuthentication": 0,
+          "KerberosAuthentication": false,
+          "ConnectionParameters": {
+              "sslmode": "prefer",
+              "connect_timeout": 10,
+              "sslcert": "<STORAGE_DIR>/.postgresql/postgresql.crt",
+              "sslkey": "<STORAGE_DIR>/.postgresql/postgresql.key"
+          }
+      }
+  }
+}
diff --git a/docker/configs/settings_local.py b/docker/configs/settings_local.py
index 2b3d541387..94adc516a4 100644
--- a/docker/configs/settings_local.py
+++ b/docker/configs/settings_local.py
@@ -1,35 +1,30 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2007-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-from ietf.settings import *                                          # pyflakes:ignore
+from ietf.settings import *  # pyflakes:ignore
+from ietf.settings import (
+    ARTIFACT_STORAGE_NAMES,
+    STORAGES,
+    BLOBSTORAGE_MAX_ATTEMPTS,
+    BLOBSTORAGE_READ_TIMEOUT,
+    BLOBSTORAGE_CONNECT_TIMEOUT,
+)
 
 ALLOWED_HOSTS = ['*']
 
-DATABASES = {
-    'default': {
-        'HOST': 'db',
-        'PORT': 3306,
-        'NAME': 'ietf_utf8',
-        'ENGINE': 'django.db.backends.mysql',
-        'USER': 'django',
-        'PASSWORD': 'RkTkDPFnKpko',
-        'OPTIONS': {
-            'sql_mode': 'STRICT_TRANS_TABLES',
-            'init_command': 'SET storage_engine=InnoDB; SET names "utf8"',
-        },
-    },
-}
-
-DATABASE_TEST_OPTIONS = {
-    'init_command': 'SET storage_engine=InnoDB',
+from ietf.settings_postgresqldb import DATABASES  # pyflakes:ignore
+DATABASE_ROUTERS = ["ietf.blobdb.routers.BlobdbStorageRouter"]
+BLOBDB_DATABASE = "blobdb"
+BLOBDB_REPLICATION = {
+    "ENABLED": True,
+    "DEST_STORAGE_PATTERN": "r2-{bucket}",
+    "INCLUDE_BUCKETS": ARTIFACT_STORAGE_NAMES,
+    "EXCLUDE_BUCKETS": ["staging"],
+    "VERBOSE_LOGGING": True,
 }
 
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
-IDSUBMIT_REPOSITORY_PATH = "test/id/"
-IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
+IDSUBMIT_STAGING_PATH = "/assets/www6s/staging/"
 
 AGENDA_PATH = '/assets/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH
@@ -47,30 +42,81 @@
 
 SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/'
 SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/'
-SUBMIT_YANG_INVAL_MODEL_DIR = '/assets/ietf-ftp/yang/invalmod/'
 SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/'
 SUBMIT_YANG_RFC_MODEL_DIR   = '/assets/ietf-ftp/yang/rfcmod/'
 
 # Set INTERNAL_IPS for use within Docker. See https://knasmueller.net/fix-djangos-debug-toolbar-not-showing-inside-docker
 import socket
 hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
-INTERNAL_IPS = [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
+INTERNAL_IPS = [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips] + ['127.0.0.1']
 
 # DEV_TEMPLATE_CONTEXT_PROCESSORS = [
 #    'ietf.context_processors.sql_debug',
 # ]
 
-DOCUMENT_PATH_PATTERN = '/assets/ietf-ftp/{doc.type_id}/'
+DOCUMENT_PATH_PATTERN = '/assets/ietfdata/doc/{doc.type_id}/'
 INTERNET_DRAFT_PATH = '/assets/ietf-ftp/internet-drafts/'
 RFC_PATH = '/assets/ietf-ftp/rfc/'
 CHARTER_PATH = '/assets/ietf-ftp/charter/'
 BOFREQ_PATH = '/assets/ietf-ftp/bofreq/'
 CONFLICT_REVIEW_PATH = '/assets/ietf-ftp/conflict-reviews/'
 STATUS_CHANGE_PATH = '/assets/ietf-ftp/status-changes/'
-INTERNET_DRAFT_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/ietf-ftp/internet-drafts/'
+INTERNET_DRAFT_ARCHIVE_DIR = '/assets/collection/draft-archive'
+INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/assets/archive/id'
+BIBXML_BASE_PATH = '/assets/ietfdata/derived/bibxml'
+IDSUBMIT_REPOSITORY_PATH = INTERNET_DRAFT_PATH
+FTP_DIR = '/assets/ftp'
+NFS_METRICS_TMP_DIR = '/assets/tmp'
 
 NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
-SLIDE_STAGING_PATH = 'test/staging/'
+SLIDE_STAGING_PATH = '/assets/www6s/staging/'
 
 DE_GFM_BINARY = '/usr/local/bin/de-gfm'
+
+STATIC_IETF_ORG = "/_static"
+STATIC_IETF_ORG_INTERNAL = "http://static"
+
+
+# Blob replication storage for dev
+import botocore.config
+for storagename in ARTIFACT_STORAGE_NAMES:
+    replica_storagename = f"r2-{storagename}"
+    STORAGES[replica_storagename] = {
+        "BACKEND": "ietf.doc.storage.MetadataS3Storage",
+        "OPTIONS": dict(
+            endpoint_url="http://blobstore:9000",
+            access_key="minio_root",
+            secret_key="minio_pass",
+            security_token=None,
+            client_config=botocore.config.Config(
+                request_checksum_calculation="when_required",
+                response_checksum_validation="when_required",
+                signature_version="s3v4",
+                connect_timeout=BLOBSTORAGE_CONNECT_TIMEOUT,
+                read_timeout=BLOBSTORAGE_READ_TIMEOUT,
+                retries={"total_max_attempts": BLOBSTORAGE_MAX_ATTEMPTS},
+            ),
+            verify=False,
+            bucket_name=f"{storagename}",
+        ),
+    }
+
+# For dev on rfc-index generation, create a red_bucket/ directory in the project root
+# and uncomment these settings. Generated files will appear in this directory. To
+# generate an accurate index, put up-to-date copies of unusable-rfc-numbers.json,
+# april-first-rfc-numbers.json, and publication-std-levels.json in this directory
+# before generating the index.
+#
+# STORAGES["red_bucket"] = {
+#     "BACKEND": "django.core.files.storage.FileSystemStorage",
+#     "OPTIONS": {"location": "red_bucket"},
+# }
+
+APP_API_TOKENS = {
+    "ietf.api.red_api" : ["devtoken", "redtoken"],  # Not a real secret
+    "ietf.api.views_rpc" : ["devtoken"],  # Not a real secret
+}
+
+# Errata system api configuration
+ERRATA_METADATA_NOTIFICATION_URL = "http://host.docker.internal:8808/api/rfc_metadata_update/"
+ERRATA_METADATA_NOTIFICATION_API_KEY = "not a real secret"
diff --git a/docker/configs/settings_local_sqlitetest.py b/docker/configs/settings_local_sqlitetest.py
deleted file mode 100644
index 268fe6ec1d..0000000000
--- a/docker/configs/settings_local_sqlitetest.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright The IETF Trust 2010-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-# Standard settings except we use SQLite and skip migrations, this is
-# useful for speeding up tests that depend on the test database, try
-# for instance:
-#
-#   ./manage.py test --settings=settings_sqlitetest doc.ChangeStateTestCase
-#
-
-import os 
-from ietf.settings import *                                          # pyflakes:ignore
-from ietf.settings import TEST_CODE_COVERAGE_CHECKER
-import debug                            # pyflakes:ignore
-debug.debug = True
-
-# Workaround to avoid spending minutes stepping through the migrations in
-# every test run.  The result of this is to use the 'syncdb' way of creating
-# the test database instead of doing it through the migrations.  Taken from
-# https://gist.github.com/NotSqrt/5f3c76cd15e40ef62d09
-
-class DisableMigrations(object):
- 
-    def __contains__(self, item):
-        return True
- 
-    def __getitem__(self, item):
-        return None
-
-MIGRATION_MODULES = DisableMigrations()
-
-DATABASES = {
-    'default': {
-        'NAME': 'test.db',
-        'ENGINE': 'django.db.backends.sqlite3',
-        },
-    }
-
-if TEST_CODE_COVERAGE_CHECKER and not TEST_CODE_COVERAGE_CHECKER._started: # pyflakes:ignore
-    TEST_CODE_COVERAGE_CHECKER.start()                          # pyflakes:ignore
-
-NOMCOM_PUBLIC_KEYS_DIR=os.path.abspath("tmp-nomcom-public-keys-dir")
-
-# Undo any developer-dependent middleware when running the tests
-MIDDLEWARE = [ c for c in MIDDLEWARE if not c in DEV_MIDDLEWARE ] # pyflakes:ignore
-
-TEMPLATES[0]['OPTIONS']['context_processors'] = [ p for p in TEMPLATES[0]['OPTIONS']['context_processors'] if not p in DEV_TEMPLATE_CONTEXT_PROCESSORS ] # pyflakes:ignore
-
-REQUEST_PROFILE_STORE_ANONYMOUS_SESSIONS = False
-
-IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
-IDSUBMIT_REPOSITORY_PATH = "test/id/"
-IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
-
-AGENDA_PATH = '/assets/www6s/proceedings/'
-MEETINGHOST_LOGO_PATH = AGENDA_PATH
-
-USING_DEBUG_EMAIL_SERVER=True
-EMAIL_HOST='localhost'
-EMAIL_PORT=2025
-
-MEDIA_BASE_DIR = 'test'
-MEDIA_ROOT = MEDIA_BASE_DIR + '/media/'
-MEDIA_URL = '/media/'
-
-PHOTOS_DIRNAME = 'photo'
-PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME
-
-DOCUMENT_PATH_PATTERN = '/assets/ietf-ftp/{doc.type_id}/'
-
-SUBMIT_YANG_CATALOG_MODEL_DIR = '/assets/ietf-ftp/yang/catalogmod/'
-SUBMIT_YANG_DRAFT_MODEL_DIR = '/assets/ietf-ftp/yang/draftmod/'
-SUBMIT_YANG_INVAL_MODEL_DIR = '/assets/ietf-ftp/yang/invalmod/'
-SUBMIT_YANG_IANA_MODEL_DIR = '/assets/ietf-ftp/yang/ianamod/'
-SUBMIT_YANG_RFC_MODEL_DIR   = '/assets/ietf-ftp/yang/rfcmod/'
-
-DE_GFM_BINARY = '/usr/local/bin/de-gfm'
diff --git a/docker/configs/settings_local_vite.py b/docker/configs/settings_local_vite.py
index 7fb12a003d..9116905b12 100644
--- a/docker/configs/settings_local_vite.py
+++ b/docker/configs/settings_local_vite.py
@@ -2,5 +2,9 @@
 # -*- coding: utf-8 -*-
 
 from ietf.settings_local import *                  # pyflakes:ignore
+from ietf.settings_local import DJANGO_VITE
 
-DJANGO_VITE_DEV_MODE = True
+DJANGO_VITE["default"] |= {
+    "dev_mode": True,
+    "dev_server_port": 3000,
+}
diff --git a/docker/configs/settings_postgresqldb.py b/docker/configs/settings_postgresqldb.py
new file mode 100644
index 0000000000..9b98586658
--- /dev/null
+++ b/docker/configs/settings_postgresqldb.py
@@ -0,0 +1,18 @@
+DATABASES = {
+    'default': {
+        'HOST': 'db',
+        'PORT': 5432,
+        'NAME': 'datatracker',
+        'ENGINE': 'django.db.backends.postgresql',
+        'USER': 'django',
+        'PASSWORD': 'RkTkDPFnKpko',
+    },
+    'blobdb': {
+        'HOST': 'blobdb',
+        'PORT': 5432,
+        'NAME': 'blob',
+        'ENGINE': 'django.db.backends.postgresql',
+        'USER': 'dt',
+        'PASSWORD': 'abcd1234',
+    },
+}
diff --git a/docker/db.Dockerfile b/docker/db.Dockerfile
index 5f55401c76..48ab298780 100644
--- a/docker/db.Dockerfile
+++ b/docker/db.Dockerfile
@@ -1,32 +1,37 @@
 # =====================
 # --- Builder Stage ---
 # =====================
-FROM mariadb:10 AS builder
+FROM postgres:17 AS builder
 
-# That file does the DB initialization but also runs mysql daemon, by removing the last line it will only init
-RUN ["sed", "-i", "s/exec \"$@\"/echo \"not running $@\"/", "/usr/local/bin/docker-entrypoint.sh"]
+ENV POSTGRES_PASSWORD=hk2j22sfiv
+ENV POSTGRES_USER=django
+ENV POSTGRES_DB=datatracker
+ENV POSTGRES_HOST_AUTH_METHOD=trust
+ENV PGDATA=/data
 
-# needed for intialization
-ENV MARIADB_ROOT_PASSWORD=RkTkDPFnKpko
-ENV MARIADB_DATABASE=ietf_utf8
-ENV MARIADB_USER=django
-ENV MARIADB_PASSWORD=RkTkDPFnKpko
+COPY docker/scripts/db-load-default-extensions.sh /docker-entrypoint-initdb.d/
+COPY docker/scripts/db-import.sh /docker-entrypoint-initdb.d/
+COPY datatracker.dump /
 
-# Import the latest database dump
-ADD https://www.ietf.org/lib/dt/sprint/ietf_utf8.sql.gz /docker-entrypoint-initdb.d/
-RUN chmod 0777 /docker-entrypoint-initdb.d/ietf_utf8.sql.gz
-
-# Need to change the datadir to something else that /var/lib/mysql because the parent docker file defines it as a volume.
-# https://docs.docker.com/engine/reference/builder/#volume :
-#       Changing the volume from within the Dockerfile: If any build steps change the data within the volume after
-#       it has been declared, those changes will be discarded.
-RUN ["/usr/local/bin/docker-entrypoint.sh", "mysqld", "--datadir", "/initialized-db", "--aria-log-dir-path", "/initialized-db"]
+RUN ["sed", "-i", "s/exec \"$@\"/echo \"skipping...\"/", "/usr/local/bin/docker-entrypoint.sh"]
+RUN ["/usr/local/bin/docker-entrypoint.sh", "postgres"]
 
 # ===================
 # --- Final Image ---
 # ===================
-FROM mariadb:10
+FROM postgres:17
 LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
 
-# Copy the mysql data folder from the builder stage
-COPY --from=builder /initialized-db /var/lib/mysql
+COPY --from=builder /data $PGDATA
+
+ENV POSTGRES_PASSWORD=hk2j22sfiv
+ENV POSTGRES_USER=django
+ENV POSTGRES_DB=datatracker
+ENV POSTGRES_HOST_AUTH_METHOD=trust
+
+# build-args for db dump tagging - exposed in the environment and
+# in image metadata
+ARG datatracker_dumpinfo_date=""
+ENV DATATRACKER_DUMPINFO_DATE=$datatracker_dumpinfo_date
+ARG datatracker_snapshot=""
+ENV DATATRACKER_SNAPSHOT=$datatracker_snapshot
diff --git a/docker/devblobstore.Dockerfile b/docker/devblobstore.Dockerfile
new file mode 100644
index 0000000000..40bfbd0e96
--- /dev/null
+++ b/docker/devblobstore.Dockerfile
@@ -0,0 +1,9 @@
+ARG MINIO_VERSION=latest
+FROM quay.io/minio/minio:${MINIO_VERSION}
+LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
+
+ENV MINIO_ROOT_USER=minio_root
+ENV MINIO_ROOT_PASSWORD=minio_pass
+ENV MINIO_DEFAULT_BUCKETS=defaultbucket
+
+CMD ["server", "--console-address", ":9001", "/data"]
diff --git a/docker/docker-compose.celery.yml b/docker/docker-compose.celery.yml
deleted file mode 100644
index dedae2d004..0000000000
--- a/docker/docker-compose.celery.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-version: '2.4'
-# Use version 2.4 for mem_limit setting. Version 3+ uses deploy.resources.limits.memory
-# instead, but that only works for swarm with docker-compose 1.25.1.
-
-services:
-  mq:
-    image: rabbitmq:3-alpine
-    user: '${RABBITMQ_UID:-499:499}'
-    hostname: datatracker-mq
-#    deploy:
-#      resources:
-#        limits:
-#          memory: 1gb # coordinate with settings in rabbitmq.conf
-#        reservations:
-#          memory: 512mb
-    mem_limit: 1gb  # coordinate with settings in rabbitmq.conf
-    ports:
-      - '${MQ_PORT:-5672}:5672'
-    volumes:
-      - ./lib.rabbitmq:/var/lib/rabbitmq
-      - ./rabbitmq.conf:/etc/rabbitmq/conf.d/90-ietf.conf
-      - ./definitions.json:/ietf-conf/definitions.json
-    restart: unless-stopped
-    logging:
-      driver: "syslog"
-      options:
-        syslog-address: 'unixgram:///dev/log'
-        tag: 'docker/{{.Name}}'
-#        syslog-address: "tcp://ietfa.amsl.com:514"
-
-  celery:
-    image: ghcr.io/ietf-tools/datatracker-celery:latest
-    environment:
-      CELERY_APP: ietf
-      # UPDATE_REQUIREMENTS: 1  # uncomment to update Python requirements on startup
-    command:
-      - '--loglevel=INFO'
-    user: '${CELERY_UID:-499:499}'
-    volumes:
-      - '${DATATRACKER_PATH:-..}:/workspace'
-      - '${MYSQL_SOCKET_PATH:-/run/mysql}:/run/mysql'
-    depends_on:
-      - mq
-    network_mode: 'service:mq'
-    restart: unless-stopped
-    logging:
-      driver: "syslog"
-      options:
-        syslog-address: 'unixgram:///dev/log'
-        tag: 'docker/{{.Name}}'
-#        syslog-address: "tcp://ietfa.amsl.com:514"
diff --git a/docker/docker-compose.extend.yml b/docker/docker-compose.extend.yml
index 06e47bbb08..12ebe447d5 100644
--- a/docker/docker-compose.extend.yml
+++ b/docker/docker-compose.extend.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     app:
         ports:
@@ -14,7 +12,14 @@ services:
             - app-assets:/assets
     db:
         ports:
-            - '3306'
+            - '5432'
+    pgadmin:
+        ports:
+            - '5433'
+    blobstore:
+        ports:
+            - '9000:9000'
+            - '9001:9001'
     celery:
         volumes:
             - .:/workspace
diff --git a/docker/misc/build b/docker/misc/build
deleted file mode 100644
index b3cc97e52c..0000000000
--- a/docker/misc/build
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-version=0.20
-program=${0##*/}
-progdir=${0%/*}
-if [ "$progdir" = "$program" ]; then progdir="."; fi
-if [ "$progdir" = "." ]; then progdir="$PWD"; fi
-parent=$(dirname "$progdir")
-if [ "$parent" = "." ]; then parent="$PWD"; fi
-if [[ $(uname) =~ CYGWIN.* ]]; then parent=$(echo "$parent" | sed -e 's/^\/cygdrive\/\(.\)/\1:/'); fi
-
-
-function usage() {
-    cat <<EOF
-NAME
-	$program - Build the datatracker docker images
-
-SYNOPSIS
-	$program [OPTIONS]
-
-DESCRIPTION
-	This script builds a Ubuntu-based docker image that has been
-	set up with the dependencies needed to easily run the IETF
-	datatracker in development mode.  It uses docker/app.Dockerfile and
-    db.Dockerfile; i.e., the Dockerfiles in the same directory as this script.
-
-OPTIONS
-EOF
-    grep -E '^\s+-[a-zA-Z])' "$0" | sed -E -e 's/\)[^#]+#/ /'
-    cat <<EOF
-
-AUTHOR
-	Written by:
-        Henrik Levkowetz, <henrik@levkowetz.com>
-        Lars Eggert, <lars@eggert.org>
-
-COPYRIGHT
-	Copyright (c) 2016 IETF Trust and the persons identified as authors of
-	the code. All rights reserved. Redistribution and use in source and
-	binary forms, with or without modification, is permitted pursuant to,
-	and subject to the license terms contained in, the Revised BSD
-	License set forth in Section 4.c of the IETF Trust’s Legal Provisions
-	Relating to IETF Documents(https://trustee.ietf.org/license-info).
-
-EOF
-}
-
-
-function die() {
-    echo -e "\n$program: error: $*" >&2
-    exit 1
-}
-
-
-function version() {
-	echo -e "$program $version"
-}
-
-
-trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR
-
-# Default values
-IMAGE=ietf/datatracker-environment
-TAG=$(basename "$(svn info "$parent" | grep ^URL | awk '{print $2}' | tr -d '\r')")
-LOCAL=1
-
-# Option parsing
-shortopts=hut:V
-args=$(getopt -o$shortopts $*)
-if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi
-set -- $args
-
-while true ; do
-    case "$1" in
-    	-h)    usage; exit;;	# Show this help, then exit
-    	-u)    LOCAL=0;;		# Upload image to repository after build
-    	-t)    TAG=$2; shift;;	# Use this docker image tag
-    	-V)    version; exit;;	# Show program version, then exit
-    	--)    shift; break;;
-    	*) die "Internal error, inconsistent option specification: '$1'";;
-    esac
-    shift
-done
-
-# The program itself
-docker rmi -f $IMAGE:trunk 2>/dev/null || true
-docker build --progress plain -t "$IMAGE-app:$TAG" -f docker/app.Dockerfile .
-docker build --progress plain -t "$IMAGE-db:$TAG" -f docker/db.Dockerfile .
-docker tag "$(docker images -q $IMAGE-app | head -n 1)" $IMAGE-app:latest
-docker tag "$(docker images -q $IMAGE-db | head -n 1)" $IMAGE-db:latest
-if [ -z "$LOCAL" ]; then
-    docker push $IMAGE-app:latest
-    docker push "$IMAGE-app:$TAG"
-    docker push $IMAGE-db:latest
-    docker push "$IMAGE-db:$TAG"
-fi
\ No newline at end of file
diff --git a/docker/misc/copydb b/docker/misc/copydb
deleted file mode 100644
index 748189bd6a..0000000000
--- a/docker/misc/copydb
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-version=0.11
-program=${0##*/}
-progdir=${0%/*}
-if [ "$progdir" = "$program" ]; then progdir="."; fi
-if [ "$progdir" = "." ]; then progdir="$PWD"; fi
-parent=$(dirname "$progdir")
-if [ "$parent" = "." ]; then parent="$PWD"; fi
-if [[ $(uname) =~ CYGWIN.* ]]; then parent=$(echo "$parent" | sed -e 's/^\/cygdrive\/\(.\)/\1:/'); fi
-
-
-function usage() {
-    cat <<EOF
-NAME
-	$program - Make a tarball of the MySQL database files and upload it
-
-SYNOPSIS
-	$program [OPTIONS]
-
-DESCRIPTION
-	This script creates a compressed tarball from the MySQL database files
-	on disk, and uploads it to the ietf datatracker developer area on
-	www.ietf.org.
-
-	It is intended to be used with the docker datatracker environment, after
-	you have set up the database with docker/setupdb, started the docker
-	image with docker/run, and updated the database with docker/updatedb.
-
-	To use it, exit from the docker container, to make sure that mysqldb
-	isn't running and all the files consistent and available for copy.  Then
-	run docker/$program outside the docker container.  You need to have ssh
-	access to www.ietf.org in order for the scp command to succeed.
-
-OPTIONS
-EOF
-    grep -E '^\s+-[a-zA-Z])' "$0" | sed -E -e 's/\)[^#]+#/ /'
-    cat <<EOF
-
-AUTHOR
-	Written by:
-		Henrik Levkowetz, <henrik@levkowetz.com>
-		Lars Eggert, <lars@eggert.org>
-
-COPYRIGHT
-	Copyright (c) 2016 IETF Trust and the persons identified as authors of
-	the code. All rights reserved. Redistribution and use in source and
-	binary forms, with or without modification, is permitted pursuant to,
-	and subject to the license terms contained in, the Revised BSD
-	License set forth in Section 4.c of the IETF Trust’s Legal Provisions
-	Relating to IETF Documents(https://trustee.ietf.org/license-info).
-
-EOF
-}
-
-
-function die() {
-    echo -e "\n$program: error: $*" >&2
-    exit 1
-}
-
-
-function version() {
-	echo -e "$program $version"
-}
-
-
-trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR
-
-# Option parsing
-shortopts=hV
-args=$(getopt -o$shortopts $*)
-if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi
-set -- $args
-
-while true ; do
-    case "$1" in
-    	-h)    usage; exit;;		# Show this help, then exit
-    	-V)    version; exit;;		# Show program version, then exit
-    	--)    shift; break;;
-    	*) die "Internal error, inconsistent option specification: '$1'";;
-    esac
-    shift
-done
-
-# The program itself
-if [ -e "/.dockerenv" -o -n "$(grep -s '/docker/' /proc/self/cgroup)" ]; then
-   die "It looks as if you're running inside docker -- please quit docker first."
-fi
-
-workdir=$(realpath $progdir/../data/mysql/..)
-echo "Working directory: $workdir"
-cd $workdir
-echo "Building tarfile ..."
-tar cjf ietf_utf8.bin.tar.bz2 mysql
-echo "Copying tarfile to ietfa.amsl.com ..."
-scp ietf_utf8.bin.tar.bz2 ietfa.amsl.com:/a/www/www6s/lib/dt/sprint/
\ No newline at end of file
diff --git a/docker/run b/docker/run
index cc0a19941f..71e794aaa9 100755
--- a/docker/run
+++ b/docker/run
@@ -37,12 +37,22 @@ while getopts "hp:r" opt; do
     esac
 done
 
+# Ensure the run script is in our directory.
+dirname=$(dirname $0)
+if [ "$dirname" = "." -o "$dirname" = "" ] ; then
+    :
+else
+    echo "Changing to directory $dirname"
+    cd $dirname || exit 1
+fi
+
 # Remove mounted temp directories
 rm -rf .parcel-cache __pycache__
 
 # Create extended docker-compose definition
-cp docker-compose.extend.yml docker-compose.extend-custom.yml
-sed -i -r -e "s/CUSTOM_PORT/$CUSTOM_PORT/" docker-compose.extend-custom.yml
+sed -e "s/CUSTOM_PORT/$CUSTOM_PORT/" \
+	<docker-compose.extend.yml \
+	>docker-compose.extend-custom.yml
 cd ..
 
 # Set UID/GID mappings
diff --git a/docker/scripts/app-configure-blobstore.py b/docker/scripts/app-configure-blobstore.py
new file mode 100755
index 0000000000..9ae64e0041
--- /dev/null
+++ b/docker/scripts/app-configure-blobstore.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+import boto3
+import botocore.config
+import botocore.exceptions
+import os
+import sys
+
+from ietf.settings import ARTIFACT_STORAGE_NAMES
+
+
+def init_blobstore():
+    blobstore = boto3.resource(
+        "s3",
+        endpoint_url=os.environ.get("BLOB_STORE_ENDPOINT_URL", "http://blobstore:9000"),
+        aws_access_key_id=os.environ.get("BLOB_STORE_ACCESS_KEY", "minio_root"),
+        aws_secret_access_key=os.environ.get("BLOB_STORE_SECRET_KEY", "minio_pass"),
+        aws_session_token=None,
+        config=botocore.config.Config(
+            request_checksum_calculation="when_required",
+            response_checksum_validation="when_required",
+            signature_version="s3v4",
+        ),
+    )
+    for bucketname in ARTIFACT_STORAGE_NAMES:
+        adjusted_bucket_name = (
+            os.environ.get("BLOB_STORE_BUCKET_PREFIX", "")
+            + bucketname
+            + os.environ.get("BLOB_STORE_BUCKET_SUFFIX", "")
+        ).strip()
+        try:
+            blobstore.create_bucket(Bucket=adjusted_bucket_name)
+        except botocore.exceptions.ClientError as err:
+            if err.response["Error"]["Code"] == "BucketAlreadyExists":
+                print(f"Bucket {bucketname} already exists")
+            else:
+                print(f"Error creating {bucketname}: {err.response['Error']['Code']}")
+        else:
+            print(f"Bucket {bucketname} created")
+
+
+if __name__ == "__main__":
+    sys.exit(init_blobstore())
diff --git a/docker/scripts/app-create-dirs.sh b/docker/scripts/app-create-dirs.sh
index 807522e25b..3eb328a280 100755
--- a/docker/scripts/app-create-dirs.sh
+++ b/docker/scripts/app-create-dirs.sh
@@ -1,13 +1,9 @@
 #!/bin/bash
 
 for sub in \
-    test/id \
-    test/staging \
-    test/archive \
-    test/rfc \
-    test/media \
-    test/wiki/ietf \
-    data/nomcom_keys/public_keys \
+    /assets/archive/id \
+    /assets/collection \
+    /assets/collection/draft-archive \
     /assets/ietf-ftp \
     /assets/ietf-ftp/bofreq \
     /assets/ietf-ftp/charter \
@@ -20,6 +16,11 @@ for sub in \
     /assets/ietf-ftp/yang/ianamod \
     /assets/ietf-ftp/yang/invalmod \
     /assets/ietf-ftp/yang/rfcmod \
+    /assets/ietfdata \
+    /assets/ietfdata/derived \
+    /assets/ietfdata/derived/bibxml \
+    /assets/ietfdata/derived/bibxml/bibxml-ids \
+    /assets/ietfdata/doc/draft/repository \
     /assets/www6s \
     /assets/www6s/staging \
     /assets/www6s/wg-descriptions \
@@ -28,6 +29,11 @@ for sub in \
     /assets/www6/iesg \
     /assets/www6/iesg/evaluation \
     /assets/media/photo \
+    /assets/tmp \
+    /assets/ftp \
+    /assets/ftp/charter \
+    /assets/ftp/internet-drafts \
+    /assets/ftp/review \
     ; do
     if [ ! -d "$sub"  ]; then
         echo "Creating dir $sub"
diff --git a/docker/scripts/app-cypress.sh b/docker/scripts/app-cypress.sh
deleted file mode 100755
index 81e510592b..0000000000
--- a/docker/scripts/app-cypress.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-WORKSPACEDIR="/workspace"
-
-pushd .
-cd $WORKSPACEDIR
-
-echo "Starting datatracker server..."
-ietf/manage.py runserver 0.0.0.0:8000 --settings=settings_local > /dev/null 2>&1 &
-serverPID=$!
-
-echo "Waiting for server to come online ..."
-/usr/local/bin/wait-for localhost:8000 -- echo "Server ready"
-
-echo "Run dbus process to silence warnings..."
-sudo mkdir -p /run/dbus
-sudo dbus-daemon --system &> /dev/null
-
-echo "Starting JS tests..."
-yarn cypress
-
-kill $serverPID
-popd
diff --git a/docker/scripts/app-init-celery.sh b/docker/scripts/app-init-celery.sh
new file mode 100755
index 0000000000..17925633d2
--- /dev/null
+++ b/docker/scripts/app-init-celery.sh
@@ -0,0 +1,119 @@
+#!/bin/bash -e
+#
+# Environment parameters:
+#
+#   CELERY_APP - name of application to pass to celery (defaults to ietf)
+#
+#   CELERY_ROLE - 'worker' or 'beat' (defaults to 'worker')
+#
+#   CELERY_UID - numeric uid for the celery worker process
+#
+#   CELERY_GID - numeric gid for the celery worker process
+#
+#   UPDATES_REQUIREMENTS_FROM - path, relative to /workspace mount, to a pip requirements
+#       file that should be installed at container startup. Default is no package install/update.
+#
+#   DEBUG_TERM_TIMING - if non-empty, writes debug messages during shutdown after a TERM signal
+#
+#   DEV_MODE - if non-empty, restart celery worker on Python file change
+#
+WORKSPACEDIR="/workspace"
+CELERY_ROLE="${CELERY_ROLE:-worker}"
+
+cd "$WORKSPACEDIR" || exit 255
+
+if [[ -n "${UPDATE_REQUIREMENTS_FROM}" ]]; then
+  # Need to run as root in the container for this
+  reqs_file="${WORKSPACEDIR}/${UPDATE_REQUIREMENTS_FROM}"
+  echo "Updating requirements from ${reqs_file}..."
+  pip install --upgrade -r "${reqs_file}"
+fi
+
+CELERY_OPTS=( "${CELERY_ROLE}" )
+if [[ -n "${CELERY_UID}" ]]; then
+  # ensure that a user with the necessary UID exists in container
+  if ! id "${CELERY_UID}" ; then
+    adduser --system --uid "${CELERY_UID}" --no-create-home --disabled-login "celery-user-${CELERY_UID}"
+  fi
+  CELERY_OPTS+=("--uid=${CELERY_UID}")
+  CELERY_USERNAME="$(id -nu ${CELERY_UID})"
+fi
+
+if [[ -n "${CELERY_GID}" ]]; then
+  # ensure that some group with the necessary GID exists in container
+  if ! getent group "${CELERY_GID}" ; then
+    addgroup --gid "${CELERY_GID}" "celery-group-${CELERY_GID}"
+  fi
+  CELERY_OPTS+=("--gid=${CELERY_GID}")
+  CELERY_GROUP="$(getent group ${CELERY_GID} | awk -F: '{print $1}')"
+fi
+
+run_as_celery_uid () {
+  IAM=$(whoami)
+  if [ "${IAM}" = "${CELERY_USERNAME:-root}" ]; then
+    SU_OPTS=()
+    if [[ -n "${CELERY_GROUP}" ]]; then
+      SU_OPTS+=("-g" "${CELERY_GROUP}")
+    fi
+    su "${SU_OPTS[@]}" "${CELERY_USERNAME:-root}" -s /bin/sh -c "$*"
+  else
+    /bin/sh -c "$*"
+  fi
+}
+
+log_term_timing_msgs () {
+  # output periodic debug message
+  while true; do
+    echo "Waiting for celery worker shutdown ($(date --utc --iso-8601=ns))"
+    sleep 0.5s
+  done
+}
+
+cleanup () {
+  # Cleanly terminate the celery app by sending it a TERM, then waiting for it to exit.
+  if [[ -n "${celery_pid}" ]]; then
+    echo "Gracefully terminating celery worker. This may take a few minutes if tasks are in progress..."
+    kill -TERM "${celery_pid}"
+    if [[ -n "${DEBUG_TERM_TIMING}" ]]; then
+      log_term_timing_msgs &
+    fi
+    wait "${celery_pid}"
+  fi
+}
+
+echo "Running checks as root to apply patches..."
+/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check
+
+if [[ "${CELERY_ROLE}" == "worker" ]]; then
+    echo "Running initial checks..."
+    # Run checks as celery worker if one was specified
+    run_as_celery_uid /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check
+fi
+
+USER_BIN_PATH="/home/dev/.local/bin"
+WATCHMEDO="$USER_BIN_PATH/watchmedo"
+# Find a celery that works
+if [[ -x "$USER_BIN_PATH/celery" ]]; then
+    # This branch is used for dev
+    CELERY="$USER_BIN_PATH/celery"
+else
+    # This branch is used for sandbox instances
+    CELERY="/usr/local/bin/celery"
+fi
+trap 'trap "" TERM; cleanup' TERM
+# start celery in the background so we can trap the TERM signal
+if [[ -n "${DEV_MODE}" && -x "${WATCHMEDO}" ]]; then
+  $WATCHMEDO auto-restart \
+            --patterns '*.py' \
+            --directory 'ietf' \
+            --recursive \
+            --debounce-interval 5 \
+            -- \
+            $CELERY --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" $@ &
+  celery_pid=$!
+else
+  $CELERY --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" "$@" &
+  celery_pid=$!
+fi
+
+wait "${celery_pid}"
diff --git a/docker/scripts/app-init.sh b/docker/scripts/app-init.sh
index bd3d51a98a..1d895cdf53 100755
--- a/docker/scripts/app-init.sh
+++ b/docker/scripts/app-init.sh
@@ -2,8 +2,17 @@
 
 WORKSPACEDIR="/workspace"
 
+# Handle Linux host mounting the workspace dir as root
+if [ ! -O "${WORKSPACEDIR}/ietf" ]; then
+    sudo chown -R dev:dev $WORKSPACEDIR
+fi
+
+# Start rsyslog service
 sudo service rsyslog start &>/dev/null
 
+# Add /workspace as a safe git directory
+git config --global --add safe.directory /workspace
+
 # Turn off git info in zsh prompt (causes slowdowns)
 git config oh-my-zsh.hide-info 1
 
@@ -15,63 +24,48 @@ sudo chown -R dev:dev "$WORKSPACEDIR/.vite"
 sudo chown -R dev:dev "$WORKSPACEDIR/.yarn/unplugged"
 sudo chown dev:dev "/assets"
 
-echo "Fix chromedriver /dev/shm permissions..."
-sudo chmod 1777 /dev/shm
+# Run nginx
+echo "Starting nginx..."
+sudo nginx
 
 # Build node packages that requrie native compilation
 echo "Compiling native node packages..."
 yarn rebuild
 
+# Silence Browserlist warnings
+export BROWSERSLIST_IGNORE_OLD_DATA=1
+
 # Generate static assets
 echo "Building static assets... (this could take a minute or two)"
 yarn build
 yarn legacy:build
 
 # Copy config files if needed
+cp $WORKSPACEDIR/docker/configs/settings_postgresqldb.py $WORKSPACEDIR/ietf/settings_postgresqldb.py
 
 if [ ! -f "$WORKSPACEDIR/ietf/settings_local.py" ]; then
     echo "Setting up a default settings_local.py ..."
-    cp $WORKSPACEDIR/docker/configs/settings_local.py $WORKSPACEDIR/ietf/settings_local.py
 else
-    echo "Using existing ietf/settings_local.py file"
-    if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local.py $WORKSPACEDIR/ietf/settings_local.py; then
-        echo "NOTE: Differences detected compared to docker/configs/settings_local.py!"
-        echo "We'll assume you made these deliberately."
-    fi
+    echo "Renaming existing ietf/settings_local.py to ietf/settings_local.py.bak"
+    mv -f $WORKSPACEDIR/ietf/settings_local.py $WORKSPACEDIR/ietf/settings_local.py.bak
 fi
+cp $WORKSPACEDIR/docker/configs/settings_local.py $WORKSPACEDIR/ietf/settings_local.py
 
 if [ ! -f "$WORKSPACEDIR/ietf/settings_local_debug.py" ]; then
     echo "Setting up a default settings_local_debug.py ..."
-    cp $WORKSPACEDIR/docker/configs/settings_local_debug.py $WORKSPACEDIR/ietf/settings_local_debug.py
-else
-    echo "Using existing ietf/settings_local_debug.py file"
-    if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local_debug.py $WORKSPACEDIR/ietf/settings_local_debug.py; then
-        echo "NOTE: Differences detected compared to docker/configs/settings_local_debug.py!"
-        echo "We'll assume you made these deliberately."
-    fi
-fi
-
-if [ ! -f "$WORKSPACEDIR/ietf/settings_local_sqlitetest.py" ]; then
-    echo "Setting up a default settings_local_sqlitetest.py ..."
-    cp $WORKSPACEDIR/docker/configs/settings_local_sqlitetest.py $WORKSPACEDIR/ietf/settings_local_sqlitetest.py
 else
-    echo "Using existing ietf/settings_local_sqlitetest.py file"
-    if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local_sqlitetest.py $WORKSPACEDIR/ietf/settings_local_sqlitetest.py; then
-        echo "NOTE: Differences detected compared to docker/configs/settings_local_sqlitetest.py!"
-        echo "We'll assume you made these deliberately."
-    fi
+    echo "Renaming existing ietf/settings_local_debug.py to ietf/settings_local_debug.py.bak"
+    mv -f $WORKSPACEDIR/ietf/settings_local_debug.py $WORKSPACEDIR/ietf/settings_local_debug.py.bak
 fi
+cp $WORKSPACEDIR/docker/configs/settings_local_debug.py $WORKSPACEDIR/ietf/settings_local_debug.py
 
 if [ ! -f "$WORKSPACEDIR/ietf/settings_local_vite.py" ]; then
     echo "Setting up a default settings_local_vite.py ..."
-    cp $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py
 else
-    echo "Using existing ietf/settings_local_vite.py file"
-    if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py; then
-        echo "NOTE: Differences detected compared to docker/configs/settings_local_vite.py!"
-        echo "We'll assume you made these deliberately."
-    fi
+    echo "Renaming existing ietf/settings_local_vite.py to ietf/settings_local_vite.py.bak"
+    mv -f $WORKSPACEDIR/ietf/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py.bak
 fi
+cp $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py
 
 # Create data directories
 
@@ -79,6 +73,11 @@ echo "Creating data directories..."
 chmod +x ./docker/scripts/app-create-dirs.sh
 ./docker/scripts/app-create-dirs.sh
 
+# Configure the development blobstore
+
+echo "Configuring blobstore..."
+PYTHONPATH=/workspace python ./docker/scripts/app-configure-blobstore.py
+
 # Download latest coverage results file
 
 echo "Downloading latest coverage results file..."
@@ -88,7 +87,7 @@ curl -fsSL https://github.com/ietf-tools/datatracker/releases/download/baseline/
 
 if [ -n "$EDITOR_VSCODE" ]; then
     echo "Waiting for DB container to come online ..."
-    /usr/local/bin/wait-for localhost:3306 -- echo "DB ready"
+    /usr/local/bin/wait-for db:5432 -- echo "PostgreSQL ready"
 fi
 
 # Run memcached
@@ -100,24 +99,28 @@ echo "Starting memcached..."
 
 echo "Running initial checks..."
 /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check --settings=settings_local
-# /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --settings=settings_local
 
-echo "-----------------------------------------------------------------"
-echo "Done!"
-echo "-----------------------------------------------------------------"
+# Migrate, adjusting to what the current state of the underlying database might be:
+/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --fake-initial --settings=settings_local
+
+# Apply migrations to the blobdb database as well (most are skipped)
+/usr/local/bin/python $WORKSPACEDIR/ietf/manage.py migrate --settings=settings_local --database=blobdb
 
 if [ -z "$EDITOR_VSCODE" ]; then
     CODE=0
-    python -m smtpd -n -c DebuggingServer localhost:2025 &
+    python -m aiosmtpd -n -c ietf.utils.aiosmtpd.DevDebuggingHandler -l localhost:2025 &
     if [ -z "$*" ]; then
+        echo "-----------------------------------------------------------------"
+        echo "Ready!"
+        echo "-----------------------------------------------------------------"
         echo
         echo "You can execute arbitrary commands now, e.g.,"
         echo
-        echo "    ietf/manage.py runserver 0.0.0.0:8000"
+        echo "    ietf/manage.py runserver 8001"
         echo
         echo "to start a development instance of the Datatracker."
         echo
-        echo "    ietf/manage.py test --settings=settings_sqlitetest"
+        echo "    ietf/manage.py test --settings=settings_test"
         echo
         echo "to run all the python tests."
         echo
diff --git a/docker/scripts/app-install-chromedriver.sh b/docker/scripts/app-install-chromedriver.sh
deleted file mode 100755
index 43532a1cf6..0000000000
--- a/docker/scripts/app-install-chromedriver.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-HOSTARCH=$(arch)
-if [ $HOSTARCH == "x86_64" ]; then
-    echo "Installing chrome driver..."
-    wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-    echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
-    apt-get update -y
-    apt-get install -y google-chrome-stable
-    CHROMEVER=$(google-chrome --product-version | grep -o "[^\.]*\.[^\.]*\.[^\.]*")
-    DRIVERVER=$(curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROMEVER")
-    wget -q --continue -P /chromedriver "http://chromedriver.storage.googleapis.com/$DRIVERVER/chromedriver_linux64.zip"
-    unzip /chromedriver/chromedriver* -d /chromedriver
-    ln -s /chromedriver/chromedriver /usr/local/bin/chromedriver
-    ln -s /chromedriver/chromedriver /usr/bin/chromedriver
-else
-    echo "This architecture doesn't support chromedriver. Skipping installation..."
-fi
\ No newline at end of file
diff --git a/docker/scripts/app-rsync-extras.sh b/docker/scripts/app-rsync-extras.sh
index ef6966224f..660670d20c 100755
--- a/docker/scripts/app-rsync-extras.sh
+++ b/docker/scripts/app-rsync-extras.sh
@@ -42,8 +42,6 @@ cat << EOF > "$EXCLUDE"
 *.diff
 *.doc
 *.exe
-*.html
-*.json
 *.mib
 *.new
 *.p7s
diff --git a/docker/scripts/app-setup-debian.sh b/docker/scripts/app-setup-debian.sh
index ddfc351995..ea9cc3fb87 100644
--- a/docker/scripts/app-setup-debian.sh
+++ b/docker/scripts/app-setup-debian.sh
@@ -10,7 +10,6 @@
 # Syntax: ./common-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag] [install Oh My Zsh! flag] [Add non-free packages]
 
 set -e
-
 INSTALL_ZSH=${1:-"true"}
 USERNAME=${2:-"automatic"}
 USER_UID=${3:-"automatic"}
@@ -116,18 +115,9 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
     # Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
     if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then
         # Bring in variables from /etc/os-release like VERSION_CODENAME
-        . /etc/os-release
-        sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb-src http:\/\/(deb|httredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb-src http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list 
-        sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
-        # Handle bullseye location for security https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html
-        sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
+        .  /etc/os-release
+        sed -i -E "s/Components: main/Components: main contrib non-free/" /etc/apt/sources.list.d/debian.sources
+
         echo "Running apt-get update..."
         apt-get update
         package_list="${package_list} manpages-posix manpages-posix-dev"
diff --git a/docker/scripts/app-setup-nginx.sh b/docker/scripts/app-setup-nginx.sh
new file mode 100644
index 0000000000..cdeb2ea4cb
--- /dev/null
+++ b/docker/scripts/app-setup-nginx.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+apt-get update -y
+apt-get install -y nginx
diff --git a/docker/scripts/app-start.sh b/docker/scripts/app-start.sh
new file mode 100644
index 0000000000..c3369bab93
--- /dev/null
+++ b/docker/scripts/app-start.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+sudo service rsyslog start &>/dev/null
+
+# Run nginx
+
+echo "Starting nginx..."
+pidof nginx >/dev/null && echo "nginx is already running [ OK ]" || sudo nginx
+
+# Run memcached
+
+echo "Starting memcached..."
+pidof memcached >/dev/null && echo "memcached is already running [ OK ]" || /usr/bin/memcached -u dev -d
+
+echo "-----------------------------------------------------------------"
+echo "Ready!"
+echo "-----------------------------------------------------------------"
diff --git a/docker/scripts/db-import.sh b/docker/scripts/db-import.sh
new file mode 100644
index 0000000000..a0f22cd8fc
--- /dev/null
+++ b/docker/scripts/db-import.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+echo "Drop dummy datatracker DB if it exists..."
+dropdb -U django --if-exists datatracker
+
+# Extensions and search paths will be loaded from the dump
+echo "Import DB dump into datatracker..."
+pg_restore --clean --if-exists --create --no-owner -U django -d postgres datatracker.dump
+echo "alter role django set search_path=datatracker,django,public;" | psql -U django -d datatracker
+
+echo "Done!"
diff --git a/docker/scripts/db-load-default-extensions.sh b/docker/scripts/db-load-default-extensions.sh
new file mode 100644
index 0000000000..efb64b75d0
--- /dev/null
+++ b/docker/scripts/db-load-default-extensions.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+# Adding the extension to the default template is needed to allow the test-suite
+# to be run on postgres (see ietf.settings_test). The test runner always
+# makes a fresh test database instance, and since we are bypassing the migration
+# framework and using a fixture to set the database structure, there's no reaonable
+# way to install the extension as part of the test run.
+psql -U django -d template1 -v ON_ERROR_STOP=1 -c 'CREATE EXTENSION IF NOT EXISTS citext;'
+
diff --git a/docker/scripts/updatedb b/docker/scripts/updatedb
deleted file mode 100644
index 85386daa4a..0000000000
--- a/docker/scripts/updatedb
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo "This script is deprecated. Please use the `cleandb` script in the parent folder instead."
-
-# Modified on 2021-12-20, remove this file after a while
\ No newline at end of file
diff --git a/ietf/.gitignore b/ietf/.gitignore
index 322cc214d0..af738db98c 100644
--- a/ietf/.gitignore
+++ b/ietf/.gitignore
@@ -1,7 +1,8 @@
 /*.pyc
 /settings_local.py
-/settings_local.py.bak
 /settings_local_debug.py
-/settings_local_sqlitetest.py
 /settings_local_vite.py
+/settings_mysqldb.py
+/settings_postgresqldb.py
+/settings_*.py.bak
 /ietfdb.sql.gz
diff --git a/ietf/__init__.py b/ietf/__init__.py
index 2338d0428b..26124c3c67 100644
--- a/ietf/__init__.py
+++ b/ietf/__init__.py
@@ -6,7 +6,7 @@
 
 # Version must stay in single quotes for automatic CI replace
 # Don't add patch number here:
-__version__ = '8.0.0-dev'
+__version__ = '1.0.0-dev'
 
 # Release hash must stay in single quotes for automatic CI replace
 __release_hash__ = ''
@@ -17,6 +17,24 @@
 # set this to ".p1", ".p2", etc. after patching
 __patch__   = ""
 
+if __version__ == '1.0.0-dev' and __release_hash__ == '' and __release_branch__ == '':
+    import subprocess
+    branch = subprocess.run(
+        ["/usr/bin/git", "branch", "--show-current"],
+        capture_output=True,
+    ).stdout.decode().strip()
+    git_hash = subprocess.run(
+        ["/usr/bin/git", "rev-parse", "head"],
+        capture_output=True,
+    ).stdout.decode().strip()
+    rev = subprocess.run(
+        ["/usr/bin/git", "describe", "--tags", git_hash],
+        capture_output=True,
+    ).stdout.decode().strip().split('-', 1)[0]
+    __version__ = f"{rev}-dev"
+    __release_branch__ = branch
+    __release_hash__ = git_hash
+
 
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
diff --git a/ietf/ietfauth/management/__init__.py b/ietf/admin/__init__.py
similarity index 100%
rename from ietf/ietfauth/management/__init__.py
rename to ietf/admin/__init__.py
diff --git a/ietf/admin/apps.py b/ietf/admin/apps.py
new file mode 100644
index 0000000000..20b762cfec
--- /dev/null
+++ b/ietf/admin/apps.py
@@ -0,0 +1,6 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+from django.contrib.admin import apps as admin_apps
+
+
+class AdminConfig(admin_apps.AdminConfig):
+    default_site = "ietf.admin.sites.AdminSite" 
diff --git a/ietf/admin/sites.py b/ietf/admin/sites.py
new file mode 100644
index 0000000000..69cb62ae20
--- /dev/null
+++ b/ietf/admin/sites.py
@@ -0,0 +1,15 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+from django.contrib.admin import AdminSite as _AdminSite
+from django.conf import settings
+from django.utils.safestring import mark_safe
+
+
+class AdminSite(_AdminSite):
+    site_title = "Datatracker admin"
+    
+    @staticmethod
+    def site_header():
+        if settings.SERVER_MODE == "production":
+            return "Datatracker administration"
+        else:
+            return mark_safe('Datatracker administration <span class="text-danger">&delta;</span>')
diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py
index b4c6203d98..d4562f97dd 100644
--- a/ietf/api/__init__.py
+++ b/ietf/api/__init__.py
@@ -4,56 +4,50 @@
 
 import datetime
 import re
+import sys
 
 from urllib.parse import urlencode
 
-from django.conf import settings
+from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
+from django.utils.module_loading import autodiscover_modules
+
 
 import debug                            # pyflakes:ignore
 
-import tastypie
 import tastypie.resources
+import tastypie.serializers
 from tastypie.api import Api
 from tastypie.bundle import Bundle
 from tastypie.exceptions import ApiFieldError
-from tastypie.serializers import Serializer # pyflakes:ignore (we're re-exporting this)
 from tastypie.fields import ApiField
 
 _api_list = []
 
-for _app in settings.INSTALLED_APPS:
+OMITTED_APPS_APIS = ["ietf.status"]
+
+# Pre-py3.11, fromisoformat() does not handle Z or +HH tz offsets
+HAVE_BROKEN_FROMISOFORMAT = sys.version_info < (3, 11, 0, "", 0)
+
+def populate_api_list():
     _module_dict = globals()
-    if '.' in _app:
-        _root, _name = _app.split('.', 1)
-        if _root == 'ietf':
-            if not '.' in _name:
-                _api = Api(api_name=_name)
-                _module_dict[_name] = _api
-                _api_list.append((_name, _api))
+    for app_config in django_apps.get_app_configs():
+        if '.' in app_config.name and app_config.name not in OMITTED_APPS_APIS:
+            _root, _name = app_config.name.split('.', 1)
+            if _root == 'ietf':
+                if not '.' in _name:
+                    _api = Api(api_name=_name)
+                    _module_dict[_name] = _api
+                    _api_list.append((_name, _api))
 
 def autodiscover():
     """
     Auto-discover INSTALLED_APPS resources.py modules and fail silently when
-    not present. This forces an import on them to register any admin bits they
+    not present. This forces an import on them to register any resources they
     may want.
     """
+    autodiscover_modules("resources")
 
-    from importlib import import_module
-    from django.conf import settings
-    from django.utils.module_loading import module_has_submodule
-
-    for app in settings.INSTALLED_APPS:
-        mod = import_module(app)
-        # Attempt to import the app's admin module.
-        try:
-            import_module('%s.resources' % (app, ))
-        except:
-            # Decide whether to bubble up this error. If the app just
-            # doesn't have an admin module, we can ignore the error
-            # attempting to import it, otherwise we want it to bubble up.
-            if module_has_submodule(mod, "resources"):
-                raise
 
 class ModelResource(tastypie.resources.ModelResource):
     def generate_cache_key(self, *args, **kwargs):
@@ -68,6 +62,35 @@ def generate_cache_key(self, *args, **kwargs):
         # Use a list plus a ``.join()`` because it's faster than concatenation.
         return "%s:%s:%s:%s" % (self._meta.api_name, self._meta.resource_name, ':'.join(args), smooshed)
 
+    def _z_aware_fromisoformat(self, value: str) -> datetime.datetime:
+        """datetime.datetime.fromisoformat replacement that works with python < 3.11"""
+        if HAVE_BROKEN_FROMISOFORMAT:
+            if value.upper().endswith("Z"):
+                value = value[:-1] + "+00:00"  # Z -> UTC
+            elif re.match(r"[+-][0-9][0-9]$", value[-3:]):
+                value = value + ":00"  # -04 -> -04:00
+        return datetime.datetime.fromisoformat(value)
+
+    def filter_value_to_python(
+        self, value, field_name, filters, filter_expr, filter_type
+    ):
+        py_value = super().filter_value_to_python(
+            value, field_name, filters, filter_expr, filter_type
+        )
+        if isinstance(
+            self.fields[field_name], tastypie.fields.DateTimeField
+        ) and isinstance(py_value, str):
+            # Ensure datetime values are TZ-aware, using UTC by default
+            try:
+                dt = self._z_aware_fromisoformat(py_value)
+            except ValueError:
+                pass  # let tastypie deal with the original value
+            else:
+                if dt.tzinfo is None:
+                    dt = dt.replace(tzinfo=datetime.timezone.utc)
+                py_value = dt.isoformat()
+        return py_value
+
 
 TIMEDELTA_REGEX = re.compile(r'^(?P<days>\d+d)?\s?(?P<hours>\d+h)?\s?(?P<minutes>\d+m)?\s?(?P<seconds>\d+s?)$')
 
@@ -152,3 +175,29 @@ def dehydrate(self, bundle, for_list=True):
             dehydrated = self.dehydrate_related(fk_bundle, fk_resource, for_list=for_list)
             fk_resource._meta.cache.set(cache_key, dehydrated)
         return dehydrated
+
+
+class Serializer(tastypie.serializers.Serializer):
+    OPTION_ESCAPE_NULLS = "datatracker-escape-nulls"
+
+    def format_datetime(self, data):
+        return data.astimezone(datetime.UTC).replace(tzinfo=None).isoformat(timespec="seconds") + "Z"
+
+    def to_simple(self, data, options):
+        options = options or {}
+        simple_data = super().to_simple(data, options)
+        if (
+            options.get(self.OPTION_ESCAPE_NULLS, False) 
+            and isinstance(simple_data, str)
+        ):
+            # replace nulls with unicode "symbol for null character", \u2400
+            simple_data = simple_data.replace("\x00", "\u2400")
+        return simple_data
+
+    def to_etree(self, data, options=None, name=None, depth=0):
+        # lxml does not escape nulls on its own, so ask to_simple() to do it.
+        # This is mostly (only?) an issue when generating errors responses for
+        # fuzzers.
+        options = options or {}
+        options[self.OPTION_ESCAPE_NULLS] = True
+        return super().to_etree(data, options, name, depth)
diff --git a/ietf/api/__init__.pyi b/ietf/api/__init__.pyi
index 63d9bc513b..ededea90a7 100644
--- a/ietf/api/__init__.pyi
+++ b/ietf/api/__init__.pyi
@@ -30,4 +30,5 @@ class Serializer(): ...
 class ToOneField(tastypie.fields.ToOneField): ...
 class TimedeltaField(tastypie.fields.ApiField): ...
 
+def populate_api_list() -> None: ...
 def autodiscover() -> None: ...
diff --git a/ietf/api/apps.py b/ietf/api/apps.py
new file mode 100644
index 0000000000..4549e0d7f2
--- /dev/null
+++ b/ietf/api/apps.py
@@ -0,0 +1,19 @@
+from django.apps import AppConfig
+from . import populate_api_list
+
+
+class ApiConfig(AppConfig):
+    name = "ietf.api"
+
+    def ready(self):
+        """Hook to do init after the app registry is fully populated
+        
+        Importing models or accessing the app registry is ok here, but do not
+        interact with the database. See        
+        https://docs.djangoproject.com/en/4.2/ref/applications/#django.apps.AppConfig.ready
+        """
+        # Populate our API list now that the app registry is set up
+        populate_api_list()
+
+        # Import drf-spectacular extensions 
+        import ietf.api.schema  # pyflakes: ignore
diff --git a/ietf/api/authentication.py b/ietf/api/authentication.py
new file mode 100644
index 0000000000..dfab0d72b8
--- /dev/null
+++ b/ietf/api/authentication.py
@@ -0,0 +1,19 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+#
+from rest_framework import authentication
+from django.contrib.auth.models import AnonymousUser
+
+
+class ApiKeyAuthentication(authentication.BaseAuthentication):
+    """API-Key header authentication"""
+
+    def authenticate(self, request):
+        """Extract the authentication token, if present
+        
+        This does not validate the token, it just arranges for it to be available in request.auth.
+        It's up to a Permissions class to validate it for the appropriate endpoint.
+        """
+        token = request.META.get("HTTP_X_API_KEY", None)
+        if token is None:
+            return None
+        return AnonymousUser(), token  # available as request.user and request.auth
diff --git a/ietf/api/ietf_utils.py b/ietf/api/ietf_utils.py
new file mode 100644
index 0000000000..50767a5afd
--- /dev/null
+++ b/ietf/api/ietf_utils.py
@@ -0,0 +1,76 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+# This is not utils.py because Tastypie implicitly consumes ietf.api.utils.
+# See ietf.api.__init__.py for details.
+from functools import wraps
+from typing import Callable, Optional, Union
+
+from django.conf import settings
+from django.http import HttpResponseForbidden
+
+
+def is_valid_token(endpoint, token):
+    # This is where we would consider integration with vault
+    # Settings implementation for now.
+    if hasattr(settings, "APP_API_TOKENS"):
+        token_store = settings.APP_API_TOKENS
+        if endpoint in token_store:
+            endpoint_tokens = token_store[endpoint]
+            # Be sure endpoints is a list or tuple so we don't accidentally use substring matching!
+            if not isinstance(endpoint_tokens, (list, tuple)):
+                endpoint_tokens = [endpoint_tokens]
+            if token in endpoint_tokens:
+                return True
+    return False
+
+
+def requires_api_token(func_or_endpoint: Optional[Union[Callable, str]] = None):
+    """Validate API token before executing the wrapped method
+
+    Usage:
+        * Basic: endpoint defaults to the qualified name of the wrapped method. E.g., in ietf.api.views,
+
+                @requires_api_token
+                def my_view(request):
+                    ...
+
+            will require a token for "ietf.api.views.my_view"
+
+        * Custom endpoint: specify the endpoint explicitly
+
+                @requires_api_token("ietf.api.views.some_other_thing")
+                def my_view(request):
+                    ...
+
+            will require a token for "ietf.api.views.some_other_thing"
+    """
+
+    def decorate(f):
+        if _endpoint is None:
+            fname = getattr(f, "__qualname__", None)
+            if fname is None:
+                raise TypeError(
+                    "Cannot automatically decorate function that does not support __qualname__. "
+                    "Explicitly set the endpoint."
+                )
+            endpoint = "{}.{}".format(f.__module__, fname)
+        else:
+            endpoint = _endpoint
+
+        @wraps(f)
+        def wrapped(request, *args, **kwargs):
+            authtoken = request.META.get("HTTP_X_API_KEY", None)
+            if authtoken is None or not is_valid_token(endpoint, authtoken):
+                return HttpResponseForbidden()
+            return f(request, *args, **kwargs)
+
+        return wrapped
+
+    # Magic to allow decorator to be used with or without parentheses
+    if callable(func_or_endpoint):
+        func = func_or_endpoint
+        _endpoint = None
+        return decorate(func)
+    else:
+        _endpoint = func_or_endpoint
+        return decorate
diff --git a/ietf/api/management/commands/makeresources.py b/ietf/api/management/commands/makeresources.py
index 07f8402e7d..889b2cdfb5 100644
--- a/ietf/api/management/commands/makeresources.py
+++ b/ietf/api/management/commands/makeresources.py
@@ -3,7 +3,6 @@
 
 
 import os
-import datetime
 import collections
 import io
 
@@ -14,6 +13,7 @@
 from django.core.management.base import AppCommand
 from django.db import models
 from django.template import Template, Context
+from django.utils import timezone
 
 from tastypie.resources import ModelResource
 
@@ -89,7 +89,7 @@ def handle_app_config(self, app, **options):
                     info = dict(
                         app=app.name,
                         app_label=app.label,
-                        date=datetime.datetime.now()
+                        date=timezone.now()
                     )
                     new_models = {}
                     for model, rclass_name in missing_resources:
diff --git a/ietf/api/permissions.py b/ietf/api/permissions.py
new file mode 100644
index 0000000000..8f7fdd026f
--- /dev/null
+++ b/ietf/api/permissions.py
@@ -0,0 +1,39 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+#
+from rest_framework import permissions
+from ietf.api.ietf_utils import is_valid_token
+
+
+class HasApiKey(permissions.BasePermission):
+    """Permissions class that validates a token using is_valid_token
+    
+    The view class must indicate the relevant endpoint by setting `api_key_endpoint`.
+    Must be used with an Authentication class that puts a token in request.auth.
+    """
+    def has_permission(self, request, view):
+        endpoint = getattr(view, "api_key_endpoint", None)
+        auth_token = getattr(request, "auth", None)
+        if endpoint is not None and auth_token is not None:
+            return is_valid_token(endpoint, auth_token)
+        return False
+
+
+class IsOwnPerson(permissions.BasePermission):
+    """Permission to access own Person object"""
+    def has_object_permission(self, request, view, obj):
+        if not (request.user.is_authenticated and hasattr(request.user, "person")):
+            return False
+        return obj == request.user.person
+
+
+class BelongsToOwnPerson(permissions.BasePermission):
+    """Permission to access objects associated with own Person
+    
+    Requires that the object have a "person" field that indicates ownership.
+    """
+    def has_object_permission(self, request, view, obj):
+        if not (request.user.is_authenticated and hasattr(request.user, "person")):
+            return False
+        return (
+            hasattr(obj, "person") and obj.person == request.user.person
+        )
diff --git a/ietf/api/routers.py b/ietf/api/routers.py
new file mode 100644
index 0000000000..99afdb242a
--- /dev/null
+++ b/ietf/api/routers.py
@@ -0,0 +1,31 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+"""Custom django-rest-framework routers"""
+from django.core.exceptions import ImproperlyConfigured
+from rest_framework import routers
+
+
+class PrefixedBasenameMixin:
+    """Mixin to add a prefix to the basename of a rest_framework BaseRouter"""
+    def __init__(self, name_prefix="", *args, **kwargs):
+        self.name_prefix = name_prefix
+        if len(self.name_prefix) == 0 or self.name_prefix[-1] == ".":
+            raise ImproperlyConfigured("Cannot use a name_prefix that is empty or ends with '.'")
+        super().__init__(*args, **kwargs)
+
+    def register(self, prefix, viewset, basename=None):
+        # Get the superclass "register" method from the class this is mixed-in with.
+        # This avoids typing issues with calling super().register() directly in a
+        # mixin class.
+        super_register = getattr(super(), "register")
+        if not super_register or not callable(super_register):
+            raise TypeError("Must mixin with superclass that has register() method")
+        super_register(prefix, viewset, basename=f"{self.name_prefix}.{basename}")
+
+
+class PrefixedSimpleRouter(PrefixedBasenameMixin, routers.SimpleRouter):
+    """SimpleRouter that adds a dot-separated prefix to its basename"""
+
+
+class PrefixedDefaultRouter(PrefixedBasenameMixin, routers.DefaultRouter):
+    """DefaultRouter that adds a dot-separated prefix to its basename"""
+
diff --git a/ietf/api/schema.py b/ietf/api/schema.py
new file mode 100644
index 0000000000..7340149685
--- /dev/null
+++ b/ietf/api/schema.py
@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+#
+from drf_spectacular.extensions import OpenApiAuthenticationExtension
+
+
+class ApiKeyAuthenticationScheme(OpenApiAuthenticationExtension):
+    """Authentication scheme extension for the ApiKeyAuthentication
+
+    Used by drf-spectacular when rendering the OpenAPI schema
+    """
+    target_class = "ietf.api.authentication.ApiKeyAuthentication"
+    name = "apiKeyAuth"
+
+    def get_security_definition(self, auto_schema):
+        return {
+            "type": "apiKey",
+            "description": "Shared secret in the X-Api-Key header",
+            "name": "X-Api-Key",
+            "in": "header",
+        }
diff --git a/ietf/api/serializer.py b/ietf/api/serializer.py
index 9d6cf1ebb8..d5bca430e0 100644
--- a/ietf/api/serializer.py
+++ b/ietf/api/serializer.py
@@ -1,6 +1,9 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
+# Copyright The IETF Trust 2018-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
+"""Serialization utilities
 
+This is _not_ for django-rest-framework!
+"""
 
 import hashlib
 import json
@@ -9,11 +12,12 @@
 from django.core.exceptions import ObjectDoesNotExist, FieldError
 from django.core.serializers.json import Serializer
 from django.http import HttpResponse
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 from django.db.models import Field
-from django.db.models.query import QuerySet
 from django.db.models.signals import post_save, post_delete, m2m_changed
 
+from django_stubs_ext import QuerySetAny
+
 import debug                            # pyflakes:ignore
 
 
@@ -121,7 +125,7 @@ def end_object(self, obj):
         for name in expansions:
             try:
                 field = getattr(obj, name)
-                #self._current["_"+name] = smart_text(field)
+                #self._current["_"+name] = smart_str(field)
                 if not isinstance(field, Field):
                     options = self.options.copy()
                     options["expand"] = [ v[len(name)+2:] for v in options["expand"] if v.startswith(name+"__") ]
@@ -145,7 +149,7 @@ def end_object(self, obj):
                                 field_value = None
                         else:
                             field_value = field
-                        if isinstance(field_value, QuerySet) or isinstance(field_value, list):
+                        if isinstance(field_value, QuerySetAny) or isinstance(field_value, list):
                             self._current[name] = dict([ (rel.pk, self.expand_related(rel, name)) for rel in field_value ])
                         else:
                             if hasattr(field_value, "_meta"):
@@ -188,10 +192,10 @@ def handle_fk_field(self, obj, field):
                 related = related.natural_key()
             elif field.remote_field.field_name == related._meta.pk.name:
                 # Related to remote object via primary key
-                related = smart_text(related._get_pk_val(), strings_only=True)
+                related = smart_str(related._get_pk_val(), strings_only=True)
             else:
                 # Related to remote object via other field
-                related = smart_text(getattr(related, field.remote_field.field_name), strings_only=True)
+                related = smart_str(getattr(related, field.remote_field.field_name), strings_only=True)
         self._current[field.name] = related
 
     def handle_m2m_field(self, obj, field):
@@ -201,7 +205,7 @@ def handle_m2m_field(self, obj, field):
             elif self.use_natural_keys and hasattr(field.remote_field.to, 'natural_key'):
                 m2m_value = lambda value: value.natural_key()
             else:
-                m2m_value = lambda value: smart_text(value._get_pk_val(), strings_only=True)
+                m2m_value = lambda value: smart_str(value._get_pk_val(), strings_only=True)
             self._current[field.name] = [m2m_value(related)
                                for related in getattr(obj, field.name).iterator()]
 
@@ -221,7 +225,7 @@ class JsonExportMixin(object):
 #             obj = None
 # 
 #         if obj is None:
-#             raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_text(self.model._meta.verbose_name), 'key': escape(object_id)})
+#             raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_str(self.model._meta.verbose_name), 'key': escape(object_id)})
 # 
 #         content_type = 'application/json'
 #         return HttpResponse(serialize([ obj ], sort_keys=True, indent=3)[2:-2], content_type=content_type)
@@ -264,6 +268,6 @@ def json_view(self, request, filter=None, expand=None):
             qd = dict( ( k, json.loads(v)[0] )  for k,v in items )
         except (FieldError, ValueError) as e:
             return HttpResponse(json.dumps({"error": str(e)}, sort_keys=True, indent=3), content_type=content_type)
-        text = json.dumps({smart_text(self.model._meta): qd}, sort_keys=True, indent=3)
+        text = json.dumps({smart_str(self.model._meta): qd}, sort_keys=True, indent=3)
         return HttpResponse(text, content_type=content_type)
         
diff --git a/ietf/api/serializers_rpc.py b/ietf/api/serializers_rpc.py
new file mode 100644
index 0000000000..d888de4586
--- /dev/null
+++ b/ietf/api/serializers_rpc.py
@@ -0,0 +1,804 @@
+# Copyright The IETF Trust 2025-2026, All Rights Reserved
+import datetime
+from pathlib import Path
+from typing import Literal, Optional
+
+from django.db import transaction
+from django.urls import reverse as urlreverse
+from django.utils import timezone
+from drf_spectacular.types import OpenApiTypes
+from drf_spectacular.utils import extend_schema_field
+from rest_framework import serializers
+
+from ietf.doc.expire import move_draft_files_to_archive
+from ietf.doc.models import (
+    DocumentAuthor,
+    Document,
+    RelatedDocument,
+    State,
+    DocEvent,
+    RfcAuthor,
+)
+from ietf.doc.serializers import RfcAuthorSerializer
+from ietf.doc.tasks import trigger_red_precomputer_task, update_rfc_searchindex_task
+from ietf.doc.utils import (
+    default_consensus,
+    prettify_std_name,
+    update_action_holders,
+    update_rfcauthors,
+)
+from ietf.group.models import Group, Role
+from ietf.group.serializers import AreaSerializer
+from ietf.name.models import StreamName, StdLevelName
+from ietf.person.models import Person
+from ietf.utils import log
+
+
+class PersonSerializer(serializers.ModelSerializer):
+    email = serializers.EmailField(read_only=True)
+    picture = serializers.URLField(source="cdn_photo_url", read_only=True)
+    url = serializers.SerializerMethodField(
+        help_text="relative URL for datatracker person page"
+    )
+
+    class Meta:
+        model = Person
+        fields = ["id", "plain_name", "email", "picture", "url"]
+        read_only_fields = ["id", "plain_name", "email", "picture", "url"]
+
+    @extend_schema_field(OpenApiTypes.URI)
+    def get_url(self, object: Person):
+        return urlreverse(
+            "ietf.person.views.profile",
+            kwargs={"email_or_name": object.email_address() or object.name},
+        )
+
+
+class EmailPersonSerializer(serializers.Serializer):
+    email = serializers.EmailField(source="address")
+    person_pk = serializers.IntegerField(source="person.pk")
+    name = serializers.CharField(source="person.name")
+    last_name = serializers.CharField(source="person.last_name")
+    initials = serializers.CharField(source="person.initials")
+
+
+class LowerCaseEmailField(serializers.EmailField):
+    def to_representation(self, value):
+        return super().to_representation(value).lower()
+
+
+class AuthorPersonSerializer(serializers.ModelSerializer):
+    person_pk = serializers.IntegerField(source="pk", read_only=True)
+    last_name = serializers.CharField()
+    initials = serializers.CharField()
+    email_addresses = serializers.ListField(
+        source="email_set.all", child=LowerCaseEmailField()
+    )
+
+    class Meta:
+        model = Person
+        fields = ["person_pk", "name", "last_name", "initials", "email_addresses"]
+
+
+class RfcWithAuthorsSerializer(serializers.ModelSerializer):
+    authors = AuthorPersonSerializer(many=True, source="author_persons")
+
+    class Meta:
+        model = Document
+        fields = ["rfc_number", "authors"]
+
+
+class DraftWithAuthorsSerializer(serializers.ModelSerializer):
+    draft_name = serializers.CharField(source="name")
+    authors = AuthorPersonSerializer(many=True, source="author_persons")
+
+    class Meta:
+        model = Document
+        fields = ["draft_name", "authors"]
+
+
+class WgChairSerializer(serializers.Serializer):
+    """Serialize a WG chair's name and email from a Role"""
+
+    name = serializers.SerializerMethodField()
+    email = serializers.SerializerMethodField()
+
+    @extend_schema_field(serializers.CharField)
+    def get_name(self, role: Role) -> str:
+        return role.person.plain_name()
+
+    @extend_schema_field(serializers.EmailField)
+    def get_email(self, role: Role) -> str:
+        return role.email.email_address()
+
+
+class DocumentAuthorSerializer(serializers.ModelSerializer):
+    """Serializer for a Person in a response"""
+
+    plain_name = serializers.SerializerMethodField()
+
+    class Meta:
+        model = DocumentAuthor
+        fields = ["person", "plain_name", "affiliation"]
+
+    def get_plain_name(self, document_author: DocumentAuthor) -> str:
+        return document_author.person.plain_name()
+
+
+class FullDraftSerializer(serializers.ModelSerializer):
+    # Redefine these fields so they don't pick up the regex validator patterns.
+    # There seem to be some non-compliant drafts in the system! If this serializer
+    # is used for a writeable view, the validation will need to be added back.
+    name = serializers.CharField(max_length=255)
+    title = serializers.CharField(max_length=255)
+    group = serializers.SlugRelatedField(slug_field="acronym", read_only=True)
+    area = AreaSerializer(read_only=True)
+
+    # Other fields we need to add / adjust
+    source_format = serializers.SerializerMethodField()
+    authors = DocumentAuthorSerializer(many=True, source="documentauthor_set")
+    shepherd = serializers.PrimaryKeyRelatedField(
+        source="shepherd.person", read_only=True
+    )
+    consensus = serializers.SerializerMethodField()
+    wg_chairs = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Document
+        fields = [
+            "id",
+            "name",
+            "rev",
+            "stream",
+            "title",
+            "group",
+            "area",
+            "abstract",
+            "pages",
+            "source_format",
+            "authors",
+            "intended_std_level",
+            "consensus",
+            "shepherd",
+            "ad",
+            "wg_chairs",
+        ]
+
+    def get_consensus(self, doc: Document) -> Optional[bool]:
+        return default_consensus(doc)
+
+    @extend_schema_field(WgChairSerializer(many=True))
+    def get_wg_chairs(self, doc: Document):
+        if doc.group is None:
+            return []
+        chairs = doc.group.role_set.filter(name_id="chair").select_related(
+            "person", "email"
+        )
+        return WgChairSerializer(chairs, many=True).data
+
+    def get_source_format(
+        self, doc: Document
+    ) -> Literal["unknown", "xml-v2", "xml-v3", "txt"]:
+        submission = doc.submission()
+        if submission is None:
+            return "unknown"
+        if ".xml" in submission.file_types:
+            if submission.xml_version == "3":
+                return "xml-v3"
+            else:
+                return "xml-v2"
+        elif ".txt" in submission.file_types:
+            return "txt"
+        return "unknown"
+
+
+class DraftSerializer(FullDraftSerializer):
+    class Meta:
+        model = Document
+        fields = [
+            "id",
+            "name",
+            "rev",
+            "stream",
+            "title",
+            "group",
+            "pages",
+            "source_format",
+            "authors",
+            "consensus",
+        ]
+
+
+class SubmittedToQueueSerializer(FullDraftSerializer):
+    submitted = serializers.SerializerMethodField()
+    consensus = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Document
+        fields = [
+            "id",
+            "name",
+            "stream",
+            "submitted",
+            "consensus",
+        ]
+
+    def get_submitted(self, doc) -> Optional[datetime.datetime]:
+        event = doc.sent_to_rfc_editor_event()
+        return None if event is None else event.time
+    
+    def get_consensus(self, doc) -> Optional[bool]:
+        return default_consensus(doc)
+
+
+class OriginalStreamSerializer(serializers.ModelSerializer):
+    stream = serializers.CharField(read_only=True, source="orig_stream_id")
+
+    class Meta:
+        model = Document
+        fields = ["rfc_number", "stream"]
+
+
+class ReferenceSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Document
+        fields = ["id", "name"]
+        read_only_fields = ["id", "name"]
+
+
+def _update_authors(rfc, authors_data):
+    # Construct unsaved instances from validated author data
+    new_authors = [RfcAuthor(**authdata) for authdata in authors_data]
+    # Update the RFC with the new author set
+    with transaction.atomic():
+        change_events = update_rfcauthors(rfc, new_authors)
+        for event in change_events:
+            event.save()
+    return change_events
+
+
+class SubseriesNameField(serializers.RegexField):
+
+    def __init__(self, **kwargs):
+        # pattern: no leading 0, finite length (arbitrarily set to 5 digits)
+        regex = r"^(bcp|std|fyi)[1-9][0-9]{0,4}$"
+        super().__init__(regex, **kwargs)
+
+
+
+class RfcPubSerializer(serializers.ModelSerializer):
+    """Write-only serializer for RFC publication"""
+    # publication-related fields
+    published = serializers.DateTimeField(default_timezone=datetime.timezone.utc)
+    draft_name = serializers.RegexField(
+        required=False, regex=r"^draft-[a-zA-Z0-9-]+$"
+    )
+    draft_rev = serializers.RegexField(
+        required=False, regex=r"^[0-9][0-9]$"
+    )
+
+    # fields on the RFC Document that need tweaking from ModelSerializer defaults
+    rfc_number = serializers.IntegerField(min_value=1, required=True)
+    group = serializers.SlugRelatedField(
+        slug_field="acronym", queryset=Group.objects.all(), required=False
+    )
+    stream = serializers.PrimaryKeyRelatedField(
+        queryset=StreamName.objects.filter(used=True)
+    )
+    std_level = serializers.PrimaryKeyRelatedField(
+        queryset=StdLevelName.objects.filter(used=True),
+    )
+    ad = serializers.PrimaryKeyRelatedField(
+        queryset=Person.objects.all(),
+        allow_null=True,
+        required=False,
+    )
+    obsoletes = serializers.SlugRelatedField(
+        many=True,
+        required=False,
+        slug_field="rfc_number",
+        queryset=Document.objects.filter(type_id="rfc"),
+    )
+    updates = serializers.SlugRelatedField(
+        many=True,
+        required=False,
+        slug_field="rfc_number",
+        queryset=Document.objects.filter(type_id="rfc"),
+    )
+    subseries = serializers.ListField(child=SubseriesNameField(required=False))
+    # N.b., authors is _not_ a field on Document!
+    authors = RfcAuthorSerializer(many=True)
+
+    class Meta:
+        model = Document
+        fields = [
+            "published",
+            "draft_name",
+            "draft_rev",
+            "rfc_number",
+            "title",
+            "authors",
+            "group",
+            "stream",
+            "abstract",
+            "pages",
+            "std_level",
+            "ad",
+            "obsoletes",
+            "updates",
+            "subseries",
+            "keywords",
+        ]
+
+    def validate(self, data):
+        if "draft_name" in data or "draft_rev" in data:
+            if "draft_name" not in data:
+                raise serializers.ValidationError(
+                    {"draft_name": "Missing draft_name"},
+                    code="invalid-draft-spec",
+                ) 
+            if "draft_rev" not in data:
+                raise serializers.ValidationError(
+                    {"draft_rev": "Missing draft_rev"},
+                    code="invalid-draft-spec",
+                )
+        return data
+
+    def update(self, instance, validated_data):
+        raise RuntimeError("Cannot update with this serializer")
+
+    def create(self, validated_data):
+        """Publish an RFC"""
+        published = validated_data.pop("published")
+        draft_name = validated_data.pop("draft_name", None)
+        draft_rev = validated_data.pop("draft_rev", None)
+        obsoletes = validated_data.pop("obsoletes", [])
+        updates = validated_data.pop("updates", [])
+        subseries = validated_data.pop("subseries", [])
+
+        system_person = Person.objects.get(name="(System)")
+
+        # If specified, retrieve draft and extract RFC default values from it
+        if draft_name is None:
+            draft = None
+        else:
+            # validation enforces that draft_name and draft_rev are both present
+            draft = Document.objects.filter(
+                type_id="draft",
+                name=draft_name,
+                rev=draft_rev,
+            ).first()
+            if draft is None:
+                raise serializers.ValidationError(
+                    {
+                        "draft_name": "No such draft",
+                        "draft_rev": "No such draft",
+                    },
+                    code="invalid-draft"
+                )
+            elif draft.get_state_slug() == "rfc":
+                raise serializers.ValidationError(
+                    {
+                        "draft_name": "Draft already published as RFC",
+                    },
+                    code="already-published-draft",
+                )
+
+        # Transaction to clean up if something fails
+        with transaction.atomic():
+            # create rfc, letting validated request data override draft defaults
+            rfc = self._create_rfc(validated_data)
+            DocEvent.objects.create(
+                doc=rfc,
+                rev=rfc.rev,
+                type="published_rfc",
+                time=published,
+                by=system_person,
+                desc="RFC published",
+            )
+            rfc.set_state(State.objects.get(used=True, type_id="rfc", slug="published"))
+    
+            # create updates / obsoletes relations
+            for obsoleted_rfc_pk in obsoletes:
+                RelatedDocument.objects.get_or_create(
+                    source=rfc, target=obsoleted_rfc_pk, relationship_id="obs"
+                )
+            for updated_rfc_pk in updates:
+                RelatedDocument.objects.get_or_create(
+                    source=rfc, target=updated_rfc_pk, relationship_id="updates"
+                )
+        
+            # create subseries relations
+            for subseries_doc_name in subseries:
+                ss_slug = subseries_doc_name[:3]
+                subseries_doc, ss_doc_created = Document.objects.get_or_create(
+                    type_id=ss_slug, name=subseries_doc_name
+                )
+                if ss_doc_created:
+                    subseries_doc.docevent_set.create(
+                        type=f"{ss_slug}_doc_created",
+                        by=system_person,
+                        desc=f"Created {subseries_doc_name} via publication of {rfc.name}",
+                    )
+                _, ss_rel_created = subseries_doc.relateddocument_set.get_or_create(
+                    relationship_id="contains", target=rfc
+                )
+                if ss_rel_created:
+                    subseries_doc.docevent_set.create(
+                        type="sync_from_rfc_editor",
+                        by=system_person,
+                        desc=f"Added {rfc.name} to {subseries_doc.name}",
+                    )
+                    rfc.docevent_set.create(
+                        type="sync_from_rfc_editor",
+                        by=system_person,
+                        desc=f"Added {rfc.name} to {subseries_doc.name}",
+                    )
+    
+    
+            # create relation with draft and update draft state
+            if draft is not None:
+                draft_changes = []
+                draft_events = []
+                if draft.get_state_slug() != "rfc":
+                    draft.set_state(
+                        State.objects.get(used=True, type="draft", slug="rfc")
+                    )
+                    move_draft_files_to_archive(draft, draft.rev)
+                    draft_changes.append(f"changed state to {draft.get_state()}")
+    
+                r, created_relateddoc = RelatedDocument.objects.get_or_create(
+                    source=draft, target=rfc, relationship_id="became_rfc",
+                )
+                if created_relateddoc:
+                    change = "created {rel_name} relationship between {pretty_draft_name} and {pretty_rfc_name}".format(
+                        rel_name=r.relationship.name.lower(),
+                        pretty_draft_name=prettify_std_name(draft_name),
+                        pretty_rfc_name=prettify_std_name(rfc.name),
+                    )
+                    draft_changes.append(change)
+    
+                # Always set the "draft-iesg" state. This state should be set for all drafts, so
+                # log a warning if it is not set. What should happen here is that ietf stream
+                # RFCs come in as "rfcqueue" and are set to "pub" when they appear in the RFC index.
+                # Other stream documents should normally be "idexists" and be left that way. The
+                # code here *actually* leaves "draft-iesg" state alone if it is "idexists" or "pub",
+                # and changes any other state to "pub". If unset, it changes it to "idexists".
+                # This reflects historical behavior and should probably be updated, but a migration
+                # of existing drafts (and validation of the change) is needed before we change the
+                # handling.
+                prev_iesg_state = draft.get_state("draft-iesg")
+                if prev_iesg_state is None:
+                    log.log(f'Warning while processing {rfc.name}: {draft.name} has no "draft-iesg" state')
+                    new_iesg_state = State.objects.get(type_id="draft-iesg", slug="idexists")
+                elif prev_iesg_state.slug not in ("pub", "idexists"):
+                    if prev_iesg_state.slug != "rfcqueue":
+                        log.log(
+                            'Warning while processing {}: {} is in "draft-iesg" state {} (expected "rfcqueue")'.format(
+                                rfc.name, draft.name, prev_iesg_state.slug
+                            )
+                        )
+                    new_iesg_state = State.objects.get(type_id="draft-iesg", slug="pub")
+                else:
+                    new_iesg_state = prev_iesg_state
+        
+                if new_iesg_state != prev_iesg_state:
+                    draft.set_state(new_iesg_state)
+                    draft_changes.append(f"changed {new_iesg_state.type.label} to {new_iesg_state}")
+                    e = update_action_holders(draft, prev_iesg_state, new_iesg_state)
+                    if e:
+                        draft_events.append(e)
+    
+                # If the draft and RFC streams agree, move draft to "pub" stream state. If not, complain.
+                if draft.stream != rfc.stream:
+                    log.log("Warning while processing {}: draft {} stream is {} but RFC stream is {}".format(
+                        rfc.name, draft.name, draft.stream, rfc.stream
+                    ))
+                elif draft.stream.slug in ["iab", "irtf", "ise", "editorial"]:
+                    stream_slug = f"draft-stream-{draft.stream.slug}"
+                    prev_state = draft.get_state(stream_slug)
+                    if prev_state is not None and prev_state.slug != "pub":
+                        new_state = State.objects.select_related("type").get(used=True, type__slug=stream_slug, slug="pub")
+                        draft.set_state(new_state)
+                        draft_changes.append(
+                            f"changed {new_state.type.label} to {new_state}"
+                        )
+                        e = update_action_holders(draft, prev_state, new_state)
+                        if e:
+                            draft_events.append(e)
+                if draft_changes:
+                    draft_events.append(
+                        DocEvent.objects.create(
+                            doc=draft,
+                            rev=draft.rev,
+                            by=system_person,
+                            type="sync_from_rfc_editor",
+                            desc=f"Updated while publishing {rfc.name} ({', '.join(draft_changes)})",
+                        )
+                    )
+                    draft.save_with_history(draft_events)
+
+        return rfc
+
+    def _create_rfc(self, validated_data):
+        authors_data = validated_data.pop("authors")
+        rfc = Document.objects.create(
+            type_id="rfc",
+            name=f"rfc{validated_data['rfc_number']}",
+            **validated_data,
+        )
+        for order, author_data in enumerate(authors_data):
+            rfc.rfcauthor_set.create(
+                order=order,
+                **author_data,
+            )
+        return rfc
+
+
+class EditableRfcSerializer(serializers.ModelSerializer):
+    # Would be nice to reconcile this with ietf.doc.serializers.RfcSerializer.
+    # The purposes of that serializer (representing data for Red) and this one
+    # (accepting updates from Purple) are different enough that separate formats
+    # may be needed, but if not it'd be nice to have a single RfcSerializer that
+    # can serve both.
+    #
+    # Should also consider whether this and RfcPubSerializer should merge.
+    #
+    # Treats published and subseries fields as write-only. This isn't quite correct,
+    # but makes it easier and we don't currently use the serialized value except for
+    # debugging.
+    published = serializers.DateTimeField(
+        default_timezone=datetime.timezone.utc,
+        write_only=True,
+    )
+    authors = RfcAuthorSerializer(many=True, min_length=1, source="rfcauthor_set")
+    subseries = serializers.ListField(
+        child=SubseriesNameField(required=False),
+        write_only=True,
+    )
+
+    class Meta:
+        model = Document
+        fields = [
+            "published",
+            "title",
+            "authors",
+            "stream",
+            "abstract",
+            "pages",
+            "std_level",
+            "subseries",
+            "keywords",
+        ]
+
+    def create(self, validated_data):
+        raise RuntimeError("Cannot create with this serializer")
+
+    def update(self, instance, validated_data):
+        assert isinstance(instance, Document)
+        assert instance.type_id == "rfc"
+        rfc = instance  # get better name
+
+        system_person = Person.objects.get(name="(System)")
+
+        # Remove data that needs special handling. Use a singleton object to detect
+        # missing values in case we ever support a value that needs None as an option.
+        omitted = object()
+        published = validated_data.pop("published", omitted)
+        subseries = validated_data.pop("subseries", omitted)
+        authors_data = validated_data.pop("rfcauthor_set", omitted)
+
+        # Transaction to clean up if something fails
+        with transaction.atomic():
+            # update the rfc Document itself
+            rfc_changes = []
+            rfc_events = []
+            
+            for attr, new_value in validated_data.items():
+                old_value = getattr(rfc, attr)
+                if new_value != old_value:
+                    rfc_changes.append(
+                        f"changed {attr} to '{new_value}' from '{old_value}'"
+                    )
+                    setattr(rfc, attr, new_value)
+            if len(rfc_changes) > 0:
+                rfc_change_summary = f"{', '.join(rfc_changes)}"
+                rfc_events.append(
+                    DocEvent.objects.create(
+                        doc=rfc,
+                        rev=rfc.rev,
+                        by=system_person,
+                        type="sync_from_rfc_editor",
+                        desc=f"Changed metadata: {rfc_change_summary}",
+                    )
+                )
+            if authors_data is not omitted:
+                rfc_events.extend(_update_authors(instance, authors_data))
+
+            if published is not omitted:
+                published_event = rfc.latest_event(type="published_rfc")
+                if published_event is None:
+                    # unexpected, but possible in theory
+                    rfc_events.append(
+                        DocEvent.objects.create(
+                            doc=rfc,
+                            rev=rfc.rev,
+                            type="published_rfc",
+                            time=published,
+                            by=system_person,
+                            desc="RFC published",
+                        )
+                    )
+                    rfc_events.append(
+                        DocEvent.objects.create(
+                            doc=rfc,
+                            rev=rfc.rev,
+                            type="sync_from_rfc_editor",
+                            by=system_person,
+                            desc=(
+                                f"Set publication timestamp to {published.isoformat()}"
+                            ),
+                        )
+                    )
+                else:
+                    original_pub_time = published_event.time
+                    if published != original_pub_time:
+                        published_event.time = published
+                        published_event.save()
+                        rfc_events.append(
+                            DocEvent.objects.create(
+                                doc=rfc,
+                                rev=rfc.rev,
+                                type="sync_from_rfc_editor",
+                                by=system_person,
+                                desc=(
+                                    f"Changed publication time to "
+                                    f"{published.isoformat()} from "
+                                    f"{original_pub_time.isoformat()}"
+                                )
+                            )
+                        )
+
+            # update subseries relations
+            if subseries is not omitted:
+                for subseries_doc_name in subseries:
+                    ss_slug = subseries_doc_name[:3]
+                    subseries_doc, ss_doc_created = Document.objects.get_or_create(
+                        type_id=ss_slug, name=subseries_doc_name
+                    )
+                    if ss_doc_created:
+                        subseries_doc.docevent_set.create(
+                            type=f"{ss_slug}_doc_created",
+                            by=system_person,
+                            desc=f"Created {subseries_doc_name} via update of {rfc.name}",
+                        )
+                    _, ss_rel_created = subseries_doc.relateddocument_set.get_or_create(
+                        relationship_id="contains", target=rfc
+                    )
+                    if ss_rel_created:
+                        subseries_doc.docevent_set.create(
+                            type="sync_from_rfc_editor",
+                            by=system_person,
+                            desc=f"Added {rfc.name} to {subseries_doc.name}",
+                        )
+                        rfc_events.append(
+                            rfc.docevent_set.create(
+                                type="sync_from_rfc_editor",
+                                by=system_person,
+                                desc=f"Added {rfc.name} to {subseries_doc.name}",
+                            )
+                        )
+                # Delete subseries relations that are no longer current
+                stale_subseries_relations = rfc.relations_that("contains").exclude(
+                    source__name__in=subseries
+                )
+                for stale_relation in stale_subseries_relations:
+                    stale_subseries_doc = stale_relation.source
+                    rfc_events.append(
+                        rfc.docevent_set.create(
+                            type="sync_from_rfc_editor",
+                            by=system_person,
+                            desc=f"Removed {rfc.name} from {stale_subseries_doc.name}",
+                        )
+                    )
+                    stale_subseries_doc.docevent_set.create(
+                        type="sync_from_rfc_editor",
+                        by=system_person,
+                        desc=f"Removed {rfc.name} from {stale_subseries_doc.name}",
+                    )
+                stale_subseries_relations.delete()
+            if len(rfc_events) > 0:
+                rfc.save_with_history(rfc_events)
+        # Gather obs and updates in both directions as a title/author change to
+        # this doc affects the info rendering of all of the other RFCs
+        needs_updating = sorted(
+            [
+                d.rfc_number
+                for d in [rfc]
+                + rfc.related_that_doc(("obs", "updates"))
+                + rfc.related_that(("obs", "updates"))
+            ]
+        )
+        trigger_red_precomputer_task.delay(rfc_number_list=needs_updating)
+        # Update the search index also
+        update_rfc_searchindex_task.delay(rfc.rfc_number)
+        return rfc
+
+
+class RfcFileSerializer(serializers.Serializer):
+    # The structure of this serializer is constrained by what openapi-generator-cli's
+    # python generator can correctly serialize as multipart/form-data. It does not
+    # handle nested serializers well (or perhaps at all). ListFields with child
+    # ChoiceField or RegexField do not serialize correctly. DictFields don't seem
+    # to work.
+    #
+    # It does seem to correctly send filenames along with FileFields, even as a child
+    # in a ListField, so we use that to convey the file format of each item. There
+    # are other options we could consider (e.g., a structured CharField) but this
+    # works.
+    allowed_extensions = (
+        ".html",
+        ".json",
+        ".notprepped.xml",
+        ".pdf",
+        ".txt",
+        ".xml",
+    )
+
+    rfc = serializers.SlugRelatedField(
+        slug_field="rfc_number",
+        queryset=Document.objects.filter(type_id="rfc"),
+        help_text="RFC number to which the contents belong",
+    )
+    contents = serializers.ListField(
+        child=serializers.FileField(
+            allow_empty_file=False,
+            use_url=False,
+        ),
+        help_text=(
+            "List of content files. Filename extensions are used to identify "
+            "file types, but filenames are otherwise ignored."
+        ),
+    )
+    mtime = serializers.DateTimeField(
+        required=False,
+        default=timezone.now,
+        default_timezone=datetime.UTC,
+        help_text="Modification timestamp to apply to uploaded files",
+    )
+    replace = serializers.BooleanField(
+        required=False,
+        default=False,
+        help_text=(
+            "Replace existing files for this RFC. Defaults to false. When false, "
+            "if _any_ files already exist for the specified RFC the upload will be "
+            "rejected regardless of which files are being uploaded. When true,"
+            "existing files will be removed and new ones will be put in place. BE"
+            "VERY CAREFUL WITH THIS OPTION IN PRODUCTION."
+        ),
+    )
+
+    def validate_contents(self, data):
+        found_extensions = []
+        for uploaded_file in data:
+            if not hasattr(uploaded_file, "name"):
+                raise serializers.ValidationError(
+                    "filename not specified for uploaded file",
+                    code="missing-filename",
+                )
+            ext = "".join(Path(uploaded_file.name).suffixes)
+            if ext not in self.allowed_extensions:
+                raise serializers.ValidationError(
+                    f"File uploaded with invalid extension '{ext}'",
+                    code="invalid-filename-ext",
+                )
+            if ext in found_extensions:
+                raise serializers.ValidationError(
+                    f"More than one file uploaded with extension '{ext}'",
+                    code="duplicate-filename-ext",
+                )
+        return data
+
+
+class NotificationAckSerializer(serializers.Serializer):
+    message = serializers.CharField(default="ack")
diff --git a/ietf/api/tests.py b/ietf/api/tests.py
index ab565a917c..2a44791a5c 100644
--- a/ietf/api/tests.py
+++ b/ietf/api/tests.py
@@ -1,19 +1,23 @@
-# Copyright The IETF Trust 2015-2020, All Rights Reserved
+# Copyright The IETF Trust 2015-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
-
+import base64
+import copy
 import datetime
 import json
 import html
+from unittest import mock
 import os
 import sys
 
 from importlib import import_module
-from mock import patch
 from pathlib import Path
+from random import randrange
 
 from django.apps import apps
 from django.conf import settings
-from django.test import Client
+from django.http import HttpResponseForbidden
+from django.test import Client, RequestFactory
+from django.test.utils import override_settings
 from django.urls import reverse as urlreverse
 from django.utils import timezone
 
@@ -22,41 +26,36 @@
 import debug                            # pyflakes:ignore
 
 import ietf
+from ietf.doc.storage_utils import retrieve_str
 from ietf.doc.utils import get_unicode_document_content
+from ietf.doc.models import RelatedDocument, State
+from ietf.doc.factories import IndividualDraftFactory, WgDraftFactory, WgRfcFactory
 from ietf.group.factories import RoleFactory
 from ietf.meeting.factories import MeetingFactory, SessionFactory
-from ietf.meeting.test_data import make_meeting_test_data
-from ietf.meeting.models import Session
-from ietf.person.factories import PersonFactory, random_faker
-from ietf.person.models import User
-from ietf.person.models import PersonalApiKey
-from ietf.stats.models import MeetingRegistration
-from ietf.utils.mail import outbox, get_payload_text
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+from ietf.meeting.models import Session, Registration
+from ietf.nomcom.models import Volunteer
+from ietf.nomcom.factories import NomComFactory, nomcom_kwargs_for_year
+from ietf.person.factories import PersonFactory, random_faker, EmailFactory, PersonalApiKeyFactory
+from ietf.person.models import Email, User
+from ietf.utils.mail import empty_outbox, outbox, get_payload_text
+from ietf.utils.models import DumpInfo
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized, reload_db_objects
+
+from . import Serializer
+from .ietf_utils import is_valid_token, requires_api_token
+from .views import EmailIngestionError
 
 OMITTED_APPS = (
     'ietf.secr.meetings',
     'ietf.secr.proceedings',
     'ietf.ipr',
+    'ietf.status',
+    'ietf.blobdb',
 )
 
 class CustomApiTests(TestCase):
     settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['AGENDA_PATH']
 
-    # Using mock to patch the import functions in ietf.meeting.views, where
-    # api_import_recordings() are using them:
-    @patch('ietf.meeting.views.import_audio_files')
-    def test_notify_meeting_import_audio_files(self, mock_import_audio):
-        meeting = make_meeting_test_data()
-        client = Client(Accept='application/json')
-        # try invalid method GET
-        url = urlreverse('ietf.meeting.views.api_import_recordings', kwargs={'number':meeting.number})
-        r = client.get(url)
-        self.assertEqual(r.status_code, 405)
-        # try valid method POST
-        r = client.post(url)
-        self.assertEqual(r.status_code, 201)
-
     def test_api_help_page(self):
         url = urlreverse('ietf.api.views.api_help')
         r = self.client.get(url)
@@ -67,14 +66,14 @@ def test_api_openid_issuer(self):
         r = self.client.get(url)
         self.assertContains(r, 'OpenID Connect Issuer', status_code=200)
 
-    def test_api_set_session_video_url(self):
+    def test_deprecated_api_set_session_video_url(self):
         url = urlreverse('ietf.meeting.views.api_set_session_video_url')
         recmanrole = RoleFactory(group__type_id='ietf', name_id='recman')
         recman = recmanrole.person
         meeting = MeetingFactory(type_id='ietf')
         session = SessionFactory(group__type_id='wg', meeting=meeting)
         group = session.group
-        apikey = PersonalApiKey.objects.create(endpoint=url, person=recman)
+        apikey = PersonalApiKeyFactory(endpoint=url, person=recman)
         video = 'https://foo.example.com/bar/beer/'
 
         # error cases
@@ -82,7 +81,7 @@ def test_api_set_session_video_url(self):
         self.assertContains(r, "Missing apikey parameter", status_code=400)
 
         badrole  = RoleFactory(group__type_id='ietf', name_id='ad')
-        badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person)
+        badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person)
         badrole.person.user.last_login = timezone.now()
         badrole.person.user.save()
         r = self.client.post(url, {'apikey': badapikey.hash()} )
@@ -96,7 +95,7 @@ def test_api_set_session_video_url(self):
         r = self.client.get(url, {'apikey': apikey.hash()} )
         self.assertContains(r, "Method not allowed", status_code=405)
 
-        r = self.client.post(url, {'apikey': apikey.hash()} )
+        r = self.client.post(url, {'apikey': apikey.hash(), 'group': group.acronym} )
         self.assertContains(r, "Missing meeting parameter", status_code=400)
 
 
@@ -148,17 +147,160 @@ def test_api_set_session_video_url(self):
         event = doc.latest_event()
         self.assertEqual(event.by, recman)
 
-    def test_api_add_session_attendees(self):
+    def test_api_set_session_video_url(self):
+        url = urlreverse("ietf.meeting.views.api_set_session_video_url")
+        recmanrole = RoleFactory(group__type_id="ietf", name_id="recman")
+        recman = recmanrole.person
+        meeting = MeetingFactory(type_id="ietf")
+        session = SessionFactory(group__type_id="wg", meeting=meeting)
+        apikey = PersonalApiKeyFactory(endpoint=url, person=recman)
+        video = "https://foo.example.com/bar/beer/"
+
+        # error cases
+        r = self.client.post(url, {})
+        self.assertContains(r, "Missing apikey parameter", status_code=400)
+
+        badrole = RoleFactory(group__type_id="ietf", name_id="ad")
+        badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person)
+        badrole.person.user.last_login = timezone.now()
+        badrole.person.user.save()
+        r = self.client.post(url, {"apikey": badapikey.hash()})
+        self.assertContains(r, "Restricted to role: Recording Manager", status_code=403)
+
+        r = self.client.post(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Too long since last regular login", status_code=400)
+        recman.user.last_login = timezone.now()
+        recman.user.save()
+
+        r = self.client.get(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Method not allowed", status_code=405)
+
+        r = self.client.post(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Missing session_id parameter", status_code=400)
+
+        r = self.client.post(url, {"apikey": apikey.hash(), "session_id": session.pk})
+        self.assertContains(r, "Missing url parameter", status_code=400)
+
+        bad_pk = int(Session.objects.order_by("-pk").first().pk) + 1
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": bad_pk,
+                "url": video,
+            },
+        )
+        self.assertContains(r, "Session not found", status_code=400)
+
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": "foo",
+                "url": video,
+            },
+        )
+        self.assertContains(r, "Invalid session_id", status_code=400)
+
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": session.pk,
+                "url": "foobar",
+            },
+        )
+        self.assertContains(r, "Invalid url value: 'foobar'", status_code=400)
+
+        r = self.client.post(
+            url, {"apikey": apikey.hash(), "session_id": session.pk, "url": video}
+        )
+        self.assertContains(r, "Done", status_code=200)
+
+        recordings = session.recordings()
+        self.assertEqual(len(recordings), 1)
+        doc = recordings[0]
+        self.assertEqual(doc.external_url, video)
+        event = doc.latest_event()
+        self.assertEqual(event.by, recman)
+
+    def test_api_set_meetecho_recording_name(self):
+        url = urlreverse("ietf.meeting.views.api_set_meetecho_recording_name")
+        recmanrole = RoleFactory(group__type_id="ietf", name_id="recman")
+        recman = recmanrole.person
+        meeting = MeetingFactory(type_id="ietf")
+        session = SessionFactory(group__type_id="wg", meeting=meeting)
+        apikey = PersonalApiKeyFactory(endpoint=url, person=recman)
+        name = "testname"
+
+        # error cases
+        r = self.client.post(url, {})
+        self.assertContains(r, "Missing apikey parameter", status_code=400)
+
+        badrole = RoleFactory(group__type_id="ietf", name_id="ad")
+        badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person)
+        badrole.person.user.last_login = timezone.now()
+        badrole.person.user.save()
+        r = self.client.post(url, {"apikey": badapikey.hash()})
+        self.assertContains(r, "Restricted to role: Recording Manager", status_code=403)
+
+        r = self.client.post(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Too long since last regular login", status_code=400)
+        recman.user.last_login = timezone.now()
+        recman.user.save()
+
+        r = self.client.get(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Method not allowed", status_code=405)
+
+        r = self.client.post(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Missing session_id parameter", status_code=400)
+
+        r = self.client.post(url, {"apikey": apikey.hash(), "session_id": session.pk})
+        self.assertContains(r, "Missing name parameter", status_code=400)
+
+        bad_pk = int(Session.objects.order_by("-pk").first().pk) + 1
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": bad_pk,
+                "name": name,
+            },
+        )
+        self.assertContains(r, "Session not found", status_code=400)
+
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": "foo",
+                "name": name,
+            },
+        )
+        self.assertContains(r, "Invalid session_id", status_code=400)
+
+        r = self.client.post(
+            url, {"apikey": apikey.hash(), "session_id": session.pk, "name": name}
+        )
+        self.assertContains(r, "Done", status_code=200)
+
+        session.refresh_from_db()
+        self.assertEqual(session.meetecho_recording_name, name)
+
+
+    def test_api_add_session_attendees_deprecated(self):
+        # Deprecated test - should be removed when we stop accepting a simple list of user PKs in
+        # the add_session_attendees() view
         url = urlreverse('ietf.meeting.views.api_add_session_attendees')
         otherperson = PersonFactory()
         recmanrole = RoleFactory(group__type_id='ietf', name_id='recman')
         recman = recmanrole.person
         meeting = MeetingFactory(type_id='ietf')
         session = SessionFactory(group__type_id='wg', meeting=meeting)  
-        apikey = PersonalApiKey.objects.create(endpoint=url, person=recman)
+        apikey = PersonalApiKeyFactory(endpoint=url, person=recman)
 
         badrole  = RoleFactory(group__type_id='ietf', name_id='ad')
-        badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person)
+        badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person)
         badrole.person.user.last_login = timezone.now()
         badrole.person.user.save()
 
@@ -214,6 +356,120 @@ def test_api_add_session_attendees(self):
         self.assertTrue(session.attended_set.filter(person=recman).exists())
         self.assertTrue(session.attended_set.filter(person=otherperson).exists())
 
+    def test_api_add_session_attendees(self):
+        url = urlreverse("ietf.meeting.views.api_add_session_attendees")
+        otherperson = PersonFactory()
+        recmanrole = RoleFactory(group__type_id="ietf", name_id="recman")
+        recman = recmanrole.person
+        meeting = MeetingFactory(type_id="ietf")
+        session = SessionFactory(group__type_id="wg", meeting=meeting)
+        apikey = PersonalApiKeyFactory(endpoint=url, person=recman)
+
+        badrole = RoleFactory(group__type_id="ietf", name_id="ad")
+        badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person)
+        badrole.person.user.last_login = timezone.now()
+        badrole.person.user.save()
+
+        # Improper credentials, or method
+        r = self.client.post(url, {})
+        self.assertContains(r, "Missing apikey parameter", status_code=400)
+
+        r = self.client.post(url, {"apikey": badapikey.hash()})
+        self.assertContains(r, "Restricted to role: Recording Manager", status_code=403)
+
+        r = self.client.post(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Too long since last regular login", status_code=400)
+
+        recman.user.last_login = timezone.now() - datetime.timedelta(days=365)
+        recman.user.save()
+        r = self.client.post(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Too long since last regular login", status_code=400)
+
+        recman.user.last_login = timezone.now()
+        recman.user.save()
+        r = self.client.get(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Method not allowed", status_code=405)
+
+        recman.user.last_login = timezone.now()
+        recman.user.save()
+
+        # Malformed requests
+        r = self.client.post(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Missing attended parameter", status_code=400)
+
+        for baddict in (
+            "{}",
+            '{"bogons;drop table":"bogons;drop table"}',
+            '{"session_id":"Not an integer;drop table"}',
+            f'{{"session_id":{session.pk},"attendees":"not a list;drop table"}}',
+            f'{{"session_id":{session.pk},"attendees":"not a list;drop table"}}',
+            f'{{"session_id":{session.pk},"attendees":[1,2,"not an int;drop table",4]}}',
+            f'{{"session_id":{session.pk},"attendees":["user_id":{recman.user.pk}]}}',  # no join_time
+            f'{{"session_id":{session.pk},"attendees":["user_id":{recman.user.pk},"join_time;drop table":"2024-01-01T00:00:00Z]}}',
+            f'{{"session_id":{session.pk},"attendees":["user_id":{recman.user.pk},"join_time":"not a time;drop table"]}}',
+            # next has no time zone indicator
+            f'{{"session_id":{session.pk},"attendees":["user_id":{recman.user.pk},"join_time":"2024-01-01T00:00:00"]}}',
+            f'{{"session_id":{session.pk},"attendees":["user_id":"not an int; drop table","join_time":"2024-01-01T00:00:00Z"]}}',
+            # Uncomment the next one when the _deprecated version of this test is retired
+            # f'{{"session_id":{session.pk},"attendees":[{recman.user.pk}, {otherperson.user.pk}]}}',
+        ):
+            r = self.client.post(url, {"apikey": apikey.hash(), "attended": baddict})
+            self.assertContains(r, "Malformed post", status_code=400)
+
+        bad_session_id = Session.objects.order_by("-pk").first().pk + 1
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "attended": f'{{"session_id":{bad_session_id},"attendees":[]}}',
+            },
+        )
+        self.assertContains(r, "Invalid session", status_code=400)
+        bad_user_id = User.objects.order_by("-pk").first().pk + 1
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "attended": f'{{"session_id":{session.pk},"attendees":[{{"user_id":{bad_user_id}, "join_time":"2024-01-01T00:00:00Z"}}]}}',
+            },
+        )
+        self.assertContains(r, "Invalid attendee", status_code=400)
+
+        # Reasonable request
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "attended": json.dumps(
+                    {
+                        "session_id": session.pk,
+                        "attendees": [
+                            {
+                                "user_id": recman.user.pk,
+                                "join_time": "2023-09-03T12:34:56Z",
+                            },
+                            {
+                                "user_id": otherperson.user.pk,
+                                "join_time": "2023-09-03T03:00:19Z",
+                            },
+                        ],
+                    }
+                ),
+            },
+        )
+
+        self.assertEqual(session.attended_set.count(), 2)
+        self.assertTrue(session.attended_set.filter(person=recman).exists())
+        self.assertEqual(
+            session.attended_set.get(person=recman).time,
+            datetime.datetime(2023, 9, 3, 12, 34, 56, tzinfo=datetime.UTC),
+        )
+        self.assertTrue(session.attended_set.filter(person=otherperson).exists())
+        self.assertEqual(
+            session.attended_set.get(person=otherperson).time,
+            datetime.datetime(2023, 9, 3, 3, 0, 19, tzinfo=datetime.UTC),
+        )
+
     def test_api_upload_polls_and_chatlog(self):
         recmanrole = RoleFactory(group__type_id='ietf', name_id='recman')
         recmanrole.person.user.last_login = timezone.now()
@@ -263,8 +519,8 @@ def test_api_upload_polls_and_chatlog(self):
             ),
         ):
             url = urlreverse(f"ietf.meeting.views.api_upload_{type_id}")
-            apikey = PersonalApiKey.objects.create(endpoint=url, person=recmanrole.person)
-            badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person)
+            apikey = PersonalApiKeyFactory(endpoint=url, person=recmanrole.person)
+            badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person)
 
             r = self.client.post(url, {})
             self.assertContains(r, "Missing apikey parameter", status_code=400)
@@ -297,24 +553,27 @@ def test_api_upload_polls_and_chatlog(self):
             r = self.client.post(url,{'apikey':apikey.hash(),'apidata': f'{{"session_id":{session.pk}, "{type_id}":{content}}}'})
             self.assertEqual(r.status_code, 200)
 
-            newdoc = session.sessionpresentation_set.get(document__type_id=type_id).document
+            newdoc = session.presentations.get(document__type_id=type_id).document
             newdoccontent = get_unicode_document_content(newdoc.name, Path(session.meeting.get_materials_path()) / type_id / newdoc.uploaded_filename)
             self.assertEqual(json.loads(content), json.loads(newdoccontent))
+            self.assertEqual(
+                json.loads(retrieve_str(type_id, newdoc.uploaded_filename)),
+                json.loads(content)
+            )
 
     def test_api_upload_bluesheet(self):
-        url = urlreverse('ietf.meeting.views.api_upload_bluesheet')
-        recmanrole = RoleFactory(group__type_id='ietf', name_id='recman')
+        url = urlreverse("ietf.meeting.views.api_upload_bluesheet")
+        recmanrole = RoleFactory(group__type_id="ietf", name_id="recman")
         recman = recmanrole.person
-        meeting = MeetingFactory(type_id='ietf')
-        session = SessionFactory(group__type_id='wg', meeting=meeting)
-        group = session.group
-        apikey = PersonalApiKey.objects.create(endpoint=url, person=recman)
-        
+        meeting = MeetingFactory(type_id="ietf")
+        session = SessionFactory(group__type_id="wg", meeting=meeting)
+        apikey = PersonalApiKeyFactory(endpoint=url, person=recman)
+
         people = [
-                {"name":"Andrea Andreotti", "affiliation": "Azienda"},
-                {"name":"Bosse Bernadotte", "affiliation": "Bolag"},
-                {"name":"Charles Charlemagne", "affiliation": "Compagnie"},
-            ]
+            {"name": "Andrea Andreotti", "affiliation": "Azienda"},
+            {"name": "Bosse Bernadotte", "affiliation": "Bolag"},
+            {"name": "Charles Charlemagne", "affiliation": "Compagnie"},
+        ]
         for i in range(3):
             faker = random_faker()
             people.append(dict(name=faker.name(), affiliation=faker.company()))
@@ -324,80 +583,93 @@ def test_api_upload_bluesheet(self):
         r = self.client.post(url, {})
         self.assertContains(r, "Missing apikey parameter", status_code=400)
 
-        badrole  = RoleFactory(group__type_id='ietf', name_id='ad')
-        badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person)
+        badrole = RoleFactory(group__type_id="ietf", name_id="ad")
+        badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person)
         badrole.person.user.last_login = timezone.now()
         badrole.person.user.save()
-        r = self.client.post(url, {'apikey': badapikey.hash()} )
-        self.assertContains(r, "Restricted to roles: Recording Manager, Secretariat", status_code=403)
+        r = self.client.post(url, {"apikey": badapikey.hash()})
+        self.assertContains(
+            r, "Restricted to roles: Recording Manager, Secretariat", status_code=403
+        )
 
-        r = self.client.post(url, {'apikey': apikey.hash()} )
+        r = self.client.post(url, {"apikey": apikey.hash()})
         self.assertContains(r, "Too long since last regular login", status_code=400)
         recman.user.last_login = timezone.now()
         recman.user.save()
 
-        r = self.client.get(url, {'apikey': apikey.hash()} )
+        r = self.client.get(url, {"apikey": apikey.hash()})
         self.assertContains(r, "Method not allowed", status_code=405)
 
-        r = self.client.post(url, {'apikey': apikey.hash()} )
-        self.assertContains(r, "Missing meeting parameter", status_code=400)
-
-
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, } )
-        self.assertContains(r, "Missing group parameter", status_code=400)
-
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym} )
-        self.assertContains(r, "Missing item parameter", status_code=400)
+        r = self.client.post(url, {"apikey": apikey.hash()})
+        self.assertContains(r, "Missing session_id parameter", status_code=400)
 
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym, 'item': '1'} )
+        r = self.client.post(url, {"apikey": apikey.hash(), "session_id": session.pk})
         self.assertContains(r, "Missing bluesheet parameter", status_code=400)
 
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': '1', 'group': group.acronym,
-                                    'item': '1', 'bluesheet': bluesheet, })
-        self.assertContains(r, "No sessions found for meeting", status_code=400)
-
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': 'bogous',
-                                    'item': '1', 'bluesheet': bluesheet, })
-        self.assertContains(r, "No sessions found in meeting '%s' for group 'bogous'"%meeting.number, status_code=400)
-
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym,
-                                    'item': '1', 'bluesheet': "foobar", })
-        self.assertContains(r, "Invalid json value: 'foobar'", status_code=400)
-
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym,
-                                    'item': '5', 'bluesheet': bluesheet, })
-        self.assertContains(r, "No item '5' found in list of sessions for group", status_code=400)
-
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym,
-                                    'item': 'foo', 'bluesheet': bluesheet, })
-        self.assertContains(r, "Expected a numeric value for 'item', found 'foo'", status_code=400)
-
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym,
-                                    'item': '1', 'bluesheet': bluesheet, })
+        bad_session_pk = int(Session.objects.order_by("-pk").first().pk) + 1
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": bad_session_pk,
+                "bluesheet": bluesheet,
+            },
+        )
+        self.assertContains(r, "Session not found", status_code=400)
+
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": "foo",
+                "bluesheet": bluesheet,
+            },
+        )
+        self.assertContains(r, "Invalid session_id", status_code=400)
+
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": session.pk,
+                "bluesheet": bluesheet,
+            },
+        )
         self.assertContains(r, "Done", status_code=200)
 
         # Submit again, with slightly different content, as an updated version
-        people[1]['affiliation'] = 'Bolaget AB'
+        people[1]["affiliation"] = "Bolaget AB"
         bluesheet = json.dumps(people)
-        r = self.client.post(url, {'apikey': apikey.hash(), 'meeting': meeting.number, 'group': group.acronym,
-                                    'item': '1', 'bluesheet': bluesheet, })
+        r = self.client.post(
+            url,
+            {
+                "apikey": apikey.hash(),
+                "session_id": session.pk,
+                "bluesheet": bluesheet,
+            },
+        )
         self.assertContains(r, "Done", status_code=200)
 
-        bluesheet = session.sessionpresentation_set.filter(document__type__slug='bluesheets').first().document
+        bluesheet = (
+            session.presentations.filter(document__type__slug="bluesheets")
+            .first()
+            .document
+        )
         # We've submitted an update; check that the rev is right
-        self.assertEqual(bluesheet.rev, '01')
+        self.assertEqual(bluesheet.rev, "01")
         # Check the content
         with open(bluesheet.get_file_name()) as file:
             text = file.read()
             for p in people:
-                self.assertIn(p['name'], html.unescape(text))
-                self.assertIn(p['affiliation'], html.unescape(text))
+                self.assertIn(p["name"], html.unescape(text))
+                self.assertIn(p["affiliation"], html.unescape(text))
 
     def test_person_export(self):
         person = PersonFactory()
         url = urlreverse('ietf.api.views.PersonalInformationExportView')
         login_testing_unauthorized(self, person.user.username, url)
         r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
         jsondata = r.json()
         data = jsondata['person.person'][str(person.id)]
         self.assertEqual(data['name'], person.name)
@@ -408,14 +680,14 @@ def test_api_v2_person_export_view(self):
         url = urlreverse('ietf.api.views.ApiV2PersonExportView')
         robot = PersonFactory(user__is_staff=True)
         RoleFactory(name_id='robot', person=robot, email=robot.email(), group__acronym='secretariat')
-        apikey = PersonalApiKey.objects.create(endpoint=url, person=robot)
+        apikey = PersonalApiKeyFactory(endpoint=url, person=robot)
 
         # error cases
         r = self.client.post(url, {})
         self.assertContains(r, "Missing apikey parameter", status_code=400)
 
         badrole = RoleFactory(group__type_id='ietf', name_id='ad')
-        badapikey = PersonalApiKey.objects.create(endpoint=url, person=badrole.person)
+        badapikey = PersonalApiKeyFactory(endpoint=url, person=badrole.person)
         badrole.person.user.last_login = timezone.now()
         badrole.person.user.save()
         r = self.client.post(url, {'apikey': badapikey.hash()})
@@ -433,111 +705,799 @@ def test_api_v2_person_export_view(self):
         self.assertEqual(data['ascii'], robot.ascii)
         self.assertEqual(data['user']['email'], robot.user.email)
 
-    def test_api_new_meeting_registration(self):
+    @override_settings(APP_API_TOKENS={"ietf.api.views.api_new_meeting_registration_v2": ["valid-token"]})
+    def test_api_new_meeting_registration_v2(self):
         meeting = MeetingFactory(type_id='ietf')
-        reg = {
-            'apikey': 'invalid',
+        person = PersonFactory()
+        reg_detail = {
+            'email': person.email().address,
+            'first_name': person.first_name(),
+            'last_name': person.last_name(),
+            'meeting': meeting.number,
             'affiliation': "Alguma Corporação",
             'country_code': 'PT',
-            'email': 'foo@example.pt',
-            'first_name': 'Foo',
-            'last_name': 'Bar',
-            'meeting': meeting.number,
-            'reg_type': 'hackathon',
-            'ticket_type': '',
-            'checkedin': 'False',
+            'checkedin': False,
+            'is_nomcom_volunteer': False,
+            'cancelled': False,
+            'tickets': [{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}],
         }
-        url = urlreverse('ietf.api.views.api_new_meeting_registration')
-        r = self.client.post(url, reg)
-        self.assertContains(r, 'Invalid apikey', status_code=403)
-        oidcp = PersonFactory(user__is_staff=True)
-        # Make sure 'oidcp' has an acceptable role
-        RoleFactory(name_id='robot', person=oidcp, email=oidcp.email(), group__acronym='secretariat')
-        key = PersonalApiKey.objects.create(person=oidcp, endpoint=url)
-        reg['apikey'] = key.hash()
-        #
-        # Test valid POST
-        # FIXME: sometimes, there seems to be something in the outbox?
-        old_len = len(outbox)
-        r = self.client.post(url, reg)
-        self.assertContains(r, "Accepted, New registration, Email sent", status_code=202)
-        #
-        # Check outgoing mail
-        self.assertEqual(len(outbox), old_len + 1)
-        body = get_payload_text(outbox[-1])
-        self.assertIn(reg['email'], outbox[-1]['To'] )
-        self.assertIn(reg['email'], body)
-        self.assertIn('account creation request', body)
+        reg_data = {'objects': {reg_detail['email']: reg_detail}}
+        url = urlreverse('ietf.api.views.api_new_meeting_registration_v2')
         #
-        # Check record
-        obj = MeetingRegistration.objects.get(email=reg['email'], meeting__number=reg['meeting'])
-        for key in ['affiliation', 'country_code', 'first_name', 'last_name', 'person', 'reg_type', 'ticket_type', 'checkedin']:
-            self.assertEqual(getattr(obj, key), False if key=='checkedin' else reg.get(key) , "Bad data for field '%s'" % key)
+        # Test invalid key
+        r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "invalid-token"})
+        self.assertEqual(r.status_code, 403)
         #
-        # Test with existing user
-        person = PersonFactory()
-        reg['email'] = person.email().address
-        reg['first_name'] = person.first_name()
-        reg['last_name'] = person.last_name()
+        # Test invalid data
+        bad_reg_data = copy.deepcopy(reg_data)
+        del bad_reg_data['objects'][reg_detail['email']]['email']
+        r = self.client.post(url, data=json.dumps(bad_reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 400)
         #
-        r = self.client.post(url, reg)
-        self.assertContains(r, "Accepted, New registration", status_code=202)
+        # Test valid POST
+        r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"})
+        self.assertContains(r, "Success", status_code=202)
         #
-        # There should be no new outgoing mail
-        self.assertEqual(len(outbox), old_len + 1)
+        # Check record
+        objects = Registration.objects.filter(email=reg_detail['email'], meeting__number=reg_detail['meeting'])
+        self.assertEqual(objects.count(), 1)
+        obj = objects[0]
+        for key in ['affiliation', 'country_code', 'first_name', 'last_name', 'checkedin']:
+            self.assertEqual(getattr(obj, key), False if key == 'checkedin' else reg_detail.get(key), f"Bad data for field {key}")
+        self.assertEqual(obj.tickets.count(), 1)
+        ticket = obj.tickets.first()
+        self.assertEqual(ticket.ticket_type.slug, reg_detail['tickets'][0]['ticket_type'])
+        self.assertEqual(ticket.attendance_type.slug, reg_detail['tickets'][0]['attendance_type'])
+        self.assertEqual(obj.person, person)
         #
-        # Test multiple reg types
-        reg['reg_type'] = 'remote'
-        reg['ticket_type'] = 'full_week_pass'
-        r = self.client.post(url, reg)
-        self.assertContains(r, "Accepted, New registration", status_code=202)
-        objs = MeetingRegistration.objects.filter(email=reg['email'], meeting__number=reg['meeting'])
-        self.assertEqual(len(objs), 2)
-        self.assertEqual(objs.filter(reg_type='hackathon').count(), 1)
-        self.assertEqual(objs.filter(reg_type='remote', ticket_type='full_week_pass').count(), 1)
-        self.assertEqual(len(outbox), old_len + 1)
+        # Test update (switch to remote)
+        reg_detail = {
+            'affiliation': "Alguma Corporação",
+            'country_code': 'PT',
+            'email': person.email().address,
+            'first_name': person.first_name(),
+            'last_name': person.last_name(),
+            'meeting': meeting.number,
+            'checkedin': False,
+            'is_nomcom_volunteer': False,
+            'cancelled': False,
+            'tickets': [{'attendance_type': 'remote', 'ticket_type': 'week_pass'}],
+        }
+        reg_data = {'objects': {reg_detail['email']: reg_detail}}
+        r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"})
+        self.assertContains(r, "Success", status_code=202)
+        objects = Registration.objects.filter(email=reg_detail['email'], meeting__number=reg_detail['meeting'])
+        self.assertEqual(objects.count(), 1)
+        obj = objects[0]
+        self.assertEqual(obj.tickets.count(), 1)
+        ticket = obj.tickets.first()
+        self.assertEqual(ticket.ticket_type.slug, reg_detail['tickets'][0]['ticket_type'])
+        self.assertEqual(ticket.attendance_type.slug, reg_detail['tickets'][0]['attendance_type'])
         #
-        # Test incomplete POST
-        drop_fields = ['affiliation', 'first_name', 'reg_type']
-        for field in drop_fields:
-            del reg[field]
-        r = self.client.post(url, reg)        
-        self.assertContains(r, 'Missing parameters:', status_code=400)
-        err, fields = r.content.decode().split(':', 1)
-        missing_fields = [f.strip() for f in fields.split(',')]
-        self.assertEqual(set(missing_fields), set(drop_fields))
+        # Test multiple
+        reg_detail = {
+            'affiliation': "Alguma Corporação",
+            'country_code': 'PT',
+            'email': person.email().address,
+            'first_name': person.first_name(),
+            'last_name': person.last_name(),
+            'meeting': meeting.number,
+            'checkedin': False,
+            'is_nomcom_volunteer': False,
+            'cancelled': False,
+            'tickets': [
+                {'attendance_type': 'onsite', 'ticket_type': 'one_day'},
+                {'attendance_type': 'remote', 'ticket_type': 'week_pass'},
+            ],
+        }
+        reg_data = {'objects': {reg_detail['email']: reg_detail}}
+        r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"})
+        self.assertContains(r, "Success", status_code=202)
+        objects = Registration.objects.filter(email=reg_detail['email'], meeting__number=reg_detail['meeting'])
+        self.assertEqual(objects.count(), 1)
+        obj = objects[0]
+        self.assertEqual(obj.tickets.count(), 2)
+        self.assertEqual(obj.tickets.filter(attendance_type__slug='onsite').count(), 1)
+        self.assertEqual(obj.tickets.filter(attendance_type__slug='remote').count(), 1)
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views.api_new_meeting_registration_v2": ["valid-token"]})
+    def test_api_new_meeting_registration_v2_cancelled(self):
+        meeting = MeetingFactory(type_id='ietf')
+        person = PersonFactory()
+        reg_detail = {
+            'affiliation': "Acme",
+            'country_code': 'US',
+            'email': person.email().address,
+            'first_name': person.first_name(),
+            'last_name': person.last_name(),
+            'meeting': meeting.number,
+            'checkedin': False,
+            'is_nomcom_volunteer': False,
+            'cancelled': False,
+            'tickets': [{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}],
+        }
+        reg_data = {'objects': {reg_detail['email']: reg_detail}}
+        url = urlreverse('ietf.api.views.api_new_meeting_registration_v2')
+        self.assertEqual(Registration.objects.count(), 0)
+        r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"})
+        self.assertContains(r, "Success", status_code=202)
+        self.assertEqual(Registration.objects.count(), 1)
+        reg_detail['cancelled'] = True
+        r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"})
+        self.assertContains(r, "Success", status_code=202)
+        self.assertEqual(Registration.objects.count(), 0)
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views.api_new_meeting_registration_v2": ["valid-token"]})
+    def test_api_new_meeting_registration_v2_nomcom(self):
+        meeting = MeetingFactory(type_id='ietf')
+        person = PersonFactory()
+        reg_detail = {
+            'affiliation': "Acme",
+            'country_code': 'US',
+            'email': person.email().address,
+            'first_name': person.first_name(),
+            'last_name': person.last_name(),
+            'meeting': meeting.number,
+            'checkedin': False,
+            'is_nomcom_volunteer': False,
+            'cancelled': False,
+            'tickets': [{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}],
+        }
+        reg_data = {'objects': {reg_detail['email']: reg_detail}}
+        url = urlreverse('ietf.api.views.api_new_meeting_registration_v2')
+        now = datetime.datetime.now()
+        if now.month > 10:
+            year = now.year + 1
+        else:
+            year = now.year
+        # create appropriate group and nomcom objects
+        nomcom = NomComFactory.create(is_accepting_volunteers=True, **nomcom_kwargs_for_year(year))
+
+        # first test is_nomcom_volunteer False
+        r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"})
+        self.assertContains(r, "Success", status_code=202)
+        # assert no Volunteers exists
+        self.assertEqual(Volunteer.objects.count(), 0)
+
+        # test is_nomcom_volunteer True
+        reg_detail['is_nomcom_volunteer'] = True
+        r = self.client.post(url, data=json.dumps(reg_data), content_type='application/json', headers={"X-Api-Key": "valid-token"})
+        self.assertContains(r, "Success", status_code=202)
+        # assert Volunteer exists
+        self.assertEqual(Volunteer.objects.count(), 1)
+        volunteer = Volunteer.objects.last()
+        self.assertEqual(volunteer.person, person)
+        self.assertEqual(volunteer.nomcom, nomcom)
+        self.assertEqual(volunteer.origin, 'registration')
 
     def test_api_version(self):
+        DumpInfo.objects.create(date=timezone.datetime(2022,8,31,7,10,1,tzinfo=datetime.UTC), host='testapi.example.com',tz='UTC')
         url = urlreverse('ietf.api.views.version')
         r = self.client.get(url)
         data = r.json()
         self.assertEqual(data['version'], ietf.__version__+ietf.__patch__)
+        for lib in settings.ADVERTISE_VERSIONS:
+            self.assertIn(lib, data['other'])
+        self.assertEqual(data['dumptime'], "2022-08-31 07:10:01 +0000")
+        DumpInfo.objects.update(tz='PST8PDT')
+        r = self.client.get(url)
+        data = r.json()        
+        self.assertEqual(data['dumptime'], "2022-08-31 07:10:01 -0700")
+
 
     def test_api_appauth(self):
-        url = urlreverse('ietf.api.views.app_auth')
-        person = PersonFactory()
-        apikey = PersonalApiKey.objects.create(endpoint=url, person=person)
+        for app in ["authortools", "bibxml"]:
+            url = urlreverse('ietf.api.views.app_auth', kwargs={"app": app})
+            person = PersonFactory()
+            apikey = PersonalApiKeyFactory(endpoint=url, person=person)
+    
+            self.client.login(username=person.user.username,password=f'{person.user.username}+password')
+            self.client.logout()
+    
+            # error cases
+            # missing apikey
+            r = self.client.post(url, {})
+            self.assertContains(r, 'Missing apikey parameter', status_code=400)
+    
+            # invalid apikey
+            r = self.client.post(url, {'apikey': 'foobar'})
+            self.assertContains(r, 'Invalid apikey', status_code=403)
+    
+            # working case
+            r = self.client.post(url, {'apikey': apikey.hash()})
+            self.assertEqual(r.status_code, 200)
+            jsondata = r.json()
+            self.assertEqual(jsondata['success'], True)
+            self.client.logout()
 
-        self.client.login(username=person.user.username,password=f'{person.user.username}+password')
-        self.client.logout()
+    @override_settings(APP_API_TOKENS={"ietf.api.views.nfs_metrics": ["valid-token"]})
+    def test_api_nfs_metrics(self):
+        url = urlreverse("ietf.api.views.nfs_metrics")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertContains(r, 'nfs_latency_seconds{operation="write"}')
 
-        # error cases
-        # missing apikey
-        r = self.client.post(url, {})
-        self.assertContains(r, 'Missing apikey parameter', status_code=400)
+    def test_api_get_session_matherials_no_agenda_meeting_url(self):
+        meeting = MeetingFactory(type_id='ietf')
+        session = SessionFactory(meeting=meeting)
+        url = urlreverse('ietf.meeting.views.api_get_session_materials', kwargs={'session_id': session.pk})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+    
+    @override_settings(APP_API_TOKENS={"ietf.api.views.draft_aliases": ["valid-token"]})
+    @mock.patch("ietf.api.views.DraftAliasGenerator")
+    def test_draft_aliases(self, mock):
+        mock.return_value = (("alias1", ("a1", "a2")), ("alias2", ("a3", "a4")))
+        url = urlreverse("ietf.api.views.draft_aliases")
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-type"], "application/json")
+        self.assertEqual(
+            json.loads(r.content),
+            {
+                "aliases": [
+                    {"alias": "alias1", "domains": ["ietf"], "addresses": ["a1", "a2"]},
+                    {"alias": "alias2", "domains": ["ietf"], "addresses": ["a3", "a4"]},
+                ]}
+        )
+        # some invalid cases
+        self.assertEqual(
+            self.client.get(url, headers={}).status_code,
+            403,
+        )
+        self.assertEqual(
+            self.client.get(url, headers={"X-Api-Key": "something-else"}).status_code,
+            403,
+        )
+        self.assertEqual(
+            self.client.post(url, headers={"X-Api-Key": "something-else"}).status_code,
+            403,
+        )
+        self.assertEqual(
+            self.client.post(url, headers={"X-Api-Key": "valid-token"}).status_code,
+            405,
+        )
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views.group_aliases": ["valid-token"]})
+    @mock.patch("ietf.api.views.GroupAliasGenerator")
+    def test_group_aliases(self, mock):
+        mock.return_value = (("alias1", ("ietf",), ("a1", "a2")), ("alias2", ("ietf", "iab"), ("a3", "a4")))
+        url = urlreverse("ietf.api.views.group_aliases")
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-type"], "application/json")
+        self.assertEqual(
+            json.loads(r.content),
+            {
+                "aliases": [
+                    {"alias": "alias1", "domains": ["ietf"], "addresses": ["a1", "a2"]},
+                    {"alias": "alias2", "domains": ["ietf", "iab"], "addresses": ["a3", "a4"]},
+                ]}
+        )
+        # some invalid cases
+        self.assertEqual(
+            self.client.get(url, headers={}).status_code,
+            403,
+        )
+        self.assertEqual(
+            self.client.get(url, headers={"X-Api-Key": "something-else"}).status_code,
+            403,
+        )
+        self.assertEqual(
+            self.client.post(url, headers={"X-Api-Key": "something-else"}).status_code,
+            403,
+        )
+        self.assertEqual(
+            self.client.post(url, headers={"X-Api-Key": "valid-token"}).status_code,
+            405,
+        )
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views.active_email_list": ["valid-token"]})
+    def test_active_email_list(self):
+        EmailFactory(active=True)  # make sure there's at least one active email...
+        EmailFactory(active=False)  # ... and at least one non-active emai
+        url = urlreverse("ietf.api.views.active_email_list")
+        r = self.client.post(url, headers={})
+        self.assertEqual(r.status_code, 403)
+        r = self.client.get(url, headers={})
+        self.assertEqual(r.status_code, 403)
+        r = self.client.get(url, headers={"X-Api-Key": "not-the-valid-token"})
+        self.assertEqual(r.status_code, 403)
+        r = self.client.post(url, headers={"X-Api-Key": "not-the-valid-token"})
+        self.assertEqual(r.status_code, 403)
+        r = self.client.post(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 405)
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        result = json.loads(r.content)
+        self.assertCountEqual(result.keys(), ["addresses"])
+        self.assertCountEqual(result["addresses"], Email.objects.filter(active=True).values_list("address", flat=True))
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views.related_email_list": ["valid-token"]})
+    def test_related_email_list(self):
+        joe = EmailFactory(address='joe@work.com')
+        EmailFactory(address='joe@home.com', person=joe.person)
+        EmailFactory(address='jòe@spain.com', person=joe.person)
+        url = urlreverse("ietf.api.views.related_email_list", kwargs={'email': 'joe@home.com'})
+        # no api key
+        r = self.client.get(url, headers={})
+        self.assertEqual(r.status_code, 403)
+        # invalid api key
+        r = self.client.get(url, headers={"X-Api-Key": "not-the-valid-token"})
+        self.assertEqual(r.status_code, 403)
+        # wrong method
+        r = self.client.post(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 405)
+        # valid
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        result = json.loads(r.content)
+        self.assertCountEqual(result.keys(), ["addresses"])
+        self.assertCountEqual(result["addresses"], joe.person.email_set.values_list("address", flat=True))
+        # non-ascii
+        non_ascii_url = urlreverse("ietf.api.views.related_email_list", kwargs={'email': 'jòe@spain.com'})
+        r = self.client.get(non_ascii_url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200)
+        result = json.loads(r.content)
+        self.assertTrue('joe@home.com' in result["addresses"])
+        # email not found
+        not_found_url = urlreverse("ietf.api.views.related_email_list", kwargs={'email': 'nobody@nowhere.com'})
+        r = self.client.get(not_found_url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 404)
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views.role_holder_addresses": ["valid-token"]})
+    def test_role_holder_addresses(self):
+        url = urlreverse("ietf.api.views.role_holder_addresses")
+        r = self.client.get(url, headers={})
+        self.assertEqual(r.status_code, 403, "No api token, no access")
+        r = self.client.get(url, headers={"X-Api-Key": "not-valid-token"})
+        self.assertEqual(r.status_code, 403, "Bad api token, no access")
+        r = self.client.post(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 405, "Bad method, no access")
+
+        emails = EmailFactory.create_batch(5)
+        email_queryset = Email.objects.filter(pk__in=[e.pk for e in emails])
+        with mock.patch("ietf.api.views.role_holder_emails", return_value=email_queryset):
+            r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200, "Good api token and method, access")
+        content_dict = json.loads(r.content)
+        self.assertCountEqual(content_dict.keys(), ["addresses"])
+        self.assertEqual(
+            content_dict["addresses"],
+            sorted(e.address for e in emails),
+        )
+
+    @override_settings(
+        APP_API_TOKENS={"ietf.api.views.ingest_email": "valid-token", "ietf.api.views.ingest_email_test": "test-token"}
+    )
+    @mock.patch("ietf.api.views.iana_ingest_review_email")
+    @mock.patch("ietf.api.views.ipr_ingest_response_email")
+    @mock.patch("ietf.api.views.nomcom_ingest_feedback_email")
+    def test_ingest_email(
+        self, mock_nomcom_ingest, mock_ipr_ingest, mock_iana_ingest
+    ):
+        mocks = {mock_nomcom_ingest, mock_ipr_ingest, mock_iana_ingest}
+        empty_outbox()        
+        url = urlreverse("ietf.api.views.ingest_email")
+        test_mode_url = urlreverse("ietf.api.views.ingest_email_test")
+
+        # test various bad calls
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+        self.assertFalse(any(m.called for m in mocks))
+        r = self.client.get(test_mode_url)
+        self.assertEqual(r.status_code, 403)
+        self.assertFalse(any(m.called for m in mocks))
+
+        r = self.client.post(url)
+        self.assertEqual(r.status_code, 403)
+        self.assertFalse(any(m.called for m in mocks))
+        r = self.client.post(test_mode_url)
+        self.assertEqual(r.status_code, 403)
+        self.assertFalse(any(m.called for m in mocks))
+
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 405)
+        self.assertFalse(any(m.called for m in mocks))
+        r = self.client.get(test_mode_url, headers={"X-Api-Key": "test-token"})
+        self.assertEqual(r.status_code, 405)
+        self.assertFalse(any(m.called for m in mocks))
+
+        r = self.client.post(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 415)
+        self.assertFalse(any(m.called for m in mocks))
+        r = self.client.post(test_mode_url, headers={"X-Api-Key": "test-token"})
+        self.assertEqual(r.status_code, 415)
+        self.assertFalse(any(m.called for m in mocks))
+
+        r = self.client.post(
+            url, content_type="application/json", headers={"X-Api-Key": "valid-token"}
+        )
+        self.assertEqual(r.status_code, 400)
+        self.assertFalse(any(m.called for m in mocks))
+        r = self.client.post(
+            test_mode_url, content_type="application/json", headers={"X-Api-Key": "test-token"}
+        )
+        self.assertEqual(r.status_code, 400)
+        self.assertFalse(any(m.called for m in mocks))
+
+        r = self.client.post(
+            url,
+            "this is not JSON!",
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(r.status_code, 400)
+        self.assertFalse(any(m.called for m in mocks))
+        r = self.client.post(
+            test_mode_url,
+            "this is not JSON!",
+            content_type="application/json",
+            headers={"X-Api-Key": "test-token"},
+        )
+        self.assertEqual(r.status_code, 400)
+        self.assertFalse(any(m.called for m in mocks))
+
+        r = self.client.post(
+            url,
+            {"json": "yes", "valid_schema": False},
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(r.status_code, 400)
+        self.assertFalse(any(m.called for m in mocks))
+        r = self.client.post(
+            test_mode_url,
+            {"json": "yes", "valid_schema": False},
+            content_type="application/json",
+            headers={"X-Api-Key": "test-token"},
+        )
+        self.assertEqual(r.status_code, 400)
+        self.assertFalse(any(m.called for m in mocks))
+
+        # bad destination
+        message_b64 = base64.b64encode(b"This is a message").decode()
+        r = self.client.post(
+            url,
+            {"dest": "not-a-destination", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "bad_dest"})
+        self.assertFalse(any(m.called for m in mocks))
+        r = self.client.post(
+            test_mode_url,
+            {"dest": "not-a-destination", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "test-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "bad_dest"})
+        self.assertFalse(any(m.called for m in mocks))
+
+        # test that valid requests call handlers appropriately
+        r = self.client.post(
+            url,
+            {"dest": "iana-review", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "ok"})
+        self.assertTrue(mock_iana_ingest.called)
+        self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message"))
+        self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest})))
+        mock_iana_ingest.reset_mock()
+        
+        # the test mode endpoint should _not_ call the handler
+        r = self.client.post(
+            test_mode_url,
+            {"dest": "iana-review", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "test-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "ok"})
+        self.assertFalse(any(m.called for m in mocks))
+        mock_iana_ingest.reset_mock()
+        
+        r = self.client.post(
+            url,
+            {"dest": "ipr-response", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "ok"})
+        self.assertTrue(mock_ipr_ingest.called)
+        self.assertEqual(mock_ipr_ingest.call_args, mock.call(b"This is a message"))
+        self.assertFalse(any(m.called for m in (mocks - {mock_ipr_ingest})))
+        mock_ipr_ingest.reset_mock()
+
+        # the test mode endpoint should _not_ call the handler
+        r = self.client.post(
+            test_mode_url,
+            {"dest": "ipr-response", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "test-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "ok"})
+        self.assertFalse(any(m.called for m in mocks))
+        mock_ipr_ingest.reset_mock()
+
+        # bad nomcom-feedback dest
+        for bad_nomcom_dest in [
+            "nomcom-feedback",  # no suffix
+            "nomcom-feedback-",  # no year
+            "nomcom-feedback-squid",  # not a year,
+            "nomcom-feedback-2024-2025",  # also not a year
+        ]:
+            r = self.client.post(
+                url,
+                {"dest": bad_nomcom_dest, "message": message_b64},
+                content_type="application/json",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 200)
+            self.assertEqual(r.headers["Content-Type"], "application/json")
+            self.assertEqual(json.loads(r.content), {"result": "bad_dest"})
+            self.assertFalse(any(m.called for m in mocks))
+            r = self.client.post(
+                test_mode_url,
+                {"dest": bad_nomcom_dest, "message": message_b64},
+                content_type="application/json",
+                headers={"X-Api-Key": "test-token"},
+            )
+            self.assertEqual(r.status_code, 200)
+            self.assertEqual(r.headers["Content-Type"], "application/json")
+            self.assertEqual(json.loads(r.content), {"result": "bad_dest"})
+            self.assertFalse(any(m.called for m in mocks))
+
+        # good nomcom-feedback dest
+        random_year = randrange(100000)
+        r = self.client.post(
+            url,
+            {"dest": f"nomcom-feedback-{random_year}", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "ok"})
+        self.assertTrue(mock_nomcom_ingest.called)
+        self.assertEqual(mock_nomcom_ingest.call_args, mock.call(b"This is a message", random_year))
+        self.assertFalse(any(m.called for m in (mocks - {mock_nomcom_ingest})))
+        mock_nomcom_ingest.reset_mock()
+
+        # the test mode endpoint should _not_ call the handler
+        r = self.client.post(
+            test_mode_url,
+            {"dest": f"nomcom-feedback-{random_year}", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "test-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "ok"})
+        self.assertFalse(any(m.called for m in mocks))
+        mock_nomcom_ingest.reset_mock()
+
+        # test that exceptions lead to email being sent - assumes that iana-review handling is representative
+        mock_iana_ingest.side_effect = EmailIngestionError("Error: don't send email")
+        r = self.client.post(
+            url,
+            {"dest": "iana-review", "message": message_b64},
+            content_type="application/json",
+            headers={"X-Api-Key": "valid-token"},
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "bad_msg"})
+        self.assertTrue(mock_iana_ingest.called)
+        self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message"))
+        self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest})))
+        self.assertEqual(len(outbox), 0)  # implicitly tests that _none_ of the earlier tests sent email
+        mock_iana_ingest.reset_mock()
+
+        # test default recipients and attached original message
+        mock_iana_ingest.side_effect = EmailIngestionError(
+            "Error: do send email",
+            email_body="This is my email\n",
+            email_original_message=b"This is the original message"
+        )
+        with override_settings(ADMINS=[("Some Admin", "admin@example.com")]):
+            r = self.client.post(
+                url,
+                {"dest": "iana-review", "message": message_b64},
+                content_type="application/json",
+                headers={"X-Api-Key": "valid-token"},
+            )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "bad_msg"})
+        self.assertTrue(mock_iana_ingest.called)
+        self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message"))
+        self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest})))
+        self.assertEqual(len(outbox), 1)
+        self.assertIn("admin@example.com", outbox[0]["To"])
+        self.assertEqual("Error: do send email", outbox[0]["Subject"])
+        self.assertEqual("This is my email\n", get_payload_text(outbox[0].get_body()))
+        attachments = list(a for a in outbox[0].iter_attachments())
+        self.assertEqual(len(attachments), 1)
+        self.assertEqual(attachments[0].get_filename(), "original-message")
+        self.assertEqual(attachments[0].get_content_type(), "application/octet-stream")
+        self.assertEqual(attachments[0].get_content(), b"This is the original message")
+        mock_iana_ingest.reset_mock()
+        empty_outbox()
+
+        # test overridden recipients and no attached original message
+        mock_iana_ingest.side_effect = EmailIngestionError(
+            "Error: do send email",
+            email_body="This is my email\n",
+            email_recipients=("thatguy@example.com")
+        )
+        with override_settings(ADMINS=[("Some Admin", "admin@example.com")]):
+            r = self.client.post(
+                url,
+                {"dest": "iana-review", "message": message_b64},
+                content_type="application/json",
+                headers={"X-Api-Key": "valid-token"},
+            )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "bad_msg"})
+        self.assertTrue(mock_iana_ingest.called)
+        self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message"))
+        self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest})))
+        self.assertEqual(len(outbox), 1)
+        self.assertNotIn("admin@example.com", outbox[0]["To"])
+        self.assertIn("thatguy@example.com", outbox[0]["To"])
+        self.assertEqual("Error: do send email", outbox[0]["Subject"])
+        self.assertEqual("This is my email\n", get_payload_text(outbox[0]))
+        mock_iana_ingest.reset_mock()
+        empty_outbox()
+
+        # test attached traceback
+        mock_iana_ingest.side_effect = EmailIngestionError(
+            "Error: do send email",
+            email_body="This is my email\n",
+            email_attach_traceback=True,
+        )
+        with override_settings(ADMINS=[("Some Admin", "admin@example.com")]):
+            r = self.client.post(
+                url,
+                {"dest": "iana-review", "message": message_b64},
+                content_type="application/json",
+                headers={"X-Api-Key": "valid-token"},
+            )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "application/json")
+        self.assertEqual(json.loads(r.content), {"result": "bad_msg"})
+        self.assertTrue(mock_iana_ingest.called)
+        self.assertEqual(mock_iana_ingest.call_args, mock.call(b"This is a message"))
+        self.assertFalse(any(m.called for m in (mocks - {mock_iana_ingest})))
+        self.assertEqual(len(outbox), 1)
+        self.assertIn("admin@example.com", outbox[0]["To"])
+        self.assertEqual("Error: do send email", outbox[0]["Subject"])
+        self.assertEqual("This is my email\n", get_payload_text(outbox[0].get_body()))
+        attachments = list(a for a in outbox[0].iter_attachments())
+        self.assertEqual(len(attachments), 1)
+        self.assertEqual(attachments[0].get_filename(), "traceback.txt")
+        self.assertEqual(attachments[0].get_content_type(), "text/plain")
+        self.assertIn("ietf.api.views.EmailIngestionError: Error: do send email", attachments[0].get_content())
+        mock_iana_ingest.reset_mock()
+        empty_outbox()
+
+
+class DirectAuthApiTests(TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.valid_token = "nSZJDerbau6WZwbEAYuQ"
+        self.invalid_token = self.valid_token
+        while self.invalid_token == self.valid_token:
+            self.invalid_token = User.objects.make_random_password(20)
+        self.url = urlreverse("ietf.api.views.directauth")
+        self.valid_person = PersonFactory()
+        self.valid_password = self.valid_person.user.username+"+password"
+        self.invalid_password = self.valid_password
+        while self.invalid_password == self.valid_password:
+            self.invalid_password = User.objects.make_random_password(20)
+
+        self.valid_body_with_good_password = self.post_dict(authtoken=self.valid_token, username=self.valid_person.user.username, password=self.valid_password)
+        self.valid_body_with_bad_password = self.post_dict(authtoken=self.valid_token, username=self.valid_person.user.username, password=self.invalid_password)
+        self.valid_body_with_unknown_user = self.post_dict(authtoken=self.valid_token, username="notauser@nowhere.nada", password=self.valid_password)
+
+    def post_dict(self, authtoken, username, password):
+        data = dict()
+        if authtoken is not None:
+            data["authtoken"] = authtoken
+        if username is not None:
+            data["username"] = username
+        if password is not None:
+            data["password"] = password
+        return dict(data = json.dumps(data))
+
+    def response_data(self, response):
+        try:
+            data = json.loads(response.content)
+        except json.decoder.JSONDecodeError:
+            data = None
+        self.assertIsNotNone(data)
+        return data
+
+    def test_bad_methods(self):
+        for method in (self.client.get, self.client.put, self.client.head, self.client.delete, self.client.patch):
+            r = method(self.url)
+            self.assertEqual(r.status_code, 405)
+
+    def test_bad_post(self):
+        for bad in [
+            self.post_dict(authtoken=None, username=self.valid_person.user.username, password=self.valid_password),
+            self.post_dict(authtoken=self.valid_token, username=None, password=self.valid_password),
+            self.post_dict(authtoken=self.valid_token, username=self.valid_person.user.username, password=None),
+            self.post_dict(authtoken=None, username=None, password=self.valid_password),
+            self.post_dict(authtoken=self.valid_token, username=None, password=None),
+            self.post_dict(authtoken=None, username=self.valid_person.user.username, password=None),
+            self.post_dict(authtoken=None, username=None, password=None),
+        ]:
+            r = self.client.post(self.url, bad)
+            self.assertEqual(r.status_code, 200)
+            data = self.response_data(r)
+            self.assertEqual(data["result"], "failure")
+            self.assertEqual(data["reason"], "invalid post")
 
-        # invalid apikey
-        r = self.client.post(url, {'apikey': 'foobar'})
-        self.assertContains(r, 'Invalid apikey', status_code=403)
+        bad = dict(authtoken=self.valid_token, username=self.valid_person.user.username, password=self.valid_password)
+        r = self.client.post(self.url, bad)
+        self.assertEqual(r.status_code, 200)
+        data = self.response_data(r)
+        self.assertEqual(data["result"], "failure")
+        self.assertEqual(data["reason"], "invalid post")       
+
+    @override_settings()
+    def test_notokenstore(self):
+        del settings.APP_API_TOKENS  # only affects overridden copy of settings!
+        r = self.client.post(self.url,self.valid_body_with_good_password)
+        self.assertEqual(r.status_code, 200)
+        data = self.response_data(r)
+        self.assertEqual(data["result"], "failure")
+        self.assertEqual(data["reason"], "invalid authtoken")
 
-        # working case
-        r = self.client.post(url, {'apikey': apikey.hash()})
+    @override_settings(APP_API_TOKENS={"ietf.api.views.directauth":"nSZJDerbau6WZwbEAYuQ"})
+    def test_bad_username(self):
+        r = self.client.post(self.url, self.valid_body_with_unknown_user)
         self.assertEqual(r.status_code, 200)
-        jsondata = r.json()
-        self.assertEqual(jsondata['success'], True)
+        data = self.response_data(r)
+        self.assertEqual(data["result"], "failure")
+        self.assertEqual(data["reason"], "authentication failed")
 
+    @override_settings(APP_API_TOKENS={"ietf.api.views.directauth":"nSZJDerbau6WZwbEAYuQ"})
+    def test_bad_password(self):
+        r = self.client.post(self.url, self.valid_body_with_bad_password)
+        self.assertEqual(r.status_code, 200)
+        data = self.response_data(r)
+        self.assertEqual(data["result"], "failure")
+        self.assertEqual(data["reason"], "authentication failed")
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views.directauth":"nSZJDerbau6WZwbEAYuQ"})
+    def test_good_password(self):
+        r = self.client.post(self.url, self.valid_body_with_good_password)
+        self.assertEqual(r.status_code, 200)
+        data = self.response_data(r)
+        self.assertEqual(data["result"], "success")
 
-class TastypieApiTestCase(ResourceTestCaseMixin, TestCase):
+class TastypieApiTests(ResourceTestCaseMixin, TestCase):
     def __init__(self, *args, **kwargs):
         self.apps = {}
         for app_name in settings.INSTALLED_APPS:
@@ -547,7 +1507,7 @@ def __init__(self, *args, **kwargs):
                 models_path = os.path.join(os.path.dirname(app.__file__), "models.py")
                 if os.path.exists(models_path):
                     self.apps[name] = app_name
-        super(TastypieApiTestCase, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def test_api_top_level(self):
         client = Client(Accept='application/json')
@@ -556,7 +1516,7 @@ def test_api_top_level(self):
         resource_list = r.json()
 
         for name in self.apps:
-            if not name in self.apps:
+            if not name in resource_list:
                 sys.stderr.write("Expected a REST API resource for %s, but didn't find one\n" % name)
 
         for name in self.apps:
@@ -581,3 +1541,310 @@ def test_all_model_resources_exist(self):
                     #print("There doesn't seem to be any resource for model %s.models.%s"%(app.__name__,model.__name__,))
                     self.assertIn(model._meta.model_name, list(app_resources.keys()),
                         "There doesn't seem to be any API resource for model %s.models.%s"%(app.__name__,model.__name__,))
+
+    def test_serializer_to_etree_handles_nulls(self):
+        """Serializer to_etree() should handle a null character"""
+        serializer = Serializer()
+        try:
+            serializer.to_etree("string with no nulls in it")
+        except ValueError:
+            self.fail("serializer.to_etree raised ValueError on an ordinary string")
+        try:
+            serializer.to_etree("string with a \x00 in it")
+        except ValueError:
+            self.fail(
+                "serializer.to_etree raised ValueError on a string "
+                "containing a null character"
+            )
+
+
+class RfcdiffSupportTests(TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.target_view = 'ietf.api.views.rfcdiff_latest_json'
+        self._last_rfc_num = 8000
+
+    def getJson(self, view_args):
+        url = urlreverse(self.target_view, kwargs=view_args)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        return r.json()
+
+    def next_rfc_number(self):
+        self._last_rfc_num += 1
+        return self._last_rfc_num
+
+    def do_draft_test(self, name):
+        draft = IndividualDraftFactory(name=name, rev='00', create_revisions=range(0,13))
+        draft = reload_db_objects(draft)
+        prev_draft_rev = f'{(int(draft.rev)-1):02d}'
+
+        received = self.getJson(dict(name=draft.name))
+        self.assertEqual(
+            received,
+            dict(
+                name=draft.name,
+                rev=draft.rev,
+                content_url=draft.get_href(),
+                previous=f'{draft.name}-{prev_draft_rev}',
+                previous_url= draft.history_set.get(rev=prev_draft_rev).get_href(),
+            ),
+            'Incorrect JSON when draft revision not specified',
+        )
+
+        received = self.getJson(dict(name=draft.name, rev=draft.rev))
+        self.assertEqual(
+            received,
+            dict(
+                name=draft.name,
+                rev=draft.rev,
+                content_url=draft.get_href(),
+                previous=f'{draft.name}-{prev_draft_rev}',
+                previous_url= draft.history_set.get(rev=prev_draft_rev).get_href(),
+            ),
+            'Incorrect JSON when latest revision specified',
+        )
+
+        received = self.getJson(dict(name=draft.name, rev='10'))
+        prev_draft_rev = '09'
+        self.assertEqual(
+            received,
+            dict(
+                name=draft.name,
+                rev='10',
+                content_url=draft.history_set.get(rev='10').get_href(),
+                previous=f'{draft.name}-{prev_draft_rev}',
+                previous_url= draft.history_set.get(rev=prev_draft_rev).get_href(),
+            ),
+            'Incorrect JSON when historical revision specified',
+        )
+
+        received = self.getJson(dict(name=draft.name, rev='00'))
+        self.assertNotIn('previous', received, 'Rev 00 has no previous name when not replacing a draft')
+
+        replaced = IndividualDraftFactory()
+        RelatedDocument.objects.create(relationship_id='replaces',source=draft,target=replaced)
+        received = self.getJson(dict(name=draft.name, rev='00'))
+        self.assertEqual(received['previous'], f'{replaced.name}-{replaced.rev}',
+                         'Rev 00 has a previous name when replacing a draft')
+
+    def test_draft(self):
+        # test with typical, straightforward names
+        self.do_draft_test(name='draft-somebody-did-a-thing')
+        # try with different potentially problematic names
+        self.do_draft_test(name='draft-someone-did-something-01-02')
+        self.do_draft_test(name='draft-someone-did-something-else-02')
+        self.do_draft_test(name='draft-someone-did-something-02-weird-01')
+
+    def do_draft_with_broken_history_test(self, name):
+        draft = IndividualDraftFactory(name=name, rev='10')
+        received = self.getJson(dict(name=draft.name,rev='09'))
+        self.assertEqual(received['rev'],'09')
+        self.assertEqual(received['previous'], f'{draft.name}-08')
+        self.assertTrue('warning' in received)
+
+    def test_draft_with_broken_history(self):
+        # test with typical, straightforward names
+        self.do_draft_with_broken_history_test(name='draft-somebody-did-something')
+        # try with different potentially problematic names
+        self.do_draft_with_broken_history_test(name='draft-someone-did-something-01-02')
+        self.do_draft_with_broken_history_test(name='draft-someone-did-something-else-02')
+        self.do_draft_with_broken_history_test(name='draft-someone-did-something-02-weird-03')
+
+    def do_rfc_test(self, draft_name):
+        draft = WgDraftFactory(name=draft_name, create_revisions=range(0,2))
+        rfc = WgRfcFactory(group=draft.group, rfc_number=self.next_rfc_number())
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        draft.set_state(State.objects.get(type_id='draft',slug='rfc'))
+        draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub'))
+        draft, rfc = reload_db_objects(draft, rfc)
+
+        number = rfc.rfc_number
+        received = self.getJson(dict(name=number))
+        self.assertEqual(
+            received,
+            dict(
+                content_url=rfc.get_href(),
+                name=rfc.name,
+                previous=f'{draft.name}-{draft.rev}',
+                previous_url= draft.history_set.get(rev=draft.rev).get_href(),
+            ),
+            'Can look up an RFC by number',
+        )
+
+        num_received = received
+        received = self.getJson(dict(name=rfc.name))
+        self.assertEqual(num_received, received, 'RFC by canonical name gives same result as by number')
+
+        received = self.getJson(dict(name=f'RfC {number}'))
+        self.assertEqual(num_received, received, 'RFC with unusual spacing/caps gives same result as by number')
+
+        received = self.getJson(dict(name=draft.name))
+        self.assertEqual(num_received, received, 'RFC by draft name and no rev gives same result as by number')
+
+        received = self.getJson(dict(name=draft.name, rev='01'))
+        prev_draft_rev = '00'
+        self.assertEqual(
+            received,
+            dict(
+                content_url=draft.history_set.get(rev='01').get_href(),
+                name=draft.name,
+                rev='01',
+                previous=f'{draft.name}-{prev_draft_rev}',
+                previous_url= draft.history_set.get(rev=prev_draft_rev).get_href(),
+            ),
+            'RFC by draft name with rev should give draft name, not canonical name'
+        )
+
+    def test_rfc(self):
+        # simple draft name
+        self.do_rfc_test(draft_name='draft-test-ar-ef-see')
+        # tricky draft names
+        self.do_rfc_test(draft_name='draft-whatever-02')
+        self.do_rfc_test(draft_name='draft-test-me-03-04')
+
+    def test_rfc_with_tombstone(self):
+        draft = WgDraftFactory(create_revisions=range(0,2))
+        rfc = WgRfcFactory(rfc_number=3261,group=draft.group)# See views_doc.HAS_TOMBSTONE
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        draft.set_state(State.objects.get(type_id='draft',slug='rfc'))
+        draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub'))
+        draft = reload_db_objects(draft)
+
+        # Some old rfcs had tombstones that shouldn't be used for comparisons
+        received = self.getJson(dict(name=rfc.name))
+        self.assertTrue(received['previous'].endswith('00'))
+
+    def do_rfc_with_broken_history_test(self, draft_name):
+        draft = WgDraftFactory(rev='10', name=draft_name)
+        rfc = WgRfcFactory(group=draft.group, rfc_number=self.next_rfc_number())
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        draft.set_state(State.objects.get(type_id='draft',slug='rfc'))
+        draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub'))
+        draft = reload_db_objects(draft)
+
+        received = self.getJson(dict(name=draft.name))
+        self.assertEqual(
+            received,
+            dict(
+                content_url=rfc.get_href(),
+                name=rfc.name,
+                previous=f'{draft.name}-10',
+                previous_url= f'{settings.IETF_ID_ARCHIVE_URL}{draft.name}-10.txt',
+            ),
+            'RFC by draft name without rev should return canonical RFC name and no rev',
+        )
+
+        received = self.getJson(dict(name=draft.name, rev='10'))
+        self.assertEqual(received['name'], draft.name, 'RFC by draft name with rev should return draft name')
+        self.assertEqual(received['rev'], '10', 'Requested rev should be returned')
+        self.assertEqual(received['previous'], f'{draft.name}-09', 'Previous rev is one less than requested')
+        self.assertIn(f'{draft.name}-10', received['content_url'], 'Returned URL should include requested rev')
+        self.assertNotIn('warning', received, 'No warning when we have the rev requested')
+
+        received = self.getJson(dict(name=f'{draft.name}-09'))
+        self.assertEqual(received['name'], draft.name, 'RFC by draft name with rev should return draft name')
+        self.assertEqual(received['rev'], '09', 'Requested rev should be returned')
+        self.assertEqual(received['previous'], f'{draft.name}-08', 'Previous rev is one less than requested')
+        self.assertIn(f'{draft.name}-09', received['content_url'], 'Returned URL should include requested rev')
+        self.assertEqual(
+            received['warning'],
+            'History for this version not found - these results are speculation',
+            'Warning should be issued when requested rev is not found'
+        )
+
+    def test_rfc_with_broken_history(self):
+        # simple draft name
+        self.do_rfc_with_broken_history_test(draft_name='draft-some-draft')
+        # tricky draft names
+        self.do_rfc_with_broken_history_test(draft_name='draft-gizmo-01')
+        self.do_rfc_with_broken_history_test(draft_name='draft-oh-boy-what-a-draft-02-03')
+
+    def test_no_such_document(self):
+        for name in ['rfc0000', 'draft-ftei-oof-rab-00']:
+            url = urlreverse(self.target_view, kwargs={'name': name})
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 404)
+
+
+class TokenTests(TestCase):
+    @override_settings(APP_API_TOKENS={"known.endpoint": ["token in a list"], "oops": "token as a str"})
+    def test_is_valid_token(self):
+        # various invalid cases
+        self.assertFalse(is_valid_token("unknown.endpoint", "token in a list"))
+        self.assertFalse(is_valid_token("known.endpoint", "token"))
+        self.assertFalse(is_valid_token("known.endpoint", "token as a str"))
+        self.assertFalse(is_valid_token("oops", "token"))
+        self.assertFalse(is_valid_token("oops", "token in a list"))
+        # the only valid cases
+        self.assertTrue(is_valid_token("known.endpoint", "token in a list"))
+        self.assertTrue(is_valid_token("oops", "token as a str"))
+
+    @mock.patch("ietf.api.ietf_utils.is_valid_token")
+    def test_requires_api_token(self, mock_is_valid_token):
+        called = False
+
+        @requires_api_token
+        def fn_to_wrap(request, *args, **kwargs):
+            nonlocal called
+            called = True
+            return request, args, kwargs
+        
+        req_factory = RequestFactory()
+        arg = object()
+        kwarg = object()
+
+        # No X-Api-Key header
+        mock_is_valid_token.return_value = False
+        val = fn_to_wrap(
+            req_factory.get("/some/url", headers={}),
+            arg,
+            kwarg=kwarg,
+        )
+        self.assertTrue(isinstance(val, HttpResponseForbidden))
+        self.assertFalse(mock_is_valid_token.called)
+        self.assertFalse(called)
+
+        # Bad X-Api-Key header (not resetting the mock, it was not used yet)
+        val = fn_to_wrap(
+            req_factory.get("/some/url", headers={"X-Api-Key": "some-value"}),
+            arg, 
+            kwarg=kwarg,
+        )
+        self.assertTrue(isinstance(val, HttpResponseForbidden))
+        self.assertTrue(mock_is_valid_token.called)
+        self.assertEqual(
+            mock_is_valid_token.call_args[0], 
+            (fn_to_wrap.__module__ + "." + fn_to_wrap.__qualname__, "some-value"),
+        )
+        self.assertFalse(called)
+
+        # Valid header
+        mock_is_valid_token.reset_mock()
+        mock_is_valid_token.return_value = True
+        request = req_factory.get("/some/url", headers={"X-Api-Key": "some-value"}) 
+        # Bad X-Api-Key header (not resetting the mock, it was not used yet)
+        val = fn_to_wrap(
+            request,
+            arg, 
+            kwarg=kwarg,
+        )
+        self.assertEqual(val, (request, (arg,), {"kwarg": kwarg}))
+        self.assertTrue(mock_is_valid_token.called)
+        self.assertEqual(
+            mock_is_valid_token.call_args[0], 
+            (fn_to_wrap.__module__ + "." + fn_to_wrap.__qualname__, "some-value"),
+        )
+        self.assertTrue(called)
+
+        # Test the endpoint setting
+        @requires_api_token("endpoint")
+        def another_fn_to_wrap(request):
+            return "yep"
+        
+        val = another_fn_to_wrap(request)
+        self.assertEqual(
+            mock_is_valid_token.call_args[0], 
+            ("endpoint", "some-value"),
+        )
diff --git a/ietf/api/tests_core.py b/ietf/api/tests_core.py
new file mode 100644
index 0000000000..7e45deac8a
--- /dev/null
+++ b/ietf/api/tests_core.py
@@ -0,0 +1,289 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+"""Core API tests"""
+from unittest.mock import patch
+# from unittest.mock import patch, call
+
+from django.urls import reverse as urlreverse, NoReverseMatch
+from rest_framework.test import APIClient
+
+# from ietf.person.factories import PersonFactory, EmailFactory
+# from ietf.person.models import Person
+from ietf.utils.test_utils import TestCase
+
+
+class CoreApiTestCase(TestCase):
+    client_class = APIClient
+
+
+class PersonTests(CoreApiTestCase):
+    # Tests disabled until we activate the DRF URLs in api/urls.py
+    
+    def test_person_detail(self):
+        with self.assertRaises(NoReverseMatch, msg="Re-enable test when this view is enabled"):
+            urlreverse("ietf.api.core_api.person-detail", kwargs={"pk": 1})
+
+        # person = PersonFactory()
+        # other_person = PersonFactory()
+        # url = urlreverse("ietf.api.core_api.person-detail", kwargs={"pk": person.pk})
+        # bad_pk = person.pk + 10000
+        # if Person.objects.filter(pk=bad_pk).exists():
+        #     bad_pk += 10000  # if this doesn't get us clear, something is wrong...
+        #     self.assertFalse(
+        #         Person.objects.filter(pk=bad_pk).exists(),
+        #         "Failed to find a non-existent person pk",
+        #     )
+        # bad_url = urlreverse("ietf.api.core_api.person-detail", kwargs={"pk": bad_pk})
+        # r = self.client.get(bad_url, format="json")
+        # self.assertEqual(r.status_code, 403, "Must be logged in preferred to 404")
+        # r = self.client.get(url, format="json")
+        # self.assertEqual(r.status_code, 403, "Must be logged in")
+        # self.client.login(
+        #     username=other_person.user.username,
+        #     password=other_person.user.username + "+password",
+        # )
+        # r = self.client.get(bad_url, format="json")
+        # self.assertEqual(r.status_code, 404)
+        # r = self.client.get(url, format="json")
+        # self.assertEqual(r.status_code, 403, "Can only retrieve self")
+        # self.client.login(
+        #     username=person.user.username, password=person.user.username + "+password"
+        # )
+        # r = self.client.get(url, format="json")
+        # self.assertEqual(r.status_code, 200)
+        # self.assertEqual(
+        #     r.data,
+        #     {
+        #         "id": person.pk,
+        #         "name": person.name,
+        #         "emails": [
+        #             {
+        #                 "person": person.pk,
+        #                 "address": email.address,
+        #                 "primary": email.primary,
+        #                 "active": email.active,
+        #                 "origin": email.origin,
+        #             }
+        #             for email in person.email_set.all()
+        #         ],
+        #     },
+        # )
+
+    @patch("ietf.person.api.send_new_email_confirmation_request")
+    def test_add_email(self, send_confirmation_mock):
+        with self.assertRaises(NoReverseMatch, msg="Re-enable this test when this view is enabled"):
+            urlreverse("ietf.api.core_api.person-email", kwargs={"pk": 1})
+            
+        # email = EmailFactory(address="old@example.org")
+        # person = email.person
+        # other_person = PersonFactory()
+        # url = urlreverse("ietf.api.core_api.person-email", kwargs={"pk": person.pk})
+        # post_data = {"address": "new@example.org"}
+        # 
+        # r = self.client.post(url, data=post_data, format="json")
+        # self.assertEqual(r.status_code, 403, "Must be logged in")
+        # self.assertFalse(send_confirmation_mock.called)
+        # 
+        # self.client.login(
+        #     username=other_person.user.username,
+        #     password=other_person.user.username + "+password",
+        # )
+        # r = self.client.post(url, data=post_data, format="json")
+        # self.assertEqual(r.status_code, 403, "Can only retrieve self")
+        # self.assertFalse(send_confirmation_mock.called)
+        # 
+        # self.client.login(
+        #     username=person.user.username, password=person.user.username + "+password"
+        # )
+        # r = self.client.post(url, data=post_data, format="json")
+        # self.assertEqual(r.status_code, 200)
+        # self.assertEqual(r.data, {"address": "new@example.org"})
+        # self.assertTrue(send_confirmation_mock.called)
+        # self.assertEqual(
+        #     send_confirmation_mock.call_args, call(person, "new@example.org")
+        # )
+
+
+class EmailTests(CoreApiTestCase):
+    def test_email_update(self):
+        with self.assertRaises(NoReverseMatch, msg="Re-enable this test when the view is enabled"):
+            urlreverse(
+                "ietf.api.core_api.email-detail", kwargs={"pk": "original@example.org"}
+            )
+
+        # email = EmailFactory(
+        #     address="original@example.org", primary=False, active=True, origin="factory"
+        # )
+        # person = email.person
+        # other_person = PersonFactory()
+        # url = urlreverse(
+        #     "ietf.api.core_api.email-detail", kwargs={"pk": "original@example.org"}
+        # )
+        # bad_url = urlreverse(
+        #     "ietf.api.core_api.email-detail",
+        #     kwargs={"pk": "not-original@example.org"},
+        # )
+        # 
+        # r = self.client.put(
+        #     bad_url, data={"primary": True, "active": False}, format="json"
+        # )
+        # self.assertEqual(r.status_code, 403, "Must be logged in preferred to 404")
+        # r = self.client.put(url, data={"primary": True, "active": False}, format="json")
+        # self.assertEqual(r.status_code, 403, "Must be logged in")
+        # 
+        # self.client.login(
+        #     username=other_person.user.username,
+        #     password=other_person.user.username + "+password",
+        # )
+        # r = self.client.put(
+        #     bad_url, data={"primary": True, "active": False}, format="json"
+        # )
+        # self.assertEqual(r.status_code, 404, "No such address")
+        # r = self.client.put(url, data={"primary": True, "active": False}, format="json")
+        # self.assertEqual(r.status_code, 403, "Can only access own addresses")
+        # 
+        # self.client.login(
+        #     username=person.user.username, password=person.user.username + "+password"
+        # )
+        # r = self.client.put(url, data={"primary": True, "active": False}, format="json")
+        # self.assertEqual(r.status_code, 200)
+        # self.assertEqual(
+        #     r.data,
+        #     {
+        #         "person": person.pk,
+        #         "address": "original@example.org",
+        #         "primary": True,
+        #         "active": False,
+        #         "origin": "factory",
+        #     },
+        # )
+        # email.refresh_from_db()
+        # self.assertEqual(email.person, person)
+        # self.assertEqual(email.address, "original@example.org")
+        # self.assertTrue(email.primary)
+        # self.assertFalse(email.active)
+        # self.assertEqual(email.origin, "factory")
+        # 
+        # # address / origin should be immutable
+        # r = self.client.put(
+        #     url,
+        #     data={
+        #         "address": "modified@example.org",
+        #         "primary": True,
+        #         "active": False,
+        #         "origin": "hacker",
+        #     },
+        #     format="json",
+        # )
+        # self.assertEqual(r.status_code, 200)
+        # self.assertEqual(
+        #     r.data,
+        #     {
+        #         "person": person.pk,
+        #         "address": "original@example.org",
+        #         "primary": True,
+        #         "active": False,
+        #         "origin": "factory",
+        #     },
+        # )
+        # email.refresh_from_db()
+        # self.assertEqual(email.person, person)
+        # self.assertEqual(email.address, "original@example.org")
+        # self.assertTrue(email.primary)
+        # self.assertFalse(email.active)
+        # self.assertEqual(email.origin, "factory")
+
+    def test_email_partial_update(self):
+        with self.assertRaises(NoReverseMatch, msg="Re-enable this test when the view is enabled"):
+            urlreverse(
+                "ietf.api.core_api.email-detail", kwargs={"pk": "original@example.org"}
+            )
+
+        # email = EmailFactory(
+        #     address="original@example.org", primary=False, active=True, origin="factory"
+        # )
+        # person = email.person
+        # other_person = PersonFactory()
+        # url = urlreverse(
+        #     "ietf.api.core_api.email-detail", kwargs={"pk": "original@example.org"}
+        # )
+        # bad_url = urlreverse(
+        #     "ietf.api.core_api.email-detail",
+        #     kwargs={"pk": "not-original@example.org"},
+        # )
+        # 
+        # r = self.client.patch(
+        #     bad_url, data={"primary": True}, format="json"
+        # )
+        # self.assertEqual(r.status_code, 403, "Must be logged in preferred to 404")
+        # r = self.client.patch(url, data={"primary": True}, format="json")
+        # self.assertEqual(r.status_code, 403, "Must be logged in")
+        # 
+        # self.client.login(
+        #     username=other_person.user.username,
+        #     password=other_person.user.username + "+password",
+        # )
+        # r = self.client.patch(
+        #     bad_url, data={"primary": True}, format="json"
+        # )
+        # self.assertEqual(r.status_code, 404, "No such address")
+        # r = self.client.patch(url, data={"primary": True}, format="json")
+        # self.assertEqual(r.status_code, 403, "Can only access own addresses")
+        # 
+        # self.client.login(
+        #     username=person.user.username, password=person.user.username + "+password"
+        # )
+        # r = self.client.patch(url, data={"primary": True}, format="json")
+        # self.assertEqual(r.status_code, 200)
+        # self.assertEqual(
+        #     r.data,
+        #     {
+        #         "person": person.pk,
+        #         "address": "original@example.org",
+        #         "primary": True,
+        #         "active": True,
+        #         "origin": "factory",
+        #     },
+        # )
+        # email.refresh_from_db()
+        # self.assertEqual(email.person, person)
+        # self.assertEqual(email.address, "original@example.org")
+        # self.assertTrue(email.primary)
+        # self.assertTrue(email.active)
+        # self.assertEqual(email.origin, "factory")
+        # 
+        # r = self.client.patch(url, data={"active": False}, format="json")
+        # self.assertEqual(r.status_code, 200)
+        # self.assertEqual(
+        #     r.data,
+        #     {
+        #         "person": person.pk,
+        #         "address": "original@example.org",
+        #         "primary": True,
+        #         "active": False,
+        #         "origin": "factory",
+        #     },
+        # )
+        # email.refresh_from_db()
+        # self.assertEqual(email.person, person)
+        # self.assertEqual(email.address, "original@example.org")
+        # self.assertTrue(email.primary)
+        # self.assertFalse(email.active)
+        # self.assertEqual(email.origin, "factory")
+        # 
+        # r = self.client.patch(url, data={"address": "modified@example.org"}, format="json")
+        # self.assertEqual(r.status_code, 200)  # extra fields allowed, but ignored
+        # email.refresh_from_db()
+        # self.assertEqual(email.person, person)
+        # self.assertEqual(email.address, "original@example.org")
+        # self.assertTrue(email.primary)
+        # self.assertFalse(email.active)
+        # self.assertEqual(email.origin, "factory")
+        # 
+        # r = self.client.patch(url, data={"origin": "hacker"}, format="json")
+        # self.assertEqual(r.status_code, 200)  # extra fields allowed, but ignored
+        # email.refresh_from_db()
+        # self.assertEqual(email.person, person)
+        # self.assertEqual(email.address, "original@example.org")
+        # self.assertTrue(email.primary)
+        # self.assertFalse(email.active)
+        # self.assertEqual(email.origin, "factory")
diff --git a/ietf/api/tests_ietf_utils.py b/ietf/api/tests_ietf_utils.py
new file mode 100644
index 0000000000..b8d7fea7b4
--- /dev/null
+++ b/ietf/api/tests_ietf_utils.py
@@ -0,0 +1,86 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.test import RequestFactory
+from django.test.utils import override_settings
+
+from ietf.api.ietf_utils import is_valid_token, requires_api_token
+from ietf.utils.test_utils import TestCase
+
+
+class IetfUtilsTests(TestCase):
+    @override_settings(
+        APP_API_TOKENS={
+            "ietf.api.foobar": ["valid-token"],
+            "ietf.api.misconfigured": "valid-token",  # misconfigured
+        }
+    )
+    def test_is_valid_token(self):
+        self.assertFalse(is_valid_token("ietf.fake.endpoint", "valid-token"))
+        self.assertFalse(is_valid_token("ietf.api.foobar", "invalid-token"))
+        self.assertFalse(is_valid_token("ietf.api.foobar", None))
+        self.assertTrue(is_valid_token("ietf.api.foobar", "valid-token"))
+
+        # misconfiguration
+        self.assertFalse(is_valid_token("ietf.api.misconfigured", "v"))
+        self.assertFalse(is_valid_token("ietf.api.misconfigured", None))
+        self.assertTrue(is_valid_token("ietf.api.misconfigured", "valid-token"))
+
+    @override_settings(
+        APP_API_TOKENS={
+            "ietf.api.foo": ["valid-token"],
+            "ietf.api.bar": ["another-token"],
+            "ietf.api.misconfigured": "valid-token",  # misconfigured
+        }
+    )
+    def test_requires_api_token(self):
+        @requires_api_token("ietf.api.foo")
+        def protected_function(request):
+            return f"Access granted: {request.method}"
+
+        # request with a valid token
+        request = RequestFactory().get(
+            "/some/url", headers={"X_API_KEY": "valid-token"}
+        )
+        result = protected_function(request)
+        self.assertEqual(result, "Access granted: GET")
+
+        # request with an invalid token
+        request = RequestFactory().get(
+            "/some/url", headers={"X_API_KEY": "invalid-token"}
+        )
+        result = protected_function(request)
+        self.assertEqual(result.status_code, 403)
+
+        # request without a token
+        request = RequestFactory().get("/some/url", headers={"X_API_KEY": ""})
+        result = protected_function(request)
+        self.assertEqual(result.status_code, 403)
+
+        # request without a X_API_KEY token
+        request = RequestFactory().get("/some/url")
+        result = protected_function(request)
+        self.assertEqual(result.status_code, 403)
+
+        # request with a valid token for another API endpoint
+        request = RequestFactory().get(
+            "/some/url", headers={"X_API_KEY": "another-token"}
+        )
+        result = protected_function(request)
+        self.assertEqual(result.status_code, 403)
+
+        # requests for a misconfigured endpoint
+        @requires_api_token("ietf.api.misconfigured")
+        def another_protected_function(request):
+            return f"Access granted: {request.method}"
+
+        # request with valid token
+        request = RequestFactory().get(
+            "/some/url", headers={"X_API_KEY": "valid-token"}
+        )
+        result = another_protected_function(request)
+        self.assertEqual(result, "Access granted: GET")
+
+        # request with invalid token with the correct initial character
+        request = RequestFactory().get("/some/url", headers={"X_API_KEY": "v"})
+        result = another_protected_function(request)
+        self.assertEqual(result.status_code, 403)
diff --git a/ietf/api/tests_serializers_rpc.py b/ietf/api/tests_serializers_rpc.py
new file mode 100644
index 0000000000..167ffcd3ee
--- /dev/null
+++ b/ietf/api/tests_serializers_rpc.py
@@ -0,0 +1,217 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from unittest import mock
+
+from django.utils import timezone
+
+from ietf.utils.test_utils import TestCase
+from ietf.doc.models import Document
+from ietf.doc.factories import WgRfcFactory
+from .serializers_rpc import EditableRfcSerializer
+
+
+class EditableRfcSerializerTests(TestCase):
+    def test_create(self):
+        serializer = EditableRfcSerializer(
+            data={
+                "published": timezone.now(),
+                "title": "Yadda yadda yadda",
+                "authors": [
+                    {
+                        "titlepage_name": "B. Fett",
+                        "is_editor": False,
+                        "affiliation": "DBA Galactic Empire",
+                        "country": "",
+                    },
+                ],
+                "stream": "ietf",
+                "abstract": "A long time ago in a galaxy far, far away...",
+                "pages": 3,
+                "std_level": "inf",
+                "subseries": ["fyi999"],
+            }
+        )
+        self.assertTrue(serializer.is_valid())
+        with self.assertRaises(RuntimeError, msg="serializer does not allow create()"):
+            serializer.save()
+
+    @mock.patch("ietf.api.serializers_rpc.update_rfc_searchindex_task")
+    @mock.patch("ietf.api.serializers_rpc.trigger_red_precomputer_task")
+    def test_update(self, mock_trigger_red_task, mock_update_searchindex_task):
+        updates = WgRfcFactory.create_batch(2)
+        obsoletes = WgRfcFactory.create_batch(2)
+        rfc = WgRfcFactory(pages=10)
+        updated_by = WgRfcFactory.create_batch(2)
+        obsoleted_by = WgRfcFactory.create_batch(2)
+        for d in updates:
+            rfc.relateddocument_set.create(relationship_id="updates",target=d)
+        for d in obsoletes:
+            rfc.relateddocument_set.create(relationship_id="updates",target=d)
+        for d in updated_by:
+            d.relateddocument_set.create(relationship_id="updates",target=rfc)
+        for d in obsoleted_by:
+            d.relateddocument_set.create(relationship_id="updates",target=rfc)        
+        serializer = EditableRfcSerializer(
+            instance=rfc,
+            data={
+                "published": timezone.now(),
+                "title": "Yadda yadda yadda",
+                "authors": [
+                    {
+                        "titlepage_name": "B. Fett",
+                        "is_editor": False,
+                        "affiliation": "DBA Galactic Empire",
+                        "country": "",
+                    },
+                ],
+                "stream": "ise",
+                "abstract": "A long time ago in a galaxy far, far away...",
+                "pages": 3,
+                "std_level": "inf",
+                "subseries": ["fyi999"],
+            },
+        )
+        self.assertTrue(serializer.is_valid())
+        result = serializer.save()
+        result.refresh_from_db()
+        self.assertEqual(result.title, "Yadda yadda yadda")
+        self.assertEqual(
+            list(
+                result.rfcauthor_set.values(
+                    "titlepage_name", "is_editor", "affiliation", "country"
+                )
+            ),
+            [
+                {
+                    "titlepage_name": "B. Fett",
+                    "is_editor": False,
+                    "affiliation": "DBA Galactic Empire",
+                    "country": "",
+                },
+            ],
+        )
+        self.assertEqual(result.stream_id, "ise")
+        self.assertEqual(
+            result.abstract, "A long time ago in a galaxy far, far away..."
+        )
+        self.assertEqual(result.pages, 3)
+        self.assertEqual(result.std_level_id, "inf")
+        self.assertEqual(
+            result.part_of(),
+            [Document.objects.get(name="fyi999")],
+        )
+        # Confirm that red precomputer was triggered correctly
+        self.assertTrue(mock_trigger_red_task.delay.called)
+        _, mock_kwargs = mock_trigger_red_task.delay.call_args
+        self.assertIn("rfc_number_list", mock_kwargs)
+        expected_numbers = sorted(
+            [
+                d.rfc_number
+                for d in [rfc] + updates + obsoletes + updated_by + obsoleted_by
+            ]
+        )
+        self.assertEqual(mock_kwargs["rfc_number_list"], expected_numbers)
+        # Confirm that the search index update task was triggered correctly
+        self.assertTrue(mock_update_searchindex_task.delay.called)
+        self.assertEqual(
+            mock_update_searchindex_task.delay.call_args,
+            mock.call(rfc.rfc_number),
+        )
+
+    @mock.patch("ietf.api.serializers_rpc.update_rfc_searchindex_task")
+    @mock.patch("ietf.api.serializers_rpc.trigger_red_precomputer_task")
+    def test_partial_update(self, mock_trigger_red_task, mock_update_searchindex_task):
+        # We could test other permutations of fields, but authors is a partial update
+        # we know we are going to use, so verifying that one in particular.
+        updates = WgRfcFactory.create_batch(2)
+        obsoletes = WgRfcFactory.create_batch(2)
+        rfc = WgRfcFactory(pages=10, abstract="do or do not", title="padawan")
+        updated_by = WgRfcFactory.create_batch(2)
+        obsoleted_by = WgRfcFactory.create_batch(2)
+        for d in updates:
+            rfc.relateddocument_set.create(relationship_id="updates",target=d)
+        for d in obsoletes:
+            rfc.relateddocument_set.create(relationship_id="updates",target=d)
+        for d in updated_by:
+            d.relateddocument_set.create(relationship_id="updates",target=rfc)
+        for d in obsoleted_by:
+            d.relateddocument_set.create(relationship_id="updates",target=rfc) 
+        serializer = EditableRfcSerializer(
+            partial=True,
+            instance=rfc,
+            data={
+                "authors": [
+                    {
+                        "titlepage_name": "B. Fett",
+                        "is_editor": False,
+                        "affiliation": "DBA Galactic Empire",
+                        "country": "",
+                    },
+                ],
+            },
+        )
+        self.assertTrue(serializer.is_valid())
+        result = serializer.save()
+        result.refresh_from_db()
+        self.assertEqual(rfc.title, "padawan")
+        self.assertEqual(
+            list(
+                result.rfcauthor_set.values(
+                    "titlepage_name", "is_editor", "affiliation", "country"
+                )
+            ),
+            [
+                {
+                    "titlepage_name": "B. Fett",
+                    "is_editor": False,
+                    "affiliation": "DBA Galactic Empire",
+                    "country": "",
+                },
+            ],
+        )
+        self.assertEqual(result.stream_id, "ietf")
+        self.assertEqual(result.abstract, "do or do not")
+        self.assertEqual(result.pages, 10)
+        self.assertEqual(result.std_level_id, "ps")
+        self.assertEqual(result.part_of(), [])
+        # Confirm that the red precomputer was triggered correctly
+        self.assertTrue(mock_trigger_red_task.delay.called)
+        _, mock_kwargs = mock_trigger_red_task.delay.call_args
+        self.assertIn("rfc_number_list", mock_kwargs)
+        expected_numbers = sorted(
+            [
+                d.rfc_number
+                for d in [rfc] + updates + obsoletes + updated_by + obsoleted_by
+            ]
+        )
+        self.assertEqual(mock_kwargs["rfc_number_list"], expected_numbers)
+        # Confirm that the search index update task was called correctly
+        self.assertTrue(mock_update_searchindex_task.delay.called)
+        self.assertEqual(
+            mock_update_searchindex_task.delay.call_args,
+            mock.call(rfc.rfc_number),
+        )
+
+        # Test only a field on the Document itself to be sure that it works
+        mock_trigger_red_task.delay.reset_mock()
+        mock_update_searchindex_task.delay.reset_mock()
+        serializer = EditableRfcSerializer(
+            partial=True,
+            instance=rfc,
+            data={"title": "jedi master"},
+        )
+        self.assertTrue(serializer.is_valid())
+        result = serializer.save()
+        result.refresh_from_db()
+        self.assertEqual(rfc.title, "jedi master")
+        # Confirm that the red precomputer was triggered correctly
+        self.assertTrue(mock_trigger_red_task.delay.called)
+        _, mock_kwargs = mock_trigger_red_task.delay.call_args
+        self.assertIn("rfc_number_list", mock_kwargs)
+        self.assertEqual(mock_kwargs["rfc_number_list"], expected_numbers)
+        # Confirm that the search index update task was called correctly
+        self.assertTrue(mock_update_searchindex_task.delay.called)
+        self.assertEqual(
+            mock_update_searchindex_task.delay.call_args,
+            mock.call(rfc.rfc_number),
+        )
diff --git a/ietf/api/tests_views_rpc.py b/ietf/api/tests_views_rpc.py
new file mode 100644
index 0000000000..180221cffc
--- /dev/null
+++ b/ietf/api/tests_views_rpc.py
@@ -0,0 +1,432 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+import datetime
+from io import StringIO
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+from django.conf import settings
+from django.core.files.base import ContentFile
+from django.db.models import Max
+from django.db.models.functions import Coalesce
+from django.test.utils import override_settings
+from django.urls import reverse as urlreverse
+import mock
+from django.utils import timezone
+
+from ietf.blobdb.models import Blob
+from ietf.doc.factories import IndividualDraftFactory, RfcFactory, WgDraftFactory, WgRfcFactory
+from ietf.doc.models import RelatedDocument, Document
+from ietf.group.factories import RoleFactory, GroupFactory
+from ietf.person.factories import PersonFactory
+from ietf.sync.rfcindex import rfcindex_is_dirty
+from ietf.utils.models import DirtyBits
+from ietf.utils.test_utils import APITestCase, reload_db_objects
+
+
+class RpcApiTests(APITestCase):
+    @override_settings(APP_API_TOKENS={"ietf.api.views_rpc": ["valid-token"]})
+    def test_draftviewset_references(self):
+        viewname = "ietf.api.purple_api.draft-references"
+
+        # non-existent draft
+        bad_id = Document.objects.aggregate(unused_id=Coalesce(Max("id"), 0) + 100)[
+            "unused_id"
+        ]
+        url = urlreverse(viewname, kwargs={"doc_id": bad_id})
+        # Without credentials
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+        # Add credentials
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 404)
+
+        # draft without any normative references
+        draft = IndividualDraftFactory()
+        draft = reload_db_objects(draft)
+        url = urlreverse(viewname, kwargs={"doc_id": draft.id})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200)
+        refs = r.json()
+        self.assertEqual(refs, [])
+
+        # draft without any normative references but with an informative reference
+        draft_foo = IndividualDraftFactory()
+        draft_foo = reload_db_objects(draft_foo)
+        RelatedDocument.objects.create(
+            source=draft, target=draft_foo, relationship_id="refinfo"
+        )
+        url = urlreverse(viewname, kwargs={"doc_id": draft.id})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200)
+        refs = r.json()
+        self.assertEqual(refs, [])
+
+        # draft with a normative reference
+        draft_bar = IndividualDraftFactory()
+        draft_bar = reload_db_objects(draft_bar)
+        RelatedDocument.objects.create(
+            source=draft, target=draft_bar, relationship_id="refnorm"
+        )
+        url = urlreverse(viewname, kwargs={"doc_id": draft.id})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+        r = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(r.status_code, 200)
+        refs = r.json()
+        self.assertEqual(len(refs), 1)
+        self.assertEqual(refs[0]["id"], draft_bar.id)
+        self.assertEqual(refs[0]["name"], draft_bar.name)
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views_rpc": ["valid-token"]})
+    @mock.patch("ietf.doc.tasks.signal_update_rfc_metadata_task.delay")
+    def test_notify_rfc_published(self, mock_task_delay):
+        url = urlreverse("ietf.api.purple_api.notify_rfc_published")
+        area = GroupFactory(type_id="area")
+        rfc_group = GroupFactory(type_id="wg")
+        draft_ad = RoleFactory(group=area, name_id="ad").person
+        rfc_ad = PersonFactory()
+        draft_authors = PersonFactory.create_batch(2)
+        rfc_authors = PersonFactory.create_batch(3)
+        draft = WgDraftFactory(
+            group__parent=area, authors=draft_authors, ad=draft_ad, stream_id="ietf"
+        )
+        rfc_stream_id = "ise"
+        assert isinstance(draft, Document), "WgDraftFactory should generate a Document"
+        updates = RfcFactory.create_batch(2)
+        obsoletes = RfcFactory.create_batch(2)
+        unused_rfc_number = (
+            Document.objects.filter(rfc_number__isnull=False).aggregate(
+                unused_rfc_number=Max("rfc_number") + 1
+            )["unused_rfc_number"]
+            or 10000
+        )
+
+        post_data = {
+            "published": "2025-12-17T20:29:00Z",
+            "draft_name": draft.name,
+            "draft_rev": draft.rev,
+            "rfc_number": unused_rfc_number,
+            "title": "RFC " + draft.title,
+            "authors": [
+                {
+                    "titlepage_name": f"titlepage {author.name}",
+                    "is_editor": False,
+                    "person": author.pk,
+                    "email": author.email_address(),
+                    "affiliation": "Some Affiliation",
+                    "country": "CA",
+                }
+                for author in rfc_authors
+            ],
+            "group": rfc_group.acronym,
+            "stream": rfc_stream_id,
+            "abstract": "RFC version of " + draft.abstract,
+            "pages": draft.pages + 10,
+            "std_level": "ps",
+            "ad": rfc_ad.pk,
+            "obsoletes": [o.rfc_number for o in obsoletes],
+            "updates": [o.rfc_number for o in updates],
+            "subseries": [],
+        }
+        r = self.client.post(url, data=post_data, format="json")
+        self.assertEqual(r.status_code, 403)
+
+        r = self.client.post(
+            url, data=post_data, format="json", headers={"X-Api-Key": "valid-token"}
+        )
+        self.assertEqual(r.status_code, 200)
+        rfc = Document.objects.filter(rfc_number=unused_rfc_number).first()
+        self.assertIsNotNone(rfc)
+        self.assertEqual(rfc.came_from_draft(), draft)
+        self.assertEqual(
+            rfc.docevent_set.filter(
+                type="published_rfc", time="2025-12-17T20:29:00Z"
+            ).count(),
+            1,
+        )
+        self.assertEqual(rfc.title, "RFC " + draft.title)
+        self.assertEqual(rfc.documentauthor_set.count(), 0)
+        self.assertEqual(
+            [
+                {
+                    "titlepage_name": ra.titlepage_name,
+                    "is_editor": ra.is_editor,
+                    "person": ra.person,
+                    "email": ra.email,
+                    "affiliation": ra.affiliation,
+                    "country": ra.country,
+                }
+                for ra in rfc.rfcauthor_set.all()
+            ],
+            [
+                {
+                    "titlepage_name": f"titlepage {author.name}",
+                    "is_editor": False,
+                    "person": author,
+                    "email": author.email(),
+                    "affiliation": "Some Affiliation",
+                    "country": "CA",
+                }
+                for author in rfc_authors
+            ],
+        )
+        self.assertEqual(rfc.group, rfc_group)
+        self.assertEqual(rfc.stream_id, rfc_stream_id)
+        self.assertEqual(rfc.abstract, "RFC version of " + draft.abstract)
+        self.assertEqual(rfc.pages, draft.pages + 10)
+        self.assertEqual(rfc.std_level_id, "ps")
+        self.assertEqual(rfc.ad, rfc_ad)
+        self.assertEqual(set(rfc.related_that_doc("obs")), set([o for o in obsoletes]))
+        self.assertEqual(
+            set(rfc.related_that_doc("updates")), set([o for o in updates])
+        )
+        self.assertEqual(rfc.part_of(), [])
+        self.assertEqual(draft.get_state().slug, "rfc")
+        # todo test non-empty relationships
+        # todo test references (when updating that is part of the handling)
+
+        self.assertTrue(mock_task_delay.called)
+        mock_args, mock_kwargs = mock_task_delay.call_args
+        self.assertIn("rfc_number_list", mock_kwargs)
+        expected_rfc_number_list = [rfc.rfc_number]
+        expected_rfc_number_list.extend(
+            [d.rfc_number for d in updates + obsoletes]
+        )
+        expected_rfc_number_list = sorted(set(expected_rfc_number_list))
+        self.assertEqual(mock_kwargs["rfc_number_list"], expected_rfc_number_list)
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views_rpc": ["valid-token"]})
+    @mock.patch("ietf.api.views_rpc.rebuild_reference_relations_task")
+    @mock.patch("ietf.api.views_rpc.update_rfc_searchindex_task")
+    @mock.patch("ietf.api.views_rpc.trigger_red_precomputer_task")
+    def test_upload_rfc_files(
+        self,
+        mock_trigger_red_task,
+        mock_update_searchindex_task,
+        mock_rebuild_relations,
+    ):
+        def _valid_post_data():
+            """Generate a valid post data dict
+
+            Each API call needs a fresh set of files, so don't reuse the return
+            value from this for multiple calls!
+            """
+            return {
+                "rfc": rfc.rfc_number,
+                "contents": [
+                    ContentFile(b"This is .xml", "myfile.xml"),
+                    ContentFile(b"This is .txt", "myfile.txt"),
+                    ContentFile(b"This is .html", "myfile.html"),
+                    ContentFile(b"This is .pdf", "myfile.pdf"),
+                    ContentFile(b"This is .json", "myfile.json"),
+                    ContentFile(b"This is .notprepped.xml", "myfile.notprepped.xml"),
+                ],
+                "replace": False,
+            }
+
+        url = urlreverse("ietf.api.purple_api.upload_rfc_files")
+        updates = RfcFactory.create_batch(2)
+        obsoletes = RfcFactory.create_batch(2)
+
+        rfc = WgRfcFactory()
+        for r in obsoletes:
+            rfc.relateddocument_set.create(relationship_id="obs", target=r)
+        for r in updates:
+            rfc.relateddocument_set.create(relationship_id="updates", target=r)
+        assert isinstance(rfc, Document), "WgRfcFactory should generate a Document"
+        with TemporaryDirectory() as rfc_dir:
+            settings.RFC_PATH = rfc_dir  # affects overridden settings
+            rfc_path = Path(rfc_dir)
+            (rfc_path / "prerelease").mkdir()
+            content = StringIO("XML content\n")
+            content.name = "myrfc.xml"
+
+            # no api key
+            r = self.client.post(url, _valid_post_data(), format="multipart")
+            self.assertEqual(r.status_code, 403)
+            self.assertFalse(mock_update_searchindex_task.delay.called)
+
+            # invalid RFC
+            r = self.client.post(
+                url,
+                _valid_post_data() | {"rfc": rfc.rfc_number + 10},
+                format="multipart",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 400)
+            self.assertFalse(mock_update_searchindex_task.delay.called)
+
+            # empty files
+            r = self.client.post(
+                url,
+                _valid_post_data() | {
+                    "contents": [
+                        ContentFile(b"", "myfile.xml"),
+                        ContentFile(b"", "myfile.txt"),
+                        ContentFile(b"", "myfile.html"),
+                        ContentFile(b"", "myfile.pdf"),
+                        ContentFile(b"", "myfile.json"),
+                        ContentFile(b"", "myfile.notprepped.xml"),
+                    ]
+                },
+                format="multipart",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 400)
+            self.assertFalse(mock_update_searchindex_task.delay.called)
+
+            # bad file type
+            r = self.client.post(
+                url,
+                _valid_post_data() | {
+                    "contents": [
+                        ContentFile(b"Some content", "myfile.jpg"),
+                    ]
+                },
+                format="multipart",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 400)
+            self.assertFalse(mock_update_searchindex_task.delay.called)
+
+            # Put a file in the way. Post should fail because replace = False
+            file_in_the_way = (rfc_path / f"{rfc.name}.txt")
+            file_in_the_way.touch()
+            r = self.client.post(
+                url,
+                _valid_post_data(),
+                format="multipart",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 409)  # conflict
+            self.assertFalse(mock_update_searchindex_task.delay.called)
+            file_in_the_way.unlink()
+            
+            # Put a blob in the way. Post should fail because replace = False
+            blob_in_the_way = Blob.objects.create(
+                bucket="rfc", name=f"txt/{rfc.name}.txt", content=b""
+            )
+            r = self.client.post(
+                url,
+                _valid_post_data(),
+                format="multipart",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 409)  # conflict
+            self.assertFalse(mock_update_searchindex_task.delay.called)
+            blob_in_the_way.delete()
+
+            # valid post
+            mock_trigger_red_task.delay.reset_mock()
+            r = self.client.post(
+                url,
+                _valid_post_data(),
+                format="multipart",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 200)
+            self.assertEqual(
+                mock_update_searchindex_task.delay.call_args,
+                mock.call(rfc.rfc_number),
+            )
+            for extension in ["xml", "txt", "html", "pdf", "json"]:
+                filename = f"{rfc.name}.{extension}"
+                self.assertEqual(
+                    (rfc_path / filename)
+                    .read_text(),
+                    f"This is .{extension}",
+                    f"{extension} file should contain the expected content",
+                )
+                self.assertEqual(
+                    bytes(
+                        Blob.objects.get(
+                            bucket="rfc", name=f"{extension}/{filename}"
+                        ).content
+                    ),
+                    f"This is .{extension}".encode("utf-8"),
+                    f"{extension} blob should contain the expected content",
+                )
+            # special case for notprepped
+            notprepped_fn = f"{rfc.name}.notprepped.xml"
+            self.assertEqual(
+                (
+                    rfc_path / "prerelease" / notprepped_fn
+                ).read_text(),
+                "This is .notprepped.xml",
+                ".notprepped.xml file should contain the expected content",
+            )
+            self.assertEqual(
+                bytes(
+                    Blob.objects.get(
+                        bucket="rfc", name=f"notprepped/{notprepped_fn}"
+                    ).content
+                ),
+                b"This is .notprepped.xml",
+                ".notprepped.xml blob should contain the expected content",
+            )
+            # Confirm that the red precomputer was triggered correctly
+            self.assertTrue(mock_trigger_red_task.delay.called)
+            _, mock_kwargs = mock_trigger_red_task.delay.call_args
+            self.assertIn("rfc_number_list", mock_kwargs)
+            expected_rfc_number_list = [rfc.rfc_number]
+            expected_rfc_number_list.extend(
+                [d.rfc_number for d in updates + obsoletes]
+            )
+            expected_rfc_number_list = sorted(set(expected_rfc_number_list))
+            self.assertEqual(mock_kwargs["rfc_number_list"], expected_rfc_number_list)
+            # Confirm that the search index update task was called correctly
+            self.assertTrue(mock_update_searchindex_task.delay.called)
+            # Confirm reference relations rebuild task was called correctly
+            self.assertTrue(mock_rebuild_relations.delay.called)
+            _, mock_kwargs = mock_rebuild_relations.delay.call_args
+            self.assertIn("doc_names", mock_kwargs)
+            self.assertEqual(mock_kwargs["doc_names"], [rfc.name])
+
+            # re-post with replace = False should now fail
+            mock_update_searchindex_task.reset_mock()
+            r = self.client.post(
+                url,
+                _valid_post_data(),
+                format="multipart",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 409)  # conflict
+            self.assertFalse(mock_update_searchindex_task.delay.called)
+
+            # re-post with replace = True should succeed
+            r = self.client.post(
+                url,
+                _valid_post_data() | {"replace": True},
+                format="multipart",
+                headers={"X-Api-Key": "valid-token"},
+            )
+            self.assertEqual(r.status_code, 200)
+            self.assertTrue(mock_update_searchindex_task.delay.called)
+            self.assertEqual(
+                mock_update_searchindex_task.delay.call_args,
+                mock.call(rfc.rfc_number),
+            )
+
+    @override_settings(APP_API_TOKENS={"ietf.api.views_rpc": ["valid-token"]})
+    def test_refresh_rfc_index(self):
+        DirtyBits.objects.create(
+            slug=DirtyBits.Slugs.RFCINDEX,
+            dirty_time=timezone.now() - datetime.timedelta(days=1),
+            processed_time=timezone.now() - datetime.timedelta(hours=12),
+        )
+        self.assertFalse(rfcindex_is_dirty())
+        url = urlreverse("ietf.api.purple_api.refresh_rfc_index")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 403)
+        response = self.client.get(url, headers={"X-Api-Key": "invalid-token"})
+        self.assertEqual(response.status_code, 403)
+        response = self.client.get(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(response.status_code, 405)
+        self.assertFalse(rfcindex_is_dirty())
+        response = self.client.post(url, headers={"X-Api-Key": "valid-token"})
+        self.assertEqual(response.status_code, 202)
+        self.assertTrue(rfcindex_is_dirty())
diff --git a/ietf/api/urls.py b/ietf/api/urls.py
index 714be8a6ac..7a082567b8 100644
--- a/ietf/api/urls.py
+++ b/ietf/api/urls.py
@@ -1,15 +1,31 @@
-# Copyright The IETF Trust 2017, All Rights Reserved
+# Copyright The IETF Trust 2017-2024, All Rights Reserved
 
-from django.conf.urls import include
+from drf_spectacular.views import SpectacularAPIView
+
+from django.conf import settings
+from django.urls import include, path
 from django.views.generic import TemplateView
 
 from ietf import api
-from ietf.api import views as api_views
-from ietf.doc import views_ballot
+from ietf.doc import views_ballot, api as doc_api
 from ietf.meeting import views as meeting_views
 from ietf.submit import views as submit_views
 from ietf.utils.urls import url
 
+from . import views as api_views
+from .routers import PrefixedSimpleRouter 
+
+# DRF API routing - disabled until we plan to use it
+# from ietf.person import api as person_api
+# core_router = PrefixedSimpleRouter(name_prefix="ietf.api.core_api")  # core api router
+# core_router.register("email", person_api.EmailViewSet)
+# core_router.register("person", person_api.PersonViewSet)
+
+# todo more general name for this API?
+red_router = PrefixedSimpleRouter(name_prefix="ietf.api.red_api")  # red api router
+red_router.register("doc", doc_api.RfcViewSet)
+red_router.register("subseries", doc_api.SubseriesViewSet, basename="subseries")
+
 api.autodiscover()
 
 urlpatterns = [
@@ -19,20 +35,38 @@
     url(r'^v1/?$', api_views.top_level),
     # For mailarchive use, requires secretariat role
     url(r'^v2/person/person', api_views.ApiV2PersonExportView.as_view()),
+    # --- DRF API ---
+    # path("core/", include(core_router.urls)),
+    path("purple/", include("ietf.api.urls_rpc")),
+    path("red/", include(red_router.urls)),
+    path("schema/", SpectacularAPIView.as_view()),
     #
     # --- Custom API endpoints, sorted alphabetically ---
-    # GPRD: export of personal information for the logged-in person
+    # Email alias information for drafts
+    url(r'^doc/draft-aliases/$', api_views.draft_aliases),
+    # email ingestor
+    url(r'email/$', api_views.ingest_email),
+    # email ingestor
+    url(r'email/test/$', api_views.ingest_email_test),
+    # GDPR: export of personal information for the logged-in person
     url(r'^export/personal-information/$', api_views.PersonalInformationExportView.as_view()),
+    # Email alias information for groups
+    url(r'^group/group-aliases/$', api_views.group_aliases),
+    # Email addresses belonging to role holders
+    url(r'^group/role-holder-addresses/$', api_views.role_holder_addresses),
     # Let IESG members set positions programmatically
     url(r'^iesg/position', views_ballot.api_set_position),
+    # Find the blob to store for a given materials document path
+    url(r'^meeting/(?:(?P<num>(?:interim-)?[a-z0-9-]+)/)?materials/%(document)s(?P<ext>\.[A-Za-z0-9]+)?/resolve-cached/$' % settings.URL_REGEXPS, meeting_views.api_resolve_materials_name_cached),
+    url(r'^meeting/blob/(?P<bucket>[a-z0-9-]+)/(?P<name>[a-z][a-z0-9.-]+)$', meeting_views.api_retrieve_materials_blob),
     # Let Meetecho set session video URLs
     url(r'^meeting/session/video/url$', meeting_views.api_set_session_video_url),
+    # Let Meetecho tell us the name of its recordings
+    url(r'^meeting/session/recording-name$', meeting_views.api_set_meetecho_recording_name),
     # Meeting agenda + floorplan data
     url(r'^meeting/(?P<num>[A-Za-z0-9._+-]+)/agenda-data$', meeting_views.api_get_agenda_data),
     # Meeting session materials
     url(r'^meeting/session/(?P<session_id>[A-Za-z0-9._+-]+)/materials$', meeting_views.api_get_session_materials),
-    # Let Meetecho trigger recording imports
-    url(r'^notify/meeting/import_recordings/(?P<number>[a-z0-9-]+)/?$', meeting_views.api_import_recordings),
     # Let MeetEcho upload bluesheets
     url(r'^notify/meeting/bluesheet/?$', meeting_views.api_upload_bluesheet),
     # Let MeetEcho tell us about session attendees
@@ -42,12 +76,16 @@
     # Let MeetEcho upload session polls
     url(r'^notify/session/polls/?$', meeting_views.api_upload_polls),    
     # Let the registration system notify us about registrations
-    url(r'^notify/meeting/registration/?', api_views.api_new_meeting_registration),
+    url(r'^notify/meeting/registration/v2/?', api_views.api_new_meeting_registration_v2),
     # OpenID authentication provider
     url(r'^openid/$', TemplateView.as_view(template_name='api/openid-issuer.html'), name='ietf.api.urls.oidc_issuer'),
     url(r'^openid/', include('oidc_provider.urls', namespace='oidc_provider')),
+    # Email alias listing
+    url(r'^person/email/$', api_views.active_email_list),
+    # Related Email listing
+    url(r'^person/email/(?P<email>[^/\x00]+)/related/$', api_views.related_email_list),
     # Draft submission API
-    url(r'^submit/?$', submit_views.api_submit),
+    url(r'^submit/?$', submit_views.api_submit_tombstone),
     # Draft upload API
     url(r'^submission/?$', submit_views.api_submission),
     # Draft submission state API
@@ -55,7 +93,14 @@
     # Datatracker version
     url(r'^version/?$', api_views.version),
     # Application authentication API key
-    url(r'^appauth/[authortools|bibxml]', api_views.app_auth),
+    url(r'^appauth/(?P<app>authortools|bibxml)$', api_views.app_auth),
+    # NFS metrics endpoint
+    url(r'^metrics/nfs/?$', api_views.nfs_metrics),
+    # latest versions
+    url(r'^rfcdiff-latest-json/%(name)s(?:-%(rev)s)?(\.txt|\.html)?/?$' % settings.URL_REGEXPS, api_views.rfcdiff_latest_json),
+    url(r'^rfcdiff-latest-json/(?P<name>[Rr][Ff][Cc] [0-9]+?)(\.txt|\.html)?/?$', api_views.rfcdiff_latest_json),
+    # direct authentication
+    url(r'^directauth/?$', api_views.directauth),
 ]
 
 # Additional (standard) Tastypie endpoints
diff --git a/ietf/api/urls_rpc.py b/ietf/api/urls_rpc.py
new file mode 100644
index 0000000000..8555610dc3
--- /dev/null
+++ b/ietf/api/urls_rpc.py
@@ -0,0 +1,47 @@
+# Copyright The IETF Trust 2023-2026, All Rights Reserved
+from django.urls import include, path
+
+from ietf.api import views_rpc
+from ietf.api.routers import PrefixedDefaultRouter
+from ietf.utils.urls import url
+
+router = PrefixedDefaultRouter(use_regex_path=False, name_prefix="ietf.api.purple_api")
+router.include_format_suffixes = False
+router.register(r"draft", views_rpc.DraftViewSet, basename="draft")
+router.register(r"person", views_rpc.PersonViewSet)
+router.register(r"rfc", views_rpc.RfcViewSet, basename="rfc")
+
+router.register(
+    r"rfc/<int:rfc_number>/authors",
+    views_rpc.RfcAuthorViewSet,
+    basename="rfc-authors",
+)
+
+urlpatterns = [
+    url(r"^doc/drafts_by_names/", views_rpc.DraftsByNamesView.as_view()),
+    url(r"^persons/search/", views_rpc.RpcPersonSearch.as_view()),
+    path(
+        r"rfc/publish/",
+        views_rpc.RfcPubNotificationView.as_view(),
+        name="ietf.api.purple_api.notify_rfc_published",
+    ),
+    path(
+        r"rfc/publish/files/",
+        views_rpc.RfcPubFilesView.as_view(),
+        name="ietf.api.purple_api.upload_rfc_files",
+    ),
+    path(
+        r"rfc_index/refresh/",
+        views_rpc.RfcIndexView.as_view(),
+        name="ietf.api.purple_api.refresh_rfc_index",
+    ),
+    path(r"subject/<str:subject_id>/person/", views_rpc.SubjectPersonView.as_view()),
+]
+
+# add routers at the end so individual routes can steal parts of their address
+# space (e.g., ^rfc/publish/ superseding the ^rfc/ routes of RfcViewSet)
+urlpatterns.extend(
+    [
+        path("", include(router.urls)),
+    ]
+)
diff --git a/ietf/api/views.py b/ietf/api/views.py
index 97a5517899..420bc39693 100644
--- a/ietf/api/views.py
+++ b/ietf/api/views.py
@@ -1,41 +1,55 @@
 # Copyright The IETF Trust 2017-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-
+import base64
+import binascii
+import datetime
 import json
+from pathlib import Path
+from tempfile import NamedTemporaryFile
+import jsonschema
 import pytz
+import re
 
-from jwcrypto.jwk import JWK
-
+from contextlib import suppress
 from django.conf import settings
+from django.contrib.auth import authenticate
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
-from django.core.exceptions import ValidationError
-from django.core.validators import validate_email
-from django.http import HttpResponse
+from django.http import HttpResponse, Http404, JsonResponse, HttpResponseBadRequest
 from django.shortcuts import render, get_object_or_404
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.gzip import gzip_page
 from django.views.generic.detail import DetailView
-
+from email.message import EmailMessage
+from importlib.metadata import version as metadata_version
+from jwcrypto.jwk import JWK
 from tastypie.exceptions import BadRequest
-from tastypie.utils.mime import determine_format, build_content_type
-from tastypie.utils import is_valid_jsonp_callback_value
 from tastypie.serializers import Serializer
-
-import debug                            # pyflakes:ignore
+from tastypie.utils import is_valid_jsonp_callback_value
+from tastypie.utils.mime import determine_format, build_content_type
+from textwrap import dedent
+from traceback import format_exception, extract_tb
+from typing import Iterable, Optional, Literal
 
 import ietf
-from ietf.person.models import Person, Email
 from ietf.api import _api_list
+from ietf.api.ietf_utils import is_valid_token, requires_api_token
 from ietf.api.serializer import JsonExportMixin
-from ietf.ietfauth.views import send_account_creation_email
+from ietf.doc.utils import DraftAliasGenerator, fuzzy_find_documents
+from ietf.group.utils import GroupAliasGenerator, role_holder_emails
 from ietf.ietfauth.utils import role_required
+from ietf.ipr.utils import ingest_response_email as ipr_ingest_response_email
 from ietf.meeting.models import Meeting
-from ietf.stats.models import MeetingRegistration
+from ietf.meeting.utils import import_registration_json_validator, process_single_registration
+from ietf.nomcom.utils import ingest_feedback_email as nomcom_ingest_feedback_email
+from ietf.person.models import Person, Email
+from ietf.sync.iana import ingest_review_email as iana_ingest_review_email
+from ietf.utils import log
 from ietf.utils.decorators import require_api_key
+from ietf.utils.mail import send_smtp
 from ietf.utils.models import DumpInfo
 
 
@@ -50,7 +64,10 @@ def top_level(request):
         }
 
     serializer = Serializer()
-    desired_format = determine_format(request, serializer)
+    try:
+        desired_format = determine_format(request, serializer)
+    except BadRequest as err:
+        return HttpResponseBadRequest(str(err))
 
     options = {}
 
@@ -58,10 +75,12 @@ def top_level(request):
         callback = request.GET.get('callback', 'callback')
 
         if not is_valid_jsonp_callback_value(callback):
-            raise BadRequest('JSONP callback name is invalid.')
+            return HttpResponseBadRequest("JSONP callback name is invalid")
 
         options['callback'] = callback
 
+    # This might raise UnsupportedFormat, but that indicates a real server misconfiguration
+    # so let it bubble up unhandled and trigger a 500 / email to admins.
     serialized = serializer.serialize(available_resources, desired_format, options)
     return HttpResponse(content=serialized, content_type=build_content_type(desired_format))
 
@@ -78,13 +97,13 @@ class PersonalInformationExportView(DetailView, JsonExportMixin):
 
     def get(self, request):
         person = get_object_or_404(self.model, user=request.user)
-        expand = ['searchrule', 'documentauthor', 'ad_document_set', 'ad_dochistory_set', 'docevent',
+        expand = ['searchrule', 'documentauthor', 'rfcauthor', 'ad_document_set', 'ad_dochistory_set', 'docevent',
             'ballotpositiondocevent', 'deletedevent', 'email_set', 'groupevent', 'role', 'rolehistory', 'iprdisclosurebase',
-            'iprevent', 'liaisonstatementevent', 'whitelisted', 'schedule', 'constraint', 'schedulingevent', 'message',
+            'iprevent', 'liaisonstatementevent', 'allowlisted', 'schedule', 'constraint', 'schedulingevent', 'message',
             'sendqueue', 'nominee', 'topicfeedbacklastseen', 'alias', 'email', 'apikeys', 'personevent',
             'reviewersettings', 'reviewsecretarysettings', 'unavailableperiod', 'reviewwish',
             'nextreviewerinteam', 'reviewrequest', 'meetingregistration', 'submissionevent', 'preapproval',
-            'user', 'user__communitylist', 'personextresource_set', ]
+            'user', 'communitylist', 'personextresource_set', ]
 
 
         return self.json_view(request, filter={'id':person.id}, expand=expand)
@@ -95,7 +114,11 @@ class ApiV2PersonExportView(DetailView, JsonExportMixin):
     model = Person
 
     def err(self, code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
 
     def post(self, request):
         querydict = request.POST.copy()
@@ -127,87 +150,81 @@ def post(self, request):
 #     else:
 #         return HttpResponse(status=405)
 
-@require_api_key
-@role_required('Robot')
+
+@requires_api_token
 @csrf_exempt
-def api_new_meeting_registration(request):
+def api_new_meeting_registration_v2(request):
     '''REST API to notify the datatracker about a new meeting registration'''
-    def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
-    required_fields = [ 'meeting', 'first_name', 'last_name', 'affiliation', 'country_code',
-                        'email', 'reg_type', 'ticket_type', 'checkedin']
-    fields = required_fields + []
-    if request.method == 'POST':
-        # parameters:
-        #   apikey:
-        #   meeting
-        #   name
-        #   email
-        #   reg_type (In Person, Remote, Hackathon Only)
-        #   ticket_type (full_week, one_day, student)
-        #   
-        data = {'attended': False, }
-        missing_fields = []
-        for item in fields:
-            value = request.POST.get(item, None)
-            if value is None and item in required_fields:
-                missing_fields.append(item)
-            data[item] = value
-        if missing_fields:
-            return err(400, "Missing parameters: %s" % ', '.join(missing_fields))
-        number = data['meeting']
-        try:
-            meeting = Meeting.objects.get(number=number)
-        except Meeting.DoesNotExist:
-            return err(400, "Invalid meeting value: '%s'" % (number, ))
-        reg_type = data['reg_type']
-        email = data['email']
-        try:
-            validate_email(email)
-        except ValidationError:
-            return err(400, "Invalid email value: '%s'" % (email, ))
-        if request.POST.get('cancelled', 'false') == 'true':
-            MeetingRegistration.objects.filter(
-                meeting_id=meeting.pk,
-                email=email,
-                reg_type=reg_type).delete()
-            return HttpResponse('OK', status=200, content_type='text/plain')
-        else:
-            object, created = MeetingRegistration.objects.get_or_create(
-                meeting_id=meeting.pk,
-                email=email,
-                reg_type=reg_type)
-            try:
-                # Update attributes
-                for key in set(data.keys())-set(['attended', 'apikey', 'meeting', 'email']):
-                    if key == 'checkedin':
-                        new = bool(data.get(key).lower() == 'true')
-                    else:
-                        new = data.get(key)
-                    setattr(object, key, new)
-                person = Person.objects.filter(email__address=email)
-                if person.exists():
-                    object.person = person.first()
-                object.save()
-            except ValueError as e:
-                return err(400, "Unexpected POST data: %s" % e)
-            response = "Accepted, New registration" if created else "Accepted, Updated registration"
-            if User.objects.filter(username=email).exists() or Email.objects.filter(address=email).exists():
-                pass
-            else:
-                send_account_creation_email(request, email)
-                response += ", Email sent"
-            return HttpResponse(response, status=202, content_type='text/plain')
-    else:
-        return HttpResponse(status=405)
+    def _http_err(code, text):
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
+
+    def _api_response(result):
+        return JsonResponse(data={"result": result})
+
+    if request.method != "POST":
+        return _http_err(405, "Method not allowed")
+
+    if request.content_type != "application/json":
+        return _http_err(415, "Content-Type must be application/json")
+
+    # Validate
+    try:
+        payload = json.loads(request.body)
+        import_registration_json_validator.validate(payload)
+    except json.decoder.JSONDecodeError as err:
+        return _http_err(400, f"JSON parse error at line {err.lineno} col {err.colno}: {err.msg}")
+    except jsonschema.exceptions.ValidationError as err:
+        return _http_err(400, f"JSON schema error at {err.json_path}: {err.message}")
+    except Exception:
+        return _http_err(400, "Invalid request format")
+
+    # Get the meeting ID from the first registration, the API only deals with one meeting at a time
+    first_email = next(iter(payload['objects']))
+    meeting_number = payload['objects'][first_email]['meeting']
+    try:
+        meeting = Meeting.objects.get(number=meeting_number)
+    except Meeting.DoesNotExist:
+        return _http_err(400, f"Invalid meeting value: {meeting_number}")
+
+    # confirm email exists
+    try:
+        Email.objects.get(address=first_email)
+    except Email.DoesNotExist:
+        return _http_err(400, f"Unknown email: {first_email}")
+
+    reg_data = payload['objects'][first_email]
+
+    process_single_registration(reg_data, meeting)
+
+    return HttpResponse(
+        'Success',
+        status=202,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
 
 
 def version(request):
+    dumpdate = None
     dumpinfo = DumpInfo.objects.order_by('-date').first()
-    dumptime = pytz.timezone(dumpinfo.tz).localize(dumpinfo.date).strftime('%Y-%m-%d %H:%M:%S %z') if dumpinfo else None
+    if dumpinfo:
+        dumpdate = dumpinfo.date
+        if dumpinfo.tz != "UTC":
+            dumpdate = pytz.timezone(dumpinfo.tz).localize(dumpinfo.date.replace(tzinfo=None))
+    dumptime = dumpdate.strftime('%Y-%m-%d %H:%M:%S %z') if dumpinfo else None
+
+    # important libraries
+    __version_extra__ = {}
+    for lib in settings.ADVERTISE_VERSIONS:
+        __version_extra__[lib] = metadata_version(lib)
+
     return HttpResponse(
             json.dumps({
                         'version': ietf.__version__+ietf.__patch__,
+                        'other': __version_extra__,
                         'dumptime': dumptime,
                     }),
                 content_type='application/json',
@@ -216,7 +233,504 @@ def version(request):
 
 @require_api_key
 @csrf_exempt
-def app_auth(request):
+def app_auth(request, app: Literal["authortools", "bibxml"]):
     return HttpResponse(
             json.dumps({'success': True}),
             content_type='application/json')
+
+@requires_api_token
+@csrf_exempt
+def nfs_metrics(request):
+    with NamedTemporaryFile(dir=settings.NFS_METRICS_TMP_DIR,delete=False) as fp:
+        fp.close()
+        mark = datetime.datetime.now()
+        with open(fp.name, mode="w") as f:
+            f.write("whyioughta"*1024)
+        write_latency = (datetime.datetime.now() - mark).total_seconds()
+        mark = datetime.datetime.now()
+        with open(fp.name, "r") as f:
+            _=f.read()
+        read_latency = (datetime.datetime.now() - mark).total_seconds()
+        Path(f.name).unlink()
+    response=f'nfs_latency_seconds{{operation="write"}} {write_latency}\nnfs_latency_seconds{{operation="read"}} {read_latency}\n'
+    return HttpResponse(response)
+
+def find_doc_for_rfcdiff(name, rev):
+    """rfcdiff lookup heuristics
+
+    Returns a tuple with:
+      [0] - condition string
+      [1] - document found (or None)
+      [2] - historic version
+      [3] - revision actually found (may differ from :rev: input)
+    """
+    found = fuzzy_find_documents(name, rev)
+    condition = 'no such document'
+    if found.documents.count() != 1:
+        return (condition, None, None, rev)
+    doc = found.documents.get()
+    if found.matched_rev is None or doc.rev == found.matched_rev:
+        condition = 'current version'
+        return (condition, doc, None, found.matched_rev)
+    else:
+        candidate = doc.history_set.filter(rev=found.matched_rev).order_by("-time").first()
+        if candidate:
+            condition = 'historic version'
+            return (condition, doc, candidate, found.matched_rev)
+        else:
+            condition = 'version dochistory not found'
+            return (condition, doc, None, found.matched_rev)
+
+# This is a proof of concept of a service that would redirect to the current revision
+# def rfcdiff_latest(request, name, rev=None):
+#     condition, doc, history = find_doc_for_rfcdiff(name, rev)
+#     if not doc:
+#         raise Http404
+#     if history:
+#         return redirect(history.get_href())
+#     else:
+#         return redirect(doc.get_href())
+
+HAS_TOMBSTONE = [
+    2821, 2822, 2873, 2919, 2961, 3023, 3029, 3031, 3032, 3033, 3034, 3035, 3036,
+    3037, 3038, 3042, 3044, 3050, 3052, 3054, 3055, 3056, 3057, 3059, 3060, 3061,
+    3062, 3063, 3064, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076,
+    3077, 3078, 3080, 3081, 3082, 3084, 3085, 3086, 3087, 3088, 3089, 3090, 3094,
+    3095, 3096, 3097, 3098, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109,
+    3110, 3111, 3112, 3113, 3114, 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3123,
+    3124, 3126, 3127, 3128, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, 3138,
+    3139, 3140, 3141, 3142, 3143, 3144, 3145, 3147, 3149, 3150, 3151, 3152, 3153,
+    3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, 3162, 3163, 3164, 3165, 3166,
+    3167, 3168, 3169, 3170, 3171, 3172, 3173, 3174, 3176, 3179, 3180, 3181, 3182,
+    3183, 3184, 3185, 3186, 3187, 3188, 3189, 3190, 3191, 3192, 3193, 3194, 3197,
+    3198, 3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, 3210, 3211, 3212,
+    3213, 3214, 3215, 3216, 3217, 3218, 3220, 3221, 3222, 3224, 3225, 3226, 3227,
+    3228, 3229, 3230, 3231, 3232, 3233, 3234, 3235, 3236, 3237, 3238, 3240, 3241,
+    3242, 3243, 3244, 3245, 3246, 3247, 3248, 3249, 3250, 3253, 3254, 3255, 3256,
+    3257, 3258, 3259, 3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269,
+    3270, 3271, 3272, 3273, 3274, 3275, 3276, 3278, 3279, 3280, 3281, 3282, 3283,
+    3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3296,
+    3297, 3298, 3301, 3302, 3303, 3304, 3305, 3307, 3308, 3309, 3310, 3311, 3312,
+    3313, 3315, 3317, 3318, 3319, 3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327,
+    3329, 3330, 3331, 3332, 3334, 3335, 3336, 3338, 3340, 3341, 3342, 3343, 3346,
+    3348, 3349, 3351, 3352, 3353, 3354, 3355, 3356, 3360, 3361, 3362, 3363, 3364,
+    3366, 3367, 3368, 3369, 3370, 3371, 3372, 3374, 3375, 3377, 3378, 3379, 3383,
+    3384, 3385, 3386, 3387, 3388, 3389, 3390, 3391, 3394, 3395, 3396, 3397, 3398,
+    3401, 3402, 3403, 3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413,
+    3414, 3415, 3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, 3426,
+    3427, 3428, 3429, 3430, 3431, 3433, 3434, 3435, 3436, 3437, 3438, 3439, 3440,
+    3441, 3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450, 3451, 3452, 3453, 3454,
+    3455, 3458, 3459, 3460, 3461, 3462, 3463, 3464, 3465, 3466, 3467, 3468, 3469,
+    3470, 3471, 3472, 3473, 3474, 3475, 3476, 3477, 3480, 3481, 3483, 3485, 3488,
+    3494, 3495, 3496, 3497, 3498, 3501, 3502, 3503, 3504, 3505, 3506, 3507, 3508,
+    3509, 3511, 3512, 3515, 3516, 3517, 3518, 3520, 3521, 3522, 3523, 3524, 3525,
+    3527, 3529, 3530, 3532, 3533, 3534, 3536, 3537, 3538, 3539, 3541, 3543, 3544,
+    3545, 3546, 3547, 3548, 3549, 3550, 3551, 3552, 3555, 3556, 3557, 3558, 3559,
+    3560, 3562, 3563, 3564, 3565, 3568, 3569, 3570, 3571, 3572, 3573, 3574, 3575,
+    3576, 3577, 3578, 3579, 3580, 3581, 3582, 3583, 3584, 3588, 3589, 3590, 3591,
+    3592, 3593, 3594, 3595, 3597, 3598, 3601, 3607, 3609, 3610, 3612, 3614, 3615,
+    3616, 3625, 3627, 3630, 3635, 3636, 3637, 3638
+]
+
+
+def get_previous_url(name, rev=None):
+    '''Return previous url'''
+    condition, document, history, found_rev = find_doc_for_rfcdiff(name, rev)
+    previous_url = ''
+    if condition in ('historic version', 'current version'):
+        doc = history if history else document
+        previous_url = doc.get_href()
+    elif condition == 'version dochistory not found':
+        document.rev = found_rev
+        previous_url = document.get_href()
+    return previous_url
+
+
+def rfcdiff_latest_json(request, name, rev=None):
+    response = dict()
+    condition, document, history, found_rev = find_doc_for_rfcdiff(name, rev)
+    if document and document.type_id == "rfc":
+        draft = document.came_from_draft()
+    if condition == 'no such document':
+        raise Http404
+    elif condition in ('historic version', 'current version'):
+        doc = history if history else document
+        if doc.type_id == "rfc":
+                response['content_url'] = doc.get_href()
+                response['name']=doc.name
+                if draft:
+                    prev_rev = draft.rev
+                    if doc.rfc_number in HAS_TOMBSTONE and prev_rev != '00':
+                        prev_rev = f'{(int(draft.rev)-1):02d}'
+                    response['previous'] = f'{draft.name}-{prev_rev}'
+                    response['previous_url'] = get_previous_url(draft.name, prev_rev)            
+        elif doc.type_id == "draft" and not found_rev and doc.relateddocument_set.filter(relationship_id="became_rfc").exists():
+                rfc = doc.related_that_doc("became_rfc")[0]
+                response['content_url'] = rfc.get_href()
+                response['name']=rfc.name
+                prev_rev = doc.rev
+                if rfc.rfc_number in HAS_TOMBSTONE and prev_rev != '00':
+                    prev_rev = f'{(int(doc.rev)-1):02d}'
+                response['previous'] = f'{doc.name}-{prev_rev}'
+                response['previous_url'] = get_previous_url(doc.name, prev_rev)
+        else:
+            response['content_url'] = doc.get_href()
+            response['rev'] = doc.rev
+            response['name'] = doc.name
+            if doc.rev == '00':
+                replaces_docs = (history.doc if condition=='historic version' else doc).related_that_doc('replaces')
+                if replaces_docs:
+                    replaces = replaces_docs[0]
+                    response['previous'] = f'{replaces.name}-{replaces.rev}'
+                    response['previous_url'] = get_previous_url(replaces.name, replaces.rev)
+                else:
+                    match = re.search("-(rfc)?([0-9][0-9][0-9]+)bis(-.*)?$", name)
+                    if match and match.group(2):
+                        response['previous'] = f'rfc{match.group(2)}'
+                        response['previous_url'] = get_previous_url(f'rfc{match.group(2)}')
+            else:
+                # not sure what to do if non-numeric values come back, so at least log it
+                log.assertion('doc.rev.isdigit()')
+                prev_rev = f'{(int(doc.rev)-1):02d}'
+                response['previous'] = f'{doc.name}-{prev_rev}'
+                response['previous_url'] = get_previous_url(doc.name, prev_rev)
+    elif condition == 'version dochistory not found':
+        response['warning'] = 'History for this version not found - these results are speculation'
+        response['name'] = document.name
+        response['rev'] = found_rev
+        document.rev = found_rev
+        response['content_url'] = document.get_href()
+        # not sure what to do if non-numeric values come back, so at least log it
+        log.assertion('found_rev.isdigit()')
+        if int(found_rev) > 0:
+            prev_rev = f'{(int(found_rev)-1):02d}'
+            response['previous'] = f'{document.name}-{prev_rev}'
+            response['previous_url'] = get_previous_url(document.name, prev_rev)
+        else:
+            match = re.search("-(rfc)?([0-9][0-9][0-9]+)bis(-.*)?$", name)
+            if match and match.group(2):
+                response['previous'] = f'rfc{match.group(2)}'
+                response['previous_url'] = get_previous_url(f'rfc{match.group(2)}')
+    if not response:
+        raise Http404
+    return HttpResponse(json.dumps(response), content_type='application/json')
+
+@csrf_exempt
+def directauth(request):
+    if request.method == "POST":
+        raw_data = request.POST.get("data", None)
+        if raw_data:
+            try:
+                data = json.loads(raw_data)
+            except json.decoder.JSONDecodeError:
+                data = None
+
+        if raw_data is None or data is None:
+            log.log("Request body is either missing or invalid")
+            return HttpResponse(json.dumps(dict(result="failure",reason="invalid post")), content_type='application/json')
+
+        authtoken = data.get('authtoken', None)
+        username = data.get('username', None)
+        password = data.get('password', None)
+
+        if any([item is None for item in (authtoken, username, password)]):
+            log.log("One or more mandatory fields are missing: authtoken, username, password")
+            return HttpResponse(json.dumps(dict(result="failure",reason="invalid post")), content_type='application/json')
+
+        if not is_valid_token("ietf.api.views.directauth", authtoken):
+            log.log("Auth token provided is invalid")
+            return HttpResponse(json.dumps(dict(result="failure",reason="invalid authtoken")), content_type='application/json')
+        
+        user_query = User.objects.filter(username__iexact=username)
+
+        # Matching email would be consistent with auth everywhere else in the app, but until we can map users well
+        # in the imap server, people's annotations are associated with a very specific login.
+        # If we get a second user of this API, add an "allow_any_email" argument.
+
+
+        # Note well that we are using user.username, not what was passed to the API.
+        user_count = user_query.count()
+        if user_count == 1 and authenticate(username = user_query.first().username, password = password):
+            user = user_query.get()
+            if user_query.filter(person__isnull=True).count() == 1: # Can't inspect user.person direclty here
+                log.log(f"Direct auth success (personless user): {user.pk}:{user.username}")
+            else:
+                log.log(f"Direct auth success: {user.pk}:{user.person.plain_name()}")
+            return HttpResponse(json.dumps(dict(result="success")), content_type='application/json')
+
+        log.log(f"Direct auth failure: {username} ({user_count} user(s) found)")
+        return HttpResponse(json.dumps(dict(result="failure", reason="authentication failed")), content_type='application/json') 
+
+    else:
+        log.log(f"Request must be POST: {request.method} received")
+        return HttpResponse(status=405)
+
+
+@requires_api_token
+@csrf_exempt
+def draft_aliases(request):
+    if request.method == "GET":
+        return JsonResponse(
+            {
+                "aliases": [
+                    {
+                        "alias": alias,
+                        "domains": ["ietf"],
+                        "addresses": address_list,
+                    }
+                    for alias, address_list in DraftAliasGenerator()
+                ]
+            }
+        )
+    return HttpResponse(status=405)
+
+
+@requires_api_token
+@csrf_exempt
+def group_aliases(request):
+    if request.method == "GET":
+        return JsonResponse(
+            {
+                "aliases": [
+                    {
+                        "alias": alias,
+                        "domains": domains,
+                        "addresses": address_list,
+                    } 
+                    for alias, domains, address_list in GroupAliasGenerator()
+                ]
+            }
+        )
+    return HttpResponse(status=405)
+
+
+@requires_api_token
+@csrf_exempt
+def active_email_list(request):
+    if request.method == "GET":
+        return JsonResponse(
+            {
+                "addresses": list(Email.objects.filter(active=True).values_list("address", flat=True)),
+            }
+        )
+    return HttpResponse(status=405)
+
+
+@requires_api_token
+@csrf_exempt
+def related_email_list(request, email):
+    """Given an email address, returns all other email addresses known
+    to Datatracker, via Person object
+    """
+    def _http_err(code, text):
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
+
+    if request.method == "GET":
+        try:
+            email_obj = Email.objects.get(address=email)
+        except Email.DoesNotExist:
+            return _http_err(404, "Email not found")
+        person = email_obj.person
+        if not person:
+            return JsonResponse({"addresses": []})
+        return JsonResponse(
+            {
+                "addresses": list(person.email_set.values_list("address", flat=True)),
+            }
+        )
+    return HttpResponse(status=405)
+
+
+@requires_api_token
+def role_holder_addresses(request):
+    if request.method == "GET":
+        return JsonResponse(
+            {
+                "addresses": list(
+                    role_holder_emails()
+                    .order_by("address")
+                    .values_list("address", flat=True)
+                )
+            }
+        )
+    return HttpResponse(status=405)
+
+
+_response_email_json_validator = jsonschema.Draft202012Validator(
+    schema={
+        "type": "object",
+        "properties": {
+            "dest": {
+                "type": "string",
+            },
+            "message": {
+                "type": "string",  # base64-encoded mail message
+            },
+        },
+        "required": ["dest", "message"],
+    }
+)
+
+
+class EmailIngestionError(Exception):
+    """Exception indicating ingestion failed"""
+    def __init__(
+        self,
+        msg="Message rejected",
+        *,
+        email_body: Optional[str] = None,
+        email_recipients: Optional[Iterable[str]] = None,
+        email_attach_traceback=False,
+        email_original_message: Optional[bytes]=None,
+    ):
+        self.msg = msg
+        self.email_body = email_body
+        self.email_subject = msg
+        self.email_recipients = email_recipients 
+        self.email_attach_traceback = email_attach_traceback
+        self.email_original_message = email_original_message
+        self.email_from = settings.SERVER_EMAIL
+            
+    @staticmethod
+    def _summarize_error(error):
+        frame = extract_tb(error.__traceback__)[-1]
+        return dedent(f"""\
+            Error details:
+              Exception type: {type(error).__module__}.{type(error).__name__}
+              File: {frame.filename}
+              Line: {frame.lineno}""")
+
+    def as_emailmessage(self) -> Optional[EmailMessage]:
+        """Generate an EmailMessage to report an error"""
+        if self.email_body is None:
+            return None  
+        error = self if self.__cause__ is None else self.__cause__
+        format_values = dict(
+            error=error,
+            error_summary=self._summarize_error(error),
+        )
+        msg = EmailMessage()
+        if self.email_recipients is None:
+            msg["To"] = tuple(adm[1] for adm in settings.ADMINS) 
+        else: 
+            msg["To"] = self.email_recipients
+        msg["From"] = self.email_from
+        msg["Subject"] = self.msg
+        msg.set_content(
+            self.email_body.format(**format_values)
+        )
+        if self.email_attach_traceback:
+            msg.add_attachment(
+                "".join(format_exception(None, error, error.__traceback__)),
+                filename="traceback.txt",
+            )
+        if self.email_original_message is not None:
+            # Attach incoming message if it was provided. Send as a generic media
+            # type because we don't know for sure that it was actually a valid
+            # message.
+            msg.add_attachment(
+                self.email_original_message,
+                'application', 'octet-stream',  # media type
+                filename='original-message',
+            )
+        return msg
+
+
+def ingest_email_handler(request, test_mode=False):
+    """Ingest incoming email - handler
+    
+    Returns a 4xx or 5xx status code if the HTTP request was invalid or something went
+    wrong while processing it. If the request was valid, returns a 200. This may or may
+    not indicate that the message was accepted.
+    
+    If test_mode is true, actual processing of a valid message will be skipped. In this
+    mode, a valid request with a valid destination will be treated as accepted. The
+    "bad_dest" error may still be returned.
+    """
+
+    def _http_err(code, text):
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
+
+    def _api_response(result):
+        return JsonResponse(data={"result": result})
+
+    if request.method != "POST":
+        return _http_err(405, "Method not allowed")
+
+    if request.content_type != "application/json":
+        return _http_err(415, "Content-Type must be application/json")
+
+    # Validate
+    try:
+        payload = json.loads(request.body)
+        _response_email_json_validator.validate(payload)
+    except json.decoder.JSONDecodeError as err:
+        return _http_err(400, f"JSON parse error at line {err.lineno} col {err.colno}: {err.msg}")
+    except jsonschema.exceptions.ValidationError as err:
+        return _http_err(400, f"JSON schema error at {err.json_path}: {err.message}")
+    except Exception:
+        return _http_err(400, "Invalid request format")
+
+    try:
+        message = base64.b64decode(payload["message"], validate=True)
+    except binascii.Error:
+        return _http_err(400, "Invalid message: bad base64 encoding")
+
+    dest = payload["dest"]
+    valid_dest = False
+    try:
+        if dest == "iana-review":
+            valid_dest = True
+            if not test_mode:
+                iana_ingest_review_email(message)
+        elif dest == "ipr-response":
+            valid_dest = True
+            if not test_mode:
+                ipr_ingest_response_email(message)
+        elif dest.startswith("nomcom-feedback-"):
+            maybe_year = dest[len("nomcom-feedback-"):]
+            if maybe_year.isdecimal():
+                valid_dest = True
+                if not test_mode:
+                    nomcom_ingest_feedback_email(message, int(maybe_year))
+    except EmailIngestionError as err:
+        error_email = err.as_emailmessage()
+        if error_email is not None:
+            with suppress(Exception): # send_smtp logs its own exceptions, ignore them here
+                send_smtp(error_email)
+        return _api_response("bad_msg")
+
+    if not valid_dest:
+        return _api_response("bad_dest")
+
+    return _api_response("ok")
+
+
+@requires_api_token
+@csrf_exempt
+def ingest_email(request):
+    """Ingest incoming email
+
+    Hands off to ingest_email_handler() with test_mode=False. This allows @requires_api_token to
+    give the test endpoint a distinct token from the real one.
+    """
+    return ingest_email_handler(request, test_mode=False)
+
+
+@requires_api_token
+@csrf_exempt
+def ingest_email_test(request):
+    """Ingest incoming email test endpoint
+    
+    Hands off to ingest_email_handler() with test_mode=True. This allows @requires_api_token to
+    give the test endpoint a distinct token from the real one.
+    """
+    return ingest_email_handler(request, test_mode=True)
diff --git a/ietf/api/views_rpc.py b/ietf/api/views_rpc.py
new file mode 100644
index 0000000000..6bc45fe3da
--- /dev/null
+++ b/ietf/api/views_rpc.py
@@ -0,0 +1,552 @@
+# Copyright The IETF Trust 2023-2026, All Rights Reserved
+import os
+import shutil
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+from django.conf import settings
+from django.db import IntegrityError
+from drf_spectacular.utils import OpenApiParameter
+from rest_framework import mixins, parsers, serializers, viewsets, status
+from rest_framework.decorators import action
+from rest_framework.exceptions import APIException
+from rest_framework.views import APIView
+from rest_framework.response import Response
+
+from django.db.models import CharField as ModelCharField, OuterRef, Subquery, Q
+from django.db.models.functions import Coalesce
+from django.http import Http404
+from drf_spectacular.utils import extend_schema_view, extend_schema
+from rest_framework import generics
+from rest_framework.fields import CharField as DrfCharField
+from rest_framework.filters import SearchFilter
+from rest_framework.pagination import LimitOffsetPagination
+
+from ietf.api.serializers_rpc import (
+    PersonSerializer,
+    FullDraftSerializer,
+    DraftSerializer,
+    SubmittedToQueueSerializer,
+    OriginalStreamSerializer,
+    ReferenceSerializer,
+    EmailPersonSerializer,
+    RfcWithAuthorsSerializer,
+    DraftWithAuthorsSerializer,
+    NotificationAckSerializer,
+    RfcPubSerializer,
+    RfcFileSerializer,
+    EditableRfcSerializer,
+)
+from ietf.doc.models import Document, DocHistory, RfcAuthor, DocEvent
+from ietf.doc.serializers import RfcAuthorSerializer
+from ietf.doc.storage_utils import remove_from_storage, store_file, exists_in_storage
+from ietf.doc.tasks import (
+    signal_update_rfc_metadata_task,
+    rebuild_reference_relations_task,
+    trigger_red_precomputer_task,
+    update_rfc_searchindex_task,
+)
+from ietf.person.models import Email, Person
+from ietf.sync.rfcindex import mark_rfcindex_as_dirty
+
+
+class Conflict(APIException):
+    status_code = status.HTTP_409_CONFLICT
+    default_detail = "Conflict."
+    default_code = "conflict"
+
+
+@extend_schema_view(
+    retrieve=extend_schema(
+        operation_id="get_person_by_id",
+        summary="Find person by ID",
+        description="Returns a single person",
+        parameters=[
+            OpenApiParameter(
+                name="person_id",
+                type=int,
+                location="path",
+                description="Person ID identifying this person.",
+            ),
+        ],
+    ),
+)
+class PersonViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
+    queryset = Person.objects.all()
+    serializer_class = PersonSerializer
+    api_key_endpoint = "ietf.api.views_rpc"
+    lookup_url_kwarg = "person_id"
+
+    @extend_schema(
+        operation_id="get_persons",
+        summary="Get a batch of persons",
+        description="Returns a list of persons matching requested ids. Omits any that are missing.",
+        request=list[int],
+        responses=PersonSerializer(many=True),
+    )
+    @action(detail=False, methods=["post"])
+    def batch(self, request):
+        """Get a batch of rpc person names"""
+        pks = request.data
+        return Response(
+            self.get_serializer(Person.objects.filter(pk__in=pks), many=True).data
+        )
+
+    @extend_schema(
+        operation_id="persons_by_email",
+        summary="Get a batch of persons by email addresses",
+        description=(
+            "Returns a list of persons matching requested ids. "
+            "Omits any that are missing."
+        ),
+        request=list[str],
+        responses=EmailPersonSerializer(many=True),
+    )
+    @action(detail=False, methods=["post"], serializer_class=EmailPersonSerializer)
+    def batch_by_email(self, request):
+        emails = Email.objects.filter(address__in=request.data, person__isnull=False)
+        serializer = self.get_serializer(emails, many=True)
+        return Response(serializer.data)
+
+
+class SubjectPersonView(APIView):
+    api_key_endpoint = "ietf.api.views_rpc"
+
+    @extend_schema(
+        operation_id="get_subject_person_by_id",
+        summary="Find person for OIDC subject by ID",
+        description="Returns a single person",
+        responses=PersonSerializer,
+        parameters=[
+            OpenApiParameter(
+                name="subject_id",
+                type=str,
+                description="subject ID of person to return",
+                location="path",
+            ),
+        ],
+    )
+    def get(self, request, subject_id: str):
+        try:
+            user_id = int(subject_id)
+        except ValueError:
+            raise serializers.ValidationError(
+                {"subject_id": "This field must be an integer value."}
+            )
+        person = Person.objects.filter(user__pk=user_id).first()
+        if person:
+            return Response(PersonSerializer(person).data)
+        raise Http404
+
+
+class RpcLimitOffsetPagination(LimitOffsetPagination):
+    default_limit = 10
+    max_limit = 100
+
+
+class SingleTermSearchFilter(SearchFilter):
+    """SearchFilter backend that does not split terms
+
+    The default SearchFilter treats comma or whitespace-separated terms as individual
+    search terms. This backend instead searches for the exact term.
+    """
+
+    def get_search_terms(self, request):
+        value = request.query_params.get(self.search_param, "")
+        field = DrfCharField(trim_whitespace=False, allow_blank=True)
+        cleaned_value = field.run_validation(value)
+        return [cleaned_value]
+
+
+@extend_schema_view(
+    get=extend_schema(
+        operation_id="search_person",
+        description="Get a list of persons, matching by partial name or email",
+    ),
+)
+class RpcPersonSearch(generics.ListAPIView):
+    # n.b. the OpenAPI schema for this can be generated by running
+    # ietf/manage.py spectacular --file spectacular.yaml
+    # and extracting / touching up the rpc_person_search_list operation
+    api_key_endpoint = "ietf.api.views_rpc"
+    queryset = Person.objects.all()
+    serializer_class = PersonSerializer
+    pagination_class = RpcLimitOffsetPagination
+
+    # Searchable on all name-like fields or email addresses
+    filter_backends = [SingleTermSearchFilter]
+    search_fields = ["name", "plain", "email__address"]
+
+
+@extend_schema_view(
+    retrieve=extend_schema(
+        operation_id="get_draft_by_id",
+        summary="Get a draft",
+        description="Returns the draft for the requested ID",
+        parameters=[
+            OpenApiParameter(
+                name="doc_id",
+                type=int,
+                location="path",
+                description="Doc ID identifying this draft.",
+            ),
+        ],
+    ),
+    submitted_to_rpc=extend_schema(
+        operation_id="submitted_to_rpc",
+        summary="List documents ready to enter the RFC Editor Queue",
+        description="List documents ready to enter the RFC Editor Queue",
+        responses=SubmittedToQueueSerializer(many=True),
+    ),
+)
+class DraftViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
+    queryset = Document.objects.filter(type_id="draft")
+    serializer_class = FullDraftSerializer
+    api_key_endpoint = "ietf.api.views_rpc"
+    lookup_url_kwarg = "doc_id"
+
+    @action(detail=False, serializer_class=SubmittedToQueueSerializer)
+    def submitted_to_rpc(self, request):
+        """Return documents in datatracker that have been submitted to the RPC but are not yet in the queue
+
+        Those queries overreturn - there may be things, particularly not from the IETF stream that are already in the queue.
+        """
+        ietf_docs = Q(states__type_id="draft-iesg", states__slug__in=["ann"])
+        irtf_iab_ise_editorial_docs = Q(
+            states__type_id__in=[
+                "draft-stream-iab",
+                "draft-stream-irtf",
+                "draft-stream-ise",
+                "draft-stream-editorial",
+            ],
+            states__slug__in=["rfc-edit"],
+        )
+        docs = (
+            self.get_queryset()
+            .filter(type_id="draft")
+            .filter(ietf_docs | irtf_iab_ise_editorial_docs)
+        )
+        serializer = self.get_serializer(docs, many=True)
+        return Response(serializer.data)
+
+    @extend_schema(
+        operation_id="get_draft_references",
+        summary="Get normative references to I-Ds",
+        description=(
+            "Returns the id and name of each normatively "
+            "referenced Internet-Draft for the given docId"
+        ),
+        parameters=[
+            OpenApiParameter(
+                name="doc_id",
+                type=int,
+                location="path",
+                description="Doc ID identifying this draft.",
+            ),
+        ],
+        responses=ReferenceSerializer(many=True),
+    )
+    @action(detail=True, serializer_class=ReferenceSerializer)
+    def references(self, request, doc_id=None):
+        doc = self.get_object()
+        serializer = self.get_serializer(
+            [
+                reference
+                for reference in doc.related_that_doc("refnorm")
+                if reference.type_id == "draft"
+            ],
+            many=True,
+        )
+        return Response(serializer.data)
+
+    @extend_schema(
+        operation_id="get_draft_authors",
+        summary="Gather authors of the drafts with the given names",
+        description="returns a list mapping draft names to objects describing authors",
+        request=list[str],
+        responses=DraftWithAuthorsSerializer(many=True),
+    )
+    @action(detail=False, methods=["post"], serializer_class=DraftWithAuthorsSerializer)
+    def bulk_authors(self, request):
+        drafts = self.get_queryset().filter(name__in=request.data)
+        serializer = self.get_serializer(drafts, many=True)
+        return Response(serializer.data)
+
+
+@extend_schema_view(
+    rfc_original_stream=extend_schema(
+        operation_id="get_rfc_original_streams",
+        summary="Get the streams RFCs were originally published into",
+        description="returns a list of dicts associating an RFC with its originally published stream",
+        responses=OriginalStreamSerializer(many=True),
+    )
+)
+class RfcViewSet(mixins.UpdateModelMixin, viewsets.GenericViewSet):
+    queryset = Document.objects.filter(type_id="rfc")
+    api_key_endpoint = "ietf.api.views_rpc"
+    lookup_field = "rfc_number"
+    serializer_class = EditableRfcSerializer
+
+    def perform_update(self, serializer):
+        DocEvent.objects.create(
+            doc=serializer.instance,
+            rev=serializer.instance.rev,
+            by=Person.objects.get(name="(System)"),
+            type="sync_from_rfc_editor",
+            desc="Metadata update from RFC Editor",
+        )
+        super().perform_update(serializer)
+
+    @action(detail=False, serializer_class=OriginalStreamSerializer)
+    def rfc_original_stream(self, request):
+        rfcs = self.get_queryset().annotate(
+            orig_stream_id=Coalesce(
+                Subquery(
+                    DocHistory.objects.filter(doc=OuterRef("pk"))
+                    .exclude(stream__isnull=True)
+                    .order_by("time")
+                    .values_list("stream_id", flat=True)[:1]
+                ),
+                "stream_id",
+                output_field=ModelCharField(),
+            ),
+        )
+        serializer = self.get_serializer(rfcs, many=True)
+        return Response(serializer.data)
+
+    @extend_schema(
+        operation_id="get_rfc_authors",
+        summary="Gather authors of the RFCs with the given numbers",
+        description="returns a list mapping rfc numbers to objects describing authors",
+        request=list[int],
+        responses=RfcWithAuthorsSerializer(many=True),
+    )
+    @action(detail=False, methods=["post"], serializer_class=RfcWithAuthorsSerializer)
+    def bulk_authors(self, request):
+        rfcs = self.get_queryset().filter(rfc_number__in=request.data)
+        serializer = self.get_serializer(rfcs, many=True)
+        return Response(serializer.data)
+
+
+class DraftsByNamesView(APIView):
+    api_key_endpoint = "ietf.api.views_rpc"
+
+    @extend_schema(
+        operation_id="get_drafts_by_names",
+        summary="Get a batch of drafts by draft names",
+        description="returns a list of drafts with matching names",
+        request=list[str],
+        responses=DraftSerializer(many=True),
+    )
+    def post(self, request):
+        names = request.data
+        docs = Document.objects.filter(type_id="draft", name__in=names)
+        return Response(DraftSerializer(docs, many=True).data)
+
+
+class RfcAuthorViewSet(viewsets.ReadOnlyModelViewSet):
+    """ViewSet for RfcAuthor model
+
+    Router needs to provide rfc_number as a kwarg
+    """
+
+    api_key_endpoint = "ietf.api.views_rpc"
+
+    queryset = RfcAuthor.objects.all()
+    serializer_class = RfcAuthorSerializer
+    lookup_url_kwarg = "author_id"
+    rfc_number_param = "rfc_number"
+
+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .filter(
+                document__type_id="rfc",
+                document__rfc_number=self.kwargs[self.rfc_number_param],
+            )
+        )
+
+
+class RfcPubNotificationView(APIView):
+    api_key_endpoint = "ietf.api.views_rpc"
+
+    @extend_schema(
+        operation_id="notify_rfc_published",
+        summary="Notify datatracker of RFC publication",
+        request=RfcPubSerializer,
+        responses=NotificationAckSerializer,
+    )
+    def post(self, request):
+        serializer = RfcPubSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        # Create RFC
+        try:
+            rfc = serializer.save()
+        except IntegrityError as err:
+            if Document.objects.filter(
+                rfc_number=serializer.validated_data["rfc_number"]
+            ):
+                raise serializers.ValidationError(
+                    "RFC with that number already exists",
+                    code="rfc-number-in-use",
+                )
+            raise serializers.ValidationError(
+                f"Unable to publish: {err}",
+                code="unknown-integrity-error",
+            )
+        rfc_number_list = [rfc.rfc_number]
+        rfc_number_list.extend(
+            [d.rfc_number for d in rfc.related_that_doc(("updates", "obs"))]
+        )
+        rfc_number_list = sorted(set(rfc_number_list))
+        signal_update_rfc_metadata_task.delay(rfc_number_list=rfc_number_list)
+        return Response(NotificationAckSerializer().data)
+
+
+class RfcPubFilesView(APIView):
+    api_key_endpoint = "ietf.api.views_rpc"
+    parser_classes = [parsers.MultiPartParser]
+
+    def _fs_destination(self, filename: str | Path) -> Path:
+        """Destination for an uploaded RFC file in the filesystem
+
+        Strips any path components in filename and returns an absolute Path.
+        """
+        rfc_path = Path(settings.RFC_PATH)
+        filename = Path(filename)  # could potentially have directory components
+        extension = "".join(filename.suffixes)
+        if extension == ".notprepped.xml":
+            return rfc_path / "prerelease" / filename.name
+        return rfc_path / filename.name
+
+    def _blob_destination(self, filename: str | Path) -> str:
+        """Destination name for an uploaded RFC file in the blob store
+
+        Strips any path components in filename and returns an absolute Path.
+        """
+        filename = Path(filename)  # could potentially have directory components
+        extension = "".join(filename.suffixes)
+        if extension == ".notprepped.xml":
+            file_type = "notprepped"
+        elif extension[0] == ".":
+            file_type = extension[1:]
+        else:
+            raise serializers.ValidationError(
+                f"Extension does not begin with '.'!? ({filename})",
+            )
+        return f"{file_type}/{filename.name}"
+
+    @extend_schema(
+        operation_id="upload_rfc_files",
+        summary="Upload files for a published RFC",
+        request=RfcFileSerializer,
+        responses=NotificationAckSerializer,
+    )
+    def post(self, request):
+        serializer = RfcFileSerializer(
+            # many=True,
+            data=request.data,
+        )
+        serializer.is_valid(raise_exception=True)
+        rfc = serializer.validated_data["rfc"]
+        uploaded_files = serializer.validated_data["contents"]  # list[UploadedFile]
+        replace = serializer.validated_data["replace"]
+        dest_stem = f"rfc{rfc.rfc_number}"
+        mtime = serializer.validated_data["mtime"]
+        mtimestamp = mtime.timestamp()
+        blob_kind = "rfc"
+
+        # List of files that might exist for an RFC
+        possible_rfc_files = [
+            self._fs_destination(dest_stem + ext)
+            for ext in serializer.allowed_extensions
+        ]
+        possible_rfc_blobs = [
+            self._blob_destination(dest_stem + ext)
+            for ext in serializer.allowed_extensions
+        ]
+        if not replace:
+            # this is the default: refuse to overwrite anything if not replacing
+            for possible_existing_file in possible_rfc_files:
+                if possible_existing_file.exists():
+                    raise Conflict(
+                        "File(s) already exist for this RFC",
+                        code="files-exist",
+                    )
+            for possible_existing_blob in possible_rfc_blobs:
+                if exists_in_storage(kind=blob_kind, name=possible_existing_blob):
+                    raise Conflict(
+                        "Blob(s) already exist for this RFC",
+                        code="blobs-exist",
+                    )
+
+        with TemporaryDirectory() as tempdir:
+            # Save files in a temporary directory. Use the uploaded filename
+            # extensions to identify files, but ignore the stems and generate our own.
+            files_to_move = []  # list[Path]
+            tmpfile_stem = Path(tempdir) / dest_stem
+            for upfile in uploaded_files:
+                uploaded_filename = Path(upfile.name)  # name supplied by request
+                uploaded_ext = "".join(uploaded_filename.suffixes)
+                tempfile_path = tmpfile_stem.with_suffix(uploaded_ext)
+                with tempfile_path.open("wb") as dest:
+                    for chunk in upfile.chunks():
+                        dest.write(chunk)
+                os.utime(tempfile_path, (mtimestamp, mtimestamp))
+                files_to_move.append(tempfile_path)
+            # copy files to final location, removing any existing ones first if the
+            # remove flag was set
+            if replace:
+                for possible_existing_file in possible_rfc_files:
+                    possible_existing_file.unlink(missing_ok=True)
+                for possible_existing_blob in possible_rfc_blobs:
+                    remove_from_storage(
+                        blob_kind, possible_existing_blob, warn_if_missing=False
+                    )
+            for ftm in files_to_move:
+                with ftm.open("rb") as f:
+                    store_file(
+                        kind=blob_kind,
+                        name=self._blob_destination(ftm),
+                        file=f,
+                        doc_name=rfc.name,
+                        doc_rev=rfc.rev,  # expect blank, but match whatever it is
+                        mtime=mtime,
+                    )
+                destination = self._fs_destination(ftm)
+                if (
+                    settings.SERVER_MODE != "production"
+                    and not destination.parent.exists()
+                ):
+                    destination.parent.mkdir()
+                shutil.move(ftm, destination)
+
+        # Trigger red precomputer
+        needs_updating = [rfc.rfc_number]
+        for rel in rfc.relateddocument_set.filter(
+            relationship_id__in=["obs", "updates"]
+        ):
+            needs_updating.append(rel.target.rfc_number)
+        trigger_red_precomputer_task.delay(rfc_number_list=sorted(needs_updating))
+        # Trigger search index update
+        update_rfc_searchindex_task.delay(rfc.rfc_number)
+        # Trigger reference relation srebuild
+        rebuild_reference_relations_task.delay(doc_names=[rfc.name])
+
+        return Response(NotificationAckSerializer().data)
+
+
+class RfcIndexView(APIView):
+    api_key_endpoint = "ietf.api.views_rpc"
+
+    @extend_schema(
+        operation_id="refresh_rfc_index",
+        summary="Refresh rfc-index files",
+        description="Requests creation of various index files.",
+        responses={202: None},
+        request=None,
+    )
+    def post(self, request):
+        mark_rfcindex_as_dirty()
+        return Response(status=202)
diff --git a/ietf/bin/.gitignore b/ietf/bin/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/bin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/bin/2016-05-25-collect-photos b/ietf/bin/2016-05-25-collect-photos
deleted file mode 100755
index dedda767a8..0000000000
--- a/ietf/bin/2016-05-25-collect-photos
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/usr/bin/env python
-
-import os, re, sys, shutil, pathlib
-from collections import namedtuple
-from PIL import Image
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-import django
-django.setup()
-
-from django.conf import settings
-from django.utils.text import slugify
-
-import debug
-
-from ietf.group.models import Role, Person
-from ietf.person.name import name_parts
-
-old_images_dir = ''
-new_images_dir = settings.PHOTOS_DIR
-
-if not os.path.exists(new_images_dir):
-    print("New images directory does not exist: %s" % new_images_dir)
-    sys.exit(1)
-
-old_image_files = []
-for dir in settings.OLD_PHOTO_DIRS:
-    if not os.path.exists(dir):
-        print("Old images directory does not exist: %s" % dir)
-        sys.exit(1)
-    old_image_files += [ f for f in pathlib.Path(dir).iterdir() if f.is_file() and f.suffix.lower() in ['.jpg', '.jpeg', '.png'] ]
-
-photo = namedtuple('photo', ['path', 'name', 'ext', 'width', 'height', 'time', 'file'])
-
-old_images = []
-for f in old_image_files:
-    path = str(f)
-    img = Image.open(path)
-    old_images.append(photo(path, f.stem.decode('utf8'), f.suffix, img.size[0], img.size[1], f.stat().st_mtime, f))
-
-# Fix up some names:
-
-def fix_missing_surnames(images):
-    replacement = {
-        "alissa": "alissa-cooper",
-        "alissa1": "alissa-cooper",
-        "andrei": "andrei-robachevsky",
-        "bernard": "bernard-aboba",
-        "danny": "danny-mcpherson",
-        "danny1": "danny-mcpherson",
-        "dthaler": "dave-thaler",
-        "eliot-mug": "eliot-lear",
-        "erik.nordmark-300": "erik-nordmark",
-        "hannes": "hannes-tschofenig",
-        "hildebrand": "joe-hildebrand",
-        "housley": "russ-housley",
-        "jariarkko": "jari-arkko",
-        "joel": "joel-jaeggli",
-        "joel1": "joel-jaeggli",
-        "joel2": "joel-jaeggli",
-        "jon": "jon-peterson",
-        "kessens": "david-kessens",
-        "klensin": "john-klensin",
-        "lars": "lars-eggert",
-        "lars1": "lars-eggert",
-        "marc_blanchet": "marc-blanchet",
-        "marcelo": "marcelo-bagnulo",
-        "olaf": "olaf-kolkman",
-        "olaf1": "olaf-kolkman",
-        "ross": "ross-callon",
-        "spencer": "spencer-dawkins",
-        "spencer1": "spencer-dawkins",
-        "vijay": "vijay-gurbani",
-        "xing": "xing-li",
-    }
-
-    for i in range(len(images)):
-        img = images[i]
-        name = re.sub('-[0-9]+x[0-9]+', '', img.name)
-        if '/iab/' in img.path and name in replacement:
-            name = replacement[name]
-            images[i] = photo(img.path, name, img.ext, img.width, img.height, img.time, img.file)
-
-
-fix_missing_surnames(old_images)
-
-interesting_persons = set(Person.objects.all())
-
-name_alias = {
-    u"andy":     [u"andrew", ],
-    u"ben":      [u"benjamin", ],
-    u"bill":     [u"william", ],
-    u"bob":      [u"robert", ],
-    u"chris":    [u"christopher", u"christian"],
-    u"dan":      [u"daniel", ],
-    u"dave":     [u"david", ],
-    u"dick":     [u"richard", ],
-    u"fred":     [u"alfred", ],
-    u"geoff":    [u"geoffrey", ],
-    u"jake":     [u"jacob", ],
-    u"jerry":    [u"gerald", ],
-    u"jim":      [u"james", ],
-    u"joe":      [u"joseph", ],
-    u"jon":      [u"jonathan", ],
-    u"mike":     [u"michael", ],
-    u"ned":      [u"edward", ],
-    u"pete":     [u"peter", ],
-    u"ron":      [u"ronald", ],
-    u"russ":     [u"russel", ],
-    u"steve":    [u"stephen", ],
-    u"ted":      [u"edward", ],
-    u"terry":    [u"terence", ],
-    u"tom":      [u"thomas", ],
-    u"wes":      [u"wesley", ],
-    u"will":     [u"william", ],
-
-    u"beth":     [u"elizabeth", ],
-    u"liz":      [u"elizabeth", ],
-    u"lynn":     [u"carolyn", ],
-    u"pat":      [u"patricia", u"patrick", ],
-    u"sue":      [u"susan", ],
-}
-# Add lookups from long to short, from the initial set
-for key,value in name_alias.items():
-    for item in value:
-        if item in name_alias:
-            name_alias[item] += [ key ];
-        else:
-            name_alias[item] = [ key ];
-
-exceptions = {
-'Aboba' : 'aboba-bernard',
-'Bernardos' : 'cano-carlos',
-'Bormann' : 'bormann-carsten',
-'Hinden' : 'hinden-bob',
-'Hutton' : 'hutton-andy',
-'Narten' : 'narten-thomas', # but there's no picture of him 
-'O\'Donoghue' : 'odonoghue-karen',
-'Przygienda' : 'przygienda-antoni', 
-'Salowey' : 'salowey-joe',
-'Gunter Van de Velde' : 'vandevelde-gunter',
-'Eric Vyncke' : 'vynke-eric',
-'Zuniga' : 'zuniga-carlos-juan',
-'Zhen Cao' : 'zhen-cao',
-'Jamal Hadi Salim': 'hadi-salim-jamal',
-}
-
-# Manually copied Bo Burman and Thubert Pascal from wg/photos/
-# Manually copied Victor Pascual (main image, not thumb) from wg/
-# Manually copied Eric Vync?ke (main image, not thumb) from wg/photos/
-# Manually copied Danial King (main image, not thumb) from wg/photos/
-# Manually copied the thumb (not labelled as such) for Tianran Zhou as both the main and thumb image from wg/photos/
-
-processed_files = []
-
-for person in sorted(list(interesting_persons),key=lambda x:x.last_name()+x.ascii):
-    substr_pattern = None
-    for exception in exceptions:
-        if exception in person.ascii:
-            substr_pattern = exceptions[exception]
-            break
-    if not person.ascii.strip():
-        print("   Setting person.ascii for %s" % person.name)
-        person.ascii = person.name.encode('ascii', errors='replace').decode('ascii')
-
-    _, first, _, last, _ = person.ascii_parts()
-    first = first.lower()
-    last  = last. lower()
-    if not substr_pattern:
-        substr_pattern = slugify("%s %s" % (last, first))
-
-    if first in ['', '<>'] or last in ['', '<>']:
-        continue
-
-    #debug.show('1, substr_pattern')
-
-    candidates = [x for x in old_images if x.name.lower().startswith(substr_pattern)]
-    # Also check the reverse the name order (necessary for Deng Hui, for instance)
-    substr_pattern = slugify("%s %s" % (first, last))
-    #debug.show('2, substr_pattern')
-    prev_len = len(candidates)
-    candidates += [x for x in old_images if x.name.lower().startswith(substr_pattern)]
-    if prev_len < len(candidates) :
-        print("   Found match with '%s %s' for '%s %s'" % (last, first, first, last, ))
-    # If no joy, try a short name
-    if first in name_alias:
-        prev_len = len(candidates)
-        for alias in name_alias[first]:
-            substr_pattern = slugify("%s %s" % (last, alias))
-            #debug.show('3, substr_pattern')
-            candidates += [x for x in old_images if x.name.lower().startswith(substr_pattern)]
-        if prev_len < len(candidates):
-            print("   Found match with '%s %s' for '%s %s'" % (alias, last, first, last, ))
-
-
-#     # If still no joy, try with Person.plain_name() (necessary for Donald Eastlake)
-#     if not candidates:
-#         prefix, first, middle, last, suffix = person.name_parts()
-#         name_parts = person.plain_name().lower().split()
-# 
-#         substr_pattern = u'-'.join(name_parts[-1:]+name_parts[0:1])
-#         candidates = [x for x in old_images if x.name.lower().startswith(substr_pattern)]
-#         # If no joy, try a short name
-#         if not candidates and first in name_alias:
-#             prev_len = len(candidates)
-#             for alias in name_alias[first]:
-#                 substr_pattern = u'-'.join(name_parts[-1:]+[alias])
-#                 candidates += [x for x in old_images if x.name.lower().startswith(substr_pattern)]
-#             if prev_len < len(candidates) :
-#                 print("   Used '%s %s' instead of '%s %s'" % (alias, last, first, last, ))
-
-#     # Fixup for other exceptional cases
-#     if person.ascii=="David Oran":
-#         candidates = ['oran-dave-th.jpg','oran-david.jpg']
-# 
-#     if person.ascii=="Susan Hares":
-#         candidates = ['hares-sue-th.jpg','hares-susan.JPG']
-# 
-#     if person.ascii=="Mahesh Jethanandani":
-#         candidates = ['Mahesh-Jethanandani-th.jpg','Jethanandani-Mahesh.jpg']
-
-    processed_files += [ c.path for c in candidates ]
-
-    # We now have a list of candidate photos.
-    # * Consider anything less than 200x200 a thumbnail
-    # * For the full photo, sort by size (width) and time
-    # * For the thumbnail:
-    #    - first look for a square photo less than 200x200
-    #    - if none found, then for the first in the sorted list less than 200x200
-    #    - if none found, then the smallest photo
-    if candidates:
-        candidates.sort(key=lambda x: "%04d-%d" % (x.width, x.time))
-        iesg_cand = [ c for c in candidates if '/iesg/' in  c.path ]
-        iab_cand =  [ c for c in candidates if '/iab/' in  c.path ]
-        if iesg_cand:
-            full = iesg_cand[-1]
-            thumb = iesg_cand[-1]
-        elif iab_cand:
-            full = iab_cand[-1]
-            thumb = iab_cand[0]
-        else:
-            full = candidates[-1]
-            thumbs = [ c for c in candidates if c.width==c.height and c.width <= 200 ]
-            if not thumbs:
-                thumbs = [ c for c in candidates if c.width==c.height ]
-            if not thumbs:
-                thumbs = [ c for c in candidates if c.width <= 200 ]
-            if not thumbs:
-                thumbs = candidates[:1]
-            thumb = thumbs[-1]
-        candidates = [ thumb, full ]
-
-    # At this point we either have no candidates or two. If two, the first will be the thumb
-
-    def copy(old, new):
-        if not os.path.exists(new):
-            print("Copying "+old+" to "+new)
-            shutil.copy(old, new)
-            shutil.copystat(old, new)
-
-    assert(len(candidates) in [0,2])
-    if len(candidates)==2:
-        thumb, full = candidates
-
-        new_name = person.photo_name(thumb=False)+full.ext.lower()
-        new_thumb_name = person.photo_name(thumb=True)+thumb.ext.lower()
-
-        copy( full.path, os.path.join(new_images_dir,new_name) )
-
-        #
-        copy( thumb.path,  os.path.join(new_images_dir,new_thumb_name) )
-
-
-print("")
-not_processed = 0
-for file in old_image_files:
-    if ( file.is_file()
-        and not file.suffix.lower() in ['.txt', '.lck', '.html',]
-        and not file.name.startswith('index.')
-        and not file.name.startswith('milestoneupdate')
-        and not file.name.startswith('nopicture')
-        and not file.name.startswith('robots.txt')
-    ):
-        if not str(file).decode('utf8') in processed_files:
-            not_processed += 1
-            print(u"Not processed: "+str(file).decode('utf8'))
-print("")
-print("Not processed: %s files" % not_processed)
diff --git a/ietf/bin/aliases-from-json.py b/ietf/bin/aliases-from-json.py
new file mode 100644
index 0000000000..0da5d1f8b9
--- /dev/null
+++ b/ietf/bin/aliases-from-json.py
@@ -0,0 +1,104 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+#
+# Uses only Python standard lib
+#
+
+import argparse
+import datetime
+import json
+import shutil
+import stat
+import sys
+
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+# Default options
+POSTCONFIRM_PATH = "/a/postconfirm/wrapper"
+VDOMAIN = "virtual.ietf.org"
+
+# Map from domain label to dns domain
+ADOMAINS = {
+    "ietf": "ietf.org",
+    "irtf": "irtf.org",
+    "iab": "iab.org",
+}
+
+
+def generate_files(records, adest, vdest, postconfirm, vdomain):
+    """Generate files from an iterable of records
+    
+    If adest or vdest exists as a file, it will be overwritten. If it is a directory, files
+    with the default names (draft-aliases and draft-virtual) will be created, but existing
+    files _will not_ be overwritten!
+    """
+    with TemporaryDirectory() as tmpdir:
+        tmppath = Path(tmpdir)
+        apath = tmppath / "aliases"
+        vpath = tmppath / "virtual"
+
+        with apath.open("w") as afile, vpath.open("w") as vfile:
+            date = datetime.datetime.now(datetime.UTC)
+            signature = f"# Generated by {Path(__file__).absolute()} at {date}\n"
+            afile.write(signature)
+            vfile.write(signature)
+            vfile.write(f"{vdomain} anything\n")
+
+            for item in records:
+                alias = item["alias"]
+                domains = item["domains"]
+                address_list = item["addresses"]
+                filtername = f"xfilter-{alias}"
+                afile.write(f'{filtername + ":":64s}  "|{postconfirm} filter expand-{alias} {vdomain}"\n')
+                for dom in domains:
+                    vfile.write(f"{f'{alias}@{ADOMAINS[dom]}':64s}  {filtername}\n")
+                vfile.write(f"{f'expand-{alias}@{vdomain}':64s}  {', '.join(sorted(address_list))}\n")
+
+        perms = stat.S_IWUSR | stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH
+        apath.chmod(perms)
+        vpath.chmod(perms)
+        shutil.move(apath, adest)
+        shutil.move(vpath, vdest)
+
+
+def directory_path(val):
+    p = Path(val)
+    if p.is_dir():
+        return p
+    else:
+        raise argparse.ArgumentTypeError(f"{p} is not a directory")
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Convert a JSON stream of draft alias definitions into alias / virtual alias files."
+    )
+    parser.add_argument(
+        "--prefix",
+        required=True,
+        help="Prefix for output files. Files will be named <prefix>-aliases and <prefix>-virtual."
+    )
+    parser.add_argument(
+        "--output-dir",
+        default="./",
+        type=directory_path,
+        help="Destination for output files.",
+    )
+    parser.add_argument(
+        "--postconfirm",
+        default=POSTCONFIRM_PATH,
+        help=f"Full path to postconfirm executable (defaults to {POSTCONFIRM_PATH}",
+    )
+    parser.add_argument(
+        "--vdomain",
+        default=VDOMAIN,
+        help=f"Virtual domain (defaults to {VDOMAIN}_",
+    )
+    args = parser.parse_args()
+    data = json.load(sys.stdin)
+    generate_files(
+        data["aliases"],
+        adest=args.output_dir / f"{args.prefix}-aliases",
+        vdest=args.output_dir / f"{args.prefix}-virtual",
+        postconfirm=args.postconfirm,
+        vdomain=args.vdomain,
+    )
diff --git a/ietf/bin/announce-header-change b/ietf/bin/announce-header-change
deleted file mode 100755
index 256324e31a..0000000000
--- a/ietf/bin/announce-header-change
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-
-import sys, os, sys
-import datetime
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-import django
-django.setup()
-
-from django.core import management
-from django.template.loader import render_to_string
-
-from ietf import settings
-from ietf.utils.mail import send_mail_preformatted
-from ietf.utils.mail import send_mail
-
-target_date=datetime.date(year=2014,month=1,day=24)
-
-send_mail(request = None, 
-          to       = "IETF-Announce <ietf-announce@ietf.org>",
-          frm      = "The IESG <iesg-secretary@ietf.org>",
-          subject  = "Upcoming change to announcement email header fields (using old header)",
-          template = "utils/header_change_content.txt",
-          context  = dict(oldornew='old', target_date=target_date),
-          extra    = {'Reply-To' : 'ietf@ietf.org',
-                      'Sender'   : '<iesg-secretary@ietf.org>',
-                     }
-         )
-
-send_mail(request = None, 
-          to       = "IETF-Announce:;",
-          frm      = "The IESG <noreply@ietf.org>",
-          subject  = "Upcoming change to announcement email header fields (using new header)",
-          template = "utils/header_change_content.txt",
-          context  = dict(oldornew='new', target_date=target_date),
-          extra    = {'Reply-To' : 'IETF Discussion List <ietf@ietf.org>',
-                      'Sender'   : '<iesg-secretary@ietf.org>',
-                     },
-          bcc      = '<ietf-announce@ietf.org>',
-         )
diff --git a/ietf/bin/create-break-sessions b/ietf/bin/create-break-sessions
deleted file mode 100755
index 52ce044d8c..0000000000
--- a/ietf/bin/create-break-sessions
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# -*- Python -*-
-#
-
-import os, sys
-
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-import django
-django.setup()
-
-from ietf.group.models import Group
-from ietf.person.models import Person
-from ietf.name.models import SessionStatusName
-from ietf.meeting.models import Meeting, Session, ScheduledSession as ScheduleTimeslotSSessionAssignment
-
-secretariat = Group.objects.get(acronym='secretariat')
-system = Person.objects.get(id=1, name='(System)')
-scheduled = SessionStatusName.objects.get(slug='sched')
-
-for meeting in Meeting.objects.filter(type="ietf").order_by("date"):
-    print "Checking %s schedules ..." % meeting
-    brk, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Break', type_id='break',)
-    reg, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Registration', type_id='reg',)
-
-    for schedule in meeting.schedule_set.all():
-        print "  Checking for missing Break and Reg sessions in %s" % schedule
-        for timeslot in meeting.timeslot_set.all():
-            if timeslot.type_id == 'break' and not (schedule.base and SchedTimeSessAssignment.objects.filter(timeslot=timeslot, session=brk, schedule=schedule.base).exists()):
-                assignment, created = SchedTimeSessAssignment.objects.get_or_create(timeslot=timeslot, session=brk, schedule=schedule)
-                if created:
-                    print "    Added %s break assignment" % timeslot
-            if timeslot.type_id == 'reg' and not (schedule.base and SchedTimeSessAssignment.objects.filter(timeslot=timeslot, session=reg, schedule=schedule.base).exists()):
-                assignment, created = SchedTimeSessAssignment.objects.get_or_create(timeslot=timeslot, session=reg, schedule=schedule)
-                if created:
-                    print "    Added %s registration assignment" % timeslot
diff --git a/ietf/bin/create-charter-newrevisiondocevents b/ietf/bin/create-charter-newrevisiondocevents
deleted file mode 100755
index c7ce9c5220..0000000000
--- a/ietf/bin/create-charter-newrevisiondocevents
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-version = "0.10"
-program = os.path.basename(sys.argv[0])
-progdir = os.path.dirname(sys.argv[0])
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-
-# ----------------------------------------------------------------------
-def note(string):
-    sys.stdout.write("%s\n" % (string))
-    
-# ----------------------------------------------------------------------
-def warn(string):
-    sys.stderr.write(" * %s\n" % (string))
-    
-# ------------------------------------------------------------------------------
-
-import re
-from datetime import datetime as Datetime
-
-import django
-django.setup()
-
-from django.conf import settings
-
-from ietf.utils.path import path as Path
-from ietf.doc.models import Document, NewRevisionDocEvent
-from ietf.person.models import Person
-
-system_entity = Person.objects.get(name="(System)")
-
-charterdir = Path(settings.CHARTER_PATH)
-for file in charterdir.files("charter-ietf-*.txt"):
-    fname = file.name
-    ftime = Datetime.fromtimestamp(file.mtime)
-    match = re.search("^(?P<name>[a-z0-9-]+)-(?P<rev>\d\d-\d\d)\.txt$", fname)
-    if match:
-        name = match.group("name")
-        rev = match.group("rev")
-    else:
-        match = re.search("^(?P<name>[a-z0-9-]+)-(?P<rev>\d\d)\.txt$", fname)
-        if match:
-            name = match.group("name")
-            rev = match.group("rev")
-        else:
-            warn("Failed extracting revision from filename: '%s'" % fname)
-    try:
-        doc = Document.objects.get(type="charter", name=name)
-        try:
-            event = NewRevisionDocEvent.objects.get(doc=doc, type='new_revision', rev=rev)
-            note(".")
-        except NewRevisionDocEvent.MultipleObjectsReturned, e:
-            warn("Multiple NewRevisionDocEvent exists for '%s'" % fname)
-        except NewRevisionDocEvent.DoesNotExist:
-            event = NewRevisionDocEvent(doc=doc, type='new_revision', rev=rev, by=system_entity, time=ftime, desc="")
-            event.save()
-            note("Created new NewRevisionDocEvent for %s-%s" % (name, rev))
-    except Document.DoesNotExist:
-        warn("Document not found: '%s'; no NewRevisionDocEvent created for '%s'" % (name, fname))
-    
diff --git a/ietf/bin/dump-draft-info b/ietf/bin/dump-draft-info
deleted file mode 100755
index 3ac2e4a58a..0000000000
--- a/ietf/bin/dump-draft-info
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-version = "0.10"
-program = os.path.basename(sys.argv[0])
-progdir = os.path.dirname(sys.argv[0])
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-import django
-django.setup()
-
-from django.template import Template, Context
-
-from ietf.doc.models import Document
-from ietf.person.models import Person
-
-drafts = Document.objects.filter(type="draft")
-
-ads = {}
-for p in Person.objects.filter(ad_document_set__type="draft").distinct():
-    ads[p.id] = p.role_email("ad")
-
-for d in drafts:
-    d.ad_email = ads.get(d.ad_id)
-
-templ_text = """{% for draft in drafts %}{% if draft.notify or draft.ad_email %}{{ draft.name }}{% if draft.notify %} docnotify='{{ draft.notify|cut:"<"|cut:">" }}'{% endif %}{% if draft.ad_email %} docsponsor='{{ draft.ad_email }}'{% endif %}
-{% endif %}{% endfor %}"""
-template = Template(templ_text)
-context = Context({ 'drafts':drafts })
-
-print template.render(context).encode('utf-8')
diff --git a/ietf/bin/email-sync-discrepancies b/ietf/bin/email-sync-discrepancies
deleted file mode 100755
index 3593fd126f..0000000000
--- a/ietf/bin/email-sync-discrepancies
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-
-import sys, os, sys
-import syslog
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-from optparse import OptionParser
-
-parser = OptionParser()
-parser.add_option("-t", "--to", dest="to",
-                  help="Email address to send report to", metavar="EMAIL")
-
-options, args = parser.parse_args()
-
-syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
-
-import django
-django.setup()
-
-from ietf.sync.mails import email_discrepancies
-
-receivers = ["iesg-secretary@ietf.org"]
-
-if options.to:
-    receivers = [options.to]
-
-email_discrepancies(receivers)
-
-syslog.syslog("Emailed sync discrepancies to %s" % receivers)
diff --git a/ietf/bin/expire-ids b/ietf/bin/expire-ids
index a23423d3b1..bb0b94ee61 100755
--- a/ietf/bin/expire-ids
+++ b/ietf/bin/expire-ids
@@ -13,10 +13,6 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
 sys.path = [ basedir ] + sys.path
 os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
 
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
 import django
@@ -27,6 +23,7 @@ django.setup()
 from ietf.utils.log import logger
 
 try:
+    from ietf.utils.timezone import datetime_today
     from ietf.doc.expire import ( in_draft_expire_freeze, get_expired_drafts, expirable_drafts,
         send_expire_notice_for_draft, expire_draft, clean_up_draft_files )
     from ietf.doc.models import Document
@@ -42,7 +39,7 @@ try:
             # the purpose of double-checking that a document is still expirable when it is actually
             # being marked as expired.
             if (expirable_drafts(Document.objects.filter(pk=doc.pk)).exists()
-                    and doc.expires < datetime.datetime.today() + datetime.timedelta(1)):
+                    and doc.expires < datetime_today() + datetime.timedelta(1)):
                 send_expire_notice_for_draft(doc)
                 expire_draft(doc)
                 syslog.syslog("  Expired draft %s-%s" % (doc.name, doc.rev))
diff --git a/ietf/bin/expire-last-calls b/ietf/bin/expire-last-calls
deleted file mode 100755
index 83b565e192..0000000000
--- a/ietf/bin/expire-last-calls
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-
-# This script requires that the proper virtual python environment has been
-# invoked before start
-
-import os
-import sys
-import syslog
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
-
-import django
-django.setup()
-
-# ----------------------------------------------------------------------
-
-from ietf.doc.lastcall import get_expired_last_calls, expire_last_call
-
-drafts = get_expired_last_calls()
-for doc in drafts:
-    try:
-        expire_last_call(doc)
-        syslog.syslog("Expired last call for %s (id=%s)" % (doc.file_tag(), doc.pk))
-    except Exception as e:
-        syslog.syslog(syslog.LOG_ERR, "ERROR: Failed to expire last call for %s (id=%s)" % (doc.file_tag(), doc.pk))
diff --git a/ietf/bin/expire-submissions b/ietf/bin/expire-submissions
index 22db38322d..113a53ddfa 100755
--- a/ietf/bin/expire-submissions
+++ b/ietf/bin/expire-submissions
@@ -8,10 +8,6 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
 sys.path = [ basedir ] + sys.path
 os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
 
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
 import django
diff --git a/ietf/bin/find-submission-confirmation-email-in-postfix-log b/ietf/bin/find-submission-confirmation-email-in-postfix-log
deleted file mode 100755
index 6bf41574a1..0000000000
--- a/ietf/bin/find-submission-confirmation-email-in-postfix-log
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env python
-
-import io
-import os
-import sys
-
-version = "0.10"
-program = os.path.basename(sys.argv[0])
-progdir = os.path.dirname(sys.argv[0])
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-# ----------------------------------------------------------------------
-def note(string):
-    sys.stdout.write("%s\n" % (string))
-    
-# ----------------------------------------------------------------------
-def warn(string):
-    sys.stderr.write(" * %s\n" % (string))
-    
-# ------------------------------------------------------------------------------
-
-import re
-from datetime import datetime as Datetime
-import time
-import warnings
-warnings.filterwarnings('ignore', message='the sets module is deprecated', append=True)
-
-import django
-django.setup()
-
-from django.conf import settings
-
-from ietf.utils.path import path as Path
-
-from ietf.submit.models import Submission
-from ietf.doc.models import Document
-
-
-
-args = sys.argv[1:]
-if len(args) < 3:
-    warn("Expected '$ %s DRAFTNAME  USER.LOG  POSTFIX.LOG', but found no arguments -- exiting" % program)
-    sys.exit(1)
-
-draft = args[0]
-if re.search("\.txt$", draft):
-    draft = draft[:-4]
-if re.search("-\d\d$", draft):
-    draft = draft[:-3]
-
-if len(args) == 1:
-    logfiles = [ arg[1] ]
-else:
-    logfiles = args[1:]
-
-from_email = settings.IDSUBMIT_FROM_EMAIL
-if "<" in from_email:
-    from_email = from_email.split("<")[1].split(">")[0]
-
-submission = Submission.objects.filter(name=draft).latest('submission_date')
-document = Document.objects.get(name=draft)
-emails = [ author.email.address for author in document.documentauthor_set.all() if author.email ]
-
-timestrings = []
-for file in [ Path(settings.INTERNET_DRAFT_PATH) / ("%s-%s.txt"%(draft, submission.rev)),
-              Path(settings.IDSUBMIT_STAGING_PATH) / ("%s-%s.txt"%(draft, submission.rev)) ]:
-    if os.path.exists(file):
-        upload_time = time.localtime(file.mtime)
-        ts = time.strftime("%b %d %H:%M", upload_time)
-        timestrings += [ ts ]
-        timestrings += [ ts[:-1] + chr(((ord(ts[-1])-ord('0')+1)%10)+ord('0')) ]
-        print "Looking for mail log lines timestamped %s, also checking %s ..." % (timestrings[0], timestrings[1])
-
-for log in logfiles:
-    print "\n  Checking %s ...\n" % log
-    if log.endswith('.gz'):
-        import gzip
-        logfile = gzip.open(log)
-    else:
-        logfile = io.open(log)
-    queue_ids = []
-    for line in logfile:
-        if from_email in line and "Confirmation for Auto-Post of I-D "+draft in line:
-            ts = line[:12]
-            timestrings += [ ts ]
-            print "Found a mention of %s, adding timestamp %s: \n  %s" % (draft, ts, line)
-        for ts in timestrings:
-            if line.startswith(ts):
-                if from_email in line:
-                    for to_email in emails:
-                        if to_email in line:
-                            sys.stdout.write(line)
-                            if "queued_as:" in line:
-                                queue_ids += [ line.split("queued_as:")[1].split(",")[0] ]
-                elif queue_ids:
-                    for qi in queue_ids:
-                        if qi in line:
-                            sys.stdout.write(line)
diff --git a/ietf/bin/iana-changes-updates b/ietf/bin/iana-changes-updates
index 817f7e5334..b0ea6712e7 100755
--- a/ietf/bin/iana-changes-updates
+++ b/ietf/bin/iana-changes-updates
@@ -18,6 +18,7 @@ django.setup()
 
 from django.conf import settings
 from optparse import OptionParser
+from zoneinfo import ZoneInfo
 
 parser = OptionParser()
 parser.add_option("-f", "--from", dest="start",
@@ -38,13 +39,16 @@ CLOCK_SKEW_COMPENSATION = 5 # seconds
 MAX_INTERVAL_ACCEPTED_BY_IANA = datetime.timedelta(hours=23)
 
 
+local_tzinfo = ZoneInfo(settings.TIME_ZONE)
 start = datetime.datetime.now() - datetime.timedelta(hours=23) + datetime.timedelta(seconds=CLOCK_SKEW_COMPENSATION)
 if options.start:
     start = datetime.datetime.strptime(options.start, "%Y-%m-%d %H:%M:%S")
+start = start.replace(tzinfo=local_tzinfo).astimezone(datetime.timezone.utc)
 
 end = start + datetime.timedelta(hours=23)
 if options.end:
-    end = datetime.datetime.strptime(options.end, "%Y-%m-%d %H:%M:%S")
+    end = datetime.datetime.strptime(options.end, "%Y-%m-%d %H:%M:%S").replace(tzinfo=local_tzinfo)
+end = end.astimezone(datetime.timezone.utc)
 
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
@@ -52,7 +56,13 @@ syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
 from ietf.sync.iana import fetch_changes_json, parse_changes_json, update_history_with_changes
 
-syslog.syslog("Updating history log with new changes from IANA from %s, period %s - %s" % (settings.IANA_SYNC_CHANGES_URL, start, end))
+syslog.syslog(
+    "Updating history log with new changes from IANA from %s, period %s - %s" % (
+        settings.IANA_SYNC_CHANGES_URL,
+        start.astimezone(local_tzinfo),
+        end.astimezone(local_tzinfo),
+    )
+)
 
 t = start
 while t < end:
diff --git a/ietf/bin/iana-protocols-updates b/ietf/bin/iana-protocols-updates
index 668ee54f91..bdbeef8c8e 100755
--- a/ietf/bin/iana-protocols-updates
+++ b/ietf/bin/iana-protocols-updates
@@ -29,7 +29,7 @@ def chunks(l, n):
 syslog.syslog("Updating history log with new RFC entries from IANA protocols page %s" % settings.IANA_SYNC_PROTOCOLS_URL)
 
 # FIXME: this needs to be the date where this tool is first deployed
-rfc_must_published_later_than = datetime.datetime(2012, 11, 26, 0, 0, 0)
+rfc_must_published_later_than = datetime.datetime(2012, 11, 26, 0, 0, 0, tzinfo=datetime.timezone.utc)
 
 try:
     response = requests.get(
diff --git a/ietf/bin/iana-review-email b/ietf/bin/iana-review-email
index 5c7a7183b9..27aee4015e 100755
--- a/ietf/bin/iana-review-email
+++ b/ietf/bin/iana-review-email
@@ -8,10 +8,6 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
 sys.path = [ basedir ] + sys.path
 os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
 
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
 syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
 import django
diff --git a/ietf/bin/interim_minutes_reminder b/ietf/bin/interim_minutes_reminder
deleted file mode 100755
index 7f2f84f739..0000000000
--- a/ietf/bin/interim_minutes_reminder
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# -*- Python -*-
-#
-'''
-This script calls ietf.meeting.helpers.check_interim_minutes() which sends
-a reminder email for interim meetings that occurred 10 days ago but still
-don't have minutes.
-'''
-
-# Set PYTHONPATH and load environment variables for standalone script -----------------
-import os, sys
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-import django
-django.setup()
-# -------------------------------------------------------------------------------------
-
-from ietf.meeting.helpers import check_interim_minutes
-
-check_interim_minutes()
diff --git a/ietf/bin/list-role-holder-emails b/ietf/bin/list-role-holder-emails
deleted file mode 100755
index 6d6c160464..0000000000
--- a/ietf/bin/list-role-holder-emails
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-
-
-import os, sys
-import syslog
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
-
-import django
-django.setup()
-
-from django.utils.encoding import force_str
-from ietf.group.models import Role
-
-addresses = set()
-for role in Role.objects.filter(
-                    group__state__slug='active',
-                    group__type__in=['ag','area','dir','iab','ietf','irtf','nomcom','rg','team','wg','rag']):
-    #sys.stderr.write(str(role)+'\n')
-    for e in role.person.email_set.all():
-        if e.active and not e.address.startswith('unknown-email-'):
-            addresses.add(e.address)
-
-addresses = list(addresses)
-addresses.sort()
-for a in addresses:
-    print(force_str(a))
diff --git a/ietf/bin/mailman_listinfo.py b/ietf/bin/mailman_listinfo.py
deleted file mode 100755
index f7e4cfe4c1..0000000000
--- a/ietf/bin/mailman_listinfo.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/python2.7
-# Copyright The IETF Trust 2022, All Rights Reserved
-# Note the shebang. This specifically targets deployment on IETFA and intends to use its system python2.7.
-
-# This is an adaptor to pull information out of Mailman2 using its python libraries (which are only available for python2).
-# It is NOT django code, and does not have access to django.conf.settings.
-
-import json
-import sys
-
-from collections import defaultdict
-
-def main():
-
-    sys.path.append('/usr/lib/mailman')
-
-    have_mailman = False
-    try:
-        from Mailman import Utils
-        from Mailman import MailList
-        from Mailman import MemberAdaptor
-        have_mailman = True
-    except ImportError:
-        pass
-
-
-    if not have_mailman:
-        sys.stderr.write("Could not import mailman modules -- skipping import of mailman list info")
-        sys.exit()
-
-    names = list(Utils.list_names())
-
-    # need to emit dict of names, each name has an mlist, and each mlist has description, advertised, and members (calculated as below)
-    result = defaultdict(dict)
-    for name in names:
-        mlist = MailList.MailList(name, lock=False)
-        result[name] = dict()
-        result[name]['internal_name'] = mlist.internal_name()
-        result[name]['real_name'] = mlist.real_name
-        result[name]['description'] = mlist.description # Not attempting to change encoding
-        result[name]['advertised'] = mlist.advertised
-        result[name]['members'] = list()
-        if mlist.advertised:
-            members = mlist.getRegularMemberKeys() + mlist.getDigestMemberKeys()
-            members = set([ m for m in members if mlist.getDeliveryStatus(m) == MemberAdaptor.ENABLED ])
-            result[name]['members'] = list(members)
-    json.dump(result, sys.stdout)
-
-if __name__ == "__main__":
-    main()
diff --git a/ietf/bin/merge-person-records b/ietf/bin/merge-person-records
deleted file mode 100755
index 155e5755f6..0000000000
--- a/ietf/bin/merge-person-records
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# -*- Python -*-
-#
-'''
-This script merges two Person records into one.  It determines which record is the target
-based on most current User record (last_login) unless -f (force) option is used to
-force SOURCE TARGET as specified on the command line.  The order of operations is
-important.  We must complete all source.save() operations before moving the aliases to
-the target, this is to avoid extra "Possible duplicate Person" emails going out, if the
-Person is saved without an alias the Person.save() creates another one, which then
-conflicts with the moved one.
-'''
-
-# Set PYTHONPATH and load environment variables for standalone script -----------------
-import os, sys
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-import django
-django.setup()
-# -------------------------------------------------------------------------------------
-
-import argparse
-from django.contrib import admin
-from ietf.person.models import Person
-from ietf.person.utils import (merge_persons, send_merge_notification, handle_users,
-    determine_merge_order)
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("source_id",type=int)
-    parser.add_argument("target_id",type=int)
-    parser.add_argument('-f','--force', help='force merge order',action='store_true')
-    parser.add_argument('-v','--verbose', help='verbose output',action='store_true')
-    args = parser.parse_args()
-
-    source = Person.objects.get(pk=args.source_id)
-    target = Person.objects.get(pk=args.target_id)
-
-    # set merge order
-    if not args.force:
-        source,target = determine_merge_order(source,target)
-
-    # confirm
-    print "Merging person {}({}) to {}({})".format(source.ascii,source.pk,target.ascii,target.pk)
-    print handle_users(source,target,check_only=True)
-    response = raw_input('Ok to continue y/n? ')
-    if response.lower() != 'y':
-        sys.exit()
-
-    # perform merge
-    success, changes = merge_persons(source, target, verbose=args.verbose)
-
-    # send email notification
-    send_merge_notification(target,changes)
-
-if __name__ == "__main__":
-    main()
diff --git a/ietf/bin/notify-expirations b/ietf/bin/notify-expirations
index 0270c13765..fc2fd86a31 100755
--- a/ietf/bin/notify-expirations
+++ b/ietf/bin/notify-expirations
@@ -7,10 +7,6 @@ basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
 sys.path = [ basedir ] + sys.path
 os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
 
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
 import django
 django.setup()
 
diff --git a/ietf/bin/pretty-xml-dump b/ietf/bin/pretty-xml-dump
deleted file mode 100755
index 22abc08a64..0000000000
--- a/ietf/bin/pretty-xml-dump
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-python manage.py dumpdata --format=xml "$@" | sed -e 's/<\/*object/\
-  &/g' -e 's/<field/\
-    &/g' -e 's/<\/django-objects/\
-&/g'
diff --git a/ietf/bin/recalculate-rfc-authors-snapshot b/ietf/bin/recalculate-rfc-authors-snapshot
deleted file mode 100644
index b1c1428f1a..0000000000
--- a/ietf/bin/recalculate-rfc-authors-snapshot
+++ /dev/null
@@ -1,8341 +0,0 @@
-#!/usr/bin/env python
-
-"""DANGER, WILL ROBINSON
-
-This code was used in the construction of person migrations 0016 through 0019
-and doc migration 0029 The original intent was to provide a utility that could
-be run periodically, but the need for manual inspection of the results was too
-great. It is here as a _starting point_ for future exploration of updating rfc
-documentauthor sets. Be careful to check that assumptions haven't changed in
-the interim.
-
-"""
-
-import os, sys
-import django
-import argparse
-from collections import namedtuple
-import subprocess
-from tempfile import mkstemp
-
-basedir = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../..'))
-sys.path.insert(0, basedir)
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
-
-django.setup()
-
-from ietf.person.models import Email, Person
-from ietf.doc.models import Document
-from ietf import settings
-
-import debug
-
-# This is a snapshot dump from the RFC Editor in late April 2017
-rfced_data = """RFC1          ||      S. Crocker         ||         
-  RFC2          ||       B. Duvall         ||         
-  RFC3          ||       S.D. Crocker         ||         
-  RFC4          ||       E.B. Shapiro         ||         
-  RFC5          ||      J. Rulifson         ||       
-  RFC6          ||       S.D. Crocker         ||         
-  RFC7          ||       G. Deloche         ||         
-  RFC8          ||      G. Deloche         ||       
-  RFC9          ||      G. Deloche         ||       
-  RFC10          ||       S.D. Crocker         ||         
-  RFC11          ||      G. Deloche         ||       
-  RFC12          ||       M. Wingfield         ||         
-  RFC13          ||       V. Cerf         ||         
-  RFC14          ||               ||         
-  RFC15          ||       C.S. Carr         ||         
-  RFC16          ||       S. Crocker         ||         
-  RFC17          ||       J.E. Kreznar         ||         
-  RFC18          ||       V. Cerf         ||         
-  RFC19          ||       J.E. Kreznar         ||         
-  RFC20          ||      V.G. Cerf         ||       
-  RFC21          ||       V.G. Cerf         ||         
-  RFC22          ||       V.G. Cerf         ||         
-  RFC23          ||       G. Gregg         ||         
-  RFC24          ||       S.D. Crocker         ||         
-  RFC25          ||       S.D. Crocker         ||         
-  RFC26          ||               ||         
-  RFC27          ||       S.D. Crocker         ||         
-  RFC28          ||       W.K. English         ||         
-  RFC29          ||       R.E. Kahn         ||         
-  RFC30          ||       S.D. Crocker         ||         
-  RFC31          ||      D. Bobrow, W.R. Sutherland         ||         
-  RFC32          ||       J. Cole         ||         
-  RFC33          ||       S.D. Crocker         ||         
-  RFC34          ||       W.K. English         ||         
-  RFC35          ||       S.D. Crocker         ||         
-  RFC36          ||       S.D. Crocker         ||         
-  RFC37          ||       S.D. Crocker         ||         
-  RFC38          ||       S.M. Wolfe         ||         
-  RFC39          ||       E. Harslem, J.F. Heafner         ||         
-  RFC40          ||       E. Harslem, J.F. Heafner         ||         
-  RFC41          ||       J.T. Melvin         ||         
-  RFC42          ||       E. Ancona         ||         
-  RFC43          ||       A.G. Nemeth         ||         
-  RFC44          ||       A. Shoshani, R. Long, A. Landsberg         ||         
-  RFC45          ||       J. Postel, S.D. Crocker         ||         
-  RFC46          ||       E. Meyer         ||         
-  RFC47          ||       J. Postel, S. Crocker         ||         
-  RFC48          ||       J. Postel, S.D. Crocker         ||         
-  RFC49          ||       E. Meyer         ||         
-  RFC50          ||       E. Harslen, J. Heafner         ||         
-  RFC51          ||      M. Elie         ||       
-  RFC52          ||       J. Postel, S.D. Crocker         ||         
-  RFC53          ||       S.D. Crocker         ||         
-  RFC54          ||       S.D. Crocker, J. Postel, J. Newkirk, M. Kraley         ||         
-  RFC55          ||       J. Newkirk, M. Kraley, J. Postel, S.D. Crocker         ||         
-  RFC56          ||       E. Belove, D. Black, R. Flegal, L.G. Farquar         ||         
-  RFC57          ||       M. Kraley, J. Newkirk         ||         
-  RFC58          ||       T.P. Skinner         ||         
-  RFC59          ||       E. Meyer         ||         
-  RFC60          ||      R. Kalin         ||       
-  RFC61          ||       D.C. Walden         ||         
-  RFC62          ||       D.C. Walden         ||         
-  RFC63          ||       V.G. Cerf         ||         
-  RFC64          ||       M. Elie         ||         
-  RFC65          ||       D.C. Walden         ||         
-  RFC66          ||       S.D. Crocker         ||         
-  RFC67          ||       W.R. Crowther         ||         
-  RFC68          ||       M. Elie         ||         
-  RFC69          ||       A.K. Bhushan         ||         
-  RFC70          ||       S.D. Crocker         ||         
-  RFC71          ||       T. Schipper         ||         
-  RFC72          ||       R.D. Bressler         ||         
-  RFC73          ||       S.D. Crocker         ||         
-  RFC74          ||      J.E. White         ||       
-  RFC75          ||       S.D. Crocker         ||         
-  RFC76          ||       J. Bouknight, J. Madden, G.R. Grossman         ||         
-  RFC77          ||       J. Postel         ||         
-  RFC78          ||       E. Harslem, J.F. Heafner, J.E. White         ||         
-  RFC79          ||       E. Meyer         ||         
-  RFC80          ||       E. Harslem, J.F. Heafner         ||         
-  RFC81          ||       J. Bouknight         ||         
-  RFC82          ||       E. Meyer         ||         
-  RFC83          ||       R.H. Anderson, E. Harslem, J.F. Heafner         ||         
-  RFC84          ||       J.B. North         ||         
-  RFC85          ||       S.D. Crocker         ||         
-  RFC86          ||      S.D. Crocker         ||       
-  RFC87          ||       A. Vezza         ||         
-  RFC88          ||       R.T. Braden, S.M. Wolfe         ||         
-  RFC89          ||       R.M. Metcalfe         ||         
-  RFC90          ||       R.T. Braden         ||         
-  RFC91          ||       G.H. Mealy         ||         
-  RFC92          ||               ||         
-  RFC93          ||       A.M. McKenzie         ||         
-  RFC94          ||       E. Harslem, J.F. Heafner         ||         
-  RFC95          ||      S. Crocker         ||       
-  RFC96          ||       R.W. Watson         ||         
-  RFC97          ||      J.T. Melvin, R.W. Watson         ||       
-  RFC98          ||       E. Meyer, T. Skinner         ||         
-  RFC99          ||       P.M. Karp         ||         
-  RFC100          ||       P.M. Karp         ||         
-  RFC101          ||       R.W. Watson         ||         
-  RFC102          ||       S.D. Crocker         ||         
-  RFC103          ||       R.B. Kalin         ||         
-  RFC104          ||       J.B. Postel, S.D. Crocker         ||         
-  RFC105          ||       J.E. White         ||         
-  RFC106          ||       T.C. O'Sullivan         ||         
-  RFC107          ||       R.D. Bressler, S.D. Crocker, W.R. Crowther, G.R. Grossman, R.S. Tomlinson, J.E. White         ||         
-  RFC108          ||       R.W. Watson         ||         
-  RFC109          ||      J. Winett         ||       
-  RFC110          ||      J. Winett         ||       
-  RFC111          ||       S.D. Crocker         ||         
-  RFC112          ||      T.C. O'Sullivan         ||       
-  RFC113          ||       E. Harslem, J.F. Heafner, J.E. White         ||         
-  RFC114          ||       A.K. Bhushan         ||         
-  RFC115          ||       R.W. Watson, J.B. North         ||         
-  RFC116          ||       S.D. Crocker         ||         
-  RFC117          ||       J. Wong         ||         
-  RFC118          ||       R.W. Watson         ||         
-  RFC119          ||      M. Krilanovich         ||       
-  RFC120          ||       M. Krilanovich         ||         
-  RFC121          ||       M. Krilanovich         ||         
-  RFC122          ||       J.E. White         ||         
-  RFC123          ||       S.D. Crocker         ||         
-  RFC124          ||       J.T. Melvin         ||         
-  RFC125          ||       J. McConnell         ||         
-  RFC126          ||       J. McConnell         ||         
-  RFC127          ||       J. Postel         ||         
-  RFC128          ||       J. Postel         ||         
-  RFC129          ||       E. Harslem, J. Heafner, E. Meyer         ||         
-  RFC130          ||       J.F. Heafner         ||         
-  RFC131          ||       E. Harslem, J.F. Heafner         ||         
-  RFC132          ||       J.E. White         ||         
-  RFC133          ||       R.L. Sunberg         ||         
-  RFC134          ||       A. Vezza         ||         
-  RFC135          ||       W. Hathaway         ||         
-  RFC136          ||       R.E. Kahn         ||         
-  RFC137          ||       T.C. O'Sullivan         ||         
-  RFC138          ||       R.H. Anderson, V.G. Cerf, E. Harslem, J.F. Heafner, J. Madden, R.M. Metcalfe, A. Shoshani, J.E. White, D.C.M. Wood         ||         
-  RFC139          ||       T.C. O'Sullivan         ||         
-  RFC140          ||       S.D. Crocker         ||         
-  RFC141          ||       E. Harslem, J.F. Heafner         ||         
-  RFC142          ||       C. Kline, J. Wong         ||         
-  RFC143          ||       W. Naylor, J. Wong, C. Kline, J. Postel         ||         
-  RFC144          ||       A. Shoshani         ||         
-  RFC145          ||       J. Postel         ||         
-  RFC146          ||       P.M. Karp, D.B. McKay, D.C.M. Wood         ||         
-  RFC147          ||       J.M. Winett         ||         
-  RFC148          ||       A.K. Bhushan         ||         
-  RFC149          ||       S.D. Crocker         ||         
-  RFC150          ||       R.B. Kalin         ||         
-  RFC151          ||       A. Shoshani         ||         
-  RFC152          ||       M. Wilber         ||         
-  RFC153          ||       J.T. Melvin, R.W. Watson         ||         
-  RFC154          ||       S.D. Crocker         ||         
-  RFC155          ||       J.B. North         ||         
-  RFC156          ||       J. Bouknight         ||         
-  RFC157          ||       V.G. Cerf         ||         
-  RFC158          ||      T.C. O'Sullivan         ||       
-  RFC159          ||               ||         
-  RFC160          ||       Network Information Center. Stanford Research Institute         ||         
-  RFC161          ||       A. Shoshani         ||         
-  RFC162          ||       M. Kampe         ||         
-  RFC163          ||       V.G. Cerf         ||         
-  RFC164          ||       J.F. Heafner         ||         
-  RFC165          ||      J. Postel         ||       
-  RFC166          ||       R.H. Anderson, V.G. Cerf, E. Harslem, J.F. Heafner, J. Madden, R.M. Metcalfe, A. Shoshani, J.E. White, D.C.M. Wood         ||         
-  RFC167          ||       A.K. Bhushan, R.M. Metcalfe, J.M. Winett         ||         
-  RFC168          ||       J.B. North         ||         
-  RFC169          ||      S.D. Crocker         ||       
-  RFC170          ||       Network Information Center. Stanford Research Institute         ||         
-  RFC171          ||       A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenize, J. Melvin, B. Sundberg, D. Watson, J. White         ||         
-  RFC172          ||       A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenzie, J. Melvin, B. Sundberg, D. Watson, J. White         ||         
-  RFC173          ||       P.M. Karp, D.B. McKay         ||         
-  RFC174          ||       J. Postel, V.G. Cerf         ||         
-  RFC175          ||       E. Harslem, J.F. Heafner         ||         
-  RFC176          ||       A.K. Bhushan, R. Kanodia, R.M. Metcalfe, J. Postel         ||         
-  RFC177          ||       J. McConnell         ||         
-  RFC178          ||       I.W. Cotton         ||         
-  RFC179          ||       A.M. McKenzie         ||         
-  RFC180          ||       A.M. McKenzie         ||         
-  RFC181          ||       J. McConnell         ||         
-  RFC182          ||       J.B. North         ||         
-  RFC183          ||      J.M. Winett         ||       
-  RFC184          ||       K.C. Kelley         ||         
-  RFC185          ||       J.B. North         ||         
-  RFC186          ||       J.C. Michener         ||         
-  RFC187          ||       D.B. McKay, D.P. Karp         ||         
-  RFC188          ||       P.M. Karp, D.B. McKay         ||         
-  RFC189          ||       R.T. Braden         ||         
-  RFC190          ||       L.P. Deutsch         ||         
-  RFC191          ||       C.H. Irby         ||         
-  RFC192          ||       R.W. Watson         ||         
-  RFC193          ||       E. Harslem, J.F. Heafner         ||         
-  RFC194          ||       V. Cerf, E. Harslem, J. Heafner, B. Metcalfe, J. White         ||         
-  RFC195          ||       G.H. Mealy         ||         
-  RFC196          ||       R.W. Watson         ||         
-  RFC197          ||       A. Shoshani, E. Harslem         ||         
-  RFC198          ||       J.F. Heafner         ||         
-  RFC199          ||      T. Williams         ||       
-  RFC200          ||       J.B. North         ||         
-  RFC201          ||               ||         
-  RFC202          ||       S.M. Wolfe, J. Postel         ||         
-  RFC203          ||       R.B. Kalin         ||         
-  RFC204          ||       J. Postel         ||         
-  RFC205          ||       R.T. Braden         ||         
-  RFC206          ||      J. White         ||       
-  RFC207          ||       A. Vezza         ||         
-  RFC208          ||       A.M. McKenzie         ||         
-  RFC209          ||       B. Cosell         ||         
-  RFC210          ||       W. Conrad         ||         
-  RFC211          ||      J.B. North         ||       
-  RFC212          ||       Information Sciences Institute University of Southern California         ||         
-  RFC213          ||       B. Cosell         ||         
-  RFC214          ||       E. Harslem         ||         
-  RFC215          ||       A.M. McKenzie         ||         
-  RFC216          ||      J.E. White         ||       
-  RFC217          ||       J.E. White         ||         
-  RFC218          ||       B. Cosell         ||         
-  RFC219          ||       R. Winter         ||         
-  RFC220          ||               ||         
-  RFC221          ||       R.W. Watson         ||         
-  RFC222          ||       R.M. Metcalfe         ||         
-  RFC223          ||       J.T. Melvin, R.W. Watson         ||         
-  RFC224          ||       A.M. McKenzie         ||         
-  RFC225          ||       E. Harslem, R. Stoughton         ||         
-  RFC226          ||       P.M. Karp         ||         
-  RFC227          ||       J.F. Heafner, E. Harslem         ||         
-  RFC228          ||       D.C. Walden         ||         
-  RFC229          ||       J. Postel         ||         
-  RFC230          ||       T. Pyke         ||         
-  RFC231          ||       J.F. Heafner, E. Harslem         ||         
-  RFC232          ||       A. Vezza         ||         
-  RFC233          ||       A. Bhushan, R. Metcalfe         ||         
-  RFC234          ||       A. Vezza         ||         
-  RFC235          ||       E. Westheimer         ||         
-  RFC236          ||       J. Postel         ||         
-  RFC237          ||       R.W. Watson         ||         
-  RFC238          ||       R.T. Braden         ||         
-  RFC239          ||       R.T. Braden         ||         
-  RFC240          ||       A.M. McKenzie         ||         
-  RFC241          ||       A.M. McKenzie         ||         
-  RFC242          ||       L. Haibt, A.P. Mullery         ||         
-  RFC243          ||       A.P. Mullery         ||         
-  RFC244          ||               ||         
-  RFC245          ||       C. Falls         ||         
-  RFC246          ||       A. Vezza         ||         
-  RFC247          ||       P.M. Karp         ||         
-  RFC248          ||               ||         
-  RFC249          ||       R.F. Borelli         ||         
-  RFC250          ||       H. Brodie         ||         
-  RFC251          ||       D. Stern         ||         
-  RFC252          ||       E. Westheimer         ||         
-  RFC253          ||       J.A. Moorer         ||         
-  RFC254          ||      A. Bhushan         ||       
-  RFC255          ||       E. Westheimer         ||         
-  RFC256          ||      B. Cosell         ||       
-  RFC257          ||               ||         
-  RFC258          ||               ||         
-  RFC259          ||               ||         
-  RFC260          ||               ||         
-  RFC261          ||               ||         
-  RFC262          ||               ||         
-  RFC263          ||       A.M. McKenzie         ||         
-  RFC264          ||       A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenize, B. Sundberg, D. Watson, J. White         ||         
-  RFC265          ||       A. Bhushan, B. Braden, W. Crowther, E. Harslem, J. Heafner, A. McKenzie, J. Melvin, B. Sundberg, D. Watson, J. White         ||         
-  RFC266          ||       E. Westheimer         ||         
-  RFC267          ||       E. Westheimer         ||         
-  RFC268          ||       J. Postel         ||         
-  RFC269          ||       H. Brodie         ||         
-  RFC270          ||       A.M. McKenzie         ||         
-  RFC271          ||       B. Cosell         ||         
-  RFC272          ||               ||         
-  RFC273          ||       R.W. Watson         ||         
-  RFC274          ||       E. Forman         ||         
-  RFC275          ||               ||         
-  RFC276          ||       R.W. Watson         ||         
-  RFC277          ||               ||         
-  RFC278          ||       A.K. Bhushan, R.T. Braden, E. Harslem, J.F. Heafner, A.M. McKenzie, J.T. Melvin, R.L. Sundberg, R.W. Watson, J.E. White         ||         
-  RFC279          ||               ||         
-  RFC280          ||       R.W. Watson         ||         
-  RFC281          ||       A.M. McKenzie         ||         
-  RFC282          ||       M.A. Padlipsky         ||         
-  RFC283          ||       R.T. Braden         ||         
-  RFC284          ||               ||         
-  RFC285          ||       D. Huff         ||         
-  RFC286          ||       E. Forman         ||         
-  RFC287          ||       E. Westheimer         ||         
-  RFC288          ||       E. Westheimer         ||         
-  RFC289          ||       R.W. Watson         ||         
-  RFC290          ||       A.P. Mullery         ||         
-  RFC291          ||       D.B. McKay         ||         
-  RFC292          ||      J.C. Michener, I.W. Cotton, K.C. Kelley, D.E. Liddle, E. Meyer         ||       
-  RFC293          ||       E. Westheimer         ||         
-  RFC294          ||       A.K. Bhushan         ||         
-  RFC295          ||       J. Postel         ||         
-  RFC296          ||      D.E. Liddle         ||       
-  RFC297          ||       D.C. Walden         ||         
-  RFC298          ||       E. Westheimer         ||         
-  RFC299          ||       D. Hopkin         ||         
-  RFC300          ||       J.B. North         ||         
-  RFC301          ||       R. Alter         ||         
-  RFC302          ||       R.F. Bryan         ||         
-  RFC303          ||       Network Information Center. Stanford Research Institute         ||         
-  RFC304          ||      D.B. McKay         ||       
-  RFC305          ||       R. Alter         ||         
-  RFC306          ||       E. Westheimer         ||         
-  RFC307          ||       E. Harslem         ||         
-  RFC308          ||       M. Seriff         ||         
-  RFC309          ||       A.K. Bhushan         ||         
-  RFC310          ||       A.K. Bhushan         ||         
-  RFC311          ||       R.F. Bryan         ||         
-  RFC312          ||       A.M. McKenzie         ||         
-  RFC313          ||       T.C. O'Sullivan         ||         
-  RFC314          ||       I.W. Cotton         ||         
-  RFC315          ||       E. Westheimer         ||         
-  RFC316          ||       D.B. McKay, A.P. Mullery         ||         
-  RFC317          ||       J. Postel         ||         
-  RFC318          ||       J. Postel         ||         
-  RFC319          ||       E. Westheimer         ||         
-  RFC320          ||      R. Reddy         ||       
-  RFC321          ||       P.M. Karp         ||         
-  RFC322          ||       V. Cerf, J. Postel         ||         
-  RFC323          ||       V. Cerf         ||         
-  RFC324          ||       J. Postel         ||         
-  RFC325          ||       G. Hicks         ||         
-  RFC326          ||       E. Westheimer         ||         
-  RFC327          ||       A.K. Bhushan         ||         
-  RFC328          ||       J. Postel         ||         
-  RFC329          ||       Network Information Center. Stanford Research Institute         ||         
-  RFC330          ||       E. Westheimer         ||         
-  RFC331          ||       J.M. McQuillan         ||         
-  RFC332          ||       E. Westheimer         ||         
-  RFC333          ||       R.D. Bressler, D. Murphy, D.C. Walden         ||         
-  RFC334          ||       A.M. McKenzie         ||         
-  RFC335          ||       R.F. Bryan         ||         
-  RFC336          ||       I.W. Cotton         ||         
-  RFC337          ||               ||         
-  RFC338          ||       R.T. Braden         ||         
-  RFC339          ||       R. Thomas         ||         
-  RFC340          ||       T.C. O'Sullivan         ||         
-  RFC341          ||               ||         
-  RFC342          ||       E. Westheimer         ||         
-  RFC343          ||       A.M. McKenzie         ||         
-  RFC344          ||       E. Westheimer         ||         
-  RFC345          ||       K.C. Kelley         ||         
-  RFC346          ||       J. Postel         ||         
-  RFC347          ||       J. Postel         ||         
-  RFC348          ||       J. Postel         ||         
-  RFC349          ||       J. Postel         ||         
-  RFC350          ||       R. Stoughton         ||         
-  RFC351          ||       D. Crocker         ||         
-  RFC352          ||       D. Crocker         ||         
-  RFC353          ||       E. Westheimer         ||         
-  RFC354          ||       A.K. Bhushan         ||         
-  RFC355          ||       J. Davidson         ||         
-  RFC356          ||       R. Alter         ||         
-  RFC357          ||       J. Davidson         ||         
-  RFC358          ||               ||         
-  RFC359          ||       D.C. Walden         ||         
-  RFC360          ||      C. Holland         ||       
-  RFC361          ||       R.D. Bressler         ||         
-  RFC362          ||       E. Westheimer         ||         
-  RFC363          ||       Network Information Center. Stanford Research Institute         ||         
-  RFC364          ||       M.D. Abrams         ||         
-  RFC365          ||       D.C. Walden         ||         
-  RFC366          ||       E. Westheimer         ||         
-  RFC367          ||       E. Westheimer         ||         
-  RFC368          ||       R.T. Braden         ||         
-  RFC369          ||       J.R. Pickens         ||         
-  RFC370          ||       E. Westheimer         ||         
-  RFC371          ||       R.E. Kahn         ||         
-  RFC372          ||       R.W. Watson         ||         
-  RFC373          ||       J. McCarthy         ||         
-  RFC374          ||       A.M. McKenzie         ||         
-  RFC375          ||               ||         
-  RFC376          ||       E. Westheimer         ||         
-  RFC377          ||       R.T. Braden         ||         
-  RFC378          ||       A.M. McKenzie         ||         
-  RFC379          ||       R. Braden         ||         
-  RFC380          ||               ||         
-  RFC381          ||       J.M. McQuillan         ||         
-  RFC382          ||       L. McDaniel         ||         
-  RFC383          ||               ||         
-  RFC384          ||       J.B. North         ||         
-  RFC385          ||       A.K. Bhushan         ||         
-  RFC386          ||       B. Cosell, D.C. Walden         ||         
-  RFC387          ||       K.C. Kelley, J. Meir         ||         
-  RFC388          ||       V. Cerf         ||         
-  RFC389          ||       B. Noble         ||         
-  RFC390          ||       R.T. Braden         ||         
-  RFC391          ||       A.M. McKenzie         ||         
-  RFC392          ||       G. Hicks, B.D. Wessler         ||         
-  RFC393          ||       J.M. Winett         ||         
-  RFC394          ||       J.M. McQuillan         ||         
-  RFC395          ||       J.M. McQuillan         ||         
-  RFC396          ||       S. Bunch         ||         
-  RFC397          ||               ||         
-  RFC398          ||      J.R. Pickens, E. Faeh         ||       
-  RFC399          ||       M. Krilanovich         ||         
-  RFC400          ||       A.M. McKenzie         ||         
-  RFC401          ||       J. Hansen         ||         
-  RFC402          ||       J.B. North         ||         
-  RFC403          ||      G. Hicks         ||       
-  RFC404          ||       A.M. McKenzie         ||         
-  RFC405          ||       A.M. McKenzie         ||         
-  RFC406          ||       J.M. McQuillan         ||         
-  RFC407          ||       R.D. Bressler, R. Guida, A.M. McKenzie         ||         
-  RFC408          ||       A.D. Owen, J. Postel         ||         
-  RFC409          ||       J.E. White         ||         
-  RFC410          ||       J.M. McQuillan         ||         
-  RFC411          ||       M.A. Padlipsky         ||         
-  RFC412          ||       G. Hicks         ||         
-  RFC413          ||       A.M. McKenzie         ||         
-  RFC414          ||       A.K. Bhushan         ||         
-  RFC415          ||       H. Murray         ||         
-  RFC416          ||       J.C. Norton         ||         
-  RFC417          ||       J. Postel, C. Kline         ||         
-  RFC418          ||      W. Hathaway         ||       
-  RFC419          ||       A. Vezza         ||         
-  RFC420          ||       H. Murray         ||         
-  RFC421          ||       A.M. McKenzie         ||         
-  RFC422          ||       A.M. McKenzie         ||         
-  RFC423          ||       B. Noble         ||         
-  RFC424          ||               ||         
-  RFC425          ||       R.D. Bressler         ||         
-  RFC426          ||       R. Thomas         ||         
-  RFC427          ||               ||         
-  RFC428          ||               ||         
-  RFC429          ||       J. Postel         ||         
-  RFC430          ||       R.T. Braden         ||         
-  RFC431          ||       M. Krilanovich         ||         
-  RFC432          ||       N. Neigus         ||         
-  RFC433          ||       J. Postel         ||         
-  RFC434          ||       A.M. McKenzie         ||         
-  RFC435          ||       B. Cosell, D.C. Walden         ||         
-  RFC436          ||       M. Krilanovich         ||         
-  RFC437          ||       E. Faeh         ||         
-  RFC438          ||       R. Thomas, R. Clements         ||         
-  RFC439          ||       V. Cerf         ||         
-  RFC440          ||       D.C. Walden         ||         
-  RFC441          ||       R.D. Bressler, R. Thomas         ||         
-  RFC442          ||       V. Cerf         ||         
-  RFC443          ||       A.M. McKenzie         ||         
-  RFC444          ||               ||         
-  RFC445          ||       A.M. McKenzie         ||         
-  RFC446          ||       L.P. Deutsch         ||         
-  RFC447          ||       A.M. McKenzie         ||         
-  RFC448          ||       R.T. Braden         ||         
-  RFC449          ||       D.C. Walden         ||         
-  RFC450          ||       M.A. Padlipsky         ||         
-  RFC451          ||       M.A. Padlipsky         ||         
-  RFC452          ||      J. Winett         ||       
-  RFC453          ||       M.D. Kudlick         ||         
-  RFC454          ||       A.M. McKenzie         ||         
-  RFC455          ||       A.M. McKenzie         ||         
-  RFC456          ||       M.D. Kudlick         ||         
-  RFC457          ||       D.C. Walden         ||         
-  RFC458          ||       R.D. Bressler, R. Thomas         ||         
-  RFC459          ||       W. Kantrowitz         ||         
-  RFC460          ||       C. Kline         ||         
-  RFC461          ||       A.M. McKenzie         ||         
-  RFC462          ||       J. Iseli, D. Crocker         ||         
-  RFC463          ||       A.K. Bhushan         ||         
-  RFC464          ||       M.D. Kudlick         ||         
-  RFC465          ||               ||         
-  RFC466          ||       J.M. Winett         ||         
-  RFC467          ||       J.D. Burchfiel, R.S. Tomlinson         ||         
-  RFC468          ||       R.T. Braden         ||         
-  RFC469          ||       M.D. Kudlick         ||         
-  RFC470          ||       R. Thomas         ||         
-  RFC471          ||       R. Thomas         ||         
-  RFC472          ||       S. Bunch         ||         
-  RFC473          ||       D.C. Walden         ||         
-  RFC474          ||       S. Bunch         ||         
-  RFC475          ||      A.K. Bhushan         ||       
-  RFC476          ||       A.M. McKenzie         ||         
-  RFC477          ||       M. Krilanovich         ||         
-  RFC478          ||       R.D. Bressler, R. Thomas         ||         
-  RFC479          ||       J.E. White         ||         
-  RFC480          ||       J.E. White         ||         
-  RFC481          ||               ||         
-  RFC482          ||      A.M. McKenzie         ||       
-  RFC483          ||       M.D. Kudlick         ||         
-  RFC484          ||               ||         
-  RFC485          ||       J.R. Pickens         ||         
-  RFC486          ||       R.D. Bressler         ||         
-  RFC487          ||       R.D. Bressler         ||         
-  RFC488          ||       M.F. Auerbach         ||         
-  RFC489          ||       J. Postel         ||         
-  RFC490          ||       J.R. Pickens         ||         
-  RFC491          ||       M.A. Padlipsky         ||         
-  RFC492          ||       E. Meyer         ||         
-  RFC493          ||      J.C. Michener, I.W. Cotton, K.C. Kelley, D.E. Liddle, E. Meyer         ||       
-  RFC494          ||       D.C. Walden         ||         
-  RFC495          ||      A.M. McKenzie         ||       
-  RFC496          ||       M.F. Auerbach         ||         
-  RFC497          ||      A.M. McKenzie         ||       
-  RFC498          ||       R.T. Braden         ||         
-  RFC499          ||      B.R. Reussow         ||       
-  RFC500          ||      A. Shoshani, I. Spiegler         ||       
-  RFC501          ||       K.T. Pogran         ||         
-  RFC502          ||               ||         
-  RFC503          ||       N. Neigus, J. Postel         ||         
-  RFC504          ||       R. Thomas         ||         
-  RFC505          ||       M.A. Padlipsky         ||         
-  RFC506          ||       M.A. Padlipsky         ||         
-  RFC507          ||               ||         
-  RFC508          ||       L. Pfeifer, J. McAfee         ||         
-  RFC509          ||       A.M. McKenzie         ||         
-  RFC510          ||       J.E. White         ||         
-  RFC511          ||       J.B. North         ||         
-  RFC512          ||       W. Hathaway         ||         
-  RFC513          ||       W. Hathaway         ||         
-  RFC514          ||       W. Kantrowitz         ||         
-  RFC515          ||       R. Winter         ||         
-  RFC516          ||       J. Postel         ||         
-  RFC517          ||               ||         
-  RFC518          ||       N. Vaughan, E.J. Feinler         ||         
-  RFC519          ||      J.R. Pickens         ||       
-  RFC520          ||       J.D. Day         ||         
-  RFC521          ||       A.M. McKenzie         ||         
-  RFC522          ||      A.M. McKenzie         ||       
-  RFC523          ||       A.K. Bhushan         ||         
-  RFC524          ||       J.E. White         ||         
-  RFC525          ||       W. Parrish, J.R. Pickens         ||         
-  RFC526          ||       W.K. Pratt         ||         
-  RFC527          ||       R. Merryman         ||         
-  RFC528          ||       J.M. McQuillan         ||         
-  RFC529          ||       A.M. McKenzie, R. Thomas, R.S. Tomlinson, K.T. Pogran         ||         
-  RFC530          ||      A.K. Bhushan         ||       
-  RFC531          ||       M.A. Padlipsky         ||         
-  RFC532          ||       R.G. Merryman         ||         
-  RFC533          ||       D.C. Walden         ||         
-  RFC534          ||       D.C. Walden         ||         
-  RFC535          ||      R. Thomas         ||       
-  RFC536          ||               ||         
-  RFC537          ||       S. Bunch         ||         
-  RFC538          ||      A.M. McKenzie         ||       
-  RFC539          ||       D. Crocker, J. Postel         ||         
-  RFC540          ||               ||         
-  RFC541          ||               ||         
-  RFC542          ||      N. Neigus         ||       
-  RFC543          ||       N.D. Meyer         ||         
-  RFC544          ||       N.D. Meyer, K. Kelley         ||         
-  RFC545          ||       J.R. Pickens         ||         
-  RFC546          ||       R. Thomas         ||         
-  RFC547          ||       D.C. Walden         ||         
-  RFC548          ||       D.C. Walden         ||         
-  RFC549          ||       J.C. Michener         ||         
-  RFC550          ||       L.P. Deutsch         ||         
-  RFC551          ||      Y. Feinroth, R. Fink         ||       
-  RFC552          ||       A.D. Owen         ||         
-  RFC553          ||       C.H. Irby, K. Victor         ||         
-  RFC554          ||               ||         
-  RFC555          ||       J.E. White         ||         
-  RFC556          ||      A.M. McKenzie         ||       
-  RFC557          ||      B.D. Wessler         ||       
-  RFC558          ||               ||         
-  RFC559          ||       A.K. Bushan         ||         
-  RFC560          ||      D. Crocker, J. Postel         ||       
-  RFC561          ||      A.K. Bhushan, K.T. Pogran, R.S. Tomlinson, J.E. White         ||       
-  RFC562          ||      A.M. McKenzie         ||       
-  RFC563          ||       J. Davidson         ||         
-  RFC564          ||               ||         
-  RFC565          ||       D. Cantor         ||         
-  RFC566          ||      A.M. McKenzie         ||       
-  RFC567          ||       L.P. Deutsch         ||         
-  RFC568          ||       J.M. McQuillan         ||         
-  RFC569          ||       M.A. Padlipsky         ||         
-  RFC570          ||       J.R. Pickens         ||         
-  RFC571          ||      R. Braden         ||       
-  RFC572          ||               ||         
-  RFC573          ||      A. Bhushan         ||       
-  RFC574          ||      M. Krilanovich         ||       
-  RFC575          ||               ||         
-  RFC576          ||      K. Victor         ||       
-  RFC577          ||      D. Crocker         ||       
-  RFC578          ||      A.K. Bhushan, N.D. Ryan         ||       
-  RFC579          ||      A.M. McKenzie         ||       
-  RFC580          ||       J. Postel         ||         
-  RFC581          ||      D. Crocker, J. Postel         ||       
-  RFC582          ||       R. Clements         ||         
-  RFC583          ||               ||         
-  RFC584          ||       J. Iseli, D. Crocker, N. Neigus         ||         
-  RFC585          ||       D. Crocker, N. Neigus, E.J. Feinler, J. Iseli         ||         
-  RFC586          ||      A.M. McKenzie         ||       
-  RFC587          ||      J. Postel         ||       
-  RFC588          ||      A. Stokes         ||       
-  RFC589          ||       R.T. Braden         ||         
-  RFC590          ||       M.A. Padlipsky         ||         
-  RFC591          ||       D.C. Walden         ||         
-  RFC592          ||      R.W. Watson         ||       
-  RFC593          ||       A.M. McKenzie, J. Postel         ||         
-  RFC594          ||      J.D. Burchfiel         ||       
-  RFC595          ||       W. Hathaway         ||         
-  RFC596          ||       E.A. Taft         ||         
-  RFC597          ||       N. Neigus, E.J. Feinler         ||         
-  RFC598          ||      Network Information Center. Stanford Research Institute         ||       
-  RFC599          ||       R.T. Braden         ||         
-  RFC600          ||      A. Berggreen         ||       
-  RFC601          ||       A.M. McKenzie         ||         
-  RFC602          ||       R.M. Metcalfe         ||         
-  RFC603          ||       J.D. Burchfiel         ||         
-  RFC604          ||       J. Postel         ||         
-  RFC605          ||               ||         
-  RFC606          ||       L.P. Deutsch         ||         
-  RFC607          ||       M. Krilanovich, G. Gregg         ||         
-  RFC608          ||       M.D. Kudlick         ||         
-  RFC609          ||       B. Ferguson         ||         
-  RFC610          ||       R. Winter, J. Hill, W. Greiff         ||         
-  RFC611          ||       D.C. Walden         ||         
-  RFC612          ||       A.M. McKenzie         ||         
-  RFC613          ||       A.M. McKenzie         ||         
-  RFC614          ||       K.T. Pogran, N. Neigus         ||         
-  RFC615          ||      D. Crocker         ||       
-  RFC616          ||      D. Walden         ||       
-  RFC617          ||       E.A. Taft         ||         
-  RFC618          ||       E.A. Taft         ||         
-  RFC619          ||       W. Naylor, H. Opderbeck         ||         
-  RFC620          ||       B. Ferguson         ||         
-  RFC621          ||       M.D. Kudlick         ||         
-  RFC622          ||       A.M. McKenzie         ||         
-  RFC623          ||       M. Krilanovich         ||         
-  RFC624          ||       M. Krilanovich, G. Gregg, W. Hathaway, J.E. White         ||         
-  RFC625          ||       M.D. Kudlick, E.J. Feinler         ||         
-  RFC626          ||       L. Kleinrock, H. Opderbeck         ||         
-  RFC627          ||       M.D. Kudlick, E.J. Feinler         ||         
-  RFC628          ||       M.L. Keeney         ||         
-  RFC629          ||       J.B. North         ||         
-  RFC630          ||       J. Sussman         ||         
-  RFC631          ||       A. Danthine         ||         
-  RFC632          ||       H. Opderbeck         ||         
-  RFC633          ||       A.M. McKenzie         ||         
-  RFC634          ||       A.M. McKenzie         ||         
-  RFC635          ||       V. Cerf         ||         
-  RFC636          ||       J.D. Burchfiel, B. Cosell, R.S. Tomlinson, D.C. Walden         ||         
-  RFC637          ||       A.M. McKenzie         ||         
-  RFC638          ||       A.M. McKenzie         ||         
-  RFC639          ||               ||         
-  RFC640          ||       J. Postel         ||         
-  RFC641          ||               ||         
-  RFC642          ||       J.D. Burchfiel         ||         
-  RFC643          ||       E. Mader         ||         
-  RFC644          ||       R. Thomas         ||         
-  RFC645          ||      D. Crocker         ||       
-  RFC646          ||               ||         
-  RFC647          ||      M.A. Padlipsky         ||       
-  RFC648          ||               ||         
-  RFC649          ||               ||         
-  RFC650          ||               ||         
-  RFC651          ||       D. Crocker         ||         
-  RFC652          ||       D. Crocker         ||         
-  RFC653          ||       D. Crocker         ||         
-  RFC654          ||       D. Crocker         ||         
-  RFC655          ||       D. Crocker         ||         
-  RFC656          ||       D. Crocker         ||         
-  RFC657          ||       D. Crocker         ||         
-  RFC658          ||       D. Crocker         ||         
-  RFC659          ||       J. Postel         ||         
-  RFC660          ||       D.C. Walden         ||         
-  RFC661          ||      J. Postel         ||       
-  RFC662          ||       R. Kanodia         ||         
-  RFC663          ||       R. Kanodia         ||         
-  RFC664          ||               ||         
-  RFC665          ||               ||         
-  RFC666          ||       M.A. Padlipsky         ||         
-  RFC667          ||      S.G. Chipman         ||       
-  RFC668          ||               ||         
-  RFC669          ||      D.W. Dodds         ||       
-  RFC670          ||               ||         
-  RFC671          ||      R. Schantz         ||       
-  RFC672          ||       R. Schantz         ||         
-  RFC673          ||               ||         
-  RFC674          ||       J. Postel, J.E. White         ||         
-  RFC675          ||      V. Cerf, Y. Dalal, C. Sunshine         ||       
-  RFC676          ||               ||         
-  RFC677          ||       P.R. Johnson, R. Thomas         ||         
-  RFC678          ||       J. Postel         ||         
-  RFC679          ||      D.W. Dodds         ||       
-  RFC680          ||       T.H. Myer, D.A. Henderson         ||         
-  RFC681          ||       S. Holmgren         ||         
-  RFC682          ||               ||         
-  RFC683          ||       R. Clements         ||         
-  RFC684          ||       R. Schantz         ||         
-  RFC685          ||       M. Beeler         ||         
-  RFC686          ||       B. Harvey         ||         
-  RFC687          ||       D.C. Walden         ||         
-  RFC688          ||       D.C. Walden         ||         
-  RFC689          ||       R. Clements         ||         
-  RFC690          ||       J. Postel         ||         
-  RFC691          ||       B. Harvey         ||         
-  RFC692          ||       S.M. Wolfe         ||         
-  RFC693          ||               ||         
-  RFC694          ||      J. Postel         ||       
-  RFC695          ||       M. Krilanovich         ||         
-  RFC696          ||      V.G. Cerf         ||       
-  RFC697          ||       J. Lieb         ||         
-  RFC698          ||      T. Mock         ||       
-  RFC699          ||       J. Postel, J. Vernon         ||         
-  RFC700          ||      E. Mader, W.W. Plummer, R.S. Tomlinson         ||       
-  RFC701          ||      D.W. Dodds         ||       
-  RFC702          ||      D.W. Dodds         ||       
-  RFC703          ||      D.W. Dodds         ||       
-  RFC704          ||       P.J. Santos         ||         
-  RFC705          ||       R.F. Bryan         ||         
-  RFC706          ||       J. Postel         ||         
-  RFC707          ||       J.E. White         ||         
-  RFC708          ||       J.E. White         ||         
-  RFC709          ||               ||         
-  RFC710          ||               ||         
-  RFC711          ||               ||       
-  RFC712          ||      J.E. Donnelley         ||       
-  RFC713          ||       J. Haverty         ||         
-  RFC714          ||      A.M. McKenzie         ||       
-  RFC715          ||               ||       
-  RFC716          ||       D.C. Walden, J. Levin         ||         
-  RFC717          ||       J. Postel         ||         
-  RFC718          ||       J. Postel         ||         
-  RFC719          ||       J. Postel         ||         
-  RFC720          ||       D. Crocker         ||         
-  RFC721          ||      L.L. Garlick         ||       
-  RFC722          ||       J. Haverty         ||         
-  RFC723          ||               ||       
-  RFC724          ||       D. Crocker, K.T. Pogran, J. Vittal, D.A. Henderson         ||         
-  RFC725          ||       J.D. Day, G.R. Grossman         ||         
-  RFC726          ||       J. Postel, D. Crocker         ||         
-  RFC727          ||       M.R. Crispin         ||         
-  RFC728          ||       J.D. Day         ||         
-  RFC729          ||       D. Crocker         ||         
-  RFC730          ||       J. Postel         ||         
-  RFC731          ||       J.D. Day         ||         
-  RFC732          ||       J.D. Day         ||         
-  RFC733          ||       D. Crocker, J. Vittal, K.T. Pogran, D.A. Henderson         ||         
-  RFC734          ||      M.R. Crispin         ||       
-  RFC735          ||       D. Crocker, R.H. Gumpertz         ||         
-  RFC736          ||       M.R. Crispin         ||         
-  RFC737          ||       K. Harrenstien         ||         
-  RFC738          ||       K. Harrenstien         ||         
-  RFC739          ||       J. Postel         ||         
-  RFC740          ||       R.T. Braden         ||         
-  RFC741          ||       D. Cohen         ||         
-  RFC742          ||       K. Harrenstien         ||         
-  RFC743          ||       K. Harrenstien         ||         
-  RFC744          ||       J. Sattley         ||         
-  RFC745          ||       M. Beeler         ||         
-  RFC746          ||       R. Stallman         ||         
-  RFC747          ||       M.R. Crispin         ||         
-  RFC748          ||       M.R. Crispin         ||         
-  RFC749          ||       B. Greenberg         ||         
-  RFC750          ||       J. Postel         ||         
-  RFC751          ||       P.D. Lebling         ||         
-  RFC752          ||       M.R. Crispin         ||         
-  RFC753          ||       J. Postel         ||         
-  RFC754          ||       J. Postel         ||         
-  RFC755          ||       J. Postel         ||         
-  RFC756          ||       J.R. Pickens, E.J. Feinler, J.E. Mathis         ||         
-  RFC757          ||       D.P. Deutsch         ||         
-  RFC758          ||       J. Postel         ||         
-  RFC759          ||       J. Postel         ||         
-  RFC760          ||       J. Postel         ||         
-  RFC761          ||      J. Postel         ||       
-  RFC762          ||       J. Postel         ||         
-  RFC763          ||       M.D. Abrams         ||         
-  RFC764          ||       J. Postel         ||         
-  RFC765          ||       J. Postel         ||         
-  RFC766          ||       J. Postel         ||         
-  RFC767          ||       J. Postel         ||         
-  RFC768          ||       J. Postel         ||         
-  RFC769          ||       J. Postel         ||         
-  RFC770          ||       J. Postel         ||         
-  RFC771          ||       V.G. Cerf, J. Postel         ||         
-  RFC772          ||      S. Sluizer, J. Postel         ||       
-  RFC773          ||       V.G. Cerf         ||         
-  RFC774          ||       J. Postel         ||         
-  RFC775          ||       D. Mankins, D. Franklin, A.D. Owen         ||         
-  RFC776          ||       J. Postel         ||         
-  RFC777          ||      J. Postel         ||       
-  RFC778          ||       D.L. Mills         ||         
-  RFC779          ||      E. Killian         ||       
-  RFC780          ||      S. Sluizer, J. Postel         ||       
-  RFC781          ||       Z. Su         ||         
-  RFC782          ||       J. Nabielsky, A.P. Skelton         ||         
-  RFC783          ||       K.R. Sollins         ||         
-  RFC784          ||       S. Sluizer, J. Postel         ||         
-  RFC785          ||       S. Sluizer, J. Postel         ||         
-  RFC786          ||       S. Sluizer, J. Postel         ||         
-  RFC787          ||       A.L. Chapin         ||         
-  RFC788          ||      J. Postel         ||       
-  RFC789          ||       E.C. Rosen         ||         
-  RFC790          ||       J. Postel         ||         
-  RFC791          ||      J. Postel         ||       
-  RFC792          ||      J. Postel         ||       
-  RFC793          ||      J. Postel         ||       
-  RFC794          ||      V.G. Cerf         ||       
-  RFC795          ||       J. Postel         ||         
-  RFC796          ||      J. Postel         ||       
-  RFC797          ||       A.R. Katz         ||         
-  RFC798          ||       A.R. Katz         ||         
-  RFC799          ||       D.L. Mills         ||         
-  RFC800          ||       J. Postel, J. Vernon         ||         
-  RFC801          ||       J. Postel         ||         
-  RFC802          ||       A.G. Malis         ||         
-  RFC803          ||       A. Agarwal, M.J. O'Connor, D.L. Mills         ||         
-  RFC804          ||       International Telegraph and Telephone Consultative Committee of the International Telecommunication Union         ||         
-  RFC805          ||       J. Postel         ||         
-  RFC806          ||       National Bureau of Standards         ||         
-  RFC807          ||       J. Postel         ||         
-  RFC808          ||       J. Postel         ||         
-  RFC809          ||       T. Chang         ||         
-  RFC810          ||       E.J. Feinler, K. Harrenstien, Z. Su, V. White         ||         
-  RFC811          ||       K. Harrenstien, V. White, E.J. Feinler         ||         
-  RFC812          ||       K. Harrenstien, V. White         ||         
-  RFC813          ||      D.D. Clark         ||       
-  RFC814          ||      D.D. Clark         ||       
-  RFC815          ||       D.D. Clark         ||         
-  RFC816          ||      D.D. Clark         ||       
-  RFC817          ||      D.D. Clark         ||       
-  RFC818          ||       J. Postel         ||         
-  RFC819          ||      Z. Su, J. Postel         ||       
-  RFC820          ||       J. Postel         ||         
-  RFC821          ||       J. Postel         ||         
-  RFC822          ||       D. Crocker         ||         
-  RFC823          ||      R.M. Hinden, A. Sheltzer         ||       bob.hinden@gmail.com
-  RFC824          ||       W.I. MacGregor, D.C. Tappan         ||         
-  RFC825          ||       J. Postel         ||         
-  RFC826          ||      D. Plummer         ||       
-  RFC827          ||       E.C. Rosen         ||         
-  RFC828          ||       K. Owen         ||         
-  RFC829          ||       V.G. Cerf         ||         
-  RFC830          ||       Z. Su         ||         
-  RFC831          ||       R.T. Braden         ||         
-  RFC832          ||       D. Smallberg         ||         
-  RFC833          ||       D. Smallberg         ||         
-  RFC834          ||       D. Smallberg         ||         
-  RFC835          ||       D. Smallberg         ||         
-  RFC836          ||       D. Smallberg         ||         
-  RFC837          ||       D. Smallberg         ||         
-  RFC838          ||       D. Smallberg         ||         
-  RFC839          ||       D. Smallberg         ||         
-  RFC840          ||       J. Postel         ||         
-  RFC841          ||       National Bureau of Standards         ||         
-  RFC842          ||       D. Smallberg         ||         
-  RFC843          ||       D. Smallberg         ||         
-  RFC844          ||       R. Clements         ||         
-  RFC845          ||       D. Smallberg         ||         
-  RFC846          ||       D. Smallberg         ||         
-  RFC847          ||       A. Westine, D. Smallberg, J. Postel         ||         
-  RFC848          ||       D. Smallberg         ||         
-  RFC849          ||       M.R. Crispin         ||         
-  RFC850          ||       M.R. Horton         ||         
-  RFC851          ||       A.G. Malis         ||         
-  RFC852          ||      A.G. Malis         ||       
-  RFC853          ||               ||       
-  RFC854          ||      J. Postel, J.K. Reynolds         ||       
-  RFC855          ||       J. Postel, J.K. Reynolds         ||         
-  RFC856          ||      J. Postel, J. Reynolds         ||         
-  RFC857          ||      J. Postel, J. Reynolds         ||         
-  RFC858          ||       J. Postel, J. Reynolds         ||         
-  RFC859          ||       J. Postel, J. Reynolds         ||         
-  RFC860          ||       J. Postel, J. Reynolds         ||         
-  RFC861          ||      J. Postel, J. Reynolds         ||       
-  RFC862          ||       J. Postel         ||         
-  RFC863          ||       J. Postel         ||         
-  RFC864          ||       J. Postel         ||         
-  RFC865          ||       J. Postel         ||         
-  RFC866          ||       J. Postel         ||         
-  RFC867          ||       J. Postel         ||         
-  RFC868          ||       J. Postel, K. Harrenstien         ||         
-  RFC869          ||      R. Hinden         ||       bob.hinden@gmail.com
-  RFC870          ||       J.K. Reynolds, J. Postel         ||         
-  RFC871          ||       M.A. Padlipsky         ||         
-  RFC872          ||      M.A. Padlipsky         ||       
-  RFC873          ||       M.A. Padlipsky         ||         
-  RFC874          ||       M.A. Padlipsky         ||         
-  RFC875          ||       M.A. Padlipsky         ||         
-  RFC876          ||       D. Smallberg         ||         
-  RFC877          ||       J.T. Korb         ||         
-  RFC878          ||       A.G. Malis         ||         
-  RFC879          ||      J. Postel         ||       
-  RFC880          ||       J.K. Reynolds, J. Postel         ||         
-  RFC881          ||       J. Postel         ||         
-  RFC882          ||       P.V. Mockapetris         ||         
-  RFC883          ||       P.V. Mockapetris         ||         
-  RFC884          ||       M. Solomon, E. Wimmers         ||         
-  RFC885          ||       J. Postel         ||         
-  RFC886          ||       M.T. Rose         ||         
-  RFC887          ||       M. Accetta         ||         
-  RFC888          ||       L. Seamonson, E.C. Rosen         ||         
-  RFC889          ||      D.L. Mills         ||       
-  RFC890          ||       J. Postel         ||         
-  RFC891          ||       D.L. Mills         ||         
-  RFC892          ||       International Organization for Standardization         ||         
-  RFC893          ||      S. Leffler, M.J. Karels         ||       
-  RFC894          ||      C. Hornig         ||       
-  RFC895          ||      J. Postel         ||       
-  RFC896          ||      J. Nagle         ||       
-  RFC897          ||       J. Postel         ||         
-  RFC898          ||      R.M. Hinden, J. Postel, M. Muuss, J.K. Reynolds         ||       bob.hinden@gmail.com
-  RFC899          ||       J. Postel, A. Westine         ||         
-  RFC900          ||       J.K. Reynolds, J. Postel         ||         
-  RFC901          ||       J.K. Reynolds, J. Postel         ||         
-  RFC902          ||       J.K. Reynolds, J. Postel         ||         
-  RFC903          ||      R. Finlayson, T. Mann, J.C. Mogul, M. Theimer         ||       
-  RFC904          ||      D.L. Mills         ||       
-  RFC905          ||      ISO         ||       
-  RFC906          ||       R. Finlayson         ||         
-  RFC907          ||      Bolt Beranek and Newman Laboratories         ||         
-  RFC908          ||      D. Velten, R.M. Hinden, J. Sax         ||       bob.hinden@gmail.com
-  RFC909          ||       C. Welles, W. Milliken         ||         
-  RFC910          ||       H.C. Forsdick         ||         
-  RFC911          ||       P. Kirton         ||         
-  RFC912          ||       M. St. Johns         ||         
-  RFC913          ||       M. Lottor         ||         
-  RFC914          ||       D.J. Farber, G. Delp, T.M. Conte         ||         
-  RFC915          ||       M.A. Elvy, R. Nedved         ||         
-  RFC916          ||       G.G. Finn         ||         
-  RFC917          ||       J.C. Mogul         ||         
-  RFC918          ||       J.K. Reynolds         ||         
-  RFC919          ||       J.C. Mogul         ||         
-  RFC920          ||       J. Postel, J.K. Reynolds         ||         
-  RFC921          ||       J. Postel         ||         
-  RFC922          ||       J.C. Mogul         ||         
-  RFC923          ||       J.K. Reynolds, J. Postel         ||         
-  RFC924          ||       J.K. Reynolds, J. Postel         ||         
-  RFC925          ||       J. Postel         ||         
-  RFC926          ||       International Organization for Standardization         ||         
-  RFC927          ||       B.A. Anderson         ||         
-  RFC928          ||       M.A. Padlipsky         ||         
-  RFC929          ||       J. Lilienkamp, R. Mandell, M.A. Padlipsky         ||         
-  RFC930          ||       M. Solomon, E. Wimmers         ||         
-  RFC931          ||       M. St. Johns         ||         
-  RFC932          ||       D.D. Clark         ||         
-  RFC933          ||       S. Silverman         ||         
-  RFC934          ||       M.T. Rose, E.A. Stefferud         ||         
-  RFC935          ||       J.G. Robinson         ||         
-  RFC936          ||       M.J. Karels         ||         
-  RFC937          ||       M. Butler, J. Postel, D. Chase, J. Goldberger, J.K. Reynolds         ||         
-  RFC938          ||       T. Miller         ||         
-  RFC939          ||       National Research Council         ||         
-  RFC940          ||      Gateway Algorithms and Data Structures Task Force         ||       
-  RFC941          ||      International Organization for Standardization         ||       
-  RFC942          ||       National Research Council         ||         
-  RFC943          ||      J.K. Reynolds, J. Postel         ||       
-  RFC944          ||      J.K. Reynolds, J. Postel         ||       
-  RFC945          ||       J. Postel         ||         
-  RFC946          ||       R. Nedved         ||         
-  RFC947          ||       K. Lebowitz, D. Mankins         ||         
-  RFC948          ||       I. Winston         ||         
-  RFC949          ||       M.A. Padlipsky         ||         
-  RFC950          ||      J.C. Mogul, J. Postel         ||       
-  RFC951          ||      W.J. Croft, J. Gilmore         ||       
-  RFC952          ||      K. Harrenstien, M.K. Stahl, E.J. Feinler         ||       
-  RFC953          ||       K. Harrenstien, M.K. Stahl, E.J. Feinler         ||         
-  RFC954          ||       K. Harrenstien, M.K. Stahl, E.J. Feinler         ||         
-  RFC955          ||       R.T. Braden         ||         
-  RFC956          ||       D.L. Mills         ||         
-  RFC957          ||       D.L. Mills         ||         
-  RFC958          ||       D.L. Mills         ||         
-  RFC959          ||      J. Postel, J. Reynolds         ||       
-  RFC960          ||       J.K. Reynolds, J. Postel         ||         
-  RFC961          ||       J.K. Reynolds, J. Postel         ||         
-  RFC962          ||       M.A. Padlipsky         ||         
-  RFC963          ||       D.P. Sidhu         ||         
-  RFC964          ||      D.P. Sidhu, T. Blumer         ||       
-  RFC965          ||       L. Aguilar         ||         
-  RFC966          ||       S.E. Deering, D.R. Cheriton         ||         
-  RFC967          ||       M.A. Padlipsky         ||         
-  RFC968          ||       V.G. Cerf         ||         
-  RFC969          ||       D.D. Clark, M.L. Lambert, L. Zhang         ||         
-  RFC970          ||      J. Nagle         ||       
-  RFC971          ||       A.L. DeSchon         ||         
-  RFC972          ||       F.J. Wancho         ||         
-  RFC973          ||       P.V. Mockapetris         ||         
-  RFC974          ||      C. Partridge         ||       
-  RFC975          ||       D.L. Mills         ||         
-  RFC976          ||       M.R. Horton         ||         
-  RFC977          ||       B. Kantor, P. Lapsley         ||         
-  RFC978          ||       J.K. Reynolds, R. Gillman, W.A. Brackenridge, A. Witkowski, J. Postel         ||         
-  RFC979          ||       A.G. Malis         ||         
-  RFC980          ||       O.J. Jacobsen, J. Postel         ||         
-  RFC981          ||       D.L. Mills         ||         
-  RFC982          ||      H.W. Braun         ||       
-  RFC983          ||      D.E. Cass, M.T. Rose         ||       
-  RFC984          ||       D.D. Clark, M.L. Lambert         ||         
-  RFC985          ||       National Science Foundation, Network Technical Advisory Group         ||         
-  RFC986          ||       R.W. Callon, H.W. Braun         ||         
-  RFC987          ||       S.E. Kille         ||         
-  RFC988          ||       S.E. Deering         ||         
-  RFC989          ||       J. Linn         ||         
-  RFC990          ||       J.K. Reynolds, J. Postel         ||         
-  RFC991          ||       J.K. Reynolds, J. Postel         ||         
-  RFC992          ||       K.P. Birman, T.A. Joseph         ||         
-  RFC993          ||       D.D. Clark, M.L. Lambert         ||         
-  RFC994          ||       International Organization for Standardization         ||         
-  RFC995          ||      International Organization for Standardization         ||       
-  RFC996          ||       D.L. Mills         ||         
-  RFC997          ||       J.K. Reynolds, J. Postel         ||         
-  RFC998          ||       D.D. Clark, M.L. Lambert, L. Zhang         ||         
-  RFC999          ||      A. Westine, J. Postel         ||       
-  RFC1000          ||       J.K. Reynolds, J. Postel         ||         
-  RFC1001          ||       NetBIOS Working Group in the Defense Advanced Research Projects Agency, Internet Activities Board, End-to-End Services Task Force         ||         
-  RFC1002          ||       NetBIOS Working Group in the Defense Advanced Research Projects Agency, Internet Activities Board, End-to-End Services Task Force         ||         
-  RFC1003          ||       A.R. Katz         ||         
-  RFC1004          ||      D.L. Mills         ||       
-  RFC1005          ||       A. Khanna, A.G. Malis         ||         
-  RFC1006          ||       M.T. Rose, D.E. Cass         ||         
-  RFC1007          ||       W. McCoy         ||         
-  RFC1008          ||       W. McCoy         ||         
-  RFC1009          ||       R.T. Braden, J. Postel         ||         
-  RFC1010          ||       J.K. Reynolds, J. Postel         ||         
-  RFC1011          ||      J.K. Reynolds, J. Postel         ||       
-  RFC1012          ||       J.K. Reynolds, J. Postel         ||         
-  RFC1013          ||       R.W. Scheifler         ||         
-  RFC1014          ||       Sun Microsystems         ||         
-  RFC1015          ||       B.M. Leiner         ||         
-  RFC1016          ||      W. Prue, J. Postel         ||       
-  RFC1017          ||       B.M. Leiner         ||         
-  RFC1018          ||      A.M. McKenzie         ||       
-  RFC1019          ||       D. Arnon         ||         
-  RFC1020          ||       S. Romano, M.K. Stahl         ||         
-  RFC1021          ||       C. Partridge, G. Trewitt         ||         
-  RFC1022          ||       C. Partridge, G. Trewitt         ||         
-  RFC1023          ||       G. Trewitt, C. Partridge         ||         
-  RFC1024          ||       C. Partridge, G. Trewitt         ||         
-  RFC1025          ||       J. Postel         ||         
-  RFC1026          ||       S.E. Kille         ||         
-  RFC1027          ||       S. Carl-Mitchell, J.S. Quarterman         ||         
-  RFC1028          ||       J. Davin, J.D. Case, M. Fedor, M.L. Schoffstall         ||         
-  RFC1029          ||       G. Parr         ||         
-  RFC1030          ||       M.L. Lambert         ||         
-  RFC1031          ||       W.D. Lazear         ||         
-  RFC1032          ||       M.K. Stahl         ||         
-  RFC1033          ||      M. Lottor         ||       
-  RFC1034          ||      P.V. Mockapetris         ||       
-  RFC1035          ||      P.V. Mockapetris         ||       
-  RFC1036          ||      M.R. Horton, R. Adams         ||       
-  RFC1037          ||       B. Greenberg, S. Keene         ||         
-  RFC1038          ||       M. St. Johns         ||         
-  RFC1039          ||       D. Latham         ||         
-  RFC1040          ||       J. Linn         ||         
-  RFC1041          ||      Y. Rekhter         ||       
-  RFC1042          ||       J. Postel, J.K. Reynolds         ||         
-  RFC1043          ||       A. Yasuda, T. Thompson         ||         
-  RFC1044          ||      K. Hardwick, J. Lekashman         ||       
-  RFC1045          ||       D.R. Cheriton         ||         
-  RFC1046          ||       W. Prue, J. Postel         ||         
-  RFC1047          ||       C. Partridge         ||         
-  RFC1048          ||       P.A. Prindeville         ||         
-  RFC1049          ||       M.A. Sirbu         ||         
-  RFC1050          ||      Sun Microsystems         ||       
-  RFC1051          ||       P.A. Prindeville         ||         
-  RFC1052          ||      V.G. Cerf         ||       
-  RFC1053          ||      S. Levy, T. Jacobson         ||       
-  RFC1054          ||       S.E. Deering         ||         
-  RFC1055          ||       J.L. Romkey         ||         
-  RFC1056          ||       M.L. Lambert         ||         
-  RFC1057          ||       Sun Microsystems         ||         
-  RFC1058          ||       C.L. Hedrick         ||         
-  RFC1059          ||       D.L. Mills         ||         
-  RFC1060          ||       J.K. Reynolds, J. Postel         ||         
-  RFC1061          ||               ||       
-  RFC1062          ||       S. Romano, M.K. Stahl, M. Recker         ||         
-  RFC1063          ||       J.C. Mogul, C.A. Kent, C. Partridge, K. McCloghrie         ||         
-  RFC1064          ||       M.R. Crispin         ||         
-  RFC1065          ||       K. McCloghrie, M.T. Rose         ||         
-  RFC1066          ||       K. McCloghrie, M.T. Rose         ||         
-  RFC1067          ||       J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin         ||         
-  RFC1068          ||       A.L. DeSchon, R.T. Braden         ||         
-  RFC1069          ||       R.W. Callon, H.W. Braun         ||         
-  RFC1070          ||       R.A. Hagens, N.E. Hall, M.T. Rose         ||        hagens@cs.wisc.edu, nhall@cs.wisc.edu 
-  RFC1071          ||      R.T. Braden, D.A. Borman, C. Partridge         ||       
-  RFC1072          ||      V. Jacobson, R.T. Braden         ||       
-  RFC1073          ||       D. Waitzman         ||         
-  RFC1074          ||       J. Rekhter         ||         
-  RFC1075          ||       D. Waitzman, C. Partridge, S.E. Deering         ||         
-  RFC1076          ||       G. Trewitt, C. Partridge         ||         
-  RFC1077          ||       B.M. Leiner         ||         
-  RFC1078          ||      M. Lottor         ||       
-  RFC1079          ||       C.L. Hedrick         ||         
-  RFC1080          ||       C.L. Hedrick         ||         
-  RFC1081          ||       M.T. Rose         ||         
-  RFC1082          ||       M.T. Rose         ||         
-  RFC1083          ||       Defense Advanced Research Projects Agency, Internet Activities Board         ||         
-  RFC1084          ||       J.K. Reynolds         ||        JKREYNOLDS@ISI.EDU 
-  RFC1085          ||       M.T. Rose         ||       mrose17@gmail.com
-  RFC1086          ||       J.P. Onions, M.T. Rose         ||        JPO@CS.NOTT.AC.UK, mrose17@gmail.com
-  RFC1087          ||       Defense Advanced Research Projects Agency, Internet Activities Board         ||         
-  RFC1088          ||       L.J. McLaughlin         ||        ljm@TWG.COM 
-  RFC1089          ||       M. Schoffstall, C. Davin, M. Fedor, J. Case         ||        schoff@stonewall.nyser.net, jrd@ptt.lcs.mit.edu, fedor@patton.NYSER.NET, case@UTKUX1.UTK.EDU 
-  RFC1090          ||       R. Ullmann         ||         
-  RFC1091          ||       J. VanBokkelen         ||         
-  RFC1092          ||       J. Rekhter         ||         
-  RFC1093          ||       H.W. Braun         ||         
-  RFC1094          ||      B. Nowicki         ||       
-  RFC1095          ||      U.S. Warrier, L. Besaw         ||       
-  RFC1096          ||       G.A. Marcy         ||         
-  RFC1097          ||       B. Miller         ||         
-  RFC1098          ||       J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin         ||        jrd@ptt.lcs.mit.edu 
-  RFC1099          ||       J. Reynolds         ||        JKREY@ISI.EDU 
-  RFC1100          ||      Defense Advanced Research Projects Agency, Internet Activities Board         ||       
-  RFC1101          ||      P.V. Mockapetris         ||       
-  RFC1102          ||       D.D. Clark         ||         
-  RFC1103          ||       D. Katz         ||         
-  RFC1104          ||       H.W. Braun         ||        hwb@merit.edu 
-  RFC1105          ||       K. Lougheed, Y. Rekhter         ||         
-  RFC1106          ||      R. Fox         ||       rfox@tandem.com
-  RFC1107          ||       K.R. Sollins         ||        SOLLINS@XX.LCS.MIT.EDU 
-  RFC1108          ||       S. Kent         ||         
-  RFC1109          ||       V.G. Cerf         ||        CERF@A.ISI.EDU 
-  RFC1110          ||      A.M. McKenzie         ||       MCKENZIE@BBN.COM
-  RFC1111          ||       J. Postel         ||        POSTEL@ISI.EDU 
-  RFC1112          ||       S.E. Deering         ||        deering@PESCADERO.STANFORD.EDU 
-  RFC1113          ||      J. Linn         ||       Linn@ultra.enet.dec.com
-  RFC1114          ||       S.T. Kent, J. Linn         ||        kent@BBN.COM, Linn@ultra.enet.dec.com 
-  RFC1115          ||       J. Linn         ||        Linn@ultra.enet.dec.com 
-  RFC1116          ||       D.A. Borman         ||        dab@CRAY.COM 
-  RFC1117          ||       S. Romano, M.K. Stahl, M. Recker         ||         
-  RFC1118          ||       E. Krol         ||        Krol@UXC.CSO.UIUC.EDU 
-  RFC1119          ||      D.L. Mills         ||       
-  RFC1120          ||       V. Cerf         ||        VCERF@NRI.RESTON.VA.US 
-  RFC1121          ||       J. Postel, L. Kleinrock, V.G. Cerf, B. Boehm         ||        Postel@ISI.EDU, lk@CS.UCLA.EDU, VCerf@NRI.RESTON.VA.US, boehm@CS.UCLA.EDU 
-  RFC1122          ||      R. Braden, Ed.         ||       Braden@ISI.EDU
-  RFC1123          ||      R. Braden, Ed.         ||       Braden@ISI.EDU
-  RFC1124          ||       B.M. Leiner         ||         
-  RFC1125          ||       D. Estrin         ||         
-  RFC1126          ||       M. Little         ||        little@SAIC.COM 
-  RFC1127          ||       R.T. Braden         ||        Braden@ISI.EDU 
-  RFC1128          ||       D.L. Mills         ||         
-  RFC1129          ||       D.L. Mills         ||         
-  RFC1130          ||       Defense Advanced Research Projects Agency, Internet Activities Board         ||         
-  RFC1131          ||      J. Moy         ||       
-  RFC1132          ||      L.J. McLaughlin         ||       ljm@TWG.COM
-  RFC1133          ||       J.Y. Yu, H.W. Braun         ||        jyy@merit.edu, hwb@merit.edu 
-  RFC1134          ||       D. Perkins         ||        rdhobby@ucdavis.edu 
-  RFC1135          ||       J.K. Reynolds         ||        JKREY@ISI.EDU 
-  RFC1136          ||       S. Hares, D. Katz         ||         
-  RFC1137          ||       S. Kille         ||        S.Kille@Cs.Ucl.AC.UK 
-  RFC1138          ||       S.E. Kille         ||        S.Kille@Cs.Ucl.AC.UK 
-  RFC1139          ||       R.A. Hagens         ||        hagens@CS.WISC.EDU 
-  RFC1140          ||       Defense Advanced Research Projects Agency, Internet Activities Board         ||         
-  RFC1141          ||      T. Mallory, A. Kullberg         ||       tmallory@CCV.BBN.COM, akullberg@BBN.COM
-  RFC1142          ||      D. Oran, Ed.         ||       
-  RFC1143          ||       D.J. Bernstein         ||         
-  RFC1144          ||       V. Jacobson         ||         
-  RFC1145          ||      J. Zweig, C. Partridge         ||       zweig@CS.UIUC.EDU, craig@BBN.COM
-  RFC1146          ||      J. Zweig, C. Partridge         ||       zweig@CS.UIUC.EDU, craig@BBN.COM
-  RFC1147          ||      R.H. Stine         ||       STINE@SPARTA.COM
-  RFC1148          ||       S.E. Kille         ||       S.Kille@Cs.Ucl.AC.UK 
-  RFC1149          ||      D. Waitzman         ||       dwaitzman@BBN.COM
-  RFC1150          ||      G.S. Malkin, J.K. Reynolds         ||       gmalkin@proteon.com, jkrey@isi.edu
-  RFC1151          ||      C. Partridge, R.M. Hinden         ||       craig@BBN.COM, bob.hinden@gmail.com
-  RFC1152          ||      C. Partridge         ||       craig@BBN.COM
-  RFC1153          ||      F.J. Wancho         ||       
-  RFC1154          ||      D. Robinson, R. Ullmann         ||       
-  RFC1155          ||       M.T. Rose, K. McCloghrie         ||       mrose17@gmail.com
-  RFC1156          ||       K. McCloghrie, M.T. Rose         ||       mrose17@gmail.com
-  RFC1157          ||      J.D. Case, M. Fedor, M.L. Schoffstall, J. Davin         ||       jrd@ptt.lcs.mit.edu
-  RFC1158          ||       M.T. Rose         ||         
-  RFC1159          ||       R. Nelson         ||        nelson@sun.soe.clarkson.edu 
-  RFC1160          ||       V. Cerf         ||        VCERF@NRI.RESTON.VA.US 
-  RFC1161          ||       M.T. Rose         ||         
-  RFC1162          ||       G. Satz         ||         
-  RFC1163          ||       K. Lougheed, Y. Rekhter         ||         
-  RFC1164          ||       J.C. Honig, D. Katz, M. Mathis, Y. Rekhter, J.Y. Yu         ||         
-  RFC1165          ||       J. Crowcroft, J.P. Onions         ||        JON@CS.UCL.AC.UK, JPO@CS.NOTT.AC.UK 
-  RFC1166          ||      S. Kirkpatrick, M.K. Stahl, M. Recker         ||       
-  RFC1167          ||       V.G. Cerf         ||        vcerf@NRI.Reston.VA.US 
-  RFC1168          ||       A. Westine, A.L. DeSchon, J. Postel, C.E. Ward         ||         
-  RFC1169          ||       V.G. Cerf, K.L. Mills         ||        vcerf@nri.reston.va.us, MILLS@ECF.NCSL.NIST.GOV 
-  RFC1170          ||       R.B. Fougner         ||         
-  RFC1171          ||       D. Perkins         ||        ddp@andrew.cmu.edu 
-  RFC1172          ||       D. Perkins, R. Hobby         ||        rdhobby@ucdavis.edu, ddp@andrew.cmu.edu 
-  RFC1173          ||       J. VanBokkelen         ||        jbvb@ftp.com 
-  RFC1174          ||       V.G. Cerf         ||        vcerf@nri.reston.va.us 
-  RFC1175          ||       K.L. Bowers, T.L. LaQuey, J.K. Reynolds, K. Roubicek, M.K. Stahl, A. Yuan         ||         
-  RFC1176          ||       M.R. Crispin         ||        mrc@Tomobiki-Cho.CAC.Washington.EDU 
-  RFC1177          ||       G.S. Malkin, A.N. Marine, J.K. Reynolds         ||        gmalkin@ftp.com, APRIL@NIC.DDN.MIL, jkrey@isi.edu 
-  RFC1178          ||       D. Libes         ||        libes@cme.nist.gov 
-  RFC1179          ||       L. McLaughlin         ||        ljm@twg.com 
-  RFC1180          ||       T.J. Socolofsky, C.J. Kale         ||        TEDS@SPIDER.CO.UK, CLAUDIAK@SPIDER.CO.UK 
-  RFC1181          ||       R. Blokzijl         ||        k13@nikhef.nl 
-  RFC1182          ||               ||       
-  RFC1183          ||      C.F. Everhart, L.A. Mamakos, R. Ullmann, P.V. Mockapetris         ||       Craig_Everhart@transarc.com, pvm@isi.edu
-  RFC1184          ||       D.A. Borman         ||        dab@CRAY.COM 
-  RFC1185          ||       V. Jacobson, R.T. Braden, L. Zhang         ||        van@CSAM.LBL.GOV, Braden@ISI.EDU, lixia@PARC.XEROX.COM 
-  RFC1186          ||       R.L. Rivest         ||        rivest@theory.lcs.mit.edu 
-  RFC1187          ||       M.T. Rose, K. McCloghrie, J.R. Davin         ||       mrose17@gmail.com,  KZM@HLS.COM,  jrd@ptt.lcs.mit.edu 
-  RFC1188          ||       D. Katz         ||        dkatz@merit.edu 
-  RFC1189          ||       U.S. Warrier, L. Besaw, L. LaBarre, B.D. Handspicker         ||         
-  RFC1190          ||      C. Topolcic         ||       Casner@ISI.Edu, CLynn@BBN.Com, ppark@BBN.COM, Schroder@BBN.Com, Topolcic@BBN.Com
-  RFC1191          ||       J.C. Mogul, S.E. Deering         ||        mogul@decwrl.dec.com, deering@xerox.com 
-  RFC1192          ||       B. Kahin         ||        kahin@hulaw.harvard.edu 
-  RFC1193          ||       D. Ferrari         ||        ferrari@UCBVAX.BERKELEY.EDU 
-  RFC1194          ||       D.P. Zimmerman         ||        dpz@dimacs.rutgers.edu 
-  RFC1195          ||      R.W. Callon         ||       
-  RFC1196          ||       D.P. Zimmerman         ||        dpz@dimacs.rutgers.edu 
-  RFC1197          ||       M. Sherman         ||         
-  RFC1198          ||       R.W. Scheifler         ||        rws@expo.lcs.mit.edu 
-  RFC1199          ||       J. Reynolds         ||        JKREY@ISI.EDU 
-  RFC1200          ||      Defense Advanced Research Projects Agency, Internet Activities Board         ||       
-  RFC1201          ||       D. Provan         ||        donp@Novell.Com 
-  RFC1202          ||       M.T. Rose         ||       mrose17@gmail.com
-  RFC1203          ||       J. Rice         ||        RICE@SUMEX-AIM.STANFORD.EDU 
-  RFC1204          ||       S. Yeh, D. Lee         ||        dlee@netix.com 
-  RFC1205          ||       P. Chmielewski         ||        paulc@rchland.iinus1.ibm.com 
-  RFC1206          ||       G.S. Malkin, A.N. Marine         ||        gmalkin@ftp.com, APRIL@nic.ddn.mil 
-  RFC1207          ||       G.S. Malkin, A.N. Marine, J.K. Reynolds         ||        gmalkin@ftp.com, APRIL@nic.ddn.mil, jkrey@isi.edu 
-  RFC1208          ||      O.J. Jacobsen, D.C. Lynch         ||       OLE@CSLI.STANFORD.EDU, Lynch@ISI.EDU
-  RFC1209          ||      D. Piscitello, J. Lawrence         ||       dave@sabre.bellcore.com, jcl@sabre.bellcore.com
-  RFC1210          ||       V.G. Cerf, P.T. Kirstein, B. Randell         ||         
-  RFC1211          ||       A. Westine, J. Postel         ||        Westine@ISI.EDU, Postel@ISI.EDU 
-  RFC1212          ||       M.T. Rose, K. McCloghrie         ||       mrose17@gmail.com,  kzm@hls.com 
-  RFC1213          ||      K. McCloghrie, M. Rose         ||       kzm@hls.com, mrose17@gmail.com
-  RFC1214          ||      L. LaBarre         ||       cel@mbunix.mitre.org
-  RFC1215          ||       M.T. Rose         ||       mrose17@gmail.com
-  RFC1216          ||       P. Richard, P. Kynikos         ||         
-  RFC1217          ||       V.G. Cerf         ||        CERF@NRI.RESTON.VA.US 
-  RFC1218          ||      North American Directory Forum         ||       
-  RFC1219          ||      P.F. Tsuchiya         ||       tsuchiya@thumper.bellcore.com
-  RFC1220          ||      F. Baker         ||       fbaker@ACC.COM
-  RFC1221          ||      W. Edmond         ||       wbe@bbn.com
-  RFC1222          ||       H.W. Braun, Y. Rekhter         ||        HWB@SDSC.EDU, Yakov@Watson.IBM.COM 
-  RFC1223          ||       J.M. Halpern         ||         
-  RFC1224          ||       L. Steinberg         ||        LOUISS@IBM.COM 
-  RFC1225          ||       M.T. Rose         ||       mrose17@gmail.com
-  RFC1226          ||       B. Kantor         ||        brian@UCSD.EDU 
-  RFC1227          ||       M.T. Rose         ||       mrose17@gmail.com
-  RFC1228          ||       G. Carpenter, B. Wijnen         ||         
-  RFC1229          ||       K. McCloghrie         ||        kzm@hls.com 
-  RFC1230          ||       K. McCloghrie, R. Fox         ||        kzm@hls.com, rfox@synoptics.com 
-  RFC1231          ||       K. McCloghrie, R. Fox, E. Decker         ||        kzm@hls.com, rfox@synoptics.com, cire@cisco.com 
-  RFC1232          ||       F. Baker, C.P. Kolb         ||        fbaker@acc.com, kolb@psi.com 
-  RFC1233          ||       T.A. Cox, K. Tesink         ||        tacox@sabre.bellcore.com, kaj@nvuxr.cc.bellcore.com 
-  RFC1234          ||       D. Provan         ||        donp@Novell.Com 
-  RFC1235          ||       J. Ioannidis, G. Maguire         ||        ji@cs.columbia.edu, maguire@cs.columbia.edu 
-  RFC1236          ||       L. Morales, P. Hasse         ||        lmorales@huachuca-emh8.army.mil, phasse@huachuca-emh8.army.mil 
-  RFC1237          ||       R. Colella, E. Gardner, R. Callon         ||        colella@osi3.ncsl.nist.gov, epg@gateway.mitre.org 
-  RFC1238          ||       G. Satz         ||         
-  RFC1239          ||       J.K. Reynolds         ||        jkrey@isi.edu 
-  RFC1240          ||       C. Shue, W. Haggerty, K. Dobbins         ||        chi@osf.org, bill@comm.wang.com 
-  RFC1241          ||       R.A. Woodburn, D.L. Mills         ||        woody@cseic.saic.com, mills@udel.edu 
-  RFC1242          ||      S. Bradner         ||       SOB@HARVARD.HARVARD.EDU
-  RFC1243          ||       S. Waldbusser         ||        waldbusser@andrew.cmu.edu 
-  RFC1244          ||       J.P. Holbrook, J.K. Reynolds         ||        holbrook@cic.net, JKREY@ISI.EDU 
-  RFC1245          ||       J. Moy         ||         
-  RFC1246          ||       J. Moy         ||         
-  RFC1247          ||       J. Moy         ||        jmoy@proteon.com 
-  RFC1248          ||       F. Baker, R. Coltun         ||        fbaker@acc.com, rcoltun@ni.umd.edu 
-  RFC1249          ||       T. Howes, M. Smith, B. Beecher         ||        tim@umich.edu, mcs@umich.edu, bryan@umich.edu 
-  RFC1250          ||       J. Postel         ||         
-  RFC1251          ||       G. Malkin         ||        gmalkin@ftp.com 
-  RFC1252          ||       F. Baker, R. Coltun         ||        fbaker@acc.com, rcoltun@ni.umd.edu 
-  RFC1253          ||       F. Baker, R. Coltun         ||        fbaker@acc.com, rcoltun@ni.umd.edu 
-  RFC1254          ||       A. Mankin, K. Ramakrishnan         ||         
-  RFC1255          ||       The North American Directory Forum         ||         
-  RFC1256          ||      S. Deering, Ed.         ||       deering@xerox.com
-  RFC1257          ||       C. Partridge         ||        craig@SICS.SE 
-  RFC1258          ||      B. Kantor         ||       brian@UCSD.EDU
-  RFC1259          ||       M. Kapor         ||        mkapor@eff.org 
-  RFC1260          ||               ||       
-  RFC1261          ||       S. Williamson, L. Nobile         ||        scottw@DIIS.DDN.MIL 
-  RFC1262          ||       V.G. Cerf         ||         
-  RFC1263          ||       S. O'Malley, L.L. Peterson         ||        llp@cs.arizona.edu, sean@cs.arizona.edu 
-  RFC1264          ||      R.M. Hinden         ||       bob.hinden@gmail.com
-  RFC1265          ||       Y. Rekhter         ||        yakov@watson.ibm.com 
-  RFC1266          ||       Y. Rekhter         ||        yakov@watson.ibm.com 
-  RFC1267          ||       K. Lougheed, Y. Rekhter         ||         
-  RFC1268          ||       Y. Rekhter, P. Gross         ||        yakov@watson.ibm.com 
-  RFC1269          ||       S. Willis, J.W. Burruss         ||         
-  RFC1270          ||       F. Kastenholz         ||         
-  RFC1271          ||       S. Waldbusser         ||        waldbusser@andrew.cmu.edu 
-  RFC1272          ||       C. Mills, D. Hirsh, G.R. Ruth         ||         
-  RFC1273          ||       M.F. Schwartz         ||        schwartz@cs.colorado.edu 
-  RFC1274          ||       P. Barker, S. Kille         ||        P.Barker@cs.ucl.ac.uk, S.Kille@cs.ucl.ac.uk 
-  RFC1275          ||      S.E. Hardcastle-Kille         ||       S.Kille@CS.UCL.AC.UK
-  RFC1276          ||       S.E. Hardcastle-Kille         ||        S.Kille@CS.UCL.AC.UK 
-  RFC1277          ||       S.E. Hardcastle-Kille         ||        S.Kille@CS.UCL.AC.UK 
-  RFC1278          ||       S.E. Hardcastle-Kille         ||        S.Kille@CS.UCL.AC.UK 
-  RFC1279          ||      S.E. Hardcastle-Kille         ||       S.Kille@CS.UCL.AC.UK
-  RFC1280          ||       J. Postel         ||         
-  RFC1281          ||       R. Pethia, S. Crocker, B. Fraser         ||        rdp@cert.sei.cmu.edu, crocker@tis.com, byf@cert.sei.cmu.edu 
-  RFC1282          ||      B. Kantor         ||       brian@UCSD.EDU
-  RFC1283          ||       M. Rose         ||         
-  RFC1284          ||       J. Cook, Ed.         ||        kasten@europa.clearpoint.com 
-  RFC1285          ||       J. Case         ||        case@CS.UTK.EDU 
-  RFC1286          ||       E. Decker, P. Langille, A. Rijsinghani, K. McCloghrie         ||        langille@edwin.enet.dec.com, anil@levers.enet.dec.com, kzm@hls.com 
-  RFC1287          ||       D. Clark, L. Chapin, V. Cerf, R. Braden, R. Hobby         ||        ddc@LCS.MIT.EDU, vcerf@nri.reston.va.us, lyman@BBN.COM, braden@isi.edu, rdhobby@ucdavis.edu 
-  RFC1288          ||       D. Zimmerman         ||        dpz@dimacs.rutgers.edu 
-  RFC1289          ||       J. Saperia         ||        saperia@enet.dec.com 
-  RFC1290          ||       J. Martin         ||        jmartin@magnus.acs.ohio-state.edu 
-  RFC1291          ||       V. Aggarwal         ||         
-  RFC1292          ||       R. Lang, R. Wright         ||         
-  RFC1293          ||       T. Bradley, C. Brown         ||         
-  RFC1294          ||       T. Bradley, C. Brown, A. Malis         ||         
-  RFC1295          ||       The North American Directory Forum         ||        0004454742@mcimail.com 
-  RFC1296          ||       M. Lottor         ||        mkl@nisc.sri.com 
-  RFC1297          ||       D. Johnson         ||         
-  RFC1298          ||       R. Wormley, S. Bostock         ||        bwormley@novell.com, steveb@novell.com 
-  RFC1299          ||       M. Kennedy         ||        MKENNEDY@ISI.EDU 
-  RFC1300          ||       S. Greenfield         ||        0004689513@mcimail.com 
-  RFC1301          ||       S. Armstrong, A. Freier, K. Marzullo         ||        armstrong@wrc.xerox.com, freier@apple.com, marzullo@cs.cornell.edu 
-  RFC1302          ||       D. Sitzler, P. Smith, A. Marine         ||         
-  RFC1303          ||       K. McCloghrie, M. Rose         ||        kzm@hls.com, mrose17@gmail.com
-  RFC1304          ||      T. Cox, Ed., K. Tesink, Ed.         ||       tacox@sabre.bellcore.com, kaj@nvuxr.cc.bellcore.com
-  RFC1305          ||      D. Mills         ||       
-  RFC1306          ||       A. Nicholson, J. Young         ||        droid@cray.com, jsy@cray.com 
-  RFC1307          ||       J. Young, A. Nicholson         ||        jsy@cray.com, droid@cray.com 
-  RFC1308          ||       C. Weider, J. Reynolds         ||         
-  RFC1309          ||       C. Weider, J. Reynolds, S. Heker         ||        jkrey@isi.edu 
-  RFC1310          ||       L. Chapin         ||         
-  RFC1311          ||       J. Postel         ||         
-  RFC1312          ||       R. Nelson, G. Arnold         ||        nelson@crynwr.com, geoff@east.sun.com 
-  RFC1313          ||       C. Partridge         ||        craig@aland.bbn.com 
-  RFC1314          ||       A. Katz, D. Cohen         ||        Katz@ISI.Edu, Cohen@ISI.Edu 
-  RFC1315          ||       C. Brown, F. Baker, C. Carvalho         ||        cbrown@wellfleet.com, fbaker@acc.com, charles@acc.com 
-  RFC1316          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
-  RFC1317          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
-  RFC1318          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
-  RFC1319          ||      B. Kaliski         ||       burt@rsa.com
-  RFC1320          ||      R. Rivest         ||       rivest@theory.lcs.mit.edu
-  RFC1321          ||      R. Rivest         ||       rivest@theory.lcs.mit.edu
-  RFC1322          ||       D. Estrin, Y. Rekhter, S. Hotz         ||        estrin@usc.edu, yakov@ibm.com, hotz@usc.edu 
-  RFC1323          ||      V. Jacobson, R. Braden, D. Borman         ||       van@CSAM.LBL.GOV, Braden@ISI.EDU
-  RFC1324          ||       D. Reed         ||         
-  RFC1325          ||       G. Malkin, A. Marine         ||        gmalkin@Xylogics.COM, april@nisc.sri.com 
-  RFC1326          ||       P. Tsuchiya         ||        tsuchiya@thumper.bellcore.com 
-  RFC1327          ||       S. Hardcastle-Kille         ||         
-  RFC1328          ||       S. Hardcastle-Kille         ||        S.Kille@CS.UCL.AC.UK 
-  RFC1329          ||      P. Kuehn         ||       thimmela@sniabg.wa.sni.de
-  RFC1330          ||       ESCC X.500/X.400 Task Force, ESnet Site Coordinating Comittee (ESCC), Energy Sciences Network (ESnet)         ||         
-  RFC1331          ||       W. Simpson         ||        bsimpson@ray.lloyd.com 
-  RFC1332          ||       G. McGregor         ||        Glenn.McGregor@Merit.edu 
-  RFC1333          ||       W. Simpson         ||        bsimpson@ray.lloyd.com 
-  RFC1334          ||       B. Lloyd, W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
-  RFC1335          ||       Z. Wang, J. Crowcroft         ||        z.wang@cs.ucl.ac.uk, j.crowcroft@cs.ucl.ac.uk 
-  RFC1336          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
-  RFC1337          ||       R. Braden         ||        Braden@ISI.EDU 
-  RFC1338          ||       V. Fuller, T. Li, J. Yu, K. Varadhan         ||         
-  RFC1339          ||      S. Dorner, P. Resnick         ||       s-dorner@uiuc.edu, presnick@qti.qualcomm.com
-  RFC1340          ||       J. Reynolds, J. Postel         ||         
-  RFC1341          ||       N. Borenstein, N. Freed         ||         
-  RFC1342          ||       K. Moore         ||        moore@cs.utk.edu 
-  RFC1343          ||       N. Borenstein         ||         
-  RFC1344          ||       N. Borenstein         ||         
-  RFC1345          ||       K. Simonsen         ||         
-  RFC1346          ||       P. Jones         ||         
-  RFC1347          ||       R. Callon         ||         
-  RFC1348          ||       B. Manning         ||        bmanning@rice.edu 
-  RFC1349          ||       P. Almquist         ||         
-  RFC1350          ||       K. Sollins         ||        SOLLINS@LCS.MIT.EDU 
-  RFC1351          ||       J. Davin, J. Galvin, K. McCloghrie         ||        jrd@ptt.lcs.mit.edu, galvin@tis.com, kzm@hls.com 
-  RFC1352          ||       J. Galvin, K. McCloghrie, J. Davin         ||        galvin@tis.com, kzm@hls.com, jrd@ptt.lcs.mit.edu 
-  RFC1353          ||       K. McCloghrie, J. Davin, J. Galvin         ||        kzm@hls.com, jrd@ptt.lcs.mit.edu, galvin@tis.com 
-  RFC1354          ||       F. Baker         ||        fbaker@acc.com 
-  RFC1355          ||       J. Curran, A. Marine         ||        jcurran@nnsc.nsf.net, april@nisc.sri.com 
-  RFC1356          ||       A. Malis, D. Robinson, R. Ullmann         ||         
-  RFC1357          ||       D. Cohen         ||        Cohen@ISI.EDU 
-  RFC1358          ||       L. Chapin         ||        lyman@BBN.COM 
-  RFC1359          ||       ACM SIGUCCS         ||        martyne@nr-tech.cit.cornell.edu 
-  RFC1360          ||       J. Postel         ||         
-  RFC1361          ||       D. Mills         ||        mills@udel.edu 
-  RFC1362          ||       M. Allen         ||        MALLEN@NOVELL.COM, brian@ray.lloyd.com 
-  RFC1363          ||       C. Partridge         ||        craig@aland.bbn.com 
-  RFC1364          ||       K. Varadhan         ||        kannan@oar.net 
-  RFC1365          ||       K. Siyan         ||        72550.1634@compuserve.com 
-  RFC1366          ||       E. Gerich         ||        epg@MERIT.EDU 
-  RFC1367          ||       C. Topolcic         ||        topolcic@NRI.Reston.VA.US 
-  RFC1368          ||       D. McMaster, K. McCloghrie         ||        mcmaster@synoptics.com, kzm@hls.com 
-  RFC1369          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1370          ||       Internet Architecture Board, L. Chapin         ||         
-  RFC1371          ||       P. Gross         ||        pgross@ans.net 
-  RFC1372          ||       C. Hedrick, D. Borman         ||         
-  RFC1373          ||       T. Tignor         ||        tpt2@isi.edu 
-  RFC1374          ||       J. Renwick, A. Nicholson         ||        jkr@CRAY.COM, droid@CRAY.COM 
-  RFC1375          ||       P. Robinson         ||         
-  RFC1376          ||       S. Senum         ||        sjs@network.com 
-  RFC1377          ||       D. Katz         ||        dkatz@cisco.com 
-  RFC1378          ||       B. Parker         ||        brad@cayman.com 
-  RFC1379          ||      R. Braden         ||       Braden@ISI.EDU
-  RFC1380          ||       P. Gross, P. Almquist         ||        pgross@ans.net, Almquist@JESSICA.STANFORD.EDU 
-  RFC1381          ||       D. Throop, F. Baker         ||        throop@dg-rtp.dg.com, fbaker@acc.com 
-  RFC1382          ||       D. Throop, Ed.         ||        throop@dg-rtp.dg.com 
-  RFC1383          ||       C. Huitema         ||        Christian.Huitema@MIRSA.INRIA.FR 
-  RFC1384          ||       P. Barker, S.E. Hardcastle-Kille         ||        P.Barker@CS.UCL.AC.UK, S.Kille@ISODE.COM 
-  RFC1385          ||      Z. Wang         ||       z.wang@cs.ucl.ac.uk
-  RFC1386          ||       A. Cooper, J. Postel         ||         
-  RFC1387          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
-  RFC1388          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
-  RFC1389          ||       G. Malkin, F. Baker         ||        gmalkin@Xylogics.COM, fbaker@acc.com 
-  RFC1390          ||       D. Katz         ||        dkatz@cisco.com 
-  RFC1391          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
-  RFC1392          ||       G. Malkin, T. LaQuey Parker         ||        gmalkin@Xylogics.COM, tracy@utexas.edu 
-  RFC1393          ||      G. Malkin         ||       gmalkin@Xylogics.COM
-  RFC1394          ||       P. Robinson         ||         
-  RFC1395          ||       J. Reynolds         ||        jkrey@isi.edu 
-  RFC1396          ||       S. Crocker         ||         
-  RFC1397          ||       D. Haskin         ||         
-  RFC1398          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1399          ||       J. Elliott         ||        elliott@isi.edu 
-  RFC1400          ||       S. Williamson         ||        scottw@internic.net 
-  RFC1401          ||       Internet Architecture Board         ||         
-  RFC1402          ||       J. Martin         ||        nic@osu.edu 
-  RFC1403          ||       K. Varadhan         ||         
-  RFC1404          ||       B. Stockman         ||         
-  RFC1405          ||       C. Allocchio         ||        Claudio.Allocchio@elettra.Trieste.it 
-  RFC1406          ||      F. Baker, Ed., J. Watt, Ed.         ||       fbaker@acc.com, james@newbridge.com
-  RFC1407          ||       T. Cox, K. Tesink         ||        tacox@mail.bellcore.com, kaj@cc.bellcore.com 
-  RFC1408          ||       D. Borman, Ed.         ||        dab@CRAY.COM, stevea@isc.com 
-  RFC1409          ||       D. Borman, Ed.         ||        dab@CRAY.COM, stevea@isc.com 
-  RFC1410          ||       J. Postel, Ed.         ||         
-  RFC1411          ||       D. Borman, Ed.         ||        dab@CRAY.COM, stevea@isc.com 
-  RFC1412          ||       K. Alagappan         ||        kannan@sejour.lkg.dec.com, stevea@isc.com 
-  RFC1413          ||       M. St. Johns         ||        stjohns@DARPA.MIL 
-  RFC1414          ||       M. St. Johns, M. Rose         ||        stjohns@DARPA.MIL, mrose17@gmail.com
-  RFC1415          ||       J. Mindel, R. Slaski         ||         
-  RFC1416          ||       D. Borman, Ed.         ||        dab@CRAY.COM, stevea@isc.com 
-  RFC1417          ||       The North American Directory Forum         ||        0004454742@mcimail.com 
-  RFC1418          ||       M. Rose         ||       mrose17@gmail.com
-  RFC1419          ||       G. Minshall, M. Ritter         ||        minshall@wc.novell.com, MWRITTER@applelink.apple.com 
-  RFC1420          ||       S. Bostock         ||         
-  RFC1421          ||      J. Linn         ||       104-8456@mcimail.com
-  RFC1422          ||       S. Kent         ||        kent@BBN.COM 
-  RFC1423          ||      D. Balenson         ||       balenson@tis.com
-  RFC1424          ||       B. Kaliski         ||        burt@rsa.com 
-  RFC1425          ||       J. Klensin, WG Chair, N. Freed, Ed., M. Rose, E. Stefferud, D. Crocker         ||         
-  RFC1426          ||       J. Klensin, WG Chair, N. Freed, Ed., M. Rose, E. Stefferud, D. Crocker         ||         
-  RFC1427          ||       J. Klensin, WG Chair, N. Freed, Ed., K. Moore         ||         
-  RFC1428          ||       G. Vaudreuil         ||        GVaudre@CNRI.Reston.VA.US 
-  RFC1429          ||       E. Thomas         ||         
-  RFC1430          ||       S. Hardcastle-Kille, E. Huizer, V. Cerf, R. Hobby, S. Kent         ||        S.Kille@isode.com, vcerf@cnri.reston.va.us, rdhobby@ucdavis.edu, skent@bbn.com 
-  RFC1431          ||       P. Barker         ||         
-  RFC1432          ||       J. Quarterman         ||        jsq@tic.com, mids@tic.com 
-  RFC1433          ||       J. Garrett, J. Hagan, J. Wong         ||        jwg@garage.att.com, Hagan@UPENN.EDU, jwong@garage.att.com 
-  RFC1434          ||       R. Dixon, D. Kushi         ||        rcdixon@ralvmg.vnet.ibm.com, kushi@watson.ibm.com 
-  RFC1435          ||       S. Knowles         ||        stev@ftp.com 
-  RFC1436          ||       F. Anklesaria, M. McCahill, P. Lindner, D. Johnson, D. Torrey, B. Albert         ||        fxa@boombox.micro.umn.edu, mpm@boombox.micro.umn.edu, lindner@boombox.micro.umn.edu, dmj@boombox.micro.umn.edu, daniel@boombox.micro.umn.edu, alberti@boombox.micro.umn.edu 
-  RFC1437          ||       N. Borenstein, M. Linimon         ||        nsb@bellcore.com, linimon@LONESOME.COM 
-  RFC1438          ||       A. Lyman Chapin, C. Huitema         ||        Lyman@BBN.COM, Christian.Huitema@MIRSA.INRIA.FR 
-  RFC1439          ||       C. Finseth         ||        Craig.A.Finseth-1@umn.edu 
-  RFC1440          ||       R. Troth         ||        troth@rice.edu 
-  RFC1441          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1442          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1443          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1444          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1445          ||       J. Galvin, K. McCloghrie         ||        galvin@tis.com 
-  RFC1446          ||       J. Galvin, K. McCloghrie         ||        galvin@tis.com 
-  RFC1447          ||       K. McCloghrie, J. Galvin         ||        galvin@tis.com 
-  RFC1448          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1449          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1450          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1451          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1452          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1453          ||       W. Chimiak         ||        chim@relito.medeng.wfu.edu 
-  RFC1454          ||       T. Dixon         ||        dixon@rare.nl 
-  RFC1455          ||       D. Eastlake 3rd         ||         
-  RFC1456          ||       Vietnamese Standardization Working Group         ||         
-  RFC1457          ||       R. Housley         ||        Housley.McLean_CSD@Xerox.COM 
-  RFC1458          ||       R. Braudes, S. Zabele         ||        rebraudes@tasc.com, gszabele@tasc.com 
-  RFC1459          ||      J. Oikarinen, D. Reed         ||       
-  RFC1460          ||       M. Rose         ||       mrose17@gmail.com
-  RFC1461          ||       D. Throop         ||        throop@dg-rtp.dg.com 
-  RFC1462          ||       E. Krol, E. Hoffman         ||        e-krol@uiuc.edu, ellen@merit.edu 
-  RFC1463          ||       E. Hoffman, L. Jackson         ||         
-  RFC1464          ||       R. Rosenbaum         ||         
-  RFC1465          ||       D. Eppenberger         ||        Eppenberger@switch.ch 
-  RFC1466          ||       E. Gerich         ||        epg@MERIT.EDU 
-  RFC1467          ||       C. Topolcic         ||        topolcic@CNRI.Reston.VA.US 
-  RFC1468          ||       J. Murai, M. Crispin, E. van der Poel         ||        jun@wide.ad.jp, MRC@PANDA.COM, erik@poel.juice.or.jp 
-  RFC1469          ||       T. Pusateri         ||        pusateri@cs.duke.edu 
-  RFC1470          ||       R. Enger, J. Reynolds         ||        enger@reston.ans.net 
-  RFC1471          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1472          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1473          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1474          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1475          ||      R. Ullmann         ||       
-  RFC1476          ||       R. Ullmann         ||         
-  RFC1477          ||      M. Steenstrup         ||       
-  RFC1478          ||       M. Steenstrup         ||         
-  RFC1479          ||       M. Steenstrup         ||         
-  RFC1480          ||       A. Cooper, J. Postel         ||         
-  RFC1481          ||       C. Huitema         ||        Christian.Huitema@MIRSA.INRIA.FR 
-  RFC1482          ||       M. Knopper, S. Richardson         ||         
-  RFC1483          ||       Juha Heinanen         ||         
-  RFC1484          ||       S. Hardcastle-Kille         ||        S.Kille@ISODE.COM 
-  RFC1485          ||       S. Hardcastle-Kille         ||        S.Kille@ISODE.COM 
-  RFC1486          ||       M. Rose, C. Malamud         ||       mrose17@gmail.com,  carl@malamud.com 
-  RFC1487          ||       W. Yeong, T. Howes, S. Kille         ||        yeongw@psilink.com, tim@umich.edu, S.Kille@isode.com 
-  RFC1488          ||       T. Howes, S. Kille, W. Yeong, C. Robbins         ||        tim@umich.edu, S.Kille@isode.com, yeongw@psilink.com 
-  RFC1489          ||       A. Chernov         ||        ache@astral.msk.su 
-  RFC1490          ||       T. Bradley, C. Brown, A. Malis         ||         
-  RFC1491          ||       C. Weider, R. Wright         ||        clw@merit.edu, wright@lbl.gov 
-  RFC1492          ||       C. Finseth         ||        Craig.A.Finseth-1@umn.edu 
-  RFC1493          ||       E. Decker, P. Langille, A. Rijsinghani, K. McCloghrie         ||        langille@edwin.enet.dec.com, anil@levers.enet.dec.com, kzm@hls.com 
-  RFC1494          ||       H. Alvestrand, S. Thompson         ||        Harald.Alvestrand@delab.sintef.no, sjt@gateway.ssw.com 
-  RFC1495          ||       H. Alvestrand, S. Kille, R. Miles, M. Rose, S. Thompson         ||        Harald.Alvestrand@delab.sintef.no,  S.Kille@ISODE.COM,  rsm@spyder.ssw.com, mrose17@gmail.com,  sjt@gateway.ssw.com 
-  RFC1496          ||       H. Alvestrand, J. Romaguera, K. Jordan         ||        Harald.T.Alvestrand@delab.sintef.no, Kevin.E.Jordan@mercury.oss.arh.cpg.cdc.com, Romaguera@netconsult.ch 
-  RFC1497          ||       J. Reynolds         ||        jkrey@isi.edu 
-  RFC1498          ||       J. Saltzer         ||        Saltzer@MIT.EDU 
-  RFC1499          ||       J. Elliott         ||        elliott@isi.edu 
-  RFC1500          ||       J. Postel         ||         
-  RFC1501          ||       E. Brunsen         ||        BRUNSENE@EMAIL.ENMU.EDU 
-  RFC1502          ||       H. Alvestrand         ||        Harald.Alvestrand@delab.sintef.no 
-  RFC1503          ||       K. McCloghrie, M. Rose         ||        kzm@hls.com, mrose17@gmail.com
-  RFC1504          ||       A. Oppenheimer         ||        Oppenheime1@applelink.apple.com 
-  RFC1505          ||       A. Costanzo, D. Robinson, R. Ullmann         ||         
-  RFC1506          ||       J. Houttuin         ||         
-  RFC1507          ||       C. Kaufman         ||         
-  RFC1508          ||       J. Linn         ||         
-  RFC1509          ||       J. Wray         ||        Wray@tuxedo.enet.dec.com 
-  RFC1510          ||      J. Kohl, C. Neuman         ||       jtkohl@zk3.dec.com, bcn@isi.edu
-  RFC1511          ||       J. Linn         ||         
-  RFC1512          ||       J. Case, A. Rijsinghani         ||        case@CS.UTK.EDU, anil@levers.enet.dec.com 
-  RFC1513          ||       S. Waldbusser         ||        waldbusser@cmu.edu 
-  RFC1514          ||       P. Grillo, S. Waldbusser         ||        pl0143@mail.psi.net, waldbusser@cmu.edu 
-  RFC1515          ||       D. McMaster, K. McCloghrie, S. Roberts         ||        mcmaster@synoptics.com, kzm@hls.com, sroberts@farallon.com 
-  RFC1516          ||       D. McMaster, K. McCloghrie         ||        mcmaster@synoptics.com, kzm@hls.com 
-  RFC1517          ||      Internet Engineering Steering Group, R. Hinden         ||       bob.hinden@gmail.com
-  RFC1518          ||       Y. Rekhter, T. Li         ||        yakov@watson.ibm.com, tli@cisco.com 
-  RFC1519          ||       V. Fuller, T. Li, J. Yu, K. Varadhan         ||        vaf@Stanford.EDU, tli@cisco.com, jyy@merit.edu, kannan@oar.net 
-  RFC1520          ||       Y. Rekhter, C. Topolcic         ||        yakov@watson.ibm.com, topolcic@CNRI.Reston.VA.US 
-  RFC1521          ||       N. Borenstein, N. Freed         ||        gvaudre@cnri.reston.va.us 
-  RFC1522          ||       K. Moore         ||        moore@cs.utk.edu 
-  RFC1523          ||       N. Borenstein         ||        nsb@bellcore.com 
-  RFC1524          ||       N. Borenstein         ||        nsb@bellcore.com 
-  RFC1525          ||       E. Decker, K. McCloghrie, P. Langille, A. Rijsinghani         ||        kzm@hls.com, langille@edwin.enet.dec.com, anil@levers.enet.dec.com 
-  RFC1526          ||       D. Piscitello         ||        dave@mail.bellcore.com 
-  RFC1527          ||       G. Cook         ||        cook@path.net 
-  RFC1528          ||       C. Malamud, M. Rose         ||         
-  RFC1529          ||       C. Malamud, M. Rose         ||         
-  RFC1530          ||       C. Malamud, M. Rose         ||         
-  RFC1531          ||       R. Droms         ||        droms@bucknell.edu 
-  RFC1532          ||       W. Wimer         ||        Walter.Wimer@CMU.EDU 
-  RFC1533          ||       S. Alexander, R. Droms         ||        stevea@lachman.com, droms@bucknell.edu 
-  RFC1534          ||       R. Droms         ||        droms@bucknell.edu 
-  RFC1535          ||       E. Gavron         ||        gavron@aces.com 
-  RFC1536          ||       A. Kumar, J. Postel, C. Neuman, P. Danzig, S. Miller         ||        anant@isi.edu, postel@isi.edu, bcn@isi.edu, danzig@caldera.usc.edu, smiller@caldera.usc.edu 
-  RFC1537          ||       P. Beertema         ||        Piet.Beertema@cwi.nl, anant@isi.edu 
-  RFC1538          ||       W. Behl, B. Sterling, W. Teskey         ||         
-  RFC1539          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
-  RFC1540          ||       J. Postel         ||         
-  RFC1541          ||       R. Droms         ||        droms@bucknell.edu 
-  RFC1542          ||      W. Wimer         ||       Walter.Wimer@CMU.EDU
-  RFC1543          ||      J. Postel         ||       Postel@ISI.EDU, dwaitzman@BBN.COM
-  RFC1544          ||       M. Rose         ||       mrose17@gmail.com
-  RFC1545          ||       D. Piscitello         ||        dave@mail.bellcore.com 
-  RFC1546          ||      C. Partridge, T. Mendez, W. Milliken         ||       craig@bbn.com, tmendez@bbn.com, milliken@bbn.com
-  RFC1547          ||       D. Perkins         ||        Bill.Simpson@um.cc.umich.edu 
-  RFC1548          ||       W. Simpson         ||         
-  RFC1549          ||       W. Simpson, Ed.         ||         
-  RFC1550          ||       S. Bradner, A. Mankin         ||        sob@harvard.edu, mankin@cmf.nrl.navy.mil 
-  RFC1551          ||       M. Allen         ||        mallen@novell.com, fbaker@acc.com 
-  RFC1552          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
-  RFC1553          ||       S. Mathur, M. Lewis         ||        mathur@telebit.com, Mark.S.Lewis@telebit.com 
-  RFC1554          ||       M. Ohta, K. Handa         ||        mohta@cc.titech.ac.jp, handa@etl.go.jp 
-  RFC1555          ||       H. Nussbacher, Y. Bourvine         ||        hank@vm.tau.ac.il, yehavi@vms.huji.ac.il 
-  RFC1556          ||       H. Nussbacher         ||        hank@vm.tau.ac.il 
-  RFC1557          ||       U. Choi, K. Chon, H. Park         ||        uhhyung@kaist.ac.kr, chon@cosmos.kaist.ac.kr, hjpark@dino.media.co.kr 
-  RFC1558          ||       T. Howes         ||        tim@umich.edu 
-  RFC1559          ||       J. Saperia         ||        saperia@tay.dec.com 
-  RFC1560          ||       B. Leiner, Y. Rekhter         ||        leiner@nsipo.nasa.gov, yakov@watson.ibm.com 
-  RFC1561          ||       D. Piscitello         ||        wk04464@worldlink.com 
-  RFC1562          ||       G. Michaelson, M. Prior         ||        G.Michaelson@cc.uq.oz.au, mrp@itd.adelaide.edu.au 
-  RFC1563          ||       N. Borenstein         ||        nsb@bellcore.com 
-  RFC1564          ||       P. Barker, R. Hedberg         ||        P.Barker@cs.ucl.ac.uk, Roland.Hedberg@rc.tudelft.nl, Roland.Hedberg@umdac.umu.se 
-  RFC1565          ||       S. Kille, N. Freed         ||        S.Kille@isode.com, ned@innosoft.com 
-  RFC1566          ||       S. Kille, N. Freed         ||        S.Kille@isode.com, ned@innosoft.com 
-  RFC1567          ||       G. Mansfield, S. Kille         ||        glenn@aic.co.jp, S.Kille@isode.com 
-  RFC1568          ||       A. Gwinn         ||        allen@mail.cox.smu.edu 
-  RFC1569          ||       M. Rose         ||       mrose17@gmail.com
-  RFC1570          ||       W. Simpson, Ed.         ||         
-  RFC1571          ||       D. Borman         ||        dab@CRAY.COM 
-  RFC1572          ||       S. Alexander, Ed.         ||         
-  RFC1573          ||       K. McCloghrie, F. Kastenholz         ||        kzm@hls.com, kasten@ftp.com 
-  RFC1574          ||       S. Hares, C. Wittbrodt         ||        skh@merit.edu, cjw@magnolia.Stanford.EDU 
-  RFC1575          ||       S. Hares, C. Wittbrodt         ||        skh@merit.edu, cjw@magnolia.Stanford.EDU 
-  RFC1576          ||       J. Penner         ||        jjp@bscs.com 
-  RFC1577          ||       M. Laubach         ||        laubach@hpl.hp.com 
-  RFC1578          ||       J. Sellers         ||        sellers@quest.arc.nasa.gov 
-  RFC1579          ||       S. Bellovin         ||        smb@research.att.com 
-  RFC1580          ||       EARN Staff         ||        earndoc@earncc.earn.net 
-  RFC1581          ||       G. Meyer         ||        gerry@spider.co.uk 
-  RFC1582          ||       G. Meyer         ||        gerry@spider.co.uk 
-  RFC1583          ||       J. Moy         ||         
-  RFC1584          ||      J. Moy         ||       
-  RFC1585          ||       J. Moy         ||        jmoy@proteon.com 
-  RFC1586          ||       O. deSouza, M. Rodrigues         ||        osmund.desouza@att.com, manoel.rodrigues@att.com 
-  RFC1587          ||       R. Coltun, V. Fuller         ||        rcoltun@rainbow-bridge.com, vaf@Valinor.Stanford.EDU 
-  RFC1588          ||       J. Postel, C. Anderson         ||         
-  RFC1589          ||       D. Mills         ||        mills@udel.edu 
-  RFC1590          ||       J. Postel         ||        Postel@ISI.EDU 
-  RFC1591          ||       J. Postel         ||        Postel@ISI.EDU 
-  RFC1592          ||       B. Wijnen, G. Carpenter, K. Curran, A. Sehgal, G. Waters         ||         
-  RFC1593          ||       W. McKenzie, J. Cheng         ||        mckenzie@ralvma.vnet.ibm.com, cheng@ralvm6.vnet.ibm.com 
-  RFC1594          ||       A. Marine, J. Reynolds, G. Malkin         ||        amarine@atlas.arc.nasa.gov, jkrey@isi.edu, gmalkin@Xylogics.COM 
-  RFC1595          ||       T. Brown, K. Tesink         ||        tacox@mail.bellcore.com, kaj@cc.bellcore.com 
-  RFC1596          ||       T. Brown, Ed.         ||        tacox@mail.bellcore.com 
-  RFC1597          ||       Y. Rekhter, B. Moskowitz, D. Karrenberg, G. de Groot         ||        yakov@watson.ibm.com, 3858921@mcimail.com, Daniel.Karrenberg@ripe.net, GeertJan.deGroot@ripe.net 
-  RFC1598          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
-  RFC1599          ||       M. Kennedy         ||        MKENNEDY@ISI.EDU 
-  RFC1600          ||       J. Postel         ||         
-  RFC1601          ||       C. Huitema         ||        Christian.Huitema@sophia.inria.fr 
-  RFC1602          ||      Internet Architecture Board, Internet Engineering Steering Group         ||       Christian.Huitema@MIRSA.INRIA.FR, 0006423401@mcimail.com
-  RFC1603          ||       E. Huizer, D. Crocker         ||         
-  RFC1604          ||       T. Brown, Ed.         ||        tacox@mail.bellcore.com 
-  RFC1605          ||       W. Shakespeare         ||         
-  RFC1606          ||       J. Onions         ||        j.onions@nexor.co.uk 
-  RFC1607          ||       V. Cerf         ||        vcerf@isoc.org, vinton_cerf@mcimail.com 
-  RFC1608          ||       T. Johannsen, G. Mansfield, M. Kosters, S. Sataluri         ||        Thomas.Johannsen@ifn.et.tu-dresden.de, glenn@aic.co.jp, markk@internic.net, sri@qsun.att.com 
-  RFC1609          ||       G. Mansfield, T. Johannsen, M. Knopper         ||        glenn@aic.co.jp, Thomas.Johannsen@ifn.et.tu-dresden.de, mak@merit.edu 
-  RFC1610          ||       J. Postel         ||         
-  RFC1611          ||       R. Austein, J. Saperia         ||        sra@epilogue.com, saperia@zko.dec.com 
-  RFC1612          ||       R. Austein, J. Saperia         ||        sra@epilogue.com, saperia@zko.dec.com 
-  RFC1613          ||       J. Forster, G. Satz, G. Glick, R. Day         ||        forster@cisco.com, satz@cisco.com, gglick@cisco.com, R.Day@jnt.ac.uk 
-  RFC1614          ||       C. Adie         ||        C.J.Adie@edinburgh.ac.uk 
-  RFC1615          ||       J. Houttuin, J. Craigie         ||         
-  RFC1616          ||      RARE WG-MSG Task Force 88, E. Huizer, Ed., J. Romaguera, Ed.         ||       
-  RFC1617          ||       P. Barker, S. Kille, T. Lenggenhager         ||        p.barker@cs.ucl.ac.uk, s.kille@isode.com, lenggenhager@switch.ch 
-  RFC1618          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
-  RFC1619          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
-  RFC1620          ||       B. Braden, J. Postel, Y. Rekhter         ||        Braden@ISI.EDU, Postel@ISI.EDU, Yakov@WATSON.IBM.COM 
-  RFC1621          ||       P. Francis         ||        francis@cactus.ntt.jp 
-  RFC1622          ||       P. Francis         ||        francis@cactus.ntt.jp 
-  RFC1623          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1624          ||       A. Rijsinghani, Ed.         ||        anil@levers.enet.dec.com 
-  RFC1625          ||       M. St. Pierre, J. Fullton, K. Gamiel, J. Goldman, B. Kahle, J. Kunze, H. Morris, F. Schiettecatte         ||        saint@wais.com, jim.fullton@cnidr.org, kevin.gamiel@cnidr.org, jonathan@think.com, brewster@wais.com, jak@violet.berkeley.edu, morris@wais.com, francois@wais.com 
-  RFC1626          ||       R. Atkinson         ||        atkinson@itd.nrl.navy.mil 
-  RFC1627          ||       E. Lear, E. Fair, D. Crocker, T. Kessler         ||         
-  RFC1628          ||       J. Case, Ed.         ||        case@SNMP.COM 
-  RFC1629          ||       R. Colella, R. Callon, E. Gardner, Y. Rekhter         ||        colella@nist.gov, callon@wellfleet.com, epg@gateway.mitre.org, yakov@watson.ibm.com 
-  RFC1630          ||       T. Berners-Lee         ||        timbl@info.cern.ch 
-  RFC1631          ||       K. Egevang, P. Francis         ||        kbe@craycom.dk, francis@cactus.ntt.jp 
-  RFC1632          ||      A. Getchell, Ed., S. Sataluri, Ed.         ||       
-  RFC1633          ||       R. Braden, D. Clark, S. Shenker         ||        Braden@ISI.EDU, ddc@LCS.MIT.EDU, Shenker@PARC.XEROX.COM 
-  RFC1634          ||       M. Allen         ||        mallen@novell.com, fbaker@acc.com 
-  RFC1635          ||       P. Deutsch, A. Emtage, A. Marine         ||        peterd@bunyip.com, bajan@bunyip.com, amarine@atlas.arc.nasa.gov 
-  RFC1636          ||       R. Braden, D. Clark, S. Crocker, C. Huitema         ||        Braden@ISI.EDU, ddc@lcs.mit.edu, crocker@tis.com, Christian.Huitema@MIRSA.INRIA.FR 
-  RFC1637          ||       B. Manning, R. Colella         ||        bmanning@rice.edu, colella@nist.gov 
-  RFC1638          ||       F. Baker, R. Bowen         ||        Rich_Bowen@vnet.ibm.com 
-  RFC1639          ||       D. Piscitello         ||        dave@corecom.com 
-  RFC1640          ||       S. Crocker         ||        crocker@TIS.COM 
-  RFC1641          ||       D. Goldsmith, M. Davis         ||        david_goldsmith@taligent.com, mark_davis@taligent.com 
-  RFC1642          ||       D. Goldsmith, M. Davis         ||        david_goldsmith@taligent.com, mark_davis@taligent.com 
-  RFC1643          ||      F. Kastenholz         ||       kasten@ftp.com
-  RFC1644          ||      R. Braden         ||       Braden@ISI.EDU
-  RFC1645          ||       A. Gwinn         ||        allen@mail.cox.smu.edu 
-  RFC1646          ||       C. Graves, T. Butts, M. Angel         ||        cvg@oc.com, tom@oc.com, angel@oc.com 
-  RFC1647          ||       B. Kelly         ||        kellywh@mail.auburn.edu 
-  RFC1648          ||       A. Cargille         ||         
-  RFC1649          ||       R. Hagens, A. Hansen         ||        hagens@ans.net, Alf.Hansen@uninett.no 
-  RFC1650          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1651          ||       J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker         ||        klensin@mci.net,  ned@innosoft.com, mrose17@gmail.com,  stef@nma.com,  dcrocker@sgi.com 
-  RFC1652          ||      J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker         ||       klensin@mci.net, ned@innosoft.com, mrose17@gmail.com, stef@nma.com, dcrocker@sgi.com
-  RFC1653          ||       J. Klensin, N. Freed, K. Moore         ||        klensin@mci.net, ned@innosoft.com, moore@cs.utk.edu 
-  RFC1654          ||      Y. Rekhter, Ed., T. Li, Ed.         ||       
-  RFC1655          ||      Y. Rekhter, Ed., P. Gross, Ed.         ||       yakov@watson.ibm.com, 0006423401@mcimail.com
-  RFC1656          ||      P. Traina         ||       pst@cisco.com
-  RFC1657          ||       S. Willis, J. Burruss, J. Chu, Ed.         ||        swillis@wellfleet.com, jburruss@wellfleet.com, jychu@watson.ibm.com 
-  RFC1658          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
-  RFC1659          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
-  RFC1660          ||       B. Stewart         ||        rlstewart@eng.xyplex.com 
-  RFC1661          ||       W. Simpson, Ed.         ||         
-  RFC1662          ||       W. Simpson, Ed.         ||         
-  RFC1663          ||       D. Rand         ||        dave_rand@novell.com 
-  RFC1664          ||       C. Allocchio, A. Bonito, B. Cole, S. Giordano, R. Hagens         ||         
-  RFC1665          ||      Z. Kielczewski, Ed., D. Kostick, Ed., K. Shih, Ed.         ||       zbig@eicon.qc.ca, dck2@mail.bellcore.com, kmshih@novell.com
-  RFC1666          ||      Z. Kielczewski, Ed., D. Kostick, Ed., K. Shih, Ed.         ||       zbig@eicon.qc.ca, dck2@mail.bellcore.com, kmshih@novell.com
-  RFC1667          ||       S. Symington, D. Wood, M. Pullen         ||        susan@gateway.mitre.org, wood@mitre.org, mpullen@cs.gmu.edu 
-  RFC1668          ||       D. Estrin, T. Li, Y. Rekhter         ||        estrin@usc.edu, tli@cisco.com, yakov@watson.ibm.com 
-  RFC1669          ||       J. Curran         ||        jcurran@near.net 
-  RFC1670          ||       D. Heagerty         ||        denise@dxcoms.cern.ch 
-  RFC1671          ||       B. Carpenter         ||        brian@dxcoms.cern.ch 
-  RFC1672          ||       N. Brownlee         ||        n.brownlee@auckland.ac.nz 
-  RFC1673          ||       R. Skelton         ||        RSKELTON@msm.epri.com 
-  RFC1674          ||       M. Taylor         ||        mark.s.taylor@airdata.com 
-  RFC1675          ||       S. Bellovin         ||        smb@research.att.com 
-  RFC1676          ||       A. Ghiselli, D. Salomoni, C. Vistoli         ||        Salomoni@infn.it, Vistoli@infn.it, Ghiselli@infn.it 
-  RFC1677          ||       B. Adamson         ||        adamson@itd.nrl.navy.mil 
-  RFC1678          ||       E. Britton, J. Tavs         ||        brittone@vnet.ibm.com, tavs@vnet.ibm.com 
-  RFC1679          ||       D. Green, P. Irey, D. Marlow, K. O'Donoghue         ||        dtgreen@relay.nswc.navy.mil, pirey@relay.nswc.navy.mil, dmarlow@relay.nswc.navy.mil, kodonog@relay.nswc.navy.mil 
-  RFC1680          ||       C. Brazdziunas         ||        crb@faline.bellcore.com 
-  RFC1681          ||       S. Bellovin         ||        smb@research.att.com 
-  RFC1682          ||       J. Bound         ||        bound@zk3.dec.com 
-  RFC1683          ||       R. Clark, M. Ammar, K. Calvert         ||        rjc@cc.gatech.edu, ammar@cc.gatech.edu, calvert@cc.gatech.edu 
-  RFC1684          ||       P. Jurg         ||         
-  RFC1685          ||       H. Alvestrand         ||         
-  RFC1686          ||       M. Vecchi         ||        mpvecchi@twcable.com 
-  RFC1687          ||       E. Fleischman         ||        ericf@atc.boeing.com 
-  RFC1688          ||       W. Simpson         ||        Bill.Simpson@um.cc.umich.edu 
-  RFC1689          ||       J. Foster, Ed.         ||         
-  RFC1690          ||       G. Huston         ||        Geoff.Huston@aarnet.edu.au 
-  RFC1691          ||       W. Turner         ||        wrt1@cornell.edu 
-  RFC1692          ||       P. Cameron, D. Crocker, D. Cohen, J. Postel         ||        cameron@xylint.co.uk, dcrocker@sgi.com, Cohen@myricom.com, Postel@ISI.EDU 
-  RFC1693          ||      T.  Connolly, P. Amer, P. Conrad         ||       connolly@udel.edu, amer@udel.edu, pconrad@udel.edu
-  RFC1694          ||      T. Brown, Ed., K. Tesink, Ed.         ||       tacox@mail.bellcore.com, kaj@cc.bellcore.com
-  RFC1695          ||      M. Ahmed, Ed., K. Tesink, Ed.         ||       mxa@mail.bellcore.com, kaj@cc.bellcore.com
-  RFC1696          ||       J. Barnes, L. Brown, R. Royston, S. Waldbusser         ||        barnes@xylogics.com, brown_l@msm.cdx.mot.com, rroyston@usr.com, swol@andrew.cmu.edu 
-  RFC1697          ||       D. Brower, Ed., B. Purvy, A. Daniel, M. Sinykin, J. Smith         ||        daveb@ingres.com, bpurvy@us.oracle.com, anthony@informix.com, msinykin@us.oracle.com, jaysmith@us.oracle.com 
-  RFC1698          ||       P. Furniss         ||        P.Furniss@ulcc.ac.uk 
-  RFC1699          ||       J. Elliott         ||        elliott@isi.edu 
-  RFC1700          ||      J. Reynolds, J. Postel         ||       jkrey@isi.edu, postel@isi.edu
-  RFC1701          ||       S. Hanks, T. Li, D. Farinacci, P. Traina         ||        stan@netsmiths.com, tli@cisco.com, dino@cisco.com, pst@cisco.com 
-  RFC1702          ||       S. Hanks, T. Li, D. Farinacci, P. Traina         ||        stan@netsmiths.com, tli@cisco.com, dino@cisco.com, pst@cisco.com 
-  RFC1703          ||       M. Rose         ||       mrose17@gmail.com
-  RFC1704          ||       N. Haller, R. Atkinson         ||         
-  RFC1705          ||       R. Carlson, D. Ficarella         ||        RACarlson@anl.gov, ficarell@cpdmfg.cig.mot.com 
-  RFC1706          ||       B. Manning, R. Colella         ||        bmanning@isi.edu, colella@nist.gov 
-  RFC1707          ||       M. McGovern, R. Ullmann         ||        scrivner@world.std.com, rullmann@crd.lotus.com 
-  RFC1708          ||       D. Gowin         ||        drg508@crane-ns.nwscc.sea06.navy.MIL 
-  RFC1709          ||       J. Gargano, D. Wasley         ||        jcgargano@ucdavis.edu, dlw@berkeley.edu 
-  RFC1710          ||      R. Hinden         ||       bob.hinden@gmail.com
-  RFC1711          ||       J. Houttuin         ||        houttuin@rare.nl 
-  RFC1712          ||       C. Farrell, M. Schulze, S. Pleitner, D. Baldoni         ||        craig@cs.curtin.edu.au, mike@cs.curtin.edu.au, pleitner@cs.curtin.edu.au, flint@cs.curtin.edu.au 
-  RFC1713          ||       A. Romao         ||        artur@fct.unl.pt 
-  RFC1714          ||       S. Williamson, M. Kosters         ||        scottw@internic.net, markk@internic.net 
-  RFC1715          ||       C. Huitema         ||        Christian.Huitema@MIRSA.INRIA.FR 
-  RFC1716          ||       P. Almquist, F. Kastenholz         ||         
-  RFC1717          ||       K. Sklower, B. Lloyd, G. McGregor, D. Carr         ||        sklower@CS.Berkeley.EDU, brian@lloyd.com, glenn@lloyd.com, dcarr@Newbridge.COM 
-  RFC1718          ||       IETF Secretariat, G. Malkin         ||        ietf-info@cnri.reston.va.us, gmalkin@Xylogics.COM 
-  RFC1719          ||       P. Gross         ||        phill_gross@mcimail.com 
-  RFC1720          ||       J. Postel         ||         
-  RFC1721          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
-  RFC1722          ||       G. Malkin         ||        gmalkin@Xylogics.COM 
-  RFC1723          ||      G. Malkin         ||       gmalkin@Xylogics.COM
-  RFC1724          ||       G. Malkin, F. Baker         ||        gmalkin@Xylogics.COM, fred@cisco.com 
-  RFC1725          ||      J. Myers, M. Rose         ||       mrose17@gmail.com
-  RFC1726          ||       C. Partridge, F. Kastenholz         ||        craig@aland.bbn.com, kasten@ftp.com 
-  RFC1727          ||       C. Weider, P. Deutsch         ||        clw@bunyip.com, peterd@bunyip.com 
-  RFC1728          ||       C. Weider         ||        clw@bunyip.com 
-  RFC1729          ||       C. Lynch         ||        clifford.lynch@ucop.edu 
-  RFC1730          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
-  RFC1731          ||       J. Myers         ||         
-  RFC1732          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
-  RFC1733          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
-  RFC1734          ||      J. Myers         ||       
-  RFC1735          ||       J. Heinanen, R. Govindan         ||        Juha.Heinanen@datanet.tele.fi, govindan@isi.edu 
-  RFC1736          ||      J. Kunze         ||       jak@violet.berkeley.edu
-  RFC1737          ||       K. Sollins, L. Masinter         ||        masinter@parc.xerox.com, sollins@lcs.mit.edu 
-  RFC1738          ||      T. Berners-Lee, L. Masinter, M. McCahill         ||       
-  RFC1739          ||       G. Kessler, S. Shepard         ||        kumquat@hill.com, sds@hill.com 
-  RFC1740          ||       P. Faltstrom, D. Crocker, E. Fair         ||        paf@nada.kth.se, dcrocker@mordor.stanford.edu, fair@apple.com 
-  RFC1741          ||       P. Faltstrom, D. Crocker, E. Fair         ||        paf@nada.kth.se, dcrocker@mordor.stanford.edu, fair@apple.com 
-  RFC1742          ||       S. Waldbusser, K. Frisa         ||        waldbusser@cmu.edu, kfrisa@fore.com 
-  RFC1743          ||       K. McCloghrie, E. Decker         ||        kzm@cisco.com, cire@cisco.com 
-  RFC1744          ||       G. Huston         ||        Geoff.Huston@aarnet.edu.au 
-  RFC1745          ||       K. Varadhan, S. Hares, Y. Rekhter         ||        kannan@isi.edu, skh@merit.edu, yakov@watson.ibm.com 
-  RFC1746          ||       B. Manning, D. Perkins         ||        bmanning@isi.edu, dperkins@tenet.edu 
-  RFC1747          ||       J. Hilgeman, Chair, S. Nix, A. Bartky, W. Clark, Ed.         ||        jeffh@apertus.com, snix@metaplex.com, alan@sync.com, wclark@cisco.com 
-  RFC1748          ||       K. McCloghrie, E. Decker         ||        kzm@cisco.com, cire@cisco.com 
-  RFC1749          ||       K. McCloghrie, F. Baker, E. Decker         ||        kzm@cisco.com, fred@cisco.com, cire@cisco.com 
-  RFC1750          ||       D. Eastlake 3rd, S. Crocker, J. Schiller         ||        dee@lkg.dec.com, crocker@cybercash.com, jis@mit.edu 
-  RFC1751          ||       D. McDonald         ||        danmcd@itd.nrl.navy.mil 
-  RFC1752          ||       S. Bradner, A. Mankin         ||        sob@harvard.edu, mankin@isi.edu 
-  RFC1753          ||       N. Chiappa         ||        jnc@lcs.mit.edu 
-  RFC1754          ||       M. Laubach         ||        laubach@com21.com 
-  RFC1755          ||       M. Perez, F. Liaw, A. Mankin, E. Hoffman, D. Grossman, A. Malis         ||        perez@isi.edu, fong@fore.com, mankin@isi.edu, hoffman@isi.edu, dan@merlin.dev.cdx.mot.com, malis@maelstrom.timeplex.com 
-  RFC1756          ||       T. Rinne         ||        Timo.Rinne@hut.fi 
-  RFC1757          ||       S. Waldbusser         ||        waldbusser@cmu.edu 
-  RFC1758          ||       The North American Directory Forum         ||        0004454742@mcimail.com 
-  RFC1759          ||      R. Smith, F. Wright, T. Hastings, S. Zilles, J. Gyllenskog         ||       rlsmith@nb.ppd.ti.com, don@lexmark.com, tom.hastings@alum.mit.edu, szilles@mv.us.adobe.com, jgyllens@hpdmd48.boi.hp.com
-  RFC1760          ||       N. Haller         ||        nmh@bellcore.com 
-  RFC1761          ||       B. Callaghan, R. Gilligan         ||        brent.callaghan@eng.sun.com, bob.gilligan@eng.sun.com 
-  RFC1762          ||       S. Senum         ||        sjs@digibd.com 
-  RFC1763          ||       S. Senum         ||        sjs@digibd.com 
-  RFC1764          ||       S. Senum         ||        sjs@digibd.com 
-  RFC1765          ||       J. Moy         ||        jmoy@casc.com 
-  RFC1766          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
-  RFC1767          ||       D. Crocker         ||         
-  RFC1768          ||       D. Marlow         ||        dmarlow@relay.nswc.navy.mil 
-  RFC1769          ||       D. Mills         ||        mills@udel.edu 
-  RFC1770          ||      C. Graff         ||       bud@fotlan5.fotlan.army.mil
-  RFC1771          ||       Y. Rekhter, T. Li         ||         
-  RFC1772          ||       Y. Rekhter, P. Gross         ||        yakov@watson.ibm.com, 0006423401@mcimail.com 
-  RFC1773          ||       P. Traina         ||        pst@cisco.com 
-  RFC1774          ||       P. Traina, Ed.         ||         
-  RFC1775          ||       D. Crocker         ||        dcrocker@mordor.stanford.edu 
-  RFC1776          ||       S. Crocker         ||        crocker@cybercash.com 
-  RFC1777          ||       W. Yeong, T. Howes, S. Kille         ||        yeongw@psilink.com, tim@umich.edu, S.Kille@isode.com 
-  RFC1778          ||       T. Howes, S. Kille, W. Yeong, C. Robbins         ||        tim@umich.edu, S.Kille@isode.com, yeongw@psilink.com 
-  RFC1779          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC1780          ||       J. Postel, Ed.         ||         
-  RFC1781          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC1782          ||       G. Malkin, A. Harkin         ||        gmalkin@xylogics.com, ash@cup.hp.com 
-  RFC1783          ||       G. Malkin, A. Harkin         ||        gmalkin@xylogics.com, ash@cup.hp.com 
-  RFC1784          ||       G. Malkin, A. Harkin         ||        gmalkin@xylogics.com, ash@cup.hp.com 
-  RFC1785          ||       G. Malkin, A. Harkin         ||        gmalkin@xylogics.com, ash@cup.hp.com 
-  RFC1786          ||       T. Bates, E. Gerich, L. Joncheray, J-M. Jouanigot, D. Karrenberg, M. Terpstra, J. Yu         ||         
-  RFC1787          ||       Y. Rekhter         ||         
-  RFC1788          ||      W. Simpson         ||       
-  RFC1789          ||       C. Yang         ||        cqyang@cs.unt.edu 
-  RFC1790          ||       V. Cerf         ||        vcerf@isoc.org 
-  RFC1791          ||       T. Sung         ||        tae@novell.Com 
-  RFC1792          ||       T. Sung         ||        tae@novell.Com 
-  RFC1793          ||       J. Moy         ||        jmoy@casc.com 
-  RFC1794          ||       T. Brisco         ||        brisco@rutgers.edu 
-  RFC1795          ||       L. Wells, Chair, A. Bartky, Ed.         ||         
-  RFC1796          ||       C. Huitema, J. Postel, S. Crocker         ||        Christian.Huitema@MIRSA.INRIA.FR, Postel@ISI.EDU, crocker@cybercash.com 
-  RFC1797          ||       Internet Assigned Numbers Authority (IANA)         ||        iana@isi.edu 
-  RFC1798          ||       A. Young         ||        A.Young@isode.com 
-  RFC1799          ||       M. Kennedy         ||        MKENNEDY@ISI.EDU 
-  RFC1800          ||       J. Postel, Ed.         ||         
-  RFC1801          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC1802          ||       H. Alvestrand, K. Jordan, S. Langlois, J. Romaguera         ||        Harald.T.Alvestrand@uninett.no, Kevin.E.Jordan@cdc.com, Sylvain.Langlois@der.edf.fr, Romaguera@NetConsult.ch 
-  RFC1803          ||       R. Wright, A. Getchell, T. Howes, S. Sataluri, P. Yee, W. Yeong         ||         
-  RFC1804          ||       G. Mansfield, P. Rajeev, S. Raghavan, T. Howes         ||        glenn@aic.co.jp, rajeev%hss@lando.hns.com, svr@iitm.ernet.in, tim@umich.edu 
-  RFC1805          ||       A. Rubin         ||        rubin@bellcore.com 
-  RFC1806          ||      R. Troost, S. Dorner         ||       rens@century.com, sdorner@qualcomm.com
-  RFC1807          ||       R. Lasher, D. Cohen         ||        rlasher@forsythe.stanford.edu, Cohen@myri.com 
-  RFC1808          ||       R. Fielding         ||        fielding@ics.uci.edu 
-  RFC1809          ||       C. Partridge         ||        craig@aland.bbn.com 
-  RFC1810          ||       J. Touch         ||        touch@isi.edu 
-  RFC1811          ||       Federal Networking Council         ||        execdir@fnc.gov 
-  RFC1812          ||      F. Baker, Ed.         ||       
-  RFC1813          ||       B. Callaghan, B. Pawlowski, P. Staubach         ||        brent.callaghan@eng.sun.com, beepy@netapp.com, peter.staubach@eng.sun.com 
-  RFC1814          ||       E. Gerich         ||        epg@merit.edu 
-  RFC1815          ||       M. Ohta         ||        mohta@cc.titech.ac.jp 
-  RFC1816          ||       Federal Networking Council         ||        execdir@fnc.gov 
-  RFC1817          ||       Y. Rekhter         ||        yakov@cisco.com 
-  RFC1818          ||       J. Postel, T. Li, Y. Rekhter         ||        postel@isi.edu, yakov@cisco.com, tli@cisco.com 
-  RFC1819          ||      L. Delgrossi, Ed., L. Berger, Ed.         ||       lberger@bbn.com, luca@andersen.fr, dat@bbn.com, stevej@syzygycomm.com, schaller@heidelbg.ibm.com
-  RFC1820          ||       E. Huizer         ||        Erik.Huizer@SURFnet.nl 
-  RFC1821          ||       M. Borden, E. Crawley, B. Davie, S. Batsell         ||         
-  RFC1822          ||       J. Lowe         ||         
-  RFC1823          ||       T. Howes, M. Smith         ||        tim@umich.edu, mcs@umich.edu 
-  RFC1824          ||       H. Danisch         ||        danisch@ira.uka.de 
-  RFC1825          ||       R. Atkinson         ||         
-  RFC1826          ||       R. Atkinson         ||         
-  RFC1827          ||       R. Atkinson         ||         
-  RFC1828          ||      P. Metzger, W. Simpson         ||       
-  RFC1829          ||       P. Karn, P. Metzger, W. Simpson         ||         
-  RFC1830          ||       G. Vaudreuil         ||        Greg.Vaudreuil@Octel.com 
-  RFC1831          ||      R. Srinivasan         ||       raj@eng.sun.com
-  RFC1832          ||       R. Srinivasan         ||        raj@eng.sun.com 
-  RFC1833          ||      R. Srinivasan         ||       raj@eng.sun.com
-  RFC1834          ||       J. Gargano, K. Weiss         ||        jcgargano@ucdavis.edu, krweiss@ucdavis.edu 
-  RFC1835          ||       P. Deutsch, R. Schoultz, P. Faltstrom, C. Weider         ||        peterd@bunyip.com, schoultz@sunet.se, paf@bunyip.com, clw@bunyip.com 
-  RFC1836          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC1837          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC1838          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC1839          ||               ||         
-  RFC1840          ||               ||         
-  RFC1841          ||       J. Chapman, D. Coli, A. Harvey, B. Jensen, K. Rowett         ||        joelle@cisco.com, dcoli@cisco.com, agh@cisco.com, bent@cisco.com, krowett@cisco.com 
-  RFC1842          ||       Y. Wei, Y. Zhang, J. Li, J. Ding, Y. Jiang         ||        HZRFC@usai.asiainfo.com, zhang@orion.harvard.edu, jian@is.rice.edu, ding@Beijing.AsiaInfo.com, yjj@eng.umd.edu 
-  RFC1843          ||       F. Lee         ||        lee@csl.stanford.edu 
-  RFC1844          ||       E. Huizer         ||        Erik.Huizer@SURFnet.nl 
-  RFC1845          ||       D. Crocker, N. Freed, A. Cargille         ||        dcrocker@mordor.stanford.edu, ned@innosoft.com 
-  RFC1846          ||      A. Durand, F. Dupont         ||       Alain.Durand@imag.fr, Francis.Dupont@inria.fr
-  RFC1847          ||       J. Galvin, S. Murphy, S. Crocker, N. Freed         ||        galvin@tis.com, sandy@tis.com, crocker@cybercash.com, ned@innosoft.com 
-  RFC1848          ||       S. Crocker, N. Freed, J. Galvin, S. Murphy         ||        crocker@cybercash.com, galvin@tis.com, murphy@tis.com, ned@innosoft.com 
-  RFC1849          ||      H. Spencer         ||       henry@zoo.utoronto.ca
-  RFC1850          ||       F. Baker, R. Coltun         ||        fred@cisco.com, rcoltun@rainbow-bridge.com 
-  RFC1851          ||       P. Karn, P. Metzger, W. Simpson         ||         
-  RFC1852          ||       P. Metzger, W. Simpson         ||         
-  RFC1853          ||       W. Simpson         ||         
-  RFC1854          ||       N. Freed         ||        ned@innosoft.com 
-  RFC1855          ||       S. Hambridge         ||        sallyh@ludwig.sc.intel.com 
-  RFC1856          ||       H. Clark         ||        henryc@bbnplanet.com 
-  RFC1857          ||       M. Lambert         ||        lambert@psc.edu 
-  RFC1858          ||       G. Ziemba, D. Reed, P. Traina         ||        paul@alantec.com, darrenr@cyber.com.au, pst@cisco.com 
-  RFC1859          ||       Y. Pouffary         ||        pouffary@taec.enet.dec.com 
-  RFC1860          ||       T. Pummill, B. Manning         ||        trop@alantec.com, bmanning@isi.edu 
-  RFC1861          ||       A. Gwinn         ||        allen@mail.cox.smu.edu 
-  RFC1862          ||       M. McCahill, J. Romkey, M. Schwartz, K. Sollins, T. Verschuren, C. Weider         ||        mpm@boombox.micro.umn.edu, romkey@apocalypse.org, schwartz@cs.colorado.edu, sollins@lcs.mit.edu, Ton.Verschuren@surfnet.nl, clw@bunyip.com 
-  RFC1863          ||       D. Haskin         ||        dhaskin@baynetworks.com 
-  RFC1864          ||       J. Myers, M. Rose         ||       mrose17@gmail.com
-  RFC1865          ||       W. Houser, J. Griffin, C. Hage         ||        houser.walt@forum.va.gov, agriffin@cpcug.org, carl@chage.com 
-  RFC1866          ||       T. Berners-Lee, D. Connolly         ||        timbl@w3.org, connolly@w3.org 
-  RFC1867          ||       E. Nebel, L. Masinter         ||        masinter@parc.xerox.com, nebel@xsoft.sd.xerox.com 
-  RFC1868          ||       G. Malkin         ||        gmalkin@xylogics.com 
-  RFC1869          ||       J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker         ||        klensin@mci.net,  ned@innosoft.com, mrose17@gmail.com,  stef@nma.com,  dcrocker@mordor.stanford.edu 
-  RFC1870          ||       J. Klensin, N. Freed, K. Moore         ||        klensin@mci.net, ned@innosoft.com, moore@cs.utk.edu 
-  RFC1871          ||       J. Postel         ||        postel@isi.edu 
-  RFC1872          ||       E. Levinson         ||        ELevinson@Accurate.com 
-  RFC1873          ||       E. Levinson         ||         
-  RFC1874          ||       E. Levinson         ||        ELevinson@Accurate.com 
-  RFC1875          ||       N. Berge         ||        Nils.Harald.Berge@nr.no 
-  RFC1876          ||       C. Davis, P. Vixie, T. Goodwin, I. Dickinson         ||        ckd@kei.com, paul@vix.com, tim@pipex.net, idickins@fore.co.uk 
-  RFC1877          ||       S. Cobb         ||        stevec@microsoft.com 
-  RFC1878          ||       T. Pummill, B. Manning         ||        trop@alantec.com, bmanning@isi.edu 
-  RFC1879          ||       B. Manning, Ed.         ||         
-  RFC1880          ||       J. Postel, Ed.         ||         
-  RFC1881          ||       IAB, IESG         ||         
-  RFC1882          ||       B. Hancock         ||        hancock@network-1.com 
-  RFC1883          ||      S. Deering, R. Hinden         ||       bob.hinden@gmail.com
-  RFC1884          ||      R. Hinden, Ed., S. Deering, Ed.         ||       bob.hinden@gmail.com
-  RFC1885          ||       A. Conta, S. Deering         ||        deering@parc.xerox.com 
-  RFC1886          ||       S. Thomson, C. Huitema         ||        set@thumper.bellcore.com, Christian.Huitema@MIRSA.INRIA.FR 
-  RFC1887          ||      Y. Rekhter, Ed., T. Li, Ed.         ||       
-  RFC1888          ||       J. Bound, B. Carpenter, D. Harrington, J. Houldsworth, A. Lloyd         ||         
-  RFC1889          ||       Audio-Video Transport Working Group, H. Schulzrinne, S. Casner, R. Frederick, V. Jacobson         ||        schulzrinne@fokus.gmd.de, casner@precept.com, frederic@parc.xerox.com, van@ee.lbl.gov 
-  RFC1890          ||       Audio-Video Transport Working Group, H. Schulzrinne         ||        schulzrinne@fokus.gmd.de 
-  RFC1891          ||       K. Moore         ||        moore@cs.utk.edu 
-  RFC1892          ||       G. Vaudreuil         ||        Greg.Vaudreuil@Octel.com 
-  RFC1893          ||       G. Vaudreuil         ||        Greg.Vaudreuil@Octel.com 
-  RFC1894          ||       K. Moore, G. Vaudreuil         ||        moore@cs.utk.edu, Greg.Vaudreuil@Octel.Com 
-  RFC1895          ||       E. Levinson         ||        ELevinson@Accurate.com 
-  RFC1896          ||      P. Resnick, A. Walker         ||       presnick@qti.qualcomm.com, amanda@intercon.com
-  RFC1897          ||      R. Hinden, J. Postel         ||       bob.hinden@gmail.com, postel@isi.edu
-  RFC1898          ||       D. Eastlake 3rd, B. Boesch, S. Crocker, M. Yesil         ||        dee@cybercash.com, boesch@cybercash.com, crocker@cybercash.com, magdalen@cybercash.com 
-  RFC1899          ||       J. Elliott         ||        elliott@isi.edu 
-  RFC1900          ||       B. Carpenter, Y. Rekhter         ||        brian@dxcoms.cern.ch, yakov@cisco.com 
-  RFC1901          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1902          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1903          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1904          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1905          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1906          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1907          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1908          ||       J. Case, K. McCloghrie, M. Rose, S. Waldbusser         ||         
-  RFC1909          ||       K. McCloghrie, Ed.         ||         
-  RFC1910          ||       G. Waters, Ed.         ||         
-  RFC1911          ||       G. Vaudreuil         ||        Greg.Vaudreuil@Octel.Com 
-  RFC1912          ||       D. Barr         ||        barr@math.psu.edu 
-  RFC1913          ||       C. Weider, J. Fullton, S. Spero         ||        clw@bunyip.com, fullton@cnidr.org, ses@eit.com 
-  RFC1914          ||       P. Faltstrom, R. Schoultz, C. Weider         ||        paf@bunyip.com, schoultz@sunet.se, clw@bunyip.com 
-  RFC1915          ||       F. Kastenholz         ||        kasten@ftp.com 
-  RFC1916          ||       H. Berkowitz, P. Ferguson, W. Leland, P. Nesser         ||        hcb@clark.net, pferguso@cisco.com, wel@bellcore.com, pjnesser@rocket.com 
-  RFC1917          ||       P. Nesser II         ||        pjnesser@martigny.ai.mit.edu 
-  RFC1918          ||      Y. Rekhter, B. Moskowitz, D. Karrenberg, G. J. de Groot, E. Lear         ||       yakov@cisco.com, rgm3@is.chrysler.com, Daniel.Karrenberg@ripe.net, GeertJan.deGroot@ripe.net, lear@sgi.com
-  RFC1919          ||       M. Chatel         ||        mchatel@pax.eunet.ch 
-  RFC1920          ||       J. Postel         ||         
-  RFC1921          ||       J. Dujonc         ||        J.Y.Dujonc@frcl.bull.fr 
-  RFC1922          ||       HF. Zhu, DY. Hu, ZG. Wang, TC. Kao, WCH. Chang, M. Crispin         ||        zhf@net.tsinghua.edu.cn, hdy@tsinghua.edu.cn, tckao@iiidns.iii.org.tw, chung@iiidns.iii.org.tw, MRC@CAC.Washington.EDU 
-  RFC1923          ||       J. Halpern, S. Bradner         ||        jhalpern@newbridge.com, sob@harvard.edu 
-  RFC1924          ||       R. Elz         ||        kre@munnari.OZ.AU 
-  RFC1925          ||       R. Callon         ||        rcallon@baynetworks.com 
-  RFC1926          ||       J. Eriksson         ||        bygg@sunet.se 
-  RFC1927          ||       C. Rogers         ||        rogers@isi.edu 
-  RFC1928          ||       M. Leech, M. Ganis, Y. Lee, R. Kuris, D. Koblas, L. Jones         ||        mleech@bnr.ca 
-  RFC1929          ||       M. Leech         ||        mleech@bnr.ca 
-  RFC1930          ||      J. Hawkinson, T. Bates         ||       jhawk@bbnplanet.com, Tony.Bates@mci.net
-  RFC1931          ||       D. Brownell         ||        dbrownell@sun.com 
-  RFC1932          ||       R. Cole, D. Shur, C. Villamizar         ||        rgc@qsun.att.com, d.shur@att.com, curtis@ans.net 
-  RFC1933          ||       R. Gilligan, E. Nordmark         ||        Bob.Gilligan@Eng.Sun.COM, Erik.Nordmark@Eng.Sun.COM 
-  RFC1934          ||       K. Smith         ||        ksmith@ascend.com 
-  RFC1935          ||       J. Quarterman, S. Carl-Mitchell         ||        tic@tic.com 
-  RFC1936          ||       J. Touch, B. Parham         ||        touch@isi.edu, bparham@isi.edu 
-  RFC1937          ||       Y. Rekhter, D. Kandlur         ||        yakov@cisco.com, kandlur@watson.ibm.com 
-  RFC1938          ||       N. Haller, C. Metz         ||         
-  RFC1939          ||      J. Myers, M. Rose         ||       mrose17@gmail.com
-  RFC1940          ||       D. Estrin, T. Li, Y. Rekhter, K. Varadhan, D. Zappala         ||        estrin@isi.edu, tli@cisco.com, yakov@cisco.com, kannan@isi.edu, daniel@isi.edu 
-  RFC1941          ||       J. Sellers, J. Robichaux         ||        julier@internic.net, sellers@quest.arc.nasa.gov 
-  RFC1942          ||       D. Raggett         ||        dsr@w3.org 
-  RFC1943          ||       B. Jennings         ||        jennings@sandia.gov 
-  RFC1944          ||       S. Bradner, J. McQuaid         ||         
-  RFC1945          ||       T. Berners-Lee, R. Fielding, H. Frystyk         ||        timbl@w3.org, fielding@ics.uci.edu, frystyk@w3.org 
-  RFC1946          ||       S. Jackowski         ||        Stevej@NetManage.com 
-  RFC1947          ||       D. Spinellis         ||        D.Spinellis@senanet.com 
-  RFC1948          ||      S. Bellovin         ||       smb@research.att.com
-  RFC1949          ||       A. Ballardie         ||        A.Ballardie@cs.ucl.ac.uk 
-  RFC1950          ||       P. Deutsch, J-L. Gailly         ||         
-  RFC1951          ||       P. Deutsch         ||         
-  RFC1952          ||       P. Deutsch         ||         
-  RFC1953          ||      P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall         ||       bob.hinden@gmail.com
-  RFC1954          ||      P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall         ||       bob.hinden@gmail.com
-  RFC1955          ||      R. Hinden         ||       bob.hinden@gmail.com
-  RFC1956          ||       D. Engebretson, R. Plzak         ||        engebred@ncr.disa.mil, plzak@nic.ddn.mil 
-  RFC1957          ||       R. Nelson         ||        nelson@crynwr.com 
-  RFC1958          ||       B. Carpenter, Ed.         ||         
-  RFC1959          ||       T. Howes, M. Smith         ||        tim@umich.edu, mcs@umich.edu 
-  RFC1960          ||       T. Howes         ||        tim@umich.edu 
-  RFC1961          ||       P. McMahon         ||        p.v.mcmahon@rea0803.wins.icl.co.uk 
-  RFC1962          ||       D. Rand         ||        dlr@daver.bungi.com 
-  RFC1963          ||       K. Schneider, S. Venters         ||        kevin@adtran.com, sventers@adtran.com 
-  RFC1964          ||      J. Linn         ||       
-  RFC1965          ||       P. Traina         ||        pst@cisco.com 
-  RFC1966          ||       T. Bates, R. Chandra         ||        tbates@cisco.com, rchandra@cisco.com 
-  RFC1967          ||       K. Schneider, R. Friend         ||        kschneider@adtran.com, rfriend@stac.com 
-  RFC1968          ||       G. Meyer         ||        gerry@spider.co.uk 
-  RFC1969          ||       K. Sklower, G. Meyer         ||        sklower@CS.Berkeley.EDU, gerry@spider.co.uk 
-  RFC1970          ||       T. Narten, E. Nordmark, W. Simpson         ||         
-  RFC1971          ||       S. Thomson, T. Narten         ||         
-  RFC1972          ||       M. Crawford         ||        crawdad@fnal.gov 
-  RFC1973          ||       W. Simpson         ||         
-  RFC1974          ||       R. Friend, W. Simpson         ||        rfriend@stac.com 
-  RFC1975          ||       D. Schremp, J. Black, J. Weiss         ||        dhs@magna.telco.com, jtb@magna.telco.com, jaw@magna.telco.com 
-  RFC1976          ||       K. Schneider, S. Venters         ||        kevin@adtran.com, sventers@adtran.com 
-  RFC1977          ||       V. Schryver         ||        vjs@rhyolite.com 
-  RFC1978          ||       D. Rand         ||        dave_rand@novell.com 
-  RFC1979          ||       J. Woods         ||        jfw@funhouse.com 
-  RFC1980          ||      J. Seidman         ||       jim@spyglass.com
-  RFC1981          ||       J. McCann, S. Deering, J. Mogul         ||        deering@parc.xerox.com, mogul@pa.dec.com 
-  RFC1982          ||       R. Elz, R. Bush         ||        randy@psg.com 
-  RFC1983          ||       G. Malkin, Ed.         ||         
-  RFC1984          ||      IAB, IESG         ||       brian@dxcoms.cern.ch, fred@cisco.com
-  RFC1985          ||       J. De Winter         ||        jack@wildbear.on.ca 
-  RFC1986          ||       W. Polites, W. Wollman, D. Woo, R. Langan         ||         
-  RFC1987          ||      P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall         ||       bob.hinden@gmail.com
-  RFC1988          ||       G. McAnally, D. Gilbert, J. Flick         ||        johnf@hprnd.rose.hp.com 
-  RFC1989          ||       W. Simpson         ||         
-  RFC1990          ||       K. Sklower, B. Lloyd, G. McGregor, D. Carr, T. Coradetti         ||        sklower@CS.Berkeley.EDU, brian@lloyd.com, glenn@lloyd.com, dcarr@Newbridge.COM, 70761.1664@compuserve.com 
-  RFC1991          ||      D. Atkins, W. Stallings, P. Zimmermann         ||       warlord@MIT.EDU, stallings@ACM.org, prz@acm.org
-  RFC1992          ||       I. Castineyra, N. Chiappa, M. Steenstrup         ||        isidro@bbn.com, gnc@ginger.lcs.mit.edu, msteenst@bbn.com 
-  RFC1993          ||       A. Barbir, D. Carr, W. Simpson         ||         
-  RFC1994          ||       W. Simpson         ||         
-  RFC1995          ||       M. Ohta         ||        mohta@necom830.hpcl.titech.ac.jp 
-  RFC1996          ||       P. Vixie         ||        paul@vix.com 
-  RFC1997          ||      R. Chandra, P. Traina, T. Li         ||       pst@cisco.com, rchandra@cisco.com, tli@skat.usc.edu
-  RFC1998          ||       E. Chen, T. Bates         ||        enke@mci.net, tbates@cisco.com 
-  RFC1999          ||       J. Elliott         ||        elliott@isi.edu 
-  RFC2000          ||       J. Postel, Ed.         ||         
-  RFC2001          ||       W. Stevens         ||        rstevens@noao.edu 
-  RFC2002          ||       C. Perkins, Ed.         ||         
-  RFC2003          ||      C. Perkins         ||       perk@watson.ibm.com, solomon@comm.mot.com
-  RFC2004          ||       C. Perkins         ||        perk@watson.ibm.com, solomon@comm.mot.com 
-  RFC2005          ||       J. Solomon         ||        solomon@comm.mot.com 
-  RFC2006          ||       D. Cong, M. Hamlen, C. Perkins         ||         
-  RFC2007          ||       J. Foster, M. Isaacs, M. Prior         ||        Jill.Foster@newcastle.ac.uk, mmi@dcs.gla.ac.uk, mrp@connect.com.au 
-  RFC2008          ||       Y. Rekhter, T. Li         ||        yakov@cisco.com, tli@cisco.com 
-  RFC2009          ||       T. Imielinski, J. Navas         ||         
-  RFC2010          ||       B. Manning, P. Vixie         ||        bmanning@isi.edu, paul@vix.com 
-  RFC2011          ||       K. McCloghrie, Ed.         ||         
-  RFC2012          ||       K. McCloghrie, Ed.         ||         
-  RFC2013          ||       K. McCloghrie, Ed.         ||         
-  RFC2014          ||      A. Weinrib, J. Postel         ||       
-  RFC2015          ||       M. Elkins         ||         
-  RFC2016          ||       L. Daigle, P. Deutsch, B. Heelan, C. Alpaugh, M. Maclachlan         ||        ura-bunyip@bunyip.com 
-  RFC2017          ||       N. Freed, K. Moore, A. Cargille         ||        ned@innosoft.com, moore@cs.utk.edu 
-  RFC2018          ||       M. Mathis, J. Mahdavi, S. Floyd, A. Romanow         ||         
-  RFC2019          ||       M. Crawford         ||        crawdad@fnal.gov 
-  RFC2020          ||       J. Flick         ||         
-  RFC2021          ||       S. Waldbusser         ||        waldbusser@ins.com 
-  RFC2022          ||       G. Armitage         ||        gja@thumper.bellcore.com 
-  RFC2023          ||       D. Haskin, E. Allen         ||         
-  RFC2024          ||       D. Chen, Ed., P. Gayek, S. Nix         ||        dchen@vnet.ibm.com, gayek@vnet.ibm.com, snix@metaplex.com 
-  RFC2025          ||       C. Adams         ||        cadams@bnr.ca 
-  RFC2026          ||      S. Bradner         ||       
-  RFC2027          ||       J. Galvin         ||         
-  RFC2028          ||       R. Hovey, S. Bradner         ||        hovey@wnpv01.enet.dec.com, sob@harvard.edu 
-  RFC2029          ||       M. Speer, D. Hoffman         ||        michael.speer@eng.sun.com, don.hoffman@eng.sun.com 
-  RFC2030          ||       D. Mills         ||         
-  RFC2031          ||       E. Huizer         ||         
-  RFC2032          ||       T. Turletti, C. Huitema         ||        turletti@sophia.inria.fr, huitema@bellcore.com 
-  RFC2033          ||       J. Myers         ||         
-  RFC2034          ||       N. Freed         ||         
-  RFC2035          ||       L. Berc, W. Fenner, R. Frederick, S. McCanne         ||        berc@pa.dec.com, fenner@cmf.nrl.navy.mil, frederick@parc.xerox.com, mccanne@ee.lbl.gov 
-  RFC2036          ||       G. Huston         ||         
-  RFC2037          ||       K. McCloghrie, A. Bierman         ||        kzm@cisco.com, andy@yumaworks.com
-  RFC2038          ||       D. Hoffman, G. Fernando, V. Goyal         ||        gerard.fernando@eng.sun.com, goyal@precept.com, don.hoffman@eng.sun.com 
-  RFC2039          ||       C. Kalbfleisch         ||         
-  RFC2040          ||       R. Baldwin, R. Rivest         ||        baldwin@rsa.com, rivest@theory.lcs.mit.edu 
-  RFC2041          ||      B. Noble, G. Nguyen, M. Satyanarayanan, R. Katz         ||       bnoble@cs.cmu.edu, gnguyen@cs.berkeley.edu, satya@cs.cmu.edu, randy@cs.berkeley.edu
-  RFC2042          ||       B. Manning         ||        bmanning@isi.edu 
-  RFC2043          ||       A. Fuqua         ||        fuqua@vnet.ibm.com 
-  RFC2044          ||       F. Yergeau         ||        fyergeau@alis.com 
-  RFC2045          ||      N. Freed, N. Borenstein         ||       ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com
-  RFC2046          ||      N. Freed, N. Borenstein         ||       ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com
-  RFC2047          ||       K. Moore         ||        moore@cs.utk.edu 
-  RFC2048          ||       N. Freed, J. Klensin, J. Postel         ||        ned@innosoft.com, klensin@mci.net, Postel@ISI.EDU 
-  RFC2049          ||       N. Freed, N. Borenstein         ||        ned@innosoft.com, nsb@nsb.fv.com, Greg.Vaudreuil@Octel.Com 
-  RFC2050          ||      K. Hubbard, M. Kosters, D. Conrad, D. Karrenberg, J. Postel         ||       kimh@internic.net, markk@internic.net, davidc@APNIC.NET, dfk@RIPE.NET, Postel@ISI.EDU
-  RFC2051          ||       M. Allen, B. Clouston, Z. Kielczewski, W. Kwan, B. Moore         ||        mallen@hq.walldata.com, clouston@cisco.com, zbig@cisco.com, billk@jti.com, remoore@ralvm6.vnet.ibm.com 
-  RFC2052          ||       A. Gulbrandsen, P. Vixie         ||        agulbra@troll.no, paul@vix.com 
-  RFC2053          ||       E. Der-Danieliantz         ||        edd@acm.org 
-  RFC2054          ||       B. Callaghan         ||        brent.callaghan@eng.sun.com 
-  RFC2055          ||       B. Callaghan         ||        brent.callaghan@eng.sun.com 
-  RFC2056          ||       R. Denenberg, J. Kunze, D. Lynch         ||         
-  RFC2057          ||       S. Bradner         ||        sob@harvard.edu 
-  RFC2058          ||       C. Rigney, A. Rubens, W. Simpson, S. Willens         ||        cdr@livingston.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com 
-  RFC2059          ||       C. Rigney         ||        cdr@livingston.com 
-  RFC2060          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
-  RFC2061          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
-  RFC2062          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
-  RFC2063          ||       N. Brownlee, C. Mills, G. Ruth         ||        cmills@bbn.com, gruth@gte.com 
-  RFC2064          ||       N. Brownlee         ||         
-  RFC2065          ||       D. Eastlake 3rd, C. Kaufman         ||        dee@cybercash.com, charlie_kaufman@iris.com 
-  RFC2066          ||       R. Gellens         ||        Randy@MV.Unisys.Com 
-  RFC2067          ||       J. Renwick         ||        jkr@NetStar.com 
-  RFC2068          ||       R. Fielding, J. Gettys, J. Mogul, H. Frystyk, T. Berners-Lee         ||        fielding@ics.uci.edu, jg@w3.org, mogul@wrl.dec.com, frystyk@w3.org, timbl@w3.org 
-  RFC2069          ||       J. Franks, P. Hallam-Baker, J. Hostetler, P. Leach, A. Luotonen, E. Sink, L. Stewart         ||        john@math.nwu.edu, hallam@w3.org, jeff@spyglass.com, paulle@microsoft.com, luotonen@netscape.com, eric@spyglass.com, stewart@OpenMarket.com 
-  RFC2070          ||       F. Yergeau, G. Nicol, G. Adams, M. Duerst         ||        fyergeau@alis.com, gtn@ebt.com, glenn@spyglass.com, mduerst@ifi.unizh.ch 
-  RFC2071          ||       P. Ferguson, H. Berkowitz         ||        pferguso@cisco.com, hcb@clark.net 
-  RFC2072          ||       H. Berkowitz         ||        hcb@clark.net 
-  RFC2073          ||      Y. Rekhter, P. Lothberg, R. Hinden, S. Deering, J. Postel         ||       bob.hinden@gmail.com
-  RFC2074          ||       A. Bierman, R. Iddon         ||       andy@yumaworks.com, robin_iddon@3mail.3com.com 
-  RFC2075          ||       C. Partridge         ||        craig@bbn.com 
-  RFC2076          ||       J. Palme         ||         
-  RFC2077          ||       S. Nelson, C. Parks, Mitra         ||         
-  RFC2078          ||       J. Linn         ||        John.Linn@ov.com 
-  RFC2079          ||       M. Smith         ||        mcs@netscape.com 
-  RFC2080          ||       G. Malkin, R. Minnear         ||        gmalkin@Xylogics.COM, minnear@ipsilon.com 
-  RFC2081          ||       G. Malkin         ||        gmalkin@xylogics.com 
-  RFC2082          ||       F. Baker, R. Atkinson         ||        rja@cisco.com 
-  RFC2083          ||       T. Boutell         ||        boutell@boutell.com 
-  RFC2084          ||       G. Bossert, S. Cooper, W. Drummond         ||        bossert@corp.sgi.com, sc@corp.sgi.com, drummond@ieee.org 
-  RFC2085          ||       M. Oehler, R. Glenn         ||        mjo@tycho.ncsc.mil, rob.glenn@nist.gov 
-  RFC2086          ||       J. Myers         ||         
-  RFC2087          ||       J. Myers         ||         
-  RFC2088          ||      J. Myers         ||       
-  RFC2089          ||       B. Wijnen, D. Levi         ||         
-  RFC2090          ||       A. Emberson         ||        tom@lanworks.com 
-  RFC2091          ||       G. Meyer, S. Sherry         ||         
-  RFC2092          ||       S. Sherry, G. Meyer         ||         
-  RFC2093          ||       H. Harney, C. Muckenhirn         ||         
-  RFC2094          ||       H. Harney, C. Muckenhirn         ||         
-  RFC2095          ||       J. Klensin, R. Catoe, P. Krumviede         ||        klensin@mci.net, randy@mci.net, paul@mci.net 
-  RFC2096          ||       F. Baker         ||        fred@cisco.com 
-  RFC2097          ||       G. Pall         ||        gurdeep@microsoft.com 
-  RFC2098          ||       Y. Katsube, K. Nagami, H. Esaki         ||         
-  RFC2099          ||       J. Elliott         ||        elliott@isi.edu 
-  RFC2100          ||       J. Ashworth         ||        jra@scfn.thpl.lib.fl.us 
-  RFC2101          ||       B. Carpenter, J. Crowcroft, Y. Rekhter         ||        brian@dxcoms.cern.ch, j.crowcroft@cs.ucl.ac.uk, yakov@cisco.com 
-  RFC2102          ||       R. Ramanathan         ||        ramanath@bbn.com 
-  RFC2103          ||       R. Ramanathan         ||         
-  RFC2104          ||      H. Krawczyk, M. Bellare, R. Canetti         ||       hugo@watson.ibm.com, mihir@cs.ucsd.edu, canetti@watson.ibm.com
-  RFC2105          ||       Y. Rekhter, B. Davie, D. Katz, E. Rosen, G. Swallow         ||        yakov@cisco.com, bsd@cisco.com, dkatz@cisco.com, erosen@cisco.com, swallow@cisco.com 
-  RFC2106          ||       S. Chiang, J. Lee, H. Yasuda         ||        schiang@cisco.com, jolee@cisco.com, yasuda@eme068.cow.melco.co.jp 
-  RFC2107          ||       K. Hamzeh         ||        kory@ascend.com 
-  RFC2108          ||       K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie         ||        kdegraaf@isd.3com.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com 
-  RFC2109          ||      D. Kristol, L. Montulli         ||       
-  RFC2110          ||       J. Palme, A. Hopmann         ||         
-  RFC2111          ||       E. Levinson         ||         
-  RFC2112          ||       E. Levinson         ||         
-  RFC2113          ||      D. Katz         ||       
-  RFC2114          ||       S. Chiang, J. Lee, H. Yasuda         ||        schiang@cisco.com, jolee@cisco.com, yasuda@eme068.cow.melco.co.jp 
-  RFC2115          ||       C. Brown, F. Baker         ||         
-  RFC2116          ||       C. Apple, K. Rossen         ||         
-  RFC2117          ||       D. Estrin, D. Farinacci, A. Helmy, D. Thaler, S. Deering, M. Handley, V. Jacobson, C. Liu, P. Sharma, L. Wei         ||         
-  RFC2118          ||       G. Pall         ||         
-  RFC2119          ||      S. Bradner         ||       
-  RFC2120          ||       D. Chadwick         ||         
-  RFC2121          ||       G. Armitage         ||        gja@thumper.bellcore.com 
-  RFC2122          ||       D. Mavrakis, H. Layec, K. Kartmann         ||         
-  RFC2123          ||       N. Brownlee         ||         
-  RFC2124          ||       P. Amsden, J. Amweg, P. Calato, S. Bensley, G. Lyons         ||        amsden@ctron.com, amsden@ctron.com, amsden@ctron.com, amsden@ctron.com, amsden@ctron.com 
-  RFC2125          ||       C. Richards, K. Smith         ||         
-  RFC2126          ||       Y. Pouffary, A. Young         ||        pouffary@taec.enet.dec.com, A.Young@isode.com 
-  RFC2127          ||       G. Roeck, Ed.         ||        groeck@cisco.com 
-  RFC2128          ||       G. Roeck, Ed.         ||        groeck@cisco.com 
-  RFC2129          ||      K. Nagami, Y. Katsube, Y. Shobatake, A. Mogi, S. Matsuzawa, T. Jinmei, H. Esaki         ||       
-  RFC2130          ||      C. Weider, C. Preston, K. Simonsen, H. Alvestrand, R. Atkinson, M. Crispin, P. Svanberg         ||       cweider@microsoft.com, cecilia@well.com, Keld@dkuug.dk, Harald.T.Alvestrand@uninett.no, rja@cisco.com, mrc@cac.washington.edu, psv@nada.kth.se
-  RFC2131          ||      R. Droms         ||       droms@bucknell.edu
-  RFC2132          ||      S. Alexander, R. Droms         ||       sca@engr.sgi.com, droms@bucknell.edu
-  RFC2133          ||       R. Gilligan, S. Thomson, J. Bound, W. Stevens         ||        gilligan@freegate.net, set@thumper.bellcore.com, rstevens@kohala.com 
-  RFC2134          ||       ISOC Board of Trustees         ||         
-  RFC2135          ||       ISOC Board of Trustees         ||         
-  RFC2136          ||      P. Vixie, Ed., S. Thomson, Y. Rekhter, J. Bound         ||       yakov@cisco.com, set@thumper.bellcore.com, bound@zk3.dec.com, paul@vix.com 
-  RFC2137          ||       D. Eastlake 3rd         ||        dee@cybercash.com 
-  RFC2138          ||       C. Rigney, A. Rubens, W. Simpson, S. Willens         ||        cdr@livingston.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com 
-  RFC2139          ||       C. Rigney         ||        cdr@livingston.com 
-  RFC2140          ||       J. Touch         ||         
-  RFC2141          ||       R. Moats         ||         
-  RFC2142          ||       D. Crocker         ||         
-  RFC2143          ||       B. Elliston         ||         
-  RFC2144          ||       C. Adams         ||         
-  RFC2145          ||      J. C. Mogul, R. Fielding, J. Gettys, H. Frystyk         ||       
-  RFC2146          ||       Federal Networking Council         ||        execdir@fnc.gov 
-  RFC2147          ||       D. Borman         ||         
-  RFC2148          ||       H. Alvestrand, P. Jurg         ||         
-  RFC2149          ||       R. Talpade, M. Ammar         ||         
-  RFC2150          ||       J. Max, W. Stickle         ||        jlm@rainfarm.com, wls@rainfarm.com 
-  RFC2151          ||       G. Kessler, S. Shepard         ||         
-  RFC2152          ||       D. Goldsmith, M. Davis         ||        goldsmith@apple.com, mark_davis@taligent.com 
-  RFC2153          ||      W. Simpson         ||       
-  RFC2154          ||       S. Murphy, M. Badger, B. Wellington         ||         
-  RFC2155          ||       B. Clouston, B. Moore         ||         
-  RFC2156          ||       S. Kille         ||         
-  RFC2157          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
-  RFC2158          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
-  RFC2159          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
-  RFC2160          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
-  RFC2161          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
-  RFC2162          ||       C. Allocchio         ||        Claudio.Allocchio@elettra.Trieste.it 
-  RFC2163          ||       C. Allocchio         ||         
-  RFC2164          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC2165          ||       J. Veizades, E. Guttman, C. Perkins, S. Kaplan         ||        cperkins@Corp.sun.com 
-  RFC2166          ||       D. Bryant, P. Brittain         ||         
-  RFC2167          ||       S. Williamson, M. Kosters, D. Blacka, J. Singh, K. Zeilstra         ||         
-  RFC2168          ||       R. Daniel, M. Mealling         ||         
-  RFC2169          ||       R. Daniel         ||         
-  RFC2170          ||       W. Almesberger, J. Le Boudec, P. Oechslin         ||         
-  RFC2171          ||       K. Murakami, M. Maruyama         ||         
-  RFC2172          ||       M. Maruyama, K. Murakami         ||         
-  RFC2173          ||       K. Murakami, M. Maruyama         ||         
-  RFC2174          ||       K. Murakami, M. Maruyama         ||         
-  RFC2175          ||       K. Murakami, M. Maruyama         ||         
-  RFC2176          ||      K. Murakami, M. Maruyama         ||       
-  RFC2177          ||       B. Leiba         ||         
-  RFC2178          ||      J. Moy         ||       jmoy@casc.com
-  RFC2179          ||       A. Gwinn         ||        allen@mail.cox.smu.edu, ssh@wwsi.com 
-  RFC2180          ||       M. Gahrns         ||        mikega@microsoft.com 
-  RFC2181          ||      R. Elz, R. Bush         ||       kre@munnari.OZ.AU, randy@psg.com
-  RFC2182          ||       R. Elz, R. Bush, S. Bradner, M. Patton         ||        kre@munnari.OZ.AU, randy@psg.com, sob@harvard.edu, MAP@POBOX.COM 
-  RFC2183          ||      R. Troost, S. Dorner, K. Moore, Ed.         ||       rens@century.com, sdorner@qualcomm.com
-  RFC2184          ||       N. Freed, K. Moore         ||         
-  RFC2185          ||       R. Callon, D. Haskin         ||         
-  RFC2186          ||       D. Wessels, K. Claffy         ||        wessels@nlanr.net, kc@nlanr.net 
-  RFC2187          ||       D. Wessels, K. Claffy         ||        wessels@nlanr.net, kc@nlanr.net 
-  RFC2188          ||       M. Banan, M. Taylor, J. Cheng         ||         
-  RFC2189          ||      A. Ballardie         ||       
-  RFC2190          ||       C. Zhu         ||        czhu@ibeam.intel.com 
-  RFC2191          ||       G. Armitage         ||        gja@dnrc.bell-labs.com 
-  RFC2192          ||      C. Newman         ||       chris.newman@innosoft.com
-  RFC2193          ||       M. Gahrns         ||        mikega@microsoft.com 
-  RFC2194          ||       B. Aboba, J. Lu, J. Alsop, J. Ding, W. Wang         ||        bernarda@microsoft.com, juanlu@aimnet.net, jalsop@ipass.com, ding@bjai.asiainfo.com, weiwang@merit.edu 
-  RFC2195          ||       J. Klensin, R. Catoe, P. Krumviede         ||        klensin@mci.net, randy@mci.net, paul@mci.net 
-  RFC2196          ||       B. Fraser         ||         
-  RFC2197          ||       N. Freed         ||        ned.freed@innosoft.com 
-  RFC2198          ||      C. Perkins, I. Kouvelas, O. Hodson, V. Hardman, M. Handley, J.C. Bolot, A. Vega-Garcia, S. Fosse-Parisis         ||       mjh@isi.edu
-  RFC2199          ||       A. Ramos         ||        ramos@isi.edu 
-  RFC2200          ||       J. Postel         ||         
-  RFC2201          ||      A. Ballardie         ||       
-  RFC2202          ||       P. Cheng, R. Glenn         ||        pau@watson.ibm.com, rob.glenn@nist.gov 
-  RFC2203          ||      M. Eisler, A. Chiu, L. Ling         ||       mre@eng.sun.com, hacker@eng.sun.com, lling@eng.sun.com
-  RFC2204          ||      D. Nash         ||       dnash@ford.com
-  RFC2205          ||      R. Braden, Ed., L. Zhang, S. Berson, S. Herzog, S. Jamin         ||       Braden@ISI.EDU, lixia@cs.ucla.edu, Berson@ISI.EDU, Herzog@WATSON.IBM.COM, jamin@EECS.UMICH.EDU
-  RFC2206          ||       F. Baker, J. Krawczyk, A. Sastry         ||        fred@cisco.com, jjk@tiac.net, arun@cisco.com 
-  RFC2207          ||       L. Berger, T. O'Malley         ||        timo@bbn.com 
-  RFC2208          ||      A. Mankin, Ed., F. Baker, B. Braden, S. Bradner, M. O'Dell, A. Romanow, A. Weinrib, L. Zhang         ||       aweinrib@ibeam.intel.com, braden@isi.edu, lixia@cs.ucla.edu, allyn@eng.sun.com, mo@uu.net
-  RFC2209          ||       R. Braden, L. Zhang         ||        Braden@ISI.EDU, lixia@cs.ucla.edu 
-  RFC2210          ||       J. Wroclawski         ||        jtw@lcs.mit.edu 
-  RFC2211          ||       J. Wroclawski         ||        jtw@lcs.mit.edu 
-  RFC2212          ||       S. Shenker, C. Partridge, R. Guerin         ||        shenker@parc.xerox.com, craig@bbn.com, guerin@watson.ibm.com 
-  RFC2213          ||       F. Baker, J. Krawczyk, A. Sastry         ||        fred@cisco.com, jjk@tiac.net, arun@cisco.com 
-  RFC2214          ||       F. Baker, J. Krawczyk, A. Sastry         ||        fred@cisco.com, jjk@tiac.net, arun@cisco.com 
-  RFC2215          ||       S. Shenker, J. Wroclawski         ||        shenker@parc.xerox.com, jtw@lcs.mit.edu 
-  RFC2216          ||       S. Shenker, J. Wroclawski         ||        shenker@parc.xerox.com, jtw@lcs.mit.edu 
-  RFC2217          ||       G. Clark         ||        glenc@cisco.com 
-  RFC2218          ||       T. Genovese, B. Jennings         ||        TonyG@Microsoft.com, jennings@sandia.gov 
-  RFC2219          ||       M. Hamilton, R. Wright         ||        m.t.hamilton@lut.ac.uk, wright@lbl.gov 
-  RFC2220          ||       R. Guenther         ||        rgue@loc.gov 
-  RFC2221          ||       M. Gahrns         ||        mikega@microsoft.com 
-  RFC2222          ||       J. Myers         ||        jgmyers@netscape.com 
-  RFC2223          ||      J. Postel, J. Reynolds         ||       Postel@ISI.EDU, jkrey@isi.edu, dwaitzman@BBN.COM
-  RFC2224          ||       B. Callaghan         ||        brent.callaghan@eng.sun.com 
-  RFC2225          ||      M. Laubach, J. Halpern         ||       
-  RFC2226          ||       T. Smith, G. Armitage         ||        tjsmith@vnet.ibm.com, gja@lucent.com 
-  RFC2227          ||       J. Mogul, P. Leach         ||        mogul@wrl.dec.com, paulle@microsoft.com 
-  RFC2228          ||       M. Horowitz, S. Lunt         ||        marc@cygnus.com 
-  RFC2229          ||       R. Faith, B. Martin         ||        faith@cs.unc.edu, bamartin@miranda.org 
-  RFC2230          ||       R. Atkinson         ||         
-  RFC2231          ||      N. Freed, K. Moore         ||       ned.freed@innosoft.com, moore@cs.utk.edu
-  RFC2232          ||       B. Clouston, Ed., B. Moore, Ed.         ||        clouston@cisco.com, remoore@ralvm6.vnet.ibm.com 
-  RFC2233          ||       K. McCloghrie, F. Kastenholz         ||        kzm@cisco.com, kasten@ftp.com 
-  RFC2234          ||      D. Crocker, Ed., P. Overell         ||       dcrocker@bbiw.net, paul@bayleaf.org.uk
-  RFC2235          ||       R. Zakon         ||        zakon@info.isoc.org 
-  RFC2236          ||      W. Fenner         ||       fenner@parc.xerox.com
-  RFC2237          ||       K. Tamaru         ||        kenzat@microsoft.com 
-  RFC2238          ||       B. Clouston, Ed., B. Moore, Ed.         ||        clouston@cisco.com, remoore@ralvm6.vnet.ibm.com 
-  RFC2239          ||       K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie, S. Roberts         ||        kdegraaf@isd.3com.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com, sroberts@farallon.com 
-  RFC2240          ||       O. Vaughan         ||        owain@vaughan.com 
-  RFC2241          ||       D. Provan         ||        donp@Novell.Com 
-  RFC2242          ||       R. Droms, K. Fong         ||         
-  RFC2243          ||       C. Metz         ||         
-  RFC2244          ||      C. Newman, J. G. Myers         ||       
-  RFC2245          ||       C. Newman         ||         
-  RFC2246          ||      T. Dierks, C. Allen         ||       tdierks@certicom.com, pck@netcom.com, relyea@netscape.com, jar@netscape.com, msabin@netcom.com, dansimon@microsoft.com, tomw@netscape.com, hugo@watson.ibm.com
-  RFC2247          ||       S. Kille, M. Wahl, A. Grimstad, R. Huber, S. Sataluri         ||        S.Kille@ISODE.COM, M.Wahl@critical-angle.com, alg@att.com, rvh@att.com, sri@att.com 
-  RFC2248          ||       N. Freed, S. Kille         ||        ned.freed@innosoft.com, S.Kille@isode.com 
-  RFC2249          ||       N. Freed, S. Kille         ||        ned.freed@innosoft.com, S.Kille@isode.com 
-  RFC2250          ||       D. Hoffman, G. Fernando, V. Goyal, M. Civanlar         ||        gerard.fernando@eng.sun.com, goyal@precept.com, don.hoffman@eng.sun.com, civanlar@research.att.com 
-  RFC2251          ||       M. Wahl, T. Howes, S. Kille         ||        M.Wahl@critical-angle.com, howes@netscape.com, S.Kille@isode.com 
-  RFC2252          ||       M. Wahl, A. Coulbeck, T. Howes, S. Kille         ||        M.Wahl@critical-angle.com, A.Coulbeck@isode.com, howes@netscape.com, S.Kille@isode.com 
-  RFC2253          ||       M. Wahl, S. Kille, T. Howes         ||        M.Wahl@critical-angle.com, S.Kille@ISODE.COM, howes@netscape.com 
-  RFC2254          ||       T. Howes         ||        howes@netscape.com 
-  RFC2255          ||       T. Howes, M. Smith         ||        howes@netscape.com, mcs@netscape.com 
-  RFC2256          ||       M. Wahl         ||        M.Wahl@critical-angle.com 
-  RFC2257          ||       M. Daniele, B. Wijnen, D. Francisco         ||        daniele@zk3.dec.com, wijnen@vnet.ibm.com, dfrancis@cisco.com 
-  RFC2258          ||       J. Ordille         ||        joann@bell-labs.com 
-  RFC2259          ||       J. Elliott, J. Ordille         ||        jim@apocalypse.org, joann@bell-labs.com 
-  RFC2260          ||       T. Bates, Y. Rekhter         ||        tbates@cisco.com, yakov@cisco.com 
-  RFC2261          ||       D. Harrington, R. Presuhn, B. Wijnen         ||         
-  RFC2262          ||       J. Case, D. Harrington, R. Presuhn, B. Wijnen         ||         
-  RFC2263          ||       D. Levi, P. Meyer, B. Stewart         ||         
-  RFC2264          ||       U. Blumenthal, B. Wijnen         ||         
-  RFC2265          ||       B. Wijnen, R. Presuhn, K. McCloghrie         ||         
-  RFC2266          ||       J. Flick         ||         
-  RFC2267          ||       P. Ferguson, D. Senie         ||        ferguson@cisco.com, dts@senie.com 
-  RFC2268          ||       R. Rivest         ||        rsa-labs@rsa.com 
-  RFC2269          ||       G. Armitage         ||        gja@lucent.com 
-  RFC2270          ||       J. Stewart, T. Bates, R. Chandra, E. Chen         ||        jstewart@isi.edu, tbates@cisco.com, rchandra@cisco.com, enkechen@cisco.com 
-  RFC2271          ||       D. Harrington, R. Presuhn, B. Wijnen         ||         
-  RFC2272          ||       J. Case, D. Harrington, R. Presuhn, B. Wijnen         ||         
-  RFC2273          ||       D. Levi, P. Meyer, B. Stewart         ||         
-  RFC2274          ||       U. Blumenthal, B. Wijnen         ||         
-  RFC2275          ||       B. Wijnen, R. Presuhn, K. McCloghrie         ||         
-  RFC2276          ||       K. Sollins         ||        sollins@lcs.mit.edu 
-  RFC2277          ||       H. Alvestrand         ||        Harald.T.Alvestrand@uninett.no 
-  RFC2278          ||       N. Freed, J. Postel         ||        ned.freed@innosoft.com, Postel@ISI.EDU 
-  RFC2279          ||       F. Yergeau         ||        fyergeau@alis.com 
-  RFC2280          ||       C. Alaettinoglu, T. Bates, E. Gerich, D. Karrenberg, D. Meyer, M. Terpstra, C. Villamizar         ||        cengiz@isi.edu, tbates@cisco.com, epg@home.net, dfk@ripe.net, meyer@antc.uoregon.edu, marten@BayNetworks.com, curtis@ans.net 
-  RFC2281          ||       T. Li, B. Cole, P. Morton, D. Li         ||        tli@juniper.net, cole@juniper.net, pmorton@cisco.com, dawnli@cisco.com 
-  RFC2282          ||       J. Galvin         ||         
-  RFC2283          ||       T. Bates, R. Chandra, D. Katz, Y. Rekhter         ||         
-  RFC2284          ||       L. Blunk, J. Vollbrecht         ||        ljb@merit.edu, jrv@merit.edu 
-  RFC2285          ||       R. Mandeville         ||        bob.mandeville@eunet.fr 
-  RFC2286          ||       J. Kapp         ||        skapp@reapertech.com 
-  RFC2287          ||       C. Krupczak, J. Saperia         ||        cheryl@empiretech.com 
-  RFC2288          ||       C. Lynch, C. Preston, R. Daniel         ||        cliff@cni.org, cecilia@well.com, rdaniel@acl.lanl.gov 
-  RFC2289          ||       N. Haller, C. Metz, P. Nesser, M. Straw         ||         
-  RFC2290          ||       J. Solomon, S. Glass         ||        solomon@comm.mot.com, glass@ftp.com 
-  RFC2291          ||       J. Slein, F. Vitali, E. Whitehead, D. Durand         ||        slein@wrc.xerox.com, fabio@cs.unibo.it, ejw@ics.uci.edu, dgd@cs.bu.edu 
-  RFC2292          ||       W. Stevens, M. Thomas         ||        rstevens@kohala.com, matt.thomas@altavista-software.com 
-  RFC2293          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC2294          ||       S. Kille         ||        S.Kille@ISODE.COM 
-  RFC2295          ||       K. Holtman, A. Mutz         ||        koen@win.tue.nl, mutz@hpl.hp.com 
-  RFC2296          ||       K. Holtman, A. Mutz         ||        koen@win.tue.nl, mutz@hpl.hp.com 
-  RFC2297          ||      P. Newman, W. Edwards, R. Hinden, E. Hoffman, F. Ching Liaw, T. Lyon, G. Minshall         ||       bob.hinden@gmail.com
-  RFC2298          ||       R. Fajman         ||        raf@cu.nih.gov 
-  RFC2299          ||       A. Ramos         ||        ramos@isi.edu 
-  RFC2300          ||       J. Postel         ||        Postel@ISI.EDU 
-  RFC2301          ||       L. McIntyre, S. Zilles, R. Buckley, D. Venable, G. Parsons, J. Rafferty         ||         
-  RFC2302          ||       G. Parsons, J. Rafferty, S. Zilles         ||         
-  RFC2303          ||       C. Allocchio         ||         
-  RFC2304          ||       C. Allocchio         ||         
-  RFC2305          ||       K. Toyoda, H. Ohno, J. Murai, D. Wing         ||         
-  RFC2306          ||       G. Parsons, J. Rafferty         ||         
-  RFC2307          ||       L. Howard         ||        lukeh@xedoc.com 
-  RFC2308          ||      M. Andrews         ||       Mark.Andrews@cmis.csiro.au
-  RFC2309          ||      B. Braden, D. Clark, J. Crowcroft, B. Davie, S. Deering, D. Estrin, S. Floyd, V. Jacobson, G. Minshall, C. Partridge, L. Peterson, K. Ramakrishnan, S. Shenker, J. Wroclawski, L. Zhang         ||       Braden@ISI.EDU, DDC@lcs.mit.edu, Jon.Crowcroft@cs.ucl.ac.uk, bdavie@cisco.com, deering@cisco.com, Estrin@usc.edu, Floyd@ee.lbl.gov, Van@ee.lbl.gov, Minshall@fiberlane.com, craig@bbn.com, LLP@cs.arizona.edu, KKRama@research.att.com, Shenker@parc.xerox.com, JTW@lcs.mit.edu, Lixia@cs.ucla.edu
-  RFC2310          ||       K. Holtman         ||        koen@win.tue.nl 
-  RFC2311          ||      S. Dusse, P. Hoffman, B. Ramsdell, L. Lundblade, L. Repka         ||       spock@rsa.com, phoffman@imc.org, blaker@deming.com, lgl@qualcomm.com, repka@netscape.com
-  RFC2312          ||      S. Dusse, P. Hoffman, B. Ramsdell, J. Weinstein         ||       spock@rsa.com, phoffman@imc.org, blaker@deming.com, jsw@netscape.com
-  RFC2313          ||       B. Kaliski         ||        burt@rsa.com 
-  RFC2314          ||       B. Kaliski         ||        burt@rsa.com 
-  RFC2315          ||       B. Kaliski         ||        burt@rsa.com 
-  RFC2316          ||       S. Bellovin         ||         
-  RFC2317          ||       H. Eidnes, G. de Groot, P. Vixie         ||        Havard.Eidnes@runit.sintef.no, GeertJan.deGroot@bsdi.com, paul@vix.com 
-  RFC2318          ||       H. Lie, B. Bos, C. Lilley         ||        howcome@w3.org, bert@w3.org, chris@w3.org 
-  RFC2319          ||      KOI8-U Working Group         ||       
-  RFC2320          ||       M. Greene, J. Luciani, K. White, T. Kuo         ||        maria@xedia.com, luciani@baynetworks.com, kennethw@vnet.ibm.com, ted_kuo@Baynetworks.com 
-  RFC2321          ||       A. Bressen         ||        bressen@leftbank.com 
-  RFC2322          ||       K. van den Hout, A. Koopal, R. van Mook         ||        koos@cetis.hvu.nl, andre@NL.net, remco@sateh.com 
-  RFC2323          ||       A. Ramos         ||        ramos@isi.edu 
-  RFC2324          ||      L. Masinter         ||       masinter@parc.xerox.com
-  RFC2325          ||       M. Slavitch         ||        slavitch@loran.com 
-  RFC2326          ||      H. Schulzrinne, A. Rao, R. Lanphier         ||       schulzrinne@cs.columbia.edu, anup@netscape.com, robla@real.com
-  RFC2327          ||       M. Handley, V. Jacobson         ||         
-  RFC2328          ||      J. Moy         ||       jmoy@casc.com
-  RFC2329          ||       J. Moy         ||        jmoy@casc.com 
-  RFC2330          ||      V. Paxson, G. Almes, J. Mahdavi, M. Mathis         ||       vern@ee.lbl.gov, almes@advanced.org, mahdavi@psc.edu, mathis@psc.edu
-  RFC2331          ||       M. Maher         ||        maher@isi.edu 
-  RFC2332          ||       J. Luciani, D. Katz, D. Piscitello, B. Cole, N. Doraswamy         ||        dkatz@cisco.com, luciani@baynetworks.com, bcole@jnx.com, naganand@baynetworks.com 
-  RFC2333          ||       D. Cansever         ||        dcansever@gte.com 
-  RFC2334          ||       J. Luciani, G. Armitage, J. Halpern, N. Doraswamy         ||        luciani@baynetworks.com, gja@lucent.com, jhalpern@Newbridge.COM, naganand@baynetworks.com 
-  RFC2335          ||       J. Luciani         ||        luciani@baynetworks.com 
-  RFC2336          ||      J. Luciani         ||       
-  RFC2337          ||       D. Farinacci, D. Meyer, Y. Rekhter         ||         
-  RFC2338          ||      S. Knight, D. Weaver, D. Whipple, R. Hinden, D. Mitzel, P. Hunt, P. Higginson, M. Shand, A. Lindem         ||       Steven.Knight@ascend.com, Doug.Weaver@ascend.com, dwhipple@microsoft.com, bob.hinden@gmail.com, mitzel@iprg.nokia.com, hunt@iprg.nokia.com, higginson@mail.dec.com, shand@mail.dec.com
-  RFC2339          ||       The Internet Society, Sun Microsystems         ||         
-  RFC2340          ||       B. Jamoussi, D. Jamieson, D. Williston, S. Gabe         ||        jamoussi@Nortel.ca, djamies@Nortel.ca, danwil@Nortel.ca, spgabe@Nortel.ca 
-  RFC2341          ||       A. Valencia, M. Littlewood, T. Kolar         ||        tkolar@cisco.com, littlewo@cisco.com, valencia@cisco.com 
-  RFC2342          ||       M. Gahrns, C. Newman         ||        mikega@microsoft.com, chris.newman@innosoft.com 
-  RFC2343          ||       M. Civanlar, G. Cash, B. Haskell         ||        civanlar@research.att.com, glenn@research.att.com, bgh@research.att.com 
-  RFC2344          ||       G. Montenegro, Ed.         ||         
-  RFC2345          ||       J. Klensin, T. Wolf, G. Oglesby         ||        klensin@mci.net, ted@usa.net, gary@mci.net 
-  RFC2346          ||       J. Palme         ||        jpalme@dsv.su.se 
-  RFC2347          ||       G. Malkin, A. Harkin         ||        gmalkin@baynetworks.com, ash@cup.hp.com 
-  RFC2348          ||       G. Malkin, A. Harkin         ||        gmalkin@baynetworks.com, ash@cup.hp.com 
-  RFC2349          ||       G. Malkin, A. Harkin         ||        gmalkin@baynetworks.com, ash@cup.hp.com 
-  RFC2350          ||       N. Brownlee, E. Guttman         ||        n.brownlee@auckland.ac.nz, Erik.Guttman@sun.com 
-  RFC2351          ||       A. Robert         ||        arobert@par1.par.sita.int 
-  RFC2352          ||       O. Vaughan         ||        owain@vaughan.com 
-  RFC2353          ||       G. Dudley         ||        dudleyg@us.ibm.com 
-  RFC2354          ||       C. Perkins, O. Hodson         ||        c.perkins@cs.ucl.ac.uk, o.hodson@cs.ucl.ac.uk 
-  RFC2355          ||      B. Kelly         ||       kellywh@mail.auburn.edu
-  RFC2356          ||       G. Montenegro, V. Gupta         ||        gabriel.montenegro@Eng.Sun.COM, vipul.gupta@Eng.Sun.COM 
-  RFC2357          ||       A. Mankin, A. Romanow, S. Bradner, V. Paxson         ||        mankin@east.isi.edu, allyn@mci.net, sob@harvard.edu, vern@ee.lbl.gov 
-  RFC2358          ||       J. Flick, J. Johnson         ||        johnf@hprnd.rose.hp.com, jeff@redbacknetworks.com 
-  RFC2359          ||       J. Myers         ||        jgmyers@netscape.com 
-  RFC2360          ||       G. Scott         ||         
-  RFC2361          ||       E. Fleischman         ||        ericfl@microsoft.com, Eric.Fleischman@PSS.Boeing.com 
-  RFC2362          ||      D. Estrin, D. Farinacci, A. Helmy, D. Thaler, S. Deering, M. Handley, V. Jacobson, C. Liu, P. Sharma, L. Wei         ||       estrin@usc.edu, dino@cisco.com, ahelmy@catarina.usc.edu, thalerd@eecs.umich.edu, deering@parc.xerox.com, m.handley@cs.ucl.ac.uk, van@ee.lbl.gov, charley@catarina.usc.edu, puneet@catarina.usc.edu, lwei@cisco.com
-  RFC2363          ||       G. Gross, M. Kaycee, A. Li, A. Malis, J. Stephens         ||        gmgross@lucent.com, mjk@nj.paradyne.com, alin@shastanets.com, malis@ascend.com, john@cayman.com 
-  RFC2364          ||       G. Gross, M. Kaycee, A. Li, A. Malis, J. Stephens         ||        gmgross@lucent.com, mjk@nj.paradyne.com, alin@shastanets.com, malis@ascend.com, john@cayman.com 
-  RFC2365          ||       D. Meyer         ||        dmm@cisco.com 
-  RFC2366          ||       C. Chung, M. Greene         ||        cchung@tieo.saic.com 
-  RFC2367          ||       D. McDonald, C. Metz, B. Phan         ||        danmcd@eng.sun.com, cmetz@inner.net, phan@itd.nrl.navy.mil 
-  RFC2368          ||      P. Hoffman, L. Masinter, J. Zawinski         ||       
-  RFC2369          ||       G. Neufeld, J. Baer         ||         
-  RFC2370          ||      R. Coltun         ||       
-  RFC2371          ||       J. Lyon, K. Evans, J. Klein         ||        JimLyon@Microsoft.Com, Keith.Evans@Tandem.Com, Johannes.Klein@Tandem.Com 
-  RFC2372          ||       K. Evans, J. Klein, J. Lyon         ||        Keith.Evans@Tandem.Com, Johannes.Klein@Tandem.Com, JimLyon@Microsoft.Com 
-  RFC2373          ||      R. Hinden, S. Deering         ||       bob.hinden@gmail.com
-  RFC2374          ||      R. Hinden, M. O'Dell, S. Deering         ||       bob.hinden@gmail.com, mo@uunet.uu.net, deering@cisco.com
-  RFC2375          ||      R. Hinden, S. Deering         ||       bob.hinden@gmail.com, deering@cisco.com
-  RFC2376          ||       E. Whitehead, M. Murata         ||         
-  RFC2377          ||       A. Grimstad, R. Huber, S. Sataluri, M. Wahl         ||        alg@att.com, rvh@att.com, srs@lucent.com, M.Wahl@critical-angle.com 
-  RFC2378          ||       R. Hedberg, P. Pomes         ||        Roland.Hedberg@umdac.umu.se, ppomes@qualcomm.com 
-  RFC2379          ||       L. Berger         ||        lberger@fore.com 
-  RFC2380          ||       L. Berger         ||        lberger@fore.com 
-  RFC2381          ||       M. Garrett, M. Borden         ||        mwg@bellcore.com, mborden@baynetworks.com 
-  RFC2382          ||       E. Crawley, Ed., L. Berger, S. Berson, F. Baker, M. Borden, J. Krawczyk         ||        esc@argon.com, lberger@fore.com, berson@isi.edu, fred@cisco.com, mborden@baynetworks.com, jj@arrowpoint.com 
-  RFC2383          ||       M. Suzuki         ||        suzuki@nal.ecl.net 
-  RFC2384          ||       R. Gellens         ||        Randy@Qualcomm.Com 
-  RFC2385          ||      A. Heffernan         ||       ahh@cisco.com
-  RFC2386          ||       E. Crawley, R. Nair, B. Rajagopalan, H. Sandick         ||         
-  RFC2387          ||       E. Levinson         ||        XIson@cnj.digex.com 
-  RFC2388          ||      L. Masinter         ||       masinter@parc.xerox.com
-  RFC2389          ||       P. Hethmon, R. Elz         ||         
-  RFC2390          ||       T. Bradley, C. Brown, A. Malis         ||        tbradley@avici.com, cbrown@juno.com, malis@ascend.com 
-  RFC2391          ||       P. Srisuresh, D. Gan         ||        suresh@ra.lucent.com, dhg@juniper.net 
-  RFC2392          ||       E. Levinson         ||        XIson@cnj.digex.net 
-  RFC2393          ||       A. Shacham, R. Monsour, R. Pereira, M. Thomas         ||        shacham@cisco.com, rmonsour@hifn.com, rpereira@timestep.com, matt.thomas@altavista-software.com, naganand@baynetworks.com 
-  RFC2394          ||       R. Pereira         ||         
-  RFC2395          ||       R. Friend, R. Monsour         ||        rfriend@hifn.com, rmonsour@hifn.com 
-  RFC2396          ||       T. Berners-Lee, R. Fielding, L. Masinter         ||        timbl@w3.org, fielding@ics.uci.edu, masinter@parc.xerox.com 
-  RFC2397          ||      L. Masinter         ||       
-  RFC2398          ||       S. Parker, C. Schmechel         ||        sparker@eng.sun.com, cschmec@eng.sun.com 
-  RFC2399          ||       A. Ramos         ||        ramos@isi.edu 
-  RFC2400          ||       J. Postel, J. Reynolds         ||        Postel@ISI.EDU, JKRey@ISI.EDU 
-  RFC2401          ||       S. Kent, R. Atkinson         ||         
-  RFC2402          ||       S. Kent, R. Atkinson         ||         
-  RFC2403          ||       C. Madson, R. Glenn         ||         
-  RFC2404          ||       C. Madson, R. Glenn         ||         
-  RFC2405          ||       C. Madson, N. Doraswamy         ||         
-  RFC2406          ||       S. Kent, R. Atkinson         ||         
-  RFC2407          ||       D. Piper         ||        ddp@network-alchemy.com 
-  RFC2408          ||       D. Maughan, M. Schertler, M. Schneider, J. Turner         ||        wdm@tycho.ncsc.mil, mss@tycho.ncsc.mil, mjs@securify.com, jeff.turner@raba.com 
-  RFC2409          ||       D. Harkins, D. Carrel         ||        dharkins@cisco.com, carrel@ipsec.org 
-  RFC2410          ||       R. Glenn, S. Kent         ||         
-  RFC2411          ||      R. Thayer, N. Doraswamy, R. Glenn         ||       naganand@baynetworks.com, rob.glenn@nist.gov
-  RFC2412          ||       H. Orman         ||        ho@darpa.mil 
-  RFC2413          ||      S. Weibel, J. Kunze, C. Lagoze, M. Wolf         ||       weibel@oclc.org, jak@ckm.ucsf.edu, lagoze@cs.cornell.edu, misha.wolf@reuters.com
-  RFC2414          ||       M. Allman, S. Floyd, C. Partridge         ||        mallman@lerc.nasa.gov, floyd@ee.lbl.gov, craig@bbn.com 
-  RFC2415          ||       K. Poduri, K. Nichols         ||        kpoduri@Baynetworks.com, knichols@baynetworks.com 
-  RFC2416          ||       T. Shepard, C. Partridge         ||        shep@alum.mit.edu, craig@bbn.com 
-  RFC2417          ||       C. Chung, M. Greene         ||        chihschung@aol.com, maria@xedia.com 
-  RFC2418          ||      S. Bradner         ||       
-  RFC2419          ||       K. Sklower, G. Meyer         ||        sklower@CS.Berkeley.EDU 
-  RFC2420          ||       H. Kummert         ||        kummert@nentec.de 
-  RFC2421          ||       G. Vaudreuil, G. Parsons         ||        Glenn.Parsons@Nortel.ca, GregV@Lucent.Com 
-  RFC2422          ||       G. Vaudreuil, G. Parsons         ||        Glenn.Parsons@Nortel.ca, GregV@Lucent.Com 
-  RFC2423          ||       G. Vaudreuil, G. Parsons         ||        Glenn.Parsons@Nortel.ca, GregV@Lucent.Com 
-  RFC2424          ||       G. Vaudreuil, G. Parsons         ||        Glenn.Parsons@Nortel.ca, GregV@Lucent.Com 
-  RFC2425          ||      T. Howes, M. Smith, F. Dawson         ||       howes@netscape.com, mcs@netscape.com, frank_dawson@lotus.com
-  RFC2426          ||      F. Dawson, T. Howes         ||       
-  RFC2427          ||       C. Brown, A. Malis         ||        cbrown@juno.com, malis@ascend.com 
-  RFC2428          ||       M. Allman, S. Ostermann, C. Metz         ||        mallman@lerc.nasa.gov, ostermann@cs.ohiou.edu, cmetz@inner.net 
-  RFC2429          ||       C. Bormann, L. Cline, G. Deisher, T. Gardos, C. Maciocco, D. Newell, J. Ott, G. Sullivan, S. Wenger, C. Zhu         ||         
-  RFC2430          ||       T. Li, Y. Rekhter         ||        tli@juniper.net, yakov@cisco.com 
-  RFC2431          ||       D. Tynan         ||        dtynan@claddagh.ie 
-  RFC2432          ||       K. Dubray         ||        kdubray@ironbridgenetworks.com 
-  RFC2433          ||       G. Zorn, S. Cobb         ||        glennz@microsoft.com, stevec@microsoft.com 
-  RFC2434          ||      T. Narten, H. Alvestrand         ||       narten@raleigh.ibm.com, Harald@Alvestrand.no
-  RFC2435          ||       L. Berc, W. Fenner, R. Frederick, S. McCanne, P. Stewart         ||        berc@pa.dec.com, fenner@parc.xerox.com, frederick@parc.xerox.com, mccanne@cs.berkeley.edu, stewart@parc.xerox.com 
-  RFC2436          ||       R. Brett, S. Bradner, G. Parsons         ||        rfbrett@nortel.ca, sob@harvard.edu, Glenn.Parsons@Nortel.ca 
-  RFC2437          ||       B. Kaliski, J. Staddon         ||        burt@rsa.com, jstaddon@rsa.com 
-  RFC2438          ||       M. O'Dell, H. Alvestrand, B. Wijnen, S. Bradner         ||        mo@uu.net, Harald.Alvestrand@maxware.no, wijnen@vnet.ibm.com, sob@harvard.edu 
-  RFC2439          ||       C. Villamizar, R. Chandra, R. Govindan         ||        curtis@ans.net, rchandra@cisco.com, govindan@isi.edu 
-  RFC2440          ||      J. Callas, L. Donnerhacke, H. Finney, R. Thayer         ||       
-  RFC2441          ||       D. Cohen         ||        cohen@myri.com 
-  RFC2442          ||       N. Freed, D. Newman, J. Belissent, M. Hoy         ||        ned.freed@innosoft.com, dan.newman@innosoft.com, jacques.belissent@eng.sun.com 
-  RFC2443          ||       J. Luciani, A. Gallo         ||        luciani@baynetworks.com, gallo@raleigh.ibm.com 
-  RFC2444          ||       C. Newman         ||        chris.newman@innosoft.com 
-  RFC2445          ||      F. Dawson, D. Stenerson         ||       
-  RFC2446          ||      S. Silverberg, S. Mansour, F. Dawson, R. Hopson         ||       
-  RFC2447          ||      F. Dawson, S. Mansour, S. Silverberg         ||       
-  RFC2448          ||       M. Civanlar, G. Cash, B. Haskell         ||        civanlar@research.att.com, glenn@research.att.com, bgh@research.att.com 
-  RFC2449          ||      R. Gellens, C. Newman, L. Lundblade         ||       randy@qualcomm.com, chris.newman@innosoft.com, lgl@qualcomm.com
-  RFC2450          ||      R. Hinden         ||       bob.hinden@gmail.com
-  RFC2451          ||       R. Pereira, R. Adams         ||         
-  RFC2452          ||      M. Daniele         ||       daniele@zk3.dec.com
-  RFC2453          ||       G. Malkin         ||        gmalkin@baynetworks.com 
-  RFC2454          ||      M. Daniele         ||       daniele@zk3.dec.com
-  RFC2455          ||       B. Clouston, B. Moore         ||        clouston@cisco.com, remoore@us.ibm.com 
-  RFC2456          ||       B. Clouston, B. Moore         ||        clouston@cisco.com, remoore@us.ibm.com 
-  RFC2457          ||       B. Clouston, B. Moore         ||        clouston@cisco.com, remoore@us.ibm.com 
-  RFC2458          ||       H. Lu, M. Krishnaswamy, L. Conroy, S. Bellovin, F. Burg, A. DeSimone, K. Tewani, P. Davidson, H. Schulzrinne, K. Vishwanathan         ||        smb@research.att.com, fburg@hogpb.att.com, lwc@roke.co.uk, pauldav@nortel.ca, murali@bell-labs.com, hui-lan.lu@bell-labs.com, schulzrinne@cs.columbia.edu, tewani@att.com, kumar@isochrone.com 
-  RFC2459          ||       R. Housley, W. Ford, W. Polk, D. Solo         ||        housley@spyrus.com, wford@verisign.com, wpolk@nist.gov, david.solo@citicorp.com 
-  RFC2460          ||      S. Deering, R. Hinden         ||       deering@cisco.com, bob.hinden@gmail.com
-  RFC2461          ||      T. Narten, E. Nordmark, W. Simpson         ||       narten@raleigh.ibm.com, nordmark@sun.com, Bill.Simpson@um.cc.umich.edu
-  RFC2462          ||      S. Thomson, T. Narten         ||       
-  RFC2463          ||       A. Conta, S. Deering         ||        aconta@lucent.com, deering@cisco.com 
-  RFC2464          ||      M. Crawford         ||       crawdad@fnal.gov
-  RFC2465          ||      D. Haskin, S. Onishi         ||       dhaskin@baynetworks.com, sonishi@baynetworks.com
-  RFC2466          ||      D. Haskin, S. Onishi         ||       dhaskin@baynetworks.com, sonishi@baynetworks.com
-  RFC2467          ||      M. Crawford         ||       crawdad@fnal.gov
-  RFC2468          ||       V. Cerf         ||        vcerf@mci.net 
-  RFC2469          ||       T. Narten, C. Burton         ||        narten@raleigh.ibm.com, burton@rtp.vnet.ibm.com 
-  RFC2470          ||      M. Crawford, T. Narten, S. Thomas         ||       crawdad@fnal.gov, narten@raleigh.ibm.com, stephen.thomas@transnexus.com
-  RFC2471          ||      R. Hinden, R. Fink, J. Postel         ||       bob.hinden@gmail.com, rlfink@lbl.gov
-  RFC2472          ||      D. Haskin, E. Allen         ||       dhaskin@baynetworks.com, eallen@baynetworks.com
-  RFC2473          ||       A. Conta, S. Deering         ||        aconta@lucent.com, deering@cisco.com 
-  RFC2474          ||      K. Nichols, S. Blake, F. Baker, D. Black         ||       kmn@cisco.com, slblake@torrentnet.com, fred@cisco.com, black_david@emc.com
-  RFC2475          ||      S. Blake, D. Black, M. Carlson, E. Davies, Z. Wang, W. Weiss         ||       slblake@torrentnet.com, black_david@emc.com, mark.carlson@sun.com, elwynd@nortel.co.uk, zhwang@bell-labs.com, wweiss@lucent.com
-  RFC2476          ||       R. Gellens, J. Klensin         ||        Randy@Qualcomm.Com, klensin@mci.net 
-  RFC2477          ||       B. Aboba, G. Zorn         ||        bernarda@microsoft.com, glennz@microsoft.com 
-  RFC2478          ||       E. Baize, D. Pinkas         ||         
-  RFC2479          ||       C. Adams         ||        cadams@entrust.com 
-  RFC2480          ||       N. Freed         ||        ned.freed@innosoft.com 
-  RFC2481          ||       K. Ramakrishnan, S. Floyd         ||         
-  RFC2482          ||      K. Whistler, G. Adams         ||       kenw@sybase.com, glenn@spyglass.com
-  RFC2483          ||       M. Mealling, R. Daniel         ||        michaelm@rwhois.net, rdaniel@lanl.gov 
-  RFC2484          ||       G. Zorn         ||        glennz@microsoft.com 
-  RFC2485          ||       S. Drach         ||        drach@sun.com 
-  RFC2486          ||       B. Aboba, M. Beadles         ||        bernarda@microsoft.com, mbeadles@wcom.net 
-  RFC2487          ||       P. Hoffman         ||        phoffman@imc.org 
-  RFC2488          ||       M. Allman, D. Glover, L. Sanchez         ||        mallman@lerc.nasa.gov, Daniel.R.Glover@lerc.nasa.gov, lsanchez@ir.bbn.com 
-  RFC2489          ||       R. Droms         ||        droms@bucknell.edu 
-  RFC2490          ||       M. Pullen, R. Malghan, L. Lavu, G. Duan, J. Ma, H. Nah         ||        mpullen@gmu.edu, rmalghan@bacon.gmu.edu, llavu@bacon.gmu.edu, gduan@us.oracle.com, jma@newbridge.com, hnah@bacon.gmu.edu 
-  RFC2491          ||      G. Armitage, P. Schulter, M. Jork, G. Harter         ||       gja@lucent.com, paschulter@acm.org, jork@kar.dec.com, harter@zk3.dec.com
-  RFC2492          ||      G. Armitage, P. Schulter, M. Jork         ||       gja@lucent.com, paschulter@acm.org, jork@kar.dec.com
-  RFC2493          ||       K. Tesink, Ed.         ||        kaj@bellcore.com 
-  RFC2494          ||       D. Fowler, Ed.         ||        davef@newbridge.com 
-  RFC2495          ||       D. Fowler, Ed.         ||        davef@newbridge.com 
-  RFC2496          ||       D. Fowler, Ed.         ||        davef@newbridge.com 
-  RFC2497          ||      I. Souvatzis         ||       is@netbsd.org
-  RFC2498          ||       J. Mahdavi, V. Paxson         ||        mahdavi@psc.edu, vern@ee.lbl.gov 
-  RFC2499          ||       A. Ramos         ||        ramos@isi.edu 
-  RFC2500          ||       J. Reynolds, R. Braden         ||         
-  RFC2501          ||       S. Corson, J. Macker         ||        corson@isr.umd.edu, macker@itd.nrl.navy.mil 
-  RFC2502          ||       M. Pullen, M. Myjak, C. Bouwens         ||        mpullen@gmu.edu, mmyjak@virtualworkshop.com, christina.bouwens@cpmx.mail.saic.com 
-  RFC2503          ||       R. Moulton, M. Needleman         ||        ruth@muswell.demon.co.uk 
-  RFC2504          ||       E. Guttman, L. Leong, G. Malkin         ||        erik.guttman@sun.com, lorna@colt.net, gmalkin@baynetworks.com 
-  RFC2505          ||       G. Lindberg         ||         
-  RFC2506          ||       K. Holtman, A. Mutz, T. Hardie         ||        koen@win.tue.nl, andy_mutz@hp.com, hardie@equinix.com 
-  RFC2507          ||       M. Degermark, B. Nordgren, S. Pink         ||        micke@sm.luth.se, bcn@lulea.trab.se, steve@sm.luth.se 
-  RFC2508          ||       S. Casner, V. Jacobson         ||        casner@cisco.com, van@cisco.com 
-  RFC2509          ||       M. Engan, S. Casner, C. Bormann         ||        engan@effnet.com, casner@cisco.com, cabo@tzi.org 
-  RFC2510          ||       C. Adams, S. Farrell         ||        cadams@entrust.com, stephen.farrell@sse.ie 
-  RFC2511          ||       M. Myers, C. Adams, D. Solo, D. Kemp         ||        mmyers@verisign.com, cadams@entrust.com, david.solo@citicorp.com, dpkemp@missi.ncsc.mil 
-  RFC2512          ||       K. McCloghrie, J. Heinanen, W. Greene, A. Prasad         ||        kzm@cisco.com, jh@telia.fi, wedge.greene@mci.com, aprasad@cisco.com 
-  RFC2513          ||       K. McCloghrie, J. Heinanen, W. Greene, A. Prasad         ||        kzm@cisco.com, jh@telia.fi, wedge.greene@mci.com, aprasad@cisco.com 
-  RFC2514          ||       M. Noto, E. Spiegel, K. Tesink         ||        mspiegel@cisco.com, kaj@bellcore.com 
-  RFC2515          ||       K. Tesink, Ed         ||        kaj@bellcore.com 
-  RFC2516          ||       L. Mamakos, K. Lidl, J. Evarts, D. Carrel, D. Simone, R. Wheeler         ||        louie@uu.net, lidl@uu.net, jde@uu.net, carrel@RedBack.net, dan@RedBack.net, ross@routerware.com 
-  RFC2517          ||       R. Moats, R. Huber         ||        jayhawk@att.com, rvh@att.com 
-  RFC2518          ||      Y. Goland, E. Whitehead, A. Faizi, S. Carter, D. Jensen         ||       yarong@microsoft.com, ejw@ics.uci.edu, asad@netscape.com, srcarter@novell.com, dcjensen@novell.com
-  RFC2519          ||       E. Chen, J. Stewart         ||        enkechen@cisco.com, jstewart@juniper.net 
-  RFC2520          ||       J. Luciani, H. Suzuki, N. Doraswamy, D. Horton         ||        luciani@baynetworks.com, hsuzuki@cisco.com, naganand@baynetworks.com, d.horton@citr.com.au 
-  RFC2521          ||       P. Karn, W. Simpson         ||         
-  RFC2522          ||       P. Karn, W. Simpson         ||         
-  RFC2523          ||       P. Karn, W. Simpson         ||         
-  RFC2524          ||       M. Banan         ||         
-  RFC2525          ||       V. Paxson, M. Allman, S. Dawson, W. Fenner, J. Griner, I. Heavens, K. Lahey, J. Semke, B. Volz         ||        vern@aciri.org, sdawson@eecs.umich.edu, fenner@parc.xerox.com, jgriner@grc.nasa.gov, ian@spider.com, kml@nas.nasa.gov, semke@psc.edu, volz@process.com 
-  RFC2526          ||       D. Johnson, S. Deering         ||        dbj@cs.cmu.edu, deering@cisco.com 
-  RFC2527          ||       S. Chokhani, W. Ford         ||         
-  RFC2528          ||       R. Housley, W. Polk         ||        housley@spyrus.com, wpolk@nist.gov 
-  RFC2529          ||       B. Carpenter, C. Jung         ||        brian@hursley.ibm.com, cmj@3Com.com 
-  RFC2530          ||       D. Wing         ||        dwing-ietf@fuggles.com 
-  RFC2531          ||       G. Klyne, L. McIntyre         ||        GK@ACM.ORG, Lloyd.McIntyre@pahv.xerox.com 
-  RFC2532          ||       L. Masinter, D. Wing         ||        masinter@parc.xerox.com, dwing-ietf@fuggles.com 
-  RFC2533          ||       G. Klyne         ||        GK@ACM.ORG 
-  RFC2534          ||       L. Masinter, D. Wing, A. Mutz, K. Holtman         ||        masinter@parc.xerox.com, dwing-ietf@fuggles.com, koen@win.tue.nl 
-  RFC2535          ||       D. Eastlake 3rd         ||        dee3@us.ibm.com 
-  RFC2536          ||      D. Eastlake 3rd         ||       dee3@us.ibm.com
-  RFC2537          ||       D. Eastlake 3rd         ||        dee3@us.ibm.com 
-  RFC2538          ||       D. Eastlake 3rd, O. Gudmundsson         ||        dee3@us.ibm.com, ogud@tislabs.com 
-  RFC2539          ||      D. Eastlake 3rd         ||       dee3@us.ibm.com
-  RFC2540          ||       D. Eastlake 3rd         ||        dee3@us.ibm.com 
-  RFC2541          ||       D. Eastlake 3rd         ||        dee3@us.ibm.com 
-  RFC2542          ||       L. Masinter         ||        masinter@parc.xerox.com 
-  RFC2543          ||      M. Handley, H. Schulzrinne, E. Schooler, J. Rosenberg         ||       
-  RFC2544          ||      S. Bradner, J. McQuaid         ||       
-  RFC2545          ||       P. Marques, F. Dupont         ||         
-  RFC2546          ||       A. Durand, B. Buclin         ||        Alain.Durand@imag.fr, Bertrand.Buclin@ch.att.com 
-  RFC2547          ||       E. Rosen, Y. Rekhter         ||        erosen@cisco.com, yakov@cisco.com 
-  RFC2548          ||       G. Zorn         ||         
-  RFC2549          ||       D. Waitzman         ||        djw@vineyard.net 
-  RFC2550          ||       S. Glassman, M. Manasse, J. Mogul         ||        steveg@pa.dec.com, msm@pa.dec.com, mogul@pa.dec.com 
-  RFC2551          ||       S. Bradner         ||         
-  RFC2552          ||       M. Blinov, M. Bessonov, C. Clissmann         ||        mch@net-cs.ucd.ie, mikeb@net-cs.ucd.ie, ciaranc@net-cs.ucd.ie 
-  RFC2553          ||       R. Gilligan, S. Thomson, J. Bound, W. Stevens         ||        gilligan@freegate.com, set@thumper.bellcore.com, bound@zk3.dec.com, rstevens@kohala.com 
-  RFC2554          ||      J. Myers         ||       jgmyers@netscape.com
-  RFC2555          ||       RFC Editor, et al.         ||        braden@isi.edu, jkrey@isi.edu, crocker@mbl.edu, vcerf@mci.net, feinler@juno.com, celeste@isi.edu 
-  RFC2556          ||       S. Bradner         ||        sob@harvard.edu 
-  RFC2557          ||       J. Palme, A. Hopmann, N. Shelness         ||        jpalme@dsv.su.se, alexhop@microsoft.com, Shelness@lotus.com, stef@nma.com 
-  RFC2558          ||       K. Tesink         ||        kaj@research.telcordia.com 
-  RFC2559          ||       S. Boeyen, T. Howes, P. Richard         ||        sharon.boeyen@entrust.com, howes@netscape.com, patr@xcert.com 
-  RFC2560          ||      M. Myers, R. Ankney, A. Malpani, S. Galperin, C. Adams         ||       mmyers@verisign.com, rankney@erols.com, ambarish@valicert.com, galperin@mycfo.com, cadams@entrust.com
-  RFC2561          ||       K. White, R. Moore         ||        kennethw@vnet.ibm.com, remoore@us.ibm.com 
-  RFC2562          ||       K. White, R. Moore         ||        kennethw@vnet.ibm.com, remoore@us.ibm.com 
-  RFC2563          ||       R. Troll         ||        rtroll@corp.home.net 
-  RFC2564          ||       C. Kalbfleisch, C. Krupczak, R. Presuhn, J. Saperia         ||        cwk@verio.net, cheryl@empiretech.com, randy_presuhn@bmc.com, saperia@mediaone.net 
-  RFC2565          ||       R. Herriot, Ed., S. Butler, P. Moore, R. Turner         ||        rherriot@pahv.xerox.com, sbutler@boi.hp.com, paulmo@microsoft.com, rturner@sharplabs.com, rherriot@pahv.xerox.com 
-  RFC2566          ||      R. deBry, T. Hastings, R. Herriot, S. Isaacson, P. Powell         ||       sisaacson@novell.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com, debryro@uvsc.edu, papowell@astart.com
-  RFC2567          ||       F. Wright         ||         
-  RFC2568          ||       S. Zilles         ||         
-  RFC2569          ||      R. Herriot, Ed., T. Hastings, N. Jacobs, J. Martin         ||       rherriot@pahv.xerox.com, Norm.Jacobs@Central.sun.com, tom.hastings@alum.mit.edu, jkm@underscore.com
-  RFC2570          ||       J. Case, R. Mundy, D. Partain, B. Stewart         ||         
-  RFC2571          ||       B. Wijnen, D. Harrington, R. Presuhn         ||         
-  RFC2572          ||       J. Case, D. Harrington, R. Presuhn, B. Wijnen         ||         
-  RFC2573          ||       D. Levi, P. Meyer, B. Stewart         ||         
-  RFC2574          ||       U. Blumenthal, B. Wijnen         ||         
-  RFC2575          ||       B. Wijnen, R. Presuhn, K. McCloghrie         ||         
-  RFC2576          ||       R. Frye, D. Levi, S. Routhier, B. Wijnen         ||         
-  RFC2577          ||       M. Allman, S. Ostermann         ||        mallman@grc.nasa.gov, ostermann@cs.ohiou.edu 
-  RFC2578          ||      K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed.         ||       
-  RFC2579          ||      K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed.         ||       
-  RFC2580          ||      K. McCloghrie, Ed., D. Perkins, Ed., J. Schoenwaelder, Ed.         ||       
-  RFC2581          ||      M. Allman, V. Paxson, W. Stevens         ||       mallman@grc.nasa.gov, vern@aciri.org, rstevens@kohala.com
-  RFC2582          ||       S. Floyd, T. Henderson         ||         
-  RFC2583          ||       R. Carlson, L. Winkler         ||        RACarlson@anl.gov, lwinkler@anl.gov 
-  RFC2584          ||       B. Clouston, B. Moore         ||        clouston@cisco.com, remoore@us.ibm.com 
-  RFC2585          ||      R. Housley, P. Hoffman         ||       housley@spyrus.com, phoffman@imc.org 
-  RFC2586          ||       J. Salsman, H. Alvestrand         ||        James@bovik.org, Harald.T.Alvestrand@uninett.no 
-  RFC2587          ||       S. Boeyen, T. Howes, P. Richard         ||        sharon.boeyen@entrust.com, howes@netscape.com, patr@xcert.com 
-  RFC2588          ||       R. Finlayson         ||        finlayson@live.com 
-  RFC2589          ||       Y. Yaacovi, M. Wahl, T. Genovese         ||        yoramy@microsoft.com, tonyg@microsoft.com 
-  RFC2590          ||      A. Conta, A. Malis, M. Mueller         ||       aconta@lucent.com, malis@ascend.com, memueller@lucent.com
-  RFC2591          ||       D. Levi, J. Schoenwaelder         ||         
-  RFC2592          ||       D. Levi, J. Schoenwaelder         ||         
-  RFC2593          ||       J. Schoenwaelder, J. Quittek         ||        schoenw@ibr.cs.tu-bs.de, quittek@ccrle.nec.de 
-  RFC2594          ||       H. Hazewinkel, C. Kalbfleisch, J. Schoenwaelder         ||         
-  RFC2595          ||      C. Newman         ||       chris.newman@innosoft.com
-  RFC2596          ||       M. Wahl, T. Howes         ||        M.Wahl@innosoft.com, howes@netscape.com 
-  RFC2597          ||       J. Heinanen, F. Baker, W. Weiss, J. Wroclawski         ||        jh@telia.fi, fred@cisco.com, wweiss@lucent.com, jtw@lcs.mit.edu 
-  RFC2598          ||       V. Jacobson, K. Nichols, K. Poduri         ||        van@cisco.com, kmn@cisco.com, kpoduri@baynetworks.com 
-  RFC2599          ||       A. DeLaCruz         ||        delacruz@isi.edu 
-  RFC2600          ||       J. Reynolds, R. Braden         ||         
-  RFC2601          ||       M. Davison         ||        mike.davison@cisco.com 
-  RFC2602          ||       M. Davison         ||        mike.davison@cisco.com 
-  RFC2603          ||       M. Davison         ||        mike.davison@cisco.com 
-  RFC2604          ||       R. Gellens         ||        randy@qualcomm.com 
-  RFC2605          ||       G. Mansfield, S. Kille         ||        glenn@cysols.com, Steve.Kille@MessagingDirect.com 
-  RFC2606          ||      D. Eastlake 3rd, A. Panitz         ||       dee3@us.ibm.com, buglady@fuschia.net
-  RFC2607          ||       B. Aboba, J. Vollbrecht         ||        bernarda@microsoft.com, jrv@merit.edu 
-  RFC2608          ||       E. Guttman, C. Perkins, J. Veizades, M. Day         ||        Erik.Guttman@sun.com, cperkins@sun.com, veizades@home.net, mday@vinca.com 
-  RFC2609          ||       E. Guttman, C. Perkins, J. Kempf         ||        erik.guttman@sun.com, cperkins@sun.com, james.kempf@sun.com 
-  RFC2610          ||       C. Perkins, E. Guttman         ||        Charles.Perkins@Sun.Com, Erik.Guttman@Sun.Com 
-  RFC2611          ||      L. Daigle, D. van Gulik, R. Iannella, P. Faltstrom         ||       leslie@thinkingcat.com, Dirk.vanGulik@jrc.it, renato@dstc.edu.au, paf@swip.net
-  RFC2612          ||       C. Adams, J. Gilchrist         ||        carlisle.adams@entrust.com, jeff.gilchrist@entrust.com 
-  RFC2613          ||       R. Waterman, B. Lahaye, D. Romascanu, S. Waldbusser         ||        rich@allot.com, dromasca@gmail.com , waldbusser@ins.com 
-  RFC2614          ||       J. Kempf, E. Guttman         ||        james.kempf@sun.com, erik.guttman@sun.com 
-  RFC2615          ||       A. Malis, W. Simpson         ||        malis@ascend.com, wsimpson@GreenDragon.com 
-  RFC2616          ||      R. Fielding, J. Gettys, J. Mogul, H. Frystyk, L. Masinter, P. Leach, T. Berners-Lee         ||       fielding@ics.uci.edu, jg@w3.org, mogul@wrl.dec.com, frystyk@w3.org, masinter@parc.xerox.com, paulle@microsoft.com, timbl@w3.org
-  RFC2617          ||      J. Franks, P. Hallam-Baker, J. Hostetler, S. Lawrence, P. Leach, A. Luotonen, L. Stewart         ||       john@math.nwu.edu, pbaker@verisign.com, jeff@AbiSource.com, lawrence@agranat.com, paulle@microsoft.com, stewart@OpenMarket.com
-  RFC2618          ||       B. Aboba, G. Zorn         ||        bernarda@microsoft.com, glennz@microsoft.com 
-  RFC2619          ||       G. Zorn, B. Aboba         ||        bernarda@microsoft.com, glennz@microsoft.com 
-  RFC2620          ||       B. Aboba, G. Zorn         ||        bernarda@microsoft.com, glennz@microsoft.com 
-  RFC2621          ||       G. Zorn, B. Aboba         ||        bernarda@microsoft.com, glennz@microsoft.com 
-  RFC2622          ||      C. Alaettinoglu, C. Villamizar, E. Gerich, D. Kessens, D. Meyer, T. Bates, D. Karrenberg, M. Terpstra         ||       cengiz@isi.edu, curtis@avici.com, epg@home.net, David.Kessens@qwest.net, meyer@antc.uoregon.edu, tbates@cisco.com, dfk@ripe.net, marten@BayNetworks.com
-  RFC2623          ||      M. Eisler         ||       mre@eng.sun.com
-  RFC2624          ||       S. Shepler         ||        spencer.shepler@eng.sun.com 
-  RFC2625          ||       M. Rajagopal, R. Bhagwat, W. Rickard         ||        murali@gadzoox.com, raj@gadzoox.com, wayne@gadzoox.com 
-  RFC2626          ||       P. Nesser II         ||         
-  RFC2627          ||       D. Wallner, E. Harder, R. Agee         ||        dmwalln@orion.ncsc.mil, ejh@tycho.ncsc.mil 
-  RFC2628          ||       V. Smyslov         ||        svan@trustworks.com 
-  RFC2629          ||      M. Rose         ||       mrose17@gmail.com
-  RFC2630          ||       R. Housley         ||        housley@spyrus.com 
-  RFC2631          ||       E. Rescorla         ||        ekr@rtfm.com 
-  RFC2632          ||       B. Ramsdell, Ed.         ||         
-  RFC2633          ||       B. Ramsdell, Ed.         ||         
-  RFC2634          ||      P. Hoffman, Ed.         ||       phoffman@imc.org
-  RFC2635          ||       S. Hambridge, A. Lunde         ||         
-  RFC2636          ||       R. Gellens         ||        randy@qualcomm.com 
-  RFC2637          ||       K. Hamzeh, G. Pall, W. Verthein, J. Taarud, W. Little, G. Zorn         ||        kory@ascend.com, gurdeep@microsoft.com, glennz@microsoft.com 
-  RFC2638          ||      K. Nichols, V. Jacobson, L. Zhang         ||       kmn@cisco.com, van@cisco.com, lixia@cs.ucla.edu
-  RFC2639          ||      T. Hastings, C. Manros         ||       tom.hastings@alum.mit.edu, manros@cp10.es.xerox.com
-  RFC2640          ||       B. Curtin         ||        curtinw@ftm.disa.mil 
-  RFC2641          ||       D. Hamilton, D. Ruffen         ||        daveh@ctron.com, ruffen@ctron.com 
-  RFC2642          ||       L. Kane         ||        lkane@ctron.com 
-  RFC2643          ||      D. Ruffen, T. Len, J. Yanacek         ||       ruffen@ctron.com, len@ctron.com, jyanacek@ctron.com
-  RFC2644          ||       D. Senie         ||        dts@senie.com 
-  RFC2645          ||       R. Gellens         ||        randy@qualcomm.com 
-  RFC2646          ||       R. Gellens, Ed.         ||         
-  RFC2647          ||       D. Newman         ||         
-  RFC2648          ||      R. Moats         ||       jayhawk@att.com
-  RFC2649          ||       B. Greenblatt, P. Richard         ||        bgreenblatt@directory-applications.com, patr@xcert.com 
-  RFC2650          ||       D. Meyer, J. Schmitz, C. Orange, M. Prior, C. Alaettinoglu         ||        dmm@cisco.com, SchmitzJo@aol.com, orange@spiritone.com, mrp@connect.com.au, cengiz@isi.edu 
-  RFC2651          ||       J. Allen, M. Mealling         ||        jeff.allen@acm.org, michael.mealling@RWhois.net 
-  RFC2652          ||       J. Allen, M. Mealling         ||        jeff.allen@acm.org, michael.mealling@RWhois.net 
-  RFC2653          ||       J. Allen, P. Leach, R. Hedberg         ||        jeff.allen@acm.org, paulle@microsoft.com, roland@catalogix.ac.se 
-  RFC2654          ||       R. Hedberg, B. Greenblatt, R. Moats, M. Wahl         ||        roland@catalogix.ac.se, bgreenblatt@directory-applications.com, jayhawk@att.com 
-  RFC2655          ||       T. Hardie, M. Bowman, D. Hardy, M. Schwartz, D. Wessels         ||        hardie@equinix.com, mic@transarc.com, dhardy@netscape.com, wessels@nlanr.net 
-  RFC2656          ||       T. Hardie         ||        hardie@equinix.com 
-  RFC2657          ||       R. Hedberg         ||        roland@catalogix.ac.se 
-  RFC2658          ||       K. McKay         ||        kylem@qualcomm.com 
-  RFC2659          ||       E. Rescorla, A. Schiffman         ||        ekr@rtfm.com, ams@terisa.com 
-  RFC2660          ||       E. Rescorla, A. Schiffman         ||        ekr@rtfm.com, ams@terisa.com 
-  RFC2661          ||       W. Townsley, A. Valencia, A. Rubens, G. Pall, G. Zorn, B. Palter         ||        gurdeep@microsoft.com, palter@zev.net, acr@del.com, townsley@cisco.com, vandys@cisco.com, gwz@acm.org 
-  RFC2662          ||       G. Bathrick, F. Ly         ||        bathricg@agcs.com, faye@coppermountain.com 
-  RFC2663          ||       P. Srisuresh, M. Holdrege         ||        srisuresh@lucent.com, holdrege@lucent.com 
-  RFC2664          ||       R. Plzak, A. Wells, E. Krol         ||        plzakr@saic.com, awel@cs.wisc.edu, krol@uiuc.edu 
-  RFC2665          ||       J. Flick, J. Johnson         ||        johnf@rose.hp.com, jeff@redbacknetworks.com 
-  RFC2666          ||       J. Flick         ||        johnf@rose.hp.com 
-  RFC2667          ||       D. Thaler         ||        dthaler@microsoft.com 
-  RFC2668          ||       A. Smith, J. Flick, K. de Graaf, D. Romascanu, D. McMaster, K. McCloghrie, S. Roberts         ||        andrew@extremenetworks.com, johnf@rose.hp.com, kdegraaf@argon.com, dromasca@gmail.com , mcmaster@cisco.com, kzm@cisco.com, sroberts@farallon.com 
-  RFC2669          ||       M. St. Johns, Ed.         ||        stjohns@corp.home.net 
-  RFC2670          ||       M. St. Johns, Ed.         ||        stjohns@corp.home.net 
-  RFC2671          ||      P. Vixie         ||       vixie@isc.org
-  RFC2672          ||      M. Crawford         ||       crawdad@fnal.gov
-  RFC2673          ||      M. Crawford         ||       crawdad@fnal.gov
-  RFC2674          ||       E. Bell, A. Smith, P. Langille, A. Rijhsinghani, K. McCloghrie         ||        Les_Bell@3Com.com, andrew@extremenetworks.com, langille@newbridge.com, anil@cabletron.com, kzm@cisco.com 
-  RFC2675          ||      D. Borman, S. Deering, R. Hinden         ||       dab@bsdi.com, deering@cisco.com, bob.hinden@gmail.com
-  RFC2676          ||       G. Apostolopoulos, S. Kama, D. Williams, R. Guerin, A. Orda, T. Przygienda         ||        georgeap@watson.ibm.com, guerin@ee.upenn.edu, ariel@ee.technion.ac.il, dougw@watson.ibm.com 
-  RFC2677          ||       M. Greene, J. Cucchiara, J. Luciani         ||        luciani@baynetworks.com, maria@xedia.com, joan@ironbridgenetworks.com 
-  RFC2678          ||       J. Mahdavi, V. Paxson         ||        mahdavi@psc.edu, vern@ee.lbl.gov 
-  RFC2679          ||      G. Almes, S. Kalidindi, M. Zekauskas         ||       almes@advanced.org, kalidindi@advanced.org, matt@advanced.org
-  RFC2680          ||      G. Almes, S. Kalidindi, M. Zekauskas         ||       almes@advanced.org, kalidindi@advanced.org, matt@advanced.org
-  RFC2681          ||       G. Almes, S. Kalidindi, M. Zekauskas         ||        almes@advanced.org, kalidindi@advanced.org, matt@advanced.org 
-  RFC2682          ||       I. Widjaja, A. Elwalid         ||        indra.widjaja@fnc.fujitsu.com, anwar@lucent.com 
-  RFC2683          ||      B. Leiba         ||       leiba@watson.ibm.com
-  RFC2684          ||       D. Grossman, J. Heinanen         ||        dan@dma.isg.mot.com, jh@telia.fi 
-  RFC2685          ||       B. Fox, B. Gleeson         ||        barbarafox@lucent.com, bgleeson@shastanets.com 
-  RFC2686          ||       C. Bormann         ||        cabo@tzi.org 
-  RFC2687          ||       C. Bormann         ||        cabo@tzi.org 
-  RFC2688          ||       S. Jackowski, D. Putzolu, E. Crawley, B. Davie         ||        stevej@DeterministicNetworks.com, David.Putzolu@intel.com, esc@argon.com, bdavie@cisco.com 
-  RFC2689          ||       C. Bormann         ||        cabo@tzi.org 
-  RFC2690          ||       S. Bradner         ||         
-  RFC2691          ||       S. Bradner         ||         
-  RFC2692          ||       C. Ellison         ||        carl.m.ellison@intel.com 
-  RFC2693          ||       C. Ellison, B. Frantz, B. Lampson, R. Rivest, B. Thomas, T. Ylonen         ||        carl.m.ellison@intel.com, frantz@netcom.com, blampson@microsoft.com, rivest@theory.lcs.mit.edu, bt0008@sbc.com, ylo@ssh.fi 
-  RFC2694          ||       P. Srisuresh, G. Tsirtsis, P. Akkiraju, A. Heffernan         ||        srisuresh@yahoo.com, george@gideon.bt.co.uk, spa@cisco.com, ahh@juniper.net 
-  RFC2695          ||       A. Chiu         ||         
-  RFC2696          ||       C. Weider, A. Herron, A. Anantha, T. Howes         ||        cweider@microsoft.com, andyhe@microsoft.com, anoopa@microsoft.com, howes@netscape.com 
-  RFC2697          ||       J. Heinanen, R. Guerin         ||        jh@telia.fi, guerin@ee.upenn.edu 
-  RFC2698          ||       J. Heinanen, R. Guerin         ||        jh@telia.fi, guerin@ee.upenn.edu 
-  RFC2699          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC2700          ||       J. Reynolds, R. Braden         ||         
-  RFC2701          ||       G. Malkin         ||         
-  RFC2702          ||       D. Awduche, J. Malcolm, J. Agogbua, M. O'Dell, J. McManus         ||        awduche@uu.net, jmalcolm@uu.net, ja@uu.net, mo@uu.net, jmcmanus@uu.net 
-  RFC2703          ||       G. Klyne         ||        GK@ACM.ORG 
-  RFC2704          ||       M. Blaze, J. Feigenbaum, J. Ioannidis, A. Keromytis         ||        mab@research.att.com, jf@research.att.com, ji@research.att.com, angelos@dsl.cis.upenn.edu 
-  RFC2705          ||       M. Arango, A. Dugan, I. Elliott, C. Huitema, S. Pickett         ||        marango@rslcom.com, andrew.dugan@l3.com, ike.elliott@l3.com, huitema@research.telcordia.com, ScottP@vertical.com 
-  RFC2706          ||       D. Eastlake 3rd, T. Goldstein         ||        dee3@us.ibm.com, tgoldstein@brodia.com 
-  RFC2707          ||      R. Bergman, T. Hastings, S. Isaacson, H. Lewis         ||       rbergma@dpc.com, tom.hastings@alum.mit.edu, scott_isaacson@novell.com, harryl@us.ibm.com
-  RFC2708          ||      R. Bergman         ||       rbergman@dpc.com, tom.hastings@alum.mit.edu, scott_isaacson@novell.com, harryl@us.ibm.com, bpenteco@boi.hp.com
-  RFC2709          ||       P. Srisuresh         ||        srisuresh@lucent.com 
-  RFC2710          ||       S. Deering, W. Fenner, B. Haberman         ||        deering@cisco.com, fenner@research.att.com, haberman@raleigh.ibm.com 
-  RFC2711          ||      C. Partridge, A. Jackson         ||       craig@bbn.com, awjacks@bbn.com
-  RFC2712          ||       A. Medvinsky, M. Hur         ||        amedvins@excitecorp.com, matt.hur@cybersafe.com 
-  RFC2713          ||       V. Ryan, S. Seligman, R. Lee         ||        vincent.ryan@ireland.sun.com, scott.seligman@eng.sun.com, rosanna.lee@eng.sun.com 
-  RFC2714          ||       V. Ryan, R. Lee, S. Seligman         ||        vincent.ryan@ireland.sun.com, rosanna.lee@eng.sun.com, scott.seligman@eng.sun.com 
-  RFC2715          ||       D. Thaler         ||        dthaler@microsoft.com 
-  RFC2716          ||      B. Aboba, D. Simon         ||       bernarda@microsoft.com, dansimon@microsoft.com
-  RFC2717          ||      R. Petke, I. King         ||       rpetke@wcom.net, iking@microsoft.com
-  RFC2718          ||       L. Masinter, H. Alvestrand, D. Zigmond, R. Petke         ||        masinter@parc.xerox.com, harald.alvestrand@maxware.no, djz@corp.webtv.net, rpetke@wcom.net 
-  RFC2719          ||       L. Ong, I. Rytina, M. Garcia, H. Schwarzbauer, L. Coene, H. Lin, I. Juhasz, M. Holdrege, C. Sharp         ||        long@nortelnetworks.com, ian.rytina@ericsson.com, holdrege@lucent.com, lode.coene@siemens.atea.be, Miguel.A.Garcia@ericsson.com, chsharp@cisco.com, imre.i.juhasz@telia.se, hlin@research.telcordia.com, HannsJuergen.Schwarzbauer@icn.siemens.de 
-  RFC2720          ||       N. Brownlee         ||        n.brownlee@auckland.ac.nz 
-  RFC2721          ||       N. Brownlee         ||        n.brownlee@auckland.ac.nz 
-  RFC2722          ||       N. Brownlee, C. Mills, G. Ruth         ||        n.brownlee@auckland.ac.nz, cmills@gte.com, gruth@bbn.com 
-  RFC2723          ||       N. Brownlee         ||        n.brownlee@auckland.ac.nz 
-  RFC2724          ||       S. Handelman, S. Stibler, N. Brownlee, G. Ruth         ||        swhandel@us.ibm.com, stibler@us.ibm.com, n.brownlee@auckland.ac.nz, gruth@bbn.com 
-  RFC2725          ||       C. Villamizar, C. Alaettinoglu, D. Meyer, S. Murphy         ||        curtis@avici.com, cengiz@ISI.EDU, dmm@cisco.com, sandy@tis.com 
-  RFC2726          ||       J. Zsako         ||        zsako@banknet.net 
-  RFC2727          ||       J. Galvin         ||         
-  RFC2728          ||       R. Panabaker, S. Wegerif, D. Zigmond         ||         
-  RFC2729          ||       P. Bagnall, R. Briscoe, A. Poppitt         ||        pete@surfaceeffect.com, bob.briscoe@bt.com, apoppitt@jungle.bt.co.uk 
-  RFC2730          ||       S. Hanna, B. Patel, M. Shah         ||        steve.hanna@sun.com, baiju.v.patel@intel.com, munils@microsoft.com 
-  RFC2731          ||      J. Kunze         ||       jak@ckm.ucsf.edu
-  RFC2732          ||      R. Hinden, B. Carpenter, L. Masinter         ||       bob.hinden@gmail.com, brian@icair.org, LMM@acm.org
-  RFC2733          ||      J. Rosenberg, H. Schulzrinne         ||       schulzrinne@cs.columbia.edu
-  RFC2734          ||       P. Johansson         ||         
-  RFC2735          ||       B. Fox, B. Petri         ||        bfox@equipecom.com, bernhard.petri@icn.siemens.de 
-  RFC2736          ||       M. Handley, C. Perkins         ||        mjh@aciri.org, C.Perkins@cs.ucl.ac.uk 
-  RFC2737          ||       K. McCloghrie, A. Bierman         ||        kzm@cisco.com, andy@yumaworks.com
-  RFC2738          ||       G. Klyne         ||        GK@ACM.ORG 
-  RFC2739          ||      T. Small, D. Hennessy, F. Dawson         ||       
-  RFC2740          ||      R. Coltun, D. Ferguson, J. Moy         ||       rcoltun@siara.com, dennis@juniper.com, jmoy@sycamorenet.com
-  RFC2741          ||       M. Daniele, B. Wijnen, M. Ellison, D. Francisco         ||        daniele@zk3.dec.com, wijnen@vnet.ibm.com, ellison@world.std.com, dfrancis@cisco.com 
-  RFC2742          ||       L. Heintz, S. Gudur, M. Ellison         ||        lheintz@cisco.com, sgudur@hotmail.com 
-  RFC2743          ||      J. Linn         ||       
-  RFC2744          ||       J. Wray         ||        John_Wray@Iris.com 
-  RFC2745          ||       A. Terzis, B. Braden, S. Vincent, L. Zhang         ||        terzis@cs.ucla.edu, braden@isi.edu, svincent@cisco.com, lixia@cs.ucla.edu 
-  RFC2746          ||       A. Terzis, J. Krawczyk, J. Wroclawski, L. Zhang         ||        jj@arrowpoint.com, jtw@lcs.mit.edu, lixia@cs.ucla.edu, terzis@cs.ucla.edu 
-  RFC2747          ||       F. Baker, B. Lindell, M. Talwar         ||        fred@cisco.com, lindell@ISI.EDU, mohitt@microsoft.com 
-  RFC2748          ||       D. Durham, Ed., J. Boyle, R. Cohen, S. Herzog, R. Rajan, A. Sastry         ||         
-  RFC2749          ||       S. Herzog, Ed., J. Boyle, R. Cohen, D. Durham, R. Rajan, A. Sastry         ||         
-  RFC2750          ||       S. Herzog         ||         
-  RFC2751          ||       S. Herzog         ||         
-  RFC2752          ||       S. Yadav, R. Yavatkar, R. Pabbati, P. Ford, T. Moore, S. Herzog         ||         
-  RFC2753          ||       R. Yavatkar, D. Pendarakis, R. Guerin         ||        raj.yavatkar@intel.com, dimitris@watson.ibm.com, guerin@ee.upenn.edu 
-  RFC2754          ||      C. Alaettinoglu, C. Villamizar, R. Govindan         ||       cengiz@isi.edu, curtis@avici.com, govindan@isi.edu
-  RFC2755          ||       A. Chiu, M. Eisler, B. Callaghan         ||        alex.chiu@Eng.sun.com, michael.eisler@Eng.sun.com, brent.callaghan@Eng.sun.com 
-  RFC2756          ||       P. Vixie, D. Wessels         ||        vixie@isc.org, wessels@nlanr.net 
-  RFC2757          ||       G. Montenegro, S. Dawkins, M. Kojo, V. Magret, N. Vaidya         ||        gab@sun.com, sdawkins@nortel.com, kojo@cs.helsinki.fi, vincent.magret@aud.alcatel.com, vaidya@cs.tamu.edu 
-  RFC2758          ||       K. White         ||        wkenneth@us.ibm.com 
-  RFC2759          ||       G. Zorn         ||        gwz@acm.org 
-  RFC2760          ||       M. Allman, Ed., S. Dawkins, D. Glover, J. Griner, D. Tran, T. Henderson, J. Heidemann, J. Touch, H. Kruse, S. Ostermann, K. Scott, J. Semke         ||        mallman@grc.nasa.gov, Spencer.Dawkins.sdawkins@nt.com, Daniel.R.Glover@grc.nasa.gov, jgriner@grc.nasa.gov, dtran@grc.nasa.gov, tomh@cs.berkeley.edu, johnh@isi.edu, touch@isi.edu, hkruse1@ohiou.edu, ostermann@cs.ohiou.edu, kscott@mitre.org, semke@psc.edu 
-  RFC2761          ||       J. Dunn, C. Martin         ||         
-  RFC2762          ||       J. Rosenberg, H. Schulzrinne         ||        jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu 
-  RFC2763          ||      N. Shen, H. Smit         ||       naiming@siara.com, hsmit@cisco.com
-  RFC2764          ||       B. Gleeson, A. Lin, J. Heinanen, G. Armitage, A. Malis         ||         
-  RFC2765          ||      E. Nordmark         ||       nordmark@sun.com
-  RFC2766          ||      G. Tsirtsis, P. Srisuresh         ||       george.tsirtsis@bt.com, srisuresh@yahoo.com
-  RFC2767          ||      K. Tsuchiya, H. Higuchi, Y. Atarashi         ||       tsuchi@ebina.hitachi.co.jp, h-higuti@ebina.hitachi.co.jp, atarashi@ebina.hitachi.co.jp
-  RFC2768          ||       B. Aiken, J. Strassner, B. Carpenter, I. Foster, C. Lynch, J. Mambretti, R. Moore, B. Teitelbaum         ||        raiken@cisco.com, raiken@cisco.com, johns@cisco.com, brian@hursley.ibm.com, foster@mcs.anl.gov, cliff@cni.org, j-mambretti@nwu.edu, moore@sdsc.edu, ben@internet2.edu 
-  RFC2769          ||       C. Villamizar, C. Alaettinoglu, R. Govindan, D. Meyer         ||        curtis@avici.com, cengiz@ISI.EDU, govindan@ISI.EDU, dmm@cisco.com 
-  RFC2770          ||       D. Meyer, P. Lothberg         ||        dmm@cisco.com, roll@sprint.net 
-  RFC2771          ||       R. Finlayson         ||        finlayson@live.com 
-  RFC2772          ||       R. Rockell, R. Fink         ||        rrockell@sprint.net, fink@es.net 
-  RFC2773          ||       R. Housley, P. Yee, W. Nace         ||        housley@spyrus.com, yee@spyrus.com 
-  RFC2774          ||       H. Nielsen, P. Leach, S. Lawrence         ||        frystyk@microsoft.com, paulle@microsoft.com, lawrence@agranat.com 
-  RFC2775          ||       B. Carpenter         ||        brian@icair.org 
-  RFC2776          ||      M. Handley, D. Thaler, R. Kermode         ||       mjh@aciri.org, dthaler@microsoft.com, Roger.Kermode@motorola.com
-  RFC2777          ||       D. Eastlake 3rd         ||        Donald.Eastlake@motorola.com 
-  RFC2778          ||       M. Day, J. Rosenberg, H. Sugano         ||        mday@alum.mit.edu, suga@flab.fujitsu.co.jp 
-  RFC2779          ||       M. Day, S. Aggarwal, G. Mohr, J. Vincent         ||        mday@alum.mit.edu, sonuag@microsoft.com, gojomo@usa.net, jesse@intonet.com 
-  RFC2780          ||      S. Bradner, V. Paxson         ||       sob@harvard.edu, vern@aciri.org
-  RFC2781          ||       P. Hoffman, F. Yergeau         ||        phoffman@imc.org, fyergeau@alis.com 
-  RFC2782          ||      A. Gulbrandsen, P. Vixie, L. Esibov         ||       arnt@troll.no, levone@microsoft.com
-  RFC2783          ||       J. Mogul, D. Mills, J. Brittenson, J. Stone, U. Windl         ||        mogul@wrl.dec.com, mills@udel.edu, jonathan@dsg.stanford.edu, ulrich.windl@rz.uni-regensburg.de 
-  RFC2784          ||      D. Farinacci, T. Li, S. Hanks, D. Meyer, P. Traina         ||       dino@procket.com, tony1@home.net, stan_hanks@enron.net, dmm@cisco.com, pst@juniper.net
-  RFC2785          ||       R. Zuccherato         ||        robert.zuccherato@entrust.com 
-  RFC2786          ||       M. St. Johns         ||        stjohns@corp.home.net 
-  RFC2787          ||      B. Jewell, D. Chuang         ||       bjewell@coppermountain.com, david_chuang@cosinecom.com
-  RFC2788          ||       N. Freed, S. Kille         ||        ned.freed@innosoft.com, Steve.Kille@MessagingDirect.com 
-  RFC2789          ||       N. Freed, S. Kille         ||        ned.freed@innosoft.com, Steve.Kille@MessagingDirect.com 
-  RFC2790          ||       S. Waldbusser, P. Grillo         ||        waldbusser@ins.com 
-  RFC2791          ||       J. Yu         ||        jyy@cosinecom.com 
-  RFC2792          ||       M. Blaze, J. Ioannidis, A. Keromytis         ||         
-  RFC2793          ||       G. Hellstrom         ||        gunnar.hellstrom@omnitor.se 
-  RFC2794          ||       P. Calhoun, C. Perkins         ||         
-  RFC2795          ||       S. Christey         ||        steqve@shore.net 
-  RFC2796          ||       T. Bates, R. Chandra, E. Chen         ||        tbates@cisco.com, rchandra@redback.com, enke@redback.com 
-  RFC2797          ||      M. Myers, X. Liu, J. Schaad, J. Weinstein         ||       mmyers@verisign.com, xliu@cisco.com, jimsch@nwlink.com, jsw@meer.net
-  RFC2798          ||       M. Smith         ||        mcs@netscape.com 
-  RFC2799          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC2800          ||       J. Reynolds, R. Braden, S. Ginoza         ||         
-  RFC2801          ||       D. Burdett         ||        david.burdett@commerceone.com 
-  RFC2802          ||       K. Davidson, Y. Kawatsura         ||        kent@differential.com, kawatura@bisd.hitachi.co.jp 
-  RFC2803          ||       H. Maruyama, K. Tamura, N. Uramoto         ||        maruyama@jp.ibm.com, kent@trl.ibm.co.jp, uramoto@jp.ibm.com 
-  RFC2804          ||      IAB, IESG         ||       fred@cisco.com, brian@icair.org
-  RFC2805          ||       N. Greene, M. Ramalho, B. Rosen         ||        ngreene@nortelnetworks.com, mramalho@cisco.com, brosen@eng.fore.com 
-  RFC2806          ||       A. Vaha-Sipila         ||        avs@iki.fi 
-  RFC2807          ||       J. Reagle         ||        reagle@w3.org 
-  RFC2808          ||       M. Nystrom         ||        magnus@rsasecurity.com 
-  RFC2809          ||       B. Aboba, G. Zorn         ||        bernarda@microsoft.com, gwz@cisco.com 
-  RFC2810          ||      C. Kalt         ||       Christophe.Kalt@gmail.com
-  RFC2811          ||      C. Kalt         ||       Christophe.Kalt@gmail.com
-  RFC2812          ||      C. Kalt         ||       Christophe.Kalt@gmail.com
-  RFC2813          ||      C. Kalt         ||       Christophe.Kalt@gmail.com
-  RFC2814          ||       R. Yavatkar, D. Hoffman, Y. Bernet, F. Baker, M. Speer         ||        yavatkar@ibeam.intel.com, yoramb@microsoft.com, fred@cisco.com, speer@Eng.Sun.COM 
-  RFC2815          ||       M. Seaman, A. Smith, E. Crawley, J. Wroclawski         ||        andrew@extremenetworks.com, jtw@lcs.mit.edu 
-  RFC2816          ||       A. Ghanwani, J. Pace, V. Srinivasan, A. Smith, M. Seaman         ||        aghanwan@nortelnetworks.com, pacew@us.ibm.com, vijay@cosinecom.com, andrew@extremenetworks.com 
-  RFC2817          ||      R. Khare, S. Lawrence         ||       rohit@4K-associates.com, lawrence@agranat.com
-  RFC2818          ||      E. Rescorla         ||       ekr@rtfm.com
-  RFC2819          ||       S. Waldbusser         ||         
-  RFC2820          ||      E. Stokes, D. Byrne, B. Blakley, P. Behera         ||       blakley@dascom.com, stokes@austin.ibm.com, djbyrne@us.ibm.com, prasanta@netscape.com
-  RFC2821          ||      J. Klensin, Ed.         ||       
-  RFC2822          ||      P. Resnick, Ed.         ||       presnick@qti.qualcomm.com
-  RFC2823          ||       J. Carlson, P. Langner, E. Hernandez-Valencia, J. Manchester         ||        james.d.carlson@sun.com, plangner@lucent.com, enrique@lucent.com, sterling@hotair.hobl.lucent.com 
-  RFC2824          ||       J. Lennox, H. Schulzrinne         ||        lennox@cs.columbia.edu, schulzrinne@cs.columbia.edu 
-  RFC2825          ||       IAB, L. Daigle, Ed.         ||        iab@iab.org 
-  RFC2826          ||       Internet Architecture Board         ||        iab@iab.org 
-  RFC2827          ||      P. Ferguson, D. Senie         ||       ferguson@cisco.com, dts@senie.com
-  RFC2828          ||      R. Shirey         ||       rshirey@bbn.com
-  RFC2829          ||       M. Wahl, H. Alvestrand, J. Hodges, R. Morgan         ||        M.Wahl@innosoft.com, Harald@Alvestrand.no, JHodges@oblix.com, rlmorgan@washington.edu 
-  RFC2830          ||       J. Hodges, R. Morgan, M. Wahl         ||        JHodges@oblix.com, rlmorgan@washington.edu, M.Wahl@innosoft.com 
-  RFC2831          ||      P. Leach, C. Newman         ||       paulle@microsoft.com, chris.newman@innosoft.com
-  RFC2832          ||       S. Hollenbeck, M. Srivastava         ||        shollenb@netsol.com, manojs@netsol.com 
-  RFC2833          ||       H. Schulzrinne, S. Petrack         ||        schulzrinne@cs.columbia.edu, scott.petrack@metatel.com 
-  RFC2834          ||      J.-M. Pittet         ||       jmp@sgi.com
-  RFC2835          ||      J.-M. Pittet         ||       jmp@sgi.com
-  RFC2836          ||       S. Brim, B. Carpenter, F. Le Faucheur         ||        sbrim@cisco.com, brian@icair.org, flefauch@cisco.com 
-  RFC2837          ||       K. Teow         ||         
-  RFC2838          ||       D. Zigmond, M. Vickers         ||        djz@corp.webtv.net, mav@liberate.com 
-  RFC2839          ||       F. da Cruz, J. Altman         ||         
-  RFC2840          ||       J. Altman, F. da Cruz         ||         
-  RFC2841          ||       P. Metzger, W. Simpson         ||         
-  RFC2842          ||       R. Chandra, J. Scudder         ||        rchandra@redback.com, jgs@cisco.com 
-  RFC2843          ||       P. Droz, T. Przygienda         ||        dro@zurich.ibm.com, prz@siara.com 
-  RFC2844          ||       T. Przygienda, P. Droz, R. Haas         ||        prz@siara.com, dro@zurich.ibm.com, rha@zurich.ibm.com 
-  RFC2845          ||      P. Vixie, O. Gudmundsson, D. Eastlake 3rd, B. Wellington         ||       vixie@isc.org, ogud@tislabs.com, dee3@torque.pothole.com, Brian.Wellington@nominum.com
-  RFC2846          ||       C. Allocchio         ||         
-  RFC2847          ||       M. Eisler         ||        mike@eisler.com 
-  RFC2848          ||       S. Petrack, L. Conroy         ||        scott.petrack@metatel.com, lwc@roke.co.uk 
-  RFC2849          ||      G. Good         ||       ggood@netscape.com
-  RFC2850          ||       Internet Architecture Board, B. Carpenter, Ed.         ||        brian@icair.org 
-  RFC2851          ||       M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder         ||        daniele@zk3.dec.com, haberman@nortelnetworks.com, sar@epilogue.com, schoenw@ibr.cs.tu-bs.de 
-  RFC2852          ||       D. Newman         ||        dan.newman@sun.com 
-  RFC2853          ||      J. Kabat, M. Upadhyay         ||       jackk@valicert.com, mdu@eng.sun.com
-  RFC2854          ||       D. Connolly, L. Masinter         ||        connolly@w3.org, LM@att.com 
-  RFC2855          ||       K. Fujisawa         ||        fujisawa@sm.sony.co.jp 
-  RFC2856          ||       A. Bierman, K. McCloghrie, R. Presuhn         ||       andy@yumaworks.com, kzm@cisco.com, rpresuhn@bmc.com 
-  RFC2857          ||       A. Keromytis, N. Provos         ||        angelos@dsl.cis.upenn.edu, provos@citi.umich.edu, rgm@icsa.net, tytso@valinux.com 
-  RFC2858          ||      T. Bates, Y. Rekhter, R. Chandra, D. Katz         ||       tbates@cisco.com, rchandra@redback.com, dkatz@jnx.com, yakov@cisco.com
-  RFC2859          ||       W. Fang, N. Seddigh, B. Nandy         ||        wfang@cs.princeton.edu, nseddigh@nortelnetworks.com, bnandy@nortelnetworks.com 
-  RFC2860          ||       B. Carpenter, F. Baker, M. Roberts         ||        brian@icair.org, fred@cisco.com, roberts@icann.org 
-  RFC2861          ||      M. Handley, J. Padhye, S. Floyd         ||       mjh@aciri.org, padhye@aciri.org, floyd@aciri.org
-  RFC2862          ||       M. Civanlar, G. Cash         ||        civanlar@research.att.com, glenn@research.att.com 
-  RFC2863          ||       K. McCloghrie, F. Kastenholz         ||        kzm@cisco.com, kasten@argon.com 
-  RFC2864          ||       K. McCloghrie, G. Hanson         ||        kzm@cisco.com, gary_hanson@adc.com 
-  RFC2865          ||      C. Rigney, S. Willens, A. Rubens, W. Simpson         ||       cdr@telemancy.com, acr@merit.edu, wsimpson@greendragon.com, steve@livingston.com
-  RFC2866          ||      C. Rigney         ||       cdr@telemancy.com
-  RFC2867          ||       G. Zorn, B. Aboba, D. Mitton         ||        gwz@cisco.com, dmitton@nortelnetworks.com, aboba@internaut.com 
-  RFC2868          ||      G. Zorn, D. Leifer, A. Rubens, J. Shriver, M. Holdrege, I. Goyret         ||       gwz@cisco.com, leifer@del.com, John.Shriver@intel.com, acr@del.com, matt@ipverse.com, igoyret@lucent.com
-  RFC2869          ||      C. Rigney, W. Willats, P. Calhoun         ||       cdr@telemancy.com, ward@cyno.com, pcalhoun@eng.sun.com, arubens@tutsys.com, bernarda@microsoft.com
-  RFC2870          ||      R. Bush, D. Karrenberg, M. Kosters, R. Plzak         ||       randy@psg.com, daniel.karrenberg@ripe.net, markk@netsol.com, plzakr@saic.com
-  RFC2871          ||       J. Rosenberg, H. Schulzrinne         ||         
-  RFC2872          ||       Y. Bernet, R. Pabbati         ||        yoramb@microsoft.com, rameshpa@microsoft.com 
-  RFC2873          ||       X. Xiao, A. Hannan, V. Paxson, E. Crabbe         ||        xipeng@gblx.net, alan@ivmg.net, edc@explosive.net, vern@aciri.org 
-  RFC2874          ||      M. Crawford, C. Huitema         ||       crawdad@fnal.gov, huitema@microsoft.com
-  RFC2875          ||      H. Prafullchandra, J. Schaad         ||       hemma@cp.net, jimsch@exmsft.com
-  RFC2876          ||       J. Pawling         ||        john.pawling@wang.com 
-  RFC2877          ||      T. Murphy Jr., P. Rieth, J. Stevens         ||       murphyte@us.ibm.com, rieth@us.ibm.com, jssteven@us.ibm.com
-  RFC2878          ||       M. Higashiyama, F. Baker         ||        Mitsuru.Higashiyama@yy.anritsu.co.jp, fred.baker@cisco.com 
-  RFC2879          ||       G. Klyne, L. McIntyre         ||        GK@ACM.ORG, Lloyd.McIntyre@pahv.xerox.com 
-  RFC2880          ||       L. McIntyre, G. Klyne         ||        Lloyd.McIntyre@pahv.xerox.com, GK@ACM.ORG 
-  RFC2881          ||       D. Mitton, M. Beadles         ||        dmitton@nortelnetworks.com, mbeadles@smartpipes.com 
-  RFC2882          ||       D. Mitton         ||        dmitton@nortelnetworks.com 
-  RFC2883          ||       S. Floyd, J. Mahdavi, M. Mathis, M. Podolsky         ||        floyd@aciri.org, mahdavi@novell.com, mathis@psc.edu, podolsky@eecs.berkeley.edu 
-  RFC2884          ||       J. Hadi Salim, U. Ahmed         ||        hadi@nortelnetworks.com, ahmed@sce.carleton.ca 
-  RFC2885          ||       F. Cuervo, N. Greene, C. Huitema, A. Rayhan, B. Rosen, J. Segers         ||         
-  RFC2886          ||      T. Taylor         ||       tom.taylor.stds@gmail.com
-  RFC2887          ||       M. Handley, S. Floyd, B. Whetten, R. Kermode, L. Vicisano, M. Luby         ||        mjh@aciri.org, floyd@aciri.org, whetten@talarian.com, Roger.Kermode@motorola.com, lorenzo@cisco.com, luby@digitalfountain.com 
-  RFC2888          ||       P. Srisuresh         ||        srisuresh@yahoo.com 
-  RFC2889          ||       R. Mandeville, J. Perser         ||        bob@cqos.com, jerry_perser@netcomsystems.com 
-  RFC2890          ||      G. Dommety         ||       gdommety@cisco.com
-  RFC2891          ||       T. Howes, M. Wahl, A. Anantha         ||        anoopa@microsoft.com, howes@loudcloud.com, Mark.Wahl@sun.com 
-  RFC2892          ||       D. Tsiang, G. Suwala         ||        tsiang@cisco.com, gsuwala@cisco.com 
-  RFC2893          ||       R. Gilligan, E. Nordmark         ||        gilligan@freegate.com, nordmark@eng.sun.com 
-  RFC2894          ||       M. Crawford         ||        crawdad@fnal.gov 
-  RFC2895          ||       A. Bierman, C. Bucci, R. Iddon         ||       andy@yumaworks.com, cbucci@cisco.com 
-  RFC2896          ||       A. Bierman, C. Bucci, R. Iddon         ||        andy@yumaworks.com, cbucci@cisco.com 
-  RFC2897          ||       D. Cromwell         ||        cromwell@nortelnetworks.com 
-  RFC2898          ||      B. Kaliski         ||       bkaliski@rsasecurity.com
-  RFC2899          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC2900          ||       J. Reynolds, R. Braden, S. Ginoza         ||         
-  RFC2901          ||       Z. Wenzel, J. Klensin, R. Bush, S. Huter         ||        zita@nsrc.org, klensin@nsrc.org, randy@nsrc.org, sghuter@nsrc.org 
-  RFC2902          ||       S. Deering, S. Hares, C. Perkins, R. Perlman         ||        deering@cisco.com, skh@nexthop.com, Radia.Perlman@sun.com, Charles.Perkins@nokia.com 
-  RFC2903          ||       C. de Laat, G. Gross, L. Gommans, J. Vollbrecht, D. Spence         ||        delaat@phys.uu.nl, gmgross@lucent.com, jrv@interlinknetworks.com, dspence@interlinknetworks.com 
-  RFC2904          ||       J. Vollbrecht, P. Calhoun, S. Farrell, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence         ||        pcalhoun@eng.sun.com, stephen.farrell@baltimore.ie, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com 
-  RFC2905          ||       J. Vollbrecht, P. Calhoun, S. Farrell, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence         ||        jrv@interlinknetworks.com, pcalhoun@eng.sun.com, stephen.farrell@baltimore.ie, gmgross@lucent.com, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com 
-  RFC2906          ||       S. Farrell, J. Vollbrecht, P. Calhoun, L. Gommans, G. Gross, B. de Bruijn, C. de Laat, M. Holdrege, D. Spence         ||        stephen.farrell@baltimore.ie, jrv@interlinknetworks.com, pcalhoun@eng.sun.com, gmgross@lucent.com, betty@euronet.nl, delaat@phys.uu.nl, matt@ipverse.com, dspence@interlinknetworks.com 
-  RFC2907          ||       R. Kermode         ||        Roger.Kermode@motorola.com 
-  RFC2908          ||      D. Thaler, M. Handley, D. Estrin         ||       dthaler@microsoft.com, mjh@aciri.org, estrin@usc.edu
-  RFC2909          ||      P. Radoslavov, D. Estrin, R. Govindan, M. Handley, S. Kumar, D. Thaler         ||       pavlin@catarina.usc.edu, estrin@isi.edu, govindan@isi.edu, mjh@aciri.org, kkumar@usc.edu, dthaler@microsoft.com
-  RFC2910          ||      R. Herriot, Ed., S. Butler, P. Moore, R. Turner, J. Wenn         ||       robert.herriot@pahv.xerox.com, sbutler@boi.hp.com, pmoore@peerless.com, jwenn@cp10.es.xerox.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com
-  RFC2911          ||      T. Hastings, Ed., R. Herriot, R. deBry, S. Isaacson, P. Powell         ||       sisaacson@novell.com, tom.hastings@alum.mit.edu, robert.herriot@pahv.xerox.com, debryro@uvsc.edu, papowell@astart.com
-  RFC2912          ||       G. Klyne         ||        GK@ACM.ORG 
-  RFC2913          ||       G. Klyne         ||        GK@ACM.ORG 
-  RFC2914          ||      S. Floyd         ||       
-  RFC2915          ||       M. Mealling, R. Daniel         ||        michaelm@netsol.com, rdaniel@datafusion.net 
-  RFC2916          ||      P. Faltstrom         ||       paf@cisco.com
-  RFC2917          ||       K. Muthukrishnan, A. Malis         ||        mkarthik@lucent.com, Andy.Malis@vivacenetworks.com 
-  RFC2918          ||      E. Chen         ||       enke@redback.com
-  RFC2919          ||      R. Chandhok, G. Wenger         ||       chandhok@qualcomm.com, gwenger@qualcomm.com
-  RFC2920          ||       N. Freed         ||        ned.freed@innosoft.com 
-  RFC2921          ||       B. Fink         ||        fink@es.net 
-  RFC2922          ||       A. Bierman, K. Jones         ||       andy@yumaworks.com, kejones@nortelnetworks.com 
-  RFC2923          ||       K. Lahey         ||         
-  RFC2924          ||       N. Brownlee, A. Blount         ||        n.brownlee@auckland.ac.nz, blount@alum.mit.edu 
-  RFC2925          ||       K. White         ||        wkenneth@us.ibm.com 
-  RFC2926          ||       J. Kempf, R. Moats, P. St. Pierre         ||        james.kempf@sun.com, rmoats@coreon.net, Pete.StPierre@Eng.Sun.COM 
-  RFC2927          ||       M. Wahl         ||        Mark.Wahl@sun.com 
-  RFC2928          ||      R. Hinden, S. Deering, R. Fink, T. Hain         ||       bob.hinden@gmail.com, deering@cisco.com, rlfink@lbl.gov, tonyhain@microsoft.com
-  RFC2929          ||      D. Eastlake 3rd, E. Brunner-Williams, B. Manning         ||       Donald.Eastlake@motorola.com, brunner@engage.com, bmanning@isi.edu
-  RFC2930          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC2931          ||       D. Eastlake 3rd         ||        Donald.Eastlake@motorola.com 
-  RFC2932          ||      K. McCloghrie, D. Farinacci, D. Thaler         ||       kzm@cisco.com, dthaler@microsoft.com
-  RFC2933          ||      K. McCloghrie, D. Farinacci, D. Thaler         ||       kzm@cisco.com, dthaler@microsoft.com
-  RFC2934          ||       K. McCloghrie, D. Farinacci, D. Thaler, B. Fenner         ||        kzm@cisco.com, dthaler@microsoft.com, fenner@research.att.com 
-  RFC2935          ||       D. Eastlake 3rd, C. Smith         ||        Donald.Eastlake@motorola.com, chris.smith@royalbank.com 
-  RFC2936          ||       D. Eastlake 3rd, C. Smith, D. Soroka         ||        Donald.Eastlake@motorola.com, chris.smith@royalbank.com, dsoroka@us.ibm.com 
-  RFC2937          ||       C. Smith         ||        cs@Eng.Sun.COM 
-  RFC2938          ||       G. Klyne, L. Masinter         ||        GK@ACM.ORG, LMM@acm.org 
-  RFC2939          ||      R. Droms         ||       droms@bucknell.edu
-  RFC2940          ||       A. Smith, D. Partain, J. Seligson         ||        David.Partain@ericsson.com, jseligso@nortelnetworks.com 
-  RFC2941          ||       T. Ts'o, Ed., J. Altman         ||        tytso@mit.edu, jaltman@columbia.edu 
-  RFC2942          ||       T. Ts'o         ||         
-  RFC2943          ||       R. Housley, T. Horting, P. Yee         ||        housley@spyrus.com, thorting@spyrus.com, yee@spyrus.com 
-  RFC2944          ||       T. Wu         ||        tjw@cs.Stanford.EDU 
-  RFC2945          ||       T. Wu         ||        tjw@cs.Stanford.EDU 
-  RFC2946          ||       T. Ts'o         ||        tytso@mit.edu 
-  RFC2947          ||       J. Altman         ||        jaltman@columbia.edu 
-  RFC2948          ||       J. Altman         ||        jaltman@columbia.edu 
-  RFC2949          ||       J. Altman         ||        jaltman@columbia.edu 
-  RFC2950          ||       J. Altman         ||        jaltman@columbia.edu 
-  RFC2951          ||       R. Housley, T. Horting, P. Yee         ||        housley@spyrus.com, thorting@spyrus.com, yee@spyrus.com 
-  RFC2952          ||       T. Ts'o         ||        tytso@mit.edu 
-  RFC2953          ||       T. Ts'o         ||        tytso@mit.edu 
-  RFC2954          ||       K. Rehbehn, D. Fowler         ||        krehbehn@megisto.com, fowler@syndesis.com 
-  RFC2955          ||       K. Rehbehn, O. Nicklass, G. Mouradian         ||        krehbehn@megisto.com, orly_n@rad.co.il, gvm@att.com 
-  RFC2956          ||       M. Kaat         ||        Marijke.Kaat@surfnet.nl 
-  RFC2957          ||       L. Daigle, P. Faltstrom         ||        paf@cisco.com 
-  RFC2958          ||       L. Daigle, P. Faltstrom         ||        paf@cisco.com 
-  RFC2959          ||       M. Baugher, B. Strahm, I. Suconick         ||        mbaugher@passedge.com, Bill.Strahm@intel.com, irina@ennovatenetworks.com 
-  RFC2960          ||      R. Stewart, Q. Xie, K. Morneault, C. Sharp, H. Schwarzbauer, T. Taylor, I. Rytina, M. Kalla, L. Zhang, V. Paxson         ||       randall@lakerest.net, qxie1@email.mot.com, kmorneau@cisco.com, chsharp@cisco.com, HannsJuergen.Schwarzbauer@icn.siemens.de, tom.taylor.stds@gmail.com, ian.rytina@ericsson.com, mkalla@telcordia.com, lixia@cs.ucla.edu, vern@aciri.org
-  RFC2961          ||      L. Berger, D. Gan, G. Swallow, P. Pan, F. Tommasi, S. Molendini         ||       lberger@labn.net, swallow@cisco.com, franco.tommasi@unile.it, molendini@ultra5.unile.it
-  RFC2962          ||       D. Raz, J. Schoenwaelder, B. Sugla         ||        raz@lucent.com, schoenw@ibr.cs.tu-bs.de, sugla@ispsoft.com 
-  RFC2963          ||       O. Bonaventure, S. De Cnodder         ||        Olivier.Bonaventure@info.fundp.ac.be, stefaan.de_cnodder@alcatel.be 
-  RFC2964          ||       K. Moore, N. Freed         ||        moore@cs.utk.edu, ned.freed@innosoft.com 
-  RFC2965          ||      D. Kristol, L. Montulli         ||       
-  RFC2966          ||      T. Li, T. Przygienda, H. Smit         ||       tli@procket.com, prz@redback.com, henk@procket.com
-  RFC2967          ||       L. Daigle, R. Hedberg         ||        leslie@thinkingcat.com, Roland@catalogix.se 
-  RFC2968          ||       L. Daigle, T. Eklof         ||        leslie@thinkingcat.com, thommy.eklof@hotsip.com 
-  RFC2969          ||       T. Eklof, L. Daigle         ||        thommy.eklof@hotsip.com, leslie@thinkingcat.com 
-  RFC2970          ||       L. Daigle, T. Eklof         ||        leslie@thinkingcat.com, thommy.eklof@hotsip.com 
-  RFC2971          ||       T. Showalter         ||        tjs@mirapoint.com 
-  RFC2972          ||       N. Popp, M. Mealling, L. Masinter, K. Sollins         ||        LMM@acm.org, michaelm@netsol.com, nico@realnames.com, sollins@lcs.mit.edu 
-  RFC2973          ||       R. Balay, D. Katz, J. Parker         ||        Rajesh.Balay@cosinecom.com, dkatz@juniper.net, jparker@axiowave.com 
-  RFC2974          ||       M. Handley, C. Perkins, E. Whelan         ||        mjh@aciri.org, csp@isi.edu, e.whelan@cs.ucl.ac.uk 
-  RFC2975          ||       B. Aboba, J. Arkko, D. Harrington         ||        bernarda@microsoft.com, Jari.Arkko@ericsson.com, dbh@cabletron.com 
-  RFC2976          ||      S. Donovan         ||       
-  RFC2977          ||       S. Glass, T. Hiller, S. Jacobs, C. Perkins         ||         
-  RFC2978          ||       N. Freed, J. Postel         ||        ned.freed@innosoft.com 
-  RFC2979          ||       N. Freed         ||        ned.freed@innosoft.com 
-  RFC2980          ||      S. Barber         ||       sob@academ.com
-  RFC2981          ||      R. Kavasseri, Ed.         ||       ramk@cisco.com 
-  RFC2982          ||      R. Kavasseri, Ed.         ||       ramk@cisco.com 
-  RFC2983          ||       D. Black         ||        black_david@emc.com 
-  RFC2984          ||       C. Adams         ||        cadams@entrust.com 
-  RFC2985          ||       M. Nystrom, B. Kaliski         ||        magnus@rsasecurity.com, bkaliski@rsasecurity.com 
-  RFC2986          ||      M. Nystrom, B. Kaliski         ||       magnus@rsasecurity.com, bkaliski@rsasecurity.com
-  RFC2987          ||       P. Hoffman         ||        phoffman@imc.org 
-  RFC2988          ||      V. Paxson, M. Allman         ||       vern@aciri.org, mallman@grc.nasa.gov
-  RFC2989          ||      B. Aboba, P. Calhoun, S. Glass, T. Hiller, P. McCann, H. Shiino, P. Walsh, G. Zorn, G. Dommety, C. Perkins, B. Patil, D. Mitton, S. Manning, M. Beadles, X. Chen, S. Sivalingham, A. Hameed, M. Munson, S. Jacobs, B. Lim, B. Hirschman, R. Hsu, H. Koo, M. Lipford, E. Campbell, Y. Xu, S. Baba, E. Jaques         ||       bernarda@microsoft.com, pcalhoun@eng.sun.com, steven.glass@sun.com, tom.hiller@lucent.com, mccap@lucent.com, hshiino@lucent.com, walshp@lucent.com, gwz@cisco.com, gdommety@cisco.com, charliep@iprg.nokia.com, Basavaraj.Patil@nokia.com, dmitton@nortelnetworks.com, smanning@nortelnetworks.com, mbeadles@smartpipes.com, xing.chen@usa.alcatel.com, s.sivalingham@ericsson.com, none, mmunson@mobilnet.gte.com, sjacobs@gte.com, bklim@lgic.co.kr, qa4053@email.mot.com, rhsu@qualcomm.com, hskoo@sta.samsung.com, mlipfo01@sprintspectrum.com, ed_campbell@3com.com, yxu@watercove.com, sbaba@tari.toshiba.com, ejaques@akamail.com
-  RFC2990          ||       G. Huston         ||        gih@telstra.net 
-  RFC2991          ||       D. Thaler, C. Hopps         ||        dthaler@dthaler.microsoft.com, chopps@nexthop.com 
-  RFC2992          ||       C. Hopps         ||        chopps@nexthop.com 
-  RFC2993          ||       T. Hain         ||        tonyhain@microsoft.com 
-  RFC2994          ||       H. Ohta, M. Matsui         ||        hidenori@iss.isl.melco.co.jp, matsui@iss.isl.melco.co.jp 
-  RFC2995          ||       H. Lu, Ed., I. Faynberg, J. Voelker, M. Weissman, W. Zhang, S. Rhim, J. Hwang, S. Ago, S. Moeenuddin, S. Hadvani, S. Nyckelgard, J. Yoakum, L. Robart         ||        faynberg@lucent.com, huilanlu@lucent.com, jvoelker@lucent.com, maw1@lucent.com, wzz@lucent.com, syrhim@kt.co.kr, jkhwang@kt.co.kr, ago@ssf.abk.nec.co.jp, moeen@asl.dl.nec.com, hadvani@asl.dl.nec.com, soren.m.nyckelgard@telia.se, yoakum@nortelnetworks.com, robart@nortelnetworks.com 
-  RFC2996          ||       Y. Bernet         ||        yoramb@microsoft.com 
-  RFC2997          ||       Y. Bernet, A. Smith, B. Davie         ||        Yoramb@microsoft.com, bsd@cisco.com 
-  RFC2998          ||       Y. Bernet, P. Ford, R. Yavatkar, F. Baker, L. Zhang, M. Speer, R. Braden, B. Davie, J. Wroclawski, E. Felstaine         ||        yoramb@microsoft.com, raj.yavatkar@intel.com, peterf@microsoft.com, fred@cisco.com, lixia@cs.ucla.edu, speer@Eng.Sun.COM, braden@isi.edu, bsd@cisco.com, jtw@lcs.mit.edu 
-  RFC2999          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC3000          ||      J. Reynolds, R. Braden, S. Ginoza, L. Shiota         ||       
-  RFC3001          ||       M. Mealling         ||        michaelm@netsol.com 
-  RFC3002          ||       D. Mitzel         ||        mitzel@iprg.nokia.com 
-  RFC3003          ||       M. Nilsson         ||        nilsson@id3.org 
-  RFC3004          ||       G. Stump, R. Droms, Y. Gu, R. Vyaghrapuri, A. Demirtjis, B. Beser, J. Privat         ||        stumpga@us.ibm.com, rdroms@cisco.com, yegu@microsoft.com, rameshv@microsoft.com, annd@microsoft.com 
-  RFC3005          ||       S. Harris         ||        srh@merit.edu 
-  RFC3006          ||       B. Davie, C. Iturralde, D. Oran, S. Casner, J. Wroclawski         ||        bsd@cisco.com, cei@cisco.com, oran@cisco.com, casner@acm.org, jtw@lcs.mit.edu 
-  RFC3007          ||      B. Wellington         ||       Brian.Wellington@nominum.com
-  RFC3008          ||       B. Wellington         ||        Brian.Wellington@nominum.com 
-  RFC3009          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu
-  RFC3010          ||       S. Shepler, B. Callaghan, D. Robinson, R. Thurlow, C. Beame, M. Eisler, D. Noveck         ||        beame@bws.com, brent.callaghan@sun.com, mike@eisler.com, david.robinson@sun.com, robert.thurlow@sun.com 
-  RFC3011          ||       G. Waters         ||         
-  RFC3012          ||       C. Perkins, P. Calhoun         ||         
-  RFC3013          ||       T. Killalea         ||        tomk@neart.org 
-  RFC3014          ||       R. Kavasseri         ||        ramk@cisco.com 
-  RFC3015          ||       F. Cuervo, N. Greene, A. Rayhan, C. Huitema, B. Rosen, J. Segers         ||         
-  RFC3016          ||      Y. Kikuchi, T. Nomura, S. Fukunaga, Y. Matsui, H. Kimata         ||       yoshihiro.kikuchi@toshiba.co.jp, matsui@drl.mei.co.jp, t-nomura@ccm.cl.nec.co.jp, fukunaga444@oki.co.jp, kimata@nttvdt.hil.ntt.co.jp
-  RFC3017          ||       M. Riegel, G. Zorn         ||        maximilian.riegel@icn.siemens.de, gwz@cisco.com 
-  RFC3018          ||       A. Bogdanov         ||        a_bogdanov@iname.ru 
-  RFC3019          ||      B. Haberman, R. Worzella         ||       haberman@nortelnetworks.com, worzella@us.ibm.com
-  RFC3020          ||       P. Pate, B. Lynch, K. Rehbehn         ||        prayson.pate@overturenetworks.com, bob.lynch@overturenetworks.com, krehbehn@megisto.com 
-  RFC3021          ||       A. Retana, R. White, V. Fuller, D. McPherson         ||        aretana@cisco.com, riw@cisco.com, vaf@valinor.barrnet.net, danny@ambernetworks.com 
-  RFC3022          ||       P. Srisuresh, K. Egevang         ||        srisuresh@yahoo.com, kjeld.egevang@intel.com 
-  RFC3023          ||      M. Murata, S. St. Laurent, D. Kohn         ||       mmurata@trl.ibm.co.jp, simonstl@simonstl.com, dan@dankohn.com
-  RFC3024          ||       G. Montenegro, Ed.         ||         
-  RFC3025          ||       G. Dommety, K. Leung         ||        gdommety@cisco.com, kleung@cisco.com 
-  RFC3026          ||       R. Blane         ||        Roy_Blane@inmarsat.com 
-  RFC3027          ||       M. Holdrege, P. Srisuresh         ||        matt@ipverse.com, srisuresh@yahoo.com 
-  RFC3028          ||      T. Showalter         ||       tjs@mirapoint.com
-  RFC3029          ||       C. Adams, P. Sylvester, M. Zolotarev, R. Zuccherato         ||        cadams@entrust.com, mzolotarev@baltimore.com, peter.sylvester@edelweb.fr, robert.zuccherato@entrust.com 
-  RFC3030          ||       G. Vaudreuil         ||        GregV@ieee.org 
-  RFC3031          ||      E. Rosen, A. Viswanathan, R. Callon         ||       erosen@cisco.com, arun@force10networks.com, rcallon@juniper.net
-  RFC3032          ||      E. Rosen, D. Tappan, G. Fedorkow, Y. Rekhter, D. Farinacci, T. Li, A. Conta         ||       erosen@cisco.com, tappan@cisco.com, yakov@juniper.net, fedorkow@cisco.com, dino@procket.com, tli@procket.com, aconta@txc.com
-  RFC3033          ||       M. Suzuki         ||        suzuki.muneyoshi@lab.ntt.co.jp 
-  RFC3034          ||       A. Conta, P. Doolan, A. Malis         ||        aconta@txc.com, pdoolan@ennovatenetworks.com, Andy.Malis@vivacenetworks.com 
-  RFC3035          ||       B. Davie, J. Lawrence, K. McCloghrie, E. Rosen, G. Swallow, Y. Rekhter, P. Doolan         ||        bsd@cisco.com, pdoolan@ennovatenetworks.com, jlawrenc@cisco.com, kzm@cisco.com, yakov@juniper.net, erosen@cisco.com, swallow@cisco.com 
-  RFC3036          ||      L. Andersson, P. Doolan, N. Feldman, A. Fredette, B. Thomas         ||       loa.andersson@nortelnetworks.com, pdoolan@ennovatenetworks.com, nkf@us.ibm.com, fredette@photonex.com, rhthomas@cisco.com
-  RFC3037          ||       B. Thomas, E. Gray         ||        ewgray@mindspring.com, rhthomas@cisco.com 
-  RFC3038          ||      K. Nagami, Y. Katsube, N. Demizu, H. Esaki, P. Doolan         ||       ken.nagami@toshiba.co.jp, demizu@dd.iij4u.or.jp, hiroshi@wide.ad.jp, yasuhiro.katsube@toshiba.co.jp, pdoolan@ennovatenetworks.com
-  RFC3039          ||       S. Santesson, W. Polk, P. Barzin, M. Nystrom         ||        stefan@addtrust.com, wpolk@nist.gov, barzin@secude.com, magnus@rsasecurity.com 
-  RFC3040          ||       I. Cooper, I. Melve, G. Tomlinson         ||        icooper@equinix.com, Ingrid.Melve@uninett.no, gary.tomlinson@cacheflow.com 
-  RFC3041          ||      T. Narten, R. Draves         ||       narten@raleigh.ibm.com, richdr@microsoft.com
-  RFC3042          ||       M. Allman, H. Balakrishnan, S. Floyd         ||        mallman@grc.nasa.gov, hari@lcs.mit.edu, floyd@aciri.org 
-  RFC3043          ||       M. Mealling         ||        michaelm@netsol.com 
-  RFC3044          ||       S. Rozenfeld         ||         
-  RFC3045          ||       M. Meredith         ||        mark_meredith@novell.com 
-  RFC3046          ||      M. Patrick         ||       michael.patrick@motorola.com
-  RFC3047          ||      P. Luthi         ||       luthip@pictel.com
-  RFC3048          ||       B. Whetten, L. Vicisano, R. Kermode, M. Handley, S. Floyd, M. Luby         ||        whetten@talarian.com, lorenzo@cisco.com, Roger.Kermode@motorola.com, mjh@aciri.org, luby@digitalfountain.com 
-  RFC3049          ||       J. Naugle, K. Kasthurirangan, G. Ledford         ||        jnaugle@us.ibm.com, kasthuri@us.ibm.com, gledford@zephyrcorp.com 
-  RFC3050          ||       J. Lennox, H. Schulzrinne, J. Rosenberg         ||        lennox@cs.columbia.edu, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu 
-  RFC3051          ||       J. Heath, J. Border         ||        jheath@hns.com, border@hns.com 
-  RFC3052          ||       M. Eder, S. Nag         ||        michael.eder@nokia.com, thinker@monmouth.com 
-  RFC3053          ||       A. Durand, P. Fasano, I. Guardini, D. Lento         ||        Alain.Durand@sun.com, paolo.fasano@cselt.it, ivano.guardini@cselt.it, dlento@mail.tim.it 
-  RFC3054          ||       P. Blatherwick, R. Bell, P. Holland         ||        blather@nortelnetworks.com, rtbell@cisco.com, phil.holland@circa.ca 
-  RFC3055          ||       M. Krishnaswamy, D. Romascanu         ||        murali@lucent.com, dromasca@gmail.com  
-  RFC3056          ||       B. Carpenter, K. Moore         ||        brian@icair.org, moore@cs.utk.edu 
-  RFC3057          ||       K. Morneault, S. Rengasami, M. Kalla, G. Sidebottom         ||        kmorneau@cisco.com, mkalla@telcordia.com, srengasa@telcordia.com, gregside@nortelnetworks.com 
-  RFC3058          ||       S. Teiwes, P. Hartmann, D. Kuenzi         ||        stephan.teiwes@it-sec.com, peter.hartmann@it-sec.com, dkuenzi@724.com 
-  RFC3059          ||       E. Guttman         ||        Erik.Guttman@sun.com 
-  RFC3060          ||       B. Moore, E. Ellesson, J. Strassner, A. Westerinen         ||        eellesson@lboard.com, remoore@us.ibm.com, johns@cisco.com, andreaw@cisco.com 
-  RFC3061          ||       M. Mealling         ||        michaelm@netsol.com 
-  RFC3062          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
-  RFC3063          ||       Y. Ohba, Y. Katsube, E. Rosen, P. Doolan         ||        yoshihiro.ohba@toshiba.co.jp, yasuhiro.katsube@toshiba.co.jp, erosen@cisco.com, pdoolan@ennovatenetworks.com 
-  RFC3064          ||       B. Foster         ||        bfoster@cisco.com 
-  RFC3065          ||      P. Traina, D. McPherson, J. Scudder         ||       danny@ambernetworks.com, jgs@cisco.com
-  RFC3066          ||       H. Alvestrand         ||        Harald@Alvestrand.no 
-  RFC3067          ||       J. Arvidsson, A. Cormack, Y. Demchenko, J. Meijer         ||        Jimmy.J.Arvidsson@telia.se, Andrew.Cormack@ukerna.ac.uk, demch@terena.nl, jan.meijer@surfnet.nl 
-  RFC3068          ||      C. Huitema         ||       huitema@microsoft.com
-  RFC3069          ||       D. McPherson, B. Dykes         ||        danny@ambernetworks.com, bdykes@onesecure.com 
-  RFC3070          ||       V. Rawat, R. Tio, S. Nanji, R. Verma         ||        vrawat@oni.com, tor@redback.com, rverma@dc.com, suhail@redback.com 
-  RFC3071          ||       J. Klensin         ||        klensin@jck.com 
-  RFC3072          ||       M. Wildgrube         ||        max@wildgrube.com 
-  RFC3073          ||       J. Collins         ||        jcollins@bitstream.com 
-  RFC3074          ||       B. Volz, S. Gonczi, T. Lemon, R. Stevens         ||        bernie.volz@ericsson.com, steve.gonczi@networkengines.com, ted.lemon@nominum.com, robs@join.com 
-  RFC3075          ||       D. Eastlake 3rd, J. Reagle, D. Solo         ||        Donald.Eastlake@motorola.com, reagle@w3.org, dsolo@alum.mit.edu 
-  RFC3076          ||       J. Boyer         ||        jboyer@PureEdge.com 
-  RFC3077          ||       E. Duros, W. Dabbous, H. Izumiyama, N. Fujii, Y. Zhang         ||         
-  RFC3078          ||       G. Pall, G. Zorn         ||        gurdeep@microsoft.com, gwz@cisco.com 
-  RFC3079          ||       G. Zorn         ||        gwz@cisco.com 
-  RFC3080          ||      M. Rose         ||       mrose17@gmail.com
-  RFC3081          ||       M. Rose         ||       mrose17@gmail.com
-  RFC3082          ||       J. Kempf, J. Goldschmidt         ||        james.kempf@sun.com, jason.goldschmidt@sun.com 
-  RFC3083          ||       R. Woundy         ||        rwoundy@cisco.com 
-  RFC3084          ||      K. Chan, J. Seligson, D. Durham, S. Gai, K. McCloghrie, S. Herzog, F. Reichmeyer, R. Yavatkar, A. Smith         ||       khchan@nortelnetworks.com, sgai@cisco.com, Herzog@iphighway.com, kzm@cisco.com, franr@pfn.com, raj.yavatkar@intel.com, andrew@allegronetworks.com
-  RFC3085          ||       A. Coates, D. Allen, D. Rivers-Moore         ||        tony.coates@reuters.com, ho73@dial.pipex.com, daniel.rivers-moore@rivcom.com 
-  RFC3086          ||       K. Nichols, B. Carpenter         ||        nichols@packetdesign.com, brian@icair.org 
-  RFC3087          ||       B. Campbell, R. Sparks         ||        bcampbell@dynamicsoft.com, rsparks@dynamicsoft.com 
-  RFC3088          ||       K. Zeilenga         ||        kurt@openldap.org 
-  RFC3089          ||       H. Kitamura         ||        kitamura@da.jp.nec.com 
-  RFC3090          ||       E. Lewis         ||        lewis@tislabs.com 
-  RFC3091          ||       H. Kennedy         ||        kennedyh@engin.umich.edu 
-  RFC3092          ||      D. Eastlake 3rd, C. Manros, E. Raymond         ||       Donald.Eastlake@motorola.com, manros@cp10.es.xerox.com, esr@thyrsus.com
-  RFC3093          ||       M. Gaynor, S. Bradner         ||         
-  RFC3094          ||       D. Sprague, R. Benedyk, D. Brendes, J. Keller         ||        david.sprague@tekelec.com, dan.brendes@tekelec.com, robby.benedyk@tekelec.com, joe.keller@tekelec.com 
-  RFC3095          ||       C. Bormann, C. Burmeister, M. Degermark, H. Fukushima, H. Hannu, L-E. Jonsson, R. Hakenberg, T. Koren, K. Le, Z. Liu, A. Martensson, A. Miyazaki, K. Svanbro, T. Wiebke, T. Yoshimura, H. Zheng         ||        cabo@tzi.org, burmeister@panasonic.de, micke@cs.arizona.edu, fukusima@isl.mei.co.jp, hans.hannu@ericsson.com, lars-erik.jonsson@ericsson.com, hakenberg@panasonic.de, tmima@cisco.com, khiem.le@nokia.com, zhigang.liu@nokia.com, anton.martensson@era.ericsson.se, akihiro@isl.mei.co.jp, krister.svanbro@ericsson.com, wiebke@panasonic.de, yoshi@spg.yrp.nttdocomo.co.jp, haihong.zheng@nokia.com 
-  RFC3096          ||       M. Degermark, Ed.         ||         
-  RFC3097          ||       R. Braden, L. Zhang         ||        Braden@ISI.EDU, lixia@cs.ucla.edu 
-  RFC3098          ||       T. Gavin, D. Eastlake 3rd, S. Hambridge         ||        tedgavin@newsguy.com, Donald.Eastlake@motorola.com, sallyh@ludwig.sc.intel.com 
-  RFC3099          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC3100          ||               ||         
-  RFC3101          ||       P. Murphy         ||        pmurphy@noc.usgs.net 
-  RFC3102          ||       M. Borella, J. Lo, D. Grabelsky, G. Montenegro         ||        mike_borella@commworks.com, yidarlo@yahoo.com, david_grabelsky@commworks.com, gab@sun.com 
-  RFC3103          ||       M. Borella, D. Grabelsky, J. Lo, K. Taniguchi         ||        mike_borella@commworks.com, david_grabelsky@commworks.com, yidarlo@yahoo.com, taniguti@ccrl.sj.nec.com 
-  RFC3104          ||       G. Montenegro, M. Borella         ||        gab@sun.com, mike_borella@commworks.com 
-  RFC3105          ||       J. Kempf, G. Montenegro         ||        gab@sun.com 
-  RFC3106          ||       D. Eastlake 3rd, T. Goldstein         ||        Donald.Eastlake@motorola.com, tgoldstein@brodia.com 
-  RFC3107          ||      Y. Rekhter, E. Rosen         ||       yakov@juniper.net, erosen@cisco.com
-  RFC3108          ||       R. Kumar, M. Mostafa         ||        rkumar@cisco.com, mmostafa@cisco.com 
-  RFC3109          ||       R. Braden, R. Bush, J. Klensin         ||        braden@isi.edu, randy@psg.com, klensin@jck.com 
-  RFC3110          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC3111          ||       E. Guttman         ||        Erik.Guttman@germany.sun.com 
-  RFC3112          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
-  RFC3113          ||       K. Rosenbrock, R. Sanmugam, S. Bradner, J. Klensin         ||        rosenbrock@etsi.fr, sob@harvard.edu, 3GPPContact@etsi.fr 
-  RFC3114          ||      W. Nicolls         ||       wnicolls@forsythesolutions.com
-  RFC3115          ||       G. Dommety, K. Leung         ||        gdommety@cisco.com, kleung@cisco.com 
-  RFC3116          ||       J. Dunn, C. Martin         ||        Jeffrey.Dunn@worldnet.att.net, Cynthia.E.Martin@worldnet.att.net 
-  RFC3117          ||       M. Rose         ||       mrose17@gmail.com
-  RFC3118          ||      R. Droms, Ed., W. Arbaugh, Ed.         ||       
-  RFC3119          ||      R. Finlayson         ||       finlayson@live.com
-  RFC3120          ||       K. Best, N. Walsh         ||        karl.best@oasis-open.org, Norman.Walsh@East.Sun.COM 
-  RFC3121          ||       K. Best, N. Walsh         ||        karl.best@oasis-open.org, Norman.Walsh@East.Sun.COM 
-  RFC3122          ||       A. Conta         ||        aconta@txc.com 
-  RFC3123          ||       P. Koch         ||        pk@TechFak.Uni-Bielefeld.DE 
-  RFC3124          ||       H. Balakrishnan, S. Seshan         ||        hari@lcs.mit.edu, srini@cmu.edu 
-  RFC3125          ||       J. Ross, D. Pinkas, N. Pope         ||        harri.rasilainen@etsi.fr, ross@secstan.com, Denis.Pinkas@bull.net, pope@secstan.com 
-  RFC3126          ||      D. Pinkas, J. Ross, N. Pope         ||       harri.rasilainen@etsi.fr, Denis.Pinkas@bull.net, ross@secstan.com, pope@secstan.com
-  RFC3127          ||       D. Mitton, M. St.Johns, S. Barkley, D. Nelson, B. Patil, M. Stevens, B. Wolff         ||        dmitton@nortelnetworks.com, stjohns@rainmakertechnologies.com, stuartb@uu.net, dnelson@enterasys.com, Basavaraj.Patil@nokia.com, mstevens@ellacoya.com, barney@databus.com 
-  RFC3128          ||       I. Miller         ||        Ian_Miller@singularis.ltd.uk 
-  RFC3129          ||       M. Thomas         ||        mat@cisco.com 
-  RFC3130          ||       E. Lewis         ||         
-  RFC3131          ||       S. Bradner, P. Calhoun, H. Cuschieri, S. Dennett, G. Flynn, M. Lipford, M. McPheters         ||        sob@harvard.edu, pcalhoun@eng.sun.com, hcuschie@tia.eia.org, S.Dennett@motorola.com, gerry.flynn@verizonwireless.com, mjmcpheters@lucent.com 
-  RFC3132          ||       J. Kempf         ||         
-  RFC3133          ||       J. Dunn, C. Martin         ||         
-  RFC3134          ||       J. Dunn, C. Martin         ||         
-  RFC3135          ||       J. Border, M. Kojo, J. Griner, G. Montenegro, Z. Shelby         ||        border@hns.com, kojo@cs.helsinki.fi, jgriner@grc.nasa.gov, gab@sun.com, zach.shelby@ee.oulu.fi 
-  RFC3136          ||       L. Slutsman, Ed., I. Faynberg, H. Lu, M. Weissman         ||        faynberg@lucent.com, huilanlu@lucent.com, maw1@lucent.com, lslutsman@att.com 
-  RFC3137          ||      A. Retana, L. Nguyen, R. White, A. Zinin, D. McPherson         ||       aretana@cisco.com, lhnguyen@cisco.com, riw@cisco.com, azinin@nexsi.com, danny@ambernetworks.com
-  RFC3138          ||      D. Meyer         ||       dmm@sprint.net
-  RFC3139          ||       L. Sanchez, K. McCloghrie, J. Saperia         ||        kzm@cisco.com, lsanchez@megisto.com, saperia@jdscons.com 
-  RFC3140          ||       D. Black, S. Brim, B. Carpenter, F. Le Faucheur         ||        black_david@emc.com, sbrim@cisco.com, brian@icair.org, flefauch@cisco.com 
-  RFC3141          ||       T. Hiller, P. Walsh, X. Chen, M. Munson, G. Dommety, S. Sivalingham, B. Lim, P. McCann, H. Shiino, B. Hirschman, S. Manning, R. Hsu, H. Koo, M. Lipford, P. Calhoun, C. Lo, E. Jaques, E. Campbell, Y.Xu,S.Baba,T.Ayaki,T.Seki,A.Hameed         ||        pcalhoun@eng.sun.com, gdommety@cisco.com, tom.hiller@lucent.com, rhsu@qualcomm.com, mlipfo01@sprintspectrum.com, serge@awardsolutions.com, mccap@lucent.com, mmunson@gte.net, hskoo@sta.samsung.com, walshp@lucent.com, yxu@watercove.com, qa4053@email.mot.com, ejaques@akamail.com, s.sivalingham@ericsson.com, xing.chen@usa.alcatel.com, bklim@lge.com, hshiino@lucent.com, sbaba@tari.toshiba.com, ayaki@ddi.co.jp, Charles.Lo@vodafone-us.com, t-seki@kddi.com 
-  RFC3142          ||       J. Hagino, K. Yamamoto         ||        itojun@iijlab.net, kazu@iijlab.net 
-  RFC3143          ||       I. Cooper, J. Dilley         ||        icooper@equinix.com, jad@akamai.com 
-  RFC3144          ||       D. Romascanu         ||        dromasca@gmail.com  
-  RFC3145          ||       R. Verma, M. Verma, J. Carlson         ||        rverma@dc.com, Madhvi_Verma@3com.com, james.d.carlson@sun.com 
-  RFC3146          ||      K. Fujisawa, A. Onoe         ||       fujisawa@sm.sony.co.jp, onoe@sm.sony.co.jp
-  RFC3147          ||       P. Christian         ||        christi@nortelnetworks.com 
-  RFC3148          ||       M. Mathis, M. Allman         ||        mathis@psc.edu, mallman@bbn.com 
-  RFC3149          ||       A. Srinath, G. Levendel, K. Fritz, R. Kalyanaram         ||        Ashok.Srinath@sylantro.com, Gil.Levendel@sylantro.com, Kent.Fritz@sylantro.com, Raghuraman.Kal@wipro.com 
-  RFC3150          ||       S. Dawkins, G. Montenegro, M. Kojo, V. Magret         ||        spencer.dawkins@fnc.fujitsu.com, gab@sun.com, kojo@cs.helsinki.fi, vincent.magret@alcatel.com 
-  RFC3151          ||       N. Walsh, J. Cowan, P. Grosso         ||        Norman.Walsh@East.Sun.COM, jcowan@reutershealth.com, pgrosso@arbortext.com 
-  RFC3152          ||       R. Bush         ||        randy@psg.com 
-  RFC3153          ||       R. Pazhyannur, I. Ali, C. Fox         ||        pazhynnr@cig.mot.com, fia225@email.mot.com, fox@cisco.com 
-  RFC3154          ||       J. Kempf, C. Castelluccia, P. Mutaf, N. Nakajima, Y. Ohba, R. Ramjee, Y. Saifullah, B. Sarikaya, X. Xu         ||        James.Kempf@Sun.COM, pars.mutaf@inria.fr, claude.castelluccia@inria.fr, nnakajima@tari.toshiba.com, yohba@tari.toshiba.com, ramjee@bell-labs.com, Yousuf.Saifullah@nokia.com, Behcet.Sarikaya@usa.alcatel.com 
-  RFC3155          ||       S. Dawkins, G. Montenegro, M. Kojo, V. Magret, N. Vaidya         ||        spencer.dawkins@fnc.fujitsu.com, gab@sun.com, kojo@cs.helsinki.fi, vincent.magret@alcatel.com 
-  RFC3156          ||       M. Elkins, D. Del Torto, R. Levien, T. Roessler         ||         
-  RFC3157          ||       A. Arsenault, S. Farrell         ||        aarsenault@dvnet.com, stephen.farrell@baltimore.ie 
-  RFC3158          ||       C. Perkins, J. Rosenberg, H. Schulzrinne         ||        csp@isi.edu, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu 
-  RFC3159          ||      K. McCloghrie, M. Fine, J. Seligson, K. Chan, S. Hahn, R. Sahita, A. Smith, F. Reichmeyer         ||       mfine@cisco.com, jseligso@nortelnetworks.com, khchan@nortelnetworks.com, scott.hahn@intel.com, ravi.sahita@intel.com, andrew@allegronetworks.com, franr@pfn.com
-  RFC3160          ||      S. Harris         ||       
-  RFC3161          ||      C. Adams, P. Cain, D. Pinkas, R. Zuccherato         ||       cadams@entrust.com, pcain@bbn.com, Denis.Pinkas@bull.net, robert.zuccherato@entrust.com
-  RFC3162          ||      B. Aboba, G. Zorn, D. Mitton         ||       bernarda@microsoft.com, gwz@cisco.com
-  RFC3163          ||       R. Zuccherato, M. Nystrom         ||        robert.zuccherato@entrust.com, magnus@rsasecurity.com 
-  RFC3164          ||      C. Lonvick         ||       clonvick@cisco.com
-  RFC3165          ||       D. Levi, J. Schoenwaelder         ||         
-  RFC3166          ||       D. Meyer, J. Scudder         ||        dmm@sprint.net, jgs@cisco.com 
-  RFC3167          ||       D. Meyer, J. Scudder         ||        dmm@sprint.net, jgs@cisco.com 
-  RFC3168          ||      K. Ramakrishnan, S. Floyd, D. Black         ||       kk@teraoptic.com, floyd@aciri.org, black_david@emc.com
-  RFC3169          ||       M. Beadles, D. Mitton         ||        dmitton@nortelnetworks.com 
-  RFC3170          ||       B. Quinn, K. Almeroth         ||        bquinn@celoxnetworks.com, almeroth@cs.ucsb.edu 
-  RFC3171          ||      Z. Albanna, K. Almeroth, D. Meyer, M. Schipper         ||       zaid@juniper.net, almeroth@cs.ucsb.edu, dmm@sprint.net, iana@iana.org
-  RFC3172          ||       G. Huston, Ed.         ||         
-  RFC3173          ||       A. Shacham, B. Monsour, R. Pereira, M. Thomas         ||        shacham@shacham.net, bob@bobmonsour.com, royp@cisco.com, matt@3am-software.com 
-  RFC3174          ||      D. Eastlake 3rd, P. Jones         ||       Donald.Eastlake@motorola.com, paulej@packetizer.com
-  RFC3175          ||      F. Baker, C. Iturralde, F. Le Faucheur, B. Davie         ||       fred@cisco.com, cei@cisco.com, flefauch@cisco.com, bdavie@cisco.com
-  RFC3176          ||       P. Phaal, S. Panchen, N. McKee         ||        peter_phaal@INMON.COM, sonia_panchen@INMON.COM, neil_mckee@INMON.COM 
-  RFC3177          ||      IAB, IESG         ||       
-  RFC3178          ||       J. Hagino, H. Snyder         ||        itojun@iijlab.net, hal@vailsys.com 
-  RFC3179          ||       J. Schoenwaelder, J. Quittek         ||        schoenw@ibr.cs.tu-bs.de, quittek@ccrle.nec.de 
-  RFC3180          ||       D. Meyer, P. Lothberg         ||        dmm@sprint.net, roll@sprint.net 
-  RFC3181          ||       S. Herzog         ||        herzog@policyconsulting.com 
-  RFC3182          ||       S. Yadav, R. Yavatkar, R. Pabbati, P. Ford, T. Moore, S. Herzog, R. Hess         ||        Satyendra.Yadav@intel.com, Raj.Yavatkar@intel.com, rameshpa@microsoft.com, peterf@microsoft.com, timmoore@microsoft.com, herzog@policyconsulting.com, rodney.hess@intel.com 
-  RFC3183          ||       T. Dean, W. Ottaway         ||        tbdean@QinetiQ.com, wjottaway@QinetiQ.com 
-  RFC3184          ||      S. Harris         ||       srh@merit.edu
-  RFC3185          ||       S. Farrell, S. Turner         ||        stephen.farrell@baltimore.ie, turners@ieca.com 
-  RFC3186          ||       S. Shimizu, T. Kawano, K. Murakami, E. Beier         ||        shimizu@ntt-20.ecl.net, kawano@core.ecl.net, murakami@ntt-20.ecl.net, Beier@bina.de 
-  RFC3187          ||       J. Hakala, H. Walravens         ||        juha.hakala@helsinki.fi, hartmut.walravens@sbb.spk-berlin.de 
-  RFC3188          ||       J. Hakala         ||        juha.hakala@helsinki.fi 
-  RFC3189          ||      K. Kobayashi, A. Ogawa, S. Casner, C. Bormann         ||       ikob@koganei.wide.ad.jp, akimichi@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org
-  RFC3190          ||       K. Kobayashi, A. Ogawa, S. Casner, C. Bormann         ||        ikob@koganei.wide.ad.jp, akimichi@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org 
-  RFC3191          ||       C. Allocchio         ||         
-  RFC3192          ||       C. Allocchio         ||         
-  RFC3193          ||       B. Patel, B. Aboba, W. Dixon, G. Zorn, S. Booth         ||        baiju.v.patel@intel.com, bernarda@microsoft.com, wdixon@microsoft.com, gwz@cisco.com, ebooth@cisco.com 
-  RFC3194          ||       A. Durand, C. Huitema         ||         
-  RFC3195          ||       D. New, M. Rose         ||        dnew@san.rr.com, mrose17@gmail.com
-  RFC3196          ||      T. Hastings, C. Manros, P. Zehler, C. Kugler, H. Holst         ||       tom.hastings@alum.mit.edu, Kugler@us.ibm.com, hh@I-data.com, Peter.Zehler@xerox.com
-  RFC3197          ||       R. Austein         ||        sra@hactrn.net 
-  RFC3198          ||      A. Westerinen, J. Schnizlein, J. Strassner, M. Scherling, B. Quinn, S. Herzog, A. Huynh, M. Carlson, J. Perry, S. Waldbusser         ||       andreaw@cisco.com, john.schnizlein@cisco.com, john.strassner@intelliden.com, mscherling@xcert.com, bquinn@celoxnetworks.com, jay.perry@netapp.com, herzog@PolicyConsulting.com, mark.carlson@sun.com, waldbusser@nextbeacon.com
-  RFC3199          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC3200          ||               ||         
-  RFC3201          ||       R. Steinberger, O. Nicklass         ||        robert.steinberger@fnc.fujitsu.com, Orly_n@rad.co.il 
-  RFC3202          ||       R. Steinberger, O. Nicklass         ||        robert.steinberger@fnc.fujitsu.com, Orly_n@rad.co.il 
-  RFC3203          ||      Y. T'Joens, C. Hublet, P. De Schrijver         ||       yves.tjoens@alcatel.be, p2@mind.be, Christian.Hublet@alcatel.be
-  RFC3204          ||      E. Zimmerer, J. Peterson, A. Vemuri, L. Ong, F. Audet, M. Watson, M. Zonoun         ||       eric_zimmerer@yahoo.com, Aparna.Vemuri@Qwest.com, jon.peterson@neustar.com, lyndon_ong@yahoo.com, mzonoun@nortelnetworks.com, audet@nortelnetworks.com, mwatson@nortelnetworks.com
-  RFC3205          ||       K. Moore         ||        moore@cs.utk.edu 
-  RFC3206          ||       R. Gellens         ||        randy@qualcomm.com 
-  RFC3207          ||      P. Hoffman         ||       phoffman@imc.org
-  RFC3208          ||       T. Speakman, J. Crowcroft, J. Gemmell, D. Farinacci, S. Lin, D. Leshchiner, M. Luby, T. Montgomery, L. Rizzo, A. Tweedly, N. Bhaskar, R. Edmonstone, R. Sumanasekera, L. Vicisano         ||        speakman@cisco.com, dino@procket.com, steven@juniper.net, agt@cisco.com, nbhaskar@cisco.com, redmonst@cisco.com, rajitha@cisco.com, lorenzo@cisco.com, j.crowcroft@cs.ucl.ac.uk, jgemmell@microsoft.com, dleshc@tibco.com, luby@digitalfountain.com, todd@talarian.com, luigi@iet.unipi.it 
-  RFC3209          ||      D. Awduche, L. Berger, D. Gan, T. Li, V. Srinivasan, G. Swallow         ||       awduche@movaz.com, lberger@movaz.com, dhg@juniper.net, tli@procket.com, vsriniva@cosinecom.com, swallow@cisco.com
-  RFC3210          ||      D. Awduche, A. Hannan, X. Xiao         ||       awduche@movaz.com, alan@routingloop.com, xxiao@photuris.com 
-  RFC3211          ||       P. Gutmann         ||        pgut001@cs.auckland.ac.nz 
-  RFC3212          ||      B. Jamoussi, Ed., L. Andersson, R. Callon, R. Dantu, L. Wu, P. Doolan, T. Worster, N. Feldman, A. Fredette, M. Girish, E. Gray, J. Heinanen, T. Kilty, A. Malis         ||       loa.andersson@utfors.se, rcallon@juniper.net, rdantu@netrake.com, pdoolan@acm.org, Nkf@us.ibm.com, afredette@charter.net, eric.gray@sandburst.com, jh@song.fi, tim-kilty@mediaone.net, Andy.Malis@vivacenetworks.com, muckai@atoga.com, fsb@thefsb.org, liwwu@cisco.com
-  RFC3213          ||       J. Ash, M. Girish, E. Gray, B. Jamoussi, G. Wright         ||        gash@att.com, eric.gray@sandburst.com, gwright@nortelnetworks.com, muckai@atoga.com, Jamoussi@nortelnetworks.com 
-  RFC3214          ||       J. Ash, Y. Lee, P. Ashwood-Smith, B. Jamoussi, D. Fedyk, D. Skalecki, L. Li         ||        gash@att.com, jamoussi@NortelNetworks.com, petera@NortelNetworks.com, dareks@nortelnetworks.com, ylee@ceterusnetworks.com, lili@ss8networks.com, dwfedyk@nortelnetworks.com 
-  RFC3215          ||       C. Boscher, P. Cheval, L. Wu, E. Gray         ||        christophe.boscher@alcatel.fr, pierrick.cheval@space.alcatel.fr, liwwu@cisco.com, eric.gray@sandburst.com 
-  RFC3216          ||       C. Elliott, D. Harrington, J. Jason, J. Schoenwaelder, F. Strauss, W. Weiss         ||        chelliot@cisco.com, dbh@enterasys.com, jamie.jason@intel.com, schoenw@ibr.cs.tu-bs.de, strauss@ibr.cs.tu-bs.de, wweiss@ellacoya.com 
-  RFC3217          ||       R. Housley         ||        rhousley@rsasecurity.com 
-  RFC3218          ||       E. Rescorla         ||        ekr@rtfm.com 
-  RFC3219          ||       J. Rosenberg, H. Salama, M. Squire         ||        jdrosen@dynamicsoft.com, hsalama@cisco.com, mattsquire@acm.org 
-  RFC3220          ||      C. Perkins, Ed.         ||       charliep@iprg.nokia.com
-  RFC3221          ||       G. Huston         ||         
-  RFC3222          ||       G. Trotter         ||        Guy_Trotter@agilent.com 
-  RFC3223          ||               ||         
-  RFC3224          ||       E. Guttman         ||        erik.guttman@sun.com 
-  RFC3225          ||       D. Conrad         ||        david.conrad@nominum.com 
-  RFC3226          ||       O. Gudmundsson         ||        ogud@ogud.com 
-  RFC3227          ||       D. Brezinski, T. Killalea         ||        dbrezinski@In-Q-Tel.org, tomk@neart.org 
-  RFC3228          ||       B. Fenner         ||        fenner@research.att.com 
-  RFC3229          ||       J. Mogul, B. Krishnamurthy, F. Douglis, A. Feldmann, Y. Goland, A. van Hoff, D. Hellerstein         ||         
-  RFC3230          ||       J. Mogul, A. Van Hoff         ||        JeffMogul@acm.org, avh@marimba.com 
-  RFC3231          ||       D. Levi, J. Schoenwaelder         ||         
-  RFC3232          ||       J. Reynolds, Ed.         ||        rfc-editor@rfc-editor.org 
-  RFC3233          ||       P. Hoffman, S. Bradner         ||         
-  RFC3234          ||       B. Carpenter, S. Brim         ||        brian@hursley.ibm.com, sbrim@cisco.com 
-  RFC3235          ||       D. Senie         ||        dts@senie.com 
-  RFC3236          ||       M. Baker, P. Stark         ||        mbaker@planetfred.com, distobj@acm.org, Peter.Stark@ecs.ericsson.com 
-  RFC3237          ||       M. Tuexen, Q. Xie, R. Stewart, M. Shore, L. Ong, J. Loughney, M. Stillman         ||       Michael.Tuexen@icn.siemens.de, qxie1@email.mot.com, randall@lakerest.net, mshore@cisco.com, lyong@ciena.com, john.loughney@nokia.com, maureen.stillman@nokia.com
-  RFC3238          ||       S. Floyd, L. Daigle         ||        iab@iab.org 
-  RFC3239          ||      C. Kugler, H. Lewis, T. Hastings         ||       kugler@us.ibm.com, tom.hastings@alum.mit.edu, harryl@us.ibm.com
-  RFC3240          ||       D. Clunie, E. Cordonnier         ||        dclunie@dclunie.com, emmanuel.cordonnier@etiam.com 
-  RFC3241          ||      C. Bormann         ||       cabo@tzi.org
-  RFC3242          ||       L-E. Jonsson, G. Pelletier         ||        lars-erik.jonsson@ericsson.com, ghyslain.pelletier@epl.ericsson.se 
-  RFC3243          ||       L-E. Jonsson         ||        lars-erik.jonsson@ericsson.com 
-  RFC3244          ||       M. Swift, J. Trostle, J. Brezak         ||        mikesw@cs.washington.edu, john3725@world.std.com, jbrezak@microsoft.com 
-  RFC3245          ||      J. Klensin, Ed., IAB         ||       iab@iab.org, sob@harvard.edu, paf@cisco.com
-  RFC3246          ||      B. Davie, A. Charny, J.C.R. Bennet, K. Benson, J.Y. Le Boudec, W. Courtney, S. Davari, V. Firoiu, D. Stiliadis         ||       bsd@cisco.com, acharny@cisco.com, jcrb@motorola.com, Kent.Benson@tellabs.com, jean-yves.leboudec@epfl.ch, bill.courtney@trw.com, shahram_davari@pmc-sierra.com, vfiroiu@nortelnetworks.com, stiliadi@bell-labs.com
-  RFC3247          ||      A. Charny, J. Bennet, K. Benson, J. Boudec, A. Chiu, W. Courtney, S. Davari, V. Firoiu, C. Kalmanek, K. Ramakrishnan         ||       acharny@cisco.com, jcrb@motorola.com, Kent.Benson@tellabs.com, jean-yves.leboudec@epfl.ch, angela.chiu@celion.com, bill.courtney@trw.com, shahram_davari@pmc-sierra.com, vfiroiu@nortelnetworks.com, crk@research.att.com, kk@teraoptic.com
-  RFC3248          ||      G. Armitage, B. Carpenter, A. Casati, J. Crowcroft, J. Halpern, B. Kumar, J. Schnizlein         ||       
-  RFC3249          ||       V. Cancio, M. Moldovan, H. Tamura, D. Wing         ||        vcancio@pacbell.net, mmoldovan@g3nova.com, tamura@toda.ricoh.co.jp, dwing-ietf@fuggles.com 
-  RFC3250          ||      L. McIntyre, G. Parsons, J. Rafferty         ||       lmcintyre@pahv.xerox.com, gparsons@nortelnetworks.com, jraff@brooktrout.com
-  RFC3251          ||       B. Rajagopalan         ||        braja@tellium.com 
-  RFC3252          ||       H. Kennedy         ||        kennedyh@engin.umich.edu 
-  RFC3253          ||      G. Clemm, J. Amsden, T. Ellison, C. Kaler, J. Whitehead         ||       geoffrey.clemm@rational.com, jamsden@us.ibm.com, tim_ellison@uk.ibm.com, ckaler@microsoft.com, ejw@cse.ucsc.edu
-  RFC3254          ||       H. Alvestrand         ||        Harald@alvestrand.no 
-  RFC3255          ||       N. Jones, C. Murton         ||        nrjones@agere.com, murton@nortelnetworks.com 
-  RFC3256          ||       D. Jones, R. Woundy         ||        doug@yas.com, rwoundy@broadband.att.com 
-  RFC3257          ||       L. Coene         ||         
-  RFC3258          ||       T. Hardie         ||        Ted.Hardie@nominum.com 
-  RFC3259          ||       J. Ott, C. Perkins, D. Kutscher         ||        jo@tzi.uni-bremen.de, csp@isi.edu, dku@tzi.uni-bremen.de 
-  RFC3260          ||       D. Grossman         ||        dan@dma.isg.mot.com 
-  RFC3261          ||      J. Rosenberg, H. Schulzrinne, G. Camarillo, A. Johnston, J. Peterson, R. Sparks, M. Handley, E. Schooler         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com, alan.johnston@wcom.com, jon.peterson@neustar.com, rsparks@dynamicsoft.com, mjh@icir.org, schooler@research.att.com
-  RFC3262          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu
-  RFC3263          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu
-  RFC3264          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu
-  RFC3265          ||      A. B. Roach         ||       adam@dynamicsoft.com
-  RFC3266          ||      S. Olson, G. Camarillo, A. B. Roach         ||       seanol@microsoft.com, Gonzalo.Camarillo@ericsson.com, adam@dynamicsoft.com
-  RFC3267          ||      J. Sjoberg, M. Westerlund, A. Lakaniemi, Q. Xie         ||       Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, qxie1@email.mot.com
-  RFC3268          ||      P. Chown         ||       pc@skygate.co.uk
-  RFC3269          ||       R. Kermode, L. Vicisano         ||        Roger.Kermode@motorola.com, lorenzo@cisco.com 
-  RFC3270          ||      F. Le Faucheur, L. Wu, B. Davie, S. Davari, P. Vaananen, R. Krishnan, P. Cheval, J. Heinanen         ||       flefauch@cisco.com, liwwu@cisco.com, bsd@cisco.com, davari@ieee.org, pasi.vaananen@nokia.com, ram@axiowave.com, pierrick.cheval@space.alcatel.fr, jh@song.fi
-  RFC3271          ||      V. Cerf         ||       vinton.g.cerf@wcom.com
-  RFC3272          ||      D. Awduche, A. Chiu, A. Elwalid, I. Widjaja, X. Xiao         ||       awduche@movaz.com, angela.chiu@celion.com, anwar@lucent.com, iwidjaja@research.bell-labs.com, xipeng@redback.com
-  RFC3273          ||      S. Waldbusser         ||       waldbusser@nextbeacon.com
-  RFC3274          ||      P. Gutmann         ||       pgut001@cs.auckland.ac.nz
-  RFC3275          ||      D. Eastlake 3rd, J. Reagle, D. Solo         ||       Donald.Eastlake@motorola.com, reagle@w3.org, dsolo@alum.mit.edu
-  RFC3276          ||      B. Ray, R. Abbi         ||       rray@pesa.com, Rajesh.Abbi@alcatel.com
-  RFC3277          ||       D. McPherson         ||        danny@tcb.net 
-  RFC3278          ||      S. Blake-Wilson, D. Brown, P. Lambert         ||       sblakewi@certicom.com, dbrown@certicom.com, plambert@sprintmail.com
-  RFC3279          ||      L. Bassham, W. Polk, R. Housley         ||       tim.polk@nist.gov, rhousley@rsasecurity.com, lbassham@nist.gov
-  RFC3280          ||      R. Housley, W. Polk, W. Ford, D. Solo         ||       rhousley@rsasecurity.com, wford@verisign.com, wpolk@nist.gov, dsolo@alum.mit.edu
-  RFC3281          ||      S. Farrell, R. Housley         ||       stephen.farrell@baltimore.ie, rhousley@rsasecurity.com
-  RFC3282          ||      H. Alvestrand         ||       Harald@Alvestrand.no
-  RFC3283          ||      B. Mahoney, G. Babics, A. Taler         ||       bobmah@mit.edu, georgeb@steltor.com, alex@0--0.org
-  RFC3284          ||      D. Korn, J. MacDonald, J. Mogul, K. Vo         ||       kpv@research.att.com, dgk@research.att.com, JeffMogul@acm.org, jmacd@cs.berkeley.edu
-  RFC3285          ||      M. Gahrns, T. Hain         ||       mikega@microsoft.com, ahain@cisco.com
-  RFC3286          ||      L. Ong, J. Yoakum         ||       lyong@ciena.com, yoakum@nortelnetworks.com
-  RFC3287          ||      A. Bierman         ||       andy@yumaworks.com
-  RFC3288          ||      E. O'Tuathail, M. Rose         ||       eamon.otuathail@clipcode.com, mrose17@gmail.com
-  RFC3289          ||      F. Baker, K. Chan, A. Smith         ||       fred@cisco.com, khchan@nortelnetworks.com, ah_smith@acm.org
-  RFC3290          ||      Y. Bernet, S. Blake, D. Grossman, A. Smith         ||       ybernet@msn.com, steven.blake@ericsson.com, dan@dma.isg.mot.com, ah_smith@acm.org
-  RFC3291          ||      M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder         ||       md@world.std.com, bkhabs@nc.rr.com, sar@epilogue.com, schoenw@ibr.cs.tu-bs.de
-  RFC3292          ||      A. Doria, F. Hellstrand, K. Sundell, T. Worster         ||       avri@acm.org, fiffi@nortelnetworks.com, ksundell@nortelnetworks.com, fsb@thefsb.org
-  RFC3293          ||      T. Worster, A. Doria, J. Buerkle         ||       fsb@thefsb.org, avri@acm.com, Joachim.Buerkle@nortelnetworks.com
-  RFC3294          ||      A. Doria, K. Sundell         ||       avri@acm.org, sundell@nortelnetworks.com
-  RFC3295          ||      H. Sjostrand, J. Buerkle, B. Srinivasan         ||       hans@ipunplugged.com, joachim.buerkle@nortelnetworks.com, balaji@cplane.com
-  RFC3296          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC3297          ||      G. Klyne, R. Iwazaki, D. Crocker         ||       GK@ACM.ORG, iwa@rdl.toshibatec.co.jp, dcrocker@brandenburg.com
-  RFC3298          ||       I. Faynberg, J. Gato, H. Lu, L. Slutsman         ||        lslutsman@att.com, faynberg@lucent.com, jgato@airtel.es, huilanlu@lucent.com 
-  RFC3299          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC3300          ||      J. Reynolds, R. Braden, S. Ginoza, A. De La Cruz         ||       
-  RFC3301          ||      Y. T'Joens, P. Crivellari, B. Sales         ||       paolo.crivellari@belgacom.be
-  RFC3302          ||      G. Parsons, J. Rafferty         ||       gparsons@nortelnetworks.com, jraff@brooktrout.com
-  RFC3303          ||       P. Srisuresh, J. Kuthan, J. Rosenberg, A. Molitor, A. Rayhan         ||        srisuresh@yahoo.com, kuthan@fokus.fhg.de, jdrosen@dynamicsoft.com, amolitor@visi.com, rayhan@ee.ryerson.ca 
-  RFC3304          ||       R. P. Swale, P. A. Mart, P. Sijben, S. Brim, M. Shore         ||        richard.swale@bt.com, paul.sijben@picopoint.com, philip.mart@marconi.com, sbrim@cisco.com, mshore@cisco.com 
-  RFC3305          ||      M. Mealling, Ed., R. Denenberg, Ed.         ||       michael@verisignlabs.com, rden@loc.gov
-  RFC3306          ||      B. Haberman, D. Thaler         ||       bkhabs@nc.rr.com, dthaler@microsoft.com
-  RFC3307          ||      B. Haberman         ||       bkhabs@nc.rr.com
-  RFC3308          ||      P. Calhoun, W. Luo, D. McPherson, K. Peirce         ||       pcalhoun@bstormnetworks.com, luo@cisco.com, danny@tcb.net, Ken@malibunetworks.com
-  RFC3309          ||      J. Stone, R. Stewart, D. Otis         ||       jonathan@dsg.stanford.edu, randall@lakerest.net, dotis@sanlight.net
-  RFC3310          ||      A. Niemi, J. Arkko, V. Torvinen         ||       aki.niemi@nokia.com, jari.arkko@ericsson.com, vesa.torvinen@ericsson.fi
-  RFC3311          ||      J. Rosenberg         ||       jdrosen@dynamicsoft.com
-  RFC3312          ||      G. Camarillo, Ed., W. Marshall, Ed., J. Rosenberg         ||       Gonzalo.Camarillo@ericsson.com, wtm@research.att.com, jdrosen@dynamicsoft.com
-  RFC3313          ||      W. Marshall, Ed.         ||       
-  RFC3314          ||      M. Wasserman, Ed.         ||       
-  RFC3315          ||      R. Droms, Ed., J. Bound, B. Volz, T. Lemon, C. Perkins, M. Carney         ||       Jim.Bound@hp.com, volz@metrocast.net, Ted.Lemon@nominum.com, charles.perkins@nokia.com, michael.carney@sun.com
-  RFC3316          ||      J. Arkko, G. Kuijpers, H. Soliman, J. Loughney, J. Wiljakka         ||       jari.arkko@ericsson.com, gerben.a.kuijpers@ted.ericsson.se, john.loughney@nokia.com, hesham.soliman@era.ericsson.se, juha.wiljakka@nokia.com
-  RFC3317          ||      K. Chan, R. Sahita, S. Hahn, K. McCloghrie         ||       khchan@nortelnetworks.com, ravi.sahita@intel.com, scott.hahn@intel.com, kzm@cisco.com
-  RFC3318          ||      R. Sahita, Ed., S. Hahn, K. Chan, K. McCloghrie         ||       ravi.sahita@intel.com, scott.hahn@intel.com, khchan@nortelnetworks.com, kzm@cisco.com
-  RFC3319          ||       H. Schulzrinne, B. Volz         ||        schulzrinne@cs.columbia.edu, volz@metrocast.net 
-  RFC3320          ||      R. Price, C. Bormann, J. Christoffersson, H. Hannu, Z. Liu, J. Rosenberg         ||       richard.price@roke.co.uk, cabo@tzi.org, jan.christoffersson@epl.ericsson.se, hans.hannu@epl.ericsson.se, zhigang.c.liu@nokia.com, jdrosen@dynamicsoft.com
-  RFC3321          ||      H. Hannu, J. Christoffersson, S. Forsgren, K.-C. Leung, Z. Liu, R. Price         ||       hans.hannu@epl.ericsson.se, jan.christoffersson@epl.ericsson.se, StefanForsgren@alvishagglunds.se, kcleung@cs.ttu.edu, zhigang.c.liu@nokia.com, richard.price@roke.co.uk
-  RFC3322          ||      H. Hannu         ||       hans.hannu@epl.ericsson.se
-  RFC3323          ||      J. Peterson         ||       jon.peterson@neustar.biz
-  RFC3324          ||      M. Watson         ||       mwatson@nortelnetworks.com
-  RFC3325          ||      C. Jennings, J. Peterson, M. Watson         ||       fluffy@cisco.com, Jon.Peterson@NeuStar.biz, mwatson@nortelnetworks.com
-  RFC3326          ||      H. Schulzrinne, D. Oran, G. Camarillo         ||       schulzrinne@cs.columbia.edu, oran@cisco.com, Gonzalo.Camarillo@ericsson.com
-  RFC3327          ||      D. Willis, B. Hoeneisen         ||       dean.willis@softarmor.com, hoeneisen@switch.ch
-  RFC3328          ||               ||         
-  RFC3329          ||      J. Arkko, V. Torvinen, G. Camarillo, A. Niemi, T. Haukka         ||       jari.arkko@ericsson.com, vesa.torvinen@ericsson.fi, Gonzalo.Camarillo@ericsson.com, aki.niemi@nokia.com, tao.haukka@nokia.com
-  RFC3330          ||      IANA         ||       iana@iana.org
-  RFC3331          ||      K. Morneault, R. Dantu, G. Sidebottom, B. Bidulock, J. Heitz         ||       kmorneau@cisco.com, rdantu@netrake.com, greg@signatustechnologies.com, bidulock@openss7.org, jheitz@lucent.com
-  RFC3332          ||      G. Sidebottom, Ed., K. Morneault, Ed., J. Pastor-Balbas, Ed.         ||       
-  RFC3334          ||       T. Zseby, S. Zander, C. Carle         ||        zseby@fokus.fhg.de, zander@fokus.fhg.de, carle@fokus.fhg.de 
-  RFC3335          ||      T. Harding, R. Drummond, C. Shih         ||       tharding@cyclonecommerce.com, chuck.shih@gartner.com, rik@drummondgroup.com
-  RFC3336          ||      B. Thompson, T. Koren, B. Buffam         ||       brucet@cisco.com, tmima@cisco.com, bruce@seawaynetworks.com
-  RFC3337          ||      B. Thompson, T. Koren, B. Buffam         ||       brucet@cisco.com, bruce@seawaynetworks.com, tmima@cisco.com
-  RFC3338          ||      S. Lee, M-K. Shin, Y-J. Kim, E. Nordmark, A. Durand         ||       syl@pec.etri.re.kr, mkshin@pec.etri.re.kr, yjkim@pec.etri.re.kr, Alain.Durand@sun.com, erik.nordmark@sun.com
-  RFC3339          ||      G. Klyne, C. Newman         ||       chris.newman@sun.com, GK@ACM.ORG
-  RFC3340          ||      M. Rose, G. Klyne, D. Crocker         ||       mrose17@gmail.com, Graham.Klyne@MIMEsweeper.com, dcrocker@brandenburg.com
-  RFC3341          ||      M. Rose, G. Klyne, D. Crocker         ||       mrose17@gmail.com, Graham.Klyne@MIMEsweeper.com, dcrocker@brandenburg.com
-  RFC3342          ||      E. Dixon, H. Franklin, J. Kint, G. Klyne, D. New, S. Pead, M. Rose, M. Schwartz         ||       Graham.Klyne@MIMEsweeper.com, mrose17@gmail.com, schwartz@CodeOnTheRoad.com, edixon@myrealbox.com, huston@franklin.ro, d20@icosahedron.org, dnew@san.rr.com, spead@fiber.net
-  RFC3343          ||      M. Rose, G. Klyne, D. Crocker         ||       mrose17@gmail.com, gk@ninebynine.org, dcrocker@brandenburg.com
-  RFC3344          ||      C. Perkins, Ed.         ||       Basavaraj.Patil@nokia.com, PRoberts@MEGISTO.com, charliep@iprg.nokia.com
-  RFC3345          ||      D. McPherson, V. Gill, D. Walton, A. Retana         ||       danny@tcb.net, vijay@umbc.edu, dwalton@cisco.com, aretana@cisco.com
-  RFC3346          ||      J. Boyle, V. Gill, A. Hannan, D. Cooper, D. Awduche, B. Christian, W.S. Lai         ||       jboyle@pdnets.com, vijay@umbc.edu, alan@routingloop.com, dcooper@gblx.net, awduche@movaz.com, blaine@uu.net, wlai@att.com
-  RFC3347          ||      M. Krueger, R. Haagens         ||       marjorie_krueger@hp.com, Randy_Haagens@hp.com, csapuntz@stanford.edu, mbakke@cisco.com
-  RFC3348          ||      M. Gahrns, R. Cheng         ||       mikega@microsoft.com, raych@microsoft.com
-  RFC3349          ||      M. Rose         ||       mrose17@gmail.com
-  RFC3351          ||      N. Charlton, M. Gasson, G. Gybels, M. Spanner, A. van Wijk         ||       nathan@millpark.com, michael.gasson@korusolutions.com, Guido.Gybels@rnid.org.uk, mike.spanner@rnid.org.uk, Arnoud.van.Wijk@eln.ericsson.se
-  RFC3352          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
-  RFC3353          ||      D. Ooms, B. Sales, W. Livens, A. Acharya, F. Griffoul, F. Ansari         ||       Dirk.Ooms@alcatel.be, Bernard.Sales@alcatel.be, WLivens@colt-telecom.be, arup@us.ibm.com, griffoul@ulticom.com, furquan@dnrc.bell-labs.com
-  RFC3354          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC3355          ||      A. Singh, R. Turner, R. Tio, S. Nanji         ||       rturner@eng.paradyne.com, tor@redback.com, asingh1@motorola.com, suhail@redback.com
-  RFC3356          ||      G. Fishman, S. Bradner         ||       
-  RFC3357          ||      R. Koodli, R. Ravikanth         ||       rajeev.koodli@nokia.com, rravikanth@axiowave.com
-  RFC3358          ||      T. Przygienda         ||       prz@xebeo.com
-  RFC3359          ||      T. Przygienda         ||       
-  RFC3360          ||       S. Floyd         ||        floyd@icir.org 
-  RFC3361          ||      H. Schulzrinne         ||       schulzrinne@cs.columbia.edu
-  RFC3362          ||       G. Parsons         ||        gparsons@nortelnetworks.com 
-  RFC3363          ||      R. Bush, A. Durand, B. Fink, O. Gudmundsson, T. Hain         ||       
-  RFC3364          ||      R. Austein         ||       sra@hactrn.net
-  RFC3365          ||       J. Schiller         ||        jis@mit.edu 
-  RFC3366          ||      G. Fairhurst, L. Wood         ||       gorry@erg.abdn.ac.uk, lwood@cisco.com
-  RFC3367          ||       N. Popp, M. Mealling, M. Moseley         ||        npopp@verisign.com, michael@verisignlabs.com, marshall@netword.com 
-  RFC3368          ||       M. Mealling         ||        michael@verisignlabs.com 
-  RFC3369          ||      R. Housley         ||       rhousley@rsasecurity.com
-  RFC3370          ||      R. Housley         ||       rhousley@rsasecurity.com
-  RFC3371          ||      E. Caves, P. Calhoun, R. Wheeler         ||       evan@occamnetworks.com, pcalhoun@bstormnetworks.com
-  RFC3372          ||      A. Vemuri, J. Peterson         ||       Aparna.Vemuri@Qwest.com, jon.peterson@neustar.biz
-  RFC3373          ||      D. Katz, R. Saluja         ||       dkatz@juniper.net, rajesh.saluja@tenetindia.com
-  RFC3374          ||      J. Kempf, Ed.         ||       henrik@levkowetz.com, pcalhoun@bstormnetworks.com, kempf@docomolabs-usa.com, gkenward@nortelnetworks.com, hmsyed@nortelnetworks.com, jmanner@cs.helsinki.fi, madjid.nakhjiri@motorola.com, govind.krishnamurthi@nokia.com, rajeev.koodli@nokia.com, kulwinder.atwal@zucotto.com, mat@cisco.com, mat.horan@comdev.cc, phil_neumiller@3com.com
-  RFC3375          ||      S. Hollenbeck         ||       
-  RFC3376          ||      B. Cain, S. Deering, I. Kouvelas, B. Fenner, A. Thyagarajan         ||       deering@cisco.com, fenner@research.att.com, kouvelas@cisco.com
-  RFC3377          ||      J. Hodges, R. Morgan         ||       Jeff.Hodges@sun.com, rlmorgan@washington.edu
-  RFC3378          ||       R. Housley, S. Hollenbeck         ||        rhousley@rsasecurity.com, shollenbeck@verisign.com 
-  RFC3379          ||      D. Pinkas, R. Housley         ||       Denis.Pinkas@bull.net, rhousley@rsasecurity.com
-  RFC3380          ||      T. Hastings, R. Herriot, C. Kugler, H. Lewis         ||       kugler@us.ibm.com, tom.hastings@alum.mit.edu, bob@Herriot.com, harryl@us.ibm.com
-  RFC3381          ||      T. Hastings, H. Lewis, R. Bergman         ||       tom.hastings@alum.mit.edu, harryl@us.ibm.com, rbergma@hitachi-hkis.com
-  RFC3382          ||      R. deBry, T. Hastings, R. Herriot, K. Ocke, P. Zehler         ||       debryro@uvsc.edu, tom.hastings@alum.mit.edu, bob@herriot.com, KOcke@crt.xerox.com, Peter.Zehler@xerox.com
-  RFC3383          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC3384          ||      E. Stokes, R. Weiser, R. Moats, R. Huber         ||       rweiser@trustdst.com, stokese@us.ibm.com, rmoats@lemurnetworks.net, rvh@att.com
-  RFC3385          ||       D. Sheinwald, J. Satran, P. Thaler, V. Cavanna         ||        julian_satran@il.ibm.com, Dafna_Sheinwald@il.ibm.com, pat_thaler@agilent.com, vince_cavanna@agilent.com 
-  RFC3386          ||      W. Lai, Ed., D. McDysan, Ed.         ||       
-  RFC3387          ||       M. Eder, H. Chaskar, S. Nag         ||        Michael.eder@nokia.com, thinker@monmouth.com, hemant.chaskar@nokia.com 
-  RFC3388          ||      G. Camarillo, G. Eriksson, J. Holler, H. Schulzrinne         ||       Gonzalo.Camarillo@ericsson.com, Jan.Holler@era.ericsson.se, Goran.AP.Eriksson@era.ericsson.se, schulzrinne@cs.columbia.edu
-  RFC3389          ||      R. Zopf         ||       zopf@lucent.com
-  RFC3390          ||      M. Allman, S. Floyd, C. Partridge         ||       mallman@bbn.com, floyd@icir.org, craig@bbn.com
-  RFC3391          ||       R. Herriot         ||        bob@herriot.com 
-  RFC3392          ||      R. Chandra, J. Scudder         ||       rchandra@redback.com, jgs@cisco.com
-  RFC3393          ||      C. Demichelis, P. Chimento         ||       carlo.demichelis@tilab.com, chimento@torrentnet.com
-  RFC3394          ||      J. Schaad, R. Housley         ||       jimsch@exmsft.com, rhousley@rsasecurity.com
-  RFC3395          ||      A. Bierman, C. Bucci, R. Dietz, A. Warth         ||       andy@yumaworks.com, cbucci@cisco.com, rdietz@hifn.com, dahoss@earthlink.net
-  RFC3396          ||      T. Lemon, S. Cheshire         ||       mellon@nominum.com, rfc@stuartcheshire.org
-  RFC3397          ||      B. Aboba, S. Cheshire         ||       bernarda@microsoft.com, rfc@stuartcheshire.org
-  RFC3398          ||      G. Camarillo, A. B. Roach, J. Peterson, L. Ong         ||       Gonzalo.Camarillo@Ericsson.com, adam@dynamicsoft.com, jon.peterson@neustar.biz, lyOng@ciena.com
-  RFC3400          ||               ||         
-  RFC3401          ||      M. Mealling         ||       michael@neonym.net
-  RFC3402          ||      M. Mealling         ||       michael@neonym.net
-  RFC3403          ||      M. Mealling         ||       michael@neonym.net
-  RFC3404          ||      M. Mealling         ||       michael@neonym.net
-  RFC3405          ||      M. Mealling         ||       michael@neonym.net
-  RFC3406          ||      L. Daigle, D. van Gulik, R. Iannella, P. Faltstrom         ||       leslie@thinkingcat.com, renato@iprsystems.com, paf@cisco.com
-  RFC3407          ||      F. Andreasen         ||       fandreas@cisco.com
-  RFC3408          ||      Z. Liu, K. Le         ||       khiem.le@nokia.com
-  RFC3409          ||       K. Svanbro         ||        krister.svanbro@ericsson.com 
-  RFC3410          ||       J. Case, R. Mundy, D. Partain, B. Stewart         ||         
-  RFC3411          ||      D. Harrington, R. Presuhn, B. Wijnen         ||       
-  RFC3412          ||      J. Case, D. Harrington, R. Presuhn, B. Wijnen         ||       
-  RFC3413          ||       D. Levi, P. Meyer, B. Stewart         ||         
-  RFC3414          ||      U. Blumenthal, B. Wijnen         ||       
-  RFC3415          ||       B. Wijnen, R. Presuhn, K. McCloghrie         ||         
-  RFC3416          ||       R. Presuhn, Ed.         ||         
-  RFC3417          ||      R. Presuhn, Ed.         ||       
-  RFC3418          ||       R. Presuhn, Ed.         ||         
-  RFC3419          ||       M. Daniele, J. Schoenwaelder         ||        md@world.std.com, schoenw@ibr.cs.tu-bs.de 
-  RFC3420          ||      R. Sparks         ||       rsparks@dynamicsoft.com
-  RFC3421          ||      W. Zhao, H. Schulzrinne, E. Guttman, C. Bisdikian, W. Jerome         ||       zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com, bisdik@us.ibm.com, wfj@us.ibm.com
-  RFC3422          ||      O. Okamoto, M. Maruyama, T. Sajima         ||       okamoto.osamu@lab.ntt.co.jp, mitsuru@core.ecl.net, tjs@sun.com
-  RFC3423          ||       K. Zhang, E. Elkin         ||        kevinzhang@ieee.org, eitan@xacct.com 
-  RFC3424          ||      L. Daigle, Ed., IAB         ||       iab@iab.org
-  RFC3425          ||      D. Lawrence         ||       tale@nominum.com
-  RFC3426          ||      S. Floyd         ||       iab@iab.org
-  RFC3427          ||      A. Mankin, S. Bradner, R. Mahy, D. Willis, J. Ott, B. Rosen         ||       mankin@psg.com, sob@harvard.edu, rohan@cisco.com, dean.willis@softarmor.com, brian.rosen@marconi.com, jo@ipdialog.com
-  RFC3428          ||       B. Campbell, Ed., J. Rosenberg, H. Schulzrinne, C. Huitema, D. Gurle         ||        bcampbell@dynamicsoft.com, jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, huitema@microsoft.com, dgurle@microsoft.com 
-  RFC3429          ||      H. Ohta         ||       ohta.hiroshi@lab.ntt.co.jp
-  RFC3430          ||      J. Schoenwaelder         ||       schoenw@ibr.cs.tu-bs.de
-  RFC3431          ||      W. Segmuller         ||       whs@watson.ibm.com
-  RFC3432          ||      V. Raisanen, G. Grotefeld, A. Morton         ||       Vilho.Raisanen@nokia.com, g.grotefeld@motorola.com, acmorton@att.com
-  RFC3433          ||      A. Bierman, D. Romascanu, K.C. Norseth         ||       andy@yumaworks.com, dromasca@gmail.com , kenyon.c.norseth@L-3com.com
-  RFC3434          ||      A. Bierman, K. McCloghrie         ||       andy@yumaworks.com, kzm@cisco.com
-  RFC3435          ||      F. Andreasen, B. Foster         ||       fandreas@cisco.com, bfoster@cisco.com
-  RFC3436          ||      A. Jungmaier, E. Rescorla, M. Tuexen         ||       ajung@exp-math.uni-essen.de, ekr@rtfm.com, Michael.Tuexen@siemens.com
-  RFC3437          ||      W. Palter, W. Townsley         ||       mark@townsley.net, palter.ietf@zev.net
-  RFC3438          ||      W. Townsley         ||       mark@townsley.net
-  RFC3439          ||      R. Bush, D. Meyer         ||       randy@psg.com, dmm@maoz.com
-  RFC3440          ||      F. Ly, G. Bathrick         ||       faye@pedestalnetworks.com, greg.bathrick@nokia.com
-  RFC3441          ||      R. Kumar         ||       rkumar@cisco.com
-  RFC3442          ||      T. Lemon, S. Cheshire, B. Volz         ||       Ted.Lemon@nominum.com, rfc@stuartcheshire.org, bernie.volz@ericsson.com
-  RFC3443          ||      P. Agarwal, B. Akyol         ||       puneet@acm.org, bora@cisco.com
-  RFC3444          ||      A. Pras, J. Schoenwaelder         ||       pras@ctit.utwente.nl, schoenw@informatik.uni-osnabrueck.de
-  RFC3445          ||      D. Massey, S. Rose         ||       masseyd@isi.edu, scott.rose@nist.gov
-  RFC3446          ||      D. Kim, D. Meyer, H. Kilmer, D. Farinacci         ||       dorian@blackrose.org, hank@rem.com, dino@procket.com, dmm@maoz.com
-  RFC3447          ||      J. Jonsson, B. Kaliski         ||       jonsson@mathematik.uni-marburg.de, bkaliski@rsasecurity.com
-  RFC3448          ||      M. Handley, S. Floyd, J. Padhye, J. Widmer         ||       mjh@icir.org, floyd@icir.org, padhye@microsoft.com, widmer@informatik.uni-mannheim.de
-  RFC3449          ||      H. Balakrishnan, V. Padmanabhan, G. Fairhurst, M. Sooriyabandara         ||       hari@lcs.mit.edu, padmanab@microsoft.com, gorry@erg.abdn.ac.uk, mahesh@erg.abdn.ac.uk
-  RFC3450          ||      M. Luby, J. Gemmell, L. Vicisano, L. Rizzo, J. Crowcroft         ||       luby@digitalfountain.com, jgemmell@microsoft.com, lorenzo@cisco.com, luigi@iet.unipi.it, Jon.Crowcroft@cl.cam.ac.uk
-  RFC3451          ||      M. Luby, J. Gemmell, L. Vicisano, L. Rizzo, M. Handley, J. Crowcroft         ||       luby@digitalfountain.com, jgemmell@microsoft.com, lorenzo@cisco.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk
-  RFC3452          ||      M. Luby, L. Vicisano, J. Gemmell, L. Rizzo, M. Handley, J. Crowcroft         ||       luby@digitalfountain.com, lorenzo@cisco.com, jgemmell@microsoft.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk
-  RFC3453          ||      M. Luby, L. Vicisano, J. Gemmell, L. Rizzo, M. Handley, J. Crowcroft         ||       luby@digitalfountain.com, lorenzo@cisco.com, jgemmell@microsoft.com, luigi@iet.unipi.it, mjh@icir.org, Jon.Crowcroft@cl.cam.ac.uk
-  RFC3454          ||      P. Hoffman, M. Blanchet         ||       paul.hoffman@imc.org, Marc.Blanchet@viagenie.qc.ca
-  RFC3455          ||      M. Garcia-Martin, E. Henrikson, D. Mills         ||       miguel.a.garcia@ericsson.com, ehenrikson@lucent.com, duncan.mills@vf.vodafone.co.uk
-  RFC3456          ||      B. Patel, B. Aboba, S. Kelly, V. Gupta         ||       baiju.v.patel@intel.com, bernarda@microsoft.com, scott@hyperthought.com, vipul.gupta@sun.com
-  RFC3457          ||      S. Kelly, S. Ramamoorthi         ||       
-  RFC3458          ||      E. Burger, E. Candell, C. Eliot, G. Klyne         ||       e.burger@ieee.org, emily.candell@comverse.com, GK-IETF@ninebynine.org, charle@Microsoft.com
-  RFC3459          ||      E. Burger         ||       e.burger@ieee.org
-  RFC3460          ||      B. Moore, Ed.         ||       remoore@us.ibm.com
-  RFC3461          ||      K. Moore         ||       moore@cs.utk.edu
-  RFC3462          ||      G. Vaudreuil         ||       GregV@ieee.org
-  RFC3463          ||      G. Vaudreuil         ||       GregV@ieee.org
-  RFC3464          ||      K. Moore, G. Vaudreuil         ||       moore@cs.utk.edu, GregV@ieee.org
-  RFC3465          ||      M. Allman         ||       mallman@bbn.com
-  RFC3466          ||      M. Day, B. Cain, G. Tomlinson, P. Rzewski         ||       mday@alum.mit.edu, bcain@storigen.com, gary@tomlinsongroup.net, philrz@yahoo.com
-  RFC3467          ||      J. Klensin         ||       
-  RFC3468          ||      L. Andersson, G. Swallow         ||       loa@pi.se, swallow@cisco.com
-  RFC3469          ||      V. Sharma, Ed., F. Hellstrand, Ed.         ||       
-  RFC3470          ||      S. Hollenbeck, M. Rose, L. Masinter         ||       shollenbeck@verisign.com, mrose17@gmail.com,  LMM@acm.org
-  RFC3471          ||      L. Berger, Ed.         ||       lberger@movaz.com
-  RFC3472          ||      P. Ashwood-Smith, Ed., L. Berger, Ed.         ||       petera@nortelnetworks.com, lberger@movaz.com
-  RFC3473          ||      L. Berger, Ed.         ||       lberger@movaz.com
-  RFC3474          ||      Z. Lin, D. Pendarakis         ||       zhiwlin@nyct.com, dpendarakis@tellium.com
-  RFC3475          ||      O. Aboul-Magd         ||       osama@nortelnetworks.com
-  RFC3476          ||      B. Rajagopalan         ||       braja@tellium.com
-  RFC3477          ||      K. Kompella, Y. Rekhter         ||       kireeti@juniper.net, yakov@juniper.net
-  RFC3478          ||      M. Leelanivas, Y. Rekhter, R. Aggarwal         ||       manoj@juniper.net, yakov@juniper.net, rahul@redback.com
-  RFC3479          ||      A. Farrel, Ed.         ||       afarrel@movaz.com, pjb@dataconnection.com, pmatthews@hyperchip.com, ewgray@GraIyMage.com, jack.shaio@vivacenetworks.com, tob@laurelnetworks.com, andy.malis@vivacenetworks.com
-  RFC3480          ||      K. Kompella, Y. Rekhter, A. Kullberg         ||       kireeti@juniper.net, yakov@juniper.net, akullber@netplane.com
-  RFC3481          ||      H. Inamura, Ed., G. Montenegro, Ed., R. Ludwig, A. Gurtov, F. Khafizov         ||       inamura@mml.yrp.nttdocomo.co.jp, gab@sun.com, Reiner.Ludwig@Ericsson.com, andrei.gurtov@sonera.com, faridk@nortelnetworks.com
-  RFC3482          ||      M. Foster, T. McGarry, J. Yu         ||       mark.foster@neustar.biz, tom.mcgarry@neustar.biz, james.yu@neustar.biz
-  RFC3483          ||       D. Rawlins, A. Kulkarni, M. Bokaemper, K. Chan         ||        Diana.Rawlins@wcom.com, amol.kulkarni@intel.com, khchan@nortelnetworks.com, mbokaemper@juniper.net 
-  RFC3484          ||      R. Draves         ||       richdr@microsoft.com
-  RFC3485          ||       M. Garcia-Martin, C. Bormann, J. Ott, R. Price, A. B. Roach         ||        miguel.a.garcia@ericsson.com, cabo@tzi.org, jo@tzi.org, richard.price@roke.co.uk, adam@dynamicsoft.com 
-  RFC3486          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC3487          ||       H. Schulzrinne         ||        schulzrinne@cs.columbia.edu 
-  RFC3488          ||       I. Wu, T. Eckert         ||        iwu@cisco.com 
-  RFC3489          ||      J. Rosenberg, J. Weinberger, C. Huitema, R. Mahy         ||       jdrosen@dynamicsoft.com, jweinberger@dynamicsoft.com, huitema@microsoft.com, rohan@cisco.com
-  RFC3490          ||      P. Faltstrom, P. Hoffman, A. Costello         ||       paf@cisco.com, phoffman@imc.org
-  RFC3491          ||      P. Hoffman, M. Blanchet         ||       paul.hoffman@imc.org, Marc.Blanchet@viagenie.qc.ca
-  RFC3492          ||      A. Costello         ||       
-  RFC3493          ||       R. Gilligan, S. Thomson, J. Bound, J. McCann, W. Stevens         ||        gilligan@intransa.com, sethomso@cisco.com, Jim.Bound@hp.com, Jack.McCann@hp.com 
-  RFC3494          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
-  RFC3495          ||       B. Beser, P. Duffy, Ed.         ||        burcak@juniper.net, paduffy@cisco.com 
-  RFC3496          ||       A. G. Malis, T. Hsiao         ||        Andy.Malis@vivacenetworks.com, Tony.Hsiao@VivaceNetworks.com 
-  RFC3497          ||       L. Gharai, C. Perkins, G. Goncher, A. Mankin         ||        ladan@isi.edu, csp@csperkins.org, mankin@psg.com, Gary.Goncher@tek.com 
-  RFC3498          ||       J. Kuhfeld, J. Johnson, M. Thatcher         ||         
-  RFC3499          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC3500          ||               ||         
-  RFC3501          ||      M. Crispin         ||       MRC@CAC.Washington.EDU
-  RFC3502          ||       M. Crispin         ||        MRC@CAC.Washington.EDU 
-  RFC3503          ||       A. Melnikov         ||        mel@messagingdirect.com 
-  RFC3504          ||       D. Eastlake         ||        Donald.Eastlake@motorola.com 
-  RFC3505          ||       D. Eastlake         ||        Donald.Eastlake@motorola.com 
-  RFC3506          ||       K. Fujimura, D. Eastlake         ||        fujimura@isl.ntt.co.jp, Donald.Eastlake@motorola.com 
-  RFC3507          ||       J. Elson, A. Cerpa         ||        jelson@cs.ucla.edu, cerpa@cs.ucla.edu 
-  RFC3508          ||       O. Levin         ||        orit@radvision.com 
-  RFC3509          ||       A. Zinin, A. Lindem, D. Yeung         ||        zinin@psg.com, myeung@procket.com, acee@redback.com 
-  RFC3510          ||       R. Herriot, I. McDonald         ||        bob@herriot.com, imcdonald@sharplabs.com 
-  RFC3511          ||       B. Hickman, D. Newman, S. Tadjudin, T. Martin         ||        brooks.hickman@spirentcom.com, dnewman@networktest.com, Saldju.Tadjudin@spirentcom.com, tmartin@gvnw.com 
-  RFC3512          ||       M. MacFaden, D. Partain, J. Saperia, W. Tackabury         ||         
-  RFC3513          ||      R. Hinden, S. Deering         ||       bob.hinden@gmail.com, deering@cisco.com
-  RFC3514          ||       S. Bellovin         ||        bellovin@acm.org 
-  RFC3515          ||      R. Sparks         ||       rsparks@dynamicsoft.com
-  RFC3516          ||       L. Nerenberg         ||        lyndon@orthanc.ab.ca 
-  RFC3517          ||      E. Blanton, M. Allman, K. Fall, L. Wang         ||       eblanton@cs.purdue.edu, mallman@bbn.com, kfall@intel-research.net, lwang0@uky.edu
-  RFC3518          ||       M. Higashiyama, F. Baker, T. Liao         ||        Mitsuru.Higashiyama@yy.anritsu.co.jp, fred@cisco.com, tawei@cisco.com 
-  RFC3519          ||      H. Levkowetz, S. Vaarala         ||       henrik@levkowetz.com, sami.vaarala@iki.fi
-  RFC3520          ||       L-N. Hamer, B. Gage, B. Kosinski, H. Shieh         ||        nhamer@nortelnetworks.com, brettk@invidi.com, gageb@nortelnetworks.com, hugh.shieh@attws.com 
-  RFC3521          ||       L-N. Hamer, B. Gage, H. Shieh         ||        nhamer@nortelnetworks.com, gageb@nortelnetworks.com, hugh.shieh@attws.com 
-  RFC3522          ||       R. Ludwig, M. Meyer         ||        Reiner.Ludwig@eed.ericsson.se, Michael.Meyer@eed.ericsson.se 
-  RFC3523          ||       J. Polk         ||        jmpolk@cisco.com 
-  RFC3524          ||       G. Camarillo, A. Monrad         ||        Gonzalo.Camarillo@ericsson.com, atle.monrad@ericsson.com 
-  RFC3525          ||      C. Groves, Ed., M. Pantaleo, Ed., T. Anderson, Ed., T. Taylor, Ed.         ||       tlatla@verizon.net, Christian.Groves@ericsson.com.au, Marcello.Pantaleo@eed.ericsson.se, tom.taylor.stds@gmail.com
-  RFC3526          ||       T. Kivinen, M. Kojo         ||        kivinen@ssh.fi, mika.kojo@helsinki.fi 
-  RFC3527          ||       K. Kinnear, M. Stapp, R. Johnson, J. Kumarasamy         ||        kkinnear@cisco.com, mjs@cisco.com, jayk@cisco.com, raj@cisco.com 
-  RFC3528          ||       W. Zhao, H. Schulzrinne, E. Guttman         ||        zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com 
-  RFC3529          ||       W. Harold         ||        wharold@us.ibm.com 
-  RFC3530          ||      S. Shepler, B. Callaghan, D. Robinson, R. Thurlow, C. Beame, M. Eisler, D. Noveck         ||       beame@bws.com, brent.callaghan@sun.com, mike@eisler.com, dnoveck@netapp.com, david.robinson@sun.com, robert.thurlow@sun.com
-  RFC3531          ||       M. Blanchet         ||        Marc.Blanchet@viagenie.qc.ca 
-  RFC3532          ||       T. Anderson, J. Buerkle         ||        todd.a.anderson@intel.com, joachim.buerkle@nortelnetworks.com 
-  RFC3533          ||       S. Pfeiffer         ||        Silvia.Pfeiffer@csiro.au 
-  RFC3534          ||      L. Walleij         ||       triad@df.lth.se
-  RFC3535          ||       J. Schoenwaelder         ||        j.schoenwaelder@iu-bremen.de 
-  RFC3536          ||      P. Hoffman         ||       paul.hoffman@imc.org
-  RFC3537          ||       J. Schaad, R. Housley         ||        jimsch@exmsft.com, housley@vigilsec.com 
-  RFC3538          ||       Y. Kawatsura         ||        kawatura@bisd.hitachi.co.jp 
-  RFC3539          ||       B. Aboba, J. Wood         ||        bernarda@microsoft.com, jonwood@speakeasy.net 
-  RFC3540          ||       N. Spring, D. Wetherall, D. Ely         ||        nspring@cs.washington.edu, djw@cs.washington.edu, ely@cs.washington.edu 
-  RFC3541          ||       A. Walsh         ||        aaron@mantiscorp.com 
-  RFC3542          ||       W. Stevens, M. Thomas, E. Nordmark, T. Jinmei         ||        matt@3am-software.com, Erik.Nordmark@sun.com, jinmei@isl.rdc.toshiba.co.jp 
-  RFC3543          ||       S. Glass, M. Chandra         ||        steven.glass@sun.com, mchandra@cisco.com 
-  RFC3544          ||      T. Koren, S. Casner, C. Bormann         ||       tmima@cisco.com, casner@packetdesign.com, cabo@tzi.org
-  RFC3545          ||       T. Koren, S. Casner, J. Geevarghese, B. Thompson, P. Ruddy         ||        tmima@cisco.com, casner@acm.org, geevjohn@hotmail.com, brucet@cisco.com, pruddy@cisco.com 
-  RFC3546          ||       S. Blake-Wilson, M. Nystrom, D. Hopwood, J. Mikkelsen, T. Wright         ||        sblakewilson@bcisse.com, magnus@rsasecurity.com, david.hopwood@zetnet.co.uk, janm@transactionware.com, timothy.wright@vodafone.com 
-  RFC3547          ||      M. Baugher, B. Weis, T. Hardjono, H. Harney         ||       mbaugher@cisco.com, thardjono@verisign.com, hh@sparta.com, bew@cisco.com
-  RFC3548          ||       S. Josefsson, Ed.         ||         
-  RFC3549          ||       J. Salim, H. Khosravi, A. Kleen, A. Kuznetsov         ||        hadi@znyx.com, hormuzd.m.khosravi@intel.com, ak@suse.de, kuznet@ms2.inr.ac.ru 
-  RFC3550          ||      H. Schulzrinne, S. Casner, R. Frederick, V. Jacobson         ||       schulzrinne@cs.columbia.edu, casner@acm.org, ronf@bluecoat.com, van@packetdesign.com
-  RFC3551          ||      H. Schulzrinne, S. Casner         ||       schulzrinne@cs.columbia.edu, casner@acm.org
-  RFC3552          ||       E. Rescorla, B. Korver         ||        ekr@rtfm.com, briank@xythos.com, iab@iab.org 
-  RFC3553          ||       M. Mealling, L. Masinter, T. Hardie, G. Klyne         ||        michael@verisignlabs.com, LMM@acm.org, hardie@qualcomm.com, GK-IETF@ninebynine.org 
-  RFC3554          ||       S. Bellovin, J. Ioannidis, A. Keromytis, R. Stewart         ||       smb@research.att.com, ji@research.att.com, angelos@cs.columbia.edu, randall@lakerest.net
-  RFC3555          ||       S. Casner, P. Hoschka         ||        casner@acm.org, ph@w3.org 
-  RFC3556          ||       S. Casner         ||        casner@acm.org 
-  RFC3557          ||       Q. Xie, Ed.         ||        bdp003@motorola.com, Senaka.Balasuriya@motorola.com, yoonie@verbaltek.com, stephane.maes@oracle.com, hgarudad@qualcomm.com, Qiaobing.Xie@motorola.com 
-  RFC3558          ||       A. Li         ||        adamli@icsl.ucla.edu 
-  RFC3559          ||       D. Thaler         ||        dthaler@microsoft.com 
-  RFC3560          ||       R. Housley         ||        housley@vigilsec.com 
-  RFC3561          ||       C. Perkins, E. Belding-Royer, S. Das         ||        Charles.Perkins@nokia.com, ebelding@cs.ucsb.edu, sdas@ececs.uc.edu 
-  RFC3562          ||       M. Leech         ||        mleech@nortelnetworks.com 
-  RFC3563          ||      A. Zinin         ||       zinin@psg.com
-  RFC3564          ||      F. Le Faucheur, W. Lai         ||       
-  RFC3565          ||       J. Schaad         ||        jimsch@exmsft.com 
-  RFC3566          ||       S. Frankel, H. Herbert         ||        sheila.frankel@nist.gov, howard.c.herbert@intel.com 
-  RFC3567          ||      T. Li, R. Atkinson         ||       tli@procket.net, rja@extremenetworks.com
-  RFC3568          ||       A. Barbir, B. Cain, R. Nair, O. Spatscheck         ||        abbieb@nortelnetworks.com, bcain@storigen.com, nair_raj@yahoo.com, spatsch@research.att.com 
-  RFC3569          ||       S. Bhattacharyya, Ed.         ||         
-  RFC3570          ||      P. Rzewski, M. Day, D. Gilletti         ||       mday@alum.mit.edu, dgilletti@yahoo.com, philrz@yahoo.com
-  RFC3571          ||      D. Rawlins, A. Kulkarni, K. Ho Chan, M. Bokaemper, D. Dutt         ||       Diana.Rawlins@mci.com, amol.kulkarni@intel.com, khchan@nortelnetworks.com, mbokaemper@juniper.net, ddutt@cisco.com
-  RFC3572          ||      T. Ogura, M. Maruyama, T. Yoshida         ||       ogura@core.ecl.net, mitsuru@core.ecl.net, yoshida@peta.arch.ecl.net
-  RFC3573          ||       I. Goyret         ||        igoyret@lucent.com 
-  RFC3574          ||       J. Soininen, Ed.         ||         
-  RFC3575          ||      B. Aboba         ||       bernarda@microsoft.com
-  RFC3576          ||      M. Chiba, G. Dommety, M. Eklund, D. Mitton, B. Aboba         ||       mchiba@cisco.com, gdommety@cisco.com, meklund@cisco.com, david@mitton.com, bernarda@microsoft.com
-  RFC3577          ||       S. Waldbusser, R. Cole, C. Kalbfleisch, D. Romascanu         ||        waldbusser@nextbeacon.com, cwk@verio.net, rgcole@att.com, dromasca@gmail.com  
-  RFC3578          ||       G. Camarillo, A. B. Roach, J. Peterson, L. Ong         ||        Gonzalo.Camarillo@ericsson.com, adam@dynamicsoft.com, jon.peterson@neustar.biz, lyong@ciena.com 
-  RFC3579          ||      B. Aboba, P. Calhoun         ||       bernarda@microsoft.com, pcalhoun@airespace.com
-  RFC3580          ||      P. Congdon, B. Aboba, A. Smith, G. Zorn, J. Roese         ||       paul_congdon@hp.com, bernarda@microsoft.com, ah_smith@acm.org, jjr@enterasys.com, gwz@cisco.com
-  RFC3581          ||       J. Rosenberg, H. Schulzrinne         ||        jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu 
-  RFC3582          ||       J. Abley, B. Black, V. Gill         ||        jabley@isc.org, ben@layer8.net, vijaygill9@aol.com 
-  RFC3583          ||       H. Chaskar, Ed.         ||        john.loughney@nokia.com, hemant.chaskar@nokia.com 
-  RFC3584          ||       R. Frye, D. Levi, S. Routhier, B. Wijnen         ||         
-  RFC3585          ||       J. Jason, L. Rafalow, E. Vyncke         ||        jamie.jason@intel.com, rafalow@watson.ibm.com, evyncke@cisco.com 
-  RFC3586          ||       M. Blaze, A. Keromytis, M. Richardson, L. Sanchez         ||        mab@crypto.com, angelos@cs.columbia.edu, mcr@sandelman.ottawa.on.ca, lsanchez@xapiens.com 
-  RFC3587          ||      R. Hinden, S. Deering, E. Nordmark         ||       bob.hinden@gmail.com, erik.nordmark@sun.com
-  RFC3588          ||      P. Calhoun, J. Loughney, E. Guttman, G. Zorn, J. Arkko         ||       pcalhoun@airespace.com, john.Loughney@nokia.com, Jari.Arkko@ericsson.com, erik.guttman@sun.com
-  RFC3589          ||       J. Loughney         ||        john.Loughney@Nokia.com 
-  RFC3590          ||       B. Haberman         ||        brian@innovationslab.net 
-  RFC3591          ||       H-K. Lam, M. Stewart, A. Huynh         ||        mstewart1@nc.rr.com, a_n_huynh@yahoo.com, hklam@lucent.com 
-  RFC3592          ||       K. Tesink         ||        kaj@research.telcordia.com 
-  RFC3593          ||       K. Tesink, Ed.         ||         
-  RFC3594          ||       P. Duffy         ||        paduffy@cisco.com 
-  RFC3595          ||       B. Wijnen         ||        bwijnen@lucent.com 
-  RFC3596          ||       S. Thomson, C. Huitema, V. Ksinant, M. Souissi         ||        sethomso@cisco.com, huitema@microsoft.com, vladimir.ksinant@6wind.com, Mohsen.Souissi@nic.fr 
-  RFC3597          ||      A. Gustafsson         ||       gson@nominum.com
-  RFC3598          ||      K. Murchison         ||       ken@oceana.com
-  RFC3599          ||       S. Ginoza         ||        ginoza@isi.edu 
-  RFC3600          ||      J. Reynolds, Ed., S. Ginoza, Ed.         ||       
-  RFC3601          ||       C. Allocchio         ||        Claudio.Allocchio@garr.it 
-  RFC3602          ||       S. Frankel, R. Glenn, S. Kelly         ||        sheila.frankel@nist.gov, scott@hyperthought.com, rob.glenn@nist.gov 
-  RFC3603          ||      W. Marshall, Ed., F. Andreasen, Ed.         ||       
-  RFC3604          ||       H. Khosravi, G. Kullgren, S. Shew, J. Sadler, A. Watanabe         ||        hormuzd.m.khosravi@intel.com, geku@nortelnetworks.com, Jonathan.Sadler@tellabs.com, sdshew@nortelnetworks.com, Shiomoto.Kohei@lab.ntt.co.jp, atsushi@exa.onlab.ntt.co.jp, okamoto@exa.onlab.ntt.co.jp 
-  RFC3605          ||       C. Huitema         ||        huitema@microsoft.com 
-  RFC3606          ||       F. Ly, M. Noto, A. Smith, E. Spiegel, K. Tesink         ||        faye@pedestalnetworks.com, mnoto@cisco.com, ah_smith@acm.org, mspiegel@cisco.com, kaj@research.telcordia.com 
-  RFC3607          ||       M. Leech         ||        mleech@nortelnetworks.com 
-  RFC3608          ||      D. Willis, B. Hoeneisen         ||       dean.willis@softarmor.com, hoeneisen@switch.ch
-  RFC3609          ||       R. Bonica, K. Kompella, D. Meyer         ||        ronald.p.bonica@mci.com, kireeti@juniper.net, dmm@maoz.com 
-  RFC3610          ||       D. Whiting, R. Housley, N. Ferguson         ||        dwhiting@hifn.com, housley@vigilsec.com, niels@macfergus.com 
-  RFC3611          ||       T. Friedman, Ed., R. Caceres, Ed., A. Clark, Ed.         ||        almeroth@cs.ucsb.edu, caceres@watson.ibm.com, alan@telchemy.com, robert.cole@jhuapl.edu, duffield@research.att.com, timur.friedman@lip6.fr, khedayat@brixnet.com, ksarac@utdallas.edu, magnus.westerlund@ericsson.com 
-  RFC3612          ||       A. Farrel         ||        adrian@olddog.co.uk 
-  RFC3613          ||       R. Morgan, K. Hazelton         ||        rlmorgan@washington.edu, hazelton@doit.wisc.edu 
-  RFC3614          ||       J. Smith         ||        jrsmith@watson.ibm.com 
-  RFC3615          ||       J. Gustin, A. Goyens         ||        jean-marc.gustin@swift.com, andre.goyens@swift.com 
-  RFC3616          ||       F. Bellifemine, I. Constantinescu, S. Willmott         ||        Fabio.Bellifemine@TILAB.COM, ion.constantinescu@epfl.ch, steve@lsi.upc.es 
-  RFC3617          ||       E. Lear         ||        lear@cisco.com 
-  RFC3618          ||       B. Fenner, Ed., D. Meyer, Ed.         ||         
-  RFC3619          ||       S. Shah, M. Yip         ||        sshah@extremenetworks.com, my@extremenetworks.com 
-  RFC3620          ||       D. New         ||        dnew@san.rr.com 
-  RFC3621          ||       A. Berger, D. Romascanu         ||        avib@PowerDsine.com, dromasca@gmail.com  
-  RFC3622          ||       M. Mealling         ||        michael@neonym.net 
-  RFC3623          ||       J. Moy, P. Pillay-Esnault, A. Lindem         ||        jmoy@sycamorenet.com, padma@juniper.net, acee@redback.com 
-  RFC3624          ||       B. Foster, D. Auerbach, F. Andreasen         ||        fandreas@cisco.com, dea@cisco.com, bfoster@cisco.com 
-  RFC3625          ||       R. Gellens, H. Garudadri         ||         
-  RFC3626          ||       T. Clausen, Ed., P. Jacquet, Ed.         ||        T.Clausen@computer.org, Philippe.Jacquet@inria.fr 
-  RFC3627          ||      P. Savola         ||       psavola@funet.fi
-  RFC3628          ||       D. Pinkas, N. Pope, J. Ross         ||        Denis.Pinkas@bull.net, pope@secstan.com, ross@secstan.com, claire.desclercs@etsi.org 
-  RFC3629          ||       F. Yergeau         ||        fyergeau@alis.com 
-  RFC3630          ||      D. Katz, K. Kompella, D. Yeung         ||       dkatz@juniper.net, myeung@procket.com, kireeti@juniper.net
-  RFC3631          ||       S. Bellovin, Ed., J. Schiller, Ed., C. Kaufman, Ed.         ||         
-  RFC3632          ||       S. Hollenbeck, S. Veeramachaneni, S. Yalamanchilli         ||        shollenbeck@verisign.com, sveerama@verisign.com, syalamanchilli@verisign.com 
-  RFC3633          ||      O. Troan, R. Droms         ||       ot@cisco.com, rdroms@cisco.com
-  RFC3634          ||       K. Luehrs, R. Woundy, J. Bevilacqua, N. Davoust         ||        k.luehrs@cablelabs.com, richard_woundy@cable.comcast.com, john@yas.com, nancy@yas.com 
-  RFC3635          ||       J. Flick         ||        johnf@rose.hp.com 
-  RFC3636          ||       J. Flick         ||        johnf@rose.hp.com 
-  RFC3637          ||       C.M. Heard, Ed.         ||         
-  RFC3638          ||       J. Flick, C. M. Heard         ||        johnf@rose.hp.com, heard@pobox.com 
-  RFC3639          ||       M. St. Johns, Ed., G. Huston, Ed., IAB         ||         
-  RFC3640          ||      J. van der Meer, D. Mackie, V. Swaminathan, D. Singer, P. Gentric         ||       jan.vandermeer@philips.com, dmackie@apple.com, viswanathan.swaminathan@sun.com, singer@apple.com, philippe.gentric@philips.com
-  RFC3641          ||       S. Legg         ||        steven.legg@adacel.com.au 
-  RFC3642          ||       S. Legg         ||        steven.legg@adacel.com.au 
-  RFC3643          ||       R. Weber, M. Rajagopal, F. Travostino, M. O'Donnell, C. Monia, M. Merhar         ||        roweber@ieee.org, muralir@broadcom.com, travos@nortelnetworks.com, cmonia@pacbell.net, milan.merhar@sun.com 
-  RFC3644          ||       Y. Snir, Y. Ramberg, J. Strassner, R. Cohen, B. Moore         ||        yramberg@cisco.com, ysnir@cisco.com, john.strassner@intelliden.com, ronc@lyciumnetworks.com, remoore@us.ibm.com 
-  RFC3645          ||       S. Kwan, P. Garg, J. Gilroy, L. Esibov, J. Westhead, R. Hall         ||        skwan@microsoft.com, praeritg@microsoft.com, jamesg@microsoft.com, levone@microsoft.com, randyhall@lucent.com, jwesth@microsoft.com 
-  RFC3646          ||       R. Droms, Ed.         ||        rdroms@cisco.com 
-  RFC3647          ||       S. Chokhani, W. Ford, R. Sabett, C. Merrill, S. Wu         ||        chokhani@orionsec.com, wford@verisign.com, rsabett@cooley.com, cmerrill@mccarter.com, swu@infoliance.com 
-  RFC3648          ||       J. Whitehead, J. Reschke, Ed.         ||        ejw@cse.ucsc.edu, julian.reschke@greenbytes.de 
-  RFC3649          ||       S. Floyd         ||        floyd@acm.org 
-  RFC3650          ||       S. Sun, L. Lannom, B. Boesch         ||        ssun@cnri.reston.va.us, llannom@cnri.reston.va.us, bboesch@cnri.reston.va.us 
-  RFC3651          ||       S. Sun, S. Reilly, L. Lannom         ||        ssun@cnri.reston.va.us, sreilly@cnri.reston.va.us, llannom@cnri.reston.va.us 
-  RFC3652          ||       S. Sun, S. Reilly, L. Lannom, J. Petrone         ||        ssun@cnri.reston.va.us, sreilly@cnri.reston.va.us, llannom@cnri.reston.va.us, jpetrone@cnri.reston.va.us 
-  RFC3653          ||       J. Boyer, M. Hughes, J. Reagle         ||        jboyer@PureEdge.com, Merlin.Hughes@betrusted.com, reagle@mit.edu 
-  RFC3654          ||       H. Khosravi, Ed., T. Anderson, Ed.         ||        edbowen@us.ibm.com, rdantu@unt.edu, avri@acm.org, ram.gopal@nokia.com, hadi@znyx.com, muneyb@avaya.com, margaret.wasserman@nokia.com, hormuzd.m.khosravi@intel.com, todd.a.anderson@intel.com 
-  RFC3655          ||       B. Wellington, O. Gudmundsson         ||        Brian.Wellington@nominum.com, ogud@ogud.com 
-  RFC3656          ||       R. Siemborski         ||         
-  RFC3657          ||       S. Moriai, A. Kato         ||        camellia@isl.ntt.co.jp, akato@po.ntts.co.jp 
-  RFC3658          ||       O. Gudmundsson         ||        ds-rfc@ogud.com 
-  RFC3659          ||      P. Hethmon         ||       phethmon@hethmon.com
-  RFC3660          ||       B. Foster, F. Andreasen         ||        bfoster@cisco.com, fandreas@cisco.com 
-  RFC3661          ||       B. Foster, C. Sivachelvan         ||        chelliah@cisco.com, bfoster@cisco.com 
-  RFC3662          ||       R. Bless, K. Nichols, K. Wehrle         ||        bless@tm.uka.de, knichols@ieee.org, Klaus.Wehrle@uni-tuebingen.de 
-  RFC3663          ||       A. Newton         ||        anewton@verisignlabs.com 
-  RFC3664          ||       P. Hoffman         ||        paul.hoffman@vpnc.org 
-  RFC3665          ||       A. Johnston, S. Donovan, R. Sparks, C. Cunningham, K. Summers         ||        alan.johnston@mci.com, sdonovan@dynamicsoft.com, rsparks@dynamicsoft.com, ccunningham@dynamicsoft.com, kevin.summers@sonusnet.com 
-  RFC3666          ||       A. Johnston, S. Donovan, R. Sparks, C. Cunningham, K. Summers         ||        alan.johnston@mci.com, sdonovan@dynamicsoft.com, rsparks@dynamicsoft.com, ccunningham@dynamicsoft.com, kevin.summers@sonusnet.com 
-  RFC3667          ||       S. Bradner         ||         
-  RFC3668          ||      S. Bradner         ||       
-  RFC3669          ||       S. Brim         ||        sbrim@cisco.com 
-  RFC3670          ||       B. Moore, D. Durham, J. Strassner, A. Westerinen, W. Weiss         ||        remoore@us.ibm.com, david.durham@intel.com, john.strassner@intelliden.com, andreaw@cisco.com, walterweiss@attbi.com 
-  RFC3671          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
-  RFC3672          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org, steven.legg@adacel.com.au 
-  RFC3673          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
-  RFC3674          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
-  RFC3675          ||       D. Eastlake 3rd         ||        dee3@torque.pothole.com 
-  RFC3676          ||       R. Gellens         ||        randy@qualcomm.com 
-  RFC3677          ||      L. Daigle, Ed., Internet Architecture Board         ||       iab@iab.org
-  RFC3678          ||       D. Thaler, B. Fenner, B. Quinn         ||        dthaler@microsoft.com, fenner@research.att.com, rcq@ipmulticast.com 
-  RFC3679          ||       R. Droms         ||        rdroms@cisco.com 
-  RFC3680          ||      J. Rosenberg         ||       jdrosen@dynamicsoft.com
-  RFC3681          ||       R. Bush, R. Fink         ||        randy@psg.com, bob@thefinks.com 
-  RFC3682          ||      V. Gill, J. Heasley, D. Meyer         ||       vijay@umbc.edu, heas@shrubbery.net, dmm@1-4-5.net
-  RFC3683          ||       M. Rose         ||       mrose17@gmail.com
-  RFC3684          ||       R. Ogier, F. Templin, M. Lewis         ||        ogier@erg.sri.com, ftemplin@iprg.nokia.com, lewis@erg.sri.com 
-  RFC3685          ||      C. Daboo         ||       daboo@cyrusoft.com
-  RFC3686          ||       R. Housley         ||        housley@vigilsec.com 
-  RFC3687          ||       S. Legg         ||        steven.legg@adacel.com.au 
-  RFC3688          ||       M. Mealling         ||        michael@verisignlabs.com 
-  RFC3689          ||       K. Carlberg, R. Atkinson         ||        k.carlberg@cs.ucl.ac.uk, rja@extremenetworks.com 
-  RFC3690          ||       K. Carlberg, R. Atkinson         ||        k.carlberg@cs.ucl.ac.uk, rja@extremenetworks.com 
-  RFC3691          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
-  RFC3692          ||       T. Narten         ||        narten@us.ibm.com 
-  RFC3693          ||      J. Cuellar, J. Morris, D. Mulligan, J. Peterson, J. Polk         ||       Jorge.Cuellar@siemens.com, jmorris@cdt.org, dmulligan@law.berkeley.edu, jon.peterson@neustar.biz, jmpolk@cisco.com
-  RFC3694          ||      M. Danley, D. Mulligan, J. Morris, J. Peterson         ||       mre213@nyu.edu, dmulligan@law.berkeley.edu, jmorris@cdt.org, jon.peterson@neustar.biz
-  RFC3695          ||      M. Luby, L. Vicisano         ||       luby@digitalfountain.com, lorenzo@cisco.com
-  RFC3696          ||       J. Klensin         ||        john-ietf@jck.com 
-  RFC3697          ||      J. Rajahalme, A. Conta, B. Carpenter, S. Deering         ||       jarno.rajahalme@nokia.com, aconta@txc.com, brc@zurich.ibm.com
-  RFC3698          ||       K. Zeilenga, Ed.         ||        Kurt@OpenLDAP.org 
-  RFC3700          ||      J. Reynolds, Ed., S. Ginoza, Ed.         ||       
-  RFC3701          ||      R. Fink, R. Hinden         ||       bob@thefinks.com, bob.hinden@gmail.com
-  RFC3702          ||       J. Loughney, G. Camarillo         ||        John.Loughney@nokia.com, Gonzalo.Camarillo@ericsson.com 
-  RFC3703          ||       J. Strassner, B. Moore, R. Moats, E. Ellesson         ||        john.strassner@intelliden.com, remoore@us.ibm.com, rmoats@lemurnetworks.net, ellesson@mindspring.com 
-  RFC3704          ||       F. Baker, P. Savola         ||        fred@cisco.com, psavola@funet.fi 
-  RFC3705          ||       B. Ray, R. Abbi         ||        rray@pesa.com, Rajesh.Abbi@alcatel.com 
-  RFC3706          ||       G. Huang, S. Beaulieu, D. Rochefort         ||         
-  RFC3707          ||       A. Newton         ||        anewton@verisignlabs.com 
-  RFC3708          ||       E. Blanton, M. Allman         ||        eblanton@cs.purdue.edu, mallman@icir.org 
-  RFC3709          ||      S. Santesson, R. Housley, T. Freeman         ||       stefans@microsoft.com, housley@vigilsec.com, trevorf@microsoft.com
-  RFC3710          ||      H. Alvestrand         ||       harald@alvestrand.no
-  RFC3711          ||      M. Baugher, D. McGrew, M. Naslund, E. Carrara, K. Norrman         ||       mbaugher@cisco.com, elisabetta.carrara@ericsson.com, mcgrew@cisco.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com
-  RFC3712          ||      P. Fleming, I. McDonald         ||       flemingp@us.ibm.com, flemingp@us.ibm.com, flemingp@us.ibm.com
-  RFC3713          ||       M. Matsui, J. Nakajima, S. Moriai         ||        matsui@iss.isl.melco.co.jp, june15@iss.isl.melco.co.jp, shiho@rd.scei.sony.co.jp 
-  RFC3714          ||      S. Floyd, Ed., J. Kempf, Ed.         ||       iab@iab.org
-  RFC3715          ||       B. Aboba, W. Dixon         ||        bernarda@microsoft.com, ietf-wd@v6security.com 
-  RFC3716          ||       IAB Advisory Committee         ||        iab@iab.org 
-  RFC3717          ||       B. Rajagopalan, J. Luciani, D. Awduche         ||        braja@tellium.com, james_luciani@mindspring.com, awduche@awduche.com 
-  RFC3718          ||       R. McGowan         ||         
-  RFC3719          ||       J. Parker, Ed.         ||        jparker@axiowave.com 
-  RFC3720          ||      J. Satran, K. Meth, C. Sapuntzakis, M. Chadalapaka, E. Zeidner         ||       Julian_Satran@il.ibm.com, meth@il.ibm.com, csapuntz@alum.mit.edu, efri@xiv.co.il, cbm@rose.hp.com
-  RFC3721          ||      M. Bakke, J. Hafner, J. Hufferd, K. Voruganti, M. Krueger         ||       kaladhar@us.ibm.com, mbakke@cisco.com, hafner@almaden.ibm.com, hufferd@us.ibm.com, marjorie_krueger@hp.com
-  RFC3722          ||       M. Bakke         ||        mbakke@cisco.com 
-  RFC3723          ||      B. Aboba, J. Tseng, J. Walker, V. Rangan, F. Travostino         ||       bernarda@microsoft.com, joshtseng@yahoo.com, jesse.walker@intel.com, vrangan@brocade.com, travos@nortelnetworks.com
-  RFC3724          ||      J. Kempf, Ed., R. Austein, Ed., IAB         ||       
-  RFC3725          ||       J. Rosenberg, J. Peterson, H. Schulzrinne, G. Camarillo         ||        jdrosen@dynamicsoft.com, jon.peterson@neustar.biz, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com 
-  RFC3726          ||       M. Brunner, Ed.         ||        brunner@netlab.nec.de, robert.hancock@roke.co.uk, eleanor.hepworth@roke.co.uk, cornelia.kappler@siemens.com, Hannes.Tschofenig@mchp.siemens.de 
-  RFC3727          ||       S. Legg         ||        steven.legg@adacel.com.au 
-  RFC3728          ||       B. Ray, R. Abbi         ||        rray@pesa.com, Rajesh.Abbi@alcatel.com 
-  RFC3729          ||       S. Waldbusser         ||        waldbusser@nextbeacon.com 
-  RFC3730          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC3731          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC3732          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC3733          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC3734          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC3735          ||       S. Hollenbeck         ||        shollenbeck@verisign.com 
-  RFC3736          ||       R. Droms         ||        rdroms@cisco.com 
-  RFC3737          ||       B. Wijnen, A. Bierman         ||        bwijnen@lucent.com, andy@yumaworks.com
-  RFC3738          ||       M. Luby, V. Goyal         ||        luby@digitalfountain.com, v.goyal@ieee.org 
-  RFC3739          ||       S. Santesson, M. Nystrom, T. Polk         ||        stefans@microsoft.com, wpolk@nist.gov, magnus@rsasecurity.com 
-  RFC3740          ||       T. Hardjono, B. Weis         ||        thardjono@verisign.com, bew@cisco.com 
-  RFC3741          ||       J. Boyer, D. Eastlake 3rd, J. Reagle         ||        jboyer@PureEdge.com, Donald.Eastlake@motorola.com, reagle@mit.edu 
-  RFC3742          ||       S. Floyd         ||        floyd@icir.org 
-  RFC3743          ||       K. Konishi, K. Huang, H. Qian, Y. Ko         ||        konishi@jp.apan.net, huangk@alum.sinica.edu, Hlqian@cnnic.net.cn, yw@mrko.pe.kr, jseng@pobox.org.sg, rickard@rickardgroup.com 
-  RFC3744          ||       G. Clemm, J. Reschke, E. Sedlar, J. Whitehead         ||        geoffrey.clemm@us.ibm.com, julian.reschke@greenbytes.de, eric.sedlar@oracle.com, ejw@cse.ucsc.edu 
-  RFC3745          ||       D. Singer, R. Clark, D. Lee         ||        singer@apple.com, richard@elysium.ltd.uk, dlee@yahoo-inc.com 
-  RFC3746          ||       L. Yang, R. Dantu, T. Anderson, R. Gopal         ||        lily.l.yang@intel.com, rdantu@unt.edu, todd.a.anderson@intel.com, ram.gopal@nokia.com 
-  RFC3747          ||       H. Hazewinkel, Ed., D. Partain, Ed.         ||         
-  RFC3748          ||      B. Aboba, L. Blunk, J. Vollbrecht, J. Carlson, H. Levkowetz, Ed.         ||       bernarda@microsoft.com, ljb@merit.edu, jrv@umich.edu, james.d.carlson@sun.com, henrik@levkowetz.com
-  RFC3749          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC3750          ||       C. Huitema, R. Austein, S. Satapati, R. van der Pol         ||        huitema@microsoft.com, sra@isc.org, satapati@cisco.com, Ronald.vanderPol@nlnetlabs.nl 
-  RFC3751          ||      S. Bradner         ||       sob@harvard.edu
-  RFC3752          ||       A. Barbir, E. Burger, R. Chen, S. McHenry, H. Orman, R. Penno         ||        abbieb@nortelnetworks.com, e.burger@ieee.org, chen@research.att.com, stephen@mchenry.net, ho@alum.mit.edu, rpenno@nortelnetworks.com 
-  RFC3753          ||       J. Manner, Ed., M. Kojo, Ed.         ||        jmanner@cs.helsinki.fi, kojo@cs.helsinki.fi 
-  RFC3754          ||       R. Bless, K. Wehrle         ||        bless@tm.uka.de, Klaus.Wehrle@uni-tuebingen.de 
-  RFC3755          ||      S. Weiler         ||       weiler@tislabs.com
-  RFC3756          ||       P. Nikander, Ed., J. Kempf, E. Nordmark         ||        pekka.nikander@nomadiclab.com, kempf@docomolabs-usa.com, erik.nordmark@sun.com 
-  RFC3757          ||       O. Kolkman, J. Schlyter, E. Lewis         ||        olaf@ripe.net, jakob@nic.se, edlewis@arin.net 
-  RFC3758          ||       R. Stewart, M. Ramalho, Q. Xie, M. Tuexen, P. Conrad         ||       randall@lakerest.net, mramalho@cisco.com, qxie1@email.mot.com, tuexen@fh-muenster.de, conrad@acm.org
-  RFC3759          ||      L-E. Jonsson         ||       lars-erik.jonsson@ericsson.com
-  RFC3760          ||      D. Gustafson, M. Just, M. Nystrom         ||       degustafson@comcast.net, Just.Mike@tbs-sct.gc.ca, magnus@rsasecurity.com
-  RFC3761          ||      P. Faltstrom, M. Mealling         ||       paf@cisco.com
-  RFC3762          ||      O. Levin         ||       oritl@microsoft.com
-  RFC3763          ||       S. Shalunov, B. Teitelbaum         ||        shalunov@internet2.edu, ben@internet2.edu 
-  RFC3764          ||      J. Peterson         ||       jon.peterson@neustar.biz
-  RFC3765          ||       G. Huston         ||        gih@telstra.net 
-  RFC3766          ||       H. Orman, P. Hoffman         ||        hilarie@purplestreak.com, paul.hoffman@vpnc.org 
-  RFC3767          ||       S. Farrell, Ed.         ||         
-  RFC3768          ||      R. Hinden, Ed.         ||       bob.hinden@gmail.com
-  RFC3769          ||       S. Miyakawa, R. Droms         ||        miyakawa@nttv6.jp, rdroms@cisco.com 
-  RFC3770          ||       R. Housley, T. Moore         ||        housley@vigilsec.com, timmoore@microsoft.com 
-  RFC3771          ||       R. Harrison, K. Zeilenga         ||        roger_harrison@novell.com, Kurt@OpenLDAP.org 
-  RFC3772          ||       J. Carlson, R. Winslow         ||         
-  RFC3773          ||       E. Candell         ||        emily.candell@comverse.com 
-  RFC3774          ||       E. Davies, Ed.         ||         
-  RFC3775          ||      D. Johnson, C. Perkins, J. Arkko         ||       dbj@cs.rice.edu, charliep@iprg.nokia.com, jari.arkko@ericsson.com
-  RFC3776          ||       J. Arkko, V. Devarapalli, F. Dupont         ||        jari.arkko@ericsson.com, vijayd@iprg.nokia.com, Francis.Dupont@enst-bretagne.fr 
-  RFC3777          ||      J. Galvin, Ed.         ||       galvin+ietf@elistx.com
-  RFC3778          ||      E. Taft, J. Pravetz, S. Zilles, L. Masinter         ||       taft@adobe.com, jpravetz@adobe.com, szilles@adobe.com, LMM@acm.org
-  RFC3779          ||       C. Lynn, S. Kent, K. Seo         ||        CLynn@BBN.Com, Kent@BBN.Com, KSeo@BBN.Com 
-  RFC3780          ||       F. Strauss, J. Schoenwaelder         ||        strauss@ibr.cs.tu-bs.de, j.schoenwaelder@iu-bremen.de 
-  RFC3781          ||       F. Strauss, J. Schoenwaelder         ||        strauss@ibr.cs.tu-bs.de, j.schoenwaelder@iu-bremen.de 
-  RFC3782          ||      S. Floyd, T. Henderson, A. Gurtov         ||       floyd@acm.org, thomas.r.henderson@boeing.com, andrei.gurtov@teliasonera.com
-  RFC3783          ||       M. Chadalapaka, R. Elliott         ||        cbm@rose.hp.com, elliott@hp.com 
-  RFC3784          ||      H. Smit, T. Li         ||       hhwsmit@xs4all.nl, tony.li@tony.li
-  RFC3785          ||       F. Le Faucheur, R. Uppili, A. Vedrenne, P. Merckx, T. Telkamp         ||        flefauch@cisco.com, alain.vedrenne@equant.com, pierre.merckx@equant.com, telkamp@gblx.net 
-  RFC3786          ||      A. Hermelin, S. Previdi, M. Shand         ||       amir@montilio.com, sprevidi@cisco.com, mshand@cisco.com
-  RFC3787          ||       J. Parker, Ed.         ||        jparker@axiowave.com 
-  RFC3788          ||       J. Loughney, M. Tuexen, Ed., J. Pastor-Balbas         ||        john.loughney@nokia.com, tuexen@fh-muenster.de, j.javier.pastor@ericsson.com 
-  RFC3789          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
-  RFC3790          ||       C. Mickles, Ed., P. Nesser, II         ||        cmickles.ee88@gtalumni.org, phil@nesser.com 
-  RFC3791          ||       C. Olvera, P. Nesser, II         ||        cesar.olvera@consulintel.es, phil@nesser.com 
-  RFC3792          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
-  RFC3793          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
-  RFC3794          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
-  RFC3795          ||       R. Sofia, P. Nesser, II         ||        rsofia@zmail.pt, phil@nesser.com 
-  RFC3796          ||       P. Nesser, II, A. Bergstrom, Ed.         ||        phil@nesser.com, andreas.bergstrom@hiof.no 
-  RFC3797          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC3798          ||      T. Hansen, Ed., G. Vaudreuil, Ed.         ||       GregV@ieee.org
-  RFC3801          ||       G. Vaudreuil, G. Parsons         ||        gregv@ieee.org, GParsons@NortelNetworks.com 
-  RFC3802          ||       G. Vaudreuil, G. Parsons         ||        gregv@ieee.org, gparsons@nortelnetworks.com 
-  RFC3803          ||       G. Vaudreuil, G. Parsons         ||        gregv@ieee.org, gparsons@nortelnetworks.com 
-  RFC3804          ||       G. Parsons         ||        gparsons@nortelnetworks.com 
-  RFC3805          ||      R. Bergman, H. Lewis, I. McDonald         ||       Ron.Bergman@hitachi-ps.us, harryl@us.ibm.com, imcdonald@sharplabs.com
-  RFC3806          ||       R. Bergman, H. Lewis, I. McDonald         ||        Ron.Bergman@hitachi-ps.us, harryl@us.ibm.com, imcdonald@sharplabs.com 
-  RFC3807          ||       E. Weilandt, N. Khanchandani, S. Rao         ||        eva.weilandt@temic.com, rsanjay@nortelnetworks.com, neerajk@nortelnetworks.com 
-  RFC3808          ||       I. McDonald         ||        imcdonald@sharplabs.com, iana@iana.org 
-  RFC3809          ||       A. Nagarajan, Ed.         ||         
-  RFC3810          ||       R. Vida, Ed., L. Costa, Ed.         ||        Rolland.Vida@lip6.fr, Luis.Costa@lip6.fr, Serge.Fdida@lip6.fr, deering@cisco.com, fenner@research.att.com, kouvelas@cisco.com, brian@innovationslab.net 
-  RFC3811          ||      T. Nadeau, Ed., J. Cucchiara, Ed.         ||       tnadeau@cisco.com, jcucchiara@mindspring.com
-  RFC3812          ||       C. Srinivasan, A. Viswanathan, T. Nadeau         ||        cheenu@bloomberg.net, arunv@force10networks.com, tnadeau@cisco.com 
-  RFC3813          ||       C. Srinivasan, A. Viswanathan, T. Nadeau         ||        cheenu@bloomberg.net, arunv@force10networks.com, tnadeau@cisco.com 
-  RFC3814          ||       T. Nadeau, C. Srinivasan, A. Viswanathan         ||        tnadeau@cisco.com, cheenu@bloomberg.net, arunv@force10networks.com 
-  RFC3815          ||       J. Cucchiara, H. Sjostrand, J. Luciani         ||        james_luciani@mindspring.com, hans@ipunplugged.com, jcucchiara@mindspring.com 
-  RFC3816          ||       J. Quittek, M. Stiemerling, H. Hartenstein         ||        quittek@netlab.nec.de, stiemerling@netlab.nec.de, hartenstein@rz.uni-karlsruhe.de 
-  RFC3817          ||       W. Townsley, R. da Silva         ||        mark@townsley.net, rdasilva@va.rr.com 
-  RFC3818          ||       V. Schryver         ||        vjs@rhyolite.com 
-  RFC3819          ||       P. Karn, Ed., C. Bormann, G. Fairhurst, D. Grossman, R. Ludwig, J. Mahdavi, G. Montenegro, J. Touch, L. Wood         ||        karn@qualcomm.com, cabo@tzi.org, gorry@erg.abdn.ac.uk, Dan.Grossman@motorola.com, Reiner.Ludwig@ericsson.com, jmahdavi@earthlink.net, gab@sun.com, touch@isi.edu, lwood@cisco.com 
-  RFC3820          ||       S. Tuecke, V. Welch, D. Engert, L. Pearlman, M. Thompson         ||        tuecke@mcs.anl.gov, vwelch@ncsa.uiuc.edu, deengert@anl.gov, laura@isi.edu, mrthompson@lbl.gov 
-  RFC3821          ||      M. Rajagopal, E. Rodriguez, R. Weber         ||       
-  RFC3822          ||      D. Peterson         ||       dap@cnt.com
-  RFC3823          ||       B. Kovitz         ||        bkovitz@caltech.edu 
-  RFC3824          ||       J. Peterson, H. Liu, J. Yu, B. Campbell         ||        jon.peterson@neustar.biz, hong.liu@neustar.biz, james.yu@neustar.biz, bcampbell@dynamicsoft.com 
-  RFC3825          ||      J. Polk, J. Schnizlein, M. Linsner         ||       jmpolk@cisco.com, john.schnizlein@cisco.com, marc.linsner@cisco.com
-  RFC3826          ||       U. Blumenthal, F. Maino, K. McCloghrie         ||        uri@bell-labs.com, fmaino@andiamo.com, kzm@cisco.com 
-  RFC3827          ||       K. Sarcar         ||        kanoj.sarcar@sun.com 
-  RFC3828          ||      L-A. Larzon, M. Degermark, S. Pink, L-E. Jonsson, Ed., G. Fairhurst, Ed.         ||       lln@csee.ltu.se, micke@cs.arizona.edu, steve@cs.arizona.edu, lars-erik.jonsson@ericsson.com, gorry@erg.abdn.ac.uk
-  RFC3829          ||       R. Weltman, M. Smith, M. Wahl         ||        robw@worldspot.com, mcs@pearlcrescent.com 
-  RFC3830          ||      J. Arkko, E. Carrara, F. Lindholm, M. Naslund, K. Norrman         ||       jari.arkko@ericsson.com, elisabetta.carrara@ericsson.com, fredrik.lindholm@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com
-  RFC3831          ||      C. DeSanti         ||       cds@cisco.com
-  RFC3832          ||       W. Zhao, H. Schulzrinne, E. Guttman, C. Bisdikian, W. Jerome         ||        zwb@cs.columbia.edu, hgs@cs.columbia.edu, Erik.Guttman@sun.com, bisdik@us.ibm.com, wfj@us.ibm.com 
-  RFC3833          ||       D. Atkins, R. Austein         ||        derek@ihtfp.com, sra@isc.org 
-  RFC3834          ||      K. Moore         ||       moore@cs.utk.edu
-  RFC3835          ||       A. Barbir, R. Penno, R. Chen, M. Hofmann, H. Orman         ||        abbieb@nortelnetworks.com, chen@research.att.com, hofmann@bell-labs.com, ho@alum.mit.edu, rpenno@nortelnetworks.com 
-  RFC3836          ||       A. Beck, M. Hofmann, H. Orman, R. Penno, A. Terzis         ||        abeck@bell-labs.com, hofmann@bell-labs.com, ho@alum.mit.edu, rpenno@nortelnetworks.com, terzis@cs.jhu.edu 
-  RFC3837          ||       A. Barbir, O. Batuner, B. Srinivas, M. Hofmann, H. Orman         ||        abbieb@nortelnetworks.com, batuner@attbi.com, bindignavile.srinivas@nokia.com, hofmann@bell-labs.com, ho@alum.mit.edu 
-  RFC3838          ||       A. Barbir, O. Batuner, A. Beck, T. Chan, H. Orman         ||        abbieb@nortelnetworks.com, batuner@attbi.com, abeck@bell-labs.com, Tat.Chan@nokia.com, ho@alum.mit.edu 
-  RFC3839          ||      R. Castagno, D. Singer         ||       
-  RFC3840          ||       J. Rosenberg, H. Schulzrinne, P. Kyzivat         ||        jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, pkyzivat@cisco.com 
-  RFC3841          ||       J. Rosenberg, H. Schulzrinne, P. Kyzivat         ||        jdrosen@dynamicsoft.com, schulzrinne@cs.columbia.edu, pkyzivat@cisco.com 
-  RFC3842          ||       R. Mahy         ||        rohan@cisco.com 
-  RFC3843          ||       L-E. Jonsson, G. Pelletier         ||        lars-erik.jonsson@ericsson.com, ghyslain.pelletier@ericsson.com 
-  RFC3844          ||      E. Davies, Ed., J. Hofmann, Ed.         ||       elwynd@nortelnetworks.com, jeanette@wz-berlin.de
-  RFC3845          ||       J. Schlyter, Ed.         ||        jakob@nic.se 
-  RFC3846          ||      F. Johansson, T. Johansson         ||       fredrik@ipunplugged.com, tony.johansson@bytemobile.com
-  RFC3847          ||      M. Shand, L. Ginsberg         ||       mshand@cisco.com, ginsberg@cisco.com
-  RFC3848          ||      C. Newman         ||       chris.newman@sun.com
-  RFC3849          ||      G. Huston, A. Lord, P. Smith         ||       gih@apnic.net, anne@apnic.net, pfs@cisco.com
-  RFC3850          ||      B. Ramsdell, Ed.         ||       
-  RFC3851          ||      B. Ramsdell, Ed.         ||       
-  RFC3852          ||      R. Housley         ||       housley@vigilsec.com
-  RFC3853          ||       J. Peterson         ||        jon.peterson@neustar.biz 
-  RFC3854          ||       P. Hoffman, C. Bonatti, A. Eggen         ||         
-  RFC3855          ||       P. Hoffman, C. Bonatti         ||        phoffman@imc.org, bonattic@ieca.com 
-  RFC3856          ||       J. Rosenberg         ||        jdrosen@dynamicsoft.com 
-  RFC3857          ||       J. Rosenberg         ||        jdrosen@dynamicsoft.com 
-  RFC3858          ||       J. Rosenberg         ||        jdrosen@dynamicsoft.com 
-  RFC3859          ||       J. Peterson         ||        jon.peterson@neustar.biz 
-  RFC3860          ||       J. Peterson         ||        jon.peterson@neustar.biz 
-  RFC3861          ||       J. Peterson         ||        jon.peterson@neustar.biz 
-  RFC3862          ||       G. Klyne, D. Atkins         ||        GK-IETF@ninebynine.org, derek@ihtfp.com 
-  RFC3863          ||       H. Sugano, S. Fujimoto, G. Klyne, A. Bateman, W. Carr, J. Peterson         ||        sugano.h@jp.fujitsu.com, shingo_fujimoto@jp.fujitsu.com, GK@ninebynine.org, bateman@acm.org, wayne.carr@intel.com, jon.peterson@neustar.biz 
-  RFC3864          ||       G. Klyne, M. Nottingham, J. Mogul         ||        GK-IETF@ninebynine.org, mnot@pobox.com, JeffMogul@acm.org 
-  RFC3865          ||       C. Malamud         ||        carl@media.org 
-  RFC3866          ||       K. Zeilenga, Ed.         ||         
-  RFC3867          ||       Y. Kawatsura, M. Hiroya, H. Beykirch         ||        ykawatsu@itg.hitachi.co.jp, hiroya@st.rim.or.jp, hbbeykirch@web.de 
-  RFC3868          ||       J. Loughney, Ed., G. Sidebottom, L. Coene, G. Verwimp, J. Keller, B. Bidulock         ||        john.Loughney@nokia.com, greg@signatustechnologies.com, lode.coene@siemens.com, gery.verwimp@siemens.com, joe.keller@tekelec.com, bidulock@openss7.org 
-  RFC3869          ||       R. Atkinson, Ed., S. Floyd, Ed., Internet Architecture Board         ||        iab@iab.org, iab@iab.org, iab@iab.org 
-  RFC3870          ||       A. Swartz         ||        me@aaronsw.com 
-  RFC3871          ||       G. Jones, Ed.         ||        gmj3871@pobox.com 
-  RFC3872          ||       D. Zinman, D. Walker, J. Jiang         ||        dzinman@rogers.com, david.walker@sedna-wireless.com, jjiang@syndesis.com 
-  RFC3873          ||       J. Pastor, M. Belinchon         ||        J.Javier.Pastor@ericsson.com, maria.carmen.belinchon@ericsson.com 
-  RFC3874          ||       R. Housley         ||        housley@vigilsec.com 
-  RFC3875          ||       D. Robinson, K. Coar         ||        drtr@apache.org, coar@apache.org 
-  RFC3876          ||       D. Chadwick, S. Mullan         ||        d.w.chadwick@salford.ac.uk, sean.mullan@sun.com 
-  RFC3877          ||       S. Chisholm, D. Romascanu         ||        schishol@nortelnetworks.com, dromasca@gmail.com  
-  RFC3878          ||       H. Lam, A. Huynh, D. Perkins         ||        hklam@lucent.com, a_n_huynh@yahoo.com, dperkins@snmpinfo.com 
-  RFC3879          ||       C. Huitema, B. Carpenter         ||        huitema@microsoft.com, brc@zurich.ibm.com 
-  RFC3880          ||       J. Lennox, X. Wu, H. Schulzrinne         ||        lennox@cs.columbia.edu, xiaotaow@cs.columbia.edu, schulzrinne@cs.columbia.edu 
-  RFC3881          ||       G. Marshall         ||        glen.f.marshall@siemens.com 
-  RFC3882          ||       D. Turk         ||        doughan.turk@bell.ca 
-  RFC3883          ||       S. Rao, A. Zinin, A. Roy         ||        siraprao@hotmail.com, zinin@psg.com, akr@cisco.com 
-  RFC3884          ||      J. Touch, L. Eggert, Y. Wang         ||       touch@isi.edu, lars.eggert@netlab.nec.de, yushunwa@isi.edu
-  RFC3885          ||       E. Allman, T. Hansen         ||        eric@Sendmail.COM, tony+msgtrk@maillennium.att.com 
-  RFC3886          ||       E. Allman         ||        eric@Sendmail.COM 
-  RFC3887          ||       T. Hansen         ||        tony+msgtrk@maillennium.att.com 
-  RFC3888          ||       T. Hansen         ||        tony+msgtrk@maillennium.att.com 
-  RFC3889          ||               ||       
-  RFC3890          ||       M. Westerlund         ||        Magnus.Westerlund@ericsson.com 
-  RFC3891          ||       R. Mahy, B. Biggs, R. Dean         ||        rohan@cisco.com, bbiggs@dumbterm.net, rfc@fdd.com 
-  RFC3892          ||       R. Sparks         ||        RjS@xten.com 
-  RFC3893          ||       J. Peterson         ||        jon.peterson@neustar.biz 
-  RFC3894          ||       J. Degener         ||        jutta@sendmail.com 
-  RFC3895          ||      O. Nicklass, Ed.         ||       orly_n@rad.com
-  RFC3896          ||       O. Nicklass, Ed.         ||        orly_n@rad.com 
-  RFC3897          ||       A. Barbir         ||        abbieb@nortelnetworks.com 
-  RFC3898          ||       V. Kalusivalingam         ||        vibhaska@cisco.com 
-  RFC3901          ||       A. Durand, J. Ihren         ||        Alain.Durand@sun.com, johani@autonomica.se 
-  RFC3902          ||       M. Baker, M. Nottingham         ||        distobj@acm.org, mnot@pobox.com 
-  RFC3903          ||       A. Niemi, Ed.         ||        aki.niemi@nokia.com 
-  RFC3904          ||       C. Huitema, R. Austein, S. Satapati, R. van der Pol         ||        huitema@microsoft.com, sra@isc.org, satapati@cisco.com, Ronald.vanderPol@nlnetlabs.nl 
-  RFC3905          ||       V. See, Ed.         ||        vsee@microsoft.com 
-  RFC3906          ||       N. Shen, H. Smit         ||        naiming@redback.com, hhwsmit@xs4all.nl 
-  RFC3909          ||       K. Zeilenga         ||        Kurt@OpenLDAP.org 
-  RFC3910          ||      V. Gurbani, Ed., A. Brusilovsky, I. Faynberg, J. Gato, H. Lu, M. Unmehopa         ||       vkg@lucent.com, abrusilovsky@lucent.com, faynberg@lucent.com, jorge.gato@vodafone.com, huilanlu@lucent.com, unmehopa@lucent.com
-  RFC3911          ||       R. Mahy, D. Petrie         ||        rohan@airespace.com, dpetrie@pingtel.com 
-  RFC3912          ||       L. Daigle         ||        leslie@verisignlabs.com 
-  RFC3913          ||      D. Thaler         ||       dthaler@microsoft.com
-  RFC3914          ||       A. Barbir, A. Rousskov         ||        abbieb@nortelnetworks.com, rousskov@measurement-factory.com 
-  RFC3915          ||       S. Hollenbeck         ||        shollenbeck@verisign.com 
-  RFC3916          ||       X. Xiao, Ed., D. McPherson, Ed., P. Pate, Ed.         ||        xxiao@riverstonenet.com, danny@arbor.net, prayson.pate@overturenetworks.com 
-  RFC3917          ||       J. Quittek, T. Zseby, B. Claise, S. Zander         ||        quittek@netlab.nec.de, zseby@fokus.fhg.de, bclaise@cisco.com, szander@swin.edu.au 
-  RFC3918          ||       D. Stopp, B. Hickman         ||        debby@ixiacom.com, brooks.hickman@spirentcom.com 
-  RFC3919          ||       E. Stephan, J. Palet         ||        emile.stephan@francetelecom.com, jordi.palet@consulintel.es 
-  RFC3920          ||      P. Saint-Andre, Ed.         ||       ietf@stpeter.im
-  RFC3921          ||      P. Saint-Andre, Ed.         ||       ietf@stpeter.im
-  RFC3922          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC3923          ||       P. Saint-Andre         ||       ietf@stpeter.im
-  RFC3924          ||       F. Baker, B. Foster, C. Sharp         ||        fred@cisco.com, bfoster@cisco.com, chsharp@cisco.com 
-  RFC3925          ||       J. Littlefield         ||        joshl@cisco.com 
-  RFC3926          ||      T. Paila, M. Luby, R. Lehtonen, V. Roca, R. Walsh         ||       toni.paila@nokia.com, luby@digitalfountain.com, rami.lehtonen@teliasonera.com, vincent.roca@inrialpes.fr, rod.walsh@nokia.com
-  RFC3927          ||      S. Cheshire, B. Aboba, E. Guttman         ||       rfc@stuartcheshire.org, bernarda@microsoft.com, erik@spybeam.org
-  RFC3928          ||       R. Megginson, Ed., M. Smith, O. Natkovich, J. Parham         ||        rmegginson0224@aol.com, olgan@yahoo-inc.com, mcs@pearlcrescent.com, jeffparh@microsoft.com 
-  RFC3929          ||       T. Hardie         ||        hardie@qualcomm.com 
-  RFC3930          ||       D. Eastlake 3rd         ||        Donald.Eastlake@motorola.com 
-  RFC3931          ||      J. Lau, Ed., M. Townsley, Ed., I. Goyret, Ed.         ||       jedlau@cisco.com, mark@townsley.net, igoyret@lucent.com
-  RFC3932          ||      H. Alvestrand         ||       harald@alvestrand.no
-  RFC3933          ||       J. Klensin, S. Dawkins         ||        john-ietf@jck.com, spencer@mcsr-labs.org 
-  RFC3934          ||      M. Wasserman         ||       margaret@thingmagic.com
-  RFC3935          ||       H. Alvestrand         ||        harald@alvestrand.no 
-  RFC3936          ||       K. Kompella, J. Lang         ||        kireeti@juniper.net, jplang@ieee.org 
-  RFC3937          ||       M. Steidl         ||        mdirector@iptc.org 
-  RFC3938          ||       T. Hansen         ||        tony+msgctxt@maillennium.att.com 
-  RFC3939          ||       G. Parsons, J. Maruszak         ||        gparsons@nortelnetworks.com, jjmaruszak@sympatico.ca 
-  RFC3940          ||      B. Adamson, C. Bormann, M. Handley, J. Macker         ||       adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil
-  RFC3941          ||      B. Adamson, C. Bormann, M. Handley, J. Macker         ||       adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil
-  RFC3942          ||      B. Volz         ||       volz@cisco.com
-  RFC3943          ||       R. Friend         ||        rfriend@hifn.com 
-  RFC3944          ||       T. Johnson, S. Okubo, S. Campos         ||        Tyler_Johnson@unc.edu, sokubo@waseda.jp, simao.campos@itu.int 
-  RFC3945          ||      E. Mannie, Ed.         ||       eric_mannie@hotmail.com
-  RFC3946          ||       E. Mannie, D. Papadimitriou         ||        eric_mannie@hotmail.com, dimitri.papadimitriou@alcatel.be 
-  RFC3947          ||       T. Kivinen, B. Swander, A. Huttunen, V. Volpe         ||        kivinen@safenet-inc.com, Ari.Huttunen@F-Secure.com, briansw@microsoft.com, vvolpe@cisco.com 
-  RFC3948          ||       A. Huttunen, B. Swander, V. Volpe, L. DiBurro, M. Stenberg         ||        Ari.Huttunen@F-Secure.com, briansw@microsoft.com, vvolpe@cisco.com, ldiburro@nortelnetworks.com, markus.stenberg@iki.fi 
-  RFC3949          ||      R. Buckley, D. Venable, L. McIntyre, G. Parsons, J. Rafferty         ||        rbuckley@crt.xerox.com, dvenable@crt.xerox.com, lloyd10328@pacbell.net, gparsons@nortel.com, jraff@brooktrout.com 
-  RFC3950          ||      L. McIntyre, G. Parsons, J. Rafferty         ||        lloyd10328@pacbell.net, gparsons@nortel.com, jraff@brooktrout.com 
-  RFC3951          ||       S. Andersen, A. Duric, H. Astrom, R. Hagen, W. Kleijn, J. Linden         ||        sva@kom.auc.dk, alan.duric@telio.no, henrik.astrom@globalipsound.com, roar.hagen@globalipsound.com, bastiaan.kleijn@globalipsound.com, jan.linden@globalipsound.com 
-  RFC3952          ||       A. Duric, S. Andersen         ||        alan.duric@telio.no, sva@kom.auc.dk 
-  RFC3953          ||      J. Peterson         ||       jon.peterson@neustar.biz
-  RFC3954          ||      B. Claise, Ed.         ||       bclaise@cisco.com
-  RFC3955          ||       S. Leinen         ||        simon@switch.ch 
-  RFC3956          ||      P. Savola, B. Haberman         ||       psavola@funet.fi, brian@innovationslab.net
-  RFC3957          ||       C. Perkins, P. Calhoun         ||        charles.perkins@nokia.com, pcalhoun@airespace.com 
-  RFC3958          ||       L. Daigle, A. Newton         ||        leslie@thinkingcat.com, anewton@verisignlabs.com 
-  RFC3959          ||       G. Camarillo         ||        Gonzalo.Camarillo@ericsson.com 
-  RFC3960          ||       G. Camarillo, H. Schulzrinne         ||        Gonzalo.Camarillo@ericsson.com, schulzrinne@cs.columbia.edu 
-  RFC3961          ||       K. Raeburn         ||        raeburn@mit.edu 
-  RFC3962          ||       K. Raeburn         ||        raeburn@mit.edu 
-  RFC3963          ||       V. Devarapalli, R. Wakikawa, A. Petrescu, P. Thubert         ||        vijay.devarapalli@nokia.com, ryuji@sfc.wide.ad.jp, Alexandru.Petrescu@motorola.com, pthubert@cisco.com 
-  RFC3964          ||       P. Savola, C. Patel         ||        psavola@funet.fi, chirayu@chirayu.org 
-  RFC3965          ||      K. Toyoda, H. Ohno, J. Murai, D. Wing         ||       toyoda.kiyoshi@jp.panasonic.com, hohno@ohnolab.org, jun@wide.ad.jp, dwing-ietf@fuggles.com
-  RFC3966          ||      H. Schulzrinne         ||       hgs@cs.columbia.edu
-  RFC3967          ||      R. Bush, T. Narten         ||       randy@psg.com, narten@us.ibm.com
-  RFC3968          ||       G. Camarillo         ||        Gonzalo.Camarillo@ericsson.com 
-  RFC3969          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC3970          ||      K. Kompella         ||       kireeti@juniper.net
-  RFC3971          ||      J. Arkko, Ed., J. Kempf, B. Zill, P. Nikander         ||       jari.arkko@ericsson.com, kempf@docomolabs-usa.com, bzill@microsoft.com, Pekka.Nikander@nomadiclab.com
-  RFC3972          ||      T. Aura         ||       tuomaura@microsoft.com
-  RFC3973          ||       A. Adams, J. Nicholas, W. Siadak         ||        ala@nexthop.com, jonathan.nicholas@itt.com, wfs@nexthop.com 
-  RFC3974          ||      M. Nakamura, J. Hagino         ||       motonori@media.kyoto-u.ac.jp, itojun@iijlab.net
-  RFC3975          ||       G. Huston, Ed., I. Leuca, Ed.         ||        execd@iab.org, ileana.leuca@Cingular.com 
-  RFC3976          ||       V. K. Gurbani, F. Haerens, V. Rastogi         ||        vkg@lucent.com, frans.haerens@alcatel.be, vidhi.rastogi@wipro.com 
-  RFC3977          ||      C. Feather         ||       clive@davros.org
-  RFC3978          ||       S. Bradner, Ed.         ||        sob@harvard.edu 
-  RFC3979          ||      S. Bradner, Ed.         ||       sob@harvard.edu
-  RFC3980          ||      M. Krueger, M. Chadalapaka, R. Elliott         ||       marjorie_krueger@hp.com, cbm@rose.hp.com, elliott@hp.com
-  RFC3981          ||      A. Newton, M. Sanz         ||       anewton@verisignlabs.com, sanz@denic.de
-  RFC3982          ||       A. Newton, M. Sanz         ||        anewton@verisignlabs.com, sanz@denic.de 
-  RFC3983          ||       A. Newton, M. Sanz         ||        anewton@verisignlabs.com, sanz@denic.de 
-  RFC3984          ||      S. Wenger, M.M. Hannuksela, T. Stockhammer, M. Westerlund, D. Singer         ||       stewe@stewe.org, miska.hannuksela@nokia.com, stockhammer@nomor.de, magnus.westerlund@ericsson.com, singer@apple.com
-  RFC3985          ||      S. Bryant, Ed., P. Pate, Ed.         ||       stbryant@cisco.com, prayson.pate@overturenetworks.com
-  RFC3986          ||      T. Berners-Lee, R. Fielding, L. Masinter         ||       timbl@w3.org, fielding@gbiv.com, LMM@acm.org
-  RFC3987          ||      M. Duerst, M. Suignard         ||       duerst@w3.org, michelsu@microsoft.com
-  RFC3988          ||       B. Black, K. Kompella         ||        ben@layer8.net, kireeti@juniper.net 
-  RFC3989          ||      M. Stiemerling, J. Quittek, T. Taylor         ||       stiemerling@netlab.nec.de, quittek@netlab.nec.de, tom.taylor.stds@gmail.com
-  RFC3990          ||       B. O'Hara, P. Calhoun, J. Kempf         ||        bob@airespace.com, pcalhoun@airespace.com, kempf@docomolabs-usa.com 
-  RFC3991          ||       B. Foster, F. Andreasen         ||        bfoster@cisco.com, fandreas@cisco.com 
-  RFC3992          ||       B. Foster, F. Andreasen         ||        bfoster@cisco.com, fandreas@cisco.com 
-  RFC3993          ||       R. Johnson, T. Palaniappan, M. Stapp         ||        raj@cisco.com, athenmoz@cisco.com, mjs@cisco.com 
-  RFC3994          ||       H. Schulzrinne         ||        hgs@cs.columbia.edu 
-  RFC3995          ||       R. Herriot, T. Hastings         ||       bob@herriot.com, tom.hastings@alum.mit.edu
-  RFC3996          ||      R. Herriot, T. Hastings, H. Lewis         ||       bob@herriot.com, tom.hastings@alum.mit.edu, harryl@us.ibm.com
-  RFC3997          ||      T. Hastings, Ed., R. K. deBry, H. Lewis         ||       tom.hastings@alum.mit.edu, debryro@uvsc.edu, harryl@us.ibm.com
-  RFC3998          ||      C. Kugler, H. Lewis, T. Hastings, Ed.         ||       kugler@us.ibm.com, harryl@us.ibm.com, tom.hastings@alum.mit.edu
-  RFC4001          ||       M. Daniele, B. Haberman, S. Routhier, J. Schoenwaelder         ||       michael.daniele@syamsoftware.com, brian@innovationslab.net, shawn.routhier@windriver.com, j.schoenwaelder@iu-bremen.de
-  RFC4002          ||      R. Brandner, L. Conroy, R. Stastny         ||       rudolf.brandner@siemens.com, lwc@roke.co.uk, richard.stastny@oefeg.at
-  RFC4003          ||      L. Berger         ||       lberger@movaz.com
-  RFC4004          ||      P. Calhoun, T. Johansson, C. Perkins, T. Hiller, Ed., P. McCann         ||       pcalhoun@cisco.com, tony.johansson@bytemobile.com, Charles.Perkins@nokia.com, tomhiller@lucent.com, mccap@lucent.com
-  RFC4005          ||      P. Calhoun, G. Zorn, D. Spence, D. Mitton         ||       pcalhoun@cisco.com, gwz@cisco.com, dspence@computer.org, dmitton@circularnetworks.com
-  RFC4006          ||      H. Hakala, L. Mattila, J-P. Koskinen, M. Stura, J. Loughney         ||       Harri.Hakala@ericsson.com, Leena.Mattila@ericsson.com, juha-pekka.koskinen@nokia.com, marco.stura@nokia.com, John.Loughney@nokia.com
-  RFC4007          ||      S. Deering, B. Haberman, T. Jinmei, E. Nordmark, B. Zill         ||       none, brian@innovationslab.net, jinmei@isl.rdc.toshiba.co.jp, Erik.Nordmark@sun.com, bzill@microsoft.com
-  RFC4008          ||      R. Rohit, P. Srisuresh, R. Raghunarayan, N. Pai, C. Wang         ||       rrohit74@hotmail.com, srisuresh@yahoo.com, raraghun@cisco.com, npai@cisco.com, cliffwang2000@yahoo.com
-  RFC4009          ||       J. Park, S. Lee, J. Kim, J. Lee         ||       khopri@kisa.or.kr, sjlee@kisa.or.kr, jykim@kisa.or.kr, jilee@kisa.or.kr
-  RFC4010          ||       J. Park, S. Lee, J. Kim, J. Lee         ||       khopri@kisa.or.kr, sjlee@kisa.or.kr, jykim@kisa.or.kr, jilee@kisa.or.kr
-  RFC4011          ||      S. Waldbusser, J. Saperia, T. Hongal         ||       waldbusser@nextbeacon.com, saperia@jdscons.com, hongal@riverstonenet.com
-  RFC4012          ||      L. Blunk, J. Damas, F. Parent, A. Robachevsky         ||       ljb@merit.edu, Joao_Damas@isc.org, Florent.Parent@hexago.com, andrei@ripe.net
-  RFC4013          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4014          ||      R. Droms, J. Schnizlein         ||       rdroms@cisco.com, jschnizl@cisco.com
-  RFC4015          ||       R. Ludwig, A. Gurtov         ||       Reiner.Ludwig@ericsson.com, andrei.gurtov@cs.helsinki.fi
-  RFC4016          ||      M. Parthasarathy         ||       mohanp@sbcglobal.net
-  RFC4017          ||       D. Stanley, J. Walker, B. Aboba         ||       dstanley@agere.com, jesse.walker@intel.com, bernarda@microsoft.com
-  RFC4018          ||      M. Bakke, J. Hufferd, K. Voruganti, M. Krueger, T. Sperry         ||       mbakke@cisco.com, jlhufferd@comcast.net, kaladhar@us.ibm.com, marjorie_krueger@hp.com, todd_sperry@adaptec.com
-  RFC4019          ||      G. Pelletier         ||       ghyslain.pelletier@ericsson.com
-  RFC4020          ||      K. Kompella, A. Zinin         ||       kireeti@juniper.net, zinin@psg.com
-  RFC4021          ||      G. Klyne, J. Palme         ||       GK-IETF@ninebynine.org, jpalme@dsv.su.se
-  RFC4022          ||       R. Raghunarayan, Ed.         ||       raraghun@cisco.com
-  RFC4023          ||      T. Worster, Y. Rekhter, E. Rosen, Ed.         ||       tom.worster@motorola.com, yakov@juniper.net, erosen@cisco.com
-  RFC4024          ||      G. Parsons, J. Maruszak         ||       gparsons@nortel.com, jjmaruszak@sympatico.ca
-  RFC4025          ||      M. Richardson         ||       mcr@sandelman.ottawa.on.ca
-  RFC4026          ||       L. Andersson, T. Madsen         ||       loa@pi.se, tove.madsen@acreo.se
-  RFC4027          ||      S. Josefsson         ||       simon@josefsson.org
-  RFC4028          ||      S. Donovan, J. Rosenberg         ||       srd@cisco.com, jdrosen@cisco.com
-  RFC4029          ||      M. Lind, V. Ksinant, S. Park, A. Baudot, P. Savola         ||       mikael.lind@teliasonera.com, vladimir.ksinant@fr.thalesgroup.com, soohong.park@samsung.com, alain.baudot@francetelecom.com, psavola@funet.fi
-  RFC4030          ||      M. Stapp, T. Lemon         ||       mjs@cisco.com, Ted.Lemon@nominum.com
-  RFC4031          ||      M. Carugi, Ed., D. McDysan, Ed.         ||       marco.carugi@nortel.com, dave.mcdysan@mci.com
-  RFC4032          ||       G. Camarillo, P. Kyzivat         ||       Gonzalo.Camarillo@ericsson.com, pkyzivat@cisco.com
-  RFC4033          ||      R. Arends, R. Austein, M. Larson, D. Massey, S. Rose         ||       roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov
-  RFC4034          ||      R. Arends, R. Austein, M. Larson, D. Massey, S. Rose         ||       roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov
-  RFC4035          ||      R. Arends, R. Austein, M. Larson, D. Massey, S. Rose         ||       roy.arends@telin.nl, sra@isc.org, mlarson@verisign.com, massey@cs.colostate.edu, scott.rose@nist.gov
-  RFC4036          ||      W. Sawyer         ||       wsawyer@ieee.org
-  RFC4037          ||       A. Rousskov         ||       rousskov@measurement-factory.com
-  RFC4038          ||       M-K. Shin, Ed., Y-G. Hong, J. Hagino, P. Savola, E. M. Castro         ||       mshin@nist.gov, yghong@pec.etri.re.kr, itojun@iijlab.net, psavola@funet.fi, eva@gsyc.escet.urjc.es
-  RFC4039          ||       S. Park, P. Kim, B. Volz         ||       soohong.park@samsung.com, kimps@samsung.com, volz@cisco.com
-  RFC4040          ||      R. Kreuter         ||       ruediger.kreuter@siemens.com
-  RFC4041          ||      A. Farrel         ||       adrian@olddog.co.uk
-  RFC4042          ||      M. Crispin         ||       UTF9@Lingling.Panda.COM
-  RFC4043          ||      D. Pinkas, T. Gindin         ||       Denis.Pinkas@bull.net, tgindin@us.ibm.com
-  RFC4044          ||      K. McCloghrie         ||       kzm@cisco.com
-  RFC4045          ||      G. Bourdon         ||       gilles.bourdon@francetelecom.com
-  RFC4046          ||      M. Baugher, R. Canetti, L. Dondeti, F. Lindholm         ||       mbaugher@cisco.com, canetti@watson.ibm.com, ldondeti@qualcomm.com, fredrik.lindholm@ericsson.com
-  RFC4047          ||      S. Allen, D. Wells         ||       sla@ucolick.org, dwells@nrao.edu
-  RFC4048          ||      B. Carpenter         ||       brc@zurich.ibm.com
-  RFC4049          ||      R. Housley         ||       housley@vigilsec.com
-  RFC4050          ||      S. Blake-Wilson, G. Karlinger, T. Kobayashi, Y. Wang         ||       sblakewilson@bcisse.com, gregor.karlinger@cio.gv.at, kotetsu@isl.ntt.co.jp, yonwang@uncc.edu
-  RFC4051          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC4052          ||      L. Daigle, Ed., Internet Architecture Board         ||       iab@iab.org, iab@iab.org
-  RFC4053          ||      S. Trowbridge, S. Bradner, F. Baker         ||       sjtrowbridge@lucent.com, sob@harvard.edu, fred@cisco.com
-  RFC4054          ||      J. Strand, Ed.,  A. Chiu, Ed.         ||       jls@research.att.com, chiu@research.att.com
-  RFC4055          ||      J. Schaad, B. Kaliski, R. Housley         ||       jimsch@exmsft.com, bkaliski@rsasecurity.com, housley@vigilsec.com
-  RFC4056          ||      J. Schaad         ||       jimsch@exmsft.com
-  RFC4057          ||      J. Bound, Ed.         ||       jim.bound@hp.com
-  RFC4058          ||      A. Yegin, Ed., Y. Ohba, R. Penno, G. Tsirtsis, C. Wang         ||       alper.yegin@samsung.com, yohba@tari.toshiba.com, rpenno@juniper.net, G.Tsirtsis@Flarion.com, cliffwangmail@yahoo.com
-  RFC4059          ||      D. Linsenbardt, S. Pontius, A. Sturgeon         ||       dlinsenbardt@spyrus.com, spontius@spyrus.com, asturgeon@spyrus.com
-  RFC4060          ||      Q. Xie, D. Pearce         ||       qxie1@email.mot.com, bdp003@motorola.com
-  RFC4061          ||      V. Manral, R. White, A. Shaikh         ||       vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com
-  RFC4062          ||      V. Manral, R. White, A. Shaikh         ||       vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com
-  RFC4063          ||      V. Manral, R. White, A. Shaikh         ||       vishwas@sinett.com, riw@cisco.com, ashaikh@research.att.com
-  RFC4064          ||      A. Patel, K. Leung         ||       alpesh@cisco.com, kleung@cisco.com
-  RFC4065          ||      J. Kempf         ||       kempf@docomolabs-usa.com
-  RFC4066          ||      M. Liebsch, Ed., A. Singh, Ed., H. Chaskar, D. Funato, E. Shim         ||       marco.liebsch@netlab.nec.de, asingh1@email.mot.com, hemant.chaskar@airtightnetworks.net, funato@mlab.yrp.nttdocomo.co.jp, eunsoo@research.panasonic.com
-  RFC4067          ||      J. Loughney, Ed., M. Nakhjiri, C. Perkins, R. Koodli         ||       john.loughney@nokia.com, madjid.nakhjiri@motorola.com, charles.perkins@.nokia.com, rajeev.koodli@nokia.com
-  RFC4068          ||      R. Koodli, Ed.         ||       Rajeev.Koodli@nokia.com
-  RFC4069          ||      M. Dodge, B. Ray         ||       mbdodge@ieee.org, rray@pesa.com
-  RFC4070          ||      M. Dodge, B. Ray         ||       mbdodge@ieee.org, rray@pesa.com
-  RFC4071          ||      R. Austein, Ed., B. Wijnen, Ed.         ||       sra@isc.org, bwijnen@lucent.com
-  RFC4072          ||      P. Eronen, Ed., T. Hiller, G. Zorn         ||       pe@iki.fi, tomhiller@lucent.com, gwz@cisco.com
-  RFC4073          ||      R. Housley         ||       housley@vigilsec.com
-  RFC4074          ||      Y. Morishita, T. Jinmei         ||       yasuhiro@jprs.co.jp, jinmei@isl.rdc.toshiba.co.jp
-  RFC4075          ||      V. Kalusivalingam         ||       vibhaska@cisco.com
-  RFC4076          ||      T. Chown, S. Venaas, A. Vijayabhaskar         ||       tjc@ecs.soton.ac.uk, venaas@uninett.no, vibhaska@cisco.com
-  RFC4077          ||      A.B. Roach         ||       adam@estacado.net
-  RFC4078          ||      N. Earnshaw, S. Aoki, A. Ashley, W. Kameyama         ||       nigel.earnshaw@rd.bbc.co.uk, shig@center.jfn.co.jp, aashley@ndsuk.com, wataru@waseda.jp
-  RFC4079          ||      J. Peterson         ||       jon.peterson@neustar.biz
-  RFC4080          ||      R. Hancock, G. Karagiannis, J. Loughney, S. Van den Bosch         ||       robert.hancock@roke.co.uk, g.karagiannis@ewi.utwente.nl, john.loughney@nokia.com, sven.van_den_bosch@alcatel.be
-  RFC4081          ||      H. Tschofenig, D. Kroeselberg         ||       Hannes.Tschofenig@siemens.com, Dirk.Kroeselberg@siemens.com
-  RFC4082          ||      A. Perrig, D. Song, R. Canetti, J. D. Tygar, B. Briscoe         ||       perrig@cmu.edu, dawnsong@cmu.edu, canetti@watson.ibm.com, doug.tygar@gmail.com, bob.briscoe@bt.com
-  RFC4083          ||      M. Garcia-Martin         ||       miguel.an.garcia@nokia.com
-  RFC4084          ||      J. Klensin         ||       john-ietf@jck.com
-  RFC4085          ||      D. Plonka         ||       plonka@doit.wisc.edu
-  RFC4086          ||      D. Eastlake 3rd, J. Schiller, S. Crocker         ||       Donald.Eastlake@motorola.com, jis@mit.edu, steve@stevecrocker.com
-  RFC4087          ||      D. Thaler         ||       dthaler@microsoft.com
-  RFC4088          ||      D. Black, K. McCloghrie, J. Schoenwaelder         ||       black_david@emc.com, kzm@cisco.com, j.schoenwaelder@iu-bremen.de
-  RFC4089          ||      S. Hollenbeck, Ed., IAB and IESG         ||       sah@428cobrajet.net, none, none
-  RFC4090          ||      P. Pan, Ed., G. Swallow, Ed., A. Atlas, Ed.         ||       ppan@hammerheadsystems.com, swallow@cisco.com, aatlas@avici.com
-  RFC4091          ||      G. Camarillo, J. Rosenberg         ||       Gonzalo.Camarillo@ericsson.com, jdrosen@cisco.com
-  RFC4092          ||      G. Camarillo, J. Rosenberg         ||       Gonzalo.Camarillo@ericsson.com, jdrosen@cisco.com
-  RFC4093          ||      F. Adrangi, Ed., H. Levkowetz, Ed.         ||       farid.adrangi@intel.com, henrik@levkowetz.com
-  RFC4094          ||      J. Manner, X. Fu         ||       jmanner@cs.helsinki.fi, fu@cs.uni-goettingen.de
-  RFC4095          ||      C. Malamud         ||       carl@media.org
-  RFC4096          ||      C. Malamud         ||       carl@media.org
-  RFC4097          ||      M. Barnes, Ed.         ||       mary.barnes@nortel.com
-  RFC4098          ||      H. Berkowitz, E. Davies, Ed., S. Hares, P. Krishnaswamy, M. Lepp         ||       hcb@gettcomm.com, elwynd@dial.pipex.com, skh@nexthop.com, padma.krishnaswamy@saic.com, mlepp@lepp.com
-  RFC4101          ||      E. Rescorla, IAB         ||       ekr@rtfm.com, iab@iab.org
-  RFC4102          ||      P. Jones         ||       paulej@packetizer.com
-  RFC4103          ||      G. Hellstrom, P. Jones         ||       gunnar.hellstrom@omnitor.se, paulej@packetizer.com
-  RFC4104          ||      M. Pana, Ed., A. Reyes, A. Barba, D. Moron, M. Brunner         ||       mpana@metasolv.com, mreyes@ac.upc.edu, telabm@mat.upc.es, dmor4477@hotmail.com, brunner@netlab.nec.de
-  RFC4105          ||      J.-L. Le Roux, Ed., J.-P. Vasseur, Ed., J. Boyle, Ed.         ||       jeanlouis.leroux@francetelecom.com, jpv@cisco.com, jboyle@pdnets.com
-  RFC4106          ||      J. Viega, D. McGrew         ||       viega@securesoftware.com, mcgrew@cisco.com
-  RFC4107          ||      S. Bellovin, R. Housley         ||       bellovin@acm.org, housley@vigilsec.com
-  RFC4108          ||      R. Housley         ||       housley@vigilsec.com
-  RFC4109          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC4110          ||      R. Callon, M. Suzuki         ||       rcallon@juniper.net, suzuki.muneyoshi@lab.ntt.co.jp
-  RFC4111          ||      L. Fang, Ed.         ||       luyuanfang@att.com
-  RFC4112          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC4113          ||      B. Fenner, J. Flick         ||       fenner@research.att.com, john.flick@hp.com
-  RFC4114          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC4115          ||      O. Aboul-Magd, S. Rabie         ||       osama@nortel.com, rabie@nortel.com
-  RFC4116          ||      J. Abley, K. Lindqvist, E. Davies, B. Black, V. Gill         ||       jabley@isc.org, kurtis@kurtis.pp.se, elwynd@dial.pipex.com, ben@layer8.net, vgill@vijaygill.com
-  RFC4117          ||      G. Camarillo, E. Burger, H. Schulzrinne, A. van Wijk         ||       Gonzalo.Camarillo@ericsson.com, eburger@brooktrout.com, schulzrinne@cs.columbia.edu, a.vwijk@viataal.nl
-  RFC4118          ||      L. Yang, P. Zerfos, E. Sadot         ||       lily.l.yang@intel.com, pzerfos@cs.ucla.edu, esadot@avaya.com
-  RFC4119          ||      J. Peterson         ||       jon.peterson@neustar.biz
-  RFC4120          ||      C. Neuman, T. Yu, S. Hartman, K. Raeburn         ||       bcn@isi.edu, tlyu@mit.edu, hartmans-ietf@mit.edu, raeburn@mit.edu
-  RFC4121          ||      L. Zhu, K. Jaganathan, S. Hartman         ||       LZhu@microsoft.com, karthikj@microsoft.com, hartmans-ietf@mit.edu
-  RFC4122          ||      P. Leach, M. Mealling, R. Salz         ||       paulle@microsoft.com, michael@refactored-networks.com, rsalz@datapower.com
-  RFC4123          ||      H. Schulzrinne, C. Agboh         ||       hgs@cs.columbia.edu, charles.agboh@packetizer.com
-  RFC4124          ||      F. Le Faucheur, Ed.         ||       flefauch@cisco.com
-  RFC4125          ||      F. Le Faucheur, W. Lai         ||       flefauch@cisco.com, wlai@att.com
-  RFC4126          ||      J. Ash         ||       gash@att.com
-  RFC4127          ||      F. Le Faucheur, Ed.         ||       flefauch@cisco.com
-  RFC4128          ||      W. Lai         ||       wlai@att.com
-  RFC4129          ||      R. Mukundan, K. Morneault, N. Mangalpally         ||       ranjith.mukundan@wipro.com, kmorneau@cisco.com, narsim@nortelnetworks.com
-  RFC4130          ||      D. Moberg, R. Drummond         ||       dmoberg@cyclonecommerce.com, rvd2@drummondgroup.com
-  RFC4131          ||      S. Green, K. Ozawa, E. Cardona, Ed., A. Katsnelson         ||       rubbersoul3@yahoo.com, Kazuyoshi.Ozawa@toshiba.co.jp, katsnelson6@peoplepc.com, e.cardona@cablelabs.com
-  RFC4132          ||      S. Moriai, A. Kato, M. Kanda         ||       shiho@rd.scei.sony.co.jp, akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp
-  RFC4133          ||      A. Bierman, K. McCloghrie         ||       andy@yumaworks.com, kzm@cisco.com
-  RFC4134          ||      P. Hoffman, Ed.         ||       phoffman@imc.org
-  RFC4135          ||      JH. Choi, G. Daley         ||       jinchoe@samsung.com, greg.daley@eng.monash.edu.au
-  RFC4136          ||      P. Pillay-Esnault         ||       ppe@cisco.com
-  RFC4137          ||      J. Vollbrecht, P. Eronen, N. Petroni, Y. Ohba         ||       jrv@mtghouse.com, pe@iki.fi, npetroni@cs.umd.edu, yohba@tari.toshiba.com
-  RFC4138          ||      P. Sarolahti, M. Kojo         ||       pasi.sarolahti@nokia.com, kojo@cs.helsinki.fi
-  RFC4139          ||      D. Papadimitriou, J. Drake, J. Ash, A. Farrel, L. Ong         ||       dimitri.papadimitriou@alcatel.be, John.E.Drake2@boeing.com, gash@att.com, adrian@olddog.co.uk, lyong@ciena.com
-  RFC4140          ||      H. Soliman, C. Castelluccia, K. El Malki, L. Bellier         ||       h.soliman@flarion.com, claude.castelluccia@inria.fr, karim@elmalki.homeip.net, ludovic.bellier@inria.fr
-  RFC4141          ||      K. Toyoda, D. Crocker         ||       toyoda.kiyoshi@jp.panasonic.com, dcrocker@bbiw.net
-  RFC4142          ||      D. Crocker, G. Klyne         ||       dcrocker@bbiw.net, GK-IETF@ninebynine.org
-  RFC4143          ||      K. Toyoda, D. Crocker         ||       toyoda.kiyoshi@jp.panasonic.com, dcrocker@bbiw.net
-  RFC4144          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC4145          ||      D. Yon, G. Camarillo         ||       yon-comedia@rfdsoftware.com, Gonzalo.Camarillo@ericsson.com
-  RFC4146          ||      R. Gellens         ||       randy@qualcomm.com
-  RFC4147          ||      G. Huston         ||       gih@apnic.net
-  RFC4148          ||      E. Stephan         ||       emile.stephan@francetelecom.com
-  RFC4149          ||      C. Kalbfleisch, R. Cole, D. Romascanu         ||       ietf@kalbfleisch.us, robert.cole@jhuapl.edu, dromasca@gmail.com 
-  RFC4150          ||      R. Dietz, R. Cole         ||       rdietz@hifn.com, robert.cole@jhuapl.edu
-  RFC4151          ||      T. Kindberg, S. Hawke         ||       timothy@hpl.hp.com, sandro@w3.org
-  RFC4152          ||      K. Tesink, R. Fox         ||       kaj@research.telcordia.com, rfox@telcordia.com
-  RFC4153          ||      K. Fujimura, M. Terada, D. Eastlake 3rd         ||       fujimura.ko@lab.ntt.co.jp, te@rex.yrp.nttdocomo.co.jp, Donald.Eastlake@motorola.com
-  RFC4154          ||      M. Terada, K. Fujimura         ||       te@rex.yrp.nttdocomo.co.jp, fujimura.ko@lab.ntt.co.jp
-  RFC4155          ||      E. Hall         ||       ehall@ntrg.com
-  RFC4156          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC4157          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC4158          ||      M. Cooper, Y. Dzambasow, P. Hesse, S. Joseph, R. Nicholas         ||       mcooper@orionsec.com, yuriy@anassoc.com, pmhesse@geminisecurity.com, susan.joseph@vdtg.com, richard.nicholas@it.baesystems.com
-  RFC4159          ||      G. Huston         ||       gih@apnic.net
-  RFC4160          ||      K. Mimura, K. Yokoyama, T. Satoh, C. Kanaide, C. Allocchio         ||       mimu@miyabi-labo.net, keiyoko@msn.com, zsatou@t-ns.co.jp, icemilk77@yahoo.co.jp, Claudio.Allocchio@garr.it
-  RFC4161          ||      K. Mimura, K. Yokoyama, T. Satoh, K. Watanabe, C. Kanaide         ||       mimu@miyabi-labo.net, keiyoko@msn.com, zsatou@t-ns.co.jp, knabe@ad.cyberhome.ne.jp, icemilk77@yahoo.co.jp
-  RFC4162          ||      H.J. Lee, J.H. Yoon, J.I. Lee         ||       jiinii@kisa.or.kr, jhyoon@kisa.or.kr, jilee@kisa.or.kr
-  RFC4163          ||      L-E. Jonsson         ||       lars-erik.jonsson@ericsson.com
-  RFC4164          ||      G. Pelletier         ||       ghyslain.pelletier@ericsson.com
-  RFC4165          ||      T. George, B. Bidulock, R. Dantu, H. Schwarzbauer, K. Morneault         ||       tgeorge_tx@verizon.net, bidulock@openss7.org, rdantu@unt.edu, HannsJuergen.Schwarzbauer@Siemens.com, kmorneau@cisco.com
-  RFC4166          ||      L. Coene, J. Pastor-Balbas         ||       lode.coene@siemens.com, J.Javier.Pastor@ericsson.com
-  RFC4167          ||      A. Lindem         ||       acee@cisco.com
-  RFC4168          ||      J. Rosenberg, H. Schulzrinne, G. Camarillo         ||       jdrosen@cisco.com, schulzrinne@cs.columbia.edu, Gonzalo.Camarillo@ericsson.com
-  RFC4169          ||      V. Torvinen, J. Arkko, M. Naslund         ||       vesa.torvinen@turkuamk.fi, jari.arkko@ericsson.com, mats.naslund@ericsson.com
-  RFC4170          ||      B. Thompson, T. Koren, D. Wing         ||       brucet@cisco.com, tmima@cisco.com, dwing-ietf@fuggles.com
-  RFC4171          ||      J. Tseng, K. Gibbons, F. Travostino, C. Du Laney, J. Souza         ||       joshtseng@yahoo.com, kevin.gibbons@mcdata.com, travos@nortel.com, cdl@rincon.com, joes@exmsft.com
-  RFC4172          ||      C. Monia, R. Mullendore, F. Travostino, W. Jeong, M. Edwards         ||       charles_monia@yahoo.com, Rod.Mullendore@MCDATA.com, travos@nortel.com, wayland@TroikaNetworks.com, mark_edwards@adaptec.com
-  RFC4173          ||      P. Sarkar, D. Missimer, C. Sapuntzakis         ||       psarkar@almaden.ibm.com, duncan.missimer@ieee.org, csapuntz@alum.mit.edu
-  RFC4174          ||      C. Monia, J. Tseng, K. Gibbons         ||       charles_monia@yahoo.com, joshtseng@yahoo.com, kevin.gibbons@mcdata.com
-  RFC4175          ||      L. Gharai, C. Perkins         ||       ladan@isi.edu, csp@csperkins.org
-  RFC4176          ||      Y. El Mghazli, Ed., T. Nadeau, M. Boucadair, K. Chan, A. Gonguet         ||       yacine.el_mghazli@alcatel.fr, tnadeau@cisco.com, mohamed.boucadair@francetelecom.com, khchan@nortel.com, arnaud.gonguet@alcatel.fr
-  RFC4177          ||      G. Huston         ||       gih@apnic.net
-  RFC4178          ||      L. Zhu, P. Leach, K. Jaganathan, W. Ingersoll         ||       lzhu@microsoft.com, paulle@microsoft.com, karthikj@microsoft.com, wyllys.ingersoll@sun.com
-  RFC4179          ||      S. Kang         ||       sukang@nca.or.kr
-  RFC4180          ||      Y. Shafranovich         ||       ietf@shaftek.org
-  RFC4181          ||      C. Heard, Ed.         ||       heard@pobox.com
-  RFC4182          ||      E. Rosen         ||       erosen@cisco.com
-  RFC4183          ||      E. Warnicke         ||       eaw@cisco.com
-  RFC4184          ||      B. Link, T. Hager, J. Flaks         ||       bdl@dolby.com, thh@dolby.com, jasonfl@microsoft.com
-  RFC4185          ||      J. Klensin         ||       john-ietf@jck.com
-  RFC4186          ||      H. Haverinen, Ed., J. Salowey, Ed.         ||       henry.haverinen@nokia.com, jsalowey@cisco.com
-  RFC4187          ||      J. Arkko, H. Haverinen         ||       jari.Arkko@ericsson.com, henry.haverinen@nokia.com
-  RFC4188          ||      K. Norseth, Ed., E. Bell, Ed.         ||       kenyon.c.norseth@L-3com.com, elbell@ntlworld.com
-  RFC4189          ||      K. Ono, S. Tachimoto         ||       ono.kumiko@lab.ntt.co.jp, kumiko@cs.columbia.edu, tachimoto.shinya@lab.ntt.co.jp
-  RFC4190          ||      K. Carlberg, I. Brown, C. Beard         ||       k.carlberg@cs.ucl.ac.uk, I.Brown@cs.ucl.ac.uk, BeardC@umkc.edu
-  RFC4191          ||      R. Draves, D. Thaler         ||       richdr@microsoft.com, dthaler@microsoft.com
-  RFC4192          ||      F. Baker, E. Lear, R. Droms         ||       fred@cisco.com, lear@cisco.com, rdroms@cisco.com
-  RFC4193          ||      R. Hinden, B. Haberman         ||       bob.hinden@gmail.com, brian@innovationslab.net
-  RFC4194          ||      J. Strombergson, L. Walleij, P. Faltstrom         ||       Joachim.Strombergson@InformAsic.com, triad@df.lth.se, paf@cisco.com
-  RFC4195          ||      W. Kameyama         ||       wataru@waseda.jp
-  RFC4196          ||      H.J. Lee, J.H. Yoon, S.L. Lee, J.I. Lee         ||       jiinii@kisa.or.kr, jhyoon@kisa.or.kr, sllee@kisa.or.kr, jilee@kisa.or.kr
-  RFC4197          ||      M. Riegel, Ed.         ||       maximilian.riegel@siemens.com
-  RFC4198          ||      D. Tessman         ||       dtessman@zelestra.com
-  RFC4201          ||      K. Kompella, Y. Rekhter, L. Berger         ||       kireeti@juniper.net, yakov@juniper.net, lberger@movaz.com
-  RFC4202          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
-  RFC4203          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
-  RFC4204          ||      J. Lang, Ed.         ||       jplang@ieee.org
-  RFC4205          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
-  RFC4206          ||      K. Kompella, Y. Rekhter         ||       kireeti@juniper.net, yakov@juniper.net
-  RFC4207          ||      J. Lang, D. Papadimitriou         ||       jplang@ieee.org, dimitri.papadimitriou@alcatel.be
-  RFC4208          ||      G. Swallow, J. Drake, H. Ishimatsu, Y. Rekhter         ||       swallow@cisco.com, John.E.Drake2@boeing.com, hirokazu.ishimatsu@g1m.jp, yakov@juniper.net
-  RFC4209          ||      A. Fredette, Ed., J. Lang, Ed.         ||       Afredette@HatterasNetworks.com, jplang@ieee.org
-  RFC4210          ||      C. Adams, S. Farrell, T. Kause, T. Mononen         ||       cadams@site.uottawa.ca, stephen.farrell@cs.tcd.ie, toka@ssh.com, tmononen@safenet-inc.com
-  RFC4211          ||      J. Schaad         ||       jimsch@exmsft.com
-  RFC4212          ||      M. Blinov, C. Adams         ||       mikblinov@online.ie, cadams@site.uottawa.ca
-  RFC4213          ||      E. Nordmark, R. Gilligan         ||       erik.nordmark@sun.com, bob.gilligan@acm.org
-  RFC4214          ||      F. Templin, T. Gleeson, M. Talwar, D. Thaler         ||       fltemplin@acm.org, tgleeson@cisco.com, mohitt@microsoft.com, dthaler@microsoft.com
-  RFC4215          ||      J. Wiljakka, Ed.         ||       juha.wiljakka@nokia.com
-  RFC4216          ||      R. Zhang, Ed., J.-P. Vasseur, Ed.         ||       raymond_zhang@infonet.com, jpv@cisco.com
-  RFC4217          ||      P. Ford-Hutchinson         ||       rfc4217@ford-hutchinson.com
-  RFC4218          ||      E. Nordmark, T. Li         ||       erik.nordmark@sun.com, Tony.Li@tony.li
-  RFC4219          ||      E. Lear         ||       lear@cisco.com
-  RFC4220          ||      M. Dubuc, T. Nadeau, J. Lang         ||       mdubuc@ncf.ca, tnadeau@cisco.com, jplang@ieee.org
-  RFC4221          ||      T. Nadeau, C. Srinivasan, A. Farrel         ||       tnadeau@cisco.com, cheenu@bloomberg.net, adrian@olddog.co.uk
-  RFC4222          ||      G. Choudhury, Ed.         ||       gchoudhury@att.com
-  RFC4223          ||      P. Savola         ||       psavola@funet.fi
-  RFC4224          ||      G. Pelletier, L-E. Jonsson, K. Sandlund         ||       ghyslain.pelletier@ericsson.com, lars-erik.jonsson@ericsson.com, kristofer.sandlund@ericsson.com
-  RFC4225          ||      P. Nikander, J. Arkko, T. Aura, G. Montenegro, E. Nordmark         ||       pekka.nikander@nomadiclab.com, jari.arkko@ericsson.com, Tuomaura@microsoft.com, gabriel_montenegro_2000@yahoo.com, erik.nordmark@sun.com
-  RFC4226          ||      D. M'Raihi, M. Bellare, F. Hoornaert, D. Naccache, O. Ranen         ||       davidietf@gmail.com, mihir@cs.ucsd.edu, frh@vasco.com, david.naccache@gemplus.com, Ohad.Ranen@ealaddin.com
-  RFC4227          ||      E. O'Tuathail, M. Rose         ||       eamon.otuathail@clipcode.com, mrose17@gmail.com
-  RFC4228          ||      A. Rousskov         ||       rousskov@measurement-factory.com
-  RFC4229          ||      M. Nottingham, J. Mogul         ||       mnot@pobox.com, JeffMogul@acm.org
-  RFC4230          ||      H. Tschofenig, R. Graveman         ||       Hannes.Tschofenig@siemens.com, rfg@acm.org
-  RFC4231          ||      M. Nystrom         ||       magnus@rsasecurity.com
-  RFC4233          ||      K. Morneault, S. Rengasami, M. Kalla, G. Sidebottom         ||       kmorneau@cisco.com, mkalla@telcordia.com, selvam@trideaworks.com, greg@signatustechnologies.com
-  RFC4234          ||      D. Crocker, Ed., P. Overell         ||       dcrocker@bbiw.net, paul@bayleaf.org.uk
-  RFC4235          ||      J. Rosenberg, H. Schulzrinne, R. Mahy, Ed.         ||       jdrosen@cisco.com, schulzrinne@cs.columbia.edu, rohan@ekabal.com
-  RFC4236          ||      A. Rousskov, M. Stecher         ||       rousskov@measurement-factory.com, martin.stecher@webwasher.com
-  RFC4237          ||      G. Vaudreuil         ||       GregV@ieee.org
-  RFC4238          ||      G. Vaudreuil         ||       GregV@ieee.org
-  RFC4239          ||      S. McRae, G. Parsons         ||       stuart.mcrae@uk.ibm.com, gparsons@nortel.com
-  RFC4240          ||      E. Burger, Ed., J. Van Dyke, A. Spitzer         ||       eburger@brooktrout.com, jvandyke@brooktrout.com, woof@brooktrout.com
-  RFC4241          ||      Y. Shirasaki, S. Miyakawa, T. Yamasaki, A. Takenouchi         ||       yasuhiro@nttv6.jp, miyakawa@nttv6.jp, t.yamasaki@ntt.com, takenouchi.ayako@lab.ntt.co.jp
-  RFC4242          ||      S. Venaas, T. Chown, B. Volz         ||       venaas@uninett.no, tjc@ecs.soton.ac.uk, volz@cisco.com
-  RFC4243          ||      M. Stapp, R. Johnson, T. Palaniappan         ||       mjs@cisco.com, raj@cisco.com, athenmoz@cisco.com
-  RFC4244          ||      M. Barnes, Ed.         ||       mary.barnes@nortel.com
-  RFC4245          ||      O. Levin, R. Even         ||       oritl@microsoft.com, roni.even@polycom.co.il
-  RFC4246          ||      M. Dolan         ||       md.1@newtbt.com
-  RFC4247          ||      J. Ash, B. Goode, J. Hand, R. Zhang         ||       gash@att.com, bgoode@att.com, jameshand@att.com, raymond.zhang@bt.infonet.com
-  RFC4248          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC4249          ||      B. Lilly         ||       blilly@erols.com
-  RFC4250          ||      S. Lehtinen, C. Lonvick, Ed.         ||       sjl@ssh.com, clonvick@cisco.com
-  RFC4251          ||      T. Ylonen, C. Lonvick, Ed.         ||       ylo@ssh.com, clonvick@cisco.com
-  RFC4252          ||      T. Ylonen, C. Lonvick, Ed.         ||       ylo@ssh.com, clonvick@cisco.com
-  RFC4253          ||      T. Ylonen, C. Lonvick, Ed.         ||       ylo@ssh.com, clonvick@cisco.com
-  RFC4254          ||      T. Ylonen, C. Lonvick, Ed.         ||       ylo@ssh.com, clonvick@cisco.com
-  RFC4255          ||      J. Schlyter, W. Griffin         ||       jakob@openssh.com, wgriffin@sparta.com
-  RFC4256          ||      F. Cusack, M. Forssen         ||       frank@savecore.net, maf@appgate.com
-  RFC4257          ||      G. Bernstein, E. Mannie, V. Sharma, E. Gray         ||       gregb@grotto-networking.com, eric.mannie@perceval.net, v.sharma@ieee.org, Eric.Gray@Marconi.com
-  RFC4258          ||      D. Brungard, Ed.         ||       dbrungard@att.com
-  RFC4259          ||      M.-J. Montpetit, G. Fairhurst, H. Clausen, B. Collini-Nocker, H. Linder         ||       mmontpetit@motorola.com, gorry@erg.abdn.ac.uk, h.d.clausen@ieee.org, bnocker@cosy.sbg.ac.at, hlinder@cosy.sbg.ac.at
-  RFC4260          ||      P. McCann         ||       mccap@lucent.com
-  RFC4261          ||      J. Walker, A. Kulkarni, Ed.         ||       jesse.walker@intel.com, amol.kulkarni@intel.com
-  RFC4262          ||      S. Santesson         ||       stefans@microsoft.com
-  RFC4263          ||      B. Lilly         ||       blilly@erols.com
-  RFC4264          ||      T. Griffin, G. Huston         ||       Timothy.Griffin@cl.cam.ac.uk, gih@apnic.net
-  RFC4265          ||      B. Schliesser, T. Nadeau         ||       bensons@savvis.net, tnadeau@cisco.com
-  RFC4266          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC4267          ||      M. Froumentin         ||       mf@w3.org
-  RFC4268          ||      S. Chisholm, D. Perkins         ||       schishol@nortel.com, dperkins@snmpinfo.com
-  RFC4269          ||      H.J. Lee, S.J. Lee, J.H. Yoon, D.H. Cheon, J.I. Lee         ||       jiinii@kisa.or.kr, sjlee@kisa.or.kr, jhyoon@kisa.or.kr, dhcheon@mmaa.or.kr, jilee@kisa.or.kr
-  RFC4270          ||      P. Hoffman, B. Schneier         ||       paul.hoffman@vpnc.org, schneier@counterpane.com
-  RFC4271          ||      Y. Rekhter, Ed., T. Li, Ed., S. Hares, Ed.         ||       yakov@juniper.net, tony.li@tony.li, skh@nexthop.com
-  RFC4272          ||      S. Murphy         ||       Sandy@tislabs.com
-  RFC4273          ||      J. Haas, Ed., S. Hares, Ed.         ||       jhaas@nexthop.com, skh@nexthop.com
-  RFC4274          ||      D. Meyer, K. Patel         ||       dmm@1-4-5.net, keyupate@cisco.com
-  RFC4275          ||      S. Hares, D. Hares         ||       skh@nexthop.com, dhares@hickoryhill-consulting.com
-  RFC4276          ||      S. Hares, A. Retana         ||       skh@nexthop.com, aretana@cisco.com
-  RFC4277          ||      D. McPherson, K. Patel         ||       danny@arbor.net, keyupate@cisco.com
-  RFC4278          ||      S. Bellovin, A. Zinin         ||       bellovin@acm.org, zinin@psg.com
-  RFC4279          ||      P. Eronen, Ed., H. Tschofenig, Ed.         ||       pe@iki.fi, Hannes.Tschofenig@siemens.com
-  RFC4280          ||      K. Chowdhury, P. Yegani, L. Madour         ||       kchowdhury@starentnetworks.com, pyegani@cisco.com, Lila.Madour@ericsson.com
-  RFC4281          ||      R. Gellens, D. Singer, P. Frojdh         ||       randy@qualcomm.com, singer@apple.com, Per.Frojdh@ericsson.com
-  RFC4282          ||      B. Aboba, M. Beadles, J. Arkko, P. Eronen         ||       bernarda@microsoft.com, mbeadles@endforce.com, jari.arkko@ericsson.com, pe@iki.fi
-  RFC4283          ||      A. Patel, K. Leung, M. Khalil, H. Akhtar, K. Chowdhury         ||       alpesh@cisco.com, kleung@cisco.com, mkhalil@nortel.com, haseebak@nortel.com, kchowdhury@starentnetworks.com
-  RFC4284          ||      F. Adrangi, V. Lortz, F. Bari, P. Eronen         ||       farid.adrangi@intel.com, victor.lortz@intel.com, farooq.bari@cingular.com, pe@iki.fi
-  RFC4285          ||      A. Patel, K. Leung, M. Khalil, H. Akhtar, K. Chowdhury         ||       alpesh@cisco.com, kleung@cisco.com, mkhalil@nortel.com, haseebak@nortel.com, kchowdhury@starentnetworks.com
-  RFC4286          ||      B. Haberman, J. Martin         ||       brian@innovationslab.net, jim@netzwert.ag
-  RFC4287          ||      M. Nottingham, Ed., R. Sayre, Ed.         ||       mnot@pobox.com, rfsayre@boswijck.com
-  RFC4288          ||      N. Freed, J. Klensin         ||       ned.freed@mrochek.com, klensin+ietf@jck.com
-  RFC4289          ||      N. Freed, J. Klensin         ||       ned.freed@mrochek.com, klensin+ietf@jck.com
-  RFC4290          ||      J. Klensin         ||       john-ietf@jck.com
-  RFC4291          ||      R. Hinden, S. Deering         ||       bob.hinden@gmail.com
-  RFC4292          ||      B. Haberman         ||       brian@innovationslab.net
-  RFC4293          ||      S. Routhier, Ed.         ||       sar@iwl.com
-  RFC4294          ||      J. Loughney, Ed.         ||       john.loughney@nokia.com
-  RFC4295          ||      G. Keeni, K. Koide, K. Nagami, S. Gundavelli         ||       glenn@cysols.com, koide@shiratori.riec.tohoku.ac.jp, nagami@inetcore.com, sgundave@cisco.com
-  RFC4296          ||      S. Bailey, T. Talpey         ||       steph@sandburst.com, thomas.talpey@netapp.com
-  RFC4297          ||      A. Romanow, J. Mogul, T. Talpey, S. Bailey         ||       allyn@cisco.com, JeffMogul@acm.org, thomas.talpey@netapp.com, steph@sandburst.com
-  RFC4298          ||      J.-H. Chen, W. Lee, J. Thyssen         ||       rchen@broadcom.com, wlee@broadcom.com, jthyssen@broadcom.com
-  RFC4301          ||      S. Kent, K. Seo         ||       kent@bbn.com, kseo@bbn.com
-  RFC4302          ||      S. Kent         ||       kent@bbn.com
-  RFC4303          ||      S. Kent         ||       kent@bbn.com
-  RFC4304          ||      S. Kent         ||       kent@bbn.com
-  RFC4305          ||      D. Eastlake 3rd         ||       Donald.Eastlake@Motorola.com
-  RFC4306          ||      C. Kaufman, Ed.         ||       charliek@microsoft.com
-  RFC4307          ||      J. Schiller         ||       jis@mit.edu
-  RFC4308          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC4309          ||      R. Housley         ||       housley@vigilsec.com
-  RFC4310          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC4311          ||      R. Hinden, D. Thaler         ||       bob.hinden@gmail.com, dthaler@microsoft.com
-  RFC4312          ||      A. Kato, S. Moriai, M. Kanda         ||       akato@po.ntts.co.jp, shiho@rd.scei.sony.co.jp, kanda@isl.ntt.co.jp
-  RFC4313          ||      D. Oran         ||       oran@cisco.com
-  RFC4314          ||      A. Melnikov         ||       alexey.melnikov@isode.com
-  RFC4315          ||       M. Crispin         ||       MRC@CAC.Washington.EDU
-  RFC4316          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC4317          ||      A. Johnston, R. Sparks         ||       ajohnston@tello.com, rjsparks@estacado.net
-  RFC4318          ||      D. Levi, D. Harrington         ||       dlevi@nortel.com, ietfdbh@comcast.net
-  RFC4319          ||      C. Sikes, B. Ray, R. Abbi         ||       csikes@zhone.com, rray@pesa.com, Rajesh.Abbi@alcatel.com
-  RFC4320          ||      R. Sparks         ||       rjsparks@estacado.net
-  RFC4321          ||      R. Sparks         ||       rjsparks@estacado.net
-  RFC4322          ||      M. Richardson, D.H. Redelmeier         ||       mcr@sandelman.ottawa.on.ca, hugh@mimosa.com
-  RFC4323          ||      M. Patrick, W. Murwin         ||       michael.patrick@motorola.com, w.murwin@motorola.com
-  RFC4324          ||      D. Royer, G. Babics, S. Mansour         ||       Doug@IntelliCal.com, george.babics@oracle.com, smansour@ebay.com
-  RFC4325          ||      S. Santesson, R. Housley         ||       stefans@microsoft.com, housley@vigilsec.com
-  RFC4326          ||      G. Fairhurst, B. Collini-Nocker         ||       gorry@erg.abdn.ac.uk, bnocker@cosy.sbg.ac.at
-  RFC4327          ||      M. Dubuc, T. Nadeau, J. Lang, E. McGinnis         ||       dubuc.consulting@sympatico.ca, tnadeau@cisco.com, jplang@ieee.org, emcginnis@hammerheadsystems.com
-  RFC4328          ||      D. Papadimitriou, Ed.         ||       dimitri.papadimitriou@alcatel.be
-  RFC4329          ||      B. Hoehrmann         ||       bjoern@hoehrmann.de
-  RFC4330          ||      D. Mills         ||       mills@udel.edu
-  RFC4331          ||      B. Korver, L. Dusseault         ||       briank@networkresonance.com, lisa.dusseault@gmail.com
-  RFC4332          ||      K. Leung, A. Patel, G. Tsirtsis, E. Klovning         ||       kleung@cisco.com, alpesh@cisco.com, g.tsirtsis@flarion.com, espen@birdstep.com
-  RFC4333          ||      G. Huston, Ed., B. Wijnen, Ed.         ||       gih@apnic.net, bwijnen@lucent.com
-  RFC4334          ||      R. Housley, T. Moore         ||       housley@vigilsec.com, timmoore@microsoft.com
-  RFC4335          ||      J. Galbraith, P. Remaker         ||       galb-list@vandyke.com, remaker@cisco.com
-  RFC4336          ||      S. Floyd, M. Handley, E. Kohler         ||       floyd@icir.org, M.Handley@cs.ucl.ac.uk, kohler@cs.ucla.edu
-  RFC4337          ||      Y Lim, D. Singer         ||       young@netntv.co.kr, singer@apple.com
-  RFC4338          ||      C. DeSanti, C. Carlson, R. Nixon         ||       cds@cisco.com, craig.carlson@qlogic.com, bob.nixon@emulex.com
-  RFC4339          ||      J. Jeong, Ed.         ||       jjeong@cs.umn.edu
-  RFC4340          ||      E. Kohler, M. Handley, S. Floyd         ||       kohler@cs.ucla.edu, M.Handley@cs.ucl.ac.uk, floyd@icir.org
-  RFC4341          ||      S. Floyd, E. Kohler         ||       floyd@icir.org, kohler@cs.ucla.edu
-  RFC4342          ||      S. Floyd, E. Kohler, J. Padhye         ||       floyd@icir.org, kohler@cs.ucla.edu, padhye@microsoft.com
-  RFC4343          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC4344          ||      M. Bellare, T. Kohno, C. Namprempre         ||       mihir@cs.ucsd.edu, tkohno@cs.ucsd.edu, meaw@alum.mit.edu
-  RFC4345          ||      B. Harris         ||       bjh21@bjh21.me.uk
-  RFC4346          ||      T. Dierks, E. Rescorla         ||       tim@dierks.org, ekr@rtfm.com
-  RFC4347          ||      E. Rescorla, N. Modadugu         ||       ekr@rtfm.com, nagendra@cs.stanford.edu
-  RFC4348          ||      S. Ahmadi         ||       sassan.ahmadi@ieee.org
-  RFC4349          ||      C. Pignataro, M. Townsley         ||       cpignata@cisco.com, mark@townsley.net
-  RFC4350          ||      F. Hendrikx, C. Wallis         ||       ferry.hendrikx@ssc.govt.nz, colin.wallis@ssc.govt.nz
-  RFC4351          ||      G. Hellstrom, P. Jones         ||       gunnar.hellstrom@omnitor.se, paulej@packetizer.com
-  RFC4352          ||      J. Sjoberg, M. Westerlund, A. Lakaniemi, S. Wenger         ||       Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, Stephan.Wenger@nokia.com
-  RFC4353          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC4354          ||      M. Garcia-Martin         ||       miguel.an.garcia@nokia.com
-  RFC4355          ||      R. Brandner, L. Conroy, R. Stastny         ||       rudolf.brandner@siemens.com, lwc@roke.co.uk, Richard.stastny@oefeg.at
-  RFC4356          ||      R. Gellens         ||       randy@qualcomm.com
-  RFC4357          ||      V. Popov, I. Kurepkin, S. Leontiev         ||       vpopov@cryptopro.ru, kure@cryptopro.ru, lse@cryptopro.ru
-  RFC4358          ||      D. Smith         ||       dwight.smith@motorola.com
-  RFC4359          ||      B. Weis         ||       bew@cisco.com
-  RFC4360          ||      S. Sangli, D. Tappan, Y. Rekhter         ||       rsrihari@cisco.com, tappan@cisco.com, yakov@juniper.net
-  RFC4361          ||      T. Lemon, B. Sommerfeld         ||       mellon@nominum.com, sommerfeld@sun.com
-  RFC4362          ||      L-E. Jonsson, G. Pelletier, K. Sandlund         ||       lars-erik.jonsson@ericsson.com, ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com
-  RFC4363          ||      D. Levi, D. Harrington         ||       dlevi@nortel.com, ietfdbh@comcast.net
-  RFC4364          ||      E. Rosen, Y. Rekhter         ||       erosen@cisco.com, yakov@juniper.net
-  RFC4365          ||      E. Rosen         ||       erosen@cisco.com
-  RFC4366          ||      S. Blake-Wilson, M. Nystrom, D. Hopwood, J. Mikkelsen, T. Wright         ||       sblakewilson@bcisse.com, magnus@rsasecurity.com, david.hopwood@blueyonder.co.uk, janm@transactionware.com, timothy.wright@vodafone.com
-  RFC4367          ||      J. Rosenberg, Ed., IAB         ||       jdrosen@cisco.com
-  RFC4368          ||      T. Nadeau, S. Hegde         ||       tnadeau@cisco.com, subrah@cisco.com
-  RFC4369          ||      K. Gibbons, C. Monia, J. Tseng, F. Travostino         ||       kevin.gibbons@mcdata.com, charles_monia@yahoo.com, joshtseng@yahoo.com, travos@nortel.com
-  RFC4370          ||      R. Weltman         ||       robw@worldspot.com
-  RFC4371          ||      B. Carpenter, Ed., L. Lynch, Ed.         ||       brc@zurich.ibm.com, llynch@darkwing.uoregon.edu
-  RFC4372          ||      F. Adrangi, A. Lior, J. Korhonen, J. Loughney         ||       farid.adrangi@intel.com, avi@bridgewatersystems.com, jouni.korhonen@teliasonera.com, john.loughney@nokia.com
-  RFC4373          ||      R. Harrison, J. Sermersheim, Y. Dong         ||       rharrison@novell.com, jimse@novell.com, yulindong@gmail.com
-  RFC4374          ||      G. McCobb         ||       mccobb@us.ibm.com
-  RFC4375          ||      K. Carlberg         ||       carlberg@g11.org.uk
-  RFC4376          ||      P. Koskelainen, J. Ott, H. Schulzrinne, X. Wu         ||       petri.koskelainen@nokia.com, jo@netlab.hut.fi, hgs@cs.columbia.edu, xiaotaow@cs.columbia.edu
-  RFC4377          ||      T. Nadeau, M. Morrow, G. Swallow, D. Allan, S. Matsushima         ||       tnadeau@cisco.com, mmorrow@cisco.com, swallow@cisco.com, dallan@nortel.com, satoru@ft.solteria.net
-  RFC4378          ||      D. Allan, Ed., T. Nadeau, Ed.         ||       dallan@nortel.com, tnadeau@cisco.com
-  RFC4379          ||      K. Kompella, G. Swallow         ||       kireeti@juniper.net, swallow@cisco.com
-  RFC4380          ||      C. Huitema         ||       huitema@microsoft.com
-  RFC4381          ||      M. Behringer         ||       mbehring@cisco.com
-  RFC4382          ||      T. Nadeau, Ed., H. van der Linde, Ed.         ||       tnadeau@cisco.com, havander@cisco.com
-  RFC4383          ||      M. Baugher, E. Carrara         ||       mbaugher@cisco.com, carrara@kth.se
-  RFC4384          ||      D. Meyer         ||       dmm@1-4-5.net
-  RFC4385          ||      S. Bryant, G. Swallow, L. Martini, D. McPherson         ||       stbryant@cisco.com, swallow@cisco.com, lmartini@cisco.com, danny@arbor.net
-  RFC4386          ||      S. Boeyen, P. Hallam-Baker         ||       sharon.boeyen@entrust.com, pbaker@VeriSign.com
-  RFC4387          ||      P. Gutmann, Ed.         ||       pgut001@cs.auckland.ac.nz
-  RFC4388          ||      R. Woundy, K. Kinnear         ||       richard_woundy@cable.comcast.com, kkinnear@cisco.com
-  RFC4389          ||      D. Thaler, M. Talwar, C. Patel         ||       dthaler@microsoft.com, mohitt@microsoft.com, chirayu@chirayu.org
-  RFC4390          ||      V. Kashyap         ||       vivk@us.ibm.com
-  RFC4391          ||      J. Chu, V. Kashyap         ||       jerry.chu@sun.com, vivk@us.ibm.com
-  RFC4392          ||      V. Kashyap         ||       vivk@us.ibm.com
-  RFC4393          ||      H. Garudadri         ||       hgarudadri@qualcomm.com
-  RFC4394          ||      D. Fedyk, O. Aboul-Magd, D. Brungard, J. Lang, D. Papadimitriou         ||       dwfedyk@nortel.com, osama@nortel.com, dbrungard@att.com, jplang@ieee.org, dimitri.papadimitriou@alcatel.be
-  RFC4395          ||      T. Hansen, T. Hardie, L. Masinter         ||       tony+urireg@maillennium.att.com, hardie@qualcomm.com, LMM@acm.org
-  RFC4396          ||      J. Rey, Y. Matsui         ||       jose.rey@eu.panasonic.com, matsui.yoshinori@jp.panasonic.com
-  RFC4397          ||      I. Bryskin, A. Farrel         ||       i_bryskin@yahoo.com, adrian@olddog.co.uk
-  RFC4398          ||      S. Josefsson         ||       simon@josefsson.org
-  RFC4401          ||      N. Williams         ||       Nicolas.Williams@sun.com
-  RFC4402          ||      N. Williams         ||       Nicolas.Williams@sun.com
-  RFC4403          ||      B. Bergeson, K. Boogert, V. Nanjundaswamy         ||       bruce.bergeson@novell.com, kent.boogert@novell.com, vijay.nanjundaswamy@oracle.com
-  RFC4404          ||      R. Natarajan, A. Rijhsinghani         ||       anil@charter.net, r.natarajan@f5.com
-  RFC4405          ||      E. Allman, H. Katz         ||       eric@sendmail.com, hkatz@microsoft.com
-  RFC4406          ||      J. Lyon, M. Wong         ||       jimlyon@microsoft.com, mengwong@dumbo.pobox.com
-  RFC4407          ||      J. Lyon         ||       jimlyon@microsoft.com
-  RFC4408          ||      M. Wong, W. Schlitt         ||       mengwong+spf@pobox.com, wayne@schlitt.net
-  RFC4409          ||      R. Gellens, J. Klensin         ||       g+ietf@qualcomm.com, john+ietf@jck.com
-  RFC4410          ||      M. Pullen, F. Zhao, D. Cohen         ||       mpullen@gmu.edu, fzhao@netlab.gmu.edu, danny.cohen@sun.com
-  RFC4411          ||      J. Polk         ||       jmpolk@cisco.com
-  RFC4412          ||      H. Schulzrinne, J. Polk         ||       hgs@cs.columbia.edu, jmpolk@cisco.com
-  RFC4413          ||      M. West, S. McCann         ||       mark.a.west@roke.co.uk, stephen.mccann@roke.co.uk
-  RFC4414          ||       A. Newton         ||       andy@hxr.us
-  RFC4415          ||      R. Brandner, L. Conroy, R. Stastny         ||       rudolf.brandner@siemens.com, lwc@roke.co.uk, Richard.stastny@oefeg.at
-  RFC4416          ||      J. Wong, Ed.         ||       j.k.wong@sympatico.ca
-  RFC4417          ||      P. Resnick, Ed., P. Saint-Andre, Ed.         ||       presnick@qti.qualcomm.com, ietf@stpeter.im
-  RFC4418          ||      T. Krovetz, Ed.         ||       tdk@acm.org
-  RFC4419          ||      M. Friedl, N. Provos, W. Simpson         ||       markus@openbsd.org, provos@citi.umich.edu, wsimpson@greendragon.com
-  RFC4420          ||      A. Farrel, Ed., D. Papadimitriou, J.-P. Vasseur, A. Ayyangar         ||       adrian@olddog.co.uk, dimitri.papadimitriou@alcatel.be, jpv@cisco.com, arthi@juniper.net
-  RFC4421          ||      C. Perkins         ||       csp@csperkins.org
-  RFC4422          ||      A. Melnikov, Ed.,  K. Zeilenga, Ed.         ||       Alexey.Melnikov@isode.com, Kurt@OpenLDAP.org
-  RFC4423          ||      R. Moskowitz, P. Nikander         ||       rgm@icsalabs.com, pekka.nikander@nomadiclab.com
-  RFC4424          ||      S. Ahmadi         ||       sassan.ahmadi@ieee.org
-  RFC4425          ||      A. Klemets         ||       Anders.Klemets@microsoft.com
-  RFC4426          ||      J. Lang, Ed., B. Rajagopalan, Ed., D. Papadimitriou, Ed.         ||       jplang@ieee.org, balar@microsoft.com, dimitri.papadimitriou@alcatel.be
-  RFC4427          ||      E. Mannie, Ed., D. Papadimitriou, Ed.         ||       eric.mannie@perceval.net, dimitri.papadimitriou@alcatel.be
-  RFC4428          ||      D. Papadimitriou, Ed., E. Mannie, Ed.         ||       dimitri.papadimitriou@alcatel.be, eric.mannie@perceval.net
-  RFC4429          ||      N. Moore         ||       sharkey@zoic.org
-  RFC4430          ||      S. Sakane, K. Kamada, M. Thomas, J. Vilhuber         ||       Shouichi.Sakane@jp.yokogawa.com, Ken-ichi.Kamada@jp.yokogawa.com, mat@cisco.com, vilhuber@cisco.com
-  RFC4431          ||      M. Andrews, S. Weiler         ||       Mark_Andrews@isc.org,  weiler@tislabs.com
-  RFC4432          ||      B. Harris         ||       bjh21@bjh21.me.uk
-  RFC4433          ||      M. Kulkarni, A. Patel, K. Leung         ||       mkulkarn@cisco.com, alpesh@cisco.com, kleung@cisco.com
-  RFC4434          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC4435          ||      Y. Nomura, R. Walsh, J-P. Luoma, H. Asaeda, H. Schulzrinne         ||       nom@flab.fujitsu.co.jp, rod.walsh@nokia.com, juha-pekka.luoma@nokia.com, asaeda@wide.ad.jp, schulzrinne@cs.columbia.edu
-  RFC4436          ||      B. Aboba, J. Carlson, S. Cheshire         ||       bernarda@microsoft.com, james.d.carlson@sun.com, rfc@stuartcheshire.org
-  RFC4437          ||      J. Whitehead, G. Clemm, J. Reschke, Ed.         ||       ejw@cse.ucsc.edu, julian.reschke@greenbytes.degeoffrey.clemm@us.ibm.com, 
-  RFC4438          ||      C. DeSanti, V. Gaonkar, H.K. Vivek, K. McCloghrie, S. Gai         ||       cds@cisco.com, vgaonkar@cisco.com, hvivek@cisco.com, kzm@cisco.com, none
-  RFC4439          ||      C. DeSanti, V. Gaonkar, K. McCloghrie, S. Gai         ||       cds@cisco.com, vgaonkar@cisco.com, kzm@cisco.com, none
-  RFC4440          ||      S. Floyd, Ed., V. Paxson, Ed., A. Falk, Ed., IAB         ||       floyd@acm.org, vern@icir.org, falk@isi.edu
-  RFC4441          ||      B. Aboba, Ed.         ||       bernarda@microsoft.com
-  RFC4442          ||      S. Fries, H. Tschofenig         ||       steffen.fries@siemens.com, Hannes.Tschofenig@siemens.com
-  RFC4443          ||      A. Conta, S. Deering, M. Gupta, Ed.         ||       aconta@txc.com, none, mukesh.gupta@tropos.com
-  RFC4444          ||      J. Parker, Ed.         ||       jeffp@middlebury.edu
-  RFC4445          ||      J. Welch, J. Clark         ||       Jim.Welch@ineoquest.com, jiclark@cisco.com
-  RFC4446          ||      L. Martini         ||       lmartini@cisco.com
-  RFC4447          ||      L. Martini, Ed., E. Rosen, N. El-Aawar, T. Smith, G. Heron         ||       lmartini@cisco.com, nna@level3.net, giles.heron@tellabs.com, erosen@cisco.com, tob@netapp.com
-  RFC4448          ||      L. Martini, Ed., E. Rosen, N. El-Aawar, G. Heron         ||       lmartini@cisco.com, nna@level3.net, giles.heron@tellabs.com, erosen@cisco.com
-  RFC4449          ||      C. Perkins         ||       charles.perkins@nokia.com
-  RFC4450          ||      E. Lear, H. Alvestrand         ||       lear@cisco.com, harald@alvestrand.no
-  RFC4451          ||      D. McPherson, V. Gill         ||       danny@arbor.net, VijayGill9@aol.com
-  RFC4452          ||      H. Van de Sompel, T. Hammond, E. Neylon, S. Weibel         ||       herbertv@lanl.gov, t.hammond@nature.com, eneylon@manifestsolutions.com, weibel@oclc.org
-  RFC4453          ||      J. Rosenberg, G. Camarillo, Ed., D. Willis         ||       jdrosen@cisco.com, Gonzalo.Camarillo@ericsson.com, dean.willis@softarmor.com
-  RFC4454          ||      S. Singh, M. Townsley, C. Pignataro         ||       sanjeevs@cisco.com, mark@townsley.net, cpignata@cisco.com
-  RFC4455          ||      M. Hallak-Stamler, M. Bakke, Y. Lederman, M. Krueger, K. McCloghrie         ||       michele@sanrad.com, mbakke@cisco.com, yaronled@bezeqint.net, marjorie_krueger@hp.com, kzm@cisco.com
-  RFC4456          ||      T. Bates, E. Chen, R. Chandra         ||       tbates@cisco.com, enkechen@cisco.com, rchandra@sonoasystems.com
-  RFC4457          ||      G. Camarillo, G. Blanco         ||       Gonzalo.Camarillo@ericsson.com, german.blanco@ericsson.com
-  RFC4458          ||      C. Jennings, F. Audet, J. Elwell         ||       fluffy@cisco.com, audet@nortel.com, john.elwell@siemens.com
-  RFC4459          ||      P. Savola         ||       psavola@funet.fi
-  RFC4460          ||      R. Stewart, I. Arias-Rodriguez, K. Poon, A. Caro, M. Tuexen         ||       randall@lakerest.net, ivan.arias-rodriguez@nokia.com, kacheong.poon@sun.com, acaro@bbn.com, tuexen@fh-muenster.de
-  RFC4461          ||      S. Yasukawa, Ed.         ||       yasukawa.seisho@lab.ntt.co.jp
-  RFC4462          ||      J. Hutzelman, J. Salowey, J. Galbraith, V. Welch         ||       jhutz+@cmu.edu, jsalowey@cisco.com, galb@vandyke.com, welch@mcs.anl.gov
-  RFC4463          ||      S. Shanmugham, P. Monaco, B. Eberman         ||       sarvi@cisco.com, peter.monaco@nuasis.com, brian.eberman@speechworks.com
-  RFC4464          ||      A. Surtees, M. West         ||       abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk
-  RFC4465          ||      A. Surtees, M. West         ||       abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk
-  RFC4466          ||      A. Melnikov, C. Daboo         ||       Alexey.Melnikov@isode.com, cyrus@daboo.name
-  RFC4467          ||      M. Crispin         ||       MRC@CAC.Washington.EDU
-  RFC4468          ||      C. Newman         ||       chris.newman@sun.com
-  RFC4469          ||      P. Resnick         ||       presnick@qti.qualcomm.com
-  RFC4470          ||      S. Weiler, J. Ihren         ||       weiler@tislabs.com, johani@autonomica.se
-  RFC4471          ||      G. Sisson, B. Laurie         ||       geoff@nominet.org.uk, ben@algroup.co.uk
-  RFC4472          ||      A. Durand, J. Ihren, P. Savola         ||       Alain_Durand@cable.comcast.com, johani@autonomica.se, psavola@funet.fi
-  RFC4473          ||      Y. Nomura, R. Walsh, J-P. Luoma, J. Ott, H. Schulzrinne         ||       nom@flab.fujitsu.co.jp, rod.walsh@nokia.com, juha-pekka.luoma@nokia.com, jo@netlab.tkk.fi, schulzrinne@cs.columbia.edu
-  RFC4474          ||      J. Peterson,  C. Jennings         ||       jon.peterson@neustar.biz, fluffy@cisco.com
-  RFC4475          ||      R. Sparks, Ed., A. Hawrylyshen, A. Johnston, J. Rosenberg, H. Schulzrinne         ||       RjS@estacado.net, ahawrylyshen@ditechnetworks.com, alan@sipstation.com, jdrosen@cisco.com, hgs@cs.columbia.edu
-  RFC4476          ||      C. Francis, D. Pinkas         ||       Chris_S_Francis@Raytheon.com, Denis.Pinkas@bull.net
-  RFC4477          ||      T. Chown, S. Venaas, C. Strauf         ||       tjc@ecs.soton.ac.uk, venaas@uninett.no, strauf@rz.tu-clausthal.de
-  RFC4478          ||      Y. Nir         ||       ynir@checkpoint.com
-  RFC4479          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC4480          ||      H. Schulzrinne, V. Gurbani, P. Kyzivat, J. Rosenberg         ||       hgs+simple@cs.columbia.edu, vkg@lucent.com, pkyzivat@cisco.com, jdrosen@cisco.com
-  RFC4481          ||      H. Schulzrinne         ||       hgs+simple@cs.columbia.edu
-  RFC4482          ||      H. Schulzrinne         ||       hgs+simple@cs.columbia.edu
-  RFC4483          ||      E. Burger, Ed.         ||       eburger@cantata.com
-  RFC4484          ||      J. Peterson, J. Polk, D. Sicker, H. Tschofenig         ||       jon.peterson@neustar.biz, jmpolk@cisco.com, douglas.sicker@colorado.edu, Hannes.Tschofenig@siemens.com
-  RFC4485          ||      J. Rosenberg, H. Schulzrinne         ||       jdrosen@cisco.com, schulzrinne@cs.columbia.edu
-  RFC4486          ||      E. Chen, V. Gillet         ||       enkechen@cisco.com, vgi@opentransit.net
-  RFC4487          ||      F. Le, S. Faccin, B. Patil, H. Tschofenig         ||       franckle@cmu.edu, sfaccinstd@gmail.com, Basavaraj.Patil@nokia.com, Hannes.Tschofenig@siemens.com
-  RFC4488          ||      O. Levin         ||       oritl@microsoft.com
-  RFC4489          ||      J-S. Park, M-K. Shin, H-J. Kim         ||       pjs@etri.re.kr, myungki.shin@gmail.com, khj@etri.re.kr
-  RFC4490          ||      S. Leontiev, Ed., G. Chudov, Ed.         ||       lse@cryptopro.ru, chudov@cryptopro.ru
-  RFC4491          ||      S. Leontiev, Ed., D. Shefanovski, Ed.         ||       lse@cryptopro.ru, dbs@mts.ru
-  RFC4492          ||      S. Blake-Wilson, N. Bolyard, V. Gupta, C. Hawk, B. Moeller         ||       sblakewilson@safenet-inc.com, nelson@bolyard.com, vipul.gupta@sun.com, chris@corriente.net, bodo@openssl.org
-  RFC4493          ||      JH. Song, R. Poovendran, J. Lee, T. Iwata         ||       songlee@ee.washington.edu, radha@ee.washington.edu, icheol.lee@samsung.com, iwata@cse.nagoya-u.ac.jp
-  RFC4494          ||      JH. Song, R. Poovendran, J. Lee         ||       songlee@ee.washington.edu, radha@ee.washington.edu, jicheol.lee@samsung.com
-  RFC4495          ||      J. Polk, S. Dhesikan         ||       jmpolk@cisco.com, sdhesika@cisco.com
-  RFC4496          ||      M. Stecher, A. Barbir         ||       martin.stecher@webwasher.com, abbieb@nortel.com
-  RFC4497          ||      J. Elwell, F. Derks, P. Mourot, O. Rousseau         ||       john.elwell@siemens.com, frank.derks@nec-philips.com, Patrick.Mourot@alcatel.fr, Olivier.Rousseau@alcatel.fr 
-  RFC4498          ||      G. Keeni         ||       glenn@cysols.com
-  RFC4501          ||      S. Josefsson         ||       simon@josefsson.org
-  RFC4502          ||      S. Waldbusser         ||       waldbusser@nextbeacon.com
-  RFC4503          ||      M. Boesgaard, M. Vesterager, E. Zenner         ||       mab@cryptico.com, mvp@cryptico.com, ez@cryptico.com
-  RFC4504          ||      H. Sinnreich, Ed.,  S. Lass, C. Stredicke         ||       henry@pulver.com, steven.lass@verizonbusiness.com, cs@snom.de
-  RFC4505          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4506          ||      M. Eisler, Ed.         ||       email2mre-rfc4506@yahoo.com
-  RFC4507          ||      J. Salowey, H. Zhou, P. Eronen, H. Tschofenig         ||       jsalowey@cisco.com, hzhou@cisco.com, pe@iki.fi, Hannes.Tschofenig@siemens.com
-  RFC4508          ||      O. Levin, A. Johnston         ||       oritl@microsoft.com, ajohnston@ipstation.com
-  RFC4509          ||      W. Hardaker         ||       hardaker@tislabs.com
-  RFC4510          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
-  RFC4511          ||      J. Sermersheim, Ed.         ||       jimse@novell.com
-  RFC4512          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
-  RFC4513          ||      R. Harrison, Ed.         ||       roger_harrison@novell.com
-  RFC4514          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
-  RFC4515          ||      M. Smith, Ed., T. Howes         ||       mcs@pearlcrescent.com, howes@opsware.com
-  RFC4516          ||      M. Smith, Ed., T. Howes         ||       mcs@pearlcrescent.com, howes@opsware.com
-  RFC4517          ||      S. Legg, Ed.         ||       steven.legg@eb2bcom.com
-  RFC4518          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4519          ||      A. Sciberras, Ed.         ||       andrew.sciberras@eb2bcom.com
-  RFC4520          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4521          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4522          ||      S. Legg         ||       steven.legg@eb2bcom.com
-  RFC4523          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4524          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
-  RFC4525          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4526          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4527          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4528          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4529          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4530          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4531          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4532          ||      K. Zeilenga         ||       Kurt@OpenLDAP.org
-  RFC4533          ||      K. Zeilenga, J.H. Choi         ||       Kurt@OpenLDAP.org, jongchoi@us.ibm.com
-  RFC4534          ||      A Colegrove, H Harney         ||       acc@sparta.com, hh@sparta.com
-  RFC4535          ||      H. Harney, U. Meth, A. Colegrove, G. Gross         ||       hh@sparta.com, umeth@sparta.com, acc@sparta.com, gmgross@identaware.com
-  RFC4536          ||      P. Hoschka         ||       ph@w3.org
-  RFC4537          ||      L. Zhu, P. Leach, K. Jaganathan         ||       lzhu@microsoft.com, paulle@microsoft.com, karthikj@microsoft.com
-  RFC4538          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC4539          ||      T. Edwards         ||       tedwards@pbs.org
-  RFC4540          ||      M. Stiemerling, J. Quittek, C. Cadar         ||       stiemerling@netlab.nec.de, quittek@netlab.nec.de, ccadar2@yahoo.com
-  RFC4541          ||      M. Christensen, K. Kimball, F. Solensky         ||       mjc@tt.dk, karen.kimball@hp.com, frank.solensky@calix.com
-  RFC4542          ||      F. Baker, J. Polk         ||       fred@cisco.com, jmpolk@cisco.com
-  RFC4543          ||      D. McGrew, J. Viega         ||       mcgrew@cisco.com, viega@list.org
-  RFC4544          ||      M. Bakke, M. Krueger, T. McSweeney, J. Muchow         ||       mbakke@cisco.com, marjorie_krueger@hp.com, tommcs@us.ibm.com, james.muchow@qlogic.com
-  RFC4545          ||      M. Bakke, J. Muchow         ||       mbakke@cisco.com, james.muchow@qlogic.com
-  RFC4546          ||      D. Raftus, E. Cardona         ||       david.raftus@ati.com, e.cardona@cablelabs.com
-  RFC4547          ||      A. Ahmad, G. Nakanishi         ||       azlina@cisco.com, gnakanishi@motorola.com
-  RFC4548          ||      E. Gray, J. Rutemiller, G. Swallow         ||       Eric.Gray@Marconi.com, John.Rutemiller@Marconi.com, swallow@cisco.com
-  RFC4549          ||      A. Melnikov, Ed.         ||       alexey.melnikov@isode.com
-  RFC4550          ||      S. Maes, A. Melnikov         ||       stephane.maes@oracle.com, Alexey.melnikov@isode.com
-  RFC4551          ||      A. Melnikov, S. Hole         ||       Alexey.Melnikov@isode.com, Steve.Hole@messagingdirect.com
-  RFC4552          ||      M. Gupta, N. Melam         ||       mukesh.gupta@tropos.com, nmelam@juniper.net
-  RFC4553          ||      A. Vainshtein, Ed., YJ. Stein, Ed.         ||       sasha@axerra.com, yaakov_s@rad.com
-  RFC4554          ||      T. Chown         ||       tjc@ecs.soton.ac.uk
-  RFC4555          ||      P. Eronen         ||       pe@iki.fi
-  RFC4556          ||      L. Zhu, B. Tung         ||       lzhu@microsoft.com, brian@aero.org
-  RFC4557          ||      L. Zhu, K. Jaganathan, N. Williams         ||       lzhu@microsoft.com, karthikj@microsoft.com, Nicolas.Williams@sun.com
-  RFC4558          ||      Z. Ali, R. Rahman, D. Prairie, D. Papadimitriou         ||       zali@cisco.com, rrahman@cisco.com, dprairie@cisco.com, dimitri.papadimitriou@alcatel.be
-  RFC4559          ||      K. Jaganathan, L. Zhu, J. Brezak         ||       karthikj@microsoft.com, lzhu@microsoft.com, jbrezak@microsoft.com
-  RFC4560          ||      J. Quittek, Ed., K. White, Ed.         ||       quittek@netlab.nec.de, wkenneth@us.ibm.com
-  RFC4561          ||      J.-P. Vasseur, Ed., Z. Ali, S. Sivabalan         ||       jpv@cisco.com, zali@cisco.com, msiva@cisco.com
-  RFC4562          ||      T. Melsen, S. Blake         ||       Torben.Melsen@ericsson.com, steven.blake@ericsson.com
-  RFC4563          ||      E. Carrara, V. Lehtovirta, K. Norrman         ||       carrara@kth.se, vesa.lehtovirta@ericsson.com, karl.norrman@ericsson.com
-  RFC4564          ||      S. Govindan, Ed., H. Cheng, ZH. Yao, WH. Zhou, L. Yang         ||       saravanan.govindan@sg.panasonic.com, hong.cheng@sg.panasonic.com, yaoth@huawei.com, zhouwenhui@chinamobile.com, lily.l.yang@intel.com
-  RFC4565          ||      D. Loher, D. Nelson, O. Volinsky, B. Sarikaya         ||       dplore@gmail.com, dnelson@enterasys.com, ovolinsky@colubris.com, sarikaya@ieee.org
-  RFC4566          ||      M. Handley, V. Jacobson, C. Perkins         ||       M.Handley@cs.ucl.ac.uk, van@packetdesign.com, csp@csperkins.org
-  RFC4567          ||      J. Arkko, F. Lindholm, M. Naslund, K. Norrman, E. Carrara         ||       jari.arkko@ericsson.com, fredrik.lindholm@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com, carrara@kth.se
-  RFC4568          ||      F. Andreasen, M. Baugher, D. Wing         ||       fandreas@cisco.com, mbaugher@cisco.com, dwing-ietf@fuggles.com
-  RFC4569          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC4570          ||      B. Quinn, R. Finlayson         ||       rcq@boxnarrow.com, finlayson@live555.com
-  RFC4571          ||      J. Lazzaro         ||       lazzaro@cs.berkeley.edu
-  RFC4572          ||      J. Lennox         ||       lennox@cs.columbia.edu
-  RFC4573          ||      R. Even, A. Lochbaum         ||        roni.even@polycom.co.il, alochbaum@polycom.com
-  RFC4574          ||      O. Levin, G. Camarillo         ||       oritl@microsoft.com, Gonzalo.Camarillo@ericsson.com
-  RFC4575          ||      J. Rosenberg, H. Schulzrinne, O. Levin, Ed.         ||       jdrosen@cisco.com, schulzrinne@cs.columbia.edu, oritl@microsoft.com
-  RFC4576          ||      E. Rosen, P. Psenak, P. Pillay-Esnault         ||       erosen@cisco.com, ppsenak@cisco.com, ppe@cisco.com
-  RFC4577          ||      E. Rosen, P. Psenak, P. Pillay-Esnault         ||       erosen@cisco.com, ppsenak@cisco.com, ppe@cisco.com
-  RFC4578          ||      M. Johnston, S. Venaas, Ed.         ||       michael.johnston@intel.com, venaas@uninett.no
-  RFC4579          ||      A. Johnston, O. Levin         ||       alan@sipstation.com, oritl@microsoft.com
-  RFC4580          ||      B. Volz         ||       volz@cisco.com
-  RFC4581          ||      M. Bagnulo, J. Arkko         ||       marcelo@it.uc3m.es, jari.arkko@ericsson.com
-  RFC4582          ||      G. Camarillo, J. Ott, K. Drage         ||       Gonzalo.Camarillo@ericsson.com, jo@netlab.hut.fi, drage@lucent.com
-  RFC4583          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC4584          ||      S. Chakrabarti, E. Nordmark         ||       samitac2@gmail.com, erik.nordmark@sun.com
-  RFC4585          ||      J. Ott, S. Wenger, N. Sato, C. Burmeister, J. Rey         ||       jo@acm.org, stewe@stewe.org, sato652@oki.com, carsten.burmeister@eu.panasonic.com, jose.rey@eu.panasonic.com
-  RFC4586          ||      C. Burmeister, R. Hakenberg, A. Miyazaki, J. Ott, N. Sato, S. Fukunaga         ||       carsten.burmeister@eu.panasonic.com, rolf.hakenberg@eu.panasonic.com, miyazaki.akihiro@jp.panasonic.com, jo@acm.org, sato652@oki.com, fukunaga444@oki.com
-  RFC4587          ||      R. Even         ||       roni.even@polycom.co.il
-  RFC4588          ||      J. Rey, D. Leon, A. Miyazaki, V. Varsa, R. Hakenberg         ||       jose.rey@eu.panasonic.com, davidleon123@yahoo.com, miyazaki.akihiro@jp.panasonic.com, viktor.varsa@nokia.com, rolf.hakenberg@eu.panasonic.com
-  RFC4589          ||      H. Schulzrinne, H. Tschofenig         ||       schulzrinne@cs.columbia.edu, Hannes.Tschofenig@siemens.com
-  RFC4590          ||      B. Sterman, D. Sadolevsky, D. Schwartz, D. Williams, W. Beck         ||       baruch@kayote.com, dscreat@dscreat.com, david@kayote.com, dwilli@cisco.com, beckw@t-systems.com
-  RFC4591          ||      M. Townsley, G. Wilkie, S. Booth, S. Bryant, J. Lau         ||       mark@townsley.net, gwilkie@cisco.com, jebooth@cisco.com, stbryant@cisco.com, jedlau@gmail.com
-  RFC4592          ||      E. Lewis         ||       ed.lewis@neustar.biz
-  RFC4593          ||      A. Barbir, S. Murphy, Y. Yang         ||       abbieb@nortel.com, sandy@sparta.com, yiya@cisco.com
-  RFC4594          ||      J. Babiarz, K. Chan, F. Baker         ||       babiarz@nortel.com, khchan@nortel.com, fred@cisco.com
-  RFC4595          ||      F. Maino, D. Black         ||       fmaino@cisco.com, black_david@emc.com
-  RFC4596          ||      J. Rosenberg, P. Kyzivat         ||       jdrosen@cisco.com, pkyzivat@cisco.com
-  RFC4597          ||      R. Even, N. Ismail         ||       roni.even@polycom.co.il, nismail@cisco.com
-  RFC4598          ||      B. Link         ||       bdl@dolby.com
-  RFC4601          ||      B. Fenner, M. Handley, H. Holbrook, I. Kouvelas         ||       fenner@research.att.com, M.Handley@cs.ucl.ac.uk, holbrook@arastra.com, kouvelas@cisco.com
-  RFC4602          ||      T. Pusateri         ||       pusateri@juniper.net
-  RFC4603          ||      G. Zorn, G. Weber, R. Foltak         ||       gwz@cisco.com, gdweber@cisco.com, rfoltak@cisco.com
-  RFC4604          ||      H. Holbrook, B. Cain, B. Haberman         ||       holbrook@cisco.com, bcain99@gmail.com, brian@innovationslab.net
-  RFC4605          ||      B. Fenner, H. He, B. Haberman, H. Sandick         ||       fenner@research.att.com, haixiang@nortelnetworks.com, brian@innovationslab.net, sandick@nc.rr.com
-  RFC4606          ||      E. Mannie, D. Papadimitriou         ||       eric.mannie@perceval.net, dimitri.papadimitriou@alcatel.be
-  RFC4607          ||      H. Holbrook, B. Cain         ||       holbrook@arastra.com, bcain99@gmail.com
-  RFC4608          ||      D. Meyer, R. Rockell, G. Shepherd         ||       dmm@1-4-5.net, rrockell@sprint.net, gjshep@gmail.com
-  RFC4609          ||      P. Savola, R. Lehtonen, D. Meyer         ||       psavola@funet.fi, rami.lehtonen@teliasonera.com, dmm@1-4-5.net
-  RFC4610          ||      D. Farinacci, Y. Cai         ||       dino@cisco.com, ycai@cisco.com
-  RFC4611          ||      M. McBride, J. Meylor, D. Meyer         ||       mcbride@cisco.com, jmeylor@cisco.com, dmm@1-4-5.net
-  RFC4612          ||      P. Jones, H. Tamura         ||       paulej@packetizer.com, tamura@cs.ricoh.co.jp
-  RFC4613          ||      P. Frojdh, U. Lindgren, M. Westerlund         ||       per.frojdh@ericsson.com, ulf.a.lindgren@ericsson.com, magnus.westerlund@ericsson.com
-  RFC4614          ||      M. Duke, R. Braden, W. Eddy, E. Blanton         ||       martin.duke@boeing.com, braden@isi.edu, weddy@grc.nasa.gov, eblanton@cs.purdue.edu
-  RFC4615          ||      J. Song, R. Poovendran, J. Lee, T. Iwata         ||       junhyuk.song@gmail.com, radha@ee.washington.edu, jicheol.lee@samsung.com, iwata@cse.nagoya-u.ac.jp
-  RFC4616          ||      K. Zeilenga, Ed.         ||       Kurt@OpenLDAP.org
-  RFC4617          ||      J. Kornijenko         ||       j.kornienko@abcsoftware.lv
-  RFC4618          ||      L. Martini, E. Rosen, G. Heron, A. Malis         ||       lmartini@cisco.com, erosen@cisco.com, giles.heron@tellabs.com, Andy.Malis@tellabs.com
-  RFC4619          ||      L. Martini, Ed., C. Kawa, Ed., A. Malis, Ed.         ||       lmartini@cisco.com, claude.kawa@oz.com, Andy.Malis@tellabs.com
-  RFC4620          ||      M. Crawford,  B. Haberman, Ed.         ||       crawdad@fnal.gov, brian@innovationslab.net
-  RFC4621          ||      T. Kivinen, H. Tschofenig         ||       kivinen@safenet-inc.com, Hannes.Tschofenig@siemens.com
-  RFC4622          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC4623          ||      A. Malis, M. Townsley         ||       Andy.Malis@tellabs.com, mark@townsley.net
-  RFC4624          ||      B. Fenner, D. Thaler         ||       fenner@research.att.com, dthaler@microsoft.com
-  RFC4625          ||      C. DeSanti, K. McCloghrie, S. Kode, S. Gai         ||       cds@cisco.com, srinikode@yahoo.com, kzm@cisco.com, none
-  RFC4626          ||      C. DeSanti, V. Gaonkar, K. McCloghrie, S. Gai         ||       cds@cisco.com, vgaonkar@cisco.com, kzm@cisco.com, none
-  RFC4627          ||      D. Crockford         ||       douglas@crockford.com
-  RFC4628          ||      R. Even         ||       roni.even@polycom.co.il
-  RFC4629          ||      J. Ott, C. Bormann, G. Sullivan, S. Wenger, R. Even, Ed.         ||       jo@netlab.tkk.fi, cabo@tzi.org, garysull@microsoft.com, stewe@stewe.org, roni.even@polycom.co.il
-  RFC4630          ||      R. Housley, S. Santesson         ||       housley@vigilsec.com, stefans@microsoft.com
-  RFC4631          ||      M. Dubuc, T. Nadeau, J. Lang, E. McGinnis, A. Farrel         ||       dubuc.consulting@sympatico.ca, tnadeau@cisco.com, jplang@ieee.org, emcginnis@hammerheadsystems.com, adrian@olddog.co.uk
-  RFC4632          ||      V. Fuller, T. Li         ||       vaf@cisco.com, tli@tropos.com
-  RFC4633          ||      S. Hartman         ||       hartmans-ietf@mit.edu
-  RFC4634          ||      D. Eastlake 3rd, T. Hansen         ||       donald.eastlake@motorola.com, tony+shs@maillennium.att.com
-  RFC4635          ||      D. Eastlake 3rd         ||       Donald.Eastlake@motorola.com
-  RFC4636          ||      C. Perkins         ||       charles.perkins@nokia.com
-  RFC4637          ||               ||       
-  RFC4638          ||      P. Arberg, D. Kourkouzelis, M. Duckett, T. Anschutz, J. Moisand         ||       parberg@redback.com, diamondk@redback.com, mike.duckett@bellsouth.com, tom.anschutz@bellsouth.com, jmoisand@juniper.net
-  RFC4639          ||      R. Woundy, K. Marez         ||       richard_woundy@cable.comcast.com, kevin.marez@motorola.com
-  RFC4640          ||      A. Patel, Ed., G. Giaretta, Ed.         ||       alpesh@cisco.com, gerardo.giaretta@telecomitalia.it
-  RFC4641          ||      O. Kolkman, R. Gieben         ||       olaf@nlnetlabs.nl, miek@miek.nl
-  RFC4642          ||      K. Murchison, J. Vinocur, C. Newman         ||       murch@andrew.cmu.edu, vinocur@cs.cornell.edu, Chris.Newman@sun.com
-  RFC4643          ||      J. Vinocur, K. Murchison         ||       vinocur@cs.cornell.edu, murch@andrew.cmu.edu
-  RFC4644          ||      J. Vinocur, K. Murchison         ||       vinocur@cs.cornell.edu, murch@andrew.cmu.edu
-  RFC4645          ||      D. Ewell         ||       dewell@adelphia.net
-  RFC4646          ||      A. Phillips, M. Davis         ||       addison@inter-locale.com, mark.davis@macchiato.com
-  RFC4647          ||      A. Phillips, M. Davis         ||       addison@inter-locale.com, mark.davis@macchiato.com
-  RFC4648          ||      S. Josefsson         ||       simon@josefsson.org
-  RFC4649          ||      B. Volz         ||       volz@cisco.com
-  RFC4650          ||      M. Euchner         ||       martin_euchner@hotmail.com
-  RFC4651          ||      C. Vogt, J. Arkko         ||       chvogt@tm.uka.de, jari.arkko@ericsson.com
-  RFC4652          ||      D. Papadimitriou, Ed., L.Ong, J. Sadler, S. Shew, D. Ward         ||       dimitri.papadimitriou@alcatel.be, lyong@ciena.com, jonathan.sadler@tellabs.com, sdshew@nortel.com, dward@cisco.com
-  RFC4653          ||      S. Bhandarkar, A. L. N. Reddy, M. Allman, E. Blanton         ||       sumitha@tamu.edu, reddy@ee.tamu.edu, mallman@icir.org, eblanton@cs.purdue.edu
-  RFC4654          ||      J. Widmer, M. Handley         ||       widmer@acm.org, m.handley@cs.ucl.ac.uk
-  RFC4655          ||      A. Farrel, J.-P. Vasseur, J. Ash         ||       adrian@olddog.co.uk, jpv@cisco.com, gash@att.com
-  RFC4656          ||      S. Shalunov, B. Teitelbaum, A. Karp, J. Boote, M. Zekauskas         ||       shalunov@internet2.edu, ben@internet2.edu, akarp@cs.wisc.edu, boote@internet2.edu, matt@internet2.edu
-  RFC4657          ||      J. Ash, Ed., J.L. Le Roux, Ed.         ||       gash@att.com, jeanlouis.leroux@orange-ft.com
-  RFC4659          ||      J. De Clercq, D. Ooms, M. Carugi, F. Le Faucheur         ||       jeremy.de_clercq@alcatel.be, dirk@onesparrow.com, marco.carugi@nortel.com, flefauch@cisco.com
-  RFC4660          ||      H. Khartabil, E. Leppanen, M. Lonnfors, J. Costa-Requena         ||       hisham.khartabil@telio.no, eva-maria.leppanen@nokia.com, mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com
-  RFC4661          ||      H. Khartabil, E. Leppanen, M. Lonnfors, J. Costa-Requena         ||       hisham.khartabil@telio.no, eva-maria.leppanen@nokia.com, mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com
-  RFC4662          ||      A. B. Roach, B. Campbell, J. Rosenberg         ||       adam@estacado.net,  ben@estacado.net, jdrosen@cisco.com
-  RFC4663          ||      D. Harrington         ||       dbharrington@comcast.net
-  RFC4664          ||      L. Andersson, Ed., E. Rosen, Ed.         ||       loa@pi.se, erosen@cisco.com
-  RFC4665          ||      W. Augustyn, Ed., Y. Serbest, Ed.         ||       waldemar@wdmsys.com, yetik_serbest@labs.att.com
-  RFC4666          ||      K. Morneault, Ed., J. Pastor-Balbas, Ed.         ||       kmorneau@cisco.com, j.javier.pastor@ericsson.com
-  RFC4667          ||      W. Luo         ||       luo@cisco.com
-  RFC4668          ||      D. Nelson         ||       dnelson@enterasys.com
-  RFC4669          ||      D. Nelson         ||       dnelson@enterasys.com
-  RFC4670          ||      D. Nelson         ||       dnelson@enterasys.com
-  RFC4671          ||      D. Nelson         ||       dnelson@enterasys.com
-  RFC4672          ||      S. De Cnodder, N. Jonnala, M. Chiba         ||       stefaan.de_cnodder@alcatel.be, njonnala@cisco.com, mchiba@cisco.com
-  RFC4673          ||      S. De Cnodder, N. Jonnala, M. Chiba         ||       stefaan.de_cnodder@alcatel.be, njonnala@cisco.com, mchiba@cisco.com
-  RFC4674          ||      J.L. Le Roux, Ed.         ||       jeanlouis.leroux@francetelecom.com
-  RFC4675          ||      P. Congdon, M. Sanchez, B. Aboba         ||       paul.congdon@hp.com, mauricio.sanchez@hp.com, bernarda@microsoft.com
-  RFC4676          ||      H. Schulzrinne         ||       hgs+geopriv@cs.columbia.edu
-  RFC4677          ||      P. Hoffman, S. Harris         ||       paul.hoffman@vpnc.org, srh@umich.edu
-  RFC4678          ||      A. Bivens         ||       jbivens@us.ibm.com
-  RFC4679          ||      V. Mammoliti, G. Zorn, P. Arberg, R. Rennison         ||       vince@cisco.com, gwz@cisco.com, parberg@redback.com, robert.rennison@ecitele.com
-  RFC4680          ||      S. Santesson         ||       stefans@microsoft.com
-  RFC4681          ||      S. Santesson, A. Medvinsky, J. Ball         ||       stefans@microsoft.com, arimed@microsoft.com, joshball@microsoft.com
-  RFC4682          ||      E. Nechamkin, J-F. Mule         ||       enechamkin@broadcom.com, jf.mule@cablelabs.com
-  RFC4683          ||      J. Park, J. Lee, H.. Lee, S. Park, T. Polk         ||       khopri@kisa.or.kr, jilee@kisa.or.kr, hslee@kisa.or.kr, sjpark@bcqre.com, tim.polk@nist.gov
-  RFC4684          ||      P. Marques, R. Bonica, L. Fang, L. Martini, R. Raszuk, K. Patel, J. Guichard         ||       roque@juniper.net, rbonica@juniper.net, luyuanfang@att.com, lmartini@cisco.com, rraszuk@cisco.com, keyupate@cisco.com, jguichar@cisco.com
-  RFC4685          ||      J. Snell         ||       jasnell@gmail.com
-  RFC4686          ||      J. Fenton         ||       fenton@bluepopcorn.net
-  RFC4687          ||      S. Yasukawa, A. Farrel, D. King, T. Nadeau         ||       s.yasukawa@hco.ntt.co.jp, adrian@olddog.co.uk, daniel.king@aria-networks.com, tnadeau@cisco.com
-  RFC4688          ||      S. Rushing         ||       srushing@inmedius.com
-  RFC4689          ||      S. Poretsky, J. Perser, S. Erramilli, S. Khurana         ||       sporetsky@reefpoint.com, jerry@perser.org, shobha@research.telcordia.com, skhurana@motorola.com
-  RFC4690          ||      J. Klensin, P. Faltstrom, C. Karp, IAB         ||       john-ietf@jck.com, paf@cisco.com, ck@nic.museum, iab@iab.org
-  RFC4691          ||      L. Andersson, Ed.         ||       loa@pi.se
-  RFC4692          ||      G. Huston         ||       gih@apnic.net
-  RFC4693          ||      H. Alvestrand         ||       harald@alvestrand.no
-  RFC4694          ||      J. Yu         ||       james.yu@neustar.biz
-  RFC4695          ||      J. Lazzaro, J. Wawrzynek         ||       lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu
-  RFC4696          ||      J. Lazzaro, J. Wawrzynek         ||       lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu
-  RFC4697          ||       M. Larson, P. Barber         ||       mlarson@verisign.com, pbarber@verisign.com
-  RFC4698          ||      E. Gunduz, A. Newton, S. Kerr         ||       e.gunduz@computer.org, andy@hxr.us, shane@time-travellers.org
-  RFC4701          ||      M. Stapp, T. Lemon, A. Gustafsson         ||       mjs@cisco.com, mellon@nominum.com, gson@araneus.fi
-  RFC4702          ||      M. Stapp, B. Volz, Y. Rekhter         ||       mjs@cisco.com, volz@cisco.com, yakov@juniper.net
-  RFC4703          ||      M. Stapp, B. Volz         ||       mjs@cisco.com, volz@cisco.com
-  RFC4704          ||      B. Volz         ||       volz@cisco.com
-  RFC4705          ||      R. Housley, A. Corry         ||       housley@vigilsec.com, publications@gigabeam.com
-  RFC4706          ||      M. Morgenstern, M. Dodge, S. Baillie, U. Bonollo         ||       moti.Morgenstern@ecitele.com, mbdodge@ieee.org, scott.baillie@nec.com.au, umberto.bonollo@nec.com.au
-  RFC4707          ||      P. Grau, V. Heinau, H. Schlichting, R. Schuettler         ||       nas@fu-berlin.de, nas@fu-berlin.de, nas@fu-berlin.de, nas@fu-berlin.de
-  RFC4708          ||      A. Miller         ||       ak.miller@auckland.ac.nz
-  RFC4709          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC4710          ||      A. Siddiqui, D. Romascanu, E. Golovinsky         ||       anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net
-  RFC4711          ||      A. Siddiqui, D. Romascanu, E. Golovinsky         ||       anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net
-  RFC4712          ||      A. Siddiqui, D. Romascanu, E. Golovinsky, M. Rahman,Y. Kim         ||       anwars@avaya.com, dromasca@gmail.com , gene@alertlogic.net, none, ybkim@broadcom.com
-  RFC4713          ||      X. Lee, W. Mao, E. Chen, N. Hsu, J. Klensin         ||       lee@cnnic.cn, mao@cnnic.cn, erin@twnic.net.tw, snw@twnic.net.tw, john+ietf@jck.com
-  RFC4714          ||      A. Mankin, S. Hayes         ||       mankin@psg.com, stephen.hayes@ericsson.com
-  RFC4715          ||      M. Munakata, S. Schubert, T. Ohba         ||       munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp
-  RFC4716          ||      J. Galbraith, R. Thayer         ||       galb@vandyke.com, rodney@canola-jones.com
-  RFC4717          ||      L. Martini, J. Jayakumar, M. Bocci, N. El-Aawar, J. Brayley, G. Koleyni         ||       lmartini@cisco.com, jjayakum@cisco.com, matthew.bocci@alcatel.co.uk, nna@level3.net, jeremy.brayley@ecitele.com, ghassem@nortelnetworks.com
-  RFC4718          ||      P. Eronen, P. Hoffman         ||       pe@iki.fi, paul.hoffman@vpnc.org
-  RFC4719          ||      R. Aggarwal, Ed., M. Townsley, Ed., M. Dos Santos, Ed.         ||       rahul@juniper.net, mark@townsley.net, mariados@cisco.com
-  RFC4720          ||      A. Malis, D. Allan, N. Del Regno         ||       Andy.Malis@tellabs.com, dallan@nortelnetworks.com, nick.delregno@mci.com
-  RFC4721          ||      C. Perkins, P. Calhoun, J. Bharatia         ||       charles.perkins@nokia.com, pcalhoun@cisco.com, jayshree@nortel.com
-  RFC4722          ||      J. Van Dyke, E. Burger, Ed., A. Spitzer         ||       jvandyke@cantata.com, eburger@cantata.com, woof@pingtel.com
-  RFC4723          ||      T. Kosonen, T. White         ||       timo.kosonen@nokia.com, twhite@midi.org
-  RFC4724          ||      S. Sangli, E. Chen, R. Fernando, J. Scudder, Y. Rekhter         ||       rsrihari@cisco.com, enkechen@cisco.com, rex@juniper.net, jgs@juniper.net, yakov@juniper.net
-  RFC4725          ||      A. Mayrhofer, B. Hoeneisen         ||       alexander.mayrhofer@enum.at, b.hoeneisen@ieee.org
-  RFC4726          ||      A. Farrel, J.-P. Vasseur, A. Ayyangar         ||       adrian@olddog.co.uk, jpv@cisco.com, arthi@nuovasystems.com
-  RFC4727          ||      B. Fenner         ||       fenner@research.att.com
-  RFC4728          ||      D. Johnson, Y. Hu, D. Maltz         ||       dbj@cs.rice.edu, yihchun@uiuc.edu, dmaltz@cs.cmu.edu
-  RFC4729          ||      M. Abel         ||       TPM@nfc-forum.org
-  RFC4730          ||      E. Burger, M. Dolly         ||       eburger@cantata.com, mdolly@att.com
-  RFC4731          ||      A. Melnikov, D. Cridland         ||       Alexey.Melnikov@isode.com, dave.cridland@inventuresystems.co.uk
-  RFC4732          ||      M. Handley, Ed., E. Rescorla, Ed., IAB         ||       M.Handley@cs.ucl.ac.uk, ekr@networkresonance.com, iab@ietf.org
-  RFC4733          ||      H. Schulzrinne, T. Taylor         ||       schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com
-  RFC4734          ||      H. Schulzrinne, T. Taylor         ||       schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com
-  RFC4735          ||      T. Taylor         ||       tom.taylor.stds@gmail.com
-  RFC4736          ||      JP. Vasseur, Ed., Y. Ikejiri, R. Zhang         ||       jpv@cisco.com, y.ikejiri@ntt.com, raymond_zhang@bt.infonet.com
-  RFC4737          ||      A. Morton, L. Ciavattone, G. Ramachandran, S. Shalunov, J. Perser         ||       acmorton@att.com, lencia@att.com, gomathi@att.com, shalunov@internet2.edu, jperser@veriwave.com
-  RFC4738          ||      D. Ignjatic, L. Dondeti, F. Audet, P. Lin         ||       dignjatic@polycom.com, dondeti@qualcomm.com,  audet@nortel.com, linping@nortel.com
-  RFC4739          ||      P. Eronen, J. Korhonen         ||       pe@iki.fi, jouni.korhonen@teliasonera.com
-  RFC4740          ||      M. Garcia-Martin, Ed., M. Belinchon, M. Pallares-Lopez, C. Canales-Valenzuela, K. Tammi         ||       miguel.an.garcia@nokia.com, maria.carmen.belinchon@ericsson.com, miguel-angel.pallares@ericsson.com, carolina.canales@ericsson.com, kalle.tammi@nokia.com
-  RFC4741          ||      R. Enns, Ed.         ||       rpe@juniper.net
-  RFC4742          ||      M. Wasserman, T. Goddard         ||       margaret@thingmagic.com, ted.goddard@icesoft.com
-  RFC4743          ||      T. Goddard         ||       ted.goddard@icesoft.com
-  RFC4744          ||      E. Lear, K. Crozier         ||       lear@cisco.com, ken.crozier@gmail.com
-  RFC4745          ||      H. Schulzrinne, H. Tschofenig, J. Morris, J. Cuellar, J. Polk, J. Rosenberg         ||       schulzrinne@cs.columbia.edu, Hannes.Tschofenig@siemens.com, jmorris@cdt.org, Jorge.Cuellar@siemens.com, jmpolk@cisco.com, jdrosen@cisco.com
-  RFC4746          ||      T. Clancy, W. Arbaugh         ||       clancy@ltsnet.net, waa@cs.umd.edu
-  RFC4747          ||      S. Kipp, G. Ramkumar, K. McCloghrie         ||       scott.kipp@mcdata.com, gramkumar@stanfordalumni.org, kzm@cisco.com
-  RFC4748          ||      S. Bradner, Ed.         ||       sob@harvard.edu
-  RFC4749          ||      A. Sollaud         ||       aurelien.sollaud@orange-ft.com
-  RFC4750          ||      D. Joyal, Ed., P. Galecki, Ed., S. Giacalone, Ed., R. Coltun, F. Baker         ||       djoyal@nortel.com, pgalecki@airvana.com, spencer.giacalone@gmail.com, fred@cisco.com
-  RFC4752          ||      A. Melnikov, Ed.         ||       Alexey.Melnikov@isode.com
-  RFC4753          ||      D. Fu, J. Solinas         ||       defu@orion.ncsc.mil, jasolin@orion.ncsc.mil
-  RFC4754          ||      D. Fu, J. Solinas         ||       defu@orion.ncsc.mil, jasolin@orion.ncsc.mil
-  RFC4755          ||      V. Kashyap         ||       vivk@us.ibm.com
-  RFC4756          ||      A. Li         ||       adamli@hyervision.com
-  RFC4757          ||      K. Jaganathan, L. Zhu, J. Brezak         ||       karthikj@microsoft.com, lzhu@microsoft.com, jbrezak@microsoft.com
-  RFC4758          ||      M. Nystroem         ||       magnus@rsasecurity.com
-  RFC4759          ||      R. Stastny, R. Shockey, L. Conroy         ||       Richard.stastny@oefeg.at, richard.shockey@neustar.biz, lconroy@insensate.co.uk
-  RFC4760          ||      T. Bates, R. Chandra, D. Katz, Y. Rekhter         ||       tbates@cisco.com, rchandra@sonoasystems.com, dkatz@juniper.com, yakov@juniper.com
-  RFC4761          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
-  RFC4762          ||      M. Lasserre, Ed., V. Kompella, Ed.         ||       mlasserre@alcatel-lucent.com, vach.kompella@alcatel-lucent.com
-  RFC4763          ||      M. Vanderveen, H. Soliman         ||       mvandervn@yahoo.com, solimanhs@gmail.com
-  RFC4764          ||      F. Bersani, H. Tschofenig         ||       bersani_florent@yahoo.fr, Hannes.Tschofenig@siemens.com
-  RFC4765          ||      H. Debar, D. Curry, B. Feinstein         ||       herve.debar@orange-ftgroup.com, david_a_curry@glic.com, feinstein@acm.org
-  RFC4766          ||      M. Wood, M. Erlinger         ||       mark1@iss.net, mike@cs.hmc.edu
-  RFC4767          ||      B. Feinstein, G. Matthews         ||       bfeinstein@acm.org, gmatthew@nas.nasa.gov
-  RFC4768          ||      S. Hartman         ||       hartmans-ietf@mit.edu
-  RFC4769          ||      J. Livingood, R. Shockey         ||       jason_livingood@cable.comcast.com, richard.shockey@neustar.biz
-  RFC4770          ||      C. Jennings, J. Reschke, Ed.         ||       fluffy@cisco.com, julian.reschke@greenbytes.de
-  RFC4771          ||      V. Lehtovirta, M. Naslund, K. Norrman         ||       vesa.lehtovirta@ericsson.com, mats.naslund@ericsson.com, karl.norrman@ericsson.com
-  RFC4772          ||      S. Kelly         ||       scott@hyperthought.com
-  RFC4773          ||      G. Huston         ||       gih@apnic.net
-  RFC4774          ||      S. Floyd         ||       floyd@icir.org
-  RFC4775          ||      S. Bradner, B. Carpenter, Ed., T. Narten         ||       sob@harvard.edu, brc@zurich.ibm.com, narten@us.ibm.com
-  RFC4776          ||      H. Schulzrinne         ||       hgs+geopriv@cs.columbia.edu
-  RFC4777          ||      T. Murphy Jr., P. Rieth, J. Stevens         ||       murphyte@us.ibm.com, rieth@us.ibm.com, jssteven@us.ibm.com
-  RFC4778          ||      M. Kaeo         ||       merike@doubleshotsecurity.com
-  RFC4779          ||      S. Asadullah, A. Ahmed, C. Popoviciu, P. Savola, J. Palet         ||       sasad@cisco.com, adahmed@cisco.com, cpopovic@cisco.com, psavola@funet.fi, jordi.palet@consulintel.es
-  RFC4780          ||      K. Lingle, J-F. Mule, J. Maeng, D. Walker         ||       klingle@cisco.com, jf.mule@cablelabs.com, jmaeng@austin.rr.com, drwalker@rogers.com
-  RFC4781          ||      Y. Rekhter, R. Aggarwal         ||        yakov@juniper.net, rahul@juniper.net
-  RFC4782          ||      S. Floyd, M. Allman, A. Jain, P. Sarolahti         ||       floyd@icir.org, mallman@icir.org, a.jain@f5.com, pasi.sarolahti@iki.fi
-  RFC4783          ||      L. Berger, Ed.         ||       lberger@labn.net
-  RFC4784          ||      C. Carroll, F. Quick         ||       Christopher.Carroll@ropesgray.com, fquick@qualcomm.com
-  RFC4785          ||      U. Blumenthal, P. Goel         ||       urimobile@optonline.net, Purushottam.Goel@intel.com
-  RFC4786          ||      J. Abley, K. Lindqvist         ||       jabley@ca.afilias.info, kurtis@kurtis.pp.se
-  RFC4787          ||      F. Audet, Ed., C. Jennings         ||       audet@nortel.com, fluffy@cisco.com
-  RFC4788          ||      Q. Xie, R. Kapoor         ||       Qiaobing.Xie@Motorola.com, rkapoor@qualcomm.com
-  RFC4789          ||      J. Schoenwaelder, T. Jeffree         ||       j.schoenwaelder@iu-bremen.de, tony@jeffree.co.uk
-  RFC4790          ||      C. Newman, M. Duerst,  A. Gulbrandsen         ||       chris.newman@sun.com, duerst@it.aoyama.ac.jp, arnt@oryx.com
-  RFC4791          ||      C. Daboo, B. Desruisseaux, L. Dusseault         ||       cyrus@daboo.name, bernard.desruisseaux@oracle.com, lisa.dusseault@gmail.com
-  RFC4792          ||      S. Legg         ||       steven.legg@eb2bcom.com
-  RFC4793          ||      M. Nystroem         ||       magnus@rsasecurity.com
-  RFC4794          ||      B. Fenner         ||       fenner@research.att.com
-  RFC4795          ||      B. Aboba, D. Thaler, L. Esibov         ||       bernarda@microsoft.com, dthaler@microsoft.com, levone@microsoft.com
-  RFC4796          ||      J. Hautakorpi, G. Camarillo         ||       Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com
-  RFC4797          ||      Y. Rekhter, R. Bonica, E. Rosen         ||       yakov@juniper.net, rbonica@juniper.net, erosen@cisco.com
-  RFC4798          ||      J. De Clercq, D. Ooms, S. Prevost, F. Le Faucheur         ||       jeremy.de_clercq@alcatel-lucent.be, dirk@onesparrow.com, stuart.prevost@bt.com, flefauch@cisco.com
-  RFC4801          ||      T. Nadeau, Ed., A. Farrel, Ed.         ||       tnadeau@cisco.com, adrian@olddog.co.uk
-  RFC4802          ||      T. Nadeau, Ed., A. Farrel,  Ed.         ||       tnadeau@cisco.com, adrian@olddog.co.uk
-  RFC4803          ||      T. Nadeau, Ed., A. Farrel, Ed.         ||       tnadeau@cisco.com, adrian@olddog.co.uk
-  RFC4804          ||      F. Le Faucheur, Ed.         ||       flefauch@cisco.com
-  RFC4805          ||      O. Nicklass, Ed.         ||       orly_n@rad.com
-  RFC4806          ||      M. Myers, H. Tschofenig         ||       mmyers@fastq.com, Hannes.Tschofenig@siemens.com
-  RFC4807          ||      M. Baer, R. Charlet, W. Hardaker, R. Story, C. Wang         ||       baerm@tislabs.com, rcharlet@alumni.calpoly.edu, hardaker@tislabs.com, rstory@ipsp.revelstone.com, cliffwangmail@yahoo.com
-  RFC4808          ||      S. Bellovin         ||       bellovin@acm.org
-  RFC4809          ||      C. Bonatti, Ed., S. Turner, Ed., G. Lebovitz, Ed.         ||       Bonattic@ieca.com, Turners@ieca.com, gregory.ietf@gmail.com
-  RFC4810          ||      C. Wallace, U. Pordesch, R. Brandner         ||       cwallace@cygnacom.com, ulrich.pordesch@zv.fraunhofer.de, ralf.brandner@intercomponentware.com
-  RFC4811          ||      L. Nguyen, A. Roy, A. Zinin         ||       lhnguyen@cisco.com, akr@cisco.com, alex.zinin@alcatel-lucent.com
-  RFC4812          ||      L. Nguyen, A. Roy, A. Zinin         ||       lhnguyen@cisco.com, akr@cisco.com, alex.zinin@alcatel-lucent.com
-  RFC4813          ||      B. Friedman, L. Nguyen, A. Roy, D. Yeung, A. Zinin         ||       friedman@cisco.com, lhnguyen@cisco.com, akr@cisco.com, myeung@cisco.com, alex.zinin@alcatel-lucent.com
-  RFC4814          ||      D. Newman, T. Player         ||       dnewman@networktest.com, timmons.player@spirent.com
-  RFC4815          ||      L-E. Jonsson, K. Sandlund, G. Pelletier, P. Kremer         ||       lars-erik.jonsson@ericsson.com, kristofer.sandlund@ericsson.com, ghyslain.pelletier@ericsson.com, peter.kremer@ericsson.com
-  RFC4816          ||      A. Malis, L. Martini, J. Brayley, T. Walsh         ||       andrew.g.malis@verizon.com, lmartini@cisco.com, jeremy.brayley@ecitele.com, twalsh@juniper.net
-  RFC4817          ||      M. Townsley, C. Pignataro, S. Wainner, T. Seely, J. Young         ||       mark@townsley.net, cpignata@cisco.com, swainner@cisco.com, tseely@sprint.net, young@jsyoung.net
-  RFC4818          ||      J. Salowey, R. Droms         ||       jsalowey@cisco.com, rdroms@cisco.com
-  RFC4819          ||      J. Galbraith, J. Van Dyke, J. Bright         ||       galb@vandyke.com, jpv@vandyke.com, jon@siliconcircus.com
-  RFC4820          ||      M. Tuexen, R. Stewart, P. Lei         ||       tuexen@fh-muenster.de, randall@lakerest.net, peterlei@cisco.com
-  RFC4821          ||      M. Mathis, J. Heffner         ||       mathis@psc.edu, jheffner@psc.edu
-  RFC4822          ||      R. Atkinson, M. Fanto         ||       rja@extremenetworks.com, mattjf@umd.edu
-  RFC4823          ||      T. Harding, R. Scott         ||       tharding@us.axway.com, rscott@us.axway.com
-  RFC4824          ||      J. Hofmueller, Ed., A. Bachmann, Ed., IO. zmoelnig, Ed.         ||       ip-sfs@mur.at, ip-sfs@mur.at, ip-sfs@mur.at
-  RFC4825          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC4826          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC4827          ||      M. Isomaki, E. Leppanen         ||       markus.isomaki@nokia.com, eva-maria.leppanen@nokia.com
-  RFC4828          ||      S. Floyd, E. Kohler         ||       floyd@icir.org, kohler@cs.ucla.edu
-  RFC4829          ||      J. de Oliveira, Ed., JP. Vasseur, Ed., L. Chen, C. Scoglio         ||       jau@ece.drexel.edu, jpv@cisco.com, leonardo.c.chen@verizon.com, caterina@eece.ksu.edu
-  RFC4830          ||      J. Kempf, Ed.         ||       kempf@docomolabs-usa.com
-  RFC4831          ||      J. Kempf, Ed.         ||       kempf@docomolabs-usa.com
-  RFC4832          ||      C. Vogt, J. Kempf         ||       chvogt@tm.uka.de, kempf@docomolabs-usa.com
-  RFC4833          ||      E. Lear, P. Eggert         ||       lear@cisco.com, eggert@cs.ucla.edu
-  RFC4834          ||      T. Morin, Ed.         ||       thomas.morin@orange-ftgroup.com
-  RFC4835          ||      V. Manral         ||       vishwas@ipinfusion.com
-  RFC4836          ||      E. Beili         ||       edward.beili@actelis.com
-  RFC4837          ||      L. Khermosh         ||       lior_khermosh@pmc-sierra.com
-  RFC4838          ||      V. Cerf, S. Burleigh, A. Hooke, L. Torgerson, R. Durst, K. Scott, K. Fall, H. Weiss         ||       vint@google.com, Scott.Burleigh@jpl.nasa.gov, Adrian.Hooke@jpl.nasa.gov, ltorgerson@jpl.nasa.gov, durst@mitre.org, kscott@mitre.org, kfall@intel.com, howard.weiss@sparta.com
-  RFC4839          ||      G. Conboy, J. Rivlin, J. Ferraiolo         ||       gc@ebooktechnologies.com, john@ebooktechnologies.com, jferrai@us.ibm.com
-  RFC4840          ||      B. Aboba, Ed., E. Davies, D. Thaler         ||       bernarda@microsoft.com, elwynd@dial.pipex.com, dthaler@microsoft.com
-  RFC4841          ||      C. Heard, Ed.         ||       heard@pobox.com
-  RFC4842          ||      A. Malis, P. Pate, R. Cohen, Ed., D. Zelig         ||       andrew.g.malis@verizon.com, prayson.pate@overturenetworks.com, ronc@resolutenetworks.com, davidz@corrigent.com
-  RFC4843          ||      P. Nikander, J. Laganier, F. Dupont         ||       pekka.nikander@nomadiclab.com, julien.ietf@laposte.net, Francis.Dupont@fdupont.fr
-  RFC4844          ||      L. Daigle, Ed., Internet Architecture Board         ||       leslie@thinkingcat.com, iab@iab.org
-  RFC4845          ||      L. Daigle, Ed., Internet Architecture Board         ||       leslie@thinkingcat.com, iab@iab.org
-  RFC4846          ||      J. Klensin, Ed., D. Thaler, Ed.         ||       john-ietf@jck.com, dthaler@microsoft.com
-  RFC4847          ||      T. Takeda, Ed.         ||       takeda.tomonori@lab.ntt.co.jp
-  RFC4848          ||      L. Daigle         ||       leslie@thinkingcat.com
-  RFC4849          ||      P. Congdon, M. Sanchez, B. Aboba         ||       paul.congdon@hp.com, mauricio.sanchez@hp.com, bernarda@microsoft.com
-  RFC4850          ||      D. Wysochanski         ||       wysochanski@pobox.com
-  RFC4851          ||      N. Cam-Winget, D. McGrew, J. Salowey, H. Zhou         ||       ncamwing@cisco.com, mcgrew@cisco.com, jsalowey@cisco.com, hzhou@cisco.com
-  RFC4852          ||      J. Bound, Y. Pouffary, S. Klynsma, T. Chown, D. Green         ||       jim.bound@hp.com, Yanick.pouffary@hp.com, tjc@ecs.soton.ac.uk, green@commandinformation.com, sklynsma@mitre.org
-  RFC4853          ||      R. Housley         ||       housley@vigilsec.com
-  RFC4854          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC4855          ||      S. Casner         ||       casner@acm.org
-  RFC4856          ||      S. Casner         ||       casner@acm.org
-  RFC4857          ||      E. Fogelstroem, A. Jonsson, C. Perkins         ||       eva.fogelstrom@ericsson.com, annika.jonsson@ericsson.com, charles.perkins@nsn.com
-  RFC4858          ||      H. Levkowetz, D. Meyer, L. Eggert, A. Mankin         ||       henrik@levkowetz.com, dmm@1-4-5.net, lars.eggert@nokia.com, mankin@psg.com
-  RFC4859          ||      A. Farrel         ||       adrian@olddog.co.uk
-  RFC4860          ||      F. Le Faucheur, B. Davie, P. Bose, C. Christou, M. Davenport         ||       flefauch@cisco.com, bds@cisco.com, pratik.bose@lmco.com, christou_chris@bah.com, davenport_michael@bah.com
-  RFC4861          ||      T. Narten, E. Nordmark, W. Simpson, H. Soliman         ||       narten@us.ibm.com, erik.nordmark@sun.com, william.allen.simpson@gmail.com, hesham@elevatemobile.com
-  RFC4862          ||      S. Thomson, T. Narten, T. Jinmei         ||       sethomso@cisco.com, narten@us.ibm.com, jinmei@isl.rdc.toshiba.co.jp
-  RFC4863          ||      L. Martini, G. Swallow         ||       lmartini@cisco.com, swallow@cisco.com
-  RFC4864          ||      G. Van de Velde, T. Hain, R. Droms, B. Carpenter, E. Klein         ||       gunter@cisco.com, alh-ietf@tndh.net, rdroms@cisco.com, brc@zurich.ibm.com, ericlklein.ipv6@gmail.com
-  RFC4865          ||      G. White, G. Vaudreuil         ||       g.a.white@comcast.net, GregV@ieee.org
-  RFC4866          ||      J. Arkko, C. Vogt, W. Haddad         ||       jari.arkko@ericsson.com, chvogt@tm.uka.de, wassim.haddad@ericsson.com
-  RFC4867          ||      J. Sjoberg, M. Westerlund, A. Lakaniemi, Q. Xie         ||       Johan.Sjoberg@ericsson.com, Magnus.Westerlund@ericsson.com, ari.lakaniemi@nokia.com, Qiaobing.Xie@motorola.com
-  RFC4868          ||      S. Kelly, S. Frankel         ||       scott@hyperthought.com, sheila.frankel@nist.gov
-  RFC4869          ||      L. Law, J. Solinas         ||       lelaw@orion.ncsc.mil, jasolin@orion.ncsc.mil
-  RFC4870          ||      M. Delany         ||       markd+domainkeys@yahoo-inc.com
-  RFC4871          ||      E. Allman, J. Callas, M. Delany, M. Libbey, J. Fenton, M. Thomas         ||       eric+dkim@sendmail.org, jon@pgp.com, markd+dkim@yahoo-inc.com, mlibbeymail-mailsig@yahoo.com, fenton@bluepopcorn.net, mat@cisco.com
-  RFC4872          ||      J.P. Lang, Ed., Y. Rekhter, Ed., D. Papadimitriou, Ed.         ||       jplang@ieee.org, yakov@juniper.net, dimitri.papadimitriou@alcatel-lucent.be
-  RFC4873          ||      L. Berger, I. Bryskin, D. Papadimitriou, A. Farrel         ||       lberger@labn.net, IBryskin@advaoptical.com, dimitri.papadimitriou@alcatel-lucent.be, adrian@olddog.co.uk
-  RFC4874          ||      CY. Lee, A. Farrel, S. De Cnodder         ||       c.yin.lee@gmail.com, adrian@olddog.co.uk, stefaan.de_cnodder@alcatel-lucent.be
-  RFC4875          ||      R. Aggarwal, Ed., D. Papadimitriou, Ed., S. Yasukawa, Ed.         ||       rahul@juniper.net, yasukawa.seisho@lab.ntt.co.jp, Dimitri.Papadimitriou@alcatel-lucent.be
-  RFC4876          ||      B. Neal-Joslin, Ed., L. Howard, M. Ansari         ||       bob_joslin@hp.com, lukeh@padl.com, morteza@infoblox.com
-  RFC4877          ||      V. Devarapalli, F. Dupont         ||       vijay.devarapalli@azairenet.com, Francis.Dupont@fdupont.fr
-  RFC4878          ||      M. Squire         ||       msquire@hatterasnetworks.com
-  RFC4879          ||      T. Narten         ||       narten@us.ibm.com
-  RFC4880          ||      J. Callas, L. Donnerhacke, H. Finney, D. Shaw, R. Thayer         ||       jon@callas.org, lutz@iks-jena.de, hal@finney.org, dshaw@jabberwocky.com, rodney@canola-jones.com
-  RFC4881          ||      K. El Malki, Ed.         ||       karim@athonet.com
-  RFC4882          ||      R. Koodli         ||       rajeev.koodli@nokia.com
-  RFC4883          ||      G. Feher, K. Nemeth, A. Korn, I. Cselenyi         ||       Gabor.Feher@tmit.bme.hu, Krisztian.Nemeth@tmit.bme.hu, Andras.Korn@tmit.bme.hu, Istvan.Cselenyi@teliasonera.com
-  RFC4884          ||      R. Bonica, D. Gan, D. Tappan, C. Pignataro         ||       rbonica@juniper.net, derhwagan@yahoo.com, Dan.Tappan@gmail.com, cpignata@cisco.com
-  RFC4885          ||      T. Ernst, H-Y. Lach         ||       thierry.ernst@inria.fr, hong-yon.lach@motorola.com
-  RFC4886          ||      T. Ernst         ||       thierry.ernst@inria.fr
-  RFC4887          ||      P. Thubert, R. Wakikawa, V. Devarapalli         ||       pthubert@cisco.com, ryuji@sfc.wide.ad.jp, vijay.devarapalli@azairenet.com
-  RFC4888          ||      C. Ng, P. Thubert, M. Watari, F. Zhao         ||       chanwah.ng@sg.panasonic.com, pthubert@cisco.com, watari@kddilabs.jp, fanzhao@ucdavis.edu
-  RFC4889          ||      C. Ng, F. Zhao, M. Watari, P. Thubert         ||       chanwah.ng@sg.panasonic.com, fanzhao@ucdavis.edu, watari@kddilabs.jp, pthubert@cisco.com
-  RFC4890          ||      E. Davies, J. Mohacsi         ||       elwynd@dial.pipex.com, mohacsi@niif.hu
-  RFC4891          ||      R. Graveman, M. Parthasarathy, P. Savola, H. Tschofenig         ||       rfg@acm.org, mohanp@sbcglobal.net, psavola@funet.fi, Hannes.Tschofenig@nsn.com
-  RFC4892          ||      S. Woolf, D. Conrad         ||       woolf@isc.org, david.conrad@icann.org
-  RFC4893          ||      Q. Vohra, E. Chen         ||       quaizar.vohra@gmail.com, enkechen@cisco.com
-  RFC4894          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC4895          ||      M. Tuexen, R. Stewart, P. Lei, E. Rescorla         ||       tuexen@fh-muenster.de, randall@lakerest.net, peterlei@cisco.com, ekr@rtfm.com
-  RFC4896          ||      A. Surtees, M. West, A.B. Roach         ||       abigail.surtees@roke.co.uk, mark.a.west@roke.co.uk, adam@estacado.net
-  RFC4897          ||      J. Klensin, S. Hartman         ||       john-ietf@jck.com, hartmans-ietf@mit.edu
-  RFC4898          ||      M. Mathis, J. Heffner, R. Raghunarayan         ||       mathis@psc.edu, jheffner@psc.edu, raraghun@cisco.com
-  RFC4901          ||      J. Ash, Ed., J. Hand, Ed., A. Malis, Ed.         ||       gash5107@yahoo.com, jameshand@att.com, andrew.g.malis@verizon.com
-  RFC4902          ||      M. Stecher         ||        martin.stecher@webwasher.com
-  RFC4903          ||      D. Thaler         ||       dthaler@microsoft.com
-  RFC4904          ||      V. Gurbani, C. Jennings         ||       vkg@alcatel-lucent.com, fluffy@cisco.com
-  RFC4905          ||      L. Martini, Ed., E. Rosen, Ed., N. El-Aawar, Ed.         ||       lmartini@cisco.com, erosen@cisco.com, nna@level3.net
-  RFC4906          ||      L. Martini, Ed., E. Rosen, Ed., N. El-Aawar, Ed.         ||       lmartini@cisco.com, erosen@cisco.com, nna@level3.net
-  RFC4907          ||      B. Aboba, Ed.         ||       bernarda@microsoft.com
-  RFC4908          ||      K. Nagami, S. Uda, N. Ogashiwa, H. Esaki, R. Wakikawa, H. Ohnishi         ||       nagami@inetcore.com, zin@jaist.ac.jp, ogashiwa@wide.ad.jp, hiroshi@wide.ad.jp, ryuji@sfc.wide.ad.jp, ohnishi.hiroyuki@lab.ntt.co.jp
-  RFC4909          ||      L. Dondeti, Ed., D. Castleford, F. Hartung         ||       ldondeti@qualcomm.com, david.castleford@orange-ftgroup.com, frank.hartung@ericsson.com
-  RFC4910          ||      S. Legg, D. Prager         ||       steven.legg@eb2bcom.com, dap@austhink.com
-  RFC4911          ||      S. Legg         ||       steven.legg@eb2bcom.com
-  RFC4912          ||      S. Legg         ||       steven.legg@eb2bcom.com
-  RFC4913          ||      S. Legg         ||       steven.legg@eb2bcom.com
-  RFC4914          ||      S. Legg         ||       steven.legg@eb2bcom.com
-  RFC4915          ||      P. Psenak, S. Mirtorabi, A. Roy, L. Nguyen, P. Pillay-Esnault         ||       ppsenak@cisco.com, sina@force10networks.com, akr@cisco.com, lhnguyen@cisco.com, ppe@cisco.com
-  RFC4916          ||      J. Elwell         ||       john.elwell@siemens.com
-  RFC4917          ||      V. Sastry, K. Leung, A. Patel         ||       venkat.s@samsung.com, kleung@cisco.com, alpesh@cisco.com
-  RFC4918          ||      L. Dusseault, Ed.         ||       lisa.dusseault@gmail.com
-  RFC4919          ||      N. Kushalnagar, G. Montenegro, C. Schumacher         ||       nandakishore.kushalnagar@intel.com, gabriel.montenegro@microsoft.com, schumacher@danfoss.com
-  RFC4920          ||      A. Farrel, Ed., A. Satyanarayana, A. Iwata, N. Fujita, G. Ash         ||       adrian@olddog.co.uk, asatyana@cisco.com, a-iwata@ah.jp.nec.com, n-fujita@bk.jp.nec.com, gash5107@yahoo.com
-  RFC4923          ||      F. Baker, P. Bose         ||       fred@cisco.com, pratik.bose@lmco.com
-  RFC4924          ||      B. Aboba, Ed., E. Davies         ||       bernarda@microsoft.com, elwynd@dial.pipex.com
-  RFC4925          ||      X. Li, Ed., S. Dawkins, Ed., D. Ward, Ed., A. Durand, Ed.         ||       xing@cernet.edu.cn, spencer@mcsr-labs.org, dward@cisco.com, alain_durand@cable.comcast.com
-  RFC4926          ||      T.Kalin, M.Molina         ||       tomaz.kalin@dante.org.uk, maurizio.molina@dante.org.uk
-  RFC4927          ||      J.-L. Le Roux, Ed.         ||       jeanlouis.leroux@orange-ftgroup.com
-  RFC4928          ||      G. Swallow, S. Bryant, L. Andersson         ||       stbryant@cisco.com, swallow@cisco.com, loa@pi.se
-  RFC4929          ||      L. Andersson, Ed., A. Farrel, Ed.         ||       loa@pi.se, adrian@olddog.co.uk
-  RFC4930          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC4931          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC4932          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC4933          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC4934          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC4935          ||      C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai         ||       cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com
-  RFC4936          ||      C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai         ||       cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com
-  RFC4937          ||      P. Arberg, V. Mammoliti         ||       parberg@redback.com, vince@cisco.com
-  RFC4938          ||      B. Berry, H. Holgate         ||       bberry@cisco.com, hholgate@cisco.com
-  RFC4939          ||      K. Gibbons, G. Ramkumar, S. Kipp         ||       kgibbons@yahoo.com, gramkumar@stanfordalumni.org, skipp@brocade.com
-  RFC4940          ||      K. Kompella, B. Fenner         ||       kireeti@juniper.net, fenner@research.att.com
-  RFC4941          ||      T. Narten, R. Draves, S. Krishnan         ||       narten@us.ibm.com, richdr@microsoft.com, suresh.krishnan@ericsson.com
-  RFC4942          ||      E. Davies, S. Krishnan, P. Savola         ||       elwynd@dial.pipex.com, suresh.krishnan@ericsson.com, psavola@funet.fi
-  RFC4943          ||      S. Roy, A. Durand, J. Paugh         ||       sebastien.roy@sun.com, alain_durand@cable.comcast.com, jim.paugh@nominum.com
-  RFC4944          ||      G. Montenegro, N. Kushalnagar, J. Hui, D. Culler         ||       gabriel.montenegro@microsoft.com, nandakishore.kushalnagar@intel.com, jhui@archrock.com, dculler@archrock.com
-  RFC4945          ||      B. Korver         ||       briank@networkresonance.com
-  RFC4946          ||      J. Snell         ||       jasnell@gmail.com
-  RFC4947          ||      G. Fairhurst, M. Montpetit         ||       gorry@erg.abdn.ac.uk, mmontpetit@motorola.com
-  RFC4948          ||      L. Andersson, E. Davies, L. Zhang         ||       loa@pi.se, elwynd@dial.pipex.com, lixia@cs.ucla.edu
-  RFC4949          ||      R. Shirey         ||       rwshirey4949@verizon.net
-  RFC4950          ||      R. Bonica, D. Gan, D. Tappan, C. Pignataro         ||       rbonica@juniper.net, derhwagan@yahoo.com, dan.tappan@gmail.com, cpignata@cisco.com
-  RFC4951          ||      V. Jain, Ed.         ||       vipinietf@yahoo.com
-  RFC4952          ||      J. Klensin, Y. Ko         ||       john-ietf@jck.com, yw@mrko.pe.kr
-  RFC4953          ||      J. Touch         ||       touch@isi.edu
-  RFC4954          ||      R. Siemborski, Ed., A. Melnikov, Ed.         ||       robsiemb@google.com, Alexey.Melnikov@isode.com
-  RFC4955          ||      D. Blacka         ||       davidb@verisign.com
-  RFC4956          ||      R. Arends, M. Kosters, D. Blacka         ||       roy@nominet.org.uk, markk@verisign.com, davidb@verisign.com
-  RFC4957          ||      S. Krishnan, Ed., N. Montavont, E. Njedjou, S. Veerepalli, A. Yegin, Ed.         ||       suresh.krishnan@ericsson.com, nicolas.montavont@enst-bretagne.fr, eric.njedjou@orange-ftgroup.com, sivav@qualcomm.com, a.yegin@partner.samsung.com
-  RFC4958          ||      K. Carlberg         ||       carlberg@g11.org.uk
-  RFC4959          ||      R. Siemborski, A. Gulbrandsen         ||       robsiemb@google.com, arnt@oryx.com
-  RFC4960          ||      R. Stewart, Ed.         ||       randall@lakerest.net
-  RFC4961          ||      D. Wing         ||       dwing-ietf@fuggles.com
-  RFC4962          ||      R. Housley, B. Aboba         ||       housley@vigilsec.com, bernarda@microsoft.com
-  RFC4963          ||      J. Heffner, M. Mathis, B. Chandler         ||       jheffner@psc.edu, mathis@psc.edu, bchandle@gmail.com
-  RFC4964          ||      A. Allen, Ed., J. Holm, T. Hallin         ||       aallen@rim.com, Jan.Holm@ericsson.com, thallin@motorola.com
-  RFC4965          ||      J-F. Mule, W. Townsley         ||       jf.mule@cablelabs.com, mark@townsley.net
-  RFC4966          ||      C. Aoun, E. Davies         ||       ietf@energizeurnet.com, elwynd@dial.pipex.com
-  RFC4967          ||      B. Rosen         ||       br@brianrosen.net
-  RFC4968          ||      S. Madanapalli, Ed.         ||       smadanapalli@gmail.com
-  RFC4969          ||      A. Mayrhofer         ||       alexander.mayrhofer@enum.at
-  RFC4970          ||      A. Lindem, Ed., N. Shen, JP. Vasseur, R. Aggarwal, S. Shaffer         ||       acee@redback.com, naiming@cisco.com, jpv@cisco.com, rahul@juniper.net, sshaffer@bridgeport-networks.com
-  RFC4971          ||      JP. Vasseur, Ed., N. Shen, Ed., R. Aggarwal, Ed.         ||       jpv@cisco.com, naiming@cisco.com, rahul@juniper.net
-  RFC4972          ||      JP. Vasseur, Ed., JL. Leroux, Ed., S. Yasukawa, S. Previdi, P. Psenak, P. Mabbey         ||       jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com, s.yasukawa@hco.ntt.co.jp, sprevidi@cisco.com, ppsenak@cisco.com, Paul_Mabey@cable.comcast.com
-  RFC4973          ||      P. Srisuresh, P. Joseph         ||       srisuresh@yahoo.com, paul_95014@yahoo.com
-  RFC4974          ||      D. Papadimitriou, A. Farrel         ||       dimitri.papadimitriou@alcatel-lucent.be, adrian@olddog.co.uk
-  RFC4975          ||      B. Campbell, Ed., R. Mahy, Ed., C. Jennings, Ed.         ||       ben@estacado.net, rohan@ekabal.com, fluffy@cisco.com
-  RFC4976          ||      C. Jennings, R. Mahy, A. B. Roach         ||       fluffy@cisco.com, rohan@ekabal.com, adam@estacado.net
-  RFC4977          ||      G. Tsirtsis, H. Soliman         ||       tsirtsis@qualcomm.com, hesham@elevatemobile.com
-  RFC4978          ||      A. Gulbrandsen         ||       arnt@oryx.com
-  RFC4979          ||      A. Mayrhofer         ||       alexander.mayrhofer@enum.at
-  RFC4980          ||      C. Ng, T. Ernst, E. Paik, M. Bagnulo         ||       chanwah.ng@sg.panasonic.com, thierry.ernst@inria.fr, euna@kt.co.kr, marcelo@it.uc3m.es
-  RFC4981          ||      J. Risson, T. Moors         ||       jr@tuffit.com, t.moors@unsw.edu.au
-  RFC4982          ||      M. Bagnulo, J. Arkko         ||       marcelo@it.uc3m.es, jari.arkko@ericsson.com
-  RFC4983          ||      C. DeSanti, H.K. Vivek, K. McCloghrie, S. Gai         ||       cds@cisco.com, hvivek@cisco.com, kzm@cisco.com, sgai@nuovasystems.com
-  RFC4984          ||      D. Meyer, Ed., L. Zhang, Ed., K. Fall, Ed.         ||       dmm@1-4-5.net, lixia@cs.ucla.edu, kfall@intel.com
-  RFC4985          ||      S. Santesson         ||       stefans@microsoft.com
-  RFC4986          ||      H. Eland, R. Mundy, S. Crocker, S. Krishnaswamy         ||       heland@afilias.info, mundy@sparta.com, steve@shinkuro.com, suresh@sparta.com
-  RFC4987          ||      W. Eddy         ||       weddy@grc.nasa.gov
-  RFC4988          ||      R. Koodli, C. Perkins         ||       rajeev.koodli@nokia.com, charles.perkins@nokia.com
-  RFC4990          ||      K. Shiomoto, R. Papneja, R. Rabbat         ||       shiomoto.kohei@lab.ntt.co.jp, rabbat@alum.mit.edu, rpapneja@isocore.com
-  RFC4991          ||      A. Newton         ||       andy@hxr.us
-  RFC4992          ||      A. Newton         ||       andy@hxr.us
-  RFC4993          ||      A. Newton         ||       andy@hxr.us
-  RFC4994          ||      S. Zeng, B. Volz, K. Kinnear, J. Brzozowski         ||       szeng@cisco.com, volz@cisco.com, kkinnear@cisco.com, john_brzozowski@cable.comcast.com
-  RFC4995          ||      L-E. Jonsson, G. Pelletier, K. Sandlund         ||       lars-erik@lejonsson.com, ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com
-  RFC4996          ||      G. Pelletier, K. Sandlund, L-E. Jonsson, M. West         ||       ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com, lars-erik@lejonsson.com, mark.a.west@roke.co.uk
-  RFC4997          ||      R. Finking, G. Pelletier         ||       robert.finking@roke.co.uk, ghyslain.pelletier@ericsson.com
-  RFC4998          ||      T. Gondrom, R. Brandner, U. Pordesch         ||       tobias.gondrom@opentext.com, ralf.brandner@intercomponentware.com, ulrich.pordesch@zv.fraunhofer.de
-  RFC5000          ||      RFC Editor         ||       rfc-editor@rfc-editor.org
-  RFC5001          ||      R. Austein         ||       sra@isc.org
-  RFC5002          ||      G. Camarillo, G. Blanco         ||       Gonzalo.Camarillo@ericsson.com, German.Blanco@ericsson.com
-  RFC5003          ||      C. Metz, L. Martini, F. Balus, J. Sugimoto         ||       chmetz@cisco.com, lmartini@cisco.com, florin.balus@alcatel-lucent.com, sugimoto@nortel.com
-  RFC5004          ||      E. Chen, S. Sangli         ||       enkechen@cisco.com, rsrihari@cisco.com
-  RFC5005          ||      M. Nottingham         ||       mnot@pobox.com
-  RFC5006          ||      J. Jeong, Ed., S. Park, L. Beloeil, S. Madanapalli         ||       jjeong@cs.umn.edu, soohong.park@samsung.com, luc.beloeil@orange-ftgroup.com, smadanapalli@gmail.com
-  RFC5007          ||      J. Brzozowski, K. Kinnear, B. Volz, S. Zeng         ||       john_brzozowski@cable.comcast.com, kkinnear@cisco.com, volz@cisco.com, szeng@cisco.com
-  RFC5008          ||      R. Housley, J. Solinas         ||       housley@vigilsec.com, jasolin@orion.ncsc.mil
-  RFC5009          ||      R. Ejza         ||       ejzak@alcatel-lucent.com
-  RFC5010          ||      K. Kinnear, M. Normoyle, M. Stapp         ||       kkinnear@cisco.com, mnormoyle@cisco.com, mjs@cisco.com
-  RFC5011          ||      M. StJohns         ||       mstjohns@comcast.net
-  RFC5012          ||      H. Schulzrinne, R. Marshall, Ed.         ||       hgs+ecrit@cs.columbia.edu, rmarshall@telecomsys.com
-  RFC5013          ||      J. Kunze, T. Baker         ||       jak@ucop.edu, tbaker@tbaker.de
-  RFC5014          ||      E. Nordmark, S. Chakrabarti, J. Laganier         ||       Erik.Nordmark@Sun.com, samitac2@gmail.com, julien.IETF@laposte.net
-  RFC5015          ||      M. Handley, I. Kouvelas, T. Speakman, L. Vicisano         ||       M.Handley@cs.ucl.ac.uk, kouvelas@cisco.com, speakman@cisco.com, lorenzo@digitalfountain.com
-  RFC5016          ||      M. Thomas         ||       mat@cisco.com
-  RFC5017          ||      D. McWalter, Ed.         ||       dmcw@dataconnection.com
-  RFC5018          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC5019          ||      A. Deacon, R. Hurst         ||       alex@verisign.com, rmh@microsoft.com
-  RFC5020          ||      K. Zeilenga         ||       Kurt.Zeilenga@Isode.COM
-  RFC5021          ||      S. Josefsson         ||       simon@josefsson.org
-  RFC5022          ||      J. Van Dyke, E. Burger, Ed., A. Spitzer         ||       jvandyke@cantata.com, eburger@standardstrack.com, woof@pingtel.com
-  RFC5023          ||      J. Gregorio, Ed., B. de hOra, Ed.         ||       joe@bitworking.org, bill@dehora.net
-  RFC5024          ||      I. Friend         ||       ieuan.friend@dip.co.uk
-  RFC5025          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC5026          ||      G. Giaretta, Ed., J. Kempf, V. Devarapalli, Ed.         ||       gerardog@qualcomm.com, kempf@docomolabs-usa.com, vijay.devarapalli@azairenet.com
-  RFC5027          ||      F. Andreasen, D. Wing         ||       fandreas@cisco.com, dwing-ietf@fuggles.com
-  RFC5028          ||      R. Mahy         ||       rohan@ekabal.com
-  RFC5029          ||      JP. Vasseur, S. Previdi         ||       jpv@cisco.com, sprevidi@cisco.com
-  RFC5030          ||      M. Nakhjiri, Ed., K. Chowdhury, A. Lior, K. Leung         ||       madjid.nakhjiri@motorola.com, kchowdhury@starentnetworks.com, avi@bridgewatersystems.com, kleung@cisco.com
-  RFC5031          ||      H. Schulzrinne         ||       hgs+ecrit@cs.columbia.edu
-  RFC5032          ||      E. Burger, Ed.         ||       eric.burger@bea.com
-  RFC5033          ||      S. Floyd, M. Allman         ||       floyd@icir.org, mallman@icir.org
-  RFC5034          ||      R. Siemborski, A. Menon-Sen         ||       robsiemb@google.com, ams@oryx.com
-  RFC5035          ||      J. Schaad         ||       jimsch@exmsft.com
-  RFC5036          ||      L. Andersson, Ed., I. Minei, Ed., B. Thomas, Ed.         ||       loa@pi.se, ina@juniper.net, rhthomas@cisco.com
-  RFC5037          ||      L. Andersson, Ed., I. Minei, Ed., B. Thomas, Ed.         ||       loa@pi.se, ina@juniper.net, rhthomas@cisco.com
-  RFC5038          ||      B. Thomas, L. Andersson         ||       loa@pi.se, rhthomas@cisco.com
-  RFC5039          ||      J. Rosenberg, C. Jennings         ||       jdrosen@cisco.com, fluffy@cisco.com
-  RFC5040          ||      R. Recio, B. Metzler, P. Culley, J. Hilland, D. Garcia         ||       recio@us.ibm.com, bmt@zurich.ibm.com, paul.culley@hp.com, jeff.hilland@hp.com, Dave.Garcia@StanfordAlumni.org
-  RFC5041          ||      H. Shah, J. Pinkerton, R. Recio, P. Culley         ||       hemal@broadcom.com, jpink@microsoft.com, recio@us.ibm.com, paul.culley@hp.com
-  RFC5042          ||      J. Pinkerton, E. Deleganes         ||       jpink@windows.microsoft.com, deleganes@yahoo.com
-  RFC5043          ||      C. Bestler, Ed., R. Stewart, Ed.         ||       caitlin.bestler@neterion.com, randall@lakerest.net
-  RFC5044          ||      P. Culley, U. Elzur, R. Recio, S. Bailey, J. Carrier         ||       paul.culley@hp.com, uri@broadcom.com, recio@us.ibm.com, steph@sandburst.com, carrier@cray.com
-  RFC5045          ||      C. Bestler, Ed., L. Coene         ||       caitlin.bestler@neterion.com, lode.coene@nsn.com
-  RFC5046          ||      M. Ko, M. Chadalapaka, J. Hufferd, U. Elzur, H. Shah, P. Thaler         ||       mako@us.ibm.com, cbm@rose.hp.com, jhufferd@brocade.com, Uri@Broadcom.com, hemal@broadcom.com, pthaler@broadcom.com
-  RFC5047          ||      M. Chadalapaka, J. Hufferd, J. Satran, H. Shah         ||       cbm@rose.hp.com, jhufferd@brocade.com, Julian_Satran@il.ibm.com, hemal@broadcom.com
-  RFC5048          ||      M. Chadalapaka, Ed.         ||       cbm@rose.hp.com
-  RFC5049          ||      C. Bormann, Z. Liu, R. Price, G. Camarillo, Ed.         ||       cabo@tzi.org, zhigang.c.liu@nokia.com, richard.price@eads.com, Gonzalo.Camarillo@ericsson.com
-  RFC5050          ||      K. Scott, S. Burleigh         ||       kscott@mitre.org, Scott.Burleigh@jpl.nasa.gov
-  RFC5051          ||      M. Crispin         ||       MRC@CAC.Washington.EDU
-  RFC5052          ||      M. Watson, M. Luby, L. Vicisano         ||       mark@digitalfountain.com, luby@digitalfountain.com, lorenzo@digitalfountain.com
-  RFC5053          ||      M. Luby, A. Shokrollahi, M. Watson, T. Stockhammer         ||       luby@digitalfountain.com, amin.shokrollahi@epfl.ch, mark@digitalfountain.com, stockhammer@nomor.de
-  RFC5054          ||      D. Taylor, T. Wu, N. Mavrogiannopoulos, T. Perrin         ||       dtaylor@gnutls.org, thomwu@cisco.com, nmav@gnutls.org, trevp@trevp.net
-  RFC5055          ||      T. Freeman, R. Housley, A. Malpani, D. Cooper, W. Polk         ||       trevorf@microsoft.com, housley@vigilsec.com, ambarish@yahoo.com, david.cooper@nist.gov, wpolk@nist.gov
-  RFC5056          ||      N. Williams         ||       Nicolas.Williams@sun.com
-  RFC5057          ||      R. Sparks         ||       RjS@estacado.net
-  RFC5058          ||      R. Boivie, N. Feldman, Y. Imai, W. Livens, D. Ooms         ||       rhboivie@us.ibm.com, nkfeldman@yahoo.com, ug@xcast.jp, wim@livens.net, dirk@onesparrow.com
-  RFC5059          ||      N. Bhaskar, A. Gall, J. Lingard, S. Venaas         ||       nidhi@arastra.com, alexander.gall@switch.ch, jchl@arastra.com, venaas@uninett.no
-  RFC5060          ||      R. Sivaramu, J. Lingard, D. McWalter, B. Joshi, A. Kessler         ||       raghava@cisco.com, jchl@arastra.com, dmcw@dataconnection.com, bharat_joshi@infosys.com, kessler@cisco.com
-  RFC5061          ||      R. Stewart, Q. Xie, M. Tuexen, S. Maruyama, M. Kozuka         ||       randall@lakerest.net, Qiaobing.Xie@motorola.com, tuexen@fh-muenster.de, mail@marushin.gr.jp, ma-kun@kozuka.jp
-  RFC5062          ||      R. Stewart, M. Tuexen, G. Camarillo         ||       randall@lakerest.net, tuexen@fh-muenster.de, Gonzalo.Camarillo@ericsson.com
-  RFC5063          ||      A. Satyanarayana, Ed., R. Rahman, Ed.         ||       asatyana@cisco.com, rrahman@cisco.com
-  RFC5064          ||      M. Duerst         ||       duerst@it.aoyama.ac.jp
-  RFC5065          ||      P. Traina, D. McPherson, J. Scudder         ||       bgp-confederations@st04.pst.org, danny@arbor.net, jgs@juniper.net
-  RFC5066          ||      E. Beili         ||       edward.beili@actelis.com
-  RFC5067          ||      S. Lind, P. Pfautz         ||       sdlind@att.com, ppfautz@att.com
-  RFC5068          ||      C. Hutzler, D. Crocker, P. Resnick, E. Allman, T. Finch         ||       cdhutzler@aol.com, dcrocker@bbiw.net, presnick@qti.qualcomm.com, eric+ietf-smtp@sendmail.org, dot@dotat.at
-  RFC5069          ||      T. Taylor, Ed., H. Tschofenig, H. Schulzrinne, M. Shanmugam         ||       tom.taylor.stds@gmail.com, Hannes.Tschofenig@nsn.com, hgs+ecrit@cs.columbia.edu, murugaraj.shanmugam@detecon.com
-  RFC5070          ||      R. Danyliw, J. Meijer, Y. Demchenko         ||       rdd@cert.org, jan@flyingcloggies.nl, demch@chello.nl
-  RFC5071          ||      D. Hankins         ||       David_Hankins@isc.org
-  RFC5072          ||      S. Varada, Ed., D. Haskins, E. Allen         ||       varada@txc.com
-  RFC5073          ||      J.P. Vasseur, Ed., J.L. Le Roux, Ed.         ||       jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com
-  RFC5074          ||      S. Weiler         ||       weiler@tislabs.com
-  RFC5075          ||      B. Haberman, Ed., R. Hinden         ||       brian@innovationslab.net, bob.hinden@gmail.com
-  RFC5076          ||      B. Hoeneisen         ||       hoeneisen@switch.ch
-  RFC5077          ||      J. Salowey, H. Zhou, P. Eronen, H. Tschofenig         ||       jsalowey@cisco.com, hzhou@cisco.com, pe@iki.fi, Hannes.Tschofenig@nsn.com
-  RFC5078          ||      S. Dawkins         ||       spencer@mcsr-labs.org
-  RFC5079          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC5080          ||      D. Nelson, A. DeKok         ||       dnelson@elbrysnetworks.com, aland@freeradius.org
-  RFC5081          ||      N. Mavrogiannopoulos         ||       nmav@gnutls.org
-  RFC5082          ||      V. Gill, J. Heasley, D. Meyer, P. Savola, Ed., C. Pignataro         ||       vijay@umbc.edu, heas@shrubbery.net, dmm@1-4-5.net, psavola@funet.fi, cpignata@cisco.com
-  RFC5083          ||      R. Housley         ||       housley@vigilsec.com
-  RFC5084          ||      R. Housley         ||       housley@vigilsec.com
-  RFC5085          ||      T. Nadeau, Ed., C. Pignataro, Ed.         ||       tnadeau@lucidvision.com, cpignata@cisco.com
-  RFC5086          ||      A. Vainshtein, Ed., I. Sasson, E. Metz, T. Frost, P. Pate         ||       sasha@axerra.com, israel@axerra.com, e.t.metz@telecom.tno.nl, tfrost@symmetricom.com, prayson.pate@overturenetworks.com
-  RFC5087          ||      Y(J). Stein, R. Shashoua, R. Insler, M. Anavi         ||       yaakov_s@rad.com, ronen_s@rad.com, ron_i@rad.com, motty@radusa.com
-  RFC5088          ||      JL. Le Roux, Ed., JP. Vasseur, Ed., Y. Ikejiri, R. Zhang         ||       jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, y.ikejiri@ntt.com, raymond.zhang@bt.com
-  RFC5089          ||      JL. Le Roux, Ed., JP. Vasseur, Ed., Y. Ikejiri, R. Zhang         ||       jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, y.ikejiri@ntt.com, raymond.zhang@bt.com
-  RFC5090          ||      B. Sterman, D. Sadolevsky, D. Schwartz, D. Williams, W. Beck         ||       baruch@kayote.com, dscreat@dscreat.com, david@kayote.com, dwilli@cisco.com, beckw@t-systems.com
-  RFC5091          ||      X. Boyen, L. Martin         ||       xavier@voltage.com, martin@voltage.com
-  RFC5092          ||      A. Melnikov, Ed., C. Newman         ||       Alexey.Melnikov@isode.com, chris.newman@sun.com
-  RFC5093          ||      G. Hunt         ||       geoff.hunt@bt.com
-  RFC5094          ||      V. Devarapalli, A. Patel, K. Leung         ||       vijay.devarapalli@azairenet.com, alpesh@cisco.com, kleung@cisco.com
-  RFC5095          ||      J. Abley, P. Savola, G. Neville-Neil         ||       jabley@ca.afilias.info, psavola@funet.fi, gnn@neville-neil.com
-  RFC5096          ||      V. Devarapalli         ||       vijay.devarapalli@azairenet.com
-  RFC5097          ||      G. Renker, G. Fairhurst         ||       gerrit@erg.abdn.ac.uk, gorry@erg.abdn.ac.uk
-  RFC5098          ||      G. Beacham, S. Kumar, S. Channabasappa         ||       gordon.beacham@motorola.com, satish.kumar@ti.com, Sumanth@cablelabs.com
-  RFC5101          ||      B. Claise, Ed.         ||       bclaise@cisco.com
-  RFC5102          ||      J. Quittek, S. Bryant, B. Claise, P. Aitken, J. Meyer         ||       quittek@netlab.nec.de, stbryant@cisco.com, bclaise@cisco.com, paitken@cisco.com, jemeyer@paypal.com
-  RFC5103          ||      B. Trammell, E. Boschi         ||       bht@cert.org, elisa.boschi@hitachi-eu.com
-  RFC5104          ||      S. Wenger, U. Chandra, M. Westerlund, B. Burman         ||       stewe@stewe.org, Umesh.1.Chandra@nokia.com, magnus.westerlund@ericsson.com, bo.burman@ericsson.com
-  RFC5105          ||      O. Lendl         ||       otmar.lendl@enum.at
-  RFC5106          ||      H. Tschofenig, D. Kroeselberg, A. Pashalidis, Y. Ohba, F. Bersani         ||       Hannes.Tschofenig@nsn.com, Dirk.Kroeselberg@nsn.com, pashalidis@nw.neclab.eu, yohba@tari.toshiba.com, florent.ftrd@gmail.com
-  RFC5107          ||      R. Johnson, J. Kumarasamy, K. Kinnear, M. Stapp         ||       raj@cisco.com, jayk@cisco.com, kkinnear@cisco.com, mjs@cisco.com
-  RFC5109          ||      A. Li, Ed.         ||       adamli@hyervision.com
-  RFC5110          ||      P. Savola         ||       psavola@funet.fi
-  RFC5111          ||      B. Aboba, L. Dondeti         ||       bernarda@microsoft.com, ldondeti@qualcomm.com
-  RFC5112          ||      M. Garcia-Martin         ||       miguel.garcia@nsn.com
-  RFC5113          ||      J. Arkko, B. Aboba, J. Korhonen, Ed., F. Bari         ||       jari.arkko@ericsson.com, bernarda@microsoft.com, jouni.korhonen@teliasonera.com, farooq.bari@att.com
-  RFC5114          ||      M. Lepinski, S. Kent         ||       mlepinski@bbn.com, kent@bbn.com
-  RFC5115          ||      K. Carlberg, P. O'Hanlon         ||       carlberg@g11.org.uk, p.ohanlon@cs.ucl.ac.uk
-  RFC5116          ||      D. McGrew         ||       mcgrew@cisco.com
-  RFC5117          ||      M. Westerlund, S. Wenger         ||       magnus.westerlund@ericsson.com, stewe@stewe.org
-  RFC5118          ||      V. Gurbani, C. Boulton, R. Sparks         ||       vkg@alcatel-lucent.com, cboulton@ubiquitysoftware.com, RjS@estacado.net
-  RFC5119          ||      T. Edwards         ||       thomas.edwards@fox.com
-  RFC5120          ||      T. Przygienda, N. Shen, N. Sheth         ||       prz@net4u.ch, naiming@cisco.com, nsheth@juniper.net
-  RFC5121          ||      B. Patil, F. Xia, B. Sarikaya, JH. Choi, S. Madanapalli         ||       basavaraj.patil@nsn.com, xiayangsong@huawei.com, sarikaya@ieee.org, jinchoe@samsung.com, smadanapalli@gmail.com
-  RFC5122          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC5123          ||      R. White, B. Akyol         ||       riw@cisco.com, bora@cisco.com
-  RFC5124          ||      J. Ott, E. Carrara         ||       jo@comnet.tkk.fi, carrara@kth.se
-  RFC5125          ||      T. Taylor         ||       tom.taylor.stds@gmail.com
-  RFC5126          ||      D. Pinkas, N. Pope, J. Ross         ||       Denis.Pinkas@bull.net, nick.pope@thales-esecurity.com, ross@secstan.com
-  RFC5127          ||      K. Chan, J. Babiarz, F. Baker         ||       khchan@nortel.com, babiarz@nortel.com, fred@cisco.com
-  RFC5128          ||      P. Srisuresh, B. Ford, D. Kegel         ||       srisuresh@yahoo.com, baford@mit.edu, dank06@kegel.com
-  RFC5129          ||      B. Davie, B. Briscoe, J. Tay         ||       bsd@cisco.com, bob.briscoe@bt.com, june.tay@bt.com
-  RFC5130          ||      S. Previdi, M. Shand, Ed., C. Martin         ||       sprevidi@cisco.com, mshand@cisco.com, chris@ipath.net
-  RFC5131          ||      D. McWalter, Ed.         ||       dmcw@dataconnection.com
-  RFC5132          ||      D. McWalter, D. Thaler, A. Kessler         ||       dmcw@dataconnection.com, dthaler@windows.microsoft.com, kessler@cisco.com
-  RFC5133          ||      M. Tuexen, K. Morneault         ||       tuexen@fh-muenster.de, kmorneau@cisco.com
-  RFC5134          ||      M. Mealling         ||       michael@refactored-networks.com
-  RFC5135          ||      D. Wing, T. Eckert         ||       dwing-ietf@fuggles.com, eckert@cisco.com
-  RFC5136          ||      P. Chimento, J. Ishac         ||       Philip.Chimento@jhuapl.edu, jishac@nasa.gov
-  RFC5137          ||      J. Klensin         ||       john-ietf@jck.com
-  RFC5138          ||      S. Cox         ||       Simon.Cox@csiro.au
-  RFC5139          ||      M. Thomson, J. Winterbottom         ||       martin.thomson@andrew.com, james.winterbottom@andrew.com
-  RFC5140          ||      M. Bangalore, R. Kumar, J. Rosenberg, H. Salama, D.N. Shah         ||       manjax@cisco.com, rajneesh@cisco.com, jdrosen@cisco.com, hsalama@citexsoftware.com, dhaval@moowee.tv
-  RFC5141          ||      J. Goodwin, H. Apel         ||       goodwin@iso.org, apel@iso.org
-  RFC5142          ||      B. Haley, V. Devarapalli, H. Deng, J. Kempf         ||       brian.haley@hp.com, vijay.devarapalli@azairenet.com, kempf@docomolabs-usa.com, denghui@chinamobile.com
-  RFC5143          ||      A. Malis, J. Brayley, J. Shirron, L. Martini, S. Vogelsang         ||       andrew.g.malis@verizon.com, jeremy.brayley@ecitele.com, john.shirron@ecitele.com, lmartini@cisco.com, steve.vogelsang@alcatel-lucent.com
-  RFC5144          ||      A. Newton, M. Sanz         ||       andy@arin.net, sanz@denic.de
-  RFC5145          ||      K. Shiomoto, Ed.         ||       shiomoto.kohei@lab.ntt.co.jp
-  RFC5146          ||      K. Kumaki, Ed.         ||       ke-kumaki@kddi.com
-  RFC5147          ||      E. Wilde, M. Duerst         ||       dret@berkeley.edu, duerst@it.aoyama.ac.jp
-  RFC5148          ||      T. Clausen, C. Dearlove, B. Adamson         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com, adamson@itd.nrl.navy.mil
-  RFC5149          ||      J. Korhonen, U. Nilsson, V. Devarapalli         ||       jouni.korhonen@teliasonera.com, ulf.s.nilsson@teliasonera.com, vijay.devarapalli@azairenet.com
-  RFC5150          ||      A. Ayyangar, K. Kompella, JP. Vasseur, A. Farrel         ||       arthi@juniper.net, kireeti@juniper.net, jpv@cisco.com, adrian@olddog.co.uk
-  RFC5151          ||      A. Farrel, Ed., A. Ayyangar, JP. Vasseur         ||       adrian@olddog.co.uk, arthi@juniper.net, jpv@cisco.com
-  RFC5152          ||      JP. Vasseur, Ed., A. Ayyangar, Ed., R. Zhang         ||       jpv@cisco.com, arthi@juniper.net, raymond.zhang@bt.com
-  RFC5153          ||      E. Boschi, L. Mark, J. Quittek, M. Stiemerling, P. Aitken         ||       elisa.boschi@hitachi-eu.com, lutz.mark@fokus.fraunhofer.de, quittek@nw.neclab.eu, stiemerling@nw.neclab.eu, paitken@cisco.com
-  RFC5154          ||      J. Jee, Ed., S. Madanapalli, J. Mandin         ||       jhjee@etri.re.kr, smadanapalli@gmail.com, j_mandin@yahoo.com
-  RFC5155          ||      B. Laurie, G. Sisson, R. Arends, D. Blacka         ||       ben@links.org, geoff-s@panix.com, roy@nominet.org.uk, davidb@verisign.com
-  RFC5156          ||      M. Blanchet         ||       Marc.Blanchet@viagenie.ca
-  RFC5157          ||      T. Chown         ||       tjc@ecs.soton.ac.uk
-  RFC5158          ||      G. Huston         ||       gih@apnic.net
-  RFC5159          ||      L. Dondeti, Ed., A. Jerichow         ||       ldondeti@qualcomm.com, anja.jerichow@nsn.com
-  RFC5160          ||      P. Levis, M. Boucadair         ||       pierre.levis@orange-ftgroup.com, mohamed.boucadair@orange-ftgroup.com
-  RFC5161          ||      A. Gulbrandsen, Ed., A. Melnikov, Ed.         ||       arnt@oryx.com, Alexey.Melnikov@isode.com
-  RFC5162          ||      A. Melnikov, D. Cridland, C. Wilson         ||       Alexey.Melnikov@isode.com, dave.cridland@isode.com, corby@computer.org
-  RFC5163          ||      G. Fairhurst, B. Collini-Nocker         ||       gorry@erg.abdn.ac.uk, bnocker@cosy.sbg.ac.at
-  RFC5164          ||      T. Melia, Ed.         ||       tmelia@cisco.com
-  RFC5165          ||      C. Reed         ||       creed@opengeospatial.org
-  RFC5166          ||      S. Floyd, Ed.         ||       floyd@icir.org
-  RFC5167          ||      M. Dolly, R. Even         ||       mdolly@att.com, roni.even@polycom.co.il
-  RFC5168          ||      O. Levin, R. Even, P. Hagendorf         ||       oritl@microsoft.com, roni.even@polycom.co.il, pierre@radvision.com
-  RFC5169          ||      T. Clancy, M. Nakhjiri, V. Narayanan, L. Dondeti         ||       clancy@LTSnet.net, madjid.nakhjiri@motorola.com, vidyan@qualcomm.com, ldondeti@qualcomm.com
-  RFC5170          ||      V. Roca, C. Neumann, D. Furodet         ||       vincent.roca@inria.fr, christoph.neumann@thomson.net, david.furodet@st.com
-  RFC5171          ||      M. Foschiano         ||       foschia@cisco.com
-  RFC5172          ||      S. Varada, Ed.         ||       varada@ieee.org
-  RFC5173          ||      J. Degener, P. Guenther         ||       jutta@pobox.com, guenther@sendmail.com
-  RFC5174          ||      J-P. Evain         ||       evain@ebu.ch
-  RFC5175          ||      B. Haberman, Ed., R. Hinden         ||       brian@innovationslab.net, bob.hinden@gmail.com
-  RFC5176          ||      M. Chiba, G. Dommety, M. Eklund, D. Mitton, B. Aboba         ||       mchiba@cisco.com, gdommety@cisco.com, meklund@cisco.com, david@mitton.com, bernarda@microsoft.com
-  RFC5177          ||      K. Leung, G. Dommety, V. Narayanan, A. Petrescu         ||       kleung@cisco.com, gdommety@cisco.com, vidyan@qualcomm.com, alexandru.petrescu@motorola.com
-  RFC5178          ||      N. Williams, A. Melnikov         ||       Nicolas.Williams@sun.com, Alexey.Melnikov@isode.com
-  RFC5179          ||      N. Williams         ||       Nicolas.Williams@sun.com
-  RFC5180          ||      C. Popoviciu, A. Hamza, G. Van de Velde, D. Dugatkin         ||       cpopovic@cisco.com, ahamza@cisco.com, gunter@cisco.com, diego@fastsoft.com
-  RFC5181          ||      M-K. Shin, Ed., Y-H. Han, S-E. Kim, D. Premec         ||       myungki.shin@gmail.com, yhhan@kut.ac.kr, sekim@kt.co.kr, domagoj.premec@siemens.com
-  RFC5182          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
-  RFC5183          ||      N. Freed         ||       ned.freed@mrochek.com
-  RFC5184          ||      F. Teraoka, K. Gogo, K. Mitsuya, R. Shibui, K. Mitani         ||       tera@ics.keio.ac.jp, gogo@tera.ics.keio.ac.jp, mitsuya@sfc.wide.ad.jp, shibrie@tera.ics.keio.ac.jp, koki@tera.ics.keio.ac.jp, rajeev_koodli@yahoo.com
-  RFC5185          ||      S. Mirtorabi, P. Psenak, A. Lindem, Ed., A. Oswal         ||       sina@nuovasystems.com, ppsenak@cisco.com, acee@redback.com, aoswal@redback.com
-  RFC5186          ||      B. Haberman, J. Martin         ||       brian@innovationslab.net, jim@wovensystems.com
-  RFC5187          ||      P. Pillay-Esnault, A. Lindem         ||       ppe@cisco.com, acee@redback.com
-  RFC5188          ||      H. Desineni, Q. Xie         ||       hd@qualcomm.com, Qiaobing.Xie@Gmail.com
-  RFC5189          ||      M. Stiemerling, J. Quittek, T. Taylor         ||       stiemerling@nw.neclab.eu, quittek@nw.neclab.eu, tom.taylor.stds@gmail.com
-  RFC5190          ||      J. Quittek, M. Stiemerling, P. Srisuresh         ||       quittek@nw.neclab.eu, stiemerling@nw.neclab.eu, srisuresh@yahoo.com
-  RFC5191          ||      D. Forsberg, Y. Ohba, Ed., B. Patil, H. Tschofenig, A. Yegin         ||       dan.forsberg@nokia.com, yohba@tari.toshiba.com, basavaraj.patil@nsn.com, hannes.tschofenig@nsn.com, a.yegin@partner.samsung.com
-  RFC5192          ||      L. Morand, A. Yegin, S. Kumar, S. Madanapalli         ||       lionel.morand@orange-ftgroup.com, a.yegin@partner.samsung.com, surajk@techmahindra.com, syam@samsung.com
-  RFC5193          ||      P. Jayaraman, R. Lopez, Y. Ohba, Ed., M. Parthasarathy, A. Yegin         ||       prakash_jayaraman@net.com, rafa@um.es, yohba@tari.toshiba.com, mohanp@sbcglobal.net, a.yegin@partner.samsung.com
-  RFC5194          ||      A. van Wijk, Ed., G. Gybels, Ed.         ||       guido.gybels@rnid.org.uk, arnoud@realtimetext.org
-  RFC5195          ||      H. Ould-Brahim, D. Fedyk, Y. Rekhter         ||       hbrahim@nortel.com, yakov@juniper.net, dwfedyk@nortel.com
-  RFC5196          ||      M. Lonnfors, K. Kiss         ||       mikko.lonnfors@nokia.com, krisztian.kiss@nokia.com
-  RFC5197          ||      S. Fries, D. Ignjatic         ||       steffen.fries@siemens.com, dignjatic@polycom.com
-  RFC5198          ||      J. Klensin, M. Padlipsky         ||       john-ietf@jck.com, the.map@alum.mit.edu
-  RFC5201          ||      R. Moskowitz, P. Nikander, P. Jokela, Ed., T. Henderson         ||       rgm@icsalabs.com, pekka.nikander@nomadiclab.com, petri.jokela@nomadiclab.com, thomas.r.henderson@boeing.com
-  RFC5202          ||      P. Jokela, R. Moskowitz, P. Nikander         ||       petri.jokela@nomadiclab.com, rgm@icsalabs.com, pekka.nikander@nomadiclab.com
-  RFC5203          ||      J. Laganier, T. Koponen, L. Eggert         ||       julien.ietf@laposte.net, teemu.koponen@iki.fi, lars.eggert@nokia.com
-  RFC5204          ||      J. Laganier, L. Eggert         ||       julien.ietf@laposte.net, lars.eggert@nokia.com
-  RFC5205          ||      P. Nikander, J. Laganier         ||       pekka.nikander@nomadiclab.com, julien.ietf@laposte.net
-  RFC5206          ||      P. Nikander, T. Henderson, Ed., C. Vogt, J. Arkko         ||       pekka.nikander@nomadiclab.com, thomas.r.henderson@boeing.com, christian.vogt@ericsson.com, jari.arkko@ericsson.com
-  RFC5207          ||      M. Stiemerling, J. Quittek, L. Eggert         ||       stiemerling@netlab.nec.de, quittek@nw.neclab.eu, lars.eggert@nokia.com
-  RFC5208          ||      B. Kaliski         ||       kaliski_burt@emc.com
-  RFC5209          ||      P. Sangster, H. Khosravi, M. Mani, K. Narayan, J. Tardo         ||       Paul_Sangster@symantec.com, hormuzd.m.khosravi@intel.com, mmani@avaya.com, kaushik@cisco.com, joseph.tardo@nevisnetworks.com
-  RFC5210          ||      J. Wu, J. Bi, X. Li, G. Ren, K. Xu, M. Williams         ||       jianping@cernet.edu.cn, junbi@cernet.edu.cn, xing@cernet.edu.cn, rg03@mails.tsinghua.edu.cn, xuke@csnet1.cs.tsinghua.edu.cn, miw@juniper.net
-  RFC5211          ||      J. Curran         ||       jcurran@istaff.org
-  RFC5212          ||      K. Shiomoto, D. Papadimitriou, JL. Le Roux, M. Vigoureux, D. Brungard         ||       shiomoto.kohei@lab.ntt.co.jp, dimitri.papadimitriou@alcatel-lucent.be, jeanlouis.leroux@orange-ftgroup.com, martin.vigoureux@alcatel-lucent.fr, dbrungard@att.com
-  RFC5213          ||      S. Gundavelli, Ed., K. Leung, V. Devarapalli, K. Chowdhury, B. Patil         ||       sgundave@cisco.com, kleung@cisco.com, vijay@wichorus.com, kchowdhury@starentnetworks.com, basavaraj.patil@nokia.com
-  RFC5214          ||      F. Templin, T. Gleeson, D. Thaler         ||       fred.l.templin@boeing.com, tgleeson@cisco.com, dthaler@microsoft.com
-  RFC5215          ||      L. Barbato         ||       lu_zero@gentoo.org
-  RFC5216          ||      D. Simon, B. Aboba, R. Hurst         ||       dansimon@microsoft.com, bernarda@microsoft.com, rmh@microsoft.com
-  RFC5217          ||      M. Shimaoka, Ed., N. Hastings, R. Nielsen         ||       m-shimaoka@secom.co.jp, nelson.hastings@nist.gov, nielsen_rebecca@bah.com
-  RFC5218          ||      D. Thaler, B. Aboba         ||       dthaler@microsoft.com, bernarda@microsoft.com
-  RFC5219          ||      R. Finlayson         ||       finlayson@live555.com
-  RFC5220          ||      A. Matsumoto, T. Fujisaki, R. Hiromi, K. Kanayama         ||       arifumi@nttv6.net, fujisaki@nttv6.net, hiromi@inetcore.com, kanayama_kenichi@intec-si.co.jp
-  RFC5221          ||      A. Matsumoto, T. Fujisaki, R. Hiromi, K. Kanayama         ||       arifumi@nttv6.net, fujisaki@nttv6.net, hiromi@inetcore.com, kanayama_kenichi@intec-si.co.jp
-  RFC5222          ||      T. Hardie, A. Newton, H. Schulzrinne, H. Tschofenig         ||       hardie@qualcomm.com, andy@hxr.us, hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@nsn.com
-  RFC5223          ||      H. Schulzrinne, J. Polk, H. Tschofenig         ||       hgs+ecrit@cs.columbia.edu, jmpolk@cisco.com, Hannes.Tschofenig@nsn.com
-  RFC5224          ||      M. Brenner         ||       mrbrenner@alcatel-lucent.com
-  RFC5225          ||      G. Pelletier, K. Sandlund         ||       ghyslain.pelletier@ericsson.com, kristofer.sandlund@ericsson.com
-  RFC5226          ||      T. Narten, H. Alvestrand         ||       narten@us.ibm.com, Harald@Alvestrand.no
-  RFC5227          ||      S. Cheshire         ||       rfc@stuartcheshire.org
-  RFC5228          ||      P. Guenther, Ed., T. Showalter, Ed.         ||       guenther@sendmail.com, tjs@psaux.com
-  RFC5229          ||      K. Homme         ||       kjetilho@ifi.uio.no
-  RFC5230          ||      T. Showalter, N. Freed, Ed.         ||       tjs@psaux.com, ned.freed@mrochek.com
-  RFC5231          ||      W. Segmuller, B. Leiba         ||       werewolf@us.ibm.com, leiba@watson.ibm.com
-  RFC5232          ||      A. Melnikov         ||       alexey.melnikov@isode.com
-  RFC5233          ||      K. Murchison         ||       murch@andrew.cmu.edu
-  RFC5234          ||      D. Crocker, Ed., P. Overell         ||       dcrocker@bbiw.net, paul@bayleaf.org.uk
-  RFC5235          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC5236          ||      A. Jayasumana, N. Piratla, T. Banka, A. Bare, R. Whitner         ||       Anura.Jayasumana@colostate.edu, Nischal.Piratla@telekom.de, Tarun.Banka@colostate.edu, abhijit_bare@agilent.com, rick_whitner@agilent.com
-  RFC5237          ||      J. Arkko, S. Bradner         ||       jari.arkko@piuha.net, sob@harvard.edu
-  RFC5238          ||      T. Phelan         ||       tphelan@sonusnet.com
-  RFC5239          ||      M. Barnes, C. Boulton, O. Levin         ||       mary.barnes@nortel.com, cboulton@avaya.com, oritl@microsoft.com
-  RFC5240          ||      B. Joshi, R. Bijlani         ||       bharat_joshi@infosys.com, rainab@gmail.com
-  RFC5241          ||      A. Falk, S. Bradner         ||       falk@bbn.com, sob@harvard.edu
-  RFC5242          ||      J. Klensin, H. Alvestrand         ||       john+ietf@jck.com, harald@alvestrand.no
-  RFC5243          ||      R. Ogier         ||       rich.ogier@earthlink.net
-  RFC5244          ||      H. Schulzrinne, T. Taylor         ||       schulzrinne@cs.columbia.edu, tom.taylor.stds@gmail.com
-  RFC5245          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
-  RFC5246          ||      T. Dierks, E. Rescorla         ||       tim@dierks.org, ekr@rtfm.com
-  RFC5247          ||      B. Aboba, D. Simon, P. Eronen         ||       bernarda@microsoft.com, dansimon@microsoft.com, pe@iki.fi
-  RFC5248          ||      T. Hansen, J. Klensin         ||       tony+mailesc@maillennium.att.com, john+ietf@jck.com
-  RFC5249          ||      D. Harrington, Ed.         ||       dharrington@huawei.com
-  RFC5250          ||      L. Berger, I. Bryskin, A. Zinin, R. Coltun         ||       lberger@labn.net, ibryskin@advaoptical.com, alex.zinin@alcatel-lucent.com, none
-  RFC5251          ||      D. Fedyk, Ed., Y. Rekhter, Ed., D. Papadimitriou, R. Rabbat, L. Berger         ||       dwfedyk@nortel.com, yakov@juniper.net, Dimitri.Papadimitriou@alcatel-lucent.be, rabbat@alum.mit.edu, lberger@labn.net
-  RFC5252          ||      I. Bryskin, L. Berger         ||       ibryskin@advaoptical.com, lberger@labn.net
-  RFC5253          ||      T. Takeda, Ed.         ||       takeda.tomonori@lab.ntt.co.jp
-  RFC5254          ||      N. Bitar, Ed., M. Bocci, Ed., L. Martini, Ed.         ||       nabil.bitar@verizon.com, matthew.bocci@alcatel-lucent.co.uk, lmartini@cisco.com
-  RFC5255          ||      C. Newman, A. Gulbrandsen, A. Melnikov         ||       chris.newman@sun.com, arnt@oryx.com, Alexey.Melnikov@isode.com
-  RFC5256          ||      M. Crispin, K. Murchison         ||       IMAP+SORT+THREAD@Lingling.Panda.COM, murch@andrew.cmu.edu
-  RFC5257          ||      C. Daboo, R. Gellens         ||       cyrus@daboo.name, randy@qualcomm.com
-  RFC5258          ||      B. Leiba, A. Melnikov         ||       leiba@watson.ibm.com, Alexey.Melnikov@isode.com
-  RFC5259          ||      A. Melnikov, Ed., P. Coates, Ed.         ||       Alexey.Melnikov@isode.com, peter.coates@Sun.COM
-  RFC5260          ||      N. Freed         ||       ned.freed@mrochek.com
-  RFC5261          ||      J. Urpalainen         ||       jari.urpalainen@nokia.com
-  RFC5262          ||      M. Lonnfors, E. Leppanen, H. Khartabil, J. Urpalainen         ||       mikko.lonnfors@nokia.com, eva.leppanen@saunalahti.fi, hisham.khartabil@gmail.com, jari.urpalainen@nokia.com
-  RFC5263          ||      M. Lonnfors, J. Costa-Requena, E. Leppanen, H. Khartabil         ||       mikko.lonnfors@nokia.com, jose.costa-requena@nokia.com, eva.leppanen@saunalahti.fi, hisham.khartabil@gmail.com
-  RFC5264          ||      A. Niemi, M. Lonnfors, E. Leppanen         ||       aki.niemi@nokia.com, mikko.lonnfors@nokia.com, eva.leppanen@saunalaht.fi
-  RFC5265          ||      S. Vaarala, E. Klovning         ||       sami.vaarala@iki.fi, espen@birdstep.com
-  RFC5266          ||      V. Devarapalli, P. Eronen         ||       vijay@wichorus.com, pe@iki.fi
-  RFC5267          ||      D. Cridland, C. King         ||       dave.cridland@isode.com, cking@mumbo.ca
-  RFC5268          ||      R. Koodli, Ed.         ||       rkoodli@starentnetworks.com[
-  RFC5269          ||      J. Kempf, R. Koodli         ||       kempf@docomolabs-usa.com, rkoodli@starentnetworks.com
-  RFC5270          ||      H. Jang, J. Jee, Y. Han, S. Park, J. Cha         ||       heejin.jang@gmail.com, jhjee@etri.re.kr, yhhan@kut.ac.kr, soohong.park@samsung.com, jscha@etri.re.kr
-  RFC5271          ||      H. Yokota, G. Dommety         ||       yokota@kddilabs.jp, gdommety@cisco.com
-  RFC5272          ||      J. Schaad, M. Myers         ||       jimsch@nwlink.com, mmyers@fastq.com
-  RFC5273          ||      J. Schaad, M. Myers         ||       jimsch@nwlink.com, mmyers@fastq.com
-  RFC5274          ||      J. Schaad, M. Myers         ||       jimsch@nwlink.com, mmyers@fastq.com
-  RFC5275          ||      S. Turner         ||       turners@ieca.com
-  RFC5276          ||      C. Wallace         ||       cwallace@cygnacom.com
-  RFC5277          ||      S. Chisholm, H. Trevino         ||       schishol@nortel.com, htrevino@cisco.com
-  RFC5278          ||      J. Livingood, D. Troshynski         ||       jason_livingood@cable.comcast.com, dtroshynski@acmepacket.com
-  RFC5279          ||      A. Monrad, S. Loreto         ||       atle.monrad@ericsson.com, Salvatore.Loreto@ericsson.com
-  RFC5280          ||      D. Cooper, S. Santesson, S. Farrell, S. Boeyen, R. Housley, W. Polk         ||       david.cooper@nist.gov, stefans@microsoft.com, stephen.farrell@cs.tcd.ie, sharon.boeyen@entrust.com, housley@vigilsec.com, wpolk@nist.gov
-  RFC5281          ||      P. Funk, S. Blake-Wilson         ||       PaulFunk@alum.mit.edu, sblakewilson@nl.safenet-inc.com
-  RFC5282          ||      D. Black, D. McGrew         ||       black_david@emc.com, mcgrew@cisco.com
-  RFC5283          ||      B. Decraene, JL. Le Roux, I. Minei         ||       bruno.decraene@orange-ftgroup.com, jeanlouis.leroux@orange-ftgroup.com, ina@juniper.net
-  RFC5284          ||      G. Swallow, A. Farrel         ||       swallow@cisco.com, adrian@olddog.co.uk
-  RFC5285          ||      D. Singer, H. Desineni         ||       singer@apple.com, hd@qualcomm.com
-  RFC5286          ||      A. Atlas, Ed., A. Zinin, Ed.         ||       alia.atlas@bt.com, alex.zinin@alcatel-lucent.com
-  RFC5287          ||      A. Vainshtein, Y(J). Stein         ||       Alexander.Vainshtein@ecitele.com, yaakov_s@rad.com
-  RFC5288          ||      J. Salowey, A. Choudhury, D. McGrew         ||       jsalowey@cisco.com, abhijitc@cisco.com, mcgrew@cisco.com
-  RFC5289          ||      E. Rescorla         ||       ekr@rtfm.com
-  RFC5290          ||      S. Floyd, M. Allman         ||       floyd@icir.org, mallman@icir.org
-  RFC5291          ||      E. Chen, Y. Rekhter         ||       enkechen@cisco.com, yakov@juniper.net
-  RFC5292          ||      E. Chen, S. Sangli         ||       enkechen@cisco.com, rsrihari@cisco.com
-  RFC5293          ||      J. Degener, P. Guenther         ||       jutta@pobox.com, guenther@sendmail.com
-  RFC5294          ||      P. Savola, J. Lingard         ||       psavola@funet.fi, jchl@arastra.com
-  RFC5295          ||      J. Salowey, L. Dondeti, V. Narayanan, M. Nakhjiri         ||       jsalowey@cisco.com, ldondeti@qualcomm.com, vidyan@qualcomm.com, madjid.nakhjiri@motorola.com
-  RFC5296          ||      V. Narayanan, L. Dondeti         ||       vidyan@qualcomm.com, ldondeti@qualcomm.com
-  RFC5297          ||      D. Harkins         ||       dharkins@arubanetworks.com
-  RFC5298          ||      T. Takeda, Ed., A. Farrel, Ed., Y. Ikejiri, JP. Vasseur         ||       takeda.tomonori@lab.ntt.co.jp, y.ikejiri@ntt.com, adrian@olddog.co.uk, jpv@cisco.com
-  RFC5301          ||      D. McPherson, N. Shen         ||       danny@arbor.net, naiming@cisco.com
-  RFC5302          ||      T. Li, H. Smit, T. Przygienda         ||       tony.li@tony.li, hhw.smit@xs4all.nl, prz@net4u.ch
-  RFC5303          ||      D. Katz, R. Saluja, D. Eastlake 3rd         ||       dkatz@juniper.net, rajesh.saluja@tenetindia.com, d3e3e3@gmail.com
-  RFC5304          ||      T. Li, R. Atkinson         ||       tony.li@tony.li, rja@extremenetworks.com
-  RFC5305          ||      T. Li, H. Smit         ||       tony.li@tony.li, hhwsmit@xs4all.nl
-  RFC5306          ||      M. Shand, L. Ginsberg         ||       mshand@cisco.com, ginsberg@cisco.com
-  RFC5307          ||      K. Kompella, Ed., Y. Rekhter, Ed.         ||       kireeti@juniper.net, yakov@juniper.net
-  RFC5308          ||      C. Hopps         ||       chopps@cisco.com
-  RFC5309          ||      N. Shen, Ed., A. Zinin, Ed.         ||       naiming@cisco.com, alex.zinin@alcatel-lucent.com
-  RFC5310          ||      M. Bhatia, V. Manral, T. Li, R. Atkinson, R. White, M. Fanto         ||       manav@alcatel-lucent.com, vishwas@ipinfusion.com, tony.li@tony.li, rja@extremenetworks.com, riw@cisco.com, mfanto@aegisdatasecurity.com
-  RFC5311          ||      D. McPherson, Ed., L. Ginsberg, S. Previdi, M. Shand         ||       danny@arbor.net, ginsberg@cisco.com, sprevidi@cisco.com, mshand@cisco.com
-  RFC5316          ||      M. Chen, R. Zhang, X. Duan         ||       mach@huawei.com, zhangrenhai@huawei.com, duanxiaodong@chinamobile.com
-  RFC5317          ||      S. Bryant, Ed., L. Andersson, Ed.         ||       stbryant@cisco.com, loa@pi.nu
-  RFC5318          ||      J. Hautakorpi, G. Camarillo         ||       Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com
-  RFC5320          ||      F. Templin, Ed.         ||       fltemplin@acm.org
-  RFC5321          ||      J. Klensin         ||       john+smtp@jck.com
-  RFC5322          ||      P. Resnick, Ed.         ||       presnick@qti.qualcomm.com
-  RFC5323          ||      J. Reschke, Ed., S. Reddy, J. Davis, A. Babich         ||       julian.reschke@greenbytes.de, Surendra.Reddy@mitrix.com, jrd3@alum.mit.edu, ababich@us.ibm.com
-  RFC5324          ||      C. DeSanti, F. Maino, K. McCloghrie         ||       cds@cisco.com, fmaino@cisco.com, kzm@cisco.com
-  RFC5325          ||      S. Burleigh, M. Ramadas, S. Farrell         ||       Scott.Burleigh@jpl.nasa.gov, mramadas@gmail.com, stephen.farrell@cs.tcd.ie
-  RFC5326          ||      M. Ramadas, S. Burleigh, S. Farrell         ||       mramadas@gmail.com, Scott.Burleigh@jpl.nasa.gov, stephen.farrell@cs.tcd.ie
-  RFC5327          ||      S. Farrell, M. Ramadas, S. Burleigh         ||       stephen.farrell@cs.tcd.ie, mramadas@gmail.com, Scott.Burleigh@jpl.nasa.gov
-  RFC5328          ||      A. Adolf, P. MacAvock         ||       alexander.adolf@micronas.com, macavock@dvb.org
-  RFC5329          ||      K. Ishiguro, V. Manral, A. Davey, A. Lindem, Ed.         ||       kunihiro@ipinfusion.com, vishwas@ipinfusion.com, Alan.Davey@dataconnection.com, acee@redback.com
-  RFC5330          ||      JP. Vasseur, Ed., M. Meyer, K. Kumaki, A. Bonda         ||       jpv@cisco.com, matthew.meyer@bt.com, ke-kumaki@kddi.com, alberto.tempiabonda@telecomitalia.it
-  RFC5331          ||      R. Aggarwal, Y. Rekhter, E. Rosen         ||       rahul@juniper.net, yakov@juniper.net, erosen@cisco.com
-  RFC5332          ||      T. Eckert, E. Rosen, Ed., R. Aggarwal, Y. Rekhter         ||       eckert@cisco.com, erosen@cisco.com, rahul@juniper.net, yakov@juniper.net
-  RFC5333          ||      R. Mahy, B. Hoeneisen         ||       rohan@ekabal.com, bernie@ietf.hoeneisen.ch
-  RFC5334          ||      I. Goncalves, S. Pfeiffer, C. Montgomery         ||       justivo@gmail.com, silvia@annodex.net, monty@xiph.org
-  RFC5335          ||      A. Yang, Ed.         ||       abelyang@twnic.net.tw
-  RFC5336          ||      J. Yao, Ed., W. Mao, Ed.         ||       yaojk@cnnic.cn, maowei_ietf@cnnic.cn
-  RFC5337          ||      C. Newman, A. Melnikov, Ed.         ||       chris.newman@sun.com, Alexey.Melnikov@isode.com
-  RFC5338          ||      T. Henderson, P. Nikander, M. Komu         ||       thomas.r.henderson@boeing.com, pekka.nikander@nomadiclab.com, miika@iki.fi
-  RFC5339          ||      JL. Le Roux, Ed., D. Papadimitriou, Ed.         ||       jeanlouis.leroux@orange-ftgroup.com, dimitri.papadimitriou@alcatel-lucent.be
-  RFC5340          ||      R. Coltun, D. Ferguson, J. Moy, A. Lindem         ||       none, dennis@juniper.net, jmoy@sycamorenet.com, acee@redback.com
-  RFC5341          ||      C. Jennings, V. Gurbani         ||       fluffy@cisco.com, vkg@alcatel-lucent.com
-  RFC5342          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC5343          ||      J. Schoenwaelder         ||       j.schoenwaelder@jacobs-university.de
-  RFC5344          ||      A. Houri, E. Aoki, S. Parameswar         ||       avshalom@il.ibm.com, aoki@aol.net, Sriram.Parameswar@microsoft.com
-  RFC5345          ||      J. Schoenwaelder         ||       j.schoenwaelder@jacobs-university.de
-  RFC5346          ||      J. Lim, W. Kim, C. Park, L. Conroy         ||       jhlim@nida.or.kr, wkim@nida.or.kr, ckp@nida.or.kr, lconroy@insensate.co.uk
-  RFC5347          ||      F. Andreasen, D. Hancock         ||       fandreas@cisco.com, d.hancock@cablelabs.com
-  RFC5348          ||      S. Floyd, M. Handley, J. Padhye, J. Widmer         ||       floyd@icir.org, M.Handley@cs.ucl.ac.uk, padhye@microsoft.com, widmer@acm.org
-  RFC5349          ||      L. Zhu, K. Jaganathan, K. Lauter         ||       lzhu@microsoft.com, karthikj@microsoft.com, klauter@microsoft.com
-  RFC5350          ||      J. Manner, A. McDonald         ||       jukka.manner@tkk.fi, andrew.mcdonald@roke.co.uk
-  RFC5351          ||      P. Lei, L. Ong, M. Tuexen, T. Dreibholz         ||       peterlei@cisco.com, Lyong@Ciena.com, tuexen@fh-muenster.de, dreibh@iem.uni-due.de
-  RFC5352          ||      R. Stewart, Q. Xie, M. Stillman, M. Tuexen         ||       randall@lakerest.net, Qiaobing.Xie@gmail.org, maureen.stillman@nokia.com, tuexen@fh-muenster.de
-  RFC5353          ||      Q. Xie, R. Stewart, M. Stillman, M. Tuexen, A. Silverton         ||       Qiaobing.Xie@gmail.org, randall@lakerest.net, maureen.stillman@nokia.com, tuexen@fh-muenster.de, ajs.ietf@gmail.com
-  RFC5354          ||      R. Stewart, Q. Xie, M. Stillman, M. Tuexen         ||       randall@lakerest.net, Qiaobing.Xie@gmail.org, maureen.stillman@nokia.com, tuexen@fh-muenster.de
-  RFC5355          ||      M. Stillman, Ed., R. Gopal, E. Guttman, S. Sengodan, M. Holdrege         ||       maureen.stillman@nokia.com, ram.gopal@nsn.com, Erik.Guttman@sun.com, Senthil.sengodan@nsn.com, Holdrege@gmail.com
-  RFC5356          ||      T. Dreibholz, M. Tuexen         ||       dreibh@iem.uni-due.de, tuexen@fh-muenster.de
-  RFC5357          ||      K. Hedayat, R. Krzanowski, A. Morton, K. Yum, J. Babiarz         ||       khedayat@brixnet.com, roman.krzanowski@verizon.com, acmorton@att.com, kyum@juniper.net, babiarz@nortel.com
-  RFC5358          ||      J. Damas, F. Neves         ||       Joao_Damas@isc.org, fneves@registro.br
-  RFC5359          ||      A. Johnston, Ed., R. Sparks, C. Cunningham, S. Donovan, K. Summers         ||       alan@sipstation.com, RjS@nostrum.com, chrcunni@cisco.com, srd@cisco.com, ksummers@sonusnet.com
-  RFC5360          ||      J. Rosenberg, G. Camarillo, Ed., D. Willis         ||       jdrosen@cisco.com, Gonzalo.Camarillo@ericsson.com, dean.willis@softarmor.com
-  RFC5361          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC5362          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC5363          ||      G. Camarillo, A.B. Roach         ||       Gonzalo.Camarillo@ericsson.com, Adam.Roach@tekelec.com
-  RFC5364          ||      M. Garcia-Martin, G. Camarillo         ||       miguel.a.garcia@ericsson.com, Gonzalo.Camarillo@ericsson.com
-  RFC5365          ||      M. Garcia-Martin, G. Camarillo         ||       miguel.a.garcia@ericsson.com, Gonzalo.Camarillo@ericsson.com
-  RFC5366          ||      G. Camarillo, A. Johnston         ||       Gonzalo.Camarillo@ericsson.com, alan@sipstation.com
-  RFC5367          ||      G. Camarillo, A.B. Roach, O. Levin         ||       Gonzalo.Camarillo@ericsson.com, Adam.Roach@tekelec.com, oritl@microsoft.com
-  RFC5368          ||      G. Camarillo, A. Niemi, M. Isomaki, M. Garcia-Martin, H. Khartabil         ||       Gonzalo.Camarillo@ericsson.com, Aki.Niemi@nokia.com, markus.isomaki@nokia.com, miguel.a.garcia@ericsson.com, hisham.khartabil@gmail.com
-  RFC5369          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC5370          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC5371          ||      S. Futemma, E. Itakura, A. Leung         ||       satosi-f@sm.sony.co.jp, itakura@sm.sony.co.jp, andrew@ualberta.net
-  RFC5372          ||      A. Leung, S. Futemma, E. Itakura         ||       andrew@ualberta.net, satosi-f@sm.sony.co.jp, itakura@sm.sony.co.jp
-  RFC5373          ||      D. Willis, Ed., A. Allen         ||       dean.willis@softarmor.com, aallen@rim.com
-  RFC5374          ||      B. Weis, G. Gross, D. Ignjatic         ||       bew@cisco.com, gmgross@securemulticast.net, dignjatic@polycom.com
-  RFC5375          ||      G. Van de Velde, C. Popoviciu, T. Chown, O. Bonness, C. Hahn         ||       gunter@cisco.com, cpopovic@cisco.com, tjc@ecs.soton.ac.uk, Olaf.Bonness@t-systems.com, HahnC@t-systems.com
-  RFC5376          ||      N. Bitar, R. Zhang, K. Kumaki         ||       nabil.n.bitar@verizon.com, ke-kumaki@kddi.com, Raymond.zhang@bt.com
-  RFC5377          ||      J. Halpern, Ed.         ||       jmh@joelhalpern.com
-  RFC5378          ||      S. Bradner, Ed., J. Contreras, Ed.         ||       sob@harvard.edu, jorge.contreras@wilmerhale.com
-  RFC5379          ||      M. Munakata, S. Schubert, T. Ohba         ||       munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp
-  RFC5380          ||      H. Soliman, C. Castelluccia, K. ElMalki, L. Bellier         ||       hesham@elevatemobile.com, claude.castelluccia@inria.fr, karim@athonet.com, ludovic.bellier@inria.fr
-  RFC5381          ||      T. Iijima, Y. Atarashi, H. Kimura, M. Kitani, H. Okita         ||       tomoyuki.iijima@alaxala.com, atarashi@alaxala.net, h-kimura@alaxala.net, makoto.kitani@alaxala.com, hideki.okita.pf@hitachi.com
-  RFC5382          ||      S. Guha, Ed., K. Biswas, B. Ford, S. Sivakumar, P. Srisuresh         ||       saikat@cs.cornell.edu, kbiswas@cisco.com, baford@mpi-sws.org, ssenthil@cisco.com, srisuresh@yahoo.com
-  RFC5383          ||      R. Gellens         ||       randy@qualcomm.com
-  RFC5384          ||      A. Boers, I. Wijnands, E. Rosen         ||       aboers@cisco.com, ice@cisco.com, erosen@cisco.com
-  RFC5385          ||      J. Touch         ||       touch@isi.edu
-  RFC5386          ||      N. Williams, M. Richardson         ||       Nicolas.Williams@sun.com, mcr@sandelman.ottawa.on.ca
-  RFC5387          ||      J. Touch, D. Black, Y. Wang         ||       touch@isi.edu, black_david@emc.com, yu-shun.wang@microsoft.com
-  RFC5388          ||      S. Niccolini, S. Tartarelli, J. Quittek, T. Dietz, M. Swany         ||       saverio.niccolini@nw.neclab.eu, sandra.tartarelli@nw.neclab.eu, quittek@nw.neclab.eu, thomas.dietz@nw.neclab.eu, swany@UDel.Edu
-  RFC5389          ||      J. Rosenberg, R. Mahy, P. Matthews, D. Wing         ||       jdrosen@cisco.com, rohan@ekabal.com, philip_matthews@magma.ca, dwing-ietf@fuggles.com
-  RFC5390          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC5391          ||      A. Sollaud         ||       aurelien.sollaud@orange-ftgroup.com
-  RFC5392          ||      M. Chen, R. Zhang, X. Duan         ||       mach@huawei.com, zhangrenhai@huawei.com, duanxiaodong@chinamobile.com
-  RFC5393          ||      R. Sparks, Ed., S. Lawrence, A. Hawrylyshen, B. Campen         ||       RjS@nostrum.com, scott.lawrence@nortel.com, alan.ietf@polyphase.ca, bcampen@estacado.net
-  RFC5394          ||      I. Bryskin, D. Papadimitriou, L. Berger, J. Ash         ||       ibryskin@advaoptical.com, dimitri.papadimitriou@alcatel.be, lberger@labn.net, gash5107@yahoo.com
-  RFC5395          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC5396          ||      G. Huston, G. Michaelson         ||       gih@apnic.net, ggm@apnic.net
-  RFC5397          ||      W. Sanchez, C. Daboo         ||       wsanchez@wsanchez.net, cyrus@daboo.name
-  RFC5398          ||      G. Huston         ||       gih@apnic.net
-  RFC5401          ||      B. Adamson, C. Bormann, M. Handley, J. Macker         ||       adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil
-  RFC5402          ||      T. Harding, Ed.         ||       tharding@us.axway.com
-  RFC5403          ||      M. Eisler         ||       mike@eisler.com
-  RFC5404          ||      M. Westerlund, I. Johansson         ||       magnus.westerlund@ericsson.com, ingemar.s.johansson@ericsson.com
-  RFC5405          ||      L. Eggert, G. Fairhurst         ||       lars.eggert@nokia.com, gorry@erg.abdn.ac.uk
-  RFC5406          ||      S. Bellovin         ||       bellovin@acm.org
-  RFC5407          ||      M. Hasebe, J. Koshiko, Y. Suzuki, T. Yoshikawa, P. Kyzivat         ||       hasebe.miki@east.ntt.co.jp, j.koshiko@east.ntt.co.jp, suzuki.yasushi@lab.ntt.co.jp, tomoyuki.yoshikawa@east.ntt.co.jp, pkyzivat@cisco.com
-  RFC5408          ||      G. Appenzeller, L. Martin, M. Schertler         ||       appenz@cs.stanford.edu, martin@voltage.com, mschertler@us.axway.com
-  RFC5409          ||      L. Martin, M. Schertler         ||       martin@voltage.com, mschertler@us.axway.com
-  RFC5410          ||      A. Jerichow, Ed., L. Piron         ||       anja.jerichow@nsn.com, laurent.piron@nagravision.com
-  RFC5411          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC5412          ||      P. Calhoun, R. Suri, N. Cam-Winget, M. Williams, S. Hares, B. O'Hara, S. Kelly         ||       pcalhoun@cisco.com, rsuri@cisco.com, ncamwing@cisco.com, gwhiz@gwhiz.com, shares@ndzh.com, bob.ohara@computer.org, scott@hyperthought.com
-  RFC5413          ||      P. Narasimhan, D. Harkins, S. Ponnuswamy         ||       partha@arubanetworks.com, dharkins@arubanetworks.com, subbu@arubanetworks.com
-  RFC5414          ||      S. Iino, S. Govindan, M. Sugiura, H. Cheng         ||       iino.satoshi@jp.panasonic.com, saravanan.govindan@sg.panasonic.com, sugiura.mikihito@jp.panasonic.com, hong.cheng@sg.panasonic.com
-  RFC5415          ||      P. Calhoun, Ed., M. Montemurro, Ed., D. Stanley, Ed.         ||       pcalhoun@cisco.com, mmontemurro@rim.com, dstanley@arubanetworks.com
-  RFC5416          ||      P. Calhoun, Ed., M. Montemurro, Ed., D. Stanley, Ed.         ||       pcalhoun@cisco.com, mmontemurro@rim.com, dstanley@arubanetworks.com
-  RFC5417          ||      P. Calhoun         ||       pcalhoun@cisco.com
-  RFC5418          ||      S. Kelly, T. Clancy         ||       scott@hyperthought.com, clancy@LTSnet.net
-  RFC5419          ||      B. Patil, G. Dommety         ||       basavaraj.patil@nokia.com, gdommety@cisco.com
-  RFC5420          ||      A. Farrel, Ed., D. Papadimitriou, JP. Vasseur, A. Ayyangarps         ||       adrian@olddog.co.uk, dimitri.papadimitriou@alcatel.be, jpv@cisco.com, arthi@juniper.net
-  RFC5421          ||      N. Cam-Winget, H. Zhou         ||       ncamwing@cisco.com, hzhou@cisco.com
-  RFC5422          ||      N. Cam-Winget, D. McGrew, J. Salowey, H. Zhou         ||       ncamwing@cisco.com, mcgrew@cisco.com, jsalowey@cisco.com, hzhou@cisco.com
-  RFC5423          ||      R. Gellens, C. Newman         ||       rg+ietf@qualcomm.com, chris.newman@sun.com
-  RFC5424          ||      R. Gerhards         ||       rgerhards@adiscon.com
-  RFC5425          ||      F. Miao, Ed., Y. Ma, Ed., J. Salowey, Ed.         ||       miaofy@huawei.com, myz@huawei.com, jsalowey@cisco.com
-  RFC5426          ||      A. Okmianski         ||       aokmians@cisco.com
-  RFC5427          ||      G. Keeni         ||       glenn@cysols.com
-  RFC5428          ||      S. Channabasappa, W. De Ketelaere, E. Nechamkin         ||       Sumanth@cablelabs.com, deketelaere@tComLabs.com, enechamkin@broadcom.com
-  RFC5429          ||      A. Stone, Ed.         ||       aaron@serendipity.palo-alto.ca.us
-  RFC5430          ||      M. Salter, E. Rescorla, R. Housley         ||       msalter@restarea.ncsc.mil, ekr@rtfm.com, housley@vigilsec.com
-  RFC5431          ||      D. Sun         ||       dongsun@alcatel-lucent.com
-  RFC5432          ||      J. Polk, S. Dhesikan, G. Camarillo         ||       jmpolk@cisco.com, sdhesika@cisco.com, Gonzalo.Camarillo@ericsson.com
-  RFC5433          ||      T. Clancy, H. Tschofenig         ||       clancy@ltsnet.net, Hannes.Tschofenig@gmx.net
-  RFC5434          ||      T. Narten         ||       narten@us.ibm.com
-  RFC5435          ||      A. Melnikov, Ed., B. Leiba, Ed., W. Segmuller, T. Martin         ||       Alexey.Melnikov@isode.com, leiba@watson.ibm.com, werewolf@us.ibm.com, timmartin@alumni.cmu.edu
-  RFC5436          ||      B. Leiba, M. Haardt         ||       leiba@watson.ibm.com, michael.haardt@freenet.ag
-  RFC5437          ||      P. Saint-Andre, A. Melnikov         ||       ietf@stpeter.im, Alexey.Melnikov@isode.com
-  RFC5438          ||      E. Burger, H. Khartabil         ||       eburger@standardstrack.com, hisham.khartabil@gmail.com
-  RFC5439          ||      S. Yasukawa, A. Farrel, O. Komolafe         ||       s.yasukawa@hco.ntt.co.jp, adrian@olddog.co.uk, femi@cisco.com
-  RFC5440          ||      JP. Vasseur, Ed., JL. Le Roux, Ed.         ||       jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com
-  RFC5441          ||      JP. Vasseur, Ed., R. Zhang, N. Bitar, JL. Le Roux         ||       jpv@cisco.com, raymond.zhang@bt.com, nabil.n.bitar@verizon.com, jeanlouis.leroux@orange-ftgroup.com
-  RFC5442          ||      E. Burger, G. Parsons         ||       eburger@standardstrack.com, gparsons@nortel.com
-  RFC5443          ||      M. Jork, A. Atlas, L. Fang         ||       Markus.Jork@genband.com, alia.atlas@bt.com, lufang@cisco.com
-  RFC5444          ||      T. Clausen, C. Dearlove, J. Dean, C. Adjih         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com, jdean@itd.nrl.navy.mil, Cedric.Adjih@inria.fr
-  RFC5445          ||      M. Watson         ||       mark@digitalfountain.com
-  RFC5446          ||      J. Korhonen, U. Nilsson         ||       jouni.nospam@gmail.com, ulf.s.nilsson@teliasonera.com
-  RFC5447          ||      J. Korhonen, Ed., J. Bournelle, H. Tschofenig, C. Perkins, K. Chowdhury         ||       jouni.nospam@gmail.com, julien.bournelle@orange-ftgroup.com, Hannes.Tschofenig@nsn.com, charliep@wichorus.com, kchowdhury@starentnetworks.com
-  RFC5448          ||      J. Arkko, V. Lehtovirta, P. Eronen         ||       jari.arkko@piuha.net, vesa.lehtovirta@ericsson.com, pe@iki.fi
-  RFC5449          ||      E. Baccelli, P. Jacquet, D. Nguyen, T. Clausen         ||       Emmanuel.Baccelli@inria.fr, Philippe.Jacquet@inria.fr, dang.nguyen@crc.ca, T.Clausen@computer.org
-  RFC5450          ||      D. Singer, H. Desineni         ||       singer@apple.com, hd@qualcomm.com
-  RFC5451          ||      M. Kucherawy         ||       msk+ietf@sendmail.com
-  RFC5452          ||      A. Hubert, R. van Mook         ||       bert.hubert@netherlabs.nl, remco@eu.equinix.com
-  RFC5453          ||      S. Krishnan         ||       suresh.krishnan@ericsson.com
-  RFC5454          ||      G. Tsirtsis, V. Park, H. Soliman         ||       tsirtsis@googlemail.com, vpark@qualcomm.com, hesham@elevatemobile.com
-  RFC5455          ||      S. Sivabalan, Ed., J. Parker, S. Boutros, K. Kumaki         ||       msiva@cisco.com, jdparker@cisco.com, sboutros@cisco.com, ke-kumaki@kddi.com
-  RFC5456          ||      M. Spencer, B. Capouch, E. Guy, Ed., F. Miller, K. Shumard         ||       markster@digium.com, brianc@saintjoe.edu, edguy@emcsw.com, mail@frankwmiller.net, kshumard@gmail.com
-  RFC5457          ||      E. Guy, Ed.         ||       edguy@emcsw.com
-  RFC5458          ||      H. Cruickshank, P. Pillai, M. Noisternig, S. Iyengar         ||       h.cruickshank@surrey.ac.uk, p.pillai@bradford.ac.uk, mnoist@cosy.sbg.ac.at, sunil.iyengar@logica.com
-  RFC5459          ||      A. Sollaud         ||       aurelien.sollaud@orange-ftgroup.com
-  RFC5460          ||      M. Stapp         ||       mjs@cisco.com
-  RFC5461          ||      F. Gont         ||       fernando@gont.com.ar
-  RFC5462          ||      L. Andersson, R. Asati         ||       loa@pi.nu, rajiva@cisco.com
-  RFC5463          ||      N. Freed         ||       ned.freed@mrochek.com
-  RFC5464          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC5465          ||      A. Gulbrandsen, C. King, A. Melnikov         ||       arnt@oryx.com, Curtis.King@isode.com, Alexey.Melnikov@isode.com
-  RFC5466          ||      A. Melnikov, C. King         ||       Alexey.Melnikov@isode.com, Curtis.King@isode.com
-  RFC5467          ||      L. Berger, A. Takacs, D. Caviglia, D. Fedyk, J. Meuric         ||       lberger@labn.net, attila.takacs@ericsson.com, diego.caviglia@ericsson.com, dwfedyk@nortel.com, julien.meuric@orange-ftgroup.com
-  RFC5468          ||      S. Dasgupta, J. de Oliveira, JP. Vasseur         ||       sukrit@ece.drexel.edu, jau@ece.drexel.edu, jpv@cisco.com
-  RFC5469          ||      P. Eronen, Ed.         ||       pe@iki.fi
-  RFC5470          ||      G. Sadasivan, N. Brownlee, B. Claise, J. Quittek         ||       gsadasiv@rohati.com, n.brownlee@auckland.ac.nz, bclaise@cisco.com, quittek@nw.neclab.eu
-  RFC5471          ||      C. Schmoll, P. Aitken, B. Claise         ||       carsten.schmoll@fokus.fraunhofer.de, paitken@cisco.com, bclaise@cisco.com
-  RFC5472          ||      T. Zseby, E. Boschi, N. Brownlee, B. Claise         ||       tanja.zseby@fokus.fraunhofer.de, elisa.boschi@hitachi-eu.com, nevil@caida.org, bclaise@cisco.com
-  RFC5473          ||      E. Boschi, L. Mark, B. Claise         ||       elisa.boschi@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, bclaise@cisco.com
-  RFC5474          ||      N. Duffield, Ed., D. Chiou, B. Claise, A. Greenberg, M. Grossglauser, J. Rexford         ||       duffield@research.att.com, Derek@ece.utexas.edu, bclaise@cisco.com, albert@microsoft.com, matthias.grossglauser@epfl.ch, jrex@cs.princeton.edu
-  RFC5475          ||      T. Zseby, M. Molina, N. Duffield, S. Niccolini, F. Raspall         ||       tanja.zseby@fokus.fraunhofer.de, maurizio.molina@dante.org.uk, duffield@research.att.com, saverio.niccolini@netlab.nec.de, fredi@entel.upc.es
-  RFC5476          ||      B. Claise, Ed., A. Johnson, J. Quittek         ||       bclaise@cisco.com, andrjohn@cisco.com, quittek@nw.neclab.eu
-  RFC5477          ||      T. Dietz, B. Claise, P. Aitken, F. Dressler, G. Carle         ||       Thomas.Dietz@nw.neclab.eu, bclaise@cisco.com, paitken@cisco.com, dressler@informatik.uni-erlangen.de, carle@informatik.uni-tuebingen.de
-  RFC5478          ||      J. Polk         ||       jmpolk@cisco.com
-  RFC5479          ||      D. Wing, Ed., S. Fries, H. Tschofenig, F. Audet         ||       dwing-ietf@fuggles.com, steffen.fries@siemens.com, Hannes.Tschofenig@nsn.com, audet@nortel.com
-  RFC5480          ||      S. Turner, D. Brown, K. Yiu, R. Housley, T. Polk         ||       turners@ieca.com, kelviny@microsoft.com, dbrown@certicom.com, housley@vigilsec.com, wpolk@nist.gov
-  RFC5481          ||      A. Morton, B. Claise         ||       acmorton@att.com, bclaise@cisco.com
-  RFC5482          ||      L. Eggert, F. Gont         ||       lars.eggert@nokia.com, fernando@gont.com.ar
-  RFC5483          ||      L. Conroy, K. Fujiwara         ||       lconroy@insensate.co.uk, fujiwara@jprs.co.jp
-  RFC5484          ||      D. Singer         ||       singer@apple.com
-  RFC5485          ||      R. Housley         ||       housley@vigilsec.com
-  RFC5486          ||      D. Malas, Ed., D. Meyer, Ed.         ||       d.malas@cablelabs.com, dmm@1-4-5.net
-  RFC5487          ||      M. Badra         ||       badra@isima.fr
-  RFC5488          ||      S. Gundavelli, G. Keeni, K. Koide, K. Nagami         ||       sgundave@cisco.com, glenn@cysols.com, ka-koide@kddi.com, nagami@inetcore.com
-  RFC5489          ||      M. Badra, I. Hajjeh         ||       badra@isima.fr, ibrahim.hajjeh@ineovation.fr
-  RFC5490          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
-  RFC5491          ||      J. Winterbottom, M. Thomson, H. Tschofenig         ||       james.winterbottom@andrew.com, martin.thomson@andrew.com, Hannes.Tschofenig@gmx.net
-  RFC5492          ||      J. Scudder, R. Chandra         ||       jgs@juniper.net, rchandra@sonoasystems.com
-  RFC5493          ||      D. Caviglia, D. Bramanti, D. Li, D. McDysan         ||       diego.caviglia@ericsson.com, dino.bramanti@ericsson.com, danli@huawei.com, dave.mcdysan@verizon.com
-  RFC5494          ||      J. Arkko, C. Pignataro         ||       jari.arkko@piuha.net, cpignata@cisco.com
-  RFC5495          ||      D. Li, J. Gao, A. Satyanarayana, S. Bardalai         ||       danli@huawei.com, gjhhit@huawei.com, asatyana@cisco.com, snigdho.bardalai@us.fujitsu.com
-  RFC5496          ||      IJ. Wijnands, A. Boers, E. Rosen         ||       ice@cisco.com, aboers@cisco.com, erosen@cisco.com
-  RFC5497          ||      T. Clausen, C. Dearlove         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com
-  RFC5498          ||      I. Chakeres         ||       ian.chakeres@gmail.com
-  RFC5501          ||      Y. Kamite, Ed., Y. Wada, Y. Serbest, T. Morin, L. Fang         ||       y.kamite@ntt.com, wada.yuichiro@lab.ntt.co.jp, yetik_serbest@labs.att.com, thomas.morin@francetelecom.com, lufang@cisco.com
-  RFC5502          ||      J. van Elburg         ||       HansErik.van.Elburg@ericsson.com
-  RFC5503          ||      F. Andreasen, B. McKibben, B. Marshall         ||       fandreas@cisco.com, B.McKibben@cablelabs.com, wtm@research.att.com
-  RFC5504          ||      K. Fujiwara, Ed., Y. Yoneya, Ed.         ||       fujiwara@jprs.co.jp, yone@jprs.co.jp
-  RFC5505          ||      B. Aboba, D. Thaler, L. Andersson, S. Cheshire         ||       bernarda@microsoft.com, dthaler@microsoft.com, loa.andersson@ericsson.com, cheshire@apple.com
-  RFC5506          ||      I. Johansson, M. Westerlund         ||       ingemar.s.johansson@ericsson.com, magnus.westerlund@ericsson.com
-  RFC5507          ||      IAB, P. Faltstrom, Ed., R. Austein, Ed., P. Koch, Ed.         ||       iab@iab.org, paf@cisco.com, sra@isc.org, pk@denic.de
-  RFC5508          ||      P. Srisuresh, B. Ford, S. Sivakumar, S. Guha         ||       srisuresh@yahoo.com, baford@mpi-sws.org, ssenthil@cisco.com, saikat@cs.cornell.edu
-  RFC5509          ||      S. Loreto         ||       Salvatore.Loreto@ericsson.com
-  RFC5510          ||      J. Lacan, V. Roca, J. Peltotalo, S. Peltotalo         ||       jerome.lacan@isae.fr, vincent.roca@inria.fr, jani.peltotalo@tut.fi, sami.peltotalo@tut.fi
-  RFC5511          ||      A. Farrel         ||       adrian@olddog.co.uk
-  RFC5512          ||      P. Mohapatra, E. Rosen         ||       pmohapat@cisco.com, erosen@cisco.com
-  RFC5513          ||      A. Farrel         ||       adrian@olddog.co.uk
-  RFC5514          ||      E. Vyncke         ||       evyncke@cisco.com
-  RFC5515          ||      V. Mammoliti, C. Pignataro, P. Arberg, J. Gibbons, P. Howard         ||       vince@cisco.com, cpignata@cisco.com, parberg@redback.com, jgibbons@juniper.net, howsoft@mindspring.com
-  RFC5516          ||      M. Jones, L. Morand         ||       mark.jones@bridgewatersystems.com, lionel.morand@orange-ftgroup.com
-  RFC5517          ||      S. HomChaudhuri, M. Foschiano         ||       sanjibhc@gmail.com, foschia@cisco.com
-  RFC5518          ||      P. Hoffman, J. Levine, A. Hathcock         ||       paul.hoffman@domain-assurance.org, john.levine@domain-assurance.org, arvel.hathcock@altn.com
-  RFC5519          ||      J. Chesterfield, B. Haberman, Ed.         ||       julian.chesterfield@cl.cam.ac.uk, brian@innovationslab.net
-  RFC5520          ||      R. Bradford, Ed., JP. Vasseur, A. Farrel         ||       rbradfor@cisco.com, jpv@cisco.com, adrian@olddog.co.uk
-  RFC5521          ||      E. Oki, T. Takeda, A. Farrel         ||       oki@ice.uec.ac.jp, takeda.tomonori@lab.ntt.co.jp, adrian@olddog.co.uk
-  RFC5522          ||      W. Eddy, W. Ivancic, T. Davis         ||       weddy@grc.nasa.gov, William.D.Ivancic@grc.nasa.gov, Terry.L.Davis@boeing.com
-  RFC5523          ||      L. Berger         ||       lberger@labn.net
-  RFC5524          ||      D. Cridland         ||       dave.cridland@isode.com
-  RFC5525          ||      T. Dreibholz, J. Mulik         ||       dreibh@iem.uni-due.de, jaiwant@mulik.com
-  RFC5526          ||      J. Livingood, P. Pfautz, R. Stastny         ||       jason_livingood@cable.comcast.com, ppfautz@att.com, richard.stastny@gmail.com
-  RFC5527          ||      M. Haberler, O. Lendl, R. Stastny         ||       ietf@mah.priv.at, otmar.lendl@enum.at, richardstastny@gmail.com
-  RFC5528          ||      A. Kato, M. Kanda, S. Kanno         ||       akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno-s@po.ntts.co.jp
-  RFC5529          ||      A. Kato, M. Kanda, S. Kanno         ||       akato@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno-s@po.ntts.co.jp
-  RFC5530          ||      A. Gulbrandsen         ||       arnt@oryx.com
-  RFC5531          ||      R. Thurlow         ||       robert.thurlow@sun.com
-  RFC5532          ||      T. Talpey, C. Juszczak         ||       tmtalpey@gmail.com, chetnh@earthlink.net
-  RFC5533          ||      E. Nordmark, M. Bagnulo         ||       erik.nordmark@sun.com, marcelo@it.uc3m.es
-  RFC5534          ||      J. Arkko, I. van Beijnum         ||       jari.arkko@ericsson.com, iljitsch@muada.com
-  RFC5535          ||      M. Bagnulo         ||       marcelo@it.uc3m.es
-  RFC5536          ||      K. Murchison, Ed., C. Lindsey, D. Kohn         ||       murch@andrew.cmu.edu, chl@clerew.man.ac.uk, dan@dankohn.com
-  RFC5537          ||      R. Allbery, Ed., C. Lindsey         ||       rra@stanford.edu, chl@clerew.man.ac.uk
-  RFC5538          ||      F. Ellermann         ||       hmdmhdfmhdjmzdtjmzdtzktdkztdjz@gmail.com
-  RFC5539          ||      M. Badra         ||       badra@isima.fr
-  RFC5540          ||      RFC Editor         ||       rfc-editor@rfc-editor.org
-  RFC5541          ||      JL. Le Roux, JP. Vasseur, Y. Lee         ||       jeanlouis.leroux@orange-ftgroup.com, jpv@cisco.com, ylee@huawei.com
-  RFC5542          ||      T. Nadeau, Ed., D. Zelig, Ed., O. Nicklass, Ed.         ||       tom.nadeau@bt.com, davidz@oversi.com, orlyn@radvision.com
-  RFC5543          ||      H. Ould-Brahim, D. Fedyk, Y. Rekhter         ||       hbrahim@nortel.com, donald.fedyk@alcatel-lucent.com, yakov@juniper.com
-  RFC5544          ||      A. Santoni         ||       adriano.santoni@actalis.it
-  RFC5545          ||      B. Desruisseaux, Ed.         ||       bernard.desruisseaux@oracle.com
-  RFC5546          ||      C. Daboo, Ed.         ||       cyrus@daboo.name
-  RFC5547          ||      M. Garcia-Martin, M. Isomaki, G. Camarillo, S. Loreto, P. Kyzivat         ||       miguel.a.garcia@ericsson.com, markus.isomaki@nokia.com, Gonzalo.Camarillo@ericsson.com, Salvatore.Loreto@ericsson.com, pkyzivat@cisco.com
-  RFC5548          ||      M. Dohler, Ed., T. Watteyne, Ed., T. Winter, Ed., D. Barthel, Ed.         ||       mischa.dohler@cttc.es, watteyne@eecs.berkeley.edu, wintert@acm.org, Dominique.Barthel@orange-ftgroup.com
-  RFC5549          ||      F. Le Faucheur, E. Rosen         ||       flefauch@cisco.com, erosen@cisco.com
-  RFC5550          ||      D. Cridland, Ed., A. Melnikov, Ed., S. Maes, Ed.         ||       dave.cridland@isode.com, Alexey.Melnikov@isode.com, stephane.maes@oracle.com
-  RFC5551          ||      R. Gellens, Ed.         ||       rg+ietf@qualcomm.com
-  RFC5552          ||      D. Burke, M. Scott         ||       daveburke@google.com, Mark.Scott@genesyslab.com
-  RFC5553          ||      A. Farrel, Ed., R. Bradford, JP. Vasseur         ||       adrian@olddog.co.uk, rbradfor@cisco.com, jpv@cisco.com
-  RFC5554          ||      N. Williams         ||       Nicolas.Williams@sun.com
-  RFC5555          ||      H. Soliman, Ed.         ||       hesham@elevatemobile.com
-  RFC5556          ||      J. Touch, R. Perlman         ||       touch@isi.edu, Radia.Perlman@sun.com
-  RFC5557          ||      Y. Lee, JL. Le Roux, D. King, E. Oki         ||       ylee@huawei.com, jeanlouis.leroux@orange-ftgroup.com, daniel@olddog.co.uk, oki@ice.uec.ac.jp
-  RFC5558          ||      F. Templin, Ed.         ||       fltemplin@acm.org
-  RFC5559          ||      P. Eardley, Ed.         ||       philip.eardley@bt.com
-  RFC5560          ||      H. Uijterwaal         ||       henk@ripe.net
-  RFC5561          ||      B. Thomas, K. Raza, S. Aggarwal, R. Aggarwal, JL. Le Roux         ||       bobthomas@alum.mit.edu, skraza@cisco.com, shivani@juniper.net, rahul@juniper.net, jeanlouis.leroux@orange-ftgroup.com
-  RFC5562          ||      A. Kuzmanovic, A. Mondal, S. Floyd, K. Ramakrishnan         ||       akuzma@northwestern.edu, a-mondal@northwestern.edu, floyd@icir.org, kkrama@research.att.com
-  RFC5563          ||      K. Leung, G. Dommety, P. Yegani, K. Chowdhury         ||       kleung@cisco.com, gdommety@cisco.com, pyegani@cisco.com, kchowdhury@starentnetworks.com
-  RFC5564          ||      A. El-Sherbiny, M. Farah, I. Oueichek, A. Al-Zoman         ||       El-sherbiny@un.org, farah14@un.org, oueichek@scs-net.org, azoman@citc.gov.sa
-  RFC5565          ||      J. Wu, Y. Cui, C. Metz, E. Rosen         ||       jianping@cernet.edu.cn, yong@csnet1.cs.tsinghua.edu.cn, chmetz@cisco.com, erosen@cisco.com
-  RFC5566          ||      L. Berger, R. White, E. Rosen         ||       lberger@labn.net, riw@cisco.com, erosen@cisco.com
-  RFC5567          ||      T. Melanchuk, Ed.         ||       tim.melanchuk@gmail.com
-  RFC5568          ||      R. Koodli, Ed.         ||       rkoodli@starentnetworks.com
-  RFC5569          ||      R. Despres         ||       remi.despres@free.fr
-  RFC5570          ||      M. StJohns, R. Atkinson, G. Thomas         ||       mstjohns@comcast.net, rja@extremenetworks.com, none
-  RFC5571          ||      B. Storer, C. Pignataro, Ed., M. Dos Santos, B. Stevant, Ed., L. Toutain, J. Tremblay         ||       bstorer@cisco.com, cpignata@cisco.com, mariados@cisco.com, bruno.stevant@telecom-bretagne.eu, laurent.toutain@telecom-bretagne.eu, jf@jftremblay.com
-  RFC5572          ||      M. Blanchet, F. Parent         ||       Marc.Blanchet@viagenie.ca, Florent.Parent@beon.ca
-  RFC5573          ||      M. Thomson         ||       martin.thomson@andrew.com
-  RFC5574          ||      G. Herlein, J. Valin, A. Heggestad, A. Moizard         ||       gherlein@herlein.com, jean-marc.valin@usherbrooke.ca, aeh@db.org, jack@atosc.org
-  RFC5575          ||      P. Marques, N. Sheth, R. Raszuk, B. Greene, J. Mauch, D. McPherson         ||       roque@cisco.com, nsheth@juniper.net, raszuk@cisco.com, bgreene@juniper.net, jmauch@us.ntt.net, danny@arbor.net
-  RFC5576          ||      J. Lennox, J. Ott, T. Schierl         ||       jonathan@vidyo.com, jo@acm.org, ts@thomas-schierl.de
-  RFC5577          ||      P. Luthi, R. Even         ||       patrick.luthi@tandberg.no, ron.even.tlv@gmail.com
-  RFC5578          ||      B. Berry, Ed., S. Ratliff, E. Paradise, T. Kaiser, M. Adams         ||       bberry@cisco.com, sratliff@cisco.com, pdice@cisco.com, timothy.kaiser@harris.com, Michael.D.Adams@L-3com.com
-  RFC5579          ||      F. Templin, Ed.         ||       fltemplin@acm.org
-  RFC5580          ||      H. Tschofenig, Ed., F. Adrangi, M. Jones, A. Lior, B. Aboba         ||       Hannes.Tschofenig@gmx.net, farid.adrangi@intel.com, mark.jones@bridgewatersystems.com, avi@bridgewatersystems.com, bernarda@microsoft.com
-  RFC5581          ||      D. Shaw         ||       dshaw@jabberwocky.com
-  RFC5582          ||      H. Schulzrinne         ||       hgs+ecrit@cs.columbia.edu
-  RFC5583          ||      T. Schierl, S. Wenger         ||       ts@thomas-schierl.de, stewe@stewe.org
-  RFC5584          ||      M. Hatanaka, J. Matsumoto         ||       actech@jp.sony.com, actech@jp.sony.com
-  RFC5585          ||      T. Hansen, D. Crocker, P. Hallam-Baker         ||       tony+dkimov@maillennium.att.com, dcrocker@bbiw.net, phillip@hallambaker.com
-  RFC5586          ||      M. Bocci, Ed., M. Vigoureux, Ed., S. Bryant, Ed.         ||       matthew.bocci@alcatel-lucent.com, martin.vigoureux@alcatel-lucent.com, stbryant@cisco.com
-  RFC5587          ||      N. Williams         ||       Nicolas.Williams@sun.com
-  RFC5588          ||      N. Williams         ||       Nicolas.Williams@sun.com
-  RFC5589          ||      R. Sparks, A. Johnston, Ed., D. Petrie         ||       RjS@nostrum.com, alan@sipstation.com, dan.ietf@SIPez.com
-  RFC5590          ||      D. Harrington, J. Schoenwaelder         ||       ietfdbh@comcast.net, j.schoenwaelder@jacobs-university.de
-  RFC5591          ||      D. Harrington, W. Hardaker         ||       ietfdbh@comcast.net, ietf@hardakers.net
-  RFC5592          ||      D. Harrington, J. Salowey, W. Hardaker         ||       ietfdbh@comcast.net, jsalowey@cisco.com, ietf@hardakers.net
-  RFC5593          ||      N. Cook         ||       neil.cook@noware.co.uk
-  RFC5594          ||      J. Peterson, A. Cooper         ||       jon.peterson@neustar.biz, acooper@cdt.org
-  RFC5595          ||      G. Fairhurst         ||       gorry@erg.abdn.ac.uk
-  RFC5596          ||      G. Fairhurst         ||       gorry@erg.abdn.ac.uk
-  RFC5597          ||      R. Denis-Courmont         ||       rem@videolan.org
-  RFC5598          ||      D. Crocker         ||       dcrocker@bbiw.net
-  RFC5601          ||      T. Nadeau, Ed., D. Zelig, Ed.         ||       thomas.nadeau@bt.com, davidz@oversi.com
-  RFC5602          ||      D. Zelig, Ed., T. Nadeau, Ed.         ||       davidz@oversi.com, tom.nadeau@bt.com
-  RFC5603          ||      D. Zelig, Ed., T. Nadeau, Ed.         ||       davidz@oversi.com, tom.nadeau@bt.com
-  RFC5604          ||      O. Nicklass         ||       orlyn@radvision.com
-  RFC5605          ||      O. Nicklass, T. Nadeau         ||       orlyn@radvision.com, tom.nadeau@bt.com
-  RFC5606          ||      J. Peterson, T. Hardie, J. Morris         ||       jon.peterson@neustar.biz, hardie@qualcomm.com, jmorris@cdt.org
-  RFC5607          ||      D. Nelson, G. Weber         ||       dnelson@elbrysnetworks.com, gdweber@gmail.com
-  RFC5608          ||      K. Narayan, D. Nelson         ||       kaushik_narayan@yahoo.com, dnelson@elbrysnetworks.com
-  RFC5609          ||      V. Fajardo, Ed., Y. Ohba, R. Marin-Lopez         ||       vfajardo@research.telcordia.com, yoshihiro.ohba@toshiba.co.jp, rafa@um.es
-  RFC5610          ||      E. Boschi, B. Trammell, L. Mark, T. Zseby         ||       elisa.boschi@hitachi-eu.com, brian.trammell@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, tanja.zseby@fokus.fraunhofer.de
-  RFC5611          ||      A. Vainshtein, S. Galtzur         ||       Alexander.Vainshtein@ecitele.com, sharon.galtzur@rebellion.co.uk
-  RFC5612          ||      P. Eronen, D. Harrington         ||       pe@iki.fi, dharrington@huawei.com
-  RFC5613          ||      A. Zinin, A. Roy, L. Nguyen, B. Friedman, D. Yeung         ||       alex.zinin@alcatel-lucent.com, akr@cisco.com, lhnguyen@cisco.com, barryf@google.com, myeung@cisco.com
-  RFC5614          ||      R. Ogier, P. Spagnolo         ||       rich.ogier@earthlink.net, phillipspagnolo@gmail.com
-  RFC5615          ||      C. Groves, Y. Lin         ||       Christian.Groves@nteczone.com, linyangbo@huawei.com
-  RFC5616          ||      N. Cook         ||       neil.cook@noware.co.uk
-  RFC5617          ||      E. Allman, J. Fenton, M. Delany, J. Levine         ||       eric+dkim@sendmail.org, fenton@bluepopcorn.net, markd+dkim@yahoo-inc.com, standards@taugh.com
-  RFC5618          ||      A. Morton, K. Hedayat         ||       acmorton@att.com, kaynam.hedayat@exfo.com
-  RFC5619          ||      S. Yamamoto, C. Williams, H. Yokota, F. Parent         ||       shu@nict.go.jp, carlw@mcsr-labs.org, yokota@kddilabs.jp, Florent.Parent@beon.ca
-  RFC5620          ||      O. Kolkman, Ed., IAB         ||       olaf@nlnetlabs.nl, iab@iab.org
-  RFC5621          ||      G. Camarillo         ||       Gonzalo.Camarillo@ericsson.com
-  RFC5622          ||      S. Floyd, E. Kohler         ||       floyd@icir.org, kohler@cs.ucla.edu
-  RFC5623          ||      E. Oki, T. Takeda, JL. Le Roux, A. Farrel         ||       oki@ice.uec.ac.jp, takeda.tomonori@lab.ntt.co.jp, jeanlouis.leroux@orange-ftgroup.com, adrian@olddog.co.uk
-  RFC5624          ||      J. Korhonen, Ed., H. Tschofenig, E. Davies         ||       jouni.korhonen@nsn.com, Hannes.Tschofenig@gmx.net, elwynd@dial.pipex.com
-  RFC5625          ||      R. Bellis         ||       ray.bellis@nominet.org.uk
-  RFC5626          ||      C. Jennings, Ed., R. Mahy, Ed., F. Audet, Ed.         ||       fluffy@cisco.com, rohan@ekabal.com, francois.audet@skypelabs.com
-  RFC5627          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC5628          ||      P. Kyzivat         ||       pkyzivat@cisco.com
-  RFC5629          ||      J. Rosenberg         ||       jdrosen@cisco.com
-  RFC5630          ||      F. Audet         ||       francois.audet@skypelabs.com
-  RFC5631          ||      R. Shacham, H. Schulzrinne, S. Thakolsri, W. Kellerer         ||       shacham@cs.columbia.edu, hgs@cs.columbia.edu, thakolsri@docomolab-euro.com, kellerer@docomolab-euro.com
-  RFC5632          ||      C. Griffiths, J. Livingood, L. Popkin, R. Woundy, Y. Yang         ||       chris_griffiths@cable.comcast.com, jason_livingood@cable.comcast.com, laird@pando.com, richard_woundy@cable.comcast.com, yry@cs.yale.edu
-  RFC5633          ||      S. Dawkins, Ed.         ||       spencer@wonderhamster.org
-  RFC5634          ||      G. Fairhurst, A. Sathiaseelan         ||       gorry@erg.abdn.ac.uk, arjuna@erg.abdn.ac.uk
-  RFC5635          ||      W. Kumari, D. McPherson         ||       warren@kumari.net, danny@arbor.net
-  RFC5636          ||      S. Park, H. Park, Y. Won, J. Lee, S. Kent         ||       shpark@kisa.or.kr, hrpark@kisa.or.kr, yjwon@kisa.or.kr, jilee@kisa.or.kr, kent@bbn.com
-  RFC5637          ||      G. Giaretta, I. Guardini, E. Demaria, J. Bournelle, R. Lopez         ||       gerardo@qualcomm.com, ivano.guardini@telecomitalia.it, elena.demaria@telecomitalia.it, julien.bournelle@gmail.com, rafa@dif.um.es
-  RFC5638          ||      H. Sinnreich, Ed., A. Johnston, E. Shim, K. Singh         ||       henrys@adobe.com, alan@sipstation.com, eunsooshim@gmail.com, kns10@cs.columbia.edu
-  RFC5639          ||      M. Lochter, J. Merkle         ||       manfred.lochter@bsi.bund.de, johannes.merkle@secunet.com
-  RFC5640          ||      C. Filsfils, P. Mohapatra, C. Pignataro         ||       cfilsfil@cisco.com, pmohapat@cisco.com, cpignata@cisco.com
-  RFC5641          ||      N. McGill, C. Pignataro         ||       nmcgill@cisco.com, cpignata@cisco.com
-  RFC5642          ||      S. Venkata, S. Harwani, C. Pignataro, D. McPherson         ||       svenkata@google.com, sharwani@cisco.com, cpignata@cisco.com, danny@arbor.net
-  RFC5643          ||      D. Joyal, Ed., V. Manral, Ed.         ||       djoyal@nortel.com, vishwas@ipinfusion.com
-  RFC5644          ||      E. Stephan, L. Liang, A. Morton         ||       emile.stephan@orange-ftgroup.com, L.Liang@surrey.ac.uk, acmorton@att.com
-  RFC5645          ||      D. Ewell, Ed.         ||       doug@ewellic.org
-  RFC5646          ||      A. Phillips, Ed., M. Davis, Ed.         ||       addison@inter-locale.com, markdavis@google.com
-  RFC5647          ||      K. Igoe, J. Solinas         ||       kmigoe@nsa.gov, jasolin@orion.ncsc.mil
-  RFC5648          ||      R. Wakikawa, Ed., V. Devarapalli, G. Tsirtsis, T. Ernst, K. Nagami         ||       ryuji.wakikawa@gmail.com, vijay@wichorus.com, Tsirtsis@gmail.com, thierry.ernst@inria.fr, nagami@inetcore.com
-  RFC5649          ||      R. Housley, M. Dworkin         ||       housley@vigilsec.com, dworkin@nist.gov
-  RFC5650          ||      M. Morgenstern, S. Baillie, U. Bonollo         ||       moti.Morgenstern@ecitele.com, scott.baillie@nec.com.au, umberto.bonollo@nec.com.au
-  RFC5651          ||      M. Luby, M. Watson, L. Vicisano         ||       luby@qti.qualcomm.com, watson@qualcomm.com, vicisano@qualcomm.com
-  RFC5652          ||      R. Housley         ||       housley@vigilsec.com
-  RFC5653          ||      M. Upadhyay, S. Malkani         ||       m.d.upadhyay+ietf@gmail.com, Seema.Malkani@gmail.com
-  RFC5654          ||      B. Niven-Jenkins, Ed., D. Brungard, Ed., M. Betts, Ed., N. Sprecher, S. Ueno         ||       benjamin.niven-jenkins@bt.com, dbrungard@att.com, malcolm.betts@huawei.com, nurit.sprecher@nsn.com, satoshi.ueno@ntt.com
-  RFC5655          ||      B. Trammell, E. Boschi, L. Mark, T. Zseby, A. Wagner         ||       brian.trammell@hitachi-eu.com, elisa.boschi@hitachi-eu.com, lutz.mark@ifam.fraunhofer.de, tanja.zseby@fokus.fraunhofer.de, arno@wagner.name
-  RFC5656          ||      D. Stebila, J. Green         ||       douglas@stebila.ca, jonathan.green@queensu.ca
-  RFC5657          ||      L. Dusseault, R. Sparks         ||       lisa.dusseault@gmail.com, RjS@nostrum.com
-  RFC5658          ||      T. Froment, C. Lebel, B. Bonnaerens         ||       thomas.froment@tech-invite.com, Christophe.Lebel@alcatel-lucent.fr, ben.bonnaerens@alcatel-lucent.be
-  RFC5659          ||      M. Bocci, S. Bryant         ||       matthew.bocci@alcatel-lucent.com, stbryant@cisco.com
-  RFC5660          ||      N. Williams         ||       Nicolas.Williams@sun.com
-  RFC5661          ||      S. Shepler, Ed., M. Eisler, Ed., D. Noveck, Ed.         ||       shepler@storspeed.com, mike@eisler.com, dnoveck@netapp.com
-  RFC5662          ||      S. Shepler, Ed., M. Eisler, Ed., D. Noveck, Ed.         ||       shepler@storspeed.com, mike@eisler.com, dnoveck@netapp.com
-  RFC5663          ||      D. Black, S. Fridella, J. Glasgow         ||       black_david@emc.com, stevef@nasuni.com, jglasgow@aya.yale.edu
-  RFC5664          ||      B. Halevy, B. Welch, J. Zelenka         ||       bhalevy@panasas.com, welch@panasas.com, jimz@panasas.com
-  RFC5665          ||      M. Eisler         ||       mike@eisler.com
-  RFC5666          ||      T. Talpey, B. Callaghan         ||       tmtalpey@gmail.com, brentc@apple.com
-  RFC5667          ||      T. Talpey, B. Callaghan         ||       tmtalpey@gmail.com, brentc@apple.com
-  RFC5668          ||      Y. Rekhter, S. Sangli, D. Tappan         ||       yakov@juniper.net, rsrihari@cisco.com, Dan.Tappan@Gmail.com
-  RFC5669          ||      S. Yoon, J. Kim, H. Park, H. Jeong, Y. Won         ||       seokung@kisa.or.kr, seopo@kisa.or.kr, hrpark@kisa.or.kr, hcjung@kisa.or.kr, yjwon@kisa.or.kr
-  RFC5670          ||      P. Eardley, Ed.         ||       philip.eardley@bt.com
-  RFC5671          ||      S. Yasukawa, A. Farrel, Ed.         ||       yasukawa.seisho@lab.ntt.co.jp, adrian@olddog.co.uk
-  RFC5672          ||      D. Crocker, Ed.         ||       dcrocker@bbiw.net
-  RFC5673          ||      K. Pister, Ed., P. Thubert, Ed., S. Dwars, T. Phinney         ||       kpister@dustnetworks.com, pthubert@cisco.com, sicco.dwars@shell.com, tom.phinney@cox.net
-  RFC5674          ||      S. Chisholm, R. Gerhards         ||       schishol@nortel.com, rgerhards@adiscon.com
-  RFC5675          ||      V. Marinov, J. Schoenwaelder         ||       v.marinov@jacobs-university.de, j.schoenwaelder@jacobs-university.de
-  RFC5676          ||      J. Schoenwaelder, A. Clemm, A. Karmakar         ||       j.schoenwaelder@jacobs-university.de, alex@cisco.com, akarmaka@cisco.com
-  RFC5677          ||      T. Melia, Ed., G. Bajko, S. Das, N. Golmie, JC. Zuniga         ||       telemaco.melia@alcatel-lucent.com, Gabor.Bajko@nokia.com, subir@research.telcordia.com, nada.golmie@nist.gov, j.c.zuniga@ieee.org
-  RFC5678          ||      G. Bajko, S. Das         ||       gabor.bajko@nokia.com, subir@research.telcordia.com
-  RFC5679          ||      G. Bajko         ||       gabor.bajko@nokia.com
-  RFC5680          ||      S. Dawkins, Ed.         ||       spencer@wonderhamster.org
-  RFC5681          ||      M. Allman, V. Paxson, E. Blanton         ||       mallman@icir.org, vern@icir.org, eblanton@cs.purdue.edu
-  RFC5682          ||      P. Sarolahti, M. Kojo, K. Yamamoto, M. Hata         ||       pasi.sarolahti@iki.fi, kojo@cs.helsinki.fi, yamamotokaz@nttdocomo.co.jp, hatama@s1.nttdocomo.co.jp
-  RFC5683          ||      A. Brusilovsky, I. Faynberg, Z. Zeltsan, S. Patel         ||       Alec.Brusilovsky@alcatel-lucent.com, igor.faynberg@alcatel-lucent.com, zeltsan@alcatel-lucent.com, sarvar@google.com
-  RFC5684          ||      P. Srisuresh, B. Ford         ||       srisuresh@yahoo.com, bryan.ford@yale.edu
-  RFC5685          ||      V. Devarapalli, K. Weniger         ||       vijay@wichorus.com, kilian.weniger@googlemail.com
-  RFC5686          ||      Y. Hiwasaki, H. Ohmuro         ||       hiwasaki.yusuke@lab.ntt.co.jp, ohmuro.hitoshi@lab.ntt.co.jp
-  RFC5687          ||      H. Tschofenig, H. Schulzrinne         ||       Hannes.Tschofenig@gmx.net, hgs+ecrit@cs.columbia.edu
-  RFC5688          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
-  RFC5689          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC5690          ||      S. Floyd, A. Arcia, D. Ros, J. Iyengar         ||       floyd@icir.org, ae.arcia@telecom-bretagne.eu, David.Ros@telecom-bretagne.eu, jiyengar@fandm.edu
-  RFC5691          ||      F. de Bont, S. Doehla, M. Schmidt, R. Sperschneider         ||       frans.de.bont@philips.com, stefan.doehla@iis.fraunhofer.de, malte.schmidt@dolby.com, ralph.sperschneider@iis.fraunhofer.de
-  RFC5692          ||      H. Jeon, S. Jeong, M. Riegel         ||       hongseok.jeon@gmail.com, sjjeong@etri.re.kr, maximilian.riegel@nsn.com
-  RFC5693          ||      J. Seedorf, E. Burger         ||       jan.seedorf@nw.neclab.eu, eburger@standardstrack.com
-  RFC5694          ||      G. Camarillo, Ed., IAB         ||       Gonzalo.Camarillo@ericsson.com, iab@iab.org
-  RFC5695          ||      A. Akhter, R. Asati, C. Pignataro         ||       aakhter@cisco.com, rajiva@cisco.com, cpignata@cisco.com
-  RFC5696          ||      T. Moncaster, B. Briscoe, M. Menth         ||       toby.moncaster@bt.com, bob.briscoe@bt.com, menth@informatik.uni-wuerzburg.de
-  RFC5697          ||      S. Farrell         ||       stephen.farrell@cs.tcd.ie
-  RFC5698          ||      T. Kunz, S. Okunick, U. Pordesch         ||       thomas.kunz@sit.fraunhofer.de, susanne.okunick@pawisda.de, ulrich.pordesch@zv.fraunhofer.de
-  RFC5701          ||      Y. Rekhter         ||       yakov@juniper.net
-  RFC5702          ||      J. Jansen         ||       jelte@NLnetLabs.nl
-  RFC5703          ||      T. Hansen, C. Daboo         ||       tony+sieveloop@maillennium.att.com, cyrus@daboo.name
-  RFC5704          ||      S. Bryant, Ed., M. Morrow, Ed., IAB         ||       stbryant@cisco.com, mmorrow@cisco.com, iab@iab.org
-  RFC5705          ||      E. Rescorla         ||       ekr@rtfm.com
-  RFC5706          ||      D. Harrington         ||       ietfdbh@comcast.net
-  RFC5707          ||      A. Saleem, Y. Xin, G. Sharratt         ||       adnan.saleem@RadiSys.com, yong.xin@RadiSys.com, garland.sharratt@gmail.com
-  RFC5708          ||      A. Keromytis         ||       angelos@cs.columbia.edu
-  RFC5709          ||      M. Bhatia, V. Manral, M. Fanto, R. White, M. Barnes, T. Li, R. Atkinson         ||       manav@alcatel-lucent.com, vishwas@ipinfusion.com, mfanto@aegisdatasecurity.com, riw@cisco.com, mjbarnes@cisco.com, tony.li@tony.li, rja@extremenetworks.com
-  RFC5710          ||      L. Berger, D. Papadimitriou, JP. Vasseur         ||       lberger@labn.net, Dimitri.Papadimitriou@alcatel-lucent.be, jpv@cisco.com
-  RFC5711          ||      JP. Vasseur, Ed., G. Swallow, I. Minei         ||       jpv@cisco.com, swallow@cisco.com, ina@juniper.net
-  RFC5712          ||      M. Meyer, Ed., JP. Vasseur, Ed.         ||       matthew.meyer@bt.com, jpv@cisco.com
-  RFC5713          ||      H. Moustafa, H. Tschofenig, S. De Cnodder         ||       hassnaa.moustafa@orange-ftgroup.com, Hannes.Tschofenig@gmx.net, stefaan.de_cnodder@alcatel-lucent.com
-  RFC5714          ||      M. Shand, S. Bryant         ||       mshand@cisco.com, stbryant@cisco.com
-  RFC5715          ||      M. Shand, S. Bryant         ||       mshand@cisco.com, stbryant@cisco.com
-  RFC5716          ||      J. Lentini, C. Everhart, D. Ellard, R. Tewari, M. Naik         ||       jlentini@netapp.com, everhart@netapp.com, dellard@bbn.com, tewarir@us.ibm.com, manoj@almaden.ibm.com
-  RFC5717          ||      B. Lengyel, M. Bjorklund         ||       balazs.lengyel@ericsson.com, mbj@tail-f.com
-  RFC5718          ||      D. Beller, A. Farrel         ||       dieter.beller@alcatel-lucent.com, adrian@olddog.co.uk
-  RFC5719          ||      D. Romascanu, H. Tschofenig         ||       dromasca@gmail.com , Hannes.Tschofenig@gmx.net
-  RFC5720          ||      F. Templin         ||       fltemplin@acm.org
-  RFC5721          ||      R. Gellens, C. Newman         ||       rg+ietf@qualcomm.com, chris.newman@sun.com
-  RFC5722          ||      S. Krishnan         ||       suresh.krishnan@ericsson.com
-  RFC5723          ||      Y. Sheffer, H. Tschofenig         ||       yaronf@checkpoint.com, Hannes.Tschofenig@gmx.net
-  RFC5724          ||      E. Wilde, A. Vaha-Sipila         ||       dret@berkeley.edu, antti.vaha-sipila@nokia.com
-  RFC5725          ||      A. Begen, D. Hsu, M. Lague         ||       abegen@cisco.com, dohsu@cisco.com, mlague@cisco.com
-  RFC5726          ||      Y. Qiu, F. Zhao, Ed., R. Koodli         ||       qiuying@i2r.a-star.edu.sg, fanzhao@google.com, rkoodli@cisco.com
-  RFC5727          ||      J. Peterson, C. Jennings, R. Sparks         ||       jon.peterson@neustar.biz, fluffy@cisco.com, rjsparks@nostrum.com
-  RFC5728          ||      S. Combes, P. Amundsen, M. Lambert, H-P. Lexow         ||       stephane.combes@esa.int, pca@verisat.no, micheline.lambert@advantechamt.com, hlexow@stmi.com
-  RFC5729          ||      J. Korhonen, Ed., M. Jones, L. Morand, T. Tsou         ||       jouni.nospam@gmail.com, Mark.Jones@bridgewatersystems.com, Lionel.morand@orange-ftgroup.com, tena@huawei.com
-  RFC5730          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC5731          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC5732          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC5733          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC5734          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC5735          ||      M. Cotton, L. Vegoda         ||       michelle.cotton@icann.org, leo.vegoda@icann.org
-  RFC5736          ||      G. Huston, M. Cotton, L. Vegoda         ||       gih@apnic.net, michelle.cotton@icann.org, leo.vegoda@icann.org
-  RFC5737          ||      J. Arkko, M. Cotton, L. Vegoda         ||       jari.arkko@piuha.net, michelle.cotton@icann.org, leo.vegoda@icann.org
-  RFC5738          ||      P. Resnick, C. Newman         ||       presnick@qti.qualcomm.com, chris.newman@sun.com
-  RFC5739          ||      P. Eronen, J. Laganier, C. Madson         ||       pe@iki.fi, julienl@qualcomm.com, cmadson@cisco.com
-  RFC5740          ||      B. Adamson, C. Bormann, M. Handley, J. Macker         ||       adamson@itd.nrl.navy.mil, cabo@tzi.org, M.Handley@cs.ucl.ac.uk, macker@itd.nrl.navy.mil
-  RFC5741          ||      L. Daigle, Ed., O. Kolkman, Ed., IAB         ||       leslie@thinkingcat.com, olaf@nlnetlabs.nl, iab@iab.org
-  RFC5742          ||      H. Alvestrand, R. Housley         ||       harald@alvestrand.no, housley@vigilsec.com
-  RFC5743          ||      A. Falk         ||       falk@bbn.com
-  RFC5744          ||      R. Braden, J. Halpern         ||       braden@isi.edu, jhalpern@redback.com
-  RFC5745          ||      A. Malis, Ed., IAB         ||       andrew.g.malis@verizon.com, iab@iab.org
-  RFC5746          ||      E. Rescorla, M. Ray, S. Dispensa, N. Oskov         ||       ekr@rtfm.com, marsh@extendedsubset.com, dispensa@phonefactor.com, nasko.oskov@microsoft.com
-  RFC5747          ||      J. Wu, Y. Cui, X. Li, M. Xu, C. Metz         ||       jianping@cernet.edu.cn, cy@csnet1.cs.tsinghua.edu.cn, xing@cernet.edu.cn, xmw@csnet1.cs.tsinghua.edu.cn, chmetz@cisco.com
-  RFC5748          ||      S. Yoon, J. Jeong, H. Kim, H. Jeong, Y. Won         ||       seokung@kisa.or.kr, jijeong@kisa.or.kr, rinyfeel@kisa.or.kr, hcjung@kisa.or.kr, yjwon@kisa.or.kr
-  RFC5749          ||      K. Hoeper, Ed., M. Nakhjiri, Y. Ohba, Ed.         ||       khoeper@motorola.com, madjid.nakhjiri@motorola.com, yoshihiro.ohba@toshiba.co.jp
-  RFC5750          ||      B. Ramsdell, S. Turner         ||       blaker@gmail.com, turners@ieca.com
-  RFC5751          ||      B. Ramsdell, S. Turner         ||       blaker@gmail.com, turners@ieca.com
-  RFC5752          ||      S. Turner, J. Schaad         ||       turners@ieca.com, jimsch@exmsft.com
-  RFC5753          ||      S. Turner, D. Brown         ||       turners@ieca.com, dbrown@certicom.com
-  RFC5754          ||      S. Turner         ||       turners@ieca.com
-  RFC5755          ||      S. Farrell, R. Housley, S. Turner         ||       stephen.farrell@cs.tcd.ie, housley@vigilsec.com, turners@ieca.com
-  RFC5756          ||      S. Turner, D. Brown, K. Yiu, R. Housley, T. Polk         ||       turners@ieca.com, dbrown@certicom.com, kelviny@microsoft.com, housley@vigilsec.com, wpolk@nist.gov
-  RFC5757          ||      T. Schmidt, M. Waehlisch, G. Fairhurst         ||       schmidt@informatik.haw-hamburg.de, mw@link-lab.net, gorry@erg.abdn.ac.uk
-  RFC5758          ||      Q. Dang, S. Santesson, K. Moriarty, D. Brown, T. Polk         ||       quynh.dang@nist.gov, sts@aaa-sec.com, Moriarty_Kathleen@emc.com, dbrown@certicom.com, tim.polk@nist.gov
-  RFC5759          ||      J. Solinas, L. Zieglar         ||       jasolin@orion.ncsc.mil, llziegl@tycho.ncsc.mil
-  RFC5760          ||      J. Ott, J. Chesterfield, E. Schooler         ||       jo@acm.org, julianchesterfield@cantab.net, eve_schooler@acm.org
-  RFC5761          ||      C. Perkins, M. Westerlund         ||       csp@csperkins.org, magnus.westerlund@ericsson.com
-  RFC5762          ||      C. Perkins         ||       csp@csperkins.org
-  RFC5763          ||      J. Fischl, H. Tschofenig, E. Rescorla         ||       jason.fischl@skype.net, Hannes.Tschofenig@gmx.net, ekr@rtfm.com
-  RFC5764          ||      D. McGrew, E. Rescorla         ||       mcgrew@cisco.com, ekr@rtfm.com
-  RFC5765          ||      H. Schulzrinne, E. Marocco, E. Ivov         ||       hgs@cs.columbia.edu, enrico.marocco@telecomitalia.it, emcho@sip-communicator.org
-  RFC5766          ||      R. Mahy, P. Matthews, J. Rosenberg         ||       rohan@ekabal.com, philip_matthews@magma.ca, jdrosen@jdrosen.net
-  RFC5767          ||      M. Munakata, S. Schubert, T. Ohba         ||       munakata.mayumi@lab.ntt.co.jp, shida@ntt-at.com, ohba.takumi@lab.ntt.co.jp
-  RFC5768          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
-  RFC5769          ||      R. Denis-Courmont         ||       remi.denis-courmont@nokia.com
-  RFC5770          ||      M. Komu, T. Henderson, H. Tschofenig, J. Melen, A. Keranen, Ed.         ||       miika@iki.fi, thomas.r.henderson@boeing.com, Hannes.Tschofenig@gmx.net, jan.melen@ericsson.com, ari.keranen@ericsson.com
-  RFC5771          ||      M. Cotton, L. Vegoda, D. Meyer         ||       michelle.cotton@icann.org, leo.vegoda@icann.org, dmm@1-4-5.net
-  RFC5772          ||      A. Doria, E. Davies, F. Kastenholz         ||       avri@ltu.se, elwynd@dial.pipex.com, frank@bbn.com
-  RFC5773          ||      E. Davies, A. Doria         ||       elwynd@dial.pipex.com, avri@acm.org
-  RFC5774          ||      K. Wolf, A. Mayrhofer         ||       karlheinz.wolf@nic.at, alexander.mayrhofer@nic.at
-  RFC5775          ||      M. Luby, M. Watson, L. Vicisano         ||       luby@qti.qualcomm.com, watson@qualcomm.com, vicisano@qualcomm.com
-  RFC5776          ||      V. Roca, A. Francillon, S. Faurite         ||       vincent.roca@inria.fr, aurelien.francillon@inria.fr, faurite@lcpc.fr
-  RFC5777          ||      J. Korhonen, H. Tschofenig, M. Arumaithurai, M. Jones, Ed., A. Lior         ||       jouni.korhonen@nsn.com, Hannes.Tschofenig@gmx.net, mayutan.arumaithurai@gmail.com, mark.jones@bridgewatersystems.com, avi@bridgewatersystems.com
-  RFC5778          ||      J. Korhonen, Ed., H. Tschofenig, J. Bournelle, G. Giaretta, M. Nakhjiri         ||       jouni.nospam@gmail.com, Hannes.Tschofenig@gmx.net, julien.bournelle@orange-ftgroup.com, gerardo.giaretta@gmail.com, madjid.nakhjiri@motorola.com
-  RFC5779          ||      J. Korhonen, Ed., J. Bournelle, K. Chowdhury, A. Muhanna, U. Meyer         ||       jouni.nospam@gmail.com, julien.bournelle@orange-ftgroup.com, kchowdhury@cisco.com, Ahmad.muhanna@ericsson.com, meyer@umic.rwth-aachen.de
-  RFC5780          ||      D. MacDonald, B. Lowekamp         ||       derek.macdonald@gmail.com, bbl@lowekamp.net
-  RFC5781          ||      S. Weiler, D. Ward, R. Housley         ||       weiler@tislabs.com, dward@juniper.net, housley@vigilsec.com
-  RFC5782          ||      J. Levine         ||       standards@taugh.com
-  RFC5783          ||      M. Welzl, W. Eddy         ||       michawe@ifi.uio.no, wes@mti-systems.com
-  RFC5784          ||      N. Freed, S. Vedam         ||       ned.freed@mrochek.com, Srinivas.Sv@Sun.COM
-  RFC5785          ||      M. Nottingham, E. Hammer-Lahav         ||       mnot@mnot.net, eran@hueniverse.com
-  RFC5786          ||      R. Aggarwal, K. Kompella         ||       rahul@juniper.net, kireeti@juniper.net
-  RFC5787          ||      D. Papadimitriou         ||       dimitri.papadimitriou@alcatel-lucent.be
-  RFC5788          ||      A. Melnikov, D. Cridland         ||       Alexey.Melnikov@isode.com, dave.cridland@isode.com
-  RFC5789          ||      L. Dusseault, J. Snell         ||       lisa.dusseault@gmail.com, jasnell@gmail.com
-  RFC5790          ||      H. Liu, W. Cao, H. Asaeda         ||       Liuhui47967@huawei.com, caowayne@huawei.com, asaeda@wide.ad.jp
-  RFC5791          ||      J. Reschke, J. Kunze         ||       julian.reschke@greenbytes.de, jak@ucop.edu
-  RFC5792          ||      P. Sangster, K. Narayan         ||       Paul_Sangster@symantec.com, kaushik@cisco.com
-  RFC5793          ||      R. Sahita, S. Hanna, R. Hurst, K. Narayan         ||       Ravi.Sahita@intel.com, shanna@juniper.net, Ryan.Hurst@microsoft.com, kaushik@cisco.com
-  RFC5794          ||      J. Lee, J. Lee, J. Kim, D. Kwon, C. Kim         ||       jklee@ensec.re.kr, jlee05@ensec.re.kr, jaeheon@ensec.re.kr, ds_kwon@ensec.re.kr, jbr@ensec.re.kr
-  RFC5795          ||      K. Sandlund, G. Pelletier, L-E. Jonsson         ||       kristofer.sandlund@ericsson.com, ghyslain.pelletier@ericsson.com, lars-erik@lejonsson.com
-  RFC5796          ||      W. Atwood, S. Islam, M. Siami         ||       bill@cse.concordia.ca, Salekul.Islam@emt.inrs.ca, mzrsm@yahoo.ca
-  RFC5797          ||      J. Klensin, A. Hoenes         ||       john+ietf@jck.com, ah@TR-Sys.de
-  RFC5798          ||      S. Nadas, Ed.         ||       stephen.nadas@ericsson.com
-  RFC5801          ||      S. Josefsson, N. Williams         ||       simon@josefsson.org, Nicolas.Williams@oracle.com
-  RFC5802          ||      C. Newman, A. Menon-Sen, A. Melnikov, N. Williams         ||       chris.newman@oracle.com, ams@toroid.org, Alexey.Melnikov@isode.com, Nicolas.Williams@oracle.com
-  RFC5803          ||      A. Melnikov         ||       alexey.melnikov@isode.com
-  RFC5804          ||      A. Melnikov, Ed., T. Martin         ||       Alexey.Melnikov@isode.com, timmartin@alumni.cmu.edu
-  RFC5805          ||      K. Zeilenga         ||       Kurt.Zeilenga@Isode.COM
-  RFC5806          ||      S. Levy, M. Mohali, Ed.         ||       stlevy@cisco.com, marianne.mohali@orange-ftgroup.com
-  RFC5807          ||      Y. Ohba, A. Yegin         ||       yoshihiro.ohba@toshiba.co.jp, alper.yegin@yegin.org
-  RFC5808          ||      R. Marshall, Ed.         ||       rmarshall@telecomsys.com
-  RFC5810          ||      A. Doria, Ed., J. Hadi Salim, Ed., R. Haas, Ed., H. Khosravi, Ed., W. Wang, Ed., L. Dong, R. Gopal, J. Halpern         ||       avri@ltu.se, hadi@mojatatu.com, rha@zurich.ibm.com, hormuzd.m.khosravi@intel.com, wmwang@mail.zjgsu.edu.cn, donglg@zjgsu.edu.cn, ram.gopal@nsn.com, jmh@joelhalpern.com
-  RFC5811          ||      J. Hadi Salim, K. Ogawa         ||       hadi@mojatatu.com, ogawa.kentaro@lab.ntt.co.jp
-  RFC5812          ||      J. Halpern, J. Hadi Salim         ||       jmh@joelhalpern.com, hadi@mojatatu.com
-  RFC5813          ||      R. Haas         ||       rha@zurich.ibm.com
-  RFC5814          ||      W. Sun, Ed., G. Zhang, Ed.         ||       sunwq@mit.edu, zhangguoying@mail.ritt.com.cn
-  RFC5815          ||      T. Dietz, Ed., A. Kobayashi, B. Claise, G. Muenz         ||       Thomas.Dietz@nw.neclab.eu, akoba@nttv6.net, bclaise@cisco.com, muenz@net.in.tum.de
-  RFC5816          ||      S. Santesson, N. Pope         ||       sts@aaa-sec.com, nick.pope@thales-esecurity.com
-  RFC5817          ||      Z. Ali, JP. Vasseur, A. Zamfir, J. Newton         ||       zali@cisco.com, jpv@cisco.com, ancaz@cisco.com, jonathan.newton@cw.com
-  RFC5818          ||      D. Li, H. Xu, S. Bardalai, J. Meuric, D. Caviglia         ||       danli@huawei.com, xuhuiying@huawei.com, snigdho.bardalai@us.fujitsu.com, julien.meuric@orange-ftgroup.com, diego.caviglia@ericsson.com
-  RFC5819          ||      A. Melnikov, T. Sirainen         ||       Alexey.Melnikov@isode.com, tss@iki.fi
-  RFC5820          ||      A. Roy, Ed., M. Chandra, Ed.         ||       akr@cisco.com, mw.chandra@gmail.com
-  RFC5824          ||      K. Kumaki, Ed., R. Zhang, Y. Kamite         ||       ke-kumaki@kddi.com, raymond.zhang@bt.com, y.kamite@ntt.com
-  RFC5825          ||      K. Fujiwara, B. Leiba         ||       fujiwara@jprs.co.jp, barryleiba@computer.org
-  RFC5826          ||      A. Brandt, J. Buron, G. Porcu         ||       abr@sdesigns.dk, jbu@sdesigns.dk, gporcu@gmail.com
-  RFC5827          ||      M. Allman, K. Avrachenkov, U. Ayesta, J. Blanton, P. Hurtig         ||       mallman@icir.org, k.avrachenkov@sophia.inria.fr, urtzi@laas.fr, jblanton@irg.cs.ohiou.edu, per.hurtig@kau.se
-  RFC5828          ||      D. Fedyk, L. Berger, L. Andersson         ||       donald.fedyk@alcatel-lucent.com, lberger@labn.net, loa.andersson@ericsson.com
-  RFC5829          ||      A. Brown, G. Clemm, J. Reschke, Ed.         ||       albertcbrown@us.ibm.com, geoffrey.clemm@us.ibm.com, julian.reschke@greenbytes.de
-  RFC5830          ||      V. Dolmatov, Ed.         ||       dol@cryptocom.ru
-  RFC5831          ||      V. Dolmatov, Ed.         ||       dol@cryptocom.ru
-  RFC5832          ||      V. Dolmatov, Ed.         ||       dol@cryptocom.ru
-  RFC5833          ||      Y. Shi, Ed., D. Perkins, Ed., C. Elliott, Ed., Y. Zhang, Ed.         ||       rishyang@gmail.com, dperkins@dsperkins.com, chelliot@pobox.com, yzhang@fortinet.com
-  RFC5834          ||      Y. Shi, Ed., D. Perkins, Ed., C. Elliott, Ed., Y. Zhang, Ed.         ||       rishyang@gmail.com, dperkins@dsperkins.com, chelliot@pobox.com, yzhang@fortinet.com
-  RFC5835          ||      A. Morton, Ed., S. Van den Berghe, Ed.         ||       acmorton@att.com, steven.van_den_berghe@alcatel-lucent.com
-  RFC5836          ||      Y. Ohba, Ed., Q. Wu, Ed., G. Zorn, Ed.         ||       oshihiro.ohba@toshiba.co.jp, sunseawq@huawei.com, gwz@net-zen.net
-  RFC5837          ||      A. Atlas, Ed., R. Bonica, Ed., C. Pignataro, Ed., N. Shen, JR. Rivers         ||       alia.atlas@bt.com, rbonica@juniper.net, cpignata@cisco.com, naiming@cisco.com, jrrivers@yahoo.com
-  RFC5838          ||      A. Lindem, Ed., S. Mirtorabi, A. Roy, M. Barnes, R. Aggarwal         ||       acee.lindem@ericsson.com, smirtora@cisco.com, akr@cisco.com, mjbarnes@cisco.com, rahul@juniper.net
-  RFC5839          ||      A. Niemi, D. Willis, Ed.         ||       aki.niemi@nokia.com, dean.willis@softarmor.com
-  RFC5840          ||      K. Grewal, G. Montenegro, M. Bhatia         ||       ken.grewal@intel.com, gabriel.montenegro@microsoft.com, manav.bhatia@alcatel-lucent.com
-  RFC5841          ||      R. Hay, W. Turkal         ||       rhay@google.com, turkal@google.com
-  RFC5842          ||      G. Clemm, J. Crawford, J. Reschke, Ed., J. Whitehead         ||       geoffrey.clemm@us.ibm.com, ccjason@us.ibm.com, julian.reschke@greenbytes.de, ejw@cse.ucsc.edu
-  RFC5843          ||      A. Bryan         ||       anthonybryan@gmail.com
-  RFC5844          ||      R. Wakikawa, S. Gundavelli         ||       ryuji@us.toyota-itc.com, sgundave@cisco.com
-  RFC5845          ||      A. Muhanna, M. Khalil, S. Gundavelli, K. Leung         ||       ahmad.muhanna@ericsson.com, Mohamed.khalil@ericsson.com, sgundave@cisco.com, kleung@cisco.com
-  RFC5846          ||      A. Muhanna, M. Khalil, S. Gundavelli, K. Chowdhury, P. Yegani         ||       ahmad.muhanna@ericsson.com, mohamed.khalil@ericsson.com, sgundave@cisco.com, kchowdhu@cisco.com, pyegani@juniper.net
-  RFC5847          ||      V. Devarapalli, Ed., R. Koodli, Ed., H. Lim, N. Kant, S. Krishnan, J. Laganier         ||       vijay@wichorus.com, rkoodli@cisco.com, hlim@stoke.com, nishi@stoke.com, suresh.krishnan@ericsson.com, julienl@qualcomm.com
-  RFC5848          ||      J. Kelsey, J. Callas, A. Clemm         ||       john.kelsey@nist.gov, jon@callas.org, alex@cisco.com
-  RFC5849          ||      E. Hammer-Lahav, Ed.         ||       eran@hueniverse.com
-  RFC5850          ||      R. Mahy, R. Sparks, J. Rosenberg, D. Petrie, A. Johnston, Ed.         ||       rohan@ekabal.com, rjsparks@nostrum.com, jdrosen@jdrosen.net, dpetrie@sipez.com, alan@sipstation.com
-  RFC5851          ||      S. Ooghe, N. Voigt, M. Platnic, T. Haag, S. Wadhwa         ||       sven.ooghe@alcatel-lucent.com, norbert.voigt@nsn.com, mplatnic@gmail.com, haagt@telekom.de, swadhwa@juniper.net
-  RFC5852          ||      D. Caviglia, D. Ceccarelli, D. Bramanti, D. Li, S. Bardalai         ||       diego.caviglia@ericsson.com, daniele.ceccarelli@ericsson.com, none, danli@huawei.com, sbardalai@gmail.com
-  RFC5853          ||      J. Hautakorpi, Ed., G. Camarillo, R. Penfield, A. Hawrylyshen, M. Bhatia         ||       Jani.Hautakorpi@ericsson.com, Gonzalo.Camarillo@ericsson.com, bpenfield@acmepacket.com, alan.ietf@polyphase.ca, mbhatia@3clogic.com
-  RFC5854          ||      A. Bryan, T. Tsujikawa, N. McNab, P. Poeml         ||       anthonybryan@gmail.com, tatsuhiro.t@gmail.com, neil@nabber.org, peter@poeml.de
-  RFC5855          ||      J. Abley, T. Manderson         ||       joe.abley@icann.org, terry.manderson@icann.org
-  RFC5856          ||      E. Ertekin, R. Jasani, C. Christou, C. Bormann         ||       ertekin_emre@bah.com, ro@breakcheck.com, christou_chris@bah.com, cabo@tzi.org
-  RFC5857          ||      E. Ertekin, C. Christou, R. Jasani, T. Kivinen, C. Bormann         ||       ertekin_emre@bah.com, christou_chris@bah.com, ro@breakcheck.com, kivinen@iki.fi, cabo@tzi.org
-  RFC5858          ||      E. Ertekin, C. Christou, C. Bormann         ||       ertekin_emre@bah.com, christou_chris@bah.com, cabo@tzi.org
-  RFC5859          ||      R. Johnson         ||       raj@cisco.com
-  RFC5860          ||      M. Vigoureux, Ed., D. Ward, Ed., M. Betts, Ed.         ||       martin.vigoureux@alcatel-lucent.com, dward@juniper.net, malcolm.betts@rogers.com
-  RFC5861          ||      M. Nottingham         ||       mnot@yahoo-inc.com
-  RFC5862          ||      S. Yasukawa, A. Farrel         ||       yasukawa.seisho@lab.ntt.co.jp, adrian@olddog.co.uk
-  RFC5863          ||      T. Hansen, E. Siegel, P. Hallam-Baker, D. Crocker         ||       tony+dkimov@maillennium.att.com, dkim@esiegel.net, phillip@hallambaker.com, dcrocker@bbiw.net
-  RFC5864          ||      R. Allbery         ||       rra@stanford.edu
-  RFC5865          ||      F. Baker, J. Polk, M. Dolly         ||       fred@cisco.com, jmpolk@cisco.com, mdolly@att.com
-  RFC5866          ||      D. Sun, Ed., P. McCann, H. Tschofenig, T. Tsou, A. Doria, G. Zorn, Ed.         ||       d.sun@alcatel-lucent.com, pete.mccann@motorola.com, Hannes.Tschofenig@gmx.net, tena@huawei.com, avri@ltu.se, gwz@net-zen.net
-  RFC5867          ||      J. Martocci, Ed., P. De Mil, N. Riou, W. Vermeylen         ||       jerald.p.martocci@jci.com, pieter.demil@intec.ugent.be, nicolas.riou@fr.schneider-electric.com, wouter@vooruit.be
-  RFC5868          ||      S. Sakane, K. Kamada, S. Zrelli, M. Ishiyama         ||       Shouichi.Sakane@jp.yokogawa.com, Ken-ichi.Kamada@jp.yokogawa.com, Saber.Zrelli@jp.yokogawa.com, masahiro@isl.rdc.toshiba.co.jp
-  RFC5869          ||      H. Krawczyk, P. Eronen         ||       hugokraw@us.ibm.com, pe@iki.fi
-  RFC5870          ||      A. Mayrhofer, C. Spanring         ||       alexander.mayrhofer@ipcom.at, christian@spanring.eu
-  RFC5871          ||      J. Arkko, S. Bradner         ||       jari.arkko@piuha.net, sob@harvard.edu
-  RFC5872          ||      J. Arkko, A. Yegin         ||       jari.arkko@piuha.net, alper.yegin@yegin.org
-  RFC5873          ||      Y. Ohba, A. Yegin         ||       yoshihiro.ohba@toshiba.co.jp, alper.yegin@yegin.org
-  RFC5874          ||      J. Rosenberg, J. Urpalainen         ||       jdrosen.net, jari.urpalainen@nokia.com
-  RFC5875          ||      J. Urpalainen, D. Willis, Ed.         ||       jari.urpalainen@nokia.com, dean.willis@softarmor.com
-  RFC5876          ||      J. Elwell         ||       john.elwell@siemens-enterprise.com
-  RFC5877          ||      R. Housley         ||       housley@vigilsec.com
-  RFC5878          ||      M. Brown, R. Housley         ||       mark@redphonesecurity.com, housley@vigilsec.com
-  RFC5879          ||      T. Kivinen, D. McDonald         ||       kivinen@iki.fi, danmcd@opensolaris.org
-  RFC5880          ||      D. Katz, D. Ward         ||       dkatz@juniper.net, dward@juniper.net
-  RFC5881          ||      D. Katz, D. Ward         ||       dkatz@juniper.net, dward@juniper.net
-  RFC5882          ||      D. Katz, D. Ward         ||       dkatz@juniper.net, dward@juniper.net
-  RFC5883          ||      D. Katz, D. Ward         ||       dkatz@juniper.net, dward@juniper.net
-  RFC5884          ||      R. Aggarwal, K. Kompella, T. Nadeau, G. Swallow         ||       rahul@juniper.net, kireeti@juniper.net, tom.nadeau@bt.com, swallow@cisco.com
-  RFC5885          ||      T. Nadeau, Ed., C. Pignataro, Ed.         ||       tom.nadeau@bt.com, cpignata@cisco.com
-  RFC5886          ||      JP. Vasseur, Ed., JL. Le Roux, Y. Ikejiri         ||       jpv@cisco.com, jeanlouis.leroux@orange-ftgroup.com, y.ikejiri@ntt.com
-  RFC5887          ||      B. Carpenter, R. Atkinson, H. Flinck         ||       brian.e.carpenter@gmail.com, rja@extremenetworks.com, hannu.flinck@nsn.com
-  RFC5888          ||      G. Camarillo, H. Schulzrinne         ||       Gonzalo.Camarillo@ericsson.com, schulzrinne@cs.columbia.edu
-  RFC5889          ||      E. Baccelli, Ed., M. Townsley, Ed.         ||       Emmanuel.Baccelli@inria.fr, mark@townsley.net
-  RFC5890          ||      J. Klensin         ||       john+ietf@jck.com
-  RFC5891          ||      J. Klensin         ||       john+ietf@jck.com
-  RFC5892          ||      P. Faltstrom, Ed.         ||       paf@cisco.com
-  RFC5893          ||      H. Alvestrand, Ed., C. Karp         ||       harald@alvestrand.no, ck@nic.museum
-  RFC5894          ||      J. Klensin         ||       john+ietf@jck.com
-  RFC5895          ||      P. Resnick, P. Hoffman         ||       presnick@qti.qualcomm.com, paul.hoffman@vpnc.org
-  RFC5896          ||      L. Hornquist Astrand, S. Hartman         ||       lha@apple.com, hartmans-ietf@mit.edu
-  RFC5897          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
-  RFC5898          ||      F. Andreasen, G. Camarillo, D. Oran, D. Wing         ||       fandreas@cisco.com, Gonzalo.Camarillo@ericsson.com, oran@cisco.com, dwing-ietf@fuggles.com
-  RFC5901          ||      P. Cain, D. Jevans         ||       pcain@coopercain.com, dave.jevans@antiphishing.org
-  RFC5902          ||      D. Thaler, L. Zhang, G. Lebovitz         ||       dthaler@microsoft.com, lixia@cs.ucla.edu, gregory.ietf@gmail.com, iab@iab.org
-  RFC5903          ||      D. Fu, J. Solinas         ||       defu@orion.ncsc.mil, jasolin@orion.ncsc.mil
-  RFC5904          ||      G. Zorn         ||       gwz@net-zen.net
-  RFC5905          ||      D. Mills, J. Martin, Ed., J. Burbank, W. Kasch         ||       mills@udel.edu, jrmii@isc.org, jack.burbank@jhuapl.edu, william.kasch@jhuapl.edu
-  RFC5906          ||      B. Haberman, Ed., D. Mills         ||       brian@innovationslab.net, mills@udel.edu
-  RFC5907          ||      H. Gerstung, C. Elliott, B. Haberman, Ed.         ||       heiko.gerstung@meinberg.de, chelliot@pobox.com, brian@innovationslab.net
-  RFC5908          ||      R. Gayraud, B. Lourdelet         ||       richard.gayraud@free.fr, blourdel@cisco.com
-  RFC5909          ||      J-M. Combes, S. Krishnan, G. Daley         ||       jeanmichel.combes@orange-ftgroup.com, Suresh.Krishnan@ericsson.com, hoskuld@hotmail.com
-  RFC5910          ||      J. Gould, S. Hollenbeck         ||       jgould@verisign.com, shollenbeck@verisign.com
-  RFC5911          ||      P. Hoffman, J. Schaad         ||       paul.hoffman@vpnc.org, jimsch@exmsft.com
-  RFC5912          ||      P. Hoffman, J. Schaad         ||       paul.hoffman@vpnc.org, jimsch@exmsft.com
-  RFC5913          ||      S. Turner, S. Chokhani         ||       turners@ieca.com, SChokhani@cygnacom.com
-  RFC5914          ||      R. Housley, S. Ashmore, C. Wallace         ||       housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com
-  RFC5915          ||      S. Turner, D. Brown         ||       turners@ieca.com, dbrown@certicom.com
-  RFC5916          ||      S. Turner         ||       turners@ieca.com
-  RFC5917          ||      S. Turner         ||       turners@ieca.com
-  RFC5918          ||      R. Asati, I. Minei, B. Thomas         ||       rajiva@cisco.com, ina@juniper.net, bobthomas@alum.mit.edu
-  RFC5919          ||      R. Asati, P. Mohapatra, E. Chen, B. Thomas         ||       rajiva@cisco.com, pmohapat@cisco.com, chenying220@huawei.com, bobthomas@alum.mit.edu
-  RFC5920          ||      L. Fang, Ed.         ||       lufang@cisco.com
-  RFC5921          ||      M. Bocci, Ed., S. Bryant, Ed., D. Frost, Ed., L. Levrau, L. Berger         ||       matthew.bocci@alcatel-lucent.com, stbryant@cisco.com, danfrost@cisco.com, lieven.levrau@alcatel-lucent.com, lberger@labn.net
-  RFC5922          ||      V. Gurbani, S. Lawrence, A. Jeffrey         ||       vkg@alcatel-lucent.com, scott-ietf@skrb.org, ajeffrey@alcatel-lucent.com
-  RFC5923          ||      V. Gurbani, Ed., R. Mahy, B. Tate         ||       vkg@alcatel-lucent.com, rohan@ekabal.com, brett@broadsoft.com
-  RFC5924          ||      S. Lawrence, V. Gurbani         ||       scott-ietf@skrb.org, vkg@bell-labs.com
-  RFC5925          ||      J. Touch, A. Mankin, R. Bonica         ||       touch@isi.edu, mankin@psg.com, rbonica@juniper.net
-  RFC5926          ||      G. Lebovitz, E. Rescorla         ||       gregory.ietf@gmail.com, ekr@rtfm.com
-  RFC5927          ||      F. Gont         ||       fernando@gont.com.ar
-  RFC5928          ||      M. Petit-Huguenin         ||       petithug@acm.org
-  RFC5929          ||      J. Altman, N. Williams, L. Zhu         ||       jaltman@secure-endpoints.com, Nicolas.Williams@oracle.com, larry.zhu@microsoft.com
-  RFC5930          ||      S. Shen, Y. Mao, NSS. Murthy         ||       shenshuo@cnnic.cn, yumao9@gmail.com, ssmurthy.nittala@freescale.com
-  RFC5931          ||      D. Harkins, G. Zorn         ||       dharkins@arubanetworks.com, gwz@net-zen.net
-  RFC5932          ||      A. Kato, M. Kanda, S. Kanno         ||       kato.akihiro@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp, kanno.satoru@po.ntts.co.jp
-  RFC5933          ||      V. Dolmatov, Ed., A. Chuprina, I. Ustinov         ||       dol@cryptocom.ru, ran@cryptocom.ru, igus@cryptocom.ru
-  RFC5934          ||      R. Housley, S. Ashmore, C. Wallace         ||       housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com
-  RFC5935          ||      M. Ellison, B. Natale         ||       ietf@ellisonsoftware.com, rnatale@mitre.org
-  RFC5936          ||      E. Lewis, A. Hoenes, Ed.         ||       ed.lewis@neustar.biz, ah@TR-Sys.de
-  RFC5937          ||      S. Ashmore, C. Wallace         ||       srashmo@radium.ncsc.mil, cwallace@cygnacom.com
-  RFC5938          ||      A. Morton, M. Chiba         ||       acmorton@att.com, mchiba@cisco.com
-  RFC5939          ||      F. Andreasen         ||       fandreas@cisco.com
-  RFC5940          ||      S. Turner, R. Housley         ||       turners@ieca.com, housley@vigilsec.com
-  RFC5941          ||      D. M'Raihi, S. Boeyen, M. Grandcolas, S. Bajaj         ||       davidietf@gmail.com, sharon.boeyen@entrust.com, michael.grandcolas@hotmail.com, sbajaj@verisign.com
-  RFC5942          ||      H. Singh, W. Beebee, E. Nordmark         ||       shemant@cisco.com, wbeebee@cisco.com, erik.nordmark@oracle.com
-  RFC5943          ||      B. Haberman, Ed.         ||       brian@innovationslab.net
-  RFC5944          ||      C. Perkins, Ed.         ||       charliep@computer.org
-  RFC5945          ||      F. Le Faucheur, J. Manner, D. Wing, A. Guillou         ||       flefauch@cisco.com, jukka.manner@tkk.fi, dwing-ietf@fuggles.com, allan.guillou@sfr.com
-  RFC5946          ||      F. Le Faucheur, J. Manner, A. Narayanan, A. Guillou, H. Malik         ||       flefauch@cisco.com, jukka.manner@tkk.fi, ashokn@cisco.com, allan.guillou@sfr.com, Hemant.Malik@airtel.in
-  RFC5947          ||      J. Elwell, H. Kaplan         ||       john.elwell@siemens-enterprise.com, hkaplan@acmepacket.com
-  RFC5948          ||      S. Madanapalli, S. Park, S. Chakrabarti, G. Montenegro         ||       smadanapalli@gmail.com, soohong.park@samsung.com, samitac@ipinfusion.com, gabriel.montenegro@microsoft.com
-  RFC5949          ||      H. Yokota, K. Chowdhury, R. Koodli, B. Patil, F. Xia         ||       yokota@kddilabs.jp, kchowdhu@cisco.com, rkoodli@cisco.com, basavaraj.patil@nokia.com, xiayangsong@huawei.com
-  RFC5950          ||      S. Mansfield, Ed., E. Gray, Ed., K. Lam, Ed.         ||       scott.mansfield@ericsson.com, eric.gray@ericsson.com, Kam.Lam@alcatel-lucent.com
-  RFC5951          ||      K. Lam, S. Mansfield, E. Gray         ||       Kam.Lam@Alcatel-Lucent.com, Scott.Mansfield@Ericsson.com, Kam.Lam@Alcatel-Lucent.com
-  RFC5952          ||      S. Kawamura, M. Kawashima         ||       kawamucho@mesh.ad.jp, kawashimam@vx.jp.nec.com
-  RFC5953          ||      W. Hardaker         ||       ietf@hardakers.net
-  RFC5954          ||      V. Gurbani, Ed., B. Carpenter, Ed., B. Tate, Ed.         ||       vkg@bell-labs.com, brian.e.carpenter@gmail.com, brett@broadsoft.com
-  RFC5955          ||      A. Santoni         ||       adriano.santoni@actalis.it
-  RFC5956          ||      A. Begen         ||       abegen@cisco.com
-  RFC5957          ||      D. Karp         ||       dkarp@zimbra.com
-  RFC5958          ||      S. Turner         ||       turners@ieca.com
-  RFC5959          ||      S. Turner         ||       turners@ieca.com
-  RFC5960          ||      D. Frost, Ed., S. Bryant, Ed., M. Bocci, Ed.         ||       danfrost@cisco.com, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com
-  RFC5961          ||      A. Ramaiah, R. Stewart, M. Dalal         ||       ananth@cisco.com, randall@lakerest.net, mdalal@cisco.com
-  RFC5962          ||      H. Schulzrinne, V. Singh, H. Tschofenig, M. Thomson         ||       hgs@cs.columbia.edu, vs2140@cs.columbia.edu, Hannes.Tschofenig@gmx.net, martin.thomson@andrew.com
-  RFC5963          ||      R. Gagliano         ||       rogaglia@cisco.com
-  RFC5964          ||      J. Winterbottom, M. Thomson         ||       james.winterbottom@andrew.com, martin.thomson@andrew.com
-  RFC5965          ||      Y. Shafranovich, J. Levine, M. Kucherawy         ||       ietf@shaftek.org, standards@taugh.com, msk@cloudmark.com
-  RFC5966          ||      R. Bellis         ||       ray.bellis@nominet.org.uk
-  RFC5967          ||      S. Turner         ||       turners@ieca.com
-  RFC5968          ||      J. Ott, C. Perkins         ||       jo@netlab.tkk.fi, csp@csperkins.org
-  RFC5969          ||      W. Townsley, O. Troan         ||       mark@townsley.net, ot@cisco.com
-  RFC5970          ||      T. Huth, J. Freimann, V. Zimmer, D. Thaler         ||       thuth@de.ibm.com, jfrei@de.ibm.com, vincent.zimmer@intel.com, dthaler@microsoft.com
-  RFC5971          ||      H. Schulzrinne, R. Hancock         ||       hgs+nsis@cs.columbia.edu, robert.hancock@roke.co.uk
-  RFC5972          ||      T. Tsenov, H. Tschofenig, X. Fu, Ed., C. Aoun, E. Davies         ||       tseno.tsenov@mytum.de, Hannes.Tschofenig@nsn.com, fu@cs.uni-goettingen.de, cedaoun@yahoo.fr, elwynd@dial.pipex.com
-  RFC5973          ||      M. Stiemerling, H. Tschofenig, C. Aoun, E. Davies         ||       Martin.Stiemerling@neclab.eu, Hannes.Tschofenig@nsn.com, cedaoun@yahoo.fr, elwynd@dial.pipex.com
-  RFC5974          ||      J. Manner, G. Karagiannis, A. McDonald         ||       jukka.manner@tkk.fi, karagian@cs.utwente.nl, andrew.mcdonald@roke.co.uk
-  RFC5975          ||      G. Ash, Ed., A. Bader, Ed., C. Kappler, Ed., D. Oran, Ed.         ||       gash5107@yahoo.com, Attila.Bader@ericsson.com, cornelia.kappler@cktecc.de, oran@cisco.com
-  RFC5976          ||      G. Ash, A. Morton, M. Dolly, P. Tarapore, C. Dvorak, Y. El Mghazli         ||       gash5107@yahoo.com, acmorton@att.com, mdolly@att.com, tarapore@att.com, cdvorak@att.com, yacine.el_mghazli@alcatel.fr
-  RFC5977          ||      A. Bader, L. Westberg, G. Karagiannis, C. Kappler, T. Phelan         ||       Attila.Bader@ericsson.com, Lars.Westberg@ericsson.com, g.karagiannis@ewi.utwente.nl, cornelia.kappler@cktecc.de, tphelan@sonusnet.com
-  RFC5978          ||      J. Manner, R. Bless, J. Loughney, E. Davies, Ed.         ||       jukka.manner@tkk.fi, bless@kit.edu, john.loughney@nokia.com, elwynd@folly.org.uk
-  RFC5979          ||      C. Shen, H. Schulzrinne, S. Lee, J. Bang         ||       charles@cs.columbia.edu, hgs@cs.columbia.edu, sung1.lee@samsung.com, jh0278.bang@samsung.com
-  RFC5980          ||      T. Sanda, Ed., X. Fu, S. Jeong, J. Manner, H. Tschofenig         ||       sanda.takako@jp.panasonic.com, fu@cs.uni-goettingen.de, shjeong@hufs.ac.kr, jukka.manner@tkk.fi, Hannes.Tschofenig@nsn.com
-  RFC5981          ||      J. Manner, M. Stiemerling, H. Tschofenig, R. Bless, Ed.         ||       jukka.manner@tkk.fi, martin.stiemerling@neclab.eu, Hannes.Tschofenig@gmx.net, roland.bless@kit.edu
-  RFC5982          ||      A. Kobayashi, Ed., B. Claise, Ed.         ||       akoba@nttv6.net, bclaise@cisco.com
-  RFC5983          ||      R. Gellens         ||       rg+ietf@qualcomm.com
-  RFC5984          ||      K-M. Moller         ||       kalle@tankesaft.se
-  RFC5985          ||      M. Barnes, Ed.         ||       mary.ietf.barnes@gmail.com
-  RFC5986          ||      M. Thomson, J. Winterbottom         ||       martin.thomson@andrew.com, james.winterbottom@andrew.com
-  RFC5987          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC5988          ||      M. Nottingham         ||       mnot@mnot.net
-  RFC5989          ||      A.B. Roach         ||       adam@nostrum.com
-  RFC5990          ||      J. Randall, B. Kaliski, J. Brainard, S. Turner         ||       jdrandall@comcast.net, kaliski_burt@emc.com, jbrainard@rsa.com, turners@ieca.com
-  RFC5991          ||      D. Thaler, S. Krishnan, J. Hoagland         ||       dthaler@microsoft.com, suresh.krishnan@ericsson.com, Jim_Hoagland@symantec.com
-  RFC5992          ||      S. Sharikov, D. Miloshevic, J. Klensin         ||       s.shar@regtime.net, dmiloshevic@afilias.info, john-ietf@jck.com
-  RFC5993          ||      X. Duan, S. Wang, M. Westerlund, K. Hellwig, I. Johansson         ||       duanxiaodong@chinamobile.com, wangshuaiyu@chinamobile.com, magnus.westerlund@ericsson.com, karl.hellwig@ericsson.com, ingemar.s.johansson@ericsson.com
-  RFC5994          ||      S. Bryant, Ed., M. Morrow, G. Swallow, R. Cherukuri, T. Nadeau, N. Harrison, B. Niven-Jenkins         ||       stbryant@cisco.com, mmorrow@cisco.com, swallow@cisco.com, cherukuri@juniper.net, thomas.nadeau@huawei.com, neil.2.harrison@bt.com, ben@niven-jenkins.co.uk
-  RFC5995          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC5996          ||      C. Kaufman, P. Hoffman, Y. Nir, P. Eronen         ||       charliek@microsoft.com, paul.hoffman@vpnc.org, ynir@checkpoint.com, pe@iki.fi
-  RFC5997          ||      A. DeKok         ||       aland@freeradius.org
-  RFC5998          ||      P. Eronen, H. Tschofenig, Y. Sheffer         ||       pe@iki.fi, Hannes.Tschofenig@gmx.net, yaronf.ietf@gmail.com
-  RFC6001          ||      D. Papadimitriou, M. Vigoureux, K. Shiomoto, D. Brungard, JL. Le Roux         ||       dimitri.papadimitriou@alcatel-lucent.com, martin.vigoureux@alcatel-lucent.fr, shiomoto.kohei@lab.ntt.co.jp, dbrungard@att.com, jean-louis.leroux@rd.francetelecom.com
-  RFC6002          ||      L. Berger, D. Fedyk         ||       lberger@labn.net, donald.fedyk@alcatel-lucent.com
-  RFC6003          ||      D. Papadimitriou         ||       dimitri.papadimitriou@alcatel-lucent.be
-  RFC6004          ||      L. Berger, D. Fedyk         ||       lberger@labn.net, donald.fedyk@alcatel-lucent.com
-  RFC6005          ||      L. Berger, D. Fedyk         ||       lberger@labn.net, donald.fedyk@alcatel-lucent.com
-  RFC6006          ||      Q. Zhao, Ed., D. King, Ed., F. Verhaeghe, T. Takeda, Z. Ali, J. Meuric         ||       qzhao@huawei.com, daniel@olddog.co.uk, fabien.verhaeghe@gmail.com, takeda.tomonori@lab.ntt.co.jp, zali@cisco.com, julien.meuric@orange-ftgroup.com
-  RFC6007          ||      I. Nishioka, D. King         ||       i-nishioka@cb.jp.nec.com, daniel@olddog.co.uk
-  RFC6008          ||      M. Kucherawy         ||       msk@cloudmark.com
-  RFC6009          ||      N. Freed         ||       ned.freed@mrochek.com
-  RFC6010          ||      R. Housley, S. Ashmore, C. Wallace         ||       housley@vigilsec.com, srashmo@radium.ncsc.mil, cwallace@cygnacom.com
-  RFC6011          ||      S. Lawrence, Ed., J. Elwell         ||       scott-ietf@skrb.org, john.elwell@siemens-enterprise.com
-  RFC6012          ||      J. Salowey, T. Petch, R. Gerhards, H. Feng         ||       jsalowey@cisco.com, tomSecurity@network-engineer.co.uk, rgerhards@adiscon.com, fhyfeng@gmail.com
-  RFC6013          ||      W. Simpson         ||       William.Allen.Simpson@Gmail.com
-  RFC6014          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC6015          ||      A. Begen         ||       abegen@cisco.com
-  RFC6016          ||      B. Davie, F. Le Faucheur, A. Narayanan         ||       bsd@cisco.com, flefauch@cisco.com, ashokn@cisco.com
-  RFC6017          ||      K. Meadors, Ed.         ||       kyle@drummondgroup.com
-  RFC6018          ||      F. Baker, W. Harrop, G. Armitage         ||       fred@cisco.com, wazz@bud.cc.swin.edu.au, garmitage@swin.edu.au
-  RFC6019          ||      R. Housley         ||       housley@vigilsec.com
-  RFC6020          ||      M. Bjorklund, Ed.         ||       mbj@tail-f.com
-  RFC6021          ||      J. Schoenwaelder, Ed.         ||       j.schoenwaelder@jacobs-university.de
-  RFC6022          ||      M. Scott, M. Bjorklund         ||       mark.scott@ericsson.com, mbj@tail-f.com
-  RFC6023          ||      Y. Nir, H. Tschofenig, H. Deng, R. Singh         ||       ynir@checkpoint.com, Hannes.Tschofenig@gmx.net, denghui02@gmail.com, rsj@cisco.com
-  RFC6024          ||      R. Reddy, C. Wallace         ||       r.reddy@radium.ncsc.mil, cwallace@cygnacom.com
-  RFC6025          ||      C. Wallace, C. Gardiner         ||       cwallace@cygnacom.com, gardiner@bbn.com
-  RFC6026          ||      R. Sparks, T. Zourzouvillys         ||       RjS@nostrum.com, theo@crazygreek.co.uk
-  RFC6027          ||      Y. Nir         ||       ynir@checkpoint.com
-  RFC6028          ||      G. Camarillo, A. Keranen         ||       Gonzalo.Camarillo@ericsson.com, Ari.Keranen@ericsson.com
-  RFC6029          ||      I. Rimac, V. Hilt, M. Tomsu, V. Gurbani, E. Marocco         ||       rimac@bell-labs.com, volkerh@bell-labs.com, marco.tomsu@alcatel-lucent.com, vkg@bell-labs.com, enrico.marocco@telecomitalia.it
-  RFC6030          ||      P. Hoyer, M. Pei, S. Machani         ||       phoyer@actividentity.com, mpei@verisign.com, smachani@diversinet.com
-  RFC6031          ||      S. Turner, R. Housley         ||       turners@ieca.com, housley@vigilsec.com
-  RFC6032          ||      S. Turner, R. Housley         ||       turners@ieca.com, housley@vigilsec.com
-  RFC6033          ||      S. Turner         ||       turners@ieca.com
-  RFC6034          ||      D. Thaler         ||       dthaler@microsoft.com
-  RFC6035          ||      A. Pendleton, A. Clark, A. Johnston, H. Sinnreich         ||       aspen@telchemy.com, alan.d.clark@telchemy.com, alan.b.johnston@gmail.com, henry.sinnreich@gmail.com
-  RFC6036          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, shengjiang@huawei.com
-  RFC6037          ||      E. Rosen, Ed., Y. Cai, Ed., IJ. Wijnands         ||       erosen@cisco.com, ycai@cisco.com, ice@cisco.com
-  RFC6038          ||      A. Morton, L. Ciavattone         ||       acmorton@att.com, lencia@att.com
-  RFC6039          ||      V. Manral, M. Bhatia, J. Jaeggli, R. White         ||       vishwas@ipinfusion.com, manav.bhatia@alcatel-lucent.com, joel.jaeggli@nokia.com, riw@cisco.com
-  RFC6040          ||      B. Briscoe         ||       bob.briscoe@bt.com
-  RFC6041          ||      A. Crouch, H. Khosravi, A. Doria, Ed., X. Wang, K. Ogawa         ||       alan.crouch@intel.com, hormuzd.m.khosravi@intel.com, avri@acm.org, carly.wang@huawei.com, ogawa.kentaro@lab.ntt.co.jp
-  RFC6042          ||      A. Keromytis         ||       angelos@cs.columbia.edu
-  RFC6043          ||      J. Mattsson, T. Tian         ||       john.mattsson@ericsson.com, tian.tian1@zte.com.cn
-  RFC6044          ||      M. Mohali         ||       marianne.mohali@orange-ftgroup.com
-  RFC6045          ||      K. Moriarty         ||       Moriarty_Kathleen@EMC.com
-  RFC6046          ||      K. Moriarty, B. Trammell         ||       Moriarty_Kathleen@EMC.com, trammell@tik.ee.ethz.ch
-  RFC6047          ||      A. Melnikov, Ed.         ||       Alexey.Melnikov@isode.com
-  RFC6048          ||      J. Elie         ||       julien@trigofacile.com
-  RFC6049          ||      A. Morton, E. Stephan         ||       acmorton@att.com, emile.stephan@orange-ftgroup.com
-  RFC6050          ||      K. Drage         ||       drage@alcatel-lucent.com
-  RFC6051          ||      C. Perkins, T. Schierl         ||       csp@csperkins.org, ts@thomas-schierl.de
-  RFC6052          ||      C. Bao, C. Huitema, M. Bagnulo, M. Boucadair, X. Li         ||       congxiao@cernet.edu.cn, huitema@microsoft.com, marcelo@it.uc3m.es, mohamed.boucadair@orange-ftgroup.com, xing@cernet.edu.cn
-  RFC6053          ||      E. Haleplidis, K. Ogawa, W. Wang, J. Hadi Salim         ||       ehalep@ece.upatras.gr, ogawa.kentaro@lab.ntt.co.jp, wmwang@mail.zjgsu.edu.cn, hadi@mojatatu.com
-  RFC6054          ||      D. McGrew, B. Weis         ||       mcgrew@cisco.com, bew@cisco.com
-  RFC6055          ||      D. Thaler, J. Klensin, S. Cheshire         ||       dthaler@microsoft.com, john+ietf@jck.com, cheshire@apple.com
-  RFC6056          ||      M. Larsen, F. Gont         ||       michael.larsen@tieto.com, fernando@gont.com.ar
-  RFC6057          ||      C. Bastian, T. Klieber, J. Livingood, J. Mills, R. Woundy         ||       chris_bastian@cable.comcast.com, tom_klieber@cable.comcast.com, jason_livingood@cable.comcast.com, jim_mills@cable.comcast.com, richard_woundy@cable.comcast.com
-  RFC6058          ||      M. Liebsch, Ed., A. Muhanna, O. Blume         ||       marco.liebsch@neclab.eu, ahmad.muhanna@ericsson.com, oliver.blume@alcatel-lucent.de
-  RFC6059          ||      S. Krishnan, G. Daley         ||       suresh.krishnan@ericsson.com, hoskuld@hotmail.com
-  RFC6060          ||      D. Fedyk, H. Shah, N. Bitar, A. Takacs         ||       donald.fedyk@alcatel-lucent.com, hshah@ciena.com, nabil.n.bitar@verizon.com, attila.takacs@ericsson.com
-  RFC6061          ||      B. Rosen         ||       br@brianrosen.net
-  RFC6062          ||      S. Perreault, Ed., J. Rosenberg         ||       simon.perreault@viagenie.ca, jdrosen@jdrosen.net
-  RFC6063          ||      A. Doherty, M. Pei, S. Machani, M. Nystrom         ||       andrea.doherty@rsa.com, mpei@verisign.com, smachani@diversinet.com, mnystrom@microsoft.com
-  RFC6064          ||      M. Westerlund, P. Frojdh         ||       magnus.westerlund@ericsson.com, per.frojdh@ericsson.com
-  RFC6065          ||      K. Narayan, D. Nelson, R. Presuhn, Ed.         ||       kaushik_narayan@yahoo.com, d.b.nelson@comcast.net, randy_presuhn@mindspring.com
-  RFC6066          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC6067          ||      M. Davis, A. Phillips, Y. Umaoka         ||       mark@macchiato.com, addison@lab126.com, yoshito_umaoka@us.ibm.com
-  RFC6068          ||      M. Duerst, L. Masinter, J. Zawinski         ||       duerst@it.aoyama.ac.jp, LMM@acm.org, jwz@jwz.org
-  RFC6069          ||      A. Zimmermann, A. Hannemann         ||       zimmermann@cs.rwth-aachen.de, hannemann@nets.rwth-aachen.de
-  RFC6070          ||      S. Josefsson         ||       simon@josefsson.org
-  RFC6071          ||      S. Frankel, S. Krishnan         ||       sheila.frankel@nist.gov, suresh.krishnan@ericsson.com
-  RFC6072          ||      C. Jennings, J. Fischl, Ed.         ||       fluffy@cisco.com, jason.fischl@skype.net
-  RFC6073          ||      L. Martini, C. Metz, T. Nadeau, M. Bocci, M. Aissaoui         ||       lmartini@cisco.com, chmetz@cisco.com, tnadeau@lucidvision.com, matthew.bocci@alcatel-lucent.co.uk, mustapha.aissaoui@alcatel-lucent.com
-  RFC6074          ||      E. Rosen, B. Davie, V. Radoaca, W. Luo         ||       erosen@cisco.com, bsd@cisco.com, vasile.radoaca@alcatel-lucent.com, luo@weiluo.net
-  RFC6075          ||      D. Cridland         ||       dave.cridland@isode.com
-  RFC6076          ||      D. Malas, A. Morton         ||       d.malas@cablelabs.com, acmorton@att.com
-  RFC6077          ||      D. Papadimitriou, Ed., M. Welzl, M. Scharf, B. Briscoe         ||       dimitri.papadimitriou@alcatel-lucent.be, michawe@ifi.uio.no, michael.scharf@googlemail.com, bob.briscoe@bt.com
-  RFC6078          ||      G. Camarillo, J. Melen         ||       Gonzalo.Camarillo@ericsson.com, Jan.Melen@ericsson.com
-  RFC6079          ||      G. Camarillo, P. Nikander, J. Hautakorpi, A. Keranen, A. Johnston         ||       Gonzalo.Camarillo@ericsson.com, Pekka.Nikander@ericsson.com, Jani.Hautakorpi@ericsson.com, Ari.Keranen@ericsson.com, alan.b.johnston@gmail.com
-  RFC6080          ||      D. Petrie, S. Channabasappa, Ed.         ||       dan.ietf@SIPez.com, sumanth@cablelabs.com
-  RFC6081          ||      D. Thaler         ||       dthaler@microsoft.com
-  RFC6082          ||      K. Whistler, G. Adams, M. Duerst, R. Presuhn, Ed., J. Klensin         ||       kenw@sybase.com, glenn@skynav.com, duerst@it.aoyama.ac.jp, randy_presuhn@mindspring.com, john+ietf@jck.com
-  RFC6083          ||      M. Tuexen, R. Seggelmann, E. Rescorla         ||       tuexen@fh-muenster.de, seggelmann@fh-muenster.de, ekr@networkresonance.com
-  RFC6084          ||      X. Fu, C. Dickmann, J. Crowcroft         ||       fu@cs.uni-goettingen.de, mail@christian-dickmann.de, jon.crowcroft@cl.cam.ac.uk
-  RFC6085          ||      S. Gundavelli, M. Townsley, O. Troan, W. Dec         ||       sgundave@cisco.com, townsley@cisco.com, ot@cisco.com, wdec@cisco.com
-  RFC6086          ||      C. Holmberg, E. Burger, H. Kaplan         ||       christer.holmberg@ericsson.com, eburger@standardstrack.com, hkaplan@acmepacket.com
-  RFC6087          ||      A. Bierman         ||       andy@yumaworks.com
-  RFC6088          ||      G. Tsirtsis, G. Giarreta, H. Soliman, N. Montavont         ||       tsirtsis@qualcomm.com, gerardog@qualcomm.com, hesham@elevatemobile.com, nicolas.montavont@telecom-bretagne.eu
-  RFC6089          ||      G. Tsirtsis, H. Soliman, N. Montavont, G. Giaretta, K. Kuladinithi         ||       tsirtsis@qualcomm.com, hesham@elevatemobile.com, nicolas.montavont@telecom-bretagne.eu, gerardog@qualcomm.com, koo@comnets.uni-bremen.de
-  RFC6090          ||      D. McGrew, K. Igoe, M. Salter         ||       mcgrew@cisco.com, kmigoe@nsa.gov, msalter@restarea.ncsc.mil
-  RFC6091          ||      N. Mavrogiannopoulos, D. Gillmor         ||       nikos.mavrogiannopoulos@esat.kuleuven.be, dkg@fifthhorseman.net
-  RFC6092          ||      J. Woodyatt, Ed.         ||       jhw@apple.com
-  RFC6093          ||      F. Gont, A. Yourtchenko         ||       fernando@gont.com.ar, ayourtch@cisco.com
-  RFC6094          ||      M. Bhatia, V. Manral         ||       manav.bhatia@alcatel-lucent.com, vishwas@ipinfusion.com
-  RFC6095          ||      B. Linowski, M. Ersue, S. Kuryla         ||       bernd.linowski.ext@nsn.com, mehmet.ersue@nsn.com, s.kuryla@gmail.com
-  RFC6096          ||      M. Tuexen, R. Stewart         ||       tuexen@fh-muenster.de, randall@lakerest.net
-  RFC6097          ||      J. Korhonen, V. Devarapalli         ||       jouni.nospam@gmail.com, dvijay@gmail.com
-  RFC6098          ||      H. Deng, H. Levkowetz, V. Devarapalli, S. Gundavelli, B. Haley         ||       denghui02@gmail.com, henrik@levkowetz.com, dvijay@gmail.com, sgundave@cisco.com, brian.haley@hp.com
-  RFC6101          ||      A. Freier, P. Karlton, P. Kocher         ||       nikos.mavrogiannopoulos@esat.kuleuven.be
-  RFC6104          ||      T. Chown, S. Venaas         ||       tjc@ecs.soton.ac.uk, stig@cisco.com
-  RFC6105          ||      E. Levy-Abegnoli, G. Van de Velde, C. Popoviciu, J. Mohacsi         ||       elevyabe@cisco.com, gunter@cisco.com, chip@technodyne.com, mohacsi@niif.hu
-  RFC6106          ||      J. Jeong, S. Park, L. Beloeil, S. Madanapalli         ||       pjeong@brocade.com, soohong.park@samsung.com, luc.beloeil@orange-ftgroup.com, smadanapalli@gmail.com
-  RFC6107          ||      K. Shiomoto, Ed., A. Farrel, Ed.         ||       shiomoto.kohei@lab.ntt.co.jp, adrian@olddog.co.uk
-  RFC6108          ||      C. Chung, A. Kasyanov, J. Livingood, N. Mody, B. Van Lieu         ||       chae_chung@cable.comcast.com, alexander_kasyanov@cable.comcast.com, jason_livingood@cable.comcast.com, nirmal_mody@cable.comcast.com, brian@vanlieu.net
-  RFC6109          ||      C. Petrucci, F. Gennai, A. Shahin, A. Vinciarelli         ||       petrucci@digitpa.gov.it, francesco.gennai@isti.cnr.it, alba.shahin@isti.cnr.it, alessandro.vinciarelli@gmail.com
-  RFC6110          ||      L. Lhotka, Ed.         ||       ladislav@lhotka.name
-  RFC6111          ||      L. Zhu         ||       lzhu@microsoft.com
-  RFC6112          ||      L. Zhu, P. Leach, S. Hartman         ||       larry.zhu@microsoft.com, paulle@microsoft.com, hartmans-ietf@mit.edu
-  RFC6113          ||      S. Hartman, L. Zhu         ||       hartmans-ietf@mit.edu, larry.zhu@microsoft.com
-  RFC6114          ||      M. Katagi, S. Moriai         ||       Masanobu.Katagi@jp.sony.com, clefia-q@jp.sony.com
-  RFC6115          ||      T. Li, Ed.         ||       tony.li@tony.li
-  RFC6116          ||      S. Bradner, L. Conroy, K. Fujiwara         ||       sob@harvard.edu, lconroy@insensate.co.uk, fujiwara@jprs.co.jp
-  RFC6117          ||      B. Hoeneisen, A. Mayrhofer, J. Livingood         ||       bernie@ietf.hoeneisen.ch, alexander.mayrhofer@enum.at, jason_livingood@cable.comcast.com
-  RFC6118          ||      B. Hoeneisen, A. Mayrhofer         ||       bernie@ietf.hoeneisen.ch, alexander.mayrhofer@enum.at
-  RFC6119          ||      J. Harrison, J. Berger, M. Bartlett         ||       jon.harrison@metaswitch.com, jon.berger@metaswitch.com, mike.bartlett@metaswitch.com
-  RFC6120          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC6121          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC6122          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC6123          ||      A. Farrel         ||       adrian@olddog.co.uk
-  RFC6124          ||      Y. Sheffer, G. Zorn, H. Tschofenig, S. Fluhrer         ||       yaronf.ietf@gmail.com, gwz@net-zen.net, Hannes.Tschofenig@gmx.net, sfluhrer@cisco.com
-  RFC6125          ||      P. Saint-Andre, J. Hodges         ||       ietf@stpeter.im, Jeff.Hodges@PayPal.com
-  RFC6126          ||      J. Chroboczek         ||       jch@pps.jussieu.fr
-  RFC6127          ||      J. Arkko, M. Townsley         ||       jari.arkko@piuha.net, townsley@cisco.com
-  RFC6128          ||      A. Begen         ||       abegen@cisco.com
-  RFC6129          ||      L. Romary, S. Lundberg         ||       laurent.romary@inria.fr, slu@kb.dk
-  RFC6130          ||      T. Clausen, C. Dearlove, J. Dean         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com, jdean@itd.nrl.navy.mil
-  RFC6131          ||      R. George, B. Leiba         ||       robinsgv@gmail.com, barryleiba@computer.org
-  RFC6132          ||      R. George, B. Leiba         ||       robinsgv@gmail.com, barryleiba@computer.org
-  RFC6133          ||      R. George, B. Leiba, A. Melnikov         ||       robinsgv@gmail.com, barryleiba@computer.org, Alexey.Melnikov@isode.com
-  RFC6134          ||      A. Melnikov, B. Leiba         ||       Alexey.Melnikov@isode.com, barryleiba@computer.org
-  RFC6135          ||      C. Holmberg, S. Blau         ||       christer.holmberg@ericsson.com, staffan.blau@ericsson.com
-  RFC6136          ||      A. Sajassi, Ed., D. Mohan, Ed.         ||       sajassi@cisco.com, mohand@nortel.com
-  RFC6137          ||      D. Zisiadis, Ed., S. Kopsidas, Ed., M. Tsavli, Ed., G. Cessieux, Ed.         ||       dzisiadis@iti.gr, spyros@uth.gr, sttsavli@uth.gr, Guillaume.Cessieux@cc.in2p3.fr
-  RFC6138          ||      S. Kini, Ed., W. Lu, Ed.         ||       sriganesh.kini@ericsson.com, wenhu.lu@ericsson.com
-  RFC6139          ||      S. Russert, Ed., E. Fleischman, Ed., F. Templin, Ed.         ||       russerts@hotmail.com, eric.fleischman@boeing.com, fltemplin@acm.org
-  RFC6140          ||      A.B. Roach         ||       adam@nostrum.com
-  RFC6141          ||      G. Camarillo, Ed., C. Holmberg, Y. Gao         ||       Gonzalo.Camarillo@ericsson.com, Christer.Holmberg@ericsson.com, gao.yang2@zte.com.cn
-  RFC6142          ||      A. Moise, J. Brodkin         ||       avy@fdos.ca, jonathan.brodkin@fdos.ca
-  RFC6143          ||      T. Richardson, J. Levine         ||       standards@realvnc.com, standards@taugh.com
-  RFC6144          ||      F. Baker, X. Li, C. Bao, K. Yin         ||       fred@cisco.com, xing@cernet.edu.cn, congxiao@cernet.edu.cn, kyin@cisco.com
-  RFC6145          ||      X. Li, C. Bao, F. Baker         ||       xing@cernet.edu.cn, congxiao@cernet.edu.cn, fred@cisco.com
-  RFC6146          ||      M. Bagnulo, P. Matthews, I. van Beijnum         ||       marcelo@it.uc3m.es, philip_matthews@magma.ca, iljitsch@muada.com
-  RFC6147          ||      M. Bagnulo, A. Sullivan, P. Matthews, I. van Beijnum         ||       marcelo@it.uc3m.es, ajs@shinkuro.com, philip_matthews@magma.ca, iljitsch@muada.com
-  RFC6148          ||      P. Kurapati, R. Desetti, B. Joshi         ||       kurapati@juniper.net, ramakrishnadtv@infosys.com, bharat_joshi@infosys.com
-  RFC6149          ||      S. Turner, L. Chen         ||       turners@ieca.com, lily.chen@nist.gov
-  RFC6150          ||      S. Turner, L. Chen         ||       turners@ieca.com, lily.chen@nist.gov
-  RFC6151          ||      S. Turner, L. Chen         ||       turners@ieca.com, lily.chen@nist.gov
-  RFC6152          ||      J. Klensin, N. Freed, M. Rose, D. Crocker, Ed.         ||       john+ietf@jck.com, ned.freed@mrochek.com, mrose17@gmail.com, dcrocker@bbiw.net
-  RFC6153          ||      S. Das, G. Bajko         ||       subir@research.Telcordia.com, gabor.bajko@nokia.com
-  RFC6154          ||      B. Leiba, J. Nicolson         ||       barryleiba@computer.org, nicolson@google.com
-  RFC6155          ||      J. Winterbottom, M. Thomson, H. Tschofenig, R. Barnes         ||       james.winterbottom@andrew.com, martin.thomson@andrew.com, Hannes.Tschofenig@gmx.net, rbarnes@bbn.com
-  RFC6156          ||      G. Camarillo, O. Novo, S. Perreault, Ed.         ||       Gonzalo.Camarillo@ericsson.com, Oscar.Novo@ericsson.com, simon.perreault@viagenie.ca
-  RFC6157          ||      G. Camarillo, K. El Malki, V. Gurbani         ||       Gonzalo.Camarillo@ericsson.com, karim@athonet.com, vkg@bell-labs.com
-  RFC6158          ||      A. DeKok, Ed., G. Weber         ||       aland@freeradius.org, gdweber@gmail.com
-  RFC6159          ||      T. Tsou, G. Zorn, T. Taylor, Ed.         ||       tena@huawei.com, gwz@net-zen.net, tom.taylor.stds@gmail.com
-  RFC6160          ||      S. Turner         ||       turners@ieca.com
-  RFC6161          ||      S. Turner         ||       turners@ieca.com
-  RFC6162          ||      S. Turner         ||       turners@ieca.com
-  RFC6163          ||      Y. Lee, Ed., G. Bernstein, Ed., W. Imajuku         ||       ylee@huawei.com, gregb@grotto-networking.com, imajuku.wataru@lab.ntt.co.jp
-  RFC6164          ||      M. Kohno, B. Nitzan, R. Bush, Y. Matsuzaki, L. Colitti, T. Narten         ||       mkohno@juniper.net, nitzan@juniper.net, randy@psg.com, maz@iij.ad.jp, lorenzo@google.com, narten@us.ibm.com
-  RFC6165          ||      A. Banerjee, D. Ward         ||       ayabaner@cisco.com, dward@juniper.net
-  RFC6166          ||      S. Venaas         ||       stig@cisco.com
-  RFC6167          ||      M. Phillips, P. Adams, D. Rokicki, E. Johnson         ||       m8philli@uk.ibm.com, phil_adams@us.ibm.com, derek.rokicki@softwareag.com, eric@tibco.com
-  RFC6168          ||      W. Hardaker         ||       ietf@hardakers.net
-  RFC6169          ||      S. Krishnan, D. Thaler, J. Hoagland         ||       suresh.krishnan@ericsson.com, dthaler@microsoft.com, Jim_Hoagland@symantec.com
-  RFC6170          ||      S. Santesson, R. Housley, S. Bajaj, L. Rosenthol         ||       sts@aaa-sec.com, housley@vigilsec.com, siddharthietf@gmail.com, leonardr@adobe.com
-  RFC6171          ||      K. Zeilenga         ||       Kurt.Zeilenga@Isode.COM
-  RFC6172          ||      D. Black, D. Peterson         ||       david.black@emc.com, david.peterson@brocade.com
-  RFC6173          ||      P. Venkatesen, Ed.         ||       prakashvn@hcl.com
-  RFC6174          ||      E. Juskevicius         ||       edj.etc@gmail.com
-  RFC6175          ||      E. Juskevicius         ||       edj.etc@gmail.com
-  RFC6176          ||      S. Turner, T. Polk         ||       turners@ieca.com, tim.polk@nist.gov
-  RFC6177          ||      T. Narten, G. Huston, L. Roberts         ||       narten@us.ibm.com, gih@apnic.net, lea.roberts@stanford.edu
-  RFC6178          ||      D. Smith, J. Mullooly, W. Jaeger, T. Scholl         ||       djsmith@cisco.com, jmullool@cisco.com, wjaeger@att.com, tscholl@nlayer.net
-  RFC6179          ||      F. Templin, Ed.         ||       fltemplin@acm.org
-  RFC6180          ||      J. Arkko, F. Baker         ||       jari.arkko@piuha.net, fred@cisco.com
-  RFC6181          ||      M. Bagnulo         ||       marcelo@it.uc3m.es
-  RFC6182          ||      A. Ford, C. Raiciu, M. Handley, S. Barre, J. Iyengar         ||       alan.ford@roke.co.uk, c.raiciu@cs.ucl.ac.uk, m.handley@cs.ucl.ac.uk, sebastien.barre@uclouvain.be, jiyengar@fandm.edu
-  RFC6183          ||      A. Kobayashi, B. Claise, G. Muenz, K. Ishibashi         ||       akoba@orange.plala.or.jp, bclaise@cisco.com, muenz@net.in.tum.de, ishibashi.keisuke@lab.ntt.co.jp
-  RFC6184          ||      Y.-K. Wang, R. Even, T. Kristensen, R. Jesup         ||       yekuiwang@huawei.com, even.roni@huawei.com, tom.kristensen@tandberg.com, rjesup@wgate.com
-  RFC6185          ||      T. Kristensen, P. Luthi         ||       tom.kristensen@tandberg.com, patrick.luthi@tandberg.com
-  RFC6186          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC6187          ||      K. Igoe, D. Stebila         ||       kmigoe@nsa.gov, douglas@stebila.ca
-  RFC6188          ||      D. McGrew         ||       mcgrew@cisco.com
-  RFC6189          ||      P. Zimmermann, A. Johnston, Ed., J. Callas         ||       prz@mit.edu, alan.b.johnston@gmail.com, jon@callas.org
-  RFC6190          ||      S. Wenger, Y.-K. Wang, T. Schierl, A. Eleftheriadis         ||       stewe@stewe.org, yekui.wang@huawei.com, ts@thomas-schierl.de, alex@vidyo.com
-  RFC6191          ||      F. Gont         ||       fernando@gont.com.ar
-  RFC6192          ||      D. Dugal, C. Pignataro, R. Dunn         ||       dave@juniper.net, cpignata@cisco.com, rodunn@cisco.com
-  RFC6193          ||      M. Saito, D. Wing, M. Toyama         ||       ma.saito@nttv6.jp, dwing-ietf@fuggles.com, toyama.masashi@lab.ntt.co.jp
-  RFC6194          ||      T. Polk, L. Chen, S. Turner, P. Hoffman         ||       tim.polk@nist.gov, lily.chen@nist.gov, turners@ieca.com, paul.hoffman@vpnc.org
-  RFC6195          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC6196          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
-  RFC6197          ||      K. Wolf         ||       karlheinz.wolf@nic.at
-  RFC6198          ||      B. Decraene, P. Francois, C. Pelsser, Z. Ahmad, A.J. Elizondo Armengol, T. Takeda         ||       bruno.decraene@orange-ftgroup.com, francois@info.ucl.ac.be, cristel@iij.ad.jp, zubair.ahmad@orange-ftgroup.com, ajea@tid.es, takeda.tomonori@lab.ntt.co.jp
-  RFC6201          ||      R. Asati, C. Pignataro, F. Calabria, C. Olvera         ||       rajiva@cisco.com, cpignata@cisco.com, fcalabri@cisco.com, cesar.olvera@consulintel.es
-  RFC6202          ||      S. Loreto, P. Saint-Andre, S. Salsano, G. Wilkins         ||       salvatore.loreto@ericsson.com, ietf@stpeter.im, stefano.salsano@uniroma2.it, gregw@webtide.com
-  RFC6203          ||      T. Sirainen         ||       tss@iki.fi
-  RFC6204          ||      H. Singh, W. Beebee, C. Donley, B. Stark, O. Troan, Ed.         ||       shemant@cisco.com, wbeebee@cisco.com, c.donley@cablelabs.com, barbara.stark@att.com, ot@cisco.com
-  RFC6205          ||      T. Otani, Ed., D. Li, Ed.         ||       tm-otani@kddi.com, danli@huawei.com
-  RFC6206          ||      P. Levis, T. Clausen, J. Hui, O. Gnawali, J. Ko         ||       pal@cs.stanford.edu, T.Clausen@computer.org, jhui@archrock.com, gnawali@cs.stanford.edu, jgko@cs.jhu.edu
-  RFC6207          ||      R. Denenberg, Ed.         ||       rden@loc.gov
-  RFC6208          ||      K. Sankar, Ed., A. Jones         ||       ksankar@cisco.com, arnold.jones@snia.org
-  RFC6209          ||      W. Kim, J. Lee, J. Park, D. Kwon         ||       whkim5@ensec.re.kr, jklee@ensec.re.kr, jhpark@ensec.re.kr, ds_kwon@ensec.re.kr
-  RFC6210          ||      J. Schaad         ||       ietf@augustcellars.com
-  RFC6211          ||      J. Schaad         ||       ietf@augustcellars.com
-  RFC6212          ||      M. Kucherawy         ||       msk@cloudmark.com
-  RFC6213          ||      C. Hopps, L. Ginsberg         ||       chopps@cisco.com, ginsberg@cisco.com
-  RFC6214          ||      B. Carpenter, R. Hinden         ||       brian.e.carpenter@gmail.com, bob.hinden@gmail.com
-  RFC6215          ||      M. Bocci, L. Levrau, D. Frost         ||       matthew.bocci@alcatel-lucent.com, lieven.levrau@alcatel-lucent.com, danfrost@cisco.com
-  RFC6216          ||      C. Jennings, K. Ono, R. Sparks, B. Hibbard, Ed.         ||       fluffy@cisco.com, kumiko@cs.columbia.edu, Robert.Sparks@tekelec.com, Brian.Hibbard@tekelec.com
-  RFC6217          ||      T. Ritter         ||       tom@ritter.vg
-  RFC6218          ||      G. Zorn, T. Zhang, J. Walker, J. Salowey         ||       gwz@net-zen.net, tzhang@advistatech.com, jesse.walker@intel.com, jsalowey@cisco.com
-  RFC6219          ||      X. Li, C. Bao, M. Chen, H. Zhang, J. Wu         ||       xing@cernet.edu.cn, congxiao@cernet.edu.cn, fibrib@gmail.com, neilzh@gmail.com, jianping@cernet.edu.cn
-  RFC6220          ||      D. McPherson, Ed., O. Kolkman, Ed., J. Klensin, Ed., G. Huston, Ed., Internet Architecture Board         ||       dmcpherson@verisign.com, olaf@NLnetLabs.nl, john+ietf@jck.com, gih@apnic.net
-  RFC6221          ||      D. Miles, Ed., S. Ooghe, W. Dec, S. Krishnan, A. Kavanagh         ||       david.miles@alcatel-lucent.com, sven.ooghe@alcatel-lucent.com, wdec@cisco.com, suresh.krishnan@ericsson.com, alan.kavanagh@ericsson.com
-  RFC6222          ||      A. Begen, C. Perkins, D. Wing         ||       abegen@cisco.com, csp@csperkins.org, dwing-ietf@fuggles.com
-  RFC6223          ||      C. Holmberg         ||       christer.holmberg@ericsson.com
-  RFC6224          ||      T. Schmidt, M. Waehlisch, S. Krishnan         ||       schmidt@informatik.haw-hamburg.de, mw@link-lab.net, suresh.krishnan@ericsson.com
-  RFC6225          ||      J. Polk, M. Linsner, M. Thomson, B. Aboba, Ed.         ||       jmpolk@cisco.com, marc.linsner@cisco.com, martin.thomson@andrew.com, bernard_aboba@hotmail.com
-  RFC6226          ||      B. Joshi, A. Kessler, D. McWalter         ||       bharat_joshi@infosys.com, kessler@cisco.com, david@mcwalter.eu
-  RFC6227          ||      T. Li, Ed.         ||       tli@cisco.com
-  RFC6228          ||      C. Holmberg         ||       christer.holmberg@ericsson.com
-  RFC6229          ||      J. Strombergson, S. Josefsson         ||       joachim@secworks.se, simon@josefsson.org
-  RFC6230          ||      C. Boulton, T. Melanchuk, S. McGlashan         ||       chris@ns-technologies.com, timm@rainwillow.com, smcg.stds01@mcglashan.org
-  RFC6231          ||      S. McGlashan, T. Melanchuk, C. Boulton         ||       smcg.stds01@mcglashan.org, timm@rainwillow.com, chris@ns-technologies.com
-  RFC6232          ||      F. Wei, Y. Qin, Z. Li, T. Li, J. Dong         ||       weifang@chinamobile.com, qinyue@chinamobile.com, lizhenqiang@chinamobile.com, tony.li@tony.li, dongjie_dj@huawei.com
-  RFC6233          ||      T. Li, L. Ginsberg         ||       tony.li@tony.li, ginsberg@cisco.com
-  RFC6234          ||      D. Eastlake 3rd, T. Hansen         ||       d3e3e3@gmail.com, tony+shs@maillennium.att.com
-  RFC6235          ||      E. Boschi, B. Trammell         ||       boschie@tik.ee.ethz.ch, trammell@tik.ee.ethz.ch
-  RFC6236          ||      I. Johansson, K. Jung         ||       ingemar.s.johansson@ericsson.com, kyunghun.jung@samsung.com
-  RFC6237          ||      B. Leiba, A. Melnikov         ||       barryleiba@computer.org, Alexey.Melnikov@isode.com
-  RFC6238          ||      D. M'Raihi, S. Machani, M. Pei, J. Rydell         ||       davidietf@gmail.com, smachani@diversinet.com, Mingliang_Pei@symantec.com, johanietf@gmail.com
-  RFC6239          ||      K. Igoe         ||       kmigoe@nsa.gov
-  RFC6240          ||      D. Zelig, Ed., R. Cohen, Ed., T. Nadeau, Ed.         ||       david_zelig@pmc-sierra.com, ronc@resolutenetworks.com, Thomas.Nadeau@ca.com
-  RFC6241          ||      R. Enns, Ed., M. Bjorklund, Ed., J. Schoenwaelder, Ed., A. Bierman, Ed.         ||       rob.enns@gmail.com, mbj@tail-f.com, j.schoenwaelder@jacobs-university.de, andy@yumaworks.com
-  RFC6242          ||      M. Wasserman         ||       mrw@painless-security.com
-  RFC6243          ||      A. Bierman, B. Lengyel         ||       andy@yumaworks.com, balazs.lengyel@ericsson.com
-  RFC6244          ||      P. Shafer         ||       phil@juniper.net
-  RFC6245          ||      P. Yegani, K. Leung, A. Lior, K. Chowdhury, J. Navali         ||       pyegani@juniper.net, kleung@cisco.com, avi@bridgewatersystems.com, kchowdhu@cisco.com, jnavali@cisco.com
-  RFC6246          ||      A. Sajassi, Ed., F. Brockners, D. Mohan, Ed., Y. Serbest         ||       sajassi@cisco.com, fbrockne@cisco.com, dinmohan@hotmail.com, yetik_serbest@labs.att.com
-  RFC6247          ||      L. Eggert         ||       lars.eggert@nokia.com
-  RFC6248          ||      A. Morton         ||       acmorton@att.com
-  RFC6249          ||      A. Bryan, N. McNab, T. Tsujikawa, P. Poeml, H. Nordstrom         ||       anthonybryan@gmail.com, neil@nabber.org, tatsuhiro.t@gmail.com, peter@poeml.de, henrik@henriknordstrom.net
-  RFC6250          ||      D. Thaler         ||       dthaler@microsoft.com
-  RFC6251          ||      S. Josefsson         ||       simon@josefsson.org
-  RFC6252          ||      A. Dutta, Ed., V. Fajardo, Y. Ohba, K. Taniuchi, H. Schulzrinne         ||       ashutosh.dutta@ieee.org, vf0213@gmail.com, yoshihiro.ohba@toshiba.co.jp, kenichi.taniuchi@toshiba.co.jp, hgs@cs.columbia.edu
-  RFC6253          ||      T. Heer, S. Varjonen         ||       heer@cs.rwth-aachen.de, samu.varjonen@hiit.fi
-  RFC6254          ||      M. McFadden         ||       mark.mcfadden@icann.org
-  RFC6255          ||      M. Blanchet         ||       Marc.Blanchet@viagenie.ca
-  RFC6256          ||      W. Eddy, E. Davies         ||       wes@mti-systems.com, elwynd@folly.org.uk
-  RFC6257          ||      S. Symington, S. Farrell, H. Weiss, P. Lovell         ||       susan@mitre.org, stephen.farrell@cs.tcd.ie, howard.weiss@sparta.com, dtnbsp@gmail.com
-  RFC6258          ||      S. Symington         ||       susan@mitre.org
-  RFC6259          ||      S. Symington         ||       susan@mitre.org
-  RFC6260          ||      S. Burleigh         ||       Scott.C.Burleigh@jpl.nasa.gov
-  RFC6261          ||      A. Keranen         ||       ari.keranen@ericsson.com
-  RFC6262          ||      S. Ikonin         ||       ikonin@spiritdsp.com
-  RFC6263          ||      X. Marjou, A. Sollaud         ||       xavier.marjou@orange-ftgroup.com, aurelien.sollaud@orange-ftgroup.com
-  RFC6264          ||      S. Jiang, D. Guo, B. Carpenter         ||       jiangsheng@huawei.com, guoseu@huawei.com, brian.e.carpenter@gmail.com
-  RFC6265          ||      A. Barth         ||       abarth@eecs.berkeley.edu
-  RFC6266          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC6267          ||      V. Cakulev, G. Sundaram         ||       violeta.cakulev@alcatel-lucent.com, ganesh.sundaram@alcatel-lucent.com
-  RFC6268          ||      J. Schaad, S. Turner         ||       ietf@augustcellars.com, turners@ieca.com
-  RFC6269          ||      M. Ford, Ed., M. Boucadair, A. Durand, P. Levis, P. Roberts         ||       ford@isoc.org, mohamed.boucadair@orange-ftgroup.com, adurand@juniper.net, pierre.levis@orange-ftgroup.com, roberts@isoc.org
-  RFC6270          ||      M. Yevstifeyev         ||       evnikita2@gmail.com
-  RFC6271          ||      J-F. Mule         ||       jf.mule@cablelabs.com
-  RFC6272          ||      F. Baker, D. Meyer         ||       fred@cisco.com, dmm@cisco.com
-  RFC6273          ||      A. Kukec, S. Krishnan, S. Jiang         ||       ana.kukec@fer.hr, suresh.krishnan@ericsson.com, jiangsheng@huawei.com
-  RFC6274          ||      F. Gont         ||       fernando@gont.com.ar
-  RFC6275          ||      C. Perkins, Ed., D. Johnson, J. Arkko         ||       charliep@computer.org, dbj@cs.rice.edu, jari.arkko@ericsson.com
-  RFC6276          ||      R. Droms, P. Thubert, F. Dupont, W. Haddad, C. Bernardos         ||       rdroms@cisco.com, pthubert@cisco.com, fdupont@isc.org, Wassim.Haddad@ericsson.com, cjbc@it.uc3m.es
-  RFC6277          ||      S. Santesson, P. Hallam-Baker         ||       sts@aaa-sec.com, hallam@gmail.com
-  RFC6278          ||      J. Herzog, R. Khazan         ||       jherzog@ll.mit.edu, rkh@ll.mit.edu
-  RFC6279          ||      M. Liebsch, Ed., S. Jeong, Q. Wu         ||       liebsch@neclab.eu, sjjeong@etri.re.kr, sunseawq@huawei.com
-  RFC6280          ||      R. Barnes, M. Lepinski, A. Cooper, J. Morris, H. Tschofenig, H. Schulzrinne         ||       rbarnes@bbn.com, mlepinski@bbn.com, acooper@cdt.org, jmorris@cdt.org, Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu
-  RFC6281          ||      S. Cheshire, Z. Zhu, R. Wakikawa, L. Zhang         ||       cheshire@apple.com, zhenkai@ucla.edu, ryuji@jp.toyota-itc.com, lixia@cs.ucla.edu
-  RFC6282          ||      J. Hui, Ed., P. Thubert         ||       jhui@archrock.com, pthubert@cisco.com
-  RFC6283          ||      A. Jerman Blazic, S. Saljic, T. Gondrom         ||       aljosa@setcce.si, svetlana.saljic@setcce.si, tobias.gondrom@gondrom.org
-  RFC6284          ||      A. Begen, D. Wing, T. Van Caenegem         ||       abegen@cisco.com, dwing-ietf@fuggles.com, Tom.Van_Caenegem@alcatel-lucent.com
-  RFC6285          ||      B. Ver Steeg, A. Begen, T. Van Caenegem, Z. Vax         ||       billvs@cisco.com, abegen@cisco.com, Tom.Van_Caenegem@alcatel-lucent.be, zeevvax@microsoft.com
-  RFC6286          ||      E. Chen, J. Yuan         ||       enkechen@cisco.com, jenny@cisco.com
-  RFC6287          ||      D. M'Raihi, J. Rydell, S. Bajaj, S. Machani, D. Naccache         ||       davidietf@gmail.com, johanietf@gmail.com, siddharthietf@gmail.com, smachani@diversinet.com, david.naccache@ens.fr
-  RFC6288          ||      C. Reed         ||       creed@opengeospatial.org
-  RFC6289          ||      E. Cardona, S. Channabasappa, J-F. Mule         ||       e.cardona@cablelabs.com, sumanth@cablelabs.com, jf.mule@cablelabs.com
-  RFC6290          ||      Y. Nir, Ed., D. Wierbowski, F. Detienne, P. Sethi         ||       ynir@checkpoint.com, wierbows@us.ibm.com, fd@cisco.com, psethi@cisco.com
-  RFC6291          ||      L. Andersson, H. van Helvoort, R. Bonica, D. Romascanu, S. Mansfield         ||       loa.andersson@ericsson.com, huub.van.helvoort@huawei.com, rbonica@juniper.net, dromasca@gmail.com , scott.mansfield@ericsson.com
-  RFC6292          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC6293          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC6294          ||      Q. Hu, B. Carpenter         ||       qhu009@aucklanduni.ac.nz, brian.e.carpenter@gmail.com
-  RFC6295          ||      J. Lazzaro, J. Wawrzynek         ||       lazzaro@cs.berkeley.edu, johnw@cs.berkeley.edu
-  RFC6296          ||      M. Wasserman, F. Baker         ||       mrw@painless-security.com, fred@cisco.com
-  RFC6297          ||      M. Welzl, D. Ros         ||       michawe@ifi.uio.no, david.ros@telecom-bretagne.eu
-  RFC6298          ||      V. Paxson, M. Allman, J. Chu, M. Sargent         ||       vern@icir.org, mallman@icir.org, hkchu@google.com, mts71@case.edu
-  RFC6301          ||      Z. Zhu, R. Wakikawa, L. Zhang         ||       zhenkai@cs.ucla.edu, ryuji.wakikawa@gmail.com, lixia@cs.ucla.edu
-  RFC6302          ||      A. Durand, I. Gashinsky, D. Lee, S. Sheppard         ||       adurand@juniper.net, igor@yahoo-inc.com, donn@fb.com, Scott.Sheppard@att.com
-  RFC6303          ||      M. Andrews         ||       marka@isc.org
-  RFC6304          ||      J. Abley, W. Maton         ||       joe.abley@icann.org, wmaton@ryouko.imsb.nrc.ca
-  RFC6305          ||      J. Abley, W. Maton         ||       joe.abley@icann.org, wmaton@ryouko.imsb.nrc.ca
-  RFC6306          ||      P. Frejborg         ||       pfrejborg@gmail.com
-  RFC6307          ||      D. Black, Ed., L. Dunbar, Ed., M. Roth, R. Solomon         ||       david.black@emc.com, ldunbar@huawei.com, MRoth@infinera.com, ronens@corrigent.com
-  RFC6308          ||      P. Savola         ||       psavola@funet.fi
-  RFC6309          ||      J. Arkko, A. Keranen, J. Mattsson         ||       jari.arkko@piuha.net, ari.keranen@ericsson.com, john.mattsson@ericsson.com
-  RFC6310          ||      M. Aissaoui, P. Busschbach, L. Martini, M. Morrow, T. Nadeau, Y(J). Stein         ||       mustapha.aissaoui@alcatel-lucent.com, busschbach@alcatel-lucent.com, lmartini@cisco.com, mmorrow@cisco.com, Thomas.Nadeau@ca.com, yaakov_s@rad.com
-  RFC6311          ||      R. Singh, Ed., G. Kalyani, Y. Nir, Y. Sheffer, D. Zhang         ||       rsj@cisco.com, kagarigi@cisco.com, ynir@checkpoint.com, yaronf.ietf@gmail.com, zhangdacheng@huawei.com
-  RFC6312          ||      R. Koodli         ||       rkoodli@cisco.com
-  RFC6313          ||      B. Claise, G. Dhandapani, P. Aitken, S. Yates         ||       bclaise@cisco.com, gowri@cisco.com, paitken@cisco.com, syates@cisco.com
-  RFC6314          ||      C. Boulton, J. Rosenberg, G. Camarillo, F. Audet         ||       chris@ns-technologies.com, jdrosen@jdrosen.net, Gonzalo.Camarillo@ericsson.com, francois.audet@skype.net
-  RFC6315          ||      E. Guy, K. Darilion         ||       edguy@CleverSpoke.com, klaus.darilion@nic.at
-  RFC6316          ||      M. Komu, M. Bagnulo, K. Slavov, S. Sugimoto, Ed.         ||       miika@iki.fi, marcelo@it.uc3m.es, kristian.slavov@ericsson.com, shinta@sfc.wide.ad.jp
-  RFC6317          ||      M. Komu, T. Henderson         ||       miika@iki.fi, thomas.r.henderson@boeing.com
-  RFC6318          ||      R. Housley, J. Solinas         ||       housley@vigilsec.com, jasolin@orion.ncsc.mil
-  RFC6319          ||      M. Azinger, L. Vegoda         ||       marla.azinger@ftr.com, leo.vegoda@icann.org
-  RFC6320          ||      S. Wadhwa, J. Moisand, T. Haag, N. Voigt, T. Taylor, Ed.         ||       sanjay.wadhwa@alcatel-lucent.com, jmoisand@juniper.net, haagt@telekom.de, norbert.voigt@nsn.com, tom.taylor.stds@gmail.com
-  RFC6321          ||      C. Daboo, M. Douglass, S. Lees         ||       cyrus@daboo.name, douglm@rpi.edu, steven.lees@microsoft.com
-  RFC6322          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC6323          ||      G. Renker, G. Fairhurst         ||       gerrit@erg.abdn.ac.uk, gorry@erg.abdn.ac.uk
-  RFC6324          ||      G. Nakibly, F. Templin         ||       gnakibly@yahoo.com, fltemplin@acm.org
-  RFC6325          ||      R. Perlman, D. Eastlake 3rd, D. Dutt, S. Gai, A. Ghanwani         ||       Radia@alum.mit.edu, d3e3e3@gmail.com, ddutt@cisco.com, silvano@ip6.com, anoop@alumni.duke.edu
-  RFC6326          ||      D. Eastlake, A. Banerjee, D. Dutt, R. Perlman, A. Ghanwani         ||       d3e3e3@gmail.com, ayabaner@cisco.com, ddutt@cisco.com, Radia@alum.mit.edu, anoop@alumni.duke.edu
-  RFC6327          ||      D. Eastlake 3rd, R. Perlman, A. Ghanwani, D. Dutt, V. Manral         ||       d3e3e3@gmail.com, Radia@alum.mit.edu, anoop@alumni.duke.edu, ddutt@cisco.com, vishwas.manral@hp.com
-  RFC6328          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC6329          ||      D. Fedyk, Ed., P. Ashwood-Smith, Ed., D. Allan, A. Bragg, P. Unbehagen         ||       Donald.Fedyk@alcatel-lucent.com, Peter.AshwoodSmith@huawei.com, david.i.allan@ericsson.com, nbragg@ciena.com, unbehagen@avaya.com
-  RFC6330          ||      M. Luby, A. Shokrollahi, M. Watson, T. Stockhammer, L. Minder         ||       luby@qti.qualcomm.com, amin.shokrollahi@epfl.ch, watsonm@netflix.com, stockhammer@nomor.de, lminder@qualcomm.com
-  RFC6331          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
-  RFC6332          ||      A. Begen, E. Friedrich         ||       abegen@cisco.com, efriedri@cisco.com
-  RFC6333          ||      A. Durand, R. Droms, J. Woodyatt, Y. Lee         ||       adurand@juniper.net, rdroms@cisco.com, jhw@apple.com, yiu_lee@cable.comcast.com
-  RFC6334          ||      D. Hankins, T. Mrugalski         ||       dhankins@google.com, tomasz.mrugalski@eti.pg.gda.pl
-  RFC6335          ||      M. Cotton, L. Eggert, J. Touch, M. Westerlund, S. Cheshire         ||       michelle.cotton@icann.org, lars.eggert@nokia.com, touch@isi.edu, magnus.westerlund@ericsson.com, cheshire@apple.com
-  RFC6336          ||      M. Westerlund, C. Perkins         ||       magnus.westerlund@ericsson.com, csp@csperkins.org
-  RFC6337          ||      S. Okumura, T. Sawada, P. Kyzivat         ||       shinji.okumura@softfront.jp, tu-sawada@kddi.com, pkyzivat@alum.mit.edu
-  RFC6338          ||      V. Giralt, R. McDuff         ||       victoriano@uma.es, r.mcduff@uq.edu.au
-  RFC6339          ||      S. Josefsson, L. Hornquist Astrand         ||       simon@josefsson.org, lha@apple.com
-  RFC6340          ||      R. Presuhn         ||       randy_presuhn@mindspring.com
-  RFC6341          ||      K. Rehor, Ed., L. Portman, Ed., A. Hutton, R. Jain         ||       krehor@cisco.com, leon.portman@nice.com, andrew.hutton@siemens-enterprise.com, rajnish.jain@ipc.com
-  RFC6342          ||      R. Koodli         ||       rkoodli@cisco.com
-  RFC6343          ||      B. Carpenter         ||       brian.e.carpenter@gmail.com
-  RFC6344          ||      G. Bernstein, Ed., D. Caviglia, R. Rabbat, H. van Helvoort         ||       gregb@grotto-networking.com, diego.caviglia@ericsson.com, rabbat@alum.mit.edu, hhelvoort@huawei.com
-  RFC6345          ||      P. Duffy, S. Chakrabarti, R. Cragie, Y. Ohba, Ed., A. Yegin         ||       paduffy@cisco.com, samita.chakrabarti@ericsson.com, robert.cragie@gridmerge.com, yoshihiro.ohba@toshiba.co.jp, a.yegin@partner.samsung.com
-  RFC6346          ||      R. Bush, Ed.         ||       randy@psg.com
-  RFC6347          ||      E. Rescorla, N. Modadugu         ||       ekr@rtfm.com, nagendra@cs.stanford.edu
-  RFC6348          ||      JL. Le Roux, Ed., T. Morin, Ed.         ||       jeanlouis.leroux@orange-ftgroup.com, thomas.morin@orange-ftgroup.com
-  RFC6349          ||      B. Constantine, G. Forget, R. Geib, R. Schrage         ||       barry.constantine@jdsu.com, gilles.forget@sympatico.ca, Ruediger.Geib@telekom.de, reinhard@schrageconsult.com
-  RFC6350          ||      S. Perreault         ||       simon.perreault@viagenie.ca
-  RFC6351          ||      S. Perreault         ||       simon.perreault@viagenie.ca
-  RFC6352          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC6353          ||      W. Hardaker         ||       ietf@hardakers.net
-  RFC6354          ||      Q. Xie         ||       Qiaobing.Xie@gmail.com
-  RFC6355          ||      T. Narten, J. Johnson         ||       narten@us.ibm.com, jarrod.b.johnson@gmail.com
-  RFC6356          ||      C. Raiciu, M. Handley, D. Wischik         ||       costin.raiciu@cs.pub.ro, m.handley@cs.ucl.ac.uk, d.wischik@cs.ucl.ac.uk
-  RFC6357          ||      V. Hilt, E. Noel, C. Shen, A. Abdelal         ||       volker.hilt@alcatel-lucent.com, eric.noel@att.com, charles@cs.columbia.edu, aabdelal@sonusnet.com
-  RFC6358          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC6359          ||      S. Ginoza, M. Cotton, A. Morris         ||       sginoza@amsl.com, michelle.cotton@icann.org, amorris@amsl.com
-  RFC6360          ||      R. Housley         ||       housley@vigilsec.com
-  RFC6361          ||      J. Carlson, D. Eastlake 3rd         ||       carlsonj@workingcode.com, d3e3e3@gmail.com
-  RFC6362          ||      K. Meadors, Ed.         ||       kyle@drummondgroup.com
-  RFC6363          ||      M. Watson, A. Begen, V. Roca         ||       watsonm@netflix.com, abegen@cisco.com, vincent.roca@inria.fr
-  RFC6364          ||      A. Begen         ||       abegen@cisco.com
-  RFC6365          ||      P. Hoffman, J. Klensin         ||       paul.hoffman@vpnc.org, john+ietf@jck.com
-  RFC6366          ||      J. Valin, K. Vos         ||       jmvalin@jmvalin.ca, koen.vos@skype.net
-  RFC6367          ||      S. Kanno, M. Kanda         ||       kanno.satoru@po.ntts.co.jp, kanda.masayuki@lab.ntt.co.jp
-  RFC6368          ||      P. Marques, R. Raszuk, K. Patel, K. Kumaki, T. Yamagata         ||       pedro.r.marques@gmail.com, robert@raszuk.net, keyupate@cisco.com, ke-kumaki@kddi.com, to-yamagata@kddi.com
-  RFC6369          ||      E. Haleplidis, O. Koufopavlou, S. Denazis         ||       ehalep@ece.upatras.gr, odysseas@ece.upatras.gr, sdena@upatras.gr
-  RFC6370          ||      M. Bocci, G. Swallow, E. Gray         ||       matthew.bocci@alcatel-lucent.com, swallow@cisco.com, eric.gray@ericsson.com
-  RFC6371          ||      I. Busi, Ed., D. Allan, Ed.         ||       Italo.Busi@alcatel-lucent.com, david.i.allan@ericsson.com
-  RFC6372          ||      N. Sprecher, Ed., A. Farrel, Ed.         ||       nurit.sprecher@nsn.com, adrian@olddog.co.uk
-  RFC6373          ||      L. Andersson, Ed., L. Berger, Ed., L. Fang, Ed., N. Bitar, Ed., E. Gray, Ed.         ||       loa.andersson@ericsson.com, lberger@labn.net, lufang@cisco.com, nabil.n.bitar@verizon.com, Eric.Gray@Ericsson.com
-  RFC6374          ||      D. Frost, S. Bryant         ||       danfrost@cisco.com, stbryant@cisco.com
-  RFC6375          ||      D. Frost, Ed., S. Bryant, Ed.         ||       danfrost@cisco.com, stbryant@cisco.com
-  RFC6376          ||      D. Crocker, Ed., T. Hansen, Ed., M. Kucherawy, Ed.         ||       dcrocker@bbiw.net, tony+dkimov@maillennium.att.com, msk@cloudmark.com
-  RFC6377          ||      M. Kucherawy         ||       msk@cloudmark.com
-  RFC6378          ||      Y. Weingarten, Ed., S. Bryant, E. Osborne, N. Sprecher, A. Fulignoli, Ed.         ||       yaacov.weingarten@nsn.com, stbryant@cisco.com, eosborne@cisco.com, nurit.sprecher@nsn.com, annamaria.fulignoli@ericsson.com
-  RFC6379          ||      L. Law, J. Solinas         ||       lelaw@orion.ncsc.mil, jasolin@orion.ncsc.mil
-  RFC6380          ||      K. Burgin, M. Peck         ||       kwburgi@tycho.ncsc.mil, mpeck@mitre.org
-  RFC6381          ||      R. Gellens, D. Singer, P. Frojdh         ||       rg+ietf@qualcomm.com, singer@apple.com, Per.Frojdh@ericsson.com
-  RFC6382          ||      D. McPherson, R. Donnelly, F. Scalzo         ||       dmcpherson@verisign.com, rdonnelly@verisign.com, fscalzo@verisign.com
-  RFC6383          ||      K. Shiomoto, A. Farrel         ||       shiomoto.kohei@lab.ntt.co.jp, adrian@olddog.co.uk
-  RFC6384          ||      I. van Beijnum         ||       iljitsch@muada.com
-  RFC6385          ||      M. Barnes, A. Doria, H. Alvestrand, B. Carpenter         ||       mary.ietf.barnes@gmail.com, avri@acm.org, harald@alvestrand.no, brian.e.carpenter@gmail.com
-  RFC6386          ||      J. Bankoski, J. Koleszar, L. Quillio, J. Salonen, P. Wilkins, Y. Xu         ||       jimbankoski@google.com, jkoleszar@google.com, louquillio@google.com, jsalonen@google.com, paulwilkins@google.com, yaowu@google.com
-  RFC6387          ||      A. Takacs, L. Berger, D. Caviglia, D. Fedyk, J. Meuric         ||       attila.takacs@ericsson.com, lberger@labn.net, diego.caviglia@ericsson.com, donald.fedyk@alcatel-lucent.com, julien.meuric@orange.com
-  RFC6388          ||      IJ. Wijnands, Ed., I. Minei, Ed., K. Kompella, B. Thomas         ||       ice@cisco.com, ina@juniper.net, kireeti@juniper.net, bobthomas@alum.mit.edu
-  RFC6389          ||      R. Aggarwal, JL. Le Roux         ||       raggarwa_1@yahoo.com, jeanlouis.leroux@orange-ftgroup.com
-  RFC6390          ||      A. Clark, B. Claise         ||       alan.d.clark@telchemy.com, bclaise@cisco.com
-  RFC6391          ||      S. Bryant, Ed., C. Filsfils, U. Drafz, V. Kompella, J. Regan, S. Amante         ||       stbryant@cisco.com, cfilsfil@cisco.com, Ulrich.Drafz@telekom.de, vach.kompella@alcatel-lucent.com, joe.regan@alcatel-lucent.com, shane@level3.net
-  RFC6392          ||      R. Alimi, Ed., A. Rahman, Ed., Y. Yang, Ed.         ||       ralimi@google.com, Akbar.Rahman@InterDigital.com, yry@cs.yale.edu
-  RFC6393          ||      M. Yevstifeyev         ||       evnikita2@gmail.com
-  RFC6394          ||      R. Barnes         ||       rbarnes@bbn.com
-  RFC6395          ||      S. Gulrajani, S. Venaas         ||       sameerg@cisco.com, stig@cisco.com
-  RFC6396          ||      L. Blunk, M. Karir, C. Labovitz         ||       ljb@merit.edu, mkarir@merit.edu, labovit@deepfield.net
-  RFC6397          ||      T. Manderson         ||       terry.manderson@icann.org
-  RFC6398          ||      F. Le Faucheur, Ed.         ||       flefauch@cisco.com
-  RFC6401          ||      F. Le Faucheur, J. Polk, K. Carlberg         ||       flefauch@cisco.com, jmpolk@cisco.com, carlberg@g11.org.uk
-  RFC6402          ||      J. Schaad         ||       jimsch@augustcellars.com
-  RFC6403          ||      L. Zieglar, S. Turner, M. Peck         ||       llziegl@tycho.ncsc.mil, turners@ieca.com, mpeck@alumni.virginia.edu
-  RFC6404          ||      J. Seedorf, S. Niccolini, E. Chen, H. Scholz         ||       jan.seedorf@nw.neclab.eu, saverio.niccolini@.neclab.eu, eric.chen@lab.ntt.co.jp, hendrik.scholz@voipfuture.com
-  RFC6405          ||      A. Uzelac, Ed., Y. Lee, Ed.         ||       adam.uzelac@globalcrossing.com, yiu_lee@cable.comcast.com
-  RFC6406          ||      D. Malas, Ed., J. Livingood, Ed.         ||       d.malas@cablelabs.com, Jason_Livingood@cable.comcast.com
-  RFC6407          ||      B. Weis, S. Rowles, T. Hardjono         ||       bew@cisco.com, sheela@cisco.com, hardjono@mit.edu
-  RFC6408          ||      M. Jones, J. Korhonen, L. Morand         ||       mark@azu.ca, jouni.nospam@gmail.com, lionel.morand@orange-ftgroup.com
-  RFC6409          ||      R. Gellens, J. Klensin         ||       rg+ietf@qualcomm.com, john-ietf@jck.com
-  RFC6410          ||      R. Housley, D. Crocker, E. Burger         ||       housley@vigilsec.com, dcrocker@bbiw.net, eburger@standardstrack.com
-  RFC6411          ||      M. Behringer, F. Le Faucheur, B. Weis         ||       mbehring@cisco.com, flefauch@cisco.com, bew@cisco.com
-  RFC6412          ||      S. Poretsky, B. Imhoff, K. Michielsen         ||       sporetsky@allot.com, bimhoff@planetspork.com, kmichiel@cisco.com
-  RFC6413          ||      S. Poretsky, B. Imhoff, K. Michielsen         ||       sporetsky@allot.com, bimhoff@planetspork.com, kmichiel@cisco.com
-  RFC6414          ||      S. Poretsky, R. Papneja, J. Karthik, S. Vapiwala         ||       sporetsky@allot.com, rajiv.papneja@huawei.com, jkarthik@cisco.com, svapiwal@cisco.com
-  RFC6415          ||      E. Hammer-Lahav, Ed., B. Cook         ||       eran@hueniverse.com, romeda@gmail.com
-  RFC6416          ||      M. Schmidt, F. de Bont, S. Doehla, J. Kim         ||       malte.schmidt@dolby.com, frans.de.bont@philips.com, stefan.doehla@iis.fraunhofer.de, kjh1905m@naver.com
-  RFC6417          ||      P. Eardley, L. Eggert, M. Bagnulo, R. Winter         ||       philip.eardley@bt.com, lars.eggert@nokia.com, marcelo@it.uc3m.es, rolf.winter@neclab.eu
-  RFC6418          ||      M. Blanchet, P. Seite         ||       Marc.Blanchet@viagenie.ca, pierrick.seite@orange.com
-  RFC6419          ||      M. Wasserman, P. Seite         ||       mrw@painless-security.com, pierrick.seite@orange-ftgroup.com
-  RFC6420          ||      Y. Cai, H. Ou         ||       ycai@cisco.com, hou@cisco.com
-  RFC6421          ||      D. Nelson, Ed.         ||       d.b.nelson@comcast.net
-  RFC6422          ||      T. Lemon, Q. Wu         ||       mellon@nominum.com, sunseawq@huawei.com
-  RFC6423          ||      H. Li, L. Martini, J. He, F. Huang         ||       lihan@chinamobile.com, lmartini@cisco.com, hejia@huawei.com, feng.f.huang@alcatel-sbell.com.cn
-  RFC6424          ||      N. Bahadur, K. Kompella, G. Swallow         ||       nitinb@juniper.net, kireeti@juniper.net, swallow@cisco.com
-  RFC6425          ||      S. Saxena, Ed., G. Swallow, Z. Ali, A. Farrel, S. Yasukawa, T. Nadeau         ||       ssaxena@cisco.com, swallow@cisco.com, zali@cisco.com, adrian@olddog.co.uk, yasukawa.seisho@lab.ntt.co.jp, thomas.nadeau@ca.com
-  RFC6426          ||      E. Gray, N. Bahadur, S. Boutros, R. Aggarwal         ||       eric.gray@ericsson.com, nitinb@juniper.net, sboutros@cisco.com, raggarwa_1@yahoo.com
-  RFC6427          ||      G. Swallow, Ed., A. Fulignoli, Ed., M. Vigoureux, Ed., S. Boutros, D. Ward         ||       swallow@cisco.com, annamaria.fulignoli@ericsson.com, martin.vigoureux@alcatel-lucent.com, sboutros@cisco.com, dward@juniper.net
-  RFC6428          ||      D. Allan, Ed., G. Swallow, Ed., J. Drake, Ed.         ||       david.i.allan@ericsson.com, swallow@cisco.com, jdrake@juniper.net
-  RFC6429          ||      M. Bashyam, M. Jethanandani, A. Ramaiah         ||       mbashyam@ocarinanetworks.com, mjethanandani@gmail.com, ananth@cisco.com
-  RFC6430          ||      K. Li, B. Leiba         ||       likepeng@huawei.com, barryleiba@computer.org
-  RFC6431          ||      M. Boucadair, P. Levis, G. Bajko, T. Savolainen, T. Tsou         ||       mohamed.boucadair@orange.com, pierre.levis@orange.com, gabor.bajko@nokia.com, teemu.savolainen@nokia.com, tina.tsou.zouting@huawei.com
-  RFC6432          ||      R. Jesske, L. Liess         ||       r.jesske@telekom.de, L.Liess@telekom.de
-  RFC6433          ||      P. Hoffman         ||       paul.hoffman@vpnc.org
-  RFC6434          ||      E. Jankiewicz, J. Loughney, T. Narten         ||       edward.jankiewicz@sri.com, john.loughney@nokia.com, narten@us.ibm.com
-  RFC6435          ||      S. Boutros, Ed., S. Sivabalan, Ed., R. Aggarwal, Ed., M. Vigoureux, Ed., X. Dai, Ed.         ||       sboutros@cisco.com, msiva@cisco.com, raggarwa_1@yahoo.com, martin.vigoureux@alcatel-lucent.com, dai.xuehui@zte.com.cn
-  RFC6436          ||      S. Amante, B. Carpenter, S. Jiang         ||       shane@level3.net, brian.e.carpenter@gmail.com, shengjiang@huawei.com
-  RFC6437          ||      S. Amante, B. Carpenter, S. Jiang, J. Rajahalme         ||       shane@level3.net, brian.e.carpenter@gmail.com, jiangsheng@huawei.com, jarno.rajahalme@nsn.com
-  RFC6438          ||      B. Carpenter, S. Amante         ||       brian.e.carpenter@gmail.com, shane@level3.net
-  RFC6439          ||      R. Perlman, D. Eastlake, Y. Li, A. Banerjee, F. Hu         ||       Radia@alum.mit.edu, d3e3e3@gmail.com, liyizhou@huawei.com, ayabaner@cisco.com, hu.fangwei@zte.com.cn
-  RFC6440          ||      G. Zorn, Q. Wu, Y. Wang         ||       gwz@net-zen.net, sunseawq@huawei.com, w52006@huawei.com
-  RFC6441          ||      L. Vegoda         ||       leo.vegoda@icann.org
-  RFC6442          ||      J. Polk, B. Rosen, J. Peterson         ||       jmpolk@cisco.com, br@brianrosen.net, jon.peterson@neustar.biz
-  RFC6443          ||      B. Rosen, H. Schulzrinne, J. Polk, A. Newton         ||       br@brianrosen.net, hgs@cs.columbia.edu, jmpolk@cisco.com, andy@hxr.us
-  RFC6444          ||      H. Schulzrinne, L. Liess, H. Tschofenig, B. Stark, A. Kuett         ||       hgs+ecrit@cs.columbia.edu, L.Liess@telekom.de, Hannes.Tschofenig@gmx.net, barbara.stark@att.com, andres.kytt@skype.net
-  RFC6445          ||      T. Nadeau, Ed., A. Koushik, Ed., R. Cetin, Ed.         ||       thomas.nadeau@ca.com, kkoushik@cisco.com, riza.cetin@alcatel.be
-  RFC6446          ||      A. Niemi, K. Kiss, S. Loreto         ||       aki.niemi@nokia.com, krisztian.kiss@nokia.com, salvatore.loreto@ericsson.com
-  RFC6447          ||      R. Mahy, B. Rosen, H. Tschofenig         ||       rohan@ekabal.com, br@brianrosen.net, Hannes.Tschofenig@gmx.net
-  RFC6448          ||      R. Yount         ||       rjy@cmu.edu
-  RFC6449          ||      J. Falk, Ed.         ||       ietf@cybernothing.org
-  RFC6450          ||      S. Venaas         ||       stig@cisco.com
-  RFC6451          ||      A. Forte, H. Schulzrinne         ||       forte@att.com, hgs@cs.columbia.edu
-  RFC6452          ||      P. Faltstrom, Ed., P. Hoffman, Ed.         ||       paf@cisco.com, paul.hoffman@vpnc.org
-  RFC6453          ||      F. Dijkstra, R. Hughes-Jones         ||       Freek.Dijkstra@sara.nl, Richard.Hughes-Jones@dante.net
-  RFC6454          ||      A. Barth         ||       ietf@adambarth.com
-  RFC6455          ||      I. Fette, A. Melnikov         ||       ifette+ietf@google.com, Alexey.Melnikov@isode.com
-  RFC6456          ||      H. Li, R. Zheng, A. Farrel         ||       hongyu.lihongyu@huawei.com, robin@huawei.com, adrian@olddog.co.uk
-  RFC6457          ||      T. Takeda, Ed., A. Farrel         ||       takeda.tomonori@lab.ntt.co.jp, adrian@olddog.co.uk
-  RFC6458          ||      R. Stewart, M. Tuexen, K. Poon, P. Lei, V. Yasevich         ||       randall@lakerest.net, tuexen@fh-muenster.de, ka-cheong.poon@oracle.com, peterlei@cisco.com, vladislav.yasevich@hp.com
-  RFC6459          ||      J. Korhonen, Ed., J. Soininen, B. Patil, T. Savolainen, G. Bajko, K. Iisakkila         ||       jouni.nospam@gmail.com, jonne.soininen@renesasmobile.com, basavaraj.patil@nokia.com, teemu.savolainen@nokia.com, gabor.bajko@nokia.com, kaisu.iisakkila@renesasmobile.com
-  RFC6460          ||      M. Salter, R. Housley         ||       misalte@nsa.gov, housley@vigilsec.com
-  RFC6461          ||      S. Channabasappa, Ed.         ||       sumanth@cablelabs.com
-  RFC6462          ||      A. Cooper         ||       acooper@cdt.org
-  RFC6463          ||      J. Korhonen, Ed., S. Gundavelli, H. Yokota, X. Cui         ||       jouni.nospam@gmail.com, sri.gundavelli@cisco.com, yokota@kddilabs.jp, Xiangsong.Cui@huawei.com
-  RFC6464          ||      J. Lennox, Ed., E. Ivov, E. Marocco         ||       jonathan@vidyo.com, emcho@jitsi.org, enrico.marocco@telecomitalia.it
-  RFC6465          ||      E. Ivov, Ed., E. Marocco, Ed., J. Lennox         ||       emcho@jitsi.org, enrico.marocco@telecomitalia.it, jonathan@vidyo.com
-  RFC6466          ||      G. Salgueiro         ||       gsalguei@cisco.com
-  RFC6467          ||      T. Kivinen         ||       kivinen@iki.fi
-  RFC6468          ||      A. Melnikov, B. Leiba, K. Li         ||       Alexey.Melnikov@isode.com, barryleiba@computer.org, likepeng@huawei.com
-  RFC6469          ||      K. Kobayashi, K. Mishima, S. Casner, C. Bormann         ||       ikob@riken.jp, three@sfc.wide.ad.jp, casner@acm.org, cabo@tzi.org
-  RFC6470          ||      A. Bierman         ||       andy@yumaworks.com
-  RFC6471          ||      C. Lewis, M. Sergeant         ||       clewisbcp@cauce.org, matt@sergeant.org
-  RFC6472          ||      W. Kumari, K. Sriram         ||       warren@kumari.net, ksriram@nist.gov
-  RFC6473          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC6474          ||      K. Li, B. Leiba         ||       likepeng@huawei.com, barryleiba@computer.org
-  RFC6475          ||      G. Keeni, K. Koide, S. Gundavelli, R. Wakikawa         ||       glenn@cysols.com, ka-koide@kddi.com, sgundave@cisco.com, ryuji@us.toyota-itc.com
-  RFC6476          ||      P. Gutmann         ||       pgut001@cs.auckland.ac.nz
-  RFC6477          ||      A. Melnikov, G. Lunt         ||       Alexey.Melnikov@isode.com, graeme.lunt@smhs.co.uk
-  RFC6478          ||      L. Martini, G. Swallow, G. Heron, M. Bocci         ||       lmartini@cisco.com, swallow@cisco.com, giheron@cisco.com, matthew.bocci@alcatel-lucent.com
-  RFC6479          ||      X. Zhang, T. Tsou         ||       xiangyang.zhang@huawei.com, tena@huawei.com
-  RFC6480          ||      M. Lepinski, S. Kent         ||       mlepinski@bbn.com, kent@bbn.com
-  RFC6481          ||      G. Huston, R. Loomans, G. Michaelson         ||       gih@apnic.net, robertl@apnic.net, ggm@apnic.net
-  RFC6482          ||      M. Lepinski, S. Kent, D. Kong         ||       mlepinski@bbn.com, skent@bbn.com, dkong@bbn.com
-  RFC6483          ||      G. Huston, G. Michaelson         ||       gih@apnic.net, ggm@apnic.net
-  RFC6484          ||      S. Kent, D. Kong, K. Seo, R. Watro         ||       skent@bbn.com, dkong@bbn.com, kseo@bbn.com, rwatro@bbn.com
-  RFC6485          ||      G. Huston         ||       gih@apnic.net
-  RFC6486          ||      R. Austein, G. Huston, S. Kent, M. Lepinski         ||       sra@isc.org, gih@apnic.net, kent@bbn.com, mlepinski@bbn.com
-  RFC6487          ||      G. Huston, G. Michaelson, R. Loomans         ||       gih@apnic.net, ggm@apnic.net, robertl@apnic.net
-  RFC6488          ||      M. Lepinski, A. Chi, S. Kent         ||       mlepinski@bbn.com, achi@bbn.com, kent@bbn.com
-  RFC6489          ||      G. Huston, G. Michaelson, S. Kent         ||       gih@apnic.net, ggm@apnic.net, kent@bbn.com
-  RFC6490          ||      G. Huston, S. Weiler, G. Michaelson, S. Kent         ||       gih@apnic.net, weiler@sparta.com, ggm@apnic.net, kent@bbn.com
-  RFC6491          ||      T. Manderson, L. Vegoda, S. Kent         ||       terry.manderson@icann.org, leo.vegoda@icann.org, kent@bbn.com
-  RFC6492          ||      G. Huston, R. Loomans, B. Ellacott, R. Austein         ||       gih@apnic.net, robertl@apnic.net, bje@apnic.net, sra@hactrn.net
-  RFC6493          ||      R. Bush         ||       randy@psg.com
-  RFC6494          ||      R. Gagliano, S. Krishnan, A. Kukec         ||       rogaglia@cisco.com, suresh.krishnan@ericsson.com, ana.kukec@enterprisearchitects.com
-  RFC6495          ||      R. Gagliano, S. Krishnan, A. Kukec         ||       rogaglia@cisco.com, suresh.krishnan@ericsson.com, ana.kukec@enterprisearchitects.com
-  RFC6496          ||      S. Krishnan, J. Laganier, M. Bonola, A. Garcia-Martinez         ||       suresh.krishnan@ericsson.com, julien.ietf@gmail.com, marco.bonola@gmail.com, alberto@it.uc3m.es
-  RFC6497          ||      M. Davis, A. Phillips, Y. Umaoka, C. Falk         ||       mark@macchiato.com, addison@lab126.com, yoshito_umaoka@us.ibm.com, court@infiauto.com
-  RFC6498          ||      J. Stone, R. Kumar, F. Andreasen         ||       joestone@cisco.com, rkumar@cisco.com, fandreas@cisco.com
-  RFC6501          ||      O. Novo, G. Camarillo, D. Morgan, J. Urpalainen         ||       Oscar.Novo@ericsson.com, Gonzalo.Camarillo@ericsson.com, Dave.Morgan@fmr.com, jari.urpalainen@nokia.com
-  RFC6502          ||      G. Camarillo, S. Srinivasan, R. Even, J. Urpalainen         ||       Gonzalo.Camarillo@ericsson.com, srivatsa.srinivasan@gmail.com, ron.even.tlv@gmail.com, jari.urpalainen@nokia.com
-  RFC6503          ||      M. Barnes, C. Boulton, S. Romano, H. Schulzrinne         ||       mary.ietf.barnes@gmail.com, chris@ns-technologies.com, spromano@unina.it, hgs+xcon@cs.columbia.edu
-  RFC6504          ||      M. Barnes, L. Miniero, R. Presta, S P. Romano         ||       mary.ietf.barnes@gmail.com, lorenzo@meetecho.com, roberta.presta@unina.it, spromano@unina.it
-  RFC6505          ||      S. McGlashan, T. Melanchuk, C. Boulton         ||       smcg.stds01@mcglashan.org, timm@rainwillow.com, chris@ns-technologies.com
-  RFC6506          ||      M. Bhatia, V. Manral, A. Lindem         ||       manav.bhatia@alcatel-lucent.com, vishwas.manral@hp.com, acee.lindem@ericsson.com
-  RFC6507          ||      M. Groves         ||       Michael.Groves@cesg.gsi.gov.uk
-  RFC6508          ||      M. Groves         ||       Michael.Groves@cesg.gsi.gov.uk
-  RFC6509          ||      M. Groves         ||       Michael.Groves@cesg.gsi.gov.uk
-  RFC6510          ||      L. Berger, G. Swallow         ||       lberger@labn.net, swallow@cisco.com
-  RFC6511          ||      Z. Ali, G. Swallow, R. Aggarwal         ||       zali@cisco.com, swallow@cisco.com, raggarwa_1@yahoo.com
-  RFC6512          ||      IJ. Wijnands, E. Rosen, M. Napierala, N. Leymann         ||       ice@cisco.com, erosen@cisco.com, mnapierala@att.com, n.leymann@telekom.de
-  RFC6513          ||      E. Rosen, Ed., R. Aggarwal, Ed.         ||       erosen@cisco.com, raggarwa_1@yahoo.com
-  RFC6514          ||      R. Aggarwal, E. Rosen, T. Morin, Y. Rekhter         ||       raggarwa_1@yahoo.com, erosen@cisco.com, thomas.morin@orange-ftgroup.com, yakov@juniper.net
-  RFC6515          ||      R. Aggarwal, E. Rosen         ||       raggarwa_1@yahoo.com, erosen@cisco.com
-  RFC6516          ||      Y. Cai, E. Rosen, Ed., I. Wijnands         ||       ycai@cisco.com, erosen@cisco.com, ice@cisco.com
-  RFC6517          ||      T. Morin, Ed., B. Niven-Jenkins, Ed., Y. Kamite, R. Zhang, N. Leymann, N. Bitar         ||       thomas.morin@orange.com, ben@niven-jenkins.co.uk, y.kamite@ntt.com, raymond.zhang@alcatel-lucent.com, n.leymann@telekom.de, nabil.n.bitar@verizon.com
-  RFC6518          ||      G. Lebovitz, M. Bhatia         ||       gregory.ietf@gmail.com, manav.bhatia@alcatel-lucent.com
-  RFC6519          ||      R. Maglione, A. Durand         ||       roberta.maglione@telecomitalia.it, adurand@juniper.net
-  RFC6520          ||      R. Seggelmann, M. Tuexen, M. Williams         ||       seggelmann@fh-muenster.de, tuexen@fh-muenster.de, michael.glenn.williams@gmail.com
-  RFC6521          ||      A. Makela, J. Korhonen         ||       antti.t.makela@iki.fi, jouni.nospam@gmail.com
-  RFC6522          ||      M. Kucherawy, Ed.         ||       msk@cloudmark.com
-  RFC6525          ||      R. Stewart, M. Tuexen, P. Lei         ||       randall@lakerest.net, tuexen@fh-muenster.de, peterlei@cisco.com
-  RFC6526          ||      B. Claise, P. Aitken, A. Johnson, G. Muenz         ||       bclaise@cisco.com, paitken@cisco.com, andrjohn@cisco.com, muenz@net.in.tum.de
-  RFC6527          ||      K. Tata         ||       tata_kalyan@yahoo.com
-  RFC6528          ||      F. Gont, S. Bellovin         ||       fgont@si6networks.com, bellovin@acm.org
-  RFC6529          ||      A. McKenzie, S. Crocker         ||       amckenzie3@yahoo.com, steve@stevecrocker.com
-  RFC6530          ||      J. Klensin, Y. Ko         ||       john-ietf@jck.com, yangwooko@gmail.com
-  RFC6531          ||      J. Yao, W. Mao         ||       yaojk@cnnic.cn, maowei_ietf@cnnic.cn
-  RFC6532          ||      A. Yang, S. Steele, N. Freed         ||       abelyang@twnic.net.tw, Shawn.Steele@microsoft.com, ned+ietf@mrochek.com
-  RFC6533          ||      T. Hansen, Ed., C. Newman, A. Melnikov         ||       tony+eaidsn@maillennium.att.com, chris.newman@oracle.com, Alexey.Melnikov@isode.com
-  RFC6534          ||      N. Duffield, A. Morton, J. Sommers         ||       duffield@research.att.com, acmorton@att.com, jsommers@colgate.edu
-  RFC6535          ||      B. Huang, H. Deng, T. Savolainen         ||       bill.huang@chinamobile.com, denghui@chinamobile.com, teemu.savolainen@nokia.com
-  RFC6536          ||      A. Bierman, M. Bjorklund         ||       andy@yumaworks.com, mbj@tail-f.com
-  RFC6537          ||      J. Ahrenholz         ||       jeffrey.m.ahrenholz@boeing.com
-  RFC6538          ||      T. Henderson, A. Gurtov         ||       thomas.r.henderson@boeing.com, gurtov@ee.oulu.fi
-  RFC6539          ||      V. Cakulev, G. Sundaram, I. Broustis         ||       violeta.cakulev@alcatel-lucent.com, ganesh.sundaram@alcatel-lucent.com, ioannis.broustis@alcatel-lucent.com
-  RFC6540          ||      W. George, C. Donley, C. Liljenstolpe, L. Howard         ||       wesley.george@twcable.com, C.Donley@cablelabs.com, cdl@asgaard.org, lee.howard@twcable.com
-  RFC6541          ||      M. Kucherawy         ||       msk@cloudmark.com
-  RFC6542          ||      S. Emery         ||       shawn.emery@oracle.com
-  RFC6543          ||      S. Gundavelli         ||       sgundave@cisco.com
-  RFC6544          ||      J. Rosenberg, A. Keranen, B. B. Lowekamp, A. B. Roach         ||       jdrosen@jdrosen.net, ari.keranen@ericsson.com, bbl@lowekamp.net, adam@nostrum.com
-  RFC6545          ||      K. Moriarty         ||       Kathleen.Moriarty@emc.com
-  RFC6546          ||      B. Trammell         ||       trammell@tik.ee.ethz.ch
-  RFC6547          ||      W. George         ||       wesley.george@twcable.com
-  RFC6548          ||      N. Brownlee, Ed., IAB         ||       n.brownlee@auckland.ac.nz, iab@iab.org
-  RFC6549          ||      A. Lindem, A. Roy, S. Mirtorabi         ||       acee.lindem@ericsson.com, akr@cisco.com, sina@cisco.com
-  RFC6550          ||      T. Winter, Ed., P. Thubert, Ed., A. Brandt, J. Hui, R. Kelsey, P. Levis, K. Pister, R. Struik, JP. Vasseur, R. Alexander         ||       wintert@acm.org, pthubert@cisco.com, abr@sdesigns.dk, jhui@archrock.com, kelsey@ember.com, pal@cs.stanford.edu, kpister@dustnetworks.com, rstruik.ext@gmail.com, jpv@cisco.com, roger.alexander@cooperindustries.com
-  RFC6551          ||      JP. Vasseur, Ed., M. Kim, Ed., K. Pister, N. Dejean, D. Barthel         ||       jpv@cisco.com, mjkim@kt.com, kpister@dustnetworks.com, nicolas.dejean@coronis.com, dominique.barthel@orange-ftgroup.com
-  RFC6552          ||      P. Thubert, Ed.         ||       pthubert@cisco.com
-  RFC6553          ||      J. Hui, JP. Vasseur         ||       jonhui@cisco.com, jpv@cisco.com
-  RFC6554          ||      J. Hui, JP. Vasseur, D. Culler, V. Manral         ||       jonhui@cisco.com, jpv@cisco.com, culler@cs.berkeley.edu, vishwas.manral@hp.com
-  RFC6555          ||      D. Wing, A. Yourtchenko         ||       dwing-ietf@fuggles.com, ayourtch@cisco.com
-  RFC6556          ||      F. Baker         ||       fred@cisco.com
-  RFC6557          ||      E. Lear, P. Eggert         ||       lear@cisco.com, eggert@cs.ucla.edu
-  RFC6558          ||      A. Melnikov, B. Leiba, K. Li         ||       Alexey.Melnikov@isode.com, barryleiba@computer.org, likepeng@huawei.com
-  RFC6559          ||      D. Farinacci, IJ. Wijnands, S. Venaas, M. Napierala         ||       dino@cisco.com, ice@cisco.com, stig@cisco.com, mnapierala@att.com
-  RFC6560          ||      G. Richards         ||       gareth.richards@rsa.com
-  RFC6561          ||      J. Livingood, N. Mody, M. O'Reirdan         ||       jason_livingood@cable.comcast.com, nirmal_mody@cable.comcast.com, michael_oreirdan@cable.comcast.com
-  RFC6562          ||      C. Perkins, JM. Valin         ||       csp@csperkins.org, jmvalin@jmvalin.ca
-  RFC6563          ||      S. Jiang, D. Conrad, B. Carpenter         ||       jiangsheng@huawei.com, drc@cloudflare.com, brian.e.carpenter@gmail.com
-  RFC6564          ||      S. Krishnan, J. Woodyatt, E. Kline, J. Hoagland, M. Bhatia         ||       suresh.krishnan@ericsson.com, jhw@apple.com, ek@google.com, Jim_Hoagland@symantec.com, manav.bhatia@alcatel-lucent.com
-  RFC6565          ||      P. Pillay-Esnault, P. Moyer, J. Doyle, E. Ertekin, M. Lundberg         ||       ppe@cisco.com, pete@pollere.net, jdoyle@doyleassociates.net, ertekin_emre@bah.com, lundberg_michael@bah.com
-  RFC6566          ||      Y. Lee, Ed., G. Bernstein, Ed., D. Li, G. Martinelli         ||       leeyoung@huawei.com, gregb@grotto-networking.com, danli@huawei.com, giomarti@cisco.com
-  RFC6567          ||      A. Johnston, L. Liess         ||       alan.b.johnston@gmail.com, laura.liess.dt@gmail.com
-  RFC6568          ||      E. Kim, D. Kaspar, JP. Vasseur         ||       eunah.ietf@gmail.com, dokaspar.ietf@gmail.com, jpv@cisco.com
-  RFC6569          ||      JM. Valin, S. Borilin, K. Vos, C. Montgomery, R. Chen         ||       jmvalin@jmvalin.ca, borilin@spiritdsp.net, koen.vos@skype.net, xiphmont@xiph.org, rchen@broadcom.com
-  RFC6570          ||      J. Gregorio, R. Fielding, M. Hadley, M. Nottingham, D. Orchard         ||       joe@bitworking.org, fielding@gbiv.com, mhadley@mitre.org, mnot@mnot.net, orchard@pacificspirit.com
-  RFC6571          ||      C. Filsfils, Ed., P. Francois, Ed., M. Shand, B. Decraene, J. Uttaro, N. Leymann, M. Horneffer         ||       cf@cisco.com, pierre.francois@imdea.org, imc.shand@googlemail.com, bruno.decraene@orange.com, uttaro@att.com, N.Leymann@telekom.de, Martin.Horneffer@telekom.de
-  RFC6572          ||      F. Xia, B. Sarikaya, J. Korhonen, Ed., S. Gundavelli, D. Damic         ||       xiayangsong@huawei.com, sarikaya@ieee.org, jouni.nospam@gmail.com, sgundave@cisco.com, damjan.damic@siemens.com
-  RFC6573          ||      M. Amundsen         ||       mca@amundsen.com
-  RFC6574          ||      H. Tschofenig, J. Arkko         ||       Hannes.Tschofenig@gmx.net, jari.arkko@piuha.net
-  RFC6575          ||      H. Shah, Ed., E. Rosen, Ed., G. Heron, Ed., V. Kompella, Ed.         ||       hshah@ciena.com, erosen@cisco.com, giheron@cisco.com, vach.kompella@alcatel-lucent.com
-  RFC6576          ||      R. Geib, Ed., A. Morton, R. Fardid, A. Steinmitz         ||       Ruediger.Geib@telekom.de, acmorton@att.com, rfardid@cariden.com, Alexander.Steinmitz@telekom.de
-  RFC6577          ||      M. Kucherawy         ||       msk@cloudmark.com
-  RFC6578          ||      C. Daboo, A. Quillaud         ||       cyrus@daboo.name, arnaud.quillaud@oracle.com
-  RFC6579          ||      M. Yevstifeyev         ||       evnikita2@gmail.com
-  RFC6580          ||      M. Ko, D. Black         ||       mkosjc@gmail.com, david.black@emc.com
-  RFC6581          ||      A. Kanevsky, Ed., C. Bestler, Ed., R. Sharp, S. Wise         ||       arkady.kanevsky@gmail.com, Caitlin.Bestler@nexenta.com, robert.o.sharp@intel.com, swise@opengridcomputing.com
-  RFC6582          ||      T. Henderson, S. Floyd, A. Gurtov, Y. Nishida         ||       thomas.r.henderson@boeing.com, floyd@acm.org, gurtov@ee.oulu.fi, nishida@wide.ad.jp
-  RFC6583          ||      I. Gashinsky, J. Jaeggli, W. Kumari         ||       igor@yahoo-inc.com, jjaeggli@zynga.com, warren@kumari.net
-  RFC6584          ||      V. Roca         ||       vincent.roca@inria.fr
-  RFC6585          ||      M. Nottingham, R. Fielding         ||       mnot@mnot.net, fielding@gbiv.com
-  RFC6586          ||      J. Arkko, A. Keranen         ||       jari.arkko@piuha.net, ari.keranen@ericsson.com
-  RFC6587          ||      R. Gerhards, C. Lonvick         ||       rgerhards@adiscon.com, clonvick@cisco.com
-  RFC6588          ||      C. Ishikawa         ||       chiaki.ishikawa@ubin.jp
-  RFC6589          ||      J. Livingood         ||       jason_livingood@cable.comcast.com
-  RFC6590          ||      J. Falk, Ed., M. Kucherawy, Ed.         ||       ietf@cybernothing.org, msk@cloudmark.com
-  RFC6591          ||      H. Fontana         ||       hilda@hfontana.com
-  RFC6592          ||      C. Pignataro         ||       cpignata@cisco.com
-  RFC6593          ||      C. Pignataro, J. Clarke, G. Salgueiro         ||       cpignata@cisco.com, jclarke@cisco.com, gsalguei@cisco.com
-  RFC6594          ||      O. Sury         ||       ondrej.sury@nic.cz
-  RFC6595          ||      K. Wierenga, E. Lear, S. Josefsson         ||       klaas@cisco.com, lear@cisco.com, simon@josefsson.org
-  RFC6596          ||      M. Ohye, J. Kupke         ||       maileohye@gmail.com, joachim@kupke.za.net
-  RFC6597          ||      J. Downs, Ed., J. Arbeiter, Ed.         ||       jeff_downs@partech.com, jimsgti@gmail.com
-  RFC6598          ||      J. Weil, V. Kuarsingh, C. Donley, C. Liljenstolpe, M. Azinger         ||       jason.weil@twcable.com, victor.kuarsingh@gmail.com, c.donley@cablelabs.com, cdl@asgaard.org, marla.azinger@frontiercorp.com
-  RFC6601          ||      G. Ash, Ed., D. McDysan         ||       gash5107@yahoo.com, dave.mcdysan@verizon.com
-  RFC6602          ||      F. Abinader, Ed., S. Gundavelli, Ed., K. Leung, S. Krishnan, D. Premec         ||       fabinader@gmail.com, sgundave@cisco.com, kleung@cisco.com, suresh.krishnan@ericsson.com, domagoj.premec@gmail.com
-  RFC6603          ||      J. Korhonen, Ed., T. Savolainen, S. Krishnan, O. Troan         ||       jouni.nospam@gmail.com, teemu.savolainen@nokia.com, suresh.krishnan@ericsson.com, ot@cisco.com
-  RFC6604          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC6605          ||      P. Hoffman, W.C.A. Wijngaards         ||       paul.hoffman@vpnc.org, wouter@nlnetlabs.nl
-  RFC6606          ||      E. Kim, D. Kaspar, C. Gomez, C. Bormann         ||       eunah.ietf@gmail.com, dokaspar.ietf@gmail.com, carlesgo@entel.upc.edu, cabo@tzi.org
-  RFC6607          ||      K. Kinnear, R. Johnson, M. Stapp         ||       kkinnear@cisco.com, raj@cisco.com, mjs@cisco.com
-  RFC6608          ||      J. Dong, M. Chen, A. Suryanarayana         ||       jie.dong@huawei.com, mach.chen@huawei.com, asuryana@cisco.com
-  RFC6609          ||      C. Daboo, A. Stone         ||       cyrus@daboo.name, aaron@serendipity.cx
-  RFC6610          ||      H. Jang, A. Yegin, K. Chowdhury, J. Choi, T. Lemon         ||       heejin.jang@gmail.com, alper.yegin@yegin.org, kc@radiomobiles.com, jinchoe@gmail.com, Ted.Lemon@nominum.com
-  RFC6611          ||      K. Chowdhury, Ed., A. Yegin         ||       kc@radiomobiles.com, alper.yegin@yegin.org
-  RFC6612          ||      G. Giaretta, Ed.         ||       gerardog@qualcomm.com
-  RFC6613          ||      A. DeKok         ||       aland@freeradius.org
-  RFC6614          ||      S. Winter, M. McCauley, S. Venaas, K. Wierenga         ||       stefan.winter@restena.lu, mikem@open.com.au, stig@cisco.com, klaas@cisco.com
-  RFC6615          ||      T. Dietz, Ed., A. Kobayashi, B. Claise, G. Muenz         ||       Thomas.Dietz@neclab.eu, akoba@nttv6.net, bclaise@cisco.com, muenz@net.in.tum.de
-  RFC6616          ||      E. Lear, H. Tschofenig, H. Mauldin, S. Josefsson         ||       lear@cisco.com, Hannes.Tschofenig@gmx.net, hmauldin@cisco.com, simon@josefsson.org
-  RFC6617          ||      D. Harkins         ||       dharkins@arubanetworks.com
-  RFC6618          ||      J. Korhonen, Ed., B. Patil, H. Tschofenig, D. Kroeselberg         ||       jouni.nospam@gmail.com, basavaraj.patil@nokia.com, Hannes.Tschofenig@gmx.net, dirk.kroeselberg@siemens.com
-  RFC6619          ||      J. Arkko, L. Eggert, M. Townsley         ||       jari.arkko@piuha.net, lars@netapp.com, townsley@cisco.com
-  RFC6620          ||      E. Nordmark, M. Bagnulo, E. Levy-Abegnoli         ||       nordmark@acm.org, marcelo@it.uc3m.es, elevyabe@cisco.com
-  RFC6621          ||      J. Macker, Ed.         ||       macker@itd.nrl.navy.mil
-  RFC6622          ||      U. Herberg, T. Clausen         ||       ulrich@herberg.name, T.Clausen@computer.org
-  RFC6623          ||      E. Burger         ||       eburger@standardstrack.com
-  RFC6624          ||      K. Kompella, B. Kothari, R. Cherukuri         ||       kireeti@juniper.net, bhupesh@cisco.com, cherukuri@juniper.net
-  RFC6625          ||      E. Rosen, Ed., Y. Rekhter, Ed., W. Hendrickx, R. Qiu         ||       erosen@cisco.com, yakov@juniper.net, wim.henderickx@alcatel-lucent.be, rayq@huawei.com
-  RFC6626          ||      G. Tsirtsis, V. Park, V. Narayanan, K. Leung         ||       tsirtsis@googlemail.com, vpark@qualcomm.com, vidyan@qualcomm.com, kleung@cisco.com
-  RFC6627          ||      G. Karagiannis, K. Chan, T. Moncaster, M. Menth, P. Eardley, B. Briscoe         ||       g.karagiannis@utwente.nl, khchan.work@gmail.com, Toby.Moncaster@cl.cam.ac.uk, menth@informatik.uni-tuebingen.de, philip.eardley@bt.com, bob.briscoe@bt.com
-  RFC6628          ||      S. Shin, K. Kobara         ||       seonghan.shin@aist.go.jp, kobara_conf@m.aist.go.jp
-  RFC6629          ||      J. Abley, M. Bagnulo, A. Garcia-Martinez         ||       joe.abley@icann.org, marcelo@it.uc3m.es, alberto@it.uc3m.es
-  RFC6630          ||      Z. Cao, H. Deng, Q. Wu, G. Zorn, Ed.         ||       zehn.cao@gmail.com, denghui02@gmail.com, sunseawq@huawei.com, glenzorn@gmail.com
-  RFC6631          ||      D. Kuegler, Y. Sheffer         ||       dennis.kuegler@bsi.bund.de, yaronf.ietf@gmail.com
-  RFC6632          ||      M. Ersue, Ed., B. Claise         ||       mehmet.ersue@nsn.com, bclaise@cisco.com
-  RFC6633          ||      F. Gont         ||       fgont@si6networks.com
-  RFC6635          ||      O. Kolkman, Ed., J. Halpern, Ed., IAB         ||       olaf@nlnetlabs.nl, joel.halpern@ericsson.com, iab@iab.org
-  RFC6636          ||      H. Asaeda, H. Liu, Q. Wu         ||       asaeda@wide.ad.jp, helen.liu@huawei.com, bill.wu@huawei.com
-  RFC6637          ||      A. Jivsov         ||       Andrey_Jivsov@symantec.com
-  RFC6638          ||      C. Daboo, B. Desruisseaux         ||       cyrus@daboo.name, bernard.desruisseaux@oracle.com
-  RFC6639          ||      D. King, Ed., M. Venkatesan, Ed.         ||       daniel@olddog.co.uk, venkat.mahalingams@gmail.com
-  RFC6640          ||      W. George         ||       wesley.george@twcable.com
-  RFC6641          ||      C. Everhart, W. Adamson, J. Zhang         ||       everhart@netapp.com, andros@netapp.com, jiayingz@google.com
-  RFC6642          ||      Q. Wu, Ed., F. Xia, R. Even         ||       sunseawq@huawei.com, xiayangsong@huawei.com, even.roni@huawei.com
-  RFC6643          ||      J. Schoenwaelder         ||       j.schoenwaelder@jacobs-university.de
-  RFC6644          ||      D. Evans, R. Droms, S. Jiang         ||       N7DR@ipfonix.com, rdroms@cisco.com, jiangsheng@huawei.com
-  RFC6645          ||      J. Novak         ||       janovak@cisco.com
-  RFC6646          ||      H. Song, N. Zong, Y. Yang, R. Alimi         ||       haibin.song@huawei.com, zongning@huawei.com, yry@cs.yale.edu, ralimi@google.com
-  RFC6647          ||      M. Kucherawy, D. Crocker         ||       superuser@gmail.com, dcrocker@bbiw.net
-  RFC6648          ||      P. Saint-Andre, D. Crocker, M. Nottingham         ||       ietf@stpeter.im, dcrocker@bbiw.net, mnot@mnot.net
-  RFC6649          ||      L. Hornquist Astrand, T. Yu         ||       lha@apple.com, tlyu@mit.edu
-  RFC6650          ||      J. Falk, M. Kucherawy, Ed.         ||       none, superuser@gmail.com
-  RFC6651          ||      M. Kucherawy         ||       superuser@gmail.com
-  RFC6652          ||      S. Kitterman         ||       scott@kitterman.com
-  RFC6653          ||      B. Sarikaya, F. Xia, T. Lemon         ||       sarikaya@ieee.org, xiayangsong@huawei.com, mellon@nominum.com
-  RFC6654          ||      T. Tsou, C. Zhou, T. Taylor, Q. Chen         ||       Tina.Tsou.Zouting@huawei.com, cathy.zhou@huawei.com, tom.taylor.stds@gmail.com, chenqi.0819@gmail.com
-  RFC6655          ||      D. McGrew, D. Bailey         ||       mcgrew@cisco.com, dbailey@rsa.com
-  RFC6656          ||      R. Johnson, K. Kinnear, M. Stapp         ||       raj@cisco.com, kkinnear@cisco.com, mjs@cisco.com
-  RFC6657          ||      A. Melnikov, J. Reschke         ||       Alexey.Melnikov@isode.com, julian.reschke@greenbytes.de
-  RFC6658          ||      S. Bryant, Ed., L. Martini, G. Swallow, A. Malis         ||       stbryant@cisco.com, lmartini@cisco.com, swallow@cisco.com, andrew.g.malis@verizon.com
-  RFC6659          ||      A. Begen         ||       abegen@cisco.com
-  RFC6660          ||      B. Briscoe, T. Moncaster, M. Menth         ||       bob.briscoe@bt.com, toby.moncaster@cl.cam.ac.uk, menth@uni-tuebingen.de
-  RFC6661          ||      A. Charny, F. Huang, G. Karagiannis, M. Menth, T. Taylor, Ed.         ||       anna@mwsm.com, huangfuqing@huawei.com, g.karagiannis@utwente.nl, menth@uni-tuebingen.de, tom.taylor.stds@gmail.com
-  RFC6662          ||      A. Charny, J. Zhang, G. Karagiannis, M. Menth, T. Taylor, Ed.         ||       anna@mwsm.com, joyzhang@cisco.com, g.karagiannis@utwente.nl, menth@uni-tuebingen.de, tom.taylor.stds@gmail.com
-  RFC6663          ||      G. Karagiannis, T. Taylor, K. Chan, M. Menth, P. Eardley         ||       g.karagiannis@utwente.nl, tom.taylor.stds@gmail.com, khchan.work@gmail.com, menth@uni-tuebingen.de, philip.eardley@bt.com
-  RFC6664          ||      J. Schaad         ||       ietf@augustcellars.com
-  RFC6665          ||      A.B. Roach         ||       adam@nostrum.com
-  RFC6666          ||      N. Hilliard, D. Freedman         ||       nick@inex.ie, david.freedman@uk.clara.net
-  RFC6667          ||      K. Raza, S. Boutros, C. Pignataro         ||       skraza@cisco.com, sboutros@cisco.com, cpignata@cisco.com
-  RFC6668          ||      D. Bider, M. Baushke         ||       ietf-ssh2@denisbider.com, mdb@juniper.net
-  RFC6669          ||      N. Sprecher, L. Fang         ||       nurit.sprecher@nsn.com, lufang@cisco.com
-  RFC6670          ||      N. Sprecher, KY. Hong         ||       nurit.sprecher@nsn.com, hongk@cisco.com
-  RFC6671          ||      M. Betts         ||       malcolm.betts@zte.com.cn
-  RFC6672          ||      S. Rose, W. Wijngaards         ||       scott.rose@nist.gov, wouter@nlnetlabs.nl
-  RFC6673          ||      A. Morton         ||       acmorton@att.com
-  RFC6674          ||      F. Brockners, S. Gundavelli, S. Speicher, D. Ward         ||       fbrockne@cisco.com, sgundave@cisco.com, sebastian.speicher@telekom.de, wardd@cisco.com
-  RFC6675          ||      E. Blanton, M. Allman, L. Wang, I. Jarvinen, M. Kojo, Y. Nishida         ||       elb@psg.com, mallman@icir.org, liliw@juniper.net, ilpo.jarvinen@helsinki.fi, kojo@cs.helsinki.fi, nishida@wide.ad.jp
-  RFC6676          ||      S. Venaas, R. Parekh, G. Van de Velde, T. Chown, M. Eubanks         ||       stig@cisco.com, riparekh@cisco.com, gvandeve@cisco.com, tjc@ecs.soton.ac.uk, marshall.eubanks@iformata.com
-  RFC6677          ||      S. Hartman, Ed., T. Clancy, K. Hoeper         ||       hartmans-ietf@mit.edu, tcc@vt.edu, khoeper@motorolasolutions.com
-  RFC6678          ||      K. Hoeper, S. Hanna, H. Zhou, J. Salowey, Ed.         ||       khoeper@motorolasolutions.com, shanna@juniper.net, hzhou@cisco.com, jsalowey@cisco.com
-  RFC6679          ||      M. Westerlund, I. Johansson, C. Perkins, P. O'Hanlon, K. Carlberg         ||       magnus.westerlund@ericsson.com, ingemar.s.johansson@ericsson.com, csp@csperkins.org, piers.ohanlon@oii.ox.ac.uk, carlberg@g11.org.uk
-  RFC6680          ||      N. Williams, L. Johansson, S. Hartman, S. Josefsson         ||       nico@cryptonector.com, leifj@sunet.se, hartmans-ietf@mit.edu, simon@josefsson.org
-  RFC6681          ||      M. Watson, T. Stockhammer, M. Luby         ||       watsonm@netflix.com, stockhammer@nomor.de, luby@qti.qualcomm.com
-  RFC6682          ||      M. Watson, T. Stockhammer, M. Luby         ||       watsonm@netflix.com, stockhammer@nomor.de, luby@qti.qualcomm.com
-  RFC6683          ||      A. Begen, T. Stockhammer         ||       abegen@cisco.com, stockhammer@nomor.de
-  RFC6684          ||      B. Trammell         ||       trammell@tik.ee.ethz.ch
-  RFC6685          ||      B. Trammell         ||       trammell@tik.ee.ethz.ch
-  RFC6686          ||      M. Kucherawy         ||       superuser@gmail.com
-  RFC6687          ||      J. Tripathi, Ed., J. de Oliveira, Ed., JP. Vasseur, Ed.         ||       jt369@drexel.edu, jau@coe.drexel.edu, jpv@cisco.com
-  RFC6688          ||      D. Black, Ed., J. Glasgow, S. Faibish         ||       david.black@emc.com, jglasgow@google.com, sfaibish@emc.com
-  RFC6689          ||      L. Berger         ||       lberger@labn.net
-  RFC6690          ||      Z. Shelby         ||       zach@sensinode.com
-  RFC6691          ||      D. Borman         ||       david.borman@quantum.com
-  RFC6692          ||      R. Clayton, M. Kucherawy         ||       richard.clayton@cl.cam.ac.uk, superuser@gmail.com
-  RFC6693          ||      A. Lindgren, A. Doria, E. Davies, S. Grasic         ||       andersl@sics.se, avri@acm.org, elwynd@folly.org.uk, samo.grasic@ltu.se
-  RFC6694          ||      S. Moonesamy, Ed.         ||       sm+ietf@elandsys.com
-  RFC6695          ||      R. Asati         ||       rajiva@cisco.com
-  RFC6696          ||      Z. Cao, B. He, Y. Shi, Q. Wu, Ed., G. Zorn, Ed.         ||       caozhen@chinamobile.com, hebaohong@catr.cn, shiyang1@huawei.com, bill.wu@huawei.com, glenzorn@gmail.com
-  RFC6697          ||      G. Zorn, Ed., Q. Wu, T. Taylor, Y. Nir, K. Hoeper, S. Decugis         ||       glenzorn@gmail.com, bill.wu@huawei.com, tom.taylor.stds@gmail.com, ynir@checkpoint.com, khoeper@motorolasolutions.com, sdecugis@freediameter.net
-  RFC6698          ||      P. Hoffman, J. Schlyter         ||       paul.hoffman@vpnc.org, jakob@kirei.se
-  RFC6701          ||      A. Farrel, P. Resnick         ||       adrian@olddog.co.uk, presnick@qti.qualcomm.com
-  RFC6702          ||      T. Polk, P. Saint-Andre         ||       tim.polk@nist.gov, ietf@stpeter.im
-  RFC6703          ||      A. Morton, G. Ramachandran, G. Maguluri         ||       acmorton@att.com, gomathi@att.com, gmaguluri@att.com
-  RFC6704          ||      D. Miles, W. Dec, J. Bristow, R. Maglione         ||       davidmiles@google.com, wdec@cisco.com, James.Bristow@swisscom.com, roberta.maglione@telecomitalia.it
-  RFC6705          ||      S. Krishnan, R. Koodli, P. Loureiro, Q. Wu, A. Dutta         ||       suresh.krishnan@ericsson.com, rkoodli@cisco.com, loureiro@neclab.eu, Sunseawq@huawei.com, adutta@niksun.com
-  RFC6706          ||      F. Templin, Ed.         ||       fltemplin@acm.org
-  RFC6707          ||      B. Niven-Jenkins, F. Le Faucheur, N. Bitar         ||       ben@velocix.com, flefauch@cisco.com, nabil.n.bitar@verizon.com
-  RFC6708          ||      S. Kiesel, Ed., S. Previdi, M. Stiemerling, R. Woundy, Y. Yang         ||       ietf-alto@skiesel.de, sprevidi@cisco.com, martin.stiemerling@neclab.eu, Richard_Woundy@cable.comcast.com, yry@cs.yale.edu
-  RFC6709          ||      B. Carpenter, B. Aboba, Ed., S. Cheshire         ||       brian.e.carpenter@gmail.com, bernard_aboba@hotmail.com, cheshire@apple.com
-  RFC6710          ||      A. Melnikov, K. Carlberg         ||       Alexey.Melnikov@isode.com, carlberg@g11.org.uk
-  RFC6711          ||      L. Johansson         ||       leifj@nordu.net
-  RFC6712          ||      T. Kause, M. Peylo         ||       toka@ssh.com, martin.peylo@nsn.com
-  RFC6713          ||      J. Levine         ||       standards@taugh.com
-  RFC6714          ||      C. Holmberg, S. Blau, E. Burger         ||       christer.holmberg@ericsson.com, staffan.blau@ericsson.com, eburger@standardstrack.com
-  RFC6715          ||      D. Cauchie, B. Leiba, K. Li         ||       dany.cauchie@orange.com, barryleiba@computer.org, likepeng@huawei.com
-  RFC6716          ||      JM. Valin, K. Vos, T. Terriberry         ||       jmvalin@jmvalin.ca, koenvos74@gmail.com, tterriberry@mozilla.com
-  RFC6717          ||      H. Hotz, R. Allbery         ||       hotz@jpl.nasa.gov, rra@stanford.edu
-  RFC6718          ||      P. Muley, M. Aissaoui, M. Bocci         ||       praveen.muley@alcatel-lucent.com, mustapha.aissaoui@alcatel-lucent.com, matthew.bocci@alcatel-lucent.com
-  RFC6719          ||      O. Gnawali, P. Levis         ||       gnawali@cs.uh.edu, pal@cs.stanford.edu
-  RFC6720          ||      C. Pignataro, R. Asati         ||       cpignata@cisco.com, rajiva@cisco.com
-  RFC6721          ||      J. Snell         ||       jasnell@us.ibm.com
-  RFC6722          ||      P. Hoffman, Ed.         ||       paul.hoffman@vpnc.org
-  RFC6723          ||      L. Jin, Ed., R. Key, Ed., S. Delord, T. Nadeau, S. Boutros         ||       lizhong.jin@zte.com.cn, raymond.key@ieee.org, simon.delord@gmail.com, tnadeau@juniper.net, sboutros@cisco.com
-  RFC6724          ||      D. Thaler, Ed., R. Draves, A. Matsumoto, T. Chown         ||       dthaler@microsoft.com, richdr@microsoft.com, arifumi@nttv6.net, tjc@ecs.soton.ac.uk
-  RFC6725          ||      S. Rose         ||       scottr.nist@gmail.com
-  RFC6726          ||      T. Paila, R. Walsh, M. Luby, V. Roca, R. Lehtonen         ||       toni.paila@gmail.com, roderick.walsh@tut.fi, luby@qti.qualcomm.com, vincent.roca@inria.fr, rami.lehtonen@teliasonera.com
-  RFC6727          ||      T. Dietz, Ed., B. Claise, J. Quittek         ||       dietz@neclab.eu, bclaise@cisco.com, quittek@neclab.eu
-  RFC6728          ||      G. Muenz, B. Claise, P. Aitken         ||       muenz@net.in.tum.de, bclaise@cisco.com, paitken@cisco.com
-  RFC6729          ||      D. Crocker, M. Kucherawy         ||       dcrocker@bbiw.net, superuser@gmail.com
-  RFC6730          ||      S. Krishnan, J. Halpern         ||       suresh.krishnan@ericsson.com, joel.halpern@ericsson.com
-  RFC6731          ||      T. Savolainen, J. Kato, T. Lemon         ||       teemu.savolainen@nokia.com, kato@syce.net, Ted.Lemon@nominum.com
-  RFC6732          ||      V. Kuarsingh, Ed., Y. Lee, O. Vautrin         ||       victor.kuarsingh@gmail.com, yiu_lee@cable.comcast.com, olivier@juniper.net
-  RFC6733          ||      V. Fajardo, Ed., J. Arkko, J. Loughney, G. Zorn, Ed.         ||       vf0213@gmail.com, jari.arkko@ericsson.com, john.loughney@nokia.com, glenzorn@gmail.com
-  RFC6734          ||      G. Zorn, Q. Wu, V. Cakulev         ||       glenzorn@gmail.com, sunseawq@huawei.com, violeta.cakulev@alcatel-lucent.com
-  RFC6735          ||      K. Carlberg, Ed., T. Taylor         ||       carlberg@g11.org.uk, tom.taylor.stds@gmail.com
-  RFC6736          ||      F. Brockners, S. Bhandari, V. Singh, V. Fajardo         ||       fbrockne@cisco.com, shwethab@cisco.com, vaneeta.singh@gmail.com, vf0213@gmail.com
-  RFC6737          ||      K. Jiao, G. Zorn         ||       kangjiao@huawei.com, gwz@net-zen.net
-  RFC6738          ||      V. Cakulev, A. Lior, S. Mizikovsky         ||       violeta.cakulev@alcatel-lucent.com, avi.ietf@lior.org, Simon.Mizikovsky@alcatel-lucent.com
-  RFC6739          ||      H. Schulzrinne, H. Tschofenig         ||       hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@gmx.net
-  RFC6740          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
-  RFC6741          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
-  RFC6742          ||      RJ Atkinson, SN Bhatti, S. Rose         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk, scottr.nist@gmail.com
-  RFC6743          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
-  RFC6744          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
-  RFC6745          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
-  RFC6746          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
-  RFC6747          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
-  RFC6748          ||      RJ Atkinson, SN Bhatti         ||       rja.lists@gmail.com, saleem@cs.st-andrews.ac.uk
-  RFC6749          ||      D. Hardt, Ed.         ||       dick.hardt@gmail.com
-  RFC6750          ||      M. Jones, D. Hardt         ||       mbj@microsoft.com, dick.hardt@gmail.com
-  RFC6751          ||      R. Despres, Ed., B. Carpenter, D. Wing, S. Jiang         ||       despres.remi@laposte.net, brian.e.carpenter@gmail.com, dwing-ietf@fuggles.com, shengjiang@huawei.com
-  RFC6752          ||      A. Kirkham         ||       tkirkham@paloaltonetworks.com
-  RFC6753          ||      J. Winterbottom, H. Tschofenig, H. Schulzrinne, M. Thomson         ||       james.winterbottom@commscope.com, Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu, martin.thomson@skype.net
-  RFC6754          ||      Y. Cai, L. Wei, H. Ou, V. Arya, S. Jethwani         ||       yiqunc@microsoft.com, lwei@cisco.com, hou@cisco.com, varya@directv.com, sjethwani@directv.com
-  RFC6755          ||      B. Campbell, H. Tschofenig         ||       brian.d.campbell@gmail.com, hannes.tschofenig@gmx.net
-  RFC6756          ||      S. Trowbridge, Ed., E. Lear, Ed., G. Fishman, Ed., S. Bradner, Ed.         ||       steve.trowbridge@alcatel-lucent.com, lear@cisco.com, gryfishman@aol.com, sob@harvard.edu
-  RFC6757          ||      S. Gundavelli, Ed., J. Korhonen, Ed., M. Grayson, K. Leung, R. Pazhyannur         ||       sgundave@cisco.com, jouni.nospam@gmail.com, mgrayson@cisco.com, kleung@cisco.com, rpazhyan@cisco.com
-  RFC6758          ||      A. Melnikov, K. Carlberg         ||       Alexey.Melnikov@isode.com, carlberg@g11.org.uk
-  RFC6759          ||      B. Claise, P. Aitken, N. Ben-Dvora         ||       bclaise@cisco.com, paitken@cisco.com, nirbd@cisco.com
-  RFC6760          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
-  RFC6761          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
-  RFC6762          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
-  RFC6763          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
-  RFC6764          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC6765          ||      E. Beili, M. Morgenstern         ||       edward.beili@actelis.com, moti.morgenstern@ecitele.com
-  RFC6766          ||      E. Beili         ||       edward.beili@actelis.com
-  RFC6767          ||      E. Beili, M. Morgenstern         ||       edward.beili@actelis.com, moti.morgenstern@ecitele.com
-  RFC6768          ||      E. Beili         ||       edward.beili@actelis.com
-  RFC6769          ||      R. Raszuk, J. Heitz, A. Lo, L. Zhang, X. Xu         ||       robert@raszuk.net, jakob.heitz@ericsson.com, altonlo@aristanetworks.com, lixia@cs.ucla.edu, xuxh@huawei.com
-  RFC6770          ||      G. Bertrand, Ed., E. Stephan, T. Burbridge, P. Eardley, K. Ma, G. Watson         ||       gilles.bertrand@orange.com, emile.stephan@orange.com, trevor.burbridge@bt.com, philip.eardley@bt.com, kevin.ma@azukisystems.com, gwatson@velocix.com
-  RFC6771          ||      L. Eggert, G. Camarillo         ||       lars@netapp.com, Gonzalo.Camarillo@ericsson.com
-  RFC6772          ||      H. Schulzrinne, Ed., H. Tschofenig, Ed., J. Cuellar, J. Polk, J. Morris, M. Thomson         ||       schulzrinne@cs.columbia.edu, Hannes.Tschofenig@gmx.net, Jorge.Cuellar@siemens.com, jmpolk@cisco.com, ietf@jmorris.org, martin.thomson@gmail.com
-  RFC6773          ||      T. Phelan, G. Fairhurst, C. Perkins         ||       tphelan@sonusnet.com, gorry@erg.abdn.ac.uk, csp@csperkins.org
-  RFC6774          ||      R. Raszuk, Ed., R. Fernando, K. Patel, D. McPherson, K. Kumaki         ||       robert@raszuk.net, rex@cisco.com, keyupate@cisco.com, dmcpherson@verisign.com, ke-kumaki@kddi.com
-  RFC6775          ||      Z. Shelby, Ed., S. Chakrabarti, E. Nordmark, C. Bormann         ||       zach@sensinode.com, samita.chakrabarti@ericsson.com, nordmark@cisco.com, cabo@tzi.org
-  RFC6776          ||      A. Clark, Q. Wu         ||       alan.d.clark@telchemy.com, sunseawq@huawei.com
-  RFC6777          ||      W. Sun, Ed., G. Zhang, Ed., J. Gao, G. Xie, R. Papneja         ||       sun.weiqiang@gmail.com, zhangguoying@catr.cn, gjhhit@huawei.com, xieg@cs.ucr.edu, rajiv.papneja@huawei.com
-  RFC6778          ||      R. Sparks         ||       RjS@nostrum.com
-  RFC6779          ||      U. Herberg, R. Cole, I. Chakeres         ||       ulrich@herberg.name, robert.g.cole@us.army.mil, ian.chakeres@gmail.com
-  RFC6780          ||      L. Berger, F. Le Faucheur, A. Narayanan         ||       lberger@labn.net, flefauch@cisco.com, ashokn@cisco.com
-  RFC6781          ||      O. Kolkman, W. Mekking, R. Gieben         ||       olaf@nlnetlabs.nl, matthijs@nlnetlabs.nl, miek.gieben@sidn.nl
-  RFC6782          ||      V. Kuarsingh, Ed., L. Howard         ||       victor.kuarsingh@gmail.com, lee.howard@twcable.com
-  RFC6783          ||      J. Levine, R. Gellens         ||       standards@taugh.com, rg+ietf@qti.qualcomm.com
-  RFC6784          ||      S. Sakane, M. Ishiyama         ||       ssakane@cisco.com, masahiro.ishiyama@toshiba.co.jp
-  RFC6785          ||      B. Leiba         ||       barryleiba@computer.org
-  RFC6786          ||      A. Yegin, R. Cragie         ||       alper.yegin@yegin.org, robert.cragie@gridmerge.com
-  RFC6787          ||      D. Burnett, S. Shanmugham         ||       dburnett@voxeo.com, sarvi@cisco.com
-  RFC6788          ||      S. Krishnan, A. Kavanagh, B. Varga, S. Ooghe, E. Nordmark         ||       suresh.krishnan@ericsson.com, alan.kavanagh@ericsson.com, balazs.a.varga@ericsson.com, sven.ooghe@alcatel-lucent.com, nordmark@cisco.com
-  RFC6789          ||      B. Briscoe, Ed., R. Woundy, Ed., A. Cooper, Ed.         ||       bob.briscoe@bt.com, richard_woundy@cable.comcast.com, acooper@cdt.org
-  RFC6790          ||      K. Kompella, J. Drake, S. Amante, W. Henderickx, L. Yong         ||       kireeti.kompella@gmail.com, jdrake@juniper.net, shane@level3.net, wim.henderickx@alcatel-lucent.com, lucy.yong@huawei.com
-  RFC6791          ||      X. Li, C. Bao, D. Wing, R. Vaithianathan, G. Huston         ||       xing@cernet.edu.cn, congxiao@cernet.edu.cn, dwing-ietf@fuggles.com, rvaithia@cisco.com, gih@apnic.net
-  RFC6792          ||      Q. Wu, Ed., G. Hunt, P. Arden         ||       sunseawq@huawei.com, r.geoff.hunt@gmail.com, philip.arden@bt.com
-  RFC6793          ||      Q. Vohra, E. Chen         ||       quaizar.vohra@gmail.com, enkechen@cisco.com
-  RFC6794          ||      V. Hilt, G. Camarillo, J. Rosenberg         ||       volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com, jdrosen@jdrosen.net
-  RFC6795          ||      V. Hilt, G. Camarillo         ||       volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com
-  RFC6796          ||      V. Hilt, G. Camarillo, J. Rosenberg, D. Worley         ||       volker.hilt@bell-labs.com, Gonzalo.Camarillo@ericsson.com, jdrosen@jdrosen.net, worley@ariadne.com
-  RFC6797          ||      J. Hodges, C. Jackson, A. Barth         ||       Jeff.Hodges@PayPal.com, collin.jackson@sv.cmu.edu, ietf@adambarth.com
-  RFC6798          ||      A. Clark, Q. Wu         ||       alan.d.clark@telchemy.com, sunseawq@huawei.com
-  RFC6801          ||      U. Kozat, A. Begen         ||       kozat@docomolabs-usa.com, abegen@cisco.com
-  RFC6802          ||      S. Baillargeon, C. Flinta, A. Johnsson         ||       steve.baillargeon@ericsson.com, christofer.flinta@ericsson.com, andreas.a.johnsson@ericsson.com
-  RFC6803          ||      G. Hudson         ||       ghudson@mit.edu
-  RFC6804          ||      B. Manning         ||       bmanning@sfc.keio.ac.jp
-  RFC6805          ||      D. King, Ed., A. Farrel, Ed.         ||       daniel@olddog.co.uk, adrian@olddog.co.uk
-  RFC6806          ||      S. Hartman, Ed., K. Raeburn, L. Zhu         ||       hartmans-ietf@mit.edu, raeburn@mit.edu, lzhu@microsoft.com
-  RFC6807          ||      D. Farinacci, G. Shepherd, S. Venaas, Y. Cai         ||       dino@cisco.com, gjshep@gmail.com, stig@cisco.com, yiqunc@microsoft.com
-  RFC6808          ||      L. Ciavattone, R. Geib, A. Morton, M. Wieser         ||       lencia@att.com, Ruediger.Geib@telekom.de, acmorton@att.com, matthias_michael.wieser@stud.tu-darmstadt.de
-  RFC6809          ||      C. Holmberg, I. Sedlacek, H. Kaplan         ||       christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com, hkaplan@acmepacket.com
-  RFC6810          ||      R. Bush, R. Austein         ||       randy@psg.com, sra@hactrn.net
-  RFC6811          ||      P. Mohapatra, J. Scudder, D. Ward, R. Bush, R. Austein         ||       pmohapat@cisco.com, jgs@juniper.net, dward@cisco.com, randy@psg.com, sra@hactrn.net
-  RFC6812          ||      M. Chiba, A. Clemm, S. Medley, J. Salowey, S. Thombare, E. Yedavalli         ||       mchiba@cisco.com, alex@cisco.com, stmedley@cisco.com, jsalowey@cisco.com, thombare@cisco.com, eshwar@cisco.com
-  RFC6813          ||      J. Salowey, S. Hanna         ||       jsalowey@cisco.com, shanna@juniper.net
-  RFC6814          ||      C. Pignataro, F. Gont         ||       cpignata@cisco.com, fgont@si6networks.com
-  RFC6815          ||      S. Bradner, K. Dubray, J. McQuaid, A. Morton         ||       sob@harvard.edu, kdubray@juniper.net, jim@turnipvideo.com, acmorton@att.com
-  RFC6816          ||      V. Roca, M. Cunche, J. Lacan         ||       vincent.roca@inria.fr, mathieu.cunche@inria.fr, jerome.lacan@isae.fr
-  RFC6817          ||      S. Shalunov, G. Hazel, J. Iyengar, M. Kuehlewind         ||       shalunov@shlang.com, greg@bittorrent.com, jiyengar@fandm.edu, mirja.kuehlewind@ikr.uni-stuttgart.de
-  RFC6818          ||      P. Yee         ||       peter@akayla.com
-  RFC6819          ||      T. Lodderstedt, Ed., M. McGloin, P. Hunt         ||       torsten@lodderstedt.net, mark.mcgloin@ie.ibm.com, phil.hunt@yahoo.com
-  RFC6820          ||      T. Narten, M. Karir, I. Foo         ||       narten@us.ibm.com, mkarir@merit.edu, Ian.Foo@huawei.com
-  RFC6821          ||      E. Marocco, A. Fusco, I. Rimac, V. Gurbani         ||       enrico.marocco@telecomitalia.it, antonio2.fusco@telecomitalia.it, rimac@bell-labs.com, vkg@bell-labs.com
-  RFC6822          ||      S. Previdi, Ed., L. Ginsberg, M. Shand, A. Roy, D. Ward         ||       sprevidi@cisco.com, ginsberg@cisco.com, imc.shand@gmail.com, akr@cisco.com, wardd@cisco.com
-  RFC6823          ||      L. Ginsberg, S. Previdi, M. Shand         ||       ginsberg@cisco.com, sprevidi@cisco.com, imc.shand@gmail.com
-  RFC6824          ||      A. Ford, C. Raiciu, M. Handley, O. Bonaventure         ||       alanford@cisco.com, costin.raiciu@cs.pub.ro, m.handley@cs.ucl.ac.uk, olivier.bonaventure@uclouvain.be
-  RFC6825          ||      M. Miyazawa, T. Otani, K. Kumaki, T. Nadeau         ||       ma-miyazawa@kddilabs.jp, Tm-otani@kddi.com, ke-kumaki@kddi.com, tnadeau@juniper.net
-  RFC6826          ||      IJ. Wijnands, Ed., T. Eckert, N. Leymann, M. Napierala         ||       ice@cisco.com, eckert@cisco.com, n.leymann@telekom.de, mnapierala@att.com
-  RFC6827          ||      A. Malis, Ed., A. Lindem, Ed., D. Papadimitriou, Ed.         ||       andrew.g.malis@verizon.com, acee.lindem@ericsson.com, dimitri.papadimitriou@alcatel-lucent.com
-  RFC6828          ||      J. Xia         ||       xiajinwei@huawei.com
-  RFC6829          ||      M. Chen, P. Pan, C. Pignataro, R. Asati         ||       mach@huawei.com, ppan@infinera.com, cpignata@cisco.com, rajiva@cisco.com
-  RFC6830          ||      D. Farinacci, V. Fuller, D. Meyer, D. Lewis         ||       farinacci@gmail.com, vaf@vaf.net, dmm@1-4-5.net, darlewis@cisco.com
-  RFC6831          ||      D. Farinacci, D. Meyer, J. Zwiebel, S. Venaas         ||       farinacci@gmail.com, dmm@cisco.com, jzwiebel@cruzio.com, stig@cisco.com
-  RFC6832          ||      D. Lewis, D. Meyer, D. Farinacci, V. Fuller         ||       darlewis@cisco.com, dmm@1-4-5.net, farinacci@gmail.com, vaf@vaf.net
-  RFC6833          ||      V. Fuller, D. Farinacci         ||       vaf@vaf.net, farinacci@gmail.com
-  RFC6834          ||      L. Iannone, D. Saucez, O. Bonaventure         ||       luigi.iannone@telecom-paristech.fr, damien.saucez@inria.fr, olivier.bonaventure@uclouvain.be
-  RFC6835          ||      D. Farinacci, D. Meyer         ||       farinacci@gmail.com, dmm@cisco.com
-  RFC6836          ||      V. Fuller, D. Farinacci, D. Meyer, D. Lewis         ||       vaf@vaf.net, farinacci@gmail.com, dmm@1-4-5.net, darlewis@cisco.com
-  RFC6837          ||      E. Lear         ||       lear@cisco.com
-  RFC6838          ||      N. Freed, J. Klensin, T. Hansen         ||       ned+ietf@mrochek.com, john+ietf@jck.com, tony+mtsuffix@maillennium.att.com
-  RFC6839          ||      T. Hansen, A. Melnikov         ||       tony+sss@maillennium.att.com, Alexey.Melnikov@isode.com
-  RFC6840          ||      S. Weiler, Ed., D. Blacka, Ed.         ||       weiler@tislabs.com, davidb@verisign.com
-  RFC6841          ||      F. Ljunggren, AM. Eklund Lowinder, T. Okubo         ||       fredrik@kirei.se, amel@iis.se, tomofumi.okubo@icann.org
-  RFC6842          ||      N. Swamy, G. Halwasia, P. Jhingran         ||       nn.swamy@samsung.com, ghalwasi@cisco.com, pjhingra@cisco.com
-  RFC6843          ||      A. Clark, K. Gross, Q. Wu         ||       alan.d.clark@telchemy.com, kevin.gross@avanw.com, sunseawq@huawei.com
-  RFC6844          ||      P. Hallam-Baker, R. Stradling         ||       philliph@comodo.com, rob.stradling@comodo.com
-  RFC6845          ||      N. Sheth, L. Wang, J. Zhang         ||       nsheth@contrailsystems.com, liliw@juniper.net, zzhang@juniper.net
-  RFC6846          ||      G. Pelletier, K. Sandlund, L-E. Jonsson, M. West         ||       ghyslain.pelletier@interdigital.com, kristofer.sandlund@ericsson.com, lars-erik@lejonsson.com, mark.a.west@roke.co.uk
-  RFC6847          ||      D. Melman, T. Mizrahi, D. Eastlake 3rd         ||       davidme@marvell.com, talmi@marvell.com, d3e3e3@gmail.com
-  RFC6848          ||      J. Winterbottom, M. Thomson, R. Barnes, B. Rosen, R. George         ||       james.winterbottom@commscope.com, martin.thomson@gmail.com, rbarnes@bbn.com, br@brianrosen.net, robinsgv@gmail.com
-  RFC6849          ||      H. Kaplan, Ed., K. Hedayat, N. Venna, P. Jones, N. Stratton         ||       hkaplan@acmepacket.com, kh274@cornell.edu, vnagarjuna@saperix.com, paulej@packetizer.com, nathan@robotics.net
-  RFC6850          ||      A. Rijhsinghani, K. Zebrose         ||       anil@charter.net, zebrose@alum.mit.edu
-  RFC6851          ||      A. Gulbrandsen, N. Freed, Ed.         ||       arnt@gulbrandsen.priv.no, ned+ietf@mrochek.com
-  RFC6852          ||      R. Housley, S. Mills, J. Jaffe, B. Aboba, L. St.Amour         ||       housley@vigilsec.com, s.mills@ieee.org, jeff@w3.org, bernard_aboba@hotmail.com, st.amour@isoc.org
-  RFC6853          ||      J. Brzozowski, J. Tremblay, J. Chen, T. Mrugalski         ||       john_brzozowski@cable.comcast.com, jf@jftremblay.com, jack.chen@twcable.com, tomasz.mrugalski@gmail.com
-  RFC6854          ||      B. Leiba         ||       barryleiba@computer.org
-  RFC6855          ||      P. Resnick, Ed., C. Newman, Ed., S. Shen, Ed.         ||       presnick@qti.qualcomm.com, chris.newman@oracle.com, shenshuo@cnnic.cn
-  RFC6856          ||      R. Gellens, C. Newman, J. Yao, K. Fujiwara         ||       rg+ietf@qualcomm.com, chris.newman@oracle.com, yaojk@cnnic.cn, fujiwara@jprs.co.jp
-  RFC6857          ||      K. Fujiwara         ||       fujiwara@jprs.co.jp
-  RFC6858          ||      A. Gulbrandsen         ||       arnt@gulbrandsen.priv.no
-  RFC6859          ||      B. Leiba         ||       barryleiba@computer.org
-  RFC6860          ||      Y. Yang, A. Retana, A. Roy         ||       yiya@cisco.com, aretana@cisco.com, akr@cisco.com
-  RFC6861          ||      I. Dzmanashvili         ||       ioseb.dzmanashvili@gmail.com
-  RFC6862          ||      G. Lebovitz, M. Bhatia, B. Weis         ||       gregory.ietf@gmail.com, manav.bhatia@alcatel-lucent.com, bew@cisco.com
-  RFC6863          ||      S. Hartman, D. Zhang         ||       hartmans-ietf@mit.edu, zhangdacheng@huawei.com
-  RFC6864          ||      J. Touch         ||       touch@isi.edu
-  RFC6865          ||      V. Roca, M. Cunche, J. Lacan, A. Bouabdallah, K. Matsuzono         ||       vincent.roca@inria.fr, mathieu.cunche@inria.fr, jerome.lacan@isae.fr, abouabdallah@cdta.dz, kazuhisa@sfc.wide.ad.jp
-  RFC6866          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com
-  RFC6867          ||      Y. Nir, Q. Wu         ||       ynir@checkpoint.com, sunseawq@huawei.com
-  RFC6868          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC6869          ||      G. Salgueiro, J. Clarke, P. Saint-Andre         ||       gsalguei@cisco.com, jclarke@cisco.com, ietf@stpeter.im
-  RFC6870          ||      P. Muley, Ed., M. Aissaoui, Ed.         ||       praveen.muley@alcatel-lucent.com, mustapha.aissaoui@alcatel-lucent.com
-  RFC6871          ||      R. Gilman, R. Even, F. Andreasen         ||       bob_gilman@comcast.net, roni.even@mail01.huawei.com, fandreas@cisco.com
-  RFC6872          ||      V. Gurbani, Ed., E. Burger, Ed., T. Anjali, H. Abdelnur, O. Festor         ||       vkg@bell-labs.com, eburger@standardstrack.com, tricha@ece.iit.edu, humbol@gmail.com, Olivier.Festor@loria.fr
-  RFC6873          ||      G. Salgueiro, V. Gurbani, A. B. Roach         ||       gsalguei@cisco.com, vkg@bell-labs.com, adam@nostrum.com
-  RFC6874          ||      B. Carpenter, S. Cheshire, R. Hinden         ||       brian.e.carpenter@gmail.com, cheshire@apple.com, bob.hinden@gmail.com
-  RFC6875          ||      S. Kamei, T. Momose, T. Inoue, T. Nishitani         ||       skame@nttv6.jp, tmomose@cisco.com, inoue@jp.ntt.net, tomohiro.nishitani@ntt.com
-  RFC6876          ||      P. Sangster, N. Cam-Winget, J. Salowey         ||       paul_sangster@symantec.com, ncamwing@cisco.com, jsalowey@cisco.com
-  RFC6877          ||      M. Mawatari, M. Kawashima, C. Byrne         ||       mawatari@jpix.ad.jp, kawashimam@vx.jp.nec.com, cameron.byrne@t-mobile.com
-  RFC6878          ||      A.B. Roach         ||       adam@nostrum.com
-  RFC6879          ||      S. Jiang, B. Liu, B. Carpenter         ||       jiangsheng@huawei.com, leo.liubing@huawei.com, brian.e.carpenter@gmail.com
-  RFC6880          ||      L. Johansson         ||       leifj@sunet.se
-  RFC6881          ||      B. Rosen, J. Polk         ||       br@brianrosen.net, jmpolk@cisco.com
-  RFC6882          ||      K. Kumaki, Ed., T. Murai, D. Cheng, S. Matsushima, P. Jiang         ||       ke-kumaki@kddi.com, murai@fnsc.co.jp, dean.cheng@huawei.com, satoru.matsushima@g.softbank.co.jp, pe-jiang@kddi.com
-  RFC6883          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com
-  RFC6884          ||      Z. Fang         ||       zfang@qualcomm.com
-  RFC6885          ||      M. Blanchet, A. Sullivan         ||       Marc.Blanchet@viagenie.ca, asullivan@dyn.com
-  RFC6886          ||      S. Cheshire, M. Krochmal         ||       cheshire@apple.com, marc@apple.com
-  RFC6887          ||      D. Wing, Ed., S. Cheshire, M. Boucadair, R. Penno, P. Selkirk         ||       dwing-ietf@fuggles.com, cheshire@apple.com, mohamed.boucadair@orange.com, repenno@cisco.com, pselkirk@isc.org
-  RFC6888          ||      S. Perreault, Ed., I. Yamagata, S. Miyakawa, A. Nakagawa, H. Ashida         ||       simon.perreault@viagenie.ca, ikuhei@nttv6.jp, miyakawa@nttv6.jp, a-nakagawa@jpix.ad.jp, hiashida@cisco.com
-  RFC6889          ||      R. Penno, T. Saxena, M. Boucadair, S. Sivakumar         ||       rpenno@juniper.net, tasaxena@cisco.com, mohamed.boucadair@orange.com, ssenthil@cisco.com
-  RFC6890          ||      M. Cotton, L. Vegoda, R. Bonica, Ed., B. Haberman         ||       michelle.cotton@icann.org, leo.vegoda@icann.org, rbonica@juniper.net, brian@innovationslab.net
-  RFC6891          ||      J. Damas, M. Graff, P. Vixie         ||       joao@bondis.org, explorer@flame.org, vixie@isc.org
-  RFC6892          ||      E. Wilde         ||       erik.wilde@emc.com
-  RFC6893          ||      P. Higgs, P. Szucs         ||       paul.higgs@ericsson.com, paul.szucs@eu.sony.com
-  RFC6894          ||      R. Papneja, S. Vapiwala, J. Karthik, S. Poretsky, S. Rao, JL. Le Roux         ||       rajiv.papneja@huawei.com, svapiwal@cisco.com, jkarthik@cisco.com, sporetsky@allot.com, shankar.rao@du.edu, jeanlouis.leroux@orange.com
-  RFC6895          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC6896          ||      S. Barbato, S. Dorigotti, T. Fossati, Ed.         ||       tat@koanlogic.com, stewy@koanlogic.com, tho@koanlogic.com
-  RFC6897          ||      M. Scharf, A. Ford         ||       michael.scharf@alcatel-lucent.com, alanford@cisco.com
-  RFC6898          ||      D. Li, D. Ceccarelli, L. Berger         ||       huawei.danli@huawei.com, daniele.ceccarelli@ericsson.com, lberger@labn.net
-  RFC6901          ||      P. Bryan, Ed., K. Zyp, M. Nottingham, Ed.         ||       pbryan@anode.ca, kris@sitepen.com, mnot@mnot.net
-  RFC6902          ||      P. Bryan, Ed., M. Nottingham, Ed.         ||       pbryan@anode.ca, mnot@mnot.net
-  RFC6903          ||      J. Snell         ||       jasnell@gmail.com
-  RFC6904          ||      J. Lennox         ||       jonathan@vidyo.com
-  RFC6905          ||      T. Senevirathne, D. Bond, S. Aldrin, Y. Li, R. Watve         ||       tsenevir@cisco.com, mokon@mokon.net, aldrin.ietf@gmail.com, liyizhou@huawei.com, rwatve@cisco.com
-  RFC6906          ||      E. Wilde         ||       erik.wilde@emc.com
-  RFC6907          ||      T. Manderson, K. Sriram, R. White         ||       terry.manderson@icann.org, ksriram@nist.gov, russ@riw.us
-  RFC6908          ||      Y. Lee, R. Maglione, C. Williams, C. Jacquenet, M. Boucadair         ||       yiu_lee@cable.comcast.com, robmgl@cisco.com, carlw@mcsr-labs.org, christian.jacquenet@orange.com, mohamed.boucadair@orange.com
-  RFC6909          ||      S. Gundavelli, Ed., X. Zhou, J. Korhonen, G. Feige, R. Koodli         ||       sgundave@cisco.com, zhou.xingyue@zte.com.cn, jouni.nospam@gmail.com, gfeige@cisco.com, rkoodli@cisco.com
-  RFC6910          ||      D. Worley, M. Huelsemann, R. Jesske, D. Alexeitsev         ||       worley@ariadne.com, martin.huelsemann@telekom.de, r.jesske@telekom.de, alexeitsev@teleflash.com
-  RFC6911          ||      W. Dec, Ed., B. Sarikaya, G. Zorn, Ed., D. Miles, B. Lourdelet         ||       wdec@cisco.com, sarikaya@ieee.org, glenzorn@gmail.com, davidmiles@google.com, blourdel@juniper.net
-  RFC6912          ||      A. Sullivan, D. Thaler, J. Klensin, O. Kolkman         ||       asullivan@dyn.com, dthaler@microsoft.com, john-ietf@jck.com, olaf@NLnetLabs.nl
-  RFC6913          ||      D. Hanes, G. Salgueiro, K. Fleming         ||       dhanes@cisco.com, gsalguei@cisco.com, kevin@kpfleming.us
-  RFC6914          ||      J. Rosenberg         ||       jdrosen@jdrosen.net
-  RFC6915          ||      R. Bellis         ||       ray.bellis@nominet.org.uk
-  RFC6916          ||      R. Gagliano, S. Kent, S. Turner         ||       rogaglia@cisco.com, kent@bbn.com, turners@ieca.com
-  RFC6917          ||      C. Boulton, L. Miniero, G. Munson         ||       chris@ns-technologies.com, lorenzo@meetecho.com, gamunson@gmail.com
-  RFC6918          ||      F. Gont, C. Pignataro         ||       fgont@si6networks.com, cpignata@cisco.com
-  RFC6919          ||      R. Barnes, S. Kent, E. Rescorla         ||       rlb@ipv.sx, kent@bbn.com, ekr@rtfm.com
-  RFC6920          ||      S. Farrell, D. Kutscher, C. Dannewitz, B. Ohlman, A. Keranen, P. Hallam-Baker         ||       stephen.farrell@cs.tcd.ie, kutscher@neclab.eu, cdannewitz@googlemail.com, Borje.Ohlman@ericsson.com, ari.keranen@ericsson.com, philliph@comodo.com
-  RFC6921          ||      R. Hinden         ||       bob.hinden@gmail.com
-  RFC6922          ||      Y. Shafranovich         ||       ietf@shaftek.org
-  RFC6923          ||      R. Winter, E. Gray, H. van Helvoort, M. Betts         ||       rolf.winter@neclab.eu, eric.gray@ericsson.com, huub.van.helvoort@huawei.com, malcolm.betts@zte.com.cn
-  RFC6924          ||      B. Leiba         ||       barryleiba@computer.org
-  RFC6925          ||      B. Joshi, R. Desetti, M. Stapp         ||       bharat_joshi@infosys.com, ramakrishnadtv@infosys.com, mjs@cisco.com
-  RFC6926          ||      K. Kinnear, M. Stapp, R. Desetti, B. Joshi, N. Russell, P. Kurapati, B. Volz         ||       kkinnear@cisco.com, mjs@cisco.com, ramakrishnadtv@infosys.com, bharat_joshi@infosys.com, neil.e.russell@gmail.com, kurapati@juniper.net, volz@cisco.com
-  RFC6927          ||      J. Levine, P. Hoffman         ||       standards@taugh.com, paul.hoffman@vpnc.org
-  RFC6928          ||      J. Chu, N. Dukkipati, Y. Cheng, M. Mathis         ||       hkchu@google.com, nanditad@google.com, ycheng@google.com, mattmathis@google.com
-  RFC6929          ||      A. DeKok, A. Lior         ||       aland@networkradius.com, avi.ietf@lior.org
-  RFC6930          ||      D. Guo, S. Jiang, Ed., R. Despres, R. Maglione         ||       guoseu@huawei.com, jiangsheng@huawei.com, despres.remi@laposte.net, robmgl@cisco.com
-  RFC6931          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC6932          ||      D. Harkins, Ed.         ||       dharkins@arubanetworks.com
-  RFC6933          ||      A. Bierman, D. Romascanu, J. Quittek, M. Chandramouli         ||       andy@yumaworks.com, dromasca@gmail.com , quittek@neclab.eu, moulchan@cisco.com
-  RFC6934          ||      N. Bitar, Ed., S. Wadhwa, Ed., T. Haag, H. Li         ||       nabil.n.bitar@verizon.com, sanjay.wadhwa@alcatel-lucent.com, HaagT@telekom.de, hongyu.lihongyu@huawei.com
-  RFC6935          ||      M. Eubanks, P. Chimento, M. Westerlund         ||       marshall.eubanks@gmail.com, Philip.Chimento@jhuapl.edu, magnus.westerlund@ericsson.com
-  RFC6936          ||      G. Fairhurst, M. Westerlund         ||       gorry@erg.abdn.ac.uk, magnus.westerlund@ericsson.com
-  RFC6937          ||      M. Mathis, N. Dukkipati, Y. Cheng         ||       mattmathis@google.com, nanditad@google.com, ycheng@google.com
-  RFC6938          ||      J. Scudder         ||       jgs@juniper.net
-  RFC6939          ||      G. Halwasia, S. Bhandari, W. Dec         ||       ghalwasi@cisco.com, shwethab@cisco.com, wdec@cisco.com
-  RFC6940          ||      C. Jennings, B. Lowekamp, Ed., E. Rescorla, S. Baset, H. Schulzrinne         ||       fluffy@cisco.com, bbl@lowekamp.net, ekr@rtfm.com, salman@cs.columbia.edu, hgs@cs.columbia.edu
-  RFC6941          ||      L. Fang, Ed., B. Niven-Jenkins, Ed., S. Mansfield, Ed., R. Graveman, Ed.         ||       lufang@cisco.com, ben@niven-jenkins.co.uk, scott.mansfield@ericsson.com, rfg@acm.org
-  RFC6942          ||      J. Bournelle, L. Morand, S. Decugis, Q. Wu, G. Zorn         ||       julien.bournelle@orange.com, lionel.morand@orange.com, sdecugis@freediameter.net, sunseawq@huawei.com, glenzorn@gmail.com
-  RFC6943          ||      D. Thaler, Ed.         ||       dthaler@microsoft.com
-  RFC6944          ||      S. Rose         ||       scottr.nist@gmail.com
-  RFC6945          ||      R. Bush, B. Wijnen, K. Patel, M. Baer         ||       randy@psg.com, bertietf@bwijnen.net, keyupate@cisco.com, baerm@tislabs.com
-  RFC6946          ||      F. Gont         ||       fgont@si6networks.com
-  RFC6947          ||      M. Boucadair, H. Kaplan, R. Gilman, S. Veikkolainen         ||       mohamed.boucadair@orange.com, hkaplan@acmepacket.com, bob_gilman@comcast.net, Simo.Veikkolainen@nokia.com
-  RFC6948          ||      A. Keranen, J. Arkko         ||       ari.keranen@ericsson.com, jari.arkko@piuha.net
-  RFC6949          ||      H. Flanagan, N. Brownlee         ||       rse@rfc-editor.org, rfc-ise@rfc-editor.org
-  RFC6950          ||      J. Peterson, O. Kolkman, H. Tschofenig, B. Aboba         ||       jon.peterson@neustar.biz, olaf@nlnetlabs.nl, Hannes.Tschofenig@gmx.net, Bernard_aboba@hotmail.com
-  RFC6951          ||      M. Tuexen, R. Stewart         ||       tuexen@fh-muenster.de, randall@lakerest.net
-  RFC6952          ||      M. Jethanandani, K. Patel, L. Zheng         ||       mjethanandani@gmail.com, keyupate@cisco.com, vero.zheng@huawei.com
-  RFC6953          ||      A. Mancuso, Ed., S. Probasco, B. Patil         ||       amancuso@google.com, scott@probasco.me, basavpat@cisco.com
-  RFC6954          ||      J. Merkle, M. Lochter         ||       johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de
-  RFC6955          ||      J. Schaad, H. Prafullchandra         ||       ietf@augustcellars.com, HPrafullchandra@hytrust.com
-  RFC6956          ||      W. Wang, E. Haleplidis, K. Ogawa, C. Li, J. Halpern         ||       wmwang@zjsu.edu.cn, ehalep@ece.upatras.gr, ogawa.kentaro@lab.ntt.co.jp, chuanhuang_li@zjsu.edu.cn, joel.halpern@ericsson.com
-  RFC6957          ||      F. Costa, J-M. Combes, Ed., X. Pougnard, H. Li         ||       fabio.costa@orange.com, jeanmichel.combes@orange.com, xavier.pougnard@orange.com, lihy@huawei.com
-  RFC6958          ||      A. Clark, S. Zhang, J. Zhao, Q. Wu, Ed.         ||       alan.d.clark@telchemy.com, zhangyx@sttri.com.cn, zhaojing@sttri.com.cn, sunseawq@huawei.com
-  RFC6959          ||      D. McPherson, F. Baker, J. Halpern         ||       dmcpherson@verisign.com, fred@cisco.com, joel.halpern@ericsson.com
-  RFC6960          ||      S. Santesson, M. Myers, R. Ankney, A. Malpani, S. Galperin, C. Adams         ||       sts@aaa-sec.com, mmyers@fastq.com, none, ambarish@gmail.com, slava.galperin@gmail.com, cadams@eecs.uottawa.ca
-  RFC6961          ||      Y. Pettersen         ||       yngve@spec-work.net
-  RFC6962          ||      B. Laurie, A. Langley, E. Kasper         ||       benl@google.com, agl@google.com, ekasper@google.com
-  RFC6963          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC6964          ||      F. Templin         ||       fltemplin@acm.org
-  RFC6965          ||      L. Fang, Ed., N. Bitar, R. Zhang, M. Daikoku, P. Pan         ||       lufang@cisco.com, nabil.bitar@verizon.com, raymond.zhang@alcatel-lucent.com, ms-daikoku@kddi.com, ppan@infinera.com
-  RFC6967          ||      M. Boucadair, J. Touch, P. Levis, R. Penno         ||       mohamed.boucadair@orange.com, touch@isi.edu, pierre.levis@orange.com, repenno@cisco.com
-  RFC6968          ||      V. Roca, B. Adamson         ||       vincent.roca@inria.fr, adamson@itd.nrl.navy.mil
-  RFC6969          ||      A. Retana, D. Cheng         ||       aretana@cisco.com, dean.cheng@huawei.com
-  RFC6970          ||      M. Boucadair, R. Penno, D. Wing         ||       mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com
-  RFC6971          ||      U. Herberg, Ed., A. Cardenas, T. Iwao, M. Dow, S. Cespedes         ||       ulrich.herberg@us.fujitsu.com, alvaro.cardenas@me.com, smartnetpro-iwao_std@ml.css.fujitsu.com, m.dow@freescale.com, scespedes@icesi.edu.co
-  RFC6972          ||      Y. Zhang, N. Zong         ||       hishigh@gmail.com, zongning@huawei.com
-  RFC6973          ||      A. Cooper, H. Tschofenig, B. Aboba, J. Peterson, J. Morris, M. Hansen, R. Smith         ||       acooper@cdt.org, Hannes.Tschofenig@gmx.net, bernard_aboba@hotmail.com, jon.peterson@neustar.biz, ietf@jmorris.org, marit.hansen@datenschutzzentrum.de, rhys.smith@ja.net
-  RFC6974          ||      Y. Weingarten, S. Bryant, D. Ceccarelli, D. Caviglia, F. Fondelli, M. Corsi, B. Wu, X. Dai         ||       wyaacov@gmail.com, stbryant@cisco.com, daniele.ceccarelli@ericsson.com, diego.caviglia@ericsson.com, francesco.fondelli@ericsson.com, corsi.marco@gmail.com, wu.bo@zte.com.cn, dai.xuehui@zte.com.cn
-  RFC6975          ||      S. Crocker, S. Rose         ||       steve@shinkuro.com, scottr.nist@gmail.com
-  RFC6976          ||      M. Shand, S. Bryant, S. Previdi, C. Filsfils, P. Francois, O. Bonaventure         ||       imc.shand@googlemail.com, stbryant@cisco.com, sprevidi@cisco.com, cfilsfil@cisco.com, pierre.francois@imdea.org, Olivier.Bonaventure@uclouvain.be
-  RFC6977          ||      M. Boucadair, X. Pougnard         ||       mohamed.boucadair@orange.com, xavier.pougnard@orange.com
-  RFC6978          ||      J. Touch         ||       touch@isi.edu
-  RFC6979          ||      T. Pornin         ||       pornin@bolet.org
-  RFC6980          ||      F. Gont         ||       fgont@si6networks.com
-  RFC6981          ||      S. Bryant, S. Previdi, M. Shand         ||       stbryant@cisco.com, sprevidi@cisco.com, imc.shand@googlemail.com
-  RFC6982          ||      Y. Sheffer, A. Farrel         ||       yaronf.ietf@gmail.com, adrian@olddog.co.uk
-  RFC6983          ||      R. van Brandenburg, O. van Deventer, F. Le Faucheur, K. Leung         ||       ray.vanbrandenburg@tno.nl, oskar.vandeventer@tno.nl, flefauch@cisco.com, kleung@cisco.com
-  RFC6984          ||      W. Wang, K. Ogawa, E. Haleplidis, M. Gao, J. Hadi Salim         ||       wmwang@zjsu.edu.cn, ogawa.kentaro@lab.ntt.co.jp, ehalep@ece.upatras.gr, gaoming@mail.zjgsu.edu.cn, hadi@mojatatu.com
-  RFC6985          ||      A. Morton         ||       acmorton@att.com
-  RFC6986          ||      V. Dolmatov, Ed., A. Degtyarev         ||       dol@cryptocom.ru, alexey@renatasystems.org
-  RFC6987          ||      A. Retana, L. Nguyen, A. Zinin, R. White, D. McPherson         ||       aretana@cisco.com, lhnguyen@cisco.com, alex.zinin@gmail.com, Russ.White@vce.com, dmcpherson@verisign.com
-  RFC6988          ||      J. Quittek, Ed., M. Chandramouli, R. Winter, T. Dietz, B. Claise         ||       quittek@neclab.eu, moulchan@cisco.com, Rolf.Winter@neclab.eu, Thomas.Dietz@neclab.eu, bclaise@cisco.com
-  RFC6989          ||      Y. Sheffer, S. Fluhrer         ||       yaronf.ietf@gmail.com, sfluhrer@cisco.com
-  RFC6990          ||      R. Huang, Q. Wu, H. Asaeda, G. Zorn         ||       rachel.huang@huawei.com, bill.wu@huawei.com, asaeda@nict.go.jp, glenzorn@gmail.com
-  RFC6991          ||      J. Schoenwaelder, Ed.         ||       j.schoenwaelder@jacobs-university.de
-  RFC6992          ||      D. Cheng, M. Boucadair, A. Retana         ||       dean.cheng@huawei.com, mohamed.boucadair@orange.com, aretana@cisco.com
-  RFC6993          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC6994          ||      J. Touch         ||       touch@isi.edu
-  RFC6996          ||      J. Mitchell         ||       Jon.Mitchell@microsoft.com
-  RFC6997          ||      M. Goyal, Ed., E. Baccelli, M. Philipp, A. Brandt, J. Martocci         ||       mukul@uwm.edu, Emmanuel.Baccelli@inria.fr, matthias-philipp@gmx.de, abr@sdesigns.dk, jerald.p.martocci@jci.com
-  RFC6998          ||      M. Goyal, Ed., E. Baccelli, A. Brandt, J. Martocci         ||       mukul@uwm.edu, Emmanuel.Baccelli@inria.fr, abr@sdesigns.dk, jerald.p.martocci@jci.com
-  RFC7001          ||      M. Kucherawy         ||       superuser@gmail.com
-  RFC7002          ||      A. Clark, G. Zorn, Q. Wu         ||       alan.d.clark@telchemy.com, glenzorn@gmail.com, sunseawq@huawei.com
-  RFC7003          ||      A. Clark, R. Huang, Q. Wu, Ed.         ||       alan.d.clark@telchemy.com, Rachel@huawei.com, sunseawq@huawei.com
-  RFC7004          ||      G. Zorn, R. Schott, Q. Wu, Ed., R. Huang         ||       glenzorn@gmail.com, Roland.Schott@telekom.de, sunseawq@huawei.com, Rachel@huawei.com
-  RFC7005          ||      A. Clark, V. Singh, Q. Wu         ||       alan.d.clark@telchemy.com, varun@comnet.tkk.fi, sunseawq@huawei.com
-  RFC7006          ||      M. Garcia-Martin, S. Veikkolainen, R. Gilman         ||       miguel.a.garcia@ericsson.com, simo.veikkolainen@nokia.com, bob_gilman@comcast.net
-  RFC7007          ||      T. Terriberry         ||       tterribe@xiph.org
-  RFC7008          ||      S. Kiyomoto, W. Shin         ||       kiyomoto@kddilabs.jp, ohpato@hanmail.net
-  RFC7009          ||      T. Lodderstedt, Ed., S. Dronia, M. Scurtescu         ||       torsten@lodderstedt.net, sdronia@gmx.de, mscurtescu@google.com
-  RFC7010          ||      B. Liu, S. Jiang, B. Carpenter, S. Venaas, W. George         ||       leo.liubing@huawei.com, jiangsheng@huawei.com, brian.e.carpenter@gmail.com, stig@cisco.com, wesley.george@twcable.com
-  RFC7011          ||      B. Claise, Ed., B. Trammell, Ed., P. Aitken         ||       bclaise@cisco.com, trammell@tik.ee.ethz.ch, paitken@cisco.com
-  RFC7012          ||      B. Claise, Ed., B. Trammell, Ed.         ||       bclaise@cisco.com, trammell@tik.ee.ethz.ch
-  RFC7013          ||      B. Trammell, B. Claise         ||       trammell@tik.ee.ethz.ch, bclaise@cisco.com
-  RFC7014          ||      S. D'Antonio, T. Zseby, C. Henke, L. Peluso         ||       salvatore.dantonio@uniparthenope.it, tanja@caida.org, christian.henke@tektronix.com, lorenzo.peluso@unina.it
-  RFC7015          ||      B. Trammell, A. Wagner, B. Claise         ||       trammell@tik.ee.ethz.ch, arno@wagner.name, bclaise@cisco.com
-  RFC7016          ||      M. Thornburgh         ||       mthornbu@adobe.com
-  RFC7017          ||      R. Sparks         ||       rjsparks@nostrum.com
-  RFC7018          ||      V. Manral, S. Hanna         ||       vishwas.manral@hp.com, shanna@juniper.net
-  RFC7019          ||      J. Buford, M. Kolberg, Ed.         ||       buford@avaya.com, mkolberg@ieee.org
-  RFC7020          ||      R. Housley, J. Curran, G. Huston, D. Conrad         ||       housley@vigilsec.com, jcurran@arin.net, gih@apnic.net, drc@virtualized.org
-  RFC7021          ||      C. Donley, Ed., L. Howard, V. Kuarsingh, J. Berg, J. Doshi         ||       c.donley@cablelabs.com, william.howard@twcable.com, victor@jvknet.com, j.berg@cablelabs.com, jineshd@juniper.net
-  RFC7022          ||      A. Begen, C. Perkins, D. Wing, E. Rescorla         ||       abegen@cisco.com, csp@csperkins.org, dwing-ietf@fuggles.com, ekr@rtfm.com
-  RFC7023          ||      D. Mohan, Ed., N. Bitar, Ed., A. Sajassi, Ed., S. DeLord, P. Niger, R. Qiu         ||       dinmohan@hotmail.com, nabil.n.bitar@verizon.com, sajassi@cisco.com, simon.delord@gmail.com, philippe.niger@orange.com, rqiu@juniper.net
-  RFC7024          ||      H. Jeng, J. Uttaro, L. Jalil, B. Decraene, Y. Rekhter, R. Aggarwal         ||       hj2387@att.com, ju1738@att.com, luay.jalil@verizon.com, bruno.decraene@orange.com, yakov@juniper.net, raggarwa_1@yahoo.com
-  RFC7025          ||      T. Otani, K. Ogaki, D. Caviglia, F. Zhang, C. Margaria         ||       tm-otani@kddi.com, ke-oogaki@kddi.com, diego.caviglia@ericsson.com, zhangfatai@huawei.com, cyril.margaria@coriant.com
-  RFC7026          ||      A. Farrel, S. Bryant         ||       adrian@olddog.co.uk, stbryant@cisco.com
-  RFC7027          ||      J. Merkle, M. Lochter         ||       johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de
-  RFC7028          ||      JC. Zuniga, LM. Contreras, CJ. Bernardos, S. Jeon, Y. Kim         ||       JuanCarlos.Zuniga@InterDigital.com, lmcm@tid.es, cjbc@it.uc3m.es, seiljeon@av.it.pt, yhkim@dcn.ssu.ac.kr
-  RFC7029          ||      S. Hartman, M. Wasserman, D. Zhang         ||       hartmans-ietf@mit.edu, mrw@painless-security.com, zhangdacheng@huawei.com
-  RFC7030          ||      M. Pritikin, Ed., P. Yee, Ed., D. Harkins, Ed.         ||       pritikin@cisco.com, peter@akayla.com, dharkins@arubanetworks.com
-  RFC7031          ||      T. Mrugalski, K. Kinnear         ||       tomasz.mrugalski@gmail.com, kkinnear@cisco.com
-  RFC7032          ||      T. Beckhaus, Ed., B. Decraene, K. Tiruveedhula, M. Konstantynowicz, Ed., L. Martini         ||       thomas.beckhaus@telekom.de, bruno.decraene@orange.com, kishoret@juniper.net, maciek@cisco.com, lmartini@cisco.com
-  RFC7033          ||      P. Jones, G. Salgueiro, M. Jones, J. Smarr         ||       paulej@packetizer.com, gsalguei@cisco.com, mbj@microsoft.com, jsmarr@google.com
-  RFC7034          ||      D. Ross, T. Gondrom         ||       dross@microsoft.com, tobias.gondrom@gondrom.org
-  RFC7035          ||      M. Thomson, B. Rosen, D. Stanley, G. Bajko, A. Thomson         ||       martin.thomson@skype.net, br@brianrosen.net, dstanley@arubanetworks.com, Gabor.Bajko@nokia.com, athomson@lgscout.com
-  RFC7036          ||      R. Housley         ||       housley@vigilsec.com
-  RFC7037          ||      L. Yeh, M. Boucadair         ||       leaf.yeh.sdo@gmail.com, mohamed.boucadair@orange.com
-  RFC7038          ||      R. Ogier         ||       ogier@earthlink.net
-  RFC7039          ||      J. Wu, J. Bi, M. Bagnulo, F. Baker, C. Vogt, Ed.         ||       jianping@cernet.edu.cn, junbi@tsinghua.edu.cn, marcelo@it.uc3m.es, fred@cisco.com, mail@christianvogt.net
-  RFC7040          ||      Y. Cui, J. Wu, P. Wu, O. Vautrin, Y. Lee         ||       yong@csnet1.cs.tsinghua.edu.cn, jianping@cernet.edu.cn, pengwu.thu@gmail.com, Olivier@juniper.net, yiu_lee@cable.comcast.com
-  RFC7041          ||      F. Balus, Ed., A. Sajassi, Ed., N. Bitar, Ed.         ||       florin.balus@alcatel-lucent.com, sajassi@cisco.com, nabil.n.bitar@verizon.com
-  RFC7042          ||      D. Eastlake 3rd, J. Abley         ||       d3e3e3@gmail.com, jabley@dyn.com
-  RFC7043          ||      J. Abley         ||       jabley@dyn.com
-  RFC7044          ||      M. Barnes, F. Audet, S. Schubert, J. van Elburg, C. Holmberg         ||       mary.ietf.barnes@gmail.com, francois.audet@skype.net, shida@ntt-at.com, ietf.hanserik@gmail.com, christer.holmberg@ericsson.com
-  RFC7045          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com
-  RFC7046          ||      M. Waehlisch, T. Schmidt, S. Venaas         ||       mw@link-lab.net, Schmidt@informatik.haw-hamburg.de, stig@cisco.com
-  RFC7047          ||      B. Pfaff, B. Davie, Ed.         ||       blp@nicira.com, bsd@nicira.com
-  RFC7048          ||      E. Nordmark, I. Gashinsky         ||       nordmark@acm.org, igor@yahoo-inc.com
-  RFC7049          ||      C. Bormann, P. Hoffman         ||       cabo@tzi.org, paul.hoffman@vpnc.org
-  RFC7050          ||      T. Savolainen, J. Korhonen, D. Wing         ||       teemu.savolainen@nokia.com, jouni.nospam@gmail.com, dwing-ietf@fuggles.com
-  RFC7051          ||      J. Korhonen, Ed., T. Savolainen, Ed.         ||       jouni.nospam@gmail.com, teemu.savolainen@nokia.com
-  RFC7052          ||      G. Schudel, A. Jain, V. Moreno         ||       gschudel@cisco.com, atjain@juniper.net, vimoreno@cisco.com
-  RFC7053          ||      M. Tuexen, I. Ruengeler, R. Stewart         ||       tuexen@fh-muenster.de, i.ruengeler@fh-muenster.de, randall@lakerest.net
-  RFC7054          ||      A. Farrel, H. Endo, R. Winter, Y. Koike, M. Paul         ||       adrian@olddog.co.uk, hideki.endo.es@hitachi.com, rolf.winter@neclab.eu, koike.yoshinori@lab.ntt.co.jp, Manuel.Paul@telekom.de
-  RFC7055          ||      S. Hartman, Ed., J. Howlett         ||       hartmans-ietf@mit.edu, josh.howlett@ja.net
-  RFC7056          ||      S. Hartman, J. Howlett         ||       hartmans-ietf@mit.edu, josh.howlett@ja.net
-  RFC7057          ||      S. Winter, J. Salowey         ||       stefan.winter@restena.lu, jsalowey@cisco.com
-  RFC7058          ||      A. Amirante, T. Castaldi, L. Miniero, S P. Romano         ||       alessandro.amirante@unina.it, tcastaldi@meetecho.com, lorenzo@meetecho.com, spromano@unina.it
-  RFC7059          ||      S. Steffann, I. van Beijnum, R. van Rein         ||       sander@steffann.nl, iljitsch@muada.com, rick@openfortress.nl
-  RFC7060          ||      M. Napierala, E. Rosen, IJ. Wijnands         ||       mnapierala@att.com, erosen@cisco.com, ice@cisco.com
-  RFC7061          ||      R. Sinnema, E. Wilde         ||       remon.sinnema@emc.com, erik.wilde@emc.com
-  RFC7062          ||      F. Zhang, Ed., D. Li, H. Li, S. Belotti, D. Ceccarelli         ||       zhangfatai@huawei.com, huawei.danli@huawei.com, lihan@chinamobile.com, sergio.belotti@alcatel-lucent.it, daniele.ceccarelli@ericsson.com
-  RFC7063          ||      L. Zheng, J. Zhang, R. Parekh         ||       vero.zheng@huawei.com, zzhang@juniper.net, riparekh@cisco.com
-  RFC7064          ||      S. Nandakumar, G. Salgueiro, P. Jones, M. Petit-Huguenin         ||       snandaku@cisco.com, gsalguei@cisco.com, paulej@packetizer.com, petithug@acm.org
-  RFC7065          ||      M. Petit-Huguenin, S. Nandakumar, G. Salgueiro, P. Jones         ||       petithug@acm.org, snandaku@cisco.com, gsalguei@cisco.com, paulej@packetizer.com
-  RFC7066          ||      J. Korhonen, Ed., J. Arkko, Ed., T. Savolainen, S. Krishnan         ||       jouni.nospam@gmail.com, jari.arkko@piuha.net, teemu.savolainen@nokia.com, suresh.krishnan@ericsson.com
-  RFC7067          ||      L. Dunbar, D. Eastlake 3rd, R. Perlman, I. Gashinsky         ||       ldunbar@huawei.com, d3e3e3@gmail.com, Radia@alum.mit.edu, igor@yahoo-inc.com
-  RFC7068          ||      E. McMurry, B. Campbell         ||       emcmurry@computer.org, ben@nostrum.com
-  RFC7069          ||      R. Alimi, A. Rahman, D. Kutscher, Y. Yang, H. Song, K. Pentikousis         ||       ralimi@google.com, Akbar.Rahman@InterDigital.com, dirk.kutscher@neclab.eu, yry@cs.yale.edu, haibin.song@huawei.com, k.pentikousis@eict.de
-  RFC7070          ||      N. Borenstein, M. Kucherawy         ||       nsb@guppylake.com, superuser@gmail.com
-  RFC7071          ||      N. Borenstein, M. Kucherawy         ||       nsb@guppylake.com, superuser@gmail.com
-  RFC7072          ||      N. Borenstein, M. Kucherawy         ||       nsb@guppylake.com, superuser@gmail.com
-  RFC7073          ||      N. Borenstein, M. Kucherawy         ||       nsb@guppylake.com, superuser@gmail.com
-  RFC7074          ||      L. Berger, J. Meuric         ||       lberger@labn.net, julien.meuric@orange.com
-  RFC7075          ||      T. Tsou, R. Hao, T. Taylor, Ed.         ||       tina.tsou.zouting@huawei.com, ruibing_hao@cable.comcast.com, tom.taylor.stds@gmail.com
-  RFC7076          ||      M. Joseph, J. Susoy         ||       mark@p6r.com, jim@p6r.com
-  RFC7077          ||      S. Krishnan, S. Gundavelli, M. Liebsch, H. Yokota, J. Korhonen         ||       suresh.krishnan@ericsson.com, sgundave@cisco.com, marco.liebsch@neclab.eu, yokota@kddilabs.jp, jouni.nospam@gmail.com
-  RFC7078          ||      A. Matsumoto, T. Fujisaki, T. Chown         ||       arifumi@nttv6.net, fujisaki@nttv6.net, tjc@ecs.soton.ac.uk
-  RFC7079          ||      N. Del Regno, Ed., A. Malis, Ed.         ||       nick.delregno@verizon.com, amalis@gmail.com
-  RFC7080          ||      A. Sajassi, S. Salam, N. Bitar, F. Balus         ||       sajassi@cisco.com, ssalam@cisco.com, nabil.n.bitar@verizon.com, florin.balus@nuagenetworks.net
-  RFC7081          ||      E. Ivov, P. Saint-Andre, E. Marocco         ||       emcho@jitsi.org, ietf@stpeter.im, enrico.marocco@telecomitalia.it
-  RFC7082          ||      R. Shekh-Yusef, M. Barnes         ||       rifaat.ietf@gmail.com, mary.ietf.barnes@gmail.com
-  RFC7083          ||      R. Droms         ||       rdroms@cisco.com
-  RFC7084          ||      H. Singh, W. Beebee, C. Donley, B. Stark         ||       shemant@cisco.com, wbeebee@cisco.com, c.donley@cablelabs.com, barbara.stark@att.com
-  RFC7085          ||      J. Levine, P. Hoffman         ||       standards@taugh.com, paul.hoffman@cybersecurity.org
-  RFC7086          ||      A. Keranen, G. Camarillo, J. Maenpaa         ||       Ari.Keranen@ericsson.com, Gonzalo.Camarillo@ericsson.com, Jouni.Maenpaa@ericsson.com
-  RFC7087          ||      H. van Helvoort, Ed., L. Andersson, Ed., N. Sprecher, Ed.         ||       Huub.van.Helvoort@huawei.com, loa@mail01.huawei.com, nurit.sprecher@nsn.com
-  RFC7088          ||      D. Worley         ||       worley@ariadne.com
-  RFC7089          ||      H. Van de Sompel, M. Nelson, R. Sanderson         ||       hvdsomp@gmail.com, mln@cs.odu.edu, azaroth42@gmail.com
-  RFC7090          ||      H. Schulzrinne, H. Tschofenig, C. Holmberg, M. Patel         ||       hgs+ecrit@cs.columbia.edu, Hannes.Tschofenig@gmx.net, christer.holmberg@ericsson.com, Milan.Patel@huawei.com
-  RFC7091          ||      V. Dolmatov, Ed., A. Degtyarev         ||       dol@cryptocom.ru, alexey@renatasystems.org
-  RFC7092          ||      H. Kaplan, V. Pascual         ||       hadriel.kaplan@oracle.com, victor.pascual@quobis.com
-  RFC7093          ||      S. Turner, S. Kent, J. Manger         ||       turners@ieca.com, kent@bbn.com, james.h.manger@team.telstra.com
-  RFC7094          ||      D. McPherson, D. Oran, D. Thaler, E. Osterweil         ||       dmcpherson@verisign.com, oran@cisco.com, dthaler@microsoft.com, eosterweil@verisign.com
-  RFC7095          ||      P. Kewisch         ||       mozilla@kewis.ch
-  RFC7096          ||      S. Belotti, Ed., P. Grandi, D. Ceccarelli, Ed., D. Caviglia, F. Zhang, D. Li         ||       sergio.belotti@alcatel-lucent.com, pietro_vittorio.grandi@alcatel-lucent.com, daniele.ceccarelli@ericsson.com, diego.caviglia@ericsson.com, zhangfatai@huawei.com, danli@huawei.com
-  RFC7097          ||      J. Ott, V. Singh, Ed., I. Curcio         ||       jo@comnet.tkk.fi, varun@comnet.tkk.fi, igor.curcio@nokia.com
-  RFC7098          ||      B. Carpenter, S. Jiang, W. Tarreau         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com, willy@haproxy.com
-  RFC7100          ||      P. Resnick         ||       presnick@qti.qualcomm.com
-  RFC7101          ||      S. Ginoza         ||       sginoza@amsl.com
-  RFC7102          ||      JP. Vasseur         ||       jpv@cisco.com
-  RFC7103          ||      M. Kucherawy, G. Shapiro, N. Freed         ||       superuser@gmail.com, gshapiro@proofpoint.com, ned.freed@mrochek.com
-  RFC7104          ||      A. Begen, Y. Cai, H. Ou         ||       abegen@cisco.com, yiqunc@microsoft.com, hou@cisco.com
-  RFC7105          ||      M. Thomson, J. Winterbottom         ||       martin.thomson@gmail.com, a.james.winterbottom@gmail.com
-  RFC7106          ||      E. Ivov         ||       emcho@jitsi.org
-  RFC7107          ||      R. Housley         ||       housley@vigilsec.com
-  RFC7108          ||      J. Abley, T. Manderson         ||       jabley@dyn.com, terry.manderson@icann.org
-  RFC7109          ||      H. Yokota, D. Kim, B. Sarikaya, F. Xia         ||       yokota@kddilabs.jp, dskim@jejutp.or.kr, sarikaya@ieee.org, xiayangsong@huawei.com
-  RFC7110          ||      M. Chen, W. Cao, S. Ning, F. Jounay, S. Delord         ||       mach.chen@huawei.com, wayne.caowei@huawei.com, ning.so@tatacommunications.com, frederic.jounay@orange.ch, simon.delord@alcatel-lucent.com
-  RFC7111          ||      M. Hausenblas, E. Wilde, J. Tennison         ||       mhausenblas@maprtech.com, dret@berkeley.edu, jeni@jenitennison.com
-  RFC7112          ||      F. Gont, V. Manral, R. Bonica         ||       fgont@si6networks.com, vishwas@ionosnetworks.com, rbonica@juniper.net
-  RFC7113          ||      F. Gont         ||       fgont@si6networks.com
-  RFC7114          ||      B. Leiba         ||       barryleiba@computer.org
-  RFC7115          ||      R. Bush         ||       randy@psg.com
-  RFC7116          ||      K. Scott, M. Blanchet         ||       kscott@mitre.org, marc.blanchet@viagenie.ca
-  RFC7117          ||      R. Aggarwal, Ed., Y. Kamite, L. Fang, Y. Rekhter, C. Kodeboniya         ||       raggarwa_1@yahoo.com, y.kamite@ntt.com, lufang@microsoft.com, yakov@juniper.net, chaitk@yahoo.com
-  RFC7118          ||      I. Baz Castillo, J. Millan Villegas, V. Pascual         ||       ibc@aliax.net, jmillan@aliax.net, victor.pascual@quobis.com
-  RFC7119          ||      B. Claise, A. Kobayashi, B. Trammell         ||       bclaise@cisco.com, akoba@nttv6.net, trammell@tik.ee.ethz.ch
-  RFC7120          ||      M. Cotton         ||       michelle.cotton@icann.org
-  RFC7121          ||      K. Ogawa, W. Wang, E. Haleplidis, J. Hadi Salim         ||       k.ogawa@ntt.com, wmwang@mail.zjgsu.edu.cn, ehalep@ece.upatras.gr, hadi@mojatatu.com
-  RFC7122          ||      H. Kruse, S. Jero, S. Ostermann         ||       kruse@ohio.edu, sjero@purdue.edu, ostermann@eecs.ohiou.edu
-  RFC7123          ||      F. Gont, W. Liu         ||       fgont@si6networks.com, liushucheng@huawei.com
-  RFC7124          ||      E. Beili         ||       edward.beili@actelis.com
-  RFC7125          ||      B. Trammell, P. Aitken         ||       trammell@tik.ee.ethz.ch, paitken@cisco.com
-  RFC7126          ||      F. Gont, R. Atkinson, C. Pignataro         ||       fgont@si6networks.com, rja.lists@gmail.com, cpignata@cisco.com
-  RFC7127          ||      O. Kolkman, S. Bradner, S. Turner         ||       olaf@nlnetlabs.nl, sob@harvard.edu, turners@ieca.com
-  RFC7128          ||      R. Bush, R. Austein, K. Patel, H. Gredler, M. Waehlisch         ||       randy@psg.com, sra@hactrn.net, keyupate@cisco.com, hannes@juniper.net, waehlisch@ieee.org
-  RFC7129          ||      R. Gieben, W. Mekking         ||       miek@google.com, matthijs@nlnetlabs.nl
-  RFC7130          ||      M. Bhatia, Ed., M. Chen, Ed., S. Boutros, Ed., M. Binderberger, Ed., J. Haas, Ed.         ||       manav.bhatia@alcatel-lucent.com, mach@huawei.com, sboutros@cisco.com, mbinderb@cisco.com, jhaas@juniper.net
-  RFC7131          ||      M. Barnes, F. Audet, S. Schubert, H. van Elburg, C. Holmberg         ||       mary.ietf.barnes@gmail.com, francois.audet@skype.net, shida@ntt-at.com, ietf.hanserik@gmail.com, christer.holmberg@ericsson.com
-  RFC7132          ||      S. Kent, A. Chi         ||       kent@bbn.com, achi@cs.unc.edu
-  RFC7133          ||      S. Kashima, A. Kobayashi, Ed., P. Aitken         ||       kashima@nttv6.net, akoba@nttv6.net, paitken@cisco.com
-  RFC7134          ||      B. Rosen         ||       br@brianrosen.net
-  RFC7135          ||      J. Polk         ||       jmpolk@cisco.com
-  RFC7136          ||      B. Carpenter, S. Jiang         ||       brian.e.carpenter@gmail.com, jiangsheng@huawei.com
-  RFC7137          ||      A. Retana, S. Ratliff         ||       aretana@cisco.com, sratliff@cisco.com
-  RFC7138          ||      D. Ceccarelli, Ed., F. Zhang, S. Belotti, R. Rao, J. Drake         ||       daniele.ceccarelli@ericsson.com, zhangfatai@huawei.com, sergio.belotti@alcatel-lucent.com, rrao@infinera.com, jdrake@juniper.net
-  RFC7139          ||      F. Zhang, Ed., G. Zhang, S. Belotti, D. Ceccarelli, K. Pithewan         ||       zhangfatai@huawei.com, zhangguoying@mail.ritt.com.cn, sergio.belotti@alcatel-lucent.it, daniele.ceccarelli@ericsson.com, kpithewan@infinera.com
-  RFC7140          ||      L. Jin, F. Jounay, IJ. Wijnands, N. Leymann         ||       lizho.jin@gmail.com, frederic.jounay@orange.ch, ice@cisco.com, n.leymann@telekom.de
-  RFC7141          ||      B. Briscoe, J. Manner         ||       bob.briscoe@bt.com, jukka.manner@aalto.fi
-  RFC7142          ||      M. Shand, L. Ginsberg         ||       imc.shand@googlemail.com, ginsberg@cisco.com
-  RFC7143          ||      M. Chadalapaka, J. Satran, K. Meth, D. Black         ||       cbm@chadalapaka.com, julians@infinidat.com, meth@il.ibm.com, david.black@emc.com
-  RFC7144          ||      F. Knight, M. Chadalapaka         ||       knight@netapp.com, cbm@chadalapaka.com
-  RFC7145          ||      M. Ko, A. Nezhinsky         ||       mkosjc@gmail.com, alexandern@mellanox.com
-  RFC7146          ||      D. Black, P. Koning         ||       david.black@emc.com, paul_koning@Dell.com
-  RFC7147          ||      M. Bakke, P. Venkatesen         ||       mark_bakke@dell.com, prakashvn@hcl.com
-  RFC7148          ||      X. Zhou, J. Korhonen, C. Williams, S. Gundavelli, CJ. Bernardos         ||       zhou.xingyue@zte.com.cn, jouni.nospam@gmail.com, carlw@mcsr-labs.org, sgundave@cisco.com, cjbc@it.uc3m.es
-  RFC7149          ||      M. Boucadair, C. Jacquenet         ||       mohamed.boucadair@orange.com, christian.jacquenet@orange.com
-  RFC7150          ||      F. Zhang, A. Farrel         ||       zhangfatai@huawei.com, adrian@olddog.co.uk
-  RFC7151          ||      P. Hethmon, R. McMurray         ||       phethmon@hethmon.com, robmcm@microsoft.com
-  RFC7152          ||      R. Key, Ed., S. DeLord, F. Jounay, L. Huang, Z. Liu, M. Paul         ||       raymond.key@ieee.org, simon.delord@gmail.com, frederic.jounay@orange.ch, huanglu@chinamobile.com, zhliu@gsta.com, manuel.paul@telekom.de
-  RFC7153          ||      E. Rosen, Y. Rekhter         ||       erosen@cisco.com, yakov@juniper.net
-  RFC7154          ||      S. Moonesamy, Ed.         ||       sm+ietf@elandsys.com
-  RFC7155          ||      G. Zorn, Ed.         ||       glenzorn@gmail.com
-  RFC7156          ||      G. Zorn, Q. Wu, J. Korhonen         ||       glenzorn@gmail.com, bill.wu@huawei.com, jouni.nospam@gmail.com
-  RFC7157          ||      O. Troan, Ed., D. Miles, S. Matsushima, T. Okimoto, D. Wing         ||       ot@cisco.com, davidmiles@google.com, satoru.matsushima@g.softbank.co.jp, t.okimoto@west.ntt.co.jp, dwing-ietf@fuggles.com
-  RFC7158          ||      T. Bray, Ed.         ||       tbray@textuality.com
-  RFC7159          ||      T. Bray, Ed.         ||       tbray@textuality.com
-  RFC7160          ||      M. Petit-Huguenin, G. Zorn, Ed.         ||       petithug@acm.org, glenzorn@gmail.com
-  RFC7161          ||      LM. Contreras, CJ. Bernardos, I. Soto         ||       lmcm@tid.es, cjbc@it.uc3m.es, isoto@it.uc3m.es
-  RFC7162          ||      A. Melnikov, D. Cridland         ||       Alexey.Melnikov@isode.com, dave.cridland@surevine.com
-  RFC7163          ||      C. Holmberg, I. Sedlacek         ||       christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com
-  RFC7164          ||      K. Gross, R. Brandenburg         ||       kevin.gross@avanw.com, ray.vanbrandenburg@tno.nl
-  RFC7165          ||      R. Barnes         ||       rlb@ipv.sx
-  RFC7166          ||      M. Bhatia, V. Manral, A. Lindem         ||       manav.bhatia@alcatel-lucent.com, vishwas@ionosnetworks.com, acee.lindem@ericsson.com
-  RFC7167          ||      D. Frost, S. Bryant, M. Bocci, L. Berger         ||       frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com, lberger@labn.net
-  RFC7168          ||      I. Nazar         ||       inazar@deviantart.com
-  RFC7169          ||      S. Turner         ||       turners@ieca.com
-  RFC7170          ||      H. Zhou, N. Cam-Winget, J. Salowey, S. Hanna         ||       hzhou@cisco.com, ncamwing@cisco.com, jsalowey@cisco.com, steve.hanna@infineon.com
-  RFC7171          ||      N. Cam-Winget, P. Sangster         ||       ncamwing@cisco.com, paul_sangster@symantec.com
-  RFC7172          ||      D. Eastlake 3rd, M. Zhang, P. Agarwal, R. Perlman, D. Dutt         ||       d3e3e3@gmail.com, zhangmingui@huawei.com, pagarwal@broadcom.com, Radia@alum.mit.edu, ddutt.ietf@hobbesdutt.com
-  RFC7173          ||      L. Yong, D. Eastlake 3rd, S. Aldrin, J. Hudson         ||       lucy.yong@huawei.com, d3e3e3@gmail.com, sam.aldrin@huawei.com, jon.hudson@gmail.com
-  RFC7174          ||      S. Salam, T. Senevirathne, S. Aldrin, D. Eastlake 3rd         ||       ssalam@cisco.com, tsenevir@cisco.com, sam.aldrin@gmail.com, d3e3e3@gmail.com
-  RFC7175          ||      V. Manral, D. Eastlake 3rd, D. Ward, A. Banerjee         ||       vishwas@ionosnetworks.com, d3e3e3@gmail.com, dward@cisco.com, ayabaner@gmail.com
-  RFC7176          ||      D. Eastlake 3rd, T. Senevirathne, A. Ghanwani, D. Dutt, A. Banerjee         ||       d3e3e3@gmail.com, tsenevir@cisco.com, anoop@alumni.duke.edu, ddutt.ietf@hobbesdutt.com, ayabaner@gmail.com
-  RFC7177          ||      D. Eastlake 3rd, R. Perlman, A. Ghanwani, H. Yang, V. Manral         ||       d3e3e3@gmail.com, radia@alum.mit.edu, anoop@alumni.duke.edu, howardy@cisco.com, vishwas@ionosnetworks.com
-  RFC7178          ||      D. Eastlake 3rd, V. Manral, Y. Li, S. Aldrin, D. Ward         ||       d3e3e3@gmail.com, vishwas@ionosnetworks.com, liyizhou@huawei.com, sam.aldrin@huawei.com, dward@cisco.com
-  RFC7179          ||      D. Eastlake 3rd, A. Ghanwani, V. Manral, Y. Li, C. Bestler         ||       d3e3e3@gmail.com, anoop@alumni.duke.edu, vishwas@ionosnetworks.com, liyizhou@huawei.com, caitlin.bestler@nexenta.com
-  RFC7180          ||      D. Eastlake 3rd, M. Zhang, A. Ghanwani, V. Manral, A. Banerjee         ||       d3e3e3@gmail.com, zhangmingui@huawei.com, anoop@alumni.duke.edu, vishwas@ionosnetworks.com, ayabaner@gmail.com
-  RFC7181          ||      T. Clausen, C. Dearlove, P. Jacquet, U. Herberg         ||       T.Clausen@computer.org, chris.dearlove@baesystems.com, philippe.jacquet@alcatel-lucent.com, ulrich@herberg.name
-  RFC7182          ||      U. Herberg, T. Clausen, C. Dearlove         ||       ulrich@herberg.name, T.Clausen@computer.org, chris.dearlove@baesystems.com
-  RFC7183          ||      U. Herberg, C. Dearlove, T. Clausen         ||       ulrich@herberg.name, chris.dearlove@baesystems.com, T.Clausen@computer.org
-  RFC7184          ||      U. Herberg, R. Cole, T. Clausen         ||       ulrich@herberg.name, robert.g.cole@us.army.mil, T.Clausen@computer.org
-  RFC7185          ||      C. Dearlove, T. Clausen, P. Jacquet         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org, philippe.jacquet@alcatel-lucent.com
-  RFC7186          ||      J. Yi, U. Herberg, T. Clausen         ||       jiazi@jiaziyi.com, ulrich@herberg.name, T.Clausen@computer.org
-  RFC7187          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
-  RFC7188          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
-  RFC7189          ||      G. Mirsky         ||       gregory.mirsky@ericsson.com
-  RFC7190          ||      C. Villamizar         ||       curtis@occnc.com
-  RFC7191          ||      R. Housley         ||       housley@vigilsec.com
-  RFC7192          ||      S. Turner         ||       turners@ieca.com
-  RFC7193          ||      S. Turner, R. Housley, J. Schaad         ||       turners@ieca.com, housley@vigilsec.com, ietf@augustcellars.com
-  RFC7194          ||      R. Hartmann         ||       richih.mailinglist@gmail.com
-  RFC7195          ||      M. Garcia-Martin, S. Veikkolainen         ||       miguel.a.garcia@ericsson.com, simo.veikkolainen@nokia.com
-  RFC7196          ||      C. Pelsser, R. Bush, K. Patel, P. Mohapatra, O. Maennel         ||       cristel@iij.ad.jp, randy@psg.com, keyupate@cisco.com, mpradosh@yahoo.com, o@maennel.net
-  RFC7197          ||      A. Begen, Y. Cai, H. Ou         ||       abegen@cisco.com, yiqunc@microsoft.com, hou@cisco.com
-  RFC7198          ||      A. Begen, C. Perkins         ||       abegen@cisco.com, csp@csperkins.org
-  RFC7199          ||      R. Barnes, M. Thomson, J. Winterbottom, H. Tschofenig         ||       rlb@ipv.sx, martin.thomson@gmail.com, a.james.winterbottom@gmail.com, Hannes.Tschofenig@gmx.net
-  RFC7200          ||      C. Shen, H. Schulzrinne, A. Koike         ||       charles@cs.columbia.edu, schulzrinne@cs.columbia.edu, koike.arata@lab.ntt.co.jp
-  RFC7201          ||      M. Westerlund, C. Perkins         ||       magnus.westerlund@ericsson.com, csp@csperkins.org
-  RFC7202          ||      C. Perkins, M. Westerlund         ||       csp@csperkins.org, magnus.westerlund@ericsson.com
-  RFC7203          ||      T. Takahashi, K. Landfield, Y. Kadobayashi         ||       takeshi_takahashi@nict.go.jp, kent_landfield@mcafee.com, youki-k@is.aist-nara.ac.jp
-  RFC7204          ||      T. Haynes         ||       tdh@excfb.com
-  RFC7205          ||      A. Romanow, S. Botzko, M. Duckworth, R. Even, Ed.         ||       allyn@cisco.com, stephen.botzko@polycom.com, mark.duckworth@polycom.com, roni.even@mail01.huawei.com
-  RFC7206          ||      P. Jones, G. Salgueiro, J. Polk, L. Liess, H. Kaplan         ||       paulej@packetizer.com, gsalguei@cisco.com, jmpolk@cisco.com, laura.liess.dt@gmail.com, hadriel.kaplan@oracle.com
-  RFC7207          ||      M. Ortseifen, G. Dickfeld         ||       iso20022@bundesbank.de, iso20022@bundesbank.de
-  RFC7208          ||      S. Kitterman         ||       scott@kitterman.com
-  RFC7209          ||      A. Sajassi, R. Aggarwal, J. Uttaro, N. Bitar, W. Henderickx, A. Isaac         ||       sajassi@cisco.com, raggarwa_1@yahoo.com, uttaro@att.com, nabil.n.bitar@verizon.com, wim.henderickx@alcatel-lucent.com, aisaac71@bloomberg.net
-  RFC7210          ||      R. Housley, T. Polk, S. Hartman, D. Zhang         ||       housley@vigilsec.com, tim.polk@nist.gov, hartmans-ietf@mit.edu, zhangdacheng@huawei.com
-  RFC7211          ||      S. Hartman, D. Zhang         ||       hartmans-ietf@mit.edu, zhangdacheng@huawei.com
-  RFC7212          ||      D. Frost, S. Bryant, M. Bocci         ||       frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com
-  RFC7213          ||      D. Frost, S. Bryant, M. Bocci         ||       frost@mm.st, stbryant@cisco.com, matthew.bocci@alcatel-lucent.com
-  RFC7214          ||      L. Andersson, C. Pignataro         ||       loa@mail01.huawei.com, cpignata@cisco.com
-  RFC7215          ||      L. Jakab, A. Cabellos-Aparicio, F. Coras, J. Domingo-Pascual, D. Lewis         ||       lojakab@cisco.com, acabello@ac.upc.edu, fcoras@ac.upc.edu, jordi.domingo@ac.upc.edu, darlewis@cisco.com
-  RFC7216          ||      M. Thomson, R. Bellis         ||       martin.thomson@gmail.com, ray.bellis@nominet.org.uk
-  RFC7217          ||      F. Gont         ||       fgont@si6networks.com
-  RFC7218          ||      O. Gudmundsson         ||       ogud@ogud.com
-  RFC7219          ||      M. Bagnulo, A. Garcia-Martinez         ||       marcelo@it.uc3m.es, alberto@it.uc3m.es
-  RFC7220          ||      M. Boucadair, R. Penno, D. Wing         ||       mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com
-  RFC7221          ||      A. Farrel, D. Crocker, Ed.         ||       adrian@olddog.co.uk, dcrocker@bbiw.net
-  RFC7222          ||      M. Liebsch, P. Seite, H. Yokota, J. Korhonen, S. Gundavelli         ||       liebsch@neclab.eu, pierrick.seite@orange.com, yokota@kddilabs.jp, jouni.nospam@gmail.com, sgundave@cisco.com
-  RFC7223          ||      M. Bjorklund         ||       mbj@tail-f.com
-  RFC7224          ||      M. Bjorklund         ||       mbj@tail-f.com
-  RFC7225          ||      M. Boucadair         ||       mohamed.boucadair@orange.com
-  RFC7226          ||      C. Villamizar, Ed., D. McDysan, Ed., S. Ning, A. Malis, L. Yong         ||       curtis@occnc.com, dave.mcdysan@verizon.com, ning.so@tatacommunications.com, agmalis@gmail.com, lucy.yong@huawei.com
-  RFC7227          ||      D. Hankins, T. Mrugalski, M. Siodelski, S. Jiang, S. Krishnan         ||       dhankins@google.com, tomasz.mrugalski@gmail.com, msiodelski@gmail.com, jiangsheng@huawei.com, suresh.krishnan@ericsson.com
-  RFC7228          ||      C. Bormann, M. Ersue, A. Keranen         ||       cabo@tzi.org, mehmet.ersue@nsn.com, ari.keranen@ericsson.com
-  RFC7229          ||      R. Housley         ||       housley@vigilsec.com
-  RFC7230          ||      R. Fielding, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, julian.reschke@greenbytes.de
-  RFC7231          ||      R. Fielding, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, julian.reschke@greenbytes.de
-  RFC7232          ||      R. Fielding, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, julian.reschke@greenbytes.de
-  RFC7233          ||      R. Fielding, Ed., Y. Lafon, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, ylafon@w3.org, julian.reschke@greenbytes.de
-  RFC7234          ||      R. Fielding, Ed., M. Nottingham, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, mnot@mnot.net, julian.reschke@greenbytes.de
-  RFC7235          ||      R. Fielding, Ed., J. Reschke, Ed.         ||       fielding@gbiv.com, julian.reschke@greenbytes.de
-  RFC7236          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC7237          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC7238          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC7239          ||      A. Petersson, M. Nilsson         ||       andreas@sbin.se, nilsson@opera.com
-  RFC7240          ||      J. Snell         ||       jasnell@gmail.com
-  RFC7241          ||      S. Dawkins, P. Thaler, D. Romascanu, B. Aboba, Ed.         ||       spencerdawkins.ietf@gmail.com, pthaler@broadcom.com, dromasca@gmail.com , bernard_aboba@hotmail.com
-  RFC7242          ||      M. Demmer, J. Ott, S. Perreault         ||       demmer@cs.berkeley.edu, jo@netlab.tkk.fi, simon@per.reau.lt
-  RFC7243          ||      V. Singh, Ed., J. Ott, I. Curcio         ||       varun@comnet.tkk.fi, jo@comnet.tkk.fi, igor.curcio@nokia.com
-  RFC7244          ||      H. Asaeda, Q. Wu, R. Huang         ||       asaeda@nict.go.jp, bill.wu@huawei.com, Rachel@huawei.com
-  RFC7245          ||      A. Hutton, Ed., L. Portman, Ed., R. Jain, K. Rehor         ||       andrew.hutton@unify.com, leon.portman@gmail.com, rajnish.jain@outlook.com, krehor@cisco.com
-  RFC7246          ||      IJ. Wijnands, Ed., P. Hitchen, N. Leymann, W. Henderickx, A. Gulko, J. Tantsura         ||       ice@cisco.com, paul.hitchen@bt.com, n.leymann@telekom.de, wim.henderickx@alcatel-lucent.com, arkadiy.gulko@thomsonreuters.com, jeff.tantsura@ericsson.com
-  RFC7247          ||      P. Saint-Andre, A. Houri, J. Hildebrand         ||       ietf@stpeter.im, avshalom@il.ibm.com, jhildebr@cisco.com
-  RFC7248          ||      P. Saint-Andre, A. Houri, J. Hildebrand         ||       ietf@stpeter.im, avshalom@il.ibm.com, jhildebr@cisco.com
-  RFC7249          ||      R. Housley         ||       housley@vigilsec.com
-  RFC7250          ||      P. Wouters, Ed., H. Tschofenig, Ed., J. Gilmore, S. Weiler, T. Kivinen         ||       pwouters@redhat.com, Hannes.Tschofenig@gmx.net, gnu@toad.com, weiler@tislabs.com, kivinen@iki.fi
-  RFC7251          ||      D. McGrew, D. Bailey, M. Campagna, R. Dugal         ||       mcgrew@cisco.com, danbailey@sth.rub.de, mcampagna@gmail.com, rdugal@certicom.com
-  RFC7252          ||      Z. Shelby, K. Hartke, C. Bormann         ||       zach.shelby@arm.com, hartke@tzi.org, cabo@tzi.org
-  RFC7253          ||      T. Krovetz, P. Rogaway         ||       ted@krovetz.net, rogaway@cs.ucdavis.edu
-  RFC7254          ||      M. Montemurro, Ed., A. Allen, D. McDonald, P. Gosden         ||       mmontemurro@blackberry.com, aallen@blackberry.com, david.mcdonald@meteor.ie, pgosden@gsma.com
-  RFC7255          ||      A. Allen, Ed.         ||       aallen@blackberry.com
-  RFC7256          ||      F. Le Faucheur, R. Maglione, T. Taylor         ||       flefauch@cisco.com, robmgl@cisco.com, tom.taylor.stds@gmail.com
-  RFC7257          ||      T. Nadeau, Ed., A. Kiran Koushik, Ed., R. Mediratta, Ed.         ||       tnadeau@lucidvision.com, kkoushik@brocade.com, romedira@cisco.com
-  RFC7258          ||      S. Farrell, H. Tschofenig         ||       stephen.farrell@cs.tcd.ie, Hannes.Tschofenig@gmx.net
-  RFC7259          ||      P. Saint-Andre         ||       ietf@stpeter.im
-  RFC7260          ||      A. Takacs, D. Fedyk, J. He         ||       attila.takacs@ericsson.com, don.fedyk@hp.com, hejia@huawei.com
-  RFC7261          ||      M. Perumal, P. Ravindran         ||       mperumal@cisco.com, partha@parthasarathi.co.in
-  RFC7262          ||      A. Romanow, S. Botzko, M. Barnes         ||       allyn@cisco.com, stephen.botzko@polycom.com, mary.ietf.barnes@gmail.com
-  RFC7263          ||      N. Zong, X. Jiang, R. Even, Y. Zhang         ||       zongning@huawei.com, jiang.x.f@huawei.com, roni.even@mail01.huawei.com, hishigh@gmail.com
-  RFC7264          ||      N. Zong, X. Jiang, R. Even, Y. Zhang         ||       zongning@huawei.com, jiang.x.f@huawei.com, roni.even@mail01.huawei.com, hishigh@gmail.com
-  RFC7265          ||      P. Kewisch, C. Daboo, M. Douglass         ||       mozilla@kewis.ch, cyrus@daboo.name, douglm@rpi.edu
-  RFC7266          ||      A. Clark, Q. Wu, R. Schott, G. Zorn         ||       alan.d.clark@telchemy.com, sunseawq@huawei.com, Roland.Schott@telekom.de, gwz@net-zen.net
-  RFC7267          ||      L. Martini, Ed., M. Bocci, Ed., F. Balus, Ed.         ||       lmartini@cisco.com, matthew.bocci@alcatel-lucent.com, florin@nuagenetworks.net
-  RFC7268          ||      B. Aboba, J. Malinen, P. Congdon, J. Salowey, M. Jones         ||       Bernard_Aboba@hotmail.com, j@w1.fi, paul.congdon@tallac.com, jsalowey@cisco.com, mark@azu.ca
-  RFC7269          ||      G. Chen, Z. Cao, C. Xie, D. Binet         ||       chengang@chinamobile.com, caozhen@chinamobile.com, xiechf@ctbri.com.cn, david.binet@orange.com
-  RFC7270          ||      A. Yourtchenko, P. Aitken, B. Claise         ||       ayourtch@cisco.com, paitken@cisco.com, bclaise@cisco.com
-  RFC7271          ||      J. Ryoo, Ed., E. Gray, Ed., H. van Helvoort, A. D'Alessandro, T. Cheung, E. Osborne         ||       ryoo@etri.re.kr, eric.gray@ericsson.com, huub.van.helvoort@huawei.com, alessandro.dalessandro@telecomitalia.it, cts@etri.re.kr, eric.osborne@notcom.com
-  RFC7272          ||      R. van Brandenburg, H. Stokking, O. van Deventer, F. Boronat, M. Montagud, K. Gross         ||       ray.vanbrandenburg@tno.nl, hans.stokking@tno.nl, oskar.vandeventer@tno.nl, fboronat@dcom.upv.es, mamontor@posgrado.upv.es, kevin.gross@avanw.com
-  RFC7273          ||      A. Williams, K. Gross, R. van Brandenburg, H. Stokking         ||       aidan.williams@audinate.com, kevin.gross@avanw.com, ray.vanbrandenburg@tno.nl, hans.stokking@tno.nl
-  RFC7274          ||      K. Kompella, L. Andersson, A. Farrel         ||       kireeti.kompella@gmail.com, loa@mail01.huawei.com, adrian@olddog.co.uk
-  RFC7275          ||      L. Martini, S. Salam, A. Sajassi, M. Bocci, S. Matsushima, T. Nadeau         ||       lmartini@cisco.com, ssalam@cisco.com, sajassi@cisco.com, matthew.bocci@alcatel-lucent.com, satoru.matsushima@gmail.com, tnadeau@brocade.com
-  RFC7276          ||      T. Mizrahi, N. Sprecher, E. Bellagamba, Y. Weingarten         ||       talmi@marvell.com, nurit.sprecher@nsn.com, elisa.bellagamba@ericsson.com, wyaacov@gmail.com
-  RFC7277          ||      M. Bjorklund         ||       mbj@tail-f.com
-  RFC7278          ||      C. Byrne, D. Drown, A. Vizdal         ||       cameron.byrne@t-mobile.com, dan@drown.org, ales.vizdal@t-mobile.cz
-  RFC7279          ||      M. Shore, C. Pignataro         ||       melinda.shore@nomountain.net, cpignata@cisco.com
-  RFC7280          ||      G. Fairhurst         ||       gorry@erg.abdn.ac.uk
-  RFC7281          ||      A. Melnikov         ||       Alexey.Melnikov@isode.com
-  RFC7282          ||      P. Resnick         ||       presnick@qti.qualcomm.com
-  RFC7283          ||      Y. Cui, Q. Sun, T. Lemon         ||       yong@csnet1.cs.tsinghua.edu.cn, sunqi@csnet1.cs.tsinghua.edu.cn, Ted.Lemon@nominum.com
-  RFC7284          ||      M. Lanthaler         ||       mail@markus-lanthaler.com
-  RFC7285          ||      R. Alimi, Ed., R. Penno, Ed., Y. Yang, Ed., S. Kiesel, S. Previdi, W. Roome, S. Shalunov, R. Woundy         ||       ralimi@google.com, repenno@cisco.com, yry@cs.yale.edu, ietf-alto@skiesel.de, sprevidi@cisco.com, w.roome@alcatel-lucent.com, shalunov@shlang.com, Richard_Woundy@cable.comcast.com
-  RFC7286          ||      S. Kiesel, M. Stiemerling, N. Schwan, M. Scharf, H. Song         ||       ietf-alto@skiesel.de, mls.ietf@gmail.com, ietf@nico-schwan.de, michael.scharf@alcatel-lucent.com, haibin.song@huawei.com
-  RFC7287          ||      T. Schmidt, Ed., S. Gao, H. Zhang, M. Waehlisch         ||       Schmidt@informatik.haw-hamburg.de, shgao@bjtu.edu.cn, hkzhang@bjtu.edu.cn, mw@link-lab.net
-  RFC7288          ||      D. Thaler         ||       dthaler@microsoft.com
-  RFC7289          ||      V. Kuarsingh, Ed., J. Cianfarani         ||       victor@jvknet.com, john.cianfarani@rci.rogers.com
-  RFC7290          ||      L. Ciavattone, R. Geib, A. Morton, M. Wieser         ||       lencia@att.com, Ruediger.Geib@telekom.de, acmorton@att.com, matthias_michael.wieser@stud.tu-darmstadt.de
-  RFC7291          ||      M. Boucadair, R. Penno, D. Wing         ||       mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com
-  RFC7292          ||      K. Moriarty, Ed., M. Nystrom, S. Parkinson, A. Rusch, M. Scott         ||       Kathleen.Moriarty@emc.com, mnystrom@microsoft.com, sean.parkinson@rsa.com, andreas.rusch@rsa.com, michael2.scott@rsa.com
-  RFC7293          ||      W. Mills, M. Kucherawy         ||       wmills_92105@yahoo.com, msk@fb.com
-  RFC7294          ||      A. Clark, G. Zorn, C. Bi, Q. Wu         ||       alan.d.clark@telchemy.com, gwz@net-zen.net, bijy@sttri.com.cn, sunseawq@huawei.com
-  RFC7295          ||      H. Tschofenig, L. Eggert, Z. Sarker         ||       Hannes.Tschofenig@gmx.net, lars@netapp.com, Zaheduzzaman.Sarker@ericsson.com
-  RFC7296          ||      C. Kaufman, P. Hoffman, Y. Nir, P. Eronen, T. Kivinen         ||       charliekaufman@outlook.com, paul.hoffman@vpnc.org, nir.ietf@gmail.com, pe@iki.fi, kivinen@iki.fi
-  RFC7297          ||      M. Boucadair, C. Jacquenet, N. Wang         ||       mohamed.boucadair@orange.com, christian.jacquenet@orange.com, n.wang@surrey.ac.uk
-  RFC7298          ||      D. Ovsienko         ||       infrastation@yandex.ru
-  RFC7299          ||      R. Housley         ||       housley@vigilsec.com
-  RFC7300          ||      J. Haas, J. Mitchell         ||       jhaas@juniper.net, jon.mitchell@microsoft.com
-  RFC7301          ||      S. Friedl, A. Popov, A. Langley, E. Stephan         ||       sfriedl@cisco.com, andreipo@microsoft.com, agl@google.com, emile.stephan@orange.com
-  RFC7302          ||      P. Lemieux         ||       pal@sandflow.com
-  RFC7303          ||      H. Thompson, C. Lilley         ||       ht@inf.ed.ac.uk, chris@w3.org
-  RFC7304          ||      W. Kumari         ||       warren@kumari.net
-  RFC7305          ||      E. Lear, Ed.         ||       lear@cisco.com
-  RFC7306          ||      H. Shah, F. Marti, W. Noureddine, A. Eiriksson, R. Sharp         ||       hemal@broadcom.com, felix@chelsio.com, asgeir@chelsio.com, wael@chelsio.com, robert.o.sharp@intel.com
-  RFC7307          ||      Q. Zhao, K. Raza, C. Zhou, L. Fang, L. Li, D. King         ||       quintin.zhao@huawei.com, skraza@cisco.com, czhou@cisco.com, lufang@microsoft.com, lilianyuan@chinamobile.com, daniel@olddog.co.uk
-  RFC7308          ||      E. Osborne         ||       none
-  RFC7309          ||      Z. Liu, L. Jin, R. Chen, D. Cai, S. Salam         ||       zhliu@gsta.com, lizho.jin@gmail.com, chen.ran@zte.com.cn, dcai@cisco.com, ssalam@cisco.com
-  RFC7310          ||      J. Lindsay, H. Foerster         ||       lindsay@worldcastsystems.com, foerster@worldcastsystems.com
-  RFC7311          ||      P. Mohapatra, R. Fernando, E. Rosen, J. Uttaro         ||       mpradosh@yahoo.com, rex@cisco.com, erosen@cisco.com, uttaro@att.com
-  RFC7312          ||      J. Fabini, A. Morton         ||       joachim.fabini@tuwien.ac.at, acmorton@att.com
-  RFC7313          ||      K. Patel, E. Chen, B. Venkatachalapathy         ||       keyupate@cisco.com, enkechen@cisco.com, balaji_pv@hotmail.com
-  RFC7314          ||      M. Andrews         ||       marka@isc.org
-  RFC7315          ||      R. Jesske, K. Drage, C. Holmberg         ||       r.jesske@telekom.de, drage@alcatel-lucent.com, christer.holmberg@ericsson.com
-  RFC7316          ||      J. van Elburg, K. Drage, M. Ohsugi, S. Schubert, K. Arai         ||       ietf.hanserik@gmail.com, drage@alcatel-lucent.com, mayumi.ohsugi@ntt-at.co.jp, shida@ntt-at.com, arai.kenjiro@lab.ntt.co.jp
-  RFC7317          ||      A. Bierman, M. Bjorklund         ||       andy@yumaworks.com, mbj@tail-f.com
-  RFC7318          ||      A. Newton, G. Huston         ||       andy@arin.net, gih@apnic.net
-  RFC7319          ||      D. Eastlake 3rd         ||       d3e3e3@gmail.com
-  RFC7320          ||      M. Nottingham         ||       mnot@mnot.net
-  RFC7321          ||      D. McGrew, P. Hoffman         ||       mcgrew@cisco.com, paul.hoffman@vpnc.org
-  RFC7322          ||      H. Flanagan, S. Ginoza         ||       rse@rfc-editor.org, rfc-editor@rfc-editor.org
-  RFC7323          ||      D. Borman, B. Braden, V. Jacobson, R. Scheffenegger, Ed.         ||       david.borman@quantum.com, braden@isi.edu, vanj@google.com, rs@netapp.com
-  RFC7324          ||      E. Osborne         ||       eric.osborne@notcom.com
-  RFC7325          ||      C. Villamizar, Ed., K. Kompella, S. Amante, A. Malis, C. Pignataro         ||       curtis@occnc.com, kireeti@juniper.net, amante@apple.com, agmalis@gmail.com, cpignata@cisco.com
-  RFC7326          ||      J. Parello, B. Claise, B. Schoening, J. Quittek         ||       jparello@cisco.com, bclaise@cisco.com, brad.schoening@verizon.net, quittek@netlab.nec.de
-  RFC7328          ||      R. Gieben         ||       miek@google.com
-  RFC7329          ||      H. Kaplan         ||       hadrielk@yahoo.com
-  RFC7330          ||      T. Nadeau, Z. Ali, N. Akiya         ||       tnadeau@lucidvision.com, zali@cisco.com, nobo@cisco.com
-  RFC7331          ||      T. Nadeau, Z. Ali, N. Akiya         ||       tnadeau@lucidvision.com, zali@cisco.com, nobo@cisco.com
-  RFC7332          ||      H. Kaplan, V. Pascual         ||       hadrielk@yahoo.com, victor.pascual@quobis.com
-  RFC7333          ||      H. Chan, Ed., D. Liu, P. Seite, H. Yokota, J. Korhonen         ||       h.a.chan@ieee.org, liudapeng@chinamobile.com, pierrick.seite@orange.com, hidetoshi.yokota@landisgyr.com, jouni.nospam@gmail.com
-  RFC7334          ||      Q. Zhao, D. Dhody, D. King, Z. Ali, R. Casellas         ||       quintin.zhao@huawei.com, dhruv.dhody@huawei.com, daniel@olddog.co.uk, zali@cisco.com, ramon.casellas@cttc.es
-  RFC7335          ||      C. Byrne         ||       cameron.byrne@t-mobile.com
-  RFC7336          ||      L. Peterson, B. Davie, R. van Brandenburg, Ed.         ||       lapeters@akamai.com, bdavie@vmware.com, ray.vanbrandenburg@tno.nl
-  RFC7337          ||      K. Leung, Ed., Y. Lee, Ed.         ||       kleung@cisco.com, yiu_lee@cable.comcast.com
-  RFC7338          ||      F. Jounay, Ed., Y. Kamite, Ed., G. Heron, M. Bocci         ||       frederic.jounay@orange.ch, y.kamite@ntt.com, giheron@cisco.com, Matthew.Bocci@alcatel-lucent.com
-  RFC7339          ||      V. Gurbani, Ed., V. Hilt, H. Schulzrinne         ||       vkg@bell-labs.com, volker.hilt@bell-labs.com, hgs@cs.columbia.edu
-  RFC7340          ||      J. Peterson, H. Schulzrinne, H. Tschofenig         ||       jon.peterson@neustar.biz, hgs@cs.columbia.edu, Hannes.Tschofenig@gmx.net
-  RFC7341          ||      Q. Sun, Y. Cui, M. Siodelski, S. Krishnan, I. Farrer         ||       sunqi@csnet1.cs.tsinghua.edu.cn, yong@csnet1.cs.tsinghua.edu.cn, msiodelski@gmail.com, suresh.krishnan@ericsson.com, ian.farrer@telekom.de
-  RFC7342          ||      L. Dunbar, W. Kumari, I. Gashinsky         ||       ldunbar@huawei.com, warren@kumari.net, igor@yahoo-inc.com
-  RFC7343          ||      J. Laganier, F. Dupont         ||       julien.ietf@gmail.com, fdupont@isc.org
-  RFC7344          ||      W. Kumari, O. Gudmundsson, G. Barwood         ||       warren@kumari.net, ogud@ogud.com, george.barwood@blueyonder.co.uk
-  RFC7345          ||      C. Holmberg, I. Sedlacek, G. Salgueiro         ||       christer.holmberg@ericsson.com, ivo.sedlacek@ericsson.com, gsalguei@cisco.com
-  RFC7346          ||      R. Droms         ||       rdroms.ietf@gmail.com
-  RFC7347          ||      H. van Helvoort, Ed., J. Ryoo, Ed., H. Zhang, F. Huang, H. Li, A. D'Alessandro         ||       huub@van-helvoort.eu, ryoo@etri.re.kr, zhanghaiyan@huawei.com, feng.huang@philips.com, lihan@chinamobile.com, alessandro.dalessandro@telecomitalia.it
-  RFC7348          ||      M. Mahalingam, D. Dutt, K. Duda, P. Agarwal, L. Kreeger, T. Sridhar, M. Bursell, C. Wright         ||       mallik_mahalingam@yahoo.com, ddutt.ietf@hobbesdutt.com, kduda@arista.com, pagarwal@broadcom.com, kreeger@cisco.com, tsridhar@vmware.com, mike.bursell@intel.com, chrisw@redhat.com
-  RFC7349          ||      L. Zheng, M. Chen, M. Bhatia         ||       vero.zheng@huawei.com, mach.chen@huawei.com, manav@ionosnetworks.com
-  RFC7350          ||      M. Petit-Huguenin, G. Salgueiro         ||       marcph@getjive.com, gsalguei@cisco.com
-  RFC7351          ||      E. Wilde         ||       dret@berkeley.edu
-  RFC7352          ||      S. Bosch         ||       stephan@rename-it.nl
-  RFC7353          ||      S. Bellovin, R. Bush, D. Ward         ||       bellovin@acm.org, randy@psg.com, dward@cisco.com
-  RFC7354          ||      A. Adolf, P. Siebert         ||       alexander.adolf@condition-alpha.com, dvb@dvb.org
-  RFC7355          ||      G. Salgueiro, V. Pascual, A. Roman, S. Garcia         ||       gsalguei@cisco.com, victor.pascual@quobis.com, anton.roman@quobis.com, sergio.garcia@quobis.com
-  RFC7356          ||      L. Ginsberg, S. Previdi, Y. Yang         ||       ginsberg@cisco.com, sprevidi@cisco.com, yiya@cisco.com
-  RFC7357          ||      H. Zhai, F. Hu, R. Perlman, D. Eastlake 3rd, O. Stokes         ||       zhai.hongjun@zte.com.cn, hu.fangwei@zte.com.cn, Radia@alum.mit.edu, d3e3e3@gmail.com, ostokes@extremenetworks.com
-  RFC7358          ||      K. Raza, S. Boutros, L. Martini, N. Leymann         ||       skraza@cisco.com, sboutros@cisco.com, lmartini@cisco.com, n.leymann@telekom.de
-  RFC7359          ||      F. Gont         ||       fgont@si6networks.com
-  RFC7360          ||      A. DeKok         ||       aland@freeradius.org
-  RFC7361          ||      P. Dutta, F. Balus, O. Stokes, G. Calvignac, D. Fedyk         ||       pranjal.dutta@alcatel-lucent.com, florin.balus@alcatel-lucent.com, ostokes@extremenetworks.com, geraldine.calvignac@orange.com, don.fedyk@hp.com
-  RFC7362          ||      E. Ivov, H. Kaplan, D. Wing         ||       emcho@jitsi.org, hadrielk@yahoo.com, dwing-ietf@fuggles.com
-  RFC7363          ||      J. Maenpaa, G. Camarillo         ||       Jouni.Maenpaa@ericsson.com, Gonzalo.Camarillo@ericsson.com
-  RFC7364          ||      T. Narten, Ed., E. Gray, Ed., D. Black, L. Fang, L. Kreeger, M. Napierala         ||       narten@us.ibm.com, Eric.Gray@Ericsson.com, david.black@emc.com, lufang@microsoft.com, kreeger@cisco.com, mnapierala@att.com
-  RFC7365          ||      M. Lasserre, F. Balus, T. Morin, N. Bitar, Y. Rekhter         ||       marc.lasserre@alcatel-lucent.com, florin.balus@alcatel-lucent.com, thomas.morin@orange.com, nabil.n.bitar@verizon.com, yakov@juniper.net
-  RFC7366          ||      P. Gutmann         ||       pgut001@cs.auckland.ac.nz
-  RFC7367          ||      R. Cole, J. Macker, B. Adamson         ||       robert.g.cole@us.army.mil, macker@itd.nrl.navy.mil, adamson@itd.nrl.navy.mil
-  RFC7368          ||      T. Chown, Ed., J. Arkko, A. Brandt, O. Troan, J. Weil         ||       tjc@ecs.soton.ac.uk, jari.arkko@piuha.net, Anders_Brandt@sigmadesigns.com, ot@cisco.com, jason.weil@twcable.com
-  RFC7369          ||      A. Takacs, B. Gero, H. Long         ||       attila.takacs@ericsson.com, balazs.peter.gero@ericsson.com, lonho@huawei.com
-  RFC7370          ||      L. Ginsberg         ||       ginsberg@cisco.com
-  RFC7371          ||      M. Boucadair, S. Venaas         ||       mohamed.boucadair@orange.com, stig@cisco.com
-  RFC7372          ||      M. Kucherawy         ||       superuser@gmail.com
-  RFC7373          ||      B. Trammell         ||       ietf@trammell.ch
-  RFC7374          ||      J. Maenpaa, G. Camarillo         ||       Jouni.Maenpaa@ericsson.com, gonzalo.camarillo@ericsson.com
-  RFC7375          ||      J. Peterson         ||       jon.peterson@neustar.biz
-  RFC7376          ||      T. Reddy, R. Ravindranath, M. Perumal, A. Yegin         ||       tireddy@cisco.com, rmohanr@cisco.com, muthu.arul@gmail.com, alper.yegin@yegin.org
-  RFC7377          ||      B. Leiba, A. Melnikov         ||       barryleiba@computer.org, alexey.melnikov@isode.com
-  RFC7378          ||      H. Tschofenig, H. Schulzrinne, B. Aboba, Ed.         ||       Hannes.Tschofenig@gmx.net, hgs@cs.columbia.edu, Bernard_Aboba@hotmail.com
-  RFC7379          ||      Y. Li, W. Hao, R. Perlman, J. Hudson, H. Zhai         ||       liyizhou@huawei.com, haoweiguo@huawei.com, radia@alum.mit.edu, jon.hudson@gmail.com, honjun.zhai@tom.com
-  RFC7380          ||      J. Tong, C. Bi, Ed., R. Even, Q. Wu, Ed., R. Huang         ||       tongjg@sttri.com.cn, bijy@sttri.com.cn, roni.even@mail01.huawei.com, bill.wu@huawei.com, rachel.huang@huawei.com
-  RFC7381          ||      K. Chittimaneni, T. Chown, L. Howard, V. Kuarsingh, Y. Pouffary, E. Vyncke         ||       kk@dropbox.com, tjc@ecs.soton.ac.uk, lee.howard@twcable.com, victor@jvknet.com, yanick.pouffary@hp.com, evyncke@cisco.com
-  RFC7382          ||      S. Kent, D. Kong, K. Seo         ||       skent@bbn.com, dkong@bbn.com, kseo@bbn.com
-  RFC7383          ||      V. Smyslov         ||       svan@elvis.ru
-  RFC7384          ||      T. Mizrahi         ||       talmi@marvell.com
-  RFC7385          ||      L. Andersson, G. Swallow         ||       loa@mail01.huawei.com, swallow@cisco.com
-  RFC7386          ||      P. Hoffman, J. Snell         ||       paul.hoffman@vpnc.org, jasnell@gmail.com
-  RFC7387          ||      R. Key, Ed., L. Yong, Ed., S. Delord, F. Jounay, L. Jin         ||       raymond.key@ieee.org, lucy.yong@huawei.com, simon.delord@gmail.com, frederic.jounay@orange.ch, lizho.jin@gmail.com
-  RFC7388          ||      J. Schoenwaelder, A. Sehgal, T. Tsou, C. Zhou         ||       j.schoenwaelder@jacobs-university.de, s.anuj@jacobs-university.de, tina.tsou.zouting@huawei.com, cathyzhou@huawei.com
-  RFC7389          ||      R. Wakikawa, R. Pazhyannur, S. Gundavelli, C. Perkins         ||       ryuji.wakikawa@gmail.com, rpazhyan@cisco.com, sgundave@cisco.com, charliep@computer.org
-  RFC7390          ||      A. Rahman, Ed., E. Dijk, Ed.         ||       Akbar.Rahman@InterDigital.com, esko.dijk@philips.com
-  RFC7391          ||      J. Hadi Salim         ||       hadi@mojatatu.com
-  RFC7392          ||      P. Dutta, M. Bocci, L. Martini         ||       pranjal.dutta@alcatel-lucent.com, matthew.bocci@alcatel-lucent.com, lmartini@cisco.com
-  RFC7393          ||      X. Deng, M. Boucadair, Q. Zhao, J. Huang, C. Zhou         ||       dxhbupt@gmail.com, mohamed.boucadair@orange.com, zhaoqin.bupt@gmail.com, james.huang@huawei.com, cathy.zhou@huawei.com
-  RFC7394          ||      S. Boutros, S. Sivabalan, G. Swallow, S. Saxena, V. Manral, S. Aldrin         ||       sboutros@cisco.com, msiva@cisco.com, swallow@cisco.com, ssaxena@cisco.com, vishwas@ionosnetworks.com, aldrin.ietf@gmail.com
-  RFC7395          ||      L. Stout, Ed., J. Moffitt, E. Cestari         ||       lance@andyet.net, jack@metajack.im, eric@cstar.io
-  RFC7396          ||      P. Hoffman, J. Snell         ||       paul.hoffman@vpnc.org, jasnell@gmail.com
-  RFC7397          ||      J. Gilger, H. Tschofenig         ||       Gilger@ITSec.RWTH-Aachen.de, Hannes.tschofenig@gmx.net
-  RFC7398          ||      M. Bagnulo, T. Burbridge, S. Crawford, P. Eardley, A. Morton         ||       marcelo@it.uc3m.es, trevor.burbridge@bt.com, sam@samknows.com, philip.eardley@bt.com, acmorton@att.com
-  RFC7399          ||      A. Farrel, D. King         ||       adrian@olddog.co.uk, daniel@olddog.co.uk
-  RFC7400          ||      C. Bormann         ||       cabo@tzi.org
-  RFC7401          ||      R. Moskowitz, Ed., T. Heer, P. Jokela, T. Henderson         ||       rgm@labs.htt-consult.com, tobias.heer@belden.com, petri.jokela@nomadiclab.com, tomhend@u.washington.edu
-  RFC7402          ||      P. Jokela, R. Moskowitz, J. Melen         ||       petri.jokela@nomadiclab.com, rgm@labs.htt-consult.com, jan.melen@nomadiclab.com
-  RFC7403          ||      H. Kaplan         ||       hadrielk@yahoo.com
-  RFC7404          ||      M. Behringer, E. Vyncke         ||       mbehring@cisco.com, evyncke@cisco.com
-  RFC7405          ||      P. Kyzivat         ||       pkyzivat@alum.mit.edu
-  RFC7406          ||      H. Schulzrinne, S. McCann, G. Bajko, H. Tschofenig, D. Kroeselberg         ||       hgs+ecrit@cs.columbia.edu, smccann@blackberry.com, gabor.bajko@mediatek.com, Hannes.Tschofenig@gmx.net, dirk.kroeselberg@siemens.com
-  RFC7407          ||      M. Bjorklund, J. Schoenwaelder         ||       mbj@tail-f.com, j.schoenwaelder@jacobs-university.de
-  RFC7408          ||      E. Haleplidis         ||       ehalep@ece.upatras.gr
-  RFC7409          ||      E. Haleplidis, J. Halpern         ||       ehalep@ece.upatras.gr, joel.halpern@ericsson.com
-  RFC7410          ||      M. Kucherawy         ||       superuser@gmail.com
-  RFC7411          ||      T. Schmidt, Ed., M. Waehlisch, R. Koodli, G. Fairhurst, D. Liu         ||       t.schmidt@haw-hamburg.de, mw@link-lab.net, rajeev.koodli@intel.com, gorry@erg.abdn.ac.uk, liudapeng@chinamobile.com
-  RFC7412          ||      Y. Weingarten, S. Aldrin, P. Pan, J. Ryoo, G. Mirsky         ||       wyaacov@gmail.com, aldrin.ietf@gmail.com, ppan@infinera.com, ryoo@etri.re.kr, gregory.mirsky@ericsson.com
-  RFC7413          ||      Y. Cheng, J. Chu, S. Radhakrishnan, A. Jain         ||       ycheng@google.com, hkchu@google.com, sivasankar@cs.ucsd.edu, arvind@google.com
-  RFC7414          ||      M. Duke, R. Braden, W. Eddy, E. Blanton, A. Zimmermann         ||       m.duke@f5.com, braden@isi.edu, wes@mti-systems.com, elb@interruptsciences.com, alexander.zimmermann@netapp.com
-  RFC7415          ||      E. Noel, P. Williams         ||       ecnoel@att.com, phil.m.williams@bt.com
-  RFC7416          ||      T. Tsao, R. Alexander, M. Dohler, V. Daza, A. Lozano, M. Richardson, Ed.         ||       tzetatsao@eaton.com, rogeralexander@eaton.com, mischa.dohler@kcl.ac.uk, vanesa.daza@upf.edu, angel.lozano@upf.edu, mcr+ietf@sandelman.ca
-  RFC7417          ||      G. Karagiannis, A. Bhargava         ||       georgios.karagiannis@huawei.com, anuragb@cisco.com
-  RFC7418          ||      S. Dawkins, Ed.         ||       spencerdawkins.ietf@gmail.com
-  RFC7419          ||      N. Akiya, M. Binderberger, G. Mirsky         ||       nobo@cisco.com, mbinderb@cisco.com, gregory.mirsky@ericsson.com
-  RFC7420          ||      A. Koushik, E. Stephan, Q. Zhao, D. King, J. Hardwick         ||       kkoushik@brocade.com, emile.stephan@orange.com, qzhao@huawei.com, daniel@olddog.co.uk, jonathan.hardwick@metaswitch.com
-  RFC7421          ||      B. Carpenter, Ed., T. Chown, F. Gont, S. Jiang, A. Petrescu, A. Yourtchenko         ||       brian.e.carpenter@gmail.com, tjc@ecs.soton.ac.uk, fgont@si6networks.com, jiangsheng@huawei.com, alexandru.petrescu@cea.fr, ayourtch@cisco.com
-  RFC7422          ||      C. Donley, C. Grundemann, V. Sarawat, K. Sundaresan, O. Vautrin         ||       c.donley@cablelabs.com, cgrundemann@gmail.com, v.sarawat@cablelabs.com, k.sundaresan@cablelabs.com, Olivier@juniper.net
-  RFC7423          ||      L. Morand, Ed., V. Fajardo, H. Tschofenig         ||       lionel.morand@orange.com, vf0213@gmail.com, Hannes.Tschofenig@gmx.net
-  RFC7424          ||      R. Krishnan, L. Yong, A. Ghanwani, N. So, B. Khasnabish         ||       ramkri123@gmail.com, lucy.yong@huawei.com, anoop@alumni.duke.edu, ningso@yahoo.com, vumip1@gmail.com
-  RFC7425          ||      M. Thornburgh         ||       mthornbu@adobe.com
-  RFC7426          ||      E. Haleplidis, Ed., K. Pentikousis, Ed., S. Denazis, J. Hadi Salim, D. Meyer, O. Koufopavlou         ||       ehalep@ece.upatras.gr, k.pentikousis@eict.de, sdena@upatras.gr, hadi@mojatatu.com, dmm@1-4-5.net, odysseas@ece.upatras.gr
-  RFC7427          ||      T. Kivinen, J. Snyder         ||       kivinen@iki.fi, jms@opus1.com
-  RFC7428          ||      A. Brandt, J. Buron         ||       anders_brandt@sigmadesigns.com, jakob_buron@sigmadesigns.com
-  RFC7429          ||      D. Liu, Ed., JC. Zuniga, Ed., P. Seite, H. Chan, CJ. Bernardos         ||       liudapeng@chinamobile.com, JuanCarlos.Zuniga@InterDigital.com, pierrick.seite@orange.com, h.a.chan@ieee.org, cjbc@it.uc3m.es
-  RFC7430          ||      M. Bagnulo, C. Paasch, F. Gont, O. Bonaventure, C. Raiciu         ||       marcelo@it.uc3m.es, christoph.paasch@gmail.com, fgont@si6networks.com, Olivier.Bonaventure@uclouvain.be, costin.raiciu@cs.pub.ro
-  RFC7431          ||      A. Karan, C. Filsfils, IJ. Wijnands, Ed., B. Decraene         ||       apoorva@cisco.com, cfilsfil@cisco.com, ice@cisco.com, bruno.decraene@orange.com
-  RFC7432          ||      A. Sajassi, Ed., R. Aggarwal, N. Bitar, A. Isaac, J. Uttaro, J. Drake, W. Henderickx         ||       sajassi@cisco.com, raggarwa_1@yahoo.com, nabil.n.bitar@verizon.com, aisaac71@bloomberg.net, uttaro@att.com, jdrake@juniper.net, wim.henderickx@alcatel-lucent.com
-  RFC7433          ||      A. Johnston, J. Rafferty         ||       alan.b.johnston@gmail.com, jay@humancomm.com
-  RFC7434          ||      K. Drage, Ed., A. Johnston         ||       keith.drage@alcatel-lucent.com, alan.b.johnston@gmail.com
-  RFC7435          ||      V. Dukhovni         ||       ietf-dane@dukhovni.org
-  RFC7436          ||      H. Shah, E. Rosen, F. Le Faucheur, G. Heron         ||       hshah@ciena.com, erosen@juniper.net, flefauch@cisco.com, giheron@cisco.com
-  RFC7437          ||      M. Kucherawy, Ed.         ||       superuser@gmail.com
-  RFC7438          ||      IJ. Wijnands, Ed., E. Rosen, A. Gulko, U. Joorde, J. Tantsura         ||       ice@cisco.com, erosen@juniper.net, arkadiy.gulko@thomsonreuters.com, uwe.joorde@telekom.de, jeff.tantsura@ericsson.com
-  RFC7439          ||      W. George, Ed., C. Pignataro, Ed.         ||       wesley.george@twcable.com, cpignata@cisco.com
-  RFC7440          ||      P. Masotta         ||       patrick.masotta.ietf@vercot.com
-  RFC7441          ||      IJ. Wijnands, E. Rosen, U. Joorde         ||       ice@cisco.com, erosen@juniper.net, uwe.joorde@telekom.de
-  RFC7442          ||      Y. Rekhter, R. Aggarwal, N. Leymann, W. Henderickx, Q. Zhao, R. Li         ||       yakov@juniper.net, raggarwa_1@yahoo.com, N.Leymann@telekom.de, wim.henderickx@alcatel-lucent.com, quintin.zhao@huawei.com, renwei.li@huawei.com
-  RFC7443          ||      P. Patil, T. Reddy, G. Salgueiro, M. Petit-Huguenin         ||       praspati@cisco.com, tireddy@cisco.com, gsalguei@cisco.com, marc@petit-huguenin.org
-  RFC7444          ||      K. Zeilenga, A. Melnikov         ||       kurt.zeilenga@isode.com, alexey.melnikov@isode.com
-  RFC7445          ||      G. Chen, H. Deng, D. Michaud, J. Korhonen, M. Boucadair         ||       phdgang@gmail.com, denghui@chinamobile.com, dave.michaud@rci.rogers.com, jouni.nospam@gmail.com, mohamed.boucadair@orange.com
-  RFC7446          ||      Y. Lee, Ed., G. Bernstein, Ed., D. Li, W. Imajuku         ||       leeyoung@huawei.com, gregb@grotto-networking.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp
-  RFC7447          ||      J. Scudder, K. Kompella         ||       jgs@juniper.net, kireeti@juniper.net
-  RFC7448          ||      T. Taylor, Ed., D. Romascanu         ||       tom.taylor.stds@gmail.com, dromasca@gmail.com 
-  RFC7449          ||      Y. Lee, Ed., G. Bernstein, Ed., J. Martensson, T. Takeda, T. Tsuritani, O. Gonzalez de Dios         ||       leeyoung@huawei.com, gregb@grotto-networking.com, jonas.martensson@acreo.se, tomonori.takeda@ntt.com, tsuri@kddilabs.jp, oscar.gonzalezdedios@telefonica.com
-  RFC7450          ||      G. Bumgardner         ||       gbumgard@gmail.com
-  RFC7451          ||      S. Hollenbeck         ||       shollenbeck@verisign.com
-  RFC7452          ||      H. Tschofenig, J. Arkko, D. Thaler, D. McPherson         ||       Hannes.Tschofenig@gmx.net, jari.arkko@piuha.net, dthaler@microsoft.com, dmcpherson@verisign.com
-  RFC7453          ||      V. Mahalingam, K. Sampath, S. Aldrin, T. Nadeau         ||       venkat.mahalingams@gmail.com, kannankvs@gmail.com, aldrin.ietf@gmail.com, tnadeau@lucidvision.com
-  RFC7454          ||      J. Durand, I. Pepelnjak, G. Doering         ||       jerduran@cisco.com, ip@ipspace.net, gert@space.net
-  RFC7455          ||      T. Senevirathne, N. Finn, S. Salam, D. Kumar, D. Eastlake 3rd, S. Aldrin, Y. Li         ||       tsenevir@cisco.com, nfinn@cisco.com, ssalam@cisco.com, dekumar@cisco.com, d3e3e3@gmail.com, aldrin.ietf@gmail.com, liyizhou@huawei.com
-  RFC7456          ||      T. Mizrahi, T. Senevirathne, S. Salam, D. Kumar, D. Eastlake 3rd         ||       talmi@marvell.com, tsenevir@cisco.com, ssalam@cisco.com, dekumar@cisco.com, d3e3e3@gmail.com
-  RFC7457          ||      Y. Sheffer, R. Holz, P. Saint-Andre         ||       yaronf.ietf@gmail.com, holz@net.in.tum.de, peter@andyet.com
-  RFC7458          ||      R. Valmikam, R. Koodli         ||       valmikam@gmail.com, rajeev.koodli@intel.com
-  RFC7459          ||      M. Thomson, J. Winterbottom         ||       martin.thomson@gmail.com, a.james.winterbottom@gmail.com
-  RFC7460          ||      M. Chandramouli, B. Claise, B. Schoening, J. Quittek, T. Dietz         ||       moulchan@cisco.com, bclaise@cisco.com, brad.schoening@verizon.net, quittek@neclab.eu, Thomas.Dietz@neclab.eu
-  RFC7461          ||      J. Parello, B. Claise, M. Chandramouli         ||       jparello@cisco.com, bclaise@cisco.com, moulchan@cisco.com
-  RFC7462          ||      L. Liess, Ed., R. Jesske, A. Johnston, D. Worley, P. Kyzivat         ||       laura.liess.dt@gmail.com, r.jesske@telekom.de, alan.b.johnston@gmail.com, worley@ariadne.com, pkyzivat@alum.mit.edu
-  RFC7463          ||      A. Johnston, Ed., M. Soroushnejad, Ed., V. Venkataramanan         ||       alan.b.johnston@gmail.com, msoroush@gmail.com, vvenkatar@gmail.com
-  RFC7464          ||      N. Williams         ||       nico@cryptonector.com
-  RFC7465          ||      A. Popov         ||       andreipo@microsoft.com
-  RFC7466          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
-  RFC7467          ||      A. Murdock         ||       Aidan.murdock@ncia.nato.int
-  RFC7468          ||      S. Josefsson, S. Leonard         ||       simon@josefsson.org, dev+ietf@seantek.com
-  RFC7469          ||      C. Evans, C. Palmer, R. Sleevi         ||       cevans@google.com, palmer@google.com, sleevi@google.com
-  RFC7470          ||      F. Zhang, A. Farrel         ||       zhangfatai@huawei.com, adrian@olddog.co.uk
-  RFC7471          ||      S. Giacalone, D. Ward, J. Drake, A. Atlas, S. Previdi         ||       spencer.giacalone@gmail.com, dward@cisco.com, jdrake@juniper.net, akatlas@juniper.net, sprevidi@cisco.com
-  RFC7472          ||      I. McDonald, M. Sweet         ||       blueroofmusic@gmail.com, msweet@apple.com
-  RFC7473          ||      K. Raza, S. Boutros         ||       skraza@cisco.com, sboutros@cisco.com
-  RFC7474          ||      M. Bhatia, S. Hartman, D. Zhang, A. Lindem, Ed.         ||       manav@ionosnetworks.com, hartmans-ietf@mit.edu, dacheng.zhang@gmail.com, acee@cisco.com
-  RFC7475          ||      S. Dawkins         ||       spencerdawkins.ietf@gmail.com
-  RFC7476          ||      K. Pentikousis, Ed., B. Ohlman, D. Corujo, G. Boggia, G. Tyson, E. Davies, A. Molinaro, S. Eum         ||       k.pentikousis@eict.de, Borje.Ohlman@ericsson.com, dcorujo@av.it.pt, g.boggia@poliba.it, gareth.tyson@eecs.qmul.ac.uk, davieseb@scss.tcd.ie, antonella.molinaro@unirc.it, suyong@nict.go.jp
-  RFC7477          ||      W. Hardaker         ||       ietf@hardakers.net
-  RFC7478          ||      C. Holmberg, S. Hakansson, G. Eriksson         ||       christer.holmberg@ericsson.com, stefan.lk.hakansson@ericsson.com, goran.ap.eriksson@ericsson.com
-  RFC7479          ||      S. Moonesamy         ||       sm+ietf@elandsys.com
-  RFC7480          ||      A. Newton, B. Ellacott, N. Kong         ||       andy@arin.net, bje@apnic.net, nkong@cnnic.cn
-  RFC7481          ||      S. Hollenbeck, N. Kong         ||       shollenbeck@verisign.com, nkong@cnnic.cn
-  RFC7482          ||      A. Newton, S. Hollenbeck         ||       andy@arin.net, shollenbeck@verisign.com
-  RFC7483          ||      A. Newton, S. Hollenbeck         ||       andy@arin.net, shollenbeck@verisign.com
-  RFC7484          ||      M. Blanchet         ||       Marc.Blanchet@viagenie.ca
-  RFC7485          ||      L. Zhou, N. Kong, S. Shen, S. Sheng, A. Servin         ||       zhoulinlin@cnnic.cn, nkong@cnnic.cn, shenshuo@cnnic.cn, steve.sheng@icann.org, arturo.servin@gmail.com
-  RFC7486          ||      S. Farrell, P. Hoffman, M. Thomas         ||       stephen.farrell@cs.tcd.ie, paul.hoffman@vpnc.org, mike@phresheez.com
-  RFC7487          ||      E. Bellagamba, A. Takacs, G. Mirsky, L. Andersson, P. Skoldstrom, D. Ward         ||       elisa.bellagamba@ericsson.com, attila.takacs@ericsson.com, gregory.mirsky@ericsson.com, loa@mail01.huawei.com, pontus.skoldstrom@acreo.se, dward@cisco.com
-  RFC7488          ||      M. Boucadair, R. Penno, D. Wing, P. Patil, T. Reddy         ||       mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com, tireddy@cisco.com
-  RFC7489          ||      M. Kucherawy, Ed., E. Zwicky, Ed.         ||       superuser@gmail.com, zwicky@yahoo-inc.com
-  RFC7490          ||      S. Bryant, C. Filsfils, S. Previdi, M. Shand, N. So         ||       stbryant@cisco.com, cfilsfil@cisco.com, sprevidi@cisco.com, imc.shand@gmail.com, ningso@vinci-systems.com
-  RFC7491          ||      D. King, A. Farrel         ||       daniel@olddog.co.uk, adrian@olddog.co.uk
-  RFC7492          ||      M. Bhatia, D. Zhang, M. Jethanandani         ||       manav@ionosnetworks.com, dacheng.zhang@gmail.com, mjethanandani@gmail.com
-  RFC7493          ||      T. Bray, Ed.         ||       tbray@textuality.com
-  RFC7494          ||      C. Shao, H. Deng, R. Pazhyannur, F. Bari, R. Zhang, S. Matsushima         ||       shaochunju@chinamobile.com, denghui@chinamobile.com, rpazhyan@cisco.com, farooq.bari@att.com, zhangr@gsta.com, satoru.matsushima@g.softbank.co.jp
-  RFC7495          ||      A. Montville, D. Black         ||       adam.w.montville@gmail.com, david.black@emc.com
-  RFC7496          ||      M. Tuexen, R. Seggelmann, R. Stewart, S. Loreto         ||       tuexen@fh-muenster.de, rfc@robin-seggelmann.com, randall@lakerest.net, Salvatore.Loreto@ericsson.com
-  RFC7497          ||      A. Morton         ||       acmorton@att.com
-  RFC7498          ||      P. Quinn, Ed., T. Nadeau, Ed.         ||       paulq@cisco.com, tnadeau@lucidvision.com
-  RFC7499          ||      A. Perez-Mendez, Ed., R. Marin-Lopez, F. Pereniguez-Garcia, G. Lopez-Millan, D. Lopez, A. DeKok         ||       alex@um.es, rafa@um.es, pereniguez@um.es, gabilm@um.es, diego@tid.es, aland@networkradius.com
-  RFC7500          ||      R. Housley, Ed., O. Kolkman, Ed.         ||       housley@vigilsec.com, kolkman@isoc.org
-  RFC7501          ||      C. Davids, V. Gurbani, S. Poretsky         ||       davids@iit.edu, vkg@bell-labs.com, sporetsky@allot.com
-  RFC7502          ||      C. Davids, V. Gurbani, S. Poretsky         ||       davids@iit.edu, vkg@bell-labs.com, sporetsky@allot.com
-  RFC7503          ||      A. Lindem, J. Arkko         ||       acee@cisco.com, jari.arkko@piuha.net
-  RFC7504          ||      J. Klensin         ||       john-ietf@jck.com
-  RFC7505          ||      J. Levine, M. Delany         ||       standards@taugh.com, mx0dot@yahoo.com
-  RFC7506          ||      K. Raza, N. Akiya, C. Pignataro         ||       skraza@cisco.com, nobo.akiya.dev@gmail.com, cpignata@cisco.com
-  RFC7507          ||      B. Moeller, A. Langley         ||       bmoeller@acm.org, agl@google.com
-  RFC7508          ||      L. Cailleux, C. Bonatti         ||       laurent.cailleux@intradef.gouv.fr, bonatti252@ieca.com
-  RFC7509          ||      R. Huang, V. Singh         ||       rachel.huang@huawei.com, varun@comnet.tkk.fi
-  RFC7510          ||      X. Xu, N. Sheth, L. Yong, R. Callon, D. Black         ||       xuxiaohu@huawei.com, nsheth@juniper.net, lucy.yong@huawei.com, rcallon@juniper.net, david.black@emc.com
-  RFC7511          ||      M. Wilhelm         ||       max@rfc2324.org
-  RFC7512          ||      J. Pechanec, D. Moffat         ||       Jan.Pechanec@Oracle.COM, Darren.Moffat@Oracle.COM
-  RFC7513          ||      J. Bi, J. Wu, G. Yao, F. Baker         ||       junbi@tsinghua.edu.cn, jianping@cernet.edu.cn, yaoguang@cernet.edu.cn, fred@cisco.com
-  RFC7514          ||      M. Luckie         ||       mjl@caida.org
-  RFC7515          ||      M. Jones, J. Bradley, N. Sakimura         ||       mbj@microsoft.com, ve7jtb@ve7jtb.com, n-sakimura@nri.co.jp
-  RFC7516          ||      M. Jones, J. Hildebrand         ||       mbj@microsoft.com, jhildebr@cisco.com
-  RFC7517          ||      M. Jones         ||       mbj@microsoft.com
-  RFC7518          ||      M. Jones         ||       mbj@microsoft.com
-  RFC7519          ||      M. Jones, J. Bradley, N. Sakimura         ||       mbj@microsoft.com, ve7jtb@ve7jtb.com, n-sakimura@nri.co.jp
-  RFC7520          ||      M. Miller         ||       mamille2@cisco.com
-  RFC7521          ||      B. Campbell, C. Mortimore, M. Jones, Y. Goland         ||       brian.d.campbell@gmail.com, cmortimore@salesforce.com, mbj@microsoft.com, yarong@microsoft.com
-  RFC7522          ||      B. Campbell, C. Mortimore, M. Jones         ||       brian.d.campbell@gmail.com, cmortimore@salesforce.com, mbj@microsoft.com
-  RFC7523          ||      M. Jones, B. Campbell, C. Mortimore         ||       mbj@microsoft.com, brian.d.campbell@gmail.com, cmortimore@salesforce.com
-  RFC7524          ||      Y. Rekhter, E. Rosen, R. Aggarwal, T. Morin, I. Grosclaude, N. Leymann, S. Saad         ||       yakov@juniper.net, erosen@juniper.net, raggarwa_1@yahoo.com, thomas.morin@orange.com, irene.grosclaude@orange.com, n.leymann@telekom.de, samirsaad1@outlook.com
-  RFC7525          ||      Y. Sheffer, R. Holz, P. Saint-Andre         ||       yaronf.ietf@gmail.com, ralph.ietf@gmail.com, peter@andyet.com
-  RFC7526          ||      O. Troan, B. Carpenter, Ed.         ||       ot@cisco.com, brian.e.carpenter@gmail.com
-  RFC7527          ||      R. Asati, H. Singh, W. Beebee, C. Pignataro, E. Dart, W. George         ||       rajiva@cisco.com, shemant@cisco.com, wbeebee@cisco.com, cpignata@cisco.com, dart@es.net, wesley.george@twcable.com
-  RFC7528          ||      P. Higgs, J. Piesing         ||       paul.higgs@ericsson.com, jon.piesing@tpvision.com
-  RFC7529          ||      C. Daboo, G. Yakushev         ||       cyrus@daboo.name, gyakushev@yahoo.com
-  RFC7530          ||      T. Haynes, Ed., D. Noveck, Ed.         ||       thomas.haynes@primarydata.com, dave_noveck@dell.com
-  RFC7531          ||      T. Haynes, Ed., D. Noveck, Ed.         ||       thomas.haynes@primarydata.com, dave_noveck@dell.com
-  RFC7532          ||      J. Lentini, R. Tewari, C. Lever, Ed.         ||       jlentini@netapp.com, tewarir@us.ibm.com, chuck.lever@oracle.com
-  RFC7533          ||      J. Lentini, R. Tewari, C. Lever, Ed.         ||       jlentini@netapp.com, tewarir@us.ibm.com, chuck.lever@oracle.com
-  RFC7534          ||      J. Abley, W. Sotomayor         ||       jabley@dyn.com, wfms@ottix.net
-  RFC7535          ||      J. Abley, B. Dickson, W. Kumari, G. Michaelson         ||       jabley@dyn.com, bdickson@twitter.com, warren@kumari.net, ggm@apnic.net
-  RFC7536          ||      M. Linsner, P. Eardley, T. Burbridge, F. Sorensen         ||       mlinsner@cisco.com, philip.eardley@bt.com, trevor.burbridge@bt.com, frode.sorensen@nkom.no
-  RFC7537          ||      B. Decraene, N. Akiya, C. Pignataro, L. Andersson, S. Aldrin         ||       bruno.decraene@orange.com, nobo.akiya.dev@gmail.com, cpignata@cisco.com, loa@mail01.huawei.com, aldrin.ietf@gmail.com
-  RFC7538          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC7539          ||      Y. Nir, A. Langley         ||       ynir.ietf@gmail.com, agl@google.com
-  RFC7540          ||      M. Belshe, R. Peon, M. Thomson, Ed.         ||       mike@belshe.com, fenix@google.com, martin.thomson@gmail.com
-  RFC7541          ||      R. Peon, H. Ruellan         ||       fenix@google.com, herve.ruellan@crf.canon.fr
-  RFC7542          ||      A. DeKok         ||       aland@freeradius.org
-  RFC7543          ||      H. Jeng, L. Jalil, R. Bonica, K. Patel, L. Yong         ||       hj2387@att.com, luay.jalil@verizon.com, rbonica@juniper.net, keyupate@cisco.com, lucy.yong@huawei.com
-  RFC7544          ||      M. Mohali         ||       marianne.mohali@orange.com
-  RFC7545          ||      V. Chen, Ed., S. Das, L. Zhu, J. Malyar, P. McCann         ||       vchen@google.com, sdas@appcomsci.com, lei.zhu@huawei.com, jmalyar@iconectiv.com, peter.mccann@huawei.com
-  RFC7546          ||      B. Kaduk         ||       kaduk@mit.edu
-  RFC7547          ||      M. Ersue, Ed., D. Romascanu, J. Schoenwaelder, U. Herberg         ||       mehmet.ersue@nsn.com, dromasca@gmail.com , j.schoenwaelder@jacobs-university.de, ulrich@herberg.name
-  RFC7548          ||      M. Ersue, Ed., D. Romascanu, J. Schoenwaelder, A. Sehgal         ||       mehmet.ersue@nsn.com, dromasca@gmail.com , j.schoenwaelder@jacobs-university.de, s.anuj@jacobs-university.de
-  RFC7549          ||      C. Holmberg, J. Holm, R. Jesske, M. Dolly         ||       christer.holmberg@ericsson.com, jan.holm@ericsson.com, r.jesske@telekom.de, md3135@att.com
-  RFC7550          ||      O. Troan, B. Volz, M. Siodelski         ||       ot@cisco.com, volz@cisco.com, msiodelski@gmail.com
-  RFC7551          ||      F. Zhang, Ed., R. Jing, R. Gandhi, Ed.         ||       zhangfei7@huawei.com, jingrq@ctbri.com.cn, rgandhi@cisco.com
-  RFC7552          ||      R. Asati, C. Pignataro, K. Raza, V. Manral, R. Papneja         ||       rajiva@cisco.com, cpignata@cisco.com, skraza@cisco.com, vishwas@ionosnetworks.com, rajiv.papneja@huawei.com
-  RFC7553          ||      P. Faltstrom, O. Kolkman         ||       paf@netnod.se, kolkman@isoc.org
-  RFC7554          ||      T. Watteyne, Ed., M. Palattella, L. Grieco         ||       twatteyne@linear.com, maria-rita.palattella@uni.lu, a.grieco@poliba.it
-  RFC7555          ||      G. Swallow, V. Lim, S. Aldrin         ||       swallow@cisco.com, vlim@cisco.com, aldrin.ietf@gmail.com
-  RFC7556          ||      D. Anipko, Ed.         ||       dmitry.anipko@gmail.com
-  RFC7557          ||      J. Chroboczek         ||       jch@pps.univ-paris-diderot.fr
-  RFC7558          ||      K. Lynn, S. Cheshire, M. Blanchet, D. Migault         ||       kerry.lynn@verizon.com, cheshire@apple.com, Marc.Blanchet@viagenie.ca, daniel.migault@ericsson.com
-  RFC7559          ||      S. Krishnan, D. Anipko, D. Thaler         ||       suresh.krishnan@ericsson.com, dmitry.anipko@gmail.com, dthaler@microsoft.com
-  RFC7560          ||      M. Kuehlewind, Ed., R. Scheffenegger, B. Briscoe         ||       mirja.kuehlewind@tik.ee.ethz.ch, rs@netapp.com, ietf@bobbriscoe.net
-  RFC7561          ||      J. Kaippallimalil, R. Pazhyannur, P. Yegani         ||       john.kaippallimalil@huawei.com, rpazhyan@cisco.com, pyegani@juniper.net
-  RFC7562          ||      D. Thakore         ||       d.thakore@cablelabs.com
-  RFC7563          ||      R. Pazhyannur, S. Speicher, S. Gundavelli, J. Korhonen, J. Kaippallimalil         ||       rpazhyan@cisco.com, sespeich@cisco.com, sgundave@cisco.com, jouni.nospam@gmail.com, john.kaippallimalil@huawei.com
-  RFC7564          ||      P. Saint-Andre, M. Blanchet         ||       peter@andyet.com, Marc.Blanchet@viagenie.ca
-  RFC7565          ||      P. Saint-Andre         ||       peter@andyet.com
-  RFC7566          ||      L. Goix, K. Li         ||       laurent.goix@econocom-osiatis.com, kepeng.likp@gmail.com
-  RFC7567          ||      F. Baker, Ed., G. Fairhurst, Ed.         ||       fred@cisco.com, gorry@erg.abdn.ac.uk
-  RFC7568          ||      R. Barnes, M. Thomson, A. Pironti, A. Langley         ||       rlb@ipv.sx, martin.thomson@gmail.com, alfredo@pironti.eu, agl@google.com
-  RFC7569          ||      D. Quigley, J. Lu, T. Haynes         ||       dpquigl@davequigley.com, Jarrett.Lu@oracle.com, thomas.haynes@primarydata.com
-  RFC7570          ||      C. Margaria, Ed., G. Martinelli, S. Balls, B. Wright         ||       cmargaria@juniper.net, giomarti@cisco.com, steve.balls@metaswitch.com, ben.wright@metaswitch.com
-  RFC7571          ||      J. Dong, M. Chen, Z. Li, D. Ceccarelli         ||       jie.dong@huawei.com, mach.chen@huawei.com, lizhenqiang@chinamobile.com, daniele.ceccarelli@ericsson.com
-  RFC7572          ||      P. Saint-Andre, A. Houri, J. Hildebrand         ||       peter@andyet.com, avshalom@il.ibm.com, jhildebr@cisco.com
-  RFC7573          ||      P. Saint-Andre, S. Loreto         ||       peter@andyet.com, Salvatore.Loreto@ericsson.com
-  RFC7574          ||      A. Bakker, R. Petrocco, V. Grishchenko         ||       arno@cs.vu.nl, r.petrocco@gmail.com, victor.grishchenko@gmail.com
-  RFC7575          ||      M. Behringer, M. Pritikin, S. Bjarnason, A. Clemm, B. Carpenter, S. Jiang, L. Ciavaglia         ||       mbehring@cisco.com, pritikin@cisco.com, sbjarnas@cisco.com, alex@cisco.com, brian.e.carpenter@gmail.com, jiangsheng@huawei.com, Laurent.Ciavaglia@alcatel-lucent.com
-  RFC7576          ||      S. Jiang, B. Carpenter, M. Behringer         ||       jiangsheng@huawei.com, brian.e.carpenter@gmail.com, mbehring@cisco.com
-  RFC7577          ||      J. Quittek, R. Winter, T. Dietz         ||       quittek@neclab.eu, rolf.winter@neclab.eu, Thomas.Dietz@neclab.eu
-  RFC7578          ||      L. Masinter         ||       masinter@adobe.com
-  RFC7579          ||      G. Bernstein, Ed., Y. Lee, Ed., D. Li, W. Imajuku, J. Han         ||       gregb@grotto-networking.com, ylee@huawei.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp, hanjianrui@huawei.com
-  RFC7580          ||      F. Zhang, Y. Lee, J. Han, G. Bernstein, Y. Xu         ||       zhangfatai@huawei.com, leeyoung@huawei.com, hanjianrui@huawei.com, gregb@grotto-networking.com, xuyunbin@mail.ritt.com.cn
-  RFC7581          ||      G. Bernstein, Ed., Y. Lee, Ed., D. Li, W. Imajuku, J. Han         ||       gregb@grotto-networking.com, leeyoung@huawei.com, danli@huawei.com, imajuku.wataru@lab.ntt.co.jp, hanjianrui@huawei.com
-  RFC7582          ||      E. Rosen, IJ. Wijnands, Y. Cai, A. Boers         ||       erosen@juniper.net, ice@cisco.com, yiqunc@microsoft.com, arjen@boers.com
-  RFC7583          ||      S. Morris, J. Ihren, J. Dickinson, W. Mekking         ||       stephen@isc.org, johani@netnod.se, jad@sinodun.com, mmekking@dyn.com
-  RFC7584          ||      R. Ravindranath, T. Reddy, G. Salgueiro         ||       rmohanr@cisco.com, tireddy@cisco.com, gsalguei@cisco.com
-  RFC7585          ||      S. Winter, M. McCauley         ||       stefan.winter@restena.lu, mikem@airspayce.com
-  RFC7586          ||      Y. Nachum, L. Dunbar, I. Yerushalmi, T. Mizrahi         ||       youval.nachum@gmail.com, ldunbar@huawei.com, yilan@marvell.com, talmi@marvell.com
-  RFC7587          ||      J. Spittka, K. Vos, JM. Valin         ||       jspittka@gmail.com, koenvos74@gmail.com, jmvalin@jmvalin.ca
-  RFC7588          ||      R. Bonica, C. Pignataro, J. Touch         ||       rbonica@juniper.net, cpignata@cisco.com, touch@isi.edu
-  RFC7589          ||      M. Badra, A. Luchuk, J. Schoenwaelder         ||       mohamad.badra@zu.ac.ae, luchuk@snmp.com, j.schoenwaelder@jacobs-university.de
-  RFC7590          ||      P. Saint-Andre, T. Alkemade         ||       peter@andyet.com, me@thijsalkema.de
-  RFC7591          ||      J. Richer, Ed., M. Jones, J. Bradley, M. Machulak, P. Hunt         ||       ietf@justin.richer.org, mbj@microsoft.com, ve7jtb@ve7jtb.com, maciej.machulak@gmail.com, phil.hunt@yahoo.com
-  RFC7592          ||      J. Richer, Ed., M. Jones, J. Bradley, M. Machulak         ||       ietf@justin.richer.org, mbj@microsoft.com, ve7jtb@ve7jtb.com, maciej.machulak@gmail.com
-  RFC7593          ||      K. Wierenga, S. Winter, T. Wolniewicz         ||       klaas@cisco.com, stefan.winter@restena.lu, twoln@umk.pl
-  RFC7594          ||      P. Eardley, A. Morton, M. Bagnulo, T. Burbridge, P. Aitken, A. Akhter         ||       philip.eardley@bt.com, acmorton@att.com, marcelo@it.uc3m.es, trevor.burbridge@bt.com, paitken@brocade.com, aakhter@gmail.com
-  RFC7595          ||      D. Thaler, Ed., T. Hansen, T. Hardie         ||       dthaler@microsoft.com, tony+urireg@maillennium.att.com, ted.ietf@gmail.com
-  RFC7596          ||      Y. Cui, Q. Sun, M. Boucadair, T. Tsou, Y. Lee, I. Farrer         ||       yong@csnet1.cs.tsinghua.edu.cn, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com, tena@huawei.com, yiu_lee@cable.comcast.com, ian.farrer@telekom.de
-  RFC7597          ||      O. Troan, Ed., W. Dec, X. Li, C. Bao, S. Matsushima, T. Murakami, T. Taylor, Ed.         ||       ot@cisco.com, wdec@cisco.com, xing@cernet.edu.cn, congxiao@cernet.edu.cn, satoru.matsushima@g.softbank.co.jp, tetsuya@ipinfusion.com, tom.taylor.stds@gmail.com
-  RFC7598          ||      T. Mrugalski, O. Troan, I. Farrer, S. Perreault, W. Dec, C. Bao, L. Yeh, X. Deng         ||       tomasz.mrugalski@gmail.com, ot@cisco.com, ian.farrer@telekom.de, sperreault@jive.com, wdec@cisco.com, congxiao@cernet.edu.cn, leaf.y.yeh@hotmail.com, dxhbupt@gmail.com
-  RFC7599          ||      X. Li, C. Bao, W. Dec, Ed., O. Troan, S. Matsushima, T. Murakami         ||       xing@cernet.edu.cn, congxiao@cernet.edu.cn, wdec@cisco.com, ot@cisco.com, satoru.matsushima@g.softbank.co.jp, tetsuya@ipinfusion.com
-  RFC7600          ||      R. Despres, S. Jiang, Ed., R. Penno, Y. Lee, G. Chen, M. Chen         ||       despres.remi@laposte.net, jiangsheng@huawei.com, repenno@cisco.com, yiu_lee@cable.comcast.com, phdgang@gmail.com, maoke@bbix.net
-  RFC7601          ||      M. Kucherawy         ||       superuser@gmail.com
-  RFC7602          ||      U. Chunduri, W. Lu, A. Tian, N. Shen         ||       uma.chunduri@ericsson.com, wenhu.lu@ericsson.com, albert.tian@ericsson.com, naiming@cisco.com
-  RFC7603          ||      B. Schoening, M. Chandramouli, B. Nordman         ||       brad.schoening@verizon.net, moulchan@cisco.com, bnordman@lbl.gov
-  RFC7604          ||      M. Westerlund, T. Zeng         ||       magnus.westerlund@ericsson.com, thomas.zeng@gmail.com
-  RFC7605          ||      J. Touch         ||       touch@isi.edu
-  RFC7606          ||      E. Chen, Ed., J. Scudder, Ed., P. Mohapatra, K. Patel         ||       enkechen@cisco.com, jgs@juniper.net, mpradosh@yahoo.com, keyupate@cisco.com
-  RFC7607          ||      W. Kumari, R. Bush, H. Schiller, K. Patel         ||       warren@kumari.net, randy@psg.com, has@google.com, keyupate@cisco.com
-  RFC7608          ||      M. Boucadair, A. Petrescu, F. Baker         ||       mohamed.boucadair@orange.com, alexandre.petrescu@cea.fr, fred@cisco.com
-  RFC7609          ||      M. Fox, C. Kassimis, J. Stevens         ||       mjfox@us.ibm.com, kassimis@us.ibm.com, sjerry@us.ibm.com
-  RFC7610          ||      F. Gont, W. Liu, G. Van de Velde         ||       fgont@si6networks.com, liushucheng@huawei.com, gunter.van_de_velde@alcatel-lucent.com
-  RFC7611          ||      J. Uttaro, P. Mohapatra, D. Smith, R. Raszuk, J. Scudder         ||       uttaro@att.com, mpradosh@yahoo.com, djsmith@cisco.com, robert@raszuk.net, jgs@juniper.net
-  RFC7612          ||      P. Fleming, I. McDonald         ||       patfleminghtc@gmail.com, blueroofmusic@gmail.com
-  RFC7613          ||      P. Saint-Andre, A. Melnikov         ||       peter@andyet.com, alexey.melnikov@isode.com
-  RFC7614          ||      R. Sparks         ||       rjsparks@nostrum.com
-  RFC7615          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC7616          ||      R. Shekh-Yusef, Ed., D. Ahrens, S. Bremer         ||       rifaat.ietf@gmail.com, ahrensdc@gmail.com, sophie.bremer@netzkonform.de
-  RFC7617          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC7618          ||      Y. Cui, Q. Sun, I. Farrer, Y. Lee, Q. Sun, M. Boucadair         ||       yong@csnet1.cs.tsinghua.edu.cn, sunqi.ietf@gmail.com, ian.farrer@telekom.de, yiu_lee@cable.comcast.com, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com
-  RFC7619          ||      V. Smyslov, P. Wouters         ||       svan@elvis.ru, pwouters@redhat.com
-  RFC7620          ||      M. Boucadair, Ed., B. Chatras, T. Reddy, B. Williams, B. Sarikaya         ||       mohamed.boucadair@orange.com, bruno.chatras@orange.com, tireddy@cisco.com, brandon.williams@akamai.com, sarikaya@ieee.org
-  RFC7621          ||      A.B. Roach         ||       adam@nostrum.com
-  RFC7622          ||      P. Saint-Andre         ||       peter@andyet.com
-  RFC7623          ||      A. Sajassi, Ed., S. Salam, N. Bitar, A. Isaac, W. Henderickx         ||       sajassi@cisco.com, ssalam@cisco.com, nabil.n.bitar@verizon.com, aisaac@juniper.net, wim.henderickx@alcatel-lucent.com
-  RFC7624          ||      R. Barnes, B. Schneier, C. Jennings, T. Hardie, B. Trammell, C. Huitema, D. Borkmann         ||       rlb@ipv.sx, schneier@schneier.com, fluffy@cisco.com, ted.ietf@gmail.com, ietf@trammell.ch, huitema@huitema.net, daniel@iogearbox.net
-  RFC7625          ||      J. T. Hao, P. Maheshwari, R. Huang, L. Andersson, M. Chen         ||       haojiangtao@huawei.com, praveen.maheshwari@in.airtel.com, river.huang@huawei.com, loa@mail01.huawei.com, mach.chen@huawei.com
-  RFC7626          ||      S. Bortzmeyer         ||       bortzmeyer+ietf@nic.fr
-  RFC7627          ||      K. Bhargavan, Ed., A. Delignat-Lavaud, A. Pironti, A. Langley, M. Ray         ||       karthikeyan.bhargavan@inria.fr, antoine.delignat-lavaud@inria.fr, alfredo.pironti@inria.fr, agl@google.com, maray@microsoft.com
-  RFC7628          ||      W. Mills, T. Showalter, H. Tschofenig         ||       wmills_92105@yahoo.com, tjs@psaux.com, Hannes.Tschofenig@gmx.net
-  RFC7629          ||      S. Gundavelli, Ed., K. Leung, G. Tsirtsis, A. Petrescu         ||       sgundave@cisco.com, kleung@cisco.com, tsirtsis@qualcomm.com, alexandru.petrescu@cea.fr
-  RFC7630          ||      J. Merkle, Ed., M. Lochter         ||       johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de
-  RFC7631          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
-  RFC7632          ||      D. Waltermire, D. Harrington         ||       david.waltermire@nist.gov, ietfdbh@gmail.com
-  RFC7633          ||      P. Hallam-Baker         ||       philliph@comodo.com
-  RFC7634          ||      Y. Nir         ||       ynir.ietf@gmail.com
-  RFC7635          ||      T. Reddy, P. Patil, R. Ravindranath, J. Uberti         ||       tireddy@cisco.com, praspati@cisco.com, rmohanr@cisco.com, justin@uberti.name
-  RFC7636          ||      N. Sakimura, Ed., J. Bradley, N. Agarwal         ||       n-sakimura@nri.co.jp, ve7jtb@ve7jtb.com, naa@google.com
-  RFC7637          ||      P. Garg, Ed., Y. Wang, Ed.         ||       pankajg@microsoft.com, yushwang@microsoft.com
-  RFC7638          ||      M. Jones, N. Sakimura         ||       mbj@microsoft.com, n-sakimura@nri.co.jp
-  RFC7639          ||      A. Hutton, J. Uberti, M. Thomson         ||       andrew.hutton@unify.com, justin@uberti.name, martin.thomson@gmail.com
-  RFC7640          ||      B. Constantine, R. Krishnan         ||       barry.constantine@jdsu.com, ramkri123@gmail.com
-  RFC7641          ||      K. Hartke         ||       hartke@tzi.org
-  RFC7642          ||      K. LI, Ed., P. Hunt, B. Khasnabish, A. Nadalin, Z. Zeltsan         ||       kepeng.lkp@alibaba-inc.com, phil.hunt@oracle.com, vumip1@gmail.com, tonynad@microsoft.com, zachary.zeltsan@gmail.com
-  RFC7643          ||      P. Hunt, Ed., K. Grizzle, E. Wahlstroem, C. Mortimore         ||       phil.hunt@yahoo.com, kelly.grizzle@sailpoint.com, erik.wahlstrom@nexusgroup.com, cmortimore@salesforce.com
-  RFC7644          ||      P. Hunt, Ed., K. Grizzle, M. Ansari, E. Wahlstroem, C. Mortimore         ||       phil.hunt@yahoo.com, kelly.grizzle@sailpoint.com, morteza.ansari@cisco.com, erik.wahlstrom@nexusgroup.com, cmortimore@salesforce.com
-  RFC7645          ||      U. Chunduri, A. Tian, W. Lu         ||       uma.chunduri@ericsson.com, albert.tian@ericsson.com, wenhu.lu@ericsson.com
-  RFC7646          ||      P. Ebersman, W. Kumari, C. Griffiths, J. Livingood, R. Weber         ||       ebersman-ietf@dragon.net, warren@kumari.net, cgriffiths@gmail.com, jason_livingood@cable.comcast.com, ralf.weber@nominum.com
-  RFC7647          ||      R. Sparks, A.B. Roach         ||       rjsparks@nostrum.com, adam@nostrum.com
-  RFC7648          ||      S. Perreault, M. Boucadair, R. Penno, D. Wing, S. Cheshire         ||       sperreault@jive.com, mohamed.boucadair@orange.com, repenno@cisco.com, dwing-ietf@fuggles.com, cheshire@apple.com
-  RFC7649          ||      P. Saint-Andre, D. York         ||       peter@andyet.com, york@isoc.org
-  RFC7650          ||      J. Jimenez, J. Lopez-Vega, J. Maenpaa, G. Camarillo         ||       jaime.jimenez@ericsson.com, jmlvega@ugr.es, jouni.maenpaa@ericsson.com, gonzalo.camarillo@ericsson.com
-  RFC7651          ||      A. Dodd-Noble, S. Gundavelli, J. Korhonen, F. Baboescu, B. Weis         ||       noblea@cisco.com, sgundave@cisco.com, jouni.nospam@gmail.com, baboescu@broadcom.com, bew@cisco.com
-  RFC7652          ||      M. Cullen, S. Hartman, D. Zhang, T. Reddy         ||       margaret@painless-security.com, hartmans@painless-security.com, zhang_dacheng@hotmail.com, tireddy@cisco.com
-  RFC7653          ||      D. Raghuvanshi, K. Kinnear, D. Kukrety         ||       draghuva@cisco.com, kkinnear@cisco.com, dkukrety@cisco.com
-  RFC7654          ||      S. Banks, F. Calabria, G. Czirjak, R. Machat         ||       sbanks@encrypted.net, fcalabri@cisco.com, gczirjak@juniper.net, rmachat@juniper.net
-  RFC7655          ||      M. Ramalho, Ed., P. Jones, N. Harada, M. Perumal, L. Miao         ||       mramalho@cisco.com, paulej@packetizer.com, harada.noboru@lab.ntt.co.jp, muthu.arul@gmail.com, lei.miao@huawei.com
-  RFC7656          ||      J. Lennox, K. Gross, S. Nandakumar, G. Salgueiro, B. Burman, Ed.         ||       jonathan@vidyo.com, kevin.gross@avanw.com, snandaku@cisco.com, gsalguei@cisco.com, bo.burman@ericsson.com
-  RFC7657          ||      D. Black, Ed., P. Jones         ||       david.black@emc.com, paulej@packetizer.com
-  RFC7658          ||      S. Perreault, T. Tsou, S. Sivakumar, T. Taylor         ||       sperreault@jive.com, tina.tsou.zouting@huawei.com, ssenthil@cisco.com, tom.taylor.stds@gmail.com
-  RFC7659          ||      S. Perreault, T. Tsou, S. Sivakumar, T. Taylor         ||       sperreault@jive.com, tina.tsou.zouting@huawei.com, ssenthil@cisco.com, tom.taylor.stds@gmail.com
-  RFC7660          ||      L. Bertz, S. Manning, B. Hirschman         ||       lyleb551144@gmail.com, sergem913@gmail.com, Brent.Hirschman@gmail.com
-  RFC7661          ||      G. Fairhurst, A. Sathiaseelan, R. Secchi         ||       gorry@erg.abdn.ac.uk, arjuna@erg.abdn.ac.uk, raffaello@erg.abdn.ac.uk
-  RFC7662          ||      J. Richer, Ed.         ||       ietf@justin.richer.org
-  RFC7663          ||      B. Trammell, Ed., M. Kuehlewind, Ed.         ||       ietf@trammell.ch, mirja.kuehlewind@tik.ee.ethz.ch
-  RFC7664          ||      D. Harkins, Ed.         ||       dharkins@arubanetworks.com
-  RFC7665          ||      J. Halpern, Ed., C. Pignataro, Ed.         ||       jmh@joelhalpern.com, cpignata@cisco.com
-  RFC7666          ||      H. Asai, M. MacFaden, J. Schoenwaelder, K. Shima, T. Tsou         ||       panda@hongo.wide.ad.jp, mrm@vmware.com, j.schoenwaelder@jacobs-university.de, keiichi@iijlab.net, tina.tsou.zouting@huawei.com
-  RFC7667          ||      M. Westerlund, S. Wenger         ||       magnus.westerlund@ericsson.com, stewe@stewe.org
-  RFC7668          ||      J. Nieminen, T. Savolainen, M. Isomaki, B. Patil, Z. Shelby, C. Gomez         ||       johannamaria.nieminen@gmail.com, teemu.savolainen@nokia.com, markus.isomaki@nokia.com, basavaraj.patil@att.com, zach.shelby@arm.com, carlesgo@entel.upc.edu
-  RFC7669          ||      J. Levine         ||       standards@taugh.com
-  RFC7670          ||      T. Kivinen, P. Wouters, H. Tschofenig         ||       kivinen@iki.fi, pwouters@redhat.com, Hannes.Tschofenig@gmx.net
-  RFC7671          ||      V. Dukhovni, W. Hardaker         ||       ietf-dane@dukhovni.org, ietf@hardakers.net
-  RFC7672          ||      V. Dukhovni, W. Hardaker         ||       ietf-dane@dukhovni.org, ietf@hardakers.net
-  RFC7673          ||      T. Finch, M. Miller, P. Saint-Andre         ||       dot@dotat.at, mamille2@cisco.com, peter@andyet.com
-  RFC7674          ||      J. Haas, Ed.         ||       jhaas@juniper.net
-  RFC7675          ||      M. Perumal, D. Wing, R. Ravindranath, T. Reddy, M. Thomson         ||       muthu.arul@gmail.com, dwing-ietf@fuggles.com, rmohanr@cisco.com, tireddy@cisco.com, martin.thomson@gmail.com
-  RFC7676          ||      C. Pignataro, R. Bonica, S. Krishnan         ||       cpignata@cisco.com, rbonica@juniper.net, suresh.krishnan@ericsson.com
-  RFC7677          ||      T. Hansen         ||       tony+scramsha256@maillennium.att.com
-  RFC7678          ||      C. Zhou, T. Taylor, Q. Sun, M. Boucadair         ||       cathy.zhou@huawei.com, tom.taylor.stds@gmail.com, sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com
-  RFC7679          ||      G. Almes, S. Kalidindi, M. Zekauskas, A. Morton, Ed.         ||       almes@acm.org, skalidindi@ixiacom.com, matt@internet2.edu, acmorton@att.com
-  RFC7680          ||      G. Almes, S. Kalidindi, M. Zekauskas, A. Morton, Ed.         ||       almes@acm.org, skalidindi@ixiacom.com, matt@internet2.edu, acmorton@att.com
-  RFC7681          ||      J. Davin         ||       info@eesst.org
-  RFC7682          ||      D. McPherson, S. Amante, E. Osterweil, L. Blunk, D. Mitchell         ||       dmcpherson@verisign.com, amante@apple.com, eosterweil@verisign.com, ljb@merit.edu, dave@singularity.cx
-  RFC7683          ||      J. Korhonen, Ed., S. Donovan, Ed., B. Campbell, L. Morand         ||       jouni.nospam@gmail.com, srdonovan@usdonovans.com, ben@nostrum.com, lionel.morand@orange.com
-  RFC7684          ||      P. Psenak, H. Gredler, R. Shakir, W. Henderickx, J. Tantsura, A. Lindem         ||       ppsenak@cisco.com, hannes@gredler.at, rjs@rob.sh, wim.henderickx@alcatel-lucent.com, jeff.tantsura@ericsson.com, acee@cisco.com
-  RFC7685          ||      A. Langley         ||       agl@google.com
-  RFC7686          ||      J. Appelbaum, A. Muffett         ||       jacob@appelbaum.net, alecm@fb.com
-  RFC7687          ||      S. Farrell, R. Wenning, B. Bos, M. Blanchet, H. Tschofenig         ||       stephen.farrell@cs.tcd.ie, rigo@w3.org, bert@w3.org, Marc.Blanchet@viagenie.ca, Hannes.Tschofenig@gmx.net
-  RFC7688          ||      Y. Lee, Ed., G. Bernstein, Ed.         ||       leeyoung@huawei.com, gregb@grotto-networking.com
-  RFC7689          ||      G. Bernstein, Ed., S. Xu, Y. Lee, Ed., G. Martinelli, H. Harai         ||       gregb@grotto-networking.com, xsg@nict.go.jp, leeyoung@huawei.com, giomarti@cisco.com, harai@nict.go.jp
-  RFC7690          ||      M. Byerly, M. Hite, J. Jaeggli         ||       suckawha@gmail.com, mhite@hotmail.com, joelja@gmail.com
-  RFC7691          ||      S. Bradner, Ed.         ||       sob@harvard.edu
-  RFC7692          ||      T. Yoshino         ||       tyoshino@google.com
-  RFC7693          ||      M-J. Saarinen, Ed., J-P. Aumasson         ||       m.saarinen@qub.ac.uk, jean-philippe.aumasson@nagra.com
-  RFC7694          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC7695          ||      P. Pfister, B. Paterson, J. Arkko         ||       pierre.pfister@darou.fr, paterson.b@gmail.com, jari.arkko@piuha.net
-  RFC7696          ||      R. Housley         ||       housley@vigilsec.com
-  RFC7697          ||      P. Pan, S. Aldrin, M. Venkatesan, K. Sampath, T. Nadeau, S. Boutros         ||       none, aldrin.ietf@gmail.com, venkat.mahalingams@gmail.com, kannankvs@gmail.com, tnadeau@lucidvision.com, sboutros@vmware.com
-  RFC7698          ||      O. Gonzalez de Dios, Ed., R. Casellas, Ed., F. Zhang, X. Fu, D. Ceccarelli, I. Hussain         ||       oscar.gonzalezdedios@telefonica.com, ramon.casellas@cttc.es, zhangfatai@huawei.com, fu.xihua@stairnote.com, daniele.ceccarelli@ericsson.com, ihussain@infinera.com
-  RFC7699          ||      A. Farrel, D. King, Y. Li, F. Zhang         ||       adrian@olddog.co.uk, daniel@olddog.co.uk, wsliguotou@hotmail.com, zhangfatai@huawei.com
-  RFC7700          ||      P. Saint-Andre         ||       peter@andyet.com
-  RFC7701          ||      A. Niemi, M. Garcia-Martin, G. Sandbakken         ||       aki.niemi@iki.fi, miguel.a.garcia@ericsson.com, geirsand@cisco.com
-  RFC7702          ||      P. Saint-Andre, S. Ibarra, S. Loreto         ||       peter@andyet.com, saul@ag-projects.com, Salvatore.Loreto@ericsson.com
-  RFC7703          ||      E. Cordeiro, R. Carnier, A. Moreiras         ||       edwin@scordeiro.net, rodrigocarnier@gmail.com, moreiras@nic.br
-  RFC7704          ||      D. Crocker, N. Clark         ||       dcrocker@bbiw.net, narelle.clark@pavonis.com.au
-  RFC7705          ||      W. George, S. Amante         ||       wesley.george@twcable.com, amante@apple.com
-  RFC7706          ||      W. Kumari, P. Hoffman         ||       warren@kumari.net, paul.hoffman@icann.org
-  RFC7707          ||      F. Gont, T. Chown         ||       fgont@si6networks.com, tim.chown@jisc.ac.uk
-  RFC7708          ||      T. Nadeau, L. Martini, S. Bryant         ||       tnadeau@lucidvision.com, lmartini@cisco.com, stewart.bryant@gmail.com
-  RFC7709          ||      A. Malis, Ed., B. Wilson, G. Clapp, V. Shukla         ||       agmalis@gmail.com, bwilson@appcomsci.com, clapp@research.att.com, vishnu.shukla@verizon.com
-  RFC7710          ||      W. Kumari, O. Gudmundsson, P. Ebersman, S. Sheng         ||       warren@kumari.net, olafur@cloudflare.com, ebersman-ietf@dragon.net, steve.sheng@icann.org
-  RFC7711          ||      M. Miller, P. Saint-Andre         ||       mamille2@cisco.com, peter@andyet.com
-  RFC7712          ||      P. Saint-Andre, M. Miller, P. Hancke         ||       peter@andyet.com, mamille2@cisco.com, fippo@andyet.com
-  RFC7713          ||      M. Mathis, B. Briscoe         ||       mattmathis@google.com, ietf@bobbriscoe.net
-  RFC7714          ||      D. McGrew, K. Igoe         ||       mcgrew@cisco.com, mythicalkevin@yahoo.com
-  RFC7715          ||      IJ. Wijnands, Ed., K. Raza, A. Atlas, J. Tantsura, Q. Zhao         ||       ice@cisco.com, skraza@cisco.com, akatlas@juniper.net, jeff.tantsura@ericsson.com, quintin.zhao@huawei.com
-  RFC7716          ||      J. Zhang, L. Giuliano, E. Rosen, Ed., K. Subramanian, D. Pacella         ||       zzhang@juniper.net, lenny@juniper.net, erosen@juniper.net, kartsubr@cisco.com, dante.j.pacella@verizonbusiness.com
-  RFC7717          ||      K. Pentikousis, Ed., E. Zhang, Y. Cui         ||       k.pentikousis@eict.de, emma.zhanglijia@huawei.com, cuiyang@huawei.com
-  RFC7718          ||      A. Morton         ||       acmorton@att.com
-  RFC7719          ||      P. Hoffman, A. Sullivan, K. Fujiwara         ||       paul.hoffman@icann.org, asullivan@dyn.com, fujiwara@jprs.co.jp
-  RFC7720          ||      M. Blanchet, L-J. Liman         ||       Marc.Blanchet@viagenie.ca, liman@netnod.se
-  RFC7721          ||      A. Cooper, F. Gont, D. Thaler         ||       alcoop@cisco.com, fgont@si6networks.com, dthaler@microsoft.com
-  RFC7722          ||      C. Dearlove, T. Clausen         ||       chris.dearlove@baesystems.com, T.Clausen@computer.org
-  RFC7723          ||      S. Kiesel, R. Penno         ||       ietf-pcp@skiesel.de, repenno@cisco.com
-  RFC7724          ||      K. Kinnear, M. Stapp, B. Volz, N. Russell         ||       kkinnear@cisco.com, mjs@cisco.com, volz@cisco.com, neil.e.russell@gmail.com
-  RFC7725          ||      T. Bray         ||       tbray@textuality.com
-  RFC7726          ||      V. Govindan, K. Rajaraman, G. Mirsky, N. Akiya, S. Aldrin         ||       venggovi@cisco.com, kalyanir@cisco.com, gregory.mirsky@ericsson.com, nobo.akiya.dev@gmail.com, aldrin.ietf@gmail.com
-  RFC7727          ||      M. Zhang, H. Wen, J. Hu         ||       zhangmingui@huawei.com, wenhuafeng@huawei.com, hujie@ctbri.com.cn
-  RFC7728          ||      B. Burman, A. Akram, R. Even, M. Westerlund         ||       bo.burman@ericsson.com, akram.muhammadazam@gmail.com, roni.even@mail01.huawei.com, magnus.westerlund@ericsson.com
-  RFC7729          ||      B. Khasnabish, E. Haleplidis, J. Hadi Salim, Ed.         ||       vumip1@gmail.com, ehalep@ece.upatras.gr, hadi@mojatatu.com
-  RFC7730          ||      G. Huston, S. Weiler, G. Michaelson, S. Kent         ||       gih@apnic.net, weiler@tislabs.com, ggm@apnic.net, kent@bbn.com
-  RFC7731          ||      J. Hui, R. Kelsey         ||       jonhui@nestlabs.com, richard.kelsey@silabs.com
-  RFC7732          ||      P. van der Stok, R. Cragie         ||       consultancy@vanderstok.org, robert.cragie@arm.com
-  RFC7733          ||      A. Brandt, E. Baccelli, R. Cragie, P. van der Stok         ||       anders_brandt@sigmadesigns.com, Emmanuel.Baccelli@inria.fr, robert.cragie@arm.com, consultancy@vanderstok.org
-  RFC7734          ||      D. Allan, Ed., J. Tantsura, D. Fedyk, A. Sajassi         ||       david.i.allan@ericsson.com, jeff.tantsura@ericsson.com, don.fedyk@hpe.com, sajassi@cisco.com
-  RFC7735          ||      R. Sparks, T. Kivinen         ||       rjsparks@nostrum.com, kivinen@iki.fi
-  RFC7736          ||      K. Ma         ||       kevin.j.ma@ericsson.com
-  RFC7737          ||      N. Akiya, G. Swallow, C. Pignataro, L. Andersson, M. Chen         ||       nobo.akiya.dev@gmail.com, swallow@cisco.com, cpignata@cisco.com, loa@mail01.huawei.com, mach.chen@huawei.com
-  RFC7738          ||      M. Blanchet, A. Schiltknecht, P. Shames         ||       Marc.Blanchet@viagenie.ca, audric.schiltknecht@viagenie.ca, peter.m.shames@jpl.nasa.gov
-  RFC7739          ||      F. Gont         ||       fgont@si6networks.com
-  RFC7740          ||      Z. Zhang, Y. Rekhter, A. Dolganow         ||       zzhang@juniper.net, none, andrew.dolganow@alcatel-lucent.com
-  RFC7741          ||      P. Westin, H. Lundin, M. Glover, J. Uberti, F. Galligan         ||       patrik.westin@gmail.com, hlundin@google.com, michaelglover262@gmail.com, justin@uberti.name, fgalligan@google.com
-  RFC7742          ||      A.B. Roach         ||       adam@nostrum.com
-  RFC7743          ||      J. Luo, Ed., L. Jin, Ed., T. Nadeau, Ed., G. Swallow, Ed.         ||       luo.jian@zte.com.cn, lizho.jin@gmail.com, tnadeau@lucidvision.com, swallow@cisco.com
-  RFC7744          ||      L. Seitz, Ed., S. Gerdes, Ed., G. Selander, M. Mani, S. Kumar         ||       ludwig@sics.se, gerdes@tzi.org, goran.selander@ericsson.com, mehdi.mani@itron.com, sandeep.kumar@philips.com
-  RFC7745          ||      T. Manderson         ||       terry.manderson@icann.org
-  RFC7746          ||      R. Bonica, I. Minei, M. Conn, D. Pacella, L. Tomotaki         ||       rbonica@juniper.net, inaminei@google.com, meconn26@gmail.com, dante.j.pacella@verizon.com, luis.tomotaki@verizon.com
-  RFC7747          ||      R. Papneja, B. Parise, S. Hares, D. Lee, I. Varlashkin         ||       rajiv.papneja@huawei.com, bparise@skyportsystems.com, shares@ndzh.com, dlee@ixiacom.com, ilya@nobulus.com
-  RFC7748          ||      A. Langley, M. Hamburg, S. Turner         ||       agl@google.com, mike@shiftleft.org, sean@sn3rd.com
-  RFC7749          ||      J. Reschke         ||       julian.reschke@greenbytes.de
-  RFC7750          ||      J. Hedin, G. Mirsky, S. Baillargeon         ||       jonas.hedin@ericsson.com, gregory.mirsky@ericsson.com, steve.baillargeon@ericsson.com
-  RFC7751          ||      S. Sorce, T. Yu         ||       ssorce@redhat.com, tlyu@mit.edu
-  RFC7752          ||      H. Gredler, Ed., J. Medved, S. Previdi, A. Farrel, S. Ray         ||       hannes@gredler.at, jmedved@cisco.com, sprevidi@cisco.com, adrian@olddog.co.uk, raysaikat@gmail.com
-  RFC7753          ||      Q. Sun, M. Boucadair, S. Sivakumar, C. Zhou, T. Tsou, S. Perreault         ||       sunqiong@ctbri.com.cn, mohamed.boucadair@orange.com, ssenthil@cisco.com, cathy.zhou@huawei.com, tina.tsou@philips.com, sperreault@jive.com
-  RFC7754          ||      R. Barnes, A. Cooper, O. Kolkman, D. Thaler, E. Nordmark         ||       rlb@ipv.sx, alcoop@cisco.com, kolkman@isoc.org, dthaler@microsoft.com, nordmark@arista.com
-  RFC7755          ||      T. Anderson         ||       tore@redpill-linpro.com
-  RFC7756          ||      T. Anderson, S. Steffann         ||       tore@redpill-linpro.com, sander@steffann.nl
-  RFC7757          ||      T. Anderson, A. Leiva Popper         ||       tore@redpill-linpro.com, ydahhrk@gmail.com
-  RFC7758          ||      T. Mizrahi, Y. Moses         ||       dew@tx.technion.ac.il, moses@ee.technion.ac.il
-  RFC7759          ||      E. Bellagamba, G. Mirsky, L. Andersson, P. Skoldstrom, D. Ward, J. Drake         ||       elisa.bellagamba@gmail.com, gregory.mirsky@ericsson.com, loa@mail01.huawei.com, pontus.skoldstrom@acreo.se, dward@cisco.com, jdrake@juniper.net
-  RFC7760          ||      R. Housley         ||       housley@vigilsec.com
-  RFC7761          ||      B. Fenner, M. Handley, H. Holbrook, I. Kouvelas, R. Parekh, Z. Zhang, L. Zheng         ||       fenner@arista.com, m.handley@cs.ucl.ac.uk, holbrook@arista.com, kouvelas@arista.com, riparekh@cisco.com, zzhang@juniper.net, vero.zheng@huawei.com
-  RFC7762          ||      M. West         ||       mkwst@google.com
-  RFC7763          ||      S. Leonard         ||       dev+ietf@seantek.com
-  RFC7764          ||      S. Leonard         ||       dev+ietf@seantek.com
-  RFC7765          ||      P. Hurtig, A. Brunstrom, A. Petlund, M. Welzl         ||       per.hurtig@kau.se, anna.brunstrom@kau.se, apetlund@simula.no, michawe@ifi.uio.no
-  RFC7766          ||      J. Dickinson, S. Dickinson, R. Bellis, A. Mankin, D. Wessels         ||       jad@sinodun.com, sara@sinodun.com, ray@isc.org, allison.mankin@gmail.com, dwessels@verisign.com
-  RFC7767          ||      S. Vinapamula, S. Sivakumar, M. Boucadair, T. Reddy         ||       sureshk@juniper.net, ssenthil@cisco.com, mohamed.boucadair@orange.com, tireddy@cisco.com
-  RFC7768          ||      T. Tsou, W. Li, T. Taylor, J. Huang         ||       tina.tsou@philips.com, mweiboli@gmail.com, tom.taylor.stds@gmail.com, james.huang@huawei.com
-  RFC7769          ||      S. Sivabalan, S. Boutros, H. Shah, S. Aldrin, M. Venkatesan         ||       msiva@cisco.com, sboutros@cisco.com, hshah@ciena.com, aldrin.ietf@gmail.com, mannan_venkatesan@cable.comcast.com
-  RFC7770          ||      A. Lindem, Ed., N. Shen, JP. Vasseur, R. Aggarwal, S. Shaffer         ||       acee@cisco.com, naiming@cisco.com, jpv@cisco.com, raggarwa_1@yahoo.com, sshaffer@akamai.com
-  RFC7771          ||      A. Malis, Ed., L. Andersson, H. van Helvoort, J. Shin, L. Wang, A. D'Alessandro         ||       agmalis@gmail.com, loa@mail01.huawei.com, huubatwork@gmail.com, jongyoon.shin@sk.com, wangleiyj@chinamobile.com, alessandro.dalessandro@telecomitalia.it
-  RFC7772          ||      A. Yourtchenko, L. Colitti         ||       ayourtch@cisco.com, lorenzo@google.com
-  RFC7773          ||      S. Santesson         ||       sts@aaa-sec.com
-  RFC7774          ||      Y. Doi, M. Gillmore         ||       yusuke.doi@toshiba.co.jp, matthew.gillmore@itron.com
-  RFC7775          ||      L. Ginsberg, S. Litkowski, S. Previdi         ||       ginsberg@cisco.com, stephane.litkowski@orange.com, sprevidi@cisco.com
-  RFC7776          ||      P. Resnick, A. Farrel         ||       presnick@qti.qualcomm.com, adrian@olddog.co.uk
-  RFC7777          ||      S. Hegde, R. Shakir, A. Smirnov, Z. Li, B. Decraene         ||       shraddha@juniper.net, rjs@rob.sh, as@cisco.com, lizhenbin@huawei.com, bruno.decraene@orange.com
-  RFC7778          ||      D. Kutscher, F. Mir, R. Winter, S. Krishnan, Y. Zhang, CJ. Bernardos         ||       kutscher@neclab.eu, faisal.mir@gmail.com, rolf.winter@neclab.eu, suresh.krishnan@ericsson.com, ying.zhang13@hp.com, cjbc@it.uc3m.es
-  RFC7779          ||      H. Rogge, E. Baccelli         ||       henning.rogge@fkie.fraunhofer.de, Emmanuel.Baccelli@inria.fr
-  RFC7780          ||      D. Eastlake 3rd, M. Zhang, R. Perlman, A. Banerjee, A. Ghanwani, S. Gupta         ||       d3e3e3@gmail.com, zhangmingui@huawei.com, radia@alum.mit.edu, ayabaner@cisco.com, anoop@alumni.duke.edu, sujay.gupta@ipinfusion.com
-  RFC7781          ||      H. Zhai, T. Senevirathne, R. Perlman, M. Zhang, Y. Li         ||       honjun.zhai@tom.com, tsenevir@gmail.com, radia@alum.mit.edu, zhangmingui@huawei.com, liyizhou@huawei.com
-  RFC7782          ||      M. Zhang, R. Perlman, H. Zhai, M. Durrani, S. Gupta         ||       zhangmingui@huawei.com, radia@alum.mit.edu, honjun.zhai@tom.com, mdurrani@cisco.com, sujay.gupta@ipinfusion.com
-  RFC7783          ||      T. Senevirathne, J. Pathangi, J. Hudson         ||       tsenevir@gmail.com, pathangi_janardhanan@dell.com, jon.hudson@gmail.com
-  RFC7784          ||      D. Kumar, S. Salam, T. Senevirathne         ||       dekumar@cisco.com, ssalam@cisco.com, tsenevir@gmail.com
-  RFC7785          ||      S. Vinapamula, M. Boucadair         ||       sureshk@juniper.net, mohamed.boucadair@orange.com
-  RFC7786          ||      M. Kuehlewind, Ed., R. Scheffenegger         ||       mirja.kuehlewind@tik.ee.ethz.ch, rs.ietf@gmx.at
-  RFC7787          ||      M. Stenberg, S. Barth         ||       markus.stenberg@iki.fi, cyrus@openwrt.org
-  RFC7788          ||      M. Stenberg, S. Barth, P. Pfister         ||       markus.stenberg@iki.fi, cyrus@openwrt.org, pierre.pfister@darou.fr
-  RFC7789          ||      C. Cardona, P. Francois, P. Lucente         ||       juancamilo.cardona@imdea.org, pifranco@cisco.com, plucente@cisco.com
-  RFC7790          ||      Y. Yoneya, T. Nemoto         ||       yoshiro.yoneya@jprs.co.jp, t.nemo10@kmd.keio.ac.jp
-  RFC7791          ||      D. Migault, Ed., V. Smyslov         ||       daniel.migault@ericsson.com, svan@elvis.ru
-  RFC7792          ||      F. Zhang, X. Zhang, A. Farrel, O. Gonzalez de Dios, D. Ceccarelli         ||       zhangfatai@huawei.com, zhang.xian@huawei.com, adrian@olddog.co.uk, oscar.gonzalezdedios@telefonica.com, daniele.ceccarelli@ericsson.com
-  RFC7793          ||      M. Andrews         ||       marka@isc.org
-  RFC7794          ||      L. Ginsberg, Ed., B. Decraene, S. Previdi, X. Xu, U. Chunduri         ||       ginsberg@cisco.com, bruno.decraene@orange.com, sprevidi@cisco.com, xuxiaohu@huawei.com, uma.chunduri@ericsson.com
-  RFC7795          ||      J. Dong, H. Wang         ||       jie.dong@huawei.com, rainsword.wang@huawei.com
-  RFC7796          ||      Y. Jiang, Ed., L. Yong, M. Paul         ||       jiangyuanlong@huawei.com, lucyyong@huawei.com, Manuel.Paul@telekom.de
-  RFC7797          ||      M. Jones         ||       mbj@microsoft.com
-  RFC7798          ||      Y.-K. Wang, Y. Sanchez, T. Schierl, S. Wenger, M. M. Hannuksela         ||       yekui.wang@gmail.com, yago.sanchez@hhi.fraunhofer.de, thomas.schierl@hhi.fraunhofer.de, stewe@stewe.org, miska.hannuksela@nokia.com
-  RFC7799          ||      A. Morton         ||       acmorton@att.com
-  RFC7800          ||      M. Jones, J. Bradley, H. Tschofenig         ||       mbj@microsoft.com, ve7jtb@ve7jtb.com, Hannes.Tschofenig@gmx.net
-  RFC7801          ||      V. Dolmatov, Ed.         ||       dol@srcc.msu.ru
-  RFC7802          ||      S. Emery, N. Williams         ||       shawn.emery@oracle.com, nico@cryptonector.com
-  RFC7803          ||      B. Leiba         ||       barryleiba@computer.org
-  RFC7804          ||      A. Melnikov         ||       alexey.melnikov@isode.com
-  RFC7805          ||      A. Zimmermann, W. Eddy, L. Eggert         ||       alexander@zimmermann.eu.com, wes@mti-systems.com, lars@netapp.com
-  RFC7806          ||      F. Baker, R. Pan         ||       fred@cisco.com, ropan@cisco.com
-  RFC7807          ||      M. Nottingham, E. Wilde         ||       mnot@mnot.net, erik.wilde@dret.net
-  RFC7808          ||      M. Douglass, C. Daboo         ||       mdouglass@sphericalcowgroup.com, cyrus@daboo.name
-  RFC7809          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC7810          ||      S. Previdi, Ed., S. Giacalone, D. Ward, J. Drake, Q. Wu         ||       sprevidi@cisco.com, spencer.giacalone@gmail.com, wardd@cisco.com, jdrake@juniper.net, sunseawq@huawei.com
-  RFC7811          ||      G. Enyedi, A. Csaszar, A. Atlas, C. Bowers, A. Gopalan         ||       Gabor.Sandor.Enyedi@ericsson.com, Andras.Csaszar@ericsson.com, akatlas@juniper.net, cbowers@juniper.net, abishek@ece.arizona.edu
-  RFC7812          ||      A. Atlas, C. Bowers, G. Enyedi         ||       akatlas@juniper.net, cbowers@juniper.net, Gabor.Sandor.Enyedi@ericsson.com
-  RFC7813          ||      J. Farkas, Ed., N. Bragg, P. Unbehagen, G. Parsons, P. Ashwood-Smith, C. Bowers         ||       janos.farkas@ericsson.com, nbragg@ciena.com, unbehagen@avaya.com, glenn.parsons@ericsson.com, Peter.AshwoodSmith@huawei.com, cbowers@juniper.net
-  RFC7814          ||      X. Xu, C. Jacquenet, R. Raszuk, T. Boyes, B. Fee         ||       xuxiaohu@huawei.com, christian.jacquenet@orange.com, robert@raszuk.net, tboyes@bloomberg.net, bfee@extremenetworks.com
-  RFC7815          ||      T. Kivinen         ||       kivinen@iki.fi
-  RFC7816          ||      S. Bortzmeyer         ||       bortzmeyer+ietf@nic.fr
-  RFC7817          ||      A. Melnikov         ||       alexey.melnikov@isode.com
-  RFC7818          ||      M. Jethanandani         ||       mjethanandani@gmail.com
-  RFC7819          ||      S. Jiang, S. Krishnan, T. Mrugalski         ||       jiangsheng@huawei.com, suresh.krishnan@ericsson.com, tomasz.mrugalski@gmail.com
-  RFC7820          ||      T. Mizrahi         ||       talmi@marvell.com
-  RFC7821          ||      T. Mizrahi         ||       talmi@marvell.com
-  RFC7822          ||      T. Mizrahi, D. Mayer         ||       talmi@marvell.com, mayer@ntp.org
-  RFC7823          ||      A. Atlas, J. Drake, S. Giacalone, S. Previdi         ||       akatlas@juniper.net, jdrake@juniper.net, spencer.giacalone@gmail.com, sprevidi@cisco.com
-  RFC7824          ||      S. Krishnan, T. Mrugalski, S. Jiang         ||       suresh.krishnan@ericsson.com, tomasz.mrugalski@gmail.com, jiangsheng@huawei.com
-  RFC7825          ||      J. Goldberg, M. Westerlund, T. Zeng         ||       jgoldber@cisco.com, magnus.westerlund@ericsson.com, thomas.zeng@gmail.com
-  RFC7826          ||      H. Schulzrinne, A. Rao, R. Lanphier, M. Westerlund, M. Stiemerling, Ed.         ||       schulzrinne@cs.columbia.edu, anrao@cisco.com, robla@robla.net, magnus.westerlund@ericsson.com, mls.ietf@gmail.com
-  RFC7827          ||      L. Eggert         ||       lars@netapp.com
-  RFC7828          ||      P. Wouters, J. Abley, S. Dickinson, R. Bellis         ||       pwouters@redhat.com, jabley@dyn.com, sara@sinodun.com, ray@isc.org
-  RFC7829          ||      Y. Nishida, P. Natarajan, A. Caro, P. Amer, K. Nielsen         ||       nishida@wide.ad.jp, prenatar@cisco.com, acaro@bbn.com, amer@udel.edu, karen.nielsen@tieto.com
-  RFC7830          ||      A. Mayrhofer         ||       alex.mayrhofer.ietf@gmail.com
-  RFC7831          ||      J. Howlett, S. Hartman, H. Tschofenig, J. Schaad         ||       josh.howlett@ja.net, hartmans-ietf@mit.edu, Hannes.Tschofenig@gmx.net, ietf@augustcellars.com
-  RFC7832          ||      R. Smith, Ed.         ||       rhys.smith@jisc.ac.uk
-  RFC7833          ||      J. Howlett, S. Hartman, A. Perez-Mendez, Ed.         ||       josh.howlett@ja.net, hartmans-ietf@mit.edu, alex@um.es
-  RFC7834          ||      D. Saucez, L. Iannone, A. Cabellos, F. Coras         ||       damien.saucez@inria.fr, ggx@gigix.net, acabello@ac.upc.edu, fcoras@ac.upc.edu
-  RFC7835          ||      D. Saucez, L. Iannone, O. Bonaventure         ||       damien.saucez@inria.fr, ggx@gigix.net, Olivier.Bonaventure@uclouvain.be
-  RFC7836          ||      S. Smyshlyaev, Ed., E. Alekseev, I. Oshkin, V. Popov, S. Leontiev, V. Podobaev, D. Belyavsky         ||       svs@cryptopro.ru, alekseev@cryptopro.ru, oshkin@cryptopro.ru, vpopov@cryptopro.ru, lse@CryptoPro.ru, v_podobaev@factor-ts.ru, beldmit@gmail.com
-  RFC7837          ||      S. Krishnan, M. Kuehlewind, B. Briscoe, C. Ralli         ||       suresh.krishnan@ericsson.com, mirja.kuehlewind@tik.ee.ethz.ch, ietf@bobbriscoe.net, ralli@tid.es
-  RFC7838          ||      M. Nottingham, P. McManus, J. Reschke         ||       mnot@mnot.net, mcmanus@ducksong.com, julian.reschke@greenbytes.de
-  RFC7839          ||      S. Bhandari, S. Gundavelli, M. Grayson, B. Volz, J. Korhonen         ||       shwethab@cisco.com, sgundave@cisco.com, mgrayson@cisco.com, volz@cisco.com, jouni.nospam@gmail.com
-  RFC7840          ||      J. Winterbottom, H. Tschofenig, L. Liess         ||       a.james.winterbottom@gmail.com, Hannes.Tschofenig@gmx.net, L.Liess@telekom.de
-  RFC7841          ||      J. Halpern, Ed., L. Daigle, Ed., O. Kolkman, Ed.         ||       jmh@joelhalpern.com, ldaigle@thinkingcat.com, kolkman@isoc.org
-  RFC7842          ||      R. Sparks         ||       rjsparks@nostrum.com
-  RFC7843          ||      A. Ripke, R. Winter, T. Dietz, J. Quittek, R. da Silva         ||       ripke@neclab.eu, winter@neclab.eu, dietz@neclab.eu, quittek@neclab.eu, rafaelalejandro.lopezdasilva@telefonica.com
-  RFC7844          ||      C. Huitema, T. Mrugalski, S. Krishnan         ||       huitema@microsoft.com, tomasz.mrugalski@gmail.com, suresh.krishnan@ericsson.com
-  RFC7845          ||      T. Terriberry, R. Lee, R. Giles         ||       tterribe@xiph.org, ron@debian.org, giles@xiph.org
-  RFC7846          ||      R. Cruz, M. Nunes, J. Xia, R. Huang, Ed., J. Taveira, D. Lingli         ||       rui.cruz@ieee.org, mario.nunes@inov.pt, xiajinwei@huawei.com, rachel.huang@huawei.com, joao.silva@inov.pt, denglingli@chinamobile.com
-  RFC7847          ||      T. Melia, Ed., S. Gundavelli, Ed.         ||       telemaco.melia@gmail.com, sgundave@cisco.com
-  RFC7848          ||      G. Lozano         ||       gustavo.lozano@icann.org
-  RFC7849          ||      D. Binet, M. Boucadair, A. Vizdal, G. Chen, N. Heatley, R. Chandler, D. Michaud, D. Lopez, W. Haeffner         ||       david.binet@orange.com, mohamed.boucadair@orange.com, Ales.Vizdal@T-Mobile.cz, phdgang@gmail.com, nick.heatley@ee.co.uk, ross@eircom.net, dave.michaud@rci.rogers.com, diego.r.lopez@telefonica.com, walter.haeffner@vodafone.com
-  RFC7850          ||      S. Nandakumar         ||       snandaku@cisco.com
-  RFC7851          ||      H. Song, X. Jiang, R. Even, D. Bryan, Y. Sun         ||       haibin.song@huawei.com, jiangxingfeng@huawei.com, ron.even.tlv@gmail.com, dbryan@ethernot.org, sunyi@ict.ac.cn
-  RFC7852          ||      R. Gellens, B. Rosen, H. Tschofenig, R. Marshall, J. Winterbottom         ||       rg+ietf@randy.pensive.org, br@brianrosen.net, Hannes.Tschofenig@gmx.net, rmarshall@telecomsys.com, a.james.winterbottom@gmail.com
-  RFC7853          ||      S. Martin, S. Tuecke, B. McCollam, M. Lidman         ||       sjmartin@uchicago.edu, tuecke@globus.org, bmccollam@uchicago.edu, mattias@uchicago.edu<
-  RFC7854          ||      J. Scudder, Ed., R. Fernando, S. Stuart         ||       jgs@juniper.net, rex@cisco.com, sstuart@google.com
-  RFC7855          ||      S. Previdi, Ed., C. Filsfils, Ed., B. Decraene, S. Litkowski, M. Horneffer, R. Shakir         ||       sprevidi@cisco.com, cfilsfil@cisco.com, bruno.decraene@orange.com, stephane.litkowski@orange.com, Martin.Horneffer@telekom.de, rjs@rob.sh
-  RFC7856          ||      Y. Cui, J. Dong, P. Wu, M. Xu, A. Yla-Jaaski         ||       yong@csnet1.cs.tsinghua.edu.cn, knight.dongjiang@gmail.com, weapon9@gmail.com, xmw@cernet.edu.cn, antti.yla-jaaski@aalto.fi
-  RFC7857          ||      R. Penno, S. Perreault, M. Boucadair, Ed., S. Sivakumar, K. Naito         ||       repenno@cisco.com, sperreault@jive.com, mohamed.boucadair@orange.com, ssenthil@cisco.com, k.naito@nttv6.jp
-  RFC7858          ||      Z. Hu, L. Zhu, J. Heidemann, A. Mankin, D. Wessels, P. Hoffman         ||       zihu@outlook.com, liangzhu@usc.edu, johnh@isi.edu, allison.mankin@gmail.com, dwessels@verisign.com, paul.hoffman@icann.org
-  RFC7859          ||      C. Dearlove         ||       chris.dearlove@baesystems.com
-  RFC7860          ||      J. Merkle, Ed., M. Lochter         ||       johannes.merkle@secunet.com, manfred.lochter@bsi.bund.de
-  RFC7861          ||      A. Adamson, N. Williams         ||       andros@netapp.com, nico@cryptonector.com
-  RFC7862          ||      T. Haynes         ||       thomas.haynes@primarydata.com
-  RFC7863          ||      T. Haynes         ||       thomas.haynes@primarydata.com
-  RFC7864          ||      CJ. Bernardos, Ed.         ||       cjbc@it.uc3m.es
-  RFC7865          ||      R. Ravindranath, P. Ravindran, P. Kyzivat         ||       rmohanr@cisco.com, partha@parthasarathi.co.in, pkyzivat@alum.mit.edu
-  RFC7866          ||      L. Portman, H. Lum, Ed., C. Eckel, A. Johnston, A. Hutton         ||       leon.portman@gmail.com, henry.lum@genesyslab.com, eckelcu@cisco.com, alan.b.johnston@gmail.com, andrew.hutton@unify.com
-  RFC7867          ||      R. Huang         ||       rachel.huang@huawei.com
-  RFC7868          ||      D. Savage, J. Ng, S. Moore, D. Slice, P. Paluch, R. White         ||       dsavage@cisco.com, jamng@cisco.com, smoore@cisco.com, dslice@cumulusnetworks.com, peter.paluch@fri.uniza.sk, russ@riw.us
-  RFC7869          ||      D. Warden, I. Iordanov         ||       david_warden@dell.com, iiordanov@gmail.com
-  RFC7870          ||      Y. Fu, S. Jiang, J. Dong, Y. Chen         ||       fuyu@cnnic.cn, jiangsheng@huawei.com, knight.dongjiang@gmail.com, flashfoxmx@gmail.com
-  RFC7871          ||      C. Contavalli, W. van der Gaast, D. Lawrence, W. Kumari         ||       ccontavalli@google.com, wilmer@google.com, tale@akamai.com, warren@kumari.net
-  RFC7872          ||      F. Gont, J. Linkova, T. Chown, W. Liu         ||       fgont@si6networks.com, furry@google.com, tim.chown@jisc.ac.uk, liushucheng@huawei.com
-  RFC7873          ||      D. Eastlake 3rd, M. Andrews         ||       d3e3e3@gmail.com, marka@isc.org
-  RFC7874          ||      JM. Valin, C. Bran         ||       jmvalin@jmvalin.ca, cary.bran@plantronics.com
-  RFC7875          ||      S. Proust, Ed.         ||       stephane.proust@orange.com
-  RFC7876          ||      S. Bryant, S. Sivabalan, S. Soni         ||       stewart.bryant@gmail.com, msiva@cisco.com, sagsoni@cisco.com
-  RFC7877          ||      K. Cartwright, V. Bhatia, S. Ali, D. Schwartz         ||       kcartwright@tnsi.com, vbhatia@tnsi.com, syed.ali@neustar.biz, dschwartz@xconnect.net
-  RFC7878          ||      K. Cartwright, V. Bhatia, J-F. Mule, A. Mayrhofer         ||       kcartwright@tnsi.com, vbhatia@tnsi.com, jfmule@apple.com, alexander.mayrhofer@nic.at
-  RFC7879          ||      R. Ravindranath, T. Reddy, G. Salgueiro, V. Pascual, P. Ravindran         ||       rmohanr@cisco.com, tireddy@cisco.com, gsalguei@cisco.com, victor.pascual.avila@oracle.com, partha@parthasarathi.co.in
-  RFC7880          ||      C. Pignataro, D. Ward, N. Akiya, M. Bhatia, S. Pallagatti         ||       cpignata@cisco.com, wardd@cisco.com, nobo.akiya.dev@gmail.com, manav@ionosnetworks.com, santosh.pallagatti@gmail.com
-  RFC7881          ||      C. Pignataro, D. Ward, N. Akiya         ||       cpignata@cisco.com, wardd@cisco.com, nobo.akiya.dev@gmail.com
-  RFC7882          ||      S. Aldrin, C. Pignataro, G. Mirsky, N. Kumar         ||       aldrin.ietf@gmail.com, cpignata@cisco.com, gregory.mirsky@ericsson.com, naikumar@cisco.com
-  RFC7883          ||      L. Ginsberg, N. Akiya, M. Chen         ||       ginsberg@cisco.com, nobo.akiya.dev@gmail.com, mach.chen@huawei.com
-  RFC7884          ||      C. Pignataro, M. Bhatia, S. Aldrin, T. Ranganath         ||       cpignata@cisco.com, manav@ionosnetworks.com, aldrin.ietf@gmail.com, trilok.ranganatha@nokia.com
-  RFC7885          ||      V. Govindan, C. Pignataro         ||       venggovi@cisco.com, cpignata@cisco.com
-  RFC7886          ||      V. Govindan, C. Pignataro         ||       venggovi@cisco.com, cpignata@cisco.com
-  RFC7887          ||      S. Venaas, J. Arango, I. Kouvelas         ||       stig@cisco.com, jearango@cisco.com, kouvelas@arista.com
-  RFC7888          ||      A. Melnikov, Ed.         ||       alexey.melnikov@isode.com
-  RFC7889          ||      J. SrimushnamBoovaraghamoorthy, N. Bisht         ||       jayantheesh.sb@gmail.com, narendrasingh.bisht@gmail.com
-  RFC7890          ||      D. Bryan, P. Matthews, E. Shim, D. Willis, S. Dawkins         ||       dbryan@ethernot.org, philip_matthews@magma.ca, eunsooshim@gmail.com, dean.willis@softarmor.com, spencerdawkins.ietf@gmail.com
-  RFC7891          ||      J. Asghar, IJ. Wijnands, Ed., S. Krishnaswamy, A. Karan, V. Arya         ||       jasghar@cisco.com, ice@cisco.com, sowkrish@cisco.com, apoorva@cisco.com, varya@directv.com
-  RFC7892          ||      Z. Ali, A. Bonfanti, M. Hartley, F. Zhang         ||       zali@cisco.com, abonfant@cisco.com, mhartley@cisco.com, zhangfatai@huawei.com
-  RFC7893          ||      Y(J) Stein, D. Black, B. Briscoe         ||       yaakov_s@rad.com, david.black@emc.com, ietf@bobbriscoe.net
-  RFC7894          ||      M. Pritikin, C. Wallace         ||       pritikin@cisco.com, carl@redhoundsoftware.com
-  RFC7895          ||      A. Bierman, M. Bjorklund, K. Watsen         ||       andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net
-  RFC7896          ||      D. Dhody         ||       dhruv.ietf@gmail.com
-  RFC7897          ||      D. Dhody, U. Palle, R. Casellas         ||       dhruv.ietf@gmail.com, udayasree.palle@huawei.com, ramon.casellas@cttc.es
-  RFC7898          ||      D. Dhody, U. Palle, V. Kondreddy, R. Casellas         ||       dhruv.ietf@gmail.com, udayasree.palle@huawei.com, venugopalreddyk@huawei.com, ramon.casellas@cttc.es
-  RFC7899          ||      T. Morin, Ed., S. Litkowski, K. Patel, Z. Zhang, R. Kebler, J. Haas         ||       thomas.morin@orange.com, stephane.litkowski@orange.com, keyupate@cisco.com, zzhang@juniper.net, rkebler@juniper.net, jhaas@juniper.net
-  RFC7900          ||      Y. Rekhter, Ed., E. Rosen, Ed., R. Aggarwal, Y. Cai, T. Morin         ||       none, erosen@juniper.net, raggarwa_1@yahoo.com, yiqun.cai@alibaba-inc.com, thomas.morin@orange.com
-  RFC7901          ||      P. Wouters         ||       pwouters@redhat.com
-  RFC7902          ||      E. Rosen, T. Morin         ||       erosen@juniper.net, thomas.morin@orange.com
-  RFC7903          ||      S. Leonard         ||       dev+ietf@seantek.com
-  RFC7904          ||      C. Jennings, B. Lowekamp, E. Rescorla, S. Baset, H. Schulzrinne, T. Schmidt, Ed.         ||       fluffy@cisco.com, bbl@lowekamp.net, ekr@rtfm.com, sabaset@us.ibm.com, hgs@cs.columbia.edu, t.schmidt@haw-hamburg.de
-  RFC7905          ||      A. Langley, W. Chang, N. Mavrogiannopoulos, J. Strombergson, S. Josefsson         ||       agl@google.com, wtc@google.com, nmav@redhat.com, joachim@secworks.se, simon@josefsson.org
-  RFC7906          ||      P. Timmel, R. Housley, S. Turner         ||       pstimme@nsa.gov, housley@vigilsec.com, turners@ieca.com
-  RFC7908          ||      K. Sriram, D. Montgomery, D. McPherson, E. Osterweil, B. Dickson         ||       ksriram@nist.gov, dougm@nist.gov, dmcpherson@verisign.com, eosterweil@verisign.com, brian.peter.dickson@gmail.com
-  RFC7909          ||      R. Kisteleki, B. Haberman         ||       robert@ripe.net, brian@innovationslab.net
-  RFC7910          ||      W. Zhou         ||       zhouweiisu@gmail.com
-  RFC7911          ||      D. Walton, A. Retana, E. Chen, J. Scudder         ||       dwalton@cumulusnetworks.com, aretana@cisco.com, enkechen@cisco.com, jgs@juniper.net
-  RFC7912          ||      A. Melnikov         ||       alexey.melnikov@isode.com
-  RFC7913          ||      C. Holmberg         ||       christer.holmberg@ericsson.com
-  RFC7914          ||      C. Percival, S. Josefsson         ||       cperciva@tarsnap.com, simon@josefsson.org
-  RFC7915          ||      C. Bao, X. Li, F. Baker, T. Anderson, F. Gont         ||       congxiao@cernet.edu.cn, xing@cernet.edu.cn, fred@cisco.com, tore@redpill-linpro.com, fgont@si6networks.com
-  RFC7916          ||      S. Litkowski, Ed., B. Decraene, C. Filsfils, K. Raza, M. Horneffer, P. Sarkar         ||       stephane.litkowski@orange.com, bruno.decraene@orange.com, cfilsfil@cisco.com, skraza@cisco.com, Martin.Horneffer@telekom.de, pushpasis.ietf@gmail.com
-  RFC7917          ||      P. Sarkar, Ed., H. Gredler, S. Hegde, S. Litkowski, B. Decraene         ||       pushpasis.ietf@gmail.com, hannes@rtbrick.com, shraddha@juniper.net, stephane.litkowski@orange.com, bruno.decraene@orange.com
-  RFC7918          ||      A. Langley, N. Modadugu, B. Moeller         ||       agl@google.com, nagendra@cs.stanford.edu, bmoeller@acm.org
-  RFC7919          ||      D. Gillmor         ||       dkg@fifthhorseman.net
-  RFC7920          ||      A. Atlas, Ed., T. Nadeau, Ed., D. Ward         ||       akatlas@juniper.net, tnadeau@lucidvision.com, wardd@cisco.com
-  RFC7921          ||      A. Atlas, J. Halpern, S. Hares, D. Ward, T. Nadeau         ||       akatlas@juniper.net, joel.halpern@ericsson.com, shares@ndzh.com, wardd@cisco.com, tnadeau@lucidvision.com
-  RFC7922          ||      J. Clarke, G. Salgueiro, C. Pignataro         ||       jclarke@cisco.com, gsalguei@cisco.com, cpignata@cisco.com
-  RFC7923          ||      E. Voit, A. Clemm, A. Gonzalez Prieto         ||       evoit@cisco.com, alex@cisco.com, albertgo@cisco.com
-  RFC7924          ||      S. Santesson, H. Tschofenig         ||       sts@aaa-sec.com, Hannes.Tschofenig@gmx.net
-  RFC7925          ||      H. Tschofenig, Ed., T. Fossati         ||       Hannes.Tschofenig@gmx.net, thomas.fossati@nokia.com
-  RFC7926          ||      A. Farrel, Ed., J. Drake, N. Bitar, G. Swallow, D. Ceccarelli, X. Zhang         ||       adrian@olddog.co.uk, jdrake@juniper.net, nbitar40@gmail.com, swallow@cisco.com, daniele.ceccarelli@ericsson.com, zhang.xian@huawei.com
-  RFC7927          ||      D. Kutscher, Ed., S. Eum, K. Pentikousis, I. Psaras, D. Corujo, D. Saucez, T. Schmidt, M. Waehlisch         ||       kutscher@neclab.eu, suyong@ist.osaka-u.ac.jp, k.pentikousis@travelping.com, i.psaras@ucl.ac.uk, dcorujo@av.it.pt, damien.saucez@inria.fr, t.schmidt@haw-hamburg.de, waehlisch@ieee.org
-  RFC7928          ||      N. Kuhn, Ed., P. Natarajan, Ed., N. Khademi, Ed., D. Ros         ||       nicolas.kuhn@cnes.fr, prenatar@cisco.com, naeemk@ifi.uio.no, dros@simula.no
-  RFC7929          ||      P. Wouters         ||       pwouters@redhat.com
-  RFC7930          ||      S. Hartman         ||       hartmans-ietf@mit.edu
-  RFC7931          ||      D. Noveck, Ed., P. Shivam, C. Lever, B. Baker         ||       davenoveck@gmail.com, piyush.shivam@oracle.com, chuck.lever@oracle.com, bill.baker@oracle.com
-  RFC7932          ||      J. Alakuijala, Z. Szabadka         ||       jyrki@google.com, szabadka@google.com
-  RFC7933          ||      C. Westphal, Ed., S. Lederer, D. Posch, C. Timmerer, A. Azgin, W. Liu, C. Mueller, A. Detti, D. Corujo, J. Wang, M. Montpetit, N. Murray         ||       Cedric.Westphal@huawei.com, stefan.lederer@itec.aau.at, daniel.posch@itec.aau.at, christian.timmerer@itec.aau.at, aytac.azgin@huawei.com, liushucheng@huawei.com, christopher.mueller@bitmovin.net, andrea.detti@uniroma2.it, dcorujo@av.it.pt, jianwang@cityu.edu.hk, marie@mjmontpetit.com, nmurray@research.ait.ie
-  RFC7934          ||      L. Colitti, V. Cerf, S. Cheshire, D. Schinazi         ||       lorenzo@google.com, vint@google.com, cheshire@apple.com, dschinazi@apple.com
-  RFC7935          ||      G. Huston, G. Michaelson, Ed.         ||       gih@apnic.net, ggm@apnic.net
-  RFC7936          ||      T. Hardie         ||       ted.ietf@gmail.com
-  RFC7937          ||      F. Le Faucheur, Ed., G. Bertrand, Ed., I. Oprescu, Ed., R. Peterkofsky         ||       flefauch@gmail.com, gilbertrand@gmail.com, iuniana.oprescu@gmail.com, peterkofsky@google.com
-  RFC7938          ||      P. Lapukhov, A. Premji, J. Mitchell, Ed.         ||       petr@fb.com, ariff@arista.com, jrmitche@puck.nether.net
-  RFC7939          ||      U. Herberg, R. Cole, I. Chakeres, T. Clausen         ||       ulrich@herberg.name, rgcole01@comcast.net, ian.chakeres@gmail.com, T.Clausen@computer.org
-  RFC7940          ||      K. Davies, A. Freytag         ||       kim.davies@icann.org, asmus@unicode.org
-  RFC7941          ||      M. Westerlund, B. Burman, R. Even, M. Zanaty         ||       magnus.westerlund@ericsson.com, bo.burman@ericsson.com, roni.even@mail01.huawei.com, mzanaty@cisco.com
-  RFC7942          ||      Y. Sheffer, A. Farrel         ||       yaronf.ietf@gmail.com, adrian@olddog.co.uk
-  RFC7943          ||      F. Gont, W. Liu         ||       fgont@si6networks.com, liushucheng@huawei.com
-  RFC7944          ||      S. Donovan         ||       srdonovan@usdonovans.com
-  RFC7945          ||      K. Pentikousis, Ed., B. Ohlman, E. Davies, S. Spirou, G. Boggia         ||       k.pentikousis@travelping.com, Borje.Ohlman@ericsson.com, davieseb@scss.tcd.ie, spis@intracom-telecom.com, g.boggia@poliba.it
-  RFC7946          ||      H. Butler, M. Daly, A. Doyle, S. Gillies, S. Hagen, T. Schaub         ||       howard@hobu.co, martin.daly@cadcorp.com, adoyle@intl-interfaces.com, sean.gillies@gmail.com, stefan@hagen.link, tim.schaub@gmail.com
-  RFC7947          ||      E. Jasinska, N. Hilliard, R. Raszuk, N. Bakker         ||       elisa@bigwaveit.org, nick@inex.ie, robert@raszuk.net, nbakker@akamai.com
-  RFC7948          ||      N. Hilliard, E. Jasinska, R. Raszuk, N. Bakker         ||       nick@inex.ie, elisa@bigwaveit.org, robert@raszuk.net, nbakker@akamai.com
-  RFC7949          ||      I. Chen, A. Lindem, R. Atkinson         ||       ichen@kuatrotech.com, acee@cisco.com, rja.lists@gmail.com
-  RFC7950          ||      M. Bjorklund, Ed.         ||       mbj@tail-f.com
-  RFC7951          ||      L. Lhotka         ||       lhotka@nic.cz
-  RFC7952          ||      L. Lhotka         ||       lhotka@nic.cz
-  RFC7953          ||      C. Daboo, M. Douglass         ||       cyrus@daboo.name, mdouglass@sphericalcowgroup.com
-  RFC7954          ||      L. Iannone, D. Lewis, D. Meyer, V. Fuller         ||       ggx@gigix.net, darlewis@cisco.com, dmm@1-4-5.net, vaf@vaf.net
-  RFC7955          ||      L. Iannone, R. Jorgensen, D. Conrad, G. Huston         ||       ggx@gigix.net, rogerj@gmail.com, drc@virtualized.org, gih@apnic.net
-  RFC7956          ||      W. Hao, Y. Li, A. Qu, M. Durrani, P. Sivamurugan         ||       haoweiguo@huawei.com, liyizhou@huawei.com, laodulaodu@gmail.com, mdurrani@equinix.com, ponkarthick.sivamurugan@ipinfusion.com
-  RFC7957          ||      B. Campbell, Ed., A. Cooper, B. Leiba         ||       ben@nostrum.com, alcoop@cisco.com, barryleiba@computer.org
-  RFC7958          ||      J. Abley, J. Schlyter, G. Bailey, P. Hoffman         ||       jabley@dyn.com, jakob@kirei.se, guillaumebailey@outlook.com, paul.hoffman@icann.org
-  RFC7959          ||      C. Bormann, Z. Shelby, Ed.         ||       cabo@tzi.org, zach.shelby@arm.com
-  RFC7960          ||      F. Martin, Ed., E. Lear, Ed., T. Draegen. Ed., E. Zwicky, Ed., K. Andersen, Ed.         ||       fmartin@linkedin.com, lear@cisco.com, tim@dmarcian.com, zwicky@yahoo-inc.com, kandersen@linkedin.com
-  RFC7961          ||      D. Eastlake 3rd, L. Yizhou         ||       d3e3e3@gmail.com, liyizhou@huawei.com
-  RFC7962          ||      J. Saldana, Ed., A. Arcia-Moret, B. Braem, E. Pietrosemoli, A. Sathiaseelan, M. Zennaro         ||       jsaldana@unizar.es, andres.arcia@cl.cam.ac.uk, bart.braem@iminds.be, ermanno@ictp.it, arjuna.sathiaseelan@cl.cam.ac.uk, mzennaro@ictp.it
-  RFC7963          ||      Z. Ali, A. Bonfanti, M. Hartley, F. Zhang         ||       zali@cisco.com, abonfant@cisco.com, mhartley@cisco.com, zhangfatai@huawei.com
-  RFC7964          ||      D. Walton, A. Retana, E. Chen, J. Scudder         ||       dwalton@cumulusnetworks.com, aretana@cisco.com, enkechen@cisco.com, jgs@juniper.net
-  RFC7965          ||      M. Chen, W. Cao, A. Takacs, P. Pan         ||       mach.chen@huawei.com, wayne.caowei@huawei.com, attila.takacs@ericsson.com, none
-  RFC7966          ||      H. Tschofenig, J. Korhonen, Ed., G. Zorn, K. Pillay         ||       Hannes.tschofenig@gmx.net, jouni.nospam@gmail.com, glenzorn@gmail.com, kervin.pillay@gmail.com
-  RFC7967          ||      A. Bhattacharyya, S. Bandyopadhyay, A. Pal, T. Bose         ||       abhijan.bhattacharyya@tcs.com, soma.bandyopadhyay@tcs.com, arpan.pal@tcs.com, tulika.bose@tcs.com
-  RFC7968          ||      Y. Li, D. Eastlake 3rd, W. Hao, H. Chen, S. Chatterjee         ||       liyizhou@huawei.com, d3e3e3@gmail.com, haoweiguo@huawei.com, philips.chenhao@huawei.com, somnath.chatterjee01@gmail.com
-  RFC7969          ||      T. Lemon, T. Mrugalski         ||       ted.lemon@nominum.com, tomasz.mrugalski@gmail.com
-  RFC7970          ||      R. Danyliw         ||       rdd@cert.org
-  RFC7971          ||      M. Stiemerling, S. Kiesel, M. Scharf, H. Seidel, S. Previdi         ||       mls.ietf@gmail.com, ietf-alto@skiesel.de, michael.scharf@nokia.com, hseidel@benocs.com, sprevidi@cisco.com
-  RFC7972          ||      P. Lemieux         ||       pal@sandflow.com
-  RFC7973          ||      R. Droms, P. Duffy         ||       rdroms.ietf@gmail.com, paduffy@cisco.com
-  RFC7974          ||      B. Williams, M. Boucadair, D. Wing         ||       brandon.williams@akamai.com, mohamed.boucadair@orange.com, dwing-ietf@fuggles.com
-  RFC7975          ||      B. Niven-Jenkins, Ed., R. van Brandenburg, Ed.         ||       ben.niven-jenkins@nokia.com, ray.vanbrandenburg@tno.nl
-  RFC7976          ||      C. Holmberg, N. Biondic, G. Salgueiro         ||       christer.holmberg@ericsson.com, nevenka.biondic@ericsson.com, gsalguei@cisco.com
-  RFC7977          ||      P. Dunkley, G. Llewellyn, V. Pascual, G. Salgueiro, R. Ravindranath         ||       peter.dunkley@xura.com, gavin.llewellyn@xura.com, victor.pascual.avila@oracle.com, gsalguei@cisco.com, rmohanr@cisco.com
-  RFC7978          ||      D. Eastlake 3rd, M. Umair, Y. Li         ||       d3e3e3@gmail.com, mohammed.umair2@gmail.com, liyizhou@huawei.com
-  RFC7979          ||      E. Lear, Ed., R. Housley, Ed.         ||       lear@cisco.com, housley@vigilsec.com
-  RFC7980          ||      M. Behringer, A. Retana, R. White, G. Huston         ||       mbehring@cisco.com, aretana@cisco.com, russw@riw.us, gih@apnic.net
-  RFC7981          ||      L. Ginsberg, S. Previdi, M. Chen         ||       ginsberg@cisco.com, sprevidi@cisco.com, mach.chen@huawei.com
-  RFC7982          ||      P. Martinsen, T. Reddy, D. Wing, V. Singh         ||       palmarti@cisco.com, tireddy@cisco.com, dwing-ietf@fuggles.com, varun@callstats.io
-  RFC7983          ||      M. Petit-Huguenin, G. Salgueiro         ||       marc@petit-huguenin.org, gsalguei@cisco.com
-  RFC7984          ||      O. Johansson, G. Salgueiro, V. Gurbani, D. Worley, Ed.         ||       oej@edvina.net, gsalguei@cisco.com, vkg@bell-labs.com, worley@ariadne.com
-  RFC7985          ||      J. Yi, T. Clausen, U. Herberg         ||       jiazi@jiaziyi.com, T.Clausen@computer.org, ulrich@herberg.name
-  RFC7986          ||      C. Daboo         ||       cyrus@daboo.name
-  RFC7987          ||      L. Ginsberg, P. Wells, B. Decraene, T. Przygienda, H. Gredler         ||       ginsberg@cisco.com, pauwells@cisco.com, bruno.decraene@orange.com, prz@juniper.net, hannes@rtbrick.com
-  RFC7988          ||      E. Rosen, Ed., K. Subramanian, Z. Zhang         ||       erosen@juniper.net, karthik@sproute.com, zzhang@juniper.net
-  RFC7989          ||      P. Jones, G. Salgueiro, C. Pearce, P. Giralt         ||       paulej@packetizer.com, gsalguei@cisco.com, chrep@cisco.com, pgiralt@cisco.com
-  RFC7990          ||      H. Flanagan         ||       rse@rfc-editor.org
-  RFC7991          ||      P. Hoffman         ||       paul.hoffman@icann.org
-  RFC7992          ||      J. Hildebrand, Ed., P. Hoffman         ||       joe-ietf@cursive.net, paul.hoffman@icann.org
-  RFC7993          ||      H. Flanagan         ||       rse@rfc-editor.org
-  RFC7994          ||      H. Flanagan         ||       rse@rfc-editor.org
-  RFC7995          ||      T. Hansen, Ed., L. Masinter, M. Hardy         ||       tony@att.com, masinter@adobe.com, mahardy@adobe.com
-  RFC7996          ||      N. Brownlee         ||       n.brownlee@auckland.ac.nz
-  RFC7997          ||      H. Flanagan, Ed.         ||       rse@rfc-editor.org
-  RFC7998          ||      P. Hoffman, J. Hildebrand         ||       paul.hoffman@icann.org, joe-ietf@cursive.net
-  RFC7999          ||      T. King, C. Dietzel, J. Snijders, G. Doering, G. Hankins         ||       thomas.king@de-cix.net, christoph.dietzel@de-cix.net, job@ntt.net, gert@space.net, greg.hankins@nokia.com
-  RFC8000          ||      A. Adamson, N. Williams         ||       andros@netapp.com, nico@cryptonector.com
-  RFC8001          ||      F. Zhang, Ed., O. Gonzalez de Dios, Ed., C. Margaria, M. Hartley, Z. Ali         ||       zhangfatai@huawei.com, oscar.gonzalezdedios@telefonica.com, cmargaria@juniper.net, mhartley@cisco.com, zali@cisco.com
-  RFC8002          ||      T. Heer, S. Varjonen         ||       heer@hs-albsig.de, samu.varjonen@helsinki.fi
-  RFC8003          ||      J. Laganier, L. Eggert         ||       julien.ietf@gmail.com, lars@netapp.com
-  RFC8004          ||      J. Laganier, L. Eggert         ||       julien.ietf@gmail.com, lars@netapp.com
-  RFC8005          ||      J. Laganier         ||       julien.ietf@gmail.com
-  RFC8006          ||      B. Niven-Jenkins, R. Murray, M. Caulfield, K. Ma         ||       ben.niven-jenkins@nokia.com, rob.murray@nokia.com, mcaulfie@cisco.com, kevin.j.ma@ericsson.com
-  RFC8007          ||      R. Murray, B. Niven-Jenkins         ||       rob.murray@nokia.com, ben.niven-jenkins@nokia.com
-  RFC8008          ||      J. Seedorf, J. Peterson, S. Previdi, R. van Brandenburg, K. Ma         ||       jan.seedorf@hft-stuttgart.de, jon.peterson@neustar.biz, sprevidi@cisco.com, ray.vanbrandenburg@tno.nl, kevin.j.ma@ericsson.com
-  RFC8009          ||      M. Jenkins, M. Peck, K. Burgin         ||       mjjenki@tycho.ncsc.mil, mpeck@mitre.org, kelley.burgin@gmail.com
-  RFC8010          ||      M. Sweet, I. McDonald         ||       msweet@apple.com, blueroofmusic@gmail.com
-  RFC8011          ||      M. Sweet, I. McDonald         ||       msweet@apple.com, blueroofmusic@gmail.com
-  RFC8012          ||      N. Akiya, G. Swallow, C. Pignataro, A. Malis, S. Aldrin         ||       nobo.akiya.dev@gmail.com, swallow@cisco.com, cpignata@cisco.com, agmalis@gmail.com, aldrin.ietf@gmail.com
-  RFC8013          ||      D. Joachimpillai, J. Hadi Salim         ||       damascene.joachimpillai@verizon.com, hadi@mojatatu.com
-  RFC8014          ||      D. Black, J. Hudson, L. Kreeger, M. Lasserre, T. Narten         ||       david.black@dell.com, jon.hudson@gmail.com, lkreeger@gmail.com, mmlasserre@gmail.com, narten@us.ibm.com
-  RFC8015          ||      V. Singh, C. Perkins, A. Clark, R. Huang         ||       varun@callstats.io, csp@csperkins.org, alan.d.clark@telchemy.com, Rachel@huawei.com
-  RFC8016          ||      T. Reddy, D. Wing, P. Patil, P. Martinsen         ||       tireddy@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com, palmarti@cisco.com
-  RFC8017          ||      K. Moriarty, Ed., B. Kaliski, J. Jonsson, A. Rusch         ||       Kathleen.Moriarty@emc.com, bkaliski@verisign.com, jakob.jonsson@subset.se, andreas.rusch@rsa.com
-  RFC8018          ||      K. Moriarty, Ed., B. Kaliski, A. Rusch         ||       Kathleen.Moriarty@Dell.com, bkaliski@verisign.com, andreas.rusch@rsa.com
-  RFC8019          ||      Y. Nir, V. Smyslov         ||       ynir.ietf@gmail.com, svan@elvis.ru
-  RFC8020          ||      S. Bortzmeyer, S. Huque         ||       bortzmeyer+ietf@nic.fr, shuque@verisign.com
-  RFC8021          ||      F. Gont, W. Liu, T. Anderson         ||       fgont@si6networks.com, liushucheng@huawei.com, tore@redpill-linpro.com
-  RFC8022          ||      L. Lhotka, A. Lindem         ||       lhotka@nic.cz, acee@cisco.com
-  RFC8023          ||      M. Thomas, A. Mankin, L. Zhang         ||       mthomas@verisign.com, allison.mankin@gmail.com, lixia@cs.ucla.edu
-  RFC8024          ||      Y. Jiang, Ed., Y. Luo, E. Mallette, Ed., Y. Shen, W. Cheng         ||       jiangyuanlong@huawei.com, dennis.luoyong@huawei.com, edwin.mallette@gmail.com, yshen@juniper.net, chengweiqiang@chinamobile.com
-  RFC8025          ||      P. Thubert, Ed., R. Cragie         ||       pthubert@cisco.com, robert.cragie@gridmerge.com
-  RFC8026          ||      M. Boucadair, I. Farrer         ||       mohamed.boucadair@orange.com, ian.farrer@telekom.de
-  RFC8027          ||      W. Hardaker, O. Gudmundsson, S. Krishnaswamy         ||       ietf@hardakers.net, olafur+ietf@cloudflare.com, suresh@tislabs.com
-  RFC8028          ||      F. Baker, B. Carpenter         ||       fredbaker.ietf@gmail.com, brian.e.carpenter@gmail.com
-  RFC8029          ||      K. Kompella, G. Swallow, C. Pignataro, Ed., N. Kumar, S. Aldrin, M. Chen         ||       kireeti.kompella@gmail.com, swallow.ietf@gmail.com, cpignata@cisco.com, naikumar@cisco.com, aldrin.ietf@gmail.com, mach.chen@huawei.com
-  RFC8030          ||      M. Thomson, E. Damaggio, B. Raymor, Ed.         ||       martin.thomson@gmail.com, elioda@microsoft.com, brian.raymor@microsoft.com
-  RFC8031          ||      Y. Nir, S. Josefsson         ||       ynir.ietf@gmail.com, simon@josefsson.org
-  RFC8032          ||      S. Josefsson, I. Liusvaara         ||       simon@josefsson.org, ilariliusvaara@welho.com
-  RFC8033          ||      R. Pan, P. Natarajan, F. Baker, G. White         ||       ropan@cisco.com, prenatar@cisco.com, fredbaker.ietf@gmail.com, g.white@cablelabs.com
-  RFC8034          ||      G. White, R. Pan         ||       g.white@cablelabs.com, ropan@cisco.com
-  RFC8035          ||      C. Holmberg         ||       christer.holmberg@ericsson.com
-  RFC8036          ||      N. Cam-Winget, Ed., J. Hui, D. Popa         ||       ncamwing@cisco.com, jonhui@nestlabs.com, daniel.popa@itron.com
-  RFC8037          ||      I. Liusvaara         ||       ilariliusvaara@welho.com
-  RFC8039          ||      A. Shpiner, R. Tse, C. Schelp, T. Mizrahi         ||       alexshp@mellanox.com, Richard.Tse@microsemi.com, craig.schelp@oracle.com, talmi@marvell.com
-  RFC8040          ||      A. Bierman, M. Bjorklund, K. Watsen         ||       andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net
-  RFC8041          ||      O. Bonaventure, C. Paasch, G. Detal         ||       Olivier.Bonaventure@uclouvain.be, cpaasch@apple.com, gregory.detal@tessares.net
-  RFC8042          ||      Z. Zhang, L. Wang, A. Lindem         ||       zzhang@juniper.net, liliw@juniper.net, acee@cisco.com
-  RFC8043          ||      B. Sarikaya, M. Boucadair         ||       sarikaya@ieee.org, mohamed.boucadair@orange.com
-  RFC8044          ||      A. DeKok         ||       aland@freeradius.org
-  RFC8045          ||      D. Cheng, J. Korhonen, M. Boucadair, S. Sivakumar         ||       dean.cheng@huawei.com, jouni.nospam@gmail.com, mohamed.boucadair@orange.com, ssenthil@cisco.com
-  RFC8046          ||      T. Henderson, Ed., C. Vogt, J. Arkko         ||       tomhend@u.washington.edu, mail@christianvogt.net, jari.arkko@piuha.net
-  RFC8047          ||      T. Henderson, Ed., C. Vogt, J. Arkko         ||       tomhend@u.washington.edu, mail@christianvogt.net, jari.arkko@piuha.net
-  RFC8048          ||      P. Saint-Andre         ||       peter@filament.com
-  RFC8049          ||      S. Litkowski, L. Tomotaki, K. Ogaki         ||       stephane.litkowski@orange.com, luis.tomotaki@verizon.com, ke-oogaki@kddi.com
-  RFC8051          ||      X. Zhang, Ed., I. Minei, Ed.         ||       zhang.xian@huawei.com, inaminei@google.com
-  RFC8053          ||      Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku         ||       y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, maeda@lepidum.co.jp, hayashi@lepidum.co.jp, mutual-work@ioku.org
-  RFC8054          ||      K. Murchison, J. Elie         ||       murch@andrew.cmu.edu, julien@trigofacile.com
-  RFC8055          ||      C. Holmberg, Y. Jiang         ||       christer.holmberg@ericsson.com, jiangyi@chinamobile.com
-  RFC8056          ||      J. Gould         ||       jgould@verisign.com
-  RFC8057          ||      B. Stark, D. Sinicrope, W. Lupton         ||       barbara.stark@att.com, david.sinicrope@ericsson.com, wlupton@broadband-forum.org
-  RFC8058          ||      J. Levine, T. Herkula         ||       standards@taugh.com, t.herkula@optivo.com
-  RFC8059          ||      J. Arango, S. Venaas, I. Kouvelas, D. Farinacci         ||       jearango@cisco.com, stig@cisco.com, kouvelas@arista.com, farinacci@gmail.com
-  RFC8060          ||      D. Farinacci, D. Meyer, J. Snijders         ||       farinacci@gmail.com, dmm@1-4-5.net, job@ntt.net
-  RFC8061          ||      D. Farinacci, B. Weis         ||       farinacci@gmail.com, bew@cisco.com
-  RFC8062          ||      L. Zhu, P. Leach, S. Hartman, S. Emery, Ed.         ||       larry.zhu@microsoft.com, pauljleach@msn.com, hartmans-ietf@mit.edu, shawn.emery@gmail.com
-  RFC8063          ||      H.W. Ribbers, M.W. Groeneweg, R. Gieben, A.L.J. Verschuren         ||       rik.ribbers@sidn.nl, marc.groeneweg@sidn.nl, miek@miek.nl, ietf@antoin.nl
-  RFC8064          ||      F. Gont, A. Cooper, D. Thaler, W. Liu         ||       fgont@si6networks.com, alcoop@cisco.com, dthaler@microsoft.com, liushucheng@huawei.com
-  RFC8065          ||      D. Thaler         ||       dthaler@microsoft.com
-  RFC8066          ||      S. Chakrabarti, G. Montenegro, R. Droms, J. Woodyatt         ||       samitac.ietf@gmail.com, Gabriel.Montenegro@microsoft.com, rdroms.ietf@gmail.com, jhw@google.com
-  RFC8067          ||      B. Leiba         ||       barryleiba@computer.org
-  RFC8068          ||      R. Ravindranath, P. Ravindran, P. Kyzivat         ||       rmohanr@cisco.com, partha@parthasarathi.co.in, pkyzivat@alum.mit.edu
-  RFC8069          ||      A. Thomas         ||       a.n.thomas@ieee.org
-  RFC8070          ||      M. Short, Ed., S. Moore, P. Miller         ||       michikos@microsoft.com, sethmo@microsoft.com, paumil@microsoft.com
-  RFC8071          ||      K. Watsen         ||       kwatsen@juniper.net
-  RFC8072          ||      A. Bierman, M. Bjorklund, K. Watsen         ||       andy@yumaworks.com, mbj@tail-f.com, kwatsen@juniper.net
-  RFC8073          ||      K. Moriarty, M. Ford         ||       Kathleen.Moriarty@dell.com, ford@isoc.org
-  RFC8074          ||      J. Bi, G. Yao, J. Halpern, E. Levy-Abegnoli, Ed.         ||       junbi@tsinghua.edu.cn, yaoguang.china@gmail.com, joel.halpern@ericsson.com, elevyabe@cisco.com
-  RFC8075          ||      A. Castellani, S. Loreto, A. Rahman, T. Fossati, E. Dijk         ||       angelo@castellani.net, Salvatore.Loreto@ericsson.com, Akbar.Rahman@InterDigital.com, thomas.fossati@nokia.com, esko.dijk@philips.com
-  RFC8076          ||      A. Knauf, T. Schmidt, Ed., G. Hege, M. Waehlisch         ||       alexanderknauf@gmail.com, t.schmidt@haw-hamburg.de, hege@daviko.com, mw@link-lab.net
-  RFC8077          ||      L. Martini, Ed., G. Heron, Ed.         ||       lmartini@monoski.com, giheron@cisco.com
-  RFC8078          ||      O. Gudmundsson, P. Wouters         ||       olafur+ietf@cloudflare.com, pwouters@redhat.com
-  RFC8079          ||      L. Miniero, S. Garcia Murillo, V. Pascual         ||       lorenzo@meetecho.com, sergio.garcia.murillo@gmail.com, victor.pascual.avila@oracle.com
-  RFC8080          ||      O. Sury, R. Edmonds         ||       ondrej.sury@nic.cz, edmonds@mycre.ws
-  RFC8081          ||      C. Lilley         ||       chris@w3.org
-  RFC8082          ||      S. Wenger, J. Lennox, B. Burman, M. Westerlund         ||       stewe@stewe.org, jonathan@vidyo.com, bo.burman@ericsson.com, magnus.westerlund@ericsson.com
-  RFC8083          ||      C. Perkins, V. Singh         ||       csp@csperkins.org, varun@callstats.io
-  RFC8084          ||      G. Fairhurst         ||       gorry@erg.abdn.ac.uk
-  RFC8085          ||      L. Eggert, G. Fairhurst, G. Shepherd         ||       lars@netapp.com, gorry@erg.abdn.ac.uk, gjshep@gmail.com
-  RFC8086          ||      L. Yong, Ed., E. Crabbe, X. Xu, T. Herbert         ||       lucy.yong@huawei.com, edward.crabbe@gmail.com, xuxiaohu@huawei.com, tom@herbertland.com
-  RFC8087          ||      G. Fairhurst, M. Welzl         ||       gorry@erg.abdn.ac.uk, michawe@ifi.uio.no
-  RFC8089          ||      M. Kerwin         ||       matthew.kerwin@qut.edu.au
-  RFC8090          ||      R. Housley         ||       housley@vigilsec.com
-  RFC8091          ||      E. Wilde         ||       erik.wilde@dret.net
-  RFC8092          ||      J. Heitz, Ed., J. Snijders, Ed., K. Patel, I. Bagdonas, N. Hilliard         ||       jheitz@cisco.com, job@ntt.net, keyur@arrcus.com, ibagdona.ietf@gmail.com, nick@inex.ie
-  RFC8093          ||      J. Snijders         ||       job@ntt.net
-  RFC8094          ||      T. Reddy, D. Wing, P. Patil         ||       tireddy@cisco.com, dwing-ietf@fuggles.com, praspati@cisco.com
-  RFC8095          ||      G. Fairhurst, Ed., B. Trammell, Ed., M. Kuehlewind, Ed.         ||       gorry@erg.abdn.ac.uk, ietf@trammell.ch, mirja.kuehlewind@tik.ee.ethz.ch
-  RFC8096          ||      B. Fenner         ||       fenner@fenron.com
-  RFC8097          ||      P. Mohapatra, K. Patel, J. Scudder, D. Ward, R. Bush         ||       mpradosh@yahoo.com, keyur@arrcus.com, jgs@juniper.net, dward@cisco.com, randy@psg.com
-  RFC8098          ||      T. Hansen, Ed., A. Melnikov, Ed.         ||       tony@att.com, alexey.melnikov@isode.com
-  RFC8099          ||      H. Chen, R. Li, A. Retana, Y. Yang, Z. Liu         ||       huaimo.chen@huawei.com, renwei.li@huawei.com, aretana@cisco.com, yyang1998@gmail.com, liu.cmri@gmail.com
-  RFC8100          ||      R. Geib, Ed., D. Black         ||       Ruediger.Geib@telekom.de, david.black@dell.com
-  RFC8101          ||      C. Holmberg, J. Axell         ||       christer.holmberg@ericsson.com, jorgen.axell@ericsson.com
-  RFC8102          ||      P. Sarkar, Ed., S. Hegde, C. Bowers, H. Gredler, S. Litkowski         ||       pushpasis.ietf@gmail.com, shraddha@juniper.net, cbowers@juniper.net, hannes@rtbrick.com, stephane.litkowski@orange.com
-  RFC8103          ||      R. Housley         ||       housley@vigilsec.com
-  RFC8104          ||      Y. Shen, R. Aggarwal, W. Henderickx, Y. Jiang         ||       yshen@juniper.net, raggarwa_1@yahoo.com, wim.henderickx@nokia.com, jiangyuanlong@huawei.com
-  RFC8106          ||      J. Jeong, S. Park, L. Beloeil, S. Madanapalli         ||       pauljeong@skku.edu, soohong.park@samsung.com, luc.beloeil@orange.com, smadanapalli@gmail.com
-  RFC8107          ||      J. Wold         ||       jwold@ad-id.org
-  RFC8108          ||      J. Lennox, M. Westerlund, Q. Wu, C. Perkins         ||       jonathan@vidyo.com, magnus.westerlund@ericsson.com, bill.wu@huawei.com, csp@csperkins.org
-  RFC8109          ||      P. Koch, M. Larson, P. Hoffman         ||       pk@DENIC.DE, matt.larson@icann.org, paul.hoffman@icann.org
-  RFC8110          ||      D. Harkins, Ed., W. Kumari, Ed.         ||       dharkins@arubanetworks.com, warren@kumari.net
-  RFC8113          ||      M. Boucadair, C. Jacquenet         ||       mohamed.boucadair@orange.com, christian.jacquenet@orange.com
-  RFC8114          ||      M. Boucadair, C. Qin, C. Jacquenet, Y. Lee, Q. Wang         ||       mohamed.boucadair@orange.com, jacni@jacni.com, christian.jacquenet@orange.com, yiu_lee@cable.comcast.com, 13301168516@189.cn
-  RFC8115          ||      M. Boucadair, J. Qin, T. Tsou, X. Deng         ||       mohamed.boucadair@orange.com, jacni@jacni.com, tina.tsou@philips.com, dxhbupt@gmail.com
-  RFC8117          ||      C. Huitema, D. Thaler, R. Winter         ||       huitema@huitema.net, dthaler@microsoft.com, rolf.winter@hs-augsburg.de
-  RFC8118          ||      M. Hardy, L. Masinter, D. Markovic, D. Johnson, M. Bailey         ||       mahardy@adobe.com, masinter@adobe.com, dmarkovi@adobe.com, duff.johnson@pdfa.org, martin.bailey@globalgraphics.com
-  RFC8119          ||      M. Mohali, M. Barnes         ||       marianne.mohali@orange.com, mary.ietf.barnes@gmail.com
-  RFC8120          ||      Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku         ||       y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, kaorumaeda.ml@gmail.com, hayashi@lepidum.co.jp, mutual-work@ioku.org
-  RFC8121          ||      Y. Oiwa, H. Watanabe, H. Takagi, K. Maeda, T. Hayashi, Y. Ioku         ||       y.oiwa@aist.go.jp, h-watanabe@aist.go.jp, takagi.hiromitsu@aist.go.jp, kaorumaeda.ml@gmail.com, hayashi@lepidum.co.jp, mutual-work@ioku.org
-  RFC8122          ||      J. Lennox, C. Holmberg         ||       jonathan@vidyo.com, christer.holmberg@ericsson.com
-  RFC8123          ||      P. Dawes, C. Arunachalam         ||       peter.dawes@vodafone.com, carunach@cisco.com
-  RFC8124          ||      R. Ravindranath, G. Salgueiro         ||       rmohanr@cisco.com, gsalguei@cisco.com
-  RFC8128          ||      C. Morgan         ||       cmorgan@amsl.com
-  RFC8129          ||      A. Jain, N. Kinder, N. McCallum         ||       ajain323@gatech.edu, nkinder@redhat.com, npmccallum@redhat.com
-  RFC8130          ||      V. Demjanenko, D. Satterlee         ||       victor.demjanenko@vocal.com, david.satterlee@vocal.com
-  RFC8131          ||      X. Zhang, H. Zheng, Ed., R. Gandhi, Ed., Z. Ali, P. Brzozowski         ||       zhang.xian@huawei.com, zhenghaomian@huawei.com, rgandhi@cisco.com, zali@cisco.com, pbrzozowski@advaoptical.com
-  RFC8132          ||      P. van der Stok, C. Bormann, A. Sehgal         ||       consultancy@vanderstok.org, cabo@tzi.org, anuj.sehgal@navomi.com
-  RFC8133          ||      S. Smyshlyaev. Ed., E. Alekseev, I. Oshkin, V. Popov         ||       svs@cryptopro.ru, alekseev@cryptopro.ru, oshkin@cryptopro.ru, vpopov@cryptopro.ru
-  RFC8135          ||      M. Danielson, M. Nilsson         ||       magda@netinsight.net, mansaxel@besserwisser.org
-  RFC8136          ||      B. Carpenter, R. Hinden         ||       brian.e.carpenter@gmail.com, bob.hinden@gmail.com
-  RFC8138          ||      P. Thubert, Ed., C. Bormann, L. Toutain, R. Cragie         ||       pthubert@cisco.com, cabo@tzi.org, Laurent.Toutain@IMT-Atlantique.fr, robert.cragie@arm.com
-  RFC8140          ||      A. Farrel         ||       adrian@olddog.co.uk
-  RFC8144          ||      K. Murchison         ||       murch@andrew.cmu.edu
-  RFC8145          ||      D. Wessels, W. Kumari, P. Hoffman         ||       dwessels@verisign.com, warren@kumari.net, paul.hoffman@icann.org""".split('\n')
-
-
-# Many of these are addresses that the draft parser found incorrectly
-ignore_addresses =[
-'0004454742@mcimail.com',
-'0006423401@mcimail.com',
-'cabo@tzi.orgemail',
-'california@san',
-'cdl@rincon.com',
-'hss@lando.hns.com',
-'ietf-info@cnri.reston.va.us',
-'illinois@urbana-champaign',
-'jasdips@rwhois.net',
-'labs@network',
-'member@the',
-'park@mit',
-'research@icsi',
-'research@isci',
-'technopark@chaichee',
-'texas@arlington',
-'ura-bunyip@bunyip.com',
-]
-
-def get_rfc_data():
-    author_names = dict()
-    author_emails = dict()
-    for line in rfced_data:
-        (rfc,names,emails) = line.split('||')
-        rfc = int(rfc.lower().strip()[3:])
-        author_names[rfc] = [ x for x in map(str.lower,map(str.strip,names.split(','))) if x not in ['Ed.', 'ed.', '' ] ]
-        author_emails[rfc] = [ x for x in map(unicode,map(str.lower,map(str.strip,emails.split(',')))) if x not in [ '', ] ]
-    return author_names, author_emails
-
-def get_all_the_email():
-    all_the_email = Email.objects.all()
-    for e in all_the_email:
-        e.l_address = e.address.lower()
-    return all_the_email
-
-def get_matching_emails(all_the_email,addrlist):
-    """ Find Email objects with addresses case-insensitively matching things in the supplied list (for lack of __iin) """
-    l_addrlist = map(unicode.lower,addrlist)
-    return [ e for e in all_the_email if e.l_address in l_addrlist ]
-
-def show_verbose(rfc_num,*args):
-    print "rfc%-4d :"%rfc_num,' '.join(map(str,args))
-
-ParsedAuthor = namedtuple('ParsedAuthor',['name','address'])
-
-def get_parsed_authors(rfc_num):
-    h,n = mkstemp()
-    os.close(h)
-    f = open(n,"w")
-    f.write('%s/rfc%d.txt\n'%(settings.RFC_PATH,rfc_num))
-    f.close()
-    lines = subprocess.check_output(['ietf/utils/draft.py','-a',n])
-    os.unlink(n)
-    if not 'docauthors ' in lines:
-        return []
-    authorline = [l for l in lines.split('\n') if l.startswith('docauthors ')][0]
-    authstrings = authorline.split(':')[1].split(',')
-    retval = []
-    for a in authstrings:
-        if '<' in a:
-            retval.append(ParsedAuthor(a[:a.find('<')].strip(),a[a.find('<'):a.find('>')][1:]))
-        else:
-            retval.append(ParsedAuthor(a.strip(),None))
-    
-    return retval
-
-def calculate_changes(tracker_persons,tracker_emails,names,emails):
-    adds = set()
-    deletes = set()
-    for email in emails:
-        if email and email!='none' and email not in ignore_addresses:
-            p = Person.objects.filter(email__address=email).first()
-            if p:
-                if not set(map(unicode.lower,p.email_set.values_list('address',flat=True))).intersection(tracker_emails):
-                    adds.add(email)
-            else:
-                #person_name = names[emails.index(email)]
-                adds.add(email)
-    for person in tracker_persons:
-        if not set(map(unicode.lower,person.email_set.values_list('address',flat=True))).intersection(emails):
-            match = False
-            for index in [i for i,j in enumerate(emails) if j=='none' or not j]:
-                if names[index].split()[-1].lower()==person.last_name().lower():
-                    match = True
-            if not match:
-                    deletes.add(person) 
-    return adds, deletes
-
-def _main():
-
-    parser = argparse.ArgumentParser(description="Recalculate RFC documentauthor_set"+'\n\n'+__doc__,
-                                    formatter_class=argparse.RawDescriptionHelpFormatter,)
-    parser.add_argument('-v','--verbose',help="Show the action taken for each RFC",action='store_true') 
-    parser.add_argument('--rfc',type=int, nargs='*',help="Only recalculate the given rfc numbers",dest='rfcnumberlist')
-    args = parser.parse_args()
-
-    probable_email_match = set()
-    probable_duplicates = []
-    
-    all_the_email = get_all_the_email()
-    author_names, author_emails = get_rfc_data()
-    
-    stats = { 'rfc not in tracker'                           :0,
-              'same addresses'                               :0,
-              'different addresses belonging to same people' :0,
-              'same names, rfced emails do not match'        :0,
-              'rfced data is unusable'                       :0,
-              "data doesn't match but no changes found"      :0,
-              'changed authors'                              :0, }
-
-    for rfc_num in args.rfcnumberlist or sorted(author_names.keys()):
-    
-        rfc = Document.objects.filter(docalias__name='rfc%s'%rfc_num).first()
-    
-        if not rfc:
-            if args.verbose:
-                show_verbose(rfc_num,'rfc not in tracker')
-            stats['rfc not in tracker'] += 1
-            continue
-    
-        rfced_emails = set(author_emails[rfc_num])
-        tracker_emails = set(map(unicode.lower,rfc.authors.values_list('address',flat=True)))
-        tracker_persons = set([x.person for x in rfc.authors.all()])
-        matching_emails = get_matching_emails(all_the_email,rfced_emails)
-        rfced_persons = set([x.person for x in matching_emails])
-        known_emails = set([e.l_address for e in matching_emails])
-        unknown_emails = rfced_emails - known_emails
-        unknown_persons = tracker_persons-rfced_persons
-    
-        rfced_lastnames = sorted([n.split()[-1].lower() for n in author_names[rfc_num]])
-        tracker_lastnames = sorted([p.last_name().lower() for p in tracker_persons])
-    
-        if rfced_emails == tracker_emails:
-            if args.verbose:
-                show_verbose(rfc_num,'tracker and rfc editor have the same addresses')
-            stats['same addresses'] += 1
-            continue
-    
-        if len(rfced_emails)==len(tracker_emails) and not 'none' in author_emails[rfc_num]:
-            if tracker_persons == rfced_persons:
-                if args.verbose:
-                    show_verbose(rfc_num,'tracker and rfc editor have the different addresses belonging to same people')
-                stats['different addresses belonging to same people'] += 1
-                continue
-            else:
-                if len(unknown_emails)==1 and len(tracker_persons-rfced_persons)==1:
-                    p = list(tracker_persons-rfced_persons)[0]
-                    probable_email_match.add(u"%s is probably %s (%s) : %s "%(list(unknown_emails)[0], p, p.pk, rfc_num))
-                elif len(unknown_emails)==len(unknown_persons):
-                    probable_email_match.add(u"%s are probably %s : %s"%(unknown_emails,[(p.ascii,p.pk) for p in unknown_persons],rfc_num))
-                else:
-                    probable_duplicates.append((tracker_persons^rfced_persons,rfc_num))
-    
-        if tracker_lastnames == rfced_lastnames:
-            if args.verbose:
-                show_verbose(rfc_num,"emails don't match up, but person names appear to be the same")
-            stats[ 'same names, rfced emails do not match'] += 1
-            continue
-    
-        use_rfc_data = bool(len(author_emails[rfc_num])==len(author_names[rfc_num]))
-        if not use_rfc_data:
-            if args.verbose:
-                print 'Ignoring rfc database for rfc%d'%rfc_num
-            stats[ 'rfced data is unusable'] += 1
-
-        if use_rfc_data:
-            adds, deletes = calculate_changes(tracker_persons,tracker_emails,author_names[rfc_num],author_emails[rfc_num])
-        parsed_authors=get_parsed_authors(rfc_num)
-        parsed_adds, parsed_deletes = calculate_changes(tracker_persons,tracker_emails,[x.name for x in parsed_authors],[x.address for x in parsed_authors])
-
-        for e in adds.union(parsed_adds) if use_rfc_data else parsed_adds:
-            if not e or e in ignore_addresses:
-                continue
-            if not Person.objects.filter(email__address=e).exists():
-                if e not in parsed_adds:
-                    #print rfc_num,"Would add",e,"as",author_names[rfc_num][author_emails[rfc_num].index(e)],"(rfced database)"
-                    print "(address='%s',name='%s'),"%(e,author_names[rfc_num][author_emails[rfc_num].index(e)]),"# (rfced %d)"%rfc_num
-                    for p in Person.objects.filter(name__iendswith=author_names[rfc_num][author_emails[rfc_num].index(e)].split(' ')[-1]):
-                        print "\t", p.pk, p.ascii
-                else:
-                    name = [x.name for x in parsed_authors if x.address==e][0]
-                    p = Person.objects.filter(name=name).first()
-                    if p:
-                        #print e,"is probably",p.pk,p
-                        print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num)
-
-                    else:
-                        p = Person.objects.filter(ascii=name).first()
-                        if p:
-                            print e,"is probably",p.pk,p
-                            print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num)
-                        else:
-                            p = Person.objects.filter(ascii_short=name).first()
-                            if p:
-                                print e,"is probably",p.pk,p
-                                print "'%s': %d, # %s (%d)"%(e,p.pk,p.ascii,rfc_num)
-                    #print rfc_num,"Would add",e,"as",name,"(parsed)"
-                    print "(address='%s',name='%s'),"%(e,name),"# (parsed %d)"%rfc_num
-                    for p in Person.objects.filter(name__iendswith=name.split(' ')[-1]):
-                        print "\t", p.pk, p.ascii
-
-        if False: # This was a little useful, but the noise in the rfc_ed file keeps it from being completely useful
-            for p in deletes:
-                for n in author_names[rfc_num]:
-                    if p.last_name().lower()==n.split()[-1].lower():
-                        email_candidate = author_emails[rfc_num][author_names[rfc_num].index(n)]
-                        email_found = Email.objects.filter(address=email_candidate).first()
-                        if email_found:    
-                            probable_duplicates.append((set([p,email_found.person]),rfc_num))
-                        else:
-                            probable_email_match.add(u"%s is probably %s (%s) : %s"%(email_candidate, p, p.pk, rfc_num))
-             
-        if args.verbose:
-            if use_rfc_data:
-                working_adds = parsed_adds
-                seen_people = set(Email.objects.get(address=e).person for e in parsed_adds)
-                for addr in adds:
-                    person = Email.objects.get(address=addr).person
-                    if person not in seen_people:
-                        working_adds.add(addr)
-                        seen_people.add(person)
-                working_deletes = deletes.union(parsed_deletes)
-            else:
-                working_adds = parsed_adds
-                working_deletes = parsed_deletes
-            # unique_adds = set() # TODO don't add different addresses for the same person from the two sources
-            if working_adds or working_deletes:
-                show_verbose(rfc_num,"Changing original list",tracker_persons,"by adding",working_adds," and deleting",working_deletes)
-                print "(",rfc_num,",",[e for e in working_adds],",",[p.pk for p in working_deletes],"), #",[p.ascii for p in working_deletes]
-            else:
-                stats["data doesn't match but no changes found"] += 1
-                show_verbose(rfc_num,"Couldn't figure out what to change")
-
-        if False:
-        #if tracker_persons:
-        #if any(['iab@' in e for e in adds]) or any(['iesg@' in e for e in adds]) or any(['IESG'==p.name for p in deletes]) or any(['IAB'==p.name for p in deletes]):
-            print rfc_num
-            print "tracker_persons",tracker_persons
-            print "author_names",author_names[rfc_num]
-            print "author_emails",author_emails[rfc_num]
-            print "Adds:", adds
-            print "Deletes:", deletes
-        
-        stats['changed authors'] += 1
-    
-        if False:
-            debug.show('rfc_num')
-            debug.show('rfced_emails')
-            debug.show('tracker_emails')
-            debug.show('known_emails')
-            debug.show('unknown_emails')
-            debug.show('tracker_persons')
-            debug.show('rfced_persons')
-            debug.show('tracker_persons==rfced_persons')
-            debug.show('[p.id for p in tracker_persons]')
-            debug.show('[p.id for p in rfced_persons]')
-            exit()
-    
-    if True:
-        for p in sorted(list(probable_email_match)):
-            print p
-    if True:
-        print "Probable duplicate persons"
-        for d,r in sorted(probable_duplicates):
-            print [(p,p.pk) for p in d], r
-    else:
-        print len(probable_duplicates)," probable duplicate persons"
-
-    print stats
-
-if __name__ == "__main__":
-    _main()
-
diff --git a/ietf/bin/redirect-dump b/ietf/bin/redirect-dump
deleted file mode 100755
index ef35bbf0de..0000000000
--- a/ietf/bin/redirect-dump
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# Copyright The IETF Trust 2007, All Rights Reserved
-#
-#python manage.py dumpdata --format=xml redirects | xmllint --format -
-python manage.py dumpdata --format=xml redirects | sed -e 's/<\/*object/\
-  &/g' -e 's/<field/\
-    &/g' -e 's/<\/django-objects/\
-&/g'
diff --git a/ietf/bin/report_id_activity b/ietf/bin/report_id_activity
deleted file mode 100755
index 7fb8ad88ed..0000000000
--- a/ietf/bin/report_id_activity
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# -*- Python -*-
-#
-
-# This script requires that the proper virtual python environment has been
-# invoked before start
-
-# Set PYTHONPATH and load environment variables for standalone script -----------------
-import os, sys
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-import django
-django.setup()
-# -------------------------------------------------------------------------------------
-
-from ietf.secr.proceedings.reports import report_id_activity
-
-print(report_id_activity(sys.argv[1], sys.argv[2]), end='')
-
diff --git a/ietf/bin/report_progress_report b/ietf/bin/report_progress_report
deleted file mode 100755
index 9d1dad6186..0000000000
--- a/ietf/bin/report_progress_report
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# -*- Python -*-
-#
-
-# This script requires that the proper virtual python environment has been
-# invoked before start
-
-# Set PYTHONPATH and load environment variables for standalone script -----------------
-import os, sys
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-import django
-django.setup()
-# -------------------------------------------------------------------------------------
-
-from ietf.secr.proceedings.reports import report_progress_report
-
-# handle unicode characters before attempting to print
-output = report_progress_report(sys.argv[1], sys.argv[2])
-output = output.replace(chr(160),' ')     # replace NO-BREAK SPACE with space
-print(output, end='')
diff --git a/ietf/bin/rfc-editor-index-updates b/ietf/bin/rfc-editor-index-updates
deleted file mode 100755
index 4ff3bf3730..0000000000
--- a/ietf/bin/rfc-editor-index-updates
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env python
-
-# This script requires that the proper virtual python environment has been
-# invoked before start
-
-import datetime
-import io
-import os
-import requests
-import sys
-import syslog
-import traceback
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-# Before invoking django
-syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
-
-import django
-django.setup()
-
-from django.conf import settings
-from optparse import OptionParser
-from django.core.mail import mail_admins
-
-from ietf.doc.utils import rebuild_reference_relations
-from ietf.utils.log import log
-from ietf.utils.pipe import pipe
-
-import ietf.sync.rfceditor
-
-
-parser = OptionParser()
-parser.add_option("-d", dest="skip_date",
-                  help="To speed up processing skip RFCs published before this date (default is one year ago)", metavar="YYYY-MM-DD")
-
-options, args = parser.parse_args()
-
-skip_date = datetime.date.today() - datetime.timedelta(days=365)
-if options.skip_date:
-    skip_date = datetime.datetime.strptime(options.skip_date, "%Y-%m-%d").date()
-
-log("Updating document metadata from RFC index going back to %s, from %s" % (skip_date, settings.RFC_EDITOR_INDEX_URL))
-
-
-try:
-    response = requests.get(
-        settings.RFC_EDITOR_INDEX_URL,
-        timeout=30,  # seconds
-    )
-except requests.Timeout as exc:
-    log(f'GET request timed out retrieving RFC editor index: {exc}')
-    sys.exit(1)
-
-
-rfc_index_xml = response.text
-index_data = ietf.sync.rfceditor.parse_index(io.StringIO(rfc_index_xml))
-
-try:
-    response = requests.get(
-        settings.RFC_EDITOR_ERRATA_JSON_URL,
-        timeout=30,  # seconds
-    )
-except requests.Timeout as exc:
-    log(f'GET request timed out retrieving RFC editor errata: {exc}')
-    sys.exit(1)
-errata_data = response.json()
-
-if len(index_data) < ietf.sync.rfceditor.MIN_INDEX_RESULTS:
-    log("Not enough index entries, only %s" % len(index_data))
-    sys.exit(1)
-
-if len(errata_data) < ietf.sync.rfceditor.MIN_ERRATA_RESULTS:
-    log("Not enough errata entries, only %s" % len(errata_data))
-    sys.exit(1)
-
-new_rfcs = []
-for changes, doc, rfc_published in ietf.sync.rfceditor.update_docs_from_rfc_index(index_data, errata_data, skip_older_than_date=skip_date):
-    if rfc_published:
-        new_rfcs.append(doc)
-
-    for c in changes:
-        log("RFC%s, %s: %s" % (doc.rfcnum, doc.name, c))
-
-sys.exit(0)
-
-# This can be called while processing a notifying POST from the RFC Editor
-# Spawn a child to sync the rfcs and calculate new reference relationships
-# so that the POST
-
-newpid = os.fork()
-
-if newpid == 0:
-    try:
-        pipe("%s -a %s %s" % (settings.RSYNC_BINARY,settings.RFC_TEXT_RSYNC_SOURCE,settings.RFC_PATH))
-        for rfc in new_rfcs:
-            rebuild_reference_relations(rfc)
-            log("Updated references for %s"%rfc.canonical_name())
-    except:
-        subject = "Exception in updating references for new rfcs: %s : %s" % (sys.exc_info()[0],sys.exc_info()[1])
-        msg = "%s\n%s\n----\n%s"%(sys.exc_info()[0],sys.exc_info()[1],traceback.format_tb(sys.exc_info()[2])) 
-        mail_admins(subject,msg,fail_silently=True)
-        log(subject)
-    os._exit(0)
-else:
-    sys.exit(0)
diff --git a/ietf/bin/rfc-editor-queue-updates b/ietf/bin/rfc-editor-queue-updates
deleted file mode 100755
index b441e50ebc..0000000000
--- a/ietf/bin/rfc-editor-queue-updates
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-
-import io
-import os
-import requests
-import sys
-
-# boilerplate
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-import django
-django.setup()
-
-from django.conf import settings
-
-from ietf.sync.rfceditor import parse_queue, MIN_QUEUE_RESULTS, update_drafts_from_queue
-from ietf.utils.log import log
-
-log("Updating RFC Editor queue states from %s" % settings.RFC_EDITOR_QUEUE_URL)
-
-try:
-    response = requests.get(
-        settings.RFC_EDITOR_QUEUE_URL,
-        timeout=30,  # seconds
-    )
-except requests.Timeout as exc:
-    log(f'GET request timed out retrieving RFC editor queue: {exc}')
-    sys.exit(1)
-drafts, warnings = parse_queue(io.StringIO(response.text))
-for w in warnings:
-    log(u"Warning: %s" % w)
-
-if len(drafts) < MIN_QUEUE_RESULTS:
-    log("Not enough results, only %s" % len(drafts))
-    sys.exit(1)
-
-changed, warnings = update_drafts_from_queue(drafts)
-for w in warnings:
-    log(u"Warning: %s" % w)
-
-for c in changed:
-    log(u"Updated %s" % c)
diff --git a/ietf/bin/run-real-data-tests b/ietf/bin/run-real-data-tests
deleted file mode 100755
index 9a8b51ffde..0000000000
--- a/ietf/bin/run-real-data-tests
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-#
-# Run some non-modifying tests on top of the real database, to
-# exercise the code with real data.
-#
-
-import os, subprocess, datetime
-
-base_dir = os.path.relpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
-
-path = os.path.abspath(os.path.join(base_dir, ".."))
-if os.environ.get("PYTHONPATH"):
-    path += ":" + os.environ.get("PYTHONPATH")
-os.environ["PYTHONPATH"] = path
-
-
-
-def run_script(script, *args):
-    script_base = os.path.splitext(os.path.basename(script))[0]
-    script_path = os.path.join(base_dir, script)
-    output_path = os.path.join(base_dir, script_base)
-    arg_str = " " + " ".join(args) if args else ""
-    cmd_line = "%s%s > %s.output" % (script_path, arg_str, output_path)
-    print "Running %s" % cmd_line
-    before = datetime.datetime.now()
-    returncode = subprocess.call(cmd_line, shell=True)
-    print "  (took %.3f seconds)" % (datetime.datetime.now() - before).total_seconds()
-    return returncode
-
-# idindex
-run_script("idindex/generate_id_abstracts_txt.py")
-run_script("idindex/generate_id_index_txt.py")
-run_script("idindex/generate_all_id_txt.py")
-run_script("idindex/generate_all_id2_txt.py")
-
-# test crawler
-crawl_input = os.path.join(base_dir, "utils/crawlurls.txt")
-run_script("bin/test-crawl", "--urls %s" % crawl_input)
diff --git a/ietf/bin/send-review-reminders b/ietf/bin/send-review-reminders
index e74694c8a1..317db4376b 100755
--- a/ietf/bin/send-review-reminders
+++ b/ietf/bin/send-review-reminders
@@ -26,8 +26,9 @@ from ietf.review.utils import (
     send_unavailability_period_ending_reminder, send_reminder_all_open_reviews,
     send_review_reminder_overdue_assignment, send_reminder_unconfirmed_assignments)
 from ietf.utils.log import log
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 
-today = datetime.date.today()
+today = date_today(DEADLINE_TZINFO)
 
 for assignment in review_assignments_needing_reviewer_reminder(today):
     email_reviewer_reminder(assignment)
diff --git a/ietf/bin/send-scheduled-mail b/ietf/bin/send-scheduled-mail
index c6a2dbf504..d3474db094 100755
--- a/ietf/bin/send-scheduled-mail
+++ b/ietf/bin/send-scheduled-mail
@@ -3,7 +3,7 @@
 # This script requires that the proper virtual python environment has been
 # invoked before start
 
-import datetime, os, sys
+import os, sys
 import syslog
 
 # boilerplate
@@ -16,6 +16,7 @@ syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
 
 import django
 django.setup()
+from django.utils import timezone
 
 from ietf.utils.mail import log_smtp_exception, send_error_email
 from smtplib import SMTPException
@@ -32,7 +33,7 @@ from ietf.message.models import SendQueue
 
 mode = sys.argv[1]
 
-now = datetime.datetime.now()
+now = timezone.now()
 
 needs_sending = SendQueue.objects.filter(sent_at=None).select_related("message")
 if mode == "specific":
diff --git a/ietf/bin/set_admin_permissions b/ietf/bin/set_admin_permissions
deleted file mode 100755
index 7011814238..0000000000
--- a/ietf/bin/set_admin_permissions
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# -*- Python -*-
-#
-'''
-This script configures Django Admin permissions
-'''
-
-# Set PYTHONPATH and load environment variables for standalone script -----------------
-import os, sys
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
-
-import django
-django.setup()
-# -------------------------------------------------------------------------------------
-
-from django.contrib.auth.models import Group as AuthGroup
-from django.contrib.auth.models import Permission
-from ietf.group.models import Group
-
-
-def permission_names_to_objects(names):
-    """
-    Given an iterable of permission names (e.g. 'app_label.add_model'),
-    return an iterable of Permission objects for them.  The permission
-    must already exist, because a permission name is not enough information
-    to create a new permission.
-    """
-    result = []
-    for name in names:
-        app_label, codename = name.split(".", 1)
-        try:
-            result.append(Permission.objects.get(content_type__app_label=app_label,
-                                                 codename=codename))
-        except Permission.DoesNotExist:
-            print ("NO SUCH PERMISSION: %s, %s" % (app_label, codename))
-            raise
-
-    return result
-
-
-def main():
-    secretariat = Group.objects.get(acronym='secretariat')
-    users = [ r.person.user for r in secretariat.role_set.filter(name='secr') ]
-
-    # Set Auth Group members
-    auth_group, _ = AuthGroup.objects.get_or_create(name='secretariat') 
-    auth_group.user_set.set(users)
-
-    # Set Auth Group Admin Permissions
-    names = ['auth.add_user','auth.change_user','auth.delete_user',
-             'dbtemplate.change_dbtemplate',
-             'group.add_group','group.change_group','group.delete_group',
-             'group.add_role','group.change_role','group.delete_role',
-             'group.add_groupevent','group.change_groupevent','group.delete_groupevent',
-             'iesg.add_telechatagendaitem','iesg.change_telechatagendaitem','iesg.delete_telechatagendaitem',
-             'iesg.add_telechatdate','iesg.change_telechatdate','iesg.delete_telechatdate',
-             'liaisons.add_liaisonstatementgroupcontacts', 'liaisons.change_liaisonstatementgroupcontacts', 'liaisons.delete_liaisonstatementgroupcontacts',
-             'mailinglists.add_list','mailinglists.change_list','mailinglists.delete_list',
-             'mailtrigger.add_mailtrigger','mailtrigger.change_mailtrigger','mailtrigger.delete_mailtrigger',
-             'mailtrigger.add_recipient','mailtrigger.change_recipient','mailtrigger.delete_recipient',
-             'meeting.add_floorplan','meeting.change_floorplan','meeting.delete_floorplan',
-             'meeting.add_importantdate','meeting.change_importantdate','meeting.delete_importantdate',
-             'meeting.add_meeting','meeting.change_meeting','meeting.delete_meeting',
-             'meeting.add_room','meeting.change_room','meeting.delete_room',
-             'meeting.add_urlresource','meeting.change_urlresource','meeting.delete_urlresource',
-             'message.add_announcementfrom','message.change_announcementfrom','message.delete_announcementfrom',
-             'nomcom.add_nomcom','nomcom.change_nomcom','nomcom.delete_nomcom',
-             'nomcom.add_volunteer','nomcom.change_volunteer','nomcom.delete_volunteer',
-             'person.add_person','person.change_person','person.delete_person',
-             'person.add_alias','person.change_alias','person.delete_alias',
-             'person.add_email','person.change_email','person.delete_email',
-             'submit.add_submission','submit.change_submission','submit.delete_submission',
-            ]
-
-    permissions = permission_names_to_objects(names)
-    auth_group.permissions.set(permissions)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/ietf/ietfauth/management/commands/__init__.py b/ietf/blobdb/__init__.py
similarity index 100%
rename from ietf/ietfauth/management/commands/__init__.py
rename to ietf/blobdb/__init__.py
diff --git a/ietf/blobdb/admin.py b/ietf/blobdb/admin.py
new file mode 100644
index 0000000000..3e1a2a311f
--- /dev/null
+++ b/ietf/blobdb/admin.py
@@ -0,0 +1,40 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from django.contrib import admin
+from django.db.models.functions import Length
+from rangefilter.filters import DateRangeQuickSelectListFilterBuilder
+
+from .models import Blob, ResolvedMaterial
+
+
+@admin.register(Blob)
+class BlobAdmin(admin.ModelAdmin):
+    list_display = ["bucket", "name", "object_size", "modified", "mtime", "content_type"]
+    list_filter = [
+        "bucket",
+        "content_type",
+        ("modified", DateRangeQuickSelectListFilterBuilder()),
+        ("mtime", DateRangeQuickSelectListFilterBuilder()),
+    ]
+    search_fields = ["name"]
+    list_display_links = ["name"]
+
+    def get_queryset(self, request):
+        return (
+            super().get_queryset(request)
+            .defer("content")  # don't load this unless we want it
+            .annotate(object_size=Length("content"))  # accessed via object_size()
+        )
+
+    @admin.display(ordering="object_size")
+    def object_size(self, instance):
+        """Get the size of the object"""
+        return instance.object_size  # annotation added in get_queryset()
+
+
+@admin.register(ResolvedMaterial)
+class ResolvedMaterialAdmin(admin.ModelAdmin):
+    model = ResolvedMaterial
+    list_display = ["name", "meeting_number", "bucket", "blob"]
+    list_filter = ["meeting_number", "bucket"]
+    search_fields = ["name", "blob"]
+    ordering = ["name"]
diff --git a/ietf/blobdb/apps.py b/ietf/blobdb/apps.py
new file mode 100644
index 0000000000..c2513b6819
--- /dev/null
+++ b/ietf/blobdb/apps.py
@@ -0,0 +1,30 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from django.apps import AppConfig
+
+
+class BlobdbConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "ietf.blobdb"
+
+    def ready(self):
+        """Initialize app once the registries / settings are populated"""
+        from django.conf import settings
+
+        # Validate that the DB is set up
+        db = get_blobdb()  # depends on settings.BLOBDB_DATABASE
+        if db is not None and db not in settings.DATABASES:
+            raise RuntimeError(
+                f"settings.BLOBDB_DATABASE is '{db}' but that is not present in settings.DATABASES"
+            )
+
+        # Validate replication settings
+        from .replication import validate_replication_settings
+
+        validate_replication_settings()
+
+
+def get_blobdb():
+    """Retrieve the blobdb setting from Django's settings"""
+    from django.conf import settings
+
+    return getattr(settings, "BLOBDB_DATABASE", None)
diff --git a/ietf/blobdb/factories.py b/ietf/blobdb/factories.py
new file mode 100644
index 0000000000..fdcebb2b4e
--- /dev/null
+++ b/ietf/blobdb/factories.py
@@ -0,0 +1,13 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+import factory
+
+from .models import Blob
+
+
+class BlobFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = Blob
+
+    name = factory.Faker("file_path")
+    bucket = factory.Faker("word")
+    content = factory.Faker("binary", length=32)  # careful, default length is 1e6
diff --git a/ietf/blobdb/migrations/0001_initial.py b/ietf/blobdb/migrations/0001_initial.py
new file mode 100644
index 0000000000..2fcb08e5ea
--- /dev/null
+++ b/ietf/blobdb/migrations/0001_initial.py
@@ -0,0 +1,78 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="Blob",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(help_text="Name of the blob", max_length=1024),
+                ),
+                (
+                    "bucket",
+                    models.CharField(
+                        help_text="Name of the bucket containing this blob",
+                        max_length=1024,
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now,
+                        help_text="Last modification time of the blob",
+                    ),
+                ),
+                ("content", models.BinaryField(help_text="Content of the blob")),
+                (
+                    "checksum",
+                    models.CharField(
+                        editable=False,
+                        help_text="SHA-384 digest of the content",
+                        max_length=96,
+                    ),
+                ),
+                (
+                    "mtime",
+                    models.DateTimeField(
+                        blank=True,
+                        default=None,
+                        help_text="mtime associated with the blob as a filesystem object",
+                        null=True,
+                    ),
+                ),
+                (
+                    "content_type",
+                    models.CharField(
+                        blank=True,
+                        help_text="content-type header value for the blob contents",
+                        max_length=1024,
+                    ),
+                ),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name="blob",
+            constraint=models.UniqueConstraint(
+                fields=("bucket", "name"), name="unique_name_per_bucket"
+            ),
+        ),
+    ]
diff --git a/ietf/blobdb/migrations/0002_resolvedmaterial.py b/ietf/blobdb/migrations/0002_resolvedmaterial.py
new file mode 100644
index 0000000000..e0ab405b11
--- /dev/null
+++ b/ietf/blobdb/migrations/0002_resolvedmaterial.py
@@ -0,0 +1,48 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("blobdb", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ResolvedMaterial",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(help_text="Name to resolve", max_length=300)),
+                (
+                    "meeting_number",
+                    models.CharField(
+                        help_text="Meeting material is related to", max_length=64
+                    ),
+                ),
+                (
+                    "bucket",
+                    models.CharField(help_text="Resolved bucket name", max_length=255),
+                ),
+                (
+                    "blob",
+                    models.CharField(help_text="Resolved blob name", max_length=300),
+                ),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name="resolvedmaterial",
+            constraint=models.UniqueConstraint(
+                fields=("name", "meeting_number"), name="unique_name_per_meeting"
+            ),
+        ),
+    ]
diff --git a/ietf/ietfauth/migrations/__init__.py b/ietf/blobdb/migrations/__init__.py
similarity index 100%
rename from ietf/ietfauth/migrations/__init__.py
rename to ietf/blobdb/migrations/__init__.py
diff --git a/ietf/blobdb/models.py b/ietf/blobdb/models.py
new file mode 100644
index 0000000000..27325ada5d
--- /dev/null
+++ b/ietf/blobdb/models.py
@@ -0,0 +1,121 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+import json
+from functools import partial
+from hashlib import sha384
+
+from django.db import models, transaction
+from django.utils import timezone
+
+from .apps import get_blobdb
+from .replication import replication_enabled
+from .tasks import pybob_the_blob_replicator_task
+
+
+class BlobQuerySet(models.QuerySet):
+    """QuerySet customized for Blob management
+
+    Operations that bypass save() / delete() won't correctly notify watchers of changes
+    to the blob contents. Disallow them.
+    """
+
+    def delete(self):
+        raise NotImplementedError("Only deleting individual Blobs is supported")
+
+    def bulk_create(self, *args, **kwargs):
+        raise NotImplementedError("Only creating individual Blobs is supported")
+
+    def update(self, *args, **kwargs):
+        # n.b., update_or_create() _does_ call save()
+        raise NotImplementedError("Updating BlobQuerySets is not supported")
+
+    def bulk_update(self, *args, **kwargs):
+        raise NotImplementedError("Updating Blobs in bulk is not supported")
+
+
+class Blob(models.Model):
+    objects = BlobQuerySet.as_manager()
+    name = models.CharField(max_length=1024, help_text="Name of the blob")
+    bucket = models.CharField(
+        max_length=1024, help_text="Name of the bucket containing this blob"
+    )
+    modified = models.DateTimeField(
+        default=timezone.now, help_text="Last modification time of the blob"
+    )
+    content = models.BinaryField(help_text="Content of the blob")
+    checksum = models.CharField(
+        max_length=96, help_text="SHA-384 digest of the content", editable=False
+    )
+    mtime = models.DateTimeField(
+        default=None,
+        blank=True,
+        null=True,
+        help_text="mtime associated with the blob as a filesystem object",
+    )
+    content_type = models.CharField(
+        max_length=1024,
+        blank=True,
+        help_text="content-type header value for the blob contents",
+    )
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["bucket", "name"], name="unique_name_per_bucket"
+            ),
+        ]
+
+    def __str__(self):
+        return f"{self.bucket}:{self.name}"
+
+    def save(self, **kwargs):
+        db = get_blobdb()
+        with transaction.atomic(using=db):
+            self.checksum = sha384(self.content, usedforsecurity=False).hexdigest()
+            super().save(**kwargs)
+            self._emit_blob_change_event(using=db)
+
+    def delete(self, **kwargs):
+        db = get_blobdb()
+        with transaction.atomic(using=db):
+            retval = super().delete(**kwargs)
+            self._emit_blob_change_event(using=db)
+        return retval
+
+    def _emit_blob_change_event(self, using=None):
+        if not replication_enabled(self.bucket):
+            return
+
+        # For now, fire a celery task we've arranged to guarantee in-order processing.
+        # Later becomes pushing an event onto a queue to a dedicated worker.
+        transaction.on_commit(
+            partial(
+                pybob_the_blob_replicator_task.delay,
+                json.dumps(
+                    {
+                        "name": self.name,
+                        "bucket": self.bucket,
+                    }
+                )
+            ),
+            using=using,
+        )
+
+
+class ResolvedMaterial(models.Model):
+    # A Document name can be 255 characters; allow this name to be a bit longer
+    name = models.CharField(max_length=300, help_text="Name to resolve")
+    meeting_number = models.CharField(
+        max_length=64, help_text="Meeting material is related to"
+    )
+    bucket = models.CharField(max_length=255, help_text="Resolved bucket name")
+    blob = models.CharField(max_length=300, help_text="Resolved blob name")
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["name", "meeting_number"], name="unique_name_per_meeting"
+            )
+        ]
+    
+    def __str__(self):
+        return f"{self.name}@{self.meeting_number} -> {self.bucket}:{self.blob}"
diff --git a/ietf/blobdb/replication.py b/ietf/blobdb/replication.py
new file mode 100644
index 0000000000..d251d3b95c
--- /dev/null
+++ b/ietf/blobdb/replication.py
@@ -0,0 +1,178 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+import datetime
+from dataclasses import dataclass
+from io import BytesIO
+from typing import Optional
+
+from django.conf import settings
+from django.core.files import File
+from django.core.files.storage import storages, InvalidStorageError
+from django.db import connections
+
+from ietf.utils import log
+
+DEFAULT_SETTINGS = {
+    "ENABLED": False,
+    "DEST_STORAGE_PATTERN": "r2-{bucket}",
+    "INCLUDE_BUCKETS": (),  # empty means include all
+    "EXCLUDE_BUCKETS": (),  # empty means exclude none
+    "VERBOSE_LOGGING": False,
+}
+
+
+class SimpleMetadataFile(File):
+    def __init__(self, file, name=None):
+        super().__init__(file, name)
+        self.custom_metadata = {}
+        self.content_type = ""
+
+
+def get_replication_settings():
+    return DEFAULT_SETTINGS | getattr(settings, "BLOBDB_REPLICATION", {})
+
+
+def validate_replication_settings():
+    replicator_settings = get_replication_settings()
+    # No extra settings allowed
+    unknown_settings = set(DEFAULT_SETTINGS.keys()) - set(replicator_settings.keys())
+    if len(unknown_settings) > 0:
+        raise RuntimeError(
+            f"Unrecognized BLOBDB_REPLICATOR settings: {', '.join(str(unknown_settings))}"
+        )
+    # destination storage pattern must be a string that includes {bucket}
+    pattern = replicator_settings["DEST_STORAGE_PATTERN"]
+    if not isinstance(pattern, str):
+        raise RuntimeError(
+            f"DEST_STORAGE_PATTERN must be a str, not {type(pattern).__name__}"
+        )
+    if "{bucket}" not in pattern:
+        raise RuntimeError(
+            f"DEST_STORAGE_PATTERN must contain the substring '{{bucket}}' (found '{pattern}')"
+        )
+    # include/exclude buckets must be list-like
+    include_buckets = replicator_settings["INCLUDE_BUCKETS"]
+    if not isinstance(include_buckets, (list, tuple, set)):
+        raise RuntimeError("INCLUDE_BUCKETS must be a list, tuple, or set")
+    exclude_buckets = replicator_settings["EXCLUDE_BUCKETS"]
+    if not isinstance(exclude_buckets, (list, tuple, set)):
+        raise RuntimeError("EXCLUDE_BUCKETS must be a list, tuple, or set")
+    # if we have explicit include_buckets, make sure the necessary storages exist
+    if len(include_buckets) > 0:
+        include_storages = {destination_storage_name_for(b) for b in include_buckets}
+        exclude_storages = {destination_storage_name_for(b) for b in exclude_buckets}
+        configured_storages = set(settings.STORAGES.keys())
+        missing_storages = include_storages - exclude_storages - configured_storages
+        if len(missing_storages) > 0:
+            raise RuntimeError(
+                f"Replication requires unknown storage(s): {', '.join(missing_storages)}"
+            )
+
+
+def destination_storage_name_for(bucket: str):
+    pattern = get_replication_settings()["DEST_STORAGE_PATTERN"]
+    return pattern.format(bucket=bucket)
+
+
+def destination_storage_for(bucket: str):
+    storage_name = destination_storage_name_for(bucket)
+    return storages[storage_name]
+
+
+def replication_enabled(bucket: str):
+    replication_settings = get_replication_settings()
+    if not replication_settings["ENABLED"]:
+        return False
+    # Default is all buckets are included
+    included = (
+        len(replication_settings["INCLUDE_BUCKETS"]) == 0
+        or bucket in replication_settings["INCLUDE_BUCKETS"]
+    )
+    # Default is no buckets are excluded
+    excluded = (
+        len(replication_settings["EXCLUDE_BUCKETS"]) > 0
+        and bucket in replication_settings["EXCLUDE_BUCKETS"]
+    )
+    return included and not excluded
+
+
+def verbose_logging_enabled():
+    return bool(get_replication_settings()["VERBOSE_LOGGING"])
+
+
+@dataclass
+class SqlBlob:
+    content: bytes
+    checksum: str
+    modified: datetime.datetime
+    mtime: Optional[datetime.datetime]
+    content_type: str
+
+
+def fetch_blob_via_sql(bucket: str, name: str) -> Optional[SqlBlob]:
+    blobdb_connection = connections["blobdb"]
+    cursor = blobdb_connection.cursor()
+    cursor.execute(
+        """
+        SELECT content, checksum, modified, mtime, content_type FROM blobdb_blob
+        WHERE bucket=%s AND name=%s LIMIT 1
+        """,
+        [bucket, name],
+    )
+    row = cursor.fetchone()
+    col_names = [col[0] for col in cursor.description]
+    return None if row is None else SqlBlob(**{
+        col_name: row_val
+        for col_name, row_val in zip(col_names, row)
+    })
+
+
+def replicate_blob(bucket, name):
+    """Replicate a Blobdb blob to a Storage"""
+    if not replication_enabled(bucket):
+        if verbose_logging_enabled():
+            log.log(
+                f"Not replicating {bucket}:{name} because replication is not enabled for {bucket}"
+            )
+        return
+
+    try:
+        destination_storage = destination_storage_for(bucket)
+    except InvalidStorageError as e:
+        log.log(
+            f"Failed to replicate {bucket}:{name} because destination storage for {bucket} is not configured"
+        )
+        raise ReplicationError from e
+
+    blob = fetch_blob_via_sql(bucket, name)
+    if blob is None:
+        if verbose_logging_enabled():
+            log.log(f"Deleting {bucket}:{name} from replica")
+        try:
+            destination_storage.delete(name)
+        except Exception as e:
+            log.log(f"Failed to delete {bucket}:{name} from replica: {e}")
+            raise ReplicationError from e
+    else:
+        # Add metadata expected by the MetadataS3Storage
+        file_with_metadata = SimpleMetadataFile(file=BytesIO(blob.content))
+        file_with_metadata.content_type = blob.content_type
+        file_with_metadata.custom_metadata = {
+            "sha384": blob.checksum,
+            "mtime": (blob.mtime or blob.modified).isoformat(),
+        }
+        if verbose_logging_enabled():
+            log.log(
+                f"Saving {bucket}:{name} to replica ("
+                f"sha384: '{file_with_metadata.custom_metadata['sha384'][:16]}...', "
+                f"content_type: '{file_with_metadata.content_type}', "
+                f"mtime: '{file_with_metadata.custom_metadata['mtime']})"
+            )
+        try:
+            destination_storage.save(name, file_with_metadata)
+        except Exception as e:
+            log.log(f"Failed to save {bucket}:{name} to replica: {e}")
+            raise ReplicationError from e
+
+
+class ReplicationError(Exception):
+    pass
diff --git a/ietf/blobdb/routers.py b/ietf/blobdb/routers.py
new file mode 100644
index 0000000000..319c0fbc71
--- /dev/null
+++ b/ietf/blobdb/routers.py
@@ -0,0 +1,58 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from django.apps import apps
+
+from .apps import BlobdbConfig, get_blobdb
+
+
+class BlobdbStorageRouter:
+    """Database router for the Blobdb"""
+
+    _app_label = None
+
+    @property
+    def app_label(self):
+        if self._app_label is None:
+            for app in apps.get_app_configs():
+                if isinstance(app, BlobdbConfig):
+                    self._app_label = app.label
+                    break
+            if self._app_label is None:
+                raise RuntimeError(
+                    f"{BlobdbConfig.name} is not present in the Django app registry"
+                )
+        return self._app_label
+
+    @property
+    def db(self):
+        return get_blobdb()
+
+    def db_for_read(self, model, **hints):
+        """Suggest the database that should be used for read operations for objects of type model
+
+        Returns None if there is no suggestion.
+        """
+        if model._meta.app_label == self.app_label:
+            return self.db
+        return None  # no suggestion
+
+    def db_for_write(self, model, **hints):
+        """Suggest the database that should be used for write of objects of type model
+
+        Returns None if there is no suggestion.
+        """
+        if model._meta.app_label == self.app_label:
+            return self.db
+        return None  # no suggestion
+
+    def allow_migrate(self, db, app_label, model_name=None, **hints):
+        """Determine if the migration operation is allowed to run on the database with alias db
+
+        Return True if the operation should run, False if it shouldn’t run, or
+        None if the router has no opinion.
+        """
+        if self.db is None:
+            return None  # no opinion, use the default db
+        is_our_app = app_label == self.app_label
+        is_our_db = db == self.db
+        if is_our_app or is_our_db:
+            return is_our_app and is_our_db
diff --git a/ietf/blobdb/storage.py b/ietf/blobdb/storage.py
new file mode 100644
index 0000000000..4213ec801d
--- /dev/null
+++ b/ietf/blobdb/storage.py
@@ -0,0 +1,96 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from typing import Optional
+
+from django.core.exceptions import SuspiciousFileOperation
+from django.core.files.base import ContentFile
+from django.core.files.storage import Storage
+from django.db.models.functions import Length
+from django.utils.deconstruct import deconstructible
+from django.utils import timezone
+
+from ietf.utils.storage import MetadataFile
+from .models import Blob
+
+
+class BlobFile(MetadataFile):
+
+    def __init__(self, content, name=None, mtime=None, content_type=""):
+        super().__init__(
+            file=ContentFile(content),
+            name=name,
+            mtime=mtime,
+            content_type=content_type,
+        )
+
+
+@deconstructible
+class BlobdbStorage(Storage):
+
+    def __init__(self, bucket_name: Optional[str]=None):
+        if bucket_name is None:
+            raise ValueError("BlobdbStorage bucket_name must be specified")
+        self.bucket_name = bucket_name
+
+    def get_queryset(self):
+        return Blob.objects.filter(bucket=self.bucket_name)
+
+    def delete(self, name):
+        blob = self.get_queryset().filter(name=name).first()
+        if blob is not None:
+            blob.delete()
+
+    def exists(self, name):
+        return self.get_queryset().filter(name=name).exists()
+
+    def size(self, name):
+        sizes = (
+            self.get_queryset()
+            .filter(name=name)
+            .annotate(object_size=Length("content"))
+            .values_list("object_size", flat=True)
+        )
+        if len(sizes) == 0:
+            raise FileNotFoundError(
+                f"No object '{name}' exists in bucket '{self.bucket_name}'"
+            )
+        return sizes[0]  # unique constraint guarantees 0 or 1 entry
+
+    def _open(self, name, mode="rb"):
+        try:
+            blob = self.get_queryset().get(name=name)
+        except Blob.DoesNotExist:
+            raise FileNotFoundError(
+                f"No object '{name}' exists in bucket '{self.bucket_name}'"
+            )
+        return BlobFile(
+            content=blob.content,
+            name=blob.name,
+            mtime=blob.mtime or blob.modified,  # fall back to modified time
+            content_type=blob.content_type,
+        )
+
+    def _save(self, name, content):
+        """Perform the save operation
+        
+        The storage API allows _save() to save to a different name than was requested. This method will
+        never do that, instead overwriting the existing blob.
+        """
+        Blob.objects.update_or_create(
+            name=name,
+            bucket=self.bucket_name,
+            defaults={
+                "content": content.read(),
+                "modified": timezone.now(),
+                "mtime": getattr(content, "mtime", None),
+                "content_type": getattr(content, "content_type", ""),
+            },
+        )
+        return name
+
+    def get_available_name(self, name, max_length=None):
+        if max_length is not None and len(name) > max_length:
+            raise SuspiciousFileOperation(
+                f"BlobdbStorage only allows names up to {max_length}, but was"
+                f"asked to store the name '{name[:5]}...{name[-5:]} of length {len(name)}"
+            )
+        return name  # overwrite is permitted
diff --git a/ietf/blobdb/tasks.py b/ietf/blobdb/tasks.py
new file mode 100644
index 0000000000..538d415830
--- /dev/null
+++ b/ietf/blobdb/tasks.py
@@ -0,0 +1,17 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+import json
+
+from celery import shared_task
+
+from .replication import replicate_blob, ReplicationError
+
+
+@shared_task(
+    autoretry_for=(ReplicationError,), retry_backoff=10, retry_kwargs={"max_retries": 5}
+)
+def pybob_the_blob_replicator_task(body: str):
+    request = json.loads(body)
+    bucket = request["bucket"]
+    name = request["name"]
+    replicate_blob(bucket, name)
diff --git a/ietf/blobdb/tests.py b/ietf/blobdb/tests.py
new file mode 100644
index 0000000000..0eadad0a1f
--- /dev/null
+++ b/ietf/blobdb/tests.py
@@ -0,0 +1,80 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+import datetime
+
+from django.core.files.base import ContentFile
+
+from ietf.utils.test_utils import TestCase
+from .factories import BlobFactory
+from .models import Blob
+from .storage import BlobFile, BlobdbStorage
+
+
+class StorageTests(TestCase):
+    def test_save(self):
+        storage = BlobdbStorage(bucket_name="my-bucket")
+        timestamp = datetime.datetime(
+            2025,
+            3,
+            17,
+            1,
+            2,
+            3,
+            tzinfo=datetime.timezone.utc,
+        )
+        # Create file to save
+        my_file = BlobFile(
+            content=b"These are my bytes.",
+            mtime=timestamp,
+            content_type="application/x-my-content-type",
+        )
+        # save the file
+        saved_name = storage.save("myfile.txt", my_file)
+        # validate the outcome
+        self.assertEqual(saved_name, "myfile.txt")
+        blob = Blob.objects.filter(bucket="my-bucket", name="myfile.txt").first()
+        self.assertIsNotNone(blob)  # validates bucket and name
+        self.assertEqual(bytes(blob.content), b"These are my bytes.")
+        self.assertEqual(blob.mtime, timestamp)
+        self.assertEqual(blob.content_type, "application/x-my-content-type")
+        
+    def test_save_naive_file(self):
+        storage = BlobdbStorage(bucket_name="my-bucket")
+        my_naive_file = ContentFile(content=b"These are my naive bytes.")
+        # save the file
+        saved_name = storage.save("myfile.txt", my_naive_file)
+        # validate the outcome
+        self.assertEqual(saved_name, "myfile.txt")
+        blob = Blob.objects.filter(bucket="my-bucket", name="myfile.txt").first()
+        self.assertIsNotNone(blob)  # validates bucket and name
+        self.assertEqual(bytes(blob.content), b"These are my naive bytes.")
+        self.assertIsNone(blob.mtime)
+        self.assertEqual(blob.content_type, "")
+
+    def test_open(self):
+        """BlobdbStorage open yields a BlobFile with specific mtime and content_type"""
+        mtime = datetime.datetime(2021, 1, 2, 3, 45, tzinfo=datetime.timezone.utc)
+        blob = BlobFactory(mtime=mtime, content_type="application/x-oh-no-you-didnt")
+        storage = BlobdbStorage(bucket_name=blob.bucket)
+        with storage.open(blob.name, "rb") as f:
+            self.assertTrue(isinstance(f, BlobFile))
+            assert isinstance(f, BlobFile)  # redundant, narrows type for linter
+            self.assertEqual(f.read(), bytes(blob.content))
+            self.assertEqual(f.mtime, mtime)
+            self.assertEqual(f.content_type, "application/x-oh-no-you-didnt")
+
+    def test_open_null_mtime(self):
+        """BlobdbStorage open yields a BlobFile with default mtime and content_type"""
+        blob = BlobFactory(content_type="application/x-oh-no-you-didnt")  # does not set mtime
+        storage = BlobdbStorage(bucket_name=blob.bucket)
+        with storage.open(blob.name, "rb") as f:
+            self.assertTrue(isinstance(f, BlobFile))
+            assert isinstance(f, BlobFile)  # redundant, narrows type for linter
+            self.assertEqual(f.read(), bytes(blob.content))
+            self.assertIsNotNone(f.mtime)
+            self.assertEqual(f.mtime, blob.modified)
+            self.assertEqual(f.content_type, "application/x-oh-no-you-didnt")
+
+    def test_open_file_not_found(self):
+        storage = BlobdbStorage(bucket_name="not-a-bucket")
+        with self.assertRaises(FileNotFoundError):
+            storage.open("definitely/not-a-file.txt")
diff --git a/ietf/celeryapp.py b/ietf/celeryapp.py
index cefde3a8d3..fda89c30be 100644
--- a/ietf/celeryapp.py
+++ b/ietf/celeryapp.py
@@ -1,11 +1,20 @@
 import os
+import scout_apm.celery
+
+import celery
+from scout_apm.api import Config
+
+
+# Disable celery's internal logging configuration, we set it up via Django
+@celery.signals.setup_logging.connect
+def on_setup_logging(**kwargs):
+    pass
 
-from celery import Celery
 
 # Set the default Django settings module for the 'celery' program
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ietf.settings')
 
-app = Celery('ietf')
+app = celery.Celery('ietf')
 
 # Using a string here means the worker doesn't have to serialize
 # the configuration object to child processes.
@@ -13,6 +22,28 @@
 #   should have a `CELERY_` prefix.
 app.config_from_object('django.conf:settings', namespace='CELERY')
 
+# Turn on Scout APM celery instrumentation if configured in the environment
+scout_key = os.environ.get("DATATRACKER_SCOUT_KEY", None)
+if scout_key is not None:
+    scout_name = os.environ.get("DATATRACKER_SCOUT_NAME", "Datatracker")
+    scout_core_agent_socket_path = "tcp://{host}:{port}".format(
+        host=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_HOST", "localhost"),
+        port=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_PORT", "6590"),
+    )
+    Config.set(
+        key=scout_key,
+        name=scout_name,
+        monitor=True,
+        core_agent_download=False,
+        core_agent_launch=False,
+        core_agent_path=scout_core_agent_socket_path,
+    )
+    # Note: Passing the Celery app to install() method as recommended in the
+    # Scout documentation causes failure at startup, likely because Scout
+    # ingests the config greedily before Django is ready. Have not found a
+    # workaround for this other than explicitly configuring Scout.
+    scout_apm.celery.install() 
+
 # Load task modules from all registered Django apps.
 app.autodiscover_tasks()
 
diff --git a/ietf/checks.py b/ietf/checks.py
index 53e695a769..f911d081f0 100644
--- a/ietf/checks.py
+++ b/ietf/checks.py
@@ -28,81 +28,6 @@ def already_ran():
         checks_run.append(name)
         return False
 
-@checks.register('directories')
-def check_cdn_directory_exists(app_configs, **kwargs):
-    """This checks that the path from which the CDN will serve static files for
-       this version of the datatracker actually exists.  In development and test
-       mode STATIC_ROOT will normally be just static/, but in production it will be
-       set to a different part of the file system which is served via CDN, and the
-       path will contain the datatracker release version.
-    """
-    if already_ran():
-        return []
-    #
-    errors = []
-    if settings.SERVER_MODE == 'production' and not os.path.exists(settings.STATIC_ROOT):
-        errors.append(checks.Error(
-            "The static files directory has not been set up.",
-            hint="Please run 'ietf/manage.py collectstatic'.",
-            obj=None,
-            id='datatracker.E001',
-        ))
-    return errors
-
-@checks.register('files')
-def check_group_email_aliases_exists(app_configs, **kwargs):
-    from ietf.group.views import check_group_email_aliases
-    #
-    if already_ran():
-        return []
-    #
-    errors = []
-    try:
-        ok = check_group_email_aliases()
-        if not ok:
-            errors.append(checks.Error(
-                "Found no aliases in the group email aliases file\n'%s'."%settings.GROUP_ALIASES_PATH,
-                hint="Please run the generate_group_aliases management command to generate them.",
-                obj=None,
-                id="datatracker.E0002",
-            ))
-    except IOError as e:
-        errors.append(checks.Error(
-            "Could not read group email aliases:\n   %s" % e,
-            hint="Please run the generate_group_aliases management command to generate them.",
-            obj=None,
-            id="datatracker.E0003",
-        ))
-        
-    return errors
-
-@checks.register('files')
-def check_doc_email_aliases_exists(app_configs, **kwargs):
-    from ietf.doc.views_doc import check_doc_email_aliases
-    #
-    if already_ran():
-        return []
-    #
-    errors = []
-    try:
-        ok = check_doc_email_aliases()
-        if not ok:
-            errors.append(checks.Error(
-                "Found no aliases in the document email aliases file\n'%s'."%settings.DRAFT_VIRTUAL_PATH,
-                hint="Please run the generate_draft_aliases management command to generate them.",
-                obj=None,
-                id="datatracker.E0004",
-            ))
-    except IOError as e:
-        errors.append(checks.Error(
-            "Could not read document email aliases:\n   %s" % e,
-            hint="Please run the generate_draft_aliases management command to generate them.",
-            obj=None,
-            id="datatracker.E0005",
-        ))
-
-    return errors
-    
 @checks.register('directories')
 def check_id_submission_directories(app_configs, **kwargs):
     #
@@ -114,7 +39,7 @@ def check_id_submission_directories(app_configs, **kwargs):
         p = getattr(settings, s)
         if not os.path.exists(p):
             errors.append(checks.Critical(
-                "A directory used by the ID submission tool does not\n"
+                "A directory used by the I-D submission tool does not\n"
                 "exist at the path given in the settings file.  The setting is:\n"
                 "    %s = %s" % (s, p),
                 hint = ("Please either update the local settings to point at the correct\n"
@@ -134,7 +59,7 @@ def check_id_submission_files(app_configs, **kwargs):
         p = getattr(settings, s)
         if not os.path.exists(p):
             errors.append(checks.Critical(
-                "A file used by the ID submission tool does not exist\n"
+                "A file used by the I-D submission tool does not exist\n"
                 "at the path given in the settings file.  The setting is:\n"
                 "    %s = %s" % (s, p),
                 hint = ("Please either update the local settings to point at the correct\n"
@@ -179,7 +104,7 @@ def check_id_submission_checkers(app_configs, **kwargs):
         except Exception as e:
             errors.append(checks.Critical(
                 "An exception was raised when trying to import the\n"
-                "draft submission checker class '%s':\n    %s" % (checker_path, e),
+                "Internet-Draft submission checker class '%s':\n    %s" % (checker_path, e),
                 hint = "Please check that the class exists and can be imported.\n",
                 id = "datatracker.E0008",
             ))
@@ -188,7 +113,7 @@ def check_id_submission_checkers(app_configs, **kwargs):
         except Exception as e:
             errors.append(checks.Critical(
                 "An exception was raised when trying to instantiate\n"
-                "the draft submission checker class '%s':\n    %s" % (checker_path, e),
+                "the Internet-Draft submission checker class '%s':\n    %s" % (checker_path, e),
                 hint = "Please check that the class can be instantiated.\n",
                 id = "datatracker.E0009",
             ))
@@ -196,7 +121,7 @@ def check_id_submission_checkers(app_configs, **kwargs):
         for attr in ('name',):
             if not hasattr(checker, attr):
                 errors.append(checks.Critical(
-                    "The draft submission checker\n    '%s'\n"
+                    "The Internet-Draft submission checker\n    '%s'\n"
                     "has no attribute '%s', which is required" % (checker_path, attr),
                     hint = "Please update the class.\n",
                     id = "datatracker.E0010",
@@ -207,7 +132,7 @@ def check_id_submission_checkers(app_configs, **kwargs):
                 break
         else:
             errors.append(checks.Critical(
-                "The draft submission checker\n    '%s'\n"
+                "The Internet-Draft submission checker\n    '%s'\n"
                 " has no recognised checker method;  "
                 "should be one or more of %s." % (checker_path, checker_methods),
                 hint = "Please update the class.\n",
diff --git a/ietf/community/admin.py b/ietf/community/admin.py
index 890819d9d9..4c947ad3f7 100644
--- a/ietf/community/admin.py
+++ b/ietf/community/admin.py
@@ -7,8 +7,8 @@
 from ietf.community.models import CommunityList, SearchRule, EmailSubscription
 
 class CommunityListAdmin(admin.ModelAdmin):
-    list_display = ['id', 'user', 'group']
-    raw_id_fields = ['user', 'group', 'added_docs']
+    list_display = ['id', 'person', 'group']
+    raw_id_fields = ['person', 'group', 'added_docs']
 admin.site.register(CommunityList, CommunityListAdmin)
 
 class SearchRuleAdmin(admin.ModelAdmin):
diff --git a/ietf/community/apps.py b/ietf/community/apps.py
new file mode 100644
index 0000000000..ab0a6d6054
--- /dev/null
+++ b/ietf/community/apps.py
@@ -0,0 +1,12 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.apps import AppConfig
+
+
+class CommunityConfig(AppConfig):
+    name = "ietf.community"
+
+    def ready(self):
+        """Initialize the app after the registry is populated"""
+        # implicitly connects @receiver-decorated signals
+        from . import signals  # pyflakes: ignore
diff --git a/ietf/community/forms.py b/ietf/community/forms.py
index a8709c787a..d3fa01dd19 100644
--- a/ietf/community/forms.py
+++ b/ietf/community/forms.py
@@ -13,7 +13,7 @@
 from ietf.person.fields import SearchablePersonField
 
 class AddDocumentsForm(forms.Form):
-    documents = SearchableDocumentsField(label="Add documents to track", doc_type="draft")
+    documents = SearchableDocumentsField(label="Add Internet-Drafts to track", doc_type="draft")
 
 class SearchRuleTypeForm(forms.Form):
     rule_type = forms.ChoiceField(choices=[('', '--------------')] + SearchRule.RULE_TYPES)
@@ -30,6 +30,8 @@ def __init__(self, clist, rule_type, *args, **kwargs):
         super(SearchRuleForm, self).__init__(*args, **kwargs)
 
         def restrict_state(state_type, slug=None):
+            if "state" not in self.fields:
+                raise RuntimeError(f"Rule type {rule_type} cannot include state filtering")
             f = self.fields['state']
             f.queryset = f.queryset.filter(used=True).filter(type=state_type)
             if slug:
@@ -38,11 +40,15 @@ def restrict_state(state_type, slug=None):
                 f.initial = f.queryset[0].pk
                 f.widget = forms.HiddenInput()
 
+        if rule_type.endswith("_rfc"):
+            del self.fields["state"]  # rfc rules must not look at document states
+
         if rule_type in ["group", "group_rfc", "area", "area_rfc", "group_exp"]:
             if rule_type == "group_exp":
                 restrict_state("draft", "expired")
             else:
-                restrict_state("draft", "rfc" if rule_type.endswith("rfc") else "active")
+                if not rule_type.endswith("_rfc"):
+                    restrict_state("draft", "active")
             
             if rule_type.startswith("area"):
                 self.fields["group"].label = "Area"
@@ -70,7 +76,8 @@ def restrict_state(state_type, slug=None):
             del self.fields["text"]
 
         elif rule_type in ["author", "author_rfc", "shepherd", "ad"]:
-            restrict_state("draft", "rfc" if rule_type.endswith("rfc") else "active")
+            if not rule_type.endswith("_rfc"):
+                restrict_state("draft", "active")
 
             if rule_type.startswith("author"):
                 self.fields["person"].label = "Author"
@@ -84,7 +91,8 @@ def restrict_state(state_type, slug=None):
             del self.fields["text"]
 
         elif rule_type == "name_contains":
-            restrict_state("draft", "rfc" if rule_type.endswith("rfc") else "active")
+            if not rule_type.endswith("_rfc"):
+                restrict_state("draft", "active")
 
             del self.fields["person"]
             del self.fields["group"]
@@ -106,14 +114,13 @@ def clean_text(self):
 
 
 class SubscriptionForm(forms.ModelForm):
-    def __init__(self, user, clist, *args, **kwargs):
+    def __init__(self, person, clist, *args, **kwargs):
         self.clist = clist
-        self.user = user
 
         super(SubscriptionForm, self).__init__(*args, **kwargs)
 
         self.fields["notify_on"].widget = forms.RadioSelect(choices=self.fields["notify_on"].choices)
-        self.fields["email"].queryset = self.fields["email"].queryset.filter(person__user=user, active=True).order_by("-primary")
+        self.fields["email"].queryset = self.fields["email"].queryset.filter(person=person, active=True).order_by("-primary")
         self.fields["email"].widget = forms.RadioSelect(choices=[t for t in self.fields["email"].choices if t[0]])
 
         if self.fields["email"].queryset:
diff --git a/ietf/community/migrations/0001_initial.py b/ietf/community/migrations/0001_initial.py
index dc1ae75a3f..44154687f3 100644
--- a/ietf/community/migrations/0001_initial.py
+++ b/ietf/community/migrations/0001_initial.py
@@ -1,10 +1,6 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from typing import List, Tuple      # pyflakes:ignore
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
+from typing import List, Tuple
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models
@@ -14,8 +10,8 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]                                   # type: List[Tuple[str]]
+    dependencies: List[Tuple[str, str]] = [
+    ]
 
     operations = [
         migrations.CreateModel(
@@ -35,7 +31,7 @@ class Migration(migrations.Migration):
             name='SearchRule',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('rule_type', models.CharField(choices=[('group', 'All I-Ds associated with a particular group'), ('area', 'All I-Ds associated with all groups in a particular Area'), ('group_rfc', 'All RFCs associated with a particular group'), ('area_rfc', 'All RFCs associated with all groups in a particular Area'), ('state_iab', 'All I-Ds that are in a particular IAB state'), ('state_iana', 'All I-Ds that are in a particular IANA state'), ('state_iesg', 'All I-Ds that are in a particular IESG state'), ('state_irtf', 'All I-Ds that are in a particular IRTF state'), ('state_ise', 'All I-Ds that are in a particular ISE state'), ('state_rfceditor', 'All I-Ds that are in a particular RFC Editor state'), ('state_ietf', 'All I-Ds that are in a particular Working Group state'), ('author', 'All I-Ds with a particular author'), ('author_rfc', 'All RFCs with a particular author'), ('ad', 'All I-Ds with a particular responsible AD'), ('shepherd', 'All I-Ds with a particular document shepherd'), ('name_contains', 'All I-Ds with particular text/regular expression in the name')], max_length=30)),
+                ('rule_type', models.CharField(choices=[('group', 'All I-Ds associated with a particular group'), ('area', 'All I-Ds associated with all groups in a particular Area'), ('group_rfc', 'All RFCs associated with a particular group'), ('area_rfc', 'All RFCs associated with all groups in a particular Area'), ('group_exp', 'All expired I-Ds of a particular group'), ('state_iab', 'All I-Ds that are in a particular IAB state'), ('state_iana', 'All I-Ds that are in a particular IANA state'), ('state_iesg', 'All I-Ds that are in a particular IESG state'), ('state_irtf', 'All I-Ds that are in a particular IRTF state'), ('state_ise', 'All I-Ds that are in a particular ISE state'), ('state_rfceditor', 'All I-Ds that are in a particular RFC Editor state'), ('state_ietf', 'All I-Ds that are in a particular Working Group state'), ('author', 'All I-Ds with a particular author'), ('author_rfc', 'All RFCs with a particular author'), ('ad', 'All I-Ds with a particular responsible AD'), ('shepherd', 'All I-Ds with a particular document shepherd'), ('name_contains', 'All I-Ds with particular text/regular expression in the name')], max_length=30)),
                 ('text', models.CharField(blank=True, default='', max_length=255, verbose_name='Text/RegExp')),
                 ('community_list', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.CommunityList')),
             ],
diff --git a/ietf/community/migrations/0002_auto_20180220_1052.py b/ietf/community/migrations/0002_auto_20180220_1052.py
deleted file mode 100644
index cb5658ac19..0000000000
--- a/ietf/community/migrations/0002_auto_20180220_1052.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('doc', '0001_initial'),
-        ('group', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('community', '0001_initial'),
-        ('person', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='searchrule',
-            name='group',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AddField(
-            model_name='searchrule',
-            name='name_contains_index',
-            field=models.ManyToManyField(to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='searchrule',
-            name='person',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
-        ),
-        migrations.AddField(
-            model_name='searchrule',
-            name='state',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.State'),
-        ),
-        migrations.AddField(
-            model_name='emailsubscription',
-            name='community_list',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.CommunityList'),
-        ),
-        migrations.AddField(
-            model_name='emailsubscription',
-            name='email',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Email'),
-        ),
-        migrations.AddField(
-            model_name='communitylist',
-            name='added_docs',
-            field=models.ManyToManyField(to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='communitylist',
-            name='group',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AddField(
-            model_name='communitylist',
-            name='user',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/ietf/community/migrations/0002_auto_20230320_1222.py b/ietf/community/migrations/0002_auto_20230320_1222.py
new file mode 100644
index 0000000000..f552cc06e1
--- /dev/null
+++ b/ietf/community/migrations/0002_auto_20230320_1222.py
@@ -0,0 +1,67 @@
+# Generated by Django 2.2.28 on 2023-03-20 19:22
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('person', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('community', '0001_initial'),
+        ('group', '0001_initial'),
+        ('doc', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='searchrule',
+            name='group',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
+        ),
+        migrations.AddField(
+            model_name='searchrule',
+            name='name_contains_index',
+            field=models.ManyToManyField(to='doc.Document'),
+        ),
+        migrations.AddField(
+            model_name='searchrule',
+            name='person',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        ),
+        migrations.AddField(
+            model_name='searchrule',
+            name='state',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.State'),
+        ),
+        migrations.AddField(
+            model_name='emailsubscription',
+            name='community_list',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.CommunityList'),
+        ),
+        migrations.AddField(
+            model_name='emailsubscription',
+            name='email',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Email'),
+        ),
+        migrations.AddField(
+            model_name='communitylist',
+            name='added_docs',
+            field=models.ManyToManyField(to='doc.Document'),
+        ),
+        migrations.AddField(
+            model_name='communitylist',
+            name='group',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
+        ),
+        migrations.AddField(
+            model_name='communitylist',
+            name='user',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py b/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py
deleted file mode 100644
index 3bfaee9aa9..0000000000
--- a/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 14:23
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('community', '0002_auto_20180220_1052'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='CommunityListDocs',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('communitylist', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.CommunityList')),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='communitylist',
-            name='added_docs2',
-            field=models.ManyToManyField(related_name='communitylists', through='community.CommunityListDocs', to='doc.Document'),
-        ),
-        migrations.CreateModel(
-            name='SearchRuleDocs',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id')),
-                ('searchrule', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.SearchRule')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='searchrule',
-            name='name_contains_index2',
-            field=models.ManyToManyField(related_name='searchrules', through='community.SearchRuleDocs', to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/community/migrations/0003_track_rfcs.py b/ietf/community/migrations/0003_track_rfcs.py
new file mode 100644
index 0000000000..3c2d04097d
--- /dev/null
+++ b/ietf/community/migrations/0003_track_rfcs.py
@@ -0,0 +1,50 @@
+# Generated by Django 4.2.3 on 2023-07-07 18:33
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    """Track any RFCs that were created from tracked drafts"""
+    CommunityList = apps.get_model("community", "CommunityList")
+    RelatedDocument = apps.get_model("doc", "RelatedDocument")
+
+    # Handle individually tracked documents
+    for cl in CommunityList.objects.all():
+        for rfc in set(
+            RelatedDocument.objects.filter(
+                source__in=cl.added_docs.all(),
+                relationship__slug="became_rfc",
+            ).values_list("target__docs", flat=True)
+        ):
+            cl.added_docs.add(rfc)
+
+    # Handle rules - rules ending with _rfc should no longer filter by state.
+    # There are 9 CommunityLists with invalid author_rfc rules that are filtering
+    # by (draft, active) instead of (draft, rfc) state before migration. All but one
+    # also includes an author rule for (draft, active), so these will start following
+    # RFCs as well. The one exception will start tracking RFCs instead of I-Ds, which
+    # is probably what was intended, but will be a change in their user experience.
+    SearchRule = apps.get_model("community", "SearchRule")
+    rfc_rules = SearchRule.objects.filter(rule_type__endswith="_rfc")
+    rfc_rules.update(state=None)
+
+def reverse(apps, schema_editor):
+    Document = apps.get_model("doc", "Document")
+    for rfc in Document.objects.filter(type__slug="rfc"):
+        rfc.communitylist_set.clear()
+
+    # See the comment above regarding author_rfc
+    SearchRule = apps.get_model("community", "SearchRule")
+    State = apps.get_model("doc", "State")
+    SearchRule.objects.filter(rule_type__endswith="_rfc").update(
+        state=State.objects.get(type_id="draft", slug="rfc")
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("community", "0002_auto_20230320_1222"),
+        ("doc", "0014_move_rfc_docaliases"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/community/migrations/0004_delete_useless_community_lists.py b/ietf/community/migrations/0004_delete_useless_community_lists.py
new file mode 100644
index 0000000000..9f657a3c34
--- /dev/null
+++ b/ietf/community/migrations/0004_delete_useless_community_lists.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.9 on 2024-01-05 21:28
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    CommunityList = apps.get_model("community", "CommunityList")
+    # As of 2024-01-05, there are 570 personal CommunityLists with a user
+    # who has no associated Person. None of these has an EmailSubscription,
+    # so the lists are doing nothing and can be safely deleted.
+    personal_lists_no_person = CommunityList.objects.exclude(
+        user__isnull=True
+    ).filter(
+        user__person__isnull=True
+    )
+    # Confirm the assumption that none of the lists to be deleted has an EmailSubscription 
+    assert not personal_lists_no_person.filter(emailsubscription__isnull=False).exists()
+    personal_lists_no_person.delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("community", "0003_track_rfcs"),
+    ]
+
+    operations = [migrations.RunPython(forward)]
diff --git a/ietf/community/migrations/0004_set_document_m2m_keys.py b/ietf/community/migrations/0004_set_document_m2m_keys.py
deleted file mode 100644
index 60e51fc368..0000000000
--- a/ietf/community/migrations/0004_set_document_m2m_keys.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 14:27
-
-
-import sys
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-
-    Document                    = apps.get_model('doc','Document')
-    CommunityList               = apps.get_model('community', 'CommunityList')
-    CommunityListDocs           = apps.get_model('community', 'CommunityListDocs')
-    SearchRule                  = apps.get_model('community', 'SearchRule')
-    SearchRuleDocs              = apps.get_model('community', 'SearchRuleDocs')
-
-    # Document id fixup ------------------------------------------------------------
-
-    objs = Document.objects.in_bulk()
-    nameid = { o.name: o.id for id, o in objs.items() }
-
-    sys.stderr.write('\n')
-
-    sys.stderr.write(' %s.%s:\n' % (CommunityList.__name__, 'added_docs'))
-    count = 0
-    for l in tqdm(CommunityList.objects.all()):
-        for d in l.added_docs.all():
-            count += 1
-            CommunityListDocs.objects.get_or_create(communitylist=l, document_id=nameid[d.name])
-    sys.stderr.write(' %s CommunityListDocs objects created\n' % (count, ))
-
-    sys.stderr.write(' %s.%s:\n' % (SearchRule.__name__, 'name_contains_index'))
-    count = 0
-    for r in tqdm(SearchRule.objects.all()):
-        for d in r.name_contains_index.all():
-            count += 1
-            SearchRuleDocs.objects.get_or_create(searchrule=r, document_id=nameid[d.name])
-    sys.stderr.write(' %s SearchRuleDocs objects created\n' % (count, ))
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('community', '0003_add_communitylist_docs2_m2m'),
-        ('doc', '0014_set_document_docalias_id'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/community/migrations/0005_1_del_docs_m2m_table.py b/ietf/community/migrations/0005_1_del_docs_m2m_table.py
deleted file mode 100644
index 9a7b7f9453..0000000000
--- a/ietf/community/migrations/0005_1_del_docs_m2m_table.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-22 08:15
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('community', '0004_set_document_m2m_keys'),
-    ]
-
-    # The implementation of AlterField in Django 1.11 applies
-    #   'ALTER TABLE <table> MODIFY <field> ...;' in order to fix foregn keys
-    #   to the altered field, but as it seems does _not_ fix up m2m
-    #   intermediary tables in an equivalent manner, so here we remove and
-    #   then recreate the m2m tables so they will have the appropriate field
-    #   types.
-
-    operations = [
-        # Remove fields
-        migrations.RemoveField(
-            model_name='communitylist',
-            name='added_docs',
-        ),
-        migrations.RemoveField(
-            model_name='searchrule',
-            name='name_contains_index',
-        ),
-    ]
diff --git a/ietf/community/migrations/0005_2_add_docs_m2m_table.py b/ietf/community/migrations/0005_2_add_docs_m2m_table.py
deleted file mode 100644
index ef1f9bc4f5..0000000000
--- a/ietf/community/migrations/0005_2_add_docs_m2m_table.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-22 08:15
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('community', '0005_1_del_docs_m2m_table'),
-    ]
-
-    # The implementation of AlterField in Django 1.11 applies
-    #   'ALTER TABLE <table> MODIFY <field> ...;' in order to fix foregn keys
-    #   to the altered field, but as it seems does _not_ fix up m2m
-    #   intermediary tables in an equivalent manner, so here we remove and
-    #   then recreate the m2m tables so they will have the appropriate field
-    #   types.
-
-    operations = [
-        # Add fields back (will create the m2m tables with the right field types)
-        migrations.AddField(
-            model_name='communitylist',
-            name='added_docs',
-            field=models.ManyToManyField(to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='searchrule',
-            name='name_contains_index',
-            field=models.ManyToManyField(to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/community/migrations/0005_user_to_person.py b/ietf/community/migrations/0005_user_to_person.py
new file mode 100644
index 0000000000..01d8950edb
--- /dev/null
+++ b/ietf/community/migrations/0005_user_to_person.py
@@ -0,0 +1,54 @@
+# Generated by Django 4.2.2 on 2023-06-12 19:35
+
+from django.conf import settings
+from django.db import migrations
+import django.db.models.deletion
+import ietf.utils.models
+
+
+def forward(apps, schema_editor):
+    CommunityList = apps.get_model('community', 'CommunityList')
+    for clist in CommunityList.objects.all():
+        try:
+            clist.person = clist.user.person
+        except:
+            clist.person = None
+        clist.save()
+
+def reverse(apps, schema_editor):
+    CommunityList = apps.get_model('community', 'CommunityList')
+    for clist in CommunityList.objects.all():
+        try:
+            clist.user = clist.person.user
+        except:
+            clist.user = None
+        clist.save()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("community", "0004_delete_useless_community_lists"),
+        ("person", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="communitylist",
+            name="person",
+            field=ietf.utils.models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="person.Person",
+            ),
+        ),
+        migrations.RunPython(forward, reverse),
+        migrations.RemoveField(
+            model_name="communitylist",
+            name="user",
+            field=ietf.utils.models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/ietf/community/migrations/0006_copy_docs_m2m_table.py b/ietf/community/migrations/0006_copy_docs_m2m_table.py
deleted file mode 100644
index 6d1a5e3a88..0000000000
--- a/ietf/community/migrations/0006_copy_docs_m2m_table.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-27 05:56
-
-
-from django.db import migrations
-
-import sys, time
-
-from tqdm import tqdm
-
-
-def forward(apps, schema_editor):
-
-    CommunityList               = apps.get_model('community', 'CommunityList')
-    CommunityListDocs           = apps.get_model('community', 'CommunityListDocs')
-    SearchRule                  = apps.get_model('community', 'SearchRule')
-    SearchRuleDocs              = apps.get_model('community', 'SearchRuleDocs')
-
-    # Document id fixup ------------------------------------------------------------
-
-
-    sys.stderr.write('\n')
-
-    sys.stderr.write(' %s.%s:\n' % (CommunityList.__name__, 'added_docs'))
-    for l in tqdm(CommunityList.objects.all()):
-        l.added_docs.set([ d.document for d in CommunityListDocs.objects.filter(communitylist=l) ])
-
-    sys.stderr.write(' %s.%s:\n' % (SearchRule.__name__, 'name_contains_index'))
-    for r in tqdm(SearchRule.objects.all()):
-        r.name_contains_index.set([ d.document for d in SearchRuleDocs.objects.filter(searchrule=r) ])
-
-def reverse(apps, schema_editor):
-    pass
-
-def timestamp(apps, schema_editor):
-    sys.stderr.write('\n %s' % time.strftime('%Y-%m-%d %H:%M:%S'))
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('community', '0005_2_add_docs_m2m_table'),
-    ]
-
-    operations = [
-        #migrations.RunPython(forward, reverse),
-        # Alternative:
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO community_communitylist_added_docs SELECT * FROM community_communitylistdocs;",
-            ""),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO community_searchrule_name_contains_index SELECT * FROM community_searchruledocs;",
-            ""),
-        migrations.RunPython(timestamp, timestamp),
-    ]
diff --git a/ietf/community/migrations/0007_remove_docs2_m2m.py b/ietf/community/migrations/0007_remove_docs2_m2m.py
deleted file mode 100644
index a454fbf072..0000000000
--- a/ietf/community/migrations/0007_remove_docs2_m2m.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-30 03:06
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('community', '0006_copy_docs_m2m_table'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='communitylistdocs',
-            name='communitylist',
-        ),
-        migrations.RemoveField(
-            model_name='communitylistdocs',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='searchruledocs',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='searchruledocs',
-            name='searchrule',
-        ),
-        migrations.RemoveField(
-            model_name='communitylist',
-            name='added_docs2',
-        ),
-        migrations.RemoveField(
-            model_name='searchrule',
-            name='name_contains_index2',
-        ),
-        migrations.DeleteModel(
-            name='CommunityListDocs',
-        ),
-        migrations.DeleteModel(
-            name='SearchRuleDocs',
-        ),
-    ]
diff --git a/ietf/community/migrations/0008_add_group_exp_rule.py b/ietf/community/migrations/0008_add_group_exp_rule.py
deleted file mode 100644
index b5ddebe638..0000000000
--- a/ietf/community/migrations/0008_add_group_exp_rule.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2022-06-30 05:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('community', '0007_remove_docs2_m2m'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='searchrule',
-            name='rule_type',
-            field=models.CharField(choices=[('group', 'All I-Ds associated with a particular group'), ('area', 'All I-Ds associated with all groups in a particular Area'), ('group_rfc', 'All RFCs associated with a particular group'), ('area_rfc', 'All RFCs associated with all groups in a particular Area'), ('group_exp', 'All expired I-Ds of a particular group'), ('state_iab', 'All I-Ds that are in a particular IAB state'), ('state_iana', 'All I-Ds that are in a particular IANA state'), ('state_iesg', 'All I-Ds that are in a particular IESG state'), ('state_irtf', 'All I-Ds that are in a particular IRTF state'), ('state_ise', 'All I-Ds that are in a particular ISE state'), ('state_rfceditor', 'All I-Ds that are in a particular RFC Editor state'), ('state_ietf', 'All I-Ds that are in a particular Working Group state'), ('author', 'All I-Ds with a particular author'), ('author_rfc', 'All RFCs with a particular author'), ('ad', 'All I-Ds with a particular responsible AD'), ('shepherd', 'All I-Ds with a particular document shepherd'), ('name_contains', 'All I-Ds with particular text/regular expression in the name')], max_length=30),
-        ),
-    ]
diff --git a/ietf/community/migrations/0009_add_group_exp_rule_to_groups.py b/ietf/community/migrations/0009_add_group_exp_rule_to_groups.py
deleted file mode 100644
index 1d3222dc6e..0000000000
--- a/ietf/community/migrations/0009_add_group_exp_rule_to_groups.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated by Django 2.2.28 on 2022-06-30 23:15
-
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    SearchRule = apps.get_model('community', 'SearchRule')
-    CommunityList = apps.get_model('community', 'CommunityList')
-    Group = apps.get_model('group', 'Group')
-    State = apps.get_model('doc', 'State')
-    for group in Group.objects.filter(type_id__in=['wg','rg'], state_id='active'):
-        com_list = CommunityList.objects.filter(group=group).first()
-        if com_list is not None:
-            SearchRule.objects.create(community_list=com_list, rule_type="group_exp", group=group, state=State.objects.get(slug="expired", type="draft"),)
-
-
-def reverse(apps, schema_editor):
-    SearchRule = apps.get_model('community', 'SearchRule')
-    SearchRule.objects.filter(rule_type='group_exp').delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('community', '0008_add_group_exp_rule'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/community/models.py b/ietf/community/models.py
index 8938b1c097..6945918f9a 100644
--- a/ietf/community/models.py
+++ b/ietf/community/models.py
@@ -1,37 +1,35 @@
 # Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-
-from django.contrib.auth.models import User
 from django.db import models
-from django.db.models import signals
 from django.urls import reverse as urlreverse
 
-from ietf.doc.models import Document, DocEvent, State
+from ietf.doc.models import Document, State
 from ietf.group.models import Group
 from ietf.person.models import Person, Email
 from ietf.utils.models import ForeignKey
 
+
 class CommunityList(models.Model):
-    user = ForeignKey(User, blank=True, null=True)
+    person = ForeignKey(Person, blank=True, null=True)
     group = ForeignKey(Group, blank=True, null=True)
     added_docs = models.ManyToManyField(Document)
 
     def long_name(self):
-        if self.user:
-            return 'Personal ID list of %s' % self.user.username
+        if self.person:
+            return 'Personal I-D list of %s' % self.person.plain_name()
         elif self.group:
-            return 'ID list for %s' % self.group.name
+            return 'I-D list for %s' % self.group.name
         else:
-            return 'ID list'
+            return 'I-D list'
 
     def __str__(self):
         return self.long_name()
 
     def get_absolute_url(self):
         import ietf.community.views
-        if self.user:
-            return urlreverse(ietf.community.views.view_list, kwargs={ 'username': self.user.username })
+        if self.person:
+            return urlreverse(ietf.community.views.view_list, kwargs={ 'email_or_name': self.person.email() })
         elif self.group:
             return urlreverse("ietf.group.views.group_documents", kwargs={ 'acronym': self.group.acronym })
         return ""
@@ -95,20 +93,3 @@ class EmailSubscription(models.Model):
 
     def __str__(self):
         return "%s to %s (%s changes)" % (self.email, self.community_list, self.notify_on)
-
-
-def notify_events(sender, instance, **kwargs):
-    if not isinstance(instance, DocEvent):
-        return
-
-    if instance.doc.type_id != 'draft':
-        return
-
-    if getattr(instance, "skip_community_list_notification", False):
-        return
-
-    from ietf.community.utils import notify_event_to_subscribers
-    notify_event_to_subscribers(instance)
-
-
-signals.post_save.connect(notify_events)
diff --git a/ietf/community/signals.py b/ietf/community/signals.py
new file mode 100644
index 0000000000..20ee761129
--- /dev/null
+++ b/ietf/community/signals.py
@@ -0,0 +1,44 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.conf import settings
+from django.db import transaction
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from ietf.doc.models import DocEvent
+from .tasks import notify_event_to_subscribers_task
+
+
+def notify_of_event(event: DocEvent):
+    """Send subscriber notification emails for a 'draft'-related DocEvent
+
+    If the event is attached to a draft of type 'doc', queues a task to send notification emails to
+    community list subscribers. No emails will be sent when SERVER_MODE is 'test'.
+    """
+    if event.doc.type_id != "draft":
+        return
+
+    if getattr(event, "skip_community_list_notification", False):
+        return
+
+    # kludge alert: queuing a celery task in response to a signal can cause unexpected attempts to
+    # start a Celery task during tests. To prevent this, don't queue a celery task if we're running
+    # tests.
+    if settings.SERVER_MODE != "test":
+        # Wrap in on_commit in case a transaction is open
+        transaction.on_commit(
+            lambda: notify_event_to_subscribers_task.delay(event_id=event.pk)
+        )
+
+
+# dispatch_uid ensures only a single signal receiver binding is made
+@receiver(post_save, dispatch_uid="notify_of_events_receiver_uid")
+def notify_of_events_receiver(sender, instance, **kwargs):
+    """Call notify_of_event after saving a new DocEvent"""
+    if not isinstance(instance, DocEvent):
+        return
+
+    if not kwargs.get("created", False):
+        return  # only notify on creation
+
+    notify_of_event(instance)
diff --git a/ietf/community/tasks.py b/ietf/community/tasks.py
new file mode 100644
index 0000000000..763a596495
--- /dev/null
+++ b/ietf/community/tasks.py
@@ -0,0 +1,15 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+from celery import shared_task
+
+from ietf.doc.models import DocEvent 
+from ietf.utils.log import log
+
+
+@shared_task
+def notify_event_to_subscribers_task(event_id):
+    from .utils import notify_event_to_subscribers
+    event = DocEvent.objects.filter(pk=event_id).first()
+    if event is None:
+        log(f"Unable to send subscriber notifications because DocEvent {event_id} was not found")
+    else:
+        notify_event_to_subscribers(event)
diff --git a/ietf/community/tests.py b/ietf/community/tests.py
index 3dd86f70e3..04f1433d61 100644
--- a/ietf/community/tests.py
+++ b/ietf/community/tests.py
@@ -1,60 +1,112 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
+# Copyright The IETF Trust 2016-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-
+from unittest import mock
 from pyquery import PyQuery
 
+from django.test.utils import override_settings
 from django.urls import reverse as urlreverse
-from django.contrib.auth.models import User
-
-from django_webtest import WebTest
+from lxml import etree
 
-import debug                            # pyflakes:ignore
+import debug  # pyflakes:ignore
 
 from ietf.community.models import CommunityList, SearchRule, EmailSubscription
-from ietf.community.utils import docs_matching_community_list_rule, community_list_rules_matching_doc
-from ietf.community.utils import reset_name_contains_index_for_rule
+from ietf.community.signals import notify_of_event
+from ietf.community.utils import (
+    docs_matching_community_list_rule,
+    community_list_rules_matching_doc,
+)
+from ietf.community.utils import (
+    reset_name_contains_index_for_rule,
+    notify_event_to_subscribers,
+)
+from ietf.community.tasks import notify_event_to_subscribers_task
 import ietf.community.views
 from ietf.group.models import Group
 from ietf.group.utils import setup_default_community_list_for_group
+from ietf.doc.factories import DocumentFactory
 from ietf.doc.models import State
 from ietf.doc.utils import add_state_change_event
-from ietf.person.models import Person, Email
-from ietf.utils.test_utils import login_testing_unauthorized
-from ietf.utils.mail import outbox
-from ietf.doc.factories import WgDraftFactory
+from ietf.person.models import Person, Email, Alias
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+from ietf.doc.factories import DocEventFactory, WgDraftFactory
 from ietf.group.factories import GroupFactory, RoleFactory
-from ietf.person.factories import PersonFactory
+from ietf.person.factories import PersonFactory, EmailFactory, AliasFactory
+
 
-class CommunityListTests(WebTest):
+class CommunityListTests(TestCase):
     def test_rule_matching(self):
-        plain = PersonFactory(user__username='plain')
-        ad = Person.objects.get(user__username='ad')
+        plain = PersonFactory(user__username="plain")
+        ad = Person.objects.get(user__username="ad")
         draft = WgDraftFactory(
-            group__parent=Group.objects.get(acronym='farfut' ),
+            group__parent=Group.objects.get(acronym="farfut"),
             authors=[ad],
             ad=ad,
             shepherd=plain.email(),
-            states=[('draft-iesg','lc'),('draft','active')],
+            states=[("draft-iesg", "lc"), ("draft", "active")],
         )
 
-        clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
+        clist = CommunityList.objects.create(person=plain)
 
-        rule_group = SearchRule.objects.create(rule_type="group", group=draft.group, state=State.objects.get(type="draft", slug="active"), community_list=clist)
-        rule_group_rfc = SearchRule.objects.create(rule_type="group_rfc", group=draft.group, state=State.objects.get(type="draft", slug="rfc"), community_list=clist)
-        rule_area = SearchRule.objects.create(rule_type="area", group=draft.group.parent, state=State.objects.get(type="draft", slug="active"), community_list=clist)
+        rule_group = SearchRule.objects.create(
+            rule_type="group",
+            group=draft.group,
+            state=State.objects.get(type="draft", slug="active"),
+            community_list=clist,
+        )
+        rule_group_rfc = SearchRule.objects.create(
+            rule_type="group_rfc",
+            group=draft.group,
+            state=State.objects.get(type="rfc", slug="published"),
+            community_list=clist,
+        )
+        rule_area = SearchRule.objects.create(
+            rule_type="area",
+            group=draft.group.parent,
+            state=State.objects.get(type="draft", slug="active"),
+            community_list=clist,
+        )
 
-        rule_state_iesg = SearchRule.objects.create(rule_type="state_iesg", state=State.objects.get(type="draft-iesg", slug="lc"), community_list=clist)
+        rule_state_iesg = SearchRule.objects.create(
+            rule_type="state_iesg",
+            state=State.objects.get(type="draft-iesg", slug="lc"),
+            community_list=clist,
+        )
 
-        rule_author = SearchRule.objects.create(rule_type="author", state=State.objects.get(type="draft", slug="active"), person=Person.objects.filter(documentauthor__document=draft).first(), community_list=clist)
+        rule_author = SearchRule.objects.create(
+            rule_type="author",
+            state=State.objects.get(type="draft", slug="active"),
+            person=Person.objects.filter(documentauthor__document=draft).first(),
+            community_list=clist,
+        )
 
-        rule_ad = SearchRule.objects.create(rule_type="ad", state=State.objects.get(type="draft", slug="active"), person=draft.ad, community_list=clist)
+        rule_ad = SearchRule.objects.create(
+            rule_type="ad",
+            state=State.objects.get(type="draft", slug="active"),
+            person=draft.ad,
+            community_list=clist,
+        )
 
-        rule_shepherd = SearchRule.objects.create(rule_type="shepherd", state=State.objects.get(type="draft", slug="active"), person=draft.shepherd.person, community_list=clist)
+        rule_shepherd = SearchRule.objects.create(
+            rule_type="shepherd",
+            state=State.objects.get(type="draft", slug="active"),
+            person=draft.shepherd.person,
+            community_list=clist,
+        )
 
-        rule_group_exp = SearchRule.objects.create(rule_type="group_exp", group=draft.group, state=State.objects.get(type="draft", slug="expired"), community_list=clist)
+        rule_group_exp = SearchRule.objects.create(
+            rule_type="group_exp",
+            group=draft.group,
+            state=State.objects.get(type="draft", slug="expired"),
+            community_list=clist,
+        )
 
-        rule_name_contains = SearchRule.objects.create(rule_type="name_contains", state=State.objects.get(type="draft", slug="active"), text="draft-.*" + "-".join(draft.name.split("-")[2:]), community_list=clist)
+        rule_name_contains = SearchRule.objects.create(
+            rule_type="name_contains",
+            state=State.objects.get(type="draft", slug="active"),
+            text="draft-.*" + "-".join(draft.name.split("-")[2:]),
+            community_list=clist,
+        )
         reset_name_contains_index_for_rule(rule_name_contains)
 
         # doc -> rules
@@ -71,37 +123,71 @@ def test_rule_matching(self):
 
         # rule -> docs
         self.assertTrue(draft in list(docs_matching_community_list_rule(rule_group)))
-        self.assertTrue(draft not in list(docs_matching_community_list_rule(rule_group_rfc)))
+        self.assertTrue(
+            draft not in list(docs_matching_community_list_rule(rule_group_rfc))
+        )
         self.assertTrue(draft in list(docs_matching_community_list_rule(rule_area)))
-        self.assertTrue(draft in list(docs_matching_community_list_rule(rule_state_iesg)))
+        self.assertTrue(
+            draft in list(docs_matching_community_list_rule(rule_state_iesg))
+        )
         self.assertTrue(draft in list(docs_matching_community_list_rule(rule_author)))
         self.assertTrue(draft in list(docs_matching_community_list_rule(rule_ad)))
         self.assertTrue(draft in list(docs_matching_community_list_rule(rule_shepherd)))
-        self.assertTrue(draft in list(docs_matching_community_list_rule(rule_name_contains)))
-        self.assertTrue(draft not in list(docs_matching_community_list_rule(rule_group_exp)))
+        self.assertTrue(
+            draft in list(docs_matching_community_list_rule(rule_name_contains))
+        )
+        self.assertTrue(
+            draft not in list(docs_matching_community_list_rule(rule_group_exp))
+        )
 
-        draft.set_state(State.objects.get(type='draft', slug='expired'))
+        draft.set_state(State.objects.get(type="draft", slug="expired"))
 
         # doc -> rules
         matching_rules = list(community_list_rules_matching_doc(draft))
         self.assertTrue(rule_group_exp in matching_rules)
 
         # rule -> docs
-        self.assertTrue(draft in list(docs_matching_community_list_rule(rule_group_exp)))
+        self.assertTrue(
+            draft in list(docs_matching_community_list_rule(rule_group_exp))
+        )
 
-    def test_view_list(self):
-        PersonFactory(user__username='plain')
-        draft = WgDraftFactory()
+    def test_view_list_duplicates(self):
+        person = PersonFactory(
+            name="John Q. Public", user__username="bazquux@example.com"
+        )
+        PersonFactory(name="John Q. Public", user__username="foobar@example.com")
 
-        url = urlreverse(ietf.community.views.view_list, kwargs={ "username": "plain" })
+        url = urlreverse(
+            ietf.community.views.view_list,
+            kwargs={"email_or_name": person.plain_name()},
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
 
+    def complex_person(self, *args, **kwargs):
+        person = PersonFactory(*args, **kwargs)
+        EmailFactory(person=person)
+        AliasFactory(person=person)
+        return person
+
+    def email_or_name_set(self, person):
+        return [e for e in Email.objects.filter(person=person)] + [
+            a for a in Alias.objects.filter(person=person)
+        ]
+
+    def do_view_list_test(self, person):
+        draft = WgDraftFactory()
         # without list
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
+        for id in self.email_or_name_set(person):
+            url = urlreverse(
+                ietf.community.views.view_list, kwargs={"email_or_name": id}
+            )
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
 
         # with list
-        clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        if not draft in clist.added_docs.all():
+        clist = CommunityList.objects.create(person=person)
+        if draft not in clist.added_docs.all():
             clist.added_docs.add(draft)
         SearchRule.objects.create(
             community_list=clist,
@@ -109,86 +195,135 @@ def test_view_list(self):
             state=State.objects.get(type="draft", slug="active"),
             text="test",
         )
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, draft.name)
+        for id in self.email_or_name_set(person):
+            url = urlreverse(
+                ietf.community.views.view_list, kwargs={"email_or_name": id}
+            )
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+            self.assertContains(r, draft.name)
 
-    def test_manage_personal_list(self):
+    def test_view_list(self):
+        person = self.complex_person(user__username="plain")
+        self.do_view_list_test(person)
+
+    def test_view_list_without_active_email(self):
+        person = self.complex_person(user__username="plain")
+        person.email_set.update(active=False)
+        self.do_view_list_test(person)
 
-        PersonFactory(user__username='plain')
-        ad = Person.objects.get(user__username='ad')
+    def test_manage_personal_list(self):
+        person = self.complex_person(user__username="plain")
+        ad = Person.objects.get(user__username="ad")
         draft = WgDraftFactory(authors=[ad])
 
-        url = urlreverse(ietf.community.views.manage_list, kwargs={ "username": "plain" })
+        url = urlreverse(
+            ietf.community.views.manage_list, kwargs={"email_or_name": person.email()}
+        )
         login_testing_unauthorized(self, "plain", url)
 
-        page = self.app.get(url, user='plain')
-        self.assertEqual(page.status_int, 200)
-
-        # add document
-        self.assertIn('add_document', page.forms)
-        form = page.forms['add_document']
-        form['documents'].options=[(draft.pk, True, draft.name)]
-        page = form.submit('action',value='add_documents')
-        self.assertEqual(page.status_int, 302)
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertTrue(clist.added_docs.filter(pk=draft.pk))
-        page = page.follow()
-
-        self.assertContains(page, draft.name)
-
-        # remove document
-        self.assertIn('remove_document_%s' % draft.pk, page.forms)
-        form = page.forms['remove_document_%s' % draft.pk]
-        page = form.submit('action',value='remove_document')
-        self.assertEqual(page.status_int, 302)
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertTrue(not clist.added_docs.filter(pk=draft.pk))
-        page = page.follow()
-        
-        # add rule
-        r = self.client.post(url, {
-            "action": "add_rule",
-            "rule_type": "author_rfc",
-            "author_rfc-person": Person.objects.filter(documentauthor__document=draft).first().pk,
-            "author_rfc-state": State.objects.get(type="draft", slug="rfc").pk,
-        })
-        self.assertEqual(r.status_code, 302)
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertTrue(clist.searchrule_set.filter(rule_type="author_rfc"))
-
-        # add name_contains rule
-        r = self.client.post(url, {
-            "action": "add_rule",
-            "rule_type": "name_contains",
-            "name_contains-text": "draft.*mars",
-            "name_contains-state": State.objects.get(type="draft", slug="active").pk,
-        })
-        self.assertEqual(r.status_code, 302)
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertTrue(clist.searchrule_set.filter(rule_type="name_contains"))
-
-        # rule shows up on GET
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        rule = clist.searchrule_set.filter(rule_type="author_rfc").first()
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('#r%s' % rule.pk)), 1)
-
-        # remove rule
-        r = self.client.post(url, {
-            "action": "remove_rule",
-            "rule": rule.pk,
-        })
-
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertTrue(not clist.searchrule_set.filter(rule_type="author_rfc"))
+        for id in self.email_or_name_set(person):
+            url = urlreverse(
+                ietf.community.views.manage_list, kwargs={"email_or_name": id}
+            )
+            r = self.client.get(url, user="plain")
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+
+            # We can't call post() with follow=True because that 404's if
+            # the url contains unicode, because the django test client
+            # apparently re-encodes the already-encoded url.
+            def follow(r):
+                redirect_url = r.url or url
+                return self.client.get(redirect_url, user="plain")
+
+            # add document
+            self.assertContains(r, "add_document")
+            r = self.client.post(
+                url, {"action": "add_documents", "documents": draft.pk}
+            )
+            self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'")
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertTrue(clist.added_docs.filter(pk=draft.pk))
+            r = follow(r)
+            self.assertContains(r, draft.name, status_code=200)
+
+            # remove document
+            self.assertContains(r, "remove_document_%s" % draft.pk)
+            r = self.client.post(
+                url, {"action": "remove_document", "document": draft.pk}
+            )
+            self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'")
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertTrue(not clist.added_docs.filter(pk=draft.pk))
+            r = follow(r)
+            self.assertNotContains(r, draft.name, status_code=200)
+
+            # add rule
+            r = self.client.post(
+                url,
+                {
+                    "action": "add_rule",
+                    "rule_type": "author_rfc",
+                    "author_rfc-person": Person.objects.filter(
+                        documentauthor__document=draft
+                    )
+                    .first()
+                    .pk,
+                    "author_rfc-state": State.objects.get(
+                        type="rfc", slug="published"
+                    ).pk,
+                },
+            )
+            self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'")
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertTrue(clist.searchrule_set.filter(rule_type="author_rfc"))
+
+            # add name_contains rule
+            r = self.client.post(
+                url,
+                {
+                    "action": "add_rule",
+                    "rule_type": "name_contains",
+                    "name_contains-text": "draft.*mars",
+                    "name_contains-state": State.objects.get(
+                        type="draft", slug="active"
+                    ).pk,
+                },
+            )
+            self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'")
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertTrue(clist.searchrule_set.filter(rule_type="name_contains"))
+
+            # rule shows up on GET
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+            rule = clist.searchrule_set.filter(rule_type="author_rfc").first()
+            q = PyQuery(r.content)
+            self.assertEqual(len(q("#r%s" % rule.pk)), 1)
+
+            # remove rule
+            r = self.client.post(
+                url,
+                {
+                    "action": "remove_rule",
+                    "rule": rule.pk,
+                },
+            )
+
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertTrue(not clist.searchrule_set.filter(rule_type="author_rfc"))
 
     def test_manage_group_list(self):
-        draft = WgDraftFactory(group__acronym='mars')
-        RoleFactory(group__acronym='mars',name_id='chair',person=PersonFactory(user__username='marschairman'))
+        draft = WgDraftFactory(group__acronym="mars")
+        RoleFactory(
+            group__acronym="mars",
+            name_id="chair",
+            person=PersonFactory(user__username="marschairman"),
+        )
 
-        url = urlreverse(ietf.community.views.manage_list, kwargs={ "acronym": draft.group.acronym })
+        url = urlreverse(
+            ietf.community.views.manage_list, kwargs={"acronym": draft.group.acronym}
+        )
         setup_default_community_list_for_group(draft.group)
         login_testing_unauthorized(self, "marschairman", url)
 
@@ -197,95 +332,132 @@ def test_manage_group_list(self):
         self.assertEqual(r.status_code, 200)
 
         # Verify GET also works with non-WG and RG groups
-        for gtype in ['area','program']:
+        for gtype in ["area", "program"]:
             g = GroupFactory.create(type_id=gtype)
             # make sure the group's features have been initialized to improve coverage
-            _ = g.features # pyflakes:ignore
+            _ = g.features  # pyflakes:ignore
             p = PersonFactory()
-            g.role_set.create(name_id={'area':'ad','program':'lead'}[gtype],person=p, email=p.email())
-            url = urlreverse(ietf.community.views.manage_list, kwargs={ "acronym": g.acronym })
+            g.role_set.create(
+                name_id={"area": "ad", "program": "lead"}[gtype],
+                person=p,
+                email=p.email(),
+            )
+            url = urlreverse(
+                ietf.community.views.manage_list, kwargs={"acronym": g.acronym}
+            )
             setup_default_community_list_for_group(g)
-            self.client.login(username=p.user.username,password=p.user.username+"+password")
+            self.client.login(
+                username=p.user.username, password=p.user.username + "+password"
+            )
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
 
     def test_track_untrack_document(self):
-        PersonFactory(user__username='plain')
+        person = self.complex_person(user__username="plain")
         draft = WgDraftFactory()
 
-        url = urlreverse(ietf.community.views.track_document, kwargs={ "username": "plain", "name": draft.name })
+        url = urlreverse(
+            ietf.community.views.track_document,
+            kwargs={"email_or_name": person.email(), "name": draft.name},
+        )
         login_testing_unauthorized(self, "plain", url)
 
-        # track
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        r = self.client.post(url)
-        self.assertEqual(r.status_code, 302)
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertEqual(list(clist.added_docs.all()), [draft])
+        for id in self.email_or_name_set(person):
+            url = urlreverse(
+                ietf.community.views.track_document,
+                kwargs={"email_or_name": id, "name": draft.name},
+            )
 
-        # untrack
-        url = urlreverse(ietf.community.views.untrack_document, kwargs={ "username": "plain", "name": draft.name })
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
+            # track
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+
+            r = self.client.post(url)
+            self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'")
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertEqual(list(clist.added_docs.all()), [draft])
+
+            # untrack
+            url = urlreverse(
+                ietf.community.views.untrack_document,
+                kwargs={"email_or_name": id, "name": draft.name},
+            )
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
 
-        r = self.client.post(url)
-        self.assertEqual(r.status_code, 302)
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertEqual(list(clist.added_docs.all()), [])
+            r = self.client.post(url)
+            self.assertEqual(r.status_code, 302, msg=f"id='{id}', url='{url}'")
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertEqual(list(clist.added_docs.all()), [])
 
     def test_track_untrack_document_through_ajax(self):
-        PersonFactory(user__username='plain')
+        person = self.complex_person(user__username="plain")
         draft = WgDraftFactory()
 
-        url = urlreverse(ietf.community.views.track_document, kwargs={ "username": "plain", "name": draft.name })
+        url = urlreverse(
+            ietf.community.views.track_document,
+            kwargs={"email_or_name": person.email(), "name": draft.name},
+        )
         login_testing_unauthorized(self, "plain", url)
 
-        # track
-        r = self.client.post(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-        self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.json()["success"], True)
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertEqual(list(clist.added_docs.all()), [draft])
-
-        # untrack
-        url = urlreverse(ietf.community.views.untrack_document, kwargs={ "username": "plain", "name": draft.name })
-        r = self.client.post(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-        self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.json()["success"], True)
-        clist = CommunityList.objects.get(user__username="plain")
-        self.assertEqual(list(clist.added_docs.all()), [])
+        for id in self.email_or_name_set(person):
+            url = urlreverse(
+                ietf.community.views.track_document,
+                kwargs={"email_or_name": id, "name": draft.name},
+            )
+
+            # track
+            r = self.client.post(url, HTTP_X_REQUESTED_WITH="XMLHttpRequest")
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+            self.assertEqual(r.json()["success"], True)
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertEqual(list(clist.added_docs.all()), [draft])
+
+            # untrack
+            url = urlreverse(
+                ietf.community.views.untrack_document,
+                kwargs={"email_or_name": id, "name": draft.name},
+            )
+            r = self.client.post(url, HTTP_X_REQUESTED_WITH="XMLHttpRequest")
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+            self.assertEqual(r.json()["success"], True)
+            clist = CommunityList.objects.get(person__user__username="plain")
+            self.assertEqual(list(clist.added_docs.all()), [])
 
     def test_csv(self):
-        PersonFactory(user__username='plain')
+        person = self.complex_person(user__username="plain")
         draft = WgDraftFactory()
 
-        url = urlreverse(ietf.community.views.export_to_csv, kwargs={ "username": "plain" })
+        for id in self.email_or_name_set(person):
+            url = urlreverse(
+                ietf.community.views.export_to_csv, kwargs={"email_or_name": id}
+            )
 
-        # without list
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        # with list
-        clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        if not draft in clist.added_docs.all():
-            clist.added_docs.add(draft)
-        SearchRule.objects.create(
-            community_list=clist,
-            rule_type="name_contains",
-            state=State.objects.get(type="draft", slug="active"),
-            text="test",
-        )
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        # this is a simple-minded test, we don't actually check the fields
-        self.assertContains(r, draft.name)
+            # without list
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+
+            # with list
+            clist = CommunityList.objects.create(person=person)
+            if draft not in clist.added_docs.all():
+                clist.added_docs.add(draft)
+            SearchRule.objects.create(
+                community_list=clist,
+                rule_type="name_contains",
+                state=State.objects.get(type="draft", slug="active"),
+                text="test",
+            )
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+            # this is a simple-minded test, we don't actually check the fields
+            self.assertContains(r, draft.name)
 
     def test_csv_for_group(self):
         draft = WgDraftFactory()
 
-        url = urlreverse(ietf.community.views.export_to_csv, kwargs={ "acronym": draft.group.acronym })
+        url = urlreverse(
+            ietf.community.views.export_to_csv, kwargs={"acronym": draft.group.acronym}
+        )
 
         setup_default_community_list_for_group(draft.group)
 
@@ -294,60 +466,85 @@ def test_csv_for_group(self):
         self.assertEqual(r.status_code, 200)
 
     def test_feed(self):
-        PersonFactory(user__username='plain')
+        person = self.complex_person(user__username="plain")
         draft = WgDraftFactory()
 
-        url = urlreverse(ietf.community.views.feed, kwargs={ "username": "plain" })
-
-        # without list
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        # with list
-        clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        if not draft in clist.added_docs.all():
-            clist.added_docs.add(draft)
-        SearchRule.objects.create(
-            community_list=clist,
-            rule_type="name_contains",
-            state=State.objects.get(type="draft", slug="active"),
-            text="test",
-        )
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, draft.name)
+        for id in self.email_or_name_set(person):
+            url = urlreverse(ietf.community.views.feed, kwargs={"email_or_name": id})
 
-        # only significant
-        r = self.client.get(url + "?significant=1")
-        self.assertEqual(r.status_code, 200)
-        self.assertNotContains(r, '<entry>')
+            # without list
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+
+            # with list
+            clist = CommunityList.objects.create(person=person)
+            if draft not in clist.added_docs.all():
+                clist.added_docs.add(draft)
+            SearchRule.objects.create(
+                community_list=clist,
+                rule_type="name_contains",
+                state=State.objects.get(type="draft", slug="active"),
+                text="test",
+            )
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+            self.assertContains(r, draft.name)
+
+            # test atom xml
+            xml = etree.fromstring(r.content)
+            ns = {"atom": "http://www.w3.org/2005/Atom"}
+            updated = xml.xpath("/atom:feed/atom:updated", namespaces=ns)[0].text
+            entries = xml.xpath("/atom:feed/atom:entry", namespaces=ns)
+            self.assertIn("+00:00", updated)  # RFC 3339 compatible UTC TZ
+            for entry in entries:
+                updated = entry.xpath("atom:updated", namespaces=ns)[0].text
+                published = entry.xpath("atom:published", namespaces=ns)[0].text
+                entry_id = entry.xpath("atom:id", namespaces=ns)[0].text
+                self.assertIn("+00:00", updated)
+                self.assertIn("+00:00", published)
+                self.assertIn(
+                    "urn:datatracker-ietf-org:event:", entry_id
+                )  # atom:entry:id must be a valid URN
+
+            # only significant
+            r = self.client.get(url + "?significant=1")
+            self.assertEqual(r.status_code, 200, msg=f"id='{id}', url='{url}'")
+            self.assertNotContains(r, "<entry>")
 
     def test_feed_for_group(self):
         draft = WgDraftFactory()
 
-        url = urlreverse(ietf.community.views.feed, kwargs={ "acronym": draft.group.acronym })
+        url = urlreverse(
+            ietf.community.views.feed, kwargs={"acronym": draft.group.acronym}
+        )
 
         setup_default_community_list_for_group(draft.group)
 
         # test GET, rest is tested with personal list
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        
+
     def test_subscription(self):
-        PersonFactory(user__username='plain')
+        person = self.complex_person(user__username="plain")
         draft = WgDraftFactory()
 
-        url = urlreverse(ietf.community.views.subscription, kwargs={ "username": "plain" })
-
+        url = urlreverse(
+            ietf.community.views.subscription, kwargs={"email_or_name": person.email()}
+        )
         login_testing_unauthorized(self, "plain", url)
 
-        # subscription without list
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 404)
+        for id in self.email_or_name_set(person):
+            url = urlreverse(
+                ietf.community.views.subscription, kwargs={"email_or_name": id}
+            )
+
+            # subscription without list
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 404, msg=f"id='{id}', url='{url}'")
 
         # subscription with list
-        clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        if not draft in clist.added_docs.all():
+        clist = CommunityList.objects.create(person=person)
+        if draft not in clist.added_docs.all():
             clist.added_docs.add(draft)
         SearchRule.objects.create(
             community_list=clist,
@@ -355,28 +552,51 @@ def test_subscription(self):
             state=State.objects.get(type="draft", slug="active"),
             text="test",
         )
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
 
-        # subscribe
-        email = Email.objects.filter(person__user__username="plain").first()
-        r = self.client.post(url, { "email": email.pk, "notify_on": "significant", "action": "subscribe" })
-        self.assertEqual(r.status_code, 302)
+        for email in Email.objects.filter(person=person):
+            url = urlreverse(
+                ietf.community.views.subscription, kwargs={"email_or_name": email}
+            )
 
-        subscription = EmailSubscription.objects.filter(community_list=clist, email=email, notify_on="significant").first()
-
-        self.assertTrue(subscription)
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
 
-        # delete subscription
-        r = self.client.post(url, { "subscription_id": subscription.pk, "action": "unsubscribe" })
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(EmailSubscription.objects.filter(community_list=clist, email=email, notify_on="significant").count(), 0)
+            # subscribe
+            r = self.client.post(
+                url,
+                {"email": email.pk, "notify_on": "significant", "action": "subscribe"},
+            )
+            self.assertEqual(r.status_code, 302)
+
+            subscription = EmailSubscription.objects.filter(
+                community_list=clist, email=email, notify_on="significant"
+            ).first()
+
+            self.assertTrue(subscription)
+
+            # delete subscription
+            r = self.client.post(
+                url, {"subscription_id": subscription.pk, "action": "unsubscribe"}
+            )
+            self.assertEqual(r.status_code, 302)
+            self.assertEqual(
+                EmailSubscription.objects.filter(
+                    community_list=clist, email=email, notify_on="significant"
+                ).count(),
+                0,
+            )
 
     def test_subscription_for_group(self):
-        draft = WgDraftFactory(group__acronym='mars')
-        RoleFactory(group__acronym='mars',name_id='chair',person=PersonFactory(user__username='marschairman'))
+        draft = WgDraftFactory(group__acronym="mars")
+        RoleFactory(
+            group__acronym="mars",
+            name_id="chair",
+            person=PersonFactory(user__username="marschairman"),
+        )
 
-        url = urlreverse(ietf.community.views.subscription, kwargs={ "acronym": draft.group.acronym })
+        url = urlreverse(
+            ietf.community.views.subscription, kwargs={"acronym": draft.group.acronym}
+        )
 
         setup_default_community_list_for_group(draft.group)
 
@@ -385,27 +605,136 @@ def test_subscription_for_group(self):
         # test GET, rest is tested with personal list
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        
-    def test_notification(self):
-        PersonFactory(user__username='plain')
+
+    @mock.patch("ietf.community.signals.notify_of_event")
+    def test_notification_signal_receiver(self, mock_notify_of_event):
+        """Saving a newly created DocEvent should notify subscribers
+
+        This implicitly tests that notify_of_event_receiver is hooked up to the post_save signal.
+        """
+        # Arbitrary model that's not a DocEvent
+        person = PersonFactory.build()  # builds but does not save...
+        mock_notify_of_event.reset_mock()  # clear any calls that resulted from the factories
+        person.save()
+        self.assertFalse(mock_notify_of_event.called)
+
+        # build a DocEvent that is not yet persisted
+        doc = DocumentFactory()
+        event = DocEventFactory.build(by=person, doc=doc)  # builds but does not save...
+        mock_notify_of_event.reset_mock()  # clear any calls that resulted from the factories
+        event.save()
+        self.assertEqual(
+            mock_notify_of_event.call_count,
+            1,
+            "notify_task should be run on creation of DocEvent",
+        )
+        self.assertEqual(mock_notify_of_event.call_args, mock.call(event))
+
+        # save the existing DocEvent and see that no notification is sent
+        mock_notify_of_event.reset_mock()
+        event.save()
+        self.assertFalse(
+            mock_notify_of_event.called,
+            "notify_task should not be run save of on existing DocEvent",
+        )
+
+    # Mock out the on_commit call so we can tell whether the task was actually queued
+    @mock.patch("ietf.submit.views.transaction.on_commit", side_effect=lambda x: x())
+    @mock.patch("ietf.community.signals.notify_event_to_subscribers_task")
+    def test_notify_of_event(self, mock_notify_task, mock_on_commit):
+        """The community notification task should be called as intended"""
+        person = PersonFactory()  # builds but does not save...
+        doc = DocumentFactory()
+        event = DocEventFactory(by=person, doc=doc)
+        # be careful overriding SERVER_MODE - we do it here because the method
+        # under test does not make this call when in "test" mode
+        with override_settings(SERVER_MODE="not-test"):
+            notify_of_event(event)
+        self.assertTrue(
+            mock_notify_task.delay.called,
+            "notify_task should run for a DocEvent on a draft",
+        )
+        mock_notify_task.reset_mock()
+
+        event.skip_community_list_notification = True
+        # be careful overriding SERVER_MODE - we do it here because the method
+        # under test does not make this call when in "test" mode
+        with override_settings(SERVER_MODE="not-test"):
+            notify_of_event(event)
+        self.assertFalse(
+            mock_notify_task.delay.called,
+            "notify_task should not run when skip_community_list_notification is set",
+        )
+
+        event = DocEventFactory.build(by=person, doc=DocumentFactory(type_id="rfc"))
+        # be careful overriding SERVER_MODE - we do it here because the method
+        # under test does not make this call when in "test" mode
+        with override_settings(SERVER_MODE="not-test"):
+            notify_of_event(event)
+        self.assertFalse(
+            mock_notify_task.delay.called,
+            "notify_task should not run on a document with type 'rfc'",
+        )
+
+    @mock.patch("ietf.utils.mail.send_mail_text")
+    def test_notify_event_to_subscribers(self, mock_send_mail_text):
+        person = PersonFactory(user__username="plain")
         draft = WgDraftFactory()
 
-        clist = CommunityList.objects.create(user=User.objects.get(username="plain"))
-        if not draft in clist.added_docs.all():
+        clist = CommunityList.objects.create(person=person)
+        if draft not in clist.added_docs.all():
             clist.added_docs.add(draft)
 
-        EmailSubscription.objects.create(community_list=clist, email=Email.objects.filter(person__user__username="plain").first(), notify_on="significant")
+        sub_to_significant = EmailSubscription.objects.create(
+            community_list=clist,
+            email=Email.objects.filter(person__user__username="plain").first(),
+            notify_on="significant",
+        )
+        sub_to_all = EmailSubscription.objects.create(
+            community_list=clist,
+            email=Email.objects.filter(person__user__username="plain").first(),
+            notify_on="all",
+        )
 
-        mailbox_before = len(outbox)
         active_state = State.objects.get(type="draft", slug="active")
         system = Person.objects.get(name="(System)")
-        add_state_change_event(draft, system, None, active_state)
-        self.assertEqual(len(outbox), mailbox_before)
+        event = add_state_change_event(draft, system, None, active_state)
+        notify_event_to_subscribers(event)
+        self.assertEqual(mock_send_mail_text.call_count, 1)
+        address = mock_send_mail_text.call_args[0][1]
+        subject = mock_send_mail_text.call_args[0][3]
+        content = mock_send_mail_text.call_args[0][4]
+        self.assertEqual(address, sub_to_all.email.address)
+        self.assertIn(draft.name, subject)
+        self.assertIn(clist.long_name(), content)
 
-        mailbox_before = len(outbox)
         rfc_state = State.objects.get(type="draft", slug="rfc")
-        add_state_change_event(draft, system, active_state, rfc_state)
-        self.assertEqual(len(outbox), mailbox_before + 1)
-        self.assertTrue(draft.name in outbox[-1]["Subject"])
-        
-        
\ No newline at end of file
+        event = add_state_change_event(draft, system, active_state, rfc_state)
+        mock_send_mail_text.reset_mock()
+        notify_event_to_subscribers(event)
+        self.assertEqual(mock_send_mail_text.call_count, 2)
+        addresses = [
+            call_args[0][1] for call_args in mock_send_mail_text.call_args_list
+        ]
+        subjects = {call_args[0][3] for call_args in mock_send_mail_text.call_args_list}
+        contents = {call_args[0][4] for call_args in mock_send_mail_text.call_args_list}
+        self.assertCountEqual(
+            addresses,
+            [sub_to_significant.email.address, sub_to_all.email.address],
+        )
+        self.assertEqual(len(subjects), 1)
+        self.assertIn(draft.name, subjects.pop())
+        self.assertEqual(len(contents), 1)
+        self.assertIn(clist.long_name(), contents.pop())
+
+    @mock.patch("ietf.community.utils.notify_event_to_subscribers")
+    def test_notify_event_to_subscribers_task(self, mock_notify):
+        d = DocEventFactory()
+        notify_event_to_subscribers_task(event_id=d.pk)
+        self.assertEqual(mock_notify.call_count, 1)
+        self.assertEqual(mock_notify.call_args, mock.call(d))
+        mock_notify.reset_mock()
+
+        d.delete()
+        notify_event_to_subscribers_task(event_id=d.pk)
+        self.assertFalse(mock_notify.called)
diff --git a/ietf/community/urls.py b/ietf/community/urls.py
index f80547ffad..3ab132f2dc 100644
--- a/ietf/community/urls.py
+++ b/ietf/community/urls.py
@@ -4,11 +4,11 @@
 from ietf.utils.urls import url
 
 urlpatterns = [
-    url(r'^personal/(?P<username>[^/]+)/$', views.view_list),
-    url(r'^personal/(?P<username>[^/]+)/manage/$', views.manage_list),
-    url(r'^personal/(?P<username>[^/]+)/trackdocument/(?P<name>[^/]+)/$', views.track_document),
-    url(r'^personal/(?P<username>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', views.untrack_document),
-    url(r'^personal/(?P<username>[^/]+)/csv/$', views.export_to_csv),
-    url(r'^personal/(?P<username>[^/]+)/feed/$', views.feed),
-    url(r'^personal/(?P<username>[^/]+)/subscription/$', views.subscription),
+    url(r'^personal/(?P<email_or_name>[^/]+)/$', views.view_list),
+    url(r'^personal/(?P<email_or_name>[^/]+)/manage/$', views.manage_list),
+    url(r'^personal/(?P<email_or_name>[^/]+)/trackdocument/(?P<name>[^/]+)/$', views.track_document),
+    url(r'^personal/(?P<email_or_name>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', views.untrack_document),
+    url(r'^personal/(?P<email_or_name>[^/]+)/csv/$', views.export_to_csv),
+    url(r'^personal/(?P<email_or_name>[^/]+)/feed/$', views.feed),
+    url(r'^personal/(?P<email_or_name>[^/]+)/subscription/$', views.subscription),
 ]
diff --git a/ietf/community/utils.py b/ietf/community/utils.py
index 06da50011c..b6137095ef 100644
--- a/ietf/community/utils.py
+++ b/ietf/community/utils.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
+# Copyright The IETF Trust 2016-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -11,11 +11,9 @@
 
 from ietf.community.models import CommunityList, EmailSubscription, SearchRule
 from ietf.doc.models import Document, State
-from ietf.group.models import Role, Group
+from ietf.group.models import Role
 from ietf.person.models import Person
 from ietf.ietfauth.utils import has_role
-from django.contrib.auth.models import User
-from django.shortcuts import get_object_or_404
 
 from ietf.utils.mail import send_mail
 
@@ -29,24 +27,12 @@ def states_of_significant_change():
         Q(type="draft", slug__in=['rfc', 'dead'])
     )
 
-def lookup_community_list(username=None, acronym=None):
-    assert username or acronym
-
-    if acronym:
-        group = get_object_or_404(Group, acronym=acronym)
-        clist = CommunityList.objects.filter(group=group).first() or CommunityList(group=group)
-    else:
-        user = get_object_or_404(User, username=username)
-        clist = CommunityList.objects.filter(user=user).first() or CommunityList(user=user)
-
-    return clist
-
 def can_manage_community_list(user, clist):
     if not user or not user.is_authenticated:
         return False
 
-    if clist.user:
-        return user == clist.user
+    if clist.person:
+        return user == clist.person.user
     elif clist.group:
         if has_role(user, 'Secretariat'):
             return True
@@ -60,7 +46,7 @@ def reset_name_contains_index_for_rule(rule):
     if not rule.rule_type == "name_contains":
         return
 
-    rule.name_contains_index.set(Document.objects.filter(docalias__name__regex=rule.text))
+    rule.name_contains_index.set(Document.objects.filter(name__regex=rule.text))
 
 def update_name_contains_indexes_with_new_doc(doc):
     for r in SearchRule.objects.filter(rule_type="name_contains"):
@@ -71,71 +57,113 @@ def update_name_contains_indexes_with_new_doc(doc):
         if re.search(r.text, doc.name) and not doc in r.name_contains_index.all():
             r.name_contains_index.add(doc)
 
+
 def docs_matching_community_list_rule(rule):
     docs = Document.objects.all()
+    
+    if rule.rule_type.endswith("_rfc"):
+        docs = docs.filter(type_id="rfc")  # rule.state is ignored for RFCs
+    else:
+        docs = docs.filter(type_id="draft", states=rule.state)
+    
     if rule.rule_type in ['group', 'area', 'group_rfc', 'area_rfc']:
-        return docs.filter(Q(group=rule.group_id) | Q(group__parent=rule.group_id), states=rule.state)
+        return docs.filter(Q(group=rule.group_id) | Q(group__parent=rule.group_id))
     elif rule.rule_type in ['group_exp']:
-        return docs.filter(group=rule.group_id, states=rule.state)
+        return docs.filter(group=rule.group_id)
     elif rule.rule_type.startswith("state_"):
-        return docs.filter(states=rule.state)
-    elif rule.rule_type in ["author", "author_rfc"]:
-        return docs.filter(states=rule.state, documentauthor__person=rule.person)
+        return docs
+    elif rule.rule_type == "author": 
+        return docs.filter(documentauthor__person=rule.person)
+    elif rule.rule_type == "author_rfc":
+        return docs.filter(Q(rfcauthor__person=rule.person)|Q(rfcauthor__isnull=True,documentauthor__person=rule.person))
     elif rule.rule_type == "ad":
-        return docs.filter(states=rule.state, ad=rule.person)
+        return docs.filter(ad=rule.person)
     elif rule.rule_type == "shepherd":
-        return docs.filter(states=rule.state, shepherd__person=rule.person)
+        return docs.filter(shepherd__person=rule.person)
     elif rule.rule_type == "name_contains":
-        return docs.filter(states=rule.state, searchrule=rule)
+        return docs.filter(searchrule=rule)
 
     raise NotImplementedError
 
-def community_list_rules_matching_doc(doc):
-    states = list(doc.states.values_list("pk", flat=True))
 
+def community_list_rules_matching_doc(doc):
     rules = SearchRule.objects.none()
+    if doc.type_id not in ["draft", "rfc"]:
+        return rules  # none
+    states = list(doc.states.values_list("pk", flat=True))
 
+    # group and area rules
     if doc.group_id:
         groups = [doc.group_id]
         if doc.group.parent_id:
             groups.append(doc.group.parent_id)
+        rules_to_add = SearchRule.objects.filter(group__in=groups)
+        if doc.type_id == "rfc":
+            rules_to_add = rules_to_add.filter(rule_type__in=["group_rfc", "area_rfc"])
+        else:
+            rules_to_add = rules_to_add.filter(
+                rule_type__in=["group", "area", "group_exp"],
+                state__in=states,
+            )
+        rules |= rules_to_add
+
+    # state rules (only relevant for I-Ds)
+    if doc.type_id == "draft":
         rules |= SearchRule.objects.filter(
-            rule_type__in=['group', 'area', 'group_rfc', 'area_rfc', 'group_exp'],
+            rule_type__in=[
+                "state_iab",
+                "state_iana",
+                "state_iesg",
+                "state_irtf",
+                "state_ise",
+                "state_rfceditor",
+                "state_ietf",
+            ],
             state__in=states,
-            group__in=groups
         )
 
-    rules |= SearchRule.objects.filter(
-        rule_type__in=['state_iab', 'state_iana', 'state_iesg', 'state_irtf', 'state_ise', 'state_rfceditor', 'state_ietf'],
-        state__in=states,
-    )
-
-    rules |= SearchRule.objects.filter(
-        rule_type__in=["author", "author_rfc"],
-        state__in=states,
-        person__in=list(Person.objects.filter(documentauthor__document=doc)),
-    )
-
-    if doc.ad_id:
+    # author rules
+    if doc.type_id == "rfc":
+        has_rfcauthors = doc.rfcauthor_set.exists()
+        rules |= SearchRule.objects.filter(
+            rule_type="author_rfc",
+            person__in=list(
+                Person.objects.filter(
+                    Q(rfcauthor__document=doc)
+                    if has_rfcauthors
+                    else Q(documentauthor__document=doc)
+                )
+            ),
+        )
+    else:
         rules |= SearchRule.objects.filter(
-            rule_type="ad",
+            rule_type="author",
             state__in=states,
-            person=doc.ad_id,
+            person__in=list(Person.objects.filter(documentauthor__document=doc)),
         )
 
-    if doc.shepherd_id:
+    # Other draft-only rules rules
+    if doc.type_id == "draft":
+        if doc.ad_id:
+            rules |= SearchRule.objects.filter(
+                rule_type="ad",
+                state__in=states,
+                person=doc.ad_id,
+            )
+
+        if doc.shepherd_id:
+            rules |= SearchRule.objects.filter(
+                rule_type="shepherd",
+                state__in=states,
+                person__email=doc.shepherd_id,
+            )
+
         rules |= SearchRule.objects.filter(
-            rule_type="shepherd",
+            rule_type="name_contains",
             state__in=states,
-            person__email=doc.shepherd_id,
+            name_contains_index=doc,  # search our materialized index to avoid full scan
         )
 
-    rules |= SearchRule.objects.filter(
-        rule_type="name_contains",
-        state__in=states,
-        name_contains_index=doc, # search our materialized index to avoid full scan
-    )
-
     return rules
 
 
@@ -146,7 +174,11 @@ def docs_tracked_by_community_list(clist):
     # in theory, we could use an OR query, but databases seem to have
     # trouble with OR queries and complicated joins so do the OR'ing
     # manually
-    doc_ids = set(clist.added_docs.values_list("pk", flat=True))
+    doc_ids = set()
+    for doc in clist.added_docs.all():
+        doc_ids.add(doc.pk)
+        doc_ids.update(rfc.pk for rfc in doc.related_that_doc("became_rfc"))
+
     for rule in clist.searchrule_set.all():
         doc_ids = doc_ids | set(docs_matching_community_list_rule(rule).values_list("pk", flat=True))
 
diff --git a/ietf/community/views.py b/ietf/community/views.py
index c67f992d6f..08b1c24fe5 100644
--- a/ietf/community/views.py
+++ b/ietf/community/views.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -10,62 +10,122 @@
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import get_object_or_404, render
 from django.contrib.auth.decorators import login_required
+from django.utils import timezone
 from django.utils.html import strip_tags
 
-import debug                            # pyflakes:ignore
-
-from ietf.community.models import SearchRule, EmailSubscription
-from ietf.community.forms import SearchRuleTypeForm, SearchRuleForm, AddDocumentsForm, SubscriptionForm
-from ietf.community.utils import lookup_community_list, can_manage_community_list
-from ietf.community.utils import docs_tracked_by_community_list, docs_matching_community_list_rule
-from ietf.community.utils import states_of_significant_change, reset_name_contains_index_for_rule
+import debug  # pyflakes:ignore
+
+from ietf.community.models import CommunityList, EmailSubscription, SearchRule
+from ietf.community.forms import (
+    SearchRuleTypeForm,
+    SearchRuleForm,
+    AddDocumentsForm,
+    SubscriptionForm,
+)
+from ietf.community.utils import can_manage_community_list
+from ietf.community.utils import (
+    docs_tracked_by_community_list,
+    docs_matching_community_list_rule,
+)
+from ietf.community.utils import (
+    states_of_significant_change,
+    reset_name_contains_index_for_rule,
+)
+from ietf.group.models import Group
 from ietf.doc.models import DocEvent, Document
 from ietf.doc.utils_search import prepare_document_table
+from ietf.person.utils import lookup_persons
+from ietf.utils.decorators import ignore_view_kwargs
+from ietf.utils.http import is_ajax
 from ietf.utils.response import permission_denied
 
-def view_list(request, username=None):
-    clist = lookup_community_list(username)
 
+def lookup_community_list(request, email_or_name=None, acronym=None):
+    """Finds a CommunityList for a person or group
+
+    Instantiates an unsaved CommunityList if one is not found.
+
+    If the person or group cannot be found and uniquely identified, raises an Http404 exception
+    """
+    assert email_or_name or acronym
+
+    if acronym:
+        group = get_object_or_404(Group, acronym=acronym)
+        clist = CommunityList.objects.filter(group=group).first() or CommunityList(
+            group=group
+        )
+    else:
+        persons = lookup_persons(email_or_name)
+        if len(persons) > 1:
+            if hasattr(request.user, "person") and request.user.person in persons:
+                person = request.user.person
+            else:
+                raise Http404(
+                    f"Unable to identify the CommunityList for {email_or_name}"
+                )
+        else:
+            person = persons[0]
+        clist = CommunityList.objects.filter(person=person).first() or CommunityList(
+            person=person
+        )
+    return clist
+
+
+def view_list(request, email_or_name=None):
+    clist = lookup_community_list(request, email_or_name)  # may raise Http404
     docs = docs_tracked_by_community_list(clist)
     docs, meta = prepare_document_table(request, docs, request.GET)
 
-    subscribed = request.user.is_authenticated and EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user)
+    subscribed = request.user.is_authenticated and (
+        EmailSubscription.objects.none()
+        if clist.pk is None
+        else EmailSubscription.objects.filter(
+            community_list=clist, email__person__user=request.user
+        )
+    )
+
+    return render(
+        request,
+        "community/view_list.html",
+        {
+            "clist": clist,
+            "docs": docs,
+            "meta": meta,
+            "can_manage_list": can_manage_community_list(request.user, clist),
+            "subscribed": subscribed,
+            "email_or_name": email_or_name,
+        },
+    )
 
-    return render(request, 'community/view_list.html', {
-        'clist': clist,
-        'docs': docs,
-        'meta': meta,
-        'can_manage_list': can_manage_community_list(request.user, clist),
-        'subscribed': subscribed,
-    })
 
 @login_required
-def manage_list(request, username=None, acronym=None, group_type=None):
+@ignore_view_kwargs("group_type")
+def manage_list(request, email_or_name=None, acronym=None):
     # we need to be a bit careful because clist may not exist in the
     # database so we can't call related stuff on it yet
-    clist = lookup_community_list(username, acronym)
+    clist = lookup_community_list(request, email_or_name, acronym)  # may raise Http404
 
     if not can_manage_community_list(request.user, clist):
         permission_denied(request, "You do not have permission to access this view")
 
-    action = request.POST.get('action')
+    action = request.POST.get("action")
 
-    if request.method == 'POST' and action == 'add_documents':
+    if request.method == "POST" and action == "add_documents":
         add_doc_form = AddDocumentsForm(request.POST)
         if add_doc_form.is_valid():
             if clist.pk is None:
                 clist.save()
 
-            for d in add_doc_form.cleaned_data['documents']:
-                if not d in clist.added_docs.all():
+            for d in add_doc_form.cleaned_data["documents"]:
+                if d not in clist.added_docs.all():
                     clist.added_docs.add(d)
 
             return HttpResponseRedirect("")
     else:
         add_doc_form = AddDocumentsForm()
 
-    if request.method == 'POST' and action == 'remove_document':
-        document_id = request.POST.get('document')
+    if request.method == "POST" and action == "remove_document":
+        document_id = request.POST.get("document")
         if clist.pk is not None and document_id:
             document = get_object_or_404(clist.added_docs, id=document_id)
             clist.added_docs.remove(document)
@@ -73,30 +133,29 @@ def manage_list(request, username=None, acronym=None, group_type=None):
             return HttpResponseRedirect("")
 
     rule_form = None
-    if request.method == 'POST' and action == 'add_rule':
+    if request.method == "POST" and action == "add_rule":
         rule_type_form = SearchRuleTypeForm(request.POST)
         if rule_type_form.is_valid():
-            rule_type = rule_type_form.cleaned_data['rule_type']
-
-        if rule_type:
-            rule_form = SearchRuleForm(clist, rule_type, request.POST)
-            if rule_form.is_valid():
-                if clist.pk is None:
-                    clist.save()
-
-                rule = rule_form.save(commit=False)
-                rule.community_list = clist
-                rule.rule_type = rule_type
-                rule.save()
-                if rule.rule_type == "name_contains":
-                    reset_name_contains_index_for_rule(rule)
+            rule_type = rule_type_form.cleaned_data["rule_type"]
+            if rule_type:
+                rule_form = SearchRuleForm(clist, rule_type, request.POST)
+                if rule_form.is_valid():
+                    if clist.pk is None:
+                        clist.save()
+
+                    rule = rule_form.save(commit=False)
+                    rule.community_list = clist
+                    rule.rule_type = rule_type
+                    rule.save()
+                    if rule.rule_type == "name_contains":
+                        reset_name_contains_index_for_rule(rule)
 
                 return HttpResponseRedirect("")
     else:
         rule_type_form = SearchRuleTypeForm()
 
-    if request.method == 'POST' and action == 'remove_rule':
-        rule_pk = request.POST.get('rule')
+    if request.method == "POST" and action == "remove_rule":
+        rule_pk = request.POST.get("rule")
         if clist.pk is not None and rule_pk:
             rule = get_object_or_404(SearchRule, pk=rule_pk, community_list=clist)
             rule.delete()
@@ -107,53 +166,74 @@ def manage_list(request, username=None, acronym=None, group_type=None):
     for r in rules:
         r.matching_documents_count = docs_matching_community_list_rule(r).count()
 
-    empty_rule_forms = { rule_type: SearchRuleForm(clist, rule_type) for rule_type, _ in SearchRule.RULE_TYPES }
+    empty_rule_forms = {
+        rule_type: SearchRuleForm(clist, rule_type)
+        for rule_type, _ in SearchRule.RULE_TYPES
+    }
 
     total_count = docs_tracked_by_community_list(clist).count()
 
-    all_forms = [f for f in [rule_type_form, rule_form, add_doc_form, *empty_rule_forms.values()]
-                 if f is not None]
-    return render(request, 'community/manage_list.html', {
-        'clist': clist,
-        'rules': rules,
-        'individually_added': clist.added_docs.all() if clist.pk is not None else [],
-        'rule_type_form': rule_type_form,
-        'rule_form': rule_form,
-        'empty_rule_forms': empty_rule_forms,
-        'total_count': total_count,
-        'add_doc_form': add_doc_form,
-        'all_forms': all_forms,
-    })
+    all_forms = [
+        f
+        for f in [rule_type_form, rule_form, add_doc_form, *empty_rule_forms.values()]
+        if f is not None
+    ]
+    return render(
+        request,
+        "community/manage_list.html",
+        {
+            "clist": clist,
+            "rules": rules,
+            "individually_added": (
+                clist.added_docs.all() if clist.pk is not None else []
+            ),
+            "rule_type_form": rule_type_form,
+            "rule_form": rule_form,
+            "empty_rule_forms": empty_rule_forms,
+            "total_count": total_count,
+            "add_doc_form": add_doc_form,
+            "all_forms": all_forms,
+        },
+    )
 
 
 @login_required
-def track_document(request, name, username=None, acronym=None):
-    doc = get_object_or_404(Document, docalias__name=name)
+def track_document(request, name, email_or_name=None, acronym=None):
+    doc = get_object_or_404(Document, name=name)
 
     if request.method == "POST":
-        clist = lookup_community_list(username, acronym)
+        clist = lookup_community_list(
+            request, email_or_name, acronym
+        )  # may raise Http404
         if not can_manage_community_list(request.user, clist):
             permission_denied(request, "You do not have permission to access this view")
 
         if clist.pk is None:
             clist.save()
 
-        if not doc in clist.added_docs.all():
+        if doc not in clist.added_docs.all():
             clist.added_docs.add(doc)
 
-        if request.is_ajax():
-            return HttpResponse(json.dumps({ 'success': True }), content_type='application/json')
+        if is_ajax(request):
+            return HttpResponse(
+                json.dumps({"success": True}), content_type="application/json"
+            )
         else:
             return HttpResponseRedirect(clist.get_absolute_url())
 
-    return render(request, "community/track_document.html", {
-        "name": doc.name,
-    })
+    return render(
+        request,
+        "community/track_document.html",
+        {
+            "name": doc.name,
+        },
+    )
+
 
 @login_required
-def untrack_document(request, name, username=None, acronym=None):
-    doc = get_object_or_404(Document, docalias__name=name)
-    clist = lookup_community_list(username, acronym)
+def untrack_document(request, name, email_or_name=None, acronym=None):
+    doc = get_object_or_404(Document, name=name)
+    clist = lookup_community_list(request, email_or_name, acronym)  # may raise Http404
     if not can_manage_community_list(request.user, clist):
         permission_denied(request, "You do not have permission to access this view")
 
@@ -161,29 +241,35 @@ def untrack_document(request, name, username=None, acronym=None):
         if clist.pk is not None:
             clist.added_docs.remove(doc)
 
-        if request.is_ajax():
-            return HttpResponse(json.dumps({ 'success': True }), content_type='application/json')
+        if is_ajax(request):
+            return HttpResponse(
+                json.dumps({"success": True}), content_type="application/json"
+            )
         else:
             return HttpResponseRedirect(clist.get_absolute_url())
 
-    return render(request, "community/untrack_document.html", {
-        "name": doc.name,
-    })
-
+    return render(
+        request,
+        "community/untrack_document.html",
+        {
+            "name": doc.name,
+        },
+    )
 
-def export_to_csv(request, username=None, acronym=None, group_type=None):
-    clist = lookup_community_list(username, acronym)
 
-    response = HttpResponse(content_type='text/csv')
+@ignore_view_kwargs("group_type")
+def export_to_csv(request, email_or_name=None, acronym=None):
+    clist = lookup_community_list(request, email_or_name, acronym)  # may raise Http404
+    response = HttpResponse(content_type="text/csv")
 
     if clist.group:
         filename = "%s-draft-list.csv" % clist.group.acronym
     else:
         filename = "draft-list.csv"
 
-    response['Content-Disposition'] = 'attachment; filename=%s' % filename
+    response["Content-Disposition"] = "attachment; filename=%s" % filename
 
-    writer = csv.writer(response, dialect=csv.excel, delimiter=str(','))
+    writer = csv.writer(response, dialect=csv.excel, delimiter=str(","))
 
     header = [
         "Name",
@@ -196,12 +282,12 @@ def export_to_csv(request, username=None, acronym=None, group_type=None):
     ]
     writer.writerow(header)
 
-    docs = docs_tracked_by_community_list(clist).select_related('type', 'group', 'ad')
+    docs = docs_tracked_by_community_list(clist).select_related("type", "group", "ad")
     for doc in docs.prefetch_related("states", "tags"):
         row = []
         row.append(doc.name)
         row.append(doc.title)
-        e = doc.latest_event(type='new_revision')
+        e = doc.latest_event(type="new_revision")
         row.append(e.time.strftime("%Y-%m-%d") if e else "")
         row.append(strip_tags(doc.friendly_state()))
         row.append(doc.group.acronym if doc.group else "")
@@ -212,53 +298,73 @@ def export_to_csv(request, username=None, acronym=None, group_type=None):
 
     return response
 
-def feed(request, username=None, acronym=None, group_type=None):
-    clist = lookup_community_list(username, acronym)
 
-    significant = request.GET.get('significant', '') == '1'
+@ignore_view_kwargs("group_type")
+def feed(request, email_or_name=None, acronym=None):
+    clist = lookup_community_list(request, email_or_name, acronym)  # may raise Http404
+    significant = request.GET.get("significant", "") == "1"
 
-    documents = docs_tracked_by_community_list(clist).values_list('pk', flat=True)
-    since = datetime.datetime.now() - datetime.timedelta(days=14)
+    documents = docs_tracked_by_community_list(clist).values_list("pk", flat=True)
+    updated = timezone.now()
+    since = updated - datetime.timedelta(days=14)
 
-    events = DocEvent.objects.filter(
-        doc__id__in=documents,
-        time__gte=since,
-    ).distinct().order_by('-time', '-id').select_related("doc")
+    events = (
+        DocEvent.objects.filter(
+            doc__id__in=documents,
+            time__gte=since,
+        )
+        .distinct()
+        .order_by("-time", "-id")
+        .select_related("doc")
+    )
 
     if significant:
-        events = events.filter(type="changed_state", statedocevent__state__in=list(states_of_significant_change()))
+        events = events.filter(
+            type="changed_state",
+            statedocevent__state__in=list(states_of_significant_change()),
+        )
 
     host = request.get_host()
-    feed_url = 'https://%s%s' % (host, request.get_full_path())
+    feed_url = "https://%s%s" % (host, request.get_full_path())
     feed_id = uuid.uuid5(uuid.NAMESPACE_URL, str(feed_url))
-    title = '%s RSS Feed' % clist.long_name()
+    title = "%s RSS Feed" % clist.long_name()
     if significant:
-        subtitle = 'Significant document changes'
+        subtitle = "Significant document changes"
     else:
-        subtitle = 'Document changes'
-
-    return render(request, 'community/atom.xml', {
-        'clist': clist,
-        'entries': events[:50],
-        'title': title,
-        'subtitle': subtitle,
-        'id': feed_id.urn,
-        'updated': datetime.datetime.now(),
-    }, content_type='text/xml')
+        subtitle = "Document changes"
+
+    return render(
+        request,
+        "community/atom.xml",
+        {
+            "clist": clist,
+            "entries": events[:50],
+            "title": title,
+            "subtitle": subtitle,
+            "id": feed_id.urn,
+            "updated": updated,
+        },
+        content_type="text/xml",
+    )
 
 
 @login_required
-def subscription(request, username=None, acronym=None, group_type=None):
-    clist = lookup_community_list(username, acronym)
+@ignore_view_kwargs("group_type")
+def subscription(request, email_or_name=None, acronym=None):
+    clist = lookup_community_list(request, email_or_name, acronym)  # may raise Http404
     if clist.pk is None:
         raise Http404
 
-    existing_subscriptions = EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user)
+    person = request.user.person
+
+    existing_subscriptions = EmailSubscription.objects.filter(
+        community_list=clist, email__person=person
+    )
 
-    if request.method == 'POST':
+    if request.method == "POST":
         action = request.POST.get("action")
         if action == "subscribe":
-            form = SubscriptionForm(request.user, clist, request.POST)
+            form = SubscriptionForm(person, clist, request.POST)
             if form.is_valid():
                 subscription = form.save(commit=False)
                 subscription.community_list = clist
@@ -267,14 +373,20 @@ def subscription(request, username=None, acronym=None, group_type=None):
                 return HttpResponseRedirect("")
 
         elif action == "unsubscribe":
-            existing_subscriptions.filter(pk=request.POST.get("subscription_id")).delete()
+            existing_subscriptions.filter(
+                pk=request.POST.get("subscription_id")
+            ).delete()
 
             return HttpResponseRedirect("")
     else:
-        form = SubscriptionForm(request.user, clist)
-
-    return render(request, 'community/subscription.html', {
-        'clist': clist,
-        'form': form,
-        'existing_subscriptions': existing_subscriptions,
-    })
+        form = SubscriptionForm(person, clist)
+
+    return render(
+        request,
+        "community/subscription.html",
+        {
+            "clist": clist,
+            "form": form,
+            "existing_subscriptions": existing_subscriptions,
+        },
+    )
diff --git a/ietf/context_processors.py b/ietf/context_processors.py
index 618a896acd..5aaa4ab256 100644
--- a/ietf/context_processors.py
+++ b/ietf/context_processors.py
@@ -3,7 +3,9 @@
 import sys
 import django
 from django.conf import settings
+from django.utils import timezone
 from ietf import __version__, __patch__, __release_branch__, __release_hash__
+from opentelemetry.propagate import inject
 
 def server_mode(request):
     return {'server_mode': settings.SERVER_MODE}
@@ -44,4 +46,14 @@ def sql_debug(request):
 def settings_info(request):
     return {
         'settings': settings,
-    }
\ No newline at end of file
+    }
+
+def timezone_now(request):
+    return {
+        'timezone_now': timezone.now(),
+    }
+
+def traceparent_id(request):
+    context_extras = {}
+    inject(context_extras)
+    return { "otel": context_extras }
diff --git a/ietf/cookies/.gitignore b/ietf/cookies/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/cookies/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/database-notes/.gitignore b/ietf/database-notes/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/database-notes/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/dbtemplate/fixtures/nomcom_templates.xml b/ietf/dbtemplate/fixtures/nomcom_templates.xml
index 369cad73c9..e7065b84cd 100644
--- a/ietf/dbtemplate/fixtures/nomcom_templates.xml
+++ b/ietf/dbtemplate/fixtures/nomcom_templates.xml
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="utf-8"?>
-<django-objects version="1.0">
-    <object pk="1" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/home.rst</field>
-        <field type="CharField" name="title">Home page of group</field>
-        <field type="TextField" name="variables"></field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
-        <field type="TextField" name="content">Home page
-=========
-
-This is the home page of the nomcom group.</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="2" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/email/inexistent_person.txt</field>
-        <field type="CharField" name="title">Email sent to chair of nomcom and secretariat when Email and Person are created if some of them don't exist</field>
-        <field type="TextField" name="variables">$email: Newly created email
-$fullname: Fullname of the new person
-$person_id: Id of the new Person object
-$group: Name of the group</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">Hello,
-
-A new person with name $fullname and email $email has been created. The new Person object has the following id: '$person_id'.
-
-Please, check if there is some more action nedeed.</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="3" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/email/new_nominee.txt</field>
-        <field type="CharField" name="title">Email sent to nominees when they are nominated</field>
-        <field type="TextField" name="variables">$nominee: Full name of the nominee
-$position: Name of the position
-$domain: Server domain
-$accept_url: Url hash to accept nominations
-$decline_url: Url hash to decline nominations</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">Hi,
-
-You have been nominated for the position of $position.
-
-The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position.
-
-You can accept the nomination via web going to the following link http://$domain$accept_url or decline the nomination going the following link http://$domain$decline_url
-
-If you accept, you will need to fill out a questionnaire.  You will receive the questionnaire by email.
-
-Best regards,
-</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="4" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/email/new_nomination.txt</field>
-        <field type="CharField" name="title">Email sent to nominators and secretariat when the nominators make the nominations</field>
-        <field type="TextField" name="variables">$nominator: Full name of the nominator
-$nominator_email: Email of the nominator
-$nominee: Full name of the nominee
-$nominee_email: Email of the nominee
-$position: Nomination position</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">A new nomination have been received.
-
-Nominator: $nominator ($nominator_email)
-Nominee: $nominee ($nominee_email)
-Position: $position</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="5" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/position/questionnaire.txt</field>
-        <field type="CharField" name="title">Questionnaire sent to the nomine</field>
-        <field type="TextField" name="variables">$position: Position</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">Enter here the questionnaire for the position $position:
-
-Questionnaire</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="6" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/position/requirements</field>
-        <field type="CharField" name="title">Position requirements</field>
-        <field type="TextField" name="variables">$position: Position</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
-        <field type="TextField" name="content">These are the requirements for the position $position:
-
-Requirements.</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="7" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/position/header_questionnaire.txt</field>
-        <field type="CharField" name="title">Header of the email that contains the questionnaire sent to the nomine</field>
-        <field type="TextField" name="variables">$nominee: Full name of the nomine
-$position: Position</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">Hi $nominee, this is the questionnaire for the position $position:
-
-</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="8" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/email/nomination_accept_reminder.txt</field>
-        <field type="CharField" name="title">Email sent to nominees asking them to accept (or decline) the nominations.</field>
-        <field type="TextField" name="variables">$positions: Nomination positions</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">Hi,
-
-You have been nominated for the position of $position.
-
-The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position.
-
-You can accept the nomination via web going to the following link http://$domain$accept_url or decline the nomination going the following link http://$domain$decline_url
-
-If you accept, you will need to fill out a questionnaire.
-
-Best regards,</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="9" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/email/nomination_receipt.txt</field>
-        <field type="CharField" name="title">Email sent to nominator to get a confirmation mail containing feedback in cleartext</field>
-        <field type="TextField" name="variables">$nominee: Full name of the nominee
-$position: Name of the position
-$domain: Server domain
-$accept_url: Url hash to accept nominations
-$decline_url: Url hash to decline nominations</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">Hi,
-
-Your nomination of $nominee for the position of
-$position has been received and registered.
-
-The following comments have also been registered:
-
---------------------------------------------------------------------------
-$comments
---------------------------------------------------------------------------
-
-Thank you,</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="10" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/email/feedback_receipt.txt</field>
-        <field type="CharField" name="title">Email sent to feedback author to get a confirmation mail containing feedback in cleartext</field>
-        <field type="TextField" name="variables">$nominee: Full name of the nominee
-$position: Nomination position
-$comments: Comments on this candidate</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">Hi,
-
-Your input regarding $about has been received and registered.
-
-The following comments have been registered:
-
---------------------------------------------------------------------------
-$comments
---------------------------------------------------------------------------
-
-Thank you,</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="11" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/email/questionnaire_reminder.txt</field>
-        <field type="CharField" name="title">Email sent to nominees reminding them to complete a questionnaire</field>
-        <field type="TextField" name="variables">$positions: Nomination positions</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
-        <field type="TextField" name="content">
-Thank you for accepting your nomination for the position of $position.
-
-Please remember to complete and return the questionnaire for this position at your earliest opportunity.
-The questionaire is repeated below for your convenience.
-
---------</field>
-        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
-    </object>
-    <object pk="12" model="dbtemplate.dbtemplate">
-      <field type="CharField" name="path">/nomcom/defaults/topic/description</field>
-      <field type="CharField" name="title">Description of Topic</field>
-      <field type="TextField" name="variables">$topic: Topic'</field>
-      <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
-      <field type="TextField" name="content">This is a description of the topic "$topic"
-
-Describe the topic and add any information/instructions for the responder here.
-</field>
-    </object>
-    <object pk="13" model="dbtemplate.dbtemplate">
-        <field type="CharField" name="path">/nomcom/defaults/iesg_requirements</field>
-        <field type="CharField" name="title">Generic IESG Requirements</field>
-        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
-        <field type="TextField" name="content">Generic IESG Requirements Yo!</field>
-    </object>
-</django-objects>
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+    <object pk="1" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/home.rst</field>
+        <field type="CharField" name="title">Home page of group</field>
+        <field type="TextField" name="variables"></field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
+        <field type="TextField" name="content">Home page
+=========
+
+This is the home page of the nomcom group.</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="2" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/email/inexistent_person.txt</field>
+        <field type="CharField" name="title">Email sent to chair of nomcom and secretariat when Email and Person are created if some of them don't exist</field>
+        <field type="TextField" name="variables">$email: Newly created email
+$fullname: Fullname of the new person
+$person_id: Id of the new Person object
+$group: Name of the group</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">Hello,
+
+A new person with name $fullname and email $email has been created. The new Person object has the following id: '$person_id'.
+
+Please, check if there is some more action nedeed.</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="3" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/email/new_nominee.txt</field>
+        <field type="CharField" name="title">Email sent to nominees when they are nominated</field>
+        <field type="TextField" name="variables">$nominee: Full name of the nominee
+$position: Name of the position
+$domain: Server domain
+$accept_url: Url hash to accept nominations
+$decline_url: Url hash to decline nominations</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">Hi,
+
+You have been nominated for the position of $position.
+
+The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position.
+
+You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url
+
+If you accept, you will need to fill out a questionnaire.  You will receive the questionnaire by email.
+
+Best regards,
+</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="4" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/email/new_nomination.txt</field>
+        <field type="CharField" name="title">Email sent to nominators and secretariat when the nominators make the nominations</field>
+        <field type="TextField" name="variables">$nominator: Full name of the nominator
+$nominator_email: Email of the nominator
+$nominee: Full name of the nominee
+$nominee_email: Email of the nominee
+$position: Nomination position</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">A new nomination have been received.
+
+Nominator: $nominator ($nominator_email)
+Nominee: $nominee ($nominee_email)
+Position: $position</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="5" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/position/questionnaire.txt</field>
+        <field type="CharField" name="title">Questionnaire sent to the nomine</field>
+        <field type="TextField" name="variables">$position: Position</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">Enter here the questionnaire for the position $position:
+
+Questionnaire</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="6" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/position/requirements</field>
+        <field type="CharField" name="title">Position requirements</field>
+        <field type="TextField" name="variables">$position: Position</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
+        <field type="TextField" name="content">These are the requirements for the position $position:
+
+Requirements.</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="7" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/position/header_questionnaire.txt</field>
+        <field type="CharField" name="title">Header of the email that contains the questionnaire sent to the nomine</field>
+        <field type="TextField" name="variables">$nominee: Full name of the nomine
+$position: Position</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">Hi $nominee, this is the questionnaire for the position $position:
+
+</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="8" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/email/nomination_accept_reminder.txt</field>
+        <field type="CharField" name="title">Email sent to nominees asking them to accept (or decline) the nominations.</field>
+        <field type="TextField" name="variables">$positions: Nomination positions</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">Hi,
+
+You have been nominated for the position of $position.
+
+The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position.
+
+You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url
+
+If you accept, you will need to fill out a questionnaire.
+
+Best regards,</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="9" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/email/nomination_receipt.txt</field>
+        <field type="CharField" name="title">Email sent to nominator to get a confirmation mail containing feedback in cleartext</field>
+        <field type="TextField" name="variables">$nominee: Full name of the nominee
+$position: Name of the position
+$domain: Server domain
+$accept_url: Url hash to accept nominations
+$decline_url: Url hash to decline nominations</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">Hi,
+
+Your nomination of $nominee for the position of
+$position has been received and registered.
+
+The following comments have also been registered:
+
+--------------------------------------------------------------------------
+$comments
+--------------------------------------------------------------------------
+
+Thank you,</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="10" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/email/feedback_receipt.txt</field>
+        <field type="CharField" name="title">Email sent to feedback author to get a confirmation mail containing feedback in cleartext</field>
+        <field type="TextField" name="variables">$nominee: Full name of the nominee
+$position: Nomination position
+$comments: Comments on this candidate</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">Hi,
+
+Your input regarding $about has been received and registered.
+
+The following comments have been registered:
+
+--------------------------------------------------------------------------
+$comments
+--------------------------------------------------------------------------
+
+Thank you,</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="11" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/email/questionnaire_reminder.txt</field>
+        <field type="CharField" name="title">Email sent to nominees reminding them to complete a questionnaire</field>
+        <field type="TextField" name="variables">$positions: Nomination positions</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
+        <field type="TextField" name="content">
+Thank you for accepting your nomination for the position of $position.
+
+Please remember to complete and return the questionnaire for this position at your earliest opportunity.
+The questionnaire is repeated below for your convenience.
+
+--------</field>
+        <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
+    </object>
+    <object pk="12" model="dbtemplate.dbtemplate">
+      <field type="CharField" name="path">/nomcom/defaults/topic/description</field>
+      <field type="CharField" name="title">Description of Topic</field>
+      <field type="TextField" name="variables">$topic: Topic'</field>
+      <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
+      <field type="TextField" name="content">This is a description of the topic "$topic"
+
+Describe the topic and add any information/instructions for the responder here.
+</field>
+    </object>
+    <object pk="13" model="dbtemplate.dbtemplate">
+        <field type="CharField" name="path">/nomcom/defaults/iesg_requirements</field>
+        <field type="CharField" name="title">Generic IESG Requirements</field>
+        <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
+        <field type="TextField" name="content">Generic IESG Requirements Yo!</field>
+    </object>
+</django-objects>
diff --git a/ietf/dbtemplate/migrations/0001_initial.py b/ietf/dbtemplate/migrations/0001_initial.py
index 53defbda2c..a3a23451f0 100644
--- a/ietf/dbtemplate/migrations/0001_initial.py
+++ b/ietf/dbtemplate/migrations/0001_initial.py
@@ -1,10 +1,6 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from typing import List, Tuple      # pyflakes:ignore
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
+from typing import List, Tuple
 from django.db import migrations, models
 
 
@@ -12,8 +8,8 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]                                   # type: List[Tuple[str]]
+    dependencies: List[Tuple[str, str]] = [
+    ]
 
     operations = [
         migrations.CreateModel(
diff --git a/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py b/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py
deleted file mode 100644
index 9cff93f4af..0000000000
--- a/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('group', '0001_initial'),
-        ('name', '0001_initial'),
-        ('dbtemplate', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='dbtemplate',
-            name='group',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AddField(
-            model_name='dbtemplate',
-            name='type',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DBTemplateTypeName'),
-        ),
-    ]
diff --git a/ietf/dbtemplate/migrations/0002_auto_20230320_1222.py b/ietf/dbtemplate/migrations/0002_auto_20230320_1222.py
new file mode 100644
index 0000000000..5aa713635f
--- /dev/null
+++ b/ietf/dbtemplate/migrations/0002_auto_20230320_1222.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.2.28 on 2023-03-20 19:22
+
+from django.db import migrations
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('dbtemplate', '0001_initial'),
+        ('group', '0001_initial'),
+        ('name', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dbtemplate',
+            name='group',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
+        ),
+        migrations.AddField(
+            model_name='dbtemplate',
+            name='type',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DBTemplateTypeName'),
+        ),
+    ]
diff --git a/ietf/dbtemplate/migrations/0003_adjust_review_templates.py b/ietf/dbtemplate/migrations/0003_adjust_review_templates.py
deleted file mode 100644
index d3038c946c..0000000000
--- a/ietf/dbtemplate/migrations/0003_adjust_review_templates.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-03-05 11:39
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate', 'DBTemplate')
-    DBTemplate.objects.filter(id=186).update(content="""I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair.  Please treat these comments just
-like any other last call comments.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document: {{ assignment.review_request.doc.name }}-??
-Reviewer: {{ assignment.reviewer.person.plain_name }}
-Review Date: {{ today }}
-IETF LC End Date: {% if assignment.review_request.doc.most_recent_ietflc %}{{ assignment.review_request.doc.most_recent_ietflc.expires|date:"Y-m-d" }}{% else %}None{% endif %}
-IESG Telechat date: {{ assignment.review_request.doc.telechat_date|default:'Not scheduled for a telechat' }}
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-""")
-
-    DBTemplate.objects.filter(id=187).update(content="""I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair. Please wait for direction from your
-document shepherd or AD before posting a new version of the draft.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document: {{ assignment.review_request.doc.name }}-??
-Reviewer: {{ assignment.reviewer.person.plain_name }}
-Review Date: {{ today }}
-IETF LC End Date: {% if assignment.review_req.doc.most_recent_ietflc %}{{ assignment.review_request.doc.most_recent_ietflc.expires|date:"Y-m-d" }}{% else %}None{% endif %}
-IESG Telechat date: {{ assignment.review_request.doc.telechat_date|default:'Not scheduled for a telechat' }}
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
-""")
-
-def reverse(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
-    DBTemplate.objects.filter(id=186).update(content="""I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair.  Please treat these comments just
-like any other last call comments.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document: {{ review_req.doc.name }}-??
-Reviewer: {{ review_req.reviewer.person.plain_name }}
-Review Date: {{ today }}
-IETF LC End Date: {% if review_req.doc.most_recent_ietflc %}{{ review_req.doc.most_recent_ietflc.expires|date:"Y-m-d" }}{% else %}None{% endif %}
-IESG Telechat date: {{ review_req.doc.telechat_date|default:'Not scheduled for a telechat' }}
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
-""")
-    DBTemplate.objects.filter(id=187).update(content="""I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair. Please wait for direction from your
-document shepherd or AD before posting a new version of the draft.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document: {{ review_req.doc.name }}-??
-Reviewer: {{ review_req.reviewer.person.plain_name }}
-Review Date: {{ today }}
-IETF LC End Date: {% if review_req.doc.most_recent_ietflc %}{{ review_req.doc.most_recent_ietflc.expires|date:"Y-m-d" }}{% else %}None{% endif %}
-IESG Telechat date: {{ review_req.doc.telechat_date|default:'Not scheduled for a telechat' }}
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
-""")
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dbtemplate', '0002_auto_20180220_1052'),
-        ('doc','0011_reviewassignmentdocevent'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py b/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py
deleted file mode 100644
index f9a2496090..0000000000
--- a/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-03-13 13:41
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
-
-    DBTemplate.objects.filter(pk=182).update(content="""{% autoescape off %}Subject: Open review assignments in {{group.acronym}}
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc_id }}-{% if r.review_request..requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request..doc.rev }}{% endif %} {{ r.earlier_review_mark }}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-""")
-
-    DBTemplate.objects.filter(pk=183).update(content="""{% autoescape off %}Subject: Review Assignments
-
-Hi all,
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               Type      LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{r.review_request.type.name|ljust:"10"}}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc_id }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %}{% if r.earlier_review_mark %} {{ r.earlier_review_mark }}{% endif %}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}
-The LC and Telechat review templates are included below:
--------------------------------------------------------
-
--- Begin LC Template --
-I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair.  Please treat these comments just
-like any other last call comments.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document:
-Reviewer:
-Review Date:
-IETF LC End Date:
-IESG Telechat date: (if known)
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
--- End LC Template --
-
--- Begin Telechat Template --
-I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair. Please wait for direction from your
-document shepherd or AD before posting a new version of the draft.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document:
-Reviewer:
-Review Date:
-IETF LC End Date:
-IESG Telechat date: (if known)
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
--- End Telechat Template --
-{% endautoescape %}
-
-""")
-    
-    DBTemplate.objects.filter(pk=184).update(content="""{% autoescape off %}Subject: Assignments
-
-Review instructions and related resources are at:
-http://tools.ietf.org/area/sec/trac/wiki/SecDirReview{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }}{{ r.earlier_review|yesno:'R, , ' }}{% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc_id }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %}{% endfor %}
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-
-""")
-
-    DBTemplate.objects.filter(pk=185).update(content="""{% autoescape off %}Subject: Open review assignments in {{group.acronym}}
-
-Review instructions and related resources are at:
-<https://trac.ietf.org/trac/ops/wiki/Directorates>
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc_id }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %} {{ r.earlier_review_mark }}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-
-""")
-
-
-def reverse(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
-
-    DBTemplate.objects.filter(pk=182).update(content="""{% autoescape off %}Subject: Open review assignments in {{group.acronym}}
-
-The following reviewers have assignments:{% for r in review_requests %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.doc_id }}-{% if r.requested_rev %}{{ r.requested_rev }}{% else %}{{ r.doc.rev }}{% endif %} {{ r.earlier_review_mark }}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-""")
-
-    DBTemplate.objects.filter(pk=183).update(content="""{% autoescape off %}Subject: Review Assignments
-
-Hi all,
-
-The following reviewers have assignments:{% for r in review_requests %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               Type      LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.deadline|date:"Y-m-d" }}{% else %}{{r.type.name|ljust:"10"}}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.doc_id }}-{% if r.requested_rev %}{{ r.requested_rev }}{% else %}{{ r.doc.rev }}{% endif %}{% if r.earlier_review_mark %} {{ r.earlier_review_mark }}{% endif %}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}
-The LC and Telechat review templates are included below:
--------------------------------------------------------
-
--- Begin LC Template --
-I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair.  Please treat these comments just
-like any other last call comments.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document:
-Reviewer:
-Review Date:
-IETF LC End Date:
-IESG Telechat date: (if known)
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
--- End LC Template --
-
--- Begin Telechat Template --
-I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair. Please wait for direction from your
-document shepherd or AD before posting a new version of the draft.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document:
-Reviewer:
-Review Date:
-IETF LC End Date:
-IESG Telechat date: (if known)
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
--- End Telechat Template --
-{% endautoescape %}
-
-""")
-    
-    DBTemplate.objects.filter(pk=184).update(content="""{% autoescape off %}Subject: Assignments
-
-Review instructions and related resources are at:
-http://tools.ietf.org/area/sec/trac/wiki/SecDirReview{% for r in review_requests %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }}{{ r.earlier_review|yesno:'R, , ' }}{% if r.section == 'Early review requests:' %}{{ r.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.doc_id }}-{% if r.requested_rev %}{{ r.requested_rev }}{% else %}{{ r.doc.rev }}{% endif %}{% endfor %}
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-
-""")
-
-    DBTemplate.objects.filter(pk=185).update(content="""{% autoescape off %}Subject: Open review assignments in {{group.acronym}}
-
-Review instructions and related resources are at:
-<https://trac.ietf.org/trac/ops/wiki/Directorates>
-
-The following reviewers have assignments:{% for r in review_requests %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.doc_id }}-{% if r.requested_rev %}{{ r.requested_rev }}{% else %}{{ r.doc.rev }}{% endif %} {{ r.earlier_review_mark }}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-
-""")
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dbtemplate', '0003_adjust_review_templates'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-    ]
diff --git a/ietf/dbtemplate/migrations/0005_adjust_assignment_email_summary_templates_2526.py b/ietf/dbtemplate/migrations/0005_adjust_assignment_email_summary_templates_2526.py
deleted file mode 100644
index 8a07d89364..0000000000
--- a/ietf/dbtemplate/migrations/0005_adjust_assignment_email_summary_templates_2526.py
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-03-13 13:41
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
-
-    DBTemplate.objects.filter(pk=182).update(content="""{% autoescape off %}Subject: Open review assignments in {{group.acronym}}
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc.name }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %} {{ r.earlier_reviews }}{% endfor %}
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-""")
-
-    DBTemplate.objects.filter(pk=183).update(content="""{% autoescape off %}Subject: Review Assignments
-
-Hi all,
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               Type      LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{r.review_request.type.name|ljust:"10"}}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc.name }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %}{% if r.earlier_reviews %} {{ r.earlier_reviews }}{% endif %}{% endfor %}
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}
-The LC and Telechat review templates are included below:
--------------------------------------------------------
-
--- Begin LC Template --
-I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair.  Please treat these comments just
-like any other last call comments.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document:
-Reviewer:
-Review Date:
-IETF LC End Date:
-IESG Telechat date: (if known)
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
--- End LC Template --
-
--- Begin Telechat Template --
-I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair. Please wait for direction from your
-document shepherd or AD before posting a new version of the draft.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document:
-Reviewer:
-Review Date:
-IETF LC End Date:
-IESG Telechat date: (if known)
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
--- End Telechat Template --
-{% endautoescape %}
-
-""")
-    
-    DBTemplate.objects.filter(pk=184).update(content="""{% autoescape off %}Subject: Assignments
-
-Review instructions and related resources are at:
-http://tools.ietf.org/area/sec/trac/wiki/SecDirReview{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }}{{ r.earlier_review|yesno:'R, , ' }}{% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc.name }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %}{% endfor %}
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-
-""")
-
-    DBTemplate.objects.filter(pk=185).update(content="""{% autoescape off %}Subject: Open review assignments in {{group.acronym}}
-
-Review instructions and related resources are at:
-<https://trac.ietf.org/trac/ops/wiki/Directorates>
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc.name }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %} {{ r.earlier_reviews }}{% endfor %}
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-
-""")
-
-
-def reverse(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
-
-    DBTemplate.objects.filter(pk=182).update(content="""{% autoescape off %}Subject: Open review assignments in {{group.acronym}}
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc_id }}-{% if r.review_request..requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request..doc.rev }}{% endif %} {{ r.earlier_review_mark }}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-""")
-
-    DBTemplate.objects.filter(pk=183).update(content="""{% autoescape off %}Subject: Review Assignments
-
-Hi all,
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               Type      LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{r.review_request.type.name|ljust:"10"}}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc.name }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %}{% if r.earlier_review_mark %} {{ r.earlier_review_mark }}{% endif %}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}
-The LC and Telechat review templates are included below:
--------------------------------------------------------
-
--- Begin LC Template --
-I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair.  Please treat these comments just
-like any other last call comments.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document:
-Reviewer:
-Review Date:
-IETF LC End Date:
-IESG Telechat date: (if known)
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
--- End LC Template --
-
--- Begin Telechat Template --
-I am the assigned Gen-ART reviewer for this draft. The General Area
-Review Team (Gen-ART) reviews all IETF documents being processed
-by the IESG for the IETF Chair. Please wait for direction from your
-document shepherd or AD before posting a new version of the draft.
-
-For more information, please see the FAQ at
-
-<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
-
-Document:
-Reviewer:
-Review Date:
-IETF LC End Date:
-IESG Telechat date: (if known)
-
-Summary:
-
-Major issues:
-
-Minor issues:
-
-Nits/editorial comments:
-
--- End Telechat Template --
-{% endautoescape %}
-
-""")
-    
-    DBTemplate.objects.filter(pk=184).update(content="""{% autoescape off %}Subject: Assignments
-
-Review instructions and related resources are at:
-http://tools.ietf.org/area/sec/trac/wiki/SecDirReview{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }}{{ r.earlier_review|yesno:'R, , ' }}{% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc.name }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %}{% endfor %}
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-
-""")
-
-    DBTemplate.objects.filter(pk=185).update(content="""{% autoescape off %}Subject: Open review assignments in {{group.acronym}}
-
-Review instructions and related resources are at:
-<https://trac.ietf.org/trac/ops/wiki/Directorates>
-
-The following reviewers have assignments:{% for r in review_assignments %}{% ifchanged r.section %}
-
-{{r.section}}
-
-{% if r.section == 'Early review requests:' %}Reviewer               Due        Draft{% else %}Reviewer               LC end     Draft{% endif %}{% endifchanged %}
-{{ r.reviewer.person.plain_name|ljust:"22" }} {% if r.section == 'Early review requests:' %}{{ r.review_request.deadline|date:"Y-m-d" }}{% else %}{{ r.lastcall_ends|default:"None      " }}{% endif %} {{ r.review_request.doc.name }}-{% if r.review_request.requested_rev %}{{ r.review_request.requested_rev }}{% else %}{{ r.review_request.doc.rev }}{% endif %} {{ r.earlier_review_mark }}{% endfor %}
-
-* Other revision previously reviewed
-** This revision already reviewed
-
-{% if rotation_list %}Next in the reviewer rotation:
-
-{% for p in rotation_list %}  {{ p }}
-{% endfor %}{% endif %}{% endautoescape %}
-
-""")
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dbtemplate', '0004_adjust_assignment_email_summary_templates'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-    ]
diff --git a/ietf/dbtemplate/migrations/0006_add_review_assigned_template.py b/ietf/dbtemplate/migrations/0006_add_review_assigned_template.py
deleted file mode 100644
index cedd843220..0000000000
--- a/ietf/dbtemplate/migrations/0006_add_review_assigned_template.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate', 'DBTemplate')
-
-    DBTemplate.objects.create(path='/group/defaults/email/review_assigned.txt', type_id='django',
-                              content="""{{ assigner.ascii }} has assigned you as a reviewer for this document.
-
-{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}
-- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }}  
-{% endfor %}
-""")
-
-
-def reverse(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate', 'DBTemplate')
-
-    DBTemplate.objects.get(path='/group/defaults/email/review_assigned.txt').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dbtemplate', '0005_adjust_assignment_email_summary_templates_2526'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-    ]
diff --git a/ietf/dbtemplate/migrations/0007_adjust_review_assigned.py b/ietf/dbtemplate/migrations/0007_adjust_review_assigned.py
deleted file mode 100644
index c1e8324ef9..0000000000
--- a/ietf/dbtemplate/migrations/0007_adjust_review_assigned.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.26 on 2019-11-19 11:47
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
-    qs = DBTemplate.objects.filter(path='/group/defaults/email/review_assigned.txt')
-    qs.update(content="""{{ assigner.ascii }} has assigned {{ reviewer.person.ascii }} as a reviewer for this document.
-
-{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}
-- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }}  
-{% endfor %}
-""")
-    qs.update(title="Default template for review assignment email")
-
-def reverse(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
-    qs = DBTemplate.objects.filter(path='/group/defaults/email/review_assigned.txt')
-    qs.update(content="""{{ assigner.ascii }} has assigned you as a reviewer for this document.
-
-{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}
-- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }}  
-{% endfor %}
-""")
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dbtemplate', '0006_add_review_assigned_template'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/dbtemplate/migrations/0008_add_default_iesg_req_template.py b/ietf/dbtemplate/migrations/0008_add_default_iesg_req_template.py
deleted file mode 100644
index 3ca9a6fc8e..0000000000
--- a/ietf/dbtemplate/migrations/0008_add_default_iesg_req_template.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-01-07 09:25
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate', 'DBTemplate')
-    DBTemplate.objects.create(path='/nomcom/defaults/iesg_requirements', type_id='rst', title='Generic IESG requirements',
-                              content="""=============================
-IESG MEMBER DESIRED EXPERTISE
-=============================
-
-Place this year's Generic IESG Member Desired Expertise here.
-
-This template uses reStructured text for formatting. Feel free to use it (to change the above header for example). 
-""")
-
-def reverse(apps, schema_editor):
-    DBTemplate = apps.get_model('dbtemplate', 'DBTemplate')
-    DBTemplate.objects.filter(path='/nomcom/defaults/iesg_requirements').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dbtemplate', '0007_adjust_review_assigned'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/dbtemplate/templates/dbtemplate/template_edit.html b/ietf/dbtemplate/templates/dbtemplate/template_edit.html
index f27ab9c839..d4f0c755f3 100644
--- a/ietf/dbtemplate/templates/dbtemplate/template_edit.html
+++ b/ietf/dbtemplate/templates/dbtemplate/template_edit.html
@@ -15,7 +15,7 @@ <h2>Meta information</h2>
         <dd>{{ template.type.name }}
             {% if template.type.slug == "rst" %}
                 <p class="help-block">This template uses the syntax of reStructuredText. Get a quick reference at <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html">http://docutils.sourceforge.net/docs/user/rst/quickref.html</a>.</p>
-                <p class="help-block">You can do variable interpolation with $varialbe if the template allows any variable.</p>
+                <p class="help-block">You can do variable interpolation with $variable if the template allows any variable.</p>
             {% endif %}
             {% if template.type.slug == "django" %}
                 <p class="help-block">This template uses the syntax of the default django template framework. Get more info at <a href="https://docs.djangoproject.com/en/dev/topics/templates/">https://docs.djangoproject.com/en/dev/topics/templates/</a>.</p>
@@ -43,4 +43,4 @@ <h2>Edit template content</h2>
 
 
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/dbtemplate/templates/dbtemplate/template_list.html b/ietf/dbtemplate/templates/dbtemplate/template_list.html
index bfee3c99b0..e67c4f208e 100644
--- a/ietf/dbtemplate/templates/dbtemplate/template_list.html
+++ b/ietf/dbtemplate/templates/dbtemplate/template_list.html
@@ -6,7 +6,7 @@ <h1>Defined templates for group {{ group }}</h1>
     {% if template_list %}
         <ul>
             {% for template in template_list %}
-                <li><a href="{% url "ietf.dbtemplate.views.template_edit" group.acronym template.id %}">{{ template }}</a></li>
+                <li><a href="{% url "ietf.dbtemplate.views.group_template_edit" group.acronym template.id %}">{{ template }}</a></li>
             {% endfor %}
         </ul>
     {% else %}
diff --git a/ietf/dbtemplate/templates/dbtemplate/template_show.html b/ietf/dbtemplate/templates/dbtemplate/template_show.html
index 60e3bb9c7c..527c9dedf7 100644
--- a/ietf/dbtemplate/templates/dbtemplate/template_show.html
+++ b/ietf/dbtemplate/templates/dbtemplate/template_show.html
@@ -15,7 +15,7 @@ <h2>Meta information</h2>
         <dd>{{ template.type.name }}
             {% if template.type.slug == "rst" %}
                 <p class="help-block">This template uses the syntax of reStructuredText. Get a quick reference at <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html">http://docutils.sourceforge.net/docs/user/rst/quickref.html</a>.</p>
-                <p class="help-block">You can do variable interpolation with $varialbe if the template allows any variable.</p>
+                <p class="help-block">You can do variable interpolation with $variable if the template allows any variable.</p>
             {% endif %}
             {% if template.type.slug == "django" %}
                 <p class="help-block">This template uses the syntax of the default django template framework. Get more info at <a href="https://docs.djangoproject.com/en/dev/topics/templates/">https://docs.djangoproject.com/en/dev/topics/templates/</a>.</p>
@@ -34,7 +34,7 @@ <h2>Meta information</h2>
     <h2>Template content</h2>
 
     <div class="card">
-        <p class="pasted">{{ template.content }}</p>
+        <pre class="pasted">{{ template.content|escape }}</pre>
     </div>
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/doc/admin.py b/ietf/doc/admin.py
index 64b9d9eff8..0d04e8db3a 100644
--- a/ietf/doc/admin.py
+++ b/ietf/doc/admin.py
@@ -1,19 +1,22 @@
-# Copyright The IETF Trust 2010-2021, All Rights Reserved
+# Copyright The IETF Trust 2010-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 from django.contrib import admin
 from django.db import models
 from django import forms
+from rangefilter.filters import DateRangeQuickSelectListFilterBuilder
 
 from .models import (StateType, State, RelatedDocument, DocumentAuthor, Document, RelatedDocHistory,
-    DocHistoryAuthor, DocHistory, DocAlias, DocReminder, DocEvent, NewRevisionDocEvent,
+    DocHistoryAuthor, DocHistory, DocReminder, DocEvent, NewRevisionDocEvent,
     StateDocEvent, ConsensusDocEvent, BallotType, BallotDocEvent, WriteupDocEvent, LastCallDocEvent,
     TelechatDocEvent, BallotPositionDocEvent, ReviewRequestDocEvent, InitialReviewDocEvent,
     AddedMessageEvent, SubmissionDocEvent, DeletedEvent, EditedAuthorsDocEvent, DocumentURL,
     ReviewAssignmentDocEvent, IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder,
-    BofreqEditorDocEvent, BofreqResponsibleDocEvent )
+    BofreqEditorDocEvent, BofreqResponsibleDocEvent, StoredObject, RfcAuthor,
+    EditedRfcAuthorsDocEvent)
 
+from ietf.utils.admin import SaferTabularInline
 from ietf.utils.validators import validate_external_resource_value
 
 class StateTypeAdmin(admin.ModelAdmin):
@@ -21,36 +24,33 @@ class StateTypeAdmin(admin.ModelAdmin):
 admin.site.register(StateType, StateTypeAdmin)
 
 class StateAdmin(admin.ModelAdmin):
-    list_display = ["slug", "type", 'name', 'order', 'desc']
-    list_filter = ["type", ]
+    list_display = ["slug", "type", 'name', 'order', 'desc', "used"]
+    list_filter = ["type", "used"]
     search_fields = ["slug", "type__label", "type__slug", "name", "desc"]
     filter_horizontal = ["next_states"]
 admin.site.register(State, StateAdmin)
 
-# class DocAliasInline(admin.TabularInline):
-#     model = DocAlias
-#     extra = 1
-
-class DocAuthorInline(admin.TabularInline):
+class DocAuthorInline(SaferTabularInline):
     model = DocumentAuthor
     raw_id_fields = ['person', 'email']
     extra = 1
 
-class DocActionHolderInline(admin.TabularInline):
+class DocActionHolderInline(SaferTabularInline):
     model = DocumentActionHolder
     raw_id_fields = ['person']
     extra = 1
 
-class RelatedDocumentInline(admin.TabularInline):
+class RelatedDocumentInline(SaferTabularInline):
     model = RelatedDocument
+    fk_name= 'source'
     def this(self, instance):
-        return instance.source.canonical_name()
+        return instance.source.name
     readonly_fields = ['this', ]
     fields = ['this', 'relationship', 'target', ]
     raw_id_fields = ['target']
     extra = 1
 
-class AdditionalUrlInLine(admin.TabularInline):
+class AdditionalUrlInLine(SaferTabularInline):
     model = DocumentURL
     fields = ['tag','desc','url',]
     extra = 1
@@ -70,7 +70,7 @@ class Meta:
 
 class DocumentAuthorAdmin(admin.ModelAdmin):
     list_display = ['id', 'document', 'person', 'email', 'affiliation', 'country', 'order']
-    search_fields = ['document__docalias__name', 'person__name', 'email__address', 'affiliation', 'country']
+    search_fields = ['document__name', 'person__name', 'email__address', 'affiliation', 'country']
     raw_id_fields = ["document", "person", "email"]
 admin.site.register(DocumentAuthor, DocumentAuthorAdmin)
     
@@ -108,14 +108,6 @@ def state(self, instance):
 
 admin.site.register(DocHistory, DocHistoryAdmin)
 
-class DocAliasAdmin(admin.ModelAdmin):
-    list_display = ['name', 'targets']
-    search_fields = ['name', 'docs__name']
-    raw_id_fields = ['docs']
-    def targets(self, obj):
-        return ', '.join([o.name for o in obj.docs.all()])
-admin.site.register(DocAlias, DocAliasAdmin)
-
 class DocReminderAdmin(admin.ModelAdmin):
     list_display = ['id', 'event', 'type', 'due', 'active']
     list_filter = ['type', 'due', 'active']
@@ -125,7 +117,7 @@ class DocReminderAdmin(admin.ModelAdmin):
 class RelatedDocumentAdmin(admin.ModelAdmin):
     list_display = ['source', 'target', 'relationship', ]
     list_filter = ['relationship', ]
-    search_fields = ['source__name', 'target__name', 'target__docs__name', ]
+    search_fields = ['source__name', 'target__name', ]
     raw_id_fields = ['source', 'target', ]
 admin.site.register(RelatedDocument, RelatedDocumentAdmin)
 
@@ -153,6 +145,13 @@ class DocumentActionHolderAdmin(admin.ModelAdmin):
 
 # events
 
+class DeletedEventAdmin(admin.ModelAdmin):
+    list_display = ['id', 'content_type', 'json', 'by', 'time']
+    list_filter = ['time']
+    raw_id_fields = ['content_type', 'by']
+admin.site.register(DeletedEvent, DeletedEventAdmin)
+
+
 class DocEventAdmin(admin.ModelAdmin):
     def event_type(self, obj):
         return str(obj.type)
@@ -170,39 +169,43 @@ def short_desc(self, obj):
 admin.site.register(StateDocEvent, DocEventAdmin)
 admin.site.register(ConsensusDocEvent, DocEventAdmin)
 admin.site.register(BallotDocEvent, DocEventAdmin)
+admin.site.register(IRSGBallotDocEvent, DocEventAdmin)
 admin.site.register(WriteupDocEvent, DocEventAdmin)
 admin.site.register(LastCallDocEvent, DocEventAdmin)
 admin.site.register(TelechatDocEvent, DocEventAdmin)
-admin.site.register(ReviewRequestDocEvent, DocEventAdmin)
-admin.site.register(ReviewAssignmentDocEvent, DocEventAdmin)
 admin.site.register(InitialReviewDocEvent, DocEventAdmin)
-admin.site.register(AddedMessageEvent, DocEventAdmin)
-admin.site.register(SubmissionDocEvent, DocEventAdmin)
 admin.site.register(EditedAuthorsDocEvent, DocEventAdmin)
+admin.site.register(EditedRfcAuthorsDocEvent, DocEventAdmin)
 admin.site.register(IanaExpertDocEvent, DocEventAdmin)
 
-class DeletedEventAdmin(admin.ModelAdmin):
-    list_display = ['id', 'content_type', 'json', 'by', 'time']
-    list_filter = ['time']
-    raw_id_fields = ['content_type', 'by']
-admin.site.register(DeletedEvent, DeletedEventAdmin)
-
 class BallotPositionDocEventAdmin(DocEventAdmin):
-    raw_id_fields = ["doc", "by", "balloter", "ballot"]
+    raw_id_fields = DocEventAdmin.raw_id_fields + ["balloter", "ballot"]
 admin.site.register(BallotPositionDocEvent, BallotPositionDocEventAdmin)
- 
-class IRSGBallotDocEventAdmin(DocEventAdmin):
-    raw_id_fields = ["doc", "by"]
-admin.site.register(IRSGBallotDocEvent, IRSGBallotDocEventAdmin)
 
 class BofreqEditorDocEventAdmin(DocEventAdmin):
-    raw_id_fields = ["doc", "by", "editors" ]
+    raw_id_fields = DocEventAdmin.raw_id_fields + ["editors"]
 admin.site.register(BofreqEditorDocEvent, BofreqEditorDocEventAdmin)
     
 class BofreqResponsibleDocEventAdmin(DocEventAdmin):
-    raw_id_fields = ["doc", "by", "responsible" ]
+    raw_id_fields = DocEventAdmin.raw_id_fields + ["responsible"]
 admin.site.register(BofreqResponsibleDocEvent, BofreqResponsibleDocEventAdmin)
     
+class ReviewRequestDocEventAdmin(DocEventAdmin):
+    raw_id_fields = DocEventAdmin.raw_id_fields + ["review_request"]
+admin.site.register(ReviewRequestDocEvent, ReviewRequestDocEventAdmin)
+
+class ReviewAssignmentDocEventAdmin(DocEventAdmin):
+    raw_id_fields = DocEventAdmin.raw_id_fields + ["review_assignment"]
+admin.site.register(ReviewAssignmentDocEvent, ReviewAssignmentDocEventAdmin)
+
+class AddedMessageEventAdmin(DocEventAdmin):
+    raw_id_fields = DocEventAdmin.raw_id_fields + ["message"]
+admin.site.register(AddedMessageEvent, AddedMessageEventAdmin)
+
+class SubmissionDocEventAdmin(DocEventAdmin):
+    raw_id_fields = DocEventAdmin.raw_id_fields + ["submission"]
+admin.site.register(SubmissionDocEvent, SubmissionDocEventAdmin)
+
 class DocumentUrlAdmin(admin.ModelAdmin):
     list_display = ['id', 'doc', 'tag', 'url', 'desc', ]
     search_fields = ['doc__name', 'url', ]
@@ -219,3 +222,28 @@ class DocExtResourceAdmin(admin.ModelAdmin):
     search_fields = ['doc__name', 'value', 'display_name', 'name__slug',]
     raw_id_fields = ['doc', ]
 admin.site.register(DocExtResource, DocExtResourceAdmin)
+
+class StoredObjectAdmin(admin.ModelAdmin):
+    list_display = ['store', 'name', 'doc_name', 'modified', 'is_deleted']
+    list_filter = [
+        'store',
+        ('modified', DateRangeQuickSelectListFilterBuilder()),
+        ('deleted', DateRangeQuickSelectListFilterBuilder()),
+    ]
+    search_fields = ['name', 'doc_name', 'doc_rev']
+    list_display_links = ['name']
+
+    @admin.display(boolean=True, description="Deleted?", ordering="deleted")
+    def is_deleted(self, instance):
+        return instance.deleted is not None
+    
+
+admin.site.register(StoredObject, StoredObjectAdmin)
+
+class RfcAuthorAdmin(admin.ModelAdmin):
+    # the email field in the list_display/readonly_fields works through a @property
+    list_display = ['id', 'document', 'titlepage_name', 'person', 'email', 'affiliation', 'country', 'order']
+    search_fields = ['document__name', 'titlepage_name', 'person__name', 'person__email__address', 'affiliation', 'country']
+    raw_id_fields = ["document", "person"]
+    readonly_fields = ["email"]
+admin.site.register(RfcAuthor, RfcAuthorAdmin)
diff --git a/ietf/doc/api.py b/ietf/doc/api.py
new file mode 100644
index 0000000000..73fff6b27f
--- /dev/null
+++ b/ietf/doc/api.py
@@ -0,0 +1,213 @@
+# Copyright The IETF Trust 2024-2026, All Rights Reserved
+"""Doc API implementations"""
+
+from django.db.models import (
+    BooleanField,
+    Count,
+    OuterRef,
+    Prefetch,
+    Q,
+    QuerySet,
+    Subquery,
+)
+from django.db.models.functions import TruncDate
+from django_filters import rest_framework as filters
+from rest_framework import filters as drf_filters
+from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
+from rest_framework.pagination import LimitOffsetPagination
+from rest_framework.viewsets import GenericViewSet
+
+from ietf.group.models import Group
+from ietf.name.models import StreamName, DocTypeName
+from ietf.utils.timezone import RPC_TZINFO
+from .models import (
+    Document,
+    DocEvent,
+    RelatedDocument,
+    DocumentAuthor,
+    SUBSERIES_DOC_TYPE_IDS,
+)
+from .serializers import (
+    RfcMetadataSerializer,
+    RfcStatus,
+    RfcSerializer,
+    SubseriesDocSerializer,
+)
+
+
+class RfcLimitOffsetPagination(LimitOffsetPagination):
+    default_limit = 10
+    max_limit = 500
+
+
+class NumberInFilter(filters.BaseInFilter, filters.NumberFilter):
+    """Filter against a comma-separated list of numbers"""
+    pass
+
+
+class RfcFilter(filters.FilterSet):
+    published = filters.DateFromToRangeFilter()
+    stream = filters.ModelMultipleChoiceFilter(
+        queryset=StreamName.objects.filter(used=True)
+    )
+    number = NumberInFilter(
+        field_name="rfc_number"
+    )
+    group = filters.ModelMultipleChoiceFilter(
+        queryset=Group.objects.all(),
+        field_name="group__acronym",
+        to_field_name="acronym",
+    )
+    area = filters.ModelMultipleChoiceFilter(
+        queryset=Group.objects.areas(),
+        field_name="group__parent__acronym",
+        to_field_name="acronym",
+    )
+    status = filters.MultipleChoiceFilter(
+        choices=[(slug, slug) for slug in RfcStatus.status_slugs],
+        method=RfcStatus.filter,
+    )
+    sort = filters.OrderingFilter(
+        fields=(
+            ("rfc_number", "number"),  # ?sort=number / ?sort=-number
+            ("published", "published"),  # ?sort=published / ?sort=-published
+        ),
+    )
+
+
+class PrefetchRelatedDocument(Prefetch):
+    """Prefetch via a RelatedDocument
+
+    Prefetches following RelatedDocument relationships to other docs. By default, includes
+    those for which the current RFC is the `source`. If `reverse` is True, includes those
+    for which it is the `target` instead. Defaults to only "rfc" documents.
+    """
+
+    @staticmethod
+    def _get_queryset(relationship_id, reverse, doc_type_ids):
+        """Get queryset to use for the prefetch"""
+        if isinstance(doc_type_ids, str):
+            doc_type_ids = (doc_type_ids,)
+
+        return RelatedDocument.objects.filter(
+            **{
+                "relationship_id": relationship_id,
+                f"{'source' if reverse else 'target'}__type_id__in": doc_type_ids,
+            }
+        ).select_related("source" if reverse else "target")
+
+    def __init__(self, to_attr, relationship_id, reverse=False, doc_type_ids="rfc"):
+        super().__init__(
+            lookup="targets_related" if reverse else "relateddocument_set",
+            queryset=self._get_queryset(relationship_id, reverse, doc_type_ids),
+            to_attr=to_attr,
+        )
+
+
+def augment_rfc_queryset(queryset: QuerySet[Document]):
+    return (
+        queryset.select_related("std_level", "stream")
+        .prefetch_related(
+            Prefetch(
+                "group",
+                Group.objects.select_related("parent"),
+            ),
+            Prefetch(
+                "documentauthor_set",
+                DocumentAuthor.objects.select_related("email", "person"),
+            ),
+            PrefetchRelatedDocument(
+                to_attr="drafts",
+                relationship_id="became_rfc",
+                doc_type_ids="draft",
+                reverse=True,
+            ),
+            PrefetchRelatedDocument(to_attr="obsoletes", relationship_id="obs"),
+            PrefetchRelatedDocument(
+                to_attr="obsoleted_by", relationship_id="obs", reverse=True
+            ),
+            PrefetchRelatedDocument(to_attr="updates", relationship_id="updates"),
+            PrefetchRelatedDocument(
+                to_attr="updated_by", relationship_id="updates", reverse=True
+            ),
+            PrefetchRelatedDocument(
+                to_attr="subseries",
+                relationship_id="contains",
+                reverse=True,
+                doc_type_ids=SUBSERIES_DOC_TYPE_IDS,
+            ),
+        )
+        .annotate(
+            published_datetime=Subquery(
+                DocEvent.objects.filter(
+                    doc_id=OuterRef("pk"),
+                    type="published_rfc",
+                )
+                .order_by("-time")
+                .values("time")[:1]
+            ),
+        )
+        .annotate(published=TruncDate("published_datetime", tzinfo=RPC_TZINFO))
+        .annotate(
+            # Count of "verified-errata" tags will be 1 or 0, convert to Boolean
+            has_errata=Count(
+                "tags",
+                filter=Q(
+                    tags__slug="verified-errata",
+                ),
+                output_field=BooleanField(),
+            )
+        )
+    )
+
+
+class RfcViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
+    api_key_endpoint = "ietf.api.red_api"  # matches prefix in ietf/api/urls.py
+    lookup_field = "rfc_number"
+    queryset = augment_rfc_queryset(
+        Document.objects.filter(type_id="rfc", rfc_number__isnull=False)
+    ).order_by("-rfc_number")
+
+    pagination_class = RfcLimitOffsetPagination
+    filter_backends = [filters.DjangoFilterBackend, drf_filters.SearchFilter]
+    filterset_class = RfcFilter
+    search_fields = ["title", "abstract"]
+
+    def get_serializer_class(self):
+        if self.action == "retrieve":
+            return RfcSerializer
+        return RfcMetadataSerializer
+
+
+class PrefetchSubseriesContents(Prefetch):
+    def __init__(self, to_attr):
+        super().__init__(
+            lookup="relateddocument_set",
+            queryset=RelatedDocument.objects.filter(
+                relationship_id="contains",
+                target__type_id="rfc",
+            ).prefetch_related(
+                Prefetch(
+                    "target",
+                    queryset=augment_rfc_queryset(Document.objects.all()),
+                )
+            ),
+            to_attr=to_attr,
+        )
+
+
+class SubseriesFilter(filters.FilterSet):
+    type = filters.ModelMultipleChoiceFilter(
+        queryset=DocTypeName.objects.filter(pk__in=SUBSERIES_DOC_TYPE_IDS)
+    )
+
+
+class SubseriesViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
+    api_key_endpoint = "ietf.api.red_api"  # matches prefix in ietf/api/urls.py
+    lookup_field = "name"
+    serializer_class = SubseriesDocSerializer
+    queryset = Document.objects.subseries_docs().prefetch_related(
+        PrefetchSubseriesContents(to_attr="contents")
+    )
+    filter_backends = [filters.DjangoFilterBackend]
+    filterset_class = SubseriesFilter
diff --git a/ietf/doc/expire.py b/ietf/doc/expire.py
index b780c73bd4..d42af628f8 100644
--- a/ietf/doc/expire.py
+++ b/ietf/doc/expire.py
@@ -1,22 +1,27 @@
 # Copyright The IETF Trust 2010-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
-# expiry of Internet Drafts
+# expiry of Internet-Drafts
 
 
+import debug    # pyflakes:ignore
+
 from django.conf import settings
+from django.utils import timezone
 
 import datetime, os, shutil, glob, re
 from pathlib import Path
 
 from typing import List, Optional      # pyflakes:ignore
 
+from ietf.doc.storage_utils import exists_in_storage, remove_from_storage
+from ietf.doc.utils import update_action_holders
 from ietf.utils import log
 from ietf.utils.mail import send_mail
-from ietf.doc.models import Document, DocEvent, State, IESG_SUBSTATE_TAGS
+from ietf.doc.models import Document, DocEvent, State
 from ietf.person.models import Person 
 from ietf.meeting.models import Meeting
-from ietf.doc.utils import add_state_change_event, update_action_holders
 from ietf.mailtrigger.utils import gather_address_lists
+from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO
 
 
 nonexpirable_states: Optional[List[State]] = None
@@ -32,37 +37,61 @@ def expirable_drafts(queryset=None):
 
     # Populate this first time through (but after django has been set up)
     if nonexpirable_states is None:
-        # all IESG states except I-D Exists, AD Watching, and Dead block expiry
-        nonexpirable_states = list(State.objects.filter(used=True, type="draft-iesg").exclude(slug__in=("idexists","watching", "dead")))
+        # all IESG states except I-D Exists and Dead block expiry
+        nonexpirable_states = list(
+            State.objects.filter(used=True, type="draft-iesg").exclude(
+                slug__in=("idexists", "dead")
+            )
+        )
         # sent to RFC Editor and RFC Published block expiry (the latter
         # shouldn't be possible for an active draft, though)
-        nonexpirable_states += list(State.objects.filter(used=True, type__in=("draft-stream-iab", "draft-stream-irtf", "draft-stream-ise"), slug__in=("rfc-edit", "pub")))
+        nonexpirable_states += list(
+            State.objects.filter(
+                used=True,
+                type__in=(
+                    "draft-stream-iab",
+                    "draft-stream-irtf",
+                    "draft-stream-ise",
+                    "draft-stream-editorial",
+                ),
+                slug__in=("rfc-edit", "pub"),
+            )
+        )
         # other IRTF states that block expiration
-        nonexpirable_states += list(State.objects.filter(used=True, type_id="draft-stream-irtf", slug__in=("irsgpoll", "iesg-rev",)))
-
-    return queryset.filter(
-        states__type="draft", states__slug="active"
-    ).exclude(
-        expires=None
-    ).exclude(
-        states__in=nonexpirable_states
-    ).exclude(
-        tags="rfc-rev"  # under review by the RFC Editor blocks expiry
-    ).distinct()
+        nonexpirable_states += list(
+            State.objects.filter(
+                used=True,
+                type_id="draft-stream-irtf",
+                slug__in=(
+                    "irsgpoll",
+                    "iesg-rev",
+                ),
+            )
+        )
+
+    return (
+        queryset.filter(states__type="draft", states__slug="active")
+        .exclude(expires=None)
+        .exclude(states__in=nonexpirable_states)
+        .exclude(
+            tags="rfc-rev"  # under review by the RFC Editor blocks expiry
+        )
+        .distinct()
+    )
 
 
 def get_soon_to_expire_drafts(days_of_warning):
-    start_date = datetime.date.today() - datetime.timedelta(1)
+    start_date = datetime_today(DEADLINE_TZINFO) - datetime.timedelta(1)
     end_date = start_date + datetime.timedelta(days_of_warning)
 
     return expirable_drafts().filter(expires__gte=start_date, expires__lt=end_date)
 
 def get_expired_drafts():
-    return expirable_drafts().filter(expires__lt=datetime.date.today() + datetime.timedelta(1))
+    return expirable_drafts().filter(expires__lt=datetime_today(DEADLINE_TZINFO) + datetime.timedelta(1))
 
 def in_draft_expire_freeze(when=None):
     if when == None:
-        when = datetime.datetime.now()
+        when = timezone.now()
 
     meeting = Meeting.objects.filter(type='ietf', date__gte=when-datetime.timedelta(days=7)).order_by('date').first()
 
@@ -71,10 +100,10 @@ def in_draft_expire_freeze(when=None):
 
     d = meeting.get_second_cut_off()
     # for some reason, the old Perl code started at 9 am
-    second_cut_off = datetime.datetime.combine(d, datetime.time(9, 0))
+    second_cut_off = d.replace(hour=9, minute=0, second=0, microsecond=0)
 
     d = meeting.get_ietf_monday()
-    ietf_monday = datetime.datetime.combine(d, datetime.time(0, 0))
+    ietf_monday = datetime.datetime.combine(d, datetime.time(0, 0), tzinfo=meeting.tz())
 
     return second_cut_off <= when < ietf_monday
 
@@ -84,7 +113,14 @@ def send_expire_warning_for_draft(doc):
         (doc.get_state_slug("draft") != "active")):
         return # don't warn about dead or inactive documents
 
-    expiration = doc.expires.date()
+    expiration = doc.expires.astimezone(DEADLINE_TZINFO).date()
+    now_plus_12hours = timezone.now() + datetime.timedelta(hours=12)
+    soon = now_plus_12hours.date()
+    if expiration <= soon:
+        # The document will expire very soon, which will send email to the
+        # same people, so do not send the warning at this point in time
+        return
+
 
     (to,cc) = gather_address_lists('doc_expires_soon',doc=doc)
 
@@ -130,16 +166,32 @@ def move_file(f):
 
         if os.path.exists(src):
             try:
+                # ghostlinkd would keep this in the combined all archive since it would
+                # be sourced from a different place. But when ghostlinkd is removed, nothing
+                # new is needed here - the file will already exist in the combined archive
                 shutil.move(src, dst)
             except IOError as e:
                 if "No such file or directory" in str(e):
                     pass
                 else:
                     raise
-
+    
+    def remove_ftp_copy(f):
+        mark = Path(settings.FTP_DIR) / "internet-drafts" / f
+        if mark.exists():
+            mark.unlink()
+
+    def remove_from_active_draft_storage(file):
+        # Assumes the glob will never find a file with no suffix
+        ext = file.suffix[1:]
+        remove_from_storage("active-draft", f"{ext}/{file.name}", warn_if_missing=False)
+
+    # Note that the object is already in the "draft" storage.
     src_dir = Path(settings.INTERNET_DRAFT_PATH)
     for file in src_dir.glob("%s-%s.*" % (doc.name, rev)):
         move_file(str(file.name))
+        remove_ftp_copy(str(file.name))
+        remove_from_active_draft_storage(file)
 
 def expire_draft(doc):
     # clean up files
@@ -149,29 +201,16 @@ def expire_draft(doc):
 
     events = []
 
-    # change the state
-    if doc.latest_event(type='started_iesg_process'):
-        new_state = State.objects.get(used=True, type="draft-iesg", slug="dead")
-        prev_state = doc.get_state(new_state.type_id)
-        prev_tags = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
-        if new_state != prev_state:
-            doc.set_state(new_state)
-            doc.tags.remove(*prev_tags)
-            e = add_state_change_event(doc, system, prev_state, new_state, prev_tags=prev_tags, new_tags=[])
-            if e:
-                events.append(e)
-            e = update_action_holders(doc, prev_state, new_state, prev_tags=prev_tags, new_tags=[])
-            if e:
-                events.append(e)
-
     events.append(DocEvent.objects.create(doc=doc, rev=doc.rev, by=system, type="expired_document", desc="Document has expired"))
 
+    prev_draft_state=doc.get_state("draft")
     doc.set_state(State.objects.get(used=True, type="draft", slug="expired"))
+    events.append(update_action_holders(doc, prev_draft_state, doc.get_state("draft"),[],[]))
     doc.save_with_history(events)
 
 def clean_up_draft_files():
-    """Move unidentified and old files out of the Internet Draft directory."""
-    cut_off = datetime.date.today()
+    """Move unidentified and old files out of the Internet-Draft directory."""
+    cut_off = date_today(DEADLINE_TZINFO)
 
     pattern = os.path.join(settings.INTERNET_DRAFT_PATH, "draft-*.*")
     filename_re = re.compile(r'^(.*)-(\d\d)$')
@@ -204,8 +243,19 @@ def splitext(fn):
             filename, revision = match.groups()
 
         def move_file_to(subdir):
+            # Similar to move_draft_files_to_archive
             shutil.move(path,
                         os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, subdir, basename))
+            mark = Path(settings.FTP_DIR) / "internet-drafts" / basename
+            if mark.exists():
+                mark.unlink()
+            if ext:
+                # Note that we're not moving these strays anywhere - the assumption
+                # is that the active-draft blobstore will not get strays.
+                # See, however, the note about "major system failures" at "unknown_ids"
+                blobname = f"{ext[1:]}/{basename}"
+                if exists_in_storage("active-draft", blobname):
+                    remove_from_storage("active-draft", blobname)
 
         try:
             doc = Document.objects.get(name=filename, rev=revision)
@@ -214,8 +264,12 @@ def move_file_to(subdir):
 
             if state in ("rfc","repl"):
                 move_file_to("")
-            elif state in ("expired", "auth-rm", "ietf-rm") and doc.expires and doc.expires.date() < cut_off:
+            elif (state in ("expired", "auth-rm", "ietf-rm")
+                  and doc.expires
+                  and doc.expires.astimezone(DEADLINE_TZINFO).date() < cut_off):
                 move_file_to("")
 
         except Document.DoesNotExist:
+            # All uses of this past 2014 seem related to major system failures.
             move_file_to("unknown_ids")
+
diff --git a/ietf/doc/factories.py b/ietf/doc/factories.py
index 8fd6feca76..1a178c6f31 100644
--- a/ietf/doc/factories.py
+++ b/ietf/doc/factories.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
+# Copyright The IETF Trust 2016-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -7,17 +7,20 @@
 import factory.fuzzy
 import datetime
 
-from typing import Optional         # pyflakes:ignore
+from typing import Any  # pyflakes:ignore
 
 from django.conf import settings
+from django.utils import timezone
 
-from ietf.doc.models import ( Document, DocEvent, NewRevisionDocEvent, DocAlias, State, DocumentAuthor,
+from ietf.doc.models import ( Document, DocEvent, NewRevisionDocEvent, State, DocumentAuthor,
     StateDocEvent, BallotPositionDocEvent, BallotDocEvent, BallotType, IRSGBallotDocEvent, TelechatDocEvent,
-    DocumentActionHolder, BofreqEditorDocEvent, BofreqResponsibleDocEvent )
+    DocumentActionHolder, BofreqEditorDocEvent, BofreqResponsibleDocEvent, DocExtResource, RfcAuthor )
 from ietf.group.models import Group
 from ietf.person.factories import PersonFactory
 from ietf.group.factories import RoleFactory
+from ietf.name.models import ExtResourceName
 from ietf.utils.text import xslugify
+from ietf.utils.timezone import date_today
 
 
 def draft_name_generator(type_id,group,n):
@@ -32,14 +35,18 @@ def draft_name_generator(type_id,group,n):
 class BaseDocumentFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Document
+        skip_postgeneration_save = True
 
+    # n.b., a few attributes are typed as Any so mypy won't complain when we override in subclasses
     title = factory.Faker('sentence',nb_words=5)
-    abstract = factory.Faker('paragraph', nb_sentences=5)
+    abstract: Any = factory.Faker('paragraph', nb_sentences=5)
     rev = '00'
-    std_level_id = None                 # type: Optional[str]
+    std_level_id: Any = None
     intended_std_level_id = None
-    time = datetime.datetime.now()
-    expires = factory.LazyAttribute(lambda o: o.time+datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE))
+    time = timezone.now()
+    expires: Any = factory.LazyAttribute(
+        lambda o: o.time+datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE)
+    )
     pages = factory.fuzzy.FuzzyInteger(2,400)
 
 
@@ -47,16 +54,11 @@ class Meta:
     def name(self, n):
         return draft_name_generator(self.type_id,self.group,n)
 
-    newrevisiondocevent = factory.RelatedFactory('ietf.doc.factories.NewRevisionDocEventFactory','doc')
-
     @factory.post_generation
-    def other_aliases(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
-        alias = DocAliasFactory(name=obj.name)
-        alias.docs.add(obj)
-        if create and extracted:
-            for name in extracted:
-                alias = DocAliasFactory(name=name)
-                alias.docs.add(obj)
+    def newrevisiondocevent(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
+        if create:
+            if obj.type_id != "rfc":
+                NewRevisionDocEventFactory(doc=obj)
 
     @factory.post_generation
     def states(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
@@ -79,13 +81,7 @@ def authors(obj, create, extracted, **kwargs): # pylint: disable=no-self-argumen
     def relations(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         if create and extracted:
             for (rel_id, doc) in extracted:
-                if isinstance(doc, Document):
-                    docalias = doc.docalias.first()
-                elif isinstance(doc, DocAlias):
-                    docalias = doc
-                else:
-                    continue
-                obj.relateddocument_set.create(relationship_id=rel_id, target=docalias)
+                obj.relateddocument_set.create(relationship_id=rel_id, target=doc)
 
     @factory.post_generation
     def create_revisions(obj, create, extracted, **kwargs):  # pylint: disable=no-self-argument
@@ -115,10 +111,12 @@ class DocumentFactory(BaseDocumentFactory):
     group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='none')
 
 
-class IndividualDraftFactory(BaseDocumentFactory):
-
-    type_id = 'draft'
-    group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='none')
+class RfcFactory(BaseDocumentFactory):
+    type_id = "rfc"
+    rev = ""
+    rfc_number = factory.Sequence(lambda n: n + 1000)
+    name = factory.LazyAttribute(lambda o: f"rfc{o.rfc_number:d}")
+    expires = None
 
     @factory.post_generation
     def states(obj, create, extracted, **kwargs):
@@ -127,15 +125,14 @@ def states(obj, create, extracted, **kwargs):
         if extracted:
             for (state_type_id,state_slug) in extracted:
                 obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
-            if not obj.get_state('draft-iesg'):
-                obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
         else:
-            obj.set_state(State.objects.get(type_id='draft',slug='active'))
-            obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
+            obj.set_state(State.objects.get(type_id='rfc',slug='published'))
 
-class IndividualRfcFactory(IndividualDraftFactory):
 
-    alias2 = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document',name=factory.Sequence(lambda n: 'rfc%04d'%(n+1000)))
+class IndividualDraftFactory(BaseDocumentFactory):
+
+    type_id = 'draft'
+    group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='none')
 
     @factory.post_generation
     def states(obj, create, extracted, **kwargs):
@@ -144,17 +141,17 @@ def states(obj, create, extracted, **kwargs):
         if extracted:
             for (state_type_id,state_slug) in extracted:
                 obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
+            if not obj.get_state('draft-iesg'):
+                obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
         else:
-            obj.set_state(State.objects.get(type_id='draft',slug='rfc'))
+            obj.set_state(State.objects.get(type_id='draft',slug='active'))
+            obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
 
-    @factory.post_generation
-    def reset_canonical_name(obj, create, extracted, **kwargs): 
-        if hasattr(obj, '_canonical_name'):
-            del obj._canonical_name
-        return None
+class IndividualRfcFactory(RfcFactory):
+    group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='none')
 
-class WgDraftFactory(BaseDocumentFactory):
 
+class WgDraftFactory(BaseDocumentFactory):
     type_id = 'draft'
     group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='wg')
     stream_id = 'ietf'
@@ -173,30 +170,12 @@ def states(obj, create, extracted, **kwargs):
             obj.set_state(State.objects.get(type_id='draft-stream-ietf',slug='wg-doc'))
             obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
 
-class WgRfcFactory(WgDraftFactory):
-
-    alias2 = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document',name=factory.Sequence(lambda n: 'rfc%04d'%(n+1000)))
 
+class WgRfcFactory(RfcFactory):
+    group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='wg')
+    stream_id = 'ietf'
     std_level_id = 'ps'
 
-    @factory.post_generation
-    def states(obj, create, extracted, **kwargs):
-        if not create:
-            return
-        if extracted:
-            for (state_type_id,state_slug) in extracted:
-                obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
-            if not obj.get_state('draft-iesg'):
-                obj.set_state(State.objects.get(type_id='draft-iesg', slug='pub'))
-        else:
-            obj.set_state(State.objects.get(type_id='draft',slug='rfc'))
-            obj.set_state(State.objects.get(type_id='draft-iesg', slug='pub'))
-
-    @factory.post_generation
-    def reset_canonical_name(obj, create, extracted, **kwargs): 
-        if hasattr(obj, '_canonical_name'):
-            del obj._canonical_name
-        return None
 
 class RgDraftFactory(BaseDocumentFactory):
 
@@ -219,34 +198,11 @@ def states(obj, create, extracted, **kwargs):
             obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
 
 
-class RgRfcFactory(RgDraftFactory):
-
-    alias2 = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document',name=factory.Sequence(lambda n: 'rfc%04d'%(n+1000)))
-
+class RgRfcFactory(RfcFactory):
+    group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='rg')
+    stream_id = 'irtf'
     std_level_id = 'inf'
 
-    @factory.post_generation
-    def states(obj, create, extracted, **kwargs):
-        if not create:
-            return
-        if extracted:
-            for (state_type_id,state_slug) in extracted:
-                obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
-            if not obj.get_state('draft-stream-irtf'):
-                obj.set_state(State.objects.get(type_id='draft-stream-irtf', slug='pub'))
-            if not obj.get_state('draft-iesg'):
-                obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
-        else:
-            obj.set_state(State.objects.get(type_id='draft',slug='rfc'))
-            obj.set_state(State.objects.get(type_id='draft-stream-irtf', slug='pub'))
-            obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
-
-    @factory.post_generation
-    def reset_canonical_name(obj, create, extracted, **kwargs): 
-        if hasattr(obj, '_canonical_name'):
-            del obj._canonical_name
-        return None          
-
 
 class CharterFactory(BaseDocumentFactory):
 
@@ -275,7 +231,7 @@ def changes_status_of(obj, create, extracted, **kwargs):
             for (rel, target) in extracted:
                 obj.relateddocument_set.create(relationship_id=rel,target=target)
         else:
-            obj.relateddocument_set.create(relationship_id='tobcp', target=WgRfcFactory().docalias.first())
+            obj.relateddocument_set.create(relationship_id='tobcp', target=WgRfcFactory())
 
     @factory.post_generation
     def states(obj, create, extracted, **kwargs):
@@ -302,9 +258,9 @@ def review_of(obj, create, extracted, **kwargs):
         if not create:
             return
         if extracted:
-            obj.relateddocument_set.create(relationship_id='conflrev',target=extracted.docalias.first())
+            obj.relateddocument_set.create(relationship_id='conflrev',target=extracted)
         else:
-            obj.relateddocument_set.create(relationship_id='conflrev',target=DocumentFactory(name=obj.name.replace('conflict-review-','draft-'),type_id='draft',group=Group.objects.get(type_id='individ')).docalias.first())
+            obj.relateddocument_set.create(relationship_id='conflrev',target=DocumentFactory(name=obj.name.replace('conflict-review-','draft-'),type_id='draft',group=Group.objects.get(type_id='individ')))
 
 
     @factory.post_generation
@@ -320,33 +276,16 @@ def states(obj, create, extracted, **kwargs):
 # This is very skeletal. It is enough for the tests that use it now, but when it's needed, it will need to be improved with, at least, a group generator that backs the object with a review team.
 class ReviewFactory(BaseDocumentFactory):
     type_id = 'review'
-    name = factory.LazyAttribute(lambda o: 'review-doesnotexist-00-%s-%s'%(o.group.acronym,datetime.date.today().isoformat()))
+    name = factory.LazyAttribute(lambda o: 'review-doesnotexist-00-%s-%s'%(o.group.acronym,date_today().isoformat()))
     group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='review')
 
-class DocAliasFactory(factory.django.DjangoModelFactory):
-    class Meta:
-        model = DocAlias
-
-    @factory.post_generation
-    def document(self, create, extracted, **kwargs):
-        if create and extracted:
-            self.docs.add(extracted)
-
-    @factory.post_generation
-    def docs(self, create, extracted, **kwargs):
-        if create and extracted:
-            for doc in extracted:
-                if not doc in self.docs.all():
-                    self.docs.add(doc)
-
-
 class DocEventFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = DocEvent
 
     type = 'added_comment'
     by = factory.SubFactory('ietf.person.factories.PersonFactory')
-    doc = factory.SubFactory(DocumentFactory)
+    doc: Any = factory.SubFactory(DocumentFactory)  # `Any` to appease mypy when a subclass overrides doc
     desc = factory.Faker('sentence',nb_words=6)
 
     @factory.lazy_attribute
@@ -357,7 +296,8 @@ class TelechatDocEventFactory(DocEventFactory):
     class Meta:
         model = TelechatDocEvent
 
-    telechat_date = datetime.datetime.today()+datetime.timedelta(days=14)
+    # note: this is evaluated at import time and not updated - all events will have the same telechat_date
+    telechat_date = timezone.now()+datetime.timedelta(days=14)
     type = 'scheduled_for_telechat'
 
 class NewRevisionDocEventFactory(DocEventFactory):
@@ -371,9 +311,16 @@ class Meta:
     def desc(self):
          return 'New version available %s-%s'%(self.doc.name,self.rev)
 
+class PublishedRfcDocEventFactory(DocEventFactory):
+    class Meta:
+        model = DocEvent
+    type = "published_rfc"
+    doc = factory.SubFactory(WgRfcFactory)
+
 class StateDocEventFactory(DocEventFactory):
     class Meta:
         model = StateDocEvent
+        skip_postgeneration_save = True
 
     type = 'changed_state'
     state_type_id = 'draft-iesg'
@@ -410,7 +357,7 @@ class IRSGBallotDocEventFactory(BallotDocEventFactory):
     class Meta:
         model = IRSGBallotDocEvent
 
-    duedate = datetime.datetime.now() + datetime.timedelta(days=14)
+    duedate = timezone.now() + datetime.timedelta(days=14)
     ballot_type = factory.SubFactory(BallotTypeFactory, slug='irsg-approve')
 
 class BallotPositionDocEventFactory(DocEventFactory):
@@ -441,12 +388,25 @@ class Meta:
     country = factory.Faker('country')
     order = factory.LazyAttribute(lambda o: o.document.documentauthor_set.count() + 1)
 
+class RfcAuthorFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = RfcAuthor
+
+    document = factory.SubFactory(DocumentFactory)
+    titlepage_name = factory.LazyAttribute(
+        lambda obj: " ".join([obj.person.initials(), obj.person.last_name()])
+    )
+    person = factory.SubFactory('ietf.person.factories.PersonFactory')
+    affiliation = factory.Faker('company')
+    order = factory.LazyAttribute(lambda o: o.document.rfcauthor_set.count() + 1)
+
 class WgDocumentAuthorFactory(DocumentAuthorFactory):
     document = factory.SubFactory(WgDraftFactory)
 
 class BofreqEditorDocEventFactory(DocEventFactory):
     class Meta:
         model = BofreqEditorDocEvent
+        skip_postgeneration_save = True
 
     type = "changed_editors"
     doc = factory.SubFactory('ietf.doc.factories.BofreqFactory')
@@ -461,10 +421,12 @@ def editors(obj, create, extracted, **kwargs):
         else:
             obj.editors.set(PersonFactory.create_batch(3))
         obj.desc = f'Changed editors to {", ".join(obj.editors.values_list("name",flat=True)) or "(None)"}'
+        obj.save()
 
 class BofreqResponsibleDocEventFactory(DocEventFactory):
     class Meta:
         model = BofreqResponsibleDocEvent
+        skip_postgeneration_save = True
 
     type = "changed_responsible"
     doc = factory.SubFactory('ietf.doc.factories.BofreqFactory')
@@ -479,7 +441,8 @@ def responsible(obj, create, extracted, **kwargs):
         else:
             ad = RoleFactory(group__type_id='area',name_id='ad').person
             obj.responsible.set([ad])
-        obj.desc = f'Changed responsible leadership to {", ".join(obj.responsible.values_list("name",flat=True)) or "(None)"}'        
+        obj.desc = f'Changed responsible leadership to {", ".join(obj.responsible.values_list("name",flat=True)) or "(None)"}'
+        obj.save()        
 
 class BofreqFactory(BaseDocumentFactory):
     type_id = 'bofreq'
@@ -517,3 +480,89 @@ def states(obj, create, extracted, **kwargs):
                 obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
         else:
             obj.set_state(State.objects.get(type_id='procmaterials', slug='active'))
+
+class DocExtResourceFactory(factory.django.DjangoModelFactory):
+
+    name = factory.Iterator(ExtResourceName.objects.filter(type_id='url'))
+    value = factory.Faker('url')
+    doc = factory.SubFactory('ietf.doc.factories.BaseDocumentFactory')
+    class Meta:
+        model = DocExtResource
+
+class EditorialDraftFactory(BaseDocumentFactory):
+
+    type_id = 'draft'
+    group = factory.SubFactory('ietf.group.factories.GroupFactory',acronym='rswg', type_id='edwg')
+    stream_id = 'editorial'
+
+    @factory.post_generation
+    def states(obj, create, extracted, **kwargs):
+        if not create:
+            return
+        if extracted:
+            for (state_type_id,state_slug) in extracted:
+                obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
+            if not obj.get_state('draft-iesg'):
+                obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
+        else:
+            obj.set_state(State.objects.get(type_id='draft',slug='active'))
+            obj.set_state(State.objects.get(type_id='draft-stream-editorial',slug='active'))
+            obj.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
+
+class EditorialRfcFactory(RgRfcFactory):
+    pass
+    
+class StatementFactory(BaseDocumentFactory):
+    type_id = "statement"
+    title = factory.Faker("sentence")
+    group = factory.SubFactory("ietf.group.factories.GroupFactory", acronym="iab")
+
+    name = factory.LazyAttribute(
+        lambda o: "statement-%s-%s" % (xslugify(o.group.acronym), xslugify(o.title))
+    )
+    uploaded_filename = factory.LazyAttribute(lambda o: f"{o.name}-{o.rev}.md")
+
+    published_statement_event = factory.RelatedFactory(
+        "ietf.doc.factories.DocEventFactory",
+        "doc",
+        type="published_statement",
+        time=timezone.now() - datetime.timedelta(days=1),
+    )
+
+    @factory.post_generation
+    def states(obj, create, extracted, **kwargs):
+        if not create:
+            return
+        if extracted:
+            for state_type_id, state_slug in extracted:
+                obj.set_state(State.objects.get(type_id=state_type_id, slug=state_slug))
+        else:
+            obj.set_state(State.objects.get(type_id="statement", slug="active"))
+
+class SubseriesFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = Document
+        skip_postgeneration_save = True
+
+    @factory.lazy_attribute_sequence
+    def name(self, n):
+        return f"{self.type_id}{n}"
+    
+    @factory.post_generation
+    def contains(obj, create, extracted, **kwargs):
+        if not create:
+            return
+        if extracted:
+            for doc in extracted:
+                obj.relateddocument_set.create(relationship_id="contains",target=doc)
+        else:
+            obj.relateddocument_set.create(relationship_id="contains", target=RfcFactory())
+
+class BcpFactory(SubseriesFactory):
+    type_id="bcp"
+
+class StdFactory(SubseriesFactory):
+    type_id="std"
+
+class FyiFactory(SubseriesFactory):
+    type_id="fyi"
diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py
index 1169db105f..0269906fcf 100644
--- a/ietf/doc/feeds.py
+++ b/ietf/doc/feeds.py
@@ -1,35 +1,42 @@
-# Copyright The IETF Trust 2007-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
+# Copyright The IETF Trust 2007-2026, All Rights Reserved
 
+import debug  # pyflakes:ignore
 
 import datetime
 import unicodedata
 
+from django.conf import settings
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
 from django.urls import reverse as urlreverse
-from django.template.defaultfilters import truncatewords, truncatewords_html, date as datefilter
-from django.template.defaultfilters import linebreaks # type: ignore
+from django.template.defaultfilters import (
+    truncatewords,
+    truncatewords_html,
+    date as datefilter,
+)
+from django.template.defaultfilters import linebreaks  # type: ignore
+from django.utils import timezone
 from django.utils.html import strip_tags
 
 from ietf.doc.models import Document, State, LastCallDocEvent, DocEvent
 from ietf.doc.utils import augment_events_with_revision
 from ietf.doc.templatetags.ietf_filters import format_textarea
+from ietf.utils.timezone import RPC_TZINFO
 
 
 def strip_control_characters(s):
     """Remove Unicode control / non-printing characters from a string"""
-    replacement_char = unicodedata.lookup('REPLACEMENT CHARACTER')
-    return ''.join(
-        replacement_char if unicodedata.category(c)[0] == 'C' else c
-        for c in s
+    replacement_char = unicodedata.lookup("REPLACEMENT CHARACTER")
+    return "".join(
+        replacement_char if unicodedata.category(c)[0] == "C" else c for c in s
     )
 
+
 class DocumentChangesFeed(Feed):
     feed_type = Atom1Feed
 
     def get_object(self, request, name):
-        return Document.objects.get(docalias__name=name)
+        return Document.objects.get(name=name)
 
     def title(self, obj):
         return "Changes for %s" % obj.display_name()
@@ -37,25 +44,37 @@ def title(self, obj):
     def link(self, obj):
         if obj is None:
             raise FeedDoesNotExist
-        return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=obj.canonical_name()))
+        return urlreverse(
+            "ietf.doc.views_doc.document_history",
+            kwargs=dict(name=obj.name),
+        )
 
     def subtitle(self, obj):
         return "History of change entries for %s." % obj.display_name()
 
     def items(self, obj):
-        events = obj.docevent_set.all().order_by("-time","-id")
+        events = (
+            obj.docevent_set.all()
+            .order_by("-time", "-id")
+            .select_related("by", "newrevisiondocevent", "submissiondocevent")
+        )
         augment_events_with_revision(obj, events)
         return events
 
     def item_title(self, item):
-        return strip_control_characters("[%s] %s [rev. %s]" % (
-            item.by,
-            truncatewords(strip_tags(item.desc), 15),
-            item.rev,
-        ))
+        return strip_control_characters(
+            "[%s] %s [rev. %s]"
+            % (
+                item.by,
+                truncatewords(strip_tags(item.desc), 15),
+                item.rev,
+            )
+        )
 
     def item_description(self, item):
-        return strip_control_characters(truncatewords_html(format_textarea(item.desc), 20))
+        return strip_control_characters(
+            truncatewords_html(format_textarea(item.desc), 20)
+        )
 
     def item_pubdate(self, item):
         return item.time
@@ -64,17 +83,28 @@ def item_author_name(self, item):
         return str(item.by)
 
     def item_link(self, item):
-        return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk
+        return (
+            urlreverse(
+                "ietf.doc.views_doc.document_history",
+                kwargs=dict(name=item.doc.name),
+            )
+            + "#history-%s" % item.pk
+        )
+
 
 class InLastCallFeed(Feed):
     title = "Documents in Last Call"
     subtitle = "Announcements for documents in last call."
     feed_type = Atom1Feed
-    author_name = 'IESG Secretary'
+    author_name = "IESG Secretary"
     link = "/doc/iesg/last-call/"
 
     def items(self):
-        docs = list(Document.objects.filter(type="draft", states=State.objects.get(type="draft-iesg", slug="lc")))
+        docs = list(
+            Document.objects.filter(
+                type="draft", states=State.objects.get(type="draft-iesg", slug="lc")
+            )
+        )
         for d in docs:
             d.lc_event = d.latest_event(LastCallDocEvent, type="sent_last_call")
 
@@ -84,9 +114,11 @@ def items(self):
         return docs
 
     def item_title(self, item):
-        return "%s (%s - %s)" % (item.name,
-                                datefilter(item.lc_event.time, "F j"),
-                                datefilter(item.lc_event.expires, "F j, Y"))
+        return "%s (%s - %s)" % (
+            item.name,
+            datefilter(item.lc_event.time, "F j"),
+            datefilter(item.lc_event.expires, "F j, Y"),
+        )
 
     def item_description(self, item):
         return strip_control_characters(linebreaks(item.lc_event.desc))
@@ -94,33 +126,55 @@ def item_description(self, item):
     def item_pubdate(self, item):
         return item.lc_event.time
 
+
 class Rss201WithNamespacesFeed(Rss201rev2Feed):
     def root_attributes(self):
         attrs = super(Rss201WithNamespacesFeed, self).root_attributes()
-        attrs['xmlns:dcterms'] = 'http://purl.org/dc/terms/'
-        attrs['xmlns:media'] = 'http://search.yahoo.com/mrss/'
-        attrs['xmlns:xsi'] = 'http://www.w3.org/2001/XMLSchema-instance'
+        attrs["xmlns:dcterms"] = "http://purl.org/dc/terms/"
+        attrs["xmlns:media"] = "http://search.yahoo.com/mrss/"
+        attrs["xmlns:xsi"] = "http://www.w3.org/2001/XMLSchema-instance"
         return attrs
 
     def add_item_elements(self, handler, item):
         super(Rss201WithNamespacesFeed, self).add_item_elements(handler, item)
 
-        for element_name in ['abstract','accessRights', 'format', 'publisher',]:
-            dc_item_name = 'dcterms_%s' % element_name
-            dc_element_name = 'dcterms:%s' % element_name
-            attrs= {'xsi:type':'dcterms:local'} if element_name == 'publisher' else {}
+        for element_name in [
+            "abstract",
+            "accessRights",
+            "format",
+            "publisher",
+        ]:
+            dc_item_name = "dcterms_%s" % element_name
+            dc_element_name = "dcterms:%s" % element_name
+            attrs = {"xsi:type": "dcterms:local"} if element_name == "publisher" else {}
             if dc_item_name in item and item[dc_item_name] is not None:
-                handler.addQuickElement(dc_element_name,item[dc_item_name],attrs)
+                handler.addQuickElement(dc_element_name, item[dc_item_name], attrs)
+
+        if "doi" in item and item["doi"] is not None:
+            handler.addQuickElement(
+                "dcterms:identifier", item["doi"], {"xsi:type": "dcterms:doi"}
+            )
+        if "doiuri" in item and item["doiuri"] is not None:
+            handler.addQuickElement(
+                "dcterms:identifier", item["doiuri"], {"xsi:type": "dcterms:uri"}
+            )
+
+        # TODO: consider using media:group
+        if "media_contents" in item and item["media_contents"] is not None:
+            for media_content in item["media_contents"]:
+                handler.startElement(
+                    "media:content",
+                    {
+                        "url": media_content["url"],
+                        "type": media_content["media_type"],
+                    },
+                )
+                if "is_format_of" in media_content:
+                    handler.addQuickElement(
+                        "dcterms:isFormatOf", media_content["is_format_of"]
+                    )
+                handler.endElement("media:content")
 
-        if 'doi' in item and item['doi'] is not None:
-           handler.addQuickElement('dcterms:identifier',item['doi'],{'xsi:type':'dcterms:doi'})
-        if 'doiuri' in item and item['doiuri'] is not None:
-           handler.addQuickElement('dcterms:identifier',item['doiuri'],{'xsi:type':'dcterms:uri'})
-
-        if 'media_content' in item and item['media_content'] is not None:
-            handler.startElement('media:content',{'url':item['media_content']['url'],'type':'text/plain'})
-            handler.addQuickElement('dcterms:isFormatOf',item['media_content']['link_url'])
-            handler.endElement('media:content')
 
 class RfcFeed(Feed):
     feed_type = Rss201WithNamespacesFeed
@@ -128,48 +182,98 @@ class RfcFeed(Feed):
     author_name = "RFC Editor"
     link = "https://www.rfc-editor.org/rfc-index2.html"
 
-    def get_object(self,request,year=None):
+    def get_object(self, request, year=None):
         self.year = year
-    
+
     def items(self):
         if self.year:
-            rfc_events = DocEvent.objects.filter(type='published_rfc',time__year=self.year).order_by('-time')
+            # Find published RFCs based on their official publication year
+            start_of_year = datetime.datetime(int(self.year), 1, 1, tzinfo=RPC_TZINFO)
+            start_of_next_year = datetime.datetime(
+                int(self.year) + 1, 1, 1, tzinfo=RPC_TZINFO
+            )
+            rfc_events = DocEvent.objects.filter(
+                type="published_rfc",
+                time__gte=start_of_year,
+                time__lt=start_of_next_year,
+            ).order_by("-time")
         else:
-            cutoff = datetime.datetime.now() - datetime.timedelta(days=8)
-            rfc_events = DocEvent.objects.filter(type='published_rfc',time__gte=cutoff).order_by('-time')
+            cutoff = timezone.now() - datetime.timedelta(days=8)
+            rfc_events = DocEvent.objects.filter(
+                type="published_rfc", time__gte=cutoff
+            ).order_by("-time")
         results = [(e.doc, e.time) for e in rfc_events]
-        for doc,time in results:
+        for doc, time in results:
             doc.publication_time = time
-        return [doc for doc,time in results]
-    
+        return [doc for doc, time in results]
+
     def item_title(self, item):
-        return "%s : %s" % (item.canonical_name(),item.title)
+        return "%s : %s" % (item.name, item.title)
 
     def item_description(self, item):
         return item.abstract
 
     def item_link(self, item):
-        return "https://rfc-editor.org/info/%s"%item.canonical_name()
+        return "https://rfc-editor.org/info/%s" % item.name
 
     def item_pubdate(self, item):
         return item.publication_time
 
     def item_extra_kwargs(self, item):
         extra = super(RfcFeed, self).item_extra_kwargs(item)
-        extra.update({'dcterms_accessRights': 'gratis'})
-        extra.update({'dcterms_format': 'text/html'})
-        extra.update({'media_content': {'url': 'https://rfc-editor.org/rfc/%s.txt' % item.canonical_name(),
-                                        'link_url': self.item_link(item) 
-                                       }
-                     })
-        extra.update({'doi':'10.17487/%s' % item.canonical_name().upper()})
-        extra.update({'doiuri':'http://dx.doi.org/10.17487/%s' % item.canonical_name().upper()})
-
-        #TODO 
+        extra.update({"dcterms_accessRights": "gratis"})
+        extra.update({"dcterms_format": "text/html"})
+        media_contents = []
+        if item.rfc_number < settings.FIRST_V3_RFC:
+            if item.rfc_number not in [8, 9, 51, 418, 500, 530, 589]:
+                for fmt, media_type in [("txt", "text/plain"), ("html", "text/html")]:
+                    media_contents.append(
+                        {
+                            "url": f"https://rfc-editor.org/rfc/{item.name}.{fmt}",
+                            "media_type": media_type,
+                            "is_format_of": self.item_link(item),
+                        }
+                    )
+            if item.rfc_number not in [571, 587]:
+                media_contents.append(
+                    {
+                        "url": f"https://www.rfc-editor.org/rfc/pdfrfc/{item.name}.txt.pdf",
+                        "media_type": "application/pdf",
+                        "is_format_of": self.item_link(item),
+                    }
+                )
+        else:
+            media_contents.append(
+                {
+                    "url": f"https://www.rfc-editor.org/rfc/{item.name}.xml",
+                    "media_type": "application/rfc+xml",
+                }
+            )
+            for fmt, media_type in [
+                ("txt", "text/plain"),
+                ("html", "text/html"),
+                ("pdf", "application/pdf"),
+            ]:
+                media_contents.append(
+                    {
+                        "url": f"https://rfc-editor.org/rfc/{item.name}.{fmt}",
+                        "media_type": media_type,
+                        "is_format_of": f"https://www.rfc-editor.org/rfc/{item.name}.xml",
+                    }
+                )
+        extra.update({"media_contents": media_contents})
+
+        extra.update(
+            {
+                "doi": item.doi,
+                "doiuri": f"https://doi.org/{item.doi}",
+            }
+        )
+
         # R104 Publisher (Mandatory - but we need a string from them first)
-        extra.update({'dcterms_publisher':'rfc-editor.org'})
+        extra.update({"dcterms_publisher": "rfc-editor.org"})
 
-        #TODO MAYBE (Optional stuff)
+        # TODO MAYBE (Optional stuff)
         # R108 License
         # R115 Creator/Contributor (which would we use?)
         # F305 Checksum (do they use it?) (or should we put the our digital signature in here somewhere?)
@@ -179,4 +283,3 @@ def item_extra_kwargs(self, item):
         # R118 Keyword
 
         return extra
-
diff --git a/ietf/doc/fields.py b/ietf/doc/fields.py
index fde5199509..4a6922bf34 100644
--- a/ietf/doc/fields.py
+++ b/ietf/doc/fields.py
@@ -13,7 +13,7 @@
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import Document, DocAlias
+from ietf.doc.models import Document
 from ietf.doc.utils import uppercase_std_abbreviated_name
 from ietf.utils.fields import SearchableField
 
@@ -69,19 +69,3 @@ def ajax_url(self):
 class SearchableDocumentField(SearchableDocumentsField):
     """Specialized to only return one Document"""
     max_entries = 1
-
-
-class SearchableDocAliasesField(SearchableDocumentsField):
-    """Search DocAliases instead of Documents"""
-    model = DocAlias # type: Type[models.Model]
-    
-    def doc_type_filter(self, queryset):
-        """Filter to include only desired doc type
-
-        For DocAlias, pass through to the docs to check type.
-        """
-        return queryset.filter(docs__type=self.doc_type)
-
-class SearchableDocAliasField(SearchableDocAliasesField):
-    """Specialized to only return one DocAlias"""
-    max_entries = 1
\ No newline at end of file
diff --git a/ietf/doc/forms.py b/ietf/doc/forms.py
index d209eb0a2f..768d6f96af 100644
--- a/ietf/doc/forms.py
+++ b/ietf/doc/forms.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
+# Copyright The IETF Trust 2013-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -6,15 +6,17 @@
 import debug #pyflakes:ignore
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.validators import validate_email
 
-from ietf.doc.fields import SearchableDocAliasesField, SearchableDocAliasField
-from ietf.doc.models import RelatedDocument, DocExtResource
+from ietf.doc.fields import SearchableDocumentField, SearchableDocumentsField
+from ietf.doc.models import RelatedDocument, DocExtResource, State
 from ietf.iesg.models import TelechatDate
 from ietf.iesg.utils import telechat_page_count
 from ietf.person.fields import SearchablePersonField, SearchablePersonsField
 from ietf.person.models import Email, Person
 
 from ietf.name.models import ExtResourceName
+from ietf.utils.timezone import date_today
 from ietf.utils.validators import validate_external_resource_value
 
 class TelechatForm(forms.Form):
@@ -34,7 +36,7 @@ def __init__(self, *args, **kwargs):
         for d in dates:
           self.page_count[d] = telechat_page_count(date=d).for_approval
           choice_display[d] = '%s (%s pages)' % (d.strftime("%Y-%m-%d"),self.page_count[d])
-          if d-datetime.date.today() < datetime.timedelta(days=13):
+          if d - date_today() < datetime.timedelta(days=13):
               choice_display[d] += ' : WARNING - this may not leave enough time for directorate reviews!'
         self.fields['telechat_date'].choices = [("", "(not on agenda)")] + [(d, choice_display[d]) for d in dates]
 
@@ -59,7 +61,7 @@ class DocAuthorChangeBasisForm(forms.Form):
     basis = forms.CharField(max_length=255, 
                             label='Reason for change', 
                             help_text='What is the source or reasoning for the changes to the author list?')
-    
+
 class AdForm(forms.Form):
     ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active", role__group__type='area').order_by('name'),
                                 label="Shepherding AD", empty_label="(None)", required=True)
@@ -74,11 +76,51 @@ def __init__(self, *args, **kwargs):
             self.fields['ad'].choices = list(choices) + [("", "-------"), (ad_pk, Person.objects.get(pk=ad_pk).plain_name())]
 
 class NotifyForm(forms.Form):
-    notify = forms.CharField(max_length=255, help_text="List of email addresses to receive state notifications, separated by comma.", label="Notification list", required=False)
+    notify = forms.CharField(
+        widget=forms.Textarea,
+        max_length=1023,
+        help_text="List of email addresses to receive state notifications, separated by comma.",
+        label="Notification list",
+        required=False,
+    )
 
     def clean_notify(self):
-        addrspecs = [x.strip() for x in self.cleaned_data["notify"].split(',')]
-        return ', '.join(addrspecs)
+        # As long as the widget is a Textarea, users will separate addresses with newlines, whether that matches the instructions or not
+        # We have been allowing nameaddrs for a long time (there are many Documents with namaddrs in their notify field)
+        # python set doesn't preserve order, so in an attempt to mostly preserve the order of what was entered, we'll use
+        # a dict (whose keys are guaranteed to be ordered) to cull out duplicates
+
+        nameaddrs=dict()
+        duplicate_addrspecs = set()
+        bad_nameaddrs = []
+        for nameaddr in self.cleaned_data["notify"].replace("\n", ",").split(","):
+            stripped = nameaddr.strip()
+            if stripped == "":
+                continue
+            if "<" in stripped:
+                if stripped[-1] != ">":
+                    bad_nameaddrs.append(nameaddr)
+                    continue
+                addrspec = stripped[stripped.find("<")+1:-1]
+            else:
+                addrspec = stripped
+            try:
+                validate_email(addrspec)
+            except ValidationError:
+                bad_nameaddrs.append(nameaddr)
+            if addrspec in nameaddrs:
+                duplicate_addrspecs.add(addrspec)
+                continue
+            else:
+                nameaddrs[addrspec] = stripped
+        error_messages = []
+        if len(duplicate_addrspecs) != 0:
+            error_messages.append(f'Duplicate addresses: {", ".join(duplicate_addrspecs)}')
+        if len(bad_nameaddrs) != 0:
+            error_messages.append(f'Invalid addresses: {", ".join(bad_nameaddrs)}')
+        if len(error_messages) != 0:
+            raise ValidationError(" and ".join(error_messages))
+        return ", ".join(nameaddrs.values())
 
 class ActionHoldersForm(forms.Form):
     action_holders = SearchablePersonsField(required=False)
@@ -92,13 +134,14 @@ class ActionHoldersForm(forms.Form):
 IESG_APPROVED_STATE_LIST = ("ann", "rfcqueue", "pub")
 
 class AddDownrefForm(forms.Form):
-    rfc = SearchableDocAliasField(
+    rfc = SearchableDocumentField(
                 label="Referenced RFC",
                 help_text="The RFC that is approved for downref",
-                required=True)
-    drafts = SearchableDocAliasesField(
+                required=True,
+                doc_type="rfc")
+    drafts = SearchableDocumentsField(
                 label="Internet-Drafts that makes the reference",
-                help_text="The drafts that approve the downref in their Last Call",
+                help_text="The Internet-Drafts that approve the downref in their Last Call",
                 required=True)
 
     def clean_rfc(self):
@@ -106,7 +149,7 @@ def clean_rfc(self):
             raise forms.ValidationError("Please provide a referenced RFC and a referencing Internet-Draft")
 
         rfc = self.cleaned_data['rfc']
-        if not rfc.document.is_rfc():
+        if rfc.type_id != "rfc":
             raise forms.ValidationError("Cannot find the RFC: " + rfc.name)
         return rfc
 
@@ -116,12 +159,12 @@ def clean_drafts(self):
 
         v_err_names = []
         drafts = self.cleaned_data['drafts']
-        for da in drafts:
-            state = da.document.get_state("draft-iesg")
+        for d in drafts:
+            state = d.get_state("draft-iesg")
             if not state or state.slug not in IESG_APPROVED_STATE_LIST:
-                v_err_names.append(da.name)
+                v_err_names.append(d.name)
         if v_err_names:
-            raise forms.ValidationError("Draft is not yet approved: " + ", ".join(v_err_names))
+            raise forms.ValidationError("Internet-Draft is not yet approved: " + ", ".join(v_err_names))
         return drafts
 
     def clean(self):
@@ -131,23 +174,23 @@ def clean(self):
         v_err_pairs = []
         rfc = self.cleaned_data['rfc']
         drafts = self.cleaned_data['drafts']
-        for da in drafts:
-            if RelatedDocument.objects.filter(source=da.document, target=rfc, relationship_id='downref-approval'):
-                v_err_pairs.append(da.name + " --> RFC " + rfc.document.rfc_number())
+        for d in drafts:
+            if RelatedDocument.objects.filter(source=d, target=rfc, relationship_id='downref-approval'):
+                v_err_pairs.append(f"{d.name} --> RFC {rfc.rfc_number}")
         if v_err_pairs:
             raise forms.ValidationError("Downref is already in the registry: " + ", ".join(v_err_pairs))
 
         if 'save_downref_anyway' not in self.data:
         # this check is skipped if the save_downref_anyway button is used
             v_err_refnorm = ""
-            for da in drafts:
-                if not RelatedDocument.objects.filter(source=da.document, target=rfc, relationship_id='refnorm'):
+            for d in drafts:
+                if not RelatedDocument.objects.filter(source=d, target=rfc, relationship_id='refnorm'):
                     if v_err_refnorm:
-                        v_err_refnorm = v_err_refnorm + " or " + da.name
+                        v_err_refnorm = v_err_refnorm + " or " + d.name
                     else:
-                        v_err_refnorm = da.name
+                        v_err_refnorm = d.name
             if v_err_refnorm:
-                v_err_refnorm_prefix = "There does not seem to be a normative reference to RFC " + rfc.document.rfc_number() + " by "
+                v_err_refnorm_prefix = f"There does not seem to be a normative reference to RFC {rfc.rfc_number} by "
                 raise forms.ValidationError(v_err_refnorm_prefix  + v_err_refnorm)
 
 
@@ -222,4 +265,33 @@ def clean(self):
 
     @staticmethod
     def valid_resource_tags():
-        return ExtResourceName.objects.all().order_by('slug').values_list('slug', flat=True)
\ No newline at end of file
+        return ExtResourceName.objects.all().order_by('slug').values_list('slug', flat=True)
+
+class InvestigateForm(forms.Form):
+    name_fragment = forms.CharField(
+        label="File name or fragment to investigate",
+        required=True,
+        help_text=(
+            "Enter a filename such as draft-ietf-some-draft-00.txt or a fragment like draft-ietf-some-draft using at least 8 characters. The search will also work for files that are not necessarily drafts."
+        ),
+        min_length=8,
+    )
+    task_id = forms.CharField(required=False, widget=forms.HiddenInput)
+
+    def clean_name_fragment(self):
+        disallowed_characters = ["%", "/", "\\", "*"]
+        name_fragment = self.cleaned_data["name_fragment"]
+        # Manual inspection of the directories at the time of this writing shows
+        # looking for files with less than 8 characters in the name is not useful
+        # Requiring this will help protect against the secretariat unintentionally
+        # matching every draft.
+        if any(c in name_fragment for c in disallowed_characters):
+            raise ValidationError(f"The following characters are disallowed: {', '.join(disallowed_characters)}")
+        return name_fragment
+
+
+class ChangeStatementStateForm(forms.Form):
+    state = forms.ModelChoiceField(
+        State.objects.filter(used=True, type="statement"),
+        empty_label=None,
+    )
diff --git a/ietf/doc/lastcall.py b/ietf/doc/lastcall.py
index fab3001b1a..dd38fd3909 100644
--- a/ietf/doc/lastcall.py
+++ b/ietf/doc/lastcall.py
@@ -1,6 +1,4 @@
-# helpers for handling last calls on Internet Drafts
-
-import datetime
+# helpers for handling last calls on Internet-Drafts
 
 from django.db.models import Q
 
@@ -10,6 +8,8 @@
 from ietf.doc.utils import add_state_change_event, update_action_holders
 from ietf.doc.mails import generate_ballot_writeup, generate_approval_mail, generate_last_call_announcement
 from ietf.doc.mails import send_last_call_request, email_last_call_expired, email_last_call_expired_with_downref
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
+
 
 def request_last_call(request, doc):
     if not doc.latest_event(type="changed_ballot_writeup_text"):
@@ -33,11 +33,10 @@ def request_last_call(request, doc):
     e.save()
 
 def get_expired_last_calls():
-    today = datetime.date.today()
     for d in Document.objects.filter(Q(states__type="draft-iesg", states__slug="lc")
                                     | Q(states__type="statchg", states__slug="in-lc")):
         e = d.latest_event(LastCallDocEvent, type="sent_last_call")
-        if e and e.expires.date() <= today:
+        if e and e.expires.astimezone(DEADLINE_TZINFO).date() <= date_today(DEADLINE_TZINFO):
             yield d
 
 def expire_last_call(doc):
@@ -74,4 +73,4 @@ def expire_last_call(doc):
     if doc.type_id == 'draft':
         lc_text = doc.latest_event(LastCallDocEvent, type="sent_last_call").desc
         if "document makes the following downward references" in lc_text:
-            email_last_call_expired_with_downref(doc, lc_text)           
\ No newline at end of file
+            email_last_call_expired_with_downref(doc, lc_text)           
diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
index 0f344f0159..ddecbb6b54 100644
--- a/ietf/doc/mails.py
+++ b/ietf/doc/mails.py
@@ -10,7 +10,8 @@
 from django.utils.html import strip_tags
 from django.conf import settings
 from django.urls import reverse as urlreverse
-from django.utils.encoding import force_text
+from django.utils import timezone
+from django.utils.encoding import force_str
 
 import debug                            # pyflakes:ignore
 from ietf.doc.templatetags.mail_filters import std_level_prompt
@@ -18,12 +19,13 @@
 from ietf.utils import log
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.ipr.utils import iprs_from_docs, related_docs
-from ietf.doc.models import WriteupDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent
+from ietf.doc.models import WriteupDocEvent, LastCallDocEvent, ConsensusDocEvent
 from ietf.doc.utils import needed_ballot_positions
 from ietf.doc.utils_bofreq import bofreq_editors, bofreq_responsible
 from ietf.group.models import Role
 from ietf.doc.models import Document
 from ietf.mailtrigger.utils import gather_address_lists
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 
 
 def email_state_changed(request, doc, text, mailtrigger_id=None):
@@ -52,7 +54,7 @@ def email_ad_approved_doc(request, doc, text):
 
 def email_ad_approved_conflict_review(request, review, ok_to_publish):
     """Email notification when AD approves a conflict review"""
-    conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target.document
+    conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target
     (to, cc) = gather_address_lists("ad_approved_conflict_review")
     frm = request.user.person.formatted_email()
     send_mail(request,
@@ -96,7 +98,7 @@ def email_stream_changed(request, doc, old_stream, new_stream, text=""):
     text = strip_tags(text)
 
     send_mail(request, to, None,
-              "ID Tracker Stream Change Notice: %s" % doc.file_tag(),
+              "I-D Tracker Stream Change Notice: %s" % doc.file_tag(),
               "doc/mail/stream_changed_email.txt",
               dict(text=text,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()),
@@ -173,7 +175,7 @@ def generate_ballot_writeup(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Ballot writeup was generated"
-    e.text = force_text(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
+    e.text = force_str(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana, 'doc': doc }))
 
     # caller is responsible for saving, if necessary
     return e
@@ -185,13 +187,13 @@ def generate_ballot_rfceditornote(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "RFC Editor Note for ballot was generated"
-    e.text = force_text(render_to_string("doc/mail/ballot_rfceditornote.txt"))
+    e.text = force_str(render_to_string("doc/mail/ballot_rfceditornote.txt"))
     e.save()
     
     return e
 
 def generate_last_call_announcement(request, doc):
-    expiration_date = datetime.date.today() + datetime.timedelta(days=14)
+    expiration_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=14)
     if doc.group.type_id in ("individ", "area"):
         group = "an individual submitter"
         expiration_date += datetime.timedelta(days=14)
@@ -200,7 +202,7 @@ def generate_last_call_announcement(request, doc):
 
     doc.filled_title = textwrap.fill(doc.title, width=70, subsequent_indent=" " * 3)
     
-    iprs = iprs_from_docs(related_docs(DocAlias.objects.get(name=doc.canonical_name())))
+    iprs = iprs_from_docs(related_docs(Document.objects.get(name=doc.name)))
     if iprs:
         ipr_links = [ urlreverse("ietf.ipr.views.show", kwargs=dict(id=i.id)) for i in iprs]
         ipr_links = [ settings.IDTRACKER_BASE_URL+url if not url.startswith("http") else url for url in ipr_links ]
@@ -230,7 +232,7 @@ def generate_last_call_announcement(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Last call announcement was generated"
-    e.text = force_text(mail)
+    e.text = force_str(mail)
 
     # caller is responsible for saving, if necessary
     return e
@@ -250,7 +252,7 @@ def generate_approval_mail(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Ballot approval text was generated"
-    e.text = force_text(mail)
+    e.text = force_str(mail)
 
     # caller is responsible for saving, if necessary
     return e
@@ -286,7 +288,7 @@ def generate_approval_mail_approved(request, doc):
     else:
         contacts = "The IESG contact person is %s." % responsible_directors[0]
 
-    doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet Draft"
+    doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet-Draft"
         
     addrs = gather_address_lists('ballot_approved_ietf_stream',doc=doc).as_strings()
     return render_to_string("doc/mail/approval_mail.txt",
@@ -306,7 +308,7 @@ def generate_approval_mail_rfc_editor(request, doc):
     # This is essentially dead code - it is only exercised if the IESG ballots on some other stream's document,
     # which does not happen now that we have conflict reviews.
     disapproved = doc.get_state_slug("draft-iesg") in DO_NOT_PUBLISH_IESG_STATES
-    doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet Draft"
+    doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet-Draft"
     addrs = gather_address_lists('ballot_approved_conflrev', doc=doc).as_strings()
 
     return render_to_string("doc/mail/approval_mail_rfc_editor.txt",
@@ -332,6 +334,9 @@ def generate_publication_request(request, doc):
     if doc.stream_id == "irtf":
         approving_body = "IRSG"
         consensus_body = doc.group.acronym.upper()
+    if doc.stream_id == "editorial":
+        approving_body = "RSAB"
+        consensus_body = doc.group.acronym.upper()
     else:
         approving_body = str(doc.stream)
         consensus_body = approving_body
@@ -418,7 +423,7 @@ def generate_issue_ballot_mail(request, doc, ballot):
     
     e = doc.latest_event(LastCallDocEvent, type="sent_last_call")
     last_call_expires = e.expires if e else None
-    last_call_has_expired = last_call_expires and last_call_expires < datetime.datetime.now()
+    last_call_has_expired = last_call_expires and last_call_expires < timezone.now()
 
     return render_to_string("doc/mail/issue_iesg_ballot_mail.txt",
                             dict(doc=doc,
@@ -437,7 +442,7 @@ def _send_irsg_ballot_email(request, doc, ballot, subject, template):
     (to, cc) = gather_address_lists('irsg_ballot_issued', doc=doc)
     sender = 'IESG Secretary <iesg-secretary@ietf.org>'
 
-    ballot_expired = ballot.duedate < datetime.datetime.now()
+    ballot_expired = ballot.duedate < timezone.now()
     active_ballot = doc.active_ballot()
     if active_ballot is None:
         needed_bps = ''
@@ -484,6 +489,54 @@ def email_irsg_ballot_closed(request, doc, ballot):
         "doc/mail/close_irsg_ballot_mail.txt",
     )
 
+def _send_rsab_ballot_email(request, doc, ballot, subject, template):
+    """Send email notification when IRSG ballot is issued"""
+    (to, cc) = gather_address_lists('rsab_ballot_issued', doc=doc)
+    sender = 'IESG Secretary <iesg-secretary@ietf.org>'
+
+    active_ballot = doc.active_ballot()
+    if active_ballot is None:
+        needed_bps = ''
+    else:
+        needed_bps = needed_ballot_positions(
+            doc,
+            list(active_ballot.active_balloter_positions().values())
+        )
+
+    return send_mail(
+        request=request,
+        frm=sender,
+        to=to,
+        cc=cc,
+        subject=subject,
+        extra={'Reply-To': [sender]},
+        template=template,
+        context=dict(
+            doc=doc,
+            doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
+            needed_ballot_positions=needed_bps,
+        ))
+
+def email_rsab_ballot_issued(request, doc, ballot):
+    """Send email notification when RSAB ballot is issued"""
+    return _send_rsab_ballot_email(
+        request,
+        doc,
+        ballot,
+        'RSAB ballot issued: %s to %s'%(doc.file_tag(), std_level_prompt(doc)),
+        'doc/mail/issue_rsab_ballot_mail.txt',
+    )
+
+def email_rsab_ballot_closed(request, doc, ballot):
+    """Send email notification when RSAB ballot is closed"""
+    return _send_rsab_ballot_email(
+        request,
+        doc,
+        ballot,
+        'RSAB ballot closed: %s to %s'%(doc.file_tag(), std_level_prompt(doc)),
+        "doc/mail/close_rsab_ballot_mail.txt",
+    )
+
 def email_iana(request, doc, to, msg, cc=None):
     # fix up message and send it with extra info on doc in headers
     import email
@@ -515,7 +568,7 @@ def email_last_call_expired(doc):
     send_mail(None,
               addrs.to,
               "DraftTracker Mail System <iesg-secretary@ietf.org>",
-              "Last Call Expired: %s" % doc.file_tag(),
+              "IETF Last Call Expired: %s" % doc.file_tag(),
               "doc/mail/change_notice.txt",
               dict(text=text,
                    doc=doc,
@@ -617,7 +670,7 @@ def send_review_possibly_replaces_request(request, doc, submitter_info):
     to = set(addrs.to)
     cc = set(addrs.cc)
 
-    possibly_replaces = Document.objects.filter(name__in=[alias.name for alias in doc.related_that_doc("possibly-replaces")])
+    possibly_replaces = Document.objects.filter(name__in=[related.name for related in doc.related_that_doc("possibly-replaces")])
     for other_doc in possibly_replaces:
         (other_to, other_cc) = gather_address_lists('doc_replacement_suggested',doc=other_doc)
         to.update(other_to)
diff --git a/ietf/doc/management/commands/find_github_backup_info.py b/ietf/doc/management/commands/find_github_backup_info.py
deleted file mode 100644
index f1f71452df..0000000000
--- a/ietf/doc/management/commands/find_github_backup_info.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-
-
-import github3
-
-from collections import Counter
-from urllib.parse import urlparse
-
-from django.conf import settings
-from django.core.management.base import BaseCommand, CommandError
-
-from ietf.doc.models import DocExtResource
-from ietf.group.models import GroupExtResource
-from ietf.person.models import PersonExtResource
-
-# TODO: Think more about submodules. This currently will only take top level repos, with the assumption that the clone will include arguments to grab all the submodules. 
-# As a consequence, we might end up pulling more than we need (or that the org or user expected)
-# Make sure this is what we want.
-
-class Command(BaseCommand):
-    help = ('Locate information about github repositories to backup')
-
-    def add_arguments(self, parser):
-        parser.add_argument('--verbose', dest='verbose', action='store_true', help='Show counts of types of repositories')
-
-    def handle(self, *args, **options):
-
-        if not (hasattr(settings,'GITHUB_BACKUP_API_KEY') and settings.GITHUB_BACKUP_API_KEY):
-            raise CommandError("ERROR: can't find GITHUB_BACKUP_API_KEY") # TODO: at >= py3.1, use returncode
-
-        github = github3.login(token = settings.GITHUB_BACKUP_API_KEY)
-        owners = dict()
-        repos = set()
-
-        for cls in (DocExtResource, GroupExtResource, PersonExtResource):
-            for res in cls.objects.filter(name_id__in=('github_repo','github_org')):
-                path_parts = urlparse(res.value).path.strip('/').split('/')
-                if not path_parts or not path_parts[0]:
-                    continue
-
-                owner = path_parts[0]
-
-                if owner not in owners:
-                    try:
-                        gh_owner = github.user(username=owner)
-                        owners[owner] = gh_owner
-                    except github3.exceptions.NotFoundError:
-                        continue 
-
-                if gh_owner.type in ('User', 'Organization'):
-                    if len(path_parts) > 1:
-                        repo = path_parts[1]
-                        if (owner, repo) not in repos:
-                            try:
-                                github.repository(owner,repo)
-                                repos.add( (owner, repo) )
-                            except github3.exceptions.NotFoundError:
-                                continue
-                    else:
-                        for repo in github.repositories_by(owner):
-                            repos.add( (owner, repo.name) )
-
-        owner_types = Counter([owners[owner].type for owner in owners])
-        if options['verbose']:
-            self.stdout.write("Owners:")
-            for key in owner_types:
-                self.stdout.write("    %s: %s"%(key,owner_types[key]))
-            self.stdout.write("Repositories: %d" % len(repos))
-            for repo in sorted(repos):
-                self.stdout.write("    https://github.com/%s/%s" % repo )
-        else:
-            for repo in sorted(repos):
-                self.stdout.write("%s/%s" % repo )
-
diff --git a/ietf/doc/management/commands/fix_105_slides.py b/ietf/doc/management/commands/fix_105_slides.py
deleted file mode 100644
index b8689482e8..0000000000
--- a/ietf/doc/management/commands/fix_105_slides.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import os
-
-from collections import Counter
-
-from django.core.management.base import BaseCommand
-
-from ietf.doc.models import DocEvent
-from ietf.meeting.models import Meeting, SessionPresentation
-from ietf.person.models import Person
-
-from ietf.secr.proceedings.proc_utils import is_powerpoint, post_process
-
-class Command(BaseCommand):
-    help = ('Fix uploaded_filename and generate pdf from pptx')
-
-    def add_arguments(self, parser):
-        parser.add_argument('--dry-run', action='store_true', dest='dry-run', default=False, help='Report on changes that would be made without making them')
-
-    def handle(self, *args, **options):
-        ietf105 = Meeting.objects.get(number=105)
-        slides_path = os.path.join(ietf105.get_materials_path(),'slides')
-        system_person = Person.objects.get(name="(System)")
-        counts = Counter()
-
-        for sp in SessionPresentation.objects.filter(session__meeting__number=105,document__type='slides'): #.filter(document__name='slides-105-manet-dlep-multicast-support-discussion'):
-            slides = sp.document
-            if not os.path.exists(os.path.join(slides_path,slides.uploaded_filename)):
-                name, ext = os.path.splitext(slides.uploaded_filename)
-                target_filename = '%s-%s%s' % (name[:name.rfind('-ss')], slides.rev,ext)
-                if os.path.exists(os.path.join(slides_path,target_filename)):
-                    slides.uploaded_filename = target_filename
-                    if not options['dry-run']:
-                        e = DocEvent.objects.create(doc=slides, rev=slides.rev, by=system_person, type='changed_document', desc='Corrected uploaded_filename')
-                        slides.save_with_history([e])
-                    counts['uploaded_filename repair succeeded'] += 1
-
-                else:
-                    self.stderr.write("Unable to repair %s" % slides)
-                    counts['uploaded_filename repair failed'] += 1
-                    continue
-            else:
-                counts['uploaded_filename already ok'] += 1
-
-            if is_powerpoint(slides): 
-                base, _ = os.path.splitext(slides.uploaded_filename)
-                if os.path.exists(os.path.join(slides_path,base+'.pdf')):
-                    self.stderr.write("PDF already exists for %s " % slides)
-                    counts['PDF already exists for a repaired file'] += 1
-                else:
-                    if not options['dry-run']:
-                        post_process(slides)
-                    counts['PDF conversions'] += 1
-
-        if options['dry-run']:
-            self.stdout.write("This is a dry-run. Nothing has actually changed. In a normal run, the output would say the following:")
-
-        for label,count in counts.iteritems():
-            self.stdout.write("%s : %d" % (label,count) )
-
-
diff --git a/ietf/doc/management/commands/generate_draft_aliases.py b/ietf/doc/management/commands/generate_draft_aliases.py
deleted file mode 100755
index 796e3db639..0000000000
--- a/ietf/doc/management/commands/generate_draft_aliases.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright The IETF Trust 2012-2021, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-# This was written as a script by Markus Stenberg <markus.stenberg@iki.fi>.
-# It was turned into a management command by Russ Housley <housley@vigisec.com>.
-
-import datetime
-import io
-import os
-import re
-import shutil
-import stat
-import time
-
-from tempfile import mkstemp
-    
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-import debug                            # pyflakes:ignore
-
-from ietf.doc.models import Document
-from ietf.group.utils import get_group_role_emails, get_group_ad_emails
-from ietf.utils.aliases import dump_sublist
-from utils.mail import parseaddr
-
-DEFAULT_YEARS = 2
-
-
-def get_draft_ad_emails(doc):
-    """Get AD email addresses for the given draft, if any."""
-    ad_emails = set()
-    # If working group document, return current WG ADs
-    if doc.group and doc.group.acronym != 'none':
-        ad_emails.update(get_group_ad_emails(doc.group))
-    # Document may have an explicit AD set
-    if doc.ad:
-        ad_emails.add(doc.ad.email_address())
-    return ad_emails
-
-
-def get_draft_chair_emails(doc):
-    """Get chair email addresses for the given draft, if any."""
-    chair_emails = set()
-    if doc.group:
-        chair_emails.update(get_group_role_emails(doc.group, ['chair', 'secr']))
-    return chair_emails
-
-
-def get_draft_shepherd_email(doc):
-    """Get shepherd email addresses for the given draft, if any."""
-    shepherd_email = set()
-    if doc.shepherd:
-        shepherd_email.add(doc.shepherd.email_address())
-    return shepherd_email
-
-
-def get_draft_authors_emails(doc):
-    """Get list of authors for the given draft."""
-    author_emails = set()
-    for author in doc.documentauthor_set.all():
-        if author.email and author.email.email_address():
-            author_emails.add(author.email.email_address())
-    return author_emails
-
-
-def get_draft_notify_emails(doc):
-    """Get list of email addresses to notify for the given draft."""
-    ad_email_alias_regex = r"^%s.ad@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
-    all_email_alias_regex = r"^%s.all@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
-    author_email_alias_regex = r"^%s@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
-    notify_email_alias_regex = r"^%s.notify@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
-    shepherd_email_alias_regex = r"^%s.shepherd@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
-    notify_emails = set()
-    if doc.notify:
-        for e in doc.notify.split(','):
-            e = e.strip()
-            if re.search(ad_email_alias_regex, e):
-                notify_emails.update(get_draft_ad_emails(doc))
-            elif re.search(author_email_alias_regex, e):
-                notify_emails.update(get_draft_authors_emails(doc))
-            elif re.search(shepherd_email_alias_regex, e):
-                notify_emails.update(get_draft_shepherd_email(doc))
-            elif re.search(all_email_alias_regex, e):
-                notify_emails.update(get_draft_ad_emails(doc))
-                notify_emails.update(get_draft_authors_emails(doc))
-                notify_emails.update(get_draft_shepherd_email(doc))
-            elif re.search(notify_email_alias_regex, e):
-                pass
-            else:
-                (name, email) = parseaddr(e)
-                notify_emails.add(email)
-    return notify_emails
-
-
-class Command(BaseCommand):
-    help = ('Generate the draft-aliases and draft-virtual files for Internet-Draft '
-            'mail aliases, placing them in the files configured in '
-            'settings.DRAFT_ALIASES_PATH and settings.DRAFT_VIRTUAL_PATH, '
-            'respectively.  The generation includes aliases for Internet-Drafts '
-            'that have seen activity in the last %s years.' % (DEFAULT_YEARS))
-
-    def handle(self, *args, **options):
-        show_since = datetime.datetime.now() - datetime.timedelta(DEFAULT_YEARS*365)
-
-        date = time.strftime("%Y-%m-%d_%H:%M:%S")
-        signature = '# Generated by %s at %s\n' % (os.path.abspath(__file__), date)
-
-        ahandle, aname = mkstemp()
-        os.close(ahandle)
-        afile = io.open(aname,"w")
-
-        vhandle, vname = mkstemp()
-        os.close(vhandle)
-        vfile = io.open(vname,"w")
-
-        afile.write(signature)
-        vfile.write(signature)
-        vfile.write("%s anything\n" % settings.DRAFT_VIRTUAL_DOMAIN)
-
-        # Internet-Drafts with active status or expired within DEFAULT_YEARS
-        drafts = Document.objects.filter(name__startswith='draft-')
-        active_drafts = drafts.filter(states__slug='active')
-        inactive_recent_drafts = drafts.exclude(states__slug='active').filter(expires__gte=show_since)
-        interesting_drafts = active_drafts | inactive_recent_drafts
-
-        alias_domains = ['ietf.org', ]
-        for draft in interesting_drafts.distinct().iterator():
-            # Omit RFCs, unless they were published in the last DEFAULT_YEARS
-            if draft.docalias.filter(name__startswith='rfc'):
-                if draft.latest_event(type='published_rfc').time < show_since:
-                    continue
-
-            alias = draft.name
-            all = set()
-
-            # no suffix and .authors are the same list
-            emails = get_draft_authors_emails(draft)
-            all.update(emails)
-            dump_sublist(afile, vfile, alias, alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails)
-            dump_sublist(afile, vfile, alias+'.authors', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails)
-
-            # .chairs = group chairs
-            emails = get_draft_chair_emails(draft)
-            if emails:
-                all.update(emails)
-                dump_sublist(afile, vfile, alias+'.chairs', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails)
-
-            # .ad = sponsoring AD / WG AD (WG document)
-            emails = get_draft_ad_emails(draft)
-            if emails:
-                all.update(emails)
-                dump_sublist(afile, vfile, alias+'.ad', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails)
-
-            # .notify = notify email list from the Document
-            emails = get_draft_notify_emails(draft)
-            if emails:
-                all.update(emails)
-                dump_sublist(afile, vfile, alias+'.notify', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails)
-
-            # .shepherd = shepherd email from the Document
-            emails = get_draft_shepherd_email(draft)
-            if emails:
-                all.update(emails)
-                dump_sublist(afile, vfile, alias+'.shepherd', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, emails)
-
-            # .all = everything from above
-            dump_sublist(afile, vfile, alias+'.all', alias_domains, settings.DRAFT_VIRTUAL_DOMAIN, all)
-
-        afile.close()
-        vfile.close()
-
-        os.chmod(aname, stat.S_IWUSR|stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH) 
-        os.chmod(vname, stat.S_IWUSR|stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH) 
-
-        shutil.move(aname, settings.DRAFT_ALIASES_PATH)
-        shutil.move(vname, settings.DRAFT_VIRTUAL_PATH)
-
-    
\ No newline at end of file
diff --git a/ietf/doc/management/commands/generate_draft_bibxml_files.py b/ietf/doc/management/commands/generate_draft_bibxml_files.py
deleted file mode 100644
index 9ac90523d5..0000000000
--- a/ietf/doc/management/commands/generate_draft_bibxml_files.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import datetime
-import io
-import os
-import re
-import sys
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-import debug                            # pyflakes:ignore
-
-from ietf.doc.models import NewRevisionDocEvent
-from ietf.doc.utils import bibxml_for_draft
-
-DEFAULT_DAYS = 7
-
-class Command(BaseCommand):
-    help = ('Generate draft bibxml files for xml2rfc references, placing them in the '
-            'directory configured in settings.BIBXML_BASE_PATH: %s.  '
-            'By default, generate files as needed for new draft revisions from the '
-            'last %s days.' % (settings.BIBXML_BASE_PATH, DEFAULT_DAYS))
-
-    def add_arguments(self, parser):
-        parser.add_argument('--all', action='store_true', default=False, help="Process all documents, not only recent submissions")
-        parser.add_argument('--days', type=int, default=DEFAULT_DAYS, help="Look submissions from the last DAYS days, instead of %s" % DEFAULT_DAYS)
-
-    def say(self, msg):
-        if self.verbosity > 0:
-            sys.stdout.write(msg)
-            sys.stdout.write('\n')
-
-    def note(self, msg):
-        if self.verbosity > 1:
-            sys.stdout.write(msg)
-            sys.stdout.write('\n')
-
-    def mutter(self, msg):
-        if self.verbosity > 2:
-            sys.stdout.write(msg)
-            sys.stdout.write('\n')
-
-    def write(self, fn, new):
-        # normalize new
-        new = re.sub(r'\r\n?', r'\n', new)
-        try:
-            with io.open(fn, encoding='utf-8') as f:
-                old = f.read()
-        except IOError:
-            old = ""
-        if old.strip() != new.strip():
-            self.note('Writing %s' % os.path.basename(fn))
-            with io.open(fn, "w", encoding='utf-8') as f:
-                f.write(new)
-
-    def handle(self, *args, **options):
-        self.verbosity = options.get("verbosity", 1)
-        process_all = options.get("all")
-        days = options.get("days")
-        #
-        bibxmldir = os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids')
-        if not os.path.exists(bibxmldir):
-            os.makedirs(bibxmldir)
-        #
-        if process_all:
-            doc_events = NewRevisionDocEvent.objects.filter(type='new_revision', doc__type_id='draft')
-        else:
-            start = datetime.datetime.now() - datetime.timedelta(days=days)
-            doc_events = NewRevisionDocEvent.objects.filter(type='new_revision', doc__type_id='draft', time__gte=start)
-        doc_events = doc_events.order_by('time')
-
-        for e in doc_events:
-            self.mutter('%s %s' % (e.time, e.doc.name))
-            try:
-                doc = e.doc
-                bibxml = bibxml_for_draft(doc, e.rev)
-                ref_rev_file_name = os.path.join(bibxmldir, 'reference.I-D.%s-%s.xml' % (doc.name, e.rev))
-                self.write(ref_rev_file_name, bibxml)
-            except Exception as ee:
-                sys.stderr.write('\n%s-%s: %s\n' % (doc.name, doc.rev, ee))
diff --git a/ietf/doc/management/commands/generate_idnits2_rfc_status.py b/ietf/doc/management/commands/generate_idnits2_rfc_status.py
deleted file mode 100644
index 45be188018..0000000000
--- a/ietf/doc/management/commands/generate_idnits2_rfc_status.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-import os
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-from ietf.doc.utils import generate_idnits2_rfc_status
-from ietf.utils.log import log
-
-class Command(BaseCommand):
-    help = ('Generate the rfc_status blob used by idnits2')
-
-    def handle(self, *args, **options):
-        filename=os.path.join(settings.DERIVED_DIR,'idnits2-rfc-status')
-        blob = generate_idnits2_rfc_status()
-        try:
-            bytes = blob.encode('utf-8')
-            with open(filename,'wb') as f:
-                f.write(bytes)
-        except Exception as e:
-            log('failed to write idnits2-rfc-status: '+str(e))
-            raise e
diff --git a/ietf/doc/management/commands/generate_idnits2_rfcs_obsoleted.py b/ietf/doc/management/commands/generate_idnits2_rfcs_obsoleted.py
deleted file mode 100644
index 8bd122e87e..0000000000
--- a/ietf/doc/management/commands/generate_idnits2_rfcs_obsoleted.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-import os
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-from ietf.doc.utils import generate_idnits2_rfcs_obsoleted
-from ietf.utils.log import log
-
-class Command(BaseCommand):
-    help = ('Generate the rfcs-obsoleted file used by idnits2')
-
-    def handle(self, *args, **options):
-        filename=os.path.join(settings.DERIVED_DIR,'idnits2-rfcs-obsoleted')
-        blob = generate_idnits2_rfcs_obsoleted()
-        try:
-            bytes = blob.encode('utf-8')
-            with open(filename,'wb') as f:
-                f.write(bytes)
-        except Exception as e:
-            log('failed to write idnits2-rfcs-obsoleted: '+str(e))
-            raise e
diff --git a/ietf/doc/migrations/0001_initial.py b/ietf/doc/migrations/0001_initial.py
index fd50d34fc7..2823abfe63 100644
--- a/ietf/doc/migrations/0001_initial.py
+++ b/ietf/doc/migrations/0001_initial.py
@@ -1,12 +1,9 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
-
-import datetime
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
 import ietf.utils.models
 
 
@@ -39,13 +36,14 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('json', models.TextField(help_text='Deleted object in JSON format, with attribute names chosen to be suitable for passing into the relevant create method.')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
             ],
         ),
         migrations.CreateModel(
             name='DocAlias',
             fields=[
-                ('name', models.CharField(max_length=255, primary_key=True, serialize=False)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, unique=True)),
             ],
             options={
                 'verbose_name': 'document alias',
@@ -56,8 +54,8 @@ class Migration(migrations.Migration):
             name='DocEvent',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(db_index=True, default=datetime.datetime.now, help_text='When the event happened')),
-                ('type', models.CharField(choices=[(b'new_revision', b'Added new revision'), (b'new_submission', b'Uploaded new revision'), (b'changed_document', b'Changed document metadata'), (b'added_comment', b'Added comment'), (b'added_message', b'Added message'), (b'edited_authors', b'Edited the documents author list'), (b'deleted', b'Deleted document'), (b'changed_state', b'Changed state'), (b'changed_stream', b'Changed document stream'), (b'expired_document', b'Expired document'), (b'extended_expiry', b'Extended expiry of document'), (b'requested_resurrect', b'Requested resurrect'), (b'completed_resurrect', b'Completed resurrect'), (b'changed_consensus', b'Changed consensus'), (b'published_rfc', b'Published RFC'), (b'added_suggested_replaces', b'Added suggested replacement relationships'), (b'reviewed_suggested_replaces', b'Reviewed suggested replacement relationships'), (b'changed_group', b'Changed group'), (b'changed_protocol_writeup', b'Changed protocol writeup'), (b'changed_charter_milestone', b'Changed charter milestone'), (b'initial_review', b'Set initial review time'), (b'changed_review_announcement', b'Changed WG Review text'), (b'changed_action_announcement', b'Changed WG Action text'), (b'started_iesg_process', b'Started IESG process on document'), (b'created_ballot', b'Created ballot'), (b'closed_ballot', b'Closed ballot'), (b'sent_ballot_announcement', b'Sent ballot announcement'), (b'changed_ballot_position', b'Changed ballot position'), (b'changed_ballot_approval_text', b'Changed ballot approval text'), (b'changed_ballot_writeup_text', b'Changed ballot writeup text'), (b'changed_rfc_editor_note_text', b'Changed RFC Editor Note text'), (b'changed_last_call_text', b'Changed last call text'), (b'requested_last_call', b'Requested last call'), (b'sent_last_call', b'Sent last call'), (b'scheduled_for_telechat', b'Scheduled for telechat'), (b'iesg_approved', b'IESG approved document (no problem)'), (b'iesg_disapproved', b'IESG disapproved document (do not publish)'), (b'approved_in_minute', b'Approved in minute'), (b'iana_review', b'IANA review comment'), (b'rfc_in_iana_registry', b'RFC is in IANA registry'), (b'rfc_editor_received_announcement', b'Announcement was received by RFC Editor'), (b'requested_publication', b'Publication at RFC Editor requested'), (b'sync_from_rfc_editor', b'Received updated information from RFC Editor'), (b'requested_review', b'Requested review'), (b'assigned_review_request', b'Assigned review request'), (b'closed_review_request', b'Closed review request'), (b'downref_approved', b'Downref approved')], max_length=50)),
+                ('time', models.DateTimeField(db_index=True, default=django.utils.timezone.now, help_text='When the event happened')),
+                ('type', models.CharField(choices=[('new_revision', 'Added new revision'), ('new_submission', 'Uploaded new revision'), ('changed_document', 'Changed document metadata'), ('added_comment', 'Added comment'), ('added_message', 'Added message'), ('edited_authors', 'Edited the documents author list'), ('deleted', 'Deleted document'), ('changed_state', 'Changed state'), ('changed_stream', 'Changed document stream'), ('expired_document', 'Expired document'), ('extended_expiry', 'Extended expiry of document'), ('requested_resurrect', 'Requested resurrect'), ('completed_resurrect', 'Completed resurrect'), ('changed_consensus', 'Changed consensus'), ('published_rfc', 'Published RFC'), ('added_suggested_replaces', 'Added suggested replacement relationships'), ('reviewed_suggested_replaces', 'Reviewed suggested replacement relationships'), ('changed_action_holders', 'Changed action holders for document'), ('changed_group', 'Changed group'), ('changed_protocol_writeup', 'Changed protocol writeup'), ('changed_charter_milestone', 'Changed charter milestone'), ('initial_review', 'Set initial review time'), ('changed_review_announcement', 'Changed WG Review text'), ('changed_action_announcement', 'Changed WG Action text'), ('started_iesg_process', 'Started IESG process on document'), ('created_ballot', 'Created ballot'), ('closed_ballot', 'Closed ballot'), ('sent_ballot_announcement', 'Sent ballot announcement'), ('changed_ballot_position', 'Changed ballot position'), ('changed_ballot_approval_text', 'Changed ballot approval text'), ('changed_ballot_writeup_text', 'Changed ballot writeup text'), ('changed_rfc_editor_note_text', 'Changed RFC Editor Note text'), ('changed_last_call_text', 'Changed last call text'), ('requested_last_call', 'Requested last call'), ('sent_last_call', 'Sent last call'), ('scheduled_for_telechat', 'Scheduled for telechat'), ('iesg_approved', 'IESG approved document (no problem)'), ('iesg_disapproved', 'IESG disapproved document (do not publish)'), ('approved_in_minute', 'Approved in minute'), ('iana_review', 'IANA review comment'), ('rfc_in_iana_registry', 'RFC is in IANA registry'), ('rfc_editor_received_announcement', 'Announcement was received by RFC Editor'), ('requested_publication', 'Publication at RFC Editor requested'), ('sync_from_rfc_editor', 'Received updated information from RFC Editor'), ('requested_review', 'Requested review'), ('assigned_review_request', 'Assigned review request'), ('closed_review_request', 'Closed review request'), ('closed_review_assignment', 'Closed review assignment'), ('downref_approved', 'Downref approved'), ('posted_related_ipr', 'Posted related IPR'), ('removed_related_ipr', 'Removed related IPR'), ('changed_editors', 'Changed BOF Request editors')], max_length=50)),
                 ('rev', models.CharField(blank=True, max_length=16, null=True, verbose_name='revision')),
                 ('desc', models.TextField()),
             ],
@@ -65,11 +63,22 @@ class Migration(migrations.Migration):
                 'ordering': ['-time', '-id'],
             },
         ),
+        migrations.CreateModel(
+            name='DocExtResource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('display_name', models.CharField(blank=True, default='', max_length=255)),
+                ('value', models.CharField(max_length=2083)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
         migrations.CreateModel(
             name='DocHistory',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
                 ('title', models.CharField(max_length=255, validators=[django.core.validators.RegexValidator(message='Please enter a string without control characters.', regex='^[^\x00-\x1f]*$')])),
                 ('abstract', models.TextField(blank=True)),
                 ('rev', models.CharField(blank=True, max_length=16, verbose_name='revision')),
@@ -77,8 +86,9 @@ class Migration(migrations.Migration):
                 ('words', models.IntegerField(blank=True, null=True)),
                 ('order', models.IntegerField(blank=True, default=1)),
                 ('expires', models.DateTimeField(blank=True, null=True)),
-                ('notify', models.CharField(blank=True, max_length=255)),
+                ('notify', models.TextField(blank=True, max_length=1023)),
                 ('external_url', models.URLField(blank=True)),
+                ('uploaded_filename', models.TextField(blank=True)),
                 ('note', models.TextField(blank=True)),
                 ('internal_comments', models.TextField(blank=True)),
                 ('name', models.CharField(max_length=255)),
@@ -112,7 +122,8 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Document',
             fields=[
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
                 ('title', models.CharField(max_length=255, validators=[django.core.validators.RegexValidator(message='Please enter a string without control characters.', regex='^[^\x00-\x1f]*$')])),
                 ('abstract', models.TextField(blank=True)),
                 ('rev', models.CharField(blank=True, max_length=16, verbose_name='revision')),
@@ -120,77 +131,17 @@ class Migration(migrations.Migration):
                 ('words', models.IntegerField(blank=True, null=True)),
                 ('order', models.IntegerField(blank=True, default=1)),
                 ('expires', models.DateTimeField(blank=True, null=True)),
-                ('notify', models.CharField(blank=True, max_length=255)),
+                ('notify', models.TextField(blank=True, max_length=1023)),
                 ('external_url', models.URLField(blank=True)),
+                ('uploaded_filename', models.TextField(blank=True)),
                 ('note', models.TextField(blank=True)),
                 ('internal_comments', models.TextField(blank=True)),
-                ('name', models.CharField(max_length=255, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(b'^[-a-z0-9]+$', b'Provide a valid document name consisting of lowercase letters, numbers and hyphens.', b'invalid')])),
-                ('ad', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_document_set', to='person.Person', verbose_name='area director')),
-                ('formal_languages', models.ManyToManyField(blank=True, help_text='Formal languages used in document', to='name.FormalLanguageName')),
+                ('name', models.CharField(max_length=255, unique=True, validators=[django.core.validators.RegexValidator('^[-a-z0-9]+$', 'Provide a valid document name consisting of lowercase letters, numbers and hyphens.', 'invalid')])),
             ],
             options={
                 'abstract': False,
             },
         ),
-        migrations.CreateModel(
-            name='DocumentAuthor',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('affiliation', models.CharField(blank=True, help_text='Organization/company used by author for submission', max_length=100)),
-                ('country', models.CharField(blank=True, help_text='Country used by author for submission', max_length=255)),
-                ('order', models.IntegerField(default=1)),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('email', ietf.utils.models.ForeignKey(blank=True, help_text='Email address used by author for submission', null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-            ],
-            options={
-                'ordering': ['document', 'order'],
-                'abstract': False,
-            },
-        ),
-        migrations.CreateModel(
-            name='DocumentURL',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('desc', models.CharField(blank=True, default='', max_length=255)),
-                ('url', models.URLField(max_length=512)),
-                ('doc', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('tag', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocUrlTagName')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='RelatedDocHistory',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('relationship', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocRelationshipName')),
-                ('source', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocHistory')),
-                ('target', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reversely_related_document_history_set', to='doc.DocAlias')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='RelatedDocument',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('relationship', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocRelationshipName')),
-                ('source', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('target', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocAlias')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='State',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('slug', models.SlugField()),
-                ('name', models.CharField(max_length=255)),
-                ('used', models.BooleanField(default=True)),
-                ('desc', models.TextField(blank=True)),
-                ('order', models.IntegerField(default=0)),
-                ('next_states', models.ManyToManyField(blank=True, related_name='previous_states', to='doc.State')),
-            ],
-            options={
-                'ordering': ['type', 'order'],
-            },
-        ),
         migrations.CreateModel(
             name='StateType',
             fields=[
@@ -221,6 +172,21 @@ class Migration(migrations.Migration):
                 ('discuss_time', models.DateTimeField(blank=True, help_text='Time discuss text was written', null=True)),
                 ('comment', models.TextField(blank=True, help_text='Optional comment')),
                 ('comment_time', models.DateTimeField(blank=True, help_text='Time optional comment was written', null=True)),
+                ('send_email', models.BooleanField(default=None, null=True)),
+            ],
+            bases=('doc.docevent',),
+        ),
+        migrations.CreateModel(
+            name='BofreqEditorDocEvent',
+            fields=[
+                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
+            ],
+            bases=('doc.docevent',),
+        ),
+        migrations.CreateModel(
+            name='BofreqResponsibleDocEvent',
+            fields=[
+                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
             ],
             bases=('doc.docevent',),
         ),
@@ -228,7 +194,7 @@ class Migration(migrations.Migration):
             name='ConsensusDocEvent',
             fields=[
                 ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
-                ('consensus', models.NullBooleanField(default=None)),
+                ('consensus', models.BooleanField(default=None, null=True)),
             ],
             bases=('doc.docevent',),
         ),
@@ -240,6 +206,13 @@ class Migration(migrations.Migration):
             ],
             bases=('doc.docevent',),
         ),
+        migrations.CreateModel(
+            name='IanaExpertDocEvent',
+            fields=[
+                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
+            ],
+            bases=('doc.docevent',),
+        ),
         migrations.CreateModel(
             name='InitialReviewDocEvent',
             fields=[
@@ -263,6 +236,13 @@ class Migration(migrations.Migration):
             ],
             bases=('doc.docevent',),
         ),
+        migrations.CreateModel(
+            name='ReviewAssignmentDocEvent',
+            fields=[
+                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
+            ],
+            bases=('doc.docevent',),
+        ),
         migrations.CreateModel(
             name='ReviewRequestDocEvent',
             fields=[
@@ -301,9 +281,88 @@ class Migration(migrations.Migration):
             ],
             bases=('doc.docevent',),
         ),
+        migrations.CreateModel(
+            name='State',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('slug', models.SlugField()),
+                ('name', models.CharField(max_length=255)),
+                ('used', models.BooleanField(default=True)),
+                ('desc', models.TextField(blank=True)),
+                ('order', models.IntegerField(default=0)),
+                ('next_states', models.ManyToManyField(blank=True, related_name='previous_states', to='doc.State')),
+                ('type', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.StateType')),
+            ],
+            options={
+                'ordering': ['type', 'order'],
+            },
+        ),
+        migrations.CreateModel(
+            name='RelatedDocument',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('relationship', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocRelationshipName')),
+                ('source', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
+                ('target', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocAlias')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='RelatedDocHistory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('relationship', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocRelationshipName')),
+                ('source', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocHistory')),
+                ('target', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reversely_related_document_history_set', to='doc.DocAlias')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='DocumentURL',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('desc', models.CharField(blank=True, default='', max_length=255)),
+                ('url', models.URLField(max_length=2083)),
+                ('doc', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
+                ('tag', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocUrlTagName')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='DocumentAuthor',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('affiliation', models.CharField(blank=True, help_text='Organization/company used by author for submission', max_length=100)),
+                ('country', models.CharField(blank=True, help_text='Country used by author for submission', max_length=255)),
+                ('order', models.IntegerField(default=1)),
+                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
+                ('email', ietf.utils.models.ForeignKey(blank=True, help_text='Email address used by author for submission', null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+            ],
+            options={
+                'ordering': ['document', 'order'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='DocumentActionHolder',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time_added', models.DateTimeField(default=django.utils.timezone.now)),
+                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='action_holders',
+            field=models.ManyToManyField(blank=True, through='doc.DocumentActionHolder', to='person.Person'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='ad',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_document_set', to='person.Person', verbose_name='area director'),
+        ),
         migrations.AddField(
-            model_name='state',
-            name='type',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.StateType'),
+            model_name='document',
+            name='formal_languages',
+            field=models.ManyToManyField(blank=True, help_text='Formal languages used in document', to='name.FormalLanguageName'),
         ),
     ]
diff --git a/ietf/doc/migrations/0002_auto_20180220_1052.py b/ietf/doc/migrations/0002_auto_20180220_1052.py
deleted file mode 100644
index 811e9eb811..0000000000
--- a/ietf/doc/migrations/0002_auto_20180220_1052.py
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('review', '0001_initial'),
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('name', '0001_initial'),
-        ('submit', '0001_initial'),
-        ('person', '0001_initial'),
-        ('message', '0001_initial'),
-        ('doc', '0001_initial'),
-        ('group', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='document',
-            name='group',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='intended_std_level',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.IntendedStdLevelName', verbose_name='Intended standardization level'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='shepherd',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_document_set', to='person.Email'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='states',
-            field=models.ManyToManyField(blank=True, to='doc.State'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='std_level',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StdLevelName', verbose_name='Standardization level'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='stream',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StreamName'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='tags',
-            field=models.ManyToManyField(blank=True, to='name.DocTagName'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='type',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'),
-        ),
-        migrations.AddField(
-            model_name='docreminder',
-            name='event',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocEvent'),
-        ),
-        migrations.AddField(
-            model_name='docreminder',
-            name='type',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocReminderTypeName'),
-        ),
-        migrations.AddField(
-            model_name='dochistoryauthor',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documentauthor_set', to='doc.DocHistory'),
-        ),
-        migrations.AddField(
-            model_name='dochistoryauthor',
-            name='email',
-            field=ietf.utils.models.ForeignKey(blank=True, help_text='Email address used by author for submission', null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Email'),
-        ),
-        migrations.AddField(
-            model_name='dochistoryauthor',
-            name='person',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='ad',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_dochistory_set', to='person.Person', verbose_name='area director'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='formal_languages',
-            field=models.ManyToManyField(blank=True, help_text='Formal languages used in document', to='name.FormalLanguageName'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='group',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='intended_std_level',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.IntendedStdLevelName', verbose_name='Intended standardization level'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='shepherd',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_dochistory_set', to='person.Email'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='states',
-            field=models.ManyToManyField(blank=True, to='doc.State'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='std_level',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StdLevelName', verbose_name='Standardization level'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='stream',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StreamName'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='tags',
-            field=models.ManyToManyField(blank=True, to='name.DocTagName'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='type',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'),
-        ),
-        migrations.AddField(
-            model_name='docevent',
-            name='by',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
-        ),
-        migrations.AddField(
-            model_name='docevent',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='docalias',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='deletedevent',
-            name='by',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
-        ),
-        migrations.AddField(
-            model_name='deletedevent',
-            name='content_type',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
-        ),
-        migrations.AddField(
-            model_name='ballottype',
-            name='doc_type',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'),
-        ),
-        migrations.AddField(
-            model_name='ballottype',
-            name='positions',
-            field=models.ManyToManyField(blank=True, to='name.BallotPositionName'),
-        ),
-        migrations.AddField(
-            model_name='submissiondocevent',
-            name='submission',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submit.Submission'),
-        ),
-        migrations.AddField(
-            model_name='statedocevent',
-            name='state',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.State'),
-        ),
-        migrations.AddField(
-            model_name='statedocevent',
-            name='state_type',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.StateType'),
-        ),
-        migrations.AddField(
-            model_name='reviewrequestdocevent',
-            name='review_request',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.ReviewRequest'),
-        ),
-        migrations.AddField(
-            model_name='reviewrequestdocevent',
-            name='state',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.ReviewRequestStateName'),
-        ),
-        migrations.AddField(
-            model_name='ballotpositiondocevent',
-            name='ad',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
-        ),
-        migrations.AddField(
-            model_name='ballotpositiondocevent',
-            name='ballot',
-            field=ietf.utils.models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.BallotDocEvent'),
-        ),
-        migrations.AddField(
-            model_name='ballotpositiondocevent',
-            name='pos',
-            field=ietf.utils.models.ForeignKey(default='norecord', on_delete=django.db.models.deletion.CASCADE, to='name.BallotPositionName', verbose_name='position'),
-        ),
-        migrations.AddField(
-            model_name='ballotdocevent',
-            name='ballot_type',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.BallotType'),
-        ),
-        migrations.AddField(
-            model_name='addedmessageevent',
-            name='in_reply_to',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='doc_irtomanual', to='message.Message'),
-        ),
-        migrations.AddField(
-            model_name='addedmessageevent',
-            name='message',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='doc_manualevents', to='message.Message'),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0002_auto_20230320_1222.py b/ietf/doc/migrations/0002_auto_20230320_1222.py
new file mode 100644
index 0000000000..90b2d11a25
--- /dev/null
+++ b/ietf/doc/migrations/0002_auto_20230320_1222.py
@@ -0,0 +1,292 @@
+# Generated by Django 2.2.28 on 2023-03-20 19:22
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('message', '0001_initial'),
+        ('name', '0001_initial'),
+        ('person', '0001_initial'),
+        ('review', '0001_initial'),
+        ('group', '0001_initial'),
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('submit', '0001_initial'),
+        ('doc', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='document',
+            name='group',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='intended_std_level',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.IntendedStdLevelName', verbose_name='Intended standardization level'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='shepherd',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_document_set', to='person.Email'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='states',
+            field=models.ManyToManyField(blank=True, to='doc.State'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='std_level',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StdLevelName', verbose_name='Standardization level'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='stream',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StreamName'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='tags',
+            field=models.ManyToManyField(blank=True, to='name.DocTagName'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='type',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'),
+        ),
+        migrations.AddField(
+            model_name='docreminder',
+            name='event',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocEvent'),
+        ),
+        migrations.AddField(
+            model_name='docreminder',
+            name='type',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocReminderTypeName'),
+        ),
+        migrations.AddField(
+            model_name='dochistoryauthor',
+            name='document',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documentauthor_set', to='doc.DocHistory'),
+        ),
+        migrations.AddField(
+            model_name='dochistoryauthor',
+            name='email',
+            field=ietf.utils.models.ForeignKey(blank=True, help_text='Email address used by author for submission', null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Email'),
+        ),
+        migrations.AddField(
+            model_name='dochistoryauthor',
+            name='person',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='ad',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_dochistory_set', to='person.Person', verbose_name='area director'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='doc',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='doc.Document'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='formal_languages',
+            field=models.ManyToManyField(blank=True, help_text='Formal languages used in document', to='name.FormalLanguageName'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='group',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='intended_std_level',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.IntendedStdLevelName', verbose_name='Intended standardization level'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='shepherd',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_dochistory_set', to='person.Email'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='states',
+            field=models.ManyToManyField(blank=True, to='doc.State'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='std_level',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StdLevelName', verbose_name='Standardization level'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='stream',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StreamName'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='tags',
+            field=models.ManyToManyField(blank=True, to='name.DocTagName'),
+        ),
+        migrations.AddField(
+            model_name='dochistory',
+            name='type',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'),
+        ),
+        migrations.AddField(
+            model_name='docextresource',
+            name='doc',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
+        ),
+        migrations.AddField(
+            model_name='docextresource',
+            name='name',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceName'),
+        ),
+        migrations.AddField(
+            model_name='docevent',
+            name='by',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        ),
+        migrations.AddField(
+            model_name='docevent',
+            name='doc',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
+        ),
+        migrations.AddField(
+            model_name='docalias',
+            name='docs',
+            field=models.ManyToManyField(related_name='docalias', to='doc.Document'),
+        ),
+        migrations.AddField(
+            model_name='deletedevent',
+            name='by',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        ),
+        migrations.AddField(
+            model_name='deletedevent',
+            name='content_type',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
+        ),
+        migrations.AddField(
+            model_name='ballottype',
+            name='doc_type',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'),
+        ),
+        migrations.AddField(
+            model_name='ballottype',
+            name='positions',
+            field=models.ManyToManyField(blank=True, to='name.BallotPositionName'),
+        ),
+        migrations.CreateModel(
+            name='IRSGBallotDocEvent',
+            fields=[
+                ('ballotdocevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.BallotDocEvent')),
+                ('duedate', models.DateTimeField(blank=True, null=True)),
+            ],
+            bases=('doc.ballotdocevent',),
+        ),
+        migrations.AddField(
+            model_name='submissiondocevent',
+            name='submission',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submit.Submission'),
+        ),
+        migrations.AddField(
+            model_name='statedocevent',
+            name='state',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.State'),
+        ),
+        migrations.AddField(
+            model_name='statedocevent',
+            name='state_type',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.StateType'),
+        ),
+        migrations.AddField(
+            model_name='reviewrequestdocevent',
+            name='review_request',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.ReviewRequest'),
+        ),
+        migrations.AddField(
+            model_name='reviewrequestdocevent',
+            name='state',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.ReviewRequestStateName'),
+        ),
+        migrations.AddField(
+            model_name='reviewassignmentdocevent',
+            name='review_assignment',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.ReviewAssignment'),
+        ),
+        migrations.AddField(
+            model_name='reviewassignmentdocevent',
+            name='state',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.ReviewAssignmentStateName'),
+        ),
+        migrations.AddIndex(
+            model_name='documentauthor',
+            index=models.Index(fields=['document', 'order'], name='doc_documen_documen_7fabe2_idx'),
+        ),
+        migrations.AddConstraint(
+            model_name='documentactionholder',
+            constraint=models.UniqueConstraint(fields=('document', 'person'), name='unique_action_holder'),
+        ),
+        migrations.AddIndex(
+            model_name='dochistoryauthor',
+            index=models.Index(fields=['document', 'order'], name='doc_dochist_documen_7e2441_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='docevent',
+            index=models.Index(fields=['type', 'doc'], name='doc_doceven_type_43e53e_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='docevent',
+            index=models.Index(fields=['-time', '-id'], name='doc_doceven_time_1a258f_idx'),
+        ),
+        migrations.AddField(
+            model_name='bofreqresponsibledocevent',
+            name='responsible',
+            field=models.ManyToManyField(blank=True, to='person.Person'),
+        ),
+        migrations.AddField(
+            model_name='bofreqeditordocevent',
+            name='editors',
+            field=models.ManyToManyField(blank=True, to='person.Person'),
+        ),
+        migrations.AddField(
+            model_name='ballotpositiondocevent',
+            name='ballot',
+            field=ietf.utils.models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.BallotDocEvent'),
+        ),
+        migrations.AddField(
+            model_name='ballotpositiondocevent',
+            name='balloter',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        ),
+        migrations.AddField(
+            model_name='ballotpositiondocevent',
+            name='pos',
+            field=ietf.utils.models.ForeignKey(default='norecord', on_delete=django.db.models.deletion.CASCADE, to='name.BallotPositionName', verbose_name='position'),
+        ),
+        migrations.AddField(
+            model_name='ballotdocevent',
+            name='ballot_type',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.BallotType'),
+        ),
+        migrations.AddField(
+            model_name='addedmessageevent',
+            name='in_reply_to',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='doc_irtomanual', to='message.Message'),
+        ),
+        migrations.AddField(
+            model_name='addedmessageevent',
+            name='message',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='doc_manualevents', to='message.Message'),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0003_auto_20180401_1231.py b/ietf/doc/migrations/0003_auto_20180401_1231.py
deleted file mode 100644
index 7760b25112..0000000000
--- a/ietf/doc/migrations/0003_auto_20180401_1231.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-04-01 12:31
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0002_auto_20180220_1052'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='docevent',
-            index=models.Index(fields=['type', 'doc'], name='doc_doceven_type_43e53e_idx'),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0003_remove_document_info_order.py b/ietf/doc/migrations/0003_remove_document_info_order.py
new file mode 100644
index 0000000000..dcd324b71f
--- /dev/null
+++ b/ietf/doc/migrations/0003_remove_document_info_order.py
@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('doc', '0002_auto_20230320_1222'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dochistory',
+            name='order',
+        ),
+        migrations.RemoveField(
+            model_name='document',
+            name='order',
+        ),
+    ]
diff --git a/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py b/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py
deleted file mode 100644
index 9d57cb476f..0000000000
--- a/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-03 11:50
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    State = apps.get_model('doc','State')
-    for type_id in ('draft-stream-iab','draft-stream-ise','draft-stream-irtf'):
-        State.objects.create(type_id=type_id,
-                             slug='repl',
-                             name='Replaced',
-                             desc='Replaced',
-                            )
-
-
-def reverse(apps, schema_editor):
-    State = apps.get_model('doc','State')
-    State.objects.filter(type_id__in=('draft-stream-iab','draft-stream-ise','draft-stream-irtf'), slug='repl').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0003_auto_20180401_1231'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/doc/migrations/0004_alter_dochistory_ad_alter_dochistory_shepherd_and_more.py b/ietf/doc/migrations/0004_alter_dochistory_ad_alter_dochistory_shepherd_and_more.py
new file mode 100644
index 0000000000..adc0e69627
--- /dev/null
+++ b/ietf/doc/migrations/0004_alter_dochistory_ad_alter_dochistory_shepherd_and_more.py
@@ -0,0 +1,36 @@
+# Generated by Django 4.0.10 on 2023-05-16 20:36
+
+from django.db import migrations
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0001_initial'),
+        ('doc', '0003_remove_document_info_order'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dochistory',
+            name='ad',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_%(class)s_set', to='person.person', verbose_name='area director'),
+        ),
+        migrations.AlterField(
+            model_name='dochistory',
+            name='shepherd',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_%(class)s_set', to='person.email'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='ad',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_%(class)s_set', to='person.person', verbose_name='area director'),
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='shepherd',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_%(class)s_set', to='person.email'),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0005_alter_docevent_type.py b/ietf/doc/migrations/0005_alter_docevent_type.py
new file mode 100644
index 0000000000..f8a3cfc795
--- /dev/null
+++ b/ietf/doc/migrations/0005_alter_docevent_type.py
@@ -0,0 +1,86 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0004_alter_dochistory_ad_alter_dochistory_shepherd_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="docevent",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("new_revision", "Added new revision"),
+                    ("new_submission", "Uploaded new revision"),
+                    ("changed_document", "Changed document metadata"),
+                    ("added_comment", "Added comment"),
+                    ("added_message", "Added message"),
+                    ("edited_authors", "Edited the documents author list"),
+                    ("deleted", "Deleted document"),
+                    ("changed_state", "Changed state"),
+                    ("changed_stream", "Changed document stream"),
+                    ("expired_document", "Expired document"),
+                    ("extended_expiry", "Extended expiry of document"),
+                    ("requested_resurrect", "Requested resurrect"),
+                    ("completed_resurrect", "Completed resurrect"),
+                    ("changed_consensus", "Changed consensus"),
+                    ("published_rfc", "Published RFC"),
+                    (
+                        "added_suggested_replaces",
+                        "Added suggested replacement relationships",
+                    ),
+                    (
+                        "reviewed_suggested_replaces",
+                        "Reviewed suggested replacement relationships",
+                    ),
+                    ("changed_action_holders", "Changed action holders for document"),
+                    ("changed_group", "Changed group"),
+                    ("changed_protocol_writeup", "Changed protocol writeup"),
+                    ("changed_charter_milestone", "Changed charter milestone"),
+                    ("initial_review", "Set initial review time"),
+                    ("changed_review_announcement", "Changed WG Review text"),
+                    ("changed_action_announcement", "Changed WG Action text"),
+                    ("started_iesg_process", "Started IESG process on document"),
+                    ("created_ballot", "Created ballot"),
+                    ("closed_ballot", "Closed ballot"),
+                    ("sent_ballot_announcement", "Sent ballot announcement"),
+                    ("changed_ballot_position", "Changed ballot position"),
+                    ("changed_ballot_approval_text", "Changed ballot approval text"),
+                    ("changed_ballot_writeup_text", "Changed ballot writeup text"),
+                    ("changed_rfc_editor_note_text", "Changed RFC Editor Note text"),
+                    ("changed_last_call_text", "Changed last call text"),
+                    ("requested_last_call", "Requested last call"),
+                    ("sent_last_call", "Sent last call"),
+                    ("scheduled_for_telechat", "Scheduled for telechat"),
+                    ("iesg_approved", "IESG approved document (no problem)"),
+                    ("iesg_disapproved", "IESG disapproved document (do not publish)"),
+                    ("approved_in_minute", "Approved in minute"),
+                    ("iana_review", "IANA review comment"),
+                    ("rfc_in_iana_registry", "RFC is in IANA registry"),
+                    (
+                        "rfc_editor_received_announcement",
+                        "Announcement was received by RFC Editor",
+                    ),
+                    ("requested_publication", "Publication at RFC Editor requested"),
+                    (
+                        "sync_from_rfc_editor",
+                        "Received updated information from RFC Editor",
+                    ),
+                    ("requested_review", "Requested review"),
+                    ("assigned_review_request", "Assigned review request"),
+                    ("closed_review_request", "Closed review request"),
+                    ("closed_review_assignment", "Closed review assignment"),
+                    ("downref_approved", "Downref approved"),
+                    ("posted_related_ipr", "Posted related IPR"),
+                    ("removed_related_ipr", "Removed related IPR"),
+                    ("changed_editors", "Changed BOF Request editors"),
+                    ("published_statement", "Published statement"),
+                ],
+                max_length=50,
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py b/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py
deleted file mode 100644
index 3529baf980..0000000000
--- a/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-03 12:16
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    Document = apps.get_model('doc','Document')
-    State = apps.get_model('doc','State')
-
-    iab_active = State.objects.get(type_id='draft-stream-iab',slug='active')
-    iab_replaced = State.objects.get(type_id='draft-stream-iab',slug='repl')
-
-    irtf_active = State.objects.get(type_id='draft-stream-irtf',slug='active')
-    irtf_candidate = State.objects.get(type_id='draft-stream-irtf',slug='candidat')
-    irtf_replaced = State.objects.get(type_id='draft-stream-irtf',slug='repl')
-    irtf_dead = State.objects.get(type_id='draft-stream-irtf',slug='dead')
-
-    doc = Document.objects.get(name='draft-flanagan-rfc-preservation')
-    doc.states.remove(iab_active)
-    doc.states.add(iab_replaced)
-
-    doc = Document.objects.get(name='draft-trammell-semi-report')
-    doc.states.remove(iab_active)
-    doc.states.add(iab_replaced)
-    
-    doc = Document.objects.get(name='draft-nir-cfrg-chacha20-poly1305')
-    doc.states.remove(irtf_candidate)
-    doc.states.add(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-ladd-spake2')
-    doc.states.remove(irtf_candidate)
-    doc.states.add(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-lee-nfvrg-resource-management-service-chain')
-    doc.states.remove(irtf_candidate)
-    doc.states.add(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-keranen-t2trg-rest-iot')
-    doc.states.remove(irtf_candidate)
-    doc.states.add(irtf_replaced)
-    
-    doc = Document.objects.get(name='draft-josefsson-argon2')
-    doc.states.remove(irtf_active)
-    doc.states.add(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-tenoever-hrpc-research')
-    doc.states.remove(irtf_active)
-    doc.states.add(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-kutscher-icnrg-challenges')
-    doc.states.remove(irtf_dead)
-    doc.states.add(irtf_replaced)
-        
-def reverse(apps, schema_editor):
-    Document = apps.get_model('doc','Document')
-    State = apps.get_model('doc','State')
-
-    iab_active = State.objects.get(type_id='draft-stream-iab',slug='active')
-    iab_replaced = State.objects.get(type_id='draft-stream-iab',slug='repl')
-
-    irtf_active = State.objects.get(type_id='draft-stream-irtf',slug='active')
-    irtf_candidate = State.objects.get(type_id='draft-stream-irtf',slug='candidat')
-    irtf_replaced = State.objects.get(type_id='draft-stream-irtf',slug='repl')
-    irtf_dead = State.objects.get(type_id='draft-stream-irtf',slug='dead')
-
-    doc = Document.objects.get(name='draft-flanagan-rfc-preservation')
-    doc.states.add(iab_active)
-    doc.states.remove(iab_replaced)
-
-    doc = Document.objects.get(name='draft-trammell-semi-report')
-    doc.states.add(iab_active)
-    doc.states.remove(iab_replaced)
-    
-    doc = Document.objects.get(name='draft-nir-cfrg-chacha20-poly1305')
-    doc.states.add(irtf_candidate)
-    doc.states.remove(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-ladd-spake2')
-    doc.states.add(irtf_candidate)
-    doc.states.remove(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-lee-nfvrg-resource-management-service-chain')
-    doc.states.add(irtf_candidate)
-    doc.states.remove(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-keranen-t2trg-rest-iot')
-    doc.states.add(irtf_candidate)
-    doc.states.remove(irtf_replaced)
-    
-    doc = Document.objects.get(name='draft-josefsson-argon2')
-    doc.states.add(irtf_active)
-    doc.states.remove(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-tenoever-hrpc-research')
-    doc.states.add(irtf_active)
-    doc.states.remove(irtf_replaced)
-
-    doc = Document.objects.get(name='draft-kutscher-icnrg-challenges')
-    doc.states.add(irtf_dead)
-    doc.states.remove(irtf_replaced)
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0004_add_draft_stream_replaced_states'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py b/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py
deleted file mode 100644
index 42f58ca02c..0000000000
--- a/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-10-03 06:39
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0005_fix_replaced_iab_irtf_stream_docs'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='ballotpositiondocevent',
-            name='send_email',
-            field=models.NullBooleanField(default=None),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0006_statements.py b/ietf/doc/migrations/0006_statements.py
new file mode 100644
index 0000000000..9a074292e5
--- /dev/null
+++ b/ietf/doc/migrations/0006_statements.py
@@ -0,0 +1,43 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    StateType = apps.get_model("doc", "StateType")
+    State = apps.get_model("doc", "State")
+
+    StateType.objects.create(slug="statement", label="Statement State")
+    State.objects.create(
+        slug="active",
+        type_id="statement",
+        name="Active",
+        order=0,
+        desc="The statement is active",
+    )
+    State.objects.create(
+        slug="replaced",
+        type_id="statement",
+        name="Replaced",
+        order=0,
+        desc="The statement has been replaced",
+    )
+
+
+def reverse(apps, schema_editor):
+    StateType = apps.get_model("doc", "StateType")
+    State = apps.get_model("doc", "State")
+
+    State.objects.filter(type_id="statement").delete()
+    StateType.objects.filter(slug="statement").delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0005_alter_docevent_type"),
+        ("name", "0004_statements"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/doc/migrations/0007_alter_docevent_type.py b/ietf/doc/migrations/0007_alter_docevent_type.py
new file mode 100644
index 0000000000..c98144d70f
--- /dev/null
+++ b/ietf/doc/migrations/0007_alter_docevent_type.py
@@ -0,0 +1,90 @@
+# Generated by Django 4.2.4 on 2023-08-23 21:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0006_statements"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="docevent",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("new_revision", "Added new revision"),
+                    ("new_submission", "Uploaded new revision"),
+                    ("changed_document", "Changed document metadata"),
+                    ("added_comment", "Added comment"),
+                    ("added_message", "Added message"),
+                    ("edited_authors", "Edited the documents author list"),
+                    ("deleted", "Deleted document"),
+                    ("changed_state", "Changed state"),
+                    ("changed_stream", "Changed document stream"),
+                    ("expired_document", "Expired document"),
+                    ("extended_expiry", "Extended expiry of document"),
+                    ("requested_resurrect", "Requested resurrect"),
+                    ("completed_resurrect", "Completed resurrect"),
+                    ("changed_consensus", "Changed consensus"),
+                    ("published_rfc", "Published RFC"),
+                    (
+                        "added_suggested_replaces",
+                        "Added suggested replacement relationships",
+                    ),
+                    (
+                        "reviewed_suggested_replaces",
+                        "Reviewed suggested replacement relationships",
+                    ),
+                    ("changed_action_holders", "Changed action holders for document"),
+                    ("changed_group", "Changed group"),
+                    ("changed_protocol_writeup", "Changed protocol writeup"),
+                    ("changed_charter_milestone", "Changed charter milestone"),
+                    ("initial_review", "Set initial review time"),
+                    ("changed_review_announcement", "Changed WG Review text"),
+                    ("changed_action_announcement", "Changed WG Action text"),
+                    ("started_iesg_process", "Started IESG process on document"),
+                    ("created_ballot", "Created ballot"),
+                    ("closed_ballot", "Closed ballot"),
+                    ("sent_ballot_announcement", "Sent ballot announcement"),
+                    ("changed_ballot_position", "Changed ballot position"),
+                    ("changed_ballot_approval_text", "Changed ballot approval text"),
+                    ("changed_ballot_writeup_text", "Changed ballot writeup text"),
+                    ("changed_rfc_editor_note_text", "Changed RFC Editor Note text"),
+                    ("changed_last_call_text", "Changed last call text"),
+                    ("requested_last_call", "Requested last call"),
+                    ("sent_last_call", "Sent last call"),
+                    ("scheduled_for_telechat", "Scheduled for telechat"),
+                    ("iesg_approved", "IESG approved document (no problem)"),
+                    ("iesg_disapproved", "IESG disapproved document (do not publish)"),
+                    ("approved_in_minute", "Approved in minute"),
+                    ("iana_review", "IANA review comment"),
+                    ("rfc_in_iana_registry", "RFC is in IANA registry"),
+                    (
+                        "rfc_editor_received_announcement",
+                        "Announcement was received by RFC Editor",
+                    ),
+                    ("requested_publication", "Publication at RFC Editor requested"),
+                    (
+                        "sync_from_rfc_editor",
+                        "Received updated information from RFC Editor",
+                    ),
+                    ("requested_review", "Requested review"),
+                    ("assigned_review_request", "Assigned review request"),
+                    ("closed_review_request", "Closed review request"),
+                    ("closed_review_assignment", "Closed review assignment"),
+                    ("downref_approved", "Downref approved"),
+                    ("posted_related_ipr", "Posted related IPR"),
+                    ("removed_related_ipr", "Removed related IPR"),
+                    (
+                        "removed_objfalse_related_ipr",
+                        "Removed Objectively False related IPR",
+                    ),
+                    ("changed_editors", "Changed BOF Request editors"),
+                    ("published_statement", "Published statement"),
+                ],
+                max_length=50,
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0007_idexists.py b/ietf/doc/migrations/0007_idexists.py
deleted file mode 100644
index d8df81d5fd..0000000000
--- a/ietf/doc/migrations/0007_idexists.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-11-04 10:56
-
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    State = apps.get_model('doc','State')
-    Document = apps.get_model('doc','Document')
-    DocHistory = apps.get_model('doc','DocHistory')
-
-    idexists = State.objects.create(
-        type_id = 'draft-iesg',
-        slug = 'idexists',
-        name = 'I-D Exists',
-        used = True,
-        desc = 'The IESG has not started processing this draft, or has stopped processing it without publicastion.',
-        order = 0,
-    )
-    idexists.next_states.set(State.objects.filter(type='draft-iesg',slug__in=['pub-req','watching']))
-
-    #for doc in tqdm(Document.objects.filter(type='draft'):
-    #    if not doc.states.filter(type='draft-iesg').exists():
-    #        doc.states.add(idexists)
-    #    for dh in doc.history_set.all():
-    #        if not dh.states.filter(type='draft-iesg').exists():
-    #            dh.states.add(idexists)            
-
-    for doc in tqdm(Document.objects.filter(type_id='draft').exclude(states__type_id='draft-iesg')):
-        doc.states.add(idexists)
-    for history in tqdm(DocHistory.objects.filter(type_id='draft').exclude(states__type_id='draft-iesg')):
-        history.states.add(idexists)
-
-
-def reverse(apps, schema_editor):
-    State = apps.get_model('doc','State')
-    State.objects.filter(slug='idexists').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0006_ballotpositiondocevent_send_email'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/doc/migrations/0008_add_uploaded_filename.py b/ietf/doc/migrations/0008_add_uploaded_filename.py
deleted file mode 100644
index bf36901080..0000000000
--- a/ietf/doc/migrations/0008_add_uploaded_filename.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2018-12-28 13:11
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0007_idexists'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='dochistory',
-            name='uploaded_filename',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='uploaded_filename',
-            field=models.TextField(blank=True),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0008_alter_docevent_type.py b/ietf/doc/migrations/0008_alter_docevent_type.py
new file mode 100644
index 0000000000..52a75f074b
--- /dev/null
+++ b/ietf/doc/migrations/0008_alter_docevent_type.py
@@ -0,0 +1,91 @@
+# Generated by Django 4.2.7 on 2023-11-04 13:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0007_alter_docevent_type"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="docevent",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("new_revision", "Added new revision"),
+                    ("new_submission", "Uploaded new revision"),
+                    ("changed_document", "Changed document metadata"),
+                    ("added_comment", "Added comment"),
+                    ("added_message", "Added message"),
+                    ("edited_authors", "Edited the documents author list"),
+                    ("deleted", "Deleted document"),
+                    ("changed_state", "Changed state"),
+                    ("changed_stream", "Changed document stream"),
+                    ("expired_document", "Expired document"),
+                    ("extended_expiry", "Extended expiry of document"),
+                    ("requested_resurrect", "Requested resurrect"),
+                    ("completed_resurrect", "Completed resurrect"),
+                    ("changed_consensus", "Changed consensus"),
+                    ("published_rfc", "Published RFC"),
+                    (
+                        "added_suggested_replaces",
+                        "Added suggested replacement relationships",
+                    ),
+                    (
+                        "reviewed_suggested_replaces",
+                        "Reviewed suggested replacement relationships",
+                    ),
+                    ("changed_action_holders", "Changed action holders for document"),
+                    ("changed_group", "Changed group"),
+                    ("changed_protocol_writeup", "Changed protocol writeup"),
+                    ("changed_charter_milestone", "Changed charter milestone"),
+                    ("initial_review", "Set initial review time"),
+                    ("changed_review_announcement", "Changed WG Review text"),
+                    ("changed_action_announcement", "Changed WG Action text"),
+                    ("started_iesg_process", "Started IESG process on document"),
+                    ("created_ballot", "Created ballot"),
+                    ("closed_ballot", "Closed ballot"),
+                    ("sent_ballot_announcement", "Sent ballot announcement"),
+                    ("changed_ballot_position", "Changed ballot position"),
+                    ("changed_ballot_approval_text", "Changed ballot approval text"),
+                    ("changed_ballot_writeup_text", "Changed ballot writeup text"),
+                    ("changed_rfc_editor_note_text", "Changed RFC Editor Note text"),
+                    ("changed_last_call_text", "Changed last call text"),
+                    ("requested_last_call", "Requested last call"),
+                    ("sent_last_call", "Sent last call"),
+                    ("scheduled_for_telechat", "Scheduled for telechat"),
+                    ("iesg_approved", "IESG approved document (no problem)"),
+                    ("iesg_disapproved", "IESG disapproved document (do not publish)"),
+                    ("approved_in_minute", "Approved in minute"),
+                    ("iana_review", "IANA review comment"),
+                    ("rfc_in_iana_registry", "RFC is in IANA registry"),
+                    (
+                        "rfc_editor_received_announcement",
+                        "Announcement was received by RFC Editor",
+                    ),
+                    ("requested_publication", "Publication at RFC Editor requested"),
+                    (
+                        "sync_from_rfc_editor",
+                        "Received updated information from RFC Editor",
+                    ),
+                    ("requested_review", "Requested review"),
+                    ("assigned_review_request", "Assigned review request"),
+                    ("closed_review_request", "Closed review request"),
+                    ("closed_review_assignment", "Closed review assignment"),
+                    ("downref_approved", "Downref approved"),
+                    ("posted_related_ipr", "Posted related IPR"),
+                    ("removed_related_ipr", "Removed related IPR"),
+                    (
+                        "removed_objfalse_related_ipr",
+                        "Removed Objectively False related IPR",
+                    ),
+                    ("changed_editors", "Changed BOF Request editors"),
+                    ("published_statement", "Published statement"),
+                    ("approved_slides", "Slides approved"),
+                ],
+                max_length=50,
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0009_add_rfc_states.py b/ietf/doc/migrations/0009_add_rfc_states.py
new file mode 100644
index 0000000000..07a6ac0205
--- /dev/null
+++ b/ietf/doc/migrations/0009_add_rfc_states.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.2 on 2023-06-14 20:57
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    StateType = apps.get_model("doc", "StateType")
+    rfc_statetype, _ = StateType.objects.get_or_create(slug="rfc", label="State")
+
+    State = apps.get_model("doc", "State")
+    State.objects.get_or_create(
+        type=rfc_statetype, slug="published", name="Published", used=True, order=1
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0008_alter_docevent_type"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward),
+    ]
diff --git a/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py b/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py
deleted file mode 100644
index f97ebbdffc..0000000000
--- a/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2018-12-28 13:33
-
-
-from django.db import migrations
-from django.db.models import F
-
-def forward(apps, schema_editor):
-    Document = apps.get_model('doc','Document')
-    Document.objects.exclude(type_id__in=('review','recording')).update(uploaded_filename = F('external_url'))
-    Document.objects.exclude(type_id__in=('review','recording')).update(external_url="")
-
-    Document.objects.filter(name='slides-100-edu-sessf-patents-at-ietf-an-overview-of-bcp79bis').update(uploaded_filename='slides-100-edu-sessf-patents-at-ietf-an-overview-of-bcp79bis-00.pdf')
-
-    DocHistory = apps.get_model('doc','DocHistory')
-    DocHistory.objects.exclude(type_id__in=('review','recording')).update(uploaded_filename = F('external_url'))
-    DocHistory.objects.exclude(type_id__in=('review','recording')).update(external_url="")
-    
-    DocHistory.objects.filter(uploaded_filename='https://www.ietf.org/proceedings/97/slides/slides-97-edu-sessb-local-version-of-newcomers-training-in-korean-00.pdf').update(uploaded_filename='slides-97-edu-sessb-local-version-of-newcomers-training-in-korean-00.pdf')
-    DocHistory.objects.filter(uploaded_filename='http://materials-98-codec-opus-newvectors-00.tar.gz').update(uploaded_filename='materials-98-codec-opus-newvectors-00.tar.gz')
-    DocHistory.objects.filter(uploaded_filename='http://materials-98-codec-opus-update-00.patch').update(uploaded_filename='materials-98-codec-opus-update-00.patch')
-    DocHistory.objects.filter(uploaded_filename='http://slides-100-edu-sessf-patents-at-ietf-an-overview-of-bcp79bis-00.pdf').update(uploaded_filename='slides-100-edu-sessf-patents-at-ietf-an-overview-of-bcp79bis-00.pdf')
-    DocHistory.objects.filter(uploaded_filename='http://bluesheets-97-6man-201611150930-00.pdf/').update(uploaded_filename='bluesheets-97-6man-201611150930-00.pdf')
-    DocHistory.objects.filter(uploaded_filename='http://agenda-interim-2017-stir-01-stir-01-01.txt').update(uploaded_filename='agenda-interim-2017-stir-01-stir-01-01.txt')
-    DocHistory.objects.filter(uploaded_filename='http://agenda-interim-2017-icnrg-02-icnrg-01-05.html').update(uploaded_filename='agenda-interim-2017-icnrg-02-icnrg-01-05.html')
-
-
-def reverse(apps, schema_editor):
-    Document = apps.get_model('doc','Document')
-    Document.objects.exclude(type_id__in=('review','recording')).update(external_url = F('uploaded_filename'))
-    Document.objects.exclude(type_id__in=('review','recording')).update(uploaded_filename="")
-
-    DocHistory = apps.get_model('doc','DocHistory')
-    DocHistory.objects.exclude(type_id__in=('review','recording')).update(external_url = F('uploaded_filename'))
-    DocHistory.objects.exclude(type_id__in=('review','recording')).update(uploaded_filename="")
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0008_add_uploaded_filename'),
-        ('review', '0008_remove_reviewrequest_old_id'),
-        ('meeting', '0011_auto_20190114_0550'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-    ]
diff --git a/ietf/doc/migrations/0010_auto_20190225_1302.py b/ietf/doc/migrations/0010_auto_20190225_1302.py
deleted file mode 100644
index 2f8dfef459..0000000000
--- a/ietf/doc/migrations/0010_auto_20190225_1302.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-02-25 13:02
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0009_move_non_url_externalurls_to_uploaded_filename'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='documenturl',
-            name='url',
-            field=models.URLField(max_length=2083),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0010_dochistory_rfc_number_document_rfc_number.py b/ietf/doc/migrations/0010_dochistory_rfc_number_document_rfc_number.py
new file mode 100644
index 0000000000..26b2a85c62
--- /dev/null
+++ b/ietf/doc/migrations/0010_dochistory_rfc_number_document_rfc_number.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.2 on 2023-06-14 22:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0009_add_rfc_states"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="dochistory",
+            name="rfc_number",
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="document",
+            name="rfc_number",
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0011_create_rfc_documents.py b/ietf/doc/migrations/0011_create_rfc_documents.py
new file mode 100644
index 0000000000..466ff81bb0
--- /dev/null
+++ b/ietf/doc/migrations/0011_create_rfc_documents.py
@@ -0,0 +1,76 @@
+# Generated by Django 4.2.2 on 2023-06-15 15:27
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    Document = apps.get_model("doc", "Document")
+    DocAlias = apps.get_model("doc", "DocAlias")
+    DocumentAuthor = apps.get_model("doc", "DocumentAuthor")
+    
+    State = apps.get_model("doc", "State")
+    draft_rfc_state = State.objects.get(type_id="draft", slug="rfc")
+    rfc_published_state = State.objects.get(type_id="rfc", slug="published")
+    
+    # Find draft Documents in the "rfc" state
+    found_by_state = Document.objects.filter(states=draft_rfc_state).distinct()
+    
+    # Find Documents with an "rfc..." alias and confirm they're the same set
+    rfc_docaliases = DocAlias.objects.filter(name__startswith="rfc")
+    found_by_name = Document.objects.filter(docalias__in=rfc_docaliases).distinct()
+    assert set(found_by_name) == set(found_by_state), "mismatch between rfcs identified by state and docalias"
+    
+    # As of 2023-06-15, there is one Document with two rfc aliases: rfc6312 and rfc6342 are the same Document. This 
+    # was due to a publication error. Because we go alias-by-alias, no special handling is needed in this migration.
+    
+    for rfc_alias in rfc_docaliases.order_by("name"):
+        assert rfc_alias.docs.count() == 1, f"DocAlias {rfc_alias} is linked to more than 1 Document"
+        draft = rfc_alias.docs.first()
+        if draft.name.startswith("rfc"):
+            rfc = draft
+            rfc.type_id = "rfc"
+            rfc.rfc_number = int(draft.name[3:])
+            rfc.save()
+            rfc.states.set([rfc_published_state])
+        else:
+            rfc = Document.objects.create(
+                type_id="rfc",
+                name=rfc_alias.name,
+                rfc_number=int(rfc_alias.name[3:]),
+                time=draft.time,
+                title=draft.title,
+                stream=draft.stream,
+                group=draft.group,
+                abstract=draft.abstract,
+                pages=draft.pages,
+                words=draft.words,
+                std_level=draft.std_level,
+                ad=draft.ad,
+                external_url=draft.external_url,
+                uploaded_filename=draft.uploaded_filename,
+                note=draft.note,
+            )
+            rfc.states.set([rfc_published_state])
+            rfc.formal_languages.set(draft.formal_languages.all())
+            
+            # Copy Authors
+            for da in draft.documentauthor_set.all():
+                DocumentAuthor.objects.create(
+                    document=rfc,
+                    person=da.person,
+                    email=da.email,
+                    affiliation=da.affiliation,
+                    country=da.country,
+                    order=da.order,
+                )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0010_dochistory_rfc_number_document_rfc_number"),
+        ("name", "0010_rfc_doctype_names"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward),
+    ]
diff --git a/ietf/doc/migrations/0011_reviewassignmentdocevent.py b/ietf/doc/migrations/0011_reviewassignmentdocevent.py
deleted file mode 100644
index e143b53397..0000000000
--- a/ietf/doc/migrations/0011_reviewassignmentdocevent.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-11 11:22
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0009_refactor_review_request'),
-        ('name', '0005_reviewassignmentstatename'),
-        ('doc', '0010_auto_20190225_1302'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ReviewAssignmentDocEvent',
-            fields=[
-                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
-                ('review_assignment', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.ReviewAssignment')),
-                ('state', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.ReviewAssignmentStateName')),
-            ],
-            bases=('doc.docevent',),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py b/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py
deleted file mode 100644
index ae9bb3ce83..0000000000
--- a/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-01 04:43
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0011_reviewassignmentdocevent'),
-        # present to facilitate migration to just before review.0010:
-        ('name', '0006_adjust_statenames'), 
-        ('dbtemplate', '0004_adjust_assignment_email_summary_templates'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='docevent',
-            name='type',
-            field=models.CharField(choices=[('new_revision', 'Added new revision'), ('new_submission', 'Uploaded new revision'), ('changed_document', 'Changed document metadata'), ('added_comment', 'Added comment'), ('added_message', 'Added message'), ('edited_authors', 'Edited the documents author list'), ('deleted', 'Deleted document'), ('changed_state', 'Changed state'), ('changed_stream', 'Changed document stream'), ('expired_document', 'Expired document'), ('extended_expiry', 'Extended expiry of document'), ('requested_resurrect', 'Requested resurrect'), ('completed_resurrect', 'Completed resurrect'), ('changed_consensus', 'Changed consensus'), ('published_rfc', 'Published RFC'), ('added_suggested_replaces', 'Added suggested replacement relationships'), ('reviewed_suggested_replaces', 'Reviewed suggested replacement relationships'), ('changed_group', 'Changed group'), ('changed_protocol_writeup', 'Changed protocol writeup'), ('changed_charter_milestone', 'Changed charter milestone'), ('initial_review', 'Set initial review time'), ('changed_review_announcement', 'Changed WG Review text'), ('changed_action_announcement', 'Changed WG Action text'), ('started_iesg_process', 'Started IESG process on document'), ('created_ballot', 'Created ballot'), ('closed_ballot', 'Closed ballot'), ('sent_ballot_announcement', 'Sent ballot announcement'), ('changed_ballot_position', 'Changed ballot position'), ('changed_ballot_approval_text', 'Changed ballot approval text'), ('changed_ballot_writeup_text', 'Changed ballot writeup text'), ('changed_rfc_editor_note_text', 'Changed RFC Editor Note text'), ('changed_last_call_text', 'Changed last call text'), ('requested_last_call', 'Requested last call'), ('sent_last_call', 'Sent last call'), ('scheduled_for_telechat', 'Scheduled for telechat'), ('iesg_approved', 'IESG approved document (no problem)'), ('iesg_disapproved', 'IESG disapproved document (do not publish)'), ('approved_in_minute', 'Approved in minute'), ('iana_review', 'IANA review comment'), ('rfc_in_iana_registry', 'RFC is in IANA registry'), ('rfc_editor_received_announcement', 'Announcement was received by RFC Editor'), ('requested_publication', 'Publication at RFC Editor requested'), ('sync_from_rfc_editor', 'Received updated information from RFC Editor'), ('requested_review', 'Requested review'), ('assigned_review_request', 'Assigned review request'), ('closed_review_request', 'Closed review request'), ('closed_review_assignment', 'Closed review assignment'), ('downref_approved', 'Downref approved')], max_length=50),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0012_move_rfc_docevents.py b/ietf/doc/migrations/0012_move_rfc_docevents.py
new file mode 100644
index 0000000000..9969a8f0ad
--- /dev/null
+++ b/ietf/doc/migrations/0012_move_rfc_docevents.py
@@ -0,0 +1,88 @@
+# Generated by Django 4.2.2 on 2023-06-20 18:36
+
+from django.db import migrations
+from django.db.models import Q
+
+
+def forward(apps, schema_editor):
+    """Move RFC events from the draft to the rfc Document"""
+    DocAlias = apps.get_model("doc", "DocAlias")
+    DocEvent = apps.get_model("doc", "DocEvent")
+    Document = apps.get_model("doc", "Document")
+
+    # queryset with events migrated regardless of whether before or after the "published_rfc" event
+    events_always_migrated = DocEvent.objects.filter(
+        Q(
+            type__in=[
+                "published_rfc",  # do not remove this one!
+            ]
+        )
+    )
+
+    # queryset with events migrated only after the "published_rfc" event
+    events_migrated_after_pub = DocEvent.objects.exclude(
+        type__in=[
+            "created_ballot",
+            "closed_ballot",
+            "sent_ballot_announcement",
+            "changed_ballot_position",
+            "changed_ballot_approval_text",
+            "changed_ballot_writeup_text",
+        ]
+    ).exclude(
+        type="added_comment",
+        desc__contains="ballot set",  # excludes 311 comments that all apply to drafts
+    )
+
+    # special case for rfc 6312/6342 draft, which has two published_rfc events
+    ignore = ["rfc6312", "rfc6342"]  # do not reprocess these later
+    rfc6312 = Document.objects.get(name="rfc6312")
+    rfc6342 = Document.objects.get(name="rfc6342")
+    draft = DocAlias.objects.get(name="rfc6312").docs.first()
+    assert draft == DocAlias.objects.get(name="rfc6342").docs.first()
+    published_events = list(
+        DocEvent.objects.filter(doc=draft, type="published_rfc").order_by("time")
+    )
+    assert len(published_events) == 2
+    (
+        pub_event_6312,
+        pub_event_6342,
+    ) = published_events  # order matches pub dates at rfc-editor.org
+
+    pub_event_6312.doc = rfc6312
+    pub_event_6312.save()
+    events_migrated_after_pub.filter(
+        doc=draft,
+        time__gte=pub_event_6312.time,
+        time__lt=pub_event_6342.time,
+    ).update(doc=rfc6312)
+
+    pub_event_6342.doc = rfc6342
+    pub_event_6342.save()
+    events_migrated_after_pub.filter(
+        doc=draft,
+        time__gte=pub_event_6342.time,
+    ).update(doc=rfc6342)
+
+    # Now handle all the rest
+    for rfc in Document.objects.filter(type_id="rfc").exclude(name__in=ignore):
+        draft = DocAlias.objects.get(name=rfc.name).docs.first()
+        assert draft is not None
+        published_event = DocEvent.objects.get(doc=draft, type="published_rfc")
+        events_always_migrated.filter(
+            doc=draft,
+        ).update(doc=rfc)
+        events_migrated_after_pub.filter(
+            doc=draft,
+            time__gte=published_event.time,
+        ).update(doc=rfc)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0011_create_rfc_documents"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward),
+    ]
diff --git a/ietf/doc/migrations/0013_add_document_docalias_id.py b/ietf/doc/migrations/0013_add_document_docalias_id.py
deleted file mode 100644
index 1b9d0ab91b..0000000000
--- a/ietf/doc/migrations/0013_add_document_docalias_id.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 08:41
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0012_add_event_type_closed_review_assignment'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='docalias',
-            name='id',
-            field=models.IntegerField(default=0),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='id',
-            field=models.IntegerField(default=0),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0013_rfc_relateddocuments.py b/ietf/doc/migrations/0013_rfc_relateddocuments.py
new file mode 100644
index 0000000000..9baddaebdb
--- /dev/null
+++ b/ietf/doc/migrations/0013_rfc_relateddocuments.py
@@ -0,0 +1,45 @@
+# Generated by Django 4.2.3 on 2023-07-05 22:40
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    DocAlias = apps.get_model("doc", "DocAlias")
+    Document = apps.get_model("doc", "Document")
+    RelatedDocument = apps.get_model("doc", "RelatedDocument")
+    for rfc_alias in DocAlias.objects.filter(name__startswith="rfc").exclude(
+        docs__type_id="rfc"
+    ):
+        # Move these over to the RFC
+        RelatedDocument.objects.filter(
+            relationship__slug__in=(
+                "tobcp",
+                "toexp",
+                "tohist",
+                "toinf",
+                "tois",
+                "tops",
+                "obs",
+                "updates",
+            ),
+            source__docalias=rfc_alias,
+        ).update(source=Document.objects.get(name=rfc_alias.name))
+        # Duplicate references on the RFC but keep the ones on the draft as well
+        originals = list(
+            RelatedDocument.objects.filter(
+                relationship__slug__in=("refinfo", "refnorm", "refold", "refunk"),
+                source__docalias=rfc_alias,
+            )
+        )
+        for o in originals:
+            o.pk = None
+            o.source = Document.objects.get(name=rfc_alias.name)
+        RelatedDocument.objects.bulk_create(originals)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0012_move_rfc_docevents"),
+    ]
+
+    operations = [migrations.RunPython(forward)]
diff --git a/ietf/doc/migrations/0014_move_rfc_docaliases.py b/ietf/doc/migrations/0014_move_rfc_docaliases.py
new file mode 100644
index 0000000000..c82a98e052
--- /dev/null
+++ b/ietf/doc/migrations/0014_move_rfc_docaliases.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.2 on 2023-06-20 18:36
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    """Point "rfc..." DocAliases at the rfc-type Document
+
+    Creates a became_rfc RelatedDocument to preserve the connection between the draft and the rfc.
+    """
+    DocAlias = apps.get_model("doc", "DocAlias")
+    Document = apps.get_model("doc", "Document")
+    RelatedDocument = apps.get_model("doc", "RelatedDocument")
+
+    for rfc_alias in DocAlias.objects.filter(name__startswith="rfc"):
+        rfc = Document.objects.get(name=rfc_alias.name)
+        aliased_doc = rfc_alias.docs.get()  # implicitly confirms only one value in rfc_alias.docs
+        if aliased_doc != rfc:
+            # If the DocAlias was not already pointing at the rfc, it was pointing at the draft
+            # it came from. Create the relationship between draft and rfc Documents.
+            assert aliased_doc.type_id == "draft", f"Alias for {rfc.name} should be pointing at a draft"
+            RelatedDocument.objects.create(
+                source=aliased_doc,
+                target=rfc_alias,
+                relationship_id="became_rfc",
+            )
+            # Now move the alias from the draft to the rfc 
+            rfc_alias.docs.set([rfc])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0013_rfc_relateddocuments"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward),
+    ]
diff --git a/ietf/doc/migrations/0014_set_document_docalias_id.py b/ietf/doc/migrations/0014_set_document_docalias_id.py
deleted file mode 100644
index a97f6d7e47..0000000000
--- a/ietf/doc/migrations/0014_set_document_docalias_id.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 08:42
-
-
-import sys
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    Document = apps.get_model('doc','Document')
-    sys.stderr.write('\n')
-    for i, d in enumerate(tqdm(Document.objects.all()), start=1):
-        d.id = i
-        d.save()
-
-    DocAlias = apps.get_model('doc','DocAlias')
-    for i, d in enumerate(tqdm(DocAlias.objects.all()), start=1):
-        d.id = i
-        d.save()
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0013_add_document_docalias_id'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/doc/migrations/0015_1_add_fk_to_document_id.py b/ietf/doc/migrations/0015_1_add_fk_to_document_id.py
deleted file mode 100644
index 6d2e7415f2..0000000000
--- a/ietf/doc/migrations/0015_1_add_fk_to_document_id.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 10:29
-
-
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0014_set_document_docalias_id'),
-    ]
-
-    operations = [
-        # Fix name and id fields first
-        migrations.AlterField(
-            model_name='docalias',
-            name='name',
-            field=models.CharField(max_length=255, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='docalias',
-            name='id',
-            field=models.IntegerField(primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='document',
-            name='name',
-            field=models.CharField(max_length=255, unique=True, validators=[django.core.validators.RegexValidator('^[-a-z0-9]+$', 'Provide a valid document name consisting of lowercase letters, numbers and hyphens.', 'invalid')]),
-        ),
-        migrations.AlterField(
-            model_name='document',
-            name='id',
-            field=models.IntegerField(primary_key=True, serialize=False),
-        ),
-
-        # Then remaining fields
-        migrations.AddField(
-            model_name='docalias',
-            name='document2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='dochistory',
-            name='doc2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='documentauthor',
-            name='document2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='documenturl',
-            name='doc2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='relateddochistory',
-            name='target2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reversely_related_document_history_set', to='doc.DocAlias', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='relateddocument',
-            name='source2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='relateddocument',
-            name='target2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.DocAlias', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='docevent',
-            name='doc2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='id'),
-        ),
-        migrations.AlterField(
-            model_name='docalias',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_docalias', to='doc.Document', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='dochistory',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_hist', to='doc.Document', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='documentauthor',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_doc_auth', to='doc.Document', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='documenturl',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_doc_url', to='doc.Document', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='relateddochistory',
-            name='target',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_hist_target', to='doc.DocAlias', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='relateddocument',
-            name='source',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_rel_source', to='doc.Document', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='relateddocument',
-            name='target',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_rel_target', to='doc.DocAlias', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='docevent',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_docevent', to='doc.Document', to_field=b'name'),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py b/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py
deleted file mode 100644
index 99ff30c552..0000000000
--- a/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-28 12:42
-
-
-import sys, time
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-def timestamp(apps, schema_editor):
-    sys.stderr.write('\n %s' % time.strftime('%Y-%m-%d %H:%M:%S'))
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0006_adjust_statenames'),
-        ('doc', '0015_1_add_fk_to_document_id'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DocumentLanguages',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='name', related_name='doclanguages')),
-                ('formallanguagename', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.FormalLanguageName')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='DocumentStates',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='name', related_name='docstates')),
-                ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.State')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='DocumentTags',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='name', related_name='doctags')),
-                ('doctagname', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocTagName')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='formal_languages2',
-            field=models.ManyToManyField(blank=True, related_name='languagedocs', through='doc.DocumentLanguages', to='name.FormalLanguageName'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='states2',
-            field=models.ManyToManyField(blank=True, related_name='statedocs', through='doc.DocumentStates', to='doc.State'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='tags2',
-            field=models.ManyToManyField(blank=True, related_name='tagdocs', through='doc.DocumentTags', to='name.DocTagName'),
-        ),
-        # Here we copy the content of the existing implicit m2m tables for
-        # the Document m2m fields into the explicit through tabeles, in order
-        # to be able to later set the correct id from name
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO doc_documentlanguages SELECT * FROM doc_document_formal_languages;",
-            ""),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO doc_documentstates SELECT * FROM doc_document_states;",
-            ""),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO doc_documenttags SELECT * FROM doc_document_tags;",
-            ""),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.AddField(
-            model_name='documentlanguages',
-            name='document2',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='id', null=True, default=None),
-        ),
-        migrations.AddField(
-            model_name='documentstates',
-            name='document2',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='id', null=True, default=None),        ),
-        migrations.AddField(
-            model_name='documenttags',
-            name='document2',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='id', null=True, default=None),
-
-        ),
-    ]
diff --git a/ietf/doc/migrations/0015_relate_no_aliases.py b/ietf/doc/migrations/0015_relate_no_aliases.py
new file mode 100644
index 0000000000..4ba3dd9607
--- /dev/null
+++ b/ietf/doc/migrations/0015_relate_no_aliases.py
@@ -0,0 +1,84 @@
+# Generated by Django 4.2.2 on 2023-06-16 13:40
+
+from django.db import migrations
+import django.db.models.deletion
+from django.db.models import F, Subquery, OuterRef, CharField
+import ietf.utils.models
+
+def forward(apps, schema_editor):
+    RelatedDocument = apps.get_model("doc", "RelatedDocument")
+    DocAlias = apps.get_model("doc", "DocAlias")
+    target_subquery = Subquery(DocAlias.objects.filter(pk=OuterRef("deprecated_target")).values("docs")[:1])
+    name_subquery = Subquery(DocAlias.objects.filter(pk=OuterRef("deprecated_target")).values("name")[:1])
+    RelatedDocument.objects.annotate(firstdoc=target_subquery).annotate(aliasname=name_subquery).update(target=F("firstdoc"),originaltargetaliasname=F("aliasname"))
+
+def reverse(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0014_move_rfc_docaliases"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='relateddocument',
+            name='target',
+            field=ietf.utils.models.ForeignKey(
+                db_index=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.docalias',
+            ),
+        ),
+        migrations.RenameField(
+            model_name="relateddocument",
+            old_name="target",
+            new_name="deprecated_target"
+        ),
+        migrations.AlterField(
+            model_name='relateddocument',
+            name='deprecated_target',
+            field=ietf.utils.models.ForeignKey(
+                db_index=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.docalias',
+            ),
+        ),
+        migrations.AddField(
+            model_name="relateddocument",
+            name="target",
+            field=ietf.utils.models.ForeignKey(
+                default=1, # A lie, but a convenient one - no relations point here.
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="targets_related",
+                to="doc.document",
+                db_index=False,
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="relateddocument",
+            name="originaltargetaliasname",
+            field=CharField(max_length=255,null=True,blank=True),
+            preserve_default=True,
+        ),
+        migrations.RunPython(forward, reverse),
+        migrations.AlterField(
+            model_name="relateddocument",
+            name="target",
+            field=ietf.utils.models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="targets_related",
+                to="doc.document",
+                db_index=True,
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="relateddocument",
+            name="deprecated_target",
+            field=ietf.utils.models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.DocAlias',
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0016_relate_hist_no_aliases.py b/ietf/doc/migrations/0016_relate_hist_no_aliases.py
new file mode 100644
index 0000000000..df5fb3c325
--- /dev/null
+++ b/ietf/doc/migrations/0016_relate_hist_no_aliases.py
@@ -0,0 +1,87 @@
+# Generated by Django 4.2.2 on 2023-06-16 13:40
+
+from django.db import migrations
+import django.db.models.deletion
+from django.db.models import F, Subquery, OuterRef, CharField
+import ietf.utils.models
+
+def forward(apps, schema_editor):
+    RelatedDocHistory = apps.get_model("doc", "RelatedDocHistory")
+    DocAlias = apps.get_model("doc", "DocAlias")
+    target_subquery = Subquery(DocAlias.objects.filter(pk=OuterRef("deprecated_target")).values("docs")[:1])
+    name_subquery = Subquery(DocAlias.objects.filter(pk=OuterRef("deprecated_target")).values("name")[:1])
+    RelatedDocHistory.objects.annotate(firstdoc=target_subquery).annotate(aliasname=name_subquery).update(target=F("firstdoc"),originaltargetaliasname=F("aliasname"))
+
+def reverse(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0015_relate_no_aliases"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='relateddochistory',
+            name='target',
+            field=ietf.utils.models.ForeignKey(
+                db_index=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.docalias',
+                related_name='reversely_related_document_history_set',
+            ),
+        ),
+        migrations.RenameField(
+            model_name="relateddochistory",
+            old_name="target",
+            new_name="deprecated_target"
+        ),
+        migrations.AlterField(
+            model_name='relateddochistory',
+            name='deprecated_target',
+            field=ietf.utils.models.ForeignKey(
+                db_index=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.docalias',
+                related_name='deprecated_reversely_related_document_history_set',
+            ),
+        ),
+        migrations.AddField(
+            model_name="relateddochistory",
+            name="target",
+            field=ietf.utils.models.ForeignKey(
+                default=1, # A lie, but a convenient one - no relations point here.
+                on_delete=django.db.models.deletion.CASCADE,
+                to="doc.document",
+                db_index=False,
+                related_name='reversely_related_document_history_set',
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="relateddochistory",
+            name="originaltargetaliasname",
+            field=CharField(max_length=255,null=True,blank=True),
+            preserve_default=True,
+        ),
+        migrations.RunPython(forward, reverse),
+        migrations.AlterField(
+            model_name="relateddochistory",
+            name="target",
+            field=ietf.utils.models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to="doc.document",
+                db_index=True,
+                related_name='reversely_related_document_history_set',
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="relateddochistory",
+            name="deprecated_target",
+            field=ietf.utils.models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.DocAlias',
+                related_name='deprecated_reversely_related_document_history_set',
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0016_set_document_docalias_fk.py b/ietf/doc/migrations/0016_set_document_docalias_fk.py
deleted file mode 100644
index 67d1333f38..0000000000
--- a/ietf/doc/migrations/0016_set_document_docalias_fk.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 14:04
-
-
-import sys
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-
-    def add_id_fk(o, a, nameid):
-        n = getattr(o, a+'_id')
-        if n:
-            i = nameid[n]
-            if not isinstance(i, int):
-                raise ValueError("Inappropriate value: %s: nameid[%s]: %s" % (o.__class__.__name__, n, i))
-            if getattr(o, a+'2_id') != i:
-                setattr(o, a+'2_id', i)
-                o.save()
-
-    DocAlias                    = apps.get_model('doc','DocAlias')
-    DocEvent                    = apps.get_model('doc', 'DocEvent')
-    DocHistory                  = apps.get_model('doc', 'DocHistory')
-    Document                    = apps.get_model('doc', 'Document')
-    DocumentAuthor              = apps.get_model('doc', 'DocumentAuthor')
-    DocumentLanguages           = apps.get_model('doc', 'DocumentLanguages')
-    DocumentStates              = apps.get_model('doc', 'DocumentStates')
-    DocumentTags                = apps.get_model('doc', 'DocumentTags')
-    DocumentURL                 = apps.get_model('doc', 'DocumentURL')
-    Group                       = apps.get_model('group', 'Group')
-    IprDocRel                   = apps.get_model('ipr', 'IprDocRel')
-    LiaisonStatementAttachment  = apps.get_model('liaisons', 'LiaisonStatementAttachment')
-    RelatedDocHistory           = apps.get_model('doc', 'RelatedDocHistory')
-    RelatedDocument             = apps.get_model('doc', 'RelatedDocument')
-    ReviewAssignment            = apps.get_model('review', 'ReviewAssignment')
-    ReviewRequest               = apps.get_model('review', 'ReviewRequest')
-    ReviewWish                  = apps.get_model('review', 'ReviewWish')
-    SessionPresentation         = apps.get_model('meeting', 'SessionPresentation')
-    Submission                  = apps.get_model('submit', 'Submission')
-
-    # Document id fixup ------------------------------------------------------------
-
-    objs = Document.objects.in_bulk()
-    nameid = { o.name: o.id for id, o in objs.items() }
-
-    sys.stderr.write('\n')
-
-    sys.stderr.write('Setting Document FKs:\n')
-
-    for C, a in [ 
-            ( DocAlias                   , 'document'),
-            ( DocEvent                   , 'doc'),
-            ( DocHistory                 , 'doc'),
-            ( DocumentAuthor             , 'document'),
-            ( DocumentLanguages          , 'document'),
-            ( DocumentStates             , 'document'),
-            ( DocumentTags               , 'document'),
-            ( DocumentURL                , 'doc'),
-            ( Group                      , 'charter'),
-            ( LiaisonStatementAttachment , 'document'),
-            ( RelatedDocument            , 'source'),
-            ( ReviewAssignment           , 'review'),
-            ( ReviewRequest              , 'doc'),
-            ( ReviewRequest              , 'unused_review'),
-            ( ReviewWish                 , 'doc'),
-            ( SessionPresentation        , 'document'),
-            ( Submission                 , 'draft'),
-        ]:
-        sys.stderr.write(' %s.%s:\n' % (C.__name__, a))
-        for o in tqdm(C.objects.all()):
-            add_id_fk(o, a, nameid)
-
-    # DocAlias id fixup ------------------------------------------------------------
-    
-    sys.stderr.write('\n')
-
-    objs = DocAlias.objects.in_bulk()
-    nameid = { o.name: o.id for id, o in objs.items() }
-
-    sys.stderr.write('Setting DocAlias FKs:\n')
-
-    for C, a in [
-            ( IprDocRel                  , 'document'),
-            ( RelatedDocument            , 'target'),
-            ( RelatedDocHistory          , 'target'),
-        ]:
-        sys.stderr.write(' %s.%s:\n' % (C.__name__, a))
-        for o in tqdm(C.objects.all()):
-            add_id_fk(o, a, nameid)
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('community', '0004_set_document_m2m_keys'),
-        ('doc', '0015_2_add_doc_document_m2m_fields'),
-        ('group', '0014_set_document_m2m_keys'),
-        ('ipr', '0003_add_ipdocrel_document2_fk'),
-        ('liaisons', '0003_liaison_document2_fk'),
-        ('meeting', '0015_sessionpresentation_document2_fk'),
-        ('message', '0003_set_document_m2m_keys'),
-        ('review', '0011_review_document2_fk'),
-        ('submit', '0002_submission_document2_fk'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/doc/migrations/0017_delete_docalias.py b/ietf/doc/migrations/0017_delete_docalias.py
new file mode 100644
index 0000000000..207ca81e15
--- /dev/null
+++ b/ietf/doc/migrations/0017_delete_docalias.py
@@ -0,0 +1,16 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipr", "0002_iprdocrel_no_aliases"),
+        ("doc", "0016_relate_hist_no_aliases"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="DocAlias",
+        ),
+    ]
diff --git a/ietf/doc/migrations/0017_make_document_id_primary_key.py b/ietf/doc/migrations/0017_make_document_id_primary_key.py
deleted file mode 100644
index baadd6f725..0000000000
--- a/ietf/doc/migrations/0017_make_document_id_primary_key.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-09 05:46
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0016_set_document_docalias_fk'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='docalias',
-            name='id',
-            field=models.AutoField(primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='document',
-            name='id',
-            field=models.AutoField(primary_key=True, serialize=False),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0018_move_dochistory.py b/ietf/doc/migrations/0018_move_dochistory.py
new file mode 100644
index 0000000000..0bc29b0bc4
--- /dev/null
+++ b/ietf/doc/migrations/0018_move_dochistory.py
@@ -0,0 +1,45 @@
+# Generated by Django 4.2.5 on 2023-09-11 17:52
+
+from django.db import migrations
+
+from django.db.models import Subquery, OuterRef, F
+
+
+def forward(apps, schema_editor):
+    DocHistory = apps.get_model("doc", "DocHistory")
+    RelatedDocument = apps.get_model("doc", "RelatedDocument")
+    Document = apps.get_model("doc", "Document")
+    DocHistory.objects.filter(type_id="draft", doc__type_id="rfc").update(type_id="rfc")
+    DocHistory.objects.filter(
+        type_id="draft", doc__type_id="draft", name__startswith="rfc"
+    ).annotate(
+        rfc_id=Subquery(
+            RelatedDocument.objects.filter(
+                source_id=OuterRef("doc_id"), relationship_id="became_rfc"
+            ).values_list("target_id", flat=True)[:1]
+        )
+    ).update(
+        doc_id=F("rfc_id"), type_id="rfc"
+    )
+    DocHistory.objects.filter(type_id="rfc").annotate(
+        rfcno=Subquery(
+            Document.objects.filter(pk=OuterRef("doc_id")).values_list(
+                "rfc_number", flat=True
+            )[:1]
+        )
+    ).update(rfc_number=F("rfcno"))
+    assert not DocHistory.objects.filter(
+        name__startswith="rfc", type_id="draft"
+    ).exists()
+    assert not DocHistory.objects.filter(
+        type_id="rfc", rfc_number__isnull=True
+    ).exists()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0017_delete_docalias"),
+    ]
+
+    # There is no going back
+    operations = [migrations.RunPython(forward)]
diff --git a/ietf/doc/migrations/0018_remove_old_document_field.py b/ietf/doc/migrations/0018_remove_old_document_field.py
deleted file mode 100644
index 887dcc7707..0000000000
--- a/ietf/doc/migrations/0018_remove_old_document_field.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-20 09:53
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0017_make_document_id_primary_key'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='documentauthor',
-            options={'ordering': ['document2', 'order']},
-        ),
-        migrations.RemoveIndex(
-            model_name='docevent',
-            name='doc_doceven_type_43e53e_idx',
-        ),
-        migrations.RemoveField(
-            model_name='docalias',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='docevent',
-            name='doc',
-        ),
-        migrations.RemoveField(
-            model_name='dochistory',
-            name='doc',
-        ),
-        migrations.RemoveField(
-            model_name='documentauthor',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='documenturl',
-            name='doc',
-        ),
-        migrations.RemoveField(
-            model_name='relateddochistory',
-            name='target',
-        ),
-        migrations.RemoveField(
-            model_name='relateddocument',
-            name='source',
-        ),
-        migrations.RemoveField(
-            model_name='relateddocument',
-            name='target',
-        ),
-        migrations.AddIndex(
-            model_name='docevent',
-            index=models.Index(fields=['type', 'doc2'], name='doc_doceven_type_ac7748_idx'),
-        ),
-        # The following 9 migrations are related to the m2m fields on Document
-        # Remove the intermediary model field pointing to Document.name
-        migrations.RemoveField(
-            model_name='documentlanguages',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='documentstates',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='documenttags',
-            name='document',
-        ),
-        # Rename the intermediary model field pointing to Document.id, to
-        # match the implicit m2m table
-        migrations.RenameField(
-            model_name='documentlanguages',
-            old_name='document2',
-            new_name='document',
-        ),
-        migrations.RenameField(
-            model_name='documentstates',
-            old_name='document2',
-            new_name='document',
-        ),
-        migrations.RenameField(
-            model_name='documenttags',
-            old_name='document2',
-            new_name='document',
-        ),
-        # Alter the fields to point to Document.pk instead of Document.name
-        migrations.AlterField(
-            model_name='documentlanguages',
-            name='document',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='documentstates',
-            name='document',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='documenttags',
-            name='document',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        # Remove the implicit m2m tables which point to Document.name
-        migrations.RemoveField(
-            model_name='document',
-            name='formal_languages',
-        ),
-        migrations.RemoveField(
-            model_name='document',
-            name='states',
-        ),
-        migrations.RemoveField(
-            model_name='document',
-            name='tags',
-        ),
-        # Next (in a separate migration, in order to commit the above before
-        # we proceed) we'll create the implicit m2m tables again, this time
-        # pointing to Document.id since that's now the primary key.
-    ]
diff --git a/ietf/doc/migrations/0019_rename_field_document2.py b/ietf/doc/migrations/0019_rename_field_document2.py
deleted file mode 100644
index 517ae9ee73..0000000000
--- a/ietf/doc/migrations/0019_rename_field_document2.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 05:31
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0018_remove_old_document_field'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='documentauthor',
-            options={'ordering': ['document', 'order']},
-        ),
-        migrations.RemoveIndex(
-            model_name='docevent',
-            name='doc_doceven_type_ac7748_idx',
-        ),
-        migrations.RenameField(
-            model_name='docalias',
-            old_name='document2',
-            new_name='document',
-        ),
-        migrations.RenameField(
-            model_name='docevent',
-            old_name='doc2',
-            new_name='doc',
-        ),
-        migrations.RenameField(
-            model_name='dochistory',
-            old_name='doc2',
-            new_name='doc',
-        ),
-        migrations.RenameField(
-            model_name='documentauthor',
-            old_name='document2',
-            new_name='document',
-        ),
-        migrations.RenameField(
-            model_name='documenturl',
-            old_name='doc2',
-            new_name='doc',
-        ),
-        migrations.RenameField(
-            model_name='relateddochistory',
-            old_name='target2',
-            new_name='target',
-        ),
-        migrations.RenameField(
-            model_name='relateddocument',
-            old_name='source2',
-            new_name='source',
-        ),
-        migrations.RenameField(
-            model_name='relateddocument',
-            old_name='target2',
-            new_name='target',
-        ),
-        migrations.AddIndex(
-            model_name='docevent',
-            index=models.Index(fields=['type', 'doc'], name='doc_doceven_type_43e53e_idx'),
-        ),
-        # Add back the m2m field we removed in 0018_...
-        migrations.AddField(
-            model_name='document',
-            name='formal_languages',
-            field=models.ManyToManyField(blank=True, help_text='Formal languages used in document', to='name.FormalLanguageName'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='states',
-            field=models.ManyToManyField(blank=True, to='doc.State'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='tags',
-            field=models.ManyToManyField(blank=True, to='name.DocTagName'),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0019_subseries.py b/ietf/doc/migrations/0019_subseries.py
new file mode 100644
index 0000000000..be2c612ac0
--- /dev/null
+++ b/ietf/doc/migrations/0019_subseries.py
@@ -0,0 +1,21 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    StateType = apps.get_model("doc", "StateType")
+    for slug in ["bcp", "std", "fyi"]:
+        StateType.objects.create(slug=slug, label=f"{slug} state")
+
+
+def reverse(apps, schema_editor):
+    StateType = apps.get_model("doc", "StateType")
+    StateType.objects.filter(slug__in=["bcp", "std", "fyi"]).delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0018_move_dochistory"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/doc/migrations/0020_copy_docs_m2m_table.py b/ietf/doc/migrations/0020_copy_docs_m2m_table.py
deleted file mode 100644
index 482c4d7852..0000000000
--- a/ietf/doc/migrations/0020_copy_docs_m2m_table.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 05:31
-
-
-import sys, time
-
-from django.db import migrations
-
-def timestamp(apps, schema_editor):
-    sys.stderr.write('\n %s' % time.strftime('%Y-%m-%d %H:%M:%S'))
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0019_rename_field_document2'),
-    ]
-
-    operations = [
-        # Copy the doc IDs from the explicit m2m table to the implicit table
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO doc_document_formal_languages SELECT id,document_id,formallanguagename_id FROM doc_documentlanguages;",
-            ""),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO doc_document_states SELECT id,document_id,state_id FROM doc_documentstates;",
-            ""),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO doc_document_tags SELECT id,document_id,doctagname_id FROM doc_documenttags;",
-            ""),
-        migrations.RunPython(timestamp, timestamp),
-    ]
diff --git a/ietf/doc/migrations/0020_move_errata_tags.py b/ietf/doc/migrations/0020_move_errata_tags.py
new file mode 100644
index 0000000000..897b88f467
--- /dev/null
+++ b/ietf/doc/migrations/0020_move_errata_tags.py
@@ -0,0 +1,29 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+from django.db.models import Subquery, OuterRef, F
+
+
+def forward(apps, schema_editor):
+    Document = apps.get_model("doc", "Document")
+    RelatedDocument = apps.get_model("doc", "RelatedDocument")
+    Document.tags.through.objects.filter(
+        doctagname_id__in=["errata", "verified-errata"], document__type_id="draft"
+    ).annotate(
+        rfcdoc=Subquery(
+            RelatedDocument.objects.filter(
+                relationship_id="became_rfc", source_id=OuterRef("document__pk")
+            ).values_list("target__pk", flat=True)[:1]
+        )
+    ).update(
+        document_id=F("rfcdoc")
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0019_subseries"),
+    ]
+
+    operations = [migrations.RunPython(forward)]
diff --git a/ietf/doc/migrations/0021_narrativeminutes.py b/ietf/doc/migrations/0021_narrativeminutes.py
new file mode 100644
index 0000000000..0f330bd053
--- /dev/null
+++ b/ietf/doc/migrations/0021_narrativeminutes.py
@@ -0,0 +1,39 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    StateType = apps.get_model("doc", "StateType")
+    State = apps.get_model("doc", "State")
+
+    StateType.objects.create(
+        slug="narrativeminutes",
+        label="State",
+    )
+    for order, slug in enumerate(["active", "deleted"]):
+        State.objects.create(
+            slug=slug,
+            type_id="narrativeminutes",
+            name=slug.capitalize(),
+            order=order,
+            desc="",
+            used=True,
+        )
+
+
+def reverse(apps, schema_editor):
+    StateType = apps.get_model("doc", "StateType")
+    State = apps.get_model("doc", "State")
+
+    State.objects.filter(type_id="narrativeminutes").delete()
+    StateType.objects.filter(slug="narrativeminutes").delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0020_move_errata_tags"),
+        ("name", "0013_narrativeminutes"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/doc/migrations/0021_remove_docs2_m2m.py b/ietf/doc/migrations/0021_remove_docs2_m2m.py
deleted file mode 100644
index c659b65deb..0000000000
--- a/ietf/doc/migrations/0021_remove_docs2_m2m.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-30 03:36
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0020_copy_docs_m2m_table'),
-    ]
-
-    operations = [
-        # Get rid of the explicit m2m tables which we needed only to be
-        # able to convert from Document.name to Document.id
-        migrations.RemoveField(
-            model_name='documentlanguages',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='documentlanguages',
-            name='formallanguagename',
-        ),
-        migrations.RemoveField(
-            model_name='documentstates',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='documentstates',
-            name='state',
-        ),
-        migrations.RemoveField(
-            model_name='documenttags',
-            name='doctagname',
-        ),
-        migrations.RemoveField(
-            model_name='documenttags',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='document',
-            name='formal_languages2',
-        ),
-        migrations.RemoveField(
-            model_name='document',
-            name='states2',
-        ),
-        migrations.RemoveField(
-            model_name='document',
-            name='tags2',
-        ),
-        migrations.DeleteModel(
-            name='DocumentLanguages',
-        ),
-        migrations.DeleteModel(
-            name='DocumentStates',
-        ),
-        migrations.DeleteModel(
-            name='DocumentTags',
-        ),
-    ]
diff --git a/ietf/doc/migrations/0022_document_primary_key_cleanup.py b/ietf/doc/migrations/0022_document_primary_key_cleanup.py
deleted file mode 100644
index 9ddc908f5c..0000000000
--- a/ietf/doc/migrations/0022_document_primary_key_cleanup.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-06-10 03:47
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0021_remove_docs2_m2m'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='docalias',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='docalias',
-            name='id',
-            field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-        ),
-        migrations.AlterField(
-            model_name='docevent',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='dochistory',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='document',
-            name='id',
-            field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
-        ),
-        migrations.AlterField(
-            model_name='documentauthor',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='documenturl',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='relateddochistory',
-            name='target',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reversely_related_document_history_set', to='doc.DocAlias'),
-        ),
-        migrations.AlterField(
-            model_name='relateddocument',
-            name='source',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='relateddocument',
-            name='target',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocAlias'),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0022_remove_dochistory_internal_comments_and_more.py b/ietf/doc/migrations/0022_remove_dochistory_internal_comments_and_more.py
new file mode 100644
index 0000000000..ad27793a83
--- /dev/null
+++ b/ietf/doc/migrations/0022_remove_dochistory_internal_comments_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.15 on 2024-08-16 16:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("doc", "0021_narrativeminutes"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="dochistory",
+            name="internal_comments",
+        ),
+        migrations.RemoveField(
+            model_name="document",
+            name="internal_comments",
+        ),
+    ]
diff --git a/ietf/doc/migrations/0023_bofreqspamstate.py b/ietf/doc/migrations/0023_bofreqspamstate.py
new file mode 100644
index 0000000000..dbbaf996e9
--- /dev/null
+++ b/ietf/doc/migrations/0023_bofreqspamstate.py
@@ -0,0 +1,30 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    State = apps.get_model("doc", "State")
+    State.objects.get_or_create(
+        type_id="bofreq",
+        slug="spam",
+        defaults={"name": "Spam", "desc": "The BOF request is spam", "order": 5},
+    )
+
+
+def reverse(apps, schema_editor):
+    State = apps.get_model("doc", "State")
+    Document = apps.get_model("doc", "Document")
+    assert not Document.objects.filter(
+        states__type="bofreq", states__slug="spam"
+    ).exists()
+    State.objects.filter(type_id="bofreq", slug="spam").delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("doc", "0022_remove_dochistory_internal_comments_and_more"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/doc/migrations/0023_one_to_many_docalias.py b/ietf/doc/migrations/0023_one_to_many_docalias.py
deleted file mode 100644
index cf3c8330a6..0000000000
--- a/ietf/doc/migrations/0023_one_to_many_docalias.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-06-10 04:36
-
-
-import sys
-
-from tqdm import tqdm
-
-from django.db import migrations, models
-
-
-def forward(apps, schema_editor):
-    DocAlias = apps.get_model('doc','DocAlias')
-    sys.stderr.write('\n')
-    for a in tqdm(DocAlias.objects.all()):
-        a.docs.add(a.document)
-
-def reverse(apps, schema_editor):
-    DocAlias = apps.get_model('doc','DocAlias')
-    sys.stderr.write('\n')
-    for a in tqdm(DocAlias.objects.all()):
-        a.document = a.document
-        a.save()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0022_document_primary_key_cleanup'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='docalias',
-            name='docs',
-            field=models.ManyToManyField(related_name='docalias', to='doc.Document'),
-        ),
-        migrations.RunPython(forward, reverse),
-        migrations.RemoveField(
-            model_name='docalias',
-            name='document',
-        ),
-    ]
diff --git a/ietf/doc/migrations/0024_iana_experts.py b/ietf/doc/migrations/0024_iana_experts.py
deleted file mode 100644
index 0922b9c243..0000000000
--- a/ietf/doc/migrations/0024_iana_experts.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.23 on 2019-08-07 12:07
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    StateType = apps.get_model('doc','StateType')
-    State = apps.get_model('doc','State')
-
-    StateType.objects.create(slug='draft-iana-experts',label='IANA Experts State')
-    State.objects.create(type_id='draft-iana-experts',
-                         slug='need-experts',
-                         name='Need IANA Expert(s)',
-                         used=True,
-                         desc='One or more registries need experts assigned',
-                         order=0
-                        )
-    State.objects.create(type_id='draft-iana-experts',
-                         slug='reviews-assigned',
-                         name='Reviews assigned',
-                         used=True,
-                         desc='One or more expert reviews have been assigned',
-                         order=1
-                        )
-    State.objects.create(type_id='draft-iana-experts',
-                         slug='expert-issues',
-                         name='Issues identified',
-                         used=True,
-                         desc='Some expert reviewers have identified issues',
-                         order=2
-                        )
-    State.objects.create(type_id='draft-iana-experts',
-                         slug='reviewers-ok',
-                         name='Expert Reviews OK',
-                         used=True,
-                         desc='All expert reviews have been completed with no blocking issues',
-                         order=2
-                        )
-
-def reverse(apps, schema_editor):
-    StateType = apps.get_model('doc','StateType')
-    State = apps.get_model('doc','State')
-
-    State.objects.filter(type_id='draft-iana-experts', slug__in=('need-experts','reviews-assigned','reviews-complete')).delete()
-    StateType.objects.filter(slug='draft-iana-experts').delete()
-
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0023_one_to_many_docalias'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/doc/migrations/0024_remove_ad_is_watching_states.py b/ietf/doc/migrations/0024_remove_ad_is_watching_states.py
new file mode 100644
index 0000000000..0c0fb0ad25
--- /dev/null
+++ b/ietf/doc/migrations/0024_remove_ad_is_watching_states.py
@@ -0,0 +1,121 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations
+
+
+def get_helper(DocHistory, RelatedDocument, RelatedDocHistory, DocumentAuthor, DocHistoryAuthor):
+    """Dependency injection wrapper"""
+
+    def save_document_in_history(doc):
+        """Save a snapshot of document and related objects in the database.
+        
+        Local copy of ietf.doc.utils.save_document_in_history() to avoid depending on the
+        code base in a migration.
+        """
+    
+        def get_model_fields_as_dict(obj):
+            return dict((field.name, getattr(obj, field.name))
+                        for field in obj._meta.fields
+                        if field is not obj._meta.pk)
+    
+        # copy fields
+        fields = get_model_fields_as_dict(doc)
+        fields["doc"] = doc
+        fields["name"] = doc.name
+    
+        dochist = DocHistory(**fields)
+        dochist.save()
+    
+        # copy many to many
+        for field in doc._meta.many_to_many:
+            if field.remote_field.through and field.remote_field.through._meta.auto_created:
+                hist_field = getattr(dochist, field.name)
+                hist_field.clear()
+                hist_field.set(getattr(doc, field.name).all())
+    
+        # copy remaining tricky many to many
+        def transfer_fields(obj, HistModel):
+            mfields = get_model_fields_as_dict(item)
+            # map doc -> dochist
+            for k, v in mfields.items():
+                if v == doc:
+                    mfields[k] = dochist
+            HistModel.objects.create(**mfields)
+    
+        for item in RelatedDocument.objects.filter(source=doc):
+            transfer_fields(item, RelatedDocHistory)
+    
+        for item in DocumentAuthor.objects.filter(document=doc):
+            transfer_fields(item, DocHistoryAuthor)
+    
+        return dochist
+    
+    return save_document_in_history
+
+
+def forward(apps, schema_editor):
+    """Mark watching draft-iesg state unused after removing it from Documents"""
+    StateDocEvent = apps.get_model("doc", "StateDocEvent")
+    Document = apps.get_model("doc", "Document")
+    State = apps.get_model("doc", "State")
+    StateType = apps.get_model("doc", "StateType")
+    Person = apps.get_model("person", "Person")
+    
+    save_document_in_history = get_helper(
+        DocHistory=apps.get_model("doc", "DocHistory"),
+        RelatedDocument=apps.get_model("doc", "RelatedDocument"),
+        RelatedDocHistory=apps.get_model("doc", "RelatedDocHistory"),
+        DocumentAuthor=apps.get_model("doc", "DocumentAuthor"),
+        DocHistoryAuthor=apps.get_model("doc", "DocHistoryAuthor"),
+    )
+
+    draft_iesg_state_type = StateType.objects.get(slug="draft-iesg")
+    idexists_state = State.objects.get(type=draft_iesg_state_type, slug="idexists")
+    watching_state = State.objects.get(type=draft_iesg_state_type, slug="watching")
+    system_person = Person.objects.get(name="(System)")
+
+    # Remove state from documents that currently have it
+    for doc in Document.objects.filter(states=watching_state):
+        assert doc.type_id == "draft"
+        doc.states.remove(watching_state)
+        doc.states.add(idexists_state)
+        e = StateDocEvent.objects.create(
+            type="changed_state",
+            by=system_person,
+            doc=doc,
+            rev=doc.rev,
+            desc=f"{draft_iesg_state_type.label} changed to <b>{idexists_state.name}</b> from {watching_state.name}",
+            state_type=draft_iesg_state_type,
+            state=idexists_state,
+        )
+        doc.time = e.time
+        doc.save()
+        save_document_in_history(doc)
+    assert not Document.objects.filter(states=watching_state).exists()
+
+    # Mark state as unused
+    watching_state.used = False
+    watching_state.save()
+
+
+def reverse(apps, schema_editor):
+    """Mark watching draft-iesg state as used
+    
+    Does not try to re-apply the state to Documents modified by the forward migration. This
+    could be done in theory, but would either require dangerous history rewriting or add a
+    lot of history junk.
+    """
+    State = apps.get_model("doc", "State")
+    StateType = apps.get_model("doc", "StateType")
+    State.objects.filter(
+        type=StateType.objects.get(slug="draft-iesg"), slug="watching"
+    ).update(used=True)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("doc", "0023_bofreqspamstate"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/doc/migrations/0025_ianaexpertdocevent.py b/ietf/doc/migrations/0025_ianaexpertdocevent.py
deleted file mode 100644
index 282d506d9c..0000000000
--- a/ietf/doc/migrations/0025_ianaexpertdocevent.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.23 on 2019-08-07 12:27
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0024_iana_experts'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='IanaExpertDocEvent',
-            fields=[
-                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
-            ],
-            bases=('doc.docevent',),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0025_storedobject_storedobject_unique_name_per_store.py b/ietf/doc/migrations/0025_storedobject_storedobject_unique_name_per_store.py
new file mode 100644
index 0000000000..e948ca3011
--- /dev/null
+++ b/ietf/doc/migrations/0025_storedobject_storedobject_unique_name_per_store.py
@@ -0,0 +1,66 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("doc", "0024_remove_ad_is_watching_states"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="StoredObject",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("store", models.CharField(max_length=256)),
+                ("name", models.CharField(max_length=1024)),
+                ("sha384", models.CharField(max_length=96)),
+                ("len", models.PositiveBigIntegerField()),
+                (
+                    "store_created",
+                    models.DateTimeField(
+                        help_text="The instant the object ws first placed in the store"
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        help_text="Instant object became known. May not be the same as the storage's created value for the instance. It will hold ctime for objects imported from older disk storage"
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(
+                        help_text="Last instant object was modified. May not be the same as the storage's modified value for the instance. It will hold mtime for objects imported from older disk storage unless they've actually been overwritten more recently"
+                    ),
+                ),
+                ("doc_name", models.CharField(blank=True, max_length=255, null=True)),
+                ("doc_rev", models.CharField(blank=True, max_length=16, null=True)),
+                ("deleted", models.DateTimeField(null=True)),
+            ],
+            options={
+                "indexes": [
+                    models.Index(
+                        fields=["doc_name", "doc_rev"],
+                        name="doc_storedo_doc_nam_d04465_idx",
+                    )
+                ],
+            },
+        ),
+        migrations.AddConstraint(
+            model_name="storedobject",
+            constraint=models.UniqueConstraint(
+                fields=("store", "name"), name="unique_name_per_store"
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0026_add_draft_rfceditor_state.py b/ietf/doc/migrations/0026_add_draft_rfceditor_state.py
deleted file mode 100644
index 0490f15ba9..0000000000
--- a/ietf/doc/migrations/0026_add_draft_rfceditor_state.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    State = apps.get_model('doc','State')
-    State.objects.get_or_create(type_id='draft-rfceditor', slug='tooling-issue', name='TI',
-                         desc='Tooling Issue; an update is needed to one or more of the tools in the publication pipeline before this document can be published')
-
-def reverse(apps, schema_editor):
-    State = apps.get_model('doc','State')
-    State.objects.filter(type_id='draft-rfceditor', slug='tooling-issue').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0025_ianaexpertdocevent'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/doc/migrations/0026_change_wg_state_descriptions.py b/ietf/doc/migrations/0026_change_wg_state_descriptions.py
new file mode 100644
index 0000000000..b02b12c97e
--- /dev/null
+++ b/ietf/doc/migrations/0026_change_wg_state_descriptions.py
@@ -0,0 +1,117 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    State = apps.get_model("doc","State")
+    for name, desc in [
+        ("WG Document","The document has been adopted by the Working Group (WG) and is under development.  A document can only be adopted by one WG at a time.  However, a document may be transferred between WGs."),
+        ("Parked WG Document","The Working Group (WG) document is in a temporary state where it will not be actively developed.  The reason for the pause is explained via a datatracker comments section."),
+        ("Dead WG Document","The Working Group (WG) document has been abandoned by the WG.  No further development is planned in this WG.  A decision to resume work on this document and move it out of this state is possible."),
+        ("In WG Last Call","The Working Group (WG) document is currently subject to an active WG Last Call (WGLC) review per Section 7.4 of RFC2418."),
+        ("Waiting for Implementation","The progression of this Working Group (WG) document towards publication is paused as it awaits implementation. The process governing the approach to implementations is WG-specific."),
+        ("Held by WG","Held by Working Group (WG) chairs for administrative reasons.  See document history for details."),
+        ("Waiting for WG Chair Go-Ahead","The Working Group (WG) document has completed Working Group Last Call (WGLC), but the WG chair(s) are not yet ready to call consensus on the document. The reasons for this may include comments from the WGLC need to be responded to, or a revision to the document is needed"),
+        ("WG Consensus: Waiting for Write-Up","The Working Group (WG) document has consensus to proceed to publication.  However, the document is waiting for a document shepherd write-up per RFC4858."),
+        ("Submitted to IESG for Publication","The Working Group (WG) document has left the WG and been submitted to the Internet Engineering Steering Group (IESG) for evaluation and publication.  See the “IESG State” or “RFC Editor State” for further details on the state of the document."),
+        ("Candidate for WG Adoption","The individual submission document has been marked by the Working Group (WG) chairs as a candidate for adoption by the WG, but no adoption call has been started."),
+        ("Call For Adoption By WG Issued","A call for adoption of the individual submission document has been issued by the Working Group (WG) chairs.  This call is still running but the WG has not yet reached consensus for adoption."),
+        ("Adopted by a WG","The individual submission document has been adopted by the Working Group (WG), but a WG document replacing this document with the typical naming convention of 'draft- ietf-wgname-topic-nn' has not yet been submitted."),
+        ("Adopted for WG Info Only","The document is adopted by the Working Group (WG) for its internal use.  The WG has decided that it will not pursue publication of it as an RFC."),
+    ]:
+        State.objects.filter(name=name).update(desc=desc)
+
+def reverse(apps, schema_editor):
+    State = apps.get_model("doc","State")
+    for name, desc in [
+       ("WG Document","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.4" target="_blank">4.2.4. WG Document</a>
+
+ The "WG Document" state describes an I-D that has been adopted by an IETF WG and is being actively developed.
+
+ A WG Chair may transition an I-D into the "WG Document" state at any time as long as the I-D is not being considered or developed in any other WG.
+
+ Alternatively, WG Chairs may rely upon new functionality to be added to the Datatracker to automatically move version-00 drafts into the "WG Document" state as described in Section 4.1.
+
+ Under normal conditions, it should not be possible for an I-D to be in the "WG Document" state in more than one WG at a time. This said, I-Ds may be transferred from one WG to another with the consent of the WG Chairs and the responsible ADs."""),
+        ("Parked WG Document","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.5" target="_blank">4.2.5. Parked WG Document</a>
+
+ A "Parked WG Document" is an I-D that has lost its author or editor, is waiting for another document to be written or for a review to be completed, or cannot be progressed by the working group for some other reason.
+
+ Some of the annotation tags described in Section 4.3 may be used in conjunction with this state to indicate why an I-D has been parked, and/or what may need to happen for the I-D to be un-parked.
+
+ Parking a WG draft will not prevent it from expiring; however, this state can be used to indicate why the I-D has stopped progressing in the WG.
+
+ A "Parked WG Document" that is not expired may be transferred from one WG to another with the consent of the WG Chairs and the responsible ADs."""),
+        ("Dead WG Document","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.6" target="_blank">4.2.6. Dead WG Document</a>
+
+ A "Dead WG Document" is an I-D that has been abandoned. Note that 'Dead' is not always a final state for a WG I-D. If consensus is subsequently achieved, a "Dead WG Document" may be resurrected. A "Dead WG Document" that is not resurrected will eventually expire.
+
+ Note that an I-D that is declared to be "Dead" in one WG and that is not expired may be transferred to a non-dead state in another WG with the consent of the WG Chairs and the responsible ADs."""),
+        ("In WG Last Call","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.7" target="_blank">4.2.7. In WG Last Call</a>
+
+ A document "In WG Last Call" is an I-D for which a WG Last Call (WGLC) has been issued and is in progress.
+
+ Note that conducting a WGLC is an optional part of the IETF WG process, per Section 7.4 of RFC 2418 [RFC2418].
+
+ If a WG Chair decides to conduct a WGLC on an I-D, the "In WG Last Call" state can be used to track the progress of the WGLC. The Chair may configure the Datatracker to send a WGLC message to one or more mailing lists when the Chair moves the I-D into this state. The WG Chair may also be able to select a different set of mailing lists for a different document undergoing a WGLC; some documents may deserve coordination with other WGs.
+
+ A WG I-D in this state should remain "In WG Last Call" until the WG Chair moves it to another state. The WG Chair may configure the Datatracker to send an e-mail after a specified period of time to remind or 'nudge' the Chair to conclude the WGLC and to determine the next state for the document.
+
+ It is possible for one WGLC to lead into another WGLC for the same document. For example, an I-D that completed a WGLC as an "Informational" document may need another WGLC if a decision is taken to convert the I-D into a Standards Track document."""),
+        ("Waiting for Implementation","""In some areas, it can be desirable to wait for multiple interoperable implementations before progressing a draft to be an RFC, and in some WGs this is required.  This state should be entered after WG Last Call has completed."""),
+        ("Held by WG","""Held by WG, see document history for details."""),
+        ("Waiting for WG Chair Go-Ahead","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.8" target="_blank">4.2.8. Waiting for WG Chair Go-Ahead</a>
+
+ A WG Chair may wish to place an I-D that receives a lot of comments during a WGLC into the "Waiting for WG Chair Go-Ahead" state. This state describes an I-D that has undergone a WGLC; however, the Chair is not yet ready to call consensus on the document.
+
+ If comments from the WGLC need to be responded to, or a revision to the I-D is needed, the Chair may place an I-D into this state until all of the WGLC comments are adequately addressed and the (possibly revised) document is in the I-D repository."""),
+        ("WG Consensus: Waiting for Write-Up","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.9" target="_blank">4.2.9. WG Consensus: Waiting for Writeup</a>
+
+ A document in the "WG Consensus: Waiting for Writeup" state has essentially completed its development within the working group, and is nearly ready to be sent to the IESG for publication. The last thing to be done is the preparation of a protocol writeup by a Document Shepherd. The IESG requires that a document shepherd writeup be completed before publication of the I-D is requested. The IETF document shepherding process and the role of a WG Document Shepherd is described in RFC 4858 [RFC4858]
+
+ A WG Chair may call consensus on an I-D without a formal WGLC and transition an I-D that was in the "WG Document" state directly into this state.
+
+ The name of this state includes the words "Waiting for Writeup" because a good document shepherd writeup takes time to prepare."""),
+        ("Submitted to IESG for Publication","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.10" target="_blank">4.2.10. Submitted to IESG for Publication</a>
+
+ This state describes a WG document that has been submitted to the IESG for publication and that has not been sent back to the working group for revision.
+
+ An I-D in this state may be under review by the IESG, it may have been approved and be in the RFC Editor's queue, or it may have been published as an RFC. Other possibilities exist too. The document may be "Dead" (in the IESG state machine) or in a "Do Not Publish" state."""),
+        ("Candidate for WG Adoption","""The document has been marked as a candidate for WG adoption by the WG Chair.  This state can be used before a call for adoption is issued (and the document is put in the "Call For Adoption By WG Issued" state), to indicate that the document is in the queue for a call for adoption, even if none has been issued yet."""),
+        ("Call For Adoption By WG Issued","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.1" target="_blank">4.2.1. Call for Adoption by WG Issued</a>
+
+ The "Call for Adoption by WG Issued" state should be used to indicate when an I-D is being considered for adoption by an IETF WG. An I-D that is in this state is actively being considered for adoption and has not yet achieved consensus, preference, or selection in the WG.
+
+ This state may be used to describe an I-D that someone has asked a WG to consider for adoption, if the WG Chair has agreed with the request. This state may also be used to identify an I-D that a WG Chair asked an author to write specifically for consideration as a candidate WG item [WGDTSPEC], and/or an I-D that is listed as a 'candidate draft' in the WG's charter.
+
+ Under normal conditions, it should not be possible for an I-D to be in the "Call for Adoption by WG Issued" state in more than one working group at the same time. This said, it is not uncommon for authors to "shop" their I-Ds to more than one WG at a time, with the hope of getting their documents adopted somewhere.
+
+ After this state is implemented in the Datatracker, an I-D that is in the "Call for Adoption by WG Issued" state will not be able to be "shopped" to any other WG without the consent of the WG Chairs and the responsible ADs impacted by the shopping.
+
+ Note that Figure 1 includes an arc leading from this state to outside of the WG state machine. This illustrates that some I-Ds that are considered do not get adopted as WG drafts. An I-D that is not adopted as a WG draft will transition out of the WG state machine and revert back to having no stream-specific state; however, the status change history log of the I-D will record that the I-D was previously in the "Call for Adoption by WG Issued" state."""),
+        ("Adopted by a WG","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.2" target="_blank">4.2.2. Adopted by a WG</a>
+
+ The "Adopted by a WG" state describes an individual submission I-D that an IETF WG has agreed to adopt as one of its WG drafts.
+
+ WG Chairs who use this state will be able to clearly indicate when their WGs adopt individual submission I-Ds. This will facilitate the Datatracker's ability to correctly capture "Replaces" information for WG drafts and correct "Replaced by" information for individual submission I-Ds that have been replaced by WG drafts.
+
+ This state is needed because the Datatracker uses the filename of an I-D as a key to search its database for status information about the I-D, and because the filename of a WG I-D is supposed to be different from the filename of an individual submission I-D. The filename of an individual submission I-D will typically be formatted as 'draft-author-wgname-topic-nn'.
+
+ The filename of a WG document is supposed to be formatted as 'draft- ietf-wgname-topic-nn'.
+
+ An individual I-D that is adopted by a WG may take weeks or months to be resubmitted by the author as a new (version-00) WG draft. If the "Adopted by a WG" state is not used, the Datatracker has no way to determine that an I-D has been adopted until a new version of the I-D is submitted to the WG by the author and until the I-D is approved for posting by a WG Chair."""),
+        ("Adopted for WG Info Only","""<a href="https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.3" target="_blank">4.2.3. Adopted for WG Info Only</a>
+
+ The "Adopted for WG Info Only" state describes a document that contains useful information for the WG that adopted it, but the document is not intended to be published as an RFC. The WG will not actively develop the contents of the I-D or progress it for publication as an RFC. The only purpose of the I-D is to provide information for internal use by the WG."""),
+    ]:
+        State.objects.filter(name=name).update(desc=desc)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("doc", "0025_storedobject_storedobject_unique_name_per_store"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]
diff --git a/ietf/doc/migrations/0027_add_irsg_doc_positions.py b/ietf/doc/migrations/0027_add_irsg_doc_positions.py
deleted file mode 100644
index e88ac9dda7..0000000000
--- a/ietf/doc/migrations/0027_add_irsg_doc_positions.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.22 on 2019-08-03 10:09
-
-
-from django.db import migrations
-
-# forward, reverse initially copied from migration 0004
-def forward(apps, schema_editor):
-    State = apps.get_model('doc','State')
-    State.objects.create(type_id='draft-stream-irtf',
-                         slug='irsg_review',
-                         name='IRSG Review',
-                         desc='IRSG Review',
-                         used=True,
-                        )
-    BallotPositionName = apps.get_model('name','BallotPositionName')
-    # desc, used, order, and blocking all have suitable defaults
-    BallotPositionName.objects.create(slug="moretime",
-                           name="Need More Time",
-                          )
-    BallotPositionName.objects.create(slug="notready",
-                           name="Not Ready",
-                          )
-
-    # Create a new ballot type for IRSG ballot
-    # include positions for the ballot type
-    BallotType = apps.get_model('doc','BallotType')
-    bt = BallotType.objects.create(doc_type_id="draft",
-                                   slug="irsg-approve",
-                                   name="IRSG Approve",
-                                   question="Is this draft ready for publication in the IRTF stream?",
-                                  )
-    bt.positions.set(['yes','noobj','recuse','notready','moretime'])
-
-def reverse(apps, schema_editor):
-    State = apps.get_model('doc','State')
-    State.objects.filter(type_id__in=('draft-stream-irtf',), slug='irsg_review').delete()
-
-    Position = apps.get_model('name','BallotPositionName')
-    for pos in ("moretime", "notready"):
-        Position.objects.filter(slug=pos).delete()
-
-    IRSGBallot = apps.get_model('doc','BallotType')
-    IRSGBallot.objects.filter(slug="irsg-approve").delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0026_add_draft_rfceditor_state'),
-        ('name', '0007_fix_m2m_slug_id_length'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-        migrations.RenameField(
-            model_name='ballotpositiondocevent',
-            old_name='ad',
-            new_name='balloter',
-        ),
-
-    ]
diff --git a/ietf/doc/migrations/0027_alter_dochistory_title_alter_document_title.py b/ietf/doc/migrations/0027_alter_dochistory_title_alter_document_title.py
new file mode 100644
index 0000000000..e0d8560e6f
--- /dev/null
+++ b/ietf/doc/migrations/0027_alter_dochistory_title_alter_document_title.py
@@ -0,0 +1,41 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0026_change_wg_state_descriptions"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="dochistory",
+            name="title",
+            field=models.CharField(
+                max_length=255,
+                validators=[
+                    django.core.validators.ProhibitNullCharactersValidator,  # type:ignore
+                    django.core.validators.RegexValidator(
+                        message="Please enter a string without control characters.",
+                        regex="^[^\x01-\x1f]*$",
+                    ),
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="document",
+            name="title",
+            field=models.CharField(
+                max_length=255,
+                validators=[
+                    django.core.validators.ProhibitNullCharactersValidator,  # type:ignore
+                    django.core.validators.RegexValidator(
+                        message="Please enter a string without control characters.",
+                        regex="^[^\x01-\x1f]*$",
+                    ),
+                ],
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0028_irsgballotdocevent.py b/ietf/doc/migrations/0028_irsgballotdocevent.py
deleted file mode 100644
index 92f4d52d73..0000000000
--- a/ietf/doc/migrations/0028_irsgballotdocevent.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-10 10:37
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0027_add_irsg_doc_positions'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='IRSGBallotDocEvent',
-            fields=[
-                ('ballotdocevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.BallotDocEvent')),
-                ('duedate', models.DateTimeField(blank=True, null=True)),
-            ],
-            bases=('doc.ballotdocevent',),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0028_rfcauthor.py b/ietf/doc/migrations/0028_rfcauthor.py
new file mode 100644
index 0000000000..776dc22eb1
--- /dev/null
+++ b/ietf/doc/migrations/0028_rfcauthor.py
@@ -0,0 +1,84 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("person", "0005_alter_historicalperson_pronouns_selectable_and_more"),
+        ("doc", "0027_alter_dochistory_title_alter_document_title"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="RfcAuthor",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("titlepage_name", models.CharField(max_length=128)),
+                ("is_editor", models.BooleanField(default=False)),
+                (
+                    "affiliation",
+                    models.CharField(
+                        blank=True,
+                        help_text="Organization/company used by author for submission",
+                        max_length=100,
+                    ),
+                ),
+                (
+                    "country",
+                    models.CharField(
+                        blank=True,
+                        help_text="Country used by author for submission",
+                        max_length=255,
+                    ),
+                ),
+                ("order", models.IntegerField(default=1)),
+                (
+                    "document",
+                    ietf.utils.models.ForeignKey(
+                        limit_choices_to={"type_id": "rfc"},
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="doc.document",
+                    ),
+                ),
+                (
+                    "email",
+                    ietf.utils.models.ForeignKey(
+                        blank=True,
+                        help_text="Email address used by author for submission",
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="person.email",
+                    ),
+                ),
+                (
+                    "person",
+                    ietf.utils.models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="person.person",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["document", "order"],
+                "indexes": [
+                    models.Index(
+                        fields=["document", "order"],
+                        name="doc_rfcauth_documen_6b5dc4_idx",
+                    )
+                ],
+            },
+        ),
+    ]
diff --git a/ietf/doc/migrations/0029_add_ipr_event_types.py b/ietf/doc/migrations/0029_add_ipr_event_types.py
deleted file mode 100644
index 08073b16e8..0000000000
--- a/ietf/doc/migrations/0029_add_ipr_event_types.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-01-17 11:54
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0028_irsgballotdocevent'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='docevent',
-            name='type',
-            field=models.CharField(choices=[('new_revision', 'Added new revision'), ('new_submission', 'Uploaded new revision'), ('changed_document', 'Changed document metadata'), ('added_comment', 'Added comment'), ('added_message', 'Added message'), ('edited_authors', 'Edited the documents author list'), ('deleted', 'Deleted document'), ('changed_state', 'Changed state'), ('changed_stream', 'Changed document stream'), ('expired_document', 'Expired document'), ('extended_expiry', 'Extended expiry of document'), ('requested_resurrect', 'Requested resurrect'), ('completed_resurrect', 'Completed resurrect'), ('changed_consensus', 'Changed consensus'), ('published_rfc', 'Published RFC'), ('added_suggested_replaces', 'Added suggested replacement relationships'), ('reviewed_suggested_replaces', 'Reviewed suggested replacement relationships'), ('changed_group', 'Changed group'), ('changed_protocol_writeup', 'Changed protocol writeup'), ('changed_charter_milestone', 'Changed charter milestone'), ('initial_review', 'Set initial review time'), ('changed_review_announcement', 'Changed WG Review text'), ('changed_action_announcement', 'Changed WG Action text'), ('started_iesg_process', 'Started IESG process on document'), ('created_ballot', 'Created ballot'), ('closed_ballot', 'Closed ballot'), ('sent_ballot_announcement', 'Sent ballot announcement'), ('changed_ballot_position', 'Changed ballot position'), ('changed_ballot_approval_text', 'Changed ballot approval text'), ('changed_ballot_writeup_text', 'Changed ballot writeup text'), ('changed_rfc_editor_note_text', 'Changed RFC Editor Note text'), ('changed_last_call_text', 'Changed last call text'), ('requested_last_call', 'Requested last call'), ('sent_last_call', 'Sent last call'), ('scheduled_for_telechat', 'Scheduled for telechat'), ('iesg_approved', 'IESG approved document (no problem)'), ('iesg_disapproved', 'IESG disapproved document (do not publish)'), ('approved_in_minute', 'Approved in minute'), ('iana_review', 'IANA review comment'), ('rfc_in_iana_registry', 'RFC is in IANA registry'), ('rfc_editor_received_announcement', 'Announcement was received by RFC Editor'), ('requested_publication', 'Publication at RFC Editor requested'), ('sync_from_rfc_editor', 'Received updated information from RFC Editor'), ('requested_review', 'Requested review'), ('assigned_review_request', 'Assigned review request'), ('closed_review_request', 'Closed review request'), ('closed_review_assignment', 'Closed review assignment'), ('downref_approved', 'Downref approved'), ('posted_related_ipr', 'Posted related IPR'), ('removed_related_ipr', 'Removed related IPR')], max_length=50),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0029_editedrfcauthorsdocevent.py b/ietf/doc/migrations/0029_editedrfcauthorsdocevent.py
new file mode 100644
index 0000000000..60837c5cb2
--- /dev/null
+++ b/ietf/doc/migrations/0029_editedrfcauthorsdocevent.py
@@ -0,0 +1,30 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0028_rfcauthor"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="EditedRfcAuthorsDocEvent",
+            fields=[
+                (
+                    "docevent_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="doc.docevent",
+                    ),
+                ),
+            ],
+            bases=("doc.docevent",),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0030_alter_dochistory_title_alter_document_title.py b/ietf/doc/migrations/0030_alter_dochistory_title_alter_document_title.py
new file mode 100644
index 0000000000..9ee858b2e8
--- /dev/null
+++ b/ietf/doc/migrations/0030_alter_dochistory_title_alter_document_title.py
@@ -0,0 +1,41 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0029_editedrfcauthorsdocevent"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="dochistory",
+            name="title",
+            field=models.CharField(
+                max_length=255,
+                validators=[
+                    django.core.validators.ProhibitNullCharactersValidator(),
+                    django.core.validators.RegexValidator(
+                        message="Please enter a string without control characters.",
+                        regex="^[^\x01-\x1f]*$",
+                    ),
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="document",
+            name="title",
+            field=models.CharField(
+                max_length=255,
+                validators=[
+                    django.core.validators.ProhibitNullCharactersValidator(),
+                    django.core.validators.RegexValidator(
+                        message="Please enter a string without control characters.",
+                        regex="^[^\x01-\x1f]*$",
+                    ),
+                ],
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0030_fix_bytes_mailarch_url.py b/ietf/doc/migrations/0030_fix_bytes_mailarch_url.py
deleted file mode 100644
index 3c3ad2aa6f..0000000000
--- a/ietf/doc/migrations/0030_fix_bytes_mailarch_url.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 14:27
-
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-import re
-
-from django.conf import settings
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-
-    Document                     = apps.get_model('doc', 'Document')
-
-    print('')
-    for d in Document.objects.filter(external_url__contains="/b'"):
-        match = re.search("^(%s/arch/msg/[^/]+/)b'([^']+)'$" % settings.MAILING_LIST_ARCHIVE_URL, d.external_url)
-        if match:
-            d.external_url = "%s%s" % (match.group(1), match.group(2))
-            d.save()
-            print('Fixed url #%s: %s' % (d.id, d.external_url))
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0029_add_ipr_event_types'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/doc/migrations/0031_change_draft_stream_ietf_state_descriptions.py b/ietf/doc/migrations/0031_change_draft_stream_ietf_state_descriptions.py
new file mode 100644
index 0000000000..c664126da3
--- /dev/null
+++ b/ietf/doc/migrations/0031_change_draft_stream_ietf_state_descriptions.py
@@ -0,0 +1,57 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    State = apps.get_model("doc", "State")
+    for name, desc in [
+        (
+            "Adopted by a WG",
+            "The individual submission document has been adopted by the Working Group (WG), but some administrative matter still needs to be completed (e.g., a WG document replacing this document with the typical naming convention of 'draft-ietf-wgname-topic-nn' has not yet been submitted).",
+        ),
+        (
+            "WG Document",
+            "The document has been identified as a Working Group (WG) document and is under development per Section 7.2 of RFC2418.",
+        ),
+        (
+            "Waiting for WG Chair Go-Ahead",
+            "The Working Group (WG) document has completed Working Group Last Call (WGLC), but the WG chairs are not yet ready to call consensus on the document. The reasons for this may include comments from the WGLC need to be responded to, or a revision to the document is needed.",
+        ),
+        (
+            "Submitted to IESG for Publication",
+            "The Working Group (WG) document has been submitted to the Internet Engineering Steering Group (IESG) for evaluation and publication per Section 7.4 of RFC2418.  See the “IESG State” or “RFC Editor State” for further details on the state of the document.",
+        ),
+    ]:
+        State.objects.filter(name=name).update(desc=desc, type="draft-stream-ietf")
+
+
+def reverse(apps, schema_editor):
+    State = apps.get_model("doc", "State")
+    for name, desc in [
+        (
+            "Adopted by a WG",
+            "The individual submission document has been adopted by the Working Group (WG), but a WG document replacing this document with the typical naming convention of 'draft- ietf-wgname-topic-nn' has not yet been submitted.",
+        ),
+        (
+            "WG Document",
+            "The document has been adopted by the Working Group (WG) and is under development.  A document can only be adopted by one WG at a time.  However, a document may be transferred between WGs.",
+        ),
+        (
+            "Waiting for WG Chair Go-Ahead",
+            "The Working Group (WG) document has completed Working Group Last Call (WGLC), but the WG chair(s) are not yet ready to call consensus on the document. The reasons for this may include comments from the WGLC need to be responded to, or a revision to the document is needed",
+        ),
+        (
+            "Submitted to IESG for Publication",
+            "The Working Group (WG) document has left the WG and been submitted to the Internet Engineering Steering Group (IESG) for evaluation and publication.  See the “IESG State” or “RFC Editor State” for further details on the state of the document.",
+        ),
+    ]:
+        State.objects.filter(name=name).update(desc=desc, type="draft-stream-ietf")
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0030_alter_dochistory_title_alter_document_title"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/doc/migrations/0031_set_state_for_charters_of_replaced_groups.py b/ietf/doc/migrations/0031_set_state_for_charters_of_replaced_groups.py
deleted file mode 100644
index 1bf96f9a4d..0000000000
--- a/ietf/doc/migrations/0031_set_state_for_charters_of_replaced_groups.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright The IETF Trust 2020, All Rights Reserved
-# Generated by Django 1.11.28 on 2020-03-03 13:54
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-
-    Person = apps.get_model('person', 'Person')
-
-    Document = apps.get_model('doc','Document')
-    State = apps.get_model('doc','State')
-    BallotDocEvent = apps.get_model('doc','BallotDocEvent')
-
-    replaced_state = State.objects.create(type_id='charter', slug='replaced', name='Replaced', used=True, desc="This charter's group was replaced.", order = 0)
-    by = Person.objects.get(name='(System)')
-
-    for doc in Document.objects.filter(type_id='charter',states__type_id='charter',states__slug__in=['intrev','extrev'],group__state='replaced'):
-        doc.states.remove(*list(doc.states.filter(type_id='charter')))
-        doc.states.add(replaced_state)
-        ballot = BallotDocEvent.objects.filter(doc=doc, type__in=('created_ballot', 'closed_ballot')).order_by('-time', '-id').first()
-        if ballot and ballot.type == 'created_ballot':
-            e = BallotDocEvent(type="closed_ballot", doc=doc, rev=doc.rev, by=by)
-            e.ballot_type = ballot.ballot_type
-            e.desc = 'Closed "%s" ballot' % e.ballot_type.name
-            e.save()
-
-
-def reverse(apps, schema_editor):
-    pass
-    
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0030_fix_bytes_mailarch_url'),
-        ('person', '0009_auto_20190118_0725'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/doc/migrations/0032_auto_20200624_1332.py b/ietf/doc/migrations/0032_auto_20200624_1332.py
deleted file mode 100644
index 1dd656a31f..0000000000
--- a/ietf/doc/migrations/0032_auto_20200624_1332.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 2.1.15 on 2020-06-24 13:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0031_set_state_for_charters_of_replaced_groups'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='ballotpositiondocevent',
-            name='send_email',
-            field=models.BooleanField(default=None, null=True),
-        ),
-        migrations.AlterField(
-            model_name='consensusdocevent',
-            name='consensus',
-            field=models.BooleanField(default=None, null=True),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0032_remove_rfcauthor_email.py b/ietf/doc/migrations/0032_remove_rfcauthor_email.py
new file mode 100644
index 0000000000..a0e147da59
--- /dev/null
+++ b/ietf/doc/migrations/0032_remove_rfcauthor_email.py
@@ -0,0 +1,16 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0031_change_draft_stream_ietf_state_descriptions"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="rfcauthor",
+            name="email",
+        ),
+    ]
diff --git a/ietf/doc/migrations/0033_dochistory_keywords_document_keywords.py b/ietf/doc/migrations/0033_dochistory_keywords_document_keywords.py
new file mode 100644
index 0000000000..5e2513e15a
--- /dev/null
+++ b/ietf/doc/migrations/0033_dochistory_keywords_document_keywords.py
@@ -0,0 +1,31 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from django.db import migrations, models
+import ietf.doc.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0032_remove_rfcauthor_email"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="dochistory",
+            name="keywords",
+            field=models.JSONField(
+                default=list,
+                max_length=1000,
+                validators=[ietf.doc.models.validate_doc_keywords],
+            ),
+        ),
+        migrations.AddField(
+            model_name="document",
+            name="keywords",
+            field=models.JSONField(
+                default=list,
+                max_length=1000,
+                validators=[ietf.doc.models.validate_doc_keywords],
+            ),
+        ),
+    ]
diff --git a/ietf/doc/migrations/0033_populate_auth48_urls.py b/ietf/doc/migrations/0033_populate_auth48_urls.py
deleted file mode 100644
index d6092b630d..0000000000
--- a/ietf/doc/migrations/0033_populate_auth48_urls.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.db.models import OuterRef, Subquery
-
-from re import match
-
-
-def forward(apps, schema_editor):
-    """Add DocumentURLs for docs in the Auth48 state
-
-    Checks the latest StateDocEvent; if it is in the auth48 state and the
-    event desc has an AUTH48 link, creates an auth48 DocumentURL for that doc.
-    """
-    Document = apps.get_model('doc', 'Document')
-    StateDocEvent = apps.get_model('doc', 'StateDocEvent')
-    DocumentURL = apps.get_model('doc', 'DocumentURL')
-
-    # Regex - extracts auth48 URL as first match group
-    pattern = r'RFC Editor state changed to <a href="(.*)"><b>AUTH48.*</b></a>.*'
-
-    # To avoid 100k queries, set up a subquery to find the latest StateDocEvent for each doc...
-    latest_events = StateDocEvent.objects.filter(doc=OuterRef('pk')).order_by('-time', '-id')
-    # ... then annotate the doc list with that and select only those in the auth48 state...
-    auth48_docs = Document.objects.annotate(
-        current_state_slug=Subquery(latest_events.values('state__slug')[:1])
-    ).filter(current_state_slug='auth48')
-    # ... and add an auth48 DocumentURL if one is found.
-    for doc in auth48_docs:
-        # Retrieve the full StateDocEvent. Results in a query per doc, but
-        # only for the few few in the auth48 state.
-        sde = StateDocEvent.objects.filter(doc=doc).order_by('-time', '-id').first()
-        urlmatch = match(pattern, sde.desc)  # Auth48 URL is usually in the event desc
-        if urlmatch is not None:
-            DocumentURL.objects.create(doc=doc, tag_id='auth48', url=urlmatch[1])
-
-    # Validate the migration using a different approach to find auth48 docs.
-    # This is slower than above, but still avoids querying for every Document.
-    auth48_events = StateDocEvent.objects.filter(state__slug='auth48')
-    for a48_event in auth48_events:
-        doc = a48_event.doc
-        latest_sde = StateDocEvent.objects.filter(doc=doc).order_by('-time', '-id').first()
-        if latest_sde.state and latest_sde.state.slug == 'auth48' and match(pattern, latest_sde.desc) is not None:
-            # Currently in the auth48 state with a URL
-            assert doc.documenturl_set.filter(tag_id='auth48').count() == 1
-        else:
-            # Either no longer in auth48 state or had no URL
-            assert doc.documenturl_set.filter(tag_id='auth48').count() == 0
-
-
-def reverse(apps, schema_editor):
-    """Remove any auth48 DocumentURLs - these did not exist before"""
-    DocumentURL = apps.get_model('doc', 'DocumentURL')
-    DocumentURL.objects.filter(tag_id='auth48').delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('doc', '0032_auto_20200624_1332'),
-        ('name', '0013_add_auth48_docurltagname'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/doc/migrations/0034_extres.py b/ietf/doc/migrations/0034_extres.py
deleted file mode 100644
index 2157d0e863..0000000000
--- a/ietf/doc/migrations/0034_extres.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-04-15 10:20
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0014_extres'),
-        ('doc', '0033_populate_auth48_urls'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DocExtResource',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('display_name', models.CharField(blank=True, default='', max_length=255)),
-                ('value', models.CharField(max_length=2083)),
-                ('doc', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceName')),
-            ],
-        ),
-    ]
diff --git a/ietf/doc/migrations/0035_populate_docextresources.py b/ietf/doc/migrations/0035_populate_docextresources.py
deleted file mode 100644
index 04b396a963..0000000000
--- a/ietf/doc/migrations/0035_populate_docextresources.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-03-19 13:06
-from __future__ import unicode_literals
-
-import re
-
-import debug # pyflakes:ignore
-
-from collections import OrderedDict, Counter
-from io import StringIO
-
-from django.db import migrations
-
-from ietf.utils.validators import validate_external_resource_value
-from django.core.exceptions import ValidationError
-
-
-name_map = {
-    "Issue.*":                "tracker",
-    ".*FAQ.*":                "faq",
-    ".*Area Web Page":        "webpage",
-    ".*Wiki":                 "wiki",
-    "Home Page":              "webpage",
-    "Slack.*":                "slack",
-    "Additional .* Web Page": "webpage",
-    "Additional .* Page":     "webpage",
-    "Yang catalog entry.*":   "yc_entry",
-    "Yang impact analysis.*": "yc_impact",
-    "GitHub":                 "github_repo",
-    "Github page":            "github_repo",
-    "GitHub repo.*":          "github_repo",
-    "Github repository.*":    "github_repo",
-    "GitHub org.*":           "github_org",
-    "GitHub User.*":          "github_username",
-    "GitLab User":            "gitlab_username",
-    "GitLab User Name":       "gitlab_username",
-}
-
-url_map = OrderedDict({
-   "https?://github\\.com": "github_repo",
-   "https://git.sr.ht/": "repo",
-   "https://todo.sr.ht/": "tracker",
-   "https?://trac\\.ietf\\.org/.*/wiki": "wiki",
-   "ietf\\.org.*/trac/wiki": "wiki",
-   "trac.*wiki": "wiki",
-   "www\\.ietf\\.org/mailman" : None,
-   "www\\.ietf\\.org/mail-archive" : None,
-   "mailarchive\\.ietf\\.org" : None,
-   "ietf\\.org/logs": "jabber_log",
-   "ietf\\.org/jabber/logs": "jabber_log",
-   "xmpp:.*?join": "jabber_room",
-   "bell-labs\\.com": None,
-   "html\\.charters": None,
-   "datatracker\\.ietf\\.org": None,
-})
-
-def forward(apps, schema_editor):
-    DocExtResource = apps.get_model('doc', 'DocExtResource')
-    ExtResourceName = apps.get_model('name', 'ExtResourceName')
-    DocumentUrl = apps.get_model('doc', 'DocumentUrl')
-
-    stats = Counter()
-    stats_file = StringIO()
-
-    for doc_url in DocumentUrl.objects.all():
-        doc_url.url = doc_url.url.strip()
-        match_found = False
-        for regext,slug in name_map.items():
-            if re.fullmatch(regext, doc_url.desc):
-                match_found = True
-                stats['mapped'] += 1
-                name = ExtResourceName.objects.get(slug=slug)
-                try:
-                    validate_external_resource_value(name, doc_url.url)
-                    DocExtResource.objects.create(doc=doc_url.doc, name_id=slug, value=doc_url.url, display_name=doc_url.desc)
-                except ValidationError as e: # pyflakes:ignore
-                    print("Failed validation:", doc_url.url, e, file=stats_file)
-                    stats['failed_validation'] +=1
-                break
-        if not match_found:
-            for regext, slug in url_map.items():
-                if re.search(regext, doc_url.url):
-                    match_found = True
-                    if slug:
-                        stats['mapped'] +=1
-                        name = ExtResourceName.objects.get(slug=slug)
-                        # Munge the URL if it's the first github repo match
-                        #  Remove "/tree/master" substring if it exists
-                        #  Remove trailing "/issues" substring if it exists
-                        #  Remove "/blob/master/.*" pattern if present
-                        if regext == "https?://github\\.com":
-                            doc_url.url = doc_url.url.replace("/tree/master","")
-                            doc_url.url = re.sub('/issues$', '', doc_url.url)
-                            doc_url.url = re.sub('/blob/master.*$', '', doc_url.url)
-                        try:
-                            validate_external_resource_value(name, doc_url.url)
-                            DocExtResource.objects.create(doc=doc_url.doc, name=name, value=doc_url.url, display_name=doc_url.desc) 
-                        except ValidationError as e: # pyflakes:ignore
-                            print("Failed validation:", doc_url.url, e, file=stats_file)
-                            stats['failed_validation'] +=1
-                    else:
-                        stats['ignored'] +=1
-                    break
-        if not match_found:
-            print("Not Mapped:", doc_url.desc, doc_url.tag.slug, doc_url.doc.name, doc_url.url, file=stats_file)
-            stats['not_mapped'] += 1
-    print('')
-    print(stats_file.getvalue())
-    print (stats)
-
-def reverse(apps, schema_editor):
-    DocExtResource = apps.get_model('doc', 'DocExtResource')
-    DocExtResource.objects.all().delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0034_extres'),
-        ('name', '0015_populate_extres'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/doc/migrations/0036_orgs_vs_repos.py b/ietf/doc/migrations/0036_orgs_vs_repos.py
deleted file mode 100644
index 37a0db0d26..0000000000
--- a/ietf/doc/migrations/0036_orgs_vs_repos.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-
-from urllib.parse import urlparse
-from django.db import migrations
-
-def categorize(url):
-    # This will categorize a few urls pointing into files in a repo as a repo, but that's better than calling them an org
-    element_count = len(urlparse(url).path.strip('/').split('/'))
-    if element_count < 1:
-        print("Bad github resource:",url)
-    return 'github_org' if element_count == 1 else 'github_repo' 
-
-def forward(apps, schema_editor):
-    DocExtResource = apps.get_model('doc','DocExtResource')
-
-    for resource in DocExtResource.objects.filter(name__slug__in=('github_org','github_repo')):
-        category = categorize(resource.value)
-        if resource.name_id != category:
-            resource.name_id = category
-            resource.save()
-
-def reverse(apps, schema_editor):
-    # Intentionally don't try to return to former worse state
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0035_populate_docextresources'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/doc/migrations/0037_clean_up_missing_docaliases.py b/ietf/doc/migrations/0037_clean_up_missing_docaliases.py
deleted file mode 100644
index 6ce350c3f8..0000000000
--- a/ietf/doc/migrations/0037_clean_up_missing_docaliases.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-22 07:58
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    Document = apps.get_model('doc', 'Document')
-    DocAlias = apps.get_model('doc', 'DocAlias')
-
-    docs_without_alias = Document.objects.filter(docalias__isnull=True)
-
-    bad_aliases = DocAlias.objects.filter(name__in=docs_without_alias.values_list('name'))
-    bad_aliases.delete()
-
-    for doc in docs_without_alias:
-        DocAlias.objects.create(name=doc.name).docs.add(doc)
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0036_orgs_vs_repos'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/doc/migrations/0038_auto_20201109_0429.py b/ietf/doc/migrations/0038_auto_20201109_0429.py
deleted file mode 100644
index 1335032b28..0000000000
--- a/ietf/doc/migrations/0038_auto_20201109_0429.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0037_clean_up_missing_docaliases'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='docevent',
-            index=models.Index(fields=['-time', '-id'], name='doc_doceven_time_1a258f_idx'),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0039_auto_20201109_0439.py b/ietf/doc/migrations/0039_auto_20201109_0439.py
deleted file mode 100644
index e6e3364568..0000000000
--- a/ietf/doc/migrations/0039_auto_20201109_0439.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0038_auto_20201109_0429'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='dochistoryauthor',
-            index=models.Index(fields=['document', 'order'], name='doc_dochist_documen_7e2441_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='documentauthor',
-            index=models.Index(fields=['document', 'order'], name='doc_documen_documen_7fabe2_idx'),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0040_add_changed_action_holders_docevent_type.py b/ietf/doc/migrations/0040_add_changed_action_holders_docevent_type.py
deleted file mode 100644
index 3aa1278712..0000000000
--- a/ietf/doc/migrations/0040_add_changed_action_holders_docevent_type.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.17 on 2021-01-15 12:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0040_lengthen_used_roles_fields'),  # only needed for schema vs data ordering
-        ('doc', '0039_auto_20201109_0439'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='docevent',
-            name='type',
-            field=models.CharField(choices=[('new_revision', 'Added new revision'), ('new_submission', 'Uploaded new revision'), ('changed_document', 'Changed document metadata'), ('added_comment', 'Added comment'), ('added_message', 'Added message'), ('edited_authors', 'Edited the documents author list'), ('deleted', 'Deleted document'), ('changed_state', 'Changed state'), ('changed_stream', 'Changed document stream'), ('expired_document', 'Expired document'), ('extended_expiry', 'Extended expiry of document'), ('requested_resurrect', 'Requested resurrect'), ('completed_resurrect', 'Completed resurrect'), ('changed_consensus', 'Changed consensus'), ('published_rfc', 'Published RFC'), ('added_suggested_replaces', 'Added suggested replacement relationships'), ('reviewed_suggested_replaces', 'Reviewed suggested replacement relationships'), ('changed_action_holders', 'Changed action holders for document'), ('changed_group', 'Changed group'), ('changed_protocol_writeup', 'Changed protocol writeup'), ('changed_charter_milestone', 'Changed charter milestone'), ('initial_review', 'Set initial review time'), ('changed_review_announcement', 'Changed WG Review text'), ('changed_action_announcement', 'Changed WG Action text'), ('started_iesg_process', 'Started IESG process on document'), ('created_ballot', 'Created ballot'), ('closed_ballot', 'Closed ballot'), ('sent_ballot_announcement', 'Sent ballot announcement'), ('changed_ballot_position', 'Changed ballot position'), ('changed_ballot_approval_text', 'Changed ballot approval text'), ('changed_ballot_writeup_text', 'Changed ballot writeup text'), ('changed_rfc_editor_note_text', 'Changed RFC Editor Note text'), ('changed_last_call_text', 'Changed last call text'), ('requested_last_call', 'Requested last call'), ('sent_last_call', 'Sent last call'), ('scheduled_for_telechat', 'Scheduled for telechat'), ('iesg_approved', 'IESG approved document (no problem)'), ('iesg_disapproved', 'IESG disapproved document (do not publish)'), ('approved_in_minute', 'Approved in minute'), ('iana_review', 'IANA review comment'), ('rfc_in_iana_registry', 'RFC is in IANA registry'), ('rfc_editor_received_announcement', 'Announcement was received by RFC Editor'), ('requested_publication', 'Publication at RFC Editor requested'), ('sync_from_rfc_editor', 'Received updated information from RFC Editor'), ('requested_review', 'Requested review'), ('assigned_review_request', 'Assigned review request'), ('closed_review_request', 'Closed review request'), ('closed_review_assignment', 'Closed review assignment'), ('downref_approved', 'Downref approved'), ('posted_related_ipr', 'Posted related IPR'), ('removed_related_ipr', 'Removed related IPR')], max_length=50),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0041_add_documentactionholder.py b/ietf/doc/migrations/0041_add_documentactionholder.py
deleted file mode 100644
index 3832a5603f..0000000000
--- a/ietf/doc/migrations/0041_add_documentactionholder.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated by Django 2.2.17 on 2021-01-15 12:50
-
-import datetime
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0018_auto_20201109_0439'),
-        ('doc', '0040_add_changed_action_holders_docevent_type'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DocumentActionHolder',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time_added', models.DateTimeField(default=datetime.datetime.now)),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='action_holders',
-            field=models.ManyToManyField(blank=True, through='doc.DocumentActionHolder', to='person.Person'),
-        ),
-        migrations.AddConstraint(
-            model_name='documentactionholder',
-            constraint=models.UniqueConstraint(fields=('document', 'person'), name='unique_action_holder'),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0042_bofreq_states.py b/ietf/doc/migrations/0042_bofreq_states.py
deleted file mode 100644
index 95119f8147..0000000000
--- a/ietf/doc/migrations/0042_bofreq_states.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.23 on 2021-05-21 13:29
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    StateType = apps.get_model('doc', 'StateType')
-    State = apps.get_model('doc', 'State')
-
-    StateType.objects.create(slug='bofreq', label='BOF Request State')
-    proposed = State.objects.create(type_id='bofreq', slug='proposed', name='Proposed', used=True, desc='The BOF request is proposed', order=0)
-    approved = State.objects.create(type_id='bofreq', slug='approved', name='Approved', used=True, desc='The BOF request is approved', order=1)
-    declined = State.objects.create(type_id='bofreq', slug='declined', name='Declined', used=True, desc='The BOF request is declined', order=2)
-    replaced = State.objects.create(type_id='bofreq', slug='replaced', name='Replaced', used=True, desc='The BOF request is proposed', order=3)
-    abandoned = State.objects.create(type_id='bofreq', slug='abandoned', name='Abandoned', used=True, desc='The BOF request is abandoned', order=4)
-
-    proposed.next_states.set([approved,declined,replaced,abandoned])
-
-def reverse(apps, schema_editor):
-    StateType = apps.get_model('doc', 'StateType')
-    State = apps.get_model('doc', 'State')
-    State.objects.filter(type_id='bofreq').delete()
-    StateType.objects.filter(slug='bofreq').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0041_add_documentactionholder'),
-        ('name', '0027_add_bofrequest'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/doc/migrations/0043_bofreq_docevents.py b/ietf/doc/migrations/0043_bofreq_docevents.py
deleted file mode 100644
index 7a300426b3..0000000000
--- a/ietf/doc/migrations/0043_bofreq_docevents.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Generated by Django 2.2.24 on 2021-07-06 13:34
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0019_auto_20210604_1443'),
-        ('doc', '0042_bofreq_states'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='docevent',
-            name='type',
-            field=models.CharField(choices=[('new_revision', 'Added new revision'), ('new_submission', 'Uploaded new revision'), ('changed_document', 'Changed document metadata'), ('added_comment', 'Added comment'), ('added_message', 'Added message'), ('edited_authors', 'Edited the documents author list'), ('deleted', 'Deleted document'), ('changed_state', 'Changed state'), ('changed_stream', 'Changed document stream'), ('expired_document', 'Expired document'), ('extended_expiry', 'Extended expiry of document'), ('requested_resurrect', 'Requested resurrect'), ('completed_resurrect', 'Completed resurrect'), ('changed_consensus', 'Changed consensus'), ('published_rfc', 'Published RFC'), ('added_suggested_replaces', 'Added suggested replacement relationships'), ('reviewed_suggested_replaces', 'Reviewed suggested replacement relationships'), ('changed_action_holders', 'Changed action holders for document'), ('changed_group', 'Changed group'), ('changed_protocol_writeup', 'Changed protocol writeup'), ('changed_charter_milestone', 'Changed charter milestone'), ('initial_review', 'Set initial review time'), ('changed_review_announcement', 'Changed WG Review text'), ('changed_action_announcement', 'Changed WG Action text'), ('started_iesg_process', 'Started IESG process on document'), ('created_ballot', 'Created ballot'), ('closed_ballot', 'Closed ballot'), ('sent_ballot_announcement', 'Sent ballot announcement'), ('changed_ballot_position', 'Changed ballot position'), ('changed_ballot_approval_text', 'Changed ballot approval text'), ('changed_ballot_writeup_text', 'Changed ballot writeup text'), ('changed_rfc_editor_note_text', 'Changed RFC Editor Note text'), ('changed_last_call_text', 'Changed last call text'), ('requested_last_call', 'Requested last call'), ('sent_last_call', 'Sent last call'), ('scheduled_for_telechat', 'Scheduled for telechat'), ('iesg_approved', 'IESG approved document (no problem)'), ('iesg_disapproved', 'IESG disapproved document (do not publish)'), ('approved_in_minute', 'Approved in minute'), ('iana_review', 'IANA review comment'), ('rfc_in_iana_registry', 'RFC is in IANA registry'), ('rfc_editor_received_announcement', 'Announcement was received by RFC Editor'), ('requested_publication', 'Publication at RFC Editor requested'), ('sync_from_rfc_editor', 'Received updated information from RFC Editor'), ('requested_review', 'Requested review'), ('assigned_review_request', 'Assigned review request'), ('closed_review_request', 'Closed review request'), ('closed_review_assignment', 'Closed review assignment'), ('downref_approved', 'Downref approved'), ('posted_related_ipr', 'Posted related IPR'), ('removed_related_ipr', 'Removed related IPR'), ('changed_editors', 'Changed BOF Request editors')], max_length=50),
-        ),
-        migrations.CreateModel(
-            name='BofreqResponsibleDocEvent',
-            fields=[
-                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
-                ('responsible', models.ManyToManyField(blank=True, to='person.Person')),
-            ],
-            bases=('doc.docevent',),
-        ),
-        migrations.CreateModel(
-            name='BofreqEditorDocEvent',
-            fields=[
-                ('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
-                ('editors', models.ManyToManyField(blank=True, to='person.Person')),
-            ],
-            bases=('doc.docevent',),
-        ),
-    ]
diff --git a/ietf/doc/migrations/0044_procmaterials_states.py b/ietf/doc/migrations/0044_procmaterials_states.py
deleted file mode 100644
index 2892935881..0000000000
--- a/ietf/doc/migrations/0044_procmaterials_states.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.23 on 2021-05-21 13:29
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    StateType = apps.get_model('doc', 'StateType')
-    State = apps.get_model('doc', 'State')
-
-    StateType.objects.create(slug='procmaterials', label='Proceedings Materials State')
-    active = State.objects.create(type_id='procmaterials', slug='active', name='Active', used=True, desc='The material is active', order=0)
-    removed = State.objects.create(type_id='procmaterials', slug='removed', name='Removed', used=True, desc='The material is removed', order=1)
-
-    active.next_states.set([removed])
-    removed.next_states.set([active])
-
-def reverse(apps, schema_editor):
-    StateType = apps.get_model('doc', 'StateType')
-    State = apps.get_model('doc', 'State')
-    State.objects.filter(type_id='procmaterials').delete()
-    StateType.objects.filter(slug='procmaterials').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0043_bofreq_docevents'),
-        ('name', '0031_add_procmaterials'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/doc/migrations/0045_docstates_chatlogs_polls.py b/ietf/doc/migrations/0045_docstates_chatlogs_polls.py
deleted file mode 100644
index 044cc60de4..0000000000
--- a/ietf/doc/migrations/0045_docstates_chatlogs_polls.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    StateType = apps.get_model("doc", "StateType")
-    State = apps.get_model("doc", "State")
-    for slug in ("chatlog", "polls"):     
-        StateType.objects.create(slug=slug, label="State")
-        for state_slug in ("active", "deleted"):
-            State.objects.create(
-                type_id = slug,
-                slug = state_slug,
-                name = state_slug.capitalize(),
-                used = True,
-                desc = "",
-                order = 0,
-            )
-
-def reverse(apps, schema_editor):
-    StateType = apps.get_model("doc", "StateType")
-    State = apps.get_model("doc", "State")
-    State.objects.filter(type_id__in=("chatlog", "polls")).delete()
-    StateType.objects.filter(slug__in=("chatlog", "polls")).delete()  
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0044_procmaterials_states'),
-        ('name', '0045_polls_and_chatlogs'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index 6512d4b54e..cc79b73831 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -1,40 +1,62 @@
-# Copyright The IETF Trust 2010-2020, All Rights Reserved
+# Copyright The IETF Trust 2010-2026, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
+from collections import namedtuple
 import datetime
 import logging
-import io
 import os
+
+import django.db
 import rfc2html
 
-from typing import Optional, TYPE_CHECKING
+from io import BufferedReader
+from pathlib import Path
+
+from django.core.exceptions import ValidationError
+from django.db.models import Q
+from lxml import etree
+from typing import Optional, Protocol, TYPE_CHECKING, Union
 from weasyprint import HTML as wpHTML
+from weasyprint.text.fonts import FontConfiguration
 
 from django.db import models
 from django.core import checks
+from django.core.files.base import File
 from django.core.cache import caches
-from django.core.validators import URLValidator, RegexValidator
+from django.core.validators import (
+    URLValidator,
+    RegexValidator,
+    ProhibitNullCharactersValidator,
+)
 from django.urls import reverse as urlreverse
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
-from django.utils.encoding import force_text
+from django.utils import timezone
+from django.utils.encoding import force_str
 from django.utils.html import mark_safe # type:ignore
+from django.contrib.staticfiles import finders
 
 import debug                            # pyflakes:ignore
 
 from ietf.group.models import Group
+from ietf.doc.storage_utils import (
+    store_str as utils_store_str,
+    store_bytes as utils_store_bytes,
+    store_file as utils_store_file
+)
 from ietf.name.models import ( DocTypeName, DocTagName, StreamName, IntendedStdLevelName, StdLevelName,
     DocRelationshipName, DocReminderTypeName, BallotPositionName, ReviewRequestStateName, ReviewAssignmentStateName, FormalLanguageName,
     DocUrlTagName, ExtResourceName)
 from ietf.person.models import Email, Person
 from ietf.person.utils import get_active_balloters
 from ietf.utils import log
-from ietf.utils.admin import admin_link
 from ietf.utils.decorators import memoize
+from ietf.utils.text import decode_document_content
 from ietf.utils.validators import validate_no_control_chars
 from ietf.utils.mail import formataddr
 from ietf.utils.models import ForeignKey
+from ietf.utils.timezone import date_today, RPC_TZINFO, DEADLINE_TZINFO
 if TYPE_CHECKING:
     # importing other than for type checking causes errors due to cyclic imports
     from ietf.meeting.models import ProceedingsMaterial, Session
@@ -51,16 +73,22 @@ def __str__(self):
 @checks.register('db-consistency')
 def check_statetype_slugs(app_configs, **kwargs):
     errors = []
-    state_type_slugs = [ t.slug for t in StateType.objects.all() ]
-    for type in DocTypeName.objects.all():
-        if not type.slug in state_type_slugs:
-            errors.append(checks.Error(
-                "The document type '%s (%s)' does not have a corresponding entry in the doc.StateType table" % (type.name, type.slug),
-                hint="You should add a doc.StateType entry with a slug '%s' to match the DocTypeName slug."%(type.slug),
-                obj=type,
-                id='datatracker.doc.E0015',
-            ))
-    return errors
+    try:
+        state_type_slugs = [ t.slug for t in StateType.objects.all() ]
+    except django.db.ProgrammingError:
+        # When running initial migrations on an empty DB, attempting to retrieve StateType will raise a
+        # ProgrammingError. Until Django 3, there is no option to skip the checks.
+        return []
+    else:
+        for type in DocTypeName.objects.all():
+            if not type.slug in state_type_slugs:
+                errors.append(checks.Error(
+                    "The document type '%s (%s)' does not have a corresponding entry in the doc.StateType table" % (type.name, type.slug),
+                    hint="You should add a doc.StateType entry with a slug '%s' to match the DocTypeName slug."%(type.slug),
+                    obj=type,
+                    id='datatracker.doc.E0015',
+                ))
+        return errors
 
 class State(models.Model):
     type = ForeignKey(StateType)
@@ -70,7 +98,7 @@ class State(models.Model):
     desc = models.TextField(blank=True)
     order = models.IntegerField(default=0)
 
-    next_states = models.ManyToManyField('State', related_name="previous_states", blank=True)
+    next_states = models.ManyToManyField('doc.State', related_name="previous_states", blank=True)
 
     def __str__(self):
         return self.name
@@ -83,16 +111,31 @@ class Meta:
 IESG_STATCHG_CONFLREV_ACTIVE_STATES = ("iesgeval", "defer")
 IESG_SUBSTATE_TAGS = ('ad-f-up', 'need-rev', 'extpty')
 
+
+def validate_doc_keywords(value):
+    if (
+        not isinstance(value, list | tuple | set) 
+        or not all(isinstance(elt, str) for elt in value)
+    ):
+        raise ValidationError("Value must be an array of strings")
+
+
 class DocumentInfo(models.Model):
     """Any kind of document.  Draft, RFC, Charter, IPR Statement, Liaison Statement"""
-    time = models.DateTimeField(default=datetime.datetime.now) # should probably have auto_now=True
+    time = models.DateTimeField(default=timezone.now) # should probably have auto_now=True
 
     type = ForeignKey(DocTypeName, blank=True, null=True) # Draft, Agenda, Minutes, Charter, Discuss, Guideline, Email, Review, Issue, Wiki, External ...
-    title = models.CharField(max_length=255, validators=[validate_no_control_chars, ])
+    title = models.CharField(
+        max_length=255,
+        validators=[
+            ProhibitNullCharactersValidator(),
+            validate_no_control_chars,
+        ],
+    )
 
     states = models.ManyToManyField(State, blank=True) # plain state (Active/Expired/...), IESG state, stream state
     tags = models.ManyToManyField(DocTagName, blank=True) # Revised ID Needed, ExternalParty, AD Followup, ...
-    stream = ForeignKey(StreamName, blank=True, null=True) # IETF, IAB, IRTF, Independent Submission
+    stream = ForeignKey(StreamName, blank=True, null=True) # IETF, IAB, IRTF, Independent Submission, Editorial
     group = ForeignKey(Group, blank=True, null=True) # WG, RG, IAB, IESG, Edu, Tools
 
     abstract = models.TextField(blank=True)
@@ -100,17 +143,27 @@ class DocumentInfo(models.Model):
     pages = models.IntegerField(blank=True, null=True)
     words = models.IntegerField(blank=True, null=True)
     formal_languages = models.ManyToManyField(FormalLanguageName, blank=True, help_text="Formal languages used in document")
-    order = models.IntegerField(default=1, blank=True) # This is probably obviated by SessionPresentaion.order
     intended_std_level = ForeignKey(IntendedStdLevelName, verbose_name="Intended standardization level", blank=True, null=True)
     std_level = ForeignKey(StdLevelName, verbose_name="Standardization level", blank=True, null=True)
     ad = ForeignKey(Person, verbose_name="area director", related_name='ad_%(class)s_set', blank=True, null=True)
     shepherd = ForeignKey(Email, related_name='shepherd_%(class)s_set', blank=True, null=True)
     expires = models.DateTimeField(blank=True, null=True)
-    notify = models.CharField(max_length=255, blank=True)
+    notify = models.TextField(max_length=1023, blank=True)
     external_url = models.URLField(blank=True)
     uploaded_filename = models.TextField(blank=True)
     note = models.TextField(blank=True)
-    internal_comments = models.TextField(blank=True)
+    rfc_number = models.PositiveIntegerField(blank=True, null=True)  # only valid for type="rfc"
+    keywords = models.JSONField(
+        default=list,
+        max_length=1000,
+        validators=[validate_doc_keywords],
+    )
+
+    @property
+    def doi(self) -> str | None:
+        if self.type_id == "rfc" and self.rfc_number is not None:
+            return f"{settings.IETF_DOI_PREFIX}/RFC{self.rfc_number:04d}"
+        return None
 
     def file_extension(self):
         if not hasattr(self, '_cached_extension'):
@@ -123,20 +176,20 @@ def file_extension(self):
 
     def get_file_path(self):
         if not hasattr(self, '_cached_file_path'):
-            if self.type_id == "draft":
+            if self.type_id == "rfc":
+                self._cached_file_path = settings.RFC_PATH
+            elif self.type_id == "draft":
                 if self.is_dochistory():
                     self._cached_file_path = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
                 else:
-                    if self.get_state_slug() == "rfc":
-                        self._cached_file_path = settings.RFC_PATH
+                    # This could be simplified since anything in INTERNET_DRAFT_PATH is also already in INTERNET_ALL_DRAFTS_ARCHIVE_DIR
+                    draft_state = self.get_state('draft')
+                    if draft_state and draft_state.slug == 'active':
+                        self._cached_file_path = settings.INTERNET_DRAFT_PATH
                     else:
-                        draft_state = self.get_state('draft')
-                        if draft_state and draft_state.slug == 'active':
-                            self._cached_file_path = settings.INTERNET_DRAFT_PATH
-                        else:
-                            self._cached_file_path = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
+                        self._cached_file_path = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
             elif self.meeting_related() and self.type_id in (
-                    "agenda", "minutes", "slides", "bluesheets", "procmaterials", "chatlog", "polls"
+                    "agenda", "minutes", "narrativeminutes", "slides", "bluesheets", "procmaterials", "chatlog", "polls"
             ):
                 meeting = self.get_related_meeting()
                 if meeting is not None:
@@ -149,7 +202,7 @@ def get_file_path(self):
                 self._cached_file_path = settings.CONFLICT_REVIEW_PATH
             elif self.type_id == "statchg":
                 self._cached_file_path = settings.STATUS_CHANGE_PATH
-            elif self.type_id == "bofreq":
+            elif self.type_id == "bofreq": # TODO: This is probably unneeded, as is the separate path setting
                 self._cached_file_path = settings.BOFREQ_PATH
             else:
                 self._cached_file_path = settings.DOCUMENT_PATH_PATTERN.format(doc=self)
@@ -159,27 +212,26 @@ def get_base_name(self):
         if not hasattr(self, '_cached_base_name'):
             if self.uploaded_filename:
                 self._cached_base_name = self.uploaded_filename
+            elif self.type_id == 'rfc':
+                self._cached_base_name = "%s.txt" % self.name  
             elif self.type_id == 'draft':
                 if self.is_dochistory():
                     self._cached_base_name = "%s-%s.txt" % (self.doc.name, self.rev)
                 else:
-                    if self.get_state_slug() == 'rfc':
-                        self._cached_base_name = "%s.txt" % self.canonical_name()
-                    else:
-                        self._cached_base_name = "%s-%s.txt" % (self.name, self.rev)
+                    self._cached_base_name = "%s-%s.txt" % (self.name, self.rev)
             elif self.type_id in ["slides", "agenda", "minutes", "bluesheets", "procmaterials", ] and self.meeting_related():
                 ext = 'pdf' if self.type_id == 'procmaterials' else 'txt'
-                self._cached_base_name = f'{self.canonical_name()}-{self.rev}.{ext}'
+                self._cached_base_name = f'{self.name}-{self.rev}.{ext}'
             elif self.type_id == 'review':
                 # TODO: This will be wrong if a review is updated on the same day it was created (or updated more than once on the same day)
                 self._cached_base_name = "%s.txt" % self.name
-            elif self.type_id == 'bofreq':
+            elif self.type_id in ['bofreq', 'statement']:
                 self._cached_base_name = "%s-%s.md" % (self.name, self.rev)
             else:
                 if self.rev:
-                    self._cached_base_name = "%s-%s.txt" % (self.canonical_name(), self.rev)
+                    self._cached_base_name = "%s-%s.txt" % (self.name, self.rev)
                 else:
-                    self._cached_base_name = "%s.txt" % (self.canonical_name(), )
+                    self._cached_base_name = "%s.txt" % (self.name, )
         return self._cached_base_name
 
     def get_file_name(self):
@@ -187,41 +239,56 @@ def get_file_name(self):
             self._cached_file_name = os.path.join(self.get_file_path(), self.get_base_name())
         return self._cached_file_name
 
-    def revisions(self):
+
+    def revisions_by_dochistory(self):
         revisions = []
-        doc = self.doc if isinstance(self, DocHistory) else self
-        for e in doc.docevent_set.filter(type='new_revision').distinct():
-            if e.rev and not e.rev in revisions:
-                revisions.append(e.rev)
-        if not doc.rev in revisions:
-            revisions.append(doc.rev)
-        revisions.sort()
+        if self.type_id != "rfc":
+            for h in self.history_set.order_by("time", "id"):
+                if h.rev and not h.rev in revisions:
+                    revisions.append(h.rev)
+            if not self.rev in revisions:
+                revisions.append(self.rev)
         return revisions
 
+    def revisions_by_newrevisionevent(self):
+        revisions = []
+        if self.type_id != "rfc":
+            doc = self.doc if isinstance(self, DocHistory) else self
+            for e in doc.docevent_set.filter(type='new_revision').distinct():
+                if e.rev and not e.rev in revisions:
+                    revisions.append(e.rev)
+            if not doc.rev in revisions:
+                revisions.append(doc.rev)
+            revisions.sort()
+        return revisions
 
     def get_href(self, meeting=None):
-        return self._get_ref(meeting=meeting,meeting_doc_refs=settings.MEETING_DOC_HREFS)
+        return self._get_ref(meeting=meeting, versioned=True)
 
 
     def get_versionless_href(self, meeting=None):
-        return self._get_ref(meeting=meeting,meeting_doc_refs=settings.MEETING_DOC_GREFS)
+        return self._get_ref(meeting=meeting, versioned=False)
 
 
-    def _get_ref(self, meeting=None, meeting_doc_refs=settings.MEETING_DOC_HREFS):
+    def _get_ref(self, meeting=None, versioned=True):
         """
         Returns an url to the document text.  This differs from .get_absolute_url(),
         which returns an url to the datatracker page for the document.   
         """
         # If self.external_url truly is an url, use it.  This is a change from
-        # the earlier resulution order, but there's at the moment one single
+        # the earlier resolution order, but there's at the moment one single
         # instance which matches this (with correct results), so we won't
         # break things all over the place.
-        if not hasattr(self, '_cached_href'):
+        cache_attr = "_cached_href" if versioned else "_cached_versionless_href"
+        if not hasattr(self, cache_attr):
             validator = URLValidator()
             if self.external_url and self.external_url.split(':')[0] in validator.schemes:
                 validator(self.external_url)
                 return self.external_url
 
+            meeting_doc_refs = (
+                settings.MEETING_DOC_HREFS if versioned else settings.MEETING_DOC_GREFS
+            )
             if self.type_id in settings.DOC_HREFS and self.type_id in meeting_doc_refs:
                 if self.meeting_related():
                     self.is_meeting_related = True
@@ -231,7 +298,7 @@ def _get_ref(self, meeting=None, meeting_doc_refs=settings.MEETING_DOC_HREFS):
                     format = settings.DOC_HREFS[self.type_id]
             elif self.type_id in settings.DOC_HREFS:
                 self.is_meeting_related = False
-                if self.is_rfc():
+                if self.type_id == "rfc":
                     format = settings.DOC_HREFS['rfc']
                 else:
                     format = settings.DOC_HREFS[self.type_id]
@@ -258,10 +325,23 @@ def _get_ref(self, meeting=None, meeting_doc_refs=settings.MEETING_DOC_HREFS):
                 info = dict(doc=self)
 
             href = format.format(**info)
+
+            # For slides that are not meeting-related, we need to know the file extension.
+            # Assume we have access to the same files as settings.DOC_HREFS["slides"] and
+            # see what extension is available
+            if  self.type_id == "slides" and not self.meeting_related() and not href.endswith("/"):
+                filepath = Path(self.get_file_path()) / self.get_base_name()  # start with this
+                if not filepath.exists():
+                    # Look for other extensions - grab the first one, sorted for stability
+                    for existing in sorted(filepath.parent.glob(f"{filepath.stem}.*")):
+                        filepath = filepath.with_suffix(existing.suffix)
+                        break
+                href += filepath.suffix  # tack on the extension
+
             if href.startswith('/'):
                 href = settings.IDTRACKER_BASE_URL + href
-            self._cached_href = href
-        return self._cached_href
+            setattr(self, cache_attr, href)
+        return getattr(self, cache_attr)
 
     def set_state(self, state):
         """Switch state type implicit in state to state. This just
@@ -321,7 +401,9 @@ def friendly_state(self):
         if not state:
             return "Unknown state"
     
-        if self.type_id == 'draft':
+        if self.type_id == "rfc":
+            return f"RFC {self.rfc_number} ({self.std_level})"
+        elif self.type_id == 'draft':
             iesg_state = self.get_state("draft-iesg")
             iesg_state_summary = None
             if iesg_state:
@@ -330,13 +412,15 @@ def friendly_state(self):
                 iesg_state_summary = iesg_state.name
                 if iesg_substate:
                      iesg_state_summary = iesg_state_summary + "::"+"::".join(tag.name for tag in iesg_substate)
-             
-            if state.slug == "rfc":
-                return "RFC %s (%s)" % (self.rfc_number(), self.std_level)
+
+            rfc = self.became_rfc()
+            if rfc:
+                return f"Became RFC {rfc.rfc_number} ({rfc.std_level})"
+
             elif state.slug == "repl":
                 rs = self.related_that("replaces")
                 if rs:
-                    return mark_safe("Replaced by " + ", ".join("<a href=\"%s\">%s</a>" % (urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=alias.document.name)), alias.document) for alias in rs))
+                    return mark_safe("Replaced by " + ", ".join("<a href=\"%s\">%s</a>" % (urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=related.name)), related) for related in rs))
                 else:
                     return "Replaced"
             elif state.slug == "active":
@@ -349,7 +433,7 @@ def friendly_state(self):
                     elif iesg_state.slug == "lc":
                         e = self.latest_event(LastCallDocEvent, type="sent_last_call")
                         if e:
-                            return iesg_state_summary + " (ends %s)" % e.expires.date().isoformat()
+                            return iesg_state_summary + " (ends %s)" % e.expires.astimezone(DEADLINE_TZINFO).date().isoformat()
     
                     return iesg_state_summary
                 else:
@@ -362,30 +446,56 @@ def friendly_state(self):
         else:
             return state.name
 
-    def is_rfc(self):
-        if not hasattr(self, '_cached_is_rfc'):
-            self._cached_is_rfc = self.pk and self.type_id == 'draft' and self.states.filter(type='draft',slug='rfc').exists()
-        return self._cached_is_rfc
-
-    def rfc_number(self):
-        if not hasattr(self, '_cached_rfc_number'):
-            self._cached_rfc_number = None
-            if self.is_rfc():
-                n = self.canonical_name()
-                if n.startswith("rfc"):
-                    self._cached_rfc_number = n[3:]
+    def author_names(self):
+        """Author names as a list of strings"""
+        names = []
+        if self.type_id == "rfc" and self.rfcauthor_set.exists():
+            for author in self.rfcauthor_set.select_related("person"):
+                if author.person:
+                    names.append(author.person.name)
                 else:
-                    if isinstance(self,Document):
-                        logger.error("Document self.is_rfc() is True but self.canonical_name() is %s" % n)
-        return self._cached_rfc_number
+                    # titlepage_name cannot be blank
+                    names.append(author.titlepage_name)
+        else:
+            names = [
+                author.person.name
+                for author in self.documentauthor_set.select_related("person")
+            ]
+        return names
+
+    def author_persons_or_names(self):
+        """Authors as a list of named tuples with person and/or titlepage_name"""
+        Author = namedtuple("Author", "person titlepage_name")
+        persons_or_names = []
+        if self.type_id=="rfc" and self.rfcauthor_set.exists():
+            for author in self.rfcauthor_set.select_related("person"):
+                persons_or_names.append(Author(person=author.person, titlepage_name=author.titlepage_name))
+        else:
+            for author in self.documentauthor_set.select_related("person"):
+                persons_or_names.append(Author(person=author.person, titlepage_name=""))
+        return persons_or_names
 
-    @property
-    def rfcnum(self):
-        return self.rfc_number()
+    def author_persons(self):
+        """Authors as a list of Persons
+        
+        Omits any RfcAuthors with a null person field.
+        """
+        if self.type_id == "rfc" and self.rfcauthor_set.exists():
+            authors_qs = self.rfcauthor_set.filter(person__isnull=False)
+        else:
+            authors_qs = self.documentauthor_set.all()
+        return [a.person for a in authors_qs.select_related("person")]
 
     def author_list(self):
+        """List of author emails"""
+        if self.type_id == "rfc" and self.rfcauthor_set.exists():
+            author_qs = self.rfcauthor_set.select_related("person").order_by("order")
+        else:
+            author_qs = self.documentauthor_set.select_related("email").order_by(
+                "order"
+            )
         best_addresses = []
-        for author in self.documentauthor_set.all():
+        for author in author_qs:
             if author.email:
                 if author.email.active or not author.email.person:
                     best_addresses.append(author.email.address)
@@ -393,9 +503,6 @@ def author_list(self):
                     best_addresses.append(author.email.person.email_address())
         return ", ".join(best_addresses)
 
-    def authors(self):
-        return [ a.person for a in self.documentauthor_set.all() ]
-
     # This, and several other ballot related functions here, assume that there is only one active ballot for a document at any point in time.
     # If that assumption is violated, they will only expose the most recently created ballot
     def ballot_open(self, ballot_type_slug):
@@ -420,7 +527,7 @@ def has_rfc_editor_note(self):
         return e != None and (e.text != "")
 
     def meeting_related(self):
-        if self.type_id in ("agenda","minutes","bluesheets","slides","recording","procmaterials","chatlog","polls"):
+        if self.type_id in ("agenda","minutes", "narrativeminutes", "bluesheets","slides","recording","procmaterials","chatlog","polls"):
              return self.type_id != "slides" or self.get_state_slug('reuse_policy')=='single'
         return False
 
@@ -455,9 +562,9 @@ def relations_that(self, relationship):
         if not isinstance(relationship, tuple):
             raise TypeError("Expected a string or tuple, received %s" % type(relationship))
         if isinstance(self, Document):
-            return RelatedDocument.objects.filter(target__docs=self, relationship__in=relationship).select_related('source')
+            return RelatedDocument.objects.filter(target=self, relationship__in=relationship).select_related('source')
         elif isinstance(self, DocHistory):
-            return RelatedDocHistory.objects.filter(target__docs=self.doc, relationship__in=relationship).select_related('source')
+            return RelatedDocHistory.objects.filter(target=self.doc, relationship__in=relationship).select_related('source')
         else:
             raise TypeError("Expected method called on Document or DocHistory")
 
@@ -491,15 +598,14 @@ def all_relations_that_doc(self, relationship, related=None):
         for r in rels:
             if not r in related:
                 related += ( r, )
-                for doc in r.target.docs.all():
-                    related = doc.all_relations_that_doc(relationship, related)
+                related = r.target.all_relations_that_doc(relationship, related)
         return related
 
     def related_that(self, relationship):
-        return list(set([x.source.docalias.get(name=x.source.name) for x in self.relations_that(relationship)]))
+        return list(set([x.source for x in self.relations_that(relationship)]))
 
     def all_related_that(self, relationship, related=None):
-        return list(set([x.source.docalias.get(name=x.source.name) for x in self.all_relations_that(relationship)]))
+        return list(set([x.source for x in self.all_relations_that(relationship)]))
 
     def related_that_doc(self, relationship):
         return list(set([x.target for x in self.relations_that_doc(relationship)]))
@@ -508,37 +614,81 @@ def all_related_that_doc(self, relationship, related=None):
         return list(set([x.target for x in self.all_relations_that_doc(relationship)]))
 
     def replaces(self):
-        return set([ d for r in self.related_that_doc("replaces") for d in r.docs.all() ])
-
-    def replaces_canonical_name(self):
-        s = set([ r.document for r in self.related_that_doc("replaces")])
-        first = list(s)[0] if s else None
-        return None if first is None else first.filename_with_rev()
+        return self.related_that_doc("replaces")
 
     def replaced_by(self):
         return set([ r.document for r in self.related_that("replaces") ])
 
-    def text(self):
+    def _text_path(self):
         path = self.get_file_name()
         root, ext =  os.path.splitext(path)
         txtpath = root+'.txt'
         if ext != '.txt' and os.path.exists(txtpath):
             path = txtpath
-        try:
-            with io.open(path, 'rb') as file:
-                raw = file.read()
-        except IOError:
+        return path
+    
+    def text_exists(self):
+        path = Path(self._text_path())
+        return path.exists()
+
+    def text(self, size = -1):
+        path = Path(self._text_path())
+        if not path.exists():
             return None
         try:
-            text = raw.decode('utf-8')
-        except UnicodeDecodeError:
-            text = raw.decode('latin-1')
-        #
-        return text
+            with path.open('rb') as file:
+                raw = file.read(size)
+        except IOError as e:
+            log.log(f"Error reading text for {path}: {e}")
+            return None
+        return decode_document_content(raw)
 
     def text_or_error(self):
         return self.text() or "Error; cannot read '%s'"%self.get_base_name()
 
+    def html_body(self, classes=""):
+        if self.type_id == "rfc":
+            try:
+                html = Path(
+                    os.path.join(settings.RFC_PATH, self.name + ".html")
+                ).read_text()
+            except (IOError, UnicodeDecodeError):
+                return None
+        else:
+            try:
+                html = Path(
+                    os.path.join(
+                        settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR,
+                        self.name + "-" + self.rev + ".html",
+                    )
+                ).read_text()
+            except (IOError, UnicodeDecodeError):
+                return None
+
+        # If HTML was generated by rfc2html, do not return it. Caller
+        # will use htmlize() to use a more current rfc2html to
+        # generate an HTMLized version. TODO: There should be a
+        # better way to determine how an HTML format was generated.
+        if html.startswith("<pre>"):
+            return None
+
+        # get body
+        etree_html = etree.HTML(html)
+        if etree_html is None:
+            return None
+        body = etree_html.xpath("//body")[0]
+        body.tag = "div"
+        if classes:
+            body.attrib["class"] = classes
+
+        # remove things
+        for tag in ["script"]:
+            for t in body.xpath(f"//{tag}"):
+                t.getparent().remove(t)
+        html = etree.tostring(body, encoding=str, method="html")
+
+        return html
+
     def htmlized(self):
         name = self.get_base_name()
         text = self.text()
@@ -558,25 +708,43 @@ def htmlized(self):
                 # The path here has to match the urlpattern for htmlized
                 # documents in order to produce correct intra-document links
                 html = rfc2html.markup(text, path=settings.HTMLIZER_URL_PREFIX)
+                html = f'<div class="rfcmarkup">{html}</div>'
                 if html:
                     cache.set(cache_key, html, settings.HTMLIZER_CACHE_TIME)
         return html
 
     def pdfized(self):
         name = self.get_base_name()
-        text = self.text()
-        cache = caches['pdfized']
-        cache_key = name.split('.')[0]
+        text = self.html_body(classes="rfchtml")
+        stylesheets = [finders.find("ietf/css/document_html_referenced.css")]
+        if text:
+            stylesheets.append(finders.find("ietf/css/document_html_txt.css"))
+        else:
+            text = self.htmlized()
+        stylesheets.append(f'{settings.STATIC_IETF_ORG_INTERNAL}/fonts/noto-sans-mono/import.css')
+
+        cache = caches["pdfized"]
+        cache_key = name.split(".")[0]
         try:
             pdf = cache.get(cache_key)
         except EOFError:
             pdf = None
         if not pdf:
-            html = rfc2html.markup(text, path=settings.PDFIZER_URL_PREFIX)
             try:
-                pdf = wpHTML(string=html.replace('\xad','')).write_pdf(stylesheets=[io.BytesIO(b'html { font-size: 94%;}')])
+                font_config = FontConfiguration()
+                pdf = wpHTML(
+                    string=text, base_url=settings.IDTRACKER_BASE_URL
+                ).write_pdf(
+                    stylesheets=stylesheets,
+                    font_config=font_config,
+                    presentational_hints=True,
+                    optimize_images=True,
+                )
             except AssertionError:
                 pdf = None
+            except Exception as e:
+                log.log('weasyprint failed:'+str(e))
+                raise
             if pdf:
                 cache.set(cache_key, pdf, settings.PDFIZER_CACHE_TIME)
         return pdf
@@ -585,70 +753,224 @@ def references(self):
         return self.relations_that_doc(('refnorm','refinfo','refunk','refold'))
 
     def referenced_by(self):
-        return self.relations_that(('refnorm','refinfo','refunk','refold')).filter(source__states__type__slug='draft',source__states__slug__in=['rfc','active'])
-
+        return self.relations_that(("refnorm", "refinfo", "refunk", "refold")).filter(
+            models.Q(
+                source__type__slug="draft",
+                source__states__type__slug="draft",
+                source__states__slug="active",
+            )
+            | models.Q(source__type__slug="rfc")
+        ).distinct()
+    
     def referenced_by_rfcs(self):
-        return self.relations_that(('refnorm','refinfo','refunk','refold')).filter(source__states__type__slug='draft',source__states__slug='rfc')
-
+        """Get refs to this doc from RFCs"""
+        return self.relations_that(("refnorm", "refinfo", "refunk", "refold")).filter(
+            source__type__slug="rfc"
+        )
+
+    def became_rfc(self):
+        if not hasattr(self, "_cached_became_rfc"):
+            doc = self if isinstance(self, Document) else self.doc
+            self._cached_became_rfc = next(iter(doc.related_that_doc("became_rfc")), None)
+        return self._cached_became_rfc
+
+    def came_from_draft(self):
+        if not hasattr(self, "_cached_came_from_draft"):
+            doc = self if isinstance(self, Document) else self.doc
+            self._cached_came_from_draft = next(iter(doc.related_that("became_rfc")), None)
+        return self._cached_came_from_draft
+    
+    def contains(self):
+        return self.related_that_doc("contains")
+    
+    def part_of(self):
+        return self.related_that("contains")
+
+    def referenced_by_rfcs_as_rfc_or_draft(self):
+        """Get refs to this doc, or a draft/rfc it came from, from an RFC"""
+        refs_to = self.referenced_by_rfcs()
+        if self.type_id == "rfc" and self.came_from_draft():
+            refs_to |= self.came_from_draft().referenced_by_rfcs()
+        return refs_to
+
+    def sent_to_rfc_editor_event(self):
+        if self.stream_id == "ietf":
+            return self.docevent_set.filter(type="iesg_approved").order_by("-time").first()
+        elif self.stream_id in ["editorial", "iab", "irtf", "ise"]:
+            return self.docevent_set.filter(type="requested_publication").order_by("-time").first()
+        else:
+            return None
     class Meta:
         abstract = True
 
+
+class HasNameRevAndTypeIdProtocol(Protocol):
+    """Typing Protocol describing a class that has name, rev, and type_id properties"""
+    @property
+    def name(self) -> str: ...
+    @property
+    def rev(self) -> str: ...
+    @property
+    def type_id(self) -> str: ...
+
+
+class StorableMixin:
+    """Mixin that adds storage helpers to a DocumentInfo subclass"""
+    def store_str(
+        self: HasNameRevAndTypeIdProtocol,
+        name: str,
+        content: str,
+        allow_overwrite: bool = False
+    ) -> None:
+        return utils_store_str(self.type_id, name, content, allow_overwrite, self.name, self.rev)
+
+    def store_bytes(
+        self: HasNameRevAndTypeIdProtocol,
+        name: str,
+        content: bytes,
+        allow_overwrite: bool = False,
+        doc_name: Optional[str] = None,
+        doc_rev: Optional[str] = None
+    ) -> None:
+        return utils_store_bytes(self.type_id, name, content, allow_overwrite, self.name, self.rev)
+
+    def store_file(
+        self: HasNameRevAndTypeIdProtocol,
+        name: str,
+        file: Union[File, BufferedReader],
+        allow_overwrite: bool = False,
+        doc_name: Optional[str] = None,
+        doc_rev: Optional[str] = None
+    ) -> None:
+        return utils_store_file(self.type_id, name, file, allow_overwrite, self.name, self.rev)
+
+
 STATUSCHANGE_RELATIONS = ('tops','tois','tohist','toinf','tobcp','toexp')
 
 class RelatedDocument(models.Model):
     source = ForeignKey('Document')
-    target = ForeignKey('DocAlias')
+    target = ForeignKey('Document', related_name='targets_related')
     relationship = ForeignKey(DocRelationshipName)
+    originaltargetaliasname = models.CharField(max_length=255, null=True, blank=True)
     def action(self):
         return self.relationship.name
     def __str__(self):
         return u"%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name)
 
     def is_downref(self):
-
-        if self.source.type.slug!='draft' or self.relationship.slug not in ['refnorm','refold','refunk']:
+        if self.source.type_id not in ["draft","rfc"] or self.relationship.slug not in [
+            "refnorm",
+            "refold",
+            "refunk",
+        ]:
             return None
 
-        state = self.source.get_state()
-        if state and state.slug == 'rfc':
-            source_lvl = self.source.std_level.slug if self.source.std_level else None
-        elif self.source.intended_std_level:
-            source_lvl = self.source.intended_std_level.slug
+        if self.source.type_id == "rfc":
+            source_lvl = self.source.std_level_id
+        elif self.source.type_id in ["bcp","std"]:
+            source_lvl = self.source.type_id
         else:
-            source_lvl = None
+            source_lvl = self.source.intended_std_level_id
 
-        if source_lvl not in ['bcp','ps','ds','std']:
+        if source_lvl not in ["bcp", "ps", "ds", "std", "unkn"]:
             return None
 
-        if self.target.document.get_state().slug == 'rfc':
-            if not self.target.document.std_level:
+        if self.target.type_id == 'rfc':
+            if not self.target.std_level:
                 target_lvl = 'unkn'
             else:
-                target_lvl = self.target.document.std_level.slug
+                target_lvl = self.target.std_level_id
+        elif self.target.type_id in ["bcp", "std"]:
+            target_lvl = self.target.type_id
         else:
-            if not self.target.document.intended_std_level:
+            if not self.target.intended_std_level:
                 target_lvl = 'unkn'
             else:
-                target_lvl = self.target.document.intended_std_level.slug
+                target_lvl = self.target.intended_std_level_id
 
-        rank = { 'ps':1, 'ds':2, 'std':3, 'bcp':3 }
+        if self.relationship.slug not in ["refnorm", "refunk"]:
+            return None
 
-        if ( target_lvl not in rank ) or ( rank[target_lvl] < rank[source_lvl] ):
-            if self.relationship.slug == 'refnorm' and target_lvl!='unkn':
-                return "Downref"
-            else:
-                return "Possible Downref"
+        if source_lvl in ["inf", "exp"]:
+            return None
+
+        pos_downref = (
+            "Downref" if self.relationship_id != "refunk" else "Possible Downref"
+        )
+
+        if source_lvl in ["bcp", "ps", "ds", "std"] and target_lvl in ["inf", "exp"]:
+            return pos_downref
+
+        if source_lvl == "ds" and target_lvl == "ps":
+            return pos_downref
+
+        if source_lvl == "std" and target_lvl in ["ps", "ds"]:
+            return pos_downref
+
+        if source_lvl not in ["inf", "exp"] and target_lvl == "unkn":
+            return "Possible Downref"
+
+        if source_lvl == "unkn" and target_lvl in ["ps", "ds"]:
+            return "Possible Downref"
 
         return None
 
     def is_approved_downref(self):
 
-        if self.target.document.get_state().slug == 'rfc':
-           if RelatedDocument.objects.filter(relationship_id='downref-approval', target=self.target):
+        if self.target.type_id == 'rfc':
+           if RelatedDocument.objects.filter(relationship_id='downref-approval', target=self.target).exists():
               return "Approved Downref"
 
         return False
 
+class RfcAuthor(models.Model):
+    """Captures the authors of an RFC as represented on the RFC title page.
+
+    This deviates from DocumentAuthor in that it does not get moved into the DocHistory
+    hierarchy as documents are saved. It will attempt to preserve email, country, and affiliation
+    from the DocumentAuthor objects associated with the draft leading to this RFC (which
+    may be wrong if the author moves or changes affiliation while the document is in the
+    queue).
+
+    It does not, at this time, attempt to capture the authors from anything _but_ the title
+    page. The datatracker may know more about such authors based on information from the draft
+    leading to the RFC, and future work may take that into account.
+
+    Once doc.rfcauthor_set.exists() for a doc of type `rfc`, doc.documentauthor_set should be 
+    ignored.
+    """
+
+    document = ForeignKey(
+        "Document",
+        on_delete=models.CASCADE,
+        limit_choices_to={"type_id": "rfc"},  # only affects ModelForms (e.g., admin)
+    )
+    titlepage_name = models.CharField(max_length=128, blank=False)
+    is_editor = models.BooleanField(default=False)
+    person = ForeignKey(Person, null=True, blank=True, on_delete=models.PROTECT)
+    affiliation = models.CharField(max_length=100, blank=True, help_text="Organization/company used by author for submission")
+    country = models.CharField(max_length=255, blank=True, help_text="Country used by author for submission")
+    order = models.IntegerField(default=1)
+
+    def __str__(self):
+        return u"%s %s (%s)" % (self.document.name, self.person, self.order)
+
+    class Meta:
+        ordering=["document", "order"]
+        indexes=[
+            models.Index(fields=["document", "order"])
+        ]
+
+    @property
+    def email(self) -> Email | None:
+        return self.person.email() if self.person else None
+    
+    def format_for_titlepage(self):
+        if self.is_editor:
+            return f"{self.titlepage_name}, Ed."
+        return self.titlepage_name
+
+
 class DocumentAuthorInfo(models.Model):
     person = ForeignKey(Person)
     # email should only be null for some historic documents
@@ -682,7 +1004,7 @@ class DocumentActionHolder(models.Model):
     """Action holder for a document"""
     document = ForeignKey('Document')
     person = ForeignKey(Person)
-    time_added = models.DateTimeField(default=datetime.datetime.now)
+    time_added = models.DateTimeField(default=timezone.now)
 
     CLEAR_ACTION_HOLDERS_STATES = ['approved', 'ann', 'rfcqueue', 'pub', 'dead']  # draft-iesg state slugs
     GROUP_ROLES_OF_INTEREST = ['chair', 'techadv', 'editor', 'secr']
@@ -698,7 +1020,7 @@ class Meta:
     def role_for_doc(self):
         """Brief string description of this person's relationship to the doc"""
         roles = []
-        if self.person in self.document.authors():
+        if self.person in self.document.author_persons():
             roles.append('Author')
         if self.person == self.document.ad:
             roles.append('Responsible AD')
@@ -717,13 +1039,25 @@ def role_for_doc(self):
             roles.append('Action Holder')
         return ', '.join(roles) 
 
+# N.B., at least a couple dozen documents exist that do not satisfy this validator
 validate_docname = RegexValidator(
     r'^[-a-z0-9]+$',
     "Provide a valid document name consisting of lowercase letters, numbers and hyphens.",
     'invalid'
 )
 
-class Document(DocumentInfo):
+
+SUBSERIES_DOC_TYPE_IDS = ("bcp", "fyi", "std")
+
+
+class DocumentQuerySet(models.QuerySet):
+    def subseries_docs(self):
+        return self.filter(type_id__in=SUBSERIES_DOC_TYPE_IDS)
+
+
+class Document(StorableMixin, DocumentInfo):
+    objects = DocumentQuerySet.as_manager()
+
     name = models.CharField(max_length=255, validators=[validate_docname,], unique=True)           # immutable
     
     action_holders = models.ManyToManyField(Person, through=DocumentActionHolder, blank=True)
@@ -740,7 +1074,7 @@ def get_absolute_url(self):
             name = self.name
             url = None
             if self.type_id == "draft" and self.get_state_slug() == "rfc":
-                name = self.canonical_name()
+                name = self.name
                 url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ 'name': name }, urlconf="ietf.urls")
             elif self.type_id in ('slides','bluesheets','recording'):
                 session = self.session_set.first()
@@ -778,28 +1112,8 @@ def latest_event(self, *args, **filter_args):
         e = model.objects.filter(doc=self).filter(**filter_args).order_by('-time', '-id').first()
         return e
 
-    def canonical_name(self):
-        if not hasattr(self, '_canonical_name'):
-            name = self.name
-            if self.type_id == "draft" and self.get_state_slug() == "rfc":
-                a = self.docalias.filter(name__startswith="rfc").order_by('-name').first()
-                if a:
-                    name = a.name
-            elif self.type_id == "charter":
-                from ietf.doc.utils_charter import charter_name_for_group # Imported locally to avoid circular imports
-                try:
-                    name = charter_name_for_group(self.chartered_group)
-                except Group.DoesNotExist:
-                    pass
-            self._canonical_name = name
-        return self._canonical_name
-
-
-    def canonical_docalias(self):
-        return self.docalias.get(name=self.name)
-
     def display_name(self):
-        name = self.canonical_name()
+        name = self.name
         if name.startswith('rfc'):
             name = name.upper()
         return name
@@ -829,22 +1143,42 @@ def save(self, *args, **kwargs):
     def telechat_date(self, e=None):
         if not e:
             e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
-        return e.telechat_date if e and e.telechat_date and e.telechat_date >= datetime.date.today() else None
+        return e.telechat_date if e and e.telechat_date and e.telechat_date >= date_today(settings.TIME_ZONE) else None
 
     def past_telechat_date(self):
         "Return the latest telechat date if it isn't in the future; else None"
         e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
-        return e.telechat_date if e and e.telechat_date and e.telechat_date < datetime.date.today() else None
+        return e.telechat_date if e and e.telechat_date and e.telechat_date < date_today(settings.TIME_ZONE) else None
 
     def previous_telechat_date(self):
         "Return the most recent telechat date in the past, if any (even if there's another in the future)"
-        e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat", telechat_date__lt=datetime.datetime.now())
+        e = self.latest_event(
+            TelechatDocEvent,
+            type="scheduled_for_telechat",
+            telechat_date__lt=date_today(settings.TIME_ZONE),
+        )
         return e.telechat_date if e else None
 
     def request_closed_time(self, review_req):
         e = self.latest_event(ReviewRequestDocEvent, type="closed_review_request", review_request=review_req)
         return e.time if e and e.time else None
 
+    @property
+    def area(self) -> Group | None:
+        """Get area for document, if one exists
+        
+        None for non-IETF-stream documents. N.b., this is stricter than Group.area() and
+        uses different logic from Document.area_acronym().
+        """
+        if self.stream_id != "ietf":
+            return None
+        if self.group is None:
+            return None
+        parent = self.group.parent
+        if parent.type_id == "area":
+            return parent
+        return None
+
     def area_acronym(self):
         g = self.group
         if g:
@@ -888,33 +1222,50 @@ def most_recent_ietflc(self):
     def displayname_with_link(self):
         return mark_safe('<a href="%s">%s-%s</a>' % (self.get_absolute_url(), self.name , self.rev))
 
-    def ipr(self,states=('posted','removed')):
+    def ipr(self,states=settings.PUBLISH_IPR_STATES):
         """Returns the IPR disclosures against this document (as a queryset over IprDocRel)."""
-        from ietf.ipr.models import IprDocRel
-        return IprDocRel.objects.filter(document__docs=self, disclosure__state__in=states)
+        # from ietf.ipr.models import IprDocRel
+        # return IprDocRel.objects.filter(document__docs=self, disclosure__state__in=states) # TODO - clear these comments away
+        return self.iprdocrel_set.filter(disclosure__state__in=states)
 
     def related_ipr(self):
         """Returns the IPR disclosures against this document and those documents this
         document directly or indirectly obsoletes or replaces
         """
         from ietf.ipr.models import IprDocRel
-        iprs = IprDocRel.objects.filter(document__in=list(self.docalias.all())+self.all_related_that_doc(('obs','replaces'))).filter(disclosure__state__in=('posted','removed')).values_list('disclosure', flat=True).distinct()
+        iprs = (
+            IprDocRel.objects.filter(
+                document__in=[self]
+                + self.all_related_that_doc(("obs", "replaces"))
+            )
+            .filter(disclosure__state__in=settings.PUBLISH_IPR_STATES)
+            .values_list("disclosure", flat=True)
+            .distinct()
+        )
         return iprs
 
+
     def future_presentations(self):
         """ returns related SessionPresentation objects for meetings that
             have not yet ended. This implementation allows for 2 week meetings """
-        candidate_presentations = self.sessionpresentation_set.filter(session__meeting__date__gte=datetime.date.today()-datetime.timedelta(days=15))
-        return sorted([pres for pres in candidate_presentations if pres.session.meeting.end_date()>=datetime.date.today()], key=lambda x:x.session.meeting.date)
+        candidate_presentations = self.presentations.filter(
+            session__meeting__date__gte=date_today() - datetime.timedelta(days=15)
+        )
+        return sorted(
+            [pres for pres in candidate_presentations
+             if pres.session.meeting.end_date() >= date_today()],
+            key=lambda x:x.session.meeting.date,
+        )
 
     def last_presented(self):
         """ returns related SessionPresentation objects for the most recent meeting in the past"""
-        # Assumes no two meetings have the same start date - if the assumption is violated, one will be chosen arbitrariy
-        candidate_presentations = self.sessionpresentation_set.filter(session__meeting__date__lte=datetime.date.today())
-        candidate_meetings = set([p.session.meeting for p in candidate_presentations if p.session.meeting.end_date()<datetime.date.today()])
+        # Assumes no two meetings have the same start date - if the assumption is violated, one will be chosen arbitrarily
+        today = date_today()
+        candidate_presentations = self.presentations.filter(session__meeting__date__lte=today)
+        candidate_meetings = set([p.session.meeting for p in candidate_presentations if p.session.meeting.end_date()<today])
         if candidate_meetings:
             mtg = sorted(list(candidate_meetings),key=lambda x:x.date,reverse=True)[0]
-            return self.sessionpresentation_set.filter(session__meeting=mtg)
+            return self.presentations.filter(session__meeting=mtg)
         else:
             return None
 
@@ -923,14 +1274,24 @@ def submission(self):
         s = s.first()
         return s
 
-    def pub_date(self):
-        """This is the rfc publication date (datetime) for RFCs, 
-        and the new-revision datetime for other documents."""
-        if self.get_state_slug() == "rfc":
+    def pub_datetime(self):
+        """Get the publication datetime of this document"""
+        if self.type_id == "rfc":
+            # As of Sept 2022, in ietf.sync.rfceditor.update_docs_from_rfc_index() `published_rfc` events are
+            # created with a timestamp whose date *in the PST8PDT timezone* is the official publication date
+            # assigned by the RFC editor.
             event = self.latest_event(type='published_rfc')
         else:
             event = self.latest_event(type='new_revision')
-        return event.time
+        return event.time.astimezone(RPC_TZINFO) if event else None
+
+    def pub_date(self):
+        """Get the publication date for this document
+
+        This is the rfc publication date for RFCs, and the new-revision date for other documents.
+        """
+        pub_datetime = self.pub_datetime()
+        return None if pub_datetime is None else pub_datetime.date()
 
     def is_dochistory(self):
         return False
@@ -955,7 +1316,7 @@ def fake_history_obj(self, rev):
             elif rev_events.exists():
                 time = rev_events.first().time
             else:
-                time = datetime.datetime.fromtimestamp(0)
+                time = datetime.datetime.fromtimestamp(0, datetime.UTC)
             dh = DocHistory(name=self.name, rev=rev, doc=self, time=time, type=self.type, title=self.title,
                              stream=self.stream, group=self.group)
 
@@ -966,6 +1327,32 @@ def action_holders_enabled(self):
         iesg_state = self.get_state('draft-iesg')
         return iesg_state and iesg_state.slug != 'idexists'
 
+    def formats(self):
+        """List of file formats available
+        
+        Only implemented for RFCs. Relies on StoredObject.
+        """
+        if self.type_id != "rfc":
+            raise RuntimeError("Only allowed for type=rfc")
+
+        # StoredObject.doc_rev can be null or "" to represent no rev. Match either
+        # of these when self.rev is "" (always expected to be the case for RFCs)
+        rev_q = Q(doc_rev=self.rev)
+        if self.rev == "":
+            rev_q |= Q(doc_rev__isnull=True)
+        return [
+            {
+                "fmt": Path(object_name).parts[0],
+                "name": object_name,
+            }
+            for object_name in StoredObject.objects.filter(
+                rev_q,
+                store="rfc",
+                doc_name=self.name,
+            ).values_list("name", flat=True)
+        ]
+
+
 class DocumentURL(models.Model):
     doc  = ForeignKey(Document)
     tag  = ForeignKey(DocUrlTagName)
@@ -1025,8 +1412,9 @@ class DocExtResource(ExtResource):
 
 class RelatedDocHistory(models.Model):
     source = ForeignKey('DocHistory')
-    target = ForeignKey('DocAlias', related_name="reversely_related_document_history_set")
+    target = ForeignKey('Document', related_name="reversely_related_document_history_set")
     relationship = ForeignKey(DocRelationshipName)
+    originaltargetaliasname = models.CharField(max_length=255, null=True, blank=True)
     def __str__(self):
         return u"%s %s %s" % (self.source.doc.name, self.relationship.name.lower(), self.target.name)
 
@@ -1038,16 +1426,13 @@ class DocHistoryAuthor(DocumentAuthorInfo):
     def __str__(self):
         return u"%s %s (%s)" % (self.document.doc.name, self.person, self.order)
 
-class DocHistory(DocumentInfo):
+class DocHistory(StorableMixin, DocumentInfo):
     doc = ForeignKey(Document, related_name="history_set")
-    # the name here is used to capture the canonical name at the time
-    # - it would perhaps be more elegant to simply call the attribute
-    # canonical_name and replace the function on Document with a
-    # property
+
     name = models.CharField(max_length=255)
 
     def __str__(self):
-        return force_text(self.doc.name)
+        return force_str(self.doc.name)
 
     def get_related_session(self):
         return self.doc.get_related_session()
@@ -1055,11 +1440,6 @@ def get_related_session(self):
     def get_related_proceedings_material(self):
         return self.doc.get_related_proceedings_material()
 
-    def canonical_name(self):
-        if hasattr(self, '_canonical_name'):
-            return self._canonical_name
-        return self.name
-
     def latest_event(self, *args, **kwargs):
         kwargs["time__lte"] = self.time
         return self.doc.latest_event(*args, **kwargs)
@@ -1074,10 +1454,6 @@ def last_presented(self):
     def groupmilestone_set(self):
         return self.doc.groupmilestone_set
 
-    @property
-    def docalias(self):
-        return self.doc.docalias
-
     def is_dochistory(self):
         return True
 
@@ -1095,25 +1471,6 @@ class Meta:
         verbose_name = "document history"
         verbose_name_plural = "document histories"
 
-class DocAlias(models.Model):
-    """This is used for documents that may appear under multiple names,
-    and in particular for RFCs, which for continuity still keep the
-    same immutable Document.name, in the tables, but will be referred
-    to by RFC number, primarily, after achieving RFC status.
-    """
-    name = models.CharField(max_length=255, unique=True)
-    docs = models.ManyToManyField(Document, related_name='docalias')
-
-    @property
-    def document(self):
-        return self.docs.first()
-
-    def __str__(self):
-        return u"%s-->%s" % (self.name, ','.join([force_text(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
-    document_link = admin_link("document")
-    class Meta:
-        verbose_name = "document alias"
-        verbose_name_plural = "document aliases"
 
 class DocReminder(models.Model):
     event = ForeignKey('DocEvent')
@@ -1201,14 +1558,22 @@ class DocReminder(models.Model):
     # IPR events
     ("posted_related_ipr", "Posted related IPR"),
     ("removed_related_ipr", "Removed related IPR"),
+    ("removed_objfalse_related_ipr", "Removed Objectively False related IPR"),
 
     # Bofreq Editor events
-    ("changed_editors", "Changed BOF Request editors")
+    ("changed_editors", "Changed BOF Request editors"),
+
+    # Statement events
+    ("published_statement", "Published statement"),
+
+    # Slide events
+    ("approved_slides", "Slides approved"),
+    
     ]
 
 class DocEvent(models.Model):
     """An occurrence for a document, used for tracking who, when and what."""
-    time = models.DateTimeField(default=datetime.datetime.now, help_text="When the event happened", db_index=True)
+    time = models.DateTimeField(default=timezone.now, help_text="When the event happened", db_index=True)
     type = models.CharField(max_length=50, choices=EVENT_TYPES)
     by = ForeignKey(Person)
     doc = ForeignKey(Document)
@@ -1265,7 +1630,7 @@ class BallotDocEvent(DocEvent):
     ballot_type = ForeignKey(BallotType)
 
     def active_balloter_positions(self):
-        """Return dict mapping each active AD or IRSG member to a current ballot position (or None if they haven't voted)."""
+        """Return dict mapping each active member of the balloting body to a current ballot position (or None if they haven't voted)."""
         res = {}
     
         active_balloters = get_active_balloters(self.ballot_type)
@@ -1302,13 +1667,13 @@ def all_positions(self):
                 if e.pos != prev:
                     latest.old_positions.append(e.pos)
 
-        # get rid of trailling "No record" positions, some old ballots
+        # get rid of trailing "No record" positions, some old ballots
         # have plenty of these
         for p in positions:
             while p.old_positions and p.old_positions[-1].slug == "norecord":
                 p.old_positions.pop()
 
-        # add any missing ADs/IRSGers through fake No Record events
+        # add any missing balloters through fake No Record events
         if self.doc.active_ballot() == self:
             norecord = BallotPositionName.objects.get(slug="norecord")
             for balloter in active_balloters:
@@ -1388,7 +1753,7 @@ class DeletedEvent(models.Model):
     content_type = ForeignKey(ContentType)
     json = models.TextField(help_text="Deleted object in JSON format, with attribute names chosen to be suitable for passing into the relevant create method.")
     by = ForeignKey(Person)
-    time = models.DateTimeField(default=datetime.datetime.now)
+    time = models.DateTimeField(default=timezone.now)
 
     def __str__(self):
         return u"%s by %s %s" % (self.content_type, self.by, self.time)
@@ -1400,6 +1765,11 @@ class EditedAuthorsDocEvent(DocEvent):
     """
     basis = models.CharField(help_text="What is the source or reasoning for the changes to the author list",max_length=255)
 
+
+class EditedRfcAuthorsDocEvent(DocEvent):
+    """Change to the RfcAuthor list for a document"""
+
+
 class BofreqEditorDocEvent(DocEvent):
     """ Capture the proponents of a BOF Request."""
     editors = models.ManyToManyField('person.Person', blank=True)
@@ -1407,3 +1777,42 @@ class BofreqEditorDocEvent(DocEvent):
 class BofreqResponsibleDocEvent(DocEvent):
     """ Capture the responsible leadership (IAB and IESG members) for a BOF Request """
     responsible = models.ManyToManyField('person.Person', blank=True)
+
+
+class StoredObjectQuerySet(models.QuerySet):
+    def exclude_deleted(self):
+        return self.filter(deleted__isnull=True)
+
+
+class StoredObject(models.Model):
+    """Hold metadata about objects placed in object storage"""
+
+    objects = StoredObjectQuerySet.as_manager() 
+
+    store = models.CharField(max_length=256)
+    name = models.CharField(max_length=1024, null=False, blank=False) # N.B. the 1024 limit on name comes from S3
+    sha384 = models.CharField(max_length=96)
+    len = models.PositiveBigIntegerField()
+    store_created = models.DateTimeField(help_text="The instant the object ws first placed in the store")
+    created = models.DateTimeField(
+        null=False,
+        help_text="Instant object became known. May not be the same as the storage's created value for the instance. It will hold ctime for objects imported from older disk storage"
+    )
+    modified = models.DateTimeField(
+        null=False,
+        help_text="Last instant object was modified. May not be the same as the storage's modified value for the instance. It will hold mtime for objects imported from older disk storage unless they've actually been overwritten more recently"
+    )
+    doc_name = models.CharField(max_length=255, null=True, blank=True)
+    doc_rev = models.CharField(max_length=16, null=True, blank=True)
+    deleted = models.DateTimeField(null=True)
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(fields=['store', 'name'], name='unique_name_per_store'),
+        ]
+        indexes = [
+            models.Index(fields=["doc_name", "doc_rev"]),
+        ]
+
+    def __str__(self):
+        return f"{self.store}:{self.name}"
diff --git a/ietf/doc/resources.py b/ietf/doc/resources.py
index 99e26ac33d..1d86df78d0 100644
--- a/ietf/doc/resources.py
+++ b/ietf/doc/resources.py
@@ -12,13 +12,14 @@
 from ietf import api
 
 from ietf.doc.models import (BallotType, DeletedEvent, StateType, State, Document,
-    DocumentAuthor, DocEvent, StateDocEvent, DocHistory, ConsensusDocEvent, DocAlias,
+    DocumentAuthor, DocEvent, StateDocEvent, DocHistory, ConsensusDocEvent,
     TelechatDocEvent, DocReminder, LastCallDocEvent, NewRevisionDocEvent, WriteupDocEvent,
     InitialReviewDocEvent, DocHistoryAuthor, BallotDocEvent, RelatedDocument,
     RelatedDocHistory, BallotPositionDocEvent, AddedMessageEvent, SubmissionDocEvent,
     ReviewRequestDocEvent, ReviewAssignmentDocEvent, EditedAuthorsDocEvent, DocumentURL,
-    IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder, 
-    BofreqEditorDocEvent,BofreqResponsibleDocEvent)
+    IanaExpertDocEvent, IRSGBallotDocEvent, DocExtResource, DocumentActionHolder,
+    BofreqEditorDocEvent, BofreqResponsibleDocEvent, StoredObject, RfcAuthor,
+    EditedRfcAuthorsDocEvent)
 
 from ietf.name.resources import BallotPositionNameResource, DocTypeNameResource
 class BallotTypeResource(ModelResource):
@@ -130,7 +131,6 @@ class Meta:
             "external_url": ALL,
             "uploaded_filename": ALL,
             "note": ALL,
-            "internal_comments": ALL,
             "name": ALL,
             "type": ALL_WITH_RELATIONS,
             "stream": ALL_WITH_RELATIONS,
@@ -247,7 +247,6 @@ class Meta:
             "external_url": ALL,
             "uploaded_filename": ALL,
             "note": ALL,
-            "internal_comments": ALL,
             "name": ALL,
             "type": ALL_WITH_RELATIONS,
             "stream": ALL_WITH_RELATIONS,
@@ -286,21 +285,6 @@ class Meta:
         }
 api.doc.register(ConsensusDocEventResource())
 
-class DocAliasResource(ModelResource):
-    document         = ToOneField(DocumentResource, 'document')
-    class Meta:
-        cache = SimpleCache()
-        queryset = DocAlias.objects.all()
-        serializer = api.Serializer()
-        detail_uri_name = 'name'
-        #resource_name = 'docalias'
-        ordering = ['id', ]
-        filtering = { 
-            "name": ALL,
-            "document": ALL_WITH_RELATIONS,
-        }
-api.doc.register(DocAliasResource())
-
 from ietf.person.resources import PersonResource
 class TelechatDocEventResource(ModelResource):
     by               = ToOneField(PersonResource, 'by')
@@ -490,7 +474,7 @@ class Meta:
 from ietf.name.resources import DocRelationshipNameResource
 class RelatedDocumentResource(ModelResource):
     source           = ToOneField(DocumentResource, 'source')
-    target           = ToOneField(DocAliasResource, 'target')
+    target           = ToOneField(DocumentResource, 'target')
     relationship     = ToOneField(DocRelationshipNameResource, 'relationship')
     class Meta:
         cache = SimpleCache()
@@ -509,7 +493,7 @@ class Meta:
 from ietf.name.resources import DocRelationshipNameResource
 class RelatedDocHistoryResource(ModelResource):
     source           = ToOneField(DocHistoryResource, 'source')
-    target           = ToOneField(DocAliasResource, 'target')
+    target           = ToOneField(DocumentResource, 'target')
     relationship     = ToOneField(DocRelationshipNameResource, 'relationship')
     class Meta:
         cache = SimpleCache()
@@ -667,6 +651,31 @@ class Meta:
 api.doc.register(EditedAuthorsDocEventResource())
 
 
+
+from ietf.person.resources import PersonResource
+class EditedRfcAuthorsDocEventResource(ModelResource):
+    by               = ToOneField(PersonResource, 'by')
+    doc              = ToOneField(DocumentResource, 'doc')
+    docevent_ptr     = ToOneField(DocEventResource, 'docevent_ptr')
+    class Meta:
+        queryset = EditedRfcAuthorsDocEvent.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'editedrfcauthorsdocevent'
+        ordering = ['id', ]
+        filtering = { 
+            "id": ALL,
+            "time": ALL,
+            "type": ALL,
+            "rev": ALL,
+            "desc": ALL,
+            "by": ALL_WITH_RELATIONS,
+            "doc": ALL_WITH_RELATIONS,
+            "docevent_ptr": ALL_WITH_RELATIONS,
+        }
+api.doc.register(EditedRfcAuthorsDocEventResource())
+
+
 from ietf.name.resources import DocUrlTagNameResource
 class DocumentURLResource(ModelResource):
     doc              = ToOneField(DocumentResource, 'doc')
@@ -859,3 +868,51 @@ class Meta:
             "responsible": ALL_WITH_RELATIONS,
         }
 api.doc.register(BofreqResponsibleDocEventResource())
+
+
+class StoredObjectResource(ModelResource):
+    class Meta:
+        queryset = StoredObject.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'storedobject'
+        ordering = ['id', ]
+        filtering = { 
+            "id": ALL,
+            "store": ALL,
+            "name": ALL,
+            "sha384": ALL,
+            "len": ALL,
+            "store_created": ALL,
+            "created": ALL,
+            "modified": ALL,
+            "doc_name": ALL,
+            "doc_rev": ALL,
+            "deleted": ALL,
+        }
+api.doc.register(StoredObjectResource())
+
+
+from ietf.person.resources import EmailResource, PersonResource
+class RfcAuthorResource(ModelResource):
+    document         = ToOneField(DocumentResource, 'document')
+    person           = ToOneField(PersonResource, 'person', null=True)
+    email            = ToOneField(EmailResource, 'email', null=True, readonly=True)
+    class Meta:
+        queryset = RfcAuthor.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'rfcauthor'
+        ordering = ['id', ]
+        filtering = { 
+            "id": ALL,
+            "titlepage_name": ALL,
+            "is_editor": ALL,
+            "affiliation": ALL,
+            "country": ALL,
+            "order": ALL,
+            "document": ALL_WITH_RELATIONS,
+            "person": ALL_WITH_RELATIONS,
+            "email": ALL_WITH_RELATIONS,
+        }
+api.doc.register(RfcAuthorResource())
diff --git a/ietf/doc/serializers.py b/ietf/doc/serializers.py
new file mode 100644
index 0000000000..3651670962
--- /dev/null
+++ b/ietf/doc/serializers.py
@@ -0,0 +1,360 @@
+# Copyright The IETF Trust 2024-2026, All Rights Reserved
+"""django-rest-framework serializers"""
+
+from dataclasses import dataclass
+from typing import Literal, ClassVar
+
+from django.db.models.manager import BaseManager
+from django.db.models.query import QuerySet
+from drf_spectacular.utils import extend_schema_field
+from rest_framework import serializers
+
+from ietf.group.serializers import (
+    AreaDirectorSerializer,
+    AreaSerializer,
+    GroupSerializer,
+)
+from ietf.name.serializers import StreamNameSerializer
+from ietf.utils import log
+from .models import Document, DocumentAuthor, RfcAuthor
+
+
+class RfcAuthorSerializer(serializers.ModelSerializer):
+    """Serializer for an RfcAuthor / DocumentAuthor in a response"""
+
+    email = serializers.EmailField(source="email.address", read_only=True)
+    datatracker_person_path = serializers.URLField(
+        source="person.get_absolute_url",
+        required=False,
+        help_text="URL for person link (relative to datatracker base URL)",
+        read_only=True,
+    )
+
+    class Meta:
+        model = RfcAuthor
+        fields = [
+            "titlepage_name",
+            "is_editor",
+            "person",
+            "email",
+            "affiliation",
+            "country",
+            "datatracker_person_path",
+        ]
+
+    def to_representation(self, instance):
+        """instance -> primitive data types
+
+        Translates a DocumentAuthor into an equivalent RfcAuthor we can use the same
+        serializer for either type.
+        """
+        if isinstance(instance, DocumentAuthor):
+            # create a non-persisted RfcAuthor as a shim - do not save it!
+            document_author = instance
+            instance = RfcAuthor(
+                titlepage_name=document_author.person.plain_name(),
+                is_editor=False,
+                person=document_author.person,
+                affiliation=document_author.affiliation,
+                country=document_author.country,
+                order=document_author.order,
+            )
+        return super().to_representation(instance)
+
+    def validate(self, data):
+        email = data.get("email")
+        if email is not None:
+            person = data.get("person")
+            if person is None:
+                raise serializers.ValidationError(
+                    {
+                        "email": "cannot have an email without a person",
+                    },
+                    code="email-without-person",
+                )
+            if email.person_id != person.pk:
+                raise serializers.ValidationError(
+                    {
+                        "email": "email must belong to person",
+                    },
+                    code="email-person-mismatch",
+                )
+        return data
+
+
+@dataclass
+class DocIdentifier:
+    type: Literal["doi", "issn"]
+    value: str
+
+
+class DocIdentifierSerializer(serializers.Serializer):
+    type = serializers.ChoiceField(choices=["doi", "issn"])
+    value = serializers.CharField()
+
+
+type RfcStatusSlugT = Literal[
+    "std",
+    "ps",
+    "ds",
+    "bcp",
+    "inf",
+    "exp",
+    "hist",
+    "unkn",
+    "not-issued",
+]
+
+
+@dataclass
+class RfcStatus:
+    """Helper to extract the 'Status' from an RFC document for serialization"""
+
+    slug: RfcStatusSlugT
+
+    # Names that aren't just the slug itself. ClassVar annotation prevents dataclass from treating this as a field.
+    fancy_names: ClassVar[dict[RfcStatusSlugT, str]] = {
+        "std": "internet standard",
+        "ps": "proposed standard",
+        "ds": "draft standard",
+        "bcp": "best current practice",
+        "inf": "informational",
+        "exp": "experimental",
+        "hist": "historic",
+        "unkn": "unknown",
+    }
+
+    # ClassVar annotation prevents dataclass from treating this as a field
+    stdlevelname_slug_map: ClassVar[dict[str, RfcStatusSlugT]] = {
+        "bcp": "bcp",
+        "ds": "ds",
+        "exp": "exp",
+        "hist": "hist",
+        "inf": "inf",
+        "std": "std",
+        "ps": "ps",
+        "unkn": "unkn",
+    }
+
+    # ClassVar annotation prevents dataclass from treating this as a field
+    status_slugs: ClassVar[list[RfcStatusSlugT]] = sorted(
+        # TODO implement "not-issued" RFCs
+        set(stdlevelname_slug_map.values()) | {"not-issued"}
+    )
+
+    @property
+    def name(self):
+        return RfcStatus.fancy_names.get(self.slug, self.slug)
+
+    @classmethod
+    def from_document(cls, doc: Document):
+        """Decide the status that applies to a document"""
+        return cls(
+            slug=(cls.stdlevelname_slug_map.get(doc.std_level.slug, "unkn")),
+        )
+
+    @classmethod
+    def filter(cls, queryset, name, value: list[RfcStatusSlugT]):
+        """Filter a queryset by status
+
+        This is basically the inverse of the from_document() method. Given a status name, filter
+        the queryset to those in that status. The queryset should be a Document queryset.
+        """
+        interesting_slugs = [
+            stdlevelname_slug
+            for stdlevelname_slug, status_slug in cls.stdlevelname_slug_map.items()
+            if status_slug in value
+        ]
+        if len(interesting_slugs) == 0:
+            return queryset.none()
+        return queryset.filter(std_level__slug__in=interesting_slugs)
+
+
+class RfcStatusSerializer(serializers.Serializer):
+    """Status serializer for a Document instance"""
+
+    slug = serializers.ChoiceField(choices=RfcStatus.status_slugs)
+    name = serializers.CharField()
+
+    def to_representation(self, instance: Document):
+        return super().to_representation(instance=RfcStatus.from_document(instance))
+
+
+class ShepherdSerializer(serializers.Serializer):
+    email = serializers.EmailField(source="email_address")
+
+
+class RelatedDraftSerializer(serializers.Serializer):
+    id = serializers.IntegerField(source="source.id")
+    name = serializers.CharField(source="source.name")
+    title = serializers.CharField(source="source.title")
+    shepherd = ShepherdSerializer(source="source.shepherd", allow_null=True)
+    ad = AreaDirectorSerializer(source="source.ad", allow_null=True)
+
+
+class RelatedRfcSerializer(serializers.Serializer):
+    id = serializers.IntegerField(source="target.id")
+    number = serializers.IntegerField(source="target.rfc_number")
+    title = serializers.CharField(source="target.title")
+
+
+class ReverseRelatedRfcSerializer(serializers.Serializer):
+    id = serializers.IntegerField(source="source.id")
+    number = serializers.IntegerField(source="source.rfc_number")
+    title = serializers.CharField(source="source.title")
+
+
+class ContainingSubseriesSerializer(serializers.Serializer):
+    name = serializers.CharField(source="source.name")
+    type = serializers.CharField(source="source.type_id")
+
+
+class RfcFormatSerializer(serializers.Serializer):
+    RFC_FORMATS = ("xml", "txt", "html", "pdf", "ps", "json", "notprepped")
+
+    fmt = serializers.ChoiceField(choices=RFC_FORMATS)
+    name = serializers.CharField(help_text="Name of blob in the blob store")
+
+
+class RfcMetadataSerializer(serializers.ModelSerializer):
+    """Serialize metadata of an RFC
+
+    This needs to be called with a Document queryset that has been processed with
+    api.augment_rfc_queryset() or it very likely will not work. Some of the typing
+    refers to Document, but this should really be WithAnnotations[Document, ...].
+    However, have not been able to make that work yet.
+    """
+
+    number = serializers.IntegerField(source="rfc_number")
+    published = serializers.DateField()
+    status = RfcStatusSerializer(source="*")
+    authors = serializers.SerializerMethodField()
+    group = GroupSerializer()
+    area = AreaSerializer(read_only=True)
+    stream = StreamNameSerializer()
+    ad = AreaDirectorSerializer(read_only=True, allow_null=True)
+    group_list_email = serializers.EmailField(source="group.list_email", read_only=True)
+    identifiers = serializers.SerializerMethodField()
+    draft = serializers.SerializerMethodField()
+    obsoletes = RelatedRfcSerializer(many=True, read_only=True)
+    obsoleted_by = ReverseRelatedRfcSerializer(many=True, read_only=True)
+    updates = RelatedRfcSerializer(many=True, read_only=True)
+    updated_by = ReverseRelatedRfcSerializer(many=True, read_only=True)
+    subseries = ContainingSubseriesSerializer(many=True, read_only=True)
+    formats = RfcFormatSerializer(
+        many=True, read_only=True, help_text="Available formats"
+    )
+    keywords = serializers.ListField(child=serializers.CharField(), read_only=True)
+    has_errata = serializers.BooleanField(read_only=True)
+
+    class Meta:
+        model = Document
+        fields = [
+            "number",
+            "title",
+            "published",
+            "status",
+            "pages",
+            "authors",
+            "group",
+            "area",
+            "stream",
+            "ad",
+            "group_list_email",
+            "identifiers",
+            "obsoletes",
+            "obsoleted_by",
+            "updates",
+            "updated_by",
+            "subseries",
+            "draft",
+            "abstract",
+            "formats",
+            "keywords",
+            "has_errata",
+        ]
+
+    @extend_schema_field(RfcAuthorSerializer(many=True))
+    def get_authors(self, doc: Document):
+        # If doc has any RfcAuthors, use those, otherwise fall back to DocumentAuthors
+        author_queryset: QuerySet[RfcAuthor] | QuerySet[DocumentAuthor] = (
+            doc.rfcauthor_set.all()
+            if doc.rfcauthor_set.exists()
+            else doc.documentauthor_set.all()
+        )
+        # RfcAuthorSerializer can deal with DocumentAuthor instances
+        return RfcAuthorSerializer(
+            instance=author_queryset,
+            many=True,
+        ).data
+
+    @extend_schema_field(DocIdentifierSerializer(many=True))
+    def get_identifiers(self, doc: Document):
+        identifiers = []
+        if doc.doi:
+            identifiers.append(
+                DocIdentifier(type="doi", value=doc.doi)
+            )
+        return DocIdentifierSerializer(instance=identifiers, many=True).data
+
+    @extend_schema_field(RelatedDraftSerializer)
+    def get_draft(self, doc: Document):
+        if hasattr(doc, "drafts"):
+            # This is the expected case - drafts is added by a Prefetch in
+            # the augment_rfc_queryset() method.
+            try:
+                related_doc = doc.drafts[0]
+            except IndexError:
+                return None
+        else:
+            # Fallback in case augment_rfc_queryset() was not called
+            log.log(
+                f"Warning: {self.__class__}.get_draft() called without prefetched draft"
+            )
+            related_doc = doc.came_from_draft()
+        return RelatedDraftSerializer(related_doc).data
+
+
+class RfcSerializer(RfcMetadataSerializer):
+    """Serialize an RFC, including its metadata and text content if available"""
+
+    text = serializers.CharField(allow_null=True)
+
+    class Meta:
+        model = RfcMetadataSerializer.Meta.model
+        fields = RfcMetadataSerializer.Meta.fields + ["text"]
+
+
+class SubseriesContentListSerializer(serializers.ListSerializer):
+    """ListSerializer that gets its object from item.target"""
+
+    def to_representation(self, data):
+        """
+        List of object instances -> List of dicts of primitive datatypes.
+        """
+        # Dealing with nested relationships, data can be a Manager,
+        # so, first get a queryset from the Manager if needed
+        iterable = data.all() if isinstance(data, BaseManager) else data
+        # Serialize item.target instead of item itself
+        return [self.child.to_representation(item.target) for item in iterable]
+
+
+class SubseriesContentSerializer(RfcMetadataSerializer):
+    """Serialize RFC contained in a subseries doc"""
+
+    class Meta(RfcMetadataSerializer.Meta):
+        list_serializer_class = SubseriesContentListSerializer
+
+
+class SubseriesDocSerializer(serializers.ModelSerializer):
+    """Serialize a subseries document (e.g., a BCP or STD)"""
+
+    contents = SubseriesContentSerializer(many=True)
+
+    class Meta:
+        model = Document
+        fields = [
+            "name",
+            "type",
+            "contents",
+        ]
diff --git a/ietf/doc/storage.py b/ietf/doc/storage.py
new file mode 100644
index 0000000000..ee1e76c4fa
--- /dev/null
+++ b/ietf/doc/storage.py
@@ -0,0 +1,181 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from typing import Optional
+
+import debug  # pyflakes:ignore
+import json
+
+from contextlib import contextmanager
+from storages.backends.s3 import S3Storage
+
+from django.core.files.base import File
+
+from ietf.blobdb.storage import BlobdbStorage
+from ietf.doc.models import StoredObject
+from ietf.utils.log import log
+from ietf.utils.storage import MetadataFile
+from ietf.utils.timezone import timezone
+
+
+class StoredObjectFile(MetadataFile):
+    """Django storage File object that represents a StoredObject"""
+    def __init__(self, file, name, mtime=None, content_type="", store=None, doc_name=None, doc_rev=None):
+        super().__init__(
+            file=file,
+            name=name,
+            mtime=mtime,
+            content_type=content_type,
+        )
+        self.store = store
+        self.doc_name = doc_name
+        self.doc_rev = doc_rev
+
+    @classmethod
+    def from_storedobject(cls, file, name, store):
+        """Alternate constructor for objects that already exist in the StoredObject table"""
+        stored_object = StoredObject.objects.exclude_deleted().filter(store=store, name=name).first()
+        if stored_object is None:
+            raise FileNotFoundError(f"StoredObject for {store}:{name} does not exist or was deleted")
+        file = cls(file, name, store, doc_name=stored_object.doc_name, doc_rev=stored_object.doc_rev)
+        if int(file.custom_metadata["len"]) != stored_object.len:
+            raise RuntimeError(f"File length changed unexpectedly for {store}:{name}")
+        if file.custom_metadata["sha384"] != stored_object.sha384:
+            raise RuntimeError(f"SHA-384 hash changed unexpectedly for {store}:{name}")
+        return file
+
+
+@contextmanager
+def maybe_log_timing(enabled, op, **kwargs):
+    """If enabled, log elapsed time and additional data from kwargs
+
+    Emits log even if an exception occurs
+    """
+    before = timezone.now()
+    exception = None
+    try:
+        yield
+    except Exception as err:
+        exception = err
+        raise
+    finally:
+        if enabled:
+            dt = timezone.now() - before
+            log(
+                json.dumps(
+                    {
+                        "log": "S3Storage_timing",
+                        "seconds": dt.total_seconds(),
+                        "op": op,
+                        "exception": "" if exception is None else repr(exception),
+                        **kwargs,
+                    }
+                )
+            )
+
+
+class MetadataS3Storage(S3Storage):
+    def get_default_settings(self):
+        # add a default for the ietf_log_blob_timing boolean
+        return super().get_default_settings() | {"ietf_log_blob_timing": False}
+
+    def _save(self, name, content: File):
+        with maybe_log_timing(
+            self.ietf_log_blob_timing, "_save", bucket_name=self.bucket_name, name=name
+        ):
+            return super()._save(name, content)
+
+    def _open(self, name, mode="rb"):
+        with maybe_log_timing(
+            self.ietf_log_blob_timing,
+            "_open",
+            bucket_name=self.bucket_name,
+            name=name,
+            mode=mode,
+        ):
+            return super()._open(name, mode)
+
+    def delete(self, name):
+        with maybe_log_timing(
+            self.ietf_log_blob_timing, "delete", bucket_name=self.bucket_name, name=name
+        ):
+            super().delete(name)
+
+    def _get_write_parameters(self, name, content=None):
+        # debug.show('f"getting write parameters for {name}"')
+        params = super()._get_write_parameters(name, content)
+        # If we have a non-empty explicit content type, use it
+        content_type = getattr(content, "content_type", "").strip()
+        if content_type != "":
+            params["ContentType"] = content_type
+        if "Metadata" not in params:
+            params["Metadata"] = {}
+        if hasattr(content, "custom_metadata"):
+            params["Metadata"].update(content.custom_metadata)
+        return params
+
+
+class StoredObjectBlobdbStorage(BlobdbStorage):
+    warn_if_missing = True  # TODO-BLOBSTORE make this configurable (or remove it)
+
+    def _save_stored_object(self, name, content) -> StoredObject:
+        now = timezone.now()
+        record, created = StoredObject.objects.get_or_create(
+            store=self.bucket_name,
+            name=name,
+            defaults=dict(
+                sha384=content.custom_metadata["sha384"],
+                len=int(content.custom_metadata["len"]),
+                store_created=now,
+                created=now,
+                modified=now,
+                doc_name=getattr(
+                    content,
+                    "doc_name",  # Note that these are assumed to be invariant
+                    None,  # should be blank?
+                ),
+                doc_rev=getattr(
+                    content,
+                    "doc_rev",  # for a given name
+                    None,  # should be blank?
+                ),
+            ),
+        )
+        if not created and (
+            record.sha384 != content.custom_metadata["sha384"]
+            or record.len != int(content.custom_metadata["len"])
+            or record.deleted is not None
+        ):
+            record.sha384 = content.custom_metadata["sha384"]
+            record.len = int(content.custom_metadata["len"])
+            record.modified = now
+            record.deleted = None
+            record.save()
+        return record
+
+    def _delete_stored_object(self, name) -> Optional[StoredObject]:
+        existing_record = StoredObject.objects.filter(store=self.bucket_name, name=name)
+        if not existing_record.exists() and self.warn_if_missing:
+            complaint = (
+                f"WARNING: Asked to delete {name} from {self.bucket_name} storage, "
+                f"but there was no matching StoredObject"
+            )
+            log(complaint)
+            debug.show("complaint")
+        else:
+            now = timezone.now()
+            # Note that existing_record is a queryset that will have one matching object
+            existing_record.exclude_deleted().update(deleted=now)
+        return existing_record.first()
+
+    def _save(self, name, content):
+        """Perform the save operation 
+        
+        In principle the name could change on save to the blob store. As of now, BlobdbStorage
+        will not change it, but allow for that possibility. Callers should be prepared for this.
+        """
+        saved_name = super()._save(name, content)
+        self._save_stored_object(saved_name, content)
+        return saved_name
+
+    def delete(self, name):
+        self._delete_stored_object(name)
+        super().delete(name)
diff --git a/ietf/doc/storage_utils.py b/ietf/doc/storage_utils.py
new file mode 100644
index 0000000000..9c18bb8a8a
--- /dev/null
+++ b/ietf/doc/storage_utils.py
@@ -0,0 +1,194 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+import datetime
+from io import BufferedReader
+from typing import Optional, Union
+
+import debug  # pyflakes ignore
+
+from django.conf import settings
+from django.core.files.base import ContentFile, File
+from django.core.files.storage import storages, Storage
+
+from ietf.utils.log import log
+from ietf.utils.text import decode_document_content
+
+
+class StorageUtilsError(Exception):
+    pass
+
+
+class AlreadyExistsError(StorageUtilsError):
+    pass
+
+
+def _get_storage(kind: str) -> Storage:
+    if kind in settings.ARTIFACT_STORAGE_NAMES:
+        return storages[kind]
+    else:
+        debug.say(f"Got into not-implemented looking for {kind}")
+        raise NotImplementedError(f"Don't know how to store {kind}")
+
+
+def exists_in_storage(kind: str, name: str) -> bool:
+    if settings.ENABLE_BLOBSTORAGE:
+        try:
+            store = _get_storage(kind)
+            with store.open(name):
+                return True
+        except FileNotFoundError:
+            return False
+        except Exception as err:
+            log(f"Blobstore Error: Failed to test existence of {kind}:{name}: {repr(err)}")
+            if settings.SERVER_MODE == "development":
+                raise
+    return False
+
+
+def remove_from_storage(kind: str, name: str, warn_if_missing: bool = True) -> None:
+    if settings.ENABLE_BLOBSTORAGE:
+        try:
+            if exists_in_storage(kind, name):
+                _get_storage(kind).delete(name)
+            elif warn_if_missing:
+                complaint = (
+                    f"WARNING: Asked to delete non-existent {name} from {kind} storage"
+                )
+                debug.show("complaint")
+                log(complaint)
+        except Exception as err:
+            log(f"Blobstore Error: Failed to remove {kind}:{name}: {repr(err)}")
+            if settings.SERVER_MODE == "development":
+                raise
+    return None
+
+
+def store_file(
+    kind: str,
+    name: str,
+    file: Union[File, BufferedReader],
+    allow_overwrite: bool = False,
+    doc_name: Optional[str] = None,
+    doc_rev: Optional[str] = None,
+    content_type: str="",
+    mtime: Optional[datetime.datetime]=None,
+) -> None:
+    from .storage import StoredObjectFile  # avoid circular import
+    if settings.ENABLE_BLOBSTORAGE:
+        try:
+            is_new = not exists_in_storage(kind, name)
+            # debug.show('f"Asked to store {name} in {kind}: is_new={is_new}, allow_overwrite={allow_overwrite}"')
+            if not allow_overwrite and not is_new:
+                debug.show('f"Failed to save {kind}:{name} - name already exists in store"')
+                raise AlreadyExistsError(f"Failed to save {kind}:{name} - name already exists in store")
+            new_name = _get_storage(kind).save(
+                name,
+                StoredObjectFile(
+                    file=file,
+                    name=name,
+                    doc_name=doc_name,
+                    doc_rev=doc_rev,
+                    mtime=mtime,
+                    content_type=content_type,
+                ),
+            )
+            if new_name != name:
+                complaint = f"Error encountered saving '{name}' - results stored in '{new_name}' instead."
+                debug.show("complaint")
+                raise StorageUtilsError(complaint)
+        except Exception as err:
+            log(f"Blobstore Error: Failed to store file {kind}:{name}: {repr(err)}")
+            if settings.SERVER_MODE == "development":
+                raise  # TODO-BLOBSTORE eventually make this an error for all modes
+    return None
+
+
+def store_bytes(
+    kind: str,
+    name: str,
+    content: bytes,
+    allow_overwrite: bool = False,
+    doc_name: Optional[str] = None,
+    doc_rev: Optional[str] = None,
+    content_type: str = "",
+    mtime: Optional[datetime.datetime] = None,
+) -> None:
+    if settings.ENABLE_BLOBSTORAGE:
+        try:
+            store_file(
+                kind,
+                name,
+                ContentFile(content),
+                allow_overwrite,
+                doc_name,
+                doc_rev,
+                content_type,
+                mtime,
+            )
+        except Exception as err:
+            # n.b., not likely to get an exception here because store_file or store_bytes will catch it
+            log(f"Blobstore Error: Failed to store bytes to {kind}:{name}: {repr(err)}")
+            if settings.SERVER_MODE == "development":
+                raise  # TODO-BLOBSTORE eventually make this an error for all modes
+    return None
+
+
+def store_str(
+    kind: str,
+    name: str,
+    content: str,
+    allow_overwrite: bool = False,
+    doc_name: Optional[str] = None,
+    doc_rev: Optional[str] = None,
+    content_type: str = "",
+    mtime: Optional[datetime.datetime] = None,
+) -> None:
+    if settings.ENABLE_BLOBSTORAGE:
+        try:
+            content_bytes = content.encode("utf-8")
+            store_bytes(
+                kind,
+                name,
+                content_bytes,
+                allow_overwrite,
+                doc_name,
+                doc_rev,
+                content_type,
+                mtime,
+            )
+        except Exception as err:
+            # n.b., not likely to get an exception here because store_file or store_bytes will catch it
+            log(f"Blobstore Error: Failed to store string to {kind}:{name}: {repr(err)}")
+            if settings.SERVER_MODE == "development":
+                raise  # TODO-BLOBSTORE eventually make this an error for all modes
+    return None
+
+
+def retrieve_bytes(kind: str, name: str) -> bytes:
+    from ietf.doc.storage import maybe_log_timing
+    if not settings.ENABLE_BLOBSTORAGE:
+        return b""
+    try:
+        store = _get_storage(kind)
+        with store.open(name) as f:
+            with maybe_log_timing(
+                hasattr(store, "ietf_log_blob_timing") and store.ietf_log_blob_timing,
+                "read",
+                bucket_name=store.bucket_name if hasattr(store, "bucket_name") else "",
+                name=name,
+            ):
+                content = f.read()
+    except Exception as err:
+        log(f"Blobstore Error: Failed to read bytes from {kind}:{name}: {repr(err)}")
+        raise
+    return content
+
+
+def retrieve_str(kind: str, name: str) -> str:
+    if not settings.ENABLE_BLOBSTORAGE:
+        return ""
+    try:
+        content = decode_document_content(retrieve_bytes(kind, name))
+    except Exception as err:
+        log(f"Blobstore Error: Failed to read string from {kind}:{name}: {repr(err)}")
+        raise
+    return content
diff --git a/ietf/doc/tasks.py b/ietf/doc/tasks.py
new file mode 100644
index 0000000000..273242e35f
--- /dev/null
+++ b/ietf/doc/tasks.py
@@ -0,0 +1,222 @@
+# Copyright The IETF Trust 2024-2026, All Rights Reserved
+#
+# Celery task definitions
+#
+import datetime
+
+import debug  # pyflakes:ignore
+
+from celery import shared_task
+from celery.exceptions import MaxRetriesExceededError
+from pathlib import Path
+
+from django.conf import settings
+from django.utils import timezone
+
+from ietf.doc.utils_r2 import rfcs_are_in_r2
+from ietf.doc.utils_red import trigger_red_precomputer
+from ietf.utils import log, searchindex
+from ietf.utils.timezone import datetime_today
+
+from .expire import (
+    in_draft_expire_freeze,
+    get_expired_drafts,
+    expirable_drafts,
+    send_expire_notice_for_draft,
+    expire_draft,
+    clean_up_draft_files,
+    get_soon_to_expire_drafts,
+    send_expire_warning_for_draft,
+)
+from .lastcall import get_expired_last_calls, expire_last_call
+from .models import Document, NewRevisionDocEvent
+from .utils import (
+    generate_idnits2_rfc_status,
+    generate_idnits2_rfcs_obsoleted,
+    rebuild_reference_relations,
+    update_or_create_draft_bibxml_file,
+    ensure_draft_bibxml_path_exists,
+    investigate_fragment,
+)
+from .utils_bofreq import fixup_bofreq_timestamps
+from .utils_errata import signal_update_rfc_metadata
+
+
+@shared_task
+def expire_ids_task():
+    try:
+        if not in_draft_expire_freeze():
+            log.log("Expiring drafts ...")
+            for doc in get_expired_drafts():
+                # verify expirability -- it might have changed after get_expired_drafts() was run
+                # (this whole loop took about 2 minutes on 04 Jan 2018)
+                # N.B., re-running expirable_drafts() repeatedly is fairly expensive. Where possible,
+                # it's much faster to run it once on a superset query of the objects you are going
+                # to test and keep its results. That's not desirable here because it would defeat
+                # the purpose of double-checking that a document is still expirable when it is actually
+                # being marked as expired.
+                if expirable_drafts(
+                    Document.objects.filter(pk=doc.pk)
+                ).exists() and doc.expires < datetime_today() + datetime.timedelta(1):
+                    send_expire_notice_for_draft(doc)
+                    expire_draft(doc)
+                    log.log(f"  Expired draft {doc.name}-{doc.rev}")
+
+        log.log("Cleaning up draft files")
+        clean_up_draft_files()
+    except Exception as e:
+        log.log("Exception in expire-ids: %s" % e)
+        raise
+
+
+@shared_task
+def notify_expirations_task(notify_days=14):
+    for doc in get_soon_to_expire_drafts(notify_days):
+        send_expire_warning_for_draft(doc)
+
+
+@shared_task
+def expire_last_calls_task():
+    for doc in get_expired_last_calls():
+        try:
+            expire_last_call(doc)
+        except Exception:
+            log.log(
+                f"ERROR: Failed to expire last call for {doc.file_tag()} (id={doc.pk})"
+            )
+        else:
+            log.log(f"Expired last call for {doc.file_tag()} (id={doc.pk})")
+
+
+@shared_task
+def generate_idnits2_rfc_status_task():
+    outpath = Path(settings.DERIVED_DIR) / "idnits2-rfc-status"
+    blob = generate_idnits2_rfc_status()
+    try:
+        outpath.write_text(blob, encoding="utf8")  # TODO-BLOBSTORE
+    except Exception as e:
+        log.log(f"failed to write idnits2-rfc-status: {e}")
+
+
+@shared_task
+def generate_idnits2_rfcs_obsoleted_task():
+    outpath = Path(settings.DERIVED_DIR) / "idnits2-rfcs-obsoleted"
+    blob = generate_idnits2_rfcs_obsoleted()
+    try:
+        outpath.write_text(blob, encoding="utf8")  # TODO-BLOBSTORE
+    except Exception as e:
+        log.log(f"failed to write idnits2-rfcs-obsoleted: {e}")
+
+
+@shared_task
+def generate_draft_bibxml_files_task(days=7, process_all=False):
+    """Generate bibxml files for recently updated docs
+
+    If process_all is False (the default), processes only docs with new revisions
+    in the last specified number of days.
+    """
+    if not process_all and days < 1:
+        raise ValueError("Must call with days >= 1 or process_all=True")
+    ensure_draft_bibxml_path_exists()
+    doc_events = NewRevisionDocEvent.objects.filter(
+        type="new_revision",
+        doc__type_id="draft",
+    ).order_by("time")
+    if not process_all:
+        doc_events = doc_events.filter(
+            time__gte=timezone.now() - datetime.timedelta(days=days)
+        )
+    for event in doc_events:
+        try:
+            update_or_create_draft_bibxml_file(event.doc, event.rev)
+        except Exception as err:
+            log.log(f"Error generating bibxml for {event.doc.name}-{event.rev}: {err}")
+
+
+@shared_task(ignore_result=False)
+def investigate_fragment_task(name_fragment: str):
+    return {
+        "name_fragment": name_fragment,
+        "results": investigate_fragment(name_fragment),
+    }
+
+
+@shared_task
+def rebuild_reference_relations_task(doc_names: list[str]):
+    log.log(f"Task: Rebuilding reference relations for {doc_names}")
+    for doc in Document.objects.filter(name__in=doc_names, type__in=["rfc", "draft"]):
+        filenames = dict()
+        base = (
+            settings.RFC_PATH
+            if doc.type_id == "rfc"
+            else settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
+        )
+        stem = doc.name if doc.type_id == "rfc" else f"{doc.name}-{doc.rev}"
+        for ext in ["xml", "txt"]:
+            path = Path(base) / f"{stem}.{ext}"
+            if path.is_file():
+                filenames[ext] = str(path)
+        if len(filenames) > 0:
+            rebuild_reference_relations(doc, filenames)
+        else:
+            log.log(f"Found no content for {stem}")
+
+
+@shared_task
+def fixup_bofreq_timestamps_task():  # pragma: nocover
+    fixup_bofreq_timestamps()
+
+
+@shared_task
+def signal_update_rfc_metadata_task(rfc_number_list=()):
+    signal_update_rfc_metadata(rfc_number_list)
+
+
+@shared_task(bind=True)
+def trigger_red_precomputer_task(self, rfc_number_list=()):
+    if not rfcs_are_in_r2(rfc_number_list):
+        log.log(f"Objects are not yet in R2 for RFCs {rfc_number_list}")
+        try:
+            countdown = getattr(settings, "RED_PRECOMPUTER_TRIGGER_RETRY_DELAY", 10)
+            max_retries = getattr(settings, "RED_PRECOMPUTER_TRIGGER_MAX_RETRIES", 12)
+            self.retry(countdown=countdown, max_retries=max_retries)
+        except MaxRetriesExceededError:
+            log.log(f"Gave up waiting for objects in R2 for RFCs {rfc_number_list}")
+    else:
+        trigger_red_precomputer(rfc_number_list)
+
+
+@shared_task(bind=True)
+def update_rfc_searchindex_task(self, rfc_number: int):
+    """Update the search index for one RFC"""
+    if not searchindex.enabled():
+        log.log("Search indexing is not enabled, skipping")
+        return
+
+    rfc = Document.objects.filter(type_id="rfc", rfc_number=rfc_number).first()
+    if rfc is None:
+        log.log(
+            f"ERROR: Document for rfc{rfc_number} not found, not updating search index"
+        )
+        return
+    try:
+        searchindex.update_or_create_rfc_entry(rfc)
+    except Exception as err:
+        log.log(f"Search index update for {rfc.name} failed ({err})")
+        if isinstance(err, searchindex.RETRYABLE_ERROR_CLASSES):
+            searchindex_settings = searchindex.get_settings()
+            self.retry(
+                countdown=searchindex_settings["TASK_RETRY_DELAY"],
+                max_retries=searchindex_settings["TASK_MAX_RETRIES"],
+            )
+
+
+@shared_task
+def rebuild_searchindex_task(*, batchsize=40, drop_collection=False):
+    if drop_collection:
+        searchindex.delete_collection()
+        searchindex.create_collection()
+    searchindex.update_or_create_rfc_entries(
+        Document.objects.filter(type_id="rfc").order_by("-rfc_number"),
+        batchsize=batchsize,
+    )
diff --git a/ietf/doc/templatetags/active_groups_menu.py b/ietf/doc/templatetags/active_groups_menu.py
index dd97c8e45b..c60d6dcd1a 100644
--- a/ietf/doc/templatetags/active_groups_menu.py
+++ b/ietf/doc/templatetags/active_groups_menu.py
@@ -8,23 +8,19 @@
 
 register = template.Library()
 
-parents = GroupTypeName.objects.filter(
-    slug__in=["ag", "area", "rag", "team", "dir", "program"]
-)
-
-others = []
-for group in Group.objects.filter(acronym__in=("rsoc",), state_id="active"):
-    group.menu_url = reverse("ietf.group.views.group_home", kwargs=dict(acronym=group.acronym))  # type: ignore
-    # could use group.about_url() instead
-    others.append(group)
-
 
 @register.simple_tag
 def active_groups_menu(flavor):
-    global parents, others
+    parents = GroupTypeName.objects.filter(slug__in=["ag", "area", "rag", "team", "dir", "program", "iabworkshop"])
+    others = []
+    for group in Group.objects.filter(acronym__in=("rsoc",), state_id="active"):
+        group.menu_url = reverse("ietf.group.views.group_home", kwargs=dict(acronym=group.acronym))  # type: ignore
+        # could use group.about_url() instead
+        others.append(group)
+
     for p in parents:
         p.menu_url = "/%s/" % p.slug
     return render_to_string(
         "base/menu_active_groups.html",
         {"parents": parents, "others": others, "flavor": flavor},
-    )
\ No newline at end of file
+    )
diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py
index ee6be139c2..07a6c7f926 100644
--- a/ietf/doc/templatetags/ballot_icon.py
+++ b/ietf/doc/templatetags/ballot_icon.py
@@ -38,6 +38,7 @@
 from django import template
 from django.urls import reverse as urlreverse
 from django.db.models import Q
+from django.utils import timezone
 from django.utils.safestring import mark_safe
 
 from ietf.ietfauth.utils import user_is_person, has_role
@@ -52,7 +53,9 @@ def showballoticon(doc):
     if doc.type_id == "draft":
         if doc.stream_id == 'ietf' and doc.get_state_slug("draft-iesg") not in IESG_BALLOT_ACTIVE_STATES:
             return False
-        elif doc.stream_id == 'irtf' and doc.get_state_slug("draft-stream-irtf") not in ['irsgpoll']:
+        elif doc.stream_id == 'irtf' and doc.get_state_slug("draft-stream-irtf") != "irsgpoll":
+            return False
+        elif doc.stream_id == 'editorial' and doc.get_state_slug("draft-stream-rsab") != "rsabpoll":
             return False
     elif doc.type_id == "charter":
         if doc.get_state_slug() not in ("intrev", "extrev", "iesgrev"):
@@ -93,9 +96,14 @@ def sort_key(t):
     positions = list(ballot.active_balloter_positions().items())
     positions.sort(key=sort_key)
 
+    request = context.get("request")
+    ballot_edit_return_point_param = f"ballot_edit_return_point={request.path}"
+
     right_click_string = ''
     if has_role(user, "Area Director"):
-        right_click_string = 'oncontextmenu="window.location.href=\'%s\';return false;"' %  urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk))
+        right_click_string = 'oncontextmenu="window.location.href=\'{}?{}\';return false;"'.format(
+            urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
+            ballot_edit_return_point_param)
 
     my_blocking = False
     for i, (balloter, pos) in enumerate(positions):
@@ -104,14 +112,20 @@ def sort_key(t):
             break
 
     typename = "Unknown"
-    if ballot.ballot_type.slug=='irsg-approve':
+    if ballot.ballot_type.slug == "irsg-approve":
         typename = "IRSG"
+    elif ballot.ballot_type.slug == "rsab-approve":
+        typename = "RSAB"
     else:
         typename = "IESG"
+    
+    modal_url = "{}?{}".format(
+        urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
+        ballot_edit_return_point_param)
 
     res = ['<a %s href="%s" data-bs-toggle="modal" data-bs-target="#modal-%d" aria-label="%s positions" title="%s positions (click to show more)" class="ballot-icon"><table' % (
             right_click_string,
-            urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
+            modal_url,
             ballot.pk,
             typename,
             typename,)]
@@ -139,7 +153,7 @@ def sort_key(t):
         i = i + 1
 
     res.append("</tr></tbody></table></a>")
-    res.append('<div id="modal-%d" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"><div class="modal-dialog modal-dialog-scrollable modal-xl"><div class="modal-content"></div></div></div>' % ballot.pk)
+    res.append('<div id="modal-%d" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"><div class="modal-dialog modal-dialog-scrollable modal-xl modal-fullscreen-lg-down"><div class="modal-content"></div></div></div>' % ballot.pk)
 
     return mark_safe("".join(res))
 
@@ -170,22 +184,21 @@ def state_age_colored(doc):
         if not iesg_state:
             return ""
 
-        if iesg_state in ["dead", "watching", "pub", "idexists"]:
+        if iesg_state in ["dead", "pub", "idexists"]:
             return ""
         try:
-            state_date = (
+            state_datetime = (
                 doc.docevent_set.filter(
                     Q(type="started_iesg_process")
                     | Q(type="changed_state", statedocevent__state_type="draft-iesg")
                 )
                 .order_by("-time")[0]
-                .time.date()
+                .time
             )
         except IndexError:
-            state_date = datetime.date(1990, 1, 1)
-        days = (datetime.date.today() - state_date).days
-        # loosely based on
-        # https://trac.ietf.org/trac/iesg/wiki/PublishPath
+            state_datetime = datetime.datetime(1990, 1, 1, tzinfo=datetime.UTC)
+        days = (timezone.now() - state_datetime).days
+        # loosely based on the Publish Path page at the iesg wiki
         if iesg_state == "lc":
             goal1 = 30
             goal2 = 30
@@ -208,9 +221,9 @@ def state_age_colored(doc):
             goal1 = 14
             goal2 = 28
         if days > goal2:
-            class_name = "bg-danger"
+            class_name = "text-bg-danger"
         elif days > goal1:
-            class_name = "bg-warning"
+            class_name = "text-bg-warning"
         else:
             # don't show a badge when things are in the green; clutters display
             # class_name = "text-success"
@@ -243,6 +256,6 @@ def auth48_alert_badge(doc):
 
     rfced_state = doc.get_state_slug('draft-rfceditor')
     if rfced_state == 'auth48':
-        return mark_safe('<span class="badge rounded-pill bg-info" title="AUTH48">AUTH48</span>')
+        return mark_safe('<span class="badge rounded-pill text-bg-info" title="AUTH48">AUTH48</span>')
 
     return ''
diff --git a/ietf/doc/templatetags/document_type_badge.py b/ietf/doc/templatetags/document_type_badge.py
new file mode 100644
index 0000000000..a82c606ff9
--- /dev/null
+++ b/ietf/doc/templatetags/document_type_badge.py
@@ -0,0 +1,29 @@
+# Copyright The IETF Trust 2015-2020, All Rights Reserved
+from django import template
+from django.conf import settings
+from django.template.loader import render_to_string
+from ietf.utils.log import log
+
+register = template.Library()
+
+
+@register.simple_tag
+def document_type_badge(doc, snapshot, submission, resurrected_by):
+    context = {"doc": doc, "snapshot": snapshot, "submission": submission, "resurrected_by": resurrected_by}
+    if doc.type_id == "rfc":
+        return render_to_string(
+            "doc/badge/doc-badge-rfc.html",
+            context,
+        )
+    elif doc.type_id == "draft":
+        return render_to_string(
+            "doc/badge/doc-badge-draft.html",
+            context,
+        )
+    else:
+        error_message = f"Unsupported document type {doc.type_id}."
+        if settings.SERVER_MODE != 'production':
+            raise ValueError(error_message)
+        else:
+            log(error_message)
+        return ""
diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index c309a7ebdf..ae5df641c2 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -1,10 +1,12 @@
-# Copyright The IETF Trust 2007-2020, All Rights Reserved
+# Copyright The IETF Trust 2007-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
 import re
+from pathlib import Path
 from urllib.parse import urljoin
+from zoneinfo import ZoneInfo
 
 from django import template
 from django.conf import settings
@@ -12,21 +14,23 @@
 from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, striptags
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.html import strip_tags
-from django.utils.encoding import force_text
-from django.utils.encoding import force_str # pyflakes:ignore force_str is used in the doctests
+from django.utils.encoding import force_str
 from django.urls import reverse as urlreverse
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.urls import NoReverseMatch
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import BallotDocEvent, DocAlias
+from ietf.doc.models import BallotDocEvent, Document
 from ietf.doc.models import ConsensusDocEvent
-from ietf.utils.html import sanitize_fragment
+from ietf.ietfauth.utils import can_request_rfc_publication as utils_can_request_rfc_publication
 from ietf.utils import log
 from ietf.doc.utils import prettify_std_name
-from ietf.utils.text import wordwrap, fill, wrap_text_if_unwrapped, bleach_linker, bleach_cleaner, validate_url
+from ietf.utils.html import clean_html
+from ietf.utils.text import wordwrap, fill, wrap_text_if_unwrapped, linkify
+from ietf.utils.validators import validate_url
 
 register = template.Library()
 
@@ -95,7 +99,7 @@ def sanitize(value):
     attributes to those deemed acceptable.  See ietf/utils/html.py
     for the details.
     """
-    return mark_safe(sanitize_fragment(value))
+    return mark_safe(clean_html(value))
 
 
 # For use with ballot view
@@ -129,7 +133,7 @@ def bracketpos(pos,posslug):
 @register.filter
 def prettystdname(string, space=" "):
     from ietf.doc.utils import prettify_std_name
-    return prettify_std_name(force_text(string or ""), space)
+    return prettify_std_name(force_str(string or ""), space)
 
 @register.filter
 def rfceditor_info_url(rfcnum : str):
@@ -137,15 +141,16 @@ def rfceditor_info_url(rfcnum : str):
     return urljoin(settings.RFC_EDITOR_INFO_BASE_URL, f'rfc{rfcnum}')
 
 
-def doc_canonical_name(name):
+def doc_name(name):
     """Check whether a given document exists, and return its canonical name"""
 
     def find_unique(n):
         key = hash(n)
         found = cache.get(key)
         if not found:
-            exact = DocAlias.objects.filter(name=n).first()
+            exact = Document.objects.filter(name=n).first()
             found = exact.name if exact else "_"
+            # TODO review this cache policy (and the need for these entire function)
             cache.set(key, found, timeout=60*60*24)  # cache for one day
         return None if found == "_" else found
 
@@ -171,7 +176,7 @@ def find_unique(n):
 
 
 def link_charter_doc_match(match):
-    if not doc_canonical_name(match[0]):
+    if not doc_name(match[0]):
         return match[0]
     url = urlreverse(
         "ietf.doc.views_doc.document_main",
@@ -184,7 +189,7 @@ def link_non_charter_doc_match(match):
     name = match[0]
     # handle "I-D.*"" reference-style matches
     name = re.sub(r"^i-d\.(.*)", r"draft-\1", name, flags=re.IGNORECASE)
-    cname = doc_canonical_name(name)
+    cname = doc_name(name)
     if not cname:
         return match[0]
     if name == cname:
@@ -199,7 +204,7 @@ def link_non_charter_doc_match(match):
         url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=cname))
         return f'<a href="{url}">{match[0]}</a>'
 
-    cname = doc_canonical_name(name)
+    cname = doc_name(name)
     if not cname:
         return match[0]
     if name == cname:
@@ -219,12 +224,11 @@ def link_non_charter_doc_match(match):
 def link_other_doc_match(match):
     doc = match[2].strip().lower()
     rev = match[3]
-    if not doc_canonical_name(doc + rev):
+    if not doc_name(doc + rev):
         return match[0]
     url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc + rev))
     return f'<a href="{url}">{match[1]}</a>'
 
-
 @register.filter(name="urlize_ietf_docs", is_safe=True, needs_autoescape=True)
 def urlize_ietf_docs(string, autoescape=None):
     """
@@ -248,58 +252,57 @@ def urlize_ietf_docs(string, autoescape=None):
         flags=re.IGNORECASE | re.ASCII,
     )
     string = re.sub(
-        r"\b(?<![/\-:=#\"\'])((RFC|BCP|STD|FYI)\s*0*(\d+))\b",
+        r"\b(?<![/\-:=#\"\'])((RFC|BCP|STD|FYI) *\n? *0*(\d+))\b",
         link_other_doc_match,
         string,
         flags=re.IGNORECASE | re.ASCII,
     )
+
     return mark_safe(string)
 
 
 urlize_ietf_docs = stringfilter(urlize_ietf_docs)
 
-@register.filter(name='urlize_related_source_list', is_safe=True, needs_autoescape=True)
-def urlize_related_source_list(related, autoescape=None):
+@register.filter(name='urlize_related_source_list', is_safe=True, document_html=False)
+def urlize_related_source_list(related, document_html=False):
     """Convert a list of RelatedDocuments into list of links using the source document's canonical name"""
     links = []
     names = set()
     titles = set()
     for rel in related:
-        name=rel.source.canonical_name()
+        name=rel.source.name
         title = rel.source.title
         if name in names and title in titles:
             continue
         names.add(name)
         titles.add(title)
-        url = urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=name))
-        if autoescape:
-            name = escape(name)
-            title = escape(title)
+        url = urlreverse('ietf.doc.views_doc.document_main' if document_html is False else 'ietf.doc.views_doc.document_html', kwargs=dict(name=name))
+        name = escape(name)
+        title = escape(title)
         links.append(mark_safe(
             '<a href="%(url)s" title="%(title)s">%(name)s</a>' % dict(name=prettify_std_name(name),
                                                                       title=title,
                                                                       url=url)
         ))
     return links
-        
-@register.filter(name='urlize_related_target_list', is_safe=True, needs_autoescape=True)
-def urlize_related_target_list(related, autoescape=None):
+
+@register.filter(name='urlize_related_target_list', is_safe=True, document_html=False)
+def urlize_related_target_list(related, document_html=False):
     """Convert a list of RelatedDocuments into list of links using the target document's canonical name"""
     links = []
     for rel in related:
-        name=rel.target.document.canonical_name()
-        title = rel.target.document.title
-        url = urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=name))
-        if autoescape:
-            name = escape(name)
-            title = escape(title)
+        name=rel.target.name
+        title = rel.target.title
+        url = urlreverse('ietf.doc.views_doc.document_main' if document_html is False else 'ietf.doc.views_doc.document_html', kwargs=dict(name=name))
+        name = escape(name)
+        title = escape(title)
         links.append(mark_safe(
             '<a href="%(url)s" title="%(title)s">%(name)s</a>' % dict(name=prettify_std_name(name),
                                                                       title=title,
                                                                       url=url)
         ))
     return links
-        
+
 @register.filter(name='dashify')
 def dashify(string):
     """
@@ -315,10 +318,19 @@ def underline(string):
 
 @register.filter(name='timesince_days')
 def timesince_days(date):
-    """Returns the number of days since 'date' (relative to now)"""
+    """Returns the number of days since 'date' (relative to now)
+
+    >>> timesince_days(timezone.now() - datetime.timedelta(days=2))
+    2
+
+    >>> tz = ZoneInfo(settings.TIME_ZONE)
+    >>> timesince_days(timezone.now().astimezone(tz).date() - datetime.timedelta(days=2))
+    2
+
+    """
     if date.__class__ is not datetime.datetime:
-        date = datetime.datetime(date.year, date.month, date.day)
-    delta = datetime.datetime.now() - date
+        date = datetime.datetime(date.year, date.month, date.day, tzinfo=ZoneInfo(settings.TIME_ZONE))
+    delta = timezone.now() - date
     return delta.days
 
 @register.filter
@@ -400,9 +412,9 @@ def startswith(x, y):
     return str(x).startswith(y)
 
 
-@register.filter(name='removesuffix', is_safe=False)
-def removesuffix(value, suffix):
-    """Remove an exact-match suffix
+@register.filter(name='removeprefix', is_safe=False)
+def removeprefix(value, prefix):
+    """Remove an exact-match prefix
     
     The is_safe flag is False because indiscriminate use of this could result in non-safe output.
     See https://docs.djangoproject.com/en/2.2/howto/custom-template-tags/#filters-and-auto-escaping
@@ -410,8 +422,8 @@ def removesuffix(value, suffix):
     HTML-unsafe output.
     """
     base = str(value)
-    if base.endswith(suffix):
-        return base[:-len(suffix)]
+    if base.startswith(prefix):
+        return base[len(prefix):]
     else:
         return base
 
@@ -435,16 +447,16 @@ def ad_area(user):
 @register.filter
 def format_history_text(text, trunc_words=25):
     """Run history text through some cleaning and add ellipsis if it's too long."""
-    full = mark_safe(bleach_cleaner.clean(text))
-    full = bleach_linker.linkify(urlize_ietf_docs(full))
+    full = mark_safe(clean_html(text))
+    full = linkify(urlize_ietf_docs(full))
 
     return format_snippet(full, trunc_words)
 
 @register.filter
 def format_snippet(text, trunc_words=25): 
     # urlize if there aren't already links present
-    text = bleach_linker.linkify(text)
-    full = keep_spacing(collapsebr(linebreaksbr(mark_safe(sanitize_fragment(text)))))
+    text = linkify(text)
+    full = keep_spacing(collapsebr(linebreaksbr(mark_safe(clean_html(text)))))
     snippet = truncatewords_html(full, trunc_words)
     if snippet != full:
         return mark_safe('<div class="snippet">%s<button type="button" aria-label="Expand" class="btn btn-sm btn-primary show-all"><i class="bi bi-caret-down"></i></button></div><div class="d-none full">%s</div>' % (snippet, full))
@@ -468,6 +480,19 @@ def state(doc, slug):
         slug = "%s-stream-%s" % (doc.type_id, doc.stream_id)
     return doc.get_state(slug)
 
+
+@register.filter
+def is_unexpected_wg_state(doc):
+    """Returns a flag indicating whether the document has an unexpected wg state."""
+    if not doc.type_id == "draft":
+        return False
+
+    draft_iesg_state = doc.get_state("draft-iesg")
+    draft_stream_state = doc.get_state("draft-stream-ietf")
+
+    return draft_iesg_state.slug != "idexists" and draft_stream_state is not None and draft_stream_state.slug != "sub-pub"
+
+
 @register.filter
 def statehelp(state):
     "Output help icon with tooltip for state."
@@ -496,10 +521,89 @@ def plural(text, seq, arg='s'):
     else:
         return text + pluralize(len(seq), arg)
 
+
+# Translation table to escape ICS characters. The {} | {} construction builds up a dict
+# mapping characters to arbitrary-length strings or None. Values in later dicts override
+# earlier ones prior to conversion to a translation table, so excluding a char and then
+# mapping it to an escape sequence results in its being escaped, not dropped.
+rfc5545_text_escapes = str.maketrans(
+    # text       = *(TSAFE-CHAR / ":" / DQUOTE / ESCAPED-CHAR)
+    # TSAFE-CHAR = WSP / %x21 / %x23-2B / %x2D-39 / %x3C-5B /
+    #                    %x5D-7E / NON-US-ASCII
+    {chr(c): None for c in range(0x00, 0x20)}  # strip 0x00-0x20
+    | {
+        # ESCAPED-CHAR = ("\\" / "\;" / "\," / "\N" / "\n")
+        "\n": r"\n",
+        ";": r"\;",
+        ",": r"\,",
+        "\\": r"\\",  # rhs is two backslashes!
+        "\t": "\t",  # htab ok (0x09)
+        " ": " ",  # space ok (0x20)
+    }
+)
+
+
 @register.filter
 def ics_esc(text):
-    text = re.sub(r"([\n,;\\])", r"\\\1", text)
-    return text
+    """Escape a string to use in an iCalendar text context
+    
+    >>> ics_esc('simple')
+    'simple'
+    
+    For the next tests, it helps to know:
+      chr(0x09) = "\t"
+      chr(0x0a) = "\n"
+      chr(0x0d) = "\r"
+      chr(0x5c) = "\\"
+    
+    >>> ics_esc(f'strips{chr(0x0d)}out{chr(0x0d)}LFs')
+    'stripsoutLFs'
+    
+    
+    >>> ics_esc(f'escapes;and,and{chr(0x5c)}and{chr(0x0a)}')
+    'escapes\\\\;and\\\\,and\\\\\\\\and\\\\n'
+    
+    >>> ics_esc(f"keeps spaces : and{chr(0x09)}tabs")
+    'keeps spaces : and\\ttabs'
+    """
+    return text.translate(rfc5545_text_escapes)
+
+
+@register.simple_tag
+def ics_date_time(dt, tzname):
+    """Render a datetime as an iCalendar date-time
+
+    dt a datetime, localized to the timezone to be displayed
+    tzname is the name for this timezone
+
+    Caller must arrange for a VTIMEZONE for the tzname to be included in the iCalendar file.
+    Output includes a ':'. Use like:
+      DTSTART{% ics_date_time timestamp 'America/Los_Angeles' %}
+    to get
+      DTSTART;TZID=America/Los_Angeles:20221021T111200
+
+    >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'utc')
+    ':20220102T030405Z'
+
+    >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'UTC')
+    ':20220102T030405Z'
+
+    >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'GmT')
+    ':20220102T030405Z'
+
+    >>> ics_date_time(datetime.datetime(2022,1,2,3,4,5), 'America/Los_Angeles')
+    ';TZID=America/Los_Angeles:20220102T030405'
+    """
+    timestamp = dt.strftime('%Y%m%dT%H%M%S')
+    if tzname.lower() in ('gmt', 'utc'):
+        return f':{timestamp}Z'
+    else:
+        return f';TZID={ics_esc(tzname)}:{timestamp}'
+
+@register.filter
+def next_day(value):
+    return value + datetime.timedelta(days=1)
+
 
 @register.filter
 def consensus(doc):
@@ -513,6 +617,19 @@ def consensus(doc):
     else:
         return "Unknown"
 
+
+@register.filter
+def std_level_to_label_format(doc):
+    """Returns valid Bootstrap classes to label a status level badge."""
+    if doc.type_id == "rfc":
+        if doc.related_that("obs"):
+            return "obs"
+        else:
+            return doc.std_level_id
+    else:
+        return "draft"
+
+
 @register.filter
 def pos_to_label_format(text):
     """Returns valid Bootstrap classes to label a ballot position."""
@@ -525,6 +642,8 @@ def pos_to_label_format(text):
         'Recuse':       'bg-recuse text-light',
         'Not Ready':    'bg-discuss text-light',
         'Need More Time': 'bg-discuss text-light',
+        'Concern': 'bg-discuss text-light',
+
     }.get(str(text), 'bg-norecord text-dark')
 
 @register.filter
@@ -539,6 +658,7 @@ def pos_to_border_format(text):
         'Recuse':       'border-recuse',
         'Not Ready':    'border-discuss',
         'Need More Time': 'border-discuss',
+        'Concern': 'border-discuss',
     }.get(str(text), 'border-norecord')
 
 @register.filter
@@ -598,7 +718,7 @@ def rfcbis(s):
 @stringfilter
 def urlize(value):
     raise RuntimeError("Use linkify from textfilters instead of urlize")
-    
+
 @register.filter
 @stringfilter
 def charter_major_rev(rev):
@@ -612,17 +732,25 @@ def charter_minor_rev(rev):
 @register.filter()
 def can_defer(user,doc):
     ballot = doc.latest_event(BallotDocEvent, type="created_ballot")
-    if ballot and (doc.type_id == "draft" or doc.type_id == "conflrev") and doc.stream_id == 'ietf' and has_role(user, 'Area Director,Secretariat'):
+    if ballot and (doc.type_id == "draft" or doc.type_id == "conflrev" or doc.type_id=="statchg") and doc.stream_id == 'ietf' and has_role(user, 'Area Director,Secretariat'):
         return True
     else:
         return False
 
+@register.filter()
+def can_clear_ballot(user, doc):
+    return can_defer(user, doc)
+
+@register.filter()
+def can_request_rfc_publication(user, doc):
+    return utils_can_request_rfc_publication(user, doc)
+
 @register.filter()
 def can_ballot(user,doc):
-    # Only IRSG memebers (and the secretariat, handled by code separately) can take positions on IRTF documents
-    # Otherwise, an AD can take a position on anything that has a ballot open
-    if doc.type_id == 'draft' and doc.stream_id == 'irtf':
-        return has_role(user,'IRSG Member')
+    if doc.stream_id == "irtf" and doc.type_id == "draft":
+        return has_role(user,"IRSG Member")
+    elif doc.stream_id == "editorial" and doc.type_id == "draft":
+        return has_role(user,"RSAB Member")
     else:
         return user.person.role_set.filter(name="ad", group__type="area", group__state="active")
 
@@ -637,22 +765,22 @@ def action_holder_badge(action_holder):
     >>> action_holder_badge(DocumentActionHolderFactory())
     ''
 
-    >>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=15)))
+    >>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=15)))
     ''
 
-    >>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=16)))
-    '<span class="badge rounded-pill bg-danger" title="In state for 16 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 16</span>'
+    >>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=16)))
+    '<span class="badge rounded-pill text-bg-danger" title="In state for 16 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 16</span>'
 
-    >>> action_holder_badge(DocumentActionHolderFactory(time_added=datetime.datetime.now() - datetime.timedelta(days=30)))
-    '<span class="badge rounded-pill bg-danger" title="In state for 30 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 30</span>'
+    >>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=30)))
+    '<span class="badge rounded-pill text-bg-danger" title="In state for 30 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 30</span>'
 
     >>> settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS = old_limit
     """
     age_limit = settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS
-    age = (datetime.datetime.now() - action_holder.time_added).days
+    age = (timezone.now() - action_holder.time_added).days
     if age > age_limit:
         return mark_safe(
-            '<span class="badge rounded-pill bg-danger" title="In state for %d day%s; goal is &lt;%d days."><i class="bi bi-clock-fill"></i> %d</span>'
+            '<span class="badge rounded-pill text-bg-danger" title="In state for %d day%s; goal is &lt;%d days."><i class="bi bi-clock-fill"></i> %d</span>'
             % (age, "s" if age != 1 else "", age_limit, age)
         )
     else:
@@ -779,3 +907,171 @@ def is_valid_url(url):
     except ValidationError:
         return False
     return True
+
+
+@register.filter
+def badgeify(blob):
+    """
+    Add an appropriate bootstrap badge around "text", based on its contents.
+    """
+    config = [
+        (r"rejected|not ready|serious issues", "danger", "x-lg"),
+        (r"complete|accepted|ready", "success", ""),
+        (r"has nits|almost ready", "info", "info-lg"),
+        (r"has issues|on the right track", "warning", "exclamation-lg"),
+        (r"assigned", "info", "person-plus-fill"),
+        (r"will not review|overtaken by events|withdrawn", "secondary", "dash-lg"),
+        (r"no response", "warning", "question-lg"),
+    ]
+    text = str(blob)
+
+    for pattern, color, icon in config:
+        if re.search(pattern, text, flags=re.IGNORECASE):
+            # Shorten the badge text
+            text = re.sub(r"with ", "w/", text, flags=re.IGNORECASE)
+            text = re.sub(r"document", "doc", text, flags=re.IGNORECASE)
+            text = re.sub(r"will not", "won't", text, flags=re.IGNORECASE)
+
+            return mark_safe(
+                f"""
+                <span class="badge rounded-pill text-bg-{color} text-wrap">
+                    <i class="bi bi-{icon}"></i> {text.capitalize()}
+                </span>
+                """
+            )
+
+    return text
+
+@register.filter
+def simple_history_delta_changes(history):
+    """Returns diff between given history and previous entry."""
+    prev = history.prev_record
+    if prev:
+        delta = history.diff_against(prev)
+        return delta.changes
+    return []
+
+@register.filter
+def simple_history_delta_change_cnt(history):
+    """Returns number of changes between given history and previous entry."""
+    prev = history.prev_record
+    if prev:
+        delta = history.diff_against(prev)
+        return len(delta.changes)
+    return 0
+
+@register.filter
+def mtime(path):
+    """Returns a datetime object representing mtime given a pathlib Path object"""
+    return datetime.datetime.fromtimestamp(path.stat().st_mtime).astimezone(ZoneInfo(settings.TIME_ZONE))
+
+@register.filter
+def mtime_is_epoch(path):
+    return path.stat().st_mtime == 0
+
+@register.filter
+def url_for_path(path):
+    """Consructs a 'best' URL for web access to the given pathlib Path object.
+
+    Assumes that the path is into the Internet-Draft archive or the proceedings.
+    """
+    if Path(settings.AGENDA_PATH) in path.parents:
+        return (
+            f"https://www.ietf.org/proceedings/{path.relative_to(settings.AGENDA_PATH)}"
+        )
+    elif any(
+        [
+            pathdir in path.parents
+            for pathdir in [
+                Path(settings.INTERNET_DRAFT_PATH),
+                Path(settings.INTERNET_DRAFT_ARCHIVE_DIR).parent,
+                Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR),
+            ]
+        ]
+    ):
+        return f"{settings.IETF_ID_ARCHIVE_URL}{path.name}"
+    else:
+        return "#"
+
+
+@register.filter
+def is_in_stream(doc):
+    """
+    Check if the doc is in one of the states in it stream that
+    indicate that is actually adopted, i.e., part of the stream.
+    (There are various "candidate" states that necessitate this
+    filter.)
+    """
+    if not doc.stream:
+        return False
+    stream = doc.stream.slug
+    state = doc.get_state_slug(f"draft-stream-{doc.stream.slug}")
+    if not state:
+        return True
+    if stream == "ietf":
+        return state not in ["wg-cand", "c-adopt"]
+    elif stream == "irtf":
+        return state != "candidat"
+    elif stream == "iab":
+        return state not in ["candidat", "diff-org"]
+    elif stream == "editorial":
+        return True
+    return False
+
+
+@register.filter
+def is_doc_ietf_adoptable(doc):
+    return doc.stream_id is None or all(
+        [
+            doc.stream_id == "ietf",
+            doc.get_state_slug("draft-stream-ietf")
+            not in [
+                "c-adopt",
+                "adopt-wg",
+                "info",
+                "wg-doc",
+                "parked",
+                "dead",
+                "wg-lc",
+                "waiting-for-implementation",
+                "chair-w",
+                "writeupw",
+                "sub-pub",
+            ],
+            doc.get_state_slug("draft") != "rfc",
+            doc.became_rfc() is None,
+        ]
+    )
+
+
+@register.filter
+def can_issue_ietf_wg_lc(doc):
+    return all(
+        [
+            doc.stream_id == "ietf",
+            doc.get_state_slug("draft-stream-ietf")
+            not in ["wg-cand", "c-adopt", "wg-lc"],
+            doc.get_state_slug("draft") != "rfc",
+            doc.became_rfc() is None,
+        ]
+    )
+
+
+@register.filter
+def can_submit_to_iesg(doc):
+    return all(
+        [
+            doc.stream_id == "ietf",
+            doc.get_state_slug("draft-iesg") == "idexists",
+            doc.get_state_slug("draft-stream-ietf") not in ["wg-cand", "c-adopt"],
+        ]
+    )
+
+
+@register.filter
+def has_had_ietf_wg_lc(doc):
+    return (
+        doc.stream_id == "ietf"
+        and doc.docevent_set.filter(statedocevent__state__slug="wg-lc").exists()
+    )
+
diff --git a/ietf/doc/templatetags/mail_filters.py b/ietf/doc/templatetags/mail_filters.py
index 32e8dd0ca8..6be6620315 100644
--- a/ietf/doc/templatetags/mail_filters.py
+++ b/ietf/doc/templatetags/mail_filters.py
@@ -9,7 +9,7 @@ def std_level_prompt(doc):
     to the object's intended_std_level (with the word RFC appended in some
     cases), or a prompt requesting that the intended_std_level be set."""
     
-    prompt = "*** YOU MUST SELECT AN INTENDED STATUS FOR THIS DRAFT AND REGENERATE THIS TEXT ***"
+    prompt = "*** YOU MUST SELECT AN INTENDED STATUS FOR THIS INTERNET-DRAFT AND REGENERATE THIS TEXT ***"
 
     if doc.intended_std_level:
        prompt = doc.intended_std_level.name
diff --git a/ietf/doc/templatetags/tests_ietf_filters.py b/ietf/doc/templatetags/tests_ietf_filters.py
index f791d61530..b5130849ea 100644
--- a/ietf/doc/templatetags/tests_ietf_filters.py
+++ b/ietf/doc/templatetags/tests_ietf_filters.py
@@ -3,13 +3,26 @@
 from django.conf import settings
 
 from ietf.doc.factories import (
-    WgDraftFactory,
+    WgRfcFactory,
     IndividualDraftFactory,
     CharterFactory,
     NewRevisionDocEventFactory,
+    StatusChangeFactory,
+    RgDraftFactory,
+    EditorialDraftFactory,
+    WgDraftFactory,
+    ConflictReviewFactory,
+    BofreqFactory,
+    StatementFactory,
+    RfcFactory,
+)
+from ietf.doc.models import DocEvent
+from ietf.doc.templatetags.ietf_filters import (
+    urlize_ietf_docs,
+    is_valid_url,
+    is_in_stream,
+    is_unexpected_wg_state,
 )
-from ietf.doc.models import State, DocEvent, DocAlias
-from ietf.doc.templatetags.ietf_filters import urlize_ietf_docs, is_valid_url
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase
 
@@ -19,29 +32,42 @@
 
 
 class IetfFiltersTests(TestCase):
+    def test_is_in_stream(self):
+        for draft in [
+            IndividualDraftFactory(),
+            CharterFactory(),
+            StatusChangeFactory(),
+            ConflictReviewFactory(),
+            StatementFactory(),
+            BofreqFactory(),
+        ]:
+            self.assertFalse(is_in_stream(draft))
+        for draft in [RgDraftFactory(), WgDraftFactory(), EditorialDraftFactory()]:
+            self.assertTrue(is_in_stream(draft))
+        for stream in ["iab", "ietf", "irtf", "ise", "editorial"]:
+            self.assertTrue(is_in_stream(IndividualDraftFactory(stream_id=stream)))
+
     def test_is_valid_url(self):
         cases = [(settings.IDTRACKER_BASE_URL, True), ("not valid", False)]
         for url, result in cases:
             self.assertEqual(is_valid_url(url), result)
 
     def test_urlize_ietf_docs(self):
-        wg_id = WgDraftFactory()
-        wg_id.set_state(State.objects.get(type="draft", slug="rfc"))
-        wg_id.std_level_id = "bcp"
-        wg_id.save_with_history(
+        rfc = WgRfcFactory(rfc_number=123456, std_level_id="bcp")
+        rfc.save_with_history(
             [
                 DocEvent.objects.create(
-                    doc=wg_id,
-                    rev=wg_id.rev,
+                    doc=rfc,
+                    rev=rfc.rev,
                     type="published_rfc",
                     by=Person.objects.get(name="(System)"),
                 )
             ]
         )
-        DocAlias.objects.create(name="rfc123456").docs.add(wg_id)
-        DocAlias.objects.create(name="bcp123456").docs.add(wg_id)
-        DocAlias.objects.create(name="std123456").docs.add(wg_id)
-        DocAlias.objects.create(name="fyi123456").docs.add(wg_id)
+        # TODO - bring these into existance when subseries are well modeled
+        # DocAlias.objects.create(name="bcp123456").docs.add(rfc)
+        # DocAlias.objects.create(name="std123456").docs.add(rfc)
+        # DocAlias.objects.create(name="fyi123456").docs.add(rfc)
 
         id = IndividualDraftFactory(name="draft-me-rfc123456bis")
         id_num = IndividualDraftFactory(name="draft-rosen-rfcefdp-update-2026")
@@ -59,15 +85,16 @@ def test_urlize_ietf_docs(self):
 
         cases = [
             ("no change", "no change"),
-            ("bCp123456", '<a href="/doc/bcp123456/">bCp123456</a>'),
-            ("Std 00123456", '<a href="/doc/std123456/">Std 00123456</a>'),
-            (
-                "FyI  0123456 changes std 00123456",
-                '<a href="/doc/fyi123456/">FyI  0123456</a> changes <a href="/doc/std123456/">std 00123456</a>',
-            ),
+            # TODO: rework subseries when we add them
+            # ("bCp123456", '<a href="/doc/bcp123456/">bCp123456</a>'),
+            # ("Std 00123456", '<a href="/doc/std123456/">Std 00123456</a>'),
+            # (
+            #     "FyI  0123456 changes std 00123456",
+            #     '<a href="/doc/fyi123456/">FyI  0123456</a> changes <a href="/doc/std123456/">std 00123456</a>',
+            # ),
             ("rfc123456", '<a href="/doc/rfc123456/">rfc123456</a>'),
             ("Rfc 0123456", '<a href="/doc/rfc123456/">Rfc 0123456</a>'),
-            (wg_id.name, f'<a href="/doc/{wg_id.name}/">{wg_id.name}</a>'),
+            (rfc.name, f'<a href="/doc/{rfc.name}/">{rfc.name}</a>'),
             (
                 f"{id.name}-{id.rev}.txt",
                 f'<a href="/doc/{id.name}/{id.rev}/">{id.name}-{id.rev}.txt</a>',
@@ -149,3 +176,17 @@ def test_urlize_ietf_docs(self):
         for input, output in cases:
             # debug.show("(input, urlize_ietf_docs(input), output)")
             self.assertEqual(urlize_ietf_docs(input), output)
+    
+    def test_is_unexpected_wg_state(self):
+        """
+        Test that the unexpected_wg_state function works correctly
+        """
+        # test documents with expected wg states
+        self.assertFalse(is_unexpected_wg_state(RfcFactory()))
+        self.assertFalse(is_unexpected_wg_state(WgDraftFactory (states=[('draft-stream-ietf', 'sub-pub')])))
+        self.assertFalse(is_unexpected_wg_state(WgDraftFactory (states=[('draft-iesg', 'idexists')])))
+        self.assertFalse(is_unexpected_wg_state(WgDraftFactory (states=[('draft-stream-ietf', 'wg-cand'), ('draft-iesg','idexists')])))
+
+        # test documents with unexpected wg states due to invalid combination of states
+        self.assertTrue(is_unexpected_wg_state(WgDraftFactory (states=[('draft-stream-ietf', 'wg-cand'), ('draft-iesg','lc-req')])))
+        self.assertTrue(is_unexpected_wg_state(WgDraftFactory (states=[('draft-stream-ietf', 'chair-w'), ('draft-iesg','pub-req')])))
diff --git a/ietf/doc/templatetags/wg_menu.py b/ietf/doc/templatetags/wg_menu.py
index e82f125c07..3e8d209448 100644
--- a/ietf/doc/templatetags/wg_menu.py
+++ b/ietf/doc/templatetags/wg_menu.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2022, All Rights Reserved
+# Copyright The IETF Trust 2009-2023, All Rights Reserved
 
 # Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
@@ -32,6 +32,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import debug    # pyflakes: ignore
+
 from django import template
 from django.template.loader import render_to_string
 from django.db import models
@@ -60,15 +62,13 @@
 
 @register.simple_tag
 def wg_menu(flavor):
-    global parents
-
     for p in parents:
         p.short_name = parent_short_names.get(p.acronym) or p.name
         if p.short_name.endswith(" Area"):
             p.short_name = p.short_name[: -len(" Area")]
 
         if p.type_id == "area":
-            p.menu_url = "/wg/#" + p.acronym
+            p.menu_url = "/wg/#" + p.acronym.upper()
         elif p.acronym == "irtf":
             p.menu_url = "/rg/"
         elif p.acronym == "iab":
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index e7f8ad21c0..f92c9648e6 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -1,13 +1,16 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import os
 import datetime
 import io
+from hashlib import sha384
+
+from django.http import HttpRequest
 import lxml
 import bibtexparser
-import mock
+from unittest import mock
 import json
 import copy
 import random
@@ -16,32 +19,47 @@
 from pathlib import Path
 from pyquery import PyQuery
 from urllib.parse import urlparse, parse_qs
-from tempfile import NamedTemporaryFile
 from collections import defaultdict
+from zoneinfo import ZoneInfo
 
-from django.core.management import call_command
 from django.urls import reverse as urlreverse
 from django.conf import settings
 from django.forms import Form
 from django.utils.html import escape
 from django.test import override_settings
+from django.utils import timezone
 from django.utils.text import slugify
 
 from tastypie.test import ResourceTestCaseMixin
 
+from weasyprint.urls import URLFetchingError
+
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( Document, DocAlias, DocRelationshipName, RelatedDocument, State,
+from ietf.doc.models import ( Document, DocRelationshipName, RelatedDocument, State,
     DocEvent, BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, NewRevisionDocEvent, BallotType,
-    EditedAuthorsDocEvent )
-from ietf.doc.factories import ( DocumentFactory, DocEventFactory, CharterFactory, 
-    ConflictReviewFactory, WgDraftFactory, IndividualDraftFactory, WgRfcFactory, 
-    IndividualRfcFactory, StateDocEventFactory, BallotPositionDocEventFactory, 
-    BallotDocEventFactory, DocumentAuthorFactory, NewRevisionDocEventFactory,
-    StatusChangeFactory, BofreqFactory)
+    EditedAuthorsDocEvent, StateType)
+from ietf.doc.factories import (DocumentFactory, DocEventFactory, CharterFactory,
+                                ConflictReviewFactory, WgDraftFactory,
+                                IndividualDraftFactory, WgRfcFactory,
+                                IndividualRfcFactory, StateDocEventFactory,
+                                BallotPositionDocEventFactory,
+                                BallotDocEventFactory, DocumentAuthorFactory,
+                                NewRevisionDocEventFactory,
+                                StatusChangeFactory, DocExtResourceFactory,
+                                RgDraftFactory, BcpFactory, RfcAuthorFactory)
+from ietf.doc.forms import NotifyForm
 from ietf.doc.fields import SearchableDocumentsField
-from ietf.doc.utils import create_ballot_if_not_open, uppercase_std_abbreviated_name
-from ietf.doc.views_search import ad_dashboard_group, ad_dashboard_group_type, shorten_group_name # TODO: red flag that we're importing from views in tests. Move these to utils.
+from ietf.doc.utils import (
+    create_ballot_if_not_open,
+    investigate_fragment,
+    uppercase_std_abbreviated_name,
+    DraftAliasGenerator,
+    generate_idnits2_rfc_status,
+    generate_idnits2_rfcs_obsoleted,
+    get_doc_email_aliases,
+)
+from ietf.doc.views_doc import get_diff_revisions
 from ietf.group.models import Group, Role
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.ipr.factories import HolderIprDisclosureFactory
@@ -49,18 +67,22 @@
 from ietf.meeting.factories import ( MeetingFactory, SessionFactory, SessionPresentationFactory,
      ProceedingsMaterialFactory )
 
-from ietf.name.models import SessionStatusName, BallotPositionName, DocTypeName
+from ietf.name.models import SessionStatusName, BallotPositionName, DocTypeName, RoleName
 from ietf.person.models import Person
 from ietf.person.factories import PersonFactory, EmailFactory
-from ietf.utils.mail import outbox, empty_outbox
-from ietf.utils.test_utils import login_testing_unauthorized, unicontent, reload_db_objects
+from ietf.utils.mail import get_payload_text, outbox, empty_outbox
+from ietf.utils.test_utils import login_testing_unauthorized, unicontent
 from ietf.utils.test_utils import TestCase
 from ietf.utils.text import normalize_text
+from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO, RPC_TZINFO
+from ietf.doc.utils_search import AD_WORKLOAD
+
 
 class SearchTests(TestCase):
     def test_search(self):
 
         draft = WgDraftFactory(name='draft-ietf-mars-test',group=GroupFactory(acronym='mars',parent=Group.objects.get(acronym='farfut')),authors=[PersonFactory()],ad=PersonFactory())
+        rfc = WgRfcFactory()
         draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub-req"))
         old_draft = IndividualDraftFactory(name='draft-foo-mars-test',authors=[PersonFactory()],title="Optimizing Martian Network Topologies")
         old_draft.set_state(State.objects.get(used=True, type="draft", slug="expired"))
@@ -88,11 +110,16 @@ def test_search(self):
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "draft-foo-mars-test")
 
-        # find by rfc/active/inactive
-        draft.set_state(State.objects.get(type="draft", slug="rfc"))
-        r = self.client.get(base_url + "?rfcs=on&name=%s" % draft.name)
+        r = self.client.get(base_url + "?olddrafts=on&name=FoO")  # mixed case
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, draft.title)
+        self.assertContains(r, "draft-foo-mars-test")
+
+        # find by RFC
+        r = self.client.get(base_url + "?rfcs=on&name=%s" % rfc.name)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, rfc.title)
+
+        # find by active/inactive
 
         draft.set_state(State.objects.get(type="draft", slug="active"))
         r = self.client.get(base_url + "?activedrafts=on&name=%s" % draft.name)
@@ -121,6 +148,10 @@ def test_search(self):
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.title)
 
+        r = self.client.get(base_url + "?activedrafts=on&by=group&group=%s" % draft.group.acronym.swapcase())
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, draft.title)
+
         # find by area
         r = self.client.get(base_url + "?activedrafts=on&by=area&area=%s" % draft.group.parent_id)
         self.assertEqual(r.status_code, 200)
@@ -141,6 +172,23 @@ def test_search(self):
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.title)
 
+    def test_search_became_rfc(self):
+        draft = WgDraftFactory()
+        rfc = WgRfcFactory()
+        draft.set_state(State.objects.get(type="draft", slug="rfc"))
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        base_url = urlreverse('ietf.doc.views_search.search')
+
+        # find by RFC
+        r = self.client.get(base_url + f"?rfcs=on&name={rfc.name}")
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, rfc.title)
+
+        # find by draft
+        r = self.client.get(base_url + f"?activedrafts=on&rfcs=on&name={draft.name}")
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, rfc.title)
+
     def test_search_for_name(self):
         draft = WgDraftFactory(name='draft-ietf-mars-test',group=GroupFactory(acronym='mars',parent=Group.objects.get(acronym='farfut')),authors=[PersonFactory()],ad=PersonFactory())
         draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub-req"))
@@ -162,16 +210,39 @@ def test_search_for_name(self):
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
+        # mixed-up case exact match
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name.swapcase())))
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
+
         # prefix match
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
+        # mixed-up case prefix match
+        r = self.client.get(
+            urlreverse(
+                'ietf.doc.views_search.search_for_name',
+                kwargs=dict(name="-".join(draft.name.swapcase().split("-")[:-1])),
+            ))
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
+
         # non-prefix match
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[1:]))))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
+        # mixed-up case non-prefix match
+        r = self.client.get(
+            urlreverse(
+                'ietf.doc.views_search.search_for_name',
+                kwargs=dict(name="-".join(draft.name.swapcase().split("-")[1:])),
+            ))
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
+
         # other doctypes than drafts
         doc = Document.objects.get(name='charter-ietf-mars')
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name='charter-ietf-ma')))
@@ -225,6 +296,17 @@ def test_search_for_name(self):
         parsed = urlparse(r["Location"])
         self.assertEqual(parsed.path, urlreverse('ietf.doc.views_search.search'))
         self.assertEqual(parse_qs(parsed.query)["name"][0], "draft-ietf-doesnotexist-42")
+    
+    def test_search_rfc(self):
+        rfc = WgRfcFactory(name="rfc0000")
+        
+        # search for existing RFC should redirect directly to the RFC page
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=rfc.name)))
+        self.assertRedirects(r, f'/doc/{rfc.name}/', status_code=302, target_status_code=200)
+
+        # search for existing RFC with revision number should redirect to the RFC page
+        r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=rfc.name + "-99")), follow=True)
+        self.assertRedirects(r, f'/doc/{rfc.name}/', status_code=302, target_status_code=200)
 
     def test_frontpage(self):
         r = self.client.get("/")
@@ -232,52 +314,68 @@ def test_frontpage(self):
         self.assertContains(r, "Document Search")
 
     def test_ad_workload(self):
-        Role.objects.filter(name_id='ad').delete()
-        ad = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active',person__name='Example Areadirector').person
-        doc_type_names = ['bofreq', 'charter', 'conflrev', 'draft', 'statchg']
-        expected = defaultdict(lambda :0)
-        for doc_type_name in doc_type_names:
-            if doc_type_name=='draft':
-                states = State.objects.filter(type='draft-iesg', used=True).values_list('slug', flat=True)
-            else:
-                states = State.objects.filter(type=doc_type_name, used=True).values_list('slug', flat=True)
-
-            for state in states:
-                target_num = random.randint(0,2)
+        Role.objects.filter(name_id="ad").delete()
+        ad = RoleFactory(
+            name_id="ad",
+            group__type_id="area",
+            group__state_id="active",
+            person__name="Example Areadirector",
+        ).person
+        expected = defaultdict(lambda: 0)
+        for doc_type_slug in AD_WORKLOAD:
+            for state in AD_WORKLOAD[doc_type_slug]:
+                target_num = random.randint(0, 2)
                 for _ in range(target_num):
-                    if doc_type_name == 'draft':
-                        doc = IndividualDraftFactory(ad=ad,states=[('draft-iesg', state),('draft','rfc' if state=='pub' else 'active')])
-                    elif doc_type_name == 'charter':
-                        doc = CharterFactory(ad=ad, states=[(doc_type_name, state)])
-                    elif doc_type_name == 'bofreq':
-                        # Note that the view currently doesn't handle bofreqs
-                        doc = BofreqFactory(states=[(doc_type_name, state)], bofreqresponsibledocevent__responsible=[ad])
-                    elif doc_type_name == 'conflrev':
-                        doc = ConflictReviewFactory(ad=ad, states=State.objects.filter(type_id=doc_type_name, slug=state))
-                    elif doc_type_name == 'statchg':
-                        doc = StatusChangeFactory(ad=ad, states=State.objects.filter(type_id=doc_type_name, slug=state))
-                    else:
-                        # Currently unreachable
-                        doc = DocumentFactory(type_id=doc_type_name, ad=ad, states=[(doc_type_name, state)])
-
-                    if not slugify(ad_dashboard_group_type(doc)) in ('document', 'none'):
-                        expected[(slugify(ad_dashboard_group_type(doc)), slugify(ad.full_name_as_key()), slugify(shorten_group_name(ad_dashboard_group(doc))))] += 1
-        
-        url = urlreverse('ietf.doc.views_search.ad_workload')
+                    if (
+                        doc_type_slug == "draft"
+                        or doc_type_slug == "rfc"
+                        and state == "rfcqueue"
+                    ):
+                        IndividualDraftFactory(
+                            ad=ad,
+                            states=[
+                                ("draft-iesg", state),
+                                ("draft", "rfc" if state == "pub" else "active"),
+                            ],
+                        )
+                    elif doc_type_slug == "rfc":
+                        WgRfcFactory.create(
+                            states=[("draft", "rfc"), ("draft-iesg", "pub")]
+                        )
+
+                    elif doc_type_slug == "charter":
+                        CharterFactory(ad=ad, states=[(doc_type_slug, state)])
+                    elif doc_type_slug == "conflrev":
+                        ConflictReviewFactory(
+                            ad=ad,
+                            states=State.objects.filter(
+                                type_id=doc_type_slug, slug=state
+                            ),
+                        )
+                    elif doc_type_slug == "statchg":
+                        StatusChangeFactory(
+                            ad=ad,
+                            states=State.objects.filter(
+                                type_id=doc_type_slug, slug=state
+                            ),
+                        )
+        self.client.login(username="ad", password="ad+password")
+        url = urlreverse("ietf.doc.views_search.ad_workload")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         for group_type, ad, group in expected:
-            self.assertEqual(int(q(f'#{group_type}-{ad}-{group}').text()),expected[(group_type, ad, group)])
+            self.assertEqual(
+                int(q(f"#{group_type}-{ad}-{group}").text()),
+                expected[(group_type, ad, group)],
+            )
 
     def test_docs_for_ad(self):
         ad = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active').person
         draft = IndividualDraftFactory(ad=ad)
         draft.action_holders.set([PersonFactory()])
         draft.set_state(State.objects.get(type='draft-iesg', slug='lc'))
-        rfc = IndividualDraftFactory(ad=ad)
-        rfc.set_state(State.objects.get(type='draft', slug='rfc'))
-        DocAlias.objects.create(name='rfc6666').docs.add(rfc)
+        rfc = IndividualRfcFactory(ad=ad)
         conflrev = DocumentFactory(type_id='conflrev',ad=ad)
         conflrev.set_state(State.objects.get(type='conflrev', slug='iesgeval'))
         statchg = DocumentFactory(type_id='statchg',ad=ad)
@@ -301,7 +399,7 @@ def test_docs_for_ad(self):
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
         self.assertContains(r, escape(draft.action_holders.first().name))
-        self.assertContains(r, rfc.canonical_name())
+        self.assertContains(r, rfc.name)
         self.assertContains(r, conflrev.name)
         self.assertContains(r, statchg.name)
         self.assertContains(r, charter.name)
@@ -309,6 +407,30 @@ def test_docs_for_ad(self):
         self.assertContains(r, discuss_other.doc.name)
         self.assertContains(r, block_other.doc.name)
 
+    def test_docs_for_iesg(self):
+        ad1 = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active').person
+        ad2 = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active').person
+
+        draft = IndividualDraftFactory(ad=ad1)
+        draft.action_holders.set([PersonFactory()])
+        draft.set_state(State.objects.get(type='draft-iesg', slug='lc'))
+        rfc = IndividualRfcFactory(ad=ad2)
+        conflrev = DocumentFactory(type_id='conflrev',ad=ad1)
+        conflrev.set_state(State.objects.get(type='conflrev', slug='iesgeval'))
+        statchg = DocumentFactory(type_id='statchg',ad=ad2)
+        statchg.set_state(State.objects.get(type='statchg', slug='iesgeval'))
+        charter = CharterFactory(name='charter-ietf-ames',ad=ad1)
+        charter.set_state(State.objects.get(type='charter', slug='iesgrev'))
+
+        r = self.client.get(urlreverse('ietf.doc.views_search.docs_for_iesg'))
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, draft.name)
+        self.assertContains(r, escape(draft.action_holders.first().name))
+        self.assertNotContains(r, rfc.name)
+        self.assertContains(r, conflrev.name)
+        self.assertContains(r, statchg.name)
+        self.assertContains(r, charter.name)
+
     def test_auth48_doc_for_ad(self):
         """Docs in AUTH48 state should have a decoration"""
         ad = RoleFactory(name_id='ad', group__type_id='area', group__state_id='active').person
@@ -331,17 +453,6 @@ def test_drafts_in_last_call(self):
         self.assertContains(r, draft.title)
         self.assertContains(r, escape(draft.action_holders.first().name))
 
-    def test_in_iesg_process(self):
-        doc_in_process = IndividualDraftFactory()
-        doc_in_process.action_holders.set([PersonFactory()])
-        doc_in_process.set_state(State.objects.get(type='draft-iesg', slug='lc'))
-        doc_not_in_process = IndividualDraftFactory()
-        r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_iesg_process'))
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, doc_in_process.title)
-        self.assertContains(r, escape(doc_in_process.action_holders.first().name))
-        self.assertNotContains(r, doc_not_in_process.title)
-        
     def test_indexes(self):
         draft = IndividualDraftFactory()
         rfc = WgRfcFactory()
@@ -349,16 +460,17 @@ def test_indexes(self):
         r = self.client.get(urlreverse('ietf.doc.views_search.index_all_drafts'))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
-        self.assertContains(r, rfc.canonical_name().upper())
+        self.assertContains(r, rfc.name.upper())
 
         r = self.client.get(urlreverse('ietf.doc.views_search.index_active_drafts'))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.title)
 
     def test_ajax_search_docs(self):
-        draft = IndividualDraftFactory()
+        draft = IndividualDraftFactory(name="draft-ietf-rfc1234bis")
+        rfc = IndividualRfcFactory(rfc_number=1234)
+        bcp = IndividualRfcFactory(name="bcp12345", type_id="bcp")
 
-        # Document
         url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={
             "model_name": "document",
             "doc_type": "draft",
@@ -368,38 +480,47 @@ def test_ajax_search_docs(self):
         data = r.json()
         self.assertEqual(data[0]["id"], draft.pk)
 
-        # DocAlias
-        doc_alias = draft.docalias.first()
-
         url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={
-            "model_name": "docalias",
-            "doc_type": "draft",
+            "model_name": "document",
+            "doc_type": "rfc",
         })
+        r = self.client.get(url, dict(q=rfc.name))
+        self.assertEqual(r.status_code, 200)
+        data = r.json()
+        self.assertEqual(data[0]["id"], rfc.pk)
 
-        r = self.client.get(url, dict(q=doc_alias.name))
+        url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={
+            "model_name": "document",
+            "doc_type": "all",
+        })
+        r = self.client.get(url, dict(q="1234"))
         self.assertEqual(r.status_code, 200)
         data = r.json()
-        self.assertEqual(data[0]["id"], doc_alias.pk)
+        self.assertEqual(len(data), 3)
+        pks = set([data[i]["id"] for i in range(3)])
+        self.assertEqual(pks, set([bcp.pk, rfc.pk, draft.pk]))
+
+
 
     def test_recent_drafts(self):
         # Three drafts to show with various warnings
         drafts = WgDraftFactory.create_batch(3,states=[('draft','active'),('draft-iesg','ad-eval')])
         for index, draft in enumerate(drafts):
-            StateDocEventFactory(doc=draft, state=('draft-iesg','ad-eval'), time=datetime.datetime.now()-datetime.timedelta(days=[1,15,29][index]))
+            StateDocEventFactory(doc=draft, state=('draft-iesg','ad-eval'), time=timezone.now()-datetime.timedelta(days=[1,15,29][index]))
             draft.action_holders.set([PersonFactory()])
 
         # And one draft that should not show (with the default of 7 days to view)
         old = WgDraftFactory()
-        old.docevent_set.filter(newrevisiondocevent__isnull=False).update(time=datetime.datetime.now()-datetime.timedelta(days=8))
-        StateDocEventFactory(doc=old, time=datetime.datetime.now()-datetime.timedelta(days=8))
+        old.docevent_set.filter(newrevisiondocevent__isnull=False).update(time=timezone.now()-datetime.timedelta(days=8))
+        StateDocEventFactory(doc=old, time=timezone.now()-datetime.timedelta(days=8))
 
         url = urlreverse('ietf.doc.views_search.recent_drafts')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertEqual(len(q('td.doc')),3)
-        self.assertTrue(q('td.status span.bg-warning[title*="%s"]' % "for 15 days"))
-        self.assertTrue(q('td.status span.bg-danger[title*="%s"]' % "for 29 days"))
+        self.assertTrue(q('td.status span.text-bg-warning[title*="%s"]' % "for 15 days"))
+        self.assertTrue(q('td.status span.text-bg-danger[title*="%s"]' % "for 29 days"))
         for ah in [draft.action_holders.first() for draft in drafts]:
             self.assertContains(r, escape(ah.name))
 
@@ -485,7 +606,7 @@ class DocDraftTestCase(TestCase):
 1.  Introduction
 
    This document describes how to make the Martian networks work.  The
-   methods used in Earth do not directly translate to the efficent
+   methods used in Earth do not directly translate to the efficient
    networks on Mars, as the topographical differences caused by planets.
    For example the avian carriers, cannot be used in the Mars, thus
    RFC1149 ([RFC1149]) cannot be used in Mars.
@@ -581,21 +702,24 @@ def setUp(self):
                 f.write(self.draft_text)
 
     def test_document_draft(self):
-        draft = WgDraftFactory(name='draft-ietf-mars-test',rev='01')
+        draft = WgDraftFactory(name='draft-ietf-mars-test',rev='01', create_revisions=range(0,2))
+
         HolderIprDisclosureFactory(docs=[draft])
         
         # Docs for testing relationships. Does not test 'possibly-replaces'. The 'replaced_by' direction
         # is tested separately below.
         replaced = IndividualDraftFactory()
-        draft.relateddocument_set.create(relationship_id='replaces',source=draft,target=replaced.docalias.first())
+        draft.relateddocument_set.create(relationship_id='replaces',source=draft,target=replaced)
         obsoleted = IndividualDraftFactory()
-        draft.relateddocument_set.create(relationship_id='obs',source=draft,target=obsoleted.docalias.first())
+        draft.relateddocument_set.create(relationship_id='obs',source=draft,target=obsoleted)
         obsoleted_by = IndividualDraftFactory()
-        obsoleted_by.relateddocument_set.create(relationship_id='obs',source=obsoleted_by,target=draft.docalias.first())
+        obsoleted_by.relateddocument_set.create(relationship_id='obs',source=obsoleted_by,target=draft)
         updated = IndividualDraftFactory()
-        draft.relateddocument_set.create(relationship_id='updates',source=draft,target=updated.docalias.first())
+        draft.relateddocument_set.create(relationship_id='updates',source=draft,target=updated)
         updated_by = IndividualDraftFactory()
-        updated_by.relateddocument_set.create(relationship_id='updates',source=obsoleted_by,target=draft.docalias.first())
+        updated_by.relateddocument_set.create(relationship_id='updates',source=obsoleted_by,target=draft)
+
+        DocExtResourceFactory(doc=draft)
 
         # these tests aren't testing all attributes yet, feel free to
         # expand them
@@ -606,68 +730,32 @@ def test_document_draft(self):
         if settings.USER_PREFERENCE_DEFAULTS['full_draft'] == 'off':
             self.assertContains(r, "Show full document")
             self.assertNotContains(r, "Deimos street")
-        self.assertContains(r, replaced.canonical_name())
+        self.assertContains(r, replaced.name)
         self.assertContains(r, replaced.title)
-        # obs/updates not included until draft is RFC
-        self.assertNotContains(r, obsoleted.canonical_name())
-        self.assertNotContains(r, obsoleted.title)
-        self.assertNotContains(r, obsoleted_by.canonical_name())
-        self.assertNotContains(r, obsoleted_by.title)
-        self.assertNotContains(r, updated.canonical_name())
-        self.assertNotContains(r, updated.title)
-        self.assertNotContains(r, updated_by.canonical_name())
-        self.assertNotContains(r, updated_by.title)
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=0")
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Active Internet-Draft")
         self.assertContains(r, "Show full document")
         self.assertNotContains(r, "Deimos street")
-        self.assertContains(r, replaced.canonical_name())
+        self.assertContains(r, replaced.name)
         self.assertContains(r, replaced.title)
-        # obs/updates not included until draft is RFC
-        self.assertNotContains(r, obsoleted.canonical_name())
-        self.assertNotContains(r, obsoleted.title)
-        self.assertNotContains(r, obsoleted_by.canonical_name())
-        self.assertNotContains(r, obsoleted_by.title)
-        self.assertNotContains(r, updated.canonical_name())
-        self.assertNotContains(r, updated.title)
-        self.assertNotContains(r, updated_by.canonical_name())
-        self.assertNotContains(r, updated_by.title)
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=foo")
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Active Internet-Draft")
         self.assertNotContains(r, "Show full document")
         self.assertContains(r, "Deimos street")
-        self.assertContains(r, replaced.canonical_name())
+        self.assertContains(r, replaced.name)
         self.assertContains(r, replaced.title)
-        # obs/updates not included until draft is RFC
-        self.assertNotContains(r, obsoleted.canonical_name())
-        self.assertNotContains(r, obsoleted.title)
-        self.assertNotContains(r, obsoleted_by.canonical_name())
-        self.assertNotContains(r, obsoleted_by.title)
-        self.assertNotContains(r, updated.canonical_name())
-        self.assertNotContains(r, updated.title)
-        self.assertNotContains(r, updated_by.canonical_name())
-        self.assertNotContains(r, updated_by.title)
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=1")
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Active Internet-Draft")
         self.assertNotContains(r, "Show full document")
         self.assertContains(r, "Deimos street")
-        self.assertContains(r, replaced.canonical_name())
+        self.assertContains(r, replaced.name)
         self.assertContains(r, replaced.title)
-        # obs/updates not included until draft is RFC
-        self.assertNotContains(r, obsoleted.canonical_name())
-        self.assertNotContains(r, obsoleted.title)
-        self.assertNotContains(r, obsoleted_by.canonical_name())
-        self.assertNotContains(r, obsoleted_by.title)
-        self.assertNotContains(r, updated.canonical_name())
-        self.assertNotContains(r, updated.title)
-        self.assertNotContains(r, updated_by.canonical_name())
-        self.assertNotContains(r, updated_by.title)
 
         self.client.cookies = SimpleCookie({str('full_draft'): str('on')})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
@@ -675,17 +763,8 @@ def test_document_draft(self):
         self.assertContains(r, "Active Internet-Draft")
         self.assertNotContains(r, "Show full document")
         self.assertContains(r, "Deimos street")
-        self.assertContains(r, replaced.canonical_name())
+        self.assertContains(r, replaced.name)
         self.assertContains(r, replaced.title)
-        # obs/updates not included until draft is RFC
-        self.assertNotContains(r, obsoleted.canonical_name())
-        self.assertNotContains(r, obsoleted.title)
-        self.assertNotContains(r, obsoleted_by.canonical_name())
-        self.assertNotContains(r, obsoleted_by.title)
-        self.assertNotContains(r, updated.canonical_name())
-        self.assertNotContains(r, updated.title)
-        self.assertNotContains(r, updated_by.canonical_name())
-        self.assertNotContains(r, updated_by.title)
 
         self.client.cookies = SimpleCookie({str('full_draft'): str('off')})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
@@ -693,17 +772,8 @@ def test_document_draft(self):
         self.assertContains(r, "Active Internet-Draft")
         self.assertContains(r, "Show full document")
         self.assertNotContains(r, "Deimos street")
-        self.assertContains(r, replaced.canonical_name())
+        self.assertContains(r, replaced.name)
         self.assertContains(r, replaced.title)
-        # obs/updates not included until draft is RFC
-        self.assertNotContains(r, obsoleted.canonical_name())
-        self.assertNotContains(r, obsoleted.title)
-        self.assertNotContains(r, obsoleted_by.canonical_name())
-        self.assertNotContains(r, obsoleted_by.title)
-        self.assertNotContains(r, updated.canonical_name())
-        self.assertNotContains(r, updated.title)
-        self.assertNotContains(r, updated_by.canonical_name())
-        self.assertNotContains(r, updated_by.title)
 
         self.client.cookies = SimpleCookie({str('full_draft'): str('foo')})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
@@ -712,45 +782,43 @@ def test_document_draft(self):
         if settings.USER_PREFERENCE_DEFAULTS['full_draft'] == 'off':
             self.assertContains(r, "Show full document")
             self.assertNotContains(r, "Deimos street")
-        self.assertContains(r, replaced.canonical_name())
+        self.assertContains(r, replaced.name)
         self.assertContains(r, replaced.title)
-        # obs/updates not included until draft is RFC
-        self.assertNotContains(r, obsoleted.canonical_name())
-        self.assertNotContains(r, obsoleted.title)
-        self.assertNotContains(r, obsoleted_by.canonical_name())
-        self.assertNotContains(r, obsoleted_by.title)
-        self.assertNotContains(r, updated.canonical_name())
-        self.assertNotContains(r, updated.title)
-        self.assertNotContains(r, updated_by.canonical_name())
-        self.assertNotContains(r, updated_by.title)
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, "Versions:")
+        self.assertContains(r, "Select version")
         self.assertContains(r, "Deimos street")
         q = PyQuery(r.content)
         self.assertEqual(q('title').text(), 'draft-ietf-mars-test-01')
-        self.assertEqual(len(q('.rfcmarkup pre')), 4)
-        self.assertEqual(len(q('.rfcmarkup span.h1')), 2)
-        self.assertEqual(len(q('.rfcmarkup a[href]')), 41)
+        self.assertEqual(len(q('.rfcmarkup pre')), 3)
+        self.assertEqual(len(q('.rfcmarkup span.h1, .rfcmarkup h1')), 2)
+        self.assertEqual(len(q('.rfcmarkup a[href]')), 27)
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=draft.name, rev=draft.rev)))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertEqual(q('title').text(), 'draft-ietf-mars-test-01')
 
+        # check that revision list has expected versions
+        self.assertEqual(len(q('#sidebar .revision-list .page-item.active a.page-link[href$="draft-ietf-mars-test-01"]')), 1)
+
+        # check that diff dropdowns have expected versions
+        self.assertEqual(len(q('#sidebar option[value="draft-ietf-mars-test-00"][selected="selected"]')), 1)
+
         rfc = WgRfcFactory()
+        rfc.save_with_history([DocEventFactory(doc=rfc)])
         (Path(settings.RFC_PATH) / rfc.get_base_name()).touch()
-        r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name())))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.name)))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(q('title').text(), f'RFC {rfc.rfc_number()} - {rfc.title}')
+        self.assertEqual(q('title').text(), f'RFC {rfc.rfc_number} - {rfc.title}')
 
         # synonyms for the rfc should be redirected to its canonical view
-        r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.rfc_number())))
-        self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name())))
-        r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=f'RFC {rfc.rfc_number()}')))
-        self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.canonical_name())))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.rfc_number)))
+        self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=f'RFC {rfc.rfc_number}')))
+        self.assertRedirects(r, urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=rfc.name)))
 
         # expired draft
         draft.set_state(State.objects.get(type="draft", slug="expired"))
@@ -764,56 +832,63 @@ def test_document_draft(self):
 
         replacement = WgDraftFactory(
             name="draft-ietf-replacement",
-            time=datetime.datetime.now(),
+            time=timezone.now(),
             title="Replacement Draft",
             stream_id=draft.stream_id, group_id=draft.group_id, abstract=draft.abstract,stream=draft.stream, rev=draft.rev,
             pages=draft.pages, intended_std_level_id=draft.intended_std_level_id,
             shepherd_id=draft.shepherd_id, ad_id=draft.ad_id, expires=draft.expires,
-            notify=draft.notify, note=draft.note)
+            notify=draft.notify)
         rel = RelatedDocument.objects.create(source=replacement,
-                                             target=draft.docalias.get(name__startswith="draft"),
+                                             target=draft,
                                              relationship_id="replaces")
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Replaced Internet-Draft")
-        self.assertContains(r, replacement.canonical_name())
+        self.assertContains(r, replacement.name)
         self.assertContains(r, replacement.title)
         rel.delete()
 
         # draft published as RFC
         draft.set_state(State.objects.get(type="draft", slug="rfc"))
-        draft.std_level_id = "bcp"
-        draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="published_rfc", by=Person.objects.get(name="(System)"))])
+        draft.std_level_id = "ps"
+
+        rfc = WgRfcFactory(group=draft.group, name="rfc123456")
+        rfc.save_with_history([DocEvent.objects.create(doc=rfc, rev=None, type="published_rfc", by=Person.objects.get(name="(System)"))])
+
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
 
+        obsoleted = IndividualRfcFactory()
+        rfc.relateddocument_set.create(relationship_id='obs',target=obsoleted)
+        obsoleted_by = IndividualRfcFactory()
+        obsoleted_by.relateddocument_set.create(relationship_id='obs',target=rfc)
+        updated = IndividualRfcFactory()
+        rfc.relateddocument_set.create(relationship_id='updates',target=updated)
+        updated_by = IndividualRfcFactory()
+        updated_by.relateddocument_set.create(relationship_id='updates',target=rfc)
 
-        rfc_alias = DocAlias.objects.create(name="rfc123456")
-        rfc_alias.docs.add(draft)
-        bcp_alias = DocAlias.objects.create(name="bcp123456")
-        bcp_alias.docs.add(draft)
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=draft.rev)))
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, "This is an older version of an Internet-Draft that was ultimately published as")
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 302)
-        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=bcp_alias.name)))
-        self.assertEqual(r.status_code, 302)
 
-        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc_alias.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name)))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "RFC 123456")
         self.assertContains(r, draft.name)
-        self.assertContains(r, replaced.canonical_name())
-        self.assertContains(r, replaced.title)
         # obs/updates included with RFC
-        self.assertContains(r, obsoleted.canonical_name())
+        self.assertContains(r, obsoleted.name)
         self.assertContains(r, obsoleted.title)
-        self.assertContains(r, obsoleted_by.canonical_name())
+        self.assertContains(r, obsoleted_by.name)
         self.assertContains(r, obsoleted_by.title)
-        self.assertContains(r, updated.canonical_name())
+        self.assertContains(r, updated.name)
         self.assertContains(r, updated.title)
-        self.assertContains(r, updated_by.canonical_name())
+        self.assertContains(r, updated_by.name)
         self.assertContains(r, updated_by.title)
 
-        # naked RFC - also wierd that we test a PS from the ISE
+        # naked RFC - also weird that we test a PS from the ISE
         rfc = IndividualDraftFactory(
             name="rfc1234567",
             title="RFC without a Draft",
@@ -843,7 +918,7 @@ def test_draft_status_changes(self):
         draft = WgRfcFactory()
         status_change_doc = StatusChangeFactory(
             group=draft.group,
-            changes_status_of=[('tops', draft.docalias.first())],
+            changes_status_of=[('tops', draft)],
         )
         status_change_url = urlreverse(
             'ietf.doc.views_doc.document_main',
@@ -851,7 +926,7 @@ def test_draft_status_changes(self):
         )
         proposed_status_change_doc = StatusChangeFactory(
             group=draft.group,
-            changes_status_of=[('tobcp', draft.docalias.first())],
+            changes_status_of=[('tobcp', draft)],
             states=[State.objects.get(slug='needshep', type='statchg')],
         )
         proposed_status_change_url = urlreverse(
@@ -862,7 +937,7 @@ def test_draft_status_changes(self):
         r = self.client.get(
             urlreverse(
                 'ietf.doc.views_doc.document_main',
-                kwargs={'name': draft.canonical_name()},
+                kwargs={'name': draft.name},
             )
         )
         self.assertEqual(r.status_code, 200)
@@ -908,7 +983,7 @@ def test_edit_authors_permissions(self):
         # Relevant users not authorized to edit authors
         unauthorized_usernames = [
             'plain',
-            *[author.user.username for author in draft.authors()],
+            *[author.user.username for author in draft.author_persons()],
             draft.group.get_chair().person.user.username,
             'ad'
         ]
@@ -923,7 +998,7 @@ def test_edit_authors_permissions(self):
         self.client.logout()
 
         # Try to add an author via POST - still only the secretary should be able to do this.
-        orig_authors = draft.authors()
+        orig_authors = draft.author_persons()
         post_data = self.make_edit_authors_post_data(
             basis='permission test',
             authors=draft.documentauthor_set.all(),
@@ -941,12 +1016,12 @@ def test_edit_authors_permissions(self):
         for username in unauthorized_usernames:
             login_testing_unauthorized(self, username, url, method='post', request_kwargs=dict(data=post_data))
             draft = Document.objects.get(pk=draft.pk)
-            self.assertEqual(draft.authors(), orig_authors)  # ensure draft author list was not modified
+            self.assertEqual(draft.author_persons(), orig_authors)  # ensure draft author list was not modified
         login_testing_unauthorized(self, 'secretary', url, method='post', request_kwargs=dict(data=post_data))
         r = self.client.post(url, post_data)
         self.assertEqual(r.status_code, 302)
         draft = Document.objects.get(pk=draft.pk)
-        self.assertEqual(draft.authors(), orig_authors + [new_auth_person])
+        self.assertEqual(draft.author_persons(), orig_authors + [new_auth_person])
 
     def make_edit_authors_post_data(self, basis, authors):
         """Helper to generate edit_authors POST data for a set of authors"""
@@ -1276,7 +1351,12 @@ def test_edit_authors_reorder_authors(self):
 
     def test_edit_authors_edit_fields(self):
         draft = WgDraftFactory()
-        DocumentAuthorFactory.create_batch(3, document=draft)
+        DocumentAuthorFactory.create_batch(
+            3,
+            document=draft,
+            affiliation='Somewhere, Inc.',
+            country='Bolivia',
+        )
         url = urlreverse('ietf.doc.views_doc.edit_authors', kwargs=dict(name=draft.name))
         change_reason = 'reorder the authors'
 
@@ -1288,8 +1368,9 @@ def test_edit_authors_edit_fields(self):
             authors = draft.documentauthor_set.all(),
             basis=change_reason
         )
-        
-        new_email = EmailFactory(person=draft.authors()[0])
+
+        old_address = draft.author_persons()[0].email()
+        new_email = EmailFactory(person=draft.author_persons()[0], address=f'changed-{old_address}')
         post_data['author-0-email'] = new_email.address
         post_data['author-1-affiliation'] = 'University of Nowhere'
         post_data['author-2-country'] = 'Chile'
@@ -1322,17 +1403,17 @@ def test_edit_authors_edit_fields(self):
         country_event = change_events.filter(desc__icontains='changed country').first()
 
         self.assertIsNotNone(email_event)
-        self.assertIn(draft.authors()[0].name, email_event.desc)
+        self.assertIn(draft.author_persons()[0].name, email_event.desc)
         self.assertIn(before[0]['email'], email_event.desc)
         self.assertIn(after[0]['email'], email_event.desc)
 
         self.assertIsNotNone(affiliation_event)
-        self.assertIn(draft.authors()[1].name, affiliation_event.desc)
+        self.assertIn(draft.author_persons()[1].name, affiliation_event.desc)
         self.assertIn(before[1]['affiliation'], affiliation_event.desc)
         self.assertIn(after[1]['affiliation'], affiliation_event.desc)
 
         self.assertIsNotNone(country_event)
-        self.assertIn(draft.authors()[2].name, country_event.desc)
+        self.assertIn(draft.author_persons()[2].name, country_event.desc)
         self.assertIn(before[2]['country'], country_event.desc)
         self.assertIn(after[2]['country'], country_event.desc)
 
@@ -1390,6 +1471,14 @@ def test_document_draft_action_holders_buttons(self, mock_method):
         """Buttons for action holders should be shown when AD or secretary"""
         draft = WgDraftFactory()
         draft.action_holders.set([PersonFactory()])
+        other_group = GroupFactory(type_id=draft.group.type_id)
+
+        # create a test RoleName and put it in the docman_roles for the document group
+        RoleName.objects.create(slug="wrangler", name="Wrangler", used=True)
+        draft.group.features.docman_roles.append("wrangler")
+        draft.group.features.save()
+        wrangler = RoleFactory(group=draft.group, name_id="wrangler").person
+        wrangler_of_other_group = RoleFactory(group=other_group, name_id="wrangler").person
 
         url = urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=draft.name))
         edit_ah_url = urlreverse('ietf.doc.views_doc.edit_action_holders', kwargs=dict(name=draft.name))
@@ -1422,11 +1511,15 @@ def _run_test(username=None, expect_buttons=False):
 
         _run_test(None, False)
         _run_test('plain', False)
+        _run_test(wrangler_of_other_group.user.username, False)
+        _run_test(wrangler.user.username, True)
         _run_test('ad', True)
         _run_test('secretary', True)
 
     def test_draft_group_link(self):
         """Link to group 'about' page should have correct format"""
+        event_datetime = datetime.datetime(2010, 10, 10, tzinfo=RPC_TZINFO)
+
         for group_type_id in ['wg', 'rg', 'ag']:
             group = GroupFactory(type_id=group_type_id)
             draft = WgDraftFactory(name='draft-document-%s' % group_type_id, group=group)
@@ -1434,11 +1527,11 @@ def test_draft_group_link(self):
             self.assertEqual(r.status_code, 200)
             self.assert_correct_wg_group_link(r, group)
 
-            rfc = WgRfcFactory(name='draft-rfc-document-%s' % group_type_id, group=group)
-            DocEventFactory.create(doc=rfc, type='published_rfc', time = '2010-10-10')
-            # get the rfc name to avoid a redirect
-            rfc_name = rfc.docalias.filter(name__startswith='rfc').first().name
-            r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc_name)))
+            rfc = WgRfcFactory(group=group)
+            draft = WgDraftFactory(group=group)
+            draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+            DocEventFactory.create(doc=rfc, type='published_rfc', time=event_datetime)
+            r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name)))
             self.assertEqual(r.status_code, 200)
             self.assert_correct_wg_group_link(r, group)
 
@@ -1449,14 +1542,33 @@ def test_draft_group_link(self):
             self.assertEqual(r.status_code, 200)
             self.assert_correct_non_wg_group_link(r, group)
 
-            rfc = WgRfcFactory(name='draft-rfc-document-%s' % group_type_id, group=group)
-            DocEventFactory.create(doc=rfc, type='published_rfc', time = '2010-10-10')
-            # get the rfc name to avoid a redirect
-            rfc_name = rfc.docalias.filter(name__startswith='rfc').first().name
-            r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc_name)))
+            rfc = WgRfcFactory(group=group)
+            draft = WgDraftFactory(name='draft-rfc-document-%s'% group_type_id, group=group)
+            draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+            DocEventFactory.create(doc=rfc, type='published_rfc', time=event_datetime)
+            r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name)))
             self.assertEqual(r.status_code, 200)
             self.assert_correct_non_wg_group_link(r, group)
 
+    def test_document_email_authors_button(self):
+        # rfc not from draft
+        rfc = WgRfcFactory()
+        DocEventFactory.create(doc=rfc, type='published_rfc')
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('a:contains("Email authors")')), 0, 'Did not expect "Email authors" button')
+
+        # rfc from draft
+        draft = WgDraftFactory(group=rfc.group)
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        draft.set_state(State.objects.get(used=True, type="draft", slug="rfc"))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('a:contains("Email authors")')), 1, 'Expected "Email authors" button')
+
     def test_document_primary_and_history_views(self):
         IndividualDraftFactory(name='draft-imaginary-independent-submission')
         ConflictReviewFactory(name='conflict-review-imaginary-irtf-submission')
@@ -1554,13 +1666,17 @@ def test_status_change(self):
         statchg = StatusChangeFactory()
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.name)))
         self.assertEqual(r.status_code, 200)
-        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.relateddocument_set.first().target.document)))
-        self.assertEqual(r.status_code, 302)
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.relateddocument_set.first().target)))
+        self.assertEqual(r.status_code, 200)
 
     def test_document_charter(self):
         CharterFactory(name='charter-ietf-mars')
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name="charter-ietf-mars")))
         self.assertEqual(r.status_code, 200)
+    
+    def test_incorrect_rfc_url(self):
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name="rfc8989", rev="00")))
+        self.assertEqual(r.status_code, 404)
 
     def test_document_conflict_review(self):
         ConflictReviewFactory(name='conflict-review-imaginary-irtf-submission')
@@ -1586,7 +1702,7 @@ def test_document_material(self):
             name = "session-72-mars-1",
             meeting = Meeting.objects.get(number='72'),
             group = Group.objects.get(acronym='mars'),
-            modified = datetime.datetime.now(),
+            modified = timezone.now(),
             add_to_schedule=False,
         )
         SchedulingEvent.objects.create(
@@ -1598,6 +1714,17 @@ def test_document_material(self):
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
+        self.assertNotContains(r, "The session for this document was cancelled.")
+
+        SchedulingEvent.objects.create(
+            session=session,
+            status_id='canceled',
+            by = Person.objects.get(user__username="marschairman"), 
+        )
+
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, "The session for this document was cancelled.")
 
     def test_document_ballot(self):
         doc = IndividualDraftFactory()
@@ -1616,7 +1743,7 @@ def test_document_ballot(self):
             type="changed_ballot_position",
             pos_id="yes",
             comment="Looks fine to me",
-            comment_time=datetime.datetime.now(),
+            comment_time=timezone.now(),
             balloter=Person.objects.get(user__username="ad"),
             by=Person.objects.get(name="(System)"))
 
@@ -1640,7 +1767,13 @@ def test_document_ballot(self):
         doc.save_with_history([e])
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertRegex(r.content.decode(), r'\(\s*%s\s+for\s+-%s\s*\)' % (pos.comment_time.strftime('%Y-%m-%d'), oldrev))
+        self.assertRegex(
+            r.content.decode(),
+            r'\(\s*%s\s+for\s+-%s\s*\)' % (
+                pos.comment_time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime('%Y-%m-%d'),
+                oldrev,
+            )
+        )
 
         # Now simulate a new ballot against the new revision and make sure the "was" position is included
         pos2 = BallotPositionDocEvent.objects.create(
@@ -1650,7 +1783,7 @@ def test_document_ballot(self):
             type="changed_ballot_position",
             pos_id="noobj",
             comment="Still looks okay to me",
-            comment_time=datetime.datetime.now(),
+            comment_time=timezone.now(),
             balloter=Person.objects.get(user__username="ad"),
             by=Person.objects.get(name="(System)"))
 
@@ -1672,7 +1805,7 @@ def test_document_ballot_popup_unique_anchors_per_doc(self):
                 type="changed_ballot_position",
                 pos_id="yes",
                 comment="Looks fine to me",
-                comment_time=datetime.datetime.now(),
+                comment_time=timezone.now(),
                 balloter=Person.objects.get(user__username="ad"),
                 by=Person.objects.get(name="(System)"))
 
@@ -1688,7 +1821,7 @@ def test_document_ballot_popup_unique_anchors_per_doc(self):
             href = q(f'div.balloter-name a[href$="{author_slug}"]').attr('href')
             ids = [
                 target.attr('id')
-                for target in q(f'p.h5[id$="{author_slug}"]').items()
+                for target in q(f'div.h5[id$="{author_slug}"]').items()
             ]
             self.assertEqual(len(ids), 1, 'Should be exactly one link for the balloter')
             self.assertEqual(href, f'#{ids[0]}', 'Anchor href should match ID')
@@ -1709,38 +1842,88 @@ def test_document_ballot_needed_positions(self):
         self.assertNotContains(r, 'more YES or NO')
 
         # status change
-        DocAlias.objects.create(name='rfc9998').docs.add(IndividualDraftFactory())
-        DocAlias.objects.create(name='rfc9999').docs.add(IndividualDraftFactory())
+        Document.objects.create(name='rfc9998')
+        Document.objects.create(name='rfc9999')
         doc = DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review')
         iesgeval_pk = str(State.objects.get(slug='iesgeval',type__slug='statchg').pk)
         empty_outbox()
         self.client.login(username='ad', password='ad+password')
         r = self.client.post(urlreverse('ietf.doc.views_status_change.change_state',kwargs=dict(name=doc.name)),dict(new_state=iesgeval_pk))
         self.assertEqual(r.status_code, 302)
-        r = self.client.get(r._headers["location"][1])
+        r = self.client.get(r.headers["location"])
         self.assertContains(r, ">IESG Evaluation<")
         self.assertEqual(len(outbox), 2)
         self.assertIn('iesg-secretary',outbox[0]['To'])
         self.assertIn('drafts-eval',outbox[1]['To'])
 
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9998'),relationship_id='tohist')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist')
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
         self.assertNotContains(r, 'Needs a YES')
         self.assertNotContains(r, 'more YES or NO')
 
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9999'),relationship_id='tois')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois')
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
         self.assertContains(r, 'more YES or NO')
 
     def test_document_json(self):
         doc = IndividualDraftFactory()
-
+        author = DocumentAuthorFactory(document=doc)
+        
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_json", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
         data = r.json()
-        self.assertEqual(doc.name, data['name'])
-        self.assertEqual(doc.pages,data['pages'])
+        self.assertEqual(data["name"], doc.name)
+        self.assertEqual(data["pages"], doc.pages)
+        self.assertEqual(
+            data["authors"],
+            [
+                {
+                    "name": author.person.name,
+                    "email": author.email.address,
+                    "affiliation": author.affiliation,
+                }
+            ]
+        )
+
+    def test_document_json_rfc(self):
+        doc = IndividualRfcFactory()
+        old_style_author = DocumentAuthorFactory(document=doc)
+        url = urlreverse("ietf.doc.views_doc.document_json", kwargs=dict(name=doc.name))
 
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        data = r.json()
+        self.assertEqual(data["name"], doc.name)
+        self.assertEqual(data["pages"], doc.pages)
+        self.assertEqual(
+            data["authors"],
+            [
+                {
+                    "name": old_style_author.person.name,
+                    "email": old_style_author.email.address,
+                    "affiliation": old_style_author.affiliation,
+                }
+            ]
+        )
+    
+        new_style_author = RfcAuthorFactory(document=doc)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        data = r.json()
+        self.assertEqual(data["name"], doc.name)
+        self.assertEqual(data["pages"], doc.pages)
+        self.assertEqual(
+            data["authors"],
+            [
+                {
+                    "name": new_style_author.titlepage_name,
+                    "email": new_style_author.email.address,
+                    "affiliation": new_style_author.affiliation,
+                }
+            ]
+        )
+
+    
     def test_writeup(self):
         doc = IndividualDraftFactory(states = [('draft','active'),('draft-iesg','iesg-eva')],)
 
@@ -1775,6 +1958,18 @@ def test_writeup(self):
         self.assertContains(r, notes.text)
         self.assertContains(r, rfced_note.text)
 
+    def test_diff_revisions(self):
+        ind_doc = IndividualDraftFactory(create_revisions=range(2))
+        wg_doc = WgDraftFactory(
+            relations=[("replaces", ind_doc)], create_revisions=range(2)
+        )
+        diff_revisions = get_diff_revisions(HttpRequest(), wg_doc.name, wg_doc)
+        self.assertEqual(len(diff_revisions), 4)
+        self.assertEqual(
+            [t[3] for t in diff_revisions],
+            [f"{n}-{v:02d}" for n in [wg_doc.name, ind_doc.name] for v in [1, 0]],
+        )
+
     def test_history(self):
         doc = IndividualDraftFactory()
 
@@ -1791,15 +1986,14 @@ def test_history(self):
         self.assertContains(r, e.desc)
 
     def test_history_bis_00(self):
-        rfcname='rfc9090'
-        rfc = WgRfcFactory(alias2=rfcname)
-        bis_draft = WgDraftFactory(name='draft-ietf-{}-{}bis'.format(rfc.group.acronym,rfcname))
+        rfc = WgRfcFactory(rfc_number=9090)
+        bis_draft = WgDraftFactory(name='draft-ietf-{}-{}bis'.format(rfc.group.acronym,rfc.name))
 
         url = urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=bis_draft.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200) 
         q = PyQuery(unicontent(r))
-        attr1='value="{}"'.format(rfcname)
+        attr1='value="{}"'.format(rfc.name)
         self.assertEqual(len(q('option['+attr1+'][selected="selected"]')), 1)
 
 
@@ -1842,18 +2036,38 @@ def test_last_call_feed(self):
             desc="Last call\x0b",  # include a control character to be sure it does not break anything
             type="sent_last_call",
             by=Person.objects.get(user__username="secretary"),
-            expires=datetime.date.today() + datetime.timedelta(days=7))
+            expires=datetime_today(DEADLINE_TZINFO) + datetime.timedelta(days=7))
 
         r = self.client.get("/feed/last-call/")
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, doc.name)
 
     def test_rfc_feed(self):
-        WgRfcFactory()
+        rfc = WgRfcFactory(rfc_number=9000)
+        DocEventFactory(doc=rfc, type="published_rfc")
         r = self.client.get("/feed/rfc/")
         self.assertTrue(r.status_code, 200)
+        q = PyQuery(r.content[39:]) # Strip off the xml declaration
+        self.assertEqual(len(q("item")), 1)
+        item = q("item")[0]
+        media_content = item.findall("{http://search.yahoo.com/mrss/}content")
+        self.assertEqual(len(media_content),4)
+        types = set([m.attrib["type"] for m in media_content])
+        self.assertEqual(types, set(["application/rfc+xml", "text/plain", "text/html", "application/pdf"]))
+        rfcs_2016 = WgRfcFactory.create_batch(3) # rfc numbers will be well below v3
+        for rfc in rfcs_2016:
+            e = DocEventFactory(doc=rfc, type="published_rfc")
+            e.time = e.time.replace(year=2016)
+            e.save()
         r = self.client.get("/feed/rfc/2016")
         self.assertTrue(r.status_code, 200)
+        q = PyQuery(r.content[39:])
+        self.assertEqual(len(q("item")), 3)
+        item = q("item")[0]
+        media_content = item.findall("{http://search.yahoo.com/mrss/}content")
+        self.assertEqual(len(media_content), 3)
+        types = set([m.attrib["type"] for m in media_content])
+        self.assertEqual(types, set(["text/plain", "text/html", "application/pdf"]))
 
     def test_state_help(self):
         url = urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type="draft-iesg"))
@@ -1886,62 +2100,91 @@ def _parse_bibtex_response(self, response) -> dict:
 
     @override_settings(RFC_EDITOR_INFO_BASE_URL='https://www.rfc-editor.ietf.org/info/')
     def test_document_bibtex(self):
+
+        for factory in [CharterFactory, BcpFactory, StatusChangeFactory, ConflictReviewFactory]: # Should be extended to all other doc types
+            doc = factory()
+            url = urlreverse("ietf.doc.views_doc.document_bibtex", kwargs=dict(name=doc.name))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 404)          
         rfc = WgRfcFactory.create(
-                  #other_aliases = ['rfc6020',],
-                  states = [('draft','rfc'),('draft-iesg','pub')],
-                  std_level_id = 'ps',
-                  time = datetime.datetime(2010,10,10),
-              )
-        num = rfc.rfc_number()
-        DocEventFactory.create(doc=rfc, type='published_rfc', time = '2010-10-10')
+            time=datetime.datetime(2010, 10, 10, tzinfo=ZoneInfo(settings.TIME_ZONE))
+        )
+        num = rfc.rfc_number
+        DocEventFactory.create(
+            doc=rfc,
+            type="published_rfc",
+            time=datetime.datetime(2010, 10, 10, tzinfo=RPC_TZINFO),
+        )
         #
-        url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=rfc.name))
+        url = urlreverse("ietf.doc.views_doc.document_bibtex", kwargs=dict(name=rfc.name))
         r = self.client.get(url)
-        entry = self._parse_bibtex_response(r)["rfc%s"%num]
-        self.assertEqual(entry['series'],   'Request for Comments')
-        self.assertEqual(entry['number'],   num)
-        self.assertEqual(entry['doi'],      '10.17487/RFC%s'%num)
-        self.assertEqual(entry['year'],     '2010')
-        self.assertEqual(entry['month'].lower()[0:3], 'oct')
-        self.assertEqual(entry['url'],      f'https://www.rfc-editor.ietf.org/info/rfc{num}')
+        entry = self._parse_bibtex_response(r)["rfc%s" % num]
+        self.assertEqual(entry["series"], "Request for Comments")
+        self.assertEqual(int(entry["number"]), num)
+        self.assertEqual(entry["doi"], "10.17487/RFC%s" % num)
+        self.assertEqual(entry["year"], "2010")
+        self.assertEqual(entry["month"].lower()[0:3], "oct")
+        self.assertEqual(entry["url"], f"https://www.rfc-editor.ietf.org/info/rfc{num}")
         #
-        self.assertNotIn('day', entry)
-
+        self.assertNotIn("day", entry)
+    
+        # test for incorrect case - revision for RFC
+        rfc = WgRfcFactory(name="rfc0000")
+        url = urlreverse(
+            "ietf.doc.views_doc.document_bibtex", kwargs=dict(name=rfc.name, rev="00")
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+    
         april1 = IndividualRfcFactory.create(
-                  stream_id =       'ise',
-                  states =          [('draft','rfc'),('draft-iesg','pub')],
-                  std_level_id =    'inf',
-                  time =            datetime.datetime(1990,0o4,0o1),
-              )
-        num = april1.rfc_number()
-        DocEventFactory.create(doc=april1, type='published_rfc', time = '1990-04-01')
+            stream_id="ise",
+            std_level_id="inf",
+            time=datetime.datetime(1990, 4, 1, tzinfo=ZoneInfo(settings.TIME_ZONE)),
+        )
+        num = april1.rfc_number
+        DocEventFactory.create(
+            doc=april1,
+            type="published_rfc",
+            time=datetime.datetime(1990, 4, 1, tzinfo=RPC_TZINFO),
+        )
         #
-        url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=april1.name))
+        url = urlreverse(
+            "ietf.doc.views_doc.document_bibtex", kwargs=dict(name=april1.name)
+        )
         r = self.client.get(url)
-        self.assertEqual(r.get('Content-Type'), 'text/plain; charset=utf-8')
-        entry = self._parse_bibtex_response(r)["rfc%s"%num]
-        self.assertEqual(entry['series'],   'Request for Comments')
-        self.assertEqual(entry['number'],   num)
-        self.assertEqual(entry['doi'],      '10.17487/RFC%s'%num)
-        self.assertEqual(entry['year'],     '1990')
-        self.assertEqual(entry['month'].lower()[0:3],    'apr')
-        self.assertEqual(entry['day'],      '1')
-        self.assertEqual(entry['url'],      f'https://www.rfc-editor.ietf.org/info/rfc{num}')
-
+        self.assertEqual(r.get("Content-Type"), "text/plain; charset=utf-8")
+        entry = self._parse_bibtex_response(r)["rfc%s" % num]
+        self.assertEqual(entry["series"], "Request for Comments")
+        self.assertEqual(int(entry["number"]), num)
+        self.assertEqual(entry["doi"], "10.17487/RFC%s" % num)
+        self.assertEqual(entry["year"], "1990")
+        self.assertEqual(entry["month"].lower()[0:3], "apr")
+        self.assertEqual(entry["day"], "1")
+        self.assertEqual(entry["url"], f"https://www.rfc-editor.ietf.org/info/rfc{num}")
+    
         draft = IndividualDraftFactory.create()
-        docname = '%s-%s' % (draft.name, draft.rev)
-        bibname = docname[6:]           # drop the 'draft-' prefix
-        url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=draft.name))
+        docname = "%s-%s" % (draft.name, draft.rev)
+        bibname = docname[6:]  # drop the 'draft-' prefix
+        url = urlreverse("ietf.doc.views_doc.document_bibtex", kwargs=dict(name=draft.name))
         r = self.client.get(url)
         entry = self._parse_bibtex_response(r)[bibname]
-        self.assertEqual(entry['note'],     'Work in Progress')
-        self.assertEqual(entry['number'],   docname)
-        self.assertEqual(entry['year'],     str(draft.pub_date().year))
-        self.assertEqual(entry['month'].lower()[0:3],    draft.pub_date().strftime('%b').lower())
-        self.assertEqual(entry['day'],      str(draft.pub_date().day))
-        self.assertEqual(entry['url'],      settings.IDTRACKER_BASE_URL + urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=draft.rev)))
+        self.assertEqual(entry["note"], "Work in Progress")
+        self.assertEqual(entry["number"], docname)
+        self.assertEqual(entry["year"], str(draft.pub_date().year))
+        self.assertEqual(
+            entry["month"].lower()[0:3], draft.pub_date().strftime("%b").lower()
+        )
+        self.assertEqual(entry["day"], str(draft.pub_date().day))
+        self.assertEqual(
+            entry["url"],
+            settings.IDTRACKER_BASE_URL
+            + urlreverse(
+                "ietf.doc.views_doc.document_main",
+                kwargs=dict(name=draft.name, rev=draft.rev),
+            ),
+        )
         #
-        self.assertNotIn('doi', entry)
+        self.assertNotIn("doi", entry)
 
     def test_document_bibxml(self):
         draft = IndividualDraftFactory.create()
@@ -1972,20 +2215,19 @@ def test_trailing_hypen_digit_name_bibxml(self):
 
 class AddCommentTestCase(TestCase):
     def test_add_comment(self):
-        draft = WgDraftFactory(name='draft-ietf-mars-test',group__acronym='mars')
-        url = urlreverse('ietf.doc.views_doc.add_comment', kwargs=dict(name=draft.name))
+        draft = WgDraftFactory(name="draft-ietf-mars-test", group__acronym="mars")
+        url = urlreverse("ietf.doc.views_doc.add_comment", kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
         # normal get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(unicontent(r))
-        self.assertEqual(len(q('form textarea[name=comment]')), 1)
+        self.assertEqual(len(q("form textarea[name=comment]")), 1)
 
-        # request resurrect
         events_before = draft.docevent_set.count()
         mailbox_before = len(outbox)
-        
+
         r = self.client.post(url, dict(comment="This is a test."))
         self.assertEqual(r.status_code, 302)
 
@@ -1993,9 +2235,9 @@ def test_add_comment(self):
         self.assertEqual("This is a test.", draft.latest_event().desc)
         self.assertEqual("added_comment", draft.latest_event().type)
         self.assertEqual(len(outbox), mailbox_before + 1)
-        self.assertIn("Comment added", outbox[-1]['Subject'])
-        self.assertIn(draft.name, outbox[-1]['Subject'])
-        self.assertIn('draft-ietf-mars-test@', outbox[-1]['To'])
+        self.assertIn("Comment added", outbox[-1]["Subject"])
+        self.assertIn(draft.name, outbox[-1]["Subject"])
+        self.assertIn("draft-ietf-mars-test@", outbox[-1]["To"])
 
         # Make sure we can also do it as IANA
         self.client.login(username="iana", password="iana+password")
@@ -2004,7 +2246,22 @@ def test_add_comment(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(unicontent(r))
-        self.assertEqual(len(q('form textarea[name=comment]')), 1)
+        self.assertEqual(len(q("form textarea[name=comment]")), 1)
+
+        empty_outbox()
+        rfc = WgRfcFactory()
+        self.client.login(username="rfc", password="rfc+password")
+        url = urlreverse("ietf.doc.views_doc.add_comment", kwargs=dict(name=rfc.name))
+        r = self.client.post(
+            url, dict(comment="This is an RFC Editor comment on an RFC.")
+        )
+        self.assertEqual(r.status_code, 302)
+
+        self.assertEqual(
+            "This is an RFC Editor comment on an RFC.", rfc.latest_event().desc
+        )
+        self.assertEqual(len(outbox), 1)
+        self.assertIn("This is an RFC Editor comment on an RFC.", get_payload_text(outbox[0]))
 
 
 class TemplateTagTest(TestCase):
@@ -2018,7 +2275,7 @@ class ReferencesTest(TestCase):
 
     def test_references(self):
         doc1 = WgDraftFactory(name='draft-ietf-mars-test')
-        doc2 = IndividualDraftFactory(name='draft-imaginary-independent-submission').docalias.first()
+        doc2 = IndividualDraftFactory(name='draft-imaginary-independent-submission')
         RelatedDocument.objects.get_or_create(source=doc1,target=doc2,relationship=DocRelationshipName.objects.get(slug='refnorm'))
         url = urlreverse('ietf.doc.views_doc.document_references', kwargs=dict(name=doc1.name))
         r = self.client.get(url)
@@ -2030,123 +2287,169 @@ def test_references(self):
         self.assertContains(r, doc1.name)
 
 class GenerateDraftAliasesTests(TestCase):
-   def setUp(self):
-       super().setUp()
-       self.doc_aliases_file = NamedTemporaryFile(delete=False, mode='w+')
-       self.doc_aliases_file.close()
-       self.doc_virtual_file = NamedTemporaryFile(delete=False, mode='w+')
-       self.doc_virtual_file.close()
-       self.saved_draft_aliases_path = settings.DRAFT_ALIASES_PATH
-       self.saved_draft_virtual_path = settings.DRAFT_VIRTUAL_PATH
-       settings.DRAFT_ALIASES_PATH = self.doc_aliases_file.name
-       settings.DRAFT_VIRTUAL_PATH = self.doc_virtual_file.name
-
-   def tearDown(self):
-       settings.DRAFT_ALIASES_PATH = self.saved_draft_aliases_path
-       settings.DRAFT_VIRTUAL_PATH = self.saved_draft_virtual_path
-       os.unlink(self.doc_aliases_file.name)
-       os.unlink(self.doc_virtual_file.name)
-       super().tearDown()
-
-   def testManagementCommand(self):
-       a_month_ago = datetime.datetime.now() - datetime.timedelta(30)
-       ad = RoleFactory(name_id='ad', group__type_id='area', group__state_id='active').person
-       shepherd = PersonFactory()
-       author1 = PersonFactory()
-       author2 = PersonFactory()
-       author3 = PersonFactory()
-       author4 = PersonFactory()
-       author5 = PersonFactory()
-       author6 = PersonFactory()
-       mars = GroupFactory(type_id='wg', acronym='mars')
-       marschairman = PersonFactory(user__username='marschairman')
-       mars.role_set.create(name_id='chair', person=marschairman, email=marschairman.email())
-       doc1 = IndividualDraftFactory(authors=[author1], shepherd=shepherd.email(), ad=ad)
-       doc2 = WgDraftFactory(name='draft-ietf-mars-test', group__acronym='mars', authors=[author2], ad=ad)
-       doc3 = WgRfcFactory.create(name='draft-ietf-mars-finished', group__acronym='mars', authors=[author3], ad=ad, std_level_id='ps', states=[('draft','rfc'),('draft-iesg','pub')], time=a_month_ago)
-       DocEventFactory.create(doc=doc3, type='published_rfc', time=a_month_ago.strftime("%Y-%m-%d"))
-       doc4 = WgRfcFactory.create(authors=[author4,author5], ad=ad, std_level_id='ps', states=[('draft','rfc'),('draft-iesg','pub')], time=datetime.datetime(2010,10,10))
-       DocEventFactory.create(doc=doc4, type='published_rfc', time = '2010-10-10')
-       doc5 = IndividualDraftFactory(authors=[author6])
-
-       args = [ ]
-       kwargs = { }
-       out = io.StringIO()
-       call_command("generate_draft_aliases", *args, **kwargs, stdout=out, stderr=out)
-       self.assertFalse(out.getvalue())
-
-       with open(settings.DRAFT_ALIASES_PATH) as afile:
-           acontent = afile.read()
-           self.assertTrue(all([x in acontent for x in [
-               'xfilter-' + doc1.name,
-               'xfilter-' + doc1.name + '.ad',
-               'xfilter-' + doc1.name + '.authors',
-               'xfilter-' + doc1.name + '.shepherd',
-               'xfilter-' + doc1.name + '.all',
-               'xfilter-' + doc2.name,
-               'xfilter-' + doc2.name + '.ad',
-               'xfilter-' + doc2.name + '.authors',
-               'xfilter-' + doc2.name + '.chairs',
-               'xfilter-' + doc2.name + '.all',
-               'xfilter-' + doc3.name,
-               'xfilter-' + doc3.name + '.ad',
-               'xfilter-' + doc3.name + '.authors',
-               'xfilter-' + doc3.name + '.chairs',
-               'xfilter-' + doc5.name,
-               'xfilter-' + doc5.name + '.authors',
-               'xfilter-' + doc5.name + '.all',
-           ]]))
-           self.assertFalse(all([x in acontent for x in [
-               'xfilter-' + doc1.name + '.chairs',
-               'xfilter-' + doc2.name + '.shepherd',
-               'xfilter-' + doc3.name + '.shepherd',
-               'xfilter-' + doc4.name,
-               'xfilter-' + doc5.name + '.shepherd',
-               'xfilter-' + doc5.name + '.ad',
-           ]]))
-
-       with open(settings.DRAFT_VIRTUAL_PATH) as vfile:
-           vcontent = vfile.read()
-           self.assertTrue(all([x in vcontent for x in [
-               ad.email_address(),
-               shepherd.email_address(),
-               marschairman.email_address(),
-               author1.email_address(),
-               author2.email_address(),
-               author3.email_address(),
-               author6.email_address(),
-           ]]))
-           self.assertFalse(all([x in vcontent for x in [
-               author4.email_address(),
-               author5.email_address(),
-           ]]))
-           self.assertTrue(all([x in vcontent for x in [
-               'xfilter-' + doc1.name,
-               'xfilter-' + doc1.name + '.ad',
-               'xfilter-' + doc1.name + '.authors',
-               'xfilter-' + doc1.name + '.shepherd',
-               'xfilter-' + doc1.name + '.all',
-               'xfilter-' + doc2.name,
-               'xfilter-' + doc2.name + '.ad',
-               'xfilter-' + doc2.name + '.authors',
-               'xfilter-' + doc2.name + '.chairs',
-               'xfilter-' + doc2.name + '.all',
-               'xfilter-' + doc3.name,
-               'xfilter-' + doc3.name + '.ad',
-               'xfilter-' + doc3.name + '.authors',
-               'xfilter-' + doc3.name + '.chairs',
-               'xfilter-' + doc5.name,
-               'xfilter-' + doc5.name + '.authors',
-               'xfilter-' + doc5.name + '.all',
-           ]]))
-           self.assertFalse(all([x in vcontent for x in [
-               'xfilter-' + doc1.name + '.chairs',
-               'xfilter-' + doc2.name + '.shepherd',
-               'xfilter-' + doc3.name + '.shepherd',
-               'xfilter-' + doc4.name,
-               'xfilter-' + doc5.name + '.shepherd',
-               'xfilter-' + doc5.name + '.ad',
-           ]]))
+    @override_settings(TOOLS_SERVER="tools.example.org", DRAFT_ALIAS_DOMAIN="draft.example.org")
+    def test_generator_class(self):
+        """The DraftAliasGenerator should generate the same lists as the old mgmt cmd"""
+        a_month_ago = (timezone.now() - datetime.timedelta(30)).astimezone(RPC_TZINFO)
+        a_month_ago = a_month_ago.replace(hour=0, minute=0, second=0, microsecond=0)
+        ad = RoleFactory(
+            name_id="ad", group__type_id="area", group__state_id="active"
+        ).person
+        shepherd = PersonFactory()
+        author1 = PersonFactory()
+        author2 = PersonFactory()
+        author3 = PersonFactory()
+        author4 = PersonFactory()
+        author5 = PersonFactory()
+        author6 = PersonFactory()
+        mars = GroupFactory(type_id="wg", acronym="mars")
+        marschairman = PersonFactory(user__username="marschairman")
+        mars.role_set.create(
+            name_id="chair", person=marschairman, email=marschairman.email()
+        )
+        doc1 = IndividualDraftFactory(authors=[author1], shepherd=shepherd.email(), ad=ad)
+        doc2 = WgDraftFactory(
+            name="draft-ietf-mars-test", group__acronym="mars", authors=[author2], ad=ad
+        )
+        doc2.notify = f"{doc2.name}.ad@draft.example.org"
+        doc2.save()
+        doc3 = WgDraftFactory.create(
+            name="draft-ietf-mars-finished",
+            group__acronym="mars",
+            authors=[author3],
+            ad=ad,
+            std_level_id="ps",
+            states=[("draft", "rfc"), ("draft-iesg", "pub")],
+            time=a_month_ago,
+        )
+        rfc3 = WgRfcFactory()
+        DocEventFactory.create(doc=rfc3, type="published_rfc", time=a_month_ago)
+        doc3.relateddocument_set.create(relationship_id="became_rfc", target=rfc3)
+        doc4 = WgDraftFactory.create(
+            authors=[author4, author5],
+            ad=ad,
+            std_level_id="ps",
+            states=[("draft", "rfc"), ("draft-iesg", "pub")],
+            time=datetime.datetime(2010, 10, 10, tzinfo=ZoneInfo(settings.TIME_ZONE)),
+        )
+        rfc4 = WgRfcFactory()
+        DocEventFactory.create(
+            doc=rfc4,
+            type="published_rfc",
+            time=datetime.datetime(2010, 10, 10, tzinfo=RPC_TZINFO),
+        )
+        doc4.relateddocument_set.create(relationship_id="became_rfc", target=rfc4)
+        doc5 = IndividualDraftFactory(authors=[author6])
+
+        output = [(alias, alist) for alias, alist in DraftAliasGenerator()]
+        alias_dict = dict(output)
+        self.assertEqual(len(alias_dict), len(output))  # no duplicate aliases
+        expected_dict = {
+            doc1.name: [author1.email_address()],
+            doc1.name + ".ad": [ad.email_address()],
+            doc1.name + ".authors": [author1.email_address()],
+            doc1.name + ".shepherd": [shepherd.email_address()],
+            doc1.name
+            + ".all": [
+                author1.email_address(),
+                ad.email_address(),
+                shepherd.email_address(),
+            ],
+            doc2.name: [author2.email_address()],
+            doc2.name + ".ad": [ad.email_address()],
+            doc2.name + ".authors": [author2.email_address()],
+            doc2.name + ".chairs": [marschairman.email_address()],
+            doc2.name + ".notify": [ad.email_address()],
+            doc2.name
+            + ".all": [
+                author2.email_address(),
+                ad.email_address(),
+                marschairman.email_address(),
+            ],
+            doc3.name: [author3.email_address()],
+            doc3.name + ".ad": [ad.email_address()],
+            doc3.name + ".authors": [author3.email_address()],
+            doc3.name + ".chairs": [marschairman.email_address()],
+            doc3.name
+            + ".all": [
+                author3.email_address(),
+                ad.email_address(),
+                marschairman.email_address(),
+            ],
+            doc5.name: [author6.email_address()],
+            doc5.name + ".authors": [author6.email_address()],
+            doc5.name + ".all": [author6.email_address()],
+        }
+        # Sort lists for comparison
+        self.assertEqual(
+            {k: sorted(v) for k, v in alias_dict.items()},
+            {k: sorted(v) for k, v in expected_dict.items()},
+        )
+
+        # check single name
+        output = [(alias, alist) for alias, alist in DraftAliasGenerator(Document.objects.filter(name=doc1.name))]
+        alias_dict = dict(output)
+        self.assertEqual(len(alias_dict), len(output))  # no duplicate aliases
+        expected_dict = {
+            doc1.name: [author1.email_address()],
+            doc1.name + ".ad": [ad.email_address()],
+            doc1.name + ".authors": [author1.email_address()],
+            doc1.name + ".shepherd": [shepherd.email_address()],
+            doc1.name
+            + ".all": [
+                author1.email_address(),
+                ad.email_address(),
+                shepherd.email_address(),
+            ],
+        }
+        # Sort lists for comparison
+        self.assertEqual(
+            {k: sorted(v) for k, v in alias_dict.items()},
+            {k: sorted(v) for k, v in expected_dict.items()},
+        )
+
+    @override_settings(TOOLS_SERVER="tools.example.org", DRAFT_ALIAS_DOMAIN="draft.example.org")
+    def test_get_draft_notify_emails(self):
+        ad = PersonFactory()
+        shepherd = PersonFactory()
+        author = PersonFactory()
+        doc = DocumentFactory(authors=[author], shepherd=shepherd.email(), ad=ad)
+        generator = DraftAliasGenerator()
+
+        doc.notify = f"{doc.name}@draft.example.org"
+        doc.save()
+        self.assertCountEqual(generator.get_draft_notify_emails(doc), [author.email_address()])
+
+        doc.notify = f"{doc.name}.ad@draft.example.org"
+        doc.save()
+        self.assertCountEqual(generator.get_draft_notify_emails(doc), [ad.email_address()])
+
+        doc.notify = f"{doc.name}.shepherd@draft.example.org"
+        doc.save()
+        self.assertCountEqual(generator.get_draft_notify_emails(doc), [shepherd.email_address()])
+
+        doc.notify = f"{doc.name}.all@draft.example.org"
+        doc.save()
+        self.assertCountEqual(
+            generator.get_draft_notify_emails(doc),
+            [ad.email_address(), author.email_address(), shepherd.email_address()]
+        )
+
+        doc.notify = f"{doc.name}.notify@draft.example.org"
+        doc.save()
+        self.assertCountEqual(generator.get_draft_notify_emails(doc), [])
+
+        doc.notify = f"{doc.name}.ad@somewhere.example.com"
+        doc.save()
+        self.assertCountEqual(generator.get_draft_notify_emails(doc), [f"{doc.name}.ad@somewhere.example.com"])
+        
+        doc.notify = f"somebody@example.com, nobody@example.com, {doc.name}.ad@tools.example.org"
+        doc.save()
+        self.assertCountEqual(
+            generator.get_draft_notify_emails(doc),
+            ["somebody@example.com", "nobody@example.com", ad.email_address()]
+        )
+
 
 class EmailAliasesTests(TestCase):
 
@@ -2155,37 +2458,20 @@ def setUp(self):
         WgDraftFactory(name='draft-ietf-mars-test',group__acronym='mars')
         WgDraftFactory(name='draft-ietf-ames-test',group__acronym='ames')
         RoleFactory(group__type_id='review', group__acronym='yangdoctors', name_id='secr')
-        self.doc_alias_file = NamedTemporaryFile(delete=False, mode='w+')
-        self.doc_alias_file.write("""# Generated by hand at 2015-02-12_16:26:45
-virtual.ietf.org anything
-draft-ietf-mars-test@ietf.org              xfilter-draft-ietf-mars-test
-expand-draft-ietf-mars-test@virtual.ietf.org  mars-author@example.com, mars-collaborator@example.com
-draft-ietf-mars-test.authors@ietf.org      xfilter-draft-ietf-mars-test.authors
-expand-draft-ietf-mars-test.authors@virtual.ietf.org  mars-author@example.mars, mars-collaborator@example.mars
-draft-ietf-mars-test.chairs@ietf.org      xfilter-draft-ietf-mars-test.chairs
-expand-draft-ietf-mars-test.chairs@virtual.ietf.org  mars-chair@example.mars
-draft-ietf-mars-test.all@ietf.org      xfilter-draft-ietf-mars-test.all
-expand-draft-ietf-mars-test.all@virtual.ietf.org  mars-author@example.mars, mars-collaborator@example.mars, mars-chair@example.mars
-draft-ietf-ames-test@ietf.org              xfilter-draft-ietf-ames-test
-expand-draft-ietf-ames-test@virtual.ietf.org  ames-author@example.com, ames-collaborator@example.com
-draft-ietf-ames-test.authors@ietf.org      xfilter-draft-ietf-ames-test.authors
-expand-draft-ietf-ames-test.authors@virtual.ietf.org  ames-author@example.ames, ames-collaborator@example.ames
-draft-ietf-ames-test.chairs@ietf.org      xfilter-draft-ietf-ames-test.chairs
-expand-draft-ietf-ames-test.chairs@virtual.ietf.org  ames-chair@example.ames
-draft-ietf-ames-test.all@ietf.org      xfilter-draft-ietf-ames-test.all
-expand-draft-ietf-ames-test.all@virtual.ietf.org  ames-author@example.ames, ames-collaborator@example.ames, ames-chair@example.ames
-
-""")
-        self.doc_alias_file.close()
-        self.saved_draft_virtual_path = settings.DRAFT_VIRTUAL_PATH
-        settings.DRAFT_VIRTUAL_PATH = self.doc_alias_file.name
-
-    def tearDown(self):
-        settings.DRAFT_VIRTUAL_PATH = self.saved_draft_virtual_path
-        os.unlink(self.doc_alias_file.name)
-        super().tearDown()
-
-    def testAliases(self):
+
+
+    @mock.patch("ietf.doc.views_doc.get_doc_email_aliases")
+    def testAliases(self, mock_get_aliases):
+        mock_get_aliases.return_value = [
+            {"doc_name": "draft-ietf-mars-test", "alias_type": "", "expansion": "mars-author@example.mars, mars-collaborator@example.mars"},
+            {"doc_name": "draft-ietf-mars-test", "alias_type": ".authors", "expansion": "mars-author@example.mars, mars-collaborator@example.mars"},
+            {"doc_name": "draft-ietf-mars-test", "alias_type": ".chairs", "expansion": "mars-chair@example.mars"},
+            {"doc_name": "draft-ietf-mars-test", "alias_type": ".all", "expansion": "mars-author@example.mars, mars-collaborator@example.mars, mars-chair@example.mars"},
+            {"doc_name": "draft-ietf-ames-test", "alias_type": "", "expansion": "ames-author@example.ames, ames-collaborator@example.ames"},
+            {"doc_name": "draft-ietf-ames-test", "alias_type": ".authors", "expansion": "ames-author@example.ames, ames-collaborator@example.ames"},
+            {"doc_name": "draft-ietf-ames-test", "alias_type": ".chairs", "expansion": "ames-chair@example.ames"},
+            {"doc_name": "draft-ietf-ames-test", "alias_type": ".all", "expansion": "ames-author@example.ames, ames-collaborator@example.ames, ames-chair@example.ames"},
+        ]
         PersonFactory(user__username='plain')
         url = urlreverse('ietf.doc.urls.redirect.document_email', kwargs=dict(name="draft-ietf-mars-test"))
         r = self.client.get(url)
@@ -2195,16 +2481,70 @@ def testAliases(self):
         login_testing_unauthorized(self, "plain", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
+        self.assertEqual(mock_get_aliases.call_args, mock.call())
         self.assertTrue(all([x in unicontent(r) for x in ['mars-test@','mars-test.authors@','mars-test.chairs@']]))
         self.assertTrue(all([x in unicontent(r) for x in ['ames-test@','ames-test.authors@','ames-test.chairs@']]))
 
-    def testExpansions(self):
+
+    @mock.patch("ietf.doc.views_doc.get_doc_email_aliases")
+    def testExpansions(self, mock_get_aliases):
+        mock_get_aliases.return_value = [
+            {"doc_name": "draft-ietf-mars-test", "alias_type": "", "expansion": "mars-author@example.mars, mars-collaborator@example.mars"},
+            {"doc_name": "draft-ietf-mars-test", "alias_type": ".authors", "expansion": "mars-author@example.mars, mars-collaborator@example.mars"},
+            {"doc_name": "draft-ietf-mars-test", "alias_type": ".chairs", "expansion": "mars-chair@example.mars"},
+            {"doc_name": "draft-ietf-mars-test", "alias_type": ".all", "expansion": "mars-author@example.mars, mars-collaborator@example.mars, mars-chair@example.mars"},
+        ]
         url = urlreverse('ietf.doc.views_doc.document_email', kwargs=dict(name="draft-ietf-mars-test"))
         r = self.client.get(url)
+        self.assertEqual(mock_get_aliases.call_args, mock.call("draft-ietf-mars-test"))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'draft-ietf-mars-test.all@ietf.org')
         self.assertContains(r, 'iesg_ballot_saved')
+    
+    @mock.patch("ietf.doc.utils.DraftAliasGenerator")
+    def test_get_doc_email_aliases(self, mock_alias_gen_cls):
+        mock_alias_gen_cls.return_value = [
+            ("draft-something-or-other.some-type", ["somebody@example.com"]),
+            ("draft-something-or-other", ["somebody@example.com"]),
+            ("draft-nothing-at-all", ["nobody@example.com"]),
+            ("draft-nothing-at-all.some-type", ["nobody@example.com"]),
+        ]
+        # order is important in the response - should be sorted by doc name and otherwise left
+        # in order
+        self.assertEqual(
+            get_doc_email_aliases(),
+            [
+                {
+                    "doc_name": "draft-nothing-at-all",
+                    "alias_type": "",
+                    "expansion": "nobody@example.com",
+                },
+                {
+                    "doc_name": "draft-nothing-at-all",
+                    "alias_type": ".some-type",
+                    "expansion": "nobody@example.com",
+                },
+                {
+                    "doc_name": "draft-something-or-other",
+                    "alias_type": ".some-type",
+                    "expansion": "somebody@example.com",
+                },
+                {
+                    "doc_name": "draft-something-or-other",
+                    "alias_type": "",
+                    "expansion": "somebody@example.com",
+                },
+            ],
+        )
+        self.assertEqual(mock_alias_gen_cls.call_args, mock.call(None))
 
+        # Repeat with a name, no need to re-test that the alias list is actually passed through, just
+        # check that the DraftAliasGenerator is called correctly
+        draft = WgDraftFactory()
+        get_doc_email_aliases(draft.name)
+        self.assertQuerySetEqual(mock_alias_gen_cls.call_args[0][0], Document.objects.filter(pk=draft.pk))
+        
+        
 class DocumentMeetingTests(TestCase):
 
     def setUp(self):
@@ -2217,7 +2557,7 @@ def setUp(self):
         self.other_chair = PersonFactory()
         self.other_group.role_set.create(name_id='chair',person=self.other_chair,email=self.other_chair.email())
 
-        today = datetime.date.today()
+        today = date_today()
         cut_days = settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_CORRECTION_DAYS
         self.past_cutoff = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1+cut_days))
         self.past = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=cut_days/2))
@@ -2227,8 +2567,8 @@ def setUp(self):
 
     def test_view_document_meetings(self):
         doc = IndividualDraftFactory.create()
-        doc.sessionpresentation_set.create(session=self.inprog,rev=None)
-        doc.sessionpresentation_set.create(session=self.interim,rev=None)
+        doc.presentations.create(session=self.inprog,rev=None)
+        doc.presentations.create(session=self.interim,rev=None)
 
         url = urlreverse('ietf.doc.views_doc.all_presentations', kwargs=dict(name=doc.name))
         response = self.client.get(url)
@@ -2239,8 +2579,8 @@ def test_view_document_meetings(self):
         self.assertFalse(q('#addsessionsbutton'))
         self.assertFalse(q("a.btn:contains('Remove document')"))
 
-        doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None)
-        doc.sessionpresentation_set.create(session=self.past,rev=None)
+        doc.presentations.create(session=self.past_cutoff,rev=None)
+        doc.presentations.create(session=self.past,rev=None)
 
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
@@ -2273,41 +2613,72 @@ def test_view_document_meetings(self):
         self.assertFalse(q("#futuremeets a.btn:contains('Remove document')"))
         self.assertFalse(q("#pastmeets a.btn:contains('Remove document')"))
 
-    def test_edit_document_session(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")
+    @mock.patch("ietf.doc.views_doc.SlidesManager")
+    def test_edit_document_session(self, mock_slides_manager_cls):
         doc = IndividualDraftFactory.create()
-        sp = doc.sessionpresentation_set.create(session=self.future,rev=None)
+        sp = doc.presentations.create(session=self.future,rev=None)
 
         url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name='no-such-doc',session_id=sp.session_id))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=0))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         self.client.login(username=self.other_chair.user.username,password='%s+password'%self.other_chair.user.username)
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
-        
+        self.assertFalse(mock_slides_manager_cls.called)
+
         self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         q = PyQuery(response.content)
         self.assertEqual(2,len(q('select#id_version option')))
+        self.assertFalse(mock_slides_manager_cls.called)
 
+        # edit draft
         self.assertEqual(1,doc.docevent_set.count())
         response = self.client.post(url,{'version':'00','save':''})
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(doc.sessionpresentation_set.get(pk=sp.pk).rev,'00')
+        self.assertEqual(doc.presentations.get(pk=sp.pk).rev,'00')
         self.assertEqual(2,doc.docevent_set.count())
+        self.assertFalse(mock_slides_manager_cls.called)
+
+        # editing slides should call Meetecho API
+        slides = SessionPresentationFactory(
+            session=self.future,
+            document__type_id="slides",
+            document__rev="00",
+            rev=None,
+            order=1,
+        ).document
+        url = urlreverse(
+            "ietf.doc.views_doc.edit_sessionpresentation",
+            kwargs={"name": slides.name, "session_id": self.future.pk},
+        )
+        response = self.client.post(url, {"version": "00", "save": ""})
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, mock.call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.send_update.call_args,
+            mock.call(self.future),
+        )
 
     def test_edit_document_session_after_proceedings_closed(self):
         doc = IndividualDraftFactory.create()
-        sp = doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None)
+        sp = doc.presentations.create(session=self.past_cutoff,rev=None)
 
         url = urlreverse('ietf.doc.views_doc.edit_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id))
         self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
@@ -2320,39 +2691,64 @@ def test_edit_document_session_after_proceedings_closed(self):
         q=PyQuery(response.content)
         self.assertEqual(1,len(q(".alert-warning:contains('may affect published proceedings')")))
 
-    def test_remove_document_session(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")
+    @mock.patch("ietf.doc.views_doc.SlidesManager")
+    def test_remove_document_session(self, mock_slides_manager_cls):
         doc = IndividualDraftFactory.create()
-        sp = doc.sessionpresentation_set.create(session=self.future,rev=None)
+        sp = doc.presentations.create(session=self.future,rev=None)
 
         url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name='no-such-doc',session_id=sp.session_id))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=0))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id))
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         self.client.login(username=self.other_chair.user.username,password='%s+password'%self.other_chair.user.username)
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
-        
+        self.assertFalse(mock_slides_manager_cls.called)
+
         self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
+        self.assertFalse(mock_slides_manager_cls.called)
 
+        # removing a draft
         self.assertEqual(1,doc.docevent_set.count())
         response = self.client.post(url,{'remove_session':''})
         self.assertEqual(response.status_code, 302)
-        self.assertFalse(doc.sessionpresentation_set.filter(pk=sp.pk).exists())
+        self.assertFalse(doc.presentations.filter(pk=sp.pk).exists())
         self.assertEqual(2,doc.docevent_set.count())
+        self.assertFalse(mock_slides_manager_cls.called)
+
+        # removing slides should call Meetecho API
+        slides = SessionPresentationFactory(session=self.future, document__type_id="slides", order=1).document
+        url = urlreverse(
+            "ietf.doc.views_doc.remove_sessionpresentation",
+            kwargs={"name": slides.name, "session_id": self.future.pk},
+        )
+        response = self.client.post(url, {"remove_session": ""})
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, mock.call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.delete.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.delete.call_args,
+            mock.call(self.future, slides),
+        )
 
     def test_remove_document_session_after_proceedings_closed(self):
         doc = IndividualDraftFactory.create()
-        sp = doc.sessionpresentation_set.create(session=self.past_cutoff,rev=None)
+        sp = doc.presentations.create(session=self.past_cutoff,rev=None)
 
         url = urlreverse('ietf.doc.views_doc.remove_sessionpresentation',kwargs=dict(name=doc.name,session_id=sp.session_id))
         self.client.login(username=self.group_chair.user.username,password='%s+password'%self.group_chair.user.username)
@@ -2365,28 +2761,49 @@ def test_remove_document_session_after_proceedings_closed(self):
         q=PyQuery(response.content)
         self.assertEqual(1,len(q(".alert-warning:contains('may affect published proceedings')")))
 
-    def test_add_document_session(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")
+    @mock.patch("ietf.doc.views_doc.SlidesManager")
+    def test_add_document_session(self, mock_slides_manager_cls):
         doc = IndividualDraftFactory.create()
 
         url = urlreverse('ietf.doc.views_doc.add_sessionpresentation',kwargs=dict(name=doc.name))
         login_testing_unauthorized(self,self.group_chair.user.username,url)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
-    
+        self.assertFalse(mock_slides_manager_cls.called)
+
         response = self.client.post(url,{'session':0,'version':'current'})
         self.assertEqual(response.status_code,200)
         q=PyQuery(response.content)
         self.assertTrue(q('.form-select.is-invalid'))
+        self.assertFalse(mock_slides_manager_cls.called)
 
         response = self.client.post(url,{'session':self.future.pk,'version':'bogus version'})
         self.assertEqual(response.status_code,200)
         q=PyQuery(response.content)
         self.assertTrue(q('.form-select.is-invalid'))
+        self.assertFalse(mock_slides_manager_cls.called)
 
+        # adding a draft
         self.assertEqual(1,doc.docevent_set.count())
         response = self.client.post(url,{'session':self.future.pk,'version':'current'})
         self.assertEqual(response.status_code,302)
         self.assertEqual(2,doc.docevent_set.count())
+        self.assertEqual(doc.presentations.get(session__pk=self.future.pk).order, 0)
+        self.assertFalse(mock_slides_manager_cls.called)
+
+        # adding slides should set order / call Meetecho API
+        slides = DocumentFactory(type_id="slides")
+        url = urlreverse("ietf.doc.views_doc.add_sessionpresentation", kwargs=dict(name=slides.name))
+        response = self.client.post(url, {"session": self.future.pk, "version": "current"})
+        self.assertEqual(response.status_code,302)
+        self.assertEqual(slides.presentations.get(session__pk=self.future.pk).order, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, mock.call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.add.call_args,
+            mock.call(self.future, slides, order=1),
+        )
 
     def test_get_related_meeting(self):
         """Should be able to retrieve related meeting"""
@@ -2419,60 +2836,6 @@ def test_get_related_meeting(self):
                 self.assertIsNone(doc.get_related_meeting(), f'{doc.type.slug} should not be related to meeting')
 
 class ChartTests(ResourceTestCaseMixin, TestCase):
-    def test_search_chart_conf(self):
-        doc = IndividualDraftFactory()
-
-        conf_url = urlreverse('ietf.doc.views_stats.chart_conf_newrevisiondocevent')
-
-        # No qurey arguments; expect an empty json object
-        r = self.client.get(conf_url)
-        self.assertValidJSONResponse(r)
-        self.assertEqual(unicontent(r), '{}')
-
-        # No match
-        r = self.client.get(conf_url + '?activedrafts=on&name=thisisnotadocumentname')
-        self.assertValidJSONResponse(r)
-        d = r.json()
-        self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
-
-        r = self.client.get(conf_url + '?activedrafts=on&name=%s'%doc.name[6:12])
-        self.assertValidJSONResponse(r)
-        d = r.json()
-        self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
-        self.assertEqual(len(d['series'][0]['data']), 0)
-
-    def test_search_chart_data(self):
-        doc = IndividualDraftFactory()
-
-        data_url = urlreverse('ietf.doc.views_stats.chart_data_newrevisiondocevent')
-
-        # No qurey arguments; expect an empty json list
-        r = self.client.get(data_url)
-        self.assertValidJSONResponse(r)
-        self.assertEqual(unicontent(r), '[]')
-
-        # No match
-        r = self.client.get(data_url + '?activedrafts=on&name=thisisnotadocumentname')
-        self.assertValidJSONResponse(r)
-        d = r.json()
-        self.assertEqual(unicontent(r), '[]')
-
-        r = self.client.get(data_url + '?activedrafts=on&name=%s'%doc.name[6:12])
-        self.assertValidJSONResponse(r)
-        d = r.json()
-        self.assertEqual(len(d), 1)
-        self.assertEqual(len(d[0]), 2)
-
-    def test_search_chart(self):
-        doc = IndividualDraftFactory()
-
-        chart_url = urlreverse('ietf.doc.views_stats.chart_newrevisiondocevent')
-        r = self.client.get(chart_url)
-        self.assertEqual(r.status_code, 200)
-
-        r = self.client.get(chart_url + '?activedrafts=on&name=%s'%doc.name[6:12])
-        self.assertEqual(r.status_code, 200)
-        
     def test_personal_chart(self):
         person = PersonFactory.create()
         IndividualDraftFactory.create(
@@ -2485,7 +2848,7 @@ def test_personal_chart(self):
         self.assertValidJSONResponse(r)
         d = r.json()
         self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
-        self.assertEqual("New draft revisions over time for %s" % person.name, d['title']['text'])
+        self.assertEqual("New Internet-Draft revisions over time for %s" % person.name, d['title']['text'])
 
         data_url = urlreverse('ietf.doc.views_stats.chart_data_person_drafts', kwargs=dict(id=person.id))
 
@@ -2494,6 +2857,7 @@ def test_personal_chart(self):
         d = r.json()
         self.assertEqual(len(d), 1)
         self.assertEqual(len(d[0]), 2)
+        self.assertEqual(d[0][1], 1) 
 
         page_url = urlreverse('ietf.person.views.profile', kwargs=dict(email_or_name=person.name))
         r = self.client.get(page_url)
@@ -2559,7 +2923,7 @@ def setUp(self):
         self.doc.save_with_history([e])
 
         # This is necessary for the view to be able to find the document
-        # which hints that the view has an issue : if a materials document is taken out of all SessionPresentations, it is no longer accessable by this view
+        # which hints that the view has an issue : if a materials document is taken out of all SessionPresentations, it is no longer accessible by this view
         SessionPresentationFactory(session__meeting__number=meeting_number, session__group=self.doc.group, document=self.doc)
 
     def test_markdown_and_text(self):
@@ -2578,247 +2942,63 @@ def test_markdown_and_text(self):
 class Idnits2SupportTests(TestCase):
     settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['DERIVED_DIR']
 
-    def test_obsoleted(self):
-        rfc = WgRfcFactory(alias2__name='rfc1001')
-        WgRfcFactory(alias2__name='rfc1003',relations=[('obs',rfc)])
-        rfc = WgRfcFactory(alias2__name='rfc1005')
-        WgRfcFactory(alias2__name='rfc1007',relations=[('obs',rfc)])
+    def test_generate_idnits2_rfcs_obsoleted(self):
+        rfc = WgRfcFactory(rfc_number=1001)
+        WgRfcFactory(rfc_number=1003,relations=[('obs',rfc)])
+        rfc = WgRfcFactory(rfc_number=1005)
+        WgRfcFactory(rfc_number=1007,relations=[('obs',rfc)])
+        blob = generate_idnits2_rfcs_obsoleted()
+        self.assertEqual(blob, b'1001 1003\n1005 1007\n'.decode("utf8"))
 
+    def test_obsoleted(self):
         url = urlreverse('ietf.doc.views_doc.idnits2_rfcs_obsoleted')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 404)
-        call_command('generate_idnits2_rfcs_obsoleted')
+        # value written is arbitrary, expect it to be passed through
+        (Path(settings.DERIVED_DIR) / "idnits2-rfcs-obsoleted").write_bytes(b'1001 1003\n1005 1007\n')
         url = urlreverse('ietf.doc.views_doc.idnits2_rfcs_obsoleted')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.content, b'1001 1003\n1005 1007\n')
 
-    def test_rfc_status(self):
+    def test_generate_idnits2_rfc_status(self):
         for slug in ('bcp', 'ds', 'exp', 'hist', 'inf', 'std', 'ps', 'unkn'):
             WgRfcFactory(std_level_id=slug)
+        blob = generate_idnits2_rfc_status().replace("\n", "")
+        self.assertEqual(blob[6312-1], "O")
+
+    def test_rfc_status(self):
         url = urlreverse('ietf.doc.views_doc.idnits2_rfc_status')
         r = self.client.get(url)
         self.assertEqual(r.status_code,404)
-        call_command('generate_idnits2_rfc_status')
+        # value written is arbitrary, expect it to be passed through
+        (Path(settings.DERIVED_DIR) / "idnits2-rfc-status").write_bytes(b'1001 1003\n1005 1007\n')
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
-        blob = unicontent(r).replace('\n','')
-        self.assertEqual(blob[6312-1],'O')
+        self.assertEqual(r.content, b'1001 1003\n1005 1007\n')
 
     def test_idnits2_state(self):
         rfc = WgRfcFactory()
-        url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=rfc.canonical_name()))
+        draft = WgDraftFactory()
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=rfc.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertContains(r,'rfcnum')
 
         draft = WgDraftFactory()
-        url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=draft.canonical_name()))
+        url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=draft.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertNotContains(r,'rfcnum')
         self.assertContains(r,'Unknown')
 
         draft = WgDraftFactory(intended_std_level_id='ps')
-        url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=draft.canonical_name()))
+        url = urlreverse('ietf.doc.views_doc.idnits2_state', kwargs=dict(name=draft.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertContains(r,'Proposed')
 
-class RfcdiffSupportTests(TestCase):
-
-    def setUp(self):
-        super().setUp()
-        self.target_view = 'ietf.doc.views_doc.rfcdiff_latest_json'
-        self._last_rfc_num = 8000
-
-    def getJson(self, view_args):
-        url = urlreverse(self.target_view, kwargs=view_args)
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        return r.json()
-
-    def next_rfc_number(self):
-        self._last_rfc_num += 1
-        return self._last_rfc_num
-
-    def do_draft_test(self, name):
-        draft = IndividualDraftFactory(name=name, rev='00', create_revisions=range(0,13))
-        draft = reload_db_objects(draft)
-
-        received = self.getJson(dict(name=draft.name))
-        self.assertEqual(
-            received,
-            dict(
-                name=draft.name,
-                rev=draft.rev,
-                content_url=draft.get_href(),
-                previous=f'{draft.name}-{(int(draft.rev)-1):02d}'
-            ),
-            'Incorrect JSON when draft revision not specified',
-        )
-
-        received = self.getJson(dict(name=draft.name, rev=draft.rev))
-        self.assertEqual(
-            received,
-            dict(
-                name=draft.name,
-                rev=draft.rev,
-                content_url=draft.get_href(),
-                previous=f'{draft.name}-{(int(draft.rev)-1):02d}'
-            ),
-            'Incorrect JSON when latest revision specified',
-        )
-
-        received = self.getJson(dict(name=draft.name, rev='10'))
-        self.assertEqual(
-            received,
-            dict(
-                name=draft.name,
-                rev='10',
-                content_url=draft.history_set.get(rev='10').get_href(),
-                previous=f'{draft.name}-09'
-            ),
-            'Incorrect JSON when historical revision specified',
-        )
-
-        received = self.getJson(dict(name=draft.name, rev='00'))
-        self.assertNotIn('previous', received, 'Rev 00 has no previous name when not replacing a draft')
-
-        replaced = IndividualDraftFactory()
-        RelatedDocument.objects.create(relationship_id='replaces',source=draft,target=replaced.docalias.first())
-        received = self.getJson(dict(name=draft.name, rev='00'))
-        self.assertEqual(received['previous'], f'{replaced.name}-{replaced.rev}',
-                         'Rev 00 has a previous name when replacing a draft')
-
-    def test_draft(self):
-        # test with typical, straightforward names
-        self.do_draft_test(name='draft-somebody-did-a-thing')
-        # try with different potentially problematic names
-        self.do_draft_test(name='draft-someone-did-something-01-02')
-        self.do_draft_test(name='draft-someone-did-something-else-02')
-        self.do_draft_test(name='draft-someone-did-something-02-weird-01')
-
-    def do_draft_with_broken_history_test(self, name):
-        draft = IndividualDraftFactory(name=name, rev='10')
-        received = self.getJson(dict(name=draft.name,rev='09'))
-        self.assertEqual(received['rev'],'09')
-        self.assertEqual(received['previous'], f'{draft.name}-08')
-        self.assertTrue('warning' in received)
-
-    def test_draft_with_broken_history(self):
-        # test with typical, straightforward names
-        self.do_draft_with_broken_history_test(name='draft-somebody-did-something')
-        # try with different potentially problematic names
-        self.do_draft_with_broken_history_test(name='draft-someone-did-something-01-02')
-        self.do_draft_with_broken_history_test(name='draft-someone-did-something-else-02')
-        self.do_draft_with_broken_history_test(name='draft-someone-did-something-02-weird-03')
-
-    def do_rfc_test(self, draft_name):
-        draft = WgDraftFactory(name=draft_name, create_revisions=range(0,2))
-        draft.docalias.create(name=f'rfc{self.next_rfc_number():04}')
-        draft.set_state(State.objects.get(type_id='draft',slug='rfc'))
-        draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub'))
-        draft = reload_db_objects(draft)
-        rfc = draft
-        
-        number = rfc.rfc_number()
-        received = self.getJson(dict(name=number))
-        self.assertEqual(
-            received,
-            dict(
-                content_url=rfc.get_href(),
-                name=rfc.canonical_name(),
-                previous=f'{draft.name}-{draft.rev}',
-            ),
-            'Can look up an RFC by number',
-        )
-
-        num_received = received
-        received = self.getJson(dict(name=rfc.canonical_name()))
-        self.assertEqual(num_received, received, 'RFC by canonical name gives same result as by number')
-
-        received = self.getJson(dict(name=f'RfC {number}'))
-        self.assertEqual(num_received, received, 'RFC with unusual spacing/caps gives same result as by number')
-
-        received = self.getJson(dict(name=draft.name))
-        self.assertEqual(num_received, received, 'RFC by draft name and no rev gives same result as by number')
-
-        received = self.getJson(dict(name=draft.name, rev='01'))
-        self.assertEqual(
-            received,
-            dict(
-                content_url=draft.history_set.get(rev='01').get_href(),
-                name=draft.name,
-                rev='01',
-                previous=f'{draft.name}-00',
-            ),
-            'RFC by draft name with rev should give draft name, not canonical name'
-        )
-
-    def test_rfc(self):
-        # simple draft name
-        self.do_rfc_test(draft_name='draft-test-ar-ef-see')
-        # tricky draft names
-        self.do_rfc_test(draft_name='draft-whatever-02')
-        self.do_rfc_test(draft_name='draft-test-me-03-04')
-
-    def test_rfc_with_tombstone(self):
-        draft = WgDraftFactory(create_revisions=range(0,2))
-        draft.docalias.create(name='rfc3261') # See views_doc.HAS_TOMBSTONE
-        draft.set_state(State.objects.get(type_id='draft',slug='rfc'))
-        draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub'))
-        draft = reload_db_objects(draft)
-        rfc = draft
-
-        # Some old rfcs had tombstones that shouldn't be used for comparisons
-        received = self.getJson(dict(name=rfc.canonical_name()))
-        self.assertTrue(received['previous'].endswith('00'))
-
-    def do_rfc_with_broken_history_test(self, draft_name):
-        draft = WgDraftFactory(rev='10', name=draft_name)
-        draft.docalias.create(name=f'rfc{self.next_rfc_number():04}')
-        draft.set_state(State.objects.get(type_id='draft',slug='rfc'))
-        draft.set_state(State.objects.get(type_id='draft-iesg', slug='pub'))
-        draft = reload_db_objects(draft)
-        rfc = draft
-
-        received = self.getJson(dict(name=draft.name))
-        self.assertEqual(
-            received,
-            dict(
-                content_url=rfc.get_href(),
-                name=rfc.canonical_name(),
-                previous=f'{draft.name}-10',
-            ),
-            'RFC by draft name without rev should return canonical RFC name and no rev',
-        )
-
-        received = self.getJson(dict(name=draft.name, rev='10'))
-        self.assertEqual(received['name'], draft.name, 'RFC by draft name with rev should return draft name')
-        self.assertEqual(received['rev'], '10', 'Requested rev should be returned')
-        self.assertEqual(received['previous'], f'{draft.name}-09', 'Previous rev is one less than requested')
-        self.assertIn(f'{draft.name}-10', received['content_url'], 'Returned URL should include requested rev')
-        self.assertNotIn('warning', received, 'No warning when we have the rev requested')
-
-        received = self.getJson(dict(name=f'{draft.name}-09'))
-        self.assertEqual(received['name'], draft.name, 'RFC by draft name with rev should return draft name')
-        self.assertEqual(received['rev'], '09', 'Requested rev should be returned')
-        self.assertEqual(received['previous'], f'{draft.name}-08', 'Previous rev is one less than requested')
-        self.assertIn(f'{draft.name}-09', received['content_url'], 'Returned URL should include requested rev')
-        self.assertEqual(
-            received['warning'],
-            'History for this version not found - these results are speculation',
-            'Warning should be issued when requested rev is not found'
-        )
-
-    def test_rfc_with_broken_history(self):
-        # simple draft name
-        self.do_rfc_with_broken_history_test(draft_name='draft-some-draft')
-        # tricky draft names
-        self.do_rfc_with_broken_history_test(draft_name='draft-gizmo-01')
-        self.do_rfc_with_broken_history_test(draft_name='draft-oh-boy-what-a-draft-02-03')
-
 
 class RawIdTests(TestCase):
 
@@ -2859,16 +3039,12 @@ def test_raw_id(self):
         self.should_succeed(dict(name=draft.name, rev='00',ext='txt'))
         self.should_404(dict(name=draft.name, rev='00',ext='html'))
 
-    def test_raw_id_rfc(self):
-        rfc = WgRfcFactory()
-        dir = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
-        (Path(dir) / f'{rfc.name}-{rfc.rev}.txt').touch()
-        self.should_succeed(dict(name=rfc.name))
-        self.should_404(dict(name=rfc.canonical_name()))
+    # test_raw_id_rfc intentionally removed
+    # an rfc is no longer a pseudo-version of a draft.
 
     def test_non_draft(self):
-        charter = CharterFactory()
-        self.should_404(dict(name=charter.name))
+        for doc in [CharterFactory(), WgRfcFactory()]:
+            self.should_404(dict(name=doc.name))
 
 class PdfizedTests(TestCase):
 
@@ -2880,28 +3056,506 @@ def should_succeed(self, argdict):
         url = urlreverse(self.view, kwargs=argdict)
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
-        self.assertEqual(r.get('Content-Type'),'application/pdf;charset=utf-8')
+        self.assertEqual(r.get('Content-Type'),'application/pdf')
 
     def should_404(self, argdict):
         url = urlreverse(self.view, kwargs=argdict)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 404)
 
+    # This takes a _long_ time (32s on a 2022 m1 macbook pro) - is it worth what it covers?
     def test_pdfized(self):
-        rfc = WgRfcFactory(create_revisions=range(0,2))
+        rfc = WgRfcFactory()
+        draft = WgDraftFactory(create_revisions=range(0,2))
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
 
         dir = settings.RFC_PATH
-        with (Path(dir) / f'{rfc.canonical_name()}.txt').open('w') as f:
+        with (Path(dir) / f'{rfc.name}.txt').open('w') as f:
             f.write('text content')
         dir = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
         for r in range(0,2):
-            with (Path(dir) / f'{rfc.name}-{r:02d}.txt').open('w') as f:
+            with (Path(dir) / f'{draft.name}-{r:02d}.txt').open('w') as f:
                 f.write('text content')
 
-        self.should_succeed(dict(name=rfc.canonical_name()))
+        self.assertTrue(
+            login_testing_unauthorized(
+                self,
+                PersonFactory().user.username,
+                urlreverse(self.view, kwargs={"name": draft.name}),
+            )
+        )
         self.should_succeed(dict(name=rfc.name))
+        self.should_succeed(dict(name=draft.name))
         for r in range(0,2):
-            self.should_succeed(dict(name=rfc.name,rev=f'{r:02d}'))
+            self.should_succeed(dict(name=draft.name,rev=f'{r:02d}'))
             for ext in ('pdf','txt','html','anythingatall'):
-                self.should_succeed(dict(name=rfc.name,rev=f'{r:02d}',ext=ext))
-        self.should_404(dict(name=rfc.name,rev='02'))
+                self.should_succeed(dict(name=draft.name,rev=f'{r:02d}',ext=ext))
+        self.should_404(dict(name=draft.name,rev='02'))
+
+        with mock.patch('ietf.doc.models.DocumentInfo.pdfized', side_effect=URLFetchingError):
+            url = urlreverse(self.view, kwargs=dict(name=rfc.name))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            self.assertContains(r, "Error while rendering PDF")
+
+class NotifyValidationTests(TestCase):
+    def test_notify_validation(self):
+        valid_values = [
+            "foo@example.com, bar@example.com",
+            "Foo Bar <foobar@example.com>, baz@example.com",
+            "foo@example.com, ,bar@example.com,", # We're ignoring extra commas
+            "foo@example.com\nbar@example.com", # Yes, we're quietly accepting a newline as a comma
+        ]
+        bad_nameaddr_values = [
+            "@example.com",
+            "foo",
+            "foo@",
+            "foo bar foobar@example.com",
+        ]
+        duplicate_values = [
+            "foo@bar.com, bar@baz.com, foo@bar.com",
+            "Foo <foo@bar.com>, foobar <foo@bar.com>",
+        ]
+        both_duplicate_and_bad_values = [
+            "foo@example.com, bar@, Foo <foo@example.com>",
+            "Foo <@example.com>, Bar <@example.com>",
+        ]
+        for v in valid_values:
+            self.assertTrue(NotifyForm({"notify": v}).is_valid())
+        for v in bad_nameaddr_values:
+            f = NotifyForm({"notify": v})
+            self.assertFalse(f.is_valid())
+            self.assertTrue("Invalid addresses" in f.errors["notify"][0])
+            self.assertFalse("Duplicate addresses" in f.errors["notify"][0])
+        for v in duplicate_values:
+            f = NotifyForm({"notify": v})
+            self.assertFalse(f.is_valid())
+            self.assertFalse("Invalid addresses" in f.errors["notify"][0])
+            self.assertTrue("Duplicate addresses" in f.errors["notify"][0])
+        for v in both_duplicate_and_bad_values:
+            f = NotifyForm({"notify": v})
+            self.assertFalse(f.is_valid())
+            self.assertTrue("Invalid addresses" in f.errors["notify"][0])
+            self.assertTrue("Duplicate addresses" in f.errors["notify"][0])
+
+class CanRequestConflictReviewTests(TestCase):
+    def test_gets_request_conflict_review_action_button(self):
+        ise_draft = IndividualDraftFactory(stream_id="ise")
+        irtf_draft = RgDraftFactory()
+
+        # This is blunt, trading off precision for time. A more thorough test would ensure
+        # that the text is in a button and that the correct link is absent/present as well.
+
+        target_string = "Begin IETF conflict review"
+
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=irtf_draft.name))
+        r = self.client.get(url)
+        self.assertNotContains(r, target_string)
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url)
+        self.assertContains(r, target_string)
+        self.client.logout()
+        self.client.login(username="irtf-chair", password="irtf-chair+password")
+        r = self.client.get(url)
+        self.assertContains(r, target_string)
+        self.client.logout()
+        self.client.login(username="ise-chair", password="ise-chair+password")
+        r = self.client.get(url)
+        self.assertNotContains(r, target_string)
+        self.client.logout()
+
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=ise_draft.name))
+        r = self.client.get(url)
+        self.assertNotContains(r, target_string)
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url)
+        self.assertContains(r, target_string)
+        self.client.logout()
+        self.client.login(username="irtf-chair", password="irtf-chair+password")
+        r = self.client.get(url)
+        self.assertNotContains(r, target_string)
+        self.client.logout()
+        self.client.login(username="ise-chair", password="ise-chair+password")
+        r = self.client.get(url)
+        self.assertContains(r, target_string)
+
+class DocInfoMethodsTests(TestCase):
+
+    def test_became_rfc(self):
+        draft = WgDraftFactory()
+        rfc = WgRfcFactory()
+        draft.relateddocument_set.create(relationship_id="became_rfc",target=rfc)
+        self.assertEqual(draft.became_rfc(), rfc)
+        self.assertEqual(rfc.came_from_draft(), draft)
+
+        charter = CharterFactory()
+        self.assertIsNone(charter.became_rfc())
+        self.assertIsNone(charter.came_from_draft())
+
+    def test_revisions(self):
+        draft = WgDraftFactory(rev="09",create_revisions=range(0,10))
+        self.assertEqual(draft.revisions_by_dochistory(),[f"{i:02d}" for i in range(0,10)])
+        self.assertEqual(draft.revisions_by_newrevisionevent(),[f"{i:02d}" for i in range(0,10)])
+        rfc = WgRfcFactory()
+        self.assertEqual(rfc.revisions_by_newrevisionevent(),[])
+        self.assertEqual(rfc.revisions_by_dochistory(),[])
+
+        draft.history_set.filter(rev__lt="08").delete()
+        draft.docevent_set.filter(newrevisiondocevent__rev="05").delete()
+        self.assertEqual(draft.revisions_by_dochistory(),[f"{i:02d}" for i in range(8,10)])
+        self.assertEqual(draft.revisions_by_newrevisionevent(),[f"{i:02d}" for i in [*range(0,5), *range(6,10)]])      
+
+    def test_referenced_by_rfcs(self):
+        # n.b., no significance to the ref* values in this test
+        referring_draft = WgDraftFactory()
+        (rfc, referring_rfc) = WgRfcFactory.create_batch(2)
+        rfc.targets_related.create(relationship_id="refnorm", source=referring_draft)
+        rfc.targets_related.create(relationship_id="refnorm", source=referring_rfc)
+        self.assertCountEqual(
+            rfc.referenced_by_rfcs(),
+            rfc.targets_related.filter(source=referring_rfc),
+        )
+
+    def test_referenced_by_rfcs_as_rfc_or_draft(self):
+        # n.b., no significance to the ref* values in this test
+        draft = WgDraftFactory()
+        rfc = WgRfcFactory()
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        
+        # Draft referring to the rfc and the draft - should not be reported at all
+        draft_referring_to_both = WgDraftFactory()
+        draft_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=draft)
+        draft_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=rfc)
+        
+        # RFC referring only to the draft - should be reported for either the draft or the rfc
+        rfc_referring_to_draft = WgRfcFactory()
+        rfc_referring_to_draft.relateddocument_set.create(relationship_id="refinfo", target=draft)
+
+        # RFC referring only to the rfc - should be reported only for the rfc
+        rfc_referring_to_rfc = WgRfcFactory()
+        rfc_referring_to_rfc.relateddocument_set.create(relationship_id="refinfo", target=rfc)
+
+        # RFC referring only to the rfc - should be reported only for the rfc
+        rfc_referring_to_rfc = WgRfcFactory()
+        rfc_referring_to_rfc.relateddocument_set.create(relationship_id="refinfo", target=rfc)
+
+        # RFC referring to the rfc and the draft - should be reported for both
+        rfc_referring_to_both = WgRfcFactory()
+        rfc_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=draft)
+        rfc_referring_to_both.relateddocument_set.create(relationship_id="refnorm", target=rfc)
+
+        self.assertCountEqual(
+            draft.referenced_by_rfcs_as_rfc_or_draft(),
+            draft.targets_related.filter(source__type="rfc"),
+        )
+
+        self.assertCountEqual(
+            rfc.referenced_by_rfcs_as_rfc_or_draft(),
+            draft.targets_related.filter(source__type="rfc") | rfc.targets_related.filter(source__type="rfc"),
+        )
+
+class StateIndexTests(TestCase):
+
+    def test_state_index(self):
+        url = urlreverse('ietf.doc.views_help.state_index')
+        r = self.client.get(url)
+        q = PyQuery(r.content)
+        content = [ e.text for e in q('#content table td a ') ]
+        names = StateType.objects.values_list('slug', flat=True)
+        # The following doesn't cover all doc types, only a selection
+        for name in names:
+            if not '-' in name:
+                self.assertIn(name, content)
+
+class InvestigateTests(TestCase):
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + [
+        "AGENDA_PATH",
+        # "INTERNET_DRAFT_PATH",
+        # "INTERNET_DRAFT_ARCHIVE_DIR",
+        # "INTERNET_ALL_DRAFTS_ARCHIVE_DIR",
+    ]
+
+    def setUp(self):
+        super().setUp()
+        # Contort the draft archive dir temporary replacement
+        # to match the "collections" concept
+        archive_tmp_dir = Path(settings.INTERNET_DRAFT_ARCHIVE_DIR)
+        new_archive_dir = archive_tmp_dir / "draft-archive"
+        new_archive_dir.mkdir()
+        settings.INTERNET_DRAFT_ARCHIVE_DIR = str(new_archive_dir)
+        donated_personal_copy_dir = archive_tmp_dir / "donated-personal-copy"
+        donated_personal_copy_dir.mkdir()
+        meeting_dir = Path(settings.AGENDA_PATH) / "666"
+        meeting_dir.mkdir()
+        all_archive_dir = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR)
+        repository_dir = Path(settings.INTERNET_DRAFT_PATH)
+
+        for path in [repository_dir, all_archive_dir]:
+            (path / "draft-this-is-active-00.txt").touch()
+        for path in [new_archive_dir, all_archive_dir]:
+            (path / "draft-old-but-can-authenticate-00.txt").touch()
+            (path / "draft-has-mixed-provenance-01.txt").touch()
+        for path in [donated_personal_copy_dir, all_archive_dir]:
+            (path / "draft-donated-from-a-personal-collection-00.txt").touch()
+            (path / "draft-has-mixed-provenance-00.txt").touch()
+            (path / "draft-has-mixed-provenance-00.txt.Z").touch()
+        (all_archive_dir / "draft-this-should-not-be-possible-00.txt").touch()
+        (meeting_dir / "draft-this-predates-the-archive-00.txt").touch()
+
+    def test_investigate_fragment(self):
+
+        result = investigate_fragment("this-is-active")
+        self.assertEqual(len(result["can_verify"]), 1)
+        self.assertEqual(len(result["unverifiable_collections"]), 0)
+        self.assertEqual(len(result["unexpected"]), 0)
+        self.assertEqual(
+            list(result["can_verify"])[0].name, "draft-this-is-active-00.txt"
+        )
+
+        result = investigate_fragment("old-but-can")
+        self.assertEqual(len(result["can_verify"]), 1)
+        self.assertEqual(len(result["unverifiable_collections"]), 0)
+        self.assertEqual(len(result["unexpected"]), 0)
+        self.assertEqual(
+            list(result["can_verify"])[0].name, "draft-old-but-can-authenticate-00.txt"
+        )
+
+        result = investigate_fragment("predates")
+        self.assertEqual(len(result["can_verify"]), 1)
+        self.assertEqual(len(result["unverifiable_collections"]), 0)
+        self.assertEqual(len(result["unexpected"]), 0)
+        self.assertEqual(
+            list(result["can_verify"])[0].name, "draft-this-predates-the-archive-00.txt"
+        )
+
+        result = investigate_fragment("personal-collection")
+        self.assertEqual(len(result["can_verify"]), 0)
+        self.assertEqual(len(result["unverifiable_collections"]), 1)
+        self.assertEqual(len(result["unexpected"]), 0)
+        self.assertEqual(
+            list(result["unverifiable_collections"])[0].name,
+            "draft-donated-from-a-personal-collection-00.txt",
+        )
+
+        result = investigate_fragment("mixed-provenance")
+        self.assertEqual(len(result["can_verify"]), 1)
+        self.assertEqual(len(result["unverifiable_collections"]), 2)
+        self.assertEqual(len(result["unexpected"]), 0)
+        self.assertEqual(
+            list(result["can_verify"])[0].name, "draft-has-mixed-provenance-01.txt"
+        )
+        self.assertEqual(
+            set([p.name for p in result["unverifiable_collections"]]),
+            set(
+                [
+                    "draft-has-mixed-provenance-00.txt",
+                    "draft-has-mixed-provenance-00.txt.Z",
+                ]
+            ),
+        )
+
+        result = investigate_fragment("not-be-possible")
+        self.assertEqual(len(result["can_verify"]), 0)
+        self.assertEqual(len(result["unverifiable_collections"]), 0)
+        self.assertEqual(len(result["unexpected"]), 1)
+        self.assertEqual(
+            list(result["unexpected"])[0].name,
+            "draft-this-should-not-be-possible-00.txt",
+        )
+
+    @mock.patch("ietf.doc.utils.caches")
+    def test_investigate_fragment_cache(self, mock_caches):
+        """investigate_fragment should cache its result"""
+        mock_default_cache = mock_caches["default"]
+        mock_default_cache.get.return_value = None  # disable cache
+        result = investigate_fragment("this-is-active")
+        self.assertEqual(len(result["can_verify"]), 1)
+        self.assertEqual(len(result["unverifiable_collections"]), 0)
+        self.assertEqual(len(result["unexpected"]), 0)
+        self.assertEqual(
+            list(result["can_verify"])[0].name, "draft-this-is-active-00.txt"
+        )
+        self.assertTrue(mock_default_cache.get.called)
+        self.assertTrue(mock_default_cache.set.called)
+        expected_key = f"investigate_fragment:{sha384(b'this-is-active').hexdigest()}"
+        self.assertEqual(mock_default_cache.set.call_args.kwargs["key"], expected_key)
+        cached_value = mock_default_cache.set.call_args.kwargs["value"]  # hang on to this
+        mock_default_cache.reset_mock()
+
+        # Check that a cached value is used
+        mock_default_cache.get.return_value = cached_value
+        with mock.patch("ietf.doc.utils.Path") as mock_path:
+            result = investigate_fragment("this-is-active")
+        # Check that we got the same results
+        self.assertEqual(len(result["can_verify"]), 1)
+        self.assertEqual(len(result["unverifiable_collections"]), 0)
+        self.assertEqual(len(result["unexpected"]), 0)
+        self.assertEqual(
+            list(result["can_verify"])[0].name, "draft-this-is-active-00.txt"
+        )
+        # And that we used the cache
+        self.assertFalse(mock_path.called)  # a proxy for "did the method do any real work"
+        self.assertTrue(mock_default_cache.get.called)
+        self.assertEqual(mock_default_cache.get.call_args, mock.call(expected_key))
+
+    def test_investigate_get(self):
+        """GET with no querystring should retrieve the investigate UI"""
+        url = urlreverse("ietf.doc.views_doc.investigate")
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("form#investigate")), 1)
+        self.assertEqual(len(q("div#results")), 0)
+
+    @mock.patch("ietf.doc.views_doc.AsyncResult")
+    def test_investgate_get_task_id(self, mock_asyncresult):
+        """GET with querystring should lookup task status"""
+        url = urlreverse("ietf.doc.views_doc.investigate")
+        login_testing_unauthorized(self, "secretary", url)
+        mock_asyncresult.return_value.ready.return_value = True
+        r = self.client.get(url + "?id=a-task-id")
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.json(), {"status": "ready"})
+        self.assertTrue(mock_asyncresult.called)
+        self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id"))
+        mock_asyncresult.reset_mock()
+
+        mock_asyncresult.return_value.ready.return_value = False
+        r = self.client.get(url + "?id=a-task-id")
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.json(), {"status": "notready"})
+        self.assertTrue(mock_asyncresult.called)
+        self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id"))
+
+    @mock.patch("ietf.doc.views_doc.investigate_fragment_task")
+    def test_investigate_post(self, mock_investigate_fragment_task):
+        """POST with a name_fragment and no task_id should start a celery task"""
+        url = urlreverse("ietf.doc.views_doc.investigate")
+        login_testing_unauthorized(self, "secretary", url)
+
+        # test some invalid cases
+        r = self.client.post(url, {"name_fragment": "short"})  # limit is >= 8 characters
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("#id_name_fragment.is-invalid")), 1)
+        self.assertFalse(mock_investigate_fragment_task.delay.called)
+        for char in ["*", "%", "/", "\\"]:
+            r = self.client.post(url, {"name_fragment": f"bad{char}character"})
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertEqual(len(q("#id_name_fragment.is-invalid")), 1)
+            self.assertFalse(mock_investigate_fragment_task.delay.called)
+        
+        # now a valid one
+        mock_investigate_fragment_task.delay.return_value.id = "a-task-id"
+        r = self.client.post(url, {"name_fragment": "this-is-a-valid-fragment"})
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(mock_investigate_fragment_task.delay.called)
+        self.assertEqual(mock_investigate_fragment_task.delay.call_args, mock.call("this-is-a-valid-fragment"))
+        self.assertEqual(r.json(), {"id": "a-task-id"})
+
+    @mock.patch("ietf.doc.views_doc.AsyncResult")
+    def test_investigate_post_task_id(self, mock_asyncresult):
+        """POST with name_fragment and task_id should retrieve results"""
+        url = urlreverse("ietf.doc.views_doc.investigate")
+        login_testing_unauthorized(self, "secretary", url)
+
+        # First, test a non-successful result - this could be a failure or non-existent task id
+        mock_result = mock_asyncresult.return_value
+        mock_result.successful.return_value = False
+        r = self.client.post(url, {"name_fragment": "some-fragment", "task_id": "a-task-id"})
+        self.assertContains(r, "The investigation task failed.", status_code=200)
+        self.assertTrue(mock_asyncresult.called)
+        self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id"))
+        self.assertFalse(mock_result.get.called)
+        mock_asyncresult.reset_mock()
+        q = PyQuery(r.content)
+        self.assertEqual(q("#id_name_fragment").val(), "some-fragment")
+        self.assertEqual(q("#id_task_id").val(), "a-task-id")
+
+        # now the various successful result mixes
+        mock_result = mock_asyncresult.return_value
+        mock_result.successful.return_value = True
+        mock_result.get.return_value = {
+            "name_fragment": "different-fragment",
+            "results": {
+                "can_verify": set(),
+                "unverifiable_collections": set(),
+                "unexpected": set(),
+            }
+        }
+        r = self.client.post(url, {"name_fragment": "some-fragment", "task_id": "a-task-id"})
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(mock_asyncresult.called)
+        self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id"))
+        mock_asyncresult.reset_mock()
+        q = PyQuery(r.content)
+        self.assertEqual(q("#id_name_fragment").val(), "different-fragment", "name_fragment should be reset")
+        self.assertEqual(q("#id_task_id").val(), "", "task_id should be cleared")
+        self.assertEqual(len(q("div#results")), 1)
+        self.assertEqual(len(q("table#authenticated")), 0)
+        self.assertEqual(len(q("table#unverifiable")), 0)
+        self.assertEqual(len(q("table#unexpected")), 0)
+
+        # This file was created in setUp. It allows the view to render properly
+        # but its location / content don't matter for this test otherwise.
+        a_file_that_exists = Path(settings.INTERNET_DRAFT_PATH) / "draft-this-is-active-00.txt"
+
+        mock_result.get.return_value = {
+            "name_fragment": "different-fragment",
+            "results": {
+                "can_verify": {a_file_that_exists},
+                "unverifiable_collections": {a_file_that_exists},
+                "unexpected": set(),
+            }
+        }
+        r = self.client.post(url, {"name_fragment": "some-fragment", "task_id": "a-task-id"})
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(mock_asyncresult.called)
+        self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id"))
+        mock_asyncresult.reset_mock()
+        q = PyQuery(r.content)
+        self.assertEqual(q("#id_name_fragment").val(), "different-fragment", "name_fragment should be reset")
+        self.assertEqual(q("#id_task_id").val(), "", "task_id should be cleared")
+        self.assertEqual(len(q("div#results")), 1)
+        self.assertEqual(len(q("table#authenticated")), 1)
+        self.assertEqual(len(q("table#unverifiable")), 1)
+        self.assertEqual(len(q("table#unexpected")), 0)
+
+        mock_result.get.return_value = {
+            "name_fragment": "different-fragment",
+            "results": {
+                "can_verify": set(),
+                "unverifiable_collections": set(),
+                "unexpected": {a_file_that_exists},
+            }
+        }
+        r = self.client.post(url, {"name_fragment": "some-fragment", "task_id": "a-task-id"})
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(mock_asyncresult.called)
+        self.assertEqual(mock_asyncresult.call_args, mock.call("a-task-id"))
+        mock_asyncresult.reset_mock()
+        q = PyQuery(r.content)
+        self.assertEqual(q("#id_name_fragment").val(), "different-fragment", "name_fragment should be reset")
+        self.assertEqual(q("#id_task_id").val(), "", "task_id should be cleared")
+        self.assertEqual(len(q("div#results")), 1)
+        self.assertEqual(len(q("table#authenticated")), 0)
+        self.assertEqual(len(q("table#unverifiable")), 0)
+        self.assertEqual(len(q("table#unexpected")), 1)
+
+
+class LogIOErrorTests(TestCase):
+
+    def test_doc_text_io_error(self):
+
+        d = IndividualDraftFactory()
+
+        with mock.patch("ietf.doc.models.Path") as path_cls_mock:
+            with mock.patch("ietf.doc.models.log.log") as log_mock:
+                path_cls_mock.return_value.exists.return_value = True
+                path_cls_mock.return_value.open.return_value.__enter__.return_value.read.side_effect = IOError("Bad things happened")
+                text = d.text()
+                self.assertIsNone(text)
+                self.assertTrue(log_mock.called)
+                self.assertIn("Bad things happened", log_mock.call_args[0][0])
diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index 317e4e3a1d..8420e411e2 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -3,7 +3,7 @@
 
 
 import datetime
-import mock
+from unittest import mock
 
 from pyquery import PyQuery
 
@@ -12,30 +12,42 @@
 from django.test import RequestFactory
 from django.utils.text import slugify
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 
 from ietf.doc.models import (Document, State, DocEvent,
                              BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, TelechatDocEvent)
 from ietf.doc.factories import (DocumentFactory, IndividualDraftFactory, IndividualRfcFactory, WgDraftFactory,
-                                BallotPositionDocEventFactory, BallotDocEventFactory)
+                                BallotPositionDocEventFactory, BallotDocEventFactory, IRSGBallotDocEventFactory, RgDraftFactory)
+from ietf.doc.templatetags.ietf_filters import can_defer
 from ietf.doc.utils import create_ballot_if_not_open
+from ietf.doc.views_ballot import parse_ballot_edit_return_point
 from ietf.doc.views_doc import document_ballot_content
 from ietf.group.models import Group, Role
 from ietf.group.factories import GroupFactory, RoleFactory, ReviewTeamFactory
 from ietf.ipr.factories import HolderIprDisclosureFactory
-from ietf.name.models import BallotPositionName
 from ietf.iesg.models import TelechatDate
-from ietf.person.models import Person, PersonalApiKey
-from ietf.person.factories import PersonFactory
+from ietf.person.models import Person
+from ietf.person.factories import PersonFactory, PersonalApiKeyFactory
 from ietf.person.utils import get_active_ads
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
 from ietf.utils.text import unwrap
+from ietf.utils.timezone import date_today, datetime_today
 
 
 class EditPositionTests(TestCase):
+
+    # N.B. This test needs to be rewritten to exercise all types of ballots (iesg, irsg, rsab)
+    # and test against the output of the mailtriggers instead of looking for hardcoded values
+    # in the To and CC results. See #7864
     def test_edit_position(self):
         ad = Person.objects.get(user__username="ad")
-        draft = IndividualDraftFactory(ad=ad,stream_id='ietf')
+        draft = WgDraftFactory(
+            ad=ad,
+            stream_id="ietf",
+            notify="somebody@example.com",
+            group__acronym="mars",
+        )
         ballot = create_ballot_if_not_open(None, draft, ad, 'approve')
         url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name,
                                                           ballot_id=ballot.pk))
@@ -51,11 +63,20 @@ def test_edit_position(self):
         self.assertEqual(len(q('form textarea[name=comment]')), 1)
 
         # vote
+        empty_outbox()
         events_before = draft.docevent_set.count()
-        
-        r = self.client.post(url, dict(position="discuss",
-                                       discuss=" This is a discussion test. \n ",
-                                       comment=" This is a test. \n "))
+
+        r = self.client.post(
+            url,
+            dict(
+                position="discuss",
+                discuss=" This is a discussion test. \n ",
+                comment=" This is a test. \n ",
+                additional_cc="test298347@example.com",
+                cc_choices=["doc_notify", "doc_group_chairs"],
+                send_mail=1,
+            ),
+        )
         self.assertEqual(r.status_code, 302)
 
         pos = draft.latest_event(BallotPositionDocEvent, balloter=ad)
@@ -66,6 +87,22 @@ def test_edit_position(self):
         self.assertTrue(pos.comment_time != None)
         self.assertTrue("New position" in pos.desc)
         self.assertEqual(draft.docevent_set.count(), events_before + 3)
+        self.assertEqual(len(outbox),1)
+        m = outbox[0]
+        self.assertTrue("COMMENT" in m['Subject'])
+        self.assertTrue("DISCUSS" in m['Subject'])
+        self.assertTrue(draft.name in m['Subject'])
+        self.assertTrue("This is a discussion test." in str(m))
+        self.assertTrue("This is a test" in str(m))
+        self.assertTrue("iesg@" in m['To'])
+        # cc_choice doc_group_chairs
+        self.assertTrue("mars-chairs@" in m['Cc'])
+        # cc_choice doc_notify
+        self.assertTrue("somebody@example.com" in m['Cc'])
+        # cc_choice doc_group_email_list was not selected
+        self.assertFalse(draft.group.list_email in m['Cc'])
+        # extra-cc    
+        self.assertTrue("test298347@example.com" in m['Cc'])        
 
         # recast vote
         events_before = draft.docevent_set.count()
@@ -105,9 +142,9 @@ def test_api_set_position(self):
         draft = WgDraftFactory(ad=ad)
         url = urlreverse('ietf.doc.views_ballot.api_set_position')
         create_ballot_if_not_open(None, draft, ad, 'approve')
-        ad.user.last_login = datetime.datetime.now()
+        ad.user.last_login = timezone.now()
         ad.user.save()
-        apikey = PersonalApiKey.objects.create(endpoint=url, person=ad)
+        apikey = PersonalApiKeyFactory(endpoint=url, person=ad)
 
         # vote
         events_before = draft.docevent_set.count()
@@ -226,61 +263,6 @@ def test_cannot_edit_position_as_pre_ad(self):
         r = self.client.post(url, dict(position="discuss", discuss="Test discuss text"))
         self.assertEqual(r.status_code, 403)
         
-    def test_send_ballot_comment(self):
-        ad = Person.objects.get(user__username="ad")
-        draft = WgDraftFactory(ad=ad,group__acronym='mars')
-        draft.notify = "somebody@example.com"
-        draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
-
-        ballot = create_ballot_if_not_open(None, draft, ad, 'approve')
-
-        BallotPositionDocEvent.objects.create(
-            doc=draft, rev=draft.rev, type="changed_ballot_position",
-            by=ad, balloter=ad, ballot=ballot, pos=BallotPositionName.objects.get(slug="discuss"),
-            discuss="This draft seems to be lacking a clearer title?",
-            discuss_time=datetime.datetime.now(),
-            comment="Test!",
-            comment_time=datetime.datetime.now())
-        
-        url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name,
-                                                                ballot_id=ballot.pk))
-        login_testing_unauthorized(self, "ad", url)
-
-        # normal get
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertTrue(len(q('form input[name="extra_cc"]')) > 0)
-
-        # send
-        mailbox_before = len(outbox)
-
-        r = self.client.post(url, dict(extra_cc="test298347@example.com", cc_choices=['doc_notify','doc_group_chairs']))
-        self.assertEqual(r.status_code, 302)
-
-        self.assertEqual(len(outbox), mailbox_before + 1)
-        m = outbox[-1]
-        self.assertTrue("COMMENT" in m['Subject'])
-        self.assertTrue("DISCUSS" in m['Subject'])
-        self.assertTrue(draft.name in m['Subject'])
-        self.assertTrue("clearer title" in str(m))
-        self.assertTrue("Test!" in str(m))
-        self.assertTrue("iesg@" in m['To'])
-        # cc_choice doc_group_chairs
-        self.assertTrue("mars-chairs@" in m['Cc'])
-        # cc_choice doc_notify
-        self.assertTrue("somebody@example.com" in m['Cc'])
-        # cc_choice doc_group_email_list was not selected
-        self.assertFalse(draft.group.list_email in m['Cc'])
-        # extra-cc    
-        self.assertTrue("test298347@example.com" in m['Cc'])
-
-        r = self.client.post(url, dict(cc=""))
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(len(outbox), mailbox_before + 2)
-        m = outbox[-1]
-        self.assertTrue("iesg@" in m['To'])
-        self.assertFalse(m['Cc'] and draft.group.list_email in m['Cc'])
 
 
 class BallotWriteupsTests(TestCase):
@@ -353,7 +335,7 @@ def test_request_last_call(self):
         self.assertTrue('aread@' in outbox[-1]['Cc'])
 
     def test_edit_ballot_writeup(self):
-        draft = IndividualDraftFactory(states=[('draft','active'),('draft-iesg','iesg-eva')])
+        draft = IndividualDraftFactory(states=[('draft','active'),('draft-iesg','iesg-eva')], stream_id='ietf')
         url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
@@ -383,8 +365,25 @@ def test_edit_ballot_writeup(self):
         self.assertTrue("This is a simple test" in d.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text").text)
         self.assertTrue('iesg-eva' == d.get_state_slug('draft-iesg'))
 
+    def test_edit_ballot_writeup_unauthorized_stream(self):
+        # Test that accessing a document from unauthorized (irtf) stream returns a 404 error
+        draft = RgDraftFactory()
+        url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name))
+        login_testing_unauthorized(self, "ad", url)
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
+    def test_edit_ballot_writeup_invalid_name(self):
+        # Test that accessing a non-existent document returns a 404 error
+        url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name="invalid_name"))
+        login_testing_unauthorized(self, "ad", url)
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
     def test_edit_ballot_writeup_already_approved(self):
-        draft = IndividualDraftFactory(states=[('draft','active'),('draft-iesg','approved')])
+        draft = IndividualDraftFactory(states=[('draft','active'),('draft-iesg','approved')], stream_id='ietf')
         url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
@@ -458,7 +457,7 @@ def test_edit_ballot_rfceditornote(self):
     def test_issue_ballot(self):
         ad = Person.objects.get(user__username="ad")
         for case in ('none','past','future'):
-            draft = IndividualDraftFactory(ad=ad)
+            draft = IndividualDraftFactory(ad=ad, stream_id='ietf')
             if case in ('past','future'):
                 LastCallDocEvent.objects.create(
                     by=Person.objects.get(name='(System)'),
@@ -466,7 +465,7 @@ def test_issue_ballot(self):
                     doc=draft,
                     rev=draft.rev,
                     desc='issued last call',
-                    expires = datetime.datetime.now()+datetime.timedelta(days = 1 if case=='future' else -1)
+                    expires = timezone.now()+datetime.timedelta(days = 1 if case=='future' else -1)
                 )
             url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name))
             login_testing_unauthorized(self, "ad", url)
@@ -497,7 +496,7 @@ def test_issue_ballot(self):
 
     def test_issue_ballot_auto_state_change(self):
         ad = Person.objects.get(user__username="ad")
-        draft = IndividualDraftFactory(ad=ad, states=[('draft','active'),('draft-iesg','writeupw')])
+        draft = IndividualDraftFactory(ad=ad, states=[('draft','active'),('draft-iesg','writeupw')], stream_id='ietf')
         url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
@@ -521,11 +520,12 @@ def test_issue_ballot_auto_state_change(self):
 
     def test_issue_ballot_warn_if_early(self):
         ad = Person.objects.get(user__username="ad")
-        draft = IndividualDraftFactory(ad=ad, states=[('draft','active'),('draft-iesg','lc')])
+        draft = IndividualDraftFactory(ad=ad, states=[('draft','active'),('draft-iesg','lc')], stream_id='ietf')
         url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
         # expect warning about issuing a ballot before IETF Last Call is done
+        # No last call has yet been issued
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -533,6 +533,38 @@ def test_issue_ballot_warn_if_early(self):
         self.assertTrue(q('[class=text-danger]:contains("not completed IETF Last Call")'))
         self.assertTrue(q('[type=submit]:contains("Save")'))
 
+        # Last call exists but hasn't expired
+        LastCallDocEvent.objects.create(
+            doc=draft,
+            expires=datetime_today()+datetime.timedelta(days=14),
+            by=Person.objects.get(name="(System)")
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(q('[class=text-danger]:contains("not completed IETF Last Call")'))
+
+        # Last call exists and has expired
+        LastCallDocEvent.objects.filter(doc=draft).update(expires=datetime_today()-datetime.timedelta(days=2))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertFalse(q('[class=text-danger]:contains("not completed IETF Last Call")'))
+
+        for state_slug in ["lc", "ad-eval"]:
+            draft.set_state(State.objects.get(type="draft-iesg",slug=state_slug))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertTrue(q('[class=text-danger]:contains("It would be unexpected to issue a ballot while in this state.")'))
+
+        draft.set_state(State.objects.get(type="draft-iesg",slug="writeupw"))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertFalse(q('[class=text-danger]:contains("It would be unexpected to issue a ballot while in this state.")'))         
+                         
+
     def test_edit_approval_text(self):
         ad = Person.objects.get(user__username="ad")
         draft = WgDraftFactory(ad=ad,states=[('draft','active'),('draft-iesg','iesg-eva')],intended_std_level_id='ps',group__parent=Group.objects.get(acronym='farfut'))
@@ -770,7 +802,7 @@ def test_clear_ballot(self):
         ballot = create_ballot_if_not_open(None, draft, ad, 'approve')
         old_ballot_id = ballot.id
         draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) 
-        url = urlreverse('ietf.doc.views_ballot.clear_ballot', kwargs=dict(name=draft.name,ballot_type_slug=draft.ballot_open('approve').ballot_type.slug))
+        url = urlreverse('ietf.doc.views_ballot.clear_ballot', kwargs=dict(name=draft.name,ballot_type_slug="approve"))
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
@@ -780,6 +812,11 @@ def test_clear_ballot(self):
         self.assertIsNotNone(ballot)
         self.assertEqual(ballot.ballotpositiondocevent_set.count(),0)
         self.assertNotEqual(old_ballot_id, ballot.id)
+        # It's not valid to clear a ballot of a type where there's no matching state
+        url = urlreverse('ietf.doc.views_ballot.clear_ballot', kwargs=dict(name=draft.name,ballot_type_slug="statchg"))
+        r = self.client.post(url,{})
+        self.assertEqual(r.status_code, 404)
+ 
 
     def test_ballot_downref_approve(self):
         ad = Person.objects.get(name="Areað Irector")
@@ -791,7 +828,7 @@ def test_ballot_downref_approve(self):
                   doc=draft,
                   rev=draft.rev,
                   desc='issued last call',
-                  expires = datetime.datetime.now()-datetime.timedelta(days=14) )
+                  expires = timezone.now()-datetime.timedelta(days=14) )
         WriteupDocEvent.objects.create(
                   by=Person.objects.get(name='(System)'),
                   doc=draft,
@@ -800,8 +837,8 @@ def test_ballot_downref_approve(self):
                   desc='Last call announcement was changed',
                   text='this is simple last call text.' )
         rfc = IndividualRfcFactory.create(
+                  name = "rfc6666",
                   stream_id='ise',
-                  other_aliases=['rfc6666',],
                   states=[('draft','rfc'),('draft-iesg','pub')],
                   std_level_id='inf', )
 
@@ -818,7 +855,7 @@ def test_ballot_downref_approve(self):
         self.assertContains(r, "No downward references for")
 
         # Add a downref, the page should ask if it should be added to the registry
-        rel = draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'),relationship_id='refnorm')
+        rel = draft.relateddocument_set.create(target=rfc, relationship_id='refnorm')
         d = [rdoc for rdoc in draft.relateddocument_set.all() if rel.is_approved_downref()]
         original_len = len(d)
         r = self.client.get(url)
@@ -898,7 +935,7 @@ def test_make_last_call_yang_document(self):
 
         mailbox_before = len(outbox)
 
-        last_call_sent_date = datetime.date.today()
+        last_call_sent_date = date_today()
         expire_date = last_call_sent_date+datetime.timedelta(days=14)
         
         r = self.client.post(url,
@@ -1067,6 +1104,35 @@ def setUp(self):
         DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review',states=[('statchg','iesgeval')])
         DocumentFactory(type_id='conflrev',name='conflict-review-imaginary-irtf-submission',states=[('conflrev','iesgeval')])
 
+class IetfFiltersTests(TestCase):
+    def test_can_defer(self):
+        secretariat = Person.objects.get(user__username="secretary").user
+        ad = Person.objects.get(user__username="ad").user
+        irtf_chair = Person.objects.get(user__username="irtf-chair").user
+        rsab_chair = Person.objects.get(user__username="rsab-chair").user
+        irsg_member = RoleFactory(group__type_id="rg", name_id="chair").person.user
+        rsab_member = RoleFactory(group=Group.objects.get(acronym="rsab"), name_id="member").person.user
+        nobody = PersonFactory().user
+
+        users = set([secretariat, ad, irtf_chair, rsab_chair, irsg_member, rsab_member, nobody])
+
+        iesg_ballot = BallotDocEventFactory(doc__stream_id='ietf')
+        self.assertTrue(can_defer(secretariat, iesg_ballot.doc))
+        self.assertTrue(can_defer(ad, iesg_ballot.doc))
+        for user in users - set([secretariat, ad]):
+            self.assertFalse(can_defer(user, iesg_ballot.doc))
+
+        irsg_ballot = IRSGBallotDocEventFactory(doc__stream_id='irtf')
+        for user in users:
+            self.assertFalse(can_defer(user, irsg_ballot.doc))
+
+        rsab_ballot = BallotDocEventFactory(ballot_type__slug='rsab-approve', doc__stream_id='editorial')
+        for user in users:
+            self.assertFalse(can_defer(user, rsab_ballot.doc))        
+
+    def test_can_clear_ballot(self):
+        pass # Right now, can_clear_ballot is implemented by can_defer
+
 class RegenerateLastCallTestCase(TestCase):
 
     def test_regenerate_last_call(self):
@@ -1089,13 +1155,13 @@ def test_regenerate_last_call(self):
         self.assertFalse("contains these normative down" in lc_text)
 
         rfc = IndividualRfcFactory.create(
+                  rfc_number=6666,
                   stream_id='ise',
-                  other_aliases=['rfc6666',],
                   states=[('draft','rfc'),('draft-iesg','pub')],
                   std_level_id='inf',
               )
 
-        draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'),relationship_id='refnorm')
+        draft.relateddocument_set.create(target=rfc,relationship_id='refnorm')
 
         r = self.client.post(url, dict(regenerate_last_call_text="1"))
         self.assertEqual(r.status_code, 200)
@@ -1105,7 +1171,7 @@ def test_regenerate_last_call(self):
         self.assertTrue("rfc6666" in lc_text)
         self.assertTrue("Independent Submission" in lc_text)
 
-        draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'), relationship_id='downref-approval')
+        draft.relateddocument_set.create(target=rfc, relationship_id='downref-approval')
 
         r = self.client.post(url, dict(regenerate_last_call_text="1"))
         self.assertEqual(r.status_code, 200)
@@ -1117,7 +1183,7 @@ def test_regenerate_last_call(self):
 
 class BallotContentTests(TestCase):
     def test_ballotpositiondocevent_any_email_sent(self):
-        now = datetime.datetime.now()  # be sure event timestamps are at distinct times
+        now = timezone.now()  # be sure event timestamps are at distinct times
         bpde_with_null_send_email = BallotPositionDocEventFactory(
             time=now - datetime.timedelta(minutes=30),
             send_email=None,
@@ -1196,11 +1262,12 @@ def test_ballotpositiondocevent_any_email_sent(self):
         )
 
     def _assertBallotMessage(self, q, balloter, expected):
-        heading = q(f'p.h5[id$="_{slugify(balloter.plain_name())}"]')
+        heading = q(f'div.h5[id$="_{slugify(balloter.plain_name())}"]')
         self.assertEqual(len(heading), 1)
-        # <p.h5/> is followed by a panel with the message of interest, so use next()
+        # <div.h5> is followed by a panel with the message of interest, so use next()
+        next = heading.next()
         self.assertEqual(
-            len(heading.next().find(
+            len(next.find(
                 f'*[title="{expected}"]'
             )),
             1,
@@ -1219,7 +1286,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=balloters[0],
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now(),
+            discuss_time=timezone.now(),
             send_email=True,
         )
         BallotPositionDocEventFactory(
@@ -1227,7 +1294,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=balloters[1],
             pos_id='noobj',
             comment='Commentary',
-            comment_time=datetime.datetime.now(),
+            comment_time=timezone.now(),
             send_email=True,
         )
 
@@ -1237,7 +1304,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=balloters[2],
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now(),
+            discuss_time=timezone.now(),
             send_email=False,
         )
         BallotPositionDocEventFactory(
@@ -1245,7 +1312,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=balloters[3],
             pos_id='noobj',
             comment='Commentary',
-            comment_time=datetime.datetime.now(),
+            comment_time=timezone.now(),
             send_email=False,
         )
 
@@ -1255,7 +1322,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=balloters[4],
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now() - datetime.timedelta(days=1),
+            discuss_time=timezone.now() - datetime.timedelta(days=1),
             send_email=True,
         )
         BallotPositionDocEventFactory(
@@ -1263,7 +1330,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=balloters[4],
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now(),
+            discuss_time=timezone.now(),
             send_email=False,
         )
         BallotPositionDocEventFactory(
@@ -1271,7 +1338,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=balloters[5],
             pos_id='noobj',
             comment='Commentary',
-            comment_time=datetime.datetime.now() - datetime.timedelta(days=1),
+            comment_time=timezone.now() - datetime.timedelta(days=1),
             send_email=True,
         )
         BallotPositionDocEventFactory(
@@ -1279,7 +1346,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=balloters[5],
             pos_id='noobj',
             comment='Commentary',
-            comment_time=datetime.datetime.now(),
+            comment_time=timezone.now(),
             send_email=False,
         )
 
@@ -1296,7 +1363,7 @@ def test_document_ballot_content_email_sent(self):
             balloter__plain='plain name1',
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now(),
+            discuss_time=timezone.now(),
             send_email=False,
         ).balloter
         send_email_balloter = BallotPositionDocEventFactory(
@@ -1304,7 +1371,7 @@ def test_document_ballot_content_email_sent(self):
             balloter__plain='plain name2',
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now(),
+            discuss_time=timezone.now(),
             send_email=True,
         ).balloter
         prev_send_email_balloter = BallotPositionDocEventFactory(
@@ -1312,7 +1379,7 @@ def test_document_ballot_content_email_sent(self):
             balloter__plain='plain name3',
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now() - datetime.timedelta(days=1),
+            discuss_time=timezone.now() - datetime.timedelta(days=1),
             send_email=True,
         ).balloter
         BallotPositionDocEventFactory(
@@ -1320,7 +1387,7 @@ def test_document_ballot_content_email_sent(self):
             balloter=prev_send_email_balloter,
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now(),
+            discuss_time=timezone.now(),
             send_email=False,
         )
 
@@ -1351,7 +1418,7 @@ def test_document_ballot_content_without_send_email_values(self):
             balloter=balloters[0],
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now(),
+            discuss_time=timezone.now(),
             send_email=None,
         )
         BallotPositionDocEventFactory(
@@ -1359,7 +1426,7 @@ def test_document_ballot_content_without_send_email_values(self):
             balloter=balloters[1],
             pos_id='noobj',
             comment='Commentary',
-            comment_time=datetime.datetime.now(),
+            comment_time=timezone.now(),
             send_email=None,
         )
         old_balloter = BallotPositionDocEventFactory(
@@ -1367,7 +1434,7 @@ def test_document_ballot_content_without_send_email_values(self):
             balloter__plain='plain name',  # ensure plain name is slugifiable
             pos_id='discuss',
             discuss='Discussion text',
-            discuss_time=datetime.datetime.now(),
+            discuss_time=timezone.now(),
             send_email=None,
         ).balloter
 
@@ -1377,6 +1444,31 @@ def test_document_ballot_content_without_send_email_values(self):
             ballot_id=ballot.pk,
         )
         q = PyQuery(content)
-        self._assertBallotMessage(q, balloters[0], 'No email send requests for this discuss')
-        self._assertBallotMessage(q, balloters[1], 'No ballot position send log available')
-        self._assertBallotMessage(q, old_balloter, 'No ballot position send log available')
\ No newline at end of file
+        self._assertBallotMessage(q, balloters[0], 'No discuss send log available')
+        self._assertBallotMessage(q, balloters[1], 'No comment send log available')
+        self._assertBallotMessage(q, old_balloter, 'No ballot position send log available')
+
+class ReturnToUrlTests(TestCase):
+    def test_invalid_return_to_url(self):
+        with self.assertRaises(ValueError):
+            parse_ballot_edit_return_point('/', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718')
+
+        with self.assertRaises(ValueError):
+            parse_ballot_edit_return_point('/a-route-that-does-not-exist/', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718')
+
+        with self.assertRaises(ValueError):
+            parse_ballot_edit_return_point('https://example.com/phishing', 'draft-ietf-opsawg-ipfix-tcpo-v6eh', '998718')
+
+    def test_valid_default_return_to_url(self):
+        self.assertEqual(parse_ballot_edit_return_point(
+            None,
+            'draft-ietf-opsawg-ipfix-tcpo-v6eh',
+            '998718'
+        ), '/doc/draft-ietf-opsawg-ipfix-tcpo-v6eh/ballot/998718/')
+        
+    def test_valid_return_to_url(self):
+        self.assertEqual(parse_ballot_edit_return_point(
+            '/doc/draft-ietf-opsawg-ipfix-tcpo-v6eh/ballot/998718/',
+            'draft-ietf-opsawg-ipfix-tcpo-v6eh',
+            '998718'
+        ), '/doc/draft-ietf-opsawg-ipfix-tcpo-v6eh/ballot/998718/')
diff --git a/ietf/doc/tests_bofreq.py b/ietf/doc/tests_bofreq.py
index 4d02108d01..6b142149be 100644
--- a/ietf/doc/tests_bofreq.py
+++ b/ietf/doc/tests_bofreq.py
@@ -14,10 +14,12 @@
 from django.conf import settings
 from django.urls import reverse as urlreverse
 from django.template.loader import render_to_string
+from django.utils import timezone
 
+from ietf.doc.storage_utils import retrieve_str
 from ietf.group.factories import RoleFactory
 from ietf.doc.factories import BofreqFactory, NewRevisionDocEventFactory
-from ietf.doc.models import State, Document, DocAlias, NewRevisionDocEvent
+from ietf.doc.models import State, Document, NewRevisionDocEvent
 from ietf.doc.utils_bofreq import bofreq_editors, bofreq_responsible
 from ietf.ietfauth.utils import has_role
 from ietf.person.factories import PersonFactory
@@ -31,7 +33,7 @@ class BofreqTests(TestCase):
     settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['BOFREQ_PATH']
 
     def write_bofreq_file(self, bofreq):
-        fname = Path(settings.BOFREQ_PATH) / ("%s-%s.md" % (bofreq.canonical_name(), bofreq.rev))
+        fname = Path(settings.BOFREQ_PATH) / ("%s-%s.md" % (bofreq.name, bofreq.rev))
         with fname.open("w") as f:
             f.write(f"""# This is a test bofreq.
 Version: {bofreq.rev}
@@ -48,13 +50,13 @@ def test_show_bof_requests(self):
         states = State.objects.filter(type_id='bofreq')
         self.assertTrue(states.count()>0)
         for i in range(3*len(states)):
-           BofreqFactory(states=[('bofreq',states[i%len(states)].slug)],newrevisiondocevent__time=datetime.datetime.today()-datetime.timedelta(days=randint(0,20)))
+           BofreqFactory(states=[('bofreq',states[i%len(states)].slug)],newrevisiondocevent__time=timezone.now()-datetime.timedelta(days=randint(0,20)))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         for state in states:
-            self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1)
-            self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3)
+            self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1 if state.slug!="spam" else 0)
+            self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3 if state.slug!="spam" else 0)
         self.assertFalse(q('#start_button'))
         PersonFactory(user__username='nobody')
         self.client.login(username='nobody', password='nobody+password')
@@ -62,6 +64,13 @@ def test_show_bof_requests(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertTrue(q('#start_button'))
+        self.client.logout()
+        self.client.login(username='secretary', password='secretary+password')
+        r = self.client.get(url)
+        q = PyQuery(r.content)
+        for state in states:
+            self.assertEqual(len(q(f'#bofreqs-{state.slug}')), 1)
+            self.assertEqual(len(q(f'#bofreqs-{state.slug} tbody tr')), 3)
 
 
     def test_bofreq_main_page(self):
@@ -298,17 +307,20 @@ def test_submit(self):
         url = urlreverse('ietf.doc.views_bofreq.submit', kwargs=dict(name=doc.name))
 
         rev = doc.rev
+        doc_time = doc.time 
         r = self.client.post(url,{'bofreq_submission':'enter','bofreq_content':'# oiwefrase'})
         self.assertEqual(r.status_code, 302)
         doc = reload_db_objects(doc)
-        self.assertEqual(rev, doc.rev)
+        self.assertEqual(doc.rev, rev)
+        self.assertEqual(doc.time, doc_time)
 
         nobody = PersonFactory()
         self.client.login(username=nobody.user.username, password=nobody.user.username+'+password')
         r = self.client.post(url,{'bofreq_submission':'enter','bofreq_content':'# oiwefrase'})
         self.assertEqual(r.status_code, 403)
         doc = reload_db_objects(doc)
-        self.assertEqual(rev, doc.rev)
+        self.assertEqual(doc.rev, rev)
+        self.assertEqual(doc.time, doc_time)
         self.client.logout()
 
         editor = bofreq_editors(doc).first()
@@ -319,22 +331,29 @@ def test_submit(self):
             file = NamedTemporaryFile(delete=False,mode="w+",encoding='utf-8')
             file.write(f'# {username}')
             file.close()
-            for postdict in [
-                        {'bofreq_submission':'enter','bofreq_content':f'# {username}'},
-                        {'bofreq_submission':'upload','bofreq_file':open(file.name,'rb')},
-                     ]:
-                docevent_count = doc.docevent_set.count()
-                empty_outbox()
-                r = self.client.post(url, postdict)
-                self.assertEqual(r.status_code, 302)
-                doc = reload_db_objects(doc)
-                self.assertEqual('%02d'%(int(rev)+1) ,doc.rev)
-                self.assertEqual(f'# {username}', doc.text())
-                self.assertEqual(docevent_count+1, doc.docevent_set.count())
-                self.assertEqual(1, len(outbox))
-                rev = doc.rev
+            try:
+                with open(file.name, 'rb') as bofreq_fd:
+                    for postdict in [
+                                {'bofreq_submission':'enter','bofreq_content':f'# {username}'},
+                                {'bofreq_submission':'upload','bofreq_file':bofreq_fd},
+                            ]:
+                        docevent_count = doc.docevent_set.count()
+                        empty_outbox()
+                        r = self.client.post(url, postdict)
+                        self.assertEqual(r.status_code, 302)
+                        doc = reload_db_objects(doc)
+                        self.assertEqual(doc.rev, '%02d'%(int(rev)+1))
+                        self.assertGreater(doc.time, doc_time)
+                        self.assertEqual(doc.text(), f'# {username}')
+                        self.assertEqual(retrieve_str('bofreq', doc.get_base_name()), f'# {username}')
+                        self.assertEqual(doc.docevent_set.count(), docevent_count+1)
+                        self.assertEqual(len(outbox), 1)
+                        rev = doc.rev
+                        doc_time = doc.time
+            finally:
+                os.unlink(file.name)
+
             self.client.logout()
-            os.unlink(file.name)
 
     def test_start_new_bofreq(self):
         url = urlreverse('ietf.doc.views_bofreq.new_bof_request')
@@ -349,25 +368,28 @@ def test_start_new_bofreq(self):
         file = NamedTemporaryFile(delete=False,mode="w+",encoding='utf-8')
         file.write('some stuff')
         file.close()
-        for postdict in [
-                            dict(title='title one', bofreq_submission='enter', bofreq_content='some stuff'),
-                            dict(title='title two', bofreq_submission='upload', bofreq_file=open(file.name,'rb')),
-                        ]:
-            empty_outbox()
-            r = self.client.post(url, postdict)
-            self.assertEqual(r.status_code,302)
-            name = f"bofreq-{xslugify(nobody.last_name())[:64]}-{postdict['title']}".replace(' ','-')
-            bofreq = Document.objects.filter(name=name,type_id='bofreq').first()
-            self.assertIsNotNone(bofreq)
-            self.assertIsNotNone(DocAlias.objects.filter(name=name).first())
-            self.assertEqual(bofreq.title, postdict['title'])
-            self.assertEqual(bofreq.rev, '00')
-            self.assertEqual(bofreq.get_state_slug(), 'proposed')
-            self.assertEqual(list(bofreq_editors(bofreq)), [nobody])
-            self.assertEqual(bofreq.latest_event(NewRevisionDocEvent).rev, '00')
-            self.assertEqual(bofreq.text_or_error(), 'some stuff')
-            self.assertEqual(len(outbox),1)
-        os.unlink(file.name)
+        try:
+            with open(file.name,'rb') as bofreq_fd:
+                for postdict in [
+                                    dict(title='title one', bofreq_submission='enter', bofreq_content='some stuff'),
+                                    dict(title='title two', bofreq_submission='upload', bofreq_file=bofreq_fd),
+                                ]:
+                    empty_outbox()
+                    r = self.client.post(url, postdict)
+                    self.assertEqual(r.status_code,302)
+                    name = f"bofreq-{xslugify(nobody.last_name())[:64]}-{postdict['title']}".replace(' ','-')
+                    bofreq = Document.objects.filter(name=name,type_id='bofreq').first()
+                    self.assertIsNotNone(bofreq)
+                    self.assertEqual(bofreq.title, postdict['title'])
+                    self.assertEqual(bofreq.rev, '00')
+                    self.assertEqual(bofreq.get_state_slug(), 'proposed')
+                    self.assertEqual(list(bofreq_editors(bofreq)), [nobody])
+                    self.assertEqual(bofreq.latest_event(NewRevisionDocEvent).rev, '00')
+                    self.assertEqual(bofreq.text_or_error(), 'some stuff')
+                    self.assertEqual(retrieve_str('bofreq',bofreq.get_base_name()), 'some stuff')
+                    self.assertEqual(len(outbox),1)
+        finally:
+            os.unlink(file.name)
         existing_bofreq = BofreqFactory(requester_lastname=nobody.last_name())
         for postdict in [
                             dict(title='', bofreq_submission='enter', bofreq_content='some stuff'),
diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py
index 8732b7701d..62e49559e2 100644
--- a/ietf/doc/tests_charter.py
+++ b/ietf/doc/tests_charter.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright The IETF Trust 2011-2020, All Rights Reserved
+# Copyright The IETF Trust 2011-2023, All Rights Reserved
 
 
 import datetime
@@ -16,6 +16,7 @@
 from ietf.doc.factories import CharterFactory, NewRevisionDocEventFactory, TelechatDocEventFactory
 from ietf.doc.models import ( Document, State, BallotDocEvent, BallotType, NewRevisionDocEvent,
     TelechatDocEvent, WriteupDocEvent )
+from ietf.doc.storage_utils import retrieve_str
 from ietf.doc.utils_charter import ( next_revision, default_review_text, default_action_text,
     charter_name_for_group )
 from ietf.doc.utils import close_open_ballots
@@ -26,6 +27,8 @@
 from ietf.utils.test_utils import TestCase
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
 from ietf.utils.test_utils import login_testing_unauthorized
+from ietf.utils.timezone import datetime_today, date_today, DEADLINE_TZINFO
+
 
 class ViewCharterTests(TestCase):
     def test_view_revisions(self):
@@ -85,11 +88,12 @@ def test_view_revisions(self):
 class EditCharterTests(TestCase):
     settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['CHARTER_PATH']
 
+    def setUp(self):
+        super().setUp()
+        (Path(settings.FTP_DIR)/"charter").mkdir()
+
     def write_charter_file(self, charter):
-        with (Path(settings.CHARTER_PATH) /
-              ("%s-%s.txt" % (charter.canonical_name(), charter.rev))
-        ).open("w") as f:
-            f.write("This is a charter.")
+        (Path(settings.CHARTER_PATH) / f"{charter.name}-{charter.rev}.txt").write_text("This is a charter.")
 
     def test_startstop_process(self):
         CharterFactory(group__acronym='mars')
@@ -402,7 +406,7 @@ def test_no_returning_item_for_different_ballot(self):
 
         # Make it so that the charter has been through internal review, and passed its external review
         # ballot on a previous telechat 
-        last_week = datetime.date.today()-datetime.timedelta(days=7)
+        last_week = datetime_today(DEADLINE_TZINFO) - datetime.timedelta(days=7)
         BallotDocEvent.objects.create(type='created_ballot',by=login,doc=charter, rev=charter.rev,
                                       ballot_type=BallotType.objects.get(doc_type=charter.type,slug='r-extrev'),
                                       time=last_week)
@@ -446,8 +450,8 @@ def test_edit_notify(self):
         # Regenerate does not save!
         self.assertEqual(charter.notify,newlist)
         q = PyQuery(r.content)
-        formlist = q('form input[name=notify]')[0].value
-        self.assertEqual(formlist, None)
+        formlist = q('form textarea[name=notify]')[0].value.strip()
+        self.assertEqual(formlist, "")
 
     def test_edit_ad(self):
 
@@ -507,8 +511,21 @@ def test_submit_charter(self):
         self.assertEqual(charter.rev, next_revision(prev_rev))
         self.assertTrue("new_revision" in charter.latest_event().type)
 
-        with (Path(settings.CHARTER_PATH) / (charter.canonical_name() + "-" + charter.rev + ".txt")).open(encoding='utf-8') as f:
-            self.assertEqual(f.read(), "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode('utf-8'))
+        charter_path = Path(settings.CHARTER_PATH) / (charter.name + "-" + charter.rev + ".txt")
+        file_contents = (charter_path).read_text("utf-8")
+        self.assertEqual(
+            file_contents,
+            "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode("utf-8"),
+        )
+        ftp_charter_path = Path(settings.FTP_DIR) / "charter" / charter_path.name
+        self.assertTrue(ftp_charter_path.exists())
+        self.assertTrue(charter_path.samefile(ftp_charter_path))
+        blobstore_contents = retrieve_str("charter", charter.get_base_name())
+        self.assertEqual(
+            blobstore_contents,
+            "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode("utf-8"),
+        )        
+
 
     def test_submit_initial_charter(self):
         group = GroupFactory(type_id='wg',acronym='mars',list_email='mars-wg@ietf.org')
@@ -536,6 +553,24 @@ def test_submit_initial_charter(self):
         group = Group.objects.get(pk=group.pk)
         self.assertEqual(group.charter, charter)
 
+    def test_submit_charter_with_invalid_name(self):
+        self.client.login(username="secretary", password="secretary+password")
+        ietf_group = GroupFactory(type_id="wg")
+        for bad_name in ("charter-irtf-{}", "charter-randomjunk-{}", "charter-ietf-thisisnotagroup"):
+            url = urlreverse("ietf.doc.views_charter.submit", kwargs={"name": bad_name.format(ietf_group.acronym)})
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 404, f"GET of charter named {bad_name} should 404")
+            r = self.client.post(url, {})
+            self.assertEqual(r.status_code, 404, f"POST of charter named {bad_name} should 404")
+
+        irtf_group = GroupFactory(type_id="rg")
+        for bad_name in ("charter-ietf-{}", "charter-whatisthis-{}", "charter-irtf-thisisnotagroup"):
+            url = urlreverse("ietf.doc.views_charter.submit", kwargs={"name": bad_name.format(irtf_group.acronym)})
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 404, f"GET of charter named {bad_name} should 404")
+            r = self.client.post(url, {})
+            self.assertEqual(r.status_code, 404, f"POST of charter named {bad_name} should 404")
+
     def test_edit_review_announcement_text(self):
         area = GroupFactory(type_id='area')
         RoleFactory(name_id='ad',group=area,person=Person.objects.get(user__username='ad'))
@@ -746,7 +781,7 @@ def test_approve(self):
 
         charter.set_state(State.objects.get(used=True, type="charter", slug="iesgrev"))
 
-        due_date = datetime.date.today() + datetime.timedelta(days=180)
+        due_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=180)
         m1 = GroupMilestone.objects.create(group=group,
                                            state_id="active",
                                            desc="Has been copied",
@@ -786,9 +821,11 @@ def test_approve(self):
         self.assertTrue(not charter.ballot_open("approve"))
 
         self.assertEqual(charter.rev, "01")
-        self.assertTrue(
-            (Path(settings.CHARTER_PATH) / ("charter-ietf-%s-%s.txt" % (group.acronym, charter.rev))).exists()
-        )
+        charter_path = Path(settings.CHARTER_PATH) / ("charter-ietf-%s-%s.txt" % (group.acronym, charter.rev))
+        charter_ftp_path = Path(settings.FTP_DIR) / "charter" / charter_path.name
+        self.assertTrue(charter_path.exists())
+        self.assertTrue(charter_ftp_path.exists())
+        self.assertTrue(charter_path.samefile(charter_ftp_path))
 
         self.assertEqual(len(outbox), 2)
         #
@@ -815,6 +852,19 @@ def test_approve(self):
         self.assertEqual(group.groupmilestone_set.filter(state="active", desc=m1.desc).count(), 1)
         self.assertEqual(group.groupmilestone_set.filter(state="active", desc=m4.desc).count(), 1)
 
+    def test_approve_irtf(self):
+        charter = CharterFactory(group__type_id='rg')
+        url = urlreverse('ietf.doc.views_charter.approve', kwargs=dict(name=charter.name))
+        login_testing_unauthorized(self, "secretary", url)
+        empty_outbox()
+        r = self.client.post(url, dict())
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(len(outbox), 2)
+        self.assertTrue("IRTF" in outbox[1]['From'])
+        self.assertTrue("irtf-announce" in outbox[1]['To'])
+        self.assertTrue(charter.group.acronym in outbox[1]['Cc'])
+        self.assertTrue("RG Action" in outbox[1]['Subject'])
+
     def test_charter_with_milestones(self):
         charter = CharterFactory()
 
@@ -826,7 +876,7 @@ def test_charter_with_milestones(self):
         m = GroupMilestone.objects.create(group=charter.group,
                                           state_id="active",
                                           desc="Test milestone",
-                                          due=datetime.date.today(),
+                                          due=date_today(DEADLINE_TZINFO),
                                           resolved="")
 
         url = urlreverse('ietf.doc.views_charter.charter_with_milestones_txt', kwargs=dict(name=charter.name, rev=charter.rev))
@@ -838,4 +888,4 @@ def test_chartering_from_bof(self):
         ad_role = RoleFactory(group__type_id='area',name_id='ad')
         charter = CharterFactory(group__type_id='wg',group__state_id='bof',group__parent=ad_role.group)
         e1,_ = default_review_text(charter.group, charter, Person.objects.get(name="(System)"))
-        self.assertTrue('A new IETF WG has been proposed' in e1.text)
\ No newline at end of file
+        self.assertTrue('A new IETF WG has been proposed' in e1.text)
diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py
index 4cc501ec0c..791db17f5a 100644
--- a/ietf/doc/tests_conflict_review.py
+++ b/ietf/doc/tests_conflict_review.py
@@ -1,9 +1,10 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import io
 import os
+from pathlib import Path
 
 from pyquery import PyQuery
 from textwrap import wrap
@@ -13,8 +14,9 @@
 
 import debug    # pyflakes:ignore
 
-from ietf.doc.factories import IndividualDraftFactory, ConflictReviewFactory
-from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, BallotPositionDocEvent, TelechatDocEvent, State
+from ietf.doc.factories import IndividualDraftFactory, ConflictReviewFactory, RgDraftFactory
+from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, BallotPositionDocEvent, TelechatDocEvent, State, DocTagName
+from ietf.doc.storage_utils import retrieve_str
 from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_conflict_review import default_approval_text
 from ietf.group.models import Person
@@ -70,12 +72,12 @@ def test_start_review_as_secretary(self):
         self.assertEqual(review_doc.ad.name,'Areað Irector')
         self.assertEqual(review_doc.notify,'ipu@ietf.org')
         doc = Document.objects.get(name='draft-imaginary-independent-submission')
-        self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')])
+        self.assertTrue(doc in [x.target for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')])
 
         self.assertTrue(review_doc.latest_event(DocEvent,type="added_comment").desc.startswith("IETF conflict review requested"))
         self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith("IETF conflict review initiated"))
         self.assertTrue('Conflict Review requested' in outbox[-1]['Subject'])
-        
+
         # verify you can't start a review when a review is already in progress
         r = self.client.post(url,dict(ad="Areað Irector",create_in_state="Needs Shepherd",notify='ipu@ietf.org'))
         self.assertEqual(r.status_code, 404)
@@ -105,7 +107,7 @@ def test_start_review_as_stream_owner(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form input[name=notify]')),1)
+        self.assertEqual(len(q('form textarea[name=notify]')), 1)
         self.assertEqual(len(q('form select[name=ad]')),0)
 
         # successfully starts a review, and notifies the secretariat
@@ -119,7 +121,7 @@ def test_start_review_as_stream_owner(self):
         self.assertEqual(review_doc.ad.name,'Ietf Chair')
         self.assertEqual(review_doc.notify,'ipu@ietf.org')
         doc = Document.objects.get(name='draft-imaginary-independent-submission')
-        self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')])
+        self.assertTrue(doc in [x.target for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')])
 
         self.assertEqual(len(outbox), messages_before + 2)
 
@@ -168,6 +170,21 @@ def test_change_state(self):
         self.assertTrue(review_doc.active_ballot())
         self.assertEqual(review_doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes')
 
+        # try to change to an AD-forbidden state
+        appr_noprob_sent_pk = str(State.objects.get(used=True, slug='appr-noprob-sent',type__slug='conflrev').pk)
+        r = self.client.post(url,dict(review_state=appr_noprob_sent_pk,comment='xyzzy'))
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(q('form .invalid-feedback'))
+
+        # try again as secretariat
+        self.client.logout()
+        login_testing_unauthorized(self, 'secretary', url)
+        r = self.client.post(url,dict(review_state=appr_noprob_sent_pk,comment='xyzzy'))
+        self.assertEqual(r.status_code, 302)
+        review_doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
+        self.assertEqual(review_doc.get_state('conflrev').slug, 'appr-noprob-sent')
+
 
     def test_edit_notices(self):
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
@@ -179,8 +196,8 @@ def test_edit_notices(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form input[name=notify]')),1)
-        self.assertEqual(doc.notify,q('form input[name=notify]')[0].value)
+        self.assertEqual(len(q('form textarea[name=notify]')), 1)
+        self.assertEqual(doc.notify, q('form textarea[name=notify]')[0].value.strip())
 
         # change notice list
         newlist = '"Foo Bar" <foo@bar.baz.com>'
@@ -197,7 +214,7 @@ def test_edit_notices(self):
         # Regenerate does not save!
         self.assertEqual(doc.notify,newlist)
         q = PyQuery(r.content)
-        self.assertEqual(None,q('form input[name=notify]')[0].value)
+        self.assertEqual("", q('form textarea[name=notify]')[0].value.strip())
 
     def test_edit_ad(self):
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
@@ -372,7 +389,7 @@ def setUp(self):
 
 
 class ConflictReviewSubmitTests(TestCase):
-    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['CONFLICT_REVIEW_PATH']
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['CONFLICT_REVIEW_PATH','FTP_PATH']
     def test_initial_submission(self):
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         url = urlreverse('ietf.doc.views_conflict_review.submit',kwargs=dict(name=doc.name))
@@ -388,9 +405,15 @@ def test_initial_submission(self):
         # Right now, nothing to test - we let people put whatever the web browser will let them put into that textbox
 
         # sane post using textbox
-        path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
+        basename = f"{doc.name}-{doc.rev}.txt"
+        path = Path(settings.CONFLICT_REVIEW_PATH) / basename
+        ftp_dir = Path(settings.FTP_DIR) / "conflict-reviews"
+        if not ftp_dir.exists():
+            ftp_dir.mkdir()
+        ftp_path = ftp_dir / basename
         self.assertEqual(doc.rev,'00')
-        self.assertFalse(os.path.exists(path))
+        self.assertFalse(path.exists())
+        self.assertFalse(ftp_path.exists())
         r = self.client.post(url,dict(content="Some initial review text\n",submit_response="1"))
         self.assertEqual(r.status_code,302)
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
@@ -398,7 +421,9 @@ def test_initial_submission(self):
         with io.open(path) as f:
             self.assertEqual(f.read(),"Some initial review text\n")
             f.close()
+        self.assertTrue(ftp_path.exists())
         self.assertTrue( "submission-00" in doc.latest_event(NewRevisionDocEvent).desc)
+        self.assertEqual(retrieve_str("conflrev",basename), "Some initial review text\n")
 
     def test_subsequent_submission(self):
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
@@ -408,7 +433,7 @@ def test_subsequent_submission(self):
         # A little additional setup 
         # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp
         self.assertEqual(doc.rev,'00')
-        path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
+        path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.name, doc.rev))
         with io.open(path,'w') as f:
             f.write('This is the old proposal.')
             f.close()
@@ -435,7 +460,7 @@ def test_subsequent_submission(self):
         self.assertEqual(r.status_code, 302)
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertEqual(doc.rev,'01')
-        path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
+        path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.name, doc.rev))
         with io.open(path) as f:
             self.assertEqual(f.read(),"This is a new proposal.")
             f.close()
@@ -450,3 +475,89 @@ def test_subsequent_submission(self):
     def setUp(self):
         super().setUp()
         ConflictReviewFactory(name='conflict-review-imaginary-irtf-submission',review_of=IndividualDraftFactory(name='draft-imaginary-irtf-submission',stream_id='irtf'),notify='notifyme@example.net')
+
+class ConflictReviewStreamStateTests(TestCase):
+
+    def start_review(self, stream, role, kwargs=None):
+        doc = RgDraftFactory() if stream=='irtf' else IndividualDraftFactory(stream=StreamName.objects.get(slug='ise'))
+        url = urlreverse('ietf.doc.views_conflict_review.start_review', kwargs=dict(name=doc.name))
+        login_testing_unauthorized(self, role, url)
+        r = self.client.post(url, kwargs)
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(doc.get_state('draft-stream-'+stream).slug, 'iesg-rev')
+
+    def test_start_irtf_review_as_secretary(self):
+        ad_strpk = str(Person.objects.get(name='Areað Irector').pk)
+        state_strpk = str(State.objects.get(used=True, slug='needshep', type__slug='conflrev').pk)
+        self.start_review('irtf', 'secretary', kwargs=dict(ad=ad_strpk, create_in_state=state_strpk))
+
+    def test_start_ise_review_as_secretary(self):
+        ad_strpk = str(Person.objects.get(name='Areað Irector').pk)
+        state_strpk = str(State.objects.get(used=True, slug='needshep', type__slug='conflrev').pk)
+        self.start_review('ise', 'secretary', kwargs=dict(ad=ad_strpk, create_in_state=state_strpk))
+
+    def test_start_irtf_review_as_stream_owner(self):
+        self.start_review('irtf', 'irtf-chair')
+
+    def test_start_ise_review_as_stream_owner(self):
+        self.start_review('ise', 'ise-chair')
+
+    def close_review(self, close_type, stream, role):
+        doc = RgDraftFactory() if stream=='irtf' else IndividualDraftFactory(stream=StreamName.objects.get(slug='ise'))
+        review = ConflictReviewFactory(review_of=doc)
+        url = urlreverse('ietf.doc.views_conflict_review.change_state', kwargs=dict(name=review.name))
+        login_testing_unauthorized(self, role, url)
+        strpk = str(State.objects.get(used=True, slug=close_type, type__slug='conflrev').pk)
+        r = self.client.post(url, dict(review_state=strpk))
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(doc.get_state('draft-stream-'+stream).slug, 'chair-w' if stream=='irtf' else 'ise-rev')
+        self.assertIn(DocTagName.objects.get(pk='iesg-com'), doc.tags.all())
+
+    def test_close_irtf_review_reqnopub_as_secretary(self):
+        self.close_review('appr-reqnopub-sent', 'irtf', 'secretary')
+
+    def test_close_ise_review_reqnopub_as_secretary(self):
+        self.close_review('appr-reqnopub-sent', 'ise', 'secretary')
+
+    def test_close_irtf_review_noprob_as_secretary(self):
+        self.close_review('appr-noprob-sent', 'irtf', 'secretary')
+
+    def test_close_ise_review_noprob_as_secretary(self):
+        self.close_review('appr-noprob-sent', 'ise', 'secretary')
+
+    def test_close_irtf_review_withdraw_as_secretary(self):
+        self.close_review('withdraw', 'irtf', 'secretary')
+
+    def test_close_ise_review_withdraw_as_secretary(self):
+        self.close_review('withdraw', 'ise', 'secretary')
+
+    def test_close_irtf_review_dead_as_secretary(self):
+        self.close_review('dead', 'irtf', 'secretary')
+
+    def test_close_ise_review_dead_as_secretary(self):
+        self.close_review('dead', 'ise', 'secretary')
+
+    def test_close_irtf_review_withdraw_as_ad(self):
+        self.close_review('withdraw', 'irtf', 'ad')
+
+    def test_close_ise_review_withdraw_as_ad(self):
+        self.close_review('withdraw', 'ise', 'ad')
+
+    def test_close_irtf_review_dead_as_ad(self):
+        self.close_review('dead', 'irtf', 'ad')
+
+    def test_close_ise_review_dead_as_ad(self):
+        self.close_review('dead', 'ise', 'ad')
+
+    def test_approve_review(self):
+        doc = RgDraftFactory()
+        review = ConflictReviewFactory(review_of=doc)
+        review.set_state(State.objects.get(used=True, slug='appr-noprob-pend', type='conflrev'))
+
+        url = urlreverse('ietf.doc.views_conflict_review.approve_conflict_review', kwargs=dict(name=review.name))
+        login_testing_unauthorized(self, 'secretary', url)
+
+        r = self.client.post(url, dict(announcement_text=default_approval_text(review)))
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(doc.get_state('draft-stream-irtf').slug, 'chair-w')
+        self.assertIn(DocTagName.objects.get(pk='iesg-com'), doc.tags.all())
diff --git a/ietf/doc/tests_downref.py b/ietf/doc/tests_downref.py
index dae65cb07d..0222ad7942 100644
--- a/ietf/doc/tests_downref.py
+++ b/ietf/doc/tests_downref.py
@@ -19,12 +19,9 @@ def setUp(self):
         super().setUp()
         PersonFactory(name='Plain Man',user__username='plain')
         self.draft = WgDraftFactory(name='draft-ietf-mars-test')
-        self.draftalias = self.draft.docalias.get(name='draft-ietf-mars-test')
         self.doc = WgDraftFactory(name='draft-ietf-mars-approved-document',states=[('draft-iesg','rfcqueue')])
-        self.docalias = self.doc.docalias.get(name='draft-ietf-mars-approved-document')
-        self.rfc = WgRfcFactory(alias2__name='rfc9998')
-        self.rfcalias = self.rfc.docalias.get(name='rfc9998')
-        RelatedDocument.objects.create(source=self.doc, target=self.rfcalias, relationship_id='downref-approval')
+        self.rfc = WgRfcFactory(rfc_number=9998)
+        RelatedDocument.objects.create(source=self.doc, target=self.rfc, relationship_id='downref-approval')
 
     def test_downref_registry(self):
         url = urlreverse('ietf.doc.views_downref.downref_registry')
@@ -64,44 +61,44 @@ def test_downref_registry_add(self):
         self.assertContains(r, 'Save downref')
 
         # error - already in the downref registry
-        r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.doc.pk, )))
+        r = self.client.post(url, dict(rfc=self.rfc.pk, drafts=(self.doc.pk, )))
         self.assertContains(r, 'Downref is already in the registry')
 
         # error - source is not in an approved state
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
+        r = self.client.post(url, dict(rfc=self.rfc.pk, drafts=(self.draft.pk, )))
         self.assertContains(r, 'Draft is not yet approved')
 
         # error - the target is not a normative reference of the source
         self.draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
+        r = self.client.post(url, dict(rfc=self.rfc.pk, drafts=(self.draft.pk, )))
         self.assertContains(r, 'There does not seem to be a normative reference to RFC')
         self.assertContains(r, 'Save downref anyway')
 
         # normal - approve the document so the downref is now okay
-        RelatedDocument.objects.create(source=self.draft, target=self.rfcalias, relationship_id='refnorm')
+        RelatedDocument.objects.create(source=self.draft, target=self.rfc, relationship_id='refnorm')
         draft_de_count_before = self.draft.docevent_set.count()
         rfc_de_count_before = self.rfc.docevent_set.count()
 
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
+        r = self.client.post(url, dict(rfc=self.rfc.pk, drafts=(self.draft.pk, )))
         self.assertEqual(r.status_code, 302)
         newurl = urlreverse('ietf.doc.views_downref.downref_registry')
         r = self.client.get(newurl)
         self.assertContains(r, '<a href="/doc/draft-ietf-mars-test')
-        self.assertTrue(RelatedDocument.objects.filter(source=self.draft, target=self.rfcalias, relationship_id='downref-approval'))
+        self.assertTrue(RelatedDocument.objects.filter(source=self.draft, target=self.rfc, relationship_id='downref-approval'))
         self.assertEqual(self.draft.docevent_set.count(), draft_de_count_before + 1)
         self.assertEqual(self.rfc.docevent_set.count(), rfc_de_count_before + 1)
 
     def test_downref_last_call(self):
         draft = WgDraftFactory(name='draft-ietf-mars-ready-for-lc-document',intended_std_level_id='ps',states=[('draft-iesg','iesg-eva')])
         WgDraftFactory(name='draft-ietf-mars-another-approved-document',states=[('draft-iesg','rfcqueue')])
-        rfc9999 = WgRfcFactory(alias2__name='rfc9999', std_level_id=None)
-        RelatedDocument.objects.create(source=draft, target=rfc9999.docalias.get(name='rfc9999'), relationship_id='refnorm')
+        rfc9999 = WgRfcFactory(rfc_number=9999, std_level_id=None)
+        RelatedDocument.objects.create(source=draft, target=rfc9999, relationship_id='refnorm')
         url = urlreverse('ietf.doc.views_ballot.lastcalltext', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
@@ -113,9 +110,9 @@ def test_downref_last_call(self):
         self.assertIn('The document contains these normative downward references', text)
 
         # now, the announcement text about the downref to RFC 9999 should be gone
-        RelatedDocument.objects.create(source=draft, target=rfc9999.docalias.get(name='rfc9999'),relationship_id='downref-approval')
+        RelatedDocument.objects.create(source=draft, target=rfc9999, relationship_id='downref-approval')
         r = self.client.post(url, dict(regenerate_last_call_text="1"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         text = q("[name=last_call_text]").text()
-        self.assertNotIn('The document contains these normative downward references', text)
\ No newline at end of file
+        self.assertNotIn('The document contains these normative downward references', text)
diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index 3a0f0315cc..21a873c5c0 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -1,29 +1,35 @@
-# Copyright The IETF Trust 2011-2020, All Rights Reserved
+# Copyright The IETF Trust 2011-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
+import json
 import os
 import datetime
 import io
-import mock
+from unittest import mock
 
 from collections import Counter
 from pathlib import Path
 from pyquery import PyQuery
 
+from django.db.models import Max, Q
 from django.urls import reverse as urlreverse
 from django.conf import settings
+from django.utils import timezone
 from django.utils.html import escape
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.expire import get_expired_drafts, send_expire_notice_for_draft, expire_draft
-from ietf.doc.factories import IndividualDraftFactory, WgDraftFactory, RgDraftFactory, DocEventFactory
+from ietf.doc.expire import expirable_drafts, get_expired_drafts, send_expire_notice_for_draft, expire_draft
+from ietf.doc.factories import EditorialDraftFactory, IndividualDraftFactory, StateDocEventFactory, WgDraftFactory, RgDraftFactory, DocEventFactory, WgRfcFactory
 from ietf.doc.models import ( Document, DocReminder, DocEvent,
     ConsensusDocEvent, LastCallDocEvent, RelatedDocument, State, TelechatDocEvent, 
     WriteupDocEvent, DocRelationshipName, IanaExpertDocEvent )
+from ietf.doc.storage_utils import exists_in_storage, store_str
 from ietf.doc.utils import get_tags_for_stream_id, create_ballot_if_not_open
-from ietf.name.models import StreamName, DocTagName
+from ietf.doc.views_draft import AdoptDraftForm, IssueCallForAdoptionForm, IssueWorkingGroupLastCallForm
+from ietf.ietfauth.utils import has_role
+from ietf.name.models import DocTagName, RoleName
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.group.models import Group, Role
 from ietf.person.factories import PersonFactory, EmailFactory
@@ -33,6 +39,7 @@
 from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
 from ietf.utils.test_utils import TestCase
+from ietf.utils.timezone import date_today, datetime_from_date, DEADLINE_TZINFO
 
 
 class ChangeStateTests(TestCase):
@@ -80,7 +87,7 @@ def test_ad_approved(self):
         self.assertTrue("Approved: " in outbox[-1]['Subject'])
         self.assertTrue(draft.name in outbox[-1]['Subject'])
         self.assertTrue('iesg@' in outbox[-1]['To'])
-        
+
     def test_change_state(self):
         ad = Person.objects.get(user__username="ad")
         draft = WgDraftFactory(
@@ -94,7 +101,7 @@ def test_change_state(self):
         draft.action_holders.add(ad)
 
         url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name))
-        login_testing_unauthorized(self, "secretary", url)
+        login_testing_unauthorized(self, "ad", url)
 
         first_state = draft.get_state("draft-iesg")
         next_states = first_state.next_states.all()
@@ -133,7 +140,7 @@ def test_change_state(self):
         self.assertEqual(draft.get_state_slug("draft-iesg"), "review-e")
         self.assertTrue(not draft.tags.filter(slug="ad-f-up"))
         self.assertTrue(draft.tags.filter(slug="need-rev"))
-        self.assertCountEqual(draft.action_holders.all(), [ad] + draft.authors())
+        self.assertCountEqual(draft.action_holders.all(), [ad] + draft.author_persons())
         self.assertEqual(draft.docevent_set.count(), events_before + 3)
         self.assertTrue("Test comment" in draft.docevent_set.all()[0].desc)
         self.assertTrue("Changed action holders" in draft.docevent_set.all()[1].desc)
@@ -150,6 +157,20 @@ def test_change_state(self):
         q = PyQuery(r.content)
         self.assertEqual(len(q('form [type=submit]:contains("%s")' % first_state.name)), 1)
 
+        # try to change to an AD-forbidden state
+        r = self.client.post(url, dict(state=State.objects.get(used=True, type='draft-iesg', slug='ann').pk, comment='Test comment'))
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(q('form .invalid-feedback'))
+
+        # try again as secretariat
+        self.client.logout()
+        login_testing_unauthorized(self, 'secretary', url)
+        r = self.client.post(url, dict(state=State.objects.get(used=True, type='draft-iesg', slug='ann').pk, comment='Test comment'))
+        self.assertEqual(r.status_code, 302)
+        draft = Document.objects.get(name=draft.name)
+        self.assertEqual(draft.get_state_slug('draft-iesg'), 'ann')
+
     def test_pull_from_rfc_queue(self):
         ad = Person.objects.get(user__username="ad")
         draft = WgDraftFactory(
@@ -158,7 +179,7 @@ def test_pull_from_rfc_queue(self):
             states=[('draft-iesg','rfcqueue')],
         )
         DocEventFactory(type='started_iesg_process',by=ad,doc=draft,rev=draft.rev,desc="Started IESG Process")
-        draft.action_holders.add(*(draft.authors()))
+        draft.action_holders.add(*(draft.author_persons()))
 
         url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
@@ -258,7 +279,7 @@ def test_request_last_call(self):
             states=[('draft-iesg','ad-eval')],
         )
         DocEventFactory(type='started_iesg_process',by=ad,doc=draft,rev=draft.rev,desc="Started IESG Process")
-        draft.action_holders.add(*(draft.authors()))
+        draft.action_holders.add(*(draft.author_persons()))
 
         self.client.login(username="secretary", password="secretary+password")
         url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name))
@@ -307,6 +328,24 @@ def test_request_last_call(self):
         # action holders
         self.assertCountEqual(draft.action_holders.all(), [ad])
         
+    def test_iesg_state_edit_button(self):
+        ad = Person.objects.get(user__username="ad")
+        draft = WgDraftFactory(ad=ad,states=[('draft','active'),('draft-iesg','ad-eval')])
+
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))
+        self.client.login(username="ad", password="ad+password")
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertIn("Edit", q('tr:contains("IESG state")').text())
+
+        draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="dead"))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertNotIn("Edit", q('tr:contains("IESG state")').text())
+
 
 class EditInfoTests(TestCase):
     def test_edit_info(self):
@@ -340,16 +379,14 @@ def test_edit_info(self):
                                   stream=draft.stream_id,
                                   ad=str(new_ad.pk),
                                   notify="test@example.com",
-                                  note="New note",
                                   telechat_date="",
                                   ))
         self.assertEqual(r.status_code, 302)
 
         draft = Document.objects.get(name=draft.name)
         self.assertEqual(draft.ad, new_ad)
-        self.assertEqual(draft.note, "New note")
         self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat"))
-        self.assertEqual(draft.docevent_set.count(), events_before + 3)
+        self.assertEqual(draft.docevent_set.count(), events_before + 2)
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue(draft.name in outbox[-1]['Subject'])
 
@@ -364,7 +401,6 @@ def test_edit_telechat_date(self):
                     stream=draft.stream_id,
                     ad=str(draft.ad_id),
                     notify=draft.notify,
-                    note="",
                     )
 
         # get
@@ -401,11 +437,11 @@ def test_edit_telechat_date(self):
 
         # change to a telechat that should cause returning item to be auto-detected
         # First, make it appear that the previous telechat has already passed
-        telechat_event.telechat_date = datetime.date.today()-datetime.timedelta(days=7)
+        telechat_event.telechat_date = date_today() - datetime.timedelta(days=7)
         telechat_event.save()
         ad = Person.objects.get(user__username="ad")
         ballot = create_ballot_if_not_open(None, draft, ad, 'approve')
-        ballot.time = telechat_event.telechat_date
+        ballot.time = datetime_from_date(telechat_event.telechat_date)
         ballot.save()
 
         r = self.client.post(url, data)
@@ -428,7 +464,7 @@ def test_edit_telechat_date(self):
         self.assertTrue("Telechat update" in outbox[-1]['Subject'])
 
         # Put it on an agenda that's very soon from now
-        next_week = datetime.date.today()+datetime.timedelta(days=7)
+        next_week = date_today() + datetime.timedelta(days=7)
         td =  TelechatDate.objects.active()[0]
         td.date = next_week
         td.save()
@@ -438,72 +474,61 @@ def test_edit_telechat_date(self):
         self.assertIn("may not leave enough time", get_payload_text(outbox[-1]))
 
     def test_start_iesg_process_on_draft(self):
-
         draft = WgDraftFactory(
             name="draft-ietf-mars-test2",
-            group__acronym='mars',
+            group__acronym="mars",
             intended_std_level_id="ps",
-            authors=[Person.objects.get(user__username='ad')],
-            )
-        
-        url = urlreverse('ietf.doc.views_draft.edit_info', kwargs=dict(name=draft.name))
+            authors=[Person.objects.get(user__username="ad")],
+        )
+
+        url = urlreverse("ietf.doc.views_draft.edit_info", kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
         # normal get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form select[name=intended_std_level]')), 1)
-        self.assertEqual(None,q('form input[name=notify]')[0].value)
+        self.assertEqual(len(q("form select[name=intended_std_level]")), 1)
+        self.assertEqual("", q("form textarea[name=notify]")[0].value.strip())
 
-        # add
-        events_before = draft.docevent_set.count()
+        events_before = list(draft.docevent_set.values_list("id", flat=True))
         mailbox_before = len(outbox)
 
         ad = Person.objects.get(name="Areað Irector")
 
-        r = self.client.post(url,
-                             dict(intended_std_level=str(draft.intended_std_level_id),
-                                  ad=ad.pk,
-                                  create_in_state=State.objects.get(used=True, type="draft-iesg", slug="watching").pk,
-                                  notify="test@example.com",
-                                  note="This is a note",
-                                  telechat_date="",
-                                  ))
+        r = self.client.post(
+            url,
+            dict(
+                intended_std_level=str(draft.intended_std_level_id),
+                ad=ad.pk,
+                notify="test@example.com",
+                telechat_date="",
+            ),
+        )
         self.assertEqual(r.status_code, 302)
 
         draft = Document.objects.get(name=draft.name)
-        self.assertEqual(draft.get_state_slug("draft-iesg"), "watching")
+        self.assertEqual(draft.get_state_slug("draft-iesg"), "pub-req")
+        self.assertEqual(draft.get_state_slug("draft-stream-ietf"), "sub-pub")
         self.assertEqual(draft.ad, ad)
-        self.assertEqual(draft.note, "This is a note")
-        self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat"))
-        self.assertEqual(draft.docevent_set.count(), events_before + 5)
-        self.assertCountEqual(draft.action_holders.all(), [draft.ad])
-        events = list(draft.docevent_set.order_by('time', 'id'))
-        self.assertEqual(events[-5].type, "started_iesg_process")
-        self.assertEqual(len(outbox), mailbox_before+1)
-        self.assertTrue('IESG processing' in outbox[-1]['Subject'])
-        self.assertTrue('draft-ietf-mars-test2@' in outbox[-1]['To']) 
-
-        # Redo, starting in publication requested to make sure WG state is also set
-        draft.set_state(State.objects.get(type_id='draft-iesg', slug='idexists'))
-        draft.set_state(State.objects.get(type='draft-stream-ietf',slug='writeupw'))
-        draft.stream = StreamName.objects.get(slug='ietf')
-        draft.action_holders.clear()
-        draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_stream", by=Person.objects.get(user__username="secretary"), desc="Test")])
-        r = self.client.post(url,
-                             dict(intended_std_level=str(draft.intended_std_level_id),
-                                  ad=ad.pk,
-                                  create_in_state=State.objects.get(used=True, type="draft-iesg", slug="pub-req").pk,
-                                  notify="test@example.com",
-                                  note="This is a note",
-                                  telechat_date="",
-                                  ))
-        self.assertEqual(r.status_code, 302)
-        draft = Document.objects.get(name=draft.name)
-        self.assertEqual(draft.get_state_slug('draft-iesg'),'pub-req')
-        self.assertEqual(draft.get_state_slug('draft-stream-ietf'),'sub-pub')
+        self.assertTrue(
+            not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
+        )
+        # check that the expected events were created (don't insist on ordering)
+        self.assertCountEqual(
+            draft.docevent_set.exclude(id__in=events_before).values_list("type", flat=True),
+            [
+                "changed_action_holders",  # action holders set to AD
+                "changed_document",  # WG state set to sub-pub
+                "changed_document",  # AD set
+                "changed_document",  # state change notice email set
+                "started_iesg_process",  # IESG state is now pub-req
+            ],
+        )
         self.assertCountEqual(draft.action_holders.all(), [draft.ad])
+        self.assertEqual(len(outbox), mailbox_before + 1)
+        self.assertTrue("IESG processing" in outbox[-1]["Subject"])
+        self.assertTrue("draft-ietf-mars-test2@" in outbox[-1]["To"])
 
     def test_edit_consensus(self):
         draft = WgDraftFactory()
@@ -555,6 +580,11 @@ def setUp(self):
     def write_draft_file(self, name, size):
         with (Path(settings.INTERNET_DRAFT_PATH) / name).open('w') as f:
             f.write("a" * size)
+        _, ext = os.path.splitext(name)
+        if ext:
+            ext=ext[1:]
+            store_str("active-draft", f"{ext}/{name}", "a"*size, allow_overwrite=True)
+            store_str("draft", f"{ext}/{name}", "a"*size, allow_overwrite=True)
 
 
 class ResurrectTests(DraftFileMixin, TestCase):
@@ -569,7 +599,7 @@ def test_request_resurrect(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form [type=submit]')), 1)
+        self.assertEqual(len(q('#content form [type=submit]')), 1)
 
 
         # request resurrect
@@ -605,7 +635,7 @@ def test_resurrect(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form [type=submit]')), 1)
+        self.assertEqual(len(q('#content form [type=submit]')), 1)
 
         # complete resurrect
         events_before = draft.docevent_set.count()
@@ -618,7 +648,7 @@ def test_resurrect(self):
         self.assertEqual(draft.docevent_set.count(), events_before + 1)
         self.assertEqual(draft.latest_event().type, "completed_resurrect")
         self.assertEqual(draft.get_state_slug(), "active")
-        self.assertTrue(draft.expires >= datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE - 1))
+        self.assertTrue(draft.expires >= timezone.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE - 1))
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue('Resurrection Completed' in outbox[-1]['Subject'])
         self.assertTrue('iesg-secretary' in outbox[-1]['To'])
@@ -627,26 +657,35 @@ def test_resurrect(self):
         # ensure file restored from archive directory
         self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, txt)))
         self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, txt)))
+        self.assertTrue(exists_in_storage("active-draft",f"txt/{txt}"))
 
 
 class ExpireIDsTests(DraftFileMixin, TestCase):
     def test_in_draft_expire_freeze(self):
         from ietf.doc.expire import in_draft_expire_freeze
 
-        # If there is no "next" meeting, we musn't be in a freeze
+        # If there is no "next" meeting, we mustn't be in a freeze
         self.assertTrue(not in_draft_expire_freeze())
 
         meeting = Meeting.objects.create(number="123",
                                type=MeetingTypeName.objects.get(slug="ietf"),
-                               date=datetime.date.today())
+                               date=date_today())
         second_cut_off = meeting.get_second_cut_off()
         ietf_monday = meeting.get_ietf_monday()
 
-        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(second_cut_off - datetime.timedelta(days=7), datetime.time(0, 0, 0))))
-        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(second_cut_off, datetime.time(0, 0, 0))))
-        self.assertTrue(in_draft_expire_freeze(datetime.datetime.combine(second_cut_off + datetime.timedelta(days=7), datetime.time(0, 0, 0))))
-        self.assertTrue(in_draft_expire_freeze(datetime.datetime.combine(ietf_monday - datetime.timedelta(days=1), datetime.time(0, 0, 0))))
-        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(ietf_monday, datetime.time(0, 0, 0))))
+        self.assertFalse(in_draft_expire_freeze((second_cut_off - datetime.timedelta(days=7)).replace(hour=0, minute=0, second=0)))
+        self.assertFalse(in_draft_expire_freeze(second_cut_off.replace(hour=0, minute=0, second=0)))
+        self.assertTrue(in_draft_expire_freeze((second_cut_off + datetime.timedelta(days=7)).replace(hour=0, minute=0, second=0)))
+        self.assertTrue(in_draft_expire_freeze(
+            datetime.datetime.combine(
+                ietf_monday - datetime.timedelta(days=1),
+                datetime.time(0, 0, 0),
+                tzinfo=datetime.UTC,
+            )
+        ))
+        self.assertFalse(in_draft_expire_freeze(
+            datetime.datetime.combine(ietf_monday, datetime.time(0, 0, 0), tzinfo=datetime.UTC)
+        ))
         
     def test_warn_expirable_drafts(self):
         from ietf.doc.expire import get_soon_to_expire_drafts, send_expire_warning_for_draft
@@ -657,9 +696,9 @@ def test_warn_expirable_drafts(self):
 
         self.assertEqual(len(list(get_soon_to_expire_drafts(14))), 0)
 
-        # hack into expirable state
+        # hack into expirable state to expire in 10 days
         draft.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
-        draft.expires = datetime.datetime.now() + datetime.timedelta(days=10)
+        draft.expires = timezone.now() + datetime.timedelta(days=10)
         draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
 
         self.assertEqual(len(list(get_soon_to_expire_drafts(14))), 1)
@@ -673,8 +712,17 @@ def test_warn_expirable_drafts(self):
         self.assertTrue('draft-ietf-mars-test@' in outbox[-1]['To']) # Gets the authors
         self.assertTrue('mars-chairs@ietf.org' in outbox[-1]['Cc'])
         self.assertTrue('aread@' in outbox[-1]['Cc'])
+        
+        # hack into expirable state to expire in 10 hours
+        draft.expires = timezone.now() + datetime.timedelta(hours=10)
+        draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
+        
+        # test send warning is not sent for a document so close to expiration
+        mailbox_before = len(outbox)
+        send_expire_warning_for_draft(draft)
+        self.assertEqual(len(outbox), mailbox_before)
 
-        #Check that we don't sent expiration warnings for dead or replaced drafts
+        # Check that we don't sent expiration warnings for dead or replaced drafts
         old_state = draft.get_state_slug("draft-iesg")
         mailbox_before = len(outbox)
         draft.set_state(State.objects.get(type_id="draft-iesg",slug="dead"))
@@ -698,15 +746,11 @@ def test_expire_drafts(self):
         
         # hack into expirable state
         draft.set_state(State.objects.get(type_id='draft-iesg',slug='idexists'))
-        draft.expires = datetime.datetime.now()
+        draft.expires = timezone.now()
         draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
 
         self.assertEqual(len(list(get_expired_drafts())), 1)
 
-        draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="watching"))
-
-        self.assertEqual(len(list(get_expired_drafts())), 1)
-
         draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva"))
 
         self.assertEqual(len(list(get_expired_drafts())), 0)
@@ -728,20 +772,24 @@ def test_expire_drafts(self):
         txt = "%s-%s.txt" % (draft.name, draft.rev)
         self.write_draft_file(txt, 5000)
 
+        self.assertFalse(expirable_drafts(Document.objects.filter(pk=draft.pk)).exists())
+        draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="idexists"))
+        self.assertTrue(expirable_drafts(Document.objects.filter(pk=draft.pk)).exists())
         expire_draft(draft)
 
         draft = Document.objects.get(name=draft.name)
         self.assertEqual(draft.get_state_slug(), "expired")
-        self.assertEqual(draft.get_state_slug("draft-iesg"), "dead")
+        self.assertEqual(draft.get_state_slug("draft-iesg"), "idexists")
         self.assertTrue(draft.latest_event(type="expired_document"))
-        self.assertCountEqual(draft.action_holders.all(), [])
+        self.assertEqual(draft.action_holders.count(), 0)
         self.assertIn('Removed all action holders', draft.latest_event(type='changed_action_holders').desc)
         self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, txt)))
+        self.assertFalse(exists_in_storage("active-draft", f"txt/{txt}"))
         self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, txt)))
 
         draft.delete()
 
-        rgdraft = RgDraftFactory(expires=datetime.datetime.now())
+        rgdraft = RgDraftFactory(expires=timezone.now())
         self.assertEqual(len(list(get_expired_drafts())), 1)
         for slug in ('iesg-rev','irsgpoll'):
             rgdraft.set_state(State.objects.get(type_id='draft-stream-irtf',slug=slug))
@@ -760,6 +808,7 @@ def test_clean_up_draft_files(self):
         clean_up_draft_files()
         
         self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, unknown)))
+        self.assertFalse(exists_in_storage("active-draft", f"txt/{unknown}"))
         self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, "unknown_ids", unknown)))
 
         
@@ -770,6 +819,7 @@ def test_clean_up_draft_files(self):
         clean_up_draft_files()
         
         self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, malformed)))
+        self.assertFalse(exists_in_storage("active-draft", f"txt/{malformed}"))
         self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, "unknown_ids", malformed)))
 
         
@@ -784,14 +834,16 @@ def test_clean_up_draft_files(self):
         clean_up_draft_files()
         
         self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, txt)))
+        self.assertFalse(exists_in_storage("active-draft", f"txt/{txt}"))
         self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, txt)))
 
         self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, pdf)))
+        self.assertFalse(exists_in_storage("active-draft", f"pdf/{pdf}"))
         self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, pdf)))
 
         # expire draft
         draft.set_state(State.objects.get(used=True, type="draft", slug="expired"))
-        draft.expires = datetime.datetime.now() - datetime.timedelta(days=1)
+        draft.expires = timezone.now() - datetime.timedelta(days=1)
         draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
 
         e = DocEvent(doc=draft, rev=draft.rev, type= "expired_document", time=draft.expires,
@@ -805,6 +857,7 @@ def test_clean_up_draft_files(self):
         clean_up_draft_files()
         
         self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, txt)))
+        self.assertFalse(exists_in_storage("active-draft", f"txt/{txt}"))
         self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, txt)))
 
 
@@ -824,7 +877,7 @@ def test_expire_last_call(self):
 
         e = LastCallDocEvent(doc=draft, rev=draft.rev, type="sent_last_call", by=secretary)
         e.text = "Last call sent"
-        e.expires = datetime.datetime.now() + datetime.timedelta(days=14)
+        e.expires = timezone.now() + datetime.timedelta(days=14)
         e.save()
         
         self.assertEqual(len(list(get_expired_last_calls())), 0)
@@ -832,7 +885,7 @@ def test_expire_last_call(self):
         # test expired
         e = LastCallDocEvent(doc=draft, rev=draft.rev, type="sent_last_call", by=secretary)
         e.text = "Last call sent"
-        e.expires = datetime.datetime.now()
+        e.expires = timezone.now()
         e.save()
         
         drafts = list(get_expired_last_calls())
@@ -866,7 +919,7 @@ def test_expire_last_call_with_downref(self):
         e = LastCallDocEvent(doc=draft, rev=draft.rev, type="sent_last_call", by=secretary)
         e.text = "Last call sent"
         e.desc = "Blah, blah, blah.\n\nThis document makes the following downward references (downrefs):\n  ** Downref: Normative reference to an Experimental RFC: RFC 4764"
-        e.expires = datetime.datetime.now()
+        e.expires = timezone.now()
         e.save()
         
         drafts = list(get_expired_last_calls())
@@ -888,6 +941,7 @@ def setUp(self):
         super().setUp()
         doc = WgDraftFactory(group__acronym='mars',shepherd=PersonFactory(user__username='plain',name='Plain Man').email_set.first())
         self.docname = doc.name
+        self.doc_group = doc.group
 
     def test_doc_change_stream(self):
         url = urlreverse('ietf.doc.views_draft.change_stream', kwargs=dict(name=self.docname))
@@ -928,7 +982,7 @@ def test_doc_change_notify(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form input[name=notify]')),1)
+        self.assertEqual(len(q('form textarea[name=notify]')), 1)
 
         # Provide a list
         r = self.client.post(url,dict(notify="TJ2APh2P@ietf.org",save_addresses="1"))
@@ -943,7 +997,7 @@ def test_doc_change_notify(self):
         # Regenerate does not save!
         self.assertEqual(doc.notify,'TJ2APh2P@ietf.org')
         q = PyQuery(r.content)
-        self.assertEqual(None,q('form input[name=notify]')[0].value)
+        self.assertEqual("", q('form textarea[name=notify]')[0].value.strip())
 
     def test_doc_change_intended_status(self):
         url = urlreverse('ietf.doc.views_draft.change_intention', kwargs=dict(name=self.docname))
@@ -1004,23 +1058,6 @@ def test_doc_change_telechat_date(self):
         doc = Document.objects.get(name=self.docname)
         self.assertEqual(doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None)
         
-    def test_doc_change_iesg_note(self):
-        url = urlreverse('ietf.doc.views_draft.edit_iesg_note', kwargs=dict(name=self.docname))
-        login_testing_unauthorized(self, "secretary", url)
-
-        # get
-        r = self.client.get(url)
-        self.assertEqual(r.status_code,200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('[type=submit]:contains("Save")')),1)
-
-        # post
-        r = self.client.post(url,dict(note='ZpyQFGmA\r\nZpyQFGmA'))
-        self.assertEqual(r.status_code,302)
-        doc = Document.objects.get(name=self.docname)
-        self.assertEqual(doc.note,'ZpyQFGmA\nZpyQFGmA')
-        self.assertTrue('ZpyQFGmA' in doc.latest_event(DocEvent,type='added_comment').desc)
-
     def test_doc_change_ad(self):
         url = urlreverse('ietf.doc.views_draft.edit_ad', kwargs=dict(name=self.docname))
         login_testing_unauthorized(self, "secretary", url)
@@ -1289,8 +1326,10 @@ def do_doc_change_action_holders_test(self, username):
         RoleFactory(name_id='techadv', person=PersonFactory(), group=doc.group)
         RoleFactory(name_id='editor', person=PersonFactory(), group=doc.group)
         RoleFactory(name_id='secr', person=PersonFactory(), group=doc.group)
-        
+        some_other_chair = RoleFactory(name_id="chair").person
+
         url = urlreverse('ietf.doc.views_doc.edit_action_holders', kwargs=dict(name=doc.name))
+        login_testing_unauthorized(self, some_other_chair.user.username, url)  # other chair can't edit action holders
         login_testing_unauthorized(self, username, url)
         
         r = self.client.get(url)
@@ -1330,9 +1369,17 @@ def _test_changing_ah(action_holders, reason):
 
         _test_changing_ah([doc.ad, doc.shepherd.person], 'this is a first test')
         _test_changing_ah([doc.ad], 'this is a second test')
-        _test_changing_ah(doc.authors(), 'authors can do it, too')
+        _test_changing_ah(doc.author_persons(), 'authors can do it, too')
         _test_changing_ah([], 'clear it back out')
 
+    def test_doc_change_action_holders_as_doc_manager(self):
+        # create a test RoleName and put it in the docman_roles for the document group
+        RoleName.objects.create(slug="wrangler", name="Wrangler", used=True)
+        self.doc_group.features.docman_roles.append("wrangler")
+        self.doc_group.features.save()
+        wrangler = RoleFactory(group=self.doc_group, name_id="wrangler").person
+        self.do_doc_change_action_holders_test(wrangler.user.username)
+
     def test_doc_change_action_holders_as_secretary(self):
         self.do_doc_change_action_holders_test('secretary')
 
@@ -1342,9 +1389,11 @@ def test_doc_change_action_holders_as_ad(self):
     def do_doc_remind_action_holders_test(self, username):
         doc = Document.objects.get(name=self.docname)
         doc.action_holders.set(PersonFactory.create_batch(3))
-        
+        some_other_chair = RoleFactory(name_id="chair").person
+    
         url = urlreverse('ietf.doc.views_doc.remind_action_holders', kwargs=dict(name=doc.name))
         
+        login_testing_unauthorized(self, some_other_chair.user.username, url)  # other chair can't send reminder
         login_testing_unauthorized(self, username, url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
@@ -1371,6 +1420,14 @@ def do_doc_remind_action_holders_test(self, username):
         self.client.post(url)
         self.assertEqual(len(outbox), 1)  # still 1
 
+    def test_doc_remind_action_holders_as_doc_manager(self):
+        # create a test RoleName and put it in the docman_roles for the document group
+        RoleName.objects.create(slug="wrangler", name="Wrangler", used=True)
+        self.doc_group.features.docman_roles.append("wrangler")
+        self.doc_group.features.save()
+        wrangler = RoleFactory(group=self.doc_group, name_id="wrangler").person
+        self.do_doc_remind_action_holders_test(wrangler.user.username)
+
     def test_doc_remind_action_holders_as_ad(self):
         self.do_doc_remind_action_holders_test('ad')
 
@@ -1453,6 +1510,42 @@ def test_confirm_submission(self):
         self.assertTrue("aread@" in outbox[-1]['To'])
         self.assertTrue("iesg-secretary@" in outbox[-1]['Cc'])
 
+    def test_confirm_submission_no_doc_ad(self):
+        url = urlreverse('ietf.doc.views_draft.to_iesg', kwargs=dict(name=self.docname))
+        self.client.login(username="marschairman", password="marschairman+password")
+
+        doc = Document.objects.get(name=self.docname)
+        RoleFactory(name_id='ad', group=doc.group, person=doc.ad)
+        e = DocEvent(type="changed_document", by=doc.ad, doc=doc, rev=doc.rev, desc="Remove doc AD")
+        e.save()
+        doc.ad = None
+        doc.save_with_history([e])
+
+        docevents_pre = set(doc.docevent_set.all())
+        mailbox_before = len(outbox)
+
+        r = self.client.post(url, dict(confirm="1"))
+        self.assertEqual(r.status_code, 302)
+
+        doc = Document.objects.get(name=self.docname)
+        self.assertTrue(doc.get_state('draft-iesg').slug=='pub-req')
+        self.assertTrue(doc.get_state('draft-stream-ietf').slug=='sub-pub')
+
+        self.assertCountEqual(doc.action_holders.all(), [doc.ad])
+
+        new_docevents = set(doc.docevent_set.all()) - docevents_pre
+        self.assertEqual(len(new_docevents), 5)
+        new_docevent_type_count = Counter([e.type for e in new_docevents])
+        self.assertEqual(new_docevent_type_count['changed_state'],2)
+        self.assertEqual(new_docevent_type_count['started_iesg_process'],1)
+        self.assertEqual(new_docevent_type_count['changed_action_holders'], 1)
+        self.assertEqual(new_docevent_type_count['changed_document'], 1)
+
+        self.assertEqual(len(outbox), mailbox_before + 1)
+        self.assertTrue("Publication has been requested" in outbox[-1]['Subject'])
+        self.assertTrue("aread@" in outbox[-1]['To'])
+        self.assertTrue("iesg-secretary@" in outbox[-1]['Cc'])
+
 
 
 class RequestPublicationTests(TestCase):
@@ -1579,84 +1672,203 @@ def test_release_ise_draft(self):
 
 class AdoptDraftTests(TestCase):
     def test_adopt_document(self):
-        RoleFactory(group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',name_id='chair')
-        draft = IndividualDraftFactory(name='draft-ietf-mars-test',notify='aliens@example.mars')
-
-        url = urlreverse('ietf.doc.views_draft.adopt_draft', kwargs=dict(name=draft.name))
-        login_testing_unauthorized(self, "marschairman", url)
-        
-        # get
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('form select[name="group"] option')), 1) # we can only select "mars"
-
-        # adopt in mars WG
-        mailbox_before = len(outbox)
-        events_before = draft.docevent_set.count()
-        mars = Group.objects.get(acronym="mars")
-        call_issued = State.objects.get(type='draft-stream-ietf',slug='c-adopt')
-        r = self.client.post(url,
-                             dict(comment="some comment",
-                                  group=mars.pk,
-                                  newstate=call_issued.pk,
-                                  weeks="10"))
-        self.assertEqual(r.status_code, 302)
-
-        draft = Document.objects.get(pk=draft.pk)
-        self.assertEqual(draft.group.acronym, "mars")
-        self.assertEqual(draft.stream_id, "ietf")
-        self.assertEqual(draft.docevent_set.count() - events_before, 5)
-        self.assertEqual(draft.notify,"aliens@example.mars")
-        self.assertEqual(len(outbox), mailbox_before + 1)
-        self.assertTrue("Call For Adoption" in outbox[-1]["Subject"])
-        self.assertTrue("mars-chairs@ietf.org" in outbox[-1]['To'])
-        self.assertTrue("draft-ietf-mars-test@" in outbox[-1]['To'])
-        self.assertTrue("mars-wg@" in outbox[-1]['To'])
-
-        self.assertFalse(mars.list_email in draft.notify)
-
-    def test_right_state_choices_offered(self):
-        draft = IndividualDraftFactory()
-        wg = GroupFactory(type_id='wg',state_id='active')
-        rg = GroupFactory(type_id='rg',state_id='active')
-        person = PersonFactory(user__username='person')
+        stream_state_type_slug = {
+            "wg": "draft-stream-ietf",
+            "ag": "draft-stream-ietf",
+            "rg": "draft-stream-irtf",
+            "rag": "draft-stream-irtf",
+            "edwg": "draft-stream-editorial",
+        }
+        for type_id in ("wg", "ag", "rg", "rag", "edwg"):
+            chair_role = RoleFactory(group__type_id=type_id,name_id='chair')
+            draft = IndividualDraftFactory(notify=f'{type_id}group@example.mars')
+
+            url = urlreverse('ietf.doc.views_draft.adopt_draft', kwargs=dict(name=draft.name))
+            self.client.logout()
+            login_testing_unauthorized(self, chair_role.person.user.username, url)
+
+            # get
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
 
-        self.client.login(username='person',password='person+password')
-        url = urlreverse('ietf.doc.views_draft.adopt_draft', kwargs=dict(name=draft.name))
+            # call for adoption
+            group_type_can_call_for_adoption = State.objects.filter(type_id=stream_state_type_slug[type_id],slug="c-adopt").exists()
+            if group_type_can_call_for_adoption:
+                empty_outbox()
+                events_before = draft.docevent_set.count()
+                call_issued = State.objects.get(type=stream_state_type_slug[type_id],slug='c-adopt')
+                r = self.client.post(url,
+                                    dict(comment="some comment",
+                                        group=chair_role.group.pk,
+                                        newstate=call_issued.pk,
+                                        weeks="10"))
+                self.assertEqual(r.status_code, 302)
+
+                draft = Document.objects.get(pk=draft.pk)
+                self.assertEqual(draft.get_state_slug(stream_state_type_slug[type_id]), "c-adopt")
+                self.assertEqual(draft.group, chair_role.group)
+                self.assertEqual(draft.stream_id, stream_state_type_slug[type_id][13:]) # trim off "draft-stream-"
+                self.assertEqual(draft.docevent_set.count() - events_before, 5)
+                self.assertEqual(len(outbox), 1)
+                # contents of outbox[1] are tested elsewhere
+
+            # adopt
+            empty_outbox()
+            events_before = draft.docevent_set.count()
+            # There are several possible states that a stream can adopt into - we will only test one per stream
+            stream_adopt_state_slug =  "wg-doc" if type_id in ("wg", "ag") else "active"
+            stream_adopt_state = State.objects.get(type=stream_state_type_slug[type_id],slug=stream_adopt_state_slug)
+            r = self.client.post(url,
+                                dict(comment="some comment",
+                                    group=chair_role.group.pk,
+                                    newstate=stream_adopt_state.pk,
+                                    weeks="10"))
+            self.assertEqual(r.status_code, 302)
 
-        person.role_set.create(name_id='chair',group=wg,email=person.email())
-        r = self.client.get(url)
-        q = PyQuery(r.content)
-        self.assertTrue('(IETF)' in q('#id_newstate option').text())
-        self.assertFalse('(IRTF)' in q('#id_newstate option').text())
+            draft = Document.objects.get(pk=draft.pk)
+            self.assertEqual(draft.get_state_slug(stream_state_type_slug[type_id]), stream_adopt_state_slug)
+            self.assertEqual(draft.group, chair_role.group)
+            self.assertEqual(draft.stream_id, stream_state_type_slug[type_id][13:]) # trim off "draft-stream-"
+            if type_id in ("wg", "ag"):
+                self.assertEqual(
+                    Counter(list(draft.docevent_set.values_list('type',flat=True))[events_before:]),
+                    Counter({'changed_group': 1, 'changed_stream': 1, 'new_revision': 1})
+                )
+            else:
+                self.assertEqual(
+                    Counter(list(draft.docevent_set.values_list('type',flat=True))[events_before:]),
+                    Counter({'changed_state': 1, 'added_comment': 1, 'changed_group': 1, 'changed_document': 1, 'changed_stream': 1, 'new_revision': 1})
+                )
+            self.assertEqual(len(outbox), 1 if type_id in ["wg", "ag"] else 2)
+            self.assertTrue(stream_adopt_state.name in outbox[-1]["Subject"])
+            self.assertTrue(f"{chair_role.group.acronym}-chairs@" in outbox[-1]['To'])
+            self.assertTrue(f"{draft.name}@" in outbox[-1]['To'])
+            self.assertTrue(f"{chair_role.group.acronym}@" in outbox[-1]['To'])
+            if type_id not in ["wg", "ag"]:
+                self.assertTrue(outbox[-2]["Subject"].endswith("to Informational"))
+                # recipient fields tested elsewhere
+
+
+class AdoptDraftFormTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        # test_data.py made a WG already, and made all the GroupFeatures
+        # This will detect changes in that assumption
+        self.chair_roles = {
+            "wg": Group.objects.filter(
+                type__features__acts_like_wg=True, state="active"
+            )
+            .get()
+            .role_set.get(name_id="chair")
+        }
+        # This set of tests currently assumes all document adopting group types have "chair" in thier docman roles,
+        # and only tests that the form acts correctly for chairs. It should be expanded to use all the roles it finds
+        # in the group of docman roles (which comes from the production database by way of ietf/name/fixtures/names.json)
+        for type_id in ["ag", "rg", "rag", "edwg"]:
+            self.chair_roles[type_id] = RoleFactory(
+                group__type_id=type_id, name_id="chair"
+            )
 
-        person.role_set.create(name_id='chair',group=Group.objects.get(acronym='irtf'),email=person.email())
-        r = self.client.get(url)
-        q = PyQuery(r.content)
-        self.assertTrue('(IETF)' in q('#id_newstate option').text())
-        self.assertTrue('(IRTF)' in q('#id_newstate option').text())
+    def test_form_init(self):
+        secretariat = Person.objects.get(user__username="secretary")
+        f = AdoptDraftForm(user=secretariat.user)
+        form_offers_groups = f.fields["group"].queryset
+        self.assertEqual(
+            set(form_offers_groups.all()),
+            set(
+                Group.objects.filter(type__features__acts_like_wg=True, state="active")
+            ),
+        )
+        self.assertEqual(form_offers_groups.count(), 5)
+        form_offers_states = State.objects.filter(
+            pk__in=[t[0] for t in f.fields["newstate"].choices[1:]]
+        )
+        self.assertEqual(
+            Counter(form_offers_states.values_list("type_id", flat=True)),
+            Counter(
+                {
+                    "draft-stream-irtf": 14,
+                    "draft-stream-ietf": 12,
+                    "draft-stream-editorial": 5,
+                }
+            ),
+        )
 
-        person.role_set.filter(group__acronym='irtf').delete()
-        person.role_set.create(name_id='chair',group=rg,email=person.email())
-        r = self.client.get(url)
-        q = PyQuery(r.content)
-        self.assertTrue('(IETF)' in q('#id_newstate option').text())
-        self.assertTrue('(IRTF)' in q('#id_newstate option').text())
+        irtf_chair = Person.objects.get(user__username="irtf-chair")
+        f = AdoptDraftForm(user=irtf_chair.user)
+        form_offers_groups = f.fields["group"].queryset
+        self.assertEqual(
+            set(form_offers_groups.all()),
+            set(Group.objects.filter(type_id__in=("rag", "rg"), state="active")),
+        )
+        self.assertEqual(form_offers_groups.count(), 2)
+        form_offers_states = State.objects.filter(
+            pk__in=[t[0] for t in f.fields["newstate"].choices[1:]]
+        )
+        self.assertEqual(
+            set(form_offers_states.values_list("type_id", flat=True)),
+            set(["draft-stream-irtf"]),
+        )
 
-        person.role_set.filter(group=wg).delete()
-        r = self.client.get(url)
-        q = PyQuery(r.content)
-        self.assertFalse('(IETF)' in q('#id_newstate option').text())
-        self.assertTrue('(IRTF)' in q('#id_newstate option').text())
+        stream_state_type_slug = {
+            "wg": "draft-stream-ietf",
+            "ag": "draft-stream-ietf",
+            "rg": "draft-stream-irtf",
+            "rag": "draft-stream-irtf",
+            "edwg": "draft-stream-editorial",
+        }
+        for type_id in self.chair_roles:
+            f = AdoptDraftForm(user=self.chair_roles[type_id].person.user)
+            form_offers_groups = f.fields["group"].queryset
+            self.assertEqual(form_offers_groups.get(), self.chair_roles[type_id].group)
+            form_offers_states = State.objects.filter(
+                pk__in=[t[0] for t in f.fields["newstate"].choices[1:]]
+            )
+            self.assertEqual(
+                set(form_offers_states.values_list("type_id", flat=True)),
+                set([stream_state_type_slug[type_id]]),
+            )
 
-        person.role_set.all().delete()
-        person.role_set.create(name_id='secr',group=Group.objects.get(acronym='secretariat'),email=person.email())
-        r = self.client.get(url)
-        q = PyQuery(r.content)
-        self.assertTrue('(IETF)' in q('#id_newstate option').text())
-        self.assertTrue('(IRTF)' in q('#id_newstate option').text())
+        edwgchair_role = self.chair_roles["edwg"]
+        RoleFactory(group__type_id="wg", person=edwgchair_role.person, name_id="chair")
+        RoleFactory(group__type_id="rg", person=edwgchair_role.person, name_id="chair")
+        f = AdoptDraftForm(user=edwgchair_role.person.user)
+        form_offers_groups = f.fields["group"].queryset
+        self.assertEqual(
+            set(form_offers_groups.values_list("type_id", flat=True)),
+            set(["edwg", "wg", "rg"]),
+        )
+        self.assertEqual(form_offers_groups.count(), 3)
+        form_offers_states = State.objects.filter(
+            pk__in=[t[0] for t in f.fields["newstate"].choices[1:]]
+        )
+        self.assertEqual(
+            set(form_offers_states.values_list("type_id", flat=True)),
+            set(["draft-stream-irtf", "draft-stream-ietf", "draft-stream-editorial"]),
+        )
 
+        also_chairs_wg = RoleFactory(
+            group__type_id="wg", person=irtf_chair, name_id="chair"
+        )
+        f = AdoptDraftForm(user=irtf_chair.user)
+        form_offers_groups = f.fields["group"].queryset
+        self.assertEqual(
+            set(form_offers_groups.all()),
+            set(
+                Group.objects.filter(
+                    Q(type_id__in=("rag", "rg")) | Q(pk=also_chairs_wg.group.pk),
+                    state="active",
+                )
+            ),
+        )
+        self.assertEqual(form_offers_groups.count(), 4)
+        form_offers_states = State.objects.filter(
+            pk__in=[t[0] for t in f.fields["newstate"].choices[1:]]
+        )
+        self.assertEqual(
+            set(form_offers_states.values_list("type_id", flat=True)),
+            set(["draft-stream-irtf", "draft-stream-ietf"]),
+        )
 
 class ChangeStreamStateTests(TestCase):
     def test_set_tags(self):
@@ -1730,8 +1942,11 @@ def test_set_initial_state(self):
         self.assertEqual(draft.docevent_set.count() - events_before, 2)
         reminder = DocReminder.objects.filter(event__doc=draft, type="stream-s")
         self.assertEqual(len(reminder), 1)
-        due = datetime.datetime.now() + datetime.timedelta(weeks=10)
-        self.assertTrue(due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1))
+        due = timezone.now().astimezone(DEADLINE_TZINFO) + datetime.timedelta(weeks=10)
+        self.assertTrue(
+            due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1),
+            f'Due date {reminder[0].due} should be {due} +/- 1 day'
+        )
         self.assertEqual(len(outbox), 1)
         self.assertTrue("state changed" in outbox[0]["Subject"].lower())
         self.assertTrue("mars-chairs@ietf.org" in outbox[0].as_string())
@@ -1775,13 +1990,354 @@ def test_set_state(self):
         self.assertEqual(draft.docevent_set.count() - events_before, 2)
         reminder = DocReminder.objects.filter(event__doc=draft, type="stream-s")
         self.assertEqual(len(reminder), 1)
-        due = datetime.datetime.now() + datetime.timedelta(weeks=10)
-        self.assertTrue(due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1))
+        due = timezone.now().astimezone(DEADLINE_TZINFO) + datetime.timedelta(weeks=10)
+        self.assertTrue(
+            due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1),
+            f'Due date {reminder[0].due} should be {due} +/- 1 day'
+        )
         self.assertEqual(len(outbox), 1)
         self.assertTrue("state changed" in outbox[0]["Subject"].lower())
         self.assertTrue("mars-chairs@ietf.org" in outbox[0].as_string())
         self.assertTrue("marsdelegate@ietf.org" in outbox[0].as_string())
 
+    def test_set_stream_state_to_wglc(self):
+        def _form_presents_state_option(response, state):
+            q = PyQuery(response.content)
+            option = q(f"select#id_new_state option[value='{state.pk}']")
+            return len(option) != 0 
+        
+        doc = WgDraftFactory()
+        chair = RoleFactory(name_id="chair", group=doc.group).person
+        url = urlreverse(
+            "ietf.doc.views_draft.change_stream_state",
+            kwargs=dict(name=doc.name, state_type="draft-stream-ietf"),
+        )
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        wglc_state = State.objects.get(type="draft-stream-ietf", slug="wg-lc")
+        doc.set_state(wglc_state)
+        StateDocEventFactory(
+            doc=doc,
+            state_type_id="draft-stream-ietf",
+            state=("draft-stream-ietf", "wg-lc"),
+        )
+        self.assertEqual(doc.docevent_set.count(), 2)
+        r = self.client.get(url)
+        self.assertTrue(_form_presents_state_option(r, wglc_state))
+        other_doc = WgDraftFactory()
+        self.client.logout()
+        url = urlreverse(
+            "ietf.doc.views_draft.change_stream_state",
+            kwargs=dict(name=other_doc.name, state_type="draft-stream-ietf"),
+        )
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertTrue(_form_presents_state_option(r, wglc_state))
+
+    def test_wg_call_for_adoption_issued(self):
+        role = RoleFactory(
+            name_id="chair",
+            group__acronym="mars",
+            group__list_email="mars-wg@ietf.org",
+            person__user__username="marschairman",
+            person__name="WG Cháir Man",
+        )
+        # First test the usual workflow through the manage adoption view
+        draft = IndividualDraftFactory()
+        url = urlreverse(
+            "ietf.doc.views_draft.adopt_draft", kwargs=dict(name=draft.name)
+        )
+        login_testing_unauthorized(self, "marschairman", url)
+        empty_outbox()
+        call_issued = State.objects.get(type="draft-stream-ietf", slug="c-adopt")
+        r = self.client.post(
+            url,
+            dict(
+                comment="some comment",
+                group=role.group.pk,
+                newstate=call_issued.pk,
+                weeks="10",
+            ),
+        )
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(len(outbox), 1)
+        # Test not entering a duration on the form
+        draft = IndividualDraftFactory()
+        url = urlreverse(
+            "ietf.doc.views_draft.adopt_draft", kwargs=dict(name=draft.name)
+        )
+        empty_outbox()
+        call_issued = State.objects.get(type="draft-stream-ietf", slug="c-adopt")
+        r = self.client.post(
+            url,
+            dict(
+                comment="some comment",
+                group=role.group.pk,
+                newstate=call_issued.pk,
+            ),
+        )
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(len(outbox), 1)
+
+        # Test the less usual workflow of issuing a call for adoption 
+        # of a document that's already in the ietf stream
+        draft = WgDraftFactory(group=role.group)
+        url = urlreverse(
+            "ietf.doc.views_draft.change_stream_state",
+            kwargs=dict(name=draft.name, state_type="draft-stream-ietf"),
+        )
+        old_state = draft.get_state("draft-stream-%s" % draft.stream_id)
+        new_state = State.objects.get(
+            used=True, type="draft-stream-%s" % draft.stream_id, slug="c-adopt"
+        )
+        self.assertNotEqual(old_state, new_state)
+        empty_outbox()
+        r = self.client.post(
+            url,
+            dict(
+                new_state=new_state.pk,
+                comment="some comment",
+                weeks="10",
+                tags=[
+                    t.pk
+                    for t in draft.tags.filter(
+                        slug__in=get_tags_for_stream_id(draft.stream_id)
+                    )
+                ],
+            ),
+        )
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(len(outbox), 1)
+        draft = WgDraftFactory(group=role.group)
+        url = urlreverse(
+            "ietf.doc.views_draft.change_stream_state",
+            kwargs=dict(name=draft.name, state_type="draft-stream-ietf"),
+        )
+        old_state = draft.get_state("draft-stream-%s" % draft.stream_id)
+        new_state = State.objects.get(
+            used=True, type="draft-stream-%s" % draft.stream_id, slug="c-adopt"
+        )
+        self.assertNotEqual(old_state, new_state)
+        empty_outbox()
+        r = self.client.post(
+            url,
+            dict(
+                new_state=new_state.pk,
+                comment="some comment",
+                tags=[
+                    t.pk
+                    for t in draft.tags.filter(
+                        slug__in=get_tags_for_stream_id(draft.stream_id)
+                    )
+                ],
+            ),
+        )
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(len(outbox), 1)
+
+    def test_issue_wg_lc_form(self):
+        end_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=1)
+        post = dict(
+            end_date=end_date,
+            to="foo@example.net, bar@example.com",
+            # Intentionally not passing cc
+            subject=f"garbage {end_date.isoformat()}",
+            body=f"garbage {end_date.isoformat()}",
+        )
+        form = IssueWorkingGroupLastCallForm(post)
+        self.assertTrue(form.is_valid())
+        post["end_date"] = date_today(DEADLINE_TZINFO)
+        form = IssueWorkingGroupLastCallForm(post)
+        self.assertFalse(form.is_valid())
+        self.assertIn(
+            "End date must be later than today",
+            form.errors["end_date"],
+            "Form accepted a too-early date",
+        )
+        post["end_date"] = end_date + datetime.timedelta(days=2)
+        form = IssueWorkingGroupLastCallForm(post)
+        self.assertFalse(form.is_valid())
+        self.assertIn(
+            f"Last call end date ({post['end_date'].isoformat()}) not found in subject",
+            form.errors["subject"],
+            "form allowed subject without end_date",
+        )
+        self.assertIn(
+            f"Last call end date ({post['end_date'].isoformat()}) not found in body",
+            form.errors["body"],
+            "form allowed body without end_date",
+        )
+
+    def test_issue_wg_lc(self):
+        def _assert_rejected(testcase, doc, person):
+            url = urlreverse(
+                "ietf.doc.views_draft.issue_wg_lc", kwargs=dict(name=doc.name)
+            )
+            login_testing_unauthorized(testcase, person.user.username, url)
+            r = testcase.client.get(url)
+            testcase.assertEqual(r.status_code, 404)
+            testcase.client.logout()
+
+        already_rfc = WgDraftFactory(states=[("draft", "rfc")])
+        rfc_chair = RoleFactory(name_id="chair", group=already_rfc.group).person
+        _assert_rejected(self, already_rfc, rfc_chair)
+        rg_doc = RgDraftFactory()
+        rg_chair = RoleFactory(name_id="chair", group=rg_doc.group).person
+        _assert_rejected(self, rg_doc, rg_chair)
+        inwglc_doc = WgDraftFactory(states=[("draft-stream-ietf", "wg-lc")])
+        inwglc_chair = RoleFactory(name_id="chair", group=inwglc_doc.group).person
+        _assert_rejected(self, inwglc_doc, inwglc_chair)
+        doc = WgDraftFactory()
+        chair = RoleFactory(name_id="chair", group=doc.group).person
+        url = urlreverse("ietf.doc.views_draft.issue_wg_lc", kwargs=dict(name=doc.name))
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        postdict = dict()
+        postdict["end_date"] = q("input#id_end_date").attr("value")
+        postdict["to"] = q("input#id_to").attr("value") + ", extrato@example.org"
+        cc = q("input#id_cc").attr("value")
+        if cc is not None:
+            postdict["cc"] = cc + ", extracc@example.org"
+        else:
+            postdict["cc"] = "extracc@example.org"
+        postdict["subject"] = q("input#id_subject").attr("value") + " Extra Subject Words"
+        postdict["body"] = q("textarea#id_body").text() + "FGgqbQ$UNeXs"
+        empty_outbox()
+        r = self.client.post(
+            url,
+            postdict,
+        )
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(doc.get_state_slug("draft-stream-ietf"), "wg-lc")
+        self.assertEqual(len(outbox), 2)
+        self.assertIn(f"{doc.group.acronym}@ietf.org", outbox[1]["To"])
+        self.assertIn("extrato@example.org", outbox[1]["To"])
+        self.assertIn("extracc@example.org", outbox[1]["Cc"])
+        self.assertIn("Extra Subject Words", outbox[1]["Subject"])
+        self.assertIn("WG Last Call", outbox[1]["Subject"])
+        body = get_payload_text(outbox[1])
+        self.assertIn("disclosure obligations", body)
+        self.assertIn("FGgqbQ$UNeXs", body)
+
+    def test_issue_wg_call_for_adoption_form(self):
+        end_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=1)
+        post = dict(
+            end_date=end_date,
+            to="foo@example.net, bar@example.com",
+            # Intentionally not passing cc
+            subject=f"garbage {end_date.isoformat()}",
+            body=f"garbage {end_date.isoformat()}",
+        )
+        form = IssueCallForAdoptionForm(post)
+        self.assertTrue(form.is_valid())
+        post["end_date"] = date_today(DEADLINE_TZINFO)
+        form = IssueCallForAdoptionForm(post)
+        self.assertFalse(form.is_valid())
+        self.assertIn(
+            "End date must be later than today",
+            form.errors["end_date"],
+            "Form accepted a too-early date",
+        )
+        post["end_date"] = end_date + datetime.timedelta(days=2)
+        form = IssueCallForAdoptionForm(post)
+        self.assertFalse(form.is_valid())
+        self.assertIn(
+            f"Call for adoption end date ({post['end_date'].isoformat()}) not found in subject",
+            form.errors["subject"],
+            "form allowed subject without end_date",
+        )
+        self.assertIn(
+            f"Call for adoption end date ({post['end_date'].isoformat()}) not found in body",
+            form.errors["body"],
+            "form allowed body without end_date",
+        )
+
+    def test_issue_wg_call_for_adoption(self):
+        def _assert_rejected(testcase, doc, person, group=None):
+            target_acronym = group.acronym if group is not None else doc.group.acronym
+            url = urlreverse(
+                "ietf.doc.views_draft.issue_wg_call_for_adoption",
+                kwargs=dict(name=doc.name, acronym=target_acronym),
+            )
+            login_testing_unauthorized(testcase, person.user.username, url)
+            r = testcase.client.get(url)
+            testcase.assertEqual(r.status_code, 403)
+            testcase.client.logout()
+
+        def _verify_call_issued(testcase, doc, chair_role):
+            url = urlreverse(
+                "ietf.doc.views_draft.issue_wg_call_for_adoption",
+                kwargs=dict(name=doc.name, acronym=chair_role.group.acronym),
+            )
+            login_testing_unauthorized(testcase, chair_role.person.user.username, url)
+            r = testcase.client.get(url)
+            testcase.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            postdict = dict()
+            postdict["end_date"] = q("input#id_end_date").attr("value")
+            postdict["to"] = q("input#id_to").attr("value") + ", extrato@example.com"
+            self.assertIn(chair_role.group.list_email, postdict["to"])
+            cc = q("input#id_cc").attr("value")
+            if cc is not None:
+                postdict["cc"] = cc + ", extracc@example.com"
+            else:
+                postdict["cc"] = "extracc@example.com"
+            postdict["subject"] = q("input#id_subject").attr("value") + " Extra Subject Words"
+            postdict["body"] = q("textarea#id_body").text() + "FGgqbQ$UNeXs"
+            empty_outbox()
+            r = testcase.client.post(
+                url,
+                postdict,
+            )
+            testcase.assertEqual(r.status_code, 302)
+            doc.refresh_from_db()
+            self.assertEqual(doc.group, chair_role.group)
+            self.assertEqual(doc.get_state_slug("draft-stream-ietf"), "c-adopt")
+            self.assertEqual(len(outbox), 2)
+            self.assertIn(f"{doc.group.acronym}@ietf.org", outbox[1]["To"])
+            self.assertIn("extrato@example.com", outbox[1]["To"])
+            self.assertIn("extracc@example.com", outbox[1]["Cc"])
+            self.assertIn("Call for adoption", outbox[1]["Subject"])
+            self.assertIn("Extra Subject Words", outbox[1]["Subject"])
+            body = get_payload_text(outbox[1])
+            self.assertIn("disclosure obligations", body)
+            self.assertIn("FGgqbQ$UNeXs", body)
+            self.client.logout()
+            return doc
+
+        already_rfc = WgDraftFactory(states=[("draft", "rfc")])
+        rfc = WgRfcFactory(group=already_rfc.group)
+        already_rfc.relateddocument_set.create(relationship_id="became_rfc",target=rfc)
+        rfc_chair = RoleFactory(name_id="chair", group=already_rfc.group).person
+        _assert_rejected(self, already_rfc, rfc_chair)
+        rg_doc = RgDraftFactory()
+        rg_chair = RoleFactory(name_id="chair", group=rg_doc.group).person
+        _assert_rejected(self, rg_doc, rg_chair)
+        inwglc_doc = WgDraftFactory(states=[("draft-stream-ietf", "wg-lc")])
+        inwglc_chair = RoleFactory(name_id="chair", group=inwglc_doc.group).person
+        _assert_rejected(self, inwglc_doc, inwglc_chair)
+        ind_doc = IndividualDraftFactory()
+        _assert_rejected(self, ind_doc, rg_chair, rg_doc.group)
+
+        # Successful call issued for doc already in WG
+        doc = WgDraftFactory(states=[("draft-stream-ietf","wg-cand")])
+        chair_role = RoleFactory(name_id="chair",group=doc.group)
+        _ = _verify_call_issued(self, doc, chair_role)
+
+        # Successful call issued for doc not yet in WG
+        doc = IndividualDraftFactory()
+        chair_role = RoleFactory(name_id="chair",group__type_id="wg")
+        doc = _verify_call_issued(self, doc, chair_role)
+        self.assertEqual(doc.group, chair_role.group)
+        self.assertEqual(doc.stream_id, "ietf")
+        self.assertEqual(doc.get_state_slug("draft-stream-ietf"), "c-adopt")
+        self.assertCountEqual(
+            doc.docevent_set.values_list("type", flat=True),
+            ["changed_state", "changed_group", "changed_stream", "new_revision"]
+        )
+
     def test_pubreq_validation(self):
         role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man')
         RoleFactory(name_id='delegate',group=role.group,person__user__email='marsdelegate@ietf.org')
@@ -1826,7 +2382,7 @@ def setUp(self):
             name="draft-test-base-b",
             title="Base B",
             group=mars_wg,
-            expires = datetime.datetime.now() - datetime.timedelta(days = 365 - settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
+            expires = timezone.now() - datetime.timedelta(days = 365 - settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
         )
         p = PersonFactory(name="baseb_author")
         e = Email.objects.create(address="baseb_author@example.com", person=p, origin=p.user.username)
@@ -1868,7 +2424,7 @@ def test_change_replaces(self):
         
         # Post that says replacea replaces base a
         empty_outbox()
-        RelatedDocument.objects.create(source=self.replacea, target=self.basea.docalias.first(),
+        RelatedDocument.objects.create(source=self.replacea, target=self.basea,
                                        relationship=DocRelationshipName.objects.get(slug="possibly-replaces"))
         self.assertEqual(self.basea.get_state().slug,'active')
         r = self.client.post(url, dict(replaces=self.basea.pk))
@@ -1916,7 +2472,7 @@ def test_change_replaces(self):
 
 
     def test_review_possibly_replaces(self):
-        replaced = self.basea.docalias.first()
+        replaced = self.basea
         RelatedDocument.objects.create(source=self.replacea, target=replaced,
                                        relationship=DocRelationshipName.objects.get(slug="possibly-replaces"))
 
@@ -1960,6 +2516,276 @@ def test_shepherd_writeup_generation(self):
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertContains(r, "for Individual Documents", status_code=200)
+        r = self.client.post(url,dict(reset_text=''))
+        self.assertContains(r, "for Individual Documents", status_code=200)
         url = urlreverse('ietf.doc.views_draft.edit_shepherd_writeup', kwargs=dict(name=wg_draft.name))
         r = self.client.get(url)
         self.assertContains(r, "for Group Documents", status_code=200)
+        r = self.client.post(url,dict(reset_text=''))
+        self.assertContains(r, "for Group Documents", status_code=200)
+
+class EditorialDraftMetadataTests(TestCase):
+    def test_editorial_metadata(self):
+        draft = EditorialDraftFactory()
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))
+        r = self.client.get(url)
+        q = PyQuery(r.content)
+        top_level_metadata_headings = q("tbody>tr>th:first-child").text()
+        self.assertNotIn("IESG", top_level_metadata_headings)
+        self.assertNotIn("IANA", top_level_metadata_headings)
+
+class IetfGroupActionHelperTests(TestCase):
+    def test_manage_adoption_routing(self):
+        draft = IndividualDraftFactory()
+        nobody = PersonFactory()
+        rgchair = RoleFactory(group__type_id="rg", name_id="chair").person
+        wgchair = RoleFactory(group__type_id="wg", name_id="chair").person
+        multichair = RoleFactory(group__type_id="rg", name_id="chair").person
+        RoleFactory(group__type_id="wg", person=multichair, name_id="chair")
+        ad = RoleFactory(group__type_id="area", name_id="ad").person
+        secretary = Role.objects.filter(
+            name_id="secr", group__acronym="secretariat"
+        ).first()
+        self.assertIsNotNone(secretary)
+        secretary = secretary.person
+        self.assertFalse(
+            has_role(rgchair.user, ["Secretariat", "Area Director", "WG Chair"])
+        )
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main", kwargs={"name": draft.name}
+        )
+        ask_about_ietf_link = urlreverse(
+            "ietf.doc.views_draft.ask_about_ietf_adoption_call",
+            kwargs={"name": draft.name},
+        )
+        non_ietf_adoption_link = urlreverse(
+            "ietf.doc.views_draft.adopt_draft", kwargs={"name": draft.name}
+        )
+        for person in (None, nobody, rgchair, wgchair, multichair, ad, secretary):
+            if person is not None:
+                self.client.login(
+                    username=person.user.username,
+                    password=f"{person.user.username}+password",
+                )
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            has_ask_about_ietf_link = len(q(f'a[href="{ask_about_ietf_link}"]')) != 0
+            has_non_ietf_adoption_link = (
+                len(q(f'a[href="{non_ietf_adoption_link}"]')) != 0
+            )
+            ask_about_r = self.client.get(ask_about_ietf_link)
+            ask_about_link_return_code = ask_about_r.status_code
+            if person == rgchair:
+                self.assertFalse(has_ask_about_ietf_link)
+                self.assertTrue(has_non_ietf_adoption_link)
+                self.assertEqual(ask_about_link_return_code, 403)
+            elif person in (ad, nobody, None):
+                self.assertFalse(has_ask_about_ietf_link)
+                self.assertFalse(has_non_ietf_adoption_link)
+                self.assertEqual(
+                    ask_about_link_return_code, 302 if person is None else 403
+                )
+            else:
+                self.assertTrue(has_ask_about_ietf_link)
+                self.assertFalse(has_non_ietf_adoption_link)
+                self.assertEqual(ask_about_link_return_code, 200)
+            self.client.logout()
+
+    def test_ask_about_ietf_adoption_call(self):
+        # Basic permission tests above
+        doc = IndividualDraftFactory()
+        self.assertEqual(doc.docevent_set.count(), 1)
+        chair_role = RoleFactory(group__type_id="wg", name_id="chair")
+        chair = chair_role.person
+        group = chair_role.group
+        othergroup = GroupFactory(type_id="wg")
+        url = urlreverse(
+            "ietf.doc.views_draft.ask_about_ietf_adoption_call",
+            kwargs={"name": doc.name},
+        )
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.post(url, {"group": othergroup.pk})
+        self.assertEqual(r.status_code, 200)
+        r = self.client.post(url, {"group": group.pk})
+        self.assertEqual(r.status_code, 302)
+
+    def test_offer_wg_action_helpers(self):
+        def _assert_view_presents_buttons(testcase, response, expected):
+            q = PyQuery(response.content)
+            for id, expect in expected:
+                button = q(f"#{id}")
+                testcase.assertEqual(
+                    len(button) != 0,
+                    expect
+                )
+
+        # View rejects access
+        came_from_draft = WgDraftFactory(states=[("draft","rfc")])
+        rfc = WgRfcFactory(group=came_from_draft.group)
+        came_from_draft.relateddocument_set.create(relationship_id="became_rfc",target=rfc)
+        rfc_chair = RoleFactory(name_id="chair", group=rfc.group).person
+        url = urlreverse("ietf.doc.views_draft.offer_wg_action_helpers", kwargs=dict(name=came_from_draft.name))
+        login_testing_unauthorized(self, rfc_chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+        self.client.logout()
+        rg_draft = RgDraftFactory()
+        rg_chair = RoleFactory(group=rg_draft.group, name_id="chair").person
+        url = urlreverse("ietf.doc.views_draft.offer_wg_action_helpers", kwargs=dict(name=rg_draft.name))
+        login_testing_unauthorized(self, rg_chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,404)
+        self.client.logout()
+
+        # View offers access
+        draft = WgDraftFactory()
+        chair = RoleFactory(group=draft.group, name_id="chair").person
+        url = urlreverse("ietf.doc.views_draft.offer_wg_action_helpers", kwargs=dict(name=draft.name))
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        _assert_view_presents_buttons(
+            self,
+            r,
+            [
+                ("id_wgadopt_button", False),
+                ("id_wglc_button", True),
+                ("id_pubreq_button", True),
+            ],
+        )
+        draft.set_state(State.objects.get(type_id="draft-stream-ietf", slug="wg-cand"))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        _assert_view_presents_buttons(
+            self,
+            r,
+            [
+                ("id_wgadopt_button", True),
+                ("id_wglc_button", False),
+                ("id_pubreq_button", False),
+            ],
+        ) 
+        draft.set_state(State.objects.get(type_id="draft-stream-ietf", slug="wg-lc"))
+        StateDocEventFactory(
+            doc=draft,
+            state_type_id="draft-stream-ietf",
+            state=("draft-stream-ietf", "wg-lc"),
+        )
+        self.assertEqual(draft.docevent_set.count(), 2)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+        _assert_view_presents_buttons(
+            self,
+            r,
+            [
+                ("id_wgadopt_button", False),
+                ("id_wglc_button", False),
+                ("id_pubreq_button", True),
+            ],
+        )
+        draft.set_state(State.objects.get(type_id="draft-stream-ietf",slug="chair-w"))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        _assert_view_presents_buttons(
+            self,
+            r,
+            [
+                ("id_wgadopt_button", False),
+                ("id_wglc_button", True),
+                ("id_pubreq_button", True),
+            ],
+        )
+        self.assertContains(response=r,text="Issue Another Working Group Last Call", status_code=200)
+        other_draft = WgDraftFactory()
+        self.client.logout()
+        url = urlreverse("ietf.doc.views_draft.offer_wg_action_helpers", kwargs=dict(name=other_draft.name))
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        _assert_view_presents_buttons(
+            self,
+            r,
+            [
+                ("id_wgadopt_button", False),
+                ("id_wglc_button", True),
+                ("id_pubreq_button", True),
+            ],
+        )
+        self.assertContains(
+            response=r, text="Issue Working Group Last Call", status_code=200
+        )
+
+class BallotEmailAjaxTests(TestCase):
+    def test_ajax_build_position_email(self):
+        def _post_json(self, url, json_to_post):
+            r = self.client.post(
+                url, json.dumps(json_to_post), content_type="application/json"
+            )
+            self.assertEqual(r.status_code, 200)
+            return json.loads(r.content)
+
+        doc = WgDraftFactory()
+        ad = RoleFactory(
+            name_id="ad", group=doc.group, person__name="Some Areadirector"
+        ).person
+        url = urlreverse("ietf.doc.views_ballot.ajax_build_position_email")
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 405)
+        response = _post_json(self, url, {})
+        self.assertFalse(response["success"])
+        self.assertEqual(response["errors"], ["post_data not provided"])
+        response = _post_json(self, url, {"dictis": "not empty"})
+        self.assertFalse(response["success"])
+        self.assertEqual(response["errors"], ["post_data not provided"])
+        response = _post_json(self, url, {"post_data": {}})
+        self.assertFalse(response["success"])
+        self.assertEqual(len(response["errors"]), 7)
+        response = _post_json(
+            self,
+            url,
+            {
+                "post_data": {
+                    "discuss": "aaaaaa",
+                    "comment": "bbbbbb",
+                    "position": "discuss",
+                    "balloter": Person.objects.aggregate(maxpk=Max("pk") + 1)["maxpk"],
+                    "docname": "this-draft-does-not-exist",
+                    "cc_choices": ["doc_group_mail_list"],
+                    "additional_cc": "foo@example.com",
+                }
+            },
+        )
+        self.assertFalse(response["success"])
+        self.assertEqual(
+            response["errors"],
+            ["No person found matching balloter", "No document found matching docname"],
+        )
+        response = _post_json(
+            self,
+            url,
+            {
+                "post_data": {
+                    "discuss": "aaaaaa",
+                    "comment": "bbbbbb",
+                    "position": "discuss",
+                    "balloter": ad.pk,
+                    "docname": doc.name,
+                    "cc_choices": ["doc_group_mail_list"],
+                    "additional_cc": "foo@example.com",
+                }
+            },
+        )
+        self.assertTrue(response["success"])
+        for snippet in [
+            "aaaaaa",
+            "bbbbbb",
+            "DISCUSS",
+            ad.plain_name(),
+            doc.name,
+            doc.group.list_email,
+            "foo@example.com",
+        ]:
+            self.assertIn(snippet, response["text"])
+
diff --git a/ietf/doc/tests_irsg_ballot.py b/ietf/doc/tests_irsg_ballot.py
index f178bb4e56..d96cf9dbef 100644
--- a/ietf/doc/tests_irsg_ballot.py
+++ b/ietf/doc/tests_irsg_ballot.py
@@ -19,6 +19,7 @@
 from ietf.person.utils import get_active_irsg, get_active_ads
 from ietf.group.factories import RoleFactory
 from ietf.person.models import Person
+from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO
 
 
 class IssueIRSGBallotTests(TestCase):
@@ -254,7 +255,7 @@ def test_edit_ballot_position_permissions(self):
         irsgmember = get_active_irsg()[0]
         secr = RoleFactory(group__acronym='secretariat',name_id='secr')
         wg_ballot = create_ballot_if_not_open(None, wg_draft, ad.person, 'approve')
-        due = datetime.date.today()+datetime.timedelta(days=14)
+        due = datetime_today(DEADLINE_TZINFO) + datetime.timedelta(days=14)
         rg_ballot = create_ballot_if_not_open(None, rg_draft, secr.person, 'irsg-approve', due)
 
         url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=wg_draft.name, ballot_id=wg_ballot.pk))
@@ -287,7 +288,7 @@ def test_edit_ballot_position_permissions(self):
 
     def test_iesg_ballot_no_irsg_actions(self):
         ad = Person.objects.get(user__username="ad")
-        wg_draft = IndividualDraftFactory(ad=ad)
+        wg_draft = IndividualDraftFactory(ad=ad, stream_id='ietf')
         irsgmember = get_active_irsg()[0]
 
         url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=wg_draft.name))
@@ -323,7 +324,7 @@ class BaseManipulationTests():
     def test_issue_ballot(self):
         draft = RgDraftFactory()
         url = urlreverse('ietf.doc.views_ballot.issue_irsg_ballot',kwargs=dict(name=draft.name))
-        due = datetime.date.today()+datetime.timedelta(days=14)
+        due = date_today(DEADLINE_TZINFO)+datetime.timedelta(days=14)
         empty_outbox()
 
         login_testing_unauthorized(self, self.username , url)
@@ -354,28 +355,35 @@ def test_issue_ballot(self):
     def test_take_and_email_position(self):
         draft = RgDraftFactory()
         ballot = IRSGBallotDocEventFactory(doc=draft)
-        url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) + self.balloter
+        url = (
+            urlreverse(
+                "ietf.doc.views_ballot.edit_position",
+                kwargs=dict(name=draft.name, ballot_id=ballot.pk),
+            )
+            + self.balloter
+        )
         empty_outbox()
 
         login_testing_unauthorized(self, self.username, url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        r = self.client.post(url, dict(position='yes', comment='oib239sb', send_mail='Save and send email'))
+        empty_outbox()
+        r = self.client.post(
+            url,
+            dict(
+                position="yes",
+                comment="oib239sb",
+                send_mail="Save and send email",
+                cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"],
+            ),
+        )
         self.assertEqual(r.status_code, 302)
         e = draft.latest_event(BallotPositionDocEvent)
-        self.assertEqual(e.pos.slug,'yes')
-        self.assertEqual(e.comment, 'oib239sb')
-
-        url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) + self.balloter
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        r = self.client.post(url, dict(cc_choices=['doc_authors','doc_group_chairs','doc_group_mail_list'], body="Stuff"))
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(len(outbox),1)
-        self.assertNotIn('discuss-criteria', get_payload_text(outbox[0]))
+        self.assertEqual(e.pos.slug, "yes")
+        self.assertEqual(e.comment, "oib239sb")
+        self.assertEqual(len(outbox), 1)
+        self.assertNotIn("discuss-criteria", get_payload_text(outbox[0]))
 
     def test_close_ballot(self):
         draft = RgDraftFactory()
@@ -444,8 +452,8 @@ def setUp(self):
 
     def test_cant_issue_irsg_ballot(self):
         draft = RgDraftFactory()
-        due = datetime.date.today()+datetime.timedelta(days=14)
-        url = urlreverse('ietf.doc.views_ballot.close_irsg_ballot', kwargs=dict(name=draft.name))
+        due = datetime_today(DEADLINE_TZINFO) + datetime.timedelta(days=14)
+        url = urlreverse('ietf.doc.views_ballot.issue_irsg_ballot', kwargs=dict(name=draft.name))
 
         self.client.login(username = self.username, password = self.username+'+password')
         r = self.client.get(url)
@@ -481,27 +489,31 @@ def test_cant_take_position_on_iesg_ballot(self):
     def test_take_and_email_position(self):
         draft = RgDraftFactory()
         ballot = IRSGBallotDocEventFactory(doc=draft)
-        url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name, ballot_id=ballot.pk))
+        url = urlreverse(
+            "ietf.doc.views_ballot.edit_position",
+            kwargs=dict(name=draft.name, ballot_id=ballot.pk),
+        )
         empty_outbox()
 
         login_testing_unauthorized(self, self.username, url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        r = self.client.post(url, dict(position='yes', comment='oib239sb', send_mail='Save and send email'))
+        r = self.client.post(
+            url,
+            dict(
+                position="yes",
+                comment="oib239sb",
+                send_mail="Save and send email",
+                cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"],
+            ),
+        )
         self.assertEqual(r.status_code, 302)
         e = draft.latest_event(BallotPositionDocEvent)
-        self.assertEqual(e.pos.slug,'yes')
-        self.assertEqual(e.comment, 'oib239sb')
-
-        url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name, ballot_id=ballot.pk))
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        r = self.client.post(url, dict(cc_choices=['doc_authors','doc_group_chairs','doc_group_mail_list'], body="Stuff"))
+        self.assertEqual(e.pos.slug, "yes")
+        self.assertEqual(e.comment, "oib239sb")
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(len(outbox),1)
+        self.assertEqual(len(outbox), 1)
 
 class IESGMemberTests(TestCase):
 
diff --git a/ietf/doc/tests_js.py b/ietf/doc/tests_js.py
index 02daaae904..9a5aad13b9 100644
--- a/ietf/doc/tests_js.py
+++ b/ietf/doc/tests_js.py
@@ -41,7 +41,7 @@ def _fill_in_author_form(form_elt, name, email, affiliation, country):
                     (By.CSS_SELECTOR, result_selector),
                     name
                 ))
-            input.send_keys('\n')  # select the object
+            self.driver.find_element(By.CSS_SELECTOR, result_selector).click()
 
             # After the author is selected, the email select options will be populated.
             # Wait for that, then click on the option corresponding to the requested email.
@@ -92,12 +92,8 @@ def _read_author_form(form_elt):
         self.assertEqual(len(author_forms), 1)
 
         # get the "add author" button so we can add blank author forms
-        add_author_button = self.driver.find_element(By.ID, 'add-author-button')
         for index, auth in enumerate(authors):
-            self.driver.execute_script("arguments[0].scrollIntoView();", add_author_button)  # FIXME: no idea why this fails:
-            # self.scroll_to_element(add_author_button)  # Can only click if it's in view!
-            self.driver.execute_script("arguments[0].click();", add_author_button)  # FIXME: no idea why this fails:
-            # add_author_button.click()  # Create a new form. Automatically scrolls to it.
+            self.scroll_and_click((By.ID, 'add-author-button'))  # Create new form. Automatically scrolls to it.
             author_forms = authors_list.find_elements(By.CLASS_NAME, 'author-panel')
             authors_added = index + 1
             self.assertEqual(len(author_forms), authors_added + 1)  # Started with 1 author, hence +1
@@ -118,10 +114,9 @@ def _read_author_form(form_elt):
         # Must provide a "basis" (change reason)
         self.driver.find_element(By.ID, 'id_basis').send_keys('change testing')
         # Now click the 'submit' button and check that the update was accepted.
-        submit_button = self.driver.find_element(By.CSS_SELECTOR, 'button[type="submit"]')
-        self.driver.execute_script("arguments[0].click();", submit_button)  # FIXME: no idea why this fails:
-        # self.scroll_to_element(submit_button)
-        # submit_button.click()
+        submit_button = self.driver.find_element(By.CSS_SELECTOR, '#content button[type="submit"]')
+        self.scroll_to_element(submit_button)
+        submit_button.click()
         # Wait for redirect to the document_main view
         self.wait.until(
             expected_conditions.url_to_be(
@@ -132,4 +127,4 @@ def _read_author_form(form_elt):
         self.assertEqual(
             list(draft.documentauthor_set.values_list('person', flat=True)),
             [first_auth.person.pk] + [auth.pk for auth in authors]
-        )
\ No newline at end of file
+        )
diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py
index 1e922197d5..04779bdaf1 100644
--- a/ietf/doc/tests_material.py
+++ b/ietf/doc/tests_material.py
@@ -4,21 +4,24 @@
 
 import os
 import shutil
-import datetime
 import io
 
+from unittest.mock import call, patch
 from pathlib import Path
 from pyquery import PyQuery
 
 import debug              # pyflakes:ignore
 
 from django.conf import settings
+from django.test import override_settings
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 
-from ietf.doc.models import Document, State, DocAlias, NewRevisionDocEvent
+from ietf.doc.models import Document, State, NewRevisionDocEvent
+from ietf.doc.storage_utils import retrieve_str
 from ietf.group.factories import RoleFactory
 from ietf.group.models import Group
-from ietf.meeting.factories import MeetingFactory, SessionFactory
+from ietf.meeting.factories import MeetingFactory, SessionFactory, SessionPresentationFactory
 from ietf.meeting.models import Meeting, SessionPresentation, SchedulingEvent
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
@@ -26,7 +29,7 @@
 
 
 class GroupMaterialTests(TestCase):
-    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['AGENDA_PATH']
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['AGENDA_PATH', 'FTP_DIR']
     def setUp(self):
         super().setUp()
         self.materials_dir = self.tempdir("materials")
@@ -35,6 +38,10 @@ def setUp(self):
             self.slides_dir.mkdir()
         self.saved_document_path_pattern = settings.DOCUMENT_PATH_PATTERN
         settings.DOCUMENT_PATH_PATTERN = self.materials_dir + "/{doc.type_id}/"
+        self.assertTrue(Path(settings.FTP_DIR).exists())
+        ftp_slides_dir = Path(settings.FTP_DIR) / "slides"
+        if not ftp_slides_dir.exists():
+            ftp_slides_dir.mkdir()
 
         self.meeting_slides_dir = Path(settings.AGENDA_PATH) / "42" / "slides"
         if not self.meeting_slides_dir.exists():
@@ -54,7 +61,6 @@ def create_slides(self):
         doc = Document.objects.create(name="slides-testteam-test-file", rev="01", type_id="slides", group=group)
         doc.set_state(State.objects.get(type="slides", slug="active"))
         doc.set_state(State.objects.get(type="reuse_policy", slug="multiple"))
-        DocAlias.objects.create(name=doc.name).docs.add(doc)
         NewRevisionDocEvent.objects.create(doc=doc,by=Person.objects.get(name="(System)"),rev='00',type='new_revision',desc='New revision available')
         NewRevisionDocEvent.objects.create(doc=doc,by=Person.objects.get(name="(System)"),rev='01',type='new_revision',desc='New revision available')
 
@@ -111,8 +117,16 @@ def test_upload_slides(self):
         self.assertEqual(doc.title, "Test File - with fancy title")
         self.assertEqual(doc.get_state_slug(), "active")
 
-        with io.open(os.path.join(self.materials_dir, "slides", doc.name + "-" + doc.rev + ".pdf")) as f:
+        basename=f"{doc.name}-{doc.rev}.pdf"
+        filepath=Path(self.materials_dir) / "slides" / basename
+        with filepath.open() as f:
             self.assertEqual(f.read(), content)
+        ftp_filepath=Path(settings.FTP_DIR) / "slides" / basename
+        with ftp_filepath.open() as f:
+            self.assertEqual(f.read(), content)
+        # This test is very sloppy wrt the actual file content.
+        # Working with/around that for the moment.
+        self.assertEqual(retrieve_str("slides", basename), content)
 
         # check that posting same name is prevented
         test_file.seek(0)
@@ -136,26 +150,54 @@ def test_change_state(self):
         doc = Document.objects.get(name=doc.name)
         self.assertEqual(doc.get_state_slug(), "deleted")
 
-    def test_edit_title(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")
+    @patch("ietf.doc.views_material.SlidesManager")
+    def test_edit_title(self, mock_slides_manager_cls):
         doc = self.create_slides()
 
         url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(name=doc.name, action="title"))
         login_testing_unauthorized(self, "secretary", url)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         # post
         r = self.client.post(url, dict(title="New title"))
         self.assertEqual(r.status_code, 302)
         doc = Document.objects.get(name=doc.name)
         self.assertEqual(doc.title, "New title")
+        self.assertFalse(mock_slides_manager_cls.return_value.send_update.called)
+
+        # assign to a session to see that it now sends updates to Meetecho
+        session = SessionPresentationFactory(session__group=doc.group, document=doc).session
+
+        # Grab the title on the slides when the API call was made (to be sure it's not before it was updated)
+        titles_sent = []
+        mock_slides_manager_cls.return_value.send_update.side_effect = lambda sess: titles_sent.extend(
+            list(sess.presentations.values_list("document__title", flat=True))
+        ) 
+
+        r = self.client.post(url, dict(title="Newer title"))
+        self.assertEqual(r.status_code, 302)
+        doc = Document.objects.get(name=doc.name)
+        self.assertEqual(doc.title, "Newer title")
+        self.assertTrue(mock_slides_manager_cls.called)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.send_update.call_args,
+            call(session),
+        )
+        self.assertEqual(titles_sent, ["Newer title"])
 
-    def test_revise(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")
+    @patch("ietf.doc.views_material.SlidesManager")
+    def test_revise(self, mock_slides_manager_cls):
         doc = self.create_slides()
 
         session = SessionFactory(
             name = "session-42-mars-1",
             meeting = Meeting.objects.get(number='42'),
             group = Group.objects.get(acronym='mars'),
-            modified = datetime.datetime.now(),
+            modified = timezone.now(),
         )
         SchedulingEvent.objects.create(
             session=session,
@@ -166,11 +208,18 @@ def test_revise(self):
 
         url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(name=doc.name, action="revise"))
         login_testing_unauthorized(self, "secretary", url)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         content = "some text"
         test_file = io.StringIO(content)
         test_file.name = "unnamed.txt"
 
+        # Grab the title on the slides when the API call was made (to be sure it's not before it was updated)
+        titles_sent = []
+        mock_slides_manager_cls.return_value.send_update.side_effect = lambda sess: titles_sent.extend(
+            list(sess.presentations.values_list("document__title", flat=True))
+        ) 
+
         # post
         r = self.client.post(url, dict(title="New title",
                                        abstract="New abstract",
@@ -181,7 +230,17 @@ def test_revise(self):
         self.assertEqual(doc.rev, "02")
         self.assertEqual(doc.title, "New title")
         self.assertEqual(doc.get_state_slug(), "active")
+        self.assertTrue(mock_slides_manager_cls.called)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.send_update.call_args,
+            call(session),
+        )
+        self.assertEqual(titles_sent, ["New title"])
 
         with io.open(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + ".txt")) as f:
             self.assertEqual(f.read(), content)
+        self.assertEqual(retrieve_str("slides", f"{doc.name}-{doc.rev}.txt"), content)
+
 
diff --git a/ietf/doc/tests_models.py b/ietf/doc/tests_models.py
new file mode 100644
index 0000000000..d835f646fb
--- /dev/null
+++ b/ietf/doc/tests_models.py
@@ -0,0 +1,113 @@
+# Copyright The IETF Trust 2016-2023, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+import itertools
+
+from ietf.doc.factories import WgRfcFactory
+from ietf.doc.models import RelatedDocument
+from ietf.utils.test_utils import TestCase
+
+
+class RelatedDocumentTests(TestCase):
+    def test_is_downref(self):
+        rfcs = [
+            WgRfcFactory(std_level_id=lvl)
+            for lvl in ["inf", "exp", "bcp", "ps", "ds", "std", "unkn"]
+        ]
+
+        result_matrix = {
+            # source
+            "inf": {
+                "inf": None,  # target
+                "exp": None,  # target
+                "bcp": None,  # target
+                "ps": None,  # target
+                "ds": None,  # target
+                "std": None,  # target
+                "unkn": None,  # target
+            },
+            # source
+            "exp": {
+                "inf": None,  # target
+                "exp": None,  # target
+                "bcp": None,  # target
+                "ps": None,  # target
+                "ds": None,  # target
+                "std": None,  # target
+                "unkn": None,  # target
+            },
+            # source
+            "bcp": {
+                "inf": "Downref",  # target
+                "exp": "Downref",  # target
+                "bcp": None,  # target
+                "ps": None,  # target
+                "ds": None,  # target
+                "std": None,  # target
+                "unkn": "Possible Downref",  # target
+            },
+            # source
+            "ps": {
+                "inf": "Downref",  # target
+                "exp": "Downref",  # target
+                "bcp": None,  # target
+                "ps": None,  # target
+                "ds": None,  # target
+                "std": None,  # target
+                "unkn": "Possible Downref",  # target
+            },
+            # source
+            "ds": {
+                "inf": "Downref",  # target
+                "exp": "Downref",  # target
+                "bcp": None,  # target
+                "ps": "Downref",  # target
+                "ds": None,  # target
+                "std": None,  # target
+                "unkn": "Possible Downref",  # target
+            },
+            # source
+            "std": {
+                "inf": "Downref",  # target
+                "exp": "Downref",  # target
+                "bcp": None,  # target
+                "ps": "Downref",  # target
+                "ds": "Downref",  # target
+                "std": None,  # target
+                "unkn": "Possible Downref",  # target
+            },
+            # source
+            "unkn": {
+                "inf": None,  # target
+                "exp": None,  # target
+                "bcp": None,  # target
+                "ps": "Possible Downref",  # target
+                "ds": "Possible Downref",  # target
+                "std": None,  # target
+                "unkn": "Possible Downref",  # target
+            },
+        }
+
+        for rel in ["refnorm", "refinfo", "refunk", "refold"]:
+            for source, target in itertools.product(rfcs, rfcs):
+                ref = RelatedDocument.objects.create(
+                    source=source,
+                    target=target,
+                    relationship_id=rel,
+                )
+
+                result = ref.is_downref()
+
+                desired_result = (
+                    result_matrix[source.std_level_id][target.std_level_id]
+                    if ref.relationship.slug in ["refnorm", "refunk"]
+                    else None
+                )
+                if (
+                    ref.relationship.slug == "refunk"
+                    and desired_result is not None
+                    and not desired_result.startswith("Possible")
+                ):
+                    desired_result = f"Possible {desired_result}"
+
+                self.assertEqual(desired_result, result)
diff --git a/ietf/doc/tests_notprepped.py b/ietf/doc/tests_notprepped.py
new file mode 100644
index 0000000000..f417aa7931
--- /dev/null
+++ b/ietf/doc/tests_notprepped.py
@@ -0,0 +1,122 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from django.conf import settings
+from django.utils import timezone
+from django.urls import reverse as urlreverse
+
+from pyquery import PyQuery
+
+from ietf.doc.factories import WgRfcFactory
+from ietf.doc.models import StoredObject
+from ietf.doc.storage_utils import store_bytes
+from ietf.utils.test_utils import TestCase
+
+
+class NotpreppedRfcXmlTests(TestCase):
+    def test_editor_source_button_visibility(self):
+        pre_v3 = WgRfcFactory(rfc_number=settings.FIRST_V3_RFC - 1)
+        first_v3 = WgRfcFactory(rfc_number=settings.FIRST_V3_RFC)
+        post_v3 = WgRfcFactory(rfc_number=settings.FIRST_V3_RFC + 1)
+
+        for rfc, expect_button in [(pre_v3, False), (first_v3, True), (post_v3, True)]:
+            r = self.client.get(
+                urlreverse(
+                    "ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name)
+                )
+            )
+            self.assertEqual(r.status_code, 200)
+            buttons = PyQuery(r.content)('a.btn:contains("Get editor source")')
+            if expect_button:
+                self.assertEqual(len(buttons), 1, msg=f"rfc_number={rfc.rfc_number}")
+                expected_href = urlreverse(
+                    "ietf.doc.views_doc.rfcxml_notprepped_wrapper",
+                    kwargs=dict(number=rfc.rfc_number),
+                )
+                self.assertEqual(
+                    buttons.attr("href"),
+                    expected_href,
+                    msg=f"rfc_number={rfc.rfc_number}",
+                )
+            else:
+                self.assertEqual(len(buttons), 0, msg=f"rfc_number={rfc.rfc_number}")
+
+    def test_rfcxml_notprepped(self):
+        number = settings.FIRST_V3_RFC
+        stored_name = f"notprepped/rfc{number}.notprepped.xml"
+        url = f"/doc/rfc{number}/notprepped/"
+
+        # 404 for pre-v3 RFC numbers (no document needed)
+        r = self.client.get(f"/doc/rfc{number - 1}/notprepped/")
+        self.assertEqual(r.status_code, 404)
+
+        # 404 when no RFC document exists in the database
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
+        # 404 when RFC document exists but has no StoredObject
+        WgRfcFactory(rfc_number=number)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
+        # 404 when StoredObject exists but backing storage is missing (FileNotFoundError)
+        now = timezone.now()
+        StoredObject.objects.create(
+            store="rfc",
+            name=stored_name,
+            sha384="a" * 96,
+            len=0,
+            store_created=now,
+            created=now,
+            modified=now,
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
+        # 200 with correct content-type, attachment disposition, and body when object is fully stored
+        xml_content = b"<rfc>test</rfc>"
+        store_bytes("rfc", stored_name, xml_content, allow_overwrite=True)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r["Content-Type"], "application/xml")
+        self.assertEqual(
+            r["Content-Disposition"],
+            f'attachment; filename="rfc{number}.notprepped.xml"',
+        )
+        self.assertEqual(b"".join(r.streaming_content), xml_content)
+
+    def test_rfcxml_notprepped_wrapper(self):
+        number = settings.FIRST_V3_RFC
+
+        # 404 for pre-v3 RFC numbers (no document needed)
+        r = self.client.get(
+            urlreverse(
+                "ietf.doc.views_doc.rfcxml_notprepped_wrapper",
+                kwargs=dict(number=number - 1),
+            )
+        )
+        self.assertEqual(r.status_code, 404)
+
+        # 404 when no RFC document exists in the database
+        r = self.client.get(
+            urlreverse(
+                "ietf.doc.views_doc.rfcxml_notprepped_wrapper",
+                kwargs=dict(number=number),
+            )
+        )
+        self.assertEqual(r.status_code, 404)
+
+        # 200 with rendered template when RFC document exists
+        rfc = WgRfcFactory(rfc_number=number)
+        r = self.client.get(
+            urlreverse(
+                "ietf.doc.views_doc.rfcxml_notprepped_wrapper",
+                kwargs=dict(number=number),
+            )
+        )
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertIn(str(rfc.rfc_number), q("h1").text())
+        download_url = urlreverse(
+            "ietf.doc.views_doc.rfcxml_notprepped", kwargs=dict(number=number)
+        )
+        self.assertEqual(len(q(f'a.btn[href="{download_url}"]')), 1)
diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
index 7e902514d5..82d1b5c232 100644
--- a/ietf/doc/tests_review.py
+++ b/ietf/doc/tests_review.py
@@ -1,29 +1,31 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
+# Copyright The IETF Trust 2016-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-import datetime, os, shutil
+from pathlib import Path
+import datetime
 import io
-import tarfile, tempfile, mailbox
-import email.mime.multipart, email.mime.text, email.utils
+import os
+import shutil
 
-from mock import patch
+from unittest.mock import patch, Mock
 from requests import Response
 
-
 from django.apps import apps
 from django.urls import reverse as urlreverse
 from django.conf import settings
+from django.utils import timezone
 
 from pyquery import PyQuery
 
 import debug                            # pyflakes:ignore
 
+from ietf.doc.storage_utils import retrieve_str
 import ietf.review.mailarch
 
 from ietf.doc.factories import ( NewRevisionDocEventFactory, IndividualDraftFactory, WgDraftFactory,
                             WgRfcFactory, ReviewFactory, DocumentFactory)
-from ietf.doc.models import ( Document, DocumentAuthor, RelatedDocument, DocEvent, ReviewRequestDocEvent,
+from ietf.doc.models import ( DocumentAuthor, RelatedDocument, DocEvent, ReviewRequestDocEvent,
                             ReviewAssignmentDocEvent, )
 from ietf.group.factories import RoleFactory, ReviewTeamFactory
 from ietf.group.models import Group
@@ -38,6 +40,7 @@
 from ietf.utils.test_utils import login_testing_unauthorized, reload_db_objects
 from ietf.utils.test_utils import TestCase
 from ietf.utils.text import strip_prefix, xslugify
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 from django.utils.html import escape
 
 class ReviewTests(TestCase):
@@ -46,6 +49,7 @@ def setUp(self):
         self.review_dir = self.tempdir('review')
         self.old_document_path_pattern = settings.DOCUMENT_PATH_PATTERN
         settings.DOCUMENT_PATH_PATTERN = self.review_dir + "/{doc.type_id}/"
+        (Path(settings.FTP_DIR) / "review").mkdir()
 
         self.review_subdir = os.path.join(self.review_dir, "review")
         if not os.path.exists(self.review_subdir):
@@ -56,6 +60,17 @@ def tearDown(self):
         settings.DOCUMENT_PATH_PATTERN = self.old_document_path_pattern
         super().tearDown()
 
+    def verify_review_files_were_written(self, assignment, expected_content = "This is a review\nwith two lines"):
+        review_file = Path(self.review_subdir) / f"{assignment.review.name}.txt"
+        content = review_file.read_text()
+        self.assertEqual(content, expected_content)
+        self.assertEqual(
+            retrieve_str("review", review_file.name),
+            expected_content
+        )
+        review_ftp_file = Path(settings.FTP_DIR) / "review" / review_file.name
+        self.assertTrue(review_file.samefile(review_ftp_file))
+
     def test_request_review(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
         NewRevisionDocEventFactory(doc=doc,rev='01')
@@ -67,7 +82,7 @@ def test_request_review(self):
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
         RoleFactory(group=review_team3,person__user__username='reviewsecretary3',person__user__email='reviewsecretary3@example.com',name_id='secr')
 
-        req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         ReviewAssignmentFactory(review_request = req, reviewer = rev_role.person.email_set.first(), state_id='accepted')
 
         url = urlreverse('ietf.doc.views_review.request_review', kwargs={ "name": doc.name })
@@ -77,7 +92,7 @@ def test_request_review(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        deadline = datetime.date.today() + datetime.timedelta(days=10)
+        deadline = date_today() + datetime.timedelta(days=10)
 
         empty_outbox()
 
@@ -136,24 +151,32 @@ def test_request_review_of_rfc(self):
         url = urlreverse('ietf.doc.views_review.request_review', kwargs={ "name": doc.name })
         login_testing_unauthorized(self, "ad", url)
 
-        # get should fail
+        # get should fail - all non draft types 404
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
+        # Can only request reviews on active draft documents
+        doc = WgDraftFactory(states=[("draft","rfc")])
+        url = urlreverse('ietf.doc.views_review.request_review', kwargs={ "name": doc.name })
         r = self.client.get(url)
         self.assertEqual(r.status_code, 403)
 
+
+
     def test_doc_page(self):
 
         doc = WgDraftFactory(group__acronym='mars',rev='01')
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         ReviewAssignmentFactory(review_request=review_req, reviewer=rev_role.person.email_set.first(), state_id='accepted')
 
         # move the review request to a doubly-replaced document to
         # check we can fish it out
         old_doc = WgDraftFactory(name="draft-foo-mars-test")
         older_doc = WgDraftFactory(name="draft-older")
-        RelatedDocument.objects.create(source=old_doc, target=older_doc.docalias.first(), relationship_id='replaces')
-        RelatedDocument.objects.create(source=doc, target=old_doc.docalias.first(), relationship_id='replaces')
+        RelatedDocument.objects.create(source=old_doc, target=older_doc, relationship_id='replaces')
+        RelatedDocument.objects.create(source=doc, target=old_doc, relationship_id='replaces')
         review_req.doc = older_doc
         review_req.save()
 
@@ -166,7 +189,7 @@ def test_review_request(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01', authors=[author])
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         ReviewAssignmentFactory(review_request = review_req, reviewer = rev_role.person.email_set.first(), state_id='accepted')
 
         url = urlreverse('ietf.doc.views_review.review_request', kwargs={ "name": doc.name, "request_id": review_req.pk })
@@ -195,7 +218,7 @@ def test_close_request(self):
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
         RoleFactory(group=review_team,person__user__username='reviewsecretary2',person__user__email='reviewsecretary2@example.com',name_id='secr')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         ReviewAssignmentFactory(review_request=review_req, state_id='accepted', reviewer=rev_role.person.email_set.first())
 
         close_url = urlreverse('ietf.doc.views_review.close_request', kwargs={ "name": doc.name, "request_id": review_req.pk })
@@ -260,14 +283,14 @@ def test_assign_reviewer(self):
 
         # previous review
         req = ReviewRequestFactory(
-            time=datetime.datetime.now() - datetime.timedelta(days=100),
+            time=timezone.now() - datetime.timedelta(days=100),
             requested_by=Person.objects.get(name="(System)"),
             doc=doc,
             type_id='early',
             team=review_req.team,
             state_id='assigned',
             requested_rev="01",
-            deadline=datetime.date.today() - datetime.timedelta(days=80),
+            deadline=date_today() - datetime.timedelta(days=80),
         )
         ReviewAssignmentFactory(
             review_request = req,
@@ -344,6 +367,52 @@ def test_assign_reviewer(self):
         self.assertIn("This team has completed other reviews", message)
         self.assertIn("{} -01 Serious Issues".format(reviewer_email.person.ascii), message)
 
+        # check events
+        assignment_events = assignment.reviewassignmentdocevent_set.all()
+        self.assertEqual(assignment_events.count(), 1)
+        e = assignment_events.first()
+        self.assertEqual(e.type, 'assigned_review_request')
+        self.assertIn('is assigned', e.desc)
+        self.assertEqual(e.doc, doc)
+        request_events = review_req.reviewrequestdocevent_set.all()
+        self.assertEqual(request_events.count(), 0)
+
+    def test_assign_reviewer_after_reject(self):
+        doc = WgDraftFactory()
+        review_team = ReviewTeamFactory()
+        rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
+        reviewer_email = Email.objects.get(person__user__username="reviewer")
+        RoleFactory(group=review_team,person__user__username='reviewsecretary',name_id='secr')
+        review_req = ReviewRequestFactory(team=review_team,doc=doc)
+        ReviewAssignmentFactory(review_request=review_req, state_id='rejected', reviewer=rev_role.person.email_set.first())
+
+        url = urlreverse('ietf.doc.views_review.assign_reviewer', kwargs={ "name": doc.name, "request_id": review_req.pk })
+        login_testing_unauthorized(self, "reviewsecretary", url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        reviewer_label = q("option[value=\"{}\"]".format(reviewer_email.address)).text().lower()
+        self.assertIn("rejected review of document before", reviewer_label)
+
+    def test_assign_reviewer_after_withdraw(self):
+        doc = WgDraftFactory()
+        review_team = ReviewTeamFactory()
+        rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
+        RoleFactory(group=review_team,person__user__username='reviewsecretary',name_id='secr')
+        review_req = ReviewRequestFactory(team=review_team,doc=doc)
+        reviewer = rev_role.person.email_set.first()
+        ReviewAssignmentFactory(review_request=review_req, state_id='withdrawn', reviewer=reviewer)
+        req_url = urlreverse('ietf.doc.views_review.review_request', kwargs={ "name": doc.name, "request_id": review_req.pk })
+        assign_url = urlreverse('ietf.doc.views_review.assign_reviewer', kwargs={ "name": doc.name, "request_id": review_req.pk })
+
+        login_testing_unauthorized(self, "reviewsecretary", assign_url)
+        r = self.client.post(assign_url, { "action": "assign", "reviewer": reviewer.pk })
+        self.assertRedirects(r, req_url)
+        review_req = reload_db_objects(review_req)
+        assignment = review_req.reviewassignment_set.last()
+        self.assertEqual(assignment.state, ReviewAssignmentStateName.objects.get(slug='assigned'))
+        self.assertEqual(review_req.state, ReviewRequestStateName.objects.get(slug='assigned'))
+
     def test_previously_reviewed_replaced_doc(self):
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',person__name='Some Reviewer',name_id='reviewer')
@@ -372,7 +441,7 @@ def test_accept_reviewer_assignment(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         assignment = ReviewAssignmentFactory(review_request=review_req, state_id='assigned', reviewer=rev_role.person.email_set.first())
 
         url = urlreverse('ietf.doc.views_review.review_request', kwargs={ "name": doc.name, "request_id": review_req.pk })
@@ -395,7 +464,7 @@ def test_reject_reviewer_assignment(self):
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         assignment = ReviewAssignmentFactory(review_request = review_req, reviewer=rev_role.person.email_set.first(), state_id='accepted')
 
         reject_url = urlreverse('ietf.doc.views_review.reject_reviewer_assignment', kwargs={ "name": doc.name, "assignment_id": assignment.pk })
@@ -407,13 +476,54 @@ def test_reject_reviewer_assignment(self):
         r = self.client.get(req_url)
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, reject_url)
+
+        # anonymous user should not be able to reject
         self.client.logout()
+        r = self.client.post(reject_url, { "action": "reject", "message_to_secretary": "Test message" })
+        self.assertEqual(r.status_code, 302)  # forwards to login page
+        assignment = reload_db_objects(assignment)
+        self.assertEqual(assignment.state_id, "accepted")
+
+        # unrelated person should not be able to reject
+        other_person = PersonFactory()
+        login_testing_unauthorized(self, other_person.user.username, reject_url)
+        r = self.client.post(reject_url, { "action": "reject", "message_to_secretary": "Test message" })
+        self.assertEqual(r.status_code, 403)
+        assignment = reload_db_objects(assignment)
+        self.assertEqual(assignment.state_id, "accepted")
 
-        # get reject page
+        # Check that user can reject it
+        login_testing_unauthorized(self, assignment.reviewer.person.user.username, reject_url)
+        r = self.client.get(reject_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, escape(assignment.reviewer.person.name))
+        self.assertNotContains(r, 'can not be rejected')
+        self.assertContains(r, '<button type="submit"')
+
+        # reject
+        empty_outbox()
+        r = self.client.post(reject_url, { "action": "reject", "message_to_secretary": "Test message" })
+        self.assertEqual(r.status_code, 302)
+
+        assignment = reload_db_objects(assignment)
+        self.assertEqual(assignment.state_id, "rejected")
+        self.assertNotEqual(assignment.completed_on,None)
+        e = doc.latest_event()
+        self.assertEqual(e.type, "closed_review_assignment")
+        self.assertTrue("rejected" in e.desc)
+        self.assertEqual(len(outbox), 1)
+        self.assertNotIn(assignment.reviewer.address, outbox[0]["To"])
+        self.assertIn("<reviewsecretary@example.com>", outbox[0]["To"])
+        self.assertTrue("Test message" in get_payload_text(outbox[0]))
+        self.client.logout()
+
+        # Secretary can also reject it
+        assignment.state_id = 'assigned'
+        assignment.save()
         login_testing_unauthorized(self, "reviewsecretary", reject_url)
         r = self.client.get(reject_url)
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, assignment.reviewer.person.name)
+        self.assertContains(r, escape(assignment.reviewer.person.name))
         self.assertNotContains(r, 'can not be rejected')
         self.assertContains(r, '<button type="submit"')
 
@@ -433,15 +543,20 @@ def test_reject_reviewer_assignment(self):
         self.assertNotIn("<reviewsecretary@example.com>", outbox[0]["To"])
         self.assertTrue("Test message" in get_payload_text(outbox[0]))
 
-        # try again, but now with an expired review request, which should not be allowed (#2277)
+        # try again, but now with an expired review request,
+        # which should not be allowed (#2277)
         assignment.state_id = 'assigned'
         assignment.save()
         review_req.deadline = datetime.date(2019, 1, 1)
         review_req.save()
+        self.client.logout()
         
+        # Login as reviewer to do this test, so it should fail, as the
+        # request is past deadline
+        login_testing_unauthorized(self, assignment.reviewer.person.user.username, reject_url)
         r = self.client.get(reject_url)
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, assignment.reviewer.person.name)
+        self.assertContains(r, escape(assignment.reviewer.person.name))
         self.assertContains(r, 'can not be rejected')
         self.assertNotContains(r, '<button type="submit"')
 
@@ -450,115 +565,217 @@ def test_reject_reviewer_assignment(self):
         r = self.client.post(reject_url, { "action": "reject", "message_to_secretary": "Test message" })
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'can not be rejected')
+        self.client.logout()
+
+        # Change settings so that even the reviewer should
+        # be allowed to reject the request even after past deadline
+        m = apps.get_model('review', 'ReviewTeamSettings')
+        for row in m.objects.all():
+            if row.group.upcase_acronym == review_team.upcase_acronym:
+               row.allow_reviewer_to_reject_after_deadline = True
+               row.save(update_fields=['allow_reviewer_to_reject_after_deadline'])
+
+        # Test again as user
+        login_testing_unauthorized(self, assignment.reviewer.person.user.username, reject_url)
+        r = self.client.get(reject_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, escape(assignment.reviewer.person.name))
+        self.assertNotContains(r, 'can not be rejected')
+        self.assertContains(r, '<button type="submit"')
+
+        # actually reject
+        r = self.client.post(reject_url, { "action": "reject", "message_to_secretary": "Test message" })
+        self.assertEqual(r.status_code, 302)
 
         assignment = reload_db_objects(assignment)
-        self.assertEqual(assignment.state_id, "assigned")
-        self.assertEqual(len(outbox), 0)
+        self.assertEqual(assignment.state_id, "rejected")
+        self.assertNotEqual(len(outbox), 0)
+        self.client.logout()
 
-    def make_test_mbox_tarball(self, review_req):
-        mbox_path = os.path.join(self.review_dir, "testmbox.tar.gz")
-        with tarfile.open(mbox_path, "w:gz") as tar:
-            with tempfile.NamedTemporaryFile(dir=self.review_dir, suffix=".mbox") as tmp:
-                mbox = mailbox.mbox(tmp.name)
+        # Log in as secretary and that should still allow rejecting the review
+        assignment.state_id = 'assigned'
+        assignment.save()
+        login_testing_unauthorized(self, "reviewsecretary", reject_url)
+        r = self.client.get(reject_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, escape(assignment.reviewer.person.name))
+        self.assertNotContains(r, 'can not be rejected')
+        self.assertContains(r, '<button type="submit"')
 
-                # plain text
-                msg = email.mime.text.MIMEText("Hello,\n\nI have reviewed the document and did not find any problems.\n\nJohn Doe")
-                msg["From"] = "John Doe <johndoe@example.com>"
-                msg["To"] = review_req.team.list_email
-                msg["Subject"] = "Review of {}-01".format(review_req.doc.name)
-                msg["Message-ID"] = email.utils.make_msgid()
-                msg["Archived-At"] = "<https://www.example.com/testmessage>"
-                msg["Date"] = email.utils.formatdate()
+        # actually reject
+        empty_outbox()
+        r = self.client.post(reject_url, { "action": "reject", "message_to_secretary": "Test message" })
+        self.assertEqual(r.status_code, 302)
 
-                mbox.add(msg)
+        assignment = reload_db_objects(assignment)
+        self.assertEqual(assignment.state_id, "rejected")
+        self.assertNotEqual(len(outbox), 0)
 
-                # plain text + HTML
-                msg = email.mime.multipart.MIMEMultipart('alternative')
-                msg["From"] = "John Doe II <johndoe2@example.com>"
-                msg["To"] = review_req.team.list_email
-                msg["Subject"] = "Review of {}".format(review_req.doc.name)
-                msg["Message-ID"] = email.utils.make_msgid()
-                msg["Archived-At"] = "<https://www.example.com/testmessage2>"
+        # Revert the setting of allow_reviewer_to_reject_after_deadline
+        # This should not affect the secretary's ability to reject.
+        m = apps.get_model('review', 'ReviewTeamSettings')
+        for row in m.objects.all():
+            if row.group.upcase_acronym == review_team.upcase_acronym:
+               row.allow_reviewer_to_reject_after_deadline = False
+               row.save(update_fields=['allow_reviewer_to_reject_after_deadline'])
+        assignment.state_id = 'assigned'
+        assignment.save()
+        r = self.client.get(reject_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, escape(assignment.reviewer.person.name))
+        self.assertNotContains(r, 'can not be rejected')
+        self.assertContains(r, '<button type="submit"')
 
-                msg.attach(email.mime.text.MIMEText("Hi!,\r\nLooks OK!\r\n-John", "plain"))
-                msg.attach(email.mime.text.MIMEText("<html><body><p>Hi!,</p><p>Looks OK!</p><p>-John</p></body></html>", "html"))
-                mbox.add(msg)
 
-                tmp.flush()
+    def test_accept_reviewer_assignment_after_reject(self):
+        doc = WgDraftFactory()
+        review_team = ReviewTeamFactory()
+        rev_role = RoleFactory(group=review_team,name_id='reviewer')
+        review_req = ReviewRequestFactory(doc=doc,team=review_team)
+        assignment = ReviewAssignmentFactory(review_request=review_req, state_id='rejected', reviewer=rev_role.person.email_set.first())
 
-                tar.add(os.path.relpath(tmp.name))
+        url = urlreverse('ietf.doc.views_review.review_request', kwargs={ "name": doc.name, "request_id": review_req.pk })
+        username = assignment.reviewer.person.user.username
+        self.client.login(username=username, password=username + "+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        d = q('.reviewer-assignment-not-accepted')
+        self.assertTrue(d("[name=action][value=accept]"))
 
-        return mbox_path
+        # accept
+        r = self.client.post(url, { "action": "accept" })
+        self.assertEqual(r.status_code, 302)
 
-    def test_search_mail_archive(self):
-        doc = WgDraftFactory(group__acronym='mars',rev='01')
+        assignment = reload_db_objects(assignment)
+        self.assertEqual(assignment.state_id, "accepted")
+
+    @patch('ietf.review.mailarch.requests.post')
+    def test_retrieve_messages(self, mock_post):
+        mock_data = {
+            "results": [
+                {
+                    "from": "Alice <alice@example.com>",
+                    "subject": "Hello",
+                    "content": "Hi\n This is a really good document.\n",
+                    "message_id": "abc123",
+                    "url": "https://example.com/message",
+                    "date": "2025-04-07T12:00:00",
+                }
+            ]
+        }
+        mock_post.return_value.json.return_value = mock_data
+
+        doc = WgDraftFactory(group__acronym='mars', rev='01')
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
-        rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
-        RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        rev_role = RoleFactory(group=review_team, person__user__username='reviewer', person__user__email='reviewer@example.com', name_id='reviewer')
+        RoleFactory(group=review_team, person__user__username='reviewsecretary', person__user__email='reviewsecretary@example.com', name_id='secr')
+        review_req = ReviewRequestFactory(doc=doc, team=review_team, type_id='early', state_id='assigned', requested_by=rev_role.person, deadline=timezone.now() + datetime.timedelta(days=20))
+        ReviewAssignmentFactory(review_request=review_req, reviewer=rev_role.person.email_set.first(), state_id='accepted')
+
+        query_data = ietf.review.mailarch.construct_query_data(doc, review_team, query=None)
+        response = ietf.review.mailarch.retrieve_messages(query_data)
+
+        self.assertEqual(len(response), 1)
+        self.assertEqual(response[0]['from'], 'Alice <alice@example.com>')
+        self.assertEqual(response[0]['splitfrom'], ('Alice', 'alice@example.com'))
+        self.assertEqual(response[0]['subject'], 'Hello')
+        self.assertEqual(response[0]['content'], 'Hi\n This is a really good document.')
+        self.assertEqual(response[0]['message_id'], 'abc123')
+        self.assertEqual(response[0]['url'], 'https://example.com/message')
+        self.assertEqual(response[0]['utcdate'], ('2025-04-07', '12:00:00'))
+
+    def test_construct_query_data(self):
+        doc = WgDraftFactory(group__acronym='mars', rev='01')
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        data = ietf.review.mailarch.construct_query_data(doc, review_team, query=None)
+        self.assertEqual(data['start_date'], (date_today() - datetime.timedelta(days=180)).isoformat())
+        self.assertEqual(data['email_list'], 'reviewteam')
+        self.assertEqual(data['query_value'], doc.name)
+        self.assertEqual(data['query'], f'subject:({doc.name})')
+        self.assertEqual(data['limit'], '30')
+
+    @patch('ietf.doc.views_review.requests.post')
+    def test_search_mail_archive(self, mock_post):
+        doc = WgDraftFactory(group__acronym='mars', rev='01')
+        review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
+        rev_role = RoleFactory(group=review_team, person__user__username='reviewer', person__user__email='reviewer@example.com', name_id='reviewer')
+        RoleFactory(group=review_team, person__user__username='reviewsecretary', person__user__email='reviewsecretary@example.com', name_id='secr')
+        review_req = ReviewRequestFactory(doc=doc, team=review_team, type_id='early', state_id='assigned', requested_by=rev_role.person, deadline=timezone.now() + datetime.timedelta(days=20))
         assignment = ReviewAssignmentFactory(review_request=review_req, reviewer=rev_role.person.email_set.first(), state_id='accepted')
 
+        mock_data = {
+            "results": [
+                {
+                    "from": "Alice <alice@example.com>",
+                    "subject": "Review of {}-01".format(review_req.doc.name),
+                    "content": "Hi\n This is a really good document.\n",
+                    "message_id": "abc123",
+                    "url": "https://example.com/message",
+                    "date": "2025-04-07T12:00:00",
+                },
+                {
+                    "from": "Joe <joe@example.com>",
+                    "subject": "Review of {}".format(review_req.doc.name),
+                    "content": "Hi\n I believe this is the best document.\n",
+                    "message_id": "abc456",
+                    "url": "https://example.com/message",
+                    "date": "2025-04-07T12:00:00",
+                }
+            ]
+        }
+        response1 = Mock()
+        response1.json.return_value = mock_data
+
+        response2 = Mock()
+        response2.json.return_value = mock_data
+
+        response3 = Mock()
+        response3.json.return_value = {"results": []}
+
+        mock_post.side_effect = [response1, response2, response3]
+
         # test URL construction
-        query_urls = ietf.review.mailarch.construct_query_urls(doc, review_team)
-        self.assertTrue(review_req.doc.name in query_urls["query_data_url"])
+        query_data = ietf.review.mailarch.construct_query_data(doc, review_team)
+        self.assertTrue(review_req.doc.name in query_data["query_value"])
 
-        # test parsing
-        mbox_path = self.make_test_mbox_tarball(review_req)
+        url = urlreverse('ietf.doc.views_review.search_mail_archive', kwargs={"name": doc.name, "assignment_id": assignment.pk})
+        url2 = urlreverse('ietf.doc.views_review.search_mail_archive', kwargs={"name": doc.name, "acronym": review_team.acronym})
+        login_testing_unauthorized(self, "reviewsecretary", url)
 
-        try:
-            # mock URL generator and point it to local file - for this
-            # to work, the module (and not the function) must be
-            # imported in the view
-            real_fn = ietf.review.mailarch.construct_query_urls
-            ietf.review.mailarch.construct_query_urls = lambda doc, team, query=None: { "query_data_url": "file://" + os.path.abspath(mbox_path) }
-            url = urlreverse('ietf.doc.views_review.search_mail_archive', kwargs={ "name": doc.name, "assignment_id": assignment.pk })
-            url2 = urlreverse('ietf.doc.views_review.search_mail_archive', kwargs={ "name": doc.name, "acronym": review_team.acronym })
-            login_testing_unauthorized(self, "reviewsecretary", url)
-
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            messages = r.json()["messages"]
-            self.assertEqual(len(messages), 2)
-
-            r = self.client.get(url2)
-            self.assertEqual(r.status_code, 200)
-            messages = r.json()["messages"]
-            self.assertEqual(len(messages), 2)
-
-            today = datetime.date.today()
-
-            self.assertEqual(messages[0]["url"], "https://www.example.com/testmessage")
-            self.assertTrue("John Doe" in messages[0]["content"])
-            self.assertEqual(messages[0]["subject"], "Review of {}-01".format(review_req.doc.name))
-            self.assertEqual(messages[0]["revision_guess"], "01")
-            self.assertEqual(messages[0]["splitfrom"], ["John Doe", "johndoe@example.com"])
-            self.assertEqual(messages[0]["utcdate"][0], today.isoformat())
-
-            self.assertEqual(messages[1]["url"], "https://www.example.com/testmessage2")
-            self.assertTrue("Looks OK" in messages[1]["content"])
-            self.assertTrue("<html>" not in messages[1]["content"])
-            self.assertEqual(messages[1]["subject"], "Review of {}".format(review_req.doc.name))
-            self.assertFalse('revision_guess' in messages[1])
-            self.assertEqual(messages[1]["splitfrom"], ["John Doe II", "johndoe2@example.com"])
-            self.assertEqual(messages[1]["utcdate"][0], "")
-
-
-            # Test failure to return mailarch results
-            no_result_path = os.path.join(self.review_dir, "mailarch_no_result.html")
-            with io.open(no_result_path, "w") as f:
-                f.write('Content-Type: text/html\n\n<html><body><div class="xtr"><div class="xtd no-results">No results found</div></div>')
-            ietf.review.mailarch.construct_query_urls = lambda doc, team, query=None: { "query_data_url": "file://" + os.path.abspath(no_result_path) }
-
-            url = urlreverse('ietf.doc.views_review.search_mail_archive', kwargs={ "name": doc.name, "assignment_id": assignment.pk })
-
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            result = r.json()
-            self.assertNotIn('messages', result)
-            self.assertIn('No results found', result['error'])
-
-        finally:
-            ietf.review.mailarch.construct_query_urls = real_fn
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        messages = r.json()["messages"]
+        self.assertEqual(len(messages), 2)
+
+        r = self.client.get(url2)
+        self.assertEqual(r.status_code, 200)
+        messages = r.json()["messages"]
+        self.assertEqual(len(messages), 2)
+
+        self.assertEqual(messages[0]["url"], "https://example.com/message")
+        self.assertTrue("Hi" in messages[0]["content"])
+        self.assertEqual(messages[0]["subject"], "Review of {}-01".format(review_req.doc.name))
+        self.assertEqual(messages[0]["revision_guess"], "01")
+        self.assertEqual(messages[0]["splitfrom"], ["Alice", "alice@example.com"])
+        self.assertEqual(messages[0]["utcdate"], ['2025-04-07', '12:00:00'])
+
+        self.assertEqual(messages[1]["url"], "https://example.com/message")
+        self.assertTrue("Hi" in messages[1]["content"])
+        self.assertTrue("<html>" not in messages[1]["content"])
+        self.assertEqual(messages[1]["subject"], "Review of {}".format(review_req.doc.name))
+        self.assertFalse('revision_guess' in messages[1])
+        self.assertEqual(messages[1]["splitfrom"], ["Joe", "joe@example.com"])
+        self.assertEqual(messages[1]["utcdate"], ['2025-04-07', '12:00:00'])
+
+        # Test failure to return mailarch results
+        url = urlreverse('ietf.doc.views_review.search_mail_archive', kwargs={"name": doc.name, "assignment_id": assignment.pk})
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        result = r.json()
+        self.assertNotIn('messages', result)
+        self.assertIn('No results found', result['error'])
 
     def test_submit_unsolicited_review_choose_team(self):
         doc = WgDraftFactory(group__acronym='mars', rev='01')
@@ -587,12 +804,12 @@ def setup_complete_review_test(self):
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         assignment = ReviewAssignmentFactory(review_request=review_req, state_id='accepted', reviewer=rev_role.person.email_set.first())
         for r in ReviewResultName.objects.filter(slug__in=("issues", "ready")):
             review_req.team.reviewteamsettings.review_results.add(r)
 
-        url = urlreverse('ietf.doc.views_review.complete_review', kwargs={ "name": doc.name, "assignment_id": review_req.pk })
+        url = urlreverse('ietf.doc.views_review.complete_review', kwargs={ "name": doc.name, "assignment_id": assignment.pk })
 
         return assignment, url
 
@@ -605,7 +822,7 @@ def test_complete_review_upload_content(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, assignment.review_request.team.list_email)
-        for author in assignment.review_request.doc.authors():
+        for author in assignment.review_request.doc.author_persons():
             self.assertContains(r, author.formatted_email())
 
         # faulty post
@@ -647,8 +864,7 @@ def test_complete_review_upload_content(self):
         self.assertTrue(assignment.review_request.team.acronym.lower() in assignment.review.name)
         self.assertTrue(assignment.review_request.doc.rev in assignment.review.name)
 
-        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
-            self.assertEqual(f.read(), "This is a review\nwith two lines")
+        self.verify_review_files_were_written(assignment)
 
         self.assertEqual(len(outbox), 1)
         self.assertIn(assignment.review_request.team.list_email, outbox[0]["To"])
@@ -699,15 +915,17 @@ def test_complete_review_enter_content(self):
         assignment = reload_db_objects(assignment)
         self.assertEqual(assignment.state_id, "completed")
         # Completed time should be close to now, but will not be exactly, so check within 10s margin
-        completed_time_diff = datetime.datetime.now() - assignment.completed_on
+        completed_time_diff = timezone.now() - assignment.completed_on
         self.assertLess(completed_time_diff, datetime.timedelta(seconds=10))
 
-        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
-            self.assertEqual(f.read(), "This is a review\nwith two lines")
+        self.verify_review_files_were_written(assignment)
 
         self.assertEqual(len(outbox), 1)
         self.assertIn(assignment.review_request.team.list_email, outbox[0]["To"])
-        self.assertIn("This is a review", get_payload_text(outbox[0]))
+        payload = get_payload_text(outbox[0])
+        self.assertIn("This is a review", payload)
+        self.assertIn(f"Document: {assignment.review_request.doc.name}", payload)
+        self.assertIn(f"Title: {assignment.review_request.doc.title}", payload)
 
         self.assertIn(settings.MAILING_LIST_ARCHIVE_URL, assignment.review.external_url)
 
@@ -733,18 +951,17 @@ def test_complete_review_enter_content_by_secretary(self):
         # The secretary is allowed to set a custom completion date (#2590)
         assignment = reload_db_objects(assignment)
         self.assertEqual(assignment.state_id, "completed")
-        self.assertEqual(assignment.completed_on, datetime.datetime(2012, 12, 24, 12, 13, 14))
+        self.assertEqual(assignment.completed_on, datetime.datetime(2012, 12, 24, 12, 13, 14, tzinfo=DEADLINE_TZINFO))
 
         # There should be two events:
         # - the event logging when the change when it was entered, i.e. very close to now.
         # - the completion of the review, set to the provided date/time
         events = ReviewAssignmentDocEvent.objects.filter(doc=assignment.review_request.doc).order_by('-time')
-        event0_time_diff = datetime.datetime.now() - events[0].time
+        event0_time_diff = timezone.now() - events[0].time
         self.assertLess(event0_time_diff, datetime.timedelta(seconds=10))
-        self.assertEqual(events[1].time, datetime.datetime(2012, 12, 24, 12, 13, 14))
+        self.assertEqual(events[1].time, datetime.datetime(2012, 12, 24, 12, 13, 14, tzinfo=DEADLINE_TZINFO))
         
-        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
-            self.assertEqual(f.read(), "This is a review\nwith two lines")
+        self.verify_review_files_were_written(assignment)
 
         self.assertEqual(len(outbox), 1)
         self.assertIn(assignment.review_request.team.list_email, outbox[0]["To"])
@@ -830,8 +1047,7 @@ def test_complete_review_link_to_mailing_list(self, mock):
         assignment = reload_db_objects(assignment)
         self.assertEqual(assignment.state_id, "completed")
 
-        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
-            self.assertEqual(f.read(), "This is a review\nwith two lines")
+        self.verify_review_files_were_written(assignment)
 
         self.assertEqual(len(outbox), 0)
         self.assertTrue("http://example.com" in assignment.review.external_url)
@@ -880,8 +1096,7 @@ def test_complete_unsolicited_review_link_to_mailing_list_by_secretary(self, moc
         self.assertEqual(assignment.reviewer, rev_role.person.role_email('reviewer'))
         self.assertEqual(assignment.state_id, "completed")
 
-        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
-            self.assertEqual(f.read(), "This is a review\nwith two lines")
+        self.verify_review_files_were_written(assignment)
 
         self.assertEqual(len(outbox), 0)
         self.assertTrue("http://example.com" in assignment.review.external_url)
@@ -898,10 +1113,11 @@ def test_double_submit_review(self):
             assignment.review_request.team.acronym, 
             assignment.review_request.type.slug,
             xslugify(assignment.reviewer.person.ascii_parts()[3]),
-            datetime.date.today().isoformat(),
+            date_today().isoformat(),
         ]
         review_name = "-".join(c for c in name_components if c).lower()
-        Document.objects.create(name=review_name,type_id='review',group=assignment.review_request.team)
+
+        ReviewFactory(name=review_name,type_id='review',group=assignment.review_request.team)
 
         r = self.client.post(url, data={
             "result": ReviewResultName.objects.get(reviewteamsettings_review_results_set__group=assignment.review_request.team, slug="ready").pk,
@@ -917,10 +1133,9 @@ def test_double_submit_review(self):
         })
         self.assertEqual(r.status_code, 302)
         r2 = self.client.get(r.url)
-        # FIXME-LARS: this fails when the tests are run with --debug-mode, i.e., DEBUG is set:
-        if not settings.DEBUG:
-            self.assertEqual(len(r2.context['messages']),1)
-            self.assertIn('Attempt to save review failed', list(r2.context['messages'])[0].message)
+        self.assertEqual(r2.status_code, 200)
+        self.assertEqual(len(r2.context['messages']),1)
+        self.assertIn('Attempt to save review failed', list(r2.context['messages'])[0].message)
 
     def test_partially_complete_review(self):
         assignment, url = self.setup_complete_review_test()
@@ -985,12 +1200,13 @@ def test_revise_review_enter_content(self):
         self.assertEqual(assignment.state_id, "completed")
         # The revision event time should be the date the revision was submitted, i.e. not backdated
         event1 = assignment.review_request.doc.latest_event(ReviewAssignmentDocEvent)
-        event_time_diff = datetime.datetime.now() - event1.time
+        event_time_diff = timezone.now() - event1.time
         self.assertLess(event_time_diff, datetime.timedelta(seconds=10))
         self.assertTrue('revised' in event1.desc.lower())
 
-        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
-            self.assertEqual(f.read(), "This is a review\nwith two lines")
+        # See https://github.com/ietf-tools/datatracker/issues/6941
+        # These are _not_ getting written as a new version as intended.
+        self.verify_review_files_were_written(assignment)
 
         self.assertEqual(len(outbox), 0)
 
@@ -1012,11 +1228,13 @@ def test_revise_review_enter_content(self):
         assignment = reload_db_objects(assignment)
         self.assertEqual(assignment.review.rev, "01")
         event2 = assignment.review_request.doc.latest_event(ReviewAssignmentDocEvent)
-        event_time_diff = datetime.datetime.now() - event2.time
+        event_time_diff = timezone.now() - event2.time
         self.assertLess(event_time_diff, datetime.timedelta(seconds=10))
         # Ensure that a new event was created for the new revision (#2590)
         self.assertNotEqual(event1.id, event2.id)
 
+        self.verify_review_files_were_written(assignment, "This is a revised review")
+
         self.assertEqual(len(outbox), 0)
         
     def test_edit_comment(self):
@@ -1024,7 +1242,7 @@ def test_edit_comment(self):
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='assigned',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         ReviewAssignmentFactory(review_request = review_req, reviewer = rev_role.person.email_set.first(), state_id='accepted')
 
         url = urlreverse('ietf.doc.views_review.edit_comment', kwargs={ "name": doc.name, "request_id": review_req.pk })
@@ -1046,7 +1264,7 @@ def test_edit_deadline(self):
         review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
         rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',name_id='reviewer')
         RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr')
-        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,deadline=datetime.datetime.now()+datetime.timedelta(days=20))
+        review_req = ReviewRequestFactory(doc=doc,team=review_team,type_id='early',state_id='accepted',requested_by=rev_role.person,deadline=timezone.now()+datetime.timedelta(days=20))
         ReviewAssignmentFactory(review_request = review_req, reviewer = rev_role.person.email_set.first(), state_id='accepted')
 
         url = urlreverse('ietf.doc.views_review.edit_deadline', kwargs={ "name": doc.name, "request_id": review_req.pk })
@@ -1153,4 +1371,4 @@ def test_review_wishes_remove(self):
         ReviewWish.objects.create(person=reviewer, doc=doc, team=team)
         r = self.client.post(url + '?next=http://example.com')
         self.assertRedirects(r, doc.get_absolute_url(), fetch_redirect_response=False)
-        self.assertFalse(ReviewWish.objects.all())
\ No newline at end of file
+        self.assertFalse(ReviewWish.objects.all())
diff --git a/ietf/doc/tests_rsab_ballot.py b/ietf/doc/tests_rsab_ballot.py
new file mode 100644
index 0000000000..9086106ba9
--- /dev/null
+++ b/ietf/doc/tests_rsab_ballot.py
@@ -0,0 +1,574 @@
+# Copyright The IETF Trust 2022, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+# import datetime
+# from pyquery import PyQuery
+
+import debug  # pyflakes:ignore
+
+from django.urls import reverse as urlreverse
+
+from ietf.utils.mail import outbox, empty_outbox, get_payload_text
+from ietf.utils.test_utils import TestCase, unicontent, login_testing_unauthorized
+from ietf.doc.factories import (
+    EditorialDraftFactory,
+    EditorialRfcFactory,
+    IndividualDraftFactory,
+    WgDraftFactory,
+    RgDraftFactory,
+    BallotDocEventFactory,
+    IRSGBallotDocEventFactory,
+    BallotPositionDocEventFactory,
+)
+from ietf.doc.models import BallotPositionDocEvent
+from ietf.doc.utils import create_ballot_if_not_open, close_ballot
+from ietf.person.utils import get_active_rsab, get_active_ads, get_active_irsg
+from ietf.group.factories import RoleFactory
+from ietf.group.models import Group, Role
+from ietf.person.models import Person
+
+
+class IssueRSABBallotTests(TestCase):
+    def test_issue_ballot_button_presence(self):
+
+        individual_draft = IndividualDraftFactory()
+        wg_draft = WgDraftFactory()
+        rg_draft = RgDraftFactory()
+        ed_draft = EditorialDraftFactory()
+        ed_rfc = EditorialRfcFactory()
+
+        # login as an RSAB chair
+        self.client.login(username="rsab-chair", password="rsab-chair+password")
+
+        for name in [
+            doc.name
+            for doc in (individual_draft, wg_draft, rg_draft, ed_rfc)
+        ]:
+            url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=name))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            self.assertNotIn("Issue RSAB ballot", unicontent(r))
+
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main", kwargs=dict(name=ed_draft.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertIn("Issue RSAB ballot", unicontent(r))
+
+        self.client.logout()
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main", kwargs=dict(name=ed_draft.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertNotIn("Issue RSAB ballot", unicontent(r))
+
+    def test_close_ballot_button_presence(self):
+        individual_draft = IndividualDraftFactory()
+        wg_draft = WgDraftFactory()
+        rg_draft = RgDraftFactory()
+        ed_draft = EditorialDraftFactory()
+        ed_rfc = EditorialRfcFactory()
+        iesgmember = get_active_ads()[0]
+        irsgmember = get_active_irsg()[0]
+
+        BallotDocEventFactory(doc=ed_draft, ballot_type__slug="rsab-approve")
+
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main", kwargs=dict(name=ed_draft.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertNotIn("Close RSAB ballot", unicontent(r))
+
+        # Login as other body balloters to see if the ballot close button appears
+        for member in (iesgmember, irsgmember):
+            url = urlreverse(
+                "ietf.doc.views_doc.document_main", kwargs=dict(name=ed_draft.name)
+            )
+            self.client.login(
+                username=member.user.username,
+                password=member.user.username + "+password",
+            )
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            self.assertNotIn("Close RSAB ballot", unicontent(r))
+
+            # Try to get the ballot closing page directly
+            url = urlreverse(
+                "ietf.doc.views_ballot.close_rsab_ballot",
+                kwargs=dict(name=ed_draft.name),
+            )
+            r = self.client.get(url)
+            self.assertNotEqual(r.status_code, 200)
+            self.client.logout()
+
+        # Login as the RSAB chair
+        self.client.login(username="rsab-chair", password="rsab-chair+password")
+
+        # The close button should now be available
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main", kwargs=dict(name=ed_draft.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertIn("Close RSAB ballot", unicontent(r))
+
+        # Get the page with the Close RSAB Ballot Yes/No buttons
+        url = urlreverse(
+            "ietf.doc.views_ballot.close_rsab_ballot", kwargs=dict(name=ed_draft.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        # Login as the Secretariat
+        self.client.logout()
+        self.client.login(username="secretary", password="secretary+password")
+
+        # The close button should be available
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main", kwargs=dict(name=ed_draft.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertIn("Close RSAB ballot", unicontent(r))
+
+        # Individual, IETF, and RFC docs should not show the Close button.
+        for draft in (individual_draft, wg_draft, rg_draft, ed_rfc):
+            url = urlreverse(
+                "ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)
+            )
+            r = self.client.get(url, follow=True)
+            self.assertEqual(r.status_code, 200)
+            self.assertNotIn("Close RSAB ballot", unicontent(r))
+
+    # TODO: This has a lot of redundancy with the BaseManipulation tests that should be refactored to speed tests up.
+    def test_issue_ballot(self):
+
+        ed_draft1 = EditorialDraftFactory()
+        ed_draft2 = EditorialDraftFactory()
+        iesgmember = get_active_ads()[0]
+
+        self.assertFalse(ed_draft1.ballot_open("rsab-approve"))
+
+        self.client.login(username="rsab-chair", password="rsab-chair+password")
+        url = urlreverse(
+            "ietf.doc.views_ballot.issue_rsab_ballot", kwargs=dict(name=ed_draft1.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        # Buttons present?
+        self.assertIn("rsab_button", unicontent(r))
+
+        # Press the No button - expect nothing but a redirect back to the draft's main page
+        r = self.client.post(url, dict(rsab_button="No"))
+        self.assertEqual(r.status_code, 302)
+
+        # Press the Yes button
+        r = self.client.post(url, dict(rsab_button="Yes"))
+        self.assertEqual(r.status_code, 302)
+        self.assertTrue(ed_draft1.ballot_open("rsab-approve"))
+
+        # Having issued a ballot, the Issue RSAB ballot button should be gone
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main", kwargs=dict(name=ed_draft1.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertNotIn("Issue RSAB ballot", unicontent(r))
+
+        # The RSAB evaluation record tab should exist
+        self.assertIn("RSAB evaluation record", unicontent(r))
+        # The RSAB evaluation record tab should not indicate unavailability
+        self.assertNotIn(
+            "RSAB Evaluation Ballot has not been created yet", unicontent(r)
+        )  # TODO: why is this a thing? We don't ever show the tab unless there's a ballot. May need to reconsider how we treat the IESG.
+
+        # We should find an RSAB member's name on the RSAB evaluation tab regardless of any positions taken or not
+        url = urlreverse(
+            "ietf.doc.views_doc.document_rsab_ballot", kwargs=dict(name=ed_draft1.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        rsabmembers = get_active_rsab()
+        self.assertNotEqual(len(rsabmembers), 0)
+        for member in rsabmembers:
+            self.assertIn(member.name, unicontent(r))
+
+        # Having issued a ballot, it should appear on the RSAB Ballot Status page
+        url = urlreverse("ietf.doc.views_ballot.rsab_ballot_status")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        # Does the draft name appear on the page?
+        self.assertIn(ed_draft1.name, unicontent(r))
+
+        self.client.logout()
+
+        # Test that an IESG member cannot issue an RSAB ballot
+        self.client.login(
+            username=iesgmember.user.username,
+            password=iesgmember.user.username + "password",
+        )
+
+        url = urlreverse(
+            "ietf.doc.views_ballot.issue_rsab_ballot", kwargs=dict(name=ed_draft2.name)
+        )
+        r = self.client.get(url)
+        self.assertNotEqual(r.status_code, 200)
+        # Buttons present?
+        self.assertNotIn("rsab_button", unicontent(r))
+
+        # Attempt to press the Yes button anyway
+        r = self.client.post(url, dict(rsab_button="Yes"))
+        self.assertTrue(r.status_code == 302 and "/accounts/login" in r["Location"])
+
+    def test_edit_ballot_position_permissions(self):
+        ed_draft = EditorialDraftFactory()
+        ad = RoleFactory(group__type_id="area", name_id="ad")
+        pre_ad = RoleFactory(group__type_id="area", name_id="pre-ad")
+        irsgmember = get_active_irsg()[0]
+        rsab_chair = Role.objects.get(group__acronym="rsab", name="chair")
+        ballot = create_ballot_if_not_open(
+            None, ed_draft, rsab_chair.person, "rsab-approve"
+        )
+
+        url = urlreverse(
+            "ietf.doc.views_ballot.edit_position",
+            kwargs=dict(name=ed_draft.name, ballot_id=ballot.pk),
+        )
+
+        for person in (ad.person, pre_ad.person, irsgmember):
+            self.client.login(
+                username=person.user.username,
+                password=f"{person.user.username}+password",
+            )
+            r = self.client.post(
+                url, dict(position="concern", discuss="Test discuss text")
+            )
+            self.assertEqual(r.status_code, 403)
+            self.client.logout()
+
+    def test_iesg_ballot_no_rsab_actions(self):
+        ad = Person.objects.get(user__username="ad")
+        wg_draft = IndividualDraftFactory(ad=ad)
+        RoleFactory.create_batch(
+            2, name_id="member", group=Group.objects.get(acronym="rsab")
+        )
+        rsabmember = get_active_rsab()[0]
+
+        url = urlreverse(
+            "ietf.doc.views_ballot.ballot_writeupnotes", kwargs=dict(name=wg_draft.name)
+        )
+
+        # RSAB members should not be able to issue IESG ballots
+        login_testing_unauthorized(self, rsabmember.user.username, url)
+        r = self.client.post(
+            url, dict(ballot_writeup="This is a test.", issue_ballot="1")
+        )
+        self.assertNotEqual(r.status_code, 200)
+
+        self.client.logout()
+        login_testing_unauthorized(self, "ad", url)
+
+        BallotDocEventFactory(doc=wg_draft)
+
+        # rsab members (who are not also IESG members) can't take positions
+        ballot = wg_draft.active_ballot()
+        url = urlreverse(
+            "ietf.doc.views_ballot.edit_position",
+            kwargs=dict(name=wg_draft.name, ballot_id=ballot.pk),
+        )
+        self.client.logout()
+        login_testing_unauthorized(self, rsabmember.user.username, url)
+
+        r = self.client.post(url, dict(position="discuss", discuss="Test discuss text"))
+        self.assertEqual(r.status_code, 403)
+
+
+class BaseManipulationTests:
+    def test_issue_ballot(self):
+        draft = EditorialDraftFactory()
+        url = urlreverse(
+            "ietf.doc.views_ballot.issue_rsab_ballot", kwargs=dict(name=draft.name)
+        )
+        empty_outbox()
+
+        login_testing_unauthorized(self, self.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        r = self.client.post(url, {"rsab_button": "No"})
+        self.assertEqual(r.status_code, 302)
+        self.assertIsNone(draft.ballot_open("rsab-approve"))
+
+        # No notifications should have been generated yet
+        self.assertEqual(len(outbox), 0)
+
+        r = self.client.post(url, {"rsab_button": "Yes"})
+        self.assertEqual(r.status_code, 302)
+        self.assertIsNotNone(draft.ballot_open("rsab-approve"))
+
+        # Should have sent a notification about the new ballot
+        self.assertEqual(len(outbox), 1)
+        msg = outbox[0]
+        self.assertIn("RSAB ballot issued", msg["Subject"])
+        self.assertIn("iesg-secretary@ietf.org", msg["From"])
+        self.assertIn(draft.name, msg["Cc"])
+        self.assertIn("rsab@rfc-editor.org", msg["To"])
+
+    def test_take_and_email_position(self):
+        draft = EditorialDraftFactory()
+        ballot = BallotDocEventFactory(doc=draft, ballot_type__slug="rsab-approve")
+        url = (
+            urlreverse(
+                "ietf.doc.views_ballot.edit_position",
+                kwargs=dict(name=draft.name, ballot_id=ballot.pk),
+            )
+            + self.balloter
+        )
+        empty_outbox()
+
+        login_testing_unauthorized(self, self.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        r = self.client.post(
+            url,
+            dict(
+                position="yes",
+                comment="oib239sb",
+                send_mail="Save and send email",
+                cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"],
+            ),
+        )
+        self.assertEqual(r.status_code, 302)
+        e = draft.latest_event(BallotPositionDocEvent)
+        self.assertEqual(e.pos.slug, "yes")
+        self.assertEqual(e.comment, "oib239sb")
+        self.assertEqual(len(outbox), 1)
+        self.assertNotIn("discuss-criteria", get_payload_text(outbox[0]))
+
+    def test_close_ballot(self):
+        draft = EditorialDraftFactory()
+        BallotDocEventFactory(doc=draft, ballot_type__slug="rsab-approve")
+        url = urlreverse(
+            "ietf.doc.views_ballot.close_rsab_ballot", kwargs=dict(name=draft.name)
+        )
+        empty_outbox()
+
+        login_testing_unauthorized(self, self.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        r = self.client.post(url, dict(rsab_button="No"))
+        self.assertEqual(r.status_code, 302)
+        self.assertIsNotNone(draft.ballot_open("rsab-approve"))
+
+        # Should not have generated a notification yet
+        self.assertEqual(len(outbox), 0)
+
+        r = self.client.post(url, dict(rsab_button="Yes"))
+        self.assertEqual(r.status_code, 302)
+        self.assertIsNone(draft.ballot_open("rsab-approve"))
+
+        # Closing the ballot should have generated a notification
+        self.assertEqual(len(outbox), 1)
+        msg = outbox[0]
+        self.assertIn("RSAB ballot closed", msg["Subject"])
+        self.assertIn("iesg-secretary@ietf.org", msg["From"])
+        self.assertIn("rsab@rfc-editor.org", msg["To"])
+        self.assertIn(f"{draft.name}@ietf.org", msg["Cc"])
+
+    def test_view_outstanding_ballots(self):
+        draft = EditorialDraftFactory()
+        BallotDocEventFactory(doc=draft, ballot_type__slug="rsab-approve")
+        url = urlreverse("ietf.doc.views_ballot.rsab_ballot_status")
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertIn(draft.name, unicontent(r))
+
+        close_ballot(
+            draft, Person.objects.get(user__username=self.username), "rsab-approve"
+        )
+        r = self.client.get(url)
+        self.assertNotIn(draft.name, unicontent(r))
+
+
+class RSABChairTests(BaseManipulationTests, TestCase):
+    def setUp(self):
+        super().setUp()
+        self.username = "rsab-chair"
+        self.balloter = ""
+
+
+class SecretariatTests(BaseManipulationTests, TestCase):
+    def setUp(self):
+        super().setUp()
+        self.username = "secretary"
+        self.balloter = "?balloter={}".format(
+            Person.objects.get(user__username="rsab-chair").pk
+        )
+
+
+class RSABMemberTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.username = RoleFactory(
+            group__acronym="rsab", name_id="member"
+        ).person.user.username
+
+    def test_cant_issue_rsab_ballot(self):
+        draft = EditorialDraftFactory()
+        url = urlreverse(
+            "ietf.doc.views_ballot.issue_rsab_ballot", kwargs=dict(name=draft.name)
+        )
+
+        self.client.login(username=self.username, password=self.username + "+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+
+        r = self.client.post(url, {"rsab_button": "Yes"})
+        self.assertEqual(r.status_code, 403)
+
+    def test_cant_close_rsab_ballot(self):
+        draft = EditorialDraftFactory()
+        BallotDocEventFactory(doc=draft, ballot_type__slug="rsab-approve")
+        url = urlreverse(
+            "ietf.doc.views_ballot.close_rsab_ballot", kwargs=dict(name=draft.name)
+        )
+
+        self.client.login(username=self.username, password=self.username + "+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+
+        r = self.client.post(url, dict(rsab_button="Yes"))
+        self.assertEqual(r.status_code, 403)
+
+    def test_cant_act_on_other_bodies_ballots(self):
+        ietf_doc = WgDraftFactory()
+        irtf_doc = RgDraftFactory()
+
+        self.client.login(username=self.username, password=f"{self.username}+password")
+
+        url = urlreverse(
+            "ietf.doc.views_ballot.ballot_writeupnotes", kwargs=dict(name=ietf_doc.name)
+        )
+        self.assertEqual(self.client.get(url).status_code, 403)
+        self.assertEqual(
+            self.client.post(
+                url,
+                dict(ballot_writeup="This is a simple test.", save_ballot_writeup="1"),
+            ).status_code,
+            403,
+        )
+
+        url = urlreverse(
+            "ietf.doc.views_ballot.issue_irsg_ballot", kwargs=dict(name=irtf_doc.name)
+        )
+        self.assertEqual(self.client.get(url).status_code, 403)
+        self.assertEqual(
+            self.client.post(
+                url, dict(irsg_button="Yes", duedate="2038-01-19")
+            ).status_code,
+            403,
+        )
+
+        for name, ballot_id in [
+            (ietf_doc.name, BallotDocEventFactory(doc=ietf_doc).pk),
+            (irtf_doc.name, IRSGBallotDocEventFactory(doc=irtf_doc).pk),
+        ]:
+            url = urlreverse(
+                "ietf.doc.views_ballot.edit_position",
+                kwargs=dict(name=name, ballot_id=ballot_id),
+            )
+            self.assertEqual(
+                self.client.get(url).status_code, 200
+            )  # TODO : WHAT?! : This is strange, and probably tied up badly with pre-ad, and it should change.
+            self.assertEqual(
+                self.client.post(
+                    url,
+                    dict(position="yes"),
+                ).status_code,
+                403,
+            )
+
+        url = urlreverse(
+            "ietf.doc.views_ballot.close_irsg_ballot", kwargs=dict(name=irtf_doc.name)
+        )
+        self.assertEqual(self.client.get(url).status_code, 403)
+        self.assertEqual(
+            self.client.post(url, dict(irsg_button="Yes")).status_code, 403
+        )
+
+        # Closing iesg ballots happens as a side-effect of secretariat actions with access testing done elsewhere
+
+    def test_take_and_email_position(self):
+        draft = EditorialDraftFactory()
+        ballot = BallotDocEventFactory(doc=draft, ballot_type__slug="rsab-approve")
+        url = urlreverse(
+            "ietf.doc.views_ballot.edit_position",
+            kwargs=dict(name=draft.name, ballot_id=ballot.pk),
+        )
+        empty_outbox()
+
+        login_testing_unauthorized(self, self.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        r = self.client.post(
+            url,
+            dict(
+                position="yes",
+                comment="oib239sb",
+                send_mail="Save and send email",
+                cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"],
+            ),
+        )
+        self.assertEqual(r.status_code, 302)
+        e = draft.latest_event(BallotPositionDocEvent)
+        self.assertEqual(e.pos.slug, "yes")
+        self.assertEqual(e.comment, "oib239sb")
+        self.assertEqual(len(outbox), 1)
+
+
+class NobodyTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.draft = EditorialDraftFactory()
+        self.ballot = BallotDocEventFactory(
+            doc=self.draft, ballot_type__slug="rsab-approve"
+        )
+        BallotPositionDocEventFactory(
+            ballot=self.ballot,
+            by=get_active_rsab()[0],
+            pos_id="yes",
+            comment="b2390sn3",
+        )
+
+    def can_see_RSAB_tab(self):
+        url = urlreverse(
+            "ietf.doc.views_doc.document_rsab_ballot", kwargs=dict(name=self.draft.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertIn("b2390sn3", unicontent(r))
+
+    def test_cant_take_position_on_irtf_ballot(self):
+
+        url = urlreverse(
+            "ietf.doc.views_ballot.edit_position",
+            kwargs=dict(name=self.draft.name, ballot_id=self.ballot.pk),
+        )
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 302)
+        self.assertIn("/accounts/login", r["Location"])
+
+        r = self.client.post(
+            url,
+            dict(position="yes", comment="oib239sb", send_mail="Save and send email"),
+        )
+        self.assertEqual(r.status_code, 302)
+        self.assertIn("/accounts/login", r["Location"])
diff --git a/ietf/doc/tests_statement.py b/ietf/doc/tests_statement.py
new file mode 100644
index 0000000000..bb097b1828
--- /dev/null
+++ b/ietf/doc/tests_statement.py
@@ -0,0 +1,407 @@
+# Copyright The IETF Trust 2023-2025, All Rights Reserved
+
+import debug  # pyflakes:ignore
+
+from pyquery import PyQuery
+
+from pathlib import Path
+from zoneinfo import ZoneInfo
+
+from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.template.loader import render_to_string
+from django.urls import reverse as urlreverse
+
+from ietf.doc.factories import StatementFactory, DocEventFactory
+from ietf.doc.models import Document, State, NewRevisionDocEvent
+from ietf.doc.storage_utils import retrieve_str
+from ietf.group.models import Group
+from ietf.person.factories import PersonFactory
+from ietf.utils.mail import outbox, empty_outbox
+from ietf.utils.test_utils import (
+    TestCase,
+    reload_db_objects,
+    login_testing_unauthorized,
+)
+
+
+class StatementsTestCase(TestCase):
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + [
+        "DOCUMENT_PATH_PATTERN"
+    ]
+
+    def extract_content(self, response):
+        if not hasattr(response, "_cached_extraction"):
+            response._cached_extraction = list(response.streaming_content)[0].decode(
+                "utf-8"
+            )
+        return response._cached_extraction
+
+    def write_statement_markdown_file(self, statement):
+        (
+            Path(settings.DOCUMENT_PATH_PATTERN.format(doc=statement))
+            / ("%s-%s.md" % (statement.name, statement.rev))
+        ).write_text(
+            """# This is a test statement.
+Version: {statement.rev}
+
+## A section
+
+This test section has some text.
+"""
+        )
+
+    def write_statement_pdf_file(self, statement):
+        (
+            Path(settings.DOCUMENT_PATH_PATTERN.format(doc=statement))
+            / ("%s-%s.pdf" % (statement.name, statement.rev))
+        ).write_text(
+            f"{statement.rev} This is not valid PDF, but the test does not need it to be"
+        )
+
+    def test_statement_doc_view(self):
+        doc = StatementFactory()
+        self.write_statement_markdown_file(doc)
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        self.assertEqual(q("#statement-state").text(), "Active")
+        self.assertEqual(q("#statement-type").text(), "IAB Statement")
+        self.assertIn("has some text", q(".card-body").text())
+        published = doc.docevent_set.filter(type="published_statement").last().time
+        self.assertIn(
+            published.astimezone(ZoneInfo(settings.TIME_ZONE)).date().isoformat(),
+            q("#published").text(),
+        )
+
+        doc.set_state(State.objects.get(type_id="statement", slug="replaced"))
+        doc2 = StatementFactory()
+        doc2.relateddocument_set.create(relationship_id="replaces", target=doc)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        self.assertEqual(q("#statement-state").text(), "Replaced")
+        self.assertEqual(q("#statement-type").text(), "Replaced IAB Statement")
+        self.assertEqual(q("#statement-type").next().text(), f"Replaced by {doc2.name}")
+
+        url = urlreverse(
+            "ietf.doc.views_doc.document_main", kwargs=dict(name=doc2.name)
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        self.assertEqual(q("#statement-type").text(), "IAB Statement")
+        self.assertEqual(q("#statement-type").next().text(), f"Replaces {doc.name}")
+
+    def test_serve_pdf(self):
+        url = urlreverse(
+            "ietf.doc.views_statement.serve_pdf",
+            kwargs=dict(name="statement-does-not-exist"),
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
+        doc = StatementFactory()
+        url = urlreverse(
+            "ietf.doc.views_statement.serve_pdf", kwargs=dict(name=doc.name)
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)  # File not found
+
+        self.write_statement_pdf_file(doc)
+        doc.rev = "01"
+        e = DocEventFactory(type="published_statement", doc=doc, rev=doc.rev)
+        doc.save_with_history([e])
+        self.write_statement_pdf_file(doc)
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.get("Content-Type"), "application/pdf")
+        self.assertTrue(
+            self.extract_content(r).startswith(doc.rev)
+        )  # relies on test doc not actually being pdf
+
+        url = urlreverse(
+            "ietf.doc.views_statement.serve_pdf", kwargs=dict(name=doc.name, rev="00")
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(self.extract_content(r).startswith("00 "))
+        url = urlreverse(
+            "ietf.doc.views_statement.serve_pdf", kwargs=dict(name=doc.name, rev="01")
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(self.extract_content(r).startswith("01 "))
+
+    def test_submit(self):
+        doc = StatementFactory()
+        url = urlreverse("ietf.doc.views_statement.submit", kwargs=dict(name=doc.name))
+
+        rev = doc.rev
+        r = self.client.post(
+            url, {"statement_submission": "enter", "statement_content": "# oiwefrase"}
+        )
+        self.assertEqual(r.status_code, 302)
+        doc = reload_db_objects(doc)
+        self.assertEqual(rev, doc.rev)
+
+        nobody = PersonFactory()
+        self.client.login(
+            username=nobody.user.username, password=nobody.user.username + "+password"
+        )
+        r = self.client.post(
+            url, {"statement_submission": "enter", "statement_content": "# oiwefrase"}
+        )
+        self.assertEqual(r.status_code, 403)
+        doc = reload_db_objects(doc)
+        self.assertEqual(rev, doc.rev)
+        self.client.logout()
+
+        for username in ["secretary"]:  # There is potential for expanding this list
+            self.client.login(username=username, password=username + "+password")
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            file = SimpleUploadedFile(
+                "random.pdf",
+                b"not valid pdf",
+                content_type="application/pdf",
+            )
+            for postdict in [
+                {
+                    "statement_submission": "enter",
+                    "statement_content": f"# {username}",
+                },
+                {
+                    "statement_submission": "upload",
+                    "statement_file": file,
+                },
+            ]:
+                docevent_count = doc.docevent_set.count()
+                empty_outbox()
+                r = self.client.post(url, postdict)
+                self.assertEqual(r.status_code, 302)
+                doc = reload_db_objects(doc)
+                self.assertEqual("%02d" % (int(rev) + 1), doc.rev)
+                if postdict["statement_submission"] == "enter":
+                    self.assertEqual(f"# {username}", doc.text())
+                    self.assertEqual(
+                        retrieve_str("statement", f"{doc.name}-{doc.rev}.md"),
+                        f"# {username}"
+                    )
+                else:
+                    self.assertEqual("not valid pdf", doc.text())
+                    self.assertEqual(
+                        retrieve_str("statement", f"{doc.name}-{doc.rev}.pdf"),
+                        "not valid pdf"
+                    )
+                self.assertEqual(docevent_count + 1, doc.docevent_set.count())
+                self.assertEqual(0, len(outbox))
+                rev = doc.rev
+            self.client.logout()
+
+    def test_start_new_statement(self):
+        url = urlreverse("ietf.doc.views_statement.new_statement")
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertContains(
+            r,
+            "Replace this with the content of the statement in markdown source",
+            status_code=200,
+        )
+        group = Group.objects.get(acronym="iab")
+        r = self.client.post(
+            url,
+            dict(
+                group=group.pk,
+                title="default",
+                statement_submission="enter",
+                statement_content=render_to_string(
+                    "doc/statement/statement_template.md", {"settings": settings}
+                ),
+            ),
+        )
+        self.assertContains(r, "The example content may not be saved.", status_code=200)
+
+        file = SimpleUploadedFile(
+            "random.pdf",
+            b"not valid pdf",
+            content_type="application/pdf",
+        )
+        group = Group.objects.get(acronym="iab")
+        for postdict in [
+            dict(
+                group=group.pk,
+                title="title one",
+                statement_submission="enter",
+                statement_content="some stuff",
+            ),
+            dict(
+                group=group.pk,
+                title="title two",
+                statement_submission="upload",
+                statement_file=file,
+            ),
+        ]:
+            empty_outbox()
+            r = self.client.post(url, postdict)
+            self.assertEqual(r.status_code, 302)
+            name = f"statement-{group.acronym}-{postdict['title']}".replace(
+                " ", "-"
+            )  # cheap slugification
+            statement = Document.objects.filter(
+                name=name, type_id="statement"
+            ).first()
+            self.assertIsNotNone(statement)
+            self.assertEqual(statement.title, postdict["title"])
+            self.assertEqual(statement.rev, "00")
+            self.assertEqual(statement.get_state_slug(), "active")
+            self.assertEqual(
+                statement.latest_event(NewRevisionDocEvent).rev, "00"
+            )
+            self.assertIsNotNone(statement.latest_event(type="published_statement"))
+            self.assertIsNotNone(statement.history_set.last().latest_event(type="published_statement"))
+            if postdict["statement_submission"] == "enter":
+                self.assertEqual(statement.text_or_error(), "some stuff")
+                self.assertEqual(
+                    retrieve_str("statement", statement.uploaded_filename),
+                    "some stuff"
+                )
+            else:
+                self.assertTrue(statement.uploaded_filename.endswith("pdf"))
+                self.assertEqual(
+                    retrieve_str("statement", f"{statement.name}-{statement.rev}.pdf"),
+                    "not valid pdf"
+                )
+            self.assertEqual(len(outbox), 0)
+
+        existing_statement = StatementFactory()
+        for postdict in [
+            dict(
+                group=group.pk,
+                title="",
+                statement_submission="enter",
+                statement_content="some stuff",
+            ),
+            dict(
+                group=group.pk,
+                title="a title",
+                statement_submission="enter",
+                statement_content="",
+            ),
+            dict(
+                group=group.pk,
+                title=existing_statement.title,
+                statement_submission="enter",
+                statement_content="some stuff",
+            ),
+            dict(
+                group=group.pk,
+                title="森川",
+                statement_submission="enter",
+                statement_content="some stuff",
+            ),
+            dict(
+                group=group.pk,
+                title="a title",
+                statement_submission="",
+                statement_content="some stuff",
+            ),
+            dict(
+                group="",
+                title="a title",
+                statement_submission="enter",
+                statement_content="some stuff",
+            ),
+            dict(
+                group=0,
+                title="a title",
+                statement_submission="enter",
+                statement_content="some stuff",
+            ),
+        ]:
+            r = self.client.post(url, postdict)
+            self.assertEqual(r.status_code, 200, f"Wrong status_code for {postdict}")
+            q = PyQuery(r.content)
+            self.assertTrue(
+                q("form div.is-invalid"), f"Expected an error for {postdict}"
+            )
+
+    def test_submit_non_markdown_formats(self):
+        doc = StatementFactory()
+
+        file = SimpleUploadedFile(
+            "random.pdf",
+            b"01 This is not valid PDF, but the test does not need it to be",
+            content_type="application/pdf",
+        )
+
+        url = urlreverse("ietf.doc.views_statement.submit", kwargs=dict(name=doc.name))
+        login_testing_unauthorized(self, "secretary", url)
+
+        r = self.client.post(
+            url,
+            {
+                "statement_submission": "upload",
+                "statement_file": file,
+            },
+        )
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(
+            r["Location"],
+            urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)),
+        )
+
+        doc = reload_db_objects(doc)
+        self.assertEqual(doc.rev, "01")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(
+            q("#id_statement_content").text().strip(),
+            "The current revision of this statement is in pdf format",
+        )
+
+        file = SimpleUploadedFile(
+            "random.mp4", b"29ucdvn2o09hano5", content_type="video/mp4"
+        )
+        r = self.client.post(
+            url, {"statement_submission": "upload", "statement_file": file}
+        )
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue("Unexpected content" in q("#id_statement_file").next().text())
+
+    def test_change_statement_state(self):
+        statement = StatementFactory()  # starts in "active" state
+        active_state = State.objects.get(type_id="statement", slug="active")
+        replaced_state = State.objects.get(type_id="statement", slug="replaced")
+        url = urlreverse(
+            "ietf.doc.views_statement.change_statement_state",
+            kwargs={"name": statement.name},
+        )
+
+        events_before = statement.docevent_set.count()
+        login_testing_unauthorized(self, "secretary", url)
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200)
+
+        r = self.client.post(url, {"state": active_state.pk}, follow=True)
+        self.assertContains(r, "State not changed", status_code=200)
+        statement = Document.objects.get(pk=statement.pk)  # bust the state cache
+        self.assertEqual(statement.get_state(), active_state)
+
+        r = self.client.post(url, {"state": replaced_state.pk}, follow=True)
+        self.assertContains(r, "State changed to", status_code=200)
+        statement = Document.objects.get(pk=statement.pk)  # bust the state cache
+        self.assertEqual(statement.get_state(), replaced_state)
+
+        events_after = statement.docevent_set.count()
+        self.assertEqual(events_after, events_before + 1)
+        event = statement.docevent_set.first()
+        self.assertEqual(event.type, "changed_state")
+        self.assertEqual(
+            event.desc, "Statement State changed to <b>Replaced</b> from Active"
+        )
diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py
index cd8f859dd1..da1a4f1906 100644
--- a/ietf/doc/tests_status_change.py
+++ b/ietf/doc/tests_status_change.py
@@ -4,6 +4,7 @@
 
 import io
 import os
+from pathlib import Path
 
 import debug    # pyflakes:ignore
 
@@ -14,9 +15,11 @@
 from django.conf import settings
 from django.urls import reverse as urlreverse
 
-from ietf.doc.factories import DocumentFactory, IndividualRfcFactory, WgRfcFactory
-from ietf.doc.models import ( Document, DocAlias, State, DocEvent,
+from ietf.doc.factories import ( DocumentFactory, IndividualRfcFactory,
+    WgRfcFactory, DocEventFactory, WgDraftFactory )
+from ietf.doc.models import ( Document, State, DocEvent,
     BallotPositionDocEvent, NewRevisionDocEvent, TelechatDocEvent, WriteupDocEvent )
+from ietf.doc.storage_utils import retrieve_str
 from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_status_change import default_approval_text
 from ietf.group.models import Person
@@ -69,12 +72,12 @@ def test_start_review(self):
             statchg_relation_row_blah="tois")
         )
         self.assertEqual(r.status_code, 302)
-        status_change = Document.objects.get(name='status-change-imaginary-new')        
+        status_change = Document.objects.get(name='status-change-imaginary-new')
         self.assertEqual(status_change.get_state('statchg').slug,'adrev')
         self.assertEqual(status_change.rev,'00')
         self.assertEqual(status_change.ad.name,'Areað Irector')
         self.assertEqual(status_change.notify,'ipu@ietf.org')
-        self.assertTrue(status_change.relateddocument_set.filter(relationship__slug='tois',target__docs__name='draft-ietf-random-thing'))
+        self.assertTrue(status_change.relateddocument_set.filter(relationship__slug='tois',target__name='rfc9999'))
 
         # Verify that it's possible to start a status change without a responsible ad.
         r = self.client.post(url,dict(
@@ -86,6 +89,16 @@ def test_start_review(self):
         status_change = Document.objects.get(name='status-change-imaginary-new2')
         self.assertIsNone(status_change.ad)        
 
+        # Verify that the right thing happens if a control along the way uppercases RFC
+        r = self.client.post(url,dict(
+            document_name="imaginary-new3",title="A new imaginary status change",
+            create_in_state=state_strpk,notify='ipu@ietf.org',new_relation_row_blah="RFC9999",
+            statchg_relation_row_blah="tois")
+        )
+        self.assertEqual(r.status_code, 302)
+        status_change = Document.objects.get(name='status-change-imaginary-new3')
+        self.assertTrue(status_change.relateddocument_set.filter(relationship__slug='tois',target__name='rfc9999'))
+
 
     def test_change_state(self):
 
@@ -137,6 +150,21 @@ def test_change_state(self):
         self.assertTrue(doc.active_ballot())
         self.assertEqual(doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position").pos_id,'yes')
 
+        # try to change to an AD-forbidden state
+        appr_sent_pk = str(State.objects.get(used=True, slug='appr-sent',type__slug='statchg').pk)
+        r = self.client.post(url, dict(new_state=appr_sent_pk, comment='xyzzy'))
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(q('form .invalid-feedback'))
+
+        # try again as secretariat
+        self.client.logout()
+        login_testing_unauthorized(self, 'secretary', url)
+        r = self.client.post(url, dict(new_state=appr_sent_pk, comment='xyzzy'))
+        self.assertEqual(r.status_code, 302)
+        doc = Document.objects.get(name='status-change-imaginary-mid-review')
+        self.assertEqual(doc.get_state('statchg').slug, 'appr-sent')
+
     def test_edit_notices(self):
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
         url = urlreverse('ietf.doc.views_doc.edit_notify;status-change',kwargs=dict(name=doc.name))
@@ -147,8 +175,8 @@ def test_edit_notices(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form input[name=notify]')),1)
-        self.assertEqual(doc.notify,q('form input[name=notify]')[0].value)
+        self.assertEqual(len(q('form textarea[name=notify]')), 1)
+        self.assertEqual(doc.notify, q('form textarea[name=notify]')[0].value.strip())
 
         # change notice list
         newlist = '"Foo Bar" <foo@bar.baz.com>'
@@ -159,8 +187,8 @@ def test_edit_notices(self):
         self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Notification list changed'))       
 
         # Some additional setup so there's something to put in a generated notify list
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9999'),relationship_id='tois')
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9998'),relationship_id='tohist')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist')
 
         # Ask the form to regenerate the list
         r = self.client.post(url,dict(regenerate_addresses="1"))
@@ -169,8 +197,8 @@ def test_edit_notices(self):
         # Regenerate does not save!
         self.assertEqual(doc.notify,newlist)
         q = PyQuery(r.content)
-        formlist = q('form input[name=notify]')[0].value
-        self.assertEqual(None,formlist)
+        formlist = q('form textarea[name=notify]')[0].value.strip()
+        self.assertEqual("", formlist)
 
     def test_edit_title(self):
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
@@ -263,8 +291,8 @@ def test_edit_lc(self):
         login_testing_unauthorized(self, "ad", url)
 
         # additional setup
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9999'),relationship_id='tois')
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9998'),relationship_id='tohist')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist')
         doc.ad = Person.objects.get(name='Ad No2')
         doc.save_with_history([DocEvent.objects.create(doc=doc, rev=doc.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
         
@@ -289,7 +317,19 @@ def test_edit_lc(self):
         self.assertEqual(r.status_code,200)
         self.assertContains(r,  'RFC9999 from Proposed Standard to Internet Standard')
         self.assertContains(r,  'RFC9998 from Informational to Historic')
-      
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("button[name='send_last_call_request']")), 1)
+
+        # Make sure request LC isn't offered with no responsible AD.
+        doc.ad = None
+        doc.save_with_history([DocEventFactory(doc=doc)])
+        r = self.client.get(url)
+        self.assertEqual(r.status_code,200) 
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("button[name='send_last_call_request']")), 0)
+        doc.ad = Person.objects.get(name='Ad No2')
+        doc.save_with_history([DocEventFactory(doc=doc)])
+
         # request last call
         messages_before = len(outbox)
         r = self.client.post(url,dict(last_call_text='stuff',send_last_call_request='Save+and+Request+Last+Call'))
@@ -307,8 +347,8 @@ def test_approve(self):
         login_testing_unauthorized(self, "secretary", url)
         
         # Some additional setup
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9999'),relationship_id='tois')
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9998'),relationship_id='tohist')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist')
         create_ballot_if_not_open(None, doc, Person.objects.get(user__username="secretary"), "statchg")
         doc.set_state(State.objects.get(slug='appr-pend',type='statchg'))
 
@@ -348,10 +388,10 @@ def approval_pend_notice_test_helper(self, role):
         url = urlreverse('ietf.doc.views_status_change.change_state',kwargs=dict(name=doc.name))
 
         # Add some status change related documents
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9999'),relationship_id='tois')
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9998'),relationship_id='tohist')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist')
         # And a non-status change related document
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc14'),relationship_id='updates')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc14'),relationship_id='updates')
 
         login_testing_unauthorized(self, role, url)
         empty_outbox()
@@ -373,9 +413,9 @@ def approval_pend_notice_test_helper(self, role):
             self.assertTrue(notification['Subject'].startswith('Approved:'))
             notification_text = get_payload_text(notification)
             self.assertIn('The AD has approved changing the status', notification_text)
-            self.assertIn(DocAlias.objects.get(name='rfc9999').document.canonical_name(), notification_text)
-            self.assertIn(DocAlias.objects.get(name='rfc9998').document.canonical_name(), notification_text)
-            self.assertNotIn(DocAlias.objects.get(name='rfc14').document.canonical_name(), notification_text)
+            self.assertIn(Document.objects.get(name='rfc9999').name, notification_text)
+            self.assertIn(Document.objects.get(name='rfc9998').name, notification_text)
+            self.assertNotIn(Document.objects.get(name='rfc14').name, notification_text)
             self.assertNotIn('No value found for', notification_text)  # make sure all interpolation values were set
         else:
             self.assertEqual(len(outbox), 0)
@@ -395,8 +435,8 @@ def test_edit_relations(self):
         login_testing_unauthorized(self, "secretary", url)
         
         # Some additional setup
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9999'),relationship_id='tois')
-        doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9998'),relationship_id='tohist')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist')
 
         # get
         r = self.client.get(url)
@@ -446,16 +486,63 @@ def verify_relations(doc,target_name,status):
         verify_relations(doc,'rfc9998','tobcp' )
         verify_relations(doc,'rfc14'  ,'tohist')
         self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Affected RFC list changed.'))       
+
+    def test_clear_ballot(self):
+        doc = Document.objects.get(name='status-change-imaginary-mid-review')
+        url = urlreverse('ietf.doc.views_ballot.clear_ballot',kwargs=dict(name=doc.name, ballot_type_slug="statchg"))
+        login_testing_unauthorized(self, "secretary", url)
         
+        # Some additional setup
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist')
+        create_ballot_if_not_open(None, doc, Person.objects.get(user__username="secretary"), "statchg")
+        doc.set_state(State.objects.get(slug='iesgeval',type='statchg'))
+        old_ballot = doc.ballot_open("statchg")
+        self.assertIsNotNone(old_ballot)
+        
+        r = self.client.post(url, dict())
+        self.assertEqual(r.status_code,302)
+        new_ballot = doc.ballot_open("statchg")
+        self.assertIsNotNone(new_ballot)
+        self.assertNotEqual(new_ballot, old_ballot)
+        self.assertEqual(doc.get_state_slug("statchg"),"iesgeval")
+
+    def test_clear_deferred_ballot(self):
+        doc = Document.objects.get(name='status-change-imaginary-mid-review')
+        url = urlreverse('ietf.doc.views_ballot.clear_ballot',kwargs=dict(name=doc.name, ballot_type_slug="statchg"))
+        login_testing_unauthorized(self, "secretary", url)
+        
+        # Some additional setup
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9999'),relationship_id='tois')
+        doc.relateddocument_set.create(target=Document.objects.get(name='rfc9998'),relationship_id='tohist')
+        create_ballot_if_not_open(None, doc, Person.objects.get(user__username="secretary"), "statchg")
+        doc.set_state(State.objects.get(slug='defer',type='statchg'))
+        old_ballot = doc.ballot_open("statchg")
+        self.assertIsNotNone(old_ballot)
+        
+        r = self.client.post(url, dict())
+        self.assertEqual(r.status_code,302)
+        new_ballot = doc.ballot_open("statchg")
+        self.assertIsNotNone(new_ballot)
+        self.assertNotEqual(new_ballot, old_ballot)
+        self.assertEqual(doc.get_state_slug("statchg"),"iesgeval")
+
     def setUp(self):
         super().setUp()
-        IndividualRfcFactory(alias2__name='rfc14',name='draft-was-never-issued',std_level_id='unkn')
-        WgRfcFactory(alias2__name='rfc9999',name='draft-ietf-random-thing',std_level_id='ps')
-        WgRfcFactory(alias2__name='rfc9998',name='draft-ietf-random-other-thing',std_level_id='inf')
+        IndividualRfcFactory(rfc_number=14,std_level_id='unkn') # draft was never issued
+
+        rfc = WgRfcFactory(rfc_number=9999,std_level_id='ps')
+        draft = WgDraftFactory(name='draft-ietf-random-thing')
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+
+        rfc = WgRfcFactory(rfc_number=9998,std_level_id='inf')
+        draft = WgDraftFactory(name='draft-ietf-random-other-thing')
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+
         DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review',notify='notify@example.org')
 
 class StatusChangeSubmitTests(TestCase):
-    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['STATUS_CHANGE_PATH']
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['STATUS_CHANGE_PATH', 'FTP_PATH']
     def test_initial_submission(self):
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
         url = urlreverse('ietf.doc.views_status_change.submit',kwargs=dict(name=doc.name))
@@ -471,15 +558,27 @@ def test_initial_submission(self):
         # Right now, nothing to test - we let people put whatever the web browser will let them put into that textbox
 
         # sane post using textbox
-        path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
         self.assertEqual(doc.rev,'00')
-        self.assertFalse(os.path.exists(path))
+        basename = f"{doc.name}-{doc.rev}.txt"
+        filepath = Path(settings.STATUS_CHANGE_PATH) / basename
+        ftp_filepath = Path(settings.FTP_DIR) / "status-changes" / basename
+        self.assertFalse(filepath.exists())
+        self.assertFalse(ftp_filepath.exists())
+        # TODO-BLOBSTORE: next assert is disabled because we currently suppress all exceptions 
+        # with self.assertRaises(FileNotFoundError):
+        #     retrieve_str("statchg",basename)
         r = self.client.post(url,dict(content="Some initial review text\n",submit_response="1"))
         self.assertEqual(r.status_code,302)
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
         self.assertEqual(doc.rev,'00')
-        with io.open(path) as f:
+        with filepath.open() as f:
+            self.assertEqual(f.read(),"Some initial review text\n")
+        with ftp_filepath.open() as f:
             self.assertEqual(f.read(),"Some initial review text\n")
+        self.assertEqual(
+            retrieve_str("statchg", basename),
+            "Some initial review text\n"
+        )
         self.assertTrue( "mid-review-00" in doc.latest_event(NewRevisionDocEvent).desc)
 
     def test_subsequent_submission(self):
@@ -490,7 +589,7 @@ def test_subsequent_submission(self):
         # A little additional setup 
         # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp
         self.assertEqual(doc.rev,'00')
-        path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
+        path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.name, doc.rev))
         with io.open(path,'w') as f:
             f.write('This is the old proposal.')
             f.close()
@@ -516,16 +615,21 @@ def test_subsequent_submission(self):
         self.assertContains(r, "does not appear to be a text file")
 
         # sane post uploading a file
-        test_file = StringIO("This is a new proposal.")
+        test_content = "This is a new proposal."
+        test_file = StringIO(test_content)
         test_file.name = "unnamed"
         r = self.client.post(url,dict(txt=test_file,submit_response="1"))
         self.assertEqual(r.status_code, 302)
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
         self.assertEqual(doc.rev,'01')
-        path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
+        path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.name, doc.rev))
         with io.open(path) as f:
-            self.assertEqual(f.read(),"This is a new proposal.")
+            self.assertEqual(f.read(), test_content)
             f.close()
+        self.assertEqual(
+            retrieve_str("statchg", f"{doc.name}-{doc.rev}.txt"),
+            test_content
+        )
         self.assertTrue( "mid-review-01" in doc.latest_event(NewRevisionDocEvent).desc)
 
         # verify reset text button works
@@ -543,3 +647,6 @@ def test_subsequent_submission(self):
     def setUp(self):
         super().setUp()
         DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review',notify='notify@example.org')
+        ftp_subdir=Path(settings.FTP_DIR)/"status-changes"
+        if not ftp_subdir.exists():
+            ftp_subdir.mkdir()
diff --git a/ietf/doc/tests_subseries.py b/ietf/doc/tests_subseries.py
new file mode 100644
index 0000000000..8186dc4dec
--- /dev/null
+++ b/ietf/doc/tests_subseries.py
@@ -0,0 +1,49 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+import debug # pyflakes:ignore
+
+from pyquery import PyQuery
+
+from django.urls import reverse as urlreverse
+
+from ietf.doc.factories import SubseriesFactory, RfcFactory
+from ietf.doc.models import Document
+from ietf.utils.test_utils import TestCase
+
+class SubseriesTests(TestCase):
+
+    def test_index_and_view(self):
+        types = ["bcp", "std", "fyi"]
+        for type_id in types:
+            doc = SubseriesFactory(type_id=type_id)
+            self.assertEqual(len(doc.contains()), 1)
+            rfc = doc.contains()[0]
+            # Index
+            url = urlreverse("ietf.doc.views_search.index_subseries", kwargs=dict(type_id=type_id))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertIsNotNone(q(f"#{doc.name}"))
+            self.assertIn(f"RFC {rfc.name[3:]}",q(f"#{doc.name}").text())
+            # Subseries document view
+            url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertIn(f"{doc.type_id.upper()} {doc.name[3:]} consists of:",q("h2").text())
+            self.assertIn(f"RFC {rfc.name[3:]}", q("div.row p a").text())
+            # RFC view
+            url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name))
+            r = self.client.get(url)
+            q = PyQuery(r.content)
+            self.assertIn(f"RFC {rfc.name[3:]} also known as {type_id.upper()} {doc.name[3:]}", q("h1").text())
+        bcp = Document.objects.filter(type_id="bcp").last()
+        bcp.relateddocument_set.create(relationship_id="contains", target=RfcFactory())
+        for rfc in bcp.contains():
+            url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name))
+            r = self.client.get(url)
+            q = PyQuery(r.content)
+            self.assertIn(f"RFC {rfc.name[3:]} part of BCP {bcp.name[3:]}", q("h1").text())     
+
+
diff --git a/ietf/doc/tests_tasks.py b/ietf/doc/tests_tasks.py
new file mode 100644
index 0000000000..2e2d65463f
--- /dev/null
+++ b/ietf/doc/tests_tasks.py
@@ -0,0 +1,317 @@
+# Copyright The IETF Trust 2024-2026, All Rights Reserved
+
+import datetime
+from unittest import mock
+
+from pathlib import Path
+
+from celery.exceptions import Retry
+from django.conf import settings
+from django.test.utils import override_settings
+from django.utils import timezone
+from typesense import exceptions as typesense_exceptions
+
+from ietf.utils.test_utils import TestCase
+from ietf.utils.timezone import datetime_today
+
+from .factories import DocumentFactory, NewRevisionDocEventFactory, WgRfcFactory
+from .models import Document, NewRevisionDocEvent
+from .tasks import (
+    expire_ids_task,
+    expire_last_calls_task,
+    generate_draft_bibxml_files_task,
+    generate_idnits2_rfcs_obsoleted_task,
+    generate_idnits2_rfc_status_task,
+    investigate_fragment_task,
+    notify_expirations_task,
+    rebuild_searchindex_task,
+    update_rfc_searchindex_task,
+)
+
+
+class TaskTests(TestCase):
+    @mock.patch("ietf.doc.tasks.in_draft_expire_freeze")
+    @mock.patch("ietf.doc.tasks.get_expired_drafts")
+    @mock.patch("ietf.doc.tasks.expirable_drafts")
+    @mock.patch("ietf.doc.tasks.send_expire_notice_for_draft")
+    @mock.patch("ietf.doc.tasks.expire_draft")
+    @mock.patch("ietf.doc.tasks.clean_up_draft_files")
+    def test_expire_ids_task(
+        self,
+        clean_up_draft_files_mock,
+        expire_draft_mock,
+        send_expire_notice_for_draft_mock,
+        expirable_drafts_mock,
+        get_expired_drafts_mock,
+        in_draft_expire_freeze_mock,
+    ):
+        # set up mocks
+        in_draft_expire_freeze_mock.return_value = False
+        doc, other_doc = DocumentFactory.create_batch(2)
+        doc.expires = datetime_today()
+        get_expired_drafts_mock.return_value = [doc, other_doc]
+        expirable_drafts_mock.side_effect = [
+            Document.objects.filter(pk=doc.pk),
+            Document.objects.filter(pk=other_doc.pk),
+        ]
+
+        # call task
+        expire_ids_task()
+
+        # check results
+        self.assertTrue(in_draft_expire_freeze_mock.called)
+        self.assertEqual(expirable_drafts_mock.call_count, 2)
+        self.assertEqual(send_expire_notice_for_draft_mock.call_count, 1)
+        self.assertEqual(send_expire_notice_for_draft_mock.call_args[0], (doc,))
+        self.assertEqual(expire_draft_mock.call_count, 1)
+        self.assertEqual(expire_draft_mock.call_args[0], (doc,))
+        self.assertTrue(clean_up_draft_files_mock.called)
+
+        # test that an exception is raised
+        in_draft_expire_freeze_mock.side_effect = RuntimeError
+        with self.assertRaises(RuntimeError):
+            expire_ids_task()
+
+    @mock.patch("ietf.doc.tasks.send_expire_warning_for_draft")
+    @mock.patch("ietf.doc.tasks.get_soon_to_expire_drafts")
+    def test_notify_expirations_task(self, get_drafts_mock, send_warning_mock):
+        # Set up mocks
+        get_drafts_mock.return_value = ["sentinel"]
+        notify_expirations_task()
+        self.assertEqual(send_warning_mock.call_count, 1)
+        self.assertEqual(send_warning_mock.call_args[0], ("sentinel",))
+
+    @mock.patch("ietf.doc.tasks.expire_last_call")
+    @mock.patch("ietf.doc.tasks.get_expired_last_calls")
+    def test_expire_last_calls_task(self, mock_get_expired, mock_expire):
+        docs = DocumentFactory.create_batch(3)
+        mock_get_expired.return_value = docs
+        expire_last_calls_task()
+        self.assertTrue(mock_get_expired.called)
+        self.assertEqual(mock_expire.call_count, 3)
+        self.assertEqual(mock_expire.call_args_list[0], mock.call(docs[0]))
+        self.assertEqual(mock_expire.call_args_list[1], mock.call(docs[1]))
+        self.assertEqual(mock_expire.call_args_list[2], mock.call(docs[2]))
+
+        # Check that it runs even if exceptions occur
+        mock_get_expired.reset_mock()
+        mock_expire.reset_mock()
+        mock_expire.side_effect = ValueError
+        expire_last_calls_task()
+        self.assertTrue(mock_get_expired.called)
+        self.assertEqual(mock_expire.call_count, 3)
+        self.assertEqual(mock_expire.call_args_list[0], mock.call(docs[0]))
+        self.assertEqual(mock_expire.call_args_list[1], mock.call(docs[1]))
+        self.assertEqual(mock_expire.call_args_list[2], mock.call(docs[2]))
+
+    def test_investigate_fragment_task(self):
+        investigation_results = object()  # singleton
+        with mock.patch(
+            "ietf.doc.tasks.investigate_fragment", return_value=investigation_results
+        ) as mock_inv:
+            retval = investigate_fragment_task("some fragment")
+        self.assertTrue(mock_inv.called)
+        self.assertEqual(mock_inv.call_args, mock.call("some fragment"))
+        self.assertEqual(
+            retval, {"name_fragment": "some fragment", "results": investigation_results}
+        )
+
+    @mock.patch("ietf.doc.tasks.searchindex.update_or_create_rfc_entry")
+    @mock.patch("ietf.doc.tasks.searchindex.enabled")
+    def test_update_rfc_searchindex_task(
+        self, mock_searchindex_enabled, mock_create_entry
+    ):
+        mock_searchindex_enabled.return_value = False
+
+        self.assertFalse(Document.objects.filter(rfc_number=5073).exists())
+        rfc = WgRfcFactory()
+        update_rfc_searchindex_task(rfc_number=5073)
+        self.assertFalse(mock_create_entry.called)
+        update_rfc_searchindex_task(rfc_number=rfc.rfc_number)
+        self.assertFalse(mock_create_entry.called)
+
+        mock_searchindex_enabled.return_value = True
+        update_rfc_searchindex_task(rfc_number=5073)
+        self.assertFalse(mock_create_entry.called)
+        update_rfc_searchindex_task(rfc_number=rfc.rfc_number)
+        self.assertTrue(mock_create_entry.called)
+
+        with override_settings(SEARCHINDEX_CONFIG={"TASK_MAX_RETRIES": 0}):
+            # Try a non-retryable error (there are others)
+            mock_create_entry.side_effect = typesense_exceptions.RequestMalformed
+            update_rfc_searchindex_task(rfc_number=rfc.rfc_number)  # no retry
+            # Now what should be a retryable error
+            mock_create_entry.side_effect = typesense_exceptions.Timeout
+            with self.assertRaises(Retry):
+                update_rfc_searchindex_task(rfc_number=rfc.rfc_number)
+
+    @mock.patch("ietf.doc.tasks.searchindex.update_or_create_rfc_entries")
+    @mock.patch("ietf.doc.tasks.searchindex.create_collection")
+    @mock.patch("ietf.doc.tasks.searchindex.delete_collection")
+    def test_rebuild_searchindex_task(self, mock_delete, mock_create, mock_update):
+        rfcs = WgRfcFactory.create_batch(10)
+        rebuild_searchindex_task()
+        self.assertFalse(mock_delete.called)
+        self.assertFalse(mock_create.called)
+        self.assertTrue(mock_update.called)
+        self.assertQuerysetEqual(
+            mock_update.call_args.args[0],
+            sorted(rfcs, key=lambda doc: -doc.rfc_number),
+            ordered=True,
+        )
+
+        mock_delete.reset_mock()
+        mock_create.reset_mock()
+        mock_update.reset_mock()
+        rebuild_searchindex_task(drop_collection=True)
+        self.assertTrue(mock_delete.called)
+        self.assertTrue(mock_create.called)
+        self.assertTrue(mock_update.called)
+        self.assertQuerysetEqual(
+            mock_update.call_args.args[0],
+            sorted(rfcs, key=lambda doc: -doc.rfc_number),
+            ordered=True,
+        )
+
+        mock_delete.reset_mock()
+        mock_create.reset_mock()
+        mock_update.reset_mock()
+        rebuild_searchindex_task(drop_collection=True, batchsize=3)
+        self.assertTrue(mock_delete.called)
+        self.assertTrue(mock_create.called)
+        self.assertTrue(mock_update.called)
+        self.assertQuerysetEqual(
+            mock_update.call_args.args[0],
+            sorted(rfcs, key=lambda doc: -doc.rfc_number),
+            ordered=True,
+        )
+        self.assertEqual(mock_update.call_args.kwargs["batchsize"], 3)
+
+
+class Idnits2SupportTests(TestCase):
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + [
+        "DERIVED_DIR"
+    ]
+
+    @mock.patch("ietf.doc.tasks.generate_idnits2_rfcs_obsoleted")
+    def test_generate_idnits2_rfcs_obsoleted_task(self, mock_generate):
+        mock_generate.return_value = "dåtå"
+        generate_idnits2_rfcs_obsoleted_task()
+        self.assertEqual(mock_generate.call_count, 1)
+        self.assertEqual(
+            "dåtå".encode("utf8"),
+            (Path(settings.DERIVED_DIR) / "idnits2-rfcs-obsoleted").read_bytes(),
+        )
+
+    @mock.patch("ietf.doc.tasks.generate_idnits2_rfc_status")
+    def test_generate_idnits2_rfc_status_task(self, mock_generate):
+        mock_generate.return_value = "dåtå"
+        generate_idnits2_rfc_status_task()
+        self.assertEqual(mock_generate.call_count, 1)
+        self.assertEqual(
+            "dåtå".encode("utf8"),
+            (Path(settings.DERIVED_DIR) / "idnits2-rfc-status").read_bytes(),
+        )
+
+
+class BIBXMLSupportTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        now = timezone.now()
+        self.very_old_event = NewRevisionDocEventFactory(
+            time=now - datetime.timedelta(days=1000), rev="17"
+        )
+        self.old_event = NewRevisionDocEventFactory(
+            time=now - datetime.timedelta(days=8), rev="03"
+        )
+        self.young_event = NewRevisionDocEventFactory(
+            time=now - datetime.timedelta(days=6), rev="06"
+        )
+        # a couple that should always be ignored
+        NewRevisionDocEventFactory(
+            time=now - datetime.timedelta(days=6),
+            rev="09",
+            doc__type_id="rfc",  # not a draft
+        )
+        NewRevisionDocEventFactory(
+            type="changed_document",  # not a "new_revision" type
+            time=now - datetime.timedelta(days=6),
+            rev="09",
+            doc__type_id="rfc",
+        )
+        # Get rid of the "00" events created by the factories -- they're just noise for this test
+        NewRevisionDocEvent.objects.filter(rev="00").delete()
+
+    @mock.patch("ietf.doc.tasks.ensure_draft_bibxml_path_exists")
+    @mock.patch("ietf.doc.tasks.update_or_create_draft_bibxml_file")
+    def test_generate_bibxml_files_for_all_drafts_task(
+        self, mock_create, mock_ensure_path
+    ):
+        generate_draft_bibxml_files_task(process_all=True)
+        self.assertTrue(mock_ensure_path.called)
+        self.assertCountEqual(
+            mock_create.call_args_list,
+            [
+                mock.call(self.young_event.doc, self.young_event.rev),
+                mock.call(self.old_event.doc, self.old_event.rev),
+                mock.call(self.very_old_event.doc, self.very_old_event.rev),
+            ],
+        )
+        mock_create.reset_mock()
+        mock_ensure_path.reset_mock()
+
+        # everything should still be tried, even if there's an exception
+        mock_create.side_effect = RuntimeError
+        generate_draft_bibxml_files_task(process_all=True)
+        self.assertTrue(mock_ensure_path.called)
+        self.assertCountEqual(
+            mock_create.call_args_list,
+            [
+                mock.call(self.young_event.doc, self.young_event.rev),
+                mock.call(self.old_event.doc, self.old_event.rev),
+                mock.call(self.very_old_event.doc, self.very_old_event.rev),
+            ],
+        )
+
+    @mock.patch("ietf.doc.tasks.ensure_draft_bibxml_path_exists")
+    @mock.patch("ietf.doc.tasks.update_or_create_draft_bibxml_file")
+    def test_generate_bibxml_files_for_recent_drafts_task(
+        self, mock_create, mock_ensure_path
+    ):
+        # default args - look back 7 days
+        generate_draft_bibxml_files_task()
+        self.assertTrue(mock_ensure_path.called)
+        self.assertCountEqual(
+            mock_create.call_args_list,
+            [mock.call(self.young_event.doc, self.young_event.rev)],
+        )
+        mock_create.reset_mock()
+        mock_ensure_path.reset_mock()
+
+        # shorter lookback
+        generate_draft_bibxml_files_task(days=5)
+        self.assertTrue(mock_ensure_path.called)
+        self.assertCountEqual(mock_create.call_args_list, [])
+        mock_create.reset_mock()
+        mock_ensure_path.reset_mock()
+
+        # longer lookback
+        generate_draft_bibxml_files_task(days=9)
+        self.assertTrue(mock_ensure_path.called)
+        self.assertCountEqual(
+            mock_create.call_args_list,
+            [
+                mock.call(self.young_event.doc, self.young_event.rev),
+                mock.call(self.old_event.doc, self.old_event.rev),
+            ],
+        )
+
+    @mock.patch("ietf.doc.tasks.ensure_draft_bibxml_path_exists")
+    @mock.patch("ietf.doc.tasks.update_or_create_draft_bibxml_file")
+    def test_generate_bibxml_files_for_recent_drafts_task_with_bad_value(
+        self, mock_create, mock_ensure_path
+    ):
+        with self.assertRaises(ValueError):
+            generate_draft_bibxml_files_task(days=0)
+        self.assertFalse(mock_create.called)
+        self.assertFalse(mock_ensure_path.called)
diff --git a/ietf/doc/tests_utils.py b/ietf/doc/tests_utils.py
index aef6eb69a7..ba672cd847 100644
--- a/ietf/doc/tests_utils.py
+++ b/ietf/doc/tests_utils.py
@@ -1,20 +1,36 @@
 # Copyright The IETF Trust 2020, All Rights Reserved
 import datetime
+from io import BytesIO
+
+import mock
 import debug  # pyflakes:ignore
+import requests
 
-from unittest.mock import patch
+from pathlib import Path
+from unittest.mock import call, patch
 
+from django.conf import settings
+from django.core.files.storage import storages
 from django.db import IntegrityError
+from django.test.utils import override_settings
+from django.utils import timezone
+
 
+from ietf.doc.utils_r2 import rfcs_are_in_r2
+from ietf.doc.utils_red import trigger_red_precomputer
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.name.models import DocTagName
 from ietf.person.factories import PersonFactory
-from ietf.utils.test_utils import TestCase, name_of_file_containing
+from ietf.doc.factories import BallotPositionDocEventFactory
+from ietf.utils.test_utils import TestCase, name_of_file_containing, reload_db_objects
 from ietf.person.models import Person
 from ietf.doc.factories import DocumentFactory, WgRfcFactory, WgDraftFactory
-from ietf.doc.models import State, DocumentActionHolder, DocumentAuthor, Document
+from ietf.doc.models import State, DocumentActionHolder, DocumentAuthor, StoredObject
 from ietf.doc.utils import (update_action_holders, add_state_change_event, update_documentauthors,
-                            fuzzy_find_documents, rebuild_reference_relations)
+                            fuzzy_find_documents, rebuild_reference_relations, build_file_urls,
+                            ensure_draft_bibxml_path_exists, update_or_create_draft_bibxml_file,
+                            last_ballot_doc_revision)
+from ietf.doc.storage_utils import store_str
 from ietf.utils.draft import Draft, PlaintextDraft
 from ietf.utils.xmldraft import XMLDraft
 
@@ -143,18 +159,33 @@ def test_update_action_holders_resets_age(self):
         doc = self.doc_in_iesg_state('pub-req')
         doc.action_holders.set([self.ad])
         dah = doc.documentactionholder_set.get(person=self.ad)
-        dah.time_added = datetime.datetime(2020, 1, 1)  # arbitrary date in the past
+        dah.time_added = datetime.datetime(2020, 1, 1, tzinfo=datetime.UTC)  # arbitrary date in the past
         dah.save()
 
-        self.assertNotEqual(doc.documentactionholder_set.get(person=self.ad).time_added.date(), datetime.date.today())
+        right_now = timezone.now()
+        self.assertLess(doc.documentactionholder_set.get(person=self.ad).time_added, right_now)
         self.update_doc_state(doc, State.objects.get(slug='ad-eval'))
-        self.assertEqual(doc.documentactionholder_set.get(person=self.ad).time_added.date(), datetime.date.today())
+        self.assertGreaterEqual(doc.documentactionholder_set.get(person=self.ad).time_added, right_now)
 
     def test_update_action_holders_add_tag_need_rev(self):
-        """Adding need-rev tag adds authors as action holders"""
+        """Adding need-rev tag drops AD and adds authors as action holders"""
         doc = self.doc_in_iesg_state('pub-req')
         first_author = self.authors[0]
         doc.action_holders.add(first_author)
+        doc.action_holders.add(doc.ad)
+        self.assertCountEqual(doc.action_holders.all(), [first_author, doc.ad])
+        self.update_doc_state(doc,
+                              doc.get_state('draft-iesg'),
+                              add_tags=['need-rev'],
+                              remove_tags=None)
+        self.assertCountEqual(doc.action_holders.all(), self.authors)
+        self.assertNotIn(self.ad, doc.action_holders.all())
+        
+        # Check case where an author is ad
+        doc = self.doc_in_iesg_state('pub-req')
+        doc.ad = first_author
+        doc.save()
+        doc.action_holders.add(first_author)
         self.assertCountEqual(doc.action_holders.all(), [first_author])
         self.update_doc_state(doc,
                               doc.get_state('draft-iesg'),
@@ -172,6 +203,12 @@ def test_update_action_holders_add_tag_need_rev_no_dups(self):
                               remove_tags=None)
         self.assertCountEqual(doc.action_holders.all(), self.authors)
 
+    def test_update_action_holders_add_tag_ad_f_up(self):
+        doc = self.doc_in_iesg_state('pub-req')
+        self.assertEqual(doc.action_holders.count(), 0)
+        self.update_doc_state(doc, doc.get_state('draft-iesg'), add_tags=['ad-f-up'])
+        self.assertCountEqual(doc.action_holders.all(), [self.ad])
+
     def test_update_action_holders_remove_tag_need_rev(self):
         """Removing need-rev tag drops authors as action holders"""
         doc = self.doc_in_iesg_state('pub-req')
@@ -186,13 +223,14 @@ def test_update_action_holders_remove_tag_need_rev(self):
     def test_update_action_holders_add_tag_need_rev_ignores_non_authors(self):
         """Adding need-rev tag does not affect existing action holders"""
         doc = self.doc_in_iesg_state('pub-req')
-        doc.action_holders.add(self.ad)
-        self.assertCountEqual(doc.action_holders.all(),[self.ad])
+        other_person = PersonFactory()
+        doc.action_holders.add(other_person)
+        self.assertCountEqual(doc.action_holders.all(),[other_person])
         self.update_doc_state(doc,
                               doc.get_state('draft-iesg'),
                               add_tags=['need-rev'],
                               remove_tags=None)
-        self.assertCountEqual(doc.action_holders.all(), [self.ad] + self.authors)
+        self.assertCountEqual(doc.action_holders.all(), [other_person] + self.authors)
 
     def test_update_action_holders_remove_tag_need_rev_ignores_non_authors(self):
         """Removing need-rev tag does not affect non-author action holders"""
@@ -248,41 +286,49 @@ def test_update_documentauthors_with_nulls(self):
         self.assertEqual(docauth.country, '')
 
     def do_fuzzy_find_documents_rfc_test(self, name):
-        rfc = WgRfcFactory(name=name, create_revisions=(0, 1, 2))
-        rfc = Document.objects.get(pk=rfc.pk)  # clear out any cached values
+        draft = WgDraftFactory(name=name, create_revisions=(0, 1, 2))
+        rfc = WgRfcFactory()
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
+        draft, rfc = reload_db_objects(draft, rfc)
 
         # by canonical name
-        found = fuzzy_find_documents(rfc.canonical_name(), None)
+        found = fuzzy_find_documents(rfc.name, None)
         self.assertCountEqual(found.documents, [rfc])
         self.assertEqual(found.matched_rev, None)
-        self.assertEqual(found.matched_name, rfc.canonical_name())
+        self.assertEqual(found.matched_name, rfc.name)
 
         # by draft name, no rev
-        found = fuzzy_find_documents(rfc.name, None)
-        self.assertCountEqual(found.documents, [rfc])
+        found = fuzzy_find_documents(draft.name, None)
+        self.assertCountEqual(found.documents, [draft])
         self.assertEqual(found.matched_rev, None)
-        self.assertEqual(found.matched_name, rfc.name)
+        self.assertEqual(found.matched_name, draft.name)
 
         # by draft name, latest rev
-        found = fuzzy_find_documents(rfc.name, '02')
-        self.assertCountEqual(found.documents, [rfc])
+        found = fuzzy_find_documents(draft.name, '02')
+        self.assertCountEqual(found.documents, [draft])
         self.assertEqual(found.matched_rev, '02')
-        self.assertEqual(found.matched_name, rfc.name)
+        self.assertEqual(found.matched_name, draft.name)
 
         # by draft name, earlier rev
-        found = fuzzy_find_documents(rfc.name, '01')
-        self.assertCountEqual(found.documents, [rfc])
+        found = fuzzy_find_documents(draft.name, '01')
+        self.assertCountEqual(found.documents, [draft])
         self.assertEqual(found.matched_rev, '01')
-        self.assertEqual(found.matched_name, rfc.name)
+        self.assertEqual(found.matched_name, draft.name)
 
         # wrong name or revision
-        found = fuzzy_find_documents(rfc.name + '-incorrect')
+        found = fuzzy_find_documents(draft.name + '-incorrect')
         self.assertCountEqual(found.documents, [], 'Should not find document that does not match')
-        found = fuzzy_find_documents(rfc.name + '-incorrect', '02')
+        found = fuzzy_find_documents(draft.name + '-incorrect', '02')
         self.assertCountEqual(found.documents, [], 'Still should not find document, even with a version')
-        found = fuzzy_find_documents(rfc.name, '22')
-        self.assertCountEqual(found.documents, [rfc],
+        found = fuzzy_find_documents(draft.name, '22')
+        self.assertCountEqual(found.documents, [draft],
                               'Should find document even if rev does not exist')
+        
+        # by rfc name mistakenly trying to provide a revision
+        found = fuzzy_find_documents(rfc.name+"-22")
+        self.assertCountEqual(found.documents, [rfc], "Should ignore versions when fuzzyfinding RFCs" )
+        found = fuzzy_find_documents(rfc.name,"22")
+        self.assertCountEqual(found.documents, [rfc], "Should ignore versions when fuzzyfinding RFCs" )
 
 
     def test_fuzzy_find_documents(self):
@@ -292,35 +338,59 @@ def test_fuzzy_find_documents(self):
         self.do_fuzzy_find_documents_rfc_test('draft-name-that-has-two-02-04')
         self.do_fuzzy_find_documents_rfc_test('draft-wild-01-numbers-0312')
 
+    @override_settings(RFC_FILE_TYPES=['pdf'], IDSUBMIT_FILE_TYPES=['xml'])
+    @patch('ietf.doc.utils.os.path.exists', return_value=True)
+    def test_build_file_urls(self, mocked):
+        # a cursory test only - does not check details of how URLs are constructed
+        self.assertEqual(
+            build_file_urls(DocumentFactory(type_id='statchg')), ([], []),
+            'Non-draft Document should return empty sets'
+        )
+
+        with self.assertRaises(AssertionError):
+            build_file_urls(WgDraftFactory(rev=''))
+
+        urls, types = build_file_urls(WgDraftFactory(rev='23'))
+        self.assertEqual(['xml', 'bibtex', 'bibxml'], [t for t, _ in urls])
+        self.assertEqual(types, ['xml'])
+
+        urls, types = build_file_urls(WgRfcFactory(rev=''))
+        self.assertEqual(['pdf', 'bibtex'], [t for t, _ in urls])
+        self.assertEqual(types, ['pdf'])
+
+        urls, types = build_file_urls(WgRfcFactory(rev='23'))
+        self.assertEqual(['pdf', 'bibtex'], [t for t, _ in urls])
+        self.assertEqual(types, ['pdf'])
+
 
 class RebuildReferenceRelationsTests(TestCase):
     def setUp(self):
         super().setUp()
         self.doc = WgDraftFactory()  # document under test
         # Other documents that should be found by rebuild_reference_relations
-        self.normative, self.informative, self.unknown = WgRfcFactory.create_batch(3)
+        self.normative, self.informative, self.unknown = WgRfcFactory.create_batch(3) # AMHERE - these need to have rfc names.
         for relationship in ['refnorm', 'refinfo', 'refunk', 'refold']:
             self.doc.relateddocument_set.create(
-                target=WgRfcFactory().docalias.first(),
+                target=WgRfcFactory(),
                 relationship_id=relationship,
             )
         self.updated = WgRfcFactory()  # related document that should be left alone
-        self.doc.relateddocument_set.create(target=self.updated.docalias.first(), relationship_id='updates')
+        self.doc.relateddocument_set.create(target=self.updated, relationship_id='updates')
         self.assertCountEqual(self.doc.relateddocument_set.values_list('relationship__slug', flat=True),
                               ['refnorm', 'refinfo', 'refold', 'refunk', 'updates'],
                               'Test conditions set up incorrectly: wrong prior document relationships')
         for other_doc in [self.normative, self.informative, self.unknown]:
             self.assertEqual(
-                self.doc.relateddocument_set.filter(target__name=other_doc.canonical_name()).count(),
+                self.doc.relateddocument_set.filter(target__name=other_doc.name).count(),
                 0,
                 'Test conditions set up incorrectly: new documents already related',
             )
 
     def _get_refs_return_value(self):
         return {
-            self.normative.canonical_name(): Draft.REF_TYPE_NORMATIVE,
-            self.informative.canonical_name(): Draft.REF_TYPE_INFORMATIVE,
-            self.unknown.canonical_name(): Draft.REF_TYPE_UNKNOWN,
+            self.normative.name: Draft.REF_TYPE_NORMATIVE,
+            self.informative.name: Draft.REF_TYPE_INFORMATIVE,
+            self.unknown.name: Draft.REF_TYPE_UNKNOWN,
             'draft-not-found': Draft.REF_TYPE_NORMATIVE,
         }
 
@@ -328,13 +398,13 @@ def test_requires_txt_or_xml(self):
         result = rebuild_reference_relations(self.doc, {})
         self.assertCountEqual(result.keys(), ['errors'])
         self.assertEqual(len(result['errors']), 1)
-        self.assertIn('No draft text available', result['errors'][0],
-                      'Error should be reported if no draft file is given')
+        self.assertIn('No file available', result['errors'][0],
+                      'Error should be reported if no Internet-Draft file is given')
 
         result = rebuild_reference_relations(self.doc, {'md': 'cant-do-this.md'})
         self.assertCountEqual(result.keys(), ['errors'])
         self.assertEqual(len(result['errors']), 1)
-        self.assertIn('No draft text available', result['errors'][0],
+        self.assertIn('No file available', result['errors'][0],
                       'Error should be reported if no XML or plaintext file is given')
 
     @patch.object(XMLDraft, 'get_refs')
@@ -351,7 +421,7 @@ def test_xml(self, mock_init, mock_get_refs):
         self.assertEqual(
             result,
             {
-                'warnings': ['There were 1 references with no matching DocAlias'],
+                'warnings': ['There were 1 references with no matching Document'],
                 'unfound': ['draft-not-found'],
             }
         )
@@ -359,10 +429,10 @@ def test_xml(self, mock_init, mock_get_refs):
         self.assertCountEqual(
             self.doc.relateddocument_set.values_list('target__name', 'relationship__slug'),
             [
-                (self.normative.canonical_name(), 'refnorm'),
-                (self.informative.canonical_name(), 'refinfo'),
-                (self.unknown.canonical_name(), 'refunk'),
-                (self.updated.docalias.first().name, 'updates'),
+                (self.normative.name, 'refnorm'),
+                (self.informative.name, 'refinfo'),
+                (self.unknown.name, 'refunk'),
+                (self.updated.name, 'updates'),
             ]
         )
 
@@ -382,7 +452,7 @@ def test_plaintext(self, mock_init, mock_get_refs):
         self.assertEqual(
             result,
             {
-                'warnings': ['There were 1 references with no matching DocAlias'],
+                'warnings': ['There were 1 references with no matching Document'],
                 'unfound': ['draft-not-found'],
             }
         )
@@ -390,10 +460,10 @@ def test_plaintext(self, mock_init, mock_get_refs):
         self.assertCountEqual(
             self.doc.relateddocument_set.values_list('target__name', 'relationship__slug'),
             [
-                (self.normative.canonical_name(), 'refnorm'),
-                (self.informative.canonical_name(), 'refinfo'),
-                (self.unknown.canonical_name(), 'refunk'),
-                (self.updated.docalias.first().name, 'updates'),
+                (self.normative.name, 'refnorm'),
+                (self.informative.name, 'refinfo'),
+                (self.unknown.name, 'refunk'),
+                (self.updated.name, 'updates'),
             ]
         )
 
@@ -414,7 +484,7 @@ def test_xml_and_plaintext(self, mock_init, mock_get_refs, mock_plaintext_init):
         self.assertEqual(
             result,
             {
-                'warnings': ['There were 1 references with no matching DocAlias'],
+                'warnings': ['There were 1 references with no matching Document'],
                 'unfound': ['draft-not-found'],
             }
         )
@@ -422,9 +492,208 @@ def test_xml_and_plaintext(self, mock_init, mock_get_refs, mock_plaintext_init):
         self.assertCountEqual(
             self.doc.relateddocument_set.values_list('target__name', 'relationship__slug'),
             [
-                (self.normative.canonical_name(), 'refnorm'),
-                (self.informative.canonical_name(), 'refinfo'),
-                (self.unknown.canonical_name(), 'refunk'),
-                (self.updated.docalias.first().name, 'updates'),
+                (self.normative.name, 'refnorm'),
+                (self.informative.name, 'refinfo'),
+                (self.unknown.name, 'refunk'),
+                (self.updated.name, 'updates'),
             ]
         )
+
+
+class DraftBibxmlTests(TestCase):
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ["BIBXML_BASE_PATH"]
+
+    def test_ensure_draft_bibxml_path_exists(self):
+        expected = Path(settings.BIBXML_BASE_PATH) / "bibxml-ids"
+        self.assertFalse(expected.exists())
+        ensure_draft_bibxml_path_exists()
+        self.assertTrue(expected.is_dir())  # false if does not exist or is not dir
+
+    @patch("ietf.doc.utils.bibxml_for_draft", return_value="This\ris\nmy\r\nbibxml")
+    def test_create_draft_bibxml_file(self, mock):
+        bibxml_path = Path(settings.BIBXML_BASE_PATH) / "bibxml-ids"
+        bibxml_path.mkdir(exist_ok=False)  # expect to start with a clean slate
+        
+        doc = DocumentFactory()
+        ref_path = bibxml_path / f"reference.I-D.{doc.name}-26.xml"  # we're pretending it's rev 26
+        
+        update_or_create_draft_bibxml_file(doc, "26")
+        self.assertEqual(mock.call_count, 1)
+        self.assertEqual(mock.call_args, call(doc, "26"))
+        self.assertEqual(ref_path.read_text(), "This\nis\nmy\nbibxml")
+
+    @patch("ietf.doc.utils.bibxml_for_draft", return_value="This\ris\nmy\r\nbibxml")
+    def test_update_draft_bibxml_file(self, mock):
+        bibxml_path = Path(settings.BIBXML_BASE_PATH) / "bibxml-ids"
+        bibxml_path.mkdir(exist_ok=False)  # expect to start with a clean slate
+        
+        doc = DocumentFactory()
+        ref_path = bibxml_path / f"reference.I-D.{doc.name}-26.xml"  # we're pretending it's rev 26
+        ref_path.write_text("Old data")
+
+        # should replace it
+        update_or_create_draft_bibxml_file(doc, "26")
+        self.assertEqual(mock.call_count, 1)
+        self.assertEqual(mock.call_args, call(doc, "26"))
+        self.assertEqual(ref_path.read_text(), "This\nis\nmy\nbibxml")
+
+        # should leave it alone if it differs only by leading/trailing whitespace
+        mock.reset_mock()
+        mock.return_value = "   \n  This\nis\nmy\nbibxml  "
+        update_or_create_draft_bibxml_file(doc, "26")
+        self.assertEqual(mock.call_count, 1)
+        self.assertEqual(mock.call_args, call(doc, "26"))
+        self.assertEqual(ref_path.read_text(), "This\nis\nmy\nbibxml")
+
+
+class LastBallotDocRevisionTests(TestCase):
+    def test_last_ballot_doc_revision(self):
+        now = timezone.now()
+        ad = Person.objects.get(user__username="ad")
+        bpde_with_null_send_email = BallotPositionDocEventFactory(
+            time=now - datetime.timedelta(minutes=30),
+            send_email=None,
+        )
+        ballot = bpde_with_null_send_email.ballot
+        BallotPositionDocEventFactory(
+            ballot=ballot,
+            balloter=ad,
+            pos_id='noobj',
+            comment='Commentary',
+            comment_time=timezone.now(),
+            send_email=None,
+        )
+        doc = bpde_with_null_send_email.doc
+        rev = bpde_with_null_send_email.rev
+        nobody = PersonFactory()
+        self.assertIsNone(last_ballot_doc_revision(doc, nobody))
+        self.assertEqual(rev, last_ballot_doc_revision(doc, ad))
+
+
+class UtilsRedTests(TestCase):
+    @mock.patch("ietf.doc.utils_red.log")
+    @mock.patch("ietf.doc.utils_red.requests.post")
+    def test_trigger_red_precomputer_not_configured(self, mock_post, mock_log):
+        with override_settings():
+            try:
+                del settings.CUSTOM_SETTING_NAME
+            except AttributeError:
+                pass
+            trigger_red_precomputer(rfc_number_list=[1, 2, 3])
+            self.assertEqual(mock_log.call_count, 1)
+            mock_args, _ = mock_log.call_args
+            self.assertEqual(
+                mock_args,
+                ("No URL configured for triggering red precompute multiple, skipping",),
+            )
+
+        mock_log.reset_mock()
+        with override_settings(TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL=None):
+            trigger_red_precomputer(rfc_number_list=[1, 2, 3])
+            self.assertFalse(mock_post.called)
+            self.assertEqual(mock_log.call_count, 1)
+            mock_args, _ = mock_log.call_args
+            self.assertEqual(
+                mock_args,
+                ("No URL configured for triggering red precompute multiple, skipping",),
+            )
+
+    @override_settings(
+        TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL="urlbits",
+    )
+    @mock.patch("ietf.doc.utils_red.log")
+    @mock.patch("ietf.doc.utils_red.requests.post", side_effect=requests.Timeout())
+    def test_trigger_red_precomputer_swallows_timeout_exception(
+        self, mock_post, mock_log
+    ):
+        exception_raised = False
+        try:
+            trigger_red_precomputer(rfc_number_list=[1, 2, 3])
+        except Exception:
+            exception_raised = True
+        self.assertFalse(exception_raised)
+        self.assertEqual(mock_log.call_count, 2)
+        # only checking the last log call
+        mock_args, _ = mock_log.call_args
+        self.assertEqual(len(mock_args), 1)
+        self.assertIn("POST request timed out", mock_args[0])
+
+    @override_settings(
+        TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL="urlbits",
+    )
+    @mock.patch("ietf.doc.utils_red.requests.post", side_effect=Exception())
+    def test_trigger_red_precomputer_does_not_swallow_too_much(self, mock_post):
+        exception_raised = False
+        try:
+            trigger_red_precomputer(rfc_number_list=[1, 2, 3])
+        except Exception:
+            exception_raised = True
+        self.assertTrue(exception_raised)
+
+    @override_settings(
+        TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL="urlbits",
+        DEFAULT_REQUESTS_TIMEOUT=314159265,
+    )
+    @mock.patch("ietf.doc.utils_red.log")
+    @mock.patch("ietf.doc.utils_red.requests.post")
+    def test_trigger_red_precomputer(self, mock_post, mock_log):
+        mock_post.return_value = mock.Mock(status_code=200)
+        trigger_red_precomputer(rfc_number_list=[1, 2, 3])
+        self.assertTrue(mock_post.called)
+        _, mock_kwargs = mock_post.call_args
+        self.assertIn("url", mock_kwargs)
+        self.assertEqual(mock_kwargs["url"], "urlbits")
+        self.assertIn("json", mock_kwargs)
+        self.assertEqual(mock_kwargs["json"], {"rfcs": "1,2,3"})
+        self.assertIn("timeout", mock_kwargs)
+        self.assertEqual(mock_kwargs["timeout"], 314159265)
+        self.assertEqual(mock_log.call_count, 1)  # Not testing the first info log value
+        mock_log.reset_mock()
+        mock_post.reset_mock()
+        mock_post.return_value = mock.Mock(
+            status_code=500,
+        )
+        trigger_red_precomputer(rfc_number_list=[1, 2, 3])
+        self.assertEqual(mock_log.call_count, 2)
+        mock_args, _ = mock_log.call_args
+        self.assertEqual(len(mock_args), 1)
+        expected = f"POST request failed for {settings.TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL} : status_code=500"
+        self.assertEqual(mock_args[0], expected)
+
+
+class UtilsR2TestCase(TestCase):
+    def test_rfcs_are_in_r2(self):
+        rfcs = WgRfcFactory.create_batch(2)
+        rfc_name_list = [rfc.name for rfc in rfcs]
+        rfc_number_list = [rfc.rfc_number for rfc in rfcs]
+        r2_rfc_bucket = storages["r2-rfc"]
+        # Right now the various doc Factories do not populate any content
+        self.assertEqual(
+            StoredObject.objects.filter(
+                store="rfc", doc_name__in=rfc_name_list
+            ).count(),
+            0,
+        )
+        self.assertTrue(rfcs_are_in_r2(rfc_number_list=rfc_number_list))
+        for rfc in rfcs:
+            store_str(
+                kind="rfc",
+                name=f"testartifact/{rfc.name}.testartifact",
+                content="",
+                doc_name=rfc.name,
+                doc_rev=None,
+            )
+        self.assertEqual(
+            StoredObject.objects.filter(
+                store="rfc", doc_name__in=rfc_name_list
+            ).count(),
+            2,
+        )
+        self.assertFalse(rfcs_are_in_r2(rfc_number_list=rfc_number_list))
+        r2_rfc_bucket.save(f"testartifact/{rfcs[0].name}.testartifact", BytesIO(b""))
+        self.assertFalse(rfcs_are_in_r2(rfc_number_list=rfc_number_list))
+        r2_rfc_bucket.save(f"testartifact/{rfcs[1].name}.testartifact", BytesIO(b""))
+        self.assertTrue(rfcs_are_in_r2(rfc_number_list=rfc_number_list))
+
+
+
diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py
index 65b8bb4d17..0c13503b78 100644
--- a/ietf/doc/urls.py
+++ b/ietf/doc/urls.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2020, All Rights Reserved
+# Copyright The IETF Trust 2009-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
@@ -33,11 +33,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-from django.conf.urls import include
-from django.views.generic import RedirectView
 from django.conf import settings
+from django.urls import include
+from django.views.generic import RedirectView
 
-from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_downref, views_stats, views_help, views_bofreq
+from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_downref, views_stats, views_help, views_bofreq, views_statement
 from ietf.utils.urls import url
 
 session_patterns = [
@@ -53,11 +53,13 @@
     url(r'^ad/?$', views_search.ad_workload),
     url(r'^ad/(?P<name>[^/]+)/?$', views_search.docs_for_ad),
     url(r'^ad2/(?P<name>[\w.-]+)/$', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)),
+    url(r'^for_iesg/?$', RedirectView.as_view(pattern_name='ietf.doc.views_search.docs_for_iesg', permanent=False)),
     url(r'^rfc-status-changes/?$', views_status_change.rfc_status_changes),
     url(r'^start-rfc-status-change/(?:%(name)s/)?$' % settings.URL_REGEXPS, views_status_change.start_rfc_status_change),
     url(r'^bof-requests/?$', views_bofreq.bof_requests),
     url(r'^bof-requests/new/$', views_bofreq.new_bof_request),
-    url(r'^iesg/?$', views_search.drafts_in_iesg_process),
+    url(r'^statement/new/$', views_statement.new_statement),
+    url(r'^iesg/?$', views_search.docs_for_iesg),
     url(r'^email-aliases/?$', views_doc.email_aliases),
     url(r'^downref/?$', views_downref.downref_registry),
     url(r'^downref/add/?$', views_downref.downref_registry_add),
@@ -65,17 +67,15 @@
         r"^shepherdwriteup-template/(?P<type>\w+)/?$",
         views_doc.document_shepherd_writeup_template,
     ),
+    url(r'^investigate/?$', views_doc.investigate),
 
-    url(r'^stats/newrevisiondocevent/?$', views_stats.chart_newrevisiondocevent),
-    url(r'^stats/newrevisiondocevent/conf/?$', views_stats.chart_conf_newrevisiondocevent),
-    url(r'^stats/newrevisiondocevent/data/?$', views_stats.chart_data_newrevisiondocevent),
     url(r'^stats/person/(?P<id>[0-9]+)/drafts/conf/?$', views_stats.chart_conf_person_drafts),
     url(r'^stats/person/(?P<id>[0-9]+)/drafts/data/?$', views_stats.chart_data_person_drafts),
 
 # This block should really all be at the idealized docs.ietf.org service
     url(r'^html/(?P<name>bcp[0-9]+?)(\.txt|\.html)?/?$', RedirectView.as_view(url=settings.RFC_EDITOR_INFO_BASE_URL+"%(name)s", permanent=False)), 
     url(r'^html/(?P<name>std[0-9]+?)(\.txt|\.html)?/?$', RedirectView.as_view(url=settings.RFC_EDITOR_INFO_BASE_URL+"%(name)s", permanent=False)), 
-    url(r'^html/%(name)s(?:-%(rev)s)?(\.txt|\.html)?/?$' % settings.URL_REGEXPS, views_doc.document_html),
+    url(r'^html/%(name)s(?:-(?P<rev>[0-9]{2}(-[0-9]{2})?))?(\.txt|\.html)?/?$' % settings.URL_REGEXPS, views_doc.document_html),
 
     url(r'^id/%(name)s(?:-%(rev)s)?(?:\.(?P<ext>(txt|html|xml)))?/?$' % settings.URL_REGEXPS, views_doc.document_raw_id),
     url(r'^pdf/%(name)s(?:-%(rev)s)?(?:\.(?P<ext>[a-z]+))?/?$' % settings.URL_REGEXPS, views_doc.document_pdfized),
@@ -85,20 +85,22 @@
     url(r'^html/(?P<name>[Rr][Ff][Cc] [0-9]+?)(\.txt|\.html)?/?$', views_doc.document_html),
     url(r'^idnits2-rfcs-obsoleted/?$', views_doc.idnits2_rfcs_obsoleted),
     url(r'^idnits2-rfc-status/?$', views_doc.idnits2_rfc_status),
-# These two are proof-of-concept of a service that would redirect to the latest version
-#    url(r'^rfcdiff-latest/%(name)s(?:-%(rev)s)?(\.txt|\.html)?/?$' % settings.URL_REGEXPS, views_doc.rfcdiff_latest),
-#    url(r'^rfcdiff-latest/(?P<name>[Rr][Ff][Cc] [0-9]+?)(\.txt|\.html)?/?$', views_doc.rfcdiff_latest),
-    url(r'^rfcdiff-latest-json/%(name)s(?:-%(rev)s)?(\.txt|\.html)?/?$' % settings.URL_REGEXPS, views_doc.rfcdiff_latest_json),
-    url(r'^rfcdiff-latest-json/(?P<name>[Rr][Ff][Cc] [0-9]+?)(\.txt|\.html)?/?$', views_doc.rfcdiff_latest_json),
 
     url(r'^all/?$', views_search.index_all_drafts),
     url(r'^active/?$', views_search.index_active_drafts),
     url(r'^recent/?$', views_search.recent_drafts),
-    url(r'^select2search/(?P<model_name>(document|docalias))/(?P<doc_type>draft)/$', views_search.ajax_select2_search_docs),
+    url(r'^select2search/(?P<model_name>document)/(?P<doc_type>(draft|rfc|all))/$', views_search.ajax_select2_search_docs),
     url(r'^ballots/irsg/$', views_ballot.irsg_ballot_status),
+    url(r'^ballots/rsab/$', views_ballot.rsab_ballot_status),
+
+    url(r'^build-position-email/$', views_ballot.ajax_build_position_email),
+
+    url(r'^(?P<type_id>(bcp|std|fyi))/?$', views_search.index_subseries),
 
     url(r'^%(name)s(?:/%(rev)s)?/$' % settings.URL_REGEXPS, views_doc.document_main),
     url(r'^%(name)s(?:/%(rev)s)?/bibtex/$' % settings.URL_REGEXPS, views_doc.document_bibtex),
+    url(r'^rfc(?P<number>[0-9]+)/notprepped/$' , views_doc.rfcxml_notprepped),
+    url(r'^rfc(?P<number>[0-9]+)/notprepped-wrapper/$', views_doc.rfcxml_notprepped_wrapper),
     url(r'^%(name)s(?:/%(rev)s)?/idnits2-state/$' % settings.URL_REGEXPS, views_doc.idnits2_state),
     url(r'^bibxml3/reference.I-D.%(name)s(?:-%(rev)s)?.xml$' % settings.URL_REGEXPS, views_doc.document_bibxml_ref),
     url(r'^bibxml3/%(name)s(?:-%(rev)s)?.xml$' % settings.URL_REGEXPS, views_doc.document_bibxml),
@@ -110,9 +112,9 @@
     url(r'^%(name)s/referencedby/$' % settings.URL_REGEXPS, views_doc.document_referenced_by),
     url(r'^%(name)s/ballot/(iesg/)?$' % settings.URL_REGEXPS, views_doc.document_ballot),
     url(r'^%(name)s/ballot/irsg/$' % settings.URL_REGEXPS, views_doc.document_irsg_ballot),
+    url(r'^%(name)s/ballot/rsab/$' % settings.URL_REGEXPS, views_doc.document_rsab_ballot),
     url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.document_ballot),
     url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/position/$' % settings.URL_REGEXPS, views_ballot.edit_position),
-    url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/emailposition/$' % settings.URL_REGEXPS, views_ballot.send_ballot_comment),
     url(r'^%(name)s/(?:%(rev)s/)?doc.json$' % settings.URL_REGEXPS, views_doc.document_json),
     url(r'^%(name)s/ballotpopup/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.ballot_popup),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/reviewrequest/', include("ietf.doc.urls_review")),
@@ -125,6 +127,7 @@
     url(r'^%(name)s/edit/info/$' % settings.URL_REGEXPS, views_draft.edit_info),
     url(r'^%(name)s/edit/requestresurrect/$' % settings.URL_REGEXPS, views_draft.request_resurrect),
     url(r'^%(name)s/edit/submit-to-iesg/$' % settings.URL_REGEXPS, views_draft.to_iesg),
+    url(r'^%(name)s/edit/issue-wg-lc/$' % settings.URL_REGEXPS, views_draft.issue_wg_lc),
     url(r'^%(name)s/edit/resurrect/$' % settings.URL_REGEXPS, views_draft.resurrect),
     url(r'^%(name)s/edit/addcomment/$' % settings.URL_REGEXPS, views_doc.add_comment),
 
@@ -136,7 +139,6 @@
     url(r'^%(name)s/edit/suggested-replaces/$' % settings.URL_REGEXPS, views_draft.review_possibly_replaces),
     url(r'^%(name)s/edit/status/$' % settings.URL_REGEXPS, views_draft.change_intention),
     url(r'^%(name)s/edit/telechat/$' % settings.URL_REGEXPS, views_doc.telechat_date),
-    url(r'^%(name)s/edit/iesgnote/$' % settings.URL_REGEXPS, views_draft.edit_iesg_note),
     url(r'^%(name)s/edit/ad/$' % settings.URL_REGEXPS, views_draft.edit_ad),
     url(r'^%(name)s/edit/authors/$' % settings.URL_REGEXPS, views_doc.edit_authors),
     url(r'^%(name)s/edit/consensus/$' % settings.URL_REGEXPS, views_draft.edit_consensus),
@@ -144,9 +146,14 @@
     url(r'^%(name)s/edit/shepherdemail/$' % settings.URL_REGEXPS, views_draft.change_shepherd_email),
     url(r'^%(name)s/edit/shepherdwriteup/$' % settings.URL_REGEXPS, views_draft.edit_shepherd_writeup),
     url(r'^%(name)s/edit/requestpublication/$' % settings.URL_REGEXPS, views_draft.request_publication),
+    url(r'^%(name)s/edit/ask-about-ietf-adoption/$' % settings.URL_REGEXPS, views_draft.ask_about_ietf_adoption_call),
     url(r'^%(name)s/edit/adopt/$' % settings.URL_REGEXPS, views_draft.adopt_draft),
+    url(r'^%(name)s/edit/issue-wg-call-for-adoption/%(acronym)s/$' % settings.URL_REGEXPS, views_draft.issue_wg_call_for_adoption),
+
     url(r'^%(name)s/edit/release/$' % settings.URL_REGEXPS, views_draft.release_draft),
     url(r'^%(name)s/edit/state/(?P<state_type>draft-stream-[a-z]+)/$' % settings.URL_REGEXPS, views_draft.change_stream_state),
+    url(r'^%(name)s/edit/wg-action-helpers/$' % settings.URL_REGEXPS, views_draft.offer_wg_action_helpers),
+    url(r'^%(name)s/edit/state/statement/$' % settings.URL_REGEXPS, views_statement.change_statement_state),
 
     url(r'^%(name)s/edit/clearballot/(?P<ballot_type_slug>[\w-]+)/$' % settings.URL_REGEXPS, views_ballot.clear_ballot),
     url(r'^%(name)s/edit/deferballot/$' % settings.URL_REGEXPS, views_ballot.defer_ballot),
@@ -161,7 +168,10 @@
     url(r'^%(name)s/edit/resources/$' % settings.URL_REGEXPS, views_draft.edit_doc_extresources),
     url(r'^%(name)s/edit/issueballot/irsg/$' % settings.URL_REGEXPS, views_ballot.issue_irsg_ballot),
     url(r'^%(name)s/edit/closeballot/irsg/$' % settings.URL_REGEXPS, views_ballot.close_irsg_ballot),
+    url(r'^%(name)s/edit/issueballot/rsab/$' % settings.URL_REGEXPS, views_ballot.issue_rsab_ballot),
+    url(r'^%(name)s/edit/closeballot/rsab/$' % settings.URL_REGEXPS, views_ballot.close_rsab_ballot),
 
+    url(r'^help/state/?$', views_help.state_index),
     url(r'^help/state/(?P<type>[\w-]+)/$', views_help.state_help),
     url(r'^help/relationships/$', views_help.relationship_help),
     url(r'^help/relationships/(?P<subset>\w+)/$', views_help.relationship_help),
@@ -170,10 +180,15 @@
 
     url(r'^%(charter)s/' % settings.URL_REGEXPS, include('ietf.doc.urls_charter')),
     url(r'^%(bofreq)s/' % settings.URL_REGEXPS, include('ietf.doc.urls_bofreq')),
+    url(r'^%(statement)s/' % settings.URL_REGEXPS, include('ietf.doc.urls_statement')),
     url(r'^%(name)s/conflict-review/' % settings.URL_REGEXPS, include('ietf.doc.urls_conflict_review')),
     url(r'^%(name)s/status-change/' % settings.URL_REGEXPS, include('ietf.doc.urls_status_change')),
     url(r'^%(name)s/material/' % settings.URL_REGEXPS, include('ietf.doc.urls_material')),
     url(r'^%(name)s/session/' % settings.URL_REGEXPS, include('ietf.doc.urls_material')),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/session/', include(session_patterns)),
     url(r'^(?P<name>[A-Za-z0-9\._\+\-]+)$', views_search.search_for_name),
+    # rfcdiff - latest versions - keep old URLs alive during migration period
+    url(r'^rfcdiff-latest-json/%(name)s(?:-%(rev)s)?(\.txt|\.html)?/?$' % settings.URL_REGEXPS, RedirectView.as_view(pattern_name='ietf.api.views.rfcdiff_latest_json', permanent=True)),
+    url(r'^rfcdiff-latest-json/(?P<name>[Rr][Ff][Cc] [0-9]+?)(\.txt|\.html)?/?$', RedirectView.as_view(pattern_name='ietf.api.views.rfcdiff_latest_json', permanent=True)),
+    # end of rfcdiff support URLs
 ]
diff --git a/ietf/doc/urls_review.py b/ietf/doc/urls_review.py
index 1cc37f744e..0133444274 100644
--- a/ietf/doc/urls_review.py
+++ b/ietf/doc/urls_review.py
@@ -9,6 +9,7 @@
     url(r'^(?P<request_id>[0-9]+)/$', views_review.review_request),
     url(r'^(?P<request_id>[0-9]+)/login/$', views_review.review_request_forced_login),
     url(r'^(?P<request_id>[0-9]+)/close/$', views_review.close_request),
+    url(r'^(?P<request_id>[0-9]+)/addrequestcomment/$', views_review.add_request_comment),
     url(r'^(?P<request_id>[0-9]+)/assignreviewer/$', views_review.assign_reviewer),
     url(r'^(?P<assignment_id>[0-9]+)/rejectreviewerassignment/$', views_review.reject_reviewer_assignment),
     url(r'^(?P<assignment_id>[0-9]+)/complete/$', views_review.complete_review),
diff --git a/ietf/doc/urls_statement.py b/ietf/doc/urls_statement.py
new file mode 100644
index 0000000000..e130c453ba
--- /dev/null
+++ b/ietf/doc/urls_statement.py
@@ -0,0 +1,10 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.conf import settings
+from ietf.doc import views_statement
+from ietf.utils.urls import url
+
+urlpatterns = [
+    url(r"^(?:%(rev)s/)?pdf/$" % settings.URL_REGEXPS, views_statement.serve_pdf),
+    url(r"^submit/$", views_statement.submit),
+]
diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
index 01b529c5e7..8cbe5e8f3e 100644
--- a/ietf/doc/utils.py
+++ b/ietf/doc/utils.py
@@ -1,9 +1,8 @@
-# Copyright The IETF Trust 2011-2020, All Rights Reserved
+# Copyright The IETF Trust 2011-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
-import hashlib
 import io
 import json
 import math
@@ -11,34 +10,51 @@
 import re
 import textwrap
 
-from collections import defaultdict, namedtuple
-from urllib.parse import quote
+from collections import defaultdict, namedtuple, Counter
+from dataclasses import dataclass
+from hashlib import sha384
+from pathlib import Path
+from typing import Iterator, Optional, Union, Iterable
+from zoneinfo import ZoneInfo
 
 from django.conf import settings
 from django.contrib import messages
+from django.core.cache import caches
+from django.db.models import OuterRef
 from django.forms import ValidationError
 from django.http import Http404
 from django.template.loader import render_to_string
+from django.utils import timezone
 from django.utils.html import escape
 from django.urls import reverse as urlreverse
 
+from django_stubs_ext import QuerySetAny
 
 import debug                            # pyflakes:ignore
 from ietf.community.models import CommunityList
 from ietf.community.utils import docs_tracked_by_community_list
 
-from ietf.doc.models import Document, DocHistory, State, DocumentAuthor, DocHistoryAuthor
-from ietf.doc.models import DocAlias, RelatedDocument, RelatedDocHistory, BallotType, DocReminder
+from ietf.doc.models import (
+    DocHistory,
+    DocHistoryAuthor,
+    Document,
+    DocumentAuthor,
+    RfcAuthor,
+    State, EditedRfcAuthorsDocEvent,
+)
+from ietf.doc.models import RelatedDocument, RelatedDocHistory, BallotType, DocReminder
 from ietf.doc.models import DocEvent, ConsensusDocEvent, BallotDocEvent, IRSGBallotDocEvent, NewRevisionDocEvent, StateDocEvent
-from ietf.doc.models import TelechatDocEvent, DocumentActionHolder, EditedAuthorsDocEvent
+from ietf.doc.models import TelechatDocEvent, DocumentActionHolder, EditedAuthorsDocEvent, BallotPositionDocEvent
 from ietf.name.models import DocReminderTypeName, DocRelationshipName
-from ietf.group.models import Role, Group
+from ietf.group.models import Role, Group, GroupFeatures
 from ietf.ietfauth.utils import has_role, is_authorized_in_doc_stream, is_individual_draft_author, is_bofreq_editor
-from ietf.person.models import Person
+from ietf.person.models import Email, Person
+from ietf.person.utils import get_active_balloters
 from ietf.review.models import ReviewWish
 from ietf.utils import draft, log
-from ietf.utils.mail import send_mail
+from ietf.utils.mail import parseaddr, send_mail
 from ietf.mailtrigger.utils import gather_address_lists
+from ietf.utils.timezone import date_today, datetime_from_date, datetime_today, DEADLINE_TZINFO
 from ietf.utils.xmldraft import XMLDraft
 
 
@@ -52,7 +68,7 @@ def get_model_fields_as_dict(obj):
     # copy fields
     fields = get_model_fields_as_dict(doc)
     fields["doc"] = doc
-    fields["name"] = doc.canonical_name()
+    fields["name"] = doc.name
 
     dochist = DocHistory(**fields)
     dochist.save()
@@ -114,6 +130,10 @@ def get_tags_for_stream_id(stream_id):
         return []
 
 def can_adopt_draft(user, doc):
+    """Answers whether a user can adopt a given draft into some stream/group.
+    
+    This does not answer, even by implicaiton, which streams/groups the user has authority to adopt into."""
+
     if not user.is_authenticated:
         return False
 
@@ -125,17 +145,29 @@ def can_adopt_draft(user, doc):
         return (doc.stream_id in (None, "irtf")
                 and doc.group.type_id == "individ")
 
-    roles = Role.objects.filter(name__in=("chair", "delegate", "secr"),
-                                group__type__in=("wg", "rg", "ag", "rag"),
-                                group__state="active",
-                                person__user=user)
-    role_groups = [ r.group for r in roles ]
+    for type_id, allowed_stream in (
+        ("wg", "ietf"),
+        ("rg", "irtf"),
+        ("ag", "ietf"),
+        ("rag", "irtf"),
+        ("edwg", "editorial"),
+    ):
+        if doc.stream_id in (None, allowed_stream):
+            if doc.group.type_id in ("individ", type_id):
+                if Role.objects.filter(
+                    name__in=GroupFeatures.objects.get(type_id=type_id).docman_roles,
+                    group__type_id = type_id,
+                    group__state = "active",
+                    person__user = user,
+                ).exists():
+                    return True
+                        
+    return False
 
-    return (doc.stream_id in (None, "ietf", "irtf")
-            and (doc.group.type_id == "individ" or (doc.group in role_groups and len(role_groups)>1))
-            and roles.exists())
 
 def can_unadopt_draft(user, doc):
+    # TODO: This should use docman_roles, and this implementation probably returns wrong answers
+    # For instance, should any WG chair be able to unadopt a group from any other WG
     if not user.is_authenticated:
         return False
     if has_role(user, "Secretariat"):
@@ -151,6 +183,8 @@ def can_unadopt_draft(user, doc):
     elif doc.stream_id == 'iab':
         return False    # Right now only the secretariat can add a document to the IAB stream, so we'll
                         # leave it where only the secretariat can take it out.
+    elif doc.stream_id == 'editorial':
+        return user.person.role_set.filter(name='chair', group__acronym='rswg').exists()
     else:
         return False
 
@@ -196,7 +230,7 @@ def needed_ballot_positions(doc, active_positions):
         else:
             related_set = RelatedDocHistory.objects.none()
         for rel in related_set.filter(relationship__slug__in=['tops', 'tois', 'tohist', 'toinf', 'tobcp', 'toexp']):
-            if (rel.target.document.std_level_id in ['bcp','ps','ds','std']) or (rel.relationship_id in ['tops','tois','tobcp']):
+            if (rel.target.std_level_id in ['bcp','ps','ds','std']) or (rel.relationship_id in ['tops','tois','tobcp']):
                 needed = two_thirds_rule(recused=len(recuse))
                 break
     else:
@@ -218,7 +252,6 @@ def needed_ballot_positions(doc, active_positions):
 
     return " ".join(answer)
 
-# Not done yet - modified version of above needed_ballot_positions
 def irsg_needed_ballot_positions(doc, active_positions):
     '''Returns text answering the question "what does this document
     need to pass?".  The return value is only useful if the document
@@ -246,6 +279,21 @@ def irsg_needed_ballot_positions(doc, active_positions):
 
     return " ".join(answer)
 
+def rsab_needed_ballot_positions(doc, active_positions):
+    count = Counter([p.pos_id if p else 'none' for p in active_positions])
+    answer = []
+    if count["concern"] > 0:
+        answer.append("Has a Concern position.")
+        # note RFC9280 section 3.2.2 item 12
+        # the "vote" mentioned there is a separate thing from ballot position.
+    if count["yes"] == 0:
+        # This is _implied_ by 9280 - a document shouldn't be
+        # approved if all RSAB members recuse
+        answer.append("Needs a YES position.")
+    if count["none"] > 0:
+        answer.append("Some members have have not taken a position.")
+    return " ".join(answer)
+        
 def create_ballot(request, doc, by, ballot_slug, time=None):
     closed = close_open_ballots(doc, by)
     for e in closed:
@@ -261,16 +309,14 @@ def create_ballot(request, doc, by, ballot_slug, time=None):
 def create_ballot_if_not_open(request, doc, by, ballot_slug, time=None, duedate=None):
     ballot_type = BallotType.objects.get(doc_type=doc.type, slug=ballot_slug)
     if not doc.ballot_open(ballot_slug):
+        kwargs = dict(type="created_ballot", by=by, doc=doc, rev=doc.rev)
         if time:
-            if duedate:
-                e = IRSGBallotDocEvent(type="created_ballot", by=by, doc=doc, rev=doc.rev, time=time, duedate=duedate)
-            else:
-                e = BallotDocEvent(type="created_ballot", by=by, doc=doc, rev=doc.rev, time=time)
+            kwargs['time'] = time
+        if doc.stream_id == 'irtf':
+            kwargs['duedate'] = duedate
+            e = IRSGBallotDocEvent(**kwargs)
         else:
-            if duedate:
-                e = IRSGBallotDocEvent(type="created_ballot", by=by, doc=doc, rev=doc.rev, duedate=duedate)
-            else:
-                e = BallotDocEvent(type="created_ballot", by=by, doc=doc, rev=doc.rev)
+            e = BallotDocEvent(**kwargs)
         e.ballot_type = ballot_type
         e.desc = 'Created "%s" ballot' % e.ballot_type.name
         e.save()
@@ -311,14 +357,12 @@ def augment_events_with_revision(doc, events):
     """Take a set of events for doc and add a .rev attribute with the
     revision they refer to by checking NewRevisionDocEvents."""
 
-    event_revisions = list(NewRevisionDocEvent.objects.filter(doc=doc).order_by('time', 'id').values('id', 'rev', 'time'))
-
-    if doc.type_id == "draft" and doc.get_state_slug() == "rfc":
-        # add fake "RFC" revision
-        e = doc.latest_event(type="published_rfc")
-        if e:
-            event_revisions.append(dict(id=e.id, time=e.time, rev="RFC"))
-            event_revisions.sort(key=lambda x: (x["time"], x["id"]))
+    # Need QuerySetAny instead of QuerySet until django-stubs 5.0.1
+    if isinstance(events, QuerySetAny):
+        qs = events.filter(newrevisiondocevent__isnull=False)
+    else:
+        qs = NewRevisionDocEvent.objects.filter(doc=doc)
+    event_revisions = list(qs.order_by('time', 'id').values('id', 'rev', 'time'))
 
     for e in sorted(events, key=lambda e: (e.time, e.id), reverse=True):
         while event_revisions and (e.time, e.id) < (event_revisions[-1]["time"], event_revisions[-1]["id"]):
@@ -336,42 +380,6 @@ def augment_events_with_revision(doc, events):
                 cur_rev = "00"
             e.rev = cur_rev
 
-def add_links_in_new_revision_events(doc, events, diff_revisions):
-    """Add direct .txt links and diff links to new_revision events."""
-    prev = None
-
-    diff_urls = dict(((name, revision), url) for name, revision, time, url in diff_revisions)
-
-    for e in sorted(events, key=lambda e: (e.time, e.id)):
-        if not e.type == "new_revision":
-            continue
-
-        for sub in ['newrevisiondocevent', 'submissiondocevent', ]:
-            if hasattr(e, sub):
-                e = getattr(e, sub)
-                break
-
-        if not (e.doc.name, e.rev) in diff_urls:
-            continue
-
-        full_url = diff_url = diff_urls[(e.doc.name, e.rev)]
-
-        if doc.type_id in "draft": # work around special diff url for drafts
-            full_url = "https://www.ietf.org/archive/id/" + diff_url + ".txt"
-
-        # build links
-        links = r'<a href="%s">\1</a>' % full_url
-        if prev:
-            links += ""
-
-        if prev != None:
-            links += ' (<a href="%s?url1=%s&amp;url2=%s">diff from previous</a>)' % (settings.RFCDIFF_BASE_URL, quote(prev, safe="~"), quote(diff_url, safe="~"))
-
-        # replace the bold filename part
-        e.desc = re.sub(r"<b>(.+-[0-9][0-9].txt)</b>", links, e.desc)
-
-        prev = diff_url
-
 
 def add_events_message_info(events):
     for e in events:
@@ -400,8 +408,12 @@ def get_unicode_document_content(key, filename, codec='utf-8', errors='ignore'):
 def tags_suffix(tags):
     return ("::" + "::".join(t.name for t in tags)) if tags else ""
 
-def add_state_change_event(doc, by, prev_state, new_state, prev_tags=None, new_tags=None, timestamp=None):
-    """Add doc event to explain that state change just happened."""
+
+def new_state_change_event(doc, by, prev_state, new_state, prev_tags=None, new_tags=None, timestamp=None):
+    """Create unsaved doc event to explain that state change just happened
+    
+    Returns None if no state change occurred.
+    """
     if prev_state and new_state:
         assert prev_state.type_id == new_state.type_id
 
@@ -421,7 +433,22 @@ def add_state_change_event(doc, by, prev_state, new_state, prev_tags=None, new_t
         e.desc += " from %s" % (prev_state.name + tags_suffix(prev_tags))
     if timestamp:
         e.time = timestamp
-    e.save()
+    return e  # not saved!
+
+
+def add_state_change_event(doc, by, prev_state, new_state, prev_tags=None, new_tags=None, timestamp=None):
+    """Add doc event to explain that state change just happened.
+    
+    Returns None if no state change occurred.
+    
+    Note: Creating a state change DocEvent will trigger notifications to be sent to people subscribed
+    to the doc via a CommunityList on its first save(). If you need to adjust the event (say, changing
+    its desc) before that notification is sent, use new_state_change_event() instead and save the
+    event after making your changes. 
+    """
+    e = new_state_change_event(doc, by, prev_state, new_state, prev_tags, new_tags, timestamp)
+    if e is not None:
+        e.save()
     return e
 
 
@@ -455,55 +482,125 @@ def add_action_holder_change_event(doc, by, prev_set, reason=None):
     )
 
 
+@dataclass
+class TagSetComparer:
+    before: set[str]
+    after: set[str]
+
+    def changed(self):
+        return self.before != self.after
+
+    def added(self, tag):
+        return tag in self.after and tag not in self.before
+
+    def removed(self, tag):
+        return tag in self.before and tag not in self.after
+
+
 def update_action_holders(doc, prev_state=None, new_state=None, prev_tags=None, new_tags=None):
     """Update the action holders for doc based on state transition
     
     Returns an event describing the change which should be passed to doc.save_with_history()
     
-    Only cares about draft-iesg state changes. Places where other state types are updated
-    may not call this method. If you add rules for updating action holders on other state
+    Only cares about draft-iesg state changes and draft expiration. 
+    Places where other state types are updated may not call this method. 
+    If you add rules for updating action holders on other state
     types, be sure this is called in the places that change that state.
     """
     # Should not call this with different state types
     if prev_state and new_state:
         assert prev_state.type_id == new_state.type_id
 
-    # Convert tags to sets of slugs    
-    prev_tag_slugs = {t.slug for t in (prev_tags or [])}
-    new_tag_slugs = {t.slug for t in (new_tags or [])}
+    # Convert tags to sets of slugs
+    tags = TagSetComparer(
+        before={t.slug for t in (prev_tags or [])},
+        after={t.slug for t in (new_tags or [])},
+    )
 
     # Do nothing if state / tag have not changed
-    if (prev_state == new_state) and (prev_tag_slugs == new_tag_slugs):
+    if (prev_state == new_state) and not tags.changed():
         return None
     
     # Remember original list of action holders to later check if it changed
     prev_set = list(doc.action_holders.all())
-    # Only draft-iesg states are of interest (for now)
-    if (prev_state != new_state) and (getattr(new_state, 'type_id') == 'draft-iesg'):
-        # Clear the action_holders list on a state change. This will reset the age of any that get added back.
+
+    if new_state and new_state.type_id=="draft" and new_state.slug=="expired":
         doc.action_holders.clear()
-        if doc.ad and new_state.slug not in DocumentActionHolder.CLEAR_ACTION_HOLDERS_STATES:
-            # Default to responsible AD for states other than these
-            doc.action_holders.add(doc.ad)
-    
-    if prev_tag_slugs != new_tag_slugs:
-        # If we have added or removed the need-rev tag, add or remove authors as action holders
-        if ('need-rev' in prev_tag_slugs) and ('need-rev' not in new_tag_slugs):
+        return add_action_holder_change_event(
+            doc, 
+            Person.objects.get(name='(System)'), 
+            prev_set,
+            reason='draft expired',
+        )
+    else:
+        # Update the action holders. To get this right for people with more
+        # than one relationship to the document, do removals first, then adds.
+        # Remove outdated action holders
+        iesg_state_changed = (prev_state != new_state) and (getattr(new_state, "type_id", None) == "draft-iesg") 
+        if iesg_state_changed:
+            # Clear the action_holders list on a state change. This will reset the age of any that get added back.
+            doc.action_holders.clear()
+        if tags.removed("need-rev"):
             # Removed the 'need-rev' tag - drop authors from the action holders list
-            DocumentActionHolder.objects.filter(document=doc, person__in=doc.authors()).delete()
-        elif ('need-rev' not in prev_tag_slugs) and ('need-rev' in new_tag_slugs):
-            # Added the 'need-rev' tag - add authors to the action holders list
-            for auth in doc.authors():
-                if not doc.action_holders.filter(pk=auth.pk).exists():
-                    doc.action_holders.add(auth)
-
-    # Now create an event if we changed the set
-    return add_action_holder_change_event(
-        doc, 
-        Person.objects.get(name='(System)'), 
-        prev_set,
-        reason='IESG state changed',
-    )
+            DocumentActionHolder.objects.filter(document=doc, person__in=doc.author_persons()).delete()
+        elif tags.added("need-rev"):
+            # Remove the AD if we're asking for a new revision
+            DocumentActionHolder.objects.filter(document=doc, person=doc.ad).delete()
+
+        # Add new action holders
+        if doc.ad:
+            # AD is an action holder unless specified otherwise for the new state
+            if iesg_state_changed and new_state.slug not in DocumentActionHolder.CLEAR_ACTION_HOLDERS_STATES:
+                doc.action_holders.add(doc.ad)
+            # If AD follow-up is needed, make sure they are an action holder 
+            if tags.added("ad-f-up"):
+                doc.action_holders.add(doc.ad)
+        # Authors get the action if a revision is needed
+        if tags.added("need-rev"):
+            for auth in doc.author_persons():
+                doc.action_holders.add(auth)
+
+        # Now create an event if we changed the set
+        return add_action_holder_change_event(
+            doc, 
+            Person.objects.get(name='(System)'), 
+            prev_set,
+            reason='IESG state changed',
+        )
+
+
+def _change_field_and_describe(
+    author: DocumentAuthor | RfcAuthor,
+    field: str,
+    newval,
+    field_display_name: str | None = None,
+):
+    # make the change
+    oldval = getattr(author, field)
+    setattr(author, field, newval)
+
+    was_empty = oldval is None or len(str(oldval)) == 0
+    now_empty = newval is None or len(str(newval)) == 0
+
+    # describe the change
+    if oldval == newval:
+        return None
+    else:
+        if field_display_name is None:
+            field_display_name = field
+
+        if was_empty and not now_empty:
+            return 'set {field} to "{new}"'.format(
+                field=field_display_name, new=newval
+            )
+        elif now_empty and not was_empty:
+            return 'cleared {field} (was "{old}")'.format(
+                field=field_display_name, old=oldval
+            )
+        else:
+            return 'changed {field} from "{old}" to "{new}"'.format(
+                field=field_display_name, old=oldval, new=newval
+            )
 
 
 def update_documentauthors(doc, new_docauthors, by=None, basis=None):
@@ -518,27 +615,6 @@ def update_documentauthors(doc, new_docauthors, by=None, basis=None):
     used. These objects will not be saved, their attributes will be used to create new
     DocumentAuthor instances. (The document and order fields will be ignored.)
     """
-    def _change_field_and_describe(auth, field, newval):
-        # make the change
-        oldval = getattr(auth, field)
-        setattr(auth, field, newval)
-        
-        was_empty = oldval is None or len(str(oldval)) == 0
-        now_empty = newval is None or len(str(newval)) == 0
-        
-        # describe the change
-        if oldval == newval:
-            return None
-        else:
-            if was_empty and not now_empty:
-                return 'set {field} to "{new}"'.format(field=field, new=newval)
-            elif now_empty and not was_empty:
-                return 'cleared {field} (was "{old}")'.format(field=field, old=oldval)
-            else:
-                return 'changed {field} from "{old}" to "{new}"'.format(
-                    field=field, old=oldval, new=newval
-                )
-
     persons = []
     changes = []  # list of change descriptions
 
@@ -582,6 +658,123 @@ def _change_field_and_describe(auth, field, newval):
         ) for change in changes
     ] 
 
+
+def update_rfcauthors(
+    rfc: Document, new_rfcauthors: Iterable[RfcAuthor], by: Person | None = None
+) -> Iterable[EditedRfcAuthorsDocEvent]:
+    def _find_matching_author(
+        author_to_match: RfcAuthor, existing_authors: Iterable[RfcAuthor]
+    ) -> RfcAuthor | None:
+        """Helper to find a matching existing author"""
+        if author_to_match.person_id is not None:
+            for candidate in existing_authors:
+                if candidate.person_id == author_to_match.person_id:
+                    return candidate
+            return None  # no match
+        # author does not have a person, match on titlepage name
+        for candidate in existing_authors:
+            if candidate.titlepage_name == author_to_match.titlepage_name:
+                return candidate
+        return None  # no match
+
+    def _rfcauthor_from_documentauthor(docauthor: DocumentAuthor) -> RfcAuthor:
+        """Helper to create an equivalent RfcAuthor from a DocumentAuthor"""
+        return RfcAuthor(
+            document_id=docauthor.document_id,
+            titlepage_name=docauthor.person.plain_name(),  # closest thing we have
+            is_editor=False,
+            person_id=docauthor.person_id,
+            affiliation=docauthor.affiliation,
+            country=docauthor.country,
+            order=docauthor.order,
+        )
+
+    # Is this the first time this document is getting an RfcAuthor? If so, the
+    # updates will need to account for the model change.
+    converting_from_docauthors = not rfc.rfcauthor_set.exists()
+    
+    if converting_from_docauthors:
+        original_authors = [
+            _rfcauthor_from_documentauthor(da) for da in rfc.documentauthor_set.all()
+        ]
+    else:
+        original_authors = list(rfc.rfcauthor_set.all())
+
+    authors_to_commit = []
+    changes = []
+    for order, new_author in enumerate(new_rfcauthors):
+        matching_author = _find_matching_author(new_author, original_authors)
+        if matching_author is not None:
+            # Update existing matching author using new_author data
+            authors_to_commit.append(matching_author)
+            original_authors.remove(matching_author)  # avoid reuse
+            # Describe changes to this author
+            author_changes = []
+            # Update fields other than order
+            for field in ["titlepage_name", "is_editor", "affiliation", "country"]:
+                author_changes.append(
+                    _change_field_and_describe(
+                        matching_author,
+                        field,
+                        getattr(new_author, field),
+                        # List titlepage_name as "name" in logs
+                        "name" if field == "titlepage_name" else field,
+                    )
+                )
+            # Update order
+            author_changes.append(
+                _change_field_and_describe(matching_author, "order", order + 1)
+            )
+            matching_author.save()
+            author_change_summary = ", ".join(
+                [ch for ch in author_changes if ch is not None]
+            )
+            if len(author_change_summary) > 0:
+                changes.append(
+                    'Changed author "{name}": {summary}'.format(
+                        name=matching_author.titlepage_name,
+                        summary=author_change_summary,
+                    )
+                )
+        else:
+            # No author matched, so update the new_author and use that
+            new_author.document = rfc
+            new_author.order = order + 1
+            new_author.save()
+            if new_author.person_id is not None:
+                person_desc = f"Person {new_author.person_id}"
+            else:
+                person_desc = "no Person linked"
+            changes.append(
+                f'Added "{new_author.titlepage_name}" ({person_desc}) as author'
+            )
+    # Any authors left in original_authors are no longer in the list, so remove them
+    for removed_author in original_authors:
+        # Skip actual removal of old authors if we are converting from the
+        # DocumentAuthor models - the original_authors were just stand-ins anyway.
+        if not converting_from_docauthors:
+            removed_author.delete()
+        if removed_author.person_id is not None:
+            person_desc = f"Person {removed_author.person_id}"
+        else:
+            person_desc = "no Person linked"
+        changes.append(
+            f'Removed "{removed_author.titlepage_name}" ({person_desc}) as author'
+        )
+    # Create DocEvents, but leave it up to caller to save
+    if by is None:
+        by = Person.objects.get(name="(System)")
+    return [
+        EditedRfcAuthorsDocEvent(
+            type="edited_authors",
+            by=by,
+            doc=rfc,
+            desc=change,
+        )
+        for change in changes
+    ]
+
+
 def update_reminder(doc, reminder_type_slug, event, due_date):
     reminder_type = DocReminderTypeName.objects.get(slug=reminder_type_slug)
 
@@ -633,15 +826,42 @@ def nice_consensus(consensus):
         }
     return mapping[consensus]
 
+def last_ballot_doc_revision(doc, person):
+    """ Return the document revision for the most recent ballot position
+        by the provided user. """
+    ballot = doc.active_ballot()
+    if ballot is None or person is None:
+        return None    
+    balloters = get_active_balloters(ballot.ballot_type)
+    if person not in balloters:
+        return None
+    position_queryset = BallotPositionDocEvent.objects.filter(type="changed_ballot_position", balloter=person, ballot=ballot).order_by("-time")
+    if not position_queryset.exists():
+        return None
+    ballot_time = position_queryset.first().time
+    doc_rev = NewRevisionDocEvent.objects.filter(doc=doc, time__lte=ballot_time).order_by('-time').first().rev
+    return doc_rev
+
 def has_same_ballot(doc, date1, date2=None):
     """ Test if the most recent ballot created before the end of date1
         is the same as the most recent ballot created before the
         end of date 2. """
+    datetime1 = datetime_from_date(date1, DEADLINE_TZINFO)
     if date2 is None:
-        date2 = datetime.date.today()
-    ballot1 = doc.latest_event(BallotDocEvent,type='created_ballot',time__lt=date1+datetime.timedelta(days=1))
-    ballot2 = doc.latest_event(BallotDocEvent,type='created_ballot',time__lt=date2+datetime.timedelta(days=1))
-    return ballot1==ballot2
+        datetime2 = datetime_today(DEADLINE_TZINFO)
+    else:
+        datetime2 = datetime_from_date(date2, DEADLINE_TZINFO)
+    ballot1 = doc.latest_event(
+        BallotDocEvent,
+        type='created_ballot',
+        time__lt=datetime1 + datetime.timedelta(days=1),
+    )
+    ballot2 = doc.latest_event(
+        BallotDocEvent,
+        type='created_ballot',
+        time__lt=datetime2 + datetime.timedelta(days=1),
+    )
+    return ballot1 == ballot2
 
 def make_notify_changed_event(request, doc, by, new_notify, time=None):
 
@@ -687,7 +907,7 @@ def update_telechat(request, doc, by, new_telechat_date, new_returning_item=None
          and on_agenda
          and prev_agenda
          and new_telechat_date != prev_telechat
-         and prev_telechat < datetime.date.today()
+         and prev_telechat < date_today(DEADLINE_TZINFO)
          and has_same_ballot(doc,prev.telechat_date)
        ):
         returning = True
@@ -706,7 +926,7 @@ def update_telechat(request, doc, by, new_telechat_date, new_returning_item=None
         else:
             e.desc = "Removed from agenda for telechat"
     elif on_agenda and new_telechat_date != prev_telechat:
-        e.desc = "Telechat date has been changed to <b>%s</b> from <b>%s</b>" % (
+        e.desc = "Telechat date has been changed to <b>%s</b> (Previous date was <b>%s</b>)" % (
             new_telechat_date, prev_telechat)
     else:
         # we didn't reschedule but flipped returning item bit - let's
@@ -718,7 +938,7 @@ def update_telechat(request, doc, by, new_telechat_date, new_returning_item=None
 
     e.save()
 
-    has_short_fuse = doc.type_id=='draft' and new_telechat_date and (( new_telechat_date - datetime.date.today() ) < datetime.timedelta(days=13))
+    has_short_fuse = doc.type_id=='draft' and new_telechat_date and (( new_telechat_date - date_today() ) < datetime.timedelta(days=13))
 
     from ietf.doc.mails import email_update_telechat
 
@@ -734,49 +954,93 @@ def rebuild_reference_relations(doc, filenames):
 
     filenames should be a dict mapping file ext (i.e., type) to the full path of each file.
     """
-    if doc.type.slug != 'draft':
+    if doc.type.slug not in ["draft", "rfc"]:
+        log.log(f"rebuild_reference_relations called for non draft/rfc doc {doc.name}")
         return None
 
-    # try XML first
-    if 'xml' in filenames:
-        refs = XMLDraft(filenames['xml']).get_refs()
-    elif 'txt' in filenames:
-        filename = filenames['txt']
-        try:
-            refs = draft.PlaintextDraft.from_file(filename).get_refs()
-        except IOError as e:
-            return { 'errors': ["%s :%s" %  (e.strerror, filename)] }
-    else:
-        return {'errors': ['No draft text available for rebuilding reference relations. Need XML or plaintext.']}
 
-    doc.relateddocument_set.filter(relationship__slug__in=['refnorm','refinfo','refold','refunk']).delete()
+    if "xml" not in filenames and "txt" not in filenames:
+        log.log(f"rebuild_reference_relations error: no file available for {doc.name}")
+        return {
+            "errors": [
+                "No file available for rebuilding reference relations. Need XML or plaintext."
+            ]
+        }
+    else:
+        try:
+            # try XML first
+            if "xml" in filenames:
+                refs = XMLDraft(filenames["xml"]).get_refs()
+            elif "txt" in filenames:
+                filename = filenames["txt"]
+                refs = draft.PlaintextDraft.from_file(filename).get_refs()
+        except (IOError, UnicodeDecodeError) as e:
+                log.log(f"rebuild_reference_relations error: On {doc.name}: {e}")
+                return {"errors": [f"{e}: {filename}"]}
+
+    before = set(doc.relateddocument_set.filter(
+        relationship__slug__in=["refnorm", "refinfo", "refold", "refunk"]
+    ).values_list("relationship__slug","target__name"))
 
     warnings = []
     errors = []
     unfound = set()
-    for ( ref, refType ) in refs.items():
-        # As of Dec 2021, DocAlias has a unique constraint on the name field, so count > 1 should not occur
-        refdoc = DocAlias.objects.filter( name=ref )
+    intended = set()
+    names = [ref for ref in refs]
+    names.extend([ref[:-3] for ref in refs if re.match(r"^draft-.*-\d{2}$", ref)])
+    queryset = Document.objects.filter(name__in=names)
+    for ref, refType in refs.items():
+        refdoc = queryset.filter(name=ref)
+        if not refdoc.exists() and re.match(r"^draft-.*-\d{2}$", ref):
+            refdoc = queryset.filter(name=ref[:-3])
         count = refdoc.count()
         if count == 0:
-            unfound.add( "%s" % ref )
+            unfound.add("%s" % ref)
             continue
         elif count > 1:
-            errors.append("Too many DocAlias objects found for %s"%ref)
+            log.unreachable("2026-3-16") # This branch is holdover from DocAlias
+            errors.append("Too many Document objects found for %s" % ref)
         else:
             # Don't add references to ourself
-            if doc != refdoc[0].document:
-                RelatedDocument.objects.get_or_create( source=doc, target=refdoc[ 0 ], relationship=DocRelationshipName.objects.get( slug='ref%s' % refType ) )
+            if doc != refdoc[0]:
+                intended.add((f"ref{refType}", refdoc[0].name))
+
     if unfound:
-        warnings.append('There were %d references with no matching DocAlias'%len(unfound))
+        warnings.append(
+            "There were %d references with no matching Document" % len(unfound)
+        )
+
+    if intended != before:
+        for slug, name in before-intended:
+            doc.relateddocument_set.filter(target__name=name, relationship_id=slug).delete()
+        for slug, name in intended-before:
+            doc.relateddocument_set.create(
+                target=queryset.get(name=name),
+                relationship_id=slug
+            )
+        after = set(doc.relateddocument_set.filter(
+            relationship__slug__in=["refnorm", "refinfo", "refold", "refunk"]
+        ).values_list("relationship__slug","target__name"))
+        if after != intended:
+            errors.append("Attempted changed didn't achieve intended results")
+        changed_references = True
+    else:
+        changed_references = False
 
     ret = {}
     if errors:
-        ret['errors']=errors
+        ret["errors"] = errors
     if warnings:
-        ret['warnings']=warnings
+        ret["warnings"] = warnings
     if unfound:
-        ret['unfound']=list(unfound)
+        ret["unfound"] = list(unfound)
+
+    logmsg = f"rebuild_reference_relations for {doc.name}: "
+    logmsg += "changed references" if changed_references else "references unchanged"
+    if ret:
+        logmsg += f" {json.dumps(ret)}"
+
+    log.log(logmsg)
 
     return ret
 
@@ -803,26 +1067,26 @@ def set_replaces_for_document(request, doc, new_replaces, by, email_subject, com
 
     for d in old_replaces:
         if d not in new_replaces:
-            other_addrs = gather_address_lists('doc_replacement_changed',doc=d.document)
+            other_addrs = gather_address_lists('doc_replacement_changed',doc=d)
             to.update(other_addrs.to)
             cc.update(other_addrs.cc)
             RelatedDocument.objects.filter(source=doc, target=d, relationship=relationship).delete()
             if not RelatedDocument.objects.filter(target=d, relationship=relationship):
-                s = 'active' if d.document.expires > datetime.datetime.now() else 'expired'
-                d.document.set_state(State.objects.get(type='draft', slug=s))
+                s = 'active' if d.expires > timezone.now() else 'expired'
+                d.set_state(State.objects.get(type='draft', slug=s))
 
     for d in new_replaces:
         if d not in old_replaces:
-            other_addrs = gather_address_lists('doc_replacement_changed',doc=d.document)
+            other_addrs = gather_address_lists('doc_replacement_changed',doc=d)
             to.update(other_addrs.to)
             cc.update(other_addrs.cc)
             RelatedDocument.objects.create(source=doc, target=d, relationship=relationship)
-            d.document.set_state(State.objects.get(type='draft', slug='repl'))
+            d.set_state(State.objects.get(type='draft', slug='repl'))
             
-            if d.document.stream_id in ('irtf','ise','iab'):
-                repl_state = State.objects.get(type_id='draft-stream-%s'%d.document.stream_id, slug='repl')
-                d.document.set_state(repl_state)
-                events.append(StateDocEvent.objects.create(doc=d.document, rev=d.document.rev, by=by, type='changed_state', desc="Set stream state to Replaced",state_type=repl_state.type, state=repl_state))
+            if d.stream_id in ('irtf','ise','iab'):
+                repl_state = State.objects.get(type_id='draft-stream-%s'%d.stream_id, slug='repl')
+                d.set_state(repl_state)
+                events.append(StateDocEvent.objects.create(doc=d, rev=d.rev, by=by, type='changed_state', desc="Set stream state to Replaced",state_type=repl_state.type, state=repl_state))
 
     # make sure there are no lingering suggestions duplicating new replacements
     RelatedDocument.objects.filter(source=doc, target__in=new_replaces, relationship="possibly-replaces").delete()
@@ -892,7 +1156,7 @@ def extract_complete_replaces_ancestor_mapping_for_docs(names):
             break
 
         relations = ( RelatedDocument.objects.filter(source__name__in=front, relationship="replaces")
-                          .select_related("target").values_list("source__name", "target__docs__name") )
+                          .select_related("target").values_list("source__name", "target__name") )
         if not relations:
             break
 
@@ -913,112 +1177,88 @@ def make_rev_history(doc):
 
     def get_predecessors(doc, predecessors=None):
         if predecessors is None:
-            predecessors = []
+            predecessors = set()
         if hasattr(doc, 'relateddocument_set'):
-            for alias in doc.related_that_doc('replaces'):
-                for document in alias.docs.all():
-                    if document not in predecessors:
-                        predecessors.append(document)
-                        predecessors.extend(get_predecessors(document, predecessors))
+            for document in doc.related_that_doc('replaces'):
+                if document not in predecessors:
+                    predecessors.add(document)
+                    predecessors.update(get_predecessors(document, predecessors))
+        if doc.came_from_draft():
+            predecessors.add(doc.came_from_draft())
+            predecessors.update(get_predecessors(doc.came_from_draft(), predecessors))
         return predecessors
 
     def get_ancestors(doc, ancestors = None):
         if ancestors is None:
-            ancestors = []
+            ancestors = set()
         if hasattr(doc, 'relateddocument_set'):
-            for alias in doc.related_that('replaces'):
-                for document in alias.docs.all():
-                    if document not in ancestors:
-                        ancestors.append(document)
-                        ancestors.extend(get_ancestors(document, ancestors))
+            for document in doc.related_that('replaces'):
+                if document not in ancestors:
+                    ancestors.add(document)
+                    ancestors.update(get_ancestors(document, ancestors))
+        if doc.became_rfc():
+            if doc.became_rfc() not in ancestors:
+                ancestors.add(doc.became_rfc())
+                ancestors.update(get_ancestors(doc.became_rfc(), ancestors))
         return ancestors
 
     def get_replaces_tree(doc):
         tree = get_predecessors(doc)
-        tree.extend(get_ancestors(doc))
+        tree.update(get_ancestors(doc))
         return tree
 
     history = {}
     docs = get_replaces_tree(doc)
     if docs is not None:
-        docs.append(doc)
+        docs.add(doc)
         for d in docs:
-            for e in d.docevent_set.filter(type='new_revision').distinct():
-                if hasattr(e, 'newrevisiondocevent'):
-                    url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=d)) + e.newrevisiondocevent.rev + "/"
-                    history[url] = {
-                        'name': d.name,
-                        'rev': e.newrevisiondocevent.rev,
-                        'published': e.time.isoformat(),
-                        'url': url,
-                    }
-                    if d.history_set.filter(rev=e.newrevisiondocevent.rev).exists():
-                        history[url]['pages'] = d.history_set.filter(rev=e.newrevisiondocevent.rev).first().pages
+            if d.type_id == "rfc":
+                url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=d))
+                e = d.docevent_set.filter(type="published_rfc").order_by("-time").first()
+                history[url] = {
+                    "name": d.name,
+                    "rev": d.name,
+                    "published": e and e.time.isoformat(),
+                    "url": url,
+                }
+            else:
+                for e in d.docevent_set.filter(type='new_revision').distinct():
+                    if hasattr(e, 'newrevisiondocevent'):
+                        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=d)) + e.newrevisiondocevent.rev + "/"
+                        history[url] = {
+                            'name': d.name,
+                            'rev': e.newrevisiondocevent.rev,
+                            'published': e.time.isoformat(),
+                            'url': url,
+                        }
+                        if d.history_set.filter(rev=e.newrevisiondocevent.rev).exists():
+                            history[url]['pages'] = d.history_set.filter(rev=e.newrevisiondocevent.rev).first().pages
 
     if doc.type_id == "draft":
+        # Do nothing - all draft revisions are captured above already.
+        e = None 
+    elif doc.type_id == "rfc":
+        # e.time.date() agrees with RPC publication date when shown in the RPC_TZINFO time zone
         e = doc.latest_event(type='published_rfc')
     else:
         e = doc.latest_event(type='iesg_approved')
     if e:
         url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=e.doc))
         history[url] = {
-            'name': e.doc.canonical_name(),
-            'rev': e.doc.canonical_name(),
+            'name': e.doc.name,
+            'rev': e.doc.name,
             'published': e.time.isoformat(),
             'url': url
         }
-        if hasattr(e, 'newrevisiondocevent') and doc.history_set.filter(rev=e.newrevisiondocevent.rev).exists():
+        if doc.type_id != "rfc" and hasattr(e, 'newrevisiondocevent') and doc.history_set.filter(rev=e.newrevisiondocevent.rev).exists():
             history[url]['pages'] = doc.history_set.filter(rev=e.newrevisiondocevent.rev).first().pages
     history = list(history.values())
     return sorted(history, key=lambda x: x['published'])
 
 
-def get_search_cache_key(params):
-    from ietf.doc.views_search import SearchForm
-    fields = set(SearchForm.base_fields) - set(['sort',])
-    kwargs = dict([ (k,v) for (k,v) in list(params.items()) if k in fields ])
-    key = "doc:document:search:" + hashlib.sha512(json.dumps(kwargs, sort_keys=True).encode('utf-8')).hexdigest()
-    return key
-    
-def label_wrap(label, items, joiner=',', max=50):
-    lines = []
-    if not items:
-        return lines
-    line = '%s: %s' % (label, items[0])
-    for item in items[1:]:
-        if len(line)+len(joiner+' ')+len(item) > max:
-            lines.append(line+joiner)
-            line = ' '*(len(label)+len(': ')) + item
-        else:
-            line += joiner+' '+item
-    if line:
-        lines.append(line)
-    return lines
-
-def join_justified(left, right, width=72):
-    count = max(len(left), len(right))
-    left = left + ['']*(count-len(left))
-    right = right + ['']*(count-len(right))
-    lines = []
-    i = 0
-    while True:
-        l = left[i]
-        r = right[i]
-        if len(l)+1+len(r) > width:
-            left = left + ['']
-            right = right[:i] + [''] + right[i:]
-            r = right[i]
-            count += 1
-        lines.append( l + ' ' + r.rjust(width-len(l)-1) )
-        i += 1
-        if i >= count:
-            break
-    return lines
-
-def build_file_urls(doc):
-    if isinstance(doc,Document) and doc.get_state_slug() == "rfc":
-        name = doc.canonical_name()
-        base_path = os.path.join(settings.RFC_PATH, name + ".")
+def build_file_urls(doc: Union[Document, DocHistory]):
+    if doc.type_id == "rfc":
+        base_path = os.path.join(settings.RFC_PATH, doc.name + ".")
         possible_types = settings.RFC_FILE_TYPES
         found_types = [t for t in possible_types if os.path.exists(base_path + t)]
 
@@ -1026,186 +1266,67 @@ def build_file_urls(doc):
 
         file_urls = []
         for t in found_types:
+            if t == "ps": # Postscript might have been submitted but should not be displayed in the list of URLs
+                continue
             label = "plain text" if t == "txt" else t
-            file_urls.append((label, base + name + "." + t))
+            file_urls.append((label, base + doc.name + "." + t))
 
         if "pdf" not in found_types and "txt" in found_types:
-            file_urls.append(("pdf", base + "pdfrfc/" + name + ".txt.pdf"))
+            file_urls.append(("pdf", base + "pdfrfc/" + doc.name + ".txt.pdf"))
 
         if "txt" in found_types:
-            file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=name))))
+            file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=doc.name))))
             if doc.tags.filter(slug="verified-errata").exists():
-                file_urls.append(("with errata", settings.RFC_EDITOR_INLINE_ERRATA_URL.format(rfc_number=doc.rfc_number())))
-        file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_bibtex',kwargs=dict(name=name))))
-    else:
+                file_urls.append(("with errata", settings.RFC_EDITOR_INLINE_ERRATA_URL.format(rfc_number=doc.rfc_number)))
+        file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_bibtex',kwargs=dict(name=doc.name))))
+    elif doc.type_id == "draft" and doc.rev != "":
         base_path = os.path.join(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR, doc.name + "-" + doc.rev + ".")
         possible_types = settings.IDSUBMIT_FILE_TYPES
         found_types = [t for t in possible_types if os.path.exists(base_path + t)]
         base = settings.IETF_ID_ARCHIVE_URL
         file_urls = []
         for t in found_types:
+            if t == "ps": # Postscript might have been submitted but should not be displayed in the list of URLs
+                continue
             label = "plain text" if t == "txt" else t
             file_urls.append((label, base + doc.name + "-" + doc.rev + "." + t))
 
-        if doc.text():
+        if doc.text_exists():
             file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=doc.name, rev=doc.rev))))
             file_urls.append(("pdfized", urlreverse('ietf.doc.views_doc.document_pdfized', kwargs=dict(name=doc.name, rev=doc.rev))))
         file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_bibtex',kwargs=dict(name=doc.name,rev=doc.rev))))
-
+        file_urls.append(("bibxml", urlreverse('ietf.doc.views_doc.document_bibxml',kwargs=dict(name=doc.name,rev=doc.rev))))
+    else:
+        if doc.type_id == "draft":
+            # TODO: look at the state of the database post migration and update this comment, or remove the block
+            # As of 2022-12-14, there are 1463 Document and 3136 DocHistory records with type='draft' and rev=''.
+            # All of these are in the rfc state and are covered by the above cases.
+            log.unreachable('2022-12-14')
+        file_urls = []
+        found_types = []
+        
     return file_urls, found_types
 
-def build_doc_supermeta_block(doc):
-    items = []
-    items.append(f'[<a href="{ settings.IDTRACKER_BASE_URL }" title="Document search and retrieval page">Search</a>]')
-
-    file_urls, found_types = build_file_urls(doc)
-    file_urls = [('txt',url) if label=='plain text' else (label,url) for label,url in file_urls]
-
-    if file_urls:
-        file_labels = {
-            'txt' : 'Plaintext version of this document',
-            'xml' : 'XML source for this document',
-            'pdf' : 'PDF version of this document',
-            'html' : 'HTML version of this document, from XML2RFC',
-            'bibtex' : 'BibTex entry for this document',
-        }
-        parts=[]
-        for label,url in file_urls:
-            if 'htmlized' not in label:
-                file_label=file_labels.get(label,'')
-                title_attribute = f' title="{file_label}"' if file_label else ''
-                partstring = f'<a href="{url}"{title_attribute}>{label}</a>' 
-                parts.append(partstring)
-        items.append('[' + '|'.join(parts) + ']')
-
-    items.append(f'[<a href="{ urlreverse("ietf.doc.views_doc.document_main",kwargs=dict(name=doc.canonical_name())) }" title="Datatracker information for this document">Tracker</a>]')
-    if doc.group.acronym != 'none':
-        items.append(f'[<a href="{urlreverse("ietf.group.views.group_home",kwargs=dict(acronym=doc.group.acronym))}" title="The working group handling this document">WG</a>]')
-    items.append(f'[<a href="mailto:{doc.name}@ietf.org?subject={doc.name}" title="Send email to the document authors">Email</a>]')
-    if doc.rev != "00":
-        items.append(f'[<a href="{settings.RFCDIFF_BASE_URL}?difftype=--hwdiff&amp;url2={doc.name}-{doc.rev}.txt" title="Inline diff (wdiff)">Diff1</a>]')
-        items.append(f'[<a href="{settings.RFCDIFF_BASE_URL}?url2={doc.name}-{doc.rev}.txt" title="Side-by-side diff">Diff2</a>]')
-    items.append(f'[<a href="{settings.IDNITS_BASE_URL}?url={settings.IETF_ID_ARCHIVE_URL}{doc.name}-{doc.rev}.txt" title="Run an idnits check of this document">Nits</a>]')
-
-    return ' '.join(items)
-
-def build_doc_meta_block(doc, path):
-    def add_markup(path, doc, lines):
-        is_hst = doc.is_dochistory()
-        rev = doc.rev
-        if is_hst:
-            doc = doc.doc
-        name = doc.name
-        rfcnum = doc.rfc_number()
-        errata_url = settings.RFC_EDITOR_ERRATA_URL.format(rfc_number=rfcnum) if not is_hst else ""
-        ipr_url = "%s?submit=draft&amp;id=%s" % (urlreverse('ietf.ipr.views.search'), name)
-        for i, line in enumerate(lines):
-            # add draft links
-            line = re.sub(r'\b(draft-[-a-z0-9]+)\b', r'<a href="%s/\g<1>">\g<1></a>'%(path, ), line)
-            # add rfcXXXX to RFC links
-            line = re.sub(r' (rfc[0-9]+)\b', r' <a href="%s/\g<1>">\g<1></a>'%(path, ), line)
-            # add XXXX to RFC links
-            line = re.sub(r' ([0-9]{3,5})\b', r' <a href="%s/rfc\g<1>">\g<1></a>'%(path, ), line)
-            # add draft revision links
-            line = re.sub(r' ([0-9]{2})\b', r' <a href="%s/%s-\g<1>">\g<1></a>'%(path, name, ), line)
-            if rfcnum:
-                # add errata link
-                line = re.sub(r'Errata exist', r'<a class="text-warning" href="%s">Errata exist</a>'%(errata_url, ), line)
-            if is_hst or not rfcnum:
-                # make current draft rev bold
-                line = re.sub(r'>(%s)<'%rev, r'><b>\g<1></b><', line)
-            line = re.sub(r'IPR declarations', r'<a class="text-warning" href="%s">IPR declarations</a>'%(ipr_url, ), line)
-            line = line.replace(r'[txt]', r'[<a href="%s">txt</a>]' % doc.get_href())
-            lines[i] = line
-        return lines
-    #
-    now = datetime.datetime.now()
-    draft_state = doc.get_state('draft')
-    block = ''
-    meta = {}
-    if doc.type_id == 'draft':
-        revisions = []
-        ipr = doc.related_ipr()
-        if ipr:
-            meta['ipr'] = [ "IPR declarations" ]
-        if doc.is_rfc() and not doc.is_dochistory():
-            if not doc.name.startswith('rfc'):
-                meta['from'] = [ "%s-%s"%(doc.name, doc.rev) ]
-            meta['errata'] = [ "Errata exist" ] if doc.tags.filter(slug='errata').exists() else []
-            
-            meta['obsoletedby'] = [ document.rfc_number() for alias in doc.related_that('obs') for document in alias.docs.all() ]
-            meta['obsoletedby'].sort()
-            meta['updatedby'] = [ document.rfc_number() for alias in doc.related_that('updates') for document in alias.docs.all() ]
-            meta['updatedby'].sort()
-            meta['stdstatus'] = [ doc.std_level.name ]
-        else:
-            dd = doc.doc if doc.is_dochistory() else doc
-            revisions += [ '(%s)%s'%(d.name, ' '*(2-((len(d.name)-1)%3))) for d in dd.replaces() ]
-            revisions += doc.revisions()
-            if doc.is_dochistory() and doc.doc.is_rfc():
-                revisions += [ doc.doc.canonical_name() ]
-            else:
-                revisions += [ d.name for d in doc.replaced_by() ]
-            meta['versions'] = revisions
-            if not doc.is_dochistory and draft_state.slug == 'active' and now > doc.expires:
-                # Active past expiration date
-                meta['active'] = [ 'Document is active' ]
-                meta['state' ] = [ doc.friendly_state() ]
-            intended_std = doc.intended_std_level if doc.intended_std_level else None
-            if intended_std:
-                if intended_std.slug in ['ps', 'ds', 'std']:
-                    meta['stdstatus'] = [ "Standards Track" ]
-                else:
-                    meta['stdstatus'] = [ intended_std.name ]
-    elif doc.type_id == 'charter':
-        meta['versions'] = doc.revisions()
-    #
-    # Add markup to items that needs it.
-    if 'versions' in meta:
-        meta['versions'] = label_wrap('Versions', meta['versions'], joiner="")
-    for label in ['Obsoleted by', 'Updated by', 'From' ]:
-        item = label.replace(' ','').lower()
-        if item in meta and meta[item]:
-            meta[item] = label_wrap(label, meta[item])
-    #
-    left = []
-    right = []
-    #right = [ '[txt]']
-    for item in [ 'from', 'versions', 'obsoletedby', 'updatedby', ]:
-        if item in meta and meta[item]:
-            left += meta[item]
-    for item in ['stdstatus', 'active', 'state', 'ipr', 'errata', ]:
-        if item in meta and meta[item]:
-            right += meta[item]
-    lines = join_justified(left, right)
-    block = '\n'.join(add_markup(path, doc, lines))
-    #
-    return block
-
-
-def augment_docs_and_user_with_user_info(docs, user):
+def augment_docs_and_person_with_person_info(docs, person):
     """Add attribute to each document with whether the document is tracked
-    or has a review wish by the user or not, and the review teams the user is on."""
+    or has a review wish by the person or not, and the review teams the person is on."""
 
     tracked = set()
     review_wished = set()
-    
-    if user and user.is_authenticated:
-        user.review_teams = Group.objects.filter(
-                reviewteamsettings__isnull=False, role__person__user=user, role__name='reviewer')
 
-        doc_pks = [d.pk for d in docs]
-        clist = CommunityList.objects.filter(user=user).first()
-        if clist:
-            tracked.update(
-                docs_tracked_by_community_list(clist).filter(pk__in=doc_pks).values_list("pk", flat=True))
+    # used in templates
+    person.review_teams = Group.objects.filter(
+        reviewteamsettings__isnull=False, role__person=person, role__name='reviewer')
 
-        try:
-            wishes = ReviewWish.objects.filter(person=Person.objects.get(user=user))
-            wishes = wishes.filter(doc__pk__in=doc_pks).values_list("doc__pk", flat=True)
-            review_wished.update(wishes)
-        except Person.DoesNotExist:
-            pass
+    doc_pks = [d.pk for d in docs]
+    clist = CommunityList.objects.filter(person=person).first()
+    if clist:
+        tracked.update(
+            docs_tracked_by_community_list(clist).filter(pk__in=doc_pks).values_list("pk", flat=True))
+
+    wishes = ReviewWish.objects.filter(person=person)
+    wishes = wishes.filter(doc__pk__in=doc_pks).values_list("doc__pk", flat=True)
+    review_wished.update(wishes)
 
     for d in docs:
         d.tracked_in_personal_community_list = d.pk in tracked
@@ -1247,21 +1368,24 @@ def generate_idnits2_rfc_status():
         'unkn': 'U',
     }
 
-    rfcs = Document.objects.filter(type_id='draft',states__slug='rfc',states__type='draft')
+    rfcs = Document.objects.filter(type_id='rfc')
     for rfc in rfcs:
-        offset = int(rfc.rfcnum)-1
+        offset = int(rfc.rfc_number)-1
         blob[offset] = symbols[rfc.std_level_id]
         if rfc.related_that('obs'):
             blob[offset] = 'O'
 
     # Workarounds for unusual states in the datatracker
 
-    # Document.get(docalias='rfc6312').rfcnum == 6342 
-    # 6312 was published with the wrong rfc number in it
-    # weird workaround in the datatracker - there are two 
-    # DocAliases starting with rfc - the canonical name code
-    # searches for the lexically highest alias starting with rfc
-    # which is getting lucky.
+    # The explanation for 6312 is from before docalias was removed
+    # The workaround is still needed, even if the datatracker
+    # state no longer matches what's described here:
+    #   Document.get(docalias='rfc6312').rfc_number == 6342 
+    #   6312 was published with the wrong rfc number in it
+    #   weird workaround in the datatracker - there are two 
+    #   DocAliases starting with rfc - the canonical name code
+    #   searches for the lexically highest alias starting with rfc
+    #   which is getting lucky.
     blob[6312 - 1] = 'O'
 
     # RFC200 is an old RFC List by Number
@@ -1277,7 +1401,7 @@ def generate_idnits2_rfc_status():
 def generate_idnits2_rfcs_obsoleted():
     obsdict = defaultdict(list)
     for r in RelatedDocument.objects.filter(relationship_id='obs'):
-        obsdict[int(r.target.document.rfc_number())].append(int(r.source.rfc_number()))
+        obsdict[int(r.target.rfc_number)].append(int(r.source.rfc_number)) # Aren't these already guaranteed to be ints?
     for k in obsdict:
         obsdict[k] = sorted(obsdict[k])
     return render_to_string('doc/idnits2-rfcs-obsoleted.txt', context={'obsitems':sorted(obsdict.items())})
@@ -1293,6 +1417,8 @@ def fuzzy_find_documents(name, rev=None):
     document.
     """
     # Handle special case name formats
+    if re.match(r"^\s*rfc", name, flags=re.IGNORECASE):
+        name = re.sub(r"\s+", "", name.lower())
     if name.startswith('rfc0'):
         name = "rfc" + name[3:].lstrip('0')
     if name.startswith('review-') and re.search(r'-\d\d\d\d-\d\d$', name):
@@ -1303,22 +1429,28 @@ def fuzzy_find_documents(name, rev=None):
         rev = rev[-2:]
     if re.match("^[0-9]+$", name):
         name = f'rfc{name}'
-    if re.match("^[Rr][Ff][Cc] [0-9]+$",name):
-        name = f'rfc{name[4:]}'
+
+    if name.startswith("rfc"):
+        sought_type = "rfc"
+        name = name.split("-")[0] # strip any noise (like a revision) at and after the first hyphen
+        rev = None # If someone is looking for an RFC and supplies a version, ignore it.
+    else:
+        sought_type = "draft"
 
     # see if we can find a document using this name
-    docs = Document.objects.filter(docalias__name=name, type_id='draft')
-    if rev and not docs.exists():
-        # No document found, see if the name/rev split has been misidentified.
+    docs = Document.objects.filter(name=name, type_id=sought_type)
+    if sought_type == "draft" and rev and not docs.exists():
+        # No draft found, see if the name/rev split has been misidentified.
         # Handles some special cases, like draft-ietf-tsvwg-ieee-802-11.
         name = '%s-%s' % (name, rev)
-        docs = Document.objects.filter(docalias__name=name, type_id='draft')
+        docs = Document.objects.filter(name=name, type_id='draft')
         if docs.exists():
             rev = None  # found a doc by name with rev = None, so update that
 
     FoundDocuments = namedtuple('FoundDocuments', 'documents matched_name matched_rev')
     return FoundDocuments(docs, name, rev)
 
+
 def bibxml_for_draft(doc, rev=None):
 
     if rev is not None and rev != doc.rev:
@@ -1331,20 +1463,253 @@ def bibxml_for_draft(doc, rev=None):
         raise Http404("Revision not found")
 
     # Build the date we want to claim for the document in the bibxml
-    # For documents that have relevent NewRevisionDocEvents, use the date of the event.
+    # For documents that have relevant NewRevisionDocEvents, use the date of the event.
     # Very old documents don't have NewRevisionDocEvents - just use the document time.
         
     latest_revision_event = doc.latest_event(NewRevisionDocEvent, type="new_revision")
     latest_revision_rev = latest_revision_event.rev if latest_revision_event else None
     best_events = NewRevisionDocEvent.objects.filter(doc__name=doc.name, rev=(rev or latest_revision_rev))
+    tzinfo = ZoneInfo(settings.TIME_ZONE)
     if best_events.exists():
         # There was a period where it was possible to get more than one NewRevisionDocEvent for a revision.
         # A future data cleanup would allow this to be simplified
         best_event = best_events.order_by('time').first()
         log.assertion('doc.rev == best_event.rev')
-        doc.date = best_event.time.date()
+        doc.date = best_event.time.astimezone(tzinfo).date()
     else:
-        doc.date = doc.time.date()      # Even if this may be incoreect, what would be better?
+        doc.date = doc.time.astimezone(tzinfo).date()      # Even if this may be incorrect, what would be better?
+
+    name = doc.name if isinstance(doc, Document) else doc.doc.name
+    if name.startswith('rfc'): # bibxml3 does not speak of RFCs
+        raise Http404()
+        
+    return render_to_string('doc/bibxml.xml', {'name':name, 'doc':doc, 'doc_bibtype':'I-D', 'settings':settings})
+
+
+class DraftAliasGenerator:
+    days = 2 * 365
+
+    def __init__(self, draft_queryset=None):
+        if draft_queryset is not None:
+            self.draft_queryset = draft_queryset.filter(type_id="draft")  # only drafts allowed
+        else:
+            self.draft_queryset = Document.objects.filter(type_id="draft")
+
+    def get_draft_ad_emails(self, doc):
+        """Get AD email addresses for the given draft, if any."""
+        from ietf.group.utils import get_group_ad_emails  # avoid circular import
+        ad_emails = set()
+        # If working group document, return current WG ADs
+        if doc.group and doc.group.acronym != "none":
+            ad_emails.update(get_group_ad_emails(doc.group))
+        # Document may have an explicit AD set
+        if doc.ad:
+            ad_emails.add(doc.ad.email_address())
+        return ad_emails
+
+    def get_draft_chair_emails(self, doc):
+        """Get chair email addresses for the given draft, if any."""
+        from ietf.group.utils import get_group_role_emails  # avoid circular import
+        chair_emails = set()
+        if doc.group:
+            chair_emails.update(get_group_role_emails(doc.group, ["chair", "secr"]))
+        return chair_emails
+
+    def get_draft_shepherd_email(self, doc):
+        """Get shepherd email addresses for the given draft, if any."""
+        shepherd_email = set()
+        if doc.shepherd:
+            shepherd_email.add(doc.shepherd.email_address())
+        return shepherd_email
+
+    def get_draft_authors_emails(self, doc):
+        """Get list of authors for the given draft."""
+        author_emails = set()
+        for email in Email.objects.filter(documentauthor__document=doc):
+            if email.active:
+                author_emails.add(email.address)
+            elif email.person:
+                person_email = email.person.email_address()
+                if person_email:
+                    author_emails.add(person_email)
+        return author_emails
+
+    def get_draft_notify_emails(self, doc):
+        """Get list of email addresses to notify for the given draft."""
+        ad_email_alias_regex = r"^%s.ad@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
+        all_email_alias_regex = r"^%s.all@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
+        author_email_alias_regex = r"^%s@(%s|%s)$" % (doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
+        notify_email_alias_regex = r"^%s.notify@(%s|%s)$" % (
+        doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
+        shepherd_email_alias_regex = r"^%s.shepherd@(%s|%s)$" % (
+        doc.name, settings.DRAFT_ALIAS_DOMAIN, settings.TOOLS_SERVER)
+        notify_emails = set()
+        if doc.notify:
+            for e in doc.notify.split(','):
+                e = e.strip()
+                if re.search(ad_email_alias_regex, e):
+                    notify_emails.update(self.get_draft_ad_emails(doc))
+                elif re.search(author_email_alias_regex, e):
+                    notify_emails.update(self.get_draft_authors_emails(doc))
+                elif re.search(shepherd_email_alias_regex, e):
+                    notify_emails.update(self.get_draft_shepherd_email(doc))
+                elif re.search(all_email_alias_regex, e):
+                    notify_emails.update(self.get_draft_ad_emails(doc))
+                    notify_emails.update(self.get_draft_authors_emails(doc))
+                    notify_emails.update(self.get_draft_shepherd_email(doc))
+                elif re.search(notify_email_alias_regex, e):
+                    pass
+                else:
+                    (name, email) = parseaddr(e)
+                    notify_emails.add(email)
+        return notify_emails
+
+    def _yield_aliases_for_draft(self, doc)-> Iterator[tuple[str, list[str]]]:
+        alias = doc.name
+        all = set()
+
+        # no suffix and .authors are the same list
+        emails = self.get_draft_authors_emails(doc)
+        all.update(emails)
+        if emails:
+            yield alias, list(emails)
+            yield alias + ".authors", list(emails)
+
+        # .chairs = group chairs
+        emails = self.get_draft_chair_emails(doc)
+        if emails:
+            all.update(emails)
+            yield alias + ".chairs", list(emails)
+
+        # .ad = sponsoring AD / WG AD (WG document)
+        emails = self.get_draft_ad_emails(doc)
+        if emails:
+            all.update(emails)
+            yield alias + ".ad", list(emails)
+
+        # .notify = notify email list from the Document
+        emails = self.get_draft_notify_emails(doc)
+        if emails:
+            all.update(emails)
+            yield alias + ".notify", list(emails)
+
+        # .shepherd = shepherd email from the Document
+        emails = self.get_draft_shepherd_email(doc)
+        if emails:
+            all.update(emails)
+            yield alias + ".shepherd", list(emails)
+
+        # .all = everything from above
+        if all:
+            yield alias + ".all", list(all)
+
+    def __iter__(self) -> Iterator[tuple[str, list[str]]]:
+        # Internet-Drafts with active status or expired within self.days
+        show_since = timezone.now() - datetime.timedelta(days=self.days)
+        drafts = self.draft_queryset
+
+        # Look up the draft-active state properly. Doing this with
+        # states__type_id, states__slug directly in the `filter()`
+        # works, but it does not work as expected in `exclude()`.
+        active_state = State.objects.get(type_id="draft", slug="active")
+        active_pks = []  # build a static list of the drafts we actually returned as "active"
+        active_drafts = drafts.filter(states=active_state)
+        for this_draft in active_drafts:
+            active_pks.append(this_draft.pk)
+            for alias, addresses in self._yield_aliases_for_draft(this_draft):
+                yield alias, addresses
+
+        # Annotate with the draft state slug so we can check for drafts that
+        # have become RFCs
+        inactive_recent_drafts = (
+            drafts.exclude(pk__in=active_pks)  # don't re-filter by state, states may have changed during the run!
+            .filter(expires__gte=show_since)
+            .annotate(
+                # Why _default_manager instead of objects? See:
+                # https://docs.djangoproject.com/en/4.2/topics/db/managers/#django.db.models.Model._default_manager
+                draft_state_slug=Document.states.through._default_manager.filter(
+                    document__pk=OuterRef("pk"),
+                    state__type_id="draft"
+                ).values("state__slug"),
+            )
+        )
+        for this_draft in inactive_recent_drafts:
+            # Omit drafts that became RFCs, unless they were published in the last DEFAULT_YEARS
+            if this_draft.draft_state_slug == "rfc":
+                rfc = this_draft.became_rfc()
+                log.assertion("rfc is not None")
+                if rfc.latest_event(type='published_rfc').time < show_since:
+                    continue
+            for alias, addresses in self._yield_aliases_for_draft(this_draft):
+                yield alias, addresses
+
+
+def get_doc_email_aliases(name: Optional[str] = None):
+    aliases = []
+    for (alias, alist) in DraftAliasGenerator(
+        Document.objects.filter(type_id="draft", name=name) if name else None
+    ):
+        # alias is draft-name.alias_type
+        doc_name, _dot, alias_type = alias.partition(".")
+        aliases.append({
+            "doc_name": doc_name,
+            "alias_type": f".{alias_type}" if alias_type else "",
+            "expansion": ", ".join(sorted(alist)),
+        })
+    return sorted(aliases, key=lambda a: (a["doc_name"]))
+
+
+def investigate_fragment(name_fragment: str):
+    cache = caches["default"]
+    # Ensure name_fragment does not interact badly with the cache key handling
+    name_digest = sha384(name_fragment.encode("utf8")).hexdigest()
+    cache_key = f"investigate_fragment:{name_digest}"
+    result = cache.get(cache_key)
+    if result is None:
+        can_verify = set()
+        for root in [settings.INTERNET_DRAFT_PATH, settings.INTERNET_DRAFT_ARCHIVE_DIR]:
+            can_verify.update(list(Path(root).glob(f"*{name_fragment}*")))
+        archive_verifiable_names = set([p.name for p in can_verify])
+        # Can also verify drafts in proceedings directories
+        can_verify.update(list(Path(settings.AGENDA_PATH).glob(f"**/*{name_fragment}*")))
+    
+        # N.B. This reflects the assumption that the internet draft archive dir is in the
+        # a directory with other collections (at /a/ietfdata/draft/collections as this is written)
+        unverifiable_collections = set([
+            p for p in
+            Path(settings.INTERNET_DRAFT_ARCHIVE_DIR).parent.glob(f"**/*{name_fragment}*")
+            if p.name not in archive_verifiable_names
+        ])
+        
+        unverifiable_collections.difference_update(can_verify)
+    
+        expected_names = set([p.name for p in can_verify.union(unverifiable_collections)])
+        maybe_unexpected = list(
+            Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR).glob(f"*{name_fragment}*")
+        )
+        unexpected = [p for p in maybe_unexpected if p.name not in expected_names]
+        result = dict(
+            can_verify=can_verify,
+            unverifiable_collections=unverifiable_collections,
+            unexpected=unexpected,
+        )
+        # 1 hour caching
+        cache.set(key=cache_key, timeout=3600, value=result)
+    return result
+
+
+def update_or_create_draft_bibxml_file(doc, rev):
+    log.assertion("doc.type_id == 'draft'")
+    normalized_bibxml = re.sub(r"\r\n?", r"\n", bibxml_for_draft(doc, rev))
+    ref_rev_file_path = Path(settings.BIBXML_BASE_PATH) / "bibxml-ids" / f"reference.I-D.{doc.name}-{rev}.xml"
+    try:
+        existing_bibxml = ref_rev_file_path.read_text(encoding="utf8")
+    except IOError:
+        existing_bibxml = ""
+    if normalized_bibxml.strip() != existing_bibxml.strip():
+        log.log(f"Writing {ref_rev_file_path}")
+        ref_rev_file_path.write_text(normalized_bibxml, encoding="utf8") # TODO-BLOBSTORE
 
-    return render_to_string('doc/bibxml.xml', {'name':doc.name, 'doc': doc, 'doc_bibtype':'I-D'})
 
+def ensure_draft_bibxml_path_exists():
+    (Path(settings.BIBXML_BASE_PATH) / "bibxml-ids").mkdir(exist_ok=True)
diff --git a/ietf/doc/utils_bofreq.py b/ietf/doc/utils_bofreq.py
index aec8f60ad6..d01b039b8e 100644
--- a/ietf/doc/utils_bofreq.py
+++ b/ietf/doc/utils_bofreq.py
@@ -1,12 +1,149 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
+# Copyright The IETF Trust 2021-2026 All Rights Reserved
+import datetime
+from pathlib import Path
 
-from ietf.doc.models import BofreqEditorDocEvent, BofreqResponsibleDocEvent
+from django.conf import settings
+
+from ietf.doc.models import (
+    BofreqEditorDocEvent,
+    BofreqResponsibleDocEvent,
+    DocEvent,
+    DocHistory,
+    Document,
+)
 from ietf.person.models import Person
+from ietf.utils import log
+
 
 def bofreq_editors(bofreq):
     e = bofreq.latest_event(BofreqEditorDocEvent)
     return e.editors.all() if e else Person.objects.none()
 
+
 def bofreq_responsible(bofreq):
     e = bofreq.latest_event(BofreqResponsibleDocEvent)
-    return e.responsible.all() if e else Person.objects.none()
\ No newline at end of file
+    return e.responsible.all() if e else Person.objects.none()
+
+
+def fixup_bofreq_timestamps():  # pragma: nocover
+    """Fixes bofreq event / document timestamps
+
+    Timestamp errors resulted from the bug fixed by
+    https://github.com/ietf-tools/datatracker/pull/10333
+    
+    Does not fix up -00 revs because the timestamps on these were not affected by
+    the bug. Replacing their timestamps creates a confusing event history because the 
+    filesystem timestamp is usually a fraction of a second later than other events
+    created upon the initial rev creation. This causes the "New revision available"
+    event to appear _after_ these events in the history. Better to leave them as is.  
+    """
+    FIX_DEPLOYMENT_TIME = "2026-02-03T01:16:00+00:00"  # 12.58.0 -> production
+
+    def _get_doc_time(doc_name: str, rev: str):
+        path = Path(settings.BOFREQ_PATH) / f"{doc_name}-{rev}.md"
+        return datetime.datetime.fromtimestamp(path.stat().st_mtime, datetime.UTC)
+
+    # Find affected DocEvents and DocHistories
+    new_bofreq_events = (
+        DocEvent.objects.filter(
+            doc__type="bofreq", type="new_revision", time__lt=FIX_DEPLOYMENT_TIME
+        )
+        .exclude(rev="00")  # bug did not affect rev 00 events
+        .order_by("doc__name", "rev")
+    )
+    log.log(
+        f"fixup_bofreq_timestamps: found {new_bofreq_events.count()} "
+        f"new_revision events before {FIX_DEPLOYMENT_TIME}"
+    )
+    document_fixups = {}
+    for e in new_bofreq_events:
+        name = e.doc.name
+        rev = e.rev
+        filesystem_time = _get_doc_time(name, rev)
+        assert e.time < filesystem_time, (
+            f"Rev {rev} event timestamp for {name} unexpectedly later than the "
+            "filesystem timestamp!"
+        )
+        try:
+            dochistory = DocHistory.objects.filter(
+                name=name, time__lt=filesystem_time
+            ).get(rev=rev)
+        except DocHistory.MultipleObjectsReturned as err:
+            raise RuntimeError(
+                f"Multiple DocHistories for {name} rev {rev} exist earlier than the "
+                "filesystem timestamp!"
+            ) from err
+        except DocHistory.DoesNotExist as err:
+            if rev == "00":
+                # Unreachable because we don't adjust -00 revs, but could be needed
+                # if we did, in theory. In practice it's still not reached, but
+                # keeping the case for completeness.
+                dochistory = None
+            else:
+                raise RuntimeError(
+                    f"No DocHistory for {name} rev {rev} exists earlier than the "
+                    f"filesystem timestamp!"
+                ) from err
+
+        if name not in document_fixups:
+            document_fixups[name] = []
+        document_fixups[name].append(
+            {
+                "event": e,
+                "dochistory": dochistory,
+                "filesystem_time": filesystem_time,
+            }
+        )
+
+    # Now do the actual fixup
+    system_person = Person.objects.get(name="(System)")
+    for doc_name, fixups in document_fixups.items():
+        bofreq = Document.objects.get(type="bofreq", name=doc_name)
+        log_msg_parts = []
+        adjusted_revs = []
+        for fixup in fixups:
+            event_to_fix = fixup["event"]
+            dh_to_fix = fixup["dochistory"]
+            new_time = fixup["filesystem_time"]
+            adjusted_revs.append(event_to_fix.rev)
+
+            # Fix up the event
+            event_to_fix.time = new_time
+            event_to_fix.save()
+            log_msg_parts.append(f"rev {event_to_fix.rev} DocEvent")
+
+            # Fix up the DocHistory
+            if dh_to_fix is not None:
+                dh_to_fix.time = new_time
+                dh_to_fix.save()
+                log_msg_parts.append(f"rev {dh_to_fix.rev} DocHistory")
+
+            if event_to_fix.rev == bofreq.rev and bofreq.time < new_time:
+                # Update the Document without calling save(). Only update if
+                # the time has not changed so we don't inadvertently overwrite
+                # a concurrent update.
+                Document.objects.filter(pk=bofreq.pk, time=bofreq.time).update(
+                    time=new_time
+                )
+                bofreq.refresh_from_db()
+                if bofreq.rev == event_to_fix.rev:
+                    log_msg_parts.append(f"rev {bofreq.rev} Document")
+                else:
+                    log.log(
+                        "fixup_bofreq_timestamps: WARNING: bofreq Document rev "
+                        f"changed for {bofreq.name}"
+                    )
+        log.log(f"fixup_bofreq_timestamps: {bofreq.name}: " + ", ".join(log_msg_parts))
+
+        # Fix up the Document, if necessary, and add a record of the adjustment
+        DocEvent.objects.create(
+            type="added_comment",
+            by=system_person,
+            doc=bofreq,
+            rev=bofreq.rev,
+            desc=(
+                "Corrected inaccurate document and new revision event timestamps for "
+                + ("version " if len(adjusted_revs) == 1 else "versions ")
+                + ", ".join(adjusted_revs)
+            ),
+        )
diff --git a/ietf/doc/utils_charter.py b/ietf/doc/utils_charter.py
index ce95521063..287ce8cece 100644
--- a/ietf/doc/utils_charter.py
+++ b/ietf/doc/utils_charter.py
@@ -3,15 +3,17 @@
 
 
 import datetime
-import io
 import os
 import re
 import shutil
 
+from pathlib import Path
+
 from django.conf import settings
 from django.urls import reverse as urlreverse
 from django.template.loader import render_to_string
-from django.utils.encoding import smart_text, force_text
+from django.utils import timezone
+from django.utils.encoding import smart_str, force_str
 
 import debug                            # pyflakes:ignore
 
@@ -24,6 +26,8 @@
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.utils.log import log
 from ietf.group.utils import save_group_in_history
+from ietf.utils.timezone import date_today
+
 
 def charter_name_for_group(group):
     if group.type_id == "rg":
@@ -59,10 +63,9 @@ def next_approved_revision(rev):
     return "%#02d" % (int(m.group('major')) + 1)
 
 def read_charter_text(doc):
-    filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
+    filename = Path(settings.CHARTER_PATH) / f"{doc.name}-{doc.rev}.txt"
     try:
-        with io.open(filename, 'r') as f:
-            return f.read()
+        return filename.read_text()
     except IOError:
         return "Error: couldn't read charter text"
 
@@ -73,7 +76,7 @@ def change_group_state_after_charter_approval(group, by):
 
     save_group_in_history(group)
     group.state = new_state
-    group.time = datetime.datetime.now()
+    group.time = timezone.now()
     group.save()
 
     # create an event for the group state change, too
@@ -89,22 +92,43 @@ def change_group_state_after_charter_approval(group, by):
 def fix_charter_revision_after_approval(charter, by):
     # according to spec, 00-02 becomes 01, so copy file and record new revision
     try:
-        old = os.path.join(charter.get_file_path(), '%s-%s.txt' % (charter.canonical_name(), charter.rev))
-        new = os.path.join(charter.get_file_path(), '%s-%s.txt' % (charter.canonical_name(), next_approved_revision(charter.rev)))
+        old = os.path.join(
+            charter.get_file_path(), "%s-%s.txt" % (charter.name, charter.rev)
+        )
+        new = os.path.join(
+            charter.get_file_path(),
+            "%s-%s.txt" % (charter.name, next_approved_revision(charter.rev)),
+        )
         shutil.copy(old, new)
     except IOError:
         log("There was an error copying %s to %s" % (old, new))
+    # Also provide a copy to the legacy ftp source directory, which is served by rsync
+    # This replaces the hardlink copy that ghostlink has made in the past
+    # Still using a hardlink as long as these are on the same filesystem.
+    # Staying with os.path vs pathlib.Path until we get to python>=3.10.
+    charter_dir = os.path.join(settings.FTP_DIR, "charter")
+    ftp_filepath = os.path.join(
+        charter_dir, "%s-%s.txt" % (charter.name, next_approved_revision(charter.rev))
+    )
+    try:
+        os.link(new, ftp_filepath)
+    except IOError as ex:
+        log(
+            "There was an error creating a hardlink at %s pointing to %s: %s"
+            % (ftp_filepath, new, ex)
+        )
 
     events = []
     e = NewRevisionDocEvent(doc=charter, by=by, type="new_revision")
     e.rev = next_approved_revision(charter.rev)
-    e.desc = "New version available: <b>%s-%s.txt</b>" % (charter.canonical_name(), e.rev)
+    e.desc = "New version available: <b>%s-%s.txt</b>" % (charter.name, e.rev)
     e.save()
     events.append(e)
 
     charter.rev = e.rev
     charter.save_with_history(events)
 
+
 def historic_milestones_for_charter(charter, rev):
     """Return GroupMilestone/GroupMilestoneHistory objects for charter
     document at rev by looking through the history."""
@@ -132,7 +156,7 @@ def historic_milestones_for_charter(charter, rev):
         # revision (when approving a charter)
         just_before_next_rev = e[0].time - datetime.timedelta(seconds=5)
     else:
-        just_before_next_rev = datetime.datetime.now()
+        just_before_next_rev = timezone.now()
 
     res = []
     if hasattr(charter, 'chartered_group'):
@@ -150,7 +174,7 @@ def generate_ballot_writeup(request, doc):
     e.doc = doc
     e.rev = doc.rev,
     e.desc = "Ballot writeup was generated"
-    e.text = force_text(render_to_string("doc/charter/ballot_writeup.txt"))
+    e.text = force_str(render_to_string("doc/charter/ballot_writeup.txt"))
 
     # caller is responsible for saving, if necessary
     return e
@@ -194,10 +218,10 @@ def derive_new_work_text(review_text,group):
                                            'Reply_to':'<iesg@ietf.org>'})
     if not addrs.cc:
         del m['Cc']
-    return smart_text(m.as_string())
+    return smart_str(m.as_string())
 
 def default_review_text(group, charter, by):
-    now = datetime.datetime.now()
+    now = timezone.now()
     addrs = gather_address_lists('charter_external_review',group=group).as_strings(compact=False)
 
     e1 = WriteupDocEvent(doc=charter, rev=charter.rev, by=by)
@@ -215,7 +239,7 @@ def default_review_text(group, charter, by):
                                     parent_ads=group.parent.role_set.filter(name='ad'),
                                     techadv=group.role_set.filter(name="techadv"),
                                     milestones=group.groupmilestone_set.filter(state="charter"),
-                                    review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(),
+                                    review_date=(date_today() + datetime.timedelta(weeks=1)).isoformat(),
                                     review_type="new" if group.state_id in ["proposed","bof"] else "recharter",
                                     to=addrs.to,
                                     cc=addrs.cc,
diff --git a/ietf/doc/utils_errata.py b/ietf/doc/utils_errata.py
new file mode 100644
index 0000000000..539262151f
--- /dev/null
+++ b/ietf/doc/utils_errata.py
@@ -0,0 +1,35 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+import requests
+
+from django.conf import settings
+
+from ietf.utils.log import log
+
+
+def signal_update_rfc_metadata(rfc_number_list=()):
+    key = getattr(settings, "ERRATA_METADATA_NOTIFICATION_API_KEY", None)
+    if key is not None:
+        headers = {"X-Api-Key": settings.ERRATA_METADATA_NOTIFICATION_API_KEY}
+        post_dict = {
+            "rfc_number_list": list(rfc_number_list),
+        }
+        try:
+            response = requests.post(
+                settings.ERRATA_METADATA_NOTIFICATION_URL,
+                headers=headers,
+                json=post_dict,
+                timeout=settings.DEFAULT_REQUESTS_TIMEOUT,
+            )
+        except requests.Timeout as e:
+            log(
+                f"POST request timed out for {settings.ERRATA_METADATA_NOTIFICATION_URL} ]: {e}"
+            )
+            # raise RuntimeError(f'POST request timed out for {settings.ERRATA_METADATA_NOTIFICATION_URL}') from e
+            return
+        if response.status_code != 200:
+            log(
+                f"POST request failed for {settings.ERRATA_METADATA_NOTIFICATION_URL} ]: {response.status_code} {response.text}"
+            )
+    else:
+        log("No API key configured for errata metadata notification, skipping")
diff --git a/ietf/doc/utils_r2.py b/ietf/doc/utils_r2.py
new file mode 100644
index 0000000000..53fb978303
--- /dev/null
+++ b/ietf/doc/utils_r2.py
@@ -0,0 +1,17 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from django.core.files.storage import storages
+
+from ietf.doc.models import StoredObject
+
+
+def rfcs_are_in_r2(rfc_number_list=()):
+    r2_rfc_bucket = storages["r2-rfc"]
+    for rfc_number in rfc_number_list:
+        stored_objects = StoredObject.objects.filter(
+            store="rfc", doc_name=f"rfc{rfc_number}"
+        )
+        for stored_object in stored_objects:
+            if not r2_rfc_bucket.exists(stored_object.name):
+                return False
+    return True
diff --git a/ietf/doc/utils_red.py b/ietf/doc/utils_red.py
new file mode 100644
index 0000000000..bcda893dca
--- /dev/null
+++ b/ietf/doc/utils_red.py
@@ -0,0 +1,31 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+import requests
+
+from django.conf import settings
+
+from ietf.utils.log import log
+
+
+def trigger_red_precomputer(rfc_number_list=()):
+    url = getattr(settings, "TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL", None)
+    if url is not None:
+        payload = {
+            "rfcs": ",".join([str(n) for n in rfc_number_list]),
+        }
+        try:
+            log(f"Triggering red precompute multiple for RFCs {rfc_number_list}")
+            response = requests.post(
+                url=url,
+                json=payload,
+                timeout=settings.DEFAULT_REQUESTS_TIMEOUT,
+            )
+        except requests.Timeout as e:
+            log(f"POST request timed out for {url} : {e}")
+            return
+        if response.status_code != 200:
+            log(
+                f"POST request failed for {url} : status_code={response.status_code}"
+            )
+    else:
+        log("No URL configured for triggering red precompute multiple, skipping")
diff --git a/ietf/doc/utils_search.py b/ietf/doc/utils_search.py
index 47532fdb33..a5f461f9bb 100644
--- a/ietf/doc/utils_search.py
+++ b/ietf/doc/utils_search.py
@@ -5,11 +5,17 @@
 import datetime
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import Document, DocAlias, RelatedDocument, DocEvent, TelechatDocEvent, BallotDocEvent
+from zoneinfo import ZoneInfo
+
+from django.conf import settings
+
+from ietf.doc.models import Document, RelatedDocument, DocEvent, TelechatDocEvent, BallotDocEvent, DocTypeName
 from ietf.doc.expire import expirable_drafts
-from ietf.doc.utils import augment_docs_and_user_with_user_info
+from ietf.doc.utils import augment_docs_and_person_with_person_info
 from ietf.meeting.models import SessionPresentation, Meeting, Session
 from ietf.review.utils import review_assignments_to_list_for_docs
+from ietf.utils.timezone import date_today
+
 
 def wrap_value(v):
     return lambda: v
@@ -20,7 +26,7 @@ def fill_in_telechat_date(docs, doc_dict=None, doc_ids=None):
         doc_dict = dict((d.pk, d) for d in docs)
         doc_ids = list(doc_dict.keys())
     if doc_ids is None:
-        doc_ids = list(doc_dict.keys())        
+        doc_ids = list(doc_dict.keys())
 
     seen = set()
     for e in TelechatDocEvent.objects.filter(doc__id__in=doc_ids, type="scheduled_for_telechat").order_by('-time'):
@@ -30,8 +36,9 @@ def fill_in_telechat_date(docs, doc_dict=None, doc_ids=None):
             seen.add(e.doc_id)
 
 def fill_in_document_sessions(docs, doc_dict, doc_ids):
-    beg_date = datetime.date.today()-datetime.timedelta(days=7)
-    end_date = datetime.date.today()+datetime.timedelta(days=30)
+    today = date_today()
+    beg_date = today-datetime.timedelta(days=7)
+    end_date = today+datetime.timedelta(days=30)
     meetings = Meeting.objects.filter(date__gte=beg_date, date__lte=end_date).prefetch_related('session_set')
     # get sessions
     sessions = Session.objects.filter(meeting_id__in=[ m.id for m in meetings ])
@@ -47,12 +54,13 @@ def fill_in_document_sessions(docs, doc_dict, doc_ids):
 def fill_in_document_table_attributes(docs, have_telechat_date=False):
     # fill in some attributes for the document table results to save
     # some hairy template code and avoid repeated SQL queries
-    # TODO - this function evolved from something that assumed it was handling only drafts. It still has places where it assumes all docs are drafts where that is not a correct assumption
+    # TODO - this function evolved from something that assumed it was handling only drafts. 
+    #        It still has places where it assumes all docs are drafts where that is not a correct assumption
 
     doc_dict = dict((d.pk, d) for d in docs)
     doc_ids = list(doc_dict.keys())
 
-    rfc_aliases = dict([ (a.document.id, a.name) for a in DocAlias.objects.filter(name__startswith="rfc", docs__id__in=doc_ids) ])
+    rfcs = dict((d.pk, d.name) for d in docs if d.type_id == "rfc")
 
     # latest event cache
     event_types = ("published_rfc",
@@ -83,10 +91,8 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
     # misc
     expirable_pks = expirable_drafts(Document.objects.filter(pk__in=doc_ids)).values_list('pk', flat=True)
     for d in docs:
-        # emulate canonical name which is used by a lot of the utils
-        # d.canonical_name = wrap_value(rfc_aliases[d.pk] if d.pk in rfc_aliases else d.name)
 
-        if d.rfc_number() != None and d.latest_event_cache["published_rfc"]:
+        if d.type_id == "rfc" and d.latest_event_cache["published_rfc"]:
             d.latest_revision_date = d.latest_event_cache["published_rfc"].time
         elif d.latest_event_cache["new_revision"]:
             d.latest_revision_date = d.latest_event_cache["new_revision"].time
@@ -102,7 +108,10 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
                 d.search_heading = "Withdrawn Internet-Draft"
                 d.expirable = False
             else:
-                d.search_heading = "%s Internet-Draft" % d.get_state()
+                if d.type_id == "draft" and d.stream_id == 'ietf' and d.get_state_slug('draft-iesg') != 'idexists': # values can be: ad-eval idexists approved rfcqueue dead iesg-eva
+                    d.search_heading = "%s with the IESG Internet-Draft" % d.get_state()
+                else:
+                    d.search_heading = "%s Internet-Draft" % d.get_state()
                 if state_slug == "active":
                     d.expirable = d.pk in expirable_pks
                 else:
@@ -111,7 +120,7 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
             d.search_heading = "%s" % (d.type,)
             d.expirable = False
 
-        if d.get_state_slug() != "rfc":
+        if d.type_id == "draft" and d.get_state_slug() != "rfc":
             d.milestones = [ m for (t, s, v, m) in sorted(((m.time, m.state.slug, m.desc, m) for m in d.groupmilestone_set.all() if m.state_id == "active")) ]
             d.review_assignments = review_assignments_to_list_for_docs([d]).get(d.name, [])
 
@@ -121,29 +130,48 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
     # RFCs
 
     # errata
-    erratas = set(Document.objects.filter(tags="errata", id__in=list(rfc_aliases.keys())).distinct().values_list("name", flat=True))
-    verified_erratas = set(Document.objects.filter(tags="verified-errata", id__in=list(rfc_aliases.keys())).distinct().values_list("name", flat=True))
+    erratas = set(Document.objects.filter(tags="errata", id__in=list(rfcs.keys())).distinct().values_list("name", flat=True))
+    verified_erratas = set(Document.objects.filter(tags="verified-errata", id__in=list(rfcs.keys())).distinct().values_list("name", flat=True))
     for d in docs:
         d.has_errata = d.name in erratas
         d.has_verified_errata = d.name in verified_erratas
 
     # obsoleted/updated by
-    for a in rfc_aliases:
-        d = doc_dict[a]
+    for rfc in rfcs:
+        d = doc_dict[rfc]
         d.obsoleted_by_list = []
         d.updated_by_list = []
 
-    xed_by = RelatedDocument.objects.filter(target__name__in=list(rfc_aliases.values()),
-                                            relationship__in=("obs", "updates")).select_related('target')
-    rel_rfc_aliases = dict([ (a.document.id, re.sub(r"rfc(\d+)", r"RFC \1", a.name, flags=re.IGNORECASE)) for a in DocAlias.objects.filter(name__startswith="rfc", docs__id__in=[rel.source_id for rel in xed_by]) ])
+    # Revisit this block after RFCs become first-class Document objects
+    xed_by = list(
+        RelatedDocument.objects.filter(
+            target__name__in=list(rfcs.values()),
+            relationship__in=("obs", "updates"),
+        ).select_related("target")
+    )
+    # TODO - this likely reduces to something even simpler
+    rel_rfcs = {
+        d.id: re.sub(r"rfc(\d+)", r"RFC \1", d.name, flags=re.IGNORECASE)
+        for d in Document.objects.filter(
+            type_id="rfc", id__in=[rel.source_id for rel in xed_by]
+        )
+    }
+    xed_by.sort(
+        key=lambda rel: int(
+            re.sub(
+                r"rfc\s*(\d+)",
+                r"\1",
+                rel_rfcs[rel.source_id],
+                flags=re.IGNORECASE,
+            )
+        )
+    )
     for rel in xed_by:
-        d = doc_dict[rel.target.document.id]
+        d = doc_dict[rel.target.id]
         if rel.relationship_id == "obs":
-            l = d.obsoleted_by_list
+            d.obsoleted_by_list.append(rel.source)
         elif rel.relationship_id == "updates":
-            l = d.updated_by_list
-        l.append(rel_rfc_aliases[rel.source_id])
-        l.sort()
+            d.updated_by_list.append(rel.source)
 
 def augment_docs_with_related_docs_info(docs):
     """Augment all documents with related documents information.
@@ -153,10 +181,10 @@ def augment_docs_with_related_docs_info(docs):
         if d.type_id == 'conflrev':
             if len(d.related_that_doc('conflrev')) != 1:
                 continue
-            originalDoc = d.related_that_doc('conflrev')[0].document
+            originalDoc = d.related_that_doc('conflrev')[0]
             d.pages = originalDoc.pages
-            
-def prepare_document_table(request, docs, query=None, max_results=200):
+
+def prepare_document_table(request, docs, query=None, max_results=200, show_ad_and_shepherd=True):
     """Take a queryset of documents and a QueryDict with sorting info
     and return list of documents with attributes filled in for
     displaying a full table of information about the documents, plus
@@ -167,14 +195,15 @@ def prepare_document_table(request, docs, query=None, max_results=200):
         # the number of queries
         docs = docs.select_related("ad", "std_level", "intended_std_level", "group", "stream", "shepherd", )
         docs = docs.prefetch_related("states__type", "tags", "groupmilestone_set__group", "reviewrequest_set__team",
-                                     "ad__email_set", "docalias__iprdocrel_set")
+                                     "ad__email_set", "iprdocrel_set")
         docs = docs[:max_results] # <- that is still a queryset, but with a LIMIT now
         docs = list(docs)
     else:
         docs = docs[:max_results]
 
     fill_in_document_table_attributes(docs)
-    augment_docs_and_user_with_user_info(docs, request.user)
+    if request.user.is_authenticated and hasattr(request.user, "person"):
+        augment_docs_and_person_with_person_info(docs, request.user.person)
     augment_docs_with_related_docs_info(docs)
 
     meta = {}
@@ -191,10 +220,14 @@ def num(i):
 
         res = []
 
-        rfc_num = d.rfc_number()
+        rfc_num = num(d.rfc_number) if d.rfc_number else None
 
         if d.type_id == "draft":
             res.append(num(["Active", "Expired", "Replaced", "Withdrawn", "RFC"].index(d.search_heading.split()[0])))
+            if "with the IESG" in d.search_heading:
+                res.append("1")
+            else:
+                res.append("0")
         else:
             res.append(d.type_id);
             res.append("-");
@@ -204,27 +237,27 @@ def num(i):
         if sort_key == "title":
             res.append(d.title)
         elif sort_key == "date":
-            res.append(str(d.latest_revision_date))
+            res.append(str(d.latest_revision_date.astimezone(ZoneInfo(settings.TIME_ZONE))))
         elif sort_key == "status":
-            if rfc_num != None:
-                res.append(num(rfc_num))
+            if rfc_num is not None:
+                res.append(rfc_num)
             else:
                 res.append(num(d.get_state().order) if d.get_state() else None)
         elif sort_key == "ipr":
             res.append(len(d.ipr()))
         elif sort_key == "ad":
-            if rfc_num != None:
-                res.append(num(rfc_num))
+            if rfc_num is not None:
+                res.append(rfc_num)
             elif d.get_state_slug() == "active":
                 if d.get_state("draft-iesg"):
                     res.append(d.get_state("draft-iesg").order)
                 else:
                     res.append(0)
         else:
-            if rfc_num != None:
-                res.append(num(rfc_num))
+            if rfc_num is not None:
+                res.append(rfc_num)
             else:
-                res.append(d.canonical_name())
+                res.append(d.name)
 
         return res
 
@@ -234,17 +267,18 @@ def num(i):
     if len(docs) == max_results:
         meta['max'] = max_results
 
-    meta['headers'] = [{'title': 'Document', 'key':'document'},
-                       {'title': 'Title', 'key':'title'},
-                       {'title': 'Date', 'key':'date'},
-                       {'title': 'Status', 'key':'status'},
-                       {'title': 'IPR', 'key':'ipr'},
-                       {'title': 'AD / Shepherd', 'key':'ad'}]
+    meta['headers'] = [{'title': 'Document', 'key': 'document'},
+                       {'title': 'Title', 'key': 'title'},
+                       {'title': 'Date', 'key': 'date'},
+                       {'title': 'Status', 'key': 'status'},
+                       {'title': 'IPR', 'key': 'ipr'}]
+    if show_ad_and_shepherd:
+        meta['headers'].append({'title': 'AD / Shepherd', 'key': 'ad'})
+    meta['show_ad_and_shepherd'] = show_ad_and_shepherd
 
     if query and hasattr(query, "urlencode"):  # fed a Django QueryDict
         d = query.copy()
         for h in meta['headers']:
-            h["sort_url"] = "?" + d.urlencode()
             if h['key'] == sort_key:
                 h['sorted'] = True
                 if sort_reversed:
@@ -255,5 +289,89 @@ def num(i):
                     d["sort"] = "-" + h["key"]
             else:
                 d["sort"] = h["key"]
+            h["sort_url"] = "?" + d.urlencode()
 
     return (docs, meta)
+
+
+# The document types and state slugs to include in the AD dashboard
+# and AD doc list, in the order they should be shown.
+#
+# "rfc" is a custom subset of "draft" that we special-case in the code
+# to break out these docs into a separate table.
+#
+AD_WORKLOAD = {
+    "draft": [
+        "pub-req",
+        "ad-eval",
+        "lc-req",
+        "lc",
+        "goaheadw",
+        "writeupw",
+        # "defer",  # probably not a useful state to show, since it's rare
+        "iesg-eva",
+        "approved",
+        "ann",
+    ],
+    "rfc": [
+        "rfcqueue",
+        "rfc",
+    ],
+    "conflrev": [
+        "needshep",
+        "adrev",
+        "iesgeval",
+        "approved",  # synthesized state for all the "appr-" states
+        # "withdraw",  # probably not a useful state to show
+    ],
+    "statchg": [
+        "needshep",
+        "adrev",
+        "lc-req",
+        "in-lc",
+        "iesgeval",
+        "goahead",
+        "appr-sent",
+        # "dead",  # probably not a useful state to show
+    ],
+    "charter": [
+        "notrev",
+        "infrev",
+        "intrev",
+        "extrev",
+        "iesgrev",
+        "approved",
+        # "replaced",  # probably not a useful state to show
+    ],
+}
+
+
+def doc_type(doc):
+    dt = doc.type.slug
+    if (
+        doc.get_state_slug("draft") == "rfc"
+        or doc.get_state_slug("draft-iesg") == "rfcqueue"
+    ):
+        dt = "rfc"
+    return dt
+
+
+def doc_state(doc):
+    dt = doc.type.slug
+    ds = doc.get_state(dt)
+    if dt == "draft":
+        dis = doc.get_state("draft-iesg")
+        if ds.slug == "active" and dis:
+            return dis.slug
+    elif dt == "conflrev":
+        if ds.slug.startswith("appr"):
+            return "approved"
+    return ds.slug
+
+
+def doc_type_name(doc_type):
+    if doc_type == "rfc":
+        return "RFC"
+    if doc_type == "draft":
+        return "Internet-Draft"
+    return DocTypeName.objects.get(slug=doc_type).name
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index 7a4e345711..03cf01a4a1 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -4,11 +4,12 @@
 # Directors and Secretariat
 
 
-import datetime, json
+import datetime
+import json
 
 from django import forms
 from django.conf import settings
-from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.http import HttpResponse, HttpResponseNotAllowed, HttpResponseRedirect, Http404, HttpResponseBadRequest
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.defaultfilters import striptags
 from django.template.loader import render_to_string
@@ -27,29 +28,25 @@
     extra_automation_headers, generate_last_call_announcement, 
     generate_issue_ballot_mail, generate_ballot_writeup, generate_ballot_rfceditornote,
     generate_approval_mail, email_irsg_ballot_closed, email_irsg_ballot_issued,
+    email_rsab_ballot_issued, email_rsab_ballot_closed,
     email_lc_to_yang_doctors )
 from ietf.doc.lastcall import request_last_call
 from ietf.doc.templatetags.ietf_filters import can_ballot
 from ietf.iesg.models import TelechatDate
 from ietf.ietfauth.utils import has_role, role_required, is_authorized_in_doc_stream
+from ietf.mailtrigger.models import Recipient
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.mailtrigger.forms import CcSelectForm
 from ietf.message.utils import infer_message
 from ietf.name.models import BallotPositionName, DocTypeName
 from ietf.person.models import Person
-from ietf.utils.mail import send_mail_text, send_mail_preformatted
+from ietf.utils.fields import ModelMultipleChoiceField, MultiEmailField
+from ietf.utils.http import validate_return_to_path
+from ietf.utils.mail import decode_header_value, send_mail_text, send_mail_preformatted
 from ietf.utils.decorators import require_api_key
 from ietf.utils.response import permission_denied
+from ietf.utils.timezone import date_today, datetime_from_date, DEADLINE_TZINFO
 
-BALLOT_CHOICES = (("yes", "Yes"),
-                  ("noobj", "No Objection"),
-                  ("discuss", "Discuss"),
-                  ("abstain", "Abstain"),
-                  ("recuse", "Recuse"),
-                  ("moretime", "Need More Time"),
-                  ("notready", "Not Ready"),
-                  ("", "No Record"),
-                  )
 
 # -------------------------------------------------
 # Helper Functions
@@ -104,6 +101,8 @@ def __init__(self, *args, **kwargs):
         ballot_type = kwargs.pop("ballot_type")
         super(EditPositionForm, self).__init__(*args, **kwargs)
         self.fields['position'].queryset = ballot_type.positions.order_by('order')
+        if ballot_type.positions.filter(blocking=True).exists():
+            self.fields['discuss'].label = ballot_type.positions.get(blocking=True).name
 
     def clean_discuss(self):
        entered_discuss = self.cleaned_data["discuss"]
@@ -181,66 +180,90 @@ def save_position(form, doc, ballot, balloter, login=None, send_email=False):
 
     return pos
 
-@role_required('Area Director','Secretariat','IRSG Member')
+class AdditionalCCForm(forms.Form):
+    additional_cc = MultiEmailField(required=False)
+
+@role_required("Area Director", "Secretariat", "IRSG Member", "RSAB Member")
 def edit_position(request, name, ballot_id):
-    """Vote and edit discuss and comment on document as Area Director."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    """Vote and edit discuss and comment on document"""
+    doc = get_object_or_404(Document, name=name)
     ballot = get_object_or_404(BallotDocEvent, type="created_ballot", pk=ballot_id, doc=doc)
 
     balloter = login = request.user.person
 
-    if 'ballot_edit_return_point' in request.session:
-        return_to_url = request.session['ballot_edit_return_point']
-    else:
-        return_to_url = urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name, ballot_id=ballot_id))
-
-    # if we're in the Secretariat, we can select an AD to act as stand-in for
-    # or we can select an IRSG member
+    try:
+        return_to_url = parse_ballot_edit_return_point(request.GET.get('ballot_edit_return_point'), doc.name, ballot_id)
+    except ValueError:
+        return HttpResponseBadRequest('ballot_edit_return_point is invalid')
+    
+    # if we're in the Secretariat, we can select a balloter to act as stand-in for
     if has_role(request.user, "Secretariat"):
         balloter_id = request.GET.get('balloter')
         if not balloter_id:
             raise Http404
         balloter = get_object_or_404(Person, pk=balloter_id)
 
+    if doc.stream_id == 'irtf':
+        mailtrigger_slug='irsg_ballot_saved'
+    elif doc.stream_id == 'editorial':
+        mailtrigger_slug='rsab_ballot_saved'
+    else:
+        mailtrigger_slug='iesg_ballot_saved'
+
     if request.method == 'POST':
         old_pos = None
         if not has_role(request.user, "Secretariat") and not can_ballot(request.user, doc):
-            # prevent pre-ADs from voting
-            permission_denied(request, "Must be a proper Area Director in an active area or IRSG Member to cast ballot")
+            # prevent pre-ADs from taking a position
+            permission_denied(request, "Must be an active member (not a pre-AD for example) of the balloting body to take a position")
+        
+        if request.POST.get("Defer") and doc.stream.slug != "irtf":
+            return redirect('ietf.doc.views_ballot.defer_ballot', name=doc)
+        elif request.POST.get("Undefer") and doc.stream.slug != "irtf":
+            return redirect('ietf.doc.views_ballot.undefer_ballot', name=doc)
         
         form = EditPositionForm(request.POST, ballot_type=ballot.ballot_type)
-        if form.is_valid():
+        cc_select_form = CcSelectForm(data=request.POST,mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
+        additional_cc_form = AdditionalCCForm(request.POST)
+        if form.is_valid() and cc_select_form.is_valid() and additional_cc_form.is_valid():
             send_mail = True if request.POST.get("send_mail") else False
-            save_position(form, doc, ballot, balloter, login, send_mail)
-
+            pos = save_position(form, doc, ballot, balloter, login, send_mail)
             if send_mail:
-                qstr=""
-                if request.GET.get('balloter'):
-                    qstr += "?balloter=%s" % request.GET.get('balloter')
-                return HttpResponseRedirect(urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=doc.name, ballot_id=ballot_id)) + qstr)
-            elif request.POST.get("Defer") and doc.stream.slug != "irtf":
-                return redirect('ietf.doc.views_ballot.defer_ballot', name=doc)
-            elif request.POST.get("Undefer") and doc.stream.slug != "irtf":
-                return redirect('ietf.doc.views_ballot.undefer_ballot', name=doc)
-            else:
-                return HttpResponseRedirect(return_to_url)
+                addrs, frm, subject, body = build_position_email(balloter, doc, pos)
+                if doc.stream_id == 'irtf':
+                    mailtrigger_slug='irsg_ballot_saved'
+                elif doc.stream_id == 'editorial':
+                    mailtrigger_slug='rsab_ballot_saved'
+                else:
+                    mailtrigger_slug='iesg_ballot_saved'
+                cc = []
+                cc.extend(cc_select_form.get_selected_addresses())
+                extra_cc = additional_cc_form.cleaned_data["additional_cc"]
+                if extra_cc:
+                    cc.extend(extra_cc)
+                cc_set = set(cc)
+                cc_set.discard("")
+                cc = sorted(list(cc_set))
+                send_mail_text(request, addrs.to, frm, subject, body, cc=", ".join(cc))
+            return redirect(return_to_url)
     else:
         initial = {}
         old_pos = doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position", balloter=balloter, ballot=ballot)
         if old_pos:
             initial['position'] = old_pos.pos.slug
             initial['discuss'] = old_pos.discuss
-            initial['comment'] = old_pos.comment
-            
+            initial['comment'] = old_pos.comment      
         form = EditPositionForm(initial=initial, ballot_type=ballot.ballot_type)
+        cc_select_form = CcSelectForm(mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
+        additional_cc_form = AdditionalCCForm()
 
     blocking_positions = dict((p.pk, p.name) for p in form.fields["position"].queryset.all() if p.blocking)
-
     ballot_deferred = doc.active_defer_event()
 
     return render(request, 'doc/ballot/edit_position.html',
                               dict(doc=doc,
                                    form=form,
+                                   cc_select_form=cc_select_form,
+                                   additional_cc_form=additional_cc_form,
                                    balloter=balloter,
                                    return_to_url=return_to_url,
                                    old_pos=old_pos,
@@ -255,14 +278,18 @@ def edit_position(request, name, ballot_id):
 @csrf_exempt
 def api_set_position(request):
     def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
     if request.method == 'POST':
         ad = request.user.person
         name = request.POST.get('doc')
         if not name:
             return err(400, "Missing document name")
         try:
-            doc = Document.objects.get(docalias__name=name)
+            doc = Document.objects.get(name=name)
         except Document.DoesNotExist:
             return err(400, "Document not found")
         position_names = BallotPositionName.objects.values_list('slug', flat=True)
@@ -288,24 +315,105 @@ def err(code, text):
     addrs, frm, subject, body = build_position_email(ad, doc, pos)
     send_mail_text(request, addrs.to, frm, subject, body, cc=addrs.cc)
 
-    return HttpResponse("Done", status=200, content_type='text/plain')
+    return HttpResponse(
+        "Done",
+        status=200,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
 
 
-def build_position_email(balloter, doc, pos):
+@role_required("Area Director", "Secretariat")
+@csrf_exempt
+def ajax_build_position_email(request):
+    if request.method != "POST":
+        return HttpResponseNotAllowed(["POST"])
+    errors = list()
+    try:
+        json_body = json.loads(request.body)
+    except json.decoder.JSONDecodeError:
+        errors.append("Post body is not valid json")
+    if len(errors) == 0:
+        post_data = json_body.get("post_data")
+        if post_data is None:
+            errors.append("post_data not provided")
+        else:
+            for key in [
+                "discuss",
+                "comment",
+                "position",
+                "balloter",
+                "docname",
+                "cc_choices",
+                "additional_cc",
+            ]:
+                if key not in post_data:
+                    errors.append(f"{key} not found in post_data")
+    if len(errors) == 0:
+        person = Person.objects.filter(pk=post_data.get("balloter")).first()
+        if person is None:
+            errors.append("No person found matching balloter")
+        doc = Document.objects.filter(name=post_data.get("docname")).first()
+        if doc is None:
+            errors.append("No document found matching docname")
+    if len(errors) > 0:
+        response = {
+            "success": False,
+            "errors": errors,
+        }
+    else:
+        wanted = dict()  # consider named tuple instead
+        wanted["discuss"] = post_data.get("discuss")
+        wanted["comment"] = post_data.get("comment")
+        wanted["position_name"] = post_data.get("position")
+        wanted["balloter"] = person
+        wanted["doc"] = doc
+        addrs, frm, subject, body = build_position_email_from_dict(wanted)
+
+        recipient_slugs = post_data.get("cc_choices")
+        # Consider refactoring gather_address_lists so this isn't duplicated from there
+        cc_addrs = set()
+        for r in Recipient.objects.filter(slug__in=recipient_slugs):
+            cc_addrs.update(r.gather(doc=doc))
+        additional_cc = post_data.get("additional_cc")
+        for addr in additional_cc.split(","):
+            cc_addrs.add(addr.strip())
+        cc_addrs.discard("")
+        cc_addrs = sorted(list(cc_addrs))
+
+        response_text = "\n".join(
+            [
+                f"From: {decode_header_value(frm)}",
+                f"To: {', '.join([decode_header_value(addr) for addr in addrs.to])}",
+                f"Cc: {', '.join([decode_header_value(addr) for addr in cc_addrs])}",
+                f"Subject: {subject}",
+                "",
+                body,
+            ]
+        )
+
+        response = {
+            "success": True,
+            "text": response_text,
+        }
+    return HttpResponse(json.dumps(response), content_type="application/json")
+
+def build_position_email_from_dict(pos_dict):
+    doc = pos_dict["doc"]
     subj = []
     d = ""
     blocking_name = "DISCUSS"
-    if pos.pos.blocking and pos.discuss:
-        d = pos.discuss
-        blocking_name = pos.pos.name.upper()
+    pos_name = BallotPositionName.objects.filter(slug=pos_dict["position_name"]).first()
+    if pos_name.blocking and pos_dict.get("discuss"):
+        d = pos_dict.get("discuss")
+        blocking_name = pos_name.name.upper()
         subj.append(blocking_name)
     c = ""
-    if pos.comment:
-        c = pos.comment
+    if pos_dict.get("comment"):
+        c = pos_dict.get("comment")
         subj.append("COMMENT")
-
+    balloter = pos_dict.get("balloter")
     balloter_name_genitive = balloter.plain_name() + "'" if balloter.plain_name().endswith('s') else balloter.plain_name() + "'s"
-    subject = "%s %s on %s" % (balloter_name_genitive, pos.pos.name if pos.pos else "No Position", doc.name + "-" + doc.rev)
+    subject = "%s %s on %s" % (balloter_name_genitive, pos_name.name if pos_name else "No Position", doc.name + "-" + doc.rev)
     if subj:
         subject += ": (with %s)" % " and ".join(subj)
 
@@ -314,97 +422,51 @@ def build_position_email(balloter, doc, pos):
                                  comment=c,
                                  balloter=balloter.plain_name(),
                                  doc=doc,
-                                 pos=pos.pos,
+                                 pos=pos_name,
                                  blocking_name=blocking_name,
                                  settings=settings))
     frm = balloter.role_email("ad").formatted_email()
 
     if doc.stream_id == "irtf":
         addrs = gather_address_lists('irsg_ballot_saved',doc=doc)
+    elif doc.stream_id == "editorial":
+        addrs = gather_address_lists('rsab_ballot_saved',doc=doc)
     else:
         addrs = gather_address_lists('iesg_ballot_saved',doc=doc)
 
     return addrs, frm, subject, body
 
-@role_required('Area Director','Secretariat','IRSG Member')
-def send_ballot_comment(request, name, ballot_id):
-    """Email document ballot position discuss/comment for Area Director."""
-    doc = get_object_or_404(Document, docalias__name=name)
-    ballot = get_object_or_404(BallotDocEvent, type="created_ballot", pk=ballot_id, doc=doc)
-
-    if not has_role(request.user, 'Secretariat'):
-        if doc.stream_id == 'irtf' and not has_role(request.user, 'IRSG Member'):
-            raise Http404
-        if doc.stream_id == 'ietf' and not has_role(request.user, 'Area Director'):
-            raise Http404
-
-    balloter = request.user.person
-
-    if 'ballot_edit_return_point' in request.session:
-        return_to_url = request.session['ballot_edit_return_point']
-    else:
-        return_to_url = urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name, ballot_id=ballot_id))
-
-    if 'HTTP_REFERER' in request.META:
-        back_url = request.META['HTTP_REFERER']
-    else:
-        back_url = urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name, ballot_id=ballot_id))
-
-    # if we're in the Secretariat, we can select an AD to act as stand-in for
-    if has_role(request.user, "Secretariat"):
-        balloter_id = request.GET.get('balloter')
-        if not balloter_id:
-            raise Http404
-        balloter = get_object_or_404(Person, pk=balloter_id)
-
-    pos = doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position", balloter=balloter, ballot=ballot)
-    if not pos:
-        raise Http404
-
-    addrs, frm, subject, body = build_position_email(balloter, doc, pos)
 
-    if doc.stream_id == 'irtf':
-        mailtrigger_slug='irsg_ballot_saved'
-    else:
-        mailtrigger_slug='iesg_ballot_saved'
-        
-    if request.method == 'POST':
-        cc = []
-        cc_select_form = CcSelectForm(data=request.POST,mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
-        if cc_select_form.is_valid():
-            cc.extend(cc_select_form.get_selected_addresses())
-        extra_cc = [x.strip() for x in request.POST.get("extra_cc","").split(',') if x.strip()]
-        if extra_cc:
-            cc.extend(extra_cc)
-
-        send_mail_text(request, addrs.to, frm, subject, body, cc=", ".join(cc))
-            
-        return HttpResponseRedirect(return_to_url)
-
-    else: 
+def build_position_email(balloter, doc, pos):
 
-        cc_select_form = CcSelectForm(mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
-  
-        return render(request, 'doc/ballot/send_ballot_comment.html',
-                      dict(doc=doc,
-                          subject=subject,
-                          body=body,
-                          frm=frm,
-                          to=addrs.as_strings().to,
-                          balloter=balloter,
-                          back_url=back_url,
-                          cc_select_form = cc_select_form,
-                      ))
+    pos_dict=dict()
+    pos_dict["doc"]=doc
+    pos_dict["position_name"]=pos.pos.slug
+    pos_dict["discuss"]=pos.discuss
+    pos_dict["comment"]=pos.comment
+    pos_dict["balloter"]=balloter
+    return build_position_email_from_dict(pos_dict)
 
 @role_required('Area Director','Secretariat')
 def clear_ballot(request, name, ballot_type_slug):
     """Clear all positions and discusses on every open ballot for a document."""
     doc = get_object_or_404(Document, name=name)
+    # If there's no appropriate ballot type state, clearing would be an invalid action.
+    # This will need to be updated if we ever allow defering IRTF ballots
+    if ballot_type_slug == "approve":
+        state_machine = "draft-iesg"
+    elif ballot_type_slug in ["statchg","conflrev"]:
+        state_machine = ballot_type_slug
+    else:
+        state_machine = None
+    state_slug = state_machine and doc.get_state_slug(state_machine)
+    if state_machine is None or state_slug is None:
+        raise Http404
     if request.method == 'POST':
         by = request.user.person
         if close_ballot(doc, by, ballot_type_slug):
             create_ballot_if_not_open(request, doc, by, ballot_type_slug)
-        if doc.get_state('draft-iesg').slug == 'defer':
+        if state_slug == "defer":
             do_undefer_ballot(request,doc)
         return redirect("ietf.doc.views_doc.document_main", name=doc.name)
 
@@ -415,7 +477,7 @@ def clear_ballot(request, name, ballot_type_slug):
 @role_required('Area Director','Secretariat')
 def defer_ballot(request, name):
     """Signal post-pone of ballot, notifying relevant parties."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if doc.type_id not in ('draft','conflrev','statchg'):
         raise Http404
     interesting_state = dict(draft='draft-iesg',conflrev='conflrev',statchg='statchg')
@@ -469,7 +531,7 @@ def defer_ballot(request, name):
 @role_required('Area Director','Secretariat')
 def undefer_ballot(request, name):
     """undo deferral of ballot ballot."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if doc.type_id not in ('draft','conflrev','statchg'):
         raise Http404
     if doc.type_id == 'draft' and not doc.get_state("draft-iesg"):
@@ -505,7 +567,7 @@ def clean_last_call_text(self):
 @role_required('Area Director','Secretariat')
 def lastcalltext(request, name):
     """Editing of the last call text"""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if not doc.get_state("draft-iesg"):
         raise Http404
 
@@ -591,7 +653,11 @@ def clean_ballot_writeup(self):
 @role_required('Area Director','Secretariat')
 def ballot_writeupnotes(request, name):
     """Editing of ballot write-up and notes"""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
+
+    if doc.stream_id is None or doc.stream_id != 'ietf':
+        raise Http404("The requested operation is not allowed for this document.")
+
     prev_state = doc.get_state("draft-iesg")
 
     login = request.user.person
@@ -622,7 +688,7 @@ def ballot_writeupnotes(request, name):
                 existing.save()
 
             if "issue_ballot" in request.POST and not ballot_already_approved:
-                if prev_state.slug in ['watching', 'writeupw', 'goaheadw']:
+                if prev_state.slug in ['writeupw', 'goaheadw']:
                     new_state = State.objects.get(used=True, type="draft-iesg", slug='iesg-eva')
                     prev_tags = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
                     doc.set_state(new_state)
@@ -688,7 +754,8 @@ def ballot_writeupnotes(request, name):
                               dict(doc=doc,
                                    back_url=doc.get_absolute_url(),
                                    ballot_issued=bool(doc.latest_event(type="sent_ballot_announcement")),
-                                   ballot_issue_danger=bool(prev_state.slug in ['ad-eval', 'lc']),
+                                   warn_lc = not doc.docevent_set.filter(lastcalldocevent__expires__date__lt=date_today(DEADLINE_TZINFO)).exists(),
+                                   warn_unexpected_state= prev_state if bool(prev_state.slug in ['ad-eval', 'lc']) else None,
                                    ballot_writeup_form=form,
                                    need_intended_status=need_intended_status,
                                    ))
@@ -702,7 +769,7 @@ def clean_rfc_editor_note(self):
 @role_required('Area Director','Secretariat','IAB Chair','IRTF Chair','ISE')
 def ballot_rfceditornote(request, name):
     """Editing of RFC Editor Note"""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
 
     if not is_authorized_in_doc_stream(request.user, doc):
         permission_denied(request, "You do not have the necessary permissions to change the RFC Editor Note for this document")
@@ -723,7 +790,7 @@ def ballot_rfceditornote(request, name):
                 e = WriteupDocEvent(doc=doc, rev=doc.rev, by=login)
                 e.by = login
                 e.type = "changed_rfc_editor_note_text"
-                e.desc = "RFC Editor Note was changed"
+                e.desc = f"RFC Editor Note was changed to \n{t}"
                 e.text = t.rstrip()
                 e.save()
 
@@ -767,7 +834,7 @@ def clean_approval_text(self):
 @role_required('Area Director','Secretariat')
 def ballot_approvaltext(request, name):
     """Editing of approval text"""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if not doc.get_state("draft-iesg"):
         raise Http404
 
@@ -818,7 +885,7 @@ def ballot_approvaltext(request, name):
 @role_required('Secretariat')
 def approve_ballot(request, name):
     """Approve ballot, sending out announcement, changing state."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if not doc.get_state("draft-iesg"):
         raise Http404
 
@@ -933,7 +1000,7 @@ def approve_ballot(request, name):
 
 
 class ApproveDownrefsForm(forms.Form):
-    checkboxes = forms.ModelMultipleChoiceField(
+    checkboxes = ModelMultipleChoiceField(
         widget = forms.CheckboxSelectMultiple,
         queryset =  RelatedDocument.objects.none(), )
 
@@ -949,13 +1016,19 @@ def clean(self):
 @role_required('Secretariat')
 def approve_downrefs(request, name):
     """Document ballot was just approved; add the checked downwared references to the downref registry."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if not doc.get_state("draft-iesg"):
         raise Http404
 
     login = request.user.person
 
-    downrefs_to_rfc = [rel for rel in doc.relateddocument_set.all() if rel.is_downref() and not rel.is_approved_downref() and rel.target.document.is_rfc()]
+    downrefs_to_rfc = [
+        rel
+        for rel in doc.relateddocument_set.all()
+        if rel.is_downref()
+        and not rel.is_approved_downref()
+        and rel.target.type_id == "rfc"
+    ]
 
     downrefs_to_rfc_qs = RelatedDocument.objects.filter(pk__in=[r.pk for r in downrefs_to_rfc])        
 
@@ -970,12 +1043,12 @@ def approve_downrefs(request, name):
                 c = DocEvent(type="downref_approved", doc=rel.source,
                         rev=rel.source.rev, by=login)
                 c.desc = "Downref to RFC %s approved by Last Call for %s-%s" % (
-                        rel.target.document.rfc_number(), rel.source, rel.source.rev)
+                    rel.target.rfc_number, rel.source, rel.source.rev)
                 c.save()
-                c = DocEvent(type="downref_approved", doc=rel.target.document,
-                        rev=rel.target.document.rev, by=login)
+                c = DocEvent(type="downref_approved", doc=rel.target,
+                        rev=rel.target.rev, by=login)
                 c.desc = "Downref to RFC %s approved by Last Call for %s-%s" % (
-                        rel.target.document.rfc_number(), rel.source, rel.source.rev)
+                    rel.target.rfc_number, rel.source, rel.source.rev)
                 c.save()
 
             return HttpResponseRedirect(doc.get_absolute_url())
@@ -996,8 +1069,8 @@ class MakeLastCallForm(forms.Form):
 
 @role_required('Secretariat')
 def make_last_call(request, name):
-    """Make last call for Internet Draft, sending out announcement."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    """Make last call for Internet-Draft, sending out announcement."""
+    doc = get_object_or_404(Document, name=name)
     if not (doc.get_state("draft-iesg") or doc.get_state("statchg")):
         raise Http404
 
@@ -1055,9 +1128,11 @@ def make_last_call(request, name):
             e.desc = "The following Last Call announcement was sent out (ends %s):<br><br>" % expiration_date
             e.desc += announcement
 
-            if form.cleaned_data['last_call_sent_date'] != e.time.date():
-                e.time = datetime.datetime.combine(form.cleaned_data['last_call_sent_date'], e.time.time())
-            e.expires = expiration_date
+            e_production_time = e.time.astimezone(DEADLINE_TZINFO)
+            if form.cleaned_data['last_call_sent_date'] != e_production_time.date():
+                lcsd = form.cleaned_data['last_call_sent_date']
+                e.time = e_production_time.replace(year=lcsd.year, month=lcsd.month, day=lcsd.day)  # preserves tzinfo
+            e.expires = datetime_from_date(expiration_date, DEADLINE_TZINFO)
             e.save()
             events.append(e)
 
@@ -1080,7 +1155,7 @@ def make_last_call(request, name):
             return HttpResponseRedirect(doc.get_absolute_url())
     else:
         initial = {}
-        initial["last_call_sent_date"] = datetime.date.today()
+        initial["last_call_sent_date"] = date_today()
         if doc.type.slug == 'draft':
             # This logic is repeated in the code that edits last call text - why?
             expire_days = 14
@@ -1091,7 +1166,7 @@ def make_last_call(request, name):
             expire_days=28
             templ = 'doc/status_change/make_last_call.html'
 
-        initial["last_call_expiration_date"] = datetime.date.today() + datetime.timedelta(days=expire_days)
+        initial["last_call_expiration_date"] = date_today() + datetime.timedelta(days=expire_days)
         
         form = MakeLastCallForm(initial=initial)
   
@@ -1103,12 +1178,12 @@ def make_last_call(request, name):
 
 @role_required('Secretariat', 'IRTF Chair')
 def issue_irsg_ballot(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if doc.stream.slug != "irtf" or doc.type != DocTypeName.objects.get(slug="draft"):
         raise Http404
 
     by = request.user.person
-    fillerdate = datetime.date.today() + datetime.timedelta(weeks=2)
+    fillerdate = date_today(DEADLINE_TZINFO) + datetime.timedelta(weeks=2)
 
     if request.method == 'POST':
         button = request.POST.get("irsg_button")
@@ -1117,7 +1192,7 @@ def issue_irsg_ballot(request, name):
             e = IRSGBallotDocEvent(doc=doc, rev=doc.rev, by=request.user.person)
             if (duedate == None or duedate==""):
                 duedate = str(fillerdate)
-            e.duedate = datetime.datetime.strptime(duedate, '%Y-%m-%d')
+            e.duedate = datetime_from_date(datetime.datetime.strptime(duedate, '%Y-%m-%d'), DEADLINE_TZINFO)
             e.type = "created_ballot"
             e.desc = "Created IRSG Ballot"
             ballot_type = BallotType.objects.get(doc_type=doc.type, slug="irsg-approve")
@@ -1158,7 +1233,7 @@ def issue_irsg_ballot(request, name):
 
 @role_required('Secretariat', 'IRTF Chair')
 def close_irsg_ballot(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if doc.stream.slug != "irtf" or doc.type != DocTypeName.objects.get(slug="draft"):
         raise Http404
 
@@ -1188,8 +1263,122 @@ def irsg_ballot_status(request):
             ballot = doc.active_ballot()
             if ballot:
                 doc.ballot = ballot
-                doc.duedate=datetime.datetime.strftime(ballot.irsgballotdocevent.duedate, '%Y-%m-%d')
+                doc.duedate=datetime.datetime.strftime(
+                    ballot.irsgballotdocevent.duedate.astimezone(DEADLINE_TZINFO),
+                    '%Y-%m-%d',
+                )
 
             docs.append(doc)
 
     return render(request, 'doc/irsg_ballot_status.html', {'docs':docs})
+
+@role_required('Secretariat', 'RSAB Chair')
+def issue_rsab_ballot(request, name):
+    doc = get_object_or_404(Document, name=name)
+    if doc.stream.slug != "editorial" or doc.type != DocTypeName.objects.get(slug="draft"):
+        raise Http404
+
+    by = request.user.person
+
+    if request.method == 'POST':
+        button = request.POST.get("rsab_button") # TODO: Really? There's an irsg button? The templates should be generalized.
+        if button == 'Yes':
+            e = BallotDocEvent(doc=doc, rev=doc.rev, by=request.user.person)
+            e.type = "created_ballot"
+            e.desc = "Created RSAB Ballot"
+            ballot_type = BallotType.objects.get(doc_type=doc.type, slug="rsab-approve")
+            e.ballot_type = ballot_type
+            e.save()
+            new_state = doc.get_state()
+            prev_tags = []
+            new_tags = []
+
+            email_rsab_ballot_issued(request, doc, ballot=e)  # Send notification email
+
+            if doc.type_id == 'draft':
+                new_state = State.objects.get(used=True, type="draft-stream-editorial", slug='rsabpoll')
+
+            prev_state = doc.get_state(new_state.type_id if new_state else None)
+
+            doc.set_state(new_state)
+            doc.tags.remove(*prev_tags)
+
+            events = []
+            e = add_state_change_event(doc, by, prev_state, new_state, prev_tags=prev_tags, new_tags=new_tags)
+            if e:
+                events.append(e)
+            e = update_action_holders(doc, prev_state, new_state, prev_tags=prev_tags, new_tags=new_tags)
+            if e:
+                events.append(e)
+
+            if events:
+                doc.save_with_history(events)
+
+        return HttpResponseRedirect(doc.get_absolute_url())
+    else:
+        templ = 'doc/ballot/rsab_ballot_approve.html'
+
+        question = "Confirm issuing a ballot for " + name + "?"
+        return render(request, templ, dict(doc=doc, question=question))
+
+@role_required('Secretariat', 'RSAB Chair')
+def close_rsab_ballot(request, name):
+    doc = get_object_or_404(Document, name=name)
+    if doc.stream.slug != "editorial" or doc.type_id != "draft":
+        raise Http404
+
+    by = request.user.person
+
+    if request.method == 'POST':
+        button = request.POST.get("rsab_button")
+        if button == 'Yes':
+            ballot = close_ballot(doc, by, "rsab-approve")
+            email_rsab_ballot_closed(
+                request,
+                doc=doc,
+                ballot=BallotDocEvent.objects.get(pk=ballot.pk)
+            )
+        return HttpResponseRedirect(doc.get_absolute_url())
+        
+    templ = 'doc/ballot/rsab_ballot_close.html'
+    question = "Confirm closing the ballot for " + name + "?"
+    return render(request, templ, dict(doc=doc, question=question))
+
+def rsab_ballot_status(request):
+    possible_docs = Document.objects.filter(docevent__ballotdocevent__isnull=False)
+    docs = []
+    for doc in possible_docs:
+        if doc.ballot_open("rsab-approve"):
+            ballot = doc.active_ballot()
+            if ballot:
+                doc.ballot = ballot
+
+            docs.append(doc)
+    return render(request, 'doc/rsab_ballot_status.html', {'docs':docs}) 
+    # Possible TODO: add a menu item to show this? Maybe only if you're in rsab or an rswg chair?
+    # There will be so few of these that the general community would follow them from the rswg docs page.
+    # Maybe the view isn't actually needed at all...
+
+
+def parse_ballot_edit_return_point(path, doc_name, ballot_id):
+    get_default_path = lambda: urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc_name, ballot_id=ballot_id))
+    allowed_path_handlers = {
+        "ietf.community.views.view_list",
+        "ietf.doc.views_doc.document_ballot",
+        "ietf.doc.views_doc.document_irsg_ballot",
+        "ietf.doc.views_doc.document_rsab_ballot",
+        "ietf.doc.views_ballot.irsg_ballot_status",
+        "ietf.doc.views_ballot.rsab_ballot_status",
+        "ietf.doc.views_search.search",
+        "ietf.doc.views_search.docs_for_ad",
+        "ietf.doc.views_search.drafts_in_last_call",
+        "ietf.doc.views_search.recent_drafts",
+        "ietf.group.views.chartering_groups",
+        "ietf.group.views.group_documents",
+        "ietf.group.views.stream_documents",
+        "ietf.iesg.views.agenda",
+        "ietf.iesg.views.agenda_documents",
+        "ietf.iesg.views.discusses",
+        "ietf.iesg.views.past_documents",
+    }
+    return validate_return_to_path(path, get_default_path, allowed_path_handlers)
diff --git a/ietf/doc/views_bofreq.py b/ietf/doc/views_bofreq.py
index 92a130efb4..94e3960dfa 100644
--- a/ietf/doc/views_bofreq.py
+++ b/ietf/doc/views_bofreq.py
@@ -15,7 +15,7 @@
 
 from ietf.doc.mails import (email_bofreq_title_changed, email_bofreq_editors_changed, 
     email_bofreq_new_revision, email_bofreq_responsible_changed)
-from ietf.doc.models import (Document, DocAlias, DocEvent, NewRevisionDocEvent, 
+from ietf.doc.models import (Document, DocEvent, NewRevisionDocEvent, 
     BofreqEditorDocEvent, BofreqResponsibleDocEvent, State)
 from ietf.doc.utils import add_state_change_event
 from ietf.doc.utils_bofreq import bofreq_editors, bofreq_responsible
@@ -91,7 +91,6 @@ def submit(request, name):
                 by=request.user.person,
                 rev=bofreq.rev,
                 desc='New revision available',
-                time=bofreq.time,
             )
             bofreq.save_with_history([e])
             bofreq_submission = form.cleaned_data['bofreq_submission']
@@ -101,6 +100,7 @@ def submit(request, name):
                 content = form.cleaned_data['bofreq_content']
             with io.open(bofreq.get_file_name(), 'w', encoding='utf-8') as destination:
                 destination.write(content)
+            bofreq.store_str(bofreq.get_base_name(), content)
             email_bofreq_new_revision(request, bofreq)
             return redirect('ietf.doc.views_doc.document_main', name=bofreq.name)
 
@@ -168,8 +168,6 @@ def new_bof_request(request):
             )
             e2.editors.set([request.user.person])
             bofreq.save_with_history([e1,e2])
-            alias = DocAlias.objects.create(name=name)
-            alias.docs.set([bofreq])
             bofreq_submission = form.cleaned_data['bofreq_submission']
             if bofreq_submission == "upload":
                 content = get_cleaned_text_file_content(form.cleaned_data["bofreq_file"])
@@ -177,6 +175,7 @@ def new_bof_request(request):
                 content = form.cleaned_data['bofreq_content']
             with io.open(bofreq.get_file_name(), 'w', encoding='utf-8') as destination:
                 destination.write(content)
+            bofreq.store_str(bofreq.get_base_name(), content)
             email_bofreq_new_revision(request, bofreq)
             return redirect('ietf.doc.views_doc.document_main', name=bofreq.name)
 
diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py
index c2b88ac473..e899f59227 100644
--- a/ietf/doc/views_charter.py
+++ b/ietf/doc/views_charter.py
@@ -3,11 +3,12 @@
 
 
 import datetime
-import io
 import json
 import os
 import textwrap
 
+from pathlib import Path
+
 from django.http import HttpResponseRedirect, HttpResponseNotFound, Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse as urlreverse
@@ -16,12 +17,13 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.utils.encoding import force_text
+from django.utils import timezone
+from django.utils.encoding import force_str
 from django.utils.html import escape
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( Document, DocAlias, DocHistory, State, DocEvent,
+from ietf.doc.models import ( Document, DocHistory, State, DocEvent,
     BallotDocEvent, BallotPositionDocEvent, InitialReviewDocEvent, NewRevisionDocEvent,
     WriteupDocEvent, TelechatDocEvent )
 from ietf.doc.utils import ( add_state_change_event, close_open_ballots,
@@ -31,16 +33,17 @@
     generate_ballot_writeup, generate_issue_ballot_mail, next_revision,
     derive_new_work_text,
     change_group_state_after_charter_approval, fix_charter_revision_after_approval,
-    split_charter_name)
+    split_charter_name, charter_name_for_group)
 from ietf.doc.mails import email_state_changed, email_charter_internal_review
 from ietf.group.mails import email_admin_re_charter
 from ietf.group.models import Group, ChangeStateGroupEvent, MilestoneGroupEvent
-from ietf.group.utils import save_group_in_history, save_milestone_in_history, can_manage_all_groups_of_type
-from ietf.group.views import fill_in_charter_info
+from ietf.group.utils import save_group_in_history, save_milestone_in_history, can_manage_all_groups_of_type, \
+    fill_in_charter_info
 from ietf.ietfauth.utils import has_role, role_required
 from ietf.name.models import GroupStateName
 from ietf.person.models import Person
 from ietf.utils.history import find_history_active_at
+from ietf.utils.log import assertion, log
 from ietf.utils.mail import send_mail_preformatted 
 from ietf.utils.textupload import get_cleaned_text_file_content
 from ietf.utils.response import permission_denied
@@ -77,7 +80,7 @@ def change_state(request, name, option=None):
     chartering_type = get_chartering_type(charter)
 
     initial_review = charter.latest_event(InitialReviewDocEvent, type="initial_review")
-    if charter.get_state_slug() != "infrev" or (initial_review and initial_review.expires < datetime.datetime.now()) or chartering_type == "rechartering":
+    if charter.get_state_slug() != "infrev" or (initial_review and initial_review.expires < timezone.now()) or chartering_type == "rechartering":
         initial_review = None
 
     by = request.user.person
@@ -162,7 +165,7 @@ def change_state(request, name, option=None):
                 if message or charter_state.slug == "intrev" or charter_state.slug == "extrev":
                     email_admin_re_charter(request, group, "Charter state changed to \"%s\"" % charter_state.name, message,'charter_state_edit_admin_needed')
 
-                # TODO - do we need a seperate set of recipients for state changes to charters vrs other kind of documents
+                # TODO - do we need a separate set of recipients for state changes to charters vrs other kind of documents
                 email_state_changed(request, charter, "State changed to %s." % charter_state, 'doc_state_edited')
 
                 if charter_state.slug == "intrev" and group.type_id == "wg":
@@ -183,7 +186,7 @@ def change_state(request, name, option=None):
 
             if charter_state.slug == "infrev" and clean["initial_time"] and clean["initial_time"] != 0:
                 e = InitialReviewDocEvent(type="initial_review", by=by, doc=charter, rev=charter.rev)
-                e.expires = datetime.datetime.now() + datetime.timedelta(weeks=clean["initial_time"])
+                e.expires = timezone.now() + datetime.timedelta(weeks=clean["initial_time"])
                 e.desc = "Initial review time expires %s" % e.expires.strftime("%Y-%m-%d")
                 e.save()
 
@@ -361,38 +364,41 @@ def clean_txt(self):
 
 @login_required
 def submit(request, name, option=None):
-    if not name.startswith('charter-'):
-        raise Http404
-
+    # Charters are named "charter-<ietf|irtf>-<group acronym>"
     charter = Document.objects.filter(type="charter", name=name).first()
     if charter:
         group = charter.group
-        charter_canonical_name = charter.canonical_name()
+        assertion("charter.name == charter_name_for_group(group)")
         charter_rev = charter.rev
     else:
         top_org, group_acronym = split_charter_name(name)
         group = get_object_or_404(Group, acronym=group_acronym)
-        charter_canonical_name = name
+        if name != charter_name_for_group(group):
+            raise Http404  # do not allow creation of misnamed charters
         charter_rev = "00-00"
 
-    if not can_manage_all_groups_of_type(request.user, group.type_id) or not group.features.has_chartering_process:
+    if (
+        not can_manage_all_groups_of_type(request.user, group.type_id)
+        or not group.features.has_chartering_process
+    ):
         permission_denied(request, "You don't have permission to access this view.")
 
-
-    path = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter_canonical_name, charter_rev))
-    not_uploaded_yet = charter_rev.endswith("-00") and not os.path.exists(path)
+    charter_filename = Path(settings.CHARTER_PATH) / f"{name}-{charter_rev}.txt"
+    not_uploaded_yet = charter_rev.endswith("-00") and not charter_filename.exists()
 
     if not_uploaded_yet or not charter:
         # this case is special - we recently chartered or rechartered and have no file yet
         next_rev = charter_rev
     else:
         # search history for possible collisions with abandoned efforts
-        prev_revs = list(charter.history_set.order_by('-time').values_list('rev', flat=True))
+        prev_revs = list(
+            charter.history_set.order_by("-time").values_list("rev", flat=True)
+        )
         next_rev = next_revision(charter.rev)
         while next_rev in prev_revs:
             next_rev = next_revision(next_rev)
 
-    if request.method == 'POST':
+    if request.method == "POST":
         form = UploadForm(request.POST, request.FILES)
         if form.is_valid():
             # Also save group history so we can search for it
@@ -407,9 +413,10 @@ def submit(request, name, option=None):
                     abstract=group.name,
                     rev=next_rev,
                 )
-                DocAlias.objects.create(name=charter.name).docs.add(charter)
 
-                charter.set_state(State.objects.get(used=True, type="charter", slug="notrev"))
+                charter.set_state(
+                    State.objects.get(used=True, type="charter", slug="notrev")
+                )
 
                 group.charter = charter
                 group.save()
@@ -417,56 +424,88 @@ def submit(request, name, option=None):
                 charter.rev = next_rev
 
             events = []
-            e = NewRevisionDocEvent(doc=charter, by=request.user.person, type="new_revision")
-            e.desc = "New version available: <b>%s-%s.txt</b>" % (charter.canonical_name(), charter.rev)
+            e = NewRevisionDocEvent(
+                doc=charter, by=request.user.person, type="new_revision"
+            )
+            e.desc = "New version available: <b>%s-%s.txt</b>" % (
+                charter.name,
+                charter.rev,
+            )
             e.rev = charter.rev
             e.save()
             events.append(e)
 
             # Save file on disk
-            filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev))
-            with io.open(filename, 'w', encoding='utf-8') as destination:
-                if form.cleaned_data['txt']:
-                    destination.write(form.cleaned_data['txt'])
+            charter_filename = charter_filename.with_name(
+                f"{name}-{charter.rev}.txt"
+            )  # update rev
+            with charter_filename.open("w", encoding="utf-8") as destination:
+                if form.cleaned_data["txt"]:
+                    content=form.cleaned_data["txt"]
                 else:
-                    destination.write(form.cleaned_data['content'])
+                    content=form.cleaned_data["content"]
+                destination.write(content)
+            # Also provide a copy to the legacy ftp source directory, which is served by rsync
+            # This replaces the hardlink copy that ghostlink has made in the past
+            # Still using a hardlink as long as these are on the same filesystem.
+            ftp_filename = Path(settings.FTP_DIR) / "charter" / charter_filename.name
+            try:
+                os.link(charter_filename, ftp_filename) # os.link until we are on python>=3.10
+            except IOError:
+                log(
+                    "There was an error creating a hardlink at %s pointing to %s"
+                    % (ftp_filename, charter_filename)
+                )
+            charter.store_str(charter_filename.name, content)     
 
-            if option in ['initcharter','recharter'] and charter.ad == None:
-                charter.ad = getattr(group.ad_role(),'person',None)
+
+            if option in ["initcharter", "recharter"] and charter.ad == None:
+                charter.ad = getattr(group.ad_role(), "person", None)
 
             charter.save_with_history(events)
 
             if option:
-                return redirect('ietf.doc.views_charter.change_state', name=charter.name, option=option)
+                return redirect(
+                    "ietf.doc.views_charter.change_state",
+                    name=charter.name,
+                    option=option,
+                )
             else:
                 return redirect("ietf.doc.views_doc.document_main", name=charter.name)
     else:
-        init = { "content": "" }
+        init = {"content": ""}
 
         if not_uploaded_yet and charter:
             # use text from last approved revision
             last_approved = charter.rev.split("-")[0]
-            h = charter.history_set.filter(rev=last_approved).order_by("-time", "-id").first()
+            h = (
+                charter.history_set.filter(rev=last_approved)
+                .order_by("-time", "-id")
+                .first()
+            )
             if h:
-                charter_canonical_name = h.canonical_name()
-                charter_rev = h.rev
-
-        filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter_canonical_name, charter_rev))
+                assertion("h.name == charter_name_for_group(group)")
+                charter_filename = charter_filename.with_name(
+                    f"{name}-{h.rev}.txt"
+                )  # update rev
 
         try:
-            with io.open(filename, 'r') as f:
-                init["content"] = f.read()
+            init["content"] = charter_filename.read_text()
         except IOError:
             pass
         form = UploadForm(initial=init)
         fill_in_charter_info(group)
 
-    return render(request, 'doc/charter/submit.html', {
-        'form': form,
-        'next_rev': next_rev,
-        'group': group,
-        'name': name,
-    })
+    return render(
+        request,
+        "doc/charter/submit.html",
+        {
+            "form": form,
+            "next_rev": next_rev,
+            "group": group,
+            "name": name,
+        },
+    )
 
 class ActionAnnouncementTextForm(forms.Form):
     announcement_text = forms.CharField(widget=forms.Textarea, required=True, strip=False)
@@ -483,7 +522,7 @@ def clean_announcement_text(self):
         return self.cleaned_data["announcement_text"].replace("\r", "")
 
 
-@role_required('Area Director','Secretariat')
+@role_required("Area Director", "Secretariat")
 def review_announcement_text(request, name):
     """Editing of review announcement text"""
     charter = get_object_or_404(Document, type="charter", name=name)
@@ -492,7 +531,9 @@ def review_announcement_text(request, name):
     by = request.user.person
 
     existing = charter.latest_event(WriteupDocEvent, type="changed_review_announcement")
-    existing_new_work = charter.latest_event(WriteupDocEvent, type="changed_new_work_text")
+    existing_new_work = charter.latest_event(
+        WriteupDocEvent, type="changed_new_work_text"
+    )
 
     if not existing:
         (existing, existing_new_work) = default_review_text(group, charter, by)
@@ -505,19 +546,23 @@ def review_announcement_text(request, name):
         existing_new_work.by = by
         existing_new_work.type = "changed_new_work_text"
         existing_new_work.desc = "%s review text was changed" % group.type.name
-        existing_new_work.text = derive_new_work_text(existing.text,group)
-        existing_new_work.time = datetime.datetime.now()
+        existing_new_work.text = derive_new_work_text(existing.text, group)
+        existing_new_work.time = timezone.now()
 
-    form = ReviewAnnouncementTextForm(initial=dict(announcement_text=escape(existing.text),new_work_text=escape(existing_new_work.text)))
+    form = ReviewAnnouncementTextForm(
+        initial=dict(
+            announcement_text=escape(existing.text),
+            new_work_text=escape(existing_new_work.text),
+        )
+    )
 
-    if request.method == 'POST':
+    if request.method == "POST":
         form = ReviewAnnouncementTextForm(request.POST)
         if "save_text" in request.POST and form.is_valid():
-
-            now = datetime.datetime.now()
+            now = timezone.now()
             events = []
 
-            t = form.cleaned_data['announcement_text']
+            t = form.cleaned_data["announcement_text"]
             if t != existing.text:
                 e = WriteupDocEvent(doc=charter, rev=charter.rev)
                 e.by = by
@@ -531,11 +576,11 @@ def review_announcement_text(request, name):
                 existing.save()
                 events.append(existing)
 
-            t = form.cleaned_data['new_work_text']
+            t = form.cleaned_data["new_work_text"]
             if t != existing_new_work.text:
                 e = WriteupDocEvent(doc=charter, rev=charter.rev)
                 e.by = by
-                e.type = "changed_new_work_text" 
+                e.type = "changed_new_work_text"
                 e.desc = "%s new work message text was changed" % (group.type.name)
                 e.text = t
                 e.time = now
@@ -548,33 +593,71 @@ def review_announcement_text(request, name):
                 charter.save_with_history(events)
 
             if request.GET.get("next", "") == "approve":
-                return redirect('ietf.doc.views_charter.approve', name=charter.canonical_name())
+                return redirect(
+                    "ietf.doc.views_charter.approve", name=charter.name
+                )
 
-            return redirect('ietf.doc.views_doc.document_writeup', name=charter.canonical_name())
+            return redirect(
+                "ietf.doc.views_doc.document_writeup", name=charter.name
+            )
 
         if "regenerate_text" in request.POST:
             (existing, existing_new_work) = default_review_text(group, charter, by)
             existing.save()
             existing_new_work.save()
-            form = ReviewAnnouncementTextForm(initial=dict(announcement_text=escape(existing.text),
-                                                           new_work_text=escape(existing_new_work.text)))
-
-        if any(x in request.POST for x in ['send_annc_only','send_nw_only','send_both']) and form.is_valid():
-            if any(x in request.POST for x in ['send_annc_only','send_both']):
-                parsed_msg = send_mail_preformatted(request, form.cleaned_data['announcement_text'])
-                messages.success(request, "The email To: '%s' with Subject: '%s' has been sent." % (parsed_msg["To"],parsed_msg["Subject"],))
-            if any(x in request.POST for x in ['send_nw_only','send_both']):
-                parsed_msg = send_mail_preformatted(request, form.cleaned_data['new_work_text'])
-                messages.success(request, "The email To: '%s' with Subject: '%s' has been sent." % (parsed_msg["To"],parsed_msg["Subject"],))
-            return redirect('ietf.doc.views_doc.document_writeup', name=charter.name)
-
-    return render(request, 'doc/charter/review_announcement_text.html',
-                  dict(charter=charter,
-                       back_url=urlreverse('ietf.doc.views_doc.document_writeup', kwargs=dict(name=charter.name)),
-                       announcement_text_form=form,
-                  ))
+            form = ReviewAnnouncementTextForm(
+                initial=dict(
+                    announcement_text=escape(existing.text),
+                    new_work_text=escape(existing_new_work.text),
+                )
+            )
+
+        if (
+            any(
+                x in request.POST
+                for x in ["send_annc_only", "send_nw_only", "send_both"]
+            )
+            and form.is_valid()
+        ):
+            if any(x in request.POST for x in ["send_annc_only", "send_both"]):
+                parsed_msg = send_mail_preformatted(
+                    request, form.cleaned_data["announcement_text"]
+                )
+                messages.success(
+                    request,
+                    "The email To: '%s' with Subject: '%s' has been sent."
+                    % (
+                        parsed_msg["To"],
+                        parsed_msg["Subject"],
+                    ),
+                )
+            if any(x in request.POST for x in ["send_nw_only", "send_both"]):
+                parsed_msg = send_mail_preformatted(
+                    request, form.cleaned_data["new_work_text"]
+                )
+                messages.success(
+                    request,
+                    "The email To: '%s' with Subject: '%s' has been sent."
+                    % (
+                        parsed_msg["To"],
+                        parsed_msg["Subject"],
+                    ),
+                )
+            return redirect("ietf.doc.views_doc.document_writeup", name=charter.name)
+
+    return render(
+        request,
+        "doc/charter/review_announcement_text.html",
+        dict(
+            charter=charter,
+            back_url=urlreverse(
+                "ietf.doc.views_doc.document_writeup", kwargs=dict(name=charter.name)
+            ),
+            announcement_text_form=form,
+        ),
+    )
 
-@role_required('Area Director','Secretariat')
+@role_required("Area Director", "Secretariat")
 def action_announcement_text(request, name):
     """Editing of action announcement text"""
     charter = get_object_or_404(Document, type="charter", name=name)
@@ -589,16 +672,18 @@ def action_announcement_text(request, name):
     if not existing:
         raise Http404
 
-    form = ActionAnnouncementTextForm(initial=dict(announcement_text=escape(existing.text)))
+    form = ActionAnnouncementTextForm(
+        initial=dict(announcement_text=escape(existing.text))
+    )
 
-    if request.method == 'POST':
+    if request.method == "POST":
         form = ActionAnnouncementTextForm(request.POST)
         if "save_text" in request.POST and form.is_valid():
-            t = form.cleaned_data['announcement_text']
+            t = form.cleaned_data["announcement_text"]
             if t != existing.text:
                 e = WriteupDocEvent(doc=charter, rev=charter.rev)
                 e.by = by
-                e.type = "changed_action_announcement" 
+                e.type = "changed_action_announcement"
                 e.desc = "%s action text was changed" % group.type.name
                 e.text = t
                 e.save()
@@ -606,25 +691,46 @@ def action_announcement_text(request, name):
                 existing.save()
 
             if request.GET.get("next", "") == "approve":
-                return redirect('ietf.doc.views_charter.approve', name=charter.canonical_name())
+                return redirect(
+                    "ietf.doc.views_charter.approve", name=charter.name
+                )
 
-            return redirect('ietf.doc.views_doc.document_writeup', name=charter.canonical_name())
+            return redirect(
+                "ietf.doc.views_doc.document_writeup", name=charter.name
+            )
 
         if "regenerate_text" in request.POST:
             e = default_action_text(group, charter, by)
             e.save()
-            form = ActionAnnouncementTextForm(initial=dict(announcement_text=escape(e.text)))
+            form = ActionAnnouncementTextForm(
+                initial=dict(announcement_text=escape(e.text))
+            )
 
         if "send_text" in request.POST and form.is_valid():
-            parsed_msg = send_mail_preformatted(request, form.cleaned_data['announcement_text'])
-            messages.success(request, "The email To: '%s' with Subject: '%s' has been sent." % (parsed_msg["To"],parsed_msg["Subject"],))
-            return redirect('ietf.doc.views_doc.document_writeup', name=charter.name)
-
-    return render(request, 'doc/charter/action_announcement_text.html',
-                  dict(charter=charter,
-                       back_url=urlreverse('ietf.doc.views_doc.document_writeup', kwargs=dict(name=charter.name)),
-                       announcement_text_form=form,
-                  ))
+            parsed_msg = send_mail_preformatted(
+                request, form.cleaned_data["announcement_text"]
+            )
+            messages.success(
+                request,
+                "The email To: '%s' with Subject: '%s' has been sent."
+                % (
+                    parsed_msg["To"],
+                    parsed_msg["Subject"],
+                ),
+            )
+            return redirect("ietf.doc.views_doc.document_writeup", name=charter.name)
+
+    return render(
+        request,
+        "doc/charter/action_announcement_text.html",
+        dict(
+            charter=charter,
+            back_url=urlreverse(
+                "ietf.doc.views_doc.document_writeup", kwargs=dict(name=charter.name)
+            ),
+            announcement_text_form=form,
+        ),
+    )
 
 class BallotWriteupForm(forms.Form):
     ballot_writeup = forms.CharField(widget=forms.Textarea, required=True, strip=False)
@@ -805,33 +911,37 @@ def approve(request, name):
                   dict(charter=charter,
                        announcement=escape(announcement)))
 
+
 def charter_with_milestones_txt(request, name, rev):
-    charter = get_object_or_404(Document, type="charter", docalias__name=name)
+    charter = get_object_or_404(Document, type="charter", name=name)
 
-    revision_event = charter.latest_event(NewRevisionDocEvent, type="new_revision", rev=rev)
+    revision_event = charter.latest_event(
+        NewRevisionDocEvent, type="new_revision", rev=rev
+    )
     if not revision_event:
         return HttpResponseNotFound("Revision %s not found in database" % rev)
 
     # read charter text
     c = find_history_active_at(charter, revision_event.time) or charter
-    filename = '%s-%s.txt' % (c.canonical_name(), rev)
-
-    charter_text = ""
-
+    filename = Path(settings.CHARTER_PATH) / f"{c.name}-{rev}.txt"
     try:
-        with io.open(os.path.join(settings.CHARTER_PATH, filename), 'r') as f:
-            charter_text = force_text(f.read(), errors='ignore')
+        with filename.open() as f:
+            charter_text = force_str(f.read(), errors="ignore")
     except IOError:
-        charter_text = "Error reading charter text %s" % filename
+        charter_text = f"Error reading charter text {filename.name}"
 
     milestones = historic_milestones_for_charter(charter, rev)
 
     # wrap the output nicely
-    wrapper = textwrap.TextWrapper(initial_indent="", subsequent_indent=" " * 11, width=80, break_long_words=False)
+    wrapper = textwrap.TextWrapper(
+        initial_indent="", subsequent_indent=" " * 11, width=80, break_long_words=False
+    )
     for m in milestones:
         m.desc_filled = wrapper.fill(m.desc)
 
-    return render(request, 'doc/charter/charter_with_milestones.txt',
-                  dict(charter_text=charter_text,
-                       milestones=milestones),
-                  content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
\ No newline at end of file
+    return render(
+        request,
+        "doc/charter/charter_with_milestones.txt",
+        dict(charter_text=charter_text, milestones=milestones),
+        content_type="text/plain; charset=%s" % settings.DEFAULT_CHARSET,
+    )
diff --git a/ietf/doc/views_conflict_review.py b/ietf/doc/views_conflict_review.py
index e42c138727..159f1340a4 100644
--- a/ietf/doc/views_conflict_review.py
+++ b/ietf/doc/views_conflict_review.py
@@ -1,10 +1,11 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
 import io
 import os
+from pathlib import Path
 
 from django import forms
 from django.shortcuts import render, get_object_or_404, redirect
@@ -16,7 +17,7 @@
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( BallotDocEvent, BallotPositionDocEvent, DocAlias, DocEvent,
+from ietf.doc.models import ( BallotDocEvent, BallotPositionDocEvent, DocEvent,
     Document, NewRevisionDocEvent, State )
 from ietf.doc.utils import ( add_state_change_event, close_open_ballots,
     create_ballot_if_not_open, update_telechat )
@@ -25,6 +26,7 @@
 from ietf.group.models import Role, Group
 from ietf.iesg.models import TelechatDate
 from ietf.ietfauth.utils import has_role, role_required, is_authorized_in_doc_stream
+from ietf.name.models import DocTagName
 from ietf.person.models import Person
 from ietf.utils import log
 from ietf.utils.mail import send_mail_preformatted
@@ -35,6 +37,12 @@ class ChangeStateForm(forms.Form):
     review_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev"), label="Conflict review state", empty_label=None, required=True)
     comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history.", required=False, strip=False)
 
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop("user")
+        super(ChangeStateForm, self).__init__(*args, **kwargs)
+        if not has_role(user, "Secretariat"):
+            self.fields["review_state"].queryset = self.fields["review_state"].queryset.exclude(slug__in=("appr-reqnopub-sent","appr-noprob-sent"))
+
 @role_required("Area Director", "Secretariat")
 def change_state(request, name, option=None):
     """Change state of an IESG review for IETF conflicts in other stream's documents, notifying parties as necessary
@@ -44,7 +52,7 @@ def change_state(request, name, option=None):
     login = request.user.person
 
     if request.method == 'POST':
-        form = ChangeStateForm(request.POST)
+        form = ChangeStateForm(request.POST, user=request.user)
         if form.is_valid():
             clean = form.cleaned_data
             new_state = clean['review_state']
@@ -90,12 +98,15 @@ def change_state(request, name, option=None):
                                                       review,
                                                       ok_to_publish)
 
+                if new_state.slug in ["appr-reqnopub-sent", "appr-noprob-sent", "withdraw", "dead"]:
+                    doc = review.related_that_doc("conflrev")[0]
+                    update_stream_state(doc, login, 'chair-w' if doc.stream_id=='irtf' else 'ise-rev', 'iesg-com')
 
             return redirect('ietf.doc.views_doc.document_main', name=review.name)
     else:
         s = review.get_state()
         init = dict(review_state=s.pk if s else None)
-        form = ChangeStateForm(initial=init)
+        form = ChangeStateForm(initial=init, user=request.user)
 
     return render(request, 'doc/change_state.html',
                               dict(form=form,
@@ -113,7 +124,7 @@ def send_conflict_review_ad_changed_email(request, review, event):
                                  by = request.user.person,
                                  event = event,
                                  review = review,
-                                 reviewed_doc = review.relateddocument_set.get(relationship__slug='conflrev').target.document,
+                                 reviewed_doc = review.relateddocument_set.get(relationship__slug='conflrev').target,
                                  review_url = settings.IDTRACKER_BASE_URL+review.get_absolute_url(),
                                )
                           )
@@ -128,7 +139,7 @@ def send_conflict_review_started_email(request, review):
                                  cc = addrs.cc,
                                  by = request.user.person,
                                  review = review,
-                                 reviewed_doc = review.relateddocument_set.get(relationship__slug='conflrev').target.document,
+                                 reviewed_doc = review.relateddocument_set.get(relationship__slug='conflrev').target,
                                  review_url = settings.IDTRACKER_BASE_URL+review.get_absolute_url(),
                                  )
                            )
@@ -137,7 +148,7 @@ def send_conflict_review_started_email(request, review):
 
     addrs = gather_address_lists('conflrev_requested_iana',doc=review).as_strings(compact=False)
     email_iana(request, 
-               review.relateddocument_set.get(relationship__slug='conflrev').target.document,
+               review.relateddocument_set.get(relationship__slug='conflrev').target,
                addrs.to,
                msg,
                cc=addrs.cc)
@@ -155,7 +166,7 @@ def send_conflict_eval_email(request,review):
     send_mail_preformatted(request,msg,override=override)
     addrs = gather_address_lists('ballot_issued_iana',doc=review).as_strings()
     email_iana(request, 
-               review.relateddocument_set.get(relationship__slug='conflrev').target.document,
+               review.relateddocument_set.get(relationship__slug='conflrev').target,
                addrs.to,
                msg,
                addrs.cc)
@@ -171,12 +182,23 @@ def clean_txt(self):
         return get_cleaned_text_file_content(self.cleaned_data["txt"])
 
     def save(self, review):
-        filename = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.canonical_name(), review.rev))
-        with io.open(filename, 'w', encoding='utf-8') as destination:
+        basename = f"{review.name}-{review.rev}.txt"
+        filepath = Path(settings.CONFLICT_REVIEW_PATH) / basename
+        with filepath.open('w', encoding='utf-8') as destination:
             if self.cleaned_data['txt']:
-                destination.write(self.cleaned_data['txt'])
+                content = self.cleaned_data['txt']
             else:
-                destination.write(self.cleaned_data['content'])
+                content = self.cleaned_data['content']
+            destination.write(content)
+        ftp_filepath = Path(settings.FTP_DIR) / "conflict-reviews" / basename
+        try:
+            os.link(filepath, ftp_filepath) # Path.hardlink_to is not available until 3.10
+        except IOError as e:
+            log.log(
+                "There was an error creating a hardlink at %s pointing to %s: %s"
+                % (ftp_filepath, filepath, e)
+            )
+        review.store_str(basename, content)
 
 #This is very close to submit on charter - can we get better reuse?
 @role_required('Area Director','Secretariat')
@@ -185,7 +207,7 @@ def submit(request, name):
 
     login = request.user.person
 
-    path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.canonical_name(), review.rev))
+    path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.name, review.rev))
     not_uploaded_yet = review.rev == "00" and not os.path.exists(path)
 
     if not_uploaded_yet:
@@ -202,7 +224,7 @@ def submit(request, name):
 
                 events = []
                 e = NewRevisionDocEvent(doc=review, by=login, type="new_revision")
-                e.desc = "New version available: <b>%s-%s.txt</b>" % (review.canonical_name(), review.rev)
+                e.desc = "New version available: <b>%s-%s.txt</b>" % (review.name, review.rev)
                 e.rev = review.rev
                 e.save()
                 events.append(e)
@@ -234,7 +256,7 @@ def submit(request, name):
                                                 dict(),
                                               ))
         else:
-            filename = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.canonical_name(), review.rev))
+            filename = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.name, review.rev))
             try:
                 with io.open(filename, 'r') as f:
                     init["content"] = f.read()
@@ -247,7 +269,7 @@ def submit(request, name):
                               {'form': form,
                                'next_rev': next_rev,
                                'review' : review,
-                               'conflictdoc' : review.relateddocument_set.get(relationship__slug='conflrev').target.document,
+                               'conflictdoc' : review.relateddocument_set.get(relationship__slug='conflrev').target,
                               })
 
 @role_required("Area Director", "Secretariat")
@@ -275,8 +297,8 @@ def edit_ad(request, name):
         form = AdForm(initial=init)
 
     
-    conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target.document
-    titletext = 'the conflict review of %s-%s' % (conflictdoc.canonical_name(),conflictdoc.rev)
+    conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target
+    titletext = 'the conflict review of %s-%s' % (conflictdoc.name,conflictdoc.rev)
     return render(request, 'doc/change_ad.html',
                               {'form': form,
                                'doc': review,
@@ -287,7 +309,7 @@ def edit_ad(request, name):
 def default_approval_text(review):
 
     current_text = review.text_or_error()      # pyflakes:ignore
-    conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target.document
+    conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target
     if conflictdoc.stream_id=='ise':
          receiver = 'Independent Submissions Editor'
     elif conflictdoc.stream_id=='irtf':
@@ -355,6 +377,9 @@ def approve_conflict_review(request, name):
             c.desc = "The following approval message was sent\n"+form.cleaned_data['announcement_text']
             c.save()
 
+            doc = review.related_that_doc("conflrev")[0]
+            update_stream_state(doc, login, 'chair-w' if doc.stream_id=='irtf' else 'ise-rev', 'iesg-com')
+
             return HttpResponseRedirect(review.get_absolute_url())
 
     else:
@@ -365,18 +390,30 @@ def approve_conflict_review(request, name):
     return render(request, 'doc/conflict_review/approve.html',
                               dict(
                                    review = review,
-                                   conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target.document,   
+                                   conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target,   
                                    form = form,
                                    ))
 
 class SimpleStartReviewForm(forms.Form):
-    notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
+    notify = forms.CharField(
+        widget=forms.Textarea,
+        max_length=1023,
+        label="Notice emails",
+        help_text="Separate email addresses with commas.",
+        required=False,
+    )
 
 class StartReviewForm(forms.Form):
     ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), 
                                 label="Shepherding AD", empty_label="(None)", required=True)
     create_in_state = forms.ModelChoiceField(State.objects.filter(used=True, type="conflrev", slug__in=("needshep", "adrev")), empty_label=None, required=False)
-    notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
+    notify = forms.CharField(
+        widget=forms.Textarea,
+        max_length=1023,
+        label="Notice emails",
+        help_text="Separate email addresses with commas.",
+        required=False,
+    )
     telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False, widget=forms.Select(attrs={'onchange':'make_bold()'}))
 
     def __init__(self, *args, **kwargs):
@@ -404,7 +441,7 @@ def start_review_sanity_check(request, name):
         raise Http404
 
     # sanity check that there's not already a conflict review document for this document
-    if [ rel.source for alias in doc_to_review.docalias.all() for rel in alias.relateddocument_set.filter(relationship='conflrev') ]:
+    if [ rel.source for rel in doc_to_review.targets_related.filter(relationship='conflrev') ]:
         raise Http404
 
     return doc_to_review
@@ -436,11 +473,8 @@ def build_conflict_review_document(login, doc_to_review, ad, notify, create_in_s
         group=iesg_group,
     )
     conflict_review.set_state(create_in_state)
-
-    DocAlias.objects.create( name=review_name).docs.add( conflict_review )
-
             
-    conflict_review.relateddocument_set.create(target=DocAlias.objects.get(name=doc_to_review.name),relationship_id='conflrev')
+    conflict_review.relateddocument_set.create(target=doc_to_review, relationship_id='conflrev')
 
     c = DocEvent(type="added_comment", doc=conflict_review, rev=conflict_review.rev, by=login)
     c.desc = "IETF conflict review requested"
@@ -476,6 +510,8 @@ def start_review_as_secretariat(request, name):
 
             send_conflict_review_started_email(request, conflict_review)
 
+            update_stream_state(doc_to_review, login, 'iesg-rev')
+
             return HttpResponseRedirect(conflict_review.get_absolute_url())
     else: 
         notify_addresses = build_notify_addresses(doc_to_review)
@@ -510,6 +546,8 @@ def start_review_as_stream_owner(request, name):
 
             send_conflict_review_started_email(request, conflict_review)
 
+            update_stream_state(doc_to_review, login, 'iesg-rev')
+
             return HttpResponseRedirect(conflict_review.get_absolute_url())
     else: 
         notify_addresses = build_notify_addresses(doc_to_review)
@@ -523,4 +561,23 @@ def start_review_as_stream_owner(request, name):
                               {'form':   form,
                                'doc_to_review': doc_to_review,
                               },
-                          )
\ No newline at end of file
+                          )
+
+def update_stream_state(doc, by, state, tag=None):
+    statetype = 'draft-stream-' + doc.stream_id
+    prev_state = doc.get_state(statetype)
+    new_state = State.objects.get(type_id=statetype, slug=state)
+    if tag:
+        prev_tags = set(doc.tags.all())
+        new_tags = set(DocTagName.objects.filter(pk=tag))
+
+    if new_state != prev_state:
+        doc.set_state(new_state)
+        events = []
+        if tag:
+            doc.tags.clear()
+            doc.tags.set(new_tags)
+            events.append(add_state_change_event(doc, by, prev_state, new_state, prev_tags, new_tags))
+        else:
+            events.append(add_state_change_event(doc, by, prev_state, new_state))
+        doc.save_with_history(events)
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index 7475c6b1f7..5b57a62074 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2022, All Rights Reserved
+# Copyright The IETF Trust 2009-2026, All Rights Reserved
 # -*- coding: utf-8 -*-
 #
 # Parts Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -34,79 +34,136 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-import datetime
 import glob
-import io
 import json
 import os
 import re
 
-from urllib.parse import quote
 from pathlib import Path
 
-from django.http import HttpResponse, Http404
+from celery.result import AsyncResult
+from django.core.cache import caches
+from django.core.files.base import ContentFile
+from django.core.exceptions import PermissionDenied
+from django.db.models import Max
+from django.http import FileResponse, HttpResponse, Http404, HttpResponseBadRequest, JsonResponse
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.loader import render_to_string
 from django.urls import reverse as urlreverse
 from django.conf import settings
 from django import forms
-
+from django.contrib.auth.decorators import login_required
+from django.contrib.staticfiles import finders
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( Document, DocAlias, DocHistory, DocEvent, BallotDocEvent, BallotType,
-    ConsensusDocEvent, NewRevisionDocEvent, TelechatDocEvent, WriteupDocEvent, IanaExpertDocEvent,
+from ietf.doc.models import ( Document, DocHistory, DocEvent, BallotDocEvent, BallotType,
+    ConsensusDocEvent, NewRevisionDocEvent, StoredObject, TelechatDocEvent, WriteupDocEvent, IanaExpertDocEvent,
     IESG_BALLOT_ACTIVE_STATES, STATUSCHANGE_RELATIONS, DocumentActionHolder, DocumentAuthor,
     RelatedDocument, RelatedDocHistory)
-from ietf.doc.utils import (add_links_in_new_revision_events, augment_events_with_revision,
+from ietf.doc.tasks import investigate_fragment_task
+from ietf.doc.utils import (augment_events_with_revision,
     can_adopt_draft, can_unadopt_draft, get_chartering_type, get_tags_for_stream_id,
-    needed_ballot_positions, nice_consensus, prettify_std_name, update_telechat, has_same_ballot,
+    needed_ballot_positions, nice_consensus, update_telechat, has_same_ballot,
     get_initial_notify, make_notify_changed_event, make_rev_history, default_consensus,
-    add_events_message_info, get_unicode_document_content, build_doc_meta_block,
-    augment_docs_and_user_with_user_info, irsg_needed_ballot_positions, add_action_holder_change_event,
-    build_doc_supermeta_block, build_file_urls, update_documentauthors, fuzzy_find_documents,
-    bibxml_for_draft)
+    add_events_message_info, get_unicode_document_content,
+    augment_docs_and_person_with_person_info, irsg_needed_ballot_positions, add_action_holder_change_event,
+    build_file_urls, update_documentauthors, fuzzy_find_documents,
+    bibxml_for_draft, get_doc_email_aliases)
 from ietf.doc.utils_bofreq import bofreq_editors, bofreq_responsible
 from ietf.group.models import Role, Group
 from ietf.group.utils import can_manage_all_groups_of_type, can_manage_materials, group_features_role_filter
 from ietf.ietfauth.utils import ( has_role, is_authorized_in_doc_stream, user_is_person,
-    role_required, is_individual_draft_author)
+    role_required, is_individual_draft_author, can_request_rfc_publication)
 from ietf.name.models import StreamName, BallotPositionName
 from ietf.utils.history import find_history_active_at
-from ietf.doc.forms import TelechatForm, NotifyForm, ActionHoldersForm, DocAuthorForm, DocAuthorChangeBasisForm
+from ietf.doc.views_ballot import parse_ballot_edit_return_point
+from ietf.doc.forms import InvestigateForm, TelechatForm, NotifyForm, ActionHoldersForm, DocAuthorForm, DocAuthorChangeBasisForm
 from ietf.doc.mails import email_comment, email_remind_action_holders
+from ietf.doc.utils import last_ballot_doc_revision
 from ietf.mailtrigger.utils import gather_relevant_expansions
-from ietf.meeting.models import Session
+from ietf.meeting.models import Session, SessionPresentation
 from ietf.meeting.utils import group_sessions, get_upcoming_manageable_sessions, sort_sessions, add_event_info_to_session_qs
 from ietf.review.models import ReviewAssignment
-from ietf.review.utils import can_request_review_of_doc, review_assignments_to_list_for_docs
+from ietf.review.utils import can_request_review_of_doc, review_assignments_to_list_for_docs, review_requests_to_list_for_docs
 from ietf.review.utils import no_review_from_teams_on_doc
+from ietf.doc.storage_utils import retrieve_bytes
 from ietf.utils import markup_txt, log, markdown
-from ietf.utils.draft import PlaintextDraft
+from ietf.utils.draft import get_status_from_draft_text
+from ietf.utils.meetecho import MeetechoAPIError, SlidesManager
 from ietf.utils.response import permission_denied
 from ietf.utils.text import maybe_split
-
+from ietf.utils.timezone import date_today
+from ietf.utils.unicodenormalize import normalize_for_sorting
 
 def render_document_top(request, doc, tab, name):
     tabs = []
     tabs.append(("Status", "status", urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=name)), True, None))
 
-    iesg_type_slugs = set(BallotType.objects.values_list('slug',flat=True)) 
-    iesg_type_slugs.discard('irsg-approve')
+    iesg_type_slugs = set(BallotType.objects.exclude(slug__in=("irsg-approve","rsab-approve")).values_list('slug',flat=True)) 
     iesg_ballot = doc.latest_event(BallotDocEvent, type="created_ballot", ballot_type__slug__in=iesg_type_slugs)
     irsg_ballot = doc.latest_event(BallotDocEvent, type="created_ballot", ballot_type__slug='irsg-approve')
+    rsab_ballot = doc.latest_event(BallotDocEvent, type="created_ballot", ballot_type__slug='rsab-approve')
 
-    if doc.type_id == "draft" and doc.get_state("draft-stream-irtf"):
-        tabs.append(("IRSG Evaluation Record", "irsgballot", urlreverse("ietf.doc.views_doc.document_irsg_ballot", kwargs=dict(name=name)), irsg_ballot,  None if irsg_ballot else "IRSG Evaluation Ballot has not been created yet"))
-    if doc.type_id in ("draft","conflrev", "statchg"):
-        tabs.append(("IESG Evaluation Record", "ballot", urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=name)), iesg_ballot,  None if iesg_ballot else "IESG Evaluation Ballot has not been created yet"))
-    elif doc.type_id == "charter" and doc.group.type_id == "wg":
-        tabs.append(("IESG Review", "ballot", urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=name)), iesg_ballot, None if iesg_ballot else "IESG Review Ballot has not been created yet"))
-    
-    if doc.type_id == "draft" or (doc.type_id == "charter" and doc.group.type_id == "wg"):
-        tabs.append(("IESG Writeups", "writeup", urlreverse('ietf.doc.views_doc.document_writeup', kwargs=dict(name=name)), True, None))
-
-    tabs.append(("Email expansions","email",urlreverse('ietf.doc.views_doc.document_email', kwargs=dict(name=name)), True, None))
+    if doc.type_id == "draft":
+        if doc.get_state("draft-stream-irtf"):
+            tabs.append((
+                "IRSG Evaluation Record", 
+                "irsgballot", 
+                urlreverse("ietf.doc.views_doc.document_irsg_ballot", kwargs=dict(name=name)), 
+                irsg_ballot,  
+                None if irsg_ballot else "IRSG Evaluation Ballot has not been created yet"
+            ))
+        if  doc.get_state("draft-stream-editorial"):
+            tabs.append((
+                "RSAB Evaluation Record", 
+                "rsabballot", 
+                urlreverse("ietf.doc.views_doc.document_rsab_ballot", kwargs=dict(name=name)), 
+                rsab_ballot,  
+                None if rsab_ballot else "RSAB Evaluation Ballot has not been created yet"
+            ))
+
+    if iesg_ballot or (doc.group and doc.group.type_id == "wg"):
+        if doc.type_id in ("draft", "conflrev", "statchg"):
+            tabs.append(
+                (
+                    "IESG Evaluation Record",
+                    "ballot",
+                    urlreverse(
+                        "ietf.doc.views_doc.document_ballot", kwargs=dict(name=name)
+                    ),
+                    iesg_ballot,
+                    None,
+                )
+            )
+        elif doc.type_id == "charter" and doc.group and doc.group.type_id == "wg":
+            tabs.append(
+                (
+                    "IESG Review",
+                    "ballot",
+                    urlreverse(
+                        "ietf.doc.views_doc.document_ballot", kwargs=dict(name=name)
+                    ),
+                    iesg_ballot,
+                    None,
+                )
+            )
+        if doc.type_id == "draft" or (
+            doc.type_id == "charter" and doc.group and doc.group.type_id == "wg"
+        ):
+            tabs.append(
+                (
+                    "IESG Writeups",
+                    "writeup",
+                    urlreverse(
+                        "ietf.doc.views_doc.document_writeup", kwargs=dict(name=name)
+                    ),
+                    True,
+                    None,
+                )
+            )
+    if not doc.type_id in ["bcp", "std", "fyi"]:
+        tabs.append(("Email expansions","email",urlreverse('ietf.doc.views_doc.document_email', kwargs=dict(name=name)), True, None))
     tabs.append(("History", "history", urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=name)), True, None))
 
     if name.startswith("rfc"):
@@ -114,7 +171,7 @@ def render_document_top(request, doc, tab, name):
     else:
         name += "-" + doc.rev
 
-    return render_to_string("doc/document_top.html",
+    return render_to_string("doc/document_top.html" if not doc.type_id in ["bcp", "std", "fyi"] else "doc/document_subseries_top.html",
                             dict(doc=doc,
                                  tabs=tabs,
                                  selected=tab,
@@ -131,45 +188,45 @@ def interesting_doc_relations(doc):
     else:
         raise TypeError("Expected this method to be called with a Document or DocHistory object")
 
-    that_relationships = STATUSCHANGE_RELATIONS + ('conflrev', 'replaces', 'possibly_replaces', 'updates', 'obs') 
+    that_relationships = STATUSCHANGE_RELATIONS + ('conflrev', 'replaces', 'possibly_replaces', 'updates', 'obs', 'became_rfc') 
 
-    that_doc_relationships = ('replaces', 'possibly_replaces', 'updates', 'obs')
+    that_doc_relationships = ('replaces', 'possibly_replaces', 'updates', 'obs', 'became_rfc')
 
-    interesting_relations_that = cls.objects.filter(target__docs=target, relationship__in=that_relationships).select_related('source')
-    interesting_relations_that_doc = cls.objects.filter(source=doc, relationship__in=that_doc_relationships).prefetch_related('target__docs')
+    interesting_relations_that = cls.objects.filter(target=target, relationship__in=that_relationships).select_related('source')
+    interesting_relations_that_doc = cls.objects.filter(source=doc, relationship__in=that_doc_relationships).prefetch_related('target')
 
     return interesting_relations_that, interesting_relations_that_doc
 
-def document_main(request, name, rev=None):
-    doc = get_object_or_404(Document.objects.select_related(), docalias__name=name)
+def document_main(request, name, rev=None, document_html=False):
+
+    doc = get_object_or_404(Document.objects.select_related(), name=name)
+
+    if doc.type_id == "rfc" and rev is not None:
+        raise Http404()
+
+    log.assertion('doc.type_id!="rfc" or doc.name.startswith("rfc")')
 
     # take care of possible redirections
-    aliases = DocAlias.objects.filter(docs=doc).values_list("name", flat=True)
-    if rev==None and doc.type_id == "draft" and not name.startswith("rfc"):
-        for a in aliases:
-            if a.startswith("rfc"):
-                return redirect("ietf.doc.views_doc.document_main", name=a)
-    
-    revisions = []
-    for h in doc.history_set.order_by("time", "id"):
-        if h.rev and not h.rev in revisions:
-            revisions.append(h.rev)
-    if not doc.rev in revisions:
-        revisions.append(doc.rev)
+    if document_html is False and rev is None:
+        became_rfc = doc.became_rfc()
+        if became_rfc:
+            return redirect("ietf.doc.views_doc.document_main", name=became_rfc.name)
+
+    revisions = doc.revisions_by_dochistory()
     latest_rev = doc.rev
 
     snapshot = False
 
     gh = None
-    if rev != None:
-        # find the entry in the history
+    if rev and rev != doc.rev:
+        # find the entry in the history if the rev requested is not the current rev
         for h in doc.history_set.order_by("-time"):
             if rev == h.rev:
                 snapshot = True
                 doc = h
                 break
 
-        if not snapshot:
+        if not snapshot and document_html is False:
             return redirect('ietf.doc.views_doc.document_main', name=name)
 
         if doc.type_id == "charter":
@@ -184,14 +241,140 @@ def document_main(request, name, rev=None):
 
     top = render_document_top(request, doc, "status", name)
 
-
     telechat = doc.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
-    if telechat and (not telechat.telechat_date or telechat.telechat_date < datetime.date.today()):
+    if telechat and (not telechat.telechat_date or telechat.telechat_date < date_today(settings.TIME_ZONE)):
        telechat = None
 
-
     # specific document types
-    if doc.type_id == "draft":
+    if doc.type_id == "rfc":
+        split_content = request.COOKIES.get("full_draft", settings.USER_PREFERENCE_DEFAULTS["full_draft"]) == "off"
+        if request.GET.get('include_text') == "0":
+            split_content = True
+        elif request.GET.get('include_text') == "1":
+            split_content = False
+        else:
+            pass
+
+        interesting_relations_that, interesting_relations_that_doc = interesting_doc_relations(doc)
+
+        can_edit = has_role(request.user, ("Area Director", "Secretariat"))
+        can_edit_authors = has_role(request.user, ("Secretariat"))
+
+        stream_slugs = StreamName.objects.values_list("slug", flat=True)
+        # For some reason, AnonymousUser has __iter__, but is not iterable,
+        # which causes problems in the filter() below.  Work around this:  
+        if request.user.is_authenticated:
+            roles = Role.objects.filter(group__acronym__in=stream_slugs, person__user=request.user)
+            roles = group_features_role_filter(roles, request.user.person, 'docman_roles')
+        else:
+            roles = []
+
+        can_change_stream = bool(can_edit or roles)
+
+        file_urls, found_types = build_file_urls(doc)
+        if not request.user.is_authenticated:
+            file_urls = [fu for fu in file_urls if fu[0] != "pdfized"]
+        content = doc.text_or_error() # pyflakes:ignore
+        content = markup_txt.markup(maybe_split(content, split=split_content))
+
+        if not found_types:
+            content = "This RFC is not currently available online."
+            split_content = False
+        elif "txt" not in found_types:
+            content = "This RFC is not available in plain text format."
+            split_content = False
+
+        # status changes
+        status_changes = []
+        proposed_status_changes = []
+        for r in interesting_relations_that.filter(relationship__in=STATUSCHANGE_RELATIONS):
+            state_slug = r.source.get_state_slug()
+            if state_slug in ('appr-sent', 'appr-pend'):
+                status_changes.append(r)
+            elif state_slug in ('needshep','adrev','iesgeval','defer','appr-pr'):
+                proposed_status_changes.append(r)
+            else:
+                pass
+
+        presentations = doc.future_presentations()
+
+        if request.user.is_authenticated and hasattr(request.user, "person"):
+            augment_docs_and_person_with_person_info([doc], request.user.person)
+
+        exp_comment = doc.latest_event(IanaExpertDocEvent,type="comment")
+        iana_experts_comment = exp_comment and exp_comment.desc
+
+        html = None
+        js = None
+        css = None
+        diff_revisions = None
+        simple_diff_revisions = None
+        if document_html:
+            diff_revisions=get_diff_revisions(request, name, doc)
+            simple_diff_revisions = [t[1] for t in diff_revisions if t[0] == doc.name]
+            simple_diff_revisions.reverse()
+            html = doc.html_body()
+            if request.COOKIES.get("pagedeps") == "inline":
+                js = Path(finders.find("ietf/js/document_html.js")).read_text()
+                css = Path(finders.find("ietf/css/document_html_inline.css")).read_text()
+                if html:
+                    css += Path(finders.find("ietf/css/document_html_txt.css")).read_text()
+
+        # submission
+        submission = ""
+        if group is None:
+            submission = "unknown"
+        elif group.type_id == "individ":
+            submission = "individual"
+        elif group.type_id == "area" and doc.stream_id == "ietf":
+            submission = "individual in %s area" % group.acronym
+        else:
+            if group.features.acts_like_wg and not group.type_id == "edwg":
+                submission = "%s %s" % (group.acronym, group.type)
+            else:
+                submission = group.acronym
+            submission = '<a href="%s">%s</a>' % (group.about_url(), submission)
+
+        draft = doc.came_from_draft()
+        mailto_name = draft.name if draft else None
+
+        return render(request, "doc/document_rfc.html" if document_html is False else "doc/document_html.html",
+                                  dict(doc=doc,
+                                       document_html=document_html,
+                                       css=css,
+                                       js=js,
+                                       html=html,
+                                       group=group,
+                                       top=top,
+                                       name=doc.name,
+                                       content=content,
+                                       split_content=split_content,
+                                       revisions=simple_diff_revisions if document_html else revisions,
+                                       latest_rev=latest_rev,
+                                       can_edit=can_edit,
+                                       can_edit_authors=can_edit_authors,
+                                       can_change_stream=can_change_stream,
+                                       rfc_number=doc.rfc_number,
+                                       updates=interesting_relations_that_doc.filter(relationship="updates"),
+                                       updated_by=interesting_relations_that.filter(relationship="updates"),
+                                       obsoletes=interesting_relations_that_doc.filter(relationship="obs"),
+                                       obsoleted_by=interesting_relations_that.filter(relationship="obs"),
+                                       status_changes=status_changes,
+                                       proposed_status_changes=proposed_status_changes,
+                                       has_errata=doc.pk and doc.tags.filter(slug="errata"), # doc.pk == None if using a fake_history_obj
+                                       file_urls=file_urls,
+                                       rfc_editor_state=doc.get_state("draft-rfceditor"),
+                                       iana_review_state=doc.get_state("draft-iana-review"),
+                                       iana_action_state=doc.get_state("draft-iana-action"),
+                                       iana_experts_state=doc.get_state("draft-iana-experts"),
+                                       iana_experts_comment=iana_experts_comment,
+                                       presentations=presentations,
+                                       diff_revisions=diff_revisions,
+                                       submission=submission,
+                                       mailto_name=mailto_name,
+                                       ))
+
+    elif doc.type_id == "draft":
         split_content = request.COOKIES.get("full_draft", settings.USER_PREFERENCE_DEFAULTS["full_draft"]) == "off"
         if request.GET.get('include_text') == "0":
             split_content = True
@@ -226,56 +409,30 @@ def document_main(request, name, rev=None):
 
         can_edit_replaces = has_role(request.user, ("Area Director", "Secretariat", "IRTF Chair", "WG Chair", "RG Chair", "WG Secretary", "RG Secretary"))
 
+        can_edit_action_holders = can_edit or (
+            request.user.is_authenticated and group.has_role(request.user, group.features.docman_roles)
+        )
+
         is_author = request.user.is_authenticated and doc.documentauthor_set.filter(person__user=request.user).exists()
         can_view_possibly_replaces = can_edit_replaces or is_author
 
-        rfc_number = name[3:] if name.startswith("") else None
-        draft_name = None
-        for a in aliases:
-            if a.startswith("draft"):
-                draft_name = a
-
-        rfc_aliases = [prettify_std_name(a) for a in aliases
-                       if a.startswith("fyi") or a.startswith("std") or a.startswith("bcp")]
-
         latest_revision = None
 
-        # Workaround to allow displaying last rev of draft that became rfc as a draft
-        # This should be unwound when RFCs become their own documents.
-        if snapshot:
-            doc.name = doc.doc.name
-            name = doc.doc.name
-        else:
-            name = doc.name
-
         file_urls, found_types = build_file_urls(doc)
-        if not snapshot and doc.get_state_slug() == "rfc":
-            # content
-            content = doc.text_or_error() # pyflakes:ignore
-            content = markup_txt.markup(maybe_split(content, split=split_content))
-
+        if not request.user.is_authenticated:
+            file_urls = [fu for fu in file_urls if fu[0] != "pdfized"]
         content = doc.text_or_error() # pyflakes:ignore
         content = markup_txt.markup(maybe_split(content, split=split_content))
 
-        if not snapshot and doc.get_state_slug() == "rfc":
-            if not found_types:
-                content = "This RFC is not currently available online."
-                split_content = False
-            elif "txt" not in found_types:
-                content = "This RFC is not available in plain text format."
-                split_content = False
-        else:
-            latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
+        latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
 
         # ballot
         iesg_ballot_summary = None
-        irsg_ballot_summary = None
         due_date = None
         if (iesg_state_slug in IESG_BALLOT_ACTIVE_STATES) or irsg_state:
             active_ballot = doc.active_ballot()
             if active_ballot:
                 if irsg_state:
-                    irsg_ballot_summary = irsg_needed_ballot_positions(doc, list(active_ballot.active_balloter_positions().values()))
                     due_date=active_ballot.irsgballotdocevent.duedate
                 else:
                     iesg_ballot_summary = needed_ballot_positions(doc, list(active_ballot.active_balloter_positions().values()))
@@ -289,7 +446,7 @@ def document_main(request, name, rev=None):
         elif group.type_id == "area" and doc.stream_id == "ietf":
             submission = "individual in %s area" % group.acronym
         else:
-            if group.features.acts_like_wg:
+            if group.features.acts_like_wg and not group.type_id=="edwg":
                 submission = "%s %s" % (group.acronym, group.type)
             else:
                 submission = group.acronym
@@ -340,13 +497,6 @@ def document_main(request, name, rev=None):
             can_submit_unsolicited_review_for_teams = Group.objects.filter(
                 reviewteamsettings__isnull=False, role__person__user=request.user, role__name='secr')
 
-        # mailing list search archive
-        search_archive = "www.ietf.org/mail-archive/web/"
-        if doc.stream_id == "ietf" and group.type_id == "wg" and group.list_archive:
-            search_archive = group.list_archive
-
-        search_archive = quote(search_archive, safe="~")
-
         # conflict reviews
         conflict_reviews = [r.source.name for r in interesting_relations_that.filter(relationship="conflrev")]
 
@@ -367,13 +517,17 @@ def document_main(request, name, rev=None):
         # remaining actions
         actions = []
 
-        if can_adopt_draft(request.user, doc) and not doc.get_state_slug() in ["rfc"] and not snapshot:
+        if can_adopt_draft(request.user, doc) and doc.get_state_slug() not in ["rfc"] and not snapshot:
+            target = urlreverse("ietf.doc.views_draft.adopt_draft", kwargs=dict(name=doc.name))
             if doc.group and doc.group.acronym != 'none': # individual submission
                 # already adopted in one group
                 button_text = "Switch adoption"
             else:
                 button_text = "Manage adoption"
-            actions.append((button_text, urlreverse('ietf.doc.views_draft.adopt_draft', kwargs=dict(name=doc.name))))
+                # can_adopt_draft currently returns False for Area Directors
+                if has_role(request.user, ["Secretariat", "WG Chair"]):
+                    target = urlreverse("ietf.doc.views_draft.ask_about_ietf_adoption_call", kwargs=dict(name=doc.name))
+            actions.append((button_text, target))
 
         if can_unadopt_draft(request.user, doc) and not doc.get_state_slug() in ["rfc"] and not snapshot:
             if doc.get_state_slug('draft-iesg') == 'idexists':
@@ -390,42 +544,69 @@ def document_main(request, name, rev=None):
         if doc.get_state_slug() == "expired" and has_role(request.user, ("Secretariat",)) and not snapshot:
             actions.append(("Resurrect", urlreverse('ietf.doc.views_draft.resurrect', kwargs=dict(name=doc.name))))
         
-        if (doc.get_state_slug() not in ["rfc", "expired"] and doc.stream_id in ("irtf",) and not snapshot and not doc.ballot_open('irsg-approve') and can_edit_stream_info):
-            label = "Issue IRSG Ballot"
-            actions.append((label, urlreverse('ietf.doc.views_ballot.issue_irsg_ballot', kwargs=dict(name=doc.name))))
-        if (doc.get_state_slug() not in ["rfc", "expired"] and doc.stream_id in ("irtf",) and not snapshot and doc.ballot_open('irsg-approve') and can_edit_stream_info):
-            label = "Close IRSG Ballot"
-            actions.append((label, urlreverse('ietf.doc.views_ballot.close_irsg_ballot', kwargs=dict(name=doc.name))))
-
-        if (doc.get_state_slug() not in ["rfc", "expired"] and doc.stream_id in ("ise", "irtf")
-            and can_edit_stream_info and not conflict_reviews and not snapshot):
-            label = "Begin IETF Conflict Review"
-            if not doc.intended_std_level:
-                label += " (note that intended status is not set)"
-            actions.append((label, urlreverse('ietf.doc.views_conflict_review.start_review', kwargs=dict(name=doc.name))))
-
-        if (doc.get_state_slug() not in ["rfc", "expired"] and doc.stream_id in ("iab", "ise", "irtf")
-            and can_edit_stream_info and not snapshot):
-            if doc.get_state_slug('draft-stream-%s' % doc.stream_id) not in ('rfc-edit', 'pub', 'dead'):
-                label = "Request Publication"
+        if doc.get_state_slug() not in ["rfc", "expired"] and not snapshot:
+            if doc.stream_id == "irtf" and has_role(request.user, ("Secretariat", "IRTF Chair")):
+                if not doc.ballot_open('irsg-approve'):
+                    actions.append((
+                        "Issue IRSG Ballot",
+                        urlreverse('ietf.doc.views_ballot.issue_irsg_ballot', kwargs=dict(name=doc.name))
+                    ))
+                else:
+                    actions.append((
+                        "Close IRSG Ballot",
+                        urlreverse('ietf.doc.views_ballot.close_irsg_ballot', kwargs=dict(name=doc.name))
+                    ))
+            elif doc.stream_id == "editorial" and has_role(request.user, ("Secretariat", "RSAB Chair")): 
+                if not doc.ballot_open('rsab-approve'):
+                    actions.append((
+                        "Issue RSAB Ballot",
+                        urlreverse('ietf.doc.views_ballot.issue_rsab_ballot', kwargs=dict(name=doc.name))
+                        ))
+                else:
+                    actions.append((
+                        "Close RSAB Ballot",
+                        urlreverse('ietf.doc.views_ballot.close_rsab_ballot', kwargs=dict(name=doc.name))
+                    ))
+
+        if (
+            doc.get_state_slug() not in ["rfc", "expired"]
+            and not conflict_reviews
+            and not snapshot
+        ):
+            if (
+                doc.stream_id == "ise" and has_role(request.user, ("Secretariat", "ISE"))
+            ) or (
+                doc.stream_id == "irtf" and has_role(request.user, ("Secretariat", "IRTF Chair"))
+            ):
+                label = "Begin IETF conflict review" # Note that the template feeds this through capfirst_allcaps
                 if not doc.intended_std_level:
                     label += " (note that intended status is not set)"
-                if iesg_state and iesg_state_slug not in ('idexists','dead'):
-                    label += " (Warning: the IESG state indicates ongoing IESG processing)"
-                actions.append((label, urlreverse('ietf.doc.views_draft.request_publication', kwargs=dict(name=doc.name))))
+                actions.append((label, urlreverse('ietf.doc.views_conflict_review.start_review', kwargs=dict(name=doc.name))))
+
+        if doc.get_state_slug() not in ["rfc", "expired"] and not snapshot:
+            if can_request_rfc_publication(request.user, doc):
+                if doc.get_state_slug('draft-stream-%s' % doc.stream_id) not in ('rfc-edit', 'pub', 'dead'):
+                    label = "Request Publication"
+                    if not doc.intended_std_level:
+                        label += " (note that intended status is not set)"
+                    if iesg_state and iesg_state_slug not in ('idexists','dead'):
+                        label += " (Warning: the IESG state indicates ongoing IESG processing)"
+                    actions.append((label, urlreverse('ietf.doc.views_draft.request_publication', kwargs=dict(name=doc.name))))
 
         if doc.get_state_slug() not in ["rfc", "expired"] and doc.stream_id in ("ietf",) and not snapshot:
             if iesg_state_slug == 'idexists' and can_edit:
                 actions.append(("Begin IESG Processing", urlreverse('ietf.doc.views_draft.edit_info', kwargs=dict(name=doc.name)) + "?new=1"))
-            elif can_edit_stream_info and (iesg_state_slug in ('idexists','watching')):
+            elif can_edit_stream_info and (iesg_state_slug == 'idexists'):
                 actions.append(("Submit to IESG for Publication", urlreverse('ietf.doc.views_draft.to_iesg', kwargs=dict(name=doc.name))))
 
-        augment_docs_and_user_with_user_info([doc], request.user)
+        if request.user.is_authenticated and hasattr(request.user, "person"):
+            augment_docs_and_person_with_person_info([doc], request.user.person)
 
-        published = doc.latest_event(type="published_rfc")
+        published = doc.latest_event(type="published_rfc")  # todo rethink this now that published_rfc is on rfc
         started_iesg_process = doc.latest_event(type="started_iesg_process")
 
         review_assignments = review_assignments_to_list_for_docs([doc]).get(doc.name, [])
+        review_requests = review_requests_to_list_for_docs([doc]).get(doc.name, [])
         no_review_from_teams = no_review_from_teams_on_doc(doc, rev or doc.rev)
 
         exp_comment = doc.latest_event(IanaExpertDocEvent,type="comment")
@@ -440,22 +621,46 @@ def document_main(request, name, rev=None):
         # Do not show the Auth48 URL in the "Additional URLs" section
         additional_urls = doc.documenturl_set.exclude(tag_id='auth48')
 
-        # Stream description passing test
-        if doc.stream != None:
-            stream_desc = doc.stream.desc
-        else:
-            stream_desc = "(None)"
-
-        return render(request, "doc/document_draft.html",
+        # Stream description and name passing test
+        stream = ("draft-stream-" + doc.stream.slug) if doc.stream != None else "(None)"
+
+        html = None
+        js = None
+        css = None
+        diff_revisions = None
+        simple_diff_revisions = None
+        if document_html:
+            diff_revisions=get_diff_revisions(request, name, doc if isinstance(doc,Document) else doc.doc)
+            simple_diff_revisions = [t[1] for t in diff_revisions if t[0] == doc.name]
+            simple_diff_revisions.reverse()
+            if rev and rev != doc.rev: 
+                # No DocHistory was found matching rev - snapshot will be false
+                # and doc will be a Document object, not a DocHistory
+                snapshot = True
+                doc = doc.fake_history_obj(rev)
+            else:
+                html = doc.html_body()
+                if request.COOKIES.get("pagedeps") == "inline":
+                    js = Path(finders.find("ietf/js/document_html.js")).read_text()
+                    js += Path(finders.find("ietf/js/theme.js")).read_text()
+                    css = Path(finders.find("ietf/css/document_html_inline.css")).read_text()
+                    if html:
+                        css += Path(finders.find("ietf/css/document_html_txt.css")).read_text()
+
+        return render(request, "doc/document_draft.html" if document_html is False else "doc/document_html.html",
                                   dict(doc=doc,
+                                       document_html=document_html,
+                                       css=css,
+                                       js=js,
+                                       html=html,
                                        group=group,
                                        top=top,
-                                       name=name,
+                                       name=doc.name,
                                        content=content,
                                        split_content=split_content,
-                                       revisions=revisions,
+                                       revisions=simple_diff_revisions if document_html else revisions,
                                        snapshot=snapshot,
-                                       stream_desc=stream_desc,
+                                       stream=stream,
                                        latest_revision=latest_revision,
                                        latest_rev=latest_rev,
                                        can_edit=can_edit,
@@ -469,16 +674,13 @@ def document_main(request, name, rev=None):
                                        can_edit_iana_state=can_edit_iana_state,
                                        can_edit_consensus=can_edit_consensus,
                                        can_edit_replaces=can_edit_replaces,
+                                       can_edit_action_holders=can_edit_action_holders,
                                        can_view_possibly_replaces=can_view_possibly_replaces,
                                        can_request_review=can_request_review,
                                        can_submit_unsolicited_review_for_teams=can_submit_unsolicited_review_for_teams,
 
-                                       rfc_number=rfc_number,
-                                       draft_name=draft_name,
                                        telechat=telechat,
                                        iesg_ballot_summary=iesg_ballot_summary,
-                                       # PEY: Currently not using irsg_ballot_summary in the template, but it should be.  That will take a new box for IRSG data.
-                                       irsg_ballot_summary=irsg_ballot_summary,
                                        submission=submission,
                                        resurrected_by=resurrected_by,
 
@@ -493,8 +695,7 @@ def document_main(request, name, rev=None):
                                        conflict_reviews=conflict_reviews,
                                        status_changes=status_changes,
                                        proposed_status_changes=proposed_status_changes,
-                                       rfc_aliases=rfc_aliases,
-                                       has_errata=doc.tags.filter(slug="errata"),
+                                       has_errata=doc.pk and doc.tags.filter(slug="errata"), # doc.pk == None if using a fake_history_obj
                                        published=published,
                                        file_urls=file_urls,
                                        additional_urls=additional_urls,
@@ -513,17 +714,18 @@ def document_main(request, name, rev=None):
                                        iana_experts_comment=iana_experts_comment,
                                        started_iesg_process=started_iesg_process,
                                        shepherd_writeup=shepherd_writeup,
-                                       search_archive=search_archive,
                                        actions=actions,
                                        presentations=presentations,
                                        review_assignments=review_assignments,
+                                       review_requests=review_requests,
                                        no_review_from_teams=no_review_from_teams,
                                        due_date=due_date,
+                                       diff_revisions=diff_revisions
                                        ))
 
-    if doc.type_id == "charter":
+    elif doc.type_id == "charter":
         content = doc.text_or_error()     # pyflakes:ignore
-        content = markup_txt.markup(content)
+        content = markdown.markdown(content)
 
         ballot_summary = None
         if doc.get_state_slug() in ("intrev", "iesgrev"):
@@ -558,7 +760,7 @@ def document_main(request, name, rev=None):
                                        can_manage=can_manage,
                                        ))
 
-    if doc.type_id == "bofreq":
+    elif doc.type_id == "bofreq":
         content = markdown.markdown(doc.text_or_error())
         editors = bofreq_editors(doc)
         responsible = bofreq_responsible(doc)
@@ -578,8 +780,8 @@ def document_main(request, name, rev=None):
                                        editor_can_manage=editor_can_manage,
                                        ))
 
-    if doc.type_id == "conflrev":
-        filename = "%s-%s.txt" % (doc.canonical_name(), doc.rev)
+    elif doc.type_id == "conflrev":
+        filename = "%s-%s.txt" % (doc.name, doc.rev)
         pathname = os.path.join(settings.CONFLICT_REVIEW_PATH,filename)
 
         if doc.rev == "00" and not os.path.isfile(pathname):
@@ -593,7 +795,7 @@ def document_main(request, name, rev=None):
         if doc.get_state_slug() in ("iesgeval", ) and doc.active_ballot():
             ballot_summary = needed_ballot_positions(doc, list(doc.active_ballot().active_balloter_positions().values()))
 
-        conflictdoc = doc.related_that_doc('conflrev')[0].document
+        conflictdoc = doc.related_that_doc('conflrev')[0]
 
         return render(request, "doc/document_conflict_review.html",
                                   dict(doc=doc,
@@ -608,8 +810,8 @@ def document_main(request, name, rev=None):
                                        approved_states=('appr-reqnopub-pend','appr-reqnopub-sent','appr-noprob-pend','appr-noprob-sent'),
                                        ))
 
-    if doc.type_id == "statchg":
-        filename = "%s-%s.txt" % (doc.canonical_name(), doc.rev)
+    elif doc.type_id == "statchg":
+        filename = "%s-%s.txt" % (doc.name, doc.rev)
         pathname = os.path.join(settings.STATUS_CHANGE_PATH,filename)
 
         if doc.rev == "00" and not os.path.isfile(pathname):
@@ -642,14 +844,14 @@ def document_main(request, name, rev=None):
                                        sorted_relations=sorted_relations,
                                        ))
 
-    if doc.type_id in ("slides", "agenda", "minutes", "bluesheets", "procmaterials",):
+    elif doc.type_id in ("slides", "agenda", "minutes", "narrativeminutes", "bluesheets", "procmaterials",):
         can_manage_material = can_manage_materials(request.user, doc.group)
         presentations = doc.future_presentations()
         if doc.uploaded_filename:
             # we need to remove the extension for the globbing below to work
             basename = os.path.splitext(doc.uploaded_filename)[0]
         else:
-            basename = "%s-%s" % (doc.canonical_name(), doc.rev)
+            basename = "%s-%s" % (doc.name, doc.rev)
 
         pathname = os.path.join(doc.get_file_path(), basename)
 
@@ -683,6 +885,13 @@ def document_main(request, name, rev=None):
                     and doc.group.features.has_nonsession_materials
                     and doc.type_id in doc.group.features.material_types
             )
+
+        session_statusid = None
+        actual_doc = doc if isinstance(doc,Document) else doc.doc
+        if actual_doc.session_set.count() == 1:
+            if actual_doc.session_set.get().schedulingevent_set.exists():
+                session_statusid = actual_doc.session_set.get().schedulingevent_set.order_by("-time").first().status_id
+
         return render(request, "doc/document_material.html",
                                   dict(doc=doc,
                                        top=top,
@@ -695,10 +904,11 @@ def document_main(request, name, rev=None):
                                        can_upload = can_upload,
                                        other_types=other_types,
                                        presentations=presentations,
+                                       session_statusid=session_statusid,
                                        ))
 
 
-    if doc.type_id == "review":
+    elif doc.type_id == "review":
         basename = "{}.txt".format(doc.name)
         pathname = os.path.join(doc.get_file_path(), basename)
         content = get_unicode_document_content(basename, pathname)
@@ -724,11 +934,11 @@ def document_main(request, name, rev=None):
                            assignments=assignments,
                       ))
 
-    if doc.type_id in ("chatlog", "polls"):
+    elif doc.type_id in ("chatlog", "polls"):
         if isinstance(doc,DocHistory):
-            session = doc.doc.sessionpresentation_set.last().session
+            session = doc.doc.presentations.last().session
         else:
-            session = doc.sessionpresentation_set.last().session
+            session = doc.presentations.last().session
         pathname = Path(session.meeting.get_materials_path()) / doc.type_id / doc.uploaded_filename
         content = get_unicode_document_content(doc.name, str(pathname))
         return render(
@@ -745,6 +955,41 @@ def document_main(request, name, rev=None):
             )
         )
 
+    elif doc.type_id == "statement":
+        if doc.uploaded_filename:
+            basename = doc.uploaded_filename.split(".")[0] # strip extension
+        else:
+            basename = f"{doc.name}-{doc.rev}"
+        variants = set([match.name.split(".")[1] for match in Path(doc.get_file_path()).glob(f"{basename}.*")])
+        inlineable = any([ext in variants for ext in ["md", "txt"]])
+        if inlineable:
+            content = markdown.liberal_markdown(doc.text_or_error())
+        else:
+            content = "No format available to display inline"
+            if "pdf" in variants:
+                pdf_url = urlreverse(
+                    "ietf.doc.views_statement.serve_pdf",
+                    kwargs=dict(name=doc.name, rev=doc.rev),
+                )
+                content += f" - Download [pdf]({pdf_url})"
+            content = markdown.markdown(content)
+        can_manage = has_role(request.user,["Secretariat"]) # Add IAB or IESG as appropriate
+        interesting_relations_that, interesting_relations_that_doc = interesting_doc_relations(doc)
+        published = doc.latest_event(type="published_statement").time
+        return render(request, "doc/document_statement.html",
+                                  dict(doc=doc,
+                                       top=top,
+                                       revisions=revisions,
+                                       latest_rev=latest_rev,
+                                       published=published,
+                                       content=content,
+                                       snapshot=snapshot,
+                                       replaces=interesting_relations_that_doc.filter(relationship="replaces"),
+                                       replaced_by=interesting_relations_that.filter(relationship="replaces"),
+                                       can_manage=can_manage,
+                                       ))
+    elif doc.type_id in ["bcp", "std", "fyi"]:
+        return render(request, "doc/document_subseries.html", {"doc": doc, "top": top})
 
 
     raise Http404("Document not found: %s" % (name + ("-%s"%rev if rev else "")))
@@ -775,7 +1020,7 @@ def document_raw_id(request, name, rev=None, ext=None):
     for t in possible_types:
         if os.path.exists(base_path + t):
             found_types[t]=base_path+t
-    if ext == None:
+    if ext is None:
         ext = 'txt'
     if not ext in found_types:
         raise Http404('dont have the file for that extension')
@@ -787,8 +1032,8 @@ def document_raw_id(request, name, rev=None, ext=None):
     except:
         raise Http404
 
-
 def document_html(request, name, rev=None):
+    requested_rev = rev
     found = fuzzy_find_documents(name, rev)
     num_found = found.documents.count()
     if num_found == 0:
@@ -796,46 +1041,28 @@ def document_html(request, name, rev=None):
     if num_found > 1:
         raise Http404("Multiple documents matched: %s" % name)
 
-    if found.matched_name.startswith('rfc') and name != found.matched_name:
-         return redirect('ietf.doc.views_doc.document_html', name=found.matched_name)
-
     doc = found.documents.get()
+    rev = found.matched_rev
+
+    if not requested_rev and doc.type_id == "rfc": # Someone asked for /doc/html/8989
+        if not name.startswith('rfc'):
+            return redirect('ietf.doc.views_doc.document_html', name=doc.name)
 
-    if found.matched_rev or found.matched_name.startswith('rfc'):
-        rev = found.matched_rev
-    else:
-        rev = doc.rev
     if rev:
         doc = doc.history_set.filter(rev=rev).first() or doc.fake_history_obj(rev)
 
     if not os.path.exists(doc.get_file_name()):
         raise Http404("File not found: %s" % doc.get_file_name())
 
-    if doc.type_id in ['draft',]:
-        doc.supermeta = build_doc_supermeta_block(doc)
-        doc.meta = build_doc_meta_block(doc, settings.HTMLIZER_URL_PREFIX)
-
-    doccolor = 'bgwhite' # Unknown
-    if doc.type_id=='draft':
-        if doc.is_rfc():
-            if doc.related_that('obs'):
-                doccolor = 'bgbrown'
-            else:
-                doccolor = {
-                    'ps'   : 'bgblue',
-                    'exp'  : 'bgyellow',
-                    'inf'  : 'bgorange',
-                    'ds'   : 'bgcyan',
-                    'hist' : 'bggrey',
-                    'std'  : 'bggreen',
-                    'bcp'  : 'bgmagenta',
-                    'unkn' : 'bgwhite',
-                }.get(doc.std_level_id, 'bgwhite')
-        else:
-            doccolor = 'bgred' # Draft
+    return document_main(
+        request,
+        name=doc.name if requested_rev else doc.name,
+        rev=doc.rev if requested_rev or doc.type_id != "rfc" else None,
+        document_html=True,
+    )
 
-    return render(request, "doc/document_html.html", {"doc":doc, "doccolor":doccolor })
 
+@login_required
 def document_pdfized(request, name, rev=None, ext=None):
 
     found = fuzzy_find_documents(name, rev)
@@ -860,41 +1087,18 @@ def document_pdfized(request, name, rev=None, ext=None):
     if not os.path.exists(doc.get_file_name()):
         raise Http404("File not found: %s" % doc.get_file_name())
 
-    pdf = doc.pdfized()
+    try:
+        pdf = doc.pdfized()
+    except Exception:
+        return render(request, "doc/weasyprint_failed.html")
     if pdf:
-        return HttpResponse(pdf,content_type='application/pdf;charset=utf-8')
+        return HttpResponse(pdf,content_type='application/pdf')
     else:
         raise Http404
 
-def check_doc_email_aliases():
-    pattern = re.compile(r'^expand-(.*?)(\..*?)?@.*? +(.*)$')
-    good_count = 0
-    tot_count = 0
-    with io.open(settings.DRAFT_VIRTUAL_PATH,"r") as virtual_file:
-        for line in virtual_file.readlines():
-            m = pattern.match(line)
-            tot_count += 1
-            if m:
-                good_count += 1
-            if good_count > 50 and tot_count < 3*good_count:
-                return True
-    return False
-
-def get_doc_email_aliases(name):
-    if name:
-        pattern = re.compile(r'^expand-(%s)(\..*?)?@.*? +(.*)$'%name)
-    else:
-        pattern = re.compile(r'^expand-(.*?)(\..*?)?@.*? +(.*)$')
-    aliases = []
-    with io.open(settings.DRAFT_VIRTUAL_PATH,"r") as virtual_file:
-        for line in virtual_file.readlines():
-            m = pattern.match(line)
-            if m:
-                aliases.append({'doc_name':m.group(1),'alias_type':m.group(2),'expansion':m.group(3)})
-    return aliases
 
 def document_email(request,name):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     top = render_document_top(request, doc, "email", name)
 
     aliases = get_doc_email_aliases(name) if doc.type_id=='draft' else None
@@ -911,73 +1115,148 @@ def document_email(request,name):
                  )
 
 
-def document_history(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
-    top = render_document_top(request, doc, "history", name)
+def get_diff_revisions(request, name, doc):
+    """ Calculate what to offer for diff comparisons
+
+    returns list of (name, rev, time, url, is_this_doc, is_previous_doc)
+    ordered by -time for use by forms used to get to the diff tools.
+    """
+    diffable = any(
+        [
+            name.startswith(prefix)
+            for prefix in [
+                "rfc",
+                "draft",
+                "charter",
+                "conflict-review",
+                "status-change",
+            ]
+        ]
+    )
+
+    if not diffable:
+        return []
 
     # pick up revisions from events
     diff_revisions = []
 
-    diffable = [ name.startswith(prefix) for prefix in ["rfc", "draft", "charter", "conflict-review", "status-change", ]]
-    if any(diffable):
-        diff_documents = [ doc ]
-        diff_documents.extend(Document.objects.filter(docalias__relateddocument__source=doc, docalias__relateddocument__relationship="replaces"))
-
-        if doc.get_state_slug() == "rfc":
-            e = doc.latest_event(type="published_rfc")
-            aliases = doc.docalias.filter(name__startswith="rfc")
-            if aliases:
-                name = aliases[0].name
-            diff_revisions.append((name, "", e.time if e else doc.time, name))
-
-        seen = set()
-        for e in NewRevisionDocEvent.objects.filter(type="new_revision", doc__in=diff_documents).select_related('doc').order_by("-time", "-id"):
-            if (e.doc.name, e.rev) in seen:
-                continue
-
-            seen.add((e.doc.name, e.rev))
-
-            url = ""
-            if name.startswith("charter"):
-                url = request.build_absolute_uri(urlreverse('ietf.doc.views_charter.charter_with_milestones_txt', kwargs=dict(name=e.doc.name, rev=e.rev)))
-            elif name.startswith("conflict-review"):
-                url = find_history_active_at(e.doc, e.time).get_href()
-            elif name.startswith("status-change"):
-                url = find_history_active_at(e.doc, e.time).get_href()
-            elif name.startswith("draft") or name.startswith("rfc"):
-                # rfcdiff tool has special support for IDs
-                url = e.doc.name + "-" + e.rev
-
-            diff_revisions.append((e.doc.name, e.rev, e.time, url))
+    diff_documents = [doc]
+    diff_documents.extend(
+        [
+            r.target
+            for r in RelatedDocument.objects.filter(source=doc, relationship="replaces")
+        ]
+    )
+    if doc.came_from_draft():
+        diff_documents.append(doc.came_from_draft())
+
+    if doc.became_rfc():
+        rfc = doc.became_rfc()
+        e = rfc.latest_event(type="published_rfc")
+        diff_revisions.append((rfc.name, "", e.time if e else rfc.time, rfc.name, False, False))
+
+    if doc.type_id == "rfc":
+        e = doc.latest_event(type="published_rfc")
+        diff_revisions.append((name, "", e.time if e else doc.time, name, True, False))
+
+    seen = set()
+    for e in (
+        NewRevisionDocEvent.objects.filter(type="new_revision", doc__in=diff_documents)
+        .select_related("doc")
+        .order_by("-time", "-id")
+    ):
+        if (e.doc.name, e.rev) in seen:
+            continue
+
+        seen.add((e.doc.name, e.rev))
+
+        url = ""
+        if name.startswith("charter"):
+            url = request.build_absolute_uri(
+                urlreverse(
+                    "ietf.doc.views_charter.charter_with_milestones_txt",
+                    kwargs=dict(name=e.doc.name, rev=e.rev),
+                )
+            )
+        elif name.startswith("conflict-review"):
+            url = find_history_active_at(e.doc, e.time).get_href()
+        elif name.startswith("status-change"):
+            url = find_history_active_at(e.doc, e.time).get_href()
+        elif name.startswith("draft") or name.startswith("rfc"):
+            # rfcdiff tool has special support for IDs
+            url = e.doc.name + "-" + e.rev
+
+        diff_revisions.append((e.doc.name, e.rev, e.time, url, e.doc == doc and e.rev == doc.rev, False))
+    
+    diff_revisions.sort(key=lambda t: t[2], reverse=True)
+    for index, t in enumerate(diff_revisions):
+        if t[4]: # is_this_doc
+            n = index+1
+            if n < len(diff_revisions):
+                t_name, rev, time, url, _, _ = diff_revisions[n]
+                diff_revisions[n] = (t_name, rev, time, url, False, True)
+                break
+
+    return diff_revisions
+
+
+def document_history(request, name):
+    doc = get_object_or_404(Document, name=name)
+    top = render_document_top(request, doc, "history", name)
+    diff_revisions = get_diff_revisions(request, name, doc)
 
     # grab event history
     events = doc.docevent_set.all().order_by("-time", "-id").select_related("by")
 
     augment_events_with_revision(doc, events)
-    add_links_in_new_revision_events(doc, events, diff_revisions)
     add_events_message_info(events)
 
     # figure out if the current user can add a comment to the history
-    if doc.type_id == "draft" and doc.group != None:
-        can_add_comment = bool(has_role(request.user, ("Area Director", "Secretariat", "IRTF Chair", "IANA", "RFC Editor")) or (
-            request.user.is_authenticated and
-            Role.objects.filter(name__in=("chair", "secr"),
-                group__acronym=doc.group.acronym,
-                person__user=request.user)))
+    if doc.type_id in ("draft", "rfc") and doc.group is not None:
+        can_add_comment = bool(
+            has_role(
+                request.user,
+                ("Area Director", "Secretariat", "IRTF Chair", "IANA", "RFC Editor"),
+            )
+            or (
+                request.user.is_authenticated
+                and Role.objects.filter(
+                    name__in=("chair", "secr"),
+                    group__acronym=doc.group.acronym,
+                    person__user=request.user,
+                )
+            )
+        )
     else:
-        can_add_comment = has_role(request.user, ("Area Director", "Secretariat", "IRTF Chair"))
-    return render(request, "doc/document_history.html",
-                              dict(doc=doc,
-                                   top=top,
-                                   diff_revisions=diff_revisions,
-                                   events=events,
-                                   can_add_comment=can_add_comment,
-                                   ))
+        can_add_comment = has_role(
+            request.user, ("Area Director", "Secretariat", "IRTF Chair")
+        )
+
+    # if the current user has balloted on this document, give them a revision hint
+    ballot_doc_rev = None
+    if request.user.is_authenticated:
+        ballot_doc_rev = last_ballot_doc_revision(doc, request.user.person)
+
+    return render(
+        request,
+        "doc/document_history.html",
+        {
+            "doc": doc,
+            "top": top,
+            "diff_revisions": diff_revisions,
+            "events": events,
+            "can_add_comment": can_add_comment,
+            "ballot_doc_rev": ballot_doc_rev,
+        },
+    )
 
 
 def document_bibtex(request, name, rev=None):
+    if name.startswith('rfc') and rev is not None:
+        raise Http404()
+
     # Make sure URL_REGEXPS did not grab too much for the rev number
-    if rev != None and len(rev) != 2:
+    if rev is not None and len(rev) != 2:
         mo = re.search(r"^(?P<m>[0-9]{1,2})-(?P<n>[0-9]{2})$", rev)
         if mo:
             name = name+"-"+mo.group(1)
@@ -986,33 +1265,39 @@ def document_bibtex(request, name, rev=None):
             name = name+"-"+rev
             rev = None
 
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
 
-    latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
-    replaced_by = [d.name for d in doc.related_that("replaces")]
-    published = doc.latest_event(type="published_rfc")
-    rfc = latest_revision.doc if latest_revision and latest_revision.doc.get_state_slug() == "rfc" else None
+    if doc.type_id not in ["rfc", "draft"]:
+        raise Http404()
 
-    if rev != None and rev != doc.rev:
-        # find the entry in the history
-        for h in doc.history_set.order_by("-time"):
-            if rev == h.rev:
-                doc = h
-                break
+    doi = None
+    draft_became_rfc = None
+    replaced_by = None
+    latest_revision = None
+    if doc.type_id == "draft":
+        latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
+        replaced_by = [d.name for d in doc.related_that("replaces")]
+        draft_became_rfc = doc.became_rfc()
 
-    if doc.is_rfc():
-        # This needs to be replaced with a lookup, as the mapping may change
-        # over time.  Probably by updating ietf/sync/rfceditor.py to add the
-        # as a DocAlias, and use a method on Document to retrieve it.
-        doi = "10.17487/RFC%04d" % int(doc.rfc_number())
-    else:
-        doi = None
+        if rev is not None and rev != doc.rev:
+            # find the entry in the history
+            for h in doc.history_set.order_by("-time"):
+                if rev == h.rev:
+                    doc = h
+                    break
+
+    elif doc.type_id == "rfc":
+        doi = doc.doi
+
+    if doc.is_dochistory():
+        latest_event = doc.latest_event(type='new_revision', rev=rev)
+        if latest_event:
+            doc.pub_date = latest_event.time
 
     return render(request, "doc/document_bibtex.bib",
                               dict(doc=doc,
                                    replaced_by=replaced_by,
-                                   published=published,
-                                   rfc=rfc,
+                                   published_as=draft_became_rfc,
                                    latest_revision=latest_revision,
                                    doi=doi,
                                ),
@@ -1033,7 +1318,7 @@ def document_bibxml(request, name, rev=None):
         raise Http404()
 
     # Make sure URL_REGEXPS did not grab too much for the rev number
-    if rev != None and len(rev) != 2:
+    if rev is not None and len(rev) != 2:
         mo = re.search(r"^(?P<m>[0-9]{1,2})-(?P<n>[0-9]{2})$", rev)
         if mo:
             name = name+"-"+mo.group(1)
@@ -1049,7 +1334,7 @@ def document_bibxml(request, name, rev=None):
 
 
 def document_writeup(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     top = render_document_top(request, doc, "writeup", name)
 
     def text_from_writeup(event_type):
@@ -1113,7 +1398,7 @@ def text_from_writeup(event_type):
                                    ))
 
 def document_shepherd_writeup(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     lastwriteup = doc.latest_event(WriteupDocEvent,type="changed_protocol_writeup")
     if lastwriteup:
         writeup_text = lastwriteup.text
@@ -1150,22 +1435,46 @@ def document_shepherd_writeup_template(request, type):
 
 
 def document_references(request, name):
-    doc = get_object_or_404(Document,docalias__name=name)
+    doc = get_object_or_404(Document,name=name)
     refs = doc.references()
+    if doc.type_id in ["bcp","std","fyi"]:
+        for rfc in doc.contains():
+            refs |= rfc.references()    
     return render(request, "doc/document_references.html",dict(doc=doc,refs=sorted(refs,key=lambda x:x.target.name),))
 
 def document_referenced_by(request, name):
-    doc = get_object_or_404(Document,docalias__name=name)
+    """View documents that reference the named document
+    
+    The view lists both direct references to a the named document, plus references to
+    related other documents. For a draft that became an RFC, this will include references
+    to the RFC. For an RFC, this will include references to the draft it came from, if any.
+    For a subseries document, this will include references to any of the RFC documents it
+    contains. 
+    
+    In the rendered output, a badge is applied to indicate the name of the document the
+    reference actually targeted. E.g., on the display for a draft that became RFC NNN,
+    references included because they point to that RFC would be shown with a tag "As RFC NNN".
+    The intention is to make the "Referenced By" page useful for finding related work while
+    accurately reflecting the actual reference relationships.     
+    """
+    doc = get_object_or_404(Document,name=name)
     refs = doc.referenced_by()
-    full = ( request.GET.get('full') != None )
+    if doc.came_from_draft():
+        refs |= doc.came_from_draft().referenced_by()
+    if doc.became_rfc():
+        refs |= doc.became_rfc().referenced_by()
+    if doc.type_id in ["bcp","std","fyi"]:
+        for rfc in doc.contains():
+            refs |= rfc.referenced_by()
+    full = ( request.GET.get('full') is not None )
     numdocs = refs.count()
     if not full and numdocs>250:
        refs=refs[:250]
     else:
        numdocs=None
-    refs=sorted(refs,key=lambda x:(['refnorm','refinfo','refunk','refold'].index(x.relationship.slug),x.source.canonical_name()))
+    refs=sorted(refs,key=lambda x:(['refnorm','refinfo','refunk','refold'].index(x.relationship.slug),x.source.name))
     return render(request, "doc/document_referenced_by.html",
-               dict(alias_name=name,
+               dict(name=name,
                     doc=doc,
                     numdocs=numdocs,
                     refs=refs,
@@ -1177,7 +1486,7 @@ def document_ballot_content(request, doc, ballot_id, editable=True):
     augment_events_with_revision(doc, all_ballots)
 
     ballot = None
-    if ballot_id != None:
+    if ballot_id is not None:
         ballot_id = int(ballot_id)
         for b in all_ballots:
             if b.id == ballot_id:
@@ -1201,7 +1510,7 @@ def document_ballot_content(request, doc, ballot_id, editable=True):
     position_groups = []
     for n in BallotPositionName.objects.filter(slug__in=[p.pos_id for p in positions]).order_by('order'):
         g = (n, [p for p in positions if p.pos_id == n.slug])
-        g[1].sort(key=lambda p: (p.is_old_pos, p.balloter.plain_name()))
+        g[1].sort(key=lambda p: (p.is_old_pos, normalize_for_sorting(p.balloter.plain_name())))
         if n.blocking:
             position_groups.insert(0, g)
         else:
@@ -1239,22 +1548,13 @@ def document_ballot_content(request, doc, ballot_id, editable=True):
                               request=request)
 
 def document_ballot(request, name, ballot_id=None):
-    doc = get_object_or_404(Document, docalias__name=name)
-    all_ballots = list(BallotDocEvent.objects.filter(doc=doc, type="created_ballot").order_by("time"))
-    if not ballot_id:
-        if all_ballots:
-            ballot = all_ballots[-1]
-        else:
-            raise Http404("Ballot not found for: %s" % name)
-        ballot_id = ballot.id
+    doc = get_object_or_404(Document, name=name)
+    ballots = BallotDocEvent.objects.filter(doc=doc, type="created_ballot").order_by("time")
+    if ballot_id is not None:
+        ballot = ballots.filter(id=ballot_id).first()
     else:
-        ballot_id = int(ballot_id)
-        for b in all_ballots:
-            if b.id == ballot_id:
-                ballot = b
-                break
-
-    if not ballot_id or not ballot:
+        ballot = ballots.last()
+    if not ballot:
         raise Http404("Ballot not found for: %s" % name)
 
     if ballot.ballot_type.slug == "irsg-approve":
@@ -1264,18 +1564,16 @@ def document_ballot(request, name, ballot_id=None):
 
     top = render_document_top(request, doc, ballot_tab, name)
 
-    c = document_ballot_content(request, doc, ballot_id, editable=True)
-    request.session['ballot_edit_return_point'] = request.path_info
+    c = document_ballot_content(request, doc, ballot.id, editable=True)
 
     return render(request, "doc/document_ballot.html",
                               dict(doc=doc,
                                    top=top,
                                    ballot_content=c,
-                                   # ballot_type_slug=ballot.ballot_type.slug,
                                    ))
 
 def document_irsg_ballot(request, name, ballot_id=None):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     top = render_document_top(request, doc, "irsgballot", name)
     if not ballot_id:
         ballot = doc.latest_event(BallotDocEvent, type="created_ballot", ballot_type__slug='irsg-approve')
@@ -1284,8 +1582,6 @@ def document_irsg_ballot(request, name, ballot_id=None):
 
     c = document_ballot_content(request, doc, ballot_id, editable=True)
 
-    request.session['ballot_edit_return_point'] = request.path_info
-
     return render(request, "doc/document_ballot.html",
                               dict(doc=doc,
                                    top=top,
@@ -1293,21 +1589,48 @@ def document_irsg_ballot(request, name, ballot_id=None):
                                    # ballot_type_slug=ballot.ballot_type.slug,
                                    ))
 
+def document_rsab_ballot(request, name, ballot_id=None):
+    doc = get_object_or_404(Document, name=name)
+    top = render_document_top(request, doc, "rsabballot", name)
+    if not ballot_id:
+        ballot = doc.latest_event(BallotDocEvent, type="created_ballot", ballot_type__slug='rsab-approve')
+        if ballot:
+            ballot_id = ballot.id
+
+    c = document_ballot_content(request, doc, ballot_id, editable=True)
+
+    return render(
+        request,
+        "doc/document_ballot.html",
+        dict(
+            doc=doc,
+            top=top,
+            ballot_content=c,
+        )
+    )
+
 def ballot_popup(request, name, ballot_id):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     c = document_ballot_content(request, doc, ballot_id=ballot_id, editable=False)
     ballot = get_object_or_404(BallotDocEvent,id=ballot_id)
+    
+    try:
+        return_to_url = parse_ballot_edit_return_point(request.GET.get('ballot_edit_return_point'), name, ballot_id)
+    except ValueError:
+        return HttpResponseBadRequest('ballot_edit_return_point is invalid')
+    
     return render(request, "doc/ballot_popup.html",
                               dict(doc=doc,
                                    ballot_content=c,
                                    ballot_id=ballot_id,
                                    ballot_type_slug=ballot.ballot_type.slug,
+                                   ballot_edit_return_point=return_to_url,
                                    editable=True,
                                    ))
 
 
 def document_json(request, name, rev=None):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
 
     def extract_name(s):
         return s.name if s else None
@@ -1327,15 +1650,21 @@ def extract_name(s):
     data["expires"] = doc.expires.strftime("%Y-%m-%d %H:%M:%S") if doc.expires else None
     data["title"] = doc.title
     data["abstract"] = doc.abstract
-    data["aliases"] = list(doc.docalias.values_list("name", flat=True))
     data["state"] = extract_name(doc.get_state())
     data["intended_std_level"] = extract_name(doc.intended_std_level)
     data["std_level"] = extract_name(doc.std_level)
+    author_qs = (
+        doc.rfcauthor_set
+        if doc.type_id == "rfc" and doc.rfcauthor_set.exists()
+        else doc.documentauthor_set
+    ).select_related("person").prefetch_related("person__email_set").order_by("order")
     data["authors"] = [
-        dict(name=author.person.name,
-             email=author.email.address if author.email else None,
-             affiliation=author.affiliation)
-        for author in doc.documentauthor_set.all().select_related("person", "email").order_by("order")
+        {
+            "name": author.titlepage_name if hasattr(author, "titlepage_name") else author.person.name,
+            "email": author.email.address if author.email else None,
+            "affiliation": author.affiliation,
+        }
+        for author in author_qs
     ]
     data["shepherd"] = doc.shepherd.formatted_email() if doc.shepherd else None
     data["ad"] = doc.ad.role_email("ad").formatted_email() if doc.ad else None
@@ -1343,7 +1672,7 @@ def extract_name(s):
     latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
     data["rev_history"] = make_rev_history(latest_revision.doc if latest_revision else doc)
 
-    if doc.type_id == "draft":
+    if doc.type_id == "draft": # These live only on drafts
         data["iesg_state"] = extract_name(doc.get_state("draft-iesg"))
         data["rfceditor_state"] = extract_name(doc.get_state("draft-rfceditor"))
         data["iana_review_state"] = extract_name(doc.get_state("draft-iana-review"))
@@ -1352,6 +1681,8 @@ def extract_name(s):
         if doc.stream_id in ("ietf", "irtf", "iab"):
             e = doc.latest_event(ConsensusDocEvent, type="changed_consensus")
             data["consensus"] = e.consensus if e else None
+
+    if doc.type_id in ["draft", "rfc"]:
         data["stream"] = extract_name(doc.stream)
 
     return HttpResponse(json.dumps(data, indent=2), content_type='application/json')
@@ -1362,18 +1693,18 @@ class AddCommentForm(forms.Form):
 @role_required('Area Director', 'Secretariat', 'IRTF Chair', 'WG Chair', 'RG Chair', 'WG Secretary', 'RG Secretary', 'IANA', 'RFC Editor')
 def add_comment(request, name):
     """Add comment to history of document."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
 
     login = request.user.person
 
-    if doc.type_id == "draft" and doc.group != None:
+    if doc.type_id == "draft" and doc.group is not None:
         can_add_comment = bool(has_role(request.user, ("Area Director", "Secretariat", "IRTF Chair", "IANA", "RFC Editor")) or (
             request.user.is_authenticated and
             Role.objects.filter(name__in=("chair", "secr"),
                 group__acronym=doc.group.acronym,
                 person__user=request.user)))
     else:
-        can_add_comment = has_role(request.user, ("Area Director", "Secretariat", "IRTF Chair"))
+        can_add_comment = has_role(request.user, ("Area Director", "Secretariat", "IRTF Chair", "RFC Editor"))
     if not can_add_comment:
         # The user is a chair or secretary, but not for this WG or RG
         permission_denied(request, "You need to be a chair or secretary of this group to add a comment.")
@@ -1408,11 +1739,12 @@ def telechat_date(request, name):
 
     warnings = []
     if e and e.telechat_date and doc.type.slug != 'charter':
-        if e.telechat_date==datetime.date.today():
+        today = date_today(settings.TIME_ZONE)
+        if e.telechat_date == today:
             warnings.append( "This document is currently scheduled for today's telechat. "
                             +"Please set the returning item bit carefully.")
 
-        elif e.telechat_date<datetime.date.today() and has_same_ballot(doc,e.telechat_date):
+        elif e.telechat_date < today and has_same_ballot(doc,e.telechat_date):
             initial_returning_item = True
             warnings.append(  "This document appears to have been on a previous telechat with the same ballot, "
                             +"so the returning item bit has been set. Clear it if that is not appropriate.")
@@ -1445,9 +1777,9 @@ def telechat_date(request, name):
 
 def doc_titletext(doc):
     if doc.type.slug=='conflrev':
-        conflictdoc = doc.relateddocument_set.get(relationship__slug='conflrev').target.document
-        return 'the conflict review of %s' % conflictdoc.canonical_name()
-    return doc.canonical_name()
+        conflictdoc = doc.relateddocument_set.get(relationship__slug='conflrev').target
+        return 'the conflict review of %s' % conflictdoc.name
+    return doc.name
     
     
 def edit_notify(request, name):
@@ -1564,11 +1896,21 @@ def add_fields(self, form, index):
         })
 
 
-@role_required('Area Director', 'Secretariat')
+@login_required
 def edit_action_holders(request, name):
     """Change the set of action holders for a doc"""
     doc = get_object_or_404(Document, name=name)
-    
+
+    can_edit = has_role(request.user, ("Area Director", "Secretariat")) or (
+        doc.group and doc.group.has_role(request.user, doc.group.features.docman_roles)
+    )
+    if not can_edit:
+        # Keep the list of roles in this message up-to-date with the can_edit logic
+        message = "Restricted to roles: Area Director, Secretariat"
+        if doc.group and doc.group.acronym != "none":
+            message += f", and document managers for the {doc.group.acronym} group"
+        raise PermissionDenied(message)
+
     if request.method == 'POST':
         form = ActionHoldersForm(request.POST)
         if form.is_valid():
@@ -1606,9 +1948,9 @@ def edit_action_holders(request, name):
     role_ids = dict()  # maps role slug to list of Person IDs (assumed numeric in the JavaScript)
     extra_prefetch = []  # list of Person objects to prefetch for select2 field
 
-    if len(doc.authors()) > 0:
+    authors = doc.author_persons()
+    if len(authors) > 0:
         doc_role_labels.append(dict(slug='authors', label='Authors'))
-        authors = doc.authors()
         role_ids['authors'] = [p.pk for p in authors]
         extra_prefetch += authors
 
@@ -1678,15 +2020,25 @@ class ReminderEmailForm(forms.Form):
         strip=True,
     )
 
-@role_required('Area Director', 'Secretariat')
+@login_required
 def remind_action_holders(request, name):
     doc = get_object_or_404(Document, name=name)
-    
+
+    can_edit = has_role(request.user, ("Area Director", "Secretariat")) or (
+        doc.group and doc.group.has_role(request.user, doc.group.features.docman_roles)
+    )
+    if not can_edit:
+        # Keep the list of roles in this message up-to-date with the can_edit logic
+        message = "Restricted to roles: Area Director, Secretariat"
+        if doc.group and doc.group.acronym != "none":
+            message += f", and document managers for the {doc.group.acronym} group"
+        raise PermissionDenied(message)
+
     if request.method == 'POST':
         form = ReminderEmailForm(request.POST)
         if form.is_valid():
             email_remind_action_holders(request, doc, form.cleaned_data['note'])
-        return redirect('ietf.doc.views_doc.document_main', name=doc.canonical_name())
+        return redirect('ietf.doc.views_doc.document_main', name=doc.name)
 
     form = ReminderEmailForm()
     return render(
@@ -1700,16 +2052,26 @@ def remind_action_holders(request, name):
     )
 
 
-def email_aliases(request,name=''):
-    doc = get_object_or_404(Document, name=name) if name else None
-    if not name:
-        # require login for the overview page, but not for the
-        # document-specific pages 
-        if not request.user.is_authenticated:
-                return redirect('%s?next=%s' % (settings.LOGIN_URL, request.path))
-    aliases = get_doc_email_aliases(name)
-
-    return render(request,'doc/email_aliases.html',{'aliases':aliases,'ietf_domain':settings.IETF_DOMAIN,'doc':doc})
+@login_required
+def email_aliases(request):
+    """List of all email aliases
+    
+    This is currently slow except when cached
+    """
+    slowcache = caches["slowpages"]
+    cache_key = "emailaliasesview"
+    aliases = slowcache.get(cache_key)
+    if not aliases:
+        aliases = get_doc_email_aliases()  # gets all aliases
+        slowcache.set(cache_key, aliases, 3600)
+    return render(
+        request,
+        "doc/email_aliases.html",
+        {
+            "aliases": aliases,
+            "ietf_domain": settings.IETF_DOMAIN,
+        },
+    )
 
 class VersionForm(forms.Form):
 
@@ -1723,7 +2085,7 @@ def __init__(self, *args, **kwargs):
 
 def edit_sessionpresentation(request,name,session_id):
     doc = get_object_or_404(Document, name=name)
-    sp = get_object_or_404(doc.sessionpresentation_set, session_id=session_id)
+    sp = get_object_or_404(doc.presentations, session_id=session_id)
 
     if not sp.session.can_manage_materials(request.user):
         raise Http404
@@ -1740,7 +2102,13 @@ def edit_sessionpresentation(request,name,session_id):
         if form.is_valid():
             new_selection = form.cleaned_data['version']
             if initial['version'] != new_selection:
-                doc.sessionpresentation_set.filter(pk=sp.pk).update(rev=None if new_selection=='current' else new_selection)
+                doc.presentations.filter(pk=sp.pk).update(rev=None if new_selection=='current' else new_selection)
+                if doc.type_id == "slides" and hasattr(settings, "MEETECHO_API_CONFIG"):
+                    sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+                    try:
+                        sm.send_update(sp.session)
+                    except MeetechoAPIError as err:
+                        log.log(f"Error in SlidesManager.send_update(): {err}")
                 c = DocEvent(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person)
                 c.desc = "Revision for session %s changed to  %s" % (sp.session,new_selection)
                 c.save()
@@ -1752,7 +2120,7 @@ def edit_sessionpresentation(request,name,session_id):
 
 def remove_sessionpresentation(request,name,session_id):
     doc = get_object_or_404(Document, name=name)
-    sp = get_object_or_404(doc.sessionpresentation_set, session_id=session_id)
+    sp = get_object_or_404(doc.presentations, session_id=session_id)
 
     if not sp.session.can_manage_materials(request.user):
         raise Http404
@@ -1761,7 +2129,13 @@ def remove_sessionpresentation(request,name,session_id):
         raise Http404
 
     if request.method == 'POST':
-        doc.sessionpresentation_set.filter(pk=sp.pk).delete()
+        doc.presentations.filter(pk=sp.pk).delete()
+        if doc.type_id == "slides" and hasattr(settings, "MEETECHO_API_CONFIG"):
+            sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+            try:
+                sm.delete(sp.session, doc)
+            except MeetechoAPIError as err:
+                log.log(f"Error in SlidesManager.delete(): {err}")
         c = DocEvent(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person)
         c.desc = "Removed from session: %s" % (sp.session)
         c.save()
@@ -1785,7 +2159,7 @@ def add_sessionpresentation(request,name):
     version_choices.insert(0,('current','Current at the time of the session'))
 
     sessions = get_upcoming_manageable_sessions(request.user)
-    sessions = sort_sessions([s for s in sessions if not s.sessionpresentation_set.filter(document=doc).exists()])
+    sessions = sort_sessions([s for s in sessions if not s.presentations.filter(document=doc).exists()])
     if doc.group:
         sessions = sorted(sessions,key=lambda x:0 if x.group==doc.group else 1)
 
@@ -1798,7 +2172,25 @@ def add_sessionpresentation(request,name):
             session_id = session_form.cleaned_data['session']
             version = version_form.cleaned_data['version']
             rev = None if version=='current' else version
-            doc.sessionpresentation_set.create(session_id=session_id,rev=rev)
+            if doc.type_id == "slides":
+                max_order = SessionPresentation.objects.filter(
+                    document__type='slides',
+                    session__pk=session_id,
+                ).aggregate(Max('order'))['order__max'] or 0
+                order = max_order + 1
+            else:
+                order = 0
+            sp = doc.presentations.create(
+                session_id=session_id,
+                rev=rev,
+                order=order,
+            )
+            if doc.type_id == "slides" and hasattr(settings, "MEETECHO_API_CONFIG"):
+                sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+                try:
+                    sm.add(sp.session, doc, order=sp.order)
+                except MeetechoAPIError as err:
+                    log.log(f"Error in SlidesManager.add(): {err}")
             c = DocEvent(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person)
             c.desc = "%s to session: %s" % ('Added -%s'%rev if rev else 'Added', Session.objects.get(pk=session_id))
             c.save()
@@ -1851,156 +2243,144 @@ def idnits2_rfc_status(request):
 
 
 def idnits2_state(request, name, rev=None):
-    doc = get_object_or_404(Document, docalias__name=name)
-    if doc.type_id!='draft':
+    doc = get_object_or_404(Document, name=name)
+    if doc.type_id not in ["draft", "rfc"]:
         raise Http404
-    zero_revision = NewRevisionDocEvent.objects.filter(doc=doc,rev='00').first()
+    zero_revision = None
+    if doc.type_id == "rfc":
+        draft = doc.came_from_draft()
+        if draft:
+            zero_revision = NewRevisionDocEvent.objects.filter(
+                doc=draft, rev="00"
+            ).first()
+    else:
+        zero_revision = NewRevisionDocEvent.objects.filter(doc=doc, rev="00").first()
     if zero_revision:
         doc.created = zero_revision.time
     else:
-        doc.created = doc.docevent_set.order_by('-time').first().time
+        if doc.type_id == "draft":
+            if doc.became_rfc():
+                interesting_event = (
+                    doc.became_rfc()
+                    .docevent_set.filter(type="published_rfc")
+                    .order_by("-time")
+                    .first()
+                )
+            else:
+                interesting_event = doc.docevent_set.order_by(
+                    "-time"
+                ).first()  # Is taking the most _recent_ instead of the oldest event correct?
+        else:  # doc.type_id == "rfc"
+            interesting_event = (
+                doc.docevent_set.filter(type="published_rfc").order_by("-time").first()
+            )
+        doc.created = interesting_event.time
     if doc.std_level:
         doc.deststatus = doc.std_level.name
     elif doc.intended_std_level:
         doc.deststatus = doc.intended_std_level.name
     else:
-        text = doc.text()
+         # 10000 is a conservative prefix on number of utf-8 encoded bytes to 
+         # cover at least the first 10 lines of characters
+        text = doc.text(size=10000)
         if text:
-            parsed_draft = PlaintextDraft(text=doc.text(), source=name, name_from_source=False)
-            doc.deststatus = parsed_draft.get_status()
+            doc.deststatus = get_status_from_draft_text(text)
         else:
-            doc.deststatus="Unknown"
-    return render(request, 'doc/idnits2-state.txt', context={'doc':doc}, content_type='text/plain;charset=utf-8')    
+            doc.deststatus = "Unknown"
+    return render(
+        request,
+        "doc/idnits2-state.txt",
+        context={"doc": doc},
+        content_type="text/plain;charset=utf-8",
+    )
+
 
-def find_doc_for_rfcdiff(name, rev):
-    """rfcdiff lookup heuristics
+@role_required("Secretariat")
+def investigate(request):
+    """Investigate a fragment
 
-    Returns a tuple with:
-      [0] - condition string
-      [1] - document found (or None)
-      [2] - historic version
-      [3] - revision actually found (may differ from :rev: input)
+    A plain GET with no querystring returns the UI page.
+
+    POST with the task_id field empty starts an async task and returns a JSON response with
+    the ID needed to monitor the task for results.
+
+    GET with a querystring parameter "id" will poll the status of the async task and return "ready"
+    or "notready".
+
+    POST with the task_id field set to the id of a "ready" task will return its results or an error
+    if the task failed or the id is invalid (expired, never exited, etc).
     """
-    found = fuzzy_find_documents(name, rev)
-    condition = 'no such document'
-    if found.documents.count() != 1:
-        return (condition, None, None, rev)
-    doc = found.documents.get()
-    if found.matched_rev is None or doc.rev == found.matched_rev:
-        condition = 'current version'
-        return (condition, doc, None, found.matched_rev)
-    else:
-        candidate = doc.history_set.filter(rev=found.matched_rev).order_by("-time").first()
-        if candidate:
-            condition = 'historic version'
-            return (condition, doc, candidate, found.matched_rev)
-        else:
-            condition = 'version dochistory not found'
-            return (condition, doc, None, found.matched_rev)
-            
-# This is a proof of concept of a service that would redirect to the current revision           
-# def rfcdiff_latest(request, name, rev=None):
-#     condition, doc, history = find_doc_for_rfcdiff(name, rev)
-#     if not doc:
-#         raise Http404
-#     if history:
-#         return redirect(history.get_href())
-#     else:
-#         return redirect(doc.get_href())
-
-HAS_TOMBSTONE = [ 
-    2821, 2822, 2873, 2919, 2961, 3023, 3029, 3031, 3032, 3033, 3034, 3035, 3036,
-    3037, 3038, 3042, 3044, 3050, 3052, 3054, 3055, 3056, 3057, 3059, 3060, 3061,
-    3062, 3063, 3064, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076,
-    3077, 3078, 3080, 3081, 3082, 3084, 3085, 3086, 3087, 3088, 3089, 3090, 3094,
-    3095, 3096, 3097, 3098, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109,
-    3110, 3111, 3112, 3113, 3114, 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3123,
-    3124, 3126, 3127, 3128, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, 3138,
-    3139, 3140, 3141, 3142, 3143, 3144, 3145, 3147, 3149, 3150, 3151, 3152, 3153,
-    3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, 3162, 3163, 3164, 3165, 3166,
-    3167, 3168, 3169, 3170, 3171, 3172, 3173, 3174, 3176, 3179, 3180, 3181, 3182,
-    3183, 3184, 3185, 3186, 3187, 3188, 3189, 3190, 3191, 3192, 3193, 3194, 3197,
-    3198, 3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, 3210, 3211, 3212,
-    3213, 3214, 3215, 3216, 3217, 3218, 3220, 3221, 3222, 3224, 3225, 3226, 3227,
-    3228, 3229, 3230, 3231, 3232, 3233, 3234, 3235, 3236, 3237, 3238, 3240, 3241,
-    3242, 3243, 3244, 3245, 3246, 3247, 3248, 3249, 3250, 3253, 3254, 3255, 3256,
-    3257, 3258, 3259, 3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269,
-    3270, 3271, 3272, 3273, 3274, 3275, 3276, 3278, 3279, 3280, 3281, 3282, 3283,
-    3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3296,
-    3297, 3298, 3301, 3302, 3303, 3304, 3305, 3307, 3308, 3309, 3310, 3311, 3312,
-    3313, 3315, 3317, 3318, 3319, 3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327,
-    3329, 3330, 3331, 3332, 3334, 3335, 3336, 3338, 3340, 3341, 3342, 3343, 3346,
-    3348, 3349, 3351, 3352, 3353, 3354, 3355, 3356, 3360, 3361, 3362, 3363, 3364,
-    3366, 3367, 3368, 3369, 3370, 3371, 3372, 3374, 3375, 3377, 3378, 3379, 3383,
-    3384, 3385, 3386, 3387, 3388, 3389, 3390, 3391, 3394, 3395, 3396, 3397, 3398,
-    3401, 3402, 3403, 3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413,
-    3414, 3415, 3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, 3426,
-    3427, 3428, 3429, 3430, 3431, 3433, 3434, 3435, 3436, 3437, 3438, 3439, 3440,
-    3441, 3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450, 3451, 3452, 3453, 3454,
-    3455, 3458, 3459, 3460, 3461, 3462, 3463, 3464, 3465, 3466, 3467, 3468, 3469,
-    3470, 3471, 3472, 3473, 3474, 3475, 3476, 3477, 3480, 3481, 3483, 3485, 3488,
-    3494, 3495, 3496, 3497, 3498, 3501, 3502, 3503, 3504, 3505, 3506, 3507, 3508,
-    3509, 3511, 3512, 3515, 3516, 3517, 3518, 3520, 3521, 3522, 3523, 3524, 3525,
-    3527, 3529, 3530, 3532, 3533, 3534, 3536, 3537, 3538, 3539, 3541, 3543, 3544,
-    3545, 3546, 3547, 3548, 3549, 3550, 3551, 3552, 3555, 3556, 3557, 3558, 3559,
-    3560, 3562, 3563, 3564, 3565, 3568, 3569, 3570, 3571, 3572, 3573, 3574, 3575,
-    3576, 3577, 3578, 3579, 3580, 3581, 3582, 3583, 3584, 3588, 3589, 3590, 3591,
-    3592, 3593, 3594, 3595, 3597, 3598, 3601, 3607, 3609, 3610, 3612, 3614, 3615,
-    3616, 3625, 3627, 3630, 3635, 3636, 3637, 3638
-]
-
-def rfcdiff_latest_json(request, name, rev=None):
-    response = dict()
-    condition, document, history, found_rev = find_doc_for_rfcdiff(name, rev)
-
-    if condition == 'no such document':
-        raise Http404
-    elif condition in ('historic version', 'current version'):
-        doc = history if history else document
-        if not found_rev and doc.is_rfc():
-            response['content_url'] = doc.get_href()
-            response['name']=doc.canonical_name()
-            if doc.name != doc.canonical_name():
-                prev_rev = doc.rev
-                # not sure what to do if non-numeric values come back, so at least log it
-                log.assertion('doc.rfc_number().isdigit()') # .rfc_number() is expensive...
-                log.assertion('doc.rev.isdigit()')
-                if int(doc.rfc_number()) in HAS_TOMBSTONE and prev_rev != '00':
-                    prev_rev = f'{(int(doc.rev)-1):02d}'
-                response['previous'] = f'{doc.name}-{prev_rev}'
-        else:
-            doc.is_rfc = lambda: False
-            response['content_url'] = doc.get_href()
-            response['rev'] = doc.rev
-            response['name'] = doc.name
-            if doc.rev == '00':
-                replaces_docs = (history.doc if condition=='historic version' else doc).related_that_doc('replaces')
-                if replaces_docs:
-                    replaces = replaces_docs[0].document
-                    response['previous'] = f'{replaces.name}-{replaces.rev}'
+    results = None
+    # Start an investigation or retrieve a result on a POST
+    if request.method == "POST":
+        form = InvestigateForm(request.POST)
+        if form.is_valid():
+            task_id = form.cleaned_data["task_id"]
+            if task_id:
+                # Ignore the rest of the form and retrieve the result
+                task_result = AsyncResult(task_id)
+                if task_result.successful():
+                    retval = task_result.get()
+                    results = retval["results"]
+                    form.data = form.data.copy()
+                    form.data["name_fragment"] = retval[
+                        "name_fragment"
+                    ]  # ensure consistency
+                    del form.data["task_id"]  # do not request the task result again
                 else:
-                    match = re.search("-(rfc)?([0-9][0-9][0-9]+)bis(-.*)?$", name)
-                    if match and match.group(2):
-                        response['previous'] = f'rfc{match.group(2)}'
+                    form.add_error(
+                        None,
+                        "The investigation task failed. Please try again and ask for help if this recurs.",
+                    )
+                # Falls through to the render at the end!
             else:
-                # not sure what to do if non-numeric values come back, so at least log it
-                log.assertion('doc.rev.isdigit()')
-                response['previous'] = f'{doc.name}-{(int(doc.rev)-1):02d}'
-    elif condition == 'version dochistory not found':
-        response['warning'] = 'History for this version not found - these results are speculation'
-        response['name'] = document.name
-        response['rev'] = found_rev
-        document.rev = found_rev
-        document.is_rfc = lambda: False
-        response['content_url'] = document.get_href()
-        # not sure what to do if non-numeric values come back, so at least log it
-        log.assertion('found_rev.isdigit()')
-        if int(found_rev) > 0:
-            response['previous'] = f'{document.name}-{(int(found_rev)-1):02d}'
+                name_fragment = form.cleaned_data["name_fragment"]
+                task_result = investigate_fragment_task.delay(name_fragment)
+                return JsonResponse({"id": task_result.id})
+    else:
+        task_id = request.GET.get("id", None)
+        if task_id is not None:
+            # Check status if we got the "id" parameter
+            task_result = AsyncResult(task_id)
+            return JsonResponse(
+                {"status": "ready" if task_result.ready() else "notready"}
+            )
         else:
-            match = re.search("-(rfc)?([0-9][0-9][0-9]+)bis(-.*)?$", name)
-            if match and match.group(2):
-                response['previous'] = f'rfc{match.group(2)}'
-    if not response:
+            # Serve up an empty form
+            form = InvestigateForm()
+
+    # If we get here, it is just a plain GET - serve the UI
+    return render(
+        request,
+        "doc/investigate.html",
+        context={
+            "form": form,
+            "results": results,
+        },
+    )
+
+def rfcxml_notprepped(request, number):
+    number = int(number)
+    if number < settings.FIRST_V3_RFC:
+        raise Http404
+    rfc = Document.objects.filter(type="rfc", rfc_number=number).first()
+    if rfc is None:
+        raise Http404
+    name = f"notprepped/rfc{number}.notprepped.xml"
+    if not StoredObject.objects.filter(name=name).exists():
+        raise Http404
+    try:
+        bytes = retrieve_bytes("rfc", name)
+    except FileNotFoundError:
+        raise Http404
+    return FileResponse(ContentFile(bytes, name=f"rfc{number}.notprepped.xml"), as_attachment=True)
+
+
+def rfcxml_notprepped_wrapper(request, number):
+    number = int(number)
+    if number < settings.FIRST_V3_RFC:
+        raise Http404
+    rfc = Document.objects.filter(type="rfc", rfc_number=number).first()
+    if rfc is None:
         raise Http404
-    return HttpResponse(json.dumps(response), content_type='application/json')
+    return render(request, "doc/notprepped_wrapper.html", context={"rfc": rfc})
diff --git a/ietf/doc/views_downref.py b/ietf/doc/views_downref.py
index 1b7b51edb0..2668baae34 100644
--- a/ietf/doc/views_downref.py
+++ b/ietf/doc/views_downref.py
@@ -19,7 +19,7 @@ def downref_registry(request):
     downref_doc_pairs = [ ]
     downref_relations = RelatedDocument.objects.filter(relationship_id='downref-approval')
     for rel in downref_relations:
-        downref_doc_pairs.append((rel.target.document, rel.source))
+        downref_doc_pairs.append((rel.target, rel.source))
 
     return render(request, 'doc/downref.html', {
              "doc_pairs": downref_doc_pairs,
@@ -38,18 +38,18 @@ def downref_registry_add(request):
         if form.is_valid():
             drafts = form.cleaned_data['drafts']
             rfc = form.cleaned_data['rfc']
-            for da in drafts:
-                RelatedDocument.objects.create(source=da.document,
+            for d in drafts:
+                RelatedDocument.objects.create(source=d,
                         target=rfc, relationship_id='downref-approval')
-                c = DocEvent(type="downref_approved", doc=da.document,
-                        rev=da.document.rev, by=login)
+                c = DocEvent(type="downref_approved", doc=d,
+                        rev=d.rev, by=login)
                 c.desc = "Downref to RFC %s approved by Last Call for %s-%s" % (
-                        rfc.document.rfc_number(), da.name, da.document.rev)
+                        rfc.rfc_number, d.name, d.rev)
                 c.save()
-                c = DocEvent(type="downref_approved", doc=rfc.document,
-                        rev=rfc.document.rev, by=login)
+                c = DocEvent(type="downref_approved", doc=rfc,
+                        rev=rfc.rev, by=login)
                 c.desc = "Downref to RFC %s approved by Last Call for %s-%s" % (
-                        rfc.document.rfc_number(), da.name, da.document.rev)
+                        rfc.rfc_number, d.name, d.rev)
                 c.save()
 
             return HttpResponseRedirect(urlreverse('ietf.doc.views_downref.downref_registry'))
diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py
index e0d73855b1..c5faf1140b 100644
--- a/ietf/doc/views_draft.py
+++ b/ietf/doc/views_draft.py
@@ -1,8 +1,8 @@
-# Copyright The IETF Trust 2010-2020, All Rights Reserved
+# Copyright The IETF Trust 2010-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-# changing state and metadata on Internet Drafts
+# changing state and metadata on Internet-Drafts
 
 import datetime
 import os
@@ -19,10 +19,11 @@
 from django.template.loader import render_to_string
 from django.forms.utils import ErrorList
 from django.template.defaultfilters import pluralize
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( Document, DocAlias, RelatedDocument, State,
+from ietf.doc.models import ( Document, RelatedDocument, State,
     StateType, DocEvent, ConsensusDocEvent, TelechatDocEvent, WriteupDocEvent, StateDocEvent,
     IanaExpertDocEvent, IESG_SUBSTATE_TAGS)
 from ietf.doc.mails import ( email_pulled_from_rfc_queue, email_resurrect_requested,
@@ -31,39 +32,50 @@
     generate_publication_request, email_adopted, email_intended_status_changed,
     email_iesg_processing_document, email_ad_approved_doc,
     email_iana_expert_review_state_changed )
+from ietf.doc.storage_utils import retrieve_bytes, store_bytes
+from ietf.doc.templatetags.ietf_filters import is_doc_ietf_adoptable
 from ietf.doc.utils import ( add_state_change_event, can_adopt_draft, can_unadopt_draft,
     get_tags_for_stream_id, nice_consensus, update_action_holders,
     update_reminder, update_telechat, make_notify_changed_event, get_initial_notify,
     set_replaces_for_document, default_consensus, tags_suffix, can_edit_docextresources,
     update_doc_extresources )
 from ietf.doc.lastcall import request_last_call
-from ietf.doc.fields import SearchableDocAliasesField
+from ietf.doc.fields import SearchableDocumentsField
 from ietf.doc.forms import ExtResourceForm
 from ietf.group.models import Group, Role, GroupFeatures
 from ietf.iesg.models import TelechatDate
 from ietf.ietfauth.utils import has_role, is_authorized_in_doc_stream, user_is_person
-from ietf.ietfauth.utils import role_required
+from ietf.ietfauth.utils import role_required, can_request_rfc_publication
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.message.models import Message
 from ietf.name.models import IntendedStdLevelName, DocTagName, StreamName
 from ietf.person.fields import SearchableEmailField
 from ietf.person.models import Person, Email
-from ietf.utils.mail import send_mail, send_mail_message, on_behalf_of
+from ietf.utils.mail import send_mail, send_mail_message, on_behalf_of, send_mail_text
 from ietf.utils.textupload import get_cleaned_text_file_content
 from ietf.utils import log
+from ietf.utils.fields import DatepickerDateField, ModelMultipleChoiceField, MultiEmailField
 from ietf.utils.response import permission_denied
+from ietf.utils.timezone import date_today, datetime_from_date, datetime_today, DEADLINE_TZINFO
+
 
 class ChangeStateForm(forms.Form):
     state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg"), empty_label=None, required=True)
     substate = forms.ModelChoiceField(DocTagName.objects.filter(slug__in=IESG_SUBSTATE_TAGS), required=False)
     comment = forms.CharField(widget=forms.Textarea, required=False, strip=False)
 
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop("user")
+        super(ChangeStateForm, self).__init__(*args, **kwargs)
+        if not has_role(user, "Secretariat"):
+            self.fields["state"].queryset = self.fields["state"].queryset.exclude(slug="ann")
+
     def clean(self):
         retclean = self.cleaned_data
         state = self.cleaned_data.get('state', '(None)')
         tag = self.cleaned_data.get('substate','')
         comment = self.cleaned_data['comment'].strip() # pyflakes:ignore
-        doc = get_object_or_404(Document, docalias__name=self.docname)
+        doc = get_object_or_404(Document, name=self.docname)
         prev = doc.get_state("draft-iesg")
     
         # tag handling is a bit awkward since the UI still works
@@ -81,17 +93,18 @@ def clean(self):
 
 @role_required('Area Director','Secretariat')
 def change_state(request, name):
-    """Change IESG state of Internet Draft, notifying parties as necessary
+    """Change IESG state of Internet-Draft, notifying parties as necessary
     and logging the change as a comment."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
 
-    if (not doc.latest_event(type="started_iesg_process")) or doc.get_state_slug() == "expired":
+    # Steer ADs towards "Begin IESG Processing"
+    if doc.get_state_slug("draft-iesg")=="idexists" and not has_role(request.user,"Secretariat"):
         raise Http404
 
     login = request.user.person
 
     if request.method == 'POST':
-        form = ChangeStateForm(request.POST)
+        form = ChangeStateForm(request.POST, user=request.user)
         form.docname=name
 
         if form.is_valid():
@@ -172,7 +185,8 @@ def change_state(request, name):
         state = doc.get_state("draft-iesg")
         t = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
         form = ChangeStateForm(initial=dict(state=state.pk if state else None,
-                                            substate=t[0].pk if t else None))
+                                            substate=t[0].pk if t else None),
+                               user=request.user)
         form.docname=name
 
     state = doc.get_state("draft-iesg")
@@ -202,7 +216,7 @@ class AddIanaExpertsCommentForm(forms.Form):
 
 @role_required('Secretariat', 'IANA')
 def add_iana_experts_comment(request, name):
-    doc = get_object_or_404(Document, docalias__name = name)
+    doc = get_object_or_404(Document, name = name)
     if request.method == 'POST':
         form = AddIanaExpertsCommentForm(request.POST)
         if form.is_valid():
@@ -226,9 +240,9 @@ def __init__(self, state_type, *args, **kwargs):
 
 @role_required('Secretariat', 'IANA')
 def change_iana_state(request, name, state_type):
-    """Change IANA review state of Internet Draft. Normally, this is done via
+    """Change IANA review state of Internet-Draft. Normally, this is done via
     automatic sync, but this form allows one to set it manually."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
 
     state_type = doc.type_id + "-" + state_type
 
@@ -268,7 +282,7 @@ class ChangeStreamForm(forms.Form):
 def change_stream(request, name):
     """Change the stream of a Document of type 'draft', notifying parties as necessary
     and logging the change as a comment."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if not doc.type_id=='draft':
         raise Http404
 
@@ -330,7 +344,7 @@ def change_stream(request, name):
                                    ))
 
 class ReplacesForm(forms.Form):
-    replaces = SearchableDocAliasesField(required=False)
+    replaces = SearchableDocumentsField(required=False)
     comment = forms.CharField(widget=forms.Textarea, required=False, strip=False)
 
     def __init__(self, *args, **kwargs):
@@ -340,16 +354,16 @@ def __init__(self, *args, **kwargs):
 
     def clean_replaces(self):
         for d in self.cleaned_data['replaces']:
-            if d.document == self.doc:
-                raise forms.ValidationError("A draft can't replace itself")
-            if d.document.type_id == "draft" and d.document.get_state_slug() == "rfc":
-                raise forms.ValidationError("A draft can't replace an RFC")
+            if d == self.doc:
+                raise forms.ValidationError("An Internet-Draft can't replace itself")
+            if d.type_id == "draft" and d.get_state_slug() == "rfc":
+                raise forms.ValidationError("An Internet-Draft can't replace an RFC")
         return self.cleaned_data['replaces']
 
 def replaces(request, name):
     """Change 'replaces' set of a Document of type 'draft' , notifying parties 
        as necessary and logging the change as a comment."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if doc.type_id != 'draft':
         raise Http404
     if not (has_role(request.user, ("Secretariat", "Area Director", "WG Chair", "RG Chair", "WG Secretary", "RG Secretary"))
@@ -380,9 +394,9 @@ def replaces(request, name):
                    ))
 
 class SuggestedReplacesForm(forms.Form):
-    replaces = forms.ModelMultipleChoiceField(queryset=DocAlias.objects.all(),
-                                              label="Suggestions", required=False, widget=forms.CheckboxSelectMultiple,
-                                              help_text="Select only the documents that are replaced by this document")
+    replaces = ModelMultipleChoiceField(queryset=Document.objects.all(),
+                                        label="Suggestions", required=False, widget=forms.CheckboxSelectMultiple,
+                                        help_text="Select only the documents that are replaced by this document")
     comment = forms.CharField(label="Optional comment", widget=forms.Textarea, required=False, strip=False)
 
     def __init__(self, suggested, *args, **kwargs):
@@ -393,7 +407,7 @@ def __init__(self, suggested, *args, **kwargs):
         self.fields["replaces"].choices = [(d.pk, d.name) for d in suggested]
 
 def review_possibly_replaces(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if doc.type_id != 'draft':
         raise Http404
     if not (has_role(request.user, ("Secretariat", "Area Director"))
@@ -448,7 +462,7 @@ class ChangeIntentionForm(forms.Form):
 def change_intention(request, name):
     """Change the intended publication status of a Document of type 'draft' , notifying parties 
        as necessary and logging the change as a comment."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if doc.type_id != 'draft':
         raise Http404
 
@@ -456,8 +470,6 @@ def change_intention(request, name):
             or is_authorized_in_doc_stream(request.user, doc)):
         permission_denied(request, "You do not have the necessary permissions to view this page.")
 
-    login = request.user.person
-
     if request.method == 'POST':
         form = ChangeIntentionForm(request.POST)
         if form.is_valid():
@@ -465,36 +477,7 @@ def change_intention(request, name):
             comment = form.cleaned_data['comment'].strip()
             old_level = doc.intended_std_level
 
-            if new_level != old_level:
-                doc.intended_std_level = new_level
-
-                events = []
-                e = DocEvent(doc=doc, rev=doc.rev, by=login, type='changed_document')
-                e.desc = "Intended Status changed to <b>%s</b> from %s"% (new_level,old_level) 
-                e.save()
-                events.append(e)
-
-                if comment:
-                    c = DocEvent(doc=doc, rev=doc.rev, by=login, type="added_comment")
-                    c.desc = comment
-                    c.save()
-                    events.append(c)
-
-                de = doc.latest_event(ConsensusDocEvent, type="changed_consensus")
-                prev_consensus = de and de.consensus
-                if not prev_consensus and doc.intended_std_level_id in ("std", "ds", "ps", "bcp"):
-                    ce = ConsensusDocEvent(doc=doc, rev=doc.rev, by=login, type="changed_consensus")
-                    ce.consensus = True
-                    ce.desc = "Changed consensus to <b>%s</b> from %s" % (nice_consensus(True),
-                                                                          nice_consensus(prev_consensus))
-                    ce.save()
-                    events.append(ce)
-
-                doc.save_with_history(events)
-
-                msg = "\n".join(e.desc for e in events)
-
-                email_intended_status_changed(request, doc, msg)
+            set_intended_status_level(request=request, doc=doc, new_level=new_level, old_level=old_level, comment=comment)
 
             return HttpResponseRedirect(doc.get_absolute_url())
 
@@ -507,42 +490,10 @@ def change_intention(request, name):
                                    doc=doc,
                                    ))
 
-class EditInfoForm(forms.Form):
-    intended_std_level = forms.ModelChoiceField(IntendedStdLevelName.objects.filter(used=True), empty_label="(None)", required=True, label="Intended RFC status")
-    area = forms.ModelChoiceField(Group.objects.filter(type="area", state="active"), empty_label="(None - individual submission)", required=False, label="Assigned to area")
-    ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), label="Responsible AD", empty_label="(None)", required=True)
-    create_in_state = forms.ModelChoiceField(State.objects.filter(used=True, type="draft-iesg", slug__in=("pub-req", "watching")), empty_label=None, required=False)
-    notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
-    note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False, strip=False)
-    telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False, widget=forms.Select(attrs={'onchange':'make_bold()'}))
-    returning_item = forms.BooleanField(required=False)
-
-    def __init__(self, *args, **kwargs):
-        super(self.__class__, self).__init__(*args, **kwargs)
-
-        # if previous AD is now ex-AD, append that person to the list
-        ad_pk = self.initial.get('ad')
-        choices = self.fields['ad'].choices
-        if ad_pk and ad_pk not in [pk for pk, name in choices]:
-            self.fields['ad'].choices = list(choices) + [("", "-------"), (ad_pk, Person.objects.get(pk=ad_pk).plain_name())]
-        
-        # telechat choices
-        dates = [d.date for d in TelechatDate.objects.active().order_by('date')]
-        init = kwargs['initial']['telechat_date']
-        if init and init not in dates:
-            dates.insert(0, init)
-
-        self.fields['telechat_date'].choices = [("", "(not on agenda)")] + [(d, d.strftime("%Y-%m-%d")) for d in dates]
-
-        # returning item is rendered non-standard
-        self.standard_fields = [x for x in self.visible_fields() if x.name not in ('returning_item',)]
-
-    def clean_note(self):
-        return self.cleaned_data['note'].replace('\r', '').strip()
 
 def to_iesg(request,name):
     """ Submit an IETF stream document to the IESG for publication """ 
-    doc = get_object_or_404(Document, docalias__name=name, stream='ietf')
+    doc = get_object_or_404(Document, name=name, stream='ietf')
 
     if doc.get_state_slug('draft') == "expired" or doc.get_state_slug('draft-iesg') == 'pub-req' :
         raise Http404
@@ -579,22 +530,19 @@ def to_iesg(request,name):
     if request.method == 'POST':
 
         if request.POST.get("confirm", ""): 
-
             by = request.user.person
 
             events = []
-
-            changes = []
+            def doc_event(type, by, doc, desc):
+                return DocEvent.objects.create(type=type, by=by, doc=doc, rev=doc.rev, desc=desc)
 
             if doc.get_state_slug("draft-iesg") == "idexists":
-                e = DocEvent()
-                e.type = "started_iesg_process"
-                e.by = by
-                e.doc = doc
-                e.rev = doc.rev
-                e.desc = "IESG process started in state <b>%s</b>" % target_state['iesg'].name
-                e.save()
-                events.append(e)
+                events.append(doc_event("started_iesg_process", by, doc, f"Document is now in IESG state <b>{target_state['iesg'].name}</b>"))
+
+            # do this first, so AD becomes action holder
+            if not doc.ad == ad :
+                doc.ad = ad
+                events.append(doc_event("changed_document", by, doc, f"Responsible AD changed to {doc.ad}"))
 
             for state_type in ['draft-iesg','draft-stream-ietf']:
                 prev_state=doc.get_state(state_type)
@@ -606,25 +554,14 @@ def to_iesg(request,name):
                         events.append(e)
                     events.append(add_state_change_event(doc=doc,by=by,prev_state=prev_state,new_state=new_state))
 
-            if not doc.ad == ad :
-                doc.ad = ad
-                changes.append("Responsible AD changed to %s" % doc.ad)
-
             if not doc.notify == notify :
                 doc.notify = notify
-                changes.append("State Change Notice email list changed to %s" % doc.notify)
+                events.append(doc_event("changed_document", by, doc, f"State Change Notice email list changed to {doc.notify}"))
 
             # Get the last available writeup
             previous_writeup = doc.latest_event(WriteupDocEvent,type="changed_protocol_writeup")
             if previous_writeup != None:
-                changes.append(previous_writeup.text)
-
-            for c in changes:
-                e = DocEvent(doc=doc, rev=doc.rev, by=by)
-                e.desc = c
-                e.type = "changed_document"
-                e.save()
-                events.append(e)
+                events.append(doc_event("changed_document", by, doc, previous_writeup.text))
 
             doc.save_with_history(events)
 
@@ -651,16 +588,81 @@ def to_iesg(request,name):
                                    notify=notify,
                                   ))
 
-@role_required('Area Director','Secretariat')
+class EditInfoForm(forms.Form):
+    intended_std_level = forms.ModelChoiceField(
+        IntendedStdLevelName.objects.filter(used=True),
+        empty_label="(None)",
+        required=True,
+        label="Intended RFC status",
+    )
+    area = forms.ModelChoiceField(
+        Group.objects.filter(type="area", state="active"),
+        empty_label="(None - individual submission)",
+        required=False,
+        label="Assigned to area",
+    )
+    ad = forms.ModelChoiceField(
+        Person.objects.filter(
+            role__name="ad", role__group__state="active", role__group__type="area"
+        ).order_by("name"),
+        label="Responsible AD",
+        empty_label="(None)",
+        required=True,
+    )
+    notify = forms.CharField(
+        widget=forms.Textarea,
+        max_length=1023,
+        label="Notice emails",
+        help_text="Separate email addresses with commas.",
+        required=False,
+    )
+    telechat_date = forms.TypedChoiceField(
+        coerce=lambda x: datetime.datetime.strptime(x, "%Y-%m-%d").date(),
+        empty_value=None,
+        required=False,
+        widget=forms.Select(attrs={"onchange": "make_bold()"}),
+    )
+    returning_item = forms.BooleanField(required=False)
+
+    def __init__(self, *args, **kwargs):
+        super(self.__class__, self).__init__(*args, **kwargs)
+
+        # if previous AD is now ex-AD, append that person to the list
+        ad_pk = self.initial.get("ad")
+        choices = self.fields["ad"].choices
+        if ad_pk and ad_pk not in [pk for pk, name in choices]:
+            self.fields["ad"].choices = list(choices) + [
+                ("", "-------"),
+                (ad_pk, Person.objects.get(pk=ad_pk).plain_name()),
+            ]
+
+        # telechat choices
+        dates = [d.date for d in TelechatDate.objects.active().order_by("date")]
+        init = kwargs["initial"]["telechat_date"]
+        if init and init not in dates:
+            dates.insert(0, init)
+
+        self.fields["telechat_date"].choices = [("", "(not on agenda)")] + [
+            (d, d.strftime("%Y-%m-%d")) for d in dates
+        ]
+
+        # returning item is rendered non-standard
+        self.standard_fields = [
+            x for x in self.visible_fields() if x.name not in ("returning_item",)
+        ]
+
+
+@role_required("Area Director", "Secretariat")
 def edit_info(request, name):
-    """Edit various Internet Draft attributes, notifying parties as
+    """Edit various Internet-Draft attributes, notifying parties as
     necessary and logging changes as document events."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if doc.get_state_slug() == "expired":
         raise Http404
 
     new_document = False
-    if doc.get_state_slug("draft-iesg") == "idexists": # FIXME: should probably receive "new document" as argument to view instead of this
+    # FIXME: should probably receive "new document" as argument to view instead of this
+    if doc.get_state_slug("draft-iesg") == "idexists":
         new_document = True
         doc.notify = get_initial_notify(doc)
 
@@ -668,34 +670,45 @@ def edit_info(request, name):
     initial_telechat_date = e.telechat_date if e else None
     initial_returning_item = bool(e and e.returning_item)
 
-    if request.method == 'POST':
-        form = EditInfoForm(request.POST,
-                            initial=dict(ad=doc.ad_id,
-                                         telechat_date=initial_telechat_date))
+    if request.method == "POST":
+        form = EditInfoForm(
+            request.POST,
+            initial=dict(ad=doc.ad_id, telechat_date=initial_telechat_date),
+        )
         if form.is_valid():
             by = request.user.person
+            pubreq_state = State.objects.get(type="draft-iesg", slug="pub-req")
 
             r = form.cleaned_data
             events = []
 
             if new_document:
-                doc.set_state(r['create_in_state'])
+                doc.set_state(pubreq_state)
 
                 # Is setting the WG state here too much of a hidden side-effect?
-                if r['create_in_state'].slug=='pub-req':
-                    if doc.stream and doc.stream.slug=='ietf' and doc.group and doc.group.type_id == 'wg':
-                        submitted_state = State.objects.get(type='draft-stream-ietf',slug='sub-pub')
-                        doc.set_state(submitted_state)
-                        e = DocEvent()
-                        e.type = "changed_document"
-                        e.by = by
-                        e.doc = doc
-                        e.rev = doc.rev
-                        e.desc = "Working group state set to %s" % submitted_state.name
-                        e.save()
-                        events.append(e)
+                if (
+                    doc.stream
+                    and doc.stream.slug == "ietf"
+                    and doc.group
+                    and doc.group.type_id == "wg"
+                ):
+                    submitted_state = State.objects.get(
+                        type="draft-stream-ietf", slug="sub-pub"
+                    )
+                    doc.set_state(submitted_state)
+                    e = DocEvent()
+                    e.type = "changed_document"
+                    e.by = by
+                    e.doc = doc
+                    e.rev = doc.rev
+                    e.desc = "Working group state set to %s" % submitted_state.name
+                    e.save()
+                    events.append(e)
 
-                replaces = Document.objects.filter(docalias__relateddocument__source=doc, docalias__relateddocument__relationship="replaces")
+                replaces = Document.objects.filter(
+                    targets_related__source=doc,
+                    targets_related__relationship="replaces",
+                )
                 if replaces:
                     # this should perhaps be somewhere else, e.g. the
                     # place where the replace relationship is established?
@@ -704,7 +717,10 @@ def edit_info(request, name):
                     e.by = Person.objects.get(name="(System)")
                     e.doc = doc
                     e.rev = doc.rev
-                    e.desc = "Earlier history may be found in the Comment Log for <a href=\"%s\">%s</a>" % (replaces[0], replaces[0].get_absolute_url())
+                    e.desc = (
+                        'Earlier history may be found in the Comment Log for <a href="%s">%s</a>'
+                        % (replaces[0], replaces[0].get_absolute_url())
+                    )
                     e.save()
                     events.append(e)
 
@@ -713,7 +729,10 @@ def edit_info(request, name):
                 e.by = by
                 e.doc = doc
                 e.rev = doc.rev
-                e.desc = "IESG process started in state <b>%s</b>" % doc.get_state("draft-iesg").name
+                e.desc = (
+                    "Document is now in IESG state <b>%s</b>"
+                    % doc.get_state("draft-iesg").name
+                )
                 e.save()
                 events.append(e)
 
@@ -723,9 +742,9 @@ def desc(attr, new, old):
                 entry = "%(attr)s changed to <b>%(new)s</b> from <b>%(old)s</b>"
                 if new_document:
                     entry = "%(attr)s changed to <b>%(new)s</b>"
-                
+
                 return entry % dict(attr=attr, new=new, old=old)
-            
+
             def diff(attr, name):
                 v = getattr(doc, attr)
                 if r[attr] != v:
@@ -733,21 +752,9 @@ def diff(attr, name):
                     setattr(doc, attr, r[attr])
 
             # update the attributes, keeping track of what we're doing
-            diff('intended_std_level', "Intended Status")
-            diff('ad', "Responsible AD")
-            diff('notify', "State Change Notice email list")
-
-            if r['note'] != doc.note:
-                if not r['note']:
-                    if doc.note:
-                        changes.append("Note field has been cleared")
-                else:
-                    if doc.note:
-                        changes.append("Note changed to '%s'" % r['note'])
-                    else:
-                        changes.append("Note added '%s'" % r['note'])
-                    
-                doc.note = r['note']
+            diff("intended_std_level", "Intended Status")
+            diff("ad", "Responsible AD")
+            diff("notify", "State Change Notice email list")
 
             if doc.group.type_id in ("individ", "area"):
                 if not r["area"]:
@@ -761,12 +768,16 @@ def diff(attr, name):
                     doc.group = r["area"]
 
             for c in changes:
-                events.append(DocEvent.objects.create(doc=doc, rev=doc.rev, by=by, desc=c, type="changed_document"))
+                events.append(
+                    DocEvent.objects.create(
+                        doc=doc, rev=doc.rev, by=by, desc=c, type="changed_document"
+                    )
+                )
 
             # Todo - chase this
-            e = update_telechat(request, doc, by,
-                                r['telechat_date'], r['returning_item'])
-
+            e = update_telechat(
+                request, doc, by, r["telechat_date"], r["returning_item"]
+            )
             if e:
                 events.append(e)
 
@@ -774,46 +785,49 @@ def diff(attr, name):
 
             if new_document:
                 # If we created a new doc, update the action holders as though it
-                # started in idexists and moved to its create_in_state. Do this
+                # started in idexists and moved to pub-req. Do this
                 # after the doc has been updated so, e.g., doc.ad is set.
                 update_action_holders(
                     doc,
-                    State.objects.get(type='draft-iesg', slug='idexists'),
-                    r['create_in_state']
+                    State.objects.get(type="draft-iesg", slug="idexists"),
+                    pubreq_state,
                 )
 
             if changes:
                 email_iesg_processing_document(request, doc, changes)
-                
+
             return HttpResponseRedirect(doc.get_absolute_url())
     else:
-        init = dict(intended_std_level=doc.intended_std_level_id,
-                    area=doc.group_id,
-                    ad=doc.ad_id,
-                    notify=doc.notify,
-                    note=doc.note,
-                    telechat_date=initial_telechat_date,
-                    returning_item=initial_returning_item,
-                    )
+        init = dict(
+            intended_std_level=doc.intended_std_level_id,
+            area=doc.group_id,
+            ad=doc.ad_id,
+            notify=doc.notify,
+            telechat_date=initial_telechat_date,
+            returning_item=initial_returning_item,
+        )
 
         form = EditInfoForm(initial=init)
 
     # optionally filter out some fields
-    if not new_document:
-        form.standard_fields = [x for x in form.standard_fields if x.name != "create_in_state"]
     if doc.group.type_id not in ("individ", "area"):
         form.standard_fields = [x for x in form.standard_fields if x.name != "area"]
 
-    return render(request, 'doc/draft/edit_info.html',
-                              dict(doc=doc,
-                                   form=form,
-                                   user=request.user,
-                                   ballot_issued=doc.latest_event(type="sent_ballot_announcement")))
+    return render(
+        request,
+        "doc/draft/edit_info.html",
+        dict(
+            doc=doc,
+            form=form,
+            user=request.user,
+            ballot_issued=doc.latest_event(type="sent_ballot_announcement"),
+        ),
+    )
 
 @role_required('Area Director','Secretariat')
 def request_resurrect(request, name):
-    """Request resurrect of expired Internet Draft."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    """Request resurrect of expired Internet-Draft."""
+    doc = get_object_or_404(Document, name=name)
     if doc.get_state_slug() != "expired":
         raise Http404
 
@@ -835,8 +849,8 @@ def request_resurrect(request, name):
 
 @role_required('Secretariat')
 def resurrect(request, name):
-    """Resurrect expired Internet Draft."""
-    doc = get_object_or_404(Document, docalias__name=name)
+    """Resurrect expired Internet-Draft."""
+    doc = get_object_or_404(Document, name=name)
     if doc.get_state_slug() != "expired":
         raise Http404
 
@@ -857,7 +871,7 @@ def resurrect(request, name):
         events.append(e)
 
         doc.set_state(State.objects.get(used=True, type="draft", slug="active"))
-        doc.expires = datetime.datetime.now() + datetime.timedelta(settings.INTERNET_DRAFT_DAYS_TO_EXPIRE)
+        doc.expires = timezone.now() + datetime.timedelta(settings.INTERNET_DRAFT_DAYS_TO_EXPIRE)
         doc.save_with_history(events)
 
         restore_draft_file(request, doc)
@@ -877,59 +891,21 @@ def restore_draft_file(request, draft):
     log.log("Resurrecting %s.  Moving files:" % draft.name)
     for file in files:
         try:
+            # ghostlinkd would keep this in the combined all archive since it would
+            # be sourced from a different place. But when ghostlinkd is removed, nothing
+            # new is needed here - the file will already exist in the combined archive
             shutil.move(file, settings.INTERNET_DRAFT_PATH)
             log.log("  Moved file %s to %s" % (file, settings.INTERNET_DRAFT_PATH))
         except shutil.Error as ex:
-            messages.warning(request, 'There was an error restoring the draft file: {} ({})'.format(file, ex))
+            messages.warning(request, 'There was an error restoring the Internet-Draft file: {} ({})'.format(file, ex))
             log.log("  Exception %s when attempting to move %s" % (ex, file))
+        _, ext = os.path.splitext(os.path.basename(file))
+        if ext:
+            ext = ext[1:]
+            blobname = f"{ext}/{basename}.{ext}"
+            store_bytes("active-draft", blobname, retrieve_bytes("draft", blobname))
 
 
-class IESGNoteForm(forms.Form):
-    note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False, strip=False)
-
-    def clean_note(self):
-        # not munging the database content to use html line breaks --
-        # that has caused a lot of pain in the past.
-        return self.cleaned_data['note'].replace('\r', '').strip()
-
-@role_required("Area Director", "Secretariat")
-def edit_iesg_note(request, name):
-    doc = get_object_or_404(Document, type="draft", name=name)
-    login = request.user.person
-
-    initial = dict(note=doc.note)
-
-    if request.method == "POST":
-        form = IESGNoteForm(request.POST, initial=initial)
-
-        if form.is_valid():
-            new_note = form.cleaned_data['note']
-            if new_note != doc.note:
-                if not new_note:
-                    if doc.note:
-                        log_message = "Note field has been cleared"
-                else:
-                    if doc.note:
-                        log_message = "Note changed to '%s'" % new_note
-                    else:
-                        log_message = "Note added '%s'" % new_note
-
-                c = DocEvent(type="added_comment", doc=doc, rev=doc.rev, by=login)
-                c.desc = log_message
-                c.save()
-
-                doc.note = new_note
-                doc.save_with_history([c])
-
-            return redirect('ietf.doc.views_doc.document_main', name=doc.name)
-    else:
-        form = IESGNoteForm(initial=initial)
-
-    return render(request, 'doc/draft/edit_iesg_note.html',
-                              dict(doc=doc,
-                                   form=form,
-                                   ))
-
 class ShepherdWriteupUploadForm(forms.Form):
     content = forms.CharField(widget=forms.Textarea, label="Shepherd writeup", help_text="Edit the shepherd writeup.", required=False, strip=False)
     txt = forms.FileField(label=".txt format", help_text="Or upload a .txt file.", required=False)
@@ -989,14 +965,16 @@ def edit_shepherd_writeup(request, name):
                 return redirect("ietf.doc.views_doc.document_main", name=doc.name)
 
         elif "reset_text" in request.POST:
+            if not doc.group.type.slug or doc.group.type.slug != "wg":
+                generate_type = "individ"
+            else:
+                generate_type = "group"           
             init = {
                 "content": render_to_string(
                     "doc/shepherd_writeup.txt",
                     dict(
                         doc=doc,
-                        type="individ"
-                        if not doc.group.type.slug or doc.group.type.slug != "ietf"
-                        else "group",
+                        type=generate_type,
                         stream=doc.stream.slug,
                         group=doc.group.type.slug,
                     ),
@@ -1020,13 +998,15 @@ def edit_shepherd_writeup(request, name):
         if previous_writeup:
             init["content"] = previous_writeup.text
         else:
+            if not doc.group.type.slug or doc.group.type.slug != "wg":
+                generate_type = "individ"
+            else:
+                generate_type = "group"
             init["content"] = render_to_string(
                 "doc/shepherd_writeup.txt",
                 dict(
                     doc=doc,
-                    type="individ"
-                    if not doc.group.type.slug or doc.group.type.slug != "wg"
-                    else "group",
+                    type=generate_type,
                     stream=doc.stream.slug,
                     group=doc.group.type.slug,
                 ),
@@ -1170,7 +1150,7 @@ def clean_ad(self):
         state = self.doc.get_state('draft-iesg')
         if not ad:
             if state.slug not in ['idexists','dead']:
-                raise forms.ValidationError("Drafts in state %s must have an assigned AD." % state)
+                raise forms.ValidationError("Internet-Drafts in state %s must have an assigned AD." % state)
         return ad
 
 @role_required("Area Director", "Secretariat")
@@ -1277,11 +1257,11 @@ class PublicationForm(forms.Form):
         subject = forms.CharField(max_length=200, required=True)
         body = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
-    doc = get_object_or_404(Document, type="draft", name=name, stream__in=("iab", "ise", "irtf"))
+    doc = get_object_or_404(Document, type="draft", name=name, stream__in=("iab", "ise", "irtf", "editorial"))
 
-    if not is_authorized_in_doc_stream(request.user, doc):
+    if not can_request_rfc_publication(request.user, doc):
         permission_denied(request, "You do not have the necessary permissions to view this page.")
-
+ 
     consensus_event = doc.latest_event(ConsensusDocEvent, type="changed_consensus")
 
     m = Message()
@@ -1362,63 +1342,163 @@ class PublicationForm(forms.Form):
                           )
 
 class AdoptDraftForm(forms.Form):
-    group = forms.ModelChoiceField(queryset=Group.objects.filter(type__features__acts_like_wg=True, state="active").order_by("-type", "acronym"), required=True, empty_label=None)
-    newstate = forms.ModelChoiceField(queryset=State.objects.filter(type__in=['draft-stream-ietf','draft-stream-irtf'], used=True).exclude(slug__in=settings.GROUP_STATES_WITH_EXTRA_PROCESSING), required=True, label="State")
-    comment = forms.CharField(widget=forms.Textarea, required=False, label="Comment", help_text="Optional comment explaining the reasons for the adoption.", strip=False)
+    group = forms.ModelChoiceField(
+        queryset=Group.objects.filter(type__features__acts_like_wg=True, state="active")
+        .order_by("-type", "acronym")
+        .distinct(),
+        required=True,
+        empty_label=None,
+    )
+    newstate = forms.ModelChoiceField(
+        queryset=State.objects.filter(
+            type__in=[
+                "draft-stream-ietf",
+                "draft-stream-irtf",
+                "draft-stream-editorial",
+            ],
+            used=True,
+        ).exclude(slug__in=settings.GROUP_STATES_WITH_EXTRA_PROCESSING),
+        required=True,
+        label="State",
+    )
+    comment = forms.CharField(
+        widget=forms.Textarea,
+        required=False,
+        label="Comment",
+        help_text="Optional comment explaining the reasons for the adoption.",
+        strip=False,
+    )
     weeks = forms.IntegerField(required=False, label="Expected weeks in adoption state")
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop("user")
-        rg_features = GroupFeatures.objects.get(type_id='rg')
-        wg_features = GroupFeatures.objects.get(type_id='wg')
-
         super(AdoptDraftForm, self).__init__(*args, **kwargs)
 
+        docman_roles = {}
+        for group_type in ("wg", "ag", "rg", "rag", "edwg"):
+            docman_roles[group_type] = GroupFeatures.objects.get(
+                type_id=group_type
+            ).docman_roles
+
         state_types = set()
         if has_role(user, "Secretariat"):
-            state_types.update(['draft-stream-ietf','draft-stream-irtf'])
-        else: 
-            if (has_role(user, "IRTF Chair")
-                or Group.objects.filter(type="rg",
-                                        state="active",
-                                        role__person__user=user,
-                                        role__name__in=rg_features.docman_roles).exists()):
-                state_types.add('draft-stream-irtf')
-            if Group.objects.filter(    type="wg",
-                                        state="active",
-                                        role__person__user=user,
-                                        role__name__in=wg_features.docman_roles).exists():
-                state_types.add('draft-stream-ietf')
-
-        state_choices = State.objects.filter(type__in=state_types, used=True).exclude(slug__in=settings.GROUP_STATES_WITH_EXTRA_PROCESSING)
+            state_types.update(
+                ["draft-stream-ietf", "draft-stream-irtf", "draft-stream-editorial"]
+            )
+        else:
+            if has_role(user, "IRTF Chair") or any(
+                [
+                    Group.objects.filter(
+                        type=type_id,
+                        state="active",
+                        role__person__user=user,
+                        role__name__in=docman_roles[type_id],
+                    ).exists()
+                    for type_id in ("rg", "rag")
+                ]
+            ):
+                state_types.add("draft-stream-irtf")
+            if any(
+                [
+                    Group.objects.filter(
+                        type=type_id,
+                        state="active",
+                        role__person__user=user,
+                        role__name__in=docman_roles[type_id],
+                    ).exists()
+                    for type_id in ("wg", "ag")
+                ]
+            ):
+                state_types.add("draft-stream-ietf")
+            if Group.objects.filter(
+                type="edwg",
+                state="active",
+                role__person__user=user,
+                role__name__in=docman_roles["edwg"],
+            ).exists():
+                state_types.add("draft-stream-editorial")
+
+        state_choices = State.objects.filter(type__in=state_types, used=True).exclude(
+            slug__in=settings.GROUP_STATES_WITH_EXTRA_PROCESSING
+        )
 
         if not has_role(user, "Secretariat"):
+            allow_matching_groups = []
             if has_role(user, "IRTF Chair"):
-                group_queryset = self.fields["group"].queryset.filter(Q(role__person__user=user, role__name__in=rg_features.docman_roles)|Q(type="rg", state="active")).distinct()
-            else:
-                group_queryset = self.fields["group"].queryset.filter(role__person__user=user, role__name__in=wg_features.docman_roles).distinct()
-            self.fields["group"].queryset = group_queryset
-
-        self.fields['group'].choices = [(g.pk, '%s - %s' % (g.acronym, g.name)) for g in self.fields["group"].queryset]
-        self.fields['newstate'].choices = [('','-- Pick a state --')]
-        self.fields['newstate'].choices.extend([(x.pk,x.name + " (IETF)") for x in state_choices if x.type_id == 'draft-stream-ietf'])
-        self.fields['newstate'].choices.extend([(x.pk,x.name + " (IRTF)") for x in state_choices if x.type_id == 'draft-stream-irtf'])
+                allow_matching_groups.append(Q(type__in=["rg", "rag"]))
+            for type_id in docman_roles:
+                allow_matching_groups.append(
+                    Q(
+                        role__person__user=user,
+                        role__name__in=docman_roles[type_id],
+                        type_id=type_id,
+                    )
+                )
+            combined_query = Q(pk__in=[]) # Never use Q() here when following this pattern
+            for query in allow_matching_groups:
+                combined_query |= query
+        
+            self.fields["group"].queryset = self.fields["group"].queryset.filter(combined_query)
+
+        self.fields["group"].choices = [
+            (g.pk, "%s - %s" % (g.acronym, g.name))
+            for g in self.fields["group"].queryset
+        ]
+        self.fields["newstate"].choices = [("", "-- Pick a state --")]
+        self.fields["newstate"].choices.extend(
+            [
+                (x.pk, x.name + " (IETF)")
+                for x in state_choices
+                if x.type_id == "draft-stream-ietf"
+            ]
+        )
+        self.fields["newstate"].choices.extend(
+            [
+                (x.pk, x.name + " (IRTF)")
+                for x in state_choices
+                if x.type_id == "draft-stream-irtf"
+            ]
+        )
+        self.fields["newstate"].choices.extend(
+            [
+                (x.pk, x.name + " (Editorial)")
+                for x in state_choices
+                if x.type_id == "draft-stream-editorial"
+            ]
+        )
 
     def clean_newstate(self):
-        group = self.cleaned_data['group']
-        newstate = self.cleaned_data['newstate']
-        
-        if (newstate.type_id == 'draft-stream-ietf') and (group.type_id == 'rg'):
-            raise forms.ValidationError('Cannot assign IETF WG state to IRTF group')
-        elif (newstate.type_id == 'draft-stream-irtf') and (group.type_id == 'wg'):
-            raise forms.ValidationError('Cannot assign IRTF RG state to IETF group')
-        else:
-            return newstate
-               
+        group = self.cleaned_data["group"]
+        newstate = self.cleaned_data["newstate"]
+
+        ok_to_assign = (
+            ("draft-stream-ietf", ("wg", "ag")),
+            ("draft-stream-irtf", ("rg", "rag")),
+            ("draft-stream-editorial", ("edwg",)),
+        )
+        ok = True
+        for stream, types in ok_to_assign:
+            if newstate.type_id == stream and group.type_id not in types:
+                ok = False
+                break
+        if not ok:
+            state_type_text = newstate.type_id.split("-")[-1].upper()
+            group_type_text = {
+                "wg": "IETF Working Group",
+                "ag": "IETF Area Group",
+                "rg": "IRTF Research Group",
+                "rag": "IRTF Area Group",
+                "edwg": "Editorial Stream Working Group",
+            }[group.type_id]
+            raise forms.ValidationError(
+                f"Cannot assign {state_type_text} state to a {group_type_text}"
+            )
+        return newstate
+
+
 @login_required
 def adopt_draft(request, name):
     doc = get_object_or_404(Document, type="draft", name=name)
-
     if not can_adopt_draft(request.user, doc):
         permission_denied(request, "You don't have permission to access this page.")
 
@@ -1431,8 +1511,10 @@ def adopt_draft(request, name):
             events = []
 
             group = form.cleaned_data["group"]
-            if group.type.slug == "rg":
-                new_stream = StreamName.objects.get(slug="irtf")                
+            if group.type.slug in ("rg", "rag"):
+                new_stream = StreamName.objects.get(slug="irtf") 
+            elif group.type.slug =="edwg":
+                new_stream = StreamName.objects.get(slug="editorial")               
             else:
                 new_stream = StreamName.objects.get(slug="ietf")                
 
@@ -1451,6 +1533,13 @@ def adopt_draft(request, name):
                 if old_stream != None:
                     email_stream_changed(request, doc, old_stream, new_stream)
 
+                # Force intended std level here if stream isn't ietf
+                if new_stream.slug != "ietf":
+                    old_level = doc.intended_std_level
+                    new_level = IntendedStdLevelName.objects.get(slug="inf", used=True)
+                    set_intended_status_level(request=request, doc=doc, new_level=new_level, old_level=old_level, comment="")
+
+
             # group
             if group != doc.group:
                 e = DocEvent(type="changed_group", doc=doc, rev=doc.rev, by=by)
@@ -1475,11 +1564,13 @@ def adopt_draft(request, name):
                 events.append(e)
 
                 due_date = None
-                if form.cleaned_data["weeks"] != None:
-                    due_date = datetime.date.today() + datetime.timedelta(weeks=form.cleaned_data["weeks"])
+                if form.cleaned_data["weeks"] is not None:
+                    due_date = datetime_today(DEADLINE_TZINFO) + datetime.timedelta(weeks=form.cleaned_data["weeks"])
 
                 update_reminder(doc, "stream-s", e, due_date)
 
+                # The following call name is very misleading - the view allows 
+                # setting states that are _not_ the adopted state.
                 email_adopted(request, doc, prev_state, new_state, by, comment)
 
             # comment
@@ -1577,7 +1668,7 @@ class ChangeStreamStateForm(forms.Form):
     new_state = forms.ModelChoiceField(queryset=State.objects.filter(used=True), label='State' )
     weeks = forms.IntegerField(label='Expected weeks in state',required=False)
     comment = forms.CharField(widget=forms.Textarea, required=False, help_text="Optional comment for the document history.", strip=False)
-    tags = forms.ModelMultipleChoiceField(queryset=DocTagName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False)
+    tags = ModelMultipleChoiceField(queryset=DocTagName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False)
 
     def __init__(self, *args, **kwargs):
         doc = kwargs.pop("doc")
@@ -1593,11 +1684,14 @@ def __init__(self, *args, **kwargs):
             f.queryset = f.queryset.exclude(pk__in=unused_states)
         f.label = state_type.label
         if self.stream.slug == 'ietf':
+            help_text_items = []
             if self.can_set_sub_pub:
-                f.help_text = "Only select 'Submitted to IESG for Publication' to correct errors. Use the document's main page to request publication."
+                help_text_items.append("Only select 'Submitted to IESG for Publication' to correct errors. This is not how to submit a document to the IESG.")
             else:
                 f.queryset = f.queryset.exclude(slug='sub-pub')
-                f.help_text = "You may not set the 'Submitted to IESG for Publication' using this form - Use the document's main page to request publication."
+                help_text_items.append("You may not set the 'Submitted to IESG for Publication' using this form - Use the button above or the document's main page to request publication.")
+            help_text_items.append("Only use this form in unusual circumstances when issuing call for adoption or working group last call.")
+            f.help_text = " ".join(help_text_items)
 
         f = self.fields['tags']
         f.queryset = f.queryset.filter(slug__in=get_tags_for_stream_id(doc.stream_id))
@@ -1608,7 +1702,7 @@ def __init__(self, *args, **kwargs):
     def clean_new_state(self):
         new_state = self.cleaned_data.get('new_state')
         if new_state.slug=='sub-pub' and not self.can_set_sub_pub:
-            raise forms.ValidationError('You may not set the %s state using this form. Use the "Submit to IESG for publication" button on the document\'s main page instead. If that button does not appear, the document may already have IESG state. Ask your Area Director or the Secretariat for help.'%new_state.name)
+            raise forms.ValidationError('You may not set the %s state using this form. Use the "Submit to IESG for Publication" button on the document\'s main page instead. If that button does not appear, the document may already have IESG state. Ask your Area Director or the Secretariat for help.'%new_state.name)
         return new_state
          
 
@@ -1634,6 +1728,19 @@ def next_states_for_stream_state(doc, state_type, current_state):
 
     return next_states
 
+@login_required
+def offer_wg_action_helpers(request, name):
+    doc = get_object_or_404(Document, type="draft", name=name)
+    if doc.stream is None or doc.stream_id != "ietf" or doc.became_rfc() is not None:
+        raise Http404
+
+    if not is_authorized_in_doc_stream(request.user, doc):
+        permission_denied(request, "You don't have permission to access this page.")
+    
+    return render(request, "doc/draft/wg_action_helpers.html",
+                              {"doc": doc,
+                              })
+
 @login_required
 def change_stream_state(request, name, state_type):
     doc = get_object_or_404(Document, type="draft", name=name)
@@ -1648,10 +1755,17 @@ def change_stream_state(request, name, state_type):
     prev_state = doc.get_state(state_type.slug)
     next_states = next_states_for_stream_state(doc, state_type, prev_state)
 
+    # These tell the form to allow directly setting the state to fix up errors.
     can_set_sub_pub = has_role(request.user,('Secretariat','Area Director')) or (prev_state and prev_state.slug=='sub-pub')
 
     if request.method == 'POST':
-        form = ChangeStreamStateForm(request.POST, doc=doc, state_type=state_type,can_set_sub_pub=can_set_sub_pub,stream=doc.stream)
+        form = ChangeStreamStateForm(
+            request.POST,
+            doc=doc,
+            state_type=state_type,
+            can_set_sub_pub=can_set_sub_pub,
+            stream=doc.stream,
+        )
         if form.is_valid():
             by = request.user.person
             events = []
@@ -1666,13 +1780,13 @@ def change_stream_state(request, name, state_type):
                 events.append(e)
 
                 due_date = None
-                if form.cleaned_data["weeks"] != None:
-                    due_date = datetime.date.today() + datetime.timedelta(weeks=form.cleaned_data["weeks"])
+                if form.cleaned_data["weeks"] is not None:
+                    due_date = datetime_today(DEADLINE_TZINFO) + datetime.timedelta(weeks=form.cleaned_data["weeks"])
 
                 update_reminder(doc, "stream-s", e, due_date)
 
                 email_stream_state_changed(request, doc, prev_state, new_state, by, comment)
-
+                    
             # tags
             existing_tags = set(doc.tags.all())
             new_tags = set(form.cleaned_data["tags"])
@@ -1708,8 +1822,15 @@ def change_stream_state(request, name, state_type):
             else:
                 form.add_error(None, "No change in state or tags found, and no comment provided -- nothing to do.")
     else:
-        form = ChangeStreamStateForm(initial=dict(new_state=prev_state.pk if prev_state else None, tags= doc.tags.all()),
-                                     doc=doc, state_type=state_type, can_set_sub_pub = can_set_sub_pub,stream = doc.stream)
+        form = ChangeStreamStateForm(
+            initial=dict(
+                new_state=prev_state.pk if prev_state else None, tags=doc.tags.all()
+            ),
+            doc=doc,
+            state_type=state_type,
+            can_set_sub_pub=can_set_sub_pub,
+            stream=doc.stream,
+        )
 
     milestones = doc.groupmilestone_set.all()
 
@@ -1721,3 +1842,358 @@ def change_stream_state(request, name, state_type):
                                "state_type": state_type,
                                "next_states": next_states,
                               })
+
+# This should be in ietf.doc.utils, but placing it there brings a circular import issue with ietf.doc.mail
+def set_intended_status_level(request, doc, new_level, old_level, comment):
+    if new_level != old_level:
+        doc.intended_std_level = new_level
+
+        events = []
+        e = DocEvent(doc=doc, rev=doc.rev, by=request.user.person, type='changed_document')
+        e.desc = "Intended Status changed to <b>%s</b> from %s"% (new_level,old_level) 
+        e.save()
+        events.append(e)
+
+        if comment:
+            c = DocEvent(doc=doc, rev=doc.rev, by=request.user.person, type="added_comment")
+            c.desc = comment
+            c.save()
+            events.append(c)
+
+        de = doc.latest_event(ConsensusDocEvent, type="changed_consensus")
+        prev_consensus = de and de.consensus
+        if not prev_consensus and doc.intended_std_level_id in ("std", "ds", "ps", "bcp"):
+            ce = ConsensusDocEvent(doc=doc, rev=doc.rev, by=request.user.person, type="changed_consensus")
+            ce.consensus = True
+            ce.desc = "Changed consensus to <b>%s</b> from %s" % (nice_consensus(True),
+                                                                    nice_consensus(prev_consensus))
+            ce.save()
+            events.append(ce)
+
+        doc.save_with_history(events)
+
+        msg = "\n".join(e.desc for e in events)
+
+        email_intended_status_changed(request, doc, msg)
+
+class IssueWorkingGroupLastCallForm(forms.Form):
+    end_date = DatepickerDateField(
+        required=True,
+        date_format="yyyy-mm-dd",
+        picker_settings={
+            "autoclose": "1",
+        },
+        help_text="The date the Last Call closes. If you change this, review the subject and body carefully to ensure the change is captured correctly.",
+    )
+
+    to = MultiEmailField(
+        required=True,
+        help_text="Comma separated list of address to use in the To: header",
+    )
+    cc = MultiEmailField(
+        required=False, help_text="Comma separated list of addresses to copy"
+    )
+    subject = forms.CharField(
+        required=True,
+        help_text="Subject for Last Call message. If you change the date here, be sure to make a matching change in the body.",
+    )
+    body = forms.CharField(
+        widget=forms.Textarea, required=True, help_text="Body for Last Call message"
+    )
+
+    def clean_end_date(self):
+        end_date = self.cleaned_data["end_date"]
+        if end_date <= date_today(DEADLINE_TZINFO):
+            raise forms.ValidationError("End date must be later than today")
+        return end_date
+
+    def clean(self):
+        cleaned_data = super().clean()
+        end_date = cleaned_data.get("end_date")
+        if end_date is not None:
+            body = cleaned_data.get("body")
+            subject = cleaned_data.get("subject")
+            if end_date.isoformat() not in body:
+                self.add_error(
+                    "body",
+                    forms.ValidationError(
+                        f"Last call end date ({end_date.isoformat()}) not found in body"
+                    ),
+                )
+            if end_date.isoformat() not in subject:
+                self.add_error(
+                    "subject",
+                    forms.ValidationError(
+                        f"Last call end date ({end_date.isoformat()}) not found in subject"
+                    ),
+                )
+        return cleaned_data
+
+
+@login_required
+def issue_wg_lc(request, name):
+    doc = get_object_or_404(Document, name=name)
+
+    if doc.stream_id != "ietf":
+        raise Http404
+    if doc.type_id != "draft" or doc.group.type_id != "wg":
+        raise Http404
+    if doc.get_state_slug("draft-stream-ietf") == "wg-lc":
+        raise Http404
+    if doc.get_state_slug("draft") == "rfc":
+        raise Http404
+
+    if not is_authorized_in_doc_stream(request.user, doc):
+        permission_denied(request, "You don't have permission to access this page.")
+
+    if request.method == "POST":
+        form = IssueWorkingGroupLastCallForm(request.POST)
+        if form.is_valid():
+            # Intentionally not changing tags or adding a comment
+            # those things can be done with other workflows
+            by = request.user.person
+            prev_state = doc.get_state("draft-stream-ietf")
+            events = []
+            wglc_state = State.objects.get(type="draft-stream-ietf", slug="wg-lc")
+            doc.set_state(wglc_state)
+            e = add_state_change_event(doc, by, prev_state, wglc_state)
+            events.append(e)
+            end_date = form.cleaned_data["end_date"]
+            update_reminder(
+                doc, "stream-s", e, datetime_from_date(end_date, DEADLINE_TZINFO)
+            )
+            doc.save_with_history(events)
+            email_stream_state_changed(request, doc, prev_state, wglc_state, by)
+            send_mail_text(
+                request, 
+                to = form.cleaned_data["to"], 
+                frm = request.user.person.formatted_email(),
+                subject = form.cleaned_data["subject"], 
+                txt = form.cleaned_data["body"],
+                cc = form.cleaned_data["cc"],
+            )
+            return redirect("ietf.doc.views_doc.document_main", name=doc.name)
+    else:
+        end_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=14)
+        subject = f"WG Last Call: {doc.name}-{doc.rev} (Ends {end_date})"
+        body = render_to_string(
+            "doc/mail/wg_last_call_issued.txt",
+            dict(
+                doc=doc,
+                end_date=end_date,
+                wg_list=doc.group.list_email,
+                settings=settings,
+            ),
+        )
+        (to, cc) = gather_address_lists("doc_wg_last_call_issued", doc=doc)
+
+        form = IssueWorkingGroupLastCallForm(
+            initial=dict(
+                end_date=end_date,
+                to=", ".join(to),
+                cc=", ".join(cc),
+                subject=subject,
+                body=body,
+            )
+        )
+
+    return render(
+        request,
+        "doc/draft/issue_working_group_last_call.html",
+        dict(
+            doc=doc,
+            form=form,
+        ),
+    )
+
+class IssueCallForAdoptionForm(forms.Form):
+    end_date = DatepickerDateField(
+        required=True,
+        date_format="yyyy-mm-dd",
+        picker_settings={
+            "autoclose": "1",
+        },
+        help_text="The date the Call for Adoption closes. If you change this, review the subject and body carefully to ensure the change is captured correctly.",
+    )
+
+    to = MultiEmailField(
+        required=True,
+        help_text="Comma separated list of address to use in the To: header",
+    )
+    cc = MultiEmailField(
+        required=False, help_text="Comma separated list of addresses to copy"
+    )
+    subject = forms.CharField(
+        required=True,
+        help_text="Subject for Call for Adoption message. If you change the date here, be sure to make a matching change in the body.",
+    )
+    body = forms.CharField(
+        widget=forms.Textarea, required=True, help_text="Body for Call for Adoption message"
+    )
+
+    def clean_end_date(self):
+        end_date = self.cleaned_data["end_date"]
+        if end_date <= date_today(DEADLINE_TZINFO):
+            raise forms.ValidationError("End date must be later than today")
+        return end_date
+
+    def clean(self):
+        cleaned_data = super().clean()
+        end_date = cleaned_data.get("end_date")
+        if end_date is not None:
+            body = cleaned_data.get("body")
+            subject = cleaned_data.get("subject")
+            if end_date.isoformat() not in body:
+                self.add_error(
+                    "body",
+                    forms.ValidationError(
+                        f"Call for adoption end date ({end_date.isoformat()}) not found in body"
+                    ),
+                )
+            if end_date.isoformat() not in subject:
+                self.add_error(
+                    "subject",
+                    forms.ValidationError(
+                        f"Call for adoption end date ({end_date.isoformat()}) not found in subject"
+                    ),
+                )
+        return cleaned_data
+
+@login_required
+def issue_wg_call_for_adoption(request, name, acronym):
+    doc = get_object_or_404(Document, name=name)
+    group = Group.objects.filter(acronym=acronym, type_id="wg").first()
+    reject = False
+    if group is None or doc.type_id != "draft" or not is_doc_ietf_adoptable(doc):
+        reject = True
+    if doc.stream is None:
+        if not can_adopt_draft(request.user, doc):
+            reject = True
+    elif doc.stream_id != "ietf":
+        reject = True
+    else: # doc.stream_id == "ietf"
+        if not is_authorized_in_doc_stream(request.user, doc):
+            reject = True
+    if reject:
+        raise permission_denied(request, f"You can't issue a {acronym} wg call for adoption for this document.")
+
+    if request.method == "POST":
+        form = IssueCallForAdoptionForm(request.POST)
+        if form.is_valid():
+            # Intentionally not changing tags or adding a comment
+            # those things can be done with other workflows
+            by = request.user.person
+
+            events = []
+            if doc.stream_id != "ietf":
+                stream = StreamName.objects.get(slug="ietf")
+                doc.stream = stream
+                e = DocEvent(type="changed_stream", doc=doc, rev=doc.rev, by=by)
+                e.desc = f"Changed stream to <b>{stream.name}</b>"  # Propogates embedding html in DocEvent.desc for consistency
+                e.save()
+                events.append(e)
+            if doc.group != group:
+                doc.group = group
+                e = DocEvent(type="changed_group", doc=doc, rev=doc.rev, by=by)
+                e.desc = f"Changed group to <b>{group.name} ({group.acronym.upper()})</b>"  # Even if it makes the cats cry
+                e.save()
+                events.append(e)
+            prev_state = doc.get_state("draft-stream-ietf")
+            c_adopt_state = State.objects.get(type="draft-stream-ietf", slug="c-adopt")
+            doc.set_state(c_adopt_state)
+            e = add_state_change_event(doc, by, prev_state, c_adopt_state)
+            events.append(e)
+            end_date = form.cleaned_data["end_date"]
+            update_reminder(
+                doc, "stream-s", e, datetime_from_date(end_date, DEADLINE_TZINFO)
+            )
+            doc.save_with_history(events)
+            email_stream_state_changed(request, doc, prev_state, c_adopt_state, by)
+            send_mail_text(
+                request, 
+                to = form.cleaned_data["to"], 
+                frm = request.user.person.formatted_email(),
+                subject = form.cleaned_data["subject"], 
+                txt = form.cleaned_data["body"],
+                cc = form.cleaned_data["cc"],
+            )
+            return redirect("ietf.doc.views_doc.document_main", name=doc.name)
+    else:
+        end_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=14)
+        subject = f"Call for adoption: {doc.name}-{doc.rev}  (Ends {end_date})"
+        body = render_to_string(
+            "doc/mail/wg_call_for_adoption_issued.txt",
+            dict(
+                doc=doc,
+                group=group,
+                end_date=end_date,
+                wg_list=doc.group.list_email,
+                settings=settings,
+            ),
+        )
+        (to, cc) = gather_address_lists("doc_wg_call_for_adoption_issued", doc=doc)
+        if doc.group.acronym == "none":
+            to.insert(0, f"{group.acronym}-chairs@ietf.org")
+            to.insert(0, group.list_email)
+        form = IssueCallForAdoptionForm(
+            initial=dict(
+                end_date=end_date,
+                to=", ".join(to),
+                cc=", ".join(cc),
+                subject=subject,
+                body=body,
+            )
+        )
+
+    return render(
+        request,
+        "doc/draft/issue_working_group_call_for_adoption.html",
+        dict(
+            doc=doc,
+            form=form,
+        ),
+    )
+
+class GroupModelChoiceField(forms.ModelChoiceField):
+    def label_from_instance(self, obj):
+        return f"{obj.acronym} - {obj.name}"
+
+
+class WgForm(forms.Form):
+    group = GroupModelChoiceField(
+        queryset=Group.objects.filter(type_id="wg", state="active")
+        .order_by("acronym")
+        .distinct(),
+        required=True,
+        empty_label="Select IETF Working Group",
+    )
+
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop("user")
+        super(WgForm, self).__init__(*args, **kwargs)
+        if not has_role(user, ["Secretariat", "Area Director"]):
+            self.fields["group"].queryset = self.fields["group"].queryset.filter(
+                role__name_id="chair", role__person=user.person
+            )
+
+
+@role_required("Secretariat", "WG Chair")
+def ask_about_ietf_adoption_call(request, name):
+    doc = get_object_or_404(Document, name=name)
+    if doc.stream is not None or doc.group.acronym != "none":
+        raise Http404
+    if request.method == "POST":
+        form = WgForm(request.POST, user=request.user)
+        if form.is_valid():
+            group = form.cleaned_data["group"]
+            return redirect(issue_wg_call_for_adoption, name=doc.name, acronym=group.acronym)
+    else:
+        form = WgForm(initial={"group": None}, user=request.user)
+    return render(
+        request,
+        "doc/draft/ask_about_ietf_adoption.html",
+        dict(
+            doc=doc,
+            form=form,
+        ),
+    )
diff --git a/ietf/doc/views_help.py b/ietf/doc/views_help.py
index 43c029ac70..34d29aaccb 100644
--- a/ietf/doc/views_help.py
+++ b/ietf/doc/views_help.py
@@ -1,3 +1,7 @@
+# Copyright The IETF Trust 2013-2023, All Rights Reserved
+
+import debug # pyflakes: ignore
+
 from django.shortcuts import render, get_object_or_404
 from django.http import Http404
 
@@ -5,24 +9,63 @@
 from ietf.name.models import DocRelationshipName,  DocTagName
 from ietf.doc.utils import get_tags_for_stream_id
 
-def state_help(request, type):
+def state_index(request):
+    types = StateType.objects.all()
+    names = [ type.slug for type in types ]
+    for type in types:
+        if "-" in type.slug and type.slug.split('-',1)[0] in names:
+            type.stategroups = None
+        else:
+            groups = StateType.objects.filter(slug__startswith=type.slug)
+            type.stategroups =  [ g.slug[len(type.slug)+1:] for g in groups if not g == type ] or ""
+                
+    return render(request, 'doc/state_index.html', {"types": types})
+
+def state_help(request, type=None):
     slug, title = {
         "draft-iesg": ("draft-iesg", "IESG States for Internet-Drafts"),
         "draft-rfceditor": ("draft-rfceditor", "RFC Editor States for Internet-Drafts"),
         "draft-iana-action": ("draft-iana-action", "IANA Action States for Internet-Drafts"),
+        "draft-iana-review": ("draft-iana-review", "IANA Review States for Internet-Drafts"),
+        "draft-iana-experts": ("draft-iana-experts", "IANA Expert Review States for Internet-Drafts"),
         "draft-stream-ietf": ("draft-stream-ietf", "IETF Stream States for Internet-Drafts"),
         "draft-stream-irtf": ("draft-stream-irtf", "IRTF Stream States for Internet-Drafts"),
         "draft-stream-ise": ("draft-stream-ise", "ISE Stream States for Internet-Drafts"),
         "draft-stream-iab": ("draft-stream-iab", "IAB Stream States for Internet-Drafts"),
+        "draft-stream-editorial": ("draft-stream-editorial", "Editorial Stream States for Internet-Drafts"),
         "charter": ("charter", "Charter States"),
         "conflict-review": ("conflrev", "Conflict Review States"),
         "status-change": ("statchg", "RFC Status Change States"),
         "bofreq": ("bofreq", "BOF Request States"),
         "procmaterials": ("procmaterials", "Proceedings Materials States"),
+        "statement": ("statement", "Statement States"),
+        "slides": ("slides", "Slides States"),
+        "minutes": ("minutes", "Minutes States"),
+        "liai-att": ("liai-att", "Liaison Attachment States"),
+        "recording": ("recording", "Recording States"),
+        "bluesheets": ("bluesheets", "Bluesheets States"),
+        "reuse_policy": ("reuse_policy", "Reuse Policy States"),
+        "review": ("review", "Review States"),
+        "liaison": ("liaison", "Liaison States"),
+        "shepwrit": ("shepwrit", "Shapherd Writeup States"),
+        "bofreq": ("bofreq", "BOF Request States"),
+        "procmaterials": ("procmaterials", "Proceedings Materials States"),
+        "chatlog": ("chatlog", "Chat Log States"),
+        "polls": ("polls", "Polls States"),
+        "statement": ("statement", "Statement States"),
+        "rfc": ("rfc", "RFC States"),
+        "bcp": ("bcp", "BCP States"),
+        "std": ("std", "STD States"),
+        "fyi": ("fyi", "FYI States"),
+        "narrativeminutes": ("narrativeminutes", "Narrative Minutes States"),
+        "draft": ("draft", "Draft States"),
+        "statchg": ("statchg", "Status Change States"),
+        "agenda": ("agenda", "Agenda States"),
+        "conflrev": ("conflrev", "Conflict Review States")
         }.get(type, (None, None))
     state_type = get_object_or_404(StateType, slug=slug)
 
-    states = State.objects.filter(type=state_type).order_by("order")
+    states = State.objects.filter(used=True, type=state_type).order_by("order")
 
     has_next_states = False
     for state in states:
diff --git a/ietf/doc/views_material.py b/ietf/doc/views_material.py
index 21b93397a8..eefac0ca61 100644
--- a/ietf/doc/views_material.py
+++ b/ietf/doc/views_material.py
@@ -3,11 +3,12 @@
 
 
 # views for managing group materials (slides, ...)
-import io
 import os
+from pathlib import Path
 import re
 
 from django import forms
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.http import Http404
 from django.shortcuts import render, get_object_or_404, redirect
@@ -16,14 +17,19 @@
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import Document, DocAlias, DocTypeName, DocEvent, State
+from ietf.doc.models import Document, DocTypeName, DocEvent, State
 from ietf.doc.models import NewRevisionDocEvent
 from ietf.doc.utils import add_state_change_event, check_common_doc_name_rules
 from ietf.group.models import Group
 from ietf.group.utils import can_manage_materials
+from ietf.meeting.utils import resolve_uploaded_material
+from ietf.utils import log
+from ietf.utils.decorators import ignore_view_kwargs
+from ietf.utils.meetecho import MeetechoAPIError, SlidesManager
 from ietf.utils.response import permission_denied
 
 @login_required
+@ignore_view_kwargs("group_type")
 def choose_material_type(request, acronym):
     group = get_object_or_404(Group, acronym=acronym)
     if not group.features.has_nonsession_materials:
@@ -91,6 +97,7 @@ def clean_name(self):
         return name
 
 @login_required
+@ignore_view_kwargs("group_type")
 def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
     # the materials process is not very developed, so at the moment we
     # handle everything through the same view/form
@@ -110,6 +117,8 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
     valid_doctypes = ['procmaterials']
     if group is not None:
         valid_doctypes.extend(['minutes','agenda','bluesheets'])
+        if group.acronym=="iesg":
+            valid_doctypes.append("narrativeminutes")
         valid_doctypes.extend(group.features.material_types)
 
     if document_type.slug not in valid_doctypes:
@@ -118,6 +127,8 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
     if not can_manage_materials(request.user, group):
         permission_denied(request, "You don't have permission to access this view")
 
+    sessions_with_slide_title_updates = set()
+
     if request.method == 'POST':
         form = UploadMaterialForm(document_type, action, group, doc, request.POST, request.FILES)
 
@@ -152,13 +163,26 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
                 f = form.cleaned_data["material"]
                 file_ext = os.path.splitext(f.name)[1]
 
-                with io.open(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + file_ext), 'wb+') as dest:
+                basename = f"{doc.name}-{doc.rev}{file_ext}" # Note the lack of a . before file_ext - see os.path.splitext
+                filepath = Path(doc.get_file_path()) / basename
+                with filepath.open('wb+') as dest:
                     for chunk in f.chunks():
                         dest.write(chunk)
-
-            if action == "new":
-                alias, __ = DocAlias.objects.get_or_create(name=doc.name)
-                alias.docs.add(doc)
+                f.seek(0)
+                doc.store_file(basename, f)
+                if not doc.meeting_related():
+                    log.assertion('doc.type_id == "slides"')
+                    ftp_filepath = Path(settings.FTP_DIR) / doc.type_id / basename
+                    try:
+                        os.link(filepath, ftp_filepath) # Path.hardlink is not available until 3.10
+                    except IOError as ex:
+                        log.log(
+                            "There was an error creating a hardlink at %s pointing to %s: %s"
+                            % (ftp_filepath, filepath, ex)
+                        )
+                else:
+                    for meeting in set([s.meeting for s in doc.session_set.all()]):
+                        resolve_uploaded_material(meeting=meeting, doc=doc)
 
             if prev_rev != doc.rev:
                 e = NewRevisionDocEvent(type="new_revision", doc=doc, rev=doc.rev)
@@ -174,6 +198,9 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
                     e.desc += " from %s" % prev_title
                 e.save()
                 events.append(e)
+                if doc.type_id == "slides":
+                    for sp in doc.presentations.all():
+                        sessions_with_slide_title_updates.add(sp.session)
 
             if prev_abstract != doc.abstract:
                 e = DocEvent(doc=doc, rev=doc.rev, by=request.user.person, type='changed_document')
@@ -191,6 +218,16 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
             if events:
                 doc.save_with_history(events)
 
+            # Call Meetecho API if any session slides titles changed 
+            if sessions_with_slide_title_updates and hasattr(settings, "MEETECHO_API_CONFIG"):
+                sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+                for session in sessions_with_slide_title_updates:
+                    try:
+                        # SessionPresentations are unique over (session, document) so there will be no duplicates
+                        sm.send_update(session)
+                    except MeetechoAPIError as err:
+                        log.log(f"Error in SlidesManager.send_update(): {err}")
+
             return redirect("ietf.doc.views_doc.document_main", name=doc.name)
     else:
         form = UploadMaterialForm(document_type, action, group, doc)
diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py
index c7d8e58046..1968b133ce 100644
--- a/ietf/doc/views_review.py
+++ b/ietf/doc/views_review.py
@@ -2,15 +2,17 @@
 # -*- coding: utf-8 -*-
 
 
-import io
 import itertools
 import json
 import os
 import datetime
+from pathlib import Path
 import requests
 import email.utils
 
-from django.utils.http import is_safe_url
+from django.utils import timezone
+from django.utils.http import url_has_allowed_host_and_scheme
+
 from simple_history.utils import update_change_reason
 
 import debug    # pyflakes:ignore
@@ -26,7 +28,7 @@
 from django.template.loader import render_to_string, TemplateDoesNotExist
 from django.urls import reverse as urlreverse
 
-from ietf.doc.models import (Document, NewRevisionDocEvent, State, DocAlias,
+from ietf.doc.models import (Document, NewRevisionDocEvent, State,
                              LastCallDocEvent, ReviewRequestDocEvent, ReviewAssignmentDocEvent, DocumentAuthor)
 from ietf.name.models import (ReviewRequestStateName, ReviewAssignmentStateName, ReviewResultName, 
                              ReviewTypeName)
@@ -50,8 +52,11 @@
 from ietf.utils.textupload import get_cleaned_text_file_content
 from ietf.utils.mail import send_mail_message
 from ietf.mailtrigger.utils import gather_address_lists
-from ietf.utils.fields import MultiEmailField
+from ietf.utils.fields import ModelMultipleChoiceField, MultiEmailField
+from ietf.utils.http import is_ajax
 from ietf.utils.response import permission_denied
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
+
 
 def clean_doc_revision(doc, rev):
     if rev:
@@ -63,7 +68,7 @@ def clean_doc_revision(doc, rev):
     return rev
 
 class RequestReviewForm(forms.ModelForm):
-    team = forms.ModelMultipleChoiceField(queryset=Group.objects.all(), widget=forms.CheckboxSelectMultiple)
+    team = ModelMultipleChoiceField(queryset=Group.objects.all(), widget=forms.CheckboxSelectMultiple)
     deadline = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={ "autoclose": "1", "start-date": "+0d" })
 
     class Meta:
@@ -92,7 +97,7 @@ def __init__(self, user, doc, *args, **kwargs):
 
     def clean_deadline(self):
         v = self.cleaned_data.get('deadline')
-        if v < datetime.date.today():
+        if v < date_today(DEADLINE_TZINFO):
             raise forms.ValidationError("Select today or a date in the future.")
         return v
 
@@ -112,12 +117,12 @@ def clean(self):
 
 @login_required
 def request_review(request, name):
-    doc = get_object_or_404(Document, name=name)
+    doc = get_object_or_404(Document, type_id="draft", name=name)
 
     if not can_request_review_of_doc(request.user, doc):
         permission_denied(request, "You do not have permission to perform this action")
 
-    now = datetime.datetime.now()
+    now = timezone.now()
 
     lc_ends = None
     e = doc.latest_event(LastCallDocEvent, type="sent_last_call")
@@ -214,11 +219,13 @@ def review_request(request, name, request_id):
     
     can_edit_deadline = can_edit_comment
 
+    can_add_comment = can_manage_request
+
     assignments = review_req.reviewassignment_set.all()
     for assignment in assignments:
         assignment.is_reviewer = user_is_person(request.user, assignment.reviewer.person)
 
-        assignment.can_accept_reviewer_assignment = (assignment.state_id == "assigned"
+        assignment.can_accept_reviewer_assignment = (assignment.state_id in ["assigned", "rejected"]
                                                      and (assignment.is_reviewer or can_manage_request))
 
         assignment.can_reject_reviewer_assignment = (assignment.state_id in ["assigned", "accepted"]
@@ -255,6 +262,7 @@ def review_request(request, name, request_id):
         'can_assign_reviewer': can_assign_reviewer,
         'can_edit_comment': can_edit_comment,
         'can_edit_deadline': can_edit_deadline,
+        'can_add_comment': can_add_comment,
         'assignments': assignments,
         'wg_chairs': wg_chairs,
         'iesg_state_summary': iesg_state_summary,
@@ -305,6 +313,31 @@ def close_request(request, name, request_id):
         'form': form,
     })
 
+class AddCommentForm(forms.Form):
+    comment = forms.CharField(required=True, widget=forms.Textarea, strip=False)
+
+@login_required
+def add_request_comment(request, name, request_id):
+    doc = get_object_or_404(Document, name=name)
+    review_req = get_object_or_404(ReviewRequest, pk=request_id)
+
+    can_request = is_authorized_in_doc_stream(request.user, doc)
+    can_manage_request = can_manage_review_requests_for_team(request.user, review_req.team)
+    if not (can_request or can_manage_request):
+        permission_denied(request, "You do not have permission to perform this action")
+
+    if request.method == "POST":
+        form = AddCommentForm(request.POST)
+        if form.is_valid():
+            c = form.cleaned_data['comment']
+
+            review_req.add_history(c)
+            return redirect(review_request, name=review_req.doc.name, request_id=review_req.pk)
+    else:
+        form = AddCommentForm()
+
+    return render(request, 'doc/add_comment.html',
+                  dict(doc=doc, form=form, review_req=review_req))
 
 class AssignReviewerForm(forms.Form):
     reviewer = PersonEmailChoiceField(label="Assign Additional Reviewer", empty_label="(None)")
@@ -343,13 +376,19 @@ def assign_reviewer(request, name, request_id):
 
 class RejectReviewerAssignmentForm(forms.Form):
     message_to_secretary = forms.CharField(widget=forms.Textarea, required=False, help_text="Optional explanation of rejection, will be emailed to team secretary if filled in", strip=False)
+    wants_to_be_next = forms.BooleanField(label="I want to be assigned new document immediately", required=False)
 
 @login_required
 def reject_reviewer_assignment(request, name, assignment_id):
     doc = get_object_or_404(Document, name=name)
     review_assignment = get_object_or_404(ReviewAssignment, pk=assignment_id, state__in=["assigned", "accepted"])
-    review_request_past_deadline = review_assignment.review_request.deadline < datetime.date.today()
 
+    allow_reject_request = True
+    # Only check deadline if the group does not allow rejecting always
+    if not review_assignment.review_request.team.reviewteamsettings.allow_reviewer_to_reject_after_deadline:
+        if review_assignment.review_request.deadline < date_today(DEADLINE_TZINFO):
+            allow_reject_request = False
+    
     if not review_assignment.reviewer:
         return redirect(review_request, name=review_assignment.review_request.doc.name, request_id=review_assignment.review_request.pk)
 
@@ -359,12 +398,17 @@ def reject_reviewer_assignment(request, name, assignment_id):
     if not (is_reviewer or can_manage_request):
         permission_denied(request, "You do not have permission to perform this action")
 
-    if request.method == "POST" and request.POST.get("action") == "reject" and not review_request_past_deadline:
+    # Secretary or whoever can manage review request, has permission
+    # to reject requests even if the deadline is in the past
+    if can_manage_request:
+        allow_reject_request = True
+
+    if request.method == "POST" and request.POST.get("action") == "reject" and allow_reject_request:
         form = RejectReviewerAssignmentForm(request.POST)
         if form.is_valid():
             # reject the assignment
             review_assignment.state = ReviewAssignmentStateName.objects.get(slug="rejected")
-            review_assignment.completed_on = datetime.datetime.now()
+            review_assignment.completed_on = timezone.now()
             review_assignment.save()
 
             descr = "Assignment of request for {} review by {} to {} was rejected".format(
@@ -383,12 +427,10 @@ def reject_reviewer_assignment(request, name, assignment_id):
                 state=review_assignment.state,
             )
 
-            policy = get_reviewer_queue_policy(review_assignment.review_request.team)
-            policy.return_reviewer_to_rotation_top(review_assignment.reviewer.person)
-
             msg = render_to_string("review/reviewer_assignment_rejected.txt", {
                 "by": request.user.person,
-                "message_to_secretary": form.cleaned_data.get("message_to_secretary")
+                "message_to_secretary": form.cleaned_data.get("message_to_secretary"),
+                "wants_to_be_next" : form.cleaned_data['wants_to_be_next']
             })
 
             email_review_assignment_change(request, review_assignment, "Reviewer assignment rejected", msg, by=request.user.person, notify_secretary=True, notify_reviewer=True, notify_requested_by=False)
@@ -402,7 +444,7 @@ def reject_reviewer_assignment(request, name, assignment_id):
         'review_req': review_assignment.review_request,
         'assignments': review_assignment.review_request.reviewassignment_set.all(),
         'form': form,
-        'review_request_past_deadline': review_request_past_deadline,
+        'allow_reject_request': allow_reject_request,
     })
 
 @login_required
@@ -434,7 +476,7 @@ def withdraw_reviewer_assignment(request, name, assignment_id):
         )            
 
         policy = get_reviewer_queue_policy(review_assignment.review_request.team)
-        policy.return_reviewer_to_rotation_top(review_assignment.reviewer.person)
+        policy.set_wants_to_be_next(review_assignment.reviewer.person)
         
         msg = "Review assignment withdrawn by %s"%request.user.person
 
@@ -531,7 +573,7 @@ class CompleteReviewForm(forms.Form):
     review_url = forms.URLField(label="Link to message", required=False)
     review_file = forms.FileField(label="Text file to upload", required=False)
     review_content = forms.CharField(widget=forms.Textarea, required=False, strip=False)
-    completion_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={ "autoclose": "1" }, initial=datetime.date.today, help_text="Date of announcement of the results of this review")
+    completion_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={ "autoclose": "1" }, initial=date_today, help_text="Date of announcement of the results of this review")
     completion_time = forms.TimeField(widget=forms.HiddenInput, initial=datetime.time.min)
     cc = MultiEmailField(required=False, help_text="Email addresses to send to in addition to the review team list")
     email_ad = forms.BooleanField(label="Send extra email to the responsible AD suggesting early attention", required=False)
@@ -704,13 +746,14 @@ def complete_review(request, name, assignment_id=None, acronym=None):
                     team.acronym, 
                     request_type.slug,
                     xslugify(reviewer.person.ascii_parts()[3]),
-                    datetime.date.today().isoformat(),
+                    date_today().isoformat(),
                 ]
                 review_name = "-".join(c for c in name_components if c).lower()
-                if not Document.objects.filter(name=review_name).exists():
-                    review = Document.objects.create(name=review_name,type_id='review',group=team)
-                    DocAlias.objects.create(name=review_name).docs.add(review)
-                else:
+                review, created = Document.objects.get_or_create(
+                    name=review_name,
+                    defaults={'type_id': 'review', 'group': team},
+                )
+                if not created:
                     messages.warning(request, message='Attempt to save review failed: review document already exists. This most likely occurred because the review was submitted twice in quick succession. If you intended to submit a new review, rather than update an existing one, things are probably OK. Please verify that the shown review is what you expected.')
                     return redirect("ietf.doc.views_doc.document_main", name=review_name)
 
@@ -723,7 +766,7 @@ def complete_review(request, name, assignment_id=None, acronym=None):
                     type=form.cleaned_data['review_type'],
                     doc=doc,
                     team=team,
-                    deadline=datetime.date.today(),
+                    deadline=date_today(DEADLINE_TZINFO),
                     requested_by=Person.objects.get(user=request.user),
                     requested_rev=form.cleaned_data['reviewed_rev'],
                 )
@@ -731,13 +774,13 @@ def complete_review(request, name, assignment_id=None, acronym=None):
                     review_request=review_request,
                     state_id='assigned',
                     reviewer=form.cleaned_data['reviewer'].role_email('reviewer', group=team),
-                    assigned_on=datetime.datetime.now(),
+                    assigned_on=timezone.now(),
                     review = review,
                 )
 
             review.rev = "00" if not review.rev else "{:02}".format(int(review.rev) + 1)
             review.title = "{} Review of {}-{}".format(assignment.review_request.type.name, assignment.review_request.doc.name, form.cleaned_data["reviewed_rev"])
-            review.time = datetime.datetime.now()
+            review.time = timezone.now()
             if review_submission == "link":
                 review.external_url = form.cleaned_data['review_url']
 
@@ -760,13 +803,22 @@ def complete_review(request, name, assignment_id=None, acronym=None):
             else:
                 content = form.cleaned_data['review_content']
 
-            filename = os.path.join(review.get_file_path(), '{}.txt'.format(review.name))
-            with io.open(filename, 'w', encoding='utf-8') as destination:
-                destination.write(content)
+            review_path = Path(review.get_file_path()) / f"{review.name}.txt"
+            review_path.write_text(content)
+            review.store_str(f"{review.name}.txt", content, allow_overwrite=True) # We have a bug that review revisions dont create a new version!
+            review_ftp_path = Path(settings.FTP_DIR) / "review" / review_path.name
+            # See https://github.com/ietf-tools/datatracker/issues/6941 - when that's
+            # addressed, making this link should not be conditional
+            if not review_ftp_path.exists():
+                os.link(review_path, review_ftp_path) # switch this to Path.hardlink when python>=3.10 is available
 
-            completion_datetime = datetime.datetime.now()
+            completion_datetime = timezone.now()
             if "completion_date" in form.cleaned_data:
-                completion_datetime = datetime.datetime.combine(form.cleaned_data["completion_date"], form.cleaned_data.get("completion_time") or datetime.time.min)
+                completion_datetime = datetime.datetime.combine(
+                    form.cleaned_data["completion_date"],
+                    form.cleaned_data.get("completion_time") or datetime.time.min,
+                    tzinfo=DEADLINE_TZINFO,
+                )
 
             # complete assignment
             assignment.state = form.cleaned_data["state"]
@@ -778,7 +830,7 @@ def complete_review(request, name, assignment_id=None, acronym=None):
 
             need_to_email_review = review_submission != "link" and assignment.review_request.team.list_email and not revising_review
 
-            submitted_on_different_date = completion_datetime.date() != datetime.date.today()
+            submitted_on_different_date = completion_datetime.date() != date_today(DEADLINE_TZINFO)
             desc = "Request for {} review by {} {}: {}. Reviewer: {}.".format(
                 assignment.review_request.type.name,
                 assignment.review_request.team.acronym.upper(),
@@ -799,7 +851,7 @@ def complete_review(request, name, assignment_id=None, acronym=None):
             close_event.by = request.user.person
             close_event.desc = desc
             close_event.state = assignment.state
-            close_event.time = datetime.datetime.now()
+            close_event.time = timezone.now()
             close_event.save()
             
             # If the completion date is different, record when the initial review was made too.
@@ -845,7 +897,7 @@ def complete_review(request, name, assignment_id=None, acronym=None):
 
             if need_to_email_review:
                 # email the review
-                subject = "{} {} {} of {}-{}".format(assignment.review_request.team.acronym.capitalize(),assignment.review_request.type.name.lower(),"partial review" if assignment.state_id == "part-completed" else "review", assignment.review_request.doc.name, assignment.reviewed_rev)
+                subject = "{}-{} {} {} {}".format(assignment.review_request.doc.name, assignment.reviewed_rev, assignment.review_request.type.name.lower(), assignment.review_request.team.acronym.capitalize(), "partial review" if assignment.state_id == "part-completed" else "review")
                 related_groups = [ assignment.review_request.team, ]
                 if assignment.review_request.doc.group:
                     related_groups.append(assignment.review_request.doc.group)
@@ -894,21 +946,26 @@ def complete_review(request, name, assignment_id=None, acronym=None):
         }
 
         try:
-            initial['review_content'] = render_to_string('/group/%s/review/content_templates/%s.txt' % (assignment.review_request.team.acronym,
-                                                                                                        request_type.slug), {'assignment':assignment, 'today':datetime.date.today()}) 
+            initial['review_content'] = render_to_string(
+                f'/group/{assignment.review_request.team.acronym}/review/content_templates/{request_type.slug}.txt',
+                {
+                    'assignment': assignment,
+                    'today': date_today(settings.TIME_ZONE),
+                },
+            )
         except (TemplateDoesNotExist, AttributeError):
             pass
 
         form = CompleteReviewForm(assignment, doc, team, is_reviewer, initial=initial)
 
-    mail_archive_query_urls = mailarch.construct_query_urls(doc, team)
+    mail_archive_query_data = mailarch.construct_query_data(doc, team)
 
     return render(request, 'doc/review/complete_review.html', {
         'doc': doc,
         'team': team,
         'assignment': assignment,
         'form': form,
-        'mail_archive_query_urls': mail_archive_query_urls,
+        'mail_archive_query_data': mail_archive_query_data,
         'revising_review': revising_review,
         'review_to': to,
         'review_cc': cc,
@@ -930,27 +987,25 @@ def search_mail_archive(request, name, acronym=None, assignment_id=None):
     if not (is_reviewer or can_manage_request):
         permission_denied(request, "You do not have permission to perform this action")
 
-    res = mailarch.construct_query_urls(doc, team, query=request.GET.get("query"))
-    if not res:
-        return JsonResponse({ "error": "Couldn't do lookup in mail archive - don't know where to look"})
-
-    MAX_RESULTS = 30
+    query_data = mailarch.construct_query_data(doc, team, query=request.GET.get("query"))
+    if not query_data:
+        return JsonResponse({"error": "Couldn't do lookup in mail archive - don't know where to look"})
 
     try:
-        res["messages"] = mailarch.retrieve_messages(res["query_data_url"])[:MAX_RESULTS]
-        for message in res["messages"]:
+        query_data["messages"] = mailarch.retrieve_messages(query_data)
+        for message in query_data["messages"]:
             try:
                 revision_guess = message["subject"].split(name)[1].split('-')[1]
                 message["revision_guess"] = revision_guess if revision_guess.isnumeric() else None
             except IndexError:
                 pass
     except KeyError as e:
-        res["error"] = "No results found (%s)" % str(e)
+        query_data["error"] = "No results found (%s)" % str(e)
     except Exception as e:
-        res["error"] = "Retrieval from mail archive failed: %s" % str(e)
+        query_data["error"] = "Retrieval from mail archive failed: %s" % str(e)
         # raise # useful when debugging
 
-    return JsonResponse(res)
+    return JsonResponse(query_data)
 
 class EditReviewRequestCommentForm(forms.ModelForm):
     comment = forms.CharField(widget=forms.Textarea, strip=False)
@@ -984,7 +1039,7 @@ class Meta:
 
     def clean_deadline(self):
         v = self.cleaned_data.get('deadline')
-        if v < datetime.date.today():
+        if v < date_today(DEADLINE_TZINFO):
             raise forms.ValidationError("Select today or a date in the future.")
         return v
 
@@ -1001,7 +1056,11 @@ def edit_deadline(request, name, request_id):
         if form.is_valid():
             if form.cleaned_data['deadline'] != old_deadline:
                 form.save()
-                subject = "Deadline changed: {} {} review of {}-{}".format(review_req.team.acronym.capitalize(),review_req.type.name.lower(), review_req.doc.name, review_req.requested_rev)
+                subject = f"Deadline changed: {review_req.team.acronym.capitalize()} {review_req.type.name.lower()} review of {review_req.doc.name}"
+                if review_req.requested_rev:
+                    subject += f"-{review_req.requested_rev}"
+                descr = "Deadine changed from {} to {}".format(old_deadline, review_req.deadline)
+                update_change_reason(review_req, descr)
                 msg = render_to_string("review/deadline_changed.txt", {
                     "review_req": review_req,
                     "old_deadline": old_deadline,
@@ -1039,7 +1098,7 @@ def save(self):
 
 @login_required
 def review_wish_add(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
 
     if request.method == "POST":
         form = ReviewWishAddForm(request.user, doc, request.POST)
@@ -1056,7 +1115,7 @@ def review_wish_add(request, name):
 
 @login_required
 def review_wishes_remove(request, name):
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     person = get_object_or_404(Person, user=request.user)
 
     if request.method == "POST":
@@ -1069,12 +1128,17 @@ def review_wishes_remove(request, name):
 
 
 def _generate_ajax_or_redirect_response(request, doc):
-    redirect_url = request.GET.get('next')
-    url_is_safe = is_safe_url(url=redirect_url, allowed_hosts=request.get_host(),
-                              require_https=request.is_secure())
-    if request.is_ajax():
-        return HttpResponse(json.dumps({'success': True}), content_type='application/json')
+    redirect_url = request.GET.get("next")
+    url_is_safe = url_has_allowed_host_and_scheme(
+        url=redirect_url,
+        allowed_hosts=request.get_host(),
+        require_https=request.is_secure(),
+    )
+    if is_ajax(request):
+        return HttpResponse(
+            json.dumps({"success": True}), content_type="application/json"
+        )
     elif url_is_safe:
         return HttpResponseRedirect(redirect_url)
     else:
-        return HttpResponseRedirect(doc.get_absolute_url())
\ No newline at end of file
+        return HttpResponseRedirect(doc.get_absolute_url())
diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py
index efe24d02c1..4232d77f6c 100644
--- a/ietf/doc/views_search.py
+++ b/ietf/doc/views_search.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2022, All Rights Reserved
+# Copyright The IETF Trust 2009-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 #
 # Some parts Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -33,11 +33,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
+import hashlib
+import json
 import re
 import datetime
+import copy
+import operator
 
 from collections import defaultdict
+from functools import reduce
 
 from django import forms
 from django.conf import settings
@@ -47,26 +51,30 @@
 from django.http import Http404, HttpResponseBadRequest, HttpResponse, HttpResponseRedirect, QueryDict
 from django.shortcuts import render
 from django.utils import timezone
+from django.utils.html import strip_tags
 from django.utils.cache import _generate_cache_key # type: ignore
-
+from django.utils.text import slugify
 
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( Document, DocHistory, DocAlias, State,
-    LastCallDocEvent, NewRevisionDocEvent, IESG_SUBSTATE_TAGS,
+from ietf.doc.models import ( Document, DocHistory, State,
+    NewRevisionDocEvent, IESG_SUBSTATE_TAGS,
     IESG_BALLOT_ACTIVE_STATES, IESG_STATCHG_CONFLREV_ACTIVE_STATES,
     IESG_CHARTER_ACTIVE_STATES )
 from ietf.doc.fields import select2_id_doc_name_json
-from ietf.doc.utils import get_search_cache_key, augment_events_with_revision
+from ietf.doc.utils import augment_events_with_revision, needed_ballot_positions
 from ietf.group.models import Group
 from ietf.idindex.index import active_drafts_index_by_group
 from ietf.name.models import DocTagName, DocTypeName, StreamName
 from ietf.person.models import Person
 from ietf.person.utils import get_active_ads
 from ietf.utils.draft_search import normalize_draftname
-from ietf.doc.utils_search import prepare_document_table
-
+from ietf.utils.fields import ModelMultipleChoiceField
+from ietf.utils.log import log
+from ietf.doc.utils_search import prepare_document_table, doc_type, doc_state, doc_type_name, AD_WORKLOAD
+from ietf.ietfauth.utils import has_role
+from ietf.utils.unicodenormalize import normalize_for_sorting
 
 class SearchForm(forms.Form):
     name = forms.CharField(required=False)
@@ -94,7 +102,7 @@ class SearchForm(forms.Form):
             ("ad", "AD"), ("-ad", "AD (desc)"), ),
         required=False, widget=forms.HiddenInput)
 
-    doctypes = forms.ModelMultipleChoiceField(queryset=DocTypeName.objects.filter(used=True).exclude(slug__in=('draft','liai-att')).order_by('name'), required=False)
+    doctypes = ModelMultipleChoiceField(queryset=DocTypeName.objects.filter(used=True).exclude(slug__in=('draft', 'rfc', 'bcp', 'std', 'fyi', 'liai-att')).order_by('name'), required=False)
 
     def __init__(self, *args, **kwargs):
         super(SearchForm, self).__init__(*args, **kwargs)
@@ -153,8 +161,11 @@ def retrieve_search_results(form, all_types=False):
     else:
         types = []
 
-        if query['activedrafts'] or query['olddrafts'] or query['rfcs']:
+        if query['activedrafts'] or query['olddrafts']:
             types.append('draft')
+        
+        if query['rfcs']:
+            types.append('rfc')
 
         types.extend(query["doctypes"])
 
@@ -165,33 +176,76 @@ def retrieve_search_results(form, all_types=False):
 
     # name
     if query["name"]:
-        docs = docs.filter(Q(docalias__name__icontains=query["name"]) |
-                           Q(title__icontains=query["name"])).distinct()
+        look_for = query["name"]
+        queries = [
+            Q(name__icontains=look_for),
+            Q(title__icontains=look_for)
+        ]
+        # Check to see if this is just a search for an rfc look for a few variants
+        if look_for.lower()[:3] == "rfc" and look_for[3:].strip().isdigit():
+            spaceless = look_for.lower()[:3]+look_for[3:].strip()
+            if spaceless != look_for:
+                queries.extend([
+                    Q(name__icontains=spaceless),
+                    Q(title__icontains=spaceless)            
+                ])
+            singlespace = look_for.lower()[:3]+" "+look_for[3:].strip()
+            if singlespace != look_for:
+                queries.extend([
+                    Q(name__icontains=singlespace),
+                    Q(title__icontains=singlespace)            
+                ])        
+
+        # Do a similar thing if the search is just for a subseries doc, like a bcp.
+        if look_for.lower()[:3] in ["bcp", "fyi", "std"] and look_for[3:].strip().isdigit() and query["rfcs"]: # Also look for rfcs contained in the subseries.
+            queries.extend([
+                Q(targets_related__source__name__icontains=look_for, targets_related__relationship_id="contains"),
+                Q(targets_related__source__title__icontains=look_for, targets_related__relationship_id="contains"),
+            ])
+            spaceless = look_for.lower()[:3]+look_for[3:].strip()
+            if spaceless != look_for:
+                queries.extend([
+                    Q(targets_related__source__name__icontains=spaceless, targets_related__relationship_id="contains"),
+                    Q(targets_related__source__title__icontains=spaceless, targets_related__relationship_id="contains"),
+                ])
+            singlespace = look_for.lower()[:3]+" "+look_for[3:].strip()
+            if singlespace != look_for:
+                queries.extend([
+                    Q(targets_related__source__name__icontains=singlespace, targets_related__relationship_id="contains"),
+                    Q(targets_related__source__title__icontains=singlespace, targets_related__relationship_id="contains"),
+                ])
+
+        if query["rfcs"]:
+            queries.extend([Q(targets_related__source__name__icontains=look_for, targets_related__relationship_id="became_rfc")])
+
+        combined_query = reduce(operator.or_, queries)
+        docs = docs.filter(combined_query)
 
     # rfc/active/old check buttons
     allowed_draft_states = []
-    if query["rfcs"]:
-        allowed_draft_states.append("rfc")
     if query["activedrafts"]:
         allowed_draft_states.append("active")
     if query["olddrafts"]:
         allowed_draft_states.extend(['repl', 'expired', 'auth-rm', 'ietf-rm'])
 
     docs = docs.filter(Q(states__slug__in=allowed_draft_states) |
-                       ~Q(type__slug='draft')).distinct()
+                       ~Q(type__slug='draft'))
 
     # radio choices
     by = query["by"]
     if by == "author":
         docs = docs.filter(
             Q(documentauthor__person__alias__name__icontains=query["author"]) |
-            Q(documentauthor__person__email__address__icontains=query["author"])
+            Q(documentauthor__person__email__address__icontains=query["author"]) |
+            Q(rfcauthor__person__alias__name__icontains=query["author"]) |
+            Q(rfcauthor__person__email__address__icontains=query["author"]) |
+            Q(rfcauthor__titlepage_name__icontains=query["author"])
         )
     elif by == "group":
-        docs = docs.filter(group__acronym=query["group"])
+        docs = docs.filter(group__acronym__iexact=query["group"])
     elif by == "area":
         docs = docs.filter(Q(group__type="wg", group__parent=query["area"]) |
-                           Q(group=query["area"])).distinct()
+                           Q(group=query["area"]))
     elif by == "ad":
         docs = docs.filter(ad=query["ad"])
     elif by == "state":
@@ -204,9 +258,18 @@ def retrieve_search_results(form, all_types=False):
     elif by == "stream":
         docs = docs.filter(stream=query["stream"])
 
+    docs=docs.distinct()
+
     return docs
 
+
 def search(request):
+    def _get_cache_key(params):
+        fields = set(SearchForm.base_fields) - {'sort'}
+        kwargs = dict([(k, v) for (k, v) in list(params.items()) if k in fields])
+        key = "doc:document:search:" + hashlib.sha512(json.dumps(kwargs, sort_keys=True).encode('utf-8')).hexdigest()
+        return key
+
     if request.GET:
         # backwards compatibility
         get_params = request.GET.copy()
@@ -221,13 +284,15 @@ def search(request):
         if not form.is_valid():
             return HttpResponseBadRequest("form not valid: %s" % form.errors)
 
-        cache_key = get_search_cache_key(get_params)
-        results = cache.get(cache_key)
-        if not results:
+        cache_key = _get_cache_key(get_params)
+        cached_val = cache.get(cache_key)
+        if cached_val:
+            [results, meta] = cached_val
+        else:
             results = retrieve_search_results(form)
-            cache.set(cache_key, results)
-
-        results, meta = prepare_document_table(request, results, get_params)
+            results, meta = prepare_document_table(request, results, get_params)
+            cache.set(cache_key, [results, meta]) # for settings.CACHE_MIDDLEWARE_SECONDS
+            log(f"Search results computed for {get_params}")
         meta['searching'] = True
     else:
         form = SearchForm()
@@ -245,17 +310,17 @@ def frontpage(request):
 
 def search_for_name(request, name):
     def find_unique(n):
-        exact = DocAlias.objects.filter(name=n).first()
+        exact = Document.objects.filter(name__iexact=n).first()
         if exact:
             return exact.name
 
-        aliases = DocAlias.objects.filter(name__startswith=n)[:2]
-        if len(aliases) == 1:
-            return aliases[0].name
+        startswith = Document.objects.filter(name__istartswith=n)[:2]
+        if len(startswith) == 1:
+            return startswith[0].name
 
-        aliases = DocAlias.objects.filter(name__contains=n)[:2]
-        if len(aliases) == 1:
-            return aliases[0].name
+        contains = Document.objects.filter(name__icontains=n)[:2]
+        if len(contains) == 1:
+            return contains[0].name
 
         return None
 
@@ -280,21 +345,21 @@ def cached_redirect(cache_key, url):
     if redirect_to:
         return cached_redirect(cache_key, urlreverse("ietf.doc.views_doc.document_main", kwargs={ "name": redirect_to }))
     else:
-        # check for embedded rev - this may be ambigious, so don't
+        # check for embedded rev - this may be ambiguous, so don't
         # chop it off if we don't find a match
         rev_split = re.search("^(.+)-([0-9]{2})$", n)
         if rev_split:
             redirect_to = find_unique(rev_split.group(1))
             if redirect_to:
                 rev = rev_split.group(2)
-                # check if we can redirect directly to the rev
-                if DocHistory.objects.filter(doc__docalias__name=redirect_to, rev=rev).exists():
+                # check if we can redirect directly to the rev if it's draft, if rfc - always redirect to main page
+                if not redirect_to.startswith('rfc') and DocHistory.objects.filter(doc__name=redirect_to, rev=rev).exists():
                     return cached_redirect(cache_key, urlreverse("ietf.doc.views_doc.document_main", kwargs={ "name": redirect_to, "rev": rev }))
                 else:
                     return cached_redirect(cache_key, urlreverse("ietf.doc.views_doc.document_main", kwargs={ "name": redirect_to }))
 
     # build appropriate flags based on string prefix
-    doctypenames = DocTypeName.objects.filter(used=True)
+    doctypenames = DocTypeName.objects.filter(used=True).exclude(slug__in=["bcp","std","fyi"])
     # This would have been more straightforward if document prefixes couldn't
     # contain a dash.  Probably, document prefixes shouldn't contain a dash ...
     search_args = "?name=%s" % n
@@ -310,76 +375,55 @@ def cached_redirect(cache_key, url):
 
     return cached_redirect(cache_key, urlreverse('ietf.doc.views_search.search') + search_args)
 
-def ad_dashboard_group_type(doc):
-    # Return group type for document for dashboard.
-    # If doc is not defined return list of all possible
-    # group types
-    if not doc:
-        return ('I-D', 'RFC', 'Conflict Review', 'Status Change', 'Charter')
-    if doc.type.slug=='draft':
-        if doc.get_state_slug('draft') == 'rfc':
-            return 'RFC'
-        elif doc.get_state_slug('draft') == 'active' and doc.get_state_slug('draft-iesg') and doc.get_state('draft-iesg').name =='RFC Ed Queue':
-            return 'RFC'
-        elif doc.get_state_slug('draft') == 'active' and doc.get_state_slug('draft-iesg') and doc.get_state('draft-iesg').name in ('Dead', 'I-D Exists', 'AD is watching'):
-             return None
-        elif doc.get_state('draft').name in ('Expired', 'Replaced'):
-            return None
-        else:
-            return 'I-D'
-    elif doc.type.slug=='conflrev':
-          return 'Conflict Review'
-    elif doc.type.slug=='statchg':
-        return 'Status Change'
-    elif doc.type.slug=='charter':
-        return "Charter"
-    else:
-        return "Document"
 
-def ad_dashboard_group(doc):
-
-    if doc.type.slug=='draft':
-        if doc.get_state_slug('draft') == 'rfc':
-            return 'RFC'
-        elif doc.get_state_slug('draft') == 'active' and doc.get_state_slug('draft-iesg'):
-            return '%s Internet-Draft' % doc.get_state('draft-iesg').name
-        else:
-            return '%s Internet-Draft' % doc.get_state('draft').name
-    elif doc.type.slug=='conflrev':
-        if doc.get_state_slug('conflrev') in ('appr-reqnopub-sent','appr-noprob-sent'):
-            return 'Approved Conflict Review'
-        elif doc.get_state_slug('conflrev') in ('appr-reqnopub-pend','appr-noprob-pend','appr-reqnopub-pr','appr-noprob-pr'):
-            return "%s Conflict Review" % State.objects.get(type__slug='draft-iesg',slug='approved')
-        else:
-          return '%s Conflict Review' % doc.get_state('conflrev')
-    elif doc.type.slug=='statchg':
-        if doc.get_state_slug('statchg') in ('appr-sent',):
-            return 'Approved Status Change'
-        if doc.get_state_slug('statchg') in ('appr-pend','appr-pr'):
-            return '%s Status Change' % State.objects.get(type__slug='draft-iesg',slug='approved')
-        else:
-            return '%s Status Change' % doc.get_state('statchg')
-    elif doc.type.slug=='charter':
-        if doc.get_state_slug('charter') == 'approved':
-            return "Approved Charter"
+def get_state_name_calculator():
+    """Get a function to calculate state names
+    
+    Queries the database once when called, then uses cached look-up table for name calculations.
+    """
+    # state_lut always has at least rfc, draft, and draft-iesg keys
+    state_lut = defaultdict(dict, **{"rfc": {}, "draft":{}, "draft-iesg": {}})
+    for state in State.objects.filter(used=True):
+        state_lut[state.type_id][state.slug] = state.name
+    state_lut = dict(state_lut)  # convert to dict to freeze key changes
+
+    def _get_state_name(doc_type, state_slug):
+        """Get display name for a doc type / state slug
+        
+        Note doc_type rfc here is _not_ necessarily Document.type - for some callers
+        it is a type derived from draft... The ad_workload view needs more rework so that
+        the code isn't having to shadow-box so much.
+        """
+        if doc_type == "rfc":
+            if state_slug == "rfc":
+                return "RFC"
+            elif state_slug in state_lut["rfc"]:
+                return state_lut["rfc"][state_slug]
+            else:
+                return state_lut["draft"].get(
+                    state_slug,
+                    state_lut["draft-iesg"][state_slug],
+                )
+        elif doc_type == "draft" and state_slug not in ["rfc", "expired"]:
+            return state_lut["draft"].get(
+                state_slug,
+                state_lut["draft-iesg"][state_slug],
+            )
+        elif doc_type == "draft" and state_slug == "rfc":
+            return "RFC"
+        elif doc_type == "conflrev" and state_slug.startswith("appr"):
+            return "Approved"
         else:
-            return '%s Charter' % doc.get_state('charter')
-    else:
-        return "Document"
+            return state_lut[doc_type][state_slug]
 
+    # return the function as a closure
+    return _get_state_name
 
-def shorten_group_name(name):
-    for s in [
-        " Internet-Draft",
-        " Conflict Review",
-        " Status Change",
-        " (Internal Steering Group/IAB Review) Charter",
-        "Charter",
-    ]:
-        if name.endswith(s):
-            name = name[: -len(s)]
 
+def shorten_state_name(name):
+    """Get abbreviated display name for a state"""
     for pat, sub in [
+        (r" \(Internal Steering Group/IAB Review\)", ""),
         ("Writeup", "Write-up"),
         ("Requested", "Req"),
         ("Evaluation", "Eval"),
@@ -387,82 +431,47 @@ def shorten_group_name(name):
         ("Waiting", "Wait"),
         ("Go-Ahead", "OK"),
         ("Approved-", "App, "),
+        ("Approved No Problem", "App."),
         ("announcement", "ann."),
         ("IESG Eval - ", ""),
         ("Not currently under review", "Not under review"),
         ("External Review", "Ext. Review"),
-        (r"IESG Review \(Charter for Approval, Selected by Secretariat\)", "IESG Review"),
+        (
+            r"IESG Review \(Charter for Approval, Selected by Secretariat\)",
+            "IESG Review",
+        ),
         ("Needs Shepherd", "Needs Shep."),
         ("Approved", "App."),
         ("Replaced", "Repl."),
         ("Withdrawn", "Withd."),
         ("Chartering/Rechartering", "Charter"),
-        (r"\(Message to Community, Selected by Secretariat\)", "")
+        (r"\(Message to Community, Selected by Secretariat\)", ""),
     ]:
         name = re.sub(pat, sub, name)
-
     return name.strip()
 
 
-def ad_dashboard_sort_key(doc):
-
-    if doc.type.slug=='draft' and doc.get_state_slug('draft') == 'rfc':
-        return "21%04d" % int(doc.rfc_number())
-    if doc.type.slug=='statchg' and doc.get_state_slug('statchg') == 'appr-sent':
-        return "22%d" % 0 # TODO - get the date of the transition into this state here
-    if doc.type.slug=='conflrev' and doc.get_state_slug('conflrev') in ('appr-reqnopub-sent','appr-noprob-sent'):
-        return "23%d" % 0 # TODO - get the date of the transition into this state here
-    if doc.type.slug=='charter' and doc.get_state_slug('charter') == 'approved':
-        return "24%d" % 0 # TODO - get the date of the transition into this state here
-
-    seed = ad_dashboard_group(doc)
-
-    if doc.type.slug=='conflrev' and doc.get_state_slug('conflrev') == 'adrev':
-        state = State.objects.get(type__slug='draft-iesg',slug='ad-eval')
-        return "1%d%s" % (state.order,seed)
-
-    if doc.type.slug=='charter' and doc.get_state_slug('charter') != 'replaced':
-        if doc.get_state_slug('charter') in ('notrev','infrev'):
-            return "100%s" % seed
-        elif  doc.get_state_slug('charter') == 'intrev':
-            state = State.objects.get(type__slug='draft-iesg',slug='ad-eval')
-            return "1%d%s" % (state.order,seed)
-        elif  doc.get_state_slug('charter') == 'extrev':
-            state = State.objects.get(type__slug='draft-iesg',slug='lc')
-            return "1%d%s" % (state.order,seed)
-        elif  doc.get_state_slug('charter') == 'iesgrev':
-            state = State.objects.get(type__slug='draft-iesg',slug='iesg-eva')
-            return "1%d%s" % (state.order,seed)
-
-    if doc.type.slug=='statchg' and  doc.get_state_slug('statchg') == 'adrev':
-        state = State.objects.get(type__slug='draft-iesg',slug='ad-eval')
-        return "1%d%s" % (state.order,seed)
-
-    if seed.startswith('Needs Shepherd'):
-        return "100%s" % seed
-    if seed.endswith(' Document'):
-        seed = seed[:-9]
-    elif seed.endswith(' Internet-Draft'):
-        seed = seed[:-15]
-    elif seed.endswith(' Conflict Review'):
-        seed = seed[:-16]
-    elif seed.endswith(' Status Change'):
-        seed = seed[:-14]
-    state = State.objects.filter(type__slug='draft-iesg',name=seed)
-    if state:
-        ageseconds = 0
-        changetime= doc.latest_event(type='changed_document')
-        if changetime:
-            ad = (datetime.datetime.now()-doc.latest_event(type='changed_document').time)
-            ageseconds = (ad.microseconds + (ad.seconds + ad.days * 24 * 3600) * 10**6) / 10**6
-        return "1%d%s%s%010d" % (state[0].order,seed,doc.type.slug,ageseconds)
-
-    return "3%s" % seed
+def date_to_bucket(date, now, num_buckets):
+    return num_buckets - int((now.date() - date.date()).total_seconds() / 60 / 60 / 24)
 
 
 def ad_workload(request):
-    delta = datetime.timedelta(days=30)
-    right_now = timezone.now()
+    _calculate_state_name = get_state_name_calculator()
+    IESG_STATES = State.objects.filter(type="draft-iesg").values_list("name", flat=True)
+    STATE_SLUGS = {
+        dt: {_calculate_state_name(dt, ds): ds for ds in AD_WORKLOAD[dt]}  # type: ignore
+        for dt in AD_WORKLOAD.keys()
+    }
+
+    def _state_to_doc_type(state):
+        for dt in STATE_SLUGS:
+            if state in STATE_SLUGS[dt]:
+                return dt
+        return None
+
+    # number of days (= buckets) to show in the graphs
+    days = 120 if has_role(request.user, ["Area Director", "Secretariat"]) else 1
+    now = timezone.now()
 
     ads = []
     responsible = Document.objects.values_list("ad", flat=True).distinct()
@@ -476,231 +485,230 @@ def ad_workload(request):
     ).distinct():
         if p in get_active_ads():
             ads.append(p)
+    ads.sort(key=lambda p: normalize_for_sorting(p.plain_name()))
 
-    doctypes = list(
-        DocTypeName.objects.filter(used=True)
-        .exclude(slug__in=("draft", "liai-att"))
-        .values_list("pk", flat=True)
-    )
-
-    up_is_good = {}
-    group_types = ad_dashboard_group_type(None)
-    groups = {g: {} for g in group_types}
-    group_names = {g: [] for g in group_types}
-
-    # Prefill groups in preferred sort order
-    # FIXME: This should really use the database states instead of replicating the logic
-    for id, (g, uig) in enumerate(
-        [
-            ("Publication Requested Internet-Draft", False),
-            ("AD Evaluation Internet-Draft", False),
-            ("In Last Call Internet-Draft", True),
-            ("Waiting for Writeup Internet-Draft", False),
-            ("IESG Evaluation - Defer Internet-Draft", False),
-            ("IESG Evaluation Internet-Draft", True),
-            ("Waiting for AD Go-Ahead Internet-Draft", False),
-            ("Approved-announcement to be sent Internet-Draft", True),
-            ("Approved-announcement sent Internet-Draft", True),
-        ]
-    ):
-        groups["I-D"][g] = id
-        group_names["I-D"].append(g)
-        up_is_good[g] = uig
-
-    for id, g in enumerate(["RFC Ed Queue Internet-Draft", "RFC"]):
-        groups["RFC"][g] = id
-        group_names["RFC"].append(g)
-        up_is_good[g] = True
-
-    for id, (g, uig) in enumerate(
-        [
-            ("AD Review Conflict Review", False),
-            ("Needs Shepherd Conflict Review", False),
-            ("IESG Evaluation Conflict Review", True),
-            ("Approved Conflict Review", True),
-            ("Withdrawn Conflict Review", None),
-        ]
-    ):
-        groups["Conflict Review"][g] = id
-        group_names["Conflict Review"].append(g)
-        up_is_good[g] = uig
-
-    for id, (g, uig) in enumerate(
-        [
-            ("Publication Requested Status Change", False),
-            ("AD Evaluation Status Change", False),
-            ("In Last Call Status Change", True),
-            ("Waiting for Writeup Status Change", False),
-            ("IESG Evaluation Status Change", True),
-            ("Waiting for AD Go-Ahead Status Change", False),
-        ]
-    ):
-        groups["Status Change"][g] = id
-        group_names["Status Change"].append(g)
-        up_is_good[g] = uig
-
-    for id, (g, uig) in enumerate(
-        [
-            ("Not currently under review Charter", None),
-            ("Draft Charter Charter", None),
-            ("Start Chartering/Rechartering (Internal Steering Group/IAB Review) Charter", False),
-            ("External Review (Message to Community, Selected by Secretariat) Charter", True),
-            ("IESG Review (Charter for Approval, Selected by Secretariat) Charter", True),
-            ("Approved Charter", True),
-            ("Replaced Charter", None),
-        ]
-    ):
-        groups["Charter"][g] = id
-        group_names["Charter"].append(g)
-        up_is_good[g] = uig
+    bucket_template = {
+        dt: {state: [[] for _ in range(days)] for state in STATE_SLUGS[dt].values()}
+        for dt in STATE_SLUGS
+    }
+    sums = copy.deepcopy(bucket_template)
 
     for ad in ads:
-        form = SearchForm(
-            {
-                "by": "ad",
-                "ad": ad.id,
-                "rfcs": "on",
-                "activedrafts": "on",
-                "olddrafts": "on",
-                "doctypes": doctypes,
-            }
-        )
-
         ad.dashboard = urlreverse(
             "ietf.doc.views_search.docs_for_ad", kwargs=dict(name=ad.full_name_as_key())
         )
-        ad.counts = defaultdict(list)
-        ad.prev = defaultdict(list)
-        ad.doc_now = defaultdict(list)
-        ad.doc_prev = defaultdict(list)
-
-        for doc in retrieve_search_results(form):
-            group_type = ad_dashboard_group_type(doc)
-            if group_type and group_type in groups:
-                # Right now, anything with group_type "Document", such as a bofreq is not handled.
-                group = ad_dashboard_group(doc)
-                if group not in groups[group_type]:
-                    groups[group_type][group] = len(groups[group_type])
-                    group_names[group_type].append(group)
-
-                inc = len(groups[group_type]) - len(ad.counts[group_type])
-                if inc > 0:
-                    ad.counts[group_type].extend([0] * inc)
-                    ad.prev[group_type].extend([0] * inc)
-                    ad.doc_now[group_type].extend(set() for _ in range(inc))
-                    ad.doc_prev[group_type].extend(set() for _ in range(inc))
-
-                ad.counts[group_type][groups[group_type][group]] += 1
-                ad.doc_now[group_type][groups[group_type][group]].add(doc)
-
-                last_state_event = (
-                    doc.docevent_set.filter(
-                        Q(type="started_iesg_process") | Q(type="changed_state")
-                    )
-                    .order_by("-time")
-                    .first()
-                )
-                if (last_state_event is not None) and (right_now - last_state_event.time) > delta:
-                    ad.prev[group_type][groups[group_type][group]] += 1
-                    ad.doc_prev[group_type][groups[group_type][group]].add(doc)
+        ad.buckets = copy.deepcopy(bucket_template)
+
+        # https://github.com/ietf-tools/datatracker/issues/4577
+        docs_via_group_ad = Document.objects.exclude(
+            group__acronym="none"
+        ).filter(
+            group__role__name="ad",
+            group__role__person=ad
+        ).filter(
+            states__type="draft-stream-ietf",
+            states__slug__in=["wg-doc","wg-lc","waiting-for-implementation","chair-w","writeupw"]
+        )
 
-    for ad in ads:
-        ad.doc_diff = defaultdict(list)
-        for gt in group_types:
-            inc = len(groups[gt]) - len(ad.counts[gt])
-            if inc > 0:
-                ad.counts[gt].extend([0] * inc)
-                ad.prev[gt].extend([0] * inc)
-                ad.doc_now[gt].extend([set()] * inc)
-                ad.doc_prev[gt].extend([set()] * inc)
-
-            ad.doc_diff[gt].extend([set()] * len(groups[gt]))
-            for idx, g in enumerate(group_names[gt]):
-                ad.doc_diff[gt][idx] = ad.doc_prev[gt][idx] ^ ad.doc_now[gt][idx]
-
-    # Shorten the names of groups
-    for gt in group_types:
-        for idx, g in enumerate(group_names[gt]):
-            group_names[gt][idx] = (
-                shorten_group_name(g),
-                g,
-                up_is_good[g] if g in up_is_good else None,
-            )
+        doc_for_ad = Document.objects.filter(ad=ad)
 
-    workload = [
-        dict(
-            group_type=gt,
-            group_names=group_names[gt],
-            counts=[
-                (
-                    ad,
-                    [
-                        (
-                            group_names[gt][index],
-                            ad.counts[gt][index],
-                            ad.prev[gt][index],
-                            ad.doc_diff[gt][index],
-                        )
-                        for index in range(len(group_names[gt]))
-                    ],
-                )
-                for ad in ads
-            ],
-            sums=[
-                (
-                    group_names[gt][index],
-                    sum([ad.counts[gt][index] for ad in ads]),
-                    sum([ad.prev[gt][index] for ad in ads]),
-                )
-                for index in range(len(group_names[gt]))
+        ad.pre_pubreq = (docs_via_group_ad | doc_for_ad).filter(
+            type="draft"
+        ).filter(
+            states__type="draft",
+            states__slug="active"
+        ).filter(
+            states__type="draft-iesg",
+            states__slug="idexists"
+        ).distinct().count()
+
+        for doc in Document.objects.exclude(type_id="rfc").filter(ad=ad):
+            dt = doc_type(doc)
+            state = doc_state(doc)
+
+            state_events = doc.docevent_set.filter(
+                type__in=["started_iesg_process", "changed_state", "closed_ballot"]
+            )
+            if doc.became_rfc():
+                state_events = state_events | doc.became_rfc().docevent_set.filter(type="published_rfc")
+            state_events = state_events.order_by("-time")
+
+            # compute state history for drafts
+            last = now
+            for e in state_events:
+                to_state = None
+                if dt == "charter":
+                    if e.type == "closed_ballot":
+                        to_state = _calculate_state_name(dt, state)
+                    elif e.desc.endswith("has been replaced"):
+                        # stop tracking
+                        last = e.time
+                        break
+
+                if not to_state:
+                    # get the state name this event changed the doc into
+                    match = re.search(
+                        r"(RFC) published|[Ss]tate changed to (.*?)(?:::.*)? from (.*?)(?=::|$)",
+                        strip_tags(e.desc),
+                        flags=re.MULTILINE,
+                    )
+                    if not match:
+                        # some irrelevant state change for the AD dashboard, ignore it
+                        continue
+                    to_state = match.group(1) or match.group(2)
+
+                # fix up some states that have been renamed
+                if dt == "conflrev" and to_state.startswith("Approved"):
+                    to_state = "Approved"
+                elif dt == "charter" and to_state.startswith(
+                    "Start Chartering/Rechartering"
+                ):
+                    to_state = "Start Chartering/Rechartering (Internal Steering Group/IAB Review)"
+                elif to_state == "RFC Published":
+                    to_state = "RFC"
+
+                if dt == "rfc":
+                    new_dt = _state_to_doc_type(to_state)
+                    if new_dt is not None and new_dt != dt:
+                        dt = new_dt
+
+                if to_state not in STATE_SLUGS[dt].keys() or to_state == "Replaced":
+                    # change into a state the AD dashboard doesn't display
+                    if to_state in IESG_STATES or to_state == "Replaced":
+                        # if it's an IESG state we don't display, record it's time
+                        last = e.time
+                    # keep going with next event
+                    continue
+
+                sn = STATE_SLUGS[dt][to_state]
+                buckets_start = date_to_bucket(e.time, now, days)
+                buckets_end = date_to_bucket(last, now, days)
+
+                if dt == "charter" and to_state == "Approved" and buckets_start < 0:
+                    # don't count old charter approvals
+                    break
+
+                if buckets_start <= 0:
+                    if buckets_end >= 0:
+                        for b in range(0, buckets_end):
+                            ad.buckets[dt][sn][b].append(doc.name)
+                            sums[dt][sn][b].append(doc.name)
+                        last = e.time
+                    break
+
+                # record doc state in the indicated buckets
+                for b in range(buckets_start, buckets_end):
+                    ad.buckets[dt][sn][b].append(doc.name)
+                    sums[dt][sn][b].append(doc.name)
+                last = e.time
+
+    metadata = [
+        {
+            "type": (dt, doc_type_name(dt)),
+            "states": [
+                (state, shorten_state_name(_calculate_state_name(dt, state))) for state in ad.buckets[dt]
             ],
-        )
-        for gt in group_types
+            "ads": ads,
+        }
+        for dt in AD_WORKLOAD
     ]
 
-    return render(request, "doc/ad_list.html", {"workload": workload, "delta": delta})
+    data = {
+        dt: {slugify(ad): ad.buckets[dt] for ad in ads} | {"sum": sums[dt]}
+        for dt in AD_WORKLOAD
+    }
+
+    return render(
+        request,
+        "doc/ad_list.html",
+        {"metadata": metadata, "data": data, "delta": days},
+    )
+
 
 def docs_for_ad(request, name):
+    def sort_key(doc):
+        dt = doc_type(doc)
+        dt_key = list(AD_WORKLOAD.keys()).index(dt)
+        ds = doc_state(doc)
+        ds_key = AD_WORKLOAD[dt].index(ds) if ds in AD_WORKLOAD[dt] else 99
+        return dt_key * 100 + ds_key
+
     ad = None
-    responsible = Document.objects.values_list('ad', flat=True).distinct()
-    for p in Person.objects.filter(Q(role__name__in=("pre-ad", "ad"),
-                                     role__group__type="area",
-                                     role__group__state="active")
-                                   | Q(pk__in=responsible)).distinct():
+    responsible = Document.objects.values_list("ad", flat=True).distinct()
+    for p in Person.objects.filter(
+        Q(
+            role__name__in=("pre-ad", "ad"),
+            role__group__type="area",
+            role__group__state="active",
+        )
+        | Q(pk__in=responsible)
+    ).distinct():
         if name == p.full_name_as_key():
             ad = p
             break
     if not ad:
         raise Http404
-    form = SearchForm({'by':'ad','ad': ad.id,
-                       'rfcs':'on', 'activedrafts':'on', 'olddrafts':'on',
-                       'sort': 'status',
-                       'doctypes': list(DocTypeName.objects.filter(used=True).exclude(slug__in=('draft','liai-att')).values_list("pk", flat=True))})
-    results, meta = prepare_document_table(request, retrieve_search_results(form), form.data, max_results=500)
-    results.sort(key=ad_dashboard_sort_key)
-    del meta["headers"][-1]
-    #
+
+    results, meta = prepare_document_table(
+        request, Document.objects.filter(ad=ad), max_results=500, show_ad_and_shepherd=False
+    )
+    results.sort(key=lambda d: sort_key(d))
+
+    # filter out some results
+    results = [
+        r
+        for r in results
+        if not (
+            r.type_id == "charter"
+            and (
+                r.group.state_id == "abandon"
+                or r.get_state_slug("charter") == "replaced"
+            )
+        )
+        and not (
+            r.type_id == "draft"
+            and (
+                r.get_state_slug("draft-iesg") == "dead"
+                or r.get_state_slug("draft") == "repl"
+                or r.get_state_slug("draft") == "rfc"
+                or (r.get_state_slug("draft") == "expired" and r.get_state_slug("draft-iesg") == "idexists")
+            )
+        )
+    ]
+
+    _calculate_state_name = get_state_name_calculator()
     for d in results:
-        d.search_heading = ad_dashboard_group(d)
-    #
-    # Additional content showing docs with blocking positions by this ad
+        dt = d.type.slug
+        d.search_heading = _calculate_state_name(dt, doc_state(d))
+        if d.search_heading != "RFC":
+            d.search_heading += f" {doc_type_name(dt)}"
+
+    # Additional content showing docs with blocking positions by this AD,
+    # and docs that the AD hasn't balloted on that are lacking ballot positions to progress
     blocked_docs = []
+    not_balloted_docs = []
     if ad in get_active_ads():
-        possible_docs = Document.objects.filter(Q(states__type="draft-iesg",
-                                                  states__slug__in=IESG_BALLOT_ACTIVE_STATES) |
-                                                Q(states__type="charter",
-                                                  states__slug__in=IESG_CHARTER_ACTIVE_STATES) |
-                                                Q(states__type__in=("statchg", "conflrev"),
-                                                  states__slug__in=IESG_STATCHG_CONFLREV_ACTIVE_STATES),
-                                                docevent__ballotpositiondocevent__pos__blocking=True,
-                                                docevent__ballotpositiondocevent__balloter=ad).distinct()
+        iesg_docs = Document.objects.filter(
+            Q(states__type="draft-iesg", states__slug__in=IESG_BALLOT_ACTIVE_STATES)
+            | Q(states__type="charter", states__slug__in=IESG_CHARTER_ACTIVE_STATES)
+            | Q(
+                states__type__in=("statchg", "conflrev"),
+                states__slug__in=IESG_STATCHG_CONFLREV_ACTIVE_STATES,
+            )
+        ).distinct()
+        possible_docs = iesg_docs.filter(
+            docevent__ballotpositiondocevent__pos__blocking=True,
+            docevent__ballotpositiondocevent__balloter=ad,
+        )
         for doc in possible_docs:
             ballot = doc.active_ballot()
             if not ballot:
                 continue
 
             blocking_positions = [p for p in ballot.all_positions() if p.pos.blocking]
-            if not blocking_positions or not any( p.balloter==ad for p in blocking_positions ):
+            if not blocking_positions or not any(
+                p.balloter == ad for p in blocking_positions
+            ):
                 continue
 
             augment_events_with_revision(doc, blocking_positions)
@@ -712,15 +720,129 @@ def docs_for_ad(request, name):
 
         # latest first
         if blocked_docs:
-            blocked_docs.sort(key=lambda d: min(p.time for p in d.blocking_positions if p.balloter==ad), reverse=True)
+            blocked_docs.sort(
+                key=lambda d: min(
+                    p.time for p in d.blocking_positions if p.balloter == ad
+                ),
+                reverse=True,
+            )
+
+        possible_docs = iesg_docs.exclude(
+            Q(docevent__ballotpositiondocevent__balloter=ad)
+        )
+        for doc in possible_docs:
+            ballot = doc.active_ballot()
+            if (
+                not ballot
+                or doc.get_state_slug("draft") == "repl"
+                or doc.get_state_slug("draft-iesg") == "defer"
+                or not doc.previous_telechat_date()
+            ):
+                continue
+
+            iesg_ballot_summary = needed_ballot_positions(
+                doc, list(ballot.active_balloter_positions().values())
+            )
+            if re.search(r"\bNeeds\s+\d+", iesg_ballot_summary):
+                not_balloted_docs.append(doc)
+
+    return render(
+        request,
+        "doc/drafts_for_ad.html",
+        {
+            "docs": results,
+            "meta": meta,
+            "ad": ad,
+            "blocked_docs": blocked_docs,
+            "not_balloted_docs": not_balloted_docs,
+        },
+    )
+
+
+def docs_for_iesg(request):
+    def sort_key(doc):
+        dt = doc_type(doc)
+        dt_key = list(AD_WORKLOAD.keys()).index(dt)
+        ds = doc_state(doc)
+        ds_key = AD_WORKLOAD[dt].index(ds) if ds in AD_WORKLOAD[dt] else 99
+        return dt_key * 100 + ds_key
+
+    results, meta = prepare_document_table(
+        request,
+        Document.objects.filter(
+            ad__in=Person.objects.filter(
+                Q(
+                    role__name__in=("pre-ad", "ad"),
+                    role__group__type="area",
+                    role__group__state="active",
+                )
+            )
+        ).exclude(
+            type_id="rfc",
+        ).exclude(
+            type_id="draft",
+            states__type="draft", 
+            states__slug__in=["repl", "rfc"],
+        ).exclude(
+            type_id="draft",
+            states__type="draft-iesg",
+            states__slug__in=["idexists", "rfcqueue"],
+        ).exclude(
+            type_id="conflrev",
+            states__type="conflrev",
+            states__slug__in=["appr-noprob-sent", "appr-reqnopub-sent", "withdraw", "dead"],
+        ).exclude(
+            type_id="statchg",
+            states__type="statchg",
+            states__slug__in=["appr-sent", "dead"],
+        ).exclude(
+            type_id="charter",
+            states__type="charter",
+            states__slug__in=["notrev", "infrev", "approved", "replaced"],
+        ),
+        max_results=1000,
+        show_ad_and_shepherd=True,
+    )
+    results.sort(key=lambda d: sort_key(d))
+
+    # filter out some results
+    results = [
+        r
+        for r in results
+        if not (
+            r.type_id == "charter"
+            and (
+                r.group.state_id == "abandon"
+                or r.get_state_slug("charter") == "replaced"
+            )
+        )
+        and not (
+            r.type_id == "draft"
+            and (
+                r.get_state_slug("draft-iesg") == "dead"
+                or r.get_state_slug("draft") == "repl"
+                or r.get_state_slug("draft") == "rfc"
+            )
+        )
+    ]
+
+    _calculate_state_name = get_state_name_calculator()
+    for d in results:
+        dt = d.type.slug
+        d.search_heading = _calculate_state_name(dt, doc_state(d))
+        if d.search_heading != "RFC":
+            d.search_heading += f" {doc_type_name(dt)}"
+
+    return render(
+        request,
+        "doc/drafts_for_iesg.html",
+        {
+            "docs": results,
+            "meta": meta,
+        },
+    )
 
-        for d in blocked_docs:
-           if d.get_base_name() == 'charter-ietf-shmoo-01-04.txt':
-              print('Is in list')
 
-    return render(request, 'doc/drafts_for_ad.html', {
-        'form':form, 'docs':results, 'meta':meta, 'ad_name': ad.plain_name(), 'blocked_docs': blocked_docs
-    })
 def drafts_in_last_call(request):
     lc_state = State.objects.get(type="draft-iesg", slug="lc").pk
     form = SearchForm({'by':'state','state': lc_state, 'rfcs':'on', 'activedrafts':'on'})
@@ -733,35 +855,12 @@ def drafts_in_last_call(request):
         'form':form, 'docs':results, 'meta':meta, 'pages':pages
     })
 
-def drafts_in_iesg_process(request):
-    states = State.objects.filter(type="draft-iesg").exclude(slug__in=('idexists', 'pub', 'dead', 'watching', 'rfcqueue'))
-    title = "Documents in IESG process"
-
-    grouped_docs = []
-
-    for s in states.order_by("order"):
-        docs = Document.objects.filter(type="draft", states=s).distinct().order_by("time").select_related("ad", "group", "group__parent")
-        if docs:
-            if s.slug == "lc":
-                for d in docs:
-                    e = d.latest_event(LastCallDocEvent, type="sent_last_call")
-                    d.lc_expires = e.expires if e else datetime.datetime.min
-                docs = list(docs)
-                docs.sort(key=lambda d: d.lc_expires)
-
-            grouped_docs.append((s, docs))
-
-    return render(request, 'doc/drafts_in_iesg_process.html', {
-            "grouped_docs": grouped_docs,
-            "title": title,
-            })
-
 def recent_drafts(request, days=7):
     slowcache = caches['slowpages']
-    cache_key = f'recentdraftsview{days}' 
+    cache_key = f'recentdraftsview{days}'
     cached_val = slowcache.get(cache_key)
     if not cached_val:
-        since = datetime.datetime.now()-datetime.timedelta(days=days)
+        since = timezone.now()-datetime.timedelta(days=days)
         state = State.objects.get(type='draft', slug='active')
         events = NewRevisionDocEvent.objects.filter(time__gt=since)
         names = [ e.doc.name for e in events ]
@@ -780,78 +879,97 @@ def recent_drafts(request, days=7):
     })
 
 
-def index_all_drafts(request):
+def index_all_drafts(request): # Should we rename this
     # try to be efficient since this view returns a lot of data
     categories = []
 
-    for s in ("active", "rfc", "expired", "repl", "auth-rm", "ietf-rm"):
+    # Gather drafts
+    for s in ("active", "expired", "repl", "auth-rm", "ietf-rm"):
         state = State.objects.get(type="draft", slug=s)
 
-        if state.slug == "rfc":
-            heading = "RFCs"
-        elif state.slug in ("ietf-rm", "auth-rm"):
+        if state.slug in ("ietf-rm", "auth-rm"):
             heading = "Internet-Drafts %s" % state.name
         else:
             heading = "%s Internet-Drafts" % state.name
 
-        draft_names = DocAlias.objects.filter(docs__states=state).values_list("name", "docs__name")
+        drafts = Document.objects.filter(type_id="draft", states=state).order_by("name")
 
-        names = []
-        names_to_skip = set()
-        for name, doc in draft_names:
-            sort_key = name
-            if name != doc:
-                if not name.startswith("rfc"):
-                    name, doc = doc, name
-                names_to_skip.add(doc)
-
-            if name.startswith("rfc"):
-                name = name.upper()
-                sort_key = '%09d' % (100000000-int(name[3:]))
-
-            names.append((name, sort_key))
-
-        names.sort(key=lambda t: t[1])
-
-        names = [f'<a href=\"{urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=n))}\">{n}</a>'
-                 for n, __ in names if n not in names_to_skip]
+        names = [
+            f'<a href=\"{urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))}\">{doc.name}</a>'
+            for doc in drafts
+        ]        
 
         categories.append((state,
                       heading,
                       len(names),
                       "<br>".join(names)
                       ))
+    
+    # gather RFCs
+    rfcs = Document.objects.filter(type_id="rfc").order_by('-rfc_number')
+    names = [
+        f'<a href=\"{urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name))}\">{rfc.name.upper()}</a>'
+        for rfc in rfcs
+    ]
+    
+    state = State.objects.get(type_id="rfc", slug="published")
+
+    categories.append((state,
+                    "RFCs",
+                    len(names),
+                    "<br>".join(names)
+                    ))
+    
+    # Return to the previous section ordering
+    categories = categories[0:1]+categories[5:]+categories[1:5]
+
     return render(request, 'doc/index_all_drafts.html', { "categories": categories })
 
 def index_active_drafts(request):
+    slowcache = caches['slowpages']
     cache_key = 'doc:index_active_drafts'
-    groups = cache.get(cache_key)
+    groups = slowcache.get(cache_key)
     if not groups:
         groups = active_drafts_index_by_group()
-        cache.set(cache_key, groups, 15*60)
+        slowcache.set(cache_key, groups, 15*60)
     return render(request, "doc/index_active_drafts.html", { 'groups': groups })
 
-def ajax_select2_search_docs(request, model_name, doc_type):
-    if model_name == "docalias":
-        model = DocAlias
-    else:
-        model = Document
+def ajax_select2_search_docs(request, model_name, doc_type): # TODO - remove model_name argument...
+    """Get results for a select2 search field
+    
+    doc_type can be "draft", "rfc", or "all", to search for only docs of type "draft", only docs of
+    type "rfc", or docs of type "draft" or "rfc" or any of the subseries ("bcp", "std", ...).
+    
+    If a need arises for searching _only_ for draft or rfc, without including the subseries, then an
+    additional option or options will be needed.
+    """
+    model = Document # Earlier versions allowed searching over DocAlias which no longer exists
 
     q = [w.strip() for w in request.GET.get('q', '').split() if w.strip()]
 
     if not q:
         objs = model.objects.none()
     else:
-        qs = model.objects.all()
-
-        if model == Document:
-            qs = qs.filter(type=doc_type)
-        elif model == DocAlias:
-            qs = qs.filter(docs__type=doc_type)
-
+        if doc_type == "draft":
+            types = ["draft"]
+        elif doc_type == "rfc":
+            types = ["rfc"]
+        elif doc_type == "all":
+            types = ("draft", "rfc", "bcp", "fyi", "std")
+        else:
+            return HttpResponseBadRequest("Invalid document type")
+        qs = model.objects.filter(type__in=[t.strip() for t in types])
         for t in q:
             qs = qs.filter(name__icontains=t)
 
         objs = qs.distinct().order_by("name")[:20]
 
     return HttpResponse(select2_id_doc_name_json(model, objs), content_type='application/json')
+
+def index_subseries(request, type_id):
+    docs = sorted(Document.objects.filter(type_id=type_id),key=lambda o: int(o.name[3:]))
+    if len(docs)>0:
+        type = docs[0].type
+    else:
+        type = DocTypeName.objects.get(slug=type_id)
+    return render(request, "doc/index_subseries.html", {"type": type, "docs": docs})
diff --git a/ietf/doc/views_statement.py b/ietf/doc/views_statement.py
new file mode 100644
index 0000000000..4b85c81d83
--- /dev/null
+++ b/ietf/doc/views_statement.py
@@ -0,0 +1,321 @@
+# Copyright The IETF Trust 2023-2025, All Rights Reserved
+from django.contrib import messages
+
+import debug  # pyflakes: ignore
+
+from pathlib import Path
+
+from django import forms
+from django.conf import settings
+from django.http import FileResponse, Http404, HttpResponseRedirect
+from django.views.decorators.cache import cache_control
+from django.shortcuts import get_object_or_404, render, redirect
+from django.template.loader import render_to_string
+
+from ietf.doc.forms import ChangeStatementStateForm
+from ietf.doc.utils import add_state_change_event
+from ietf.utils import markdown
+from django.utils.html import escape
+
+from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, State
+from ietf.group.models import Group
+from ietf.ietfauth.utils import role_required
+from ietf.utils.text import xslugify
+from ietf.utils.textupload import get_cleaned_text_file_content
+
+CONST_PDF_REV_NOTICE = "The current revision of this statement is in pdf format"
+
+
+@cache_control(max_age=3600)
+def serve_pdf(self, name, rev=None):
+    doc = get_object_or_404(Document, name=name)
+    if rev is None:
+        rev = doc.rev
+    p = Path(doc.get_file_path()).joinpath(f"{doc.name}-{rev}.pdf")
+    if not p.exists():
+        raise Http404
+    else:
+        return FileResponse(p.open(mode="rb"), content_type="application/pdf")
+
+
+class StatementUploadForm(forms.Form):
+    ACTIONS = [
+        ("enter", "Enter content directly"),
+        ("upload", "Upload content from file"),
+    ]
+    statement_submission = forms.ChoiceField(choices=ACTIONS, widget=forms.RadioSelect)
+    statement_file = forms.FileField(
+        label="Markdown or PDF source file to upload", required=False
+    )
+    statement_content = forms.CharField(
+        widget=forms.Textarea(attrs={"rows": 30}), required=False, strip=False
+    )
+
+    def clean(self):
+        def require_field(f):
+            if not self.cleaned_data.get(f):
+                self.add_error(f, forms.ValidationError("You must fill in this field."))
+                return False
+            else:
+                return True
+
+        submission_method = self.cleaned_data.get("statement_submission")
+        markdown_content = ""
+        if submission_method == "enter":
+            if require_field("statement_content"):
+                markdown_content = self.cleaned_data["statement_content"].replace(
+                    "\r", ""
+                )
+                default_content = render_to_string(
+                    "doc/statement/statement_template.md", {}
+                )
+                if markdown_content == default_content:
+                    raise forms.ValidationError(
+                        "The example content may not be saved. Edit it to contain the next revision statement content."
+                    )
+                if markdown_content == CONST_PDF_REV_NOTICE:
+                    raise forms.ValidationError(
+                        "Not proceeding with the text noting that the current version is pdf. Did you mean to upload a new PDF?"
+                    )
+        elif submission_method == "upload":
+            if require_field("statement_file"):
+                content_type = self.cleaned_data["statement_file"].content_type
+                acceptable_types = (
+                    "application/pdf",
+                ) + settings.DOC_TEXT_FILE_VALID_UPLOAD_MIME_TYPES
+                if not content_type.startswith(
+                    acceptable_types
+                ):  # dances around decoration of types with encoding etc.
+                    self.add_error(
+                        "statement_file",
+                        forms.ValidationError(
+                            f"Unexpected content type: Expected one of {', '.join(acceptable_types)}"
+                        ),
+                    )
+                elif content_type != "application/pdf":
+                    markdown_content = get_cleaned_text_file_content(
+                        self.cleaned_data["statement_file"]
+                    )
+        if markdown_content != "":
+            try:
+                _ = markdown.liberal_markdown(markdown_content)
+            except Exception as e:
+                raise forms.ValidationError(f"Markdown processing failed: {e}")
+
+
+@role_required("Secretariat")
+def submit(request, name):
+    statement = get_object_or_404(Document, type="statement", name=name)
+
+    if request.method == "POST":
+        form = StatementUploadForm(request.POST, request.FILES)
+        if form.is_valid():
+            statement_submission = form.cleaned_data["statement_submission"]
+            writing_pdf = (
+                statement_submission == "upload"
+                and form.cleaned_data["statement_file"].content_type
+                == "application/pdf"
+            )
+
+            statement.rev = "%02d" % (int(statement.rev) + 1)
+            statement.uploaded_filename = (
+                f"{statement.name}-{statement.rev}.{'pdf' if writing_pdf else 'md'}"
+            )
+            e = NewRevisionDocEvent.objects.create(
+                type="new_revision",
+                doc=statement,
+                by=request.user.person,
+                rev=statement.rev,
+                desc="New revision available",
+            )
+            statement.save_with_history([e])
+            markdown_content = ""
+            if statement_submission == "upload":
+                if not writing_pdf:
+                    markdown_content = get_cleaned_text_file_content(
+                        form.cleaned_data["statement_file"]
+                    )
+            else:
+                markdown_content = form.cleaned_data["statement_content"]
+            with Path(statement.get_file_name()).open(
+                mode="wb" if writing_pdf else "w"
+            ) as destination:
+                if writing_pdf:
+                    f = form.cleaned_data["statement_file"]
+                    for chunk in f.chunks():
+                        destination.write(chunk)
+                    f.seek(0)
+                    statement.store_file(statement.uploaded_filename, f)
+                else:
+                    destination.write(markdown_content)
+                    statement.store_str(statement.uploaded_filename, markdown_content)
+            return redirect("ietf.doc.views_doc.document_main", name=statement.name)
+    else:
+        if statement.uploaded_filename.endswith("pdf"):
+            text = CONST_PDF_REV_NOTICE
+        else:
+            text = statement.text_or_error()
+        init = {
+            "statement_content": text,
+            "statement_submission": "enter",
+        }
+        form = StatementUploadForm(initial=init)
+    return render(
+        request, "doc/statement/upload_content.html", {"form": form, "doc": statement}
+    )
+
+
+class NewStatementForm(StatementUploadForm):
+    group = forms.ModelChoiceField(
+        queryset=Group.objects.filter(acronym__in=["iab", "iesg"])
+    )
+    title = forms.CharField(max_length=255)
+    field_order = [
+        "group",
+        "title",
+        "statement_submission",
+        "statement_file",
+        "statement_content",
+    ]
+
+    def name_from_title_and_group(self, title, group):
+        title_slug = xslugify(title)
+        if title_slug.startswith(f"{group.acronym}-"):
+            title_slug = title_slug[len(f"{group.acronym}-") :]
+        name = f"statement-{group.acronym}-{title_slug[:240]}"
+        return name.replace("_", "-")
+
+    def clean(self):
+        if all([field in self.cleaned_data for field in ["title", "group"]]):
+            title = self.cleaned_data["title"]
+            group = self.cleaned_data["group"]
+            name = self.name_from_title_and_group(title, group)
+            if name == self.name_from_title_and_group("", group):
+                self.add_error(
+                    "title",
+                    forms.ValidationError(
+                        "The filename derived from this title is empty. Please include a few descriptive words using ascii or numeric characters"
+                    ),
+                )
+            if Document.objects.filter(name=name).exists():
+                self.add_error(
+                    "title",
+                    forms.ValidationError(
+                        "This title produces a filename already used by an existing statement"
+                    ),
+                )
+        return super().clean()
+
+
+@role_required("Secretariat")
+def new_statement(request):
+    if request.method == "POST":
+        form = NewStatementForm(request.POST, request.FILES)
+        if form.is_valid():
+            statement_submission = form.cleaned_data["statement_submission"]
+            writing_pdf = (
+                statement_submission == "upload"
+                and form.cleaned_data["statement_file"].content_type
+                == "application/pdf"
+            )
+
+            group = form.cleaned_data["group"]
+            title = form.cleaned_data["title"]
+            name = form.name_from_title_and_group(title, group)
+            statement = Document.objects.create(
+                type_id="statement",
+                group=group,
+                name=name,
+                title=title,
+                abstract="",
+                rev="00",
+                uploaded_filename=f"{name}-00.{'pdf' if writing_pdf else 'md'}",
+            )
+            statement.set_state(State.objects.get(type_id="statement", slug="active"))
+            e1 = NewRevisionDocEvent.objects.create(
+                type="new_revision",
+                doc=statement,
+                by=request.user.person,
+                rev=statement.rev,
+                desc="New revision available",
+                time=statement.time,
+            )
+            e2 = DocEvent.objects.create(
+                type="published_statement",
+                doc=statement,
+                rev=statement.rev,
+                by=request.user.person,
+                desc="Statement published",
+                time=statement.time,
+            )
+            statement.save_with_history([e1, e2])
+            markdown_content = ""
+            if statement_submission == "upload":
+                if not writing_pdf:
+                    markdown_content = get_cleaned_text_file_content(
+                        form.cleaned_data["statement_file"]
+                    )
+            else:
+                markdown_content = form.cleaned_data["statement_content"]
+            with Path(statement.get_file_name()).open(
+                mode="wb" if writing_pdf else "w"
+            ) as destination:
+                if writing_pdf:
+                    f = form.cleaned_data["statement_file"]
+                    for chunk in f.chunks():
+                        destination.write(chunk)
+                        f.seek(0)
+                        statement.store_file(statement.uploaded_filename, f)
+                else:
+                    destination.write(markdown_content)
+                    statement.store_str(statement.uploaded_filename, markdown_content)
+            return redirect("ietf.doc.views_doc.document_main", name=statement.name)
+
+    else:
+        init = {
+            "statement_content": escape(
+                render_to_string(
+                    "doc/statement/statement_template.md", {"settings": settings}
+                )
+            ),
+            "statement_submission": "enter",
+        }
+        form = NewStatementForm(initial=init)
+    return render(request, "doc/statement/new_statement.html", {"form": form})
+
+
+@role_required("Secretariat")
+def change_statement_state(request, name):
+    """Change state of a statement Document"""
+    statement = get_object_or_404(
+        Document.objects.filter(type_id="statement"),
+        name=name,
+    )
+    if request.method == "POST":
+        form = ChangeStatementStateForm(request.POST)
+        if form.is_valid():
+            new_state = form.cleaned_data["state"]
+            prev_state = statement.get_state()
+            if new_state == prev_state:
+                messages.info(request, f"State not changed, remains {prev_state}.")
+            else:
+                statement.set_state(new_state)
+                e = add_state_change_event(
+                    statement,
+                    request.user.person,
+                    prev_state,
+                    new_state,
+                )
+                statement.save_with_history([e])
+                messages.success(request, f"State changed to {new_state}.")
+            return HttpResponseRedirect(statement.get_absolute_url())
+    else:
+        form = ChangeStatementStateForm(initial={"state": statement.get_state()})
+    return render(
+        request,
+        "doc/statement/change_statement_state.html",
+        {
+            "form": form,
+            "statement": statement,
+        },
+    )
diff --git a/ietf/doc/views_stats.py b/ietf/doc/views_stats.py
index 414d04bbe8..028573b338 100644
--- a/ietf/doc/views_stats.py
+++ b/ietf/doc/views_stats.py
@@ -4,25 +4,22 @@
 import datetime
 
 from django.conf import settings
-from django.core.cache import cache
-from django.urls import reverse as urlreverse
 from django.db.models.aggregates import Count
-from django.http import JsonResponse, HttpResponseBadRequest
-from django.shortcuts import render
+from django.db.models.functions import TruncDate
+from django.http import JsonResponse
 from django.views.decorators.cache import cache_page
 
 import debug                            # pyflakes:ignore
 
 from ietf.doc.models import DocEvent
 from ietf.doc.templatetags.ietf_filters import comma_separated_list
-from ietf.doc.utils import get_search_cache_key
-from ietf.doc.views_search import SearchForm, retrieve_search_results
 from ietf.name.models import DocTypeName
 from ietf.person.models import Person
+from ietf.utils.timezone import date_today
 
-epochday = datetime.datetime.utcfromtimestamp(0).date().toordinal()
 
-column_chart_conf = settings.CHART_TYPE_COLUMN_OPTIONS
+epochday = datetime.datetime.fromtimestamp(0, datetime.UTC).date().toordinal()
+
 
 def dt(s):
     "Convert the date string returned by sqlite's date() to a datetime.date"
@@ -38,16 +35,13 @@ def model_to_timeline_data(model, field='time', **kwargs):
     assert field in [ f.name for f in model._meta.get_fields() ]
 
     objects = ( model.objects.filter(**kwargs)
+                                .annotate(date=TruncDate(field, tzinfo=datetime.UTC))
                                 .order_by('date')
-                                .extra(select={'date': 'date(%s.%s)'% (model._meta.db_table, field) })
                                 .values('date')
                                 .annotate(count=Count('id')))
     if objects.exists():
         obj_list = list(objects)
-        # This is needed for sqlite, when we're running tests:
-        if type(obj_list[0]['date']) != datetime.date:
-            obj_list = [ {'date': dt(e['date']), 'count': e['count']} for e in obj_list ]
-        today = datetime.date.today()
+        today = date_today(datetime.UTC)
         if not obj_list[-1]['date'] == today:
             obj_list += [ {'date': today, 'count': 0} ]
         data = [ ((e['date'].toordinal()-epochday)*1000*60*60*24, e['count']) for e in obj_list ]
@@ -64,9 +58,9 @@ def get_doctypes(queryargs, pluralize=False):
         or queryargs.get('activedrafts') == 'on'
         or queryargs.get('olddrafts') == 'on'):
             if pluralize:
-                doctypes.append('Drafts')
+                doctypes.append('Internet-Drafts')
             else:
-                doctypes.append('Draft')
+                doctypes.append('Internet-Draft')
     alltypes = DocTypeName.objects.exclude(slug__in='draft').order_by('name');
     for doctype in alltypes:
         if 'include-' + doctype.slug in queryargs:
@@ -114,49 +108,6 @@ def make_title(queryargs):
         title += ' with name matching "%s"' % name
     return title
 
-def chart_newrevisiondocevent(request):
-    return render(request, "doc/stats/highstock.html", {
-            "title": "Document Statistics",
-            "confurl": urlreverse("ietf.doc.views_stats.chart_conf_newrevisiondocevent"),
-            "dataurl": urlreverse("ietf.doc.views_stats.chart_data_newrevisiondocevent"),
-            "queryargs": request.GET.urlencode(),
-            }
-        )
-
-#@cache_page(60*15)
-def chart_data_newrevisiondocevent(request):
-    queryargs = request.GET
-    if queryargs:
-        cache_key = get_search_cache_key(queryargs)
-        results = cache.get(cache_key)
-        if not results:
-            form = SearchForm(queryargs)
-            if not form.is_valid():
-                return HttpResponseBadRequest("form not valid: %s" % form.errors)
-            results = retrieve_search_results(form)
-            if results.exists():
-                cache.set(cache_key, results)
-        if results.exists():
-            data = model_to_timeline_data(DocEvent, doc__in=results, type='new_revision')
-        else:
-            data = []
-    else:
-        data = []
-    return JsonResponse(data, safe=False)
-
-
-@cache_page(60*15)
-def chart_conf_newrevisiondocevent(request):
-    queryargs = request.GET
-    if queryargs:
-        conf = copy.deepcopy(settings.CHART_TYPE_COLUMN_OPTIONS)
-        conf['title']['text'] = make_title(queryargs)
-        conf['series'][0]['name'] = "Submitted %s" % get_doctypes(queryargs, pluralize=True).lower(),
-    else:
-        conf = {}
-    return JsonResponse(conf)
-
-
 @cache_page(60*15)
 def chart_conf_person_drafts(request, id):
     person = Person.objects.filter(id=id).first()
@@ -164,8 +115,8 @@ def chart_conf_person_drafts(request, id):
         conf = {}
     else:
         conf = copy.deepcopy(settings.CHART_TYPE_COLUMN_OPTIONS)
-        conf['title']['text'] = "New draft revisions over time for %s" % person.name
-        conf['series'][0]['name'] = "Submitted drafts" 
+        conf['title']['text'] = "New Internet-Draft revisions over time for %s" % person.name
+        conf['series'][0]['name'] = "Submitted Internet-Drafts"
     return JsonResponse(conf)
 
 @cache_page(60*15)
diff --git a/ietf/doc/views_status_change.py b/ietf/doc/views_status_change.py
index b64aadfd00..2bccc213c4 100644
--- a/ietf/doc/views_status_change.py
+++ b/ietf/doc/views_status_change.py
@@ -5,6 +5,7 @@
 import datetime
 import io
 import os
+from pathlib import Path
 import re
 
 from typing import Dict             # pyflakes:ignore
@@ -15,13 +16,13 @@
 from django.urls import reverse
 from django.template.loader import render_to_string
 from django.conf import settings
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.html import escape
 
 import debug                            # pyflakes:ignore
 from ietf.doc.mails import email_ad_approved_status_change
 
-from ietf.doc.models import ( Document, DocAlias, State, DocEvent, BallotDocEvent,
+from ietf.doc.models import ( Document, State, DocEvent, BallotDocEvent,
     BallotPositionDocEvent, NewRevisionDocEvent, WriteupDocEvent, STATUSCHANGE_RELATIONS )
 from ietf.doc.forms import AdForm
 from ietf.doc.lastcall import request_last_call
@@ -33,14 +34,22 @@
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.name.models import DocRelationshipName, StdLevelName
 from ietf.person.models import Person
+from ietf.utils.log import log
 from ietf.utils.mail import send_mail_preformatted
 from ietf.utils.textupload import get_cleaned_text_file_content
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 
 
 class ChangeStateForm(forms.Form):
     new_state = forms.ModelChoiceField(State.objects.filter(type="statchg", used=True), label="Status Change Evaluation State", empty_label=None, required=True)
     comment = forms.CharField(widget=forms.Textarea, help_text="Optional comment for the review history.", required=False, strip=False)
 
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop("user")
+        super(ChangeStateForm, self).__init__(*args, **kwargs)
+        if not has_role(user, "Secretariat"):
+            self.fields["new_state"].queryset = self.fields["new_state"].queryset.exclude(slug="appr-sent")
+
 
 @role_required("Area Director", "Secretariat")
 def change_state(request, name, option=None):
@@ -51,7 +60,7 @@ def change_state(request, name, option=None):
     login = request.user.person
 
     if request.method == 'POST':
-        form = ChangeStateForm(request.POST)
+        form = ChangeStateForm(request.POST, user=request.user)
         if form.is_valid():
             clean = form.cleaned_data
             new_state = clean['new_state']
@@ -97,8 +106,8 @@ def change_state(request, name, option=None):
                         relationship__slug__in=STATUSCHANGE_RELATIONS
                     )
                     related_doc_info = [
-                        dict(title=rel_doc.target.document.title,
-                             canonical_name=rel_doc.target.document.canonical_name(),
+                        dict(title=rel_doc.target.title,
+                             name=rel_doc.target.name,
                              newstatus=newstatus(rel_doc))
                         for rel_doc in related_docs
                     ]
@@ -115,7 +124,7 @@ def change_state(request, name, option=None):
                     type='statchg',
                     label='Status Change Evaluation State',
                    )
-        form = ChangeStateForm(initial=init)
+        form = ChangeStateForm(initial=init, user=request.user)
 
     return render(request, 'doc/change_state.html',
                               dict(form=form,
@@ -147,12 +156,23 @@ def clean_txt(self):
         return get_cleaned_text_file_content(self.cleaned_data["txt"])
 
     def save(self, doc):
-       filename = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
-       with io.open(filename, 'w', encoding='utf-8') as destination:
-           if self.cleaned_data['txt']:
-               destination.write(self.cleaned_data['txt'])
-           else:
-               destination.write(self.cleaned_data['content'])
+        basename = f"{doc.name}-{doc.rev}.txt"
+        filename = Path(settings.STATUS_CHANGE_PATH) / basename
+        with io.open(filename, 'w', encoding='utf-8') as destination:
+            if self.cleaned_data['txt']:
+                content = self.cleaned_data['txt']
+            else:
+                content = self.cleaned_data['content']
+            destination.write(content)
+            doc.store_str(basename, content)
+        try:
+            ftp_filename = Path(settings.FTP_DIR) / "status-changes" / basename
+            os.link(filename, ftp_filename) # Path.hardlink is not available until 3.10
+        except IOError as ex:
+            log(
+                "There was an error creating a hardlink at %s pointing to %s: %s"
+                % (ftp_filename, filename, ex)
+            )
 
 #This is very close to submit on charter - can we get better reuse?
 @role_required('Area Director','Secretariat')
@@ -161,7 +181,7 @@ def submit(request, name):
 
     login = request.user.person
 
-    path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
+    path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.name, doc.rev))
     not_uploaded_yet = doc.rev == "00" and not os.path.exists(path)
 
     if not_uploaded_yet:
@@ -178,7 +198,7 @@ def submit(request, name):
 
                 events = []
                 e = NewRevisionDocEvent(doc=doc, by=login, type="new_revision")
-                e.desc = "New version available: <b>%s-%s.txt</b>" % (doc.canonical_name(), doc.rev)
+                e.desc = "New version available: <b>%s-%s.txt</b>" % (doc.name, doc.rev)
                 e.rev = doc.rev
                 e.save()
                 events.append(e)
@@ -210,7 +230,7 @@ def submit(request, name):
                                                 dict(),
                                               )
         else:
-            filename = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
+            filename = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.name, doc.rev))
             try:
                 with io.open(filename, 'r') as f:
                     init["content"] = f.read()
@@ -252,7 +272,7 @@ def edit_title(request, name):
         init = { "title" : status_change.title }
         form = ChangeTitleForm(initial=init)
 
-    titletext = '%s-%s.txt' % (status_change.canonical_name(),status_change.rev)
+    titletext = '%s-%s.txt' % (status_change.name,status_change.rev)
     return render(request, 'doc/change_title.html',
                               {'form': form,
                                'doc': status_change,
@@ -283,7 +303,7 @@ def edit_ad(request, name):
         init = { "ad" : status_change.ad_id }
         form = AdForm(initial=init)
 
-    titletext = '%s-%s.txt' % (status_change.canonical_name(),status_change.rev)
+    titletext = '%s-%s.txt' % (status_change.name,status_change.rev)
     return render(request, 'doc/change_ad.html',
                               {'form': form,
                                'doc': status_change,
@@ -308,7 +328,7 @@ def default_approval_text(status_change,relateddoc):
 
     current_text = status_change.text_or_error() # pyflakes:ignore
 
-    if relateddoc.target.document.std_level_id in ('std','ps','ds','bcp',):
+    if relateddoc.target.std_level_id in ('std','ps','ds','bcp',):
         action = "Protocol Action"
     else:
         action = "Document Action"
@@ -319,7 +339,7 @@ def default_approval_text(status_change,relateddoc):
                                dict(status_change=status_change,
                                     status_change_url = settings.IDTRACKER_BASE_URL+status_change.get_absolute_url(),
                                     relateddoc= relateddoc,
-                                    relateddoc_url = settings.IDTRACKER_BASE_URL+relateddoc.target.document.get_absolute_url(),
+                                    relateddoc_url = settings.IDTRACKER_BASE_URL+relateddoc.target.get_absolute_url(),
                                     approved_text = current_text,
                                     action=action,
                                     newstatus=newstatus(relateddoc),
@@ -387,7 +407,7 @@ def approve(request, name):
 
             for rel in status_change.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS):
                 # Add a document event to each target
-                c = DocEvent(type="added_comment", doc=rel.target.document, rev=rel.target.document.rev, by=login)
+                c = DocEvent(type="added_comment", doc=rel.target, rev=rel.target.rev, by=login)
                 c.desc = "New status of %s approved by the IESG\n%s%s" % (newstatus(rel), settings.IDTRACKER_BASE_URL,reverse('ietf.doc.views_doc.document_main', kwargs={'name': status_change.name}))
                 c.save()
 
@@ -398,7 +418,7 @@ def approve(request, name):
         init = []
         for rel in status_change.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS):
             init.append({"announcement_text" : escape(default_approval_text(status_change,rel)),
-                         "label": "Announcement text for %s to %s"%(rel.target.document.canonical_name(),newstatus(rel)),
+                         "label": "Announcement text for %s to %s"%(rel.target.name,newstatus(rel)),
                        })
         formset = AnnouncementFormSet(initial=init)
         for form in formset.forms:
@@ -417,7 +437,7 @@ def clean_helper(form, formtype):
         rfc_fields = {}
         status_fields={}
         for k in sorted(form.data.keys()):
-            v = form.data[k]
+            v = form.data[k].lower()
             if k.startswith('new_relation_row'):
                 if re.match(r'\d{1,4}',v):
                     v = 'rfc'+v
@@ -438,7 +458,7 @@ def clean_helper(form, formtype):
 
            if not re.match(r'(?i)rfc\d{1,4}',key):
               errors.append(key+" is not a valid RFC - please use the form RFCn\n")
-           elif not DocAlias.objects.filter(name=key):
+           elif not Document.objects.filter(name=key):
               errors.append(key+" does not exist\n")
 
            if new_relations[key] not in STATUSCHANGE_RELATIONS:
@@ -467,7 +487,13 @@ class StartStatusChangeForm(forms.Form):
     ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active",role__group__type='area').order_by('name'), 
                                 label="Shepherding AD", empty_label="(None)", required=False)
     create_in_state = forms.ModelChoiceField(State.objects.filter(type="statchg", slug__in=("needshep", "adrev")), empty_label=None, required=False)
-    notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
+    notify = forms.CharField(
+        widget=forms.Textarea,
+        max_length=1023,
+        label="Notice emails",
+        help_text="Separate email addresses with commas.",
+        required=False,
+    )
     telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False, widget=forms.Select(attrs={'onchange':'make_bold()'}))
     relations={}                        # type: Dict[str, str]
 
@@ -524,13 +550,13 @@ def rfc_status_changes(request):
                           )
 
 @role_required("Area Director","Secretariat")
-def start_rfc_status_change(request,name):
+def start_rfc_status_change(request, name=None):
     """Start the RFC status change review process, setting the initial shepherding AD, and possibly putting the review on a telechat."""
 
     if name:
        if not re.match("(?i)rfc[0-9]{1,4}",name):
            raise Http404
-       seed_rfc = get_object_or_404(Document, type="draft", docalias__name=name)
+       seed_rfc = get_object_or_404(Document, type="rfc", name=name)
 
     login = request.user.person
 
@@ -553,14 +579,11 @@ def start_rfc_status_change(request,name):
                 group=iesg_group,
             )
             status_change.set_state(form.cleaned_data['create_in_state'])
-
-            DocAlias.objects.create( name= 'status-change-'+form.cleaned_data['document_name']).docs.add(status_change)
             
             for key in form.cleaned_data['relations']:
-                status_change.relateddocument_set.create(target=DocAlias.objects.get(name=key),
+                status_change.relateddocument_set.create(target=Document.objects.get(name=key),
                                                          relationship_id=form.cleaned_data['relations'][key])
 
-
             tc_date = form.cleaned_data['telechat_date']
             if tc_date:
                 update_telechat(request, status_change, login, tc_date)
@@ -570,9 +593,9 @@ def start_rfc_status_change(request,name):
         init = {}
         if name:
            init['title'] = "%s to CHANGETHIS" % seed_rfc.title
-           init['document_name'] = "%s-to-CHANGETHIS" % seed_rfc.canonical_name()
+           init['document_name'] = "%s-to-CHANGETHIS" % seed_rfc.name
            relations={}
-           relations[seed_rfc.canonical_name()]=None
+           relations[seed_rfc.name]=None
            init['relations'] = relations
         form = StartStatusChangeForm(initial=init)
 
@@ -598,11 +621,11 @@ def edit_relations(request, name):
     
             old_relations={}
             for rel in status_change.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS):
-                old_relations[rel.target.document.canonical_name()]=rel.relationship.slug
+                old_relations[rel.target.name]=rel.relationship.slug
             new_relations=form.cleaned_data['relations']
             status_change.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS).delete()
             for key in new_relations:
-                status_change.relateddocument_set.create(target=DocAlias.objects.get(name=key),
+                status_change.relateddocument_set.create(target=Document.objects.get(name=key),
                                                          relationship_id=new_relations[key])
             c = DocEvent(type="added_comment", doc=status_change, rev=status_change.rev, by=login)
             c.desc = "Affected RFC list changed.\nOLD:"
@@ -619,7 +642,7 @@ def edit_relations(request, name):
     else: 
         relations={}
         for rel in status_change.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS):
-            relations[rel.target.document.canonical_name()]=rel.relationship.slug
+            relations[rel.target.name]=rel.relationship.slug
         init = { "relations":relations, 
                }
         form = EditStatusChangeForm(initial=init)
@@ -638,7 +661,7 @@ def generate_last_call_text(request, doc):
     # and when groups are set, vary the expiration time accordingly
 
     requester = "an individual participant"
-    expiration_date = datetime.date.today() + datetime.timedelta(days=28)
+    expiration_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=28)
     cc = []
     
     new_text = render_to_string("doc/status_change/last_call_announcement.txt",
@@ -646,8 +669,8 @@ def generate_last_call_text(request, doc):
                                      settings=settings,
                                      requester=requester,
                                      expiration_date=expiration_date.strftime("%Y-%m-%d"),
-                                     changes=['%s from %s to %s\n    (%s)'%(rel.target.name.upper(),rel.target.document.std_level.name,newstatus(rel),rel.target.document.title) for rel in doc.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS)],
-                                     urls=[rel.target.document.get_absolute_url() for rel in doc.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS)],
+                                     changes=['%s from %s to %s\n    (%s)'%(rel.target.name.upper(),rel.target.std_level.name,newstatus(rel),rel.target.title) for rel in doc.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS)],
+                                     urls=[rel.target.get_absolute_url() for rel in doc.relateddocument_set.filter(relationship__slug__in=STATUSCHANGE_RELATIONS)],
                                      cc=cc
                                     )
                                )
@@ -658,7 +681,7 @@ def generate_last_call_text(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = 'Last call announcement was generated'
-    e.text = force_text(new_text)
+    e.text = force_str(new_text)
     e.save()
 
     return e 
@@ -678,7 +701,7 @@ def last_call(request, name):
     form = LastCallTextForm(initial=dict(last_call_text=escape(last_call_event.text)))
 
     if request.method == 'POST':
-        if "save_last_call_text" in request.POST or "send_last_call_request" in request.POST:
+        if "save_last_call_text" in request.POST or ("send_last_call_request" in request.POST and status_change.ad is not None):
             form = LastCallTextForm(request.POST)
             if form.is_valid():
                 events = []
diff --git a/ietf/group/admin.py b/ietf/group/admin.py
index 0773a4ce2b..685c10aeea 100644
--- a/ietf/group/admin.py
+++ b/ietf/group/admin.py
@@ -1,10 +1,12 @@
-# Copyright The IETF Trust 2010-2020, All Rights Reserved
+# Copyright The IETF Trust 2010-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 import re
 
 from functools import update_wrapper
 
+from base64 import b64encode
+
 import debug # pyflakes:ignore
 
 from django import forms
@@ -12,25 +14,27 @@
 from django.contrib import admin
 from django.contrib.admin.utils import unquote
 from django.core.management import load_command_class
+from django.db.models import BinaryField
 from django.http import Http404
 from django.shortcuts import render
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.html import escape
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from ietf.group.models import (Group, GroupFeatures, GroupHistory, GroupEvent, GroupURL, GroupMilestone,
     GroupMilestoneHistory, GroupStateTransitions, Role, RoleHistory, ChangeStateGroupEvent,
-    MilestoneGroupEvent, GroupExtResource, )
+    MilestoneGroupEvent, GroupExtResource, Appeal, AppealArtifact )
 from ietf.name.models import GroupTypeName
 
-from ietf.utils.validators import validate_external_resource_value
+from ietf.utils.admin import SaferTabularInline
 from ietf.utils.response import permission_denied
+from ietf.utils.validators import validate_external_resource_value
 
-class RoleInline(admin.TabularInline):
+class RoleInline(SaferTabularInline):
     model = Role
     raw_id_fields = ["person", "email"]
 
-class GroupURLInline(admin.TabularInline):
+class GroupURLInline(SaferTabularInline):
     model = GroupURL
 
 class GroupForm(forms.ModelForm):
@@ -69,6 +73,12 @@ def clean(self):
                     'Acronym is invalid. For groups that create documents, the acronym must be at least '
                     'two characters and only contain lowercase letters and numbers starting with a letter.'
                 )
+            elif self.cleaned_data['type'].pk == 'sdo':
+                valid_re = r'^[a-z0-9][a-z0-9-]*[a-z0-9]$'
+                error_msg = (
+                    'Acronym is invalid. It must be at least two characters and only contain lowercase '
+                    'letters and numbers. It may contain hyphens, but that is discouraged.'
+                )
             else:
                 valid_re = r'^[a-z][a-z0-9-]*[a-z0-9]$'
                 error_msg = (
@@ -152,7 +162,7 @@ def send_one_reminder(self, request, object_id):
             permission_denied(request, "You don't have edit permissions for this change.")
 
         if obj is None:
-            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_text(opts.verbose_name), 'key': escape(object_id)})
+            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_str(opts.verbose_name), 'key': escape(object_id)})
 
         return self.send_reminder(request, sdo=obj)
     
@@ -291,3 +301,52 @@ class GroupExtResourceAdmin(admin.ModelAdmin):
     search_fields = ['group__acronym', 'value', 'display_name', 'name__slug',]
     raw_id_fields = ['group', ]
 admin.site.register(GroupExtResource, GroupExtResourceAdmin)
+
+class AppealAdmin(admin.ModelAdmin):
+    list_display = ["group", "date", "name"]
+    search_fields = ["group__acronym", "date", "name"]
+    raw_id_fields = ["group"]
+admin.site.register(Appeal, AppealAdmin)
+
+# From https://stackoverflow.com/questions/58529099/adding-file-upload-widget-for-binaryfield-to-django-admin
+class BinaryFileInput(forms.ClearableFileInput):
+
+    def is_initial(self, value):
+        """
+        Return whether value is considered to be initial value.
+        """
+        return bool(value)
+
+    def format_value(self, value):
+        """Format the size of the value in the db.
+
+        We can't render it's name or url, but we'd like to give some information
+        as to wether this file is not empty/corrupt.
+        """
+        if self.is_initial(value):
+            return f'{len(value)} bytes'
+
+
+    def value_from_datadict(self, data, files, name):
+        """Return the file contents so they can be put in the db."""
+        upload = super().value_from_datadict(data, files, name)
+        if upload:
+            bits = upload.read()
+            return b64encode(bits).decode("ascii") # Who made this so hard?
+            
+class RestrictContentTypeChoicesForm(forms.ModelForm):
+    content_type = forms.ChoiceField(
+        choices=(
+            ( "text/markdown;charset=utf-8", "Markdown"),
+            ( "application/pdf", "PDF")
+        )
+    )
+class AppealArtifactAdmin(admin.ModelAdmin):
+    list_display = ["display_title", "appeal","date"]
+    ordering = ["-appeal__date", "date"]
+    formfield_overrides = {
+        BinaryField: { "widget": BinaryFileInput() },
+    }
+    form = RestrictContentTypeChoicesForm
+
+admin.site.register(AppealArtifact, AppealArtifactAdmin)
diff --git a/ietf/group/factories.py b/ietf/group/factories.py
index d8d927d801..3061e0cb7c 100644
--- a/ietf/group/factories.py
+++ b/ietf/group/factories.py
@@ -1,20 +1,33 @@
-# Copyright The IETF Trust 2015-2020, All Rights Reserved
+# Copyright The IETF Trust 2015-2022, All Rights Reserved
 import datetime
 import debug # pyflakes:ignore
 import factory
 
 from typing import List    # pyflakes:ignore
 
-from ietf.group.models import Group, Role, GroupEvent, GroupMilestone, \
-                              GroupHistory, RoleHistory
+from django.utils import timezone
+
+from ietf.group.models import (
+    Appeal,
+    AppealArtifact,
+    Group,
+    GroupEvent,
+    GroupMilestone,
+    GroupHistory,
+    Role,
+    RoleHistory
+)   
 from ietf.review.factories import ReviewTeamSettingsFactory
+from ietf.utils.timezone import date_today
+
 
 class GroupFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Group
         django_get_or_create = ('acronym',)
+        skip_postgeneration_save = True
 
-    name = factory.Faker('sentence',nb_words=6)
+    name = factory.Faker('text', max_nb_chars=80)
     acronym = factory.Sequence(lambda n: 'acronym%d' %n)
     state_id = 'active'
     type_id = 'wg'
@@ -66,7 +79,7 @@ class Meta:
 
 class DatedGroupMilestoneFactory(BaseGroupMilestoneFactory):
     group = factory.SubFactory(GroupFactory, uses_milestone_dates=True)
-    due = datetime.datetime.today()+datetime.timedelta(days=180)
+    due = date_today() + datetime.timedelta(days=180)
 
 class DatelessGroupMilestoneFactory(BaseGroupMilestoneFactory):
     group = factory.SubFactory(GroupFactory, uses_milestone_dates=False)
@@ -75,17 +88,40 @@ class DatelessGroupMilestoneFactory(BaseGroupMilestoneFactory):
 class GroupHistoryFactory(factory.django.DjangoModelFactory):
     class Meta:
         model=GroupHistory
+        skip_postgeneration_save = True
+
+    time = lambda: timezone.now()
+    group = factory.SubFactory(GroupFactory, state_id='active')
 
     name = factory.LazyAttribute(lambda obj: obj.group.name)
-    state_id = 'active'
+    state_id = factory.LazyAttribute(lambda obj: obj.group.state_id)
     type_id = factory.LazyAttribute(lambda obj: obj.group.type_id)
-    list_email = factory.LazyAttribute(lambda obj: '%s@ietf.org'% obj.group.acronym)
-    uses_milestone_dates = True
-    used_roles = [] # type: List[str]
-
-    group = factory.SubFactory(GroupFactory)
+    parent = factory.LazyAttribute(lambda obj: obj.group.parent)
+    uses_milestone_dates = factory.LazyAttribute(lambda obj: obj.group.uses_milestone_dates)
+    used_roles = factory.LazyAttribute(lambda obj: obj.group.used_roles)
+    description = factory.LazyAttribute(lambda obj: obj.group.description)
+    list_email = factory.LazyAttribute(lambda obj: '%s@ietf.org'% obj.group.acronym) #TODO : move this to GroupFactory
+    list_subscribe = factory.LazyAttribute(lambda obj: obj.group.list_subscribe)
+    list_archive = factory.LazyAttribute(lambda obj: obj.group.list_archive)
+    comments = factory.LazyAttribute(lambda obj: obj.group.comments)
+    meeting_seen_as_area = factory.LazyAttribute(lambda obj: obj.group.meeting_seen_as_area)
     acronym = factory.LazyAttribute(lambda obj: obj.group.acronym)
 
+    @factory.post_generation
+    def unused_states(obj, create, extracted, **kwargs):
+        if create:
+            if extracted:
+                obj.unused_states.set(extracted)
+            else:
+                obj.unused_states.set(obj.group.unused_states.all())
+    @factory.post_generation
+    def unused_tags(obj, create, extracted, **kwargs):
+        if create:
+            if extracted:
+                obj.unused_tags.set(extracted)
+            else:
+                obj.unused_tags.set(obj.group.unused_states.all())            
+
 class RoleHistoryFactory(factory.django.DjangoModelFactory):
     class Meta:
         model=RoleHistory
@@ -94,3 +130,36 @@ class Meta:
     person = factory.SubFactory('ietf.person.factories.PersonFactory')
     email = factory.LazyAttribute(lambda obj: obj.person.email())
 
+class AppealFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model=Appeal
+    
+    name=factory.Faker("sentence")
+    group=factory.SubFactory(GroupFactory, acronym="iab")
+
+class AppealArtifactFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model=AppealArtifact
+        skip_postgeneration_save = True
+    
+    appeal = factory.SubFactory(AppealFactory)
+    artifact_type = factory.SubFactory("ietf.name.factories.AppealArtifactTypeNameFactory", slug="appeal")
+    content_type = "text/markdown;charset=utf-8"
+    # Needs newer factory_boy
+    # bits = factory.Transformer(
+    #     "Some example **Markdown**",
+    #     lambda o: memoryview(o.encode("utf-8") if isinstance(o,str) else o)
+    # )
+    #
+    # Usage: a = AppealArtifactFactory(set_bits__using="foo bar") or
+    #        a = AppealArtifactFactory(set_bits__using=b"foo bar")
+    @factory.post_generation
+    def set_bits(obj, create, extracted, **kwargs):
+        if not create:
+            return
+        using = kwargs.pop("using","Some example **Markdown**")
+        if isinstance(using, str):
+            using = using.encode("utf-8")
+        obj.bits = memoryview(using)
+        obj.save()
+
diff --git a/ietf/group/forms.py b/ietf/group/forms.py
index 0b8fc8e459..7e00429271 100644
--- a/ietf/group/forms.py
+++ b/ietf/group/forms.py
@@ -1,9 +1,8 @@
-# Copyright The IETF Trust 2017-2020, All Rights Reserved
+# Copyright The IETF Trust 2017-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 # Stdlib imports
-import datetime
 import re
 
 import debug      # pyflakes:ignore
@@ -27,6 +26,7 @@
 from ietf.utils.textupload import get_cleaned_text_file_content
 #from ietf.utils.ordereddict import insert_after_in_ordered_dict
 from ietf.utils.fields import DatepickerDateField, MultiEmailField
+from ietf.utils.timezone import date_today
 from ietf.utils.validators import validate_external_resource_value
 
 # --- Constants --------------------------------------------------------
@@ -103,6 +103,8 @@ def __init__(self, *args, **kwargs):
         else:
             field = None
 
+        self.hide_parent = kwargs.pop('hide_parent', False)
+
         super(self.__class__, self).__init__(*args, **kwargs)
 
         if not group_features or group_features.has_chartering_process:
@@ -138,18 +140,21 @@ def __init__(self, *args, **kwargs):
             self.fields['acronym'].widget.attrs['readonly'] = ""
 
         # Sort out parent options
-        self.fields['parent'].queryset = self.fields['parent'].queryset.filter(type__in=parent_types)
-        if need_parent:
-            self.fields['parent'].required = True
-            self.fields['parent'].empty_label = None
-        # if this is a new group, fill in the default parent, if any
-        if self.group is None or (not hasattr(self.group, 'pk')):
-            self.fields['parent'].initial = self.fields['parent'].queryset.filter(
-                acronym=default_parent
-            ).first()
-        # label the parent field as 'IETF Area' if appropriate, for consistency with past behavior
-        if parent_types.count() == 1 and parent_types.first().pk == 'area':
-            self.fields['parent'].label = "IETF Area"
+        if self.hide_parent:
+            self.fields.pop('parent')
+        else:
+            self.fields['parent'].queryset = self.fields['parent'].queryset.filter(type__in=parent_types)
+            if need_parent:
+                self.fields['parent'].required = True
+                self.fields['parent'].empty_label = None
+            # if this is a new group, fill in the default parent, if any
+            if self.group is None or (not hasattr(self.group, 'pk')):
+                self.fields['parent'].initial = self.fields['parent'].queryset.filter(
+                    acronym=default_parent
+                ).first()
+            # label the parent field as 'IETF Area' if appropriate, for consistency with past behavior
+            if parent_types.count() == 1 and parent_types.first().pk == 'area':
+                self.fields['parent'].label = "IETF Area"
 
         if field:
             keys = list(self.fields.keys())
@@ -364,7 +369,7 @@ class Meta:
     def __init__(self, *args, **kwargs):
         super(AddUnavailablePeriodForm, self).__init__(*args, **kwargs)
 
-        self.fields["start_date"] = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label=self.fields["start_date"].label, help_text=self.fields["start_date"].help_text, required=self.fields["start_date"].required, initial=datetime.date.today())
+        self.fields["start_date"] = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label=self.fields["start_date"].label, help_text=self.fields["start_date"].help_text, required=self.fields["start_date"].required, initial=date_today())
         self.fields["end_date"] = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label=self.fields["end_date"].label, help_text=self.fields["end_date"].help_text, required=self.fields["end_date"].required)
 
         self.fields['availability'].widget = forms.RadioSelect(choices=UnavailablePeriod.LONG_AVAILABILITY_CHOICES)
diff --git a/ietf/group/management/commands/generate_group_aliases.py b/ietf/group/management/commands/generate_group_aliases.py
deleted file mode 100755
index 9efbb68abc..0000000000
--- a/ietf/group/management/commands/generate_group_aliases.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright The IETF Trust 2012-2021, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-# This was written as a script by Markus Stenberg <markus.stenberg@iki.fi>.
-# It was turned into a management command by Russ Housley <housley@vigisec.com>.
-
-import datetime
-import io
-import os
-import shutil
-import stat
-import time
-
-from tempfile import mkstemp
-    
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-import debug                            # pyflakes:ignore
-
-from ietf.group.models import Group
-from ietf.group.utils import get_group_ad_emails, get_group_role_emails, get_child_group_role_emails
-from ietf.name.models import GroupTypeName
-from ietf.utils.aliases import dump_sublist
-
-DEFAULT_YEARS = 5
-ACTIVE_STATES=['active', 'bof', 'proposed']
-GROUP_TYPES=['wg', 'rg', 'dir', 'team', 'review', 'program', 'rfcedtyp']
-NO_AD_GROUP_TYPES=['rg', 'team', 'program', 'rfcedtyp']
-IETF_DOMAIN=['ietf.org', ]
-IRTF_DOMAIN=['irtf.org', ]
-IAB_DOMAIN=['iab.org', ]
-
-class Command(BaseCommand):
-    help = ('Generate the group-aliases and group-virtual files for Internet-Draft '
-            'mail aliases, placing them in the file configured in '
-            'settings.GROUP_ALIASES_PATH and settings.GROUP_VIRTUAL_PATH, '
-            'respectively.  The generation includes aliases for groups that '
-            'have seen activity in the last %s years.' % (DEFAULT_YEARS))
-
-    def handle(self, *args, **options):
-        show_since = datetime.datetime.now() - datetime.timedelta(DEFAULT_YEARS*365)
-
-        date = time.strftime("%Y-%m-%d_%H:%M:%S")
-        signature = '# Generated by %s at %s\n' % (os.path.abspath(__file__), date)
-
-        ahandle, aname = mkstemp()
-        os.close(ahandle)
-        afile = io.open(aname,"w")
-
-        vhandle, vname = mkstemp()
-        os.close(vhandle)
-        vfile = io.open(vname,"w")
-
-        afile.write(signature)
-        vfile.write(signature)
-        vfile.write("%s anything\n" % settings.GROUP_VIRTUAL_DOMAIN)
-
-        # Loop through each group type and build -ads and -chairs entries
-        for g in GROUP_TYPES:
-            domains = []
-            domains += IETF_DOMAIN
-            if g == 'rg':
-                domains += IRTF_DOMAIN
-            if g == 'program':
-                domains += IAB_DOMAIN
-
-            entries = Group.objects.filter(type=g).all()
-            active_entries = entries.filter(state__in=ACTIVE_STATES)
-            inactive_recent_entries = entries.exclude(state__in=ACTIVE_STATES).filter(time__gte=show_since)
-            interesting_entries = active_entries | inactive_recent_entries
-
-            for e in interesting_entries.distinct().iterator():
-                name = e.acronym
-                
-                # Research groups, teams, and programs do not have -ads lists
-                if not g in NO_AD_GROUP_TYPES:
-                    dump_sublist(afile, vfile, name+'-ads', domains, settings.GROUP_VIRTUAL_DOMAIN, get_group_ad_emails(e))
-                # All group types have -chairs lists
-                dump_sublist(afile, vfile, name+'-chairs', domains, settings.GROUP_VIRTUAL_DOMAIN, get_group_role_emails(e, ['chair', 'secr']))
-
-        # The area lists include every chair in active working groups in the area
-        areas = Group.objects.filter(type='area').all()
-        active_areas = areas.filter(state__in=ACTIVE_STATES)
-        for area in active_areas:
-            name = area.acronym
-            area_ad_emails = get_group_role_emails(area, ['pre-ad', 'ad', 'chair'])
-            dump_sublist(afile, vfile, name+'-ads', IETF_DOMAIN, settings.GROUP_VIRTUAL_DOMAIN, area_ad_emails)
-            dump_sublist(afile, vfile, name+'-chairs', IETF_DOMAIN, settings.GROUP_VIRTUAL_DOMAIN, (get_child_group_role_emails(area, ['chair', 'secr']) | area_ad_emails))
-
-        # Other groups with chairs that require Internet-Draft submission approval
-        gtypes = GroupTypeName.objects.values_list('slug', flat=True)
-        special_groups = Group.objects.filter(type__features__req_subm_approval=True, acronym__in=gtypes, state='active')
-        for group in special_groups:
-            dump_sublist(afile, vfile, group.acronym+'-chairs', IETF_DOMAIN, settings.GROUP_VIRTUAL_DOMAIN, get_group_role_emails(group, ['chair', 'delegate']))
-
-        afile.close()
-        vfile.close()
-
-        os.chmod(aname, stat.S_IWUSR|stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH) 
-        os.chmod(vname, stat.S_IWUSR|stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH) 
-
-        shutil.move(aname, settings.GROUP_ALIASES_PATH)
-        shutil.move(vname, settings.GROUP_VIRTUAL_PATH)
diff --git a/ietf/group/migrations/0001_initial.py b/ietf/group/migrations/0001_initial.py
index 740d5315bd..57a6e6e15f 100644
--- a/ietf/group/migrations/0001_initial.py
+++ b/ietf/group/migrations/0001_initial.py
@@ -1,12 +1,13 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
-
-import datetime
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
+import ietf.name.models
+import ietf.utils.db
 import ietf.utils.models
+import ietf.utils.validators
+import jsonfield.fields
 
 
 class Migration(migrations.Migration):
@@ -24,13 +25,16 @@ class Migration(migrations.Migration):
             name='Group',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
                 ('name', models.CharField(max_length=80)),
                 ('description', models.TextField(blank=True)),
                 ('list_email', models.CharField(blank=True, max_length=64)),
                 ('list_subscribe', models.CharField(blank=True, max_length=255)),
                 ('list_archive', models.CharField(blank=True, max_length=255)),
                 ('comments', models.TextField(blank=True)),
+                ('meeting_seen_as_area', models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG')),
+                ('used_roles', jsonfield.fields.JSONField(blank=True, default=[], help_text="Leave an empty list to get the group_type's default used roles", max_length=256)),
+                ('uses_milestone_dates', models.BooleanField(default=True)),
                 ('acronym', models.SlugField(max_length=40, unique=True)),
                 ('charter', ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='chartered_group', to='doc.Document')),
                 ('parent', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
@@ -47,9 +51,11 @@ class Migration(migrations.Migration):
             name='GroupEvent',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now, help_text='When the event happened')),
+                ('time', models.DateTimeField(default=django.utils.timezone.now, help_text='When the event happened')),
                 ('type', models.CharField(choices=[('changed_state', 'Changed state'), ('added_comment', 'Added comment'), ('info_changed', 'Changed metadata'), ('requested_close', 'Requested closing group'), ('changed_milestone', 'Changed milestone'), ('sent_notification', 'Sent notification'), ('status_update', 'Status update')], max_length=50)),
                 ('desc', models.TextField()),
+                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
             ],
             options={
                 'ordering': ['-time', 'id'],
@@ -59,13 +65,16 @@ class Migration(migrations.Migration):
             name='GroupHistory',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
                 ('name', models.CharField(max_length=80)),
                 ('description', models.TextField(blank=True)),
                 ('list_email', models.CharField(blank=True, max_length=64)),
                 ('list_subscribe', models.CharField(blank=True, max_length=255)),
                 ('list_archive', models.CharField(blank=True, max_length=255)),
                 ('comments', models.TextField(blank=True)),
+                ('meeting_seen_as_area', models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG')),
+                ('used_roles', jsonfield.fields.JSONField(blank=True, default=[], help_text="Leave an empty list to get the group_type's default used roles", max_length=256)),
+                ('uses_milestone_dates', models.BooleanField(default=True)),
                 ('acronym', models.CharField(max_length=40)),
                 ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='group.Group')),
                 ('parent', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
@@ -83,7 +92,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('desc', models.CharField(max_length=500, verbose_name='Description')),
-                ('due', models.DateField()),
+                ('due', models.DateField(blank=True, null=True)),
+                ('order', models.IntegerField(blank=True, null=True)),
                 ('resolved', models.CharField(blank=True, help_text='Explanation of why milestone is resolved (usually "Done"), or empty if still due.', max_length=50)),
                 ('time', models.DateTimeField(auto_now=True)),
                 ('docs', models.ManyToManyField(blank=True, to='doc.Document')),
@@ -91,36 +101,42 @@ class Migration(migrations.Migration):
                 ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.GroupMilestoneStateName')),
             ],
             options={
-                'ordering': ['due', 'id'],
+                'ordering': ['order', 'due', 'id'],
                 'abstract': False,
             },
         ),
         migrations.CreateModel(
-            name='GroupMilestoneHistory',
+            name='ChangeStateGroupEvent',
+            fields=[
+                ('groupevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='group.GroupEvent')),
+            ],
+            bases=('group.groupevent',),
+        ),
+        migrations.CreateModel(
+            name='RoleHistory',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('desc', models.CharField(max_length=500, verbose_name='Description')),
-                ('due', models.DateField()),
-                ('resolved', models.CharField(blank=True, help_text='Explanation of why milestone is resolved (usually "Done"), or empty if still due.', max_length=50)),
-                ('time', models.DateTimeField()),
-                ('docs', models.ManyToManyField(blank=True, to='doc.Document')),
-                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
-                ('milestone', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='group.GroupMilestone')),
-                ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.GroupMilestoneStateName')),
+                ('email', ietf.utils.models.ForeignKey(help_text='Email address used by person for this role.', on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
+                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.GroupHistory')),
+                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.RoleName')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
             options={
-                'ordering': ['due', 'id'],
-                'abstract': False,
+                'verbose_name_plural': 'role histories',
             },
         ),
         migrations.CreateModel(
-            name='GroupStateTransitions',
+            name='Role',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('email', ietf.utils.models.ForeignKey(help_text='Email address used by person for this role.', on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
                 ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
-                ('next_states', models.ManyToManyField(related_name='previous_groupstatetransitions_states', to='doc.State')),
-                ('state', ietf.utils.models.ForeignKey(help_text='State for which the next states should be overridden', on_delete=django.db.models.deletion.CASCADE, to='doc.State')),
+                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.RoleName')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
+            options={
+                'ordering': ['name_id'],
+            },
         ),
         migrations.CreateModel(
             name='GroupURL',
@@ -132,38 +148,79 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='Role',
+            name='GroupStateTransitions',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('email', ietf.utils.models.ForeignKey(help_text='Email address used by person for this role.', on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
                 ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
-                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.RoleName')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('next_states', models.ManyToManyField(related_name='previous_groupstatetransitions_states', to='doc.State')),
+                ('state', ietf.utils.models.ForeignKey(help_text='State for which the next states should be overridden', on_delete=django.db.models.deletion.CASCADE, to='doc.State')),
             ],
-            options={
-                'ordering': ['name_id'],
-            },
         ),
         migrations.CreateModel(
-            name='RoleHistory',
+            name='GroupMilestoneHistory',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('email', ietf.utils.models.ForeignKey(help_text='Email address used by person for this role.', on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
-                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.GroupHistory')),
-                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.RoleName')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('desc', models.CharField(max_length=500, verbose_name='Description')),
+                ('due', models.DateField(blank=True, null=True)),
+                ('order', models.IntegerField(blank=True, null=True)),
+                ('resolved', models.CharField(blank=True, help_text='Explanation of why milestone is resolved (usually "Done"), or empty if still due.', max_length=50)),
+                ('time', models.DateTimeField()),
+                ('docs', models.ManyToManyField(blank=True, to='doc.Document')),
+                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('milestone', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='group.GroupMilestone')),
+                ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.GroupMilestoneStateName')),
             ],
             options={
-                'verbose_name_plural': 'role histories',
+                'ordering': ['order', 'due', 'id'],
+                'abstract': False,
             },
         ),
         migrations.CreateModel(
-            name='ChangeStateGroupEvent',
+            name='GroupFeatures',
             fields=[
-                ('groupevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='group.GroupEvent')),
-                ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.GroupStateName')),
+                ('type', ietf.utils.models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='features', serialize=False, to='name.GroupTypeName')),
+                ('need_parent', models.BooleanField(default=False, help_text='Does this group type require a parent group?', verbose_name='Need Parent')),
+                ('default_parent', models.CharField(blank=True, default='', help_text='Default parent group acronym for this group type', max_length=40, verbose_name='Default Parent')),
+                ('has_milestones', models.BooleanField(default=False, verbose_name='Milestones')),
+                ('has_chartering_process', models.BooleanField(default=False, verbose_name='Chartering')),
+                ('has_documents', models.BooleanField(default=False, verbose_name='Documents')),
+                ('has_session_materials', models.BooleanField(default=False, verbose_name='Sess Matrl.')),
+                ('has_nonsession_materials', models.BooleanField(default=False, verbose_name='Other Matrl.')),
+                ('has_meetings', models.BooleanField(default=False, verbose_name='Meetings')),
+                ('has_reviews', models.BooleanField(default=False, verbose_name='Reviews')),
+                ('has_default_chat', models.BooleanField(default=False, verbose_name='Chat')),
+                ('acts_like_wg', models.BooleanField(default=False, verbose_name='WG-Like')),
+                ('create_wiki', models.BooleanField(default=False, verbose_name='Wiki')),
+                ('custom_group_roles', models.BooleanField(default=False, verbose_name='Cust. Roles')),
+                ('customize_workflow', models.BooleanField(default=False, verbose_name='Workflow')),
+                ('is_schedulable', models.BooleanField(default=False, verbose_name='Schedulable')),
+                ('show_on_agenda', models.BooleanField(default=False, verbose_name='On Agenda')),
+                ('req_subm_approval', models.BooleanField(default=False, verbose_name='Subm. Approval')),
+                ('about_page', models.CharField(default='ietf.group.views.group_about', max_length=64)),
+                ('default_tab', models.CharField(default='ietf.group.views.group_about', max_length=64)),
+                ('material_types', ietf.utils.db.IETFJSONField(default=['slides'], max_length=64)),
+                ('default_used_roles', ietf.utils.db.IETFJSONField(default=[], max_length=256)),
+                ('admin_roles', ietf.utils.db.IETFJSONField(default=['chair'], max_length=64)),
+                ('docman_roles', ietf.utils.db.IETFJSONField(default=['ad', 'chair', 'delegate', 'secr'], max_length=128)),
+                ('groupman_roles', ietf.utils.db.IETFJSONField(default=['ad', 'chair'], max_length=128)),
+                ('groupman_authroles', ietf.utils.db.IETFJSONField(default=['Secretariat'], max_length=128)),
+                ('matman_roles', ietf.utils.db.IETFJSONField(default=['ad', 'chair', 'delegate', 'secr'], max_length=128)),
+                ('role_order', ietf.utils.db.IETFJSONField(default=['chair', 'secr', 'member'], help_text='The order in which roles are shown, for instance on photo pages.  Enter valid JSON.', max_length=128)),
+                ('session_purposes', ietf.utils.db.IETFJSONField(default=[], help_text='Allowed session purposes for this group type', max_length=256, validators=[ietf.utils.validators.JSONForeignKeyListValidator(ietf.name.models.SessionPurposeName)])),
+                ('agenda_filter_type', models.ForeignKey(default='none', on_delete=django.db.models.deletion.PROTECT, to='name.AgendaFilterTypeName')),
+                ('agenda_type', models.ForeignKey(default='ietf', null=True, on_delete=django.db.models.deletion.CASCADE, to='name.AgendaTypeName')),
+                ('parent_types', models.ManyToManyField(blank=True, help_text='Group types allowed as parent of this group type', related_name='child_features', to='name.GroupTypeName')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='GroupExtResource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('display_name', models.CharField(blank=True, default='', max_length=255)),
+                ('value', models.CharField(max_length=2083)),
+                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceName')),
             ],
-            bases=('group.groupevent',),
         ),
         migrations.CreateModel(
             name='MilestoneGroupEvent',
@@ -173,14 +230,13 @@ class Migration(migrations.Migration):
             ],
             bases=('group.groupevent',),
         ),
-        migrations.AddField(
+        migrations.AddIndex(
             model_name='groupevent',
-            name='by',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+            index=models.Index(fields=['-time', '-id'], name='group_group_time_ee7c7c_idx'),
         ),
         migrations.AddField(
-            model_name='groupevent',
-            name='group',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
+            model_name='changestategroupevent',
+            name='state',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.GroupStateName'),
         ),
     ]
diff --git a/ietf/group/migrations/0002_appeal.py b/ietf/group/migrations/0002_appeal.py
new file mode 100644
index 0000000000..e993eba35b
--- /dev/null
+++ b/ietf/group/migrations/0002_appeal.py
@@ -0,0 +1,83 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ietf.utils.models
+import ietf.utils.timezone
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0007_appeal_artifact_typename"),
+        ("group", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Appeal",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=512)),
+                ("date", models.DateField(default=ietf.utils.timezone.date_today)),
+                (
+                    "group",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="group.group"
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["-date", "-id"],
+            },
+        ),
+        migrations.CreateModel(
+            name="AppealArtifact",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date", models.DateField(default=ietf.utils.timezone.date_today)),
+                (
+                    "title",
+                    models.CharField(
+                        blank=True,
+                        help_text="The artifact_type.name will be used if this field is blank",
+                        max_length=256,
+                    ),
+                ),
+                ("order", models.IntegerField(default=0)),
+                ("content_type", models.CharField(max_length=32)),
+                ("bits", models.BinaryField(editable=True)),
+                (
+                    "appeal",
+                    ietf.utils.models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="group.appeal"
+                    ),
+                ),
+                (
+                    "artifact_type",
+                    ietf.utils.models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="name.appealartifacttypename",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["date", "order", "artifact_type__order"],
+            },
+        ),
+    ]
diff --git a/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py b/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py
deleted file mode 100644
index 7828722ccc..0000000000
--- a/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-07-10 15:58
-
-
-import django.core.validators
-import django.db.models.deletion
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-import debug                            # pyflakes:ignore
-
-import ietf.utils.models
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('name', '0002_agendatypename'),
-        ('group', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='GroupFeatures',
-            fields=[
-                ('type', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='name.GroupTypeName', related_name='features')),
-                ('has_milestones', models.BooleanField(default=False, verbose_name='Milestones')),
-                ('has_chartering_process', models.BooleanField(default=False, verbose_name='Chartering')),
-                ('has_documents', models.BooleanField(default=False, verbose_name='Documents')),
-                ('has_dependencies', models.BooleanField(default=False, verbose_name='Dependencies')),
-                ('has_nonsession_materials', models.BooleanField(default=False, verbose_name='Materials')),
-                ('has_meetings', models.BooleanField(default=False, verbose_name='Meetings')),
-                ('has_reviews', models.BooleanField(default=False, verbose_name='Reviews')),
-                ('has_default_jabber', models.BooleanField(default=False, verbose_name='Jabber')),
-                ('customize_workflow', models.BooleanField(default=False, verbose_name='Workflow')),
-                ('about_page', models.CharField(default='ietf.group.views.group_about', max_length=64)),
-                ('default_tab', models.CharField(default='ietf.group.views.group_about', max_length=64)),
-                ('material_types', models.CharField(default='slides', max_length=64, validators=[django.core.validators.RegexValidator(code=b'invalid', message=b'Enter a comma-separated list of material types', regex=b'[a-z0-9_-]+(,[a-z0-9_-]+)*')])),
-                # type: ignore
-                ('admin_roles', models.CharField(default='chair', max_length=64, validators=[django.core.validators.RegexValidator(code=b'invalid', message=b'Enter a comma-separated list of role slugs', regex=b'[a-z0-9_-]+(,[a-z0-9_-]+)*')])),
-                ('agenda_type', models.ForeignKey(default='ietf', null=True, on_delete=django.db.models.deletion.CASCADE, to='name.AgendaTypeName')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='HistoricalGroupFeatures',
-            fields=[
-                ('has_milestones', models.BooleanField(default=False, verbose_name='Milestones')),
-                ('has_chartering_process', models.BooleanField(default=False, verbose_name='Chartering')),
-                ('has_documents', models.BooleanField(default=False, verbose_name='Documents')),
-                ('has_dependencies', models.BooleanField(default=False, verbose_name='Dependencies')),
-                ('has_nonsession_materials', models.BooleanField(default=False, verbose_name='Materials')),
-                ('has_meetings', models.BooleanField(default=False, verbose_name='Meetings')),
-                ('has_reviews', models.BooleanField(default=False, verbose_name='Reviews')),
-                ('has_default_jabber', models.BooleanField(default=False, verbose_name='Jabber')),
-                ('customize_workflow', models.BooleanField(default=False, verbose_name='Workflow')),
-                ('about_page', models.CharField(default='ietf.group.views.group_about', max_length=64)),
-                ('default_tab', models.CharField(default='ietf.group.views.group_about', max_length=64)),
-                ('material_types', models.CharField(default='slides', max_length=64, validators=[django.core.validators.RegexValidator(code=b'invalid', message=b'Enter a comma-separated list of material types', regex=b'[a-z0-9_-]+(,[a-z0-9_-]+)*')])),
-                ('admin_roles', models.CharField(default='chair', max_length=64, validators=[django.core.validators.RegexValidator(code=b'invalid', message=b'Enter a comma-separated list of role slugs', regex=b'[a-z0-9_-]+(,[a-z0-9_-]+)*')])),
-                ('history_id', models.AutoField(primary_key=True, serialize=False)),
-                ('history_change_reason', models.CharField(max_length=100, null=True)),
-                ('history_date', models.DateTimeField()),
-                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
-                ('agenda_type', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.AgendaTypeName')),
-                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
-                ('type', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.GroupTypeName')),
-            ],
-            options={
-                'ordering': ('-history_date', '-history_id'),
-                'get_latest_by': 'history_date',
-                'verbose_name': 'historical group features',
-            },
-        ),
-    ]
diff --git a/ietf/group/migrations/0003_groupfeatures_data.py b/ietf/group/migrations/0003_groupfeatures_data.py
deleted file mode 100644
index 1e46f1df5a..0000000000
--- a/ietf/group/migrations/0003_groupfeatures_data.py
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-07-10 15:58
-
-
-from django.conf import settings
-from django.db import migrations
-
-import debug                            # pyflakes:ignore
-
-from ietf.review.utils import active_review_teams
-
-group_type_features = {
-    'ag': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'ietf',
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': True,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'area': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'ietf',
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'dir': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair,secr',
-        'agenda_type': None,
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'review': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair,secr',
-        'agenda_type': None,
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.review_requests',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': True,
-        'material_types': 'slides'},
-    'iab': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'ietf',
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': True,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'ietf': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'ietf',
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': True,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'individ': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': None,
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'irtf': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'ietf',
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'isoc': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': None,
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'nomcom': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'side',
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'program': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'lead',
-        'agenda_type': None,
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': True,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': True,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'rfcedtyp': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'side',
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'rg': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'ietf',
-        'customize_workflow': True,
-        'default_tab': 'ietf.group.views.group_documents',
-        'has_chartering_process': True,
-        'has_default_jabber': True,
-        'has_dependencies': True,
-        'has_documents': True,
-        'has_meetings': True,
-        'has_nonsession_materials': False,
-        'has_milestones': True,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'sdo': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': None,
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': False,
-        'has_nonsession_materials': False,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'team': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'ietf',
-        'customize_workflow': False,
-        'default_tab': 'ietf.group.views.group_about',
-        'has_chartering_process': False,
-        'has_default_jabber': False,
-        'has_dependencies': False,
-        'has_documents': False,
-        'has_meetings': True,
-        'has_nonsession_materials': True,
-        'has_milestones': False,
-        'has_reviews': False,
-        'material_types': 'slides'},
-    'wg': {
-        'about_page': 'ietf.group.views.group_about',
-        'admin_roles': 'chair',
-        'agenda_type': 'ietf',
-        'customize_workflow': True,
-        'default_tab': 'ietf.group.views.group_documents',
-        'has_chartering_process': True,
-        'has_default_jabber': True,
-        'has_dependencies': True,
-        'has_documents': True,
-        'has_meetings': True,
-        'has_nonsession_materials': False,
-        'has_milestones': True,
-        'has_reviews': False,
-        'material_types': 'slides'},
-}
-
-
-def forward(apps, schema_editor):
-    Group = apps.get_model('group', 'Group')
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    AgendaTypeName = apps.get_model('name', 'AgendaTypeName')
-    for type in group_type_features:
-        features = group_type_features[type]
-        features['type_id'] = type
-        if features['agenda_type']:
-            features['agenda_type'] = AgendaTypeName.objects.get(slug=features['agenda_type'])
-        GroupFeatures.objects.create(**features)
-    dir = GroupTypeName.objects.get(slug='dir')
-    review = GroupTypeName.objects.create(slug='review', name='Directorate (with reviews)', desc='', used=True, order=0)
-    review_teams = [ g.acronym for g in active_review_teams() ]
-    for group in Group.objects.filter(type=dir):
-        if group.acronym in review_teams:
-            group.type = review
-            group.save()
-
-def reverse(apps, schema_editor):
-    Group = apps.get_model('group', 'Group')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    dir = GroupTypeName.objects.get(slug='dir')
-    review = GroupTypeName.objects.get(slug='review')
-    for group in Group.objects.filter(type=review):
-        group.type = dir
-        group.save()
-    for entry in GroupFeatures.objects.all():
-        entry.delete()
-    review.delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('group', '0002_groupfeatures_historicalgroupfeatures'),
-        ('name', '0003_agendatypename_data'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0003_iabworkshops.py b/ietf/group/migrations/0003_iabworkshops.py
new file mode 100644
index 0000000000..c8d175a100
--- /dev/null
+++ b/ietf/group/migrations/0003_iabworkshops.py
@@ -0,0 +1,34 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    GroupFeatures = apps.get_model("group", "GroupFeatures")
+    GroupTypeName = apps.get_model("name", "GroupTypeName")
+
+    iabworkshop = GroupFeatures.objects.create(
+        type_id="iabworkshop",
+        need_parent=True,
+        default_parent="iab",
+        has_documents=True,
+        has_session_materials=True,
+        has_meetings=True,
+        has_default_chat=True,
+        session_purposes='["regular"]',  
+    )
+    iabworkshop.parent_types.add(GroupTypeName.objects.get(slug="ietf"))
+
+
+def reverse(apps, schema_editor):
+    GroupFeatures = apps.get_model("group", "GroupFeatures")
+    GroupFeatures.objects.filter(type="iabworkshop").delete()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("group", "0002_appeal"),
+        ("name", "0009_iabworkshops"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]
diff --git a/ietf/group/migrations/0004_add_group_feature_fields.py b/ietf/group/migrations/0004_add_group_feature_fields.py
deleted file mode 100644
index 681232f6c2..0000000000
--- a/ietf/group/migrations/0004_add_group_feature_fields.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2019-01-10 07:51
-
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0003_groupfeatures_data'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='acts_like_wg',
-            field=models.BooleanField(default=False, verbose_name='WG-Like'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='create_wiki',
-            field=models.BooleanField(default=False, verbose_name='Wiki'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='custom_group_roles',
-            field=models.BooleanField(default=False, verbose_name='Group Roles'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='has_session_materials',
-            field=models.BooleanField(default=False, verbose_name='Materials'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='is_schedulable',
-            field=models.BooleanField(default=False, verbose_name='Schedulable'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='role_order',
-            field=models.CharField(default='chair,secr,member', help_text='The order in which roles are shown, for instance on photo pages', max_length=128, validators=[django.core.validators.RegexValidator(code=b'invalid', message=b'Enter a comma-separated list of role slugs', regex=b'[a-z0-9_-]+(,[a-z0-9_-]+)*')]),
-            # type: ignore
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='show_on_agenda',
-            field=models.BooleanField(default=False, verbose_name='On Agenda'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='req_subm_approval',
-            field=models.BooleanField(default=False, verbose_name='Subm. Approval'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='matman_roles',
-            field=models.CharField(default='ad,chair,delegate,secr', max_length=64, validators=[django.core.validators.RegexValidator(code=b'invalid', message=b'Enter a comma-separated list of role slugs', regex=b'[a-z0-9_-]+(,[a-z0-9_-]+)*')]),
-            # type: ignore
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='acts_like_wg',
-            field=models.BooleanField(default=False, verbose_name='WG-Like'),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='create_wiki',
-            field=models.BooleanField(default=False, verbose_name='Wiki'),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='custom_group_roles',
-            field=models.BooleanField(default=False, verbose_name='Group Roles'),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='has_session_materials',
-            field=models.BooleanField(default=False, verbose_name='Materials'),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='is_schedulable',
-            field=models.BooleanField(default=False, verbose_name='Schedulable'),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='role_order',
-            field=models.CharField(default='chair,secr,member', help_text='The order in which roles are shown, for instance on photo pages', max_length=128, validators=[django.core.validators.RegexValidator(code=b'invalid', message=b'Enter a comma-separated list of role slugs', regex=b'[a-z0-9_-]+(,[a-z0-9_-]+)*')]),
-            # type: ignore
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='show_on_agenda',
-            field=models.BooleanField(default=False, verbose_name='On Agenda'),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='req_subm_approval',
-            field=models.BooleanField(default=False, verbose_name='Subm. Approval'),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='matman_roles',
-            field=models.CharField(default='ad,chair,delegate,secr', max_length=64, validators=[django.core.validators.RegexValidator(code=b'invalid', message=b'Enter a comma-separated list of role slugs', regex=b'[a-z0-9_-]+(,[a-z0-9_-]+)*')]),
-            # type: ignore
-        ),
-    ]
diff --git a/ietf/group/migrations/0004_modern_list_archive.py b/ietf/group/migrations/0004_modern_list_archive.py
new file mode 100644
index 0000000000..91c2fd23e2
--- /dev/null
+++ b/ietf/group/migrations/0004_modern_list_archive.py
@@ -0,0 +1,24 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.conf import settings
+from django.db import migrations
+from django.db.models import Value
+from django.db.models.functions import Replace
+
+
+def forward(apps, schema_editor):
+    Group = apps.get_model("group", "Group")
+    old_pattern = f"{settings.MAILING_LIST_ARCHIVE_URL}/arch/search/?email_list="
+    new_pattern = f"{settings.MAILING_LIST_ARCHIVE_URL}/arch/browse/"
+
+    Group.objects.filter(list_archive__startswith=old_pattern).update(
+        list_archive=Replace("list_archive", Value(old_pattern), Value(new_pattern))
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("group", "0003_iabworkshops"),
+    ]
+
+    operations = [migrations.RunPython(forward)]
diff --git a/ietf/group/migrations/0005_group_features_list_data_to_json.py b/ietf/group/migrations/0005_group_features_list_data_to_json.py
deleted file mode 100644
index 68727ffe41..0000000000
--- a/ietf/group/migrations/0005_group_features_list_data_to_json.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2019-01-09 09:02
-
-
-import json
-import re
-
-from django.db import migrations
-
-import debug                            # pyflakes:ignore
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    for f in GroupFeatures.objects.all():
-        for a in ['material_types', 'admin_roles', 'matman_roles', 'role_order']:
-            v = getattr(f, a, None)
-            if v != None:
-                v = re.sub(r'[][\\"\' ]+', '', v)
-                v = v.split(',')
-                v = json.dumps(v)
-                setattr(f, a, v)
-        f.save()
-# This migration changes existing data fields in an incompatible manner, and
-# would not be interleavable if we hadn't added compatibility code in
-# Group.features() beforehand.  With that patched in, we permit interleaving.
-forward.interleavable = True            # type: ignore # https://github.com/python/mypy/issues/2087
-
-def reverse(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    for f in GroupFeatures.objects.all():
-        for a in ['material_types', 'admin_roles', 'matman_roles', 'role_order']:
-            v = getattr(f, a, None)
-            if v != None:
-                v = getattr(f, a)
-                v = json.loads(v)
-                v = ','.join(v)
-                setattr(f, a, v)
-        f.save()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0004_add_group_feature_fields'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0005_remove_sdo_authorized_individuals.py b/ietf/group/migrations/0005_remove_sdo_authorized_individuals.py
new file mode 100644
index 0000000000..77fe25b467
--- /dev/null
+++ b/ietf/group/migrations/0005_remove_sdo_authorized_individuals.py
@@ -0,0 +1,192 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from collections import defaultdict
+
+from django.db import migrations
+
+from ietf.person.name import plain_name
+
+
+def get_plain_name(person):
+    return person.plain or plain_name(person.name)
+
+
+def forward(apps, schema_editor):
+    """Remove any 'auth' Role objects for groups of type 'sdo'
+
+    The IAB has decided that the Authorized Individual concept for
+    authorizing entry or management of liaison statments hasn't worked
+    well - the roles for the groups are not being maintained, Instead,
+    the concept will be removed and the liaison managers or secretariat
+    (and soon the liaison coordinators) will operate the liaison tool
+    on their behalf.
+    """
+    Role = apps.get_model("group", "Role")
+    GroupEvent = apps.get_model("group", "GroupEvent")
+    groups = defaultdict(list)
+    role_qs = Role.objects.filter(name_id="auth", group__type_id="sdo")
+    for role in role_qs:
+        groups[role.group].append(role)
+    for group in groups:
+        desc = f"Removed Authorized Persons: {', '.join([get_plain_name(role.person) for role in groups[group]])}"
+        GroupEvent.objects.create(
+            group=group,
+            by_id=1,  # (System)
+            desc=desc,
+        )
+    role_qs.delete()
+
+
+def reverse(apps, schema_editor):
+    """Intentionally does nothing"""
+    pass
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("group", "0004_modern_list_archive"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
+
+
+# At the time this migration was created, it would have removed these Role objects:
+# { "authorized_individuals" : [
+# {"person_id": 107937, "group_id": 56, "email": "hannu.hietalahti@nokia.com" }, # Hannu Hietalahti is Authorized Individual in 3gpp
+# {"person_id": 107943, "group_id": 56, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Authorized Individual in 3gpp
+# {"person_id": 112807, "group_id": 56, "email": "Paolo.Usai@etsi.org" }, # Paolo Usai is Authorized Individual in 3gpp
+# {"person_id": 105859, "group_id": 56, "email": "atle.monrad@ericsson.com" }, # Atle Monrad is Authorized Individual in 3gpp
+# {"person_id": 116149, "group_id": 1907, "email": "tsgsx_chair@3GPP2.org" }, # Xiaowu Zhao is Authorized Individual in 3gpp2-tsg-sx
+# {"person_id": 120914, "group_id": 1902, "email": "ozgur.oyman@intel.com" }, # Ozgur Oyman is Authorized Individual in 3gpp-tsgsa-sa4
+# {"person_id": 107943, "group_id": 1902, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Authorized Individual in 3gpp-tsgsa-sa4
+# {"person_id": 119203, "group_id": 1902, "email": "fanyanping@huawei.com" }, # Yanping Fan is Authorized Individual in 3gpp-tsgsa-sa4
+# {"person_id": 112977, "group_id": 1902, "email": "tomas.frankkila@ericsson.com" }, # Tomas Frankkila is Authorized Individual in 3gpp-tsgsa-sa4
+# {"person_id": 120240, "group_id": 2019, "email": "CM8655@att.com" }, # Peter Musgrove is Authorized Individual in atis-eloc-tf
+# {"person_id": 120241, "group_id": 2019, "email": "Christian.Militeau@intrado.com" }, # Christian Militeau is Authorized Individual in atis-eloc-tf
+# {"person_id": 120243, "group_id": 2019, "email": "ablasgen@atis.org" }, # Alexandra Blasgen is Authorized Individual in atis-eloc-tf
+# {"person_id": 114696, "group_id": 67, "email": "KEN.KO@adtran.com" }, # Ken Ko is Authorized Individual in broadband-forum
+# {"person_id": 119494, "group_id": 67, "email": "michael.fargano@centurylink.com" }, # Michael Fargano is Authorized Individual in broadband-forum
+# {"person_id": 124318, "group_id": 67, "email": "joey.boyd@adtran.com" }, # Joey Boyd is Authorized Individual in broadband-forum
+# {"person_id": 114762, "group_id": 67, "email": "bwelch@juniper.net" }, # Bill Welch is Authorized Individual in broadband-forum
+# {"person_id": 112837, "group_id": 67, "email": "christophe.alter@orange.com" }, # Christophe Alter is Authorized Individual in broadband-forum
+# {"person_id": 141083, "group_id": 2407, "email": "dan.middleton@intel.com" }, # Dan Middleton is Authorized Individual in confidential-computing-consortium
+# {"person_id": 117421, "group_id": 1933, "email": "chairman@dmtf.org" }, # Winston Bumpus is Authorized Individual in dmtf
+# {"person_id": 116529, "group_id": 1919, "email": "istvan@ecma-international.org" }, # Istvan Sebestyen is Authorized Individual in ecma-tc39
+# {"person_id": 116363, "group_id": 1915, "email": "e2nasupport@etsi.org" }, # Sonia Compans is Authorized Individual in etsi-e2na
+# {"person_id": 116862, "group_id": 2003, "email": "latif@ladid.lu" }, # Latif Ladid is Authorized Individual in etsi-isg-ip6
+# {"person_id": 116283, "group_id": 2198, "email": "adrian.neal@vodafone.com" }, # Adrian Neal is Authorized Individual in etsi-isg-mec
+# {"person_id": 119412, "group_id": 2004, "email": "jkfernic@uwaterloo.ca" }, # Jennifer Fernick is Authorized Individual in etsi-isg-qsc
+# {"person_id": 122406, "group_id": 2165, "email": "d.lake@surrey.ac.uk" }, # David Lake is Authorized Individual in etsi-ngp
+# {"person_id": 122407, "group_id": 2165, "email": "andy.sutton@ee.co.uk" }, # Andy Sutton is Authorized Individual in etsi-ngp
+# {"person_id": 112609, "group_id": 2165, "email": "richard.li@futurewei.com" }, # Richard Li is Authorized Individual in etsi-ngp
+# {"person_id": 122406, "group_id": 2177, "email": "d.lake@surrey.ac.uk" }, # David Lake is Authorized Individual in etsi-ngp-isp
+# {"person_id": 112609, "group_id": 2177, "email": "richard.li@futurewei.com" }, # Richard Li is Authorized Individual in etsi-ngp-isp
+# {"person_id": 122407, "group_id": 2177, "email": "andy.sutton@ee.co.uk" }, # Andy Sutton is Authorized Individual in etsi-ngp-isp
+# {"person_id": 118527, "group_id": 1986, "email": "luca.pesando@telecomitalia.it" }, # Luca Pesando is Authorized Individual in etsi-ntech
+# {"person_id": 118526, "group_id": 1986, "email": "NTECHsupport@etsi.org" }, # Sylwia Korycinska is Authorized Individual in etsi-ntech
+# {"person_id": 116052, "group_id": 1904, "email": "Beniamino.gorini@alcatel-lucent.com" }, # Gorini Beniamino is Authorized Individual in etsi-tc-ee
+# {"person_id": 19651, "group_id": 63, "email": "glenn.parsons@ericsson.com" }, # Glenn Parsons is Authorized Individual in ieee-802-1
+# {"person_id": 107599, "group_id": 63, "email": "tony@jeffree.co.uk" }, # Tony Jeffree is Authorized Individual in ieee-802-1
+# {"person_id": 117415, "group_id": 1862, "email": "Adrian.P.Stephens@intel.com" }, # Adrian Stephens is Authorized Individual in ieee-802-11
+# {"person_id": 106284, "group_id": 1862, "email": "dstanley@arubanetworks.com" }, # Dorothy Stanley is Authorized Individual in ieee-802-11
+# {"person_id": 114106, "group_id": 1871, "email": "r.b.marks@ieee.org" }, # Roger Marks is Authorized Individual in ieee-802-16
+# {"person_id": 101753, "group_id": 1885, "email": "max.riegel@ieee.org" }, # Max Riegel is Authorized Individual in ieee-802-ec-omniran
+# {"person_id": 113810, "group_id": 1859, "email": "jehrig@inventures.com" }, # John Ehrig is Authorized Individual in imtc
+# {"person_id": 123010, "group_id": 48, "email": "Emil.Kowalczyk@orange.com" }, # Emil Kowalczyk is Authorized Individual in iso-iec-jtc1-sc2
+# {"person_id": 11182, "group_id": 48, "email": "paf@netnod.se" }, # Patrik Fältström is Authorized Individual in iso-iec-jtc1-sc2
+# {"person_id": 117429, "group_id": 1939, "email": "krystyna.passia@din.de" }, # Krystyna Passia is Authorized Individual in iso-iec-jtc1-sc27
+# {"person_id": 117428, "group_id": 1939, "email": "walter.fumy@bdr.de" }, # Walter Fumy is Authorized Individual in iso-iec-jtc1-sc27
+# {"person_id": 114435, "group_id": 74, "email": "watanabe@itscj.ipsj.or.jp" }, # Shinji Watanabe is Authorized Individual in iso-iec-jtc1-sc29-wg11
+# {"person_id": 112106, "group_id": 49, "email": "jooran@kisi.or.kr" }, # Jooran Lee is Authorized Individual in iso-iec-jtc1-sc6
+# {"person_id": 17037, "group_id": 49, "email": "dykim@comsun.chungnnam.ac.kr" }, # Dae Kim is Authorized Individual in iso-iec-jtc1-sc6
+# {"person_id": 117426, "group_id": 1938, "email": "chair@jtc1-sc7.org" }, # Francois Coallier is Authorized Individual in iso-iec-jtc1-sc7
+# {"person_id": 117427, "group_id": 1938, "email": "secretariat@jtc1-sc7.org" }, # Witold Suryn is Authorized Individual in iso-iec-jtc1-sc7
+# {"person_id": 118769, "group_id": 2144, "email": "alexandre.petrescu@gmail.com" }, # Alexandre Petrescu is Authorized Individual in isotc204
+# {"person_id": 115544, "group_id": 1890, "email": "sergio.buonomo@itu.int" }, # Sergio Buonomo is Authorized Individual in itu-r
+# {"person_id": 122111, "group_id": 2157, "email": "h.mazar@atdi.com" }, # Haim Mazar is Authorized Individual in itu-r-wp-5c
+# {"person_id": 115544, "group_id": 2157, "email": "sergio.buonomo@itu.int" }, # Sergio Buonomo is Authorized Individual in itu-r-wp-5c
+# {"person_id": 112105, "group_id": 51, "email": "Malcolm.Johnson@itu.int" }, # Malcom Johnson is Authorized Individual in itu-t
+# {"person_id": 113911, "group_id": 1860, "email": "martin.adolph@itu.int" }, # Martin Adolph is Authorized Individual in itu-t-fg-dist
+# {"person_id": 122779, "group_id": 2180, "email": "Leo.Lehmann@bakom.admin.ch" }, # Leo Lehmann is Authorized Individual in itu-t-fg-imt-2020
+# {"person_id": 103383, "group_id": 2180, "email": "peter.ashwoodsmith@huawei.com" }, # Peter Ashwood-Smith is Authorized Individual in itu-t-fg-imt-2020
+# {"person_id": 107300, "group_id": 1872, "email": "tatiana.kurakova@itu.int" }, # Tatiana Kurakova is Authorized Individual in itu-t-jca-cloud
+# {"person_id": 106224, "group_id": 1872, "email": "mmorrow@cisco.com" }, # Monique Morrow is Authorized Individual in itu-t-jca-cloud
+# {"person_id": 105714, "group_id": 1874, "email": "martin.euchner@itu.int" }, # Martin Euchner is Authorized Individual in itu-t-jca-cop
+# {"person_id": 106475, "group_id": 2170, "email": "khj@etri.re.kr" }, # Hyoung-Jun Kim is Authorized Individual in itu-t-jca-iot-scc
+# {"person_id": 122491, "group_id": 2170, "email": "tsbjcaiot@itu.int" }, # ITU Tsb is Authorized Individual in itu-t-jca-iot-scc
+# {"person_id": 122490, "group_id": 2170, "email": "fabio.bigi@virgilio.it" }, # Fabio Bigi is Authorized Individual in itu-t-jca-iot-scc
+# {"person_id": 116952, "group_id": 1927, "email": "chengying10@chinaunicom.cn" }, # Ying Cheng is Authorized Individual in itu-t-jca-sdn
+# {"person_id": 111205, "group_id": 1927, "email": "t-egawa@ct.jp.nec.com" }, # Takashi Egawa is Authorized Individual in itu-t-jca-sdn
+# {"person_id": 107298, "group_id": 2178, "email": "tsbsg11@itu.int" }, # Arshey Odedra is Authorized Individual in itu-tsbsg-11
+# {"person_id": 107300, "group_id": 77, "email": "tatiana.kurakova@itu.int" }, # Tatiana Kurakova is Authorized Individual in itu-t-sg-11
+# {"person_id": 112573, "group_id": 77, "email": "stefano.polidori@itu.int" }, # Stefano Polidori is Authorized Individual in itu-t-sg-11
+# {"person_id": 115401, "group_id": 84, "email": "spennock@rim.com" }, # Scott Pennock is Authorized Individual in itu-t-sg-12
+# {"person_id": 114255, "group_id": 84, "email": "hiroshi.ota@itu.int" }, # Hiroshi Ota is Authorized Individual in itu-t-sg-12
+# {"person_id": 113032, "group_id": 84, "email": "catherine.quinquis@orange.com" }, # Catherine Quinquis is Authorized Individual in itu-t-sg-12
+# {"person_id": 113031, "group_id": 84, "email": "gunilla.berndtsson@ericsson.com" }, # Gunilla Berndtsson is Authorized Individual in itu-t-sg-12
+# {"person_id": 113672, "group_id": 84, "email": "sarah.scott@itu.int" }, # Sarah Scott is Authorized Individual in itu-t-sg-12
+# {"person_id": 122459, "group_id": 81, "email": "chan@etri.re.kr" }, # Kangchan Lee is Authorized Individual in itu-t-sg-13
+# {"person_id": 107300, "group_id": 81, "email": "tatiana.kurakova@itu.int" }, # Tatiana Kurakova is Authorized Individual in itu-t-sg-13
+# {"person_id": 109145, "group_id": 62, "email": "lihan@chinamobile.com" }, # Han Li is Authorized Individual in itu-t-sg-15
+# {"person_id": 115875, "group_id": 62, "email": "mark.jones@xtera.com" }, # Mark Jones is Authorized Individual in itu-t-sg-15
+# {"person_id": 115846, "group_id": 62, "email": "peter.stassar@huawei.com" }, # Peter Stassar is Authorized Individual in itu-t-sg-15
+# {"person_id": 123452, "group_id": 62, "email": "sshew@ciena.com" }, # Stephen Shew is Authorized Individual in itu-t-sg-15
+# {"person_id": 109312, "group_id": 62, "email": "huubatwork@gmail.com" }, # Huub van Helvoort is Authorized Individual in itu-t-sg-15
+# {"person_id": 115874, "group_id": 62, "email": "tom.huber@tellabs.com" }, # Tom Huber is Authorized Individual in itu-t-sg-15
+# {"person_id": 110799, "group_id": 62, "email": "koike.yoshinori@lab.ntt.co.jp" }, # Yoshinori Koike is Authorized Individual in itu-t-sg-15
+# {"person_id": 110831, "group_id": 62, "email": "kam.lam@nokia.com" }, # Hing-Kam Lam is Authorized Individual in itu-t-sg-15
+# {"person_id": 114255, "group_id": 62, "email": "hiroshi.ota@itu.int" }, # Hiroshi Ota is Authorized Individual in itu-t-sg-15
+# {"person_id": 115874, "group_id": 62, "email": "tom.huber@coriant.com" }, # Tom Huber is Authorized Individual in itu-t-sg-15
+# {"person_id": 123014, "group_id": 62, "email": "jessy.rouyer@nokia.com" }, # Jessy Rouyer is Authorized Individual in itu-t-sg-15
+# {"person_id": 111160, "group_id": 62, "email": "ryoo@etri.re.kr" }, # Jeong-dong Ryoo is Authorized Individual in itu-t-sg-15
+# {"person_id": 107296, "group_id": 62, "email": "greg.jones@itu.int" }, # Greg Jones is Authorized Individual in itu-t-sg-15
+# {"person_id": 118539, "group_id": 72, "email": "rosa.angelesleondev@itu.int" }, # Rosa De Vivero is Authorized Individual in itu-t-sg-16
+# {"person_id": 123169, "group_id": 72, "email": "garysull@microsoft.com" }, # Gary Sullivan is Authorized Individual in itu-t-sg-16
+# {"person_id": 107746, "group_id": 72, "email": "hiwasaki.yusuke@lab.ntt.co.jp" }, # Yusuke Hiwasaki is Authorized Individual in itu-t-sg-16
+# {"person_id": 108160, "group_id": 1987, "email": "Christian.Groves@nteczone.com" }, # Christian Groves is Authorized Individual in itu-t-sg-16-q3
+# {"person_id": 118539, "group_id": 1987, "email": "rosa.angelesleondev@itu.int" }, # Rosa De Vivero is Authorized Individual in itu-t-sg-16-q3
+# {"person_id": 124354, "group_id": 76, "email": "jhbaek@kisa.or.kr" }, # Jonghyun Baek is Authorized Individual in itu-t-sg-17
+# {"person_id": 12898, "group_id": 1937, "email": "youki-k@is.aist-nara.ac.jp" }, # Youki Kadobayashi is Authorized Individual in itu-t-sg-17-q4
+# {"person_id": 113593, "group_id": 79, "email": "maite.comasbarnes@itu.int" }, # Maite Barnes is Authorized Individual in itu-t-sg-3
+# {"person_id": 122983, "group_id": 2000, "email": "cristina.bueti@itu.int" }, # Cristina Bueti is Authorized Individual in itu-t-sg-5
+# {"person_id": 112573, "group_id": 2072, "email": "stefano.polidori@itu.int" }, # Stefano Polidori is Authorized Individual in itu-t-sg-9
+# {"person_id": 113101, "group_id": 82, "email": "steve.trowbridge@alcatel-lucent.com" }, # Stephen Trowbridge is Authorized Individual in itu-t-tsag
+# {"person_id": 20783, "group_id": 82, "email": "reinhard.scholl@itu.int" }, # Reinhard Scholl is Authorized Individual in itu-t-tsag
+# {"person_id": 107300, "group_id": 1846, "email": "tatiana.kurakova@itu.int" }, # Tatiana Kurakova is Authorized Individual in itu-t-wp-5-13
+# {"person_id": 112107, "group_id": 69, "email": "michael.oreirdan@maawg.org" }, # Michael O'Reirdan is Authorized Individual in maawg
+# {"person_id": 121870, "group_id": 75, "email": "liaisons@mef.net" }, # Liaison Mef is Authorized Individual in mef
+# {"person_id": 112510, "group_id": 75, "email": "nan@mef.net" }, # Nan Chen is Authorized Individual in mef
+# {"person_id": 124306, "group_id": 75, "email": "jason.wolfe@bell.ca" }, # WOLFE Jason is Authorized Individual in mef
+# {"person_id": 114454, "group_id": 75, "email": "mike.bencheck@siamasystems.com" }, # Mike Bencheck is Authorized Individual in mef
+# {"person_id": 115327, "group_id": 1888, "email": "klaus.moschner@ngmn.org" }, # Klaus Moschner is Authorized Individual in ngmn
+# {"person_id": 123305, "group_id": 1888, "email": "office@ngmn.org" }, # Office Ngmn is Authorized Individual in ngmn
+# {"person_id": 115160, "group_id": 1888, "email": "jminlee@sk.com" }, # Jongmin Lee is Authorized Individual in ngmn
+# {"person_id": 117424, "group_id": 1936, "email": "patrick.gallagher@nist.gov" }, # Patrick Gallagher is Authorized Individual in nist
+# {"person_id": 117431, "group_id": 1941, "email": "chet.ensign@xn--oasis-open-vt6e.org" }, # Chet Ensign is Authorized Individual in oasis
+# {"person_id": 120913, "group_id": 2142, "email": "james.walker@tatacommunications.com" }, # James Walker is Authorized Individual in occ
+# {"person_id": 6699, "group_id": 2142, "email": "dromasca@gmail.com" }, # Dan Romascanu is Authorized Individual in occ
+# {"person_id": 118403, "group_id": 2142, "email": "richard.schell@verizon.com" }, # Rick Schell is Authorized Individual in occ
+# {"person_id": 109676, "group_id": 83, "email": "Jonathan.Sadler@tellabs.com" }, # Jonathan Sadler is Authorized Individual in oif
+# {"person_id": 122843, "group_id": 2122, "email": "tzhang@omaorg.org" }, # Tiffany Zhang is Authorized Individual in oma
+# {"person_id": 116967, "group_id": 1947, "email": "JMudge@omaorg.org" }, # John Mudge is Authorized Individual in oma-architecture-wg
+# {"person_id": 117423, "group_id": 1935, "email": "soley@omg.org" }, # Richard Soley is Authorized Individual in omg
+# {"person_id": 110831, "group_id": 1858, "email": "kam.lam@nokia.com" }, # Hing-Kam Lam is Authorized Individual in onf
+# {"person_id": 113674, "group_id": 1858, "email": "dan.pitt@opennetworking.org" }, # Dan Pitt is Authorized Individual in onf
+# {"person_id": 118348, "group_id": 1984, "email": "dave.hood@ericsson.com" }, # Dave Hood is Authorized Individual in onf-arch-wg
+# {"person_id": 116967, "group_id": 60, "email": "JMudge@omaorg.org" }, # John Mudge is Authorized Individual in open-mobile-alliance
+# {"person_id": 112613, "group_id": 60, "email": "jerry.shih@att.com" }, # Jerry Shih is Authorized Individual in open-mobile-alliance
+# {"person_id": 113067, "group_id": 60, "email": "laurent.goix@econocom.com" }, # Laurent Goix is Authorized Individual in open-mobile-alliance
+# {"person_id": 112772, "group_id": 60, "email": "zhiyuan.hu@alcatel-sbell.com.cn" }, # Hu Zhiyuan is Authorized Individual in open-mobile-alliance
+# {"person_id": 113064, "group_id": 60, "email": "thierry.berisot@telekom.de" }, # Thierry Berisot is Authorized Individual in open-mobile-alliance
+# {"person_id": 124276, "group_id": 2212, "email": "jmisener@qti.qualcomm.com" }, # Jim Misener is Authorized Individual in sae-cell-v2x
+# {"person_id": 124278, "group_id": 2212, "email": "Keith.Wilson@sae.org" }, # Keith Wilson is Authorized Individual in sae-cell-v2x
+# {"person_id": 124277, "group_id": 2212, "email": "Elizabeth.Perry@sae.org" }, # Elizabeth Perry is Authorized Individual in sae-cell-v2x
+# {"person_id": 117430, "group_id": 1940, "email": "admin@trustedcomputinggroup.org" }, # Lindsay Adamson is Authorized Individual in tcg
+# {"person_id": 117422, "group_id": 1934, "email": "j.hietala@opengroup.org" }, # Jim Hietala is Authorized Individual in the-open-group
+# {"person_id": 112104, "group_id": 53, "email": "rick@unicode.org" }, # Rick McGowan is Authorized Individual in unicode
+# {"person_id": 112103, "group_id": 54, "email": "plh@w3.org" }, # Philippe Le Hégaret is Authorized Individual in w3c
+# {"person_id": 120261, "group_id": 54, "email": "wendy@seltzer.org" }, # Wendy Seltzer is Authorized Individual in w3c
+# {"person_id": 118020, "group_id": 1955, "email": "tiago@wballiance.com" }, # Tiago Rodrigues is Authorized Individual in wba
+# {"person_id": 125489, "group_id": 1955, "email": "bruno@wballiance.com" }, # Bruno Tomas is Authorized Individual in wba
+# {"person_id": 109129, "group_id": 70, "email": "smccammon@amsl.com" }, # Stephanie McCammon is Authorized Individual in zigbee-alliance
+# ]}
diff --git a/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py b/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py
deleted file mode 100644
index 76412c8210..0000000000
--- a/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2019-01-16 05:53
-
-
-from django.db import migrations, models
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0005_group_features_list_data_to_json'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='docman_roles',
-            field=jsonfield.fields.JSONField(default=['ad', 'chair', 'delegate', 'secr'], max_length=128),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='groupman_roles',
-            field=jsonfield.fields.JSONField(default=['ad', 'chair'], max_length=128),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='docman_roles',
-            field=jsonfield.fields.JSONField(default=['ad', 'chair', 'delegate', 'secr'], max_length=128),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='groupman_roles',
-            field=jsonfield.fields.JSONField(default=['ad', 'chair'], max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='admin_roles',
-            field=jsonfield.fields.JSONField(default=['chair'], max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='custom_group_roles',
-            field=models.BooleanField(default=False, verbose_name='Cust. Roles'),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='has_nonsession_materials',
-            field=models.BooleanField(default=False, verbose_name='Other Matrl.'),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='has_session_materials',
-            field=models.BooleanField(default=False, verbose_name='Sess Matrl.'),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='material_types',
-            field=jsonfield.fields.JSONField(default=['slides'], max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='matman_roles',
-            field=jsonfield.fields.JSONField(default=['ad', 'chair', 'delegate', 'secr'], max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='role_order',
-            field=jsonfield.fields.JSONField(default=['chair', 'secr', 'member'], help_text='The order in which roles are shown, for instance on photo pages.  Enter valid JSON.', max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='admin_roles',
-            field=jsonfield.fields.JSONField(default=['chair'], max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='custom_group_roles',
-            field=models.BooleanField(default=False, verbose_name='Cust. Roles'),
-        ),
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='has_nonsession_materials',
-            field=models.BooleanField(default=False, verbose_name='Other Matrl.'),
-        ),
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='has_session_materials',
-            field=models.BooleanField(default=False, verbose_name='Sess Matrl.'),
-        ),
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='material_types',
-            field=jsonfield.fields.JSONField(default=['slides'], max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='matman_roles',
-            field=jsonfield.fields.JSONField(default=['ad', 'chair', 'delegate', 'secr'], max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='role_order',
-            field=jsonfield.fields.JSONField(default=['chair', 'secr', 'member'], help_text='The order in which roles are shown, for instance on photo pages.  Enter valid JSON.', max_length=128),
-        ),
-    ]
diff --git a/ietf/group/migrations/0006_remove_liason_contacts.py b/ietf/group/migrations/0006_remove_liason_contacts.py
new file mode 100644
index 0000000000..13afd1a53e
--- /dev/null
+++ b/ietf/group/migrations/0006_remove_liason_contacts.py
@@ -0,0 +1,270 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from collections import defaultdict
+
+from django.db import migrations
+
+from ietf.person.name import plain_name
+
+
+def get_plain_name(person):
+    return person.plain or plain_name(person.name)
+
+
+def forward(apps, schema_editor):
+    """Removes liaison_contact and liaison_cc_contact roles from all groups
+
+    The IAB has decided to remove the liaison_contact and liaison_cc_contact
+    role concept from the datatracker as the roles are not well understood
+    and have not been being maintained.
+    """
+    Role = apps.get_model("group", "Role")
+    GroupEvent = apps.get_model("group", "GroupEvent")
+    for role_name in ["liaison_contact", "liaison_cc_contact"]:
+        groups = defaultdict(list)
+        role_qs = Role.objects.filter(name_id=role_name)
+        for role in role_qs:
+            groups[role.group].append(role)
+        for group in groups:
+            desc = f"Removed {role_name}: {', '.join([get_plain_name(role.person) for role in groups[group]])}"
+            GroupEvent.objects.create(
+                group=group,
+                by_id=1,  # (System)
+                desc=desc,
+            )
+        role_qs.delete()
+
+
+def reverse(apps, schema_editor):
+    """Intentionally does nothing"""
+    pass
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("group", "0005_remove_sdo_authorized_individuals"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
+
+
+# At the time this migration was created, it would remove these objects
+# {"liaison_contacts":[
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 56, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 56, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp
+#   { "role_name": "liaison_contact", "person_id": 127959, "group_id": 57, "email": "mahendra@qualcomm.com" }, # Mahendran Ac is Liaison Contact in 3gpp2
+#   { "role_name": "liaison_contact", "person_id": 111440, "group_id": 2026, "email": "georg.mayer.huawei@gmx.com" }, # Georg Mayer is Liaison Contact in 3gpp-tsgct
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2026, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgct
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2027, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgct-ct1
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 2027, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp-tsgct-ct1
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 2410, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp-tsgct-ct3
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2410, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgct-ct3
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 2028, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp-tsgct-ct4
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2028, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgct-ct4
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2029, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgran
+#   { "role_name": "liaison_contact", "person_id": 111440, "group_id": 2029, "email": "georg.mayer.huawei@gmx.com" }, # Georg Mayer is Liaison Contact in 3gpp-tsgran
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 2030, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp-tsgran-ran2
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2030, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgran-ran2
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2023, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgsa
+#   { "role_name": "liaison_contact", "person_id": 111440, "group_id": 2023, "email": "georg.mayer.huawei@gmx.com" }, # Georg Mayer is Liaison Contact in 3gpp-tsgsa
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2024, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgsa-sa2
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 2024, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp-tsgsa-sa2
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2025, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgsa-sa3
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 2025, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp-tsgsa-sa3
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 1902, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp-tsgsa-sa4
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 1902, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgsa-sa4
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2031, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in 3gpp-tsgt-wg2
+#   { "role_name": "liaison_contact", "person_id": 107737, "group_id": 2031, "email": "lionel.morand@orange.com" }, # Lionel Morand is Liaison Contact in 3gpp-tsgt-wg2
+#   { "role_name": "liaison_contact", "person_id": 106345, "group_id": 1396, "email": "Menachem.Dodge@ecitele.com" }, # Menachem Dodge is Liaison Contact in adslmib
+#   { "role_name": "liaison_contact", "person_id": 108054, "group_id": 1956, "email": "shengjiang@bupt.edu.cn" }, # Sheng Jiang is Liaison Contact in anima
+#   { "role_name": "liaison_contact", "person_id": 11834, "group_id": 1956, "email": "tte@cs.fau.de" }, # Toerless Eckert is Liaison Contact in anima
+#   { "role_name": "liaison_contact", "person_id": 21684, "group_id": 1805, "email": "barryleiba@computer.org" }, # Barry Leiba is Liaison Contact in appsawg
+#   { "role_name": "liaison_contact", "person_id": 102154, "group_id": 1805, "email": "alexey.melnikov@isode.com" }, # Alexey Melnikov is Liaison Contact in appsawg
+#   { "role_name": "liaison_contact", "person_id": 107279, "group_id": 1805, "email": "yaojk@cnnic.cn" }, # Jiankang Yao is Liaison Contact in appsawg
+#   { "role_name": "liaison_contact", "person_id": 100754, "group_id": 941, "email": "tom.taylor@rogers.com" }, # Tom Taylor is Liaison Contact in avt
+#   { "role_name": "liaison_contact", "person_id": 105873, "group_id": 941, "email": "ron.even.tlv@gmail.com" }, # Roni Even is Liaison Contact in avt
+#   { "role_name": "liaison_contact", "person_id": 105097, "group_id": 1813, "email": "keith.drage@alcatel-lucent.com" }, # Keith Drage is Liaison Contact in avtext
+#   { "role_name": "liaison_contact", "person_id": 101923, "group_id": 1813, "email": "jonathan@vidyo.com" }, # Jonathan Lennox is Liaison Contact in avtext
+#   { "role_name": "liaison_contact", "person_id": 108279, "group_id": 1960, "email": "martin.vigoureux@alcatel-lucent.com" }, # Martin Vigoureux is Liaison Contact in bess
+#   { "role_name": "liaison_contact", "person_id": 109666, "group_id": 66, "email": "g.white@cablelabs.com" }, # Greg White is Liaison Contact in cablelabs
+#   { "role_name": "liaison_contact", "person_id": 117421, "group_id": 1933, "email": "chairman@dmtf.org" }, # Winston Bumpus is Liaison Contact in dmtf
+#   { "role_name": "liaison_contact", "person_id": 127961, "group_id": 1739, "email": "statements@ietf.org" }, # statements@ietf.org is Liaison Contact in drinks
+#   { "role_name": "liaison_contact", "person_id": 109505, "group_id": 1787, "email": "bernie@ietf.hoeneisen.ch" }, # Bernie Hoeneisen is Liaison Contact in e2md
+#   { "role_name": "liaison_contact", "person_id": 109059, "group_id": 1787, "email": "ray.bellis@nominet.org.uk" }, # Ray Bellis is Liaison Contact in e2md
+#   { "role_name": "liaison_contact", "person_id": 116529, "group_id": 1919, "email": "istvan@ecma-interational.org" }, # Istvan Sebestyen is Liaison Contact in ecma-tc39
+#   { "role_name": "liaison_contact", "person_id": 127964, "group_id": 1919, "email": "johnneumann.openstrat@gmail.com" }, # John Neuman is Liaison Contact in ecma-tc39
+#   { "role_name": "liaison_contact", "person_id": 106012, "group_id": 1643, "email": "marc.linsner@cisco.com" }, # Marc Linsner is Liaison Contact in ecrit
+#   { "role_name": "liaison_contact", "person_id": 107084, "group_id": 1643, "email": "rmarshall@telecomsys.com" }, # Roger Marshall is Liaison Contact in ecrit
+#   { "role_name": "liaison_contact", "person_id": 116363, "group_id": 1915, "email": "e2nasupport@etsi.org" }, # Sonia Compans is Liaison Contact in etsi-e2na
+#   { "role_name": "liaison_contact", "person_id": 126473, "group_id": 2261, "email": "isgsupport@etsi.org" }, # Sonia Compan is Liaison Contact in etsi-isg-sai
+#   { "role_name": "liaison_contact", "person_id": 128316, "group_id": 2301, "email": "GSMALiaisons@gsma.com" }, # David Pollington is Liaison Contact in gsma-ztc
+#   { "role_name": "liaison_contact", "person_id": 3056, "group_id": 1875, "email": "shares@ndzh.com" }, # Susan Hares is Liaison Contact in i2rs
+#   { "role_name": "liaison_contact", "person_id": 105046, "group_id": 1875, "email": "jhaas@pfrc.org" }, # Jeffrey Haas is Liaison Contact in i2rs
+#   { "role_name": "liaison_contact", "person_id": 120845, "group_id": 61, "email": "tale@dd.org" }, # David Lawrence is Liaison Contact in icann-board-of-directors
+#   { "role_name": "liaison_contact", "person_id": 112851, "group_id": 2105, "email": "pthaler@broadcom.com" }, # Patricia Thaler is Liaison Contact in ieee-802
+#   { "role_name": "liaison_contact", "person_id": 127968, "group_id": 2105, "email": "p.nikolich@ieee.org" }, # Paul Nikolich is Liaison Contact in ieee-802
+#   { "role_name": "liaison_contact", "person_id": 19651, "group_id": 63, "email": "glenn.parsons@ericsson.com" }, # Glenn Parsons is Liaison Contact in ieee-802-1
+#   { "role_name": "liaison_contact", "person_id": 123875, "group_id": 63, "email": "JMessenger@advaoptical.com" }, # John Messenger is Liaison Contact in ieee-802-1
+#   { "role_name": "liaison_contact", "person_id": 127968, "group_id": 63, "email": "p.nikolich@ieee.org" }, # Paul Nikolich is Liaison Contact in ieee-802-1
+#   { "role_name": "liaison_contact", "person_id": 117415, "group_id": 1862, "email": "Adrian.P.Stephens@intel.com" }, # Adrian Stephens is Liaison Contact in ieee-802-11
+#   { "role_name": "liaison_contact", "person_id": 106284, "group_id": 1862, "email": "dstanley@agere.com" }, # Dorothy Stanley is Liaison Contact in ieee-802-11
+#   { "role_name": "liaison_contact", "person_id": 128345, "group_id": 2302, "email": "liaison@iowngf.org" }, # Forum Iown is Liaison Contact in iown-global-forum
+#   { "role_name": "liaison_contact", "person_id": 117428, "group_id": 1939, "email": "walter.fumy@bdr.de" }, # Walter Fumy is Liaison Contact in iso-iec-jtc1-sc27
+#   { "role_name": "liaison_contact", "person_id": 117429, "group_id": 1939, "email": "krystyna.passia@din.de" }, # Krystyna Passia is Liaison Contact in iso-iec-jtc1-sc27
+#   { "role_name": "liaison_contact", "person_id": 151289, "group_id": 50, "email": "koike@itscj.ipsj.or.jp" }, # Mayumi Koike is Liaison Contact in iso-iec-jtc1-sc29
+#   { "role_name": "liaison_contact", "person_id": 151289, "group_id": 2110, "email": "koike@itscj.ipsj.or.jp" }, # Mayumi Koike is Liaison Contact in iso-iec-jtc1-sc29-wg1
+#   { "role_name": "liaison_contact", "person_id": 114435, "group_id": 74, "email": "watanabe@itscj.ipsj.or.jp" }, # Shinji Watanabe is Liaison Contact in iso-iec-jtc1-sc29-wg11
+#   { "role_name": "liaison_contact", "person_id": 112106, "group_id": 49, "email": "jooran@kisi.or.kr" }, # Jooran Lee is Liaison Contact in iso-iec-jtc1-sc6
+#   { "role_name": "liaison_contact", "person_id": 113587, "group_id": 49, "email": "dykim@cnu.kr" }, # Chungnam University is Liaison Contact in iso-iec-jtc1-sc6
+#   { "role_name": "liaison_contact", "person_id": 117427, "group_id": 1938, "email": "secretariat@jtc1-sc7.org" }, # Witold Suryn is Liaison Contact in iso-iec-jtc1-sc7
+#   { "role_name": "liaison_contact", "person_id": 117426, "group_id": 1938, "email": "chair@jtc1-sc7.org" }, # Francois Coallier is Liaison Contact in iso-iec-jtc1-sc7
+#   { "role_name": "liaison_contact", "person_id": 127971, "group_id": 68, "email": "sabine.donnardcusse@afnor.org" }, # sabine.donnardcusse@afnor.org is Liaison Contact in isotc46
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2057, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1890, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-r
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2058, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-r-wp5a
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2059, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-r-wp5d
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2060, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-r-wp8a
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2061, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-r-wp8f
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 51, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2063, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-fg-cloud
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1860, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-fg-dist
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2064, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-fg-iptv
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2065, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-fg-ngnm
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2062, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-ipv6-group
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1872, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-jca-cloud
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1874, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-jca-cop
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2066, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-jca-idm
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1927, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-jca-sdn
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 65, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-mpls
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 52, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-ngn
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2067, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-ngnmfg
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 77, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-11
+#   { "role_name": "liaison_contact", "person_id": 128236, "group_id": 77, "email": "denis.andreev@itu.int" }, # Denis ANDREEV is Liaison Contact in itu-t-sg-11
+#   { "role_name": "liaison_contact", "person_id": 107300, "group_id": 77, "email": "tatiana.kurakova@itu.int" }, # Tatiana Kurakova is Liaison Contact in itu-t-sg-11
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2074, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-11-q5
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2075, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-11-wp2
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 84, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-12
+#   { "role_name": "liaison_contact", "person_id": 102900, "group_id": 84, "email": "acmorton@att.com" }, # Al Morton is Liaison Contact in itu-t-sg-12
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2076, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-12-q12
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2077, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-12-q17
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2082, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-13-q11
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2078, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-13-q3
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2079, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-13-q5
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2080, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-13-q7
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2081, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-13-q9
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2083, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-13-wp3
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2084, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-13-wp4
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2085, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-13-wp5
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2086, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-14
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 62, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2087, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q1
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2092, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q10
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2093, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q11
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2094, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q12
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2095, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q14
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2096, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q15
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2088, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q3
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2089, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q4
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2090, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q6
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2091, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-q9
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2097, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-wp1
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2098, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-15-wp3
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 72, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-16
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2101, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-16-q10
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1987, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-16-q3
+#   { "role_name": "liaison_contact", "person_id": 118539, "group_id": 1987, "email": "rosa.angelesleondev@itu.int" }, # Rosa De Vivero is Liaison Contact in itu-t-sg-16-q3
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2099, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-16-q8
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2100, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-16-q9
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 76, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-17
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2102, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-17-q2
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1937, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-17-q4
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1954, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-17-tsb
+#   { "role_name": "liaison_contact", "person_id": 12898, "group_id": 1954, "email": "youki-k@is.aist-nara.ac.jp" }, # Youki Kadobayashi is Liaison Contact in itu-t-sg-17-tsb
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 78, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-2
+#   { "role_name": "liaison_contact", "person_id": 127962, "group_id": 78, "email": "dr.guinena@ntra.gov.eg" }, # dr.guinena@ntra.gov.eg is Liaison Contact in itu-t-sg-2
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2103, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-20
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2073, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-2-q1
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 79, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-3
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2068, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-4
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2000, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-5
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2069, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-6
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2070, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-7
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2071, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-8
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 2072, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-sg-9
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 82, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-tsag
+#   { "role_name": "liaison_contact", "person_id": 127957, "group_id": 82, "email": "tsbtsag@itu.int" }, # Bilel Jamoussi is Liaison Contact in itu-t-tsag
+#   { "role_name": "liaison_cc_contact", "person_id": 127958, "group_id": 1846, "email": "itu-t-liaison@iab.org" }, # itu-t liaison is Liaison CC Contact in itu-t-wp-5-13
+#   { "role_name": "liaison_contact", "person_id": 10083, "group_id": 1882, "email": "paul.hoffman@vpnc.org" }, # Paul Hoffman is Liaison Contact in json
+#   { "role_name": "liaison_contact", "person_id": 111178, "group_id": 1882, "email": "mamille2@cisco.com" }, # Matthew Miller is Liaison Contact in json
+#   { "role_name": "liaison_contact", "person_id": 106881, "group_id": 1593, "email": "vach.kompella@alcatel.com" }, # Vach Kompella is Liaison Contact in l2vpn
+#   { "role_name": "liaison_contact", "person_id": 19987, "group_id": 1593, "email": "danny@arbor.net" }, # Danny McPherson is Liaison Contact in l2vpn
+#   { "role_name": "liaison_contact", "person_id": 2329, "group_id": 1593, "email": "stbryant@cisco.com" }, # Stewart Bryant is Liaison Contact in l2vpn
+#   { "role_name": "liaison_contact", "person_id": 101552, "group_id": 1593, "email": "Shane.Amante@Level3.com" }, # Shane Amante is Liaison Contact in l2vpn
+#   { "role_name": "liaison_contact", "person_id": 110305, "group_id": 1877, "email": "jason.weil@twcable.com" }, # Jason Weil is Liaison Contact in lmap
+#   { "role_name": "liaison_contact", "person_id": 6699, "group_id": 1877, "email": "dromasca@avaya.com" }, # Dan Romascanu is Liaison Contact in lmap
+#   { "role_name": "liaison_contact", "person_id": 127969, "group_id": 69, "email": "madkins@fb.com" }, # Mike Adkins is Liaison Contact in maawg
+#   { "role_name": "liaison_contact", "person_id": 127970, "group_id": 69, "email": "technical-chair@mailman.m3aawg.org" }, # technical-chair@mailman.m3aawg.org is Liaison Contact in maawg
+#   { "role_name": "liaison_contact", "person_id": 112512, "group_id": 75, "email": "rraghu@ciena.com" }, # Raghu Ranganathan is Liaison Contact in mef
+#   { "role_name": "liaison_contact", "person_id": 119947, "group_id": 1755, "email": "mrw@lilacglade.org" }, # Margaret Cullen is Liaison Contact in mif
+#   { "role_name": "liaison_contact", "person_id": 109884, "group_id": 1755, "email": "denghui02@hotmail.com" }, # Hui Deng is Liaison Contact in mif
+#   { "role_name": "liaison_contact", "person_id": 128292, "group_id": 1936, "email": "james.olthoff@nist.gov" }, # James Olthoff is Liaison Contact in nist
+#   { "role_name": "liaison_contact", "person_id": 104183, "group_id": 1537, "email": "john.loughney@nokia.com" }, # John Loughney is Liaison Contact in nsis
+#   { "role_name": "liaison_contact", "person_id": 105786, "group_id": 1840, "email": "matthew.bocci@nokia.com" }, # Matthew Bocci is Liaison Contact in nvo3
+#   { "role_name": "liaison_contact", "person_id": 112438, "group_id": 1840, "email": "bensons@queuefull.net" }, # Benson Schliesser is Liaison Contact in nvo3
+#   { "role_name": "liaison_contact", "person_id": 107943, "group_id": 2296, "email": "3GPPLiaison@etsi.org" }, # Susanna Kooistra is Liaison Contact in o3gpptsgran3
+#   { "role_name": "liaison_contact", "person_id": 127966, "group_id": 1941, "email": "chet.ensign@oasis-open.org" }, # chet.ensign@oasis-open.org is Liaison Contact in oasis
+#   { "role_name": "liaison_contact", "person_id": 117423, "group_id": 1935, "email": "soley@omg.org" }, # Richard Soley is Liaison Contact in omg
+#   { "role_name": "liaison_contact", "person_id": 127963, "group_id": 1858, "email": "dan.pitt@opennetworkingfoundation.org" }, # dan.pitt@opennetworkingfoundation.org is Liaison Contact in onf
+#   { "role_name": "liaison_contact", "person_id": 108304, "group_id": 1599, "email": "gunter.van_de_velde@nokia.com" }, # Gunter Van de Velde is Liaison Contact in opsec
+#   { "role_name": "liaison_contact", "person_id": 111647, "group_id": 1599, "email": "kk@google.com" }, # Chittimaneni Kk is Liaison Contact in opsec
+#   { "role_name": "liaison_contact", "person_id": 111656, "group_id": 1599, "email": "warren@kumari.net" }, # Warren Kumari is Liaison Contact in opsec
+#   { "role_name": "liaison_contact", "person_id": 106471, "group_id": 1188, "email": "dbrungard@att.com" }, # Deborah Brungard is Liaison Contact in ospf
+#   { "role_name": "liaison_contact", "person_id": 104198, "group_id": 1188, "email": "adrian@olddog.co.uk" }, # Adrian Farrel is Liaison Contact in ospf
+#   { "role_name": "liaison_contact", "person_id": 104816, "group_id": 1188, "email": "akr@cisco.com" }, # Abhay Roy is Liaison Contact in ospf
+#   { "role_name": "liaison_contact", "person_id": 10784, "group_id": 1188, "email": "acee@redback.com" }, # Acee Lindem is Liaison Contact in ospf
+#   { "role_name": "liaison_contact", "person_id": 108123, "group_id": 1819, "email": "Gabor.Bajko@nokia.com" }, # Gabor Bajko is Liaison Contact in paws
+#   { "role_name": "liaison_contact", "person_id": 106987, "group_id": 1819, "email": "br@brianrosen.net" }, # Brian Rosen is Liaison Contact in paws
+#   { "role_name": "liaison_cc_contact", "person_id": 122823, "group_id": 1630, "email": "ketant.ietf@gmail.com" }, # Ketan Talaulikar is Liaison CC Contact in pce
+#   { "role_name": "liaison_contact", "person_id": 125031, "group_id": 1630, "email": "andrew.stone@nokia.com" }, # Andrew Stone is Liaison Contact in pce
+#   { "role_name": "liaison_contact", "person_id": 108213, "group_id": 1630, "email": "julien.meuric@orange.com" }, # Julien Meuric is Liaison Contact in pce
+#   { "role_name": "liaison_contact", "person_id": 111477, "group_id": 1630, "email": "dd@dhruvdhody.com" }, # Dhruv Dhody is Liaison Contact in pce
+#   { "role_name": "liaison_contact", "person_id": 112773, "group_id": 1701, "email": "lars.eggert@nokia.com" }, # Lars Eggert is Liaison Contact in pcn
+#   { "role_name": "liaison_contact", "person_id": 12671, "group_id": 1437, "email": "adamson@itd.nrl.navy.mil" }, # Brian Adamson is Liaison Contact in rmt
+#   { "role_name": "liaison_contact", "person_id": 100609, "group_id": 1437, "email": "lorenzo@vicisano.net" }, # Lorenzo Vicisano is Liaison Contact in rmt
+#   { "role_name": "liaison_contact", "person_id": 115213, "group_id": 1730, "email": "maria.ines.robles@ericsson.com" }, # Ines Robles is Liaison Contact in roll
+#   { "role_name": "liaison_contact", "person_id": 110721, "group_id": 1820, "email": "ted.ietf@gmail.com" }, # Ted Hardie is Liaison Contact in rtcweb
+#   { "role_name": "liaison_contact", "person_id": 104294, "group_id": 1820, "email": "magnus.westerlund@ericsson.com" }, # Magnus Westerlund is Liaison Contact in rtcweb
+#   { "role_name": "liaison_contact", "person_id": 105791, "group_id": 1820, "email": "fluffy@iii.ca" }, # Cullen Jennings is Liaison Contact in rtcweb
+#   { "role_name": "liaison_contact", "person_id": 105906, "group_id": 1910, "email": "james.n.guichard@futurewei.com" }, # Jim Guichard is Liaison Contact in sfc
+#   { "role_name": "liaison_contact", "person_id": 3862, "group_id": 1910, "email": "jmh@joelhalpern.com" }, # Joel Halpern is Liaison Contact in sfc
+#   { "role_name": "liaison_contact", "person_id": 127960, "group_id": 1462, "email": "sipcore@ietf.org" }, # sipcore@ietf.org is Liaison Contact in sip
+#   { "role_name": "liaison_contact", "person_id": 103769, "group_id": 1762, "email": "adam@nostrum.com" }, # Adam Roach is Liaison Contact in sipcore
+#   { "role_name": "liaison_contact", "person_id": 108554, "group_id": 1762, "email": "pkyzivat@alum.mit.edu" }, # Paul Kyzivat is Liaison Contact in sipcore
+#   { "role_name": "liaison_contact", "person_id": 103539, "group_id": 1542, "email": "gonzalo.camarillo@ericsson.com" }, # Gonzalo Camarillo is Liaison Contact in sipping
+#   { "role_name": "liaison_contact", "person_id": 103612, "group_id": 1542, "email": "jf.mule@cablelabs.com" }, # Jean-Francois Mule is Liaison Contact in sipping
+#   { "role_name": "liaison_contact", "person_id": 3862, "group_id": 1905, "email": "jmh@joelhalpern.com" }, # Joel Halpern is Liaison Contact in spring
+#   { "role_name": "liaison_contact", "person_id": 109802, "group_id": 1905, "email": "aretana.ietf@gmail.com" }, # Alvaro Retana is Liaison Contact in spring
+#   { "role_name": "liaison_contact", "person_id": 107172, "group_id": 1905, "email": "bruno.decraene@orange.com" }, # Bruno Decraene is Liaison Contact in spring
+#   { "role_name": "liaison_contact", "person_id": 5376, "group_id": 1899, "email": "housley@vigilsec.com" }, # Russ Housley is Liaison Contact in stir
+#   { "role_name": "liaison_contact", "person_id": 103961, "group_id": 1899, "email": "rjsparks@nostrum.com" }, # Robert Sparks is Liaison Contact in stir
+#   { "role_name": "liaison_contact", "person_id": 117430, "group_id": 1940, "email": "admin@trustedcomputinggroup.org" }, # Lindsay Adamson is Liaison Contact in tcg
+#   { "role_name": "liaison_contact", "person_id": 110932, "group_id": 1985, "email": "oscar.gonzalezdedios@telefonica.com" }, # Oscar de Dios is Liaison Contact in teas
+#   { "role_name": "liaison_contact", "person_id": 10064, "group_id": 1985, "email": "lberger@labn.net" }, # Lou Berger is Liaison Contact in teas
+#   { "role_name": "liaison_contact", "person_id": 114351, "group_id": 1985, "email": "vbeeram@juniper.net" }, # Vishnu Beeram is Liaison Contact in teas
+#   { "role_name": "liaison_contact", "person_id": 117422, "group_id": 1934, "email": "j.hietala@opengroup.org" }, # Jim Hietala is Liaison Contact in the-open-group
+#   { "role_name": "liaison_contact", "person_id": 106414, "group_id": 1709, "email": "yaakovjstein@gmail.com" }, # Yaakov Stein is Liaison Contact in tictoc
+#   { "role_name": "liaison_contact", "person_id": 4857, "group_id": 1709, "email": "kodonog@pobox.com" }, # Karen O'Donoghue is Liaison Contact in tictoc
+#   { "role_name": "liaison_contact", "person_id": 144713, "group_id": 2420, "email": "liaisons@tmforum.org" }, # liaisons@tmforum.org is Liaison Contact in tmforum
+#   { "role_name": "liaison_contact", "person_id": 112773, "group_id": 1324, "email": "lars@eggert.org" }, # Lars Eggert is Liaison Contact in tsv
+#   { "role_name": "liaison_contact", "person_id": 112104, "group_id": 53, "email": "rick@unicode.org" }, # Rick McGowan is Liaison Contact in unicode
+#   { "role_name": "liaison_contact", "person_id": 105907, "group_id": 1864, "email": "stpeter@stpeter.im" }, # Peter Saint-Andre is Liaison Contact in videocodec
+#   { "role_name": "liaison_contact", "person_id": 120261, "group_id": 54, "email": "wseltzer@w3.org" }, # Wendy Seltzer is Liaison Contact in w3c
+#   { "role_name": "liaison_contact", "person_id": 112103, "group_id": 54, "email": "plh@w3.org" }, # Philippe Le Hégaret is Liaison Contact in w3c
+#   { "role_name": "liaison_contact", "person_id": 107520, "group_id": 1957, "email": "shida@ntt-at.com" }, # Shida Schubert is Liaison Contact in webpush
+#   { "role_name": "liaison_contact", "person_id": 110049, "group_id": 1957, "email": "jhildebr@cisco.com" }, # Joe Hildebrand is Liaison Contact in webpush
+#   { "role_name": "liaison_contact", "person_id": 103769, "group_id": 1601, "email": "adam@nostrum.com" }, # Adam Roach is Liaison Contact in xcon
+#   { "role_name": "liaison_contact", "person_id": 107520, "group_id": 1815, "email": "shida@ntt-at.com" }, # Shida Schubert is Liaison Contact in xrblock
+#   { "role_name": "liaison_contact", "person_id": 6699, "group_id": 1815, "email": "dromasca@avaya.com" }, # Dan Romascanu is Liaison Contact in xrblock
+# ]}
diff --git a/ietf/group/migrations/0007_new_group_features_data.py b/ietf/group/migrations/0007_new_group_features_data.py
deleted file mode 100644
index b08e7f8ae6..0000000000
--- a/ietf/group/migrations/0007_new_group_features_data.py
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2019-01-09 09:02
-
-
-from django.db import migrations
-
-import debug                            # pyflakes:ignore
-
-group_type_features = {
-    'ag': {
-        'custom_group_roles': True,
-        'has_session_materials': True,
-        'acts_like_wg': True,
-        'create_wiki': True,
-        'is_schedulable': True,
-        'req_subm_approval': True,
-        'show_on_agenda': True,
-        'docman_roles': ['chair', 'delegate', 'secr'],
-        'groupman_roles': ['ad', 'chair', 'delegate'],
-        'matman_roles': ['ad', 'chair', 'delegate', 'secr'],
-        'role_order': ['chair', 'secr'],
-    },
-    'area': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': True,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': ['ad', 'delegate', 'secr'],
-        'groupman_roles': ['ad',],
-        'matman_roles': ['ad', 'chair', 'delegate', 'secr'],
-        'role_order': ['chair', 'secr'],
-        },
-    'dir': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': True,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': [],
-        'groupman_roles': ['ad', 'secr', ],
-        'matman_roles': ['ad', 'chair', 'delegate', 'secr'],
-        'role_order': ['chair', 'secr'],
-        },
-    'review': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': True,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': ['secr'],
-        'groupman_roles': ['ad', 'secr'],
-        'matman_roles': ['ad', 'secr'],
-        'role_order': ['chair', 'secr'],
-        },
-    'iab': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': False,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': True,
-        'docman_roles': ['chair'],
-        'groupman_roles': [],
-        'matman_roles': ['chair', 'delegate'],
-        'role_order': ['chair', 'secr'],
-        },
-    'ietf': {
-        'custom_group_roles': True,
-        'has_session_materials': True,
-        'acts_like_wg': False,
-        'create_wiki': False,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': ['chair', ],
-        'groupman_roles': ['chair', 'delegate'],
-        'matman_roles': ['chair', 'delegate'],
-        'role_order': ['chair', 'secr'],
-        },
-    'individ': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': False,
-        'is_schedulable': False,
-        'req_subm_approval': False,
-        'show_on_agenda': False,
-        'docman_roles': ['auth'],
-        'groupman_roles': [],
-        'matman_roles': [],
-        'role_order': ['chair', 'secr'],
-        },
-    'irtf': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': False,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': [],
-        'groupman_roles': ['chair', 'delegate'],
-        'matman_roles': ['chair', 'delegate', 'secr'],
-        'role_order': ['chair', 'secr'],
-        },
-    'isoc': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': False,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': [],
-        'groupman_roles': ['chair', ],
-        'matman_roles': ['chair', 'secr'],
-        'role_order': ['chair', 'secr'],
-        },
-    'nomcom': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': True,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': [],
-        'groupman_roles': ['chair', 'advisor'],
-        'matman_roles': ['chair'],
-        'role_order': ['chair', 'member', 'advisor'],
-        },
-    'program': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': False,
-        'is_schedulable': False,
-        'req_subm_approval': False,
-        'show_on_agenda': False,
-        'docman_roles': ['chair', 'secr'],
-        'groupman_roles': ['chair', 'secr'],
-        'matman_roles': ['chair', 'secr'],
-        'role_order': ['chair', 'secr'],
-        },
-    'rfcedtyp': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': False,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': [],
-        'groupman_roles': [],
-        'matman_roles': [],
-        'role_order': ['chair', 'secr'],
-        },
-    'rg': {
-        'custom_group_roles': False,
-        'has_session_materials': True,
-        'acts_like_wg': True,
-        'create_wiki': True,
-        'is_schedulable': True,
-        'req_subm_approval': True,
-        'show_on_agenda': True,
-        'docman_roles': ['chair', 'delegate', 'secr'],
-        'groupman_roles': ['chair', 'secr'],
-        'matman_roles': ['chair', 'secr'],
-        'role_order': ['chair', 'secr'],
-        },
-    'sdo': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': False,
-        'is_schedulable': False,
-        'req_subm_approval': True,
-        'show_on_agenda': False,
-        'docman_roles': ['liaiman', 'matman'],
-        'groupman_roles': [],
-        'matman_roles': [],
-        'role_order': ['liaiman'],
-        },
-    'team': {
-        'custom_group_roles': True,
-        'has_session_materials': False,
-        'acts_like_wg': False,
-        'create_wiki': True,
-        'is_schedulable': False,
-        'req_subm_approval': False,
-        'show_on_agenda': False,
-        'docman_roles': [],
-        'groupman_roles': ['chair', ],
-        'matman_roles': [],
-        'role_order': ['chair', 'member', 'matman'],
-        },
-    'wg': {
-        'custom_group_roles': False,
-        'has_session_materials': True,
-        'acts_like_wg': True,
-        'create_wiki': True,
-        'is_schedulable': True,
-        'req_subm_approval': True,
-        'show_on_agenda': True,
-        'docman_roles': ['chair', 'delegate', 'secr'],
-        'groupman_roles': ['ad', 'chair', 'delegate', 'secr'],
-        'matman_roles': ['ad', 'chair', 'delegate', 'secr'],
-        'role_order': ['chair', 'secr', 'delegate'],
-        },
-}
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    for type in group_type_features:
-        features = group_type_features[type]
-        gf = GroupFeatures.objects.get(type=type)
-        for k,v in features.items():
-            setattr(gf, k, v)
-        gf.save()
-# This migration does not remove or change any previous fields, and executes
-# swirftly, so we permit it to be interleaved with schema migrations
-forward.interleavable = True            # type: ignore # https://github.com/python/mypy/issues/2087
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0006_group_features_lists_to_jsonfield')
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0007_used_roles.py b/ietf/group/migrations/0007_used_roles.py
new file mode 100644
index 0000000000..0dfa79fa03
--- /dev/null
+++ b/ietf/group/migrations/0007_used_roles.py
@@ -0,0 +1,49 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    Group = apps.get_model("group", "Group")
+    GroupFeatures = apps.get_model("group", "GroupFeatures")
+    iab = Group.objects.get(acronym="iab")
+    iab.used_roles = [
+        "chair",
+        "delegate",
+        "exofficio",
+        "liaison",
+        "liaison_coordinator",
+        "member",
+    ]
+    iab.save()
+    GroupFeatures.objects.filter(type_id="ietf").update(
+        default_used_roles=[
+            "ad",
+            "member",
+            "comdir",
+            "delegate",
+            "execdir",
+            "recman",
+            "secr",
+            "chair",
+        ]
+    )
+
+
+def reverse(apps, schema_editor):
+    Group = apps.get_model("group", "Group")
+    iab = Group.objects.get(acronym="iab")
+    iab.used_roles = []
+    iab.save()
+    # Intentionally not putting trac-* back into grouptype ietf default_used_roles
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("group", "0006_remove_liason_contacts"),
+        ("name", "0018_alter_rolenames"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/group/migrations/0008_alter_group_used_roles_and_more.py b/ietf/group/migrations/0008_alter_group_used_roles_and_more.py
new file mode 100644
index 0000000000..28f345df00
--- /dev/null
+++ b/ietf/group/migrations/0008_alter_group_used_roles_and_more.py
@@ -0,0 +1,107 @@
+# Generated by Django 4.2.23 on 2025-08-15 16:46
+
+from django.db import migrations, models
+import ietf.group.models
+import ietf.name.models
+import ietf.utils.db
+import ietf.utils.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("group", "0007_used_roles"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="group",
+            name="used_roles",
+            field=models.JSONField(
+                blank=True,
+                default=list,
+                help_text="Leave an empty list to get the group_type's default used roles",
+                max_length=256,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="admin_roles",
+            field=ietf.utils.db.EmptyAwareJSONField(
+                default=ietf.group.models.default_admin_roles, max_length=64
+            ),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="default_used_roles",
+            field=ietf.utils.db.EmptyAwareJSONField(default=list, max_length=256),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="docman_roles",
+            field=ietf.utils.db.EmptyAwareJSONField(
+                default=ietf.group.models.default_docman_roles, max_length=128
+            ),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="groupman_authroles",
+            field=ietf.utils.db.EmptyAwareJSONField(
+                default=ietf.group.models.default_groupman_authroles, max_length=128
+            ),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="groupman_roles",
+            field=ietf.utils.db.EmptyAwareJSONField(
+                default=ietf.group.models.default_groupman_roles, max_length=128
+            ),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="material_types",
+            field=ietf.utils.db.EmptyAwareJSONField(
+                default=ietf.group.models.default_material_types, max_length=64
+            ),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="matman_roles",
+            field=ietf.utils.db.EmptyAwareJSONField(
+                default=ietf.group.models.default_matman_roles, max_length=128
+            ),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="role_order",
+            field=ietf.utils.db.EmptyAwareJSONField(
+                default=ietf.group.models.default_role_order,
+                help_text="The order in which roles are shown, for instance on photo pages.  Enter valid JSON.",
+                max_length=128,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="groupfeatures",
+            name="session_purposes",
+            field=ietf.utils.db.EmptyAwareJSONField(
+                default=list,
+                help_text="Allowed session purposes for this group type",
+                max_length=256,
+                validators=[
+                    ietf.utils.validators.JSONForeignKeyListValidator(
+                        ietf.name.models.SessionPurposeName
+                    )
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="grouphistory",
+            name="used_roles",
+            field=models.JSONField(
+                blank=True,
+                default=list,
+                help_text="Leave an empty list to get the group_type's default used roles",
+                max_length=256,
+            ),
+        ),
+    ]
diff --git a/ietf/group/migrations/0008_group_features_onetoone.py b/ietf/group/migrations/0008_group_features_onetoone.py
deleted file mode 100644
index 86bfacc1ee..0000000000
--- a/ietf/group/migrations/0008_group_features_onetoone.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2019-01-19 10:08
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0007_new_group_features_data'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='type',
-            field=ietf.utils.models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='features', serialize=False, to='name.GroupTypeName'),
-        ),
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='type',
-            field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.GroupTypeName'),
-        ),
-    ]
diff --git a/ietf/group/migrations/0009_auto_20190122_1012.py b/ietf/group/migrations/0009_auto_20190122_1012.py
deleted file mode 100644
index 397757404f..0000000000
--- a/ietf/group/migrations/0009_auto_20190122_1012.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-22 10:12
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0008_group_features_onetoone'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='historicalgroupfeatures',
-            name='agenda_type',
-            field=models.ForeignKey(blank=True, db_constraint=False, default='ietf', null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.AgendaTypeName'),
-        ),
-    ]
diff --git a/ietf/group/migrations/0010_add_group_types.py b/ietf/group/migrations/0010_add_group_types.py
deleted file mode 100644
index 59c2c07f7f..0000000000
--- a/ietf/group/migrations/0010_add_group_types.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2019-01-09 09:02
-
-
-from django.db import migrations
-
-import debug                            # pyflakes:ignore
-
-group_type_features = {
-    'adhoc': {
-        'grouptypename': {
-            "slug": 'adhoc',
-            "desc": 'Ad Hoc schedulable Group Type, for instance HotRfc',
-            "name": "Ad Hoc",
-            "order": 0,
-            "used": True,
-            "verbose_name": "Ad Hoc Group Type",
-        },
-        'groupfeatures': {
-            'about_page': 'ietf.group.views.group_about',
-            'acts_like_wg': False,
-            'admin_roles': '["chair"]',
-            'agenda_type_id': 'ietf',
-            'create_wiki': True,
-            'custom_group_roles': False,
-            'customize_workflow': False,
-            'default_tab': 'ietf.group.views.group_about',
-            'docman_roles': '["chair"]',
-            'groupman_roles': '["chair","delegate"]',
-            'has_chartering_process': False,
-            'has_default_jabber': True,
-            'has_documents': False,
-            'has_dependencies': False,
-            'has_meetings': True,
-            'has_milestones': False,
-            'has_nonsession_materials': False,
-            'has_reviews': False,
-            'has_session_materials': True,
-            'is_schedulable': True,
-            'material_types': '["slides"]',
-            'matman_roles': '["chair","delegate"]',
-            'req_subm_approval': True,
-            'role_order': '["chair","delegate"]',
-            'show_on_agenda': True,
-        },
-    },
-    'iesg': {
-        'grouptypename': {
-            "slug": 'iesg',
-            "desc": '',
-            "name": "IESG",
-            "order": 0,
-            "used": True,
-            "verbose_name": "Internet Engineering Steering Group"
-        },
-        'groupfeatures': {
-            'about_page': 'ietf.group.views.group_about',
-            'acts_like_wg': False,
-            'admin_roles': '["chair"]',
-            'agenda_type_id': None,
-            'create_wiki': False,
-            'custom_group_roles': True,
-            'customize_workflow': False,
-            'default_tab': 'ietf.group.views.group_about',
-            'docman_roles': '["chair"]',
-            'groupman_roles': '["chair","delegate"]',
-            'has_chartering_process': False,
-            'has_default_jabber': False,
-            'has_documents': False,
-            'has_dependencies': False,
-            'has_meetings': False,
-            'has_milestones': False,
-            'has_nonsession_materials': False,
-            'has_reviews': False,
-            'has_session_materials': False,
-            'is_schedulable': False,
-            'material_types': '[]',
-            'matman_roles': '["chair","delegate"]',
-            'req_subm_approval': True,
-            'role_order': '["chair","secr"]',
-            'show_on_agenda': False
-        },
-    },
-    'ise': {
-        'grouptypename': {
-            "slug": 'ise',
-            "desc": '',
-            "name": "ISE",
-            "order": 0,
-            "used": True,
-            "verbose_name": "Independent Stream Editor",
-        },
-        'groupfeatures': {
-            'about_page': 'ietf.group.views.group_about',
-            'acts_like_wg': False,
-            'admin_roles': '["chair","lead"]',
-            'agenda_type_id': None,
-            'create_wiki': False,
-            'custom_group_roles': True,
-            'customize_workflow': False,
-            'default_tab': 'ietf.group.views.group_about',
-            'docman_roles': '["chair"]',
-            'groupman_roles': '["chair","delegate"]',
-            'has_chartering_process': False,
-            'has_default_jabber': False,
-            'has_documents': False,
-            'has_dependencies': False,
-            'has_meetings': False,
-            'has_milestones': False,
-            'has_nonsession_materials': False,
-            'has_reviews': False,
-            'has_session_materials': False,
-            'is_schedulable': False,
-            'material_types': '[]',
-            'matman_roles': '["chair","delegate"]',
-            'req_subm_approval': True,
-            'role_order': '["chair"]',
-            'show_on_agenda': False
-        },
-    },
-}
-
-def forward(apps, schema_editor):
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    for slug in group_type_features:
-        typename = group_type_features[slug]['grouptypename']
-        gt, _ = GroupTypeName.objects.get_or_create(slug=slug)
-        for k,v in typename.items():
-            setattr(gt, k, v)
-        gt.save()
-        #
-        features = group_type_features[slug]['groupfeatures']
-        gf, _ = GroupFeatures.objects.get_or_create(type_id=slug)
-        for k,v in features.items():
-            setattr(gf, k, v)
-        gf.save()
-
-
-# This migration does not remove or change any previous fields, and executes
-# swirftly, so we permit it to be interleaved with schema migrations
-forward.interleavable = True            # type: ignore # https://github.com/python/mypy/issues/2087
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0009_auto_20190122_1012'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0011_auto_20190225_1302.py b/ietf/group/migrations/0011_auto_20190225_1302.py
deleted file mode 100644
index 1b5e45e2e7..0000000000
--- a/ietf/group/migrations/0011_auto_20190225_1302.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-02-25 13:02
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0010_add_group_types'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='groupfeatures',
-            name='has_dependencies',
-        ),
-        migrations.RemoveField(
-            model_name='historicalgroupfeatures',
-            name='has_dependencies',
-        ),
-    ]
diff --git a/ietf/group/migrations/0012_add_old_nomcom_announcements.py b/ietf/group/migrations/0012_add_old_nomcom_announcements.py
deleted file mode 100644
index 3aa65bc91f..0000000000
--- a/ietf/group/migrations/0012_add_old_nomcom_announcements.py
+++ /dev/null
@@ -1,1308 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-03-23 17:50
-
-
-from django.db import migrations
-
-from ietf.group.models import Group 
-from ietf.person.models import Person
-from ietf.message.models import Message
-from datetime import datetime
-
-def forward(apps, schema_editor):
-
-        p=Person.objects.filter(name="Jim Fenton")[0]
-
-# Unfortunately, get_nomcom_by_year only works for 2013 and later, so we need to do things the hard way.
-
-        n = Group.objects.filter(acronym="nomcom2002")[0]
- 
-        n.message_set.create(by=p, subject="nomcom call for volunteers", time=datetime(2002,7,30),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-This is the call for volunteers to participate in the 2002 IETF
-Nominations Committee, the committee that will select this year's
-nominees for the IAB and the IESG.  Details about the Nominations
-Committee process can be found in RFC 2727.
-
-The NomCom is the IETF's way of choosing its leadership. Typically,
-half of the IAB and half of the IESG is selected each year. It is
-possible that the NomCom will have to fill more or fewer slots than
-this, due to the creation or elimination of positions by the IESG,
-resignations, transfers, etc. IESG members whose terms are up are
-Harald Alvestrand, IETF Chair; Scott Bradner, Transport; Randy Bush,
-Operations &amp; Management; Patrik Faltstrom, Applications; Thomas Narten,
-Internet; Bill Fenner, Routing; and Jeff Schiller, Security. IAB
-members whose terms are up are: Ran Atkinson, Rob Austein, Fred Baker,
-Steve Deering, Sally Floyd, and Geoff Huston.
-
-For the NomCom to work as it should, the pool from which the volunteers
-are chosen should be as large as possible. The more people who
-volunteer, the better chance we have of choosing a random yet
-representative cross section of the IETF population. Volunteering for
-the NomCom is also a good way of serving the IETF community. So please
-volunteer.
-
-NomCom members are barred from nomination during the year they serve,
-even if they later resign. Therefore being selected for the NomCom
-provides complete immunity against selection for the IAB or IESG during
-that year.
-
-People who volunteer should be sure they can the afford the time,
-several hours per week for the next 4-5 months.  The task basically
-involves the following activities:
-
-  - Reading candidate's statements
-  - Participating in a weekly 2 hour conference call.
-  - Attending the IETF meetings held during the selection process.
-  - Doing several interviews.
-  - Speaking to IETF participants about the candidates, the job
-    requirements or the process.
-
-All NomCom deliberations and supporting information that relates to
-specific nominees, candidates, and confirmed candidates are
-confidential. The NomCom members will be exposed to confidential
-information as a result of their deliberations, their interactions with
-those they consult, and from those who provide requested supporting
-information. All members are expected to handle this information in a
-manner consistent with its sensitivity.
-
-To qualify as a volunteer, a person needs to have attended 2 out of the
-last 3 IETF meetings.  Anyone who meets this requirement is invited to
-volunteer by emailing your name, telephone number(s), and email address
-to proberts@megisto.com no later than September 6, 2002.  Please put
-"NOMCOM VOLUNTEER" in the subject line.
-
-Once the list closes, I'll provide the list to the IETF secretariat who
-will verify the eligibility of the each of the volunteers (e.g. has
-attended at least 2 of the last 3 IETFs).  I will also ask them to
-publish the list prior to verification for volunteers to confirm that I
-actually received their email volunteering.  This list will be
-published at: http://www.ietf.org/nomcom/index.html
-
-We will then run the selection process and announce the results the
-week of September 16, 2002. Ten (10) NomCom voting members will be
-chosen from the pool of volunteers according to the procedure described
-by Donald Eastlake in RFC 2777, "Publicly Verifiable Nomcom Random
-Selection". The source of randomness will be based on the shares traded
-number of 12 stocks selected by the NomCom chair.
-
-The official shares traded numbers (denoted in 000s) will be drawn from
-the September 16, 2002 Wall Street Journal which reports the sales
-figures from the previous trading day - September 13, 2002. If trading
-in any of the stocks  is suspended, then the shares traded will be
-assumed to be 0.
-
-Please volunteer.
-
-Thank you,
-
-Phil Roberts &lt;proberts@megisto.com&gt;
-
-STOCKS USED IN THE NOMCOM SELECTION PROCESS:
-
-Martha Stewart Living (MSO)
-Harley-Davidson (HDI)
-Motorola (MOT)
-Sony (SNE)
-Metlife (MET)
-Home Depot (HD)
-Wrigely (WWY)
-Granite Construction, Inc (GVA)
-UPS (UPS)
-Marriott International (MAR)
-Quest Diagnostics (DGX)
-Nordstrom (JWN)
-
-""")
-
-        n.message_set.create(by=p, subject="Selection of the Nominations Committee", time=datetime(2002,9,17),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-STOCKS USED IN THE NOMCOM SELECTION PROCESS, published result (in 100s), 
-number used as input (using 000s, rounded):
-
-Martha Stewart Living (MSO), 1562, 156,
-Harley-Davidson (HDI), 12575, 1258,
-Motorola (MOT), 86406, 8641,
-Sony (SNE), 4061, 406,
-Metlife (MET), 26384, 2638,
-Home Depot (HD), 77244, 7724,
-Wrigely (WWY), 2422, 242,
-Granite Construction, Inc (GVA), 2134, 213,
-UPS (UPS), 25343, 2534,
-Marriott International (MAR), 20820, 2082,
-Quest Diagnostics (DGX), 6471, 647,
-Nordstrom (JWN), 3598, 360.
-
-
-Output of selection run:
-------------------------
-
-Type size of pool:
-(or 'exit' to exit) 146
-Type number of items to be selected:
-(or 'exit' to exit) 10
-Approximately 49.8 bits of entropy needed.
-
-Type #1 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-156 
-Type #2 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-1258 
-Type #3 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-8641 
-Type #4 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-406 
-Type #5 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-2638 
-Type #6 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-7724 
-Type #7 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-242 
-Type #8 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-213 
-Type #9 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-2534 
-Type #10 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-2082 
-Type #11 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-647 
-Type #12 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-360 
-Type #13 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-Key is:
- 156./1258./8641./406./2638./7724./242./213./2534./2082./647./360./
-index        hex value of MD5        div  selected
- 1  E220923B36A9DC02559AD9D8A2A3788E  146  -> 23 <-
- 2  4DA923C4AB28A35840731A3BC7FD6FED  145  -> 75 <-
- 3  C15AC23F9DDA50A178749955C7DB4C53  144  -> 86 <-
- 4  CF0F40F7AD1346B3DA357793950D7E01  143  -> 47 <-
- 5  1FB9FDBD56707A1B656F095A3CF0ACEF  142  -> 74 <-
- 6  C530071D6CD9E5FA83AA719D28C4013A  141  -> 127 <-
- 7  9E9F928E84A3BF6DE15E336C9AF0EB14  140  -> 118 <-
- 8  8668415B21041948BE0EE91A69724B4C  139  -> 15 <-
- 9  26338CA7ED8FB029E20B1AD0DD34BEC4  138  ->  9 <-
-10  369D706DC4051ADFD4259C287E78AAE7  137  -> 140 <-
-
-Done, type any character to exit.
-
-----------------------------------
-Nominations committee:
- 23. Edward Lewis
- 75. Alec Brusilovsky
- 86. Michael Richardson
- 47. Eva Jonsson
- 74. Stephen Trowbridge
-127. Frank Alfano
-118. Thomas Kurien
- 15. Dennis Beard
-  9. Richard Draves
-140. Eva Gustaffson
-
-"""
-        )
-
-        n.message_set.create(by=p, subject="Announcement of the Nominations Committee", time=datetime(2002,9,18),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-We have completed selection of the 2002 
-Nominations committee.
-
-Please welcome the voting members of this 
-year's Nomcom: 
-
-Edward Lewis <edlewis@arin.net> 
-Alec Brusilovsky <abrusilovsky@ieee.org> 
-Michael Richardson <mcr@sandelman.ca> 
-Eva Jonsson <eva.jonsson@utfors.se> 
-Stephen Trowbridge <sjtrowbridge@lucent.com> 
-Frank Alfano <falfano@lucent.com> 
-Thomas Kurien <kurien@lucent.com> 
-Dennis Beard <beardd@nortelnetworks.com> 
-Richard Draves <richdr@microsoft.com> 
-Eva Gustafsson <eva.gustafsson@ericsson.com.>
-
-The non-voting members are: 
-
-Phil Roberts <proberts@megisto.com> (chair) 
-Allison Mankin <mankin@psg.com> (IETF liaison) 
-Eric Rescorla <ekr@rtfm.com> (IAB liaison) 
-Theodore Ts'o <tytso@mit.edu> (previous nomcom chair)
-
-Information on this year's selection process is available at: 
-<http://www.ietf.org/nomcom/select-announce.txt>
-"""
-        )
-
-        n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,10,21),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-The 2002-2003 Nominations Committee is now
-soliciting nominations for the open
-slots on the IESG and IAB. 
-
-Please take the time, even if it is
-only a few moments, to send us your
-thoughts. 
-
-Members of the community are encouraged to
-nominate candidates for any of the positions
-which are up for re-filling: 
-
-IESG Terms ending in March, 2003:
-Harald Alvestrand IETF Chair
-Scott Bradner Transport
-Randy Bush Operations & Management
-Patrik Faltstrom Applications
-Thomas Narten Internet
-Bill Fenner Routing
-Jeff Schiller Security 
-
-IAB Terms ending in March, 2003:
-Ran Atkinson
-Rob Austein
-Fred Baker
-Steve Deering
-Sally Floyd
-Geoff Huston 
-
-Members of the community are encouraged to contact the nomcom confidentially 
-1) to nominate someone for any of these positions (please provide the email
-address of any nominee), 
-2) to provide input relating to potential candidates, or 
-3) to provide comments regarding the past performance of incumbents.
-All of this information will be considered during the deliberations of
-the nominating committee and will be held in confidence by the nominating
-committee. 
-
-We emphasize that comments sent to the nominations committee will be kept
-in confidence. As noted in RFC 2727 "all deliberations and supporting 
-information that relates to specific nominees, candidates, and confirmed
-candidates are confidential." 
-
-Self-nominations are accepted. The deadline for nominations is midnight
-Friday, November 22, 2002. Early input is desirable so that candidates
-may be interviewed during the Atlanta IETF meeting. 
-
-The members of the NomCom can be contacted individually at the addresses
-below or collectively at <nomcom@ietf.org>. Additionally, the members of
-the NomCom will be identified at the IETF by a small orange dot
-on their name tags. People are encouraged to take advantage of the
-opportunity to talk to the members of the NomCom about nominations
-and other issues related to the IAB and IESG membership. 
-
-The 2002-2003 Nominations Committee
-Edward Lewis <edlewis@arin.net> 
-Alec Brusilovsky <abrusilovsky@lucent.com> 
-Michael Richardson <mcr@sandelman.ca> 
-Eva Jonsson <eva.jonsson@utfors.se> 
-Stephen Trowbridge <sjtrowbridge@lucent.com> 
-Frank Alfano <falfano@lucent.com> 
-Thomas Kurien <kurien@lucent.com> 
-Dennis Beard <beardd@nortelnetworks.com> 
-Richard Draves <richdr@microsoft.com> 
-Eva Gustafsson <eva.gustafsson@ericsson.com> 
-
-Non-voting members:
-Phil Roberts <proberts@megito.com> (chair)
-Allison Mankin <mankin@psg.com> (IESG liaison)
-Eric Rescorla <ekr@rtfm.com> (IAB liaison) 
-Theodore Ts'o <tytso@mit.edu> (previous nomcom chair) 
-
-The role of non-voting members (from RFC 2727): 
-
-"The nominations committee comprises at least a non-voting Chair,
-10 voting volunteers, and 3 non-voting liaisons. The sitting IAB
-and IESG members each appoint a non-voting liaison to the nominating
-committee from their current membership who are not sitting in an 
-open position. The Chair of the prior year's nominating committee 
-also serves as a non-voting liaison.
-
-""")
-
-        n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,11,0o5),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-The 2002-2003 Nominations Committee is now
-soliciting nominations for the open
-slots on the IESG and IAB.
-
-Please take the time, even if it is
-only a few moments, to send us your
-thoughts.
-
-Members of the community are encouraged to
-nominate candidates for any of the positions
-which are up for re-filling:
-
-IESG Terms ending in March, 2003:
-Harald Alvestrand     IETF Chair
-Scott Bradner         Transport
-Randy Bush            Operations & Management
-Patrik Faltstrom      Applications
-Thomas Narten         Internet
-Bill Fenner           Routing
-Jeff Schiller         Security
-
-IAB Terms ending in March, 2003:
-Ran Atkinson
-Rob Austein
-Fred Baker
-*Steve Deering
-Sally Floyd
-Geoff Huston
-
-*Please note that Steve Deering is on sabbatical and will not be a candidate
-to return to the IAB.
-
-Members of the community are encouraged to contact the nomcom confidentially 
-1) to nominate someone for any of these positions (please provide the email
-address of any nominee), 
-2) to provide input relating to potential candidates, or 
-3) to provide comments regarding the past performance of incumbents.
-All of this information will be considered during the deliberations of
-the nominating committee and will be held in confidence by the nominating
-committee.
-
-We emphasize that comments sent to the nominations committee will be kept
-in confidence. As noted in RFC 2727 "all deliberations and supporting 
-information that relates to specific nominees, candidates, and confirmed
-candidates are confidential."
-
-Self-nominations are accepted. The deadline for nominations is midnight
-Friday, November 22, 2002.  Early input is desirable so that candidates
-may be interviewed during the Atlanta IETF meeting.
-
-The members of the NomCom can be contacted individually at the addresses
-below or collectively at nomcom@ietf.org.  Additionally, the members of
-the NomCom will be identified at the IETF by a small orange dot
-on their name tags.  People are encouraged to take advantage of the
-opportunity to talk to the members of the NomCom about nominations
-and other issues related to the IAB and IESG membership.
-
-The 2002-2003 Nominations Committee
-Edward Lewis <edlewis@arin.net> 
-Alec Brusilovsky <abrusilovsky@lucent.com> 
-Michael Richardson <mcr@sandelman.ca> 
-Eva Jonsson <eva.jonsson@utfors.se> 
-Stephen Trowbridge <sjtrowbridge@lucent.com> 
-Frank Alfano <falfano@lucent.com> 
-Thomas Kurien <kurien@lucent.com> 
-Dennis Beard <beardd@nortelnetworks.com> 
-Richard Draves <richdr@microsoft.com> 
-Eva Gustafsson <eva.gustafsson@ericsson.com>
-
-Non-voting members:
-Phil Roberts <proberts@megito.com> (chair)
-Allison Mankin <mankin@psg.com> (IESG liaison)
-Eric Rescorla <ekr@rtfm.com> (IAB liaison) 
-Theodore Ts'o <tytso@mit.edu> (previous nomcom chair)
-
-The role of non-voting members (from RFC 2727):
-
-"The nominations committee comprises at least a non-voting Chair,
-10 voting volunteers, and 3 non-voting liaisons.  The sitting IAB
-and IESG members each appoint a non-voting liaison to the nominating
-committee from their current membership who are not sitting in an 
-open position.  The Chair of the prior year's nominating committee 
-also serves as a non-voting liaison.
-""")
-
-        n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,11,12),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-The 2002-2003 Nominations Committee is now
-soliciting nominations for the open
-slots on the IESG and IAB.
-
-Please take the time, even if it is
-only a few moments, to send us your
-thoughts.
-
-Members of the community are encouraged to
-nominate candidates for any of the positions
-which are up for re-filling:
-
-IESG Terms ending in March, 2003:
-Harald Alvestrand     IETF Chair
-Scott Bradner         Transport
-Randy Bush            Operations & Management
-Patrik Faltstrom      Applications
-Thomas Narten         Internet
-Bill Fenner           Routing
-Jeff Schiller         Security
-
-IAB Terms ending in March, 2003:
-Ran Atkinson
-Rob Austein
-Fred Baker
-*Steve Deering
-Sally Floyd
-Geoff Huston
-
-*Please note that Steve Deering is on sabbatical and will not be a candidate
-to return to the IAB.
-
-Members of the community are encouraged to contact the nomcom confidentially 
-1) to nominate someone for any of these positions (please provide the email
-address of any nominee), 
-2) to provide input relating to potential candidates, or 
-3) to provide comments regarding the past performance of incumbents.
-All of this information will be considered during the deliberations of
-the nominating committee and will be held in confidence by the nominating
-committee.
-
-We emphasize that comments sent to the nominations committee will be kept
-in confidence. As noted in RFC 2727 "all deliberations and supporting 
-information that relates to specific nominees, candidates, and confirmed
-candidates are confidential."
-
-Self-nominations are accepted. The deadline for nominations is midnight
-Friday, November 22, 2002.  Early input is desirable so that candidates
-may be interviewed during the Atlanta IETF meeting.
-
-The members of the NomCom can be contacted individually at the addresses
-below or collectively at nomcom@ietf.org.  Additionally, the members of
-the NomCom will be identified at the IETF by a small orange dot
-on their name tags.  People are encouraged to take advantage of the
-opportunity to talk to the members of the NomCom about nominations
-and other issues related to the IAB and IESG membership.
-
-The 2002-2003 Nominations Committee
-Edward Lewis <edlewis@arin.net> 
-Alec Brusilovsky <abrusilovsky@lucent.com> 
-Michael Richardson <mcr@sandelman.ca> 
-Eva Jonsson <eva.jonsson@utfors.se> 
-Stephen Trowbridge <sjtrowbridge@lucent.com> 
-Frank Alfano <falfano@lucent.com> 
-Thomas Kurien <kurien@lucent.com> 
-Dennis Beard <beardd@nortelnetworks.com> 
-Richard Draves <richdr@microsoft.com> 
-Eva Gustafsson <eva.gustafsson@ericsson.com>
-
-Non-voting members:
-Phil Roberts <proberts@megito.com> (chair)
-Allison Mankin <mankin@psg.com> (IESG liaison)
-Eric Rescorla <ekr@rtfm.com> (IAB liaison) 
-Theodore Ts'o <tytso@mit.edu> (previous nomcom chair)
-
-The role of non-voting members (from RFC 2727):
-
-"The nominations committee comprises at least a non-voting Chair,
-10 voting volunteers, and 3 non-voting liaisons.  The sitting IAB
-and IESG members each appoint a non-voting liaison to the nominating
-committee from their current membership who are not sitting in an 
-open position.  The Chair of the prior year's nominating committee 
-also serves as a non-voting liaison.
-"""
-        )
-
-        n.message_set.create(by=p, subject="IETF Nomcom Announcement", time=datetime(2003,2,27),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-The nomcom is pleased to announce the results of the 2002-2003
-selection process.  The IAB has approved the IESG candidates and
-the ISOC has approved the IAB candidates.  Please welcome them
-in their roles.
- 
-
-The IESG selections are as follows:
-Harald Alvestrand   IETF Chair
-Ted Hardie          Applications
-Thomas Narten       Internet
-Randy Bush          Operations and Management
-Bill Fenner         Routing
-Russ Housley        Security
-Jon Peterson        Transport
- 
-The IAB selections are as follows:
-Bernard Aboba
-Rob Austein
-Sally Floyd
-Jun-ichiro Itojun Hagino
-Mark Handley
-Geoff Huston
- 
-And also Patrik Faltstrom has been selected to fill
-the vacancy left by Ted Hardie, a one year term.
-
-Many people deserve to be thanked.  First thanks are due to
-all of those who volunteered to serve on the nomcom, and especially
-to those who were randomly selected and served as voting members
-of the nomcom.  They contributed considerable time from their busy
-schedules to participate in weekly calls, to conduct interviews, to
-read questionnaires, and to make the selection of candidates.
- 
-Thanks to those in the community who volunteered to serve on the IESG
-and the IAB, both to those who were selected and those not chosen this
-time around.  Thanks very much for completing the questionnaires, the
-follow-up questionnaires, and participating in interviews.
- 
-Thanks are also due to the IETF as a whole for providing input to the
-process through nominations, recommendations, and feedback on
-potential candidates.
- 
-The voting members of the nomcom are:
-Edward Lewis
-Alec Brusilovsky
-Michael Richardson
-Eva Jonsson
-Stephen Trowbridge
-Frank Alfano
-Thomas Kurien
-Dennis Beard
-Richard Draves
-Eva Gustafsson
-
-The nonvoting members are:
-Phil Roberts - chair
-Allison Mankin - IESG liaison
-Eric Rescorla - IAB liaison
-Ted Ts'o - past chair
-""")
-
-        n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Request", time=datetime(2003,6,11),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
- The nominations committee has received notice to fill the vacancy in the
- Internet Area created with Erik Nordmark's departure. The nominations
- committee is seeking nominees to fill the open position. The chosen
- candidate
- will serve out the rest of the current term, which ends in March 2004,
- and the two year term following, according to the rules documented in RFC
- 2727.
-   
- Members of the community are encouraged to contact the nomcom confidentially
-
- 1) to nominate someone for this position (please provide the email
- address of any nominee), or 2) to provide input relating to potential
- candidates.
-   
- All of this information will be considered during the deliberations of
- the nominating committee and will be held in confidence by the nominating
- committee.
-   
- We emphasize that comments sent to the nominations committee will be kept
- in confidence. As noted in RFC 2727 "all deliberations and supporting 
- information that relates to specific nominees, candidates, and confirmed
- candidates are confidential."
-   
- Self-nominations are accepted. The deadline for nominations is midnight
- Tuesday, June 17, 2003. 
-   
- The members of the NomCom can be contacted individually at the addresses
- below or collectively at <nomcom@ietf.org>.
-   
- The 2002-2003 Nominations Committee
- Edward Lewis <edlewis@arin.net> 
- Alec Brusilovsky <abrusilovsky@iee.org> 
- Michael Richardson <mcr@sandelman.ca> 
- Eva Jonsson <eva.jonsson@utfors.se> 
- Stephen Trowbridge <sjtrowbridge@lucent.com> 
- Frank Alfano <falfano@lucent.com> 
- Thomas Kurien <kurien@kamputech.com> 
- Dennis Beard <beardd@nortelnetworks.com>
-
- Richard Draves <richdr@microsoft.com> 
- Eva Gustafsson <eva.gustafsson@ericsson.com>
-   
- Non-voting members:
- Phil Roberts <proberts@megito.com> (chair)
- Allison Mankin <mankin@psg.com> (IESG liaison)
- Eric Rescorla <ekr@rtfm.com> (IAB liaison) 
- Theodore Ts'o <tytso@mit.edu> (previous nomcom chair)
-   
- The role of non-voting members (from RFC 2727):
-   
- "The nominations committee comprises at least a non-voting Chair,
- 10 voting volunteers, and 3 non-voting liaisons. The sitting IAB
- and IESG members each appoint a non-voting liaison to the nominating
- committee from their current membership who are not sitting in an 
- open position. The Chair of the prior year's nominating committee 
- also serves as a non-voting liaison.
-""")
-
-        n.message_set.create(by=p, subject="Nomcom result announcement", time=datetime(2003,7,15),
-                frm="Phil Roberts <PRoberts@MEGISTO.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
- The nomcom is pleased to announce that it has selected Margaret Wasserman
- to fill the mid-term vacancy left by Erik Nordmark's resignation.
-   
- Thanks are due again to many folks. First thanks are due to
- all of those who volunteered to serve on the nomcom, and especially
- to those who were randomly selected and served as voting members
- of the nomcom. They contributed considerable time from their busy
- schedules to participate in weekly calls, to conduct interviews, to
- read questionnaires, and to make the selection of candidates.
-   
- Thanks to those in the community who volunteered to serve on the IESG
- and the IAB, both to those who were selected and those not chosen this
- time around. Thanks very much for completing the questionnaires, the
- follow-up questionnaires, and participating in interviews.
-   
- Thanks are also due to the IETF as a whole for providing input to the
- process through nominations, recommendations, and feedback on
- potential candidates.
-   
- The voting members of the nomcom are:
- Edward Lewis
- Alec Brusilovsky
- Michael Richardson
- Eva Jonsson
- Stephen Trowbridge
- Frank Alfano
- Thomas Kurien
- Dennis Beard
- Richard Draves
- Eva Gustafsson
-   
- The nonvoting members are:
- Phil Roberts - chair
- Allison Mankin - IESG liaison
- Eric Rescorla - IAB liaison
- Ted Ts'o - past chair
-""")
-
-        n = Group.objects.filter(acronym="nomcom2003")[0]
-
-        n.message_set.create(by=p, subject="IETF Nominations Committee Chair Announcement", time=datetime(2003,8,25),
-                frm="Lynn St. Amour", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
- One of the roles of the ISOC President is to appoint the IETF Nominations 
-Committee chair. This is done through consultation with the IETF and IAB Chairs 
-as well as the ISOC Executive Committee and it gives us great pleasure to announce 
-that Rich Draves has agreed to serve as the 2003 IETF Nominations Committee chair. 
-Rich can be reached at <richdr@microsoft.com>.
-
-A Call for Nominations for this committee will be sent shortly to the IETF 
-Announcement list; and a list of the IESG and IAB seats to be filled will also be 
-published shortly. Please give serious consideration to possible candidates for these
-posts and in the interim, make your suggestions known to Rich, who will share them 
-with the committee when seated.
-
-This is an ambitious undertaking and it is important that the entire IETF community 
-assist as much as possible. Thank you in advance for your support and a sincere thank
-you to Rich for agreeing to take on this important responsibility.
-
-Lynn St. Amour
-President & CEO
-The Internet Society
-""")
-
-        n.message_set.create(by=p, subject="NomCom call for volunteers", time=datetime(2003,9,22),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-This is the call for volunteers to participate in the 2003 IETF Nominations Committee, 
-the committee that will select this year's nominees for the IAB and the IESG.
-
-The NomCom is the IETF's way of choosing its leadership. Typically, half of the IAB 
-and half of the IESG is selected each year. It is possible that the NomCom will have 
-to fill more or fewer slots than this, due to the creation or elimination of positions 
-by the IESG, resignations, transfers, etc. IESG members whose terms are up are: 
-Ned Freed, Applications; Bert Wijnen, Operations and Management; Alex Zinin, 
-Routing; Steve Bellovin, Security; and Allison Mankin, Transport. 
-IAB members whose terms are up are: Leslie Daigle, Patrik Faltstrom, 
-Charlie Kaufman, James Kempf, Eric Rescorla, and Mike St. Johns.
-
-For the NomCom to work as it should, the pool from which the volunteers are chosen 
-should be as large as possible. The more people who volunteer, the better chance 
-we have of choosing a random yet representative cross section of the IETF population. 
-Volunteering for the NomCom is also a good way of serving the IETF community. 
-So please volunteer.
-
-NomCom members are barred from nomination during the year they serve, even if they 
-later resign. Therefore being selected for the NomCom provides complete immunity against 
-selection for the IAB or IESG during that year.
-
-People who volunteer should be sure they can the afford the time, several hours per week 
-for the next 4-5 months.  The task basically involves the following activities:
-
-- Reading candidate's statements
-- Participating in a weekly 2 hour conference call.
-- Attending the IETF meetings held during the selection process.
-- Doing several interviews.
-- Speaking to IETF participants about the candidates, the job requirements, or the process.
-
-All NomCom deliberations and supporting information that relates to specific nominees, 
-candidates, and confirmed candidates are confidential. The NomCom members will be exposed 
-to confidential information as a result of their deliberations, their interactions with 
-those they consult, and from those who provide requested supporting information. 
-All members are expected to handle this information in a manner consistent with 
-its sensitivity.
-
-Details about the Nominations Committee process can be found in RFC 2727 and 
-draft-ietf-nomcom-rfc2727bis-07.txt. The 2003 NomCom will use RFC 2727 until 2727bis 
-is approved as an RFC, at which time we will switch (as much as possible) to 2727bis.
-
-To qualify as a volunteer, a person needs to have attended 2 out of the last 3 IETF meetings 
-(according to RFC 2727) or 3 out of the last 5 IETF meetings (according to 2727bis). 
-Anyone who meets either of these requirements is invited to volunteer by emailing your name, 
-telephone number(s), and email address to richdr@microsoft.com no later than noon in Seattle 
-on October 3, 2003.  Please put "NOMCOM VOLUNTEER" in the subject line.
-
-I will check the eligibility of volunteers against both criteria and publish a up-to-date 
-list of verified volunteers at http://www.ietf.org/nomcom/index.html. On October 3, 
-I will decide whether to use the 2-of-3 or 3-of-5 rule, depending on whether 2727bis 
-has been approved by that date. This will result in a final list of volunteers.
-
-I will then run the selection process and announce the results on October 10, 2003. 
-Ten NomCom voting members will be chosen from the pool of volunteers according to the 
-procedure described by Donald Eastlake in RFC 2777, "Publicly Verifiable Nomcom Random 
-Selection". The source of randomness will be based on the shares-traded number of 12 stocks 
-selected by the NomCom chair.
-
-The official shares-traded numbers (denoted in 000s) will be drawn from the October 10, 2003 
-Wall Street Journal which reports the sales figures from the previous trading day - October 9,
-2003. If trading in any of the stocks is suspended, then the shares traded will be assumed 
-to be 0.
-
-The NomCom voting members will start their term on October 17, after the IETF community 
-has had a chance to review the random selection process.
-
-Please volunteer.
-
-Thank you,
-
-Rich Draves <richdr@microsoft.com>
-
-STOCKS USED IN THE NOMCOM SELECTION PROCESS:
-
-Motorola (MOT)
-Lucent (LU)
-Nortel (NT)
-Liberty (L)
-Pfizer (PFE)
-General Electric (GE)
-Nokia (NOK)
-EMC Corp (EMC)
-FTI Consulting (FCN)
-Citigroup (C)
-Corning (GLW)
-Tyco International (TYC)
-""")
-
-        n.message_set.create(by=p, subject="NomCom volunteer list", time=datetime(2003,10,6),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-The final list of volunteers for the 2003 NomCom can be found at
-http://www.ietf.org/nomcom. I would like to thank everyone who
-volunteered.
-
-I will run the selection process and announce the results on October 10,
-2003. Ten NomCom voting members will be chosen from the pool of
-volunteers according to the procedure described by Donald Eastlake in
-RFC 2777, "Publicly Verifiable Nomcom Random Selection". The source of
-randomness will be based on the shares-traded number of the 12 stocks
-specified below.
-
-At this time, 2727bis has not yet been approved as an RFC. Hence I will
-use RFC 2727's eligibility criteria (attended 2 of the last 3 IETF
-meetings) when performing the random selection. I will not check the
-primary affiliation of the volunteers. If the RFC 2777 algorithm selects
-an ineligible volunteer, I will repeat the method until I have ten
-eligible and willing volunteers.
-
-The official shares-traded numbers (denoted in 000s) will be drawn from
-the October 10, 2003 Wall Street Journal which reports the sales figures
-from the previous trading day - October 9, 2003. If trading in any of
-the stocks is suspended, then the shares traded will be assumed to be 0.
-
-The NomCom voting members will start their term on October 17, after the
-IETF community has had a chance to review the random selection process.
-
-Thank you,
-
-Rich Draves <richdr@microsoft.com>
-
-STOCKS USED IN THE NOMCOM SELECTION PROCESS:
-
-Motorola (MOT)
-Lucent (LU)
-Nortel (NT)
-Liberty (L)
-Pfizer (PFE)
-General Electric (GE)
-Nokia (NOK)
-EMC Corp (EMC)
-FTI Consulting (FCN)
-Citigroup (C)
-Corning (GLW)
-Tyco International (TYC)
-""")
-
-        n.message_set.create(by=p, subject="Selection of the Nominations Committee", time=datetime(2003,10,10),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-STOCKS USED IN THE NOMCOM SELECTION PROCESS, published result (in 100s), 
-number used as input (using 000s, rounded):
-
-Motorola (MOT)                  143319  14332
-Lucent (LU)                     636797  63680
-Nortel (NT)                     266832  26683
-Liberty (L)                     83877   8388
-Pfizer (PFE)                    175698  17570
-General Electric (GE)           266052  26605
-Nokia (NOK)                     137837  13784
-EMC Corp (EMC)                  108120  10812
-FTI Consulting (FCN)            9765    977
-Citigroup (C)                   145963  14596
-Corning (GLW)                   116000  11600
-Tyco International (TYC)        107024  10702
-
-Output of selection run:
-------------------------
-
-Type size of pool:
-(or 'exit' to exit) 114
-Type number of items to be selected:
-(or 'exit' to exit) 15
-Approximately 61.0 bits of entropy needed.
-
-Type #1 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-14332
-14332
-Type #2 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-63680
-63680
-Type #3 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-26683
-26683
-Type #4 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-8388
-8388
-Type #5 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-17570
-17570
-Type #6 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-26605
-26605
-Type #7 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-13784
-13784
-Type #8 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-10812
-10812
-Type #9 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-977
-977
-Type #10 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-14596
-14596
-Type #11 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-11600
-11600
-Type #12 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-10702
-10702
-Type #13 randomness or 'end' followed by new line.
-Up to 16 integers or the word 'float' followed by up
-to 16 x.y format reals.
-end
-Key is:
-14332./63680./26683./8388./17570./26605./13784./10812./977./14596./11600./10702./
-index        hex value of MD5        div  selected
- 1  F9B4D100A3CC11E9F996D3806ACF1E29  114  -> 56 <-
- 2  319E2A14967C870FC89FDA06E21CB1A5  113  -> 44 <-
- 3  2F0E1E14F6659112390388D06D5DC395  112  -> 88 <-
- 4  D2D99A5EA018EF669293B370BE1F841A  111  -> 57 <-
- 5  53AD4E59C1E64FBA45FD2686186DD855  110  -> 114 <-
- 6  BBFF136BBE4E3580424039F6DB489300  109  -> 81 <-
- 7  69748D37FC816759F04F6660672050E9  108  -> 55 <-
- 8  CFE98B12654474DB49F0F224FD79AE0B  107  -> 84 <-
- 9  0A7ADA8D4B330BDA96CE570E9ACACF72  106  -> 100 <-
-10  B67F3A637817D2391A68FD0068D09A10  105  -> 82 <-
-11  84F8A3A7EEC6C0EAB68233E3144CC892  104  -> 108 <-
-12  C59B0A56531A8B9A280040E5FF9CF899  103  -> 47 <-
-13  FB4AD25533FA8DC99ED7113A3A388BCD  102  -> 28 <-
-14  D6CD94F1E92DAFE569FF0835063E5495  101  -> 105 <-
-15  6C22311D8EB6F2298EB201DFFD1AFE22  100  -> 89 <-
-
-Done, type any character to exit.
-
-----------------------------------
-Nominations committee:
-56. Kireeti Kompella <kireeti@juniper.net>
-44. Abdul-jabbar Asiri <ajasiri@nortelnetworks.com>
-88. Jin Seek Choi <jin@icu.ac.kr>
-57. Richard Shockey <richard@shockey.us>
-114. Ralph Droms <rdroms@cisco.com>
-81. David E. Martin <martinde@us.ibm.com>
-55. NOT ELIGIBLE
-84. Dan Forsberg <dan.forsberg@nokia.com>
-100. Ole J. Jacobsen <ole@cisco.com>
-82. Basavaraj Patil <basavaraj.patil@nokia.com>
-108. Andrew Thiessen <Andrew@its.bldrdoc.gov>
-""")
-
-        n.message_set.create(by=p, subject="NomCom Selection", time=datetime(2003,10,10),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-Please welcome the voting members of this year's nomcom:
-
-Kireeti Kompella <kireeti@juniper.net>
-Abdul-jabbar Asiri <ajasiri@nortelnetworks.com>
-Jin Seek Choi <jin@icu.ac.kr>
-Richard Shockey <richard@shockey.us>
-Ralph Droms <rdroms@cisco.com>
-David E. Martin <martinde@us.ibm.com>
-Dan Forsberg <dan.forsberg@nokia.com>
-Ole J. Jacobsen <ole@cisco.com>
-Basavaraj Patil <basavaraj.patil@nokia.com>
-Andrew Thiessen <Andrew@its.bldrdoc.gov>
-
-The non-voting members are: 
-
-Rich Draves <richdr@microsoft.com> (chair)
-Phil Roberts <proberts@megisto.com> (previous chair) 
-Bill Fenner <fenner@research.att.com> (IESG liaison) 
-
-The IAB has not yet selected its liaison - that should happen next week.
-
-The ISOC has appointed Brian Carpenter <brc@zurich.ibm.com> as its
-liaison. Because 2727bis has not yet been approved, following the
-procedures of RFC 2727 I will propose the addition of Brian as a
-liaison, subject to the nomcom's approval.
-
-The nomcom's term will start on October 17, 2003, after the IETF
-community has had a chance to review the selection process.
-
-Information on this year's selection process is available at
-http://www.ietf.org/nomcom. I used the RFC 2727 eligibility rules.
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="Call for Nominees", time=datetime(2003,10,17),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-Please send the NomCom <nomcom@ietf.org> nominations for the open IESG
-and IAB positions:
-
-IESG members whose terms are up are:
-Ned Freed, Applications
-Bert Wijnen, Operations and Management
-Alex Zinin, Routing
-Steve Bellovin, Security
-Allison Mankin, Transport
-
-IAB members whose terms are up are:
-Leslie Daigle
-Patrik Faltstrom 
-Charlie Kaufman
-James Kempf
-Eric Rescorla
-Mike St. Johns
-
-The nomination period will end at noon Pacific Time on Friday November 14.
-
-Any member of the IETF community may nominate any member of the IETF
-community for any open position. Self-nominations are permitted.
-
-Please also send the NomCom your feedback on the past performance of the
-incumbents.
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="NomCom members", time=datetime(2003,10,24),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-AB has appointed Geoff Huston as its non-voting liaison to the
-nomcom.
-
-Following RFC 2727's provisions, the nomcom has voted to add Brian
-Carpenter as a non-voting liaison with the ISOC board.
-
-To recap, the nomcom voting members are:
-
-Kireeti Kompella <kireeti@juniper.net>
-Abdul-jabbar Asiri <ajasiri@nortelnetworks.com>
-Jin Seek Choi <jin@icu.ac.kr>
-Richard Shockey <richard@shockey.us>
-Ralph Droms <rdroms@cisco.com>
-David E. Martin <martinde@us.ibm.com>
-Dan Forsberg <dan.forsberg@nokia.com>
-Ole J. Jacobsen <ole@cisco.com>
-Basavaraj Patil <basavaraj.patil@nokia.com>
-Andrew Thiessen <Andrew@its.bldrdoc.gov>
-
-The non-voting members are: 
-
-Rich Draves <richdr@microsoft.com> (chair)
-Phil Roberts <proberts@megisto.com> (previous chair) 
-Bill Fenner <fenner@research.att.com> (IESG liaison) 
-Geoff Huston <gih@telstra.net> (IAB liaison)
-Brian Carpenter <brc@zurich.ibm.com> (ISOC liaison)
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="NomCom at IETF", time=datetime(2003,11,7),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-Members of the nomcom at IETF will be happy to chat with you in person
-about what the nomcom should look for in candidates for the IESG and
-IAB, specific feedback about the incumbents or potential nominees,
-suggestions for nominees, etc.
-
-Note that all such information and feedback is kept strictly
-confidential within the nomcom.
-
-You can easily spot nomcom members because we will have orange dots on
-our registration badges. Also, the nomcom will be holding "office
-hours." You can drop by the "Directors Row 2" room, Tuesday through
-Thursday, to find someone to chat with. Or you can always send email to
-nomcom@ietf.org.
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="NomCom News", time=datetime(2003,11,14),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-Randy Bush has resigned from his position as O&M Area Director. Hence,
-the nomcom will be filling Randy's position in addition to the
-previously announced positions.
-
-Please submit nominations for Randy's O&M Area Director position to
-nomcom@ietf.org. The deadline for these nominations is noon (Pacific
-Time) on December 1.
-
-I am extending the deadline for nominations for the other positions to
-noon (Pacific Time) on November 17.
-
-Any member of the IETF community may nominate any member of the IETF
-community for any open position. Self-nominations are permitted.
-
-Please also send the NomCom your feedback on the past performance of the
-incumbents, or feedback on potential nominees.
-
-All input to the nomcom will be kept strictly confidential.
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="reminder - nominations to replace Randy Bush", time=datetime(2003,11,26),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-At IETF Randy Bush resigned from his position as Operations & Management
-Area Director for the IETF. This creates a mid-term vacancy that the
-IETF NomCom needs to fill. Randy's replacement will have a one-year
-term.
-
-Please submit nominations for Randy's O&M Area Director position to
-nomcom@ietf.org. The deadline for these nominations is noon (Pacific
-Time) on December 1.
-
-Any member of the IETF community may nominate any member of the IETF
-community for any open position. Self-nominations are permitted.
-
-Please also send the NomCom your feedback on the past performance of the
-incumbents, feedback on potential nominees, or your thoughts on what the
-NomCom should keep in mind when considering candidates.
-
-All input to the nomcom will be kept strictly confidential.
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="Randy Bush replacement schedule", time=datetime(2003,12,1),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-For mid-term vacancies, RFC 2727 says "the selection and confirmation
-process is expected to be completed within 1 month." However, there are
-several factors that make a one-month schedule impractical in this
-situation.
-
-1. Some nominees for Randy's O&M AD position are also under
-consideration for other positions.
-2. The two O&M ADs need to have complementary skills.
-3. Candidates with operational experience & relationships are rare.
-4. The Thanksgiving and Christmas holiday seasons.
-
-To have the best chance of producing a high-quality result, the NomCom
-(after consulting with ISOC and the IAB as confirming body) has arrived
-at the following schedule for filling Randy Bush's O&M AD position:
-
-1. Nominations due to NomCom by Dec 1, 2003.
-2. NomCom produces confidential short-list by Dec 10.
-3. NomCom makes decision by Dec 22.
-4. NomCom notifies IAB on Jan 5, 2004.
-5. IAB confirms (or rejects) by Jan 19.
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="Randy Bush replacement", time=datetime(2004,1,14),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-I am pleased to announce that the IAB has confirmed the NomCom's
-selection of David Kessens for a one-year term as O&M Area Director,
-filling the mid-term vacancy left by Randy Bush's resignation.
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="NomCom results", time=datetime(2004,2,13),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-I am pleased to announce the results of the 2003-2004 NomCom selection
-process. The IAB has approved the IESG candidates and the ISOC board has
-approved the IAB candidates. Please welcome them in their roles:
-
-The IESG selections are:
-Scott Hollenbeck, Applications
-Bert Wijnen, Operations and Management
-Alex Zinin, Routing
-Steve Bellovin, Security
-Allison Mankin, Transport
- 
-The IAB selections are:
-Leslie Daigle
-Patrik Faltstrom
-Bob Hinden
-Eric Rescorla
-Pete Resnick
-Jonathan Rosenberg
-
-Many people deserve to be thanked.  First thanks are due to all of those
-who volunteered to serve on the NomCom, and especially to those who were
-randomly selected and served as voting members of the NomCom. They
-contributed considerable time from their busy schedules to participate
-in weekly calls, to conduct interviews, to read questionnaires, and to
-make the selection of candidates.
- 
-Thanks to those in the community who volunteered to serve on the IESG
-and the IAB, both to those who were selected and those not chosen this
-time around. Thanks very much for completing the questionnaires and
-participating in interviews.
- 
-Thanks are also due to the IETF as a whole for providing input to the
-process through nominations, recommendations, and feedback on potential
-candidates.
- 
-The voting members of the nomcom are:
-Kireeti Kompella
-Abdul-jabbar Asiri
-Jin Seek Choi
-Richard Shockey
-Ralph Droms
-David Martin
-Dan Forsberg
-Ole Jacobsen
-Basavaraj Patil
-Andrew Thiessen
-
-The nonvoting members are:
-Richard Draves, chair
-Phil Roberts, past chair
-Bill Fenner, IESG liaison
-Geoff Huston, IAB liaison
-Brian Carpenter, ISOC liaison
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="call for Security AD nominations", time=datetime(2004,9,28),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-Steve Bellovin has resigned from his position as Security Area Director,
-effective the end of the November IETF meeting. The IESG has asked the
-2003-2004 NomCom to fill the mid-term vacancy. Steve's replacement will
-serve the remainder of Steve's two-year term.
-
-Please submit nominations for Steve's Security AD position to
-nomcom03@ietf.org. The deadline for these nominations is noon (Pacific
-Time) on October 11, 2004. Please include the nominee's email address or
-other contact information. Feel free to comment on the nominee's
-qualifications and the needs of the Security Area.
-
-Any member of the IETF community may nominate any member of the IETF
-community. Self-nominations are permitted.
-
-Even if you do not wish to make a nomination, please send the NomCom any
-input on the Security Area and/or potential nominees.
-
-All input to the NomCom will be kept strictly confidential.
-
-Thanks,
-Rich
-""")
-
-        n.message_set.create(by=p, subject="Steve Bellovin replacement", time=datetime(2004,11,7),
-                frm="Richard Draves <richdr@microsoft.com>", to="IETF Announcement list <ietf-announce@ietf.org>", body="""
-I am pleased to announce that the IAB has confirmed the NomCom's
-selection of Sam Hartman for a one-year term as Security Area Director,
-filling the mid-term vacancy left by Steve Bellovin's resignation.
-
-I would like to thank everyone who volunteered their time and energy
-for this process, including all the candidates, the members of the
-community
-who provided feedback, and the members of the nomcom.
-
-Thanks,
-Rich
-""")
-
-        return
-        
-
-def reverse(apps, schema_editor):
-        n = Group.objects.filter(acronym="nomcom2002")[0]
-
-        announcements = Message.objects.filter(related_groups=n)
-        announcements.delete()
-
-        n = Group.objects.filter(acronym="nomcom2003")[0]
-        announcements = Message.objects.filter(related_groups=n)
-        announcements.delete()
-
-        return
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0011_auto_20190225_1302'),
-    ]
-
-    operations = [
-                migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py b/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py
deleted file mode 100644
index dd1eba6699..0000000000
--- a/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-02-25 13:02
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0012_add_old_nomcom_announcements'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='GroupMilestoneDocs',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id')),
-                ('groupmilestone', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.GroupMilestone')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='GroupMilestoneHistoryDocs',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id')),
-                ('groupmilestonehistory', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.GroupMilestoneHistory')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='charter2',
-            field=ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='chartered_group', to='doc.Document', to_field='id'),
-        ),
-        migrations.AlterField(
-            model_name='group',
-            name='charter',
-            field=ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='old_group', to='doc.Document', to_field='name'),
-        ),
-        migrations.AddField(
-            model_name='groupmilestone',
-            name='docs2',
-            field=models.ManyToManyField(blank=True, related_name='groupmilestones', through='group.GroupMilestoneDocs', to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='groupmilestonehistory',
-            name='docs2',
-            field=models.ManyToManyField(blank=True, related_name='groupmilestoneshistory', through='group.GroupMilestoneHistoryDocs', to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/group/migrations/0014_set_document_m2m_keys.py b/ietf/group/migrations/0014_set_document_m2m_keys.py
deleted file mode 100644
index f886a9006c..0000000000
--- a/ietf/group/migrations/0014_set_document_m2m_keys.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-10 06:48
-
-
-import sys
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-
-    Document                    = apps.get_model('doc','Document')
-    GroupMilestone              = apps.get_model('group', 'GroupMilestone')
-    GroupMilestoneDocs          = apps.get_model('group', 'GroupMilestoneDocs')
-    GroupMilestoneHistory       = apps.get_model('group', 'GroupMilestoneHistory')
-    GroupMilestoneHistoryDocs   = apps.get_model('group', 'GroupMilestoneHistoryDocs')
-
-    # Document id fixup ------------------------------------------------------------
-
-    objs = Document.objects.in_bulk()
-    nameid = { o.name: o.id for id, o in objs.items() }
-
-    sys.stderr.write('\n')
-
-    sys.stderr.write(' %s.%s:\n' % (GroupMilestone.__name__, 'docs'))
-    count = 0
-    for m in tqdm(GroupMilestone.objects.all()):
-        for d in m.docs.all():
-            count += 1
-            GroupMilestoneDocs.objects.get_or_create(groupmilestone=m, document_id=nameid[d.name])
-    sys.stderr.write(' %s GroupMilestoneDocs objects created\n' % (count, ))
-
-    sys.stderr.write(' %s.%s:\n' % (GroupMilestoneHistory.__name__, 'docs'))
-    count = 0
-    for m in tqdm(GroupMilestoneHistory.objects.all()):
-        for d in m.docs.all():
-            count += 1
-            GroupMilestoneHistoryDocs.objects.get_or_create(GroupMilestoneHistory=m, document_id=nameid[d.name])
-    sys.stderr.write(' %s GroupMilestoneHistoryDocs objects created\n' % (count, ))
-
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0013_add_groupmilestone_docs2_m2m'),
-        ('doc', '0014_set_document_docalias_id'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0015_1_del_docs_m2m_table.py b/ietf/group/migrations/0015_1_del_docs_m2m_table.py
deleted file mode 100644
index 717eccaa7c..0000000000
--- a/ietf/group/migrations/0015_1_del_docs_m2m_table.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-22 08:00
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0014_set_document_m2m_keys'),
-    ]
-
-    # The implementation of AlterField in Django 1.11 applies
-    #   'ALTER TABLE <table> MODIFY <field> ...;' in order to fix foregn keys
-    #   to the altered field, but as it seems does _not_ fix up m2m
-    #   intermediary tables in an equivalent manner, so here we remove and
-    #   then recreate the m2m tables so they will have the appropriate field
-    #   types.
-
-    operations = [
-        migrations.RemoveField(
-            model_name='groupmilestone',
-            name='docs',
-        ),
-        migrations.RemoveField(
-            model_name='groupmilestonehistory',
-            name='docs',
-        ),
-        migrations.AddField(
-            model_name='groupmilestone',
-            name='docs',
-            field=models.ManyToManyField(to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='groupmilestonehistory',
-            name='docs',
-            field=models.ManyToManyField(to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/group/migrations/0015_2_add_docs_m2m_table.py b/ietf/group/migrations/0015_2_add_docs_m2m_table.py
deleted file mode 100644
index e7c0e3bfbf..0000000000
--- a/ietf/group/migrations/0015_2_add_docs_m2m_table.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-22 08:00
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0015_1_del_docs_m2m_table'),
-    ]
-
-    # The implementation of AlterField in Django 1.11 applies
-    #   'ALTER TABLE <table> MODIFY <field> ...;' in order to fix foregn keys
-    #   to the altered field, but as it seems does _not_ fix up m2m
-    #   intermediary tables in an equivalent manner, so here we remove and
-    #   then recreate the m2m tables so they will have the appropriate field
-    #   types.
-
-    operations = [
-        migrations.RemoveField(
-            model_name='groupmilestone',
-            name='docs',
-        ),
-        migrations.RemoveField(
-            model_name='groupmilestonehistory',
-            name='docs',
-        ),
-        migrations.AddField(
-            model_name='groupmilestone',
-            name='docs',
-            field=models.ManyToManyField(blank=True, to='doc.Document'),
-        ),
-        migrations.AddField(
-            model_name='groupmilestonehistory',
-            name='docs',
-            field=models.ManyToManyField(blank=True, to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/group/migrations/0016_copy_docs_m2m_table.py b/ietf/group/migrations/0016_copy_docs_m2m_table.py
deleted file mode 100644
index 2871c34a95..0000000000
--- a/ietf/group/migrations/0016_copy_docs_m2m_table.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-27 05:57
-
-
-import sys, time
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-
-    GroupMilestone              = apps.get_model('group', 'GroupMilestone')
-    GroupMilestoneDocs          = apps.get_model('group', 'GroupMilestoneDocs')
-    GroupMilestoneHistory       = apps.get_model('group', 'GroupMilestoneHistory')
-    GroupMilestoneHistoryDocs   = apps.get_model('group', 'GroupMilestoneHistoryDocs')
-
-    # Document id fixup ------------------------------------------------------------
-
-    sys.stderr.write('\n')
-
-    sys.stderr.write(' %s.%s:\n' % (GroupMilestone.__name__, 'docs'))
-    for m in tqdm(GroupMilestone.objects.all()):
-        m.docs.set([ d.document for d in GroupMilestoneDocs.objects.filter(groupmilestone=m) ])
-
-    sys.stderr.write(' %s.%s:\n' % (GroupMilestoneHistory.__name__, 'docs'))
-    for m in tqdm(GroupMilestoneHistory.objects.all()):
-        m.docs.set([ d.document for d in GroupMilestoneHistoryDocs.objects.filter(groupmilestonehistory=m) ])
-
-
-def reverse(apps, schema_editor):
-    pass
-
-def timestamp(apps, schema_editor):
-    sys.stderr.write('\n %s' % time.strftime('%Y-%m-%d %H:%M:%S'))
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0015_2_add_docs_m2m_table'),
-    ]
-
-    operations = [
-        #migrations.RunPython(forward, reverse),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO group_groupmilestone_docs SELECT * FROM group_groupmilestonedocs;",
-            ""
-        ),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO group_groupmilestonehistory_docs SELECT * FROM group_groupmilestonehistorydocs;",
-            ""
-        ),
-        migrations.RunPython(timestamp, timestamp),
-    ]
diff --git a/ietf/group/migrations/0017_remove_docs2_m2m.py b/ietf/group/migrations/0017_remove_docs2_m2m.py
deleted file mode 100644
index 00a44303db..0000000000
--- a/ietf/group/migrations/0017_remove_docs2_m2m.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-30 03:23
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0016_copy_docs_m2m_table'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='groupmilestonedocs',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='groupmilestonedocs',
-            name='groupmilestone',
-        ),
-        migrations.RemoveField(
-            model_name='groupmilestonehistorydocs',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='groupmilestonehistorydocs',
-            name='groupmilestonehistory',
-        ),
-        migrations.RemoveField(
-            model_name='groupmilestone',
-            name='docs2',
-        ),
-        migrations.RemoveField(
-            model_name='groupmilestonehistory',
-            name='docs2',
-        ),
-        migrations.DeleteModel(
-            name='GroupMilestoneDocs',
-        ),
-        migrations.DeleteModel(
-            name='GroupMilestoneHistoryDocs',
-        ),
-    ]
diff --git a/ietf/group/migrations/0018_remove_old_document_field.py b/ietf/group/migrations/0018_remove_old_document_field.py
deleted file mode 100644
index 5a47e545c5..0000000000
--- a/ietf/group/migrations/0018_remove_old_document_field.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-25 06:51
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0017_remove_docs2_m2m'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='group',
-            name='charter',
-        ),
-    ]
diff --git a/ietf/group/migrations/0019_rename_field_document2.py b/ietf/group/migrations/0019_rename_field_document2.py
deleted file mode 100644
index 438c669d26..0000000000
--- a/ietf/group/migrations/0019_rename_field_document2.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-25 06:52
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0019_rename_field_document2'),
-        ('group', '0018_remove_old_document_field'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='group',
-            old_name='charter2',
-            new_name='charter',
-        ),
-    ]
diff --git a/ietf/group/migrations/0020_add_uses_milestone_dates.py b/ietf/group/migrations/0020_add_uses_milestone_dates.py
deleted file mode 100644
index a14b49fbec..0000000000
--- a/ietf/group/migrations/0020_add_uses_milestone_dates.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-30 11:41
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0019_rename_field_document2'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='group',
-            name='uses_milestone_dates',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='grouphistory',
-            name='uses_milestone_dates',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/ietf/group/migrations/0021_add_order_to_milestones.py b/ietf/group/migrations/0021_add_order_to_milestones.py
deleted file mode 100644
index 22f40af6c3..0000000000
--- a/ietf/group/migrations/0021_add_order_to_milestones.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-30 13:37
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0020_add_uses_milestone_dates'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='groupmilestone',
-            options={'ordering': ['order', 'due', 'id']},
-        ),
-        migrations.AlterModelOptions(
-            name='groupmilestonehistory',
-            options={'ordering': ['order', 'due', 'id']},
-        ),
-        migrations.AddField(
-            model_name='groupmilestone',
-            name='order',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='groupmilestonehistory',
-            name='order',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='groupmilestone',
-            name='due',
-            field=models.DateField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='groupmilestonehistory',
-            name='due',
-            field=models.DateField(blank=True, null=True),
-        ),
-    ]
diff --git a/ietf/group/migrations/0022_populate_uses_milestone_dates.py b/ietf/group/migrations/0022_populate_uses_milestone_dates.py
deleted file mode 100644
index a7b7d3eaa7..0000000000
--- a/ietf/group/migrations/0022_populate_uses_milestone_dates.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-30 11:42
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    Group = apps.get_model('group','Group')
-    GroupHistory = apps.get_model('group','GroupHistory')
-
-    Group.objects.filter(type__features__has_milestones=True).update(uses_milestone_dates=True)
-    GroupHistory.objects.filter(type__features__has_milestones=True).update(uses_milestone_dates=True)
-
-def reverse(apps, schema_editor):
-    Group = apps.get_model('group','Group')
-    GroupHistory = apps.get_model('group','GroupHistory')
-
-    Group.objects.filter(type__features__has_milestones=True).update(uses_milestone_dates=False)
-    GroupHistory.objects.filter(type__features__has_milestones=True).update(uses_milestone_dates=False)
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0021_add_order_to_milestones'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/group/migrations/0023_use_milestone_dates_default_to_true.py b/ietf/group/migrations/0023_use_milestone_dates_default_to_true.py
deleted file mode 100644
index 440fce54a5..0000000000
--- a/ietf/group/migrations/0023_use_milestone_dates_default_to_true.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright The IETF Trust 2020, All Rights Reserved
-# Generated by Django 1.11.28 on 2020-02-11 07:47
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0022_populate_uses_milestone_dates'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='group',
-            name='uses_milestone_dates',
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AlterField(
-            model_name='grouphistory',
-            name='uses_milestone_dates',
-            field=models.BooleanField(default=True),
-        ),
-    ]
diff --git a/ietf/group/migrations/0024_add_groupman_authroles.py b/ietf/group/migrations/0024_add_groupman_authroles.py
deleted file mode 100644
index 5c64618054..0000000000
--- a/ietf/group/migrations/0024_add_groupman_authroles.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-05-04 13:10
-from __future__ import unicode_literals
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0023_use_milestone_dates_default_to_true'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='groupman_authroles',
-            field=jsonfield.fields.JSONField(default=['Secretariat'], max_length=128),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='groupman_authroles',
-            field=jsonfield.fields.JSONField(default=['Secretariat'], max_length=128),
-        ),
-    ]
diff --git a/ietf/group/migrations/0025_populate_groupman_authroles.py b/ietf/group/migrations/0025_populate_groupman_authroles.py
deleted file mode 100644
index d024c8bd2d..0000000000
--- a/ietf/group/migrations/0025_populate_groupman_authroles.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-05-01 12:54
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-authroles_map = {
-    'adhoc': ['Secretariat'],
-    'admin': ['Secretariat'],
-    'ag': ['Secretariat', 'Area Director'],
-    'area': ['Secretariat'],
-    'dir': ['Secretariat'],
-    'iab': ['Secretariat'],
-    'iana': ['Secretariat'],
-    'iesg': ['Secretariat'],
-    'ietf': ['Secretariat'],
-    'individ': [],
-    'irtf': ['Secretariat'],
-    'ise': ['Secretariat'],
-    'isoc': ['Secretariat'],
-    'nomcom': ['Secretariat'],
-    'program': ['Secretariat', 'IAB'],
-    'review': ['Secretariat'],
-    'rfcedtyp': ['Secretariat'],
-    'rg': ['Secretariat', 'IRTF Chair'],
-    'sdo': ['Secretariat'],
-    'team': ['Secretariat'],
-    'wg': ['Secretariat', 'Area Director'],
-}
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    for type_id, authroles in authroles_map.items():
-        GroupFeatures.objects.filter(type_id=type_id).update(groupman_authroles=authroles)
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0024_add_groupman_authroles'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0026_programs_meet.py b/ietf/group/migrations/0026_programs_meet.py
deleted file mode 100644
index 4fb6fda06b..0000000000
--- a/ietf/group/migrations/0026_programs_meet.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-05-01 12:54
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    program = GroupFeatures.objects.get(type_id='program')
-    program.has_meetings = True
-    program.matman_roles = ['lead', 'chair', 'secr']
-    program.docman_roles = ['lead', 'chair', 'secr']
-    program.groupman_roles = ['lead', 'chair', 'secr']
-    program.role_order = ['lead', 'chair', 'secr']
-    program.save()
-
-def reverse(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    program = GroupFeatures.objects.get(type_id='program')
-    program.has_meetings = False
-    program.matman_roles = ['lead', 'secr']
-    program.docman_roles = ['lead', 'secr']
-    program.groupman_roles = ['lead', 'secr']
-    program.role_order = ['lead', 'secr']
-    program.save()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0025_populate_groupman_authroles'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0027_programs_have_parents.py b/ietf/group/migrations/0027_programs_have_parents.py
deleted file mode 100644
index d05d020092..0000000000
--- a/ietf/group/migrations/0027_programs_have_parents.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-05-08 09:02
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    Group = apps.get_model('group','Group')
-    iab = Group.objects.get(acronym='iab')
-    Group.objects.filter(type_id='program').update(parent=iab)
-
-def reverse(apps, schema_editor):
-    pass # No point in removing the parents
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0026_programs_meet'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0028_add_robots.py b/ietf/group/migrations/0028_add_robots.py
deleted file mode 100644
index ab4c8749bc..0000000000
--- a/ietf/group/migrations/0028_add_robots.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-05-01 12:54
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.utils.text import slugify
-
-robots = [
-    ('Mail Archive', '/api/v2/person/person', 'secretariat', 'mailarchive@ietf.org'),
-    ('Registration System', '/api/notify/meeting/registration', 'secretariat', 'registration@ietf.org'),
-]
-
-def forward(apps, schema_editor):
-    RoleName = apps.get_model('name', 'RoleName')
-    Role = apps.get_model('group', 'Role')
-    Group =  apps.get_model('group', 'Group')
-    User = apps.get_model('auth', 'User')
-    Person = apps.get_model('person', 'Person')
-    Email = apps.get_model('person', 'Email')
-    PersonalApiKey = apps.get_model('person', 'PersonalApiKey')
-    #
-    rname, __ = RoleName.objects.get_or_create(slug='robot')
-    # 
-    for (name, endpoint, acronym, address) in robots:
-        first_name, last_name = name.rsplit(None, 1)
-        user, created  = User.objects.get_or_create(username=slugify(name))
-        if created:
-            user.first_name=first_name
-            user.last_name=last_name
-            user.is_staff=True
-            user.is_active=True
-            user.save()
-        #
-        person, created = Person.objects.get_or_create(name=name)
-        if created:
-            person.user = user
-            person.ascii = name
-            person.consent = True
-            person.save()
-        else:
-            assert person.user == user
-        #
-        email, created = Email.objects.get_or_create(address=address)
-        if created:
-            email.origin = 'registration'
-            email.person = person
-            email.active = True
-            email.save()
-        else:
-            assert email.person == person
-        #
-        group = Group.objects.get(acronym=acronym)
-        role, created = Role.objects.get_or_create(person=person, name=rname, group=group, email=email)
-        #
-        key, created = PersonalApiKey.objects.get_or_create(person=person, endpoint=endpoint, valid=True)
-
-def reverse(apps, schema_editor):
-    Person = apps.get_model('person', 'Person')
-    for (name, endpoint, acronym, address) in robots:
-        deleted = Person.objects.filter(name=name).delete()
-        print('deleted: %s' % deleted)
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0027_programs_have_parents'),
-        ('name', '0012_role_name_robots'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0029_add_used_roles_and_default_used_roles.py b/ietf/group/migrations/0029_add_used_roles_and_default_used_roles.py
deleted file mode 100644
index 6f4a562c61..0000000000
--- a/ietf/group/migrations/0029_add_used_roles_and_default_used_roles.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 2.0.13 on 2020-05-22 12:00
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0028_add_robots'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='group',
-            name='used_roles',
-            field=jsonfield.fields.JSONField(default=[], help_text="Leave an empty list to get the group_type's default used roles", max_length=128),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='default_used_roles',
-            field=jsonfield.fields.JSONField(default=[], max_length=128),
-        ),
-        migrations.AddField(
-            model_name='grouphistory',
-            name='used_roles',
-            field=jsonfield.fields.JSONField(default=[], help_text="Leave an empty list to get the group_type's default used roles", max_length=128),
-        ),
-        migrations.AddField(
-            model_name='historicalgroupfeatures',
-            name='default_used_roles',
-            field=jsonfield.fields.JSONField(default=[], max_length=128),
-        ),
-    ]
diff --git a/ietf/group/migrations/0030_populate_default_used_roles.py b/ietf/group/migrations/0030_populate_default_used_roles.py
deleted file mode 100644
index e6ba3a0fc1..0000000000
--- a/ietf/group/migrations/0030_populate_default_used_roles.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Generated by Django 2.0.13 on 2020-05-22 11:41
-
-from django.db import migrations
-
-grouptype_defaults = {
-    'adhoc': ['matman', 'ad', 'chair', 'lead'],
-    'admin': ['member', 'chair'],
-    'ag': ['ad', 'chair', 'secr'],
-    'area': ['ad'],
-    'dir': ['ad', 'chair', 'reviewer', 'secr'],
-    'review': ['ad', 'chair', 'reviewer', 'secr'],
-    'iab': ['chair'],
-    'iana': ['auth'],
-    'iesg': [],
-    'ietf': ['ad', 'member', 'comdir', 'delegate', 'execdir', 'recman', 'secr', 'trac-editor', 'trac-admin', 'chair'],
-    'individ': ['ad'],
-    'irtf': ['member', 'atlarge', 'chair'],
-    'ise': ['chair'],
-    'isoc': ['chair', 'ceo'],
-    'nomcom': ['member', 'advisor', 'liaison', 'chair', 'techadv'],
-    'program': ['member', 'chair', 'lead'],
-    'rfcedtyp': ['auth', 'chair'],
-    'rg': ['chair', 'techadv', 'secr', 'delegate'],
-    'sdo': ['liaiman', 'ceo', 'coord', 'auth', 'chair'],
-    'team': ['ad', 'member', 'delegate', 'secr', 'liaison', 'atlarge', 'chair', 'matman', 'techadv'],
-    'wg': ['ad', 'editor', 'delegate', 'secr', 'chair', 'matman', 'techadv'],
-}
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group','GroupFeatures')
-    for type_id, roles in grouptype_defaults.items():
-        GroupFeatures.objects.filter(type_id=type_id).update(default_used_roles=roles)
-
-def reverse(apps, schema_editor):
-    pass # intentional
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0029_add_used_roles_and_default_used_roles'),
-        ('stats', '0003_meetingregistration_attended'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0031_allow_blank_used_roles.py b/ietf/group/migrations/0031_allow_blank_used_roles.py
deleted file mode 100644
index 331727f6f3..0000000000
--- a/ietf/group/migrations/0031_allow_blank_used_roles.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 2.0.13 on 2020-06-15 11:10
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0030_populate_default_used_roles'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='group',
-            name='used_roles',
-            field=jsonfield.fields.JSONField(blank=True, default=[], help_text="Leave an empty list to get the group_type's default used roles", max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='grouphistory',
-            name='used_roles',
-            field=jsonfield.fields.JSONField(blank=True, default=[], help_text="Leave an empty list to get the group_type's default used roles", max_length=128),
-        ),
-    ]
diff --git a/ietf/group/migrations/0032_add_meeting_seen_as_area.py b/ietf/group/migrations/0032_add_meeting_seen_as_area.py
deleted file mode 100644
index 9be9ebe0fb..0000000000
--- a/ietf/group/migrations/0032_add_meeting_seen_as_area.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright The IETF Trust 2020', 'All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-02-12 07:11
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-def forward(apps, schema_editor):
-    Group = apps.get_model('group', 'Group')
-    initial_area_groups = ['dispatch', 'gendispatch', 'intarea', 'opsarea', 'opsawg', 'rtgarea', 'rtgwg', 'saag', 'secdispatch', 'tsvarea', 'irtfopen']
-    Group.objects.filter(acronym__in=initial_area_groups).update(meeting_seen_as_area=True)
-    
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0031_allow_blank_used_roles'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='group',
-            name='meeting_seen_as_area',
-            field=models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG'),
-        ),
-        migrations.AddField(
-            model_name='grouphistory',
-            name='meeting_seen_as_area',
-            field=models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG'),
-        ),
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0033_extres.py b/ietf/group/migrations/0033_extres.py
deleted file mode 100644
index 2e3d037a2a..0000000000
--- a/ietf/group/migrations/0033_extres.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-04-15 10:20
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0014_extres'),
-        ('group', '0032_add_meeting_seen_as_area'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='GroupExtResource',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('display_name', models.CharField(blank=True, default='', max_length=255)),
-                ('value', models.CharField(max_length=2083)),
-                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
-                ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceName')),
-            ],
-        ),
-    ]
diff --git a/ietf/group/migrations/0034_populate_groupextresources.py b/ietf/group/migrations/0034_populate_groupextresources.py
deleted file mode 100644
index a8c0e1b989..0000000000
--- a/ietf/group/migrations/0034_populate_groupextresources.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-03-19 13:06
-from __future__ import unicode_literals
-
-import re
-
-import debug # pyflakes:ignore
-
-from collections import OrderedDict, Counter
-from io import StringIO
-
-from django.db import migrations
-from django.core.exceptions import ValidationError
-
-
-from ietf.utils.validators import validate_external_resource_value
-
-name_map = {
-    "Issue.*":                "tracker",
-    ".*FAQ.*":                "faq",
-    ".*Area Web Page":        "webpage",
-    ".*Wiki":                 "wiki",
-    "Home Page":              "webpage",
-    "Slack.*":                "slack",
-    "Additional .* Web Page": "webpage",
-    "Additional .* Page":     "webpage",
-    "Yang catalog entry.*":   "yc_entry",
-    "Yang impact analysis.*": "yc_impact",
-    "GitHub":                 "github_repo",
-    "Github page":            "github_repo",
-    "GitHub repo.*":          "github_repo",
-    "Github repository.*":    "github_repo",
-    "GitHub org.*":           "github_org",
-    "GitHub User.*":          "github_username",
-    "GitLab User":            "gitlab_username",
-    "GitLab User Name":       "gitlab_username",
-}
-
-url_map = OrderedDict({
-   "https?://github\\.com": "github_repo",
-   "https?://trac\\.ietf\\.org/.*/wiki": "wiki",
-   "ietf\\.org.*/trac/wiki": "wiki",
-   "trac.*wiki": "wiki",
-   "www\\.ietf\\.org/mailman" : "mailing_list",
-   "www\\.ietf\\.org/mail-archive" : "mailing_list_archive",
-   "ietf\\.org/logs": "jabber_log",
-   "ietf\\.org/jabber/logs": "jabber_log",
-   "xmpp:.*?join": "jabber_room",
-   "https?://.*": "webpage"
-})
-
-def forward(apps, schema_editor):
-    GroupExtResource = apps.get_model('group', 'GroupExtResource')
-    ExtResourceName = apps.get_model('name', 'ExtResourceName')
-    GroupUrl = apps.get_model('group', 'GroupUrl')
-
-    stats = Counter()
-    stats_file = StringIO()
-
-    for group_url in GroupUrl.objects.all():
-        group_url.url = group_url.url.strip()
-        match_found = False
-        for regext,slug in name_map.items():
-            if re.fullmatch(regext, group_url.name):
-                match_found = True
-                stats['mapped'] += 1
-                name = ExtResourceName.objects.get(slug=slug)
-                try:
-                    validate_external_resource_value(name, group_url.url)
-                    GroupExtResource.objects.create(group=group_url.group, name_id=slug, value=group_url.url, display_name=group_url.name)
-                except ValidationError as e: # pyflakes:ignore
-                    print("Failed validation:", group_url.url, e, file=stats_file)
-                    stats['failed_validation'] +=1
-                break
-        if not match_found:
-            for regext, slug in url_map.items():
-                if re.search(regext, group_url.url):
-                    match_found = True
-                    if slug:
-                        stats['mapped'] +=1
-                        name = ExtResourceName.objects.get(slug=slug)
-                        # Munge the URL if it's the first github repo match
-                        #  Remove "/tree/master" substring if it exists
-                        #  Remove trailing "/issues" substring if it exists
-                        #  Remove "/blob/master/.*" pattern if present
-                        if regext == "https?://github\\.com":
-                            group_url.url = group_url.url.replace("/tree/master","")
-                            group_url.url = re.sub('/issues$', '', group_url.url)
-                            group_url.url = re.sub('/blob/master.*$', '', group_url.url)
-                        try:
-                            validate_external_resource_value(name, group_url.url)
-                            GroupExtResource.objects.create(group=group_url.group, name=name, value=group_url.url, display_name=group_url.name)
-                        except ValidationError as e: # pyflakes:ignore
-                            print("Failed validation:", group_url.url, e, file=stats_file)
-                            stats['failed_validation'] +=1
-                    else:
-                        stats['ignored'] +=1
-                    break
-        if not match_found:
-            print("Not Mapped:",group_url.group.acronym, group_url.name, group_url.url, file=stats_file)
-            stats['not_mapped'] += 1
-    print('')
-    print(stats_file.getvalue())
-    print(stats)
-
-def reverse(apps, schema_editor):
-    GroupExtResource = apps.get_model('group', 'GroupExtResource')
-    GroupExtResource.objects.all().delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0033_extres'),
-        ('name', '0015_populate_extres'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/group/migrations/0035_add_research_area_groups.py b/ietf/group/migrations/0035_add_research_area_groups.py
deleted file mode 100644
index 212ef30f7d..0000000000
--- a/ietf/group/migrations/0035_add_research_area_groups.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Generated by Django 2.2.14 on 2020-07-28 09:30
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group','GroupFeatures')
-    GroupFeatures.objects.create(
-        about_page = 'ietf.group.views.group_about',
-        acts_like_wg = True,
-        admin_roles = ['chair'],
-        agenda_type_id = 'ietf',
-        create_wiki = True,
-        custom_group_roles = True,
-        customize_workflow = False,
-        default_tab = 'ietf.group.views.group_about',
-        default_used_roles = ['chair', 'secr'],
-        docman_roles = ['chair', 'delegate', 'secr'],
-        groupman_authroles = ['Secretariat', 'IRTF Chair'],
-        groupman_roles = ['chair', 'delegate'],
-        has_chartering_process = False,
-        has_default_jabber = False,
-        has_documents = True,
-        has_meetings = True,
-        has_milestones = False,
-        has_nonsession_materials = False,
-        has_reviews = False,
-        has_session_materials = True,
-        is_schedulable = True,
-        material_types = ['slides'],
-        matman_roles = ['chair', 'delegate', 'secr'],
-        req_subm_approval = True,
-        role_order = ['chair', 'secr'],
-        show_on_agenda = True,
-        type_id = 'rag',
-    )
-
-    Group = apps.get_model('group','Group')
-    Group.objects.filter(type_id='ag',parent__acronym='irtf').update(type_id='rag')
-
-def reverse(apps, schema_editor):
-    Group = apps.get_model('group','Group')
-    Group.objects.filter(type_id='rag',parent__acronym='irtf').update(type_id='ag')
-
-    GroupFeatures = apps.get_model('group','GroupFeatures')
-    GroupFeatures.objects.filter(type_id='rag').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0034_populate_groupextresources'),
-        ('name', '0016_add_research_area_groups'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/group/migrations/0036_orgs_vs_repos.py b/ietf/group/migrations/0036_orgs_vs_repos.py
deleted file mode 100644
index b764b86f44..0000000000
--- a/ietf/group/migrations/0036_orgs_vs_repos.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-
-from urllib.parse import urlparse
-from django.db import migrations
-
-def categorize(url):
-    # This will categorize a few urls pointing into files in a repo as a repo, but that's better than calling them an org
-    element_count = len(urlparse(url).path.strip('/').split('/'))
-    if element_count < 1:
-        print("Bad github resource:",url)
-    return 'github_org' if element_count == 1 else 'github_repo' 
-
-def forward(apps, schema_editor):
-    GroupExtResource = apps.get_model('group','GroupExtResource')
-
-    for resource in GroupExtResource.objects.filter(name_id__in=('github_org','github_repo',)):
-        category = categorize(resource.value)
-        if resource.name_id != category:
-            resource.name_id = category
-            resource.save()
-
-def reverse(apps, schema_editor):
-    # Intentionally don't try to return to former worse state
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0035_add_research_area_groups'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0037_initial_yc_roles.py b/ietf/group/migrations/0037_initial_yc_roles.py
deleted file mode 100644
index 20eb471d60..0000000000
--- a/ietf/group/migrations/0037_initial_yc_roles.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright The IETF Trust 2020 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    RoleName = apps.get_model('name','RoleName')
-    Group = apps.get_model('group','Group')
-    Role = apps.get_model('group','Role')
-    Person = apps.get_model('person','Person')
-
-    RoleName.objects.create(
-        slug = 'yc_operator',
-        name = 'YangCatalog Operator',
-        desc = 'Can grant user api rights and browse the YangCatalog directory structure',
-    )
-
-    ycsupport = Group.objects.create(
-        acronym='ycsupport',
-        name="YangCatalog Support",
-        state_id='active',
-        type_id='team',
-        parent = Group.objects.get(acronym='ops'),
-        description = "Team for supporting YangCatalog.org operations",
-    )
-
-    RoleName.objects.create(
-        slug = 'yc_admin',
-        name = 'YangCatalog Administrator',
-        desc = 'Can operate the YangCatalog, change its configuration, and edit its data',
-    )
-
-    for name,role_name_id in (
-        ('Robert Sparks','yc_operator'),
-        ('Benoit Claise','yc_operator'),
-        ('Eric Vyncke','yc_operator'),
-        ('Miroslav Kovac','yc_admin'),
-        ('Slavomir Mazur','yc_admin'),
-    ):
-        person = Person.objects.get(name=name)
-        email = person.email_set.filter(primary=True).first()
-        if not email:
-            email = person.email_set.filter(active=True).order_by("-time").first()
-        Role.objects.create(
-            name_id = role_name_id,
-            group = ycsupport,
-            person = person,
-            email = email,
-        )
-
-def reverse(apps, schema_editor):
-    RoleName = apps.get_model('name','RoleName')
-    Group = apps.get_model('group','Group')
-    Role = apps.get_model('group','Role')
-
-    Role.objects.filter(name_id__in = ( 'yc_operator' , 'yc_admin' )).delete()
-    Group.objects.filter(acronym='ycsupport').delete()
-    RoleName.objects.filter(slug__in=( 'yc_operator' , 'yc_admin' )).delete() 
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0036_orgs_vs_repos'),
-        ('name', '0020_add_rescheduled_session_name'),
-        ('person','0016_auto_20200807_0750'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0038_auto_20201109_0439.py b/ietf/group/migrations/0038_auto_20201109_0439.py
deleted file mode 100644
index 26bfd03eda..0000000000
--- a/ietf/group/migrations/0038_auto_20201109_0439.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0037_initial_yc_roles'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='groupevent',
-            index=models.Index(fields=['-time', '-id'], name='group_group_time_ee7c7c_idx'),
-        ),
-    ]
diff --git a/ietf/group/migrations/0039_remove_historicalgroupfeatures.py b/ietf/group/migrations/0039_remove_historicalgroupfeatures.py
deleted file mode 100644
index 669cde8750..0000000000
--- a/ietf/group/migrations/0039_remove_historicalgroupfeatures.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Generated by Django 2.2.17 on 2020-12-18 08:54
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0038_auto_20201109_0439'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='HistoricalGroupFeatures',
-        ),
-    ]
-
-# In case these are ever needed again, here's what had been captured.
-# Note that many of the values are not well formed as JSONFields and need to be manually corrected if they are brought back.
-# 
-# -- Table structure for table `group_historicalgroupfeatures`
-# DROP TABLE IF EXISTS `group_historicalgroupfeatures`;
-# CREATE TABLE `group_historicalgroupfeatures` (
-#   KEY `group_historicalgroupfeatures_agenda_type_id_089e752b` (`agenda_type_id`),
-#   KEY `group_historicalgroupfeatures_history_user_id_0d1368d2` (`history_user_id`),
-#   KEY `group_historicalgroupfeatures_type_id_4ed21f10` (`type_id`)
-# -- Dumping data for table `group_historicalgroupfeatures`
-# LOCK TABLES `group_historicalgroupfeatures` WRITE;
-# /*!40000 ALTER TABLE `group_historicalgroupfeatures` DISABLE KEYS */;
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,1,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','slides','chair,lead',1,NULL,'2018-07-15 08:23:57.183851','~','ietf',433,'ietf',0,0,0,0,0,'chair,secr,member',0,0,'ad,chair,delegate,secr','[\"ad\",\"chair\",\"delegate\",\"secr\"]','[\"ad\",\"chair\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,0,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','slides','ad',2,NULL,'2018-07-19 13:07:33.440449','~','ietf',433,'area',0,0,0,0,0,'chair,secr,member',0,0,'ad,chair,delegate,secr','[\"ad\",\"chair\",\"delegate\",\"secr\"]','[\"ad\",\"chair\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,1,0,1,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\"]',3,NULL,'2019-02-04 07:41:05.566267','~','ietf',433,'ag',1,1,1,1,1,'[\"chair\",\"secr\"]',1,1,'[\"ad\",\"chair\",\"delegate\",\"secr\"]','[\"chair\",\"delegate\",\"secr\"]','[\"ad\",\"chair\",\"delegate\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,1,0,1,0,'ietf.group.views.group_about','ietf.group.views.group_about','\"[\\\"slides\\\"]\"','\"[\\\"chair\\\"]\"',4,NULL,'2019-03-07 14:32:17.595737','~','ietf',433,'adhoc',0,1,0,1,1,'\"[\\\"chair\\\",\\\"delegate\\\",\\\"matman\\\"]\"',1,1,'\"[\\\"chair\\\",\\\"delegate\\\",\\\"matman\\\"]\"','\"[\\\"chair\\\"]\"','\"[\\\"chair\\\",\\\"delegate\\\"]\"','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,1,0,1,0,'ietf.group.views.group_about','ietf.group.views.group_about','\"[\\\"slides\\\"]\"','\"[\\\"chair\\\"]\"',5,NULL,'2019-03-07 15:13:37.631043','~','ietf',433,'adhoc',0,1,0,1,1,'\"[\\\"chair\\\",\\\"lead\\\",\\\"delegate\\\",\\\"matman\\\"]\"',1,1,'\"[\\\"chair\\\",\\\"lead\\\",\\\"delegate\\\",\\\"matman\\\"]\"','\"[\\\"chair\\\"]\"','\"[\\\"chair\\\",\\\"lead\\\",\\\"delegate\\\"]\"','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,1,1,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\"]',6,NULL,'2019-03-13 11:02:32.696034','~','ietf',433,'team',0,1,1,0,0,'[\"chair\",\"member\",\"matman\"]',0,0,'[\"chair\",\"matman\"]','[\"chair\"]','[\"chair\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,1,1,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\"]',7,NULL,'2019-03-13 13:59:38.964013','~','ietf',433,'team',0,1,1,0,0,'[\"chair\",\"member\",\"matman\"]',0,0,'[\"chair\",\"matman\"]','[\"chair\"]','[\"chair\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,1,0,1,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\"]',8,NULL,'2019-03-13 14:02:03.061530','~','ietf',433,'adhoc',0,1,0,1,1,'[\"chair\",\"lead\",\"delegate\",\"matman\"]',1,1,'[\"chair\",\"lead\",\"delegate\",\"matman\"]','[\"chair\"]','[\"chair\",\"lead\",\"delegate\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,0,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','\"[]\"','[\"chair\"]',9,NULL,'2019-03-13 14:04:12.810180','~','ad',433,'iesg',0,0,1,0,0,'[\"chair\",\"delegate\",\"member\"]',0,1,'[\"chair\",\"delegate\",\"member\"]','[\"chair\"]','[\"chair\",\"delegate\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,0,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\",\"lead\"]',10,NULL,'2019-03-13 14:05:47.617726','~','ad',433,'ise',0,0,1,0,0,'[\"chair\",\"delegate\"]',0,1,'[\"chair\",\"delegate\"]','[\"chair\"]','[\"chair\",\"delegate\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (1,1,1,0,1,0,1,1,'ietf.group.views.group_about','ietf.group.views.group_documents','[\"slides\"]','[\"chair\"]',11,NULL,'2019-04-23 04:11:30.770056','~','ietf',433,'rg',1,1,0,1,1,'[\"chair\",\"delegate\",\"secr\"]',1,1,'[\"chair\",\"delegate\",\"secr\"]','[\"chair\",\"delegate\",\"secr\"]','[\"chair\",\"delegate\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (1,0,1,0,0,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"lead\"]',12,NULL,'2019-04-24 04:03:41.967314','~','ad',433,'program',0,0,1,0,0,'[\"lead\",\"secr\"]',0,0,'[\"lead\",\"secr\"]','[\"lead\",\"secr\"]','[\"lead\",\"secr\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,0,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\",\"advisor\"]',13,NULL,'2019-04-29 04:44:26.522936','~','side',433,'nomcom',0,1,1,0,0,'[\"chair\",\"member\",\"advisor\"]',0,1,'[\"chair\"]','[\"chair\"]','[\"chair\",\"advisor\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,0,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\"]',14,NULL,'2019-06-26 13:28:11.695889','+','ietf',433,'admin',0,0,0,0,0,'[\"chair\"]',0,0,'[\"chair\"]','[\"chair\"]','[\"chair\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,0,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\"]',15,NULL,'2019-06-26 13:29:29.706999','+','ietf',433,'iana',0,0,0,0,0,'[\"chair\"]',0,0,'[\"chair\"]','[\"chair\"]','[\"chair\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,1,0,0,0,0,0,'ietf.group.views.group_about','ietf.group.views.group_about','[\"slides\"]','[\"chair\",\"lead\"]',16,NULL,'2019-07-17 04:20:03.049554','~','ad',433,'ise',0,0,1,0,0,'[\"chair\",\"delegate\"]',0,1,'[\"chair\",\"delegate\"]','[\"chair\"]','[\"chair\",\"delegate\"]','[\"Secretariat\"]','[]');
-# INSERT INTO `group_historicalgroupfeatures` (`has_milestones`, `has_chartering_process`, `has_documents`, `has_nonsession_materials`, `has_meetings`, `has_reviews`, `has_default_jabber`, `customize_workflow`, `about_page`, `default_tab`, `material_types`, `admin_roles`, `history_id`, `history_change_reason`, `history_date`, `history_type`, `agenda_type_id`, `history_user_id`, `type_id`, `acts_like_wg`, `create_wiki`, `custom_group_roles`, `has_session_materials`, `is_schedulable`, `role_order`, `show_on_agenda`, `req_subm_approval`, `matman_roles`, `docman_roles`, `groupman_roles`, `groupman_authroles`, `default_used_roles`) VALUES (0,0,0,0,1,1,0,0,'ietf.group.views.group_about','ietf.group.views.review_requests','[\n    \"slides\"\n]','[\n    \"chair\",\n    \"secr\"\n]',17,NULL,'2020-11-23 10:19:39.119039','~','ietf',420,'review',0,1,1,0,0,'[\n    \"chair\",\n    \"secr\"\n]',0,1,'[\n    \"ad\",\n    \"secr\"\n]','[\n    \"secr\"\n]','[\n    \"ad\",\n    \"secr\"\n]','[\n    \"Secretariat\"\n]','[\n    \"ad\",\n    \"chair\",\n    \"reviewer\",\n    \"secr\"\n]');
-# /*!40000 ALTER TABLE `group_historicalgroupfeatures` ENABLE KEYS */;
-# 
\ No newline at end of file
diff --git a/ietf/group/migrations/0040_lengthen_used_roles_fields.py b/ietf/group/migrations/0040_lengthen_used_roles_fields.py
deleted file mode 100644
index d33310495e..0000000000
--- a/ietf/group/migrations/0040_lengthen_used_roles_fields.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated by Django 2.2.17 on 2020-12-11 08:48
-
-from django.db import migrations
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0039_remove_historicalgroupfeatures'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='group',
-            name='used_roles',
-            field=jsonfield.fields.JSONField(blank=True, default=[], help_text="Leave an empty list to get the group_type's default used roles", max_length=256),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='default_used_roles',
-            field=jsonfield.fields.JSONField(default=[], max_length=256),
-        ),
-        migrations.AlterField(
-            model_name='grouphistory',
-            name='used_roles',
-            field=jsonfield.fields.JSONField(blank=True, default=[], help_text="Leave an empty list to get the group_type's default used roles", max_length=256),
-        ),
-        # historicalgroupfeatures has been removed
-        # migrations.AlterField(
-        #     model_name='historicalgroupfeatures',
-        #     name='default_used_roles',
-        #     field=jsonfield.fields.JSONField(default=[], max_length=256),
-        # ),
-    ]
diff --git a/ietf/group/migrations/0041_create_liaison_contact_roles.py b/ietf/group/migrations/0041_create_liaison_contact_roles.py
deleted file mode 100644
index 0194cc077f..0000000000
--- a/ietf/group/migrations/0041_create_liaison_contact_roles.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# Generated by Django 2.2.17 on 2020-12-09 06:59
-
-from django.db import migrations
-
-from ietf.person.name import plain_name
-from ietf.utils.mail import parseaddr
-
-
-def find_or_create_email(email_model, person_model, formatted_email, group):
-    """Look up an email address or create if needed
-    
-    Also creates a Person if the email does not have one. Created Email will have
-    the origin field set to the origin parameter to this method.
-    """
-    name, address = parseaddr(formatted_email)
-    if not address:
-        raise ValueError('Could not parse email "%s"' % formatted_email)
-    email, _ = email_model.objects.get_or_create(
-        address=address,
-        defaults=dict(origin='liaison contact: ' + group.acronym)
-    )
-
-    if not email.person:
-        person = person_model.objects.create(name=name if name else address)
-        email.person = person
-        email.save()
-
-    # Display an alert if the formatted address sent from the Role will differ
-    # from what was in the original contacts list
-    if not email.person.plain and email.person.name == email.address:
-        recreated_contact_email = email.address
-    else:
-        person_plain = email.person.plain if email.person.plain else plain_name(email.person.name)
-        recreated_contact_email = "%s <%s>" % (person_plain, email.address)
-    if recreated_contact_email != formatted_email:
-        print('>> Note: address "%s" is now "%s" (%s)' % (
-            formatted_email,
-            recreated_contact_email,
-            group.acronym,
-        ))    
-    return email
-
-
-def forward(apps, schema_editor):
-    """Perform forward migration
-    
-    Creates liaison_contact and liaison_cc_contact Roles corresponding to existing
-    LiaisonStatementGroupContact instances.
-    """
-    Group = apps.get_model('group', 'Group')
-    Role = apps.get_model('group', 'Role')
-    Email = apps.get_model('person', 'Email')
-    Person = apps.get_model('person', 'Person')
-    
-    RoleName = apps.get_model('name', 'RoleName')
-    contact_role_name = RoleName.objects.get(slug='liaison_contact')
-    cc_contact_role_name = RoleName.objects.get(slug='liaison_cc_contact')
-    
-    print()
-    LiaisonStatementGroupContacts = apps.get_model('liaisons', 'LiaisonStatementGroupContacts')
-    for lsgc in LiaisonStatementGroupContacts.objects.all():
-        group = lsgc.group
-        for contact_email in lsgc.contacts.split(','):
-            if contact_email:
-                email = find_or_create_email(Email, Person, 
-                                             contact_email.strip(), 
-                                             group)
-                Role.objects.create(
-                    group=group,
-                    name=contact_role_name,
-                    person=email.person,
-                    email=email,
-                )
-
-        for contact_email in lsgc.cc_contacts.split(','):
-            if contact_email:
-                email = find_or_create_email(Email, Person, 
-                                             contact_email.strip(), 
-                                             group)
-                Role.objects.create(
-                    group=group,
-                    name=cc_contact_role_name,
-                    person=email.person,
-                    email=email,
-                )
-            
-    # Now validate that we got them all. As much as possible, use independent code
-    # to avoid replicating any bugs from the original migration.
-    for group in Group.objects.all():
-        lsgc = LiaisonStatementGroupContacts.objects.filter(group_id=group.pk).first()
-        
-        if not lsgc:
-            if group.role_set.filter(name__in=[contact_role_name, cc_contact_role_name]).exists():
-                raise ValueError('%s group has contact roles after migration but had no LiaisonStatementGroupContacts' % (
-                    group.acronym,
-                ))
-        else:
-            contacts = group.role_set.filter(name=contact_role_name)
-            num_lsgc_contacts = len(lsgc.contacts.split(',')) if lsgc.contacts else 0
-            if len(contacts) != num_lsgc_contacts:
-                raise ValueError(
-                    '%s group has %d contact(s) but only %d address(es) in its LiaisonStatementGroupContacts (contact addresses = "%s", LSGC.contacts="%s")' % (
-                        group.acronym, len(contacts), num_lsgc_contacts,
-                        '","'.join([c.email.address for c in contacts]),
-                        lsgc.contacts,
-                    )
-                )
-            for contact in contacts:
-                email = contact.email.address
-                if email.lower() not in lsgc.contacts.lower():
-                    raise ValueError(
-                        '%s group has "%s" contact but not found in LiaisonStatementGroupContacts.contacts = "%s"' % (
-                            group.acronym, email, lsgc.contacts,
-                        )
-                    )
-
-            cc_contacts = group.role_set.filter(name=cc_contact_role_name)
-            num_lsgc_cc_contacts = len(lsgc.cc_contacts.split(',')) if lsgc.cc_contacts else 0
-            if len(cc_contacts) != num_lsgc_cc_contacts:
-                raise ValueError(
-                    '%s group has %d CC contact(s) but %d address(es) in its LiaisonStatementGroupContacts (cc_contact addresses = "%s", LSGC.cc_contacts="%s")' % (
-                        group.acronym, len(cc_contacts), num_lsgc_cc_contacts,
-                        '","'.join([c.email.address for c in cc_contacts]),
-                        lsgc.cc_contacts,
-                    )
-                )
-            for cc_contact in cc_contacts:
-                email = cc_contact.email.address
-                if email.lower() not in lsgc.cc_contacts.lower():
-                    raise ValueError(
-                        '%s group has "%s" CC contact but not found in LiaisonStatementGroupContacts.cc_contacts = "%s"' % (
-                            group.acronym, email, lsgc.cc_contacts,
-                        )
-                    )
-
-def reverse(apps, schema_editor):
-    """Perform reverse migration
-    
-    Removes liaison_contact and liaison_cc_contact Roles. The forward migration creates missing
-    Email and Person instances, but these are not removed because it's difficult to do this
-    safely and correctly.
-    """
-    Role = apps.get_model('group', 'Role')
-    Role.objects.filter(
-        name_id__in=['liaison_contact', 'liaison_cc_contact']
-    ).delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0040_lengthen_used_roles_fields'),
-        ('name', '0022_add_liaison_contact_rolenames'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0042_add_liaison_contact_roles_to_used_roles.py b/ietf/group/migrations/0042_add_liaison_contact_roles_to_used_roles.py
deleted file mode 100644
index 2b16d7485b..0000000000
--- a/ietf/group/migrations/0042_add_liaison_contact_roles_to_used_roles.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Generated by Django 2.2.17 on 2020-12-11 08:52
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    role_names_to_add = ['liaison_contact', 'liaison_cc_contact']
-    
-    Group = apps.get_model('group', 'Group')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    Role = apps.get_model('group', 'Role')
-    
-    # Add new liaison contact roles to default_used_fields for wg, sdo, and area groups
-    for group_type in ['wg', 'sdo', 'area']:
-        gf = GroupFeatures.objects.get(type_id=group_type)
-        for role_name in role_names_to_add:
-            if role_name not in gf.default_used_roles:
-                gf.default_used_roles.append(role_name)
-        gf.save()
-        
-        # Add new role names to any groups that both have liaison contacts
-        # and use a custom used_roles list.
-        for group in Group.objects.filter(type_id=group_type):
-            used_roles_is_set = len(group.used_roles) > 0
-            has_contacts = Role.objects.filter(name_id__in=role_names_to_add).exists()
-            if used_roles_is_set and has_contacts:
-                for role_name in role_names_to_add:
-                    if role_name not in group.used_roles:
-                        print('>> Adding %s to used_roles for %s' % (role_name, group.acronym))
-                        group.used_roles.append(role_name)
-                group.save()
-
-
-def reverse(apps, schema_editor):
-    role_names_to_remove = ['liaison_contact', 'liaison_cc_contact']
-    
-    Group = apps.get_model('group', 'Group')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-
-    for group in Group.objects.all():
-        for role_name in role_names_to_remove:
-            if role_name in group.used_roles:
-                print('>> Removing %s from used_roles for %s' % (role_name, group.acronym))
-                group.used_roles.remove(role_name)
-                group.save()
-
-    for gf in GroupFeatures.objects.all():
-        for role_name in role_names_to_remove:
-            if role_name in gf.default_used_roles:
-                print('>> Removing %s from default_used_roles for %s' % (role_name, gf.type_id))
-                gf.default_used_roles.remove(role_name)
-                gf.save()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0041_create_liaison_contact_roles'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0043_add_groupfeatures_parent_type_fields.py b/ietf/group/migrations/0043_add_groupfeatures_parent_type_fields.py
deleted file mode 100644
index 82cb0990f3..0000000000
--- a/ietf/group/migrations/0043_add_groupfeatures_parent_type_fields.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 2.2.19 on 2021-04-13 05:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0023_change_stream_descriptions'),
-        ('group', '0042_add_liaison_contact_roles_to_used_roles'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='parent_types',
-            field=models.ManyToManyField(blank=True, help_text='Group types allowed as parent of this group type', related_name='child_features', to='name.GroupTypeName'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='need_parent',
-            field=models.BooleanField(default=False, help_text='Does this group type require a parent group?', verbose_name='Need Parent'),
-        ),
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='default_parent',
-            field=models.CharField(blank=True, default='', help_text='Default parent group acronym for this group type', max_length=40, verbose_name='Default Parent'),
-        ),
-    ]
diff --git a/ietf/group/migrations/0044_populate_groupfeatures_parent_type_fields.py b/ietf/group/migrations/0044_populate_groupfeatures_parent_type_fields.py
deleted file mode 100644
index 855b47c90f..0000000000
--- a/ietf/group/migrations/0044_populate_groupfeatures_parent_type_fields.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Generated by Django 2.2.19 on 2021-04-13 09:17
-
-from django.db import migrations
-
-def populate_parent_types(apps, schema_editor):
-    """Add default parent_types entries
-
-    Data were determined from existing groups via this query:
-    {t.slug: list(
-        Group.objects.filter(type=t, parent__isnull=False).values_list('parent__type', flat=True).distinct()
-    ) for t in GroupTypeName.objects.all()}
-    """
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    type_map = {
-        'adhoc': ['ietf'],
-        'admin': [],
-        'ag': ['area', 'ietf'],
-        'area': ['ietf'],
-        'dir': ['area'],
-        'iab': ['ietf'],
-        'iana': [],
-        'iesg': [],
-        'ietf': ['ietf'],
-        'individ': ['area'],
-        'irtf': ['irtf'],
-        'ise': [],
-        'isoc': ['isoc'],
-        'nomcom': ['area'],
-        'program': ['ietf'],
-        'rag': ['irtf'],
-        'review': ['area'],
-        'rfcedtyp': [],
-        'rg': ['irtf'],
-        'sdo': ['sdo', 'area'],
-        'team': ['area'],
-        'wg': ['area']
-    }
-    for type_slug, parent_slugs in type_map.items():
-        if len(parent_slugs) > 0:
-            features = GroupFeatures.objects.get(type__slug=type_slug)
-            features.parent_types.add(*GroupTypeName.objects.filter(slug__in=parent_slugs))
-
-    # validate
-    for gtn in GroupTypeName.objects.all():
-        slugs_in_db = set(type.slug for type in gtn.features.parent_types.all())
-        assert(slugs_in_db == set(type_map[gtn.slug]))
-
-
-def set_need_parent_values(apps, schema_editor):
-    """Set need_parent values
-
-    Data determined from existing groups using:
-
-    GroupTypeName.objects.exclude(pk__in=Group.objects.filter(parent__isnull=True).values('type'))
-
-    'iesg' has been removed because there are no groups of this type, so no parent types have
-    been made available to it.
-    """
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-
-    GroupFeatures.objects.filter(
-        type_id__in=('area', 'dir', 'individ', 'review', 'rg',)
-    ).update(need_parent=True)
-
-
-def set_default_parents(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-
-    # rg-typed groups are children of the irtf group
-    rg_features = GroupFeatures.objects.filter(type_id='rg').first()
-    if rg_features:
-        rg_features.default_parent = 'irtf'
-        rg_features.save()
-
-
-def empty_reverse(apps, schema_editor):
-    pass  # nothing to do, field will be dropped
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0043_add_groupfeatures_parent_type_fields'),
-        ('person', '0019_auto_20210604_1443'),
-    ]
-
-    operations = [
-        migrations.RunPython(populate_parent_types, empty_reverse),
-        migrations.RunPython(set_need_parent_values, empty_reverse),
-        migrations.RunPython(set_default_parents, empty_reverse),
-    ]
diff --git a/ietf/group/migrations/0045_iabasg.py b/ietf/group/migrations/0045_iabasg.py
deleted file mode 100644
index 371b7c45b5..0000000000
--- a/ietf/group/migrations/0045_iabasg.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    Group = apps.get_model('group', 'Group')
-
-    # Copy program to iabasg
-    feat = GroupFeatures.objects.get(pk='program')
-    feat.pk = 'iabasg'
-    feat.save()
-    feat.parent_types.add('ietf')
-
-    # List provided by Cindy on 30Aug2021
-    Group.objects.filter(acronym__in=['iana-evolution','iproc','liaison-oversight','ietfiana','plenary-planning','rfcedprog']).update(type_id='iabasg')
-
-    Group.objects.filter(acronym='model-t').update(parent=Group.objects.get(acronym='iab'))
-
-def reverse(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    Group = apps.get_model('group', 'Group')
-    Group.objects.filter(type_id='iabasg').update(type_id='program')
-    # Intentionally not removing the parent of model-t
-    GroupFeatures.objects.filter(pk='iabasg').delete()
-
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0044_populate_groupfeatures_parent_type_fields'),
-        ('name', '0028_iabasg'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/group/migrations/0046_grouptypename_admin_to_adm.py b/ietf/group/migrations/0046_grouptypename_admin_to_adm.py
deleted file mode 100644
index 73c2689938..0000000000
--- a/ietf/group/migrations/0046_grouptypename_admin_to_adm.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    GroupTypeName = apps.get_model('name','GroupTypeName')
-    Group = apps.get_model('group', 'Group')
-    GroupHistory = apps.get_model('group', 'GroupHistory')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-
-    a = GroupTypeName.objects.get(pk='admin')
-    a.pk='adm'
-    a.order=1
-    a.save()
-    f = GroupFeatures.objects.get(pk='admin')
-    f.pk='adm'
-    f.save()
-
-    Group.objects.filter(type_id='admin').update(type_id='adm')
-    GroupHistory.objects.filter(type_id='admin').update(type_id='adm')
-
-    GroupFeatures.objects.filter(pk='admin').delete()
-    GroupTypeName.objects.filter(pk='admin').delete()
-
-def reverse(apps, schema_editor):
-    GroupTypeName = apps.get_model('name','GroupTypeName')
-    Group = apps.get_model('group', 'Group')
-    GroupHistory = apps.get_model('group','GroupHistory')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-
-    a = GroupTypeName.objects.get(pk='adm')
-    a.pk='admin'
-    a.order=0
-    a.save()
-    f = GroupFeatures.objects.get(pk='adm')
-    f.pk='admin'
-    f.save()
-
-    Group.objects.filter(type_id='adm').update(type_id='admin')
-    GroupHistory.objects.filter(type_id='adm').update(type_id='admin')
-
-    GroupFeatures.objects.filter(type_id='adm').delete()
-    GroupTypeName.objects.filter(pk='adm').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0045_iabasg'),
-        ('name', '0028_iabasg'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/group/migrations/0047_ietfllc.py b/ietf/group/migrations/0047_ietfllc.py
deleted file mode 100644
index a946e2bf01..0000000000
--- a/ietf/group/migrations/0047_ietfllc.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-from django.db import migrations
-
-def email(person):
-    e = person.email_set.filter(primary=True).first()
-    if not e:
-        e = person.email_set.filter(active=True).order_by("-time").first()
-    return e
-
-def forward(apps, schema_editor):
-    Group = apps.get_model('group', 'Group')
-    Person = apps.get_model('person', 'Person')
-    llc = Group.objects.create(
-        acronym='ietfadminllc',
-        name="IETF Administration LLC",
-        state_id='active',
-        type_id='adm',
-        description="The IETF Administration LLC (IETF LLC) provides the corporate legal home for the IETF, the Internet Architecture Board (IAB), and the Internet Research Task Force (IRTF).  The Administration (https://www.ietf.org/about/administration/) section of the website has full details of the LLC and is where the various policies and reports produced by the LLC are published.",
-    )
-    Group.objects.filter(acronym='llc-board').update(parent=llc, description="The IETF Administration LLC (IETF LLC) provides the corporate legal home for the IETF, the Internet Architecture Board (IAB), and the Internet Research Task Force (IRTF).  The Administration (https://www.ietf.org/about/administration/) section of the website has full details of the LLC and is where the various policies and reports produced by the LLC are published.")
-    llc_staff= Group.objects.create(
-        acronym='llc-staff',
-        name="IETF LLC employees",
-        state_id='active',
-        type_id='adm',
-        parent=llc,
-        description="The IETF Administration LLC (IETF LLC) provides the corporate legal home for the IETF, the Internet Architecture Board (IAB), and the Internet Research Task Force (IRTF).  The Administration (https://www.ietf.org/about/administration/) section of the website has full details of the LLC and is where the various policies and reports produced by the LLC are published.",
-    )
-    legal = Group.objects.create(
-        acronym='legal-consult',
-        name="Legal consultation group",
-        state_id='active',
-        type_id='adm',
-        parent=llc,
-        description="The legal-consult list is a group of community participants who provide their views to the IETF Administration LLC in private on various legal matters.  This was first established under the IAOC and has not been reviewed since.  Legal advice is provided separately to the LLC by contracted external counsel.",
-    )
-
-    for email_addr in ('jay@ietf.org', 'ghwood@ietf.org', 'lbshaw@ietf.org', 'krathnayake@ietf.org'):
-        p = Person.objects.get(email__address=email_addr)
-        llc_staff.role_set.create(name_id='member',person=p,email=email(p))
-
-    for email_addr in (
-        'amorris@amsl.com',
-        'brad@biddle.law',
-        'David.Wilson@thompsonhine.com',
-        'glenn.deen@nbcuni.com',
-        'hall@isoc.org',
-        'Jason_Livingood@comcast.com',
-        'jay@ietf.org',
-        'jmh@joelhalpern.com',
-        'johnl@taugh.com',
-        'kathleen.moriarty.ietf@gmail.com',
-        'lars@eggert.org',
-        'lflynn@amsl.com',
-        'stewe@stewe.org',
-        'vigdis@biddle.law',
-        'wendy@seltzer.org',
-    ):
-        p = Person.objects.filter(email__address=email_addr).first()
-        if p:
-            legal.role_set.create(name_id='member', person=p, email=email(p))
-
-
-def reverse(apps, schema_editor):
-    Group = apps.get_model('group', 'Group')
-    Group.objects.filter(acronym='llc-board').update(parent=None)
-    Group.objects.filter(acronym__in=['llc_staff','legal-consult']).delete()
-    Group.objects.filter(acronym='ietfadminllc').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0046_grouptypename_admin_to_adm'),
-        ('person', '0019_auto_20210604_1443'),
-        # The below are needed for reverse migrations to work
-        ('name','0028_iabasg'),
-        ('doc', '0043_bofreq_docevents'),
-        ('liaisons','0009_delete_liaisonstatementgroupcontacts_model'),
-        ('meeting', '0018_document_primary_key_cleanup'),
-        ('review', '0014_document_primary_key_cleanup'),
-        ('submit', '0008_submissionextresource'), 
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/group/migrations/0048_has_session_materials.py b/ietf/group/migrations/0048_has_session_materials.py
deleted file mode 100644
index 3a081275d7..0000000000
--- a/ietf/group/migrations/0048_has_session_materials.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-from django.db import migrations
-
-# Not adding team at this time - need to untangle the nonsession_materials mess first
-
-types_to_change = [
-    'program',
-    'dir',
-    'review',
-]
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    GroupFeatures.objects.filter(type__in=types_to_change).update(has_session_materials=True)
-
-def reverse(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    GroupFeatures.objects.filter(type__in=types_to_change).update(has_session_materials=False)
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0047_ietfllc'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0049_auto_20211019_1136.py b/ietf/group/migrations/0049_auto_20211019_1136.py
deleted file mode 100644
index b9464f8178..0000000000
--- a/ietf/group/migrations/0049_auto_20211019_1136.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-19 11:36
-
-from django.db import migrations
-import ietf.utils.db
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0048_has_session_materials'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='admin_roles',
-            field=ietf.utils.db.IETFJSONField(default=['chair'], max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='default_used_roles',
-            field=ietf.utils.db.IETFJSONField(default=[], max_length=256),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='docman_roles',
-            field=ietf.utils.db.IETFJSONField(default=['ad', 'chair', 'delegate', 'secr'], max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='groupman_authroles',
-            field=ietf.utils.db.IETFJSONField(default=['Secretariat'], max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='groupman_roles',
-            field=ietf.utils.db.IETFJSONField(default=['ad', 'chair'], max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='material_types',
-            field=ietf.utils.db.IETFJSONField(default=['slides'], max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='matman_roles',
-            field=ietf.utils.db.IETFJSONField(default=['ad', 'chair', 'delegate', 'secr'], max_length=128),
-        ),
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='role_order',
-            field=ietf.utils.db.IETFJSONField(default=['chair', 'secr', 'member'], help_text='The order in which roles are shown, for instance on photo pages.  Enter valid JSON.', max_length=128),
-        ),
-    ]
diff --git a/ietf/group/migrations/0050_groupfeatures_agenda_filter_type.py b/ietf/group/migrations/0050_groupfeatures_agenda_filter_type.py
deleted file mode 100644
index e7cdc64dec..0000000000
--- a/ietf/group/migrations/0050_groupfeatures_agenda_filter_type.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0033_populate_agendafiltertypename'),
-        ('group', '0049_auto_20211019_1136'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='agenda_filter_type',
-            field=models.ForeignKey(default='none', on_delete=django.db.models.deletion.PROTECT, to='name.AgendaFilterTypeName'),
-        ),
-    ]
diff --git a/ietf/group/migrations/0051_populate_groupfeatures_agenda_filter_type.py b/ietf/group/migrations/0051_populate_groupfeatures_agenda_filter_type.py
deleted file mode 100644
index fa5025902b..0000000000
--- a/ietf/group/migrations/0051_populate_groupfeatures_agenda_filter_type.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-
-    # map AgendaFilterTypeName slug to group types - unlisted get 'none'
-    filter_types = dict(
-        # list previously hard coded in agenda view, plus 'review'
-        normal={'wg', 'ag', 'rg', 'rag', 'iab', 'program', 'review'},
-        heading={'area', 'ietf', 'irtf'},
-        special={'team', 'adhoc'},
-    )
-
-    for ft, group_types in filter_types.items():
-        for gf in GroupFeatures.objects.filter(type__slug__in=group_types):
-            gf.agenda_filter_type_id = ft
-            gf.save()
-
-
-def reverse(apps, schema_editor):
-    pass  # nothing to do, model will be deleted anyway
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0050_groupfeatures_agenda_filter_type'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0052_groupfeatures_session_purposes.py b/ietf/group/migrations/0052_groupfeatures_session_purposes.py
deleted file mode 100644
index 8a3668e7e1..0000000000
--- a/ietf/group/migrations/0052_groupfeatures_session_purposes.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.24 on 2021-09-26 11:29
-
-from django.db import migrations
-import ietf.name.models
-import ietf.utils.db
-import ietf.utils.validators
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0051_populate_groupfeatures_agenda_filter_type'),
-        ('name', '0034_sessionpurposename'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='groupfeatures',
-            name='session_purposes',
-            field=ietf.utils.db.IETFJSONField(default=[], help_text='Allowed session purposes for this group type', max_length=256, validators=[ietf.utils.validators.JSONForeignKeyListValidator(ietf.name.models.SessionPurposeName)]),
-        ),
-    ]
diff --git a/ietf/group/migrations/0053_populate_groupfeatures_session_purposes.py b/ietf/group/migrations/0053_populate_groupfeatures_session_purposes.py
deleted file mode 100644
index 642aa5f215..0000000000
--- a/ietf/group/migrations/0053_populate_groupfeatures_session_purposes.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.24 on 2021-09-26 11:29
-
-from django.db import migrations
-
-
-default_purposes = dict(
-    adhoc=['presentation'],
-    adm=['closed_meeting', 'officehours'],
-    ag=['regular'],
-    area=['regular'],
-    dir=['open_meeting', 'presentation', 'regular', 'social', 'tutorial'],
-    iab=['closed_meeting', 'regular'],
-    iabasg=['closed_meeting', 'officehours', 'open_meeting'],
-    iana=['officehours'],
-    iesg=['closed_meeting', 'open_meeting'],
-    ietf=['admin', 'plenary', 'presentation', 'social'],
-    irtf=[],
-    ise=['officehours'],
-    isoc=['officehours', 'open_meeting', 'presentation'],
-    nomcom=['closed_meeting', 'officehours'],
-    program=['regular', 'tutorial'],
-    rag=['regular'],
-    review=['open_meeting', 'social'],
-    rfcedtyp=['officehours'],
-    rg=['regular'],
-    team=['coding', 'presentation', 'social', 'tutorial'],
-    wg=['regular'],
-)
-
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    SessionPurposeName = apps.get_model('name', 'SessionPurposeName')
-
-    # verify that we're not about to use an invalid purpose
-    for purposes in default_purposes.values():
-        for purpose in purposes:
-            SessionPurposeName.objects.get(pk=purpose)  # throws an exception unless exists
-
-    for type_, purposes in default_purposes.items():
-        GroupFeatures.objects.filter(
-            type=type_
-        ).update(
-            session_purposes=purposes
-        )
-
-def reverse(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    GroupFeatures.objects.update(session_purposes=[])  # clear back out to default
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0052_groupfeatures_session_purposes'),
-        ('name', '0035_populate_sessionpurposename'),
-
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0054_enable_delegation.py b/ietf/group/migrations/0054_enable_delegation.py
deleted file mode 100644
index 9655f819e6..0000000000
--- a/ietf/group/migrations/0054_enable_delegation.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2022 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group','GroupFeatures')
-    for type_id in ('dir', 'iabasg', 'program', 'review', 'team'):
-        f = GroupFeatures.objects.get(type_id=type_id)
-        if 'delegate' not in f.groupman_roles:
-            f.groupman_roles.append('delegate')
-            f.save()
-    for type_id in ('adhoc', 'ag', 'iesg', 'irtf', 'ise', 'rag', 'dir', 'iabasg', 'program', 'review'):
-        f = GroupFeatures.objects.get(type_id=type_id)
-        if 'delegate' not in f.default_used_roles:
-            f.default_used_roles.append('delegate')
-            f.save()
-
-def reverse (apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0053_populate_groupfeatures_session_purposes'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-    ]
diff --git a/ietf/group/migrations/0055_editorial_stream.py b/ietf/group/migrations/0055_editorial_stream.py
deleted file mode 100644
index a7dc9ca9c3..0000000000
--- a/ietf/group/migrations/0055_editorial_stream.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The IETF Trust 2022 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    Group = apps.get_model('group', 'Group')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    Group.objects.create(
-        acronym='editorial',
-        name='Editorial Stream',
-        state_id='active',
-        type_id='editorial',
-        parent=None,
-    )
-    templ = GroupFeatures.objects.get(type='rfcedtyp')
-    templ.pk = None
-    templ.type_id='editorial'
-    templ.save()
-
-
-
-def reverse(apps, schema_editor):
-    Group = apps.get_model('group', 'Group')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    GroupFeatures.objects.filter(type='editorial').delete()
-    Group.objects.filter(acronym='editorial').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0054_enable_delegation'),
-        ('name', '0043_editorial_stream_grouptype'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0056_dir_chair_groupman_role.py b/ietf/group/migrations/0056_dir_chair_groupman_role.py
deleted file mode 100644
index b69eb03ae8..0000000000
--- a/ietf/group/migrations/0056_dir_chair_groupman_role.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated by Django 2.2.28 on 2022-06-14 13:14
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    features = GroupFeatures.objects.get(type_id='dir')
-    if 'chair' not in features.groupman_roles:
-        features.groupman_roles.append('chair')
-        features.save()
-
-
-def reverse(apps, schema_editor):
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-    features = GroupFeatures.objects.get(type_id='dir')
-    if 'chair' in features.groupman_roles:
-        features.groupman_roles.remove('chair')
-        features.save()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0055_editorial_stream'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/group/migrations/0057_nojabber_onlychat.py b/ietf/group/migrations/0057_nojabber_onlychat.py
deleted file mode 100644
index c089a9761b..0000000000
--- a/ietf/group/migrations/0057_nojabber_onlychat.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
-# Generated by Django 2.2.28 on 2022-07-14 09:09
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0056_dir_chair_groupman_role'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='groupfeatures',
-            old_name='has_default_jabber',
-            new_name='has_default_chat',
-        ),
-    ]
diff --git a/ietf/group/migrations/0058_alter_has_default_chat.py b/ietf/group/migrations/0058_alter_has_default_chat.py
deleted file mode 100644
index 8f0464764c..0000000000
--- a/ietf/group/migrations/0058_alter_has_default_chat.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
-# Generated by Django 2.2.28 on 2022-07-15 12:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0057_nojabber_onlychat'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='groupfeatures',
-            name='has_default_chat',
-            field=models.BooleanField(default=False, verbose_name='Chat'),
-        ),
-    ]
diff --git a/ietf/group/milestones.py b/ietf/group/milestones.py
index 43748a1f25..52f2eaebee 100644
--- a/ietf/group/milestones.py
+++ b/ietf/group/milestones.py
@@ -29,7 +29,7 @@ class MilestoneForm(forms.Form):
     desc = forms.CharField(max_length=500, label="Milestone", required=True)
     due = DatepickerDateField(date_format="MM yyyy", picker_settings={"min-view-mode": "months", "autoclose": "1", "view-mode": "years" }, required=True)
     order = forms.IntegerField(required=True, widget=forms.HiddenInput)
-    docs = SearchableDocumentsField(label="Drafts", required=False, help_text="Any drafts that the milestone concerns.")
+    docs = SearchableDocumentsField(label="Internet-Drafts", required=False, help_text="Any Internet-Drafts that the milestone concerns.")
     resolved_checkbox = forms.BooleanField(required=False, label="Resolved")
     resolved = forms.CharField(label="Resolved as", max_length=50, required=False)
 
@@ -369,7 +369,7 @@ def save_milestone_form(f):
                     email_milestones_changed(request, group, changes, states)
 
                 if milestone_set == "charter":
-                    return redirect('ietf.doc.views_doc.document_main', name=group.charter.canonical_name())
+                    return redirect('ietf.doc.views_doc.document_main', name=group.charter.name)
                 else:
                     return HttpResponseRedirect(group.about_url())
     else:
@@ -399,7 +399,7 @@ def save_milestone_form(f):
                        can_change_uses_milestone_dates=can_change_uses_milestone_dates))
 
 @login_required
-def reset_charter_milestones(request, group_type, acronym):
+def reset_charter_milestones(request, acronym, group_type=None):
     """Reset charter milestones to the currently in-use milestones."""
     group = get_group_or_404(acronym, group_type)
     if not group.features.has_milestones:
diff --git a/ietf/group/models.py b/ietf/group/models.py
index 899c88241a..a7e3c6616e 100644
--- a/ietf/group/models.py
+++ b/ietf/group/models.py
@@ -2,9 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
 import email.utils
-import jsonfield
 import os
 import re
 
@@ -13,21 +11,25 @@
 from django.db import models
 from django.db.models.deletion import CASCADE, PROTECT
 from django.dispatch import receiver
+from django.utils import timezone
+from django.utils.text import slugify
 
 import debug                            # pyflakes:ignore
 
 from ietf.name.models import (GroupStateName, GroupTypeName, DocTagName, GroupMilestoneStateName, RoleName,
-                              AgendaTypeName, AgendaFilterTypeName, ExtResourceName, SessionPurposeName)
+                              AgendaTypeName, AgendaFilterTypeName, ExtResourceName, SessionPurposeName,
+                              AppealArtifactTypeName )
 from ietf.person.models import Email, Person
-from ietf.utils.db import IETFJSONField
+from ietf.utils.db import EmptyAwareJSONField
 from ietf.utils.mail import formataddr, send_mail_text
 from ietf.utils import log
 from ietf.utils.models import ForeignKey, OneToOneField
+from ietf.utils.timezone import date_today
 from ietf.utils.validators import JSONForeignKeyListValidator
 
 
 class GroupInfo(models.Model):
-    time = models.DateTimeField(default=datetime.datetime.now)
+    time = models.DateTimeField(default=timezone.now)
     name = models.CharField(max_length=80)
     state = ForeignKey(GroupStateName, null=True)
     type = ForeignKey(GroupTypeName, null=True)
@@ -43,7 +45,7 @@ class GroupInfo(models.Model):
     unused_states = models.ManyToManyField('doc.State', help_text="Document states that have been disabled for the group.", blank=True)
     unused_tags = models.ManyToManyField(DocTagName, help_text="Document tags that have been disabled for the group.", blank=True)
 
-    used_roles = jsonfield.JSONField(max_length=256, blank=True, default=[], help_text="Leave an empty list to get the group_type's default used roles")
+    used_roles = models.JSONField(max_length=256, blank=True, default=list, help_text="Leave an empty list to get the group_type's default used roles")
 
     uses_milestone_dates = models.BooleanField(default=True)
 
@@ -109,6 +111,9 @@ def active_wgs(self):
     def closed_wgs(self):
         return self.wgs().exclude(state__in=Group.ACTIVE_STATE_IDS)
 
+    def areas(self):
+        return self.get_queryset().filter(type="area")
+
     def with_meetings(self):
         return self.get_queryset().filter(type__features__has_meetings=True)
 
@@ -133,15 +138,15 @@ def has_role(self, user, role_names):
             role_names = [role_names]
         return user.is_authenticated and self.role_set.filter(name__in=role_names, person__user=user).exists()
 
-    def is_decendant_of(self, sought_parent):
+    def is_descendant_of(self, sought_parent):
         parent = self.parent
-        decendants = [ self, ]
-        while (parent != None) and (parent not in decendants):
-            decendants = [ parent ] + decendants
+        descendants = [ self, ]
+        while (parent != None) and (parent not in descendants):
+            descendants = [ parent ] + descendants
             if parent.acronym == sought_parent:
                 return True
             parent = parent.parent
-        log.assertion('parent not in decendants')
+        log.assertion('parent not in descendants')
         return False
 
     def get_chair(self):
@@ -180,11 +185,15 @@ def liaison_approvers(self):
         return self.role_set.none()
 
     def status_for_meeting(self,meeting):
-        end_date = meeting.end_date()+datetime.timedelta(days=1)
         previous_meeting = meeting.previous_meeting()
-        status_events = self.groupevent_set.filter(type='status_update',time__lte=end_date).order_by('-time')
+        status_events = self.groupevent_set.filter(
+            type='status_update',
+            time__lt=meeting.end_datetime(),
+        ).order_by('-time')
         if previous_meeting:
-            status_events = status_events.filter(time__gte=previous_meeting.end_date()+datetime.timedelta(days=1))
+            status_events = status_events.filter(
+                time__gte=previous_meeting.end_datetime()
+            )
         return status_events.first()
 
     def get_description(self):
@@ -228,6 +237,36 @@ def chat_archive_url(self):
 )
 
 
+# JSONFields need callable defaults that work with migrations to avoid sharing
+# data structures between instances. These helpers provide that. 
+def default_material_types():
+    return ["slides"]
+
+
+def default_admin_roles():
+    return ["chair"]
+
+
+def default_docman_roles():
+    return ["ad", "chair", "delegate", "secr"]
+
+
+def default_groupman_roles():
+    return ["ad", "chair"]
+
+
+def default_groupman_authroles():
+    return ["Secretariat"]
+
+
+def default_matman_roles():
+    return ["ad", "chair", "delegate", "secr"]
+
+
+def default_role_order():
+    return ["chair", "secr", "member"]
+
+
 class GroupFeatures(models.Model):
     type = OneToOneField(GroupTypeName, primary_key=True, null=False, related_name='features')
     #history = HistoricalRecords()
@@ -261,16 +300,16 @@ class GroupFeatures(models.Model):
     agenda_type             = models.ForeignKey(AgendaTypeName, null=True, default="ietf", on_delete=CASCADE)
     about_page              = models.CharField(max_length=64, blank=False, default="ietf.group.views.group_about" )
     default_tab             = models.CharField(max_length=64, blank=False, default="ietf.group.views.group_about" )
-    material_types          = IETFJSONField(max_length=64, accepted_empty_values=[[], {}], blank=False, default=["slides"])
-    default_used_roles      = IETFJSONField(max_length=256, accepted_empty_values=[[], {}], blank=False, default=[])
-    admin_roles             = IETFJSONField(max_length=64, accepted_empty_values=[[], {}], blank=False, default=["chair"]) # Trac Admin
-    docman_roles            = IETFJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=["ad","chair","delegate","secr"])
-    groupman_roles          = IETFJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=["ad","chair",])
-    groupman_authroles      = IETFJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=["Secretariat",])
-    matman_roles            = IETFJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=["ad","chair","delegate","secr"])
-    role_order              = IETFJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=["chair","secr","member"],
-                                                help_text="The order in which roles are shown, for instance on photo pages.  Enter valid JSON.")
-    session_purposes        = IETFJSONField(max_length=256, accepted_empty_values=[[], {}], blank=False, default=[],
+    material_types          = EmptyAwareJSONField(max_length=64, accepted_empty_values=[[], {}], blank=False, default=default_material_types)
+    default_used_roles      = EmptyAwareJSONField(max_length=256, accepted_empty_values=[[], {}], blank=False, default=list)
+    admin_roles             = EmptyAwareJSONField(max_length=64, accepted_empty_values=[[], {}], blank=False, default=default_admin_roles)  # Trac Admin
+    docman_roles            = EmptyAwareJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=default_docman_roles)
+    groupman_roles          = EmptyAwareJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=default_groupman_roles)
+    groupman_authroles      = EmptyAwareJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=default_groupman_authroles)
+    matman_roles            = EmptyAwareJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=default_matman_roles)
+    role_order              = EmptyAwareJSONField(max_length=128, accepted_empty_values=[[], {}], blank=False, default=default_role_order,
+                                            help_text="The order in which roles are shown, for instance on photo pages.  Enter valid JSON.")
+    session_purposes        = EmptyAwareJSONField(max_length=256, accepted_empty_values=[[], {}], blank=False, default=list,
                                                   help_text="Allowed session purposes for this group type",
                                                   validators=[JSONForeignKeyListValidator(SessionPurposeName)])
 
@@ -331,7 +370,7 @@ class GroupMilestoneHistory(GroupMilestoneInfo):
     milestone = ForeignKey(GroupMilestone, related_name="history_set")
 
 class GroupStateTransitions(models.Model):
-    """Captures that a group has overriden the default available
+    """Captures that a group has overridden the default available
     document state transitions for a certain state."""
     group = ForeignKey(Group)
     state = ForeignKey('doc.State', help_text="State for which the next states should be overridden")
@@ -353,7 +392,7 @@ def __str__(self):
 class GroupEvent(models.Model):
     """An occurrence for a group, used for tracking who, when and what."""
     group = ForeignKey(Group)
-    time = models.DateTimeField(default=datetime.datetime.now, help_text="When the event happened")
+    time = models.DateTimeField(default=timezone.now, help_text="When the event happened")
     type = models.CharField(max_length=50, choices=GROUP_EVENT_CHOICES)
     by = ForeignKey(Person)
     desc = models.TextField()
@@ -405,6 +444,46 @@ def __str__(self):
     class Meta:
         verbose_name_plural = "role histories"
 
+class Appeal(models.Model):
+    name = models.CharField(max_length=512)
+    group = models.ForeignKey(Group, on_delete=models.PROTECT)
+    date = models.DateField(default=date_today)
+
+    class Meta:
+        ordering = ['-date', '-id']
+
+    def __str__(self):
+        return f"{self.date} - {self.name}"
+
+class AppealArtifact(models.Model):
+    appeal = ForeignKey(Appeal)
+    artifact_type = ForeignKey(AppealArtifactTypeName)
+    date = models.DateField(default=date_today)
+    title = models.CharField(max_length=256, blank=True, help_text="The artifact_type.name will be used if this field is blank")
+    order = models.IntegerField(default=0)
+    content_type = models.CharField(max_length=32)
+    # "Abusing" BinaryField (see the django docs) for the small number of
+    # these things we have on purpose. Later, any non-markdown content may
+    # move off into statics instead.
+    bits = models.BinaryField(editable=True)
+
+    class Meta:
+        ordering = ['date', 'order', 'artifact_type__order']
+
+    def display_title(self):
+        if self.title != "":
+            return self.title
+        else:
+            return self.artifact_type.name
+
+    def is_markdown(self):
+        return self.content_type == "text/markdown;charset=utf-8"
+    
+    def download_name(self):
+        return f"{self.date}-{slugify(self.display_title())}.{'md' if self.is_markdown() else 'pdf'}"
+
+    def __str__(self):
+        return f"{self.date} {self.display_title()} : {self.appeal.name}"
 
 # --- Signal hooks for group models ---
 
@@ -415,6 +494,8 @@ def notify_rfceditor_of_group_name_change(sender, instance=None, **kwargs):
             current = Group.objects.get(pk=instance.pk)
         except Group.DoesNotExist:
             return
+        if current.type_id == "sdo":
+            return
         addr = settings.RFC_EDITOR_GROUP_NOTIFICATION_EMAIL
         if addr and instance.name != current.name:
             msg = """
diff --git a/ietf/group/resources.py b/ietf/group/resources.py
index 310fb5fb9b..698f50460a 100644
--- a/ietf/group/resources.py
+++ b/ietf/group/resources.py
@@ -13,7 +13,7 @@
 
 from ietf.group.models import (Group, GroupStateTransitions, GroupMilestone, GroupHistory, # type: ignore
     GroupURL, Role, GroupEvent, RoleHistory, GroupMilestoneHistory, MilestoneGroupEvent,
-    ChangeStateGroupEvent, GroupFeatures, GroupExtResource)
+    ChangeStateGroupEvent, GroupFeatures, GroupExtResource, Appeal, AppealArtifact)
 
 
 from ietf.person.resources import PersonResource
@@ -333,3 +333,42 @@ class Meta:
             "name": ALL_WITH_RELATIONS,
         }
 api.group.register(GroupExtResourceResource())
+
+
+class AppealResource(ModelResource):
+    group            = ToOneField(GroupResource, 'group')
+    class Meta:
+        queryset = Appeal.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'appeal'
+        ordering = ['id', ]
+        filtering = { 
+            "id": ALL,
+            "name": ALL,
+            "date": ALL,
+            "group": ALL_WITH_RELATIONS,
+        }
+api.group.register(AppealResource())
+
+from ietf.name.resources import AppealArtifactTypeNameResource
+class AppealArtifactResource(ModelResource):
+    appeal           = ToOneField(AppealResource, 'appeal')
+    artifact_type    = ToOneField(AppealArtifactTypeNameResource, 'artifact_type')
+    class Meta:
+        excludes= ("bits",)
+        queryset = AppealArtifact.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'appealartifact'
+        ordering = [ "id", ]
+        filtering = { 
+            "id": ALL,
+            "date": ALL,
+            "title": ALL,
+            "order": ALL,
+            "content_type": ALL,
+            "appeal": ALL_WITH_RELATIONS,
+            "artifact_type": ALL_WITH_RELATIONS,
+        }
+api.group.register(AppealArtifactResource())
diff --git a/ietf/group/serializers.py b/ietf/group/serializers.py
new file mode 100644
index 0000000000..e789ba46bf
--- /dev/null
+++ b/ietf/group/serializers.py
@@ -0,0 +1,50 @@
+# Copyright The IETF Trust 2024-2026, All Rights Reserved
+"""django-rest-framework serializers"""
+
+from drf_spectacular.utils import extend_schema_field
+from rest_framework import serializers
+
+from ietf.person.models import Email
+from .models import Group, Role
+
+
+class GroupSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Group
+        fields = ["acronym", "name", "type", "list_email"]
+
+
+class AreaDirectorSerializer(serializers.Serializer):
+    """Serialize an area director
+
+    Works with Email or Role
+    """
+
+    name = serializers.SerializerMethodField()
+    email = serializers.SerializerMethodField()
+
+    @extend_schema_field(serializers.CharField)
+    def get_name(self, instance: Email | Role):
+        person = getattr(instance, 'person', None)
+        return person.plain_name() if person else None
+
+    @extend_schema_field(serializers.EmailField)
+    def get_email(self, instance: Email | Role):
+        if isinstance(instance, Role):
+            return instance.email.email_address()
+        return instance.email_address()
+
+
+class AreaSerializer(serializers.ModelSerializer):
+    ads = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Group
+        fields = ["acronym", "name", "ads"]
+
+    @extend_schema_field(AreaDirectorSerializer(many=True))
+    def get_ads(self, area: Group):
+        return AreaDirectorSerializer(
+            area.ads if area.is_active else Role.objects.none(),
+            many=True,
+        ).data
diff --git a/ietf/group/tasks.py b/ietf/group/tasks.py
new file mode 100644
index 0000000000..ada83e80e2
--- /dev/null
+++ b/ietf/group/tasks.py
@@ -0,0 +1,232 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+#
+# Celery task definitions
+#
+import shutil
+
+from celery import shared_task
+from pathlib import Path
+
+from django.conf import settings
+from django.template.loader import render_to_string
+from django.utils import timezone
+
+from ietf.doc.storage_utils import store_file
+from ietf.liaisons.models import LiaisonStatement
+from ietf.utils import log
+from ietf.utils.test_runner import disable_coverage
+
+from .models import Group, GroupHistory
+from .utils import fill_in_charter_info, fill_in_wg_drafts, fill_in_wg_roles, save_group_in_history
+from .views import extract_last_name, roles
+
+
+@shared_task
+def generate_wg_charters_files_task():
+    areas = Group.objects.filter(type="area", state="active").order_by("name")
+    groups = (
+        Group.objects.filter(type="wg", state="active")
+        .exclude(parent=None)
+        .order_by("acronym")
+    )
+    for group in groups:
+        fill_in_charter_info(group)
+        fill_in_wg_roles(group)
+        fill_in_wg_drafts(group)
+    for area in areas:
+        area.groups = [g for g in groups if g.parent_id == area.pk]
+    charter_path = Path(settings.CHARTER_PATH)
+    charters_file = charter_path / "1wg-charters.txt"
+    charters_file.write_text(
+        render_to_string("group/1wg-charters.txt", {"areas": areas}),
+        encoding="utf8",
+    )
+    charters_by_acronym_file = charter_path / "1wg-charters-by-acronym.txt"
+    charters_by_acronym_file.write_text(
+        render_to_string("group/1wg-charters-by-acronym.txt", {"groups": groups}),
+        encoding="utf8",
+    )
+
+    with charters_file.open("rb") as f:
+        store_file("indexes", "1wg-charters.txt", f, allow_overwrite=True)
+    with charters_by_acronym_file.open("rb") as f:
+        store_file("indexes", "1wg-charters-by-acronym.txt", f, allow_overwrite=True)
+
+    charter_copy_dests = [
+        getattr(settings, "CHARTER_COPY_PATH", None), 
+        getattr(settings, "CHARTER_COPY_OTHER_PATH", None),
+        getattr(settings, "CHARTER_COPY_THIRD_PATH", None),
+    ]
+    for charter_copy_dest in charter_copy_dests:
+        if charter_copy_dest is not None:
+            if not Path(charter_copy_dest).is_dir():
+                log.log(
+                    f"Error copying 1wg-charter files to {charter_copy_dest}: it does not exist or is not a directory"
+                )
+            else:
+                try:
+                    shutil.copy2(charters_file, charter_copy_dest)
+                except IOError as err:
+                    log.log(f"Error copying {charters_file} to {charter_copy_dest}: {err}")
+                try:
+                    shutil.copy2(charters_by_acronym_file, charter_copy_dest)
+                except IOError as err:
+                    log.log(
+                        f"Error copying {charters_by_acronym_file} to {charter_copy_dest}: {err}"
+                    )
+
+
+@shared_task
+def generate_wg_summary_files_task():
+    # Active WGs (all should have a parent, but filter to be sure)
+    groups = (
+        Group.objects.filter(type="wg", state="active")
+        .exclude(parent=None)
+        .order_by("acronym")
+    )
+    # Augment groups with chairs list
+    for group in groups:
+        group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
+
+    # Active areas with one or more active groups in them 
+    areas = Group.objects.filter(
+        type="area",
+        state="active",
+        group__in=groups,
+    ).distinct().order_by("name")
+    # Augment areas with their groups
+    for area in areas:
+        area.groups = [g for g in groups if g.parent_id == area.pk]
+    summary_path = Path(settings.GROUP_SUMMARY_PATH)
+    summary_file = summary_path / "1wg-summary.txt"
+    summary_file.write_text(
+        render_to_string("group/1wg-summary.txt", {"areas": areas}),
+        encoding="utf8",
+    )
+    summary_by_acronym_file = summary_path / "1wg-summary-by-acronym.txt"
+    summary_by_acronym_file.write_text(
+        render_to_string(
+            "group/1wg-summary-by-acronym.txt",
+            {"areas": areas, "groups": groups},
+        ),
+        encoding="utf8",
+    )
+
+    with summary_file.open("rb") as f:
+        store_file("indexes", "1wg-summary.txt", f, allow_overwrite=True)
+    with summary_by_acronym_file.open("rb") as f:
+        store_file("indexes", "1wg-summary-by-acronym.txt", f, allow_overwrite=True)
+
+@shared_task
+@disable_coverage()
+def run_once_adjust_liaison_groups():  # pragma: no cover
+    log.log("Starting run_once_adjust_liaison_groups")
+    if all(
+        [
+            Group.objects.filter(
+                acronym__in=[
+                    "3gpp-tsg-ct",
+                    "3gpp-tsg-ran-wg1",
+                    "3gpp-tsg-ran-wg4",
+                    "3gpp-tsg-sa",
+                    "3gpp-tsg-sa-wg5",
+                    "3gpp-tsgct",  # duplicates 3gpp-tsg-ct above already
+                    "3gpp-tsgct-ct1",  # will normalize all acronyms to hyphenated form
+                    "3gpp-tsgct-ct3",  # and consistently match the name
+                    "3gpp-tsgct-ct4",  # (particularly use of WG)
+                    "3gpp-tsgran",
+                    "3gpp-tsgran-ran2",
+                    "3gpp-tsgsa",  # duplicates 3gpp-tsg-sa above
+                    "3gpp-tsgsa-sa2",  # will normalize
+                    "3gpp-tsgsa-sa3",
+                    "3gpp-tsgsa-sa4",
+                    "3gpp-tsgt-wg2",
+                ]
+            ).count()
+            == 16,
+            not Group.objects.filter(
+                acronym__in=[
+                    "3gpp-tsg-ran-wg3",
+                    "3gpp-tsg-ct-wg1",
+                    "3gpp-tsg-ct-wg3",
+                    "3gpp-tsg-ct-wg4",
+                    "3gpp-tsg-ran",
+                    "3gpp-tsg-ran-wg2",
+                    "3gpp-tsg-sa-wg2",
+                    "3gpp-tsg-sa-wg3",
+                    "3gpp-tsg-sa-wg4",
+                    "3gpp-tsg-t-wg2",
+                ]
+            ).exists(),
+            Group.objects.filter(acronym="o3gpptsgran3").exists(),
+            not LiaisonStatement.objects.filter(
+                to_groups__acronym__in=["3gpp-tsgct", "3gpp-tsgsa"]
+            ).exists(),
+            not LiaisonStatement.objects.filter(
+                from_groups__acronym="3gpp-tsgct"
+            ).exists(),
+            LiaisonStatement.objects.filter(from_groups__acronym="3gpp-tsgsa").count()
+            == 1,
+            LiaisonStatement.objects.get(from_groups__acronym="3gpp-tsgsa").pk == 1448,
+        ]
+    ):
+        for old_acronym, new_acronym, new_name in (
+            ("o3gpptsgran3", "3gpp-tsg-ran-wg3", "3GPP TSG RAN WG3"),
+            ("3gpp-tsgct-ct1", "3gpp-tsg-ct-wg1", "3GPP TSG CT WG1"),
+            ("3gpp-tsgct-ct3", "3gpp-tsg-ct-wg3", "3GPP TSG CT WG3"),
+            ("3gpp-tsgct-ct4", "3gpp-tsg-ct-wg4", "3GPP TSG CT WG4"),
+            ("3gpp-tsgran", "3gpp-tsg-ran", "3GPP TSG RAN"),
+            ("3gpp-tsgran-ran2", "3gpp-tsg-ran-wg2", "3GPP TSG RAN WG2"),
+            ("3gpp-tsgsa-sa2", "3gpp-tsg-sa-wg2", "3GPP TSG SA WG2"),
+            ("3gpp-tsgsa-sa3", "3gpp-tsg-sa-wg3", "3GPP TSG SA WG3"),
+            ("3gpp-tsgsa-sa4", "3gpp-tsg-sa-wg4", "3GPP TSG SA WG4"),
+            ("3gpp-tsgt-wg2", "3gpp-tsg-t-wg2", "3GPP TSG T WG2"),
+        ):
+            group = Group.objects.get(acronym=old_acronym)
+            save_group_in_history(group)
+            group.time = timezone.now()
+            group.acronym = new_acronym
+            group.name = new_name
+            if old_acronym.startswith("3gpp-tsgct-"):
+                group.parent = Group.objects.get(acronym="3gpp-tsg-ct")
+            elif old_acronym.startswith("3gpp-tsgsa-"):
+                group.parent = Group.objects.get(acronym="3gpp-tsg-sa")
+            group.save()
+            group.groupevent_set.create(
+                time=group.time,
+                by_id=1,  # (System)
+                type="info_changed",
+                desc=f"acronym changed from {old_acronym} to {new_acronym}, name set to {new_name}",
+            )
+
+        for acronym, new_name in (("3gpp-tsg-ct", "3GPP TSG CT"),):
+            group = Group.objects.get(acronym=acronym)
+            save_group_in_history(group)
+            group.time = timezone.now()
+            group.name = new_name
+            group.save()
+            group.groupevent_set.create(
+                time=group.time,
+                by_id=1,  # (System)
+                type="info_changed",
+                desc=f"name set to {new_name}",
+            )
+
+        ls = LiaisonStatement.objects.get(pk=1448)
+        ls.from_groups.remove(Group.objects.get(acronym="3gpp-tsgsa"))
+        ls.from_groups.add(Group.objects.get(acronym="3gpp-tsg-sa"))
+
+        # Rewriting history to effectively merge the histories of the duplicate groups
+        GroupHistory.objects.filter(parent__acronym="3gpp-tsgsa").update(
+            parent=Group.objects.get(acronym="3gpp-tsg-sa")
+        )
+        GroupHistory.objects.filter(parent__acronym="3gpp-tsgct").update(
+            parent=Group.objects.get(acronym="3gpp-tsg-ct")
+        )
+
+        deleted = Group.objects.filter(
+            acronym__in=["3gpp-tsgsa", "3gpp-tsgct"]
+        ).delete()
+        log.log(f"Deleted Groups: {deleted}")
+    else:
+        log.log("* Refusing to continue as preconditions have changed")
diff --git a/ietf/group/templatetags/group_filters.py b/ietf/group/templatetags/group_filters.py
index e7fb4a1819..bf2ad71949 100644
--- a/ietf/group/templatetags/group_filters.py
+++ b/ietf/group/templatetags/group_filters.py
@@ -2,7 +2,7 @@
 
 import debug                            # pyflakes:ignore
 
-from ietf.group.models import Group
+from ietf.nomcom.models import NomCom
 
 register = template.Library()
 
@@ -19,14 +19,15 @@ def active_nomcoms(user):
     if not (user and hasattr(user, "is_authenticated") and user.is_authenticated):
         return []
 
-    groups = []
-
-    groups.extend(Group.objects.filter(
-        role__person__user=user,
-        type_id='nomcom',
-        state__slug='active').distinct().select_related("type"))
-
-    return groups
+    return list(
+        NomCom.objects.filter(
+            group__role__person__user=user,
+            group__type_id='nomcom',  # just in case...
+            group__state__slug='active',
+        )
+        .distinct()
+        .order_by("group__acronym")
+    )
 
 @register.inclusion_tag('person/person_link.html')
 def role_person_link(role, **kwargs):
@@ -36,3 +37,10 @@ def role_person_link(role, **kwargs):
     plain_name = role.person.plain_name()
     email = role.email.address
     return {'name': name, 'plain_name': plain_name, 'email': email, 'title': title, 'class': cls}
+
+@register.filter
+def name_with_conditional_acronym(group):
+    if group.type_id in ("sdo", "isoc", "individ", "nomcom", "ietf", "irtf", ):
+        return group.name
+    else:
+        return f"{group.name} ({group.acronym})"
diff --git a/ietf/group/tests.py b/ietf/group/tests.py
index b168e4d3b0..229744388c 100644
--- a/ietf/group/tests.py
+++ b/ietf/group/tests.py
@@ -1,28 +1,31 @@
 # Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import io
-import os
 import datetime
 import json
+from unittest import mock
 
-from tempfile import NamedTemporaryFile
-
-from django.core.management import call_command
-from django.conf import settings
 from django.urls import reverse as urlreverse
 from django.db.models import Q
 from django.test import Client
+from django.utils import timezone
 
 import debug                             # pyflakes:ignore
 
-from ietf.doc.factories import DocumentFactory, WgDraftFactory
-from ietf.doc.models import DocEvent, RelatedDocument
+from ietf.doc.factories import DocumentFactory, WgDraftFactory, EditorialDraftFactory
+from ietf.doc.models import DocEvent, RelatedDocument, Document
 from ietf.group.models import Role, Group
-from ietf.group.utils import get_group_role_emails, get_child_group_role_emails, get_group_ad_emails
+from ietf.group.utils import (
+    get_group_role_emails,
+    get_child_group_role_emails,
+    get_group_ad_emails,
+    get_group_email_aliases,
+    GroupAliasGenerator,
+    role_holder_emails,
+)
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.person.factories import PersonFactory, EmailFactory
-from ietf.person.models import Person
+from ietf.person.models import Email, Person
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 
 class StreamTests(TestCase):
@@ -40,6 +43,11 @@ def test_stream_documents(self):
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
 
+        EditorialDraftFactory() # Quick way to ensure RSWG exists.
+        r = self.client.get(urlreverse("ietf.group.views.stream_documents", kwargs=dict(acronym="editorial")))
+        self.assertRedirects(r, expected_url=urlreverse('ietf.group.views.group_documents',kwargs={"acronym":"rswg"}))
+
+
     def test_stream_edit(self):
         EmailFactory(address="ad2@ietf.org")
 
@@ -57,13 +65,86 @@ def test_stream_edit(self):
         self.assertTrue(Role.objects.filter(name="delegate", group__acronym=stream_acronym, email__address="ad2@ietf.org"))
 
 
+class GroupLeadershipTests(TestCase):
+    def test_leadership_wg(self):
+        # setup various group states
+        bof_role = RoleFactory(
+            group__type_id="wg", group__state_id="bof", name_id="chair"
+        )
+        proposed_role = RoleFactory(
+            group__type_id="wg", group__state_id="proposed", name_id="chair"
+        )
+        active_role = RoleFactory(
+            group__type_id="wg", group__state_id="active", name_id="chair"
+        )
+        conclude_role = RoleFactory(
+            group__type_id="wg", group__state_id="conclude", name_id="chair"
+        )
+        url = urlreverse(
+            "ietf.group.views.group_leadership", kwargs={"group_type": "wg"}
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, "Group Leadership")
+        self.assertContains(r, bof_role.person.last_name())
+        self.assertContains(r, proposed_role.person.last_name())
+        self.assertContains(r, active_role.person.last_name())
+        self.assertNotContains(r, conclude_role.person.last_name())
+
+    def test_leadership_wg_csv(self):
+        url = urlreverse(
+            "ietf.group.views.group_leadership_csv", kwargs={"group_type": "wg"}
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r["Content-Type"], "text/csv")
+        self.assertContains(r, "Chairman, Sops")
+
+    def test_leadership_rg(self):
+        role = RoleFactory(group__type_id="rg", name_id="chair")
+        url = urlreverse(
+            "ietf.group.views.group_leadership", kwargs={"group_type": "rg"}
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, "Group Leadership")
+        self.assertContains(r, role.person.last_name())
+        self.assertNotContains(r, "Chairman, Sops")
+
+
+class GroupStatsTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        a = WgDraftFactory()
+        b = WgDraftFactory()
+        RelatedDocument.objects.create(
+            source=a, target=b, relationship_id="refnorm"
+        )
+
+    def test_group_stats(self):
+        client = Client(Accept="application/json")
+        url = urlreverse("ietf.group.views.group_stats_data")
+        r = client.get(url)
+        self.assertTrue(r.status_code == 200, "Failed to receive group stats")
+        self.assertGreater(len(r.content), 0, "Group stats have no content")
+
+        try:
+            data = json.loads(r.content)
+        except Exception as e:
+            self.fail("JSON load failed: %s" % e)
+
+        ids = [d["id"] for d in data]
+        for doc in Document.objects.all():
+            self.assertIn(doc.name, ids)
+
+
 class GroupDocDependencyTests(TestCase):
     def setUp(self):
         super().setUp()
         a = WgDraftFactory()
         b = WgDraftFactory()
         RelatedDocument.objects.create(
-            source=a, target=b.docalias.first(), relationship_id="refnorm"
+            source=a, target=b, relationship_id="refnorm"
         )
 
     def test_group_document_dependencies(self):
@@ -96,27 +177,15 @@ def test_group_document_dependencies(self):
 
 
 class GenerateGroupAliasesTests(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.doc_aliases_file = NamedTemporaryFile(delete=False, mode='w+')
-        self.doc_aliases_file.close()
-        self.doc_virtual_file = NamedTemporaryFile(delete=False, mode='w+')
-        self.doc_virtual_file.close()
-        self.saved_draft_aliases_path = settings.GROUP_ALIASES_PATH
-        self.saved_draft_virtual_path = settings.GROUP_VIRTUAL_PATH
-        settings.GROUP_ALIASES_PATH = self.doc_aliases_file.name
-        settings.GROUP_VIRTUAL_PATH = self.doc_virtual_file.name
-        
-    def tearDown(self):
-        settings.GROUP_ALIASES_PATH = self.saved_draft_aliases_path
-        settings.GROUP_VIRTUAL_PATH = self.saved_draft_virtual_path
-        os.unlink(self.doc_aliases_file.name)
-        os.unlink(self.doc_virtual_file.name)
-        super().tearDown()
-
-    def testManagementCommand(self):
-        a_month_ago = datetime.datetime.now() - datetime.timedelta(30)
-        a_decade_ago = datetime.datetime.now() - datetime.timedelta(3650)
+    def test_generator_class(self):
+        """The GroupAliasGenerator should generate the same lists as the old mgmt cmd"""
+        # clean out test fixture group roles we don't need for this test
+        Role.objects.filter(
+            group__acronym__in=["farfut", "iab", "ietf", "irtf", "ise", "ops", "rsab", "rsoc", "sops"]
+        ).delete()
+    
+        a_month_ago = timezone.now() - datetime.timedelta(30)
+        a_decade_ago = timezone.now() - datetime.timedelta(3650)
         role1 = RoleFactory(name_id='ad', group__type_id='area', group__acronym='myth', group__state_id='active')
         area = role1.group
         ad = role1.person
@@ -131,83 +200,100 @@ def testManagementCommand(self):
         recent = GroupFactory(type_id='wg', acronym='recent', parent=area, state_id='conclude', time=a_month_ago)
         recentchair = PersonFactory(user__username='recentchair')
         recent.role_set.create(name_id='chair', person=recentchair, email=recentchair.email())
-        wayold = GroupFactory(type_id='wg', acronym='recent', parent=area, state_id='conclude', time=a_decade_ago)
+        wayold = GroupFactory(type_id='wg', acronym='wayold', parent=area, state_id='conclude', time=a_decade_ago)
         wayoldchair = PersonFactory(user__username='wayoldchair')
         wayold.role_set.create(name_id='chair', person=wayoldchair, email=wayoldchair.email())
-        role2 = RoleFactory(name_id='ad', group__type_id='area', group__acronym='done', group__state_id='conclude')
-        done = role2.group
-        done_ad = role2.person
+        # create a "done" group that should not be included anywhere
+        RoleFactory(name_id='ad', group__type_id='area', group__acronym='done', group__state_id='conclude')
         irtf = Group.objects.get(acronym='irtf')
         testrg = GroupFactory(type_id='rg', acronym='testrg', parent=irtf)
         testrgchair = PersonFactory(user__username='testrgchair')
         testrg.role_set.create(name_id='chair', person=testrgchair, email=testrgchair.email())
-        individual = PersonFactory()
-
-        args = [ ]
-        kwargs = { }
-        out = io.StringIO()
-        call_command("generate_group_aliases", *args, **kwargs, stdout=out, stderr=out)
-        self.assertFalse(out.getvalue())
-
-        with open(settings.GROUP_ALIASES_PATH) as afile:
-            acontent = afile.read()
-            self.assertTrue('xfilter-' + area.acronym + '-ads' in acontent)
-            self.assertTrue('xfilter-' + area.acronym + '-chairs' in acontent)
-            self.assertTrue('xfilter-' + mars.acronym + '-ads' in acontent)
-            self.assertTrue('xfilter-' + mars.acronym + '-chairs' in acontent)
-            self.assertTrue('xfilter-' + ames.acronym + '-ads' in acontent)
-            self.assertTrue('xfilter-' + ames.acronym + '-chairs' in acontent)
-            self.assertTrue(all([x in acontent for x in [
-                'xfilter-' + area.acronym + '-ads',
-                'xfilter-' + area.acronym + '-chairs',
-                'xfilter-' + mars.acronym + '-ads',
-                'xfilter-' + mars.acronym + '-chairs',
-                'xfilter-' + ames.acronym + '-ads',
-                'xfilter-' + ames.acronym + '-chairs',
-                'xfilter-' + recent.acronym + '-ads',
-                'xfilter-' + recent.acronym + '-chairs',
-            ]]))
-            self.assertFalse(all([x in acontent for x in [
-                'xfilter-' + done.acronym + '-ads',
-                'xfilter-' + done.acronym + '-chairs',
-                'xfilter-' + wayold.acronym + '-ads',
-                'xfilter-' + wayold.acronym + '-chairs',
-            ]]))
-
-        with open(settings.GROUP_VIRTUAL_PATH) as vfile:
-            vcontent = vfile.read()
-            self.assertTrue(all([x in vcontent for x in [
-                ad.email_address(),
-                marschair.email_address(),
-                marssecr.email_address(),
-                ameschair.email_address(),
-                recentchair.email_address(),
-                testrgchair.email_address(),
-            ]]))
-            self.assertFalse(all([x in vcontent for x in [
-                done_ad.email_address(),
-                wayoldchair.email_address(),
-                individual.email_address(),
-            ]]))
-            self.assertTrue(all([x in vcontent for x in [
-                'xfilter-' + area.acronym + '-ads',
-                'xfilter-' + area.acronym + '-chairs',
-                'xfilter-' + mars.acronym + '-ads',
-                'xfilter-' + mars.acronym + '-chairs',
-                'xfilter-' + ames.acronym + '-ads',
-                'xfilter-' + ames.acronym + '-chairs',
-                'xfilter-' + recent.acronym + '-ads',
-                'xfilter-' + recent.acronym + '-chairs',
-                'xfilter-' + testrg.acronym + '-chairs',
-                testrg.acronym + '-chairs@ietf.org',
-                testrg.acronym + '-chairs@irtf.org',
-            ]]))
-            self.assertFalse(all([x in vcontent for x in [
-                'xfilter-' + done.acronym + '-ads',
-                'xfilter-' + done.acronym + '-chairs',
-                'xfilter-' + wayold.acronym + '-ads',
-                'xfilter-' + wayold.acronym + '-chairs',
-            ]]))
+        testrag = GroupFactory(type_id='rg', acronym='testrag', parent=irtf)
+        testragchair = PersonFactory(user__username='testragchair')
+        testrag.role_set.create(name_id='chair', person=testragchair, email=testragchair.email())
+
+        output = [(alias, (domains, alist)) for alias, domains, alist in GroupAliasGenerator()]
+        alias_dict = dict(output)
+        self.maxDiff = None
+        self.assertEqual(len(alias_dict), len(output))  # no duplicate aliases
+        expected_dict = {
+            area.acronym + "-ads": (["ietf"], [ad.email_address()]),
+            area.acronym + "-chairs": (["ietf"], [ad.email_address(), marschair.email_address(), marssecr.email_address(), ameschair.email_address()]),
+            mars.acronym + "-ads": (["ietf"], [ad.email_address()]),
+            mars.acronym + "-chairs": (["ietf"], [marschair.email_address(), marssecr.email_address()]),
+            ames.acronym + "-ads": (["ietf"], [ad.email_address()]),
+            ames.acronym + "-chairs": (["ietf"], [ameschair.email_address()]),
+            recent.acronym + "-ads": (["ietf"], [ad.email_address()]),
+            recent.acronym + "-chairs": (["ietf"], [recentchair.email_address()]),
+            testrg.acronym + "-chairs": (["ietf", "irtf"], [testrgchair.email_address()]),
+            testrag.acronym + "-chairs": (["ietf", "irtf"], [testragchair.email_address()]),
+        }
+        # Sort lists for comparison
+        self.assertEqual(
+            {k: (sorted(doms), sorted(addrs)) for k, (doms, addrs) in alias_dict.items()},
+            {k: (sorted(doms), sorted(addrs)) for k, (doms, addrs) in expected_dict.items()},
+        )
+
+    @mock.patch("ietf.group.utils.GroupAliasGenerator")
+    def test_get_group_email_aliases(self, mock_alias_gen_cls):
+        GroupFactory(name="agroup", type_id="rg")
+        GroupFactory(name="bgroup")
+        GroupFactory(name="cgroup", type_id="rg")
+        GroupFactory(name="dgroup")
+
+        mock_alias_gen_cls.return_value = [
+            ("bgroup-chairs", ["ietf"], ["c1@example.com", "c2@example.com"]),
+            ("agroup-ads", ["ietf", "irtf"], ["ad@example.com"]),
+            ("bgroup-ads", ["ietf"], ["ad@example.com"]),
+        ]
+        # order is important - should be by acronym, otherwise left in order returned by generator
+        self.assertEqual(
+            get_group_email_aliases(None, None),
+            [
+                {
+                    "acronym": "agroup",
+                    "alias_type": "-ads",
+                    "expansion": "ad@example.com",
+                },
+                {
+                    "acronym": "bgroup",
+                    "alias_type": "-chairs",
+                    "expansion": "c1@example.com, c2@example.com",
+                },
+                {
+                    "acronym": "bgroup",
+                    "alias_type": "-ads",
+                    "expansion": "ad@example.com",
+                },
+            ],
+        )
+        self.assertQuerySetEqual(
+            mock_alias_gen_cls.call_args[0][0],
+            Group.objects.all(),
+            ordered=False,
+        )
+
+        # test other parameter combinations but we already checked that the alias generator's
+        # output will be passed through, so don't re-test the processing
+        get_group_email_aliases("agroup", None)
+        self.assertQuerySetEqual(
+            mock_alias_gen_cls.call_args[0][0],
+            Group.objects.filter(acronym="agroup"),
+            ordered=False,
+        )
+        get_group_email_aliases(None, "wg")
+        self.assertQuerySetEqual(
+            mock_alias_gen_cls.call_args[0][0],
+            Group.objects.filter(type_id="wg"),
+            ordered=False,
+        )
+        get_group_email_aliases("agroup", "wg")
+        self.assertQuerySetEqual(
+            mock_alias_gen_cls.call_args[0][0],
+            Group.objects.none(),
+            ordered=False,
+        )
 
 
 class GroupRoleEmailTests(TestCase):
@@ -247,3 +333,41 @@ def test_group_ad_emails(self):
             self.assertGreater(len(emails), 0)
             for item in emails:
                 self.assertIn('@', item)
+
+    def test_role_holder_emails(self):
+        # The test fixtures create a bunch of addresses that pollute this test's results - disable them
+        Email.objects.update(active=False)
+
+        role_holders = [
+            RoleFactory(name_id="member", group__type_id=gt).person
+            for gt in [
+                "ag",
+                "area",
+                "dir",
+                "iab",
+                "ietf",
+                "irtf",
+                "nomcom",
+                "rg",
+                "team",
+                "wg",
+                "rag",
+            ]
+        ]
+        # Expect an additional active email to be included
+        EmailFactory(
+            person=role_holders[0],
+            active=True,
+        )
+        # Do not expect an inactive email to be included
+        EmailFactory(
+            person=role_holders[1],
+            active=False,
+        )
+        # Do not expect address on a role-holder for a different group type
+        RoleFactory(name_id="member", group__type_id="adhoc")  # arbitrary type not in the of-interest list
+        
+        self.assertCountEqual(
+            role_holder_emails(),
+            Email.objects.filter(active=True, person__in=role_holders),
+        )
diff --git a/ietf/group/tests_appeals.py b/ietf/group/tests_appeals.py
new file mode 100644
index 0000000000..ae6c54bf47
--- /dev/null
+++ b/ietf/group/tests_appeals.py
@@ -0,0 +1,71 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+import debug    # pyflakes: ignore
+import datetime
+
+from pyquery import PyQuery
+
+from django.urls import reverse as urlreverse
+
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase
+from ietf.group.factories import (
+    AppealFactory,
+    AppealArtifactFactory,
+)
+class AppealTests(TestCase):
+
+    def test_download_name(self):
+        artifact = AppealArtifactFactory()
+        self.assertEqual(artifact.download_name(),f"{artifact.date}-appeal.md")
+        artifact = AppealArtifactFactory(content_type="application/pdf",artifact_type__slug="response")
+        self.assertEqual(artifact.download_name(),f"{artifact.date}-response.pdf")
+
+
+    def test_appeal_list_view(self):
+        appeal_date = datetime.date.today()-datetime.timedelta(days=14)
+        response_date = appeal_date+datetime.timedelta(days=8)
+        appeal = AppealFactory(name="A name to look for", date=appeal_date)
+        appeal_artifact = AppealArtifactFactory(appeal=appeal, artifact_type__slug="appeal", date=appeal_date)
+        response_artifact = AppealArtifactFactory(appeal=appeal, artifact_type__slug="response", content_type="application/pdf", date=response_date)
+
+        url = urlreverse("ietf.group.views.appeals", kwargs=dict(acronym="iab"))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("#appeals > tbody > tr")), 1)
+        self.assertEqual(q("#appeal-1-date").text(), f"{appeal_date}")
+        self.assertEqual(f"{appeal_artifact.display_title()} - {appeal_date}", q("#artifact-1-1").text())
+        self.assertEqual(f"{response_artifact.display_title()} - {response_date}", q("#artifact-1-2").text())
+        self.assertIsNone(q("#artifact-1-1").attr("download"))
+        self.assertEqual(q("#artifact-1-2").attr("download"), response_artifact.download_name())
+
+    def test_markdown_view(self):
+        artifact = AppealArtifactFactory()
+        url = urlreverse("ietf.group.views.appeal_artifact", kwargs=dict(acronym="iab", artifact_id=artifact.pk))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(q("#content>p>strong").text(),"Markdown")
+        self.assertIsNone(q("#content a").attr("download"))
+        self.client.login(username='secretary', password='secretary+password')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(q("#content a").attr("download"), artifact.download_name())
+
+    def test_markdown_download(self):
+        artifact = AppealArtifactFactory()
+        url = urlreverse("ietf.group.views.appeal_artifact_markdown", kwargs=dict(acronym="iab", artifact_id=artifact.pk))
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertContains(r, "**Markdown**", status_code=200)
+
+    def test_pdf_download(self):
+        artifact = AppealArtifactFactory(content_type="application/pdf") # The bits won't _really_ be pdf
+        url = urlreverse("ietf.group.views.appeal_artifact", kwargs=dict(acronym="iab", artifact_id=artifact.pk))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.get("Content-Disposition"), f'attachment; filename="{artifact.download_name()}"')
+        self.assertEqual(r.get("Content-Type"), artifact.content_type)
+        self.assertEqual(r.content, artifact.bits.tobytes())
+
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index 0b3ead2c74..3f24e2e3d6 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -1,22 +1,23 @@
-# Copyright The IETF Trust 2009-2022, All Rights Reserved
+# Copyright The IETF Trust 2009-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-import os
 import calendar
 import datetime
 import io
 import bleach
+from unittest import mock
 
-from unittest.mock import patch
+from unittest.mock import call, patch
 from pathlib import Path
 from pyquery import PyQuery
-from tempfile import NamedTemporaryFile
 
 import debug                            # pyflakes:ignore
 
 from django.conf import settings
+from django.http import Http404, HttpResponse
 from django.test import RequestFactory
+from django.test.utils import override_settings
 from django.urls import reverse as urlreverse
 from django.urls import NoReverseMatch
 from django.utils import timezone
@@ -26,14 +27,17 @@
 
 from ietf.community.models import CommunityList
 from ietf.community.utils import reset_name_contains_index_for_rule
-from ietf.doc.factories import WgDraftFactory, IndividualDraftFactory, CharterFactory, BallotDocEventFactory
-from ietf.doc.models import Document, DocAlias, DocEvent, State
+from ietf.doc.factories import WgDraftFactory, RgDraftFactory, IndividualDraftFactory, CharterFactory, BallotDocEventFactory
+from ietf.doc.models import Document, DocEvent, State
+from ietf.doc.storage_utils import retrieve_str
 from ietf.doc.utils_charter import charter_name_for_group
 from ietf.group.admin import GroupForm as AdminGroupForm
 from ietf.group.factories import (GroupFactory, RoleFactory, GroupEventFactory, 
     DatedGroupMilestoneFactory, DatelessGroupMilestoneFactory)
 from ietf.group.forms import GroupForm
 from ietf.group.models import Group, GroupEvent, GroupMilestone, GroupStateTransitions, Role
+from ietf.group.tasks import generate_wg_charters_files_task, generate_wg_summary_files_task
+from ietf.group.views import response_from_file
 from ietf.group.utils import save_group_in_history, setup_default_community_list_for_group
 from ietf.meeting.factories import SessionFactory
 from ietf.name.models import DocTagName, GroupStateName, GroupTypeName, ExtResourceName, RoleName
@@ -42,6 +46,8 @@
 from ietf.review.factories import ReviewRequestFactory, ReviewAssignmentFactory
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent, reload_db_objects
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
+
 
 def group_urlreverse_list(group, viewname):
     return [
@@ -54,7 +60,13 @@ def pklist(docs):
     return [ str(doc.pk) for doc in docs.all() ]
 
 class GroupPagesTests(TestCase):
-    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['CHARTER_PATH']
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + [
+        "CHARTER_PATH",
+        "CHARTER_COPY_PATH",
+        "CHARTER_COPY_OTHER_PATH", # Note: not explicitly testing use of 
+        "CHARTER_COPY_THIRD_PATH", #       either of these settings
+        "GROUP_SUMMARY_PATH",
+    ]
 
     def test_active_groups(self):
         area = GroupFactory.create(type_id='area')
@@ -69,7 +81,7 @@ def test_active_groups(self):
         self.assertContains(r, group.name)
         self.assertContains(r, escape(group.ad_role().person.name))
 
-        for t in ('rg','area','ag', 'rag', 'dir','review','team','program','iabasg','adm','rfcedtyp'):
+        for t in ('rg','area','ag', 'rag', 'dir','review','team','program','iabasg','iabworkshop','adm','rfcedtyp'): # See issue 5120
             g = GroupFactory.create(type_id=t,state_id='active') 
             if t in ['dir','review']:
                 g.parent = GroupFactory.create(type_id='area',state_id='active')
@@ -78,6 +90,12 @@ def test_active_groups(self):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             self.assertContains(r, g.acronym)
+            if t == "area":
+                q = PyQuery(r.content)
+                wg_url = urlreverse("ietf.group.views.active_groups", kwargs=dict(group_type="wg"))
+                href = f"{wg_url}#{g.acronym.upper()}"
+                self.assertEqual(q(f"h2#id-{g.acronym} a").attr("href"), href)
+                self.assertEqual(q(f'h2#id-{g.acronym} a[href="{href}"]').text(), f"({g.acronym.upper()})")
 
         url = urlreverse('ietf.group.views.active_groups', kwargs=dict())
         r = self.client.get(url)
@@ -85,7 +103,7 @@ def test_active_groups(self):
         self.assertContains(r, "Directorate")
         self.assertContains(r, "AG")
 
-        for slug in GroupTypeName.objects.exclude(slug__in=['wg','rg','ag','rag','area','dir','review','team','program','adhoc','ise','adm','iabasg','rfcedtyp']).values_list('slug',flat=True):
+        for slug in GroupTypeName.objects.exclude(slug__in=['wg','rg','ag','rag','area','dir','review','team','program','adhoc','ise','adm','iabasg','iabworkshop','rfcedtyp', 'edwg', 'edappr']).values_list('slug',flat=True):
             with self.assertRaises(NoReverseMatch):
                 url=urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type=slug))
 
@@ -108,48 +126,204 @@ def test_group_home(self):
             self.assertContains(r, draft.name)
             self.assertContains(r, draft.title)
 
-    def test_wg_summaries(self):
-        group = CharterFactory(group__type_id='wg',group__parent=GroupFactory(type_id='area')).group
-        RoleFactory(group=group,name_id='chair',person=PersonFactory())
-        RoleFactory(group=group,name_id='ad',person=PersonFactory())
+    def test_response_from_file(self):
+        # n.b., GROUP_SUMMARY_PATH is a temp dir that will be cleaned up automatically
+        fp = Path(settings.GROUP_SUMMARY_PATH) / "some-file.txt"
+        fp.write_text("This is a charters file with an é")
+        r = response_from_file(fp)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.headers["Content-Type"], "text/plain; charset=utf-8")
+        self.assertEqual(r.content.decode("utf8"), "This is a charters file with an é")
+        # now try with a nonexistent file
+        fp.unlink()
+        with self.assertRaises(Http404):
+            response_from_file(fp)
+
+    @patch("ietf.group.views.response_from_file")
+    def test_wg_summary_area(self, mock):
+        r = self.client.get(
+            urlreverse("ietf.group.views.wg_summary_area", kwargs={"group_type": "rg"})
+        )  # not wg
+        self.assertEqual(r.status_code, 404)
+        self.assertFalse(mock.called)
+        mock.return_value = HttpResponse("yay")
+        r = self.client.get(
+            urlreverse("ietf.group.views.wg_summary_area", kwargs={"group_type": "wg"})
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content.decode(), "yay")
+        self.assertEqual(mock.call_args, call(Path(settings.GROUP_SUMMARY_PATH) / "1wg-summary.txt"))
+
+    @patch("ietf.group.views.response_from_file")
+    def test_wg_summary_acronym(self, mock):
+        r = self.client.get(
+            urlreverse(
+                "ietf.group.views.wg_summary_acronym", kwargs={"group_type": "rg"}
+            )
+        )  # not wg
+        self.assertEqual(r.status_code, 404)
+        self.assertFalse(mock.called)
+        mock.return_value = HttpResponse("yay")
+        r = self.client.get(
+            urlreverse(
+                "ietf.group.views.wg_summary_acronym", kwargs={"group_type": "wg"}
+            )
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content.decode(), "yay")
+        self.assertEqual(
+            mock.call_args, call(Path(settings.GROUP_SUMMARY_PATH) / "1wg-summary-by-acronym.txt")
+        )
 
+    @patch("ietf.group.views.response_from_file")
+    def test_wg_charters(self, mock):
+        r = self.client.get(
+            urlreverse("ietf.group.views.wg_charters", kwargs={"group_type": "rg"})
+        )  # not wg
+        self.assertEqual(r.status_code, 404)
+        self.assertFalse(mock.called)
+        mock.return_value = HttpResponse("yay")
+        r = self.client.get(
+            urlreverse("ietf.group.views.wg_charters", kwargs={"group_type": "wg"})
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content.decode(), "yay")
+        self.assertEqual(mock.call_args, call(Path(settings.CHARTER_PATH) / "1wg-charters.txt"))
+
+    @patch("ietf.group.views.response_from_file")
+    def test_wg_charters_by_acronym(self, mock):
+        r = self.client.get(
+            urlreverse(
+                "ietf.group.views.wg_charters_by_acronym", kwargs={"group_type": "rg"}
+            )
+        )  # not wg
+        self.assertEqual(r.status_code, 404)
+        self.assertFalse(mock.called)
+        mock.return_value = HttpResponse("yay")
+        r = self.client.get(
+            urlreverse(
+                "ietf.group.views.wg_charters_by_acronym", kwargs={"group_type": "wg"}
+            )
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content.decode(), "yay")
+        self.assertEqual(
+            mock.call_args, call(Path(settings.CHARTER_PATH) / "1wg-charters-by-acronym.txt")
+        )
+
+    def test_generate_wg_charters_files_task(self):
+        group = CharterFactory(
+            group__type_id="wg", group__parent=GroupFactory(type_id="area")
+        ).group
+        RoleFactory(group=group, name_id="chair", person=PersonFactory())
+        RoleFactory(group=group, name_id="ad", person=PersonFactory())
         chair = Email.objects.filter(role__group=group, role__name="chair")[0]
+        (
+            Path(settings.CHARTER_PATH) / f"{group.charter.name}-{group.charter.rev}.txt"
+        ).write_text("This is a charter.")
 
-        with (Path(settings.CHARTER_PATH) / ("%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev))).open("w") as f:
-            f.write("This is a charter.")
+        generate_wg_charters_files_task()
+        wg_charters_contents = (Path(settings.CHARTER_PATH) / "1wg-charters.txt").read_text(
+            encoding="utf8"
+        )
+        self.assertIn(group.acronym, wg_charters_contents)
+        self.assertIn(group.name, wg_charters_contents)
+        self.assertIn(group.ad_role().person.plain_name(), wg_charters_contents)
+        self.assertIn(chair.address, wg_charters_contents)
+        self.assertIn("This is a charter.", wg_charters_contents)
+        wg_charters_copy = (
+            Path(settings.CHARTER_COPY_PATH) / "1wg-charters.txt"
+        ).read_text(encoding="utf8")
+        self.assertEqual(wg_charters_copy, wg_charters_contents)
+
+        wg_charters_by_acronym_contents = (
+            Path(settings.CHARTER_PATH) / "1wg-charters-by-acronym.txt"
+        ).read_text(encoding="utf8")
+        self.assertIn(group.acronym, wg_charters_by_acronym_contents)
+        self.assertIn(group.name, wg_charters_by_acronym_contents)
+        self.assertIn(group.ad_role().person.plain_name(), wg_charters_by_acronym_contents)
+        self.assertIn(chair.address, wg_charters_by_acronym_contents)
+        self.assertIn("This is a charter.", wg_charters_by_acronym_contents)
+        wg_charters_by_acronymcopy = (
+            Path(settings.CHARTER_COPY_PATH) / "1wg-charters-by-acronym.txt"
+        ).read_text(encoding="utf8")
+        self.assertEqual(wg_charters_by_acronymcopy, wg_charters_by_acronym_contents)
+
+    def test_generate_wg_charters_files_task_without_copy(self):
+        """Test disabling charter file copying
+
+        Note that these tests mostly check that errors are not encountered. Because they unset
+        the CHARTER_COPY_PATH or set it to a non-directory destination, it's not clear where to
+        look to see whether the files were (incorrectly) copied somewhere.
+        """
+        group = CharterFactory(
+            group__type_id="wg", group__parent=GroupFactory(type_id="area")
+        ).group
+        (
+            Path(settings.CHARTER_PATH) / f"{group.charter.name}-{group.charter.rev}.txt"
+        ).write_text("This is a charter.")
+
+        # No directory set
+        with override_settings():
+            del settings.CHARTER_COPY_PATH
+            generate_wg_charters_files_task()
+        # n.b., CHARTER_COPY_PATH is set again outside the with block
+        self.assertTrue((Path(settings.CHARTER_PATH) / "1wg-charters.txt").exists())
+        self.assertFalse((Path(settings.CHARTER_COPY_PATH) / "1wg-charters.txt").exists())
+        self.assertTrue(
+            (Path(settings.CHARTER_PATH) / "1wg-charters-by-acronym.txt").exists()
+        )
+        self.assertFalse(
+            (Path(settings.CHARTER_COPY_PATH) / "1wg-charters-by-acronym.txt").exists()
+        )
+        (Path(settings.CHARTER_PATH) / "1wg-charters.txt").unlink()
+        (Path(settings.CHARTER_PATH) / "1wg-charters-by-acronym.txt").unlink()
+
+        # Set to a file, not a directory
+        not_a_dir = Path(settings.CHARTER_COPY_PATH) / "not-a-dir.txt"
+        not_a_dir.write_text("Not a dir")
+        with override_settings(CHARTER_COPY_PATH=str(not_a_dir)):
+            generate_wg_charters_files_task()
+        # n.b., CHARTER_COPY_PATH is set again outside the with block
+        self.assertTrue((Path(settings.CHARTER_PATH) / "1wg-charters.txt").exists())
+        self.assertFalse((Path(settings.CHARTER_COPY_PATH) / "1wg-charters.txt").exists())
+        self.assertTrue(
+            (Path(settings.CHARTER_PATH) / "1wg-charters-by-acronym.txt").exists()
+        )
+        self.assertFalse(
+            (Path(settings.CHARTER_COPY_PATH) / "1wg-charters-by-acronym.txt").exists()
+        )
+        self.assertEqual(not_a_dir.read_text(), "Not a dir")
 
-        url = urlreverse('ietf.group.views.wg_summary_area', kwargs=dict(group_type="wg"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, group.parent.name)
-        self.assertContains(r, group.acronym)
-        self.assertContains(r, group.name)
-        self.assertContains(r, chair.address)
+    def test_generate_wg_summary_files_task(self):
+        group = CharterFactory(group__type_id='wg',group__parent=GroupFactory(type_id='area')).group
+        RoleFactory(group=group,name_id='chair',person=PersonFactory())
+        RoleFactory(group=group,name_id='ad',person=PersonFactory())
 
-        url = urlreverse('ietf.group.views.wg_summary_acronym', kwargs=dict(group_type="wg"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, group.acronym)
-        self.assertContains(r, group.name)
-        self.assertContains(r, chair.address)
-        
-        url = urlreverse('ietf.group.views.wg_charters', kwargs=dict(group_type="wg"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, group.acronym)
-        self.assertContains(r, group.name)
-        self.assertContains(r, group.ad_role().person.plain_name())
-        self.assertContains(r, chair.address)
-        self.assertContains(r, "This is a charter.")
+        chair = Email.objects.filter(role__group=group, role__name="chair")[0]
 
-        url = urlreverse('ietf.group.views.wg_charters_by_acronym', kwargs=dict(group_type="wg"))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, group.acronym)
-        self.assertContains(r, group.name)
-        self.assertContains(r, group.ad_role().person.plain_name())
-        self.assertContains(r, chair.address)
-        self.assertContains(r, "This is a charter.")
+        generate_wg_summary_files_task()
+
+        for summary_by_area_contents in [
+            (
+                Path(settings.GROUP_SUMMARY_PATH) / "1wg-summary.txt"
+            ).read_text(encoding="utf8"),
+            retrieve_str("indexes", "1wg-summary.txt")
+        ]:
+            self.assertIn(group.parent.name, summary_by_area_contents)
+            self.assertIn(group.acronym, summary_by_area_contents)
+            self.assertIn(group.name, summary_by_area_contents)
+            self.assertIn(chair.address, summary_by_area_contents)
+
+        for summary_by_acronym_contents in [
+            (
+                Path(settings.GROUP_SUMMARY_PATH) / "1wg-summary-by-acronym.txt"
+            ).read_text(encoding="utf8"),
+            retrieve_str("indexes", "1wg-summary-by-acronym.txt")
+        ]:
+            self.assertIn(group.acronym, summary_by_acronym_contents)
+            self.assertIn(group.name, summary_by_acronym_contents)
+            self.assertIn(chair.address, summary_by_acronym_contents)
 
     def test_chartering_groups(self):
         group = CharterFactory(group__type_id='wg',group__parent=GroupFactory(type_id='area'),states=[('charter','intrev')]).group
@@ -239,6 +413,7 @@ def test_group_documents(self):
             self.assertContains(r, draft3.name)
             for ah in draft3.action_holders.all():
                 self.assertContains(r, escape(ah.name))
+            self.assertContains(r, "Active with the IESG Internet-Draft") # draft3 is pub-req hence should have such a divider
             self.assertContains(r, 'for 173 days', count=1)  # the old_dah should be tagged
             self.assertContains(r, draft4.name)
             self.assertNotContains(r, draft5.name)
@@ -251,6 +426,25 @@ def test_group_documents(self):
         q = PyQuery(r.content)
         self.assertTrue(any([draft2.name in x.attrib['href'] for x in q('table td a.track-untrack-doc')]))
 
+        # Let's also check the IRTF stream
+        rg = GroupFactory(type_id='rg')
+        setup_default_community_list_for_group(rg)
+        rgDraft = RgDraftFactory(group=rg)
+        rgDraft4 = RgDraftFactory(group=rg)
+        rgDraft4.set_state(State.objects.get(slug='irsg-w'))
+        rgDraft7 = RgDraftFactory(group=rg)
+        rgDraft7.set_state(State.objects.get(type='draft-stream-%s' % rgDraft7.stream_id, slug='dead'))
+        for url in group_urlreverse_list(rg, 'ietf.group.views.group_documents'):
+            with self.settings(DOC_ACTION_HOLDER_MAX_AGE_DAYS=20):
+                r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            self.assertContains(r, rgDraft.name)
+            self.assertContains(r, rg.name)
+            self.assertContains(r, rg.acronym)
+            self.assertNotContains(r, draft3.name) # As draft3 is a WG draft, it should not be listed here
+            self.assertContains(r, rgDraft4.name)
+            self.assertNotContains(r, rgDraft7.name)
+
         # test the txt version too while we're at it
         for url in group_urlreverse_list(group, 'ietf.group.views.group_documents_txt'):
             r = self.client.get(url)
@@ -262,14 +456,15 @@ def test_group_charter(self):
         group = CharterFactory().group
         draft = WgDraftFactory(group=group)
 
-        with (Path(settings.CHARTER_PATH) / ("%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev))).open("w") as f:
-            f.write("This is a charter.")
+        (
+            Path(settings.CHARTER_PATH) / f"{group.charter.name}-{group.charter.rev}.txt"
+        ).write_text("This is a charter.")
 
         milestone = GroupMilestone.objects.create(
             group=group,
             state_id="active",
             desc="Get Work Done",
-            due=datetime.date.today() + datetime.timedelta(days=100))
+            due=date_today(DEADLINE_TZINFO) + datetime.timedelta(days=100))
         milestone.docs.add(draft)
 
         for url in [group.about_url(),] + group_urlreverse_list(group, 'ietf.group.views.group_about'):
@@ -281,12 +476,6 @@ def test_group_charter(self):
             self.assertContains(r, milestone.desc)
             self.assertContains(r, milestone.docs.all()[0].name)
 
-    def test_about_rendertest(self):
-        group = CharterFactory().group
-        url = urlreverse('ietf.group.views.group_about_rendertest', kwargs=dict(acronym=group.acronym))
-        r = self.client.get(url)
-        self.assertEqual(r.status_code,200)
-
 
     def test_group_about(self):
 
@@ -354,6 +543,25 @@ def verify_can_edit_group(url, group, username):
                 for username in list(set(interesting_users)-set(can_edit[group.type_id])):
                     verify_cannot_edit_group(url, group, username)
 
+    def test_group_about_team_parent(self):
+        """Team about page should show parent when parent is not an area"""
+        GroupFactory(type_id='team', parent=GroupFactory(type_id='area', acronym='gen'))
+        GroupFactory(type_id='team', parent=GroupFactory(type_id='ietf', acronym='iab'))
+        GroupFactory(type_id='team', parent=None)
+
+        for team in Group.objects.filter(type='team').select_related('parent'):
+            url = urlreverse('ietf.group.views.group_about', kwargs=dict(acronym=team.acronym))
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            if team.parent and team.parent.type_id != 'area':
+                self.assertContains(r, 'Parent')
+                self.assertContains(r, team.parent.acronym)
+            elif team.parent and team.parent.type_id == 'area':
+                self.assertContains(r, team.parent.name)
+                self.assertNotContains(r, '>Parent<')
+            else:
+                self.assertNotContains(r, '>Parent<')
+
     def test_group_about_personnel(self):
         """Correct personnel should appear on the group About page"""
         group = GroupFactory()
@@ -389,7 +597,6 @@ def test_materials(self):
             type_id="slides",
         )
         doc.set_state(State.objects.get(type="slides", slug="active"))
-        DocAlias.objects.create(name=doc.name).docs.add(doc)
 
         for url in group_urlreverse_list(group, 'ietf.group.views.materials'):
             r = self.client.get(url)
@@ -476,13 +683,13 @@ def test_nonactive_group_badges(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(q('.badge.bg-warning').text(),"Concluded WG")
+        self.assertEqual(q('.badge.text-bg-warning').text(),"Concluded WG")
         replaced_group = GroupFactory(state_id='replaced')
         url = urlreverse("ietf.group.views.history",kwargs={'acronym':replaced_group.acronym})
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(q('.badge.bg-warning').text(),"Replaced WG")
+        self.assertEqual(q('.badge.text-bg-warning').text(),"Replaced WG")
 
 
 class GroupEditTests(TestCase):
@@ -614,7 +821,7 @@ def test_create_based_on_existing_bof(self):
 
     def test_create_non_chartered_includes_description(self):
         parent = GroupFactory(type_id='area')
-        group_type = GroupTypeName.objects.filter(used=True, features__has_chartering_process=False).first()
+        group_type = GroupTypeName.objects.filter(used=True, features__has_chartering_process=False, features__parent_types='area').first()
         self.assertIsNotNone(group_type)
         url = urlreverse('ietf.group.views.edit', kwargs=dict(group_type=group_type.slug, action="create"))
         login_testing_unauthorized(self, "secretary", url)
@@ -672,8 +879,9 @@ def test_edit_info(self):
         self.assertTrue(len(q('form .is-invalid')) > 0)
         
         # edit info
-        with (Path(settings.CHARTER_PATH) / ("%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev))).open("w") as f:
-            f.write("This is a charter.")
+        (
+            Path(settings.CHARTER_PATH) / f"{group.charter.name}-{group.charter.rev}.txt"
+        ).write_text("This is a charter.")
         area = group.parent
         ad = Person.objects.get(name="Areað Irector")
         state = GroupStateName.objects.get(slug="bof")
@@ -715,7 +923,9 @@ def test_edit_info(self):
         self.assertEqual(group.list_archive, "archive.mars")
         self.assertEqual(group.description, '')
 
-        self.assertTrue((Path(settings.CHARTER_PATH) / ("%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev))).exists())
+        self.assertTrue(
+            (Path(settings.CHARTER_PATH) / f"{group.charter.name}-{group.charter.rev}.txt").exists()
+        )
         self.assertEqual(len(outbox), 2)
         self.assertTrue('Personnel change' in outbox[0]['Subject'])
         for prefix in ['ad1','ad2','aread','marschairman','marsdelegate']:
@@ -876,7 +1086,7 @@ def test_edit_reviewers(self):
         self.assertEqual(r.status_code, 302)
         review_assignment.state_id = 'accepted'
         review_assignment.save()
-        review_req.deadline = datetime.date.today() - datetime.timedelta(days=1)
+        review_req.deadline = date_today(DEADLINE_TZINFO) - datetime.timedelta(days=1)
         review_req.save()
         
         r = self.client.post(url, post_data)
@@ -950,10 +1160,88 @@ def test_edit_description_field(self):
             r = self.client.post(url, {
                 'description': 'Ignored description',
             })
-        self.assertEqual(r.status_code, 302)
+        self.assertEqual(r.status_code, 403)
         group = Group.objects.get(pk=group.pk)  # refresh
         self.assertEqual(group.description, 'Updated description')
 
+    def test_edit_parent(self):
+        group = GroupFactory.create(type_id='wg', parent=GroupFactory.create(type_id='area'))
+        chair = RoleFactory(group=group, name_id='chair').person
+        url = urlreverse('ietf.group.views.edit', kwargs=dict(group_type=group.type_id, acronym=group.acronym, action='edit'))
+
+        # parent is not shown to group chair
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('form select[name=parent]')), 0)
+
+        # view ignores attempt to change parent
+        old_parent = group.parent
+        new_parent = GroupFactory(type_id='area')
+        self.assertNotEqual(new_parent.acronym, group.parent.acronym)
+        r = self.client.post(url, dict(
+            name=group.name,
+            acronym=group.acronym,
+            state=group.state_id,
+            parent=new_parent.pk))
+        self.assertEqual(r.status_code, 302)
+        group = Group.objects.get(pk=group.pk)
+        self.assertNotEqual(group.parent, new_parent)
+        self.assertEqual(group.parent, old_parent)
+
+        # parent is shown to AD and Secretariat
+        for priv_user in ('ad', 'secretary'):
+            self.client.logout()
+            login_testing_unauthorized(self, priv_user, url)
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertEqual(len(q('form select[name=parent]')), 1)
+
+            new_parent = GroupFactory(type_id='area')
+            self.assertNotEqual(new_parent.acronym, group.parent.acronym)
+            r = self.client.post(url, dict(
+                name=group.name,
+                acronym=group.acronym,
+                state=group.state_id,
+                parent=new_parent.pk))
+            self.assertEqual(r.status_code, 302)
+            group = Group.objects.get(pk=group.pk)
+            self.assertEqual(group.parent, new_parent)
+
+    def test_edit_parent_field(self):
+        group = GroupFactory.create(type_id='wg', parent=GroupFactory.create(type_id='area'))
+        chair = RoleFactory(group=group, name_id='chair').person
+        url = urlreverse('ietf.group.views.edit', kwargs=dict(group_type=group.type_id, acronym=group.acronym, action='edit', field='parent'))
+
+        # parent is not shown to group chair
+        login_testing_unauthorized(self, chair.user.username, url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 403)
+
+        # chair is not allowed to change parent
+        new_parent = GroupFactory(type_id='area')
+        self.assertNotEqual(new_parent.acronym, group.parent.acronym)
+        r = self.client.post(url, dict(parent=new_parent.pk))
+        self.assertEqual(r.status_code, 403)
+
+        # parent is shown to AD and Secretariat
+        for priv_user in ('ad', 'secretary'):
+            self.client.logout()
+            login_testing_unauthorized(self, priv_user, url)
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertEqual(len(q('form select[name=parent]')), 1)
+
+            new_parent = GroupFactory(type_id='area')
+            self.assertNotEqual(new_parent.acronym, group.parent.acronym)
+            r = self.client.post(url, dict(parent=new_parent.pk))
+            self.assertEqual(r.status_code, 302)
+            group = Group.objects.get(pk=group.pk)
+            self.assertEqual(group.parent, new_parent)
+
     def test_conclude(self):
         group = GroupFactory(acronym="mars")
 
@@ -1191,18 +1479,18 @@ def create_test_milestones(self):
         RoleFactory(group=group,name_id='chair',person=PersonFactory(user__username='marschairman'))
         draft = WgDraftFactory(group=group)
 
-        m1 = GroupMilestone.objects.create(id=1,
+        m1 = GroupMilestone.objects.create(
                                            group=group,
                                            desc="Test 1",
-                                           due=datetime.date.today(),
+                                           due=date_today(DEADLINE_TZINFO),
                                            resolved="",
                                            state_id="active")
         m1.docs.set([draft])
 
-        m2 = GroupMilestone.objects.create(id=2,
+        m2 = GroupMilestone.objects.create(
                                            group=group,
                                            desc="Test 2",
-                                           due=datetime.date.today(),
+                                           due=date_today(DEADLINE_TZINFO),
                                            resolved="",
                                            state_id="charter")
         m2.docs.set([draft])
@@ -1246,7 +1534,7 @@ def test_add_milestone(self):
         events_before = group.groupevent_set.count()
         doc_pks = pklist(Document.objects.filter(type="draft"))
 
-        due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365))
+        due = self.last_day_of_month(date_today(DEADLINE_TZINFO) + datetime.timedelta(days=365))
 
         # faulty post
         r = self.client.post(url, { 'prefix': "m-1",
@@ -1302,7 +1590,7 @@ def test_add_milestone_as_chair(self):
 
         milestones_before = GroupMilestone.objects.filter(group=group).count()
         events_before = group.groupevent_set.count()
-        due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365))
+        due = self.last_day_of_month(date_today(DEADLINE_TZINFO) + datetime.timedelta(days=365))
 
         # add
         mailbox_before = len(outbox)
@@ -1340,13 +1628,14 @@ def test_accept_milestone(self):
         events_before = group.groupevent_set.count()
 
         # add
-        r = self.client.post(url, { 'prefix': "m1",
-                                    'm1-id': m1.id,
-                                    'm1-desc': m1.desc,
-                                    'm1-due': m1.due.strftime("%B %Y"),
-                                    'm1-resolved': m1.resolved,
-                                    'm1-docs': pklist(m1.docs),
-                                    'm1-review': "accept",
+        mstr = f"m{m1.id}"
+        r = self.client.post(url, { 'prefix': mstr,
+                                    f'{mstr}-id': m1.id,
+                                    f'{mstr}-desc': m1.desc,
+                                    f'{mstr}-due': m1.due.strftime("%B %Y"),
+                                    f'{mstr}-resolved': m1.resolved,
+                                    f'{mstr}-docs': pklist(m1.docs),
+                                    f'{mstr}-review': "accept",
                                     'action': "save",
                                     })
         self.assertEqual(r.status_code, 302)
@@ -1366,13 +1655,14 @@ def test_delete_milestone(self):
         events_before = group.groupevent_set.count()
 
         # delete
-        r = self.client.post(url, { 'prefix': "m1",
-                                    'm1-id': m1.id,
-                                    'm1-desc': m1.desc,
-                                    'm1-due': m1.due.strftime("%B %Y"),
-                                    'm1-resolved': "",
-                                    'm1-docs': pklist(m1.docs),
-                                    'm1-delete': "checked",
+        mstr = f"m{m1.id}"
+        r = self.client.post(url, { 'prefix': mstr,
+                                    f'{mstr}-id': m1.id,
+                                    f'{mstr}-desc': m1.desc,
+                                    f'{mstr}-due': m1.due.strftime("%B %Y"),
+                                    f'{mstr}-resolved': "",
+                                    f'{mstr}-docs': pklist(m1.docs),
+                                    f'{mstr}-delete': "checked",
                                     'action': "save",
                                     })
         self.assertEqual(r.status_code, 302)
@@ -1393,15 +1683,16 @@ def test_edit_milestone(self):
         events_before = group.groupevent_set.count()
         doc_pks = pklist(Document.objects.filter(type="draft"))
 
-        due = self.last_day_of_month(datetime.date.today() + datetime.timedelta(days=365))
+        due = self.last_day_of_month(date_today(DEADLINE_TZINFO) + datetime.timedelta(days=365))
 
+        mstr = f"m{m1.id}"
         # faulty post
-        r = self.client.post(url, { 'prefix': "m1",
-                                    'm1-id': m1.id,
-                                    'm1-desc': "", # no description
-                                    'm1-due': due.strftime("%B %Y"),
-                                    'm1-resolved': "",
-                                    'm1-docs': doc_pks,
+        r = self.client.post(url, { 'prefix': mstr,
+                                    f'{mstr}-id': m1.id,
+                                    f'{mstr}-desc': "", # no description
+                                    f'{mstr}-due': due.strftime("%B %Y"),
+                                    f'{mstr}-resolved': "",
+                                    f'{mstr}-docs': doc_pks,
                                     'action': "save",
                                     })
         self.assertEqual(r.status_code, 200)
@@ -1413,13 +1704,13 @@ def test_edit_milestone(self):
 
         # edit
         mailbox_before = len(outbox)
-        r = self.client.post(url, { 'prefix': "m1",
-                                    'm1-id': m1.id,
-                                    'm1-desc': "Test 2 - changed",
-                                    'm1-due': due.strftime("%B %Y"),
-                                    'm1-resolved': "Done",
-                                    'm1-resolved_checkbox': "checked",
-                                    'm1-docs': doc_pks,
+        r = self.client.post(url, { 'prefix': mstr,
+                                    f'{mstr}-id': m1.id,
+                                    f'{mstr}-desc': "Test 2 - changed",
+                                    f'{mstr}-due': due.strftime("%B %Y"),
+                                    f'{mstr}-resolved': "Done",
+                                    f'{mstr}-resolved_checkbox': "checked",
+                                    f'{mstr}-docs': doc_pks,
                                     'action': "save",
                                     })
         self.assertEqual(r.status_code, 302)
@@ -1690,58 +1981,72 @@ def setUp(self):
         PersonFactory(user__username='plain')
         GroupFactory(acronym='mars',parent=GroupFactory(type_id='area'))
         GroupFactory(acronym='ames',parent=GroupFactory(type_id='area'))
-        self.group_alias_file = NamedTemporaryFile(delete=False)
-        self.group_alias_file.write(b"""# Generated by hand at 2015-02-12_16:30:52
-virtual.ietf.org anything
-mars-ads@ietf.org                                                xfilter-mars-ads
-expand-mars-ads@virtual.ietf.org                                 aread@example.org
-mars-chairs@ietf.org                                             xfilter-mars-chairs
-expand-mars-chairs@virtual.ietf.org                              mars_chair@ietf.org
-ames-ads@ietf.org                                                xfilter-mars-ads
-expand-ames-ads@virtual.ietf.org                                 aread@example.org
-ames-chairs@ietf.org                                             xfilter-mars-chairs
-expand-ames-chairs@virtual.ietf.org                              mars_chair@ietf.org
-""")
-        self.group_alias_file.close()
-        self.saved_group_virtual_path = settings.GROUP_VIRTUAL_PATH
-        settings.GROUP_VIRTUAL_PATH = self.group_alias_file.name
-
-    def tearDown(self):
-        settings.GROUP_VIRTUAL_PATH = self.saved_group_virtual_path
-        os.unlink(self.group_alias_file.name)
-        super().tearDown()
-
-    def testAliases(self):
+
+    @mock.patch("ietf.group.views.get_group_email_aliases")
+    def testAliases(self, mock_get_aliases):
         url = urlreverse('ietf.group.urls_info_details.redirect.email', kwargs=dict(acronym="mars"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 302)
 
+        mock_get_aliases.return_value = [
+            {"acronym": "mars", "alias_type": "-ads", "expansion": "aread@example.org"},
+            {"acronym": "mars", "alias_type": "-chairs", "expansion": "mars_chair@ietf.org"},
+        ]
         for testdict in [dict(acronym="mars"),dict(acronym="mars",group_type="wg")]:
             url = urlreverse('ietf.group.urls_info_details.redirect.email', kwargs=testdict)
             r = self.client.get(url,follow=True)
+            self.assertEqual(
+                mock_get_aliases.call_args,
+                mock.call(testdict.get("acronym", None), testdict.get("group_type", None)),
+            )
             self.assertTrue(all([x in unicontent(r) for x in ['mars-ads@','mars-chairs@']]))
             self.assertFalse(any([x in unicontent(r) for x in ['ames-ads@','ames-chairs@']]))
 
         url = urlreverse('ietf.group.views.email_aliases', kwargs=dict())
         login_testing_unauthorized(self, "plain", url)
+
+        mock_get_aliases.return_value = [
+            {"acronym": "mars", "alias_type": "-ads", "expansion": "aread@example.org"},
+            {"acronym": "mars", "alias_type": "-chairs", "expansion": "mars_chair@ietf.org"},
+            {"acronym": "ames", "alias_type": "-ads", "expansion": "aread@example.org"},
+            {"acronym": "ames", "alias_type": "-chairs", "expansion": "mars_chair@ietf.org"},
+        ]
         r = self.client.get(url)
         self.assertTrue(r.status_code,200)
+        self.assertEqual(mock_get_aliases.call_args, mock.call(None, None))
         self.assertTrue(all([x in unicontent(r) for x in ['mars-ads@','mars-chairs@','ames-ads@','ames-chairs@']]))
 
         url = urlreverse('ietf.group.views.email_aliases', kwargs=dict(group_type="wg"))
+        mock_get_aliases.return_value = [
+            {"acronym": "mars", "alias_type": "-ads", "expansion": "aread@example.org"},
+            {"acronym": "mars", "alias_type": "-chairs", "expansion": "mars_chair@ietf.org"},
+            {"acronym": "ames", "alias_type": "-ads", "expansion": "aread@example.org"},
+            {"acronym": "ames", "alias_type": "-chairs", "expansion": "mars_chair@ietf.org"},
+        ]
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
+        self.assertEqual(mock_get_aliases.call_args, mock.call(None, "wg"))
         self.assertContains(r, 'mars-ads@')
 
         url = urlreverse('ietf.group.views.email_aliases', kwargs=dict(group_type="rg"))
+        mock_get_aliases.return_value = []
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
+        self.assertEqual(mock_get_aliases.call_args, mock.call(None, "rg"))
         self.assertNotContains(r, 'mars-ads@')
 
-    def testExpansions(self):
+    @mock.patch("ietf.group.views.get_group_email_aliases")
+    def testExpansions(self, mock_get_aliases):
+        mock_get_aliases.return_value = [
+            {"acronym": "mars", "alias_type": "-ads", "expansion": "aread@example.org"},
+            {"acronym": "mars", "alias_type": "-chairs", "expansion": "mars_chair@ietf.org"},
+            {"acronym": "ames", "alias_type": "-ads", "expansion": "aread@example.org"},
+            {"acronym": "ames", "alias_type": "-chairs", "expansion": "mars_chair@ietf.org"},
+        ]
         url = urlreverse('ietf.group.views.email', kwargs=dict(acronym="mars"))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
+        self.assertEqual(mock_get_aliases.call_args, mock.call("mars", None))
         self.assertContains(r, 'Email aliases')
         self.assertContains(r, 'mars-ads@ietf.org')
         self.assertContains(r, 'group_personnel_change')
@@ -1776,7 +2081,7 @@ class MeetingInfoTests(TestCase):
     def setUp(self):
         super().setUp()
         self.group = GroupFactory.create(type_id='wg')
-        today = datetime.date.today()
+        today = date_today()
         SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=14))
         self.inprog = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1))
         SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today+datetime.timedelta(days=90))
@@ -1824,7 +2129,7 @@ def ensure_cant_edit(group,user):
             self.assertEqual(response.status_code, 404)
             self.client.logout()
 
-        for type_id in GroupTypeName.objects.exclude(slug__in=('wg','rg','ag','rag','team')).values_list('slug',flat=True):
+        for type_id in GroupTypeName.objects.exclude(slug__in=('wg','rg','ag','rag','team','edwg')).values_list('slug',flat=True):
             group = GroupFactory.create(type_id=type_id)
             for user in (None,User.objects.get(username='secretary')):
                 ensure_updates_dont_show(group,user)
@@ -1900,7 +2205,7 @@ def test_view_all_status_updates(self):
     def test_view_status_update_for_meeting(self):
         chair = RoleFactory(name_id='chair',group__type_id='wg')
         GroupEventFactory(type='status_update',group=chair.group)
-        sess = SessionFactory.create(meeting__type_id='ietf',group=chair.group,meeting__date=datetime.datetime.today()-datetime.timedelta(days=1))
+        sess = SessionFactory.create(meeting__type_id='ietf',group=chair.group,meeting__date=date_today()-datetime.timedelta(days=1))
         url = urlreverse('ietf.group.views.group_about_status_meeting',kwargs={'acronym':chair.group.acronym,'num':sess.meeting.number}) 
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
@@ -1935,12 +2240,12 @@ def test_group_parent_loop(self):
         import signal
 
         def timeout_handler(signum, frame):
-            raise Exception("Infinite loop in parent links is not handeled properly.")
+            raise Exception("Infinite loop in parent links is not handled properly.")
 
         signal.signal(signal.SIGALRM, timeout_handler)
         signal.alarm(1)   # One second
         try:
-            test2.is_decendant_of("ietf")
+            test2.is_descendant_of("ietf")
         except AssertionError:
             pass
         except Exception:
@@ -1961,13 +2266,22 @@ def test_admin_acronym_validation(self):
         self.assertIn('acronym',form.errors)
         form = AdminGroupForm({'acronym':'f','name':'should fail','type':'wg','state':'active','used_roles':'[]','time':now})
         self.assertIn('acronym',form.errors)
-        # For the ITU we have a heirarchy of group names that use hyphens as delimeters
+        # For the ITU we have a hierarchy of group names that use hyphens as delimiters
         form = AdminGroupForm({'acronym':'should-pass','name':'should pass','type':'sdo','state':'active','used_roles':'[]','time':now})
         self.assertTrue(form.is_valid())
         form = AdminGroupForm({'acronym':'shouldfail-','name':'should fail','type':'wg','state':'active','used_roles':'[]','time':now})
         self.assertIn('acronym',form.errors)
+        form = AdminGroupForm({'acronym':'shouldfail-','name':'should fail','type':'sdo','state':'active','used_roles':'[]','time':now})
+        self.assertIn('acronym',form.errors)
         form = AdminGroupForm({'acronym':'-shouldfail','name':'should fail','type':'wg','state':'active','used_roles':'[]','time':now})
         self.assertIn('acronym',form.errors)
+        form = AdminGroupForm({'acronym':'-shouldfail','name':'should fail','type':'sdo','state':'active','used_roles':'[]','time':now})
+        self.assertIn('acronym',form.errors)
+        # SDO groups (and only SDO groups) can have a leading number
+        form = AdminGroupForm({'acronym':'3gpp-should-pass','name':'should pass','type':'sdo','state':'active','used_roles':'[]','time':now})
+        self.assertTrue(form.is_valid())
+        form = AdminGroupForm({'acronym':'123shouldfail','name':'should fail','type':'wg','state':'active','used_roles':'[]','time':now})
+        self.assertIn('acronym',form.errors)
 
         wg = GroupFactory(acronym='bad-idea', type_id='wg') # There are some existing wg and programs with hyphens in their acronyms.
         form = AdminGroupForm({'acronym':wg.acronym,'name':wg.name,'type':wg.type_id,'state':wg.state_id,'used_roles':str(wg.used_roles),'time':now},instance=wg)
diff --git a/ietf/group/tests_js.py b/ietf/group/tests_js.py
index 49dd339839..7c51c23319 100644
--- a/ietf/group/tests_js.py
+++ b/ietf/group/tests_js.py
@@ -7,6 +7,7 @@
 from ietf.doc.factories import WgDraftFactory
 from ietf.group.factories import GroupFactory, RoleFactory, DatedGroupMilestoneFactory
 from ietf.utils.jstest import IetfSeleniumTestCase, ifSeleniumEnabled, selenium_enabled
+from ietf.utils.timezone import date_today
 
 if selenium_enabled():
     from selenium.common.exceptions import TimeoutException
@@ -68,7 +69,7 @@ def test_add_milestone(self):
         draft = WgDraftFactory()
         WgDraftFactory.create_batch(3)  # some drafts to ignore
         description = 'some description'
-        due_date = datetime.date.today() + datetime.timedelta(days=60)
+        due_date = date_today() + datetime.timedelta(days=60)
 
         assert(len(draft.name) > 5)
         draft_search_string = draft.name[-5:]
@@ -99,8 +100,8 @@ def test_add_milestone(self):
 
         # fill in the edit milestone form
         desc_input.send_keys(description)
-        due_input.send_keys(due_date.strftime('%m %Y\n'))  # \n closes the date selector
         self._search_draft_and_locate_result(draft_input, draft_search_string, draft).click()
+        due_input.send_keys(due_date.strftime('%m %Y'))
 
         self._click_milestone_submit_button('Review')
         result_row = self._assert_milestone_changed()
@@ -164,7 +165,7 @@ def test_edit_milestone(self):
         # modify the fields
         new_due_date = (milestone.due + datetime.timedelta(days=31)).strftime('%m %Y')
         due_field.clear()
-        due_field.send_keys(new_due_date + '\n')
+        due_field.send_keys(new_due_date)
 
         self._search_draft_and_locate_result(draft_input, draft_search_string, draft).click()
 
@@ -188,4 +189,4 @@ def test_edit_milestone(self):
         gms = self.group.groupmilestone_set.first()
         self.assertEqual(gms.desc, expected_desc)
         self.assertEqual(gms.due.strftime('%m %Y'), expected_due_date)
-        self.assertCountEqual(expected_docs, gms.docs.all())
\ No newline at end of file
+        self.assertCountEqual(expected_docs, gms.docs.all())
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index ee4ae96fe5..bb9b79a416 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
+# Copyright The IETF Trust 2016-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -7,7 +7,9 @@
 
 from pyquery import PyQuery
 
+from django.conf import settings
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 
 from ietf.review.policies import get_reviewer_queue_policy
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, reload_db_objects
@@ -25,6 +27,7 @@
 from ietf.doc.factories import DocumentFactory
 from ietf.group.factories import RoleFactory, ReviewTeamFactory, GroupFactory
 from ietf.review.factories import ReviewRequestFactory, ReviewerSettingsFactory, ReviewAssignmentFactory
+from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO
 from django.utils.html import escape
 
 class ReviewTests(TestCase):
@@ -38,7 +41,7 @@ def test_review_requests(self):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             self.assertContains(r, review_req.doc.name)
-            self.assertContains(r, assignment.reviewer.person.name)
+            self.assertContains(r, escape(assignment.reviewer.person.name))
 
         url = urlreverse(ietf.group.views.review_requests, kwargs={ 'acronym': group.acronym })
 
@@ -98,8 +101,20 @@ def test_suggested_review_requests(self):
 
         self.assertEqual(list(suggested_review_requests_for_team(team)), [])
 
+        # blocked by an already existing request (don't suggest it again)
+        review_req.state_id = "requested"
+        review_req.save()
+        self.assertEqual(list(suggested_review_requests_for_team(team)), [])
+
+        # ... but not for a previous version
+        review_req.requested_rev = prev_rev
+        review_req.save()
+        self.assertEqual(len(suggested_review_requests_for_team(team)), 1)
+
+
         # blocked by completion
         review_req.state = ReviewRequestStateName.objects.get(slug="assigned")
+        review_req.requested_rev = ""
         review_req.save()
         assignment.state = ReviewAssignmentStateName.objects.get(slug="completed")
         assignment.reviewed_rev = review_req.doc.rev
@@ -113,6 +128,7 @@ def test_suggested_review_requests(self):
 
         self.assertEqual(len(suggested_review_requests_for_team(team)), 1)
 
+
     def test_suggested_review_requests_on_lc_and_telechat(self):
         review_req = ReviewRequestFactory(state_id='assigned')
         doc = review_req.doc
@@ -131,7 +147,7 @@ def test_suggested_review_requests_on_lc_and_telechat(self):
         doc.states.add(State.objects.get(type="draft-iesg", slug="lc", used=True))
         LastCallDocEvent.objects.create(
             doc=doc,
-            expires=datetime.datetime.now() + datetime.timedelta(days=365),
+            expires=timezone.now() + datetime.timedelta(days=365),
             by=Person.objects.get(name="(System)"),
             rev=doc.rev
         )
@@ -155,7 +171,7 @@ def test_reviewer_overview(self):
             review_request__doc=review_req1.doc,
             review_request__team=review_req1.team,
             review_request__type_id="early",
-            review_request__deadline=datetime.date.today() + datetime.timedelta(days=30),
+            review_request__deadline=date_today(DEADLINE_TZINFO) + datetime.timedelta(days=30),
             review_request__state_id="assigned",
             review_request__requested_by=Person.objects.get(user__username="reviewer"),
             state_id = "accepted",
@@ -165,7 +181,7 @@ def test_reviewer_overview(self):
         UnavailablePeriod.objects.create(
             team=review_req1.team,
             person=reviewer,
-            start_date=datetime.date.today() - datetime.timedelta(days=10),
+            start_date=date_today() - datetime.timedelta(days=10),
             availability="unavailable",
         )
 
@@ -180,7 +196,7 @@ def test_reviewer_overview(self):
                     urlreverse(ietf.group.views.reviewer_overview, kwargs={ 'acronym': group.acronym, 'group_type': group.type_id })]:
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertContains(r, reviewer.name)
+            self.assertContains(r, escape(reviewer.name))
             self.assertContains(r, review_req1.doc.name)
             # without a login, reason for being unavailable should not be seen
             self.assertNotContains(r, "Availability")
@@ -196,13 +212,13 @@ def test_reviewer_overview(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # review team members can see reason for being unavailable
-        self.assertContains(r, "Availability")
+        self.assertContains(r, "Available")
 
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # secretariat can see reason for being unavailable
-        self.assertContains(r, "Availability")
+        self.assertContains(r, "Available")
 
         # add one closed review with no response and see it is visible
         review_req2 = ReviewRequestFactory(state_id='completed',team=team)
@@ -210,7 +226,7 @@ def test_reviewer_overview(self):
             review_request__doc=review_req2.doc,
             review_request__team=review_req2.team,
             review_request__type_id="lc",
-            review_request__deadline=datetime.date.today() - datetime.timedelta(days=30),
+            review_request__deadline=date_today(DEADLINE_TZINFO) - datetime.timedelta(days=30),
             review_request__state_id="assigned",
             review_request__requested_by=Person.objects.get(user__username="reviewer"),
             state_id = "no-response",
@@ -220,26 +236,26 @@ def test_reviewer_overview(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # We should see the new document with status of no response
-        self.assertContains(r, "No Response")
+        self.assertContains(r, "No response")
         self.assertContains(r, review_req1.doc.name)
         self.assertContains(r, review_req2.doc.name)
         # None of the reviews should be completed this time,
-        # note that "Days Since Completed has soft hypens in it, so it
+        # note that "Days Since Completed has soft hyphens in it, so it
         # will not match
         self.assertNotContains(r, "Completed")
         # add multiple completed reviews
         review_req3 = ReviewRequestFactory(state_id='completed', team=team)
         ReviewAssignmentFactory(
             review_request__doc=review_req3.doc,
-            review_request__time=datetime.date.today() - datetime.timedelta(days=30),
+            review_request__time=datetime_today() - datetime.timedelta(days=30),
             review_request__team=review_req3.team,
             review_request__type_id="telechat",
-            review_request__deadline=datetime.date.today() - datetime.timedelta(days=25),
+            review_request__deadline=date_today(DEADLINE_TZINFO) - datetime.timedelta(days=25),
             review_request__state_id="completed",
             review_request__requested_by=Person.objects.get(user__username="reviewer"),
             state_id = "completed",
             reviewer=reviewer.email_set.first(),
-            assigned_on=datetime.date.today() - datetime.timedelta(days=30)
+            assigned_on=datetime_today() - datetime.timedelta(days=30)
         )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
@@ -252,15 +268,15 @@ def test_reviewer_overview(self):
         for i in range(10):
             ReviewAssignmentFactory(
                 review_request__doc=reqs[i].doc,
-                review_request__time=datetime.date.today() - datetime.timedelta(days=i*30),
+                review_request__time=datetime_today() - datetime.timedelta(days=i*30),
                 review_request__team=reqs[i].team,
                 review_request__type_id="telechat",
-                review_request__deadline=datetime.date.today() - datetime.timedelta(days=i*20),
+                review_request__deadline=date_today(DEADLINE_TZINFO) - datetime.timedelta(days=i*20),
                 review_request__state_id="completed",
                 review_request__requested_by=Person.objects.get(user__username="reviewer"),
                 state_id = "completed",
                 reviewer=reviewer.email_set.first(),
-                assigned_on=datetime.date.today() - datetime.timedelta(days=i*30)
+                assigned_on=datetime_today() - datetime.timedelta(days=i*30)
             )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
@@ -300,32 +316,32 @@ def test_reviewer_overview(self):
             else:
                 self.assertNotContains(r, reqs[i].doc.name)
         # Add assigned items, they should be visible as long as they
-        # are withing time period
+        # are within time period
         review_req4 = ReviewRequestFactory(state_id='completed', team=team)
         ReviewAssignmentFactory(
             review_request__doc=review_req4.doc,
-            review_request__time=datetime.date.today() - datetime.timedelta(days=80),
+            review_request__time=datetime_today() - datetime.timedelta(days=80),
             review_request__team=review_req4.team,
             review_request__type_id="lc",
-            review_request__deadline=datetime.date.today() - datetime.timedelta(days=60),
+            review_request__deadline=date_today(DEADLINE_TZINFO) - datetime.timedelta(days=60),
             review_request__state_id="assigned",
             review_request__requested_by=Person.objects.get(user__username="reviewer"),
             state_id = "accepted",
             reviewer=reviewer.email_set.first(),
-            assigned_on=datetime.date.today() - datetime.timedelta(days=80)
+            assigned_on=datetime_today() - datetime.timedelta(days=80)
         )
         review_req5 = ReviewRequestFactory(state_id='completed', team=team)
         ReviewAssignmentFactory(
             review_request__doc=review_req5.doc,
-            review_request__time=datetime.date.today() - datetime.timedelta(days=120),
+            review_request__time=datetime_today() - datetime.timedelta(days=120),
             review_request__team=review_req5.team,
             review_request__type_id="lc",
-            review_request__deadline=datetime.date.today() - datetime.timedelta(days=100),
+            review_request__deadline=date_today(DEADLINE_TZINFO) - datetime.timedelta(days=100),
             review_request__state_id="assigned",
             review_request__requested_by=Person.objects.get(user__username="reviewer"),
             state_id = "accepted",
             reviewer=reviewer.email_set.first(),
-            assigned_on=datetime.date.today() - datetime.timedelta(days=120)
+            assigned_on=datetime_today() - datetime.timedelta(days=120)
         )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
@@ -366,10 +382,10 @@ def test_manage_review_requests(self):
         login_testing_unauthorized(self, "secretary", unassigned_url)
 
         # Need one more person in review team one so we can test incrementing skip_count without immediately decrementing it
-        another_reviewer = PersonFactory.create(name = "Extra TestReviewer") # needs to be lexically greater than the exsting one
+        another_reviewer = PersonFactory.create(name = "Extra TestReviewer") # needs to be lexically greater than the existing one
         another_reviewer.role_set.create(name_id='reviewer', email=another_reviewer.email(), group=review_req1.team)
         ReviewerSettingsFactory(team=review_req3.team, person = another_reviewer)
-        yet_another_reviewer = PersonFactory.create(name = "YetAnotherExtra TestReviewer") # needs to be lexically greater than the exsting one
+        yet_another_reviewer = PersonFactory.create(name = "YetAnotherExtra TestReviewer") # needs to be lexically greater than the existing one
         yet_another_reviewer.role_set.create(name_id='reviewer', email=yet_another_reviewer.email(), group=review_req1.team)
         ReviewerSettingsFactory(team=review_req3.team, person = yet_another_reviewer)
 
@@ -429,7 +445,7 @@ def test_manage_review_requests_assign_suggested_reviews(self):
         doc.states.add(State.objects.get(type="draft-iesg", slug="lc", used=True))
         LastCallDocEvent.objects.create(
             doc=doc,
-            expires=datetime.datetime.now() + datetime.timedelta(days=365),
+            expires=timezone.now() + datetime.timedelta(days=365),
             by=Person.objects.get(name="(System)"),
             rev=doc.rev
         )
@@ -475,7 +491,7 @@ def test_email_open_review_assignments(self):
         review_req1 = ReviewRequestFactory()
         review_assignment_completed = ReviewAssignmentFactory(review_request=review_req1,reviewer=EmailFactory(person__user__username='marschairman'), state_id='completed', reviewed_rev=0)
         ReviewAssignmentFactory(review_request=review_req1,reviewer=review_assignment_completed.reviewer)
-        TelechatDocEvent.objects.create(telechat_date=datetime.date.today(), type='scheduled_for_telechat', by=review_assignment_completed.reviewer.person, doc=review_req1.doc, rev=0)
+        TelechatDocEvent.objects.create(telechat_date=date_today(settings.TIME_ZONE), type='scheduled_for_telechat', by=review_assignment_completed.reviewer.person, doc=review_req1.doc, rev=0)
 
         DBTemplateFactory.create(path='/group/defaults/email/open_assignments.txt',
                                  type_id='django',
@@ -555,7 +571,7 @@ def test_change_reviewer_settings(self):
         # get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.context['period_form']['start_date'].initial, datetime.date.today())
+        self.assertEqual(r.context['period_form']['start_date'].initial, date_today())
 
         # set settings
         empty_outbox()
@@ -596,7 +612,7 @@ def test_change_reviewer_settings(self):
         self.assertEqual(settings.skip_next, 0)
 
         # add unavailable period
-        start_date = datetime.date.today() + datetime.timedelta(days=10)
+        start_date = date_today() + datetime.timedelta(days=10)
         empty_outbox()
         r = self.client.post(url, {
             "action": "add_period",
@@ -695,6 +711,22 @@ def test_change_review_secretary_settings(self):
         self.assertEqual(settings.max_items_to_show_in_reviewer_list, 10)
         self.assertEqual(settings.days_to_show_in_reviewer_list, 365)
 
+    def test_assign_reviewer_after_reject(self):
+        team = ReviewTeamFactory()
+        reviewer = RoleFactory(name_id='reviewer', group=team).person
+        ReviewerSettingsFactory(person=reviewer, team=team)
+        review_req = ReviewRequestFactory(team=team)
+        ReviewAssignmentFactory(review_request=review_req, state_id='rejected', reviewer=reviewer.email())
+
+        unassigned_url = urlreverse(ietf.group.views.manage_review_requests, kwargs={ 'acronym': team.acronym, 'group_type': team.type_id, "assignment_status": "unassigned" })
+        login_testing_unauthorized(self, "secretary", unassigned_url)
+
+        r = self.client.get(unassigned_url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        reviewer_label = q("option[value=\"{}\"]".format(reviewer.email())).text().lower()
+        self.assertIn("rejected review of document before", reviewer_label)
+
 
 class BulkAssignmentTests(TestCase):
 
@@ -728,7 +760,7 @@ def test_rotation_queue_update(self):
         r = self.client.post(unassigned_url, postdict)
         self.assertEqual(r.status_code,302)
         self.assertEqual(expected_ending_head_of_rotation, policy.default_reviewer_rotation_list()[0])
-        self.assertMailboxContains(outbox, subject='Last Call assignment', text='Requested by', count=4)
+        self.assertMailboxContains(outbox, subject='Last Call', text='Requested by', count=4)
      
 class ResetNextReviewerInTeamTests(TestCase):
 
@@ -782,4 +814,171 @@ def test_reset_next_reviewer(self):
             self.assertEqual(r.status_code,302)
             self.assertEqual(NextReviewerInTeam.objects.get(team=group).next_reviewer, reviewers[target_index].person)
             self.client.logout()
-            target_index += 2
\ No newline at end of file
+            target_index += 2
+
+class RequestsHistoryTests(TestCase):
+    def test_requests_history_overview_page(self):
+        # Make assigned assignment
+        review_req = ReviewRequestFactory(state_id='assigned')
+        assignment = ReviewAssignmentFactory(review_request=review_req,
+                                             state_id='assigned',
+                                             reviewer=EmailFactory(),
+                                             assigned_on = review_req.time)
+        group = review_req.team
+
+        for url in [urlreverse(ietf.group.views.review_requests_history,
+                               kwargs={ 'acronym': group.acronym }),
+                    urlreverse(ietf.group.views.review_requests_history,
+                               kwargs={ 'acronym': group.acronym ,
+                                        'group_type': group.type_id}),
+                    urlreverse(ietf.group.views.review_requests_history,
+                               kwargs={ 'acronym': group.acronym }) +
+                    '?since=3m',
+                    urlreverse(ietf.group.views.review_requests_history,
+                               kwargs={ 'acronym': group.acronym ,
+                                        'group_type': group.type_id }) +
+                    '?since=3m']:
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            self.assertContains(r, review_req.doc.name)
+            self.assertContains(r, 'Assigned')
+            self.assertContains(r, escape(assignment.reviewer.person.name))
+
+        url = urlreverse(ietf.group.views.review_requests_history,
+                         kwargs={ 'acronym': group.acronym })
+
+        assignment.state = ReviewAssignmentStateName.objects.get(slug="completed")
+        assignment.result = ReviewResultName.objects.get(slug="ready")
+        assignment.save()
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, review_req.doc.name)
+        self.assertContains(r, 'Assigned')
+        self.assertContains(r, 'Completed')
+
+    def test_requests_history_filter_page(self):
+        # First assignment as assigned
+        review_req = ReviewRequestFactory(state_id = 'assigned',
+                                          doc = DocumentFactory())
+        assignment = ReviewAssignmentFactory(review_request = review_req,
+                                             state_id = 'assigned',
+                                             reviewer = EmailFactory(),
+                                             assigned_on = review_req.time)
+        group = review_req.team
+
+        # Second assignment in same group as accepted
+        review_req2 = ReviewRequestFactory(state_id = 'assigned',
+                                           team = review_req.team,
+                                           doc = DocumentFactory())
+        assignment2 = ReviewAssignmentFactory(review_request = review_req2,
+                                              state_id='accepted',
+                                              reviewer = EmailFactory(),
+                                              assigned_on = review_req2.time)
+
+        # Modify the assignment to be completed, and mark it ready
+        assignment2.state = ReviewAssignmentStateName.objects.get(slug="completed")
+        assignment2.result = ReviewResultName.objects.get(slug="ready")
+        assignment2.save()
+
+        # Check that we have all information when we do not filter
+        url = urlreverse(ietf.group.views.review_requests_history,
+                         kwargs={ 'acronym': group.acronym })
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, review_req.doc.name)
+        self.assertContains(r, review_req2.doc.name)
+        self.assertContains(r, 'data-text="Assigned"')
+        self.assertContains(r, 'data-text="Accepted"')
+        self.assertContains(r, 'data-text="Completed"')
+        self.assertContains(r, 'data-text="Ready"')
+        self.assertContains(r, escape(assignment.reviewer.person.name))
+        self.assertContains(r, escape(assignment2.reviewer.person.name))
+
+        # Check first reviewer history
+        for url in [urlreverse(ietf.group.views.review_requests_history,
+                               kwargs={ 'acronym': group.acronym }) +
+                    '?reviewer_email=' + str(assignment.reviewer),
+                    urlreverse(ietf.group.views.review_requests_history,
+                               kwargs={ 'acronym': group.acronym ,
+                                        'group_type': group.type_id}) +
+                    '?reviewer_email=' + str(assignment.reviewer)]:
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            self.assertContains(r, review_req.doc.name)
+            self.assertNotContains(r, review_req2.doc.name)
+            self.assertContains(r, 'data-text="Assigned"')
+            self.assertNotContains(r, 'data-text="Accepted"')
+            self.assertNotContains(r, 'data-text="Completed"')
+            self.assertNotContains(r, 'data-text="Ready"')
+            self.assertContains(r, escape(assignment.reviewer.person.name))
+            self.assertNotContains(r, escape(assignment2.reviewer.person.name))
+
+        # Check second reviewer history
+        for url in [urlreverse(ietf.group.views.review_requests_history,
+                               kwargs={ 'acronym': group.acronym }) +
+                    '?reviewer_email=' + str(assignment2.reviewer),
+                    urlreverse(ietf.group.views.review_requests_history,
+                               kwargs={ 'acronym': group.acronym ,
+                                        'group_type': group.type_id}) +
+                    '?reviewer_email=' + str(assignment2.reviewer)]:
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            self.assertNotContains(r, review_req.doc.name)
+            self.assertContains(r, review_req2.doc.name)
+            self.assertNotContains(r, 'data-text="Assigned"')
+            self.assertContains(r, 'data-text="Accepted"')
+            self.assertContains(r, 'data-text="Completed"')
+            self.assertContains(r, 'data-text="Ready"')
+            self.assertNotContains(r, escape(assignment.reviewer.person.name))
+            self.assertContains(r, escape(assignment2.reviewer.person.name))
+
+        # Check for reviewer that does not have anything
+        url = urlreverse(ietf.group.views.review_requests_history,
+                         kwargs={ 'acronym': group.acronym }) + '?reviewer_email=nobody@nowhere.example.org'
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertNotContains(r, review_req.doc.name)
+        self.assertNotContains(r, 'data-text="Assigned"')
+        self.assertNotContains(r, 'data-text="Accepted"')
+        self.assertNotContains(r, 'data-text="Completed"')
+
+    def test_requests_history_invalid_filter_parameters(self):
+        # First assignment as assigned
+        review_req = ReviewRequestFactory(state_id="assigned", doc=DocumentFactory())
+        group = review_req.team
+        url = urlreverse(
+            "ietf.group.views.review_requests_history",
+            kwargs={"acronym": group.acronym},
+        )
+        invalid_reviewer_emails = [
+            "%00null@example.com",  # urlencoded null character
+            "null@exa%00mple.com",  # urlencoded null character
+            "\x00null@example.com",  # literal null character
+            "null@ex\x00ample.com",  # literal null character
+        ]
+        for invalid_email in invalid_reviewer_emails:
+            r = self.client.get(
+                url + f"?reviewer_email={invalid_email}"
+            )
+            self.assertEqual(
+                r.status_code, 
+                400,
+                f"should return a 400 response for reviewer_email={repr(invalid_email)}"
+            )
+
+        invalid_since_choices = [
+            "forever",  # not an option
+            "all\x00",  # literal null character
+            "a%00ll",  # urlencoded null character
+        ]
+        for invalid_since in invalid_since_choices:
+            r = self.client.get(
+                url + f"?since={invalid_since}"
+            )
+            self.assertEqual(
+                r.status_code, 
+                400,
+                f"should return a 400 response for since={repr(invalid_since)}"
+            )
diff --git a/ietf/group/tests_serializers.py b/ietf/group/tests_serializers.py
new file mode 100644
index 0000000000..b584a17ae2
--- /dev/null
+++ b/ietf/group/tests_serializers.py
@@ -0,0 +1,96 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+from ietf.group.factories import RoleFactory, GroupFactory
+from ietf.group.serializers import (
+    AreaDirectorSerializer,
+    AreaSerializer,
+    GroupSerializer,
+)
+from ietf.person.factories import EmailFactory
+from ietf.utils.test_utils import TestCase
+
+
+class GroupSerializerTests(TestCase):
+    def test_serializes(self):
+        wg = GroupFactory()
+        serialized = GroupSerializer(wg).data
+        self.assertEqual(
+            serialized,
+            {
+                "acronym": wg.acronym,
+                "name": wg.name,
+                "type": "wg",
+                "list_email": wg.list_email,
+            },
+        )
+
+
+class AreaDirectorSerializerTests(TestCase):
+    def test_serializes_role(self):
+        """Should serialize a Role correctly"""
+        role = RoleFactory(group__type_id="area", name_id="ad")
+        serialized = AreaDirectorSerializer(role).data
+        self.assertEqual(
+            serialized,
+            {"email": role.email.email_address(), "name": role.person.plain_name()},
+        )
+
+    def test_serializes_email(self):
+        """Should serialize an Email correctly"""
+        email = EmailFactory()
+        serialized = AreaDirectorSerializer(email).data
+        self.assertEqual(
+            serialized,
+            {
+                "email": email.email_address(),
+                "name": email.person.plain_name() if email.person else None,
+            },
+        )
+
+
+class AreaSerializerTests(TestCase):
+    def test_serializes_active_area(self):
+        """Should serialize an active area correctly"""
+        area = GroupFactory(type_id="area", state_id="active")
+        serialized = AreaSerializer(area).data
+        self.assertEqual(
+            serialized,
+            {
+                "acronym": area.acronym,
+                "name": area.name,
+                "ads": [],
+            },
+        )
+        ad_roles = RoleFactory.create_batch(2, group=area, name_id="ad")
+        serialized = AreaSerializer(area).data
+        self.assertEqual(serialized["acronym"], area.acronym)
+        self.assertEqual(serialized["name"], area.name)
+        self.assertCountEqual(
+            serialized["ads"],
+            [
+                {"email": ad.email.email_address(), "name": ad.person.plain_name()}
+                for ad in ad_roles
+            ],
+        )
+
+    def test_serializes_inactive_area(self):
+        """Should serialize an inactive area correctly"""
+        area = GroupFactory(type_id="area", state_id="conclude")
+        serialized = AreaSerializer(area).data
+        self.assertEqual(
+            serialized,
+            {
+                "acronym": area.acronym,
+                "name": area.name,
+                "ads": [],
+            },
+        )
+        RoleFactory.create_batch(2, group=area, name_id="ad")
+        serialized = AreaSerializer(area).data
+        self.assertEqual(
+            serialized,
+            {
+                "acronym": area.acronym,
+                "name": area.name,
+                "ads": [],
+            },
+        )
diff --git a/ietf/group/urls.py b/ietf/group/urls.py
index 46bde4ede3..8354aba063 100644
--- a/ietf/group/urls.py
+++ b/ietf/group/urls.py
@@ -1,7 +1,7 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
+# Copyright The IETF Trust 2013-2023, All Rights Reserved
 
 from django.conf import settings
-from django.conf.urls import include
+from django.urls import include
 from django.views.generic import RedirectView
 
 from ietf.community import views as community_views
@@ -20,11 +20,11 @@
     url(r'^documents/subscription/$', community_views.subscription),
     url(r'^charter/$', views.group_about),
     url(r'^about/$', views.group_about),
-    url(r'^about/rendertest/$', views.group_about_rendertest),
     url(r'^about/status/$', views.group_about_status),
     url(r'^about/status/edit/$', views.group_about_status_edit),
     url(r'^about/status/meeting/(?P<num>\d+)/$', views.group_about_status_meeting),
     url(r'^history/$',views.history),
+    url(r'^requestshistory/$',views.review_requests_history),
     url(r'^history/addcomment/$',views.add_comment),
     url(r'^email/$', views.email),
     url(r'^deps\.json$', views.dependencies),
@@ -48,11 +48,20 @@
     url(r'^secretarysettings/$', views.change_review_secretary_settings),
     url(r'^reset_next_reviewer/$', views.reset_next_reviewer),
     url(r'^email-aliases/$', RedirectView.as_view(pattern_name=views.email,permanent=False),name='ietf.group.urls_info_details.redirect.email'),
+    url(r'^statements/$', views.statements),
+    url(r'^appeals/$', views.appeals),
+    url(r'^appeals/artifact/(?P<artifact_id>\d+)$', views.appeal_artifact),
+    url(r'^appeals/artifact/(?P<artifact_id>\d+)/markdown$', views.appeal_artifact_markdown),
+
+
 ]
 
 
 group_urls = [
-    url(r'^$', views.active_groups), 
+    url(r'^$', views.active_groups),
+    url(r'^leadership/(?P<group_type>(wg|rg))/$', views.group_leadership),
+    url(r'^leadership/(?P<group_type>(wg|rg))/csv/$', views.group_leadership_csv),
+    url(r'^groupstats.json', views.group_stats_data, None, 'ietf.group.views.group_stats_data'),
     url(r'^groupmenu.json', views.group_menu_data, None, 'ietf.group.views.group_menu_data'),
     url(r'^chartering/$', views.chartering_groups),
     url(r'^chartering/create/(?P<group_type>(wg|rg))/$', views.edit, {'action': "charter"}),
diff --git a/ietf/group/utils.py b/ietf/group/utils.py
index b701d6a7c7..6777ed1933 100644
--- a/ietf/group/utils.py
+++ b/ietf/group/utils.py
@@ -1,12 +1,13 @@
-# Copyright The IETF Trust 2012-2021, All Rights Reserved
+# Copyright The IETF Trust 2012-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
+import datetime
 
-
-import io
-import os
+from itertools import chain
+from pathlib import Path
 
 from django.db.models import Q
 from django.shortcuts import get_object_or_404
+from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.urls import reverse as urlreverse
@@ -15,13 +16,13 @@
 
 from ietf.community.models import CommunityList, SearchRule
 from ietf.community.utils import reset_name_contains_index_for_rule, can_manage_community_list
-from ietf.doc.models import Document, State
+from ietf.doc.models import Document, State, RelatedDocument
 from ietf.group.models import Group, RoleHistory, Role, GroupFeatures, GroupEvent
 from ietf.ietfauth.utils import has_role
 from ietf.name.models import GroupTypeName, RoleName
 from ietf.person.models import Email
 from ietf.review.utils import can_manage_review_requests_for_team
-from ietf.utils import log
+from ietf.utils import log, markdown
 from ietf.utils.history import get_history_object_for, copy_many_to_many_for_history
 from ietf.doc.templatetags.ietf_filters import is_valid_url
 from functools import reduce
@@ -55,15 +56,14 @@ def get_charter_text(group):
         if (h.rev > c.rev and not (c_appr and not h_appr)) or (h_appr and not c_appr):
             c = h
 
-    filename = os.path.join(c.get_file_path(), "%s-%s.txt" % (c.canonical_name(), c.rev))
+    filename = Path(c.get_file_path()) / f"{c.name}-{c.rev}.txt"
     try:
-        with io.open(filename, 'rb') as f:
-            text = f.read()
-            try:
-                text = text.decode('utf8')
-            except UnicodeDecodeError:
-                text = text.decode('latin1')
-            return text
+        text = filename.read_bytes()
+        try:
+            text = text.decode('utf8')
+        except UnicodeDecodeError:
+            text = text.decode('latin1')
+        return text
     except IOError:
         return 'Error Loading Group Charter'
 
@@ -154,17 +154,23 @@ def can_manage_materials(user, group):
 def can_manage_session_materials(user, group, session):
     return has_role(user, 'Secretariat') or (group.has_role(user, group.features.matman_roles) and not session.is_material_submission_cutoff())
 
-# Maybe this should be cached...
 def can_manage_some_groups(user):
     if not user.is_authenticated:
         return False
+    authroles = set(
+        chain.from_iterable(
+            GroupFeatures.objects.values_list("groupman_authroles", flat=True)
+        )
+    )
+    extra_role_qs = dict()
     for gf in GroupFeatures.objects.all():
-        for authrole in gf.groupman_authroles:
-            if has_role(user, authrole):
-                return True
-            if Role.objects.filter(name__in=gf.groupman_roles, group__type_id=gf.type_id, person__user=user).exists():
-                return True
-    return False          
+        extra_role_qs[f"{gf.type_id} groupman roles"] = Q(
+            name__in=gf.groupman_roles,
+            group__type_id=gf.type_id,
+            group__state__in=["active", "bof", "proposed"],
+        )
+    return has_role(user, authroles, extra_role_qs=extra_role_qs)
+       
 
 def can_provide_status_update(user, group):
     if not group.features.acts_like_wg:
@@ -191,7 +197,7 @@ def setup_default_community_list_for_group(group):
         community_list=clist,
         rule_type="group_rfc",
         group=group,
-        state=State.objects.get(slug="rfc", type="draft"),
+        state=State.objects.get(slug="published", type="rfc"),
     )
     SearchRule.objects.create(
         community_list=clist,
@@ -230,9 +236,14 @@ def construct_group_menu_context(request, group, selected, group_type, others):
         import ietf.group.views
         entries.append(("Review requests", urlreverse(ietf.group.views.review_requests, kwargs=kwargs)))
         entries.append(("Reviewers", urlreverse(ietf.group.views.reviewer_overview, kwargs=kwargs)))
-
+        entries.append(("Reviews History", urlreverse(ietf.group.views.review_requests_history, kwargs=kwargs)))
     if group.features.has_meetings:
         entries.append(("Meetings", urlreverse("ietf.group.views.meetings", kwargs=kwargs)))
+    if group.acronym in ["iesg"]:
+        entries.append(("Working Groups", urlreverse("ietf.iesg.views.working_groups")))
+    if group.acronym in ["iab", "iesg"]:
+        entries.append(("Statements", urlreverse("ietf.group.views.statements", kwargs=kwargs)))
+        entries.append(("Appeals", urlreverse("ietf.group.views.appeals", kwargs=kwargs)))
     entries.append(("History", urlreverse("ietf.group.views.history", kwargs=kwargs)))
     entries.append(("Photos", urlreverse("ietf.group.views.group_photos", kwargs=kwargs)))
     entries.append(("Email expansions", urlreverse("ietf.group.views.email", kwargs=kwargs)))
@@ -240,7 +251,6 @@ def construct_group_menu_context(request, group, selected, group_type, others):
         if is_valid_url(group.list_archive):
             entries.append((mark_safe("List archive &raquo;"), group.list_archive))
 
-
     # actions
     actions = []
 
@@ -352,3 +362,188 @@ def update_role_set(group, role_name, new_value, by):
                 e.save()
 
     return added, removed
+
+
+class GroupAliasGenerator:
+    days = 5 * 365
+    active_states = ["active", "bof", "proposed"]
+    group_types = [
+        "wg",
+        "rg",
+        "rag",
+        "dir",
+        "team",
+        "review",
+        "program",
+        "rfcedtyp",
+        "edappr",
+        "edwg",
+    ]  # This should become groupfeature driven...
+    no_ad_group_types = ["rg", "rag", "team", "program", "rfcedtyp", "edappr", "edwg"]
+
+    def __init__(self, group_queryset=None):
+        if group_queryset is None:
+            self.group_queryset = Group.objects.all()
+        else:
+            self.group_queryset = group_queryset
+
+    def __iter__(self):
+        show_since = timezone.now() - datetime.timedelta(days=self.days)
+
+        # Loop through each group type and build -ads and -chairs entries
+        for g in self.group_types:
+            domains = ["ietf"]
+            if g in ("rg", "rag"):
+                domains.append("irtf")
+            if g == "program":
+                domains.append("iab")
+
+            entries = self.group_queryset.filter(type=g).all()
+            active_entries = entries.filter(state__in=self.active_states)
+            inactive_recent_entries = entries.exclude(
+                state__in=self.active_states
+            ).filter(time__gte=show_since)
+            interesting_entries = active_entries | inactive_recent_entries
+
+            for e in interesting_entries.distinct().iterator():
+                name = e.acronym
+
+                # Research groups, teams, and programs do not have -ads lists
+                if not g in self.no_ad_group_types:
+                    ad_emails = get_group_ad_emails(e)
+                    if ad_emails:
+                        yield name + "-ads", domains, list(ad_emails)
+                # All group types have -chairs lists
+                chair_emails = get_group_role_emails(e, ["chair", "secr"])
+                if chair_emails:
+                    yield name + "-chairs", domains, list(chair_emails)
+
+        # The area lists include every chair in active working groups in the area
+        areas = self.group_queryset.filter(type="area").all()
+        active_areas = areas.filter(state__in=self.active_states)
+        for area in active_areas:
+            name = area.acronym
+            area_ad_emails = get_group_role_emails(area, ["pre-ad", "ad", "chair"])
+            if area_ad_emails:
+                yield name + "-ads", ["ietf"], list(area_ad_emails)
+            chair_emails = get_child_group_role_emails(area, ["chair", "secr"]) | area_ad_emails
+            if chair_emails:
+                yield name + "-chairs", ["ietf"], list(chair_emails)
+
+        # Other groups with chairs that require Internet-Draft submission approval
+        gtypes = GroupTypeName.objects.values_list("slug", flat=True)
+        special_groups = self.group_queryset.filter(
+            type__features__req_subm_approval=True, acronym__in=gtypes, state="active"
+        )
+        for group in special_groups:
+            chair_emails = get_group_role_emails(group, ["chair", "delegate"])
+            if chair_emails:
+                yield group.acronym + "-chairs", ["ietf"], list(chair_emails)
+
+
+def get_group_email_aliases(acronym, group_type):
+    aliases = []
+    group_queryset = Group.objects.all()
+    if acronym:
+        group_queryset = group_queryset.filter(acronym=acronym)
+    if group_type:
+        group_queryset = group_queryset.filter(type__slug=group_type)
+    for (alias, _, alist) in GroupAliasGenerator(group_queryset):
+        acro, _hyphen, alias_type = alias.partition("-")
+        expansion = ", ".join(sorted(alist))
+        aliases.append({
+            "acronym": acro,
+            "alias_type": f"-{alias_type}" if alias_type else "",
+            "expansion": expansion,
+        })
+    return sorted(aliases, key=lambda a: a["acronym"])
+
+
+def role_holder_emails():
+    """Get queryset of active Emails for group role holders"""
+    group_types_of_interest = [
+        "ag",
+        "area",
+        "dir",
+        "iab",
+        "ietf",
+        "irtf",
+        "nomcom",
+        "rg",
+        "team",
+        "wg",
+        "rag",
+    ]
+    roles = Role.objects.filter(
+        group__state__slug="active",
+        group__type__in=group_types_of_interest,
+    )
+    emails = Email.objects.filter(active=True).exclude(
+        address__startswith="unknown-email-"
+    )
+    return emails.filter(person__role__in=roles).distinct()
+
+
+def fill_in_charter_info(group, include_drafts=False):
+    group.areadirector = getattr(group.ad_role(),'email',None)
+
+    personnel = {}
+    for r in Role.objects.filter(group=group).order_by('person__name').select_related("email", "person", "name"):
+        if r.name_id not in personnel:
+            personnel[r.name_id] = []
+        personnel[r.name_id].append(r)
+
+    if group.parent and group.parent.type_id == "area" and group.ad_role() and "ad" not in personnel:
+        ad_roles = list(Role.objects.filter(group=group.parent, name="ad", person=group.ad_role().person))
+        if ad_roles:
+            personnel["ad"] = ad_roles
+
+    group.personnel = []
+    for role_name_slug, roles in personnel.items():
+        label = roles[0].name.name
+        if len(roles) > 1:
+            if label.endswith("y"):
+                label = label[:-1] + "ies"
+            else:
+                label += "s"
+
+        group.personnel.append((role_name_slug, label, roles))
+
+    group.personnel.sort(key=lambda t: t[2][0].name.order)
+
+    milestone_state = "charter" if group.state_id == "proposed" else "active"
+    group.milestones = group.groupmilestone_set.filter(state=milestone_state)
+    if group.uses_milestone_dates:
+        group.milestones = group.milestones.order_by('resolved', 'due')
+    else:
+        group.milestones = group.milestones.order_by('resolved', 'order')
+
+    if group.charter:
+        group.charter_text = get_charter_text(group)
+    else:
+        group.charter_text = "Not chartered yet."
+    group.charter_html = markdown.markdown(group.charter_text)
+
+
+def fill_in_wg_roles(group):
+    def get_roles(slug, default):
+        for role_slug, label, roles in group.personnel:
+            if slug == role_slug:
+                return roles
+        return default
+
+    group.chairs = get_roles("chair", [])
+    ads = get_roles("ad", [])
+    group.areadirector = ads[0] if ads else None
+    group.techadvisors = get_roles("techadv", [])
+    group.editors = get_roles("editor", [])
+    group.secretaries = get_roles("secr", [])
+
+
+def fill_in_wg_drafts(group):
+    group.drafts = Document.objects.filter(type_id="draft", group=group).order_by("name")
+    group.rfcs = Document.objects.filter(type_id="rfc", group=group).order_by("rfc_number")
+    for rfc in group.rfcs:
+        # TODO: remote_field?
+        rfc.remote_field = RelatedDocument.objects.filter(source=rfc,relationship_id__in=['obs','updates']).distinct()
+        rfc.invrel = RelatedDocument.objects.filter(target=rfc,relationship_id__in=['obs','updates']).distinct()
diff --git a/ietf/group/views.py b/ietf/group/views.py
index 3a4b9f3e0c..8561a5059f 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright The IETF Trust 2009-2022, All Rights Reserved
+# Copyright The IETF Trust 2009-2023, All Rights Reserved
 #
 # Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
@@ -35,32 +35,42 @@
 
 
 import copy
+import csv
 import datetime
 import itertools
-import io
 import math
-import re
 import json
+import types
 
 from collections import OrderedDict, defaultdict
+from pathlib import Path
 from simple_history.utils import update_change_reason
 
 from django import forms
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.db.models import Q, Count
-from django.http import HttpResponse, HttpResponseRedirect, Http404, JsonResponse
+from django.db.models import Count, F, OuterRef, Prefetch, Q, Subquery, TextField, Value
+from django.db.models.functions import Coalesce
+from django.http import (
+    HttpResponse,
+    HttpResponseRedirect,
+    Http404,
+    JsonResponse,
+    HttpResponseBadRequest,
+)
 from django.shortcuts import render, redirect, get_object_or_404
 from django.template.loader import render_to_string
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 from django.utils.html import escape
 from django.views.decorators.cache import cache_page, cache_control
+from django.urls import reverse
 
 import debug                            # pyflakes:ignore
 
 from ietf.community.models import CommunityList, EmailSubscription
 from ietf.community.utils import docs_tracked_by_community_list
-from ietf.doc.models import DocTagName, State, DocAlias, RelatedDocument, Document
+from ietf.doc.models import DocTagName, State, RelatedDocument, Document, DocEvent
 from ietf.doc.templatetags.ietf_filters import clean_whitespace
 from ietf.doc.utils import get_chartering_type, get_tags_for_stream_id
 from ietf.doc.utils_charter import charter_name_for_group, replace_charter_of_replaced_group
@@ -71,18 +81,20 @@
                               AddUnavailablePeriodForm, EndUnavailablePeriodForm, ReviewSecretarySettingsForm, )
 from ietf.group.mails import email_admin_re_charter, email_personnel_change, email_comment
 from ietf.group.models import ( Group, Role, GroupEvent, GroupStateTransitions,
-                              ChangeStateGroupEvent, GroupFeatures )
-from ietf.group.utils import (get_charter_text, can_manage_all_groups_of_type, 
+                              ChangeStateGroupEvent, GroupFeatures, AppealArtifact )
+from ietf.group.utils import (can_manage_all_groups_of_type,
                               milestone_reviewer_for_group_type, can_provide_status_update,
                               can_manage_materials, group_attribute_change_desc,
                               construct_group_menu_context, get_group_materials,
                               save_group_in_history, can_manage_group, update_role_set,
-                              get_group_or_404, setup_default_community_list_for_group, )                              
+                              get_group_or_404, setup_default_community_list_for_group, fill_in_charter_info,
+                              get_group_email_aliases)                              
 #
 from ietf.ietfauth.utils import has_role, is_authorized_in_group
 from ietf.mailtrigger.utils import gather_relevant_expansions
 from ietf.meeting.helpers import get_meeting
-from ietf.meeting.utils import group_sessions, add_event_info_to_session_qs
+from ietf.meeting.models import ImportantDate, SchedTimeSessAssignment, SchedulingEvent
+from ietf.meeting.utils import group_sessions
 from ietf.name.models import GroupTypeName, StreamName
 from ietf.person.models import Email, Person
 from ietf.review.models import (ReviewRequest, ReviewAssignment, ReviewerSettings, 
@@ -90,11 +102,9 @@
 from ietf.review.policies import get_reviewer_queue_policy
 from ietf.review.utils import (can_manage_review_requests_for_team,
                                can_access_review_stats_for_team,
-
                                extract_revision_ordered_review_requests_for_documents_and_replaced,
                                assign_review_request_to_reviewer,
                                close_review_request,
-
                                suggested_review_requests_for_team,
                                unavailable_periods_to_list,
                                current_unavailable_periods_for_reviewers,
@@ -110,14 +120,16 @@
 from ietf.name.models import ReviewAssignmentStateName
 from ietf.utils.mail import send_mail_text, parse_preformatted
 
-from ietf.ietfauth.utils import user_is_person
+from ietf.ietfauth.utils import user_is_person, role_required
 from ietf.dbtemplate.models import DBTemplate
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.mailtrigger.models import Recipient
 from ietf.settings import MAILING_LIST_INFO_URL
+from ietf.utils.decorators import ignore_view_kwargs
 from ietf.utils.response import permission_denied
 from ietf.utils.text import strip_suffix
 from ietf.utils import markdown
+from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO
 
 
 # --- Helpers ----------------------------------------------------------
@@ -126,88 +138,17 @@ def roles(group, role_name):
     return Role.objects.filter(group=group, name=role_name).select_related("email", "person")
 
 
-def fill_in_charter_info(group, include_drafts=False):
-    group.areadirector = getattr(group.ad_role(),'email',None)
-
-    personnel = {}
-    for r in Role.objects.filter(group=group).order_by('person__name').select_related("email", "person", "name"):
-        if r.name_id not in personnel:
-            personnel[r.name_id] = []
-        personnel[r.name_id].append(r)
-
-    if group.parent and group.parent.type_id == "area" and group.ad_role() and "ad" not in personnel:
-        ad_roles = list(Role.objects.filter(group=group.parent, name="ad", person=group.ad_role().person))
-        if ad_roles:
-            personnel["ad"] = ad_roles
-
-    group.personnel = []
-    for role_name_slug, roles in personnel.items():
-        label = roles[0].name.name
-        if len(roles) > 1:
-            if label.endswith("y"):
-                label = label[:-1] + "ies"
-            else:
-                label += "s"
-
-        group.personnel.append((role_name_slug, label, roles))
-
-    group.personnel.sort(key=lambda t: t[2][0].name.order)
-
-    milestone_state = "charter" if group.state_id == "proposed" else "active"
-    group.milestones = group.groupmilestone_set.filter(state=milestone_state)
-    if group.uses_milestone_dates:
-        group.milestones = group.milestones.order_by('resolved', 'due')
-    else:
-        group.milestones = group.milestones.order_by('resolved', 'order')
-
-    if group.charter:
-        group.charter_text = get_charter_text(group)
-    else:
-        group.charter_text = "Not chartered yet."
-
 def extract_last_name(role):
     return role.person.name_parts()[3]
 
-def fill_in_wg_roles(group):
-    def get_roles(slug, default):
-        for role_slug, label, roles in group.personnel:
-            if slug == role_slug:
-                return roles
-        return default
-
-    group.chairs = get_roles("chair", [])
-    ads = get_roles("ad", [])
-    group.areadirector = ads[0] if ads else None
-    group.techadvisors = get_roles("techadv", [])
-    group.editors = get_roles("editor", [])
-    group.secretaries = get_roles("secr", [])
-
-def fill_in_wg_drafts(group):
-    aliases = DocAlias.objects.filter(docs__type="draft", docs__group=group).prefetch_related('docs').order_by("name")
-    group.drafts = []
-    group.rfcs = []
-    for a in aliases:
-        if a.name.startswith("draft"):
-            group.drafts.append(a)
-        else:
-            group.rfcs.append(a)
-            a.remote_field = RelatedDocument.objects.filter(source=a.document,relationship_id__in=['obs','updates']).distinct()
-            a.invrel = RelatedDocument.objects.filter(target=a,relationship_id__in=['obs','updates']).distinct()
-
-
-def check_group_email_aliases():
-    pattern = re.compile(r'expand-(.*?)(-\w+)@.*? +(.*)$')
-    tot_count = 0
-    good_count = 0
-    with io.open(settings.GROUP_VIRTUAL_PATH,"r") as virtual_file:
-        for line in virtual_file.readlines():
-            m = pattern.match(line)
-            tot_count += 1
-            if m:
-                good_count += 1
-            if good_count > 50 and tot_count < 3*good_count:
-                return True
-    return False
+
+def response_from_file(fpath: Path) -> HttpResponse:
+    """Helper to shovel a file back in an HttpResponse"""
+    try:
+        content = fpath.read_bytes()
+    except IOError:
+        raise Http404
+    return HttpResponse(content, content_type="text/plain; charset=utf-8")
 
 
 # --- View functions ---------------------------------------------------
@@ -215,58 +156,26 @@ def check_group_email_aliases():
 def wg_summary_area(request, group_type):
     if group_type != "wg":
         raise Http404
-    areas = Group.objects.filter(type="area", state="active").order_by("name")
-    for area in areas:
-        area.groups = Group.objects.filter(parent=area, type="wg", state="active").order_by("acronym")
-        for group in area.groups:
-            group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
+    return response_from_file(Path(settings.GROUP_SUMMARY_PATH) / "1wg-summary.txt")
 
-    areas = [a for a in areas if a.groups]
-
-    return render(request, 'group/1wg-summary.txt',
-                  { 'areas': areas },
-                  content_type='text/plain; charset=UTF-8')
 
 def wg_summary_acronym(request, group_type):
     if group_type != "wg":
         raise Http404
-    areas = Group.objects.filter(type="area", state="active").order_by("name")
-    groups = Group.objects.filter(type="wg", state="active").order_by("acronym").select_related("parent")
-    for group in groups:
-        group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
-    return render(request, 'group/1wg-summary-by-acronym.txt',
-                  { 'areas': areas,
-                    'groups': groups },
-                  content_type='text/plain; charset=UTF-8')
+    return response_from_file(Path(settings.GROUP_SUMMARY_PATH) / "1wg-summary-by-acronym.txt")
+
 
-@cache_page ( 60 * 60, cache="slowpages" )
 def wg_charters(request, group_type):
     if group_type != "wg":
         raise Http404
-    areas = Group.objects.filter(type="area", state="active").order_by("name")
-    for area in areas:
-        area.groups = Group.objects.filter(parent=area, type="wg", state="active").order_by("name")
-        for group in area.groups:
-            fill_in_charter_info(group)
-            fill_in_wg_roles(group)
-            fill_in_wg_drafts(group)
-    return render(request, 'group/1wg-charters.txt',
-                  { 'areas': areas },
-                  content_type='text/plain; charset=UTF-8')
-
-@cache_page ( 60 * 60, cache="slowpages" )
+    return response_from_file(Path(settings.CHARTER_PATH) / "1wg-charters.txt") 
+
+
 def wg_charters_by_acronym(request, group_type):
     if group_type != "wg":
         raise Http404
+    return response_from_file(Path(settings.CHARTER_PATH) / "1wg-charters-by-acronym.txt") 
 
-    groups = Group.objects.filter(type="wg", state="active").exclude(parent=None).order_by("acronym")
-    for group in groups:
-        fill_in_charter_info(group)
-        fill_in_wg_roles(group)
-        fill_in_wg_drafts(group)
-    return render(request, 'group/1wg-charters-by-acronym.txt',
-                  { 'groups': groups },
-                  content_type='text/plain; charset=UTF-8')
 
 def active_groups(request, group_type=None):
 
@@ -288,7 +197,7 @@ def active_groups(request, group_type=None):
         return active_dirs(request)
     elif group_type == "review":
         return active_review_dirs(request)
-    elif group_type in ("program", "iabasg"):
+    elif group_type in ("program", "iabasg","iabworkshop"):
         return active_iab(request)
     elif group_type == "adm":
         return active_adm(request)
@@ -298,8 +207,28 @@ def active_groups(request, group_type=None):
         raise Http404
 
 def active_group_types(request):
-    grouptypes = GroupTypeName.objects.filter(slug__in=['wg','rg','ag','rag','team','dir','review','area','program','iabasg','adm']).filter(group__state='active').annotate(group_count=Count('group'))
-    return render(request, 'group/active_groups.html', {'grouptypes':grouptypes})
+    grouptypes = (
+        GroupTypeName.objects.filter(
+            slug__in=[
+                "wg",
+                "rg",
+                "ag",
+                "rag",
+                "team",
+                "dir",
+                "review",
+                "area",
+                "program",
+                "iabasg",
+                "iabworkshop"
+                "adm",
+            ]
+        )
+        .filter(group__state="active")
+        .order_by('order', 'name')  # default ordering ignored for "GROUP BY" queries, make it explicit
+        .annotate(group_count=Count("group"))
+    )
+    return render(request, "group/active_groups.html", {"grouptypes": grouptypes})
 
 def active_dirs(request):
     dirs = Group.objects.filter(type__in=['dir', 'review'], state="active").order_by("name")
@@ -316,13 +245,22 @@ def active_review_dirs(request):
     return render(request, 'group/active_review_dirs.html', {'dirs' : dirs })
 
 def active_teams(request):
-    teams = Group.objects.filter(type="team", state="active").order_by("name")
+    parent_type_order = {"area": 1, "adm": 3, None: 4}
+
+    def team_sort_key(group):
+        type_id = group.parent.type_id if group.parent else None
+        return (parent_type_order.get(type_id, 2), group.parent.name if group.parent else "", group.name)
+
+    teams = sorted(
+        Group.objects.filter(type="team", state="active").select_related("parent"),
+        key=team_sort_key,
+    )
     for group in teams:
         group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
-    return render(request, 'group/active_teams.html', {'teams' : teams })
+    return render(request, 'group/active_teams.html', {'teams': teams})
 
 def active_iab(request):
-    iabgroups = Group.objects.filter(type__in=("program","iabasg"), state="active").order_by("-type_id","name")
+    iabgroups = Group.objects.filter(type__in=("program","iabasg","iabworkshop"), state="active").order_by("-type_id","name")
     for group in iabgroups:
         group.leads = sorted(roles(group, "lead"), key=extract_last_name)
     return render(request, 'group/active_iabgroups.html', {'iabgroups' : iabgroups })
@@ -332,7 +270,7 @@ def active_adm(request):
     return render(request, 'group/active_adm.html', {'adm' : adm })
 
 def active_rfced(request):
-    rfced = Group.objects.filter(type="rfcedtyp", state="active").order_by("parent", "name")
+    rfced = Group.objects.filter(type__in=["rfcedtyp", "edwg", "edappr"], state="active").order_by("parent", "name")
     return render(request, 'group/active_rfced.html', {'rfced' : rfced})
 
 
@@ -357,7 +295,7 @@ def active_wgs(request):
             if group.list_subscribe.startswith('http'):
                 group.list_subscribe_url = group.list_subscribe
             elif group.list_email.endswith('@ietf.org'):
-                group.list_subscribe_url = MAILING_LIST_INFO_URL % {'list_addr':group.list_email.split('@')[0]}
+                group.list_subscribe_url = MAILING_LIST_INFO_URL % {'list_addr':group.list_email.split('@')[0].lower(),'domain':'ietf.org'}
             else:
                 group.list_subscribe_url = "mailto:"+group.list_subscribe
 
@@ -411,35 +349,86 @@ def chartering_groups(request):
                   dict(charter_states=charter_states,
                        group_types=group_types))
 
+
 def concluded_groups(request):
     sections = OrderedDict()
 
-    sections['WGs'] = Group.objects.filter(type='wg', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
-    sections['RGs'] = Group.objects.filter(type='rg', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
-    sections['BOFs'] = Group.objects.filter(type='wg', state="bof-conc").select_related("state", "charter").order_by("parent__name","acronym")
-    sections['AGs'] = Group.objects.filter(type='ag', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
-    sections['RAGs'] = Group.objects.filter(type='rag', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
-    sections['Directorates'] = Group.objects.filter(type='dir', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
-    sections['Review teams'] = Group.objects.filter(type='review', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
-    sections['Teams'] = Group.objects.filter(type='team', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
-    sections['Programs'] = Group.objects.filter(type='program', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
+    sections["WGs"] = (
+        Group.objects.filter(type="wg", state="conclude")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
+    sections["RGs"] = (
+        Group.objects.filter(type="rg", state="conclude")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
+    sections["BOFs"] = (
+        Group.objects.filter(type="wg", state="bof-conc")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
+    sections["AGs"] = (
+        Group.objects.filter(type="ag", state="conclude")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
+    sections["RAGs"] = (
+        Group.objects.filter(type="rag", state="conclude")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
+    sections["Directorates"] = (
+        Group.objects.filter(type="dir", state="conclude")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
+    sections["Review teams"] = (
+        Group.objects.filter(type="review", state="conclude")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
+    sections["Teams"] = (
+        Group.objects.filter(type="team", state="conclude")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
+    sections["Programs"] = (
+        Group.objects.filter(type="program", state="conclude")
+        .select_related("state", "charter")
+        .order_by("parent__name", "acronym")
+    )
 
     for name, groups in sections.items():
-        
         # add start/conclusion date
         d = dict((g.pk, g) for g in groups)
 
         for g in groups:
             g.start_date = g.conclude_date = None
 
-        for e in ChangeStateGroupEvent.objects.filter(group__in=groups, state="active").order_by("-time"):
+        # Some older BOFs were created in the "active" state, so consider both "active" and "bof"
+        # ChangeStateGroupEvents when finding the start date. A group with _both_ "active" and "bof"
+        # events should not be in the "bof-conc" state so this shouldn't cause a problem (if it does,
+        # we'll need to clean up the data)
+        for e in ChangeStateGroupEvent.objects.filter(
+            group__in=groups,
+            state__in=["active", "bof"] if name == "BOFs" else ["active"],
+        ).order_by("-time"):
             d[e.group_id].start_date = e.time
 
-        for e in ChangeStateGroupEvent.objects.filter(group__in=groups, state="conclude").order_by("time"):
+        # Similarly, some older BOFs were concluded into the "conclude" state and the event was never
+        # fixed, so consider both "conclude" and "bof-conc" ChangeStateGroupEvents when finding the
+        # concluded date. A group with _both_ "conclude" and "bof-conc" events should not be in the
+        # "bof-conc" state so this shouldn't cause a problem (if it does, we'll need to clean up the
+        # data)
+        for e in ChangeStateGroupEvent.objects.filter(
+            group__in=groups,
+            state__in=["bof-conc", "conclude"] if name == "BOFs" else ["conclude"],
+        ).order_by("time"):
             d[e.group_id].conclude_date = e.time
 
-    return render(request, 'group/concluded_groups.html',
-                  dict(sections=sections))
+    return render(request, "group/concluded_groups.html", dict(sections=sections))
+
 
 def prepare_group_documents(request, group, clist):
     found_docs, meta = prepare_document_table(request, docs_tracked_by_community_list(clist), request.GET, max_results=500)
@@ -452,8 +441,8 @@ def prepare_group_documents(request, group, clist):
         # non-WG drafts and call for WG adoption are considered related
         if (d.group != group
             or (d.stream_id and d.get_state_slug("draft-stream-%s" % d.stream_id) in ("c-adopt", "wg-cand"))):
-            if d.get_state_slug() != "expired":
-                d.search_heading = "Related Internet-Draft"
+            if (d.type_id == "draft" and d.get_state_slug() not in ["expired","rfc"]) or d.type_id == "rfc":
+                d.search_heading = "Related Internet-Drafts and RFCs"
                 docs_related.append(d)
         else:
             if not (d.get_state_slug('draft-iesg') == "dead" or (d.stream_id and d.get_state_slug("draft-stream-%s" % d.stream_id) == "dead")):
@@ -463,6 +452,47 @@ def prepare_group_documents(request, group, clist):
 
     return docs, meta, docs_related, meta_related
 
+def get_leadership(group_type):
+    people = Person.objects.filter(
+        role__name__slug="chair",
+        role__group__type=group_type,
+        role__group__state__slug__in=("active", "bof", "proposed"),
+    ).distinct()
+    leaders = []
+    for person in people:
+        parts = person.name_parts()
+        groups = [
+            r.group.acronym
+            for r in person.role_set.filter(
+                name__slug="chair",
+                group__type=group_type,
+                group__state__slug__in=("active", "bof", "proposed"),
+            )
+        ]
+        entry = {"name": "%s, %s" % (parts[3], parts[1]), "groups": ", ".join(groups)}
+        leaders.append(entry)
+    return sorted(leaders, key=lambda a: a["name"])
+
+
+def group_leadership(request, group_type=None):
+    context = {}
+    context["leaders"] = get_leadership(group_type)
+    context["group_type"] = group_type
+    return render(request, "group/group_leadership.html", context)
+
+
+def group_leadership_csv(request, group_type=None):
+    leaders = get_leadership(group_type)
+    response = HttpResponse(content_type="text/csv")
+    response["Content-Disposition"] = (
+        f'attachment; filename="group_leadership_{group_type}.csv"'
+    )
+    writer = csv.writer(response, dialect=csv.excel, delimiter=str(","))
+    writer.writerow(["Name", "Groups"])
+    for leader in leaders:
+        writer.writerow([leader["name"], leader["groups"]])
+    return response
+
 def group_home(request, acronym, group_type=None):
     group = get_group_or_404(acronym, group_type)
     kwargs = dict(acronym=group.acronym)
@@ -512,9 +542,8 @@ def group_documents_txt(request, acronym, group_type=None):
 
     rows = []
     for d in itertools.chain(docs, docs_related):
-        rfc_number = d.rfc_number()
-        if rfc_number != None:
-            name = rfc_number
+        if d.type_id == "rfc":
+            name = str(d.rfc_number)
         else:
             name = "%s-%s" % (d.name, d.rev)
 
@@ -542,6 +571,7 @@ def group_about(request, acronym, group_type=None):
     can_provide_update = can_provide_status_update(request.user, group)
     status_update = group.latest_event(type="status_update")
 
+    subgroups = Group.objects.filter(parent=group, state="active").exclude(type__slug__in=["sdo", "individ", "nomcom"]).order_by("type", "acronym")
 
     return render(request, 'group/group_about.html',
                   construct_group_menu_context(request, group, "about", group_type, {
@@ -554,6 +584,7 @@ def group_about(request, acronym, group_type=None):
                       "charter_submit_url": charter_submit_url,
                       "editable_roles": group.used_roles or group.features.default_used_roles,
                       "closing_note": e,
+                      "subgroups": subgroups,
                   }))
 
 def all_status(request):
@@ -566,7 +597,7 @@ def all_status(request):
         if e:
             wg_reports.append(e)
 
-    wg_reports.sort(key=lambda x: (x.group.parent.acronym,datetime.datetime.now()-x.time))
+    wg_reports.sort(key=lambda x: (x.group.parent.acronym,timezone.now()-x.time))
 
     rg_reports = []
     for rg in rgs:
@@ -580,17 +611,6 @@ def all_status(request):
                   }
                  )
 
-def group_about_rendertest(request, acronym, group_type=None):
-    group = get_group_or_404(acronym, group_type)
-    charter = None
-    if group.charter:
-        charter = get_charter_text(group)
-    try:
-        rendered = markdown.markdown(charter)
-    except Exception as e:
-        rendered = f'Markdown rendering failed: {e}'
-    return render(request, 'group/group_about_rendertest.html', {'group':group, 'charter':charter, 'rendered':rendered})
-
 def group_about_status(request, acronym, group_type=None):
     group = get_group_or_404(acronym, group_type)
     status_update = group.latest_event(type='status_update')
@@ -651,21 +671,6 @@ def group_about_status_edit(request, acronym, group_type=None):
                   }
                  )
 
-def get_group_email_aliases(acronym, group_type):
-    if acronym:
-        pattern = re.compile(r'expand-(%s)(-\w+)@.*? +(.*)$'%acronym)
-    else:
-        pattern = re.compile(r'expand-(.*?)(-\w+)@.*? +(.*)$')
-
-    aliases = []
-    with io.open(settings.GROUP_VIRTUAL_PATH,"r") as virtual_file:
-        for line in virtual_file.readlines():
-            m = pattern.match(line)
-            if m:
-                if acronym or not group_type or Group.objects.filter(acronym=m.group(1),type__slug=group_type):
-                    aliases.append({'acronym':m.group(1),'alias_type':m.group(2),'expansion':m.group(3)})
-    return aliases
-
 def email(request, acronym, group_type=None):
     group = get_group_or_404(acronym, group_type)
 
@@ -693,6 +698,61 @@ def history(request, acronym, group_type=None):
                       "can_add_comment": can_add_comment,
                   }))
 
+
+class RequestsHistoryParamsForm(forms.Form):
+    SINCE_CHOICES = (
+        (None, "1 month"),
+        ("3m", "3 months"),
+        ("6m", "6 months"),
+        ("1y", "1 year"),
+        ("2y", "2 years"),
+        ("all", "All"),
+    )
+
+    reviewer_email = forms.EmailField(required=False)
+    since = forms.ChoiceField(choices=SINCE_CHOICES, required=False)
+
+def review_requests_history(request, acronym, group_type=None):
+    group = get_group_or_404(acronym, group_type)
+    if not group.features.has_reviews:
+        raise Http404
+
+    params = RequestsHistoryParamsForm(request.GET)
+    if not params.is_valid():
+        return HttpResponseBadRequest("Invalid parameters")
+
+    reviewer_email = params.cleaned_data["reviewer_email"] or None
+    if reviewer_email:
+        history = ReviewAssignment.history.model.objects.filter(
+            review_request__team__acronym=acronym,
+            reviewer=reviewer_email)
+    else:
+        history = ReviewAssignment.history.model.objects.filter(
+            review_request__team__acronym=acronym)
+        reviewer_email = ''
+        
+    since = params.cleaned_data["since"] or None
+    if since != "all":
+        date_limit = {
+            None: datetime.timedelta(days=31),
+            "3m": datetime.timedelta(days=31 * 3),
+            "6m": datetime.timedelta(days=180),
+            "1y": datetime.timedelta(days=365),
+            "2y": datetime.timedelta(days=2 * 365),
+        }[since]
+
+        history = history.filter(review_request__time__gte=datetime_today(DEADLINE_TZINFO) - date_limit)
+
+    return render(request, 'group/review_requests_history.html',
+                  construct_group_menu_context(request, group, "reviews history", group_type, {
+                      "group": group,
+                      "acronym": acronym,
+                      "history": history,
+                      "since_choices": params.SINCE_CHOICES,
+                      "since": since,
+                      "reviewer_email": reviewer_email
+                  }))
+
 def materials(request, acronym, group_type=None):
     group = get_group_or_404(acronym, group_type)
     if not group.features.has_nonsession_materials:
@@ -732,14 +792,31 @@ def dependencies(request, acronym, group_type=None):
         source__type="draft",
         relationship__slug__startswith="ref",
     )
-
-    both_rfcs = Q(source__states__slug="rfc", target__docs__states__slug="rfc")
-    inactive = Q(source__states__slug__in=["expired", "repl"])
+    rfc_or_subseries = {"rfc", "bcp", "fyi", "std"}
+    both_rfcs = Q(source__type_id="rfc", target__type_id__in=rfc_or_subseries)
+    pre_rfc_draft_to_rfc = Q(
+        source__states__type="draft",
+        source__states__slug="rfc",
+        target__type_id__in=rfc_or_subseries,
+    )
+    both_pre_rfcs = Q(
+        source__states__type="draft",
+        source__states__slug="rfc",
+        target__type_id="draft",
+        target__states__type="draft",
+        target__states__slug="rfc",
+    )
+    inactive = Q(
+        source__states__type="draft",
+        source__states__slug__in=["expired", "repl"],
+    )
     attractor = Q(target__name__in=["rfc5000", "rfc5741"])
-    removed = Q(source__states__slug__in=["auth-rm", "ietf-rm"])
+    removed = Q(source__states__type="draft", source__states__slug__in=["auth-rm", "ietf-rm"])
     relations = (
         RelatedDocument.objects.filter(references)
         .exclude(both_rfcs)
+        .exclude(pre_rfc_draft_to_rfc)
+        .exclude(both_pre_rfcs)
         .exclude(inactive)
         .exclude(attractor)
         .exclude(removed)
@@ -747,29 +824,28 @@ def dependencies(request, acronym, group_type=None):
 
     links = set()
     for x in relations:
-        target_state = x.target.document.get_state_slug("draft")
-        if target_state != "rfc" or x.is_downref():
+        always_include = x.target.type_id not in rfc_or_subseries and x.target.get_state_slug("draft") != "rfc" 
+        if always_include or x.is_downref():
             links.add(x)
 
     replacements = RelatedDocument.objects.filter(
         relationship__slug="replaces",
-        target__docs__in=[x.target.document for x in links],
+        target__in=[x.target for x in links],
     )
 
     for x in replacements:
         links.add(x)
 
-    nodes = set([x.source for x in links]).union([x.target.document for x in links])
+    nodes = set([x.source for x in links]).union([x.target for x in links])
     graph = {
         "nodes": [
             {
-                "id": x.canonical_name(),
-                "rfc": x.get_state("draft").slug == "rfc",
-                "post-wg": not x.get_state("draft-iesg").slug
-                in ["idexists", "watching", "dead"],
-                "expired": x.get_state("draft").slug == "expired",
-                "replaced": x.get_state("draft").slug == "repl",
-                "group": x.group.acronym if x.group.acronym != "none" else "",
+                "id": x.became_rfc().name if x.became_rfc() else x.name,
+                "rfc": x.type_id == "rfc" or x.became_rfc() is not None,
+                "post-wg": x.get_state_slug("draft-iesg") not in ["idexists", "dead"],
+                "expired": x.get_state_slug("draft") == "expired",
+                "replaced": x.get_state_slug("draft") == "repl",
+                "group": x.group.acronym if x.group and x.group.acronym != "none" else "",
                 "url": x.get_absolute_url(),
                 "level": x.intended_std_level.name
                 if x.intended_std_level
@@ -781,8 +857,8 @@ def dependencies(request, acronym, group_type=None):
         ],
         "links": [
             {
-                "source": x.source.canonical_name(),
-                "target": x.target.document.canonical_name(),
+                "source": x.source.became_rfc().name if x.source.became_rfc() else x.source.name,
+                "target": x.target.became_rfc().name if x.target.became_rfc() else x.target.name,
                 "rel": "downref" if x.is_downref() else x.relationship.slug,
             }
             for x in links
@@ -805,35 +881,125 @@ def email_aliases(request, acronym=None, group_type=None):
 
     return render(request,'group/email_aliases.html',{'aliases':aliases,'ietf_domain':settings.IETF_DOMAIN,'group':group})
 
-def meetings(request, acronym=None, group_type=None):
-    group = get_group_or_404(acronym,group_type) if acronym else None
+def meetings(request, acronym, group_type=None):
+    group = get_group_or_404(acronym, group_type)
+
+    four_years_ago = timezone.now() - datetime.timedelta(days=4 * 365)
+
+    stsas = SchedTimeSessAssignment.objects.filter(
+        session__type__in=["regular", "plenary", "other"],
+        session__group=group)
+    if group.acronym not in ["iab", "iesg"]:
+        stsas = stsas.filter(session__meeting__date__gt=four_years_ago)
+    stsas = stsas.annotate(sessionstatus=Coalesce(
+                Subquery(
+                    SchedulingEvent.objects.filter(
+                        session=OuterRef("session__pk")
+                    ).order_by(
+                        '-time', '-id'
+                    ).values('status')[:1]),
+                Value(''), 
+                output_field=TextField())
+    ).filter(
+        sessionstatus__in=["sched", "schedw", "appr", "canceled"],
+        session__meeting__schedule=F("schedule")
+    ).distinct().select_related(
+        "session", "session__group", "session__group__parent", "session__meeting__type", "timeslot"
+    ).prefetch_related(
+        "session__materials",
+        "session__materials__states",
+        Prefetch("session__materials",
+            queryset=Document.objects.exclude(states__type=F("type"), states__slug='deleted').order_by('presentations__order').prefetch_related('states'),
+            to_attr="prefetched_active_materials"
+        ),
+    )
+
+    stsas = list(stsas)
 
-    four_years_ago = datetime.datetime.now()-datetime.timedelta(days=4*365)
+    for stsa in stsas:
+        stsa.session._otsa = stsa
+        stsa.session.official_timeslotassignment = types.MethodType(lambda self:self._otsa, stsa.session)
+        stsa.session.current_status = stsa.sessionstatus
 
-    sessions = add_event_info_to_session_qs(
-        group.session_set.filter(
-            meeting__date__gt=four_years_ago,
-            type__in=['regular','plenary','other']
+    sessions = sorted(
+        set([stsa.session for stsa in stsas]),
+        key=lambda x: (
+            x._otsa.timeslot.time,
+            x._otsa.timeslot.type_id,
+            x._otsa.session.group.parent.name if x._otsa.session.group.parent else None,
+            x._otsa.session.name
         )
-    ).filter(
-        current_status__in=['sched','schedw','appr','canceled'],
     )
 
+    meeting_seen = None
+    for s in sessions:
+        if s.meeting != meeting_seen:
+            meeting_seen = s.meeting
+            order = 1
+        s._oim = order
+        s.order_in_meeting = types.MethodType(lambda self:self._oim, s)
+        order += 1
+
+
+    revsub_dates_by_meeting = dict(ImportantDate.objects.filter(name_id="revsub", meeting__session__in=sessions).distinct().values_list("meeting_id","date"))
+
+    for s in sessions:
+        s.order_number = s.order_in_meeting()
+        if s.meeting.pk in revsub_dates_by_meeting:
+            cutoff_date = revsub_dates_by_meeting[s.meeting.pk]
+        else:
+            cutoff_date = s.meeting.date + datetime.timedelta(days=s.meeting.submission_correction_day_offset)
+        s.cached_is_cutoff = date_today(datetime.UTC) > cutoff_date
+
     future, in_progress, recent, past = group_sessions(sessions)
 
-    can_edit = group.has_role(request.user,group.features.groupman_roles)
-    can_always_edit = has_role(request.user,["Secretariat","Area Director"])
-
-    return render(request,'group/meetings.html',
-                  construct_group_menu_context(request, group, "meetings", group_type, {
-                     'group':group,
-                     'future':future,
-                     'in_progress':in_progress,
-                     'recent':recent,
-                     'past':past,
-                     'can_edit':can_edit,
-                     'can_always_edit':can_always_edit,
-                  }))
+    can_edit = group.has_role(request.user, group.features.groupman_roles)
+    can_always_edit = has_role(request.user, ["Secretariat", "Area Director"])
+
+    far_past = []
+    if group.acronym in ["iab", "iesg"]:
+        recent_past = []
+        for s in past:
+            if s.time >= four_years_ago:
+                recent_past.append(s)
+            else:
+                far_past.append(s)
+        past = recent_past
+
+    # Add calendar actions
+    cal_actions = []
+
+    cal_actions.append(dict(
+        label='Download as .ics',
+        url=reverse('ietf.meeting.views.upcoming_ical')+"?show="+group.acronym)
+    )
+    cal_actions.append(dict(
+        label='Subscribe with webcal',
+        url='webcal://'+request.get_host()+reverse('ietf.meeting.views.upcoming_ical')+"?show="+group.acronym)
+    )
+
+    return render(
+        request,
+        "group/meetings.html",
+        construct_group_menu_context(
+            request,
+            group,
+            "meetings",
+            group_type,
+            {
+                "group": group,
+                "future": future,
+                "in_progress": in_progress,
+                "recent": recent,
+                "past": past,
+                "far_past": far_past,
+                "can_edit": can_edit,
+                "can_always_edit": can_always_edit,
+                "cal_actions": cal_actions,
+            },
+        ),
+    )
+
 
 def chair_photos(request, group_type=None):
     roles = sorted(Role.objects.filter(group__type=group_type, group__state='active', name_id='chair'),key=lambda x: x.person.last_name()+x.person.name+x.group.acronym)
@@ -862,60 +1028,6 @@ def group_photos(request, group_type=None, acronym=None):
                       'group':group }))
 
 
-
-## XXX Remove after testing
-# def get_or_create_initial_charter(group, group_type):
-#     charter_name = charter_name_for_group(group)
-# 
-#     try:
-#         charter = Document.objects.get(docalias__name=charter_name)
-#     except Document.DoesNotExist:
-#         charter = Document(
-#             name=charter_name,
-#             type_id="charter",
-#             title=group.name,
-#             group=group,
-#             abstract=group.name,
-#             rev="00-00",
-#         )
-#         charter.save()
-#         charter.set_state(State.objects.get(used=True, type="charter", slug="notrev"))
-# 
-#         # Create an alias as well
-#         DocAlias.objects.create(name=charter.name).docs.add(charter)
-# 
-#     return charter
-# 
-# @login_required
-# def submit_initial_charter(request, group_type=None, acronym=None):
-# 
-#     # This needs refactoring.
-#     # The signature assumed you could have groups with the same name, but with different types, which we do not allow.
-#     # Consequently, this can be called with an existing group acronym and a type 
-#     # that doesn't match the existing group type. The code below essentially ignores the group_type argument.
-#     #
-#     # If possible, the use of get_or_create_initial_charter should be moved
-#     # directly into charter_submit, and this function should go away.
-# 
-#     if acronym==None:
-#         raise Http404
-# 
-#     group = get_object_or_404(Group, acronym=acronym)
-#     if not group.features.has_chartering_process:
-#         raise Http404
-# 
-#     # This is where we start ignoring the passed in group_type
-#     group_type = group.type_id
-# 
-#     if not can_manage_group(request.user, group):
-#         permission_denied(request, "You don't have permission to access this view")
-# 
-#     if not group.charter:
-#         group.charter = get_or_create_initial_charter(group, group_type)
-#         group.save()
-# 
-#     return redirect('ietf.doc.views_charter.submit', name=group.charter.name, option="initcharter")
-
 @login_required
 def edit(request, group_type=None, acronym=None, action="edit", field=None):
     """Edit or create a group, notifying parties as
@@ -958,21 +1070,24 @@ def diff(attr, name):
         if not (can_manage_group(request.user, group)
                 or group.has_role(request.user, group.features.groupman_roles)):
             permission_denied(request, "You don't have permission to access this view")
+        hide_parent = not has_role(request.user, ("Secretariat", "Area Director", "IRTF Chair"))
     else:
         # This allows ADs to create RG and the IRTF Chair to create WG, but we trust them not to
         if not has_role(request.user, ("Secretariat", "Area Director", "IRTF Chair")):
              permission_denied(request, "You don't have permission to access this view")
-                
+        hide_parent = False
 
     if request.method == 'POST':
-        form = GroupForm(request.POST, group=group, group_type=group_type, field=field)
+        form = GroupForm(request.POST, group=group, group_type=group_type, field=field, hide_parent=hide_parent)
+        if field and not form.fields:
+            permission_denied(request, "You don't have permission to edit this field")
         if form.is_valid():
             clean = form.cleaned_data
             if new_group:
                 try:
                     group = Group.objects.get(acronym=clean["acronym"])
                     save_group_in_history(group)
-                    group.time = datetime.datetime.now()
+                    group.time = timezone.now()
                     group.save()
                 except Group.DoesNotExist:
                     group = Group.objects.create(name=clean["name"],
@@ -1026,7 +1141,7 @@ def diff(attr, name):
                     change_text=title + ' deleted: ' + ", ".join(x.name_and_email() for x in deleted)
                     personnel_change_text+=change_text+"\n"
 
-                    today = datetime.date.today()
+                    today = date_today()
                     for deleted_email in deleted:
                         # Verify the person doesn't have a separate reviewer role for the group with a different address
                         if not group.role_set.filter(name_id='reviewer',person=deleted_email.person).exists():
@@ -1071,7 +1186,7 @@ def diff(attr, name):
                         )
                     ))
 
-            group.time = datetime.datetime.now()
+            group.time = timezone.now()
 
             if changes and not new_group:
                 for attr, new, desc in changes:
@@ -1127,7 +1242,9 @@ def diff(attr, name):
 
         else:
             init = dict()
-        form = GroupForm(initial=init, group=group, group_type=group_type, field=field)
+        form = GroupForm(initial=init, group=group, group_type=group_type, field=field, hide_parent=hide_parent)
+        if field and not form.fields:
+            permission_denied(request, "You don't have permission to edit this field")
 
     return render(request, 'group/edit.html',
                   dict(group=group,
@@ -1281,6 +1398,8 @@ def streams(request):
     return render(request, 'group/index.html', {'streams':streams})
 
 def stream_documents(request, acronym):
+    if acronym == "editorial":
+        return HttpResponseRedirect(urlreverse(group_documents, kwargs=dict(acronym="rswg")))
     streams = [ s.slug for s in StreamName.objects.all().exclude(slug__in=['ietf', 'legacy']) ]
     if not acronym in streams:
         raise Http404("No such stream: %s" % acronym)
@@ -1288,7 +1407,10 @@ def stream_documents(request, acronym):
     editable = has_role(request.user, "Secretariat") or group.has_role(request.user, "chair")
     stream = StreamName.objects.get(slug=acronym)
 
-    qs = Document.objects.filter(states__type="draft", states__slug__in=["active", "rfc"], stream=acronym)
+    qs = Document.objects.filter(stream=acronym).filter(
+        Q(type_id="draft", states__type="draft", states__slug="active")
+        | Q(type_id="rfc")
+    ).distinct()
     docs, meta = prepare_document_table(request, qs, max_results=1000)
     return render(request, 'group/stream_documents.html', {'stream':stream, 'docs':docs, 'meta':meta, 'editable':editable } )
 
@@ -1338,20 +1460,132 @@ def stream_edit(request, acronym):
                 )
 
 
-@cache_control(public=True, max_age=30*60)
+@cache_control(public=True, max_age=30 * 60)
 @cache_page(30 * 60)
 def group_menu_data(request):
-    groups = Group.objects.filter(state="active", parent__state="active").filter(Q(type__features__acts_like_wg=True)|Q(type_id__in=['program','iabasg'])|Q(parent__acronym='ietfadminllc')|Q(parent__acronym='rfceditor')).order_by("-type_id","acronym")
+    groups = (
+        Group.objects.filter(state="active", parent__state="active")
+        .filter(
+            Q(type__features__acts_like_wg=True)
+            | Q(type_id__in=["program", "iabasg", "iabworkshop"])
+            | Q(parent__acronym="ietfadminllc")
+            | Q(parent__acronym="rfceditor")
+        )
+        .order_by("-type_id", "acronym")
+        .select_related("type")
+    )
 
     groups_by_parent = defaultdict(list)
     for g in groups:
-        url = urlreverse("ietf.group.views.group_home", kwargs={ 'group_type': g.type_id, 'acronym': g.acronym })
-#        groups_by_parent[g.parent_id].append({ 'acronym': g.acronym, 'name': escape(g.name), 'url': url })
-        groups_by_parent[g.parent_id].append({ 'acronym': g.acronym, 'name': escape(g.name), 'type': escape(g.type.verbose_name or g.type.name), 'url': url })
+        url = urlreverse(
+            "ietf.group.views.group_home",
+            kwargs={"group_type": g.type_id, "acronym": g.acronym},
+        )
+        #        groups_by_parent[g.parent_id].append({ 'acronym': g.acronym, 'name': escape(g.name), 'url': url })
+        groups_by_parent[g.parent_id].append(
+            {
+                "acronym": g.acronym,
+                "name": escape(g.name),
+                "type": escape(g.type.verbose_name or g.type.name),
+                "url": url,
+            }
+        )
 
+    iab = Group.objects.get(acronym="iab")
+    groups_by_parent[iab.pk].insert(
+        0,
+        {
+            "acronym": iab.acronym,
+            "name": iab.name,
+            "type": "Top Level Group",
+            "url": urlreverse(
+                "ietf.group.views.group_home", kwargs={"acronym": iab.acronym}
+            ),
+        },
+    )
     return JsonResponse(groups_by_parent)
 
 
+
+@cache_control(public=True, max_age=30 * 60)
+@cache_page(30 * 60)
+def group_stats_data(request, years="3", only_active=True):
+    when = timezone.now() - datetime.timedelta(days=int(years) * 365)
+    docs = (
+        Document.objects.filter(type="draft", stream="ietf")
+        .filter(
+            Q(docevent__newrevisiondocevent__time__gte=when)
+            | Q(docevent__type="published_rfc", docevent__time__gte=when)
+        )
+        .exclude(states__type="draft", states__slug="repl")
+        .distinct()
+    )
+
+    data = []
+    for a in Group.objects.filter(type="area"):
+        if only_active and not a.is_active:
+            continue
+
+        area_docs = docs.filter(group__parent=a).exclude(group__acronym="none")
+        if not area_docs:
+            continue
+
+        area_page_cnt = 0
+        area_doc_cnt = 0
+        for wg in Group.objects.filter(type="wg", parent=a):
+            if only_active and not wg.is_active:
+                continue
+
+            wg_docs = area_docs.filter(group=wg)
+            if not wg_docs:
+                continue
+
+            wg_page_cnt = 0
+            for doc in wg_docs:
+                # add doc data
+                data.append(
+                    {
+                        "id": doc.name,
+                        "active": True,
+                        "parent": wg.acronym,
+                        "grandparent": a.acronym,
+                        "pages": doc.pages,
+                        "docs": 1,
+                    }
+                )
+                wg_page_cnt += doc.pages
+
+            area_doc_cnt += len(wg_docs)
+            area_docs = area_docs.exclude(group=wg)
+
+            # add WG data
+            data.append(
+                {
+                    "id": wg.acronym,
+                    "active": wg.is_active,
+                    "parent": a.acronym,
+                    "grandparent": "ietf",
+                    "pages": wg_page_cnt,
+                    "docs": len(wg_docs),
+                }
+            )
+            area_page_cnt += wg_page_cnt
+
+        # add area data
+        data.append(
+            {
+                "id": a.acronym,
+                "active": a.is_active,
+                "parent": "ietf",
+                "pages": area_page_cnt,
+                "docs": area_doc_cnt,
+            }
+        )
+
+    data.append({"id": "ietf", "active": True})
+    return JsonResponse(data, safe=False)
+
+
 # --- Review views -----------------------------------------------------
 
 def get_open_review_requests_for_team(team, assignment_status=None):
@@ -1387,7 +1621,7 @@ def review_requests(request, acronym, group_type=None):
     unassigned_review_requests.sort(key=lambda r: r.doc.name)
 
     open_review_assignments = list(ReviewAssignment.objects.filter(review_request__team=group, state_id__in=('assigned','accepted')).order_by('-assigned_on'))
-    today = datetime.date.today()
+    today = date_today(DEADLINE_TZINFO)
     unavailable_periods = current_unavailable_periods_for_reviewers(group)
     for a in open_review_assignments:
         a.reviewer_unavailable = any(p.availability == "unavailable"
@@ -1420,11 +1654,14 @@ def review_requests(request, acronym, group_type=None):
         }[since]
 
         closed_review_requests = closed_review_requests.filter(
-              Q(reviewrequestdocevent__type='closed_review_request', reviewrequestdocevent__time__gte=datetime.date.today() - date_limit)
-            | Q(reviewrequestdocevent__isnull=True, time__gte=datetime.date.today() - date_limit)
+              Q(reviewrequestdocevent__type='closed_review_request',
+                reviewrequestdocevent__time__gte=datetime_today(DEADLINE_TZINFO) - date_limit)
+            | Q(reviewrequestdocevent__isnull=True, time__gte=datetime_today(DEADLINE_TZINFO) - date_limit)
         ).distinct()
 
-        closed_review_assignments = closed_review_assignments.filter(completed_on__gte = datetime.date.today() - date_limit)
+        closed_review_assignments = closed_review_assignments.filter(
+            completed_on__gte = datetime_today(DEADLINE_TZINFO) - date_limit,
+        )
 
     return render(request, 'group/review_requests.html',
                   construct_group_menu_context(request, group, "review requests", group_type, {
@@ -1455,7 +1692,7 @@ def reviewer_overview(request, acronym, group_type=None):
         unavailable_periods[p.person_id].append(p)
     reviewer_roles = { r.person_id: r for r in Role.objects.filter(group=group, name="reviewer").select_related("email") }
 
-    today = datetime.date.today()
+    today = date_today()
 
     max_closed_reqs = settings.GROUP_REVIEW_MAX_ITEMS_TO_SHOW_IN_REVIEWER_LIST
     days_back = settings.GROUP_REVIEW_DAYS_TO_SHOW_IN_REVIEWER_LIST
@@ -1509,7 +1746,7 @@ def reviewer_overview(request, acronym, group_type=None):
                                     int(math.ceil(d.assignment_to_closure_days)) if d.assignment_to_closure_days is not None else None))
             if d.state in ["completed", "completed_in_time", "completed_late"]:
                 if d.assigned_time is not None:
-                    delta = datetime.datetime.now() - d.assigned_time
+                    delta = timezone.now() - d.assigned_time
                     if d.assignment_to_closure_days is not None:
                         days = int(delta.days - d.assignment_to_closure_days)
                         if days_since > days: days_since = days
@@ -1685,7 +1922,7 @@ def email_open_review_assignments(request, acronym, group_type=None):
             r.section = 'Last calls:'
             r.section_order='1'
         e = r.review_request.doc.latest_event(LastCallDocEvent, type="sent_last_call")
-        r.lastcall_ends = e and e.expires.date().isoformat()
+        r.lastcall_ends = e and e.expires.astimezone(DEADLINE_TZINFO).date().isoformat()
         r.earlier_review = ReviewAssignment.objects.filter(review_request__doc=r.review_request.doc,reviewer__in=r.reviewer.person.email_set.all(),state="completed")
         if r.earlier_review:
             earlier_reviews_formatted = ['-{} {} reviewed'.format(ra.reviewed_rev, ra.review_request.type.slug) for ra in r.earlier_review]
@@ -1833,7 +2070,7 @@ def change_reviewer_settings(request, acronym, reviewer_email, group_type=None):
             period.save()
             update_change_reason(period, "Added unavailability period: {}".format(period))
 
-            today = datetime.date.today()
+            today = date_today()
 
             in_the_past = period.end_date and period.end_date < today
 
@@ -1874,7 +2111,7 @@ def change_reviewer_settings(request, acronym, reviewer_email, group_type=None):
                     period.delete()
                     update_change_reason(period, "Removed unavailability period: {}".format(period))
 
-                    today = datetime.date.today()
+                    today = date_today()
 
                     in_the_past = period.end_date and period.end_date < today
 
@@ -2011,7 +2248,87 @@ def reset_next_reviewer(request, acronym, group_type=None):
 
     return render(request, 'group/reset_next_reviewer.html', { 'group':group, 'form': form,})
 
+def statements(request, acronym, group_type=None):
+    if not acronym in ["iab", "iesg"]:
+        raise Http404
+    group = get_group_or_404(acronym, group_type)
+    statements = (
+        group.document_set.filter(type_id="statement")
+        .annotate(
+            published=Subquery(
+                DocEvent.objects.filter(doc=OuterRef("pk"), type="published_statement")
+                .order_by("-time")
+                .values("time")[:1]
+            )
+        )
+        .annotate(
+            status=Subquery(
+                Document.states.through.objects.filter(
+                    document_id=OuterRef("pk"), state__type="statement"
+                ).values_list("state__slug", flat=True)[:1]
+            )
+        )
+        .order_by("status", "-published")
+    )
+    return render(
+        request,
+        "group/statements.html",
+        construct_group_menu_context(
+            request,
+            group,
+            "statements",
+            group_type,
+            {
+                "group": group,
+                "statements": statements,
+            },
+        ),
+    )
 
+def appeals(request, acronym, group_type=None):
+    if not acronym in ["iab", "iesg"]:
+        raise Http404
+    group = get_group_or_404(acronym, group_type)
+    appeals = group.appeal_set.all()
+    return render(
+        request,
+        "group/appeals.html",
+        construct_group_menu_context(
+            request,
+            group,
+            "appeals",
+            group_type,
+            {
+                "group": group,
+                "appeals": appeals,
+            },
+        ),
+    )
 
-
-
+@ignore_view_kwargs("group_type")
+def appeal_artifact(request, acronym, artifact_id):
+    artifact = get_object_or_404(AppealArtifact, pk=artifact_id)
+    if artifact.is_markdown():
+        artifact_html = markdown.markdown(artifact.bits.tobytes().decode("utf-8"))
+        return render(
+            request,
+            "group/appeal_artifact.html",
+            dict(artifact=artifact, artifact_html=artifact_html)
+        )
+    else:
+        return HttpResponse(
+            artifact.bits, 
+            headers = {
+                "Content-Type": artifact.content_type,
+                "Content-Disposition": f'attachment; filename="{artifact.download_name()}"'
+            }
+        )
+    
+@role_required("Secretariat")
+@ignore_view_kwargs("group_type")
+def appeal_artifact_markdown(request, acronym, artifact_id):
+    artifact = get_object_or_404(AppealArtifact, pk=artifact_id)
+    if artifact.is_markdown():
+        return HttpResponse(artifact.bits, content_type=artifact.content_type)
+    else:
+        raise Http404
diff --git a/ietf/secr/areas/__init__.py b/ietf/help/migrations/__init__.py
similarity index 100%
rename from ietf/secr/areas/__init__.py
rename to ietf/help/migrations/__init__.py
diff --git a/ietf/help/tests_views.py b/ietf/help/tests_views.py
deleted file mode 100644
index 714dab39ed..0000000000
--- a/ietf/help/tests_views.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from pyquery import PyQuery
-
-from django.urls import reverse
-
-import debug                            # pyflakes:ignore
-
-from ietf.utils.test_utils import TestCase
-from ietf.doc.models import StateType
-
-class HelpPageTests(TestCase):
-
-    def test_state_index(self):
-        url = reverse('ietf.help.views.state_index')
-        r = self.client.get(url)
-        q = PyQuery(r.content)
-        content = [ e.text for e in q('#content table td a ') ]
-        names = StateType.objects.values_list('slug', flat=True)
-        # The following doesn't cover all doc types, only a selection
-        for name in names:
-            if not '-' in name:
-                self.assertIn(name, content)
-
-        
-    def test_personal_information_help(self):
-        r = self.client.get('/help/personal-information')
-        self.assertContains(r, 'personal information')
-        self.assertContains(r, 'GDPR')
diff --git a/ietf/help/urls.py b/ietf/help/urls.py
index 9c0bfb1577..90ce7e12e9 100644
--- a/ietf/help/urls.py
+++ b/ietf/help/urls.py
@@ -1,14 +1,11 @@
-# Copyright The IETF Trust 2013-2018, All Rights Reserved
-
-from django.views.generic import TemplateView
+# Copyright The IETF Trust 2013-2022, All Rights Reserved
 
 from ietf.help import views
 from ietf.utils.urls import url
+from django.views.generic import RedirectView
 
 urlpatterns = [
     url(r'^state/(?P<doc>[-\w]+)/(?P<type>[-\w]+)/?$', views.state),
     url(r'^state/(?P<doc>[-\w]+)/?$', views.state),
-    url(r'^state/?$', views.state_index),
-    url(r'^personal-information/?$', TemplateView.as_view(template_name='help/personal-information.html'), name='personal-information'),
+    url(r'^state/?$', RedirectView.as_view(url='/doc/help/state/', permanent=True)),
 ]
-
diff --git a/ietf/help/views.py b/ietf/help/views.py
index 9c0060e991..493bf0dcf1 100644
--- a/ietf/help/views.py
+++ b/ietf/help/views.py
@@ -1,25 +1,11 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-import os
-
-from django.shortcuts import get_object_or_404, render
-
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import State, StateType
 from ietf.name.models import StreamName
+from django.shortcuts import redirect
 
-def state_index(request):
-    types = StateType.objects.all()
-    names = [ type.slug for type in types ]
-    for type in types:
-        if "-" in type.slug and type.slug.split('-',1)[0] in names:
-            type.stategroups = None
-        else:
-            groups = StateType.objects.filter(slug__startswith=type.slug)
-            type.stategroups =  [ g.slug[len(type.slug)+1:] for g in groups if not g == type ] or ""
-                
-    return render(request, 'help/state_index.html', {"types": types})
+# This is just a redirect to the new URL under /doc; can probably go away eventually.
 
 def state(request, doc, type=None):
     if type:
@@ -27,14 +13,5 @@ def state(request, doc, type=None):
         if type in streams:
             type = "stream-%s" % type
     slug = "%s-%s" % (doc,type) if type else doc
-    statetype = get_object_or_404(StateType, slug=slug)
-    states = State.objects.filter(used=True, type=statetype).order_by('order')
-    return render(request, 'help/states.html', {"doc": doc, "type": statetype, "states":states} )
-
-def environment(request):
-    if request.is_secure():
-        os.environ['SCHEME'] = "https"
-    else:
-        os.environ['SCHEME'] = "http"
-    os.environ["URL"] = request.build_absolute_uri(".")
-    return render(request, 'help/environment.html', {"env": os.environ} )
+    return redirect('/doc/help/state/%s' % slug, permanent = True)
+    
\ No newline at end of file
diff --git a/ietf/idindex/.gitignore b/ietf/idindex/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/idindex/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/idindex/index.py b/ietf/idindex/index.py
index 3d17b197ca..19eb29d4da 100644
--- a/ietf/idindex/index.py
+++ b/ietf/idindex/index.py
@@ -7,14 +7,14 @@
 
 import datetime
 import os
-import pytz
 
 from django.conf import settings
 from django.template.loader import render_to_string
+from django.utils import timezone
 
 import debug    # pyflakes:ignore
 
-from ietf.doc.models import Document, DocEvent, DocumentAuthor, RelatedDocument, DocAlias, State
+from ietf.doc.models import Document, DocEvent, DocumentAuthor, RelatedDocument, State
 from ietf.doc.models import LastCallDocEvent, NewRevisionDocEvent
 from ietf.doc.models import IESG_SUBSTATE_TAGS
 from ietf.doc.templatetags.ietf_filters import clean_whitespace
@@ -31,15 +31,18 @@ def formatted_rev_date(name):
         t = revision_time.get(name)
         return t.strftime("%Y-%m-%d") if t else ""
 
-    rfc_aliases = dict(DocAlias.objects.filter(name__startswith="rfc",
-                                               docs__states=State.objects.get(type="draft", slug="rfc")).values_list("docs__name", "name"))
+    rfcs = dict()
+    for rfc in Document.objects.filter(type_id="rfc"):
+        draft = rfc.came_from_draft()
+        if draft is not None:
+            rfcs[draft.name] = rfc.name
 
-    replacements = dict(RelatedDocument.objects.filter(target__docs__states=State.objects.get(type="draft", slug="repl"),
+    replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"),
                                                        relationship="replaces").values_list("target__name", "source__name"))
 
 
     # we need a distinct to prevent the queries below from multiplying the result
-    all_ids = Document.objects.filter(type="draft").order_by('name').exclude(name__startswith="rfc").distinct()
+    all_ids = Document.objects.filter(type="draft").order_by('name').distinct()
 
     res = ["\nInternet-Drafts Status Summary\n"]
 
@@ -48,7 +51,7 @@ def add_line(f1, f2, f3, f4):
         res.append(f1 + "\t" + f2 + "\t" + f3 + "\t" + f4)
 
 
-    inactive_states = ["idexists", "pub", "watching", "dead"]
+    inactive_states = ["idexists", "pub", "dead"]
 
     excludes = list(State.objects.filter(type="draft", slug__in=["rfc","repl"]))
     includes = list(State.objects.filter(type="draft-iesg").exclude(slug__in=inactive_states))
@@ -62,7 +65,7 @@ def add_line(f1, f2, f3, f4):
             state += "::" + "::".join(tags)
         add_line(d.name + "-" + d.rev,
                  formatted_rev_date(d.name),
-                 "In IESG processing - ID Tracker state <" + state + ">",
+                 "In IESG processing - I-D Tracker state <" + state + ">",
                  "",
                  )
 
@@ -77,9 +80,9 @@ def add_line(f1, f2, f3, f4):
             last_field = ""
 
             if s.slug == "rfc":
-                a = rfc_aliases.get(name)
-                if a:
-                    last_field = a[3:]
+                rfc = rfcs.get(name)
+                if rfc:
+                    last_field = rfc[3:] # Rework this to take advantage of having the number at hand already.
             elif s.slug == "repl":
                 state += " replaced by " + replacements.get(name, "0")
 
@@ -108,14 +111,17 @@ def file_types_for_drafts():
 def all_id2_txt():
     # this returns a lot of data so try to be efficient
 
-    drafts = Document.objects.filter(type="draft").exclude(name__startswith="rfc").order_by('name')
+    drafts = Document.objects.filter(type="draft").order_by('name')
     drafts = drafts.select_related('group', 'group__parent', 'ad', 'intended_std_level', 'shepherd', )
     drafts = drafts.prefetch_related("states")
 
-    rfc_aliases = dict(DocAlias.objects.filter(name__startswith="rfc",
-                                               docs__states=State.objects.get(type="draft", slug="rfc")).values_list("docs__name", "name"))
+    rfcs = dict()
+    for rfc in Document.objects.filter(type_id="rfc"):
+        draft = rfc.came_from_draft()
+        if draft is not None:
+            rfcs[draft.name] = rfc.name
 
-    replacements = dict(RelatedDocument.objects.filter(target__docs__states=State.objects.get(type="draft", slug="repl"),
+    replacements = dict(RelatedDocument.objects.filter(target__states=State.objects.get(type="draft", slug="repl"),
                                                        relationship="replaces").values_list("target__name", "source__name"))
 
     revision_time = dict(DocEvent.objects.filter(type="new_revision", doc__name__startswith="draft-").order_by('time').values_list("doc__name", "time"))
@@ -164,9 +170,9 @@ def all_id2_txt():
         # 4
         rfc_number = ""
         if state == "rfc":
-            a = rfc_aliases.get(d.name)
-            if a:
-                rfc_number = a[3:]
+            rfc = rfcs.get(d.name)
+            if rfc:
+                rfc_number = rfc[3:]
         fields.append(rfc_number)
         # 5
         repl = ""
@@ -270,7 +276,7 @@ def active_drafts_index_by_group(extra_values=()):
     groups = [g for g in groups_dict.values() if hasattr(g, "active_drafts")]
     groups.sort(key=lambda g: g.acronym)
 
-    fallback_time = datetime.datetime(1950, 1, 1)
+    fallback_time = datetime.datetime(1950, 1, 1, tzinfo=datetime.UTC)
     for g in groups:
         g.active_drafts.sort(key=lambda d: d.get("initial_rev_time", fallback_time))
 
@@ -296,6 +302,6 @@ def id_index_txt(with_abstracts=False):
 
     return render_to_string("idindex/id_index.txt", {
             'groups': groups,
-            'time': datetime.datetime.now(pytz.UTC).strftime("%Y-%m-%d %H:%M:%S %Z"),
+            'time': timezone.now().astimezone(datetime.UTC).strftime("%Y-%m-%d %H:%M:%S %Z"),
             'with_abstracts': with_abstracts,
             })
diff --git a/ietf/idindex/tasks.py b/ietf/idindex/tasks.py
new file mode 100644
index 0000000000..2f5f1871d7
--- /dev/null
+++ b/ietf/idindex/tasks.py
@@ -0,0 +1,99 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+#
+# Celery task definitions
+#
+import os
+import shutil
+
+import debug    # pyflakes:ignore
+
+from celery import shared_task
+from contextlib import AbstractContextManager
+from pathlib import Path
+from tempfile import NamedTemporaryFile
+from typing import List
+
+from django.conf import settings
+
+from ietf.doc.storage_utils import store_file
+
+from .index import all_id_txt, all_id2_txt, id_index_txt
+
+
+class TempFileManager(AbstractContextManager):
+    def __init__(self, tmpdir=None) -> None:
+        self.cleanup_list: set[Path] = set()
+        self.dir = tmpdir
+
+    def make_temp_file(self, content):
+        with NamedTemporaryFile(mode="wt", delete=False, dir=self.dir) as tf:
+            tf_path = Path(tf.name)
+            self.cleanup_list.add(tf_path)
+            tf.write(content)
+        return tf_path
+
+    def move_into_place(self, src_path: Path, dest_path: Path, hardlink_dirs: List[Path] = []):
+        shutil.move(src_path, dest_path)
+        dest_path.chmod(0o644)
+        self.cleanup_list.remove(src_path)
+        for path in hardlink_dirs:
+            target = path / dest_path.name
+            target.unlink(missing_ok=True)
+            os.link(dest_path, target) # until python>=3.10
+        with dest_path.open("rb") as f:
+            store_file("indexes", dest_path.name, f, allow_overwrite=True)
+
+    def cleanup(self):
+        for tf_path in self.cleanup_list:
+            tf_path.unlink(missing_ok=True)
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.cleanup()
+        return False  # False: do not suppress the exception
+
+
+@shared_task
+def idindex_update_task():
+    """Update I-D indexes"""
+    id_path = Path(settings.INTERNET_DRAFT_PATH)
+    derived_path = Path(settings.DERIVED_DIR)
+    download_path = Path(settings.ALL_ID_DOWNLOAD_DIR)
+    ftp_path = Path(settings.FTP_DIR) / "internet-drafts"
+    all_archive_path = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR)
+
+    with TempFileManager() as tmp_mgr:
+        # Generate copies of new contents
+        all_id_content = all_id_txt()
+        all_id_tmpfile = tmp_mgr.make_temp_file(all_id_content)
+        derived_all_id_tmpfile = tmp_mgr.make_temp_file(all_id_content)
+        download_all_id_tmpfile = tmp_mgr.make_temp_file(all_id_content)
+
+        id_index_content = id_index_txt()
+        id_index_tmpfile = tmp_mgr.make_temp_file(id_index_content)
+        derived_id_index_tmpfile = tmp_mgr.make_temp_file(id_index_content)
+        download_id_index_tmpfile = tmp_mgr.make_temp_file(id_index_content)
+
+        id_abstracts_content = id_index_txt(with_abstracts=True)
+        id_abstracts_tmpfile = tmp_mgr.make_temp_file(id_abstracts_content)
+        derived_id_abstracts_tmpfile = tmp_mgr.make_temp_file(id_abstracts_content)
+        download_id_abstracts_tmpfile = tmp_mgr.make_temp_file(id_abstracts_content)
+
+        all_id2_content = all_id2_txt()
+        all_id2_tmpfile = tmp_mgr.make_temp_file(all_id2_content)
+        derived_all_id2_tmpfile = tmp_mgr.make_temp_file(all_id2_content)
+
+        # Move temp files as-atomically-as-possible into place
+        tmp_mgr.move_into_place(all_id_tmpfile, id_path / "all_id.txt", [ftp_path, all_archive_path])
+        tmp_mgr.move_into_place(derived_all_id_tmpfile, derived_path / "all_id.txt")
+        tmp_mgr.move_into_place(download_all_id_tmpfile, download_path / "id-all.txt")
+
+        tmp_mgr.move_into_place(id_index_tmpfile, id_path / "1id-index.txt", [ftp_path, all_archive_path])
+        tmp_mgr.move_into_place(derived_id_index_tmpfile, derived_path / "1id-index.txt")
+        tmp_mgr.move_into_place(download_id_index_tmpfile, download_path / "id-index.txt")
+
+        tmp_mgr.move_into_place(id_abstracts_tmpfile, id_path / "1id-abstracts.txt", [ftp_path, all_archive_path])
+        tmp_mgr.move_into_place(derived_id_abstracts_tmpfile, derived_path / "1id-abstracts.txt")
+        tmp_mgr.move_into_place(download_id_abstracts_tmpfile, download_path / "id-abstract.txt")
+
+        tmp_mgr.move_into_place(all_id2_tmpfile, id_path / "all_id2.txt", [ftp_path, all_archive_path])
+        tmp_mgr.move_into_place(derived_all_id2_tmpfile, derived_path / "all_id2.txt")
diff --git a/ietf/idindex/tests.py b/ietf/idindex/tests.py
index 413e3a4ed6..ba6100550d 100644
--- a/ietf/idindex/tests.py
+++ b/ietf/idindex/tests.py
@@ -3,18 +3,23 @@
 
 
 import datetime
+from unittest import mock
 
 from pathlib import Path
+from tempfile import TemporaryDirectory
 
 from django.conf import settings
+from django.utils import timezone
 
 import debug    # pyflakes:ignore
 
-from ietf.doc.factories import WgDraftFactory
-from ietf.doc.models import Document, DocAlias, RelatedDocument, State, LastCallDocEvent, NewRevisionDocEvent
+from ietf.doc.factories import WgDraftFactory, RfcFactory
+from ietf.doc.models import Document, RelatedDocument, State, LastCallDocEvent, NewRevisionDocEvent
+from ietf.doc.storage_utils import retrieve_str
 from ietf.group.factories import GroupFactory
 from ietf.name.models import DocRelationshipName
 from ietf.idindex.index import all_id_txt, all_id2_txt, id_index_txt
+from ietf.idindex.tasks import idindex_update_task, TempFileManager
 from ietf.person.factories import PersonFactory, EmailFactory
 from ietf.utils.test_utils import TestCase
 
@@ -40,7 +45,8 @@ def test_all_id_txt(self):
 
         # published
         draft.set_state(State.objects.get(type="draft", slug="rfc"))
-        DocAlias.objects.create(name="rfc1234").docs.add(draft)
+        rfc = RfcFactory(rfc_number=1234)
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
 
         txt = all_id_txt()
         self.assertTrue(draft.name + "-" + draft.rev in txt)
@@ -51,8 +57,13 @@ def test_all_id_txt(self):
 
         RelatedDocument.objects.create(
             relationship=DocRelationshipName.objects.get(slug="replaces"),
-            source=Document.objects.create(type_id="draft", rev="00", name="draft-test-replacement"),
-            target=draft.docalias.get(name__startswith="draft"))
+            source=Document.objects.create(
+                type_id="draft",
+                rev="00",
+                name="draft-test-replacement"
+            ),
+            target=draft
+        )
 
         txt = all_id_txt()
         self.assertTrue(draft.name + "-" + draft.rev in txt)
@@ -102,7 +113,8 @@ def get_fields(content):
 
         # test RFC
         draft.set_state(State.objects.get(type="draft", slug="rfc"))
-        DocAlias.objects.create(name="rfc1234").docs.add(draft)
+        rfc = RfcFactory(rfc_number=1234)
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
         t = get_fields(all_id2_txt())
         self.assertEqual(t[4], "1234")
 
@@ -110,8 +122,12 @@ def get_fields(content):
         draft.set_state(State.objects.get(type="draft", slug="repl"))
         RelatedDocument.objects.create(
             relationship=DocRelationshipName.objects.get(slug="replaces"),
-            source=Document.objects.create(type_id="draft", rev="00", name="draft-test-replacement"),
-            target=draft.docalias.get(name__startswith="draft"))
+            source=Document.objects.create(
+                type_id="draft",
+                rev="00", 
+                name="draft-test-replacement"
+            ),
+            target=draft)
 
         t = get_fields(all_id2_txt())
         self.assertEqual(t[5], "draft-test-replacement")
@@ -120,7 +136,7 @@ def get_fields(content):
         draft.set_state(State.objects.get(type="draft", slug="active"))
         draft.set_state(State.objects.get(type="draft-iesg", slug="lc"))
 
-        e = LastCallDocEvent.objects.create(doc=draft, rev=draft.rev, type="sent_last_call", expires=datetime.datetime.now() + datetime.timedelta(days=14), by=draft.ad)
+        e = LastCallDocEvent.objects.create(doc=draft, rev=draft.rev, type="sent_last_call", expires=timezone.now() + datetime.timedelta(days=14), by=draft.ad)
 
         t = get_fields(all_id2_txt())
         self.assertEqual(t[11], e.expires.strftime("%Y-%m-%d"))
@@ -139,3 +155,58 @@ def test_id_index_txt(self):
         txt = id_index_txt(with_abstracts=True)
 
         self.assertTrue(draft.abstract[:20] in txt)
+
+
+class TaskTests(TestCase):
+    @mock.patch("ietf.idindex.tasks.all_id_txt")
+    @mock.patch("ietf.idindex.tasks.all_id2_txt")
+    @mock.patch("ietf.idindex.tasks.id_index_txt")
+    @mock.patch.object(TempFileManager, "__enter__")
+    def test_idindex_update_task(
+        self,
+        temp_file_mgr_enter_mock,
+        id_index_mock,
+        all_id2_mock,
+        all_id_mock,
+    ):
+        # Replace TempFileManager's __enter__() method with one that returns a mock.
+        # Pass a spec to the mock so we validate that only actual methods are called.
+        mgr_mock = mock.Mock(spec=TempFileManager)
+        temp_file_mgr_enter_mock.return_value = mgr_mock
+        
+        idindex_update_task()
+
+        self.assertEqual(all_id_mock.call_count, 1)
+        self.assertEqual(all_id2_mock.call_count, 1)
+        self.assertEqual(id_index_mock.call_count, 2)
+        self.assertEqual(id_index_mock.call_args_list[0], (tuple(), dict()))
+        self.assertEqual(
+            id_index_mock.call_args_list[1], 
+            (tuple(), {"with_abstracts": True}),
+        )
+        self.assertEqual(mgr_mock.make_temp_file.call_count, 11)
+        self.assertEqual(mgr_mock.move_into_place.call_count, 11)
+
+    def test_temp_file_manager(self):
+        with TemporaryDirectory() as temp_dir:
+            with TemporaryDirectory() as other_dir:
+                temp_path = Path(temp_dir)
+                other_path = Path(other_dir)
+                with TempFileManager(temp_path) as tfm:
+                    path1 = tfm.make_temp_file("yay")
+                    path2 = tfm.make_temp_file("boo")  # do not keep this one
+                    self.assertTrue(path1.exists())
+                    self.assertTrue(path2.exists())
+                    dest = temp_path / "yay.txt"
+                    tfm.move_into_place(path1, dest, [other_path])
+                # make sure things were cleaned up...
+                self.assertFalse(path1.exists())  # moved to dest
+                self.assertFalse(path2.exists())  # left behind
+                # check destination contents and permissions
+                self.assertEqual(dest.read_text(), "yay")
+                self.assertEqual(
+                    retrieve_str("indexes", "yay.txt"),
+                    "yay"
+                )
+                self.assertEqual(dest.stat().st_mode & 0o777, 0o644)
+                self.assertTrue(dest.samefile(other_path / "yay.txt"))
diff --git a/ietf/iesg/.gitignore b/ietf/iesg/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/iesg/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/iesg/admin.py b/ietf/iesg/admin.py
index 9ffb352c43..06bbaeb201 100644
--- a/ietf/iesg/admin.py
+++ b/ietf/iesg/admin.py
@@ -3,7 +3,7 @@
 import debug                            # pyflakes:ignore
 
 from ietf.doc.models import TelechatDocEvent
-from ietf.iesg.models import TelechatDate, TelechatAgendaItem
+from ietf.iesg.models import TelechatDate, TelechatAgendaItem, TelechatAgendaContent
 
 class TelechatAgendaItemAdmin(admin.ModelAdmin):
     pass
@@ -22,3 +22,6 @@ def save_model(self, request, obj, form, change):
 
 admin.site.register(TelechatDate, TelechatDateAdmin)
 
+class TelechatAgendaContentAdmin(admin.ModelAdmin):
+    list_display = ('section',)
+admin.site.register(TelechatAgendaContent, TelechatAgendaContentAdmin)
diff --git a/ietf/iesg/agenda.py b/ietf/iesg/agenda.py
index e923c1babc..ace4c9ec40 100644
--- a/ietf/iesg/agenda.py
+++ b/ietf/iesg/agenda.py
@@ -4,7 +4,6 @@
 
 # utilities for constructing agendas for IESG telechats
 
-import io
 import datetime
 from collections import OrderedDict
 
@@ -15,18 +14,20 @@
 
 from ietf.doc.models import Document, LastCallDocEvent, ConsensusDocEvent
 from ietf.doc.utils_search import fill_in_telechat_date
-from ietf.iesg.models import TelechatDate, TelechatAgendaItem
+from ietf.iesg.models import TelechatDate, TelechatAgendaItem, TelechatAgendaContent
 from ietf.review.utils import review_assignments_to_list_for_docs
+from ietf.utils.timezone import date_today, make_aware
 
 def get_agenda_date(date=None):
     if not date:
         try:
             return TelechatDate.objects.active().order_by('date')[0].date
         except IndexError:
-            return datetime.date.today()
+            return date_today()
     else:
+        parsed_date = make_aware(datetime.datetime.strptime(date, "%Y-%m-%d"), settings.TIME_ZONE).date()
         try:
-            return TelechatDate.objects.active().get(date=datetime.datetime.strptime(date, "%Y-%m-%d").date()).date
+            return TelechatDate.objects.active().get(date=parsed_date).date
         except (ValueError, TelechatDate.DoesNotExist):
             raise Http404
 
@@ -65,7 +66,7 @@ def get_doc_section(doc):
     elif doc.type_id == 'statchg':
         protocol_action = False
         for relation in doc.relateddocument_set.filter(relationship__slug__in=('tops','tois','tohist','toinf','tobcp','toexp')):
-            if relation.relationship_id in ('tops','tois') or relation.target.document.std_level_id in ('std','ds','ps'):
+            if relation.relationship_id in ('tops','tois') or relation.target.std_level_id in ('std','ds','ps'):
                 protocol_action = True
         if protocol_action:
             s = "2.3"
@@ -132,26 +133,24 @@ def agenda_sections():
         ('4.2', {'title':"WG rechartering"}),
         ('4.2.1', {'title':"Under evaluation for IETF review", 'docs':[]}),
         ('4.2.2', {'title':"Proposed for approval", 'docs':[]}),
-        ('5', {'title':"IAB news we can use"}),
+        ('5', {'title':"IESG Liaison News"}),
         ('6', {'title':"Management issues"}),
         ('7', {'title':"Any Other Business (WG News, New Proposals, etc.)"}),
         ])
 
 def fill_in_agenda_administrivia(date, sections):
-    extra_info_files = (
-        ("1.1", "roll_call", settings.IESG_ROLL_CALL_FILE),
-        ("1.3", "minutes", settings.IESG_MINUTES_FILE),
-        ("1.4", "action_items", settings.IESG_TASK_FILE),
-        )
+    extra_info = (
+        ("1.1", "roll_call"),
+        ("1.3", "minutes"),
+        ("1.4", "action_items"),
+    )
 
-    for s, key, filename in extra_info_files:
+    for s, key in extra_info:
         try:
-            with io.open(filename, 'r', encoding='utf-8', errors='replace') as f:
-                t = f.read().strip()
-        except IOError:
-            t = "(Error reading %s)" % filename
-
-        sections[s]["text"] = t
+            text = TelechatAgendaContent.objects.get(section__slug=key).text
+        except TelechatAgendaContent.DoesNotExist:
+            text = ""
+        sections[s]["text"] = text
 
 def fill_in_agenda_docs(date, sections, docs=None):
     if not docs:
@@ -187,7 +186,7 @@ def fill_in_agenda_docs(date, sections, docs=None):
 
             doc.review_assignments = review_assignments_for_docs.get(doc.name, [])
         elif doc.type_id == "conflrev":
-            doc.conflictdoc = doc.relateddocument_set.get(relationship__slug='conflrev').target.document
+            doc.conflictdoc = doc.relateddocument_set.get(relationship__slug='conflrev').target
         elif doc.type_id == "charter":
             pass
 
@@ -220,4 +219,4 @@ def agenda_data(date=None):
     fill_in_agenda_docs(date, sections)
     fill_in_agenda_management_issues(date, sections)
 
-    return { 'date': date.isoformat(), 'sections': sections }
\ No newline at end of file
+    return { 'date': date.isoformat(), 'sections': sections }
diff --git a/ietf/iesg/factories.py b/ietf/iesg/factories.py
index a9c8bed56e..e49b08b583 100644
--- a/ietf/iesg/factories.py
+++ b/ietf/iesg/factories.py
@@ -4,7 +4,7 @@
 import debug    # pyflakes:ignore
 import factory
 
-from ietf.iesg.models import TelechatAgendaItem
+from ietf.iesg.models import TelechatAgendaItem, TelechatAgendaContent
 
 
 class IESGMgmtItemFactory(factory.django.DjangoModelFactory):
@@ -14,3 +14,10 @@ class Meta:
     type = 3
     text = factory.Faker('paragraph', nb_sentences=3)
     title = factory.Faker('sentence', nb_words=3)
+
+
+class TelechatAgendaContentFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = TelechatAgendaContent
+
+    text = factory.Faker('paragraph', nb_sentences=5)
diff --git a/ietf/iesg/feeds.py b/ietf/iesg/feeds.py
index 6e8d290c6d..a8b5c2869c 100644
--- a/ietf/iesg/feeds.py
+++ b/ietf/iesg/feeds.py
@@ -2,12 +2,13 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
-
+from django.conf import settings
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 
 from ietf.doc.models import Document, TelechatDocEvent
+from ietf.utils.timezone import date_today
+
 
 class IESGAgendaFeed(Feed):
     title = "Documents on Future IESG Telechat Agendas"
@@ -16,7 +17,7 @@ class IESGAgendaFeed(Feed):
     description_template = "iesg/feed_item_description.html"
 
     def items(self):
-        docs = Document.objects.filter(docevent__telechatdocevent__telechat_date__gte=datetime.date.today()).distinct()
+        docs = Document.objects.filter(docevent__telechatdocevent__telechat_date__gte=date_today(settings.TIME_ZONE)).distinct()
         for d in docs:
             d.latest_telechat_event = d.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
         docs = [d for d in docs if d.latest_telechat_event.telechat_date]
diff --git a/ietf/iesg/migrations/0001_initial.py b/ietf/iesg/migrations/0001_initial.py
new file mode 100644
index 0000000000..6ceb343d10
--- /dev/null
+++ b/ietf/iesg/migrations/0001_initial.py
@@ -0,0 +1,55 @@
+# Generated by Django 2.2.28 on 2023-03-20 19:22
+
+from typing import List, Tuple
+from django.db import migrations, models
+import ietf.iesg.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies: List[Tuple[str, str]] = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Telechat',
+            fields=[
+                ('telechat_id', models.IntegerField(primary_key=True, serialize=False)),
+                ('telechat_date', models.DateField(blank=True, null=True)),
+                ('minute_approved', models.IntegerField(blank=True, null=True)),
+                ('wg_news_txt', models.TextField(blank=True)),
+                ('iab_news_txt', models.TextField(blank=True)),
+                ('management_issue', models.TextField(blank=True)),
+                ('frozen', models.IntegerField(blank=True, null=True)),
+                ('mi_frozen', models.IntegerField(blank=True, null=True)),
+            ],
+            options={
+                'db_table': 'telechat',
+            },
+        ),
+        migrations.CreateModel(
+            name='TelechatAgendaItem',
+            fields=[
+                ('id', models.AutoField(db_column='template_id', primary_key=True, serialize=False)),
+                ('text', models.TextField(blank=True, db_column='template_text')),
+                ('type', models.IntegerField(choices=[(1, 'Any Other Business (WG News, New Proposals, etc.)'), (2, 'IAB News'), (3, 'Management Item')], db_column='template_type', default=3)),
+                ('title', models.CharField(db_column='template_title', max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TelechatDate',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateField(default=ietf.iesg.models.next_telechat_date)),
+            ],
+            options={
+                'ordering': ['-date'],
+            },
+        ),
+        migrations.AddIndex(
+            model_name='telechatdate',
+            index=models.Index(fields=['-date'], name='iesg_telech_date_a0e0ed_idx'),
+        ),
+    ]
diff --git a/ietf/iesg/migrations/0002_telechatagendacontent.py b/ietf/iesg/migrations/0002_telechatagendacontent.py
new file mode 100644
index 0000000000..b3f24017a3
--- /dev/null
+++ b/ietf/iesg/migrations/0002_telechatagendacontent.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.28 on 2023-03-10 16:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0002_telechatagendasectionname'),
+        ('iesg', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TelechatAgendaContent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField(blank=True)),
+                ('section', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='name.TelechatAgendaSectionName')),
+            ],
+        ),
+    ]
diff --git a/ietf/iesg/migrations/0003_delete_telechat.py b/ietf/iesg/migrations/0003_delete_telechat.py
new file mode 100644
index 0000000000..6a09b88555
--- /dev/null
+++ b/ietf/iesg/migrations/0003_delete_telechat.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.2.13 on 2024-06-21 20:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("iesg", "0002_telechatagendacontent"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="Telechat",
+        ),
+    ]
diff --git a/ietf/secr/console/__init__.py b/ietf/iesg/migrations/__init__.py
similarity index 100%
rename from ietf/secr/console/__init__.py
rename to ietf/iesg/migrations/__init__.py
diff --git a/ietf/iesg/models.py b/ietf/iesg/models.py
index f3690d4c78..dcc8a9880b 100644
--- a/ietf/iesg/models.py
+++ b/ietf/iesg/models.py
@@ -36,8 +36,13 @@
 
 import datetime
 
+from django.conf import settings
 from django.db import models
 
+from ietf.name.models import TelechatAgendaSectionName
+from ietf.utils.timezone import date_today
+
+
 class TelechatAgendaItem(models.Model):
     TYPE_CHOICES = (
         (1, "Any Other Business (WG News, New Proposals, etc.)"),
@@ -54,29 +59,15 @@ def __str__(self):
         type_name = self.TYPE_CHOICES_DICT.get(self.type, str(self.type))
         return "%s: %s" % (type_name, self.title or "")
 
-class Telechat(models.Model):
-    telechat_id = models.IntegerField(primary_key=True)
-    telechat_date = models.DateField(null=True, blank=True)
-    minute_approved = models.IntegerField(null=True, blank=True)
-    wg_news_txt = models.TextField(blank=True)
-    iab_news_txt = models.TextField(blank=True)
-    management_issue = models.TextField(blank=True)
-    frozen = models.IntegerField(null=True, blank=True)
-    mi_frozen = models.IntegerField(null=True, blank=True)
-
-    class Meta:
-        db_table = 'telechat'
-
-
 def next_telechat_date():
     dates = TelechatDate.objects.order_by("-date")
     if dates:
         return dates[0].date + datetime.timedelta(days=14)
-    return datetime.date.today()
+    return date_today(settings.TIME_ZONE)
 
 class TelechatDateManager(models.Manager):
     def active(self):
-        return self.get_queryset().filter(date__gte=datetime.date.today())
+        return self.get_queryset().filter(date__gte=date_today(settings.TIME_ZONE))
 
 class TelechatDate(models.Model):
     objects = TelechatDateManager()
@@ -91,3 +82,11 @@ class Meta:
         indexes = [
             models.Index(fields=['-date',]),
         ]
+
+
+class TelechatAgendaContent(models.Model):
+    section = models.ForeignKey(TelechatAgendaSectionName, on_delete=models.PROTECT)
+    text = models.TextField(blank=True)
+
+    def __str__(self):
+        return f"{self.section.name} content"
diff --git a/ietf/iesg/resources.py b/ietf/iesg/resources.py
index a67dbc3a42..c28dcf51d3 100644
--- a/ietf/iesg/resources.py
+++ b/ietf/iesg/resources.py
@@ -3,13 +3,13 @@
 # Autogenerated by the mkresources management command 2014-11-13 23:53
 
 
-from ietf.api import ModelResource
-from tastypie.constants import ALL
+from ietf.api import ModelResource, ToOneField
+from tastypie.constants import ALL, ALL_WITH_RELATIONS
 from tastypie.cache import SimpleCache
 
 from ietf import api
 
-from ietf.iesg.models import TelechatDate, Telechat, TelechatAgendaItem
+from ietf.iesg.models import TelechatDate, TelechatAgendaItem, TelechatAgendaContent
 
 
 class TelechatDateResource(ModelResource):
@@ -17,45 +17,57 @@ class Meta:
         cache = SimpleCache()
         queryset = TelechatDate.objects.all()
         serializer = api.Serializer()
-        #resource_name = 'telechatdate'
-        ordering = ['id', ]
-        filtering = { 
+        # resource_name = 'telechatdate'
+        ordering = [
+            "id",
+        ]
+        filtering = {
             "id": ALL,
             "date": ALL,
         }
+
+
 api.iesg.register(TelechatDateResource())
 
-class TelechatResource(ModelResource):
-    class Meta:
-        cache = SimpleCache()
-        queryset = Telechat.objects.all()
-        serializer = api.Serializer()
-        #resource_name = 'telechat'
-        ordering = ['tlechat_id', ]
-        filtering = { 
-            "telechat_id": ALL,
-            "telechat_date": ALL,
-            "minute_approved": ALL,
-            "wg_news_txt": ALL,
-            "iab_news_txt": ALL,
-            "management_issue": ALL,
-            "frozen": ALL,
-            "mi_frozen": ALL,
-        }
-api.iesg.register(TelechatResource())
 
 class TelechatAgendaItemResource(ModelResource):
     class Meta:
         cache = SimpleCache()
         queryset = TelechatAgendaItem.objects.all()
         serializer = api.Serializer()
-        #resource_name = 'telechatagendaitem'
-        ordering = ['id', ]
-        filtering = { 
+        # resource_name = 'telechatagendaitem'
+        ordering = [
+            "id",
+        ]
+        filtering = {
             "id": ALL,
             "text": ALL,
             "type": ALL,
             "title": ALL,
         }
+
+
 api.iesg.register(TelechatAgendaItemResource())
 
+from ietf.name.resources import TelechatAgendaSectionNameResource
+
+
+class TelechatAgendaContentResource(ModelResource):
+    section = ToOneField(TelechatAgendaSectionNameResource, "section")
+
+    class Meta:
+        queryset = TelechatAgendaContent.objects.none()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        # resource_name = 'telechatagendacontent'
+        ordering = [
+            "id",
+        ]
+        filtering = {
+            "id": ALL,
+            "text": ALL,
+            "section": ALL_WITH_RELATIONS,
+        }
+
+
+api.iesg.register(TelechatAgendaContentResource())
diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py
index f317ad32b7..e5fbe5da7b 100644
--- a/ietf/iesg/tests.py
+++ b/ietf/iesg/tests.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
+from collections import Counter
 import datetime
 import io
 import tarfile
@@ -17,18 +18,20 @@
 import debug                            # pyflakes:ignore
 
 from ietf.doc.models import DocEvent, BallotPositionDocEvent, TelechatDocEvent
-from ietf.doc.models import Document, DocAlias, State, RelatedDocument
-from ietf.doc.factories import WgDraftFactory, IndividualDraftFactory, ConflictReviewFactory, BaseDocumentFactory, CharterFactory, WgRfcFactory, IndividualRfcFactory
+from ietf.doc.models import Document, State, RelatedDocument
+from ietf.doc.factories import BallotDocEventFactory, BallotPositionDocEventFactory, TelechatDocEventFactory, WgDraftFactory, IndividualDraftFactory, ConflictReviewFactory, BaseDocumentFactory, CharterFactory, WgRfcFactory, IndividualRfcFactory
 from ietf.doc.utils import create_ballot_if_not_open
-from ietf.group.factories import RoleFactory, GroupFactory
+from ietf.group.factories import RoleFactory, GroupFactory, DatedGroupMilestoneFactory, DatelessGroupMilestoneFactory
 from ietf.group.models import Group, GroupMilestone, Role
-from ietf.iesg.agenda import get_agenda_date, agenda_data
-from ietf.iesg.models import TelechatDate
-from ietf.name.models import StreamName
+from ietf.iesg.agenda import get_agenda_date, agenda_data, fill_in_agenda_administrivia, agenda_sections
+from ietf.iesg.models import TelechatDate, TelechatAgendaContent
+from ietf.iesg.utils import get_wg_dashboard_info
+from ietf.name.models import StreamName, TelechatAgendaSectionName
+from ietf.person.factories import PersonFactory
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
-from ietf.iesg.factories import IESGMgmtItemFactory
-
+from ietf.iesg.factories import IESGMgmtItemFactory, TelechatAgendaContentFactory
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 
 class IESGTests(TestCase):
     def test_feed(self):
@@ -51,6 +54,15 @@ def test_feed(self):
         self.assertContains(r, draft.name)
         self.assertContains(r, escape(pos.balloter.plain_name()))
 
+        # Mark draft as replaced
+        draft.set_state(State.objects.get(type="draft", slug="repl"))
+
+        r = self.client.get(urlreverse("ietf.iesg.views.discusses"))
+        self.assertEqual(r.status_code, 200)
+
+        self.assertNotContains(r, draft.name)
+        self.assertNotContains(r, escape(pos.balloter.plain_name()))
+
     def test_milestones_needing_review(self):
         draft = WgDraftFactory()
         RoleFactory(name_id='ad',group=draft.group,person=Person.objects.get(user__username='ad'))
@@ -58,7 +70,7 @@ def test_milestones_needing_review(self):
         m = GroupMilestone.objects.create(group=draft.group,
                                           state_id="review",
                                           desc="Test milestone",
-                                          due=datetime.date.today())
+                                          due=date_today(DEADLINE_TZINFO))
 
         url = urlreverse("ietf.iesg.views.milestones_needing_review")
         login_testing_unauthorized(self, "ad", url)
@@ -70,7 +82,80 @@ def test_milestones_needing_review(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertNotContains(r, m.desc)
+
+    def test_milestones_needing_review_ordering(self):
+        dated_group = GroupFactory(uses_milestone_dates=True)
+        RoleFactory(
+            name_id='ad',
+            group=dated_group,
+            person=Person.objects.get(user__username='ad'),
+        )
+        dated_milestones = [
+            DatedGroupMilestoneFactory(
+                group=dated_group,
+                state_id="review",
+                desc="This is the description of one dated group milestone",
+            ),
+            DatedGroupMilestoneFactory(
+                group=dated_group,
+                state_id="review",
+                desc="This is the description of another dated group milestone",
+            ),
+        ]
+        dated_milestones[0].due -= datetime.timedelta(days=1)  # make this one earlier
+        dated_milestones[0].save()
+
+        dateless_group = GroupFactory(uses_milestone_dates=False)
+        RoleFactory(
+            name_id='ad',
+            group=dateless_group,
+            person=Person.objects.get(user__username='ad'),
+        )
+        dateless_milestones = [
+            DatelessGroupMilestoneFactory(
+                group=dateless_group,
+                state_id="review",
+                desc="This is the description of one dateless group milestone",
+            ),
+            DatelessGroupMilestoneFactory(
+                group=dateless_group,
+                state_id="review",
+                desc="This is the description of another dateless group milestone",
+            ),
+        ]
+
+        url = urlreverse("ietf.iesg.views.milestones_needing_review")
+        self.client.login(username="ad", password="ad+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        pq = PyQuery(r.content)
         
+        # check order-by-date
+        dated_tbody = pq(f'td:contains("{dated_milestones[0].desc}")').closest("tbody")
+        rows = list(dated_tbody.items("tr"))  # keep as pyquery objects
+        self.assertTrue(rows[0].find('td:first:contains("Last")'))  # Last milestone shown first
+        self.assertFalse(rows[0].find('td:first:contains("Next")'))
+        self.assertTrue(rows[0].find(f'td:contains("{dated_milestones[1].desc}")'))
+        self.assertFalse(rows[0].find(f'td:contains("{dated_milestones[0].desc}")'))
+
+        self.assertFalse(rows[1].find('td:first:contains("Last")'))  # Last milestone shown first
+        self.assertTrue(rows[1].find('td:first:contains("Next")'))
+        self.assertFalse(rows[1].find(f'td:contains("{dated_milestones[1].desc}")'))
+        self.assertTrue(rows[1].find(f'td:contains("{dated_milestones[0].desc}")'))
+
+        # check order-by-order
+        dateless_tbody = pq(f'td:contains("{dateless_milestones[0].desc}")').closest("tbody")
+        rows = list(dateless_tbody.items("tr"))  # keep as pyquery objects
+        self.assertTrue(rows[0].find('td:first:contains("Last")'))  # Last milestone shown first
+        self.assertFalse(rows[0].find('td:first:contains("Next")'))
+        self.assertTrue(rows[0].find(f'td:contains("{dateless_milestones[1].desc}")'))
+        self.assertFalse(rows[0].find(f'td:contains("{dateless_milestones[0].desc}")'))
+
+        self.assertFalse(rows[1].find('td:first:contains("Last")'))  # Last milestone shown first
+        self.assertTrue(rows[1].find('td:first:contains("Next")'))
+        self.assertFalse(rows[1].find(f'td:contains("{dateless_milestones[1].desc}")'))
+        self.assertTrue(rows[1].find(f'td:contains("{dateless_milestones[0].desc}")'))
+
 
     def test_review_decisions(self):
         draft = WgDraftFactory()
@@ -95,13 +180,1600 @@ def test_photos(self):
         ads = Role.objects.filter(group__type='area', group__state='active', name_id='ad')
         self.assertEqual(len(q('.photo')), ads.count())
         
+    def test_ietf_activity(self):
+        url = urlreverse("ietf.iesg.views.ietf_activity")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+    def test_working_groups(self):
+        # Clean away the wasted built-for-every-test noise
+        Group.objects.filter(type__in=["wg", "area"]).delete()
+
+        (
+            area_summary,
+            area_totals,
+            ad_summary,
+            noad_summary,
+            ad_totals,
+            noad_totals,
+            totals,
+            wg_summary,
+        ) = get_wg_dashboard_info()
+        self.assertEqual(area_summary, [])
+        self.assertEqual(
+            area_totals, {"group_count": 0, "doc_count": 0, "page_count": 0}
+        )
+        self.assertEqual(ad_summary, [])
+        self.assertEqual(noad_summary, [])
+        self.assertEqual(
+            ad_totals,
+            {
+                "ad_group_count": 0,
+                "doc_group_count": 0,
+                "doc_count": 0,
+                "page_count": 0,
+            },
+        )
+        self.assertEqual(
+            noad_totals,
+            {
+                "ad_group_count": 0,
+                "doc_group_count": 0,
+                "doc_count": 0,
+                "page_count": 0,
+            },
+        )
+        self.assertEqual(
+            totals,
+            {
+                "group_count": 0,
+                "doc_count": 0,
+                "page_count": 0,
+                "groups_with_docs_count": 0,
+            },
+        )
+        self.assertEqual(wg_summary, [])
+
+        # Construct Areas with WGs similar in shape to a real moment of the IETF
+
+        # Note that this test construciton uses the first letter of the wg acronyms
+        # for convenience to switch on whether groups have documents with assigned ADs.
+        # (Search for ` if wg_acronym[0] > "g"`)
+        # There's no other significance to the names of the area directors or the
+        # acronyms of the areas and groups other than being distinct. Taking the
+        # values from sets of similar things hopefully helps with debugging the tests.
+
+        areas = {}
+        for area_acronym in ["red", "orange", "yellow", "green", "blue", "violet"]:
+            areas[area_acronym] = GroupFactory(type_id="area", acronym=area_acronym)
+        for ad, area, wgs in [
+            ("Alpha", "red", ["bassoon"]),
+            ("Bravo", "orange", ["celesta"]),
+            ("Charlie", "orange", ["clarinet", "cymbals"]),
+            ("Delta", "yellow", ["flute"]),
+            ("Echo", "yellow", ["glockenspiel"]),
+            ("Foxtrot", "green", ["gong", "guitar"]),
+            ("Golf", "green", ["harp"]),
+            ("Hotel", "blue", ["harpsichord"]),
+            ("Indigo", "blue", ["oboe", "organ"]),
+            ("Juliet", "violet", ["piano"]),
+            ("Kilo", "violet", ["piccolo"]),
+            ("Lima", "violet", ["saxophone", "tambourine"]),
+        ]:
+            p = Person.objects.filter(name=ad).first() or PersonFactory(name=ad)
+            RoleFactory(group=areas[area], person=p, name_id="ad")
+            for wg in wgs:
+                g = GroupFactory(acronym=wg, type_id="wg", parent=areas[area])
+                RoleFactory(group=g, person=p, name_id="ad")
+
+        # Some ADs have out of area groups
+        g = GroupFactory(acronym="timpani", parent=areas["orange"])
+        RoleFactory(group=g, person=Person.objects.get(name="Juliet"), name_id="ad")
+
+        (
+            area_summary,
+            area_totals,
+            ad_summary,
+            noad_summary,
+            ad_totals,
+            noad_totals,
+            totals,
+            wg_summary,
+        ) = get_wg_dashboard_info()
+
+        # checks for the expected result with area sorted by name
+        self.assertEqual(
+            area_summary,
+            [
+                {
+                    "area": "blue",
+                    "groups_in_area": 3,
+                    "groups_with_docs": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "area": "green",
+                    "groups_in_area": 3,
+                    "groups_with_docs": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "area": "orange",
+                    "groups_in_area": 4,
+                    "groups_with_docs": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "area": "red",
+                    "groups_in_area": 1,
+                    "groups_with_docs": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "area": "violet",
+                    "groups_in_area": 4,
+                    "groups_with_docs": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "area": "yellow",
+                    "groups_in_area": 2,
+                    "groups_with_docs": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+            ],
+        )
+        self.assertEqual(
+            area_totals, {"group_count": 0, "doc_count": 0, "page_count": 0}
+        )
+        self.assertEqual(
+            ad_summary,
+            [
+                {
+                    "ad": "Alpha",
+                    "area": "red",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Bravo",
+                    "area": "orange",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Charlie",
+                    "area": "orange",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Delta",
+                    "area": "yellow",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Echo",
+                    "area": "yellow",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Foxtrot",
+                    "area": "green",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Golf",
+                    "area": "green",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Hotel",
+                    "area": "blue",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Indigo",
+                    "area": "blue",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "orange",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "violet",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Kilo",
+                    "area": "violet",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Lima",
+                    "area": "violet",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+            ],
+        )
+        self.assertEqual(
+            noad_summary,
+            [
+                {
+                    "ad": "Alpha",
+                    "area": "red",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Bravo",
+                    "area": "orange",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Charlie",
+                    "area": "orange",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Delta",
+                    "area": "yellow",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Echo",
+                    "area": "yellow",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Foxtrot",
+                    "area": "green",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Golf",
+                    "area": "green",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Hotel",
+                    "area": "blue",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Indigo",
+                    "area": "blue",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "orange",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "violet",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Kilo",
+                    "area": "violet",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+                {
+                    "ad": "Lima",
+                    "area": "violet",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0,
+                    "doc_percent": 0,
+                    "page_percent": 0,
+                },
+            ],
+        )
+        self.assertEqual(
+            ad_totals,
+            {
+                "ad_group_count": 17,
+                "doc_group_count": 0,
+                "doc_count": 0,
+                "page_count": 0,
+            },
+        )
+        self.assertEqual(
+            noad_totals,
+            {
+                "ad_group_count": 17,
+                "doc_group_count": 0,
+                "doc_count": 0,
+                "page_count": 0,
+            },
+        )
+        self.assertEqual(
+            totals,
+            {
+                "group_count": 17,
+                "doc_count": 0,
+                "page_count": 0,
+                "groups_with_docs_count": 0,
+            },
+        )
+        self.assertEqual(
+            wg_summary,
+            [
+                {
+                    "wg": "bassoon",
+                    "area": "red",
+                    "ad": "Alpha",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "celesta",
+                    "area": "orange",
+                    "ad": "Bravo",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "clarinet",
+                    "area": "orange",
+                    "ad": "Charlie",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "cymbals",
+                    "area": "orange",
+                    "ad": "Charlie",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "flute",
+                    "area": "yellow",
+                    "ad": "Delta",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "glockenspiel",
+                    "area": "yellow",
+                    "ad": "Echo",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "gong",
+                    "area": "green",
+                    "ad": "Foxtrot",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "guitar",
+                    "area": "green",
+                    "ad": "Foxtrot",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "harp",
+                    "area": "green",
+                    "ad": "Golf",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "harpsichord",
+                    "area": "blue",
+                    "ad": "Hotel",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "oboe",
+                    "area": "blue",
+                    "ad": "Indigo",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "organ",
+                    "area": "blue",
+                    "ad": "Indigo",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "piano",
+                    "area": "violet",
+                    "ad": "Juliet",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "piccolo",
+                    "area": "violet",
+                    "ad": "Kilo",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "saxophone",
+                    "area": "violet",
+                    "ad": "Lima",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "tambourine",
+                    "area": "violet",
+                    "ad": "Lima",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "timpani",
+                    "area": "orange",
+                    "ad": "Juliet",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+            ],
+        )
+
+        # As seen above, all doc and page counts are currently 0
+
+        # We'll give a group a document but not assign it to its AD
+        WgDraftFactory(
+            group=Group.objects.get(acronym="saxophone"), pages=len("saxophone")
+        )
+        (
+            area_summary,
+            area_totals,
+            ad_summary,
+            noad_summary,
+            ad_totals,
+            noad_totals,
+            totals,
+            wg_summary,
+        ) = get_wg_dashboard_info()
+        count_violet_dicts = 0
+        for d in area_summary:
+            if d["area"] == "violet":
+                count_violet_dicts += 1
+                self.assertEqual(d["groups_with_docs"], 1)
+                self.assertEqual(d["doc_count"], 1)
+                self.assertEqual(d["page_count"], 9)
+                self.assertEqual(d["group_percent"], 100.0)
+                self.assertEqual(d["doc_percent"], 100.0)
+                self.assertEqual(d["page_percent"], 100.0)
+            else:
+                self.assertEqual(d["groups_with_docs"], 0)
+                self.assertEqual(d["doc_count"], 0)
+                self.assertEqual(d["page_count"], 0)
+                self.assertEqual(d["group_percent"], 0)
+                self.assertEqual(d["doc_percent"], 0)
+                self.assertEqual(d["page_percent"], 0)
+        self.assertEqual(count_violet_dicts, 1)
+
+        self.assertEqual(
+            area_totals, {"group_count": 1, "doc_count": 1, "page_count": 9}
+        )
+
+        # No AD has this document, even though it's in Lima's group
+        count_lima_dicts = 0
+        for d in ad_summary:
+            if d["ad"] == "Lima":
+                count_lima_dicts += 1
+            self.assertEqual(d["doc_group_count"], 0)
+            self.assertEqual(d["doc_count"], 0)
+            self.assertEqual(d["page_count"], 0)
+            self.assertEqual(d["group_percent"], 0)
+            self.assertEqual(d["doc_percent"], 0)
+            self.assertEqual(d["page_percent"], 0)
+        self.assertEqual(count_lima_dicts, 1)
+
+        # It's in Lima's group, so normally it will eventually land on Lima
+        count_lima_dicts = 0
+        for d in noad_summary:
+            if d["ad"] == "Lima":
+                count_lima_dicts += 1
+                self.assertEqual(d["doc_group_count"], 1)
+                self.assertEqual(d["doc_count"], 1)
+                self.assertEqual(d["page_count"], 9)
+                self.assertEqual(d["group_percent"], 100.0)
+                self.assertEqual(d["doc_percent"], 100.0)
+                self.assertEqual(d["page_percent"], 100.0)
+            else:
+                self.assertEqual(d["doc_group_count"], 0)
+                self.assertEqual(d["doc_count"], 0)
+                self.assertEqual(d["page_count"], 0)
+                self.assertEqual(d["group_percent"], 0)
+                self.assertEqual(d["doc_percent"], 0)
+                self.assertEqual(d["page_percent"], 0)
+        self.assertEqual(count_lima_dicts, 1)
+
+        self.assertEqual(
+            ad_totals,
+            {
+                "ad_group_count": 17,
+                "doc_group_count": 0,
+                "doc_count": 0,
+                "page_count": 0,
+            },
+        )
+        self.assertEqual(
+            noad_totals,
+            {
+                "ad_group_count": 17,
+                "doc_group_count": 1,
+                "doc_count": 1,
+                "page_count": 9,
+            },
+        )
+        self.assertEqual(
+            totals,
+            {
+                "group_count": 17,
+                "doc_count": 1,
+                "page_count": 9,
+                "groups_with_docs_count": 1,
+            },
+        )
+
+        count_sax_dicts = 0
+        for d in wg_summary:
+            if d["wg"] == "saxophone":
+                count_sax_dicts += 1
+                self.assertEqual(d["doc_count"], 1)
+                self.assertEqual(d["page_count"], 9)
+            else:
+                self.assertEqual(d["doc_count"], 0)
+                self.assertEqual(d["page_count"], 0)
+        self.assertEqual(count_sax_dicts, 1)
+
+        # Assign that doc to Lima
+        self.assertEqual(Document.objects.count(), 1)
+        Document.objects.all().update(ad=Person.objects.get(name="Lima"))
+        (
+            area_summary,
+            area_totals,
+            ad_summary,
+            noad_summary,
+            ad_totals,
+            noad_totals,
+            totals,
+            wg_summary,
+        ) = get_wg_dashboard_info()
+        count_violet_dicts = 0
+        for d in area_summary:
+            if d["area"] == "violet":
+                count_violet_dicts += 1
+                self.assertEqual(d["groups_with_docs"], 1)
+                self.assertEqual(d["doc_count"], 1)
+                self.assertEqual(d["page_count"], 9)
+                self.assertEqual(d["group_percent"], 100.0)
+                self.assertEqual(d["doc_percent"], 100.0)
+                self.assertEqual(d["page_percent"], 100.0)
+            else:
+                self.assertEqual(d["groups_with_docs"], 0)
+                self.assertEqual(d["doc_count"], 0)
+                self.assertEqual(d["page_count"], 0)
+                self.assertEqual(d["group_percent"], 0)
+                self.assertEqual(d["doc_percent"], 0)
+                self.assertEqual(d["page_percent"], 0)
+        self.assertEqual(count_violet_dicts, 1)
+
+        self.assertEqual(
+            area_totals, {"group_count": 1, "doc_count": 1, "page_count": 9}
+        )
+
+        # This time it will show up as a doc assigned to Lima
+        count_lima_dicts = 0
+        for d in ad_summary:
+            if d["ad"] == "Lima":
+                count_lima_dicts += 1
+                self.assertEqual(d["doc_group_count"], 1)
+                self.assertEqual(d["doc_count"], 1)
+                self.assertEqual(d["page_count"], 9)
+                self.assertEqual(d["group_percent"], 100.0)
+                self.assertEqual(d["doc_percent"], 100.0)
+                self.assertEqual(d["page_percent"], 100.0)
+            else:
+                self.assertEqual(d["doc_group_count"], 0)
+                self.assertEqual(d["doc_count"], 0)
+                self.assertEqual(d["page_count"], 0)
+                self.assertEqual(d["group_percent"], 0)
+                self.assertEqual(d["doc_percent"], 0)
+                self.assertEqual(d["page_percent"], 0)
+        self.assertEqual(count_lima_dicts, 1)
+
+        # and there will be no noad documents
+        count_lima_dicts = 0
+        for d in noad_summary:
+            if d["ad"] == "Lima":
+                count_lima_dicts += 1
+            self.assertEqual(d["doc_group_count"], 0)
+            self.assertEqual(d["doc_count"], 0)
+            self.assertEqual(d["page_count"], 0)
+            self.assertEqual(d["group_percent"], 0)
+            self.assertEqual(d["doc_percent"], 0)
+            self.assertEqual(d["page_percent"], 0)
+        self.assertEqual(count_lima_dicts, 1)
+
+        self.assertEqual(
+            ad_totals,
+            {
+                "ad_group_count": 17,
+                "doc_group_count": 1,
+                "doc_count": 1,
+                "page_count": 9,
+            },
+        )
+        self.assertEqual(
+            noad_totals,
+            {
+                "ad_group_count": 17,
+                "doc_group_count": 0,
+                "doc_count": 0,
+                "page_count": 0,
+            },
+        )
+        self.assertEqual(
+            totals,
+            {
+                "group_count": 17,
+                "doc_count": 1,
+                "page_count": 9,
+                "groups_with_docs_count": 1,
+            },
+        )
+
+        count_sax_dicts = 0
+        for d in wg_summary:
+            if d["wg"] == "saxophone":
+                count_sax_dicts += 1
+                self.assertEqual(d["doc_count"], 1)
+                self.assertEqual(d["page_count"], 9)
+            else:
+                self.assertEqual(d["doc_count"], 0)
+                self.assertEqual(d["page_count"], 0)
+        self.assertEqual(count_sax_dicts, 1)
+
+        # Now give Lima a document in a group that's not in their area:
+        WgDraftFactory(
+            group=Group.objects.get(acronym="gong"),
+            pages=len("gong"),
+            ad=Person.objects.get(name="Lima"),
+        )
+        (
+            area_summary,
+            area_totals,
+            ad_summary,
+            noad_summary,
+            ad_totals,
+            noad_totals,
+            totals,
+            wg_summary,
+        ) = get_wg_dashboard_info()
+        seen_dicts = Counter([d["area"] for d in area_summary])
+        for d in areas:
+            self.assertEqual(seen_dicts[area], 1 if area in ["violet", "green"] else 0)
+        for d in area_summary:
+            if d["area"] in ["violet", "green"]:
+                self.assertEqual(d["doc_count"], 1)
+                self.assertEqual(d["page_count"], 9 if d["area"] == "violet" else 4)
+                self.assertEqual(d["group_percent"], 50)
+                self.assertEqual(d["doc_percent"], 50)
+                self.assertEqual(
+                    d["page_percent"],
+                    100 * 9 / 13 if d["area"] == "violet" else 100 * 4 / 13,
+                )
+            else:
+                self.assertEqual(d["doc_count"], 0)
+                self.assertEqual(d["page_count"], 0)
+                self.assertEqual(d["group_percent"], 0)
+                self.assertEqual(d["doc_percent"], 0)
+                self.assertEqual(d["page_percent"], 0)
+
+        self.assertEqual(
+            area_totals, {"group_count": 2, "doc_count": 2, "page_count": 13}
+        )
+
+        for d in ad_summary:
+            if d["ad"] == "Lima":
+                self.assertEqual(d["doc_group_count"], 1)
+                self.assertEqual(d["doc_count"], 1)
+                self.assertEqual(d["page_count"], 9 if d["area"] == "violet" else 4)
+                self.assertEqual(d["group_percent"], 50)
+                self.assertEqual(d["doc_percent"], 50)
+                self.assertEqual(
+                    d["page_percent"],
+                    100 * 9 / 13 if d["area"] == "violet" else 100 * 4 / 13,
+                )
+            else:
+                self.assertEqual(d["doc_group_count"], 0)
+                self.assertEqual(
+                    d["doc_count"], 0
+                )  # Note in particular this is 0 for Foxtrot
+                self.assertEqual(d["page_count"], 0)
+                self.assertEqual(d["group_percent"], 0)
+                self.assertEqual(d["doc_percent"], 0)
+                self.assertEqual(d["page_percent"], 0)
+
+        for d in wg_summary:
+            if d["wg"] == "gong":
+                # Lima's doc in gong above counts at the dict for gong even though the ad reported there is Foxtrot.
+                self.assertEqual(
+                    d,
+                    {
+                        "wg": "gong",
+                        "area": "green",
+                        "ad": "Foxtrot",
+                        "doc_count": 1,
+                        "page_count": 4,
+                        "rfc_count": 0,
+                        "recent_rfc_count": 0,
+                    },
+                )
+            elif d["ad"] == "Lima":
+                self.assertEqual(
+                    d["area"], "violet"
+                )  # The out of area assignment is not reflected in the wg_summary at all.
+
+        # Now pile on a lot of documents
+        for wg_acronym in [
+            "bassoon",
+            "celesta",
+            "clarinet",
+            "cymbals",
+            "flute",
+            "glockenspiel",
+            "gong",
+            "guitar",
+            "harp",
+            "harpsichord",
+            "oboe",
+            "organ",
+            "piano",
+            "piccolo",
+            "saxophone",
+            "tambourine",
+            "timpani",
+        ]:
+            if wg_acronym in ["bassoon", "celesta"]:
+                continue  # Those WGs have no docs
+            # The rest have a doc that's not assigned to any ad
+            WgDraftFactory(
+                group=Group.objects.get(acronym=wg_acronym), pages=len(wg_acronym)
+            )
+            if wg_acronym[0] > "g":
+                # Some have a doc assigned to the responsible ad
+                WgDraftFactory(
+                    group=Group.objects.get(acronym=wg_acronym),
+                    pages=len(wg_acronym),
+                    ad=Role.objects.get(name_id="ad", group__acronym=wg_acronym).person,
+                )
+        # The other AD for an area might be covering a doc
+        WgDraftFactory(
+            group=Group.objects.get(acronym="saxophone"),
+            pages=len("saxophone"),
+            ad=Person.objects.get(name="Juliet"),
+        )
+        # An Ad not associated with the group or the area is responsible for a doc
+        WgDraftFactory(
+            group=Group.objects.get(acronym="bassoon"),
+            pages=len("bassoon"),
+            ad=Person.objects.get(name="Juliet"),
+        )
+
+        (
+            area_summary,
+            area_totals,
+            ad_summary,
+            noad_summary,
+            ad_totals,
+            noad_totals,
+            totals,
+            wg_summary,
+        ) = get_wg_dashboard_info()
+
+        self.assertEqual(
+            area_summary,
+            [
+                {
+                    "area": "blue",
+                    "groups_in_area": 3,
+                    "groups_with_docs": 3,
+                    "doc_count": 6,
+                    "page_count": 40,
+                    "group_percent": 18.75,
+                    "doc_percent": 21.428571428571427,
+                    "page_percent": 20.51282051282051,
+                },
+                {
+                    "area": "green",
+                    "groups_in_area": 3,
+                    "groups_with_docs": 3,
+                    "doc_count": 5,
+                    "page_count": 22,
+                    "group_percent": 18.75,
+                    "doc_percent": 17.857142857142858,
+                    "page_percent": 11.282051282051283,
+                },
+                {
+                    "area": "orange",
+                    "groups_in_area": 4,
+                    "groups_with_docs": 3,
+                    "doc_count": 4,
+                    "page_count": 29,
+                    "group_percent": 18.75,
+                    "doc_percent": 14.285714285714285,
+                    "page_percent": 14.871794871794872,
+                },
+                {
+                    "area": "red",
+                    "groups_in_area": 1,
+                    "groups_with_docs": 1,
+                    "doc_count": 1,
+                    "page_count": 7,
+                    "group_percent": 6.25,
+                    "doc_percent": 3.571428571428571,
+                    "page_percent": 3.5897435897435894,
+                },
+                {
+                    "area": "violet",
+                    "groups_in_area": 4,
+                    "groups_with_docs": 4,
+                    "doc_count": 10,
+                    "page_count": 80,
+                    "group_percent": 25.0,
+                    "doc_percent": 35.714285714285715,
+                    "page_percent": 41.02564102564102,
+                },
+                {
+                    "area": "yellow",
+                    "groups_in_area": 2,
+                    "groups_with_docs": 2,
+                    "doc_count": 2,
+                    "page_count": 17,
+                    "group_percent": 12.5,
+                    "doc_percent": 7.142857142857142,
+                    "page_percent": 8.717948717948717,
+                },
+            ],
+        )
+        self.assertEqual(
+            area_totals, {"group_count": 16, "doc_count": 28, "page_count": 195}
+        )
+        self.assertEqual(
+            ad_summary,
+            [
+                {
+                    "ad": "Alpha",
+                    "area": "red",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0.0,
+                    "doc_percent": 0.0,
+                    "page_percent": 0.0,
+                },
+                {
+                    "ad": "Bravo",
+                    "area": "orange",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0.0,
+                    "doc_percent": 0.0,
+                    "page_percent": 0.0,
+                },
+                {
+                    "ad": "Charlie",
+                    "area": "orange",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0.0,
+                    "doc_percent": 0.0,
+                    "page_percent": 0.0,
+                },
+                {
+                    "ad": "Delta",
+                    "area": "yellow",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0.0,
+                    "doc_percent": 0.0,
+                    "page_percent": 0.0,
+                },
+                {
+                    "ad": "Echo",
+                    "area": "yellow",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0.0,
+                    "doc_percent": 0.0,
+                    "page_percent": 0.0,
+                },
+                {
+                    "ad": "Foxtrot",
+                    "area": "green",
+                    "ad_group_count": 2,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0.0,
+                    "doc_percent": 0.0,
+                    "page_percent": 0.0,
+                },
+                {
+                    "ad": "Golf",
+                    "area": "green",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 4,
+                    "group_percent": 8.333333333333332,
+                    "doc_percent": 7.6923076923076925,
+                    "page_percent": 4.395604395604396,
+                },
+                {
+                    "ad": "Hotel",
+                    "area": "blue",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 11,
+                    "group_percent": 8.333333333333332,
+                    "doc_percent": 7.6923076923076925,
+                    "page_percent": 12.087912087912088,
+                },
+                {
+                    "ad": "Indigo",
+                    "area": "blue",
+                    "ad_group_count": 2,
+                    "doc_group_count": 2,
+                    "doc_count": 2,
+                    "page_count": 9,
+                    "group_percent": 16.666666666666664,
+                    "doc_percent": 15.384615384615385,
+                    "page_percent": 9.89010989010989,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "orange",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 7,
+                    "group_percent": 8.333333333333332,
+                    "doc_percent": 7.6923076923076925,
+                    "page_percent": 7.6923076923076925,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "red",
+                    "ad_group_count": 0,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 7,
+                    "group_percent": 8.333333333333332,
+                    "doc_percent": 7.6923076923076925,
+                    "page_percent": 7.6923076923076925,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "violet",
+                    "ad_group_count": 1,
+                    "doc_group_count": 2,
+                    "doc_count": 2,
+                    "page_count": 14,
+                    "group_percent": 16.666666666666664,
+                    "doc_percent": 15.384615384615385,
+                    "page_percent": 15.384615384615385,
+                },
+                {
+                    "ad": "Kilo",
+                    "area": "violet",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 7,
+                    "group_percent": 8.333333333333332,
+                    "doc_percent": 7.6923076923076925,
+                    "page_percent": 7.6923076923076925,
+                },
+                {
+                    "ad": "Lima",
+                    "area": "green",
+                    "ad_group_count": 0,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 4,
+                    "group_percent": 8.333333333333332,
+                    "doc_percent": 7.6923076923076925,
+                    "page_percent": 4.395604395604396,
+                },
+                {
+                    "ad": "Lima",
+                    "area": "violet",
+                    "ad_group_count": 2,
+                    "doc_group_count": 2,
+                    "doc_count": 3,
+                    "page_count": 28,
+                    "group_percent": 16.666666666666664,
+                    "doc_percent": 23.076923076923077,
+                    "page_percent": 30.76923076923077,
+                },
+            ],
+        )
+        self.assertEqual(
+            noad_summary,
+            [
+                {
+                    "ad": "Alpha",
+                    "area": "red",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0.0,
+                    "doc_percent": 0.0,
+                    "page_percent": 0.0,
+                },
+                {
+                    "ad": "Bravo",
+                    "area": "orange",
+                    "ad_group_count": 1,
+                    "doc_group_count": 0,
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "group_percent": 0.0,
+                    "doc_percent": 0.0,
+                    "page_percent": 0.0,
+                },
+                {
+                    "ad": "Charlie",
+                    "area": "orange",
+                    "ad_group_count": 2,
+                    "doc_group_count": 2,
+                    "doc_count": 2,
+                    "page_count": 15,
+                    "group_percent": 13.333333333333334,
+                    "doc_percent": 13.333333333333334,
+                    "page_percent": 14.423076923076922,
+                },
+                {
+                    "ad": "Delta",
+                    "area": "yellow",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 5,
+                    "group_percent": 6.666666666666667,
+                    "doc_percent": 6.666666666666667,
+                    "page_percent": 4.807692307692308,
+                },
+                {
+                    "ad": "Echo",
+                    "area": "yellow",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 12,
+                    "group_percent": 6.666666666666667,
+                    "doc_percent": 6.666666666666667,
+                    "page_percent": 11.538461538461538,
+                },
+                {
+                    "ad": "Foxtrot",
+                    "area": "green",
+                    "ad_group_count": 2,
+                    "doc_group_count": 2,
+                    "doc_count": 2,
+                    "page_count": 10,
+                    "group_percent": 13.333333333333334,
+                    "doc_percent": 13.333333333333334,
+                    "page_percent": 9.615384615384617,
+                },
+                {
+                    "ad": "Golf",
+                    "area": "green",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 4,
+                    "group_percent": 6.666666666666667,
+                    "doc_percent": 6.666666666666667,
+                    "page_percent": 3.8461538461538463,
+                },
+                {
+                    "ad": "Hotel",
+                    "area": "blue",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 11,
+                    "group_percent": 6.666666666666667,
+                    "doc_percent": 6.666666666666667,
+                    "page_percent": 10.576923076923077,
+                },
+                {
+                    "ad": "Indigo",
+                    "area": "blue",
+                    "ad_group_count": 2,
+                    "doc_group_count": 2,
+                    "doc_count": 2,
+                    "page_count": 9,
+                    "group_percent": 13.333333333333334,
+                    "doc_percent": 13.333333333333334,
+                    "page_percent": 8.653846153846153,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "orange",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 7,
+                    "group_percent": 6.666666666666667,
+                    "doc_percent": 6.666666666666667,
+                    "page_percent": 6.730769230769231,
+                },
+                {
+                    "ad": "Juliet",
+                    "area": "violet",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 5,
+                    "group_percent": 6.666666666666667,
+                    "doc_percent": 6.666666666666667,
+                    "page_percent": 4.807692307692308,
+                },
+                {
+                    "ad": "Kilo",
+                    "area": "violet",
+                    "ad_group_count": 1,
+                    "doc_group_count": 1,
+                    "doc_count": 1,
+                    "page_count": 7,
+                    "group_percent": 6.666666666666667,
+                    "doc_percent": 6.666666666666667,
+                    "page_percent": 6.730769230769231,
+                },
+                {
+                    "ad": "Lima",
+                    "area": "violet",
+                    "ad_group_count": 2,
+                    "doc_group_count": 2,
+                    "doc_count": 2,
+                    "page_count": 19,
+                    "group_percent": 13.333333333333334,
+                    "doc_percent": 13.333333333333334,
+                    "page_percent": 18.269230769230766,
+                },
+            ],
+        )
+        self.assertEqual(
+            ad_totals,
+            {
+                "ad_group_count": 17,
+                "doc_group_count": 12,
+                "doc_count": 13,
+                "page_count": 91,
+            },
+        )
+        self.assertEqual(
+            noad_totals,
+            {
+                "ad_group_count": 17,
+                "doc_group_count": 15,
+                "doc_count": 15,
+                "page_count": 104,
+            },
+        )
+        self.assertEqual(
+            totals,
+            {
+                "group_count": 17,
+                "doc_count": 28,
+                "page_count": 195,
+                "groups_with_docs_count": 16,
+            },
+        )
+        self.assertEqual(
+            wg_summary,
+            [
+                {
+                    "wg": "bassoon",
+                    "area": "red",
+                    "ad": "Alpha",
+                    "doc_count": 1,
+                    "page_count": 7,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "celesta",
+                    "area": "orange",
+                    "ad": "Bravo",
+                    "doc_count": 0,
+                    "page_count": 0,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "clarinet",
+                    "area": "orange",
+                    "ad": "Charlie",
+                    "doc_count": 1,
+                    "page_count": 8,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "cymbals",
+                    "area": "orange",
+                    "ad": "Charlie",
+                    "doc_count": 1,
+                    "page_count": 7,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "flute",
+                    "area": "yellow",
+                    "ad": "Delta",
+                    "doc_count": 1,
+                    "page_count": 5,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "glockenspiel",
+                    "area": "yellow",
+                    "ad": "Echo",
+                    "doc_count": 1,
+                    "page_count": 12,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "gong",
+                    "area": "green",
+                    "ad": "Foxtrot",
+                    "doc_count": 2,
+                    "page_count": 8,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "guitar",
+                    "area": "green",
+                    "ad": "Foxtrot",
+                    "doc_count": 1,
+                    "page_count": 6,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "harp",
+                    "area": "green",
+                    "ad": "Golf",
+                    "doc_count": 2,
+                    "page_count": 8,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "harpsichord",
+                    "area": "blue",
+                    "ad": "Hotel",
+                    "doc_count": 2,
+                    "page_count": 22,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "oboe",
+                    "area": "blue",
+                    "ad": "Indigo",
+                    "doc_count": 2,
+                    "page_count": 8,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "organ",
+                    "area": "blue",
+                    "ad": "Indigo",
+                    "doc_count": 2,
+                    "page_count": 10,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "piano",
+                    "area": "violet",
+                    "ad": "Juliet",
+                    "doc_count": 2,
+                    "page_count": 10,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "piccolo",
+                    "area": "violet",
+                    "ad": "Kilo",
+                    "doc_count": 2,
+                    "page_count": 14,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "saxophone",
+                    "area": "violet",
+                    "ad": "Lima",
+                    "doc_count": 4,
+                    "page_count": 36,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "tambourine",
+                    "area": "violet",
+                    "ad": "Lima",
+                    "doc_count": 2,
+                    "page_count": 20,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+                {
+                    "wg": "timpani",
+                    "area": "orange",
+                    "ad": "Juliet",
+                    "doc_count": 2,
+                    "page_count": 14,
+                    "rfc_count": 0,
+                    "recent_rfc_count": 0,
+                },
+            ],
+        )
+
+        # Make sure the view doesn't _crash_ - the template is a dead-simple rendering of the dicts, but this test doesn't prove that
+        url = urlreverse("ietf.iesg.views.working_groups")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+
 class IESGAgendaTests(TestCase):
     def setUp(self):
         super().setUp()
         mars = GroupFactory(acronym='mars',parent=Group.objects.get(acronym='farfut'))
         wgdraft = WgDraftFactory(name='draft-ietf-mars-test', group=mars, intended_std_level_id='ps')
-        rfc = IndividualRfcFactory.create(stream_id='irtf', other_aliases=['rfc6666',], states=[('draft','rfc'),('draft-iesg','pub')], std_level_id='inf', )
-        wgdraft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'), relationship_id='refnorm')
+        rfc = IndividualRfcFactory.create(stream_id='irtf', rfc_number=6666, std_level_id='inf', )
+        wgdraft.relateddocument_set.create(target=rfc, relationship_id='refnorm')
         ise_draft = IndividualDraftFactory(name='draft-imaginary-independent-submission')
         ise_draft.stream = StreamName.objects.get(slug="ise")
         ise_draft.save_with_history([DocEvent(doc=ise_draft, rev=ise_draft.rev, type="changed_stream", by=Person.objects.get(user__username="secretary"), desc="Test")])
@@ -134,6 +1806,16 @@ def setUp(self):
         for i in range(0, 10):
             self.mgmt_items.append(IESGMgmtItemFactory())
 
+    def test_fill_in_agenda_administrivia(self):
+        roll_call = TelechatAgendaContentFactory(section_id='roll_call')
+        minutes = TelechatAgendaContentFactory(section_id='minutes')
+        action_items = TelechatAgendaContentFactory(section_id='action_items')
+        sections = agenda_sections()
+        fill_in_agenda_administrivia(None, sections)  # n.b., date parameter is unused at present
+        self.assertIn(roll_call.text, sections["1.1"]["text"])
+        self.assertIn(minutes.text, sections["1.3"]["text"])
+        self.assertIn(action_items.text, sections["1.4"]["text"])
+
     def test_fill_in_agenda_docs(self):
         draft = self.telechat_docs["ietf_draft"]
         statchg = self.telechat_docs["statchg"]
@@ -142,7 +1824,7 @@ def test_fill_in_agenda_docs(self):
         mgmtitem = self.mgmt_items
 
         # put on agenda
-        date = datetime.date.today() + datetime.timedelta(days=50)
+        date = date_today(settings.TIME_ZONE) + datetime.timedelta(days=50)
         TelechatDate.objects.create(date=date)
         telechat_event = TelechatDocEvent.objects.create(
             type="scheduled_for_telechat",
@@ -221,7 +1903,7 @@ def test_fill_in_agenda_docs(self):
 
         relation = RelatedDocument.objects.create(
             source=statchg,
-            target=DocAlias.objects.filter(name__startswith='rfc', docs__std_level="ps")[0],
+            target=Document.objects.filter(type_id="rfc", std_level="ps").first(),
             relationship_id="tohist")
 
         statchg.group = Group.objects.get(acronym="mars")
@@ -239,7 +1921,7 @@ def test_fill_in_agenda_docs(self):
         self.assertTrue(statchg in agenda_data(date_str)["sections"]["2.3.3"]["docs"])
         
         # 3.3 document status changes
-        relation.target = DocAlias.objects.filter(name__startswith='rfc', docs__std_level="inf")[0]
+        relation.target = Document.objects.filter(type_id="rfc", std_level="inf").first()
         relation.save()
 
         statchg.group = Group.objects.get(acronym="mars")
@@ -330,9 +2012,14 @@ def test_agenda_json(self):
         self.assertTrue(r.json())
 
     def test_agenda(self):
+        action_items = TelechatAgendaContentFactory(section_id='action_items')
         r = self.client.get(urlreverse("ietf.iesg.views.agenda"))
         self.assertEqual(r.status_code, 200)
 
+        self.assertContains(r, action_items.text)
+
+        q = PyQuery(r.content)
+
         for k, d in self.telechat_docs.items():
             if d.type_id == "charter":
                 self.assertContains(r, d.group.name, msg_prefix="%s '%s' not in response" % (k, d.group.name))
@@ -341,6 +2028,18 @@ def test_agenda(self):
                 self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name))
                 self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title))
 
+            if d.type_id in ["charter", "draft"]:
+                if d.group.parent is None:
+                    continue
+                wg_url = urlreverse("ietf.group.views.active_groups", kwargs=dict(group_type="wg"))
+                href = f"{wg_url}#{d.group.parent.acronym.upper()}"
+                texts = [elem.text.strip() for elem in q(f'a[href="{href}"]')]
+                self.assertGreater(len(texts), 0)
+                if d.type_id == "charter":
+                    self.assertTrue(any(t == d.group.parent.acronym.upper() for t in texts))
+                elif d.type_id == "draft":
+                    self.assertTrue(any(t == f"({d.group.parent.acronym.upper()})" for t in texts))
+
         for i, mi in enumerate(self.mgmt_items, start=1):
             s = "6." + str(i)
             self.assertContains(r, s, msg_prefix="Section '%s' not in response" % s)
@@ -349,6 +2048,29 @@ def test_agenda(self):
         # Make sure the sort places 6.9 before 6.10
         self.assertLess(r.content.find(b"6.9"), r.content.find(b"6.10"))
 
+    def test_agenda_restricted_sections(self):
+        r = self.client.get(urlreverse("ietf.iesg.views.agenda"))
+        # not logged in
+        for section_id in ("roll_call", "minutes"):
+            self.assertNotContains(
+                r, urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": section_id})
+            )
+
+        self.client.login(username="plain", password="plain+password")
+        for section_id in ("roll_call", "minutes"):
+            self.assertNotContains(
+                r, urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": section_id})
+            )
+
+        for username in ("ad", "secretary", "iab chair"):
+            self.client.login(username=username, password=f"{username}+password")
+            r = self.client.get(urlreverse("ietf.iesg.views.agenda"))
+            self.assertEqual(r.status_code, 200)
+            for section_id in ("roll_call", "minutes"):
+                self.assertContains(
+                    r, urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": section_id})
+                )
+
     def test_agenda_txt(self):
         r = self.client.get(urlreverse("ietf.iesg.views.agenda_txt"))
         self.assertEqual(r.status_code, 200)
@@ -414,12 +2136,13 @@ def test_agenda_documents_txt(self):
     def test_agenda_documents(self):
         url = urlreverse("ietf.iesg.views.agenda_documents")
         r = self.client.get(url)
+
         self.assertEqual(r.status_code, 200)
 
         for k, d in self.telechat_docs.items():
             self.assertContains(r, d.name, msg_prefix="%s '%s' not in response" % (k, d.name, ))
-            self.assertContains(r, d.title, msg_prefix="%s '%s' title not in response" % (k, d.title, ))
-
+            self.assertContains(r, d.title, msg_prefix="%s '%s' not in response" % (k, d.title, ))
+    
     def test_past_documents(self):
         url = urlreverse("ietf.iesg.views.past_documents")
         # We haven't put any documents on past telechats, so this should be empty
@@ -430,7 +2153,7 @@ def test_past_documents(self):
             self.assertNotIn(d.title, unicontent(r))
         # Add the documents to a past telechat
         by = Person.objects.get(name="Areað Irector")
-        date = datetime.date.today() - datetime.timedelta(days=14)
+        date = date_today(settings.TIME_ZONE) - datetime.timedelta(days=14)
         approved = State.objects.get(type='draft-iesg', slug='approved')
         iesg_eval = State.objects.get(type='draft-iesg', slug='iesg-eva')
         for d in list(self.telechat_docs.values()):
@@ -485,7 +2208,7 @@ def test_agenda_telechat_docs(self):
 
     def test_admin_change(self):
         draft = Document.objects.get(name="draft-ietf-mars-test")
-        today = datetime.date.today()
+        today = date_today(settings.TIME_ZONE)
         telechat_date = TelechatDate.objects.get(date=draft.telechat_date())
         url = urlreverse('admin:iesg_telechatdate_change', args=(telechat_date.id,))
         self.client.login(username="secretary", password="secretary+password")
@@ -494,6 +2217,66 @@ def test_admin_change(self):
         draft = Document.objects.get(name="draft-ietf-mars-test")
         self.assertEqual(draft.telechat_date(),today)
 
+class IESGAgendaTelechatPagesTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        # make_immutable_test_data made a set of future telechats - only need one
+        # We'll take the "next" one
+        self.telechat_date = get_agenda_date()
+        # make_immutable_test_data made and area with only one ad - give it another
+        ad = Person.objects.get(user__username="ad")
+        adrole = Role.objects.get(person=ad, name="ad")
+        ad2 = RoleFactory(group=adrole.group, name_id="ad").person
+        self.ads=[ad,ad2]
+        
+        # Make some drafts
+        docs = [
+            WgDraftFactory(pages=2, states=[('draft-iesg','iesg-eva'),]),
+            IndividualDraftFactory(pages=20, states=[('draft-iesg','iesg-eva'),]),
+            WgDraftFactory(pages=200, states=[('draft-iesg','iesg-eva'),]),
+        ]
+        # Put them on the telechat
+        for doc in docs:
+            TelechatDocEventFactory(doc=doc, telechat_date=self.telechat_date)
+        # Give them ballots
+        ballots = [BallotDocEventFactory(doc=doc) for doc in docs]
+
+        # Give the "ad" Area-Director a discuss on one 
+        BallotPositionDocEventFactory(balloter=ad, doc=docs[0], pos_id="discuss", ballot=ballots[0])
+        # and a "norecord" position on another
+        BallotPositionDocEventFactory(balloter=ad, doc=docs[1], pos_id="norecord", ballot=ballots[1])
+        # Now "ad" should have 220 pages left to ballot on.
+        # Every other ad should have 222 pages left to ballot on.
+
+    def test_ad_pages_left_to_ballot_on(self):
+        url = urlreverse("ietf.iesg.views.agenda_documents")
+
+        # A non-AD user won't get "pages left"
+        response = self.client.get(url)
+        telechat = response.context["telechats"][0]
+        self.assertEqual(telechat["date"], self.telechat_date)
+        self.assertEqual(telechat["ad_pages_left_to_ballot_on"],0)
+        self.assertNotContains(response,"pages left to ballot on")
+
+        username=self.ads[0].user.username
+        self.assertTrue(self.client.login(username=username, password=f"{username}+password"))
+
+        response = self.client.get(url)
+        telechat = response.context["telechats"][0]
+        self.assertEqual(telechat["ad_pages_left_to_ballot_on"],220)
+        self.assertContains(response,"220 pages left to ballot on")
+
+        self.client.logout()
+        username=self.ads[1].user.username
+        self.assertTrue(self.client.login(username=username, password=f"{username}+password"))
+
+        response = self.client.get(url)
+        telechat = response.context["telechats"][0]
+        self.assertEqual(telechat["ad_pages_left_to_ballot_on"],222)
+
+
+
+
 class RescheduleOnAgendaTests(TestCase):
     def test_reschedule(self):
         draft = WgDraftFactory()
@@ -541,4 +2324,105 @@ def test_reschedule(self):
         self.assertTrue(draft.latest_event(TelechatDocEvent, "scheduled_for_telechat"))
         self.assertEqual(draft.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date, d)
         self.assertTrue(not draft.latest_event(TelechatDocEvent, "scheduled_for_telechat").returning_item)
-        self.assertEqual(draft.docevent_set.count(), events_before + 1)
\ No newline at end of file
+        self.assertEqual(draft.docevent_set.count(), events_before + 1)
+
+
+class TelechatAgendaContentTests(TestCase):
+    def test_telechat_agenda_content_view(self):
+        self.client.login(username="ad", password="ad+password")
+        r = self.client.get(urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": "fake"}))
+        self.assertEqual(r.status_code, 404, "Nonexistent section should 404")
+        for section in TelechatAgendaSectionName.objects.filter(used=True).values_list("slug", flat=True):
+            r = self.client.get(
+                urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": section})
+            )
+            self.assertEqual(r.status_code, 404, "Section with no content should 404")
+        for section in TelechatAgendaSectionName.objects.filter(used=True).values_list("slug", flat=True):
+            content = TelechatAgendaContentFactory(section_id=section).text
+            r = self.client.get(
+                urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": section})
+            )
+            self.assertContains(r, content, status_code=200)
+            self.assertEqual(r.get("Content-Type", None), "text/plain; charset=utf-8")
+
+    def test_telechat_agenda_content_view_permissions(self):
+        for section in TelechatAgendaSectionName.objects.filter(used=True).values_list("slug", flat=True):
+            TelechatAgendaContentFactory(section_id=section)
+            url = urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": section})
+            self.client.logout()
+            login_testing_unauthorized(self, "plain", url)
+            login_testing_unauthorized(self, "ad", url)
+            self.assertEqual(self.client.get(url).status_code, 200)
+            self.client.login(username="iab chair", password="iab chair+password")
+            self.assertEqual(self.client.get(url).status_code, 200)
+            self.client.login(username="secretary", password="secretary+password")
+            self.assertEqual(self.client.get(url).status_code, 200)
+
+    def test_telechat_agenda_content_edit(self):
+        for section in TelechatAgendaSectionName.objects.filter(used=True):
+            self.assertFalse(TelechatAgendaContent.objects.filter(section=section).exists())
+            url = urlreverse("ietf.iesg.views.telechat_agenda_content_edit", kwargs={"section": section.slug})
+            self.client.logout()
+            login_testing_unauthorized(self, "plain", url, method="get")
+            login_testing_unauthorized(self, "ad", url, method="get")
+            login_testing_unauthorized(self, "iab chair", url, method="get")
+            login_testing_unauthorized(self, "secretary", url, method="get")
+            r = self.client.get(url)
+            self.assertContains(r, str(section), status_code=200)
+
+            self.client.logout()
+            login_testing_unauthorized(self, "plain", url, method="post")
+            login_testing_unauthorized(self, "ad", url, method="post")
+            login_testing_unauthorized(self, "iab chair", url, method="post")
+            login_testing_unauthorized(self, "secretary", url, method="post")
+            r = self.client.post(url, {"text": "This is some content"})
+            self.assertRedirects(r, urlreverse("ietf.iesg.views.telechat_agenda_content_manage"))
+            contents = TelechatAgendaContent.objects.filter(section=section)
+            self.assertEqual(contents.count(), 1)
+            self.assertEqual(contents.first().text, "This is some content")
+
+            self.client.logout()
+            login_testing_unauthorized(self, "plain", url, method="post")
+            login_testing_unauthorized(self, "ad", url, method="post")
+            login_testing_unauthorized(self, "iab chair", url, method="post")
+            login_testing_unauthorized(self, "secretary", url, method="post")
+            r = self.client.post(url, {"text": "This is some different content"})
+            self.assertRedirects(r, urlreverse("ietf.iesg.views.telechat_agenda_content_manage"))
+            contents = TelechatAgendaContent.objects.filter(section=section)
+            self.assertEqual(contents.count(), 1)
+            self.assertEqual(contents.first().text, "This is some different content")
+
+    def test_telechat_agenda_content_manage(self):
+        url = urlreverse("ietf.iesg.views.telechat_agenda_content_manage")
+        login_testing_unauthorized(self, "plain", url)
+        login_testing_unauthorized(self, "ad", url)
+        login_testing_unauthorized(self, "iab chair", url)
+        login_testing_unauthorized(self, "secretary", url)
+        self.assertEqual(TelechatAgendaContent.objects.count(), 0)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        pq = PyQuery(r.content)
+        for section in TelechatAgendaSectionName.objects.filter(used=True):
+            # check that there's a tab even when section is empty
+            nav_button = pq(f"button.nav-link#{section.slug}-tab")
+            self.assertEqual(nav_button.text(), str(section))
+            edit_url = urlreverse("ietf.iesg.views.telechat_agenda_content_edit", kwargs={"section": section.pk})
+            edit_button = pq(f'div#{section.slug} a[href="{edit_url}"]')
+            self.assertEqual(len(edit_button), 1)
+            self.assertIn(f"No {section}", pq(f"div#{section.slug}").text())
+            # and create a section for the next test
+            TelechatAgendaContentFactory(section_id=section.slug)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        pq = PyQuery(r.content)
+        for section in TelechatAgendaSectionName.objects.filter(used=True):
+            # check that there's a tab with the content
+            nav_button = pq(f"button.nav-link#{section.slug}-tab")
+            self.assertEqual(nav_button.text(), str(section))
+            edit_url = urlreverse("ietf.iesg.views.telechat_agenda_content_edit", kwargs={"section": section.pk})
+            edit_button = pq(f'div#{section.slug} a[href="{edit_url}"]')
+            self.assertEqual(len(edit_button), 1)
+            self.assertIn(
+                TelechatAgendaContent.objects.get(section=section).text, pq(f"div#{section.slug}").text()
+            )
+
diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py
index fa6f3dbf73..5fd9dea0cc 100644
--- a/ietf/iesg/urls.py
+++ b/ietf/iesg/urls.py
@@ -52,9 +52,14 @@
 
     url(r'^agenda/documents.txt$', views.agenda_documents_txt),
     url(r'^agenda/documents/$', views.agenda_documents),
+    url(r'^agenda/sections$', views.telechat_agenda_content_manage),
+    url(r'^agenda/section/(?P<section>[a-z_]+)$', views.telechat_agenda_content_view),
+    url(r'^agenda/section/(?P<section>[a-z_]+)/edit$', views.telechat_agenda_content_edit),
     url(r'^past/documents/$', views.past_documents),
     url(r'^agenda/telechat-(?:%(date)s-)?docs.tgz' % settings.URL_REGEXPS, views.telechat_docs_tarfile),
     url(r'^discusses/$', views.discusses),
+    url(r'^ietf-activity/$', views.ietf_activity),
+    url(r'^working-groups/$', views.working_groups),
     url(r'^milestones/$', views.milestones_needing_review),
     url(r'^photos/$', views.photos),
-]
\ No newline at end of file
+]
diff --git a/ietf/iesg/utils.py b/ietf/iesg/utils.py
index 4ddc9cb404..1d24ecac8e 100644
--- a/ietf/iesg/utils.py
+++ b/ietf/iesg/utils.py
@@ -1,56 +1,321 @@
-from collections import namedtuple
+from collections import Counter, defaultdict, namedtuple
 
-import debug                            # pyflakes:ignore
+import datetime
+
+import debug  # pyflakes:ignore
+
+from django.db import models
+from django.utils import timezone
 
 from ietf.doc.models import Document, STATUSCHANGE_RELATIONS
 from ietf.doc.utils_search import fill_in_telechat_date
+from ietf.group.models import Group
 from ietf.iesg.agenda import get_doc_section
+from ietf.person.utils import get_active_ads
+from ietf.utils.unicodenormalize import normalize_for_sorting
 
+TelechatPageCount = namedtuple(
+    "TelechatPageCount",
+    ["for_approval", "for_action", "related", "ad_pages_left_to_ballot_on"],
+)
 
-TelechatPageCount = namedtuple('TelechatPageCount',['for_approval','for_action','related'])
 
-def telechat_page_count(date=None, docs=None):
+def telechat_page_count(date=None, docs=None, ad=None):
     if not date and not docs:
-        return TelechatPageCount(0, 0, 0)
+        return TelechatPageCount(0, 0, 0, 0)
 
     if not docs:
-        candidates = Document.objects.filter(docevent__telechatdocevent__telechat_date=date).distinct() 
+        candidates = Document.objects.filter(
+            docevent__telechatdocevent__telechat_date=date
+        ).distinct()
         fill_in_telechat_date(candidates)
-        docs = [ doc for doc in candidates if doc.telechat_date()==date ]
+        docs = [doc for doc in candidates if doc.telechat_date() == date]
+
+    for_action = [d for d in docs if get_doc_section(d).endswith(".3")]
 
-    for_action =[d for d in docs if get_doc_section(d).endswith('.3')]
+    for_approval = set(docs) - set(for_action)
 
-    for_approval = set(docs)-set(for_action)
+    drafts = [d for d in for_approval if d.type_id == "draft"]
 
-    drafts = [d for d in for_approval if d.type_id == 'draft']
+    ad_pages_left_to_ballot_on = 0
+    pages_for_approval = 0
 
-    pages_for_approval = sum([d.pages or 0 for d in drafts])
+    for draft in drafts:
+        pages_for_approval += draft.pages or 0
+        if ad:
+            ballot = draft.active_ballot()
+            if ballot:
+                positions = ballot.active_balloter_positions()
+                ad_position = positions.get(ad, None)
+                if ad_position is None or ad_position.pos_id == "norecord":
+                    ad_pages_left_to_ballot_on += draft.pages or 0
 
     pages_for_action = 0
     for d in for_action:
-        if d.type_id == 'draft':
+        if d.type_id == "draft":
             pages_for_action += d.pages or 0
-        elif d.type_id == 'statchg':
+        elif d.type_id == "statchg":
             for rel in d.related_that_doc(STATUSCHANGE_RELATIONS):
-                pages_for_action += rel.document.pages or 0
-        elif d.type_id == 'conflrev':
-            for rel in d.related_that_doc('conflrev'):
-                pages_for_action += rel.document.pages or 0
+                pages_for_action += rel.pages or 0
+        elif d.type_id == "conflrev":
+            for rel in d.related_that_doc("conflrev"):
+                pages_for_action += rel.pages or 0
         else:
             pass
 
     related_pages = 0
-    for d in for_approval-set(drafts):
-        if d.type_id == 'statchg':
+    for d in for_approval - set(drafts):
+        if d.type_id == "statchg":
             for rel in d.related_that_doc(STATUSCHANGE_RELATIONS):
-                related_pages += rel.document.pages or 0
-        elif d.type_id == 'conflrev':
-            for rel in d.related_that_doc('conflrev'):
-                related_pages += rel.document.pages or 0
+                related_pages += rel.pages or 0
+        elif d.type_id == "conflrev":
+            for rel in d.related_that_doc("conflrev"):
+                related_pages += rel.pages or 0
         else:
             # There's really nothing to rely on to give a reading load estimate for charters
             pass
-    
-    return TelechatPageCount(for_approval=pages_for_approval,
-                             for_action=pages_for_action,
-                             related=related_pages)
+
+    return TelechatPageCount(
+        for_approval=pages_for_approval,
+        for_action=pages_for_action,
+        related=related_pages,
+        ad_pages_left_to_ballot_on=ad_pages_left_to_ballot_on,
+    )
+
+
+def get_wg_dashboard_info():
+    docs = (
+        Document.objects.filter(
+            group__type="wg",
+            group__state="active",
+            states__type="draft",
+            states__slug="active",
+        )
+        .filter(models.Q(ad__isnull=True) | models.Q(ad__in=get_active_ads()))
+        .distinct()
+        .prefetch_related("group", "group__parent")
+        .exclude(
+            states__type="draft-stream-ietf",
+            states__slug__in=["c-adopt", "wg-cand", "dead", "parked", "info"],
+        )
+    )
+    groups = Group.objects.filter(state="active", type="wg")
+    areas = Group.objects.filter(state="active", type="area")
+
+    total_group_count = groups.count()
+    total_doc_count = docs.count()
+    total_page_count = docs.aggregate(models.Sum("pages"))["pages__sum"] or 0
+    totals = {
+        "group_count": total_group_count,
+        "doc_count": total_doc_count,
+        "page_count": total_page_count,
+    }
+
+    # Since this view is primarily about counting subsets of the above docs query and the
+    # expected number of returned documents is just under 1000 typically - do the totaling
+    # work in python rather than asking the db to do it.
+
+    groups_for_area = defaultdict(set)
+    pages_for_area = defaultdict(lambda: 0)
+    docs_for_area = defaultdict(lambda: 0)
+    groups_for_ad = defaultdict(lambda: defaultdict(set))
+    pages_for_ad = defaultdict(lambda: defaultdict(lambda: 0))
+    docs_for_ad = defaultdict(lambda: defaultdict(lambda: 0))
+    groups_for_noad = defaultdict(lambda: defaultdict(set))
+    pages_for_noad = defaultdict(lambda: defaultdict(lambda: 0))
+    docs_for_noad = defaultdict(lambda: defaultdict(lambda: 0))
+    docs_for_wg = defaultdict(lambda: 0)
+    pages_for_wg = defaultdict(lambda: 0)
+    groups_total = set()
+    pages_total = 0
+    docs_total = 0
+
+    responsible_for_group = defaultdict(lambda: defaultdict(lambda: "None"))
+    responsible_count = defaultdict(lambda: defaultdict(lambda: 0))
+    for group in groups:
+        responsible = f"{', '.join([r.person.plain_name() for r in group.role_set.filter(name_id='ad')])}"
+        docs_for_noad[responsible][group.parent.acronym] = (
+            0  # Ensure these keys are present later
+        )
+        docs_for_ad[responsible][group.parent.acronym] = 0
+        responsible_for_group[group.acronym][group.parent.acronym] = responsible
+        responsible_count[responsible][group.parent.acronym] += 1
+
+    for doc in docs:
+        docs_for_wg[doc.group] += 1
+        pages_for_wg[doc.group] += doc.pages
+        groups_for_area[doc.group.area.acronym].add(doc.group.acronym)
+        pages_for_area[doc.group.area.acronym] += doc.pages
+        docs_for_area[doc.group.area.acronym] += 1
+
+        if doc.ad is None:
+            responsible = responsible_for_group[doc.group.acronym][
+                doc.group.parent.acronym
+            ]
+            groups_for_noad[responsible][doc.group.parent.acronym].add(
+                doc.group.acronym
+            )
+            pages_for_noad[responsible][doc.group.parent.acronym] += doc.pages
+            docs_for_noad[responsible][doc.group.parent.acronym] += 1
+        else:
+            responsible = f"{doc.ad.plain_name()}"
+            groups_for_ad[responsible][doc.group.parent.acronym].add(doc.group.acronym)
+            pages_for_ad[responsible][doc.group.parent.acronym] += doc.pages
+            docs_for_ad[responsible][doc.group.parent.acronym] += 1
+
+        docs_total += 1
+        groups_total.add(doc.group.acronym)
+        pages_total += doc.pages
+
+    groups_total = len(groups_total)
+    totals["groups_with_docs_count"] = groups_total
+
+    area_summary = []
+
+    for area in areas:
+        group_count = len(groups_for_area[area.acronym])
+        doc_count = docs_for_area[area.acronym]
+        page_count = pages_for_area[area.acronym]
+        area_summary.append(
+            {
+                "area": area.acronym,
+                "groups_in_area": groups.filter(parent=area).count(),
+                "groups_with_docs": group_count,
+                "doc_count": doc_count,
+                "page_count": page_count,
+                "group_percent": group_count / groups_total * 100
+                if groups_total != 0
+                else 0,
+                "doc_percent": doc_count / docs_total * 100 if docs_total != 0 else 0,
+                "page_percent": page_count / pages_total * 100
+                if pages_total != 0
+                else 0,
+            }
+        )
+    area_summary.sort(key=lambda r: r["area"])
+    area_totals = {
+        "group_count": groups_total,
+        "doc_count": docs_total,
+        "page_count": pages_total,
+    }
+
+    noad_summary = []
+    noad_totals = {
+        "ad_group_count": 0,
+        "doc_group_count": 0,
+        "doc_count": 0,
+        "page_count": 0,
+    }
+    for ad in docs_for_noad:
+        for area in docs_for_noad[ad]:
+            noad_totals["ad_group_count"] += responsible_count[ad][area]
+            noad_totals["doc_group_count"] += len(groups_for_noad[ad][area])
+            noad_totals["doc_count"] += docs_for_noad[ad][area]
+            noad_totals["page_count"] += pages_for_noad[ad][area]
+    for ad in docs_for_noad:
+        for area in docs_for_noad[ad]:
+            noad_summary.append(
+                {
+                    "ad": ad,
+                    "area": area,
+                    "ad_group_count": responsible_count[ad][area],
+                    "doc_group_count": len(groups_for_noad[ad][area]),
+                    "doc_count": docs_for_noad[ad][area],
+                    "page_count": pages_for_noad[ad][area],
+                    "group_percent": len(groups_for_noad[ad][area])
+                    / noad_totals["doc_group_count"]
+                    * 100
+                    if noad_totals["doc_group_count"] != 0
+                    else 0,
+                    "doc_percent": docs_for_noad[ad][area]
+                    / noad_totals["doc_count"]
+                    * 100
+                    if noad_totals["doc_count"] != 0
+                    else 0,
+                    "page_percent": pages_for_noad[ad][area]
+                    / noad_totals["page_count"]
+                    * 100
+                    if noad_totals["page_count"] != 0
+                    else 0,
+                }
+            )
+    noad_summary.sort(key=lambda r: (normalize_for_sorting(r["ad"]), r["area"]))
+
+    ad_summary = []
+    ad_totals = {
+        "ad_group_count": 0,
+        "doc_group_count": 0,
+        "doc_count": 0,
+        "page_count": 0,
+    }
+    for ad in docs_for_ad:
+        for area in docs_for_ad[ad]:
+            ad_totals["ad_group_count"] += responsible_count[ad][area]
+            ad_totals["doc_group_count"] += len(groups_for_ad[ad][area])
+            ad_totals["doc_count"] += docs_for_ad[ad][area]
+            ad_totals["page_count"] += pages_for_ad[ad][area]
+    for ad in docs_for_ad:
+        for area in docs_for_ad[ad]:
+            ad_summary.append(
+                {
+                    "ad": ad,
+                    "area": area,
+                    "ad_group_count": responsible_count[ad][area],
+                    "doc_group_count": len(groups_for_ad[ad][area]),
+                    "doc_count": docs_for_ad[ad][area],
+                    "page_count": pages_for_ad[ad][area],
+                    "group_percent": len(groups_for_ad[ad][area])
+                    / ad_totals["doc_group_count"]
+                    * 100
+                    if ad_totals["doc_group_count"] != 0
+                    else 0,
+                    "doc_percent": docs_for_ad[ad][area] / ad_totals["doc_count"] * 100
+                    if ad_totals["doc_count"] != 0
+                    else 0,
+                    "page_percent": pages_for_ad[ad][area]
+                    / ad_totals["page_count"]
+                    * 100
+                    if ad_totals["page_count"] != 0
+                    else 0,
+                }
+            )
+    ad_summary.sort(key=lambda r: (normalize_for_sorting(r["ad"]), r["area"]))
+
+    rfc_counter = Counter(
+        Document.objects.filter(type="rfc").values_list("group__acronym", flat=True)
+    )
+    recent_rfc_counter = Counter(
+        Document.objects.filter(
+            type="rfc",
+            docevent__type="published_rfc",
+            docevent__time__gte=timezone.now() - datetime.timedelta(weeks=104),
+        ).values_list("group__acronym", flat=True)
+    )
+    for wg in set(groups) - set(docs_for_wg.keys()):
+        docs_for_wg[wg] += 0
+        pages_for_wg[wg] += 0
+    wg_summary = []
+    for wg in docs_for_wg:
+        wg_summary.append(
+            {
+                "wg": wg.acronym,
+                "area": wg.parent.acronym,
+                "ad": responsible_for_group[wg.acronym][wg.parent.acronym],
+                "doc_count": docs_for_wg[wg],
+                "page_count": pages_for_wg[wg],
+                "rfc_count": rfc_counter[wg.acronym],
+                "recent_rfc_count": recent_rfc_counter[wg.acronym],
+            }
+        )
+    wg_summary.sort(key=lambda r: (r["wg"], r["area"]))
+
+    return (
+        area_summary,
+        area_totals,
+        ad_summary,
+        noad_summary,
+        ad_totals,
+        noad_totals,
+        totals,
+        wg_summary,
+    )
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 5d1457cee8..f03afb9fc1 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -41,13 +41,15 @@
 import os
 import tarfile
 import time
+from dateutil import relativedelta
 
 from django import forms
 from django.conf import settings
 from django.db import models
 from django.http import HttpResponse
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.sites.models import Site
+from django.urls import reverse as urlreverse
 from django.utils.encoding import force_bytes
 #from django.views.decorators.cache import cache_page
 #from django.views.decorators.vary import vary_on_cookie
@@ -58,11 +60,15 @@
 from ietf.doc.utils import update_telechat, augment_events_with_revision
 from ietf.group.models import GroupMilestone, Role
 from ietf.iesg.agenda import agenda_data, agenda_sections, fill_in_agenda_docs, get_agenda_date
-from ietf.iesg.models import TelechatDate
-from ietf.iesg.utils import telechat_page_count
+from ietf.iesg.models import TelechatDate, TelechatAgendaContent
+from ietf.iesg.utils import get_wg_dashboard_info, telechat_page_count
 from ietf.ietfauth.utils import has_role, role_required, user_is_person
+from ietf.name.models import TelechatAgendaSectionName
 from ietf.person.models import Person
+from ietf.meeting.utils import get_activity_stats
 from ietf.doc.utils_search import fill_in_document_table_attributes, fill_in_telechat_date
+from ietf.utils.timezone import date_today, datetime_from_date
+from ietf.utils.unicodenormalize import normalize_for_sorting
 
 def review_decisions(request, year=None):
     events = DocEvent.objects.filter(type__in=("iesg_disapproved", "iesg_approved"))
@@ -73,9 +79,9 @@ def review_decisions(request, year=None):
         year = int(year)
         events = events.filter(time__year=year)
     else:
-        d = datetime.date.today() - datetime.timedelta(days=185)
+        d = date_today() - datetime.timedelta(days=185)
         d = datetime.date(d.year, d.month, 1)
-        events = events.filter(time__gte=d)
+        events = events.filter(time__gte=datetime_from_date(d))
 
     events = events.select_related("doc", "doc__intended_std_level").order_by("-time", "-id")
 
@@ -96,7 +102,7 @@ def agenda_json(request, date=None):
 
     res = {
         "telechat-date": str(data["date"]),
-        "as-of": str(datetime.datetime.utcnow()),
+        "as-of": str(datetime.datetime.now(datetime.UTC)),
         "page-counts": telechat_page_count(date=get_agenda_date(date))._asdict(),
         "sections": {},
         }
@@ -117,7 +123,7 @@ def agenda_json(request, date=None):
 
             for doc in docs:
                 wginfo = {
-                    'docname': doc.canonical_name(),
+                    'docname': doc.name,
                     'rev': doc.rev,
                     'wgname': doc.group.name,
                     'acronym': doc.group.acronym,
@@ -132,13 +138,11 @@ def agenda_json(request, date=None):
 
             for doc in docs:
                 docinfo = {
-                    'docname':doc.canonical_name(),
+                    'docname':doc.name,
                     'title':doc.title,
                     'ad':doc.ad.name if doc.ad else None,
                     }
 
-                if doc.note:
-                    docinfo['note'] = doc.note
                 defer = doc.active_defer_event()
                 if defer:
                     docinfo['defer-by'] = defer.by.name
@@ -146,8 +150,8 @@ def agenda_json(request, date=None):
                 if doc.type_id == "draft":
                     docinfo['rev'] = doc.rev
                     docinfo['intended-std-level'] = str(doc.intended_std_level)
-                    if doc.rfc_number():
-                        docinfo['rfc-number'] = doc.rfc_number()
+                    if doc.type_id == "rfc":
+                        docinfo['rfc-number'] = doc.rfc_number
 
                     iana_state = doc.get_state("draft-iana-review")
                     if iana_state and iana_state.slug in ("not-ok", "changed", "need-rev"):
@@ -167,8 +171,8 @@ def agenda_json(request, date=None):
 
                 elif doc.type_id == 'conflrev':
                     docinfo['rev'] = doc.rev
-                    td = doc.relateddocument_set.get(relationship__slug='conflrev').target.document
-                    docinfo['target-docname'] = td.canonical_name()
+                    td = doc.relateddocument_set.get(relationship__slug='conflrev').target
+                    docinfo['target-docname'] = td.name
                     docinfo['target-title'] = td.title
                     docinfo['target-rev'] = td.rev
                     docinfo['intended-std-level'] = str(td.intended_std_level)
@@ -194,10 +198,18 @@ def agenda(request, date=None):
     data = agenda_data(date)
 
     if has_role(request.user, ["Area Director", "IAB Chair", "Secretariat"]):
-        data["sections"]["1.1"]["title"] = data["sections"]["1.1"]["title"].replace("Roll call", '<a href="%s">Roll Call</a>' % settings.IESG_ROLL_CALL_URL )
-        data["sections"]["1.3"]["title"] = data["sections"]["1.3"]["title"].replace("minutes", '<a href="%s">Minutes</a>' % settings.IESG_MINUTES_URL)
+        data["sections"]["1.1"]["title"] = data["sections"]["1.1"]["title"].replace(
+            "Roll call",
+            '<a href="{}">Roll Call</a>'.format(
+                urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": "roll_call"})
+            )
+        )
+        data["sections"]["1.3"]["title"] = data["sections"]["1.3"]["title"].replace(
+            "minutes",
+            '<a href="{}">Minutes</a>'.format(
+                urlreverse("ietf.iesg.views.telechat_agenda_content_view", kwargs={"section": "minutes"})
+            ))
 
-    request.session['ballot_edit_return_point'] = request.path_info
     return render(request, "iesg/agenda.html", {
             "date": data["date"],
             "sections": sorted(data["sections"].items(), key=lambda x:[int(p) for p in x[0].split('.')]),
@@ -210,7 +222,7 @@ def agenda_txt(request, date=None):
             "date": data["date"],
             "sections": sorted(data["sections"].items(), key=lambda x:[int(p) for p in x[0].split('.')]),
             "domain": Site.objects.get_current().domain,
-            }, content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
+            }, content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}")
 
 @role_required('Area Director', 'Secretariat')
 def agenda_moderator_package(request, date=None):
@@ -266,16 +278,23 @@ def leaf_section(num, section):
 @role_required('Area Director', 'Secretariat')
 def agenda_package(request, date=None):
     data = agenda_data(date)
-    return render(request, "iesg/agenda_package.txt", {
+    return render(
+        request,
+        "iesg/agenda_package.txt",
+        {
             "date": data["date"],
             "sections": sorted(data["sections"].items()),
             "roll_call": data["sections"]["1.1"]["text"],
-            "roll_call_url": settings.IESG_ROLL_CALL_URL,
             "minutes": data["sections"]["1.3"]["text"],
-            "minutes_url": settings.IESG_MINUTES_URL,
-            "management_items": [(num, section) for num, section in data["sections"].items() if "6" < num < "7"],
+            "management_items": [
+                (num, section)
+                for num, section in data["sections"].items()
+                if "6" < num < "7"
+            ],
             "domain": Site.objects.get_current().domain,
-            }, content_type='text/plain')
+        },
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
 
 
 def agenda_documents_txt(request):
@@ -306,7 +325,10 @@ def agenda_documents_txt(request):
             d.rev,
             )
         rows.append("\t".join(row))
-    return HttpResponse("\n".join(rows), content_type='text/plain')
+    return HttpResponse(
+        "\n".join(rows),
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
 
 class RescheduleForm(forms.Form):
     telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False)
@@ -351,6 +373,8 @@ def handle_reschedule_form(request, doc, dates, status):
     return form
 
 def agenda_documents(request):
+    ad = request.user.person if has_role(request.user, "Area Director") else None
+
     dates = list(TelechatDate.objects.active().order_by('date').values_list("date", flat=True)[:4])
 
     docs_by_date = dict((d, []) for d in dates)
@@ -380,15 +404,17 @@ def agenda_documents(request):
         # the search_result_row view to display them (which expects them)
         fill_in_document_table_attributes(docs_by_date[date], have_telechat_date=True)
         fill_in_agenda_docs(date, sections, docs_by_date[date])
-        pages = telechat_page_count(docs=docs_by_date[date]).for_approval
-
+        page_count = telechat_page_count(docs=docs_by_date[date], ad=ad)
+        pages = page_count.for_approval
+        
         telechats.append({
                 "date":     date,
                 "pages":    pages,
+                "ad_pages_left_to_ballot_on": page_count.ad_pages_left_to_ballot_on,
                 "sections": sorted((num, section) for num, section in sections.items()
                                    if "2" <= num < "5")
                 })
-    request.session['ballot_edit_return_point'] = request.path_info
+    
     return render(request, 'iesg/agenda_documents.html', { 'telechats': telechats })
 
 def past_documents(request):
@@ -473,6 +499,7 @@ def discusses(request):
                                             models.Q(states__type__in=("statchg", "conflrev"),
                                                      states__slug__in=("iesgeval", "defer")),
                                             docevent__ballotpositiondocevent__pos__blocking=True)
+    possible_docs = possible_docs.exclude(states__in=State.objects.filter(type="draft", slug="repl"))
     possible_docs = possible_docs.select_related("stream", "group", "ad").distinct()
 
     docs = []
@@ -516,10 +543,12 @@ def milestones_needing_review(request):
         ad_list.append(ad)
         ad.groups_needing_review = sorted(groups, key=lambda g: g.acronym)
         for g, milestones in groups.items():
-            g.milestones_needing_review = sorted(milestones, key=lambda m: m.due)
+            g.milestones_needing_review = sorted(
+                milestones, key=lambda m: m.due if m.group.uses_milestone_dates else m.order
+            )
 
     return render(request, 'iesg/milestones_needing_review.html',
-                  dict(ads=sorted(ad_list, key=lambda ad: ad.plain_name()),))
+                  dict(ads=sorted(ad_list, key=lambda ad: normalize_for_sorting(ad.plain_name())),))
 
 def photos(request):
     roles = sorted(Role.objects.filter(group__type='area', group__state='active', name_id='ad'),key=lambda x: "" if x.group.acronym=="gen" else x.group.acronym)
@@ -527,4 +556,84 @@ def photos(request):
         role.last_initial = role.person.last_name()[0]
     return render(request, 'iesg/photos.html', {'group_type': 'IESG', 'role': '', 'roles': roles })
 
-    
\ No newline at end of file
+def month_choices():
+    choices = [(str(n).zfill(2), str(n).zfill(2)) for n in range(1, 13)]
+    return choices
+
+def year_choices():
+    this_year = date_today().year
+    choices = [(str(n), str(n)) for n in range(this_year, 2009, -1)]
+    return choices
+
+class ActivityForm(forms.Form):
+    month = forms.ChoiceField(choices=month_choices, help_text='Month', required=True)
+    year = forms.ChoiceField(choices=year_choices, help_text='Year', required=True)
+
+def ietf_activity(request):
+    # default date range for last month
+    today = date_today()
+    edate = today.replace(day=1)
+    sdate = (edate - datetime.timedelta(days=1)).replace(day=1)
+    if request.method == 'GET':
+        form = ActivityForm(request.GET)
+        if form.is_valid():
+            month = form.cleaned_data['month']
+            year = form.cleaned_data['year']
+            sdate = datetime.date(int(year), int(month), 1)
+            edate = sdate + relativedelta.relativedelta(months=1)
+    
+    # always pass back an unbound form to avoid annoying is-valid styling
+    form = ActivityForm(initial={'month': str(sdate.month).zfill(2), 'year': sdate.year})
+    context = get_activity_stats(sdate, edate)
+    context['form'] = form
+    return render(request, "iesg/ietf_activity_report.html", context)
+
+
+class TelechatAgendaContentForm(forms.Form):
+    text = forms.CharField(max_length=100_000, widget=forms.Textarea, required=False)
+
+
+@role_required("Secretariat")
+def telechat_agenda_content_edit(request, section):
+    section = get_object_or_404(TelechatAgendaSectionName, slug=section, used=True)
+    content = TelechatAgendaContent.objects.filter(section=section).first()
+    initial = {"text": content.text} if content else {}
+    if request.method == "POST":
+        form = TelechatAgendaContentForm(data=request.POST, initial=initial)
+        if form.is_valid():
+            TelechatAgendaContent.objects.update_or_create(
+                section=section, defaults={"text": form.cleaned_data["text"]}
+            )
+            return redirect("ietf.iesg.views.telechat_agenda_content_manage")
+    else:
+        form = TelechatAgendaContentForm(initial=initial)
+    return render(request, "iesg/telechat_agenda_content_edit.html", {"section": section, "form": form})
+
+
+@role_required("Secretariat")
+def telechat_agenda_content_manage(request):
+    # Fill in any missing instances with empty stand-ins. The edit view will create persistent instances if needed.
+    contents = [
+        TelechatAgendaContent.objects.filter(section=section).first() or TelechatAgendaContent(section=section)
+        for section in TelechatAgendaSectionName.objects.filter(used=True)
+    ]
+    return render(request, "iesg/telechat_agenda_content_manage.html", {"contents": contents})
+
+
+@role_required("Secretariat", "IAB Chair", "Area Director")
+def telechat_agenda_content_view(request, section):
+    content = get_object_or_404(TelechatAgendaContent, section__slug=section, section__used=True)
+    return HttpResponse(
+        content=content.text,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
+
+def working_groups(request):
+ 
+    area_summary, area_totals, ad_summary, noad_summary, ad_totals, noad_totals, totals, wg_summary = get_wg_dashboard_info()
+
+    return render(
+        request,
+        "iesg/working_groups.html",
+        dict(area_summary=area_summary, area_totals=area_totals, ad_summary=ad_summary, noad_summary=noad_summary, ad_totals=ad_totals, noad_totals=noad_totals, totals=totals, wg_summary=wg_summary),
+    )
diff --git a/ietf/ietfauth/.gitignore b/ietf/ietfauth/.gitignore
deleted file mode 100644
index 8ca2ec2c8b..0000000000
--- a/ietf/ietfauth/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.swp
-/*.pyc
diff --git a/ietf/ietfauth/admin.py b/ietf/ietfauth/admin.py
new file mode 100644
index 0000000000..c2914f9efa
--- /dev/null
+++ b/ietf/ietfauth/admin.py
@@ -0,0 +1,136 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+import datetime
+
+from django.conf import settings
+from django.contrib import admin, messages
+from django.contrib.admin import action
+from django.contrib.admin.actions import delete_selected as default_delete_selected
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
+from django.utils import timezone
+
+
+# Replace default UserAdmin with our custom one
+admin.site.unregister(User)
+
+
+class AgeListFilter(admin.SimpleListFilter):
+    title = "account age"
+    parameter_name = "age"
+    
+    def lookups(self, request, model_admin):
+        return [
+            ("1day", "> 1 day"),
+            ("3days", "> 3 days"),
+            ("1week", "> 1 week"),
+            ("1month", "> 1 month"),
+            ("1year", "> 1 year"),
+        ]
+
+    def queryset(self, request, queryset):
+        deltas = {
+            "1day": datetime.timedelta(days=1),
+            "3days": datetime.timedelta(days=3),
+            "1week": datetime.timedelta(weeks=1),
+            "1month": datetime.timedelta(days=30),
+            "1year": datetime.timedelta(days=365),
+        }
+        if self.value():
+            return queryset.filter(date_joined__lt=timezone.now()-deltas[self.value()])
+        return queryset
+
+
+@admin.register(User)
+class CustomUserAdmin(UserAdmin):
+    list_display = (
+        "username",
+        "person",
+        "date_joined",
+        "last_login",
+        "is_staff",
+    )
+    list_filter = list(UserAdmin.list_filter) + [
+        AgeListFilter,
+        ("person", admin.EmptyFieldListFilter),
+    ]
+    actions = ["delete_selected"]
+
+    @action(
+        permissions=["delete"], description="Delete personless %(verbose_name_plural)s"
+    )
+    def delete_selected(self, request, queryset):
+        """Delete selected action restricted to Users with a null Person field
+
+        This displaces the default delete_selected action with a safer one that will
+        only delete personless Users. It is done this way instead of by introducing
+        a new action so that we can simply hand off to the default action (imported
+        as default_delete_selected()) without having to adjust its template (and maybe
+        other things) to make it work with a different action name.
+        """
+        already_confirmed = bool(request.POST.get("post"))
+        personless_queryset = queryset.filter(person__isnull=True)
+        original_count = queryset.count()
+        personless_count = personless_queryset.count()
+        if personless_count > original_count:
+            # Refuse to act if the count increased!
+            self.message_user(
+                request,
+                (
+                    "Limiting the selection to Users without a Person INCREASED the "
+                    "count from {} to {}. This should not happen and probably means a "
+                    "concurrent change to the database affected this request. Please "
+                    "try again.".format(original_count, personless_count)
+                ),
+                level=messages.ERROR,
+            )
+            return None  # return to changelist
+
+        # Display warning/info if this is showing the confirmation page
+        if not already_confirmed:
+            if personless_count < original_count:
+                self.message_user(
+                    request,
+                    (
+                        "Limiting the selection to Users without a Person reduced the "
+                        "count from {} to {}. Only {} will be deleted.".format(
+                            original_count, personless_count, personless_count
+                        )
+                    ),
+                    level=messages.WARNING,
+                )
+            else:
+                self.message_user(
+                    request,
+                    "Confirmed that all selected Users had no Persons.",
+                )
+
+        # Django limits the number of fields in a request. The delete form itself
+        # includes a few metadata fields, so give it a little padding. The default
+        # limit is 1000 and everything will break if it's a small number, so not
+        # bothering to check that it's > 10.
+        max_count = settings.DATA_UPLOAD_MAX_NUMBER_FIELDS - 10
+        if personless_count > max_count:
+            self.message_user(
+                request,
+                (
+                    f"Only {max_count} Users can be deleted at once. Will only delete "
+                    f"the first {max_count} selected Personless Users."
+                ),
+                level=messages.WARNING,
+            )
+            # delete() doesn't like a queryset limited via [:max_count], so do an
+            # equivalent filter.
+            last_to_delete = personless_queryset.order_by("pk")[max_count]
+            personless_queryset = personless_queryset.filter(pk__lt=last_to_delete.pk)
+
+        if already_confirmed and personless_count != original_count:
+            # After confirmation, none of the above filtering should change anything.
+            # Refuse to delete if the DB moved underneath us.
+            self.message_user(
+                request,
+                "Queryset count changed, nothing deleted. Please try again.",
+                level=messages.ERROR,
+            )
+            return None
+
+        return default_delete_selected(self, request, personless_queryset)
diff --git a/ietf/ietfauth/backends.py b/ietf/ietfauth/backends.py
new file mode 100644
index 0000000000..ad34ca9a74
--- /dev/null
+++ b/ietf/ietfauth/backends.py
@@ -0,0 +1,21 @@
+
+# From https://simpleisbetterthancomplex.com/tutorial/2017/02/06/how-to-implement-case-insensitive-username.html
+from django.contrib.auth import get_user_model
+from django.contrib.auth.backends import ModelBackend
+
+
+class CaseInsensitiveModelBackend(ModelBackend):
+    def authenticate(self, request, username=None, password=None, **kwargs):
+        UserModel = get_user_model()
+        if username is None:
+            username = kwargs.get(UserModel.USERNAME_FIELD)
+        try:
+            case_insensitive_username_field = '{}__iexact'.format(UserModel.USERNAME_FIELD)
+            user = UserModel._default_manager.get(**{case_insensitive_username_field: username})
+        except UserModel.DoesNotExist:
+            # Run the default password hasher once to reduce the timing
+            # difference between an existing and a non-existing user (#20760).
+            UserModel().set_password(password)
+        else:
+            if user.check_password(password) and self.user_can_authenticate(user):
+                return user
diff --git a/ietf/ietfauth/factories.py b/ietf/ietfauth/factories.py
index b68b0cecef..5e827791a1 100644
--- a/ietf/ietfauth/factories.py
+++ b/ietf/ietfauth/factories.py
@@ -14,6 +14,7 @@
 class OidClientRecordFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = OidClientRecord
+        skip_postgeneration_save = True
 
     name = factory.Faker('company')
     owner = factory.SubFactory(UserFactory)
diff --git a/ietf/ietfauth/forms.py b/ietf/ietfauth/forms.py
index 851ad02f81..41828f2bf6 100644
--- a/ietf/ietfauth/forms.py
+++ b/ietf/ietfauth/forms.py
@@ -3,23 +3,23 @@
 
 
 import re
+
 from unidecode import unidecode
 
 from django import forms
-from django.conf import settings
+from django.contrib.auth.models import User
+from django.contrib.auth import password_validation
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.contrib.auth.models import User
-from django.utils.html import mark_safe # type:ignore
-from django.urls import reverse as urlreverse
-
-from django_password_strength.widgets import PasswordStrengthInput, PasswordConfirmationInput
-
-import debug                            # pyflakes:ignore
 
 from ietf.person.models import Person, Email
-from ietf.mailinglists.models import Whitelisted
+from ietf.mailinglists.models import Allowlisted
 from ietf.utils.text import isascii
+from .password_validation import StrongPasswordValidator
+
+from .validators import prevent_at_symbol, prevent_system_name, prevent_anonymous_name, is_allowed_address
+from .widgets import PasswordStrengthInput, PasswordConfirmationInput
+
 
 class RegistrationForm(forms.Form):
     email = forms.EmailField(label="Your email (lowercase)")
@@ -30,45 +30,65 @@ def clean_email(self):
             return email
         if email.lower() != email:
             raise forms.ValidationError('The supplied address contained uppercase letters.  Please use a lowercase email address.')
-        if User.objects.filter(username=email).exists():
-            raise forms.ValidationError('An account with the email address you provided already exists.')
         return email
 
 
+class PasswordStrengthField(forms.CharField):
+    widget = PasswordStrengthInput(
+        attrs={
+            "class": "password_strength",
+            "data-disable-strength-enforcement": "",  # usually removed in init
+        }
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        for pwval in password_validation.get_default_password_validators():
+            if isinstance(pwval, password_validation.MinimumLengthValidator):
+                self.widget.attrs["minlength"] = pwval.min_length
+            elif isinstance(pwval, StrongPasswordValidator):
+                self.widget.attrs.pop(
+                    "data-disable-strength-enforcement", None
+                )
+
+    
+
 class PasswordForm(forms.Form):
-    password = forms.CharField(widget=PasswordStrengthInput(attrs={'class':'password_strength'}))
+    password = PasswordStrengthField()
     password_confirmation = forms.CharField(widget=PasswordConfirmationInput(
                                                         confirm_with='password',
                                                         attrs={'class':'password_confirmation'}),
                                             help_text="Enter the same password as above, for verification.",)
-                                            
+
+    def __init__(self, *args, user=None, **kwargs):
+        # user is a kw-only argument to avoid interfering with the signature
+        # when this class is mixed with ModelForm in PersonPasswordForm
+        self.user = user
+        super().__init__(*args, **kwargs)
 
     def clean_password_confirmation(self):
-        password = self.cleaned_data.get("password", "")
-        password_confirmation = self.cleaned_data["password_confirmation"]
+        # clean fields here rather than a clean() method so validation is
+        # still enforced in PersonPasswordForm without having to override its
+        # clean() method
+        password = self.cleaned_data.get("password")
+        password_confirmation = self.cleaned_data.get("password_confirmation")
         if password != password_confirmation:
-            raise forms.ValidationError("The two password fields didn't match.")
+            raise ValidationError(
+                "The password confirmation is different than the new password" 
+            )
+        try:
+            password_validation.validate_password(password_confirmation, self.user)
+        except ValidationError as err:
+            self.add_error("password", err)
         return password_confirmation
 
+
 def ascii_cleaner(supposedly_ascii):
     outside_printable_ascii_pattern = r'[^\x20-\x7F]'
     if re.search(outside_printable_ascii_pattern, supposedly_ascii):
         raise forms.ValidationError("Only unaccented Latin characters are allowed.")
     return supposedly_ascii
 
-def prevent_at_symbol(name):
-    if "@" in name:
-        raise forms.ValidationError("Please fill in name - this looks like an email address (@ is not allowed in names).")
-
-def prevent_system_name(name):
-    name_without_spaces = name.replace(" ", "").replace("\t", "")
-    if "(system)" in name_without_spaces.lower():
-        raise forms.ValidationError("Please pick another name - this name is reserved.")
-
-def prevent_anonymous_name(name):
-    name_without_spaces = name.replace(" ", "").replace("\t", "")
-    if "anonymous" in name_without_spaces.lower():
-        raise forms.ValidationError("Please pick another name - this name is reserved.")
 
 class PersonPasswordForm(forms.ModelForm, PasswordForm):
 
@@ -103,10 +123,7 @@ def get_person_form(*args, **kwargs):
     class PersonForm(forms.ModelForm):
         class Meta:
             model = Person
-            exclude = exclude_list
-            widgets = {
-                'consent': forms.widgets.CheckboxInput,
-            }            
+            exclude = exclude_list           
 
         def __init__(self, *args, **kwargs):
             super(PersonForm, self).__init__(*args, **kwargs)
@@ -119,10 +136,9 @@ def __init__(self, *args, **kwargs):
                 self.initial["ascii"] = ""
 
             self.fields['pronouns_selectable'] = forms.MultipleChoiceField(label='Pronouns', choices = [(option, option) for option in ["he/him", "she/her", "they/them"]], widget=forms.CheckboxSelectMultiple, required=False)
-
-            for f in ['name', 'ascii', 'ascii_short', 'biography', 'photo', 'photo_thumb', 'pronouns_selectable']:
-                if f in self.fields:
-                    self.fields[f].label = mark_safe(self.fields[f].label + ' <a href="#pi" aria-label="!"><i class="bi bi-exclamation-circle"></i></a>')
+            self.fields["pronouns_freetext"].widget.attrs.update(
+                {"aria-label": "Optionally provide your personal pronouns"}
+            )
 
             self.unidecoded_ascii = False
 
@@ -155,19 +171,6 @@ def clean_ascii_short(self):
             prevent_system_name(name)
             return ascii_cleaner(name)
 
-        def clean_consent(self):
-            consent = self.cleaned_data.get('consent')
-            require_consent = (
-                self.cleaned_data.get('name') != person.name_from_draft
-                or self.cleaned_data.get('ascii') != person.name_from_draft
-                or self.cleaned_data.get('biography')
-                or self.cleaned_data.get('pronouns_selectable')
-                or self.cleaned_data.get('pronouns_freetext')
-            )
-            if consent == False and require_consent:
-                raise forms.ValidationError("In order to modify your profile with data that require consent, you must permit the IETF to use the uploaded data.")
-            return consent
-
         def clean(self):
             if self.cleaned_data.get("pronouns_selectable") and self.cleaned_data.get("pronouns_freetext"):
                 self.add_error("pronouns_freetext", "Either select from the pronoun checkboxes or provide a custom value, but not both")
@@ -176,20 +179,7 @@ def clean(self):
 
 
 class NewEmailForm(forms.Form):
-    new_email = forms.EmailField(label="New email address", required=False)
-
-    def clean_new_email(self):
-        email = self.cleaned_data.get("new_email", "")
-        if email:
-            existing = Email.objects.filter(address=email).first()
-            if existing:
-                raise forms.ValidationError("Email address '%s' is already assigned to account '%s' (%s)" % (existing, existing.person and existing.person.user, existing.person))
-
-        for pat in settings.EXCLUDED_PERSONAL_EMAIL_REGEX_PATTERNS:
-            if re.search(pat, email):
-                raise ValidationError("This email address is not valid in a datatracker account")
-
-        return email
+    new_email = forms.EmailField(label="New email address", required=False, validators=[is_allowed_address])
 
 
 class RoleEmailForm(forms.Form):
@@ -209,49 +199,30 @@ def __init__(self, role, *args, **kwargs):
 class ResetPasswordForm(forms.Form):
     username = forms.EmailField(label="Your email (lowercase)")
 
-    def clean_username(self):
-        import ietf.ietfauth.views
-        username = self.cleaned_data["username"]
-        if not User.objects.filter(username=username).exists():
-            raise forms.ValidationError(mark_safe("Didn't find a matching account. If you don't have an account yet, you can <a href=\"{}\">create one</a>.".format(urlreverse(ietf.ietfauth.views.create_account))))
-        return username
-
 
 class TestEmailForm(forms.Form):
     email = forms.EmailField(required=False)
 
-class WhitelistForm(forms.ModelForm):
+class AllowlistForm(forms.ModelForm):
     class Meta:
-        model = Whitelisted
+        model = Allowlisted
         exclude = ['by', 'time' ]
 
-    
-from django import forms
-
 
-class ChangePasswordForm(forms.Form):
+class ChangePasswordForm(PasswordForm):
     current_password = forms.CharField(widget=forms.PasswordInput)
+    field_order = ["current_password", "password", "password_confirmation"]
 
-    new_password = forms.CharField(widget=PasswordStrengthInput(attrs={'class':'password_strength'}))
-    new_password_confirmation = forms.CharField(widget=PasswordConfirmationInput(
-                                                    confirm_with='new_password',
-                                                    attrs={'class':'password_confirmation'}))
-
-    def __init__(self, user, data=None):
-        self.user = user
-        super(ChangePasswordForm, self).__init__(data)
+    def __init__(self, user, *args, **kwargs):
+        # user arg is optional in superclass, but required for this form
+        super().__init__(*args, user=user, **kwargs)
 
     def clean_current_password(self):
-        password = self.cleaned_data.get('current_password', None)
+        # n.b., password = None is handled by check_password and results in a failed check
+        password = self.cleaned_data.get("current_password", None)
         if not self.user.check_password(password):
-            raise ValidationError('Invalid password')
+            raise ValidationError("Invalid password")
         return password
-            
-    def clean(self):
-        new_password = self.cleaned_data.get('new_password', None)
-        conf_password = self.cleaned_data.get('new_password_confirmation', None)
-        if not new_password == conf_password:
-            raise ValidationError("The password confirmation is different than the new password")
 
 
 class ChangeUsernameForm(forms.Form):
@@ -274,6 +245,6 @@ def clean_password(self):
 
     def clean_username(self):
         username = self.cleaned_data['username']
-        if User.objects.filter(username=username).exists():
+        if User.objects.filter(username__iexact=username).exists():
             raise ValidationError("A login with that username already exists.  Please contact the secretariat to get this resolved.")
         return username
diff --git a/ietf/ietfauth/htpasswd.py b/ietf/ietfauth/htpasswd.py
deleted file mode 100644
index 3716d98600..0000000000
--- a/ietf/ietfauth/htpasswd.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import io
-import subprocess, hashlib
-from django.utils.encoding import force_bytes
-
-from django.conf import settings
-
-def update_htpasswd_file(username, password):
-    if getattr(settings, 'USE_PYTHON_HTDIGEST', None):
-        pass_file = settings.HTPASSWD_FILE
-        realm = settings.HTDIGEST_REALM
-        prefix = force_bytes('%s:%s:' % (username, realm))
-        key = force_bytes(hashlib.md5(prefix + force_bytes(password)).hexdigest())
-        f = io.open(pass_file, 'r+b')
-        pos = f.tell()
-        line = f.readline()
-        while line:
-            if line.startswith(prefix):
-                break
-            pos=f.tell()
-            line = f.readline()
-        f.seek(pos)
-        f.write(b'%s%s\n' % (prefix, key))
-        f.close()
-    else:
-        p = subprocess.Popen([settings.HTPASSWD_COMMAND, "-b", settings.HTPASSWD_FILE, username, password], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
diff --git a/ietf/ietfauth/management/commands/send_apikey_usage_emails.py b/ietf/ietfauth/management/commands/send_apikey_usage_emails.py
deleted file mode 100644
index 4aa4e55248..0000000000
--- a/ietf/ietfauth/management/commands/send_apikey_usage_emails.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright The IETF Trust 2017-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import datetime
-
-from textwrap import dedent
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-import debug                            # pyflakes:ignore
-
-from ietf.person.models import PersonalApiKey, PersonApiKeyEvent
-from ietf.utils.mail import send_mail
-
-
-class Command(BaseCommand):
-    """
-    Send out emails to all persons who have personal API keys about usage.
-
-    Usage is show over the given period, where the default period is 7 days.
-    """
-
-    help = dedent(__doc__).strip()
-            
-    def add_arguments(self, parser):
-        parser.add_argument('-d', '--days', dest='days', type=int, default=7,
-            help='The period over which to show usage.')
-
-    def handle(self, *filenames, **options):
-        """
-        """
-
-        self.verbosity = int(options.get('verbosity'))
-        days = options.get('days')
-
-        keys = PersonalApiKey.objects.filter(valid=True)
-        for key in keys:
-            earliest = datetime.datetime.now() - datetime.timedelta(days=days)
-            events = PersonApiKeyEvent.objects.filter(key=key, time__gt=earliest)
-            count = events.count()
-            events = events[:32]
-            if count:
-                key_name = key.hash()[:8]
-                subject = "API key usage for key '%s' for the last %s days" %(key_name, days)
-                to = key.person.email_address()
-                frm = settings.DEFAULT_FROM_EMAIL
-                send_mail(None, to, frm, subject, 'utils/apikey_usage_report.txt',  {'person':key.person,
-                    'days':days, 'key':key, 'key_name':key_name, 'count':count, 'events':events, } )
-                
diff --git a/ietf/ietfauth/password_validation.py b/ietf/ietfauth/password_validation.py
new file mode 100644
index 0000000000..bfed4a784e
--- /dev/null
+++ b/ietf/ietfauth/password_validation.py
@@ -0,0 +1,23 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from django.core.exceptions import ValidationError
+from zxcvbn import zxcvbn
+
+
+class StrongPasswordValidator:
+    message = "This password does not meet complexity requirements and is easily guessable."
+    code = "weak"
+    min_zxcvbn_score = 3
+
+    def __init__(self, message=None, code=None, min_zxcvbn_score=None):
+        if message is not None:
+            self.message = message
+        if code is not None:
+            self.code = code
+        if min_zxcvbn_score is not None:
+            self.min_zxcvbn_score = min_zxcvbn_score
+
+    def validate(self, password, user=None):
+        """Validate that a password is strong enough"""
+        strength_report = zxcvbn(password[:72], max_length=72)
+        if strength_report["score"] < self.min_zxcvbn_score:
+            raise ValidationError(message=self.message, code=self.code)
diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py
index 1651de08d4..a77e5bd5d5 100644
--- a/ietf/ietfauth/tests.py
+++ b/ietf/ietfauth/tests.py
@@ -1,15 +1,12 @@
-# Copyright The IETF Trust 2009-2022, All Rights Reserved
+# Copyright The IETF Trust 2009-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
-import io
 import logging                          # pyflakes:ignore
-import os
 import re
 import requests
 import requests_mock
-import shutil
 import time
 import urllib
 
@@ -21,103 +18,102 @@
 from oic.utils.authn.client import CLIENT_AUTHN_METHOD
 from oidc_provider.models import RSAKey
 from pyquery import PyQuery
-from unittest import skipIf
 from urllib.parse import urlsplit
 
+import django.core.signing
 from django.urls import reverse as urlreverse
 from django.contrib.auth.models import User
 from django.conf import settings
-from django.template.loader import render_to_string 
+from django.template.loader import render_to_string
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.group.models import Group, Role, RoleName
-from ietf.ietfauth.htpasswd import update_htpasswd_file
 from ietf.ietfauth.utils import has_role
-from ietf.mailinglists.models import Subscribed
-from ietf.meeting.factories import MeetingFactory
+from ietf.meeting.factories import MeetingFactory, RegistrationFactory, RegistrationTicketFactory
 from ietf.nomcom.factories import NomComFactory
-from ietf.person.factories import PersonFactory, EmailFactory, UserFactory
-from ietf.person.models import Person, Email, PersonalApiKey
+from ietf.person.factories import PersonFactory, EmailFactory, UserFactory, PersonalApiKeyFactory
+from ietf.person.models import Person, Email
+from ietf.person.tasks import send_apikey_usage_emails_task
 from ietf.review.factories import ReviewRequestFactory, ReviewAssignmentFactory
 from ietf.review.models import ReviewWish, UnavailablePeriod
-from ietf.stats.models import MeetingRegistration
-from ietf.utils.decorators import skip_coverage
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+from ietf.utils.timezone import date_today
 
-import ietf.ietfauth.views
-
-if os.path.exists(settings.HTPASSWD_COMMAND):
-    skip_htpasswd_command = False
-    skip_message = ""
-else:
-    skip_htpasswd_command = True
-    skip_message = ("Skipping htpasswd test: The binary for htpasswd wasn't found in the\n       "
-                    "location indicated in settings.py.")
-    print("     "+skip_message)
 
 class IetfAuthTests(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.saved_use_python_htdigest = getattr(settings, "USE_PYTHON_HTDIGEST", None)
-        settings.USE_PYTHON_HTDIGEST = True
-
-        self.saved_htpasswd_file = settings.HTPASSWD_FILE
-        self.htpasswd_dir = self.tempdir('htpasswd')
-        settings.HTPASSWD_FILE = os.path.join(self.htpasswd_dir, "htpasswd")
-        io.open(settings.HTPASSWD_FILE, 'a').close() # create empty file
-
-        self.saved_htdigest_realm = getattr(settings, "HTDIGEST_REALM", None)
-        settings.HTDIGEST_REALM = "test-realm"
-
-    def tearDown(self):
-        shutil.rmtree(self.htpasswd_dir)
-        settings.USE_PYTHON_HTDIGEST = self.saved_use_python_htdigest
-        settings.HTPASSWD_FILE = self.saved_htpasswd_file
-        settings.HTDIGEST_REALM = self.saved_htdigest_realm
-        super().tearDown()
 
     def test_index(self):
-        self.assertEqual(self.client.get(urlreverse(ietf.ietfauth.views.index)).status_code, 200)
+        self.assertEqual(self.client.get(urlreverse("ietf.ietfauth.views.index")).status_code, 200)
 
     def test_login_and_logout(self):
         PersonFactory(user__username='plain')
 
         # try logging in without a next
-        r = self.client.get(urlreverse(ietf.ietfauth.views.login))
+        r = self.client.get(urlreverse("ietf.ietfauth.views.login"))
         self.assertEqual(r.status_code, 200)
 
-        r = self.client.post(urlreverse(ietf.ietfauth.views.login), {"username":"plain", "password":"plain+password"})
+        r = self.client.post(urlreverse("ietf.ietfauth.views.login"), {"username":"plain", "password":"plain+password"})
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlsplit(r["Location"])[2], urlreverse(ietf.ietfauth.views.profile))
+        self.assertEqual(urlsplit(r["Location"])[2], urlreverse("ietf.ietfauth.views.profile"))
 
         # try logging out
-        r = self.client.get(urlreverse('django.contrib.auth.views.logout'))
+        r = self.client.post(urlreverse('django.contrib.auth.views.logout'), {})
         self.assertEqual(r.status_code, 200)
         self.assertNotContains(r, "accounts/logout")
 
-        r = self.client.get(urlreverse(ietf.ietfauth.views.profile))
+        r = self.client.get(urlreverse("ietf.ietfauth.views.profile"))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlsplit(r["Location"])[2], urlreverse(ietf.ietfauth.views.login))
+        self.assertEqual(urlsplit(r["Location"])[2], urlreverse("ietf.ietfauth.views.login"))
 
         # try logging in with a next
-        r = self.client.post(urlreverse(ietf.ietfauth.views.login) + "?next=/foobar", {"username":"plain", "password":"plain+password"})
+        r = self.client.post(urlreverse("ietf.ietfauth.views.login") + "?next=/foobar", {"username":"plain", "password":"plain+password"})
         self.assertEqual(r.status_code, 302)
         self.assertEqual(urlsplit(r["Location"])[2], "/foobar")
 
+    def test_login_button(self):
+        PersonFactory(user__username='plain')
+
+        def _test_login(url):
+            # try mashing the sign-in button repeatedly
+            r = self.client.get(url)
+            if r.status_code == 302:
+                r = self.client.get(r["Location"])
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            login_url = q("a:Contains('Sign in')").attr("href")
+            self.assertEqual(login_url, "/accounts/login/?next=" + url)
+            r = self.client.get(login_url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            login_url = q("a:Contains('Sign in')").attr("href")
+            self.assertEqual(login_url, "/accounts/login/?next=" + url)
+
+            # try logging in with the provided next
+            r = self.client.post(login_url, {"username":"plain", "password":"plain+password"})
+            self.assertEqual(r.status_code, 302)
+            self.assertEqual(urlsplit(r["Location"])[2], url)
+            self.client.logout()
+
+        # try with a trivial next
+        _test_login("/")
+        # try with a next that requires login
+        _test_login(urlreverse("ietf.ietfauth.views.profile"))
+
     def test_login_with_different_email(self):
         person = PersonFactory(user__username='plain')
         email = EmailFactory(person=person)
 
         # try logging in without a next
-        r = self.client.get(urlreverse(ietf.ietfauth.views.login))
+        r = self.client.get(urlreverse("ietf.ietfauth.views.login"))
         self.assertEqual(r.status_code, 200)
 
-        r = self.client.post(urlreverse(ietf.ietfauth.views.login), {"username":email, "password":"plain+password"})
+        r = self.client.post(urlreverse("ietf.ietfauth.views.login"), {"username":email, "password":"plain+password"})
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlsplit(r["Location"])[2], urlreverse(ietf.ietfauth.views.profile))
+        self.assertEqual(urlsplit(r["Location"])[2], urlreverse("ietf.ietfauth.views.profile"))
 
     def extract_confirm_url(self, confirm_email):
         # dig out confirm_email link
@@ -131,20 +127,11 @@ def extract_confirm_url(self, confirm_email):
 
         return confirm_url
 
-    def username_in_htpasswd_file(self, username):
-        with io.open(settings.HTPASSWD_FILE) as f:
-            for l in f:
-                if l.startswith(username + ":"):
-                    return True
-        with io.open(settings.HTPASSWD_FILE) as f:
-            print(f.read())
-
-        return False
 
 # For the lowered barrier to account creation period, we are disabling this kind of failure
     # def test_create_account_failure(self):
 
-    #     url = urlreverse(ietf.ietfauth.views.create_account)
+    #     url = urlreverse("ietf.ietfauth.views.create_account")
 
     #     # get
     #     r = self.client.get(url)
@@ -162,8 +149,8 @@ def test_create_account_failure_template(self):
         r = render_to_string('registration/manual.html', { 'account_request_email': settings.ACCOUNT_REQUEST_EMAIL })
         self.assertTrue("Additional Assistance Required" in r)
 
-    def register_and_verify(self, email):
-        url = urlreverse(ietf.ietfauth.views.create_account)
+    def register(self, email):
+        url = urlreverse("ietf.ietfauth.views.create_account")
 
         # register email
         empty_outbox()
@@ -172,59 +159,63 @@ def register_and_verify(self, email):
         self.assertContains(r, "Account request received")
         self.assertEqual(len(outbox), 1)
 
+    def register_and_verify(self, email):
+        self.register(email)
+
         # go to confirm page
         confirm_url = self.extract_confirm_url(outbox[-1])
         r = self.client.get(confirm_url)
         self.assertEqual(r.status_code, 200)
 
         # password mismatch
-        r = self.client.post(confirm_url, { 'password': 'secret', 'password_confirmation': 'nosecret' })
+        r = self.client.post(
+            confirm_url, {
+                "password": "secret-and-secure",
+                "password_confirmation": "not-secret-or-secure",
+            }
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(User.objects.filter(username=email).count(), 0)
+
+        # weak password
+        r = self.client.post(
+            confirm_url, {
+                "password": "password1234",
+                "password_confirmation": "password1234",
+            }
+        )
         self.assertEqual(r.status_code, 200)
         self.assertEqual(User.objects.filter(username=email).count(), 0)
 
         # confirm
-        r = self.client.post(confirm_url, { 'name': 'User Name', 'ascii': 'User Name', 'password': 'secret', 'password_confirmation': 'secret' })
+        r = self.client.post(
+            confirm_url,
+            {
+                "name": "User Name",
+                "ascii": "User Name",
+                "password": "secret-and-secure",
+                "password_confirmation": "secret-and-secure",
+            },
+        )
         self.assertEqual(r.status_code, 200)
         self.assertEqual(User.objects.filter(username=email).count(), 1)
         self.assertEqual(Person.objects.filter(user__username=email).count(), 1)
         self.assertEqual(Email.objects.filter(person__user__username=email).count(), 1)
 
-        self.assertTrue(self.username_in_htpasswd_file(email))
-
-    def test_create_whitelisted_account(self):
+    # This also tests new account creation.
+    def test_create_existing_account(self):
+        # create account once
         email = "new-account@example.com"
-
-        # add whitelist entry
-        r = self.client.post(urlreverse(ietf.ietfauth.views.login), {"username":"secretary", "password":"secretary+password"})
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlsplit(r["Location"])[2], urlreverse(ietf.ietfauth.views.profile))
-
-        r = self.client.get(urlreverse(ietf.ietfauth.views.add_account_whitelist))
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, "Add a whitelist entry")
-
-        r = self.client.post(urlreverse(ietf.ietfauth.views.add_account_whitelist), {"email": email})
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, "Whitelist entry creation successful")
-
-        # log out
-        r = self.client.get(urlreverse('django.contrib.auth.views.logout'))
-        self.assertEqual(r.status_code, 200)
-
-        # register and verify whitelisted email
         self.register_and_verify(email)
 
+        # create account again
+        self.register(email)
 
-    def test_create_subscribed_account(self):
-        # verify creation with email in subscribed list
-        saved_delay = settings.LIST_ACCOUNT_DELAY
-        settings.LIST_ACCOUNT_DELAY = 1
-        email = "subscribed@example.com"
-        s = Subscribed(email=email)
-        s.save()
-        time.sleep(1.1)
-        self.register_and_verify(email)
-        settings.LIST_ACCOUNT_DELAY = saved_delay
+        # check notification
+        note = get_payload_text(outbox[-1])
+        self.assertIn(email, note)
+        self.assertIn("A datatracker account for that email already exists", note)
+        self.assertIn(urlreverse("ietf.ietfauth.views.password_reset"), note)
 
     def test_ietfauth_profile(self):
         EmailFactory(person__user__username='plain')
@@ -233,7 +224,7 @@ def test_ietfauth_profile(self):
         username = "plain"
         email_address = Email.objects.filter(person__user__username=username).first().address
 
-        url = urlreverse(ietf.ietfauth.views.profile)
+        url = urlreverse("ietf.ietfauth.views.profile")
         login_testing_unauthorized(self, username, url)
 
 
@@ -252,7 +243,6 @@ def test_ietfauth_profile(self):
             "pronouns_freetext": "foo/bar",
             "affiliation": "Test Org",
             "active_emails": email_address,
-            "consent": True,
         }
 
         # edit details - faulty ASCII
@@ -315,11 +305,14 @@ def test_ietfauth_profile(self):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(Email.objects.filter(address=new_email_address, person__user__username=username, active=1).count(), 1)
 
-        # check that we can't re-add it - that would give a duplicate
-        r = self.client.get(confirm_url)
+        # try and add it again
+        empty_outbox()
+        r = self.client.post(url, with_new_email_address)
         self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('[name="action"][value="confirm"]')), 0)
+        self.assertEqual(len(outbox), 1)
+        note = get_payload_text(outbox[-1])
+        self.assertIn(new_email_address, note)
+        self.assertIn("already associated with your account", note)
 
         pronoundish = base_data.copy()
         pronoundish["pronouns_freetext"] = "baz/boom"
@@ -379,6 +372,21 @@ def test_ietfauth_profile(self):
         self.assertEqual(len(updated_roles), 1)
         self.assertEqual(updated_roles[0].email_id, new_email_address)
 
+    def test_email_case_insensitive_protection(self):
+        EmailFactory(address="TestAddress@example.net")
+        person = PersonFactory()
+        url = urlreverse("ietf.ietfauth.views.profile")
+        login_testing_unauthorized(self, person.user.username, url)
+
+        data = {
+            "name": person.name,
+            "plain": person.plain,
+            "ascii": person.ascii,
+            "active_emails": [e.address for e in person.email_set.filter(active=True)],
+            "new_email": "testaddress@example.net",
+        }
+        r = self.client.post(url, data)
+        self.assertContains(r, "A confirmation email has been sent to", status_code=200)
 
     def test_nomcom_dressing_on_profile(self):
         url = urlreverse('ietf.ietfauth.views.profile')
@@ -391,7 +399,7 @@ def test_nomcom_dressing_on_profile(self):
         self.assertFalse(q('#volunteer-button'))
         self.assertFalse(q('#volunteered'))
 
-        year = datetime.date.today().year
+        year = date_today().year
         nomcom = NomComFactory(group__acronym=f'nomcom{year}',is_accepting_volunteers=True)
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
@@ -406,38 +414,39 @@ def test_nomcom_dressing_on_profile(self):
         self.assertFalse(q('#volunteer-button'))
         self.assertTrue(q('#volunteered'))
 
-
     def test_reset_password(self):
-        url = urlreverse(ietf.ietfauth.views.password_reset)
-        email = 'someone@example.com'
-        password = 'foobar'
-
-        user = User.objects.create(username=email, email=email)
-        user.set_password(password)
+        WEAK_PASSWORD="password1234"
+        VALID_PASSWORD = "complex-and-long-valid-password"
+        ANOTHER_VALID_PASSWORD = "very-complicated-and-lengthy-password"
+        url = urlreverse("ietf.ietfauth.views.password_reset")
+        email = "someone@example.com"
+
+        user = PersonFactory(user__email=email).user
+        user.set_password(VALID_PASSWORD)
         user.save()
-        p = Person.objects.create(name="Some One", ascii="Some One", user=user)
-        Email.objects.create(address=user.username, person=p, origin=user.username)
-        
+
         # get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        # ask for reset, wrong username
-        r = self.client.post(url, { 'username': "nobody@example.com" })
+        # ask for reset, wrong username (form should not fail)
+        r = self.client.post(url, {"username": "nobody@example.com"})
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q("form .is-invalid")) > 0)
+        self.assertTrue(len(q("form .is-invalid")) == 0)
 
         # ask for reset
         empty_outbox()
-        r = self.client.post(url, { 'username': user.username })
+        r = self.client.post(url, {"username": user.username})
         self.assertEqual(r.status_code, 200)
         self.assertEqual(len(outbox), 1)
 
         # goto change password page, logged in as someone else
         confirm_url = self.extract_confirm_url(outbox[-1])
         other_user = UserFactory()
-        self.client.login(username=other_user.username, password=other_user.username + '+password')
+        self.client.login(
+            username=other_user.username, password=other_user.username + "+password"
+        )
         r = self.client.get(confirm_url)
         self.assertEqual(r.status_code, 403)
 
@@ -446,21 +455,47 @@ def test_reset_password(self):
         r = self.client.get(confirm_url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertNotIn(user.username, q('.nav').text(),
-                         'user should not appear signed in while resetting password')
+        self.assertNotIn(
+            user.username,
+            q(".nav").text(),
+            "user should not appear signed in while resetting password",
+        )
 
         # password mismatch
-        r = self.client.post(confirm_url, { 'password': 'secret', 'password_confirmation': 'nosecret' })
+        r = self.client.post(
+            confirm_url,
+            {
+                "password": ANOTHER_VALID_PASSWORD,
+                "password_confirmation": ANOTHER_VALID_PASSWORD[::-1],
+            },
+        )
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(len(q("form .is-invalid")) > 0)
+
+        # weak password
+        r = self.client.post(
+            confirm_url,
+            {
+                "password": WEAK_PASSWORD,
+                "password_confirmation": WEAK_PASSWORD,
+            },
+        )
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertTrue(len(q("form .is-invalid")) > 0)
 
         # confirm
-        r = self.client.post(confirm_url, { 'password': 'secret', 'password_confirmation': 'secret' })
+        r = self.client.post(
+            confirm_url,
+            {
+                "password": ANOTHER_VALID_PASSWORD,
+                "password_confirmation": ANOTHER_VALID_PASSWORD,
+            },
+        )
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertEqual(len(q("form .is-invalid")), 0)
-        self.assertTrue(self.username_in_htpasswd_file(user.username))
 
         # reuse reset url
         r = self.client.get(confirm_url)
@@ -468,15 +503,18 @@ def test_reset_password(self):
 
         # login after reset request
         empty_outbox()
-        user.set_password(password)
+        user.set_password(VALID_PASSWORD)
         user.save()
 
-        r = self.client.post(url, { 'username': user.username })
+        r = self.client.post(url, {"username": user.username})
         self.assertEqual(r.status_code, 200)
         self.assertEqual(len(outbox), 1)
         confirm_url = self.extract_confirm_url(outbox[-1])
 
-        r = self.client.post(urlreverse(ietf.ietfauth.views.login), {'username': email, 'password': password})
+        r = self.client.post(
+            urlreverse("ietf.ietfauth.views.login"),
+            {"username": email, "password": VALID_PASSWORD},
+        )
 
         r = self.client.get(confirm_url)
         self.assertEqual(r.status_code, 404)
@@ -484,17 +522,83 @@ def test_reset_password(self):
         # change password after reset request
         empty_outbox()
 
-        r = self.client.post(url, { 'username': user.username })
+        r = self.client.post(url, {"username": user.username})
         self.assertEqual(r.status_code, 200)
         self.assertEqual(len(outbox), 1)
         confirm_url = self.extract_confirm_url(outbox[-1])
 
-        user.set_password('newpassword')
+        user.set_password(ANOTHER_VALID_PASSWORD)
         user.save()
 
         r = self.client.get(confirm_url)
         self.assertEqual(r.status_code, 404)
 
+    def test_reset_password_without_person(self):
+        """No password reset for account without a person"""
+        url = urlreverse('ietf.ietfauth.views.password_reset')
+        user = UserFactory()
+        user.set_password('some password')
+        user.save()
+        empty_outbox()
+        r = self.client.post(url, { 'username': user.username})
+        self.assertContains(r, 'We have sent you an email with instructions', status_code=200)
+        q = PyQuery(r.content)
+        self.assertTrue(len(q("form .is-invalid")) == 0)
+        self.assertEqual(len(outbox), 0)
+
+    def test_reset_password_address_handling(self):
+        """Reset password links are only sent to known, active addresses"""
+        url = urlreverse('ietf.ietfauth.views.password_reset')
+        person = PersonFactory()
+        person.email_set.update(active=False)
+        empty_outbox()
+        r = self.client.post(url, { 'username': person.user.username})
+        self.assertContains(r, 'We have sent you an email with instructions', status_code=200)
+        q = PyQuery(r.content)
+        self.assertTrue(len(q("form .is-invalid")) == 0)
+        self.assertEqual(len(outbox), 0)
+
+        active_address = EmailFactory(person=person).address
+        r = self.client.post(url, {'username': person.user.username})
+        self.assertContains(r, 'We have sent you an email with instructions', status_code=200)
+        self.assertEqual(len(outbox), 1)
+        to = outbox[0].get('To')
+        self.assertIn(active_address, to)
+        self.assertNotIn(person.user.username, to)
+
+    def test_reset_password_without_username(self):
+        """Reset password using non-username email address"""
+        url = urlreverse('ietf.ietfauth.views.password_reset')
+        person = PersonFactory()
+        secondary_address = EmailFactory(person=person).address
+        inactive_secondary_address = EmailFactory(person=person, active=False).address
+        empty_outbox()
+        r = self.client.post(url, { 'username': secondary_address})
+        self.assertContains(r, 'We have sent you an email with instructions', status_code=200)
+        self.assertEqual(len(outbox), 1)
+        to = outbox[0].get('To')
+        self.assertIn(person.user.username, to)
+        self.assertIn(secondary_address, to)
+        self.assertNotIn(inactive_secondary_address, to)
+
+    def test_reset_password_without_user(self):
+        """Reset password using email address for person without a user account"""
+        url = urlreverse('ietf.ietfauth.views.password_reset')
+        email = EmailFactory()
+        person = email.person
+        # Remove the user object from the person to get a Email/Person without User:
+        person.user = None
+        person.save()
+        # Remove the remaining User record, since reset_password looks for that by username:
+        User.objects.filter(username__iexact=email.address).delete()
+        empty_outbox()
+        r = self.client.post(url, { 'username': email.address })
+        self.assertEqual(len(outbox), 1)
+        lastReceivedEmail = outbox[-1]
+        self.assertIn(email.address, lastReceivedEmail.get('To'))
+        self.assertTrue(lastReceivedEmail.get('Subject').startswith("Confirm password reset"))
+        self.assertContains(r, "Your password reset request has been successfully received", status_code=200)
+
     def test_review_overview(self):
         review_req = ReviewRequestFactory()
         assignment = ReviewAssignmentFactory(review_request=review_req,reviewer=EmailFactory(person__user__username='reviewer'))
@@ -506,11 +610,11 @@ def test_review_overview(self):
         UnavailablePeriod.objects.create(
             team=review_req.team,
             person=reviewer,
-            start_date=datetime.date.today() - datetime.timedelta(days=10),
+            start_date=date_today() - datetime.timedelta(days=10),
             availability="unavailable",
         )
 
-        url = urlreverse(ietf.ietfauth.views.review_overview)
+        url = urlreverse("ietf.ietfauth.views.review_overview")
 
         login_testing_unauthorized(self, reviewer.user.username, url)
 
@@ -536,117 +640,176 @@ def test_review_overview(self):
         self.assertEqual(r.status_code, 302)
         self.assertEqual(ReviewWish.objects.filter(doc=doc, team=review_req.team).count(), 0)
 
-    def test_htpasswd_file_with_python(self):
-        # make sure we test both Python and call-out to binary
-        settings.USE_PYTHON_HTDIGEST = True
-
-        update_htpasswd_file("foo", "passwd")
-        self.assertTrue(self.username_in_htpasswd_file("foo"))
-
-    @skipIf(skip_htpasswd_command, skip_message)
-    @skip_coverage
-    def test_htpasswd_file_with_htpasswd_binary(self):
-        # make sure we test both Python and call-out to binary
-        settings.USE_PYTHON_HTDIGEST = False
-
-        update_htpasswd_file("foo", "passwd")
-        self.assertTrue(self.username_in_htpasswd_file("foo"))
-        
-
     def test_change_password(self):
-
-        chpw_url = urlreverse(ietf.ietfauth.views.change_password)
-        prof_url = urlreverse(ietf.ietfauth.views.profile)
-        login_url = urlreverse(ietf.ietfauth.views.login)
-        redir_url = '%s?next=%s' % (login_url, chpw_url)
+        VALID_PASSWORD = "complex-and-long-valid-password"
+        ANOTHER_VALID_PASSWORD = "very-complicated-and-lengthy-password"
+        chpw_url = urlreverse("ietf.ietfauth.views.change_password")
+        prof_url = urlreverse("ietf.ietfauth.views.profile")
+        login_url = urlreverse("ietf.ietfauth.views.login")
+        redir_url = "%s?next=%s" % (login_url, chpw_url)
 
         # get without logging in
         r = self.client.get(chpw_url)
         self.assertRedirects(r, redir_url)
 
-        user = User.objects.create(username="someone@example.com", email="someone@example.com")
-        user.set_password("password")
+        user = User.objects.create(
+            username="someone@example.com", email="someone@example.com"
+        )
+        user.set_password(VALID_PASSWORD)
         user.save()
         p = Person.objects.create(name="Some One", ascii="Some One", user=user)
         Email.objects.create(address=user.username, person=p, origin=user.username)
 
         # log in
-        r = self.client.post(redir_url, {"username":user.username, "password":"password"})
+        r = self.client.post(
+            redir_url, {"username": user.username, "password": VALID_PASSWORD}
+        )
         self.assertRedirects(r, chpw_url)
 
         # wrong current password
-        r = self.client.post(chpw_url, {"current_password": "fiddlesticks",
-                                        "new_password": "foobar",
-                                        "new_password_confirmation": "foobar",
-                                       })
+        r = self.client.post(
+            chpw_url,
+            {
+                "current_password": "fiddlesticks",
+                "password": ANOTHER_VALID_PASSWORD,
+                "password_confirmation": ANOTHER_VALID_PASSWORD,
+            },
+        )
         self.assertEqual(r.status_code, 200)
-        self.assertFormError(r, 'form', 'current_password', 'Invalid password')
+        self.assertFormError(r.context["form"], "current_password", "Invalid password")
 
         # mismatching new passwords
-        r = self.client.post(chpw_url, {"current_password": "password",
-                                        "new_password": "foobar",
-                                        "new_password_confirmation": "barfoo",
-                                       })
+        r = self.client.post(
+            chpw_url,
+            {
+                "current_password": VALID_PASSWORD,
+                "password": ANOTHER_VALID_PASSWORD,
+                "password_confirmation": ANOTHER_VALID_PASSWORD[::-1],
+            },
+        )
         self.assertEqual(r.status_code, 200)
-        self.assertFormError(r, 'form', None, "The password confirmation is different than the new password")
+        self.assertFormError(
+            r.context["form"],
+            "password_confirmation",
+            "The password confirmation is different than the new password",
+        )
+
+        # password too short
+        r = self.client.post(
+            chpw_url,
+            {
+                "current_password": VALID_PASSWORD,
+                "password": "sh0rtpw0rd",
+                "password_confirmation": "sh0rtpw0rd",
+            }
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertFormError(
+            r.context["form"],
+            "password",
+            "This password is too short. It must contain at least "
+            f"{settings.PASSWORD_POLICY_MIN_LENGTH} characters."
+        )
+
+        # password too simple
+        r = self.client.post(
+            chpw_url,
+            {
+                "current_password": VALID_PASSWORD,
+                "password": "passwordpassword",
+                "password_confirmation": "passwordpassword",
+            }
+        )
+        self.assertEqual(r.status_code, 200)
+        self.assertFormError(
+            r.context["form"],
+            "password",
+            "This password does not meet complexity requirements "
+            "and is easily guessable."
+        )
 
         # correct password change
-        r = self.client.post(chpw_url, {"current_password": "password",
-                                        "new_password": "foobar",
-                                        "new_password_confirmation": "foobar",
-                                       })
+        r = self.client.post(
+            chpw_url,
+            {
+                "current_password": VALID_PASSWORD,
+                "password": ANOTHER_VALID_PASSWORD,
+                "password_confirmation": ANOTHER_VALID_PASSWORD,
+            },
+        )
         self.assertRedirects(r, prof_url)
         # refresh user object
         user = User.objects.get(username="someone@example.com")
-        self.assertTrue(user.check_password('foobar'))
+        self.assertTrue(user.check_password(ANOTHER_VALID_PASSWORD))
 
     def test_change_username(self):
-
-        chun_url = urlreverse(ietf.ietfauth.views.change_username)
-        prof_url = urlreverse(ietf.ietfauth.views.profile)
-        login_url = urlreverse(ietf.ietfauth.views.login)
-        redir_url = '%s?next=%s' % (login_url, chun_url)
+        VALID_PASSWORD = "complex-and-long-valid-password"
+        chun_url = urlreverse("ietf.ietfauth.views.change_username")
+        prof_url = urlreverse("ietf.ietfauth.views.profile")
+        login_url = urlreverse("ietf.ietfauth.views.login")
+        redir_url = "%s?next=%s" % (login_url, chun_url)
 
         # get without logging in
         r = self.client.get(chun_url)
         self.assertRedirects(r, redir_url)
 
-        user = User.objects.create(username="someone@example.com", email="someone@example.com")
-        user.set_password("password")
+        user = User.objects.create(
+            username="someone@example.com", email="someone@example.com"
+        )
+        user.set_password(VALID_PASSWORD)
         user.save()
         p = Person.objects.create(name="Some One", ascii="Some One", user=user)
         Email.objects.create(address=user.username, person=p, origin=user.username)
-        Email.objects.create(address="othername@example.org", person=p, origin=user.username)
+        Email.objects.create(
+            address="othername@example.org", person=p, origin=user.username
+        )
 
         # log in
-        r = self.client.post(redir_url, {"username":user.username, "password":"password"})
+        r = self.client.post(
+            redir_url, {"username": user.username, "password": VALID_PASSWORD}
+        )
         self.assertRedirects(r, chun_url)
 
         # wrong username
-        r = self.client.post(chun_url, {"username": "fiddlesticks",
-                                        "password": "password",
-                                       })
+        r = self.client.post(
+            chun_url,
+            {
+                "username": "fiddlesticks",
+                "password": VALID_PASSWORD,
+            },
+        )
         self.assertEqual(r.status_code, 200)
-        self.assertFormError(r, 'form', 'username',
-            "Select a valid choice. fiddlesticks is not one of the available choices.")
+        self.assertFormError(
+            r.context["form"],
+            "username",
+            "Select a valid choice. fiddlesticks is not one of the available choices.",
+        )
 
         # wrong password
-        r = self.client.post(chun_url, {"username": "othername@example.org",
-                                        "password": "foobar",
-                                       })
+        r = self.client.post(
+            chun_url,
+            {
+                "username": "othername@example.org",
+                "password": "foobar",
+            },
+        )
         self.assertEqual(r.status_code, 200)
-        self.assertFormError(r, 'form', 'password', 'Invalid password')
+        self.assertFormError(r.context["form"], "password", "Invalid password")
 
         # correct username change
-        r = self.client.post(chun_url, {"username": "othername@example.org",
-                                        "password": "password",
-                                       })
+        r = self.client.post(
+            chun_url,
+            {
+                "username": "othername@example.org",
+                "password": VALID_PASSWORD,
+            },
+        )
         self.assertRedirects(r, prof_url)
         # refresh user object
         prev = user
         user = User.objects.get(username="othername@example.org")
         self.assertEqual(prev, user)
-        self.assertTrue(user.check_password('password'))
+        self.assertTrue(user.check_password(VALID_PASSWORD))
 
     def test_apikey_management(self):
         # Create a person with a role that will give at least one valid apikey
@@ -690,8 +853,20 @@ def test_apikey_management(self):
         url = urlreverse('ietf.ietfauth.views.apikey_disable')
         r = self.client.get(url)
 
+        self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'Disable a personal API key')
         self.assertContains(r, 'Key')
+
+        # Try to delete something that doesn't exist
+        r = self.client.post(url, {'hash': key.hash()+'bad'})
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r,"Key validation failed; key not disabled")
+
+        # Try to delete someone else's key
+        otherkey = PersonalApiKeyFactory()
+        r = self.client.post(url, {'hash': otherkey.hash()})
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r,"Key validation failed; key not disabled")
         
         # Delete a key
         r = self.client.post(url, {'hash': key.hash()})
@@ -744,30 +919,30 @@ def test_apikey_errors(self):
             self.assertContains(r, 'Invalid apikey', status_code=403)
 
             # invalid apikey (invalidated api key)
-            unauthorized_url = urlreverse('ietf.api.views.app_auth')
-            invalidated_apikey = PersonalApiKey.objects.create(
-                        endpoint=unauthorized_url, person=person, valid=False)
+            unauthorized_url = urlreverse('ietf.api.views.app_auth', kwargs={'app': 'authortools'})
+            invalidated_apikey = PersonalApiKeyFactory(endpoint=unauthorized_url, person=person, valid=False)
             r = self.client.post(unauthorized_url, {'apikey': invalidated_apikey.hash()})
             self.assertContains(r, 'Invalid apikey', status_code=403)
 
             # too long since regular login
-            person.user.last_login = datetime.datetime.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS+1)
+            person.user.last_login = timezone.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS+1)
             person.user.save()
             r = self.client.post(key.endpoint, {'apikey':key.hash(), 'dummy':'dummy',})
             self.assertContains(r, 'Too long since last regular login', status_code=400)
-            person.user.last_login = datetime.datetime.now()
+            person.user.last_login = timezone.now()
             person.user.save()
 
             # endpoint mismatch
-            key2 = PersonalApiKey.objects.create(person=person, endpoint='/')
+            key2 = PersonalApiKeyFactory(
+                person=person,
+                endpoint='/',
+                validate_model=False,  # allow invalid endpoint
+            )
             r = self.client.post(key.endpoint, {'apikey':key2.hash(), 'dummy':'dummy',})
             self.assertContains(r, 'Apikey endpoint mismatch', status_code=400)
             key2.delete()
 
     def test_send_apikey_report(self):
-        from ietf.ietfauth.management.commands.send_apikey_usage_emails import Command
-        from ietf.utils.mail import outbox, empty_outbox
-
         person =  RoleFactory(name_id='secr', group__acronym='secretariat').person
 
         url = urlreverse('ietf.ietfauth.views.apikey_create')
@@ -784,17 +959,16 @@ def test_send_apikey_report(self):
         # apikey usage will be registered)
         count = 2
         # avoid usage across dates
-        if datetime.datetime.now().time() > datetime.time(hour=23, minute=59, second=58):
+        if timezone.now().time() > datetime.time(hour=23, minute=59, second=58):
             time.sleep(2)
         for i in range(count):
             for key in person.apikeys.all():
                 self.client.post(key.endpoint, {'apikey':key.hash(), 'dummy': 'dummy', })
-        date = str(datetime.date.today())
+        date = str(date_today())
 
         empty_outbox()
-        cmd = Command()
-        cmd.handle(verbosity=0, days=7)
-        
+        send_apikey_usage_emails_task(days=7)
+
         self.assertEqual(len(outbox), len(endpoints))
         for mail in outbox:
             body = get_payload_text(mail)
@@ -842,6 +1016,72 @@ def test_edit_person_extresources(self):
         self.assertEqual(person.personextresource_set.get(name__slug='github_repo').display_name, 'Some display text')
         self.assertIn(person.personextresource_set.first().name.slug, str(person.personextresource_set.first()))
 
+    def test_confirm_new_email(self):
+        person = PersonFactory()
+        valid_auth = django.core.signing.dumps(
+            [person.user.username, "new_email@example.com"], salt="add_email"
+        )
+        invalid_auth = django.core.signing.dumps(
+            [person.user.username, "not_this_one@example.com"], salt="pepper"
+        )
+
+        # Test that we check the salt
+        r = self.client.get(
+            urlreverse("ietf.ietfauth.views.confirm_new_email", kwargs={"auth": invalid_auth})
+        )
+        self.assertEqual(r.status_code, 404)
+        r = self.client.post(
+            urlreverse("ietf.ietfauth.views.confirm_new_email", kwargs={"auth": invalid_auth})
+        )
+        self.assertEqual(r.status_code, 404)
+
+        # Now check that the valid auth works
+        self.assertFalse(
+            person.email_set.filter(address__icontains="new_email@example.com").exists()
+        )
+        confirm_url = urlreverse(
+            "ietf.ietfauth.views.confirm_new_email", kwargs={"auth": valid_auth}
+        )
+        r = self.client.get(confirm_url)
+        self.assertContains(r, urllib.parse.quote(confirm_url), status_code=200)
+        r = self.client.post(confirm_url, data={"action": "confirm"})
+        self.assertContains(r, "has been updated", status_code=200)
+        self.assertTrue(
+            person.email_set.filter(address__icontains="new_email@example.com").exists()
+        )
+
+        # Authorizing a second time should be handled gracefully
+        r = self.client.post(confirm_url, data={"action": "confirm"})
+        self.assertContains(r, "already includes", status_code=200)
+
+        # Another person should not be able to add the same address and should be told so,
+        # whether they use the same or different letter case
+        other_person = PersonFactory()
+        other_auth = django.core.signing.dumps(
+            [other_person.user.username, "new_email@example.com"], salt="add_email"
+        )
+        r = self.client.post(
+            urlreverse("ietf.ietfauth.views.confirm_new_email", kwargs={"auth": other_auth}),
+            data={"action": "confirm"},
+        )
+        self.assertContains(r, "in use by another user", status_code=200)
+
+        other_auth = django.core.signing.dumps(
+            [other_person.user.username, "NeW_eMaIl@eXaMpLe.CoM"], salt="add_email"
+        )
+        r = self.client.post(
+            urlreverse("ietf.ietfauth.views.confirm_new_email", kwargs={"auth": other_auth}),
+            data={"action": "confirm"},
+        )
+
+        self.assertContains(r, "in use by another user", status_code=200)
+        self.assertFalse(
+            other_person.email_set.filter(address__icontains="new_email@example.com").exists()
+        )
+        self.assertTrue(
+            person.email_set.filter(address__icontains="new_email@example.com").exists()
+        )
+
 
 class OpenIDConnectTests(TestCase):
     def request_matcher(self, request):
@@ -906,12 +1146,16 @@ def test_oidc_code_auth(self):
             # an additional email
             EmailFactory(person=person)
             email_list = person.email_set.all().values_list('address', flat=True)
-            meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-            MeetingRegistration.objects.create(
-                    meeting=meeting, person=None, first_name=person.first_name(), last_name=person.last_name(),
-                    email=email_list[0], ticket_type='full_week', reg_type='remote', affiliation='Some Company',
-                )
-
+            meeting = MeetingFactory(type_id='ietf', date=date_today())
+            reg_person = RegistrationFactory(
+                meeting=meeting,
+                person=person,
+                first_name=person.first_name(),
+                last_name=person.last_name(),
+                email=email_list[0],
+                affiliation='Some Company',
+                with_ticket={'attendance_type_id': 'remote', 'ticket_type_id': 'week_pass'},
+            )
             # Get access authorisation
             session = {}
             session["state"] = rndstr()
@@ -964,35 +1208,48 @@ def test_oidc_code_auth(self):
             for key in ['iss', 'sub', 'aud', 'exp', 'iat', 'auth_time', 'nonce', 'at_hash']:
                 self.assertIn(key, access_token_info['id_token'])
 
-            # Get userinfo, check keys present
+            # Get userinfo, check keys present, most common scenario
             userinfo = client.do_user_info_request(state=params["state"], scope=args['scope'])
             for key in [ 'email', 'family_name', 'given_name', 'meeting', 'name', 'pronouns', 'roles',
                          'ticket_type', 'reg_type', 'affiliation', 'picture', 'dots', ]:
                 self.assertIn(key, userinfo)
                 self.assertTrue(userinfo[key])
             self.assertIn('remote', set(userinfo['reg_type'].split()))
-            self.assertNotIn('hackathon', set(userinfo['reg_type'].split()))
+            self.assertNotIn('hackathon_onsite', set(userinfo['reg_type'].split()))
             self.assertIn(active_group.acronym, [i[1] for i in userinfo['roles']])
             self.assertNotIn(closed_group.acronym, [i[1] for i in userinfo['roles']])
 
-            # Create another registration, with a different email
-            MeetingRegistration.objects.create(
-                    meeting=meeting, person=None, first_name=person.first_name(), last_name=person.last_name(),
-                    email=email_list[1], ticket_type='one_day', reg_type='hackathon', affiliation='Some Company, Inc',
-                )
+            # Create a registration, with only email, no person (rare if at all)
+            reg_person.delete()
+            reg_email = RegistrationFactory(
+                meeting=meeting,
+                person=None,
+                first_name=person.first_name(),
+                last_name=person.last_name(),
+                email=email_list[1],
+                affiliation='Some Company, Inc',
+                with_ticket={'attendance_type_id': 'hackathon_onsite', 'ticket_type_id': 'one_day'},
+            )
             userinfo = client.do_user_info_request(state=params["state"], scope=args['scope'])
-            self.assertIn('hackathon', set(userinfo['reg_type'].split()))
-            self.assertIn('remote', set(userinfo['reg_type'].split()))
-            self.assertIn('full_week', set(userinfo['ticket_type'].split()))
-            self.assertIn('Some Company', userinfo['affiliation'])
-
-            # Create a third registration, with a composite reg type
-            MeetingRegistration.objects.create(
-                    meeting=meeting, person=None, first_name=person.first_name(), last_name=person.last_name(),
-                    email=email_list[1], ticket_type='one_day', reg_type='hackathon remote', affiliation='Some Company, Inc',
-                )
+            self.assertIn('hackathon_onsite', set(userinfo['reg_type'].split()))
+            self.assertNotIn('remote', set(userinfo['reg_type'].split()))
+            self.assertIn('one_day', set(userinfo['ticket_type'].split()))
+            self.assertIn('Some Company, Inc', userinfo['affiliation'])
+
+            # Test with multiple tickets
+            reg_email.delete()
+            creg = RegistrationFactory(
+                meeting=meeting,
+                person=None,
+                first_name=person.first_name(),
+                last_name=person.last_name(),
+                email=email_list[1],
+                affiliation='Some Company, Inc',
+                with_ticket={'attendance_type_id': 'hackathon_remote', 'ticket_type_id': 'week_pass'},
+            )
+            RegistrationTicketFactory(registration=creg, attendance_type_id='remote', ticket_type_id='week_pass')
             userinfo = client.do_user_info_request(state=params["state"], scope=args['scope'])
-            self.assertEqual(set(userinfo['reg_type'].split()), set(['remote', 'hackathon']))
+            self.assertEqual(set(userinfo['reg_type'].split()), set(['remote', 'hackathon_remote']))
 
             # Check that ending a session works
             r = client.do_end_session_request(state=params["state"], scope=args['scope'])
@@ -1011,4 +1268,4 @@ def test_has_role_empty_role_names(self):
         """has_role is False if role_names is empty"""
         role = RoleFactory(name_id='secr', group__acronym='secretariat')
         self.assertTrue(has_role(role.person.user, ['Secretariat']), 'Test is broken')
-        self.assertFalse(has_role(role.person.user, []), 'has_role() should return False when role_name is empty')
\ No newline at end of file
+        self.assertFalse(has_role(role.person.user, []), 'has_role() should return False when role_name is empty')
diff --git a/ietf/ietfauth/urls.py b/ietf/ietfauth/urls.py
index 12c749fbe2..7493fe5c97 100644
--- a/ietf/ietfauth/urls.py
+++ b/ietf/ietfauth/urls.py
@@ -14,7 +14,7 @@
         url(r'^confirmnewemail/(?P<auth>[^/]+)/$', views.confirm_new_email),
         url(r'^create/$', views.create_account),
         url(r'^create/confirm/(?P<auth>[^/]+)/$', views.confirm_account),
-        url(r'^login/$', views.login),
+        url(r'^login/$', views.AnyEmailLoginView.as_view(), name="ietf.ietfauth.views.login"),
         url(r'^logout/$', LogoutView.as_view(), name="django.contrib.auth.views.logout"),
         url(r'^password/$', views.change_password),
         url(r'^profile/$', views.profile),
@@ -24,5 +24,4 @@
         url(r'^review/$', views.review_overview),
         url(r'^testemail/$', views.test_email),
         url(r'^username/$', views.change_username),
-        url(r'^whitelist/add/?$', views.add_account_whitelist),
 ]
diff --git a/ietf/ietfauth/utils.py b/ietf/ietfauth/utils.py
index 43353ca533..0df667fbd2 100644
--- a/ietf/ietfauth/utils.py
+++ b/ietf/ietfauth/utils.py
@@ -7,23 +7,25 @@
 import oidc_provider.lib.claims
 
 
-from functools import wraps
+from functools import wraps, WRAPPER_ASSIGNMENTS
+from urllib.parse import quote as urlquote
 
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.contrib.sites.models import Site
+from django.core import signing
 from django.core.exceptions import PermissionDenied
 from django.db.models import Q
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
-from django.utils.decorators import available_attrs
-from django.utils.http import urlquote
 
 import debug                            # pyflakes:ignore
 
 from ietf.group.models import Role, GroupFeatures
-from ietf.person.models import Person
+from ietf.person.models import Email, Person
 from ietf.person.utils import get_dots
 from ietf.doc.utils_bofreq import bofreq_editors
+from ietf.utils.mail import send_mail
 
 def user_is_person(user, person):
     """Test whether user is associated with person."""
@@ -39,9 +41,10 @@ def has_role(user, role_names, *args, **kwargs):
     """Determines whether user has any of the given standard roles
     given. Role names must be a list or, in case of a single value, a
     string."""
-    if not isinstance(role_names, (list, tuple)):
-        role_names = [ role_names ]
-    
+    extra_role_qs = kwargs.get("extra_role_qs", None)
+    if not isinstance(role_names, (list, tuple, set)):
+        role_names = [role_names]
+
     if not user or not user.is_authenticated:
         return False
 
@@ -49,7 +52,13 @@ def has_role(user, role_names, *args, **kwargs):
     if not hasattr(user, "roles_check_cache"):
         user.roles_check_cache = {}
 
-    key = frozenset(role_names)
+    keynames = set(role_names)
+    if extra_role_qs:
+        keynames.update(set(extra_role_qs.keys()))
+    year = kwargs.get("year", None)
+    if year is not None:
+        keynames.add(f"nomcomyear{year}")
+    key = frozenset(keynames)
     if key not in user.roles_check_cache:
         try:
             person = user.person
@@ -57,51 +66,123 @@ def has_role(user, role_names, *args, **kwargs):
             return False
 
         role_qs = {
-            "Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"),
-            "Secretariat": Q(person=person, name="secr", group__acronym="secretariat"),
-            "IAB" : Q(person=person, name="member", group__acronym="iab"),
-            "IANA": Q(person=person, name="auth", group__acronym="iana"),
-            "RFC Editor": Q(person=person, name="auth", group__acronym="rpc"),
-            "ISE" : Q(person=person, name="chair", group__acronym="ise"),
-            "IAD": Q(person=person, name="admdir", group__acronym="ietf"),
-            "IETF Chair": Q(person=person, name="chair", group__acronym="ietf"),
-            "IETF Trust Chair": Q(person=person, name="chair", group__acronym="ietf-trust"),
-            "IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"),
-            "IAB Chair": Q(person=person, name="chair", group__acronym="iab"),
-            "IAB Executive Director": Q(person=person, name="execdir", group__acronym="iab"),
-            "IAB Group Chair": Q(person=person, name="chair", group__type="iab", group__state="active"),
-            "IAOC Chair": Q(person=person, name="chair", group__acronym="iaoc"),
-            "WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof", "proposed"]),
-            "WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof", "proposed"]),
-            "RG Chair": Q(person=person,name="chair", group__type="rg", group__state__in=["active","proposed"]),
-            "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state__in=["active","proposed"]),
-            "AG Secretary": Q(person=person,name="secr", group__type="ag", group__state__in=["active"]),
-            "RAG Secretary": Q(person=person,name="secr", group__type="rag", group__state__in=["active"]),
-            "Team Chair": Q(person=person,name="chair", group__type="team", group__state="active"),
-            "Program Lead": Q(person=person,name="lead", group__type="program", group__state="active"),
-            "Program Secretary": Q(person=person,name="secr", group__type="program", group__state="active"),
-            "Program Chair": Q(person=person,name="chair", group__type="program", group__state="active"),
-            "Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
-            "Nomcom Advisor": Q(person=person, name="advisor", group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
-            "Nomcom": Q(person=person, group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
-            "Liaison Manager": Q(person=person,name="liaiman",group__type="sdo",group__state="active", ),
-            "Authorized Individual": Q(person=person,name="auth",group__type="sdo",group__state="active", ),
-            "Recording Manager": Q(person=person,name="recman",group__type="ietf",group__state="active", ),
-            "Reviewer": Q(person=person, name="reviewer", group__state="active"),
-            "Review Team Secretary": Q(person=person, name="secr", group__reviewteamsettings__isnull=False,group__state="active", ),
-            "IRSG Member": (Q(person=person, name="member", group__acronym="irsg") | Q(person=person, name="chair", group__acronym="irtf") | Q(person=person, name="atlarge", group__acronym="irsg")),
-            "Robot": Q(person=person, name="robot", group__acronym="secretariat"),
-            }
-
-        filter_expr = Q(pk__in=[])  # ensure empty set is returned if no other terms are added
+            "Area Director": Q(
+                name__in=("pre-ad", "ad"), group__type="area", group__state="active"
+            ),
+            "Secretariat": Q(name="secr", group__acronym="secretariat"),
+            "IAB": Q(name="member", group__acronym="iab"),
+            "IANA": Q(name="auth", group__acronym="iana"),
+            "RFC Editor": Q(name="auth", group__acronym="rpc"),
+            "ISE": Q(name="chair", group__acronym="ise"),
+            "IAD": Q(name="admdir", group__acronym="ietf"),
+            "IETF Chair": Q(name="chair", group__acronym="ietf"),
+            "IETF Trust Chair": Q(name="chair", group__acronym="ietf-trust"),
+            "IRTF Chair": Q(name="chair", group__acronym="irtf"),
+            "RSAB Chair": Q(name="chair", group__acronym="rsab"),
+            "IAB Chair": Q(name="chair", group__acronym="iab"),
+            "IAB Executive Director": Q(name="execdir", group__acronym="iab"),
+            "IAB Group Chair": Q(
+                name="chair", group__type="iab", group__state="active"
+            ),
+            "IAOC Chair": Q(name="chair", group__acronym="iaoc"),
+            "WG Chair": Q(
+                name="chair",
+                group__type="wg",
+                group__state__in=["active", "bof", "proposed"],
+            ),
+            "WG Secretary": Q(
+                name="secr",
+                group__type="wg",
+                group__state__in=["active", "bof", "proposed"],
+            ),
+            "RG Chair": Q(
+                name="chair", group__type="rg", group__state__in=["active", "proposed"]
+            ),
+            "RG Secretary": Q(
+                name="secr", group__type="rg", group__state__in=["active", "proposed"]
+            ),
+            "AG Secretary": Q(
+                name="secr", group__type="ag", group__state__in=["active"]
+            ),
+            "RAG Secretary": Q(
+                name="secr", group__type="rag", group__state__in=["active"]
+            ),
+            "Team Chair": Q(name="chair", group__type="team", group__state="active"),
+            "Program Lead": Q(
+                name="lead", group__type="program", group__state="active"
+            ),
+            "Program Secretary": Q(
+                name="secr", group__type="program", group__state="active"
+            ),
+            "Program Chair": Q(
+                name="chair", group__type="program", group__state="active"
+            ),
+            "EDWG Chair": Q(name="chair", group__type="edwg", group__state="active"),
+            "Nomcom Chair": Q(
+                name="chair",
+                group__type="nomcom",
+                group__acronym__icontains=kwargs.get("year", "0000"),
+            ),
+            "Nomcom Advisor": Q(
+                name="advisor",
+                group__type="nomcom",
+                group__acronym__icontains=kwargs.get("year", "0000"),
+            ),
+            "Nomcom": Q(
+                group__type="nomcom",
+                group__acronym__icontains=kwargs.get("year", "0000"),
+            ),
+            "Liaison Manager": Q(
+                name="liaiman",
+                group__type="sdo",
+                group__state="active",
+            ),
+            "Liaison Coordinator": Q(
+                name="liaison_coordinator",
+                group__acronym="iab",
+            ),
+            "Authorized Individual": Q(
+                name="auth",
+                group__type="sdo",
+                group__state="active",
+            ),
+            "Recording Manager": Q(
+                name="recman",
+                group__type="ietf",
+                group__state="active",
+            ),
+            "Reviewer": Q(name="reviewer", group__state="active"),
+            "Review Team Secretary": Q(
+                name="secr",
+                group__reviewteamsettings__isnull=False,
+                group__state="active",
+            ),
+            "IRSG Member": (
+                Q(name="member", group__acronym="irsg")
+                | Q(name="chair", group__acronym="irtf")
+                | Q(name="atlarge", group__acronym="irsg")
+            ),
+            "RSAB Member": Q(name="member", group__acronym="rsab"),
+            "Robot": Q(name="robot", group__acronym="secretariat"),
+        }
+
+        filter_expr = Q(
+            pk__in=[]
+        )  # ensure empty set is returned if no other terms are added
         for r in role_names:
             filter_expr |= role_qs[r]
+        if extra_role_qs:
+            for r in extra_role_qs:
+                filter_expr |= extra_role_qs[r]
 
-        user.roles_check_cache[key] = bool(Role.objects.filter(filter_expr).exists())
+        user.roles_check_cache[key] = bool(
+            Role.objects.filter(person=person).filter(filter_expr).exists()
+        )
 
     return user.roles_check_cache[key]
 
 
+
 # convenient decorator
 
 def passes_test_decorator(test_func, message):
@@ -110,7 +191,7 @@ def passes_test_decorator(test_func, message):
     error. The test function should be on the form fn(user) ->
     true/false."""
     def decorate(view_func):
-        @wraps(view_func, assigned=available_attrs(view_func))
+        @wraps(view_func, assigned=WRAPPER_ASSIGNMENTS)
         def inner(request, *args, **kwargs):
             if not request.user.is_authenticated:
                 return HttpResponseRedirect('%s?%s=%s' % (settings.LOGIN_URL, REDIRECT_FIELD_NAME, urlquote(request.get_full_path())))
@@ -130,9 +211,9 @@ def role_required(*role_names):
 
 # specific permissions
 
+
 def is_authorized_in_doc_stream(user, doc):
-    """Return whether user is authorized to perform stream duties on
-    document."""
+    """Is user authorized to perform stream duties on doc?"""
     if has_role(user, ["Secretariat"]):
         return True
 
@@ -163,6 +244,10 @@ def is_authorized_in_doc_stream(user, doc):
         if doc.group.type.slug == 'individ':
             docman_roles = GroupFeatures.objects.get(type_id="ietf").docman_roles
         group_req = Q(group__acronym=doc.stream.slug)
+    elif doc.stream.slug == "editorial":
+        group_req = Q(group=doc.group) | Q(group__acronym='rsab')
+        if doc.group.type.slug in ("individ", "edappr"):
+            docman_roles = GroupFeatures.objects.get(type_id="edappr").docman_roles
     else:
         group_req = Q()  # no group constraint for other cases
 
@@ -202,7 +287,7 @@ def is_individual_draft_author(user, doc):
     if not hasattr(user, 'person'):
         return False
 
-    if user.person in doc.authors():
+    if user.person in doc.author_persons():
         return True
 
     return False
@@ -217,7 +302,7 @@ def is_bofreq_editor(user, doc):
 def openid_userinfo(claims, user):
     # Populate claims dict.
     person = get_object_or_404(Person, user=user)
-    email = person.email()
+    email = person.email_allowing_inactive()
     if person.photo:
         photo_url = person.cdn_photo_url()
     else:
@@ -265,13 +350,14 @@ def scope_pronouns(self):
         )
 
     def scope_registration(self):
+        # import here to avoid circular imports
         from ietf.meeting.helpers import get_current_ietf_meeting
-        from ietf.stats.models import MeetingRegistration
+        from ietf.meeting.models import Registration
         meeting = get_current_ietf_meeting()
         person = self.user.person
         email_list = person.email_set.values_list('address')
         q = Q(person=person, meeting=meeting) | Q(email__in=email_list, meeting=meeting)
-        regs = MeetingRegistration.objects.filter(q).distinct()
+        regs = Registration.objects.filter(q).distinct()
         for reg in regs:
             if not reg.person_id:
                 reg.person = person
@@ -282,16 +368,82 @@ def scope_registration(self):
             ticket_types = set([])
             reg_types = set([])
             for reg in regs:
-                ticket_types.add(reg.ticket_type)
-                reg_types.add(reg.reg_type)
+                for ticket in reg.tickets.all():
+                    ticket_types.add(ticket.ticket_type.slug)
+                    reg_types.add(ticket.attendance_type.slug)
             info = {
-                'meeting':      meeting.number,
+                'meeting': meeting.number,
                 # full_week, one_day, student:
-                'ticket_type':  ' '.join(ticket_types),
+                'ticket_type': ' '.join(ticket_types),
                 # onsite, remote, hackathon_onsite, hackathon_remote:
-                'reg_type':     ' '.join(reg_types),
-                'affiliation':  ([ reg.affiliation for reg in regs if reg.affiliation ] or [''])[0],
+                'reg_type': ' '.join(reg_types),
+                'affiliation': ([reg.affiliation for reg in regs if reg.affiliation] or [''])[0],
             }
 
         return info
-            
+
+def can_request_rfc_publication(user, doc):
+    """Answers whether this user has an appropriate role to send this document to the RFC Editor for publication as an RFC.
+
+    This not take anything but the stream of the document into account.
+
+    NOTE: This intentionally always returns False for IETF stream documents.
+    The publication request process for the IETF stream is handled by the 
+    secretariat at ietf.doc.views_ballot.approve_ballot"""
+
+    if doc.stream_id == "irtf":
+        return has_role(user, ("Secretariat", "IRTF Chair"))
+    elif doc.stream_id == "editorial":
+        return has_role(user, ("Secretariat", "RSAB Chair"))
+    elif doc.stream_id == "ise":
+        return has_role(user, ("Secretariat", "ISE"))
+    elif doc.stream_id == "iab":
+        return has_role(user, ("Secretariat", "IAB Chair"))
+    elif doc.stream_id == "ietf":
+        return False # See the docstring
+    else:
+        return False
+
+
+def send_new_email_confirmation_request(person: Person, address: str):
+    """Request confirmation of a new email address
+    
+    If the email address is already in use, sends an alert to it. If not, sends a confirmation request.
+    By design, does not indicate which was sent. This is intended to make it a bit harder to scrape addresses
+    with a mindless bot.
+    """
+    auth = signing.dumps([person.user.username, address], salt="add_email")
+    domain = Site.objects.get_current().domain
+    from_email = settings.DEFAULT_FROM_EMAIL
+
+    existing = Email.objects.filter(address=address).first()
+    if existing:
+        subject = f"Attempt to add your email address by {person.name}"
+        send_mail(
+            None,
+            address,
+            from_email,
+            subject,
+            "registration/add_email_exists_email.txt",
+            {
+                "domain": domain,
+                "email": address,
+                "person": person,
+            },
+        )
+    else:
+        subject = f"Confirm email address for {person.name}"
+        send_mail(
+            None,
+            address,
+            from_email,
+            subject,
+            "registration/add_email_email.txt",
+            {
+                "domain": domain,
+                "auth": auth,
+                "email": address,
+                "person": person,
+                "expire": settings.DAYS_TO_EXPIRE_REGISTRATION_LINK,
+            },
+        )
diff --git a/ietf/ietfauth/validators.py b/ietf/ietfauth/validators.py
new file mode 100644
index 0000000000..84684f34d5
--- /dev/null
+++ b/ietf/ietfauth/validators.py
@@ -0,0 +1,34 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+import re
+
+from django import forms
+from django.conf import settings
+from django.core.exceptions import ValidationError
+
+
+def prevent_at_symbol(name):
+    if "@" in name:
+        raise forms.ValidationError(
+            "Please fill in name - this looks like an email address (@ is not allowed in names)."
+        )
+
+
+def prevent_system_name(name):
+    name_without_spaces = name.replace(" ", "").replace("\t", "")
+    if "(system)" in name_without_spaces.lower():
+        raise forms.ValidationError("Please pick another name - this name is reserved.")
+
+
+def prevent_anonymous_name(name):
+    name_without_spaces = name.replace(" ", "").replace("\t", "")
+    if "anonymous" in name_without_spaces.lower():
+        raise forms.ValidationError("Please pick another name - this name is reserved.")
+
+
+def is_allowed_address(value):
+    """Validate that an address complies with datatracker requirements"""
+    for pat in settings.EXCLUDED_PERSONAL_EMAIL_REGEX_PATTERNS:
+        if re.search(pat, value):
+            raise ValidationError(
+                "This email address is not valid in a datatracker account"
+            )
diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py
index 8cf21f52c5..b5256b14f8 100644
--- a/ietf/ietfauth/views.py
+++ b/ietf/ietfauth/views.py
@@ -34,18 +34,18 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+import datetime
 import importlib
 
-from datetime import date as Date, datetime as DateTime
 # needed if we revert to higher barrier for account creation
-#from datetime import datetime as DateTime, timedelta as TimeDelta, date as Date
+# from datetime import datetime as DateTime, timedelta as TimeDelta, date as Date
 from collections import defaultdict
 
 import django.core.signing
 from django import forms
 from django.contrib import messages
 from django.conf import settings
-from django.contrib.auth import update_session_auth_hash, logout, authenticate
+from django.contrib.auth import logout, update_session_auth_hash, password_validation
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.hashers import identify_hasher
@@ -53,8 +53,8 @@
 from django.contrib.auth.views import LoginView
 from django.contrib.sites.models import Site
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.db import IntegrityError
 from django.urls import reverse as urlreverse
-from django.utils.safestring import mark_safe
 from django.http import Http404, HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.encoding import force_bytes
@@ -63,13 +63,9 @@
 
 from ietf.group.models import Role, Group
 from ietf.ietfauth.forms import ( RegistrationForm, PasswordForm, ResetPasswordForm, TestEmailForm,
-                                WhitelistForm, ChangePasswordForm, get_person_form, RoleEmailForm,
+                                ChangePasswordForm, get_person_form, RoleEmailForm,
                                 NewEmailForm, ChangeUsernameForm, PersonPasswordForm)
-from ietf.ietfauth.htpasswd import update_htpasswd_file
-from ietf.ietfauth.utils import role_required, has_role
-from ietf.mailinglists.models import Whitelisted
-# needed if we revert to higher barrier for account creation
-#from ietf.mailinglists.models import Subscribed, Whitelisted
+from ietf.ietfauth.utils import has_role, send_new_email_confirmation_request
 from ietf.name.models import ExtResourceName
 from ietf.nomcom.models import NomCom
 from ietf.person.models import Person, Email, Alias, PersonalApiKey, PERSON_API_KEY_VALUES
@@ -79,11 +75,11 @@
 from ietf.utils.decorators import person_required
 from ietf.utils.mail import send_mail
 from ietf.utils.validators import validate_external_resource_value
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 
 # These are needed if we revert to the higher bar for account creation
 
 
-
 def index(request):
     return render(request, 'registration/index.html')
 
@@ -100,7 +96,7 @@ def index(request):
 # def ietf_login(request):
 #     if not request.user.is_authenticated:
 #         return HttpResponse("Not authenticated?", status=500)
-# 
+#
 #     redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '')
 #     request.session.set_test_cookie()
 #     return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to)))
@@ -114,33 +110,67 @@ def index(request):
 #         redirect_to = settings.LOGIN_REDIRECT_URL
 #     return HttpResponseRedirect(redirect_to)
 
+
 def create_account(request):
-    to_email = None
+    new_account_email = None
 
-    if request.method == 'POST':
+    if request.method == "POST":
         form = RegistrationForm(request.POST)
         if form.is_valid():
-            to_email = form.cleaned_data['email'] # This will be lowercase if form.is_valid()
-
-            # For the IETF 113 Registration period (at least) we are lowering the barriers for account creation
-            # to the simple email round-trip check
-            send_account_creation_email(request, to_email)
-
-            # The following is what to revert to should that lowered barrier prove problematic
-            # existing = Subscribed.objects.filter(email=to_email).first()
-            # ok_to_create = ( Whitelisted.objects.filter(email=to_email).exists()
-            #     or existing and (existing.time + TimeDelta(seconds=settings.LIST_ACCOUNT_DELAY)) < DateTime.now() )
-            # if ok_to_create:
-            #     send_account_creation_email(request, to_email)
-            # else:
-            #     return render(request, 'registration/manual.html', { 'account_request_email': settings.ACCOUNT_REQUEST_EMAIL })
+            new_account_email = form.cleaned_data[
+                "email"
+            ]  # This will be lowercase if form.is_valid()
+            email_is_known = False  # do we already know of the new_account_email address?
+
+            # Find an existing Person to contact, if one exists
+            person_to_contact = None
+            user = User.objects.filter(username__iexact=new_account_email).first()
+            if user is not None:
+                email_is_known = True
+                try:
+                    person_to_contact = user.person
+                except User.person.RelatedObjectDoesNotExist:
+                    # User.person is a OneToOneField so it raises an exception if the field is null
+                    pass  # leave person_to_contact as None
+            if person_to_contact is None:
+                email = Email.objects.filter(address__iexact=new_account_email).first()
+                if email is not None:
+                    email_is_known = True
+                    # Email.person is a ForeignKey, so its value is None if the field is null
+                    person_to_contact = email.person
+            # Get a "good" email to contact the existing Person
+            to_email = person_to_contact.email_address() if person_to_contact else None
+
+            if to_email:
+                # We have a "good" email - send instructions to it
+                send_account_creation_exists_email(request, new_account_email, to_email)
+            elif email_is_known:
+                # Either a User or an Email matching new_account_email is in the system but we do not have a
+                # "good" email to use to contact its owner. Fail so the user can contact the secretariat to sort
+                # things out.
+                form.add_error(
+                    "email",
+                    ValidationError(
+                        f"Unable to create account for {new_account_email}. Please contact "
+                        f"the Secretariat at {settings.SECRETARIAT_SUPPORT_EMAIL} for assistance."
+                    ),
+                )
+                new_account_email = None  # Indicate to the template that we failed to create the requested account
+            else:
+                send_account_creation_email(request, new_account_email)
+
     else:
         form = RegistrationForm()
 
-    return render(request, 'registration/create.html', {
-        'form': form,
-        'to_email': to_email,
-    })
+    return render(
+        request,
+        "registration/create.html",
+        {
+            "form": form,
+            "to_email": new_account_email,
+        },
+    )
+
 
 def send_account_creation_email(request, to_email):
     auth = django.core.signing.dumps(to_email, salt="create_account")
@@ -155,13 +185,30 @@ def send_account_creation_email(request, to_email):
     })
 
 
+def send_account_creation_exists_email(request, new_account_email, to_email):
+    domain = Site.objects.get_current().domain
+    subject = "Attempted account creation at %s" % domain
+    from_email = settings.DEFAULT_FROM_EMAIL
+    send_mail(
+        request,
+        to_email,
+        from_email,
+        subject,
+        "registration/creation_exists_email.txt",
+        {
+            "domain": domain,
+            "username": new_account_email,
+        },
+    )
+
+
 def confirm_account(request, auth):
     try:
         email = django.core.signing.loads(auth, salt="create_account", max_age=settings.DAYS_TO_EXPIRE_REGISTRATION_LINK * 24 * 60 * 60)
     except django.core.signing.BadSignature:
         raise Http404("Invalid or expired auth")
 
-    if User.objects.filter(username=email).exists():
+    if User.objects.filter(username__iexact=email).exists():
         return redirect(profile)
 
     success = False
@@ -173,8 +220,6 @@ def confirm_account(request, auth):
             user = User.objects.create(username=email, email=email)
             user.set_password(password)
             user.save()
-            # password is also stored in htpasswd file
-            update_htpasswd_file(email, password)
 
             # make sure the rest of the person infrastructure is
             # well-connected
@@ -224,7 +269,7 @@ def profile(request):
     emails = Email.objects.filter(person=person).exclude(address__startswith='unknown-email-').order_by('-active','-time')
     new_email_forms = []
 
-    nc = NomCom.objects.filter(group__acronym__icontains=Date.today().year).first()
+    nc = NomCom.objects.filter(group__acronym__icontains=date_today().year).first()
     if nc and nc.volunteer_set.filter(person=person).exists():
         volunteer_status = 'volunteered'
     elif nc and nc.is_accepting_volunteers:
@@ -251,23 +296,8 @@ def profile(request):
                 to_email = f.cleaned_data["new_email"]
                 if not to_email:
                     continue
-
                 email_confirmations.append(to_email)
-
-                auth = django.core.signing.dumps([person.user.username, to_email], salt="add_email")
-
-                domain = Site.objects.get_current().domain
-                subject = 'Confirm email address for %s' % person.name
-                from_email = settings.DEFAULT_FROM_EMAIL
-
-                send_mail(request, to_email, from_email, subject, 'registration/add_email_email.txt', {
-                    'domain': domain,
-                    'auth': auth,
-                    'email': to_email,
-                    'person': person,
-                    'expire': settings.DAYS_TO_EXPIRE_REGISTRATION_LINK,
-                })
-                
+                send_new_email_confirmation_request(person, to_email)
 
             for r in roles:
                 e = r.email_form.cleaned_data["email"]
@@ -392,15 +422,26 @@ def confirm_new_email(request, auth):
     except django.core.signing.BadSignature:
         raise Http404("Invalid or expired auth")
 
-    person = get_object_or_404(Person, user__username=username)
+    person = get_object_or_404(Person, user__username__iexact=username)
 
     # do another round of validation since the situation may have
     # changed since submitting the request
     form = NewEmailForm({ "new_email": email })
     can_confirm = form.is_valid() and email
     new_email_obj = None
+    created = False
     if request.method == 'POST' and can_confirm and request.POST.get("action") == "confirm":
-        new_email_obj = Email.objects.create(address=email, person=person, origin=username)
+        try: 
+            new_email_obj, created = Email.objects.get_or_create(
+                address=email, 
+                person=person, 
+                defaults={'origin': username},
+            )
+        except IntegrityError:
+            can_confirm = False
+            form.add_error(
+                None, "Email address is in use by another user. Please contact the secretariat for assistance."
+            )
 
     return render(request, 'registration/confirm_new_email.html', {
         'username': username,
@@ -408,6 +449,7 @@ def confirm_new_email(request, auth):
         'can_confirm': can_confirm,
         'form': form,
         'new_email_obj': new_email_obj,
+        'already_confirmed': new_email_obj and not created,
     })
 
 def password_reset(request):
@@ -415,31 +457,50 @@ def password_reset(request):
     if request.method == 'POST':
         form = ResetPasswordForm(request.POST)
         if form.is_valid():
-            username = form.cleaned_data['username']
-
-            data = { 'username': username }
-            if User.objects.filter(username=username).exists():
-                user = User.objects.get(username=username)
-                data['password'] = user.password and user.password[-4:]
-                if user.last_login:
-                    data['last_login'] = user.last_login.timestamp()
-                else:
-                    data['last_login'] = None
-
-            auth = django.core.signing.dumps(data, salt="password_reset")
-
-            domain = Site.objects.get_current().domain
-            subject = 'Confirm password reset at %s' % domain
-            from_email = settings.DEFAULT_FROM_EMAIL
-            to_email = username # form validation makes sure that this is an email address
-
-            send_mail(request, to_email, from_email, subject, 'registration/password_reset_email.txt', {
-                'domain': domain,
-                'auth': auth,
-                'username': username,
-                'expire': settings.MINUTES_TO_EXPIRE_RESET_PASSWORD_LINK,
-            })
+            submitted_username = form.cleaned_data['username']
+            # The form validation checks that a matching User exists. Add the person__isnull check
+            # because the OneToOne field does not gracefully handle checks for user.person is Null.
+            # If we don't get a User here, we know it's because there's no related Person.
+            # We still report that the action succeeded, so we're not leaking the existence of user
+            # email addresses.
+            user = User.objects.filter(username__iexact=submitted_username, person__isnull=False).first()
+            if not user:
+                # try to find user ID from the email address
+                email = Email.objects.filter(address=submitted_username).first()
+                if email and email.person:
+                    if email.person.user:
+                        user = email.person.user
+                    else: 
+                        # Create a User record with this (conditioned by way of Email) username
+                        # Don't bother setting the name or email fields on User - rely on the
+                        # Person pointer.
+                        user = User.objects.create(
+                            username=email.address.lower(), 
+                            is_active=True,
+                        )
+                        email.person.user = user
+                        email.person.save()
+            if user and user.person.email_set.filter(active=True).exists():
+                data = {
+                    'username': user.username,
+                    'password': user.password and user.password[-4:],
+                    'last_login': user.last_login.timestamp() if user.last_login else None,
+                }
+                auth = django.core.signing.dumps(data, salt="password_reset")
 
+                domain = Site.objects.get_current().domain
+                subject = 'Confirm password reset at %s' % domain
+                from_email = settings.DEFAULT_FROM_EMAIL
+                # Send email to addresses from the database, NOT to the address from the form.
+                # This prevents unicode spoofing tricks (https://nvd.nist.gov/vuln/detail/CVE-2019-19844).
+                to_emails = list(set(email.address for email in user.person.email_set.filter(active=True)))
+                to_emails.sort()
+                send_mail(request, to_emails, from_email, subject, 'registration/password_reset_email.txt', {
+                    'domain': domain,
+                    'auth': auth,
+                    'username': submitted_username,
+                    'expire': settings.MINUTES_TO_EXPIRE_RESET_PASSWORD_LINK,
+                })
             success = True
     else:
         form = ResetPasswordForm()
@@ -456,11 +517,11 @@ def confirm_password_reset(request, auth):
         password = data['password']
         last_login = None
         if data['last_login']:
-            last_login = DateTime.fromtimestamp(data['last_login'])
+            last_login = datetime.datetime.fromtimestamp(data['last_login'], datetime.UTC)
     except django.core.signing.BadSignature:
         raise Http404("Invalid or expired auth")
 
-    user = get_object_or_404(User, username=username, password__endswith=password, last_login=last_login)
+    user = get_object_or_404(User, username__iexact=username, password__endswith=password, last_login=last_login)
     if request.user.is_authenticated and request.user != user:
         return HttpResponseForbidden(
             f'This password reset link is not for the signed-in user. '
@@ -468,18 +529,16 @@ def confirm_password_reset(request, auth):
         )
     success = False
     if request.method == 'POST':
-        form = PasswordForm(request.POST)
+        form = PasswordForm(user=user, data=request.POST)
         if form.is_valid():
             password = form.cleaned_data["password"]
 
             user.set_password(password)
             user.save()
-            # password is also stored in htpasswd file
-            update_htpasswd_file(user.username, password)
 
             success = True
     else:
-        form = PasswordForm()
+        form = PasswordForm(user=user)
 
     hlibname, hashername = settings.PASSWORD_HASHERS[0].rsplit('.',1)
     hlib = importlib.import_module(hlibname)
@@ -521,23 +580,6 @@ def test_email(request):
 
     return r
 
-@role_required('Secretariat')
-def add_account_whitelist(request):
-    success = False
-    if request.method == 'POST':
-        form = WhitelistForm(request.POST)
-        if form.is_valid():
-            email = form.cleaned_data['email']
-            entry = Whitelisted(email=email, by=request.user.person)
-            entry.save()
-            success = True
-    else:
-        form = WhitelistForm()
-
-    return render(request, 'ietfauth/whitelist_form.html', {
-        'form': form,
-        'success': success,
-    })
 
 class AddReviewWishForm(forms.Form):
     doc = SearchableDocumentField(label="Document", doc_type="draft")
@@ -558,7 +600,7 @@ def review_overview(request):
         reviewer__person__user=request.user,
         state__in=["assigned", "accepted"],
     )
-    today = Date.today()
+    today = date_today(DEADLINE_TZINFO)
     for r in open_review_assignments:
         r.due = max(0, (today - r.review_request.deadline).days)
 
@@ -627,12 +669,10 @@ def change_password(request):
     if request.method == 'POST':
         form = ChangePasswordForm(user, request.POST)
         if form.is_valid():
-            new_password = form.cleaned_data["new_password"]
+            new_password = form.cleaned_data["password"]
             
             user.set_password(new_password)
             user.save()
-            # password is also stored in htpasswd file
-            update_htpasswd_file(user.username, new_password)
             # keep the session
             update_session_auth_hash(request, user)
 
@@ -654,7 +694,7 @@ def change_password(request):
         'hasher': hasher,
     })
 
-    
+
 @login_required
 @person_required
 def change_username(request):
@@ -669,13 +709,10 @@ def change_username(request):
         form = ChangeUsernameForm(user, request.POST)
         if form.is_valid():
             new_username = form.cleaned_data["username"]
-            password = form.cleaned_data["password"]
             assert new_username in emails
 
             user.username = new_username.lower()
             user.save()
-            # password is also stored in htpasswd file
-            update_htpasswd_file(user.username, password)
             # keep the session
             update_session_auth_hash(request, user)
 
@@ -690,71 +727,79 @@ def change_username(request):
     return render(request, 'registration/change_username.html', {'form': form})
 
 
-
-def login(request, extra_context=None):
-    """
-    This login function is a wrapper around django's login() for the purpose
-    of providing a notification if the user's password has been cleared.  The
-    warning will be triggered if the password field has been set to something
-    which is not recognized as a valid password hash.
+class AnyEmailAuthenticationForm(AuthenticationForm):
+    """AuthenticationForm that allows any email address as the username
+    
+    Also performs a check for a cleared password field and provides a helpful error message
+    if that applies to the user attempting to log in.
     """
-
-    require_consent = []
-    if request.method == "POST":
-        form = AuthenticationForm(request, data=request.POST)
-        username = form.data.get('username')
-        user = User.objects.filter(username=username).first()
-        if not user:
-            # try to find user ID from the email address
+    _unauthenticated_user = None
+
+    def clean_username(self):
+        username = self.cleaned_data.get("username", None)
+        if username is None:
+            raise self.get_invalid_login_error()
+        user = User.objects.filter(username__iexact=username).first()
+        if user is None:
             email = Email.objects.filter(address=username).first()
-            if email and email.person and email.person.user:
-                u2 = email.person.user
-                # be conservative, only accept this if login is valid
-                if u2:
-                    pw = form.data.get('password')
-                    au = authenticate(request, username=u2.username, password=pw)
-                    if au:
-                        # kludge to change the querydict
-                        q2 = request.POST.copy()
-                        q2['username'] = u2.username
-                        request.POST = q2
-                        user = u2
-        #
-        if user:
-            try:
-                if user.person and not user.person.consent:
-                    require_consent = user.person.needs_consent()
-            except ObjectDoesNotExist:
-                pass
-            try:
-                identify_hasher(user.password)
+            if email and email.person:
+                user = email.person.user  # might be None
+        if user is None:
+            raise self.get_invalid_login_error()
+        self._unauthenticated_user = user  # remember this for the clean() method
+        return user.username
+
+    def clean(self):
+        if self._unauthenticated_user is not None:
+            try: 
+                identify_hasher(self._unauthenticated_user.password)
             except ValueError:
-                extra_context = {"alert":
-                                    "Note: Your password has been cleared because "
-                                    "of possible password leakage.  "
-                                    "Please use the password reset link below "
-                                    "to set a new password for your account.",
-                                }
-    response = LoginView.as_view(extra_context=extra_context)(request)
-    if isinstance(response, HttpResponseRedirect) and user and user.is_authenticated:
-        try:
-            user.person
-        except Person.DoesNotExist:
-            logout(request)
-            response = render(request, 'registration/missing_person.html')
-        if require_consent:
-            messages.warning(request, mark_safe(f'''
-
-                You have personal information associated with your account which is not
-                derived from draft submissions or other ietf work, namely: %s.  Please go
-                to your <a href="{urlreverse("ietf.ietfauth.views.profile")}">account profile</a> and review your
-                personal information, then scoll to the bottom and check the 'confirm'
-                checkbox and submit the form, in order to to indicate that that the
-                provided personal information may be used and displayed within the IETF
-                datatracker.
-
-                ''' % ', '.join(require_consent)))
-    return response
+                self.add_error(
+                    "password",
+                    'Your password has been cleared because of possible password leakage. '
+                    'Please use the "Forgot your password?" button below to set a new password '
+                    'for your account.',
+                )
+        return super().clean()
+
+    def confirm_login_allowed(self, user):
+        """Check whether a successfully authenticated user is permitted to log in"""
+        super().confirm_login_allowed(user)
+        # Optionally enforce password validation
+        if getattr(settings, "PASSWORD_POLICY_ENFORCE_AT_LOGIN", False):
+            try:
+                password_validation.validate_password(
+                    self.cleaned_data["password"], user
+                )
+            except ValidationError:
+                raise ValidationError(
+                    # dict mapping field to error / error list
+                    {
+                        "__all__": ValidationError(
+                            'You entered your password correctly, but it  does not '
+                            'meet our current length and complexity requirements. '
+                            'Please use the "Forgot your password?" button below to '
+                            'set a new password for your account.'
+                        ),
+                    }
+                )
+
+
+class AnyEmailLoginView(LoginView):
+    """LoginView that allows any email address as the username
+    
+    Redirects to the missing_person page instead of logging in if the user does not have a Person 
+    """
+    form_class = AnyEmailAuthenticationForm
+
+    def form_valid(self, form):
+        """Security check complete. Log the user in if they have a Person."""
+        user = form.get_user()  # user has authenticated at this point
+        if not hasattr(user, "person"):
+            logout(self.request)  # should not be logged in yet, but just in case...
+            return render(self.request, "registration/missing_person.html")
+        return super().form_valid(form)
+
 
 @login_required
 @person_required
@@ -790,11 +835,11 @@ class Meta:
 @person_required
 def apikey_disable(request):
     person = request.user.person
-    choices = [ (k.hash(), str(k)) for k in person.apikeys.all() ]
+    choices = [ (k.hash(), str(k)) for k in person.apikeys.exclude(valid=False) ]
     #
     class KeyDeleteForm(forms.Form):
         hash = forms.ChoiceField(label='Key', choices=choices)
-        def clean_key(self):
+        def clean_hash(self):
             hash = force_bytes(self.cleaned_data['hash'])
             key = PersonalApiKey.validate_key(hash)
             if key and key.person == request.user.person:
@@ -805,7 +850,7 @@ def clean_key(self):
     if request.method == 'POST':
         form = KeyDeleteForm(request.POST)
         if form.is_valid():
-            hash = force_bytes(form.data['hash'])
+            hash = force_bytes(form.cleaned_data['hash'])
             key = PersonalApiKey.validate_key(hash)
             key.valid = False
             key.save()
diff --git a/ietf/ietfauth/widgets.py b/ietf/ietfauth/widgets.py
new file mode 100644
index 0000000000..fd7fa16726
--- /dev/null
+++ b/ietf/ietfauth/widgets.py
@@ -0,0 +1,115 @@
+from django.forms import PasswordInput
+from django.utils.safestring import mark_safe
+from django.utils.translation import gettext as _
+
+# The PasswordStrengthInput and PasswordConfirmationInput widgets come from the
+# django-password-strength project, https://pypi.org/project/django-password-strength/
+#
+# Original license:
+#
+# Copyright &copy; 2015 A.J. May and individual contributors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the 
+# following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+# disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the 
+# following disclaimer in the documentation and/or other materials provided with the distribution.
+# 
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote 
+# products derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+class PasswordStrengthInput(PasswordInput):
+    """
+    Form widget to show the user how strong his/her password is.
+    """
+
+    def render(self, name, value, attrs=None, renderer=None):
+        strength_markup = """
+        <div style="margin-top: 10px;">
+            <div class="progress" style="margin-bottom: 10px;">
+                <div class="progress-bar progress-bar-warning password_strength_bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="5" style="width: 0%"></div>
+            </div>
+            <p class="text-body-secondary password_strength_info hidden">
+                <span class="label label-danger">
+                    {}
+                </span>
+                <span style="margin-left:5px;">
+                    {}
+                </span>
+                <span class="password_improvement_hint d-none"></span>
+            </p>
+        </div>
+        """.format(
+            _("Warning"),
+            _(
+                'This password would take <em class="password_strength_time"></em> to crack.'
+            ),
+        )
+
+        try:
+            self.attrs["class"] = "%s password_strength".strip() % self.attrs["class"]
+        except KeyError:
+            self.attrs["class"] = "password_strength"
+
+        return mark_safe(
+            super(PasswordInput, self).render(name, value, attrs, renderer)
+            + strength_markup
+        )
+
+    class Media:
+        js = (
+            "ietf/js/zxcvbn.js",
+            "ietf/js/password_strength.js",
+        )
+
+
+class PasswordConfirmationInput(PasswordInput):
+    """
+    Form widget to confirm the users password by letting him/her type it again.
+    """
+
+    def __init__(self, confirm_with=None, attrs=None, render_value=False):
+        super(PasswordConfirmationInput, self).__init__(attrs, render_value)
+        self.confirm_with = confirm_with
+
+    def render(self, name, value, attrs=None, renderer=None):
+        if self.confirm_with:
+            self.attrs["data-confirm-with"] = "id_%s" % self.confirm_with
+            
+        confirmation_markup = """
+        <div style="margin-top: 10px;" class="hidden password_strength_info">
+            <p class="text-body-secondary">
+                <span class="label label-danger">
+                    %s
+                </span>
+                <span style="margin-left:5px;">%s</span>
+            </p>
+        </div>
+        """ % (
+            _("Warning"),
+            _("Your passwords don't match."),
+        )
+
+        try:
+            self.attrs["class"] = (
+                "%s password_confirmation".strip() % self.attrs["class"]
+            )
+        except KeyError:
+            self.attrs["class"] = "password_confirmation"
+
+        return mark_safe(
+            super(PasswordInput, self).render(name, value, attrs, renderer)
+            + confirmation_markup
+        )
diff --git a/ietf/ipr/.gitignore b/ietf/ipr/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/ipr/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/ipr/admin.py b/ietf/ipr/admin.py
index a0185f58c6..d6a320203b 100644
--- a/ietf/ipr/admin.py
+++ b/ietf/ipr/admin.py
@@ -1,13 +1,23 @@
-# Copyright The IETF Trust 2010-2020, All Rights Reserved
+# Copyright The IETF Trust 2010-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 from django import forms
 from django.contrib import admin
 from ietf.name.models import DocRelationshipName
-from ietf.ipr.models import (IprDisclosureBase, IprDocRel, IprEvent,
-    RelatedIpr, HolderIprDisclosure, ThirdPartyIprDisclosure, GenericIprDisclosure, 
-    NonDocSpecificIprDisclosure, LegacyMigrationIprEvent)
+from ietf.ipr.models import (
+    IprDisclosureBase,
+    IprDocRel,
+    IprEvent,
+    RelatedIpr,
+    HolderIprDisclosure,
+    RemovedIprDisclosure,
+    ThirdPartyIprDisclosure,
+    GenericIprDisclosure,
+    NonDocSpecificIprDisclosure,
+    LegacyMigrationIprEvent,
+)
+from ietf.utils.admin import SaferTabularInline
 
 # ------------------------------------------------------
 # ModelAdmins
@@ -20,13 +30,13 @@ class Meta:
           'sections':forms.TextInput,
         }
 
-class IprDocRelInline(admin.TabularInline):
+class IprDocRelInline(SaferTabularInline):
     model = IprDocRel
     form = IprDocRelAdminForm
     raw_id_fields = ['document']
     extra = 1
 
-class RelatedIprInline(admin.TabularInline):
+class RelatedIprInline(SaferTabularInline):
     model = RelatedIpr
     raw_id_fields = ['target']
     fk_name = 'source'
@@ -94,7 +104,7 @@ class IprDocRelAdmin(admin.ModelAdmin):
 
 class RelatedIprAdmin(admin.ModelAdmin):
     list_display = ['source', 'target', 'relationship', ]
-    search_fields = ['source__name', 'target__name', 'target__docs__name', ]
+    search_fields = ['source__name', 'target__name', ]
     raw_id_fields = ['source', 'target', ]
 admin.site.register(RelatedIpr, RelatedIprAdmin)
 
@@ -110,3 +120,9 @@ class LegacyMigrationIprEventAdmin(admin.ModelAdmin):
     list_filter = ['time', 'type', 'response_due']
     raw_id_fields = ['by', 'disclosure', 'message', 'in_reply_to']
 admin.site.register(LegacyMigrationIprEvent, LegacyMigrationIprEventAdmin)
+
+class RemovedIprDisclosureAdmin(admin.ModelAdmin):
+    pass
+
+
+admin.site.register(RemovedIprDisclosure, RemovedIprDisclosureAdmin)
diff --git a/ietf/ipr/factories.py b/ietf/ipr/factories.py
index da12629126..8a8a740158 100644
--- a/ietf/ipr/factories.py
+++ b/ietf/ipr/factories.py
@@ -1,10 +1,12 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
+# Copyright The IETF Trust 2018-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
 import factory
+from faker import Faker
 
+from django.utils import timezone
 
 from ietf.ipr.models import (
     IprDisclosureBase, HolderIprDisclosure, ThirdPartyIprDisclosure, NonDocSpecificIprDisclosure,
@@ -12,17 +14,19 @@
 )
 
 def _fake_patent_info():
+    fake = Faker()
     return "Date: %s\nNotes: %s\nTitle: %s\nNumber: %s\nInventor: %s\n" % (
-        (datetime.datetime.today()-datetime.timedelta(days=365)).strftime("%Y-%m-%d"),
-        factory.Faker('paragraph'),
-        factory.Faker('sentence', nb_words=8),
+        (timezone.now()-datetime.timedelta(days=365)).strftime("%Y-%m-%d"),
+        fake.paragraph(),
+        fake.sentence(nb_words=8),
         'US9999999',
-        factory.Faker('name'),
+        fake.name(),
     )
 
 class IprDisclosureBaseFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = IprDisclosureBase
+        skip_postgeneration_save = True
 
     by = factory.SubFactory('ietf.person.factories.PersonFactory')
     compliant = True
@@ -38,7 +42,7 @@ def docs(self, create, extracted, **kwargs):
             return
         if extracted:
             for doc in extracted:
-                IprDocRel.objects.create(disclosure=self,document=doc.docalias.first())
+                IprDocRel.objects.create(disclosure=self,document=doc)
 
     @factory.post_generation
     def updates(self, create, extracted, **kwargs):
@@ -92,3 +96,11 @@ class Meta:
     disclosure = factory.SubFactory(IprDisclosureBaseFactory)
     desc = factory.Faker('sentence')
 
+class IprDocRelFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = IprDocRel
+
+    disclosure = factory.SubFactory(HolderIprDisclosureFactory)
+    document = factory.SubFactory("ietf.doc.factories.IndividualDraftFactory")
+    revisions = "00"
+    sections = ""
diff --git a/ietf/ipr/feeds.py b/ietf/ipr/feeds.py
index b5f4c4e6a4..e8a1c739f2 100644
--- a/ietf/ipr/feeds.py
+++ b/ietf/ipr/feeds.py
@@ -1,12 +1,13 @@
-# Copyright The IETF Trust 2007-2020, All Rights Reserved
+# Copyright The IETF Trust 2007-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
+from django.conf import settings
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 from django.urls import reverse_lazy
 from django.utils.safestring import mark_safe
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from ietf.ipr.models import IprDisclosureBase
 
@@ -19,13 +20,13 @@ class LatestIprDisclosuresFeed(Feed):
     feed_url = "/feed/ipr/"
 
     def items(self):
-        return IprDisclosureBase.objects.filter(state__in=('posted','removed')).order_by('-time')[:30]
+        return IprDisclosureBase.objects.filter(state__in=settings.PUBLISH_IPR_STATES).order_by('-time')[:30]
 
     def item_title(self, item):
         return mark_safe(item.title)
 
     def item_description(self, item):
-        return force_text(item.title)
+        return force_str(item.title)
         
     def item_pubdate(self, item):
         return item.time
diff --git a/ietf/ipr/forms.py b/ietf/ipr/forms.py
index 06248e2a73..dac34bddf6 100644
--- a/ietf/ipr/forms.py
+++ b/ietf/ipr/forms.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2014-2020, All Rights Reserved
+# Copyright The IETF Trust 2014-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -14,7 +14,7 @@
 import debug                            # pyflakes:ignore
 
 from ietf.group.models import Group
-from ietf.doc.fields import SearchableDocAliasField
+from ietf.doc.fields import SearchableDocumentField
 from ietf.ipr.mail import utc_from_string
 from ietf.ipr.fields import SearchableIprDisclosuresField
 from ietf.ipr.models import (IprDocRel, IprDisclosureBase, HolderIprDisclosure,
@@ -95,7 +95,7 @@ def clean(self):
         return self.cleaned_data
 
 class DraftForm(forms.ModelForm):
-    document = SearchableDocAliasField(label="I-D name/RFC number", required=True, doc_type="draft")
+    document = SearchableDocumentField(label="I-D name/RFC number", required=True, doc_type="all")
 
     class Meta:
         model = IprDocRel
@@ -105,6 +105,17 @@ class Meta:
         }
         help_texts = { 'sections': 'Sections' }
 
+    def clean(self):
+        cleaned_data = super().clean()
+        revisions = cleaned_data.get("revisions")
+        document = cleaned_data.get("document")
+        if not document:
+            self.add_error("document", "Identifying the Internet-Draft or RFC for this disclosure is required.")
+        elif not document.name.startswith("rfc"):
+            if revisions is None or revisions.strip() == "":
+                self.add_error("revisions", "Revisions of this Internet-Draft for which this disclosure is relevant must be specified.")
+        return cleaned_data
+
 patent_number_help_text = "Enter one or more comma-separated patent publication or application numbers as two-letter country code and serial number, e.g.: US62/123456 or WO2017123456. Do not include thousands-separator commas in serial numbers.  It is preferable to use individual disclosures for each patent, even if this field permits multiple patents to be listed, in order to get inventor, title, and date information below correct." 
 validate_patent_number = RegexValidator(
                                     regex=(r"^("
@@ -327,7 +338,19 @@ def clean(self):
 
         return cleaned_data
 
+
 class HolderIprDisclosureForm(IprDisclosureFormBase):
+    is_blanket_disclosure = forms.BooleanField(
+        label=mark_safe(
+            'This is a blanket IPR disclosure '
+            '(see Section 5.4.3 of <a href="https://www.ietf.org/rfc/rfc8179.txt">RFC 8179</a>)'
+        ),
+        help_text="In satisfaction of its disclosure obligations, Patent Holder commits to license all of "
+                  "IPR (as defined in RFC 8179) that would have required disclosure under RFC 8179 on a "
+                  "royalty-free (and otherwise reasonable and non-discriminatory) basis. Patent Holder "
+                  "confirms that all other terms and conditions are described in this IPR disclosure.",
+        required=False,
+    )
     licensing = CustomModelChoiceField(IprLicenseTypeName.objects.all(),
         widget=forms.RadioSelect,empty_label=None)
 
@@ -345,6 +368,15 @@ def __init__(self, *args, **kwargs):
         else:
             # entering new disclosure
             self.fields['licensing'].queryset = IprLicenseTypeName.objects.exclude(slug='none-selected')
+        
+        if self.data.get("is_blanket_disclosure", False):
+            # for a blanket disclosure, patent details are not required
+            self.fields["patent_number"].required = False
+            self.fields["patent_inventor"].required = False
+            self.fields["patent_title"].required = False
+            self.fields["patent_date"].required = False
+            # n.b., self.fields["patent_notes"] is never required
+
             
     def clean(self):
         cleaned_data = super(HolderIprDisclosureForm, self).clean()
@@ -413,7 +445,7 @@ def save(self, *args, **kwargs):
         
 class SearchForm(forms.Form):
     state =    forms.MultipleChoiceField(choices=[], widget=forms.CheckboxSelectMultiple,required=False)
-    draft =    forms.CharField(label="Draft name", max_length=128, required=False)
+    draft =    forms.CharField(label="Internet-Draft name", max_length=128, required=False)
     rfc =      forms.IntegerField(label="RFC number", required=False)
     holder =   forms.CharField(label="Name of patent owner/applicant", max_length=128,required=False)
     patent =   forms.CharField(label="Text in patent information", max_length=128,required=False)
@@ -428,4 +460,4 @@ def __init__(self, *args, **kwargs):
 class StateForm(forms.Form):
     state = forms.ModelChoiceField(queryset=IprDisclosureStateName.objects,label="New State",empty_label=None)
     comment = forms.CharField(required=False, widget=forms.Textarea, help_text="You may add a comment to be included in the disclosure history.", strip=False)
-    private = forms.BooleanField(label="Private comment", required=False, help_text="If this box is checked the comment will not appear in the disclosure's public history view.")
\ No newline at end of file
+    private = forms.BooleanField(label="Private comment", required=False, help_text="If this box is checked the comment will not appear in the disclosure's public history view.")
diff --git a/ietf/ipr/mail.py b/ietf/ipr/mail.py
index ea3551d56b..9bef751b95 100644
--- a/ietf/ipr/mail.py
+++ b/ietf/ipr/mail.py
@@ -3,15 +3,16 @@
 
 
 import base64
-import email
 import datetime
 from dateutil.tz import tzoffset
 import os
-import pytz
 import re
 
+from email import message_from_bytes
+from email.utils import parsedate_tz
+
 from django.template.loader import render_to_string
-from django.utils.encoding import force_text, force_bytes
+from django.utils.encoding import force_str, force_bytes
 
 import debug                            # pyflakes:ignore
 
@@ -50,7 +51,7 @@ def parsedate_to_datetime(date):
     http://python.readthedocs.org/en/latest/library/email.util.html
     """
     try:
-        tuple = email.utils.parsedate_tz(date)
+        tuple = parsedate_tz(date)
         if not tuple:
             return None
         tz = tuple[-1]
@@ -62,10 +63,12 @@ def parsedate_to_datetime(date):
 
 def utc_from_string(s):
     date = parsedate_to_datetime(s)
-    if is_aware(date):
-        return date.astimezone(pytz.utc).replace(tzinfo=None)
+    if date is None:
+        return None
+    elif is_aware(date):
+        return date.astimezone(datetime.UTC)
     else:
-        return date
+        return date.replace(tzinfo=datetime.UTC)
 
 # ----------------------------------------------------------------
 # Email Functions
@@ -99,7 +102,7 @@ def get_reply_to():
     address with "plus addressing" using a random string.  Guaranteed to be unique"""
     local,domain = get_base_ipr_request_address().split('@')
     while True:
-        rand = force_text(base64.urlsafe_b64encode(os.urandom(12)))
+        rand = force_str(base64.urlsafe_b64encode(os.urandom(12)))
         address = "{}+{}@{}".format(local,rand,domain)
         q = Message.objects.filter(reply_to=address)
         if not q:
@@ -168,31 +171,44 @@ def message_from_message(message,by=None):
     )
     return msg
 
+
+class UndeliverableIprResponseError(Exception):
+    """Response email could not be delivered and should be treated as an error"""
+
+
 def process_response_email(msg):
-    """Saves an incoming message.  msg=string.  Message "To" field is expected to
-    be in the format ietf-ipr+[identifier]@ietf.org.  Expect to find a message with
-    a matching value in the reply_to field, associated to an IPR disclosure through
-    IprEvent.  Create a Message object for the incoming message and associate it to
-    the original message via new IprEvent"""
-    message = email.message_from_bytes(force_bytes(msg))
+    """Save an incoming IPR response email message
+    
+    Message "To" field is expected to be in the format ietf-ipr+[identifier]@ietf.org. If
+    the address or identifier is missing, the message will be silently dropped.
+
+    Expect to find a message with a matching value in the reply_to field, associated to an
+    IPR disclosure through IprEvent. If it cannot be matched, raises UndeliverableIprResponseError 
+    
+    Creates a Message object for the incoming message and associates it to
+    the original message via new IprEvent
+    """
+    message = message_from_bytes(force_bytes(msg))
     to = message.get('To', '')
 
     # exit if this isn't a response we're interested in (with plus addressing)
-    local,domain = get_base_ipr_request_address().split('@')
+    local, domain = get_base_ipr_request_address().split('@')
     if not re.match(r'^{}\+[a-zA-Z0-9_\-]{}@{}'.format(local,'{16}',domain),to):
-        return None
-    
+        _from = message.get("From", "<unknown>")
+        log(f"Ignoring IPR email without a message identifier from {_from} to {to}")
+        return
+
     try:
         to_message = Message.objects.get(reply_to=to)
     except Message.DoesNotExist:
         log('Error finding matching message ({})'.format(to))
-        return None
+        raise UndeliverableIprResponseError(f"Unable to find message matching {to}")
 
     try:
         disclosure = to_message.msgevents.first().disclosure
     except:
         log('Error processing message ({})'.format(to))
-        return None
+        raise UndeliverableIprResponseError("Error processing message for {to}")
 
     ietf_message = message_from_message(message)
     IprEvent.objects.create(
@@ -204,4 +220,4 @@ def process_response_email(msg):
     )
     
     log("Received IPR email from %s" % ietf_message.frm)
-    return ietf_message
+
diff --git a/ietf/ipr/management/commands/generate_draft_recursive_txt.py b/ietf/ipr/management/commands/generate_draft_recursive_txt.py
deleted file mode 100644
index 240fc5348e..0000000000
--- a/ietf/ipr/management/commands/generate_draft_recursive_txt.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright The IETF Trust 2014-2021, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.core.management.base import BaseCommand, CommandError
-
-from ietf.ipr.utils import generate_draft_recursive_txt
-
-
-class Command(BaseCommand):
-    help = ("Generate machine-readable list of IPR disclosures by draft name (recursive)")
-
-    def handle(self, *args, **options):
-        try:
-            generate_draft_recursive_txt()
-        except (ValueError, IOError) as e:
-            raise CommandError(e)
diff --git a/ietf/ipr/management/commands/process_email.py b/ietf/ipr/management/commands/process_email.py
index d04b54b216..616cade5c4 100644
--- a/ietf/ipr/management/commands/process_email.py
+++ b/ietf/ipr/management/commands/process_email.py
@@ -9,7 +9,7 @@
 from django.core.management import CommandError
 
 from ietf.utils.management.base import EmailOnFailureCommand
-from ietf.ipr.mail import process_response_email
+from ietf.ipr.mail import process_response_email, UndeliverableIprResponseError
 
 import debug                            # pyflakes:ignore
 
@@ -23,11 +23,15 @@ def add_arguments(self, parser):
 
     def handle(self, *args, **options):
         email = options.get('email', None)
-        binary_input = io.open(email, 'rb') if email else sys.stdin.buffer
-        self.msg_bytes = binary_input.read()
+        if email:
+            binary_input = io.open(email, 'rb')
+            self.msg_bytes = binary_input.read()
+            binary_input.close()
+        else:
+            self.msg_bytes = sys.stdin.buffer.read()
         try:
             process_response_email(self.msg_bytes)
-        except ValueError as e:
+        except (ValueError, UndeliverableIprResponseError) as e:
             raise CommandError(e)
 
     failure_subject = 'Error during ipr email processing'
@@ -44,4 +48,4 @@ def make_failure_message(self, error, **extra):
                 'application', 'octet-stream',  # mime type
                 filename='original-message',
             )
-        return msg
\ No newline at end of file
+        return msg
diff --git a/ietf/ipr/management/tests.py b/ietf/ipr/management/tests.py
index d84b0cfef4..d7acd65042 100644
--- a/ietf/ipr/management/tests.py
+++ b/ietf/ipr/management/tests.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2021, All Rights Reserved
 # -*- coding: utf-8 -*-
 """Tests of ipr management commands"""
-import mock
+from unittest import mock
 import sys
 
 from django.core.management import call_command
diff --git a/ietf/ipr/migrations/0001_initial.py b/ietf/ipr/migrations/0001_initial.py
index e370d3d5ad..b204fd4012 100644
--- a/ietf/ipr/migrations/0001_initial.py
+++ b/ietf/ipr/migrations/0001_initial.py
@@ -1,7 +1,4 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -32,15 +29,11 @@ class Migration(migrations.Migration):
                 ('submitter_email', models.EmailField(blank=True, max_length=254)),
                 ('time', models.DateTimeField(auto_now_add=True)),
                 ('title', models.CharField(blank=True, max_length=255)),
+                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
-        ),
-        migrations.CreateModel(
-            name='IprDocRel',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('sections', models.TextField(blank=True)),
-                ('revisions', models.CharField(blank=True, max_length=16)),
-            ],
+            options={
+                'ordering': ['-time', '-id'],
+            },
         ),
         migrations.CreateModel(
             name='IprEvent',
@@ -49,18 +42,16 @@ class Migration(migrations.Migration):
                 ('time', models.DateTimeField(auto_now_add=True)),
                 ('desc', models.TextField()),
                 ('response_due', models.DateTimeField(blank=True, null=True)),
+                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('disclosure', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ipr.IprDisclosureBase')),
+                ('in_reply_to', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='irtoevents', to='message.Message')),
+                ('message', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='msgevents', to='message.Message')),
+                ('type', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.IprEventTypeName')),
             ],
             options={
                 'ordering': ['-time', '-id'],
             },
         ),
-        migrations.CreateModel(
-            name='RelatedIpr',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('relationship', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocRelationshipName')),
-            ],
-        ),
         migrations.CreateModel(
             name='GenericIprDisclosure',
             fields=[
@@ -86,7 +77,6 @@ class Migration(migrations.Migration):
                 ('holder_contact_info', models.TextField(blank=True, help_text='Address, phone, etc.')),
                 ('licensing_comments', models.TextField(blank=True)),
                 ('submitter_claims_all_terms_disclosed', models.BooleanField(default=False)),
-                ('licensing', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.IprLicenseTypeName')),
             ],
             bases=('ipr.iprdisclosurebase',),
         ),
@@ -122,55 +112,24 @@ class Migration(migrations.Migration):
             ],
             bases=('ipr.iprdisclosurebase',),
         ),
-        migrations.AddField(
-            model_name='relatedipr',
-            name='source',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relatedipr_source_set', to='ipr.IprDisclosureBase'),
-        ),
-        migrations.AddField(
-            model_name='relatedipr',
-            name='target',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relatedipr_target_set', to='ipr.IprDisclosureBase'),
-        ),
-        migrations.AddField(
-            model_name='iprevent',
-            name='by',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
-        ),
-        migrations.AddField(
-            model_name='iprevent',
-            name='disclosure',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ipr.IprDisclosureBase'),
-        ),
-        migrations.AddField(
-            model_name='iprevent',
-            name='in_reply_to',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='irtoevents', to='message.Message'),
-        ),
-        migrations.AddField(
-            model_name='iprevent',
-            name='message',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='msgevents', to='message.Message'),
-        ),
-        migrations.AddField(
-            model_name='iprevent',
-            name='type',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.IprEventTypeName'),
-        ),
-        migrations.AddField(
-            model_name='iprdocrel',
-            name='disclosure',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ipr.IprDisclosureBase'),
-        ),
-        migrations.AddField(
-            model_name='iprdocrel',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocAlias'),
+        migrations.CreateModel(
+            name='RelatedIpr',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('relationship', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocRelationshipName')),
+                ('source', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relatedipr_source_set', to='ipr.IprDisclosureBase')),
+                ('target', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relatedipr_target_set', to='ipr.IprDisclosureBase')),
+            ],
         ),
-        migrations.AddField(
-            model_name='iprdisclosurebase',
-            name='by',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        migrations.CreateModel(
+            name='IprDocRel',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('sections', models.TextField(blank=True)),
+                ('revisions', models.CharField(blank=True, max_length=16)),
+                ('disclosure', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ipr.IprDisclosureBase')),
+                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocAlias')),
+            ],
         ),
         migrations.AddField(
             model_name='iprdisclosurebase',
@@ -187,4 +146,17 @@ class Migration(migrations.Migration):
             name='state',
             field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.IprDisclosureStateName'),
         ),
+        migrations.AddIndex(
+            model_name='iprevent',
+            index=models.Index(fields=['-time', '-id'], name='ipr_ipreven_time_9630c4_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='iprdisclosurebase',
+            index=models.Index(fields=['-time', '-id'], name='ipr_iprdisc_time_846a78_idx'),
+        ),
+        migrations.AddField(
+            model_name='holderiprdisclosure',
+            name='licensing',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.IprLicenseTypeName'),
+        ),
     ]
diff --git a/ietf/ipr/migrations/0002_auto_20180225_1207.py b/ietf/ipr/migrations/0002_auto_20180225_1207.py
deleted file mode 100644
index 3f34a491d8..0000000000
--- a/ietf/ipr/migrations/0002_auto_20180225_1207.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-25 12:07
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ipr', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='iprdisclosurebase',
-            options={'ordering': ['-time', '-id']},
-        ),
-    ]
diff --git a/ietf/ipr/migrations/0002_iprdocrel_no_aliases.py b/ietf/ipr/migrations/0002_iprdocrel_no_aliases.py
new file mode 100644
index 0000000000..bcfc73a320
--- /dev/null
+++ b/ietf/ipr/migrations/0002_iprdocrel_no_aliases.py
@@ -0,0 +1,104 @@
+# Generated by Django 4.2.2 on 2023-06-16 13:40
+
+from django.db import migrations
+import django.db.models.deletion
+from django.db.models import F, Subquery, OuterRef, ManyToManyField, CharField
+import ietf.utils.models
+
+def forward(apps, schema_editor):
+    IprDocRel = apps.get_model("ipr", "IprDocRel")
+    DocAlias = apps.get_model("doc", "DocAlias")
+    document_subquery = Subquery(
+        DocAlias.objects.filter(
+            pk=OuterRef("deprecated_document")
+        ).values("docs")[:1]
+    )
+    name_subquery = Subquery(
+        DocAlias.objects.filter(
+            pk=OuterRef("deprecated_document")
+        ).values("name")[:1]
+    )
+    IprDocRel.objects.annotate(
+        firstdoc=document_subquery,
+        aliasname=name_subquery,
+    ).update(
+        document=F("firstdoc"),
+        originaldocumentaliasname=F("aliasname"),
+    ) 
+    # This might not be right - we may need here (and in the relateddocument migrations) to pay attention to
+    # whether the name being pointed to is and rfc name or a draft name and point to the right object instead...
+
+def reverse(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipr", "0001_initial"),
+        ("doc", "0016_relate_hist_no_aliases")
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='iprdocrel',
+            name='document',
+            field=ietf.utils.models.ForeignKey(
+                db_index=False,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.docalias',
+            ),
+        ),
+        migrations.RenameField(
+            model_name="iprdocrel",
+            old_name="document",
+            new_name="deprecated_document"
+        ),
+        migrations.AlterField(
+            model_name='iprdocrel',
+            name='deprecated_document',
+            field=ietf.utils.models.ForeignKey(
+                db_index=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.docalias',
+            ),
+        ),
+        migrations.AddField(
+            model_name="iprdocrel",
+            name="document",
+            field=ietf.utils.models.ForeignKey(
+                default=1, # A lie, but a convenient one - no iprdocrel objects point here.
+                on_delete=django.db.models.deletion.CASCADE,
+                to="doc.document",
+                db_index=False,
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="iprdocrel",
+            name="originaldocumentaliasname",
+            field=CharField(max_length=255,null=True,blank=True),
+            preserve_default=True,
+        ),
+        migrations.RunPython(forward, reverse),
+        migrations.AlterField(
+            model_name="iprdocrel",
+            name="document",
+            field=ietf.utils.models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to="doc.document",
+                db_index=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name='iprdisclosurebase',
+            name='docs',
+            field=ManyToManyField(through='ipr.IprDocRel', to='doc.Document'),
+        ),
+        migrations.RemoveField(
+            model_name="iprdocrel",
+            name="deprecated_document",
+            field=ietf.utils.models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                to='doc.DocAlias',
+            ),
+        ),
+    ]
diff --git a/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py b/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py
deleted file mode 100644
index e5ac7f4413..0000000000
--- a/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 11:58
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0015_1_add_fk_to_document_id'),
-        ('ipr', '0002_auto_20180225_1207'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='iprdocrel',
-            name='document2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.DocAlias', to_field=b'id'),
-        ),
-        migrations.AlterField(
-            model_name='iprdocrel',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_ipr', to='doc.DocAlias', to_field=b'name'),
-        ),
-    ]
diff --git a/ietf/ipr/migrations/0003_alter_iprdisclosurebase_docs.py b/ietf/ipr/migrations/0003_alter_iprdisclosurebase_docs.py
new file mode 100644
index 0000000000..23b349f567
--- /dev/null
+++ b/ietf/ipr/migrations/0003_alter_iprdisclosurebase_docs.py
@@ -0,0 +1,18 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0017_delete_docalias"),
+        ("ipr", "0002_iprdocrel_no_aliases"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="iprdisclosurebase",
+            name="docs",
+            field=models.ManyToManyField(through="ipr.IprDocRel", to="doc.document"),
+        ),
+    ]
diff --git a/ietf/ipr/migrations/0004_holderiprdisclosure_is_blanket_disclosure.py b/ietf/ipr/migrations/0004_holderiprdisclosure_is_blanket_disclosure.py
new file mode 100644
index 0000000000..66282b3cd5
--- /dev/null
+++ b/ietf/ipr/migrations/0004_holderiprdisclosure_is_blanket_disclosure.py
@@ -0,0 +1,16 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipr", "0003_alter_iprdisclosurebase_docs"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="holderiprdisclosure",
+            name="is_blanket_disclosure",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/ietf/ipr/migrations/0004_remove_iprdocrel_document.py b/ietf/ipr/migrations/0004_remove_iprdocrel_document.py
deleted file mode 100644
index d5af9d9473..0000000000
--- a/ietf/ipr/migrations/0004_remove_iprdocrel_document.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-20 09:53
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ipr', '0003_add_ipdocrel_document2_fk'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='iprdocrel',
-            name='document',
-        ),
-    ]
diff --git a/ietf/ipr/migrations/0005_removediprdisclosure.py b/ietf/ipr/migrations/0005_removediprdisclosure.py
new file mode 100644
index 0000000000..400a264579
--- /dev/null
+++ b/ietf/ipr/migrations/0005_removediprdisclosure.py
@@ -0,0 +1,28 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipr", "0004_holderiprdisclosure_is_blanket_disclosure"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="RemovedIprDisclosure",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("removed_id", models.PositiveBigIntegerField(unique=True)),
+                ("reason", models.TextField()),
+            ],
+        ),
+    ]
diff --git a/ietf/ipr/migrations/0005_rename_field_document2.py b/ietf/ipr/migrations/0005_rename_field_document2.py
deleted file mode 100644
index 4fef4c2274..0000000000
--- a/ietf/ipr/migrations/0005_rename_field_document2.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 05:31
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0019_rename_field_document2'),
-        ('ipr', '0004_remove_iprdocrel_document'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='iprdocrel',
-            old_name='document2',
-            new_name='document',
-        ),
-    ]
diff --git a/ietf/ipr/migrations/0006_already_removed_ipr.py b/ietf/ipr/migrations/0006_already_removed_ipr.py
new file mode 100644
index 0000000000..0e2dbc63eb
--- /dev/null
+++ b/ietf/ipr/migrations/0006_already_removed_ipr.py
@@ -0,0 +1,24 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    RemovedIprDisclosure = apps.get_model("ipr", "RemovedIprDisclosure")
+    for id in (6544, 6068):
+        RemovedIprDisclosure.objects.create(
+            removed_id=id,
+            reason="This IPR disclosure was removed as objectively false.",
+        )
+
+
+def reverse(apps, schema_editor):
+    RemovedIprDisclosure = apps.get_model("ipr", "RemovedIprDisclosure")
+    RemovedIprDisclosure.objects.all().delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipr", "0005_removediprdisclosure"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/ipr/migrations/0006_document_primary_key_cleanup.py b/ietf/ipr/migrations/0006_document_primary_key_cleanup.py
deleted file mode 100644
index df8f66c549..0000000000
--- a/ietf/ipr/migrations/0006_document_primary_key_cleanup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-06-10 03:42
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ipr', '0005_rename_field_document2'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='iprdocrel',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocAlias'),
-        ),
-    ]
diff --git a/ietf/ipr/migrations/0007_create_ipr_doc_events.py b/ietf/ipr/migrations/0007_create_ipr_doc_events.py
deleted file mode 100644
index 395bc11ce9..0000000000
--- a/ietf/ipr/migrations/0007_create_ipr_doc_events.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-01-17 12:32
-
-
-from django.db import migrations
-
-
-def create_or_delete_ipr_doc_events(apps, delete=False):
-    """Create or delete DocEvents for IprEvents
-    
-    Mostly duplicates IprEvent.create_doc_events(). This is necessary
-    because model methods, including custom save() methods, are not 
-    available to migrations.
-    """
-    IprEvent = apps.get_model('ipr', 'IprEvent')
-    DocEvent = apps.get_model('doc', 'DocEvent')
-    
-    # Map from self.type_id to DocEvent.EVENT_TYPES for types that
-    # should be logged as DocEvents
-    event_type_map = {
-        'posted': 'posted_related_ipr',
-        'removed': 'removed_related_ipr',
-    }
-
-    for ipr_event in IprEvent.objects.filter(type_id__in=event_type_map):
-        related_docs = set()  # related docs, no duplicates
-        for alias in ipr_event.disclosure.docs.all():
-            related_docs.update(alias.docs.all())
-        for doc in related_docs:
-            kwargs = dict(
-                type=event_type_map[ipr_event.type_id],
-                time=ipr_event.time,
-                by=ipr_event.by,
-                doc=doc,
-                rev='',
-                desc='%s related IPR disclosure: <b>%s</b>' % (ipr_event.type.name,
-                                                               ipr_event.disclosure.title),
-            )
-            events = DocEvent.objects.filter(**kwargs)  # get existing events
-            if delete:
-                events.delete()
-            elif len(events) == 0:
-                DocEvent.objects.create(**kwargs)  # create if did not exist
-
-def forward(apps, schema_editor):
-    """Create a DocEvent for each 'posted' or 'removed' IprEvent"""
-    create_or_delete_ipr_doc_events(apps, delete=False)
-
-def reverse(apps, schema_editor):
-    """Delete DocEvents that would be created by the forward migration
-    
-    This removes data, but only data that can be regenerated by running
-    the forward migration.
-    """
-    create_or_delete_ipr_doc_events(apps, delete=True)
-    
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ipr', '0006_document_primary_key_cleanup'),
-        # Ensure the DocEvent types we need exist
-        ('doc', '0029_add_ipr_event_types'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/ipr/migrations/0008_auto_20201109_0439.py b/ietf/ipr/migrations/0008_auto_20201109_0439.py
deleted file mode 100644
index d8140031c4..0000000000
--- a/ietf/ipr/migrations/0008_auto_20201109_0439.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('ipr', '0007_create_ipr_doc_events'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='iprdisclosurebase',
-            index=models.Index(fields=['-time', '-id'], name='ipr_iprdisc_time_846a78_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='iprevent',
-            index=models.Index(fields=['-time', '-id'], name='ipr_ipreven_time_9630c4_idx'),
-        ),
-    ]
diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py
index 282f335684..ea148c2704 100644
--- a/ietf/ipr/models.py
+++ b/ietf/ipr/models.py
@@ -1,14 +1,14 @@
-# Copyright The IETF Trust 2007-2020, All Rights Reserved
+# Copyright The IETF Trust 2007-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-import datetime
-
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse
+from django.utils import timezone
 
-from ietf.doc.models import DocAlias, DocEvent
+from ietf.doc.models import Document, DocEvent
 from ietf.name.models import DocRelationshipName,IprDisclosureStateName,IprLicenseTypeName,IprEventTypeName
 from ietf.person.models import Person
 from ietf.message.models import Message
@@ -17,11 +17,11 @@
 class IprDisclosureBase(models.Model):
     by                  = ForeignKey(Person) # who was logged in, or System if nobody was logged in
     compliant           = models.BooleanField("Complies to RFC3979", default=True)
-    docs                = models.ManyToManyField(DocAlias, through='IprDocRel')
+    docs                = models.ManyToManyField(Document, through='ipr.IprDocRel')
     holder_legal_name   = models.CharField(max_length=255)
     notes               = models.TextField("Additional notes", blank=True)
     other_designations  = models.CharField("Designations for other contributions", blank=True, max_length=255)
-    rel                 = models.ManyToManyField('self', through='RelatedIpr', symmetrical=False)
+    rel                 = models.ManyToManyField('self', through='ipr.RelatedIpr', symmetrical=False)
     state               = ForeignKey(IprDisclosureStateName)
     submitter_name      = models.CharField(max_length=255,blank=True)
     submitter_email     = models.EmailField(blank=True)
@@ -125,17 +125,30 @@ def is_thirdparty(self):
 
 
 class HolderIprDisclosure(IprDisclosureBase):
-    ietfer_name              = models.CharField(max_length=255, blank=True) # "Whose Personal Belief Triggered..."
-    ietfer_contact_email     = models.EmailField(blank=True)
-    ietfer_contact_info      = models.TextField(blank=True)
-    patent_info              = models.TextField()
-    has_patent_pending       = models.BooleanField(default=False)
-    holder_contact_email     = models.EmailField()
-    holder_contact_name      = models.CharField(max_length=255)
-    holder_contact_info      = models.TextField(blank=True, help_text="Address, phone, etc.")
-    licensing                = ForeignKey(IprLicenseTypeName)
-    licensing_comments       = models.TextField(blank=True)
+    ietfer_name = models.CharField(
+        max_length=255, blank=True
+    )  # "Whose Personal Belief Triggered..."
+    ietfer_contact_email = models.EmailField(blank=True)
+    ietfer_contact_info = models.TextField(blank=True)
+    patent_info = models.TextField()
+    has_patent_pending = models.BooleanField(default=False)
+    holder_contact_email = models.EmailField()
+    holder_contact_name = models.CharField(max_length=255)
+    holder_contact_info = models.TextField(blank=True, help_text="Address, phone, etc.")
+    licensing = ForeignKey(IprLicenseTypeName)
+    licensing_comments = models.TextField(blank=True)
     submitter_claims_all_terms_disclosed = models.BooleanField(default=False)
+    is_blanket_disclosure = models.BooleanField(default=False)
+    
+    def clean(self):
+        if self.is_blanket_disclosure:
+            # If the IprLicenseTypeName does not exist, we have a serious problem and a 500 response is ok,
+            # so not handling failure of the `get()`
+            royalty_free_licensing = IprLicenseTypeName.objects.get(slug="royalty-free")
+            if self.licensing_id != royalty_free_licensing.pk:
+                raise ValidationError(
+                    f'Must select "{royalty_free_licensing.desc}" for a blanket IPR disclosure.')
+
 
 class ThirdPartyIprDisclosure(IprDisclosureBase):
     ietfer_name              = models.CharField(max_length=255) # "Whose Personal Belief Triggered..."
@@ -161,9 +174,10 @@ class GenericIprDisclosure(IprDisclosureBase):
 
 class IprDocRel(models.Model):
     disclosure = ForeignKey(IprDisclosureBase)
-    document   = ForeignKey(DocAlias)
+    document   = ForeignKey(Document)
     sections   = models.TextField(blank=True)
     revisions  = models.CharField(max_length=16,blank=True) # allows strings like 01-07
+    originaldocumentaliasname = models.CharField(max_length=255, null=True, blank=True)
 
     def doc_type(self):
         name = self.document.name
@@ -176,7 +190,7 @@ def doc_type(self):
 
     def formatted_name(self):
         name = self.document.name
-        if name.startswith("rfc"):
+        if len(name) >= 3 and name[:3] in ("rfc", "bcp", "fyi", "std"):
             return name.upper()
         #elif self.revisions:
         #    return "%s-%s" % (name, self.revisions)
@@ -220,7 +234,7 @@ def response_past_due(self):
         """Returns true if it's beyond the response_due date and no response has been
         received"""
         qs = IprEvent.objects.filter(disclosure=self.disclosure,in_reply_to=self.message)
-        if not qs and datetime.datetime.now().date() > self.response_due.date():
+        if not qs and timezone.now().date() > self.response_due.date():
             return True
         else:
             return False
@@ -232,12 +246,10 @@ def create_doc_events(self):
         event_type_map = {
             'posted': 'posted_related_ipr',
             'removed': 'removed_related_ipr',
+            'removed_objfalse': 'removed_objfalse_related_ipr',
         }
         if self.type_id in event_type_map:
-            related_docs = set()  # related docs, no duplicates
-            for alias in self.disclosure.docs.all():
-                related_docs.update(alias.docs.all())
-            for doc in related_docs:
+            for doc in self.disclosure.docs.distinct():
                 DocEvent.objects.create(
                     type=event_type_map[self.type_id],
                     time=self.time,
@@ -258,3 +270,7 @@ class LegacyMigrationIprEvent(IprEvent):
     """A subclass of IprEvent specifically for capturing contents of legacy_url_0,
     the text of a disclosure submitted by email"""
     pass
+
+class RemovedIprDisclosure(models.Model):
+    removed_id = models.PositiveBigIntegerField(unique=True)
+    reason = models.TextField()
diff --git a/ietf/ipr/resources.py b/ietf/ipr/resources.py
index 665b0ab02f..c4d2c436e6 100644
--- a/ietf/ipr/resources.py
+++ b/ietf/ipr/resources.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2015-2019, All Rights Reserved
+# Copyright The IETF Trust 2015-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2015-03-21 14:05 PDT
 
@@ -11,16 +11,16 @@
 
 from ietf import api
 
-from ietf.ipr.models import ( IprDisclosureBase, IprDocRel, HolderIprDisclosure, ThirdPartyIprDisclosure,
+from ietf.ipr.models import ( IprDisclosureBase, IprDocRel, HolderIprDisclosure, RemovedIprDisclosure, ThirdPartyIprDisclosure,
     RelatedIpr, NonDocSpecificIprDisclosure, GenericIprDisclosure, IprEvent, LegacyMigrationIprEvent )
 
 from ietf.person.resources import PersonResource
 from ietf.name.resources import IprDisclosureStateNameResource
-from ietf.doc.resources import DocAliasResource
+from ietf.doc.resources import DocumentResource
 class IprDisclosureBaseResource(ModelResource):
     by               = ToOneField(PersonResource, 'by')
     state            = ToOneField(IprDisclosureStateNameResource, 'state')
-    docs             = ToManyField(DocAliasResource, 'docs', null=True)
+    docs             = ToManyField(DocumentResource, 'docs', null=True)
     rel              = ToManyField('ietf.ipr.resources.IprDisclosureBaseResource', 'rel', null=True)
     class Meta:
         queryset = IprDisclosureBase.objects.all()
@@ -45,10 +45,9 @@ class Meta:
         }
 api.ipr.register(IprDisclosureBaseResource())
 
-from ietf.doc.resources import DocAliasResource
 class IprDocRelResource(ModelResource):
     disclosure       = ToOneField(IprDisclosureBaseResource, 'disclosure')
-    document         = ToOneField(DocAliasResource, 'document')
+    document         = ToOneField(DocumentResource, 'document')
     class Meta:
         cache = SimpleCache()
         queryset = IprDocRel.objects.all()
@@ -66,13 +65,12 @@ class Meta:
 
 from ietf.person.resources import PersonResource
 from ietf.name.resources import IprDisclosureStateNameResource, IprLicenseTypeNameResource
-from ietf.doc.resources import DocAliasResource
 class HolderIprDisclosureResource(ModelResource):
     by               = ToOneField(PersonResource, 'by')
     state            = ToOneField(IprDisclosureStateNameResource, 'state')
     iprdisclosurebase_ptr = ToOneField(IprDisclosureBaseResource, 'iprdisclosurebase_ptr')
     licensing        = ToOneField(IprLicenseTypeNameResource, 'licensing')
-    docs             = ToManyField(DocAliasResource, 'docs', null=True)
+    docs             = ToManyField(DocumentResource, 'docs', null=True)
     rel              = ToManyField(IprDisclosureBaseResource, 'rel', null=True)
     class Meta:
         cache = SimpleCache()
@@ -111,12 +109,11 @@ class Meta:
 
 from ietf.person.resources import PersonResource
 from ietf.name.resources import IprDisclosureStateNameResource
-from ietf.doc.resources import DocAliasResource
 class ThirdPartyIprDisclosureResource(ModelResource):
     by               = ToOneField(PersonResource, 'by')
     state            = ToOneField(IprDisclosureStateNameResource, 'state')
     iprdisclosurebase_ptr = ToOneField(IprDisclosureBaseResource, 'iprdisclosurebase_ptr')
-    docs             = ToManyField(DocAliasResource, 'docs', null=True)
+    docs             = ToManyField(DocumentResource, 'docs', null=True)
     rel              = ToManyField(IprDisclosureBaseResource, 'rel', null=True)
     class Meta:
         cache = SimpleCache()
@@ -168,12 +165,11 @@ class Meta:
 
 from ietf.person.resources import PersonResource
 from ietf.name.resources import IprDisclosureStateNameResource
-from ietf.doc.resources import DocAliasResource
 class NonDocSpecificIprDisclosureResource(ModelResource):
     by               = ToOneField(PersonResource, 'by')
     state            = ToOneField(IprDisclosureStateNameResource, 'state')
     iprdisclosurebase_ptr = ToOneField(IprDisclosureBaseResource, 'iprdisclosurebase_ptr')
-    docs             = ToManyField(DocAliasResource, 'docs', null=True)
+    docs             = ToManyField(DocumentResource, 'docs', null=True)
     rel              = ToManyField(IprDisclosureBaseResource, 'rel', null=True)
     class Meta:
         cache = SimpleCache()
@@ -207,12 +203,11 @@ class Meta:
 
 from ietf.person.resources import PersonResource
 from ietf.name.resources import IprDisclosureStateNameResource
-from ietf.doc.resources import DocAliasResource
 class GenericIprDisclosureResource(ModelResource):
     by               = ToOneField(PersonResource, 'by')
     state            = ToOneField(IprDisclosureStateNameResource, 'state')
     iprdisclosurebase_ptr = ToOneField(IprDisclosureBaseResource, 'iprdisclosurebase_ptr')
-    docs             = ToManyField(DocAliasResource, 'docs', null=True)
+    docs             = ToManyField(DocumentResource, 'docs', null=True)
     rel              = ToManyField(IprDisclosureBaseResource, 'rel', null=True)
     class Meta:
         cache = SimpleCache()
@@ -300,3 +295,18 @@ class Meta:
         }
 api.ipr.register(LegacyMigrationIprEventResource())
 
+
+
+class RemovedIprDisclosureResource(ModelResource):
+    class Meta:
+        queryset = RemovedIprDisclosure.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'removediprdisclosure'
+        ordering = ['id', ]
+        filtering = { 
+            "id": ALL,
+            "removed_id": ALL,
+            "reason": ALL,
+        }
+api.ipr.register(RemovedIprDisclosureResource())
diff --git a/ietf/ipr/sitemaps.py b/ietf/ipr/sitemaps.py
index 0b6ce42829..543272e8f1 100644
--- a/ietf/ipr/sitemaps.py
+++ b/ietf/ipr/sitemaps.py
@@ -1,11 +1,12 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2007-2023, All Rights Reserved
 #
+from django.conf import settings
 from django.contrib.sitemaps import GenericSitemap
 from ietf.ipr.models import IprDisclosureBase
 
 # changefreq is "never except when it gets updated or withdrawn"
 # so skip giving one
 
-queryset = IprDisclosureBase.objects.filter(state__in=('posted','removed'))
+queryset = IprDisclosureBase.objects.filter(state__in=settings.PUBLISH_IPR_STATES)
 archive = {'queryset':queryset, 'date_field': 'time', 'allow_empty':True }
 IPRMap = GenericSitemap(archive)        # type: ignore
diff --git a/ietf/ipr/templatetags/ipr_filters.py b/ietf/ipr/templatetags/ipr_filters.py
index 21d5579bf9..8b3b420c41 100644
--- a/ietf/ipr/templatetags/ipr_filters.py
+++ b/ietf/ipr/templatetags/ipr_filters.py
@@ -1,10 +1,14 @@
-# Copyright The IETF Trust 2014-2020, All Rights Reserved
+# Copyright The IETF Trust 2014-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
+import debug    # pyflakes: ignore
+
 from django import template
 from django.utils.html import format_html
 
+from ietf.doc.models import NewRevisionDocEvent
+
 register = template.Library()
 
 
@@ -26,3 +30,37 @@ def render_message_for_history(msg):
 @register.filter
 def to_class_name(value):
     return value.__class__.__name__
+
+def draft_rev_at_time(iprdocrel):
+    draft = iprdocrel.document
+    event = iprdocrel.disclosure.get_latest_event_posted()
+    if event is None:
+        return ("","The Internet-Draft's revision at the time this disclosure was posted could not be determined.")
+    time = event.time
+    if not NewRevisionDocEvent.objects.filter(doc=draft).exists():
+        return ("","The Internet-Draft's revision at the time this disclosure was posted could not be determined.")
+    rev_event_before = NewRevisionDocEvent.objects.filter(doc=draft, time__lte=time).order_by('-time').first()
+    if rev_event_before is None:
+        return ("","The Internet-Draft's initial submission was after this disclosure was posted.")
+    else:
+        return(rev_event_before.rev, "")
+
+@register.filter
+def no_revisions_message(iprdocrel):
+    draft = iprdocrel.document
+    if draft.type_id != "draft" or iprdocrel.revisions.strip() != "":
+        return ""
+    rev_at_time, exception = draft_rev_at_time(iprdocrel)
+    current_rev = draft.rev
+
+    first_line = "No revisions for this Internet-Draft were specified in this disclosure."
+    contact_line = "Contact the discloser or patent holder if there are questions about which revisions this disclosure pertains to."
+
+    if current_rev == "00":
+        return f"{first_line} However, there is only one revision of this Internet-Draft."
+
+    if rev_at_time:
+        return f"{first_line} The Internet-Draft's revision was {rev_at_time} at the time this disclosure was posted. {contact_line}"
+    else:
+        return f"{first_line} {exception} {contact_line}"
+    
diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
index db9c1371e4..53a599e2de 100644
--- a/ietf/ipr/tests.py
+++ b/ietf/ipr/tests.py
@@ -1,32 +1,58 @@
-# Copyright The IETF Trust 2009-2020, All Rights Reserved
+# Copyright The IETF Trust 2009-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
-
+import json
+from unittest import mock
+import re
 
 from pyquery import PyQuery
 from urllib.parse import quote, urlparse
+from zoneinfo import ZoneInfo
 
-from django.urls import reverse as urlreverse
 from django.conf import settings
+from django.test.utils import override_settings
+from django.urls import reverse as urlreverse
+from django.utils import timezone
+
+from django.db.models import Max
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import DocAlias
-from ietf.doc.factories import DocumentFactory, WgDraftFactory, WgRfcFactory
+from ietf.api.views import EmailIngestionError
+from ietf.doc.factories import (
+    DocumentFactory,
+    WgDraftFactory,
+    WgRfcFactory,
+    RfcFactory,
+    NewRevisionDocEventFactory
+)
+from ietf.doc.utils import prettify_std_name
 from ietf.group.factories import RoleFactory
-from ietf.ipr.factories import HolderIprDisclosureFactory, GenericIprDisclosureFactory, IprEventFactory
+from ietf.ipr.factories import (
+    HolderIprDisclosureFactory,
+    GenericIprDisclosureFactory,
+    IprDisclosureBaseFactory,
+    IprDocRelFactory,
+    IprEventFactory,
+    ThirdPartyIprDisclosureFactory
+)
+from ietf.ipr.forms import DraftForm, HolderIprDisclosureForm
 from ietf.ipr.mail import (process_response_email, get_reply_to, get_update_submitter_emails,
-    get_pseudo_submitter, get_holders, get_update_cc_addrs)
-from ietf.ipr.models import (IprDisclosureBase,GenericIprDisclosure,HolderIprDisclosure,
-    ThirdPartyIprDisclosure)
-from ietf.ipr.utils import get_genitive, get_ipr_summary
+                           get_pseudo_submitter, get_holders, get_update_cc_addrs, UndeliverableIprResponseError)
+from ietf.ipr.models import (IprDisclosureBase, GenericIprDisclosure, HolderIprDisclosure, RemovedIprDisclosure,
+                             ThirdPartyIprDisclosure, IprEvent)
+from ietf.ipr.templatetags.ipr_filters import no_revisions_message
+from ietf.ipr.utils import get_genitive, get_ipr_summary, ingest_response_email
 from ietf.mailtrigger.utils import gather_address_lists
+from ietf.message.factories import MessageFactory
 from ietf.message.models import Message
+from ietf.person.factories import PersonFactory
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.text import text_to_dict
+from ietf.utils.timezone import date_today
 
 
 def make_data_from_content(content):
@@ -83,9 +109,46 @@ def test_get_update_submitter_emails(self):
         self.assertTrue(messages[0].startswith('To: %s' % ipr.submitter_email))
         
     def test_showlist(self):
+        for disc_factory_type in (HolderIprDisclosureFactory, GenericIprDisclosureFactory, ThirdPartyIprDisclosureFactory):
+            ipr = disc_factory_type(state_id="removed")
+            r = self.client.get(urlreverse("ietf.ipr.views.showlist"))
+            self.assertContains(r, ipr.title)
+            self.assertContains(r, "removed at the request of the submitter")
+            self.assertNotContains(r, "removed as objectively false")
+            ipr.state_id="posted"
+            ipr.save()
+            r = self.client.get(urlreverse("ietf.ipr.views.showlist"))
+            self.assertContains(r, ipr.title)
+            self.assertNotContains(r, "removed at the request of the submitter")
+            self.assertNotContains(r, "removed as objectively false")
+            ipr.state_id="removed_objfalse"
+            ipr.save()
+            r = self.client.get(urlreverse("ietf.ipr.views.showlist"))
+            self.assertContains(r, ipr.title)
+            self.assertNotContains(r, "removed at the request of the submitter")
+            self.assertContains(r, "removed as objectively false")
+            ipr.delete()
+
+    def test_show_delete(self):
         ipr = HolderIprDisclosureFactory()
-        r = self.client.get(urlreverse("ietf.ipr.views.showlist"))
-        self.assertContains(r, ipr.title)
+        removed = RemovedIprDisclosure.objects.create(
+            removed_id=ipr.pk, reason="Removed for reasons"
+        )
+        url = urlreverse("ietf.ipr.views.show", kwargs=dict(id=removed.removed_id))
+        r = self.client.get(url)
+        self.assertContains(r, "Removed for reasons")
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("#deletion_warning")), 0)
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url)
+        self.assertContains(r, "Removed for reasons")
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("#deletion_warning")), 1)
+        ipr.delete()
+        r = self.client.get(url)
+        self.assertContains(r, "Removed for reasons")
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("#deletion_warning")), 0)
 
     def test_show_posted(self):
         ipr = HolderIprDisclosureFactory()
@@ -112,17 +175,16 @@ def test_show_removed(self):
         r = self.client.get(urlreverse("ietf.ipr.views.show", kwargs=dict(id=ipr.pk)))
         self.assertContains(r, 'This IPR disclosure was removed')
         
+    def test_show_removed_objfalse(self):
+        ipr = HolderIprDisclosureFactory(state_id='removed_objfalse')
+        r = self.client.get(urlreverse("ietf.ipr.views.show", kwargs=dict(id=ipr.pk)))
+        self.assertContains(r, 'This IPR disclosure was removed as objectively false')
+        
     def test_ipr_history(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get(urlreverse("ietf.ipr.views.history", kwargs=dict(id=ipr.pk)))
         self.assertContains(r, ipr.title)
 
-    def test_iprs_for_drafts(self):
-        draft=WgDraftFactory()
-        ipr = HolderIprDisclosureFactory(docs=[draft,])
-        r = self.client.get(urlreverse("ietf.ipr.views.by_draft_txt"))
-        self.assertContains(r, draft.name)
-        self.assertContains(r, str(ipr.pk))
 
     def test_about(self):
         r = self.client.get(urlreverse("ietf.ipr.views.about"))
@@ -131,7 +193,7 @@ def test_about(self):
     def test_search(self):
         WgDraftFactory() # The test matching the prefix "draft" needs more than one thing to find
         draft = WgDraftFactory()
-        ipr = HolderIprDisclosureFactory(docs=[draft,],patent_info='Number: US12345\nTitle: A method of transfering bits\nInventor: A. Nonymous\nDate: 2000-01-01')
+        ipr = HolderIprDisclosureFactory(docs=[draft,],patent_info='Number: US12345\nTitle: A method of transferring bits\nInventor: A. Nonymous\nDate: 2000-01-01')
 
         url = urlreverse("ietf.ipr.views.search")
 
@@ -144,21 +206,56 @@ def test_search(self):
         r = self.client.get(url + "?submit=draft&id=%s" % draft.name)
         self.assertContains(r, ipr.title)
 
+        # find by id, mixed case letters
+        r = self.client.get(url + "?submit=draft&id=%s" % draft.name.swapcase())
+        self.assertContains(r, ipr.title)
+
         # find draft
         r = self.client.get(url + "?submit=draft&draft=%s" % draft.name)
         self.assertContains(r, ipr.title)
 
+        # find draft, mixed case letters
+        r = self.client.get(url + "?submit=draft&draft=%s" % draft.name.swapcase())
+        self.assertContains(r, ipr.title)
+
         # search + select document
         r = self.client.get(url + "?submit=draft&draft=draft")
         self.assertContains(r, draft.name)
         self.assertNotContains(r, ipr.title)
 
-        DocAlias.objects.create(name="rfc321").docs.add(draft)
+        rfc = RfcFactory(rfc_number=321)
+        draft.relateddocument_set.create(relationship_id="became_rfc",target=rfc)
 
         # find RFC
         r = self.client.get(url + "?submit=rfc&rfc=321")
         self.assertContains(r, ipr.title)
 
+        rfc_new = RfcFactory(rfc_number=322)
+        rfc_new.relateddocument_set.create(relationship_id="obs", target=rfc)
+
+        # find RFC 322 which obsoletes RFC 321 whose draft has IPR
+        r = self.client.get(url + "?submit=rfc&rfc=322")
+        self.assertContains(r, ipr.title)
+        self.assertContains(r, "Total number of IPR disclosures found: <b>1</b>")
+        self.assertContains(r, "Total number of documents searched: <b>3</b>.")
+        self.assertContains(
+            r,
+            f'Results for <a href="/doc/{rfc_new.name}/">{prettify_std_name(rfc_new.name)}</a> ("{rfc_new.title}")',
+            html=True,
+        )
+        self.assertContains(
+            r,
+            f'Results for <a href="/doc/{rfc.name}/">{prettify_std_name(rfc.name)}</a> ("{rfc.title}"), '
+            f'which was obsoleted by <a href="/doc/{rfc_new.name}/">{prettify_std_name(rfc_new.name)}</a> ("{rfc_new.title}")',
+            html=True,
+        )
+        self.assertContains(
+            r,
+            f'Results for <a href="/doc/{draft.name}/">{prettify_std_name(draft.name)}</a> ("{draft.title}"), '
+            f'which became rfc <a href="/doc/{rfc.name}/">{prettify_std_name(rfc.name)}</a> ("{rfc.title}")',
+            html=True,
+        )
+
         # find by patent owner
         r = self.client.get(url + "?submit=holder&holder=%s" % ipr.holder_legal_name)
         self.assertContains(r, ipr.title)
@@ -182,6 +279,24 @@ def test_search(self):
         r = self.client.get(url + "?submit=iprtitle&iprtitle=%s" % quote(ipr.title))
         self.assertContains(r, ipr.title)
 
+    def test_search_null_characters(self):
+        """IPR search gracefully rejects null characters in parameters"""
+        # Not a combinatorially exhaustive set, but tries to exercise all the parameters
+        bad_params = [
+            "option=document_search&document_search=draft-\x00stuff"
+            "submit=dra\x00ft",
+            "submit=draft&id=some\x00id",
+            "submit=draft&id_document_tag=some\x00id",
+            "submit=draft&id=someid&state=re\x00moved",
+            "submit=draft&id=someid&state=posted&state=re\x00moved",
+            "submit=draft&id=someid&state=removed&draft=draft-no\x00tvalid",
+            "submit=rfc&rfc=rfc\x00123",
+        ]
+        url = urlreverse("ietf.ipr.views.search")
+        for query_params in bad_params:
+            r = self.client.get(f"{url}?{query_params}")
+            self.assertEqual(r.status_code, 400, f"querystring '{query_params}' should be rejected")
+        
     def test_feed(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get("/feed/ipr/")
@@ -194,16 +309,16 @@ def test_sitemap(self):
 
     def test_new_generic(self):
         """Ensure new-generic redirects to new-general"""
-        url = urlreverse("ietf.ipr.views.new", kwargs={ "type": "generic" })
+        url = urlreverse("ietf.ipr.views.new", kwargs={ "_type": "generic" })
         r = self.client.get(url)
         self.assertEqual(r.status_code,302)
-        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.ipr.views.new", kwargs={ "type": "general"}))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.ipr.views.new", kwargs={ "_type": "general"}))
 
 
     def test_new_general(self):
         """Add a new general disclosure.  Note: submitter does not need to be logged in.
         """
-        url = urlreverse("ietf.ipr.views.new", kwargs={ "type": "general" })
+        url = urlreverse("ietf.ipr.views.new", kwargs={ "_type": "general" })
 
         # invalid post
         r = self.client.post(url, {
@@ -240,8 +355,8 @@ def test_new_specific(self):
         """Add a new specific disclosure.  Note: submitter does not need to be logged in.
         """
         draft = WgDraftFactory()
-        WgRfcFactory()
-        url = urlreverse("ietf.ipr.views.new", kwargs={ "type": "specific" })
+        rfc = WgRfcFactory()
+        url = urlreverse("ietf.ipr.views.new", kwargs={ "_type": "specific" })
 
         # successful post
         empty_outbox()
@@ -254,12 +369,12 @@ def test_new_specific(self):
             "ietfer_contact_info": "555-555-0101",
             "iprdocrel_set-TOTAL_FORMS": 2,
             "iprdocrel_set-INITIAL_FORMS": 0,
-            "iprdocrel_set-0-document": draft.docalias.first().pk,
+            "iprdocrel_set-0-document": draft.pk,
             "iprdocrel_set-0-revisions": '00',
-            "iprdocrel_set-1-document": DocAlias.objects.filter(name__startswith="rfc").first().pk,
+            "iprdocrel_set-1-document": rfc.pk,
             "patent_number": "SE12345678901",
             "patent_inventor": "A. Nonymous",
-            "patent_title": "A method of transfering bits",
+            "patent_title": "A method of transferring bits",
             "patent_date": "2000-01-01",
             "has_patent_pending": False,
             "licensing": "royalty-free",
@@ -274,7 +389,7 @@ def test_new_specific(self):
         ipr = iprs[0]
         self.assertEqual(ipr.holder_legal_name, "Test Legal")
         self.assertEqual(ipr.state.slug, 'pending')
-        for item in ['SE12345678901','A method of transfering bits','2000-01-01']:
+        for item in ['SE12345678901','A method of transferring bits','2000-01-01']:
             self.assertIn(item, ipr.get_child().patent_info)
         self.assertTrue(isinstance(ipr.get_child(),HolderIprDisclosure))
         self.assertEqual(len(outbox),1)
@@ -294,12 +409,44 @@ def test_new_specific(self):
             r = self.client.post(url, data)
             self.assertContains(r, "Your IPR disclosure has been submitted", msg_prefix="Checked patent number: %s" % patent_number)
 
+    def test_new_specific_no_revision(self):
+        draft = WgDraftFactory()
+        rfc = WgRfcFactory()
+        url = urlreverse("ietf.ipr.views.new", kwargs={ "_type": "specific" })
+
+        # successful post
+        empty_outbox()
+        data = {
+            "holder_legal_name": "Test Legal",
+            "holder_contact_name": "Test Holder",
+            "holder_contact_email": "test@holder.com",
+            "holder_contact_info": "555-555-0100",
+            "ietfer_name": "Test Participant",
+            "ietfer_contact_info": "555-555-0101",
+            "iprdocrel_set-TOTAL_FORMS": 2,
+            "iprdocrel_set-INITIAL_FORMS": 0,
+            "iprdocrel_set-0-document": draft.pk,
+            "iprdocrel_set-1-document": rfc.pk,
+            "patent_number": "SE12345678901",
+            "patent_inventor": "A. Nonymous",
+            "patent_title": "A method of transferring bits",
+            "patent_date": "2000-01-01",
+            "has_patent_pending": False,
+            "licensing": "royalty-free",
+            "submitter_name": "Test Holder",
+            "submitter_email": "test@holder.com",
+        }
+        r = self.client.post(url, data)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(q("#id_iprdocrel_set-0-revisions").hasClass("is-invalid"))
+
     def test_new_thirdparty(self):
         """Add a new third-party disclosure.  Note: submitter does not need to be logged in.
         """
         draft = WgDraftFactory()
-        WgRfcFactory()
-        url = urlreverse("ietf.ipr.views.new", kwargs={ "type": "third-party" })
+        rfc = WgRfcFactory()
+        url = urlreverse("ietf.ipr.views.new", kwargs={ "_type": "third-party" })
 
         # successful post
         empty_outbox()
@@ -310,12 +457,12 @@ def test_new_thirdparty(self):
             "ietfer_contact_info": "555-555-0101",
             "iprdocrel_set-TOTAL_FORMS": 2,
             "iprdocrel_set-INITIAL_FORMS": 0,
-            "iprdocrel_set-0-document": draft.docalias.first().pk,
+            "iprdocrel_set-0-document": draft.pk,
             "iprdocrel_set-0-revisions": '00',
-            "iprdocrel_set-1-document": DocAlias.objects.filter(name__startswith="rfc").first().pk,
+            "iprdocrel_set-1-document": rfc.pk,
             "patent_number": "SE12345678901",
             "patent_inventor": "A. Nonymous",
-            "patent_title": "A method of transfering bits",
+            "patent_title": "A method of transferring bits",
             "patent_date": "2000-01-01",
             "has_patent_pending": False,
             "licensing": "royalty-free",
@@ -329,7 +476,7 @@ def test_new_thirdparty(self):
         ipr = iprs[0]
         self.assertEqual(ipr.holder_legal_name, "Test Legal")
         self.assertEqual(ipr.state.slug, "pending")
-        for item in ['SE12345678901','A method of transfering bits','2000-01-01' ]:
+        for item in ['SE12345678901','A method of transferring bits','2000-01-01' ]:
             self.assertIn(item, ipr.get_child().patent_info)
         self.assertTrue(isinstance(ipr.get_child(),ThirdPartyIprDisclosure))
         self.assertEqual(len(outbox),1)
@@ -346,7 +493,7 @@ def test_edit(self):
         r = self.client.get(url)
         self.assertContains(r, original_ipr.holder_legal_name)
 
-        #url = urlreverse("ietf.ipr.views.new", kwargs={ "type": "specific" })
+        #url = urlreverse("ietf.ipr.views.new", kwargs={ "_type": "specific" })
         # successful post
         empty_outbox()
         post_data = {
@@ -357,7 +504,7 @@ def test_edit(self):
             "holder_legal_name": "Test Legal",
             "ietfer_contact_info": "555-555-0101",
             "ietfer_name": "Test Participant",
-            "iprdocrel_set-0-document": draft.docalias.first().pk,
+            "iprdocrel_set-0-document": draft.pk,
             "iprdocrel_set-0-revisions": '00',
             "iprdocrel_set-INITIAL_FORMS": 0,
             "iprdocrel_set-TOTAL_FORMS": 1,
@@ -365,7 +512,7 @@ def test_edit(self):
             "patent_date": "2000-01-01",
             "patent_inventor": "A. Nonymous",
             "patent_number": "SE12345678901",
-            "patent_title": "A method of transfering bits",
+            "patent_title": "A method of transferring bits",
             "submitter_email": "test@holder.com",
             "submitter_name": "Test Holder",
             "updates": [],
@@ -385,7 +532,7 @@ def test_edit(self):
 
     def test_update(self):
         draft = WgDraftFactory()
-        WgRfcFactory()
+        rfc = WgRfcFactory()
         original_ipr = HolderIprDisclosureFactory(docs=[draft,])
 
         # get
@@ -393,7 +540,7 @@ def test_update(self):
         r = self.client.get(url)
         self.assertContains(r, original_ipr.title)
 
-        #url = urlreverse("ietf.ipr.views.new", kwargs={ "type": "specific" })
+        #url = urlreverse("ietf.ipr.views.new", kwargs={ "_type": "specific" })
         # successful post
         empty_outbox()
         r = self.client.post(url, {
@@ -406,12 +553,12 @@ def test_update(self):
             "ietfer_contact_info": "555-555-0101",
             "iprdocrel_set-TOTAL_FORMS": 2,
             "iprdocrel_set-INITIAL_FORMS": 0,
-            "iprdocrel_set-0-document": draft.docalias.first().pk,
+            "iprdocrel_set-0-document": draft.pk,
             "iprdocrel_set-0-revisions": '00',
-            "iprdocrel_set-1-document": DocAlias.objects.filter(name__startswith="rfc").first().pk,
+            "iprdocrel_set-1-document": rfc.pk,
             "patent_number": "SE12345678901",
             "patent_inventor": "A. Nonymous",
-            "patent_title": "A method of transfering bits",
+            "patent_title": "A method of transferring bits",
             "patent_date": "2000-01-01",
             "has_patent_pending": False,
             "licensing": "royalty-free",
@@ -433,7 +580,7 @@ def test_update(self):
 
     def test_update_bad_post(self):
         draft = WgDraftFactory()
-        url = urlreverse("ietf.ipr.views.new", kwargs={ "type": "specific" })
+        url = urlreverse("ietf.ipr.views.new", kwargs={ "_type": "specific" })
 
         empty_outbox()
         r = self.client.post(url, {
@@ -443,11 +590,11 @@ def test_update_bad_post(self):
             "holder_contact_email": "test@holder.com",
             "iprdocrel_set-TOTAL_FORMS": 1,
             "iprdocrel_set-INITIAL_FORMS": 0,
-            "iprdocrel_set-0-document": draft.docalias.first().pk,
+            "iprdocrel_set-0-document": draft.pk,
             "iprdocrel_set-0-revisions": '00',
             "patent_number": "SE12345678901",
             "patent_inventor": "A. Nonymous",
-            "patent_title": "A method of transfering bits",
+            "patent_title": "A method of transferring bits",
             "patent_date": "2000-01-01",
             "has_patent_pending": False,
             "licensing": "royalty-free",
@@ -522,7 +669,7 @@ def test_admin_removed(self):
         self.client.login(username="secretary", password="secretary+password")
         
         # test for presence of pending ipr
-        num = IprDisclosureBase.objects.filter(state__in=('removed','rejected')).count()
+        num = IprDisclosureBase.objects.filter(state__in=('removed','removed_objfalse','rejected')).count()
         
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
@@ -572,12 +719,15 @@ def test_notify(self):
         self.assertEqual(r.status_code,302)
         self.assertEqual(len(outbox),len_before+2)
         self.assertTrue('george@acme.com' in outbox[len_before]['To'])
-        self.assertIn('posted on '+datetime.date.today().strftime("%Y-%m-%d"), get_payload_text(outbox[len_before]).replace('\n',' '))
+        self.assertIn('posted on '+date_today().strftime("%Y-%m-%d"), get_payload_text(outbox[len_before]).replace('\n',' '))
         self.assertTrue('draft-ietf-mars-test@ietf.org' in outbox[len_before+1]['To'])
         self.assertTrue('mars-wg@ietf.org' in outbox[len_before+1]['Cc'])
-        self.assertIn('Secretariat on '+ipr.get_latest_event_submitted().time.strftime("%Y-%m-%d"), get_payload_text(outbox[len_before+1]).replace('\n',' '))
+        self.assertIn(
+            'Secretariat on ' + ipr.get_latest_event_submitted().time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime("%Y-%m-%d"),
+            get_payload_text(outbox[len_before + 1]).replace('\n', ' ')
+        )
         self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.showlist")}', get_payload_text(outbox[len_before]).replace('\n',' '))
-        self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.history",kwargs=dict(id=ipr.pk))}', get_payload_text(outbox[len_before+1]).replace('\n',' '))
+        self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.show",kwargs=dict(id=ipr.pk))}', get_payload_text(outbox[len_before+1]).replace('\n',' '))
 
     def test_notify_generic(self):
         RoleFactory(name_id='ad',group__acronym='gen')
@@ -593,14 +743,17 @@ def test_notify_generic(self):
         r = self.client.post(url, data )
         self.assertEqual(r.status_code,302)
         self.assertEqual(len(outbox),2)
-        self.assertIn('Secretariat on '+ipr.get_latest_event_submitted().time.strftime("%Y-%m-%d"), get_payload_text(outbox[1]).replace('\n',' '))
+        self.assertIn(
+            'Secretariat on ' + ipr.get_latest_event_submitted().time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime("%Y-%m-%d"),
+            get_payload_text(outbox[1]).replace('\n',' '),
+        )
         self.assertIn(f'{settings.IDTRACKER_BASE_URL}{urlreverse("ietf.ipr.views.showlist")}', get_payload_text(outbox[1]).replace('\n',' '))
 
-    def send_ipr_email_helper(self):
-        ipr = HolderIprDisclosureFactory()
+    def send_ipr_email_helper(self) -> tuple[str, IprEvent, HolderIprDisclosure]:
+        ipr = HolderIprDisclosureFactory.create()  # call create() explicitly so mypy sees correct type
         url = urlreverse('ietf.ipr.views.email',kwargs={ "id": ipr.id })
         self.client.login(username="secretary", password="secretary+password")
-        yesterday = datetime.date.today() - datetime.timedelta(1)
+        yesterday = date_today() - datetime.timedelta(1)
         data = dict(
             to='joe@test.com',
             frm='ietf-ipr@ietf.org',
@@ -614,10 +767,11 @@ def send_ipr_email_helper(self):
         q = Message.objects.filter(reply_to=data['reply_to'])
         self.assertEqual(q.count(),1)
         event = q[0].msgevents.first()
+        assert event is not None
         self.assertTrue(event.response_past_due())
         self.assertEqual(len(outbox), 1)
         self.assertTrue('joe@test.com' in outbox[0]['To'])
-        return data['reply_to'], event
+        return data['reply_to'], event, ipr
 
     uninteresting_ipr_message_strings = [
         ("To: {to}\nCc: {cc}\nFrom: joe@test.com\nDate: {date}\nSubject: test\n"),
@@ -631,43 +785,55 @@ def send_ipr_email_helper(self):
 
     def test_process_response_email(self):
         # first send a mail
-        reply_to, event = self.send_ipr_email_helper()
+        reply_to, event, _ = self.send_ipr_email_helper()
 
         # test process response uninteresting messages
         addrs = gather_address_lists('ipr_disclosure_submitted').as_strings()
         for message_string in self.uninteresting_ipr_message_strings:
-            result = process_response_email(
+            process_response_email(
                 message_string.format(
                     to=addrs.to,
                     cc=addrs.cc,
-                    date=datetime.datetime.now().ctime()
+                    date=timezone.now().ctime()
                 )
             )
-            self.assertIsNone(result)
-        
+
         # test process response
         message_string = """To: {}
 From: joe@test.com
 Date: {}
 Subject: test
-""".format(reply_to, datetime.datetime.now().ctime())
-        result = process_response_email(message_string)
-
-        self.assertIsInstance(result, Message)
+""".format(reply_to, timezone.now().ctime())
+        process_response_email(message_string)
         self.assertFalse(event.response_past_due())
 
+        # test with an unmatchable message identifier
+        bad_reply_to = re.sub(
+            r"\+.{16}@",
+            '+0123456789abcdef@',
+            reply_to,
+        )
+        self.assertNotEqual(reply_to, bad_reply_to)
+        message_string = f"""To: {bad_reply_to}
+        From: joe@test.com
+        Date: {timezone.now().ctime()}
+        Subject: test
+        """
+        with self.assertRaises(UndeliverableIprResponseError):
+            process_response_email(message_string)
+
     def test_process_response_email_with_invalid_encoding(self):
         """Interesting emails with invalid encoding should be handled"""
-        reply_to, _ = self.send_ipr_email_helper()
+        reply_to, _, disclosure = self.send_ipr_email_helper()
         # test process response
         message_string = """To: {}
 From: joe@test.com
 Date: {}
 Subject: test
-""".format(reply_to, datetime.datetime.now().ctime())
+""".format(reply_to, timezone.now().ctime())
         message_bytes = message_string.encode('utf8') + b'\nInvalid stuff: \xfe\xff\n'
-        result = process_response_email(message_bytes)
-        self.assertIsInstance(result, Message)
+        process_response_email(message_bytes)
+        result = IprEvent.objects.filter(disclosure=disclosure).first().message  # newest
         # \ufffd is a rhombus character with an inverse ?, used to replace invalid characters
         self.assertEqual(result.body, 'Invalid stuff: \ufffd\ufffd\n\n',  # not sure where the extra \n is from
                          'Invalid characters should be replaced with \ufffd characters')
@@ -680,10 +846,47 @@ def test_process_response_email_uninteresting_with_invalid_encoding(self):
             message_bytes = message_string.format(
                                 to=addrs.to,
                                 cc=addrs.cc,
-                                date=datetime.datetime.now().ctime(),
+                                date=timezone.now().ctime(),
             ).encode('utf8') + b'\nInvalid stuff: \xfe\xff\n'
-            result = process_response_email(message_bytes)
-            self.assertIsNone(result)
+            process_response_email(message_bytes)
+
+    @override_settings(ADMINS=(("Some Admin", "admin@example.com"),))
+    @mock.patch("ietf.ipr.utils.process_response_email")
+    def test_ingest_response_email(self, mock_process_response_email):
+        message = b"What a nice message"
+        mock_process_response_email.side_effect = ValueError("ouch!")
+        with self.assertRaises(EmailIngestionError) as context:
+            ingest_response_email(message)
+        self.assertIsNone(context.exception.email_recipients)  # default recipients
+        self.assertIsNotNone(context.exception.email_body)  # body set
+        self.assertIsNotNone(context.exception.email_original_message)  # original message attached
+        self.assertEqual(context.exception.email_attach_traceback, True)
+        self.assertTrue(mock_process_response_email.called)
+        self.assertEqual(mock_process_response_email.call_args, mock.call(message))
+        mock_process_response_email.reset_mock()
+        
+        mock_process_response_email.side_effect = UndeliverableIprResponseError
+        mock_process_response_email.return_value = None
+        with self.assertRaises(EmailIngestionError) as context:
+            ingest_response_email(message)
+        self.assertIsNone(context.exception.as_emailmessage())  # should not send an email on a clean rejection
+        self.assertTrue(mock_process_response_email.called)
+        self.assertEqual(mock_process_response_email.call_args, mock.call(message))
+        mock_process_response_email.reset_mock()
+
+        mock_process_response_email.side_effect = None
+        mock_process_response_email.return_value = None  # ignored message
+        ingest_response_email(message)  # should not raise an exception
+        self.assertIsNone(context.exception.as_emailmessage())  # should not send an email on ignored message
+        self.assertTrue(mock_process_response_email.called)
+        self.assertEqual(mock_process_response_email.call_args, mock.call(message))
+        mock_process_response_email.reset_mock()
+
+        # successful operation
+        mock_process_response_email.return_value = MessageFactory()
+        ingest_response_email(message)
+        self.assertTrue(mock_process_response_email.called)
+        self.assertEqual(mock_process_response_email.call_args, mock.call(message))
 
     def test_ajax_search(self):
         url = urlreverse('ietf.ipr.views.ajax_search')
@@ -701,9 +904,9 @@ def test_edit_using_factory(self):
         post_data = {
             'iprdocrel_set-TOTAL_FORMS' : 1,
             'iprdocrel_set-INITIAL_FORMS' : 0,
-            'iprdocrel_set-0-id': disclosure.pk,
+            'iprdocrel_set-0-id': '',
             "iprdocrel_set-0-document": disclosure.docs.first().pk,
-            "iprdocrel_set-0-revisions": disclosure.docs.first().document.rev,
+            "iprdocrel_set-0-revisions": disclosure.docs.first().rev,
             'holder_legal_name': disclosure.holder_legal_name,
             'patent_number': patent_dict['Number'],
             'patent_title': patent_dict['Title'],
@@ -725,18 +928,28 @@ def test_docevent_creation(self):
                          'New Document already has a "posted_related_ipr" DocEvent')
         self.assertEqual(0, doc.docevent_set.filter(type='removed_related_ipr').count(),
                          'New Document already has a "removed_related_ipr" DocEvent')
+        self.assertEqual(0, doc.docevent_set.filter(type='removed_objfalse_related_ipr').count(),
+                         'New Document already has a "removed_objfalse_related_ipr" DocEvent')
         # A 'posted' IprEvent must create a corresponding DocEvent  
         IprEventFactory(type_id='posted', disclosure=ipr)
         self.assertEqual(1, doc.docevent_set.filter(type='posted_related_ipr').count(),
                          'Creating "posted" IprEvent did not create a "posted_related_ipr" DocEvent')
         self.assertEqual(0, doc.docevent_set.filter(type='removed_related_ipr').count(),
                          'Creating "posted" IprEvent created a "removed_related_ipr" DocEvent')
+        self.assertEqual(0, doc.docevent_set.filter(type='removed_objfalse_related_ipr').count(),
+                         'Creating "posted" IprEvent created a "removed_objfalse_related_ipr" DocEvent')
         # A 'removed' IprEvent must create a corresponding DocEvent
         IprEventFactory(type_id='removed', disclosure=ipr)
         self.assertEqual(1, doc.docevent_set.filter(type='posted_related_ipr').count(),
                          'Creating "removed" IprEvent created a "posted_related_ipr" DocEvent')
         self.assertEqual(1, doc.docevent_set.filter(type='removed_related_ipr').count(),
                          'Creating "removed" IprEvent did not create a "removed_related_ipr" DocEvent')
+        # A 'removed_objfalse' IprEvent must create a corresponding DocEvent
+        IprEventFactory(type_id='removed_objfalse', disclosure=ipr)
+        self.assertEqual(1, doc.docevent_set.filter(type='posted_related_ipr').count(),
+                         'Creating "removed_objfalse" IprEvent created a "posted_related_ipr" DocEvent')
+        self.assertEqual(1, doc.docevent_set.filter(type='removed_objfalse_related_ipr').count(),
+                         'Creating "removed_objfalse" IprEvent did not create a "removed_objfalse_related_ipr" DocEvent')
         # The DocEvent descriptions must refer to the IprEvents
         posted_docevent = doc.docevent_set.filter(type='posted_related_ipr').first()
         self.assertIn(ipr.title, posted_docevent.desc, 
@@ -744,4 +957,236 @@ def test_docevent_creation(self):
         removed_docevent = doc.docevent_set.filter(type='removed_related_ipr').first()
         self.assertIn(ipr.title, removed_docevent.desc,
                       'IprDisclosure title does not appear in DocEvent desc when removed')
-        
\ No newline at end of file
+        removed_objfalse_docevent = doc.docevent_set.filter(type='removed_objfalse_related_ipr').first()
+        self.assertIn(ipr.title, removed_objfalse_docevent.desc,
+                      'IprDisclosure title does not appear in DocEvent desc when removed as objectively false')
+
+    def test_no_revisions_message(self):
+        draft = WgDraftFactory(rev="02")
+        now = timezone.now()
+        for rev in range(0,3):
+            NewRevisionDocEventFactory(doc=draft, rev=f"{rev:02d}", time=now-datetime.timedelta(days=30*(2-rev)))
+        
+        # Disclosure has non-empty revisions field on its related draft
+        iprdocrel = IprDocRelFactory(document=draft)
+        IprEventFactory(type_id="posted",time=now,disclosure=iprdocrel.disclosure)
+        self.assertEqual(
+            no_revisions_message(iprdocrel),
+            ""
+        )
+
+        # Disclosure has more than one revision, none called out, disclosure after submissions
+        iprdocrel = IprDocRelFactory(document=draft, revisions="")
+        IprEventFactory(type_id="posted",time=now,disclosure=iprdocrel.disclosure)
+        self.assertEqual(
+            no_revisions_message(iprdocrel),
+            "No revisions for this Internet-Draft were specified in this disclosure. The Internet-Draft's revision was 02 at the time this disclosure was posted. Contact the discloser or patent holder if there are questions about which revisions this disclosure pertains to."
+        )
+
+        # Disclosure has more than one revision, none called out, disclosure after 01
+        iprdocrel = IprDocRelFactory(document=draft, revisions="")
+        e = IprEventFactory(type_id="posted",disclosure=iprdocrel.disclosure)
+        e.time = now-datetime.timedelta(days=15)
+        e.save()
+        self.assertEqual(
+            no_revisions_message(iprdocrel),
+            "No revisions for this Internet-Draft were specified in this disclosure. The Internet-Draft's revision was 01 at the time this disclosure was posted. Contact the discloser or patent holder if there are questions about which revisions this disclosure pertains to."
+        )
+
+        # Disclosure has more than one revision, none called out, disclosure was before the 00
+        iprdocrel = IprDocRelFactory(document=draft, revisions="")
+        e = IprEventFactory(type_id="posted",disclosure=iprdocrel.disclosure)
+        e.time = now-datetime.timedelta(days=180)
+        e.save()
+        self.assertEqual(
+            no_revisions_message(iprdocrel),
+            "No revisions for this Internet-Draft were specified in this disclosure. The Internet-Draft's initial submission was after this disclosure was posted. Contact the discloser or patent holder if there are questions about which revisions this disclosure pertains to."
+        )
+
+        # disclosed draft has no NewRevisionDocEvents
+        draft = WgDraftFactory(rev="20")
+        draft.docevent_set.all().delete()
+        iprdocrel = IprDocRelFactory(document=draft, revisions="")
+        IprEventFactory(type_id="posted",disclosure=iprdocrel.disclosure)
+        self.assertEqual(
+            no_revisions_message(iprdocrel),
+            "No revisions for this Internet-Draft were specified in this disclosure. The Internet-Draft's revision at the time this disclosure was posted could not be determined. Contact the discloser or patent holder if there are questions about which revisions this disclosure pertains to."
+        )
+
+        # disclosed draft has only one revision
+        draft = WgDraftFactory(rev="00")
+        iprdocrel = IprDocRelFactory(document=draft, revisions="")
+        IprEventFactory(type_id="posted",disclosure=iprdocrel.disclosure)
+        self.assertEqual(
+            no_revisions_message(iprdocrel),
+            "No revisions for this Internet-Draft were specified in this disclosure. However, there is only one revision of this Internet-Draft."
+        )
+
+
+class DraftFormTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.disclosure = IprDisclosureBaseFactory()
+        self.draft = WgDraftFactory.create_batch(10)[-1]
+        self.rfc = RfcFactory()
+
+    def test_revisions_valid(self):
+        post_data = {
+            # n.b., "document" is a SearchableDocumentField, which is a multiple choice field limited
+            # to a single choice. Its value must be an array of pks with one element.
+            "document": [str(self.draft.pk)],
+            "disclosure": str(self.disclosure.pk),
+        }
+        # The revisions field is just a char field that allows descriptions of the applicable
+        # document revisions. It's usually just a rev or "00-02", but the form allows anything
+        # not empty. The secretariat will review the value before the disclosure is posted so
+        # minimal validation is ok here.
+        self.assertTrue(DraftForm(post_data | {"revisions": "00"}).is_valid())
+        self.assertTrue(DraftForm(post_data | {"revisions": "00-02"}).is_valid())
+        self.assertTrue(DraftForm(post_data | {"revisions": "01,03, 05"}).is_valid())
+        self.assertTrue(DraftForm(post_data | {"revisions": "all but 01"}).is_valid())
+        # RFC instead of draft - allow empty / missing revisions
+        post_data["document"] = [str(self.rfc.pk)]
+        self.assertTrue(DraftForm(post_data).is_valid())
+        self.assertTrue(DraftForm(post_data | {"revisions": ""}).is_valid())
+
+    def test_revisions_invalid(self):
+        missing_rev_error_msg = (
+            "Revisions of this Internet-Draft for which this disclosure is relevant must be specified."
+        )
+        null_char_error_msg = "Null characters are not allowed."
+        
+        post_data = {
+            # n.b., "document" is a SearchableDocumentField, which is a multiple choice field limited
+            # to a single choice. Its value must be an array of pks with one element.
+            "document": [str(self.draft.pk)],
+            "disclosure": str(self.disclosure.pk),
+        }
+        self.assertFormError(
+            DraftForm(post_data), "revisions", missing_rev_error_msg
+        )
+        self.assertFormError(
+            DraftForm(post_data | {"revisions": ""}), "revisions", missing_rev_error_msg
+        )
+        self.assertFormError(
+            DraftForm(post_data | {"revisions": "1\x00"}),
+            "revisions",
+            [null_char_error_msg, missing_rev_error_msg],
+        )
+        # RFC instead of draft still validates the revisions field
+        self.assertFormError(
+            DraftForm(post_data | {"document": [str(self.rfc.pk)], "revisions": "1\x00"}),
+            "revisions",
+            null_char_error_msg,
+        )
+
+
+class HolderIprDisclosureFormTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        # Checkboxes that are False are left out of the Form data, not sent back at all. These are
+        # commented out - if they were checked, their value would be "on".
+        self.data = {
+            "holder_legal_name": "Test Legal",
+            "holder_contact_name": "Test Holder",
+            "holder_contact_email": "test@holder.com",
+            "holder_contact_info": "555-555-0100",
+            "ietfer_name": "Test Participant",
+            "ietfer_contact_info": "555-555-0101",
+            "iprdocrel_set-TOTAL_FORMS": 2,
+            "iprdocrel_set-INITIAL_FORMS": 0,
+            "iprdocrel_set-0-document": "1234",  # fake id - validates but won't save()
+            "iprdocrel_set-0-revisions": '00',
+            "iprdocrel_set-1-document": "4567",  # fake id - validates but won't save()
+            # "is_blanket_disclosure": "on", 
+            "patent_number": "SE12345678901",
+            "patent_inventor": "A. Nonymous",
+            "patent_title": "A method of transferring bits",
+            "patent_date": "2000-01-01",
+            # "has_patent_pending": "on",
+            "licensing": "reasonable",
+            "submitter_name": "Test Holder",
+            "submitter_email": "test@holder.com",
+        }
+        
+    def test_blanket_disclosure_licensing_restrictions(self):
+        """when is_blanket_disclosure is True only royalty-free licensing is valid
+        
+        Most of the form functionality is tested via the views in IprTests above. More thorough testing
+        of validation ought to move here so we don't have to exercise the whole Django plumbing repeatedly.
+        """       
+        self.assertTrue(HolderIprDisclosureForm(data=self.data).is_valid())       
+        self.data["is_blanket_disclosure"] = "on"
+        self.assertFalse(HolderIprDisclosureForm(data=self.data).is_valid())       
+        self.data["licensing"] = "royalty-free"
+        self.assertTrue(HolderIprDisclosureForm(data=self.data).is_valid())       
+
+    def test_patent_details_required_unless_blanket(self):
+        self.assertTrue(HolderIprDisclosureForm(data=self.data).is_valid())
+        patent_fields = ["patent_number", "patent_inventor", "patent_title", "patent_date"]
+        # any of the fields being missing should invalidate the form
+        for pf in patent_fields:
+            val = self.data.pop(pf)
+            self.assertFalse(HolderIprDisclosureForm(data=self.data).is_valid())
+            self.data[pf] = val
+
+        # should be optional if is_blanket_disclosure is True
+        self.data["is_blanket_disclosure"] = "on"
+        self.data["licensing"] = "royalty-free"  # also needed for a blanket disclosure
+        for pf in patent_fields:
+            val = self.data.pop(pf)
+            self.assertTrue(HolderIprDisclosureForm(data=self.data).is_valid())
+            self.data[pf] = val
+
+class JsonSnapshotTests(TestCase):
+    def test_json_snapshot(self):
+        h = HolderIprDisclosureFactory()
+        url = urlreverse("ietf.ipr.views.json_snapshot", kwargs=dict(id=h.id))
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        dump = json.loads(r.content)
+        self.assertCountEqual(
+            [o["model"] for o in dump],
+            ["ipr.holderiprdisclosure", "ipr.iprdisclosurebase", "person.person"],
+        )
+        h.docs.add(WgRfcFactory())
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        dump = json.loads(r.content)
+        self.assertCountEqual(
+            [o["model"] for o in dump],
+            [
+                "ipr.holderiprdisclosure",
+                "ipr.iprdisclosurebase",
+                "ipr.iprdocrel",
+                "person.person",
+            ],
+        )
+        IprEventFactory(
+            disclosure=h,
+            message=MessageFactory(by=PersonFactory()),
+            in_reply_to=MessageFactory(),
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        dump = json.loads(r.content)
+        self.assertCountEqual(
+            [o["model"] for o in dump],
+            [
+                "ipr.holderiprdisclosure",
+                "ipr.iprdisclosurebase",
+                "ipr.iprdocrel",
+                "ipr.iprevent",
+                "message.message",
+                "message.message",
+                "person.person",
+                "person.person",
+                "person.person",
+                "person.person",
+            ],
+        )
+        no_such_ipr_id = IprDisclosureBase.objects.aggregate(Max("id"))["id__max"] + 1
+        url = urlreverse("ietf.ipr.views.json_snapshot", kwargs=dict(id=no_such_ipr_id))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
diff --git a/ietf/ipr/urls.py b/ietf/ipr/urls.py
index 6f7b2d4080..2c8a26c624 100644
--- a/ietf/ipr/urls.py
+++ b/ietf/ipr/urls.py
@@ -12,8 +12,6 @@
     url(r'^admin/$', RedirectView.as_view(url=reverse_lazy('ietf.ipr.views.admin',kwargs={'state':'pending'}), permanent=True)),
     url(r'^admin/(?P<state>pending|removed|parked)/$', views.admin),
     url(r'^ajax/search/$', views.ajax_search),
-    url(r'^by-draft/$', views.by_draft_txt),
-    url(r'^by-draft-recursive/$', views.by_draft_recursive_txt),
     url(r'^(?P<id>\d+)/$', views.show),
     url(r'^(?P<id>\d+)/addcomment/$', views.add_comment),
     url(r'^(?P<id>\d+)/addemail/$', views.add_email),
@@ -23,8 +21,9 @@
     url(r'^(?P<id>\d+)/notify/(?P<type>update|posted)/$', views.notify),
     url(r'^(?P<id>\d+)/post/$', views.post),
     url(r'^(?P<id>\d+)/state/$', views.state),
+    url(r'^(?P<id>\d+)/json-snapshot/$', views.json_snapshot),
     url(r'^update/$', RedirectView.as_view(url=reverse_lazy('ietf.ipr.views.showlist'), permanent=True)),
     url(r'^update/(?P<id>\d+)/$', views.update),
-    url(r'^new-(?P<type>(specific|generic|general|third-party))/$', views.new),
+    url(r'^new-(?P<_type>(specific|generic|general|third-party))/$', views.new),
     url(r'^search/$', views.search),
 ]
diff --git a/ietf/ipr/utils.py b/ietf/ipr/utils.py
index 43f5494b1c..bcbb052260 100644
--- a/ietf/ipr/utils.py
+++ b/ietf/ipr/utils.py
@@ -1,9 +1,16 @@
-# Copyright The IETF Trust 2014-2020, All Rights Reserved
+# Copyright The IETF Trust 2014-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-from ietf.ipr.models import IprDocRel
+import json
+import debug # pyflakes:ignore
+
+from textwrap import dedent
+
+from django.core import serializers
 
-import debug                            # pyflakes:ignore
+from ietf.ipr.mail import process_response_email, UndeliverableIprResponseError
+
+from ietf.ipr.models import IprDocRel
 
 def get_genitive(name):
     """Return the genitive form of name"""
@@ -32,60 +39,69 @@ def get_ipr_summary(disclosure):
     return summary if len(summary) <= 128 else summary[:125]+'...'
 
 
-def iprs_from_docs(aliases,**kwargs):
-    """Returns a list of IPRs related to doc aliases"""
+def iprs_from_docs(docs,**kwargs):
+    """Returns a list of IPRs related to docs"""
     iprdocrels = []
-    for alias in aliases:
-        for document in alias.docs.all():
-            if document.ipr(**kwargs):
-                iprdocrels += document.ipr(**kwargs)
+    for document in docs:
+        if document.ipr(**kwargs):
+            iprdocrels += document.ipr(**kwargs)
     return list(set([i.disclosure for i in iprdocrels]))
     
-def related_docs(alias, relationship=('replaces', 'obs')):
+def related_docs(doc, relationship=('replaces', 'obs'), reverse_relationship=("became_rfc",)):
     """Returns list of related documents"""
 
-    results = []
-    for doc in alias.docs.all():
-        results += list(doc.docalias.all())
-    
-    rels = []
-    for doc in alias.docs.all():
-        rels += list(doc.all_relations_that_doc(relationship))
-
-    for rel in rels:
-        rel_aliases = list(rel.target.document.docalias.all())
-        
-        for x in rel_aliases:
-            x.related = rel
-            x.relation = rel.relationship.revname
-        results += rel_aliases
-
-    return list(set(results))
+    results = [doc]
 
+    rels = doc.all_relations_that_doc(relationship)
 
-def generate_draft_recursive_txt():
-    docipr = {}
+    for rel in rels:
+        rel.target.related = rel
+        rel.target.relation = rel.relationship.revname
+    results += [x.target for x in rels]
 
-    for o in IprDocRel.objects.filter(disclosure__state='posted').select_related('document'):
-        alias = o.document
-        name = alias.name
-        for document in alias.docs.all():
-            related = set(document.docalias.all()) | set(document.all_related_that_doc(('obs', 'replaces')))
-            for alias in related:
-                name = alias.name
-                if name.startswith("rfc"):
-                    name = name.upper()
-                if not name in docipr:
-                    docipr[name] = []
-                docipr[name].append(o.disclosure_id)
+    rev_rels = doc.all_relations_that(reverse_relationship)
+    for rel in rev_rels:
+        rel.source.related = rel
+        rel.source.relation = rel.relationship.name
+    results += [x.source for x in rev_rels]
 
-    lines = [ "# Machine-readable list of IPR disclosures by draft name" ]
-    for name, iprs in docipr.items():
-        lines.append(name + "\t" + "\t".join(str(ipr_id) for ipr_id in sorted(iprs)))
+    return list(set(results))
 
-    data = '\n'.join(lines)
-    filename = '/a/ietfdata/derived/ipr_draft_recursive.txt'
-    with open(filename, 'w') as f:
-        f.write(data)
 
     
+def ingest_response_email(message: bytes):
+    from ietf.api.views import EmailIngestionError  # avoid circular import
+    try:
+        process_response_email(message)
+    except UndeliverableIprResponseError:
+        # Message was rejected due to some problem the sender can fix, so bounce but don't send
+        # an email to the admins
+        raise EmailIngestionError("IPR response rejected", email_body=None)
+    except Exception as err:
+        # Message was rejected due to an unhandled exception. This is likely something
+        # the admins need to address, so send them a copy of the email.
+        raise EmailIngestionError(
+            "Datatracker IPR email ingestion error",
+            email_body=dedent("""\
+                An error occurred while ingesting IPR email into the Datatracker. The original message is attached.
+                
+                {error_summary}
+                """),
+            email_original_message=message,
+            email_attach_traceback=True,
+        ) from err
+
+def json_dump_disclosure(disclosure):
+    objs = set()
+    objs.add(disclosure)
+    objs.add(disclosure.iprdisclosurebase_ptr)
+    objs.add(disclosure.by)
+    objs.update(IprDocRel.objects.filter(disclosure=disclosure))
+    objs.update(disclosure.iprevent_set.all())
+    objs.update([i.by for i in disclosure.iprevent_set.all()])
+    objs.update([i.message for i in disclosure.iprevent_set.all() if i.message ])
+    objs.update([i.message.by for i in disclosure.iprevent_set.all() if i.message ])
+    objs.update([i.in_reply_to for i in disclosure.iprevent_set.all() if i.in_reply_to ])
+    objs.update([i.in_reply_to.by for i in disclosure.iprevent_set.all() if i.in_reply_to ])
+    objs = sorted(list(objs),key=lambda o:o.__class__.__name__)
+    return json.dumps(json.loads(serializers.serialize("json",objs)),indent=4)
diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py
index 163a858cc7..0a43ff2c27 100644
--- a/ietf/ipr/views.py
+++ b/ietf/ipr/views.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007-2022, All Rights Reserved
+# Copyright The IETF Trust 2007-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -10,7 +10,7 @@
 from django.db.models import Q
 from django.forms.models import inlineformset_factory, model_to_dict
 from django.forms.formsets import formset_factory
-from django.http import HttpResponse, Http404, HttpResponseRedirect
+from django.http import HttpResponse, Http404, HttpResponseRedirect, HttpResponseBadRequest
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.loader import render_to_string
 from django.urls import reverse as urlreverse
@@ -18,7 +18,7 @@
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import DocAlias
+from ietf.doc.models import Document
 from ietf.group.models import Role, Group
 from ietf.ietfauth.utils import role_required, has_role
 from ietf.ipr.mail import (message_from_message, get_reply_to, get_update_submitter_emails)
@@ -28,21 +28,22 @@
     AddCommentForm, AddEmailForm, NotifyForm, StateForm, NonDocSpecificIprDisclosureForm,
     GenericIprDisclosureForm)
 from ietf.ipr.models import (IprDisclosureStateName, IprDisclosureBase,
-    HolderIprDisclosure, GenericIprDisclosure, ThirdPartyIprDisclosure,
+    HolderIprDisclosure, GenericIprDisclosure, RemovedIprDisclosure, ThirdPartyIprDisclosure,
     NonDocSpecificIprDisclosure, IprDocRel,
     RelatedIpr,IprEvent)
 from ietf.ipr.utils import (get_genitive, get_ipr_summary,
-    iprs_from_docs, related_docs)
+    iprs_from_docs, json_dump_disclosure, related_docs)
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.message.models import Message
 from ietf.message.utils import infer_message
 from ietf.name.models import IprLicenseTypeName
 from ietf.person.models import Person
-from ietf.secr.utils.document import get_rfc_num, is_draft
+from ietf.utils import log
 from ietf.utils.draft_search import normalize_draftname
 from ietf.utils.mail import send_mail, send_mail_message
 from ietf.utils.response import permission_denied
 from ietf.utils.text import text_to_dict
+from ietf.utils.timezone import datetime_from_date, datetime_today, DEADLINE_TZINFO
 
 # ----------------------------------------------------------------
 # Globals
@@ -68,16 +69,20 @@ def get_document_emails(ipr):
     has been posted"""
     messages = []
     for rel in ipr.iprdocrel_set.all():
-        doc = rel.document.document
+        doc = rel.document
 
-        if is_draft(doc):
+        if doc.type_id=="draft":
             doc_info = 'Internet-Draft entitled "{}" ({})'.format(doc.title,doc.name)
+        elif doc.type_id=="rfc":
+            doc_info = 'RFC entitled "{}" (RFC{})'.format(doc.title, doc.rfc_number)
         else:
-            doc_info = 'RFC entitled "{}" (RFC{})'.format(doc.title,get_rfc_num(doc))
+            log.unreachable("2023-08-15")
+            return ""
 
         addrs = gather_address_lists('ipr_posted_on_doc',doc=doc).as_strings(compact=False)
 
-        author_names = ', '.join(a.person.name for a in doc.documentauthor_set.select_related("person"))
+        # Get a list of author names for the salutation in the body of the email
+        author_names = ', '.join(doc.author_names())
     
         context = dict(
             settings=settings,
@@ -147,15 +152,14 @@ def ipr_rfc_number(disclosureDate, thirdPartyDisclosureFlag):
     # made on 1993-07-23, which is more than a year after RFC 1310.
 
     # RFC publication date comes from the RFC Editor announcement
-    # TODO: These times are tzinfo=pytz.utc, but disclosure times are offset-naive
     ipr_rfc_pub_datetime = {
-        1310 : datetime.datetime(1992,  3, 13,  0,  0),
-        1802 : datetime.datetime(1994,  3, 23,  0,  0),
-        2026 : datetime.datetime(1996, 10, 29,  0,  0),
-        3668 : datetime.datetime(2004,  2, 18,  0,  0),
-        3979 : datetime.datetime(2005,  3,  2,  2, 23),
-        4879 : datetime.datetime(2007,  4, 10, 18, 21),
-        8179 : datetime.datetime(2017,  5, 31, 23,  1),
+        1310 : datetime.datetime(1992,  3, 13,  0,  0, tzinfo=datetime.UTC),
+        1802 : datetime.datetime(1994,  3, 23,  0,  0, tzinfo=datetime.UTC),
+        2026 : datetime.datetime(1996, 10, 29,  0,  0, tzinfo=datetime.UTC),
+        3668 : datetime.datetime(2004,  2, 18,  0,  0, tzinfo=datetime.UTC),
+        3979 : datetime.datetime(2005,  3,  2,  2, 23, tzinfo=datetime.UTC),
+        4879 : datetime.datetime(2007,  4, 10, 18, 21, tzinfo=datetime.UTC),
+        8179 : datetime.datetime(2017,  5, 31, 23,  1, tzinfo=datetime.UTC),
     }
 
     if disclosureDate < ipr_rfc_pub_datetime[1310]:
@@ -269,7 +273,7 @@ def add_email(request, id):
 @role_required('Secretariat',)
 def admin(request, state):
     """Administrative disclosure listing.  For non-posted disclosures"""
-    states = IprDisclosureStateName.objects.filter(slug__in=[state, "rejected"] if state == "removed" else [state])
+    states = IprDisclosureStateName.objects.filter(slug__in=[state, "rejected", "removed_objfalse"] if state == "removed" else [state])
     if not states:
         raise Http404
 
@@ -296,7 +300,7 @@ def edit(request, id, updates=None):
     ipr = get_object_or_404(IprDisclosureBase, id=id).get_child()
     type = class_to_type[ipr.__class__.__name__]
     
-    DraftFormset = inlineformset_factory(IprDisclosureBase, IprDocRel, form=DraftForm, can_delete=True, extra=1)
+    DraftFormset = inlineformset_factory(IprDisclosureBase, IprDocRel, form=DraftForm, can_delete=True, extra=0)
 
     if request.method == 'POST':
         form = ipr_form_mapping[ipr.__class__.__name__](request.POST,instance=ipr)
@@ -316,7 +320,7 @@ def edit(request, id, updates=None):
         else:
             valid_formsets = True
 
-        if form.is_valid() and valid_formsets: 
+        if form.is_valid() and valid_formsets:
             updates = form.cleaned_data.get('updates')
             disclosure = form.save(commit=False)
             disclosure.save()
@@ -396,7 +400,7 @@ def email(request, id):
                 type_id = 'msgout',
                 by = request.user.person,
                 disclosure = ipr,
-                response_due = form.cleaned_data['response_due'],
+                response_due = datetime_from_date(form.cleaned_data['response_due'], DEADLINE_TZINFO),
                 message = msg,
             )
 
@@ -442,58 +446,35 @@ def history(request, id):
         'selected_tab_entry':'history'
     })
 
-def by_draft_txt(request):
-    docipr = {}
-
-    for o in IprDocRel.objects.filter(disclosure__state='posted').select_related('document'):
-        name = o.document.name
-        if name.startswith("rfc"):
-            name = name.upper()
-
-        if not name in docipr:
-            docipr[name] = []
-
-        docipr[name].append(o.disclosure_id)
-
-    lines = [ "# Machine-readable list of IPR disclosures by draft name" ]
-    for name, iprs in docipr.items():
-        lines.append(name + "\t" + "\t".join(str(ipr_id) for ipr_id in sorted(iprs)))
 
-    return HttpResponse("\n".join(lines), content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
-
-def by_draft_recursive_txt(request):
-    """Returns machine-readable list of IPR disclosures by draft name, recursive.
-    NOTE: this view is expensive and should be removed _after_ tools.ietf.org is retired,
-    including util function and management commands that generate the content for
-    this view."""
-
-    with open('/a/ietfdata/derived/ipr_draft_recursive.txt') as f:
-        content = f.read()
-    return HttpResponse(content, content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
-
-
-def new(request, type, updates=None):
+def new(request, _type, updates=None):
     """Submit a new IPR Disclosure.  If the updates field != None, this disclosure
     updates one or more other disclosures."""
     # Note that URL patterns won't ever send updates - updates is only non-null when called from code
 
     # This odd construct flipping generic and general allows the URLs to say 'general' while having a minimal impact on the code.
     # A cleanup to change the code to switch on type 'general' should follow.
-    if type == 'generic' and updates: # Only happens when called directly from the updates view
+    if (
+        _type == "generic" and updates
+    ):  # Only happens when called directly from the updates view
         pass
-    elif type == 'generic':
-        return HttpResponseRedirect(urlreverse('ietf.ipr.views.new',kwargs=dict(type='general')))
-    elif type == 'general':
-        type = 'generic'
+    elif _type == "generic":
+        return HttpResponseRedirect(
+            urlreverse("ietf.ipr.views.new", kwargs=dict(_type="general"))
+        )
+    elif _type == "general":
+        _type = "generic"
     else:
         pass
 
     # 1 to show initially + the template
-    DraftFormset = inlineformset_factory(IprDisclosureBase, IprDocRel, form=DraftForm, can_delete=False, extra=1 + 1)
+    DraftFormset = inlineformset_factory(
+        IprDisclosureBase, IprDocRel, form=DraftForm, can_delete=False, extra=1 + 1
+    )
 
-    if request.method == 'POST':
-        form = ipr_form_mapping[type](request.POST)
-        if type != 'generic':
+    if request.method == "POST":
+        form = ipr_form_mapping[_type](request.POST)
+        if _type != "generic":
             draft_formset = DraftFormset(request.POST, instance=IprDisclosureBase())
         else:
             draft_formset = None
@@ -502,72 +483,92 @@ def new(request, type, updates=None):
             person = Person.objects.get(name="(System)")
         else:
             person = request.user.person
-            
+
         # check formset validity
-        if type != 'generic':
+        if _type != "generic":
             valid_formsets = draft_formset.is_valid()
         else:
             valid_formsets = True
-            
+
         if form.is_valid() and valid_formsets:
-            if 'updates' in form.cleaned_data:
-                updates = form.cleaned_data['updates']
-                del form.cleaned_data['updates']
+            if "updates" in form.cleaned_data:
+                updates = form.cleaned_data["updates"]
+                del form.cleaned_data["updates"]
             disclosure = form.save(commit=False)
             disclosure.by = person
-            disclosure.state = IprDisclosureStateName.objects.get(slug='pending')
+            disclosure.state = IprDisclosureStateName.objects.get(slug="pending")
             disclosure.save()
-            
-            if type != 'generic':
+
+            if _type != "generic":
                 draft_formset = DraftFormset(request.POST, instance=disclosure)
                 draft_formset.save()
 
             set_disclosure_title(disclosure)
             disclosure.save()
-            
+
             if updates:
                 for ipr in updates:
-                    RelatedIpr.objects.create(source=disclosure,target=ipr,relationship_id='updates')
-                
+                    RelatedIpr.objects.create(
+                        source=disclosure, target=ipr, relationship_id="updates"
+                    )
+
             # create IprEvent
             IprEvent.objects.create(
-                type_id='submitted',
+                type_id="submitted",
                 by=person,
                 disclosure=disclosure,
-                desc="Disclosure Submitted")
+                desc="Disclosure Submitted",
+            )
 
             # send email notification
-            (to, cc) = gather_address_lists('ipr_disclosure_submitted')
-            send_mail(request, to, ('IPR Submitter App', 'ietf-ipr@ietf.org'),
-                'New IPR Submission Notification',
+            (to, cc) = gather_address_lists("ipr_disclosure_submitted")
+            send_mail(
+                request,
+                to,
+                ("IPR Submitter App", "ietf-ipr@ietf.org"),
+                "New IPR Submission Notification",
                 "ipr/new_update_email.txt",
-                {"ipr": disclosure,},
-                cc=cc)
-            
+                {
+                    "ipr": disclosure,
+                },
+                cc=cc,
+            )
+
             return render(request, "ipr/submitted.html")
 
     else:
         if updates:
             original = IprDisclosureBase(id=updates).get_child()
             initial = model_to_dict(original)
-            initial.update({'updates':str(updates), })
-            patent_info = text_to_dict(initial.get('patent_info', ''))
+            initial.update(
+                {
+                    "updates": str(updates),
+                }
+            )
+            patent_info = text_to_dict(initial.get("patent_info", ""))
             if list(patent_info.keys()):
-                patent_dict = dict([ ('patent_'+k.lower(), v) for k,v in list(patent_info.items()) ])
+                patent_dict = dict(
+                    [("patent_" + k.lower(), v) for k, v in list(patent_info.items())]
+                )
             else:
-                patent_dict = {'patent_notes': initial.get('patent_info', '')}
+                patent_dict = {"patent_notes": initial.get("patent_info", "")}
             initial.update(patent_dict)
-            form = ipr_form_mapping[type](initial=initial)
+            form = ipr_form_mapping[_type](initial=initial)
         else:
-            form = ipr_form_mapping[type]()
-        disclosure = IprDisclosureBase()    # dummy disclosure for inlineformset
+            form = ipr_form_mapping[_type]()
+        disclosure = IprDisclosureBase()  # dummy disclosure for inlineformset
         draft_formset = DraftFormset(instance=disclosure)
 
-    return render(request, "ipr/details_edit.html",  {
-        'form': form,
-        'draft_formset':draft_formset,
-        'type':type,
-    })
+    return render(
+        request,
+        "ipr/details_edit.html",
+        {
+            "form": form,
+            "draft_formset": draft_formset,
+            "type": _type,
+        },
+    )
+
 
 @role_required('Secretariat',)
 def notify(request, id, type):
@@ -590,7 +591,7 @@ def notify(request, id, type):
                     type_id = form.cleaned_data['type'],
                     by = request.user.person,
                     disclosure = ipr,
-                    response_due = datetime.datetime.now().date() + datetime.timedelta(days=30),
+                    response_due = datetime_today(DEADLINE_TZINFO) + datetime.timedelta(days=30),
                     message = message,
                 )
             messages.success(request,'Notifications sent')
@@ -629,11 +630,16 @@ def post(request, id):
     
 def search(request):
     search_type = request.GET.get("submit")
+    if search_type and "\x00" in search_type:
+        return HttpResponseBadRequest("Null characters are not allowed")
+
     # query field
     q = ''
     # legacy support
     if not search_type and request.GET.get("option", None) == "document_search":
         docname = request.GET.get("document_search", "")
+        if docname and "\x00" in docname:
+            return HttpResponseBadRequest("Null characters are not allowed")
         if docname.startswith("draft-"):
             search_type = "draft"
             q = docname
@@ -643,18 +649,24 @@ def search(request):
     if search_type:
         form = SearchForm(request.GET)
         docid = request.GET.get("id") or request.GET.get("id_document_tag") or ""
+        if docid and "\x00" in docid:
+            return HttpResponseBadRequest("Null characters are not allowed")
         docs = doc = None
         iprs = []
         related_iprs = []
 
         # set states
-        states = request.GET.getlist('state',('posted','removed'))
+        states = request.GET.getlist('state',settings.PUBLISH_IPR_STATES)
+        if any("\x00" in state for state in states if state):
+            return HttpResponseBadRequest("Null characters are not allowed")
         if states == ['all']:
             states = IprDisclosureStateName.objects.values_list('slug',flat=True)
         
         # get query field
         if request.GET.get(search_type):
             q = request.GET.get(search_type)
+            if q and "\x00" in q:
+                return HttpResponseBadRequest("Null characters are not allowed")
 
         if q or docid:
             # Search by RFC number or draft-identifier
@@ -663,23 +675,53 @@ def search(request):
                 doc = q
 
                 if docid:
-                    start = DocAlias.objects.filter(name=docid)
+                    start = Document.objects.filter(name__iexact=docid)
                 else:
                     if search_type == "draft":
                         q = normalize_draftname(q)
-                        start = DocAlias.objects.filter(name__contains=q, name__startswith="draft")
+                        start = Document.objects.filter(name__icontains=q, name__startswith="draft")
                     elif search_type == "rfc":
-                        start = DocAlias.objects.filter(name="rfc%s" % q.lstrip("0"))
+                        start = Document.objects.filter(name="rfc%s" % q.lstrip("0"))
                 
                 # one match
                 if len(start) == 1:
                     first = start[0]
-                    doc = first.document
-                    docs = related_docs(first)
-                    iprs = iprs_from_docs(docs,states=states)
+                    doc = first
+                    docs = set([first])
+                    docs.update(
+                        related_docs(
+                            first, relationship=("replaces", "obs"), reverse_relationship=()
+                        )
+                    )
+                    docs.update(
+                        set(
+                            [
+                                draft
+                                for drafts in [
+                                    related_docs(
+                                        d, relationship=(), reverse_relationship=("became_rfc",)
+                                    )
+                                    for d in docs
+                                ]
+                                for draft in drafts
+                            ]
+                        )
+                    )
+                    docs.discard(None)
+                    docs = sorted(
+                        docs,
+                        key=lambda d: (
+                            d.rfc_number if d.rfc_number is not None else 0,
+                            d.became_rfc().rfc_number if d.became_rfc() else 0,
+                        ),
+                        reverse=True,
+                    )
+                    iprs = iprs_from_docs(docs, states=states)
                     template = "ipr/search_doc_result.html"
-                    updated_docs = related_docs(first, ('updates',))
-                    related_iprs = list(set(iprs_from_docs(updated_docs, states=states)) - set(iprs))
+                    updated_docs = related_docs(first, ("updates",))
+                    related_iprs = list(
+                        set(iprs_from_docs(updated_docs, states=states)) - set(iprs)
+                    )
                 # multiple matches, select just one
                 elif start:
                     docs = start
@@ -706,27 +748,27 @@ def search(request):
             # Search by wg acronym
             # Document list with IPRs
             elif search_type == "group":
-                docs = list(DocAlias.objects.filter(docs__group=q))
+                docs = list(Document.objects.filter(group=q))
                 related = []
                 for doc in docs:
                     doc.product_of_this_wg = True
                     related += related_docs(doc)
                 iprs = iprs_from_docs(list(set(docs+related)),states=states)
-                docs = [ doc for doc in docs if doc.document.ipr() ]
-                docs = sorted(docs, key=lambda x: max([ipr.disclosure.time for ipr in x.document.ipr()]), reverse=True)
+                docs = [ doc for doc in docs if doc.ipr() ]
+                docs = sorted(docs, key=lambda x: max([ipr.disclosure.time for ipr in x.ipr()]), reverse=True)
                 template = "ipr/search_wg_result.html"
                 q = Group.objects.get(id=q).acronym     # make acronym for use in template
 
             # Search by rfc and id title
             # Document list with IPRs
             elif search_type == "doctitle":
-                docs = list(DocAlias.objects.filter(docs__title__icontains=q))
+                docs = list(Document.objects.filter(title__icontains=q))
                 related = []
                 for doc in docs:
                     related += related_docs(doc)
                 iprs = iprs_from_docs(list(set(docs+related)),states=states)
-                docs = [ doc for doc in docs if doc.document.ipr() ]
-                docs = sorted(docs, key=lambda x: max([ipr.disclosure.time for ipr in x.document.ipr()]), reverse=True)
+                docs = [ doc for doc in docs if doc.ipr() ]
+                docs = sorted(docs, key=lambda x: max([ipr.disclosure.time for ipr in x.ipr()]), reverse=True)
                 template = "ipr/search_doctitle_result.html"
 
             # Search by title of IPR disclosure
@@ -776,9 +818,16 @@ def get_details_tabs(ipr, selected):
 
 def show(request, id):
     """View of individual declaration"""
-    ipr = get_object_or_404(IprDisclosureBase, id=id).get_child()
+    ipr = IprDisclosureBase.objects.filter(id=id)
+    removed = RemovedIprDisclosure.objects.filter(removed_id=id)
+    if removed.exists():
+        return render(request, "ipr/deleted.html", {"removed": removed.get(), "ipr": ipr})
+    if not ipr.exists():
+        raise Http404
+    else:
+        ipr = ipr.get().get_child()
     if not has_role(request.user, 'Secretariat'):
-        if ipr.state.slug == 'removed':
+        if ipr.state.slug in ['removed', 'removed_objfalse']:
             return render(request, "ipr/removed.html", {
                 'ipr': ipr
             })
@@ -801,10 +850,10 @@ def show(request, id):
 
 def showlist(request):
     """List all disclosures by type, posted only"""
-    generic = GenericIprDisclosure.objects.filter(state__in=('posted','removed')).prefetch_related('relatedipr_source_set__target','relatedipr_target_set__source').order_by('-time')
-    specific = HolderIprDisclosure.objects.filter(state__in=('posted','removed')).prefetch_related('relatedipr_source_set__target','relatedipr_target_set__source').order_by('-time')
-    thirdpty = ThirdPartyIprDisclosure.objects.filter(state__in=('posted','removed')).prefetch_related('relatedipr_source_set__target','relatedipr_target_set__source').order_by('-time')
-    nondocspecific = NonDocSpecificIprDisclosure.objects.filter(state__in=('posted','removed')).prefetch_related('relatedipr_source_set__target','relatedipr_target_set__source').order_by('-time')
+    generic = GenericIprDisclosure.objects.filter(state__in=settings.PUBLISH_IPR_STATES).prefetch_related('relatedipr_source_set__target','relatedipr_target_set__source').order_by('-time')
+    specific = HolderIprDisclosure.objects.filter(state__in=settings.PUBLISH_IPR_STATES).prefetch_related('relatedipr_source_set__target','relatedipr_target_set__source').order_by('-time')
+    thirdpty = ThirdPartyIprDisclosure.objects.filter(state__in=settings.PUBLISH_IPR_STATES).prefetch_related('relatedipr_source_set__target','relatedipr_target_set__source').order_by('-time')
+    nondocspecific = NonDocSpecificIprDisclosure.objects.filter(state__in=settings.PUBLISH_IPR_STATES).prefetch_related('relatedipr_source_set__target','relatedipr_target_set__source').order_by('-time')
     
     # combine nondocspecific with generic and re-sort
     generic = itertools.chain(generic,nondocspecific)
@@ -860,3 +909,8 @@ def update(request, id):
     child = ipr.get_child()
     type = class_to_type[child.__class__.__name__]
     return new(request, type, updates=id)
+
+@role_required("Secretariat")
+def json_snapshot(request, id):
+    obj = get_object_or_404(IprDisclosureBase,id=id).get_child()
+    return HttpResponse(json_dump_disclosure(obj),content_type="application/json")
diff --git a/ietf/liaisons/.gitignore b/ietf/liaisons/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/liaisons/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/liaisons/admin.py b/ietf/liaisons/admin.py
index c7cb7a4dae..d873cce536 100644
--- a/ietf/liaisons/admin.py
+++ b/ietf/liaisons/admin.py
@@ -7,15 +7,16 @@
 
 from ietf.liaisons.models import  ( LiaisonStatement, LiaisonStatementEvent,
     RelatedLiaisonStatement, LiaisonStatementAttachment )
+from ietf.utils.admin import SaferTabularInline
 
 
-class RelatedLiaisonStatementInline(admin.TabularInline):
+class RelatedLiaisonStatementInline(SaferTabularInline):
     model = RelatedLiaisonStatement
     fk_name = 'source'
     raw_id_fields = ['target']
     extra = 1
 
-class LiaisonStatementAttachmentInline(admin.TabularInline):
+class LiaisonStatementAttachmentInline(SaferTabularInline):
     model = LiaisonStatementAttachment
     raw_id_fields = ['document']
     extra = 1
@@ -24,7 +25,7 @@ class LiaisonStatementAdmin(admin.ModelAdmin):
     list_display = ['id', 'title', 'submitted', 'from_groups_short_display', 'purpose', 'related_to']
     list_display_links = ['id', 'title']
     ordering = ('title', )
-    raw_id_fields = ('from_contact', 'attachments', 'from_groups', 'to_groups')
+    raw_id_fields = ('attachments', 'from_groups', 'to_groups')
     #filter_horizontal = ('from_groups', 'to_groups')
     inlines = [ RelatedLiaisonStatementInline, LiaisonStatementAttachmentInline ]
 
@@ -50,4 +51,4 @@ class LiaisonStatementEventAdmin(admin.ModelAdmin):
     raw_id_fields = ["statement", "by"]
 
 admin.site.register(LiaisonStatement, LiaisonStatementAdmin)
-admin.site.register(LiaisonStatementEvent, LiaisonStatementEventAdmin)
\ No newline at end of file
+admin.site.register(LiaisonStatementEvent, LiaisonStatementEventAdmin)
diff --git a/ietf/liaisons/factories.py b/ietf/liaisons/factories.py
index 61788817eb..ca588236e3 100644
--- a/ietf/liaisons/factories.py
+++ b/ietf/liaisons/factories.py
@@ -1,14 +1,15 @@
 import factory
 
 from ietf.group.factories import GroupFactory
-from ietf.liaisons.models import LiaisonStatement, LiaisonStatementEvent, LiaisonStatementAttachment
+from ietf.liaisons.models import LiaisonStatement, LiaisonStatementEvent, LiaisonStatementAttachment, RelatedLiaisonStatement
 
 class LiaisonStatementFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = LiaisonStatement
+        skip_postgeneration_save = True
 
     title = factory.Faker('sentence')
-    from_contact = factory.SubFactory('ietf.person.factories.EmailFactory')
+    from_contact = factory.Faker('email')
     purpose_id = 'comment'
     body = factory.Faker('paragraph')
     state_id = 'posted'
@@ -49,3 +50,12 @@ class Meta:
         type_id='liai-att',
         # TODO: Make name more convenient (the default now is to try to generate a draftname)
     )
+
+
+class RelatedLiaisonStatementFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = RelatedLiaisonStatement
+
+    source = factory.SubFactory(LiaisonStatementFactory)
+    target = factory.SubFactory(LiaisonStatementFactory)
+    relationship_id = "refunk"
diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py
index c66c27593e..6ceda5ad38 100644
--- a/ietf/liaisons/forms.py
+++ b/ietf/liaisons/forms.py
@@ -3,44 +3,39 @@
 
 
 import io
-import datetime, os
 import operator
-
-from typing import Union            # pyflakes:ignore
-
+import os
 from email.utils import parseaddr
-from form_utils.forms import BetterModelForm
+from functools import reduce
+from typing import Union, Optional  # pyflakes:ignore
 
 from django import forms
 from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.db.models.query import QuerySet
-from django.forms.utils import ErrorList
-from django.db.models import Q
-#from django.forms.widgets import RadioFieldRenderer
+from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
+from django.db.models import Q, QuerySet
+from django.forms.utils import ErrorList
+from django_stubs_ext import QuerySetAny
 
-import debug                            # pyflakes:ignore
-
+from ietf.doc.models import Document
+from ietf.group.models import Group
 from ietf.ietfauth.utils import has_role
-from ietf.name.models import DocRelationshipName
-from ietf.liaisons.utils import get_person_for_user,is_authorized_individual
-from ietf.liaisons.widgets import ButtonWidget,ShowAttachmentsWidget
-from ietf.liaisons.models import (LiaisonStatement,
-    LiaisonStatementEvent,LiaisonStatementAttachment,LiaisonStatementPurposeName)
 from ietf.liaisons.fields import SearchableLiaisonStatementsField
-from ietf.group.models import Group
-from ietf.person.models import Email
-from ietf.person.fields import SearchableEmailField
-from ietf.doc.models import Document, DocAlias
-from ietf.utils.fields import DatepickerDateField
-from functools import reduce
+from ietf.liaisons.models import (LiaisonStatement,
+                                  LiaisonStatementEvent, LiaisonStatementAttachment, LiaisonStatementPurposeName)
+from ietf.liaisons.utils import get_person_for_user, OUTGOING_LIAISON_ROLES, \
+    INCOMING_LIAISON_ROLES
+from ietf.liaisons.widgets import ButtonWidget, ShowAttachmentsWidget
+from ietf.name.models import DocRelationshipName
+from ietf.person.models import Person
+from ietf.utils.fields import DatepickerDateField, ModelMultipleChoiceField
+from ietf.utils.timezone import date_today, datetime_from_date, DEADLINE_TZINFO
 
 '''
 NOTES:
 Authorized individuals are people (in our Person table) who are authorized to send
 messages on behalf of some other group - they have a formal role in the other group,
-whereas the liasion manager has a formal role with the IETF (or more correctly,
+whereas the liaison manager has a formal role with the IETF (or more correctly,
 with the IAB).
 '''
 
@@ -51,45 +46,105 @@
 def liaison_manager_sdos(person):
     return Group.objects.filter(type="sdo", state="active", role__person=person, role__name="liaiman").distinct()
 
+
 def flatten_choices(choices):
-    '''Returns a flat choice list given one with option groups defined'''
+    """Returns a flat choice list given one with option groups defined
+    
+    n.b., Django allows mixing grouped options and top-level options. This helper only supports
+    the non-mixed case where every option is in an option group.
+    """
     flat = []
-    for optgroup,options in choices:
+    for optgroup, options in choices:
         flat.extend(options)
     return flat
+
+
+def choices_from_group_queryset(groups: QuerySet[Group]):
+    """Get choices list for internal IETF groups user is authorized to select
     
-def get_internal_choices(user):
-    '''Returns the set of internal IETF groups the user has permissions for, as a list
-    of choices suitable for use in a select widget.  If user == None, all active internal
-    groups are included.'''
+    Returns a grouped list of choices suitable for use with a ChoiceField. If user is None,
+    includes all groups.
+    """
+    main = []
+    areas = []
+    wgs = []
+    for g in groups.distinct().order_by("acronym"):
+        if g.acronym in ("ietf", "iesg", "iab"):
+            main.append((g.pk, f"The {g.acronym.upper()}"))
+        elif g.type_id == "area":
+            areas.append((g.pk, f"{g.acronym} - {g.name}"))
+        elif g.type_id == "wg":
+            wgs.append((g.pk, f"{g.acronym} - {g.name}"))
     choices = []
-    groups = get_groups_for_person(user.person if user else None)
-    main = [ (g.pk, 'The {}'.format(g.acronym.upper())) for g in groups.filter(acronym__in=('ietf','iesg','iab')) ]
-    areas = [ (g.pk, '{} - {}'.format(g.acronym,g.name)) for g in groups.filter(type='area') ]
-    wgs = [ (g.pk, '{} - {}'.format(g.acronym,g.name)) for g in groups.filter(type='wg') ]
-    choices.append(('Main IETF Entities', main))
-    choices.append(('IETF Areas', areas))
-    choices.append(('IETF Working Groups', wgs ))
+    if len(main) > 0:
+        choices.append(("Main IETF Entities", main))
+    if len(areas) > 0:
+        choices.append(("IETF Areas", areas))
+    if len(wgs) > 0:
+        choices.append(("IETF Working Groups", wgs))
     return choices
 
-def get_groups_for_person(person):
-    '''Returns queryset of internal Groups the person has interesting roles in.
-    This is a refactor of IETFHierarchyManager.get_entities_for_person().  If Person
-    is None or Secretariat or Liaison Manager all internal IETF groups are returned.
-    '''
-    if person == None or has_role(person.user, "Secretariat") or has_role(person.user, "Liaison Manager"):
-        # collect all internal IETF groups
-        queries = [Q(acronym__in=('ietf','iesg','iab')),
-                   Q(type='area',state='active'),
-                   Q(type='wg',state='active')]
+
+def all_internal_groups():
+    """Get a queryset of all IETF groups suitable for LS To/From assignment"""
+    return Group.objects.filter(
+        Q(acronym__in=("ietf", "iesg", "iab"))
+        | Q(type="area", state="active")
+        | Q(type="wg", state="active")
+    ).distinct()
+
+
+def internal_groups_for_person(person: Optional[Person]):
+    """Get a queryset of IETF groups suitable for LS To/From assignment by person"""
+    if person is None:
+        return Group.objects.none()  # no person = no roles
+
+    if has_role(
+        person.user,
+        (
+            "Secretariat",
+            "IETF Chair",
+            "IAB Chair",
+            "Liaison Manager",
+            "Liaison Coordinator",
+            "Authorized Individual",
+        ),
+    ):
+        return all_internal_groups()
+    # Interesting roles, as Group queries
+    queries = [
+        Q(role__person=person, role__name="chair", acronym="ietf"),
+        Q(role__person=person, role__name="chair", acronym="iab"),
+        Q(role__person=person, role__name="ad", type="area", state="active"),
+        Q(
+            role__person=person,
+            role__name__in=("chair", "secretary"),
+            type="wg",
+            state="active",
+        ),
+        Q(
+            parent__role__person=person,
+            parent__role__name="ad",
+            type="wg",
+            state="active",
+        ),
+    ]
+    if has_role(person.user, "Area Director"):
+        queries.append(Q(acronym__in=("ietf", "iesg")))  # AD can also choose these
+    return Group.objects.filter(reduce(operator.or_, queries)).distinct()
+
+
+def external_groups_for_person(person):
+    """Get a queryset of external groups suitable for LS To/From assignment by person"""
+    filter_expr = Q(pk__in=[])  # start with no groups
+    # These roles can add all external sdo groups
+    if has_role(person.user, set(INCOMING_LIAISON_ROLES + OUTGOING_LIAISON_ROLES) - {"Liaison Manager", "Authorized Individual"}):
+        filter_expr |= Q(type="sdo")
     else:
-        # Interesting roles, as Group queries
-        queries = [Q(role__person=person,role__name='chair',acronym='ietf'),
-                   Q(role__person=person,role__name__in=('chair','execdir'),acronym='iab'),
-                   Q(role__person=person,role__name='ad',type='area',state='active'),
-                   Q(role__person=person,role__name__in=('chair','secretary'),type='wg',state='active'),
-                   Q(parent__role__person=person,parent__role__name='ad',type='wg',state='active')]
-    return Group.objects.filter(reduce(operator.or_,queries)).order_by('acronym').distinct()
+        # The person cannot add all external sdo groups; add any for which they are Liaison Manager
+        filter_expr |= Q(type="sdo", role__person=person, role__name__in=["auth", "liaiman"])
+    return Group.objects.filter(state="active").filter(filter_expr).distinct().order_by("name")
+
 
 def liaison_form_factory(request, type=None, **kwargs):
     """Returns appropriate Liaison entry form"""
@@ -131,7 +186,7 @@ class AddCommentForm(forms.Form):
 #     def render(self):
 #         output = []
 #         for widget in self:
-#             output.append(format_html(force_text(widget)))
+#             output.append(format_html(force_str(widget)))
 #         return mark_safe('\n'.join(output))
 
 
@@ -154,7 +209,7 @@ def get_results(self):
             query = self.cleaned_data.get('text')
             if query:
                 q = (Q(title__icontains=query) |
-                    Q(from_contact__address__icontains=query) |
+                    Q(from_contact__icontains=query) |
                     Q(to_contacts__icontains=query) |
                     Q(other_identifiers__icontains=query) |
                     Q(body__icontains=query) |
@@ -185,9 +240,12 @@ def get_results(self):
             end_date = self.cleaned_data.get('end_date')
             events = None
             if start_date:
-                events = LiaisonStatementEvent.objects.filter(type='posted', time__gte=start_date)
+                events = LiaisonStatementEvent.objects.filter(
+                    type='posted',
+                    time__gte=datetime_from_date(start_date, DEADLINE_TZINFO),
+                )
                 if end_date:
-                    events = events.filter(time__lte=end_date)
+                    events = events.filter(time__lte=datetime_from_date(end_date, DEADLINE_TZINFO))
             elif end_date:
                 events = LiaisonStatementEvent.objects.filter(type='posted', time__lte=end_date)
             if events:
@@ -197,10 +255,10 @@ def get_results(self):
         return results
 
 
-class CustomModelMultipleChoiceField(forms.ModelMultipleChoiceField):
+class CustomModelMultipleChoiceField(ModelMultipleChoiceField):
     '''If value is a QuerySet, return it as is (for use in widget.render)'''
     def prepare_value(self, value):
-        if isinstance(value, QuerySet):
+        if isinstance(value, QuerySetAny):
             return value
         if (hasattr(value, '__iter__') and
                 not isinstance(value, str) and
@@ -209,20 +267,15 @@ def prepare_value(self, value):
         return super(CustomModelMultipleChoiceField, self).prepare_value(value)
 
 
-class LiaisonModelForm(BetterModelForm):
+class LiaisonModelForm(forms.ModelForm):
     '''Specify fields which require a custom widget or that are not part of the model.
     '''
-    from_groups = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),label='Groups',required=False)
-    from_groups.widget.attrs["class"] = "select2-field"
-    from_groups.widget.attrs['data-minimum-input-length'] = 0
-    from_contact = forms.EmailField()   # type: Union[forms.EmailField, SearchableEmailField]
+    from_groups = ModelMultipleChoiceField(queryset=Group.objects.all(),label='Groups',required=False)
     to_contacts = forms.CharField(label="Contacts", widget=forms.Textarea(attrs={'rows':'3', }), strip=False)
-    to_groups = forms.ModelMultipleChoiceField(queryset=Group.objects,label='Groups',required=False)
-    to_groups.widget.attrs["class"] = "select2-field"
-    to_groups.widget.attrs['data-minimum-input-length'] = 0
+    to_groups = ModelMultipleChoiceField(queryset=Group.objects,label='Groups',required=False)
     deadline = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Deadline', required=True)
     related_to = SearchableLiaisonStatementsField(label='Related Liaison Statement', required=False)
-    submitted_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Submission date', required=True, initial=datetime.date.today())
+    submitted_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Submission date', required=True, initial=lambda: date_today(DEADLINE_TZINFO))
     attachments = CustomModelMultipleChoiceField(queryset=Document.objects,label='Attachments', widget=ShowAttachmentsWidget, required=False)
     attach_title = forms.CharField(label='Title', required=False)
     attach_file = forms.FileField(label='File', required=False)
@@ -234,13 +287,6 @@ class LiaisonModelForm(BetterModelForm):
     class Meta:
         model = LiaisonStatement
         exclude = ('attachments','state','from_name','to_name')
-        fieldsets = [('From', {'fields': ['from_groups','from_contact', 'response_contacts'], 'legend': ''}),
-                     ('To', {'fields': ['to_groups','to_contacts'], 'legend': ''}),
-                     ('Other email addresses', {'fields': ['technical_contacts','action_holder_contacts','cc_contacts'], 'legend': ''}),
-                     ('Purpose', {'fields':['purpose', 'deadline'], 'legend': ''}),
-                     ('Reference', {'fields': ['other_identifiers','related_to'], 'legend': ''}),
-                     ('Liaison Statement', {'fields': ['title', 'submitted_date', 'body', 'attachments'], 'legend': ''}),
-                     ('Add attachment', {'fields': ['attach_title', 'attach_file', 'attach_button'], 'legend': ''})]
 
     def __init__(self, user, *args, **kwargs):
         super(LiaisonModelForm, self).__init__(*args, **kwargs)
@@ -249,13 +295,17 @@ def __init__(self, user, *args, **kwargs):
         self.person = get_person_for_user(user)
         self.is_new = not self.instance.pk
 
+        self.fields["from_groups"].widget.attrs["class"] = "select2-field"
+        self.fields["from_groups"].widget.attrs["data-minimum-input-length"] = 0
         self.fields["from_groups"].widget.attrs["data-placeholder"] = "Type in name to search for group"
+        self.fields["to_groups"].widget.attrs["class"] = "select2-field"
+        self.fields["to_groups"].widget.attrs["data-minimum-input-length"] = 0
         self.fields["to_groups"].widget.attrs["data-placeholder"] = "Type in name to search for group"
         self.fields["to_contacts"].label = 'Contacts'
         self.fields["other_identifiers"].widget.attrs["rows"] = 2
-        
+
         # add email validators
-        for field in ['from_contact','to_contacts','technical_contacts','action_holder_contacts','cc_contacts']:
+        for field in ['to_contacts','technical_contacts','action_holder_contacts','cc_contacts']:
             if field in self.fields:
                 self.fields[field].validators.append(validate_emails)
 
@@ -274,18 +324,6 @@ def clean_to_groups(self):
             raise forms.ValidationError('You must specify a To Group')
         return to_groups
         
-    def clean_from_contact(self):
-        contact = self.cleaned_data.get('from_contact')
-        from_groups = self.cleaned_data.get('from_groups')
-        try:
-            email = Email.objects.get(address=contact)
-            if not email.origin:
-                email.origin = "liaison: %s" % (','.join([ g.acronym for g in from_groups.all() ]))
-                email.save()
-        except ObjectDoesNotExist:
-            raise forms.ValidationError('Email address does not exist')
-        return email
-
 # Note to future person: This is the wrong place to fix the new lines
 # in cc_contacts and to_contacts. Those belong in the save function.
 # Or at least somewhere other than here.
@@ -379,12 +417,12 @@ def save_attachments(self):
                     uploaded_filename = name + extension, 
                     )
                 )
-            if created:
-                DocAlias.objects.create(name=attach.name).docs.add(attach)
             LiaisonStatementAttachment.objects.create(statement=self.instance,document=attach)
             attach_file = io.open(os.path.join(settings.LIAISON_ATTACH_PATH, attach.name + extension), 'wb')
             attach_file.write(attached_file.read())
             attach_file.close()
+            attached_file.seek(0)
+            attach.store_file(attach.uploaded_filename, attached_file)
 
             if not self.is_new:
                 # create modified event
@@ -428,101 +466,102 @@ def set_to_fields(self):
         assert NotImplemented
 
 class IncomingLiaisonForm(LiaisonModelForm):
-    def clean(self):
-        if 'send' in list(self.data.keys()) and self.get_post_only():
-            raise forms.ValidationError('As an IETF Liaison Manager you can not send incoming liaison statements, you only can post them')
-        return super(IncomingLiaisonForm, self).clean()
 
     def is_approved(self):
         '''Incoming Liaison Statements do not required approval'''
         return True
 
-    def get_post_only(self):
-        from_groups = self.cleaned_data.get('from_groups')
-        if has_role(self.user, "Secretariat") or is_authorized_individual(self.user,from_groups):
-            return False
-        return True
-
     def set_from_fields(self):
-        '''Set from_groups and from_contact options and initial value based on user
-        accessing the form.'''
-        if has_role(self.user, "Secretariat"):
-            queryset = Group.objects.filter(type="sdo", state="active").order_by('name')
-        else:
-            queryset = Group.objects.filter(type="sdo", state="active", role__person=self.person, role__name__in=("liaiman", "auth")).distinct().order_by('name')
-            self.fields['from_contact'].initial = self.person.role_set.filter(group=queryset[0]).first().email.address
-            self.fields['from_contact'].widget.attrs['disabled'] = True
-        self.fields['from_groups'].queryset = queryset
-        self.fields['from_groups'].widget.submitter = str(self.person)
-
+        """Configure from "From" fields based on user roles"""
+        qs = external_groups_for_person(self.person)
+        self.fields["from_groups"].queryset = qs
+        self.fields["from_groups"].widget.submitter = str(self.person)
         # if there's only one possibility make it the default
-        if len(queryset) == 1:
-            self.fields['from_groups'].initial = queryset
+        if len(qs) == 1:
+            self.fields['from_groups'].initial = qs
+
+        # Note that the IAB chair currently doesn't get to work with incoming liaison statements
+
+        # Removing this block at the request of the IAB - as a workaround until the new liaison tool is
+        # create, anyone with access to the form can set any from_contact value
+        #
+        # if not (
+        #     has_role(self.user, "Secretariat")
+        #     or has_role(self.user, "Liaison Coordinator")
+        # ):
+        #     self.fields["from_contact"].initial = (
+        #         self.person.role_set.filter(group=qs[0]).first().email.formatted_email()
+        #     )
+        #     self.fields["from_contact"].widget.attrs["disabled"] = True
 
     def set_to_fields(self):
         '''Set to_groups and to_contacts options and initial value based on user
         accessing the form.  For incoming Liaisons, to_groups choices is the full set.
         '''
-        self.fields['to_groups'].choices = get_internal_choices(None)
+        self.fields['to_groups'].choices = choices_from_group_queryset(all_internal_groups())
 
 
 class OutgoingLiaisonForm(LiaisonModelForm):
-    from_contact = SearchableEmailField(only_users=True)
     approved = forms.BooleanField(label="Obtained prior approval", required=False)
 
     class Meta:
         model = LiaisonStatement
         exclude = ('attachments','state','from_name','to_name','action_holder_contacts')
-        # add approved field, no action_holder_contacts
-        fieldsets = [('From', {'fields': ['from_groups','from_contact','response_contacts','approved'], 'legend': ''}),
-                     ('To', {'fields': ['to_groups','to_contacts'], 'legend': ''}),
-                     ('Other email addresses', {'fields': ['technical_contacts','cc_contacts'], 'legend': ''}),
-                     ('Purpose', {'fields':['purpose', 'deadline'], 'legend': ''}),
-                     ('Reference', {'fields': ['other_identifiers','related_to'], 'legend': ''}),
-                     ('Liaison Statement', {'fields': ['title', 'submitted_date', 'body', 'attachments'], 'legend': ''}),
-                     ('Add attachment', {'fields': ['attach_title', 'attach_file', 'attach_button'], 'legend': ''})]
 
     def is_approved(self):
         return self.cleaned_data['approved']
 
     def set_from_fields(self):
-        '''Set from_groups and from_contact options and initial value based on user
-        accessing the form'''
-        choices = get_internal_choices(self.user)
-        self.fields['from_groups'].choices = choices
-        
-        # set initial value if only one entry 
-        flat_choices = flatten_choices(choices)
+        """Configure from "From" fields based on user roles"""
+        self.set_from_groups_field()
+        self.set_from_contact_field()
+
+    def set_from_groups_field(self):
+        """Configure the from_groups field based on roles"""
+        grouped_choices = choices_from_group_queryset(internal_groups_for_person(self.person))
+        flat_choices = flatten_choices(grouped_choices)
         if len(flat_choices) == 1:
-            self.fields['from_groups'].initial = [flat_choices[0][0]]
-        
+            self.fields["from_groups"].choices = flat_choices
+            self.fields["from_groups"].initial = [flat_choices[0][0]]
+        else:
+            self.fields["from_groups"].choices = grouped_choices
+
+    def set_from_contact_field(self):
+        """Configure the from_contact field based on user roles"""
+        # Secretariat can set this to any valid address but gets no default
         if has_role(self.user, "Secretariat"):
             return
-
-        if self.person.role_set.filter(name='liaiman',group__state='active'):
-            email = self.person.role_set.filter(name='liaiman',group__state='active').first().email.address
-        elif self.person.role_set.filter(name__in=('ad','chair'),group__state='active'):
-            email = self.person.role_set.filter(name__in=('ad','chair'),group__state='active').first().email.address
+        elif has_role(self.user, ["IAB Chair", "Liaison Coordinator"]):
+            self.fields["from_contact"].initial = "IAB Chair <iab-chair@iab.org>"
+            return
+        elif has_role(self.user, "IETF Chair"):
+            self.fields["from_contact"].initial = "IETF Chair <chair@ietf.org>"
+            return
+        # ... others have it set to the correct value and cannot change it
+        self.fields['from_contact'].disabled = True
+        # Set up the querysets we might use - only evaluated as needed
+        liaison_manager_role = self.person.role_set.filter(name="liaiman", group__state="active")
+        chair_or_ad_role = self.person.role_set.filter(
+                    name__in=("ad", "chair"), group__state="active"
+                )  
+        if liaison_manager_role.exists():
+            from_contact_email = liaison_manager_role.first().email
+        elif chair_or_ad_role.exists():
+            from_contact_email = chair_or_ad_role.first().email
         else:
-            email = self.person.email_address()
-        self.fields['from_contact'].initial = email
-        self.fields['from_contact'].widget.attrs['disabled'] = True
+            from_contact_email = self.person.email()
+        self.fields['from_contact'].initial = from_contact_email.formatted_email()
 
     def set_to_fields(self):
-        '''Set to_groups and to_contacts options and initial value based on user
-        accessing the form'''
-        # set options. if the user is a Liaison Manager and nothing more, reduce set to his SDOs
-        if has_role(self.user, "Liaison Manager") and not self.person.role_set.filter(name__in=('ad','chair'),group__state='active'):
-            queryset = Group.objects.filter(type="sdo", state="active", role__person=self.person, role__name="liaiman").distinct().order_by('name')
-        else:
-            # get all outgoing entities
-            queryset = Group.objects.filter(type="sdo", state="active").order_by('name')
-
-        self.fields['to_groups'].queryset = queryset
+        """Configure the "To" fields based on user roles"""
+        qs = external_groups_for_person(self.person)
+        self.fields['to_groups'].queryset = qs 
 
         # set initial
         if has_role(self.user, "Liaison Manager"):
-            self.fields['to_groups'].initial = [queryset.first()]
+            self.fields['to_groups'].initial = [
+                qs.filter(role__person=self.person, role__name="liaiman").first()
+            ]
 
 
 class EditLiaisonForm(LiaisonModelForm):
@@ -530,46 +569,33 @@ def __init__(self, *args, **kwargs):
         super(EditLiaisonForm, self).__init__(*args, **kwargs)
         self.edit = True
         self.fields['attachments'].initial = self.instance.liaisonstatementattachment_set.exclude(removed=True)
-        related = [ str(x.pk) for x in self.instance.source_of_set.all() ]
-        self.fields['related_to'].initial = ','.join(related)
+        self.fields['related_to'].initial = [ x.target for x in self.instance.source_of_set.all() ]
         self.fields['submitted_date'].initial = self.instance.submitted
 
     def save(self, *args, **kwargs):
         super(EditLiaisonForm, self).save(*args,**kwargs)
         if self.has_changed() and 'submitted_date' in self.changed_data:
             event = self.instance.liaisonstatementevent_set.filter(type='submitted').first()
-            event.time = self.cleaned_data.get('submitted_date')
+            event.time = datetime_from_date(self.cleaned_data.get('submitted_date'), DEADLINE_TZINFO)
             event.save()
 
         return self.instance
 
     def set_from_fields(self):
-        '''Set from_groups and from_contact options and initial value based on user
-        accessing the form.'''
+        """Configure from "From" fields based on user roles"""
         if self.instance.is_outgoing():
-            self.fields['from_groups'].choices = get_internal_choices(self.user)
+            self.fields['from_groups'].choices = choices_from_group_queryset(internal_groups_for_person(self.person))
         else:
-            if has_role(self.user, "Secretariat"):
-                queryset = Group.objects.filter(type="sdo").order_by('name')
-            else:
-                queryset = Group.objects.filter(type="sdo", role__person=self.person, role__name__in=("liaiman", "auth")).distinct().order_by('name')
+            self.fields["from_groups"].queryset = external_groups_for_person(self.person)
+            if not has_role(self.user, "Secretariat"):
                 self.fields['from_contact'].widget.attrs['disabled'] = True
-            self.fields['from_groups'].queryset = queryset
 
     def set_to_fields(self):
-        '''Set to_groups and to_contacts options and initial value based on user
-        accessing the form.  For incoming Liaisons, to_groups choices is the full set.
-        '''
+        """Configure the "To" fields based on user roles"""
         if self.instance.is_outgoing():
-            # if the user is a Liaison Manager and nothing more, reduce to set to his SDOs
-            if has_role(self.user, "Liaison Manager") and not self.person.role_set.filter(name__in=('ad','chair'),group__state='active'):
-                queryset = Group.objects.filter(type="sdo", role__person=self.person, role__name="liaiman").distinct().order_by('name')
-            else:
-                # get all outgoing entities
-                queryset = Group.objects.filter(type="sdo").order_by('name')
-            self.fields['to_groups'].queryset = queryset
+            self.fields['to_groups'].queryset = external_groups_for_person(self.person)
         else:
-            self.fields['to_groups'].choices = get_internal_choices(None)
+            self.fields['to_groups'].choices = choices_from_group_queryset(all_internal_groups())
 
 
 class EditAttachmentForm(forms.Form):
diff --git a/ietf/liaisons/mails.py b/ietf/liaisons/mails.py
index 47f18c75bb..878aada576 100644
--- a/ietf/liaisons/mails.py
+++ b/ietf/liaisons/mails.py
@@ -2,19 +2,22 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
-
 from django.conf import settings
 from django.template.loader import render_to_string
 
 from ietf.utils.mail import send_mail_text
 from ietf.group.models import Role
 from ietf.mailtrigger.utils import gather_address_lists
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
+
 
 def send_liaison_by_email(request, liaison):
     subject = 'New Liaison Statement, "%s"' % (liaison.title)
     from_email = settings.LIAISON_UNIVERSAL_FROM
-    (to_email, cc) = gather_address_lists('liaison_statement_posted',liaison=liaison)
+    if liaison.is_outgoing():
+        (to_email, cc) = gather_address_lists('liaison_statement_posted_outgoing',liaison=liaison)
+    else:
+        (to_email, cc) = gather_address_lists('liaison_statement_posted_incoming',liaison=liaison)
     bcc = ['statements@ietf.org']
     body = render_to_string('liaisons/liaison_mail.txt', dict(liaison=liaison))
 
@@ -61,7 +64,7 @@ def possibly_send_deadline_reminder(liaison):
         0: 'today'
         }
 
-    days_to_go = (liaison.deadline - datetime.date.today()).days
+    days_to_go = (liaison.deadline - date_today(DEADLINE_TZINFO)).days
     if not (days_to_go < 0 or days_to_go in list(PREVIOUS_DAYS.keys())):
         return None # no reminder
 
diff --git a/ietf/liaisons/management/.gitignore b/ietf/liaisons/management/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/liaisons/management/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/liaisons/management/commands/check_liaison_deadlines.py b/ietf/liaisons/management/commands/check_liaison_deadlines.py
index 84faa5fed7..1fe76029a5 100644
--- a/ietf/liaisons/management/commands/check_liaison_deadlines.py
+++ b/ietf/liaisons/management/commands/check_liaison_deadlines.py
@@ -8,13 +8,14 @@
 
 from ietf.liaisons.models import LiaisonStatement
 from ietf.liaisons.mails import possibly_send_deadline_reminder
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 
 
 class Command(BaseCommand):
     help = ("Check liaison deadlines and send a reminder if we are close to a deadline")
 
     def handle(self, *args, **options):
-        today = datetime.date.today()
+        today = date_today(DEADLINE_TZINFO)
         cutoff = today - datetime.timedelta(14)
 
         msgs = []
diff --git a/ietf/liaisons/migrations/0001_initial.py b/ietf/liaisons/migrations/0001_initial.py
index 7b58564ff1..eccd8bb331 100644
--- a/ietf/liaisons/migrations/0001_initial.py
+++ b/ietf/liaisons/migrations/0001_initial.py
@@ -1,7 +1,4 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -34,14 +31,17 @@ class Migration(migrations.Migration):
                 ('other_identifiers', models.TextField(blank=True, null=True)),
                 ('body', models.TextField(blank=True)),
             ],
+            options={
+                'ordering': ['id'],
+            },
         ),
         migrations.CreateModel(
-            name='LiaisonStatementAttachment',
+            name='RelatedLiaisonStatement',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('removed', models.BooleanField(default=False)),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('statement', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='liaisons.LiaisonStatement')),
+                ('relationship', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocRelationshipName')),
+                ('source', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='source_of_set', to='liaisons.LiaisonStatement')),
+                ('target', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='target_of_set', to='liaisons.LiaisonStatement')),
             ],
         ),
         migrations.CreateModel(
@@ -59,21 +59,12 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='LiaisonStatementGroupContacts',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('contacts', models.CharField(blank=True, max_length=255)),
-                ('cc_contacts', models.CharField(blank=True, max_length=255)),
-                ('group', ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group', unique=True)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='RelatedLiaisonStatement',
+            name='LiaisonStatementAttachment',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('relationship', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocRelationshipName')),
-                ('source', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='source_of_set', to='liaisons.LiaisonStatement')),
-                ('target', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='target_of_set', to='liaisons.LiaisonStatement')),
+                ('removed', models.BooleanField(default=False)),
+                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
+                ('statement', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='liaisons.LiaisonStatement')),
             ],
         ),
         migrations.AddField(
@@ -111,4 +102,8 @@ class Migration(migrations.Migration):
             name='to_groups',
             field=models.ManyToManyField(blank=True, related_name='liaisonstatement_to_set', to='group.Group'),
         ),
+        migrations.AddIndex(
+            model_name='liaisonstatementevent',
+            index=models.Index(fields=['-time', '-id'], name='liaisons_li_time_3e1646_idx'),
+        ),
     ]
diff --git a/ietf/liaisons/migrations/0002_alter_liaisonstatement_response_contacts.py b/ietf/liaisons/migrations/0002_alter_liaisonstatement_response_contacts.py
new file mode 100644
index 0000000000..ac0a11101b
--- /dev/null
+++ b/ietf/liaisons/migrations/0002_alter_liaisonstatement_response_contacts.py
@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("liaisons", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="liaisonstatement",
+            name="response_contacts",
+            field=models.TextField(
+                blank=True, help_text="Where to send a response", max_length=1024
+            ),
+        ),
+    ]
diff --git a/ietf/liaisons/migrations/0002_auto_20180225_1207.py b/ietf/liaisons/migrations/0002_auto_20180225_1207.py
deleted file mode 100644
index 62a9b8a13b..0000000000
--- a/ietf/liaisons/migrations/0002_auto_20180225_1207.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-25 12:07
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('liaisons', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='liaisonstatement',
-            options={'ordering': ['id']},
-        ),
-    ]
diff --git a/ietf/liaisons/migrations/0003_liaison_document2_fk.py b/ietf/liaisons/migrations/0003_liaison_document2_fk.py
deleted file mode 100644
index 5fdf0f0f49..0000000000
--- a/ietf/liaisons/migrations/0003_liaison_document2_fk.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 11:58
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0015_1_add_fk_to_document_id'),
-        ('liaisons', '0002_auto_20180225_1207'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='liaisonstatementattachment',
-            name='document2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AlterField(
-            model_name='liaisonstatementattachment',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_liaison', to='doc.Document', to_field=b'name'),
-        ),
-    ]
diff --git a/ietf/liaisons/migrations/0003_liaisonstatement_from_contact_tmp.py b/ietf/liaisons/migrations/0003_liaisonstatement_from_contact_tmp.py
new file mode 100644
index 0000000000..de2ce7ff59
--- /dev/null
+++ b/ietf/liaisons/migrations/0003_liaisonstatement_from_contact_tmp.py
@@ -0,0 +1,22 @@
+# Copyright The IETF Trust 2025 All Rights Reserved
+from django.db import migrations, models
+import ietf.utils.validators
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("liaisons", "0002_alter_liaisonstatement_response_contacts"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="liaisonstatement",
+            name="from_contact_tmp",
+            field=models.CharField(
+                blank=True,
+                help_text="Address of the formal sender of the statement",
+                max_length=512,
+                validators=[ietf.utils.validators.validate_mailbox_address],
+            ),
+        ),
+    ]
diff --git a/ietf/liaisons/migrations/0004_populate_liaisonstatement_from_contact_tmp.py b/ietf/liaisons/migrations/0004_populate_liaisonstatement_from_contact_tmp.py
new file mode 100644
index 0000000000..dbab326b0c
--- /dev/null
+++ b/ietf/liaisons/migrations/0004_populate_liaisonstatement_from_contact_tmp.py
@@ -0,0 +1,60 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from itertools import islice
+
+from django.db import migrations
+
+from ietf.person.name import plain_name
+from ietf.utils.mail import formataddr
+from ietf.utils.validators import validate_mailbox_address
+
+
+def forward(apps, schema_editor):
+    def _formatted_email(email):
+        """Format an email address to match Email.formatted_email()"""
+        person = email.person
+        if person:
+            return formataddr(
+                (
+                    # inlined Person.plain_name(), minus the caching
+                    person.plain if person.plain else plain_name(person.name),
+                    email.address,
+                )
+            )
+        return email.address
+
+    def _batched(iterable, n):
+        """Split an iterable into lists of length <= n
+
+        (based on itertools example code for batched(), which is added in py312)
+        """
+        iterator = iter(iterable)
+        batch = list(islice(iterator, n))  # consumes first n iterations
+        while batch:
+            yield batch
+            batch = list(islice(iterator, n))  # consumes next n iterations
+
+    LiaisonStatement = apps.get_model("liaisons", "LiaisonStatement")
+    LiaisonStatement.objects.update(from_contact_tmp="")  # ensure they're all blank
+    for batch in _batched(
+        LiaisonStatement.objects.exclude(from_contact=None).select_related(
+            "from_contact"
+        ),
+        100,
+    ):
+        for ls in batch:
+            ls.from_contact_tmp = _formatted_email(ls.from_contact)
+            validate_mailbox_address(
+                ls.from_contact_tmp
+            )  # be sure it's permitted before we accept it
+
+        LiaisonStatement.objects.bulk_update(batch, fields=["from_contact_tmp"])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("liaisons", "0003_liaisonstatement_from_contact_tmp"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward),
+    ]
diff --git a/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py b/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py
deleted file mode 100644
index 3f5868ef2b..0000000000
--- a/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-20 09:53
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('liaisons', '0003_liaison_document2_fk'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='liaisonstatementattachment',
-            name='document',
-        ),
-    ]
diff --git a/ietf/liaisons/migrations/0005_rename_field_document2.py b/ietf/liaisons/migrations/0005_rename_field_document2.py
deleted file mode 100644
index ddb8005735..0000000000
--- a/ietf/liaisons/migrations/0005_rename_field_document2.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 05:31
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0019_rename_field_document2'),
-        ('liaisons', '0004_remove_liaisonstatementattachment_document'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='liaisonstatementattachment',
-            old_name='document2',
-            new_name='document',
-        ),
-    ]
diff --git a/ietf/liaisons/migrations/0005_replace_liaisonstatement_from_contact.py b/ietf/liaisons/migrations/0005_replace_liaisonstatement_from_contact.py
new file mode 100644
index 0000000000..e1702ae3bc
--- /dev/null
+++ b/ietf/liaisons/migrations/0005_replace_liaisonstatement_from_contact.py
@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2025 All Rights Reserved
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("liaisons", "0004_populate_liaisonstatement_from_contact_tmp"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="liaisonstatement",
+            name="from_contact",
+        ),
+        migrations.RenameField(
+            model_name="liaisonstatement",
+            old_name="from_contact_tmp",
+            new_name="from_contact",
+        ),
+    ]
diff --git a/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py b/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py
deleted file mode 100644
index cae4b0ab16..0000000000
--- a/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-06-10 03:47
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('liaisons', '0005_rename_field_document2'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='liaisonstatementattachment',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/liaisons/migrations/0007_auto_20201109_0439.py b/ietf/liaisons/migrations/0007_auto_20201109_0439.py
deleted file mode 100644
index cd9aa967e6..0000000000
--- a/ietf/liaisons/migrations/0007_auto_20201109_0439.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('liaisons', '0006_document_primary_key_cleanup'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='liaisonstatementevent',
-            index=models.Index(fields=['-time', '-id'], name='liaisons_li_time_3e1646_idx'),
-        ),
-    ]
diff --git a/ietf/liaisons/migrations/0008_purge_liaisonstatementgroupcontacts_data.py b/ietf/liaisons/migrations/0008_purge_liaisonstatementgroupcontacts_data.py
deleted file mode 100644
index 4bec1a4f01..0000000000
--- a/ietf/liaisons/migrations/0008_purge_liaisonstatementgroupcontacts_data.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# Generated by Django 2.2.17 on 2020-12-10 06:21
-
-from django.db import migrations
-
-from ietf.person.name import plain_name
-
-
-def forward(apps, schema_editor):
-    """Delete LiaisonStatementGroupContacts records"""
-    LiaisonStatementGroupContacts = apps.get_model('liaisons', 'LiaisonStatementGroupContacts')
-    LiaisonStatementGroupContacts.objects.all().delete()
-
-
-def contacts_from_roles(roles):
-    """Create contacts string from Role queryset"""
-    emails = []
-    for r in roles:
-        if not r.person.plain and r.person.name == r.email.address:
-            # Person was just a stand-in for a bare email address, so just return a bare email address
-            emails.append(r.email.address)
-        else:
-            # Person had a name of some sort, use that as the friendly name
-            person_name = r.person.plain if r.person.plain else plain_name(r.person.name)
-            emails.append('{} <{}>'.format(person_name,r.email.address))
-    return ','.join(emails)
-
-def reverse(apps, schema_editor):
-    """Recreate LiaisonStatementGroupContacts records
-    
-    Note that this does not exactly reproduce the original contents. In particular, email addresses
-    in contacts or cc_contacts may have had different real names than those in the corresponding
-    email.person.name field. In this case, the record will be reconstructed with the name from
-    the Person model. The email addresses should be unchanged, though. 
-    """
-    LiaisonStatementGroupContacts = apps.get_model('liaisons', 'LiaisonStatementGroupContacts')
-    Group = apps.get_model('group', 'Group')
-    Role = apps.get_model('group', 'Role')
-    RoleName=apps.get_model('name', 'RoleName')
-    
-    contact_role_name = RoleName.objects.get(slug='liaison_contact')
-    cc_contact_role_name = RoleName.objects.get(slug='liaison_cc_contact')
-    
-    for group in Group.objects.all():
-        contacts = Role.objects.filter(name=contact_role_name, group=group)
-        cc_contacts = Role.objects.filter(name=cc_contact_role_name, group=group)
-        if contacts.exists() or cc_contacts.exists():
-            LiaisonStatementGroupContacts.objects.create(
-                group_id=group.pk,
-                contacts=contacts_from_roles(contacts),
-                cc_contacts=contacts_from_roles(cc_contacts),
-            )
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('liaisons', '0007_auto_20201109_0439'),
-        ('group', '0041_create_liaison_contact_roles'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/liaisons/migrations/0009_delete_liaisonstatementgroupcontacts_model.py b/ietf/liaisons/migrations/0009_delete_liaisonstatementgroupcontacts_model.py
deleted file mode 100644
index c4f654f1d0..0000000000
--- a/ietf/liaisons/migrations/0009_delete_liaisonstatementgroupcontacts_model.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by Django 2.2.17 on 2020-12-10 10:05
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('liaisons', '0008_purge_liaisonstatementgroupcontacts_data'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='LiaisonStatementGroupContacts',
-        ),
-    ]
diff --git a/ietf/liaisons/models.py b/ietf/liaisons/models.py
index 6302bea779..a2d79ea476 100644
--- a/ietf/liaisons/models.py
+++ b/ietf/liaisons/models.py
@@ -7,13 +7,14 @@
 from django.db import models
 from django.utils.text import slugify
 
-from ietf.person.models import Email, Person
+from ietf.person.models import Person
 from ietf.name.models import (LiaisonStatementPurposeName, LiaisonStatementState,
                               LiaisonStatementEventTypeName, LiaisonStatementTagName,
                               DocRelationshipName)
 from ietf.doc.models import Document
 from ietf.group.models import Group
 from ietf.utils.models import ForeignKey
+from ietf.utils.validators import validate_mailbox_address
 
 # maps (previous state id, new state id) to event type id
 STATE_EVENT_MAPPING = {
@@ -29,11 +30,16 @@
 class LiaisonStatement(models.Model):
     title = models.CharField(max_length=255)
     from_groups = models.ManyToManyField(Group, blank=True, related_name='liaisonstatement_from_set')
-    from_contact = ForeignKey(Email, blank=True, null=True)
+    from_contact = models.CharField(
+        blank=True,
+        max_length=512,
+        help_text="Address of the formal sender of the statement",
+        validators=(validate_mailbox_address,)
+    )
     to_groups = models.ManyToManyField(Group, blank=True, related_name='liaisonstatement_to_set')
     to_contacts = models.CharField(max_length=2000, help_text="Contacts at recipient group")
 
-    response_contacts = models.CharField(blank=True, max_length=255, help_text="Where to send a response") # RFC4053
+    response_contacts = models.TextField(blank=True, max_length=1024, help_text="Where to send a response") # RFC4053
     technical_contacts = models.CharField(blank=True, max_length=255, help_text="Who to contact for clarification") # RFC4053
     action_holder_contacts = models.CharField(blank=True, max_length=255, help_text="Who makes sure action is completed")  # incoming only?
     cc_contacts = models.TextField(blank=True)
@@ -44,7 +50,7 @@ class LiaisonStatement(models.Model):
     body = models.TextField(blank=True)
 
     tags = models.ManyToManyField(LiaisonStatementTagName, blank=True)
-    attachments = models.ManyToManyField(Document, through='LiaisonStatementAttachment', blank=True)
+    attachments = models.ManyToManyField(Document, through='liaisons.LiaisonStatementAttachment', blank=True)
     state = ForeignKey(LiaisonStatementState, default='pending')
 
     class Meta:
@@ -85,7 +91,7 @@ def name(self):
         if self.from_groups.count():
             frm = ', '.join([i.acronym or i.name for i in self.from_groups.all()])
         else:
-            frm = self.from_contact.person.name
+            frm = self.from_contact
         if self.to_groups.count():
             to = ', '.join([i.acronym or i.name for i in self.to_groups.all()])
         else:
diff --git a/ietf/liaisons/resources.py b/ietf/liaisons/resources.py
index 8f31ea3a64..02cd159a11 100644
--- a/ietf/liaisons/resources.py
+++ b/ietf/liaisons/resources.py
@@ -15,12 +15,10 @@
                                   RelatedLiaisonStatement)
 
 
-from ietf.person.resources import EmailResource
 from ietf.group.resources import GroupResource
 from ietf.name.resources import LiaisonStatementPurposeNameResource, LiaisonStatementTagNameResource, LiaisonStatementStateResource
 from ietf.doc.resources import DocumentResource
 class LiaisonStatementResource(ModelResource):
-    from_contact     = ToOneField(EmailResource, 'from_contact', null=True)
     purpose          = ToOneField(LiaisonStatementPurposeNameResource, 'purpose')
     state            = ToOneField(LiaisonStatementStateResource, 'state')
     from_groups      = ToManyField(GroupResource, 'from_groups', null=True)
@@ -36,6 +34,7 @@ class Meta:
         filtering = { 
             "id": ALL,
             "title": ALL,
+            "from_contact": ALL,
             "to_contacts": ALL,
             "response_contacts": ALL,
             "technical_contacts": ALL,
@@ -44,9 +43,6 @@ class Meta:
             "deadline": ALL,
             "other_identifiers": ALL,
             "body": ALL,
-            "from_name": ALL,
-            "to_name": ALL,
-            "from_contact": ALL_WITH_RELATIONS,
             "purpose": ALL_WITH_RELATIONS,
             "state": ALL_WITH_RELATIONS,
             "from_groups": ALL_WITH_RELATIONS,
diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py
index b08832ae55..e29045443f 100644
--- a/ietf/liaisons/tests.py
+++ b/ietf/liaisons/tests.py
@@ -14,21 +14,26 @@
 from django.contrib.auth.models import User
 from django.urls import reverse as urlreverse
 from django.db.models import Q
+from django.utils import timezone
+
 from io import StringIO
 from pyquery import PyQuery
 
+from ietf.doc.storage_utils import retrieve_str
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox
 
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.liaisons.factories import ( LiaisonStatementFactory, 
-    LiaisonStatementEventFactory, LiaisonStatementAttachmentFactory, )
+    LiaisonStatementEventFactory, LiaisonStatementAttachmentFactory, RelatedLiaisonStatementFactory)
 from ietf.liaisons.models import (LiaisonStatement, LiaisonStatementPurposeName,
     LiaisonStatementAttachment)
 from ietf.person.models import Person
 from ietf.group.models import Group
 from ietf.liaisons.mails import send_sdo_reminder, possibly_send_deadline_reminder
 from ietf.liaisons.views import contacts_from_roles, contact_email_from_role
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
+
 
 # -------------------------------------------------
 # Helper Functions
@@ -50,7 +55,7 @@ def get_liaison_post_data(type='incoming'):
                 to_contacts='to_contacts@example.com',
                 purpose="info",
                 title="title",
-                submitted_date=datetime.datetime.today().strftime("%Y-%m-%d"),
+                submitted_date=timezone.now().strftime("%Y-%m-%d"),
                 body="body",
                 send="1" )
 
@@ -105,65 +110,74 @@ def test_help_pages(self):
         self.assertEqual(self.client.get('/liaison/help/from_ietf/').status_code, 200)
         self.assertEqual(self.client.get('/liaison/help/to_ietf/').status_code, 200)
 
+    def test_list_other_sdo(self):
+        GroupFactory(type_id="sdo", state_id="conclude", acronym="third")
+        GroupFactory(type_id="sdo", state_id="active", acronym="second")
+        GroupFactory(type_id="sdo", state_id="active", acronym="first")
+        url = urlreverse("ietf.liaisons.views.list_other_sdo")
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q("h1")), 2)
+        first_td_elements_text = [e.text for e in q("tr").find("td:first-child a")]
+        self.assertEqual(first_td_elements_text, ["first", "second", "third"])
 
 class UnitTests(TestCase):
-    def test_get_cc(self):
-        from ietf.liaisons.views import get_cc,EMAIL_ALIASES
+    def test_get_contacts_for_liaison_messages_for_group_primary(self):
+        from ietf.mailtrigger.utils import get_contacts_for_liaison_messages_for_group_primary,EMAIL_ALIASES
 
         # test IETF
-        cc = get_cc(Group.objects.get(acronym='ietf'))
+        cc = get_contacts_for_liaison_messages_for_group_primary(Group.objects.get(acronym='ietf'))
         self.assertTrue(EMAIL_ALIASES['IESG'] in cc)
         self.assertTrue(EMAIL_ALIASES['IETFCHAIR'] in cc)
         # test IAB
-        cc = get_cc(Group.objects.get(acronym='iab'))
+        cc = get_contacts_for_liaison_messages_for_group_primary(Group.objects.get(acronym='iab'))
         self.assertTrue(EMAIL_ALIASES['IAB'] in cc)
         self.assertTrue(EMAIL_ALIASES['IABCHAIR'] in cc)
-        self.assertTrue(EMAIL_ALIASES['IABEXECUTIVEDIRECTOR'] in cc)
         # test an Area
         area = Group.objects.filter(type='area').first()
-        cc = get_cc(area)
+        cc = get_contacts_for_liaison_messages_for_group_primary(area)
         self.assertTrue(EMAIL_ALIASES['IETFCHAIR'] in cc)
         self.assertTrue(contacts_from_roles([area.ad_role()]) in cc)
         # test a Working Group
         wg = Group.objects.filter(type='wg').first()
-        cc = get_cc(wg)
+        cc = get_contacts_for_liaison_messages_for_group_primary(wg)
         self.assertTrue(contacts_from_roles([wg.parent.ad_role()]) in cc)
         self.assertTrue(contacts_from_roles([wg.get_chair()]) in cc)
         # test an SDO
         sdo = RoleFactory(name_id='liaiman',group__type_id='sdo',).group
-        cc = get_cc(sdo)
+        cc = get_contacts_for_liaison_messages_for_group_primary(sdo)
         self.assertTrue(contacts_from_roles([sdo.role_set.filter(name='liaiman').first()]) in cc)
         # test a cc_contact role
         cc_contact_role = RoleFactory(name_id='liaison_cc_contact', group=sdo)
-        cc = get_cc(sdo)
+        cc = get_contacts_for_liaison_messages_for_group_primary(sdo)
         self.assertIn(contact_email_from_role(cc_contact_role), cc)
 
-    def test_get_contacts_for_group(self):
-        from ietf.liaisons.views import get_contacts_for_group, EMAIL_ALIASES
+    def test_get_contacts_for_liaison_messages_for_group_secondary(self):
+        from ietf.mailtrigger.utils import get_contacts_for_liaison_messages_for_group_secondary,EMAIL_ALIASES
 
-        # test explicit
+        # test explicit group contacts
         sdo = GroupFactory(type_id='sdo')
         contact_email = RoleFactory(name_id='liaison_contact', group=sdo).email.address
-        contacts = get_contacts_for_group(sdo)
+        contacts = get_contacts_for_liaison_messages_for_group_secondary(sdo)
         self.assertIsNotNone(contact_email)
         self.assertIn(contact_email, contacts)
         # test area
         area = Group.objects.filter(type='area').first()
-        contacts = get_contacts_for_group(area)
+        contacts = get_contacts_for_liaison_messages_for_group_secondary(area)
         self.assertTrue(area.ad_role().email.address in contacts)
         # test wg
         wg = Group.objects.filter(type='wg').first()
-        contacts = get_contacts_for_group(wg)
+        contacts = get_contacts_for_liaison_messages_for_group_secondary(wg)
         self.assertTrue(wg.get_chair().email.address in contacts)
         # test ietf
-        contacts = get_contacts_for_group(Group.objects.get(acronym='ietf'))
+        contacts = get_contacts_for_liaison_messages_for_group_secondary(Group.objects.get(acronym='ietf'))
         self.assertTrue(EMAIL_ALIASES['IETFCHAIR'] in contacts)
         # test iab
-        contacts = get_contacts_for_group(Group.objects.get(acronym='iab'))
+        contacts = get_contacts_for_liaison_messages_for_group_secondary(Group.objects.get(acronym='iab'))
         self.assertTrue(EMAIL_ALIASES['IABCHAIR'] in contacts)
-        self.assertTrue(EMAIL_ALIASES['IABEXECUTIVEDIRECTOR'] in contacts)
         # test iesg
-        contacts = get_contacts_for_group(Group.objects.get(acronym='iesg'))
+        contacts = get_contacts_for_liaison_messages_for_group_secondary(Group.objects.get(acronym='iesg'))
         self.assertTrue(EMAIL_ALIASES['IESG'] in contacts)
 
     def test_needs_approval(self):
@@ -200,7 +214,6 @@ def test_ajax(self):
         self.assertEqual(r.status_code, 200)
         data = r.json()
         self.assertEqual(data["error"], False)
-        self.assertEqual(data["post_only"], False)
         self.assertTrue('cc' in data)
         self.assertTrue('needs_approval' in data)
         self.assertTrue('to_contacts' in data)
@@ -242,7 +255,7 @@ class ManagementCommandTests(TestCase):
     def test_check_liaison_deadlines(self):
         from django.core.management import call_command
 
-        LiaisonStatementFactory(deadline=datetime.date.today()+datetime.timedelta(days=1))
+        LiaisonStatementFactory(deadline=date_today(DEADLINE_TZINFO)+datetime.timedelta(days=1))
 
         out = io.StringIO()
         mailbox_before = len(outbox)
@@ -310,7 +323,7 @@ def test_add_comment(self):
         self.assertNotContains(r, 'Private comment')
 
     def test_taken_care_of(self):
-        liaison = LiaisonStatementFactory(deadline=datetime.date.today()+datetime.timedelta(days=1))
+        liaison = LiaisonStatementFactory(deadline=date_today(DEADLINE_TZINFO)+datetime.timedelta(days=1))
 
         url = urlreverse('ietf.liaisons.views.liaison_detail', kwargs=dict(object_id=liaison.pk))
         # normal get
@@ -360,6 +373,9 @@ def test_approval_process(self):
         self.assertEqual(len(q('form button[name=approved]')), 0)
 
         # check the detail page / authorized
+        r = self.client.post(url, dict(dead="1"))
+        self.assertEqual(r.status_code, 403)
+        mailbox_before = len(outbox)
         self.client.login(username="ulm-liaiman", password="ulm-liaiman+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
@@ -384,11 +400,13 @@ def test_approval_process(self):
         self.assertTrue(liaison.liaisonstatementevent_set.filter(type='posted'))
 
     def test_edit_liaison(self):
-        liaison = LiaisonStatementFactory(deadline=datetime.date.today()+datetime.timedelta(days=1))
-        LiaisonStatementEventFactory(statement=liaison,type_id='submitted', time=datetime.datetime.now()-datetime.timedelta(days=1))
+        liaison = LiaisonStatementFactory(deadline=date_today(DEADLINE_TZINFO) + datetime.timedelta(days=1))
+        LiaisonStatementEventFactory(statement=liaison,type_id='submitted', time=timezone.now()-datetime.timedelta(days=1))
         LiaisonStatementEventFactory(statement=liaison,type_id='posted')
         from_group = liaison.from_groups.first()
         to_group = liaison.to_groups.first()
+        rel1 = RelatedLiaisonStatementFactory(source=liaison)
+        rel2 = RelatedLiaisonStatementFactory(source=liaison)
 
         url = urlreverse('ietf.liaisons.views.liaison_edit', kwargs=dict(object_id=liaison.pk))
         login_testing_unauthorized(self, "secretary", url)
@@ -398,10 +416,18 @@ def test_edit_liaison(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertEqual(len(q('form input[name=from_contact]')), 1)
+        json_data = q('form select[name=related_to]').attr('data-pre')
+        try:
+            decoded = json.loads(json_data)
+        except json.JSONDecodeError as e:
+            self.fail('data-pre contained invalid JSON data: %s' % str(e))
+        decoded_ids = [item['id'] for item in decoded]
+        self.assertEqual(decoded_ids, [rel1.target.id, rel2.target.id])
 
         # edit
         attachments_before = liaison.attachments.count()
-        test_file = StringIO("hello world")
+        test_content = "hello world"
+        test_file = StringIO(test_content)
         test_file.name = "unnamed"
         r = self.client.post(url,
                              dict(from_groups=str(from_group.pk),
@@ -439,16 +465,20 @@ def test_edit_liaison(self):
         self.assertEqual(attachment.title, "attachment")
         with (Path(settings.LIAISON_ATTACH_PATH) / attachment.uploaded_filename).open() as f:
             written_content = f.read()
+        self.assertEqual(written_content, test_content)
+        self.assertEqual(
+            retrieve_str(attachment.type_id, attachment.uploaded_filename),
+            test_content,
+        )
 
-        test_file.seek(0)
-        self.assertEqual(written_content, test_file.read())
 
     def test_incoming_access(self):
-        '''Ensure only Secretariat, Liaison Managers, and Authorized Individuals
+        '''Ensure only Secretariat, Liaison Managers, Liaison Coordinators, and Authorized Individuals
         have access to incoming liaisons.
         '''
         sdo = RoleFactory(name_id='liaiman',group__type_id='sdo', person__user__username='ulm-liaiman').group
         RoleFactory(name_id='auth',group=sdo,person__user__username='ulm-auth')
+        RoleFactory(name_id='liaison_coordinator', group__acronym='iab', person__user__username='liaison-coordinator')
         stmt = LiaisonStatementFactory(from_groups=[sdo,])
         LiaisonStatementEventFactory(statement=stmt,type_id='posted')
         RoleFactory(name_id='chair',person__user__username='marschairman',group__acronym='mars')
@@ -481,6 +511,15 @@ def test_incoming_access(self):
         r = self.client.get(addurl)
         self.assertEqual(r.status_code, 200)
 
+        # Liaison Coordinator has access
+        self.client.login(username="liaison-coordinator", password="liaison-coordinator+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('a.btn:contains("New incoming liaison")')), 1)
+        r = self.client.get(addurl)
+        self.assertEqual(r.status_code, 200)
+
         # Authorized Individual has access
         self.client.login(username="ulm-auth", password="ulm-auth+password")
         r = self.client.get(url)
@@ -503,9 +542,9 @@ def test_outgoing_access(self):
 
         sdo = RoleFactory(name_id='liaiman',group__type_id='sdo', person__user__username='ulm-liaiman').group
         RoleFactory(name_id='auth',group=sdo,person__user__username='ulm-auth')
+        RoleFactory(name_id='liaison_coordinator', group__acronym='iab', person__user__username='liaison-coordinator')
         mars = RoleFactory(name_id='chair',person__user__username='marschairman',group__acronym='mars').group
         RoleFactory(name_id='secr',group=mars,person__user__username='mars-secr')
-        RoleFactory(name_id='execdir',group=Group.objects.get(acronym='iab'),person__user__username='iab-execdir')
 
         url = urlreverse('ietf.liaisons.views.liaison_list')
         addurl = urlreverse('ietf.liaisons.views.liaison_add', kwargs={'type':'outgoing'})
@@ -563,17 +602,17 @@ def test_outgoing_access(self):
         r = self.client.get(addurl)
         self.assertEqual(r.status_code, 200)
 
-        # IAB Executive Director
-        self.assertTrue(self.client.login(username="iab-execdir", password="iab-execdir+password"))
+        # Liaison Manager has access
+        self.assertTrue(self.client.login(username="ulm-liaiman", password="ulm-liaiman+password"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q("a.btn:contains('New outgoing liaison')")), 1)
+        self.assertEqual(len(q('a.btn:contains("New outgoing liaison")')), 1)
         r = self.client.get(addurl)
         self.assertEqual(r.status_code, 200)
 
-        # Liaison Manager has access
-        self.assertTrue(self.client.login(username="ulm-liaiman", password="ulm-liaiman+password"))
+        # Liaison Coordinator has access
+        self.assertTrue(self.client.login(username="liaison-coordinator", password="liaison-coordinator+password"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -691,12 +730,13 @@ def test_add_incoming_liaison(self):
 
         # add new
         mailbox_before = len(outbox)
-        test_file = StringIO("hello world")
+        test_content = "hello world"
+        test_file = StringIO(test_content)
         test_file.name = "unnamed"
         from_groups = [ str(g.pk) for g in Group.objects.filter(type="sdo") ]
         to_group = Group.objects.get(acronym="mars")
         submitter = Person.objects.get(user__username="marschairman")
-        today = datetime.date.today()
+        today = date_today(datetime.UTC)
         related_liaison = liaison
         r = self.client.post(url,
                              dict(from_groups=from_groups,
@@ -721,7 +761,7 @@ def test_add_incoming_liaison(self):
 
         l = LiaisonStatement.objects.all().order_by("-id")[0]
         self.assertEqual(l.from_groups.count(),2)
-        self.assertEqual(l.from_contact.address, submitter.email_address())
+        self.assertEqual(l.from_contact, submitter.email_address())
         self.assertSequenceEqual(l.to_groups.all(),[to_group])
         self.assertEqual(l.technical_contacts, "technical_contact@example.com")
         self.assertEqual(l.action_holder_contacts, "action_holder_contacts@example.com")
@@ -743,6 +783,11 @@ def test_add_incoming_liaison(self):
         self.assertEqual(attachment.title, "attachment")
         with (Path(settings.LIAISON_ATTACH_PATH) / attachment.uploaded_filename).open() as f:
             written_content = f.read()
+        self.assertEqual(written_content, test_content)
+        self.assertEqual(
+            retrieve_str(attachment.type_id, attachment.uploaded_filename),
+            test_content
+        )
 
         test_file.seek(0)
         self.assertEqual(written_content, test_file.read())
@@ -751,8 +796,11 @@ def test_add_incoming_liaison(self):
         self.assertTrue("Liaison Statement" in outbox[-1]["Subject"])
     
         self.assertTrue('to_contacts@' in outbox[-1]['To'])
+        self.assertTrue(submitter.email_address(), outbox[-1]['To'])
         self.assertTrue('cc@' in outbox[-1]['Cc'])
 
+
+
     def test_add_outgoing_liaison(self):
         RoleFactory(name_id='liaiman',group__type_id='sdo', person__user__username='ulm-liaiman')
         wg = RoleFactory(name_id='chair',person__user__username='marschairman',group__acronym='mars').group
@@ -770,12 +818,13 @@ def test_add_outgoing_liaison(self):
 
         # add new
         mailbox_before = len(outbox)
-        test_file = StringIO("hello world")
+        test_content = "hello world"
+        test_file = StringIO(test_content)
         test_file.name = "unnamed"
         from_group = Group.objects.get(acronym="mars")
         to_group = Group.objects.filter(type="sdo")[0]
         submitter = Person.objects.get(user__username="marschairman")
-        today = datetime.date.today()
+        today = date_today(datetime.UTC)
         related_liaison = liaison
         r = self.client.post(url,
                              dict(from_groups=str(from_group.pk),
@@ -800,7 +849,7 @@ def test_add_outgoing_liaison(self):
 
         l = LiaisonStatement.objects.all().order_by("-id")[0]
         self.assertSequenceEqual(l.from_groups.all(), [from_group])
-        self.assertEqual(l.from_contact.address, submitter.email_address())
+        self.assertEqual(l.from_contact, submitter.email_address())
         self.assertSequenceEqual(l.to_groups.all(), [to_group])
         self.assertEqual(l.to_contacts, "to_contacts@example.com")
         self.assertEqual(l.technical_contacts, "technical_contact@example.com")
@@ -822,58 +871,31 @@ def test_add_outgoing_liaison(self):
         self.assertEqual(attachment.title, "attachment")
         with (Path(settings.LIAISON_ATTACH_PATH) / attachment.uploaded_filename).open() as f:
             written_content = f.read()
-
-        test_file.seek(0)
-        self.assertEqual(written_content, test_file.read())
+        self.assertEqual(written_content, test_content)
+        self.assertEqual(
+            retrieve_str(attachment.type_id, attachment.uploaded_filename),
+            test_content
+        )
 
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("Liaison Statement" in outbox[-1]["Subject"])
         self.assertTrue('aread@' in outbox[-1]['To'])
-
-    def test_add_outgoing_liaison_unapproved_post_only(self):
-        RoleFactory(name_id='liaiman',group__type_id='sdo', person__user__username='ulm-liaiman')
-        mars = RoleFactory(name_id='chair',person__user__username='marschairman',group__acronym='mars').group
-        RoleFactory(name_id='ad',group=mars)
-
-        url = urlreverse('ietf.liaisons.views.liaison_add', kwargs={'type':'outgoing'})
-        login_testing_unauthorized(self, "secretary", url)
-
-        # add new
-        mailbox_before = len(outbox)
-        from_group = Group.objects.get(acronym="mars")
-        to_group = Group.objects.filter(type="sdo")[0]
-        submitter = Person.objects.get(user__username="marschairman")
-        today = datetime.date.today()
-        r = self.client.post(url,
-                             dict(from_groups=str(from_group.pk),
-                                  from_contact=submitter.email_address(),
-                                  to_groups=str(to_group.pk),
-                                  to_contacts='to_contacts@example.com',
-                                  approved="",
-                                  purpose="info",
-                                  title="title",
-                                  submitted_date=today.strftime("%Y-%m-%d"),
-                                  body="body",
-                                  post_only="1",
-                                  ))
-        self.assertEqual(r.status_code, 302)
-        l = LiaisonStatement.objects.all().order_by("-id")[0]
-        self.assertEqual(l.state.slug,'pending')
-        self.assertEqual(len(outbox), mailbox_before + 1)
+        self.assertTrue(submitter.email_address(), outbox[-1]['Cc'])
 
     def test_liaison_add_attachment(self):
-        liaison = LiaisonStatementFactory(deadline=datetime.date.today()+datetime.timedelta(days=1))
+        liaison = LiaisonStatementFactory(deadline=date_today(DEADLINE_TZINFO)+datetime.timedelta(days=1))
         LiaisonStatementEventFactory(statement=liaison,type_id='submitted')
 
         self.assertEqual(liaison.attachments.count(),0)
 
 
         # get minimum edit post data
-        file = StringIO('dummy file')
+        test_data = "dummy file"
+        file = StringIO(test_data)
         file.name = "upload.txt"
         post_data = dict(
             from_groups = ','.join([ str(x.pk) for x in liaison.from_groups.all() ]),
-            from_contact = liaison.from_contact.address,
+            from_contact = liaison.from_contact,
             to_groups = ','.join([ str(x.pk) for x in liaison.to_groups.all() ]),
             to_contacts = 'to_contacts@example.com',
             purpose = liaison.purpose.slug,
@@ -896,28 +918,50 @@ def test_liaison_add_attachment(self):
         self.assertEqual(liaison.attachments.count(),1)
         event = liaison.liaisonstatementevent_set.order_by('id').last()
         self.assertTrue(event.desc.startswith('Added attachment'))
+        attachment = liaison.attachments.get()
+        self.assertEqual(
+            retrieve_str(attachment.type_id, attachment.uploaded_filename),
+            test_data
+        )
 
     def test_liaison_edit_attachment(self):
-
-        attachment = LiaisonStatementAttachmentFactory(document__name='liaiatt-1')
-        url = urlreverse('ietf.liaisons.views.liaison_edit_attachment', kwargs=dict(object_id=attachment.statement_id,doc_id=attachment.document_id))
+        attachment = LiaisonStatementAttachmentFactory(document__name="liaiatt-1")
+        url = urlreverse(
+            "ietf.liaisons.views.liaison_edit_attachment",
+            kwargs=dict(
+                object_id=attachment.statement_id, doc_id=attachment.document_id
+            ),
+        )
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        post_data = dict(title='New Title')
-        r = self.client.post(url,post_data)
+        post_data = dict(title="New Title")
+        r = self.client.post(url, post_data)
         attachment = LiaisonStatementAttachment.objects.get(pk=attachment.pk)
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(attachment.document.title,'New Title')
-
-    def test_liaison_delete_attachment(self):
-        attachment = LiaisonStatementAttachmentFactory(document__name='liaiatt-1')
-        liaison = attachment.statement
-        url = urlreverse('ietf.liaisons.views.liaison_delete_attachment', kwargs=dict(object_id=liaison.pk,attach_id=attachment.pk))
-        login_testing_unauthorized(self, "secretary", url)
+        self.assertEqual(attachment.document.title, "New Title")
+
+        # ensure attempts to edit attachments not attached to this liaison statement fail
+        other_attachment = LiaisonStatementAttachmentFactory(document__name="liaiatt-2")
+        url = urlreverse(
+            "ietf.liaisons.views.liaison_edit_attachment",
+            kwargs=dict(
+                object_id=attachment.statement_id, doc_id=other_attachment.document_id
+            ),
+        )
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(liaison.liaisonstatementattachment_set.filter(removed=False).count(),0)
+        self.assertEqual(r.status_code, 404)
+        r = self.client.post(url, dict(title="New Title"))
+        self.assertEqual(r.status_code, 404)
+
+    # def test_liaison_delete_attachment(self):
+    #     attachment = LiaisonStatementAttachmentFactory(document__name='liaiatt-1')
+    #     liaison = attachment.statement
+    #     url = urlreverse('ietf.liaisons.views.liaison_delete_attachment', kwargs=dict(object_id=liaison.pk,attach_id=attachment.pk))
+    #     login_testing_unauthorized(self, "secretary", url)
+    #     r = self.client.get(url)
+    #     self.assertEqual(r.status_code, 302)
+    #     self.assertEqual(liaison.liaisonstatementattachment_set.filter(removed=False).count(),0)
 
     def test_in_response(self):
         '''A statement with purpose=in_response must have related statement specified'''
@@ -1021,7 +1065,7 @@ def test_search(self):
         LiaisonStatementEventFactory(type_id='posted', statement__body="Has recently in its body",statement__from_groups=[GroupFactory(type_id='sdo',acronym='ulm'),])
         # Statement 2
         s2 = LiaisonStatementEventFactory(type_id='posted', statement__body="That word does not occur here", statement__title="Nor does it occur here")
-        s2.time=datetime.datetime(2010,1,1)
+        s2.time=datetime.datetime(2010, 1, 1, tzinfo=datetime.UTC)
         s2.save()
 
         # test list only, no search filters
@@ -1086,17 +1130,6 @@ def test_redirect_for_approval(self):
     # -------------------------------------------------
     # Form validations
     # -------------------------------------------------
-    def test_post_and_send_fail(self):
-        RoleFactory(name_id='liaiman',person__user__username='ulm-liaiman',group__type_id='sdo',group__acronym='ulm')
-        GroupFactory(type_id='wg',acronym='mars')
-
-        url = urlreverse('ietf.liaisons.views.liaison_add', kwargs={'type':'incoming'})
-        login_testing_unauthorized(self, "ulm-liaiman", url)
-
-        r = self.client.post(url,get_liaison_post_data(),follow=True)
-
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, 'As an IETF Liaison Manager you can not send incoming liaison statements')
 
     def test_deadline_field(self):
         '''Required for action, comment, not info, response'''
@@ -1148,7 +1181,7 @@ def test_send_sdo_reminder(self):
         self.assertTrue('ulm-liaiman@' in outbox[-1]['To'])
 
     def test_send_liaison_deadline_reminder(self):
-        liaison = LiaisonStatementFactory(deadline=datetime.date.today()+datetime.timedelta(days=1))
+        liaison = LiaisonStatementFactory(deadline=date_today(DEADLINE_TZINFO) + datetime.timedelta(days=1))
 
         mailbox_before = len(outbox)
         possibly_send_deadline_reminder(liaison)
@@ -1161,4 +1194,4 @@ def test_send_liaison_deadline_reminder(self):
 
         mailbox_before = len(outbox)
         possibly_send_deadline_reminder(liaison)
-        self.assertEqual(len(outbox), mailbox_before)
\ No newline at end of file
+        self.assertEqual(len(outbox), mailbox_before)
diff --git a/ietf/liaisons/tests_forms.py b/ietf/liaisons/tests_forms.py
new file mode 100644
index 0000000000..101c0c8298
--- /dev/null
+++ b/ietf/liaisons/tests_forms.py
@@ -0,0 +1,217 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from ietf.group.factories import GroupFactory, RoleFactory
+from ietf.group.models import Group
+from ietf.liaisons.forms import (
+    flatten_choices,
+    choices_from_group_queryset,
+    all_internal_groups,
+    internal_groups_for_person,
+    external_groups_for_person,
+)
+from ietf.person.factories import PersonFactory
+from ietf.person.models import Person
+from ietf.utils.test_utils import TestCase
+
+
+class HelperTests(TestCase):
+    @staticmethod
+    def _alphabetically_by_acronym(group_list):
+        return sorted(group_list, key=lambda item: item.acronym)
+
+    def test_choices_from_group_queryset(self):
+        main_groups = list(Group.objects.filter(acronym__in=["ietf", "iab"]))
+        areas = GroupFactory.create_batch(2, type_id="area")
+        wgs = GroupFactory.create_batch(2)
+
+        # No groups
+        self.assertEqual(
+            choices_from_group_queryset(Group.objects.none()),
+            [],
+        )
+
+        # Main groups only
+        choices = choices_from_group_queryset(
+            Group.objects.filter(pk__in=[g.pk for g in main_groups])
+        )
+        self.assertEqual(len(choices), 1, "show one optgroup, hide empty ones")
+        self.assertEqual(choices[0][0], "Main IETF Entities")
+        self.assertEqual(
+            [val for val, _ in choices[0][1]],  # extract the choice value
+            [g.pk for g in self._alphabetically_by_acronym(main_groups)],
+        )
+
+        # Area groups only
+        choices = choices_from_group_queryset(
+            Group.objects.filter(pk__in=[g.pk for g in areas])
+        )
+        self.assertEqual(len(choices), 1, "show one optgroup, hide empty ones")
+        self.assertEqual(choices[0][0], "IETF Areas")
+        self.assertEqual(
+            [val for val, _ in choices[0][1]],  # extract the choice value
+            [g.pk for g in self._alphabetically_by_acronym(areas)],
+        )
+
+        # WGs only
+        choices = choices_from_group_queryset(
+            Group.objects.filter(pk__in=[g.pk for g in wgs])
+        )
+        self.assertEqual(len(choices), 1, "show one optgroup, hide empty ones")
+        self.assertEqual(choices[0][0], "IETF Working Groups")
+        self.assertEqual(
+            [val for val, _ in choices[0][1]],  # extract the choice value
+            [g.pk for g in self._alphabetically_by_acronym(wgs)],
+        )
+
+        # All together
+        choices = choices_from_group_queryset(
+            Group.objects.filter(pk__in=[g.pk for g in main_groups + areas + wgs])
+        )
+        self.assertEqual(len(choices), 3, "show all three optgroups")
+        self.assertEqual(
+            [optgroup_label for optgroup_label, _ in choices],
+            ["Main IETF Entities", "IETF Areas", "IETF Working Groups"],
+        )
+        self.assertEqual(
+            [val for val, _ in choices[0][1]],  # extract the choice value
+            [g.pk for g in self._alphabetically_by_acronym(main_groups)],
+        )
+        self.assertEqual(
+            [val for val, _ in choices[1][1]],  # extract the choice value
+            [g.pk for g in self._alphabetically_by_acronym(areas)],
+        )
+        self.assertEqual(
+            [val for val, _ in choices[2][1]],  # extract the choice value
+            [g.pk for g in self._alphabetically_by_acronym(wgs)],
+        )
+
+    def test_all_internal_groups(self):
+        # test relies on the data created in ietf.utils.test_data.make_immutable_test_data()
+        self.assertCountEqual(
+            all_internal_groups().values_list("acronym", flat=True),
+            {"ietf", "iab", "iesg", "farfut", "ops", "sops"},
+        )
+
+    def test_internal_groups_for_person(self):
+        # test relies on the data created in ietf.utils.test_data.make_immutable_test_data()
+        # todo add liaison coordinator when modeled
+        RoleFactory(
+            name_id="auth",
+            group__type_id="sdo",
+            group__acronym="sdo",
+            person__user__username="sdo-authperson",
+        )
+
+        self.assertQuerysetEqual(
+            internal_groups_for_person(None),
+            Group.objects.none(),
+            msg="no Person means no groups",
+        )
+        self.assertQuerysetEqual(
+            internal_groups_for_person(PersonFactory()),
+            Group.objects.none(),
+            msg="no Role means no groups",
+        )
+
+        for username in (
+            "secretary",
+            "ietf-chair",
+            "iab-chair",
+            "sdo-authperson",
+        ):
+            returned_queryset = internal_groups_for_person(
+                Person.objects.get(user__username=username)
+            )
+            self.assertCountEqual(
+                returned_queryset.values_list("acronym", flat=True),
+                {"ietf", "iab", "iesg", "farfut", "ops", "sops"},
+                f"{username} should get all groups",
+            )
+
+        # "ops-ad" user is the AD of the "ops" area, which contains the "sops" wg
+        self.assertCountEqual(
+            internal_groups_for_person(
+                Person.objects.get(user__username="ops-ad")
+            ).values_list("acronym", flat=True),
+            {"ietf", "iesg", "ops", "sops"},
+            "area director should get only their area, its wgs, and the ietf/iesg groups",
+        )
+
+        self.assertCountEqual(
+            internal_groups_for_person(
+                Person.objects.get(user__username="sopschairman"),
+            ).values_list("acronym", flat=True),
+            {"sops"},
+            "wg chair should get only their wg",
+        )
+
+    def test_external_groups_for_person(self):
+        RoleFactory(name_id="liaison_coordinator", group__acronym="iab", person__user__username="liaison-coordinator")
+        the_sdo = GroupFactory(type_id="sdo", acronym="the-sdo")
+        liaison_manager = RoleFactory(name_id="liaiman", group=the_sdo).person
+        authperson = RoleFactory(name_id="auth", group=the_sdo).person
+
+        GroupFactory(acronym="other-sdo", type_id="sdo")
+        for username in (
+            "secretary",
+            "ietf-chair",
+            "iab-chair",
+            "liaison-coordinator",
+            "ad",
+            "sopschairman",
+            "sopssecretary",
+        ):
+            person = Person.objects.get(user__username=username)
+            self.assertCountEqual(
+                external_groups_for_person(
+                    person,
+                ).values_list("acronym", flat=True),
+                {"the-sdo", "other-sdo"},
+                f"{username} should get all SDO groups",
+            )
+            tmp_role = RoleFactory(name_id="chair", group__type_id="wg", person=person)
+            self.assertCountEqual(
+                external_groups_for_person(
+                    person,
+                ).values_list("acronym", flat=True),
+                {"the-sdo", "other-sdo"},
+                f"{username} should still get all SDO groups when they also a liaison manager",
+            )
+            tmp_role.delete()
+
+        self.assertCountEqual(
+            external_groups_for_person(liaison_manager).values_list(
+                "acronym", flat=True
+            ),
+            {"the-sdo"},
+            "liaison manager should get only their SDO group",
+        )
+        self.assertCountEqual(
+            external_groups_for_person(authperson).values_list("acronym", flat=True),
+            {"the-sdo"},
+            "authorized individual should get only their SDO group",
+        )
+
+    def test_flatten_choices(self):
+        self.assertEqual(flatten_choices([]), [])
+        self.assertEqual(
+            flatten_choices(
+                (
+                    ("group A", ()),
+                    ("group B", (("val0", "label0"), ("val1", "label1"))),
+                    ("group C", (("val2", "label2"),)),
+                )
+            ),
+            [("val0", "label0"), ("val1", "label1"), ("val2", "label2")],
+        )
+
+
+class IncomingLiaisonFormTests(TestCase):
+    pass
+
+
+class OutgoingLiaisonFormTests(TestCase):
+    pass
+
+
+class EditLiaisonFormTests(TestCase):
+    pass
diff --git a/ietf/liaisons/urls.py b/ietf/liaisons/urls.py
index a4afbfef5d..498df3b965 100644
--- a/ietf/liaisons/urls.py
+++ b/ietf/liaisons/urls.py
@@ -26,8 +26,8 @@
     url(r'^(?P<object_id>\d+)/$', views.liaison_detail),
     url(r'^(?P<object_id>\d+)/addcomment/$', views.add_comment),
     url(r'^(?P<object_id>\d+)/edit/$', views.liaison_edit),
-    url(r'^(?P<object_id>\d+)/edit-attachment/(?P<doc_id>[A-Za-z0-9._+-]+)$', views.liaison_edit_attachment),
-    url(r'^(?P<object_id>\d+)/delete-attachment/(?P<attach_id>[A-Za-z0-9._+-]+)$', views.liaison_delete_attachment),
+    url(r'^(?P<object_id>\d+)/edit-attachment/(?P<doc_id>[0-9]+)$', views.liaison_edit_attachment),
+    url(r'^(?P<object_id>\d+)/delete-attachment/(?P<attach_id>[0-9]+)$', views.liaison_delete_attachment),
     url(r'^(?P<object_id>\d+)/history/$', views.liaison_history),
     url(r'^(?P<object_id>\d+)/reply/$', views.liaison_reply),
     url(r'^(?P<object_id>\d+)/resend/$', views.liaison_resend),
@@ -37,4 +37,5 @@
     url(r'^add/$', views.redirect_add),
     url(r'^for_approval/$', views.redirect_for_approval),
     url(r'^for_approval/(?P<object_id>\d+)/$', views.redirect_for_approval),
+    url(r"^list_other_sdo/$", views.list_other_sdo),
 ]
diff --git a/ietf/liaisons/utils.py b/ietf/liaisons/utils.py
index df48831917..469bbc5c87 100644
--- a/ietf/liaisons/utils.py
+++ b/ietf/liaisons/utils.py
@@ -4,6 +4,21 @@
 from ietf.liaisons.models import LiaisonStatement
 from ietf.ietfauth.utils import has_role, passes_test_decorator
 
+# Roles allowed to create and manage outgoing liaison statements.
+OUTGOING_LIAISON_ROLES = [
+    "Area Director",
+    "IAB Chair",
+    "IETF Chair",
+    "Liaison Manager",
+    "Liaison Coordinator",
+    "Secretariat",
+    "WG Chair",
+    "WG Secretary",
+]
+
+# Roles allowed to create and manage incoming liaison statements.
+INCOMING_LIAISON_ROLES = ["Authorized Individual", "Liaison Manager", "Liaison Coordinator", "Secretariat"]
+
 can_submit_liaison_required = passes_test_decorator(
     lambda u, *args, **kwargs: can_add_liaison(u),
     "Restricted to participants who are authorized to submit liaison statements on behalf of the various IETF entities")
@@ -30,13 +45,13 @@ def can_edit_liaison(user, liaison):
     '''Returns True if user has edit / approval authority.
     
     True if:
-    - user is Secretariat
+    - user is Secretariat or Liaison Coordinator
     - liaison is outgoing and user has approval authority
     - user is liaison manager of all SDOs involved
     '''
     if not user.is_authenticated:
         return False
-    if has_role(user, "Secretariat"):
+    if has_role(user, "Secretariat") or has_role(user, "Liaison Coordinator"):
         return True
 
     if liaison.is_outgoing() and liaison in approvable_liaison_statements(user):
@@ -59,11 +74,10 @@ def get_person_for_user(user):
         return None
 
 def can_add_outgoing_liaison(user):
-    return has_role(user, ["Area Director","WG Chair","WG Secretary","IETF Chair","IAB Chair",
-        "IAB Executive Director","Liaison Manager","Secretariat"])
+    return has_role(user, OUTGOING_LIAISON_ROLES)
 
 def can_add_incoming_liaison(user):
-    return has_role(user, ["Liaison Manager","Authorized Individual","Secretariat"])
+    return has_role(user, INCOMING_LIAISON_ROLES)
 
 def can_add_liaison(user):
     return can_add_incoming_liaison(user) or can_add_outgoing_liaison(user)
diff --git a/ietf/liaisons/views.py b/ietf/liaisons/views.py
index a8e80a5194..59c6ea69fc 100644
--- a/ietf/liaisons/views.py
+++ b/ietf/liaisons/views.py
@@ -7,19 +7,17 @@
 
 from django.contrib import messages
 from django.urls import reverse as urlreverse
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, ObjectDoesNotExist, PermissionDenied
 from django.core.validators import validate_email
 from django.db.models import Q, Prefetch
-from django.http import HttpResponse
+from django.http import Http404, HttpResponse
 from django.shortcuts import render, get_object_or_404, redirect
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import Document
 from ietf.ietfauth.utils import role_required, has_role
 from ietf.group.models import Group, Role
-from ietf.liaisons.models import (LiaisonStatement,LiaisonStatementEvent,
-    LiaisonStatementAttachment)
+from ietf.liaisons.models import LiaisonStatement,LiaisonStatementEvent
 from ietf.liaisons.utils import (get_person_for_user, can_add_outgoing_liaison,
     can_add_incoming_liaison, can_edit_liaison,can_submit_liaison_required,
     can_add_liaison)
@@ -29,13 +27,6 @@
 from ietf.name.models import LiaisonStatementTagName
 from ietf.utils.response import permission_denied
 
-EMAIL_ALIASES = {
-    'IETFCHAIR':'The IETF Chair <chair@ietf.org>',
-    'IESG':'The IESG <iesg@ietf.org>',
-    'IAB':'The IAB <iab@iab.org>',
-    'IABCHAIR':'The IAB Chair <iab-chair@iab.org>',
-    'IABEXECUTIVEDIRECTOR':'The IAB Executive Director <execd@iab.org>'}
-
 # -------------------------------------------------
 # Helper Functions
 # -------------------------------------------------
@@ -57,7 +48,7 @@ def _can_take_care(liaison, user):
         return False
 
     if user.is_authenticated:
-        if has_role(user, "Secretariat"):
+        if has_role(user, "Secretariat") or has_role(user, "Liaison Coordinator"):
             return True
         else:
             return _find_person_in_emails(liaison, get_person_for_user(user))
@@ -84,8 +75,6 @@ def _find_person_in_emails(liaison, person):
             return True
         elif addr in ('iab@iab.org', 'iab-chair@iab.org') and has_role(person.user, "IAB Chair"):
             return True
-        elif addr in ('execd@iab.org', ) and has_role(person.user, "IAB Executive Director"):
-            return True
 
     return False
 
@@ -97,66 +86,6 @@ def contacts_from_roles(roles):
     emails = [ contact_email_from_role(r) for r in roles ]
     return ','.join(emails)
 
-def get_cc(group):
-    '''Returns list of emails to use as CC for group.  Simplified refactor of IETFHierarchy
-    get_cc() and get_from_cc()
-    '''
-    emails = []
-
-    # role based CCs
-    if group.acronym in ('ietf','iesg'):
-        emails.append(EMAIL_ALIASES['IESG'])
-        emails.append(EMAIL_ALIASES['IETFCHAIR'])
-    elif group.acronym in ('iab'):
-        emails.append(EMAIL_ALIASES['IAB'])
-        emails.append(EMAIL_ALIASES['IABCHAIR'])
-        emails.append(EMAIL_ALIASES['IABEXECUTIVEDIRECTOR'])
-    elif group.type_id == 'area':
-        emails.append(EMAIL_ALIASES['IETFCHAIR'])
-        ad_roles = group.role_set.filter(name='ad')
-        emails.extend([ contact_email_from_role(r) for r in ad_roles ])
-    elif group.type_id == 'wg':
-        ad_roles = group.parent.role_set.filter(name='ad')
-        emails.extend([ contact_email_from_role(r) for r in ad_roles ])
-        chair_roles = group.role_set.filter(name='chair')
-        emails.extend([ contact_email_from_role(r) for r in chair_roles ])
-        if group.list_email:
-            emails.append('{} Discussion List <{}>'.format(group.name,group.list_email))
-    elif group.type_id == 'sdo':
-        liaiman_roles = group.role_set.filter(name='liaiman')
-        emails.extend([ contact_email_from_role(r) for r in liaiman_roles ])
-
-    # explicit CCs
-    liaison_cc_roles = group.role_set.filter(name='liaison_cc_contact')
-    emails.extend([ contact_email_from_role(r) for r in liaison_cc_roles ])
-
-    return emails
-
-def get_contacts_for_group(group):
-    '''Returns default contacts for groups as a comma separated string'''
-    # use explicit default contacts if defined
-    explicit_contacts = contacts_from_roles(group.role_set.filter(name='liaison_contact'))
-    if explicit_contacts:
-        return explicit_contacts
-
-    # otherwise construct based on group type
-    contacts = []
-    if group.type_id == 'area':
-        roles = group.role_set.filter(name='ad')
-        contacts.append(contacts_from_roles(roles))
-    elif group.type_id == 'wg':
-        roles = group.role_set.filter(name='chair')
-        contacts.append(contacts_from_roles(roles))
-    elif group.acronym == 'ietf':
-        contacts.append(EMAIL_ALIASES['IETFCHAIR'])
-    elif group.acronym == 'iab':
-        contacts.append(EMAIL_ALIASES['IABCHAIR'])
-        contacts.append(EMAIL_ALIASES['IABEXECUTIVEDIRECTOR'])
-    elif group.acronym == 'iesg':
-        contacts.append(EMAIL_ALIASES['IESG'])
-
-    return ','.join(contacts)
-
 def get_details_tabs(stmt, selected):
     return [
         t + (t[0].lower() == selected.lower(),)
@@ -171,7 +100,7 @@ def needs_approval(group,person):
     user = person.user
     if group.acronym in ('ietf','iesg') and has_role(user, 'IETF Chair'):
         return False
-    if group.acronym == 'iab' and (has_role(user,'IAB Chair') or has_role(user,'IAB Executive Director')):
+    if group.acronym == 'iab' and has_role(user,'IAB Chair'):
         return False
     if group.type_id == 'area' and group.role_set.filter(name='ad',person=person):
         return False
@@ -189,23 +118,14 @@ def normalize_sort(request):
 
     return sort, order_by
 
-def post_only(group,person):
-    '''Returns true if the user is restricted to post_only (vs. post_and_send) for this
-    group.  This is for incoming liaison statements.
-    - Secretariat have full access.
-    - Authorized Individuals have full access for the group they are associated with
-    - Liaison Managers can post only
-    '''
-    if group.type_id == 'sdo' and ( not(has_role(person.user,"Secretariat") or group.role_set.filter(name='auth',person=person)) ):
-        return True
-    else:
-        return False
 
 # -------------------------------------------------
 # Ajax Functions
 # -------------------------------------------------
 @can_submit_liaison_required
 def ajax_get_liaison_info(request):
+    from ietf.mailtrigger.utils import get_contacts_for_liaison_messages_for_group_primary,get_contacts_for_liaison_messages_for_group_secondary
+
     '''Returns dictionary of info to update entry form given the groups
     that have been selected
     '''
@@ -222,20 +142,18 @@ def ajax_get_liaison_info(request):
 
     cc = []
     does_need_approval = []
-    can_post_only = []
     to_contacts = []
     response_contacts = []
-    result = {'response_contacts':[],'to_contacts': [], 'cc': [], 'needs_approval': False, 'post_only': False, 'full_list': []}
+    result = {'response_contacts':[],'to_contacts': [], 'cc': [], 'needs_approval': False, 'full_list': []}
 
     for group in from_groups:
-        cc.extend(get_cc(group))
+        cc.extend(get_contacts_for_liaison_messages_for_group_primary(group))
         does_need_approval.append(needs_approval(group,person))
-        can_post_only.append(post_only(group,person))
-        response_contacts.append(get_contacts_for_group(group))
+        response_contacts.append(get_contacts_for_liaison_messages_for_group_secondary(group))
 
     for group in to_groups:
-        cc.extend(get_cc(group))
-        to_contacts.append(get_contacts_for_group(group))
+        cc.extend(get_contacts_for_liaison_messages_for_group_primary(group))
+        to_contacts.append(get_contacts_for_liaison_messages_for_group_secondary(group))
 
     # if there are from_groups and any need approval
     if does_need_approval:
@@ -246,12 +164,15 @@ def ajax_get_liaison_info(request):
     else:
         does_need_approval = True
 
-    result.update({'error': False,
-                   'cc': list(set(cc)),
-                   'response_contacts':list(set(response_contacts)),
-                   'to_contacts': list(set(to_contacts)),
-                   'needs_approval': does_need_approval,
-                   'post_only': any(can_post_only)})
+    result.update(
+        {
+            "error": False,
+            "cc": list(set(cc)),
+            "response_contacts": list(set(response_contacts)),
+            "to_contacts": list(set(to_contacts)),
+            "needs_approval": does_need_approval,
+        }
+    )
 
     json_result = json.dumps(result)
     return HttpResponse(json_result, content_type='application/json')
@@ -375,23 +296,29 @@ def liaison_history(request, object_id):
 
 def liaison_delete_attachment(request, object_id, attach_id):
     liaison = get_object_or_404(LiaisonStatement, pk=object_id)
-    attach = get_object_or_404(LiaisonStatementAttachment, pk=attach_id)
+
     if not can_edit_liaison(request.user, liaison):
         permission_denied(request, "You are not authorized for this action.")
-
-    # FIXME: this view should use POST instead of GET when deleting
-    attach.removed = True
-    attach.save()
-
-    # create event
-    LiaisonStatementEvent.objects.create(
-        type_id='modified',
-        by=get_person_for_user(request.user),
-        statement=liaison,
-        desc='Attachment Removed: {}'.format(attach.document.title)
-    )
-    messages.success(request, 'Attachment Deleted')
-    return redirect('ietf.liaisons.views.liaison_detail', object_id=liaison.pk)
+    else:
+        permission_denied(request, "This operation is temporarily unavailable. Ask the secretariat to mark the attachment as removed using the admin.")
+
+    # The following will be replaced with a different approach in the next generation of the liaison tool
+    # attach = get_object_or_404(LiaisonStatementAttachment, pk=attach_id)
+
+    # # FIXME: this view should use POST instead of GET when deleting
+    # attach.removed = True
+    # debug.say("Got here")
+    # attach.save()
+
+    # # create event
+    # LiaisonStatementEvent.objects.create(
+    #     type_id='modified',
+    #     by=get_person_for_user(request.user),
+    #     statement=liaison,
+    #     desc='Attachment Removed: {}'.format(attach.document.title)
+    # )
+    # messages.success(request, 'Attachment Deleted')
+    # return redirect('ietf.liaisons.views.liaison_detail', object_id=liaison.pk)
 
 def liaison_detail(request, object_id):
     liaison = get_object_or_404(LiaisonStatement, pk=object_id)
@@ -402,22 +329,28 @@ def liaison_detail(request, object_id):
 
 
     if request.method == 'POST':
-        if request.POST.get('approved'):
-            liaison.change_state(state_id='approved',person=person)
-            liaison.change_state(state_id='posted',person=person)
-            send_liaison_by_email(request, liaison)
-            messages.success(request,'Liaison Statement Approved and Posted')
-        elif request.POST.get('dead'):
-            liaison.change_state(state_id='dead',person=person)
-            messages.success(request,'Liaison Statement Killed')
-        elif request.POST.get('resurrect'):
-            liaison.change_state(state_id='pending',person=person)
-            messages.success(request,'Liaison Statement Resurrected')
-        elif request.POST.get('do_action_taken') and can_take_care:
+        if request.POST.get('do_action_taken') and can_take_care:
             liaison.tags.remove('required')
             liaison.tags.add('taken')
             can_take_care = False
             messages.success(request,'Action handled')
+        else:
+            if can_edit:
+                if request.POST.get('approved'):
+                    liaison.change_state(state_id='approved',person=person)
+                    liaison.change_state(state_id='posted',person=person)
+                    send_liaison_by_email(request, liaison)
+                    messages.success(request,'Liaison Statement Approved and Posted')
+                elif request.POST.get('dead'):
+                    liaison.change_state(state_id='dead',person=person)
+                    messages.success(request,'Liaison Statement Killed')
+                elif request.POST.get('resurrect'):
+                    liaison.change_state(state_id='pending',person=person)
+                    messages.success(request,'Liaison Statement Resurrected')
+                else:
+                    pass
+            else:
+                raise PermissionDenied()
 
     relations_by = [i.target for i in liaison.source_of_set.filter(target__state__slug='posted')]
     relations_to = [i.source for i in liaison.target_of_set.filter(source__state__slug='posted')]
@@ -441,7 +374,11 @@ def liaison_edit(request, object_id):
 def liaison_edit_attachment(request, object_id, doc_id):
     '''Edit the Liaison Statement attachment title'''
     liaison = get_object_or_404(LiaisonStatement, pk=object_id)
-    doc = get_object_or_404(Document, pk=doc_id)
+    try:
+       doc = liaison.attachments.get(pk=doc_id)
+    except ObjectDoesNotExist:
+        raise Http404
+
     if not can_edit_liaison(request.user, liaison):
         permission_denied(request, "You are not authorized for this action.")
 
@@ -572,3 +509,17 @@ def liaison_resend(request, object_id):
     messages.success(request,'Liaison Statement resent')
     return redirect('ietf.liaisons.views.liaison_list')
 
+
+@role_required("Secretariat", "IAB", "Liaison Coordinator", "Liaison Manager")
+def list_other_sdo(request):
+    def _sdo_order_key(obj:Group)-> tuple[str,str]:
+        state_order = {
+            "active" : "a",
+            "conclude": "b",
+        }
+        return (state_order.get(obj.state.slug,f"c{obj.state.slug}"), obj.acronym)
+
+    sdos = sorted(list(Group.objects.filter(type="sdo")),key = _sdo_order_key)
+    for sdo in sdos:
+        sdo.liaison_managers =[r.person for r in sdo.role_set.filter(name="liaiman")]
+    return render(request,"liaisons/list_other_sdo.html",dict(sdos=sdos))
diff --git a/ietf/liaisons/widgets.py b/ietf/liaisons/widgets.py
index d6e2fe936b..48db8af0a3 100644
--- a/ietf/liaisons/widgets.py
+++ b/ietf/liaisons/widgets.py
@@ -3,11 +3,12 @@
 
 
 from django.urls import reverse as urlreverse
-from django.db.models.query import QuerySet
 from django.forms.widgets import Widget
 from django.utils.safestring import mark_safe
 from django.utils.html import conditional_escape
 
+from django_stubs_ext import QuerySetAny
+
 
 class ButtonWidget(Widget):
     def __init__(self, *args, **kwargs):
@@ -25,7 +26,9 @@ def render(self, name, value, **kwargs):
                 html += '<span class="d-none attachRequiredField">%s</span>' % conditional_escape(i)
             required_str = 'Please fill in %s to attach a new file' % conditional_escape(self.required_label)
             html += '<span class="d-none attachDisabledLabel">%s</span>' % conditional_escape(required_str)
-        html += '<button type="button" class="addAttachmentWidget btn btn-primary btn-sm">%s</button>' % conditional_escape(self.label)
+        html += '<button type="button" id="{}" class="addAttachmentWidget btn btn-primary btn-sm">{}</button>'.format(
+            f"id_{name}", conditional_escape(self.label)
+        )
         return mark_safe(html)
 
 
@@ -34,7 +37,7 @@ def render(self, name, value, **kwargs):
         html = '<div id="id_%s">' % name
         html += '<span class="d-none showAttachmentsEmpty form-control widget">No files attached</span>'
         html += '<div class="attachedFiles form-control widget">'
-        if value and isinstance(value, QuerySet):
+        if value and isinstance(value, QuerySetAny):
             for attachment in value:
                 html += '<a class="initialAttach" href="%s">%s</a>&nbsp' % (conditional_escape(attachment.document.get_href()), conditional_escape(attachment.document.title))
                 html += '<a class="btn btn-primary btn-sm" href="{}">Edit</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk}))
@@ -43,4 +46,4 @@ def render(self, name, value, **kwargs):
         else:
             html += 'No files attached'
         html += '</div></div>'
-        return mark_safe(html)
\ No newline at end of file
+        return mark_safe(html)
diff --git a/ietf/mailinglists/.gitignore b/ietf/mailinglists/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/mailinglists/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/mailinglists/admin.py b/ietf/mailinglists/admin.py
index aaa0868237..081ee6477c 100644
--- a/ietf/mailinglists/admin.py
+++ b/ietf/mailinglists/admin.py
@@ -2,22 +2,17 @@
 
 from django.contrib import admin
 
-from ietf.mailinglists.models import List, Subscribed, Whitelisted
+from ietf.mailinglists.models import NonWgMailingList, Allowlisted
 
 
-class ListAdmin(admin.ModelAdmin):
-    list_display = ('id', 'name', 'description', 'advertised')
-    search_fields = ('name',)
-admin.site.register(List, ListAdmin)
 
 
-class SubscribedAdmin(admin.ModelAdmin):
-    list_display = ('id', 'time', 'email')
-    raw_id_fields = ('lists',)
-    search_fields = ('email',)
-admin.site.register(Subscribed, SubscribedAdmin)
+class NonWgMailingListAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'domain', 'description')
+    search_fields = ('name', 'domain')
+admin.site.register(NonWgMailingList, NonWgMailingListAdmin)
 
 
-class WhitelistedAdmin(admin.ModelAdmin):
+class AllowlistedAdmin(admin.ModelAdmin):
     list_display = ('id', 'time', 'email', 'by')
-admin.site.register(Whitelisted, WhitelistedAdmin)
+admin.site.register(Allowlisted, AllowlistedAdmin)
diff --git a/ietf/mailinglists/factories.py b/ietf/mailinglists/factories.py
index bc6b2b8203..3be5770d76 100644
--- a/ietf/mailinglists/factories.py
+++ b/ietf/mailinglists/factories.py
@@ -3,16 +3,15 @@
 
 
 import factory
-import random
 
-from ietf.mailinglists.models import List
+from ietf.mailinglists.models import NonWgMailingList
 
-class ListFactory(factory.django.DjangoModelFactory):
+class NonWgMailingListFactory(factory.django.DjangoModelFactory):
     class Meta:
-        model = List
+        model = NonWgMailingList
 
     name = factory.Sequence(lambda n: "list-name-%s" % n)
+    domain = factory.Sequence(lambda n: "domain-%s.org" % n)
     description = factory.Faker('sentence', nb_words=10)
-    advertised = factory.LazyAttribute(lambda obj: random.randint(0, 1))
 
     
diff --git a/ietf/mailinglists/management/commands/import_mailman_listinfo.py b/ietf/mailinglists/management/commands/import_mailman_listinfo.py
deleted file mode 100644
index 43982f58b1..0000000000
--- a/ietf/mailinglists/management/commands/import_mailman_listinfo.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
-
-import json
-import sys
-import subprocess
-import time
-from textwrap import dedent
-
-import debug                            # pyflakes:ignore
-
-from pathlib import Path
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-from django.core.exceptions import MultipleObjectsReturned
-
-
-from ietf.mailinglists.models import List, Subscribed
-from ietf.utils.log import log
-
-mark = time.time()
-
-def import_mailman_listinfo(verbosity=0):
-    def note(msg):
-        if verbosity > 2:
-            sys.stdout.write(msg)
-            sys.stdout.write('\n')
-    def log_time(msg):
-        global mark
-        if verbosity > 1:
-            t = time.time()
-            log(msg+' (%.1fs)'% (t-mark))
-            mark = t
-
-    cmd = str(Path(settings.BASE_DIR) / "bin" / "mailman_listinfo.py")
-    result = subprocess.run([cmd], capture_output=True)
-    if result.stderr:
-        log("Error exporting information from mailmain")
-        log(result.stderr)
-        return
-    mailman_export = json.loads(result.stdout)
-
-    names = sorted(mailman_export.keys())
-    addr_max_length = Subscribed._meta.get_field('email').max_length
-    
-    subscribed = { l.name: set(l.subscribed_set.values_list('email', flat=True)) for l in List.objects.all().prefetch_related('subscribed_set') }
-
-    for name in names:
-        note("List: %s" % mailman_export[name]['internal_name'])
-
-        lists = List.objects.filter(name=mailman_export[name]['real_name'])
-        if lists.count() > 1:
-            # Arbitrary choice; we'll update the remaining item next
-            for item in lists[1:]:
-                item.delete()
-        mmlist, created = List.objects.get_or_create(name=mailman_export[name]['real_name'])
-        dirty = False
-        desc = mailman_export[name]['description'][:256]
-        if mmlist.description != desc:
-            mmlist.description = desc
-            dirty = True
-        if mmlist.advertised != mailman_export[name]['advertised']:
-            mmlist.advertised = mailman_export[name]['advertised']
-            dirty = True
-        if dirty:
-            mmlist.save()
-        # The following calls return lowercased addresses
-        if mailman_export[name]['advertised']:
-            members = set(mailman_export[name]['members'])
-            if not mailman_export[name]['real_name'] in subscribed:
-                # 2022-7-29: lots of these going into the logs but being ignored...
-                # log("Note: didn't find '%s' in the dictionary of subscriptions" % mailman_export[name]['real_name'])
-                continue
-            known = subscribed[mailman_export[name]['real_name']]
-            log_time("  Fetched known list members from database")            
-            to_remove = known - members
-            to_add = members - known
-            for addr in to_remove:
-                    note("  Removing subscription: %s" % (addr))
-                    old = Subscribed.objects.get(email=addr)
-                    old.lists.remove(mmlist)
-                    if old.lists.count() == 0:
-                        note("    Removing address with no subscriptions: %s" % (addr))
-                        old.delete()
-            if to_remove:
-                log("  Removed %s addresses from %s" % (len(to_remove), name))
-            for addr in to_add:
-                if len(addr) > addr_max_length:
-                    sys.stderr.write("    **  Email address subscribed to '%s' too long for table: <%s>\n" % (name, addr))
-                    continue
-                note("  Adding subscription: %s" % (addr))
-                try:
-                    new, created = Subscribed.objects.get_or_create(email=addr)
-                except MultipleObjectsReturned as e:
-                    sys.stderr.write("    **  Error handling %s in %s: %s\n" % (addr, name, e))
-                    continue
-                new.lists.add(mmlist)
-            if to_add:
-                log("  Added %s addresses to %s" % (len(to_add), name))
-    log("Completed import of list info from Mailman")    
-
-class Command(BaseCommand):
-    """
-    Import list information from Mailman.
-
-    Import announced list names, descriptions, and subscribers, by calling the
-    appropriate Mailman functions and adding entries to the database.
-
-    Run this from cron regularly, with sufficient permissions to access the
-    mailman database files.
-
-    """
-
-    help = dedent(__doc__).strip()
-            
-    #option_list = BaseCommand.option_list + (       )
-
-
-    def handle(self, *filenames, **options):
-        """
-
-        * Import announced lists, with appropriate meta-information.
-
-        * For each list, import the members.
-
-        """
-
-        verbosity = int(options.get('verbosity'))
-
-        import_mailman_listinfo(verbosity)
diff --git a/ietf/mailinglists/migrations/0001_initial.py b/ietf/mailinglists/migrations/0001_initial.py
index 52c04861c9..eaf5d24e31 100644
--- a/ietf/mailinglists/migrations/0001_initial.py
+++ b/ietf/mailinglists/migrations/0001_initial.py
@@ -1,7 +1,4 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
 import django.core.validators
 from django.db import migrations, models
@@ -32,7 +29,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('time', models.DateTimeField(auto_now_add=True)),
-                ('email', models.CharField(max_length=64, validators=[django.core.validators.EmailValidator()])),
+                ('email', models.CharField(max_length=128, validators=[django.core.validators.EmailValidator()])),
                 ('lists', models.ManyToManyField(to='mailinglists.List')),
             ],
             options={
@@ -40,7 +37,7 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='Whitelisted',
+            name='Allowlisted',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('time', models.DateTimeField(auto_now_add=True)),
@@ -48,7 +45,7 @@ class Migration(migrations.Migration):
                 ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
             options={
-                'verbose_name_plural': 'Whitelisted',
+                'verbose_name_plural': 'Allowlisted',
             },
         ),
     ]
diff --git a/ietf/mailinglists/migrations/0002_auto_20190703_1344.py b/ietf/mailinglists/migrations/0002_auto_20190703_1344.py
deleted file mode 100644
index b55c482a28..0000000000
--- a/ietf/mailinglists/migrations/0002_auto_20190703_1344.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# Generated by Django 1.11.22 on 2019-07-03 13:44
-
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailinglists', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='subscribed',
-            name='email',
-            field=models.CharField(max_length=128, validators=[django.core.validators.EmailValidator()]),
-        ),
-    ]
diff --git a/ietf/mailinglists/migrations/0002_nonwgmailinglist.py b/ietf/mailinglists/migrations/0002_nonwgmailinglist.py
new file mode 100644
index 0000000000..dfc941db90
--- /dev/null
+++ b/ietf/mailinglists/migrations/0002_nonwgmailinglist.py
@@ -0,0 +1,628 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations, models
+
+
+def forward(apps, schema_editor):
+    NonWgMailingList = apps.get_model("mailinglists", "NonWgMailingList")
+    List = apps.get_model("mailinglists", "List")
+
+    for l in List.objects.filter(
+        pk__in=[
+            10754,
+            10769,
+            10770,
+            10768,
+            10787,
+            10785,
+            10791,
+            10786,
+            10816,
+            10817,
+            10819,
+            10818,
+            10922,
+            10923,
+            10921,
+            10940,
+            10941,
+            10942,
+            572,
+            10297,
+            182,
+            43,
+            10704,
+            10314,
+            201,
+            419,
+            282,
+            149,
+            223,
+            10874,
+            10598,
+            10639,
+            10875,
+            10737,
+            105,
+            65,
+            10781,
+            10771,
+            10946,
+            518,
+            421,
+            214,
+            285,
+            393,
+            445,
+            553,
+            183,
+            10725,
+            33,
+            10766,
+            114,
+            417,
+            10789,
+            10876,
+            4244,
+            10705,
+            10706,
+            10878,
+            10324,
+            10879,
+            10642,
+            10821,
+            547,
+            532,
+            10636,
+            10592,
+            327,
+            248,
+            10697,
+            288,
+            346,
+            10731,
+            10955,
+            10857,
+            446,
+            55,
+            10799,
+            10800,
+            10801,
+            10612,
+            73,
+            3,
+            358,
+            9640,
+            10868,
+            378,
+            462,
+            6595,
+            10914,
+            10915,
+            197,
+            63,
+            558,
+            10824,
+            124,
+            10881,
+            177,
+            312,
+            252,
+            185,
+            523,
+            4572,
+            10618,
+            206,
+            68,
+            10859,
+            560,
+            513,
+            246,
+            7817,
+            148,
+            10864,
+            10589,
+            10773,
+            10748,
+            364,
+            311,
+            10302,
+            10272,
+            10929,
+            171,
+            10865,
+            10919,
+            377,
+            469,
+            467,
+            411,
+            505,
+            6318,
+            10811,
+            10304,
+            10882,
+            10845,
+            568,
+            10883,
+            4774,
+            264,
+            10779,
+            10884,
+            10303,
+            409,
+            10590,
+            451,
+            10749,
+            10765,
+            486,
+            519,
+            10593,
+            10313,
+            550,
+            10707,
+            307,
+            10861,
+            10654,
+            10708,
+            10275,
+            134,
+            460,
+            10911,
+            10574,
+            10885,
+            10814,
+            10676,
+            10747,
+            10305,
+            10688,
+            36,
+            10844,
+            10620,
+            458,
+            10282,
+            10594,
+            10752,
+            389,
+            296,
+            10684,
+            48,
+            533,
+            443,
+            10739,
+            491,
+            139,
+            461,
+            10690,
+            424,
+            290,
+            336,
+            31,
+            10709,
+            382,
+            10866,
+            10724,
+            539,
+            10710,
+            559,
+            10609,
+            74,
+            10582,
+            133,
+            10621,
+            34,
+            10596,
+            442,
+            13,
+            56,
+            128,
+            323,
+            10285,
+            80,
+            315,
+            3520,
+            10949,
+            10950,
+            189,
+            2599,
+            10822,
+            164,
+            10267,
+            10286,
+            464,
+            440,
+            254,
+            262,
+            10943,
+            465,
+            75,
+            179,
+            162,
+            457,
+            10572,
+            372,
+            452,
+            10273,
+            88,
+            366,
+            331,
+            140,
+            407,
+            416,
+            91,
+            10632,
+            542,
+            151,
+            117,
+            431,
+            10628,
+            10271,
+            14,
+            540,
+            278,
+            352,
+            159,
+            10851,
+            9981,
+            10694,
+            10619,
+            10732,
+            320,
+            348,
+            338,
+            349,
+            10678,
+            468,
+            293,
+            350,
+            402,
+            57,
+            524,
+            141,
+            71,
+            67,
+            508,
+            7828,
+            10268,
+            10631,
+            10713,
+            10889,
+            345,
+            78,
+            342,
+            190,
+            10869,
+            46,
+            334,
+            255,
+            5823,
+            400,
+            10867,
+            23,
+            10666,
+            10685,
+            405,
+            2801,
+            92,
+            137,
+            10640,
+            10656,
+            104,
+            123,
+            10643,
+            10891,
+            466,
+            10567,
+            10318,
+            526,
+            30,
+            222,
+            194,
+            10735,
+            10714,
+            247,
+            493,
+            1162,
+            414,
+            10648,
+            10677,
+            126,
+            16,
+            422,
+            271,
+            295,
+            81,
+            10634,
+            544,
+            10850,
+            426,
+            573,
+            353,
+            10829,
+            538,
+            10913,
+            10566,
+            167,
+            10675,
+            272,
+            10673,
+            10767,
+            528,
+            284,
+            564,
+            268,
+            10825,
+            231,
+            520,
+            10645,
+            10872,
+            515,
+            10956,
+            10947,
+            569,
+            233,
+            10952,
+            195,
+            10938,
+            2809,
+            10591,
+            10665,
+            9639,
+            10775,
+            10760,
+            10715,
+            10716,
+            10667,
+            361,
+            184,
+            10935,
+            10957,
+            10944,
+            94,
+            449,
+            525,
+            1962,
+            10300,
+            10894,
+            9156,
+            10774,
+            256,
+            289,
+            218,
+            187,
+            40,
+            10777,
+            10761,
+            10670,
+            249,
+            10764,
+            420,
+            548,
+            232,
+            410,
+            196,
+            72,
+            335,
+            70,
+            146,
+            10287,
+            10299,
+            10311,
+            10895,
+            10617,
+            531,
+            343,
+            10934,
+            10933,
+            10597,
+            158,
+            10600,
+            10692,
+            8630,
+            556,
+            324,
+            11,
+            10784,
+            498,
+            10772,
+            478,
+            10833,
+            10691,
+            391,
+            10565,
+            10669,
+            113,
+            110,
+            7831,
+            10855,
+            10312,
+            10315,
+            10896,
+            10672,
+            10306,
+            438,
+            395,
+            82,
+            10599,
+            10953,
+            10858,
+            10807,
+            10717,
+            310,
+            10808,
+            119,
+            10595,
+            10718,
+            10317,
+            10898,
+            454,
+            427,
+            10583,
+            10916,
+            403,
+            10843,
+            10899,
+            291,
+            10812,
+            10900,
+            10794,
+            341,
+            121,
+            230,
+            136,
+            166,
+            394,
+            234,
+            10901,
+            2466,
+            10573,
+            10939,
+            221,
+            490,
+            10820,
+            10873,
+            10792,
+            10870,
+            10793,
+            10904,
+            181,
+            10693,
+            482,
+            10611,
+            125,
+            10568,
+            10788,
+            211,
+            10756,
+            10719,
+            100,
+            228,
+            5833,
+            251,
+            122,
+            39,
+            534,
+            437,
+            504,
+            10613,
+            439,
+            306,
+            10863,
+            10823,
+            10926,
+            76,
+            227,
+            59,
+            42,
+            455,
+            10927,
+            10928,
+            204,
+            430,
+            10720,
+            267,
+            396,
+            10849,
+            10308,
+            281,
+            10905,
+            10736,
+            168,
+            153,
+            385,
+            89,
+            529,
+            412,
+            215,
+            484,
+            10951,
+            66,
+            173,
+            10633,
+            10681,
+            3613,
+            10274,
+            10750,
+            367,
+            387,
+            10832,
+            35,
+            147,
+            10325,
+            10671,
+            565,
+            313,
+            10871,
+            10751,
+            37,
+            10936,
+            10937,
+            287,
+            496,
+            244,
+            10841,
+            10683,
+            10906,
+            10584,
+            479,
+            10856,
+            163,
+            10910,
+            257,
+            276,
+            10840,
+            10689,
+            365,
+            10847,
+            99,
+            77,
+            435,
+            213,
+            15,
+            10932,
+            58,
+            10722,
+            131,
+            363,
+            10674,
+            322,
+            180,
+            10917,
+            10918,
+            10738,
+            10954,
+            10581,
+            208,
+            337,
+            4,
+            571,
+            10668,
+            10291,
+        ]
+    ):
+        NonWgMailingList.objects.create(name=l.name, description=l.description)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mailinglists", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="NonWgMailingList",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=32)),
+                ("description", models.CharField(max_length=256)),
+            ],
+        ),
+        migrations.RunPython(forward),
+    ]
diff --git a/ietf/mailinglists/migrations/0003_remove_subscribed_lists_delete_list_and_more.py b/ietf/mailinglists/migrations/0003_remove_subscribed_lists_delete_list_and_more.py
new file mode 100644
index 0000000000..6171136b2a
--- /dev/null
+++ b/ietf/mailinglists/migrations/0003_remove_subscribed_lists_delete_list_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.9 on 2024-02-02 23:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mailinglists", "0002_nonwgmailinglist"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="subscribed",
+            name="lists",
+        ),
+        migrations.DeleteModel(
+            name="List",
+        ),
+        migrations.DeleteModel(
+            name="Subscribed",
+        ),
+    ]
diff --git a/ietf/mailinglists/migrations/0004_nonwgmailinglist_domain.py b/ietf/mailinglists/migrations/0004_nonwgmailinglist_domain.py
new file mode 100644
index 0000000000..b977313a87
--- /dev/null
+++ b/ietf/mailinglists/migrations/0004_nonwgmailinglist_domain.py
@@ -0,0 +1,59 @@
+# Generated by Django 4.2.13 on 2024-06-05 17:51
+
+from django.db import migrations, models
+from django.db.models.functions import Lower
+
+IAB_NAMES = ["iab", "iab-stream"]
+RFCED_NAMES = [
+    "auth48archive",
+    "rfc-dist",
+    "rfc-editor-rfi",
+    "rfc-interest",
+    "rpat",
+    "rsab",
+]
+IRTF_NAMES = [
+    "anrp-select",
+    "anrw-sc",
+    "anrw-tpc",
+    "crypto-panel",
+    "dtn-interest",
+    "irsg",
+    "irtf-announce",
+    "smart",
+    "teaching",
+    "travel-grants-commitee",
+]
+
+
+def forward(apps, schema_editor):
+    NonWgMailingList = apps.get_model("mailinglists", "NonWgMailingList")
+    NonWgMailingList.objects.annotate(lowername=Lower("name")).filter(
+        lowername__in=IAB_NAMES
+    ).update(domain="iab.org")
+    NonWgMailingList.objects.annotate(lowername=Lower("name")).filter(
+        lowername__in=IRTF_NAMES
+    ).update(domain="irtf.org")
+    NonWgMailingList.objects.annotate(lowername=Lower("name")).filter(
+        lowername__in=RFCED_NAMES
+    ).update(domain="rfc-editor.org")
+
+
+def reverse(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mailinglists", "0003_remove_subscribed_lists_delete_list_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="nonwgmailinglist",
+            name="domain",
+            field=models.CharField(default="ietf.org", max_length=32),
+        ),
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/mailinglists/models.py b/ietf/mailinglists/models.py
index 606aab6242..828d3823a4 100644
--- a/ietf/mailinglists/models.py
+++ b/ietf/mailinglists/models.py
@@ -9,31 +9,27 @@
 from ietf.person.models import Person
 from ietf.utils.models import ForeignKey
 
-class List(models.Model):
+
+# NonWgMailingList is a temporary bridging class to hold information known about mailman2
+# while decoupling from mailman2 until we integrate with mailman3
+class NonWgMailingList(models.Model):
     name = models.CharField(max_length=32)
+    domain = models.CharField(max_length=32, default="ietf.org")
     description = models.CharField(max_length=256)
-    advertised = models.BooleanField(default=True)
 
     def __str__(self):
-        return "<List: %s>" % self.name
+        return "<NonWgMailingList: %s>" % self.name
     def info_url(self):
-        return settings.MAILING_LIST_INFO_URL % {'list_addr': self.name }
-
-class Subscribed(models.Model):
-    time = models.DateTimeField(auto_now_add=True)
-    email = models.CharField(max_length=128, validators=[validate_email])
-    lists = models.ManyToManyField(List)
-    def __str__(self):
-        return "<Subscribed: %s at %s>" % (self.email, self.time)
-    class Meta:
-        verbose_name_plural = "Subscribed"
+        return settings.MAILING_LIST_INFO_URL % {'list_addr': self.name.lower(), 'domain': self.domain.lower() }
 
-class Whitelisted(models.Model):
+# Allowlisted is unused, but is not being dropped until its human-curated content 
+# is archived outside this database.
+class Allowlisted(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     email = models.CharField("Email address", max_length=64, validators=[validate_email])
     by = ForeignKey(Person)
     def __str__(self):
-        return "<Whitelisted: %s at %s>" % (self.email, self.time)
+        return "<Allowlisted: %s at %s>" % (self.email, self.time)
     class Meta:
-        verbose_name_plural = "Whitelisted"
+        verbose_name_plural = "Allowlisted"
 
diff --git a/ietf/mailinglists/resources.py b/ietf/mailinglists/resources.py
index b2fce09009..4d1713b7b6 100644
--- a/ietf/mailinglists/resources.py
+++ b/ietf/mailinglists/resources.py
@@ -11,17 +11,17 @@
 from ietf import api
 from ietf.api import ToOneField                         # pyflakes:ignore
 
-from ietf.mailinglists.models import Whitelisted, List, Subscribed
+from ietf.mailinglists.models import Allowlisted, NonWgMailingList
 
 
 from ietf.person.resources import PersonResource
-class WhitelistedResource(ModelResource):
+class AllowlistedResource(ModelResource):
     by               = ToOneField(PersonResource, 'by')
     class Meta:
-        queryset = Whitelisted.objects.all()
+        queryset = Allowlisted.objects.all()
         serializer = api.Serializer()
         cache = SimpleCache()
-        #resource_name = 'whitelisted'
+        #resource_name = 'allowlisted'
         ordering = ['id', ]
         filtering = { 
             "id": ALL,
@@ -29,36 +29,22 @@ class Meta:
             "email": ALL,
             "by": ALL_WITH_RELATIONS,
         }
-api.mailinglists.register(WhitelistedResource())
+api.mailinglists.register(AllowlistedResource())
 
-class ListResource(ModelResource):
+class NonWgMailingListResource(ModelResource):
     class Meta:
-        queryset = List.objects.all()
+        queryset = NonWgMailingList.objects.all()
         serializer = api.Serializer()
         cache = SimpleCache()
-        #resource_name = 'list'
+        #resource_name = 'nonwgmailinglist'
         ordering = ['id', ]
         filtering = { 
             "id": ALL,
             "name": ALL,
+            "domain": ALL,
             "description": ALL,
-            "advertised": ALL,
         }
-api.mailinglists.register(ListResource())
+api.mailinglists.register(NonWgMailingListResource())
+
 
-class SubscribedResource(ModelResource):
-    lists            = ToManyField(ListResource, 'lists', null=True)
-    class Meta:
-        queryset = Subscribed.objects.all()
-        serializer = api.Serializer()
-        cache = SimpleCache()
-        #resource_name = 'subscribed'
-        ordering = ['id', ]
-        filtering = { 
-            "id": ALL,
-            "time": ALL,
-            "email": ALL,
-            "lists": ALL_WITH_RELATIONS,
-        }
-api.mailinglists.register(SubscribedResource())
 
diff --git a/ietf/mailinglists/tests.py b/ietf/mailinglists/tests.py
index 0c983da80c..8c5a550dfc 100644
--- a/ietf/mailinglists/tests.py
+++ b/ietf/mailinglists/tests.py
@@ -9,7 +9,7 @@
 import debug                            # pyflakes:ignore
 
 from ietf.group.factories import GroupFactory
-from ietf.mailinglists.factories import ListFactory
+from ietf.mailinglists.factories import NonWgMailingListFactory
 from ietf.utils.test_utils import TestCase
 
 
@@ -32,23 +32,15 @@ def test_groups(self):
 
 
     def test_nonwg(self):
-        groups = list()
-        groups.append(GroupFactory(type_id='wg', acronym='mars', list_archive='https://ietf.org/mars'))
-        groups.append(GroupFactory(type_id='wg', acronym='ames', state_id='conclude', list_archive='https://ietf.org/ames'))
-        groups.append(GroupFactory(type_id='wg', acronym='newstuff', state_id='bof', list_archive='https://ietf.org/newstuff'))
-        groups.append(GroupFactory(type_id='rg', acronym='research', list_archive='https://irtf.org/research'))
-        lists = ListFactory.create_batch(7)
+
+        lists = NonWgMailingListFactory.create_batch(7)
 
         url = urlreverse("ietf.mailinglists.views.nonwg")
 
         r = self.client.get(url)
+        q = PyQuery(r.content)
         for l in lists:
-            if l.advertised:
                 self.assertContains(r, l.name)
                 self.assertContains(r, l.description)
-            else:
-                self.assertNotContains(r, l.name, html=True)
-                self.assertNotContains(r, l.description, html=True)
+                self.assertNotEqual(q(f"a[href=\"{l.info_url()}\"]"), [])
 
-        for g in groups:
-            self.assertNotContains(r, g.acronym, html=True)
diff --git a/ietf/mailinglists/views.py b/ietf/mailinglists/views.py
index 51c31c546f..460f30e164 100644
--- a/ietf/mailinglists/views.py
+++ b/ietf/mailinglists/views.py
@@ -1,33 +1,25 @@
 # Copyright The IETF Trust 2007-2022, All Rights Reserved
 
-import re
-
 from django.shortcuts import render
 
-import debug                            # pyflakes:ignore
+import debug  # pyflakes:ignore
 
 from ietf.group.models import Group
-from ietf.mailinglists.models import List
+from ietf.mailinglists.models import NonWgMailingList
+
 
 def groups(request):
-    groups = Group.objects.filter(type__features__acts_like_wg=True, list_archive__startswith='http').exclude(state__in=('bof', 'conclude')).order_by("acronym")
+    groups = (
+        Group.objects.filter(
+            type__features__acts_like_wg=True, list_archive__startswith="http"
+        )
+        .exclude(state__in=("bof", "conclude"))
+        .order_by("acronym")
+    )
+
+    return render(request, "mailinglists/group_archives.html", {"groups": groups})
 
-    return render(request, "mailinglists/group_archives.html", { "groups": groups } )
 
 def nonwg(request):
-    groups = Group.objects.filter(type__features__acts_like_wg=True).exclude(state__in=['bof']).order_by("acronym")
-
-    #urls = [ g.list_archive for g in groups if '.ietf.org' in g.list_archive ]
-
-    wg_lists = set()
-    for g in groups:
-        wg_lists.add(g.acronym)
-        match = re.search(r'^(https?://mailarchive.ietf.org/arch/(browse/|search/\?email-list=))(?P<name>[^/]*)/?$', g.list_archive)
-        if match:
-            wg_lists.add(match.group('name').lower())
-
-    lists = List.objects.filter(advertised=True)
-    #debug.show('lists.count()')
-    lists = lists.exclude(name__in=wg_lists).order_by('name')
-    #debug.show('lists.count()')
-    return render(request, "mailinglists/nonwg.html", { "lists": lists } )
+    lists = NonWgMailingList.objects.order_by("name")
+    return render(request, "mailinglists/nonwg.html", {"lists": lists})
diff --git a/ietf/mailtrigger/admin.py b/ietf/mailtrigger/admin.py
index a60fd5b072..8c73f2ae02 100644
--- a/ietf/mailtrigger/admin.py
+++ b/ietf/mailtrigger/admin.py
@@ -1,9 +1,10 @@
-# Copyright The IETF Trust 2015-2019, All Rights Reserved
+# Copyright The IETF Trust 2015-2025, All Rights Reserved
 from django.contrib import admin
+from simple_history.admin import SimpleHistoryAdmin
 
 from ietf.mailtrigger.models import MailTrigger, Recipient
 
-class RecipientAdmin(admin.ModelAdmin):
+class RecipientAdmin(SimpleHistoryAdmin):
     list_display = [ 'slug', 'desc', 'template', 'has_code', ]
     def has_code(self, obj):
         return hasattr(obj,'gather_%s'%obj.slug) 
@@ -11,7 +12,7 @@ def has_code(self, obj):
 admin.site.register(Recipient, RecipientAdmin)
 
 
-class MailTriggerAdmin(admin.ModelAdmin):
+class MailTriggerAdmin(SimpleHistoryAdmin):
     list_display = [ 'slug', 'desc',  ]
     filter_horizontal = [ 'to', 'cc',  ]
 admin.site.register(MailTrigger, MailTriggerAdmin)
diff --git a/ietf/mailtrigger/forms.py b/ietf/mailtrigger/forms.py
index 366c429d8c..8d13c5edf3 100644
--- a/ietf/mailtrigger/forms.py
+++ b/ietf/mailtrigger/forms.py
@@ -11,6 +11,7 @@
 class CcSelectForm(forms.Form):
     expansions = dict()                 # type: Dict[str, List[str]]
     cc_choices = forms.MultipleChoiceField(
+                   required=False,
                    label='Cc',
                    choices=[],
                    widget=forms.CheckboxSelectMultiple(),
diff --git a/ietf/mailtrigger/migrations/0001_initial.py b/ietf/mailtrigger/migrations/0001_initial.py
index 37de9a6466..c66a908aac 100644
--- a/ietf/mailtrigger/migrations/0001_initial.py
+++ b/ietf/mailtrigger/migrations/0001_initial.py
@@ -1,10 +1,6 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from typing import List, Tuple      # pyflakes:ignore
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
+from typing import List, Tuple
 from django.db import migrations, models
 
 
@@ -12,39 +8,31 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]                                   # type: List[Tuple[str]]
+    dependencies: List[Tuple[str, str]] = [
+    ]
 
     operations = [
         migrations.CreateModel(
-            name='MailTrigger',
+            name='Recipient',
             fields=[
                 ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
                 ('desc', models.TextField(blank=True)),
+                ('template', models.TextField(blank=True, null=True)),
             ],
             options={
                 'ordering': ['slug'],
             },
         ),
         migrations.CreateModel(
-            name='Recipient',
+            name='MailTrigger',
             fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('slug', models.CharField(max_length=64, primary_key=True, serialize=False)),
                 ('desc', models.TextField(blank=True)),
-                ('template', models.TextField(blank=True, null=True)),
+                ('cc', models.ManyToManyField(blank=True, related_name='used_in_cc', to='mailtrigger.Recipient')),
+                ('to', models.ManyToManyField(blank=True, related_name='used_in_to', to='mailtrigger.Recipient')),
             ],
             options={
                 'ordering': ['slug'],
             },
         ),
-        migrations.AddField(
-            model_name='mailtrigger',
-            name='cc',
-            field=models.ManyToManyField(blank=True, related_name='used_in_cc', to='mailtrigger.Recipient'),
-        ),
-        migrations.AddField(
-            model_name='mailtrigger',
-            name='to',
-            field=models.ManyToManyField(blank=True, related_name='used_in_to', to='mailtrigger.Recipient'),
-        ),
     ]
diff --git a/ietf/mailtrigger/migrations/0002_conflrev_changes.py b/ietf/mailtrigger/migrations/0002_conflrev_changes.py
deleted file mode 100644
index 858d3a11d6..0000000000
--- a/ietf/mailtrigger/migrations/0002_conflrev_changes.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-21 12:07
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    conflrev_ad_changed = MailTrigger.objects.create(
-        slug = 'conflrev_ad_changed',
-        desc = 'Recipients when the responsible AD for a conflict review is changed',
-    )
-    conflrev_ad_changed.to.set(Recipient.objects.filter(slug='iesg-secretary'))
-    conflrev_ad_changed.cc.set(Recipient.objects.filter(slug__in=[
-            'conflict_review_steering_group',
-            'conflict_review_stream_manager',
-            'doc_affecteddoc_authors',
-            'doc_affecteddoc_group_chairs',
-            'doc_affecteddoc_notify',
-            'doc_notify',
-            'iesg',
-        ]))
-
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    MailTrigger.objects.filter(slug='conflrev_ad_changed').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0002_slidesubmitter.py b/ietf/mailtrigger/migrations/0002_slidesubmitter.py
new file mode 100644
index 0000000000..394c7d92ce
--- /dev/null
+++ b/ietf/mailtrigger/migrations/0002_slidesubmitter.py
@@ -0,0 +1,31 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    r = Recipient.objects.create(
+        slug="slides_proposer",
+        desc="Person who proposed slides",
+        template="{{ proposer.email }}"
+    )
+    mt = MailTrigger.objects.get(slug="slides_proposed")
+    mt.cc.add(r)
+
+def reverse(apps, schema_editor):
+    MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    mt = MailTrigger.objects.get(slug="slides_proposed")
+    r = Recipient.objects.get(slug="slides_proposer")
+    mt.cc.remove(r)
+    r.delete()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mailtrigger", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]
diff --git a/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py b/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py
deleted file mode 100644
index 5abf175387..0000000000
--- a/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-11-02 11:34
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    Recipient.objects.create(
-        slug = 'review_doc_ad',
-        desc = "The reviewed document's responsible area director",
-        template = '{% if review_req.doc.ad %}{{review_req.doc.ad.email_address}}{% endif %}'
-    )
-    Recipient.objects.create(
-        slug = 'review_team_ads',
-        desc = "The ADs of the team reviewing the document"
-    )
-
-    review_notify_ad = MailTrigger.objects.create(
-        slug = 'review_notify_ad',
-        desc = 'Recipients when a team notifies area directors when a review with one of a certain set of results (typically results indicating problem) is submitted',
-    )
-    review_notify_ad.to.set(Recipient.objects.filter(slug__in=['review_doc_ad','review_team_ads']))
-
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    MailTrigger.objects.filter(slug='review_notify_ad').delete()
-    Recipient.objects.filter(slug='review_doc_ad').delete()
-    Recipient.objects.filter(slug='review_team_ads').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0002_conflrev_changes'),
-        ('review', '0004_reviewteamsettings_secr_mail_alias'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0003_ballot_approved_charter.py b/ietf/mailtrigger/migrations/0003_ballot_approved_charter.py
new file mode 100644
index 0000000000..ef2e4dc444
--- /dev/null
+++ b/ietf/mailtrigger/migrations/0003_ballot_approved_charter.py
@@ -0,0 +1,26 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    mt = MailTrigger.objects.get(pk="ballot_approved_charter")
+    mt.to.remove(mt.to.first())
+    mt.to.add(Recipient.objects.get(slug="group_stream_announce"))
+
+def reverse(apps, schema_editor):
+    MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    mt = MailTrigger.objects.get(pk="ballot_approved_charter")
+    mt.to.remove(mt.to.first())
+    mt.to.add(Recipient.objects.get(slug="ietf_announce"))
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mailtrigger", "0002_slidesubmitter"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]
diff --git a/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py b/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py
deleted file mode 100644
index 50fb71a513..0000000000
--- a/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-11-03 00:24
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    changed = MailTrigger.objects.create(
-        slug = 'ballot_ednote_changed_late',
-        desc = 'Recipients when the RFC Editor note for a document is changed after the document has been approved',
-    )
-    changed.to.set(Recipient.objects.filter(slug__in=['rfc_editor','iesg']))
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    MailTrigger.objects.filter(slug='ballot_ednote_changed_late').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0003_add_review_notify_ad'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0004_slides_approved.py b/ietf/mailtrigger/migrations/0004_slides_approved.py
new file mode 100644
index 0000000000..6376e80021
--- /dev/null
+++ b/ietf/mailtrigger/migrations/0004_slides_approved.py
@@ -0,0 +1,27 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    mt = MailTrigger.objects.create(
+        slug="slides_approved",
+        desc="Recipients when slides are approved for a given session",
+    )
+    mt.to.add(Recipient.objects.get(slug="slides_proposer"))
+    mt.cc.add(Recipient.objects.get(slug="group_chairs"))
+
+def reverse(apps, schema_editor):
+    MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
+    mt = MailTrigger.objects.get(pk="slides_approved")
+    mt.delete()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mailtrigger", "0003_ballot_approved_charter"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]
diff --git a/ietf/mailtrigger/migrations/0005_rfc_recipients.py b/ietf/mailtrigger/migrations/0005_rfc_recipients.py
new file mode 100644
index 0000000000..dee49d9133
--- /dev/null
+++ b/ietf/mailtrigger/migrations/0005_rfc_recipients.py
@@ -0,0 +1,25 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    Recipient.objects.filter(slug="doc_authors").update(
+        template='{% if doc.type_id == "draft" or doc.type_id == "rfc" %}<{{doc.name}}@ietf.org>{% endif %}'
+    )
+
+
+def reverse(apps, schema_editor):
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    Recipient.objects.filter(slug="doc_authors").update(
+        template='{% if doc.type_id == "draft" %}<{{doc.name}}@ietf.org>{% endif %}'
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mailtrigger", "0004_slides_approved"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/mailtrigger/migrations/0005_slides_proposed.py b/ietf/mailtrigger/migrations/0005_slides_proposed.py
deleted file mode 100644
index 88af912815..0000000000
--- a/ietf/mailtrigger/migrations/0005_slides_proposed.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-03-25 06:11
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    changed = MailTrigger.objects.create(
-        slug = 'slides_proposed',
-        desc = 'Recipients when slides are proposed for a given session',
-    )
-    changed.to.set(Recipient.objects.filter(slug__in=['group_chairs', 'group_responsible_directors', 'group_secretaries']))
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    MailTrigger.objects.filter(slug='slides_proposed').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0004_ballot_rfceditornote_changed_postapproval'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0006_call_for_adoption_and_last_call_issued.py b/ietf/mailtrigger/migrations/0006_call_for_adoption_and_last_call_issued.py
new file mode 100644
index 0000000000..7adad150eb
--- /dev/null
+++ b/ietf/mailtrigger/migrations/0006_call_for_adoption_and_last_call_issued.py
@@ -0,0 +1,43 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    recipients = list(
+        Recipient.objects.filter(
+            slug__in=(
+                "doc_group_mail_list",
+                "doc_authors",
+                "doc_group_chairs",
+                "doc_shepherd",
+            )
+        )
+    )
+    call_for_adoption = MailTrigger.objects.create(
+        slug="doc_wg_call_for_adoption_issued",
+        desc="Recipients when a working group call for adoption is issued",
+    )
+    call_for_adoption.to.add(*recipients)
+    wg_last_call = MailTrigger.objects.create(
+        slug="doc_wg_last_call_issued",
+        desc="Recipients when a working group last call is issued",
+    )
+    wg_last_call.to.add(*recipients)
+
+
+def reverse(apps, schema_editor):
+    MailTrigger = apps.get_model("mailtrigger", "MailTrigger")
+    MailTrigger.objects.filter(
+        slug_in=("doc_wg_call_for_adoption_issued", "doc_wg_last_call_issued")
+    ).delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mailtrigger", "0005_rfc_recipients"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py b/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py
deleted file mode 100644
index 8b7936d907..0000000000
--- a/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    Recipient.objects.create(
-        slug = 'new_wg_doc_list',
-        desc = "The email list for announcing new WG -00 submissions",
-        template = '<new-wg-docs@ietf.org>'
-    )
-    changed = MailTrigger.objects.create(
-        slug = 'sub_new_wg_00',
-        desc = 'Recipients when a new IETF WG -00 draft is announced',
-    )
-    changed.to.set(Recipient.objects.filter(slug__in=['new_wg_doc_list']))
-
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    MailTrigger.objects.filter(slug='sub_new_wg_00').delete()
-    Recipient.objects.filter(slug='new_wg_doc_list').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0005_slides_proposed'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0007_add_review_mailtriggers.py b/ietf/mailtrigger/migrations/0007_add_review_mailtriggers.py
deleted file mode 100644
index 91a963d186..0000000000
--- a/ietf/mailtrigger/migrations/0007_add_review_mailtriggers.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    review_assignment_reviewer = Recipient.objects.create(
-        slug="review_assignment_reviewer",
-        desc="The reviewer assigned to a review assignment",
-        template="{% if not skip_review_reviewer %}{{review_assignment.reviewer.email_address}}{% endif %}",
-    )
-    review_assignment_review_req_by = Recipient.objects.create(
-        slug="review_assignment_review_req_by",
-        desc="The requester of an assigned review",
-        template="{% if not skip_review_requested_by %}{{review_assignment.review_request.requested_by.email_address}}{% endif %}",
-    )
-    review_req_requested_by = Recipient.objects.create(
-        slug="review_req_requested_by",
-        desc="The requester of a review",
-        template="{% if not skip_review_requested_by %}{{review_req.requested_by.email_address}}{% endif %}",
-    )
-    review_req_reviewers = Recipient.objects.create(
-        slug="review_req_reviewers",
-        desc="All reviewers assigned to a review request",
-        template=None,
-    )
-    review_secretaries = Recipient.objects.create(
-        slug="review_secretaries",
-        desc="The secretaries of the review team of a review request or assignment",
-        template=None,
-    )
-    Recipient.objects.create(
-        slug="review_reviewer",
-        desc="A single reviewer",
-        template="{{reviewer.email_address}}",
-    )
-
-    review_assignment_changed = MailTrigger.objects.create(
-        slug="review_assignment_changed",
-        desc="Recipients for a change to a review assignment",
-    )
-    review_assignment_changed.to.set([review_assignment_review_req_by, review_assignment_reviewer,
-                                      review_secretaries])
-
-    review_req_changed = MailTrigger.objects.create(
-        slug="review_req_changed",
-        desc="Recipients for a change to a review request",
-    )
-    review_req_changed.to.set([review_req_requested_by, review_req_reviewers, review_secretaries])
-    
-    review_availability_changed = MailTrigger.objects.create(
-        slug="review_availability_changed",
-        desc="Recipients for a change to a reviewer's availability",
-    )
-    review_availability_changed.to.set(
-        Recipient.objects.filter(slug__in=['review_reviewer', 'group_secretaries'])
-    )
-
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    MailTrigger.objects.filter(slug__in=[
-        'review_assignment_changed', 'review_req_changed', 'review_availability_changed', 
-    ]).delete()
-    Recipient.objects.filter(slug__in=[
-        'review_assignment_reviewer', 'review_assignment_review_req_by', 'review_req_requested_by',
-        'review_req_reviewers', 'review_secretaries', 'review_reviewer',
-    ]).delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0006_sub_new_wg_00'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0007_historicalrecipient_historicalmailtrigger.py b/ietf/mailtrigger/migrations/0007_historicalrecipient_historicalmailtrigger.py
new file mode 100644
index 0000000000..d23b72d737
--- /dev/null
+++ b/ietf/mailtrigger/migrations/0007_historicalrecipient_historicalmailtrigger.py
@@ -0,0 +1,122 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from io import StringIO
+
+from django.conf import settings
+from django.core import management
+from django.db import migrations, models
+import django.db.models.deletion
+import simple_history.models
+
+from ietf.utils.log import log
+
+
+def forward(apps, schema_editor):
+    # Fill in history for existing data using the populate_history management command
+    captured_stdout = StringIO()
+    captured_stderr = StringIO()
+    try:
+        management.call_command(
+            "populate_history",
+            "mailtrigger.MailTrigger",
+            "mailtrigger.Recipient",
+            stdout=captured_stdout,
+            stderr=captured_stderr,
+        )
+    except management.CommandError as err:
+        log(
+            "Failed to populate history for mailtrigger models.\n"
+            "\n"
+            f"stdout:\n{captured_stdout.getvalue() or '<none>'}\n"
+            "\n"
+            f"stderr:\n{captured_stderr.getvalue() or '<none>'}\n"
+        )
+        raise RuntimeError("Failed to populate history for mailtrigger models") from err
+    log(
+        "Populated history for mailtrigger models.\n"
+        "\n"
+        f"stdout:\n{captured_stdout.getvalue() or '<none>'}\n"
+        "\n"
+        f"stderr:\n{captured_stderr.getvalue() or '<none>'}\n"
+    )
+
+
+def reverse(apps, schema_editor):
+    pass  # nothing to do
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("mailtrigger", "0006_call_for_adoption_and_last_call_issued"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="HistoricalRecipient",
+            fields=[
+                ("slug", models.CharField(db_index=True, max_length=32)),
+                ("desc", models.TextField(blank=True)),
+                ("template", models.TextField(blank=True, null=True)),
+                ("history_id", models.AutoField(primary_key=True, serialize=False)),
+                ("history_date", models.DateTimeField(db_index=True)),
+                ("history_change_reason", models.CharField(max_length=100, null=True)),
+                (
+                    "history_type",
+                    models.CharField(
+                        choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
+                        max_length=1,
+                    ),
+                ),
+                (
+                    "history_user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "historical recipient",
+                "verbose_name_plural": "historical recipients",
+                "ordering": ("-history_date", "-history_id"),
+                "get_latest_by": ("history_date", "history_id"),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name="HistoricalMailTrigger",
+            fields=[
+                ("slug", models.CharField(db_index=True, max_length=64)),
+                ("desc", models.TextField(blank=True)),
+                ("history_id", models.AutoField(primary_key=True, serialize=False)),
+                ("history_date", models.DateTimeField(db_index=True)),
+                ("history_change_reason", models.CharField(max_length=100, null=True)),
+                (
+                    "history_type",
+                    models.CharField(
+                        choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
+                        max_length=1,
+                    ),
+                ),
+                (
+                    "history_user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "historical mail trigger",
+                "verbose_name_plural": "historical mail triggers",
+                "ordering": ("-history_date", "-history_id"),
+                "get_latest_by": ("history_date", "history_id"),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/mailtrigger/migrations/0008_lengthen_mailtrigger_slug.py b/ietf/mailtrigger/migrations/0008_lengthen_mailtrigger_slug.py
deleted file mode 100644
index df83bdb5fd..0000000000
--- a/ietf/mailtrigger/migrations/0008_lengthen_mailtrigger_slug.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.23 on 2019-08-30 09:02
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0007_add_review_mailtriggers'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='mailtrigger',
-            name='slug',
-            field=models.CharField(max_length=64, primary_key=True, serialize=False),
-        ),
-        # The above migration will not update the ManyToMany tables, which also reference
-        # the mailtrigger pk as varchar(32), so manual SQL is used.
-        # https://code.djangoproject.com/ticket/25012
-        migrations.RunSQL(
-            sql='ALTER TABLE `mailtrigger_mailtrigger_to` MODIFY `mailtrigger_id` varchar(64);',
-            reverse_sql='ALTER TABLE `mailtrigger_mailtrigger_to` MODIFY `mailtrigger_id` varchar(32);',
-        ),
-        migrations.RunSQL(
-            sql='ALTER TABLE `mailtrigger_mailtrigger_cc` MODIFY `mailtrigger_id` varchar(64);',
-            reverse_sql='ALTER TABLE `mailtrigger_mailtrigger_cc` MODIFY `mailtrigger_id` varchar(32);',
-        ),
-    ]
diff --git a/ietf/mailtrigger/migrations/0008_liaison_statement_incoming_and_outgoing_posted.py b/ietf/mailtrigger/migrations/0008_liaison_statement_incoming_and_outgoing_posted.py
new file mode 100644
index 0000000000..189a783a2e
--- /dev/null
+++ b/ietf/mailtrigger/migrations/0008_liaison_statement_incoming_and_outgoing_posted.py
@@ -0,0 +1,72 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    Mailtrigger = apps.get_model("mailtrigger", "MailTrigger")
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    recipients_to = Recipient.objects.get(pk="liaison_to_contacts")
+    recipients_cc = list(
+        Recipient.objects.filter(
+            slug__in=(
+                "liaison_cc",
+                "liaison_coordinators",
+                "liaison_response_contacts",
+                "liaison_technical_contacts",
+            )
+        )
+    )
+    recipient_from = Recipient.objects.get(pk="liaison_from_contact")
+
+    liaison_posted_outgoing = Mailtrigger.objects.create(
+        slug="liaison_statement_posted_outgoing",
+        desc="Recipients for a message when a new outgoing liaison statement is posted",
+    )
+    liaison_posted_outgoing.to.add(recipients_to)
+    liaison_posted_outgoing.cc.add(*recipients_cc)
+    liaison_posted_outgoing.cc.add(recipient_from)
+
+    liaison_posted_incoming = Mailtrigger.objects.create(
+        slug="liaison_statement_posted_incoming",
+        desc="Recipients for a message when a new incoming liaison statement is posted",
+    )
+    liaison_posted_incoming.to.add(recipients_to)
+    liaison_posted_incoming.cc.add(*recipients_cc)
+
+    Mailtrigger.objects.filter(slug=("liaison_statement_posted")).delete()
+
+
+def reverse(apps, schema_editor):
+    Mailtrigger = apps.get_model("mailtrigger", "MailTrigger")
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+
+    Mailtrigger.objects.filter(
+        slug__in=(
+            "liaison_statement_posted_outgoing",
+            "liaison_statement_posted_incoming",
+        )
+    ).delete()
+
+    liaison_statement_posted = Mailtrigger.objects.create(
+        slug="liaison_statement_posted",
+        desc="Recipients for a message when a new liaison statement is posted",
+    )
+
+    liaison_to_contacts = Recipient.objects.get(slug="liaison_to_contacts")
+    recipients_ccs = Recipient.objects.filter(
+        slug__in=(
+            "liaison_cc",
+            "liaison_coordinators",
+            "liaison_response_contacts",
+            "liaison_technical_contacts",
+        )
+    )
+    liaison_statement_posted.to.add(liaison_to_contacts)
+    liaison_statement_posted.cc.add(*recipients_ccs)
+
+
+class Migration(migrations.Migration):
+    dependencies = [("mailtrigger", "0007_historicalrecipient_historicalmailtrigger")]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/mailtrigger/migrations/0009_custom_review_complete_mailtriggers.py b/ietf/mailtrigger/migrations/0009_custom_review_complete_mailtriggers.py
deleted file mode 100644
index 496d4658fc..0000000000
--- a/ietf/mailtrigger/migrations/0009_custom_review_complete_mailtriggers.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    ReviewTeamSettings = apps.get_model('review', 'ReviewTeamSettings')
-    MailTrigger = apps.get_model('mailtrigger', 'Mailtrigger')
-    Group = apps.get_model('group', 'Group')
-    GroupFeatures = apps.get_model('group', 'GroupFeatures')
-
-    template = MailTrigger.objects.get(slug='review_completed')
-    template.desc = 'Default template for recipients when an review is completed - ' \
-                    'customised mail triggers are used/created per team and review type.'
-    template.save()
-    
-    for group in Group.objects.all().only('pk', 'type', 'acronym'):
-        if not GroupFeatures.objects.get(type=group.type).has_reviews:
-            continue
-        try:
-            review_team = ReviewTeamSettings.objects.get(group=group.pk)
-        except ReviewTeamSettings.DoesNotExist:
-            continue
-        team_acronym = group.acronym.lower()
-        for review_type in review_team.review_types.all():
-            slug = 'review_completed_{}_{}'.format(team_acronym, review_type.slug)
-            desc = 'Recipients when a {} {} review is completed'.format(team_acronym, review_type)
-            if MailTrigger.objects.filter(slug=slug):
-                # Never overwrite existing triggers
-                continue
-            mailtrigger = MailTrigger.objects.create(slug=slug, desc=desc)
-            mailtrigger.to.set(template.to.all())
-            mailtrigger.cc.set(template.cc.all())
-    
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0008_lengthen_mailtrigger_slug'),
-        ('review', '0014_document_primary_key_cleanup'),
-        ('group', '0019_rename_field_document2'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0010_add_review_reminder_mailtriggers.py b/ietf/mailtrigger/migrations/0010_add_review_reminder_mailtriggers.py
deleted file mode 100644
index 384c55e8f2..0000000000
--- a/ietf/mailtrigger/migrations/0010_add_review_reminder_mailtriggers.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    review_reminder_overdue_assignment = MailTrigger.objects.create(
-        slug="review_reminder_overdue_assignment",
-        desc="Recipients for overdue review assignment reminders",
-    )
-    review_reminder_overdue_assignment.to.add(
-        Recipient.objects.get(slug='group_secretaries')
-    )
-
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    MailTrigger.objects.filter(slug='review_reminder_overdue_assignment').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0009_custom_review_complete_mailtriggers'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0011_ietf_last_call.py b/ietf/mailtrigger/migrations/0011_ietf_last_call.py
deleted file mode 100644
index 6999d64f92..0000000000
--- a/ietf/mailtrigger/migrations/0011_ietf_last_call.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-04 12:12
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    Recipient = apps.get_model('mailtrigger','Recipient')
-
-    ietf_last_call = Recipient.objects.create(
-        slug = 'ietf_last_call',
-        desc = 'The IETF Last Call list',
-        template = 'last-call@ietf.org'
-    )
-    ietf_general = Recipient.objects.get(slug='ietf_general')
-
-    review_completed_triggers = MailTrigger.objects.filter(slug__startswith='review_completed')
-    
-    for trigger in review_completed_triggers:
-        trigger.cc.remove(ietf_general)
-        trigger.cc.add(ietf_last_call)
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
-    Recipient = apps.get_model('mailtrigger','Recipient')
-
-    ietf_general = Recipient.objects.get(slug='ietf_general')
-    ietf_last_call = Recipient.objects.get(slug='ietf_last_call')
-
-    review_completed_triggers = MailTrigger.objects.filter(slug__startswith='review_completed')
-
-    for trigger in review_completed_triggers:
-        trigger.cc.remove(ietf_last_call)
-        trigger.cc.add(ietf_general)
-
-    ietf_last_call.delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0010_add_review_reminder_mailtriggers'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/mailtrigger/migrations/0012_dont_last_call_early_reviews.py b/ietf/mailtrigger/migrations/0012_dont_last_call_early_reviews.py
deleted file mode 100644
index 5302a0c891..0000000000
--- a/ietf/mailtrigger/migrations/0012_dont_last_call_early_reviews.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-04 13:12
-
-
-from django.db import migrations
-
-def forward(apps, shema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    for trigger in MailTrigger.objects.filter(slug__startswith='review_completed',slug__endswith='early'):
-        trigger.cc.remove('ietf_last_call')
-
-
-def reverse(apps, shema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    for trigger in MailTrigger.objects.filter(slug__startswith='review_completed',slug__endswith='early'):
-        trigger.cc.add('ietf_last_call')
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0011_ietf_last_call'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/mailtrigger/migrations/0013_add_irsg_ballot_saved.py b/ietf/mailtrigger/migrations/0013_add_irsg_ballot_saved.py
deleted file mode 100644
index a7400e48a3..0000000000
--- a/ietf/mailtrigger/migrations/0013_add_irsg_ballot_saved.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-04 13:12
-
-
-from django.db import migrations
-
-def forward(apps, shema_editor):
-    Recipient = apps.get_model('mailtrigger','Recipient')
-
-    irsg = Recipient.objects.create(
-        slug = 'irsg',
-        desc = 'The IRSG',
-        template = 'The IRSG <irsg@irtf.org>'
-    )
-
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    slug = 'irsg_ballot_saved'
-    desc = 'Recipients when a new IRSG ballot position with comments is saved'
-    irsg_ballot_saved = MailTrigger.objects.create(
-        slug=slug,
-        desc=desc
-    )
-    irsg_ballot_saved.to.add(irsg)
-    irsg_ballot_saved.cc.set(Recipient.objects.filter(slug__in=['doc_affecteddoc_authors','doc_affecteddoc_group_chairs','doc_affecteddoc_notify','doc_authors','doc_group_chairs','doc_group_mail_list','doc_notify','doc_shepherd']))
-
-    # We cannot just change the slug of the existing ballot_saved table,
-    # because that will loose all the m2m entries in .to and .cc
-    ballot_saved = MailTrigger.objects.get(slug='ballot_saved')
-    iesg_ballot_saved = MailTrigger.objects.create(slug='iesg_ballot_saved')
-    iesg_ballot_saved.to.set(ballot_saved.to.all())
-    iesg_ballot_saved.cc.set(ballot_saved.cc.all())
-    iesg_ballot_saved.desc = ballot_saved.desc
-    iesg_ballot_saved.save()
-
-def reverse(apps, shema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    MailTrigger.objects.filter(slug='irsg_ballot_saved').delete()
-    MailTrigger.objects.filter(slug='iesg_ballot_saved').delete()
-    # 
-    Recipient = apps.get_model('mailtrigger','Recipient')
-    Recipient.objects.filter(slug='irsg').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0012_dont_last_call_early_reviews'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/mailtrigger/migrations/0014_add_ad_approved_conflict_review.py b/ietf/mailtrigger/migrations/0014_add_ad_approved_conflict_review.py
deleted file mode 100644
index b16d2bde3f..0000000000
--- a/ietf/mailtrigger/migrations/0014_add_ad_approved_conflict_review.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    ad_approved_conflict_review = MailTrigger.objects.create(
-        slug='ad_approved_conflict_review',
-        desc='Recipients when AD approves a conflict review pending announcement',
-    )
-    ad_approved_conflict_review.to.add(
-        Recipient.objects.get(pk='iesg_secretary')
-    )
-
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    MailTrigger.objects.filter(slug='ad_approved_conflict_review').delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('mailtrigger', '0013_add_irsg_ballot_saved'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/mailtrigger/migrations/0015_add_ad_approved_status_change.py b/ietf/mailtrigger/migrations/0015_add_ad_approved_status_change.py
deleted file mode 100644
index 8fce9cac06..0000000000
--- a/ietf/mailtrigger/migrations/0015_add_ad_approved_status_change.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    ad_approved_conflict_review = MailTrigger.objects.create(
-        slug='ad_approved_status_change',
-        desc='Recipients when AD approves a status change pending announcement',
-    )
-    ad_approved_conflict_review.to.add(
-        Recipient.objects.get(pk='iesg_secretary')
-    )
-
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    MailTrigger.objects.filter(slug='ad_approved_status_change').delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('mailtrigger', '0014_add_ad_approved_conflict_review'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/mailtrigger/migrations/0016_add_irsg_ballot_issued.py b/ietf/mailtrigger/migrations/0016_add_irsg_ballot_issued.py
deleted file mode 100644
index 0e3accb742..0000000000
--- a/ietf/mailtrigger/migrations/0016_add_irsg_ballot_issued.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-
-def replace_mailtrigger(MailTrigger, old_slug, new_slug):
-    """Replace a MailTrigger with an equivalent using a different slug"""
-    # Per 0013_add_irsg_ballot_saved.py, can't just modify the existing because that
-    # will lose the many-to-many relations.
-    orig_mailtrigger = MailTrigger.objects.get(slug=old_slug)
-    new_mailtrigger = MailTrigger.objects.create(slug=new_slug)
-    new_mailtrigger.to.set(orig_mailtrigger.to.all())
-    new_mailtrigger.cc.set(orig_mailtrigger.cc.all())
-    new_mailtrigger.desc = orig_mailtrigger.desc
-    new_mailtrigger.save()
-    orig_mailtrigger.delete()  # get rid of the obsolete MailTrigger
-
-
-def forward(apps, schema_editor):
-    """Forward migration: create irsg_ballot_issued and rename ballot_issued to iesg_ballot_issued"""
-    # Load historical models
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    # Create the new MailTrigger
-    irsg_ballot_issued = MailTrigger.objects.create(
-        slug='irsg_ballot_issued',
-        desc='Recipients when a new IRSG ballot is issued',
-    )
-    irsg_ballot_issued.to.set(Recipient.objects.filter(slug='irsg'))
-    irsg_ballot_issued.cc.set(Recipient.objects.filter(slug__in=[
-        'doc_stream_manager', 'doc_affecteddoc_authors', 'doc_affecteddoc_group_chairs',
-        'doc_affecteddoc_notify', 'doc_authors', 'doc_group_chairs', 'doc_group_mail_list',
-        'doc_notify', 'doc_shepherd'
-    ]))
-
-    # Replace existing 'ballot_issued' object with an 'iesg_ballot_issued'
-    replace_mailtrigger(MailTrigger, 'ballot_issued', 'iesg_ballot_issued')
-
-
-def reverse(apps, shema_editor):
-    """Reverse migration: rename iesg_ballot_issued to ballot_issued and remove irsg_ballot_issued"""
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    MailTrigger.objects.filter(slug='irsg_ballot_issued').delete()
-    replace_mailtrigger(MailTrigger, 'iesg_ballot_issued', 'ballot_issued')
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('mailtrigger', '0015_add_ad_approved_status_change'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/mailtrigger/migrations/0017_lc_to_yang_doctors.py b/ietf/mailtrigger/migrations/0017_lc_to_yang_doctors.py
deleted file mode 100644
index 6685d857f5..0000000000
--- a/ietf/mailtrigger/migrations/0017_lc_to_yang_doctors.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    Recipient.objects.create(
-        slug = 'yang_doctors_secretaries',
-        desc = 'Yang Doctors Secretaries',
-        template = ''
-    )
-
-    lc_to_yang_doctors = MailTrigger.objects.create(
-        slug='last_call_of_doc_with_yang_issued',
-        desc='Recipients when IETF LC is issued on a document with yang checks',
-    )
-
-    lc_to_yang_doctors.to.set(Recipient.objects.filter(slug='yang_doctors_secretaries'))
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    MailTrigger.objects.filter(slug='last_call_of_doc_with_yang_issued').delete()
-    Recipient.objects.filter(slug='yang_doctors_secretaries').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0016_add_irsg_ballot_issued'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/mailtrigger/migrations/0018_interim_approve_announce.py b/ietf/mailtrigger/migrations/0018_interim_approve_announce.py
deleted file mode 100644
index a3e810f0f0..0000000000
--- a/ietf/mailtrigger/migrations/0018_interim_approve_announce.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The IETF Trust 2020 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps,schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    interim_approved = MailTrigger.objects.get(slug='interim_approved')
-    interim_approved.desc = 'Recipients when an interim meeting is approved'
-    interim_approved.save()
-    interim_approved.to.set(Recipient.objects.filter(slug__in=('group_chairs','logged_in_person')))
-
-    interim_announce_requested = MailTrigger.objects.create(
-        slug='interim_announce_requested',
-        desc='Recipients when an interim announcement is requested',
-    )
-    interim_announce_requested.to.set(Recipient.objects.filter(slug='iesg_secretary'))
-
-
-def reverse(apps,schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    MailTrigger.objects.filter(slug='interim_announce_requested').delete()
-
-    interim_approved = MailTrigger.objects.get(slug='interim_approved')
-    interim_approved.desc = 'Recipients when an interim meeting is approved and an announcement needs to be sent'
-    interim_approved.save()
-    interim_approved.to.set(Recipient.objects.filter(slug='iesg_secretary'))
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0017_lc_to_yang_doctors'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0019_email_iana_expert_review_state_changed.py b/ietf/mailtrigger/migrations/0019_email_iana_expert_review_state_changed.py
deleted file mode 100644
index 9818b4427f..0000000000
--- a/ietf/mailtrigger/migrations/0019_email_iana_expert_review_state_changed.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2020 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps,schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    iana_er_state_changed = MailTrigger.objects.create(
-        slug='iana_expert_review_state_changed',
-        desc='Recipients when the IANA expert review for a document changes',
-    )
-
-    iana_er_state_changed.to.set(
-        Recipient.objects.filter(slug__in=[
-            'doc_ad', 'doc_authors', 'doc_group_chairs', 'doc_group_responsible_directors', 'doc_notify', 'doc_shepherd'
-        ])
-    )
-
-def reverse(apps,schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-
-    MailTrigger.objects.filter(slug='iana_expert_review_state_changed').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0018_interim_approve_announce'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/mailtrigger/migrations/0020_add_ad_approval_request_mailtriggers.py b/ietf/mailtrigger/migrations/0020_add_ad_approval_request_mailtriggers.py
deleted file mode 100644
index c1cfd72778..0000000000
--- a/ietf/mailtrigger/migrations/0020_add_ad_approval_request_mailtriggers.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-23 09:54
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    """Add new MailTrigger and Recipients, remove the one being replaced"""
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    MailTrigger.objects.create(
-        slug='sub_director_approval_requested',
-        desc='Recipients for a message requesting AD approval of a revised draft submission',
-    ).to.add(
-        Recipient.objects.create(
-            pk='sub_group_parent_directors',
-            desc="ADs for the parent group of a submission"
-        )
-    )
-
-    MailTrigger.objects.create(
-        slug='sub_replaced_doc_chair_approval_requested',
-        desc='Recipients for a message requesting chair approval of a replaced WG document',
-    ).to.add(
-        Recipient.objects.get(pk='doc_group_chairs')
-    )
-
-    MailTrigger.objects.create(
-        slug='sub_replaced_doc_director_approval_requested',
-        desc='Recipients for a message requesting AD approval of a replaced WG document',
-    ).to.add(
-        Recipient.objects.create(
-            pk='doc_group_parent_directors',
-            desc='ADs for the parent group of a doc'
-        )
-    )
-
-
-def reverse(apps, schema_editor):
-    """Remove the MailTrigger and Recipient created in the forward migration"""
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    MailTrigger.objects.filter(slug='sub_director_approval_requested').delete()
-    MailTrigger.objects.filter(slug='sub_replaced_doc_chair_approval_requested').delete()
-    MailTrigger.objects.filter(slug='sub_replaced_doc_director_approval_requested').delete()
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-    Recipient.objects.filter(pk='sub_group_parent_directors').delete()
-    Recipient.objects.filter(pk='doc_group_parent_directors').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0019_email_iana_expert_review_state_changed'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0021_email_remind_action_holders.py b/ietf/mailtrigger/migrations/0021_email_remind_action_holders.py
deleted file mode 100644
index 704b452a53..0000000000
--- a/ietf/mailtrigger/migrations/0021_email_remind_action_holders.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The IETF Trust 2020 All Rights Reserved
-
-from django.db import migrations
-
-
-def forward(apps,schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    (doc_action_holders, _) = Recipient.objects.get_or_create(
-        slug='doc_action_holders',
-        desc='Action holders for a document',
-        template='{% for action_holder in doc.action_holders.all %}{% if doc.shepherd and action_holder == doc.shepherd.person %}{{ doc.shepherd }}{% else %}{{ action_holder.email }}{% endif %}{% if not forloop.last %},{%endif %}{% endfor %}',
-    )
-    (doc_remind_action_holders, _) = MailTrigger.objects.get_or_create(
-        slug='doc_remind_action_holders',
-        desc='Recipients when sending a reminder email to action holders for a document',
-    )
-    doc_remind_action_holders.to.set([doc_action_holders])
-
-
-def reverse(apps,schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    MailTrigger.objects.filter(slug='doc_remind_action_holders').delete()
-    Recipient.objects.filter(slug='doc_action_holders').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0020_add_ad_approval_request_mailtriggers'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0022_add_doc_external_resource_change_requested.py b/ietf/mailtrigger/migrations/0022_add_doc_external_resource_change_requested.py
deleted file mode 100644
index 92ace7a8d0..0000000000
--- a/ietf/mailtrigger/migrations/0022_add_doc_external_resource_change_requested.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-13 07:20
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    """Add new MailTrigger and Recipients"""
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    mt, created = MailTrigger.objects.get_or_create(slug='doc_external_resource_change_requested')
-    if created:
-        mt.desc='Recipients when a change to the external resources for a document is requested.'
-        mt.save()
-        for recipient_slug in [
-            "doc_ad",
-            "doc_group_chairs",
-            "doc_group_delegates",
-            "doc_shepherd",
-            "doc_stream_manager"
-        ]:
-            mt.to.add(Recipient.objects.get(slug=recipient_slug))
-
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0021_email_remind_action_holders'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/mailtrigger/migrations/0023_bofreq_triggers.py b/ietf/mailtrigger/migrations/0023_bofreq_triggers.py
deleted file mode 100644
index 4c3580140c..0000000000
--- a/ietf/mailtrigger/migrations/0023_bofreq_triggers.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-# Generated by Django 2.2.23 on 2021-05-26 07:52
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-
-    Recipient.objects.create(slug='bofreq_editors',desc='BOF request editors',template='')
-    Recipient.objects.create(slug='bofreq_previous_editors',desc='Editors of the prior version of a BOF request', 
-        template='{% for editor in previous_editors %}{{editor.email_address}}{% if not forloop.last %},{% endif %}{% endfor %}')
-
-    Recipient.objects.create(slug='bofreq_responsible',desc='BOF request responsible leadership',template='')
-    Recipient.objects.create(slug='bofreq_previous_responsible',desc='BOF request responsible leadership before change', template='')
-
-    mt = MailTrigger.objects.create(slug='bofreq_title_changed',desc='Recipients when the title of a BOF proposal is changed.')
-    mt.to.set(Recipient.objects.filter(slug__in=['bofreq_responsible', 'bofreq_editors', 'doc_notify']))
-
-    mt = MailTrigger.objects.create(slug='bofreq_editors_changed',desc='Recipients when the editors of a BOF proposal are changed.')
-    mt.to.set(Recipient.objects.filter(slug__in=['bofreq_responsible', 'bofreq_editors', 'bofreq_previous_editors', 'doc_notify']))
-
-    mt = MailTrigger.objects.create(slug='bofreq_responsible_changed',desc='Recipients when the responsible leadership of a BOF proposal are changed.')
-    mt.to.set(Recipient.objects.filter(slug__in=['bofreq_responsible', 'bofreq_editors', 'bofreq_previous_responsible', 'doc_notify']))
-
-    mt = MailTrigger.objects.create(slug='bofreq_new_revision', desc='Recipients when a new revision of a BOF request is uploaded.')
-    mt.to.set(Recipient.objects.filter(slug__in=['bofreq_responsible', 'bofreq_editors', 'doc_notify']))
-
-    for recipient in Recipient.objects.filter(slug__in=['bofreq_responsible','bofreq_editors']):
-       MailTrigger.objects.get(slug='doc_state_edited').to.add(recipient)
-
-def reverse(apps, schema_editor):
-    MailTrigger = apps.get_model('mailtrigger', 'MailTrigger')
-    Recipient = apps.get_model('mailtrigger', 'Recipient')
-    for recipient in Recipient.objects.filter(slug__in=['bofreq_responsible','bofreq_editors']):
-       MailTrigger.objects.get(slug='doc_state_edited').to.remove(recipient)
-    MailTrigger.objects.filter(slug__in=('bofreq_title_changed', 'bofreq_editors_changed', 'bofreq_new_revision', 'bofreq_responsible_changed')).delete()
-    Recipient.objects.filter(slug__in=('bofreq_editors', 'bofreq_previous_editors')).delete()
-    Recipient.objects.filter(slug__in=('bofreq_responsible', 'bofreq_previous_responsible')).delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mailtrigger', '0022_add_doc_external_resource_change_requested'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py
index a1b712c574..435729f893 100644
--- a/ietf/mailtrigger/models.py
+++ b/ietf/mailtrigger/models.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2015-2020, All Rights Reserved
+# Copyright The IETF Trust 2015-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -7,9 +7,11 @@
 
 from email.utils import parseaddr
 
+from simple_history.models import HistoricalRecords
+
 from ietf.doc.utils_bofreq import bofreq_editors, bofreq_responsible
 from ietf.utils.mail import formataddr, get_email_addresses_from_text
-from ietf.group.models import Group
+from ietf.group.models import Group, Role
 from ietf.person.models import Email, Alias
 from ietf.review.models import ReviewTeamSettings
 
@@ -36,8 +38,9 @@ def clean_duplicates(addrlist):
 class MailTrigger(models.Model):
     slug = models.CharField(max_length=64, primary_key=True)
     desc = models.TextField(blank=True)
-    to   = models.ManyToManyField('Recipient', blank=True, related_name='used_in_to')
-    cc   = models.ManyToManyField('Recipient', blank=True, related_name='used_in_cc')
+    to   = models.ManyToManyField('mailtrigger.Recipient', blank=True, related_name='used_in_to')
+    cc   = models.ManyToManyField('mailtrigger.Recipient', blank=True, related_name='used_in_cc')
+    history = HistoricalRecords()
 
     class Meta:
         ordering = ["slug"]
@@ -49,6 +52,7 @@ class Recipient(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     desc = models.TextField(blank=True)
     template = models.TextField(null=True, blank=True)
+    history = HistoricalRecords()
 
     class Meta:
         ordering = ["slug"]
@@ -96,35 +100,35 @@ def gather_doc_affecteddoc_authors(self, **kwargs):
         addrs = []
         if 'doc' in kwargs:
             for reldoc in kwargs['doc'].related_that_doc(('conflrev','tohist','tois','tops')):
-                addrs.extend(Recipient.objects.get(slug='doc_authors').gather(**{'doc':reldoc.document}))
+                addrs.extend(Recipient.objects.get(slug='doc_authors').gather(**{'doc':reldoc}))
         return addrs
 
     def gather_doc_affecteddoc_group_chairs(self, **kwargs):
         addrs = []
         if 'doc' in kwargs:
             for reldoc in kwargs['doc'].related_that_doc(('conflrev','tohist','tois','tops')):
-                addrs.extend(Recipient.objects.get(slug='doc_group_chairs').gather(**{'doc':reldoc.document}))
+                addrs.extend(Recipient.objects.get(slug='doc_group_chairs').gather(**{'doc':reldoc}))
         return addrs
 
     def gather_doc_affecteddoc_notify(self, **kwargs):
         addrs = []
         if 'doc' in kwargs:
             for reldoc in kwargs['doc'].related_that_doc(('conflrev','tohist','tois','tops')):
-                addrs.extend(Recipient.objects.get(slug='doc_notify').gather(**{'doc':reldoc.document}))
+                addrs.extend(Recipient.objects.get(slug='doc_notify').gather(**{'doc':reldoc}))
         return addrs
 
     def gather_conflict_review_stream_manager(self, **kwargs):
         addrs = []
         if 'doc' in kwargs:
             for reldoc in kwargs['doc'].related_that_doc(('conflrev',)):
-                addrs.extend(Recipient.objects.get(slug='doc_stream_manager').gather(**{'doc':reldoc.document}))
+                addrs.extend(Recipient.objects.get(slug='doc_stream_manager').gather(**{'doc':reldoc}))
         return addrs
 
     def gather_conflict_review_steering_group(self,**kwargs):
         addrs = []
         if 'doc' in kwargs:
             for reldoc in kwargs['doc'].related_that_doc(('conflrev',)):
-                if reldoc.document.stream_id=='irtf':
+                if reldoc.stream_id=='irtf':
                     addrs.append('"Internet Research Steering Group" <irsg@irtf.org>')
         return addrs
 
@@ -137,14 +141,17 @@ def gather_group_steering_group(self,**kwargs):
 
     def gather_stream_managers(self, **kwargs):
         addrs = []
-        manager_map = dict(ise  = '<rfc-ise@rfc-editor.org>',
-                           irtf = '<irtf-chair@irtf.org>',
-                           ietf = '<iesg@ietf.org>',
-                           iab  = '<iab-chair@iab.org>')
+        manager_map = dict(
+            ise  = ['<rfc-ise@rfc-editor.org>'],
+            irtf = ['<irtf-chair@irtf.org>'],
+            ietf = ['<iesg@ietf.org>'],
+            iab  = ['<iab-chair@iab.org>'],
+            editorial = Role.objects.filter(group__acronym="rsab",name_id="chair").values_list("email__address", flat=True),
+        )
         if 'streams' in kwargs:
             for stream in kwargs['streams']:
                 if stream in manager_map:
-                    addrs.append(manager_map[stream])
+                    addrs.extend(manager_map[stream])
         return addrs
 
     def gather_doc_stream_manager(self, **kwargs):
@@ -231,7 +238,7 @@ def gather_submission_submitter(self, **kwargs):
                 try:
                     submitter = Alias.objects.get(name=submission.submitter).person
                     if submitter and submitter.email():
-                        addrs.extend(["%s <%s>" % (submitter.name, submitter.email().address)])
+                        addrs.append(f"{submitter.name} <{submitter.email().address}>")
                 except (Alias.DoesNotExist, Alias.MultipleObjectsReturned):
                     pass
         return addrs
diff --git a/ietf/mailtrigger/resources.py b/ietf/mailtrigger/resources.py
index eb5466618a..daca055bf4 100644
--- a/ietf/mailtrigger/resources.py
+++ b/ietf/mailtrigger/resources.py
@@ -7,7 +7,7 @@
 
 from ietf import api
 
-from ietf.mailtrigger.models import Recipient, MailTrigger
+from ietf.mailtrigger.models import MailTrigger, Recipient
 
 
 class RecipientResource(ModelResource):
@@ -37,3 +37,43 @@ class Meta:
         }
 api.mailtrigger.register(MailTriggerResource())
 
+from ietf.utils.resources import UserResource
+class HistoricalMailTriggerResource(ModelResource):
+    history_user     = ToOneField(UserResource, 'history_user', null=True)
+    class Meta:
+        queryset = MailTrigger.history.model.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'historicalmailtrigger'
+        ordering = ['history_id', ]
+        filtering = { 
+            "slug": ALL,
+            "desc": ALL,
+            "history_id": ALL,
+            "history_date": ALL,
+            "history_change_reason": ALL,
+            "history_type": ALL,
+            "history_user": ALL_WITH_RELATIONS,
+        }
+api.mailtrigger.register(HistoricalMailTriggerResource())
+
+from ietf.utils.resources import UserResource
+class HistoricalRecipientResource(ModelResource):
+    history_user     = ToOneField(UserResource, 'history_user', null=True)
+    class Meta:
+        queryset = Recipient.history.model.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'historicalrecipient'
+        ordering = ['history_id', ]
+        filtering = { 
+            "slug": ALL,
+            "desc": ALL,
+            "template": ALL,
+            "history_id": ALL,
+            "history_date": ALL,
+            "history_change_reason": ALL,
+            "history_type": ALL,
+            "history_user": ALL_WITH_RELATIONS,
+        }
+api.mailtrigger.register(HistoricalRecipientResource())
diff --git a/ietf/mailtrigger/utils.py b/ietf/mailtrigger/utils.py
index 48d91ff6aa..bcdaf5e44e 100644
--- a/ietf/mailtrigger/utils.py
+++ b/ietf/mailtrigger/utils.py
@@ -1,45 +1,62 @@
-# Copyright The IETF Trust 2015-2019, All Rights Reserved
+# Copyright The IETF Trust 2015-2023, All Rights Reserved
 
 from collections import namedtuple
 
-import debug                            # pyflakes:ignore
+import debug  # pyflakes:ignore
 
 from ietf.mailtrigger.models import MailTrigger, Recipient
 from ietf.submit.models import Submission
 from ietf.utils.mail import excludeaddrs
 
-class AddrLists(namedtuple('AddrLists',['to','cc'])):
 
-    __slots__ = ()
+EMAIL_ALIASES = {
+    "IETFCHAIR": "The IETF Chair <chair@ietf.org>",
+    "IESG": "The IESG <iesg@ietf.org>",
+    "IAB": "The IAB <iab@iab.org>",
+    "IABCHAIR": "The IAB Chair <iab-chair@iab.org>",
+}
+
 
-    def as_strings(self,compact=True):
+class AddrLists(namedtuple("AddrLists", ["to", "cc"])):
+    __slots__ = ()
 
+    def as_strings(self, compact=True):
         separator = ", " if compact else ",\n    "
         to_string = separator.join(self.to)
         cc_string = separator.join(self.cc)
 
-        return namedtuple('AddrListsAsStrings',['to','cc'])(to=to_string,cc=cc_string)
+        return namedtuple("AddrListsAsStrings", ["to", "cc"])(
+            to=to_string, cc=cc_string
+        )
 
 
-def gather_address_lists(slug, skipped_recipients=None, create_from_slug_if_not_exists=None, 
-                         desc_if_not_exists=None, **kwargs):
-    mailtrigger = get_mailtrigger(slug, create_from_slug_if_not_exists, desc_if_not_exists)
+def gather_address_lists(
+    slug,
+    skipped_recipients=None,
+    create_from_slug_if_not_exists=None,
+    desc_if_not_exists=None,
+    **kwargs
+):
+    mailtrigger = get_mailtrigger(
+        slug, create_from_slug_if_not_exists, desc_if_not_exists
+    )
 
     to = set()
     for recipient in mailtrigger.to.all():
         to.update(recipient.gather(**kwargs))
-    to.discard('')
+    to.discard("")
     if skipped_recipients:
         to = excludeaddrs(to, skipped_recipients)
 
     cc = set()
     for recipient in mailtrigger.cc.all():
         cc.update(recipient.gather(**kwargs))
-    cc.discard('')
+    cc.discard("")
     if skipped_recipients:
         cc = excludeaddrs(cc, skipped_recipients)
 
-    return AddrLists(to=sorted(list(to)),cc=sorted(list(cc)))
+    return AddrLists(to=sorted(list(to)), cc=sorted(list(cc)))
+
 
 def get_mailtrigger(slug, create_from_slug_if_not_exists, desc_if_not_exists):
     try:
@@ -50,77 +67,158 @@ def get_mailtrigger(slug, create_from_slug_if_not_exists, desc_if_not_exists):
             mailtrigger = MailTrigger.objects.create(slug=slug, desc=desc_if_not_exists)
             mailtrigger.to.set(template.to.all())
             mailtrigger.cc.set(template.cc.all())
-            if slug.startswith('review_completed') and slug.endswith('early'):
-                mailtrigger.cc.remove('ietf_last_call')
+            if slug.startswith("review_completed") and slug.endswith("early"):
+                mailtrigger.cc.remove("ietf_last_call")
         else:
             raise
     return mailtrigger
 
 
-def gather_relevant_expansions(**kwargs):
-
-    def starts_with(prefix):
-        return MailTrigger.objects.filter(slug__startswith=prefix).values_list('slug',flat=True)
-
-    relevant = set() 
-    
-    if 'doc' in kwargs:
-
-        doc = kwargs['doc']
-
-        relevant.add('doc_state_edited')
-        
-        if not doc.type_id in ['bofreq',]:
-            relevant.update(['doc_telechat_details_changed','ballot_deferred','iesg_ballot_saved'])
+def get_contacts_for_liaison_messages_for_group_primary(group):
+    from ietf.liaisons.views import contact_email_from_role
+
+    '''Returns list of emails to use in liaison message for group
+    '''
+    emails = []
+
+    # role based emails
+    if group.acronym in ('ietf','iesg'):
+        emails.append(EMAIL_ALIASES['IESG'])
+        emails.append(EMAIL_ALIASES['IETFCHAIR'])
+    elif group.acronym in ('iab'):
+        emails.append(EMAIL_ALIASES['IAB'])
+        emails.append(EMAIL_ALIASES['IABCHAIR'])
+    elif group.type_id == 'area':
+        emails.append(EMAIL_ALIASES['IETFCHAIR'])
+        ad_roles = group.role_set.filter(name='ad')
+        emails.extend([ contact_email_from_role(r) for r in ad_roles ])
+    elif group.type_id == 'wg':
+        ad_roles = group.parent.role_set.filter(name='ad')
+        emails.extend([ contact_email_from_role(r) for r in ad_roles ])
+        chair_roles = group.role_set.filter(name='chair')
+        emails.extend([ contact_email_from_role(r) for r in chair_roles ])
+        if group.list_email:
+            emails.append('{} Discussion List <{}>'.format(group.name,group.list_email))
+    elif group.type_id == 'sdo':
+        liaiman_roles = group.role_set.filter(name='liaiman')
+        emails.extend([ contact_email_from_role(r) for r in liaiman_roles ])
+
+    # explicit CCs
+    liaison_cc_roles = group.role_set.filter(name='liaison_cc_contact')
+    emails.extend([ contact_email_from_role(r) for r in liaison_cc_roles ])
+
+    return emails
+
+
+def get_contacts_for_liaison_messages_for_group_secondary(group):
+    from ietf.liaisons.views import contacts_from_roles
+
+    '''Returns default contacts for groups as a comma separated string'''
+    # use explicit default contacts if defined
+    explicit_contacts = contacts_from_roles(group.role_set.filter(name='liaison_contact'))
+    if explicit_contacts:
+        return explicit_contacts
+
+    # otherwise construct based on group type
+    contacts = []
+    if group.type_id == 'area':
+        roles = group.role_set.filter(name='ad')
+        contacts.append(contacts_from_roles(roles))
+    elif group.type_id == 'wg':
+        roles = group.role_set.filter(name='chair')
+        contacts.append(contacts_from_roles(roles))
+    elif group.acronym == 'ietf':
+        contacts.append(EMAIL_ALIASES['IETFCHAIR'])
+    elif group.acronym == 'iab':
+        contacts.append(EMAIL_ALIASES['IABCHAIR'])
+    elif group.acronym == 'iesg':
+        contacts.append(EMAIL_ALIASES['IESG'])
+
+    return ','.join(contacts)
 
-        if doc.type_id in ['draft','statchg']:
-            relevant.update(starts_with('last_call_'))
 
-        if doc.type_id == 'draft':
-            relevant.update(starts_with('doc_'))
-            relevant.update(starts_with('resurrection_'))
-            relevant.update(['ipr_posted_on_doc',])
-            if doc.stream_id == 'ietf':
-                relevant.update(['ballot_approved_ietf_stream','pubreq_iesg'])
+def gather_relevant_expansions(**kwargs):
+    def starts_with(prefix):
+        return MailTrigger.objects.filter(slug__startswith=prefix).values_list(
+            "slug", flat=True
+        )
+
+    relevant = set()
+
+    if "doc" in kwargs:
+        doc = kwargs["doc"]
+
+        relevant.add("doc_state_edited")
+
+        if not doc.type_id in ["bofreq", "statement", "rfc"]:
+            relevant.update(
+                ["doc_telechat_details_changed", "ballot_deferred", "iesg_ballot_saved"]
+            )
+
+        if doc.type_id in ["draft", "statchg"]:
+            relevant.update(starts_with("last_call_"))
+
+        if doc.type_id == "rfc":
+            relevant.update(
+                [
+                    "doc_added_comment",
+                    "doc_external_resource_change_requested",
+                    "doc_state_edited",
+                    "ipr_posted_on_doc",
+                ]
+            )
+
+        if doc.type_id == "draft":
+            relevant.update(starts_with("doc_"))
+            relevant.update(starts_with("resurrection_"))
+            relevant.update(
+                [
+                    "ipr_posted_on_doc",
+                ]
+            )
+            if doc.stream_id == "ietf":
+                relevant.update(["ballot_approved_ietf_stream", "pubreq_iesg"])
             else:
-                relevant.update(['pubreq_rfced'])
-            last_submission = Submission.objects.filter(name=doc.name,state='posted').order_by('-rev').first()
-            if last_submission and 'submission' not in kwargs:
-                kwargs['submission'] = last_submission
-
-        if  doc.type_id == 'conflrev':
-            relevant.update(['conflrev_requested','ballot_approved_conflrev'])
-        if  doc.type_id == 'charter':
-            relevant.update(['charter_external_review','ballot_approved_charter'])
-
-        if doc.type_id == 'bofreq':
-            relevant.update(starts_with('bofreq'))
-
-    if 'group' in kwargs:
-
-        relevant.update(starts_with('group_'))
-        relevant.update(starts_with('milestones_'))
-        group = kwargs['group']       
+                relevant.update(["pubreq_rfced"])
+            last_submission = (
+                Submission.objects.filter(name=doc.name, state="posted")
+                .order_by("-rev")
+                .first()
+            )
+            if last_submission and "submission" not in kwargs:
+                kwargs["submission"] = last_submission
+
+        if doc.type_id == "conflrev":
+            relevant.update(["conflrev_requested", "ballot_approved_conflrev"])
+        if doc.type_id == "charter":
+            relevant.update(["charter_external_review", "ballot_approved_charter"])
+
+        if doc.type_id == "bofreq":
+            relevant.update(starts_with("bofreq"))
+
+    if "group" in kwargs:
+        relevant.update(starts_with("group_"))
+        relevant.update(starts_with("milestones_"))
+        group = kwargs["group"]
         if group.features.acts_like_wg:
-            relevant.update(starts_with('session_'))
+            relevant.update(starts_with("session_"))
         if group.features.has_chartering_process:
-            relevant.update(['charter_external_review',])
-
-    if 'submission' in kwargs:
+            relevant.update(
+                [
+                    "charter_external_review",
+                ]
+            )
 
-        relevant.update(starts_with('sub_'))
+    if "submission" in kwargs:
+        relevant.update(starts_with("sub_"))
 
     rule_list = []
     for mailtrigger in MailTrigger.objects.filter(slug__in=relevant):
-        addrs = gather_address_lists(mailtrigger.slug,**kwargs)
+        addrs = gather_address_lists(mailtrigger.slug, **kwargs)
         if addrs.to or addrs.cc:
-            rule_list.append((mailtrigger.slug,mailtrigger.desc,addrs.to,addrs.cc))
+            rule_list.append((mailtrigger.slug, mailtrigger.desc, addrs.to, addrs.cc))
     return sorted(rule_list)
 
-def get_base_submission_message_address():
-    return Recipient.objects.get(slug='submission_manualpost_handling').gather()[0]
 
 def get_base_ipr_request_address():
-    return Recipient.objects.get(slug='ipr_requests').gather()[0]
-
-
+    return Recipient.objects.get(slug="ipr_requests").gather()[0]
diff --git a/ietf/meeting/.gitignore b/ietf/meeting/.gitignore
deleted file mode 100644
index ba8bdb3afc..0000000000
--- a/ietf/meeting/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/*.swp
diff --git a/ietf/meeting/admin.py b/ietf/meeting/admin.py
index 2e2c7f7c22..03abf5c029 100644
--- a/ietf/meeting/admin.py
+++ b/ietf/meeting/admin.py
@@ -3,11 +3,14 @@
 
 
 from django.contrib import admin
+from django.db.models import Count
 
 from ietf.meeting.models import (Attended, Meeting, Room, Session, TimeSlot, Constraint, Schedule,
     SchedTimeSessAssignment, ResourceAssociation, FloorPlan, UrlResource,
     SessionPresentation, ImportantDate, SlideSubmission, SchedulingEvent, BusinessConstraint,
-    ProceedingsMaterial, MeetingHost)
+    ProceedingsMaterial, MeetingHost, Registration, RegistrationTicket,
+    AttendanceTypeName)
+from ietf.utils.admin import SaferTabularInline
 
 
 class UrlResourceAdmin(admin.ModelAdmin):
@@ -16,7 +19,7 @@ class UrlResourceAdmin(admin.ModelAdmin):
     raw_id_fields = ['room', ]
 admin.site.register(UrlResource, UrlResourceAdmin)
 
-class UrlResourceInline(admin.TabularInline):
+class UrlResourceInline(SaferTabularInline):
     model = UrlResource
 
 class RoomAdmin(admin.ModelAdmin):
@@ -26,7 +29,7 @@ class RoomAdmin(admin.ModelAdmin):
 
 admin.site.register(Room, RoomAdmin)
 
-class RoomInline(admin.TabularInline):
+class RoomInline(SaferTabularInline):
     model = Room
 
 class MeetingAdmin(admin.ModelAdmin):
@@ -91,12 +94,14 @@ def name_lower(self, instance):
 
 admin.site.register(Constraint, ConstraintAdmin)
 
-class SchedulingEventInline(admin.TabularInline):
+class SchedulingEventInline(SaferTabularInline):
     model = SchedulingEvent
     raw_id_fields = ["by"]
 
 class SessionAdmin(admin.ModelAdmin):
-    list_display = ["meeting", "name", "group_acronym", "purpose", "attendees", "requested", "current_status"]
+    list_display = [
+        "meeting", "name", "group_acronym", "purpose", "attendees", "has_onsite_tool", "chat_room", "requested", "current_status"
+    ]
     list_filter = ["purpose", "meeting", ]
     raw_id_fields = ["meeting", "group", "materials", "joint_with_groups", "tombstone_for"]
     search_fields = ["meeting__number", "name", "group__name", "group__acronym", "purpose__name"]
@@ -187,7 +192,7 @@ class ImportantDateAdmin(admin.ModelAdmin):
 class SlideSubmissionAdmin(admin.ModelAdmin):
     model = SlideSubmission
     list_display = ['session', 'submitter', 'title']
-    raw_id_fields = ['submitter', 'session']
+    raw_id_fields = ['submitter', 'session', 'doc']
 
 admin.site.register(SlideSubmission, SlideSubmissionAdmin)
 
@@ -211,3 +216,76 @@ class AttendedAdmin(admin.ModelAdmin):
     search_fields = ["person__name", "session__group__acronym", "session__meeting__number", "session__name", "session__purpose__name"]
     raw_id_fields= ["person", "session"]
 admin.site.register(Attended, AttendedAdmin)
+
+class MeetingFilter(admin.SimpleListFilter):
+    title = 'Meeting Filter'
+    parameter_name = 'meeting_id'
+
+    def lookups(self, request, model_admin):
+        # only include meetings with registration records
+        meetings = Meeting.objects.filter(type='ietf').annotate(reg_count=Count('registration')).filter(reg_count__gt=0).order_by('-date')
+        choices = meetings.values_list('id', 'number')
+        return choices
+
+    def queryset(self, request, queryset):
+        if self.value():
+            return queryset.filter(meeting__id=self.value())
+        return queryset
+
+class AttendanceFilter(admin.SimpleListFilter):
+    title = 'Attendance Type'
+    parameter_name = 'attendance_type'
+
+    def lookups(self, request, model_admin):
+        choices = AttendanceTypeName.objects.all().values_list('slug', 'name')
+        return choices
+
+    def queryset(self, request, queryset):
+        if self.value():
+            return queryset.filter(tickets__attendance_type__slug=self.value()).distinct()
+        return queryset
+
+class RegistrationTicketInline(SaferTabularInline):
+    model = RegistrationTicket
+
+class RegistrationAdmin(admin.ModelAdmin):
+    model = Registration
+    list_filter = [AttendanceFilter, MeetingFilter]
+    list_display = ['meeting', 'first_name', 'last_name', 'display_attendance', 'affiliation', 'country_code', 'email', ]
+    search_fields = ['first_name', 'last_name', 'affiliation', 'country_code', 'email', ]
+    raw_id_fields = ['person']
+    inlines = [RegistrationTicketInline, ]
+    ordering = ['-meeting__date', 'last_name']
+
+    def display_attendance(self, instance):
+        '''Only display the most significant ticket in the list.
+        To see all the tickets inspect the individual instance
+        '''
+        if instance.tickets.filter(attendance_type__slug='onsite').exists():
+            return 'onsite'
+        elif instance.tickets.filter(attendance_type__slug='remote').exists():
+            return 'remote'
+        elif instance.tickets.filter(attendance_type__slug='hackathon_onsite').exists():
+            return 'hackathon onsite'
+        elif instance.tickets.filter(attendance_type__slug='hackathon_remote').exists():
+            return 'hackathon remote'
+    display_attendance.short_description = "Attendance"  # type: ignore # https://github.com/python/mypy/issues/2087
+
+admin.site.register(Registration, RegistrationAdmin)
+
+class RegistrationTicketAdmin(admin.ModelAdmin):
+    model = RegistrationTicket
+    list_filter = ['attendance_type', ]
+    # not available until Django 5.2, the name of a related field, using the __ notation
+    # list_display = ['registration__meeting', 'registration', 'attendance_type', 'ticket_type', 'registration__email']
+    # list_select_related = ('registration',)
+    list_display = ['registration', 'attendance_type', 'ticket_type', 'display_meeting']
+    search_fields = ['registration__first_name', 'registration__last_name', 'registration__email']
+    raw_id_fields = ['registration']
+    ordering = ['-registration__meeting__date', 'registration__last_name']
+
+    def display_meeting(self, instance):
+        return instance.registration.meeting.number
+    display_meeting.short_description = "Meeting"  # type: ignore # https://github.com/python/mypy/issues/2087
+
+admin.site.register(RegistrationTicket, RegistrationTicketAdmin)
diff --git a/ietf/meeting/factories.py b/ietf/meeting/factories.py
index e59b559f41..fc0ce8387c 100644
--- a/ietf/meeting/factories.py
+++ b/ietf/meeting/factories.py
@@ -9,9 +9,10 @@
 from django.core.files.base import ContentFile
 from django.db.models import Q
 
+from ietf.doc.storage_utils import store_str
 from ietf.meeting.models import (Attended, Meeting, Session, SchedulingEvent, Schedule,
     TimeSlot, SessionPresentation, FloorPlan, Room, SlideSubmission, Constraint,
-    MeetingHost, ProceedingsMaterial)
+    MeetingHost, ProceedingsMaterial, Registration, RegistrationTicket)
 from ietf.name.models import (ConstraintName, SessionStatusName, ProceedingsMaterialTypeName,
                               TimerangeName, SessionPurposeName)
 from ietf.doc.factories import ProceedingsMaterialDocFactory
@@ -23,6 +24,7 @@
 class MeetingFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Meeting
+        skip_postgeneration_save = True
 
     type_id = factory.Iterator(['ietf','interim'])
 
@@ -103,6 +105,7 @@ def group_conflicts(obj, create, extracted, **kwargs):  # pulint: disable=no-sel
 class SessionFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Session
+        skip_postgeneration_save = True
 
     meeting = factory.SubFactory(MeetingFactory)
     purpose_id = 'regular'
@@ -110,6 +113,7 @@ class Meta:
     group = factory.SubFactory(GroupFactory)
     requested_duration = datetime.timedelta(hours=1)
     on_agenda = factory.lazy_attribute(lambda obj: SessionPurposeName.objects.get(pk=obj.purpose_id).on_agenda)
+    has_onsite_tool = factory.lazy_attribute(lambda obj: obj.purpose_id == 'regular')
 
     @factory.post_generation
     def status_id(obj, create, extracted, **kwargs):
@@ -155,6 +159,7 @@ class Meta:
 class RoomFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Room
+        skip_postgeneration_save = True
 
     meeting = factory.SubFactory(MeetingFactory)
     name = factory.Faker('name')
@@ -171,6 +176,7 @@ def session_types(obj, create, extracted, **kwargs): # pylint: disable=no-self-a
 class TimeSlotFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = TimeSlot
+        skip_postgeneration_save = True
 
     meeting = factory.SubFactory(MeetingFactory)
     type_id = 'regular'
@@ -187,7 +193,9 @@ def location(obj, create, extracted, **kwargs): # pylint: disable=no-self-argume
     
     @factory.lazy_attribute
     def time(self):
-        return datetime.datetime.combine(self.meeting.date,datetime.time(11,0))
+        return self.meeting.tz().localize(
+            datetime.datetime.combine(self.meeting.date, datetime.time(11, 0))
+        )
 
     @factory.lazy_attribute
     def duration(self):
@@ -222,6 +230,7 @@ class Meta:
 class SlideSubmissionFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = SlideSubmission
+        skip_postgeneration_save = True
 
     session = factory.SubFactory(SessionFactory)
     title = factory.Faker('sentence')
@@ -231,10 +240,15 @@ class Meta:
     make_file = factory.PostGeneration(
                     lambda obj, create, extracted, **kwargs: open(obj.staged_filepath(),'a').close()
                 )
+    
+    store_submission = factory.PostGeneration(
+        lambda obj, create, extracted, **kwargs: store_str("staging", obj.filename, "")
+    )
 
 class ConstraintFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Constraint
+        skip_postgeneration_save = True
 
     meeting = factory.SubFactory(MeetingFactory)
     source = factory.SubFactory(GroupFactory)
@@ -304,3 +318,48 @@ class Meta:
 
     session = factory.SubFactory(SessionFactory)
     person = factory.SubFactory(PersonFactory)
+
+
+class RegistrationFactory(factory.django.DjangoModelFactory):
+    """
+    This will create an associated onsite week_pass ticket by default.
+    Methods of calling:
+
+    RegistrationFactory()                   create a ticket with defaults, onsite
+    RegistrationFactory(with_ticket=True)   same as above
+    RegistrationFactory(with_ticket={'attendance_type_id': 'remote'})   creates ticket with overrides
+    RegistrationFactory(with_ticket=False)  does not create a ticket
+    """
+    class Meta:
+        model = Registration
+        skip_postgeneration_save = True
+
+    meeting = factory.SubFactory(MeetingFactory)
+    person = factory.SubFactory(PersonFactory)
+    email = factory.LazyAttribute(lambda obj: obj.person.email())
+    first_name = factory.LazyAttribute(lambda obj: obj.person.first_name())
+    last_name = factory.LazyAttribute(lambda obj: obj.person.last_name())
+    affiliation = factory.Faker('company')
+    country_code = factory.Faker('country_code')
+    attended = False
+    checkedin = False
+
+    @factory.post_generation
+    def with_ticket(self, create, extracted, **kwargs):
+        if not create:
+            return
+        if extracted is False:
+            # Explicitly disable ticket creation
+            return
+        ticket_kwargs = extracted if isinstance(extracted, dict) else {}
+        RegistrationTicketFactory(registration=self, **ticket_kwargs)
+
+
+class RegistrationTicketFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = RegistrationTicket
+        skip_postgeneration_save = True
+
+    registration = factory.SubFactory(RegistrationFactory)
+    attendance_type_id = factory.LazyAttribute(lambda _: 'onsite')
+    ticket_type_id = factory.LazyAttribute(lambda _: 'week_pass')
diff --git a/ietf/meeting/fixtures/proceedings_templates.json b/ietf/meeting/fixtures/proceedings_templates.json
index 1594debff2..97d38f566c 100644
--- a/ietf/meeting/fixtures/proceedings_templates.json
+++ b/ietf/meeting/fixtures/proceedings_templates.json
@@ -32,7 +32,7 @@
       "comments": "",
       "list_subscribe": "",
       "state": "active",
-      "time": "2012-02-26T00:21:36",
+      "time": "2012-02-26T00:21:36Z",
       "unused_tags": [],
       "list_archive": "",
       "type": "ietf",
diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py
index 183c8ff322..e5b1697f86 100644
--- a/ietf/meeting/forms.py
+++ b/ietf/meeting/forms.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
+# Copyright The IETF Trust 2016-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -15,27 +15,38 @@
 from django.core import validators
 from django.core.exceptions import ValidationError
 from django.forms import BaseInlineFormSet
+from django.template.defaultfilters import pluralize
 from django.utils.functional import cached_property
+from django.utils.safestring import mark_safe
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import Document, DocAlias, State, NewRevisionDocEvent
+from ietf.doc.models import Document, State, NewRevisionDocEvent
 from ietf.group.models import Group
 from ietf.group.utils import groups_managed_by
-from ietf.meeting.models import Session, Meeting, Schedule, countries, timezones, TimeSlot, Room
+from ietf.meeting.models import (Session, Meeting, Schedule, COUNTRIES, TIMEZONES, TimeSlot, Room,
+    Constraint, ResourceAssociation)
 from ietf.meeting.helpers import get_next_interim_number, make_materials_directories
 from ietf.meeting.helpers import is_interim_meeting_approved, get_next_agenda_name
 from ietf.message.models import Message
-from ietf.name.models import TimeSlotTypeName, SessionPurposeName
+from ietf.name.models import TimeSlotTypeName, SessionPurposeName, TimerangeName, ConstraintName
+from ietf.person.fields import SearchablePersonsField
 from ietf.person.models import Person
-from ietf.utils.fields import DatepickerDateField, DurationField, MultiEmailField, DatepickerSplitDateTimeWidget
+from ietf.utils import log
+from ietf.utils.fields import (
+    DatepickerDateField,
+    DatepickerSplitDateTimeWidget,
+    DurationField,
+    ModelMultipleChoiceField,
+    MultiEmailField,
+)
+from ietf.utils.html import clean_text_field
 from ietf.utils.validators import ( validate_file_size, validate_mime_type,
     validate_file_extension, validate_no_html_frame)
 
-# need to insert empty option for use in ChoiceField
-# countries.insert(0, ('', '-'*9 ))
-countries.insert(0, ('', '-' * 9))
-timezones.insert(0, ('', '-' * 9))
+NUM_SESSION_CHOICES = (('', '--Please select'), ('1', '1'), ('2', '2'))
+SESSION_TIME_RELATION_CHOICES = (('', 'No preference'),) + Constraint.TIME_RELATION_CHOICES
+JOINT_FOR_SESSION_CHOICES = (('1', 'First session'), ('2', 'Second session'), ('3', 'Third session'), )
 
 # -------------------------------------------------
 # Helpers
@@ -73,6 +84,27 @@ def duration_string(duration):
     return string
 
 
+def allowed_conflicting_groups():
+    return Group.objects.filter(
+        type__in=['wg', 'ag', 'rg', 'rag', 'program', 'edwg'],
+        state__in=['bof', 'proposed', 'active'])
+
+
+def check_conflict(groups, source_group):
+    '''
+    Takes a string which is a list of group acronyms.  Checks that they are all active groups
+    '''
+    # convert to python list (allow space or comma separated lists)
+    items = groups.replace(',', ' ').split()
+    active_groups = allowed_conflicting_groups()
+    for group in items:
+        if group == source_group.acronym:
+            raise forms.ValidationError("Cannot declare a conflict with the same group: %s" % group)
+
+        if not active_groups.filter(acronym=group):
+            raise forms.ValidationError("Invalid or inactive group acronym: %s" % group)
+
+
 # -------------------------------------------------
 # Forms
 # -------------------------------------------------
@@ -134,12 +166,12 @@ class InterimMeetingModelForm(forms.ModelForm):
     approved = forms.BooleanField(required=False)
     city = forms.CharField(max_length=255, required=False)
     city.widget.attrs['placeholder'] = "City"
-    country = forms.ChoiceField(choices=countries, required=False)
+    country = forms.ChoiceField(choices=COUNTRIES, required=False)
     country.widget.attrs['class'] = "select2-field"
     country.widget.attrs['data-max-entries'] = 1
     country.widget.attrs['data-placeholder'] = "Country"
     country.widget.attrs['data-minimum-input-length'] = 0
-    time_zone = forms.ChoiceField(choices=timezones)
+    time_zone = forms.ChoiceField(choices=TIMEZONES)
     time_zone.widget.attrs['class'] = "select2-field"
     time_zone.widget.attrs['data-max-entries'] = 1
     time_zone.widget.attrs['data-minimum-input-length'] = 0
@@ -223,10 +255,10 @@ def save(self, *args, **kwargs):
 
 class InterimSessionModelForm(forms.ModelForm):
     date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1"}, label='Date', required=False)
-    time = forms.TimeField(widget=forms.TimeInput(format='%H:%M'), required=True, help_text="Local time")
+    time = forms.TimeField(widget=forms.TimeInput(format='%H:%M'), required=True, help_text="Start time in meeting time zone")
     time.widget.attrs['placeholder'] = "HH:MM"
     requested_duration = CustomDurationField(required=True)
-    end_time = forms.TimeField(required=False, help_text="Local time")
+    end_time = forms.TimeField(required=False, help_text="End time in meeting time zone")
     end_time.widget.attrs['placeholder'] = "HH:MM"
     remote_participation = forms.ChoiceField(choices=(), required=False)
     remote_instructions = forms.CharField(
@@ -258,8 +290,8 @@ def __init__(self, *args, **kwargs):
         self.is_edit = bool(self.instance.pk)
         # setup fields that aren't intrinsic to the Session object
         if self.is_edit:
-            self.initial['date'] = self.instance.official_timeslotassignment().timeslot.time
-            self.initial['time'] = self.instance.official_timeslotassignment().timeslot.time
+            self.initial['date'] = self.instance.official_timeslotassignment().timeslot.local_start_time().date()
+            self.initial['time'] = self.instance.official_timeslotassignment().timeslot.local_start_time().time()
             if self.instance.agenda():
                 doc = self.instance.agenda()
                 content = doc.text_or_error()
@@ -341,8 +373,7 @@ def save_agenda(self):
                 # FIXME: What about agendas in html or markdown format?
                 uploaded_filename='{}-00.txt'.format(filename))
             doc.set_state(State.objects.get(type__slug=doc.type.slug, slug='active'))
-            DocAlias.objects.create(name=doc.name).docs.add(doc)
-            self.instance.sessionpresentation_set.create(document=doc, rev=doc.rev)
+            self.instance.presentations.create(document=doc, rev=doc.rev)
             NewRevisionDocEvent.objects.create(
                 type='new_revision',
                 by=self.user.person,
@@ -356,12 +387,19 @@ def save_agenda(self):
             os.makedirs(directory)
         with io.open(path, "w", encoding='utf-8') as file:
             file.write(self.cleaned_data['agenda'])
+        doc.store_str(doc.uploaded_filename, self.cleaned_data['agenda'])
 
 
 class InterimAnnounceForm(forms.ModelForm):
     class Meta:
         model = Message
-        fields = ('to', 'frm', 'cc', 'bcc', 'reply_to', 'subject', 'body')
+        fields = ('to', 'cc', 'frm', 'subject', 'body')
+
+    def __init__(self, *args, **kwargs):
+        super(InterimAnnounceForm, self).__init__(*args, **kwargs)
+        self.fields['frm'].label='From'
+        self.fields['frm'].widget.attrs['readonly'] = True
+        self.fields['to'].widget.attrs['readonly'] = True
 
     def save(self, *args, **kwargs):
         user = kwargs.pop('user')
@@ -375,7 +413,8 @@ def save(self, *args, **kwargs):
 class InterimCancelForm(forms.Form):
     group = forms.CharField(max_length=255, required=False)
     date = forms.DateField(required=False)
-    comments = forms.CharField(required=False, widget=forms.Textarea(attrs={'placeholder': 'enter optional comments here'}), strip=False)
+    # max_length must match Session.agenda_note
+    comments = forms.CharField(max_length=512, required=False, widget=forms.Textarea(attrs={'placeholder': 'enter optional comments here'}), strip=False)
 
     def __init__(self, *args, **kwargs):
         super(InterimCancelForm, self).__init__(*args, **kwargs)
@@ -466,6 +505,9 @@ def __init__(self, show_apply_to_all_checkbox, *args, **kwargs):
 class UploadMinutesForm(ApplyToAllFileUploadForm):
     doc_type = 'minutes'
 
+class UploadNarrativeMinutesForm(ApplyToAllFileUploadForm):
+    doc_type = 'narrativeminutes'
+
 
 class UploadAgendaForm(ApplyToAllFileUploadForm):
     doc_type = 'agenda'
@@ -474,9 +516,12 @@ class UploadAgendaForm(ApplyToAllFileUploadForm):
 class UploadSlidesForm(ApplyToAllFileUploadForm):
     doc_type = 'slides'
     title = forms.CharField(max_length=255)
+    approved = forms.BooleanField(label='Auto-approve', initial=True, required=False)
 
-    def __init__(self, session, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, session, show_apply_to_all_checkbox, can_manage, *args, **kwargs):
+        super().__init__(show_apply_to_all_checkbox, *args, **kwargs)
+        if not can_manage:
+            self.fields.pop('approved')
         self.session = session
 
     def clean_title(self):
@@ -542,7 +587,7 @@ class SwapTimeslotsForm(forms.Form):
         queryset=TimeSlot.objects.none(),  # default to none, fill in when we have a meeting
         widget=forms.TextInput,
     )
-    rooms = forms.ModelMultipleChoiceField(
+    rooms = ModelMultipleChoiceField(
         required=True,
         queryset=Room.objects.none(),  # default to none, fill in when we have a meeting
         widget=CsvModelPkInput,
@@ -608,7 +653,7 @@ class TimeSlotCreateForm(forms.Form):
     )
     duration = TimeSlotDurationField()
     show_location = forms.BooleanField(required=False, initial=True)
-    locations = forms.ModelMultipleChoiceField(
+    locations = ModelMultipleChoiceField(
         queryset=Room.objects.none(),
         widget=forms.CheckboxSelectMultiple,
     )
@@ -727,6 +772,7 @@ def __init__(self, group, *args, **kwargs):
                 'purpose',
                 session_purposes[0] if len(session_purposes) > 0 else None,
             )
+            kwargs['initial'].setdefault('has_onsite_tool', group.features.acts_like_wg)
         super().__init__(*args, **kwargs)
 
         self.fields['type'].widget.attrs.update({
@@ -738,12 +784,16 @@ def __init__(self, group, *args, **kwargs):
         self.fields['purpose'].queryset = SessionPurposeName.objects.filter(pk__in=session_purposes)
         if not group.features.acts_like_wg:
             self.fields['requested_duration'].durations = [datetime.timedelta(minutes=m) for m in range(30, 241, 30)]
+        # add bootstrap classes
+        self.fields['purpose'].widget.attrs.update({'class': 'form-select'})
+        self.fields['type'].widget.attrs.update({'class': 'form-select', 'aria-label': 'session type'})
 
     class Meta:
         model = Session
         fields = (
             'purpose', 'name', 'short', 'type', 'requested_duration',
-            'on_agenda', 'remote_instructions', 'attendees', 'comments',
+            'on_agenda', 'agenda_note', 'has_onsite_tool', 'chat_room', 'remote_instructions',
+            'attendees', 'comments',
         )
         labels = {'requested_duration': 'Length'}
 
@@ -773,6 +823,13 @@ def __init__(self, instance, *args, **kwargs):
         super().__init__(instance=instance, group=instance.group, *args, **kwargs)
 
 
+class SessionCancelForm(forms.Form):
+    confirmed = forms.BooleanField(
+        label='Cancel session?',
+        help_text='Confirm that you want to cancel this session.',
+    )
+
+
 class SessionDetailsInlineFormSet(forms.BaseInlineFormSet):
     def __init__(self, group, meeting, queryset=None, *args, **kwargs):
         self._meeting = meeting
@@ -814,3 +871,296 @@ def sessiondetailsformset_factory(min_num=1, max_num=3):
         max_num=max_num,
         extra=max_num,  # only creates up to max_num total
     )
+
+
+class SessionRequestStatusForm(forms.Form):
+    message = forms.CharField(widget=forms.Textarea(attrs={'rows': '3', 'cols': '80'}), strip=False)
+
+
+class NameModelMultipleChoiceField(ModelMultipleChoiceField):
+    def label_from_instance(self, name):
+        return name.desc
+
+
+class SessionRequestForm(forms.Form):
+    num_session = forms.ChoiceField(
+        choices=NUM_SESSION_CHOICES,
+        label="Number of sessions")
+    # session fields are added in __init__()
+    session_time_relation = forms.ChoiceField(
+        choices=SESSION_TIME_RELATION_CHOICES,
+        required=False,
+        label="Time between two sessions")
+    attendees = forms.IntegerField(label="Number of Attendees")
+    # FIXME: it would cleaner to have these be
+    # ModelMultipleChoiceField, and just customize the widgetry, that
+    # way validation comes for free (applies to this CharField and the
+    # constraints dynamically instantiated in __init__())
+    joint_with_groups = forms.CharField(max_length=255, required=False)
+    joint_with_groups_selector = forms.ChoiceField(choices=[], required=False)  # group select widget for prev field
+    joint_for_session = forms.ChoiceField(choices=JOINT_FOR_SESSION_CHOICES, required=False)
+    comments = forms.CharField(
+        max_length=200,
+        label='Special Requests',
+        help_text='i.e. restrictions on meeting times / days, etc.  (limit 200 characters)',
+        required=False)
+    third_session = forms.BooleanField(
+        required=False,
+        help_text="Help")
+    resources = forms.MultipleChoiceField(
+        widget=forms.CheckboxSelectMultiple,
+        required=False,
+        label='Resources Requested')
+    bethere = SearchablePersonsField(
+        label="Participants who must be present",
+        required=False,
+        help_text=mark_safe('<span class="fw-bold text-danger">Do not include Area Directors and WG Chairs; the system already tracks their availability.</span>'))
+    timeranges = NameModelMultipleChoiceField(
+        widget=forms.CheckboxSelectMultiple,
+        required=False,
+        label=mark_safe('Times during which this WG can <strong>not</strong> meet:<br>Please explain any selections in Special Requests below.'),
+        queryset=TimerangeName.objects.all())
+    adjacent_with_wg = forms.ChoiceField(
+        required=False,
+        label=mark_safe('Plan session adjacent with another WG:<br>(Immediately before or after another WG, no break in between, in the same room.)'))
+    send_notifications = forms.BooleanField(label="Send notification emails?", required=False, initial=False)
+
+    def __init__(self, group, meeting, data=None, *args, **kwargs):
+        self.hidden = kwargs.pop('hidden', False)
+        self.notifications_optional = kwargs.pop('notifications_optional', False)
+
+        self.group = group
+        formset_class = sessiondetailsformset_factory(max_num=3 if group.features.acts_like_wg else 50)
+        self.session_forms = formset_class(group=self.group, meeting=meeting, data=data)
+        super().__init__(data=data, *args, **kwargs)
+        if not self.notifications_optional:
+            self.fields['send_notifications'].widget = forms.HiddenInput()
+
+        # Allow additional sessions for non-wg-like groups
+        if not self.group.features.acts_like_wg:
+            self.fields['num_session'].choices = ((n, str(n)) for n in range(1, 51))
+
+        self._add_widget_class(self.fields['third_session'].widget, 'form-check-input')
+        self.fields['comments'].widget = forms.Textarea(attrs={'rows': '3', 'cols': '65'})
+
+        other_groups = list(allowed_conflicting_groups().exclude(pk=group.pk).values_list('acronym', 'acronym').order_by('acronym'))
+        self.fields['adjacent_with_wg'].choices = [('', '--No preference')] + other_groups
+        group_acronym_choices = [('', '--Select WG(s)')] + other_groups
+        self.fields['joint_with_groups_selector'].choices = group_acronym_choices
+
+        # Set up constraints for the meeting
+        self._wg_field_data = []
+        for constraintname in meeting.group_conflict_types.all():
+            # two fields for each constraint: a CharField for the group list and a selector to add entries
+            constraint_field = forms.CharField(max_length=255, required=False)
+            constraint_field.widget.attrs['data-slug'] = constraintname.slug
+            constraint_field.widget.attrs['data-constraint-name'] = str(constraintname).title()
+            constraint_field.widget.attrs['aria-label'] = f'{constraintname.slug}_input'
+            self._add_widget_class(constraint_field.widget, 'wg_constraint')
+            self._add_widget_class(constraint_field.widget, 'form-control')
+
+            selector_field = forms.ChoiceField(choices=group_acronym_choices, required=False)
+            selector_field.widget.attrs['data-slug'] = constraintname.slug  # used by onchange handler
+            self._add_widget_class(selector_field.widget, 'wg_constraint_selector')
+            self._add_widget_class(selector_field.widget, 'form-control')
+
+            cfield_id = 'constraint_{}'.format(constraintname.slug)
+            cselector_id = 'wg_selector_{}'.format(constraintname.slug)
+            # keep an eye out for field name conflicts
+            log.assertion('cfield_id not in self.fields')
+            log.assertion('cselector_id not in self.fields')
+            self.fields[cfield_id] = constraint_field
+            self.fields[cselector_id] = selector_field
+            self._wg_field_data.append((constraintname, cfield_id, cselector_id))
+
+        # Show constraints that are not actually used by the meeting so these don't get lost
+        self._inactive_wg_field_data = []
+        inactive_cnames = ConstraintName.objects.filter(
+            is_group_conflict=True  # Only collect group conflicts...
+        ).exclude(
+            meeting=meeting  # ...that are not enabled for this meeting...
+        ).filter(
+            constraint__source=group,  # ...but exist for this group...
+            constraint__meeting=meeting,  # ... at this meeting.
+        ).distinct()
+
+        for inactive_constraint_name in inactive_cnames:
+            field_id = 'delete_{}'.format(inactive_constraint_name.slug)
+            self.fields[field_id] = forms.BooleanField(required=False, label='Delete this conflict', help_text='Delete this inactive conflict?')
+            self._add_widget_class(self.fields[field_id].widget, 'form-control')
+            constraints = group.constraint_source_set.filter(meeting=meeting, name=inactive_constraint_name)
+            self._inactive_wg_field_data.append(
+                (inactive_constraint_name,
+                 ' '.join([c.target.acronym for c in constraints]),
+                 field_id)
+            )
+
+        self.fields['joint_with_groups_selector'].widget.attrs['onchange'] = "document.form_post.joint_with_groups.value=document.form_post.joint_with_groups.value + ' ' + this.options[this.selectedIndex].value; return 1;"
+        self.fields["resources"].choices = [(x.pk, x.desc) for x in ResourceAssociation.objects.filter(name__used=True).order_by('name__order')]
+
+        if self.hidden:
+            # replace all the widgets to start...
+            for key in list(self.fields.keys()):
+                self.fields[key].widget = forms.HiddenInput()
+            # re-replace a couple special cases
+            self.fields['resources'].widget = forms.MultipleHiddenInput()
+            self.fields['timeranges'].widget = forms.MultipleHiddenInput()
+            # and entirely replace bethere - no need to support searching if input is hidden
+            self.fields['bethere'] = ModelMultipleChoiceField(
+                widget=forms.MultipleHiddenInput, required=False,
+                queryset=Person.objects.all(),
+            )
+
+    def wg_constraint_fields(self):
+        """Iterates over wg constraint fields
+
+        Intended for use in the template.
+        """
+        for cname, cfield_id, cselector_id in self._wg_field_data:
+            yield cname, self[cfield_id], self[cselector_id]
+
+    def wg_constraint_count(self):
+        """How many wg constraints are there?"""
+        return len(self._wg_field_data)
+
+    def wg_constraint_field_ids(self):
+        """Iterates over wg constraint field IDs"""
+        for cname, cfield_id, _ in self._wg_field_data:
+            yield cname, cfield_id
+
+    def inactive_wg_constraints(self):
+        for cname, value, field_id in self._inactive_wg_field_data:
+            yield cname, value, self[field_id]
+
+    def inactive_wg_constraint_count(self):
+        return len(self._inactive_wg_field_data)
+
+    def inactive_wg_constraint_field_ids(self):
+        """Iterates over wg constraint field IDs"""
+        for cname, _, field_id in self._inactive_wg_field_data:
+            yield cname, field_id
+
+    @staticmethod
+    def _add_widget_class(widget, new_class):
+        """Add a new class, taking care in case some already exist"""
+        existing_classes = widget.attrs.get('class', '').split()
+        widget.attrs['class'] = ' '.join(existing_classes + [new_class])
+
+    def _join_conflicts(self, cleaned_data, slugs):
+        """Concatenate constraint fields from cleaned data into a single list"""
+        conflicts = []
+        for cname, cfield_id, _ in self._wg_field_data:
+            if cname.slug in slugs and cfield_id in cleaned_data:
+                groups = cleaned_data[cfield_id]
+                # convert to python list (allow space or comma separated lists)
+                items = groups.replace(',', ' ').split()
+                conflicts.extend(items)
+        return conflicts
+
+    def _validate_duplicate_conflicts(self, cleaned_data):
+        """Validate that no WGs appear in more than one constraint that does not allow duplicates
+
+        Raises ValidationError
+        """
+        # Only the older constraints (conflict, conflic2, conflic3) need to be mutually exclusive.
+        all_conflicts = self._join_conflicts(cleaned_data, ['conflict', 'conflic2', 'conflic3'])
+        seen = []
+        duplicated = []
+        errors = []
+        for c in all_conflicts:
+            if c not in seen:
+                seen.append(c)
+            elif c not in duplicated:  # only report once
+                duplicated.append(c)
+                errors.append(forms.ValidationError('%s appears in conflicts more than once' % c))
+        return errors
+
+    def clean_joint_with_groups(self):
+        groups = self.cleaned_data['joint_with_groups']
+        check_conflict(groups, self.group)
+        return groups
+
+    def clean_comments(self):
+        return clean_text_field(self.cleaned_data['comments'])
+
+    def clean_bethere(self):
+        bethere = self.cleaned_data["bethere"]
+        if bethere:
+            extra = set(
+                Person.objects.filter(
+                    role__group=self.group, role__name__in=["chair", "ad"]
+                )
+                & bethere
+            )
+            if extra:
+                extras = ", ".join(e.name for e in extra)
+                raise forms.ValidationError(
+                    (
+                        f"Please remove the following person{pluralize(len(extra))}, the system "
+                        f"tracks their availability due to their role{pluralize(len(extra))}: {extras}."
+                    )
+                )
+        return bethere
+
+    def clean_send_notifications(self):
+        return True if not self.notifications_optional else self.cleaned_data['send_notifications']
+
+    def is_valid(self):
+        return super().is_valid() and self.session_forms.is_valid()
+
+    def clean(self):
+        super(SessionRequestForm, self).clean()
+        self.session_forms.clean()
+
+        data = self.cleaned_data
+
+        # Validate the individual conflict fields
+        for _, cfield_id, _ in self._wg_field_data:
+            try:
+                check_conflict(data[cfield_id], self.group)
+            except forms.ValidationError as e:
+                self.add_error(cfield_id, e)
+
+        # Skip remaining tests if individual field tests had errors,
+        if self.errors:
+            return data
+
+        # error if conflicts contain disallowed dupes
+        for error in self._validate_duplicate_conflicts(data):
+            self.add_error(None, error)
+
+        # Verify expected number of session entries are present
+        num_sessions_with_data = len(self.session_forms.forms_to_keep)
+        num_sessions_expected = -1
+        try:
+            num_sessions_expected = int(data.get('num_session', ''))
+        except ValueError:
+            self.add_error('num_session', 'Invalid value for number of sessions')
+        if num_sessions_with_data < num_sessions_expected:
+            self.add_error('num_session', 'Must provide data for all sessions')
+
+        # if default (empty) option is selected, cleaned_data won't include num_session key
+        if num_sessions_expected != 2 and num_sessions_expected is not None:
+            if data.get('session_time_relation'):
+                self.add_error(
+                    'session_time_relation',
+                    forms.ValidationError('Time between sessions can only be used when two sessions are requested.')
+                )
+
+        joint_session = data.get('joint_for_session', '')
+        if joint_session != '':
+            joint_session = int(joint_session)
+            if joint_session > num_sessions_with_data:
+                self.add_error(
+                    'joint_for_session',
+                    forms.ValidationError(
+                        f'Session {joint_session} can not be the joint session, the session has not been requested.'
+                    )
+                )
+
+        return data
+
+    @property
+    def media(self):
+        # get media for our formset
+        return super().media + self.session_forms.media + forms.Media(js=('ietf/js/session_form.js',))
diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py
index 4fd4579c98..39d271ae6b 100644
--- a/ietf/meeting/helpers.py
+++ b/ietf/meeting/helpers.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
+# Copyright The IETF Trust 2013-2022, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -17,11 +17,11 @@
 from django.urls import reverse
 from django.shortcuts import get_object_or_404
 from django.template.loader import render_to_string
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
 from ietf.doc.models import Document
-from ietf.group.models import Group
 from ietf.group.utils import can_manage_some_groups, can_manage_group
 from ietf.ietfauth.utils import has_role, user_is_person
 from ietf.liaisons.utils import get_person_for_user
@@ -31,18 +31,19 @@
 from ietf.meeting.utils import session_requested_by, add_event_info_to_session_qs
 from ietf.name.models import ImportantDateName, SessionPurposeName
 from ietf.utils import log, meetecho
-from ietf.utils.history import find_history_replacements_active_at
 from ietf.utils.mail import send_mail
 from ietf.utils.pipe import pipe
 from ietf.utils.text import xslugify
 
 
-def get_meeting(num=None,type_in=['ietf',],days=28):
+def get_meeting(num=None, type_in=('ietf',), days=28):
     meetings = Meeting.objects
-    if type_in:
+    if type_in is not None:
         meetings = meetings.filter(type__in=type_in)
-    if num == None:
-        meetings = meetings.filter(date__gte=datetime.datetime.today()-datetime.timedelta(days=days)).order_by('date')
+    if num is None:
+        meetings = meetings.filter(
+            date__gte=timezone.now() - datetime.timedelta(days=days)
+        ).order_by('date')
     else:
         meetings = meetings.filter(number=num)
     if meetings.exists():
@@ -51,7 +52,7 @@ def get_meeting(num=None,type_in=['ietf',],days=28):
         raise Http404("No such meeting found: %s" % num)
 
 def get_current_ietf_meeting():
-    meetings = Meeting.objects.filter(type='ietf',date__gte=datetime.datetime.today()-datetime.timedelta(days=31)).order_by('date')
+    meetings = Meeting.objects.filter(type='ietf',date__gte=timezone.now()-datetime.timedelta(days=31)).order_by('date')
     return meetings.first()
 
 def get_current_ietf_meeting_num():
@@ -91,10 +92,9 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
     For each assignment a, adds
       a.start_timestamp
       a.end_timestamp
-      a.session.historic_group
-      a.session.historic_parent
       a.session.rescheduled_to (if rescheduled)
       a.session.prefetched_active_materials
+      a.session.order_number
     """
     assignments_queryset = assignments_queryset.prefetch_related(
             'timeslot', 'timeslot__type', 'timeslot__meeting',
@@ -104,7 +104,7 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
                 queryset=add_event_info_to_session_qs(Session.objects.all().prefetch_related(
                     'group', 'group__charter', 'group__charter__group',
                     Prefetch('materials',
-                             queryset=Document.objects.exclude(states__type=F("type"), states__slug='deleted').order_by('sessionpresentation__order').prefetch_related('states'),
+                             queryset=Document.objects.exclude(states__type=F("type"), states__slug='deleted').order_by('presentations__order').prefetch_related('states'),
                              to_attr='prefetched_active_materials'
                     )
                 ))
@@ -117,14 +117,16 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
     # assignments = list(assignments_queryset) # make sure we're set in stone
     assignments = assignments_queryset
 
-    meeting_time = datetime.datetime.combine(meeting.date, datetime.time())
-
     # replace groups with historic counterparts
     groups = [ ]
     for a in assignments:
         if a.session:
-            a.session.historic_group = None
-            a.session.order_number = None
+            # Ensure that all Sessions refer to the same Meeting instance so they can share the
+            # _groups_at_the_time() cache. The Sessions should all belong to the same meeting, but
+            # check before blindly assigning to meeting just in case.
+            if a.session.meeting.pk == meeting.pk:
+                a.session.meeting = meeting
+            a.session.order_number = a.session.order_in_meeting() if a.session.group else None
 
             if a.session.group and a.session.group not in groups:
                 groups.append(a.session.group)
@@ -134,30 +136,9 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
         if a.session and a.session.group:
             sessions_for_groups[(a.session.group, a.session.type_id)].append(a)
 
-    group_replacements = find_history_replacements_active_at(groups, meeting_time)
-
-    parent_id_set = set()
-    for a in assignments:
-        if a.session and a.session.group:
-            a.session.historic_group = group_replacements.get(a.session.group_id)
-
-            if a.session.historic_group:
-                a.session.historic_group.historic_parent = None
-                
-                if a.session.historic_group.parent_id:
-                    parent_id_set.add(a.session.historic_group.parent_id)
-
-            l = sessions_for_groups.get((a.session.group, a.session.type_id), [])
-            a.session.order_number = l.index(a) + 1 if a in l else 0
-
-    parents = Group.objects.filter(pk__in=parent_id_set)
-    parent_replacements = find_history_replacements_active_at(parents, meeting_time)
-
     timeslot_by_session_pk = {a.session_id: a.timeslot for a in assignments}
 
     for a in assignments:
-        if a.session and a.session.historic_group and a.session.historic_group.parent_id:
-            a.session.historic_group.historic_parent = parent_replacements.get(a.session.historic_group.parent_id)
 
         if a.session.current_status == 'resched':
             a.session.rescheduled_to = timeslot_by_session_pk.get(a.session.tombstone_for_id)
@@ -206,12 +187,15 @@ def _use_legacy_keywords(self):
     @staticmethod
     def _get_group(s):
         """Get group of a session, handling historic groups"""
-        return getattr(s, 'historic_group', s.group)
+        return s.group_at_the_time()
 
     def _get_group_parent(self, s):
         """Get parent of a group or parent of a session's group, handling historic groups"""
-        g = self._get_group(s) if isinstance(s, Session) else s  # accept a group or a session arg
-        return getattr(g, 'historic_parent', g.parent)
+        if isinstance(s, Session):
+            return s.group_parent_at_the_time()
+        else:
+            # Assumption is that s is a group...
+            return s and s.parent
 
     def _purpose_keyword(self, purpose):
         """Get the keyword corresponding to a session purpose"""
@@ -235,8 +219,10 @@ class AgendaFilterOrganizer(AgendaKeywordTool):
 
     Either assignments or sessions must be specified (but not both). Keywords should be applied
     to these items before calling either of the 'get_' methods, otherwise some special filters
-    may not be included (e.g., 'BoF' or 'Plenary'). If historic_group and/or historic_parent
-    attributes are present, these will be used instead of group/parent.
+    may not be included (e.g., 'BoF' or 'Plenary'). If the session's group has a GroupHistory
+    object active at the time of the start of the session's meeting, and/or the session's group
+    parent had an active GroupHistory object active at the time, these will be used instead of 
+    the group or parent.
 
     The organizer will process its inputs once, when one of its get_ methods is first called.
 
@@ -271,6 +257,10 @@ def __init__(self, *, single_category=False, **kwargs):
         self.special_filters = None
         if self._use_legacy_keywords():
             self.extra_labels += ('Plenary',)  # need this when not using session purpose
+        self.manual_extra_labels = set()
+
+    def add_extra_filter(self, kw):
+        self.manual_extra_labels.add(kw)
 
     def get_non_area_keywords(self):
         """Get list of any 'non-area' (aka 'special') keywords
@@ -327,10 +317,21 @@ def _group_filter_headings(self):
         groups = set(self._get_group(s) for s in self.sessions
                      if s
                      and self._get_group(s))
-        log.assertion('len(groups) == len(set(g.acronym for g in groups))')  # no repeated acros
+        # Verify that we're not using the same acronym for more than one distinct group, accounting for
+        # the possibility that some groups are GroupHistory instances. This assertion will fail if a Group
+        # and GroupHistory for the same group have a different acronym - in that event, the filter will
+        # not match the meeting display, so we should be alerted that this has actually occurred.
+        log.assertion(
+            "len(set(getattr(g, 'group_id', g.id) for g in groups)) "
+            "== len(set(g.acronym for g in groups))"
+        )
 
         group_parents = set(self._get_group_parent(g) for g in groups if self._get_group_parent(g))
-        log.assertion('len(group_parents) == len(set(gp.acronym for gp in group_parents))')  # no repeated acros
+        # See above for explanation of this assertion
+        log.assertion(
+            "len(set(getattr(gp, 'group_id', gp.id) for gp in group_parents)) "
+            "== len(set(gp.acronym for gp in group_parents))"
+        )
 
         all_groups = groups.union(group_parents)
         all_groups.difference_update([g for g in all_groups if g.acronym in self.exclude_acronyms])
@@ -451,13 +452,13 @@ def _legacy_non_group_filters(self, sessions):
     def _extra_filters(self):
         """Get list of filters corresponding to self.extra_labels"""
         item_source = self.assignments or self.sessions or []
-        candidates = set(self.extra_labels)
+        candidates = set(self.extra_labels).union(self.manual_extra_labels)
         return self._filter_column(
             label=None,
             keyword=None,
             children=[
                 self._filter_entry(label=label, keyword=xslugify(label), toggled_by=[], is_bof=False)
-                for label in candidates if any(
+                for label in candidates if label in self.manual_extra_labels or any(
                     # Keep only those that will affect at least one session
                     [label.lower() in item.filter_keywords for item in item_source]
                 )]
@@ -648,6 +649,11 @@ def read_session_file(type, num, doc):
 def read_agenda_file(num, doc):
     return read_session_file('agenda', num, doc)
 
+# TODO-BLOBSTORE: this is _yet another_ draft derived variant created when users
+# ask for drafts from the meeting agenda page. Consider whether to refactor this
+# now to not call out to external binaries, and consider whether we need this extra
+# format at all in the draft blobstore. if so, it would probably be stored under 
+# something like plainpdf/ 
 def convert_draft_to_pdf(doc_name):
     inpath = os.path.join(settings.IDSUBMIT_REPOSITORY_PATH, doc_name + ".txt")
     outpath = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, doc_name + ".pdf")
@@ -836,7 +842,7 @@ def get_announcement_initial(meeting, is_change=False):
         desc=desc,
         date=meeting.date,
         change=change)
-    body = render_to_string('meeting/interim_announcement.txt', locals())
+    body = render_to_string('meeting/interim_announcement.txt', locals() | {"settings": settings})
     initial['body'] = body
     return initial
 
@@ -883,13 +889,13 @@ def make_materials_directories(meeting):
     This function takes a meeting object and creates the appropriate materials directories
     '''
     path = meeting.get_materials_path()
-    # Default umask is 0x022, meaning strip write premission for group and others.
+    # Default umask is 0x022, meaning strip write permission for group and others.
     # Change this temporarily to 0x0, to keep write permission for group and others.
     # (WHY??) (Note: this code is old -- was present already when the secretariat code
     # was merged with the regular datatracker code; then in secr/proceedings/views.py
     # in make_directories())
     saved_umask = os.umask(0)   
-    for leaf in ('slides','agenda','minutes','id','rfc','bluesheets'):
+    for leaf in ('slides','agenda','minutes', 'narrativeminutes', 'id','rfc','bluesheets'):
         target = os.path.join(path,leaf)
         if not os.path.exists(target):
             os.makedirs(target)
@@ -1071,8 +1077,7 @@ def sessions_post_save(request, forms):
                 by=request.user.person,
             )
         
-        if ('date' in form.changed_data) or ('time' in form.changed_data):
-            update_interim_session_assignment(form)
+        update_interim_session_assignment(form)
         if 'agenda' in form.changed_data:
             form.save_agenda()
 
@@ -1099,6 +1104,7 @@ def create_interim_session_conferences(sessions):
             try:
                 confs = meetecho_manager.create(
                     group=session.group,
+                    session_id=session.pk,
                     description=str(session),
                     start_time=ts.utc_start_time(),
                     duration=ts.duration,
@@ -1148,26 +1154,33 @@ def sessions_post_cancel(request, sessions):
 
 
 def update_interim_session_assignment(form):
-    """Helper function to create / update timeslot assigned to interim session"""
-    time = datetime.datetime.combine(
-        form.cleaned_data['date'],
-        form.cleaned_data['time'])
+    """Helper function to create / update timeslot assigned to interim session
+
+    form is an InterimSessionModelForm
+
+    Only updates timeslot time (a datetime) and duration
+    """
     session = form.instance
+    meeting = session.meeting
+    time = meeting.tz().localize(
+        datetime.datetime.combine(form.cleaned_data['date'], form.cleaned_data['time'])
+    )
     if session.official_timeslotassignment():
         slot = session.official_timeslotassignment().timeslot
-        slot.time = time
-        slot.duration = session.requested_duration
-        slot.save()
+        if slot.time != time or slot.duration != session.requested_duration:
+            slot.time = time
+            slot.duration = session.requested_duration
+            slot.save()
     else:
         slot = TimeSlot.objects.create(
-            meeting=session.meeting,
+            meeting=meeting,
             type_id='regular',
             duration=session.requested_duration,
             time=time)
         SchedTimeSessAssignment.objects.create(
             timeslot=slot,
             session=session,
-            schedule=session.meeting.schedule)
+            schedule=meeting.schedule)
 
 def populate_important_dates(meeting):
     assert ImportantDate.objects.filter(meeting=meeting).exists() is False
diff --git a/ietf/meeting/management/commands/create_dummy_meeting.py b/ietf/meeting/management/commands/create_dummy_meeting.py
deleted file mode 100644
index 79b1e5db61..0000000000
--- a/ietf/meeting/management/commands/create_dummy_meeting.py
+++ /dev/null
@@ -1,4520 +0,0 @@
-# Copyright The IETF Trust 2020-2021, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-# This command generates a Meeting (IETF 999) with Rooms, TimeSlots, Sessions and Constraints.
-# It is mainly meant to support the development of the Automatic Schedule Builder, by
-# providing one meeting with a full set of constraints, on which the schedule
-# builder can be run to test it with a realistic dataset.
-# The data is based on IETF 106, modified to translate many previously manually
-# processed comments into Constraint objects, using recently added options.
-
-# This command was built by:
-# - Running script-generator.py, which generates new objects based on IETF 106 data.
-# - Going through all manually entered comments, and seeing whether they should and
-#   can be translated to the newly expanded Constraint objects.
-#
-# This work was done in the context of the new meeting constraints modelling:
-# https://trac.ietf.org/trac/ietfdb/wiki/MeetingConstraints
-# Note that aside from Constraint objects, as created below, there is also
-# business logic that applies to all sessions, which is to be implemented
-# in the automatic schedule builder.
-# 
-# Important notes:
-# - Free text comments can contain a lot of nuance and flexibility. These were
-#   translated to explicit Constraints as well as possible. 
-# - Some constraints, like "Please also avoid collision with IoT-related BOFs.", were
-#   too vague to define.
-# - Two WGs requested two sessions, but actually meant to have a single 2.5 hour session,
-#   which currently can not be entered in the session request UI. These were manually
-#   modified to have a single 2.5 hour session.
-# - Some constraints are implicit by business logic. For example, pce requested not
-#   to schedule against any routing area BOF. However, pce is in the routing area,
-#   and therefore should never be scheduled against any routing area BOF.
-#   Similarly, rtgwg asked for "no overlap with other routing area WGs". However,
-#   rtgwg has meeting_seen_as_area set (it is a WG, but should be considered an area meeting),
-#   meaning this behaviour is already implied. The same occurs for dispatch, which requested
-#   not to be scheduled against other area meetings.
-# - In general, the purpose of this dataset is not to recreate the set exactly as if it
-#   would be entered by session requesters, but to provide a realistic dataset of a
-#   realistic complexity.
-# - The joint second idr session was added from IETF 105, to have another case of
-#   a joint session in the dataset.
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-import debug                            # pyflakes:ignore
-
-import socket
-import datetime
-import pytz
-
-from django.core.management.base import BaseCommand
-from django.db import transaction
-from django.db.models import Q
-
-from ietf.group.models import Group
-from ietf.name.models import TimerangeName, TimeSlotTypeName, ConstraintName
-from ietf.meeting.models import Meeting, Room, Constraint, Session, ResourceAssociation, TimeSlot, SchedulingEvent, Schedule
-
-
-class Command(BaseCommand):
-    help = "Create (or delete) a dummy meeting for test and development purposes."
-
-    def add_arguments(self, parser):
-        parser.add_argument('--delete', dest='delete', action='store_true', help='Delete the test and development dummy meeting')
-        parser.add_argument('--old-conflicts', dest='old_conflicts', action='store_true',
-                            help='Use old conflict types ("conflict", "conflic2", "conflic3") instead of new ("chair_conflict", "tech_overlap", "key_participant")')
-        parser.add_argument(
-            '--start-date',
-            help='Start date for the dummy meeting (yyyy-mm-dd, defaults to 2019-11-16)',
-            type=lambda s: datetime.datetime.strptime(s, '%Y-%m-%d').date(),
-            default='2019-11-16',
-        )
-        parser.add_argument('--tz', default='UTC',
-                            help='Time zone for created meeting. Defaults to UTC. Use "" to disable.')
-
-    def _meeting_datetime(self, day, *time_args):
-        """Generate a datetime on a meeting day"""
-        return datetime.datetime.combine(
-            self.start_date,
-            datetime.time(*time_args)
-        ) + datetime.timedelta(days=day)
-
-    def handle(self, *args, **options):
-        if socket.gethostname().split('.')[0] in ['core3', 'ietfa', 'ietfb', 'ietfc', ]:
-            raise EnvironmentError("Refusing to create a dummy meetng on a production server")
-
-        opt_delete = options.get('delete', False)
-        opt_use_old_conflicts = options.get('old_conflicts', False)
-        self.start_date = options['start_date']
-        meeting_tz = options['tz']
-        if not opt_delete and (meeting_tz not in pytz.common_timezones):
-            self.stderr.write("Warning: {} is not a recognized time zone.".format(meeting_tz))
-
-        if opt_delete:
-            if Meeting.objects.filter(number='999').exists():
-                Meeting.objects.filter(number='999').delete()
-                self.stdout.write("Deleted dummy meeting IETF 999 and its related objects.")
-            else:
-                self.stderr.write("Dummy meeting IETF 999 does not exist; nothing to do.\n")
-        else:
-            if Meeting.objects.filter(number='999').exists():
-                self.stderr.write("Dummy meeting IETF 999 already exists; nothing to do.\n")
-            else:
-                transaction.set_autocommit(False)
-                
-                if self.start_date.isoweekday() != 6:
-                    self.stderr.write("Warning: dummy meeting does not start on Saturday, watch out for bugs")
-
-                m = Meeting.objects.create(
-                    number='999',
-                    type_id='IETF',
-                    date=self._meeting_datetime(0).date(),
-                    days=7,
-                    time_zone=meeting_tz,
-                )
-
-                # Set enabled constraints
-                if opt_use_old_conflicts:
-                    conflict = ['conflict', 'conflic2', 'conflic3']
-                else:
-                    conflict = ['chair_conflict', 'tech_overlap', 'key_participant']
-                for slug in conflict:
-                    m.group_conflict_types.add(ConstraintName.objects.get(slug=slug))
-
-                base_schedule = Schedule.objects.create(meeting=m, name='base', owner_id=1,
-                                                        visible=True, public=True)
-
-                schedule = Schedule.objects.create(meeting=m, name='first1', owner_id=1,
-                                                   visible=True, public=True, base=base_schedule)
-                m.schedule = schedule
-                m.save()
-                
-                ##### ROOMS #####
-                
-                r = Room.objects.create(meeting=m, name='Skai Suite 4 (Swissotel)', capacity=None, functional_name='Newcomers dinner')
-                r = Room.objects.create(meeting=m, name='Ord', capacity=None, functional_name='Code Sprint')
-                r = Room.objects.create(meeting=m, name='Skai Suite 1 (Swissotel)', capacity=None, functional_name='Systers Networking')
-                r = Room.objects.create(meeting=m, name='Butterworth', capacity=None, functional_name='Attendee Sign-Up 2')
-                r = Room.objects.create(meeting=m, name='Bras Basah', capacity=None, functional_name='Attendee Sign-Up 1')
-                r = Room.objects.create(meeting=m, name='Indiana', capacity=None, functional_name='NOC')
-                r = Room.objects.create(meeting=m, name='Ord/Blundell', capacity=None, functional_name='Terminal Room')
-                r = Room.objects.create(meeting=m, name='Bailey', capacity=None, functional_name='Secretariat')
-                r = Room.objects.create(meeting=m, name='Bonham', capacity=None, functional_name='NomCom Interviews')
-                r = Room.objects.create(meeting=m, name='Fullerton', capacity=None, functional_name='NomCom')
-                r = Room.objects.create(meeting=m, name='Minto', capacity=None, functional_name='LLC')
-                r = Room.objects.create(meeting=m, name='Mercury/Enterprise', capacity=None, functional_name='ISOC')
-                r = Room.objects.create(meeting=m, name='Clark', capacity=None, functional_name='IESG')
-                r = Room.objects.create(meeting=m, name='VIP B', capacity=None, functional_name='IAB')
-                r = Room.objects.create(meeting=m, name='Moor/Morrison', capacity=None, functional_name='Code Lounge')
-                r = Room.objects.create(meeting=m, name='Fairmont Ballroom Foyer', capacity=None, functional_name='Welcome Reception')
-                r = Room.objects.create(meeting=m, name='Convention Foyer', capacity=None, functional_name='IETF Registration')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['reg']))
-                r = Room.objects.create(meeting=m, name='Stamford & Fairmont Ballroom Foyers', capacity=None, functional_name='Breaks')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['break']))
-                r = Room.objects.create(meeting=m, name='Canning/Padang', capacity=None, functional_name='Plenary')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['plenary']))
-                r = Room.objects.create(meeting=m, name='Canning', capacity=250, functional_name='Breakout 8')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
-                r = Room.objects.create(meeting=m, name='Padang', capacity=300, functional_name='Breakout 7')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
-                r = Room.objects.create(meeting=m, name='Collyer', capacity=250, functional_name='Breakout 6')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
-                r = Room.objects.create(meeting=m, name='Sophia', capacity=200, functional_name='Breakout 5')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
-                r = Room.objects.create(meeting=m, name='Olivia', capacity=150, functional_name='Breakout 4')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
-                r = Room.objects.create(meeting=m, name='Hullet', capacity=100, functional_name='Breakout 3')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
-                r = Room.objects.create(meeting=m, name='VIP A', capacity=100, functional_name='Breakout 2')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
-                r = Room.objects.create(meeting=m, name='Orchard', capacity=50, functional_name='Breakout 1')
-                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
-                
-                ##### SESSIONS AND CONSTRAINTS #####
-                
-                ## session for grow ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1584,  # grow
-                    attendees=75,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2166, )  # sidrops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1751, )  # lisp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111303, )  # Job Snijders
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111246, )  # Chris Morrow
-                
-                ## session for sidrops ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2166,  # sidrops
-                    attendees=62,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2216, )  # lsvr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111246, )  # Chris Morrow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104971, )  # Keyur Patel
-                
-                ## session for dnsop ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1452,  # dnsop
-                    attendees=160,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for dnsop ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1452,  # dnsop
-                    attendees=160,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=988, )  # dhc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1920, )  # trans
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2146, )  # regext
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1892, )  # dmarc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18009, )  # Suzanne Woolf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123662, )  # Benno Overeinder
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115244, )  # Tim Wicinski
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
-                
-                ## session for dnssd ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1895,  # dnssd
-                    attendees=75,
-                    agenda_note="Joint with HOMENET",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""dnssd and homenet would like to do a single joint 2 hour meeting. We'll figure out how to divide the time.""",
-                    remote_instructions="",
-                )
-                ## session for dnssd ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1895,  # dnssd
-                    attendees=75,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""dnssd and homenet would like to do a single joint 2 hour meeting. We'll figure out how to divide the time.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2150, )  # babel
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119562, )  # David Schinazi
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114464, )  # Barbara Stark
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19177, )  # Stephen Farrell
-
-                ## session for lsvr ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2216,  # lsvr
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2166, )  # sidrops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2214, )  # rift
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1840, )  # nvo3
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108304, )  # Gunter Van de Velde
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111493, )  # Victor Kuarsingh
-                
-                ## session for quic ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2161,  # quic
-                    attendees=200,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                s.resources.set(ResourceAssociation.objects.filter(pk__in=[6]))  # [<ResourceAssociation: Experimental Room Setup (U-Shape and classroom, subject to availability)>]
-                ## session for quic ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2161,  # quic
-                    attendees=200,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                s.resources.set(ResourceAssociation.objects.filter(pk__in=[6]))  # [<ResourceAssociation: Experimental Room Setup (U-Shape and classroom, subject to availability)>]
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1764, )  # mptcp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2015, )  # capport
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2246, )  # add
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109354, )  # Brian Trammell
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107131, )  # Martin Thomson
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124381, )  # Alan Frindell
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105721, )  # Jana Iyengar
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119702, )  # Ian Swett
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116439, )  # Mike Bishop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103881, )  # Mark Nottingham
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112773, )  # Lars Eggert
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='time_relation', time_relation='subsequent-days')
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday').exclude(slug__startswith='wednesday-morning'))
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2253, )  # abcd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2256, )  # raw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2254, )  # wpack
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2258, )  # mathmesh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2257, )  # txauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2255, )  # tmrid
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2260, )  # webtrans
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1399, )  # opsarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1625, )  # genarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2252, )  # gendispatch
-                
-                
-                ## session for tsvwg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1463,  # tsvwg
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""Must not conflict with Transport Area BOFs. """,  # this is implicit
-                    remote_instructions="",
-                )
-                ## session for tsvwg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1463,  # tsvwg
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""Must not conflict with Transport Area BOFs. """,  # this is implicit
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1152, )  # nfsv4
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1926, )  # tram
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1966, )  # dtn
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1764, )  # mptcp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1838, )  # rmcat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1524, )  # ccamp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=23177, )  # Bob Briscoe
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110856, )  # Wesley Eddy
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104695, )  # Michael Tüxen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104331, )  # Gorry Fairhurst
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103156, )  # David Black
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='time_relation', time_relation='one-day-seperation')
-                
-                ## session for ccamp ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1524,  # ccamp
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1985, )  # teas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1630, )  # pce
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1875, )  # i2rs
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109703, )  # Daniele Ceccarelli
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108894, )  # Fatai Zhang
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
-                
-                ## session for dispatch ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1763,  # dispatch
-                    attendees=80,
-                    agenda_note="Joint with ARTAREA",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments=""" and avoid the same kind of conflicts with other area meetings and any BOFs and potential new ART WGs.""",  # this is implicit
-                    remote_instructions="",
-                )
-                s.joint_with_groups.set(Group.objects.filter(acronym='artarea'))
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1812, )  # avtcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1899, )  # stir
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1762, )  # sipcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1838, )  # rmcat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2176, )  # jmap
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2205, )  # extra
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1814, )  # payload
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1918, )  # uta
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1138, )  # mmusic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1892, )  # dmarc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1643, )  # ecrit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1815, )  # xrblock
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1926, )  # tram
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1399, )  # opsarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104140, )  # Ben Campbell
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103769, )  # Adam Roach
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102830, )  # Mary Barnes
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug='monday-morning'))
-                
-                ## session for v6ops ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1578,  # v6ops
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1584, )  # grow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101568, )  # Ron Bonica
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=2853, )  # Fred Baker
-                
-                ## session for stir ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1899,  # stir
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2167, )  # ipwave
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1643, )  # ecrit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1994, )  # modern
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1762, )  # sipcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1812, )  # avtcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1138, )  # mmusic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2156, )  # sipbrandy
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2013, )  # perc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=5376, )  # Russ Housley
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=120587, )  # Chris Wendt
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104557, )  # Jon Peterson
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103961, )  # Robert Sparks
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103769, )  # Adam Roach
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
-                
-                ## session for pim ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1397,  # pim
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1118, )  # mboned
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1875, )  # i2rs
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1840, )  # nvo3
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1132, )  # manet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1678, )  # softwire
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1751, )  # lisp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106173, )  # Stig Venaas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105708, )  # Mike McBride
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='wg_adjacent', target_id=1118, )  # mboned
-                
-                ## session for suit ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2211,  # suit
-                    attendees=80,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2167, )  # ipwave
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1899, )  # stir
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2156, )  # sipbrandy
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105857, )  # Hannes Tschofenig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124893, )  # David Brown
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=15927, )  # Dave Thaler
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123482, )  # Milosch Meriac
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=5376, )  # Russ Housley
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123481, )  # Brendan Moran
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=117723, )  # Henk Birkholz
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111953, )  # David Waltermire
-                
-                ## session for coinrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2234,  # coinrg
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1883, )  # nwcrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2228, )  # qirg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2209, )  # dinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1849, )  # icnrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=125277, )  # Jianfei He
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123468, )  # Eve Schooler
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103930, )  # Marie-Jose Montpetit
-                
-                ## session for nwcrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1883,  # nwcrg
-                    attendees=35,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1849, )  # icnrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2209, )  # dinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107132, )  # Vincent Roca
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103930, )  # Marie-Jose Montpetit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='friday').exclude(slug__startswith='thursday'))
-                
-                ## session for tcpm ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1620,  # tcpm
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1764, )  # mptcp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110636, )  # Michael Scharf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104695, )  # Michael Tüxen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=15951, )  # Yoshifumi Nishida
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug='thursday-afternoon-late'))
-                
-                ## session for ippm ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1089,  # ippm
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2015, )  # capport
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=945, )  # bmwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1628, )  # bfd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1599, )  # opsec
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109354, )  # Brian Trammell
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106879, )  # Frank Brockners
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122654, )  # Greg <gregimirsky@gmail.com>>
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102900, )  # Al Morton
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119325, )  # Tommy Pauly
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118908, )  # Giuseppe Fioccola
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113573, )  # Bill Cerveny
-                
-                ## session for lamps ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2164,  # lamps
-                    attendees=45,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2167, )  # ipwave
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2156, )  # sipbrandy
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109505, )  # Bernie Hoeneisen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108049, )  # Richard Barnes
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=125563, )  # Hendrik Brockhaus
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124538, )  # Tim Hollebeek
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18427, )  # Rich Salz
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110910, )  # Jim Schaad
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=5376, )  # Russ Housley
-                
-                ## session for httpbis ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1718,  # httpbis
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for httpbis ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1718,  # httpbis
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2015, )  # capport
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119325, )  # Tommy Pauly
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116593, )  # Patrick McManus
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103881, )  # Mark Nottingham
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
-                
-                ## session for taps ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1924,  # taps
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""The IRTF Chair is a contributor to TAPS so please avoid IRTF RGs if possible.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1812, )  # avtcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1838, )  # rmcat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2248, )  # mops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1118, )  # mboned
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2248, )  # mops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122540, )  # Jake Holland
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109354, )  # Brian Trammell
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121595, )  # Christopher Wood
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104331, )  # Gorry Fairhurst
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119463, )  # Kyle Rose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119325, )  # Tommy Pauly
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103877, )  # Michael Welzl
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114993, )  # Anna Brunstrom
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123344, )  # Theresa Enghardt
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21226, )  # Aaron Falk
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123343, )  # Philipp Tiesel
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20209, )  # Colin Perkins
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109753, )  # Zaheduzzaman Sarker
-                
-                ## session for dprive ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1958,  # dprive
-                    attendees=120,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115244, )  # Tim Wicinski
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=100664, )  # Brian Haberman
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='friday'))
-                
-                ## session for teep ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2194,  # teep
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for teep ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2194,  # teep
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107773, )  # Mingliang Pei
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105857, )  # Hannes Tschofenig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105785, )  # Nancy Cam-Winget
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=15927, )  # Dave Thaler
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124970, )  # Dave Wheeler
-                
-                ## session for iccrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=42,  # iccrg
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1764, )  # mptcp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1838, )  # rmcat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105721, )  # Jana Iyengar
-                
-                ## session for rats ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2231,  # rats
-                    attendees=40,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for rats ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2231,  # rats
-                    attendees=40,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105785, )  # Nancy Cam-Winget
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104851, )  # Kathleen Moriarty
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21144, )  # Ned Smith
-                
-                ## session for secdispatch ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2219,  # secdispatch
-                    attendees=200,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1996, )  # dots
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1990, )  # tokbind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2143, )  # curdle
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2169, )  # secevent
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108049, )  # Richard Barnes
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104851, )  # Kathleen Moriarty
-                
-                ## session for mboned ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1118,  # mboned
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2248, )  # mops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1138, )  # mmusic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2214, )  # rift
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106173, )  # Stig Venaas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105708, )  # Mike McBride
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104329, )  # Leonard Giuliano
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106315, )  # Greg Shepherd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='wg_adjacent', target_id=1397, )  # mboned
-                
-                ## session for bess ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1960,  # bess
-                    attendees=90,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for bess ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1960,  # bess
-                    attendees=90,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1840, )  # nvo3
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1397, )  # pim
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1910, )  # sfc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1969, )  # pals
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123321, )  # mankamana mishra
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113838, )  # Stephane Litkowski
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105786, )  # Matthew Bocci
-                
-                ## session for homenet and dnssd ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1803,  # homenet
-                    attendees=60,
-                    agenda_note="Joint with DNSSD",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                s.joint_with_groups.set(Group.objects.filter(acronym='dnssd'))
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2150, )  # babel
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119562, )  # David Schinazi
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114464, )  # Barbara Stark
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19177, )  # Stephen Farrell
-                
-                ## session for acme ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1995,  # acme
-                    attendees=70,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106745, )  # Yoav Nir
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18427, )  # Rich Salz
-                
-                ## session for babel ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2150,  # babel
-                    attendees=21,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1840, )  # nvo3
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1132, )  # manet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104645, )  # Russ White
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102391, )  # Donald Eastlake
-                
-                ## session for lsr ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2215,  # lsr
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for lsr ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2215,  # lsr
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2216, )  # lsvr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2214, )  # rift
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=22933, )  # Christian Hopps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10784, )  # Acee Lindem
-                
-                ## session for netconf ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1575,  # netconf
-                    attendees=65,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1714, )  # opsawg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1399, )  # opsarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2150, )  # babel
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118100, )  # Ignas Bagdonas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112548, )  # Kent Watsen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107859, )  # Mahesh Jethanandani
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
-                
-                ## session for maprg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2145,  # maprg
-                    attendees=200,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1764, )  # mptcp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1744, )  # alto
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1838, )  # rmcat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1714, )  # opsawg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=945, )  # bmwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121213, )  # Dave Plonka
-                
-                ## session for 6lo ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1897,  # 6lo
-                    attendees=55,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""Please also avoid collision with IoT-related BOFs.
-                Eric Vyncke's presence is a strong wish as he may take responsibility of this WG.""",  # BOFs are already avoided if in the internet area
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2167, )  # ipwave
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1132, )  # manet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1849, )  # icnrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116512, )  # Shwetha Bhandari
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108961, )  # Carles Gomez
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                
-                ## session for 6man ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1723,  # 6man
-                    attendees=120,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""We would prefer to have session #1 early in the week to allow for side meetings to follow up on open items.""",
-                    remote_instructions="",
-                )
-                ## session for 6man ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1723,  # 6man
-                    attendees=120,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2147, )  # mtgvenue
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105691, )  # Ole Trøan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=2793, )  # Bob Hinden
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='time_relation', time_relation='one-day-seperation')
-                
-                ## session for irtfopen ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1853,  # irtfopen
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""MUST NOT be in parallel with any other IRTF sessions. """,  # should be implicit
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1849, )  # icnrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2228, )  # qirg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1988, )  # hrpc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1968, )  # gaia
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1883, )  # nwcrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2209, )  # dinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=38, )  # nmrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1838, )  # rmcat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1812, )  # avtcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2248, )  # mops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109986, )  # Mat Ford
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20209, )  # Colin Perkins
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday'))
-                
-                ## session for lpwan ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2148,  # lpwan
-                    attendees=75,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""Eric Vyncke's presence is a strong wish (not a strong requirement) as he may take responsibility of this WG.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2256, )  # raw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2214, )  # rift
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119881, )  # Alexander Pelov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115824, )  # Pascal Thubert
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                
-                ## session for 6tisch ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1903,  # 6tisch
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2256, )  # raw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2214, )  # rift
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115824, )  # Pascal Thubert
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108628, )  # Thomas Watteyne
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                
-                ## session for lisp ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1751,  # lisp
-                    attendees=45,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1910, )  # sfc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1875, )  # i2rs
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2216, )  # lsvr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1840, )  # nvo3
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1849, )  # icnrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1118, )  # mboned
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=3862, )  # Joel Halpern
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121160, )  # Padma Pillay-Esnault
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108833, )  # Luigi Iannone
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
-                
-                ## session for mptcp ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1764,  # mptcp
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107998, )  # Philip Eardley
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=15951, )  # Yoshifumi Nishida
-                
-                ## session for roll ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1730,  # roll
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for roll ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1730,  # roll
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1132, )  # manet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115213, )  # Ines Robles
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105620, )  # Peter Van der Stok
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102254, )  # Michael Richardson
-                
-                ## session for saag ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1187,  # saag
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1996, )  # dots
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2169, )  # secevent
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2143, )  # curdle
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1920, )  # trans
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1634, )  # kitten
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1990, )  # tokbind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2166, )  # sidrops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1892, )  # dmarc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1918, )  # uta
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='thursday-afternoon-early'))
-                
-                ## session for mpls ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1140,  # mpls
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1628, )  # bfd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1910, )  # sfc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1985, )  # teas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1969, )  # pals
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1524, )  # ccamp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1630, )  # pce
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2216, )  # lsvr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1840, )  # nvo3
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1875, )  # i2rs
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108187, )  # Nicolai Leymann
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20682, )  # Loa Andersson
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=125952, )  # Mach(Guoyi) Chen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116516, )  # Tarek Saad
-                
-                ## session for pce ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1630,  # pce
-                    attendees=75,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""Do not schedule against RTG area BOF (if any)""",  # this is implicit
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1524, )  # ccamp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1985, )  # teas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2214, )  # rift
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1969, )  # pals
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1910, )  # sfc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1714, )  # opsawg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108213, )  # Julien Meuric
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115798, )  # Hariharan Ananthakrishnan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111477, )  # Dhruv Dhody
-                
-                ## session for detnet ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1962,  # detnet
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=9000),  # 2:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1630, )  # pce
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1985, )  # teas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1524, )  # ccamp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1910, )  # sfc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1969, )  # pals
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1840, )  # nvo3
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124759, )  # Ethan Grossman
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118295, )  # Janos Farkas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103156, )  # David Black
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10064, )  # Lou Berger
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='monday'))
-                
-                ## session for alto ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1744,  # alto
-                    attendees=25,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1849, )  # icnrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=38, )  # nmrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108807, )  # Jan Seedorf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106812, )  # Vijay Gurbani
-                
-                ## session for gaia ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1968,  # gaia
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=117577, )  # Leandro Navarro
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123022, )  # Jane Coffin
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
-                
-                ## session for git ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2233,  # git
-                    attendees=65,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2150, )  # babel
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121595, )  # Christopher Wood
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110077, )  # Alissa Cooper
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10083, )  # Paul Hoffman
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2253, )  # abcd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2256, )  # raw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2254, )  # wpack
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2258, )  # mathmesh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2257, )  # txauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2255, )  # tmrid
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2260, )  # webtrans
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1399, )  # opsarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1625, )  # genarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2252, )  # gendispatch
-                
-                ## session for pearg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2227,  # pearg
-                    attendees=120,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1988, )  # hrpc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2233, )  # git
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2228, )  # qirg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123472, )  # Shivan Sahib
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121595, )  # Christopher Wood
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112423, )  # Sara Dickinson
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
-                
-                ## session for tls ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1326,  # tls
-                    attendees=120,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for tls ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1326,  # tls
-                    attendees=120,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2239, )  # cacao
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2233, )  # git
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106745, )  # Yoav Nir
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101208, )  # Joseph Salowey
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18427, )  # Rich Salz
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122298, )  # Nick Sullivan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=12695, )  # Eric Rescorla
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121595, )  # Christopher Wood
-                
-                ## session for tsvarea ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1679,  # tsvarea
-                    attendees=120,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1744, )  # alto
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1838, )  # rmcat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1152, )  # nfsv4
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1966, )  # dtn
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1764, )  # mptcp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1926, )  # tram
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
-                
-                ## session for secevent ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2169,  # secevent
-                    attendees=None,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(0),  # 0:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                
-                ## session for dinrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2209,  # dinrg
-                    attendees=90,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1988, )  # hrpc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1883, )  # nwcrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20209, )  # Colin Perkins
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102174, )  # Dirk Kutscher
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101104, )  # Melinda Shore
-                
-                ## session for opsawg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1714,  # opsawg
-                    attendees=70,
-                    agenda_note="Combined OpsAWG / OpsAREA",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""PLEASE NOTE: Combined OpsAWG / OpsAREA""",
-                    remote_instructions="",
-                )
-                s.joint_with_groups.set(Group.objects.filter(acronym='opsarea'))
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1584, )  # grow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118100, )  # Ignas Bagdonas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=117721, )  # Tianran Zhou
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113086, )  # Joe Clarke
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
-                
-                ## session for avtcore ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1812,  # avtcore
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2248, )  # mops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1816, )  # clue
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1815, )  # xrblock
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1762, )  # sipcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2013, )  # perc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1814, )  # payload
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1138, )  # mmusic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1838, )  # rmcat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111749, )  # Rachel Huang
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105873, )  # Roni Even
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101923, )  # Jonathan Lennox
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
-                
-                ## session for bfd ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1628,  # bfd
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1751, )  # lisp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1910, )  # sfc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1969, )  # pals
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1985, )  # teas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1524, )  # ccamp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106444, )  # Reshad Rahman
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105046, )  # Jeffrey Haas
-                
-                ## session for emu ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1674,  # emu
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1918, )  # uta
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2143, )  # curdle
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1634, )  # kitten
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101208, )  # Joseph Salowey
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21072, )  # Jari Arkko
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113142, )  # Mohit Sethi
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109330, )  # John Mattsson
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108624, )  # Alan DeKok
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday').exclude(slug='wednesday-morning'))
-                
-                ## session for hrpc ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1988,  # hrpc
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1968, )  # gaia
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2146, )  # regext
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2015, )  # capport
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124328, )  # Mallory Knodel
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=3747, )  # Avri Doria
-                
-                ## session for cose ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2002,  # cose
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111178, )  # Matthew Miller
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123715, )  # Ivaylo Petrov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                
-                ## session for dots ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1996,  # dots
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1918, )  # uta
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111620, )  # Liang Xia
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103686, )  # Valery Smyslov
-                
-                ## session for idr ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1041,  # idr
-                    attendees=75,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for idr ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1041,  # idr
-                    attendees=75,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                s.joint_with_groups.set(Group.objects.filter(acronym__in=['i2nsf', 'ipsecme', 'bess']))
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2166, )  # sidrops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2216, )  # lsvr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=4836, )  # John Scudder
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=3056, )  # Susan Hares
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
-                
-                ## session for bmwg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=945,  # bmwg
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                s.resources.set(ResourceAssociation.objects.filter(pk__in=[6]))  # [<ResourceAssociation: Experimental Room Setup (U-Shape and classroom, subject to availability)>]
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110785, )  # Sarah Banks
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102900, )  # Al Morton
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
-                
-                ## session for panrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2202,  # panrg
-                    attendees=75,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2166, )  # sidrops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1630, )  # pce
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1744, )  # alto
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122661, )  # Jen Linkova
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109354, )  # Brian Trammell
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107190, )  # Spencer Dawkins
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123344, )  # Theresa Enghardt
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
-                
-                ## session for nmrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=38,  # nmrg
-                    attendees=80,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for nmrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=38,  # nmrg
-                    attendees=80,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1714, )  # opsawg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1399, )  # opsarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121666, )  # Jérôme François
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108591, )  # Laurent Ciavaglia
-                
-                ## session for intarea ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1665,  # intarea
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=988, )  # dhc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1847, )  # dmm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106199, )  # Wassim Haddad
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108573, )  # Juan-Carlos Zúñiga
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                
-                ## session for lwig ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1817,  # lwig
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""Eric Vyncke's presence is a strong wish only (not a strict requirement) as he may take responsibility of this WG.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1764, )  # mptcp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113142, )  # Mohit Sethi
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110531, )  # Zhen Cao
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108990, )  # Ari Keränen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11843, )  # Carsten Bormann
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
-                
-                ## session for rtgwg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1619,  # rtgwg
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""No overlap with other Routing Area workings groups.""",  # implicit, rtgwg meeting_seen_as_area set
-                    remote_instructions="",
-                )
-                ## session for rtgwg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1619,  # rtgwg
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""No overlap with other Routing Area workings groups.""",  # implicit, rtgwg meeting_seen_as_area set
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2214, )  # rift
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2166, )  # sidrops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1584, )  # grow
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=38, )  # nmrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114478, )  # Chris Bowers
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112405, )  # Jeff Tantsura
-                
-                ## session for rift ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2214,  # rift
-                    attendees=70,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2216, )  # lsvr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1630, )  # pce
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1985, )  # teas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110966, )  # Zhaohui Zhang
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112405, )  # Jeff Tantsura
-                
-                ## session for spring ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1905,  # spring
-                    attendees=140,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""If it's not possible to address all conflicts, chairs will try to schedule 6MAN related content in the first session and MPLS related content during the second session.""",
-                    remote_instructions="",
-                )
-                ## session for spring ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1905,  # spring
-                    attendees=140,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""If it's not possible to address all conflicts, chairs will try to schedule 6MAN related content in the first session and MPLS related content during the second session.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1630, )  # pce
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107172, )  # Bruno Decraene
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116387, )  # Rob Shakir
-                
-                ## session for dhc ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=988,  # dhc
-                    attendees=25,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""Eric Vyncke's presence is a strong wish as he may take responsibility of this WG.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1966, )  # dtn
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1678, )  # softwire
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106618, )  # Bernie Volz
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110805, )  # Tomek Mrugalski
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
-                
-                ## session for ipsecme ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1740,  # ipsecme
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2143, )  # curdle
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1965, )  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1918, )  # uta
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110121, )  # Tero Kivinen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111953, )  # David Waltermire
-                
-                ## session for regext ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2146,  # regext
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2239, )  # cacao
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2246, )  # add
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1988, )  # hrpc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114834, )  # Antoin Verschuren
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=2783, )  # James Galvin
-                
-                ## session for cfrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=31,  # cfrg
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""Please also avoid conflicts with Security Area WG.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2176, )  # jmap
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1918, )  # uta
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2205, )  # extra
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122298, )  # Nick Sullivan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113609, )  # Kenny Paterson
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2258, )  # mathmesh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2257, )  # txauth
-                # All security WGs not already listed as conflicts:
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1634)  # kitten
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1674)  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1740)  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748)  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1869)  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1920)  # trans
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921)  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1965)  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1990)  # tokbind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995)  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1996)  # dots
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2002)  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2143)  # curdle
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2169)  # secevent
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194)  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231)  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249)  # lake
-                
-                ## session for icnrg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1849,  # icnrg
-                    attendees=80,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2209, )  # dinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1744, )  # alto
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1883, )  # nwcrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102174, )  # Dirk Kutscher
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18250, )  # Börje Ohlman
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=773, )  # David Oran
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
-                
-                ## session for dmm ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1847,  # dmm
-                    attendees=45,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2167, )  # ipwave
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114978, )  # Satoru Matsushima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109589, )  # Dapeng Liu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101641, )  # Sri Gundavelli
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
-                
-                ## session for jmap ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2176,  # jmap
-                    attendees=20,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1918, )  # uta
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1892, )  # dmarc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2221, )  # iasa2
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1953, )  # calext
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2205, )  # extra
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122671, )  # Bron Gondwana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122525, )  # Neil Jenkins
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121191, )  # Jim Fenton
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
-                
-                ## session for calext ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1953,  # calext
-                    attendees=15,
-                    agenda_note="1330 - 1430",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""We will need to make possible remote participation""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2176, )  # jmap
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2205, )  # extra
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122671, )  # Bron Gondwana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109969, )  # Daniel Migault
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
-                
-                ## session for cbor ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2175,  # cbor
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""Please avoid collision with any Sec and IoT-related BOFs.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1996, )  # dots
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119822, )  # Francesca Palombini
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110910, )  # Jim Schaad
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11843, )  # Carsten Bormann
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2254, )  # wpack
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2252, )  # gendispatch
-                
-                ## session for rum ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2242,  # rum
-                    attendees=20,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1812, )  # avtcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1138, )  # mmusic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1643, )  # ecrit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1762, )  # sipcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1994, )  # modern
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108554, )  # Paul Kyzivat
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106987, )  # Brian Rosen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103769, )  # Adam Roach
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(Q(slug__startswith='friday') | Q(slug='tuesday-morning')))
-                
-                ## session for mls ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2220,  # mls
-                    attendees=125,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2221, )  # iasa2
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2013, )  # perc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=12695, )  # Eric Rescorla
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122298, )  # Nick Sullivan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108049, )  # Richard Barnes
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
-                
-                ## session for extra ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2205,  # extra
-                    attendees=15,
-                    agenda_note="1430 - 1530",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2176, )  # jmap
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1953, )  # calext
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122671, )  # Bron Gondwana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107279, )  # Jiankang Yao
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
-                
-                ## session for manet ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1132,  # manet
-                    attendees=20,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1966, )  # dtn
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1985, )  # teas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19150, )  # Stan Ratliff
-                
-                ## session for rmcat ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1838,  # rmcat
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1138, )  # mmusic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2145, )  # maprg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1812, )  # avtcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20209, )  # Colin Perkins
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114993, )  # Anna Brunstrom
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105519, )  # Martin Stiemerling
-                
-                ## session for anima ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1956,  # anima
-                    attendees=80,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""It would be nice to have the 1.5 hour meeting first.""",  # this is default
-                    remote_instructions="",
-                )
-                ## session for anima ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1956,  # anima
-                    attendees=80,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""It would be nice to have the 1.5 hour meeting first.""",  # this is default
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1118, )  # mboned
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2202, )  # panrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2209, )  # dinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1399, )  # opsarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=38, )  # nmrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118100, )  # Ignas Bagdonas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108054, )  # Sheng Jiang
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11834, )  # Toerless Eckert
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
-                
-                ## session for ntp ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1642,  # ntp
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=945, )  # bmwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113902, )  # Dieter Sibold
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=4857, )  # Karen O'Donoghue
-                
-                ## session for oauth ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1748,  # oauth
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for oauth ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1748,  # oauth
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1762, )  # sipcore
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2169, )  # secevent
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1990, )  # tokbind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111355, )  # Rifaat Shekh-Yusef
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105857, )  # Hannes Tschofenig
-                
-                ## session for sacm ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1869,  # sacm
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1642, )  # ntp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1996, )  # dots
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2239, )  # cacao
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2169, )  # secevent
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113536, )  # Christopher Inacio
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111953, )  # David Waltermire
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=4857, )  # Karen O'Donoghue
-                
-                ## session for bier ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1964,  # bier
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1118, )  # mboned
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104151, )  # Tony Przygienda
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106315, )  # Greg Shepherd
-                
-                ## session for teas ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1985,  # teas
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=9000),  # 2:30:00
-                    comments="""Other Conflicts: IRTF RRG, RTG BOFs""",  # RTG BOF constraint is implicit
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1524, )  # ccamp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1630, )  # pce
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1875, )  # i2rs
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1840, )  # nvo3
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1969, )  # pals
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10064, )  # Lou Berger
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114351, )  # Vishnu Beeram
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
-                
-                ## session for netmod ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1638,  # netmod
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                ## session for netmod ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1638,  # netmod
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1985, )  # teas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1875, )  # i2rs
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20959, )  # Joel Jaeggli
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10064, )  # Lou Berger
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118100, )  # Ignas Bagdonas
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112548, )  # Kent Watsen
-                
-                ## session for core ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1789,  # core
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""Plse also avd any potntlly IoT reltd BOFs&PRGs tht mght cme up.
-                Second meeting often is 40 people.""",
-                    remote_instructions="",
-                )
-                ## session for core ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1789,  # core
-                    attendees=60,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""Plse also avd any potntlly IoT reltd BOFs&PRGs tht mght cme up.
-                Second meeting often is 40 people.""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1849, )  # icnrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1996, )  # dots
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2209, )  # dinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11843, )  # Carsten Bormann
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113152, )  # Jaime Jimenez
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='time_relation', time_relation='one-day-seperation')
-                
-                ## session for t2trg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1991,  # t2trg
-                    attendees=90,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""Please also avoid any potentially IoT related BOFs that might come up
-                """,
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2250, )  # loops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2021, )  # ice
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1897, )  # 6lo
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2234, )  # coinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2209, )  # dinrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1578, )  # v6ops
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1849, )  # icnrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1965, )  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1399, )  # opsarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11843, )  # Carsten Bormann
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108990, )  # Ari Keränen
-                
-                ## session for ace ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1921,  # ace
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2252, )  # gendispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109969, )  # Daniel Migault
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110910, )  # Jim Schaad
-                
-                ## session for wpack ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2254,  # wpack
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug='monday-morning'))
-                
-                ## session for webtrans ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2260,  # webtrans
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2021, )  # ice
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
-                
-                ## session for abcd ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2253,  # abcd
-                    attendees=200,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
-                
-                ## session for tmrid ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2255,  # tmrid
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                
-                ## session for mops ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2248,  # mops
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2208, )  # doh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1678, )  # softwire
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1138, )  # mmusic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1397, )  # pim
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1626, )  # hip
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1118, )  # mboned
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1895, )  # dnssd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1822, )  # cdni
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109223, )  # Leslie Daigle
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
-                
-                ## session for raw ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2256,  # raw
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1524, )  # ccamp
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1132, )  # manet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1962, )  # detnet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='monday'))
-                
-                ## session for txauth ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2257,  # txauth
-                    attendees=150,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2169, )  # secevent
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2143, )  # curdle
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2164, )  # lamps
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2002, )  # cose
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1920, )  # trans
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1634, )  # kitten
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1869, )  # sacm
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1990, )  # tokbind
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1740, )  # ipsecme
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231, )  # rats
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1965, )  # i2nsf
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1674, )  # emu
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1996, )  # dots
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1831, )  # mile
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
-                                
-                ## session for gendispatch ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2252,  # gendispatch
-                    attendees=75,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2253, )  # abcd
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2258, )  # mathmesh
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2256, )  # raw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2255, )  # tmrid
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1714, )  # opsawg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2257, )  # txauth
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2260, )  # webtrans
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1625, )  # genarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2254, )  # wpack
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18321, )  # Pete Resnick
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119822, )  # Francesca Palombini
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110077, )  # Alissa Cooper
-                
-                ## session for dtn ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1966,  # dtn
-                    attendees=30,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2256, )  # raw
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1132, )  # manet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=38, )  # nmrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19869, )  # Marc Blanchet
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=117656, )  # Rick Taylor
-                
-                ## session for lake ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2249,  # lake
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19177, )  # Stephen Farrell
-                
-                ## session for mathmesh ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2258,  # mathmesh
-                    attendees=100,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2254, )  # wpack
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
-                
-                ## session for qirg ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=2228,  # qirg
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=125147, )  # Stephanie Wehner
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110694, )  # Rodney Van Meter
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.filter(slug__in=[
-                    'tuesday-afternoon-early', 'tuesday-afternoon-late', 'wednesday-morning',
-                    'wednesday-afternoon-early', 'wednesday-afternoon-late', 'thursday-morning']))
-                
-                ## session for nvo3 ##
-                s = Session.objects.create(
-                    meeting=m,
-                    type_id="regular",
-                    group_id=1840,  # nvo3
-                    attendees=50,
-                    agenda_note="",
-                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
-                    comments="""""",
-                    remote_instructions="",
-                )
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1910, )  # sfc
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1140, )  # mpls
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105786, )  # Matthew Bocci
-                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112237, )  # Sam Aldrin
-                
-                ##### TIMESLOTS #####
-                
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-22 12:00:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(6, 12, 0), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-22 08:30:00 length 1:15:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(6, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
-                ## timeslot 2019-11-22 08:30:00 length 4:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(6, 8, 30), duration=datetime.timedelta(seconds=14400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-22 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(6, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-21 17:20:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(5, 17, 20), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-21 15:30:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(5, 15, 30), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-21 12:30:00 length 0:45:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Host Speaker Series", time=self._meeting_datetime(5, 12, 30), duration=datetime.timedelta(seconds=2700), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-21 12:15:00 length 1:00:00 in Skai Suite 1 (Swissotel) size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Systers Lunch", time=self._meeting_datetime(5, 12, 15), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Skai Suite 1 (Swissotel)"), show_location=True)
-                ## timeslot 2019-11-21 12:00:00 length 1:30:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Break", time=self._meeting_datetime(5, 12, 0), duration=datetime.timedelta(seconds=5400), location=None, show_location=False)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-21 09:00:00 length 1:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="NomCom Office Hours", time=self._meeting_datetime(5, 9, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-21 08:30:00 length 1:15:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(5, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
-                ## timeslot 2019-11-21 08:30:00 length 9:30:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(5, 8, 30), duration=datetime.timedelta(seconds=34200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-21 08:00:00 length 1:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Newcomers' Feedback Session", time=self._meeting_datetime(5, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-21 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(5, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-20 17:10:00 length 2:30:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="plenary", name="IETF Plenary", time=self._meeting_datetime(4, 17, 10), duration=datetime.timedelta(seconds=9000), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-20 16:50:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(4, 16, 50), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="unavail", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="unavail", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-20 15:00:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(4, 15, 0), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-20 12:15:00 length 1:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="WG Chairs Forum (For WG Chairs Only)", time=self._meeting_datetime(4, 12, 15), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-20 12:00:00 length 1:30:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Break", time=self._meeting_datetime(4, 12, 0), duration=datetime.timedelta(seconds=5400), location=None, show_location=False)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-20 09:00:00 length 1:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="NomCom Office Hours", time=self._meeting_datetime(4, 9, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-20 09:00:00 length 0:45:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Routing AD Office Hours", time=self._meeting_datetime(4, 9, 0), duration=datetime.timedelta(seconds=2700), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-20 08:30:00 length 1:15:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(4, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
-                ## timeslot 2019-11-20 08:30:00 length 8:40:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(4, 8, 30), duration=datetime.timedelta(seconds=31200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-20 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(4, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-20 07:30:00 length 2:00:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="lead", name="IAB Breakfast", time=self._meeting_datetime(4, 7, 30), duration=datetime.timedelta(seconds=7200), location=None, show_location=True)
-                ## timeslot 2019-11-19 19:00:00 length 4:00:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="IETF 106 Social Event at the ArtScience Museum Marina Bay Sands - Hosted by Nokia", time=self._meeting_datetime(3, 19, 0), duration=datetime.timedelta(seconds=14400), location=None, show_location=False)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Internet Area AD Office Hours", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-19 16:50:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(3, 16, 50), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-19 15:00:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(3, 15, 0), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-19 12:00:00 length 1:30:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Break", time=self._meeting_datetime(3, 12, 0), duration=datetime.timedelta(seconds=5400), location=None, show_location=False)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-19 09:00:00 length 1:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="NomCom Office Hours", time=self._meeting_datetime(3, 9, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-19 08:30:00 length 10:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=36000), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-19 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(3, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-19 07:30:00 length 2:00:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="lead", name="IAB Breakfast", time=self._meeting_datetime(3, 7, 30), duration=datetime.timedelta(seconds=7200), location=None, show_location=True)
-                ## timeslot 2019-11-18 19:30:00 length 1:30:00 in Skai Suite 4 (Swissotel) size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Newcomers' Dinner (Open to Newcomers. Note that pre-registration is required and a $25USD fee will be charged.)", time=self._meeting_datetime(2, 19, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Skai Suite 4 (Swissotel)"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Hackdemo Happy Hour", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-18 17:50:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(2, 17, 50), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-18 16:50:00 length 1:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="TSV AD Office Hours", time=self._meeting_datetime(2, 16, 50), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-18 15:30:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(2, 15, 30), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-18 12:00:00 length 1:30:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Break", time=self._meeting_datetime(2, 12, 0), duration=datetime.timedelta(seconds=5400), location=None, show_location=False)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-18 09:00:00 length 1:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="NomCom Office Hours", time=self._meeting_datetime(2, 9, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-18 08:30:00 length 1:15:00 in None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(2, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
-                ## timeslot 2019-11-18 08:30:00 length 10:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(2, 8, 30), duration=datetime.timedelta(seconds=36000), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-18 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(2, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-18 08:00:00 length 1:00:00 in Skai Suite 1 (Swissotel) size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Systers Networking Event", time=self._meeting_datetime(2, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Skai Suite 1 (Swissotel)"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Orchard size: 50 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in VIP A size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Hullet size: 100 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Collyer size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Padang size: 300 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Canning size: 250 ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Canning/Padang size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in VIP B size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Clark size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Minto size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Fullerton size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Bonham size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Bailey size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Ord/Blundell size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Indiana size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Bras Basah size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
-                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Butterworth size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
-                ## timeslot 2019-11-17 17:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Welcome Reception", time=self._meeting_datetime(1, 17, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-17 16:00:00 length 1:00:00 in Fairmont Ballroom Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Newcomers' Quick Connections (Open to Newcomers. Note that pre-registration is required)", time=self._meeting_datetime(1, 16, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
-                ## timeslot 2019-11-17 13:45:00 length 1:00:00 in Sophia size: 200 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Tutorial: Service Discovery for IP Applications", time=self._meeting_datetime(1, 13, 45), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
-                ## timeslot 2019-11-17 12:30:00 length 1:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Tutorial: Newcomers' Overview", time=self._meeting_datetime(1, 12, 30), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-17 10:00:00 length 2:00:00 in Olivia size: 150 ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="IEPG Meeting", time=self._meeting_datetime(1, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
-                ## timeslot 2019-11-17 10:00:00 length 8:00:00 in Convention Foyer size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(1, 10, 0), duration=datetime.timedelta(seconds=28800), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
-                ## timeslot 2019-11-17 08:30:00 length 7:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="IETF Hackathon", time=self._meeting_datetime(1, 8, 30), duration=datetime.timedelta(seconds=27000), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                ## timeslot 2019-11-16 09:30:00 length 8:30:00 in Ord size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="Code Sprint", time=self._meeting_datetime(0, 9, 30), duration=datetime.timedelta(seconds=30600), location=Room.objects.get(meeting=m, name="Ord"), show_location=True)
-                ## timeslot 2019-11-16 08:30:00 length 13:30:00 in Moor/Morrison size: None ##
-                TimeSlot.objects.create(meeting=m, type_id="other", name="IETF Hackathon", time=self._meeting_datetime(0, 8, 30), duration=datetime.timedelta(seconds=48600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
-                
-                for s in m.session_set.all():
-                    SchedulingEvent.objects.create(session=s, status_id='schedw', by_id=1)
-                
-                transaction.commit()
-                self.stdout.write("IETF 999 created.\n")
-
diff --git a/ietf/meeting/management/commands/create_test_meeting.py b/ietf/meeting/management/commands/create_test_meeting.py
new file mode 100644
index 0000000000..e48a8d66a2
--- /dev/null
+++ b/ietf/meeting/management/commands/create_test_meeting.py
@@ -0,0 +1,4650 @@
+# Copyright The IETF Trust 2020-2021, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+# This command generates a Meeting (IETF 999) with Rooms, TimeSlots, Sessions and Constraints.
+# It is mainly meant to support the development of the Automatic Schedule Builder, by
+# providing one meeting with a full set of constraints, on which the schedule
+# builder can be run to test it with a realistic dataset.
+# The data is based on IETF 106, modified to translate many previously manually
+# processed comments into Constraint objects, using recently added options.
+
+# This command was built by:
+# - Running script-generator.py, which generates new objects based on IETF 106 data.
+# - Going through all manually entered comments, and seeing whether they should and
+#   can be translated to the newly expanded Constraint objects.
+#
+# This work was done in the context of the new meeting constraints modelling:
+# https://github.com/ietf-tools/datatracker/wiki/MeetingConstraints
+# Note that aside from Constraint objects, as created below, there is also
+# business logic that applies to all sessions, which is to be implemented
+# in the automatic schedule builder.
+# 
+# Important notes:
+# - Free text comments can contain a lot of nuance and flexibility. These were
+#   translated to explicit Constraints as well as possible. 
+# - Some constraints, like "Please also avoid collision with IoT-related BOFs.", were
+#   too vague to define.
+# - Two WGs requested two sessions, but actually meant to have a single 2.5 hour session,
+#   which currently can not be entered in the session request UI. These were manually
+#   modified to have a single 2.5 hour session.
+# - Some constraints are implicit by business logic. For example, pce requested not
+#   to schedule against any routing area BOF. However, pce is in the routing area,
+#   and therefore should never be scheduled against any routing area BOF.
+#   Similarly, rtgwg asked for "no overlap with other routing area WGs". However,
+#   rtgwg has meeting_seen_as_area set (it is a WG, but should be considered an area meeting),
+#   meaning this behaviour is already implied. The same occurs for dispatch, which requested
+#   not to be scheduled against other area meetings.
+# - In general, the purpose of this dataset is not to recreate the set exactly as if it
+#   would be entered by session requesters, but to provide a realistic dataset of a
+#   realistic complexity.
+# - The joint second idr session was added from IETF 105, to have another case of
+#   a joint session in the dataset.
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import debug                            # pyflakes:ignore
+
+import socket
+import datetime
+import pytz
+
+from django.core.management.base import BaseCommand, CommandError
+from django.db import transaction
+from django.db.models import Q
+
+from ietf.group.models import Group
+from ietf.name.models import TimerangeName, TimeSlotTypeName, ConstraintName
+from ietf.meeting.models import Meeting, Room, Constraint, Session, ResourceAssociation, TimeSlot, SchedulingEvent, Schedule
+
+
+class Command(BaseCommand):
+    help = "Create (or delete) a meeting for test and development purposes."
+
+    def add_arguments(self, parser):
+        parser.add_argument('--delete', dest='delete', action='store_true', help='Delete the test and development meeting')
+        parser.add_argument('--old-conflicts', dest='old_conflicts', action='store_true',
+                            help='Use old conflict types ("conflict", "conflic2", "conflic3") instead of new ("chair_conflict", "tech_overlap", "key_participant")')
+        parser.add_argument(
+            '--start-date',
+            help='Start date for the test meeting (yyyy-mm-dd, defaults to 2019-11-16)',
+            type=lambda s: datetime.datetime.strptime(s, '%Y-%m-%d').date(),
+            default='2019-11-16',
+        )
+        parser.add_argument('--tz', default='UTC',
+                            help='Time zone for test meeting. Defaults to UTC. Use "" to disable.')
+
+    def _meeting_datetime(self, day, *time_args):
+        """Generate a datetime on a meeting day"""
+        return self.meeting_tz.localize(
+            datetime.datetime.combine(
+                self.start_date,
+                datetime.time(*time_args)
+            ) + datetime.timedelta(days=day)
+        )
+
+    def handle(self, *args, **options):
+        if socket.gethostname().split('.')[0] in ['core3', 'ietfa', 'ietfb', 'ietfc', ]:
+            raise EnvironmentError("Refusing to create a test meetng on a production server")
+
+        opt_delete = options.get('delete', False)
+        opt_use_old_conflicts = options.get('old_conflicts', False)
+        self.start_date = options['start_date']
+        meeting_tzname = options['tz']
+        if opt_delete:
+            if Meeting.objects.filter(number='999').exists():
+                Meeting.objects.filter(number='999').delete()
+                self.stdout.write("Deleted test meeting IETF 999 and its related objects.")
+            else:
+                self.stderr.write("Test meeting IETF 999 does not exist; nothing to do.\n")
+        else:
+            try:
+                self.meeting_tz = pytz.timezone(meeting_tzname)
+            except pytz.UnknownTimeZoneError:
+                raise CommandError("{} is not a recognized time zone.".format(meeting_tzname))
+
+            if Meeting.objects.filter(number='999').exists():
+                self.stderr.write("Test meeting IETF 999 already exists; nothing to do.\n")
+            else:
+                transaction.set_autocommit(False)
+                
+                if self.start_date.isoweekday() != 6:
+                    self.stderr.write("Warning: test meeting does not start on Saturday, watch out for bugs")
+
+                m = Meeting.objects.create(
+                    number='999',
+                    type_id='IETF',
+                    date=self._meeting_datetime(0).date(),
+                    days=7,
+                    time_zone=meeting_tzname,
+                )
+
+                # Set enabled constraints
+                if opt_use_old_conflicts:
+                    conflict = ['conflict', 'conflic2', 'conflic3']
+                else:
+                    conflict = ['chair_conflict', 'tech_overlap', 'key_participant']
+                for slug in conflict:
+                    m.group_conflict_types.add(ConstraintName.objects.get(slug=slug))
+
+                base_schedule = Schedule.objects.create(meeting=m, name='base', owner_id=1,
+                                                        visible=True, public=True)
+
+                schedule = Schedule.objects.create(meeting=m, name='first1', owner_id=1,
+                                                   visible=True, public=True, base=base_schedule)
+                m.schedule = schedule
+                m.save()
+                
+                ##### ROOMS #####
+                
+                r = Room.objects.create(meeting=m, name='Skai Suite 4 (Swissotel)', capacity=None, functional_name='Newcomers dinner')
+                r = Room.objects.create(meeting=m, name='Ord', capacity=None, functional_name='Code Sprint')
+                r = Room.objects.create(meeting=m, name='Skai Suite 1 (Swissotel)', capacity=None, functional_name='Systers Networking')
+                r = Room.objects.create(meeting=m, name='Butterworth', capacity=None, functional_name='Attendee Sign-Up 2')
+                r = Room.objects.create(meeting=m, name='Bras Basah', capacity=None, functional_name='Attendee Sign-Up 1')
+                r = Room.objects.create(meeting=m, name='Indiana', capacity=None, functional_name='NOC')
+                r = Room.objects.create(meeting=m, name='Ord/Blundell', capacity=None, functional_name='Terminal Room')
+                r = Room.objects.create(meeting=m, name='Bailey', capacity=None, functional_name='Secretariat')
+                r = Room.objects.create(meeting=m, name='Bonham', capacity=None, functional_name='NomCom Interviews')
+                r = Room.objects.create(meeting=m, name='Fullerton', capacity=None, functional_name='NomCom')
+                r = Room.objects.create(meeting=m, name='Minto', capacity=None, functional_name='LLC')
+                r = Room.objects.create(meeting=m, name='Mercury/Enterprise', capacity=None, functional_name='ISOC')
+                r = Room.objects.create(meeting=m, name='Clark', capacity=None, functional_name='IESG')
+                r = Room.objects.create(meeting=m, name='VIP B', capacity=None, functional_name='IAB')
+                r = Room.objects.create(meeting=m, name='Moor/Morrison', capacity=None, functional_name='Code Lounge')
+                r = Room.objects.create(meeting=m, name='Fairmont Ballroom Foyer', capacity=None, functional_name='Welcome Reception')
+                r = Room.objects.create(meeting=m, name='Convention Foyer', capacity=None, functional_name='IETF Registration')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['reg']))
+                r = Room.objects.create(meeting=m, name='Stamford & Fairmont Ballroom Foyers', capacity=None, functional_name='Breaks')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['break']))
+                r = Room.objects.create(meeting=m, name='Canning/Padang', capacity=None, functional_name='Plenary')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['plenary']))
+                r = Room.objects.create(meeting=m, name='Canning', capacity=250, functional_name='Breakout 8')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
+                r = Room.objects.create(meeting=m, name='Padang', capacity=300, functional_name='Breakout 7')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
+                r = Room.objects.create(meeting=m, name='Collyer', capacity=250, functional_name='Breakout 6')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
+                r = Room.objects.create(meeting=m, name='Sophia', capacity=200, functional_name='Breakout 5')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
+                r = Room.objects.create(meeting=m, name='Olivia', capacity=150, functional_name='Breakout 4')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
+                r = Room.objects.create(meeting=m, name='Hullet', capacity=100, functional_name='Breakout 3')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
+                r = Room.objects.create(meeting=m, name='VIP A', capacity=100, functional_name='Breakout 2')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
+                r = Room.objects.create(meeting=m, name='Orchard', capacity=50, functional_name='Breakout 1')
+                r.session_types.set(TimeSlotTypeName.objects.filter(slug__in=['regular']))
+                
+                ##### SESSIONS AND CONSTRAINTS #####
+                
+                ## session for grow ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1584,  # grow
+                    attendees=75,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2166, )  # sidrops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1751, )  # lisp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111303, )  # Job Snijders
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111246, )  # Chris Morrow
+                
+                ## session for sidrops ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2166,  # sidrops
+                    attendees=62,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2216, )  # lsvr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111246, )  # Chris Morrow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104971, )  # Keyur Patel
+                
+                ## session for dnsop ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1452,  # dnsop
+                    attendees=160,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for dnsop ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1452,  # dnsop
+                    attendees=160,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=988, )  # dhc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1920, )  # trans
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2146, )  # regext
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1892, )  # dmarc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18009, )  # Suzanne Woolf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123662, )  # Benno Overeinder
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115244, )  # Tim Wicinski
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
+                
+                ## session for dnssd ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1895,  # dnssd
+                    attendees=75,
+                    agenda_note="Joint with HOMENET",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""dnssd and homenet would like to do a single joint 2 hour meeting. We'll figure out how to divide the time.""",
+                    remote_instructions="",
+                )
+                ## session for dnssd ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1895,  # dnssd
+                    attendees=75,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""dnssd and homenet would like to do a single joint 2 hour meeting. We'll figure out how to divide the time.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2150, )  # babel
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119562, )  # David Schinazi
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114464, )  # Barbara Stark
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19177, )  # Stephen Farrell
+
+                ## session for lsvr ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2216,  # lsvr
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2166, )  # sidrops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2214, )  # rift
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1840, )  # nvo3
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108304, )  # Gunter Van de Velde
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111493, )  # Victor Kuarsingh
+                
+                ## session for quic ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2161,  # quic
+                    attendees=200,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                s.resources.set(ResourceAssociation.objects.filter(pk__in=[6]))  # [<ResourceAssociation: Experimental Room Setup (U-Shape and classroom, subject to availability)>]
+                ## session for quic ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2161,  # quic
+                    attendees=200,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                s.resources.set(ResourceAssociation.objects.filter(pk__in=[6]))  # [<ResourceAssociation: Experimental Room Setup (U-Shape and classroom, subject to availability)>]
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1764, )  # mptcp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2015, )  # capport
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2246, )  # add
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109354, )  # Brian Trammell
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107131, )  # Martin Thomson
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124381, )  # Alan Frindell
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105721, )  # Jana Iyengar
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119702, )  # Ian Swett
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116439, )  # Mike Bishop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103881, )  # Mark Nottingham
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112773, )  # Lars Eggert
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='time_relation', time_relation='subsequent-days')
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday').exclude(slug__startswith='wednesday-morning'))
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2253, )  # abcd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2256, )  # raw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2254, )  # wpack
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2258, )  # mathmesh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2257, )  # txauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2255, )  # tmrid
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2260, )  # webtrans
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1399, )  # opsarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1625, )  # genarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2252, )  # gendispatch
+                
+                
+                ## session for tsvwg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1463,  # tsvwg
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""Must not conflict with Transport Area BOFs. """,  # this is implicit
+                    remote_instructions="",
+                )
+                ## session for tsvwg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1463,  # tsvwg
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""Must not conflict with Transport Area BOFs. """,  # this is implicit
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1152, )  # nfsv4
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1926, )  # tram
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1966, )  # dtn
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1764, )  # mptcp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1838, )  # rmcat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1524, )  # ccamp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=23177, )  # Bob Briscoe
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110856, )  # Wesley Eddy
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104695, )  # Michael Tüxen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104331, )  # Gorry Fairhurst
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103156, )  # David Black
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='time_relation', time_relation='one-day-seperation')
+                
+                ## session for ccamp ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1524,  # ccamp
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1985, )  # teas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1630, )  # pce
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1875, )  # i2rs
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109703, )  # Daniele Ceccarelli
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108894, )  # Fatai Zhang
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
+                
+                ## session for dispatch ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1763,  # dispatch
+                    attendees=80,
+                    agenda_note="Joint with ARTAREA",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments=""" and avoid the same kind of conflicts with other area meetings and any BOFs and potential new ART WGs.""",  # this is implicit
+                    remote_instructions="",
+                )
+                s.joint_with_groups.set(Group.objects.filter(acronym='artarea'))
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1812, )  # avtcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1899, )  # stir
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1762, )  # sipcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1838, )  # rmcat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2176, )  # jmap
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2205, )  # extra
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1814, )  # payload
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1918, )  # uta
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1138, )  # mmusic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1892, )  # dmarc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1643, )  # ecrit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1815, )  # xrblock
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1926, )  # tram
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1399, )  # opsarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104140, )  # Ben Campbell
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103769, )  # Adam Roach
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102830, )  # Mary Barnes
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug='monday-morning'))
+                
+                ## session for v6ops ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1578,  # v6ops
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1584, )  # grow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101568, )  # Ron Bonica
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=2853, )  # Fred Baker
+                
+                ## session for stir ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1899,  # stir
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2167, )  # ipwave
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1643, )  # ecrit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1994, )  # modern
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1762, )  # sipcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1812, )  # avtcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1138, )  # mmusic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2156, )  # sipbrandy
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2013, )  # perc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=5376, )  # Russ Housley
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=120587, )  # Chris Wendt
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104557, )  # Jon Peterson
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103961, )  # Robert Sparks
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103769, )  # Adam Roach
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
+                
+                ## session for pim ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1397,  # pim
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1118, )  # mboned
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1875, )  # i2rs
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1840, )  # nvo3
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1132, )  # manet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1678, )  # softwire
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1751, )  # lisp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106173, )  # Stig Venaas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105708, )  # Mike McBride
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='wg_adjacent', target_id=1118, )  # mboned
+                
+                ## session for suit ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2211,  # suit
+                    attendees=80,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2167, )  # ipwave
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1899, )  # stir
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2156, )  # sipbrandy
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105857, )  # Hannes Tschofenig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124893, )  # David Brown
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=15927, )  # Dave Thaler
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123482, )  # Milosch Meriac
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=5376, )  # Russ Housley
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123481, )  # Brendan Moran
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=117723, )  # Henk Birkholz
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111953, )  # David Waltermire
+                
+                ## session for coinrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2234,  # coinrg
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1883, )  # nwcrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2228, )  # qirg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2209, )  # dinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1849, )  # icnrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=125277, )  # Jianfei He
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123468, )  # Eve Schooler
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103930, )  # Marie-Jose Montpetit
+                
+                ## session for nwcrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1883,  # nwcrg
+                    attendees=35,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1849, )  # icnrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2209, )  # dinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107132, )  # Vincent Roca
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103930, )  # Marie-Jose Montpetit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='friday').exclude(slug__startswith='thursday'))
+                
+                ## session for tcpm ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1620,  # tcpm
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1764, )  # mptcp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110636, )  # Michael Scharf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104695, )  # Michael Tüxen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=15951, )  # Yoshifumi Nishida
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug='thursday-afternoon-late'))
+                
+                ## session for ippm ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1089,  # ippm
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2015, )  # capport
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=945, )  # bmwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1628, )  # bfd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1599, )  # opsec
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109354, )  # Brian Trammell
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106879, )  # Frank Brockners
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122654, )  # Greg <gregimirsky@gmail.com>>
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102900, )  # Al Morton
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119325, )  # Tommy Pauly
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118908, )  # Giuseppe Fioccola
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113573, )  # Bill Cerveny
+                
+                ## session for lamps ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2164,  # lamps
+                    attendees=45,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2167, )  # ipwave
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2156, )  # sipbrandy
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109505, )  # Bernie Hoeneisen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108049, )  # Richard Barnes
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=125563, )  # Hendrik Brockhaus
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124538, )  # Tim Hollebeek
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18427, )  # Rich Salz
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110910, )  # Jim Schaad
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=5376, )  # Russ Housley
+                
+                ## session for httpbis ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1718,  # httpbis
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for httpbis ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1718,  # httpbis
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2015, )  # capport
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119325, )  # Tommy Pauly
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116593, )  # Patrick McManus
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103881, )  # Mark Nottingham
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
+                
+                ## session for taps ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1924,  # taps
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""The IRTF Chair is a contributor to TAPS so please avoid IRTF RGs if possible.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1812, )  # avtcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1838, )  # rmcat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2248, )  # mops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1118, )  # mboned
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2248, )  # mops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122540, )  # Jake Holland
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109354, )  # Brian Trammell
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121595, )  # Christopher Wood
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104331, )  # Gorry Fairhurst
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119463, )  # Kyle Rose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119325, )  # Tommy Pauly
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103877, )  # Michael Welzl
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114993, )  # Anna Brunstrom
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123344, )  # Theresa Enghardt
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21226, )  # Aaron Falk
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123343, )  # Philipp Tiesel
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20209, )  # Colin Perkins
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109753, )  # Zaheduzzaman Sarker
+                
+                ## session for dprive ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1958,  # dprive
+                    attendees=120,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115244, )  # Tim Wicinski
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=100664, )  # Brian Haberman
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='friday'))
+                
+                ## session for teep ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2194,  # teep
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for teep ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2194,  # teep
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107773, )  # Mingliang Pei
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105857, )  # Hannes Tschofenig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105785, )  # Nancy Cam-Winget
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=15927, )  # Dave Thaler
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124970, )  # Dave Wheeler
+                
+                ## session for iccrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=42,  # iccrg
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1764, )  # mptcp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1838, )  # rmcat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105721, )  # Jana Iyengar
+                
+                ## session for rats ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2231,  # rats
+                    attendees=40,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for rats ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2231,  # rats
+                    attendees=40,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105785, )  # Nancy Cam-Winget
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104851, )  # Kathleen Moriarty
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21144, )  # Ned Smith
+                
+                ## session for secdispatch ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2219,  # secdispatch
+                    attendees=200,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1996, )  # dots
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1990, )  # tokbind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2143, )  # curdle
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2169, )  # secevent
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108049, )  # Richard Barnes
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104851, )  # Kathleen Moriarty
+                
+                ## session for mboned ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1118,  # mboned
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2248, )  # mops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1138, )  # mmusic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2214, )  # rift
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106173, )  # Stig Venaas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105708, )  # Mike McBride
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104329, )  # Leonard Giuliano
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106315, )  # Greg Shepherd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='wg_adjacent', target_id=1397, )  # mboned
+                
+                ## session for bess ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1960,  # bess
+                    attendees=90,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for bess ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1960,  # bess
+                    attendees=90,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1840, )  # nvo3
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1397, )  # pim
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1910, )  # sfc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1969, )  # pals
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123321, )  # mankamana mishra
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113838, )  # Stephane Litkowski
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105786, )  # Matthew Bocci
+                
+                ## session for homenet and dnssd ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1803,  # homenet
+                    attendees=60,
+                    agenda_note="Joint with DNSSD",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                s.joint_with_groups.set(Group.objects.filter(acronym='dnssd'))
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2150, )  # babel
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119562, )  # David Schinazi
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114464, )  # Barbara Stark
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19177, )  # Stephen Farrell
+                
+                ## session for acme ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1995,  # acme
+                    attendees=70,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106745, )  # Yoav Nir
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18427, )  # Rich Salz
+                
+                ## session for babel ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2150,  # babel
+                    attendees=21,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1840, )  # nvo3
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1132, )  # manet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104645, )  # Russ White
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102391, )  # Donald Eastlake
+                
+                ## session for lsr ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2215,  # lsr
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for lsr ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2215,  # lsr
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2216, )  # lsvr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2214, )  # rift
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=22933, )  # Christian Hopps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10784, )  # Acee Lindem
+                
+                ## session for netconf ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1575,  # netconf
+                    attendees=65,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1714, )  # opsawg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1399, )  # opsarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2150, )  # babel
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118100, )  # Ignas Bagdonas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112548, )  # Kent Watsen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107859, )  # Mahesh Jethanandani
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
+                
+                ## session for maprg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2145,  # maprg
+                    attendees=200,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1764, )  # mptcp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1744, )  # alto
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1838, )  # rmcat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1714, )  # opsawg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=945, )  # bmwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121213, )  # Dave Plonka
+                
+                ## session for 6lo ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1897,  # 6lo
+                    attendees=55,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""Please also avoid collision with IoT-related BOFs.
+                Eric Vyncke's presence is a strong wish as he may take responsibility of this WG.""",  # BOFs are already avoided if in the internet area
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2167, )  # ipwave
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1132, )  # manet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1849, )  # icnrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116512, )  # Shwetha Bhandari
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108961, )  # Carles Gomez
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                
+                ## session for 6man ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1723,  # 6man
+                    attendees=120,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""We would prefer to have session #1 early in the week to allow for side meetings to follow up on open items.""",
+                    remote_instructions="",
+                )
+                ## session for 6man ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1723,  # 6man
+                    attendees=120,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2147, )  # mtgvenue
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105691, )  # Ole Trøan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=2793, )  # Bob Hinden
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='time_relation', time_relation='one-day-seperation')
+                
+                ## session for irtfopen ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1853,  # irtfopen
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""MUST NOT be in parallel with any other IRTF sessions. """,  # should be implicit
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1849, )  # icnrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2228, )  # qirg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1988, )  # hrpc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1968, )  # gaia
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1883, )  # nwcrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2209, )  # dinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=38, )  # nmrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1838, )  # rmcat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1812, )  # avtcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2248, )  # mops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109986, )  # Mat Ford
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20209, )  # Colin Perkins
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday'))
+                
+                ## session for lpwan ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2148,  # lpwan
+                    attendees=75,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""Eric Vyncke's presence is a strong wish (not a strong requirement) as he may take responsibility of this WG.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2256, )  # raw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2214, )  # rift
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119881, )  # Alexander Pelov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115824, )  # Pascal Thubert
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                
+                ## session for 6tisch ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1903,  # 6tisch
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2256, )  # raw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2214, )  # rift
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115824, )  # Pascal Thubert
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108628, )  # Thomas Watteyne
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                
+                ## session for lisp ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1751,  # lisp
+                    attendees=45,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1910, )  # sfc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1875, )  # i2rs
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2216, )  # lsvr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1840, )  # nvo3
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1849, )  # icnrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1118, )  # mboned
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=3862, )  # Joel Halpern
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121160, )  # Padma Pillay-Esnault
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108833, )  # Luigi Iannone
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
+                
+                ## session for mptcp ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1764,  # mptcp
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107998, )  # Philip Eardley
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=15951, )  # Yoshifumi Nishida
+                
+                ## session for roll ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1730,  # roll
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for roll ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1730,  # roll
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1132, )  # manet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115213, )  # Ines Robles
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105620, )  # Peter Van der Stok
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102254, )  # Michael Richardson
+                
+                ## session for saag ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1187,  # saag
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1996, )  # dots
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2169, )  # secevent
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2143, )  # curdle
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1920, )  # trans
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1634, )  # kitten
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1990, )  # tokbind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2166, )  # sidrops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1892, )  # dmarc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1918, )  # uta
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='thursday-afternoon-early'))
+                
+                ## session for mpls ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1140,  # mpls
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1628, )  # bfd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1910, )  # sfc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1985, )  # teas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1969, )  # pals
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1524, )  # ccamp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1630, )  # pce
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2216, )  # lsvr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1840, )  # nvo3
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1875, )  # i2rs
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108187, )  # Nicolai Leymann
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20682, )  # Loa Andersson
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=125952, )  # Mach(Guoyi) Chen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116516, )  # Tarek Saad
+                
+                ## session for pce ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1630,  # pce
+                    attendees=75,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""Do not schedule against RTG area BOF (if any)""",  # this is implicit
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1524, )  # ccamp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1985, )  # teas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2214, )  # rift
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1969, )  # pals
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1910, )  # sfc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1714, )  # opsawg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108213, )  # Julien Meuric
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115798, )  # Hariharan Ananthakrishnan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111477, )  # Dhruv Dhody
+                
+                ## session for detnet ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1962,  # detnet
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=9000),  # 2:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1630, )  # pce
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1985, )  # teas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1524, )  # ccamp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1910, )  # sfc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1969, )  # pals
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1840, )  # nvo3
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124759, )  # Ethan Grossman
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118295, )  # Janos Farkas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103156, )  # David Black
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10064, )  # Lou Berger
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='monday'))
+                
+                ## session for alto ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1744,  # alto
+                    attendees=25,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1849, )  # icnrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=38, )  # nmrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108807, )  # Jan Seedorf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106812, )  # Vijay Gurbani
+                
+                ## session for gaia ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1968,  # gaia
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=117577, )  # Leandro Navarro
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123022, )  # Jane Coffin
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
+                
+                ## session for git ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2233,  # git
+                    attendees=65,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2150, )  # babel
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121595, )  # Christopher Wood
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110077, )  # Alissa Cooper
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10083, )  # Paul Hoffman
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2253, )  # abcd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2256, )  # raw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2254, )  # wpack
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2258, )  # mathmesh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2257, )  # txauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2255, )  # tmrid
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2260, )  # webtrans
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1399, )  # opsarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1625, )  # genarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2252, )  # gendispatch
+                
+                ## session for pearg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2227,  # pearg
+                    attendees=120,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1988, )  # hrpc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2233, )  # git
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2228, )  # qirg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123472, )  # Shivan Sahib
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121595, )  # Christopher Wood
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112423, )  # Sara Dickinson
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
+                
+                ## session for tls ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1326,  # tls
+                    attendees=120,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for tls ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1326,  # tls
+                    attendees=120,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2239, )  # cacao
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2233, )  # git
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106745, )  # Yoav Nir
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101208, )  # Joseph Salowey
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18427, )  # Rich Salz
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122298, )  # Nick Sullivan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=12695, )  # Eric Rescorla
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121595, )  # Christopher Wood
+                
+                ## session for tsvarea ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1679,  # tsvarea
+                    attendees=120,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1744, )  # alto
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1838, )  # rmcat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1152, )  # nfsv4
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1966, )  # dtn
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1764, )  # mptcp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1926, )  # tram
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
+                
+                ## session for secevent ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2169,  # secevent
+                    attendees=None,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(0),  # 0:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                
+                ## session for dinrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2209,  # dinrg
+                    attendees=90,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1988, )  # hrpc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1883, )  # nwcrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20209, )  # Colin Perkins
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102174, )  # Dirk Kutscher
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101104, )  # Melinda Shore
+                
+                ## session for opsawg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1714,  # opsawg
+                    attendees=70,
+                    agenda_note="Combined OpsAWG / OpsAREA",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""PLEASE NOTE: Combined OpsAWG / OpsAREA""",
+                    remote_instructions="",
+                )
+                s.joint_with_groups.set(Group.objects.filter(acronym='opsarea'))
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1584, )  # grow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118100, )  # Ignas Bagdonas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=117721, )  # Tianran Zhou
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113086, )  # Joe Clarke
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
+                
+                ## session for avtcore ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1812,  # avtcore
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2248, )  # mops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1816, )  # clue
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1815, )  # xrblock
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1762, )  # sipcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2013, )  # perc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1814, )  # payload
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1138, )  # mmusic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1838, )  # rmcat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111749, )  # Rachel Huang
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105873, )  # Roni Even
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101923, )  # Jonathan Lennox
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
+                
+                ## session for bfd ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1628,  # bfd
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1751, )  # lisp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1910, )  # sfc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1969, )  # pals
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1985, )  # teas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1524, )  # ccamp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106444, )  # Reshad Rahman
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105046, )  # Jeffrey Haas
+                
+                ## session for emu ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1674,  # emu
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1918, )  # uta
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2143, )  # curdle
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1634, )  # kitten
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101208, )  # Joseph Salowey
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21072, )  # Jari Arkko
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113142, )  # Mohit Sethi
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109330, )  # John Mattsson
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108624, )  # Alan DeKok
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday').exclude(slug='wednesday-morning'))
+                
+                ## session for hrpc ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1988,  # hrpc
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1968, )  # gaia
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2146, )  # regext
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2015, )  # capport
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=124328, )  # Mallory Knodel
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=3747, )  # Avri Doria
+                
+                ## session for cose ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2002,  # cose
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111178, )  # Matthew Miller
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123715, )  # Ivaylo Petrov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                
+                ## session for dots ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1996,  # dots
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1918, )  # uta
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111620, )  # Liang Xia
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103686, )  # Valery Smyslov
+                
+                ## session for idr ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1041,  # idr
+                    attendees=75,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for idr ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1041,  # idr
+                    attendees=75,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                s.joint_with_groups.set(Group.objects.filter(acronym__in=['i2nsf', 'ipsecme', 'bess']))
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1584, )  # grow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2166, )  # sidrops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2216, )  # lsvr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=4836, )  # John Scudder
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=3056, )  # Susan Hares
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
+                
+                ## session for bmwg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=945,  # bmwg
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                s.resources.set(ResourceAssociation.objects.filter(pk__in=[6]))  # [<ResourceAssociation: Experimental Room Setup (U-Shape and classroom, subject to availability)>]
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111656, )  # Warren Kumari
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110785, )  # Sarah Banks
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102900, )  # Al Morton
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
+                
+                ## session for panrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2202,  # panrg
+                    attendees=75,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2166, )  # sidrops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1630, )  # pce
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1744, )  # alto
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122661, )  # Jen Linkova
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109354, )  # Brian Trammell
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107190, )  # Spencer Dawkins
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=123344, )  # Theresa Enghardt
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
+                
+                ## session for nmrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=38,  # nmrg
+                    attendees=80,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for nmrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=38,  # nmrg
+                    attendees=80,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1714, )  # opsawg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1399, )  # opsarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121666, )  # Jérôme François
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108591, )  # Laurent Ciavaglia
+                
+                ## session for intarea ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1665,  # intarea
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=988, )  # dhc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1847, )  # dmm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106199, )  # Wassim Haddad
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108573, )  # Juan-Carlos Zúñiga
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                
+                ## session for lwig ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1817,  # lwig
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""Eric Vyncke's presence is a strong wish only (not a strict requirement) as he may take responsibility of this WG.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1764, )  # mptcp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113142, )  # Mohit Sethi
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110531, )  # Zhen Cao
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108990, )  # Ari Keränen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11843, )  # Carsten Bormann
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
+                
+                ## session for rtgwg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1619,  # rtgwg
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""No overlap with other Routing Area workings groups.""",  # implicit, rtgwg meeting_seen_as_area set
+                    remote_instructions="",
+                )
+                ## session for rtgwg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1619,  # rtgwg
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""No overlap with other Routing Area workings groups.""",  # implicit, rtgwg meeting_seen_as_area set
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2214, )  # rift
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2166, )  # sidrops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1584, )  # grow
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=38, )  # nmrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114478, )  # Chris Bowers
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112405, )  # Jeff Tantsura
+                
+                ## session for rift ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2214,  # rift
+                    attendees=70,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2216, )  # lsvr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1630, )  # pce
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1628, )  # bfd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1985, )  # teas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110966, )  # Zhaohui Zhang
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112405, )  # Jeff Tantsura
+                
+                ## session for spring ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1905,  # spring
+                    attendees=140,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""If it's not possible to address all conflicts, chairs will try to schedule 6MAN related content in the first session and MPLS related content during the second session.""",
+                    remote_instructions="",
+                )
+                ## session for spring ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1905,  # spring
+                    attendees=140,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""If it's not possible to address all conflicts, chairs will try to schedule 6MAN related content in the first session and MPLS related content during the second session.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1630, )  # pce
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107172, )  # Bruno Decraene
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=116387, )  # Rob Shakir
+                
+                ## session for dhc ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=988,  # dhc
+                    attendees=25,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""Eric Vyncke's presence is a strong wish as he may take responsibility of this WG.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1966, )  # dtn
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1678, )  # softwire
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106618, )  # Bernie Volz
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110805, )  # Tomek Mrugalski
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
+                
+                ## session for ipsecme ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1740,  # ipsecme
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2143, )  # curdle
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1965, )  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1918, )  # uta
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110121, )  # Tero Kivinen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111953, )  # David Waltermire
+                
+                ## session for regext ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2146,  # regext
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2239, )  # cacao
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2246, )  # add
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1988, )  # hrpc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114834, )  # Antoin Verschuren
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=2783, )  # James Galvin
+                
+                ## session for cfrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=31,  # cfrg
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""Please also avoid conflicts with Security Area WG.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2176, )  # jmap
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1918, )  # uta
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2205, )  # extra
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122298, )  # Nick Sullivan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113609, )  # Kenny Paterson
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2258, )  # mathmesh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2257, )  # txauth
+                # All security WGs not already listed as conflicts:
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1634)  # kitten
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1674)  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1740)  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748)  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1869)  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1920)  # trans
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921)  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1965)  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1990)  # tokbind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995)  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1996)  # dots
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2002)  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2143)  # curdle
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2169)  # secevent
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194)  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231)  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249)  # lake
+                
+                ## session for icnrg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1849,  # icnrg
+                    attendees=80,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2209, )  # dinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1744, )  # alto
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1883, )  # nwcrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102174, )  # Dirk Kutscher
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18250, )  # Börje Ohlman
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=773, )  # David Oran
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
+                
+                ## session for dmm ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1847,  # dmm
+                    attendees=45,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2167, )  # ipwave
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114978, )  # Satoru Matsushima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109589, )  # Dapeng Liu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=101641, )  # Sri Gundavelli
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='monday').exclude(slug__startswith='tuesday'))
+                
+                ## session for jmap ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2176,  # jmap
+                    attendees=20,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1918, )  # uta
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1892, )  # dmarc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2221, )  # iasa2
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1953, )  # calext
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2205, )  # extra
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122671, )  # Bron Gondwana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122525, )  # Neil Jenkins
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=121191, )  # Jim Fenton
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
+                
+                ## session for calext ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1953,  # calext
+                    attendees=15,
+                    agenda_note="1330 - 1430",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""We will need to make possible remote participation""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2176, )  # jmap
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2205, )  # extra
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122671, )  # Bron Gondwana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109969, )  # Daniel Migault
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
+                
+                ## session for cbor ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2175,  # cbor
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""Please avoid collision with any Sec and IoT-related BOFs.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1996, )  # dots
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119822, )  # Francesca Palombini
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110910, )  # Jim Schaad
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11843, )  # Carsten Bormann
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2254, )  # wpack
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2252, )  # gendispatch
+                
+                ## session for rum ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2242,  # rum
+                    attendees=20,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1812, )  # avtcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1138, )  # mmusic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1643, )  # ecrit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1762, )  # sipcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1994, )  # modern
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108554, )  # Paul Kyzivat
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106987, )  # Brian Rosen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=103769, )  # Adam Roach
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(Q(slug__startswith='friday') | Q(slug='tuesday-morning')))
+                
+                ## session for mls ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2220,  # mls
+                    attendees=125,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2221, )  # iasa2
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2227, )  # pearg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2013, )  # perc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=12695, )  # Eric Rescorla
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122298, )  # Nick Sullivan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108049, )  # Richard Barnes
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19483, )  # Sean Turner
+                
+                ## session for extra ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2205,  # extra
+                    attendees=15,
+                    agenda_note="1430 - 1530",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2176, )  # jmap
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1953, )  # calext
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=122671, )  # Bron Gondwana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=107279, )  # Jiankang Yao
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
+                
+                ## session for manet ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1132,  # manet
+                    attendees=20,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1966, )  # dtn
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1985, )  # teas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1404, )  # rtgarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19150, )  # Stan Ratliff
+                
+                ## session for rmcat ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1838,  # rmcat
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1138, )  # mmusic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2145, )  # maprg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=42, )  # iccrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1812, )  # avtcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1620, )  # tcpm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20209, )  # Colin Perkins
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114993, )  # Anna Brunstrom
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112330, )  # Mirja Kühlewind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105519, )  # Martin Stiemerling
+                
+                ## session for anima ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1956,  # anima
+                    attendees=80,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""It would be nice to have the 1.5 hour meeting first.""",  # this is default
+                    remote_instructions="",
+                )
+                ## session for anima ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1956,  # anima
+                    attendees=80,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""It would be nice to have the 1.5 hour meeting first.""",  # this is default
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1723, )  # 6man
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1118, )  # mboned
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2202, )  # panrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2209, )  # dinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1399, )  # opsarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=38, )  # nmrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118100, )  # Ignas Bagdonas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108054, )  # Sheng Jiang
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11834, )  # Toerless Eckert
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='friday'))
+                
+                ## session for ntp ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1642,  # ntp
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=945, )  # bmwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1089, )  # ippm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113902, )  # Dieter Sibold
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106412, )  # Suresh Krishnan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=4857, )  # Karen O'Donoghue
+                
+                ## session for oauth ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1748,  # oauth
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for oauth ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1748,  # oauth
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1762, )  # sipcore
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2169, )  # secevent
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1990, )  # tokbind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111355, )  # Rifaat Shekh-Yusef
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105857, )  # Hannes Tschofenig
+                
+                ## session for sacm ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1869,  # sacm
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1642, )  # ntp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1831, )  # mile
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1965, )  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1996, )  # dots
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2239, )  # cacao
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2169, )  # secevent
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113536, )  # Christopher Inacio
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=111953, )  # David Waltermire
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=4857, )  # Karen O'Donoghue
+                
+                ## session for bier ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1964,  # bier
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1118, )  # mboned
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1397, )  # pim
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104151, )  # Tony Przygienda
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109802, )  # Alvaro Retana
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106315, )  # Greg Shepherd
+                
+                ## session for teas ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1985,  # teas
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=9000),  # 2:30:00
+                    comments="""Other Conflicts: IRTF RRG, RTG BOFs""",  # RTG BOF constraint is implicit
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1524, )  # ccamp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1630, )  # pce
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1875, )  # i2rs
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1041, )  # idr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2215, )  # lsr
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1840, )  # nvo3
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1969, )  # pals
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10064, )  # Lou Berger
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=114351, )  # Vishnu Beeram
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
+                
+                ## session for netmod ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1638,  # netmod
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                ## session for netmod ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1638,  # netmod
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1985, )  # teas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1875, )  # i2rs
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=20959, )  # Joel Jaeggli
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=10064, )  # Lou Berger
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=118100, )  # Ignas Bagdonas
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112548, )  # Kent Watsen
+                
+                ## session for core ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1789,  # core
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""Plse also avd any potntlly IoT reltd BOFs&PRGs tht mght cme up.
+                Second meeting often is 40 people.""",
+                    remote_instructions="",
+                )
+                ## session for core ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1789,  # core
+                    attendees=60,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""Plse also avd any potntlly IoT reltd BOFs&PRGs tht mght cme up.
+                Second meeting often is 40 people.""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1849, )  # icnrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1996, )  # dots
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2209, )  # dinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11843, )  # Carsten Bormann
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=113152, )  # Jaime Jimenez
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='time_relation', time_relation='one-day-seperation')
+                
+                ## session for t2trg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1991,  # t2trg
+                    attendees=90,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""Please also avoid any potentially IoT related BOFs that might come up
+                """,
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2250, )  # loops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2021, )  # ice
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1897, )  # 6lo
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2234, )  # coinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2209, )  # dinrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1578, )  # v6ops
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1638, )  # netmod
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1575, )  # netconf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1849, )  # icnrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1965, )  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1665, )  # intarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1399, )  # opsarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=11843, )  # Carsten Bormann
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108990, )  # Ari Keränen
+                
+                ## session for ace ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1921,  # ace
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=2252, )  # gendispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[2], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109969, )  # Daniel Migault
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110910, )  # Jim Schaad
+                
+                ## session for wpack ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2254,  # wpack
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1763, )  # dispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=102154, )  # Alexey Melnikov
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug='monday-morning'))
+                
+                ## session for webtrans ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2260,  # webtrans
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2021, )  # ice
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
+                
+                ## session for abcd ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2253,  # abcd
+                    attendees=200,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1452, )  # dnsop
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=21684, )  # Barry Leiba
+                
+                ## session for tmrid ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2255,  # tmrid
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1991, )  # t2trg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                
+                ## session for mops ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2248,  # mops
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2208, )  # doh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1678, )  # softwire
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1138, )  # mmusic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1803, )  # homenet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1397, )  # pim
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1626, )  # hip
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1118, )  # mboned
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1895, )  # dnssd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1822, )  # cdni
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1924, )  # taps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=109223, )  # Leslie Daigle
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105099, )  # Éric Vyncke
+                
+                ## session for raw ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2256,  # raw
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1524, )  # ccamp
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1964, )  # bier
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1132, )  # manet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1962, )  # detnet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=106471, )  # Deborah Brungard
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__startswith='monday'))
+                
+                ## session for txauth ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2257,  # txauth
+                    attendees=150,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1718, )  # httpbis
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2169, )  # secevent
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2143, )  # curdle
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2164, )  # lamps
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2219, )  # secdispatch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2002, )  # cose
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1920, )  # trans
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1634, )  # kitten
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1869, )  # sacm
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1995, )  # acme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1990, )  # tokbind
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1740, )  # ipsecme
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2231, )  # rats
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1965, )  # i2nsf
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1748, )  # oauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2194, )  # teep
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1674, )  # emu
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2220, )  # mls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2211, )  # suit
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1996, )  # dots
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1831, )  # mile
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
+                                
+                ## session for gendispatch ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2252,  # gendispatch
+                    attendees=75,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2017, )  # artarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2161, )  # quic
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2253, )  # abcd
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2258, )  # mathmesh
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2249, )  # lake
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1326, )  # tls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2256, )  # raw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2255, )  # tmrid
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1921, )  # ace
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1714, )  # opsawg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2257, )  # txauth
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1956, )  # anima
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2260, )  # webtrans
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1625, )  # genarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1958, )  # dprive
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2254, )  # wpack
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=18321, )  # Pete Resnick
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=119822, )  # Francesca Palombini
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110077, )  # Alissa Cooper
+                
+                ## session for dtn ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1966,  # dtn
+                    attendees=30,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2256, )  # raw
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1132, )  # manet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=38, )  # nmrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1679, )  # tsvarea
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1463, )  # tsvwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=104294, )  # Magnus Westerlund
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19869, )  # Marc Blanchet
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=117656, )  # Rick Taylor
+                
+                ## session for lake ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2249,  # lake
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1730, )  # roll
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1817, )  # lwig
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2175, )  # cbor
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1789, )  # core
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2148, )  # lpwan
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1903, )  # 6tisch
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=19177, )  # Stephen Farrell
+                
+                ## session for mathmesh ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2258,  # mathmesh
+                    attendees=100,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=2254, )  # wpack
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
+                
+                ## session for qirg ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=2228,  # qirg
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1853, )  # irtfopen
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1187, )  # saag
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=31, )  # cfrg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=125147, )  # Stephanie Wehner
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=110694, )  # Rodney Van Meter
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
+                c.timeranges.set(TimerangeName.objects.filter(slug__in=[
+                    'tuesday-afternoon-early', 'tuesday-afternoon-late', 'wednesday-morning',
+                    'wednesday-afternoon-early', 'wednesday-afternoon-late', 'thursday-morning']))
+                
+                ## session for nvo3 ##
+                s = Session.objects.create(
+                    meeting=m,
+                    type_id="regular",
+                    purpose_id="regular",
+                    group_id=1840,  # nvo3
+                    attendees=50,
+                    agenda_note="",
+                    requested_duration=datetime.timedelta(seconds=3600),  # 1:00:00
+                    comments="""""",
+                    remote_instructions="",
+                )
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1905, )  # spring
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1960, )  # bess
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1619, )  # rtgwg
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[0], target_id=1910, )  # sfc
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id=conflict[1], target_id=1140, )  # mpls
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=108279, )  # Martin Vigoureux
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105786, )  # Matthew Bocci
+                c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=112237, )  # Sam Aldrin
+                
+                ##### TIMESLOTS #####
+                
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-22 12:20:00 length 1:30:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session II", time=self._meeting_datetime(6, 12, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-22 12:00:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(6, 12, 0), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-22 10:00:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(6, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-22 08:30:00 length 1:15:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(6, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
+                ## timeslot 2019-11-22 08:30:00 length 4:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(6, 8, 30), duration=datetime.timedelta(seconds=14400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-22 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(6, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-21 17:40:00 length 1:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(5, 17, 40), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-21 17:20:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(5, 17, 20), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-21 15:50:00 length 1:30:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(5, 15, 50), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-21 15:30:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(5, 15, 30), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-21 13:30:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(5, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-21 12:30:00 length 0:45:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Host Speaker Series", time=self._meeting_datetime(5, 12, 30), duration=datetime.timedelta(seconds=2700), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-21 12:15:00 length 1:00:00 in Skai Suite 1 (Swissotel) size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Systers Lunch", time=self._meeting_datetime(5, 12, 15), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Skai Suite 1 (Swissotel)"), show_location=True)
+                ## timeslot 2019-11-21 12:00:00 length 1:30:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Break", time=self._meeting_datetime(5, 12, 0), duration=datetime.timedelta(seconds=5400), location=None, show_location=False)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-21 10:00:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(5, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-21 09:00:00 length 1:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="NomCom Office Hours", time=self._meeting_datetime(5, 9, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-21 08:30:00 length 1:15:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(5, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
+                ## timeslot 2019-11-21 08:30:00 length 9:30:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(5, 8, 30), duration=datetime.timedelta(seconds=34200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-21 08:00:00 length 1:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Newcomers' Feedback Session", time=self._meeting_datetime(5, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-21 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(5, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-20 17:10:00 length 2:30:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="plenary", name="IETF Plenary", time=self._meeting_datetime(4, 17, 10), duration=datetime.timedelta(seconds=9000), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-20 16:50:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(4, 16, 50), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="unavail", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="unavail", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-20 15:20:00 length 1:30:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(4, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-20 15:00:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(4, 15, 0), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-20 13:30:00 length 1:30:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(4, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-20 12:15:00 length 1:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="WG Chairs Forum (For WG Chairs Only)", time=self._meeting_datetime(4, 12, 15), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-20 12:00:00 length 1:30:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Break", time=self._meeting_datetime(4, 12, 0), duration=datetime.timedelta(seconds=5400), location=None, show_location=False)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-20 10:00:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(4, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-20 09:00:00 length 1:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="NomCom Office Hours", time=self._meeting_datetime(4, 9, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-20 09:00:00 length 0:45:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Routing AD Office Hours", time=self._meeting_datetime(4, 9, 0), duration=datetime.timedelta(seconds=2700), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-20 08:30:00 length 1:15:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(4, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
+                ## timeslot 2019-11-20 08:30:00 length 8:40:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(4, 8, 30), duration=datetime.timedelta(seconds=31200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-20 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(4, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-20 07:30:00 length 2:00:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="lead", name="IAB Breakfast", time=self._meeting_datetime(4, 7, 30), duration=datetime.timedelta(seconds=7200), location=None, show_location=True)
+                ## timeslot 2019-11-19 19:00:00 length 4:00:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="IETF 106 Social Event at the ArtScience Museum Marina Bay Sands - Hosted by Nokia", time=self._meeting_datetime(3, 19, 0), duration=datetime.timedelta(seconds=14400), location=None, show_location=False)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Internet Area AD Office Hours", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-19 17:10:00 length 1:30:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(3, 17, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-19 16:50:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(3, 16, 50), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-19 15:20:00 length 1:30:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(3, 15, 20), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-19 15:00:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(3, 15, 0), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-19 13:30:00 length 1:30:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(3, 13, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-19 12:00:00 length 1:30:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Break", time=self._meeting_datetime(3, 12, 0), duration=datetime.timedelta(seconds=5400), location=None, show_location=False)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-19 10:00:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(3, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-19 09:00:00 length 1:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="NomCom Office Hours", time=self._meeting_datetime(3, 9, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 1:15:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=4500), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-19 08:30:00 length 10:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(3, 8, 30), duration=datetime.timedelta(seconds=36000), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-19 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(3, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-19 07:30:00 length 2:00:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="lead", name="IAB Breakfast", time=self._meeting_datetime(3, 7, 30), duration=datetime.timedelta(seconds=7200), location=None, show_location=True)
+                ## timeslot 2019-11-18 19:30:00 length 1:30:00 in Skai Suite 4 (Swissotel) size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Newcomers' Dinner (Open to Newcomers. Note that pre-registration is required and a $25USD fee will be charged.)", time=self._meeting_datetime(2, 19, 30), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Skai Suite 4 (Swissotel)"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Hackdemo Happy Hour", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=5400), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-18 18:10:00 length 1:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session III", time=self._meeting_datetime(2, 18, 10), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-18 17:50:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(2, 17, 50), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-18 16:50:00 length 1:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="TSV AD Office Hours", time=self._meeting_datetime(2, 16, 50), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-18 15:50:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session II", time=self._meeting_datetime(2, 15, 50), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-18 15:30:00 length 0:20:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage and Snack Break", time=self._meeting_datetime(2, 15, 30), duration=datetime.timedelta(seconds=1200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-18 13:30:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Afternoon Session I", time=self._meeting_datetime(2, 13, 30), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-18 12:00:00 length 1:30:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Break", time=self._meeting_datetime(2, 12, 0), duration=datetime.timedelta(seconds=5400), location=None, show_location=False)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-18 10:00:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Morning Session I", time=self._meeting_datetime(2, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-18 09:00:00 length 1:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="NomCom Office Hours", time=self._meeting_datetime(2, 9, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-18 08:30:00 length 1:15:00 in None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Side Meetings / Open Time", time=self._meeting_datetime(2, 8, 30), duration=datetime.timedelta(seconds=4500), location=None, show_location=False)
+                ## timeslot 2019-11-18 08:30:00 length 10:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(2, 8, 30), duration=datetime.timedelta(seconds=36000), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-18 08:00:00 length 1:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="break", name="Beverage Break", time=self._meeting_datetime(2, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-18 08:00:00 length 1:00:00 in Skai Suite 1 (Swissotel) size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Systers Networking Event", time=self._meeting_datetime(2, 8, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Skai Suite 1 (Swissotel)"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Orchard size: 50 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Orchard"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in VIP A size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP A"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Hullet size: 100 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Hullet"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Collyer size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Collyer"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Padang size: 300 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Padang"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Canning size: 250 ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Canning/Padang size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Canning/Padang"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Stamford & Fairmont Ballroom Foyers size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Stamford & Fairmont Ballroom Foyers"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in VIP B size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="VIP B"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Clark size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Clark"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Mercury/Enterprise size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Mercury/Enterprise"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Minto size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Minto"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Fullerton size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fullerton"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Bonham size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bonham"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Bailey size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bailey"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Ord/Blundell size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Ord/Blundell"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Indiana size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Indiana"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Bras Basah size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Bras Basah"), show_location=True)
+                ## timeslot 2019-11-17 18:00:00 length 2:00:00 in Butterworth size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="regular", name="Hot RFC Lightning Talks", time=self._meeting_datetime(1, 18, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Butterworth"), show_location=True)
+                ## timeslot 2019-11-17 17:00:00 length 2:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Welcome Reception", time=self._meeting_datetime(1, 17, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-17 16:00:00 length 1:00:00 in Fairmont Ballroom Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Newcomers' Quick Connections (Open to Newcomers. Note that pre-registration is required)", time=self._meeting_datetime(1, 16, 0), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Fairmont Ballroom Foyer"), show_location=True)
+                ## timeslot 2019-11-17 13:45:00 length 1:00:00 in Sophia size: 200 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Tutorial: Service Discovery for IP Applications", time=self._meeting_datetime(1, 13, 45), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Sophia"), show_location=True)
+                ## timeslot 2019-11-17 12:30:00 length 1:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Tutorial: Newcomers' Overview", time=self._meeting_datetime(1, 12, 30), duration=datetime.timedelta(seconds=3600), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-17 10:00:00 length 2:00:00 in Olivia size: 150 ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="IEPG Meeting", time=self._meeting_datetime(1, 10, 0), duration=datetime.timedelta(seconds=7200), location=Room.objects.get(meeting=m, name="Olivia"), show_location=True)
+                ## timeslot 2019-11-17 10:00:00 length 8:00:00 in Convention Foyer size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="reg", name="IETF Registration", time=self._meeting_datetime(1, 10, 0), duration=datetime.timedelta(seconds=28800), location=Room.objects.get(meeting=m, name="Convention Foyer"), show_location=True)
+                ## timeslot 2019-11-17 08:30:00 length 7:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="IETF Hackathon", time=self._meeting_datetime(1, 8, 30), duration=datetime.timedelta(seconds=27000), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                ## timeslot 2019-11-16 09:30:00 length 8:30:00 in Ord size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="Code Sprint", time=self._meeting_datetime(0, 9, 30), duration=datetime.timedelta(seconds=30600), location=Room.objects.get(meeting=m, name="Ord"), show_location=True)
+                ## timeslot 2019-11-16 08:30:00 length 13:30:00 in Moor/Morrison size: None ##
+                TimeSlot.objects.create(meeting=m, type_id="other", name="IETF Hackathon", time=self._meeting_datetime(0, 8, 30), duration=datetime.timedelta(seconds=48600), location=Room.objects.get(meeting=m, name="Moor/Morrison"), show_location=True)
+                
+                for s in m.session_set.all():
+                    SchedulingEvent.objects.create(session=s, status_id='schedw', by_id=1)
+                
+                transaction.commit()
+                self.stdout.write("IETF 999 created.\n")
+
diff --git a/ietf/meeting/management/commands/generate_schedule.py b/ietf/meeting/management/commands/generate_schedule.py
index ade11ef08c..c9279fb251 100644
--- a/ietf/meeting/management/commands/generate_schedule.py
+++ b/ietf/meeting/management/commands/generate_schedule.py
@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2021, All Rights Reserved
 # For an overview of this process and context, see:
-# https://trac.ietf.org/trac/ietfdb/wiki/MeetingConstraints
+# https://github.com/ietf-tools/datatracker/wiki/MeetingConstraints
 from __future__ import absolute_import, print_function, unicode_literals
 
 import calendar
@@ -14,6 +14,7 @@
 from collections import defaultdict
 from functools import lru_cache
 from typing import NamedTuple, Optional
+from warnings import warn
 
 from django.contrib.humanize.templatetags.humanize import intcomma
 from django.core.management.base import BaseCommand, CommandError
@@ -24,6 +25,8 @@
 from ietf.person.models import Person
 from ietf.meeting import models
 from ietf.meeting.helpers import get_person_by_email
+from ietf.name.models import SessionPurposeName
+
 
 # 40 runs of the optimiser for IETF 106 with cycles=160 resulted in 16
 # zero-violation invocations, with a mean number of runs of 91 and 
@@ -71,18 +74,31 @@ def add_arguments(self, parser):
                                 'Base schedule for generated schedule, specified as "[owner/]name"'
                                 ' (default is no base schedule; owner not required if name is unique)'
                             ))
+        parser.add_argument('-p', '--purpose',
+                            dest='purposes',
+                            action='append',
+                            choices=[
+                                spn.slug for spn in SessionPurposeName.objects.all()
+                                if 'regular' in spn.timeslot_types  # scheduler only works with "regular" timeslots
+                            ],
+                            default=None,
+                            help=(
+                                'Limit scheduling to specified purpose '
+                                '(use option multiple times to specify more than one purpose; default is all purposes)'
+                            ))
 
-    def handle(self, meeting, name, max_cycles, verbosity, base_id, *args, **kwargs):
-        ScheduleHandler(self.stdout, meeting, name, max_cycles, verbosity, base_id).run()
+    def handle(self, meeting, name, max_cycles, verbosity, base_id, purposes, *args, **kwargs):
+        ScheduleHandler(self.stdout, meeting, name, max_cycles, verbosity, base_id, purposes).run()
 
 
 class ScheduleHandler(object):
     def __init__(self, stdout, meeting_number, name=None, max_cycles=OPTIMISER_MAX_CYCLES,
-                 verbosity=1, base_id=None):
+                 verbosity=1, base_id=None, session_purposes=None):
         self.stdout = stdout
         self.verbosity = verbosity
         self.name = name
         self.max_cycles = max_cycles
+        self.session_purposes = session_purposes
         if meeting_number:
             try:
                 self.meeting = models.Meeting.objects.get(type="ietf", number=meeting_number)
@@ -113,6 +129,10 @@ def __init__(self, stdout, meeting_number, name=None, max_cycles=OPTIMISER_MAX_C
                 msgs.append('Applying schedule {} as base schedule'.format(ScheduleId.from_schedule(self.base_schedule)))
             self.stdout.write('\n{}\n\n'.format('\n'.join(msgs)))
         self._load_meeting()
+        if len(self.schedule.sessions) == 0:
+            raise CommandError('No sessions found to schedule')
+        if len(self.schedule.timeslots) == 0:
+            raise CommandError('No timeslots found for schedule')
 
     def run(self):
         """Schedule all sessions"""
@@ -170,9 +190,7 @@ def _available_timeslots(self):
           * sunday timeslots
           *  timeslots used by the base schedule, if any
         """
-        # n.b., models.TimeSlot is not the same as TimeSlot!
-        timeslots_db = models.TimeSlot.objects.filter(
-            meeting=self.meeting,
+        timeslots_db = self.meeting.timeslot_set.that_can_be_scheduled().filter(
             type_id='regular',
         ).exclude(
             location__capacity=None,
@@ -183,10 +201,9 @@ def _available_timeslots(self):
         else:
             fixed_timeslots = timeslots_db.filter(pk__in=self.base_schedule.qs_timeslots_in_use())
         free_timeslots = timeslots_db.exclude(pk__in=fixed_timeslots)
-
-        timeslots = {TimeSlot(t, self.verbosity) for t in free_timeslots.select_related('location')}
+        timeslots = {DatatrackerTimeSlot(t, verbosity=self.verbosity) for t in free_timeslots.select_related('location')}
         timeslots.update(
-            TimeSlot(t, self.verbosity, is_fixed=True) for t in fixed_timeslots.select_related('location')
+            DatatrackerTimeSlot(t, verbosity=self.verbosity, is_fixed=True) for t in fixed_timeslots.select_related('location')
         )
         return {t for t in timeslots if t.day != 'sunday'}
 
@@ -195,12 +212,9 @@ def _sessions_to_schedule(self, *args, **kwargs):
 
         Extra arguments are passed to the Session constructor.
         """
-        sessions_db = models.Session.objects.filter(
-            meeting=self.meeting,
-            type_id='regular',
-            schedulingevent__status_id='schedw',
-        )
-
+        sessions_db = self.meeting.session_set.that_can_be_scheduled().filter(type_id='regular')
+        if self.session_purposes is not None:
+            sessions_db = sessions_db.filter(purpose__slug__in=self.session_purposes)
         if self.base_schedule is None:
             fixed_sessions = models.Session.objects.none()
         else:
@@ -225,16 +239,18 @@ def _load_meeting(self):
             for bc in models.BusinessConstraint.objects.all()
         }
 
-        timeslots = self._available_timeslots()
-        for timeslot in timeslots:
-            timeslot.store_relations(timeslots)
-
         sessions = self._sessions_to_schedule(business_constraint_costs, self.verbosity)
         for session in sessions:
             # The complexity of a session also depends on how many
             # sessions have declared a conflict towards this session.
             session.update_complexity(sessions)
 
+        timeslots = self._available_timeslots()
+        for _ in range(len(sessions) - len(timeslots)):
+            timeslots.add(GeneratorTimeSlot(verbosity=self.verbosity))
+        for timeslot in timeslots:
+            timeslot.store_relations(timeslots)
+
         self.schedule = Schedule(
             self.stdout,
             timeslots,
@@ -270,9 +286,9 @@ def __init__(self, stdout, timeslots, sessions, business_constraint_costs,
 
     def __str__(self):
         return 'Schedule ({} timeslots, {} sessions, {} scheduled, {} in base schedule)'.format(
-            len(self.timeslots),
+            sum(1 for ts in self.timeslots if ts.is_scheduled),
             len(self.sessions),
-            len(self.schedule),
+            sum(1 for ts in self.schedule if ts.is_scheduled),
             len(self.base_schedule) if self.base_schedule else 0,
         )
 
@@ -280,9 +296,13 @@ def pretty_print(self, include_base=True):
         """Pretty print the schedule"""
         last_day = None
         sched = dict(self.schedule)
-        if include_base:
+        if include_base and self.base_schedule is not None:
             sched.update(self.base_schedule)
-        for slot in sorted(sched, key=lambda ts: ts.start):
+        timeslots = {'scheduled': [], 'unscheduled': []}
+        for ts in self.timeslots:
+            timeslots['scheduled' if ts.is_scheduled else 'unscheduled'].append(ts)
+
+        for slot in sorted(timeslots['scheduled'], key=lambda ts: ts.start):
             if last_day != slot.start.date():
                 last_day = slot.start.date()
                 print("""
@@ -293,9 +313,16 @@ def pretty_print(self, include_base=True):
             print('{}: {}{}'.format(
                 models.TimeSlot.objects.get(pk=slot.timeslot_pk),
                 models.Session.objects.get(pk=sched[slot].session_pk),
-                ' [BASE]' if slot in self.base_schedule else '',
+                ' [BASE]' if self.base_schedule and slot in self.base_schedule else '',
             ))
 
+        print("""
+-----------------
+ Unscheduled
+-----------------""")
+        for slot in timeslots['unscheduled']:
+            print(' * {}'.format(models.Session.objects.get(pk=sched[slot].session_pk)))
+
     @property
     def fixed_cost(self):
         return sum(self._fixed_costs.values())
@@ -328,12 +355,13 @@ def _load_base_schedule(self, db_base_schedule):
 
     def save_assignments(self, schedule_db):
         for timeslot, session in self.schedule.items():
-            models.SchedTimeSessAssignment.objects.create(
-                timeslot_id=timeslot.timeslot_pk,
-                session_id=session.session_pk,
-                schedule=schedule_db,
-                badness=session.last_cost,
-            )
+            if timeslot.is_scheduled:
+                models.SchedTimeSessAssignment.objects.create(
+                    timeslot_id=timeslot.timeslot_pk,
+                    session_id=session.session_pk,
+                    schedule=schedule_db,
+                    badness=session.last_cost,
+                )
     
     def adjust_for_timeslot_availability(self):
         """
@@ -352,9 +380,15 @@ def adjust_for_timeslot_availability(self):
                                .format(num_to_schedule, num_free_timeslots))
     
         def make_capacity_adjustments(t_attr, s_attr):
-            availables = [getattr(timeslot, t_attr) for timeslot in self.free_timeslots]
+            availables = [getattr(timeslot, t_attr) for timeslot in self.free_timeslots if timeslot.is_scheduled]
             availables.sort()
             sessions = sorted(self.free_sessions, key=lambda s: getattr(s, s_attr), reverse=True)
+            # If we have timeslots with is_scheduled == False, len(availables) may be < len(sessions).
+            # Add duplicates of the largest capacity timeslot to make up the difference. This will
+            # still report violations where there is *no* timeslot available that accommodates a session
+            # but will not check that there are *enough* timeslots for the number of long sessions.
+            n_unscheduled = len(sessions) - len(availables)
+            availables.extend([availables[-1]] * n_unscheduled)  # availables is sorted, so [-1] is max
             violations, cost = [], 0
             for session in sessions:
                 found_fit = False
@@ -446,9 +480,16 @@ def fill_initial_schedule(self):
         For initial scheduling, it is not a hard requirement that the timeslot is long
         or large enough, though that will be preferred due to the lower cost.
         """
+        n_free_sessions = len(list(self.free_sessions))
+        n_free_scheduled_slots = sum(1 for sl in self.free_timeslots if sl.is_scheduled)
         if self.verbosity >= 2:
-            self.stdout.write('== Initial scheduler starting, scheduling {} sessions in {} timeslots =='
-                              .format(len(list(self.free_sessions)), len(list(self.free_timeslots))))
+            self.stdout.write(
+                f'== Initial scheduler starting, scheduling {n_free_sessions} sessions in {n_free_scheduled_slots} timeslots =='
+            )
+        if self.verbosity >= 1 and n_free_sessions > n_free_scheduled_slots:
+            self.stdout.write(
+                f'WARNING: fewer timeslots ({n_free_scheduled_slots}) than sessions ({n_free_sessions}). Some sessions will not be scheduled.'
+            )
         sessions = sorted(self.free_sessions, key=lambda s: s.complexity, reverse=True)
 
         for session in sessions:
@@ -458,14 +499,20 @@ def fill_initial_schedule(self):
             def timeslot_preference(t):
                 proposed_schedule = self.schedule.copy()
                 proposed_schedule[t] = session
-                return self.calculate_dynamic_cost(proposed_schedule)[1], t.duration, t.capacity
-
+                return (
+                    self.calculate_dynamic_cost(proposed_schedule)[1],
+                    t.duration if t.is_scheduled else datetime.timedelta(hours=1000),  # unscheduled slots sort to the end
+                    t.capacity if t.is_scheduled else math.inf,  # unscheduled slots sort to the end
+                )
             possible_slots.sort(key=timeslot_preference)
             self._schedule_session(session, possible_slots[0])
             if self.verbosity >= 3:
-                self.stdout.write('Scheduled {} at {} in location {}'
-                                  .format(session.group, possible_slots[0].start,
-                                          possible_slots[0].location_pk))
+                if possible_slots[0].is_scheduled:
+                    self.stdout.write('Scheduled {} at {} in location {}'
+                                      .format(session.group, possible_slots[0].start,
+                                              possible_slots[0].location_pk))
+                else:
+                    self.stdout.write('Scheduled {} in unscheduled slot')
 
     def optimise_schedule(self):
         """
@@ -487,9 +534,10 @@ def optimise_schedule(self):
         best_cost = math.inf
         shuffle_next_run = False
         last_run_cost = None
-        switched_with = None
-        
-        for run_count in range(1, self.max_cycles+1):
+        run_count = 0
+
+        for _ in range(self.max_cycles):
+            run_count += 1
             items = list(self.schedule.items())
             random.shuffle(items)
 
@@ -585,7 +633,7 @@ def optimise_timeslot_capacity(self):
         """
         optimised_timeslots = set()
         for timeslot in list(self.schedule.keys()):
-            if timeslot in optimised_timeslots or timeslot.is_fixed:
+            if timeslot in optimised_timeslots or timeslot.is_fixed or not timeslot.is_scheduled:
                 continue
             timeslot_overlaps = sorted(timeslot.full_overlaps, key=lambda t: t.capacity, reverse=True)
             sessions_overlaps = [self.schedule.get(t) for t in timeslot_overlaps]
@@ -629,7 +677,7 @@ def _cost_for_switch(self, timeslot1, timeslot2):
             del proposed_schedule[timeslot1]
         return self.calculate_dynamic_cost(proposed_schedule)[1]
 
-    def _switch_sessions(self, timeslot1, timeslot2):
+    def _switch_sessions(self, timeslot1, timeslot2) -> Optional['Session']:
         """
         Switch the sessions currently in timeslot1 and timeslot2.
         If timeslot2 had a session scheduled, returns that Session instance.
@@ -637,11 +685,11 @@ def _switch_sessions(self, timeslot1, timeslot2):
         session1 = self.schedule.get(timeslot1)
         session2 = self.schedule.get(timeslot2)
         if timeslot1 == timeslot2:
-            return False
+            return None
         if session1 and not session1.fits_in_timeslot(timeslot2):
-            return False
+            return None
         if session2 and not session2.fits_in_timeslot(timeslot1):
-            return False
+            return None
         if session1:
             self.schedule[timeslot2] = session1
         elif session2:
@@ -658,15 +706,43 @@ def _save(self, cost):
             self.best_schedule = self.schedule.copy()
 
 
-class TimeSlot(object):
-    """
-    This TimeSlot class is analogous to the TimeSlot class in the models,
-    i.e. it represents a timeframe in a particular location.
-    """
-    def __init__(self, timeslot_db, verbosity, is_fixed=False):
+class GeneratorTimeSlot:
+    """Representation of a timeslot for the schedule generator"""
+    def __init__(self, *, verbosity=0, is_fixed=False):
         """Initialise this object from a TimeSlot model instance."""
         self.verbosity = verbosity
         self.is_fixed = is_fixed
+        self.overlaps = set()
+        self.full_overlaps = set()
+        self.adjacent = set()
+        self.start = None
+        self.day = None
+        self.time_group = 'Unscheduled'
+
+    @property
+    def is_scheduled(self):
+        """Will this timeslot appear on a schedule?"""
+        return self.start is not None
+
+    def store_relations(self, other_timeslots):
+        pass  # no relations
+
+    def has_space_for(self, attendees):
+        return True  # unscheduled time slots can support any number of attendees
+
+    def has_time_for(self, duration):
+        return True  # unscheduled time slots are long enough for any session
+
+
+class DatatrackerTimeSlot(GeneratorTimeSlot):
+    """TimeSlot on the schedule
+
+    This DatatrackerTimeSlot class is analogous to the TimeSlot class in the models,
+    i.e. it represents a timeframe in a particular location.
+    """
+    def __init__(self, timeslot_db, **kwargs):
+        """Initialise this object from a TimeSlot model instance."""
+        super().__init__(**kwargs)
         self.timeslot_pk = timeslot_db.pk
         self.location_pk = timeslot_db.location.pk
         self.capacity = timeslot_db.location.capacity
@@ -675,33 +751,38 @@ def __init__(self, timeslot_db, verbosity, is_fixed=False):
         self.end = self.start + self.duration
         self.day = calendar.day_name[self.start.weekday()].lower()
         if self.start.time() < datetime.time(12, 30):
-            self.time_of_day = 'morning'
+            time_of_day = 'morning'
         elif self.start.time() < datetime.time(15, 30):
-            self.time_of_day = 'afternoon-early'
+            time_of_day = 'afternoon-early'
         else:
-            self.time_of_day = 'afternoon-late'
-        self.time_group = self.day + '-' + self.time_of_day
-        self.overlaps = set()
-        self.full_overlaps = set()
-        self.adjacent = set()
+            time_of_day = 'afternoon-late'
+        self.time_group = f'{self.day}-{time_of_day}'
+
+    def has_space_for(self, attendees):
+        return self.capacity >= attendees
+
+    def has_time_for(self, duration):
+        return self.duration >= duration
 
     def store_relations(self, other_timeslots):
         """
         Store relations to all other timeslots. This should be called
-        after all TimeSlot objects have been created. This allows fast
-        lookups of which TimeSlot objects overlap or are adjacent.
+        after all DatatrackerTimeSlot objects have been created. This allows fast
+        lookups of which DatatrackerTimeSlot objects overlap or are adjacent.
         Note that there is a distinction between an overlap, meaning
         at least part of the timeslots occur during the same time,
         and a full overlap, meaning the start and end time are identical.
         """
         for other in other_timeslots:
+            if other == self or not other.is_scheduled:
+                continue  # no relations with self or unscheduled sessions
             if any([
                 self.start < other.start < self.end,
                 self.start < other.end < self.end,
                 self.start >= other.start and self.end <= other.end,
-            ]) and other != self:
+            ]):
                 self.overlaps.add(other)
-            if self.start == other.start and self.end == other.end and other != self:
+            if self.start == other.start and self.end == other.end:
                 self.full_overlaps.add(other)
             if (
                 abs(self.start - other.end) <= datetime.timedelta(minutes=30) or
@@ -712,7 +793,7 @@ def store_relations(self, other_timeslots):
 
 class Session(object):
     """
-    This TimeSlot class is analogous to the Session class in the models,
+    This Session class is analogous to the Session class in the models,
     i.e. it represents a single session to be scheduled. It also pulls
     in data about constraints, group parents, etc.
     """
@@ -810,7 +891,7 @@ def update_complexity(self, other_sessions):
             ])
 
     def fits_in_timeslot(self, timeslot):
-        return self.attendees <= timeslot.capacity and self.requested_duration <= timeslot.duration
+        return timeslot.has_space_for(self.attendees) and timeslot.has_time_for(self.requested_duration)
 
     def calculate_cost(self, schedule, my_timeslot, overlapping_sessions, my_sessions, include_fixed=False):
         """
@@ -820,7 +901,7 @@ def calculate_cost(self, schedule, my_timeslot, overlapping_sessions, my_session
         The functionality is split into a few methods, to optimise caching.
         
         overlapping_sessions is a list of Session objects
-        my_sessions is an iterable of tuples, each tuple containing a TimeSlot and a Session
+        my_sessions is an iterable of tuples, each tuple containing a GeneratorTimeSlot and a Session
 
         The return value is a tuple of violations (list of strings) and a cost (integer).        
         """
@@ -832,11 +913,11 @@ def calculate_cost(self, schedule, my_timeslot, overlapping_sessions, my_session
         )
 
         if include_fixed or (not self.is_fixed):
-            if self.attendees > my_timeslot.capacity:
+            if not my_timeslot.has_space_for(self.attendees):
                 violations.append('{}: scheduled in too small room'.format(self.group))
                 cost += self.business_constraint_costs['session_requires_trim']
 
-            if self.requested_duration > my_timeslot.duration:
+            if not my_timeslot.has_time_for(self.requested_duration):
                 violations.append('{}: scheduled in too short timeslot'.format(self.group))
                 cost += self.business_constraint_costs['session_requires_trim']
 
@@ -937,7 +1018,7 @@ def _calculate_cost_business_logic(self, overlapping_sessions):
     def _calculate_cost_my_other_sessions(self, my_sessions):
         """Calculate cost due to other sessions for same group
 
-        my_sessions is a set of (TimeSlot, Session) tuples.
+        my_sessions is a set of (GeneratorTimeSlot, Session) tuples.
         """
         def sort_sessions(timeslot_session_pairs):
             return sorted(timeslot_session_pairs, key=lambda item: item[1].session_pk)
@@ -953,9 +1034,18 @@ def sort_sessions(timeslot_session_pairs):
                 cost += self.business_constraint_costs['sessions_out_of_order']
                 
             if self.time_relation:
-                group_days = [t.start.date() for t, s in my_sessions]
-                # ignore conflict between two fixed sessions
-                if not (my_sessions[0][1].is_fixed and my_sessions[1][1].is_fixed):
+                if len(my_sessions) != 2:
+                    # This is not expected to happen. Alert the user if it comes up but proceed -
+                    # the violation scoring may be incorrect but the scheduler won't fail because of this.
+                    warn('"time relation" constraint only makes sense for 2 sessions but {} has {}'
+                         .format(self.group, len(my_sessions)))
+
+                if all(session.is_fixed for _, session in my_sessions):
+                    pass  # ignore conflict between fixed sessions
+                elif not all(timeslot.is_scheduled for timeslot, _ in my_sessions):
+                    pass  # ignore constraint if one or both sessions is unscheduled
+                else:
+                    group_days = [timeslot.start.date() for timeslot, _ in my_sessions]
                     difference_days = abs((group_days[1] - group_days[0]).days)
                     if self.time_relation == 'subsequent-days' and difference_days != 1:
                         violations.append('{}: has time relation subsequent-days but difference is {}'
diff --git a/ietf/meeting/management/commands/meetecho_conferences.py b/ietf/meeting/management/commands/meetecho_conferences.py
index e6525d7dc0..8a7eb0ebc0 100644
--- a/ietf/meeting/management/commands/meetecho_conferences.py
+++ b/ietf/meeting/management/commands/meetecho_conferences.py
@@ -1,7 +1,5 @@
 # Copyright The IETF Trust 2022, All Rights Reserved
 # -*- coding: utf-8 -*-
-import datetime
-
 from textwrap import dedent
 
 from django.conf import settings
@@ -9,6 +7,7 @@
 
 from ietf.meeting.models import Session
 from ietf.utils.meetecho import ConferenceManager, MeetechoAPIError
+from ietf.utils.timezone import date_today
 
 
 class Command(BaseCommand):
@@ -85,7 +84,7 @@ def fetch_conferences(self, conf_mgr, group):
         for conf in confs:
             conf_sessions[conf.id] = Session.objects.filter(
                 group__acronym=group,
-                meeting__date__gte=datetime.date.today(),
+                meeting__date__gte=date_today(),
                 remote_instructions__contains=conf.url,
             )
         return confs, conf_sessions
diff --git a/ietf/meeting/management/commands/populate_attended.py b/ietf/meeting/management/commands/populate_attended.py
deleted file mode 100644
index 5c2c801db8..0000000000
--- a/ietf/meeting/management/commands/populate_attended.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
-
-import debug # pyflakes: ignore
-
-from tqdm import tqdm
-
-from django.core.management.base import BaseCommand
-
-from ietf.meeting.models import Session
-from ietf.meeting.utils import sort_sessions
-from ietf.person.models import Person, Email
-
-import json
-
-class Command(BaseCommand):
-
-    help = 'Populates the meeting Attended table based on bluesheets and registration information'
-
-    def add_arguments(self, parser):
-        parser.add_argument('filename', nargs='+', type=str)
-
-    def handle(self, *args, **options):
-
-        issues = []
-        session_cache = dict()
-        skipped = 0
-        for filename in options['filename']:
-            records = json.loads(open(filename,'r').read())
-            for record in tqdm(records):
-                user = record['sub']
-                session_acronym = record['group']
-                meeting_number = record['meeting']
-                email = record['email']
-                # In the expected dumps from MeetEcho, if there was only one session for group foo, it would just be named 'foo'.
-                # If there were _three_, we would see 'foo' for the first, 'foo_2' for the second, and 'foo_3' for the third.
-                # order below is the index into what is returned from sort_sessions -- 0 is the first session for a group at that meeting.
-                # There is brutal fixup below for older meetings where we had special arrangements where meetecho reported the non-existant
-                # group of 'plenary', mapping it into the appropriate 'ietf' group session.
-                # A bug in the export scripts at MeetEcho trimmed the '-t' from 'model-t'.
-                order = 0
-                if session_acronym in ['anrw_test', 'demoanrw', 'hostspeaker']:
-                    skipped = skipped + 1
-                    continue
-                if session_acronym=='model':
-                    session_acronym='model-t'
-                if '_' in session_acronym:
-                    session_acronym, order = session_acronym.split('_')
-                    order = int(order)-1
-                if session_acronym == 'plenary':
-                    session_acronym = 'ietf'
-                    if meeting_number == '111':
-                        order = 4
-                    elif meeting_number == '110':
-                        order = 3
-                    elif meeting_number == '109':
-                        order = 6
-                    elif meeting_number == '108':
-                        order = 13
-                if session_acronym == 'ietf':
-                    if meeting_number == '112':
-                        order = 2
-                    elif meeting_number == '113':
-                        order = 2
-                if not (meeting_number, session_acronym) in session_cache:
-                    session_cache[(meeting_number, session_acronym)] = sort_sessions([s for s in Session.objects.filter(meeting__number=meeting_number,group__acronym=session_acronym) if s.official_timeslotassignment()])
-                sessions = session_cache[(meeting_number, session_acronym)]
-                try:
-                    session = sessions[order]
-                except IndexError:
-                    issues.append(('session not found',record))
-                    continue
-                person = None
-                email = Email.objects.filter(address=email).first()
-                if email:
-                    person = email.person
-                else:
-                    person = Person.objects.filter(user__pk=user).first()
-                if not person:
-                    issues.append(('person not found',record))
-                    continue
-                obj, created = session.attended_set.get_or_create(person=person)
-        for issue in issues:
-            print(issue)
-        print(f'{len(issues)} issues encountered')
-        print(f'{skipped} records intentionally skipped')
diff --git a/ietf/meeting/management/commands/update_important_dates.py b/ietf/meeting/management/commands/update_important_dates.py
index c1a6ad4247..9a06e850af 100644
--- a/ietf/meeting/management/commands/update_important_dates.py
+++ b/ietf/meeting/management/commands/update_important_dates.py
@@ -11,6 +11,8 @@
 from ietf.name.models import ImportantDateName
 from ietf.meeting.helpers import update_important_dates
 from ietf.meeting.models import Meeting, ImportantDate
+from ietf.utils.timezone import date_today
+
 
 class Command(BaseCommand):
 
@@ -29,7 +31,7 @@ def handle(self, *args, **options):
             if not meeting:
                 self.stderr.write("\nMeeting not found: %s\n" % (m, ))
                 continue
-            if meeting.date < datetime.date.today() + datetime.timedelta(days=max_offset):
+            if meeting.date < date_today(meeting.tz()) + datetime.timedelta(days=max_offset):
                 self.stderr.write("\nMeeting %s: Won't change dates for meetings in the past or close future\n" % (meeting, ))
                 continue
             self.stdout.write('\n%s\n\n' % (meeting, ))
diff --git a/ietf/meeting/migrations/0001_initial.py b/ietf/meeting/migrations/0001_initial.py
index 668fd0392a..d98c5619d3 100644
--- a/ietf/meeting/migrations/0001_initial.py
+++ b/ietf/meeting/migrations/0001_initial.py
@@ -1,15 +1,15 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
 import datetime
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
 import ietf.meeting.models
+import ietf.utils.fields
 import ietf.utils.models
 import ietf.utils.storage
+import ietf.utils.validators
 
 
 class Migration(migrations.Migration):
@@ -17,19 +17,20 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('group', '0001_initial'),
-        ('name', '0001_initial'),
         ('dbtemplate', '0001_initial'),
+        ('name', '0001_initial'),
         ('person', '0001_initial'),
+        ('group', '0001_initial'),
         ('doc', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Constraint',
+            name='BusinessConstraint',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('day', models.DateTimeField(blank=True, null=True)),
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('penalty', models.IntegerField(default=0, help_text='The penalty for violating this kind of constraint; for instance 10 (small penalty) or 10000 (large penalty)')),
             ],
         ),
         migrations.CreateModel(
@@ -37,20 +38,13 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=255)),
-                ('short', models.CharField(default='', max_length=2)),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('short', models.CharField(default='', max_length=3)),
+                ('modified', models.DateTimeField(auto_now=True)),
                 ('order', models.SmallIntegerField()),
                 ('image', models.ImageField(blank=True, default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=ietf.meeting.models.floorplan_path)),
             ],
-        ),
-        migrations.CreateModel(
-            name='ImportantDate',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('date', models.DateField()),
-            ],
             options={
-                'ordering': ['-meeting', 'date'],
+                'ordering': ['-id'],
             },
         ),
         migrations.CreateModel(
@@ -61,12 +55,12 @@ class Migration(migrations.Migration):
                 ('date', models.DateField()),
                 ('days', models.IntegerField(default=7, help_text='The number of days the meeting lasts', validators=[django.core.validators.MinValueValidator(1)])),
                 ('city', models.CharField(blank=True, max_length=255)),
-                ('country', models.CharField(blank=True, choices=[('', ''), ('AF', 'Afghanistan'), ('AL', 'Albania'), ('DZ', 'Algeria'), ('AD', 'Andorra'), ('AO', 'Angola'), ('AI', 'Anguilla'), ('AQ', 'Antarctica'), ('AG', 'Antigua & Barbuda'), ('AR', 'Argentina'), ('AM', 'Armenia'), ('AW', 'Aruba'), ('AU', 'Australia'), ('AT', 'Austria'), ('AZ', 'Azerbaijan'), ('BS', 'Bahamas'), ('BH', 'Bahrain'), ('BD', 'Bangladesh'), ('B', 'Barbados'), ('BY', 'Belarus'), ('BE', 'Belgium'), ('BZ', 'Belize'), ('BJ', 'Benin'), ('BM', 'Bermuda'), ('BT', 'Bhutan'), ('BO', 'Bolivia'), ('BA', 'Bosnia & Herzegovina'), ('BW', 'Botswana'), ('BV', 'Bouvet Island'), ('BR', 'Brazil'), ('G', 'Britain (UK)'), ('IO', 'British Indian Ocean Territory'), ('BN', 'Brunei'), ('BG', 'Bulgaria'), ('BF', 'Burkina Faso'), ('BI', 'Burundi'), ('KH', 'Cambodia'), ('CM', 'Cameroon'), ('CA', 'Canada'), ('CV', 'Cape Verde'), ('BQ', 'Caribbean NL'), ('KY', 'Cayman Islands'), ('CF', 'Central African Rep.'), ('TD', 'Chad'), ('CL', 'Chile'), ('CN', 'China'), ('CX', 'Christmas Island'), ('CC', 'Cocos (Keeling) Islands'), ('CO', 'Colombia'), ('KM', 'Comoros'), ('CD', 'Congo (Dem. Rep.)'), ('CG', 'Congo (Rep.)'), ('CK', 'Cook Islands'), ('CR', 'Costa Rica'), ('HR', 'Croatia'), ('CU', 'Cuba'), ('CW', 'Cura\xe7ao'), ('CY', 'Cyprus'), ('CZ', 'Czech Republic'), ('CI', "C\xf4te d'Ivoire"), ('DK', 'Denmark'), ('DJ', 'Djibouti'), ('DM', 'Dominica'), ('DO', 'Dominican Republic'), ('TL', 'East Timor'), ('EC', 'Ecuador'), ('EG', 'Egypt'), ('SV', 'El Salvador'), ('GQ', 'Equatorial Guinea'), ('ER', 'Eritrea'), ('EE', 'Estonia'), ('ET', 'Ethiopia'), ('FK', 'Falkland Islands'), ('FO', 'Faroe Islands'), ('FJ', 'Fiji'), ('FI', 'Finland'), ('FR', 'France'), ('GF', 'French Guiana'), ('PF', 'French Polynesia'), ('TF', 'French Southern & Antarctic Lands'), ('GA', 'Gabon'), ('GM', 'Gambia'), ('GE', 'Georgia'), ('DE', 'Germany'), ('GH', 'Ghana'), ('GI', 'Gibraltar'), ('GR', 'Greece'), ('GL', 'Greenland'), ('GD', 'Grenada'), ('GP', 'Guadeloupe'), ('GU', 'Guam'), ('GT', 'Guatemala'), ('GG', 'Guernsey'), ('GN', 'Guinea'), ('GW', 'Guinea-Bissau'), ('GY', 'Guyana'), ('HT', 'Haiti'), ('HM', 'Heard Island & McDonald Islands'), ('HN', 'Honduras'), ('HK', 'Hong Kong'), ('HU', 'Hungary'), ('IS', 'Iceland'), ('IN', 'India'), ('ID', 'Indonesia'), ('IR', 'Iran'), ('IQ', 'Iraq'), ('IE', 'Ireland'), ('IM', 'Isle of Man'), ('IL', 'Israel'), ('IT', 'Italy'), ('JM', 'Jamaica'), ('JP', 'Japan'), ('JE', 'Jersey'), ('JO', 'Jordan'), ('KZ', 'Kazakhstan'), ('KE', 'Kenya'), ('KI', 'Kiribati'), ('KP', 'Korea (North)'), ('KR', 'Korea (South)'), ('KW', 'Kuwait'), ('KG', 'Kyrgyzstan'), ('LA', 'Laos'), ('LV', 'Latvia'), ('L', 'Lebanon'), ('LS', 'Lesotho'), ('LR', 'Liberia'), ('LY', 'Libya'), ('LI', 'Liechtenstein'), ('LT', 'Lithuania'), ('LU', 'Luxembourg'), ('MO', 'Macau'), ('MK', 'Macedonia'), ('MG', 'Madagascar'), ('MW', 'Malawi'), ('MY', 'Malaysia'), ('MV', 'Maldives'), ('ML', 'Mali'), ('MT', 'Malta'), ('MH', 'Marshall Islands'), ('MQ', 'Martinique'), ('MR', 'Mauritania'), ('MU', 'Mauritius'), ('YT', 'Mayotte'), ('MX', 'Mexico'), ('FM', 'Micronesia'), ('MD', 'Moldova'), ('MC', 'Monaco'), ('MN', 'Mongolia'), ('ME', 'Montenegro'), ('MS', 'Montserrat'), ('MA', 'Morocco'), ('MZ', 'Mozambique'), ('MM', 'Myanmar (Burma)'), ('NA', 'Namibia'), ('NR', 'Nauru'), ('NP', 'Nepal'), ('NL', 'Netherlands'), ('NC', 'New Caledonia'), ('NZ', 'New Zealand'), ('NI', 'Nicaragua'), ('NE', 'Niger'), ('NG', 'Nigeria'), ('NU', 'Niue'), ('NF', 'Norfolk Island'), ('MP', 'Northern Mariana Islands'), ('NO', 'Norway'), ('OM', 'Oman'), ('PK', 'Pakistan'), ('PW', 'Palau'), ('PS', 'Palestine'), ('PA', 'Panama'), ('PG', 'Papua New Guinea'), ('PY', 'Paraguay'), ('PE', 'Peru'), ('PH', 'Philippines'), ('PN', 'Pitcairn'), ('PL', 'Poland'), ('PT', 'Portugal'), ('PR', 'Puerto Rico'), ('QA', 'Qatar'), ('RO', 'Romania'), ('RU', 'Russia'), ('RW', 'Rwanda'), ('RE', 'R\xe9union'), ('AS', 'Samoa (American)'), ('WS', 'Samoa (western)'), ('SM', 'San Marino'), ('ST', 'Sao Tome & Principe'), ('SA', 'Saudi Arabia'), ('SN', 'Senegal'), ('RS', 'Serbia'), ('SC', 'Seychelles'), ('SL', 'Sierra Leone'), ('SG', 'Singapore'), ('SK', 'Slovakia'), ('SI', 'Slovenia'), ('S', 'Solomon Islands'), ('SO', 'Somalia'), ('ZA', 'South Africa'), ('GS', 'South Georgia & the South Sandwich Islands'), ('SS', 'South Sudan'), ('ES', 'Spain'), ('LK', 'Sri Lanka'), ('BL', 'St Barthelemy'), ('SH', 'St Helena'), ('KN', 'St Kitts & Nevis'), ('LC', 'St Lucia'), ('SX', 'St Maarten (Dutch)'), ('MF', 'St Martin (French)'), ('PM', 'St Pierre & Miquelon'), ('VC', 'St Vincent'), ('SD', 'Sudan'), ('SR', 'Suriname'), ('SJ', 'Svalbard & Jan Mayen'), ('SZ', 'Swaziland'), ('SE', 'Sweden'), ('CH', 'Switzerland'), ('SY', 'Syria'), ('TW', 'Taiwan'), ('TJ', 'Tajikistan'), ('TZ', 'Tanzania'), ('TH', 'Thailand'), ('TG', 'Togo'), ('TK', 'Tokelau'), ('TO', 'Tonga'), ('TT', 'Trinidad & Tobago'), ('TN', 'Tunisia'), ('TR', 'Turkey'), ('TM', 'Turkmenistan'), ('TC', 'Turks & Caicos Is'), ('TV', 'Tuvalu'), ('UM', 'US minor outlying islands'), ('UG', 'Uganda'), ('UA', 'Ukraine'), ('AE', 'United Arab Emirates'), ('US', 'United States'), ('UY', 'Uruguay'), ('UZ', 'Uzbekistan'), ('VU', 'Vanuatu'), ('VA', 'Vatican City'), ('VE', 'Venezuela'), ('VN', 'Vietnam'), ('VG', 'Virgin Islands (UK)'), ('VI', 'Virgin Islands (US)'), ('WF', 'Wallis & Futuna'), ('EH', 'Western Sahara'), ('YE', 'Yemen'), ('ZM', 'Zambia'), ('ZW', 'Zimbabwe'), ('AX', '\xc5land Islands')], max_length=2)),
-                ('time_zone', models.CharField(blank=True, choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godtha', 'America/Godtha'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagre', 'Europe/Zagre'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('US/Alaska', 'US/Alaska'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('UTC', 'UTC')], max_length=255)),
+                ('country', models.CharField(blank=True, choices=[('', '---------'), ('AF', 'Afghanistan'), ('AL', 'Albania'), ('DZ', 'Algeria'), ('AD', 'Andorra'), ('AO', 'Angola'), ('AI', 'Anguilla'), ('AQ', 'Antarctica'), ('AG', 'Antigua & Barbuda'), ('AR', 'Argentina'), ('AM', 'Armenia'), ('AW', 'Aruba'), ('AU', 'Australia'), ('AT', 'Austria'), ('AZ', 'Azerbaijan'), ('BS', 'Bahamas'), ('BH', 'Bahrain'), ('BD', 'Bangladesh'), ('BB', 'Barbados'), ('BY', 'Belarus'), ('BE', 'Belgium'), ('BZ', 'Belize'), ('BJ', 'Benin'), ('BM', 'Bermuda'), ('BT', 'Bhutan'), ('BO', 'Bolivia'), ('BA', 'Bosnia & Herzegovina'), ('BW', 'Botswana'), ('BV', 'Bouvet Island'), ('BR', 'Brazil'), ('GB', 'Britain (UK)'), ('IO', 'British Indian Ocean Territory'), ('BN', 'Brunei'), ('BG', 'Bulgaria'), ('BF', 'Burkina Faso'), ('BI', 'Burundi'), ('KH', 'Cambodia'), ('CM', 'Cameroon'), ('CA', 'Canada'), ('CV', 'Cape Verde'), ('BQ', 'Caribbean NL'), ('KY', 'Cayman Islands'), ('CF', 'Central African Rep.'), ('TD', 'Chad'), ('CL', 'Chile'), ('CN', 'China'), ('CX', 'Christmas Island'), ('CC', 'Cocos (Keeling) Islands'), ('CO', 'Colombia'), ('KM', 'Comoros'), ('CD', 'Congo (Dem. Rep.)'), ('CG', 'Congo (Rep.)'), ('CK', 'Cook Islands'), ('CR', 'Costa Rica'), ('HR', 'Croatia'), ('CU', 'Cuba'), ('CW', 'Curaçao'), ('CY', 'Cyprus'), ('CZ', 'Czech Republic'), ('CI', "Côte d'Ivoire"), ('DK', 'Denmark'), ('DJ', 'Djibouti'), ('DM', 'Dominica'), ('DO', 'Dominican Republic'), ('TL', 'East Timor'), ('EC', 'Ecuador'), ('EG', 'Egypt'), ('SV', 'El Salvador'), ('GQ', 'Equatorial Guinea'), ('ER', 'Eritrea'), ('EE', 'Estonia'), ('SZ', 'Eswatini (Swaziland)'), ('ET', 'Ethiopia'), ('FK', 'Falkland Islands'), ('FO', 'Faroe Islands'), ('FJ', 'Fiji'), ('FI', 'Finland'), ('FR', 'France'), ('GF', 'French Guiana'), ('PF', 'French Polynesia'), ('TF', 'French Southern & Antarctic Lands'), ('GA', 'Gabon'), ('GM', 'Gambia'), ('GE', 'Georgia'), ('DE', 'Germany'), ('GH', 'Ghana'), ('GI', 'Gibraltar'), ('GR', 'Greece'), ('GL', 'Greenland'), ('GD', 'Grenada'), ('GP', 'Guadeloupe'), ('GU', 'Guam'), ('GT', 'Guatemala'), ('GG', 'Guernsey'), ('GN', 'Guinea'), ('GW', 'Guinea-Bissau'), ('GY', 'Guyana'), ('HT', 'Haiti'), ('HM', 'Heard Island & McDonald Islands'), ('HN', 'Honduras'), ('HK', 'Hong Kong'), ('HU', 'Hungary'), ('IS', 'Iceland'), ('IN', 'India'), ('ID', 'Indonesia'), ('IR', 'Iran'), ('IQ', 'Iraq'), ('IE', 'Ireland'), ('IM', 'Isle of Man'), ('IL', 'Israel'), ('IT', 'Italy'), ('JM', 'Jamaica'), ('JP', 'Japan'), ('JE', 'Jersey'), ('JO', 'Jordan'), ('KZ', 'Kazakhstan'), ('KE', 'Kenya'), ('KI', 'Kiribati'), ('KP', 'Korea (North)'), ('KR', 'Korea (South)'), ('KW', 'Kuwait'), ('KG', 'Kyrgyzstan'), ('LA', 'Laos'), ('LV', 'Latvia'), ('LB', 'Lebanon'), ('LS', 'Lesotho'), ('LR', 'Liberia'), ('LY', 'Libya'), ('LI', 'Liechtenstein'), ('LT', 'Lithuania'), ('LU', 'Luxembourg'), ('MO', 'Macau'), ('MG', 'Madagascar'), ('MW', 'Malawi'), ('MY', 'Malaysia'), ('MV', 'Maldives'), ('ML', 'Mali'), ('MT', 'Malta'), ('MH', 'Marshall Islands'), ('MQ', 'Martinique'), ('MR', 'Mauritania'), ('MU', 'Mauritius'), ('YT', 'Mayotte'), ('MX', 'Mexico'), ('FM', 'Micronesia'), ('MD', 'Moldova'), ('MC', 'Monaco'), ('MN', 'Mongolia'), ('ME', 'Montenegro'), ('MS', 'Montserrat'), ('MA', 'Morocco'), ('MZ', 'Mozambique'), ('MM', 'Myanmar (Burma)'), ('NA', 'Namibia'), ('NR', 'Nauru'), ('NP', 'Nepal'), ('NL', 'Netherlands'), ('NC', 'New Caledonia'), ('NZ', 'New Zealand'), ('NI', 'Nicaragua'), ('NE', 'Niger'), ('NG', 'Nigeria'), ('NU', 'Niue'), ('NF', 'Norfolk Island'), ('MK', 'North Macedonia'), ('MP', 'Northern Mariana Islands'), ('NO', 'Norway'), ('OM', 'Oman'), ('PK', 'Pakistan'), ('PW', 'Palau'), ('PS', 'Palestine'), ('PA', 'Panama'), ('PG', 'Papua New Guinea'), ('PY', 'Paraguay'), ('PE', 'Peru'), ('PH', 'Philippines'), ('PN', 'Pitcairn'), ('PL', 'Poland'), ('PT', 'Portugal'), ('PR', 'Puerto Rico'), ('QA', 'Qatar'), ('RO', 'Romania'), ('RU', 'Russia'), ('RW', 'Rwanda'), ('RE', 'Réunion'), ('AS', 'Samoa (American)'), ('WS', 'Samoa (western)'), ('SM', 'San Marino'), ('ST', 'Sao Tome & Principe'), ('SA', 'Saudi Arabia'), ('SN', 'Senegal'), ('RS', 'Serbia'), ('SC', 'Seychelles'), ('SL', 'Sierra Leone'), ('SG', 'Singapore'), ('SK', 'Slovakia'), ('SI', 'Slovenia'), ('SB', 'Solomon Islands'), ('SO', 'Somalia'), ('ZA', 'South Africa'), ('GS', 'South Georgia & the South Sandwich Islands'), ('SS', 'South Sudan'), ('ES', 'Spain'), ('LK', 'Sri Lanka'), ('BL', 'St Barthelemy'), ('SH', 'St Helena'), ('KN', 'St Kitts & Nevis'), ('LC', 'St Lucia'), ('SX', 'St Maarten (Dutch)'), ('MF', 'St Martin (French)'), ('PM', 'St Pierre & Miquelon'), ('VC', 'St Vincent'), ('SD', 'Sudan'), ('SR', 'Suriname'), ('SJ', 'Svalbard & Jan Mayen'), ('SE', 'Sweden'), ('CH', 'Switzerland'), ('SY', 'Syria'), ('TW', 'Taiwan'), ('TJ', 'Tajikistan'), ('TZ', 'Tanzania'), ('TH', 'Thailand'), ('TG', 'Togo'), ('TK', 'Tokelau'), ('TO', 'Tonga'), ('TT', 'Trinidad & Tobago'), ('TN', 'Tunisia'), ('TR', 'Turkey'), ('TM', 'Turkmenistan'), ('TC', 'Turks & Caicos Is'), ('TV', 'Tuvalu'), ('UM', 'US minor outlying islands'), ('UG', 'Uganda'), ('UA', 'Ukraine'), ('AE', 'United Arab Emirates'), ('US', 'United States'), ('UY', 'Uruguay'), ('UZ', 'Uzbekistan'), ('VU', 'Vanuatu'), ('VA', 'Vatican City'), ('VE', 'Venezuela'), ('VN', 'Vietnam'), ('VG', 'Virgin Islands (UK)'), ('VI', 'Virgin Islands (US)'), ('WF', 'Wallis & Futuna'), ('EH', 'Western Sahara'), ('YE', 'Yemen'), ('ZM', 'Zambia'), ('ZW', 'Zimbabwe'), ('AX', 'Åland Islands')], max_length=2)),
+                ('time_zone', models.CharField(choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Kyiv', 'Europe/Kyiv'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('UTC', 'UTC')], default='UTC', max_length=255)),
                 ('idsubmit_cutoff_day_offset_00', models.IntegerField(blank=True, default=13, help_text='The number of days before the meeting start date when the submission of -00 drafts will be closed.')),
                 ('idsubmit_cutoff_day_offset_01', models.IntegerField(blank=True, default=13, help_text='The number of days before the meeting start date when the submission of -01 drafts etc. will be closed.')),
-                ('idsubmit_cutoff_time_utc', models.DurationField(blank=True, default=datetime.timedelta(0, 86399), help_text='The time of day (UTC) after which submission will be closed.  Use for example 23:59:59.')),
-                ('idsubmit_cutoff_warning_days', models.DurationField(blank=True, default=datetime.timedelta(21), help_text="How long before the 00 cutoff to start showing cutoff warnings.  Use for example '21' or '21 days'.")),
+                ('idsubmit_cutoff_time_utc', models.DurationField(blank=True, default=datetime.timedelta(seconds=86399), help_text='The time of day (UTC) after which submission will be closed.  Use for example 23:59:59.')),
+                ('idsubmit_cutoff_warning_days', models.DurationField(blank=True, default=datetime.timedelta(days=21), help_text="How long before the 00 cutoff to start showing cutoff warnings.  Use for example '21' or '21 days'.")),
                 ('submission_start_day_offset', models.IntegerField(blank=True, default=90, help_text='The number of days before the meeting start date after which meeting materials will be accepted.')),
                 ('submission_cutoff_day_offset', models.IntegerField(blank=True, default=26, help_text='The number of days after the meeting start date in which new meeting materials will be accepted.')),
                 ('submission_correction_day_offset', models.IntegerField(blank=True, default=50, help_text='The number of days after the meeting start date in which updates to existing meeting materials will be accepted.')),
@@ -74,14 +68,18 @@ class Migration(migrations.Migration):
                 ('venue_addr', models.TextField(blank=True)),
                 ('break_area', models.CharField(blank=True, max_length=255)),
                 ('reg_area', models.CharField(blank=True, max_length=255)),
-                ('agenda_note', models.TextField(blank=True, help_text='Text in this field will be placed at the top of the html agenda page for the meeting.  HTML can be used, but will not be validated.')),
+                ('agenda_info_note', models.TextField(blank=True, help_text='Text in this field will be placed at the top of the html agenda page for the meeting.  HTML can be used, but will not be validated.')),
+                ('agenda_warning_note', models.TextField(blank=True, help_text='Text in this field will be placed more prominently at the top of the html agenda page for the meeting.  HTML can be used, but will not be validated.')),
                 ('session_request_lock_message', models.CharField(blank=True, max_length=255)),
                 ('proceedings_final', models.BooleanField(default=False, help_text='Are the proceedings for this meeting complete?')),
                 ('acknowledgements', models.TextField(blank=True, help_text='Acknowledgements for use in meeting proceedings.  Use ReStructuredText markup.')),
                 ('show_important_dates', models.BooleanField(default=False)),
+                ('attendees', models.IntegerField(blank=True, default=None, help_text='Number of Attendees for backfilled meetings, leave it blank for new meetings, and then it is calculated from the registrations', null=True)),
+                ('group_conflict_types', models.ManyToManyField(blank=True, help_text='Types of scheduling conflict between groups to consider', limit_choices_to={'is_group_conflict': True}, to='name.ConstraintName')),
+                ('overview', ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='overview', to='dbtemplate.DBTemplate')),
             ],
             options={
-                'ordering': ['-date', 'id'],
+                'ordering': ['-date', '-id'],
             },
         ),
         migrations.CreateModel(
@@ -97,7 +95,7 @@ class Migration(migrations.Migration):
             name='Room',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('modified', models.DateTimeField(auto_now=True)),
                 ('name', models.CharField(max_length=255)),
                 ('functional_name', models.CharField(blank=True, max_length=255)),
                 ('capacity', models.IntegerField(blank=True, null=True)),
@@ -111,7 +109,7 @@ class Migration(migrations.Migration):
                 ('session_types', models.ManyToManyField(blank=True, to='name.TimeSlotTypeName')),
             ],
             options={
-                'ordering': ['-meeting', 'name'],
+                'ordering': ['-id'],
             },
         ),
         migrations.CreateModel(
@@ -128,18 +126,6 @@ class Migration(migrations.Migration):
                 'ordering': ['timeslot__time', 'timeslot__type__slug', 'session__group__parent__name', 'session__group__acronym', 'session__name'],
             },
         ),
-        migrations.CreateModel(
-            name='Schedule',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=16)),
-                ('visible', models.BooleanField(default=True, help_text='Make this agenda available to those who know about it.')),
-                ('public', models.BooleanField(default=True, help_text='Make this agenda publically available.')),
-                ('badness', models.IntegerField(blank=True, null=True)),
-                ('meeting', ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting')),
-                ('owner', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-            ],
-        ),
         migrations.CreateModel(
             name='Session',
             fields=[
@@ -148,28 +134,24 @@ class Migration(migrations.Migration):
                 ('short', models.CharField(blank=True, help_text="Short version of 'name' above, for use in filenames.", max_length=32)),
                 ('attendees', models.IntegerField(blank=True, null=True)),
                 ('agenda_note', models.CharField(blank=True, max_length=255)),
-                ('requested', models.DateTimeField(default=datetime.datetime.now)),
                 ('requested_duration', models.DurationField(default=datetime.timedelta(0))),
                 ('comments', models.TextField(blank=True)),
                 ('scheduled', models.DateTimeField(blank=True, null=True)),
                 ('modified', models.DateTimeField(auto_now=True)),
                 ('remote_instructions', models.CharField(blank=True, max_length=1024)),
+                ('on_agenda', models.BooleanField(default=True, help_text='Is this session visible on the meeting agenda?')),
                 ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('joint_with_groups', models.ManyToManyField(blank=True, related_name='sessions_joint_in', to='group.Group')),
             ],
         ),
         migrations.CreateModel(
-            name='SessionPresentation',
+            name='UrlResource',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('rev', models.CharField(blank=True, max_length=16, null=True, verbose_name='revision')),
-                ('order', models.PositiveSmallIntegerField(default=0)),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
+                ('url', models.URLField(blank=True, null=True)),
+                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.RoomResourceName')),
+                ('room', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Room')),
             ],
-            options={
-                'ordering': ('order',),
-                'db_table': 'meeting_session_materials',
-            },
         ),
         migrations.CreateModel(
             name='TimeSlot',
@@ -186,18 +168,37 @@ class Migration(migrations.Migration):
                 ('type', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.TimeSlotTypeName')),
             ],
             options={
-                'ordering': ['-time', 'id'],
+                'ordering': ['-time', '-id'],
             },
         ),
         migrations.CreateModel(
-            name='UrlResource',
+            name='SlideSubmission',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('url', models.URLField(blank=True, null=True)),
-                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.RoomResourceName')),
-                ('room', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Room')),
+                ('time', models.DateTimeField(auto_now=True)),
+                ('title', models.CharField(max_length=255)),
+                ('filename', models.CharField(max_length=255)),
+                ('apply_to_all', models.BooleanField(default=False)),
+                ('doc', ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='doc.Document')),
+                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
+                ('status', ietf.utils.models.ForeignKey(default='pending', null=True, on_delete=django.db.models.deletion.SET_NULL, to='name.SlideSubmissionStatusName')),
+                ('submitter', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
         ),
+        migrations.CreateModel(
+            name='SessionPresentation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('rev', models.CharField(blank=True, max_length=16, null=True, verbose_name='revision')),
+                ('order', models.PositiveSmallIntegerField(default=0)),
+                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
+                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
+            ],
+            options={
+                'db_table': 'meeting_session_materials',
+                'ordering': ('order',),
+            },
+        ),
         migrations.AddField(
             model_name='session',
             name='materials',
@@ -210,8 +211,8 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='session',
-            name='requested_by',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+            name='purpose',
+            field=ietf.utils.models.ForeignKey(help_text='Purpose of the session', on_delete=django.db.models.deletion.CASCADE, to='name.SessionPurposeName'),
         ),
         migrations.AddField(
             model_name='session',
@@ -220,14 +221,39 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='session',
-            name='status',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.SessionStatusName'),
+            name='tombstone_for',
+            field=models.ForeignKey(blank=True, help_text='This session is the tombstone for a session that was rescheduled', null=True, on_delete=django.db.models.deletion.CASCADE, to='meeting.Session'),
         ),
         migrations.AddField(
             model_name='session',
             name='type',
             field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.TimeSlotTypeName'),
         ),
+        migrations.CreateModel(
+            name='SchedulingEvent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField(default=django.utils.timezone.now, help_text='When the event happened')),
+                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
+                ('status', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.SessionStatusName')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Schedule',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Letters, numbers and -:_ allowed.', max_length=64, validators=[django.core.validators.RegexValidator('^[A-Za-z0-9-:_]*$')])),
+                ('visible', models.BooleanField(default=True, help_text='Show in the list of possible agendas for the meeting.', verbose_name='Show in agenda list')),
+                ('public', models.BooleanField(default=True, help_text='Allow others to see this agenda.')),
+                ('badness', models.IntegerField(blank=True, null=True)),
+                ('notes', models.TextField(blank=True)),
+                ('base', ietf.utils.models.ForeignKey(blank=True, help_text='Sessions scheduled in the base schedule show up in this schedule too.', limit_choices_to={'base': None}, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='derivedschedule_set', to='meeting.Schedule')),
+                ('meeting', ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='schedule_set', to='meeting.Meeting')),
+                ('origin', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='meeting.Schedule')),
+                ('owner', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+            ],
+        ),
         migrations.AddField(
             model_name='schedtimesessassignment',
             name='schedule',
@@ -243,59 +269,99 @@ class Migration(migrations.Migration):
             name='timeslot',
             field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sessionassignments', to='meeting.TimeSlot'),
         ),
-        migrations.AddField(
-            model_name='meeting',
-            name='agenda',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='meeting.Schedule'),
+        migrations.CreateModel(
+            name='ProceedingsMaterial',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('document', ietf.utils.models.ForeignKey(limit_choices_to={'type_id': 'procmaterials'}, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', unique=True)),
+                ('meeting', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='proceedings_materials', to='meeting.Meeting')),
+                ('type', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ProceedingsMaterialTypeName')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='MeetingHost',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('logo', ietf.utils.fields.MissingOkImageField(height_field='logo_height', storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=ietf.meeting.models._host_upload_path, validators=[ietf.utils.validators.MaxImageSizeValidator(400, 400), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_file_size, True), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_file_extension, ['.png', '.jpg', '.jpeg']), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_mime_type, ['image/jpeg', 'image/png'], True)], width_field='logo_width')),
+                ('logo_width', models.PositiveIntegerField(null=True)),
+                ('logo_height', models.PositiveIntegerField(null=True)),
+                ('meeting', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='meetinghosts', to='meeting.Meeting')),
+            ],
+            options={
+                'ordering': ('pk',),
+            },
         ),
         migrations.AddField(
             model_name='meeting',
-            name='overview',
-            field=ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='overview', to='dbtemplate.DBTemplate'),
+            name='schedule',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='meeting.Schedule'),
         ),
         migrations.AddField(
             model_name='meeting',
             name='type',
             field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.MeetingTypeName'),
         ),
-        migrations.AddField(
-            model_name='importantdate',
-            name='meeting',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting'),
-        ),
-        migrations.AddField(
-            model_name='importantdate',
-            name='name',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ImportantDateName'),
+        migrations.CreateModel(
+            name='ImportantDate',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateField()),
+                ('meeting', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting')),
+                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ImportantDateName')),
+            ],
+            options={
+                'ordering': ['-meeting_id', 'date'],
+            },
         ),
         migrations.AddField(
             model_name='floorplan',
             name='meeting',
             field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting'),
         ),
-        migrations.AddField(
-            model_name='constraint',
-            name='meeting',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting'),
+        migrations.CreateModel(
+            name='Constraint',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time_relation', models.CharField(blank=True, choices=[('subsequent-days', 'Schedule the sessions on subsequent days'), ('one-day-seperation', 'Leave at least one free day in between the two sessions')], max_length=200)),
+                ('meeting', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting')),
+                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ConstraintName')),
+                ('person', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('source', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='constraint_source_set', to='group.Group')),
+                ('target', ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='constraint_target_set', to='group.Group')),
+                ('timeranges', models.ManyToManyField(to='name.TimerangeName')),
+            ],
         ),
-        migrations.AddField(
-            model_name='constraint',
-            name='name',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ConstraintName'),
+        migrations.CreateModel(
+            name='Attended',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
+            ],
         ),
-        migrations.AddField(
-            model_name='constraint',
-            name='person',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        migrations.AddIndex(
+            model_name='timeslot',
+            index=models.Index(fields=['-time', '-id'], name='meeting_tim_time_b802cb_idx'),
         ),
-        migrations.AddField(
-            model_name='constraint',
-            name='source',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='constraint_source_set', to='group.Group'),
+        migrations.AlterUniqueTogether(
+            name='sessionpresentation',
+            unique_together={('session', 'document')},
         ),
-        migrations.AddField(
-            model_name='constraint',
-            name='target',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='constraint_target_set', to='group.Group'),
+        migrations.AlterUniqueTogether(
+            name='proceedingsmaterial',
+            unique_together={('meeting', 'type')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='meetinghost',
+            unique_together={('meeting', 'name')},
+        ),
+        migrations.AddIndex(
+            model_name='meeting',
+            index=models.Index(fields=['-date', '-id'], name='meeting_mee_date_40ca21_idx'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='attended',
+            unique_together={('person', 'session')},
         ),
     ]
diff --git a/ietf/meeting/migrations/0002_auto_20180225_1207.py b/ietf/meeting/migrations/0002_auto_20180225_1207.py
deleted file mode 100644
index 523dd66bcf..0000000000
--- a/ietf/meeting/migrations/0002_auto_20180225_1207.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-25 12:07
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='floorplan',
-            options={'ordering': ['-id']},
-        ),
-        migrations.AlterModelOptions(
-            name='importantdate',
-            options={'ordering': ['-meeting_id', 'date']},
-        ),
-        migrations.AlterModelOptions(
-            name='meeting',
-            options={'ordering': ['-date', '-id']},
-        ),
-        migrations.AlterModelOptions(
-            name='room',
-            options={'ordering': ['-id']},
-        ),
-        migrations.AlterModelOptions(
-            name='timeslot',
-            options={'ordering': ['-time', '-id']},
-        ),
-        migrations.AlterField(
-            model_name='floorplan',
-            name='short',
-            field=models.CharField(default='', max_length=3),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0002_session_has_onsite_tool.py b/ietf/meeting/migrations/0002_session_has_onsite_tool.py
new file mode 100644
index 0000000000..f248b1a415
--- /dev/null
+++ b/ietf/meeting/migrations/0002_session_has_onsite_tool.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-03-07 16:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='session',
+            name='has_onsite_tool',
+            field=models.BooleanField(default=False, help_text='Does this session use the officially supported onsite and remote tooling?'),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0003_populate_session_has_onsite_tool.py b/ietf/meeting/migrations/0003_populate_session_has_onsite_tool.py
new file mode 100644
index 0000000000..4499fdb3b5
--- /dev/null
+++ b/ietf/meeting/migrations/0003_populate_session_has_onsite_tool.py
@@ -0,0 +1,33 @@
+# Generated by Django 2.2.28 on 2023-03-07 16:54
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    Session = apps.get_model('meeting', 'Session')
+    Meeting = apps.get_model('meeting', 'Meeting')
+    Room = apps.get_model('meeting', 'Room')
+    full_meetings = Meeting.objects.filter(type_id='ietf', schedule__isnull=False)
+    schedules = {m.schedule for m in full_meetings} | {m.schedule.base for m in full_meetings if m.schedule.base}
+    rooms_with_meetecho = Room.objects.filter(urlresource__name_id__in=['meetecho', 'meetecho_onsite']).distinct()
+    sessions_with_meetecho = Session.objects.filter(
+        timeslotassignments__schedule__in=schedules,
+        timeslotassignments__timeslot__location__in=rooms_with_meetecho,
+    ).distinct()
+    sessions_with_meetecho.update(has_onsite_tool=True)
+
+
+def reverse(apps, schema_editor):
+    Session = apps.get_model('meeting', 'Session')
+    Session.objects.all().update(has_onsite_tool=False)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0002_session_has_onsite_tool'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/meeting/migrations/0003_rename_modified_fields.py b/ietf/meeting/migrations/0003_rename_modified_fields.py
deleted file mode 100644
index 4b1dbbe85f..0000000000
--- a/ietf/meeting/migrations/0003_rename_modified_fields.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-03-02 14:33
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0002_auto_20180225_1207'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='floorplan',
-            old_name='time',
-            new_name='modified',
-        ),
-        migrations.RenameField(
-            model_name='room',
-            old_name='time',
-            new_name='modified',
-        ),
-        migrations.AlterField(
-            model_name='floorplan',
-            name='modified',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AlterField(
-            model_name='room',
-            name='modified',
-            field=models.DateTimeField(auto_now=True),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0004_meeting_attendees.py b/ietf/meeting/migrations/0004_meeting_attendees.py
deleted file mode 100644
index a929459245..0000000000
--- a/ietf/meeting/migrations/0004_meeting_attendees.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-03-20 09:17
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0003_rename_modified_fields'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='meeting',
-            name='attendees',
-            field=models.IntegerField(blank=True, default=None, help_text='Number of Attendees for backfilled meetings, leave it blank for new meetings, and then it is calculated from the registrations', null=True),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0004_session_chat_room.py b/ietf/meeting/migrations/0004_session_chat_room.py
new file mode 100644
index 0000000000..9879c8c42f
--- /dev/null
+++ b/ietf/meeting/migrations/0004_session_chat_room.py
@@ -0,0 +1,18 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0003_populate_session_has_onsite_tool'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='session',
+            name='chat_room',
+            field=models.CharField(blank=True, help_text='Name of Zulip stream, if different from group acronym', max_length=32),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0005_alter_session_agenda_note.py b/ietf/meeting/migrations/0005_alter_session_agenda_note.py
new file mode 100644
index 0000000000..59daeea45d
--- /dev/null
+++ b/ietf/meeting/migrations/0005_alter_session_agenda_note.py
@@ -0,0 +1,18 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0004_session_chat_room"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="session",
+            name="agenda_note",
+            field=models.CharField(blank=True, max_length=512),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0005_backfill_old_meetings.py b/ietf/meeting/migrations/0005_backfill_old_meetings.py
deleted file mode 100644
index 928ed4afd8..0000000000
--- a/ietf/meeting/migrations/0005_backfill_old_meetings.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-
-def backfill_old_meetings(apps, schema_editor):
-        Meeting          = apps.get_model('meeting', 'Meeting')
-
-        for id, number, type_id, date, city, country, time_zone, continent, attendees in [
-                ( 59,'59','ietf','2004-03-29','Seoul','KR','Asia/Seoul','Asia','1390' ),
-                ( 58,'58','ietf','2003-11-09','Minneapolis','US','America/Menominee','America','1233' ),
-                ( 57,'57','ietf','2003-07-13','Vienna','AT','Europe/Vienna','Europe','1304' ),
-                ( 56,'56','ietf','2003-03-16','San Francisco','US','America/Los_Angeles','America','1679' ),
-                ( 55,'55','ietf','2002-11-17','Atlanta','US','America/New_York','America','1570' ),
-                ( 54,'54','ietf','2002-07-14','Yokohama','JP','Asia/Tokyo','Asia','1885' ),
-                ( 53,'53','ietf','2002-03-17','Minneapolis','US','America/Menominee','America','1656' ),
-                ( 52,'52','ietf','2001-12-09','Salt Lake City','US','America/Denver','America','1691' ),
-                ( 51,'51','ietf','2001-08-05','London','GB','Europe/London','Europe','2226' ),
-                ( 50,'50','ietf','2001-03-18','Minneapolis','US','America/Menominee','America','1822' ),
-                ( 49,'49','ietf','2000-12-10','San Diego','US','America/Los_Angeles','America','2810' ),
-                ( 48,'48','ietf','2000-07-31','Pittsburgh','US','America/New_York','America','2344' ),
-                ( 47,'47','ietf','2000-03-26','Adelaide','AU','Australia/Adelaide','Australia','1431' ),
-                ( 46,'46','ietf','1999-11-07','Washington','US','America/New_York','America','2379' ),
-                ( 45,'45','ietf','1999-07-11','Oslo','NO','Europe/Oslo','Europe','1710' ),
-                ( 44,'44','ietf','1999-03-14','Minneapolis','US','America/Menominee','America','1705' ),
-                ( 43,'43','ietf','1998-12-07','Orlando','US','America/New_York','America','2124' ),
-                ( 42,'42','ietf','1998-08-24','Chicago','US','America/Chicago','America','2106' ),
-                ( 41,'41','ietf','1998-03-30','Los Angeles','US','America/Los_Angeles','America','1775' ),
-                ( 40,'40','ietf','1997-12-08','Washington','US','America/New_York','America','1897' ),
-                ( 39,'39','ietf','1997-08-11','Munich','DE','Europe/Berlin','Europe','1308' ),
-                ( 38,'38','ietf','1997-04-07','Memphis','US','America/Chicago','America','1321' ),
-                ( 37,'37','ietf','1996-12-09','San Jose','US','America/Los_Angeles','America','1993' ),
-                ( 36,'36','ietf','1996-06-24','Montreal','CA','America/New_York','America','1283' ),
-                ( 35,'35','ietf','1996-03-04','Los Angeles','US','America/Los_Angeles','America','1038' ),
-                ( 34,'34','ietf','1995-12-04','Dallas','US','America/Chicago','America','1007' ),
-                ( 33,'33','ietf','1995-07-17','Stockholm','SE','Europe/Stockholm','Europe','617' ),
-                ( 32,'32','ietf','1995-04-03','Danvers','US','America/New_York','America','983' ),
-                ( 31,'31','ietf','1994-12-05','San Jose','US','America/Los_Angeles','America','1079' ),
-                ( 30,'30','ietf','1994-07-25','Toronto','CA','America/New_York','America','710' ),
-                ( 29,'29','ietf','1994-03-28','Seattle','US','America/Los_Angeles','America','785' ),
-                ( 28,'28','ietf','1993-11-01','Houston','US','America/Chicago','America','636' ),
-                ( 27,'27','ietf','1993-07-12','Amsterdam','NL','Europe/Amsterdam','Europe','493' ),
-                ( 26,'26','ietf','1993-03-29','Columbus','US','America/New_York','America','638' ),
-                ( 25,'25','ietf','1992-11-16','Washington','US','America/New_York','America','633' ),
-                ( 24,'24','ietf','1992-07-13','Cambridge','US','America/New_York','America','677' ),
-                ( 23,'23','ietf','1992-03-16','San Diego','US','America/Los_Angeles','America','530' ),
-                ( 22,'22','ietf','1991-11-18','Santa Fe','US','America/Denver','America','372' ),
-                ( 21,'21','ietf','1991-07-29','Atlanta','US','America/New_York','America','387' ),
-                ( 20,'20','ietf','1991-03-11','St. Louis','US','America/Chicago','America','348' ),
-                ( 19,'19','ietf','1990-12-03','Boulder','US','America/Denver','America','292' ),
-                ( 18,'18','ietf','1990-07-30','Vancouver','CA','America/Los_Angeles','America','293' ),
-                ( 17,'17','ietf','1990-05-01','Pittsburgh','US','America/New_York','America','244' ),
-                ( 16,'16','ietf','1990-02-06','Tallahassee','US','America/New_York','America','196' ),
-                ( 15,'15','ietf','1989-10-31','Honolulu','US','Pacific/Honolulu','America','138' ),
-                ( 14,'14','ietf','1989-07-25','Stanford','US','America/Los_Angeles','America','217' ),
-                ( 13,'13','ietf','1989-04-11','Cocoa Beach','US','America/New_York','America','114' ),
-                ( 12,'12','ietf','1989-01-18','Austin','US','America/Chicago','America','120' ),
-                ( 11,'11','ietf','1988-10-17','Ann Arbor','US','America/New_York','America','114' ),
-                ( 10,'10','ietf','1988-06-15','Annapolis','US','America/New_York','America','112' ),
-                ( 9,'9','ietf','1988-03-01','San Diego','US','America/Los_Angeles','America','82' ),
-                ( 8,'8','ietf','1987-11-02','Boulder','US','America/Denver','America','56' ),
-                ( 7,'7','ietf','1987-07-27','McLean','US','America/New_York','America','101' ),
-                ( 6,'6','ietf','1987-04-22','Boston','US','America/New_York','America','88' ),
-                ( 5,'5','ietf','1987-02-04','Moffett Field','US','America/Los_Angeles','America','35' ),
-                ( 4,'4','ietf','1986-10-15','Menlo Park','US','America/Los_Angeles','America','35' ),
-                ( 3,'3','ietf','1986-07-23','Ann Arbor','US','America/New_York','America','18' ),
-                ( 2,'2','ietf','1986-04-08','Aberdeen','US','America/New_York','America','21' ),
-                ( 1,'1','ietf','1986-01-16','San Diego','US','America/Los_Angeles','America','21' ),
-        ]:
-            Meeting.objects.get_or_create(id=id, number=number, type_id=type_id,
-                                          date=date, city=city, country=country,
-                                          time_zone=time_zone);
-
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0004_meeting_attendees'),
-    ]
-
-    operations = [
-        migrations.RunPython(backfill_old_meetings, reverse)
-    ]
-            
diff --git a/ietf/meeting/migrations/0006_alter_sessionpresentation_document_and_session.py b/ietf/meeting/migrations/0006_alter_sessionpresentation_document_and_session.py
new file mode 100644
index 0000000000..e8d6a663f8
--- /dev/null
+++ b/ietf/meeting/migrations/0006_alter_sessionpresentation_document_and_session.py
@@ -0,0 +1,33 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("doc", "0021_narrativeminutes"),
+        ("meeting", "0005_alter_session_agenda_note"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sessionpresentation",
+            name="document",
+            field=ietf.utils.models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="presentations",
+                to="doc.document",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="sessionpresentation",
+            name="session",
+            field=ietf.utils.models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="presentations",
+                to="meeting.session",
+            ),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0006_backfill_attendees.py b/ietf/meeting/migrations/0006_backfill_attendees.py
deleted file mode 100644
index 212260d72d..0000000000
--- a/ietf/meeting/migrations/0006_backfill_attendees.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-
-def backfill_old_meetings(apps, schema_editor):
-        Meeting          = apps.get_model('meeting', 'Meeting')
-
-        for number, attendees in [
-                ( 101,1203 ),
-                ( 100,1018 ),
-                ( 99,1235 ),
-                ( 98,1127 ),
-                ( 97,1042 ),
-                ( 96,1425 ),
-                ( 95,1043 ),
-                ( 94,1319 ),
-                ( 93,1387 ),
-                ( 92,1221 ),
-                ( 91,1109 ),
-                ( 90,1237 ),
-                ( 89,1400 ),
-                ( 88,1189 ),
-                ( 87,1435 ),
-                ( 86,1115 ),
-                ( 85,1157 ),
-                ( 84,1199 ),
-                ( 83,1395 ),
-                ( 82, 948 ),
-                ( 81,1127 ),
-                ( 80,1231 ),
-                ( 79,1208 ),
-                ( 78,1192 ),
-                ( 77,1250 ),
-                ( 76,1152 ),
-                ( 75,1124 ),
-                ( 74,1185 ),
-                ( 73, 962 ),
-                ( 72,1182 ),
-                ( 71,1174 ),
-                ( 70,1128 ),
-                ( 69,1175 ),
-                ( 68,1193 ),
-                ( 67,1245 ),
-                ( 66,1257 ),
-                ( 65,1264 ),
-                ( 64,1240 ),
-                ( 63,1450 ),
-                ( 62,1133 ),
-                ( 61,1311 ),
-                ( 60,1460 ),
-                ( 59,1390 ),
-                ( 58,1233 ),
-                ( 57,1304 ),
-                ( 56,1679 ),
-                ( 55,1570 ),
-                ( 54,1885 ),
-                ( 53,1656 ),
-                ( 52,1691 ),
-                ( 51,2226 ),
-                ( 50,1822 ),
-                ( 49,2810 ),
-                ( 48,2344 ),
-                ( 47,1431 ),
-                ( 46,2379 ),
-                ( 45,1710 ),
-                ( 44,1705 ),
-                ( 43,2124 ),
-                ( 42,2106 ),
-                ( 41,1775 ),
-                ( 40,1897 ),
-                ( 39,1308 ),
-                ( 38,1321 ),
-                ( 37,1993 ),
-                ( 36,1283 ),
-                ( 35,1038 ),
-                ( 34,1007 ),
-                ( 33,617 ),
-                ( 32,983 ),
-                ( 31,1079 ),
-                ( 30,710 ),
-                ( 29,785 ),
-                ( 28,636 ),
-                ( 27,493 ),
-                ( 26,638 ),
-                ( 25,633 ),
-                ( 24,677 ),
-                ( 23,530 ),
-                ( 22,372 ),
-                ( 21,387 ),
-                ( 20,348 ),
-                ( 19,292 ),
-                ( 18,293 ),
-                ( 17,244 ),
-                ( 16,196 ),
-                ( 15,138 ),
-                ( 14,217 ),
-                ( 13,114 ),
-                ( 12,120 ),
-                ( 11,114 ),
-                ( 10,112 ),
-                ( 9,82 ),
-                ( 8,56 ),
-                ( 7,101 ),
-                ( 6,88 ),
-                ( 5,35 ),
-                ( 4,35 ),
-                ( 3,18 ),
-                ( 2,21 ),
-                ( 1,21 ),
-        ]:
-                meeting = Meeting.objects.filter(type='ietf',
-                                                 number=number).first();
-                meeting.attendees = attendees
-                meeting.save()
-        
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0005_backfill_old_meetings'),
-    ]
-
-    operations = [
-        migrations.RunPython(backfill_old_meetings, reverse)
-    ]
-            
diff --git a/ietf/meeting/migrations/0007_attended_origin_attended_time.py b/ietf/meeting/migrations/0007_attended_origin_attended_time.py
new file mode 100644
index 0000000000..09a8d90e07
--- /dev/null
+++ b/ietf/meeting/migrations/0007_attended_origin_attended_time.py
@@ -0,0 +1,26 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0006_alter_sessionpresentation_document_and_session"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="attended",
+            name="origin",
+            field=models.CharField(default="datatracker", max_length=32),
+        ),
+        migrations.AddField(
+            model_name="attended",
+            name="time",
+            field=models.DateTimeField(
+                blank=True, default=django.utils.timezone.now, null=True
+            ),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0007_auto_20180716_1337.py b/ietf/meeting/migrations/0007_auto_20180716_1337.py
deleted file mode 100644
index a20d9dba91..0000000000
--- a/ietf/meeting/migrations/0007_auto_20180716_1337.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.14 on 2018-07-16 13:37
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0006_backfill_attendees'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='time_zone',
-            field=models.CharField(blank=True, choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('UTC', 'UTC')], max_length=255),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0008_remove_schedtimesessassignment_notes.py b/ietf/meeting/migrations/0008_remove_schedtimesessassignment_notes.py
new file mode 100644
index 0000000000..3c0b85fc22
--- /dev/null
+++ b/ietf/meeting/migrations/0008_remove_schedtimesessassignment_notes.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.15 on 2024-08-16 13:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0007_attended_origin_attended_time"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="schedtimesessassignment",
+            name="notes",
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py b/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py
deleted file mode 100644
index 884940c221..0000000000
--- a/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-10-09 13:09
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0007_auto_20180716_1337'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='meeting',
-            old_name='agenda_note',
-            new_name='agenda_warning_note',
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0009_add_agenda_info_note.py b/ietf/meeting/migrations/0009_add_agenda_info_note.py
deleted file mode 100644
index 8fc4fdb466..0000000000
--- a/ietf/meeting/migrations/0009_add_agenda_info_note.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-10-09 14:07
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0008_rename_meeting_agenda_note'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='meeting',
-            name='agenda_info_note',
-            field=models.TextField(blank=True, help_text='Text in this field will be placed at the top of the html agenda page for the meeting.  HTML can be used, but will not be validated.'),
-        ),
-        migrations.AlterField(
-            model_name='meeting',
-            name='agenda_warning_note',
-            field=models.TextField(blank=True, help_text='Text in this field will be placed more prominently at the top of the html agenda page for the meeting.  HTML can be used, but will not be validated.'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0009_session_meetecho_recording_name.py b/ietf/meeting/migrations/0009_session_meetecho_recording_name.py
new file mode 100644
index 0000000000..79ca4919a3
--- /dev/null
+++ b/ietf/meeting/migrations/0009_session_meetecho_recording_name.py
@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0008_remove_schedtimesessassignment_notes"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="session",
+            name="meetecho_recording_name",
+            field=models.CharField(
+                blank=True, help_text="Name of the meetecho recording", max_length=64
+            ),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0010_alter_floorplan_image_alter_meetinghost_logo.py b/ietf/meeting/migrations/0010_alter_floorplan_image_alter_meetinghost_logo.py
new file mode 100644
index 0000000000..594a1a4048
--- /dev/null
+++ b/ietf/meeting/migrations/0010_alter_floorplan_image_alter_meetinghost_logo.py
@@ -0,0 +1,56 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+import ietf.meeting.models
+import ietf.utils.fields
+import ietf.utils.storage
+import ietf.utils.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0009_session_meetecho_recording_name"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="floorplan",
+            name="image",
+            field=models.ImageField(
+                blank=True,
+                default=None,
+                storage=ietf.utils.storage.BlobShadowFileSystemStorage(
+                    kind="", location=None
+                ),
+                upload_to=ietf.meeting.models.floorplan_path,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="meetinghost",
+            name="logo",
+            field=ietf.utils.fields.MissingOkImageField(
+                height_field="logo_height",
+                storage=ietf.utils.storage.BlobShadowFileSystemStorage(
+                    kind="", location=None
+                ),
+                upload_to=ietf.meeting.models._host_upload_path,
+                validators=[
+                    ietf.utils.validators.MaxImageSizeValidator(400, 400),
+                    ietf.utils.validators.WrappedValidator(
+                        ietf.utils.validators.validate_file_size, True
+                    ),
+                    ietf.utils.validators.WrappedValidator(
+                        ietf.utils.validators.validate_file_extension,
+                        [".png", ".jpg", ".jpeg"],
+                    ),
+                    ietf.utils.validators.WrappedValidator(
+                        ietf.utils.validators.validate_mime_type,
+                        ["image/jpeg", "image/png"],
+                        True,
+                    ),
+                ],
+                width_field="logo_width",
+            ),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py b/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py
deleted file mode 100644
index bb3148f78f..0000000000
--- a/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-10-09 14:23
-
-
-from django.db import migrations
-
-def forward(apps,schema_editor):
-    Meeting = apps.get_model('meeting','Meeting')
-    Meeting.objects.filter(number=103).update(agenda_info_note=
-      'To see the list of unofficial side meetings, or to reserve meeting '
-      'space, please see the '
-      '<a href="https://trac.ietf.org/trac/ietf/meeting/wiki/103sidemeetings">'
-      'meeting wiki</a>.'
-    )
-
-def reverse(apps,schema_editor):
-    Meeting = apps.get_model('meeting','Meeting')
-    Meeting.objects.filter(number=103).update(agenda_info_note="")
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0009_add_agenda_info_note'),
-        ('person', '0008_auto_20181014_1448'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-    ]
diff --git a/ietf/meeting/migrations/0011_alter_slidesubmission_doc.py b/ietf/meeting/migrations/0011_alter_slidesubmission_doc.py
new file mode 100644
index 0000000000..b9cbc58e99
--- /dev/null
+++ b/ietf/meeting/migrations/0011_alter_slidesubmission_doc.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.19 on 2025-03-17 09:37
+
+from django.db import migrations
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("doc", "0025_storedobject_storedobject_unique_name_per_store"),
+        ("meeting", "0010_alter_floorplan_image_alter_meetinghost_logo"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="slidesubmission",
+            name="doc",
+            field=ietf.utils.models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="doc.document",
+            ),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0011_auto_20190114_0550.py b/ietf/meeting/migrations/0011_auto_20190114_0550.py
deleted file mode 100644
index 50b8b71ec2..0000000000
--- a/ietf/meeting/migrations/0011_auto_20190114_0550.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-14 05:50
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0010_set_ietf_103_agenda_info_note'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='time_zone',
-            field=models.CharField(blank=True, choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('UTC', 'UTC')], max_length=255),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0012_add_slide_submissions.py b/ietf/meeting/migrations/0012_add_slide_submissions.py
deleted file mode 100644
index e1a798d59b..0000000000
--- a/ietf/meeting/migrations/0012_add_slide_submissions.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-03-23 07:41
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0009_auto_20190118_0725'),
-        ('meeting', '0011_auto_20190114_0550'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SlideSubmission',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=255)),
-                ('filename', models.CharField(max_length=255)),
-                ('apply_to_all', models.BooleanField(default=False)),
-                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
-                ('submitter', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-            ],
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0012_registration_registrationticket.py b/ietf/meeting/migrations/0012_registration_registrationticket.py
new file mode 100644
index 0000000000..c555f52e8b
--- /dev/null
+++ b/ietf/meeting/migrations/0012_registration_registrationticket.py
@@ -0,0 +1,90 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("name", "0017_populate_new_reg_names"),
+        ("person", "0004_alter_person_photo_alter_person_photo_thumb"),
+        ("meeting", "0011_alter_slidesubmission_doc"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Registration",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("first_name", models.CharField(max_length=255)),
+                ("last_name", models.CharField(max_length=255)),
+                ("affiliation", models.CharField(blank=True, max_length=255)),
+                ("country_code", models.CharField(max_length=2)),
+                ("email", models.EmailField(blank=True, max_length=254, null=True)),
+                ("attended", models.BooleanField(default=False)),
+                ("checkedin", models.BooleanField(default=False)),
+                (
+                    "meeting",
+                    ietf.utils.models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="meeting.meeting",
+                    ),
+                ),
+                (
+                    "person",
+                    ietf.utils.models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="person.person",
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="RegistrationTicket",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "attendance_type",
+                    ietf.utils.models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="name.attendancetypename",
+                    ),
+                ),
+                (
+                    "registration",
+                    ietf.utils.models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="tickets",
+                        to="meeting.registration",
+                    ),
+                ),
+                (
+                    "ticket_type",
+                    ietf.utils.models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="name.registrationtickettypename",
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0013_correct_reg_checkedin.py b/ietf/meeting/migrations/0013_correct_reg_checkedin.py
new file mode 100644
index 0000000000..88b3efceac
--- /dev/null
+++ b/ietf/meeting/migrations/0013_correct_reg_checkedin.py
@@ -0,0 +1,41 @@
+# Generated by Django 4.2.21 on 2025-05-20 22:28
+
+'''
+The original migration had a flaw. If a participant had both a remote and onsite
+registration, which is rare but does occur, which registration the checkedin state
+came from was indeterminate. If it came from the remote registration it would be
+False which might be wrong. This migration finds all registrations with onsite tickets
+and checkedin is False, and checks if it is correct, and fixes if needed.
+'''
+
+from django.db import migrations
+import datetime
+
+
+def forward(apps, schema_editor):
+    Registration = apps.get_model('meeting', 'Registration')
+    MeetingRegistration = apps.get_model('stats', 'MeetingRegistration')
+    today = datetime.date.today()
+    for reg in Registration.objects.filter(tickets__attendance_type__slug='onsite', checkedin=False, meeting__date__lt=today).order_by('meeting__number'):
+        # get original MeetingRegistration
+        mregs = MeetingRegistration.objects.filter(meeting=reg.meeting, email=reg.email, reg_type='onsite')
+        mregs_checkedin = [mr.checkedin for mr in mregs]
+        if any(mregs_checkedin):
+            reg.checkedin = True
+            reg.save()
+            print(f'updating {reg.meeting}:{reg.email}:{reg.pk}')
+
+
+def reverse(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0012_registration_registrationticket"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/meeting/migrations/0013_make_separate_break_sessobj.py b/ietf/meeting/migrations/0013_make_separate_break_sessobj.py
deleted file mode 100644
index ceea5179d2..0000000000
--- a/ietf/meeting/migrations/0013_make_separate_break_sessobj.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-03-23 06:11
-
-
-import datetime
-from django.db import migrations
-
-
-def copy_session(session):
-    session.pk = None
-    session.save()
-    return session
-
-
-def forward(apps, schema_editor):
-    Meeting = apps.get_model('meeting', 'Meeting')
-    today = datetime.datetime.today()
-    meetings = Meeting.objects.filter(date__gt=today, type='ietf')
-    for meeting in meetings:
-        sessions = meeting.session_set.filter(type__in=['break', 'reg'])
-        for session in sessions:
-            assignments = session.timeslotassignments.filter(schedule=meeting.agenda)
-            if assignments.count() > 1:
-                ids = [ a.id for a in assignments ]
-                first_assignment = session.timeslotassignments.get(id=ids[0])
-                original_session = first_assignment.session
-                for assignment in session.timeslotassignments.filter(id__in=ids[1:]):
-                    assignment.session = copy_session(original_session)
-                    assignment.save()
-
-def backward(apps, schema_editor):
-    return
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0012_add_slide_submissions'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, backward),
-    ]
diff --git a/ietf/meeting/migrations/0014_alter_floorplan_image.py b/ietf/meeting/migrations/0014_alter_floorplan_image.py
new file mode 100644
index 0000000000..e125625edc
--- /dev/null
+++ b/ietf/meeting/migrations/0014_alter_floorplan_image.py
@@ -0,0 +1,25 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+import ietf.meeting.models
+import ietf.utils.storage
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("meeting", "0013_correct_reg_checkedin"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="floorplan",
+            name="image",
+            field=models.ImageField(
+                default=None,
+                storage=ietf.utils.storage.BlobShadowFileSystemStorage(
+                    kind="", location=None
+                ),
+                upload_to=ietf.meeting.models.floorplan_path,
+            ),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0014_auto_20190426_0305.py b/ietf/meeting/migrations/0014_auto_20190426_0305.py
deleted file mode 100644
index 8f4b6b0b3b..0000000000
--- a/ietf/meeting/migrations/0014_auto_20190426_0305.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-04-26 03:05
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0013_make_separate_break_sessobj'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='country',
-            field=models.CharField(blank=True, choices=[('', ''), ('AF', 'Afghanistan'), ('AL', 'Albania'), ('DZ', 'Algeria'), ('AD', 'Andorra'), ('AO', 'Angola'), ('AI', 'Anguilla'), ('AQ', 'Antarctica'), ('AG', 'Antigua & Barbuda'), ('AR', 'Argentina'), ('AM', 'Armenia'), ('AW', 'Aruba'), ('AU', 'Australia'), ('AT', 'Austria'), ('AZ', 'Azerbaijan'), ('BS', 'Bahamas'), ('BH', 'Bahrain'), ('BD', 'Bangladesh'), ('BB', 'Barbados'), ('BY', 'Belarus'), ('BE', 'Belgium'), ('BZ', 'Belize'), ('BJ', 'Benin'), ('BM', 'Bermuda'), ('BT', 'Bhutan'), ('BO', 'Bolivia'), ('BA', 'Bosnia & Herzegovina'), ('BW', 'Botswana'), ('BV', 'Bouvet Island'), ('BR', 'Brazil'), ('GB', 'Britain (UK)'), ('IO', 'British Indian Ocean Territory'), ('BN', 'Brunei'), ('BG', 'Bulgaria'), ('BF', 'Burkina Faso'), ('BI', 'Burundi'), ('KH', 'Cambodia'), ('CM', 'Cameroon'), ('CA', 'Canada'), ('CV', 'Cape Verde'), ('BQ', 'Caribbean NL'), ('KY', 'Cayman Islands'), ('CF', 'Central African Rep.'), ('TD', 'Chad'), ('CL', 'Chile'), ('CN', 'China'), ('CX', 'Christmas Island'), ('CC', 'Cocos (Keeling) Islands'), ('CO', 'Colombia'), ('KM', 'Comoros'), ('CD', 'Congo (Dem. Rep.)'), ('CG', 'Congo (Rep.)'), ('CK', 'Cook Islands'), ('CR', 'Costa Rica'), ('HR', 'Croatia'), ('CU', 'Cuba'), ('CW', 'Cura\xe7ao'), ('CY', 'Cyprus'), ('CZ', 'Czech Republic'), ('CI', "C\xf4te d'Ivoire"), ('DK', 'Denmark'), ('DJ', 'Djibouti'), ('DM', 'Dominica'), ('DO', 'Dominican Republic'), ('TL', 'East Timor'), ('EC', 'Ecuador'), ('EG', 'Egypt'), ('SV', 'El Salvador'), ('GQ', 'Equatorial Guinea'), ('ER', 'Eritrea'), ('EE', 'Estonia'), ('SZ', 'Eswatini (Swaziland)'), ('ET', 'Ethiopia'), ('FK', 'Falkland Islands'), ('FO', 'Faroe Islands'), ('FJ', 'Fiji'), ('FI', 'Finland'), ('FR', 'France'), ('GF', 'French Guiana'), ('PF', 'French Polynesia'), ('TF', 'French Southern & Antarctic Lands'), ('GA', 'Gabon'), ('GM', 'Gambia'), ('GE', 'Georgia'), ('DE', 'Germany'), ('GH', 'Ghana'), ('GI', 'Gibraltar'), ('GR', 'Greece'), ('GL', 'Greenland'), ('GD', 'Grenada'), ('GP', 'Guadeloupe'), ('GU', 'Guam'), ('GT', 'Guatemala'), ('GG', 'Guernsey'), ('GN', 'Guinea'), ('GW', 'Guinea-Bissau'), ('GY', 'Guyana'), ('HT', 'Haiti'), ('HM', 'Heard Island & McDonald Islands'), ('HN', 'Honduras'), ('HK', 'Hong Kong'), ('HU', 'Hungary'), ('IS', 'Iceland'), ('IN', 'India'), ('ID', 'Indonesia'), ('IR', 'Iran'), ('IQ', 'Iraq'), ('IE', 'Ireland'), ('IM', 'Isle of Man'), ('IL', 'Israel'), ('IT', 'Italy'), ('JM', 'Jamaica'), ('JP', 'Japan'), ('JE', 'Jersey'), ('JO', 'Jordan'), ('KZ', 'Kazakhstan'), ('KE', 'Kenya'), ('KI', 'Kiribati'), ('KP', 'Korea (North)'), ('KR', 'Korea (South)'), ('KW', 'Kuwait'), ('KG', 'Kyrgyzstan'), ('LA', 'Laos'), ('LV', 'Latvia'), ('LB', 'Lebanon'), ('LS', 'Lesotho'), ('LR', 'Liberia'), ('LY', 'Libya'), ('LI', 'Liechtenstein'), ('LT', 'Lithuania'), ('LU', 'Luxembourg'), ('MO', 'Macau'), ('MG', 'Madagascar'), ('MW', 'Malawi'), ('MY', 'Malaysia'), ('MV', 'Maldives'), ('ML', 'Mali'), ('MT', 'Malta'), ('MH', 'Marshall Islands'), ('MQ', 'Martinique'), ('MR', 'Mauritania'), ('MU', 'Mauritius'), ('YT', 'Mayotte'), ('MX', 'Mexico'), ('FM', 'Micronesia'), ('MD', 'Moldova'), ('MC', 'Monaco'), ('MN', 'Mongolia'), ('ME', 'Montenegro'), ('MS', 'Montserrat'), ('MA', 'Morocco'), ('MZ', 'Mozambique'), ('MM', 'Myanmar (Burma)'), ('NA', 'Namibia'), ('NR', 'Nauru'), ('NP', 'Nepal'), ('NL', 'Netherlands'), ('NC', 'New Caledonia'), ('NZ', 'New Zealand'), ('NI', 'Nicaragua'), ('NE', 'Niger'), ('NG', 'Nigeria'), ('NU', 'Niue'), ('NF', 'Norfolk Island'), ('MK', 'North Macedonia'), ('MP', 'Northern Mariana Islands'), ('NO', 'Norway'), ('OM', 'Oman'), ('PK', 'Pakistan'), ('PW', 'Palau'), ('PS', 'Palestine'), ('PA', 'Panama'), ('PG', 'Papua New Guinea'), ('PY', 'Paraguay'), ('PE', 'Peru'), ('PH', 'Philippines'), ('PN', 'Pitcairn'), ('PL', 'Poland'), ('PT', 'Portugal'), ('PR', 'Puerto Rico'), ('QA', 'Qatar'), ('RO', 'Romania'), ('RU', 'Russia'), ('RW', 'Rwanda'), ('RE', 'R\xe9union'), ('AS', 'Samoa (American)'), ('WS', 'Samoa (western)'), ('SM', 'San Marino'), ('ST', 'Sao Tome & Principe'), ('SA', 'Saudi Arabia'), ('SN', 'Senegal'), ('RS', 'Serbia'), ('SC', 'Seychelles'), ('SL', 'Sierra Leone'), ('SG', 'Singapore'), ('SK', 'Slovakia'), ('SI', 'Slovenia'), ('SB', 'Solomon Islands'), ('SO', 'Somalia'), ('ZA', 'South Africa'), ('GS', 'South Georgia & the South Sandwich Islands'), ('SS', 'South Sudan'), ('ES', 'Spain'), ('LK', 'Sri Lanka'), ('BL', 'St Barthelemy'), ('SH', 'St Helena'), ('KN', 'St Kitts & Nevis'), ('LC', 'St Lucia'), ('SX', 'St Maarten (Dutch)'), ('MF', 'St Martin (French)'), ('PM', 'St Pierre & Miquelon'), ('VC', 'St Vincent'), ('SD', 'Sudan'), ('SR', 'Suriname'), ('SJ', 'Svalbard & Jan Mayen'), ('SE', 'Sweden'), ('CH', 'Switzerland'), ('SY', 'Syria'), ('TW', 'Taiwan'), ('TJ', 'Tajikistan'), ('TZ', 'Tanzania'), ('TH', 'Thailand'), ('TG', 'Togo'), ('TK', 'Tokelau'), ('TO', 'Tonga'), ('TT', 'Trinidad & Tobago'), ('TN', 'Tunisia'), ('TR', 'Turkey'), ('TM', 'Turkmenistan'), ('TC', 'Turks & Caicos Is'), ('TV', 'Tuvalu'), ('UM', 'US minor outlying islands'), ('UG', 'Uganda'), ('UA', 'Ukraine'), ('AE', 'United Arab Emirates'), ('US', 'United States'), ('UY', 'Uruguay'), ('UZ', 'Uzbekistan'), ('VU', 'Vanuatu'), ('VA', 'Vatican City'), ('VE', 'Venezuela'), ('VN', 'Vietnam'), ('VG', 'Virgin Islands (UK)'), ('VI', 'Virgin Islands (US)'), ('WF', 'Wallis & Futuna'), ('EH', 'Western Sahara'), ('YE', 'Yemen'), ('ZM', 'Zambia'), ('ZW', 'Zimbabwe'), ('AX', '\xc5land Islands')], max_length=2),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0015_alter_meeting_time_zone.py b/ietf/meeting/migrations/0015_alter_meeting_time_zone.py
new file mode 100644
index 0000000000..2a4b7859ee
--- /dev/null
+++ b/ietf/meeting/migrations/0015_alter_meeting_time_zone.py
@@ -0,0 +1,451 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+def forward(apps, schema_editor):
+    """Migrate 'GMT' meeting time zones to 'UTC'"""
+    Meeting = apps.get_model("meeting", "Meeting")
+    Meeting.objects.filter(time_zone="GMT").update(time_zone="UTC")
+
+
+def reverse(apps, schema_editor):
+    pass  # nothing to do
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0014_alter_floorplan_image"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+        migrations.AlterField(
+            model_name="meeting",
+            name="time_zone",
+            field=models.CharField(
+                choices=[
+                    ("", "---------"),
+                    ("Africa/Abidjan", "Africa/Abidjan"),
+                    ("Africa/Accra", "Africa/Accra"),
+                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+                    ("Africa/Algiers", "Africa/Algiers"),
+                    ("Africa/Asmara", "Africa/Asmara"),
+                    ("Africa/Bamako", "Africa/Bamako"),
+                    ("Africa/Bangui", "Africa/Bangui"),
+                    ("Africa/Banjul", "Africa/Banjul"),
+                    ("Africa/Bissau", "Africa/Bissau"),
+                    ("Africa/Blantyre", "Africa/Blantyre"),
+                    ("Africa/Brazzaville", "Africa/Brazzaville"),
+                    ("Africa/Bujumbura", "Africa/Bujumbura"),
+                    ("Africa/Cairo", "Africa/Cairo"),
+                    ("Africa/Casablanca", "Africa/Casablanca"),
+                    ("Africa/Ceuta", "Africa/Ceuta"),
+                    ("Africa/Conakry", "Africa/Conakry"),
+                    ("Africa/Dakar", "Africa/Dakar"),
+                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+                    ("Africa/Djibouti", "Africa/Djibouti"),
+                    ("Africa/Douala", "Africa/Douala"),
+                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+                    ("Africa/Freetown", "Africa/Freetown"),
+                    ("Africa/Gaborone", "Africa/Gaborone"),
+                    ("Africa/Harare", "Africa/Harare"),
+                    ("Africa/Johannesburg", "Africa/Johannesburg"),
+                    ("Africa/Juba", "Africa/Juba"),
+                    ("Africa/Kampala", "Africa/Kampala"),
+                    ("Africa/Khartoum", "Africa/Khartoum"),
+                    ("Africa/Kigali", "Africa/Kigali"),
+                    ("Africa/Kinshasa", "Africa/Kinshasa"),
+                    ("Africa/Lagos", "Africa/Lagos"),
+                    ("Africa/Libreville", "Africa/Libreville"),
+                    ("Africa/Lome", "Africa/Lome"),
+                    ("Africa/Luanda", "Africa/Luanda"),
+                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+                    ("Africa/Lusaka", "Africa/Lusaka"),
+                    ("Africa/Malabo", "Africa/Malabo"),
+                    ("Africa/Maputo", "Africa/Maputo"),
+                    ("Africa/Maseru", "Africa/Maseru"),
+                    ("Africa/Mbabane", "Africa/Mbabane"),
+                    ("Africa/Mogadishu", "Africa/Mogadishu"),
+                    ("Africa/Monrovia", "Africa/Monrovia"),
+                    ("Africa/Nairobi", "Africa/Nairobi"),
+                    ("Africa/Ndjamena", "Africa/Ndjamena"),
+                    ("Africa/Niamey", "Africa/Niamey"),
+                    ("Africa/Nouakchott", "Africa/Nouakchott"),
+                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+                    ("Africa/Tripoli", "Africa/Tripoli"),
+                    ("Africa/Tunis", "Africa/Tunis"),
+                    ("Africa/Windhoek", "Africa/Windhoek"),
+                    ("America/Adak", "America/Adak"),
+                    ("America/Anchorage", "America/Anchorage"),
+                    ("America/Anguilla", "America/Anguilla"),
+                    ("America/Antigua", "America/Antigua"),
+                    ("America/Araguaina", "America/Araguaina"),
+                    (
+                        "America/Argentina/Buenos_Aires",
+                        "America/Argentina/Buenos_Aires",
+                    ),
+                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+                    (
+                        "America/Argentina/Rio_Gallegos",
+                        "America/Argentina/Rio_Gallegos",
+                    ),
+                    ("America/Argentina/Salta", "America/Argentina/Salta"),
+                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+                    ("America/Aruba", "America/Aruba"),
+                    ("America/Asuncion", "America/Asuncion"),
+                    ("America/Atikokan", "America/Atikokan"),
+                    ("America/Bahia", "America/Bahia"),
+                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+                    ("America/Barbados", "America/Barbados"),
+                    ("America/Belem", "America/Belem"),
+                    ("America/Belize", "America/Belize"),
+                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+                    ("America/Boa_Vista", "America/Boa_Vista"),
+                    ("America/Bogota", "America/Bogota"),
+                    ("America/Boise", "America/Boise"),
+                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+                    ("America/Campo_Grande", "America/Campo_Grande"),
+                    ("America/Cancun", "America/Cancun"),
+                    ("America/Caracas", "America/Caracas"),
+                    ("America/Cayenne", "America/Cayenne"),
+                    ("America/Cayman", "America/Cayman"),
+                    ("America/Chicago", "America/Chicago"),
+                    ("America/Chihuahua", "America/Chihuahua"),
+                    ("America/Costa_Rica", "America/Costa_Rica"),
+                    ("America/Creston", "America/Creston"),
+                    ("America/Cuiaba", "America/Cuiaba"),
+                    ("America/Curacao", "America/Curacao"),
+                    ("America/Danmarkshavn", "America/Danmarkshavn"),
+                    ("America/Dawson", "America/Dawson"),
+                    ("America/Dawson_Creek", "America/Dawson_Creek"),
+                    ("America/Denver", "America/Denver"),
+                    ("America/Detroit", "America/Detroit"),
+                    ("America/Dominica", "America/Dominica"),
+                    ("America/Edmonton", "America/Edmonton"),
+                    ("America/Eirunepe", "America/Eirunepe"),
+                    ("America/El_Salvador", "America/El_Salvador"),
+                    ("America/Fort_Nelson", "America/Fort_Nelson"),
+                    ("America/Fortaleza", "America/Fortaleza"),
+                    ("America/Glace_Bay", "America/Glace_Bay"),
+                    ("America/Goose_Bay", "America/Goose_Bay"),
+                    ("America/Grand_Turk", "America/Grand_Turk"),
+                    ("America/Grenada", "America/Grenada"),
+                    ("America/Guadeloupe", "America/Guadeloupe"),
+                    ("America/Guatemala", "America/Guatemala"),
+                    ("America/Guayaquil", "America/Guayaquil"),
+                    ("America/Guyana", "America/Guyana"),
+                    ("America/Halifax", "America/Halifax"),
+                    ("America/Havana", "America/Havana"),
+                    ("America/Hermosillo", "America/Hermosillo"),
+                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+                    ("America/Indiana/Knox", "America/Indiana/Knox"),
+                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+                    ("America/Inuvik", "America/Inuvik"),
+                    ("America/Iqaluit", "America/Iqaluit"),
+                    ("America/Jamaica", "America/Jamaica"),
+                    ("America/Juneau", "America/Juneau"),
+                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+                    ("America/La_Paz", "America/La_Paz"),
+                    ("America/Lima", "America/Lima"),
+                    ("America/Los_Angeles", "America/Los_Angeles"),
+                    ("America/Maceio", "America/Maceio"),
+                    ("America/Managua", "America/Managua"),
+                    ("America/Manaus", "America/Manaus"),
+                    ("America/Martinique", "America/Martinique"),
+                    ("America/Matamoros", "America/Matamoros"),
+                    ("America/Mazatlan", "America/Mazatlan"),
+                    ("America/Menominee", "America/Menominee"),
+                    ("America/Merida", "America/Merida"),
+                    ("America/Metlakatla", "America/Metlakatla"),
+                    ("America/Mexico_City", "America/Mexico_City"),
+                    ("America/Miquelon", "America/Miquelon"),
+                    ("America/Moncton", "America/Moncton"),
+                    ("America/Monterrey", "America/Monterrey"),
+                    ("America/Montevideo", "America/Montevideo"),
+                    ("America/Montserrat", "America/Montserrat"),
+                    ("America/Nassau", "America/Nassau"),
+                    ("America/New_York", "America/New_York"),
+                    ("America/Nipigon", "America/Nipigon"),
+                    ("America/Nome", "America/Nome"),
+                    ("America/Noronha", "America/Noronha"),
+                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+                    (
+                        "America/North_Dakota/New_Salem",
+                        "America/North_Dakota/New_Salem",
+                    ),
+                    ("America/Nuuk", "America/Nuuk"),
+                    ("America/Ojinaga", "America/Ojinaga"),
+                    ("America/Panama", "America/Panama"),
+                    ("America/Pangnirtung", "America/Pangnirtung"),
+                    ("America/Paramaribo", "America/Paramaribo"),
+                    ("America/Phoenix", "America/Phoenix"),
+                    ("America/Port-au-Prince", "America/Port-au-Prince"),
+                    ("America/Port_of_Spain", "America/Port_of_Spain"),
+                    ("America/Porto_Velho", "America/Porto_Velho"),
+                    ("America/Puerto_Rico", "America/Puerto_Rico"),
+                    ("America/Punta_Arenas", "America/Punta_Arenas"),
+                    ("America/Rainy_River", "America/Rainy_River"),
+                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+                    ("America/Recife", "America/Recife"),
+                    ("America/Regina", "America/Regina"),
+                    ("America/Resolute", "America/Resolute"),
+                    ("America/Rio_Branco", "America/Rio_Branco"),
+                    ("America/Santarem", "America/Santarem"),
+                    ("America/Santiago", "America/Santiago"),
+                    ("America/Santo_Domingo", "America/Santo_Domingo"),
+                    ("America/Sao_Paulo", "America/Sao_Paulo"),
+                    ("America/Scoresbysund", "America/Scoresbysund"),
+                    ("America/Sitka", "America/Sitka"),
+                    ("America/St_Johns", "America/St_Johns"),
+                    ("America/St_Kitts", "America/St_Kitts"),
+                    ("America/St_Lucia", "America/St_Lucia"),
+                    ("America/St_Thomas", "America/St_Thomas"),
+                    ("America/St_Vincent", "America/St_Vincent"),
+                    ("America/Swift_Current", "America/Swift_Current"),
+                    ("America/Tegucigalpa", "America/Tegucigalpa"),
+                    ("America/Thule", "America/Thule"),
+                    ("America/Thunder_Bay", "America/Thunder_Bay"),
+                    ("America/Tijuana", "America/Tijuana"),
+                    ("America/Toronto", "America/Toronto"),
+                    ("America/Tortola", "America/Tortola"),
+                    ("America/Vancouver", "America/Vancouver"),
+                    ("America/Whitehorse", "America/Whitehorse"),
+                    ("America/Winnipeg", "America/Winnipeg"),
+                    ("America/Yakutat", "America/Yakutat"),
+                    ("America/Yellowknife", "America/Yellowknife"),
+                    ("Antarctica/Casey", "Antarctica/Casey"),
+                    ("Antarctica/Davis", "Antarctica/Davis"),
+                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+                    ("Antarctica/Mawson", "Antarctica/Mawson"),
+                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+                    ("Antarctica/Palmer", "Antarctica/Palmer"),
+                    ("Antarctica/Rothera", "Antarctica/Rothera"),
+                    ("Antarctica/Syowa", "Antarctica/Syowa"),
+                    ("Antarctica/Troll", "Antarctica/Troll"),
+                    ("Antarctica/Vostok", "Antarctica/Vostok"),
+                    ("Asia/Aden", "Asia/Aden"),
+                    ("Asia/Almaty", "Asia/Almaty"),
+                    ("Asia/Amman", "Asia/Amman"),
+                    ("Asia/Anadyr", "Asia/Anadyr"),
+                    ("Asia/Aqtau", "Asia/Aqtau"),
+                    ("Asia/Aqtobe", "Asia/Aqtobe"),
+                    ("Asia/Ashgabat", "Asia/Ashgabat"),
+                    ("Asia/Atyrau", "Asia/Atyrau"),
+                    ("Asia/Baghdad", "Asia/Baghdad"),
+                    ("Asia/Bahrain", "Asia/Bahrain"),
+                    ("Asia/Baku", "Asia/Baku"),
+                    ("Asia/Bangkok", "Asia/Bangkok"),
+                    ("Asia/Barnaul", "Asia/Barnaul"),
+                    ("Asia/Beirut", "Asia/Beirut"),
+                    ("Asia/Bishkek", "Asia/Bishkek"),
+                    ("Asia/Brunei", "Asia/Brunei"),
+                    ("Asia/Chita", "Asia/Chita"),
+                    ("Asia/Choibalsan", "Asia/Choibalsan"),
+                    ("Asia/Colombo", "Asia/Colombo"),
+                    ("Asia/Damascus", "Asia/Damascus"),
+                    ("Asia/Dhaka", "Asia/Dhaka"),
+                    ("Asia/Dili", "Asia/Dili"),
+                    ("Asia/Dubai", "Asia/Dubai"),
+                    ("Asia/Dushanbe", "Asia/Dushanbe"),
+                    ("Asia/Famagusta", "Asia/Famagusta"),
+                    ("Asia/Gaza", "Asia/Gaza"),
+                    ("Asia/Hebron", "Asia/Hebron"),
+                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+                    ("Asia/Hovd", "Asia/Hovd"),
+                    ("Asia/Irkutsk", "Asia/Irkutsk"),
+                    ("Asia/Jakarta", "Asia/Jakarta"),
+                    ("Asia/Jayapura", "Asia/Jayapura"),
+                    ("Asia/Jerusalem", "Asia/Jerusalem"),
+                    ("Asia/Kabul", "Asia/Kabul"),
+                    ("Asia/Kamchatka", "Asia/Kamchatka"),
+                    ("Asia/Karachi", "Asia/Karachi"),
+                    ("Asia/Kathmandu", "Asia/Kathmandu"),
+                    ("Asia/Khandyga", "Asia/Khandyga"),
+                    ("Asia/Kolkata", "Asia/Kolkata"),
+                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+                    ("Asia/Kuching", "Asia/Kuching"),
+                    ("Asia/Kuwait", "Asia/Kuwait"),
+                    ("Asia/Macau", "Asia/Macau"),
+                    ("Asia/Magadan", "Asia/Magadan"),
+                    ("Asia/Makassar", "Asia/Makassar"),
+                    ("Asia/Manila", "Asia/Manila"),
+                    ("Asia/Muscat", "Asia/Muscat"),
+                    ("Asia/Nicosia", "Asia/Nicosia"),
+                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+                    ("Asia/Omsk", "Asia/Omsk"),
+                    ("Asia/Oral", "Asia/Oral"),
+                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+                    ("Asia/Pontianak", "Asia/Pontianak"),
+                    ("Asia/Pyongyang", "Asia/Pyongyang"),
+                    ("Asia/Qatar", "Asia/Qatar"),
+                    ("Asia/Qostanay", "Asia/Qostanay"),
+                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+                    ("Asia/Riyadh", "Asia/Riyadh"),
+                    ("Asia/Sakhalin", "Asia/Sakhalin"),
+                    ("Asia/Samarkand", "Asia/Samarkand"),
+                    ("Asia/Seoul", "Asia/Seoul"),
+                    ("Asia/Shanghai", "Asia/Shanghai"),
+                    ("Asia/Singapore", "Asia/Singapore"),
+                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+                    ("Asia/Taipei", "Asia/Taipei"),
+                    ("Asia/Tashkent", "Asia/Tashkent"),
+                    ("Asia/Tbilisi", "Asia/Tbilisi"),
+                    ("Asia/Tehran", "Asia/Tehran"),
+                    ("Asia/Thimphu", "Asia/Thimphu"),
+                    ("Asia/Tokyo", "Asia/Tokyo"),
+                    ("Asia/Tomsk", "Asia/Tomsk"),
+                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+                    ("Asia/Urumqi", "Asia/Urumqi"),
+                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+                    ("Asia/Vientiane", "Asia/Vientiane"),
+                    ("Asia/Vladivostok", "Asia/Vladivostok"),
+                    ("Asia/Yakutsk", "Asia/Yakutsk"),
+                    ("Asia/Yangon", "Asia/Yangon"),
+                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+                    ("Asia/Yerevan", "Asia/Yerevan"),
+                    ("Atlantic/Azores", "Atlantic/Azores"),
+                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+                    ("Atlantic/Canary", "Atlantic/Canary"),
+                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+                    ("Atlantic/Faroe", "Atlantic/Faroe"),
+                    ("Atlantic/Madeira", "Atlantic/Madeira"),
+                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+                    ("Atlantic/Stanley", "Atlantic/Stanley"),
+                    ("Australia/Adelaide", "Australia/Adelaide"),
+                    ("Australia/Brisbane", "Australia/Brisbane"),
+                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+                    ("Australia/Darwin", "Australia/Darwin"),
+                    ("Australia/Eucla", "Australia/Eucla"),
+                    ("Australia/Hobart", "Australia/Hobart"),
+                    ("Australia/Lindeman", "Australia/Lindeman"),
+                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+                    ("Australia/Melbourne", "Australia/Melbourne"),
+                    ("Australia/Perth", "Australia/Perth"),
+                    ("Australia/Sydney", "Australia/Sydney"),
+                    ("Europe/Amsterdam", "Europe/Amsterdam"),
+                    ("Europe/Andorra", "Europe/Andorra"),
+                    ("Europe/Astrakhan", "Europe/Astrakhan"),
+                    ("Europe/Athens", "Europe/Athens"),
+                    ("Europe/Belgrade", "Europe/Belgrade"),
+                    ("Europe/Berlin", "Europe/Berlin"),
+                    ("Europe/Brussels", "Europe/Brussels"),
+                    ("Europe/Bucharest", "Europe/Bucharest"),
+                    ("Europe/Budapest", "Europe/Budapest"),
+                    ("Europe/Chisinau", "Europe/Chisinau"),
+                    ("Europe/Copenhagen", "Europe/Copenhagen"),
+                    ("Europe/Dublin", "Europe/Dublin"),
+                    ("Europe/Gibraltar", "Europe/Gibraltar"),
+                    ("Europe/Helsinki", "Europe/Helsinki"),
+                    ("Europe/Istanbul", "Europe/Istanbul"),
+                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+                    ("Europe/Kirov", "Europe/Kirov"),
+                    ("Europe/Kyiv", "Europe/Kyiv"),
+                    ("Europe/Lisbon", "Europe/Lisbon"),
+                    ("Europe/London", "Europe/London"),
+                    ("Europe/Luxembourg", "Europe/Luxembourg"),
+                    ("Europe/Madrid", "Europe/Madrid"),
+                    ("Europe/Malta", "Europe/Malta"),
+                    ("Europe/Minsk", "Europe/Minsk"),
+                    ("Europe/Monaco", "Europe/Monaco"),
+                    ("Europe/Moscow", "Europe/Moscow"),
+                    ("Europe/Oslo", "Europe/Oslo"),
+                    ("Europe/Paris", "Europe/Paris"),
+                    ("Europe/Prague", "Europe/Prague"),
+                    ("Europe/Riga", "Europe/Riga"),
+                    ("Europe/Rome", "Europe/Rome"),
+                    ("Europe/Samara", "Europe/Samara"),
+                    ("Europe/Saratov", "Europe/Saratov"),
+                    ("Europe/Simferopol", "Europe/Simferopol"),
+                    ("Europe/Sofia", "Europe/Sofia"),
+                    ("Europe/Stockholm", "Europe/Stockholm"),
+                    ("Europe/Tallinn", "Europe/Tallinn"),
+                    ("Europe/Tirane", "Europe/Tirane"),
+                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+                    ("Europe/Uzhgorod", "Europe/Uzhgorod"),
+                    ("Europe/Vaduz", "Europe/Vaduz"),
+                    ("Europe/Vienna", "Europe/Vienna"),
+                    ("Europe/Vilnius", "Europe/Vilnius"),
+                    ("Europe/Volgograd", "Europe/Volgograd"),
+                    ("Europe/Warsaw", "Europe/Warsaw"),
+                    ("Europe/Zaporozhye", "Europe/Zaporozhye"),
+                    ("Europe/Zurich", "Europe/Zurich"),
+                    ("Indian/Antananarivo", "Indian/Antananarivo"),
+                    ("Indian/Chagos", "Indian/Chagos"),
+                    ("Indian/Christmas", "Indian/Christmas"),
+                    ("Indian/Cocos", "Indian/Cocos"),
+                    ("Indian/Comoro", "Indian/Comoro"),
+                    ("Indian/Kerguelen", "Indian/Kerguelen"),
+                    ("Indian/Mahe", "Indian/Mahe"),
+                    ("Indian/Maldives", "Indian/Maldives"),
+                    ("Indian/Mauritius", "Indian/Mauritius"),
+                    ("Indian/Mayotte", "Indian/Mayotte"),
+                    ("Indian/Reunion", "Indian/Reunion"),
+                    ("Pacific/Apia", "Pacific/Apia"),
+                    ("Pacific/Auckland", "Pacific/Auckland"),
+                    ("Pacific/Bougainville", "Pacific/Bougainville"),
+                    ("Pacific/Chatham", "Pacific/Chatham"),
+                    ("Pacific/Chuuk", "Pacific/Chuuk"),
+                    ("Pacific/Easter", "Pacific/Easter"),
+                    ("Pacific/Efate", "Pacific/Efate"),
+                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+                    ("Pacific/Fiji", "Pacific/Fiji"),
+                    ("Pacific/Funafuti", "Pacific/Funafuti"),
+                    ("Pacific/Galapagos", "Pacific/Galapagos"),
+                    ("Pacific/Gambier", "Pacific/Gambier"),
+                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+                    ("Pacific/Guam", "Pacific/Guam"),
+                    ("Pacific/Honolulu", "Pacific/Honolulu"),
+                    ("Pacific/Kanton", "Pacific/Kanton"),
+                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+                    ("Pacific/Kosrae", "Pacific/Kosrae"),
+                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+                    ("Pacific/Majuro", "Pacific/Majuro"),
+                    ("Pacific/Marquesas", "Pacific/Marquesas"),
+                    ("Pacific/Midway", "Pacific/Midway"),
+                    ("Pacific/Nauru", "Pacific/Nauru"),
+                    ("Pacific/Niue", "Pacific/Niue"),
+                    ("Pacific/Norfolk", "Pacific/Norfolk"),
+                    ("Pacific/Noumea", "Pacific/Noumea"),
+                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+                    ("Pacific/Palau", "Pacific/Palau"),
+                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+                    ("Pacific/Saipan", "Pacific/Saipan"),
+                    ("Pacific/Tahiti", "Pacific/Tahiti"),
+                    ("Pacific/Tarawa", "Pacific/Tarawa"),
+                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+                    ("Pacific/Wake", "Pacific/Wake"),
+                    ("Pacific/Wallis", "Pacific/Wallis"),
+                    ("UTC", "UTC"),
+                ],
+                default="UTC",
+                max_length=255,
+            ),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py b/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py
deleted file mode 100644
index 257a5060cb..0000000000
--- a/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 11:58
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0015_1_add_fk_to_document_id'),
-        ('meeting', '0014_auto_20190426_0305'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='sessionpresentation',
-            name='document2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AlterField(
-            model_name='sessionpresentation',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_sesspres', to='doc.Document', to_field=b'name'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0016_alter_meeting_country_alter_meeting_time_zone.py b/ietf/meeting/migrations/0016_alter_meeting_country_alter_meeting_time_zone.py
new file mode 100644
index 0000000000..8c467ea156
--- /dev/null
+++ b/ietf/meeting/migrations/0016_alter_meeting_country_alter_meeting_time_zone.py
@@ -0,0 +1,694 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meeting", "0015_alter_meeting_time_zone"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="meeting",
+            name="country",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("", "---------"),
+                    ("AF", "Afghanistan"),
+                    ("AL", "Albania"),
+                    ("DZ", "Algeria"),
+                    ("AD", "Andorra"),
+                    ("AO", "Angola"),
+                    ("AI", "Anguilla"),
+                    ("AQ", "Antarctica"),
+                    ("AG", "Antigua & Barbuda"),
+                    ("AR", "Argentina"),
+                    ("AM", "Armenia"),
+                    ("AW", "Aruba"),
+                    ("AU", "Australia"),
+                    ("AT", "Austria"),
+                    ("AZ", "Azerbaijan"),
+                    ("BS", "Bahamas"),
+                    ("BH", "Bahrain"),
+                    ("BD", "Bangladesh"),
+                    ("BB", "Barbados"),
+                    ("BY", "Belarus"),
+                    ("BE", "Belgium"),
+                    ("BZ", "Belize"),
+                    ("BJ", "Benin"),
+                    ("BM", "Bermuda"),
+                    ("BT", "Bhutan"),
+                    ("BO", "Bolivia"),
+                    ("BA", "Bosnia & Herzegovina"),
+                    ("BW", "Botswana"),
+                    ("BV", "Bouvet Island"),
+                    ("BR", "Brazil"),
+                    ("GB", "Britain (UK)"),
+                    ("IO", "British Indian Ocean Territory"),
+                    ("BN", "Brunei"),
+                    ("BG", "Bulgaria"),
+                    ("BF", "Burkina Faso"),
+                    ("BI", "Burundi"),
+                    ("KH", "Cambodia"),
+                    ("CM", "Cameroon"),
+                    ("CA", "Canada"),
+                    ("CV", "Cape Verde"),
+                    ("BQ", "Caribbean NL"),
+                    ("KY", "Cayman Islands"),
+                    ("CF", "Central African Rep."),
+                    ("TD", "Chad"),
+                    ("CL", "Chile"),
+                    ("CN", "China"),
+                    ("CX", "Christmas Island"),
+                    ("CC", "Cocos (Keeling) Islands"),
+                    ("CO", "Colombia"),
+                    ("KM", "Comoros"),
+                    ("CD", "Congo (Dem. Rep.)"),
+                    ("CG", "Congo (Rep.)"),
+                    ("CK", "Cook Islands"),
+                    ("CR", "Costa Rica"),
+                    ("HR", "Croatia"),
+                    ("CU", "Cuba"),
+                    ("CW", "Curaçao"),
+                    ("CY", "Cyprus"),
+                    ("CZ", "Czech Republic"),
+                    ("CI", "Côte d'Ivoire"),
+                    ("DK", "Denmark"),
+                    ("DJ", "Djibouti"),
+                    ("DM", "Dominica"),
+                    ("DO", "Dominican Republic"),
+                    ("TL", "East Timor"),
+                    ("EC", "Ecuador"),
+                    ("EG", "Egypt"),
+                    ("SV", "El Salvador"),
+                    ("GQ", "Equatorial Guinea"),
+                    ("ER", "Eritrea"),
+                    ("EE", "Estonia"),
+                    ("SZ", "Eswatini (Swaziland)"),
+                    ("ET", "Ethiopia"),
+                    ("FK", "Falkland Islands"),
+                    ("FO", "Faroe Islands"),
+                    ("FJ", "Fiji"),
+                    ("FI", "Finland"),
+                    ("FR", "France"),
+                    ("GF", "French Guiana"),
+                    ("PF", "French Polynesia"),
+                    ("TF", "French S. Terr."),
+                    ("GA", "Gabon"),
+                    ("GM", "Gambia"),
+                    ("GE", "Georgia"),
+                    ("DE", "Germany"),
+                    ("GH", "Ghana"),
+                    ("GI", "Gibraltar"),
+                    ("GR", "Greece"),
+                    ("GL", "Greenland"),
+                    ("GD", "Grenada"),
+                    ("GP", "Guadeloupe"),
+                    ("GU", "Guam"),
+                    ("GT", "Guatemala"),
+                    ("GG", "Guernsey"),
+                    ("GN", "Guinea"),
+                    ("GW", "Guinea-Bissau"),
+                    ("GY", "Guyana"),
+                    ("HT", "Haiti"),
+                    ("HM", "Heard Island & McDonald Islands"),
+                    ("HN", "Honduras"),
+                    ("HK", "Hong Kong"),
+                    ("HU", "Hungary"),
+                    ("IS", "Iceland"),
+                    ("IN", "India"),
+                    ("ID", "Indonesia"),
+                    ("IR", "Iran"),
+                    ("IQ", "Iraq"),
+                    ("IE", "Ireland"),
+                    ("IM", "Isle of Man"),
+                    ("IL", "Israel"),
+                    ("IT", "Italy"),
+                    ("JM", "Jamaica"),
+                    ("JP", "Japan"),
+                    ("JE", "Jersey"),
+                    ("JO", "Jordan"),
+                    ("KZ", "Kazakhstan"),
+                    ("KE", "Kenya"),
+                    ("KI", "Kiribati"),
+                    ("KP", "Korea (North)"),
+                    ("KR", "Korea (South)"),
+                    ("KW", "Kuwait"),
+                    ("KG", "Kyrgyzstan"),
+                    ("LA", "Laos"),
+                    ("LV", "Latvia"),
+                    ("LB", "Lebanon"),
+                    ("LS", "Lesotho"),
+                    ("LR", "Liberia"),
+                    ("LY", "Libya"),
+                    ("LI", "Liechtenstein"),
+                    ("LT", "Lithuania"),
+                    ("LU", "Luxembourg"),
+                    ("MO", "Macau"),
+                    ("MG", "Madagascar"),
+                    ("MW", "Malawi"),
+                    ("MY", "Malaysia"),
+                    ("MV", "Maldives"),
+                    ("ML", "Mali"),
+                    ("MT", "Malta"),
+                    ("MH", "Marshall Islands"),
+                    ("MQ", "Martinique"),
+                    ("MR", "Mauritania"),
+                    ("MU", "Mauritius"),
+                    ("YT", "Mayotte"),
+                    ("MX", "Mexico"),
+                    ("FM", "Micronesia"),
+                    ("MD", "Moldova"),
+                    ("MC", "Monaco"),
+                    ("MN", "Mongolia"),
+                    ("ME", "Montenegro"),
+                    ("MS", "Montserrat"),
+                    ("MA", "Morocco"),
+                    ("MZ", "Mozambique"),
+                    ("MM", "Myanmar (Burma)"),
+                    ("NA", "Namibia"),
+                    ("NR", "Nauru"),
+                    ("NP", "Nepal"),
+                    ("NL", "Netherlands"),
+                    ("NC", "New Caledonia"),
+                    ("NZ", "New Zealand"),
+                    ("NI", "Nicaragua"),
+                    ("NE", "Niger"),
+                    ("NG", "Nigeria"),
+                    ("NU", "Niue"),
+                    ("NF", "Norfolk Island"),
+                    ("MK", "North Macedonia"),
+                    ("MP", "Northern Mariana Islands"),
+                    ("NO", "Norway"),
+                    ("OM", "Oman"),
+                    ("PK", "Pakistan"),
+                    ("PW", "Palau"),
+                    ("PS", "Palestine"),
+                    ("PA", "Panama"),
+                    ("PG", "Papua New Guinea"),
+                    ("PY", "Paraguay"),
+                    ("PE", "Peru"),
+                    ("PH", "Philippines"),
+                    ("PN", "Pitcairn"),
+                    ("PL", "Poland"),
+                    ("PT", "Portugal"),
+                    ("PR", "Puerto Rico"),
+                    ("QA", "Qatar"),
+                    ("RO", "Romania"),
+                    ("RU", "Russia"),
+                    ("RW", "Rwanda"),
+                    ("RE", "Réunion"),
+                    ("AS", "Samoa (American)"),
+                    ("WS", "Samoa (western)"),
+                    ("SM", "San Marino"),
+                    ("ST", "Sao Tome & Principe"),
+                    ("SA", "Saudi Arabia"),
+                    ("SN", "Senegal"),
+                    ("RS", "Serbia"),
+                    ("SC", "Seychelles"),
+                    ("SL", "Sierra Leone"),
+                    ("SG", "Singapore"),
+                    ("SK", "Slovakia"),
+                    ("SI", "Slovenia"),
+                    ("SB", "Solomon Islands"),
+                    ("SO", "Somalia"),
+                    ("ZA", "South Africa"),
+                    ("GS", "South Georgia & the South Sandwich Islands"),
+                    ("SS", "South Sudan"),
+                    ("ES", "Spain"),
+                    ("LK", "Sri Lanka"),
+                    ("BL", "St Barthelemy"),
+                    ("SH", "St Helena"),
+                    ("KN", "St Kitts & Nevis"),
+                    ("LC", "St Lucia"),
+                    ("SX", "St Maarten (Dutch)"),
+                    ("MF", "St Martin (French)"),
+                    ("PM", "St Pierre & Miquelon"),
+                    ("VC", "St Vincent"),
+                    ("SD", "Sudan"),
+                    ("SR", "Suriname"),
+                    ("SJ", "Svalbard & Jan Mayen"),
+                    ("SE", "Sweden"),
+                    ("CH", "Switzerland"),
+                    ("SY", "Syria"),
+                    ("TW", "Taiwan"),
+                    ("TJ", "Tajikistan"),
+                    ("TZ", "Tanzania"),
+                    ("TH", "Thailand"),
+                    ("TG", "Togo"),
+                    ("TK", "Tokelau"),
+                    ("TO", "Tonga"),
+                    ("TT", "Trinidad & Tobago"),
+                    ("TN", "Tunisia"),
+                    ("TR", "Turkey"),
+                    ("TM", "Turkmenistan"),
+                    ("TC", "Turks & Caicos Is"),
+                    ("TV", "Tuvalu"),
+                    ("UM", "US minor outlying islands"),
+                    ("UG", "Uganda"),
+                    ("UA", "Ukraine"),
+                    ("AE", "United Arab Emirates"),
+                    ("US", "United States"),
+                    ("UY", "Uruguay"),
+                    ("UZ", "Uzbekistan"),
+                    ("VU", "Vanuatu"),
+                    ("VA", "Vatican City"),
+                    ("VE", "Venezuela"),
+                    ("VN", "Vietnam"),
+                    ("VG", "Virgin Islands (UK)"),
+                    ("VI", "Virgin Islands (US)"),
+                    ("WF", "Wallis & Futuna"),
+                    ("EH", "Western Sahara"),
+                    ("YE", "Yemen"),
+                    ("ZM", "Zambia"),
+                    ("ZW", "Zimbabwe"),
+                    ("AX", "Åland Islands"),
+                ],
+                max_length=2,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="meeting",
+            name="time_zone",
+            field=models.CharField(
+                choices=[
+                    ("", "---------"),
+                    ("Africa/Abidjan", "Africa/Abidjan"),
+                    ("Africa/Accra", "Africa/Accra"),
+                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+                    ("Africa/Algiers", "Africa/Algiers"),
+                    ("Africa/Asmara", "Africa/Asmara"),
+                    ("Africa/Bamako", "Africa/Bamako"),
+                    ("Africa/Bangui", "Africa/Bangui"),
+                    ("Africa/Banjul", "Africa/Banjul"),
+                    ("Africa/Bissau", "Africa/Bissau"),
+                    ("Africa/Blantyre", "Africa/Blantyre"),
+                    ("Africa/Brazzaville", "Africa/Brazzaville"),
+                    ("Africa/Bujumbura", "Africa/Bujumbura"),
+                    ("Africa/Cairo", "Africa/Cairo"),
+                    ("Africa/Casablanca", "Africa/Casablanca"),
+                    ("Africa/Ceuta", "Africa/Ceuta"),
+                    ("Africa/Conakry", "Africa/Conakry"),
+                    ("Africa/Dakar", "Africa/Dakar"),
+                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+                    ("Africa/Djibouti", "Africa/Djibouti"),
+                    ("Africa/Douala", "Africa/Douala"),
+                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+                    ("Africa/Freetown", "Africa/Freetown"),
+                    ("Africa/Gaborone", "Africa/Gaborone"),
+                    ("Africa/Harare", "Africa/Harare"),
+                    ("Africa/Johannesburg", "Africa/Johannesburg"),
+                    ("Africa/Juba", "Africa/Juba"),
+                    ("Africa/Kampala", "Africa/Kampala"),
+                    ("Africa/Khartoum", "Africa/Khartoum"),
+                    ("Africa/Kigali", "Africa/Kigali"),
+                    ("Africa/Kinshasa", "Africa/Kinshasa"),
+                    ("Africa/Lagos", "Africa/Lagos"),
+                    ("Africa/Libreville", "Africa/Libreville"),
+                    ("Africa/Lome", "Africa/Lome"),
+                    ("Africa/Luanda", "Africa/Luanda"),
+                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+                    ("Africa/Lusaka", "Africa/Lusaka"),
+                    ("Africa/Malabo", "Africa/Malabo"),
+                    ("Africa/Maputo", "Africa/Maputo"),
+                    ("Africa/Maseru", "Africa/Maseru"),
+                    ("Africa/Mbabane", "Africa/Mbabane"),
+                    ("Africa/Mogadishu", "Africa/Mogadishu"),
+                    ("Africa/Monrovia", "Africa/Monrovia"),
+                    ("Africa/Nairobi", "Africa/Nairobi"),
+                    ("Africa/Ndjamena", "Africa/Ndjamena"),
+                    ("Africa/Niamey", "Africa/Niamey"),
+                    ("Africa/Nouakchott", "Africa/Nouakchott"),
+                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+                    ("Africa/Tripoli", "Africa/Tripoli"),
+                    ("Africa/Tunis", "Africa/Tunis"),
+                    ("Africa/Windhoek", "Africa/Windhoek"),
+                    ("America/Adak", "America/Adak"),
+                    ("America/Anchorage", "America/Anchorage"),
+                    ("America/Anguilla", "America/Anguilla"),
+                    ("America/Antigua", "America/Antigua"),
+                    ("America/Araguaina", "America/Araguaina"),
+                    (
+                        "America/Argentina/Buenos_Aires",
+                        "America/Argentina/Buenos_Aires",
+                    ),
+                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+                    (
+                        "America/Argentina/Rio_Gallegos",
+                        "America/Argentina/Rio_Gallegos",
+                    ),
+                    ("America/Argentina/Salta", "America/Argentina/Salta"),
+                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+                    ("America/Aruba", "America/Aruba"),
+                    ("America/Asuncion", "America/Asuncion"),
+                    ("America/Atikokan", "America/Atikokan"),
+                    ("America/Bahia", "America/Bahia"),
+                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+                    ("America/Barbados", "America/Barbados"),
+                    ("America/Belem", "America/Belem"),
+                    ("America/Belize", "America/Belize"),
+                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+                    ("America/Boa_Vista", "America/Boa_Vista"),
+                    ("America/Bogota", "America/Bogota"),
+                    ("America/Boise", "America/Boise"),
+                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+                    ("America/Campo_Grande", "America/Campo_Grande"),
+                    ("America/Cancun", "America/Cancun"),
+                    ("America/Caracas", "America/Caracas"),
+                    ("America/Cayenne", "America/Cayenne"),
+                    ("America/Cayman", "America/Cayman"),
+                    ("America/Chicago", "America/Chicago"),
+                    ("America/Chihuahua", "America/Chihuahua"),
+                    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
+                    ("America/Costa_Rica", "America/Costa_Rica"),
+                    ("America/Coyhaique", "America/Coyhaique"),
+                    ("America/Creston", "America/Creston"),
+                    ("America/Cuiaba", "America/Cuiaba"),
+                    ("America/Curacao", "America/Curacao"),
+                    ("America/Danmarkshavn", "America/Danmarkshavn"),
+                    ("America/Dawson", "America/Dawson"),
+                    ("America/Dawson_Creek", "America/Dawson_Creek"),
+                    ("America/Denver", "America/Denver"),
+                    ("America/Detroit", "America/Detroit"),
+                    ("America/Dominica", "America/Dominica"),
+                    ("America/Edmonton", "America/Edmonton"),
+                    ("America/Eirunepe", "America/Eirunepe"),
+                    ("America/El_Salvador", "America/El_Salvador"),
+                    ("America/Fort_Nelson", "America/Fort_Nelson"),
+                    ("America/Fortaleza", "America/Fortaleza"),
+                    ("America/Glace_Bay", "America/Glace_Bay"),
+                    ("America/Goose_Bay", "America/Goose_Bay"),
+                    ("America/Grand_Turk", "America/Grand_Turk"),
+                    ("America/Grenada", "America/Grenada"),
+                    ("America/Guadeloupe", "America/Guadeloupe"),
+                    ("America/Guatemala", "America/Guatemala"),
+                    ("America/Guayaquil", "America/Guayaquil"),
+                    ("America/Guyana", "America/Guyana"),
+                    ("America/Halifax", "America/Halifax"),
+                    ("America/Havana", "America/Havana"),
+                    ("America/Hermosillo", "America/Hermosillo"),
+                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+                    ("America/Indiana/Knox", "America/Indiana/Knox"),
+                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+                    ("America/Inuvik", "America/Inuvik"),
+                    ("America/Iqaluit", "America/Iqaluit"),
+                    ("America/Jamaica", "America/Jamaica"),
+                    ("America/Juneau", "America/Juneau"),
+                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+                    ("America/La_Paz", "America/La_Paz"),
+                    ("America/Lima", "America/Lima"),
+                    ("America/Los_Angeles", "America/Los_Angeles"),
+                    ("America/Maceio", "America/Maceio"),
+                    ("America/Managua", "America/Managua"),
+                    ("America/Manaus", "America/Manaus"),
+                    ("America/Martinique", "America/Martinique"),
+                    ("America/Matamoros", "America/Matamoros"),
+                    ("America/Mazatlan", "America/Mazatlan"),
+                    ("America/Menominee", "America/Menominee"),
+                    ("America/Merida", "America/Merida"),
+                    ("America/Metlakatla", "America/Metlakatla"),
+                    ("America/Mexico_City", "America/Mexico_City"),
+                    ("America/Miquelon", "America/Miquelon"),
+                    ("America/Moncton", "America/Moncton"),
+                    ("America/Monterrey", "America/Monterrey"),
+                    ("America/Montevideo", "America/Montevideo"),
+                    ("America/Montserrat", "America/Montserrat"),
+                    ("America/Nassau", "America/Nassau"),
+                    ("America/New_York", "America/New_York"),
+                    ("America/Nome", "America/Nome"),
+                    ("America/Noronha", "America/Noronha"),
+                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+                    (
+                        "America/North_Dakota/New_Salem",
+                        "America/North_Dakota/New_Salem",
+                    ),
+                    ("America/Nuuk", "America/Nuuk"),
+                    ("America/Ojinaga", "America/Ojinaga"),
+                    ("America/Panama", "America/Panama"),
+                    ("America/Paramaribo", "America/Paramaribo"),
+                    ("America/Phoenix", "America/Phoenix"),
+                    ("America/Port-au-Prince", "America/Port-au-Prince"),
+                    ("America/Port_of_Spain", "America/Port_of_Spain"),
+                    ("America/Porto_Velho", "America/Porto_Velho"),
+                    ("America/Puerto_Rico", "America/Puerto_Rico"),
+                    ("America/Punta_Arenas", "America/Punta_Arenas"),
+                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+                    ("America/Recife", "America/Recife"),
+                    ("America/Regina", "America/Regina"),
+                    ("America/Resolute", "America/Resolute"),
+                    ("America/Rio_Branco", "America/Rio_Branco"),
+                    ("America/Santarem", "America/Santarem"),
+                    ("America/Santiago", "America/Santiago"),
+                    ("America/Santo_Domingo", "America/Santo_Domingo"),
+                    ("America/Sao_Paulo", "America/Sao_Paulo"),
+                    ("America/Scoresbysund", "America/Scoresbysund"),
+                    ("America/Sitka", "America/Sitka"),
+                    ("America/St_Johns", "America/St_Johns"),
+                    ("America/St_Kitts", "America/St_Kitts"),
+                    ("America/St_Lucia", "America/St_Lucia"),
+                    ("America/St_Thomas", "America/St_Thomas"),
+                    ("America/St_Vincent", "America/St_Vincent"),
+                    ("America/Swift_Current", "America/Swift_Current"),
+                    ("America/Tegucigalpa", "America/Tegucigalpa"),
+                    ("America/Thule", "America/Thule"),
+                    ("America/Tijuana", "America/Tijuana"),
+                    ("America/Toronto", "America/Toronto"),
+                    ("America/Tortola", "America/Tortola"),
+                    ("America/Vancouver", "America/Vancouver"),
+                    ("America/Whitehorse", "America/Whitehorse"),
+                    ("America/Winnipeg", "America/Winnipeg"),
+                    ("America/Yakutat", "America/Yakutat"),
+                    ("Antarctica/Casey", "Antarctica/Casey"),
+                    ("Antarctica/Davis", "Antarctica/Davis"),
+                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+                    ("Antarctica/Mawson", "Antarctica/Mawson"),
+                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+                    ("Antarctica/Palmer", "Antarctica/Palmer"),
+                    ("Antarctica/Rothera", "Antarctica/Rothera"),
+                    ("Antarctica/Syowa", "Antarctica/Syowa"),
+                    ("Antarctica/Troll", "Antarctica/Troll"),
+                    ("Antarctica/Vostok", "Antarctica/Vostok"),
+                    ("Asia/Aden", "Asia/Aden"),
+                    ("Asia/Almaty", "Asia/Almaty"),
+                    ("Asia/Amman", "Asia/Amman"),
+                    ("Asia/Anadyr", "Asia/Anadyr"),
+                    ("Asia/Aqtau", "Asia/Aqtau"),
+                    ("Asia/Aqtobe", "Asia/Aqtobe"),
+                    ("Asia/Ashgabat", "Asia/Ashgabat"),
+                    ("Asia/Atyrau", "Asia/Atyrau"),
+                    ("Asia/Baghdad", "Asia/Baghdad"),
+                    ("Asia/Bahrain", "Asia/Bahrain"),
+                    ("Asia/Baku", "Asia/Baku"),
+                    ("Asia/Bangkok", "Asia/Bangkok"),
+                    ("Asia/Barnaul", "Asia/Barnaul"),
+                    ("Asia/Beirut", "Asia/Beirut"),
+                    ("Asia/Bishkek", "Asia/Bishkek"),
+                    ("Asia/Brunei", "Asia/Brunei"),
+                    ("Asia/Chita", "Asia/Chita"),
+                    ("Asia/Colombo", "Asia/Colombo"),
+                    ("Asia/Damascus", "Asia/Damascus"),
+                    ("Asia/Dhaka", "Asia/Dhaka"),
+                    ("Asia/Dili", "Asia/Dili"),
+                    ("Asia/Dubai", "Asia/Dubai"),
+                    ("Asia/Dushanbe", "Asia/Dushanbe"),
+                    ("Asia/Famagusta", "Asia/Famagusta"),
+                    ("Asia/Gaza", "Asia/Gaza"),
+                    ("Asia/Hebron", "Asia/Hebron"),
+                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+                    ("Asia/Hovd", "Asia/Hovd"),
+                    ("Asia/Irkutsk", "Asia/Irkutsk"),
+                    ("Asia/Jakarta", "Asia/Jakarta"),
+                    ("Asia/Jayapura", "Asia/Jayapura"),
+                    ("Asia/Jerusalem", "Asia/Jerusalem"),
+                    ("Asia/Kabul", "Asia/Kabul"),
+                    ("Asia/Kamchatka", "Asia/Kamchatka"),
+                    ("Asia/Karachi", "Asia/Karachi"),
+                    ("Asia/Kathmandu", "Asia/Kathmandu"),
+                    ("Asia/Khandyga", "Asia/Khandyga"),
+                    ("Asia/Kolkata", "Asia/Kolkata"),
+                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+                    ("Asia/Kuching", "Asia/Kuching"),
+                    ("Asia/Kuwait", "Asia/Kuwait"),
+                    ("Asia/Macau", "Asia/Macau"),
+                    ("Asia/Magadan", "Asia/Magadan"),
+                    ("Asia/Makassar", "Asia/Makassar"),
+                    ("Asia/Manila", "Asia/Manila"),
+                    ("Asia/Muscat", "Asia/Muscat"),
+                    ("Asia/Nicosia", "Asia/Nicosia"),
+                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+                    ("Asia/Omsk", "Asia/Omsk"),
+                    ("Asia/Oral", "Asia/Oral"),
+                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+                    ("Asia/Pontianak", "Asia/Pontianak"),
+                    ("Asia/Pyongyang", "Asia/Pyongyang"),
+                    ("Asia/Qatar", "Asia/Qatar"),
+                    ("Asia/Qostanay", "Asia/Qostanay"),
+                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+                    ("Asia/Riyadh", "Asia/Riyadh"),
+                    ("Asia/Sakhalin", "Asia/Sakhalin"),
+                    ("Asia/Samarkand", "Asia/Samarkand"),
+                    ("Asia/Seoul", "Asia/Seoul"),
+                    ("Asia/Shanghai", "Asia/Shanghai"),
+                    ("Asia/Singapore", "Asia/Singapore"),
+                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+                    ("Asia/Taipei", "Asia/Taipei"),
+                    ("Asia/Tashkent", "Asia/Tashkent"),
+                    ("Asia/Tbilisi", "Asia/Tbilisi"),
+                    ("Asia/Tehran", "Asia/Tehran"),
+                    ("Asia/Thimphu", "Asia/Thimphu"),
+                    ("Asia/Tokyo", "Asia/Tokyo"),
+                    ("Asia/Tomsk", "Asia/Tomsk"),
+                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+                    ("Asia/Urumqi", "Asia/Urumqi"),
+                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+                    ("Asia/Vientiane", "Asia/Vientiane"),
+                    ("Asia/Vladivostok", "Asia/Vladivostok"),
+                    ("Asia/Yakutsk", "Asia/Yakutsk"),
+                    ("Asia/Yangon", "Asia/Yangon"),
+                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+                    ("Asia/Yerevan", "Asia/Yerevan"),
+                    ("Atlantic/Azores", "Atlantic/Azores"),
+                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+                    ("Atlantic/Canary", "Atlantic/Canary"),
+                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+                    ("Atlantic/Faroe", "Atlantic/Faroe"),
+                    ("Atlantic/Madeira", "Atlantic/Madeira"),
+                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+                    ("Atlantic/Stanley", "Atlantic/Stanley"),
+                    ("Australia/Adelaide", "Australia/Adelaide"),
+                    ("Australia/Brisbane", "Australia/Brisbane"),
+                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+                    ("Australia/Darwin", "Australia/Darwin"),
+                    ("Australia/Eucla", "Australia/Eucla"),
+                    ("Australia/Hobart", "Australia/Hobart"),
+                    ("Australia/Lindeman", "Australia/Lindeman"),
+                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+                    ("Australia/Melbourne", "Australia/Melbourne"),
+                    ("Australia/Perth", "Australia/Perth"),
+                    ("Australia/Sydney", "Australia/Sydney"),
+                    ("Europe/Amsterdam", "Europe/Amsterdam"),
+                    ("Europe/Andorra", "Europe/Andorra"),
+                    ("Europe/Astrakhan", "Europe/Astrakhan"),
+                    ("Europe/Athens", "Europe/Athens"),
+                    ("Europe/Belgrade", "Europe/Belgrade"),
+                    ("Europe/Berlin", "Europe/Berlin"),
+                    ("Europe/Brussels", "Europe/Brussels"),
+                    ("Europe/Bucharest", "Europe/Bucharest"),
+                    ("Europe/Budapest", "Europe/Budapest"),
+                    ("Europe/Chisinau", "Europe/Chisinau"),
+                    ("Europe/Copenhagen", "Europe/Copenhagen"),
+                    ("Europe/Dublin", "Europe/Dublin"),
+                    ("Europe/Gibraltar", "Europe/Gibraltar"),
+                    ("Europe/Helsinki", "Europe/Helsinki"),
+                    ("Europe/Istanbul", "Europe/Istanbul"),
+                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+                    ("Europe/Kirov", "Europe/Kirov"),
+                    ("Europe/Kyiv", "Europe/Kyiv"),
+                    ("Europe/Lisbon", "Europe/Lisbon"),
+                    ("Europe/London", "Europe/London"),
+                    ("Europe/Luxembourg", "Europe/Luxembourg"),
+                    ("Europe/Madrid", "Europe/Madrid"),
+                    ("Europe/Malta", "Europe/Malta"),
+                    ("Europe/Minsk", "Europe/Minsk"),
+                    ("Europe/Monaco", "Europe/Monaco"),
+                    ("Europe/Moscow", "Europe/Moscow"),
+                    ("Europe/Oslo", "Europe/Oslo"),
+                    ("Europe/Paris", "Europe/Paris"),
+                    ("Europe/Prague", "Europe/Prague"),
+                    ("Europe/Riga", "Europe/Riga"),
+                    ("Europe/Rome", "Europe/Rome"),
+                    ("Europe/Samara", "Europe/Samara"),
+                    ("Europe/Saratov", "Europe/Saratov"),
+                    ("Europe/Simferopol", "Europe/Simferopol"),
+                    ("Europe/Sofia", "Europe/Sofia"),
+                    ("Europe/Stockholm", "Europe/Stockholm"),
+                    ("Europe/Tallinn", "Europe/Tallinn"),
+                    ("Europe/Tirane", "Europe/Tirane"),
+                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+                    ("Europe/Vaduz", "Europe/Vaduz"),
+                    ("Europe/Vienna", "Europe/Vienna"),
+                    ("Europe/Vilnius", "Europe/Vilnius"),
+                    ("Europe/Volgograd", "Europe/Volgograd"),
+                    ("Europe/Warsaw", "Europe/Warsaw"),
+                    ("Europe/Zurich", "Europe/Zurich"),
+                    ("Indian/Antananarivo", "Indian/Antananarivo"),
+                    ("Indian/Chagos", "Indian/Chagos"),
+                    ("Indian/Christmas", "Indian/Christmas"),
+                    ("Indian/Cocos", "Indian/Cocos"),
+                    ("Indian/Comoro", "Indian/Comoro"),
+                    ("Indian/Kerguelen", "Indian/Kerguelen"),
+                    ("Indian/Mahe", "Indian/Mahe"),
+                    ("Indian/Maldives", "Indian/Maldives"),
+                    ("Indian/Mauritius", "Indian/Mauritius"),
+                    ("Indian/Mayotte", "Indian/Mayotte"),
+                    ("Indian/Reunion", "Indian/Reunion"),
+                    ("Pacific/Apia", "Pacific/Apia"),
+                    ("Pacific/Auckland", "Pacific/Auckland"),
+                    ("Pacific/Bougainville", "Pacific/Bougainville"),
+                    ("Pacific/Chatham", "Pacific/Chatham"),
+                    ("Pacific/Chuuk", "Pacific/Chuuk"),
+                    ("Pacific/Easter", "Pacific/Easter"),
+                    ("Pacific/Efate", "Pacific/Efate"),
+                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+                    ("Pacific/Fiji", "Pacific/Fiji"),
+                    ("Pacific/Funafuti", "Pacific/Funafuti"),
+                    ("Pacific/Galapagos", "Pacific/Galapagos"),
+                    ("Pacific/Gambier", "Pacific/Gambier"),
+                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+                    ("Pacific/Guam", "Pacific/Guam"),
+                    ("Pacific/Honolulu", "Pacific/Honolulu"),
+                    ("Pacific/Kanton", "Pacific/Kanton"),
+                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+                    ("Pacific/Kosrae", "Pacific/Kosrae"),
+                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+                    ("Pacific/Majuro", "Pacific/Majuro"),
+                    ("Pacific/Marquesas", "Pacific/Marquesas"),
+                    ("Pacific/Midway", "Pacific/Midway"),
+                    ("Pacific/Nauru", "Pacific/Nauru"),
+                    ("Pacific/Niue", "Pacific/Niue"),
+                    ("Pacific/Norfolk", "Pacific/Norfolk"),
+                    ("Pacific/Noumea", "Pacific/Noumea"),
+                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+                    ("Pacific/Palau", "Pacific/Palau"),
+                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+                    ("Pacific/Saipan", "Pacific/Saipan"),
+                    ("Pacific/Tahiti", "Pacific/Tahiti"),
+                    ("Pacific/Tarawa", "Pacific/Tarawa"),
+                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+                    ("Pacific/Wake", "Pacific/Wake"),
+                    ("Pacific/Wallis", "Pacific/Wallis"),
+                    ("UTC", "UTC"),
+                ],
+                default="UTC",
+                max_length=255,
+            ),
+        ),
+    ]
diff --git a/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py b/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py
deleted file mode 100644
index e93baaa33b..0000000000
--- a/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 03:57
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0018_remove_old_document_field'),
-        ('meeting', '0015_sessionpresentation_document2_fk'),
-    ]
-
-    operations = [
-
-        # We need to get rid of the current through table uniqueness
-        # constraint before we can remove the document column: The table
-        # has "UNIQUE KEY `session_id` (`session_id`,`document_id`)"
-        migrations.RunSQL(
-            "ALTER TABLE `meeting_session_materials` DROP INDEX `session_id`;",
-            "CREATE UNIQUE INDEX `session_id` ON `meeting_session_materials` (`session_id`, `document_id`);"
-        ),
-        ## This doesn't work:
-        # migrations.RemoveIndex(
-        #     model_name='sessionpresentation',
-        #     name='session_id'
-        # ),
-        migrations.RemoveField(
-            model_name='sessionpresentation',
-            name='document',
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0017_rename_field_document2.py b/ietf/meeting/migrations/0017_rename_field_document2.py
deleted file mode 100644
index 5965d8d20e..0000000000
--- a/ietf/meeting/migrations/0017_rename_field_document2.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 05:31
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0019_rename_field_document2'),
-        ('meeting', '0016_remove_sessionpresentation_document'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='sessionpresentation',
-            old_name='document2',
-            new_name='document',
-        ),
-        migrations.AlterUniqueTogether(
-            name='sessionpresentation',
-            unique_together=set([('session', 'document')]),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0018_document_primary_key_cleanup.py b/ietf/meeting/migrations/0018_document_primary_key_cleanup.py
deleted file mode 100644
index 749caa443b..0000000000
--- a/ietf/meeting/migrations/0018_document_primary_key_cleanup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-06-10 03:47
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0017_rename_field_document2'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='sessionpresentation',
-            name='document',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0019_slidesubmission_time.py b/ietf/meeting/migrations/0019_slidesubmission_time.py
deleted file mode 100644
index 3dc0e2c523..0000000000
--- a/ietf/meeting/migrations/0019_slidesubmission_time.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.22 on 2019-07-21 14:03
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0018_document_primary_key_cleanup'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='slidesubmission',
-            name='time',
-            field=models.DateTimeField(auto_now=True),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0020_remove_future_break_sessions.py b/ietf/meeting/migrations/0020_remove_future_break_sessions.py
deleted file mode 100644
index 5d2569b1cc..0000000000
--- a/ietf/meeting/migrations/0020_remove_future_break_sessions.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.22 on 2019-07-22 14:56
-
-
-import datetime
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    Meeting = apps.get_model('meeting', 'Meeting')
-    today = datetime.datetime.today()
-    meetings = Meeting.objects.filter(date__gt=today, type='ietf')
-    for meeting in meetings:
-        meeting.agenda.assignments.all().delete()
-        meeting.session_set.all().delete()
-        meeting.timeslot_set.all().delete()
-
-
-def backward(apps, schema_editor):
-    return
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0019_slidesubmission_time'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, backward),
-    ]
diff --git a/ietf/meeting/migrations/0021_rename_meeting_agenda_to_schedule.py b/ietf/meeting/migrations/0021_rename_meeting_agenda_to_schedule.py
deleted file mode 100644
index 5399968cb7..0000000000
--- a/ietf/meeting/migrations/0021_rename_meeting_agenda_to_schedule.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.26 on 2019-11-18 04:01
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0020_remove_future_break_sessions'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='meeting',
-            old_name='agenda',
-            new_name='schedule',
-        ),
-        migrations.AlterField(
-            model_name='schedule',
-            name='meeting',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='schedule_set', to='meeting.Meeting'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0022_schedulingevent.py b/ietf/meeting/migrations/0022_schedulingevent.py
deleted file mode 100644
index 22602a06b4..0000000000
--- a/ietf/meeting/migrations/0022_schedulingevent.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.26 on 2019-11-19 02:41
-
-
-import datetime
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0009_auto_20190118_0725'),
-        ('name', '0007_fix_m2m_slug_id_length'),
-        ('meeting', '0021_rename_meeting_agenda_to_schedule'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SchedulingEvent',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now, help_text='When the event happened')),
-                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
-                ('status', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.SessionStatusName')),
-            ],
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0023_create_scheduling_events.py b/ietf/meeting/migrations/0023_create_scheduling_events.py
deleted file mode 100644
index 5adcdd59e1..0000000000
--- a/ietf/meeting/migrations/0023_create_scheduling_events.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.26 on 2019-11-19 02:42
-
-
-from django.db import migrations
-
-import datetime
-
-def create_scheduling_events(apps, schema_editor):
-    Session = apps.get_model('meeting', 'Session')
-    SchedulingEvent = apps.get_model('meeting', 'SchedulingEvent')
-    Person = apps.get_model('person', 'Person')
-    SessionStatusName = apps.get_model('name', 'SessionStatusName')
-
-    system_person = Person.objects.get(name='(System)')
-    session_status_names = { n.slug: n for n in SessionStatusName.objects.all() }
-
-    epoch_time = datetime.datetime(1970, 1, 1, 0, 0, 0)
-
-    for s in Session.objects.select_related('requested_by').filter(schedulingevent=None).iterator():
-        # temporarily fix up weird timestamps for the migration
-        if s.requested == epoch_time:
-            s.requested = s.modified
-
-        requested_event = SchedulingEvent()
-        requested_event.session = s
-        requested_event.time = s.requested
-        requested_event.by = s.requested_by
-        requested_event.status = session_status_names[s.status_id if s.status_id == 'apprw' or (s.status_id == 'notmeet' and not s.scheduled) else 'schedw']
-        requested_event.save()
-
-        scheduled_event = None
-        if s.status_id != requested_event.status_id:
-            if s.scheduled or s.status_id in ['sched', 'scheda']:
-                scheduled_event = SchedulingEvent()
-                scheduled_event.session = s
-                if s.scheduled:
-                    scheduled_event.time = s.scheduled
-                else:
-                    # we don't know when this happened
-                    scheduled_event.time = s.modified
-                scheduled_event.by = system_person # we don't know who did it
-                scheduled_event.status = session_status_names[s.status_id if s.status_id == 'scheda' else 'sched']
-                scheduled_event.save()
-
-        final_event = None
-        if s.status_id not in ['apprw', 'schedw', 'notmeet', 'sched', 'scheda']:
-            final_event = SchedulingEvent()
-            final_event.session = s
-            final_event.time = s.modified
-            final_event.by = system_person # we don't know who did it
-            final_event.status = session_status_names[s.status_id]
-            final_event.save()
-
-def noop(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0022_schedulingevent'),
-    ]
-
-    operations = [
-        migrations.RunPython(create_scheduling_events, noop),
-    ]
diff --git a/ietf/meeting/migrations/0024_auto_20191204_1731.py b/ietf/meeting/migrations/0024_auto_20191204_1731.py
deleted file mode 100644
index 828611bb98..0000000000
--- a/ietf/meeting/migrations/0024_auto_20191204_1731.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.26 on 2019-12-04 17:31
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0023_create_scheduling_events'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='session',
-            name='requested',
-        ),
-        migrations.RemoveField(
-            model_name='session',
-            name='requested_by',
-        ),
-        migrations.RemoveField(
-            model_name='session',
-            name='status',
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0025_rename_type_session_to_regular.py b/ietf/meeting/migrations/0025_rename_type_session_to_regular.py
deleted file mode 100644
index 1eeac57b5a..0000000000
--- a/ietf/meeting/migrations/0025_rename_type_session_to_regular.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.26 on 2019-12-06 11:13
-
-
-from django.db import migrations
-
-def rename_session_to_regular(apps, schema_editor):
-    Session = apps.get_model('meeting', 'Session')
-    TimeSlot = apps.get_model('meeting', 'TimeSlot')
-    Room = apps.get_model('meeting', 'Room')
-    TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
-
-    TimeSlotTypeName.objects.create(
-        slug='regular',
-        name='Regular',
-        used=True,
-        order=0,
-    )
-
-    Session.objects.filter(type='session').update(type='regular')
-    TimeSlot.objects.filter(type='session').update(type='regular')
-    Room.session_types.through.objects.filter(timeslottypename='session').update(timeslottypename='regular')
-
-    TimeSlotTypeName.objects.filter(slug='session').delete()
-
-def noop(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0024_auto_20191204_1731'),
-    ]
-
-    operations = [
-        migrations.RunPython(rename_session_to_regular, noop),
-    ]
diff --git a/ietf/meeting/migrations/0026_cancel_107_sessions.py b/ietf/meeting/migrations/0026_cancel_107_sessions.py
deleted file mode 100644
index 754cd7c49e..0000000000
--- a/ietf/meeting/migrations/0026_cancel_107_sessions.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-03-18 16:18
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-def cancel_sessions(apps, schema_editor):
-    Session = apps.get_model('meeting', 'Session')
-    SchedulingEvent = apps.get_model('meeting', 'SchedulingEvent')
-    SessionStatusName = apps.get_model('name', 'SessionStatusName')
-    Person = apps.get_model('person', 'Person')
-    excludes = ['txauth','dispatch','add','raw','masque','wpack','drip','gendispatch','privacypass', 'ript', 'secdispatch', 'webtrans']
-    canceled = SessionStatusName.objects.get(slug='canceled')
-    person = Person.objects.get(name='Ryan Cross')
-    sessions = Session.objects.filter(meeting__number=107,group__type__in=['wg','rg','ag']).exclude(group__acronym__in=excludes)
-    for session in sessions:
-        SchedulingEvent.objects.create(
-            session = session,
-            status = canceled,
-            by = person)
-
-
-def reverse(apps, schema_editor):
-    SchedulingEvent = apps.get_model('meeting', 'SchedulingEvent')
-    Person = apps.get_model('person', 'Person')
-    person = Person.objects.get(name='Ryan Cross')
-    SchedulingEvent.objects.filter(session__meeting__number=107, by=person).delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0025_rename_type_session_to_regular'),
-    ]
-
-    operations = [
-        migrations.RunPython(cancel_sessions, reverse),
-    ]
diff --git a/ietf/meeting/migrations/0027_add_constraint_options_and_joint_groups.py b/ietf/meeting/migrations/0027_add_constraint_options_and_joint_groups.py
deleted file mode 100644
index 7a64fbe658..0000000000
--- a/ietf/meeting/migrations/0027_add_constraint_options_and_joint_groups.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-02-11 04:47
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-def forward(apps, schema_editor):
-    ConstraintName = apps.get_model("name", "ConstraintName")
-    ConstraintName.objects.create(slug="timerange", desc="", penalty=100000,
-                                  name="Can't meet within timerange")
-    ConstraintName.objects.create(slug="time_relation", desc="", penalty=1000,
-                                  name="Preference for time between sessions")
-    ConstraintName.objects.create(slug="wg_adjacent", desc="", penalty=10000,
-                                  name="Request for adjacent scheduling with another WG")
-
-
-def reverse(apps, schema_editor):
-    ConstraintName = apps.get_model("name", "ConstraintName")
-    ConstraintName.objects.filter(slug__in=["timerange", "time_relation", "wg_adjacent"]).delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0010_timerangename'),
-        ('meeting', '0026_cancel_107_sessions'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='constraint',
-            name='day',
-        ),
-        migrations.AddField(
-            model_name='constraint',
-            name='time_relation',
-            field=models.CharField(blank=True, choices=[('subsequent-days', 'Schedule the sessions on subsequent days'), ('one-day-seperation', 'Leave at least one free day in between the two sessions')], max_length=200),
-        ),
-        migrations.AddField(
-            model_name='constraint',
-            name='timeranges',
-            field=models.ManyToManyField(to='name.TimerangeName'),
-        ),
-        migrations.AddField(
-            model_name='session',
-            name='joint_with_groups',
-            field=models.ManyToManyField(related_name='sessions_joint_in', to='group.Group'),
-        ),
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/meeting/migrations/0028_auto_20200501_0139.py b/ietf/meeting/migrations/0028_auto_20200501_0139.py
deleted file mode 100644
index 70c46c3d26..0000000000
--- a/ietf/meeting/migrations/0028_auto_20200501_0139.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-05-01 01:39
-from __future__ import unicode_literals
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0027_add_constraint_options_and_joint_groups'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='time_zone',
-            field=models.CharField(blank=True, choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('UTC', 'UTC')], max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='schedule',
-            name='name',
-            field=models.CharField(help_text='Letters, numbers and -:_ allowed.', max_length=16, validators=[django.core.validators.RegexValidator('^[A-Za-z0-9-:_]*$')]),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0029_businessconstraint.py b/ietf/meeting/migrations/0029_businessconstraint.py
deleted file mode 100644
index 7e1f13ee76..0000000000
--- a/ietf/meeting/migrations/0029_businessconstraint.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-05-29 02:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-def forward(apps, schema_editor):
-    BusinessConstraint = apps.get_model("meeting", "BusinessConstraint")
-    BusinessConstraint.objects.create(
-        slug="bof_overlapping_prg",
-        name="BOFs cannot conflict with PRGs",
-        penalty=100000,
-    )
-    BusinessConstraint.objects.create(
-        slug="bof_overlapping_bof",
-        name="BOFs cannot conflict with any other BOFs",
-        penalty=100000,
-    )
-    BusinessConstraint.objects.create(
-        slug="bof_overlapping_area_wg",
-        name="BOFs cannot conflict with any other WGs in their area",
-        penalty=100000,
-    )
-    BusinessConstraint.objects.create(
-        slug="bof_overlapping_area_meeting",
-        name="BOFs cannot conflict with any area-wide meetings (of any area)",
-        penalty=10000,
-    )
-    BusinessConstraint.objects.create(
-        slug="area_overlapping_in_area",
-        name="Area meetings cannot conflict with anything else in their area",
-        penalty=10000,
-    )
-    BusinessConstraint.objects.create(
-        slug="area_overlapping_other_area",
-        name="Area meetings cannot conflict with other area meetings",
-        penalty=100000,
-    )
-    BusinessConstraint.objects.create(
-        slug="session_overlap_ad",
-        name="WGs overseen by the same Area Director should not conflict",
-        penalty=100,
-    )
-    BusinessConstraint.objects.create(
-        slug="sessions_out_of_order",
-        name="Sessions should be scheduled in requested order",
-        penalty=100000,
-    )
-    BusinessConstraint.objects.create(
-        slug="session_requires_trim",
-        name="Sessions should be scheduled according to requested duration and attendees",
-        penalty=100000,
-    )
-    
-    ConstraintName = apps.get_model("name", "ConstraintName")
-    ConstraintName.objects.filter(slug='conflict').update(penalty=100000)
-    ConstraintName.objects.filter(slug='conflic2').update(penalty=10000)
-    ConstraintName.objects.filter(slug='conflic3').update(penalty=100000)
-    ConstraintName.objects.filter(slug='bethere').update(penalty=10000)
-    ConstraintName.objects.filter(slug='timerange').update(penalty=1000000)
-    ConstraintName.objects.filter(slug='time_relation').update(penalty=1000)
-    ConstraintName.objects.filter(slug='wg_adjacent').update(penalty=1000)
-
-
-def reverse(apps, schema_editor):
-    ConstraintName = apps.get_model("name", "ConstraintName")
-    ConstraintName.objects.filter(slug='conflict').update(penalty=100000)
-    ConstraintName.objects.filter(slug='conflic2').update(penalty=10000)
-    ConstraintName.objects.filter(slug='conflic3').update(penalty=1000)
-    ConstraintName.objects.filter(slug='bethere').update(penalty=200000)
-    ConstraintName.objects.filter(slug='timerange').update(penalty=100000)
-    ConstraintName.objects.filter(slug='time_relation').update(penalty=100000)
-    ConstraintName.objects.filter(slug='wg_adjacent').update(penalty=100000)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0028_auto_20200501_0139'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='BusinessConstraint',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('penalty', models.IntegerField(default=0, help_text='The penalty for violating this kind of constraint; for instance 10 (small penalty) or 10000 (large penalty)')),
-            ],
-        ),
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/meeting/migrations/0030_allow_empty_joint_with_sessions.py b/ietf/meeting/migrations/0030_allow_empty_joint_with_sessions.py
deleted file mode 100644
index d8ab7cff24..0000000000
--- a/ietf/meeting/migrations/0030_allow_empty_joint_with_sessions.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.14 on 2020-07-20 14:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0029_businessconstraint'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='session',
-            name='joint_with_groups',
-            field=models.ManyToManyField(blank=True, related_name='sessions_joint_in', to='group.Group'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0031_auto_20200803_1153.py b/ietf/meeting/migrations/0031_auto_20200803_1153.py
deleted file mode 100644
index 8a5ac54aa7..0000000000
--- a/ietf/meeting/migrations/0031_auto_20200803_1153.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 2.2.14 on 2020-08-03 11:53
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0018_slidesubmissionstatusname'),
-        ('doc', '0035_populate_docextresources'),
-        ('meeting', '0030_allow_empty_joint_with_sessions'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='slidesubmission',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0032_auto_20200824_1642.py b/ietf/meeting/migrations/0032_auto_20200824_1642.py
deleted file mode 100644
index 31155da6a4..0000000000
--- a/ietf/meeting/migrations/0032_auto_20200824_1642.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.2.14 on 2020-08-03 11:53
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0031_auto_20200803_1153'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='slidesubmission',
-            name='status',
-            field=ietf.utils.models.ForeignKey(null=True, default='pending', on_delete=django.db.models.deletion.SET_NULL, to='name.SlideSubmissionStatusName'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0033_session_tombstone_for.py b/ietf/meeting/migrations/0033_session_tombstone_for.py
deleted file mode 100644
index dc74615cbf..0000000000
--- a/ietf/meeting/migrations/0033_session_tombstone_for.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0032_auto_20200824_1642'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='session',
-            name='tombstone_for',
-            field=models.ForeignKey(blank=True, help_text='This session is the tombstone for a session that was rescheduled', null=True, on_delete=django.db.models.deletion.CASCADE, to='meeting.Session'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0034_schedule_notes.py b/ietf/meeting/migrations/0034_schedule_notes.py
deleted file mode 100644
index f851a6b9ff..0000000000
--- a/ietf/meeting/migrations/0034_schedule_notes.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 2.0.13 on 2020-07-01 02:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0033_session_tombstone_for'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='schedule',
-            name='notes',
-            field=models.TextField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name='schedule',
-            name='public',
-            field=models.BooleanField(default=True, help_text='Allow others to see this agenda.'),
-        ),
-        migrations.AlterField(
-            model_name='schedule',
-            name='visible',
-            field=models.BooleanField(default=True, help_text='Show in the list of possible agendas for the meeting.', verbose_name='Show in agenda list'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0035_add_session_origin.py b/ietf/meeting/migrations/0035_add_session_origin.py
deleted file mode 100644
index ff782d52cd..0000000000
--- a/ietf/meeting/migrations/0035_add_session_origin.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.0.13 on 2020-08-04 06:22
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0034_schedule_notes'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='schedule',
-            name='origin',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='meeting.Schedule'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0036_add_schedule_base.py b/ietf/meeting/migrations/0036_add_schedule_base.py
deleted file mode 100644
index 436fa5cf01..0000000000
--- a/ietf/meeting/migrations/0036_add_schedule_base.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated by Django 2.0.13 on 2020-08-07 09:30
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0035_add_session_origin'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='schedule',
-            name='base',
-            field=ietf.utils.models.ForeignKey(blank=True, help_text='Sessions scheduled in the base show up in this schedule.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='derivedschedule_set', to='meeting.Schedule'),
-        ),
-        migrations.AlterField(
-            model_name='schedule',
-            name='origin',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='meeting.Schedule'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0037_auto_20200908_0334.py b/ietf/meeting/migrations/0037_auto_20200908_0334.py
deleted file mode 100644
index 1ecd8fc9cc..0000000000
--- a/ietf/meeting/migrations/0037_auto_20200908_0334.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-08 03:34
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0036_add_schedule_base'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='schedule',
-            name='base',
-            field=ietf.utils.models.ForeignKey(blank=True, help_text='Sessions scheduled in the base schedule show up in this schedule too.', limit_choices_to={'base': None}, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='derivedschedule_set', to='meeting.Schedule'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0038_auto_20201005_1123.py b/ietf/meeting/migrations/0038_auto_20201005_1123.py
deleted file mode 100644
index faff10a0a2..0000000000
--- a/ietf/meeting/migrations/0038_auto_20201005_1123.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.16 on 2020-10-05 11:23
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0037_auto_20200908_0334'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='schedule',
-            name='name',
-            field=models.CharField(help_text='Letters, numbers and -:_ allowed.', max_length=64, validators=[django.core.validators.RegexValidator('^[A-Za-z0-9-:_]*$')]),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0039_auto_20201109_0439.py b/ietf/meeting/migrations/0039_auto_20201109_0439.py
deleted file mode 100644
index 9790a158a1..0000000000
--- a/ietf/meeting/migrations/0039_auto_20201109_0439.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0038_auto_20201005_1123'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='meeting',
-            index=models.Index(fields=['-date', '-id'], name='meeting_mee_date_40ca21_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='timeslot',
-            index=models.Index(fields=['-time', '-id'], name='meeting_tim_time_b802cb_idx'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0040_auto_20210130_1027.py b/ietf/meeting/migrations/0040_auto_20210130_1027.py
deleted file mode 100644
index 84794371ba..0000000000
--- a/ietf/meeting/migrations/0040_auto_20210130_1027.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.17 on 2021-01-30 10:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0039_auto_20201109_0439'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='time_zone',
-            field=models.CharField(blank=True, choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('UTC', 'UTC')], max_length=255),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0041_assign_correct_constraintnames.py b/ietf/meeting/migrations/0041_assign_correct_constraintnames.py
deleted file mode 100644
index a5f5cf1301..0000000000
--- a/ietf/meeting/migrations/0041_assign_correct_constraintnames.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-13 07:51
-
-from django.db import migrations
-
-
-replacement_slugs = (
-    ('conflict', 'chair_conflict'),
-    ('conflic2', 'tech_overlap'),
-    ('conflic3', 'key_participant'),
-)
-
-
-def affected(constraint_qs):
-    """Filter constraints, keeping only those to be updated"""
-    # The constraints were renamed in the UI in commit 16699 on 2019-09-03.
-    # This was between meetings 105 and 106. Assuming this migration and
-    # the new conflict types are in place before meeting 111, these
-    # are the meetings for which the UI disagreed with the constraint
-    # type actually created.
-    affected_meetings = ['106', '107', '108', '109', '110']
-    return constraint_qs.filter(meeting__number__in=affected_meetings)
-
-
-def forward(apps, schema_editor):
-    Constraint = apps.get_model('meeting', 'Constraint')
-    affected_constraints = affected(Constraint.objects.all())
-    for old, new in replacement_slugs:
-        affected_constraints.filter(name_id=old).update(name_id=new)
-
-
-def reverse(apps, schema_editor):
-    Constraint = apps.get_model('meeting', 'Constraint')
-    affected_constraints = affected(Constraint.objects.all())
-    for old, new in replacement_slugs:
-        affected_constraints.filter(name_id=new).update(name_id=old)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0040_auto_20210130_1027'),
-        ('name', '0026_add_conflict_constraintnames'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/meeting/migrations/0042_meeting_group_conflict_types.py b/ietf/meeting/migrations/0042_meeting_group_conflict_types.py
deleted file mode 100644
index 2d3320f456..0000000000
--- a/ietf/meeting/migrations/0042_meeting_group_conflict_types.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-20 12:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0026_add_conflict_constraintnames'),
-        ('meeting', '0041_assign_correct_constraintnames'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='meeting',
-            name='group_conflict_types',
-            field=models.ManyToManyField(blank=True, limit_choices_to={'is_group_conflict': True}, help_text='Types of scheduling conflict between groups to consider', to='name.ConstraintName'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0043_populate_meeting_group_conflict_types.py b/ietf/meeting/migrations/0043_populate_meeting_group_conflict_types.py
deleted file mode 100644
index 8092635641..0000000000
--- a/ietf/meeting/migrations/0043_populate_meeting_group_conflict_types.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-20 12:30
-
-from django.db import migrations
-from django.db.models import IntegerField
-from django.db.models.functions import Cast
-
-
-def forward(apps, schema_editor):
-    Meeting = apps.get_model('meeting', 'Meeting')
-    ConstraintName = apps.get_model('name', 'ConstraintName')
-
-    # old for pre-106
-    old_constraints = ConstraintName.objects.filter(slug__in=['conflict', 'conflic2', 'conflic3'])
-    new_constraints = ConstraintName.objects.filter(slug__in=['chair_conflict', 'tech_overlap', 'key_participant'])
-
-    # get meetings with numeric 'number' field to avoid lexicographic ordering
-    ietf_meetings = Meeting.objects.filter(
-        type='ietf'
-    ).annotate(
-        number_as_int=Cast('number', output_field=IntegerField())
-    )
-
-    for mtg in ietf_meetings.filter(number_as_int__lt=106):
-        for cn in old_constraints:
-            mtg.group_conflict_types.add(cn)
-    for mtg in ietf_meetings.filter(number_as_int__gte=106):
-        for cn in new_constraints:
-            mtg.group_conflict_types.add(cn)
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0042_meeting_group_conflict_types'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/meeting/migrations/0044_again_assign_correct_constraintnames.py b/ietf/meeting/migrations/0044_again_assign_correct_constraintnames.py
deleted file mode 100644
index ed2c07a3b8..0000000000
--- a/ietf/meeting/migrations/0044_again_assign_correct_constraintnames.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-13 07:51
-
-from django.db import migrations
-
-
-replacement_slugs = (
-    ('conflict', 'chair_conflict'),
-    ('conflic2', 'tech_overlap'),
-    ('conflic3', 'key_participant'),
-)
-
-
-def affected(constraint_qs):
-    """Filter constraints, keeping only those to be updated"""
-    # The constraints were renamed in the UI in commit 16699 on 2019-09-03.
-    # This was between meetings 105 and 106. Assuming this migration and
-    # the new conflict types are in place before meeting 111, these
-    # are the meetings for which the UI disagreed with the constraint
-    # type actually created.
-    affected_meetings = ['111']
-    return constraint_qs.filter(meeting__number__in=affected_meetings)
-
-
-def forward(apps, schema_editor):
-    Constraint = apps.get_model('meeting', 'Constraint')
-    affected_constraints = affected(Constraint.objects.all())
-    for old, new in replacement_slugs:
-        affected_constraints.filter(name_id=old).update(name_id=new)
-
-
-def reverse(apps, schema_editor):
-    Constraint = apps.get_model('meeting', 'Constraint')
-    affected_constraints = affected(Constraint.objects.all())
-    for old, new in replacement_slugs:
-        affected_constraints.filter(name_id=new).update(name_id=old)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0043_populate_meeting_group_conflict_types'),
-        ('name', '0027_add_bofrequest'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/meeting/migrations/0045_proceedingsmaterial.py b/ietf/meeting/migrations/0045_proceedingsmaterial.py
deleted file mode 100644
index 1ee553f4cd..0000000000
--- a/ietf/meeting/migrations/0045_proceedingsmaterial.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.24 on 2021-07-26 17:09
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0029_proceedingsmaterialtypename'),
-        ('meeting', '0044_again_assign_correct_constraintnames'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ProceedingsMaterial',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('meeting', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='proceedings_materials', to='meeting.Meeting')),
-                ('type', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ProceedingsMaterialTypeName')),
-                ('document', ietf.utils.models.ForeignKey(limit_choices_to={'type_id': 'procmaterials'}, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', unique=True)),
-            ],
-            options={
-                'unique_together': {('meeting', 'type')},
-            },
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0046_meetinghost.py b/ietf/meeting/migrations/0046_meetinghost.py
deleted file mode 100644
index 02392913b3..0000000000
--- a/ietf/meeting/migrations/0046_meetinghost.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 2.2.24 on 2021-08-26 10:18
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.meeting.models
-import ietf.utils.fields
-import ietf.utils.models
-import ietf.utils.storage
-import ietf.utils.validators
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0045_proceedingsmaterial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='MeetingHost',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255)),
-                ('logo', ietf.utils.fields.MissingOkImageField(height_field='logo_height', storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=ietf.meeting.models._host_upload_path, validators=[ietf.utils.validators.MaxImageSizeValidator(1600, 1600), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_file_size, True), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_file_extension, ['.png', '.jpg', '.jpeg']), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_mime_type, ['image/jpeg', 'image/png'], True)], width_field='logo_width')),
-                ('logo_width', models.PositiveIntegerField(null=True)),
-                ('logo_height', models.PositiveIntegerField(null=True)),
-                ('meeting', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='meetinghosts', to='meeting.Meeting')),
-            ],
-            options={
-                'ordering': ('pk',),
-                'unique_together': {('meeting', 'name')},
-            },
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0047_auto_20210906_0702.py b/ietf/meeting/migrations/0047_auto_20210906_0702.py
deleted file mode 100644
index d44b64b9da..0000000000
--- a/ietf/meeting/migrations/0047_auto_20210906_0702.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 2.2.24 on 2021-09-06 07:02
-
-from django.db import migrations
-import ietf.meeting.models
-import ietf.utils.fields
-import ietf.utils.storage
-import ietf.utils.validators
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0046_meetinghost'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meetinghost',
-            name='logo',
-            field=ietf.utils.fields.MissingOkImageField(height_field='logo_height', storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=ietf.meeting.models._host_upload_path, validators=[ietf.utils.validators.MaxImageSizeValidator(400, 400), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_file_size, True), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_file_extension, ['.png', '.jpg', '.jpeg']), ietf.utils.validators.WrappedValidator(ietf.utils.validators.validate_mime_type, ['image/jpeg', 'image/png'], True)], width_field='logo_width'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0048_auto_20211008_0907.py b/ietf/meeting/migrations/0048_auto_20211008_0907.py
deleted file mode 100644
index 5f8f844360..0000000000
--- a/ietf/meeting/migrations/0048_auto_20211008_0907.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-08 09:07
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0047_auto_20210906_0702'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='time_zone',
-            field=models.CharField(blank=True, choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('UTC', 'UTC')], max_length=255),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0049_session_purpose.py b/ietf/meeting/migrations/0049_session_purpose.py
deleted file mode 100644
index 50e8305bf1..0000000000
--- a/ietf/meeting/migrations/0049_session_purpose.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 2.2.24 on 2021-09-16 18:04
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0035_populate_sessionpurposename'),
-        ('meeting', '0048_auto_20211008_0907'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='session',
-            name='purpose',
-            field=ietf.utils.models.ForeignKey(default='none', help_text='Purpose of the session', on_delete=django.db.models.deletion.CASCADE, to='name.SessionPurposeName'),
-            preserve_default=False,
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0050_session_on_agenda.py b/ietf/meeting/migrations/0050_session_on_agenda.py
deleted file mode 100644
index 15f1885ae7..0000000000
--- a/ietf/meeting/migrations/0050_session_on_agenda.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-22 06:58
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0049_session_purpose'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='session',
-            name='on_agenda',
-            field=models.BooleanField(default=True, help_text='Is this session visible on the meeting agenda?'),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0051_populate_session_on_agenda.py b/ietf/meeting/migrations/0051_populate_session_on_agenda.py
deleted file mode 100644
index b63942072a..0000000000
--- a/ietf/meeting/migrations/0051_populate_session_on_agenda.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-22 06:58
-
-from django.db import migrations, models
-
-
-def forward(apps, schema_editor):
-    Session = apps.get_model('meeting', 'Session')
-    SchedTimeSessAssignment = apps.get_model('meeting', 'SchedTimeSessAssignment')
-    # find official assignments that are to private timeslots and fill in session.on_agenda
-    private_assignments = SchedTimeSessAssignment.objects.filter(
-        models.Q(
-            schedule=models.F('session__meeting__schedule')
-        ) | models.Q(
-            schedule=models.F('session__meeting__schedule__base')
-        ),
-        timeslot__type__private=True,
-    )
-    for pa in private_assignments:
-        pa.session.on_agenda = False
-        pa.session.save()
-    # Also update any sessions to match their purpose's default setting (this intentionally
-    # overrides the timeslot settings above, but that is unlikely to matter because the
-    # purposes will roll out at the same time as the on_agenda field)
-    Session.objects.filter(purpose__on_agenda=False).update(on_agenda=False)
-    Session.objects.filter(purpose__on_agenda=True).update(on_agenda=True)
-
-def reverse(apps, schema_editor):
-    Session = apps.get_model('meeting', 'Session')
-    Session.objects.update(on_agenda=True)  # restore all to default on_agenda=True state
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0050_session_on_agenda'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/meeting/migrations/0052_auto_20220503_1815.py b/ietf/meeting/migrations/0052_auto_20220503_1815.py
deleted file mode 100644
index 8a01c23ab9..0000000000
--- a/ietf/meeting/migrations/0052_auto_20220503_1815.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2022-05-03 18:15
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0051_populate_session_on_agenda'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='country',
-            field=models.CharField(blank=True, choices=[('', '---------'), ('AF', 'Afghanistan'), ('AL', 'Albania'), ('DZ', 'Algeria'), ('AD', 'Andorra'), ('AO', 'Angola'), ('AI', 'Anguilla'), ('AQ', 'Antarctica'), ('AG', 'Antigua & Barbuda'), ('AR', 'Argentina'), ('AM', 'Armenia'), ('AW', 'Aruba'), ('AU', 'Australia'), ('AT', 'Austria'), ('AZ', 'Azerbaijan'), ('BS', 'Bahamas'), ('BH', 'Bahrain'), ('BD', 'Bangladesh'), ('BB', 'Barbados'), ('BY', 'Belarus'), ('BE', 'Belgium'), ('BZ', 'Belize'), ('BJ', 'Benin'), ('BM', 'Bermuda'), ('BT', 'Bhutan'), ('BO', 'Bolivia'), ('BA', 'Bosnia & Herzegovina'), ('BW', 'Botswana'), ('BV', 'Bouvet Island'), ('BR', 'Brazil'), ('GB', 'Britain (UK)'), ('IO', 'British Indian Ocean Territory'), ('BN', 'Brunei'), ('BG', 'Bulgaria'), ('BF', 'Burkina Faso'), ('BI', 'Burundi'), ('KH', 'Cambodia'), ('CM', 'Cameroon'), ('CA', 'Canada'), ('CV', 'Cape Verde'), ('BQ', 'Caribbean NL'), ('KY', 'Cayman Islands'), ('CF', 'Central African Rep.'), ('TD', 'Chad'), ('CL', 'Chile'), ('CN', 'China'), ('CX', 'Christmas Island'), ('CC', 'Cocos (Keeling) Islands'), ('CO', 'Colombia'), ('KM', 'Comoros'), ('CD', 'Congo (Dem. Rep.)'), ('CG', 'Congo (Rep.)'), ('CK', 'Cook Islands'), ('CR', 'Costa Rica'), ('HR', 'Croatia'), ('CU', 'Cuba'), ('CW', 'Curaçao'), ('CY', 'Cyprus'), ('CZ', 'Czech Republic'), ('CI', "Côte d'Ivoire"), ('DK', 'Denmark'), ('DJ', 'Djibouti'), ('DM', 'Dominica'), ('DO', 'Dominican Republic'), ('TL', 'East Timor'), ('EC', 'Ecuador'), ('EG', 'Egypt'), ('SV', 'El Salvador'), ('GQ', 'Equatorial Guinea'), ('ER', 'Eritrea'), ('EE', 'Estonia'), ('SZ', 'Eswatini (Swaziland)'), ('ET', 'Ethiopia'), ('FK', 'Falkland Islands'), ('FO', 'Faroe Islands'), ('FJ', 'Fiji'), ('FI', 'Finland'), ('FR', 'France'), ('GF', 'French Guiana'), ('PF', 'French Polynesia'), ('TF', 'French Southern & Antarctic Lands'), ('GA', 'Gabon'), ('GM', 'Gambia'), ('GE', 'Georgia'), ('DE', 'Germany'), ('GH', 'Ghana'), ('GI', 'Gibraltar'), ('GR', 'Greece'), ('GL', 'Greenland'), ('GD', 'Grenada'), ('GP', 'Guadeloupe'), ('GU', 'Guam'), ('GT', 'Guatemala'), ('GG', 'Guernsey'), ('GN', 'Guinea'), ('GW', 'Guinea-Bissau'), ('GY', 'Guyana'), ('HT', 'Haiti'), ('HM', 'Heard Island & McDonald Islands'), ('HN', 'Honduras'), ('HK', 'Hong Kong'), ('HU', 'Hungary'), ('IS', 'Iceland'), ('IN', 'India'), ('ID', 'Indonesia'), ('IR', 'Iran'), ('IQ', 'Iraq'), ('IE', 'Ireland'), ('IM', 'Isle of Man'), ('IL', 'Israel'), ('IT', 'Italy'), ('JM', 'Jamaica'), ('JP', 'Japan'), ('JE', 'Jersey'), ('JO', 'Jordan'), ('KZ', 'Kazakhstan'), ('KE', 'Kenya'), ('KI', 'Kiribati'), ('KP', 'Korea (North)'), ('KR', 'Korea (South)'), ('KW', 'Kuwait'), ('KG', 'Kyrgyzstan'), ('LA', 'Laos'), ('LV', 'Latvia'), ('LB', 'Lebanon'), ('LS', 'Lesotho'), ('LR', 'Liberia'), ('LY', 'Libya'), ('LI', 'Liechtenstein'), ('LT', 'Lithuania'), ('LU', 'Luxembourg'), ('MO', 'Macau'), ('MG', 'Madagascar'), ('MW', 'Malawi'), ('MY', 'Malaysia'), ('MV', 'Maldives'), ('ML', 'Mali'), ('MT', 'Malta'), ('MH', 'Marshall Islands'), ('MQ', 'Martinique'), ('MR', 'Mauritania'), ('MU', 'Mauritius'), ('YT', 'Mayotte'), ('MX', 'Mexico'), ('FM', 'Micronesia'), ('MD', 'Moldova'), ('MC', 'Monaco'), ('MN', 'Mongolia'), ('ME', 'Montenegro'), ('MS', 'Montserrat'), ('MA', 'Morocco'), ('MZ', 'Mozambique'), ('MM', 'Myanmar (Burma)'), ('NA', 'Namibia'), ('NR', 'Nauru'), ('NP', 'Nepal'), ('NL', 'Netherlands'), ('NC', 'New Caledonia'), ('NZ', 'New Zealand'), ('NI', 'Nicaragua'), ('NE', 'Niger'), ('NG', 'Nigeria'), ('NU', 'Niue'), ('NF', 'Norfolk Island'), ('MK', 'North Macedonia'), ('MP', 'Northern Mariana Islands'), ('NO', 'Norway'), ('OM', 'Oman'), ('PK', 'Pakistan'), ('PW', 'Palau'), ('PS', 'Palestine'), ('PA', 'Panama'), ('PG', 'Papua New Guinea'), ('PY', 'Paraguay'), ('PE', 'Peru'), ('PH', 'Philippines'), ('PN', 'Pitcairn'), ('PL', 'Poland'), ('PT', 'Portugal'), ('PR', 'Puerto Rico'), ('QA', 'Qatar'), ('RO', 'Romania'), ('RU', 'Russia'), ('RW', 'Rwanda'), ('RE', 'Réunion'), ('AS', 'Samoa (American)'), ('WS', 'Samoa (western)'), ('SM', 'San Marino'), ('ST', 'Sao Tome & Principe'), ('SA', 'Saudi Arabia'), ('SN', 'Senegal'), ('RS', 'Serbia'), ('SC', 'Seychelles'), ('SL', 'Sierra Leone'), ('SG', 'Singapore'), ('SK', 'Slovakia'), ('SI', 'Slovenia'), ('SB', 'Solomon Islands'), ('SO', 'Somalia'), ('ZA', 'South Africa'), ('GS', 'South Georgia & the South Sandwich Islands'), ('SS', 'South Sudan'), ('ES', 'Spain'), ('LK', 'Sri Lanka'), ('BL', 'St Barthelemy'), ('SH', 'St Helena'), ('KN', 'St Kitts & Nevis'), ('LC', 'St Lucia'), ('SX', 'St Maarten (Dutch)'), ('MF', 'St Martin (French)'), ('PM', 'St Pierre & Miquelon'), ('VC', 'St Vincent'), ('SD', 'Sudan'), ('SR', 'Suriname'), ('SJ', 'Svalbard & Jan Mayen'), ('SE', 'Sweden'), ('CH', 'Switzerland'), ('SY', 'Syria'), ('TW', 'Taiwan'), ('TJ', 'Tajikistan'), ('TZ', 'Tanzania'), ('TH', 'Thailand'), ('TG', 'Togo'), ('TK', 'Tokelau'), ('TO', 'Tonga'), ('TT', 'Trinidad & Tobago'), ('TN', 'Tunisia'), ('TR', 'Turkey'), ('TM', 'Turkmenistan'), ('TC', 'Turks & Caicos Is'), ('TV', 'Tuvalu'), ('UM', 'US minor outlying islands'), ('UG', 'Uganda'), ('UA', 'Ukraine'), ('AE', 'United Arab Emirates'), ('US', 'United States'), ('UY', 'Uruguay'), ('UZ', 'Uzbekistan'), ('VU', 'Vanuatu'), ('VA', 'Vatican City'), ('VE', 'Venezuela'), ('VN', 'Vietnam'), ('VG', 'Virgin Islands (UK)'), ('VI', 'Virgin Islands (US)'), ('WF', 'Wallis & Futuna'), ('EH', 'Western Sahara'), ('YE', 'Yemen'), ('ZM', 'Zambia'), ('ZW', 'Zimbabwe'), ('AX', 'Åland Islands')], max_length=2),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0053_attended.py b/ietf/meeting/migrations/0053_attended.py
deleted file mode 100644
index 110101cf15..0000000000
--- a/ietf/meeting/migrations/0053_attended.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
-# Generated by Django 2.2.28 on 2022-06-17 08:40
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0023_auto_20220615_1006'),
-        ('meeting', '0052_auto_20220503_1815'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Attended',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('session', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Session')),
-            ],
-            options={
-                'unique_together': {('person', 'session')},
-            },
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0054_pytz_2002_2.py b/ietf/meeting/migrations/0054_pytz_2002_2.py
deleted file mode 100644
index bb9ad62a54..0000000000
--- a/ietf/meeting/migrations/0054_pytz_2002_2.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2022-08-12 09:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0053_attended'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='time_zone',
-            field=models.CharField(blank=True, choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montreal', 'America/Montreal'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Chongqing', 'Asia/Chongqing'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hanoi', 'Asia/Hanoi'), ('Asia/Harbin', 'Asia/Harbin'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kashgar', 'Asia/Kashgar'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Kyiv', 'Europe/Kyiv'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Johnston', 'Pacific/Johnston'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('UTC', 'UTC')], max_length=255),
-        ),
-    ]
diff --git a/ietf/meeting/migrations/0055_pytz_2022_2_1.py b/ietf/meeting/migrations/0055_pytz_2022_2_1.py
deleted file mode 100644
index 8ad9b4b827..0000000000
--- a/ietf/meeting/migrations/0055_pytz_2022_2_1.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2022-08-18 08:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('meeting', '0054_pytz_2002_2'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='meeting',
-            name='time_zone',
-            field=models.CharField(blank=True, choices=[('', '---------'), ('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Kyiv', 'Europe/Kyiv'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('UTC', 'UTC')], max_length=255),
-        ),
-    ]
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index 0265dad4c9..7d9e318aab 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -1,5 +1,4 @@
-# Copyright The IETF Trust 2007-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
+# Copyright The IETF Trust 2007-2025, All Rights Reserved
 
 
 # old meeting models can be found in ../proceedings/models.py
@@ -24,8 +23,8 @@
 from django.db.models.functions import Coalesce
 from django.conf import settings
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 from django.utils.text import slugify
-from django.utils.safestring import mark_safe
 
 from ietf.dbtemplate.models import DBTemplate
 from ietf.doc.models import Document
@@ -34,13 +33,14 @@
 from ietf.name.models import (
     MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName, RoomResourceName,
     ImportantDateName, TimerangeName, SlideSubmissionStatusName, ProceedingsMaterialTypeName,
-    SessionPurposeName,
+    SessionPurposeName, AttendanceTypeName, RegistrationTicketTypeName
 )
 from ietf.person.models import Person
 from ietf.utils.decorators import memoize
-from ietf.utils.storage import NoLocationMigrationFileSystemStorage
+from ietf.utils.history import find_history_replacements_active_at, find_history_active_at
+from ietf.utils.storage import BlobShadowFileSystemStorage
 from ietf.utils.text import xslugify
-from ietf.utils.timezone import date2datetime
+from ietf.utils.timezone import datetime_from_date, date_today
 from ietf.utils.models import ForeignKey
 from ietf.utils.validators import (
     MaxImageSizeValidator, WrappedValidator, validate_file_size, validate_mime_type,
@@ -48,26 +48,21 @@
 )
 from ietf.utils.fields import MissingOkImageField
 
-countries = list(pytz.country_names.items())
-countries.sort(key=lambda x: x[1])
-
-timezones = []
-for name in pytz.common_timezones:
-    tzfn = os.path.join(settings.TZDATA_ICS_PATH, name + ".ics")
-    if not os.path.islink(tzfn):
-        timezones.append((name, name))
-timezones.sort()
-
+# Set up countries / timezones, including an empty choice for fields
+EMPTY_CHOICE = ("", "-" * 9)
+COUNTRIES = (EMPTY_CHOICE,) + tuple(
+    sorted(pytz.country_names.items(), key=lambda x: x[1])
+)
 
-# this is used in models to format dates, as the built-in json serializer
-# can not deal with them, and the django provided serializer is inaccessible.
-from django.utils import datetime_safe
-DATE_FORMAT = "%Y-%m-%d"
-TIME_FORMAT = "%H:%M:%S"
+_tzdata_ics_path = Path(settings.TZDATA_ICS_PATH)
+TIMEZONES = (EMPTY_CHOICE,) + tuple(
+    sorted(
+        (name, name)
+        for name in pytz.common_timezones
+        if name != "GMT" and not (_tzdata_ics_path / f"{name}.ics").is_symlink()
+    )
+)
 
-def fmt_date(o):
-    d = datetime_safe.new_date(o)
-    return d.strftime(DATE_FORMAT)
 
 class Meeting(models.Model):
     # number is either the number for IETF meetings, or some other
@@ -81,11 +76,11 @@ class Meeting(models.Model):
     days = models.IntegerField(default=7, null=False, validators=[MinValueValidator(1)],
         help_text="The number of days the meeting lasts")
     city = models.CharField(blank=True, max_length=255)
-    country = models.CharField(blank=True, max_length=2, choices=countries)
+    country = models.CharField(blank=True, max_length=2, choices=COUNTRIES)
     # We can't derive time-zone from country, as there are some that have
     # more than one timezone, and the pytz module doesn't provide timezone
     # lookup information for all relevant city/country combinations.
-    time_zone = models.CharField(blank=True, max_length=255, choices=timezones)
+    time_zone = models.CharField(max_length=255, choices=TIMEZONES, default='UTC')
     idsubmit_cutoff_day_offset_00 = models.IntegerField(blank=True,
         default=settings.IDSUBMIT_DEFAULT_CUTOFF_DAY_OFFSET_00,
         help_text = "The number of days before the meeting start date when the submission of -00 drafts will be closed.")
@@ -137,46 +132,52 @@ def get_meeting_date (self,offset):
     def end_date(self):
         return self.get_meeting_date(self.days-1)
 
+    def start_datetime(self):
+        """Start-of-day on meeting.date in meeting time zone"""
+        return datetime_from_date(self.date, self.tz())
+
+    def end_datetime(self):
+        """Datetime of the first instant _after_ the meeting's last day in meeting time zone"""
+        return datetime_from_date(self.get_meeting_date(self.days), self.tz())
+
     def get_00_cutoff(self):
-        start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day, tzinfo=pytz.utc)
+        """Get the I-D submission 00 cutoff in UTC"""
         importantdate = self.importantdate_set.filter(name_id='idcutoff').first()
         if not importantdate:
             importantdate = self.importantdate_set.filter(name_id='00cutoff').first()
         if importantdate:
             cutoff_date = importantdate.date
         else:
-            cutoff_date = start_date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
-        cutoff_time = date2datetime(cutoff_date) + self.idsubmit_cutoff_time_utc
+            cutoff_date = self.date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
+        cutoff_time = datetime_from_date(cutoff_date, datetime.UTC) + self.idsubmit_cutoff_time_utc
         return cutoff_time
 
     def get_01_cutoff(self):
-        start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day, tzinfo=pytz.utc)
+        """Get the I-D submission 01 cutoff in UTC"""
         importantdate = self.importantdate_set.filter(name_id='idcutoff').first()
         if not importantdate:
             importantdate = self.importantdate_set.filter(name_id='01cutoff').first()
         if importantdate:
             cutoff_date = importantdate.date
         else:
-            cutoff_date = start_date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
-        cutoff_time = date2datetime(cutoff_date) + self.idsubmit_cutoff_time_utc
+            cutoff_date = self.date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
+        cutoff_time = datetime_from_date(cutoff_date, datetime.UTC) + self.idsubmit_cutoff_time_utc
         return cutoff_time
 
     def get_reopen_time(self):
-        start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day)
-        local_tz = pytz.timezone(self.time_zone)
-        local_date = local_tz.localize(start_date)
+        """Get the I-D submission reopening time in meeting-local time"""
         cutoff = self.get_00_cutoff()
-        if cutoff.date() == start_date:
+        if cutoff.date() == self.date:
             # no cutoff, so no local-time re-open
             reopen_time = cutoff
         else:
             # reopen time is in local timezone.  May need policy change??  XXX
-            reopen_time = local_date + self.idsubmit_cutoff_time_utc
+            reopen_time = datetime_from_date(self.date, self.tz()) + self.idsubmit_cutoff_time_utc
         return reopen_time
 
     @classmethod
     def get_current_meeting(cls, type="ietf"):
-        return cls.objects.filter(type=type, date__gte=datetime.datetime.today()-datetime.timedelta(days=7) ).order_by('date').first()
+        return cls.objects.filter(type=type, date__gte=timezone.now()-datetime.timedelta(days=7) ).order_by('date').first()
 
     def get_first_cut_off(self):
         return self.get_00_cutoff()
@@ -236,9 +237,9 @@ def get_proceedings_materials(self):
         ).order_by('type__order')
 
     def get_attendance(self):
-        """Get the meeting attendance from the MeetingRegistrations
+        """Get the meeting attendance from the Registrations
 
-        Returns a NamedTuple with onsite and online attributes. Returns None if the record is unavailable
+        Returns a NamedTuple with onsite and remote attributes. Returns None if the record is unavailable
         for this meeting.
         """
         number = self.get_number()
@@ -247,27 +248,41 @@ def get_attendance(self):
         Attendance = namedtuple('Attendance', 'onsite remote')
 
         # MeetingRegistration.attended started conflating badge-pickup and session attendance before IETF 114.
-        # We've separated session attendence off to ietf.meeting.Attended, but need to report attendance at older
+        # We've separated session attendance off to ietf.meeting.Attended, but need to report attendance at older
         # meetings correctly.
-
-        attended_per_meetingregistration = (
-            Q(meetingregistration__meeting=self) & (
-                Q(meetingregistration__attended=True) |
-                Q(meetingregistration__checkedin=True)
+        #
+        # Looking up by registration and attendance records separately and joining in
+        # python is far faster than combining the Q objects in the query (~100x).
+        # Further optimization may be possible, but the queries are tricky...
+        attended_per_meeting_registration = (
+            Q(registration__meeting=self) & (
+                Q(registration__attended=True) |
+                Q(registration__checkedin=True)
             )
         )
+        attendees_by_reg = set(
+            Person.objects.filter(attended_per_meeting_registration).values_list(
+                "pk", flat=True
+            )
+        )
+
         attended_per_meeting_attended = (
             Q(attended__session__meeting=self)
             # Note that we are not filtering to plenary, wg, or rg sessions
             # as we do for nomcom eligibility - if picking up a badge (see above)
             # is good enough, just attending e.g. a training session is also good enough
         )
-        attended = Person.objects.filter(
-            attended_per_meetingregistration | attended_per_meeting_attended
-        ).distinct()
-
-        onsite=set(attended.filter(meetingregistration__meeting=self, meetingregistration__reg_type='onsite'))
-        remote=set(attended.filter(meetingregistration__meeting=self, meetingregistration__reg_type='remote'))
+        attendees_by_att = set(
+            Person.objects.filter(attended_per_meeting_attended).values_list(
+                "pk", flat=True
+            )
+        )
+        
+        attendees = Person.objects.filter(
+            pk__in=attendees_by_att | attendees_by_reg
+        )
+        onsite = set(attendees.filter(registration__meeting=self, registration__tickets__attendance_type__slug='onsite'))
+        remote = set(attendees.filter(registration__meeting=self, registration__tickets__attendance_type__slug='remote'))
         remote.difference_update(onsite)
 
         return Attendance(
@@ -300,26 +315,6 @@ def proceedings_format_version(self):
             self._proceedings_format_version = version  # save this for later
         return self._proceedings_format_version
 
-    @property
-    def session_constraintnames(self):
-        """Gets a list of the constraint names that should be used for this meeting
-
-        Anticipated that this will soon become a many-to-many relationship with ConstraintName
-        (see issue #2770). Making this a @property allows use of the .all(), .filter(), etc,
-        so that other code should not need changes when this is replaced.
-        """
-        try:
-            mtg_num = int(self.number)
-        except ValueError:
-            mtg_num = None  # should not come up, but this method should not fail
-        if mtg_num is None or mtg_num >= 106:
-            # These meetings used the old 'conflic?' constraint types labeled as though
-            # they were the new types.
-            slugs = ('chair_conflict', 'tech_overlap', 'key_participant')
-        else:
-            slugs = ('conflict', 'conflic2', 'conflic3')
-        return ConstraintName.objects.filter(slug__in=slugs)
-
     def base_url(self):
         return "/meeting/%s" % (self.number, )
 
@@ -338,7 +333,7 @@ def build_timeslices(self):
         for ts in self.timeslot_set.all():
             if ts.location_id is None:
                 continue
-            ymd = ts.time.date()
+            ymd = ts.local_start_time().date()
             if ymd not in time_slices:
                 time_slices[ymd] = []
                 slots[ymd] = []
@@ -346,15 +341,15 @@ def build_timeslices(self):
 
             if ymd in time_slices:
                 # only keep unique entries
-                if [ts.time, ts.time + ts.duration, ts.duration.seconds] not in time_slices[ymd]:
-                    time_slices[ymd].append([ts.time, ts.time + ts.duration, ts.duration.seconds])
+                if [ts.local_start_time(), ts.local_end_time(), ts.duration.seconds] not in time_slices[ymd]:
+                    time_slices[ymd].append([ts.local_start_time(), ts.local_end_time(), ts.duration.seconds])
                     slots[ymd].append(ts)
 
         days.sort()
         for ymd in time_slices:
             # Make sure these sort the same way
             time_slices[ymd].sort()
-            slots[ymd].sort(key=lambda x: (x.time, x.duration))
+            slots[ymd].sort(key=lambda x: (x.local_start_time(), x.duration))
         return days,time_slices,slots
 
     # this functions makes a list of timeslices and rooms, and
@@ -370,42 +365,90 @@ def build_timeslices(self):
 #                    SchedTimeSessAssignment.objects.create(schedule = sched,
 #                                                    timeslot = ts)
 
+    def tz(self):
+        if not hasattr(self, '_cached_tz'):
+            self._cached_tz = pytz.timezone(self.time_zone)
+        return self._cached_tz
+
     def vtimezone(self):
-        if self.time_zone:
-            try:
-                tzfn = os.path.join(settings.TZDATA_ICS_PATH, self.time_zone + ".ics")
-                if os.path.exists(tzfn):
-                    with io.open(tzfn) as tzf:
-                        icstext = tzf.read()
-                    vtimezone = re.search("(?sm)(\nBEGIN:VTIMEZONE.*\nEND:VTIMEZONE\n)", icstext).group(1).strip()
-                    if vtimezone:
-                        vtimezone += "\n"
-                    return vtimezone
-            except IOError:
-                pass
-        return ''
-
-    def set_official_schedule(self, schedule):
-        if self.schedule != schedule:
-            self.schedule = schedule
-            self.save()
+        try:
+            tzfn = os.path.join(settings.TZDATA_ICS_PATH, self.time_zone + ".ics")
+            if os.path.exists(tzfn):
+                with io.open(tzfn) as tzf:
+                    icstext = tzf.read()
+                vtimezone = re.search("(?sm)(\nBEGIN:VTIMEZONE.*\nEND:VTIMEZONE\n)", icstext).group(1).strip()
+                if vtimezone:
+                    vtimezone += "\n"
+                return vtimezone
+        except IOError:
+            pass
+        return None
+
 
     def updated(self):
-        min_time = datetime.datetime(1970, 1, 1, 0, 0, 0) # should be Meeting.modified, but we don't have that
-        timeslots_updated = self.timeslot_set.aggregate(Max('modified'))["modified__max"] or min_time
-        sessions_updated = self.session_set.aggregate(Max('modified'))["modified__max"] or min_time
-        assignments_updated = min_time
+        # should be Meeting.modified, but we don't have that
+        timeslots_updated = self.timeslot_set.aggregate(Max('modified'))["modified__max"]
+        sessions_updated = self.session_set.aggregate(Max('modified'))["modified__max"]
+        assignments_updated = None
         if self.schedule:
-            assignments_updated = SchedTimeSessAssignment.objects.filter(schedule__in=[self.schedule, self.schedule.base if self.schedule else None]).aggregate(Max('modified'))["modified__max"] or min_time
-        ts = max(timeslots_updated, sessions_updated, assignments_updated)
-        tz = pytz.timezone(settings.PRODUCTION_TIMEZONE)
-        ts = tz.localize(ts)
-        return ts
+            assignments_updated = SchedTimeSessAssignment.objects.filter(schedule__in=[self.schedule, self.schedule.base if self.schedule else None]).aggregate(Max('modified'))["modified__max"]
+        dts = [timeslots_updated, sessions_updated, assignments_updated]
+        valid_only = [dt for dt in dts if dt is not None]
+        return max(valid_only) if valid_only else None
 
     @memoize
     def previous_meeting(self):
         return Meeting.objects.filter(type_id=self.type_id,date__lt=self.date).order_by('-date').first()
 
+    def uses_notes(self):
+        if self.type_id != 'ietf':
+            return True
+        num = self.get_number()
+        return num is not None and num >= 108
+
+    def has_recordings(self):
+        if self.type_id != 'ietf':
+            return True
+        num = self.get_number()
+        return num is not None and num >= 80
+
+    def has_chat_logs(self):
+        if self.type_id != 'ietf':
+            return True;
+        num = self.get_number()
+        return num is not None and num >= 60
+
+    def meeting_start(self):
+        """Meeting-local midnight at the start of the meeting date"""
+        return self.tz().localize(datetime.datetime.combine(self.date, datetime.time()))
+
+    def _groups_at_the_time(self):
+        """Get dict mapping Group PK to appropriate Group or GroupHistory at meeting time
+
+        Known issue: only looks up Groups and their *current* parents when called. If a Group's
+        parent was different at meeting time, that parent will not be in the cache. Use
+        group_at_the_time() to look up values - that will fill in missing groups for you.
+        """
+        if not hasattr(self,'cached_groups_at_the_time'):
+            all_group_pks = set(self.session_set.values_list('group__pk', flat=True))
+            all_group_pks.update(self.session_set.values_list('group__parent__pk', flat=True))
+            all_group_pks.discard(None)
+            self.cached_groups_at_the_time = find_history_replacements_active_at(
+                Group.objects.filter(pk__in=all_group_pks),
+                self.meeting_start(),
+            )
+        return self.cached_groups_at_the_time
+
+    def group_at_the_time(self, group):
+        # MUST call self._groups_at_the_time() before assuming cached_groups_at_the_time exists
+        gatt = self._groups_at_the_time()
+        if group.pk in gatt:
+            return gatt[group.pk]
+        # Cache miss - look up the missing historical group and add it to the cache.
+        new_item = find_history_active_at(group, self.meeting_start()) or group  # fall back to original if no history
+        self.cached_groups_at_the_time[group.pk] = new_item
+        return new_item
+
     class Meta:
         ordering = ["-date", "-id"]
         indexes = [
@@ -442,24 +485,9 @@ class Room(models.Model):
     # end floorplan-related stuff
 
     def __str__(self):
-        return u"%s size: %s" % (self.name, self.capacity)
-
-    def delete_timeslots(self):
-        for ts in self.timeslot_set.all():
-            ts.sessionassignments.all().delete()
-            ts.delete()
-
-    def create_timeslots(self):
-        days, time_slices, slots  = self.meeting.build_timeslices()
-        for day in days:
-            for ts in slots[day]:
-                TimeSlot.objects.create(type_id=ts.type_id,
-                                    meeting=self.meeting,
-                                    name=ts.name,
-                                    time=ts.time,
-                                    location=self,
-                                    duration=ts.duration)
-        #self.meeting.create_all_timeslots()
+        if len(self.functional_name) > 0 and self.functional_name != self.name:
+            return f"{self.name} [{self.functional_name}] (size: {self.capacity})"    
+        return f"{self.name} (size: {self.capacity})"    
 
     def dom_id(self):
         return "room%u" % (self.pk)
@@ -483,14 +511,6 @@ def right(self):
         return max(self.x1, self.x2) if (self.x1 and self.x2) else 0
     def bottom(self):
         return max(self.y1, self.y2) if (self.y1 and self.y2) else 0
-    def functional_display_name(self):
-        if not self.functional_name:
-            return ""
-        if 'breakout' in self.functional_name.lower():
-            return ""
-        if self.functional_name[0].isdigit():
-            return ""
-        return self.functional_name
     # audio stream support
     def audio_stream_url(self):
         urlresources = [ur for ur in self.urlresource_set.all() if ur.name_id == 'audiostream']
@@ -525,7 +545,12 @@ class FloorPlan(models.Model):
     modified= models.DateTimeField(auto_now=True)
     meeting = ForeignKey(Meeting)
     order   = models.SmallIntegerField()
-    image   = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=floorplan_path, blank=True, default=None)
+    image   = models.ImageField(
+        storage=BlobShadowFileSystemStorage(kind="floorplan"),
+        upload_to=floorplan_path,
+        blank=False,
+        default=None,
+    )
     #
     class Meta:
         ordering = ['-id',]
@@ -533,14 +558,22 @@ class Meta:
     def __str__(self):
         return u'floorplan-%s-%s' % (self.meeting.number, xslugify(self.name))
 
+
 # === Schedules, Sessions, Timeslots and Assignments ===========================
 
+class TimeSlotQuerySet(models.QuerySet):
+    def that_can_be_scheduled(self):
+        return self.exclude(type__in=TimeSlot.TYPES_NOT_SCHEDULABLE)
+
+
 class TimeSlot(models.Model):
     """
     Everything that would appear on the meeting agenda of a meeting is
     mapped to a timeslot, including breaks. Sessions are connected to
     TimeSlots during scheduling.
     """
+    objects = TimeSlotQuerySet.as_manager()
+
     meeting = ForeignKey(Meeting)
     type = ForeignKey(TimeSlotTypeName)
     name = models.CharField(max_length=255)
@@ -548,33 +581,35 @@ class TimeSlot(models.Model):
     duration = models.DurationField(default=datetime.timedelta(0))
     location = ForeignKey(Room, blank=True, null=True)
     show_location = models.BooleanField(default=True, help_text="Show location in agenda.")
-    sessions = models.ManyToManyField('Session', related_name='slots', through='SchedTimeSessAssignment', blank=True, help_text="Scheduled session, if any.")
+    sessions = models.ManyToManyField('meeting.Session', related_name='slots', through='meeting.SchedTimeSessAssignment', blank=True, help_text="Scheduled session, if any.")
     modified = models.DateTimeField(auto_now=True)
     #
 
+    TYPES_NOT_SCHEDULABLE = ('offagenda', 'reserved', 'unavail')
+
     @property
     def session(self):
         if not hasattr(self, "_session_cache"):
             self._session_cache = self.sessions.filter(timeslotassignments__schedule__in=[self.meeting.schedule, self.meeting.schedule.base if self.meeting else None]).first()
         return self._session_cache
 
-    @property
-    def time_desc(self):
-        return "%s-%s" % (self.time.strftime("%H%M"), (self.time + self.duration).strftime("%H%M"))
-
-    def meeting_date(self):
-        return self.time.date()
-
-    def registration(self):
-        # below implements a object local cache
-        # it tries to find a timeslot of type registration which starts at the same time as this slot
-        # so that it can be shown at the top of the agenda.
-        if not hasattr(self, '_reg_info'):
-            try:
-                self._reg_info = TimeSlot.objects.get(meeting=self.meeting, time__month=self.time.month, time__day=self.time.day, type="reg")
-            except TimeSlot.DoesNotExist:
-                self._reg_info = None
-        return self._reg_info
+    # Unused
+    #
+    # def meeting_date(self):
+    #     return self.time.date()
+
+    # Unused
+    #
+    # def registration(self):
+    #     # below implements a object local cache
+    #     # it tries to find a timeslot of type registration which starts at the same time as this slot
+    #     # so that it can be shown at the top of the agenda.
+    #     if not hasattr(self, '_reg_info'):
+    #         try:
+    #             self._reg_info = TimeSlot.objects.get(meeting=self.meeting, time__month=self.time.month, time__day=self.time.day, type="reg")
+    #         except TimeSlot.DoesNotExist:
+    #             self._reg_info = None
+    #     return self._reg_info
 
     def __str__(self):
         location = self.get_location()
@@ -601,86 +636,72 @@ def get_hidden_location(self):
     def get_location(self):
         return self.get_hidden_location() if self.show_location else ""
 
-    def get_functional_location(self):
-        name_parts = []
-        room = self.location
-        if room and room.functional_name:
-            name_parts.append(room.functional_name)
-        location = self.get_hidden_location()
-        if location:
-            name_parts.append(location)
-        return ' - '.join(name_parts)
-
-    def get_html_location(self):
-        if not hasattr(self, '_cached_html_location'):
-            self._cached_html_location = self.get_location()
-            if len(self._cached_html_location) > 8:
-                self._cached_html_location = mark_safe(self._cached_html_location.replace('/', '/<wbr>'))
-            else:
-                self._cached_html_location = mark_safe(self._cached_html_location.replace(' ', '&nbsp;'))
-        return self._cached_html_location
+    # Unused
+    #
+    # def get_functional_location(self):
+    #     name_parts = []
+    #     room = self.location
+    #     if room and room.functional_name:
+    #         name_parts.append(room.functional_name)
+    #     location = self.get_hidden_location()
+    #     if location:
+    #         name_parts.append(location)
+    #     return ' - '.join(name_parts)
+
+    # def get_html_location(self):
+    #     if not hasattr(self, '_cached_html_location'):
+    #         self._cached_html_location = self.get_location()
+    #         if len(self._cached_html_location) > 8:
+    #             self._cached_html_location = mark_safe(self._cached_html_location.replace('/', '/<wbr>'))
+    #         else:
+    #             self._cached_html_location = mark_safe(self._cached_html_location.replace(' ', '&nbsp;'))
+    #     return self._cached_html_location
 
     def tz(self):
-        if not hasattr(self, '_cached_tz'):
-            if self.meeting.time_zone:
-                self._cached_tz = pytz.timezone(self.meeting.time_zone)
-            else:
-                self._cached_tz = None
-        return self._cached_tz
+        return self.meeting.tz()
 
-    def tzname(self):
-        if self.tz():
-            return self.tz().tzname(self.time)
-        else:
-            return ""
+    # Unused
+    # def tzname(self):
+    #     return self.tz().tzname(self.time)
 
     def utc_start_time(self):
-        if self.tz():
-            local_start_time = self.tz().localize(self.time)
-            return local_start_time.astimezone(pytz.utc)
-        else:
-            return None
+        return self.time.astimezone(pytz.utc)  # USE_TZ is True, so time is aware
 
     def utc_end_time(self):
-        utc_start = self.utc_start_time()
-        # Add duration after converting start time, otherwise errors creep in around DST change
-        return None if utc_start is None else utc_start + self.duration
+        return self.time.astimezone(pytz.utc) + self.duration  # USE_TZ is True, so time is aware
 
     def local_start_time(self):
-        if self.tz():
-            return self.tz().localize(self.time)
-        else:
-            return None
+        return self.time.astimezone(self.tz())
 
     def local_end_time(self):
-        local_start = self.local_start_time()
-        # Add duration after converting start time, otherwise errors creep in around DST change
-        return None if local_start is None else local_start + self.duration
+        return (self.time.astimezone(pytz.utc) + self.duration).astimezone(self.tz())
 
-    @property
-    def js_identifier(self):
-        # this returns a unique identifier that is js happy.
-        #  {{s.timeslot.time|date:'Y-m-d'}}_{{ s.timeslot.time|date:'Hi' }}"
-        # also must match:
-        #  {{r|slugify}}_{{day}}_{{slot.0|date:'Hi'}}
-        dom_id="ts%u" % (self.pk)
-        if self.location is not None:
-            dom_id = self.location.dom_id()
-        return "%s_%s_%s" % (dom_id, self.time.strftime('%Y-%m-%d'), self.time.strftime('%H%M'))
-
-    def delete_concurrent_timeslots(self):
-        """Delete all timeslots which are in the same time as this slot"""
-        # can not include duration in filter, because there is no support
-        # for having it a WHERE clause.
-        # below will delete self as well.
-        for ts in self.meeting.timeslot_set.filter(time=self.time).all():
-            if ts.duration!=self.duration:
-                continue
-
-            # now remove any schedule that might have been made to this
-            # timeslot.
-            ts.sessionassignments.all().delete()
-            ts.delete()
+    # Unused
+    #
+    # @property
+    # def js_identifier(self):
+    #     # this returns a unique identifier that is js happy.
+    #     #  {{s.timeslot.time|date:'Y-m-d'}}_{{ s.timeslot.time|date:'Hi' }}"
+    #     # also must match:
+    #     #  {{r|slugify}}_{{day}}_{{slot.0|date:'Hi'}}
+    #     dom_id="ts%u" % (self.pk)
+    #     if self.location is not None:
+    #         dom_id = self.location.dom_id()
+    #     return "%s_%s_%s" % (dom_id, self.time.strftime('%Y-%m-%d'), self.time.strftime('%H%M'))
+
+    # def delete_concurrent_timeslots(self):
+    #     """Delete all timeslots which are in the same time as this slot"""
+    #     # can not include duration in filter, because there is no support
+    #     # for having it a WHERE clause.
+    #     # below will delete self as well.
+    #     for ts in self.meeting.timeslot_set.filter(time=self.time).all():
+    #         if ts.duration!=self.duration:
+    #             continue
+
+    #         # now remove any schedule that might have been made to this
+    #         # timeslot.
+    #         ts.sessionassignments.all().delete()
+    #         ts.delete()
 
     """
     Find a timeslot that comes next, in the same room.   It must be on the same day,
@@ -753,7 +774,7 @@ def is_official(self):
     @property
     def is_official_record(self):
         return (self.is_official and
-                self.meeting.end_date() <= datetime.date.today() )
+                self.meeting.end_date() <= date_today() )
 
     # returns a dictionary {group -> [schedtimesessassignment+]}
     # and it has [] if the session is not placed.
@@ -766,9 +787,6 @@ def official_token(self):
         else:
             return "unofficial"
 
-    def delete_assignments(self):
-        self.assignments.all().delete()
-
     @property
     def qs_assignments_with_sessions(self):
         return self.assignments.filter(session__isnull=False)
@@ -781,10 +799,6 @@ def qs_sessions_scheduled(self):
         """Get QuerySet containing sessions assigned to timeslots by this schedule"""
         return Session.objects.filter(timeslotassignments__schedule=self)
 
-    def delete_schedule(self):
-        self.assignments.all().delete()
-        self.delete()
-
 # to be renamed SchedTimeSessAssignments (stsa)
 class SchedTimeSessAssignment(models.Model):
     """
@@ -797,7 +811,6 @@ class SchedTimeSessAssignment(models.Model):
     schedule = ForeignKey('Schedule', null=False, blank=False, related_name='assignments')
     extendedfrom = ForeignKey('self', null=True, default=None, help_text="Timeslot this session is an extension of.")
     modified = models.DateTimeField(auto_now=True)
-    notes    = models.TextField(blank=True)
     badness  = models.IntegerField(default=0, blank=True, null=True)
     pinned   = models.BooleanField(default=False, help_text="Do not move session during automatic placement.")
 
@@ -841,12 +854,12 @@ def slug(self):
         if not self.timeslot:
             components.append("unknown")
 
-        if not self.session or not (getattr(self.session, "historic_group", None) or self.session.group):
+        if not self.session or not self.session.group_at_the_time():
             components.append("unknown")
         else:
             components.append(self.timeslot.time.strftime("%Y-%m-%d-%a-%H%M"))
 
-            g = getattr(self.session, "historic_group", None) or self.session.group
+            g = self.session.group_at_the_time()
 
             if self.timeslot.type.slug in ('break', 'reg', 'other'):
                 components.append(g.acronym)
@@ -856,7 +869,7 @@ def slug(self):
                 if self.timeslot.type.slug == "plenary":
                     components.append("1plenary")
                 else:
-                    p = getattr(g, "historic_parent", None) or g.parent
+                    p = self.session.group_parent_at_the_time()
                     if p and p.type_id in ("area", "irtf", 'ietf'):
                         components.append(p.acronym)
 
@@ -930,8 +943,8 @@ def brief_display(self):
 
 
 class SessionPresentation(models.Model):
-    session = ForeignKey('Session')
-    document = ForeignKey(Document)
+    session = ForeignKey('Session', related_name="presentations")
+    document = ForeignKey(Document, related_name="presentations")
     rev = models.CharField(verbose_name="revision", max_length=16, null=True, blank=True)
     order = models.PositiveSmallIntegerField(default=0)
 
@@ -943,8 +956,6 @@ class Meta:
     def __str__(self):
         return u"%s -> %s-%s" % (self.session, self.document.name, self.rev)
 
-constraint_cache_uses = 0
-constraint_cache_initials = 0
 
 class SessionQuerySet(models.QuerySet):
     def with_current_status(self):
@@ -1017,11 +1028,16 @@ def that_can_meet(self):
             type__slug='regular'
         )
 
+    def that_can_be_scheduled(self):
+        """Queryset containing sessions that should be scheduled for a meeting"""
+        return self.requests().with_current_status().filter(
+            current_status__in=['appr', 'schedw', 'scheda', 'sched']
+        )
+
     def requests(self):
         """Queryset containing sessions that may be handled as requests"""
-        return self.exclude(
-            type__in=('offagenda', 'reserved', 'unavail')
-        )
+        return self.exclude(type__in=TimeSlot.TYPES_NOT_SCHEDULABLE)
+
 
 class Session(models.Model):
     """Session records that a group should have a session on the
@@ -1038,13 +1054,16 @@ class Session(models.Model):
     group = ForeignKey(Group)    # The group type historically determined the session type.  BOFs also need to be added as a group. Note that not all meeting requests have a natural group to associate with.
     joint_with_groups = models.ManyToManyField(Group, related_name='sessions_joint_in',blank=True)
     attendees = models.IntegerField(null=True, blank=True)
-    agenda_note = models.CharField(blank=True, max_length=255)
+    agenda_note = models.CharField(blank=True, max_length=512)
     requested_duration = models.DurationField(default=datetime.timedelta(0))
     comments = models.TextField(blank=True)
     scheduled = models.DateTimeField(null=True, blank=True)
     modified = models.DateTimeField(auto_now=True)
     remote_instructions = models.CharField(blank=True,max_length=1024)
     on_agenda = models.BooleanField(default=True, help_text='Is this session visible on the meeting agenda?')
+    has_onsite_tool = models.BooleanField(default=False, help_text="Does this session use the officially supported onsite and remote tooling?")
+    chat_room = models.CharField(blank=True, max_length=32, help_text='Name of Zulip stream, if different from group acronym')
+    meetecho_recording_name = models.CharField(blank=True, max_length=64, help_text="Name of the meetecho recording")
 
     tombstone_for = models.ForeignKey('Session', blank=True, null=True, help_text="This session is the tombstone for a session that was rescheduled", on_delete=models.CASCADE)
 
@@ -1063,7 +1082,7 @@ def get_material(self, material_type, only_one):
             for d in l:
                 d.meeting_related = lambda: True
         else:
-            l = self.materials.filter(type=material_type).exclude(states__type=material_type, states__slug='deleted').order_by('sessionpresentation__order')
+            l = self.materials.filter(type=material_type).exclude(states__type=material_type, states__slug='deleted').order_by('presentations__order')
 
         if only_one:
             if l:
@@ -1083,16 +1102,25 @@ def minutes(self):
             self._cached_minutes = self.get_material("minutes", only_one=True)
         return self._cached_minutes
 
+    def narrative_minutes(self):
+        if not hasattr(self, '_cached_narrative_minutes'):
+            self._cached_minutes = self.get_material("narrativeminutes", only_one=True)
+        return self._cached_minutes
+
     def recordings(self):
         return list(self.get_material("recording", only_one=False))
 
     def bluesheets(self):
         return list(self.get_material("bluesheets", only_one=False))
 
+    def chatlogs(self):
+        return list(self.get_material("chatlog", only_one=False))
+
     def slides(self):
         if not hasattr(self, "_slides_cache"):
             self._slides_cache = list(self.get_material("slides", only_one=False))
         return self._slides_cache
+    
 
     def drafts(self):
         return list(self.materials.filter(type='draft'))
@@ -1105,8 +1133,18 @@ def all_meeting_sessions_for_group(self):
         from ietf.meeting.utils import add_event_info_to_session_qs
         if self.group.features.has_meetings:
             if not hasattr(self, "_all_meeting_sessions_for_group_cache"):
-                sessions = [s for s in add_event_info_to_session_qs(self.meeting.session_set.filter(group=self.group,type=self.type)) if s.official_timeslotassignment()]
-                self._all_meeting_sessions_for_group_cache = sorted(sessions, key = lambda x: x.official_timeslotassignment().timeslot.time)
+                sessions = [s for s in add_event_info_to_session_qs(self.meeting.session_set.filter(group=self.group)) if s.official_timeslotassignment()]
+                for s in sessions:
+                    s.ota = s.official_timeslotassignment()
+                # Align this sort with SchedTimeSessAssignment default sort order since many views base their order on that
+                self._all_meeting_sessions_for_group_cache = sorted(
+                    sessions, key = lambda x: (
+                        x.ota.timeslot.time,
+                        x.ota.timeslot.type.slug,
+                        x.ota.session.group.parent.name if x.ota.session.group.parent else None,
+                        x.ota.session.name
+                    )
+                )
             return self._all_meeting_sessions_for_group_cache
         else:
             return [self]
@@ -1117,30 +1155,6 @@ def order_in_meeting(self):
             self._order_in_meeting = session_list.index(self) + 1 if self in session_list else 0
         return self._order_in_meeting
 
-    def all_meeting_sessions_cancelled(self):
-        return set(s.current_status for s in self.all_meeting_sessions_for_group()) == {'canceled'}
-
-    def all_meeting_recordings(self):
-        recordings = [] # These are not sets because we need to preserve relative ordering or redo the ordering work later
-        sessions = self.all_meeting_sessions_for_group()
-        for session in sessions:
-            recordings.extend([r for r in session.recordings() if r not in recordings])
-        return recordings
-            
-    def all_meeting_bluesheets(self):
-        bluesheets = []
-        sessions = self.all_meeting_sessions_for_group()
-        for session in sessions:
-            bluesheets.extend([b for b in session.bluesheets() if b not in bluesheets])
-        return bluesheets
-            
-    def all_meeting_drafts(self):
-        drafts = []
-        sessions = self.all_meeting_sessions_for_group()
-        for session in sessions:
-            drafts.extend([d for d in session.drafts() if d not in drafts])
-        return drafts
-
     def all_meeting_agendas(self):
         agendas = []
         sessions = self.all_meeting_sessions_for_group()
@@ -1170,7 +1184,7 @@ def can_manage_materials(self, user):
         return can_manage_materials(user,self.group)
 
     def is_material_submission_cutoff(self):
-        return datetime.date.today() > self.meeting.get_submission_correction_date()
+        return date_today(datetime.UTC) > self.meeting.get_submission_correction_date()
     
     def joint_with_groups_acronyms(self):
         return [group.acronym for group in self.joint_with_groups.all()]
@@ -1213,19 +1227,30 @@ def special_request_token(self):
         else:
             return ""
 
+    @staticmethod
+    def _alpha_str(n: int):
+        """Convert integer to string of a-z characters (a, b, c, ..., aa, ab, ...)"""
+        chars = []
+        while True:
+            chars.append(string.ascii_lowercase[n % 26])
+            n //= 26
+            # for 2nd letter and beyond, 0 means end the string
+            if n == 0:
+                break
+            # beyond the first letter, no need to represent a 0, so decrement
+            n -= 1
+        return "".join(chars[::-1])
+
     def docname_token(self):
         sess_mtg = Session.objects.filter(meeting=self.meeting, group=self.group).order_by('pk')
         index = list(sess_mtg).index(self)
-        return 'sess%s' % (string.ascii_lowercase[index])
+        return f"sess{self._alpha_str(index)}"
 
     def docname_token_only_for_multiple(self):
         sess_mtg = Session.objects.filter(meeting=self.meeting, group=self.group).order_by('pk')
         if len(list(sess_mtg)) > 1:
             index = list(sess_mtg).index(self)
-            if index < 26:
-                token = 'sess%s' % (string.ascii_lowercase[index])
-            else:
-                token = 'sess%s%s' % (string.ascii_lowercase[index//26],string.ascii_lowercase[index%26])
+            token = f"sess{self._alpha_str(index)}"
             return token
         return None
         
@@ -1236,7 +1261,10 @@ def reverse_constraints(self):
         return Constraint.objects.filter(target=self.group, meeting=self.meeting).order_by('name__name')
 
     def official_timeslotassignment(self):
-        return self.timeslotassignments.filter(schedule__in=[self.meeting.schedule, self.meeting.schedule.base if self.meeting.schedule else None]).first()
+        # cache only non-None values
+        if getattr(self, "_cache_official_timeslotassignment", None) is None:
+            self._cache_official_timeslotassignment = self.timeslotassignments.filter(schedule__in=[self.meeting.schedule, self.meeting.schedule.base if self.meeting.schedule else None]).first()
+        return self._cache_official_timeslotassignment
 
     @property
     def people_constraints(self):
@@ -1254,33 +1282,35 @@ def agenda_text(self):
         else:
             return "The agenda has not been uploaded yet."
 
-    def agenda_file(self):
-        if not hasattr(self, '_agenda_file'):
-            self._agenda_file = ""
-
-            agenda = self.agenda()
-            if not agenda:
-                return ""
-
-            # FIXME: uploaded_filename should be replaced with a function that computes filenames when they are of a fixed schema and not uploaded names
-            self._agenda_file = "%s/agenda/%s" % (self.meeting.number, agenda.uploaded_filename)
-            
-        return self._agenda_file
-
     def chat_room_name(self):
-        if self.type_id=='plenary':
+        if self.chat_room:
+            return self.chat_room
+        # At some point, add a migration to add "plenary" chat room name to existing sessions in the database.
+        elif self.type_id=='plenary':
             return 'plenary'
-        elif hasattr(self, 'historic_group'):
-            return self.historic_group.acronym
         else:
-            return self.group.acronym
+            return self.group_at_the_time().acronym
 
     def chat_room_url(self):
         return settings.CHAT_URL_PATTERN.format(chat_room_name=self.chat_room_name())
 
     def chat_archive_url(self):
-        # datatracker 8.8.0 released on 2022 July 15; before that, fall back to old log URL
+
+        if hasattr(self,"prefetched_active_materials"):
+            chatlog_doc = None
+            for doc in self.prefetched_active_materials:
+                if doc.type_id=="chatlog":
+                    chatlog_doc = doc
+                    break
+            if chatlog_doc is not None:
+                return chatlog_doc.get_href()
+        else:
+            chatlog = self.presentations.filter(document__type__slug='chatlog').first()
+            if chatlog is not None:
+                return chatlog.document.get_href()
+            
         if self.meeting.date <= datetime.date(2022, 7, 15):
+            # datatracker 8.8.0 released on 2022 July 15; before that, fall back to old log URL
             return f'https://www.ietf.org/jabber/logs/{ self.chat_room_name() }?C=M;O=D'
         elif hasattr(settings,'CHAT_ARCHIVE_URL_PATTERN'):
             return settings.CHAT_ARCHIVE_URL_PATTERN.format(chat_room_name=self.chat_room_name())
@@ -1295,9 +1325,58 @@ def notes_id(self):
     def notes_url(self):
         return urljoin(settings.IETF_NOTES_URL, self.notes_id())
 
+
+    def group_at_the_time(self):
+        if not hasattr(self,"_cached_group_at_the_time"):
+            self._cached_group_at_the_time = self.meeting.group_at_the_time(self.group)
+        return self._cached_group_at_the_time
+
+    def group_parent_at_the_time(self):
+        if self.group_at_the_time().parent:
+            return self.meeting.group_at_the_time(self.group_at_the_time().parent)
+
+    def audio_stream_url(self):
+        url = getattr(settings, "MEETECHO_AUDIO_STREAM_URL", "")
+        if self.meeting.type.slug == "ietf" and self.has_onsite_tool and url:
+            return url.format(session=self)
+        return None
+
+    def video_stream_url(self):
+        url = getattr(settings, "MEETECHO_VIDEO_STREAM_URL", "")
+        if self.meeting.type.slug == "ietf" and self.has_onsite_tool and url:
+            return url.format(session=self)
+        return None
+
+    def onsite_tool_url(self):
+        url = getattr(settings, "MEETECHO_ONSITE_TOOL_URL", "")
+        if self.meeting.type.slug == "ietf" and self.has_onsite_tool and url:
+            return url.format(session=self)
+        return None
+
+    def _session_recording_url_label(self):
+        otsa = self.official_timeslotassignment()
+        if otsa is None:
+            return None
+        if self.meeting.type.slug == "ietf" and self.has_onsite_tool:
+            session_label = f"IETF{self.meeting.number}-{self.group.acronym.upper()}-{otsa.timeslot.time.strftime('%Y%m%d-%H%M')}"
+        else:
+            session_label = f"IETF-{self.group.acronym.upper()}-{otsa.timeslot.time.strftime('%Y%m%d-%H%M')}"
+        return session_label
+
+    def session_recording_url(self):
+        url_formatter = getattr(settings, "MEETECHO_SESSION_RECORDING_URL", "")
+        url = None
+        name = self.meetecho_recording_name
+        if name is None or name.strip() == "":
+            name = self._session_recording_url_label()
+        if url_formatter.strip() != "" and name is not None:
+            url = url_formatter.format(session_label=name)
+        return url
+
+
 class SchedulingEvent(models.Model):
     session = ForeignKey(Session)
-    time = models.DateTimeField(default=datetime.datetime.now, help_text="When the event happened")
+    time = models.DateTimeField(default=timezone.now, help_text="When the event happened")
     status = ForeignKey(SessionStatusName)
     by = ForeignKey(Person)
 
@@ -1322,7 +1401,7 @@ class SlideSubmission(models.Model):
     apply_to_all = models.BooleanField(default=False)
     submitter = ForeignKey(Person)
     status      = ForeignKey(SlideSubmissionStatusName, null=True, default='pending', on_delete=models.SET_NULL)
-    doc         = ForeignKey(Document, null=True, on_delete=models.SET_NULL)
+    doc         = ForeignKey(Document, blank=True, null=True, on_delete=models.SET_NULL)
 
     def staged_filepath(self):
         return os.path.join(settings.SLIDE_STAGING_PATH , self.filename)
@@ -1373,8 +1452,12 @@ class MeetingHost(models.Model):
     """Meeting sponsor"""
     meeting = ForeignKey(Meeting, related_name='meetinghosts')
     name = models.CharField(max_length=255, blank=False)
+    # TODO-BLOBSTORE - capture these logos and look for other ImageField like model fields.
     logo = MissingOkImageField(
-        storage=NoLocationMigrationFileSystemStorage(location=settings.MEETINGHOST_LOGO_PATH),
+        storage=BlobShadowFileSystemStorage(
+            kind="meetinghostlogo",
+            location=settings.MEETINGHOST_LOGO_PATH,
+        ),
         upload_to=_host_upload_path,
         width_field='logo_width',
         height_field='logo_height',
@@ -1389,7 +1472,7 @@ class MeetingHost(models.Model):
                 validate_file_extension,
                 settings.MEETING_VALID_UPLOAD_EXTENSIONS['meetinghostlogo'],
             ),
-            WrappedValidator(
+   WrappedValidator(
                 validate_mime_type,
                 settings.MEETING_VALID_UPLOAD_MIME_TYPES['meetinghostlogo'],
                 True,
@@ -1408,9 +1491,56 @@ class Meta:
 class Attended(models.Model):
     person = ForeignKey(Person)
     session = ForeignKey(Session)
+    time = models.DateTimeField(default=timezone.now, null=True, blank=True)
+    origin = models.CharField(max_length=32, default='datatracker')
 
     class Meta:
         unique_together = (('person', 'session'),)
 
     def __str__(self):
         return f'{self.person} at {self.session}'
+
+
+class RegistrationManager(models.Manager):
+    def onsite(self):
+        return self.get_queryset().filter(tickets__attendance_type__slug='onsite')
+
+    def remote(self):
+        return self.get_queryset().filter(tickets__attendance_type__slug='remote').exclude(tickets__attendance_type__slug='onsite')
+
+class Registration(models.Model):
+    """Registration attendee records from the IETF registration system"""
+    meeting = ForeignKey(Meeting)
+    first_name = models.CharField(max_length=255)
+    last_name = models.CharField(max_length=255)
+    affiliation = models.CharField(blank=True, max_length=255)
+    country_code = models.CharField(max_length=2)        # ISO 3166
+    person = ForeignKey(Person, blank=True, null=True, on_delete=models.PROTECT)
+    email = models.EmailField(blank=True, null=True)
+    # attended was used prior to the introduction of the ietf.meeting.Attended model and is still used by
+    # Meeting.get_attendance() for older meetings. It should not be used except for dealing with legacy data.
+    attended = models.BooleanField(default=False)
+    # checkedin indicates that the badge was picked up
+    checkedin = models.BooleanField(default=False)
+
+    # custom manager
+    objects = RegistrationManager()
+
+    def __str__(self):
+        return "{} {}".format(self.first_name, self.last_name)
+
+    @property
+    def attendance_type(self):
+        if self.tickets.filter(attendance_type__slug='onsite').exists():
+            return 'onsite'
+        elif self.tickets.filter(attendance_type__slug='remote').exists():
+            return 'remote'
+        return None
+
+class RegistrationTicket(models.Model):
+    registration = ForeignKey(Registration, related_name='tickets')
+    attendance_type = ForeignKey(AttendanceTypeName, on_delete=models.PROTECT)
+    ticket_type = ForeignKey(RegistrationTicketTypeName, on_delete=models.PROTECT)
+
+    def __str__(self):
+        return "{}:{}".format(self.attendance_type, self.ticket_type)
diff --git a/ietf/meeting/resources.py b/ietf/meeting/resources.py
index dc273c04cf..490b75f925 100644
--- a/ietf/meeting/resources.py
+++ b/ietf/meeting/resources.py
@@ -11,12 +11,23 @@
 
 from ietf import api
 
-from ietf.meeting.models import ( Meeting, ResourceAssociation, Constraint, Room, Schedule, Session,
-                                TimeSlot, SchedTimeSessAssignment, SessionPresentation, FloorPlan,
-                                UrlResource, ImportantDate, SlideSubmission, SchedulingEvent,
-                                BusinessConstraint, ProceedingsMaterial, MeetingHost, Attended)
+from ietf.meeting.models import (Meeting, ResourceAssociation, Constraint, Room,
+                                 Schedule, Session,
+                                 TimeSlot, SchedTimeSessAssignment, SessionPresentation,
+                                 FloorPlan,
+                                 UrlResource, ImportantDate, SlideSubmission,
+                                 SchedulingEvent,
+                                 BusinessConstraint, ProceedingsMaterial, MeetingHost,
+                                 Attended,
+                                 Registration, RegistrationTicket)
+
+from ietf.name.resources import (
+    AttendanceTypeNameResource,
+    MeetingTypeNameResource,
+    RegistrationTicketTypeNameResource,
+)
+
 
-from ietf.name.resources import MeetingTypeNameResource
 class MeetingResource(ModelResource):
     type             = ToOneField(MeetingTypeNameResource, 'type')
     schedule         = ToOneField('ietf.meeting.resources.ScheduleResource', 'schedule', null=True)
@@ -269,7 +280,6 @@ class Meta:
         filtering = { 
             "id": ALL,
             "modified": ALL,
-            "notes": ALL,
             "badness": ALL,
             "pinned": ALL,
             "timeslot": ALL_WITH_RELATIONS,
@@ -432,3 +442,52 @@ class Meta:
             "session": ALL_WITH_RELATIONS,
         }
 api.meeting.register(AttendedResource())
+
+from ietf.person.resources import PersonResource
+class RegistrationResource(ModelResource):
+    meeting          = ToOneField(MeetingResource, 'meeting')
+    person           = ToOneField(PersonResource, 'person', null=True)
+    tickets          = ToManyField(
+        'ietf.meeting.resources.RegistrationTicketResource',
+        'tickets',
+        full=True,
+    )
+    
+    class Meta:
+        queryset = Registration.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'registration'
+        ordering = ['id', ]
+        filtering = { 
+            "id": ALL,
+            "first_name": ALL,
+            "last_name": ALL,
+            "affiliation": ALL,
+            "country_code": ALL,
+            "email": ALL,
+            "attended": ALL,
+            "checkedin": ALL,
+            "meeting": ALL_WITH_RELATIONS,
+            "person": ALL_WITH_RELATIONS,
+            "tickets": ALL_WITH_RELATIONS,
+        }
+api.meeting.register(RegistrationResource())
+
+class RegistrationTicketResource(ModelResource):
+    registration          = ToOneField(RegistrationResource, 'registration')
+    attendance_type       = ToOneField(AttendanceTypeNameResource, 'attendance_type')
+    ticket_type           = ToOneField(RegistrationTicketTypeNameResource, 'ticket_type')
+    class Meta:
+        queryset = RegistrationTicket.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'registrationticket'
+        ordering = ['id', ]
+        filtering = { 
+            "id": ALL,
+            "ticket_type": ALL_WITH_RELATIONS,
+            "attendance_type": ALL_WITH_RELATIONS,
+            "registration": ALL_WITH_RELATIONS,
+        }
+api.meeting.register(RegistrationTicketResource())
diff --git a/ietf/meeting/tasks.py b/ietf/meeting/tasks.py
new file mode 100644
index 0000000000..a73763560b
--- /dev/null
+++ b/ietf/meeting/tasks.py
@@ -0,0 +1,248 @@
+# Copyright The IETF Trust 2024-2026, All Rights Reserved
+#
+# Celery task definitions
+#
+import datetime
+
+from itertools import batched
+
+from celery import shared_task, chain
+from django.db.models import IntegerField
+from django.db.models.functions import Cast
+from django.utils import timezone
+
+from ietf.utils import log
+from .models import Meeting
+from .utils import (
+    generate_proceedings_content,
+    resolve_materials_for_one_meeting,
+    store_blobs_for_one_meeting,
+)
+from .views import generate_agenda_data
+from .utils import fetch_attendance_from_meetings
+
+
+@shared_task
+def agenda_data_refresh_task(num=None):
+    """Refresh agenda data for one plenary meeting
+
+    If `num` is `None`, refreshes data for the current meeting.
+    """
+    log.log(
+        f"Refreshing agenda data for {f"IETF-{num}" if num else "current IETF meeting"}"
+    )
+    try:
+        generate_agenda_data(num, force_refresh=True)
+    except Exception as err:
+        # Log and swallow exceptions so failure on one meeting won't break a chain of
+        # tasks. This is used by agenda_data_refresh_all_task().
+        log.log(f"ERROR: Refreshing agenda data failed for num={num}: {err}")
+
+
+@shared_task
+def agenda_data_refresh():
+    """Deprecated. Use agenda_data_refresh_task() instead.
+    
+    TODO remove this after switching the periodic task to the new name
+    """
+    log.log("Deprecated agenda_data_refresh task called!")
+    agenda_data_refresh_task()
+
+
+@shared_task
+def agenda_data_refresh_all_task(*, batch_size=10):
+    """Refresh agenda data for all plenary meetings
+
+    Executes as a chain of tasks, each computing up to `batch_size` meetings
+    in a single task.
+    """
+    meeting_numbers = sorted(
+        Meeting.objects.annotate(
+            number_as_int=Cast("number", output_field=IntegerField())
+        )
+        .filter(type_id="ietf", number_as_int__gt=64)
+        .values_list("number_as_int", flat=True)
+    )
+    # Batch using chained maps rather than celery.chunk so we only use one worker
+    # at a time.
+    batched_task_chain = chain(
+        *(
+            agenda_data_refresh_task.map(nums)
+            for nums in batched(meeting_numbers, batch_size)
+        )
+    )
+    batched_task_chain.delay()
+
+
+@shared_task
+def proceedings_content_refresh_task(*, all=False):
+    """Refresh meeting proceedings cache
+
+    If `all` is `False`, then refreshes the cache for meetings whose numbers modulo
+    24 equal the current hour number (0-23). Scheduling the task once per hour will
+    then result in all proceedings being recomputed daily, with no more than two per
+    hour (now) or a few per hour in the next decade. That keeps the computation time
+    to under a couple minutes on our current production system.
+
+    If `all` is True, refreshes all meetings
+    """
+    now = timezone.now()
+
+    for meeting in Meeting.objects.filter(type_id="ietf").order_by("number"):
+        if meeting.proceedings_format_version == 1:
+            continue  # skip v1 proceedings, they're stored externally
+        num = meeting.get_number()  # convert str -> int
+        if num is None:
+            log.log(
+                f"Not refreshing proceedings for meeting {meeting.number}: "
+                f"type is 'ietf' but get_number() returned None"
+            )
+        elif all or (num % 24 == now.hour):
+            log.log(f"Refreshing proceedings for meeting {meeting.number}...")
+            generate_proceedings_content(meeting, force_refresh=True)
+
+
+@shared_task
+def fetch_meeting_attendance_task():
+    # fetch most recent two meetings
+    meetings = Meeting.objects.filter(type="ietf", date__lte=timezone.now()).order_by(
+        "-date"
+    )[:2]
+    try:
+        stats = fetch_attendance_from_meetings(meetings)
+    except RuntimeError as err:
+        log.log(f"Error in fetch_meeting_attendance_task: {err}")
+    else:
+        for meeting, meeting_stats in zip(meetings, stats):
+            log.log(
+                "Fetched data for meeting {:>3}: {:4d} created, {:4d} updated, {:4d} deleted, {:4d} processed".format(
+                    meeting.number,
+                    meeting_stats["created"],
+                    meeting_stats["updated"],
+                    meeting_stats["deleted"],
+                    meeting_stats["processed"],
+                )
+            )
+
+
+def _select_meetings(
+    meetings: list[str] | None = None,
+    meetings_since: str | None = None,
+    meetings_until: str | None = None,
+):  # nyah
+    """Select meetings by number or date range"""
+    # IETF-1 = 1986-01-16
+    EARLIEST_MEETING_DATE = datetime.datetime(1986, 1, 1)
+    meetings_since_dt: datetime.datetime | None = None
+    meetings_until_dt: datetime.datetime | None = None
+
+    if meetings_since == "zero":
+        meetings_since_dt = EARLIEST_MEETING_DATE
+    elif meetings_since is not None:
+        try:
+            meetings_since_dt = datetime.datetime.fromisoformat(meetings_since)
+        except ValueError:
+            log.log(
+                "Failed to parse meetings_since='{meetings_since}' with fromisoformat"
+            )
+            raise
+
+    if meetings_until is not None:
+        try:
+            meetings_until_dt = datetime.datetime.fromisoformat(meetings_until)
+        except ValueError:
+            log.log(
+                "Failed to parse meetings_until='{meetings_until}' with fromisoformat"
+            )
+            raise
+        if meetings_since_dt is None:
+            # if we only got meetings_until, start from the first meeting
+            meetings_since_dt = EARLIEST_MEETING_DATE
+
+    if meetings is None:
+        if meetings_since_dt is None:
+            log.log("No meetings requested, doing nothing.")
+            return Meeting.objects.none()
+        meetings_qs = Meeting.objects.filter(date__gte=meetings_since_dt)
+        if meetings_until_dt is not None:
+            meetings_qs = meetings_qs.filter(date__lte=meetings_until_dt)
+            log.log(
+                "Selecting meetings between "
+                f"{meetings_since_dt} and {meetings_until_dt}"
+            )
+        else:
+            log.log(f"Selecting meetings since {meetings_since_dt}")
+    else:
+        if meetings_since_dt is not None:
+            log.log(
+                "Ignoring meetings_since and meetings_until "
+                "because specific meetings were requested."
+            )
+        meetings_qs = Meeting.objects.filter(number__in=meetings)
+    return meetings_qs
+
+
+@shared_task
+def resolve_meeting_materials_task(
+    *,  # only allow kw arguments
+    meetings: list[str] | None = None,
+    meetings_since: str | None = None,
+    meetings_until: str | None = None,
+):
+    """Run materials resolver on meetings
+
+    Can request a set of meetings by number by passing a list in the meetings arg, or
+    by range by passing an iso-format timestamps in meetings_since / meetings_until.
+    To select all meetings, set meetings_since="zero" and omit other parameters.
+    """
+    meetings_qs = _select_meetings(meetings, meetings_since, meetings_until)
+    for meeting in meetings_qs.order_by("date"):
+        log.log(
+            f"Resolving materials for {meeting.type_id} "
+            f"meeting {meeting.number} ({meeting.date})..."
+        )
+        mark = timezone.now()
+        try:
+            resolve_materials_for_one_meeting(meeting)
+        except Exception as err:
+            log.log(
+                "Exception raised while resolving materials for "
+                f"meeting {meeting.number}: {err}"
+            )
+        else:
+            log.log(
+                f"Resolved in {(timezone.now() - mark).total_seconds():0.3f} seconds."
+            )
+
+
+@shared_task
+def store_meeting_materials_as_blobs_task(
+    *,  # only allow kw arguments
+    meetings: list[str] | None = None,
+    meetings_since: str | None = None,
+    meetings_until: str | None = None,
+):
+    """Push meeting materials into the blob store
+
+    Can request a set of meetings by number by passing a list in the meetings arg, or
+    by range by passing an iso-format timestamps in meetings_since / meetings_until.
+    To select all meetings, set meetings_since="zero" and omit other parameters.
+    """
+    meetings_qs = _select_meetings(meetings, meetings_since, meetings_until)
+    for meeting in meetings_qs.order_by("date"):
+        log.log(
+            f"Creating blobs for materials for {meeting.type_id} "
+            f"meeting {meeting.number} ({meeting.date})..."
+        )
+        mark = timezone.now()
+        try:
+            store_blobs_for_one_meeting(meeting)
+        except Exception as err:
+            log.log(
+                "Exception raised while creating blobs for "
+                f"meeting {meeting.number}: {err}"
+            )
+        else:
+            log.log(
+                f"Blobs created in {(timezone.now() - mark).total_seconds():0.3f} seconds."
+            )
diff --git a/ietf/meeting/templatetags/agenda_custom_tags.py b/ietf/meeting/templatetags/agenda_custom_tags.py
index 9a75b897c9..962cc5a34d 100644
--- a/ietf/meeting/templatetags/agenda_custom_tags.py
+++ b/ietf/meeting/templatetags/agenda_custom_tags.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
+# Copyright The IETF Trust 2013-2022, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -72,9 +72,10 @@ def webcal_url(context, viewname, *args, **kwargs):
 @register.simple_tag
 def assignment_display_name(assignment):
     """Get name for an assignment"""
-    if assignment.session.type.slug == 'regular' and getattr(assignment.session, 'historic_group', None):
-        return assignment.session.historic_group.name
-    return assignment.session.name or assignment.timeslot.name
+    if assignment.session.type.slug == 'regular':
+        return assignment.session.group_at_the_time().name
+    else:
+        return assignment.session.name or assignment.timeslot.name
 
 
 class AnchorNode(template.Node):
@@ -149,4 +150,4 @@ def location_anchor(parser, token):
         raise template.TemplateSyntaxError('location_anchor requires a single argument')
     nodelist = parser.parse(('end_location_anchor',))
     parser.delete_first_token()  # delete the end tag
-    return LocationAnchorNode(ts_var, nodelist)
\ No newline at end of file
+    return LocationAnchorNode(ts_var, nodelist)
diff --git a/ietf/meeting/templatetags/ams_filters.py b/ietf/meeting/templatetags/ams_filters.py
new file mode 100644
index 0000000000..a8175a81d6
--- /dev/null
+++ b/ietf/meeting/templatetags/ams_filters.py
@@ -0,0 +1,67 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django import template
+from ietf.person.models import Person
+
+
+register = template.Library()
+
+@register.filter
+def abbr_status(value):
+    """
+    Converts RFC Status to a short abbreviation
+    """
+    d = {'Proposed Standard':'PS',
+         'Draft Standard':'DS',
+         'Standard':'S',
+         'Historic':'H',
+         'Informational':'I',
+         'Experimental':'E',
+         'Best Current Practice':'BCP',
+         'Internet Standard':'IS'}
+
+    return d.get(value,value)
+
+@register.filter(name='display_duration')
+def display_duration(value):
+    """
+    Maps a session requested duration from select index to 
+    label."""
+    if value in (None, ''):
+        return 'unspecified'
+    value = int(value)
+    map = {0: 'None',
+           1800: '30 Minutes',
+           3600: '1 Hour',
+           5400: '1.5 Hours',
+           7200: '2 Hours',
+           9000: '2.5 Hours',
+           10800: '3 Hours',
+           12600: '3.5 Hours',
+           14400: '4 Hours'}
+    if value in map:
+        return map[value]
+    else:
+        return "%d Hours %d Minutes %d Seconds"%(value//3600,(value%3600)//60,value%60)
+
+@register.filter
+def is_ppt(value):
+    '''
+    Checks if the value ends in ppt or pptx
+    '''
+    if value.endswith('ppt') or value.endswith('pptx'):
+        return True
+    else:
+        return False
+        
+@register.filter
+def smart_login(user):
+    '''
+    Expects a Person object.  If person is a Secretariat returns "on behalf of the"
+    '''
+    if not isinstance (user, Person):
+        return user
+    if user.role_set.filter(name='secr',group__acronym='secretariat'):
+        return '%s, on behalf of the' % user
+    else:
+        return '%s, a chair of the' % user
diff --git a/ietf/meeting/templatetags/meetings_filters.py b/ietf/meeting/templatetags/meetings_filters.py
new file mode 100644
index 0000000000..3fa209daa2
--- /dev/null
+++ b/ietf/meeting/templatetags/meetings_filters.py
@@ -0,0 +1,21 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from django import template
+from ietf.meeting.helpers import can_request_interim_meeting
+
+import debug                            # pyflakes:ignore
+
+register = template.Library()
+
+@register.filter
+def can_request_interim(user):
+    """Determine whether the user can request an interim meeting
+
+    Usage: can_request_interim
+        Returns Boolean. True means user can request an interim meeting.
+    """
+
+    if not user:
+        return False
+    return can_request_interim_meeting(user)
diff --git a/ietf/meeting/templatetags/proceedings_filters.py b/ietf/meeting/templatetags/proceedings_filters.py
index f5fe0e1f14..a2a4932e7c 100644
--- a/ietf/meeting/templatetags/proceedings_filters.py
+++ b/ietf/meeting/templatetags/proceedings_filters.py
@@ -11,7 +11,7 @@ def hack_recording_title(recording,add_timestamp=False):
    if recording.title.startswith('Audio recording for') or recording.title.startswith('Video recording for'):
        hacked_title = recording.title[:15]
        if add_timestamp:
-           hacked_title += ' '+recording.sessionpresentation_set.first().session.official_timeslotassignment().timeslot.time.strftime("%a %H:%M")
+           hacked_title += ' '+recording.presentations.first().session.official_timeslotassignment().timeslot.time.strftime("%a %H:%M")
        return hacked_title
    else:
        return recording.title
diff --git a/ietf/meeting/templatetags/session_filters.py b/ietf/meeting/templatetags/session_filters.py
index 2a3da70283..3846dab49e 100644
--- a/ietf/meeting/templatetags/session_filters.py
+++ b/ietf/meeting/templatetags/session_filters.py
@@ -1,17 +1,56 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
 from django import template
 
+from ietf.name.models import SessionStatusName
+
 register = template.Library()
 
+
 @register.filter
-def presented_versions(session,doc):
-   sp = session.sessionpresentation_set.filter(document=doc)
-   if not sp:
-       return "Document not in session"
-   else:
-      rev = sp.first().rev
-      return rev if rev else "(current)"
+def presented_versions(session, doc):
+    sp = session.presentations.filter(document=doc)
+    if not sp:
+        return "Document not in session"
+    else:
+        rev = sp.first().rev
+        return rev if rev else "(current)"
+
 
 @register.filter
-def can_manage_materials(session,user):
+def can_manage_materials(session, user):
     return session.can_manage_materials(user)
 
+
+@register.filter
+def describe_with_tz(session):
+    # Very similar to session.__str__, but doesn't treat interims differently from sessions at an IETF meeting
+    # and displays the timeslot in the meeting's timezone.
+
+    if session is None:
+        return ""
+
+    status_id = None
+    if hasattr(session, "current_status"):
+        status_id = session.current_status
+    elif session.pk is not None:
+        latest_event = session.schedulingevent_set.order_by("-time", "-id").first()
+        if latest_event:
+            status_id = latest_event.status_id
+
+    if status_id in ("canceled", "disappr", "notmeet", "deleted"):
+        ss0name = "(%s)" % SessionStatusName.objects.get(slug=status_id).name
+    else:
+        ss0name = "(unscheduled)"
+        ss = session.timeslotassignments.filter(
+            schedule__in=[
+                session.meeting.schedule,
+                session.meeting.schedule.base if session.meeting.schedule else None,
+            ]
+        ).order_by("timeslot__time")
+        if ss:
+            ss0name = ",".join(
+                x.timeslot.time.astimezone(session.meeting.tz()).strftime("%a-%H%M")
+                for x in ss
+            )
+            ss0name += f" {session.meeting.tz()}"
+    return f"{session.meeting}: {session.group.acronym} {session.name} {ss0name}"
diff --git a/ietf/meeting/test_data.py b/ietf/meeting/test_data.py
index e5fdd71c57..8be55b47a2 100644
--- a/ietf/meeting/test_data.py
+++ b/ietf/meeting/test_data.py
@@ -20,11 +20,15 @@
 from ietf.person.factories import PersonFactory
 from ietf.person.models import Person
 from ietf.utils.test_data import make_test_data
+from ietf.utils.timezone import date_today
 
-def make_interim_meeting(group,date,status='sched'):
+
+def make_interim_meeting(group,date,status='sched',tz='UTC'):
     system_person = Person.objects.get(name="(System)")
-    time = datetime.datetime.combine(date, datetime.time(9))
-    meeting = create_interim_meeting(group=group,date=date)
+    meeting = create_interim_meeting(group=group,date=date,timezone=tz)
+    time = meeting.tz().localize(
+        datetime.datetime.combine(date, datetime.time(9))
+    )
     session = SessionFactory(meeting=meeting, group=group,
                              attendees=10,
                              requested_duration=datetime.timedelta(minutes=20),
@@ -47,7 +51,7 @@ def make_interim_meeting(group,date,status='sched'):
     doc = DocumentFactory.create(name=name, type_id='agenda', title="Agenda",
         uploaded_filename=file, group=group, rev=rev, states=[('draft','active')])
     pres = SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
-    session.sessionpresentation_set.add(pres)
+    session.presentations.add(pres)
     # minutes
     name = "minutes-%s-%s" % (meeting.number, time.strftime("%Y%m%d%H%M"))
     rev = '00'
@@ -55,7 +59,7 @@ def make_interim_meeting(group,date,status='sched'):
     doc = DocumentFactory.create(name=name, type_id='minutes', title="Minutes",
         uploaded_filename=file, group=group, rev=rev, states=[('draft','active')])
     pres = SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
-    session.sessionpresentation_set.add(pres)
+    session.presentations.add(pres)
     # slides
     title = "Slideshow"
 
@@ -66,7 +70,7 @@ def make_interim_meeting(group,date,status='sched'):
         uploaded_filename=file, group=group, rev=rev,
         states=[('slides','active'), ('reuse_policy', 'single')])
     pres = SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
-    session.sessionpresentation_set.add(pres)
+    session.presentations.add(pres)
     #
     return meeting
 
@@ -102,24 +106,37 @@ def make_meeting_test_data(meeting=None, create_interims=False):
 
     # slots
     session_date = meeting.date + datetime.timedelta(days=1)
+    tz = meeting.tz()
     slot1 = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
                                     duration=datetime.timedelta(minutes=60),
-                                    time=datetime.datetime.combine(session_date, datetime.time(9, 30)))
+                                    time=tz.localize(
+                                        datetime.datetime.combine(session_date, datetime.time(9, 30))
+                                    ))
     slot2 = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
                                     duration=datetime.timedelta(minutes=60),
-                                    time=datetime.datetime.combine(session_date, datetime.time(10, 50)))
+                                    time=tz.localize(
+                                        datetime.datetime.combine(session_date, datetime.time(10, 50))
+                                    ))
     breakfast_slot = TimeSlot.objects.create(meeting=meeting, type_id="lead", location=breakfast_room,
                                     duration=datetime.timedelta(minutes=90),
-                                    time=datetime.datetime.combine(session_date, datetime.time(7,0)))
+                                    time=tz.localize(
+                                        datetime.datetime.combine(session_date, datetime.time(7,0))
+                                    ))
     reg_slot = TimeSlot.objects.create(meeting=meeting, type_id="reg", location=reg_room,
                                        duration=datetime.timedelta(minutes=480),
-                                       time=datetime.datetime.combine(session_date, datetime.time(9,0)))
+                                       time=tz.localize(
+                                           datetime.datetime.combine(session_date, datetime.time(9,0))
+                                       ))
     break_slot = TimeSlot.objects.create(meeting=meeting, type_id="break", location=break_room,
                                          duration=datetime.timedelta(minutes=90),
-                                         time=datetime.datetime.combine(session_date, datetime.time(7,0)))
+                                         time=tz.localize(
+                                             datetime.datetime.combine(session_date, datetime.time(7,0))
+                                         ))
     plenary_slot = TimeSlot.objects.create(meeting=meeting, type_id="plenary", location=room,
                                          duration=datetime.timedelta(minutes=60),
-                                         time=datetime.datetime.combine(session_date, datetime.time(11,0)))
+                                         time=tz.localize(
+                                             datetime.datetime.combine(session_date, datetime.time(11,0))
+                                         ))
     # mars WG
     mars = Group.objects.get(acronym='mars')
     mars_session = SessionFactory(meeting=meeting, group=mars,
@@ -181,28 +198,28 @@ def make_meeting_test_data(meeting=None, create_interims=False):
     doc = DocumentFactory.create(name='agenda-72-mars', type_id='agenda', title="Agenda",
         uploaded_filename="agenda-72-mars.txt", group=mars, rev='00', states=[('agenda','active')])
     pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
-    mars_session.sessionpresentation_set.add(pres) # 
+    mars_session.presentations.add(pres) # 
 
     doc = DocumentFactory.create(name='minutes-72-mars', type_id='minutes', title="Minutes",
         uploaded_filename="minutes-72-mars.md", group=mars, rev='00', states=[('minutes','active')])
     pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
-    mars_session.sessionpresentation_set.add(pres)
+    mars_session.presentations.add(pres)
 
     doc = DocumentFactory.create(name='slides-72-mars-1-active', type_id='slides', title="Slideshow",
         uploaded_filename="slides-72-mars.txt", group=mars, rev='00',
         states=[('slides','active'), ('reuse_policy', 'single')])
     pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
-    mars_session.sessionpresentation_set.add(pres)
+    mars_session.presentations.add(pres)
 
     doc = DocumentFactory.create(name='slides-72-mars-2-deleted', type_id='slides',
         title="Bad Slideshow", uploaded_filename="slides-72-mars-2-deleted.txt", group=mars, rev='00',
         states=[('slides','deleted'), ('reuse_policy', 'single')])
     pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
-    mars_session.sessionpresentation_set.add(pres)
+    mars_session.presentations.add(pres)
     
     # Future Interim Meetings
-    date = datetime.date.today() + datetime.timedelta(days=365)
-    date2 = datetime.date.today() + datetime.timedelta(days=1000)
+    date = date_today() + datetime.timedelta(days=365)
+    date2 = date_today() + datetime.timedelta(days=1000)
     ames = Group.objects.get(acronym="ames")
 
     if create_interims:
@@ -213,9 +230,9 @@ def make_meeting_test_data(meeting=None, create_interims=False):
 
     return meeting
 
-def make_interim_test_data():
-    date = datetime.date.today() + datetime.timedelta(days=365)
-    date2 = datetime.date.today() + datetime.timedelta(days=1000)
+def make_interim_test_data(meeting_tz='UTC'):
+    date = date_today() + datetime.timedelta(days=365)
+    date2 = date_today() + datetime.timedelta(days=1000)
     PersonFactory(user__username='plain')
     area = GroupFactory(type_id='area')
     ad = Person.objects.get(user__username='ad')
@@ -225,10 +242,10 @@ def make_interim_test_data():
     RoleFactory(group=mars,person__user__username='marschairman',name_id='chair')
     RoleFactory(group=ames,person__user__username='ameschairman',name_id='chair')
 
-    make_interim_meeting(group=mars,date=date,status='sched')
-    make_interim_meeting(group=mars,date=date2,status='apprw')
-    make_interim_meeting(group=ames,date=date,status='canceled')
-    make_interim_meeting(group=ames,date=date2,status='apprw')
+    make_interim_meeting(group=mars,date=date,status='sched',tz=meeting_tz)
+    make_interim_meeting(group=mars,date=date2,status='apprw',tz=meeting_tz)
+    make_interim_meeting(group=ames,date=date,status='canceled',tz=meeting_tz)
+    make_interim_meeting(group=ames,date=date2,status='apprw',tz=meeting_tz)
 
     return
 
diff --git a/ietf/meeting/tests_forms.py b/ietf/meeting/tests_forms.py
index 4a06d77867..61d0a1d2c8 100644
--- a/ietf/meeting/tests_forms.py
+++ b/ietf/meeting/tests_forms.py
@@ -6,6 +6,7 @@
 from django.test import override_settings, RequestFactory
 
 from ietf.group.factories import GroupFactory
+from ietf.meeting.factories import SessionFactory
 from ietf.meeting.forms import (FileUploadForm, ApplyToAllFileUploadForm, InterimSessionModelForm,
                                 InterimMeetingModelForm)
 from ietf.person.factories import PersonFactory
@@ -123,6 +124,15 @@ def test_remote_participation_options(self):
         self.assertNotIn('meetecho', choice_vals)
         self.assertIn('manual', choice_vals)
 
+    def test_edits_in_meeting_time_zone(self):
+        # use a time zone that never has a UTC offset of 0, even with DST
+        session = SessionFactory(meeting__type_id='interim', meeting__time_zone='America/Halifax')
+        form = InterimSessionModelForm(instance=session)
+        self.assertEqual(
+            form.initial['time'].strftime('%H:%M'),
+            session.official_timeslotassignment().timeslot.local_start_time().strftime('%H:%M'),
+        )
+
 
 class InterimMeetingModelFormTests(TestCase):
     def test_enforces_authroles(self):
diff --git a/ietf/meeting/tests_helpers.py b/ietf/meeting/tests_helpers.py
index 3160f93881..b118b9f041 100644
--- a/ietf/meeting/tests_helpers.py
+++ b/ietf/meeting/tests_helpers.py
@@ -1,14 +1,16 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
+# Copyright The IETF Trust 2020-2022, All Rights Reserved
 # -*- coding: utf-8 -*-
 import datetime
 
+import debug    # pyflakes:ignore
+
 from unittest.mock import patch, Mock
 
 from django.conf import settings
 from django.contrib.messages.storage.fallback import FallbackStorage
 from django.test import override_settings, RequestFactory
 
-from ietf.group.factories import GroupFactory
+from ietf.group.factories import GroupFactory, GroupHistoryFactory
 from ietf.group.models import Group
 from ietf.meeting.factories import SessionFactory, MeetingFactory, TimeSlotFactory
 from ietf.meeting.helpers import (AgendaFilterOrganizer, AgendaKeywordTagger,
@@ -18,6 +20,7 @@
 from ietf.meeting.test_data import make_meeting_test_data
 from ietf.utils.meetecho import Conference
 from ietf.utils.test_utils import TestCase
+from ietf.utils.timezone import date_today
 
 
 # override the legacy office hours setting to guarantee consistency with the tests
@@ -27,7 +30,8 @@ def do_test_tag_assignments_with_filter_keywords(self, meeting_num, bof=False, h
         """Assignments should be tagged properly
         
         The historic param can be None, group, or parent, to specify whether to test
-        with no historic_group, a historic_group but no historic_parent, or both.
+        with no GroupHistory active at the time of the Session's meeting, 
+        with such a GroupHistory active, no GroupHistory for the parent, or both.
         """
         # decide whether meeting should use legacy keywords (for office hours)
         legacy_keywords = meeting_num <= 111
@@ -37,14 +41,19 @@ def do_test_tag_assignments_with_filter_keywords(self, meeting_num, bof=False, h
         group_state_id = 'bof' if bof else 'active'
         group = GroupFactory(state_id=group_state_id)
 
+
         # Set up the historic group and parent if needed. Keep track of these as expected_*
         # for later reference. If not using historic group or parent, fall back to the non-historic
         # groups.
+
         if historic:
-            expected_group = GroupFactory(state_id=group_state_id)
+            history_time = meeting.tz().localize(
+                datetime.datetime.combine(meeting.date, datetime.time())
+                - datetime.timedelta(days=1)
+            )
+            expected_group = GroupHistoryFactory(group=group, time=history_time)
             if historic == 'parent':
-                expected_area = GroupFactory(type_id='area')
-                expected_group.historic_parent = expected_area
+                expected_area = GroupHistoryFactory(group=group.parent,time=history_time)  
             else:
                 expected_area = expected_group.parent
         else:
@@ -111,11 +120,6 @@ def do_test_tag_assignments_with_filter_keywords(self, meeting_num, bof=False, h
 
         assignments = meeting.schedule.assignments.all()
 
-        # Set up historic groups if needed.
-        if historic:
-            for a in assignments:
-                a.session.historic_group = expected_group
-
         # Execute the method under test
         AgendaKeywordTagger(assignments=assignments).apply()
 
@@ -483,7 +487,7 @@ def test_create_interim_session_conferences(self, mock):
         mock.reset_mock()
         mock_conf_mgr.create.return_value = [
             Conference(
-                manager=mock_conf_mgr, id=1, public_id='some-uuid', description='desc',
+                manager=mock_conf_mgr, id=int(sessions[0].pk), public_id='some-uuid', description='desc',
                 start_time=timeslots[0].utc_start_time(), duration=timeslots[0].duration, url='fake-meetecho-url',
                 deletion_token='please-delete-me',
             ),
@@ -494,6 +498,7 @@ def test_create_interim_session_conferences(self, mock):
             mock_conf_mgr.create.call_args[1],
             {
                 'group': sessions[0].group,
+                'session_id': sessions[0].id,
                 'description': str(sessions[0]),
                 'start_time': timeslots[0].utc_start_time(),
                 'duration': timeslots[0].duration,
@@ -508,12 +513,12 @@ def test_create_interim_session_conferences(self, mock):
         mock.reset_mock()
         mock_conf_mgr.create.side_effect = [
             [Conference(
-                manager=mock_conf_mgr, id=1, public_id='some-uuid', description='desc',
+                manager=mock_conf_mgr, id=int(sessions[0].pk), public_id='some-uuid', description='desc',
                 start_time=timeslots[0].utc_start_time(), duration=timeslots[0].duration, url='different-fake-meetecho-url',
                 deletion_token='please-delete-me',
             )],
             [Conference(
-                manager=mock_conf_mgr, id=2, public_id='another-uuid', description='desc',
+                manager=mock_conf_mgr, id=int(sessions[1].pk), public_id='another-uuid', description='desc',
                 start_time=timeslots[1].utc_start_time(), duration=timeslots[1].duration, url='another-fake-meetecho-url',
                 deletion_token='please-delete-me-too',
             )],
@@ -524,16 +529,18 @@ def test_create_interim_session_conferences(self, mock):
             mock_conf_mgr.create.call_args_list,
             [
                 ({
-                    'group': sessions[0].group,
-                    'description': str(sessions[0]),
-                    'start_time': timeslots[0].utc_start_time(),
-                    'duration': timeslots[0].duration,
+                     'group': sessions[0].group,
+                     'session_id': sessions[0].id,
+                     'description': str(sessions[0]),
+                     'start_time': timeslots[0].utc_start_time(),
+                     'duration': timeslots[0].duration,
                  },),
                 ({
-                    'group': sessions[1].group,
-                    'description': str(sessions[1]),
-                    'start_time': timeslots[1].utc_start_time(),
-                    'duration': timeslots[1].duration,
+                     'group': sessions[1].group,
+                     'session_id': sessions[1].id,
+                     'description': str(sessions[1]),
+                     'start_time': timeslots[1].utc_start_time(),
+                     'duration': timeslots[1].duration,
                  },),
             ]
         )
@@ -586,26 +593,26 @@ def test_sessions_post_save_creates_meetecho_conferences(self, mock_create_metho
         mock_form.changed_data = []
         mock_form.requires_approval = True
 
-        mock_form.cleaned_data = {'remote_participation': None}
+        mock_form.cleaned_data = {'date': date_today(), 'time': datetime.time(1, 23), 'remote_participation': None}
         sessions_post_save(RequestFactory().post('/some/url'), [mock_form])
         self.assertTrue(mock_create_method.called)
         self.assertCountEqual(mock_create_method.call_args[0][0], [])
 
         mock_create_method.reset_mock()
-        mock_form.cleaned_data = {'remote_participation': 'manual'}
+        mock_form.cleaned_data['remote_participation'] = 'manual'
         sessions_post_save(RequestFactory().post('/some/url'), [mock_form])
         self.assertTrue(mock_create_method.called)
         self.assertCountEqual(mock_create_method.call_args[0][0], [])
 
         mock_create_method.reset_mock()
-        mock_form.cleaned_data = {'remote_participation': 'meetecho'}
+        mock_form.cleaned_data['remote_participation'] = 'meetecho'
         sessions_post_save(RequestFactory().post('/some/url'), [mock_form])
         self.assertTrue(mock_create_method.called)
         self.assertCountEqual(mock_create_method.call_args[0][0], [session])
 
         # Check that an exception does not percolate through sessions_post_save
         mock_create_method.side_effect = RuntimeError('some error')
-        mock_form.cleaned_data = {'remote_participation': 'meetecho'}
+        mock_form.cleaned_data['remote_participation'] = 'meetecho'
         # create mock request with session / message storage
         request = RequestFactory().post('/some/url')
         setattr(request, 'session', 'session')
@@ -623,12 +630,13 @@ class HelperTests(TestCase):
     def test_get_ietf_meeting(self):
         """get_ietf_meeting() should only return IETF meetings"""
         # put the IETF far in the past so it's not "current"
-        ietf = MeetingFactory(type_id='ietf', date=datetime.date.today() - datetime.timedelta(days=5 * 365))
+        today = date_today()
+        ietf = MeetingFactory(type_id='ietf', date=today- datetime.timedelta(days=5 * 365))
         # put the interim meeting now so it will be picked up as "current" if there's a bug
-        interim = MeetingFactory(type_id='interim', date=datetime.date.today())
+        interim = MeetingFactory(type_id='interim', date=today)
         self.assertEqual(get_ietf_meeting(ietf.number), ietf, 'Return IETF meeting by number')
         self.assertIsNone(get_ietf_meeting(interim.number), 'Ignore non-IETF meetings')
         self.assertIsNone(get_ietf_meeting(), 'Return None if there is no current IETF meeting')
-        ietf.date = datetime.date.today()
+        ietf.date = today
         ietf.save()
         self.assertEqual(get_ietf_meeting(), ietf, 'Return current meeting if there is one')
diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py
index 2d221994a8..3269342924 100644
--- a/ietf/meeting/tests_js.py
+++ b/ietf/meeting/tests_js.py
@@ -5,13 +5,11 @@
 import time
 import datetime
 import shutil
-import os
+import tempfile
 import re
-from unittest import skipIf
 
-import django
+from django.utils import timezone
 from django.utils.text import slugify
-from django.utils.timezone import now
 from django.db.models import F
 import pytz
 
@@ -34,6 +32,7 @@
 from ietf.utils.test_utils import assert_ical_response_is_valid
 from ietf.utils.jstest import ( IetfSeleniumTestCase, ifSeleniumEnabled, selenium_enabled,
                                 presence_of_element_child_by_css_selector )
+from ietf.utils.timezone import datetime_today, datetime_from_date, date_today, timezone_not_near_midnight
 
 if selenium_enabled():
     from selenium.webdriver.common.action_chains import ActionChains
@@ -133,7 +132,7 @@ def test_edit_meeting_schedule(self):
         self.assertEqual(session_info_container.find_element(By.CSS_SELECTOR, ".other-session .time").text, "not yet scheduled")
 
         # deselect
-        self.driver.find_element(By.CSS_SELECTOR, '.drop-target').click()
+        self.driver.find_element(By.CSS_SELECTOR, '.timeslot[data-type="regular"] .drop-target').click()
 
         self.assertEqual(session_info_container.find_elements(By.CSS_SELECTOR, ".title"), [])
         self.assertNotIn('other-session-selected', s2b_element.get_attribute('class'))
@@ -192,9 +191,9 @@ def test_edit_meeting_schedule(self):
 
         # violated due to constraints - both the timeslot and its timeslot label
         self.assertTrue(self.driver.find_elements(By.CSS_SELECTOR, '#timeslot{}.would-violate-hint'.format(slot1.pk)))
-        # Find the timeslot label for slot1 - it's the first timeslot in the first room group
+        # Find the timeslot label for slot1 - it's the first timeslot in the room group containing room 1
         slot1_roomgroup_elt = self.driver.find_element(By.CSS_SELECTOR,
-            '.day-flow .day:first-child .room-group:nth-child(2)'  # count from 2 - first-child is the day label
+            f'.day-flow .day:first-child .room-group[data-rooms="{room1.pk}"]'
         )
         self.assertTrue(
             slot1_roomgroup_elt.find_elements(By.CSS_SELECTOR,
@@ -250,7 +249,9 @@ def test_edit_meeting_schedule(self):
         self.assertTrue(s1_element.is_displayed())  # should still be displayed
         self.assertIn('hidden-parent', s1_element.get_attribute('class'),
                       'Session should be hidden when parent disabled')
-        s1_element.click()  # try to select
+        
+        self.scroll_and_click((By.CSS_SELECTOR, '#session{}'.format(s1.pk)))
+
         self.assertNotIn('selected', s1_element.get_attribute('class'),
                          'Session should not be selectable when parent disabled')
 
@@ -268,23 +269,41 @@ def test_edit_meeting_schedule(self):
         # modal_open.click()
 
         self.assertTrue(self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal").is_displayed())
-        self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal [value=\"{}\"]".format("ts-group-{}-{}".format(slot2.time.strftime("%Y%m%d-%H%M"), int(slot2.duration.total_seconds() / 60)))).click()
+        self.driver.find_element(
+            By.CSS_SELECTOR,
+            "#timeslot-group-toggles-modal [value=\"{}\"]".format(
+                "ts-group-{}-{}".format(
+                    slot2.time.astimezone(slot2.tz()).strftime("%Y%m%d-%H%M"),
+                    int(slot2.duration.total_seconds() / 60),
+                ),
+            ),
+        ).click()
         self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal [data-bs-dismiss=\"modal\"]").click()
         self.assertTrue(not self.driver.find_element(By.CSS_SELECTOR, "#timeslot-group-toggles-modal").is_displayed())
 
         # swap days
-        self.driver.find_element(By.CSS_SELECTOR, ".day .swap-days[data-dayid=\"{}\"]".format(slot4.time.date().isoformat())).click()
+        self.driver.find_element(
+            By.CSS_SELECTOR,
+            ".day .swap-days[data-dayid=\"{}\"]".format(
+                slot4.time.astimezone(slot4.tz()).date().isoformat(),
+            ),
+        ).click()
         self.assertTrue(self.driver.find_element(By.CSS_SELECTOR, "#swap-days-modal").is_displayed())
-        self.driver.find_element(By.CSS_SELECTOR, "#swap-days-modal input[name=\"target_day\"][value=\"{}\"]".format(slot1.time.date().isoformat())).click()
+        self.driver.find_element(
+            By.CSS_SELECTOR,
+            "#swap-days-modal input[name=\"target_day\"][value=\"{}\"]".format(
+                slot1.time.astimezone(slot1.tz()).date().isoformat(),
+            ),
+        ).click()
         self.driver.find_element(By.CSS_SELECTOR, "#swap-days-modal button[type=\"submit\"]").click()
 
         self.assertTrue(self.driver.find_elements(By.CSS_SELECTOR, '#timeslot{} #session{}'.format(slot4.pk, s1.pk)),
                         'Session s1 should have moved to second meeting day')
 
         # swap timeslot column - put session in a differently-timed timeslot
-        self.driver.find_element(By.CSS_SELECTOR,
+        self.scroll_and_click((By.CSS_SELECTOR,
             '.day .swap-timeslot-col[data-timeslot-pk="{}"]'.format(slot1b.pk)
-        ).click()  # open modal on the second timeslot for room1
+        ))  # open modal on the second timeslot for room1
         self.assertTrue(self.driver.find_element(By.CSS_SELECTOR, "#swap-timeslot-col-modal").is_displayed())
         self.driver.find_element(By.CSS_SELECTOR,
             '#swap-timeslot-col-modal input[name="target_timeslot"][value="{}"]'.format(slot4.pk)
@@ -305,7 +324,7 @@ def test_past_flags(self):
         room = RoomFactory(meeting=meeting)
 
         # get current time in meeting time zone
-        right_now = now().astimezone(
+        right_now = timezone.now().astimezone(
             pytz.timezone(meeting.time_zone)
         )
         if not settings.USE_TZ:
@@ -392,11 +411,16 @@ def test_past_flags(self):
     def test_past_swap_days_buttons(self):
         """Swap days buttons should be hidden for past items"""
         wait = WebDriverWait(self.driver, 2)
-        meeting = MeetingFactory(type_id='ietf', date=datetime.datetime.today() - datetime.timedelta(days=3), days=7)
+        meeting = MeetingFactory(
+            type_id='ietf',
+            date=timezone.now() - datetime.timedelta(days=3),
+            days=7,
+            time_zone=timezone_not_near_midnight(),
+        )
         room = RoomFactory(meeting=meeting)
 
         # get current time in meeting time zone
-        right_now = now().astimezone(
+        right_now = timezone.now().astimezone(
             pytz.timezone(meeting.time_zone)
         )
         if not settings.USE_TZ:
@@ -427,21 +451,24 @@ def test_past_swap_days_buttons(self):
 
         past_swap_days_buttons = self.driver.find_elements(By.CSS_SELECTOR,
             ','.join(
-                '.swap-days[data-start="{}"]'.format(ts.time.date().isoformat()) for ts in past_timeslots
+                '.swap-days[data-start="{}"]'.format(ts.time.astimezone(ts.tz()).date().isoformat())
+                for ts in past_timeslots
             )
         )
         self.assertEqual(len(past_swap_days_buttons), len(past_timeslots), 'Missing past swap days buttons')
 
         future_swap_days_buttons = self.driver.find_elements(By.CSS_SELECTOR,
             ','.join(
-                '.swap-days[data-start="{}"]'.format(ts.time.date().isoformat()) for ts in future_timeslots
+                '.swap-days[data-start="{}"]'.format(ts.time.astimezone(ts.tz()).date().isoformat())
+                for ts in future_timeslots
             )
         )
         self.assertEqual(len(future_swap_days_buttons), len(future_timeslots), 'Missing future swap days buttons')
 
         now_swap_days_buttons = self.driver.find_elements(By.CSS_SELECTOR,
             ','.join(
-                '.swap-days[data-start="{}"]'.format(ts.time.date().isoformat()) for ts in now_timeslots
+                '.swap-days[data-start="{}"]'.format(ts.time.astimezone(ts.tz()).date().isoformat())
+                for ts in now_timeslots
             )
         )
         # only one "now" button because both sessions are on the same day
@@ -474,7 +501,7 @@ def test_past_swap_days_buttons(self):
         clicked_index = 1
         # scroll so the button we want to click is just below the navbar, otherwise it may
         # fall beneath the sessions panel
-        navbar = self.driver.find_element_by_class_name('navbar')
+        navbar = self.driver.find_element(By.CSS_SELECTOR, '.navbar')
         self.driver.execute_script(
             'window.scrollBy({top: %s, behavior: "instant"})' % (
                     future_swap_days_buttons[1].location['y'] - navbar.size['height']
@@ -492,7 +519,8 @@ def test_past_swap_days_buttons(self):
         self.assertFalse(
             any(radio.is_enabled()
                 for radio in modal.find_elements(By.CSS_SELECTOR, ','.join(
-                'input[name="target_day"][value="{}"]'.format(ts.time.date().isoformat()) for ts in past_timeslots)
+                'input[name="target_day"][value="{}"]'.format(ts.time.astimezone(ts.tz()).date().isoformat())
+                for ts in past_timeslots)
             )),
             'Past day is enabled in swap-days modal for official schedule',
         )
@@ -501,14 +529,16 @@ def test_past_swap_days_buttons(self):
         self.assertTrue(
             all(radio.is_enabled()
                 for radio in modal.find_elements(By.CSS_SELECTOR, ','.join(
-                'input[name="target_day"][value="{}"]'.format(ts.time.date().isoformat()) for ts in enabled_timeslots)
+                'input[name="target_day"][value="{}"]'.format(ts.time.astimezone(ts.tz()).date().isoformat())
+                for ts in enabled_timeslots)
             )),
             'Future day is not enabled in swap-days modal for official schedule',
         )
         self.assertFalse(
             any(radio.is_enabled()
                 for radio in modal.find_elements(By.CSS_SELECTOR, ','.join(
-                'input[name="target_day"][value="{}"]'.format(ts.time.date().isoformat()) for ts in now_timeslots)
+                'input[name="target_day"][value="{}"]'.format(ts.time.astimezone(ts.tz()).date().isoformat())
+                for ts in now_timeslots)
             )),
             '"Now" day is enabled in swap-days modal for official schedule',
         )
@@ -516,11 +546,11 @@ def test_past_swap_days_buttons(self):
     def test_past_swap_timeslot_col_buttons(self):
         """Swap timeslot column buttons should be hidden for past items"""
         wait = WebDriverWait(self.driver, 2)
-        meeting = MeetingFactory(type_id='ietf', date=datetime.datetime.today() - datetime.timedelta(days=3), days=7)
+        meeting = MeetingFactory(type_id='ietf', date=timezone.now() - datetime.timedelta(days=3), days=7)
         room = RoomFactory(meeting=meeting)
 
         # get current time in meeting time zone
-        right_now = now().astimezone(
+        right_now = timezone.now().astimezone(
             pytz.timezone(meeting.time_zone)
         )
         if not settings.USE_TZ:
@@ -803,10 +833,10 @@ def test_unassigned_sessions_drop_target_visible_when_empty(self):
     def test_session_constraint_hints(self):
         """Selecting a session should mark conflicting sessions
 
-        To test for recurrence of https://trac.ietf.org/trac/ietfdb/ticket/3327 need to have some constraints that
+        To test for recurrence of https://github.com/ietf-tools/datatracker/issues/3327 need to have some constraints that
         do not conflict. Testing with only violated constraints does not exercise the code adequately.
         """
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today(), populate_schedule=False)
+        meeting = MeetingFactory(type_id='ietf', date=date_today(), populate_schedule=False)
         TimeSlotFactory.create_batch(5, meeting=meeting)
         schedule = ScheduleFactory(meeting=meeting)
         sessions = SessionFactory.create_batch(5, meeting=meeting, add_to_schedule=False)
@@ -850,51 +880,15 @@ def test_session_constraint_hints(self):
         self.assertNotIn('would-violate-hint', session_elements[4].get_attribute('class'),
                          'Constraint violation should not be indicated on non-conflicting session')
 
-@ifSeleniumEnabled
-@skipIf(django.VERSION[0]==2, "Skipping test with race conditions under Django 2")
-class ScheduleEditTests(IetfSeleniumTestCase):
-    def testUnschedule(self):
-
-        meeting = make_meeting_test_data()
-        
-        self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting=meeting, session__group__acronym='mars', schedule__name='test-schedule').count(),1)
-
-
-        ss = list(SchedTimeSessAssignment.objects.filter(session__meeting__number=72,session__group__acronym='mars',schedule__name='test-schedule')) # pyflakes:ignore
-
-        self.login()
-        url = self.absreverse('ietf.meeting.views.edit_meeting_schedule',kwargs=dict(num='72',name='test-schedule',owner='plain@example.com'))
-        self.driver.get(url)
-
-        # driver.get() will wait for scripts to finish, but not ajax
-        # requests.  Wait for completion of the permissions check:
-        read_only_note = self.driver.find_element(By.ID, 'read_only')
-        WebDriverWait(self.driver, 10).until(expected_conditions.invisibility_of_element(read_only_note), "Read-only schedule")
-
-        s1 = Session.objects.filter(group__acronym='mars', meeting=meeting).first()
-        selector = "#session_{}".format(s1.pk)
-        WebDriverWait(self.driver, 30).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, selector)), "Did not find %s"%selector)
-
-        self.assertEqual(self.driver.find_elements(By.CSS_SELECTOR, "#sortable-list #session_{}".format(s1.pk)), [])
-
-        element = self.driver.find_element(By.ID, 'session_{}'.format(s1.pk))
-        target  = self.driver.find_element(By.ID, 'sortable-list')
-        ActionChains(self.driver).drag_and_drop(element,target).perform()
-
-        self.assertTrue(self.driver.find_elements(By.CSS_SELECTOR, "#sortable-list #session_{}".format(s1.pk)))
-
-        time.sleep(0.1) # The API that modifies the database runs async
-
-        self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting__number=72,session__group__acronym='mars',schedule__name='test-schedule').count(),0)
 
 @ifSeleniumEnabled
 class SlideReorderTests(IetfSeleniumTestCase):
     def setUp(self):
         super(SlideReorderTests, self).setUp()
         self.session = SessionFactory(meeting__type_id='ietf', status_id='sched')
-        self.session.sessionpresentation_set.create(document=DocumentFactory(type_id='slides',name='one'),order=1)
-        self.session.sessionpresentation_set.create(document=DocumentFactory(type_id='slides',name='two'),order=2)
-        self.session.sessionpresentation_set.create(document=DocumentFactory(type_id='slides',name='three'),order=3)
+        self.session.presentations.create(document=DocumentFactory(type_id='slides',name='one'),order=1)
+        self.session.presentations.create(document=DocumentFactory(type_id='slides',name='two'),order=2)
+        self.session.presentations.create(document=DocumentFactory(type_id='slides',name='three'),order=3)
 
     def secr_login(self):
         self.login('secretary')
@@ -914,7 +908,7 @@ def testReorderSlides(self):
         ActionChains(self.driver).drag_and_drop(second,third).perform()
 
         time.sleep(0.1) # The API that modifies the database runs async
-        names=self.session.sessionpresentation_set.values_list('document__name',flat=True) 
+        names=self.session.presentations.values_list('document__name',flat=True) 
         self.assertEqual(list(names),['one','three','two'])
 
 @ifSeleniumEnabled
@@ -928,7 +922,7 @@ def setUp(self):
 
         # Create a group with a plenary interim session for testing type filters
         somegroup = GroupFactory(acronym='sg', name='Some Group')
-        sg_interim = make_interim_meeting(somegroup, datetime.date.today() + datetime.timedelta(days=20))
+        sg_interim = make_interim_meeting(somegroup, date_today() + datetime.timedelta(days=20))
         sg_sess = sg_interim.session_set.first()
         sg_slot = sg_sess.timeslotassignments.first().timeslot
         sg_sess.purpose_id = 'plenary'
@@ -947,20 +941,15 @@ def tearDown(self):
     def tempdir(self, label):
         # Borrowed from  test_utils.TestCase
         slug = slugify(self.__class__.__name__.replace('.','-'))
-        dirname = "tmp-{label}-{slug}-dir".format(**locals())
-        if 'VIRTUAL_ENV' in os.environ:
-            dirname = os.path.join(os.environ['VIRTUAL_ENV'], dirname)
-        path = os.path.abspath(dirname)
-        if not os.path.exists(path):
-            os.mkdir(path)
-        return path
+        suffix = "-{label}-{slug}-dir".format(**locals())
+        return tempfile.mkdtemp(suffix=suffix)
 
     def displayed_interims(self, groups=None):
         sessions = add_event_info_to_session_qs(
             Session.objects.filter(
                 meeting__type_id='interim',
                 timeslotassignments__schedule=F('meeting__schedule'),
-                timeslotassignments__timeslot__time__gte=datetime.datetime.today()
+                timeslotassignments__timeslot__time__gte=timezone.now()
             )
         ).filter(current_status__in=('sched','canceled'))
         meetings = []
@@ -973,7 +962,7 @@ def displayed_interims(self, groups=None):
     def all_ietf_meetings(self):
         meetings = Meeting.objects.filter(
             type_id='ietf',
-            date__gte=datetime.datetime.today()-datetime.timedelta(days=7)
+            date__gte=timezone.now()-datetime.timedelta(days=7)
         )
         for m in meetings:
             m.calendar_label = 'IETF %s' % m.number
@@ -1046,13 +1035,14 @@ def advance_month():
                     unexpected.add(entry.text)
             advance_month()
 
-        self.assertEqual(seen, visible_meetings, "Expected calendar entries not shown.")
-        self.assertEqual(not_visible, set(), "Hidden calendar entries for expected interim meetings.")
-        self.assertEqual(unexpected, set(), "Unexpected calendar entries visible")
+        self.assertCountEqual(seen, visible_meetings, "Expected calendar entries not shown.")
+        self.assertCountEqual(not_visible, set(), "Hidden calendar entries for expected interim meetings.")
+        self.assertCountEqual(unexpected, set(), "Unexpected calendar entries visible")
 
     def do_upcoming_view_filter_test(self, querystring, visible_meetings=()):
         self.login()
         self.driver.get(self.absreverse('ietf.meeting.views.upcoming') + querystring)
+        time.sleep(0.2)  # gross, but give the filter JS time to do its thing 
         self.assert_upcoming_meeting_visibility(visible_meetings)
         self.assert_upcoming_meeting_calendar(visible_meetings)
         self.assert_upcoming_view_filter_matches_ics_filter(querystring)
@@ -1103,7 +1093,7 @@ def assert_upcoming_view_filter_matches_ics_filter(self, filter_string):
         expected_assignments = list(SchedTimeSessAssignment.objects.filter(
             schedule__in=expected_schedules,
             session__in=expected_interim_sessions,
-            timeslot__time__gte=datetime.date.today(),
+            timeslot__time__gte=datetime_today(),
         ))
         # The UID formats should match those in the upcoming.ics template
         expected_uids = [
@@ -1122,102 +1112,85 @@ def test_upcoming_view_default(self):
         ietf_meetings = set(self.all_ietf_meetings())
         self.do_upcoming_view_filter_test('', ietf_meetings.union(self.displayed_interims()))
 
+    def test_upcoming_view_show_ietf_meetings(self):
+        self.do_upcoming_view_filter_test('?show=ietf-meetings', self.all_ietf_meetings())
+
     def test_upcoming_view_filter_show_group(self):
         # Show none
-        ietf_meetings = set(self.all_ietf_meetings())
-        self.do_upcoming_view_filter_test('?show=', ietf_meetings)
+        self.do_upcoming_view_filter_test('?show=')
 
         # Show one
-        self.do_upcoming_view_filter_test('?show=mars', 
-                                          ietf_meetings.union(
-                                              self.displayed_interims(groups=['mars'])
-                                          ))
+        self.do_upcoming_view_filter_test('?show=mars', self.displayed_interims(groups=['mars']))
 
         # Show two
-        self.do_upcoming_view_filter_test('?show=mars,ames', 
-                                          ietf_meetings.union(
-                                              self.displayed_interims(groups=['mars', 'ames'])
-                                          ))
+        self.do_upcoming_view_filter_test('?show=mars,ames',self.displayed_interims(groups=['mars', 'ames']))
+
+        # Show two plus ietf-meetings
+        self.do_upcoming_view_filter_test(
+            '?show=ietf-meetings,mars,ames',
+            set(self.all_ietf_meetings()).union(self.displayed_interims(groups=['mars', 'ames']))
+        )
 
     def test_upcoming_view_filter_show_area(self):
         mars = Group.objects.get(acronym='mars')
         area = mars.parent
-        ietf_meetings = set(self.all_ietf_meetings())
-        self.do_upcoming_view_filter_test('?show=%s' % area.acronym,
-                                          ietf_meetings.union(
-                                              self.displayed_interims(groups=['mars', 'ames'])
-                                          ))
+        self.do_upcoming_view_filter_test('?show=%s' % area.acronym, self.displayed_interims(groups=['mars', 'ames']))
 
     def test_upcoming_view_filter_show_type(self):
-        ietf_meetings = set(self.all_ietf_meetings())
-        self.do_upcoming_view_filter_test('?show=plenary',
-                                          ietf_meetings.union(
-                                              self.displayed_interims(groups=['sg'])
-                                          ))
+        self.do_upcoming_view_filter_test('?show=plenary', self.displayed_interims(groups=['sg']))
 
     def test_upcoming_view_filter_hide_group(self):
         mars = Group.objects.get(acronym='mars')
         area = mars.parent
 
         # Without anything shown, should see only ietf meetings
-        ietf_meetings = set(self.all_ietf_meetings())
-        self.do_upcoming_view_filter_test('?hide=mars', ietf_meetings)
+        self.do_upcoming_view_filter_test('?hide=mars')
 
         # With group shown
-        self.do_upcoming_view_filter_test('?show=ames,mars&hide=mars',
-                                          ietf_meetings.union(
-                                              self.displayed_interims(groups=['ames'])
-                                          ))
+        self.do_upcoming_view_filter_test('?show=ames,mars&hide=mars', self.displayed_interims(groups=['ames']))
         # With area shown
-        self.do_upcoming_view_filter_test('?show=%s&hide=mars' % area.acronym, 
-                                          ietf_meetings.union(
-                                              self.displayed_interims(groups=['ames'])
-                                          ))
-
+        self.do_upcoming_view_filter_test('?show=%s&hide=mars' % area.acronym, self.displayed_interims(groups=['ames']))
         # With type shown
-        self.do_upcoming_view_filter_test('?show=plenary&hide=sg',
-                                          ietf_meetings)
+        self.do_upcoming_view_filter_test('?show=plenary&hide=sg')
 
     def test_upcoming_view_filter_hide_area(self):
         mars = Group.objects.get(acronym='mars')
         area = mars.parent
 
-        # Without anything shown, should see only ietf meetings
-        ietf_meetings = set(self.all_ietf_meetings())
-        self.do_upcoming_view_filter_test('?hide=%s' % area.acronym, ietf_meetings)
+        # Without anything shown, should see nothing
+        self.do_upcoming_view_filter_test('?hide=%s' % area.acronym)
 
         # With area shown
-        self.do_upcoming_view_filter_test('?show=%s&hide=%s' % (area.acronym, area.acronym),
-                                          ietf_meetings)
+        self.do_upcoming_view_filter_test('?show=%s&hide=%s' % (area.acronym, area.acronym))
 
         # With group shown
-        self.do_upcoming_view_filter_test('?show=mars&hide=%s' % area.acronym, ietf_meetings)
+        self.do_upcoming_view_filter_test('?show=mars&hide=%s' % area.acronym)
 
         # With type shown
-        self.do_upcoming_view_filter_test('?show=regular&hide=%s' % area.acronym, ietf_meetings)
+        self.do_upcoming_view_filter_test('?show=regular&hide=%s' % area.acronym)
 
-    def test_upcoming_view_filter_hide_type(self):
-        mars = Group.objects.get(acronym='mars')
-        area = mars.parent
+        # with IETF meetings shown
+        self.do_upcoming_view_filter_test('?show=ietf-meetings,hide=%s' % area.acronym, self.all_ietf_meetings())
 
-        # Without anything shown, should see only ietf meetings
-        ietf_meetings = set(self.all_ietf_meetings())
-        self.do_upcoming_view_filter_test('?hide=regular', ietf_meetings)
+    def test_upcoming_view_filter_hide_type(self):
+        # Without anything shown, should see nothing
+        self.do_upcoming_view_filter_test('?hide=regular')
 
         # With group shown
-        self.do_upcoming_view_filter_test('?show=mars&hide=regular', ietf_meetings)
+        self.do_upcoming_view_filter_test('?show=mars&hide=regular')
 
         # With type shown
-        self.do_upcoming_view_filter_test('?show=plenary,regular&hide=%s' % area.acronym, 
-                                          ietf_meetings.union(
-                                              self.displayed_interims(groups=['sg'])
-                                          ))
+        self.do_upcoming_view_filter_test(
+            '?show=plenary,regular&hide=regular',
+            self.displayed_interims(groups=['sg'])
+        )
+
+        # With interim-meetings shown
+        self.do_upcoming_view_filter_test('?show=plenary,regular&hide=regular', self.displayed_interims(groups=['sg']))
 
     def test_upcoming_view_filter_whitespace(self):
         """Whitespace in filter lists should be ignored"""
-        meetings = set(self.all_ietf_meetings())
-        meetings.update(self.displayed_interims(groups=['mars']))
-        self.do_upcoming_view_filter_test('?show=mars , ames &hide=   ames', meetings)
+        self.do_upcoming_view_filter_test('?show=mars , ames &hide=   ames', self.displayed_interims(groups=['mars']))
 
     def test_upcoming_view_time_zone_selection(self):
         def _assert_interim_tz_correct(sessions, tz):
@@ -1257,10 +1230,13 @@ def _assert_ietf_tz_correct(meetings, tz):
         self.driver.get(self.absreverse('ietf.meeting.views.upcoming'))
         tz_select_input = self.driver.find_element(By.ID, 'timezone-select')
         tz_select_bottom_input = self.driver.find_element(By.ID, 'timezone-select-bottom')
-        local_tz_link = self.driver.find_element(By.ID, 'local-timezone')
-        utc_tz_link = self.driver.find_element(By.ID, 'utc-timezone')
-        local_tz_bottom_link = self.driver.find_element(By.ID, 'local-timezone-bottom')
-        utc_tz_bottom_link = self.driver.find_element(By.ID, 'utc-timezone-bottom')
+        
+        # For things we click, need to click the labels / actually visible items. The actual inputs are hidden
+        # and managed by the JS.
+        local_tz_link = self.driver.find_element(By.CSS_SELECTOR, 'label[for="local-timezone"]')
+        utc_tz_link = self.driver.find_element(By.CSS_SELECTOR, 'label[for="utc-timezone"]')
+        local_tz_bottom_link = self.driver.find_element(By.CSS_SELECTOR, 'label[for="local-timezone-bottom"]')
+        utc_tz_bottom_link = self.driver.find_element(By.CSS_SELECTOR, 'label[for="utc-timezone-bottom"]')
         
         # wait for the select box to be updated - look for an arbitrary time zone to be in
         # its options list to detect this
@@ -1270,7 +1246,10 @@ def _assert_ietf_tz_correct(meetings, tz):
                 (By.CSS_SELECTOR, '#timezone-select > option[value="%s"]' % arbitrary_tz)
             )
         )
-
+        tz_selector_clickables = self.driver.find_elements(By.CSS_SELECTOR, ".tz-display .select2")
+        self.assertEqual(len(tz_selector_clickables), 2)
+        (tz_selector_top, tz_selector_bottom) = tz_selector_clickables
+        
         arbitrary_tz_bottom_opt = tz_select_bottom_input.find_element(By.CSS_SELECTOR,
             '#timezone-select-bottom > option[value="%s"]' % arbitrary_tz)
 
@@ -1281,7 +1260,7 @@ def _assert_ietf_tz_correct(meetings, tz):
         # to inherit Django's settings.TIME_ZONE but I don't know whether that's guaranteed to be consistent.
         # To avoid test fragility, ask Moment what it considers local and expect that.
         local_tz = self.driver.execute_script('return moment.tz.guess();')
-        local_tz_opt = tz_select_input.find_element(By.CSS_SELECTOR, 'option[value=%s]' % local_tz)
+        local_tz_opt = tz_select_input.find_element(By.CSS_SELECTOR, 'option[value="%s"]' % local_tz)
         local_tz_bottom_opt = tz_select_bottom_input.find_element(By.CSS_SELECTOR, 'option[value="%s"]' % local_tz)
 
         # Should start off in local time zone
@@ -1291,8 +1270,7 @@ def _assert_ietf_tz_correct(meetings, tz):
         _assert_ietf_tz_correct(ietf_meetings, local_tz)
 
         # click 'utc' button
-        self.driver.execute_script("arguments[0].click();", utc_tz_link)  # FIXME-LARS: not working:
-        # utc_tz_link.click()
+        utc_tz_link.click()
         self.wait.until(expected_conditions.element_to_be_selected(utc_tz_opt))
         self.assertFalse(local_tz_opt.is_selected())
         self.assertFalse(local_tz_bottom_opt.is_selected())
@@ -1304,8 +1282,7 @@ def _assert_ietf_tz_correct(meetings, tz):
         _assert_ietf_tz_correct(ietf_meetings, 'UTC')
 
         # click back to 'local'
-        self.driver.execute_script("arguments[0].click();", local_tz_link)  # FIXME-LARS: not working:
-        # local_tz_link.click()
+        local_tz_link.click()
         self.wait.until(expected_conditions.element_to_be_selected(local_tz_opt))
         self.assertTrue(local_tz_opt.is_selected())
         self.assertTrue(local_tz_bottom_opt.is_selected())
@@ -1317,7 +1294,12 @@ def _assert_ietf_tz_correct(meetings, tz):
         _assert_ietf_tz_correct(ietf_meetings, local_tz)
 
         # Now select a different item from the select input
-        arbitrary_tz_opt.click()
+        tz_selector_top.click()
+        self.wait.until(
+            expected_conditions.presence_of_element_located(
+                (By.CSS_SELECTOR, 'span.select2-container .select2-results li[id$="America/Halifax"]')
+            )
+        ).click()
         self.wait.until(expected_conditions.element_to_be_selected(arbitrary_tz_opt))
         self.assertFalse(local_tz_opt.is_selected())
         self.assertFalse(local_tz_bottom_opt.is_selected())
@@ -1330,8 +1312,8 @@ def _assert_ietf_tz_correct(meetings, tz):
 
         # Now repeat those tests using the widgets at the bottom of the page
         # click 'utc' button
-        self.driver.execute_script("arguments[0].click();", utc_tz_bottom_link)  # FIXME-LARS: not working:
-        # utc_tz_bottom_link.click()
+        self.scroll_to_element(utc_tz_bottom_link)
+        utc_tz_bottom_link.click()
         self.wait.until(expected_conditions.element_to_be_selected(utc_tz_opt))
         self.assertFalse(local_tz_opt.is_selected())
         self.assertFalse(local_tz_bottom_opt.is_selected())
@@ -1343,8 +1325,8 @@ def _assert_ietf_tz_correct(meetings, tz):
         _assert_ietf_tz_correct(ietf_meetings, 'UTC')
 
         # click back to 'local'
-        self.driver.execute_script("arguments[0].click();", local_tz_bottom_link)  # FIXME-LARS: not working:
-        # local_tz_bottom_link.click()
+        self.scroll_to_element(local_tz_bottom_link)
+        local_tz_bottom_link.click()
         self.wait.until(expected_conditions.element_to_be_selected(local_tz_opt))
         self.assertTrue(local_tz_opt.is_selected())
         self.assertTrue(local_tz_bottom_opt.is_selected())
@@ -1356,7 +1338,13 @@ def _assert_ietf_tz_correct(meetings, tz):
         _assert_ietf_tz_correct(ietf_meetings, local_tz)
 
         # Now select a different item from the select input
-        arbitrary_tz_bottom_opt.click()
+        self.scroll_to_element(tz_selector_bottom)
+        tz_selector_bottom.click()
+        self.wait.until(
+            expected_conditions.presence_of_element_located(
+                (By.CSS_SELECTOR, 'span.select2-container .select2-results li[id$="America/Halifax"]')
+            )
+        ).click()
         self.wait.until(expected_conditions.element_to_be_selected(arbitrary_tz_opt))
         self.assertFalse(local_tz_opt.is_selected())
         self.assertFalse(local_tz_bottom_opt.is_selected())
@@ -1387,13 +1375,8 @@ def test_upcoming_materials_modal(self):
         self.assertFalse(modal_div.is_displayed())
 
         # Click the 'materials' button
-        open_modal_button = self.wait.until(
-            expected_conditions.element_to_be_clickable(
-                (By.CSS_SELECTOR, '[data-bs-target="#modal-%s"]' % slug)
-            ),
-            'Modal open button not found or not clickable',
-        )
-        open_modal_button.click()
+        open_modal_button_locator = (By.CSS_SELECTOR, '[data-bs-target="#modal-%s"]' % slug)
+        self.scroll_and_click(open_modal_button_locator)
         self.wait.until(
             expected_conditions.visibility_of(modal_div),
             'Modal did not become visible after clicking open button',
@@ -1407,6 +1390,7 @@ def test_upcoming_materials_modal(self):
             ),
             'Modal close button not found or not clickable',
         )
+        time.sleep(0.3)  # gross, but the button is clickable while still fading in
         close_modal_button.click()
         self.wait.until(
             expected_conditions.invisibility_of_element(modal_div),
@@ -1419,7 +1403,7 @@ class ProceedingsMaterialTests(IetfSeleniumTestCase):
     def setUp(self):
         super().setUp()
         self.wait = WebDriverWait(self.driver, 2)
-        self.meeting = MeetingFactory(type_id='ietf', number='123', date=datetime.date.today())
+        self.meeting = MeetingFactory(type_id='ietf', number='123', date=date_today())
 
     def test_add_proceedings_material(self):
         url = self.absreverse(
@@ -1518,10 +1502,10 @@ class EditTimeslotsTests(IetfSeleniumTestCase):
     """Test the timeslot editor"""
     def setUp(self):
         super().setUp()
-        self.meeting: Meeting = MeetingFactory(
+        self.meeting: Meeting = MeetingFactory(  # type: ignore[annotation-unchecked]
             type_id='ietf',
             number=120,
-            date=datetime.datetime.today() + datetime.timedelta(days=10),
+            date=date_today() + datetime.timedelta(days=10),
             populate_schedule=False,
         )
         self.edit_timeslot_url = self.absreverse(
@@ -1591,29 +1575,27 @@ def test_delete_timeslot_cancel(self):
         self.do_delete_timeslot_test(cancel=True)
 
     def do_delete_time_interval_test(self, cancel=False):
-        delete_day = self.meeting.date.date()
-        delete_time = datetime.time(hour=10)
-        other_day = self.meeting.get_meeting_date(1).date()
-        other_time = datetime.time(hour=12)
+        delete_time_local = datetime_from_date(self.meeting.date, self.meeting.tz()).replace(hour=10)
+        delete_time = delete_time_local.astimezone(datetime.UTC)
         duration = datetime.timedelta(minutes=60)
 
-        delete: [TimeSlot] = TimeSlotFactory.create_batch(
+        delete: [TimeSlot] = TimeSlotFactory.create_batch(  # type: ignore[annotation-unchecked]
             2,
             meeting=self.meeting,
-            time=datetime.datetime.combine(delete_day, delete_time),
-            duration=duration)
-
-        keep: [TimeSlot] = [
+            time=delete_time_local,
+            duration=duration,
+        )
+        keep: [TimeSlot] = [  # type: ignore[annotation-unchecked]
             TimeSlotFactory(
                 meeting=self.meeting,
-                time=datetime.datetime.combine(day, time),
+                time=keep_time,
                 duration=duration
             )
-            for (day, time) in (
-                # combinations of day/time that should not be deleted
-                (delete_day, other_time),
-                (other_day, delete_time),
-                (other_day, other_time),
+            for keep_time in (
+                # same day, but 2 hours later
+                delete_time + datetime.timedelta(hours=2),
+                # next day, but same wall clock time
+                datetime_from_date(self.meeting.get_meeting_date(1), self.meeting.tz()).replace(hour=10),
             )
         ]
 
@@ -1621,11 +1603,9 @@ def do_delete_time_interval_test(self, cancel=False):
             '#timeslot-table '
             '.delete-button[data-delete-scope="column"]'
             '[data-col-id="{}T{}-{}"]'.format(
-                delete_day.isoformat(),
-                delete_time.strftime('%H:%M'),
-                (datetime.datetime.combine(delete_day, delete_time) + duration).strftime(
-                    '%H:%M'
-                ))
+                delete_time_local.date().isoformat(),
+                delete_time_local.strftime('%H:%M'),
+                (delete_time + duration).astimezone(self.meeting.tz()).strftime('%H:%M'))
         )
         self.do_delete_test(selector, keep, delete, cancel)
 
@@ -1638,22 +1618,22 @@ def test_delete_time_interval_cancel(self):
         self.do_delete_time_interval_test(cancel=True)
 
     def do_delete_day_test(self, cancel=False):
-        delete_day = self.meeting.date.date()
-        times = [datetime.time(hour=10), datetime.time(hour=12)]
-        other_days = [self.meeting.get_meeting_date(d).date() for d in range(1, 3)]
+        delete_day = self.meeting.date
+        hours = [10, 12]
+        other_days = [self.meeting.get_meeting_date(d) for d in range(1, 3)]
 
-        delete: [TimeSlot] = [
+        delete: [TimeSlot] = [  # type: ignore[annotation-unchecked]
             TimeSlotFactory(
                 meeting=self.meeting,
-                time=datetime.datetime.combine(delete_day, time),
-            ) for time in times
+                time=datetime_from_date(delete_day, self.meeting.tz()).replace(hour=hour),
+            ) for hour in hours
         ]
 
-        keep: [TimeSlot] = [
+        keep: [TimeSlot] = [  # type: ignore[annotation-unchecked]
             TimeSlotFactory(
                 meeting=self.meeting,
-                time=datetime.datetime.combine(day, time),
-            ) for day in other_days for time in times
+                time=datetime_from_date(day, self.meeting.tz()).replace(hour=hour),
+            ) for day in other_days for hour in hours
         ]
 
         selector = (
diff --git a/ietf/meeting/tests_models.py b/ietf/meeting/tests_models.py
index 71f5b93610..869d9ec814 100644
--- a/ietf/meeting/tests_models.py
+++ b/ietf/meeting/tests_models.py
@@ -1,20 +1,29 @@
-# Copyright The IETF Trust 2021, All Rights Reserved
+# Copyright The IETF Trust 2021-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 """Tests of models in the Meeting application"""
 import datetime
 
-from ietf.meeting.factories import MeetingFactory, SessionFactory, AttendedFactory
-from ietf.stats.factories import MeetingRegistrationFactory
+from unittest.mock import patch
+
+from django.conf import settings
+from django.test import override_settings
+
+import ietf.meeting.models
+from ietf.group.factories import GroupFactory, GroupHistoryFactory
+from ietf.meeting.factories import MeetingFactory, SessionFactory, AttendedFactory, SessionPresentationFactory
+from ietf.meeting.factories import RegistrationFactory
+from ietf.meeting.models import Session
 from ietf.utils.test_utils import TestCase
+from ietf.utils.timezone import date_today, datetime_today
 
 
 class MeetingTests(TestCase):
     def test_get_attendance_pre110(self):
         """Pre-110 meetings do not calculate attendance"""
         meeting = MeetingFactory(type_id='ietf', number='109')
-        MeetingRegistrationFactory.create_batch(3, meeting=meeting, reg_type='')
-        MeetingRegistrationFactory.create_batch(4, meeting=meeting, reg_type='remote')
-        MeetingRegistrationFactory.create_batch(5, meeting=meeting, reg_type='in_person')
+        RegistrationFactory.create_batch(3, meeting=meeting, with_ticket={'attendance_type_id': 'unknown'})
+        RegistrationFactory.create_batch(4, meeting=meeting, with_ticket={'attendance_type_id': 'remote'})
+        RegistrationFactory.create_batch(5, meeting=meeting, with_ticket={'attendance_type_id': 'onsite'})
         self.assertIsNone(meeting.get_attendance())
 
     def test_get_attendance_110(self):
@@ -22,31 +31,31 @@ def test_get_attendance_110(self):
         meeting = MeetingFactory(type_id='ietf', number='110')
 
         # start with attendees that should be ignored
-        MeetingRegistrationFactory.create_batch(3, meeting=meeting, reg_type='', attended=True)
-        MeetingRegistrationFactory(meeting=meeting, reg_type='', attended=False)
+        RegistrationFactory.create_batch(3, meeting=meeting, with_ticket={'attendance_type_id': 'unknown'}, attended=True)
+        RegistrationFactory(meeting=meeting, with_ticket={'attendance_type_id': 'unknown'}, attended=False)
         attendance = meeting.get_attendance()
         self.assertIsNotNone(attendance)
         self.assertEqual(attendance.remote, 0)
         self.assertEqual(attendance.onsite, 0)
 
         # add online attendees with at least one who registered but did not attend
-        MeetingRegistrationFactory.create_batch(4, meeting=meeting, reg_type='remote', attended=True)
-        MeetingRegistrationFactory(meeting=meeting, reg_type='remote', attended=False)
+        RegistrationFactory.create_batch(4, meeting=meeting, with_ticket={'attendance_type_id': 'remote'}, attended=True)
+        RegistrationFactory(meeting=meeting, with_ticket={'attendance_type_id': 'remote'}, attended=False)
         attendance = meeting.get_attendance()
         self.assertIsNotNone(attendance)
         self.assertEqual(attendance.remote, 4)
         self.assertEqual(attendance.onsite, 0)
 
         # and the same for onsite attendees
-        MeetingRegistrationFactory.create_batch(5, meeting=meeting, reg_type='onsite', attended=True)
-        MeetingRegistrationFactory(meeting=meeting, reg_type='in_person', attended=False)
+        RegistrationFactory.create_batch(5, meeting=meeting, with_ticket={'attendance_type_id': 'onsite'}, attended=True)
+        RegistrationFactory(meeting=meeting, with_ticket={'attendance_type_id': 'onsite'}, attended=False)
         attendance = meeting.get_attendance()
         self.assertIsNotNone(attendance)
         self.assertEqual(attendance.remote, 4)
         self.assertEqual(attendance.onsite, 5)
 
         # and once more after removing all the online attendees
-        meeting.meetingregistration_set.filter(reg_type='remote').delete()
+        meeting.registration_set.remote().delete()
         attendance = meeting.get_attendance()
         self.assertIsNotNone(attendance)
         self.assertEqual(attendance.remote, 0)
@@ -55,11 +64,11 @@ def test_get_attendance_110(self):
     def test_get_attendance_113(self):
         """Simulate IETF 113 attendance gathering data"""
         meeting = MeetingFactory(type_id='ietf', number='113')
-        MeetingRegistrationFactory(meeting=meeting, reg_type='onsite', attended=True, checkedin=False)
-        MeetingRegistrationFactory(meeting=meeting, reg_type='onsite', attended=False, checkedin=True)
-        p1 = MeetingRegistrationFactory(meeting=meeting, reg_type='onsite', attended=False, checkedin=False).person
+        RegistrationFactory(meeting=meeting, with_ticket={'attendance_type_id': 'onsite'}, attended=True, checkedin=False)
+        RegistrationFactory(meeting=meeting, with_ticket={'attendance_type_id': 'onsite'}, attended=False, checkedin=True)
+        p1 = RegistrationFactory(meeting=meeting, with_ticket={'attendance_type_id': 'onsite'}, attended=False, checkedin=False).person
         AttendedFactory(session__meeting=meeting, person=p1)
-        p2 = MeetingRegistrationFactory(meeting=meeting, reg_type='remote', attended=False, checkedin=False).person
+        p2 = RegistrationFactory(meeting=meeting, with_ticket={'attendance_type_id': 'remote'}, attended=False, checkedin=False).person
         AttendedFactory(session__meeting=meeting, person=p2)
         attendance = meeting.get_attendance()
         self.assertEqual(attendance.onsite, 3)
@@ -73,9 +82,9 @@ def test_get_attendance_keeps_meetings_distinct(self):
 
         # Create a person who attended a remote session for first_mtg and onsite for second_mtg without
         # checking in for either.
-        p = MeetingRegistrationFactory(meeting=second_mtg, reg_type='onsite', attended=False, checkedin=False).person
+        p = RegistrationFactory(meeting=second_mtg, with_ticket={'attendance_type_id': 'onsite'}, attended=False, checkedin=False).person
         AttendedFactory(session__meeting=first_mtg, person=p)
-        MeetingRegistrationFactory(meeting=first_mtg, person=p, reg_type='remote', attended=False, checkedin=False)
+        RegistrationFactory(meeting=first_mtg, person=p, with_ticket={'attendance_type_id': 'remote'}, attended=False, checkedin=False)
         AttendedFactory(session__meeting=second_mtg, person=p)
 
         att = first_mtg.get_attendance()
@@ -86,9 +95,106 @@ def test_get_attendance_keeps_meetings_distinct(self):
         self.assertEqual(att.onsite, 1)
         self.assertEqual(att.remote, 0)
 
+    def test_vtimezone(self):
+        # normal time zone that should have a zoneinfo file
+        meeting = MeetingFactory(type_id='ietf', time_zone='America/Los_Angeles', populate_schedule=False)
+        vtz = meeting.vtimezone()
+        self.assertIsNotNone(vtz)
+        self.assertGreater(len(vtz), 0)
+        # time zone that does not have a zoneinfo file should return None
+        meeting = MeetingFactory(type_id='ietf', time_zone='Fake/Time_Zone', populate_schedule=False)
+        vtz = meeting.vtimezone()
+        self.assertIsNone(vtz)
+        # ioerror trying to read zoneinfo should return None
+        meeting = MeetingFactory(type_id='ietf', time_zone='America/Los_Angeles', populate_schedule=False)
+        with patch('ietf.meeting.models.io.open', side_effect=IOError):
+            vtz = meeting.vtimezone()
+        self.assertIsNone(vtz)
+
+    def test_group_at_the_time(self):
+        m = MeetingFactory(type_id='ietf', date=date_today() - datetime.timedelta(days=10))
+        cached_groups = GroupFactory.create_batch(2)
+        m.cached_groups_at_the_time = {g.pk: g for g in cached_groups}  # fake the cache
+        uncached_group_hist = GroupHistoryFactory(time=datetime_today() - datetime.timedelta(days=30))
+        self.assertEqual(m.group_at_the_time(uncached_group_hist.group), uncached_group_hist)
+        self.assertIn(uncached_group_hist.group.pk, m.cached_groups_at_the_time)
+
 
 class SessionTests(TestCase):
-    def test_chat_archive_url_with_jabber(self):
+    def test_chat_archive_url(self):
+        session = SessionFactory(
+            meeting__date=datetime.date.today(),
+            meeting__number=120,  # needs to use proceedings_format_version > 1
+        )
+        with override_settings():
+            if hasattr(settings, 'CHAT_ARCHIVE_URL_PATTERN'):
+                del settings.CHAT_ARCHIVE_URL_PATTERN
+            self.assertEqual(session.chat_archive_url(), session.chat_room_url())
+            settings.CHAT_ARCHIVE_URL_PATTERN = 'http://chat.example.com'
+            self.assertEqual(session.chat_archive_url(), 'http://chat.example.com')
+            chatlog = SessionPresentationFactory(session=session, document__type_id='chatlog').document
+            self.assertEqual(session.chat_archive_url(), chatlog.get_href())
+
         # datatracker 8.8.0 rolled out on 2022-07-15. Before that, chat logs were jabber logs hosted at www.ietf.org.
         session_with_jabber = SessionFactory(group__acronym='fakeacronym', meeting__date=datetime.date(2022,7,14))
         self.assertEqual(session_with_jabber.chat_archive_url(), 'https://www.ietf.org/jabber/logs/fakeacronym?C=M;O=D')
+        chatlog = SessionPresentationFactory(session=session_with_jabber, document__type_id='chatlog').document
+        self.assertEqual(session_with_jabber.chat_archive_url(), chatlog.get_href())
+
+    def test_chat_room_name(self):
+        session = SessionFactory(group__acronym='xyzzy')
+        self.assertEqual(session.chat_room_name(), 'xyzzy')
+        session.type_id = 'plenary'
+        self.assertEqual(session.chat_room_name(), 'plenary')
+        session.chat_room = 'fnord'
+        self.assertEqual(session.chat_room_name(), 'fnord')
+
+    def test_alpha_str(self):
+        self.assertEqual(Session._alpha_str(0), "a")
+        self.assertEqual(Session._alpha_str(1), "b")
+        self.assertEqual(Session._alpha_str(25), "z")
+        self.assertEqual(Session._alpha_str(26), "aa")
+        self.assertEqual(Session._alpha_str(27 * 26 - 1), "zz")
+        self.assertEqual(Session._alpha_str(27 * 26), "aaa")
+
+    @patch.object(ietf.meeting.models.Session, "_session_recording_url_label", return_value="LABEL")
+    def test_session_recording_url(self, mock):
+        for session_type in ["ietf", "interim"]:
+            session = SessionFactory(meeting__type_id=session_type)
+            with override_settings():
+                if hasattr(settings, "MEETECHO_SESSION_RECORDING_URL"):
+                    del settings.MEETECHO_SESSION_RECORDING_URL
+                self.assertIsNone(session.session_recording_url())
+    
+                settings.MEETECHO_SESSION_RECORDING_URL = "http://player.example.com"
+                self.assertEqual(session.session_recording_url(), "http://player.example.com")
+    
+                settings.MEETECHO_SESSION_RECORDING_URL = "http://player.example.com?{session_label}"
+                self.assertEqual(session.session_recording_url(), "http://player.example.com?LABEL")
+
+                session.meetecho_recording_name="actualname"
+                session.save()
+                self.assertEqual(session.session_recording_url(), "http://player.example.com?actualname")
+
+    def test_session_recording_url_label_ietf(self):
+        session = SessionFactory(
+            meeting__type_id='ietf',
+            meeting__date=date_today(),
+            meeting__number="123",
+            group__acronym="acro",
+        )
+        session_time = session.official_timeslotassignment().timeslot.time
+        self.assertEqual(
+            f"IETF123-ACRO-{session_time:%Y%m%d-%H%M}",  # n.b., time in label is UTC
+            session._session_recording_url_label())
+
+    def test_session_recording_url_label_interim(self):
+        session = SessionFactory(
+            meeting__type_id='interim',
+            meeting__date=date_today(),
+            group__acronym="acro",
+        )
+        session_time = session.official_timeslotassignment().timeslot.time
+        self.assertEqual(
+            f"IETF-ACRO-{session_time:%Y%m%d-%H%M}",  # n.b., time in label is UTC
+            session._session_recording_url_label())
diff --git a/ietf/meeting/tests_schedule_forms.py b/ietf/meeting/tests_schedule_forms.py
index 58c1332bd5..426d26dc2d 100644
--- a/ietf/meeting/tests_schedule_forms.py
+++ b/ietf/meeting/tests_schedule_forms.py
@@ -140,13 +140,13 @@ def test_location_options(self):
         rendered = str(TimeSlotEditForm(instance=ts)['location'])
         # noinspection PyTypeChecker
         self.assertInHTML(
-            f'<option value="{ts.location.pk}" selected>{ts.location.name} size: None</option>',
+            f'<option value="{ts.location.pk}" selected>{ts.location}</option>',
             rendered,
         )
         for room in rooms:
             # noinspection PyTypeChecker
             self.assertInHTML(
-                f'<option value="{room.pk}">{room.name} size: {room.capacity}</option>',
+                f'<option value="{room.pk}">{room}</option>',
                 rendered,
             )
 
diff --git a/ietf/meeting/tests_schedule_generator.py b/ietf/meeting/tests_schedule_generator.py
index d414805d39..8c5f71a74e 100644
--- a/ietf/meeting/tests_schedule_generator.py
+++ b/ietf/meeting/tests_schedule_generator.py
@@ -1,7 +1,10 @@
 # Copyright The IETF Trust 2020, All Rights Reserved
 import calendar
 import datetime
+import pytz
 from io import StringIO
+from warnings import filterwarnings
+
 
 from django.core.management.base import CommandError
 
@@ -36,9 +39,11 @@ def setUp(self):
                     t = TimeSlotFactory(
                         meeting=self.meeting,
                         location=room,
-                        time=datetime.datetime.combine(
-                            self.meeting.date + datetime.timedelta(days=day),
-                            datetime.time(hour, 0),
+                        time=self.meeting.tz().localize(
+                            datetime.datetime.combine(
+                                self.meeting.date + datetime.timedelta(days=day),
+                                datetime.time(hour, 0),
+                            )
                         ),
                         duration=datetime.timedelta(minutes=60),
                     )
@@ -73,12 +78,13 @@ def test_normal_schedule(self):
 
         self.stdout.seek(0)
         output = self.stdout.read()
-        self.assertIn('WARNING: session wg2 (pk 13) has no attendees set', output)
+        wg2_no_attendees_session_pk = [s.session_pk for s in generator.schedule.sessions if s.group == "wg2" and not s.attendees][0]
+        self.assertIn(f'WARNING: session wg2 (pk {wg2_no_attendees_session_pk}) has no attendees set', output)
         self.assertIn('scheduling 13 sessions in 20 timeslots', output)
         self.assertIn('Optimiser starting run 1', output)
         self.assertIn('Optimiser found an optimal schedule', output)
         
-        schedule = self.meeting.schedule_set.get(name__startswith='Auto-')
+        schedule = self.meeting.schedule_set.get(name__startswith='auto-')
         self.assertEqual(schedule.assignments.count(), 13)
 
     def test_unresolvable_schedule(self):
@@ -104,9 +110,11 @@ def test_unresolvable_schedule(self):
     def test_too_many_sessions(self):
         self._create_basic_sessions()
         self._create_basic_sessions()
-        with self.assertRaises(CommandError):
-            generator = generate_schedule.ScheduleHandler(self.stdout, self.meeting.number, verbosity=0)
-            generator.run()
+        filterwarnings('ignore', '"time relation" constraint only makes sense for 2 sessions')
+        generator = generate_schedule.ScheduleHandler(self.stdout, self.meeting.number, verbosity=1)
+        generator.run()
+        self.stdout.seek(0)
+        self.assertIn('Some sessions will not be scheduled', self.stdout.read())
 
     def test_invalid_meeting_number(self):
         with self.assertRaises(CommandError):
@@ -153,7 +161,8 @@ def test_base_schedule(self):
         self.assertIn('Applying schedule {} as base schedule'.format(
             generate_schedule.ScheduleId.from_schedule(base_schedule)
         ), output)
-        self.assertIn('WARNING: session wg2 (pk 13) has no attendees set', output)
+        wg2_no_attendees_session_pk = [s.session_pk for s in generator.schedule.sessions if s.group == "wg2" and not s.attendees][0]
+        self.assertIn(f'WARNING: session wg2 (pk {wg2_no_attendees_session_pk}) has no attendees set', output)
         self.assertIn('scheduling 13 sessions in 19 timeslots', output)  # 19 because base is using one
         self.assertIn('Optimiser starting run 1', output)
         self.assertIn('Optimiser found an optimal schedule', output)
@@ -306,8 +315,11 @@ def _create_base_schedule(self):
            add_to_schedule=False
         )
         # use a timeslot not on Sunday
+        meeting_date = pytz.utc.localize(
+            datetime.datetime.combine(self.meeting.get_meeting_date(1), datetime.time())
+        )
         ts = self.meeting.timeslot_set.filter(
-            time__gt=self.meeting.date + datetime.timedelta(days=1),
+            time__gt=meeting_date,
             location__capacity__lt=base_reg_session.attendees,
         ).order_by(
             'time'
diff --git a/ietf/meeting/tests_session_requests.py b/ietf/meeting/tests_session_requests.py
new file mode 100644
index 0000000000..42dbee5f23
--- /dev/null
+++ b/ietf/meeting/tests_session_requests.py
@@ -0,0 +1,1133 @@
+# Copyright The IETF Trust 2013-2025, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+import datetime
+
+from django.urls import reverse
+
+import debug                            # pyflakes:ignore
+
+from ietf.utils.test_utils import TestCase
+from ietf.group.factories import GroupFactory, RoleFactory
+from ietf.meeting.models import Session, ResourceAssociation, SchedulingEvent, Constraint
+from ietf.meeting.factories import MeetingFactory, SessionFactory
+from ietf.name.models import ConstraintName, TimerangeName
+from ietf.person.factories import PersonFactory
+from ietf.person.models import Person
+from ietf.meeting.forms import SessionRequestForm
+from ietf.utils.mail import outbox, empty_outbox, get_payload_text, send_mail
+from ietf.utils.timezone import date_today
+
+
+from pyquery import PyQuery
+
+SECR_USER = 'secretary'
+
+
+class SessionRequestTestCase(TestCase):
+    def test_main(self):
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        SessionFactory.create_batch(2, meeting=meeting, status_id='sched')
+        SessionFactory.create_batch(2, meeting=meeting, status_id='disappr')
+        # Several unscheduled groups come from make_immutable_base_data
+        url = reverse('ietf.meeting.views_session_request.list_view')
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        sched = r.context['scheduled_groups']
+        self.assertEqual(len(sched), 2)
+        unsched = r.context['unscheduled_groups']
+        self.assertEqual(len(unsched), 12)
+
+    def test_approve(self):
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        ad = Person.objects.get(user__username='ad')
+        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
+        mars = GroupFactory(parent=area, acronym='mars')
+        # create session waiting for approval
+        session = SessionFactory(meeting=meeting, group=mars, status_id='apprw')
+        url = reverse('ietf.meeting.views_session_request.approve_request', kwargs={'acronym': 'mars'})
+        self.client.login(username="ad", password="ad+password")
+        r = self.client.get(url)
+        self.assertRedirects(r, reverse('ietf.meeting.views_session_request.view_request', kwargs={'acronym': 'mars'}))
+        self.assertEqual(SchedulingEvent.objects.filter(session=session).order_by('-id')[0].status_id, 'appr')
+
+    def test_cancel(self):
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        ad = Person.objects.get(user__username='ad')
+        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
+        session = SessionFactory(meeting=meeting, group__parent=area, group__acronym='mars', status_id='sched')
+        url = reverse('ietf.meeting.views_session_request.cancel_request', kwargs={'acronym': 'mars'})
+        self.client.login(username="ad", password="ad+password")
+        r = self.client.get(url)
+        self.assertRedirects(r, reverse('ietf.meeting.views_session_request.list_view'))
+        self.assertEqual(SchedulingEvent.objects.filter(session=session).order_by('-id')[0].status_id, 'deleted')
+
+    def test_cancel_notification_msg(self):
+        to = "<iesg-secretary@ietf.org>"
+        subject = "Dummy subject"
+        template = "meeting/session_cancel_notification.txt"
+        meeting = MeetingFactory(type_id="ietf", date=date_today())
+        requester = PersonFactory(name="James O'Rourke", user__username="jimorourke")
+        context = {"meeting": meeting, "requester": requester}
+        cc = "cc.a@example.com, cc.b@example.com"
+        bcc = "bcc@example.com"
+
+        msg = send_mail(
+            None,
+            to,
+            None,
+            subject,
+            template,
+            context,
+            cc=cc,
+            bcc=bcc,
+        )
+        self.assertEqual(requester.name, "James O'Rourke")  # note ' (single quote) in the name
+        self.assertIn(
+            f"A request to cancel a meeting session has just been submitted by {requester.name}.",
+            get_payload_text(msg),
+        )
+
+    def test_edit(self):
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group
+        group2 = GroupFactory()
+        group3 = GroupFactory()
+        group4 = GroupFactory()
+        iabprog = GroupFactory(type_id='program')
+
+        SessionFactory(meeting=meeting, group=mars, status_id='sched')
+
+        url = reverse('ietf.meeting.views_session_request.edit_request', kwargs={'acronym': 'mars'})
+        self.client.login(username="marschairman", password="marschairman+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        attendees = 10
+        comments = 'need lights'
+        mars_sessions = meeting.session_set.filter(group__acronym='mars')
+        empty_outbox()
+        post_data = {'num_session': '2',
+                     'attendees': attendees,
+                     'constraint_chair_conflict': iabprog.acronym,
+                     'session_time_relation': 'subsequent-days',
+                     'adjacent_with_wg': group2.acronym,
+                     'joint_with_groups': group3.acronym + ' ' + group4.acronym,
+                     'joint_for_session': '2',
+                     'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
+                     'session_set-TOTAL_FORMS': '3',  # matches what view actually sends, even with only 2 filled in
+                     'session_set-INITIAL_FORMS': '1',
+                     'session_set-MIN_NUM_FORMS': '1',
+                     'session_set-MAX_NUM_FORMS': '3',
+                     'session_set-0-id': mars_sessions[0].pk,
+                     'session_set-0-name': mars_sessions[0].name,
+                     'session_set-0-short': mars_sessions[0].short,
+                     'session_set-0-purpose': mars_sessions[0].purpose_id,
+                     'session_set-0-type': mars_sessions[0].type_id,
+                     'session_set-0-requested_duration': '3600',
+                     'session_set-0-on_agenda': mars_sessions[0].on_agenda,
+                     'session_set-0-remote_instructions': mars_sessions[0].remote_instructions,
+                     'session_set-0-attendees': attendees,
+                     'session_set-0-comments': comments,
+                     'session_set-0-DELETE': '',
+                     # no session_set-1-id because it's a new request
+                     'session_set-1-name': '',
+                     'session_set-1-short': '',
+                     'session_set-1-purpose': 'regular',
+                     'session_set-1-type': 'regular',
+                     'session_set-1-requested_duration': '3600',
+                     'session_set-1-on_agenda': True,
+                     'session_set-1-remote_instructions': mars_sessions[0].remote_instructions,
+                     'session_set-1-attendees': attendees,
+                     'session_set-1-comments': comments,
+                     'session_set-1-DELETE': '',
+                     'session_set-2-id': '',
+                     'session_set-2-name': '',
+                     'session_set-2-short': '',
+                     'session_set-2-purpose': 'regular',
+                     'session_set-2-type': 'regular',
+                     'session_set-2-requested_duration': '',
+                     'session_set-2-on_agenda': 'True',
+                     'session_set-2-attendees': attendees,
+                     'session_set-2-comments': '',
+                     'session_set-2-DELETE': 'on',
+                     'submit': 'Continue'}
+        r = self.client.post(url, post_data, HTTP_HOST='example.com')
+        redirect_url = reverse('ietf.meeting.views_session_request.view_request', kwargs={'acronym': 'mars'})
+        self.assertRedirects(r, redirect_url)
+
+        # Check whether updates were stored in the database
+        sessions = Session.objects.filter(meeting=meeting, group=mars).order_by("id")  # order to match edit() view
+        self.assertEqual(len(sessions), 2)
+        session = sessions[0]
+
+        self.assertEqual(session.constraints().get(name='chair_conflict').target.acronym, iabprog.acronym)
+        self.assertEqual(session.constraints().get(name='time_relation').time_relation, 'subsequent-days')
+        self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
+        self.assertEqual(
+            list(session.constraints().get(name='timerange').timeranges.all().values('name')),
+            list(TimerangeName.objects.filter(name__in=['thursday-afternoon-early', 'thursday-afternoon-late']).values('name'))
+        )
+        self.assertFalse(sessions[0].joint_with_groups.count())
+        self.assertEqual(set(sessions[1].joint_with_groups.all()), {group3, group4})
+
+        # Check whether the updated data is visible on the view page
+        r = self.client.get(redirect_url)
+        self.assertContains(r, 'Schedule the sessions on subsequent days')
+        self.assertContains(r, 'Thursday early afternoon, Thursday late afternoon')
+        self.assertContains(r, group2.acronym)
+        # The sessions can be in any order in the HTML, deal with that
+        self.assertRegex(r.content.decode(), r'Second session with: ({} {}|{} {})'.format(group3.acronym, group4.acronym, group4.acronym, group3.acronym))
+
+        # check that a notification was sent
+        self.assertEqual(len(outbox), 1)
+        notification_payload = get_payload_text(outbox[0])
+        self.assertIn('1 Hour, 1 Hour', notification_payload)
+        self.assertNotIn('1 Hour, 1 Hour, 1 Hour', notification_payload)
+
+        # Edit again, changing the joint sessions and clearing some fields. The behaviour of
+        # edit is different depending on whether previous joint sessions were recorded.
+        empty_outbox()
+        post_data = {'num_session': '2',
+                     'attendees': attendees,
+                     'constraint_chair_conflict': '',
+                     'comments': 'need lights',
+                     'joint_with_groups': group2.acronym,
+                     'joint_for_session': '1',
+                     'session_set-TOTAL_FORMS': '3',  # matches what view actually sends, even with only 2 filled in
+                     'session_set-INITIAL_FORMS': '2',
+                     'session_set-MIN_NUM_FORMS': '1',
+                     'session_set-MAX_NUM_FORMS': '3',
+                     'session_set-0-id': sessions[0].pk,
+                     'session_set-0-name': sessions[0].name,
+                     'session_set-0-short': sessions[0].short,
+                     'session_set-0-purpose': sessions[0].purpose_id,
+                     'session_set-0-type': sessions[0].type_id,
+                     'session_set-0-requested_duration': '3600',
+                     'session_set-0-on_agenda': sessions[0].on_agenda,
+                     'session_set-0-remote_instructions': sessions[0].remote_instructions,
+                     'session_set-0-attendees': sessions[0].attendees,
+                     'session_set-0-comments': sessions[1].comments,
+                     'session_set-0-DELETE': '',
+                     'session_set-1-id': sessions[1].pk,
+                     'session_set-1-name': sessions[1].name,
+                     'session_set-1-short': sessions[1].short,
+                     'session_set-1-purpose': sessions[1].purpose_id,
+                     'session_set-1-type': sessions[1].type_id,
+                     'session_set-1-requested_duration': '3600',
+                     'session_set-1-on_agenda': sessions[1].on_agenda,
+                     'session_set-1-remote_instructions': sessions[1].remote_instructions,
+                     'session_set-1-attendees': sessions[1].attendees,
+                     'session_set-1-comments': sessions[1].comments,
+                     'session_set-1-DELETE': '',
+                     'session_set-2-id': '',
+                     'session_set-2-name': '',
+                     'session_set-2-short': '',
+                     'session_set-2-purpose': 'regular',
+                     'session_set-2-type': 'regular',
+                     'session_set-2-requested_duration': '',
+                     'session_set-2-on_agenda': 'True',
+                     'session_set-2-attendees': attendees,
+                     'session_set-2-comments': '',
+                     'session_set-2-DELETE': 'on',
+                     'submit': 'Continue'}
+        r = self.client.post(url, post_data, HTTP_HOST='example.com')
+        self.assertRedirects(r, redirect_url)
+
+        # Check whether updates were stored in the database
+        sessions = Session.objects.filter(meeting=meeting, group=mars).order_by("id")
+        self.assertEqual(len(sessions), 2)
+        session = sessions[0]
+        self.assertFalse(session.constraints().filter(name='time_relation'))
+        self.assertFalse(session.constraints().filter(name='wg_adjacent'))
+        self.assertFalse(session.constraints().filter(name='timerange'))
+        self.assertEqual(list(sessions[0].joint_with_groups.all()), [group2])
+        self.assertFalse(sessions[1].joint_with_groups.count())
+
+        # check that a notification was sent
+        self.assertEqual(len(outbox), 1)
+        notification_payload = get_payload_text(outbox[0])
+        self.assertIn('1 Hour, 1 Hour', notification_payload)
+        self.assertNotIn('1 Hour, 1 Hour, 1 Hour', notification_payload)
+
+        # Check whether the updated data is visible on the view page
+        r = self.client.get(redirect_url)
+        self.assertContains(r, 'First session with: {}'.format(group2.acronym))
+
+    def test_edit_constraint_bethere(self):
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group
+        session = SessionFactory(meeting=meeting, group=mars, status_id='sched')
+        Constraint.objects.create(
+            meeting=meeting,
+            source=mars,
+            person=Person.objects.get(user__username='marschairman'),
+            name_id='bethere',
+        )
+        self.assertEqual(session.people_constraints.count(), 1)
+        url = reverse('ietf.meeting.views_session_request.edit_request', kwargs=dict(acronym='mars'))
+        self.client.login(username='marschairman', password='marschairman+password')
+        attendees = '10'
+        ad = Person.objects.get(user__username='ad')
+        post_data = {
+            'num_session': '1',
+            'attendees': attendees,
+            'bethere': str(ad.pk),
+            'constraint_chair_conflict': '',
+            'comments': '',
+            'joint_with_groups': '',
+            'joint_for_session': '',
+            'delete_conflict': 'on',
+            'session_set-TOTAL_FORMS': '3',  # matches what view actually sends, even with only 2 filled in
+            'session_set-INITIAL_FORMS': '1',
+            'session_set-MIN_NUM_FORMS': '1',
+            'session_set-MAX_NUM_FORMS': '3',
+            'session_set-0-id': session.pk,
+            'session_set-0-name': session.name,
+            'session_set-0-short': session.short,
+            'session_set-0-purpose': session.purpose_id,
+            'session_set-0-type': session.type_id,
+            'session_set-0-requested_duration': '3600',
+            'session_set-0-on_agenda': session.on_agenda,
+            'session_set-0-remote_instructions': session.remote_instructions,
+            'session_set-0-attendees': attendees,
+            'session_set-0-comments': '',
+            'session_set-0-DELETE': '',
+            'session_set-1-id': '',
+            'session_set-1-name': '',
+            'session_set-1-short': '',
+            'session_set-1-purpose': 'regular',
+            'session_set-1-type': 'regular',
+            'session_set-1-requested_duration': '',
+            'session_set-1-on_agenda': 'True',
+            'session_set-1-attendees': attendees,
+            'session_set-1-comments': '',
+            'session_set-1-DELETE': 'on',
+            'session_set-2-id': '',
+            'session_set-2-name': '',
+            'session_set-2-short': '',
+            'session_set-2-purpose': 'regular',
+            'session_set-2-type': 'regular',
+            'session_set-2-requested_duration': '',
+            'session_set-2-on_agenda': 'True',
+            'session_set-2-attendees': attendees,
+            'session_set-2-comments': '',
+            'session_set-2-DELETE': 'on',
+            'submit': 'Save',
+        }
+        r = self.client.post(url, post_data, HTTP_HOST='example.com')
+        redirect_url = reverse('ietf.meeting.views_session_request.view_request', kwargs={'acronym': 'mars'})
+        self.assertRedirects(r, redirect_url)
+        self.assertEqual([pc.person for pc in session.people_constraints.all()], [ad])
+
+    def test_edit_inactive_conflicts(self):
+        """Inactive conflicts should be displayed and removable"""
+        meeting = MeetingFactory(type_id='ietf', date=date_today(), group_conflicts=['chair_conflict'])
+        mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group
+        session = SessionFactory(meeting=meeting, group=mars, status_id='sched')
+        other_group = GroupFactory()
+        Constraint.objects.create(
+            meeting=meeting,
+            name_id='conflict',  # not in group_conflicts for the meeting
+            source=mars,
+            target=other_group,
+        )
+
+        url = reverse('ietf.meeting.views_session_request.edit_request', kwargs=dict(acronym='mars'))
+        self.client.login(username='marschairman', password='marschairman+password')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+
+        # check that the inactive session is displayed
+        found = q('input#id_delete_conflict[type="checkbox"]')
+        self.assertEqual(len(found), 1)
+        delete_checkbox = found[0]
+        self.assertIn('Delete this conflict', delete_checkbox.label.text)
+        # check that the target is displayed correctly in the UI
+        row = found.parent().parent()
+        self.assertIn(other_group.acronym, row.find('input[@type="text"]').val())
+
+        attendees = '10'
+        post_data = {
+            'num_session': '1',
+            'attendees': attendees,
+            'constraint_chair_conflict': '',
+            'comments': '',
+            'joint_with_groups': '',
+            'joint_for_session': '',
+            'delete_conflict': 'on',
+            'session_set-TOTAL_FORMS': '1',
+            'session_set-INITIAL_FORMS': '1',
+            'session_set-MIN_NUM_FORMS': '1',
+            'session_set-MAX_NUM_FORMS': '3',
+            'session_set-0-id': session.pk,
+            'session_set-0-name': session.name,
+            'session_set-0-short': session.short,
+            'session_set-0-purpose': session.purpose_id,
+            'session_set-0-type': session.type_id,
+            'session_set-0-requested_duration': '3600',
+            'session_set-0-on_agenda': session.on_agenda,
+            'session_set-0-remote_instructions': session.remote_instructions,
+            'session_set-0-attendees': attendees,
+            'session_set-0-comments': '',
+            'session_set-0-DELETE': '',
+            'submit': 'Save',
+        }
+        r = self.client.post(url, post_data, HTTP_HOST='example.com')
+        redirect_url = reverse('ietf.meeting.views_session_request.view_request', kwargs={'acronym': 'mars'})
+        self.assertRedirects(r, redirect_url)
+        self.assertEqual(len(mars.constraint_source_set.filter(name_id='conflict')), 0)
+
+    def test_tool_status(self):
+        MeetingFactory(type_id='ietf', date=date_today())
+        url = reverse('ietf.meeting.views_session_request.status')
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        r = self.client.post(url, {'message': 'locked', 'submit': 'Lock'})
+        self.assertRedirects(r, reverse('ietf.meeting.views_session_request.list_view'))
+
+    def test_new_req_constraint_types(self):
+        """Configurable constraint types should be handled correctly in a new request
+
+        Relies on SessionRequestForm representing constraint values with element IDs
+        like id_constraint_<ConstraintName slug>
+        """
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars')
+        url = reverse('ietf.meeting.views_session_request.new_request', kwargs=dict(acronym='mars'))
+        self.client.login(username="marschairman", password="marschairman+password")
+
+        for expected in [
+            ['conflict', 'conflic2', 'conflic3'],
+            ['chair_conflict', 'tech_overlap', 'key_participant'],
+        ]:
+            meeting.group_conflict_types.clear()
+            for slug in expected:
+                meeting.group_conflict_types.add(ConstraintName.objects.get(slug=slug))
+
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertCountEqual(
+                [elt.attr('id') for elt in q.items('*[id^=id_constraint_]')],
+                ['id_constraint_{}'.format(conf_name) for conf_name in expected],
+            )
+
+    def test_edit_req_constraint_types(self):
+        """Editing a request constraint should show the expected constraints"""
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        SessionFactory(group__acronym='mars',
+                       status_id='schedw',
+                       meeting=meeting,
+                       add_to_schedule=False)
+        RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars')
+
+        url = reverse('ietf.meeting.views_session_request.edit_request', kwargs=dict(acronym='mars'))
+        self.client.login(username='marschairman', password='marschairman+password')
+
+        for expected in [
+            ['conflict', 'conflic2', 'conflic3'],
+            ['chair_conflict', 'tech_overlap', 'key_participant'],
+        ]:
+            meeting.group_conflict_types.clear()
+            for slug in expected:
+                meeting.group_conflict_types.add(ConstraintName.objects.get(slug=slug))
+
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertCountEqual(
+                [elt.attr('id') for elt in q.items('*[id^=id_constraint_]')],
+                ['id_constraint_{}'.format(conf_name) for conf_name in expected],
+            )
+
+
+class SubmitRequestCase(TestCase):
+    def setUp(self):
+        super(SubmitRequestCase, self).setUp()
+        # Ensure meeting numbers are predictable. Temporarily needed while basing
+        # constraint types on meeting number, expected to go away when #2770 is resolved.
+        MeetingFactory.reset_sequence(0)
+
+    def test_submit_request(self):
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        ad = Person.objects.get(user__username='ad')
+        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
+        group = GroupFactory(parent=area)
+        group2 = GroupFactory(parent=area)
+        group3 = GroupFactory(parent=area)
+        group4 = GroupFactory(parent=area)
+        session_count_before = Session.objects.filter(meeting=meeting, group=group).count()
+        url = reverse('ietf.meeting.views_session_request.new_request', kwargs={'acronym': group.acronym})
+        confirm_url = reverse('ietf.meeting.views_session_request.confirm', kwargs={'acronym': group.acronym})
+        main_url = reverse('ietf.meeting.views_session_request.list_view')
+        attendees = '10'
+        comments = 'need projector'
+        post_data = {'num_session': '1',
+                     'attendees': attendees,
+                     'constraint_chair_conflict': '',
+                     'comments': comments,
+                     'adjacent_with_wg': group2.acronym,
+                     'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
+                     'joint_with_groups': group3.acronym + ' ' + group4.acronym,
+                     'joint_for_session': '1',
+                     'session_set-TOTAL_FORMS': '1',
+                     'session_set-INITIAL_FORMS': '0',
+                     'session_set-MIN_NUM_FORMS': '1',
+                     'session_set-MAX_NUM_FORMS': '3',
+                     # no 'session_set-0-id' to create a new session
+                     'session_set-0-name': '',
+                     'session_set-0-short': '',
+                     'session_set-0-purpose': 'regular',
+                     'session_set-0-type': 'regular',
+                     'session_set-0-requested_duration': '3600',
+                     'session_set-0-on_agenda': True,
+                     'session_set-0-remote_instructions': '',
+                     'session_set-0-attendees': attendees,
+                     'session_set-0-comments': comments,
+                     'session_set-0-DELETE': '',
+                     'submit': 'Continue'}
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.post(url, post_data)
+        self.assertEqual(r.status_code, 200)
+
+        # Verify the contents of the confirm view
+        self.assertContains(r, 'Thursday early afternoon, Thursday late afternoon')
+        self.assertContains(r, group2.acronym)
+        self.assertContains(r, 'First session with: {} {}'.format(group3.acronym, group4.acronym))
+
+        post_data['submit'] = 'Submit'
+        r = self.client.post(confirm_url, post_data)
+        self.assertRedirects(r, main_url)
+        session_count_after = Session.objects.filter(meeting=meeting, group=group, type='regular').count()
+        self.assertEqual(session_count_after, session_count_before + 1)
+
+        # test that second confirm does not add sessions
+        r = self.client.post(confirm_url, post_data)
+        self.assertRedirects(r, main_url)
+        session_count_after = Session.objects.filter(meeting=meeting, group=group, type='regular').count()
+        self.assertEqual(session_count_after, session_count_before + 1)
+
+        # Verify database content
+        session = Session.objects.get(meeting=meeting, group=group)
+        self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
+        self.assertEqual(
+            list(session.constraints().get(name='timerange').timeranges.all().values('name')),
+            list(TimerangeName.objects.filter(name__in=['thursday-afternoon-early', 'thursday-afternoon-late']).values('name'))
+        )
+        self.assertEqual(set(list(session.joint_with_groups.all())), set([group3, group4]))
+
+    def test_submit_request_check_constraints(self):
+        m1 = MeetingFactory(type_id='ietf', date=date_today() - datetime.timedelta(days=100))
+        MeetingFactory(type_id='ietf', date=date_today(),
+                       group_conflicts=['chair_conflict', 'conflic2', 'conflic3'])
+        ad = Person.objects.get(user__username='ad')
+        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
+        group = GroupFactory(parent=area)
+        still_active_group = GroupFactory(parent=area)
+        Constraint.objects.create(
+            meeting=m1,
+            source=group,
+            target=still_active_group,
+            name_id='chair_conflict',
+        )
+        inactive_group = GroupFactory(parent=area, state_id='conclude')
+        inactive_group.save()
+        Constraint.objects.create(
+            meeting=m1,
+            source=group,
+            target=inactive_group,
+            name_id='chair_conflict',
+        )
+        session = SessionFactory(group=group, meeting=m1)
+
+        self.client.login(username="secretary", password="secretary+password")
+
+        url = reverse('ietf.meeting.views_session_request.new_request', kwargs={'acronym': group.acronym})
+        r = self.client.get(url + '?previous')
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        conflict1 = q('[name="constraint_chair_conflict"]').val()
+        self.assertIn(still_active_group.acronym, conflict1)
+        self.assertNotIn(inactive_group.acronym, conflict1)
+
+        attendees = '10'
+        comments = 'need projector'
+        post_data = {'num_session': '1',
+                     'attendees': attendees,
+                     'constraint_chair_conflict': group.acronym,
+                     'comments': comments,
+                     'session_set-TOTAL_FORMS': '3',
+                     'session_set-INITIAL_FORMS': '1',
+                     'session_set-MIN_NUM_FORMS': '1',
+                     'session_set-MAX_NUM_FORMS': '3',
+                     # no 'session_set-0-id' to create a new session
+                     'session_set-0-name': '',
+                     'session_set-0-short': '',
+                     'session_set-0-purpose': session.purpose_id,
+                     'session_set-0-type': session.type_id,
+                     'session_set-0-requested_duration': '3600',
+                     'session_set-0-on_agenda': session.on_agenda,
+                     'session_set-0-remote_instructions': session.remote_instructions,
+                     'session_set-0-attendees': attendees,
+                     'session_set-0-comments': comments,
+                     'session_set-0-DELETE': '',
+                     'session_set-1-name': '',
+                     'session_set-1-short': '',
+                     'session_set-1-purpose': session.purpose_id,
+                     'session_set-1-type': session.type_id,
+                     'session_set-1-requested_duration': '',
+                     'session_set-1-on_agenda': session.on_agenda,
+                     'session_set-1-remote_instructions': '',
+                     'session_set-1-attendees': attendees,
+                     'session_set-1-comments': '',
+                     'session_set-1-DELETE': 'on',
+                     'session_set-2-name': '',
+                     'session_set-2-short': '',
+                     'session_set-2-purpose': session.purpose_id,
+                     'session_set-2-type': session.type_id,
+                     'session_set-2-requested_duration': '',
+                     'session_set-2-on_agenda': session.on_agenda,
+                     'session_set-2-remote_instructions': '',
+                     'session_set-2-attendees': attendees,
+                     'session_set-2-comments': '',
+                     'session_set-2-DELETE': 'on',
+                     'submit': 'Continue'}
+        r = self.client.post(url, post_data)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('#session-request-form')), 1)
+        self.assertContains(r, "Cannot declare a conflict with the same group")
+
+    def test_request_notification(self):
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        ad = Person.objects.get(user__username='ad')
+        area = GroupFactory(type_id='area')
+        RoleFactory(name_id='ad', person=ad, group=area)
+        group = GroupFactory(acronym='ames', parent=area)
+        group2 = GroupFactory(acronym='ames2', parent=area)
+        group3 = GroupFactory(acronym='ames2', parent=area)
+        group4 = GroupFactory(acronym='ames3', parent=area)
+        RoleFactory(name_id='chair', group=group, person__user__username='ameschairman')
+        resource = ResourceAssociation.objects.create(name_id='project')
+        # Bit of a test data hack - the fixture now has no used resources to pick from
+        resource.name.used = True
+        resource.name.save()
+
+        url = reverse('ietf.meeting.views_session_request.new_request', kwargs={'acronym': group.acronym})
+        confirm_url = reverse('ietf.meeting.views_session_request.confirm', kwargs={'acronym': group.acronym})
+        len_before = len(outbox)
+        attendees = '10'
+        post_data = {'num_session': '2',
+                     'attendees': attendees,
+                     'bethere': str(ad.pk),
+                     'constraint_chair_conflict': group4.acronym,
+                     'comments': '',
+                     'resources': resource.pk,
+                     'session_time_relation': 'subsequent-days',
+                     'adjacent_with_wg': group2.acronym,
+                     'joint_with_groups': group3.acronym,
+                     'joint_for_session': '2',
+                     'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
+                     'session_set-TOTAL_FORMS': '2',
+                     'session_set-INITIAL_FORMS': '0',
+                     'session_set-MIN_NUM_FORMS': '1',
+                     'session_set-MAX_NUM_FORMS': '3',
+                     # no 'session_set-0-id' for new session
+                     'session_set-0-name': '',
+                     'session_set-0-short': '',
+                     'session_set-0-purpose': 'regular',
+                     'session_set-0-type': 'regular',
+                     'session_set-0-requested_duration': '3600',
+                     'session_set-0-on_agenda': True,
+                     'session_set-0-remote_instructions': '',
+                     'session_set-0-attendees': attendees,
+                     'session_set-0-comments': '',
+                     'session_set-0-DELETE': '',
+                     # no 'session_set-1-id' for new session
+                     'session_set-1-name': '',
+                     'session_set-1-short': '',
+                     'session_set-1-purpose': 'regular',
+                     'session_set-1-type': 'regular',
+                     'session_set-1-requested_duration': '3600',
+                     'session_set-1-on_agenda': True,
+                     'session_set-1-remote_instructions': '',
+                     'session_set-1-attendees': attendees,
+                     'session_set-1-comments': '',
+                     'session_set-1-DELETE': '',
+                     'submit': 'Continue'}
+        self.client.login(username="ameschairman", password="ameschairman+password")
+        # submit
+        r = self.client.post(url, post_data)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue('Confirm' in str(q("title")), r.context['form'].errors)
+        # confirm
+        post_data['submit'] = 'Submit'
+        r = self.client.post(confirm_url, post_data)
+        self.assertRedirects(r, reverse('ietf.meeting.views_session_request.list_view'))
+        self.assertEqual(len(outbox), len_before + 1)
+        notification = outbox[-1]
+        notification_payload = get_payload_text(notification)
+        sessions = Session.objects.filter(meeting=meeting, group=group)
+        self.assertEqual(len(sessions), 2)
+        session = sessions[0]
+
+        self.assertEqual(session.resources.count(), 1)
+        self.assertEqual(session.people_constraints.count(), 1)
+        self.assertEqual(session.constraints().get(name='time_relation').time_relation, 'subsequent-days')
+        self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
+        self.assertEqual(
+            list(session.constraints().get(name='timerange').timeranges.all().values('name')),
+            list(TimerangeName.objects.filter(name__in=['thursday-afternoon-early', 'thursday-afternoon-late']).values('name'))
+        )
+        resource = session.resources.first()
+        self.assertTrue(resource.desc in notification_payload)
+        self.assertTrue('Schedule the sessions on subsequent days' in notification_payload)
+        self.assertTrue(group2.acronym in notification_payload)
+        self.assertTrue("Can't meet: Thursday early afternoon, Thursday late" in notification_payload)
+        self.assertTrue('Second session joint with: {}'.format(group3.acronym) in notification_payload)
+        self.assertTrue(ad.ascii_name() in notification_payload)
+        self.assertIn(ConstraintName.objects.get(slug='chair_conflict').name, notification_payload)
+        self.assertIn(group.acronym, notification_payload)
+        self.assertIn('1 Hour, 1 Hour', notification_payload)
+        self.assertNotIn('1 Hour, 1 Hour, 1 Hour', notification_payload)
+        self.assertNotIn('The third session requires your approval', notification_payload)
+
+    def test_request_notification_msg(self):
+        to = "<iesg-secretary@ietf.org>"
+        subject = "Dummy subject"
+        template = "meeting/session_request_notification.txt"
+        header = "A new"
+        meeting = MeetingFactory(type_id="ietf", date=date_today())
+        requester = PersonFactory(name="James O'Rourke", user__username="jimorourke")
+        context = {"header": header, "meeting": meeting, "requester": requester}
+        cc = "cc.a@example.com, cc.b@example.com"
+        bcc = "bcc@example.com"
+
+        msg = send_mail(
+            None,
+            to,
+            None,
+            subject,
+            template,
+            context,
+            cc=cc,
+            bcc=bcc,
+        )
+        self.assertEqual(requester.name, "James O'Rourke")  # note ' (single quote) in the name
+        self.assertIn(
+            f"{header} meeting session request has just been submitted by {requester.name}.",
+            get_payload_text(msg),
+        )
+
+    def test_request_notification_third_session(self):
+        meeting = MeetingFactory(type_id='ietf', date=date_today())
+        ad = Person.objects.get(user__username='ad')
+        area = GroupFactory(type_id='area')
+        RoleFactory(name_id='ad', person=ad, group=area)
+        group = GroupFactory(acronym='ames', parent=area)
+        group2 = GroupFactory(acronym='ames2', parent=area)
+        group3 = GroupFactory(acronym='ames2', parent=area)
+        group4 = GroupFactory(acronym='ames3', parent=area)
+        RoleFactory(name_id='chair', group=group, person__user__username='ameschairman')
+        resource = ResourceAssociation.objects.create(name_id='project')
+        # Bit of a test data hack - the fixture now has no used resources to pick from
+        resource.name.used = True
+        resource.name.save()
+
+        url = reverse('ietf.meeting.views_session_request.new_request', kwargs={'acronym': group.acronym})
+        confirm_url = reverse('ietf.meeting.views_session_request.confirm', kwargs={'acronym': group.acronym})
+        len_before = len(outbox)
+        attendees = '10'
+        post_data = {'num_session': '2',
+                     'third_session': 'true',
+                     'attendees': attendees,
+                     'bethere': str(ad.pk),
+                     'constraint_chair_conflict': group4.acronym,
+                     'comments': '',
+                     'resources': resource.pk,
+                     'session_time_relation': 'subsequent-days',
+                     'adjacent_with_wg': group2.acronym,
+                     'joint_with_groups': group3.acronym,
+                     'joint_for_session': '2',
+                     'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
+                     'session_set-TOTAL_FORMS': '3',
+                     'session_set-INITIAL_FORMS': '0',
+                     'session_set-MIN_NUM_FORMS': '1',
+                     'session_set-MAX_NUM_FORMS': '3',
+                     # no 'session_set-0-id' for new session
+                     'session_set-0-name': '',
+                     'session_set-0-short': '',
+                     'session_set-0-purpose': 'regular',
+                     'session_set-0-type': 'regular',
+                     'session_set-0-requested_duration': '3600',
+                     'session_set-0-on_agenda': True,
+                     'session_set-0-remote_instructions': '',
+                     'session_set-0-attendees': attendees,
+                     'session_set-0-comments': '',
+                     'session_set-0-DELETE': '',
+                     # no 'session_set-1-id' for new session
+                     'session_set-1-name': '',
+                     'session_set-1-short': '',
+                     'session_set-1-purpose': 'regular',
+                     'session_set-1-type': 'regular',
+                     'session_set-1-requested_duration': '3600',
+                     'session_set-1-on_agenda': True,
+                     'session_set-1-remote_instructions': '',
+                     'session_set-1-attendees': attendees,
+                     'session_set-1-comments': '',
+                     'session_set-1-DELETE': '',
+                     # no 'session_set-2-id' for new session
+                     'session_set-2-name': '',
+                     'session_set-2-short': '',
+                     'session_set-2-purpose': 'regular',
+                     'session_set-2-type': 'regular',
+                     'session_set-2-requested_duration': '3600',
+                     'session_set-2-on_agenda': True,
+                     'session_set-2-remote_instructions': '',
+                     'session_set-2-attendees': attendees,
+                     'session_set-2-comments': '',
+                     'session_set-2-DELETE': '',
+                     'submit': 'Continue'}
+        self.client.login(username="ameschairman", password="ameschairman+password")
+        # submit
+        r = self.client.post(url, post_data)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue('Confirm' in str(q("title")), r.context['form'].errors)
+        # confirm
+        post_data['submit'] = 'Submit'
+        r = self.client.post(confirm_url, post_data)
+        self.assertRedirects(r, reverse('ietf.meeting.views_session_request.list_view'))
+        self.assertEqual(len(outbox), len_before + 1)
+        notification = outbox[-1]
+        notification_payload = get_payload_text(notification)
+        sessions = Session.objects.filter(meeting=meeting, group=group)
+        self.assertEqual(len(sessions), 3)
+        session = sessions[0]
+
+        self.assertEqual(session.resources.count(), 1)
+        self.assertEqual(session.people_constraints.count(), 1)
+        self.assertEqual(session.constraints().get(name='time_relation').time_relation, 'subsequent-days')
+        self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
+        self.assertEqual(
+            list(session.constraints().get(name='timerange').timeranges.all().values('name')),
+            list(TimerangeName.objects.filter(name__in=['thursday-afternoon-early', 'thursday-afternoon-late']).values('name'))
+        )
+        resource = session.resources.first()
+        self.assertTrue(resource.desc in notification_payload)
+        self.assertTrue('Schedule the sessions on subsequent days' in notification_payload)
+        self.assertTrue(group2.acronym in notification_payload)
+        self.assertTrue("Can't meet: Thursday early afternoon, Thursday late" in notification_payload)
+        self.assertTrue('Second session joint with: {}'.format(group3.acronym) in notification_payload)
+        self.assertTrue(ad.ascii_name() in notification_payload)
+        self.assertIn(ConstraintName.objects.get(slug='chair_conflict').name, notification_payload)
+        self.assertIn(group.acronym, notification_payload)
+        self.assertIn('1 Hour, 1 Hour, 1 Hour', notification_payload)
+        self.assertIn('The third session requires your approval', notification_payload)
+
+
+class LockAppTestCase(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.meeting = MeetingFactory(type_id='ietf', date=date_today(), session_request_lock_message='locked')
+        self.group = GroupFactory(acronym='mars')
+        RoleFactory(name_id='chair', group=self.group, person__user__username='marschairman')
+        SessionFactory(group=self.group, meeting=self.meeting)
+
+    def test_edit_request(self):
+        url = reverse('ietf.meeting.views_session_request.edit_request', kwargs={'acronym': self.group.acronym})
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q(':disabled[name="submit"]')), 0)
+        chair = self.group.role_set.filter(name_id='chair').first().person.user.username
+        self.client.login(username=chair, password=f'{chair}+password')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q(':disabled[name="submit"]')), 1)
+
+    def test_view_request(self):
+        url = reverse('ietf.meeting.views_session_request.view_request', kwargs={'acronym': self.group.acronym})
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url, follow=True)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q(':enabled[name="edit"]')), 1)  # secretary can edit
+        chair = self.group.role_set.filter(name_id='chair').first().person.user.username
+        self.client.login(username=chair, password=f'{chair}+password')
+        r = self.client.get(url, follow=True)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q(':disabled[name="edit"]')), 1)  # chair cannot edit
+
+    def test_new_request(self):
+        url = reverse('ietf.meeting.views_session_request.new_request', kwargs={'acronym': self.group.acronym})
+
+        # try as WG Chair
+        self.client.login(username="marschairman", password="marschairman+password")
+        r = self.client.get(url, follow=True)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('#session-request-form')), 0)
+
+        # try as Secretariat
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url, follow=True)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('#session-request-form')), 1)
+
+
+class NotMeetingCase(TestCase):
+    def test_not_meeting(self):
+        MeetingFactory(type_id='ietf', date=date_today())
+        group = GroupFactory(acronym='mars')
+        url = reverse('ietf.meeting.views_session_request.no_session', kwargs={'acronym': group.acronym})
+        self.client.login(username="secretary", password="secretary+password")
+
+        empty_outbox()
+
+        r = self.client.get(url, follow=True)
+        # If the view invoked by that get throws an exception (such as an integrity error),
+        # the traceback from this test will talk about a TransactionManagementError and
+        # yell about executing queries before the end of an 'atomic' block
+
+        # This is a sign of a problem - a get shouldn't have a side-effect like this one does
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, 'A message was sent to notify not having a session')
+
+        r = self.client.get(url, follow=True)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, 'is already marked as not meeting')
+
+        self.assertEqual(len(outbox), 1)
+        self.assertTrue('Not having a session' in outbox[0]['Subject'])
+        self.assertTrue('session-request@' in outbox[0]['To'])
+
+
+class RetrievePreviousCase(TestCase):
+    pass
+
+    # test error if already scheduled
+    # test get previous exists/doesn't exist
+    # test that groups scheduled and unscheduled add up to total groups
+    # test access by unauthorized
+
+
+class SessionRequestFormTest(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.meeting = MeetingFactory(type_id='ietf')
+        self.group1 = GroupFactory()
+        self.group2 = GroupFactory()
+        self.group3 = GroupFactory()
+        self.group4 = GroupFactory()
+        self.group5 = GroupFactory()
+        self.group6 = GroupFactory()
+
+        attendees = '10'
+        comments = 'need lights'
+        self.valid_form_data = {
+            'num_session': '2',
+            'third_session': 'true',
+            'attendees': attendees,
+            'constraint_chair_conflict': self.group2.acronym,
+            'constraint_tech_overlap': self.group3.acronym,
+            'constraint_key_participant': self.group4.acronym,
+            'comments': comments,
+            'session_time_relation': 'subsequent-days',
+            'adjacent_with_wg': self.group5.acronym,
+            'joint_with_groups': self.group6.acronym,
+            'joint_for_session': '3',
+            'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
+            'submit': 'Continue',
+            'session_set-TOTAL_FORMS': '3',
+            'session_set-INITIAL_FORMS': '0',
+            'session_set-MIN_NUM_FORMS': '1',
+            'session_set-MAX_NUM_FORMS': '3',
+            # no 'session_set-0-id' for new session
+            'session_set-0-name': '',
+            'session_set-0-short': '',
+            'session_set-0-purpose': 'regular',
+            'session_set-0-type': 'regular',
+            'session_set-0-requested_duration': '3600',
+            'session_set-0-on_agenda': True,
+            'session_set-0-remote_instructions': '',
+            'session_set-0-attendees': attendees,
+            'session_set-0-comments': '',
+            'session_set-0-DELETE': '',
+            # no 'session_set-1-id' for new session
+            'session_set-1-name': '',
+            'session_set-1-short': '',
+            'session_set-1-purpose': 'regular',
+            'session_set-1-type': 'regular',
+            'session_set-1-requested_duration': '3600',
+            'session_set-1-on_agenda': True,
+            'session_set-1-remote_instructions': '',
+            'session_set-1-attendees': attendees,
+            'session_set-1-comments': '',
+            'session_set-1-DELETE': '',
+            # no 'session_set-2-id' for new session
+            'session_set-2-name': '',
+            'session_set-2-short': '',
+            'session_set-2-purpose': 'regular',
+            'session_set-2-type': 'regular',
+            'session_set-2-requested_duration': '3600',
+            'session_set-2-on_agenda': True,
+            'session_set-2-remote_instructions': '',
+            'session_set-2-attendees': attendees,
+            'session_set-2-comments': '',
+            'session_set-2-DELETE': '',
+        }
+
+    def test_valid(self):
+        # Test with three sessions
+        form = SessionRequestForm(data=self.valid_form_data, group=self.group1, meeting=self.meeting)
+        self.assertTrue(form.is_valid())
+
+        # Test with two sessions
+        self.valid_form_data.update({
+            'third_session': '',
+            'session_set-TOTAL_FORMS': '2',
+            'joint_for_session': '2'
+        })
+        form = SessionRequestForm(data=self.valid_form_data, group=self.group1, meeting=self.meeting)
+        self.assertTrue(form.is_valid())
+
+        # Test with one session
+        self.valid_form_data.update({
+            'num_session': 1,
+            'session_set-TOTAL_FORMS': '1',
+            'joint_for_session': '1',
+            'session_time_relation': '',
+        })
+        form = SessionRequestForm(data=self.valid_form_data, group=self.group1, meeting=self.meeting)
+        self.assertTrue(form.is_valid())
+
+    def test_invalid_groups(self):
+        new_form_data = {
+            'constraint_chair_conflict': 'doesnotexist',
+            'constraint_tech_overlap': 'doesnotexist',
+            'constraint_key_participant': 'doesnotexist',
+            'adjacent_with_wg': 'doesnotexist',
+            'joint_with_groups': 'doesnotexist',
+        }
+        form = self._invalid_test_helper(new_form_data)
+        self.assertEqual(set(form.errors.keys()), set(new_form_data.keys()))
+
+    def test_valid_group_appears_in_multiple_conflicts(self):
+        """Some conflict types allow overlapping groups"""
+        new_form_data = {
+            'constraint_chair_conflict': self.group2.acronym,
+            'constraint_tech_overlap': self.group2.acronym,
+        }
+        self.valid_form_data.update(new_form_data)
+        form = SessionRequestForm(data=self.valid_form_data, group=self.group1, meeting=self.meeting)
+        self.assertTrue(form.is_valid())
+
+    def test_invalid_group_appears_in_multiple_conflicts(self):
+        """Some conflict types do not allow overlapping groups"""
+        self.meeting.group_conflict_types.clear()
+        self.meeting.group_conflict_types.add(ConstraintName.objects.get(slug='conflict'))
+        self.meeting.group_conflict_types.add(ConstraintName.objects.get(slug='conflic2'))
+        new_form_data = {
+            'constraint_conflict': self.group2.acronym,
+            'constraint_conflic2': self.group2.acronym,
+        }
+        form = self._invalid_test_helper(new_form_data)
+        self.assertEqual(form.non_field_errors(), ['%s appears in conflicts more than once' % self.group2.acronym])
+
+    def test_invalid_conflict_with_self(self):
+        new_form_data = {
+            'constraint_chair_conflict': self.group1.acronym,
+        }
+        self._invalid_test_helper(new_form_data)
+
+    def test_invalid_session_time_relation(self):
+        form = self._invalid_test_helper({
+            'third_session': '',
+            'session_set-TOTAL_FORMS': 1,
+            'num_session': 1,
+            'joint_for_session': '1',
+        })
+        self.assertEqual(form.errors,
+                         {
+                             'session_time_relation': ['Time between sessions can only be used when two '
+                                                       'sessions are requested.']
+                         })
+
+    def test_invalid_joint_for_session(self):
+        form = self._invalid_test_helper({
+            'third_session': '',
+            'session_set-TOTAL_FORMS': '2',
+            'num_session': 2,
+            'joint_for_session': '3',
+        })
+        self.assertEqual(form.errors,
+                         {
+                             'joint_for_session': [
+                                 'Session 3 can not be the joint session, the session has not been requested.']
+                         })
+
+        form = self._invalid_test_helper({
+            'third_session': '',
+            'session_set-TOTAL_FORMS': '1',
+            'num_session': 1,
+            'joint_for_session': '2',
+            'session_time_relation': '',
+        })
+        self.assertEqual(form.errors,
+                         {
+                             'joint_for_session': [
+                                 'Session 2 can not be the joint session, the session has not been requested.']
+                         })
+
+    def test_invalid_missing_session_length(self):
+        form = self._invalid_test_helper({
+            'session_set-TOTAL_FORMS': '2',
+            'session_set-1-requested_duration': '',
+            'third_session': 'false',
+            'joint_for_session': None,
+        })
+        self.assertEqual(form.session_forms.errors,
+                         [
+                             {},
+                             {'requested_duration': ['This field is required.']},
+                         ])
+
+        form = self._invalid_test_helper({
+            'session_set-1-requested_duration': '',
+            'session_set-2-requested_duration': '',
+            'joint_for_session': None,
+        })
+        self.assertEqual(
+            form.session_forms.errors,
+            [
+                {},
+                {'requested_duration': ['This field is required.']},
+                {'requested_duration': ['This field is required.']},
+            ])
+
+        form = self._invalid_test_helper({
+            'session_set-2-requested_duration': '',
+            'joint_for_session': None,
+        })
+        self.assertEqual(form.session_forms.errors,
+                         [
+                             {},
+                             {},
+                             {'requested_duration': ['This field is required.']},
+                         ])
+
+    def _invalid_test_helper(self, new_form_data):
+        form_data = dict(self.valid_form_data, **new_form_data)
+        form = SessionRequestForm(data=form_data, group=self.group1, meeting=self.meeting)
+        self.assertFalse(form.is_valid())
+        return form
diff --git a/ietf/meeting/tests_tasks.py b/ietf/meeting/tests_tasks.py
new file mode 100644
index 0000000000..2c5120a39d
--- /dev/null
+++ b/ietf/meeting/tests_tasks.py
@@ -0,0 +1,121 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+import datetime
+from unittest.mock import patch, call
+from ietf.utils.test_utils import TestCase
+from ietf.utils.timezone import date_today
+from .factories import MeetingFactory
+from .tasks import (
+    proceedings_content_refresh_task,
+    agenda_data_refresh_task,
+    agenda_data_refresh_all_task,
+)
+from .tasks import fetch_meeting_attendance_task
+
+
+class TaskTests(TestCase):
+    @patch("ietf.meeting.tasks.generate_agenda_data")
+    def test_agenda_data_refresh_task(self, mock_generate):
+        agenda_data_refresh_task()
+        self.assertTrue(mock_generate.called)
+        self.assertEqual(mock_generate.call_args, call(None, force_refresh=True))
+        
+        mock_generate.reset_mock()
+        mock_generate.side_effect = RuntimeError
+        try:
+            agenda_data_refresh_task()
+        except Exception as err:
+            self.fail(
+                f"agenda_data_refresh_task should not raise exceptions (got {repr(err)})"
+            )
+
+    @patch("ietf.meeting.tasks.agenda_data_refresh_task")
+    @patch("ietf.meeting.tasks.chain")
+    def test_agenda_data_refresh_all_task(self, mock_chain, mock_agenda_data_refresh):
+        # Patch the agenda_data_refresh_task task with a mock whose `.map` attribute
+        # converts its argument, which is expected to be an iterator,  to a list
+        # and returns it. We'll use this to check that the expected task chain
+        # was set up, but we don't actually run any celery tasks.
+        mock_agenda_data_refresh.map.side_effect = lambda x: list(x)
+
+        meetings = MeetingFactory.create_batch(5, type_id="ietf")
+        numbers = sorted(int(m.number) for m in meetings)
+        agenda_data_refresh_all_task(batch_size=2)
+        self.assertTrue(mock_chain.called)
+        # The lists in the call() below are the output of the lambda we patched in
+        # via mock_agenda_data_refresh.map.side_effect above. I.e., this tests that
+        # map() was called with the correct batched data.
+        self.assertEqual(
+            mock_chain.call_args,
+            call(
+                [numbers[0], numbers[1]],
+                [numbers[2], numbers[3]],
+                [numbers[4]],
+            ),
+        )
+        self.assertEqual(mock_agenda_data_refresh.call_count, 0)
+        self.assertEqual(mock_agenda_data_refresh.map.call_count, 3)
+
+    @patch("ietf.meeting.tasks.generate_proceedings_content")
+    def test_proceedings_content_refresh_task(self, mock_generate):
+        # Generate a couple of meetings
+        meeting120 = MeetingFactory(type_id="ietf", number="120")  # 24 * 5
+        meeting127 = MeetingFactory(type_id="ietf", number="127")  # 24 * 5 + 7
+
+        # Times to be returned
+        now_utc = datetime.datetime.now(tz=datetime.UTC)
+        hour_00_utc = now_utc.replace(hour=0)
+        hour_01_utc = now_utc.replace(hour=1)
+        hour_07_utc = now_utc.replace(hour=7)
+
+        # hour 00 - should call meeting with number % 24 == 0
+        with patch("ietf.meeting.tasks.timezone.now", return_value=hour_00_utc):
+            proceedings_content_refresh_task()
+        self.assertEqual(mock_generate.call_count, 1)
+        self.assertEqual(mock_generate.call_args, call(meeting120, force_refresh=True))
+        mock_generate.reset_mock()
+
+        # hour 01 - should call no meetings
+        with patch("ietf.meeting.tasks.timezone.now", return_value=hour_01_utc):
+            proceedings_content_refresh_task()
+        self.assertEqual(mock_generate.call_count, 0)
+
+        # hour 07 - should call meeting with number % 24 == 0
+        with patch("ietf.meeting.tasks.timezone.now", return_value=hour_07_utc):
+            proceedings_content_refresh_task()
+        self.assertEqual(mock_generate.call_count, 1)
+        self.assertEqual(mock_generate.call_args, call(meeting127, force_refresh=True))
+        mock_generate.reset_mock()
+
+        # With all=True, all should be called regardless of time. Reuse hour_01_utc which called none before
+        with patch("ietf.meeting.tasks.timezone.now", return_value=hour_01_utc):
+            proceedings_content_refresh_task(all=True)
+        self.assertEqual(mock_generate.call_count, 2)
+
+    @patch("ietf.meeting.tasks.fetch_attendance_from_meetings")
+    def test_fetch_meeting_attendance_task(self, mock_fetch_attendance):
+        today = date_today()
+        meetings = [
+            MeetingFactory(type_id="ietf", date=today - datetime.timedelta(days=1)),
+            MeetingFactory(type_id="ietf", date=today - datetime.timedelta(days=2)),
+            MeetingFactory(type_id="ietf", date=today - datetime.timedelta(days=3)),
+        ]
+        data = {
+            "created": 1,
+            "updated": 2,
+            "deleted": 0,
+            "processed": 3,
+        }
+
+        mock_fetch_attendance.return_value = [data, data]
+
+        fetch_meeting_attendance_task()
+        self.assertEqual(mock_fetch_attendance.call_count, 1)
+        self.assertCountEqual(mock_fetch_attendance.call_args[0][0], meetings[0:2])
+
+        # test handling of RuntimeError
+        mock_fetch_attendance.reset_mock()
+        mock_fetch_attendance.side_effect = RuntimeError
+        fetch_meeting_attendance_task()
+        self.assertTrue(mock_fetch_attendance.called)
+        # Good enough that we got here without raising an exception
diff --git a/ietf/meeting/tests_utils.py b/ietf/meeting/tests_utils.py
new file mode 100644
index 0000000000..7dd8f435e1
--- /dev/null
+++ b/ietf/meeting/tests_utils.py
@@ -0,0 +1,309 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+import copy
+import datetime
+import debug  # pyflakes: ignore
+import json
+import jsonschema
+from json import JSONDecodeError
+from unittest.mock import patch, Mock
+
+from django.http import HttpResponse, JsonResponse
+from ietf.meeting.factories import MeetingFactory, RegistrationFactory, RegistrationTicketFactory
+from ietf.meeting.models import Registration
+from ietf.meeting.utils import (
+    process_single_registration,
+    get_registration_data, 
+    sync_registration_data, 
+    fetch_attendance_from_meetings, 
+    get_activity_stats
+)
+from ietf.nomcom.models import Volunteer
+from ietf.nomcom.factories import NomComFactory, nomcom_kwargs_for_year
+from ietf.person.factories import PersonFactory
+from ietf.utils.test_utils import TestCase
+from ietf.meeting.test_data import make_meeting_test_data
+from ietf.doc.factories import NewRevisionDocEventFactory, DocEventFactory
+
+
+class JsonResponseWithJson(JsonResponse):
+    def json(self):
+        return json.loads(self.content)
+
+
+class ActivityStatsTests(TestCase):
+
+    def test_activity_stats(self):
+        utc = datetime.timezone.utc
+        make_meeting_test_data()
+        sdate = datetime.date(2016,4,3)
+        edate = datetime.date(2016,7,14)
+        MeetingFactory(type_id='ietf', date=sdate, number="96")
+        MeetingFactory(type_id='ietf', date=edate, number="97")
+
+        NewRevisionDocEventFactory(time=datetime.datetime(2016,4,5,12,0,0,0,tzinfo=utc))
+        NewRevisionDocEventFactory(time=datetime.datetime(2016,4,6,12,0,0,0,tzinfo=utc))
+        NewRevisionDocEventFactory(time=datetime.datetime(2016,4,7,12,0,0,0,tzinfo=utc))
+
+        NewRevisionDocEventFactory(time=datetime.datetime(2016,6,30,12,0,0,0,tzinfo=utc))
+        NewRevisionDocEventFactory(time=datetime.datetime(2016,6,30,13,0,0,0,tzinfo=utc))
+
+        DocEventFactory(doc__std_level_id="ps", doc__type_id="rfc", type="published_rfc", time=datetime.datetime(2016,4,5,12,0,0,0,tzinfo=utc))
+        DocEventFactory(doc__std_level_id="bcp", doc__type_id="rfc", type="published_rfc", time=datetime.datetime(2016,4,6,12,0,0,0,tzinfo=utc))
+        DocEventFactory(doc__std_level_id="inf", doc__type_id="rfc", type="published_rfc", time=datetime.datetime(2016,4,7,12,0,0,0,tzinfo=utc))
+        DocEventFactory(doc__std_level_id="exp", doc__type_id="rfc", type="published_rfc", time=datetime.datetime(2016,4,8,12,0,0,0,tzinfo=utc))
+
+        data = get_activity_stats(sdate, edate)
+        self.assertEqual(data['new_drafts_count'], len(data['new_docs']))
+        self.assertEqual(data['ffw_new_count'], 2)
+        self.assertEqual(data['ffw_new_percent'], '40%')
+        rfc_count = 0
+        for c in data['counts']:
+            rfc_count += data['counts'].get(c)
+        self.assertEqual(rfc_count, len(data['rfcs']))
+
+
+class GetRegistrationsTests(TestCase):
+
+    @patch('ietf.meeting.utils.requests.get')
+    def test_get_registation_data(self, mock_get):
+        meeting = MeetingFactory(type_id='ietf', number='122')
+        person = PersonFactory()
+        reg_details = dict(
+            first_name=person.first_name(),
+            last_name=person.last_name(),
+            email=person.email().address,
+            affiliation='Microsoft',
+            country_code='US',
+            meeting=meeting.number,
+            checkedin=True,
+            is_nomcom_volunteer=False,
+            cancelled=False,
+            tickets=[{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}],
+        )
+        reg_data = {'objects': {person.email().address: reg_details}}
+        reg_data_bad = copy.deepcopy(reg_data)
+        del reg_data_bad['objects'][person.email().address]['email']
+        response1 = HttpResponse('Invalid apikey', status=403)
+        response2 = JsonResponseWithJson(reg_data)
+        response3 = Mock()
+        response3.status_code = 200
+        response3.json.side_effect = JSONDecodeError("Expecting value", doc="", pos=0)
+        response4 = JsonResponseWithJson(reg_data_bad)
+        mock_get.side_effect = [response1, response2, response3, response4]
+        # test status 403
+        with self.assertRaises(Exception):
+            get_registration_data(meeting)
+        # test status 200 good
+        returned_data = get_registration_data(meeting)
+        self.assertEqual(returned_data, reg_data)
+        # test decode error
+        with self.assertRaises(ValueError):
+            get_registration_data(meeting)
+        # test validation error
+        with self.assertRaises(jsonschema.exceptions.ValidationError):
+            get_registration_data(meeting)
+
+    @patch('ietf.meeting.utils.get_registration_data')
+    def test_sync_registation_data(self, mock_get):
+        meeting = MeetingFactory(type_id='ietf', number='122')
+        person1 = PersonFactory()
+        person2 = PersonFactory()
+        items = []
+        for person in [person1, person2]:
+            items.append(dict(
+                first_name=person.first_name(),
+                last_name=person.last_name(),
+                email=person.email().address,
+                affiliation='Microsoft',
+                country_code='US',
+                meeting=meeting.number,
+                checkedin=True,
+                is_nomcom_volunteer=False,
+                cancelled=False,
+                tickets=[{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}],
+            ))
+        reg_data = {'objects': {items[0]['email']: items[0], items[1]['email']: items[1]}}
+        mock_get.return_value = reg_data
+        self.assertEqual(Registration.objects.filter(meeting=meeting).count(), 0)
+        stats = sync_registration_data(meeting)
+        self.assertEqual(Registration.objects.filter(meeting=meeting).count(), 2)
+        self.assertEqual(stats['created'], 2)
+        # test idempotent
+        stats = sync_registration_data(meeting)
+        self.assertEqual(Registration.objects.filter(meeting=meeting).count(), 2)
+        self.assertEqual(stats['created'], 0)
+        # test delete cancelled registration
+        del reg_data['objects'][items[1]['email']]
+        stats = sync_registration_data(meeting)
+        self.assertEqual(Registration.objects.filter(meeting=meeting).count(), 1)
+        self.assertEqual(stats['deleted'], 1)
+
+    def test_process_single_registration(self):
+        # test new registration
+        meeting = MeetingFactory(type_id='ietf', number='122')
+        person = PersonFactory()
+        reg_data = dict(
+            first_name=person.first_name(),
+            last_name=person.last_name(),
+            email=person.email().address,
+            affiliation='Microsoft',
+            country_code='US',
+            meeting=meeting.number,
+            checkedin=True,
+            is_nomcom_volunteer=False,
+            cancelled=False,
+            tickets=[{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}],
+        )
+        self.assertEqual(meeting.registration_set.count(), 0)
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual(meeting.registration_set.count(), 1)
+        reg = meeting.registration_set.first()
+        self.assertEqual(new_reg, reg)
+        self.assertEqual(action, 'created')
+        self.assertEqual(reg.first_name, person.first_name())
+        self.assertEqual(reg.last_name, person.last_name())
+        self.assertEqual(reg.email, person.email().address)
+        self.assertEqual(reg.affiliation, 'Microsoft')
+        self.assertEqual(reg.meeting, meeting)
+        self.assertEqual(reg.checkedin, True)
+        self.assertEqual(reg.tickets.count(), 1)
+        ticket = reg.tickets.first()
+        self.assertEqual(ticket.attendance_type.slug, 'onsite')
+        self.assertEqual(ticket.ticket_type.slug, 'week_pass')
+
+        # test no change
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual(meeting.registration_set.count(), 1)
+        reg = meeting.registration_set.first()
+        self.assertEqual(new_reg, reg)
+        self.assertEqual(action, None)
+
+        # test update fields
+        reg_data['affiliation'] = 'Cisco'
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual(meeting.registration_set.count(), 1)
+        reg = meeting.registration_set.first()
+        self.assertEqual(new_reg, reg)
+        self.assertEqual(action, 'updated')
+        self.assertEqual(reg.affiliation, 'Cisco')
+
+        # test update tickets
+        reg_data['tickets'] = [{'attendance_type': 'remote', 'ticket_type': 'week_pass'}]
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual(meeting.registration_set.count(), 1)
+        reg = meeting.registration_set.first()
+        self.assertEqual(new_reg, reg)
+        self.assertEqual(action, 'updated')
+        self.assertEqual(reg.tickets.count(), 1)
+        ticket = reg.tickets.first()
+        self.assertEqual(ticket.attendance_type.slug, 'remote')
+
+        # test tickets, two of same
+        reg_data['tickets'] = [
+            {'attendance_type': 'onsite', 'ticket_type': 'one_day'},
+            {'attendance_type': 'onsite', 'ticket_type': 'one_day'},
+            {'attendance_type': 'remote', 'ticket_type': 'week_pass'},
+        ]
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual(meeting.registration_set.count(), 1)
+        reg = meeting.registration_set.first()
+        self.assertEqual(new_reg, reg)
+        self.assertEqual(action, 'updated')
+        self.assertEqual(reg.tickets.count(), 3)
+        self.assertEqual(reg.tickets.filter(attendance_type__slug='onsite', ticket_type__slug='one_day').count(), 2)
+        self.assertEqual(reg.tickets.filter(attendance_type__slug='remote', ticket_type__slug='week_pass').count(), 1)
+
+        # test tickets, two of same, delete one
+        reg_data['tickets'] = [
+            {'attendance_type': 'onsite', 'ticket_type': 'one_day'},
+            {'attendance_type': 'remote', 'ticket_type': 'week_pass'},
+        ]
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual(meeting.registration_set.count(), 1)
+        reg = meeting.registration_set.first()
+        self.assertEqual(new_reg, reg)
+        self.assertEqual(action, 'updated')
+        self.assertEqual(reg.tickets.count(), 2)
+        self.assertEqual(reg.tickets.filter(attendance_type__slug='onsite', ticket_type__slug='one_day').count(), 1)
+        self.assertEqual(reg.tickets.filter(attendance_type__slug='remote', ticket_type__slug='week_pass').count(), 1)
+
+    def test_process_single_registration_nomcom(self):
+        '''Test that Volunteer is created if is_nomcom_volunteer=True'''
+        meeting = MeetingFactory(type_id='ietf', number='122')
+        person = PersonFactory()
+        reg_data = dict(
+            first_name=person.first_name(),
+            last_name=person.last_name(),
+            email=person.email().address,
+            affiliation='Microsoft',
+            country_code='US',
+            meeting=meeting.number,
+            checkedin=True,
+            is_nomcom_volunteer=True,
+            cancelled=False,
+            tickets=[{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}],
+        )
+        now = datetime.datetime.now()
+        if now.month > 10:
+            year = now.year + 1
+        else:
+            year = now.year
+        # create appropriate group and nomcom objects
+        nomcom = NomComFactory.create(is_accepting_volunteers=True, **nomcom_kwargs_for_year(year))
+        # assert no Volunteers exists
+        self.assertEqual(Volunteer.objects.count(), 0)
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual(action, 'created')
+        # assert Volunteer exists
+        self.assertEqual(Volunteer.objects.count(), 1)
+        volunteer = Volunteer.objects.last()
+        self.assertEqual(volunteer.person, person)
+        self.assertEqual(volunteer.nomcom, nomcom)
+        self.assertEqual(volunteer.origin, 'registration')
+
+    def test_process_single_registration_cancelled(self):
+        # test cancelled registration, one of two tickets
+        meeting = MeetingFactory(type_id='ietf', number='122')
+        person = PersonFactory()
+        reg = RegistrationFactory(meeting=meeting, person=person, checkedin=False, with_ticket={'attendance_type_id': 'onsite'})
+        RegistrationTicketFactory(registration=reg, attendance_type_id='remote', ticket_type_id='week_pass')
+        reg_data = dict(
+            first_name=person.first_name(),
+            last_name=person.last_name(),
+            email=person.email().address,
+            affiliation='Microsoft',
+            country_code='US',
+            meeting=meeting.number,
+            checkedin=False,
+            is_nomcom_volunteer=False,
+            cancelled=True,
+            tickets=[{'attendance_type': 'onsite', 'ticket_type': 'week_pass'}],
+        )
+        self.assertEqual(meeting.registration_set.count(), 1)
+        self.assertEqual(reg.tickets.count(), 2)
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual((new_reg, action), (None, 'deleted'))
+        self.assertEqual(meeting.registration_set.count(), 1)
+        self.assertEqual(reg.tickets.count(), 1)
+        self.assertTrue(reg.tickets.filter(attendance_type__slug='remote').exists())
+        # test cancelled registration, last ticket
+        reg_data['tickets'][0]['attendance_type'] = 'remote'
+        new_reg, action = process_single_registration(reg_data, meeting)
+        self.assertEqual((new_reg, action), (None, 'deleted'))
+        self.assertEqual(meeting.registration_set.count(), 0)
+
+    @patch("ietf.meeting.utils.sync_registration_data")
+    def test_fetch_attendance_from_meetings(self, mock_sync_reg_data):
+        mock_meetings = [object(), object(), object()]
+        d1 = dict(created=1, updated=2, deleted=0, processed=3)
+        d2 = dict(created=2, updated=2, deleted=0, processed=4)
+        d3 = dict(created=1, updated=4, deleted=1, processed=5)
+        mock_sync_reg_data.side_effect = (d1, d2, d3)
+        stats = fetch_attendance_from_meetings(mock_meetings)
+        self.assertEqual(
+            [mock_sync_reg_data.call_args_list[n][0][0] for n in range(3)],
+            mock_meetings,
+        )
+        self.assertEqual(stats, [d1, d2, d3])
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 94a52c82b1..17988e50be 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2020, All Rights Reserved
+# Copyright The IETF Trust 2009-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 import datetime
 import io
@@ -12,52 +12,66 @@
 import requests_mock
 
 from unittest import skipIf
-from mock import patch, PropertyMock
+from unittest.mock import call, patch, PropertyMock
 from pyquery import PyQuery
 from lxml.etree import tostring
+from icalendar import Calendar
 from io import StringIO, BytesIO
 from bs4 import BeautifulSoup
 from urllib.parse import urlparse, urlsplit
 from PIL import Image
 from pathlib import Path
 from tempfile import NamedTemporaryFile
+from zoneinfo import ZoneInfo
 
 from django.urls import reverse as urlreverse
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.core.serializers.json import DjangoJSONEncoder
 from django.test import Client, override_settings
 from django.db.models import F, Max
 from django.http import QueryDict, FileResponse
 from django.template import Context, Template
+from django.utils import timezone
+from django.utils.html import escape
+from django.utils.safestring import mark_safe
 from django.utils.text import slugify
-from django.utils.timezone import now
 
 import debug           # pyflakes:ignore
 
-from ietf.doc.models import Document
+from ietf.doc.models import Document, NewRevisionDocEvent
+from ietf.doc.storage_utils import exists_in_storage, remove_from_storage, retrieve_bytes, retrieve_str
 from ietf.group.models import Group, Role, GroupFeatures
 from ietf.group.utils import can_manage_group
 from ietf.person.models import Person
-from ietf.meeting.helpers import can_approve_interim_request, can_view_interim_request
-from ietf.meeting.helpers import send_interim_approval_request
+from ietf.meeting.helpers import can_approve_interim_request, can_request_interim_meeting, can_view_interim_request, preprocess_assignments_for_agenda
+from ietf.meeting.helpers import send_interim_approval_request, AgendaKeywordTagger
 from ietf.meeting.helpers import send_interim_meeting_cancellation_notice, send_interim_session_cancellation_notice
 from ietf.meeting.helpers import send_interim_minutes_reminder, populate_important_dates, update_important_dates
 from ietf.meeting.models import Session, TimeSlot, Meeting, SchedTimeSessAssignment, Schedule, SessionPresentation, SlideSubmission, SchedulingEvent, Room, Constraint, ConstraintName
 from ietf.meeting.test_data import make_meeting_test_data, make_interim_meeting, make_interim_test_data
-from ietf.meeting.utils import finalize, condition_slide_order
-from ietf.meeting.utils import add_event_info_to_session_qs
-from ietf.meeting.views import session_draft_list, parse_agenda_filter_params, sessions_post_save
+from ietf.meeting.utils import (
+    condition_slide_order,
+    generate_proceedings_content,
+    diff_meeting_schedules,
+)
+from ietf.meeting.utils import add_event_info_to_session_qs, participants_for_meeting
+from ietf.meeting.utils import create_recording, delete_recording, get_next_sequence, bluesheet_data
+from ietf.meeting.views import session_draft_list, parse_agenda_filter_params, sessions_post_save, agenda_extract_schedule
+from ietf.meeting.views import get_summary_by_area, get_summary_by_type, get_summary_by_purpose, generate_agenda_data
 from ietf.name.models import SessionStatusName, ImportantDateName, RoleName, ProceedingsMaterialTypeName
-from ietf.utils.decorators import skip_coverage
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
+from ietf.utils.test_runner import TestBlobstoreManager, disable_coverage
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
+from ietf.utils.timezone import date_today, time_now
 
-from ietf.person.factories import PersonFactory
+from ietf.person.factories import PersonFactory, PersonalApiKeyFactory
 from ietf.group.factories import GroupFactory, GroupEventFactory, RoleFactory
-from ietf.meeting.factories import ( SessionFactory, ScheduleFactory,
+from ietf.meeting.factories import (SessionFactory, ScheduleFactory,
     SessionPresentationFactory, MeetingFactory, FloorPlanFactory,
     TimeSlotFactory, SlideSubmissionFactory, RoomFactory,
-    ConstraintFactory, MeetingHostFactory, ProceedingsMaterialFactory )
+    ConstraintFactory, MeetingHostFactory, ProceedingsMaterialFactory,
+    AttendedFactory, RegistrationFactory)
 from ietf.doc.factories import DocumentFactory, WgDraftFactory
 from ietf.submit.tests import submission_file
 from ietf.utils.test_utils import assert_ical_response_is_valid
@@ -104,7 +118,7 @@ def setUp(self):
         # files will upload to the locations specified in settings.py.
         # Note that this will affect any use of the storage class in
         # meeting.models - i.e., FloorPlan.image and MeetingHost.logo
-        self.patcher = patch('ietf.meeting.models.NoLocationMigrationFileSystemStorage.base_location',
+        self.patcher = patch('ietf.meeting.models.BlobShadowFileSystemStorage.base_location',
                              new_callable=PropertyMock)
         mocked = self.patcher.start()
         mocked.return_value = self.storage_dir
@@ -119,15 +133,19 @@ def tearDown(self):
         settings.MEETINGHOST_LOGO_PATH = self.saved_meetinghost_logo_path
         super().tearDown()
 
-    def write_materials_file(self, meeting, doc, content):
-        path = os.path.join(self.materials_dir, "%s/%s/%s" % (meeting.number, doc.type_id, doc.uploaded_filename))
+    def write_materials_file(self, meeting, doc, content, charset="utf-8", with_ext=None):
+        if with_ext is None:
+            filename = doc.uploaded_filename
+        else:
+            filename = Path(doc.uploaded_filename).with_suffix(with_ext)
+        path = os.path.join(self.materials_dir, "%s/%s/%s" % (meeting.number, doc.type_id, filename))
 
         dirname = os.path.dirname(path)
         if not os.path.exists(dirname):
             os.makedirs(dirname)
 
         if isinstance(content, str):
-            content = content.encode()
+            content = content.encode(charset)
         with io.open(path, "wb") as f:
             f.write(content)
 
@@ -145,55 +163,126 @@ def write_materials_files(self, meeting, session):
                                   "This is a slideshow")
 
 
+class AgendaApiTests(TestCase):
+    def test_agenda_extract_schedule_location(self):
+        meeting = MeetingFactory(type_id='ietf')
+        room = RoomFactory(meeting=meeting, floorplan=FloorPlanFactory(meeting=meeting))
+        hidden_ts = TimeSlotFactory(meeting=meeting, location=room, show_location=False)
+        shown_ts = TimeSlotFactory(meeting=meeting, location=room, show_location=True)
+        hidden_sess = SessionFactory(meeting=meeting, add_to_schedule=False)
+        shown_sess = SessionFactory(meeting=meeting, add_to_schedule=False)
+        meeting.schedule.assignments.create(timeslot=hidden_ts, session=hidden_sess)
+        meeting.schedule.assignments.create(timeslot=shown_ts, session=shown_sess)
+        processed = preprocess_assignments_for_agenda(
+            SchedTimeSessAssignment.objects.filter(session__in=[hidden_sess, shown_sess]),
+            meeting
+        )
+        AgendaKeywordTagger(assignments=processed).apply()
+        extracted = {item.session.pk: agenda_extract_schedule(item) for item in processed}
+
+        hidden = extracted[hidden_sess.pk]
+        self.assertIsNone(hidden['room'])
+        self.assertEqual(hidden['location'], {})
+
+        shown = extracted[shown_sess.pk]
+        self.assertEqual(shown['room'], room.name)
+        self.assertEqual(shown['location'], {'name': room.floorplan.name, 'short': room.floorplan.short})
+
+    def test_agenda_extract_schedule_names(self):
+        meeting = MeetingFactory(type_id='ietf')
+        named_timeslots = TimeSlotFactory.create_batch(2, meeting=meeting, name='Timeslot Name')
+        unnamed_timeslots = TimeSlotFactory.create_batch(2, meeting=meeting, name='')
+        named_sessions = SessionFactory.create_batch(2, meeting=meeting, name='Session Name')
+        unnamed_sessions = SessionFactory.create_batch(2, meeting=meeting, name='')
+        pk_with = {
+            'both named': named_sessions[0].timeslotassignments.create(
+                schedule=meeting.schedule,
+                timeslot=named_timeslots[0],
+            ).pk,
+            'session named': named_sessions[1].timeslotassignments.create(
+                schedule=meeting.schedule,
+                timeslot=unnamed_timeslots[0],
+            ).pk,
+            'timeslot named': unnamed_sessions[0].timeslotassignments.create(
+                schedule=meeting.schedule,
+                timeslot=named_timeslots[1],
+            ).pk,
+            'neither named': unnamed_sessions[1].timeslotassignments.create(
+                schedule=meeting.schedule,
+                timeslot=unnamed_timeslots[1],
+            ).pk,
+        }
+        processed = preprocess_assignments_for_agenda(meeting.schedule.assignments.all(), meeting)
+        AgendaKeywordTagger(assignments=processed).apply()
+        extracted = {item.pk: agenda_extract_schedule(item) for item in processed}
+        self.assertEqual(extracted[pk_with['both named']]['name'], 'Session Name')
+        self.assertEqual(extracted[pk_with['both named']]['slotName'], 'Timeslot Name')
+        self.assertEqual(extracted[pk_with['session named']]['name'], 'Session Name')
+        self.assertEqual(extracted[pk_with['session named']]['slotName'], '')
+        self.assertEqual(extracted[pk_with['timeslot named']]['name'], '')
+        self.assertEqual(extracted[pk_with['timeslot named']]['slotName'], 'Timeslot Name')
+        self.assertEqual(extracted[pk_with['neither named']]['name'], '')
+        self.assertEqual(extracted[pk_with['neither named']]['slotName'], '')
+
 
 class MeetingTests(BaseMeetingTestCase):
+    @override_settings(
+        MEETECHO_ONSITE_TOOL_URL="https://onsite.example.com",
+        MEETECHO_VIDEO_STREAM_URL="https://meetecho.example.com",
+    )
     def test_meeting_agenda(self):
         meeting = make_meeting_test_data()
         session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
+        session.remote_instructions='https://remote.example.com'
+        session.save()
         slot = TimeSlot.objects.get(sessionassignments__session=session,sessionassignments__schedule=meeting.schedule)
+        meeting.timeslot_set.filter(type_id="break").update(show_location=False)
+        meeting.importantdate_set.create(name_id='prelimagenda',date=date_today() + datetime.timedelta(days=20))
         #
         self.write_materials_files(meeting, session)
         #
-        future_year = datetime.date.today().year+1
+        future_year = date_today().year+1
         future_num =  (future_year-1984)*3            # valid for the mid-year meeting
         future_meeting = Meeting.objects.create(date=datetime.date(future_year, 7, 22), number=future_num, type_id='ietf',
                                 city="Panama City", country="PA", time_zone='America/Panama')
 
         registration_text = "Registration"
 
-        # utc
-        time_interval = r"%s<span.*/span>-%s" % (slot.utc_start_time().strftime("%H:%M").lstrip("0"), (slot.utc_start_time() + slot.duration).strftime("%H:%M").lstrip("0"))
-
         # Extremely rudementary test of agenda-neue - to be replaced with back-end tests as the front-end tests are developed.
         r = self.client.get(urlreverse("agenda", kwargs=dict(num=meeting.number,utc='-utc')))
         self.assertEqual(r.status_code, 200)  
 
         # Agenda API tests
         # -> Meeting data
-        r = self.client.get(urlreverse("ietf.meeting.views.api_get_agenda_data", kwargs=dict(num=meeting.number)))
-        self.assertEqual(r.status_code, 200)  
-        rjson = json.loads(r.content.decode("utf8"))
-        self.assertJSONEqual(
-            r.content.decode("utf8"),
+        # First, check that the generation function does the right thing
+        generated_data = generate_agenda_data(meeting.number)
+        self.assertEqual(
+            generated_data,
             {
                 "meeting": {
                     "number": meeting.number,
                     "city": meeting.city,
                     "startDate": meeting.date.isoformat(),
                     "endDate": meeting.end_date().isoformat(),
-                    "updated": rjson.get("meeting").get("updated"), # Just expect the value to exist
+                    "updated": generated_data.get("meeting").get("updated"),  # Just expect the value to exist
                     "timezone": meeting.time_zone,
                     "infoNote": meeting.agenda_info_note,
-                    "warningNote": meeting.agenda_warning_note
+                    "warningNote": meeting.agenda_warning_note,
+                    "prelimAgendaDate": (date_today() + datetime.timedelta(days=20)).isoformat()
                 },
-                "categories": rjson.get("categories"), # Just expect the value to exist
+                "categories": generated_data.get("categories"),  # Just expect the value to exist
                 "isCurrentMeeting": True,
-                "useHedgeDoc": True,
-                "schedule": rjson.get("schedule"), # Just expect the value to exist
+                "usesNotes": False,  # make_meeting_test_data sets number=72
+                "schedule": generated_data.get("schedule"),  # Just expect the value to exist
                 "floors": []
             }
         )
-        # -> Session Materials
+        with patch("ietf.meeting.views.generate_agenda_data", return_value=generated_data):
+            r = self.client.get(urlreverse("ietf.meeting.views.api_get_agenda_data", kwargs=dict(num=meeting.number)))
+        self.assertEqual(r.status_code, 200)  
+        # json.dumps using the DjangoJSONEncoder to handle timestamps consistently
+        self.assertJSONEqual(r.content.decode("utf8"), json.dumps(generated_data, cls=DjangoJSONEncoder))
+        # -> Session MaterialM
         r = self.client.get(urlreverse("ietf.meeting.views.api_get_session_materials", kwargs=dict(session_id=session.id)))
         self.assertEqual(r.status_code, 200)  
         rjson = json.loads(r.content.decode("utf8"))
@@ -212,20 +301,44 @@ def test_meeting_agenda(self):
             }
         )
 
-        # plain
-        time_interval = r"%s<span.*/span>-%s" % (slot.time.strftime("%H:%M").lstrip("0"), (slot.time + slot.duration).strftime("%H:%M").lstrip("0"))
-
         # text
-        # the rest of the results don't have as nicely formatted times
-        time_interval = "%s-%s" % (slot.time.strftime("%H%M").lstrip("0"), (slot.time + slot.duration).strftime("%H%M").lstrip("0"))
-
         r = self.client.get(urlreverse("ietf.meeting.views.agenda_plain", kwargs=dict(num=meeting.number, ext=".txt")))
         self.assertContains(r, session.group.acronym)
         self.assertContains(r, session.group.name)
         self.assertContains(r, session.group.parent.acronym.upper())
         self.assertContains(r, slot.location.name)
-
-        self.assertContains(r, time_interval)
+        self.assertContains(r, "{}-{}".format(
+            slot.time.astimezone(meeting.tz()).strftime("%H%M"),
+            (slot.time + slot.duration).astimezone(meeting.tz()).strftime("%H%M"),
+        ))
+        self.assertContains(r, f"shown in the {meeting.tz()} time zone")
+        updated = meeting.updated().astimezone(meeting.tz()).strftime("%Y-%m-%d %H:%M:%S %Z")
+        self.assertContains(r, f"Updated {updated}")
+
+        # text, UTC
+        r = self.client.get(urlreverse(
+            "ietf.meeting.views.agenda_plain",
+            kwargs=dict(num=meeting.number, ext=".txt", utc="-utc"),
+        ))
+        self.assertContains(r, session.group.acronym)
+        self.assertContains(r, session.group.name)
+        self.assertContains(r, session.group.parent.acronym.upper())
+        self.assertContains(r, slot.location.name)
+        self.assertContains(r, "{}-{}".format(
+            slot.time.astimezone(datetime.UTC).strftime("%H%M"),
+            (slot.time + slot.duration).astimezone(datetime.UTC).strftime("%H%M"),
+        ))
+        self.assertContains(r, "shown in UTC")
+        updated = meeting.updated().astimezone(datetime.UTC).strftime("%Y-%m-%d %H:%M:%S %Z")
+        self.assertContains(r, f"Updated {updated}")
+
+        # text, invalid updated (none)
+        with patch("ietf.meeting.models.Meeting.updated", return_value=None):
+            r = self.client.get(urlreverse(
+                "ietf.meeting.views.agenda_plain",
+                kwargs=dict(num=meeting.number, ext=".txt", utc="-utc"),
+            ))
+            self.assertNotContains(r, "Updated ")
 
         # future meeting, no agenda
         r = self.client.get(urlreverse("ietf.meeting.views.agenda_plain", kwargs=dict(num=future_meeting.number, ext=".txt")))
@@ -239,33 +352,204 @@ def test_meeting_agenda(self):
         self.assertContains(r, session.group.parent.acronym.upper())
         self.assertContains(r, slot.location.name)
         self.assertContains(r, registration_text)
+        start_time = slot.time.astimezone(meeting.tz())
+        end_time = slot.end_time().astimezone(meeting.tz())
+        self.assertContains(r, '"{}","{}","{}"'.format(
+            start_time.strftime("%Y-%m-%d"),
+            start_time.strftime("%H%M"),
+            end_time.strftime("%H%M"),
+        ))
+        self.assertContains(r, session.materials.get(type='agenda').uploaded_filename)
+        self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
+        self.assertNotContains(r, session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
 
+        # CSV, utc
+        r = self.client.get(urlreverse(
+            "ietf.meeting.views.agenda_plain",
+            kwargs=dict(num=meeting.number, ext=".csv", utc="-utc"),
+        ))
+        self.assertContains(r, session.group.acronym)
+        self.assertContains(r, session.group.name)
+        self.assertContains(r, session.group.parent.acronym.upper())
+        self.assertContains(r, slot.location.name)
+        self.assertContains(r, registration_text)
+        start_time = slot.time.astimezone(datetime.UTC)
+        end_time = slot.end_time().astimezone(datetime.UTC)
+        self.assertContains(r, '"{}","{}","{}"'.format(
+            start_time.strftime("%Y-%m-%d"),
+            start_time.strftime("%H%M"),
+            end_time.strftime("%H%M"),
+        ))
         self.assertContains(r, session.materials.get(type='agenda').uploaded_filename)
         self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
         self.assertNotContains(r, session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
 
-        # iCal
-        r = self.client.get(urlreverse("ietf.meeting.views.agenda_ical", kwargs=dict(num=meeting.number))
-                            + "?show=" + session.group.parent.acronym.upper())
+        # iCal, no session filtering
+        ical_url = urlreverse("ietf.meeting.views.agenda_ical", kwargs=dict(num=meeting.number))
+        r = self.client.get(ical_url)
+
+        assert_ical_response_is_valid(self, r)
+        self.assertNotEqual(
+            meeting.time_zone,
+            meeting.time_zone.lower(),
+            "meeting needs a mixed-case tz for this test",
+        )
+        self.assertNotContains(r, meeting.time_zone.lower(), msg_prefix="time_zone should not be lower-cased")
+        self.assertNotEqual(
+            meeting.time_zone,
+            meeting.time_zone.upper(),
+            "meeting needs a mixed-case tz for this test",
+        )
+        self.assertNotContains(r, meeting.time_zone.upper(), msg_prefix="time_zone should not be upper-cased")
+    
+        # iCal, single group
+        r = self.client.get(ical_url + "?show=" + session.group.parent.acronym.upper())
         assert_ical_response_is_valid(self, r)
         self.assertContains(r, session.group.acronym)
         self.assertContains(r, session.group.name)
-        self.assertContains(r, slot.location.name)
-        self.assertContains(r, "BEGIN:VTIMEZONE")
-        self.assertContains(r, "END:VTIMEZONE")        
 
-        self.assertContains(r, session.agenda().get_href())
-        self.assertContains(
-            r,
+        cal = Calendar.from_ical(r.content)
+        events = [component for component in cal.walk() if component.name == "VEVENT"]
+
+        self.assertEqual(len(events), 2)
+        self.assertIn(session.remote_instructions, events[0].get('description'))
+        self.assertIn("Onsite tool: https://onsite.example.com", events[0].get('description'))
+        self.assertIn("Meetecho: https://meetecho.example.com", events[0].get('description'))
+        self.assertIn(f"Agenda {session.agenda().get_href()}", events[0].get('description'))
+        session_materials_url = settings.IDTRACKER_BASE_URL + urlreverse(
+            'ietf.meeting.views.session_details',
+            kwargs=dict(num=meeting.number, acronym=session.group.acronym)
+        )
+        self.assertIn(f"Session materials: {session_materials_url}", events[0].get('description'))
+        self.assertIn(
             urlreverse(
                 'ietf.meeting.views.session_details',
                 kwargs=dict(num=meeting.number, acronym=session.group.acronym)),
-            msg_prefix='ical should contain link to meeting materials page for session')
+            events[0].get('description'))
+        self.assertEqual(
+            session_materials_url,
+            events[0].get('url')
+        )
 
+        self.assertContains(r, f"LOCATION:{slot.location.name}")
+        
         # Floor Plan
         r = self.client.get(urlreverse('floor-plan', kwargs=dict(num=meeting.number)))
         self.assertEqual(r.status_code, 200)
 
+    def test_session_recordings_via_factories(self):
+        session = SessionFactory(meeting__type_id="ietf", meeting__date=date_today()-datetime.timedelta(days=180), meeting__number=str(random.randint(108,150)))
+        self.assertEqual(session.meetecho_recording_name, "")
+        self.assertEqual(len(session.recordings()), 0)
+        url = urlreverse("ietf.meeting.views.session_details", kwargs=dict(num=session.meeting.number, acronym=session.group.acronym))
+        r = self.client.get(url)
+        q = PyQuery(r.content)
+        # debug.show("q(f'#notes_and_recordings_{session.pk}')")
+        self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 2)
+        links = q(f"#notes_and_recordings_{session.pk} tr a")
+        self.assertEqual(len(links), 2)
+        self.assertEqual(links[0].attrib['href'], str(session.notes_url()))
+        self.assertEqual(links[1].attrib['href'], str(session.session_recording_url()))
+
+        session.meetecho_recording_name = 'my_test_session_name'
+        session.save()
+        r = self.client.get(url)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 2)
+        links = q(f"#notes_and_recordings_{session.pk} tr a")
+        self.assertEqual(len(links), 2)
+        self.assertEqual(links[0].attrib['href'], str(session.notes_url()))
+        self.assertEqual(links[1].attrib['href'], str(session.session_recording_url()))
+
+        new_recording_url = "https://www.youtube.com/watch?v=jNQXAC9IVRw"
+        new_recording_title = "Me at the zoo"
+        create_recording(session, new_recording_url, new_recording_title)
+        r = self.client.get(url)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q(f"#notes_and_recordings_{session.pk} tr")), 3)
+        links = q(f"#notes_and_recordings_{session.pk} tr a")
+        self.assertEqual(len(links), 3)
+        self.assertEqual(links[0].attrib['href'], str(session.notes_url()))
+        self.assertEqual(links[1].attrib['href'], new_recording_url)
+        self.assertIn(new_recording_title, links[1].text_content())
+        self.assertEqual(links[2].attrib['href'], str(session.session_recording_url()))
+        #debug.show("q(f'#notes_and_recordings_{session_pk}')")
+
+    def test_delete_recordings(self):
+        # No user specified, active recording state
+        sp = SessionPresentationFactory(
+            document__type_id="recording",
+            document__external_url="https://example.com/some-recording",
+            document__states=[("recording", "active")],
+        )
+        doc = sp.document
+        doc.docevent_set.all().delete()  # clear this out
+        delete_recording(sp)
+        self.assertFalse(SessionPresentation.objects.filter(pk=sp.pk).exists())
+        self.assertEqual(doc.get_state("recording").slug, "deleted", "recording state updated")
+        self.assertEqual(doc.docevent_set.count(), 1, "one event added")
+        event = doc.docevent_set.first()
+        self.assertEqual(event.type, "changed_state", "event is a changed_state event")
+        self.assertEqual(event.by.name, "(System)", "system user is responsible")
+
+        # Specified user, no recording state
+        sp = SessionPresentationFactory(
+            document__type_id="recording",
+            document__external_url="https://example.com/some-recording",
+            document__states=[],
+        )
+        doc = sp.document
+        doc.docevent_set.all().delete()  # clear this out
+        user = PersonFactory()  # naming matches the methods - user is a Person, not a User
+        delete_recording(sp, user=user)
+        self.assertFalse(SessionPresentation.objects.filter(pk=sp.pk).exists())
+        self.assertEqual(doc.get_state("recording").slug, "deleted", "recording state updated")
+        self.assertEqual(doc.docevent_set.count(), 1, "one event added")
+        event = doc.docevent_set.first()
+        self.assertEqual(event.type, "changed_state", "event is a changed_state event")
+        self.assertEqual(event.by, user, "user is responsible")
+
+        # Document is not a recording
+        sp = SessionPresentationFactory(
+            document__type_id="draft",
+            document__external_url="https://example.com/some-recording",
+        )
+        with self.assertRaises(ValueError):
+            delete_recording(sp)
+
+    def test_agenda_ical_next_meeting_type(self):
+        # start with no upcoming IETF meetings, just an interim
+        MeetingFactory(
+            type_id="interim", date=date_today() + datetime.timedelta(days=15)
+        )
+        r = self.client.get(urlreverse("ietf.meeting.views.agenda_ical", kwargs={}))
+        self.assertEqual(
+            r.status_code, 404, "Should not return an interim meeting as next meeting"
+        )
+        # create an IETF meeting after the interim - it should be found as "next"
+        ietf_meeting = MeetingFactory(
+            type_id="ietf", date=date_today() + datetime.timedelta(days=30)
+        )
+        SessionFactory(meeting=ietf_meeting, name="Session at IETF meeting")
+        r = self.client.get(urlreverse("ietf.meeting.views.agenda_ical", kwargs={}))
+        self.assertContains(r, "Session at IETF meeting", status_code=200)
+
+    def test_agenda_json_next_meeting_type(self):
+        # start with no upcoming IETF meetings, just an interim
+        MeetingFactory(
+            type_id="interim", date=date_today() + datetime.timedelta(days=15)
+        )
+        r = self.client.get(urlreverse("ietf.meeting.views.agenda_json", kwargs={}))
+        self.assertEqual(
+            r.status_code, 404, "Should not return an interim meeting as next meeting"
+        )
+        # create an IETF meeting after the interim - it should be found as "next"
+        ietf_meeting = MeetingFactory(
+            type_id="ietf", date=date_today() + datetime.timedelta(days=30)
+        )
+        SessionFactory(meeting=ietf_meeting, name="Session at IETF meeting")
+        r = self.client.get(urlreverse("ietf.meeting.views.agenda_json", kwargs={}))
+        self.assertContains(r, "Session at IETF meeting", status_code=200)
 
     @override_settings(PROCEEDINGS_V1_BASE_URL='https://example.com/{meeting.number}')
     def test_agenda_redirects_for_old_meetings(self):
@@ -315,16 +599,16 @@ def test_materials_through_cdn(self):
         doc = DocumentFactory.create(name='agenda-172-mars', type_id='agenda', title="Agenda",
             uploaded_filename="agenda-172-mars.txt", group=session107.group, rev='00', states=[('agenda','active')])
         pres = SessionPresentation.objects.create(session=session107,document=doc,rev=doc.rev)
-        session107.sessionpresentation_set.add(pres) # 
+        session107.presentations.add(pres) # 
         doc = DocumentFactory.create(name='minutes-172-mars', type_id='minutes', title="Minutes",
             uploaded_filename="minutes-172-mars.md", group=session107.group, rev='00', states=[('minutes','active')])
         pres = SessionPresentation.objects.create(session=session107,document=doc,rev=doc.rev)
-        session107.sessionpresentation_set.add(pres)
+        session107.presentations.add(pres)
         doc = DocumentFactory.create(name='slides-172-mars-1-active', type_id='slides', title="Slideshow",
             uploaded_filename="slides-172-mars.txt", group=session107.group, rev='00',
             states=[('slides','active'), ('reuse_policy', 'single')])
         pres = SessionPresentation.objects.create(session=session107,document=doc,rev=doc.rev)
-        session107.sessionpresentation_set.add(pres)
+        session107.presentations.add(pres)
 
         for session in (
             Session.objects.filter(meeting=meeting, group__acronym="mars").first(),
@@ -351,12 +635,98 @@ def test_materials(self):
     def test_interim_materials(self):
         make_meeting_test_data()
         group = Group.objects.get(acronym='mars')
-        date = datetime.datetime.today() - datetime.timedelta(days=10)
+        date = timezone.now() - datetime.timedelta(days=10)
         meeting = make_interim_meeting(group=group, date=date, status='sched')
         session = meeting.session_set.first()
 
         self.do_test_materials(meeting, session)
 
+    def test_named_session(self):
+        """Session with a name should appear separately in the materials"""
+        meeting = MeetingFactory(type_id='ietf', number='100')
+        meeting.importantdate_set.create(name_id='revsub',date=date_today() + datetime.timedelta(days=20))
+        group = GroupFactory()
+        plain_session = SessionFactory(meeting=meeting, group=group)
+        named_session = SessionFactory(meeting=meeting, group=group, name='I Got a Name')
+        for doc_type_id in ('agenda', 'minutes', 'slides', 'draft'):
+            # Set up sessions materials that will have distinct URLs for each session.
+            # This depends on settings.MEETING_DOC_HREFS and may need updating if that changes.
+            SessionPresentationFactory(
+                session=plain_session,
+                document__type_id=doc_type_id,
+                document__uploaded_filename=f'upload-{doc_type_id}-plain',
+                document__external_url=f'external_url-{doc_type_id}-plain',
+            )
+            SessionPresentationFactory(
+                session=named_session,
+                document__type_id=doc_type_id,
+                document__uploaded_filename=f'upload-{doc_type_id}-named',
+                document__external_url=f'external_url-{doc_type_id}-named',
+            )
+
+        url = urlreverse('ietf.meeting.views.materials', kwargs={'num': meeting.number})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+
+        plain_label = q(f'div#{group.acronym}')
+        self.assertEqual(plain_label.text(), group.acronym)
+        plain_row = plain_label.closest('tr')
+        self.assertTrue(plain_row)
+
+        named_label = q(f'div#{slugify(named_session.name)}')
+        self.assertEqual(named_label.text(), named_session.name)
+        named_row = named_label.closest('tr')
+        self.assertTrue(named_row)
+
+        for material in (sp.document for sp in plain_session.presentations.all()):
+            if material.type_id == 'draft':
+                expected_url = urlreverse(
+                    'ietf.doc.views_doc.document_main',
+                    kwargs={'name': material.name},
+                )
+            else:
+                expected_url = material.get_href(meeting)
+            self.assertTrue(plain_row.find(f'a[href="{expected_url}"]'))
+            self.assertFalse(named_row.find(f'a[href="{expected_url}"]'))
+
+        for material in (sp.document for sp in named_session.presentations.all()):
+            if material.type_id == 'draft':
+                expected_url = urlreverse(
+                    'ietf.doc.views_doc.document_main',
+                    kwargs={'name': material.name},
+                )
+            else:
+                expected_url = material.get_href(meeting)
+            self.assertFalse(plain_row.find(f'a[href="{expected_url}"]'))
+            self.assertTrue(named_row.find(f'a[href="{expected_url}"]'))
+
+    @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True)
+    def test_meeting_materials_non_utf8(self):
+        meeting = make_meeting_test_data()
+        session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
+        doc = session.materials.get(type="minutes")
+        self.write_materials_file(meeting,
+                                  doc,
+                                  "1. More work items underway\n\n2. The draft will be finished before next meeting\n\n - É",
+                                  charset="iso-8859-1")
+        url = urlreverse("ietf.meeting.views.materials_document",
+                         kwargs=dict(num=meeting.number, document=session.minutes()))
+
+        for accept, cont_type, content in [
+                ('text/html,text/plain,text/markdown',  'text/html',     '<li>\n<p>More work items underway</p>\n</li>'),
+                ('text/markdown,text/html,text/plain',  'text/markdown', '1. More work items underway'),
+                ('text/plain,text/markdown, text/html', 'text/plain',    '1. More work items underway'),
+                ('text/html',                           'text/html',     '<li>\n<p>More work items underway</p>\n</li>'),
+                ('text/markdown',                       'text/markdown', '1. More work items underway'),
+                ('text/plain',                          'text/plain',    '1. More work items underway'),
+            ]:
+            client = Client(HTTP_ACCEPT=accept)
+            r = client.get(url)
+            rtype = r['Content-Type'].split(';')[0]
+            self.assertEqual(cont_type, rtype)
+            self.assertContains(r, content)
+
     @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True)
     def do_test_materials(self, meeting, session):
 
@@ -379,7 +749,7 @@ def do_test_materials(self, meeting, session):
         self.assertContains(r, "1. More work items underway")
         
         
-        cont_disp = r._headers.get('content-disposition', ('Content-Disposition', ''))[1]
+        cont_disp = r.headers.get('content-disposition', ('Content-Disposition', ''))[1]
         cont_disp = re.split('; ?', cont_disp)
         cont_disp_settings = dict( e.split('=', 1) for e in cont_disp if '=' in e )
         filename = cont_disp_settings.get('filename', '').strip('"')
@@ -411,6 +781,20 @@ def do_test_materials(self, meeting, session):
             self.assertFalse(row.find("a:contains(\"Bad Slideshow\")"))
 
             # test with no meeting number in url
+            # Add various group sessions
+            groups = []
+            parent_groups = [
+                    GroupFactory.create(type_id="area", acronym="gen"),
+                    GroupFactory.create(acronym="iab"),
+                    GroupFactory.create(acronym="irtf"),
+                    ]
+            for parent in parent_groups:
+                groups.append(GroupFactory.create(parent=parent))
+            for acronym in ["rsab", "edu"]:
+                groups.append(GroupFactory.create(acronym=acronym))
+            for group in groups:
+                SessionFactory(meeting=meeting, group=group)
+            self.write_materials_files(meeting, session)
             url = urlreverse("ietf.meeting.views.materials", kwargs=dict())
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
@@ -420,6 +804,10 @@ def do_test_materials(self, meeting, session):
             self.assertTrue(row.find('a:contains("Minutes")'))
             self.assertTrue(row.find('a:contains("Slideshow")'))
             self.assertFalse(row.find("a:contains(\"Bad Slideshow\")"))
+            # test for different sections
+            sections = ["plenaries", "gen", "iab", "editorial", "irtf", "training"]
+            for section in sections:
+                self.assertEqual(len(q(f"#{section}")), 1, f"{section} section should exists in proceedings")
 
             # test with a loggged-in wg chair
             self.client.login(username="marschairman", password="marschairman+password")
@@ -484,7 +872,56 @@ def test_materials_has_edit_links(self):
         )
         self.assertEqual(len(q(f'a[href^="{edit_url}#session"]')), 1, f'Link to session_details page for {acro}')
 
+    def test_materials_document_extension_choice(self):
+        def _url(**kwargs):
+            return urlreverse("ietf.meeting.views.materials_document", kwargs=kwargs)
+
+        presentation = SessionPresentationFactory(
+            document__rev="00",
+            document__name="slides-whatever",
+            document__uploaded_filename="slides-whatever-00.txt",
+            document__type_id="slides",
+            document__states=(("reuse_policy", "single"),)
+        )
+        session = presentation.session
+        meeting = session.meeting
+        # This is not a realistic set of files to exist, but is useful for testing. Normally,
+        # we'd have _either_ txt, pdf, or pptx + pdf.
+        self.write_materials_file(meeting, presentation.document, "Hi I'm a txt", with_ext=".txt")
+        self.write_materials_file(meeting, presentation.document, "Hi I'm a pptx", with_ext=".pptx")
+
+        # with no rev, prefers the uploaded_filename
+        r = self.client.get(_url(document="slides-whatever", num=meeting.number))  # no rev
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content.decode(), "Hi I'm a txt")
+        
+        # with a rev, prefers pptx because it comes first alphabetically
+        r = self.client.get(_url(document="slides-whatever-00", num=meeting.number))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content.decode(), "Hi I'm a pptx")
+
+        # now create a pdf
+        self.write_materials_file(meeting, presentation.document, "Hi I'm a pdf", with_ext=".pdf")
+
+        # with no rev, still prefers uploaded_filename
+        r = self.client.get(_url(document="slides-whatever", num=meeting.number))  # no rev
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content.decode(), "Hi I'm a txt")
 
+        # pdf should be preferred with a rev
+        r = self.client.get(_url(document="slides-whatever-00", num=meeting.number))
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(r.content.decode(), "Hi I'm a pdf")
+        
+        # and explicit extensions should, of course, be respected
+        for ext in ["pdf", "pptx", "txt"]:
+            r = self.client.get(_url(document="slides-whatever-00", num=meeting.number, ext=f".{ext}"))
+            self.assertEqual(r.status_code, 200)
+            self.assertEqual(r.content.decode(), f"Hi I'm a {ext}")
+        
+        # and 404 should come up if the ext is not found
+        r = self.client.get(_url(document="slides-whatever-00", num=meeting.number, ext=".docx"))
+        self.assertEqual(r.status_code, 404)
 
     def test_materials_editable_groups(self):
         meeting = make_meeting_test_data()
@@ -508,13 +945,73 @@ def test_materials_editable_groups(self):
 
     @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True)
     def test_materials_name_endswith_hyphen_number_number(self):
-        sp = SessionPresentationFactory(document__name='slides-junk-15',document__type_id='slides',document__states=[('reuse_policy','single')])
-        sp.document.uploaded_filename = '%s-%s.pdf'%(sp.document.name,sp.document.rev)
+        # be sure a shadowed filename without the hyphen does not interfere
+        shadow = SessionPresentationFactory(
+            document__name="slides-115-junk",
+            document__type_id="slides",
+            document__states=[("reuse_policy", "single")],
+        )
+        shadow.document.uploaded_filename = (
+            f"{shadow.document.name}-{shadow.document.rev}.pdf"
+        )
+        shadow.document.save()
+        # create the material we want to find for the test
+        sp = SessionPresentationFactory(
+            document__name="slides-115-junk-15",
+            document__type_id="slides",
+            document__states=[("reuse_policy", "single")],
+        )
+        sp.document.uploaded_filename = f"{sp.document.name}-{sp.document.rev}.pdf"
         sp.document.save()
-        self.write_materials_file(sp.session.meeting, sp.document, 'Fake slide contents')
-        url = urlreverse("ietf.meeting.views.materials_document", kwargs=dict(document=sp.document.name,num=sp.session.meeting.number))
+        self.write_materials_file(
+            sp.session.meeting, sp.document, "Fake slide contents rev 00"
+        )
+
+        # create rev 01
+        sp.document.rev = "01"
+        sp.document.uploaded_filename = f"{sp.document.name}-{sp.document.rev}.pdf"
+        sp.document.save_with_history(
+            [
+                NewRevisionDocEvent.objects.create(
+                    type="new_revision",
+                    doc=sp.document,
+                    rev=sp.document.rev,
+                    by=Person.objects.get(name="(System)"),
+                    desc=f"New version available: <b>{sp.document.name}-{sp.document.rev}.txt</b>",
+                )
+            ]
+        )
+        self.write_materials_file(
+            sp.session.meeting, sp.document, "Fake slide contents rev 01"
+        )
+        url = urlreverse(
+            "ietf.meeting.views.materials_document",
+            kwargs=dict(document=sp.document.name, num=sp.session.meeting.number),
+        )
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
+        self.assertContains(
+            r,
+            "Fake slide contents rev 01",
+            status_code=200,
+            msg_prefix="Should return latest rev by default",
+        )
+        url = urlreverse(
+            "ietf.meeting.views.materials_document",
+            kwargs=dict(document=sp.document.name + "-00", num=sp.session.meeting.number),
+        )
+        r = self.client.get(url)
+        self.assertContains(
+            r,
+            "Fake slide contents rev 00",
+            status_code=200,
+            msg_prefix="Should return existing version on request",
+        )
+        url = urlreverse(
+            "ietf.meeting.views.materials_document",
+            kwargs=dict(document=sp.document.name + "-02", num=sp.session.meeting.number),
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404, "Should not find nonexistent version")
 
     def test_important_dates(self):
         meeting=MeetingFactory(type_id='ietf')
@@ -542,32 +1039,59 @@ def test_important_dates_ical(self):
         for d in meeting.importantdate_set.all():
             self.assertContains(r, d.date.isoformat())
 
+        updated = meeting.updated()
+        self.assertIsNotNone(updated)
+        expected_updated = updated.astimezone(datetime.UTC).strftime("%Y%m%dT%H%M%SZ")
+        self.assertContains(r, f"DTSTAMP:{expected_updated}")
+        dtstamps_count = r.content.decode("utf-8").count(f"DTSTAMP:{expected_updated}")
+        self.assertEqual(dtstamps_count, meeting.importantdate_set.count())
+
+        # With default cached_updated, 1970-01-01
+        with patch("ietf.meeting.models.Meeting.updated", return_value=None):
+            r = self.client.get(url)
+            for d in meeting.importantdate_set.all():
+                self.assertContains(r, d.date.isoformat())
+
+            expected_updated = "19700101T000000Z"
+            self.assertContains(r, f"DTSTAMP:{expected_updated}")
+            dtstamps_count = r.content.decode("utf-8").count(f"DTSTAMP:{expected_updated}")
+            self.assertEqual(dtstamps_count, meeting.importantdate_set.count())
+
     def test_group_ical(self):
         meeting = make_meeting_test_data()
         s1 = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
         a1 = s1.official_timeslotassignment()
         t1 = a1.timeslot
+
         # Create an extra session
-        t2 = TimeSlotFactory.create(meeting=meeting, time=datetime.datetime.combine(meeting.date, datetime.time(11, 30)))
+        t2 = TimeSlotFactory.create(
+            meeting=meeting,
+            time=pytz.utc.localize(
+                datetime.datetime.combine(meeting.date, datetime.time(11, 30))
+            )
+        )
+     
         s2 = SessionFactory.create(meeting=meeting, group=s1.group, add_to_schedule=False)
         SchedTimeSessAssignment.objects.create(timeslot=t2, session=s2, schedule=meeting.schedule)
-        #
+        
         url = urlreverse('ietf.meeting.views.agenda_ical', kwargs={'num':meeting.number, 'acronym':s1.group.acronym, })
         r = self.client.get(url)
         assert_ical_response_is_valid(self,
                                       r,
                                       expected_event_summaries=['mars - Martian Special Interest Group'],
                                       expected_event_count=2)
-        self.assertContains(r, t1.time.strftime('%Y%m%dT%H%M%S'))
-        self.assertContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
-        #
+        self.assertContains(r, f"DTSTART:{t1.time.strftime('%Y%m%dT%H%M%SZ')}")
+        self.assertContains(r, f"DTEND:{(t1.time + t1.duration).strftime('%Y%m%dT%H%M%SZ')}")
+        self.assertContains(r, f"DTSTART:{t2.time.strftime('%Y%m%dT%H%M%SZ')}")
+        self.assertContains(r, f"DTEND:{(t2.time + t2.duration).strftime('%Y%m%dT%H%M%SZ')}")
+
         url = urlreverse('ietf.meeting.views.agenda_ical', kwargs={'num':meeting.number, 'session_id':s1.id, })
         r = self.client.get(url)
         assert_ical_response_is_valid(self, r,
                                       expected_event_summaries=['mars - Martian Special Interest Group'],
                                       expected_event_count=1)
-        self.assertContains(r, t1.time.strftime('%Y%m%dT%H%M%S'))
-        self.assertNotContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
+        self.assertContains(r, f"DTSTART:{t1.time.strftime('%Y%m%dT%H%M%SZ')}")
+        self.assertNotContains(r, f"DTSTART:{t2.time.strftime('%Y%m%dT%H%M%SZ')}")
 
     def test_parse_agenda_filter_params(self):
         def _r(show=(), hide=(), showtypes=(), hidetypes=()):
@@ -633,10 +1157,10 @@ def build_session_setup(self):
         # but lists a different on in its agenda. The expectation is that the pdf and tgz views will return both.
         session = SessionFactory(group__type_id='wg',meeting__type_id='ietf')
         draft1 = WgDraftFactory(group=session.group)
-        session.sessionpresentation_set.create(document=draft1)
+        session.presentations.create(document=draft1)
         draft2 = WgDraftFactory(group=session.group)
         agenda = DocumentFactory(type_id='agenda',group=session.group, uploaded_filename='agenda-%s-%s' % (session.meeting.number,session.group.acronym), states=[('agenda','active')])
-        session.sessionpresentation_set.create(document=agenda)
+        session.presentations.create(document=agenda)
         self.write_materials_file(session.meeting, session.materials.get(type="agenda"),
                                   "1. WG status (15 minutes)\n\n2. Status of %s\n\n" % draft2.name)
         filenames = []
@@ -651,29 +1175,33 @@ def build_session_setup(self):
 
     def test_session_draft_tarfile(self):
         session, filenames = self.build_session_setup()
-        url = urlreverse('ietf.meeting.views.session_draft_tarfile', kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.get('Content-Type'), 'application/octet-stream')
-        for filename in filenames:
-            os.unlink(filename)
+        try:
+            url = urlreverse('ietf.meeting.views.session_draft_tarfile', kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
+            self.assertEqual(response.get('Content-Type'), 'application/octet-stream')
+        finally:
+            for filename in filenames:
+                os.unlink(filename)
 
     @skipIf(skip_pdf_tests, skip_message)
-    @skip_coverage
-    def test_session_draft_pdf(self):
+    @disable_coverage()
+    def test_session_draft_pdf(self):  # pragma: no cover
         session, filenames = self.build_session_setup()
-        url = urlreverse('ietf.meeting.views.session_draft_pdf', kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.get('Content-Type'), 'application/pdf')
-        for filename in filenames:
-            os.unlink(filename)
+        try:
+            url = urlreverse('ietf.meeting.views.session_draft_pdf', kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
+            response = self.client.get(url)
+            self.assertEqual(response.status_code, 200)
+            self.assertEqual(response.get('Content-Type'), 'application/pdf')
+        finally:
+            for filename in filenames:
+                os.unlink(filename)
 
     def test_current_materials(self):
         url = urlreverse('ietf.meeting.views.current_materials')
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
-        MeetingFactory(type_id='ietf', date=datetime.date.today())
+        MeetingFactory(type_id='ietf', date=date_today())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 302)
 
@@ -818,7 +1346,9 @@ def test_room_grouping(self):
                     TimeSlotFactory(
                         meeting=meeting,
                         location=room,
-                        time=datetime.datetime.combine(meeting.date, time),
+                        time=meeting.tz().localize(
+                            datetime.datetime.combine(meeting.date, time)
+                        ),
                         duration=datetime.timedelta(minutes=duration),
                     )
 
@@ -889,7 +1419,7 @@ def _setup_for_swap_timeslots(self):
         # Meeting must be in the future so it can be edited
         meeting = MeetingFactory(
             type_id='ietf',
-            date=datetime.date.today() + datetime.timedelta(days=7),
+            date=date_today() + datetime.timedelta(days=7),
             populate_schedule=False,
         )
         meeting.schedule = ScheduleFactory(meeting=meeting)
@@ -902,7 +1432,11 @@ def _setup_for_swap_timeslots(self):
         ]
 
         # Set up different sets of timeslots
-        t0 = datetime.datetime.combine(meeting.date, datetime.time(11, 0))
+        # Work with t0 in UTC for arithmetic. This does not change the results but is cleaner if someone looks
+        # at intermediate results which may be misleading until passed through tz.normalize().
+        t0 = meeting.tz().localize(
+            datetime.datetime.combine(meeting.date, datetime.time(11, 0))
+        ).astimezone(pytz.utc)
         dur = datetime.timedelta(hours=2)
         for room in room_groups[0]:
             TimeSlotFactory(meeting=meeting, location=room, duration=dur, time=t0)
@@ -997,7 +1531,7 @@ def test_swap_timeslots_denies_past(self):
         self.client.login(username=username, password=username + '+password')
 
         # Swap group 0's first and last sessions, first in the past
-        right_now = self._right_now_in(meeting.time_zone)
+        right_now = self._right_now_in(meeting.tz())
         for room in room_groups[0]:
             ts = room.timeslot_set.last()
             ts.time = right_now - datetime.timedelta(minutes=5)
@@ -1179,12 +1713,18 @@ def test_swap_days_denies_past(self):
         self.client.login(username=username, password=username + '+password')
 
         # Swap group 0's first and last sessions, first in the past
-        right_now = self._right_now_in(meeting.time_zone)
-        yesterday = (right_now - datetime.timedelta(days=1)).date()
-        day_before = (right_now - datetime.timedelta(days=2)).date()
+        right_now = self._right_now_in(meeting.tz())
+        yesterday = right_now.date() - datetime.timedelta(days=1)
+        day_before = right_now.date() - datetime.timedelta(days=2)
         for room in room_groups[0]:
             ts = room.timeslot_set.last()
-            ts.time = datetime.datetime.combine(yesterday, ts.time.time())
+            # Calculation keeps local clock time, shifted to a different day.
+            ts.time = meeting.tz().localize(
+                datetime.datetime.combine(
+                    yesterday,
+                    ts.time.astimezone(meeting.tz()).time()
+                ),
+            )
             ts.save()
         # timeslot_set is ordered by -time, so check that we know which is past/future
         self.assertTrue(room_groups[0][0].timeslot_set.last().time < right_now)
@@ -1218,7 +1758,12 @@ def test_swap_days_denies_past(self):
         # now with both in the past
         for room in room_groups[0]:
             ts = room.timeslot_set.first()
-            ts.time = datetime.datetime.combine(day_before, ts.time.time())
+            ts.time = meeting.tz().localize(
+                datetime.datetime.combine(
+                    day_before,
+                    ts.time.astimezone(meeting.tz()).time(),
+                )
+            )
             ts.save()
         past_slots = room_groups[0][0].timeslot_set.filter(time__lt=right_now)
         self.assertEqual(len(past_slots), 2, 'Need two timeslots in the past!')
@@ -1241,20 +1786,18 @@ def _decode_json_response(self, r):
             self.fail('Response was not valid JSON: {}'.format(err))
 
     @staticmethod
-    def _right_now_in(tzname):
-        right_now = now().astimezone(pytz.timezone(tzname))
-        if not settings.USE_TZ:
-            right_now = right_now.replace(tzinfo=None)
+    def _right_now_in(tzinfo):
+        right_now = timezone.now().astimezone(tzinfo)
         return right_now
 
     def test_assign_session(self):
         """Allow assignment to future timeslots only for official schedule"""
         meeting = MeetingFactory(
             type_id='ietf',
-            date=(datetime.datetime.today() - datetime.timedelta(days=1)).date(),
+            date=(timezone.now() - datetime.timedelta(days=1)).date(),
             days=3,
         )
-        right_now = self._right_now_in(meeting.time_zone)
+        right_now = self._right_now_in(meeting.tz())
 
         schedules = dict(
             official=meeting.schedule,
@@ -1311,10 +1854,10 @@ def test_reassign_session(self):
         """Do not allow assignment of past sessions for official schedule"""
         meeting = MeetingFactory(
             type_id='ietf',
-            date=(datetime.datetime.today() - datetime.timedelta(days=1)).date(),
+            date=(timezone.now() - datetime.timedelta(days=1)).date(),
             days=3,
         )
-        right_now = self._right_now_in(meeting.time_zone)
+        right_now = self._right_now_in(meeting.tz())
 
         schedules = dict(
             official=meeting.schedule,
@@ -1446,10 +1989,10 @@ def test_unassign_session(self):
         """Allow unassignment only of future timeslots for official schedule"""
         meeting = MeetingFactory(
             type_id='ietf',
-            date=(datetime.datetime.today() - datetime.timedelta(days=1)).date(),
+            date=(timezone.now() - datetime.timedelta(days=1)).date(),
             days=3,
         )
-        right_now = self._right_now_in(meeting.time_zone)
+        right_now = self._right_now_in(meeting.tz())
 
         schedules = dict(
             official=meeting.schedule,
@@ -1531,7 +2074,7 @@ def test_editor_with_no_timeslots(self):
         """Schedule editor should not crash when there are no timeslots"""
         meeting = MeetingFactory(
             type_id='ietf',
-            date=datetime.date.today() + datetime.timedelta(days=7),
+            date=date_today() + datetime.timedelta(days=7),
             populate_schedule=False,
         )
         meeting.schedule = ScheduleFactory(meeting=meeting)
@@ -1545,6 +2088,58 @@ def test_editor_with_no_timeslots(self):
         self.assertContains(r, 'No timeslots exist')
         self.assertContains(r, urlreverse('ietf.meeting.views.edit_timeslots', kwargs={'num': meeting.number}))
 
+    def test_editor_time_zone(self):
+        """Agenda editor should show meeting time zone"""
+        time_zone = 'Etc/GMT+8'
+        meeting_tz = ZoneInfo(time_zone)
+        meeting = MeetingFactory(
+            type_id='ietf',
+            date=date_today(meeting_tz) + datetime.timedelta(days=7),
+            populate_schedule=False,
+            time_zone=time_zone,
+        )
+        meeting.schedule = ScheduleFactory(meeting=meeting)
+        meeting.save()
+        timeslot = TimeSlotFactory(meeting=meeting)
+        ts_start = timeslot.time.astimezone(meeting_tz)
+        ts_end = timeslot.end_time().astimezone(meeting_tz)
+        url = urlreverse('ietf.meeting.views.edit_meeting_schedule', kwargs={'num': meeting.number})
+        self.assertTrue(self.client.login(username='secretary', password='secretary+password'))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        pq = PyQuery(r.content)
+
+        day_header = pq('.day-flow .day-label')
+        self.assertIn(ts_start.strftime('%A'), day_header.text())
+
+        day_swap = day_header.find('.swap-days')
+        self.assertEqual(day_swap.attr('data-dayid'), ts_start.date().isoformat())
+        self.assertEqual(day_swap.attr('data-start'), ts_start.date().isoformat())
+
+        time_label = pq('.day-flow .time-header .time-label')
+        self.assertEqual(len(time_label), 1)
+        # strftime() does not seem to support hours without leading 0, so do this manually
+        time_label_string = f'{ts_start.hour:d}:{ts_start.minute:02d} - {ts_end.hour:d}:{ts_end.minute:02d}'
+        self.assertIn(time_label_string, time_label.text())
+        self.assertEqual(time_label.attr('data-start'), ts_start.astimezone(datetime.UTC).isoformat())
+        self.assertEqual(time_label.attr('data-end'), ts_end.astimezone(datetime.UTC).isoformat())
+
+        ts_swap = time_label.find('.swap-timeslot-col')
+        origin_label = ts_swap.attr('data-origin-label')
+        # testing the exact date in origin_label is hard because Django's date filter uses
+        # different month formats than Python's strftime, so just check a couple parts.
+        self.assertIn(ts_start.strftime('%A'), origin_label)
+        self.assertIn(f'{ts_start.hour:d}:{ts_start.minute:02d}-{ts_end.hour:d}:{ts_end.minute:02d}', origin_label)
+
+        timeslot_elt = pq(f'#timeslot{timeslot.pk}')
+        self.assertEqual(len(timeslot_elt), 1)
+        self.assertEqual(timeslot_elt.attr('data-start'), ts_start.astimezone(datetime.UTC).isoformat())
+        self.assertEqual(timeslot_elt.attr('data-end'), ts_end.astimezone(datetime.UTC).isoformat())
+
+        timeslot_label = pq(f'#timeslot{timeslot.pk} .time-label')
+        self.assertEqual(len(timeslot_label), 1)
+        self.assertIn(time_label_string, timeslot_label.text())
+
 
 class EditTimeslotsTests(TestCase):
     def login(self, username='secretary'):
@@ -1567,10 +2162,11 @@ def create_timeslots_url(meeting):
     @staticmethod
     def create_bare_meeting(number=120) -> Meeting:
         """Create a basic IETF meeting"""
-        return MeetingFactory(
+        # Call create() explicitly so mypy sees the correct type
+        return MeetingFactory.create(
             type_id='ietf',
             number=number,
-            date=datetime.datetime.today() + datetime.timedelta(days=10),
+            date=date_today() + datetime.timedelta(days=10),
             populate_schedule=False,
         )
 
@@ -1602,7 +2198,8 @@ def create_meeting(self, number=120):
         meeting = self.create_bare_meeting(number=number)
         RoomFactory.create_batch(8, meeting=meeting)
         self.create_initial_schedule(meeting)
-        return meeting
+        # retrieve meeting from DB so it goes through Django's processing
+        return Meeting.objects.get(pk=meeting.pk)
 
     def test_view_permissions(self):
         """Only the secretary should be able to edit timeslots"""
@@ -1771,7 +2368,7 @@ def _col_index(elt):
         meeting = self.create_meeting()
         # add some timeslots
         times = [datetime.time(hour=h) for h in (11, 14)]
-        days = [meeting.get_meeting_date(ii).date() for ii in range(meeting.days)]
+        days = [meeting.get_meeting_date(ii) for ii in range(meeting.days)]
 
         timeslots = []
         duration = datetime.timedelta(minutes=90)
@@ -1781,7 +2378,7 @@ def _col_index(elt):
                     TimeSlotFactory(
                         meeting=meeting,
                         location=room,
-                        time=datetime.datetime.combine(day, t),
+                        time=meeting.tz().localize(datetime.datetime.combine(day, t)),
                         duration=duration,
                     )
                     for t in times
@@ -1862,17 +2459,21 @@ def test_bulk_delete_buttons_exist(self):
             TimeSlotFactory(
                 meeting=meeting,
                 location=meeting.room_set.first(),
-                time=datetime.datetime.combine(
-                    meeting.get_meeting_date(day).date(),
-                    datetime.time(hour=11)
+                time=meeting.tz().localize(
+                    datetime.datetime.combine(
+                        meeting.get_meeting_date(day),
+                        datetime.time(hour=11),
+                    )
                 ),
             )
             TimeSlotFactory(
                 meeting=meeting,
                 location=meeting.room_set.first(),
-                time=datetime.datetime.combine(
-                    meeting.get_meeting_date(day).date(),
-                    datetime.time(hour=14)
+                time=meeting.tz().localize(
+                    datetime.datetime.combine(
+                        meeting.get_meeting_date(day),
+                        datetime.time(hour=14),
+                    )
                 ),
             )
 
@@ -1971,10 +2572,8 @@ def test_edit_timeslot(self):
 
         name_before = 'Name Classic (tm)'
         type_before = 'regular'
-        time_before = datetime.datetime.combine(
-            meeting.date,
-            datetime.time(hour=10),
-        )
+        time_utc = pytz.utc.localize(datetime.datetime.combine(meeting.date, datetime.time(hour=10)))
+        time_before = time_utc.astimezone(meeting.tz())
         duration_before = datetime.timedelta(minutes=60)
         show_location_before = True
         location_before = meeting.room_set.first()
@@ -1989,24 +2588,30 @@ def test_edit_timeslot(self):
         )
 
         self.login()
+        url = self.edit_timeslot_url(ts)
+
+        # check that sched parameter is preserved
+        r = self.client.get(url)
+        self.assertNotContains(r, '?sched=', status_code=200)
+        r = self.client.get(url + '?sched=1234')
+        self.assertContains(r, '?sched=1234', status_code=200)  # could check in more detail
+
         name_after = 'New Name (tm)'
         type_after = 'plenary'
-        time_after = time_before + datetime.timedelta(days=1, hours=2)
+        time_after = (time_utc + datetime.timedelta(days=1, hours=2)).astimezone(meeting.tz())
         duration_after = duration_before * 2
         show_location_after = False
         location_after = meeting.room_set.last()
-        r = self.client.post(
-            self.edit_timeslot_url(ts),
-            data=dict(
-                name=name_after,
-                type=type_after,
-                time_0=time_after.strftime('%Y-%m-%d'),  # date for SplitDateTimeField
-                time_1=time_after.strftime('%H:%M'),  # time for SplitDateTimeField
-                duration=str(duration_after),
-                # show_location=show_location_after,  # False values are omitted from form
-                location=location_after.pk,
-            )
-        )
+        post_data = dict(
+            name=name_after,
+            type=type_after,
+            time_0=time_after.strftime('%Y-%m-%d'),  # date for SplitDateTimeField
+            time_1=time_after.strftime('%H:%M'),  # time for SplitDateTimeField
+            duration=str(duration_after),
+            # show_location=show_location_after,  # False values are omitted from form
+            location=location_after.pk,
+        )
+        r = self.client.post(url, data=post_data)
         self.assertEqual(r.status_code, 302)  # expect redirect to timeslot edit url
         self.assertEqual(r['Location'], self.edit_timeslots_url(meeting),
                          'Expected to be redirected to meeting timeslots edit page')
@@ -2027,9 +2632,15 @@ def test_edit_timeslot(self):
         self.assertEqual(ts.show_location, show_location_after)
         self.assertEqual(ts.location, location_after)
 
+        # and check with sched param set
+        r = self.client.post(url + '?sched=1234', data=post_data)
+        self.assertEqual(r.status_code, 302)  # expect redirect to timeslot edit url
+        self.assertEqual(r['Location'], self.edit_timeslots_url(meeting) + '?sched=1234',
+                         'Expected to be redirected to meeting timeslots edit page with sched param set')
+
     def test_invalid_edit_timeslot(self):
         meeting = self.create_bare_meeting()
-        ts: TimeSlot = TimeSlotFactory(meeting=meeting, name='slot')  # n.b., colon indicates type hinting
+        ts: TimeSlot = TimeSlotFactory(meeting=meeting, name='slot')  # type: ignore[annotation-unchecked]
         self.login()
         r = self.client.post(
             self.edit_timeslot_url(ts),
@@ -2149,6 +2760,7 @@ def test_create_single_timeslot(self):
         meeting = self.create_meeting()
         timeslots_before = set(ts.pk for ts in meeting.timeslot_set.all())
 
+        url = self.create_timeslots_url(meeting)
         post_data = dict(
             name='some name',
             type='regular',
@@ -2159,10 +2771,14 @@ def test_create_single_timeslot(self):
             locations=str(meeting.room_set.first().pk),
         )
         self.login()
-        r = self.client.post(
-            self.create_timeslots_url(meeting),
-            data=post_data,
-        )
+
+        # check that sched parameter is preserved
+        r = self.client.get(url)
+        self.assertNotContains(r, '?sched=', status_code=200)
+        r = self.client.get(url + '?sched=1234')
+        self.assertContains(r, '?sched=1234', status_code=200)  # could check in more detail
+
+        r = self.client.post(url, data=post_data)
         self.assertEqual(r.status_code, 302)
         self.assertEqual(r['Location'], self.edit_timeslots_url(meeting),
                          'Expected to be redirected to meeting timeslots edit page')
@@ -2171,17 +2787,23 @@ def test_create_single_timeslot(self):
         ts = meeting.timeslot_set.exclude(pk__in=timeslots_before).first()  # only 1
         self.assertEqual(ts.name, post_data['name'])
         self.assertEqual(ts.type_id, post_data['type'])
-        self.assertEqual(str(ts.time.date().toordinal()), post_data['days'])
-        self.assertEqual(ts.time.strftime('%H:%M'), post_data['time'])
+        self.assertEqual(str(ts.local_start_time().date().toordinal()), post_data['days'])
+        self.assertEqual(ts.local_start_time().strftime('%H:%M'), post_data['time'])
         self.assertEqual(str(ts.duration), '{}:00'.format(post_data['duration']))  # add seconds
         self.assertEqual(ts.show_location, post_data['show_location'])
         self.assertEqual(str(ts.location.pk), post_data['locations'])
 
+        # check again with sched parameter
+        r = self.client.post(url + '?sched=1234', data=post_data)
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(r['Location'], self.edit_timeslots_url(meeting) + '?sched=1234',
+                         'Expected to be redirected to meeting timeslots edit page with sched parameter set')
+
     def test_create_single_timeslot_outside_meeting_days(self):
         """Creating a single timeslot outside the official meeting days should work"""
         meeting = self.create_meeting()
         timeslots_before = set(ts.pk for ts in meeting.timeslot_set.all())
-        other_date = meeting.get_meeting_date(-7).date()
+        other_date = meeting.get_meeting_date(-7)
         post_data = dict(
             name='some name',
             type='regular',
@@ -2204,8 +2826,8 @@ def test_create_single_timeslot_outside_meeting_days(self):
         ts = meeting.timeslot_set.exclude(pk__in=timeslots_before).first()  # only 1
         self.assertEqual(ts.name, post_data['name'])
         self.assertEqual(ts.type_id, post_data['type'])
-        self.assertEqual(ts.time.date(), other_date)
-        self.assertEqual(ts.time.strftime('%H:%M'), post_data['time'])
+        self.assertEqual(ts.local_start_time().date(), other_date)
+        self.assertEqual(ts.local_start_time().strftime('%H:%M'), post_data['time'])
         self.assertEqual(str(ts.duration), '{}:00'.format(post_data['duration']))  # add seconds
         self.assertEqual(ts.show_location, post_data['show_location'])
         self.assertEqual(str(ts.location.pk), post_data['locations'])
@@ -2419,8 +3041,8 @@ def test_create_bulk_timeslots(self):
         """Creating multiple timeslots should work"""
         meeting = self.create_meeting()
         timeslots_before = set(ts.pk for ts in meeting.timeslot_set.all())
-        days = [meeting.get_meeting_date(n).date() for n in range(meeting.days)]
-        other_date = meeting.get_meeting_date(-1).date()  # date before start of meeting
+        days = [meeting.get_meeting_date(n) for n in range(meeting.days)]
+        other_date = meeting.get_meeting_date(-1)  # date before start of meeting
         self.assertNotIn(other_date, days)
         locations = meeting.room_set.all()
         post_data = dict(
@@ -2450,16 +3072,27 @@ def test_create_bulk_timeslots(self):
         for ts in meeting.timeslot_set.exclude(pk__in=timeslots_before):
             self.assertEqual(ts.name, post_data['name'])
             self.assertEqual(ts.type_id, post_data['type'])
-            self.assertEqual(ts.time.strftime('%H:%M'), post_data['time'])
+            self.assertEqual(ts.local_start_time().strftime('%H:%M'), post_data['time'])
             self.assertEqual(str(ts.duration), '{}:00'.format(post_data['duration']))  # add seconds
             self.assertEqual(ts.show_location, post_data['show_location'])
-            self.assertIn(ts.time.date(), days)
+            self.assertIn(ts.local_start_time().date(), days)
             self.assertIn(ts.location, locations)
             self.assertIn((ts.time.date(), ts.location), day_locs,
                           'Duplicated day / location found')
             day_locs.discard((ts.time.date(), ts.location))
         self.assertEqual(day_locs, set(), 'Not all day/location combinations created')
 
+    def test_sched_param_preserved(self):
+        meeting = MeetingFactory(type_id='ietf')
+        url = urlreverse('ietf.meeting.views.edit_timeslots', kwargs={'num': meeting.number})
+        self.client.login(username='secretary', password='secretary+password')
+        r = self.client.get(url)
+        self.assertNotContains(r, '?sched=', status_code=200)
+        self.assertNotContains(r, "Back to agenda")
+        r = self.client.get(url + '?sched=1234')
+        self.assertContains(r, '?sched=1234', status_code=200)  # could check in more detail
+        self.assertContains(r, "Back to agenda")
+
     def test_ajax_delete_timeslot(self):
         """AJAX call to delete timeslot should work"""
         meeting = self.create_bare_meeting()
@@ -2590,10 +3223,12 @@ def test_ajax_delete_timeslots_invalid(self):
 
 class ReorderSlidesTests(TestCase):
 
-    def test_add_slides_to_session(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_add_slides_to_session(self, mock_slides_manager_cls):
         for type_id in ('ietf','interim'):
             chair_role = RoleFactory(name_id='chair')
-            session = SessionFactory(group=chair_role.group, meeting__date=datetime.date.today()-datetime.timedelta(days=90), meeting__type_id=type_id)
+            session = SessionFactory(group=chair_role.group, meeting__date=date_today() - datetime.timedelta(days=90), meeting__type_id=type_id)
             slides = DocumentFactory(type_id='slides')
             url = urlreverse('ietf.meeting.views.ajax_add_slides_to_session', kwargs={'session_id':session.pk, 'num':session.meeting.number})
 
@@ -2601,6 +3236,7 @@ def test_add_slides_to_session(self):
             r = self.client.post(url, {'order':1, 'name':slides.name })
             self.assertEqual(r.status_code, 403)
             self.assertIn('have permission', unicontent(r))
+            self.assertFalse(mock_slides_manager_cls.called)
 
             self.client.login(username=chair_role.person.user.username, password=chair_role.person.user.username+"+password")
 
@@ -2608,8 +3244,9 @@ def test_add_slides_to_session(self):
             r = self.client.post(url, {'order':0, 'name':slides.name })
             self.assertEqual(r.status_code, 403)
             self.assertIn('materials cutoff', unicontent(r))
+            self.assertFalse(mock_slides_manager_cls.called)
 
-            session.meeting.date = datetime.date.today()
+            session.meeting.date = date_today()
             session.meeting.save()
 
             # Invalid order
@@ -2617,54 +3254,67 @@ def test_add_slides_to_session(self):
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('No data',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'garbage':'garbage'})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('order is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'order':0, 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('order is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'order':2, 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('order is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'order':'garbage', 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('order is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             # Invalid name
             r = self.client.post(url, {'order':1 })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('name is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'order':1, 'name':'garbage' })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('name is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             # Valid post
             r = self.client.post(url, {'order':1, 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(session.sessionpresentation_set.count(),1)
-
-            # Ingore a request to add slides that are already in a session
+            self.assertEqual(session.presentations.count(),1)
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.add.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.add.call_args, call(session=session, slides=slides, order=1))
+            mock_slides_manager_cls.reset_mock()
+
+            # Ignore a request to add slides that are already in a session
             r = self.client.post(url, {'order':1, 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(session.sessionpresentation_set.count(),1)
+            self.assertEqual(session.presentations.count(),1)
+            self.assertFalse(mock_slides_manager_cls.called)
 
 
             session2 = SessionFactory(group=session.group, meeting=session.meeting)
             SessionPresentationFactory.create_batch(3, document__type_id='slides', session=session2)
-            for num, sp in enumerate(session2.sessionpresentation_set.filter(document__type_id='slides'),start=1):
+            for num, sp in enumerate(session2.presentations.filter(document__type_id='slides'),start=1):
                 sp.order = num
                 sp.save()
 
@@ -2676,27 +3326,44 @@ def test_add_slides_to_session(self):
             r = self.client.post(url, {'order':1, 'name':more_slides[0].name})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(session2.sessionpresentation_set.get(document=more_slides[0]).order,1)
-            self.assertEqual(list(session2.sessionpresentation_set.order_by('order').values_list('order',flat=True)), list(range(1,5)))
+            self.assertEqual(session2.presentations.get(document=more_slides[0]).order,1)
+            self.assertEqual(list(session2.presentations.order_by('order').values_list('order',flat=True)), list(range(1,5)))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.add.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.add.call_args, call(session=session2, slides=more_slides[0], order=1))
+            mock_slides_manager_cls.reset_mock()
 
             # Insert at end
             r = self.client.post(url, {'order':5, 'name':more_slides[1].name})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(session2.sessionpresentation_set.get(document=more_slides[1]).order,5)
-            self.assertEqual(list(session2.sessionpresentation_set.order_by('order').values_list('order',flat=True)), list(range(1,6)))
+            self.assertEqual(session2.presentations.get(document=more_slides[1]).order,5)
+            self.assertEqual(list(session2.presentations.order_by('order').values_list('order',flat=True)), list(range(1,6)))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.add.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.add.call_args, call(session=session2, slides=more_slides[1], order=5))
+            mock_slides_manager_cls.reset_mock()
 
             # Insert in middle
             r = self.client.post(url, {'order':3, 'name':more_slides[2].name})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(session2.sessionpresentation_set.get(document=more_slides[2]).order,3)
-            self.assertEqual(list(session2.sessionpresentation_set.order_by('order').values_list('order',flat=True)), list(range(1,7)))
-
-    def test_remove_slides_from_session(self):
+            self.assertEqual(session2.presentations.get(document=more_slides[2]).order,3)
+            self.assertEqual(list(session2.presentations.order_by('order').values_list('order',flat=True)), list(range(1,7)))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.add.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.add.call_args, call(session=session2, slides=more_slides[2], order=3))
+            mock_slides_manager_cls.reset_mock()
+
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_remove_slides_from_session(self, mock_slides_manager_cls):
         for type_id in ['ietf','interim']:
             chair_role = RoleFactory(name_id='chair')
-            session = SessionFactory(group=chair_role.group, meeting__date=datetime.date.today()-datetime.timedelta(days=90), meeting__type_id=type_id)
+            session = SessionFactory(group=chair_role.group, meeting__date=date_today()-datetime.timedelta(days=90), meeting__type_id=type_id)
             slides = DocumentFactory(type_id='slides')
             url = urlreverse('ietf.meeting.views.ajax_remove_slides_from_session', kwargs={'session_id':session.pk, 'num':session.meeting.number})
 
@@ -2704,6 +3371,7 @@ def test_remove_slides_from_session(self):
             r = self.client.post(url, {'oldIndex':1, 'name':slides.name })
             self.assertEqual(r.status_code, 403)
             self.assertIn('have permission', unicontent(r))
+            self.assertFalse(mock_slides_manager_cls.called)
 
             self.client.login(username=chair_role.person.user.username, password=chair_role.person.user.username+"+password")
             
@@ -2711,8 +3379,9 @@ def test_remove_slides_from_session(self):
             r = self.client.post(url, {'oldIndex':0, 'name':slides.name })
             self.assertEqual(r.status_code, 403)
             self.assertIn('materials cutoff', unicontent(r))
+            self.assertFalse(mock_slides_manager_cls.called)
 
-            session.meeting.date = datetime.date.today()
+            session.meeting.date = date_today()
             session.meeting.save()
 
             # Invalid order
@@ -2720,40 +3389,47 @@ def test_remove_slides_from_session(self):
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('No data',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'garbage':'garbage'})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('index is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'oldIndex':0, 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('index is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'oldIndex':'garbage', 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('index is not valid',r.json()['error'])
-           
+            self.assertFalse(mock_slides_manager_cls.called)
+
             # No matching thing to delete
             r = self.client.post(url, {'oldIndex':1, 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('index is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
-            session.sessionpresentation_set.create(document=slides, rev=slides.rev, order=1)
+            session.presentations.create(document=slides, rev=slides.rev, order=1)
 
             # Bad names
             r = self.client.post(url, {'oldIndex':1})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('name is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'oldIndex':1, 'name':'garbage' })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('name is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             slides2 = DocumentFactory(type_id='slides')
 
@@ -2762,22 +3438,29 @@ def test_remove_slides_from_session(self):
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('SessionPresentation not found',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
-            session.sessionpresentation_set.create(document=slides2, rev=slides2.rev, order=2)
+            session.presentations.create(document=slides2, rev=slides2.rev, order=2)
             r = self.client.post(url, {'oldIndex':1, 'name':slides2.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('Name does not match index',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             # valid removal
             r = self.client.post(url, {'oldIndex':1, 'name':slides.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(session.sessionpresentation_set.count(),1)
+            self.assertEqual(session.presentations.count(),1)
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.delete.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.delete.call_args, call(session=session, slides=slides))
+            mock_slides_manager_cls.reset_mock()
 
             session2 = SessionFactory(group=session.group, meeting=session.meeting)
             sp_list = SessionPresentationFactory.create_batch(5, document__type_id='slides', session=session2)
-            for num, sp in enumerate(session2.sessionpresentation_set.filter(document__type_id='slides'),start=1):
+            for num, sp in enumerate(session2.presentations.filter(document__type_id='slides'),start=1):
                 sp.order = num
                 sp.save()
 
@@ -2787,28 +3470,47 @@ def test_remove_slides_from_session(self):
             r = self.client.post(url, {'oldIndex':1, 'name':sp_list[0].document.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertFalse(session2.sessionpresentation_set.filter(pk=sp_list[0].pk).exists())
-            self.assertEqual(list(session2.sessionpresentation_set.order_by('order').values_list('order',flat=True)), list(range(1,5)))
+            self.assertFalse(session2.presentations.filter(pk=sp_list[0].pk).exists())
+            self.assertEqual(list(session2.presentations.order_by('order').values_list('order',flat=True)), list(range(1,5)))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.delete.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.delete.call_args, call(session=session2, slides=sp_list[0].document))
+            mock_slides_manager_cls.reset_mock()
 
             # delete in middle of list
             r = self.client.post(url, {'oldIndex':4, 'name':sp_list[4].document.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertFalse(session2.sessionpresentation_set.filter(pk=sp_list[4].pk).exists())
-            self.assertEqual(list(session2.sessionpresentation_set.order_by('order').values_list('order',flat=True)), list(range(1,4)))
+            self.assertFalse(session2.presentations.filter(pk=sp_list[4].pk).exists())
+            self.assertEqual(list(session2.presentations.order_by('order').values_list('order',flat=True)), list(range(1,4)))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.delete.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.delete.call_args, call(session=session2, slides=sp_list[4].document))
+            mock_slides_manager_cls.reset_mock()
 
             # delete at end of list
             r = self.client.post(url, {'oldIndex':2, 'name':sp_list[2].document.name })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertFalse(session2.sessionpresentation_set.filter(pk=sp_list[2].pk).exists())
-            self.assertEqual(list(session2.sessionpresentation_set.order_by('order').values_list('order',flat=True)), list(range(1,3)))
-
-
-    def test_reorder_slides_in_session(self):
+            self.assertFalse(session2.presentations.filter(pk=sp_list[2].pk).exists())
+            self.assertEqual(list(session2.presentations.order_by('order').values_list('order',flat=True)), list(range(1,3)))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.delete.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.delete.call_args, call(session=session2, slides=sp_list[2].document))
+            mock_slides_manager_cls.reset_mock()
+
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_reorder_slides_in_session(self, mock_slides_manager_cls):
+        def _sppk_at(sppk, positions):
+            return [sppk[p-1] for p in positions]
         chair_role = RoleFactory(name_id='chair')
-        session = SessionFactory(group=chair_role.group, meeting__date=datetime.date.today()-datetime.timedelta(days=90))
+        session = SessionFactory(group=chair_role.group, meeting__date=date_today() - datetime.timedelta(days=90))
         sp_list = SessionPresentationFactory.create_batch(5, document__type_id='slides', session=session)
+        sppk = [o.pk for o in sp_list]
         for num, sp in enumerate(sp_list, start=1):
             sp.order = num
             sp.save()
@@ -2817,13 +3519,14 @@ def test_reorder_slides_in_session(self):
         for type_id in ['ietf','interim']:
             
             session.meeting.type_id = type_id
-            session.meeting.date = datetime.date.today()-datetime.timedelta(days=90)
+            session.meeting.date = date_today()-datetime.timedelta(days=90)
             session.meeting.save()
 
             # Not a valid user
             r = self.client.post(url, {'oldIndex':1, 'newIndex':2 })
             self.assertEqual(r.status_code, 403)
             self.assertIn('have permission', unicontent(r))
+            self.assertFalse(mock_slides_manager_cls.called)
 
             self.client.login(username=chair_role.person.user.username, password=chair_role.person.user.username+"+password")
 
@@ -2831,8 +3534,9 @@ def test_reorder_slides_in_session(self):
             r = self.client.post(url, {'oldIndex':1, 'newIndex':2 })
             self.assertEqual(r.status_code, 403)
             self.assertIn('materials cutoff', unicontent(r))
+            self.assertFalse(mock_slides_manager_cls.called)
 
-            session.meeting.date = datetime.date.today()
+            session.meeting.date = date_today()
             session.meeting.save()
 
             # Bad index values
@@ -2840,66 +3544,104 @@ def test_reorder_slides_in_session(self):
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('index is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'oldIndex':2, 'newIndex':6 })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('index is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             r = self.client.post(url, {'oldIndex':2, 'newIndex':2 })
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],False)
             self.assertIn('index is not valid',r.json()['error'])
+            self.assertFalse(mock_slides_manager_cls.called)
 
             # Move from beginning
             r = self.client.post(url, {'oldIndex':1, 'newIndex':3})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(list(session.sessionpresentation_set.order_by('order').values_list('pk',flat=True)),[2,3,1,4,5])
+            self.assertEqual(list(session.presentations.order_by('order').values_list('pk',flat=True)),_sppk_at(sppk,[2,3,1,4,5]))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.send_update.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_args, call(session))
+            mock_slides_manager_cls.reset_mock()
 
             # Move to beginning
             r = self.client.post(url, {'oldIndex':3, 'newIndex':1})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(list(session.sessionpresentation_set.order_by('order').values_list('pk',flat=True)),[1,2,3,4,5])
-            
+            self.assertEqual(list(session.presentations.order_by('order').values_list('pk',flat=True)),_sppk_at(sppk,[1,2,3,4,5]))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.send_update.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_args, call(session))
+            mock_slides_manager_cls.reset_mock()
+
             # Move from end
             r = self.client.post(url, {'oldIndex':5, 'newIndex':3})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(list(session.sessionpresentation_set.order_by('order').values_list('pk',flat=True)),[1,2,5,3,4])
+            self.assertEqual(list(session.presentations.order_by('order').values_list('pk',flat=True)),_sppk_at(sppk,[1,2,5,3,4]))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.send_update.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_args, call(session))
+            mock_slides_manager_cls.reset_mock()
 
             # Move to end
             r = self.client.post(url, {'oldIndex':3, 'newIndex':5})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(list(session.sessionpresentation_set.order_by('order').values_list('pk',flat=True)),[1,2,3,4,5])
+            self.assertEqual(list(session.presentations.order_by('order').values_list('pk',flat=True)),_sppk_at(sppk,[1,2,3,4,5]))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.send_update.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_args, call(session))
+            mock_slides_manager_cls.reset_mock()
 
             # Move beginning to end
             r = self.client.post(url, {'oldIndex':1, 'newIndex':5})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(list(session.sessionpresentation_set.order_by('order').values_list('pk',flat=True)),[2,3,4,5,1])
+            self.assertEqual(list(session.presentations.order_by('order').values_list('pk',flat=True)),_sppk_at(sppk,[2,3,4,5,1]))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.send_update.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_args, call(session))
+            mock_slides_manager_cls.reset_mock()
 
             # Move middle to middle 
             r = self.client.post(url, {'oldIndex':3, 'newIndex':4})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(list(session.sessionpresentation_set.order_by('order').values_list('pk',flat=True)),[2,3,5,4,1])
+            self.assertEqual(list(session.presentations.order_by('order').values_list('pk',flat=True)),_sppk_at(sppk,[2,3,5,4,1]))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.send_update.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_args, call(session))
+            mock_slides_manager_cls.reset_mock()
 
             r = self.client.post(url, {'oldIndex':3, 'newIndex':2})
             self.assertEqual(r.status_code, 200)
             self.assertEqual(r.json()['success'],True)
-            self.assertEqual(list(session.sessionpresentation_set.order_by('order').values_list('pk',flat=True)),[2,5,3,4,1])
+            self.assertEqual(list(session.presentations.order_by('order').values_list('pk',flat=True)),_sppk_at(sppk,[2,5,3,4,1]))
+            self.assertTrue(mock_slides_manager_cls.called)
+            self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+            self.assertTrue(mock_slides_manager_cls.return_value.send_update.called)
+            self.assertEqual(mock_slides_manager_cls.return_value.send_update.call_args, call(session))
+            mock_slides_manager_cls.reset_mock()
 
             # Reset for next iteration in the loop
-            session.sessionpresentation_set.update(order=F('pk'))
+            session.presentations.update(order=F('pk'))
             self.client.logout()
 
 
     def test_slide_order_reconditioning(self):
         chair_role = RoleFactory(name_id='chair')
-        session = SessionFactory(group=chair_role.group, meeting__date=datetime.date.today()-datetime.timedelta(days=90))
+        session = SessionFactory(group=chair_role.group, meeting__date=date_today() - datetime.timedelta(days=90))
         sp_list = SessionPresentationFactory.create_batch(5, document__type_id='slides', session=session)
         for num, sp in enumerate(sp_list, start=1):
             sp.order = 2*num
@@ -2910,7 +3652,7 @@ def test_slide_order_reconditioning(self):
         except AssertionError:
             pass
 
-        self.assertEqual(list(session.sessionpresentation_set.order_by('order').values_list('order',flat=True)),list(range(1,6)))
+        self.assertEqual(list(session.presentations.order_by('order').values_list('order',flat=True)),list(range(1,6)))
 
 
 class EditTests(TestCase):
@@ -2918,7 +3660,7 @@ class EditTests(TestCase):
 
     def test_official_record_schedule_is_read_only(self):
         def _set_date_offset_and_retrieve_page(meeting, days_offset, client):
-            meeting.date = datetime.date.today() + datetime.timedelta(days=days_offset)
+            meeting.date = date_today() + datetime.timedelta(days=days_offset)
             meeting.save()
             client.login(username="secretary", password="secretary+password")
             url = urlreverse("ietf.meeting.views.edit_meeting_schedule", kwargs=dict(num=meeting.number))
@@ -3001,7 +3743,9 @@ def test_edit_meeting_schedule(self):
         room = Room.objects.get(meeting=meeting, session_types='regular')
         base_timeslot = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
                                                 duration=datetime.timedelta(minutes=50),
-                                                time=datetime.datetime.combine(meeting.date + datetime.timedelta(days=2), datetime.time(9, 30)))
+                                                time=meeting.tz().localize(
+                                                    datetime.datetime.combine(meeting.date + datetime.timedelta(days=2), datetime.time(9, 30))
+                                                ))
 
         timeslots = list(TimeSlot.objects.filter(meeting=meeting, type='regular').order_by('time'))
 
@@ -3027,6 +3771,20 @@ def test_edit_meeting_schedule(self):
         for s in [s1, s2]:
             e = q("#session{}".format(s.pk))
 
+            # should be link to edit/cancel session
+            edit_session_url = urlreverse(
+                'ietf.meeting.views.edit_session', kwargs={'session_id': s.pk}
+            ) + f'?sched={meeting.schedule.pk}'
+            self.assertTrue(
+                e.find(f'a[href="{edit_session_url}"]')
+            )
+            self.assertTrue(
+                e.find('a[href="{}?sched={}"]'.format(
+                    urlreverse('ietf.meeting.views.cancel_session', kwargs={'session_id': s.pk}),
+                    meeting.schedule.pk,
+                ))
+            )
+
             # info in the item representing the session that can be moved around
             self.assertIn(s.group.acronym, e.find(".session-label").text())
             if s.comments:
@@ -3223,7 +3981,12 @@ def test_edit_meeting_timeslots_and_misc_sessions(self):
         self.assertIn("#scroll=1234", r['Location'])
 
         test_timeslot = TimeSlot.objects.get(meeting=meeting, name="IETF Testing")
-        self.assertEqual(test_timeslot.time, datetime.datetime.combine(meeting.date, datetime.time(8, 30)))
+        self.assertEqual(
+            test_timeslot.time,
+            meeting.tz().localize(
+                datetime.datetime.combine(meeting.date, datetime.time(8, 30))
+            ),
+        )
         self.assertEqual(test_timeslot.duration, datetime.timedelta(hours=1, minutes=30))
         self.assertEqual(test_timeslot.location_id, break_room.pk)
         self.assertEqual(test_timeslot.show_location, True)
@@ -3265,7 +4028,12 @@ def test_edit_meeting_timeslots_and_misc_sessions(self):
         })
         self.assertNoFormPostErrors(r)
         test_timeslot.refresh_from_db()
-        self.assertEqual(test_timeslot.time, datetime.datetime.combine(meeting.date, datetime.time(9, 30)))
+        self.assertEqual(
+            test_timeslot.time,
+            meeting.tz().localize(
+                datetime.datetime.combine(meeting.date, datetime.time(9, 30))
+            ),
+        )
         self.assertEqual(test_timeslot.duration, datetime.timedelta(hours=1))
         self.assertEqual(test_timeslot.location_id, breakfast_room.pk)
         self.assertEqual(test_timeslot.show_location, False)
@@ -3550,7 +4318,7 @@ def test_new_meeting_schedule_rejects_invalid_names(self):
             'base': meeting.schedule.base_id,
         })
         self.assertEqual(r.status_code, 200)
-        self.assertFormError(r, 'form', 'name', 'Enter a valid value.')
+        self.assertFormError(r.context["form"], 'name', 'Enter a valid value.')
         self.assertEqual(meeting.schedule_set.count(), orig_schedule_count, 'Schedule should not be created')
 
         r = self.client.post(url, {
@@ -3560,7 +4328,7 @@ def test_new_meeting_schedule_rejects_invalid_names(self):
             'base': meeting.schedule.base_id,
         })
         self.assertEqual(r.status_code, 200)
-        self.assertFormError(r, 'form', 'name', 'Enter a valid value.')
+        self.assertFormError(r.context["form"], 'name', 'Enter a valid value.')
         self.assertEqual(meeting.schedule_set.count(), orig_schedule_count, 'Schedule should not be created')
 
         # Non-ASCII alphanumeric characters
@@ -3571,16 +4339,20 @@ def test_new_meeting_schedule_rejects_invalid_names(self):
             'base': meeting.schedule.base_id,
         })
         self.assertEqual(r.status_code, 200)
-        self.assertFormError(r, 'form', 'name', 'Enter a valid value.')
+        self.assertFormError(r.context["form"], 'name', 'Enter a valid value.')
         self.assertEqual(meeting.schedule_set.count(), orig_schedule_count, 'Schedule should not be created')
 
     def test_edit_session(self):
         session = SessionFactory(meeting__type_id='ietf', group__type_id='team')  # type determines allowed session purposes
+        edit_meeting_url = urlreverse('ietf.meeting.views.edit_meeting_schedule', kwargs={'num': session.meeting.number})
         self.client.login(username='secretary', password='secretary+password')
         url = urlreverse('ietf.meeting.views.edit_session', kwargs={'session_id': session.pk})
         r = self.client.get(url)
         self.assertContains(r, 'Edit session', status_code=200)
-        r = self.client.post(url, {
+        pq = PyQuery(r.content)
+        back_button = pq(f'a[href="{edit_meeting_url}"]')
+        self.assertEqual(len(back_button), 1)
+        post_data = {
             'name': 'this is a name',
             'short': 'tian',
             'purpose': 'coding',
@@ -3590,10 +4362,11 @@ def test_edit_session(self):
             'remote_instructions': 'Do this do that',
             'attendees': '103',
             'comments': 'So much to say',
-        })
+            'chat_room': 'xyzzy',
+        }
+        r = self.client.post(url, post_data)
         self.assertNoFormPostErrors(r)
-        self.assertRedirects(r, urlreverse('ietf.meeting.views.edit_meeting_schedule',
-                                           kwargs={'num': session.meeting.number}))
+        self.assertRedirects(r, edit_meeting_url)
         session = Session.objects.get(pk=session.pk)  # refresh objects from DB
         self.assertEqual(session.name, 'this is a name')
         self.assertEqual(session.short, 'tian')
@@ -3604,6 +4377,72 @@ def test_edit_session(self):
         self.assertEqual(session.remote_instructions, 'Do this do that')
         self.assertEqual(session.attendees, 103)
         self.assertEqual(session.comments, 'So much to say')
+        self.assertEqual(session.chat_room, 'xyzzy')
+
+        # Verify return to correct schedule when sched query parameter is present
+        other_schedule = ScheduleFactory(meeting=session.meeting)
+        r = self.client.get(url + f'?sched={other_schedule.pk}')
+        edit_meeting_url = urlreverse(
+            'ietf.meeting.views.edit_meeting_schedule',
+            kwargs={
+                'num': session.meeting.number,
+                'owner': other_schedule.owner.email(),
+                'name': other_schedule.name,
+            },
+        )
+        pq = PyQuery(r.content)
+        back_button = pq(f'a[href="{edit_meeting_url}"]')
+        self.assertEqual(len(back_button), 1)
+        r = self.client.post(url + f'?sched={other_schedule.pk}', post_data)
+        self.assertRedirects(r, edit_meeting_url)
+
+    def test_cancel_session(self):
+        # session for testing with official schedule
+        session = SessionFactory(meeting__type_id='ietf')
+        url = urlreverse('ietf.meeting.views.cancel_session', kwargs={'session_id': session.pk})
+        return_url = urlreverse('ietf.meeting.views.edit_meeting_schedule', kwargs={'num': session.meeting.number})
+        # session for testing with unofficial schedule
+        other_session = SessionFactory(meeting=session.meeting)
+        unofficial_schedule = ScheduleFactory(meeting=other_session.meeting)
+        url_unofficial = urlreverse(
+            'ietf.meeting.views.cancel_session',
+            kwargs={'session_id': other_session.pk},
+        ) + f'?sched={unofficial_schedule.pk}'
+        return_url_unofficial = urlreverse(
+            'ietf.meeting.views.edit_meeting_schedule',
+            kwargs={
+                'num': other_session.meeting.number,
+                'name': unofficial_schedule.name,
+                'owner': unofficial_schedule.owner_email(),
+            },
+        )
+
+        login_testing_unauthorized(self, 'secretary', url)
+        r = self.client.get(url)
+        self.assertContains(r, 'Cancel session', status_code=200)
+        self.assertIn(return_url, r.content.decode())
+        r = self.client.get(url_unofficial)
+        self.assertContains(r, 'Cancel session', status_code=200)
+        self.assertIn(return_url_unofficial, r.content.decode())
+
+        r = self.client.post(url, {})
+        self.assertFormError(r.context["form"], 'confirmed', 'This field is required.')
+        r = self.client.post(url_unofficial, {})
+        self.assertFormError(r.context["form"], 'confirmed', 'This field is required.')
+
+        r = self.client.post(url, {'confirmed': 'on'})
+        self.assertRedirects(r, return_url)
+        session = Session.objects.with_current_status().get(pk=session.pk)
+        self.assertEqual(session.current_status, 'canceled')
+        r = self.client.get(url)
+        self.assertRedirects(r, return_url)  # should redirect immediately when session is already canceled
+
+        r = self.client.post(url_unofficial, {'confirmed': 'on'})
+        self.assertRedirects(r, return_url_unofficial)
+        other_session = Session.objects.with_current_status().get(pk=other_session.pk)
+        self.assertEqual(other_session.current_status, 'canceled')
+        r = self.client.get(url_unofficial)
+        self.assertRedirects(r, return_url_unofficial)  # should redirect immediately when session is already canceled
 
     def test_edit_timeslots(self):
         meeting = make_meeting_test_data()
@@ -3706,11 +4545,12 @@ def test_persistent_enabled_timeslot_types(self):
 
 
 class SessionDetailsTests(TestCase):
+    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['SLIDE_STAGING_PATH']
 
     def test_session_details(self):
 
         group = GroupFactory.create(type_id='wg',state_id='active')
-        session = SessionFactory.create(meeting__type_id='ietf',group=group, meeting__date=datetime.date.today()+datetime.timedelta(days=90))
+        session = SessionFactory.create(meeting__type_id='ietf',group=group, meeting__date=date_today() + datetime.timedelta(days=90))
         SessionPresentationFactory.create(session=session,document__type_id='draft',rev=None)
         SessionPresentationFactory.create(session=session,document__type_id='minutes')
         SessionPresentationFactory.create(session=session,document__type_id='slides')
@@ -3729,7 +4569,7 @@ def test_session_details_has_import_minutes_buttons(self):
         session = SessionFactory.create(
             meeting__type_id='ietf',
             group=group,
-            meeting__date=datetime.date.today() + datetime.timedelta(days=90),
+            meeting__date=date_today() + datetime.timedelta(days=90),
         )
         session_details_url = urlreverse(
             'ietf.meeting.views.session_details',
@@ -3781,7 +4621,7 @@ def test_session_details_has_import_minutes_buttons(self):
     def test_session_details_past_interim(self):
         group = GroupFactory.create(type_id='wg',state_id='active')
         chair = RoleFactory(name_id='chair',group=group)
-        session = SessionFactory.create(meeting__type_id='interim',group=group, meeting__date=datetime.date.today()-datetime.timedelta(days=90))
+        session = SessionFactory.create(meeting__type_id='interim',group=group, meeting__date=date_today() - datetime.timedelta(days=90))
         SessionPresentationFactory.create(session=session,document__type_id='draft',rev=None)
         SessionPresentationFactory.create(session=session,document__type_id='minutes')
         SessionPresentationFactory.create(session=session,document__type_id='slides')
@@ -3800,9 +4640,9 @@ def test_add_session_drafts(self):
         group = GroupFactory.create(type_id='wg',state_id='active')
         group_chair = PersonFactory.create()
         group.role_set.create(name_id='chair',person = group_chair, email = group_chair.email())
-        session = SessionFactory.create(meeting__type_id='ietf',group=group, meeting__date=datetime.date.today()+datetime.timedelta(days=90))
+        session = SessionFactory.create(meeting__type_id='ietf',group=group, meeting__date=date_today() + datetime.timedelta(days=90))
         SessionPresentationFactory.create(session=session,document__type_id='draft',rev=None)
-        old_draft = session.sessionpresentation_set.filter(document__type='draft').first().document
+        old_draft = session.presentations.filter(document__type='draft').first().document
         new_draft = DocumentFactory(type_id='draft')
 
         url = urlreverse('ietf.meeting.views.add_session_drafts', kwargs=dict(num=session.meeting.number, session_id=session.pk))
@@ -3823,10 +4663,10 @@ def test_add_session_drafts(self):
         q = PyQuery(r.content)
         self.assertIn("Already linked:", q('form .text-danger').text())
 
-        self.assertEqual(1,session.sessionpresentation_set.count())
+        self.assertEqual(1,session.presentations.count())
         r = self.client.post(url,dict(drafts=[new_draft.pk,]))
         self.assertTrue(r.status_code, 302)
-        self.assertEqual(2,session.sessionpresentation_set.count())
+        self.assertEqual(2,session.presentations.count())
 
         session.meeting.date -= datetime.timedelta(days=180)
         session.meeting.save()
@@ -3838,86 +4678,243 @@ def test_add_session_drafts(self):
         q = PyQuery(r.content)
         self.assertEqual(1,len(q(".alert-warning:contains('may affect published proceedings')")))
 
-class EditScheduleListTests(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.mtg = MeetingFactory(type_id='ietf')
-        ScheduleFactory(meeting=self.mtg, name='secretary1')
-
-    def test_list_schedules(self):
-        url = urlreverse('ietf.meeting.views.list_schedules',kwargs={'num':self.mtg.number})
-        login_testing_unauthorized(self,"secretary",url)
-        r = self.client.get(url)
-        self.assertTrue(r.status_code, 200)
-
-    def test_diff_schedules(self):
-        meeting = make_meeting_test_data()
-
-        url = urlreverse('ietf.meeting.views.diff_schedules',kwargs={'num':meeting.number})
-        login_testing_unauthorized(self,"secretary", url)
-        r = self.client.get(url)
-        self.assertTrue(r.status_code, 200)
-
-        from_schedule = Schedule.objects.get(meeting=meeting, name="test-unofficial-schedule")
-
-        session1 = Session.objects.filter(meeting=meeting, group__acronym='mars').first()
-        session2 = Session.objects.filter(meeting=meeting, group__acronym='ames').first()
-        session3 = SessionFactory(meeting=meeting, group=Group.objects.get(acronym='mars'),
-                                  attendees=10, requested_duration=datetime.timedelta(minutes=70),
-                                  add_to_schedule=False)
-        SchedulingEvent.objects.create(session=session3, status_id='schedw', by=Person.objects.first())
-
-        slot2 = TimeSlot.objects.filter(meeting=meeting, type='regular').order_by('-time').first()
-        slot3 = TimeSlot.objects.create(
-            meeting=meeting, type_id='regular', location=slot2.location,
-            duration=datetime.timedelta(minutes=60),
-            time=slot2.time + datetime.timedelta(minutes=60),
+    def test_proposed_slides_for_approval(self):
+        # This test overlaps somewhat with MaterialsTests of proposed slides handling. The focus
+        # here is on the display of slides, not the approval action.
+        group = GroupFactory()
+        meeting = MeetingFactory(
+            type_id="ietf", date=date_today() + datetime.timedelta(days=10)
         )
+        sessions = SessionFactory.create_batch(
+            2,
+            group=group,
+            meeting=meeting,
+        )
+    
+        # slides submission _not_ in the `pending` state
+        do_not_show = [
+            SlideSubmissionFactory(
+                session=sessions[0],
+                title="already approved",
+                status_id="approved",
+            ),
+            SlideSubmissionFactory(
+                session=sessions[1],
+                title="already rejected",
+                status_id="rejected",
+            ),
+        ]
+    
+        # pending submissions
+        first_session_pending = SlideSubmissionFactory(
+            session=sessions[0], title="first session title"
+        )
+        second_session_pending = SlideSubmissionFactory(
+            session=sessions[1], title="second session title"
+        )
+    
+        # and their approval URLs
+        def _approval_url(slidesub):
+            return urlreverse(
+                "ietf.meeting.views.approve_proposed_slides",
+                kwargs={"slidesubmission_id": slidesub.pk, "num": meeting.number},
+            )
+    
+        first_approval_url = _approval_url(first_session_pending)
+        second_approval_url = _approval_url(second_session_pending)
+        do_not_show_urls = [_approval_url(ss) for ss in do_not_show]
+    
+        # Retrieve the URL as a group chair
+        url = urlreverse(
+            "ietf.meeting.views.session_details",
+            kwargs={
+                "num": meeting.number,
+                "acronym": group.acronym,
+            },
+        )
+        chair = RoleFactory(group=group, name_id="chair").person
+        self.client.login(
+            username=chair.user.username, password=f"{chair.user.username}+password"
+        )
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        pq = PyQuery(r.content)
+        self.assertEqual(
+            len(pq(f'a[href="{first_approval_url}"]')),
+            1,
+            "first session proposed slides should be linked for approval",
+        )
+        self.assertEqual(
+            len(pq(f'a[href="{second_approval_url}"]')),
+            1,
+            "second session proposed slides should be linked for approval",
+        )
+        for no_show_url in do_not_show_urls:
+            self.assertEqual(
+                len(pq(f'a[href="{no_show_url}"]')),
+                0,
+                "second session proposed slides should be linked for approval",
+            )
 
-        # copy
-        new_url = urlreverse("ietf.meeting.views.new_meeting_schedule", kwargs=dict(num=meeting.number, owner=from_schedule.owner_email(), name=from_schedule.name))
-        r = self.client.post(new_url, {
-            'name': "newtest",
-            'public': "on",
-        })
-        self.assertNoFormPostErrors(r)
-
-        to_schedule = Schedule.objects.get(meeting=meeting, name='newtest')
-
-        # make some changes
-
-        edit_url = urlreverse("ietf.meeting.views.edit_meeting_schedule", kwargs=dict(num=meeting.number, owner=to_schedule.owner_email(), name=to_schedule.name))
 
-        # schedule session
-        r = self.client.post(edit_url, {
-            'action': 'assign',
-            'timeslot': slot3.pk,
-            'session': session3.pk,
-        })
-        self.assertEqual(json.loads(r.content)['success'], True)
-        # unschedule session
-        r = self.client.post(edit_url, {
-            'action': 'unassign',
-            'session': session1.pk,
-        })
-        self.assertEqual(json.loads(r.content)['success'], True)
-        # move session
-        r = self.client.post(edit_url, {
-            'action': 'assign',
-            'timeslot': slot2.pk,
-            'session': session2.pk,
-        })
-        self.assertEqual(json.loads(r.content)['success'], True)
+class EditScheduleListTests(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.mtg = MeetingFactory(type_id='ietf')
+        ScheduleFactory(meeting=self.mtg, name='secretary1')
+
+    def test_list_schedules(self):
+        url = urlreverse('ietf.meeting.views.list_schedules',kwargs={'num':self.mtg.number})
+        login_testing_unauthorized(self,"secretary",url)
+        r = self.client.get(url)
+        self.assertTrue(r.status_code, 200)
+
+    def test_diff_schedules(self):
+        # Create meeting and some time slots
+        meeting = MeetingFactory(type_id="ietf", populate_schedule=False)
+        rooms = RoomFactory.create_batch(2, meeting=meeting)
+        # first index is room, second is time
+        timeslots = [
+            [
+                TimeSlotFactory(
+                    location=room,
+                    meeting=meeting,
+                    time=datetime.datetime.combine(
+                        meeting.date, datetime.time(9, 0, tzinfo=datetime.UTC)
+                    )
+                ),
+                TimeSlotFactory(
+                    location=room,
+                    meeting=meeting,
+                    time=datetime.datetime.combine(
+                        meeting.date, datetime.time(10, 0, tzinfo=datetime.UTC)
+                    )
+                ),
+                TimeSlotFactory(
+                    location=room,
+                    meeting=meeting,
+                    time=datetime.datetime.combine(
+                        meeting.date, datetime.time(11, 0, tzinfo=datetime.UTC)
+                    )
+                ),
+            ]
+            for room in rooms
+        ]
+        sessions = SessionFactory.create_batch(
+            5, meeting=meeting, add_to_schedule=False
+        )
 
-        # now get differences
+        from_schedule = ScheduleFactory(meeting=meeting)
+        to_schedule = ScheduleFactory(meeting=meeting)
+
+        # sessions[0]: not scheduled in from_schedule, scheduled in to_schedule
+        SchedTimeSessAssignment.objects.create(
+            schedule=to_schedule,
+            session=sessions[0],
+            timeslot=timeslots[0][0],
+        )
+        # sessions[1]: scheduled in from_schedule, not scheduled in to_schedule
+        SchedTimeSessAssignment.objects.create(
+            schedule=from_schedule,
+            session=sessions[1],
+            timeslot=timeslots[0][0],
+        )
+        # sessions[2]: moves rooms, not time
+        SchedTimeSessAssignment.objects.create(
+            schedule=from_schedule,
+            session=sessions[2],
+            timeslot=timeslots[0][1],
+        )
+        SchedTimeSessAssignment.objects.create(
+            schedule=to_schedule,
+            session=sessions[2],
+            timeslot=timeslots[1][1],
+        )
+        # sessions[3]: moves time, not room
+        SchedTimeSessAssignment.objects.create(
+            schedule=from_schedule,
+            session=sessions[3],
+            timeslot=timeslots[1][1],
+        )
+        SchedTimeSessAssignment.objects.create(
+            schedule=to_schedule,
+            session=sessions[3],
+            timeslot=timeslots[1][2],
+        )
+        # sessions[4]: moves room and time
+        SchedTimeSessAssignment.objects.create(
+            schedule=from_schedule,
+            session=sessions[4],
+            timeslot=timeslots[1][0],
+        )
+        SchedTimeSessAssignment.objects.create(
+            schedule=to_schedule,
+            session=sessions[4],
+            timeslot=timeslots[0][2],
+        )
+
+        # Check the raw diffs
+        raw_diffs = diff_meeting_schedules(from_schedule, to_schedule)
+        self.assertCountEqual(
+            raw_diffs,
+            [
+                {
+                    "change": "schedule",
+                    "session": sessions[0].pk,
+                    "to": timeslots[0][0].pk,
+                },
+                {
+                    "change": "unschedule",
+                    "session": sessions[1].pk,
+                    "from": timeslots[0][0].pk,
+                },
+                {
+                    "change": "move",
+                    "session": sessions[2].pk,
+                    "from": timeslots[0][1].pk,
+                    "to": timeslots[1][1].pk,
+                },
+                {
+                    "change": "move",
+                    "session": sessions[3].pk,
+                    "from": timeslots[1][1].pk,
+                    "to": timeslots[1][2].pk,
+                },
+                {
+                    "change": "move",
+                    "session": sessions[4].pk,
+                    "from": timeslots[1][0].pk,
+                    "to": timeslots[0][2].pk,
+                },
+            ]
+        )
+
+        # Check the view
+        url = urlreverse("ietf.meeting.views.diff_schedules",
+                         kwargs={"num": meeting.number})
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertTrue(r.status_code, 200)
+
+        # with show room changes disabled - does not show sessions[2] because it did 
+        # not change time
         r = self.client.get(url, {
-            'from_schedule': from_schedule.name,
-            'to_schedule': to_schedule.name,
+            "from_schedule": from_schedule.name,
+            "to_schedule": to_schedule.name,
         })
         self.assertTrue(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q(".schedule-diffs tr")), 4 + 1)
 
+        # with show room changes enabled - shows all changes
+        r = self.client.get(url, {
+            "from_schedule": from_schedule.name,
+            "to_schedule": to_schedule.name,
+            "show_room_changes": "on",
+        })
+        self.assertTrue(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q(".schedule-diffs tr")), 3+1)
+        self.assertEqual(len(q(".schedule-diffs tr")), 5 + 1)
 
     def test_delete_schedule(self):
         url = urlreverse('ietf.meeting.views.delete_schedule',
@@ -3966,7 +4963,7 @@ class InterimTests(TestCase):
     def do_interim_skip_announcement_test(self, base_session=False, extra_session=False, canceled_session=False):
         make_meeting_test_data()
         group = Group.objects.get(acronym='irg')
-        date = datetime.date.today() + datetime.timedelta(days=30)
+        date = date_today() + datetime.timedelta(days=30)
         meeting = make_interim_meeting(group=group, date=date, status='scheda')
         session = meeting.session_set.first()
         if base_session:
@@ -4036,12 +5033,10 @@ def test_interim_skip_announcement_with_extra_and_canceled_sessions_and_base_sch
         self.do_interim_skip_announcement_test(extra_session=True, canceled_session=True, base_session=True)
 
     def do_interim_send_announcement_test(self, base_session=False, extra_session=False, canceled_session=False):
-        make_interim_test_data()
+        make_interim_test_data(meeting_tz='America/Los_Angeles')
         session = Session.objects.with_current_status().filter(
             meeting__type='interim', group__acronym='mars', current_status='apprw').first()
         meeting = session.meeting
-        meeting.time_zone = 'America/Los_Angeles'
-        meeting.save()
 
         if base_session:
             base_session = SessionFactory(meeting=meeting, status_id='apprw', add_to_schedule=False)
@@ -4078,10 +5073,11 @@ def do_interim_send_announcement_test(self, base_session=False, extra_session=Fa
             if sess:
                 timeslot = sess.official_timeslotassignment().timeslot
                 self.assertIn(timeslot.time.strftime('%Y-%m-%d'), announcement_text)
-                self.assertIn(
-                    '(%s to %s UTC)' % (
+                self.assertRegex(
+                    announcement_text,
+                    r'(%s\s+to\s+%s\s+UTC)' % (
                         timeslot.utc_start_time().strftime('%H:%M'),timeslot.utc_end_time().strftime('%H:%M')
-                    ), announcement_text)
+                    ))
         # Count number of sessions listed
         if base_session and extra_session:
             expected_session_matches = 3
@@ -4247,7 +5243,7 @@ def test_interim_approve_by_secretariat_with_extra_and_canceled_sessions_and_bas
         self.do_interim_approve_by_secretariat_test(extra_session=True, canceled_session=True, base_session=True)
 
     def test_past(self):
-        today = datetime.date.today()
+        today = date_today()
         last_week = today - datetime.timedelta(days=7)
         ietf = SessionFactory(meeting__type_id='ietf',meeting__date=last_week,group__state_id='active',group__parent=GroupFactory(state_id='active'))
         SessionFactory(meeting__type_id='interim',meeting__date=last_week,status_id='canceled',group__state_id='active',group__parent=GroupFactory(state_id='active'))
@@ -4266,7 +5262,7 @@ def do_upcoming_test(self, querystring=None, create_meeting=True):
         if querystring is not None:
             url += '?' + querystring
 
-        today = datetime.date.today()
+        today = date_today()
         interims = dict(
             mars=add_event_info_to_session_qs(Session.objects.filter(meeting__type='interim', meeting__date__gt=today, group__acronym='mars')).filter(current_status='sched').first().meeting,
             ames=add_event_info_to_session_qs(Session.objects.filter(meeting__type='interim', meeting__date__gt=today, group__acronym='ames')).filter(current_status='canceled').first().meeting,
@@ -4288,25 +5284,68 @@ def test_upcoming_ical(self):
         meeting = make_meeting_test_data(create_interims=True)
         populate_important_dates(meeting)
         url = urlreverse("ietf.meeting.views.upcoming_ical")
-        
+
+        # Expect events 3 sessions - one for each WG and one for the IETF meeting
+        expected_event_summaries = [
+            'ames - Asteroid Mining Equipment Standardization Group',
+            'mars - Martian Special Interest Group',
+            'IETF 72',
+        ]
+
+        Session.objects.filter(
+            meeting__type_id='interim',
+            group__acronym="mars",
+        ).update(
+            remote_instructions='https://someurl.example.com',
+        )
         r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        assert_ical_response_is_valid(self, r,
+                                      expected_event_summaries=expected_event_summaries,
+                                      expected_event_count=len(expected_event_summaries))
+        # Unfold long lines that might have been folded by iCal
+        content_unfolded = r.content.decode('utf-8').replace('\r\n ', '')
+        self.assertIn('Remote instructions: https://someurl.example.com', content_unfolded)
 
+        Session.objects.filter(meeting__type_id='interim').update(remote_instructions='')
+        r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        # Expect events 3 sessions - one for each WG and one for the IETF meeting
         assert_ical_response_is_valid(self, r,
-                                      expected_event_summaries=[
-                                          'ames - Asteroid Mining Equipment Standardization Group',
-                                          'mars - Martian Special Interest Group',
-                                          'IETF 72',
-                                      ],
-                                      expected_event_count=3)
+                                      expected_event_summaries=expected_event_summaries,
+                                      expected_event_count=len(expected_event_summaries))
+        content_unfolded = r.content.decode('utf-8').replace('\r\n ', '')
+        self.assertNotIn('Remote instructions:', content_unfolded)
+
+        updated = meeting.updated()
+        self.assertIsNotNone(updated)
+        expected_updated = updated.astimezone(datetime.UTC).strftime("%Y%m%dT%H%M%SZ")
+        self.assertContains(r, f"DTSTAMP:{expected_updated}")
+
+        # With default cached_updated, 1970-01-01
+        with patch("ietf.meeting.models.Meeting.updated", return_value=None):
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
 
-    def test_upcoming_ical_filter(self):
+            self.assertEqual(meeting.type_id, "ietf")
+
+            expected_updated = "19700101T000000Z"
+            self.assertEqual(1, r.content.decode("utf-8").count(f"DTSTAMP:{expected_updated}"))
+
+    @patch("ietf.meeting.utils.preprocess_meeting_important_dates")
+    def test_upcoming_ical_filter(self, mock_preprocess_meeting_important_dates):
         # Just a quick check of functionality - details tested by test_js.InterimTests
         make_meeting_test_data(create_interims=True)
         url = urlreverse("ietf.meeting.views.upcoming_ical")
+
         r = self.client.get(url + '?show=mars')
+        self.assertEqual(r.status_code, 200)
+        assert_ical_response_is_valid(self, r,
+                                      expected_event_summaries=[
+                                          'mars - Martian Special Interest Group',
+                                      ],
+                                      expected_event_count=1)
 
+        r = self.client.get(url + '?show=mars,ietf-meetings')
         self.assertEqual(r.status_code, 200)
         assert_ical_response_is_valid(self, r,
                                       expected_event_summaries=[
@@ -4315,6 +5354,8 @@ def test_upcoming_ical_filter(self):
                                       ],
                                       expected_event_count=2)
 
+        # Verify preprocess_meeting_important_dates isn't being called
+        mock_preprocess_meeting_important_dates.assert_not_called()
 
     def test_upcoming_json(self):
         make_meeting_test_data(create_interims=True)
@@ -4385,10 +5426,11 @@ def test_interim_request_options(self):
 
     def do_interim_request_single_virtual(self, emails_expected):
         make_meeting_test_data()
+        TestBlobstoreManager().emptyTestBlobstores()
         group = Group.objects.get(acronym='mars')
-        date = datetime.date.today() + datetime.timedelta(days=30)
-        time = datetime.datetime.now().time().replace(microsecond=0,second=0)
-        dt = datetime.datetime.combine(date, time)
+        date = date_today() + datetime.timedelta(days=30)
+        time = time_now().replace(microsecond=0,second=0)
+        dt = pytz.utc.localize(datetime.datetime.combine(date, time))
         duration = datetime.timedelta(hours=3)
         remote_instructions = 'Use webex'
         agenda = 'Intro. Slides. Discuss.'
@@ -4435,6 +5477,12 @@ def do_interim_request_single_virtual(self, emails_expected):
         doc = session.materials.first()
         path = os.path.join(doc.get_file_path(),doc.filename_with_rev())
         self.assertTrue(os.path.exists(path))
+        with Path(path).open() as f:
+            self.assertEqual(f.read(), agenda)
+        self.assertEqual(
+            retrieve_str("agenda",doc.uploaded_filename),
+            agenda
+        )
         # check notices to secretariat and chairs
         self.assertEqual(len(outbox), length_before + emails_expected)
         return meeting
@@ -4456,14 +5504,16 @@ def test_interim_request_single_virtual_settings_approval_not_required(self):
 
     def test_interim_request_single_in_person(self):
         make_meeting_test_data()
+        TestBlobstoreManager().emptyTestBlobstores()
         group = Group.objects.get(acronym='mars')
-        date = datetime.date.today() + datetime.timedelta(days=30)
-        time = datetime.datetime.now().time().replace(microsecond=0,second=0)
-        dt = datetime.datetime.combine(date, time)
+        date = date_today() + datetime.timedelta(days=30)
+        time = time_now().replace(microsecond=0,second=0)
+        time_zone = 'America/Los_Angeles'
+        tz = pytz.timezone(time_zone)
+        dt = tz.localize(datetime.datetime.combine(date, time))
         duration = datetime.timedelta(hours=3)
         city = 'San Francisco'
         country = 'US'
-        time_zone = 'America/Los_Angeles'
         remote_instructions = 'Use webex'
         agenda = 'Intro. Slides. Discuss.'
         agenda_note = 'On second level'
@@ -4501,19 +5551,24 @@ def test_interim_request_single_in_person(self):
         timeslot = session.official_timeslotassignment().timeslot
         self.assertEqual(timeslot.time,dt)
         self.assertEqual(timeslot.duration,duration)
+        self.assertEqual(
+            retrieve_str("agenda",session.agenda().uploaded_filename),
+            agenda
+        )
 
     def test_interim_request_multi_day(self):
         make_meeting_test_data()
-        date = datetime.date.today() + datetime.timedelta(days=30)
+        date = date_today() + datetime.timedelta(days=30)
         date2 = date + datetime.timedelta(days=1)
-        time = datetime.datetime.now().time().replace(microsecond=0,second=0)
-        dt = datetime.datetime.combine(date, time)
-        dt2 = datetime.datetime.combine(date2, time)
+        time = time_now().replace(microsecond=0,second=0)
+        time_zone = 'America/Los_Angeles'
+        tz = pytz.timezone(time_zone)
+        dt = tz.localize(datetime.datetime.combine(date, time))
+        dt2 = tz.localize(datetime.datetime.combine(date2, time))
         duration = datetime.timedelta(hours=3)
         group = Group.objects.get(acronym='mars')
         city = 'San Francisco'
         country = 'US'
-        time_zone = 'America/Los_Angeles'
         remote_instructions = 'Use webex'
         agenda = 'Intro. Slides. Discuss.'
         agenda_note = 'On second level'
@@ -4567,12 +5622,17 @@ def test_interim_request_multi_day(self):
         self.assertEqual(timeslot.time,dt2)
         self.assertEqual(timeslot.duration,duration)
         self.assertEqual(session.agenda_note,agenda_note)
+        for session in meeting.session_set.all():
+            self.assertEqual(
+                retrieve_str("agenda",session.agenda().uploaded_filename),
+                agenda
+            )
 
     def test_interim_request_multi_day_non_consecutive(self):
         make_meeting_test_data()
-        date = datetime.date.today() + datetime.timedelta(days=30)
+        date = date_today() + datetime.timedelta(days=30)
         date2 = date + datetime.timedelta(days=2)
-        time = datetime.datetime.now().time().replace(microsecond=0,second=0)
+        time = timezone.now().time().replace(microsecond=0,second=0)
         group = Group.objects.get(acronym='mars')
         city = 'San Francisco'
         country = 'US'
@@ -4607,7 +5667,7 @@ def test_interim_request_multi_day_non_consecutive(self):
     def test_interim_request_multi_day_cancel(self):
         """All sessions of a multi-day interim request should be canceled"""
         length_before = len(outbox)
-        date = datetime.date.today()+datetime.timedelta(days=15)
+        date = date_today() + datetime.timedelta(days=15)
 
         # Set up an interim request with several sessions 
         num_sessions = 3
@@ -4629,8 +5689,9 @@ def test_interim_request_multi_day_cancel(self):
 
     def test_interim_request_series(self):
         make_meeting_test_data()
+        TestBlobstoreManager().emptyTestBlobstores()
         meeting_count_before = Meeting.objects.filter(type='interim').count()
-        date = datetime.date.today() + datetime.timedelta(days=30)
+        date = date_today() + datetime.timedelta(days=30)
         if (date.month, date.day) == (12, 31):
             # Avoid date and date2 in separate years
             # (otherwise the test will fail if run on December 1st)
@@ -4640,14 +5701,15 @@ def test_interim_request_series(self):
         if date.year != date2.year:
             date += datetime.timedelta(days=1)
             date2 += datetime.timedelta(days=1)
-        time = datetime.datetime.now().time().replace(microsecond=0,second=0)
-        dt = datetime.datetime.combine(date, time)
-        dt2 = datetime.datetime.combine(date2, time)
+        time = time_now().replace(microsecond=0,second=0)
+        time_zone = 'America/Los_Angeles'
+        tz = pytz.timezone(time_zone)
+        dt = tz.localize(datetime.datetime.combine(date, time))
+        dt2 = tz.localize(datetime.datetime.combine(date2, time))
         duration = datetime.timedelta(hours=3)
         group = Group.objects.get(acronym='mars')
         city = ''
         country = ''
-        time_zone = 'America/Los_Angeles'
         remote_instructions = 'Use webex'
         agenda = 'Intro. Slides. Discuss.'
         agenda_note = 'On second level'
@@ -4715,6 +5777,11 @@ def test_interim_request_series(self):
         self.assertEqual(timeslot.time,dt2)
         self.assertEqual(timeslot.duration,duration)
         self.assertEqual(session.agenda_note,agenda_note)
+        for session in meeting.session_set.all():
+            self.assertEqual(
+                retrieve_str("agenda",session.agenda().uploaded_filename),
+                agenda
+            )
 
 
     # test_interim_pending subsumed by test_appears_on_pending
@@ -4789,14 +5856,14 @@ def test_can_manage_group(self):
         self.assertFalse(can_manage_group(user=user,group=group))
 
     def test_interim_request_details(self):
-        make_interim_test_data()
+        make_interim_test_data(meeting_tz='America/Chicago')
         meeting = Session.objects.with_current_status().filter(
             meeting__type='interim', group__acronym='mars', current_status='apprw').first().meeting
         url = urlreverse('ietf.meeting.views.interim_request_details',kwargs={'number':meeting.number})
         login_testing_unauthorized(self,"secretary",url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        start_time = meeting.session_set.first().official_timeslotassignment().timeslot.time.strftime('%H:%M')
+        start_time = meeting.session_set.first().official_timeslotassignment().timeslot.local_start_time().strftime('%H:%M')
         utc_start_time = meeting.session_set.first().official_timeslotassignment().timeslot.utc_start_time().strftime('%H:%M')
         self.assertIn(start_time, unicontent(r))
         self.assertIn(utc_start_time, unicontent(r))
@@ -4804,7 +5871,7 @@ def test_interim_request_details(self):
     def test_interim_request_details_announcement(self):
         '''Test access to Announce / Skip Announce features'''
         make_meeting_test_data()
-        date = datetime.date.today() + datetime.timedelta(days=30)
+        date = date_today() + datetime.timedelta(days=30)
         group = Group.objects.get(acronym='mars')
         meeting = make_interim_meeting(group=group, date=date, status='scheda')
         url = urlreverse('ietf.meeting.views.interim_request_details',kwargs={'number':meeting.number})
@@ -5037,8 +6104,17 @@ def test_interim_request_cancel(self, mock):
         self.assertEqual(r.status_code, 403)
         self.assertFalse(mock.called, 'Should not cancel sessions if request rejected')
 
-        # test cancelling before announcement
+        # test with overly-long comments
+        comments += '0123456789abcdef'*32
         self.client.login(username="marschairman", password="marschairman+password")
+        r = self.client.post(url, {'comments': comments})
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(q('form .is-invalid'))
+        # truncate to max_length
+        comments = comments[:512]
+
+        # test cancelling before announcement
         length_before = len(outbox)
         r = self.client.post(url, {'comments': comments})
         self.assertRedirects(r, urlreverse('ietf.meeting.views.upcoming'))
@@ -5060,6 +6136,7 @@ def test_interim_request_cancel(self, mock):
             self.assertEqual(session.agenda_note, comments)
         self.assertEqual(len(outbox), length_before + 1)
         self.assertIn('Interim Meeting Cancelled', outbox[-1]['Subject'])
+        self.assertIn(comments, get_payload_text(outbox[-1]))
         self.assertTrue(mock.called, 'Should cancel sessions if request handled')
         self.assertCountEqual(mock.call_args[0][1], meeting.session_set.all())
 
@@ -5169,12 +6246,11 @@ def test_interim_request_edit_no_notice(self):
         length_before = len(outbox)
         form_initial = r.context['form'].initial
         formset_initial =  r.context['formset'].forms[0].initial
-        new_time = formset_initial['time'] + datetime.timedelta(hours=1)
         data = {'group':group.pk,
                 'meeting_type':'single',
                 'session_set-0-id':meeting.session_set.first().id,
                 'session_set-0-date':formset_initial['date'].strftime('%Y-%m-%d'),
-                'session_set-0-time':new_time.strftime('%H:%M'),
+                'session_set-0-time':'12:34',
                 'session_set-0-requested_duration': '00:30',
                 'session_set-0-remote_instructions':formset_initial['remote_instructions'],
                 #'session_set-0-agenda':formset_initial['agenda'],
@@ -5187,7 +6263,10 @@ def test_interim_request_edit_no_notice(self):
         self.assertEqual(len(outbox),length_before)
         session = meeting.session_set.first()
         timeslot = session.official_timeslotassignment().timeslot
-        self.assertEqual(timeslot.time,new_time)
+        self.assertEqual(
+            timeslot.time,
+            meeting.tz().localize(datetime.datetime.combine(formset_initial['date'], datetime.time(12, 34))),
+        )
         
     def test_interim_request_edit(self):
         '''Edit request.  Send notice of change'''
@@ -5207,13 +6286,12 @@ def test_interim_request_edit(self):
         length_before = len(outbox)
         form_initial = r.context['form'].initial
         formset_initial =  r.context['formset'].forms[0].initial
-        new_time = formset_initial['time'] + datetime.timedelta(hours=1)
         new_duration = formset_initial['requested_duration'] + datetime.timedelta(hours=1)
         data = {'group':group.pk,
                 'meeting_type':'single',
                 'session_set-0-id':meeting.session_set.first().id,
                 'session_set-0-date':formset_initial['date'].strftime('%Y-%m-%d'),
-                'session_set-0-time':new_time.strftime('%H:%M'),
+                'session_set-0-time': '12:34',
                 'session_set-0-requested_duration':self.strfdelta(new_duration, '{hours}:{minutes}'),
                 'session_set-0-remote_instructions':formset_initial['remote_instructions'],
                 #'session_set-0-agenda':formset_initial['agenda'],
@@ -5227,7 +6305,10 @@ def test_interim_request_edit(self):
         self.assertIn('CHANGED', outbox[-1]['Subject'])
         session = meeting.session_set.first()
         timeslot = session.official_timeslotassignment().timeslot
-        self.assertEqual(timeslot.time,new_time)
+        self.assertEqual(
+            timeslot.time,
+            meeting.tz().localize(datetime.datetime.combine(formset_initial['date'], datetime.time(12, 34))),
+        )
         self.assertEqual(timeslot.duration,new_duration)
     
     def strfdelta(self, tdelta, fmt):
@@ -5239,6 +6320,7 @@ def strfdelta(self, tdelta, fmt):
     def test_interim_request_edit_agenda_updates_doc(self):
         """Updating the agenda through the request edit form should update the doc correctly"""
         make_interim_test_data()
+        TestBlobstoreManager().emptyTestBlobstores()
         meeting = add_event_info_to_session_qs(Session.objects.filter(meeting__type='interim', group__acronym='mars')).filter(current_status='sched').first().meeting
         group = meeting.session_set.first().group
         url = urlreverse('ietf.meeting.views.interim_request_edit', kwargs={'number': meeting.number})
@@ -5274,6 +6356,10 @@ def test_interim_request_edit_agenda_updates_doc(self):
         self.assertNotEqual(agenda_doc.uploaded_filename, uploaded_filename_before, 'Uploaded filename should be updated')
         with (Path(agenda_doc.get_file_path()) / agenda_doc.uploaded_filename).open() as f:
             self.assertEqual(f.read(), 'modified agenda contents', 'New agenda contents should be saved')
+        self.assertEqual(
+            retrieve_str(agenda_doc.type_id, agenda_doc.uploaded_filename),
+            "modified agenda contents"
+        )
 
     def test_interim_request_details_permissions(self):
         make_interim_test_data()
@@ -5322,7 +6408,7 @@ def test_send_interim_session_cancellation_notice(self):
     def test_send_interim_minutes_reminder(self):
         make_meeting_test_data()
         group = Group.objects.get(acronym='mars')
-        date = datetime.datetime.today() - datetime.timedelta(days=10)
+        date = timezone.now() - datetime.timedelta(days=10)
         meeting = make_interim_meeting(group=group, date=date, status='sched')
         length_before = len(outbox)
         send_interim_minutes_reminder(meeting=meeting)
@@ -5334,10 +6420,15 @@ def test_group_ical(self):
         make_interim_test_data()
         meeting = Meeting.objects.filter(type='interim', session__group__acronym='mars').first()
         s1 = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
+        self.assertGreater(len(s1.remote_instructions), 0, 'Expected remote_instructions to be set')
         a1 = s1.official_timeslotassignment()
         t1 = a1.timeslot
         # Create an extra session
-        t2 = TimeSlotFactory.create(meeting=meeting, time=datetime.datetime.combine(meeting.date, datetime.time(11, 30)))
+        t2 = TimeSlotFactory.create(
+            meeting=meeting,
+            time=meeting.tz().localize(
+                datetime.datetime.combine(meeting.date, datetime.time(11, 30))
+            ))
         s2 = SessionFactory.create(meeting=meeting, group=s1.group, add_to_schedule=False)
         SchedTimeSessAssignment.objects.create(timeslot=t2, session=s2, schedule=meeting.schedule)
         #
@@ -5347,8 +6438,9 @@ def test_group_ical(self):
         self.assertContains(r, 'BEGIN:VEVENT')
         self.assertEqual(r.content.count(b'UID'), 2)
         self.assertContains(r, 'SUMMARY:mars - Martian Special Interest Group')
-        self.assertContains(r, t1.time.strftime('%Y%m%dT%H%M%S'))
-        self.assertContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
+        self.assertContains(r, t1.local_start_time().strftime('%Y%m%dT%H%M%S'))
+        self.assertContains(r, s1.remote_instructions)
+        self.assertContains(r, t2.local_start_time().strftime('%Y%m%dT%H%M%S'))
         self.assertContains(r, 'END:VEVENT')
         #
         url = urlreverse('ietf.meeting.views.agenda_ical', kwargs={'num':meeting.number, 'session_id':s1.id, })
@@ -5358,39 +6450,11 @@ def test_group_ical(self):
         self.assertEqual(r.content.count(b'UID'), 1)
         self.assertContains(r, 'SUMMARY:mars - Martian Special Interest Group')
         self.assertContains(r, t1.time.strftime('%Y%m%dT%H%M%S'))
+        self.assertContains(r, s1.remote_instructions)
         self.assertNotContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
         self.assertContains(r, 'END:VEVENT')
 
 
-class AjaxTests(TestCase):
-    def test_ajax_get_utc(self):
-        # test bad queries
-        url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=badtime&timezone=UTC"
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        data = r.json()
-        self.assertEqual(data["error"], True)
-        url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=25:99&timezone=UTC"
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        data = r.json()
-        self.assertEqual(data["error"], True)
-        url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=10:00am&timezone=UTC"
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        data = r.json()
-        self.assertEqual(data["error"], True)
-        # test good query
-        url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=12:00&timezone=America/Los_Angeles"
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        data = r.json()
-        self.assertIn('timezone', data)
-        self.assertIn('time', data)
-        self.assertIn('utc', data)
-        self.assertNotIn('error', data)
-        self.assertEqual(data['utc'], '20:00')
-
 class IphoneAppJsonTests(TestCase):
     def test_iphone_app_json_interim(self):
         make_interim_test_data()
@@ -5429,16 +6493,10 @@ def test_iphone_app_json(self):
             self.assertTrue(msessions.filter(group__acronym=s['group']['acronym']).exists())
 
 class FinalizeProceedingsTests(TestCase):
-    @override_settings(STATS_REGISTRATION_ATTENDEES_JSON_URL='https://ietf.example.com/{number}')
-    @requests_mock.Mocker()
-    def test_finalize_proceedings(self, mock):
+    def test_finalize_proceedings(self):
         make_meeting_test_data()
         meeting = Meeting.objects.filter(type_id='ietf').order_by('id').last()
-        meeting.session_set.filter(group__acronym='mars').first().sessionpresentation_set.create(document=Document.objects.filter(type='draft').first(),rev=None)
-        mock.get(
-            settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number),
-            text=json.dumps([{"LastName": "Smith", "FirstName": "John", "Company": "ABC", "Country": "US"}]),
-        )
+        meeting.session_set.filter(group__acronym='mars').first().presentations.create(document=Document.objects.filter(type='draft').first(),rev=None)
 
         url = urlreverse('ietf.meeting.views.finalize_proceedings',kwargs={'num':meeting.number})
         login_testing_unauthorized(self,"secretary",url)
@@ -5446,13 +6504,41 @@ def test_finalize_proceedings(self, mock):
         self.assertEqual(r.status_code, 200)
 
         self.assertEqual(meeting.proceedings_final,False)
-        self.assertEqual(meeting.session_set.filter(group__acronym="mars").first().sessionpresentation_set.filter(document__type="draft").first().rev,None)
+        self.assertEqual(meeting.session_set.filter(group__acronym="mars").first().presentations.filter(document__type="draft").first().rev,None)
         r = self.client.post(url,{'finalize':1})
         self.assertEqual(r.status_code, 302)
         meeting = Meeting.objects.get(pk=meeting.pk)
         self.assertEqual(meeting.proceedings_final,True)
-        self.assertEqual(meeting.session_set.filter(group__acronym="mars").first().sessionpresentation_set.filter(document__type="draft").first().rev,'00')
+        self.assertEqual(meeting.session_set.filter(group__acronym="mars").first().presentations.filter(document__type="draft").first().rev,'00')
  
+    @patch("ietf.meeting.utils.generate_bluesheet")
+    def test_bluesheet_generation(self, mock):
+        meeting = MeetingFactory(type_id="ietf", number="107")  # number where generate_bluesheets should not be called
+        SessionFactory.create_batch(5, meeting=meeting)
+        url = urlreverse("ietf.meeting.views.finalize_proceedings", kwargs={"num": meeting.number})
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertFalse(mock.called)
+        r = self.client.post(url,{'finalize': 1})
+        self.assertEqual(r.status_code, 302)
+        self.assertFalse(mock.called)
+
+        meeting = MeetingFactory(type_id="ietf", number="108")  # number where generate_bluesheets should be called
+        SessionFactory.create_batch(5, meeting=meeting)
+        url = urlreverse("ietf.meeting.views.finalize_proceedings", kwargs={"num": meeting.number})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertFalse(mock.called)
+        r = self.client.post(url,{'finalize': 1})
+        self.assertEqual(r.status_code, 302)
+        self.assertTrue(mock.called)
+        self.assertCountEqual(
+            [call_args[0][1] for call_args in mock.call_args_list],
+            [sess for sess in meeting.session_set.all()],
+        )
+
+
 class MaterialsTests(TestCase):
     settings_temp_path_overrides = TestCase.settings_temp_path_overrides + [
         'AGENDA_PATH',
@@ -5493,13 +6579,15 @@ def test_upload_bluesheets(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertIn('Upload', str(q("title")))
-        self.assertFalse(session.sessionpresentation_set.exists())
-        test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
+        self.assertFalse(session.presentations.exists())
+        test_content = '%PDF-1.4\n%âãÏÓ\nthis is some text for a test'
+        test_file = StringIO(test_content)
         test_file.name = "not_really.pdf"
         r = self.client.post(url,dict(file=test_file))
         self.assertEqual(r.status_code, 302)
-        bs_doc = session.sessionpresentation_set.filter(document__type_id='bluesheets').first().document
+        bs_doc = session.presentations.filter(document__type_id='bluesheets').first().document
         self.assertEqual(bs_doc.rev,'00')
+        self.assertEqual(retrieve_str("bluesheets", f"{bs_doc.name}-{bs_doc.rev}.pdf"), test_content)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -5528,18 +6616,20 @@ def test_upload_bluesheets_interim(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertIn('Upload', str(q("title")))
-        self.assertFalse(session.sessionpresentation_set.exists())
-        test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
+        self.assertFalse(session.presentations.exists())
+        test_content = '%PDF-1.4\n%âãÏÓ\nthis is some text for a test'
+        test_file = StringIO(test_content)
         test_file.name = "not_really.pdf"
         r = self.client.post(url,dict(file=test_file))
         self.assertEqual(r.status_code, 302)
-        bs_doc = session.sessionpresentation_set.filter(document__type_id='bluesheets').first().document
+        bs_doc = session.presentations.filter(document__type_id='bluesheets').first().document
         self.assertEqual(bs_doc.rev,'00')
+        self.assertEqual(retrieve_str("bluesheets", f"{bs_doc.name}-{bs_doc.rev}.pdf"), test_content)
 
     def test_upload_bluesheets_interim_chair_access(self):
         make_meeting_test_data()
         mars = Group.objects.get(acronym='mars')
-        session=SessionFactory(meeting__type_id='interim',group=mars, meeting__date = datetime.date.today())
+        session=SessionFactory(meeting__type_id='interim',group=mars, meeting__date = date_today())
         url = urlreverse('ietf.meeting.views.upload_session_bluesheets',kwargs={'num':session.meeting.number,'session_id':session.id})
         self.client.login(username="marschairman", password="marschairman+password")
         r = self.client.get(url)
@@ -5548,96 +6638,130 @@ def test_upload_bluesheets_interim_chair_access(self):
         self.assertIn('Upload', str(q("title")))
         
 
-    def test_upload_minutes_agenda(self):
-        for doctype in ('minutes','agenda'):
-            session = SessionFactory(meeting__type_id='ietf')
-            if doctype == 'minutes':
-                url = urlreverse('ietf.meeting.views.upload_session_minutes',kwargs={'num':session.meeting.number,'session_id':session.id})
-            else:
-                url = urlreverse('ietf.meeting.views.upload_session_agenda',kwargs={'num':session.meeting.number,'session_id':session.id})
-            self.client.logout()
-            login_testing_unauthorized(self,"secretary",url)
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertIn('Upload', str(q("Title")))
-            self.assertFalse(session.sessionpresentation_set.exists())
-            self.assertFalse(q('form input[type="checkbox"]'))
-    
-            session2 = SessionFactory(meeting=session.meeting,group=session.group)
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertTrue(q('form input[type="checkbox"]'))
-    
-            test_file = BytesIO(b'this is some text for a test')
-            test_file.name = "not_really.json"
-            r = self.client.post(url,dict(file=test_file))
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertTrue(q('form .is-invalid'))
-    
-            test_file = BytesIO(b'this is some text for a test'*1510000)
-            test_file.name = "not_really.pdf"
-            r = self.client.post(url,dict(file=test_file))
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertTrue(q('form .is-invalid'))
-    
-            test_file = BytesIO(b'<html><frameset><frame src="foo.html"></frame><frame src="bar.html"></frame></frameset></html>')
-            test_file.name = "not_really.html"
-            r = self.client.post(url,dict(file=test_file))
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertTrue(q('form .is-invalid'))
-
-            # Test html sanitization
-            test_file = BytesIO(b'<html><head><title>Title</title></head><body><h1>Title</h1><section>Some text</section></body></html>')
-            test_file.name = "some.html"
-            r = self.client.post(url,dict(file=test_file))
-            self.assertEqual(r.status_code, 302)
-            doc = session.sessionpresentation_set.filter(document__type_id=doctype).first().document
-            self.assertEqual(doc.rev,'00')
-            text = doc.text()
-            self.assertIn('Some text', text)
-            self.assertNotIn('<section>', text)
-            self.assertIn('charset="utf-8"', text)
-
-            # txt upload
-            test_file = BytesIO(b'This is some text for a test, with the word\nvirtual at the beginning of a line.')
-            test_file.name = "some.txt"
-            r = self.client.post(url,dict(file=test_file,apply_to_all=False))
-            self.assertEqual(r.status_code, 302)
-            doc = session.sessionpresentation_set.filter(document__type_id=doctype).first().document
-            self.assertEqual(doc.rev,'01')
-            self.assertFalse(session2.sessionpresentation_set.filter(document__type_id=doctype))
-    
+    def test_label_future_sessions(self):
+        self.client.login(username='secretary', password='secretary+password')
+        for future in (True, False):
+            mtg_date = date_today()+datetime.timedelta(days=180 if future else -180)
+            session = SessionFactory(meeting__type_id='ietf', meeting__date=mtg_date)
+            # Verify future warning shows on the session details panel
+            url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':session.meeting.number, 'acronym': session.group.acronym})
             r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertIn('Revise', str(q("Title")))
-            test_file = BytesIO(b'this is some different text for a test')
-            test_file.name = "also_some.txt"
-            r = self.client.post(url,dict(file=test_file,apply_to_all=True))
-            self.assertEqual(r.status_code, 302)
-            doc = Document.objects.get(pk=doc.pk)
-            self.assertEqual(doc.rev,'02')
-            self.assertTrue(session2.sessionpresentation_set.filter(document__type_id=doctype))
-
-            # Test bad encoding
-            test_file = BytesIO('<html><h1>Title</h1><section>Some\x93text</section></html>'.encode('latin1'))
-            test_file.name = "some.html"
-            r = self.client.post(url,dict(file=test_file))
-            self.assertContains(r, 'Could not identify the file encoding')
-            doc = Document.objects.get(pk=doc.pk)
-            self.assertEqual(doc.rev,'02')
+            self.assertTrue(r.status_code==200)
+            if future:
+                self.assertContains(r, "Session has not ended yet")
+            else:
+                self.assertNotContains(r, "Session has not ended yet")
 
-            # Verify that we don't have dead links
-            url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':session.meeting.number, 'acronym': session.group.acronym})
-            top = '/meeting/%s/' % session.meeting.number
-            self.requests_mock.get(f'{session.notes_url()}/download', text='markdown notes')
-            self.requests_mock.get(f'{session.notes_url()}/info', text=json.dumps({'title': 'title', 'updatetime': '2021-12-01T17:11:00z'}))
-            self.crawl_materials(url=url, top=top)
+    def test_upload_minutes_agenda(self):
+        for doctype in ('minutes','agenda'):
+            for future in (True, False):
+                mtg_date = date_today()+datetime.timedelta(days=180 if future else -180)
+                session = SessionFactory(meeting__type_id='ietf', meeting__date=mtg_date)
+                if doctype == 'minutes':
+                    url = urlreverse('ietf.meeting.views.upload_session_minutes',kwargs={'num':session.meeting.number,'session_id':session.id})
+                else:
+                    url = urlreverse('ietf.meeting.views.upload_session_agenda',kwargs={'num':session.meeting.number,'session_id':session.id})
+                self.client.logout()
+                login_testing_unauthorized(self,"secretary",url)
+                r = self.client.get(url)
+                self.assertEqual(r.status_code, 200)
+                q = PyQuery(r.content)
+                self.assertIn('Upload', str(q("Title")))
+                self.assertFalse(session.presentations.exists())
+                self.assertFalse(q('form input[type="checkbox"]'))
+                if future and doctype == "minutes":
+                    self.assertContains(r, "Session has not ended yet")
+                else:
+                    self.assertNotContains(r, "Session has not ended yet")
+        
+                session2 = SessionFactory(meeting=session.meeting,group=session.group)
+                r = self.client.get(url)
+                self.assertEqual(r.status_code, 200)
+                q = PyQuery(r.content)
+                self.assertTrue(q('form input[type="checkbox"]'))
+        
+                # test not submitting a file
+                r = self.client.post(url, dict(submission_method="upload"))
+                self.assertEqual(r.status_code, 200)
+                q = PyQuery(r.content)
+                self.assertTrue(q("form .is-invalid"))
+        
+                test_file = BytesIO(b'this is some text for a test')
+                test_file.name = "not_really.json"
+                r = self.client.post(url,dict(submission_method="upload",file=test_file))
+                self.assertEqual(r.status_code, 200)
+                q = PyQuery(r.content)
+                self.assertTrue(q('form .is-invalid'))
+        
+                test_file = BytesIO(b'this is some text for a test'*1510000)
+                test_file.name = "not_really.pdf"
+                r = self.client.post(url,dict(submission_method="upload",file=test_file))
+                self.assertEqual(r.status_code, 200)
+                q = PyQuery(r.content)
+                self.assertTrue(q('form .is-invalid'))
+        
+                test_file = BytesIO(b'<html><frameset><frame src="foo.html"></frame><frame src="bar.html"></frame></frameset></html>')
+                test_file.name = "not_really.html"
+                r = self.client.post(url,dict(submission_method="upload",file=test_file))
+                self.assertEqual(r.status_code, 200)
+                q = PyQuery(r.content)
+                self.assertTrue(q('form .is-invalid'))
+
+                # Test html sanitization
+                test_file = BytesIO(b'<html><head><title>Title</title></head><body><h1>Title</h1><section>Some text</section></body></html>')
+                test_file.name = "some.html"
+                r = self.client.post(url,dict(submission_method="upload",file=test_file))
+                self.assertEqual(r.status_code, 302)
+                doc = session.presentations.filter(document__type_id=doctype).first().document
+                self.assertEqual(doc.rev,'00')
+                text = doc.text()
+                self.assertIn('Some text', text)
+                self.assertNotIn('<section>', text)
+                text = retrieve_str(doctype, f"{doc.name}-{doc.rev}.html")
+                self.assertIn('Some text', text)
+                self.assertNotIn('<section>', text)
+
+                # txt upload
+                test_bytes = b'This is some text for a test, with the word\nvirtual at the beginning of a line.'
+                test_file = BytesIO(test_bytes)
+                test_file.name = "some.txt"
+                r = self.client.post(url,dict(submission_method="upload",file=test_file,apply_to_all=False))
+                self.assertEqual(r.status_code, 302)
+                doc = session.presentations.filter(document__type_id=doctype).first().document
+                self.assertEqual(doc.rev,'01')
+                self.assertFalse(session2.presentations.filter(document__type_id=doctype))
+                retrieved_bytes = retrieve_bytes(doctype, f"{doc.name}-{doc.rev}.txt")
+                self.assertEqual(retrieved_bytes, test_bytes)
+        
+                r = self.client.get(url)
+                self.assertEqual(r.status_code, 200)
+                q = PyQuery(r.content)
+                self.assertIn('Revise', str(q("Title")))
+                test_bytes = b'this is some different text for a test'
+                test_file = BytesIO(test_bytes)
+                test_file.name = "also_some.txt"
+                r = self.client.post(url,dict(submission_method="upload",file=test_file,apply_to_all=True))
+                self.assertEqual(r.status_code, 302)
+                doc = Document.objects.get(pk=doc.pk)
+                self.assertEqual(doc.rev,'02')
+                self.assertTrue(session2.presentations.filter(document__type_id=doctype))
+                retrieved_bytes = retrieve_bytes(doctype, f"{doc.name}-{doc.rev}.txt")
+                self.assertEqual(retrieved_bytes, test_bytes)
+
+                # Test bad encoding
+                test_file = BytesIO('<html><h1>Title</h1><section>Some\x93text</section></html>'.encode('latin1'))
+                test_file.name = "some.html"
+                r = self.client.post(url,dict(submission_method="upload",file=test_file))
+                self.assertContains(r, 'Could not identify the file encoding')
+                doc = Document.objects.get(pk=doc.pk)
+                self.assertEqual(doc.rev,'02')
+
+                # Verify that we don't have dead links
+                url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':session.meeting.number, 'acronym': session.group.acronym})
+                top = '/meeting/%s/' % session.meeting.number
+                self.requests_mock.get(f'{session.notes_url()}/download', text='markdown notes')
+                self.requests_mock.get(f'{session.notes_url()}/info', text=json.dumps({'title': 'title', 'updatetime': '2021-12-01T17:11:00z'}))
+                self.crawl_materials(url=url, top=top)
 
     def test_upload_minutes_agenda_unscheduled(self):
         for doctype in ('minutes','agenda'):
@@ -5652,35 +6776,74 @@ def test_upload_minutes_agenda_unscheduled(self):
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertIn('Upload', str(q("Title")))
-            self.assertFalse(session.sessionpresentation_set.exists())
+            self.assertFalse(session.presentations.exists())
             self.assertFalse(q('form input[type="checkbox"]'))
+            self.assertNotContains(r, "Session has not ended yet")
 
             test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.txt"
-            r = self.client.post(url,dict(file=test_file,apply_to_all=False))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file,apply_to_all=False))
             self.assertEqual(r.status_code, 410)
 
     @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True)
     def test_upload_minutes_agenda_interim(self):
-        session=SessionFactory(meeting__type_id='interim')
         for doctype in ('minutes','agenda'):
-            if doctype=='minutes':
-                url = urlreverse('ietf.meeting.views.upload_session_minutes',kwargs={'num':session.meeting.number,'session_id':session.id})
-            else:
-                url = urlreverse('ietf.meeting.views.upload_session_agenda',kwargs={'num':session.meeting.number,'session_id':session.id})
+            for future in (True, False):
+                session=SessionFactory(meeting__type_id='interim', meeting__date = date_today()+datetime.timedelta(days=180 if future else -180))
+                if doctype=='minutes':
+                    url = urlreverse('ietf.meeting.views.upload_session_minutes',kwargs={'num':session.meeting.number,'session_id':session.id})
+                else:
+                    url = urlreverse('ietf.meeting.views.upload_session_agenda',kwargs={'num':session.meeting.number,'session_id':session.id})
+                self.client.logout()
+                login_testing_unauthorized(self,"secretary",url)
+                r = self.client.get(url)
+                self.assertEqual(r.status_code, 200)
+                q = PyQuery(r.content)
+                self.assertIn('Upload', str(q("title")))
+                self.assertFalse(session.presentations.filter(document__type_id=doctype))
+                if future and doctype == "minutes":
+                    self.assertContains(r, "Session has not ended yet")
+                else:
+                    self.assertNotContains(r, "Session has not ended yet")
+                test_bytes = b'this is some text for a test'
+                test_file = BytesIO(test_bytes)
+                test_file.name = "not_really.txt"
+                r = self.client.post(url,dict(submission_method="upload",file=test_file))
+                self.assertEqual(r.status_code, 302)
+                doc = session.presentations.filter(document__type_id=doctype).first().document
+                self.assertEqual(doc.rev,'00')
+                retrieved_bytes = retrieve_bytes(doctype, f"{doc.name}-{doc.rev}.txt")
+                self.assertEqual(retrieved_bytes, test_bytes)
+
+                # Verify that we don't have dead links
+                url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':session.meeting.number, 'acronym': session.group.acronym})
+                top = '/meeting/%s/' % session.meeting.number
+                self.requests_mock.get(f'{session.notes_url()}/download', text='markdown notes')
+                self.requests_mock.get(f'{session.notes_url()}/info', text=json.dumps({'title': 'title', 'updatetime': '2021-12-01T17:11:00z'}))
+                self.crawl_materials(url=url, top=top)
+
+    @override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True)
+    def test_upload_narrativeminutes(self):
+        for type_id in ["interim","ietf"]:
+            session=SessionFactory(meeting__type_id=type_id,group__acronym='iesg')
+            doctype='narrativeminutes'
+            url = urlreverse('ietf.meeting.views.upload_session_narrativeminutes',kwargs={'num':session.meeting.number,'session_id':session.id})
             self.client.logout()
             login_testing_unauthorized(self,"secretary",url)
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertIn('Upload', str(q("title")))
-            self.assertFalse(session.sessionpresentation_set.filter(document__type_id=doctype))
-            test_file = BytesIO(b'this is some text for a test')
+            self.assertFalse(session.presentations.filter(document__type_id=doctype))
+            test_bytes = b'this is some text for a test'
+            test_file = BytesIO(test_bytes)
             test_file.name = "not_really.txt"
-            r = self.client.post(url,dict(file=test_file))
+            r = self.client.post(url,dict(submission_method="upload",file=test_file))
             self.assertEqual(r.status_code, 302)
-            doc = session.sessionpresentation_set.filter(document__type_id=doctype).first().document
+            doc = session.presentations.filter(document__type_id=doctype).first().document
             self.assertEqual(doc.rev,'00')
+            retrieved_bytes = retrieve_bytes(doctype, f"{doc.name}-{doc.rev}.txt")
+            self.assertEqual(retrieved_bytes, test_bytes)
 
             # Verify that we don't have dead links
             url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':session.meeting.number, 'acronym': session.group.acronym})
@@ -5689,7 +6852,55 @@ def test_upload_minutes_agenda_interim(self):
             self.requests_mock.get(f'{session.notes_url()}/info', text=json.dumps({'title': 'title', 'updatetime': '2021-12-01T17:11:00z'}))
             self.crawl_materials(url=url, top=top)
 
-    def test_upload_slides(self):
+    def test_enter_agenda(self):
+        session = SessionFactory(meeting__type_id='ietf')
+        url = urlreverse('ietf.meeting.views.upload_session_agenda',kwargs={'num':session.meeting.number,'session_id':session.id})
+        redirect_url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
+        login_testing_unauthorized(self,"secretary",url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertIn('Upload', str(q("Title")))
+        self.assertFalse(session.presentations.exists())
+
+        test_text = 'Enter agenda from scratch'
+        r = self.client.post(url,dict(submission_method="enter",content=test_text))
+        self.assertRedirects(r, redirect_url)
+        doc = session.presentations.filter(document__type_id='agenda').first().document
+        self.assertEqual(doc.rev,'00')
+        self.assertEqual(retrieve_str("agenda",f"{doc.name}-{doc.rev}.md"), test_text)
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertIn('Revise', str(q("Title")))
+
+        test_bytes = b'Upload after enter'
+        test_file = BytesIO(test_bytes)
+        test_file.name = "some.txt"
+        r = self.client.post(url,dict(submission_method="upload",file=test_file))
+        self.assertRedirects(r, redirect_url)
+        doc = Document.objects.get(pk=doc.pk)
+        self.assertEqual(doc.rev,'01')
+        retrieved_bytes = retrieve_bytes("agenda", f"{doc.name}-{doc.rev}.txt")
+        self.assertEqual(retrieved_bytes, test_bytes)
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertIn('Revise', str(q("Title")))
+
+        test_text = 'Enter after upload'
+        r = self.client.post(url,dict(submission_method="enter",content=test_text))
+        self.assertRedirects(r, redirect_url)
+        doc = Document.objects.get(pk=doc.pk)
+        self.assertEqual(doc.rev,'02')
+        self.assertEqual(retrieve_str("agenda",f"{doc.name}-{doc.rev}.md"), test_text)
+
+
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_upload_slides(self, mock_slides_manager_cls):
 
         session1 = SessionFactory(meeting__type_id='ietf')
         session2 = SessionFactory(meeting=session1.meeting,group=session1.group)
@@ -5697,46 +6908,80 @@ def test_upload_slides(self):
         login_testing_unauthorized(self,"secretary",url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
+        self.assertFalse(mock_slides_manager_cls.called)
         q = PyQuery(r.content)
         self.assertIn('Upload', str(q("title")))
-        self.assertFalse(session1.sessionpresentation_set.filter(document__type_id='slides'))
-        test_file = BytesIO(b'this is not really a slide')
+        self.assertFalse(session1.presentations.filter(document__type_id='slides'))
+        test_bytes = b'this is not really a slide'
+        test_file = BytesIO(test_bytes)
         test_file.name = 'not_really.txt'
-        r = self.client.post(url,dict(file=test_file,title='a test slide file',apply_to_all=True))
+        r = self.client.post(url,dict(file=test_file,title='a test slide file',apply_to_all=True,approved=True))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(session1.sessionpresentation_set.count(),1) 
-        self.assertEqual(session2.sessionpresentation_set.count(),1) 
-        sp = session2.sessionpresentation_set.first()
+        self.assertEqual(session1.presentations.count(),1) 
+        self.assertEqual(session2.presentations.count(),1) 
+        sp = session2.presentations.first()
         self.assertEqual(sp.document.name, 'slides-%s-%s-a-test-slide-file' % (session1.meeting.number,session1.group.acronym ) )
         self.assertEqual(sp.order,1)
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 2)
+        self.assertEqual(retrieve_bytes("slides", f"{sp.document.name}-{sp.document.rev}.txt"), test_bytes)
+        # don't care which order they were called in, just that both sessions were updated
+        self.assertCountEqual(
+            mock_slides_manager_cls.return_value.add.call_args_list,
+            [
+                call(session=session1, slides=sp.document, order=1),
+                call(session=session2, slides=sp.document, order=1),
+            ],
+        )
+        mock_slides_manager_cls.reset_mock()
 
         url = urlreverse('ietf.meeting.views.upload_session_slides',kwargs={'num':session2.meeting.number,'session_id':session2.id})
-        test_file = BytesIO(b'some other thing still not slidelike')
+        test_bytes = b'some other thing still not slidelike'
+        test_file = BytesIO(test_bytes)
         test_file.name = 'also_not_really.txt'
-        r = self.client.post(url,dict(file=test_file,title='a different slide file',apply_to_all=False))
+        r = self.client.post(url,dict(file=test_file,title='a different slide file',apply_to_all=False,approved=True))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(session1.sessionpresentation_set.count(),1)
-        self.assertEqual(session2.sessionpresentation_set.count(),2)
-        sp = session2.sessionpresentation_set.get(document__name__endswith='-a-different-slide-file')
+        self.assertEqual(session1.presentations.count(),1)
+        self.assertEqual(session2.presentations.count(),2)
+        sp = session2.presentations.get(document__name__endswith='-a-different-slide-file')
         self.assertEqual(sp.order,2)
         self.assertEqual(sp.rev,'00')
         self.assertEqual(sp.document.rev,'00')
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 1)
+        self.assertEqual(retrieve_bytes("slides", f"{sp.document.name}-{sp.document.rev}.txt"), test_bytes)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.add.call_args,
+            call(session=session2, slides=sp.document, order=2),
+        )
+        mock_slides_manager_cls.reset_mock()
 
-        url = urlreverse('ietf.meeting.views.upload_session_slides',kwargs={'num':session2.meeting.number,'session_id':session2.id,'name':session2.sessionpresentation_set.get(order=2).document.name})
+        url = urlreverse('ietf.meeting.views.upload_session_slides',kwargs={'num':session2.meeting.number,'session_id':session2.id,'name':session2.presentations.get(order=2).document.name})
         r = self.client.get(url)
         self.assertTrue(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertIn('Revise', str(q("title")))
-        test_file = BytesIO(b'new content for the second slide deck')
+        test_bytes = b'new content for the second slide deck'
+        test_file = BytesIO(test_bytes)
         test_file.name = 'doesnotmatter.txt'
-        r = self.client.post(url,dict(file=test_file,title='rename the presentation',apply_to_all=False))
+        r = self.client.post(url,dict(file=test_file,title='rename the presentation',apply_to_all=False, approved=True))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(session1.sessionpresentation_set.count(),1)
-        self.assertEqual(session2.sessionpresentation_set.count(),2)
-        sp = session2.sessionpresentation_set.get(order=2)
-        self.assertEqual(sp.rev,'01')
-        self.assertEqual(sp.document.rev,'01')
- 
+        self.assertEqual(session1.presentations.count(),1)
+        self.assertEqual(session2.presentations.count(),2)
+        replacement_sp = session2.presentations.get(order=2)
+        self.assertEqual(replacement_sp.rev,'01')
+        self.assertEqual(replacement_sp.document.rev,'01')
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(retrieve_bytes("slides", f"{replacement_sp.document.name}-{replacement_sp.document.rev}.txt"), test_bytes)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.revise.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.revise.call_args,
+            call(session=session2, slides=sp.document),
+        )
+
     def test_upload_slide_title_bad_unicode(self):
         session1 = SessionFactory(meeting__type_id='ietf')
         url = urlreverse('ietf.meeting.views.upload_session_slides',kwargs={'num':session1.meeting.number,'session_id':session1.id})
@@ -5745,7 +6990,7 @@ def test_upload_slide_title_bad_unicode(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertIn('Upload', str(q("title")))
-        self.assertFalse(session1.sessionpresentation_set.filter(document__type_id='slides'))
+        self.assertFalse(session1.presentations.filter(document__type_id='slides'))
         test_file = BytesIO(b'this is not really a slide')
         test_file.name = 'not_really.txt'
         r = self.client.post(url,dict(file=test_file,title='title with bad character \U0001fabc '))
@@ -5754,39 +6999,70 @@ def test_upload_slide_title_bad_unicode(self):
         self.assertTrue(q('form .is-invalid'))
         self.assertIn("Unicode BMP", q('form .is-invalid div').text())
 
-    def test_remove_sessionpresentation(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_remove_sessionpresentation(self, mock_slides_manager_cls):
         session = SessionFactory(meeting__type_id='ietf')
+        agenda = DocumentFactory(type_id='agenda')
         doc = DocumentFactory(type_id='slides')
-        session.sessionpresentation_set.create(document=doc)
+        session.presentations.create(document=agenda)
+        session.presentations.create(document=doc)
 
         url = urlreverse('ietf.meeting.views.remove_sessionpresentation',kwargs={'num':session.meeting.number,'session_id':session.id,'name':'no-such-doc'})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         url = urlreverse('ietf.meeting.views.remove_sessionpresentation',kwargs={'num':session.meeting.number,'session_id':0,'name':doc.name})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
+        self.assertFalse(mock_slides_manager_cls.called)
 
         url = urlreverse('ietf.meeting.views.remove_sessionpresentation',kwargs={'num':session.meeting.number,'session_id':session.id,'name':doc.name})
         login_testing_unauthorized(self,"secretary",url)
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
+        self.assertFalse(mock_slides_manager_cls.called)
 
-        self.assertEqual(1,session.sessionpresentation_set.count())
+        # Removing slides should remove the materials and call MeetechoAPI
+        self.assertEqual(2, session.presentations.count())
         response = self.client.post(url,{'remove_session':''})
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(0,session.sessionpresentation_set.count())
-        self.assertEqual(2,doc.docevent_set.count())
+        self.assertEqual(1, session.presentations.count())
+        self.assertEqual(2, doc.docevent_set.count())
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.delete.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.delete.call_args,
+            call(session=session, slides=doc),
+        )
+        mock_slides_manager_cls.reset_mock()
+
+        # Removing non-slides should only remove the materials
+        url = urlreverse(
+            "ietf.meeting.views.remove_sessionpresentation",
+            kwargs={
+                "num": session.meeting.number,
+                "session_id": session.id,
+                "name": agenda.name,
+            },
+        )
+        response = self.client.post(url, {"remove_session" : ""})
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(0, session.presentations.count())
+        self.assertEqual(2, agenda.docevent_set.count())
+        self.assertFalse(mock_slides_manager_cls.called)
 
     def test_propose_session_slides(self):
         for type_id in ['ietf','interim']:
             session = SessionFactory(meeting__type_id=type_id)
             chair = RoleFactory(group=session.group,name_id='chair').person
-            session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+            session.meeting.importantdate_set.create(name_id='revsub',date=date_today() + datetime.timedelta(days=20))
             newperson = PersonFactory()
             
             session_overview_url = urlreverse('ietf.meeting.views.session_details',kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
-            propose_url = urlreverse('ietf.meeting.views.propose_session_slides', kwargs={'session_id':session.pk, 'num': session.meeting.number})    
+            upload_url = urlreverse('ietf.meeting.views.upload_session_slides', kwargs={'session_id':session.pk, 'num': session.meeting.number})    
 
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code,200)
@@ -5801,17 +7077,22 @@ def test_propose_session_slides(self):
             self.assertTrue(q('.proposeslides'))
             self.client.logout()
 
-            login_testing_unauthorized(self,newperson.user.username,propose_url)
-            r = self.client.get(propose_url)
+            login_testing_unauthorized(self,newperson.user.username,upload_url)
+            r = self.client.get(upload_url)
             self.assertEqual(r.status_code,200)
-            test_file = BytesIO(b'this is not really a slide')
+            test_bytes = b'this is not really a slide'
+            test_file = BytesIO(test_bytes)
             test_file.name = 'not_really.txt'
             empty_outbox()
-            r = self.client.post(propose_url,dict(file=test_file,title='a test slide file',apply_to_all=True))
+            r = self.client.post(upload_url,dict(file=test_file,title='a test slide file',apply_to_all=True,approved=False))
             self.assertEqual(r.status_code, 302)
             session = Session.objects.get(pk=session.pk)
             self.assertEqual(session.slidesubmission_set.count(),1)
             self.assertEqual(len(outbox),1)
+            self.assertEqual(
+                retrieve_bytes("staging", session.slidesubmission_set.get().filename),
+                test_bytes
+            )
 
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code, 200)
@@ -5828,9 +7109,35 @@ def test_propose_session_slides(self):
             self.assertEqual(len(q('.proposedslidelist p')), 2)
             self.client.logout()
 
+            login_testing_unauthorized(self,chair.user.username,upload_url)
+            r = self.client.get(upload_url)
+            self.assertEqual(r.status_code,200)
+            test_bytes = b'this is not really a slide either'
+            test_file = BytesIO(test_bytes)
+            test_file.name = 'again_not_really.txt'
+            empty_outbox()
+            r = self.client.post(upload_url,dict(file=test_file,title='a selfapproved test slide file',apply_to_all=True,approved=True))
+            self.assertEqual(r.status_code, 302)
+            self.assertEqual(len(outbox),0)
+            self.assertEqual(session.slidesubmission_set.count(),2)
+            sp = session.presentations.get(document__title__contains="selfapproved")
+            self.assertFalse(exists_in_storage("staging", sp.document.uploaded_filename))
+            self.assertEqual(
+                retrieve_bytes("slides", sp.document.uploaded_filename),
+                test_bytes
+            )
+            self.client.logout()
+
+            self.client.login(username=chair.user.username, password=chair.user.username+"+password")
+            r = self.client.get(session_overview_url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertEqual(len(q('.uploadslidelist p')), 0)
+            self.client.logout()
+
     def test_disapprove_proposed_slides(self):
         submission = SlideSubmissionFactory()
-        submission.session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        submission.session.meeting.importantdate_set.create(name_id='revsub',date=date_today() + datetime.timedelta(days=20))
         self.assertEqual(SlideSubmission.objects.filter(status__slug = 'pending').count(), 1)
         chair = RoleFactory(group=submission.session.group,name_id='chair').person
         url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
@@ -5841,14 +7148,18 @@ def test_disapprove_proposed_slides(self):
         self.assertEqual(r.status_code,302)
         self.assertEqual(SlideSubmission.objects.filter(status__slug = 'rejected').count(), 1)
         self.assertEqual(SlideSubmission.objects.filter(status__slug = 'pending').count(), 0)
+        if submission.filename is not None and submission.filename != "":
+            self.assertFalse(exists_in_storage("staging", submission.filename))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertRegex(r.content.decode(), r"These\s+slides\s+have\s+already\s+been\s+rejected")
+        self.assertRegex(r.content.decode(), r"These\s+slides\s+have\s+already\s+been\s+declined")
 
-    def test_approve_proposed_slides(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_approve_proposed_slides(self, mock_slides_manager_cls):
         submission = SlideSubmissionFactory()
         session = submission.session
-        session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        session.meeting.importantdate_set.create(name_id='revsub',date=date_today() + datetime.timedelta(days=20))
         chair = RoleFactory(group=submission.session.group,name_id='chair').person
         url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
         login_testing_unauthorized(self, chair.user.username, url)
@@ -5856,24 +7167,43 @@ def test_approve_proposed_slides(self):
         self.assertIsNone(submission.doc)
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
+        empty_outbox()
+        self.assertTrue(exists_in_storage("staging", submission.filename))
         r = self.client.post(url,dict(title='different title',approve='approve'))
         self.assertEqual(r.status_code,302)
         self.assertEqual(SlideSubmission.objects.filter(status__slug = 'pending').count(), 0)
         self.assertEqual(SlideSubmission.objects.filter(status__slug = 'approved').count(), 1)
-        submission = SlideSubmission.objects.get(id = submission.id)
+        submission.refresh_from_db()
         self.assertEqual(submission.status_id, 'approved')
         self.assertIsNotNone(submission.doc)
-        self.assertEqual(session.sessionpresentation_set.count(),1)
-        self.assertEqual(session.sessionpresentation_set.first().document.title,'different title')
+        self.assertEqual(session.presentations.count(),1)
+        self.assertEqual(session.presentations.first().document.title,'different title')
+        self.assertTrue(exists_in_storage("slides", submission.doc.uploaded_filename))
+        self.assertFalse(exists_in_storage("staging", submission.filename))
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.add.call_args,
+            call(session=session, slides=submission.doc, order=1),
+        )
+        mock_slides_manager_cls.reset_mock()
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertRegex(r.content.decode(), r"These\s+slides\s+have\s+already\s+been\s+approved")
-
-    def test_approve_proposed_slides_multisession_apply_one(self):
+        self.assertFalse(mock_slides_manager_cls.called)
+        self.assertEqual(len(outbox), 1)
+        self.assertIn(submission.submitter.email_address(), outbox[0]['To'])
+        self.assertIn('Slides approved', outbox[0]['Subject'])
+
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_approve_proposed_slides_multisession_apply_one(self, mock_slides_manager_cls):
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SlideSubmissionFactory(session__meeting__type_id='ietf')
         session1 = submission.session
         session2 = SessionFactory(group=submission.session.group, meeting=submission.session.meeting)
-        submission.session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        submission.session.meeting.importantdate_set.create(name_id='revsub',date=date_today() + datetime.timedelta(days=20))
         chair = RoleFactory(group=submission.session.group,name_id='chair').person
         url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
         login_testing_unauthorized(self, chair.user.username, url)
@@ -5882,83 +7212,201 @@ def test_approve_proposed_slides_multisession_apply_one(self):
         q = PyQuery(r.content)
         self.assertTrue(q('#id_apply_to_all'))
         r = self.client.post(url,dict(title='yet another title',approve='approve'))
+        submission.refresh_from_db()
+        self.assertIsNotNone(submission.doc)
         self.assertEqual(r.status_code,302)
-        self.assertEqual(session1.sessionpresentation_set.count(),1)
-        self.assertEqual(session2.sessionpresentation_set.count(),0)
+        self.assertEqual(session1.presentations.count(),1)
+        self.assertEqual(session2.presentations.count(),0)
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.add.call_args,
+            call(session=session1, slides=submission.doc, order=1),
+        )
 
-    def test_approve_proposed_slides_multisession_apply_all(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_approve_proposed_slides_multisession_apply_all(self, mock_slides_manager_cls):
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SlideSubmissionFactory(session__meeting__type_id='ietf')
         session1 = submission.session
         session2 = SessionFactory(group=submission.session.group, meeting=submission.session.meeting)
-        submission.session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        submission.session.meeting.importantdate_set.create(name_id='revsub',date=date_today() + datetime.timedelta(days=20))
         chair = RoleFactory(group=submission.session.group,name_id='chair').person
         url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
         login_testing_unauthorized(self, chair.user.username, url)
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         r = self.client.post(url,dict(title='yet another title',apply_to_all=1,approve='approve'))
+        submission.refresh_from_db()
         self.assertEqual(r.status_code,302)
-        self.assertEqual(session1.sessionpresentation_set.count(),1)
-        self.assertEqual(session2.sessionpresentation_set.count(),1)
+        self.assertEqual(session1.presentations.count(),1)
+        self.assertEqual(session2.presentations.count(),1)
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 2)
+        self.assertCountEqual(
+            mock_slides_manager_cls.return_value.add.call_args_list,
+            [
+                call(session=session1, slides=submission.doc, order=1),
+                call(session=session2, slides=submission.doc, order=1),
+            ]
+        )
 
-    def test_submit_and_approve_multiple_versions(self):
+    @override_settings(MEETECHO_API_CONFIG="fake settings")  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_submit_and_approve_multiple_versions(self, mock_slides_manager_cls):
         session = SessionFactory(meeting__type_id='ietf')
         chair = RoleFactory(group=session.group,name_id='chair').person
-        session.meeting.importantdate_set.create(name_id='revsub',date=datetime.date.today()+datetime.timedelta(days=20))
+        session.meeting.importantdate_set.create(name_id='revsub',date=date_today()+datetime.timedelta(days=20))
         newperson = PersonFactory()
         
-        propose_url = urlreverse('ietf.meeting.views.propose_session_slides', kwargs={'session_id':session.pk, 'num': session.meeting.number})          
+        upload_url = urlreverse('ietf.meeting.views.upload_session_slides', kwargs={'session_id':session.pk, 'num': session.meeting.number})          
         
-        login_testing_unauthorized(self,newperson.user.username,propose_url)
+        login_testing_unauthorized(self,newperson.user.username,upload_url)
         test_file = BytesIO(b'this is not really a slide')
         test_file.name = 'not_really.txt'
-        r = self.client.post(propose_url,dict(file=test_file,title='a test slide file',apply_to_all=True))
+        r = self.client.post(upload_url,dict(file=test_file,title='a test slide file',apply_to_all=True,approved=False))
         self.assertEqual(r.status_code, 302)
         self.client.logout()
 
-        submission = SlideSubmission.objects.get(session = session)
+        submission = SlideSubmission.objects.get(session=session)
 
+        self.assertTrue(exists_in_storage("staging", submission.filename))
         approve_url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':submission.pk,'num':submission.session.meeting.number})
         login_testing_unauthorized(self, chair.user.username, approve_url)
         r = self.client.post(approve_url,dict(title=submission.title,approve='approve'))
+        submission.refresh_from_db()
         self.assertEqual(r.status_code,302)
         self.client.logout()
+        self.assertFalse(exists_in_storage("staging", submission.filename))
+        self.assertTrue(exists_in_storage("slides", submission.doc.uploaded_filename))
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.add.call_args,
+            call(session=session, slides=submission.doc, order=1),
+        )
+        mock_slides_manager_cls.reset_mock()
+        
+        self.assertEqual(session.presentations.first().document.rev,'00')
 
-        self.assertEqual(session.sessionpresentation_set.first().document.rev,'00')
-
-        login_testing_unauthorized(self,newperson.user.username,propose_url)
+        login_testing_unauthorized(self,newperson.user.username,upload_url)
         test_file = BytesIO(b'this is not really a slide, but it is another version of it')
         test_file.name = 'not_really.txt'
-        r = self.client.post(propose_url,dict(file=test_file,title='a test slide file',apply_to_all=True))
+        r = self.client.post(upload_url,dict(file=test_file,title='a test slide file',apply_to_all=True))
         self.assertEqual(r.status_code, 302)
 
         test_file = BytesIO(b'this is not really a slide, but it is third version of it')
         test_file.name = 'not_really.txt'
-        r = self.client.post(propose_url,dict(file=test_file,title='a test slide file',apply_to_all=True))
+        r = self.client.post(upload_url,dict(file=test_file,title='a test slide file',apply_to_all=True))
         self.assertEqual(r.status_code, 302)
         self.client.logout()       
 
         (first_submission, second_submission) = SlideSubmission.objects.filter(session=session, status__slug = 'pending').order_by('id')
 
+        self.assertTrue(exists_in_storage("staging", first_submission.filename))
+        self.assertTrue(exists_in_storage("staging", second_submission.filename))
         approve_url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':second_submission.pk,'num':second_submission.session.meeting.number})
         login_testing_unauthorized(self, chair.user.username, approve_url)
         r = self.client.post(approve_url,dict(title=submission.title,approve='approve'))
+        first_submission.refresh_from_db()
+        second_submission.refresh_from_db()
+        self.assertTrue(exists_in_storage("staging", first_submission.filename))
+        self.assertFalse(exists_in_storage("staging", second_submission.filename))
+        self.assertTrue(exists_in_storage("slides", second_submission.doc.uploaded_filename))
         self.assertEqual(r.status_code,302)
+        self.assertEqual(mock_slides_manager_cls.call_count, 1)
+        self.assertEqual(mock_slides_manager_cls.call_args, call(api_config="fake settings"))
+        self.assertEqual(mock_slides_manager_cls.return_value.add.call_count, 0)
+        self.assertEqual(mock_slides_manager_cls.return_value.revise.call_count, 1)
+        self.assertEqual(
+            mock_slides_manager_cls.return_value.revise.call_args,
+            call(session=session, slides=second_submission.doc),
+        )
+        mock_slides_manager_cls.reset_mock()
 
         disapprove_url = urlreverse('ietf.meeting.views.approve_proposed_slides', kwargs={'slidesubmission_id':first_submission.pk,'num':first_submission.session.meeting.number})
         r = self.client.post(disapprove_url,dict(title='some title',disapprove="disapprove"))
         self.assertEqual(r.status_code,302)
         self.client.logout()
+        self.assertFalse(mock_slides_manager_cls.called)
+        self.assertFalse(exists_in_storage("staging", first_submission.filename))
 
         self.assertEqual(SlideSubmission.objects.filter(status__slug = 'pending').count(),0)
         self.assertEqual(SlideSubmission.objects.filter(status__slug = 'rejected').count(),1)
-        self.assertEqual(session.sessionpresentation_set.first().document.rev,'01')
+        self.assertEqual(session.presentations.first().document.rev,'01')
         path = os.path.join(submission.session.meeting.get_materials_path(),'slides')
-        filename = os.path.join(path,session.sessionpresentation_set.first().document.name+'-01.txt')
+        filename = os.path.join(path,session.presentations.first().document.name+'-01.txt')
         self.assertTrue(os.path.exists(filename))
-        contents = io.open(filename,'r').read()
+        fd = io.open(filename, 'r')
+        contents = fd.read()
+        fd.close()
         self.assertIn('third version', contents)
 
+    @override_settings(
+        MEETECHO_API_CONFIG="fake settings"
+    )  # enough to trigger API calls
+    @patch("ietf.meeting.views.SlidesManager")
+    def test_notify_meetecho_of_all_slides(self, mock_slides_manager_cls):
+        for meeting_type in ["ietf", "interim"]:
+            # Reset for the sake of the second iteration
+            self.client.logout()
+            mock_slides_manager_cls.reset_mock()
+
+            session = SessionFactory(meeting__type_id=meeting_type)
+            meeting = session.meeting
+    
+            # bad meeting
+            url = urlreverse(
+                "ietf.meeting.views.notify_meetecho_of_all_slides",
+                kwargs={"num": 9999, "acronym": session.group.acronym},
+            )
+            login_testing_unauthorized(self, "secretary", url)
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 404)
+            r = self.client.post(url)
+            self.assertEqual(r.status_code, 404)
+            self.assertFalse(mock_slides_manager_cls.called)
+            self.client.logout()
+    
+            # good meeting
+            url = urlreverse(
+                "ietf.meeting.views.notify_meetecho_of_all_slides",
+                kwargs={"num": meeting.number, "acronym": session.group.acronym},
+            )
+            login_testing_unauthorized(self, "secretary", url)
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 405)
+            self.assertFalse(mock_slides_manager_cls.called)
+            mock_slides_manager = mock_slides_manager_cls.return_value
+            mock_slides_manager.send_update.return_value = True
+            r = self.client.post(url)
+            self.assertEqual(r.status_code, 302)
+            self.assertEqual(mock_slides_manager.send_update.call_count, 1)
+            self.assertEqual(mock_slides_manager.send_update.call_args, call(session))
+            r = self.client.get(r["Location"])
+            messages = list(r.context["messages"])
+            self.assertEqual(len(messages), 1)
+            self.assertEqual(
+                str(messages[0]), f"Notified Meetecho about slides for {session}"
+            )
+    
+            mock_slides_manager.send_update.reset_mock()
+            mock_slides_manager.send_update.return_value = False
+            r = self.client.post(url)
+            self.assertEqual(r.status_code, 302)
+            self.assertEqual(mock_slides_manager.send_update.call_count, 1)
+            self.assertEqual(mock_slides_manager.send_update.call_args, call(session))
+            r = self.client.get(r["Location"])
+            messages = list(r.context["messages"])
+            self.assertEqual(len(messages), 1)
+            self.assertIn(
+                "No sessions were eligible for Meetecho slides update.", str(messages[0])
+            )
+
 
 @override_settings(IETF_NOTES_URL='https://notes.ietf.org/')
 class ImportNotesTests(TestCase):
@@ -6037,6 +7485,10 @@ def test_imports_previewed_text(self):
         minutes_path = Path(self.meeting.get_materials_path()) / 'minutes'
         with (minutes_path / self.session.minutes().uploaded_filename).open() as f:
             self.assertEqual(f.read(), 'original markdown text')
+        self.assertEqual(
+            retrieve_str("minutes", self.session.minutes().uploaded_filename),
+            'original markdown text'
+        )
 
     def test_refuses_identical_import(self):
         """Should not be able to import text identical to the current revision"""
@@ -6058,8 +7510,8 @@ def test_refuses_identical_import(self):
             r = self.client.get(url)  # try to import the same text
             self.assertContains(r, "This document is identical", status_code=200)
             q = PyQuery(r.content)
-            self.assertEqual(len(q('button:disabled[type="submit"]')), 1)
-            self.assertEqual(len(q('button:enabled[type="submit"]')), 0)
+            self.assertEqual(len(q('#content button:disabled[type="submit"]')), 1)
+            self.assertEqual(len(q('#content button:enabled[type="submit"]')), 0)
 
     def test_allows_import_on_existing_bad_unicode(self):
         """Should not be able to import text identical to the current revision"""
@@ -6069,7 +7521,7 @@ def test_allows_import_on_existing_bad_unicode(self):
         self.client.login(username='secretary', password='secretary+password')
         r = self.client.post(url, {'markdown_text': 'replaced below'})  # create a rev
         with open(
-                self.session.sessionpresentation_set.filter(document__type="minutes").first().document.get_file_name(),
+                self.session.presentations.filter(document__type="minutes").first().document.get_file_name(),
                 'wb'
         ) as f:
             # Replace existing content with an invalid Unicode byte string. The particular invalid
@@ -6083,8 +7535,8 @@ def test_allows_import_on_existing_bad_unicode(self):
             r = self.client.get(url)  # try to import the same text
             self.assertNotContains(r, "This document is identical", status_code=200)
             q = PyQuery(r.content)
-            self.assertEqual(len(q('button:enabled[type="submit"]')), 1)
-            self.assertEqual(len(q('button:disabled[type="submit"]')), 0)
+            self.assertEqual(len(q('#content button:enabled[type="submit"]')), 1)
+            self.assertEqual(len(q('#content button:disabled[type="submit"]')), 0)
 
     def test_handles_missing_previous_revision_file(self):
         """Should still allow import if the file for the previous revision is missing"""
@@ -6094,9 +7546,11 @@ def test_handles_missing_previous_revision_file(self):
         self.client.login(username='secretary', password='secretary+password')
         r = self.client.post(url, {'markdown_text': 'original markdown text'})  # create a rev
         # remove the file uploaded for the first rev
-        minutes_docs = self.session.sessionpresentation_set.filter(document__type='minutes')
+        minutes_docs = self.session.presentations.filter(document__type='minutes')
         self.assertEqual(minutes_docs.count(), 1)
-        Path(minutes_docs.first().document.get_file_name()).unlink()
+        to_remove = Path(minutes_docs.first().document.get_file_name())
+        to_remove.unlink()
+        remove_from_storage("minutes", to_remove.name)
 
         self.assertEqual(r.status_code, 302)
         with requests_mock.Mocker() as mock:
@@ -6137,13 +7591,35 @@ def test_handles_notes_server_failure(self):
 
 class SessionTests(TestCase):
 
+    def test_get_summary_by_area(self):
+        meeting = make_meeting_test_data(meeting=MeetingFactory(type_id='ietf', number='100'))
+        sessions = Session.objects.filter(meeting=meeting).with_current_status()
+        data = get_summary_by_area(sessions)
+        self.assertEqual(data[0][0], 'Duration')
+        self.assertGreater(len(data), 2)
+        self.assertEqual(data[-1][0], 'Total Hours')
+
+    def test_get_summary_by_type(self):
+        meeting = make_meeting_test_data(meeting=MeetingFactory(type_id='ietf', number='100'))
+        sessions = Session.objects.filter(meeting=meeting).with_current_status()
+        data = get_summary_by_type(sessions)
+        self.assertEqual(data[0][0], 'Group Type')
+        self.assertGreater(len(data), 2)
+
+    def test_get_summary_by_purpose(self):
+        meeting = make_meeting_test_data(meeting=MeetingFactory(type_id='ietf', number='100'))
+        sessions = Session.objects.filter(meeting=meeting).with_current_status()
+        data = get_summary_by_purpose(sessions)
+        self.assertEqual(data[0][0], 'Purpose')
+        self.assertGreater(len(data), 2)
+
     def test_meeting_requests(self):
         meeting = MeetingFactory(type_id='ietf')
 
         # a couple non-wg group types, confirm that their has_meetings features are as expected
         group_type_with_meetings = 'adhoc'
         self.assertTrue(GroupFeatures.objects.get(pk=group_type_with_meetings).has_meetings)
-        group_type_without_meetings = 'editorial'
+        group_type_without_meetings = 'sdo'
         self.assertFalse(GroupFeatures.objects.get(pk=group_type_without_meetings).has_meetings)
 
         area = GroupFactory(type_id='area', acronym='area')
@@ -6209,9 +7685,23 @@ def test_meeting_requests(self):
             status_id='schedw',
             add_to_schedule=False,
         )
+        session_with_none_purpose = SessionFactory(
+            meeting=meeting,
+            group__parent=area,
+            purpose_id="none",
+            status_id="schedw",
+            add_to_schedule=False,
+        )
+        tutorial_session = SessionFactory(
+            meeting=meeting,
+            group__parent=area,
+            purpose_id="tutorial",
+            status_id="schedw",
+            add_to_schedule=False,
+        )
         def _sreq_edit_link(sess):
             return urlreverse(
-                'ietf.secr.sreq.views.edit',
+                'ietf.meeting.views_session_request.edit_request',
                 kwargs={
                     'num': meeting.number,
                     'acronym': sess.group.acronym,
@@ -6247,6 +7737,8 @@ def _sreq_edit_link(sess):
         self.assertContains(r, _sreq_edit_link(proposed_wg_session))  # link to the session request
         self.assertContains(r, rg_session.group.acronym)
         self.assertContains(r, _sreq_edit_link(rg_session))  # link to the session request
+        self.assertContains(r, session_with_none_purpose.group.acronym)
+        self.assertContains(r, tutorial_session.group.acronym)
         # check headings - note that the special types (has_meetings, etc) do not have a group parent
         # so they show up in 'other'
         q = PyQuery(r.content)
@@ -6254,6 +7746,22 @@ def _sreq_edit_link(sess):
         self.assertEqual(len(q('h2#other-groups')), 1)
         self.assertEqual(len(q('h2#irtf')), 1)  # rg group has irtf group as parent
 
+        # check rounded pills
+        self.assertNotContains(  # no rounded pill for sessions with regular purpose
+            r,
+            '<span class="badge rounded-pill text-bg-info">Regular</span>',
+            html=True,
+        )
+        self.assertNotContains(  # no rounded pill for session with no purpose specified
+            r,
+            '<span class="badge rounded-pill text-bg-info">None</span>',
+            html=True,
+        )
+        self.assertContains(  # rounded pill for session with non-regular purpose
+            r,
+            '<span class="badge rounded-pill text-bg-info">Tutorial</span>',
+            html=True,
+        )
 
     def test_request_minutes(self):
         meeting = MeetingFactory(type_id='ietf')
@@ -6276,6 +7784,156 @@ def test_request_minutes(self):
         self.assertEqual(r.status_code,302)
         self.assertEqual(len(outbox),1)
 
+    @override_settings(YOUTUBE_DOMAINS=["youtube.com"])
+    def test_add_session_recordings(self):
+        session = SessionFactory(meeting__type_id="ietf")
+        url = urlreverse(
+            "ietf.meeting.views.add_session_recordings", 
+            kwargs={"session_id": session.pk, "num": session.meeting.number},
+        )
+        # does not fully validate authorization for non-secretariat users :-(
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        pq = PyQuery(r.content)
+        title_input = pq("input#id_title")
+        self.assertIsNotNone(title_input)
+        self.assertEqual(
+            title_input.attr.value,
+            "Video recording of {acro} for {timestamp}".format(
+                acro=session.group.acronym,
+                timestamp=session.official_timeslotassignment().timeslot.utc_start_time().strftime(
+                    "%Y-%m-%d %H:%M"
+                ),
+            ),
+        )
+        
+        with patch("ietf.meeting.views.create_recording") as mock_create:
+            r = self.client.post(
+                url,
+                data={
+                    "title": "This is my video title",
+                    "url": "",
+                }
+            )
+        self.assertFalse(mock_create.called)
+        
+        with patch("ietf.meeting.views.create_recording") as mock_create:
+            r = self.client.post(
+                url,
+                data={
+                    "title": "This is my video title",
+                    "url": "https://yubtub.com/this-is-not-a-youtube-video",
+                }
+            )
+        self.assertFalse(mock_create.called)
+
+        with patch("ietf.meeting.views.create_recording") as mock_create:
+            r = self.client.post(
+                url,
+                data={
+                    "title": "This is my video title",
+                    "url": "https://youtube.com/finally-a-video",
+                }
+            )
+        self.assertTrue(mock_create.called)
+        self.assertEqual(
+            mock_create.call_args, 
+            call(
+                session, 
+                "https://youtube.com/finally-a-video",
+                title="This is my video title",
+                user=Person.objects.get(user__username="secretary"),
+            ),
+        )
+
+        # CAN delete session presentation for this session
+        sp = SessionPresentationFactory(
+            session=session,
+            document__type_id="recording",
+            document__external_url="https://example.com/some-video",
+        )
+        with patch("ietf.meeting.views.delete_recording") as mock_delete:
+            r = self.client.post(
+                url,
+                data={
+                    "delete": str(sp.pk),
+                }
+            )
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(mock_delete.called)
+        self.assertEqual(mock_delete.call_args, call(sp))
+        
+        # ValueError message from delete_recording does not reach the user
+        sp = SessionPresentationFactory(
+            session=session,
+            document__type_id="recording",
+            document__external_url="https://example.com/some-video",
+        )
+        with patch("ietf.meeting.views.delete_recording", side_effect=ValueError("oh joy!")) as mock_delete:
+            r = self.client.post(
+                url,
+                data={
+                    "delete": str(sp.pk),
+                }
+            )
+        self.assertTrue(mock_delete.called)
+        self.assertNotContains(r, "oh joy!", status_code=200)
+        
+        # CANNOT delete session presentation for a different session
+        sp_for_other_session = SessionPresentationFactory(
+            document__type_id="recording",
+            document__external_url="https://example.com/some-other-video",
+        )
+        with patch("ietf.meeting.views.delete_recording") as mock_delete:
+            r = self.client.post(
+                url,
+                data={
+                    "delete": str(sp_for_other_session.pk),
+                }
+            )
+        self.assertEqual(r.status_code, 404)
+        self.assertFalse(mock_delete.called)
+
+    def test_show_chatlog_links(self):
+        meeting = MeetingFactory(type_id='ietf', number='122')
+        session = SessionFactory(meeting=meeting)
+        doc_name = 'chatlog-72-mars-197001010000'
+        SessionPresentation.objects.create(session=session,document=DocumentFactory(type_id='chatlog', name=doc_name))
+
+        session_url = urlreverse('ietf.meeting.views.session_details', 
+                                 kwargs={'num':meeting.number, 'acronym':session.group.acronym})
+
+        r = self.client.get(session_url)
+
+        self.assertEqual(r.status_code, 200)
+
+        q = PyQuery(r.content)
+
+        # Find the chatlog link in the desktop view
+        link_chatlog_box = q(f'a[title="Chat logs for {session.group.acronym}"]')
+        self.assertTrue(link_chatlog_box, 'Expected <a> element with title "Chat logs for {group.acronym}" not found.')
+        self.assertEqual(link_chatlog_box.attr('href'), '/doc/'+ doc_name)
+
+        # Find the chatlog link in the mobile view
+        link_chatlog_list = q('li:contains("Chat logs")')
+        self.assertTrue(link_chatlog_list, 'Expected <li> element containing "Chat logs" not found.')
+        self.assertEqual(link_chatlog_list.find('a').attr('href'), '/doc/'+ doc_name)
+
+    def test_hide_chatlog_links(self):
+        # mock meeting and session, but no chatlog document
+        meeting = MeetingFactory(type_id='ietf', number='122')
+        session = SessionFactory(meeting=meeting)
+
+        session_url = urlreverse('ietf.meeting.views.session_details', 
+                                 kwargs={'num':meeting.number, 'acronym':session.group.acronym})
+
+        r = self.client.get(session_url)
+
+        self.assertEqual(r.status_code, 200)
+        # validate no links for chat logs exist
+        self.assertNotContains(r, 'Chat logs')
+
+
 class HasMeetingsTests(TestCase):
     settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['AGENDA_PATH']
 
@@ -6285,8 +7943,8 @@ def do_request_interim(self, url, group, user, meeting_count):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertTrue(q('#id_group option[value="%d"]'%group.pk))
-        date = datetime.date.today() + datetime.timedelta(days=30+meeting_count)
-        time = datetime.datetime.now().time().replace(microsecond=0,second=0)
+        date = date_today() + datetime.timedelta(days=30+meeting_count)
+        time = time_now().replace(microsecond=0,second=0)
         remote_instructions = 'Use webex'
         agenda = 'Intro. Slides. Discuss.'
         agenda_note = 'On second level'
@@ -6370,10 +8028,7 @@ def test_cannot_request_interim(self):
         for gf in GroupFeatures.objects.filter(has_meetings=True):
             for role_name in all_role_names - set(gf.groupman_roles):
                 role = RoleFactory(group__type_id=gf.type_id,name_id=role_name)
-                self.client.login(username=role.person.user.username, password=role.person.user.username+'+password')
-                r = self.client.get(url)
-                self.assertEqual(r.status_code, 403)
-                self.client.logout()
+                self.assertFalse(can_request_interim_meeting(role.person.user))
 
     def test_appears_on_upcoming(self):
         url = urlreverse('ietf.meeting.views.upcoming')
@@ -6382,7 +8037,7 @@ def test_appears_on_upcoming(self):
             session = SessionFactory(
                 group__type_id = gf.type_id,
                 meeting__type_id='interim', 
-                meeting__date = datetime.datetime.today()+datetime.timedelta(days=30),
+                meeting__date = timezone.now()+datetime.timedelta(days=30),
                 status_id='sched',
             )
             sessions.append(session)
@@ -6398,7 +8053,7 @@ def test_appears_on_pending(self):
         sessions=[]
         for gf in GroupFeatures.objects.filter(has_meetings=True):
             group = GroupFactory(type_id=gf.type_id)
-            meeting_date = datetime.datetime.today() + datetime.timedelta(days=30)
+            meeting_date = timezone.now() + datetime.timedelta(days=30)
             session = SessionFactory(
                 group=group,
                 meeting__type_id='interim', 
@@ -6419,7 +8074,7 @@ def test_appears_on_announce(self):
         sessions=[]
         for gf in GroupFeatures.objects.filter(has_meetings=True):
             group = GroupFactory(type_id=gf.type_id)
-            meeting_date = datetime.datetime.today() + datetime.timedelta(days=30)
+            meeting_date = timezone.now() + datetime.timedelta(days=30)
             session = SessionFactory(
                 group=group,
                 meeting__type_id='interim', 
@@ -7057,8 +8712,7 @@ def _proceedings_file():
         path = Path(settings.BASE_DIR) / 'meeting/test_procmat.pdf'
         return path.open('rb')
 
-    def _assertMeetingHostsDisplayed(self, response, meeting):
-        pq = PyQuery(response.content)
+    def _assertMeetingHostsDisplayed(self, pq: PyQuery, meeting):
         host_divs = pq('div.host-logo')
         self.assertEqual(len(host_divs), meeting.meetinghosts.count(), 'Should have a logo for every meeting host')
         self.assertEqual(
@@ -7074,12 +8728,11 @@ def _assertMeetingHostsDisplayed(self, response, meeting):
             'Correct image and name for each host should appear in the correct order'
         )
 
-    def _assertProceedingsMaterialsDisplayed(self, response, meeting):
+    def _assertProceedingsMaterialsDisplayed(self, pq: PyQuery, meeting):
         """Checks that all (and only) active materials are linked with correct href and title"""
         expected_materials = [
             m for m in meeting.proceedings_materials.order_by('type__order') if m.active()
         ]
-        pq = PyQuery(response.content)
         links = pq('div.proceedings-material a')
         self.assertEqual(len(links), len(expected_materials), 'Should have an entry for each active ProceedingsMaterial')
         self.assertEqual(
@@ -7088,28 +8741,109 @@ def _assertProceedingsMaterialsDisplayed(self, response, meeting):
             'Correct title and link for each ProceedingsMaterial should appear in the correct order'
         )
 
+    def _assertGroupSessions(self,  pq: PyQuery):
+        """Checks that group/sessions are present"""
+        sections = ["plenaries", "gen", "iab", "editorial", "irtf", "training"]
+        for section in sections:
+            self.assertEqual(len(pq(f"#{section}")), 1, f"{section} section should exists in proceedings")
+
     def test_proceedings(self):
-        """Proceedings should be displayed correctly"""
+        """Proceedings should be displayed correctly
+
+        Proceedings contents are tested in detail when testing generate_proceedings_content.
+        """
+        # number must be >97 (settings.PROCEEDINGS_VERSION_CHANGES)
         meeting = make_meeting_test_data(meeting=MeetingFactory(type_id='ietf', number='100'))
         session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
         GroupEventFactory(group=session.group,type='status_update')
         SessionPresentationFactory(document__type_id='recording',session=session)
         SessionPresentationFactory(document__type_id='recording',session=session,document__title="Audio recording for tests")
 
+        # Add various group sessions
+        groups = []
+        parent_groups = [
+                GroupFactory.create(type_id="area", acronym="gen"),
+                GroupFactory.create(acronym="iab"),
+                GroupFactory.create(acronym="irtf"),
+                ]
+        for parent in parent_groups:
+            groups.append(GroupFactory.create(parent=parent))
+        for acronym in ["rsab", "edu"]:
+            groups.append(GroupFactory.create(acronym=acronym))
+        for group in groups:
+            SessionFactory(meeting=meeting, group=group)
+
         self.write_materials_files(meeting, session)
         self._create_proceedings_materials(meeting)
 
         url = urlreverse("ietf.meeting.views.proceedings", kwargs=dict(num=meeting.number))
-        r = self.client.get(url)
+        cached_content = mark_safe("<p>Fake proceedings content</p>")
+        with patch("ietf.meeting.views.generate_proceedings_content") as mock_gpc:
+            mock_gpc.return_value = cached_content
+            r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
+        self.assertIn(cached_content, r.content.decode())
+        self.assertTemplateUsed(r, "meeting/proceedings_wrapper.html")
+        self.assertTemplateNotUsed(r, "meeting/proceedings.html")
 
+        # These are rendered in proceedings_wrapper.html, so test them here
         if len(meeting.city) > 0:
             self.assertContains(r, meeting.city)
         if len(meeting.venue_name) > 0:
             self.assertContains(r, meeting.venue_name)
+        self._assertMeetingHostsDisplayed(PyQuery(r.content), meeting)
+
+    @patch("ietf.meeting.utils.caches")
+    def test_generate_proceedings_content(self, mock_caches):
+        # number must be >97 (settings.PROCEEDINGS_VERSION_CHANGES)
+        meeting = make_meeting_test_data(meeting=MeetingFactory(type_id='ietf', number='100'))
+
+        # First, check that by default a value in the cache is used without doing any other computation 
+        mock_default_cache = mock_caches["default"]
+        mock_default_cache.get.return_value = "a cached value"
+        result = generate_proceedings_content(meeting)
+        self.assertEqual(result, "a cached value")
+        self.assertFalse(mock_default_cache.set.called)
+        self.assertTrue(mock_default_cache.get.called)
+        cache_key = mock_default_cache.get.call_args.args[0]
+        mock_default_cache.get.reset_mock()
+    
+        # Now set up for actual computation of the proceedings content.
+        session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
+        GroupEventFactory(group=session.group,type='status_update')
+        SessionPresentationFactory(document__type_id='recording',session=session)
+        SessionPresentationFactory(document__type_id='recording',session=session,document__title="Audio recording for tests")
+
+        # Add various group sessions
+        groups = []
+        parent_groups = [
+                GroupFactory.create(type_id="area", acronym="gen"),
+                GroupFactory.create(acronym="iab"),
+                GroupFactory.create(acronym="irtf"),
+                ]
+        for parent in parent_groups:
+            groups.append(GroupFactory.create(parent=parent))
+        for acronym in ["rsab", "edu"]:
+            groups.append(GroupFactory.create(acronym=acronym))
+        for group in groups:
+            SessionFactory(meeting=meeting, group=group)
+
+        self.write_materials_files(meeting, session)
+        self._create_proceedings_materials(meeting)
+
+        # Now "empty" the mock cache and see that we compute the expected proceedings content.
+        mock_default_cache.get.return_value = None
+        proceedings_content = generate_proceedings_content(meeting)
+        self.assertTrue(mock_default_cache.get.called)
+        self.assertEqual(mock_default_cache.get.call_args.args[0], cache_key, "same cache key each time")
+        self.assertTrue(mock_default_cache.set.called)
+        self.assertEqual(mock_default_cache.set.call_args.args, (cache_key, proceedings_content))
+        self.assertGreater(mock_default_cache.set.call_args.kwargs["timeout"], 86400)
+        mock_default_cache.get.reset_mock()
+        mock_default_cache.set.reset_mock()
 
         # standard items on every proceedings
-        pq = PyQuery(r.content)
+        pq = PyQuery(proceedings_content)
         self.assertNotEqual(
             pq('a[href="{}"]'.format(
                 urlreverse('ietf.meeting.views.proceedings_overview', kwargs=dict(num=meeting.number)))
@@ -7126,7 +8860,7 @@ def test_proceedings(self):
         )
         self.assertNotEqual(
             pq('a[href="{}"]'.format(
-                urlreverse('ietf.meeting.views.proceedings_progress_report', kwargs=dict(num=meeting.number)))
+                urlreverse('ietf.meeting.views.proceedings_activity_report', kwargs=dict(num=meeting.number)))
             ),
             [],
             'Should have a link to activity report',
@@ -7140,12 +8874,81 @@ def test_proceedings(self):
         )
 
         # configurable contents
-        self._assertMeetingHostsDisplayed(r, meeting)
-        self._assertProceedingsMaterialsDisplayed(r, meeting)
+        self._assertProceedingsMaterialsDisplayed(pq, meeting)
+        self._assertGroupSessions(pq)
+
+        # Finally, repeat the first cache test, but now with force_refresh=True. The cached value
+        # should be ignored and we should recompute the proceedings as before.
+        mock_default_cache.get.return_value = "a cached value"
+        result = generate_proceedings_content(meeting, force_refresh=True)
+        self.assertEqual(result, proceedings_content)  # should have recomputed the same thing
+        self.assertFalse(mock_default_cache.get.called, "don't bother reading cache when force_refresh is True")
+        self.assertTrue(mock_default_cache.set.called)
+        self.assertEqual(mock_default_cache.set.call_args.args, (cache_key, proceedings_content))
+        self.assertGreater(mock_default_cache.set.call_args.kwargs["timeout"], 86400)
+
+    def test_named_session(self):
+        """Session with a name should appear separately in the proceedings"""
+        meeting = MeetingFactory(type_id='ietf', number='100', proceedings_final=True)
+        group = GroupFactory()
+        plain_session = SessionFactory(meeting=meeting, group=group)
+        named_session = SessionFactory(meeting=meeting, group=group, name='I Got a Name')
+        for doc_type_id in ('agenda', 'minutes', 'bluesheets', 'recording', 'slides', 'draft'):
+            # Set up sessions materials that will have distinct URLs for each session.
+            # This depends on settings.MEETING_DOC_HREFS and may need updating if that changes.
+            SessionPresentationFactory(
+                session=plain_session,
+                document__type_id=doc_type_id,
+                document__uploaded_filename=f'upload-{doc_type_id}-plain',
+                document__external_url=f'external_url-{doc_type_id}-plain',
+            )
+            SessionPresentationFactory(
+                session=named_session,
+                document__type_id=doc_type_id,
+                document__uploaded_filename=f'upload-{doc_type_id}-named',
+                document__external_url=f'external_url-{doc_type_id}-named',
+            )
+
+        url = urlreverse('ietf.meeting.views.proceedings', kwargs={'num': meeting.number})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+
+        plain_label = q(f'div#{group.acronym}')
+        self.assertEqual(plain_label.text(), group.acronym)
+        plain_row = plain_label.closest('tr')
+        self.assertTrue(plain_row)
+
+        named_label = q(f'div#{slugify(named_session.name)}')
+        self.assertEqual(named_label.text(), named_session.name)
+        named_row = named_label.closest('tr')
+        self.assertTrue(named_row)
+
+        for material in (sp.document for sp in plain_session.presentations.all()):
+            if material.type_id == 'draft':
+                expected_url = urlreverse(
+                    'ietf.doc.views_doc.document_main',
+                    kwargs={'name': material.name},
+                )
+            else:
+                expected_url = material.get_href(meeting)
+            self.assertTrue(plain_row.find(f'a[href="{expected_url}"]'))
+            self.assertFalse(named_row.find(f'a[href="{expected_url}"]'))
+
+        for material in (sp.document for sp in named_session.presentations.all()):
+            if material.type_id == 'draft':
+                expected_url = urlreverse(
+                    'ietf.doc.views_doc.document_main',
+                    kwargs={'name': material.name},
+                )
+            else:
+                expected_url = material.get_href(meeting)
+            self.assertFalse(plain_row.find(f'a[href="{expected_url}"]'))
+            self.assertTrue(named_row.find(f'a[href="{expected_url}"]'))
 
     def test_proceedings_no_agenda(self):
         # Meeting number must be larger than the last special-cased proceedings (currently 96)
-        meeting = MeetingFactory(type_id='ietf',populate_schedule=False,date=datetime.date.today(), number='100')
+        meeting = MeetingFactory(type_id='ietf',populate_schedule=False,date=date_today(), number='100')
         url = urlreverse('ietf.meeting.views.proceedings')
         r = self.client.get(url)
         self.assertRedirects(r, urlreverse('ietf.meeting.views.materials'))
@@ -7200,47 +9003,69 @@ def test_proceedings_acknowledgements_link(self):
             0,
         )
 
-    @override_settings(STATS_REGISTRATION_ATTENDEES_JSON_URL='https://ietf.example.com/{number}')
-    @requests_mock.Mocker()
-    def test_proceedings_attendees(self, mock):
-        make_meeting_test_data()
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="97")
-        mock.get(
-            settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number),
-            text=json.dumps([{"LastName": "Smith", "FirstName": "John", "Company": "ABC", "Country": "US"}]),
-        )
-        finalize(meeting)
-        url = urlreverse('ietf.meeting.views.proceedings_attendees',kwargs={'num':97})
+    def test_proceedings_attendees(self):
+        """Test proceedings attendee list. Check the following:
+           - assert onsite checkedin=True appears, not onsite checkedin=False
+           - assert remote attended appears, not remote not attended
+           - prefer onsite checkedin=True to remote attended when same person has both
+           - summary stats row shows correct counts
+           - chart data JSON is embedded with correct values
+        """
+
+        m = MeetingFactory(type_id='ietf', date=datetime.date(2023, 11, 4), number="118")
+        person_a = PersonFactory(name='Person A')
+        person_b = PersonFactory(name='Person B')
+        person_c = PersonFactory(name='Person C')
+        person_d = PersonFactory(name='Person D')
+        areg = RegistrationFactory(meeting=m, person=person_a, checkedin=True, with_ticket={'attendance_type_id': 'onsite'})
+        RegistrationFactory(meeting=m, person=person_b, checkedin=False, with_ticket={'attendance_type_id': 'onsite'})
+        creg = RegistrationFactory(meeting=m, person=person_c, with_ticket={'attendance_type_id': 'remote'})
+        RegistrationFactory(meeting=m, person=person_d, with_ticket={'attendance_type_id': 'remote'})
+        AttendedFactory(session__meeting=m, session__type_id='plenary', person=person_a)
+        AttendedFactory(session__meeting=m, session__type_id='plenary', person=person_c)
+        url = urlreverse('ietf.meeting.views.proceedings_attendees',kwargs={'num': 118})
         response = self.client.get(url)
         self.assertContains(response, 'Attendee list')
         q = PyQuery(response.content)
-        self.assertEqual(1,len(q("#id_attendees tbody tr")))
-
-    @override_settings(STATS_REGISTRATION_ATTENDEES_JSON_URL='https://ietf.example.com/{number}')
-    @requests_mock.Mocker()
-    def test_proceedings_overview(self, mock):
+        self.assertEqual(2, len(q("#id_attendees tbody tr")))
+        text = q('#id_attendees tbody tr').text().replace('\n', ' ')
+        self.assertEqual(text, f"A Person {areg.affiliation} {areg.country_code} onsite C Person {creg.affiliation} {creg.country_code} remote")
+
+        # Summary stats row: Onsite / Remote / Total (matches registration.ietf.org)
+        self.assertContains(response, 'Onsite:')
+        self.assertContains(response, 'Remote:')
+        self.assertContains(response, 'Total:')
+        self.assertContains(response, '<strong>1</strong>')   # onsite and remote
+        self.assertContains(response, '<strong>2</strong>')   # total
+
+        # Chart data embedded in page
+        chart_json = json.loads(q('#attendees-chart-data').text())
+        self.assertEqual(chart_json['type'], [['Onsite', 1], ['Remote', 1]])
+
+    def test_proceedings_overview(self):
         '''Test proceedings IETF Overview page.
         Note: old meetings aren't supported so need to add a new meeting then test.
         '''
-        make_meeting_test_data()
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="97")
-        mock.get(
-            settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number),
-            text=json.dumps([{"LastName": "Smith", "FirstName": "John", "Company": "ABC", "Country": "US"}]),
-        )
-        finalize(meeting)
+        meeting = make_meeting_test_data(meeting=MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="97"))
+
+        # finalize meeting
+        url = urlreverse('ietf.meeting.views.finalize_proceedings',kwargs={'num':meeting.number})
+        login_testing_unauthorized(self,"secretary",url)
+        r = self.client.post(url,{'finalize':1})
+        self.assertEqual(r.status_code, 302)
+
         url = urlreverse('ietf.meeting.views.proceedings_overview',kwargs={'num':97})
         response = self.client.get(url)
         self.assertContains(response, 'The Internet Engineering Task Force')
 
-    def test_proceedings_progress_report(self):
+    def test_proceedings_activity_report(self):
         make_meeting_test_data()
         MeetingFactory(type_id='ietf', date=datetime.date(2016,4,3), number="96")
         MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="97")
 
-        url = urlreverse('ietf.meeting.views.proceedings_progress_report',kwargs={'num':97})
+        url = urlreverse('ietf.meeting.views.proceedings_activity_report',kwargs={'num':97})
         response = self.client.get(url)
-        self.assertContains(response, 'Progress Report')
+        self.assertContains(response, 'Activity Report')
 
     def test_feed(self):
         meeting = make_meeting_test_data()
@@ -7254,7 +9079,7 @@ def _procmat_test_meeting(self):
         """Generate a meeting for proceedings material test"""
         # meeting number 123 avoids various legacy cases that affect these tests
         # (as of Aug 2021, anything above 96 is probably ok)
-        return MeetingFactory(type_id='ietf', number='123', date=datetime.date.today())
+        return MeetingFactory(type_id='ietf', number='123', date=date_today())
 
     def _secretary_only_permission_test(self, url, include_post=True):
         self.client.logout()
@@ -7405,12 +9230,13 @@ def test_add_proceedings_material_doc(self):
         """Upload proceedings materials document"""
         meeting = self._procmat_test_meeting()
         for mat_type in ProceedingsMaterialTypeName.objects.filter(used=True):
-            mat = self.upload_proceedings_material_test(
-                meeting,
-                mat_type,
-                {'file': self._proceedings_file(), 'external_url': ''},
-            )
-            self.assertEqual(mat.get_href(), f'{mat.document.name}:00')
+            with self._proceedings_file() as fd:
+                mat = self.upload_proceedings_material_test(
+                    meeting,
+                    mat_type,
+                    {'file': fd, 'external_url': ''},
+                )
+                self.assertEqual(mat.get_href(), f'{mat.document.name}:00')
 
     def test_add_proceedings_material_doc_invalid_ext(self):
         """Upload proceedings materials document with disallowed extension"""
@@ -7426,7 +9252,7 @@ def test_add_proceedings_material_doc_invalid_ext(self):
                 invalid_file.seek(0)  # read the file contents again
                 r = self.client.post(url, {'file': invalid_file, 'external_url': ''})
                 self.assertEqual(r.status_code, 200)
-                self.assertFormError(r, 'form', 'file', 'Found an unexpected extension: .png.  Expected one of .pdf')
+                self.assertFormError(r.context["form"], 'file', 'Found an unexpected extension: .png.  Expected one of .pdf')
 
     def test_add_proceedings_material_doc_empty(self):
         """Upload proceedings materials document without specifying a file"""
@@ -7439,7 +9265,7 @@ def test_add_proceedings_material_doc_empty(self):
             )
             r = self.client.post(url, {'external_url': ''})
             self.assertEqual(r.status_code, 200)
-            self.assertFormError(r, 'form', 'file', 'This field is required')
+            self.assertFormError(r.context["form"], 'file', 'This field is required')
 
     def test_add_proceedings_material_url(self):
         """Add a URL as proceedings material"""
@@ -7463,7 +9289,7 @@ def test_add_proceedings_material_url_invalid(self):
             )
             r = self.client.post(url, {'use_url': 'on', 'external_url': "Ceci n'est pas une URL"})
             self.assertEqual(r.status_code, 200)
-            self.assertFormError(r, 'form', 'external_url', 'Enter a valid URL.')
+            self.assertFormError(r.context["form"], 'external_url', 'Enter a valid URL.')
 
     def test_add_proceedings_material_url_empty(self):
         """Add proceedings materials URL without specifying the URL"""
@@ -7476,7 +9302,7 @@ def test_add_proceedings_material_url_empty(self):
             )
             r = self.client.post(url, {'use_url': 'on', 'external_url': ''})
             self.assertEqual(r.status_code, 200)
-            self.assertFormError(r, 'form', 'external_url', 'This field is required')
+            self.assertFormError(r.context["form"], 'external_url', 'This field is required')
 
     @override_settings(MEETING_DOC_HREFS={'procmaterials': '{doc.name}:{doc.rev}'})
     def test_replace_proceedings_material(self):
@@ -7497,12 +9323,13 @@ def test_replace_proceedings_material(self):
             kwargs=dict(num=meeting.number, material_type=pm_doc.type.slug),
         )
         self.client.login(username='secretary', password='secretary+password')
-        r = self.client.post(pm_doc_url, {'file': self._proceedings_file(), 'external_url': ''})
-        self.assertRedirects(r, success_url)
-        self.assertEqual(meeting.proceedings_materials.count(), 2)
-        pm_doc = meeting.proceedings_materials.get(pk=pm_doc.pk)  # refresh from DB
-        self.assertEqual(pm_doc.document.rev, '01')
-        self.assertEqual(pm_doc.get_href(), f'{pm_doc.document.name}:01')
+        with self._proceedings_file() as fd:
+            r = self.client.post(pm_doc_url, {'file': fd, 'external_url': ''})
+            self.assertRedirects(r, success_url)
+            self.assertEqual(meeting.proceedings_materials.count(), 2)
+            pm_doc = meeting.proceedings_materials.get(pk=pm_doc.pk)  # refresh from DB
+            self.assertEqual(pm_doc.document.rev, '01')
+            self.assertEqual(pm_doc.get_href(), f'{pm_doc.document.name}:01')
 
         # Replace the uploaded document with a URL
         r = self.client.post(pm_doc_url, {'use_url': 'on', 'external_url': 'https://example.com/second'})
@@ -7525,12 +9352,13 @@ def test_replace_proceedings_material(self):
         self.assertEqual(pm_url.get_href(), 'https://example.com/third')
 
         # Now replace the URL doc with an uploaded file
-        r = self.client.post(pm_url_url, {'file': self._proceedings_file(), 'external_url': ''})
-        self.assertRedirects(r, success_url)
-        self.assertEqual(meeting.proceedings_materials.count(), 2)
-        pm_url = meeting.proceedings_materials.get(pk=pm_url.pk)  # refresh from DB
-        self.assertEqual(pm_url.document.rev, '02')
-        self.assertEqual(pm_url.get_href(), f'{pm_url.document.name}:02')
+        with self._proceedings_file() as fd:
+            r = self.client.post(pm_url_url, {'file': fd, 'external_url': ''})
+            self.assertRedirects(r, success_url)
+            self.assertEqual(meeting.proceedings_materials.count(), 2)
+            pm_url = meeting.proceedings_materials.get(pk=pm_url.pk)  # refresh from DB
+            self.assertEqual(pm_url.document.rev, '02')
+            self.assertEqual(pm_url.get_href(), f'{pm_url.document.name}:02')
 
     def test_remove_proceedings_material(self):
         """Proceedings material can be removed"""
@@ -7594,3 +9422,158 @@ def test_rename_proceedings_material(self):
         pm = meeting.proceedings_materials.get(pk=pm.pk)
         self.assertEqual(str(pm), 'This Is Not the Default Name')
         self.assertEqual(pm.document.rev, orig_rev, 'Renaming should not change document revision')
+
+    def test_create_recording(self):
+        session = SessionFactory(meeting__type_id='ietf', meeting__number=72, group__acronym='mars')
+        filename = 'ietf42-testroomt-20000101-0800.mp3'
+        url = settings.IETF_AUDIO_URL + 'ietf{}/{}'.format(session.meeting.number, filename)
+        doc = create_recording(session, url)
+        self.assertEqual(doc.name,'recording-72-mars-1')
+        self.assertEqual(doc.group,session.group)
+        self.assertEqual(doc.external_url,url)
+        self.assertTrue(doc in session.materials.all())
+
+    def test_get_next_sequence(self):
+        session = SessionFactory(meeting__type_id='ietf', meeting__number=72, group__acronym='mars')
+        meeting = session.meeting
+        group = session.group
+        sequence = get_next_sequence(group,meeting,'recording')
+        self.assertEqual(sequence,1)
+
+    def test_participants_for_meeting(self):
+        m = MeetingFactory.create(type_id='ietf')
+        areg = RegistrationFactory(meeting=m, checkedin=True, with_ticket={'attendance_type_id': 'onsite'})
+        breg = RegistrationFactory(meeting=m, checkedin=False, with_ticket={'attendance_type_id': 'onsite'})
+        creg = RegistrationFactory(meeting=m, with_ticket={'attendance_type_id': 'remote'})
+        dreg = RegistrationFactory(meeting=m, with_ticket={'attendance_type_id': 'remote'})
+        AttendedFactory(session__meeting=m, session__type_id='plenary', person=creg.person)
+        checked_in, attended = participants_for_meeting(m)
+        self.assertIn(areg.person.pk, checked_in)
+        self.assertNotIn(breg.person.pk, checked_in)
+        self.assertNotIn(areg.person.pk, attended)
+        self.assertNotIn(breg.person.pk, attended)
+        self.assertIn(creg.person.pk, attended)
+        self.assertNotIn(dreg.person.pk, attended)
+
+    def test_session_attendance(self):
+        meeting = MeetingFactory(type_id='ietf', date=datetime.date(2023, 11, 4), number='118')
+        make_meeting_test_data(meeting=meeting)
+        session = Session.objects.filter(meeting=meeting, group__acronym='mars').first()
+        regs = RegistrationFactory.create_batch(3, meeting=meeting)
+        persons = [reg.person for reg in regs]
+        self.assertEqual(session.attended_set.count(), 0)
+
+        # If there are no attendees, the link isn't offered, and getting
+        # the page directly returns an empty list.
+        session_url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':meeting.number, 'acronym':session.group.acronym})
+        attendance_url = urlreverse('ietf.meeting.views.session_attendance', kwargs={'num':meeting.number, 'session_id':session.id})
+        r = self.client.get(session_url)
+        self.assertNotContains(r, attendance_url)
+        r = self.client.get(attendance_url)
+        self.assertEqual(r.status_code, 200)  
+        self.assertContains(r, '0 attendees')
+
+        # Add some attendees
+        add_attendees_url = urlreverse('ietf.meeting.views.api_add_session_attendees')
+        recmanrole = RoleFactory(group__type_id='ietf', name_id='recman', person__user__last_login=timezone.now())
+        recman = recmanrole.person
+        apikey = PersonalApiKeyFactory(endpoint=add_attendees_url, person=recman)
+        attendees = [person.user.pk for person in persons]
+        self.client.login(username='recman', password='recman+password')
+        r = self.client.post(add_attendees_url, {'apikey':apikey.hash(), 'attended':f'{{"session_id":{session.pk},"attendees":{attendees}}}'})
+        self.assertEqual(r.status_code, 200)  
+        self.assertEqual(session.attended_set.count(), 3)
+
+        # Before a meeting is finalized, session_attendance renders a live
+        # view of the Attended records for the session.
+        r = self.client.get(session_url)
+        self.assertContains(r, attendance_url)
+        r = self.client.get(attendance_url)
+        self.assertEqual(r.status_code, 200)  
+        self.assertContains(r, '3 attendees')
+        for person in persons:
+            self.assertContains(r, escape(person.plain_name()))
+
+        # Test for the "I was there" button.
+        def _test_button(person, expected):
+            username = person.user.username
+            self.client.login(username=username, password=f'{username}+password')
+            r = self.client.get(attendance_url)
+            self.assertEqual(b"I was there" in r.content, expected)
+        # recman isn't registered for the meeting
+        _test_button(recman, False)
+        # person0 is already on the bluesheet
+        _test_button(persons[0], False)
+        # person3 attests he was there
+        persons.append(RegistrationFactory(meeting=meeting).person)
+        # button isn't shown if we're outside the corrections windows
+        meeting.importantdate_set.create(name_id='revsub',date=date_today() - datetime.timedelta(days=20))
+        _test_button(persons[3], False)
+        # attempt to POST anyway is ignored
+        r = self.client.post(attendance_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertNotContains(r, escape(persons[3].plain_name()))
+        self.assertEqual(session.attended_set.count(), 3)
+        # button is shown, and POST is accepted
+        meeting.importantdate_set.update(name_id='revsub',date=date_today() + datetime.timedelta(days=20))
+        _test_button(persons[3], True)
+        r = self.client.post(attendance_url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, escape(persons[3].plain_name()))
+        self.assertEqual(session.attended_set.count(), 4)
+
+        # When the meeting is finalized, a bluesheet file is generated,
+        # and session_attendance redirects to the file.
+        self.client.login(username='secretary',password='secretary+password')
+        finalize_url = urlreverse('ietf.meeting.views.finalize_proceedings', kwargs={'num':meeting.number})
+        r = self.client.post(finalize_url, {'finalize':1})
+        self.assertRedirects(r, urlreverse('ietf.meeting.views.proceedings', kwargs={'num':meeting.number}))
+        doc = session.presentations.filter(document__type_id='bluesheets').first().document
+        self.assertEqual(doc.rev,'00')
+        text = doc.text()
+        self.assertIn('4 attendees', text)
+        for person in persons:
+            self.assertIn(person.plain_name(), text)
+        r = self.client.get(session_url)
+        self.assertContains(r, doc.get_href())
+        self.assertNotContains(r, attendance_url)
+        r = self.client.get(attendance_url)
+        self.assertEqual(r.status_code,302)
+        self.assertEqual(r['Location'],doc.get_href())
+
+        # An interim meeting is considered finalized immediately.
+        meeting = make_interim_meeting(group=GroupFactory(acronym='mars'), date=date_today())
+        session = Session.objects.filter(meeting=meeting, group__acronym='mars').first()
+        attendance_url = urlreverse('ietf.meeting.views.session_attendance', kwargs={'num':meeting.number, 'session_id':session.id})
+        self.assertEqual(session.attended_set.count(), 0)
+        self.client.login(username='recman', password='recman+password')
+        attendees = [person.user.pk for person in persons]
+        r = self.client.post(add_attendees_url, {'apikey':apikey.hash(), 'attended':f'{{"session_id":{session.pk},"attendees":{attendees}}}'})
+        self.assertEqual(r.status_code, 200)  
+        self.assertEqual(session.attended_set.count(), 4)
+        doc = session.presentations.filter(document__type_id='bluesheets').first().document
+        self.assertEqual(doc.rev,'00')
+        session_url = urlreverse('ietf.meeting.views.session_details', kwargs={'num':meeting.number, 'acronym':session.group.acronym})
+        r = self.client.get(session_url)
+        self.assertContains(r, doc.get_href())
+        self.assertNotContains(r, attendance_url)
+        r = self.client.get(attendance_url)
+        self.assertEqual(r.status_code,302)
+        self.assertEqual(r['Location'],doc.get_href())
+
+    def test_bluesheet_data(self):
+        session = SessionFactory(meeting__type_id="ietf") 
+        attended_with_affil = RegistrationFactory(meeting=session.meeting, affiliation="Somewhere")
+        AttendedFactory(session=session, person=attended_with_affil.person, time="2023-03-13T01:24:00Z")  # joined 2nd
+        attended_no_affil = RegistrationFactory(meeting=session.meeting, affiliation="")
+        AttendedFactory(session=session, person=attended_no_affil.person, time="2023-03-13T01:23:00Z")  # joined 1st
+        RegistrationFactory(meeting=session.meeting)  # did not attend
+
+        data = bluesheet_data(session)
+        self.assertEqual(
+            data,
+            [
+                {"name": attended_no_affil.person.plain_name(), "affiliation": ""},
+                {"name": attended_with_affil.person.plain_name(), "affiliation": "Somewhere"},
+            ]
+        )
diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py
index 1e9a97a38f..a038e1cfe6 100644
--- a/ietf/meeting/urls.py
+++ b/ietf/meeting/urls.py
@@ -1,27 +1,29 @@
-# Copyright The IETF Trust 2007-2020, All Rights Reserved
+# Copyright The IETF Trust 2007-2025, All Rights Reserved
 
-from django.conf.urls import include
-from django.views.generic import RedirectView
 from django.conf import settings
+from django.urls import include
+from django.views.generic import RedirectView
 
-from ietf.meeting import views, views_proceedings
+from ietf.meeting import views, views_proceedings, views_session_request
 from ietf.utils.urls import url
 
 class AgendaRedirectView(RedirectView):
     ignore_kwargs = ('owner', 'name')
     def get_redirect_url(self, *args, **kwargs):
-        for kwarg in self.ignore_kwargs:
-            kwargs.pop(kwarg, None)
+        kwargs = {k: v for k, v in kwargs.items() if v is not None and k not in self.ignore_kwargs}
         return super().get_redirect_url(*args, **kwargs)
 
 safe_for_all_meeting_types = [
     url(r'^session/(?P<acronym>[-a-z0-9]+)/?$',  views.session_details),
+    url(r'^session/(?P<acronym>[-a-z0-9]+)/send_slide_notifications$',  views.notify_meetecho_of_all_slides),
     url(r'^session/(?P<session_id>\d+)/drafts$',  views.add_session_drafts),
+    url(r'^session/(?P<session_id>\d+)/recordings$', views.add_session_recordings),
+    url(r'^session/(?P<session_id>\d+)/attendance$', views.session_attendance),
     url(r'^session/(?P<session_id>\d+)/bluesheets$', views.upload_session_bluesheets),
     url(r'^session/(?P<session_id>\d+)/minutes$', views.upload_session_minutes),
+    url(r'^session/(?P<session_id>\d+)/narrativeminutes$', views.upload_session_narrativeminutes),
     url(r'^session/(?P<session_id>\d+)/agenda$', views.upload_session_agenda),
     url(r'^session/(?P<session_id>\d+)/import/minutes$', views.import_session_minutes),
-    url(r'^session/(?P<session_id>\d+)/propose_slides$', views.propose_session_slides),
     url(r'^session/(?P<session_id>\d+)/slides(?:/%(name)s)?$' % settings.URL_REGEXPS, views.upload_session_slides),
     url(r'^session/(?P<session_id>\d+)/add_to_session$', views.ajax_add_slides_to_session),
     url(r'^session/(?P<session_id>\d+)/remove_from_session$', views.ajax_remove_slides_from_session),
@@ -29,7 +31,7 @@ def get_redirect_url(self, *args, **kwargs):
     url(r'^session/(?P<session_id>\d+)/doc/%(name)s/remove$' % settings.URL_REGEXPS, views.remove_sessionpresentation),
     url(r'^session/(?P<session_id>\d+)\.ics$',    views.agenda_ical),
     url(r'^sessions/(?P<acronym>[-a-z0-9]+)\.ics$', views.agenda_ical),
-    url(r'^slidesubmission/(?P<slidesubmission_id>\d+)$', views.approve_proposed_slides)
+    url(r'^slidesubmission/(?P<slidesubmission_id>\d+)$', views.approve_proposed_slides),
 ]
 
 
@@ -63,14 +65,14 @@ def get_redirect_url(self, *args, **kwargs):
 type_interim_patterns = [
     url(r'^agenda/(?P<acronym>[A-Za-z0-9-]+)-drafts.pdf$', views.session_draft_pdf),
     url(r'^agenda/(?P<acronym>[A-Za-z0-9-]+)-drafts.tgz$', views.session_draft_tarfile),
-    url(r'^materials/%(document)s((?P<ext>\.[a-z0-9]+)|/)?$' % settings.URL_REGEXPS, views.materials_document),
+    url(r'^materials/%(document)s(?P<ext>\.[A-Za-z0-9]+)$' % settings.URL_REGEXPS, views.materials_document),
+    url(r'^materials/%(document)s/?$' % settings.URL_REGEXPS, views.materials_document),
     url(r'^agenda.json$', views.agenda_json)
 ]
 
 type_ietf_only_patterns_id_optional = [
     url(r'^agenda(?P<utc>-utc)?(?P<ext>\.html)?/?$', views.agenda, name='agenda'),
-    url(r'^agenda(?P<ext>\.txt)$', views.agenda_plain),
-    url(r'^agenda(?P<ext>\.csv)$', views.agenda_plain),
+    url(r'^agenda(?P<utc>-utc)?(?P<ext>\.txt|\.csv)$', views.agenda_plain),
     url(r'^agenda/edit$',
         RedirectView.as_view(pattern_name='ietf.meeting.views.edit_meeting_schedule', permanent=True),
         name='ietf.meeting.views.edit_meeting_schedule'),
@@ -79,20 +81,19 @@ def get_redirect_url(self, *args, **kwargs):
     url(r'^agenda/agenda\.ics$', views.agenda_ical),
     url(r'^agenda\.ics$', views.agenda_ical),
     url(r'^agenda.json$', views.agenda_json),
-    url(r'^agenda/week-view(?:.html)?/?$', RedirectView.as_view(pattern_name='agenda', permanent=True)),
+    url(r'^agenda/week-view(?:.html)?/?$', AgendaRedirectView.as_view(pattern_name='agenda', permanent=True)),
     url(r'^floor-plan/?$', views.agenda, name='floor-plan'),
-    url(r'^floor-plan/(?P<floor>[-a-z0-9_]+)/?$', RedirectView.as_view(pattern_name='floor-plan', permanent=True)),
-    url(r'^week-view(?:.html)?/?$', RedirectView.as_view(pattern_name='agenda', permanent=True)),
+    url(r'^week-view(?:.html)?/?$', AgendaRedirectView.as_view(pattern_name='agenda', permanent=True)),
     url(r'^materials(?:.html)?/?$', views.materials),
     url(r'^request_minutes/?$', views.request_minutes),
-    url(r'^materials/%(document)s((?P<ext>\.[a-z0-9]+)|/)?$' % settings.URL_REGEXPS, views.materials_document),
+    url(r'^materials/%(document)s(?P<ext>\.[A-Za-z0-9]+)?/?$' % settings.URL_REGEXPS, views.materials_document),
     url(r'^session/?$', views.materials_editable_groups),
     url(r'^proceedings(?:.html)?/?$', views.proceedings),
     url(r'^proceedings(?:.html)?/finalize/?$', views.finalize_proceedings),
     url(r'^proceedings/acknowledgements/$', views.proceedings_acknowledgements),
     url(r'^proceedings/attendees/$', views.proceedings_attendees),
     url(r'^proceedings/overview/$', views.proceedings_overview),
-    url(r'^proceedings/progress-report/$', views.proceedings_progress_report),
+    url(r'^proceedings/activity-report/$', views.proceedings_activity_report),
     url(r'^proceedings/materials/$', views_proceedings.material_details),
     url(r'^proceedings/materials/(?P<material_type>[a-z_]+)/$', views_proceedings.edit_material),
     url(r'^proceedings/materials/(?P<material_type>[a-z_]+)/new/$', views_proceedings.upload_material),
@@ -108,12 +109,13 @@ def get_redirect_url(self, *args, **kwargs):
     url(r'^important-dates.(?P<output_format>ics)$', views.important_dates),
     url(r'^proceedings/meetinghosts/edit/', views_proceedings.edit_meetinghosts),
     url(r'^proceedings/meetinghosts/(?P<host_id>\d+)/logo/$', views_proceedings.meetinghost_logo),
+    url(r'^session/request/%(acronym)s/edit/$' % settings.URL_REGEXPS, views_session_request.edit_request),
+    url(r'^session/request/%(acronym)s/view/$' % settings.URL_REGEXPS, views_session_request.view_request),
 ]
 
 urlpatterns = [
     # First patterns which start with unique strings
     url(r'^$', views.current_materials),
-    url(r'^ajax/get-utc/?$', views.ajax_get_utc),
     url(r'^interim/announce/?$', views.interim_announce),
     url(r'^interim/announce/(?P<number>[A-Za-z0-9._+-]+)/?$', views.interim_send_announcement),
     url(r'^interim/skip_announce/(?P<number>[A-Za-z0-9._+-]+)/?$', views.interim_skip_announcement),
@@ -128,7 +130,15 @@ def get_redirect_url(self, *args, **kwargs):
     url(r'^upcoming/?$', views.upcoming),
     url(r'^upcoming\.ics/?$', views.upcoming_ical),
     url(r'^upcoming\.json/?$', views.upcoming_json),
+    url(r'^session/request/$', views_session_request.list_view),
+    url(r'^session/request/%(acronym)s/new/$' % settings.URL_REGEXPS, views_session_request.new_request),
+    url(r'^session/request/%(acronym)s/approve/$' % settings.URL_REGEXPS, views_session_request.approve_request),
+    url(r'^session/request/%(acronym)s/no_session/$' % settings.URL_REGEXPS, views_session_request.no_session),
+    url(r'^session/request/%(acronym)s/cancel/$' % settings.URL_REGEXPS, views_session_request.cancel_request),
+    url(r'^session/request/%(acronym)s/confirm/$' % settings.URL_REGEXPS, views_session_request.confirm),
+    url(r'^session/request/status/$', views_session_request.status),
     url(r'^session/(?P<session_id>\d+)/agenda_materials$', views.session_materials),
+    url(r'^session/(?P<session_id>\d+)/cancel/?', views.cancel_session),
     url(r'^session/(?P<session_id>\d+)/edit/?', views.edit_session),
     # Then patterns from more specific to less
     url(r'^(?P<num>interim-[a-z0-9-]+)/', include(type_interim_patterns)),
@@ -140,4 +150,3 @@ def get_redirect_url(self, *args, **kwargs):
     url(r'^(?P<num>\d+)/', include(safe_for_all_meeting_types)),
     url(r'^(?P<num>interim-[a-z0-9-]+)/', include(safe_for_all_meeting_types)),
 ]
-
diff --git a/ietf/meeting/utils.py b/ietf/meeting/utils.py
index aae286682d..10ae0d3667 100644
--- a/ietf/meeting/utils.py
+++ b/ietf/meeting/utils.py
@@ -1,45 +1,85 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
+# Copyright The IETF Trust 2016-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 import datetime
 import itertools
+from contextlib import suppress
+from dataclasses import dataclass
+
+import jsonschema
+import os
 import requests
+
+import pytz
 import subprocess
 
 from collections import defaultdict
 from pathlib import Path
-from urllib.error import HTTPError
 
 from django.conf import settings
 from django.contrib import messages
+from django.core.cache import caches
+from django.core.files.base import ContentFile
+from django.db import IntegrityError
+from django.db.models import OuterRef, Subquery, TextField, Q, Value, Max
+from django.db.models.functions import Coalesce
 from django.template.loader import render_to_string
-from django.utils.encoding import smart_text
+from django.utils import timezone
+from django.utils.encoding import smart_str
 
 import debug                            # pyflakes:ignore
 
 from ietf.dbtemplate.models import DBTemplate
-from ietf.meeting.models import Session, SchedulingEvent, TimeSlot, Constraint, SchedTimeSessAssignment
-from ietf.doc.models import Document, DocAlias, State, NewRevisionDocEvent
+from ietf.doc.storage_utils import store_bytes, store_str, AlreadyExistsError
+from ietf.meeting.models import (
+    Session,
+    SchedulingEvent,
+    TimeSlot,
+    Constraint,
+    SchedTimeSessAssignment,
+    SessionPresentation,
+    Attended,
+    Registration,
+    Meeting,
+    RegistrationTicket,
+)
+from ietf.blobdb.models import ResolvedMaterial
+from ietf.doc.models import (
+    Document,
+    State,
+    NewRevisionDocEvent,
+    StateDocEvent,
+    StoredObject,
+)
+from ietf.doc.models import DocEvent
 from ietf.group.models import Group
 from ietf.group.utils import can_manage_materials
 from ietf.name.models import SessionStatusName, ConstraintName, DocTypeName
 from ietf.person.models import Person
-from ietf.secr.proceedings.proc_utils import import_audio_files
-from ietf.utils.html import sanitize_document
+from ietf.utils import markdown
+from ietf.utils.html import clean_html
 from ietf.utils.log import log
+from ietf.utils.timezone import date_today
 
 
 def session_time_for_sorting(session, use_meeting_date):
-    official_timeslot = TimeSlot.objects.filter(sessionassignments__session=session, sessionassignments__schedule__in=[session.meeting.schedule, session.meeting.schedule.base if session.meeting.schedule else None]).first()
+    if hasattr(session, "_otsa"):
+        official_timeslot=session._otsa.timeslot
+    else:
+        official_timeslot = TimeSlot.objects.filter(sessionassignments__session=session, sessionassignments__schedule__in=[session.meeting.schedule, session.meeting.schedule.base if session.meeting.schedule else None]).first()
     if official_timeslot:
         return official_timeslot.time
     elif use_meeting_date and session.meeting.date:
-        return datetime.datetime.combine(session.meeting.date, datetime.time.min)
+        return session.meeting.tz().localize(
+            datetime.datetime.combine(session.meeting.date, datetime.time.min)
+        )
     else:
         first_event = SchedulingEvent.objects.filter(session=session).order_by('time', 'id').first()
         if first_event:
             return first_event.time
         else:
-            return datetime.datetime.min
+            # n.b. cannot interpret this in timezones west of UTC. That is not expected to be necessary,
+            # but could probably safely add a day to the minimum datetime to make that possible.
+            return pytz.utc.localize(datetime.datetime.min)
 
 def session_requested_by(session):
     first_event = SchedulingEvent.objects.filter(session=session).order_by('time', 'id').first()
@@ -64,17 +104,18 @@ def group_sessions(sessions):
 
     sessions = sorted(sessions,key=lambda s:s.time)
 
-    today = datetime.date.today()
     future = []
     in_progress = []
     recent = []
     past = []
+
     for s in sessions:
+        today = date_today(s.meeting.tz())
         if s.meeting.date > today:
             future.append(s)
         elif s.meeting.end_date() >= today:
             in_progress.append(s)
-        elif not s.is_material_submission_cutoff():
+        elif not getattr(s, "cached_is_cutoff", lambda: s.is_material_submission_cutoff):
             recent.append(s)
         else:
             past.append(s)
@@ -84,6 +125,7 @@ def group_sessions(sessions):
     recent.reverse()
     past.reverse()
 
+
     return future, in_progress, recent, past
 
 def get_upcoming_manageable_sessions(user):
@@ -101,7 +143,7 @@ def get_upcoming_manageable_sessions(user):
     # .filter(date__gte=today - F('days')), but unfortunately, it
     # doesn't work correctly with Django 1.11 and MySQL/SQLite
 
-    today = datetime.date.today()
+    today = date_today()
 
     candidate_sessions = add_event_info_to_session_qs(
         Session.objects.filter(meeting__date__gte=today - datetime.timedelta(days=15))
@@ -117,31 +159,7 @@ def sort_sessions(sessions):
     return sorted(sessions, key=lambda s: (s.meeting.number, s.group.acronym, session_time_for_sorting(s, use_meeting_date=False)))
 
 def create_proceedings_templates(meeting):
-    '''Create DBTemplates for meeting proceedings'''
-    # Get meeting attendees from registration system
-    url = settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number)
-    try:
-        attendees = requests.get(url, timeout=settings.DEFAULT_REQUESTS_TIMEOUT).json()
-    except (ValueError, HTTPError, requests.Timeout) as exc:
-        attendees = []
-        log(f'Failed to retrieve meeting attendees from [{url}]: {exc}')
-
-    if attendees:
-        attendees = sorted(attendees, key = lambda a: a['LastName'])
-        content = render_to_string('meeting/proceedings_attendees_table.html', {
-            'attendees':attendees})
-        try:
-            template = DBTemplate.objects.get(path='/meeting/proceedings/%s/attendees.html' % (meeting.number, ))
-            template.title='IETF %s Attendee List' % meeting.number
-            template.type_id='django'
-            template.content=content
-            template.save()
-        except DBTemplate.DoesNotExist:
-            DBTemplate.objects.create(
-                path='/meeting/proceedings/%s/attendees.html' % (meeting.number, ),
-                title='IETF %s Attendee List' % meeting.number,
-                type_id='django',
-                content=content)    
+    '''Create DBTemplates for meeting proceedings'''  
     # Make copy of default IETF Overview template
     if not meeting.overview:
         path = '/meeting/proceedings/%s/overview.rst' % (meeting.number, )
@@ -156,19 +174,110 @@ def create_proceedings_templates(meeting):
         meeting.overview = template
         meeting.save()
 
-def finalize(meeting):
+
+def bluesheet_data(session):
+    attendance = (
+        Attended.objects.filter(session=session)
+        .annotate(
+            affiliation=Coalesce(
+                Subquery(
+                    Registration.objects.filter(
+                        Q(meeting=session.meeting),
+                        Q(person=OuterRef("person")) | Q(email=OuterRef("person__email")),
+                    ).values("affiliation")[:1]
+                ),
+                Value(""),
+                output_field=TextField(),
+            )
+        ).distinct()
+        .order_by("time")
+    )
+
+    return [
+        {
+            "name": attended.person.plain_name(),
+            "affiliation": attended.affiliation,
+        }
+        for attended in attendance
+    ]
+
+
+def save_bluesheet(request, session, file, encoding='utf-8'):
+    bluesheet_sp = session.presentations.filter(document__type='bluesheets').first()
+    _, ext = os.path.splitext(file.name)
+
+    if bluesheet_sp:
+        doc = bluesheet_sp.document
+        doc.rev = '%02d' % (int(doc.rev)+1)
+        bluesheet_sp.rev = doc.rev
+        bluesheet_sp.save()
+    else:
+        ota = session.official_timeslotassignment()
+        sess_time = ota and ota.timeslot.time
+
+        if session.meeting.type_id=='ietf':
+            name = 'bluesheets-%s-%s-%s' % (session.meeting.number, 
+                                            session.group.acronym, 
+                                            sess_time.strftime("%Y%m%d%H%M"))
+            title = 'Bluesheets IETF%s: %s : %s' % (session.meeting.number, 
+                                                    session.group.acronym, 
+                                                    sess_time.strftime("%a %H:%M"))
+        else:
+            name = 'bluesheets-%s-%s' % (session.meeting.number, sess_time.strftime("%Y%m%d%H%M"))
+            title = 'Bluesheets %s: %s' % (session.meeting.number, sess_time.strftime("%a %H:%M"))
+        doc = Document.objects.create(
+                  name = name,
+                  type_id = 'bluesheets',
+                  title = title,
+                  group = session.group,
+                  rev = '00',
+              )
+        doc.states.add(State.objects.get(type_id='bluesheets',slug='active'))
+        session.presentations.create(document=doc,rev='00')
+    filename = '%s-%s%s'% ( doc.name, doc.rev, ext)
+    doc.uploaded_filename = filename
+    e = NewRevisionDocEvent.objects.create(doc=doc, rev=doc.rev, by=request.user.person, type='new_revision', desc='New revision available: %s'%doc.rev)
+    save_error = handle_upload_file(file, filename, session.meeting, 'bluesheets', request=request, encoding=encoding)
+    if not save_error:
+        doc.save_with_history([e])
+        resolve_uploaded_material(meeting=session.meeting, doc=doc)
+    return save_error
+
+
+def generate_bluesheet(request, session):
+    data = bluesheet_data(session)
+    if not data:
+        return
+    text = render_to_string('meeting/bluesheet.txt', {
+            'session': session,
+            'data': data,
+        })
+    return save_bluesheet(request, session, ContentFile(text.encode("utf-8"), name="unusednamepartsothereisanextension.txt"))
+
+
+def finalize(request, meeting):
     end_date = meeting.end_date()
-    end_time = datetime.datetime.combine(end_date, datetime.datetime.min.time())+datetime.timedelta(days=1)
+    end_time = meeting.tz().localize(
+        datetime.datetime.combine(
+            end_date,
+            datetime.time.min,
+        )
+    ).astimezone(pytz.utc) + datetime.timedelta(days=1)
     for session in meeting.session_set.all():
-        for sp in session.sessionpresentation_set.filter(document__type='draft',rev=None):
+        for sp in session.presentations.filter(document__type='draft',rev=None):
             rev_before_end = [e for e in sp.document.docevent_set.filter(newrevisiondocevent__isnull=False).order_by('-time') if e.time <= end_time ]
             if rev_before_end:
                 sp.rev = rev_before_end[-1].newrevisiondocevent.rev
             else:
                 sp.rev = '00'
             sp.save()
+
+        # Don't try to generate a bluesheet if it's before we had Attended records.
+        if int(meeting.number) >= 108:
+            save_error = generate_bluesheet(request, session)
+            if save_error:
+                messages.error(request, save_error)
     
-    import_audio_files(meeting)
     create_proceedings_templates(meeting)
     meeting.proceedings_final = True
     meeting.save()
@@ -193,7 +302,7 @@ def sort_accept_tuple(accept):
     return tup
 
 def condition_slide_order(session):
-    qs = session.sessionpresentation_set.filter(document__type_id='slides').order_by('order')
+    qs = session.presentations.filter(document__type_id='slides').order_by('order')
     order_list = qs.values_list('order',flat=True)
     if list(order_list) != list(range(1,qs.count()+1)):
         for num, sp in enumerate(qs, start=1):
@@ -322,7 +431,9 @@ def preprocess_constraints_for_meeting_schedule_editor(meeting, sessions):
     # synthesize AD constraints - we can treat them as a special kind of 'bethere'
     responsible_ad_for_group = {}
     session_groups = set(s.group for s in sessions if s.group and s.group.parent and s.group.parent.type_id == 'area')
-    meeting_time = datetime.datetime.combine(meeting.date, datetime.time(0, 0, 0))
+    meeting_time = meeting.tz().localize(
+        datetime.datetime.combine(meeting.date, datetime.time(0, 0, 0))
+    )
 
     # dig up historic AD names
     for group_id, history_time, pk in Person.objects.filter(rolehistory__name='ad', rolehistory__group__group__in=session_groups, rolehistory__group__time__lte=meeting_time).values_list('rolehistory__group__group', 'rolehistory__group__time', 'pk').order_by('rolehistory__group__time'):
@@ -511,7 +622,7 @@ def swap_meeting_schedule_timeslot_assignments(schedule, source_timeslots, targe
             if max_overlap > datetime.timedelta(minutes=5):
                 for a in lts_assignments:
                     a.timeslot = most_overlapping_rts
-                    a.modified = datetime.datetime.now()
+                    a.modified = timezone.now()
                     a.save()
                 swapped = True
 
@@ -529,7 +640,8 @@ def bulk_create_timeslots(meeting, times, locations, other_props):
 
 def preprocess_meeting_important_dates(meetings):
     for m in meetings:
-        m.cached_updated = m.updated()
+        # cached_updated must be present, set it to 1970-01-01 if necessary
+        m.cached_updated = m.updated() or pytz.utc.localize(datetime.datetime(1970, 1, 1, 0, 0, 0))
         m.important_dates = m.importantdate_set.prefetch_related("name")
         for d in m.important_dates:
             d.midnight_cutoff = "UTC 23:59" in d.name.name
@@ -561,7 +673,7 @@ class SaveMaterialsError(Exception):
     pass
 
 
-def save_session_minutes_revision(session, file, ext, request, encoding=None, apply_to_all=False):
+def save_session_minutes_revision(session, file, ext, request, encoding=None, apply_to_all=False, narrative=False):
     """Creates or updates session minutes records
 
     This updates the database models to reflect a new version. It does not handle
@@ -574,7 +686,8 @@ def save_session_minutes_revision(session, file, ext, request, encoding=None, ap
     Returns (Document, [DocEvents]), which should be passed to doc.save_with_history()
     if the file contents are stored successfully.
     """
-    minutes_sp = session.sessionpresentation_set.filter(document__type='minutes').first()
+    document_type = DocTypeName.objects.get(slug= 'narrativeminutes' if narrative else 'minutes')
+    minutes_sp = session.presentations.filter(document__type=document_type).first()
     if minutes_sp:
         doc = minutes_sp.document
         doc.rev = '%02d' % (int(doc.rev)+1)
@@ -586,40 +699,37 @@ def save_session_minutes_revision(session, file, ext, request, encoding=None, ap
         if not sess_time:
             raise SessionNotScheduledError
         if session.meeting.type_id=='ietf':
-            name = 'minutes-%s-%s' % (session.meeting.number,
-                                      session.group.acronym)
-            title = 'Minutes IETF%s: %s' % (session.meeting.number,
-                                            session.group.acronym)
+            name = f"{document_type.prefix}-{session.meeting.number}-{session.group.acronym}"
+            title = f"{document_type.name} IETF{session.meeting.number}: {session.group.acronym}"
             if not apply_to_all:
                 name += '-%s' % (sess_time.strftime("%Y%m%d%H%M"),)
                 title += ': %s' % (sess_time.strftime("%a %H:%M"),)
         else:
-            name = 'minutes-%s-%s' % (session.meeting.number, sess_time.strftime("%Y%m%d%H%M"))
-            title = 'Minutes %s: %s' % (session.meeting.number, sess_time.strftime("%a %H:%M"))
+            name =f"{document_type.prefix}-{session.meeting.number}-{sess_time.strftime('%Y%m%d%H%M')}"
+            title = f"{document_type.name} {session.meeting.number}: {sess_time.strftime('%a %H:%M')}"
         if Document.objects.filter(name=name).exists():
             doc = Document.objects.get(name=name)
             doc.rev = '%02d' % (int(doc.rev)+1)
         else:
             doc = Document.objects.create(
                 name = name,
-                type_id = 'minutes',
+                type = document_type,
                 title = title,
                 group = session.group,
                 rev = '00',
             )
-            DocAlias.objects.create(name=doc.name).docs.add(doc)
-        doc.states.add(State.objects.get(type_id='minutes',slug='active'))
-        if session.sessionpresentation_set.filter(document=doc).exists():
-            sp = session.sessionpresentation_set.get(document=doc)
+        doc.states.add(State.objects.get(type_id=document_type.slug,slug='active'))
+        if session.presentations.filter(document=doc).exists():
+            sp = session.presentations.get(document=doc)
             sp.rev = doc.rev
             sp.save()
         else:
-            session.sessionpresentation_set.create(document=doc,rev=doc.rev)
+            session.presentations.create(document=doc,rev=doc.rev)
     if apply_to_all:
         for other_session in get_meeting_sessions(session.meeting.number, session.group.acronym):
             if other_session != session:
-                other_session.sessionpresentation_set.filter(document__type='minutes').delete()
-                other_session.sessionpresentation_set.create(document=doc,rev=doc.rev)
+                other_session.presentations.filter(document__type=document_type).delete()
+                other_session.presentations.create(document=doc,rev=doc.rev)
     filename = f'{doc.name}-{doc.rev}{ext}'
     doc.uploaded_filename = filename
     e = NewRevisionDocEvent.objects.create(
@@ -635,7 +745,7 @@ def save_session_minutes_revision(session, file, ext, request, encoding=None, ap
         file=file,
         filename=doc.uploaded_filename,
         meeting=session.meeting,
-        subdir='minutes',
+        subdir=document_type.slug,
         request=request,
         encoding=encoding,
     )
@@ -648,31 +758,27 @@ def save_session_minutes_revision(session, file, ext, request, encoding=None, ap
 def handle_upload_file(file, filename, meeting, subdir, request=None, encoding=None):
     """Accept an uploaded materials file
 
-    This function takes a file object, a filename and a meeting object and subdir as string.
+    This function takes a _binary mode_ file object, a filename and a meeting object and subdir as string.
     It saves the file to the appropriate directory, get_materials_path() + subdir.
-    If the file is a zip file, it creates a new directory in 'slides', which is the basename of the
-    zip file and unzips the file in the new directory.
     """
     filename = Path(filename)
-    is_zipfile = filename.suffix == '.zip'
 
     path = Path(meeting.get_materials_path()) / subdir
-    if is_zipfile:
-        path = path / filename.stem
     path.mkdir(parents=True, exist_ok=True)
 
-    # agendas and minutes can only have one file instance so delete file if it already exists
-    if subdir in ('agenda', 'minutes'):
-        for f in path.glob(f'{filename.stem}.*'):
+    with (path / filename).open('wb+') as destination:
+        # prep file for reading
+        if hasattr(file, "chunks"):
+            chunks = file.chunks()
+        else:
             try:
-                f.unlink()
-            except FileNotFoundError:
-                pass  # if the file is already gone, so be it
+                file.seek(0)
+            except AttributeError:
+                pass
+            chunks = [file.read()]  # pretend we have chunks
 
-    with (path / filename).open('wb+') as destination:
         if filename.suffix in settings.MEETING_VALID_MIME_TYPE_EXTENSIONS['text/html']:
-            file.open()
-            text = file.read()
+            text = b"".join(chunks)
             if encoding:
                 try:
                     text = text.decode(encoding)
@@ -684,13 +790,18 @@ def handle_upload_file(file, filename, meeting, subdir, request=None, encoding=N
                     )
             else:
                 try:
-                    text = smart_text(text)
+                    text = smart_str(text)
                 except UnicodeDecodeError as e:
                     return "Failure trying to save '%s'. Hint: Try to upload as UTF-8: %s..." % (filename, str(e)[:120])
             # Whole file sanitization; add back what's missing from a complete
             # document (sanitize will remove these).
-            clean = sanitize_document(text)
-            destination.write(clean.encode('utf8'))
+            clean = clean_html(text)
+            clean_bytes = clean.encode('utf8')
+            destination.write(clean_bytes)
+            # Assumes contents of subdir are always document type ids
+            # TODO-BLOBSTORE: see if we can refactor this so that the connection to the document isn't lost
+            # In the meantime, consider faking it by parsing filename (shudder).
+            store_bytes(subdir, filename.name, clean_bytes)
             if request and clean != text:
                 messages.warning(request,
                                  (
@@ -699,15 +810,13 @@ def handle_upload_file(file, filename, meeting, subdir, request=None, encoding=N
                                      f"please check the resulting content.  "
                                  ))
         else:
-            if hasattr(file, 'chunks'):
-                for chunk in file.chunks():
-                    destination.write(chunk)
-            else:
-                destination.write(file.read())
-
-    # unzip zipfile
-    if is_zipfile:
-        subprocess.call(['unzip', filename], cwd=path)
+            for chunk in chunks:
+                destination.write(chunk)
+            file.seek(0)
+            if hasattr(file, "chunks"):
+                chunks = file.chunks()
+            # TODO-BLOBSTORE: See above question about refactoring
+            store_bytes(subdir, filename.name, b"".join(chunks))
 
     return None
 
@@ -731,14 +840,1028 @@ def new_doc_for_session(type_id, session):
                 rev = '00',
             )
     doc.states.add(State.objects.get(type_id=type_id, slug='active'))
-    DocAlias.objects.create(name=doc.name).docs.add(doc)
-    session.sessionpresentation_set.create(document=doc,rev='00')
+    session.presentations.create(document=doc,rev='00')
     return doc
 
+# TODO-BLOBSTORE - consider adding doc to this signature and factoring away type_id
 def write_doc_for_session(session, type_id, filename, contents):
     filename = Path(filename)
     path = Path(session.meeting.get_materials_path()) / type_id
     path.mkdir(parents=True, exist_ok=True)
     with open(path / filename, "wb") as file:
         file.write(contents.encode('utf-8'))
-    return
+    store_str(type_id, filename.name, contents)
+    return None
+
+
+@dataclass
+class BlobSpec:
+    bucket: str
+    name: str
+
+
+def resolve_one_material(
+    doc: Document, rev: str | None, ext: str | None
+) -> BlobSpec | None:
+    if doc.type_id is None:
+        log(f"Cannot resolve a doc with no type: {doc.name}")
+        return None
+
+    # Get the Document's base name. It may or may not have an extension.
+    if rev is None:
+        basename = Path(doc.get_base_name())
+    else:
+        basename = Path(f"{doc.name}-{int(rev):02d}")
+
+    # If the document's file exists, the blob is _always_ named with this stem,
+    # even if it's different from the original.
+    blob_stem = Path(f"{doc.name}-{rev or doc.rev}")
+
+    # If we have an extension, either from the URL or the Document's base name, look up
+    # the blob or file or return 404. N.b. the suffix check needs adjustment to handle
+    # a bare "." extension when we reach py3.14.
+    if ext or basename.suffix != "": 
+        if ext:
+            blob_name = str(blob_stem.with_suffix(ext))
+        else:
+            blob_name = str(blob_stem.with_suffix(basename.suffix))
+
+        # See if we have a stored object under that name
+        preferred_blob = (
+            StoredObject.objects.exclude_deleted()
+            .filter(store=doc.type_id, name=blob_name)
+            .first()
+        )
+        if preferred_blob is not None:
+            return BlobSpec(
+                bucket=preferred_blob.store,
+                name=preferred_blob.name,
+            )
+        # No stored object, fall back to the file system.
+        filename = Path(doc.get_file_path()) / basename  # use basename for file
+        if filename.is_file():
+            return BlobSpec(
+                bucket=doc.type_id,
+                name=str(blob_stem.with_suffix(filename.suffix)),
+            )
+        else:
+            return None
+
+    # No extension has been specified so far, so look one up.
+    matching_stored_objects = (
+        StoredObject.objects.exclude_deleted()
+        .filter(
+            store=doc.type_id,
+            name__startswith=f"{blob_stem}.",  # anchor to end with trailing "."
+        )
+        .order_by("name")
+    )  # orders by suffix
+    blob_ext_choices = {
+        Path(stored_obj.name).suffix: stored_obj
+        for stored_obj in matching_stored_objects
+    }
+
+    # Short-circuit to return pdf if present
+    if ".pdf" in blob_ext_choices:
+        pdf_blob = blob_ext_choices[".pdf"]
+        return BlobSpec(
+            bucket=pdf_blob.store,
+            name=str(blob_stem.with_suffix(".pdf")),
+        )
+
+    # Now look for files
+    filename = Path(doc.get_file_path()) / basename
+    file_ext_choices = {
+        # Construct a map from suffix to full filename
+        fn.suffix: fn.name
+        for fn in sorted(filename.parent.glob(filename.stem + ".*"))
+    }
+
+    # Short-circuit to return pdf if we have the file
+    if ".pdf" in file_ext_choices:
+        return BlobSpec(
+            bucket=doc.type_id,
+            name=str(blob_stem.with_suffix(".pdf")),
+        )
+
+    all_exts = set(blob_ext_choices.keys()).union(file_ext_choices.keys())
+    if len(all_exts) > 0:
+        preferred_ext = sorted(all_exts)[0]
+        if preferred_ext in blob_ext_choices:
+            preferred_blob = blob_ext_choices[preferred_ext]
+            return BlobSpec(
+                bucket=preferred_blob.store,
+                name=preferred_blob.name,
+            )
+        else:
+            return BlobSpec(
+                bucket=doc.type_id,
+                name=str(blob_stem.with_suffix(preferred_ext)),
+            )
+
+    return None
+
+
+def resolve_materials_for_one_meeting(meeting: Meeting):
+    start_time = timezone.now()
+    meeting_documents = (
+        Document.objects.filter(
+            type_id__in=settings.MATERIALS_TYPES_SERVED_BY_WORKER
+        ).filter(
+            Q(session__meeting=meeting) | Q(proceedingsmaterial__meeting=meeting)
+        )
+    ).distinct()
+    
+    resolved = []
+    for doc in meeting_documents:
+        # request by doc name with no rev
+        blob = resolve_one_material(doc, rev=None, ext=None)
+        if blob is not None:
+            resolved.append(
+                ResolvedMaterial(
+                    name=doc.name,
+                    meeting_number=meeting.number,
+                    bucket=blob.bucket,
+                    blob=blob.name,
+                )
+            )
+        # request by doc name + rev
+        blob = resolve_one_material(doc, rev=doc.rev, ext=None)
+        if blob is not None:
+            resolved.append(
+                ResolvedMaterial(
+                    name=f"{doc.name}-{doc.rev:02}",
+                    meeting_number=meeting.number,
+                    bucket=blob.bucket,
+                    blob=blob.name,
+                )
+            )
+        # for other revisions, only need request by doc name + rev
+        other_revisions = doc.revisions_by_newrevisionevent()
+        other_revisions.remove(doc.rev)
+        for rev in other_revisions:
+            blob = resolve_one_material(doc, rev=rev, ext=None)
+            if blob is not None:
+                resolved.append(
+                    ResolvedMaterial(
+                        name=f"{doc.name}-{rev:02}",
+                        meeting_number=meeting.number,
+                        bucket=blob.bucket,
+                        blob=blob.name,
+                    )
+                )
+    ResolvedMaterial.objects.bulk_create(
+        resolved,
+        update_conflicts=True,
+        unique_fields=["name", "meeting_number"],
+        update_fields=["bucket", "blob"],
+    )
+    # Warn if any files were updated during the above process
+    last_update = meeting_documents.aggregate(Max("time"))["time__max"]
+    if last_update and last_update > start_time:
+        log(
+            f"Warning: materials for meeting {meeting.number} "
+            "changed during ResolvedMaterial update"
+        )
+
+def resolve_uploaded_material(meeting: Meeting, doc: Document):
+    resolved: list[ResolvedMaterial] = []
+    remove = ResolvedMaterial.objects.none()
+    blob = resolve_one_material(doc, rev=None, ext=None)
+    if blob is None:
+        # Versionless file does not exist. Remove the versionless ResolvedMaterial
+        # if it existed. This is to avoid leaving behind a stale link to a replaced
+        # version. This comes up e.g. if a ProceedingsMaterial is changed from having
+        # an uploaded file to being an external URL.
+        remove = ResolvedMaterial.objects.filter(
+            name=doc.name, meeting_number=meeting.number
+        )
+    else:
+        resolved.append(
+            ResolvedMaterial(
+                name=doc.name,
+                meeting_number=meeting.number,
+                bucket=blob.bucket,
+                blob=blob.name,
+            )
+        )
+    # request by doc name + rev
+    blob = resolve_one_material(doc, rev=doc.rev, ext=None)
+    if blob is not None:
+        resolved.append(
+            ResolvedMaterial(
+                name=f"{doc.name}-{doc.rev:02}",
+                meeting_number=meeting.number,
+                bucket=blob.bucket,
+                blob=blob.name,
+            )
+        )
+    # Create the new record(s) 
+    ResolvedMaterial.objects.bulk_create(
+        resolved,
+        update_conflicts=True,
+        unique_fields=["name", "meeting_number"],
+        update_fields=["bucket", "blob"],
+    )
+    # and remove one if necessary (will be a none() queryset if not)
+    remove.delete()
+
+
+def store_blob_for_one_material_file(doc: Document, rev: str, filepath: Path):
+    if not settings.ENABLE_BLOBSTORAGE:
+        raise RuntimeError("Cannot store blobs: ENABLE_BLOBSTORAGE is False")
+
+    bucket = doc.type_id
+    if bucket not in settings.MATERIALS_TYPES_SERVED_BY_WORKER:
+        raise ValueError(f"Bucket {bucket} not found for doc {doc.name}.")
+    blob_stem = f"{doc.name}-{rev}"
+    suffix = filepath.suffix  # includes leading "."
+
+    # Store the file
+    try:
+        file_bytes = filepath.read_bytes()
+    except Exception as err:
+        log(f"Failed to read {filepath}: {err}")
+        raise
+    with suppress(AlreadyExistsError):
+        store_bytes(
+            kind=bucket,
+            name= blob_stem + suffix,
+            content=file_bytes,
+            mtime=datetime.datetime.fromtimestamp(
+                filepath.stat().st_mtime,
+                tz=datetime.UTC,
+            ),
+            allow_overwrite=False,
+            doc_name=doc.name,
+            doc_rev=rev,
+        )
+
+    # Special case: pre-render markdown into HTML as .md.html
+    if suffix == ".md":
+        try:
+            markdown_source = file_bytes.decode("utf-8")
+        except UnicodeDecodeError as err:
+            log(f"Unable to decode {filepath} as UTF-8, treating as latin-1: {err}")
+            markdown_source = file_bytes.decode("latin-1")
+        # render the markdown
+        try:
+            html = render_to_string(
+                "minimal.html",
+                {
+                    "content": markdown.markdown(markdown_source),
+                    "title": blob_stem,
+                    "static_ietf_org": settings.STATIC_IETF_ORG,
+                },
+            )
+        except Exception as err:
+            log(f"Failed to render markdown for {filepath}: {err}")
+        else:
+            # Don't overwrite, but don't fail if the blob exists
+            with suppress(AlreadyExistsError):
+                store_str(
+                    kind=bucket,
+                    name=blob_stem + ".md.html",
+                    content=html,
+                    allow_overwrite=False,
+                    doc_name=doc.name,
+                    doc_rev=rev,
+                    content_type="text/html;charset=utf-8",
+                )
+
+
+def store_blobs_for_one_material_doc(doc: Document):
+    """Ensure that all files related to a materials Document are in the blob store"""
+    if doc.type_id not in settings.MATERIALS_TYPES_SERVED_BY_WORKER:
+        log(f"This method does not handle docs of type {doc.name}")
+        return
+
+    # Store files for current Document / rev
+    file_path = Path(doc.get_file_path())
+    base_name = Path(doc.get_base_name())
+    # .stem would remove directories, so use .with_suffix("")
+    base_name_stem = str(base_name.with_suffix(""))
+    if base_name_stem.endswith(".") and base_name.suffix == "":
+        # In Python 3.14, a trailing "." is a valid suffix, but in prior versions
+        # it is left as part of the stem. The suffix check ensures that either way,
+        # only a single "." will be removed.
+        base_name_stem = base_name_stem[:-1]
+    # Add any we find without the rev
+    for file_to_store in file_path.glob(base_name_stem + ".*"):
+        if not (file_to_store.is_file()):
+            continue
+        try:
+            store_blob_for_one_material_file(doc, doc.rev, file_to_store)
+        except Exception as err:
+            log(
+                f"Failed to store blob for {doc} rev {doc.rev} "
+                f"from {file_to_store}: {err}"
+            )
+
+    # Get other revisions
+    for rev in doc.revisions_by_newrevisionevent():
+        if rev == doc.rev:
+            continue  # already handled this
+
+        # Add some that have the rev
+        for file_to_store in file_path.glob(doc.name + f"-{rev}.*"):
+            if not file_to_store.is_file():
+                continue
+            try:
+                store_blob_for_one_material_file(doc, rev, file_to_store)
+            except Exception as err:
+                log(
+                    f"Failed to store blob for {doc} rev {rev} "
+                    f"from {file_to_store}: {err}"
+                )
+
+
+def store_blobs_for_one_meeting(meeting: Meeting):
+    meeting_documents = (
+        Document.objects.filter(
+            type_id__in=settings.MATERIALS_TYPES_SERVED_BY_WORKER
+        ).filter(
+            Q(session__meeting=meeting) | Q(proceedingsmaterial__meeting=meeting)
+        )
+    ).distinct()
+
+    for doc in meeting_documents:
+        store_blobs_for_one_material_doc(doc)
+
+
+def create_recording(session, url, title=None, user=None):
+    '''
+    Creates the Document type=recording, setting external_url and creating
+    NewRevisionDocEvent
+    '''
+    sequence = get_next_sequence(session.group,session.meeting,'recording')
+    name = 'recording-{}-{}-{}'.format(session.meeting.number,session.group.acronym,sequence)
+    time = session.official_timeslotassignment().timeslot.time.strftime('%Y-%m-%d %H:%M')
+    if not title:
+        if url.endswith('mp3'):
+            title = 'Audio recording for {}'.format(time)
+        else:
+            title = 'Video recording for {}'.format(time)
+        
+    doc = Document.objects.create(name=name,
+                                  title=title,
+                                  external_url=url,
+                                  group=session.group,
+                                  rev='00',
+                                  type_id='recording')
+    doc.set_state(State.objects.get(type='recording', slug='active'))
+    
+    # create DocEvent
+    NewRevisionDocEvent.objects.create(type='new_revision',
+                                       by=user or Person.objects.get(name='(System)'),
+                                       doc=doc,
+                                       rev=doc.rev,
+                                       desc='New revision available',
+                                       time=doc.time)
+    pres = SessionPresentation.objects.create(session=session,document=doc,rev=doc.rev)
+    session.presentations.add(pres)
+
+    return doc
+
+def delete_recording(session_presentation, user=None):
+    """Delete a session recording"""
+    document = session_presentation.document
+    if document.type_id != "recording":
+        raise ValueError(f"Document {document.pk} is not a recording (type_id={document.type_id})")
+    recording_state = document.get_state("recording")
+    deleted_state = State.objects.get(type_id="recording", slug="deleted")
+    if recording_state != deleted_state:
+        # Update the recording state and create a history event 
+        document.set_state(deleted_state)
+        StateDocEvent.objects.create(
+            type="changed_state",
+            by=user or Person.objects.get(name="(System)"),
+            doc=document,
+            rev=document.rev,
+            state_type=deleted_state.type,
+            state=deleted_state,
+        )
+    session_presentation.delete()
+
+def get_next_sequence(group, meeting, type):
+    '''
+    Returns the next sequence number to use for a document of type = type.
+    Takes a group=Group object, meeting=Meeting object, type = string
+    '''
+    docs = Document.objects.filter(name__startswith='{}-{}-{}-'.format(type, meeting.number, group.acronym))
+    if not docs:
+        return 1
+    docs = docs.order_by('name')
+    sequence = int(docs.last().name.split('-')[-1]) + 1
+    return sequence
+
+def get_activity_stats(sdate, edate):
+    '''
+    This function takes a date range and produces a dictionary of statistics / objects for
+    use in an activity report.  Generally the end date will be the date of the last meeting
+    and the start date will be the date of the meeting before that.
+
+    Data between midnight UTC on the specified dates are included in the stats.
+    '''
+    sdatetime = pytz.utc.localize(datetime.datetime.combine(sdate, datetime.time()))
+    edatetime = pytz.utc.localize(datetime.datetime.combine(edate, datetime.time()))
+
+    data = {}
+    data['sdate'] = sdate
+    data['edate'] = edate
+
+    events = DocEvent.objects.filter(doc__type='draft', time__gte=sdatetime, time__lt=edatetime)
+    
+    data['actions_count'] = events.filter(type='iesg_approved').count()
+    data['last_calls_count'] = events.filter(type='sent_last_call').count()
+    new_draft_events = events.filter(newrevisiondocevent__rev='00')
+    new_drafts = list(set([e.doc_id for e in new_draft_events]))
+    data['new_docs'] = list(set([e.doc for e in new_draft_events]))
+    data['new_drafts_count'] = len(new_drafts)
+    data['new_drafts_updated_count'] = events.filter(doc__id__in=new_drafts,newrevisiondocevent__rev='01').count()
+    data['new_drafts_updated_more_count'] = events.filter(doc__id__in=new_drafts,newrevisiondocevent__rev='02').count()
+    
+    update_events = events.filter(type='new_revision').exclude(doc__id__in=new_drafts)
+    data['updated_drafts_count'] = len(set([e.doc_id for e in update_events]))
+    
+    # Calculate Final Four Weeks stats (ffw)
+    ffwdate = edatetime - datetime.timedelta(days=28)
+    ffw_new_count = events.filter(time__gte=ffwdate, newrevisiondocevent__rev='00').count()
+    try:
+        ffw_new_percent = format(ffw_new_count / float(data['new_drafts_count']), '.0%')
+    except ZeroDivisionError:
+        ffw_new_percent = 0
+        
+    data['ffw_new_count'] = ffw_new_count
+    data['ffw_new_percent'] = ffw_new_percent
+    
+    ffw_update_events = events.filter(time__gte=ffwdate, type='new_revision').exclude(doc__id__in=new_drafts)
+    ffw_update_count = len(set([e.doc_id for e in ffw_update_events]))
+    try:
+        ffw_update_percent = format(ffw_update_count / float(data['updated_drafts_count']),'.0%')
+    except ZeroDivisionError:
+        ffw_update_percent = 0
+    
+    data['ffw_update_count'] = ffw_update_count
+    data['ffw_update_percent'] = ffw_update_percent
+
+    rfcs_events = DocEvent.objects.filter(doc__type='rfc', time__gte=sdatetime, time__lt=edatetime)
+    rfcs = rfcs_events.filter(type='published_rfc')
+    data['rfcs'] = rfcs.select_related('doc').select_related('doc__group').select_related('doc__std_level')
+
+    data['counts'] = {'std': rfcs.filter(doc__std_level__in=('ps', 'ds', 'std')).count(),
+                      'bcp': rfcs.filter(doc__std_level='bcp').count(),
+                      'exp': rfcs.filter(doc__std_level='exp').count(),
+                      'inf': rfcs.filter(doc__std_level='inf').count()}
+
+    data['new_groups'] = Group.objects.filter(
+        type='wg',
+        groupevent__changestategroupevent__state='active',
+        groupevent__time__gte=sdatetime,
+        groupevent__time__lt=edatetime)
+        
+    data['concluded_groups'] = Group.objects.filter(
+        type='wg',
+        groupevent__changestategroupevent__state='conclude',
+        groupevent__time__gte=sdatetime,
+        groupevent__time__lt=edatetime)
+
+    return data
+
+def is_powerpoint(doc):
+    '''
+    Returns true if document is a Powerpoint presentation
+    '''
+    return doc.file_extension() in ('ppt', 'pptx')
+
+def post_process(doc):
+    '''
+    Does post processing on uploaded file.
+    - Convert PPT to PDF
+    '''
+    if is_powerpoint(doc) and hasattr(settings, 'PPT2PDF_COMMAND'):
+        try:
+            cmd = list(settings.PPT2PDF_COMMAND)   # Don't operate on the list actually in settings
+            cmd.append(doc.get_file_path())                                 # outdir
+            cmd.append(os.path.join(doc.get_file_path(), doc.uploaded_filename))  # filename
+            subprocess.check_call(cmd)
+        except (subprocess.CalledProcessError, OSError) as error:
+            log("Error converting PPT: %s" % (error))
+            return
+        # change extension
+        base, ext = os.path.splitext(doc.uploaded_filename)
+        doc.uploaded_filename = base + '.pdf'
+
+        e = DocEvent.objects.create(
+            type='changed_document',
+            by=Person.objects.get(name="(System)"),
+            doc=doc,
+            rev=doc.rev,
+            desc='Converted document to PDF',
+        )
+        doc.save_with_history([e])
+
+
+def participants_for_meeting(meeting):
+    """ Return a tuple (checked_in, attended)
+        checked_in = queryset of onsite, checkedin participants values_list('person')
+        attended = queryset of remote participants who attended a session values_list('person')
+    """
+    checked_in = meeting.registration_set.onsite().filter(checkedin=True).values_list('person', flat=True).distinct()
+    sessions = meeting.session_set.filter(Q(type='plenary') | Q(group__type__in=['wg', 'rg']))
+    attended = Attended.objects.filter(session__in=sessions).values_list('person', flat=True).distinct()
+    return (checked_in, attended)
+
+
+def generate_proceedings_content(meeting, force_refresh=False):
+    """Render proceedings content for a meeting and update cache
+    
+    Caches its value for 25 hours to ensure that the cache never expires if
+    we recompute the value daily.
+
+    :meeting: meeting whose proceedings should be rendered
+    :force_refresh: true to force regeneration and cache refresh
+    """
+    cache = caches["proceedings"]
+    key_components = [
+        "proceedings",
+        str(meeting.number),
+    ]
+    if meeting.proceedings_final:
+        # Freeze the cache key once proceedings are finalized. Further changes will
+        # not be picked up until the cache expires or is refreshed by the
+        # proceedings_content_refresh_task()
+        key_components.append("final")
+    else:
+        # Build a cache key that changes when materials are modified. For all but drafts,
+        # use the last modification time of the document. Exclude drafts from this because
+        # revisions long after the meeting ends will otherwise show up as changes and
+        # incorrectly invalidate the cache. Instead, include an ordered list of the
+        # drafts linked to the meeting so adding or removing drafts will trigger a
+        # recalculation. The list is long but that doesn't matter because we hash it into
+        # a fixed-length key.
+        meeting_docs = Document.objects.filter(session__meeting__number=meeting.number)
+        last_materials_update = (
+            meeting_docs.exclude(type_id="draft")
+            .filter(session__meeting__number=meeting.number)
+            .aggregate(Max("time"))["time__max"]
+        )
+        draft_names = (
+            meeting_docs
+            .filter(type_id="draft")
+            .order_by("name")
+            .values_list("name", flat=True)
+        )
+        key_components += [
+            last_materials_update.isoformat() if last_materials_update else "-",
+            ",".join(draft_names),
+        ]
+
+    # Key is potentially long, but the "proceedings" cache hashes it to a fixed
+    # length. If that changes, hash it separately here first.
+    cache_key = ".".join(key_components)
+    if not force_refresh:
+        cached_content = cache.get(cache_key, None)
+        if cached_content is not None:
+            return cached_content
+
+    def area_and_group_acronyms_from_session(s):
+        area = s.group_parent_at_the_time()
+        if area == None:
+            area = s.group.parent
+        group = s.group_at_the_time()
+        return (area.acronym, group.acronym)
+
+    schedule = meeting.schedule
+    sessions  = (
+        meeting.session_set.with_current_status()
+        .filter(Q(timeslotassignments__schedule__in=[schedule, schedule.base if schedule else None])
+                | Q(current_status='notmeet'))
+        .select_related()
+        .order_by('-current_status')
+    )
+
+    plenaries, _ = organize_proceedings_sessions(
+        sessions.filter(name__icontains='plenary')
+        .exclude(current_status='notmeet')
+    )
+    irtf_meeting, irtf_not_meeting = organize_proceedings_sessions(
+        sessions.filter(group__parent__acronym = 'irtf').order_by('group__acronym')
+    )
+    # per Colin (datatracker #5010) - don't report not meeting rags
+    irtf_not_meeting = [item for item in irtf_not_meeting if item["group"].type_id != "rag"]
+    irtf = {"meeting_groups":irtf_meeting, "not_meeting_groups":irtf_not_meeting}
+
+    training, _ = organize_proceedings_sessions(
+        sessions.filter(group__acronym__in=['edu','iaoc'], type_id__in=['regular', 'other',])
+        .exclude(current_status='notmeet')
+    )
+    iab, _ = organize_proceedings_sessions(
+        sessions.filter(group__parent__acronym = 'iab')
+        .exclude(current_status='notmeet')
+    )
+    editorial, _ = organize_proceedings_sessions(
+        sessions.filter(group__acronym__in=['rsab','rswg'])
+        .exclude(current_status='notmeet')
+    )
+
+    ietf = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym__in=['edu','iepg','tools'])
+    ietf = list(ietf)
+    ietf.sort(key=lambda s: area_and_group_acronyms_from_session(s))
+    ietf_areas = []
+    for area, area_sessions in itertools.groupby(ietf, key=lambda s: s.group_parent_at_the_time()):
+        meeting_groups, not_meeting_groups = organize_proceedings_sessions(area_sessions)
+        ietf_areas.append((area, meeting_groups, not_meeting_groups))
+
+    with timezone.override(meeting.tz()):
+        rendered_content = render_to_string(
+            "meeting/proceedings.html", 
+            {
+                'meeting': meeting,
+                'plenaries': plenaries,
+                'training': training,
+                'irtf': irtf,
+                'iab': iab,
+                'editorial': editorial,
+                'ietf_areas': ietf_areas,
+                'meetinghost_logo': {
+                    'max_height': settings.MEETINGHOST_LOGO_MAX_DISPLAY_HEIGHT,
+                    'max_width': settings.MEETINGHOST_LOGO_MAX_DISPLAY_WIDTH,
+                }
+            },
+        )
+    cache.set(
+        cache_key,
+        rendered_content,
+        timeout=3600 + 86400,  # one day + one hour, in seconds
+    )
+    return rendered_content
+
+
+def organize_proceedings_sessions(sessions):
+    # Collect sessions by Group, then bin by session name (including sessions with blank names).
+    # If all of a group's sessions are 'notmeet', the processed data goes in not_meeting_sessions.
+    # Otherwise, the data goes in meeting_sessions.
+    meeting_groups = []
+    not_meeting_groups = []
+    for group_acronym, group_sessions in itertools.groupby(sessions, key=lambda s: s.group.acronym):
+        by_name = {}
+        is_meeting = False
+        all_canceled = True
+        group = None
+        for s in sorted(
+                group_sessions,
+                key=lambda gs: (
+                        gs.official_timeslotassignment().timeslot.time
+                        if gs.official_timeslotassignment() else datetime.datetime(datetime.MAXYEAR, 1, 1)
+                ),
+        ):
+            group = s.group
+            if s.current_status != 'notmeet':
+                is_meeting = True
+            if s.current_status != 'canceled':
+                all_canceled = False
+            by_name.setdefault(s.name, [])
+            if s.current_status != 'notmeet' or s.presentations.exists():
+                by_name[s.name].append(s)  # for notmeet, only include sessions with materials
+        for sess_name, ss in by_name.items():
+            session = ss[0] if ss else None
+            def _format_materials(items):
+                """Format session/material for template
+
+                Input is a list of (session, materials) pairs. The materials value can be a single value or a list.
+                """
+                material_times = {}  # key is material, value is first timestamp it appeared
+                for s, mats in items:
+                    tsa = s.official_timeslotassignment()
+                    timestamp = tsa.timeslot.time if tsa else None
+                    if not isinstance(mats, list):
+                        mats = [mats]
+                    for mat in mats:
+                        if mat and mat not in material_times:
+                            material_times[mat] = timestamp
+                n_mats = len(material_times)
+                result = []
+                if n_mats == 1:
+                    result.append({'material': list(material_times)[0]})  # no 'time' when only a single material
+                elif n_mats > 1:
+                    for mat, timestamp in material_times.items():
+                        result.append({'material': mat, 'time': timestamp})
+                return result
+
+            entry = {
+                'group': group,
+                'name': sess_name,
+                'session': session,
+                'canceled': all_canceled,
+                'has_materials': s.presentations.exists(),
+                'agendas': _format_materials((s, s.agenda()) for s in ss),
+                'minutes': _format_materials((s, s.minutes()) for s in ss),
+                'bluesheets': _format_materials((s, s.bluesheets()) for s in ss),
+                'recordings': _format_materials((s, s.recordings()) for s in ss),
+                'meetecho_recordings': _format_materials((s, [s.session_recording_url()]) for s in ss),
+                'chatlogs': _format_materials((s, s.chatlogs()) for s in ss),
+                'slides': _format_materials((s, s.slides()) for s in ss),
+                'drafts': _format_materials((s, s.drafts()) for s in ss),
+                'last_update': session.last_update if hasattr(session, 'last_update') else None
+            }
+            if session and session.meeting.type_id == 'ietf' and not session.meeting.proceedings_final:
+                entry['attendances'] = _format_materials((s, s) for s in ss if Attended.objects.filter(session=s).exists())
+            if is_meeting:
+                meeting_groups.append(entry)
+            else:
+                not_meeting_groups.append(entry)
+    return meeting_groups, not_meeting_groups
+
+
+import_registration_json_validator = jsonschema.Draft202012Validator(
+    schema={
+        "type": "object",
+        "properties": {
+            "objects": {
+                "type": "object",
+                "patternProperties": {
+                    # Email address as key (simplified pattern or just allow any key)
+                    ".*": {
+                        "type": "object",
+                        "properties": {
+                            "first_name": {"type": "string"},
+                            "last_name": {"type": "string"},
+                            "email": {"type": "string", "format": "email"},
+                            "affiliation": {"type": "string"},
+                            "country_code": {"type": "string", "minLength": 2, "maxLength": 2},
+                            "meeting": {"type": "string"},
+                            "checkedin": {"type": "boolean"},
+                            "cancelled": {"type": "boolean"},
+                            "is_nomcom_volunteer": {"type": "boolean"},
+                            "tickets": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "attendance_type": {"type": "string"},
+                                        "ticket_type": {"type": "string"}
+                                    },
+                                    "required": ["attendance_type", "ticket_type"]
+                                }
+                            }
+                        },
+                        "required": [
+                            "first_name", "last_name", "email",
+                            "country_code", "meeting", 'affiliation',
+                            "checkedin", "is_nomcom_volunteer", "tickets",
+                            "cancelled",
+                        ]
+                    }
+                },
+                "additionalProperties": False
+            }
+        },
+        "required": ["objects"]
+    }
+)
+
+
+def get_registration_data(meeting):
+    '''Retrieve data from registation system for meeting'''
+    url = settings.REGISTRATION_PARTICIPANTS_API_URL
+    key = settings.REGISTRATION_PARTICIPANTS_API_KEY
+    params = {'meeting': meeting.number, 'apikey': key}
+    try:
+        response = requests.get(url, params=params, timeout=settings.DEFAULT_REQUESTS_TIMEOUT)
+    except requests.Timeout as e:
+        log(f'GET request timed out for [{url}]: {e}')
+        raise Exception("Timeout retrieving data from registration API") from e
+    if response.status_code == 200:
+        try:
+            decoded = response.json()
+        except ValueError as e:
+            raise ValueError(f'Could not decode response from registration API: {e}')
+    else:
+        raise Exception(f'Bad response from registration API: {response.status_code}, {response.content[:64]}')
+
+    # validate registration data
+    import_registration_json_validator.validate(decoded)
+    return decoded
+
+
+def sync_registration_data(meeting):
+    """"Sync meeting.Registration with registration system.
+
+    Registration records are created in realtime as people register for a
+    meeting. This function serves as an audit / reconciliation. Most records are
+    expected to already exist. The function has been optimized with this in mind.
+
+    - Creates new registrations if they don't exist
+    - Updates existing registrations if fields differ
+    - Updates tickets as needed
+    - Deletes registrations that exist in the database but not in the JSON data
+
+    Returns:
+        dict: Summary of changes made (created, updated, deleted counts)
+    """
+    reg_data = get_registration_data(meeting)
+
+    # Get the meeting ID from the first registration, the API only deals with one meeting at a time
+    first_email = next(iter(reg_data['objects']))
+    meeting_number = reg_data['objects'][first_email]['meeting']
+    try:
+        Meeting.objects.get(number=meeting_number)
+    except Meeting.DoesNotExist:
+        raise Exception(f'meeting does not exist {meeting_number}')
+
+    # Get all existing registrations for this meeting
+    existing_registrations = meeting.registration_set.all()
+    existing_emails = set(reg.email for reg in existing_registrations if reg.email)
+
+    # Track changes for reporting
+    stats = {
+        'created': 0,
+        'updated': 0,
+        'deleted': 0,
+        'processed': 0,
+    }
+
+    # Process registrations from reg_data
+    reg_emails = set()
+    for email, data in reg_data['objects'].items():
+        stats['processed'] += 1
+        reg_emails.add(email)
+
+        # Process this registration
+        _, action_taken = process_single_registration(data, meeting)
+
+        # Update stats
+        if action_taken == 'created':
+            stats['created'] += 1
+        elif action_taken == 'updated':
+            stats['updated'] += 1
+
+    # Delete registrations that exist in the DB but not in registration data, they've been cancelled
+    emails_to_delete = existing_emails - reg_emails
+    if emails_to_delete:
+        log(f"sync_reg: emails marked for deletion: {emails_to_delete}")
+        result = Registration.objects.filter(
+            email__in=emails_to_delete,
+            meeting=meeting
+        ).delete()
+        if 'meeting.Registration' in result[1]:
+            deleted_count = result[1]['meeting.Registration']
+        else:
+            deleted_count = 0
+        stats['deleted'] = deleted_count
+    # set meeting.attendees
+    count = Registration.objects.onsite().filter(meeting=meeting, checkedin=True).count()
+    if meeting.attendees != count:
+        meeting.attendees = count
+        meeting.save()
+
+    return stats
+
+
+def process_single_registration(reg_data, meeting):
+    """
+    Process a single registration record - create, update, or leave unchanged as needed.
+
+    Args:
+        reg_data (dict): Registration data
+        meeting (obj): The IETF meeting
+
+    Returns:
+        tuple: (registration, action_taken)
+            - registration: Registration object
+            - action_taken: String indicating 'created', 'updated', or None
+    """
+    # import here to avoid circular imports
+    from ietf.nomcom.models import Volunteer, NomCom
+
+    action_taken = None
+    fields_updated = False
+    tickets_modified = False
+
+    # handle deleted
+    # should not see cancelled records during nightly sync but can see
+    # them from realtime notifications
+    if reg_data['cancelled']:
+        try:
+            registration = Registration.objects.get(meeting=meeting, email=reg_data['email'])
+        except Registration.DoesNotExist:
+            return (None, None)
+        for ticket in reg_data['tickets']:
+            target = registration.tickets.filter(
+                attendance_type__slug=ticket['attendance_type'],
+                ticket_type__slug=ticket['ticket_type']).first()
+            if target:
+                target.delete()
+        if registration.tickets.count() == 0:
+            registration.delete()
+        log(f"sync_reg: cancelled registration {reg_data['email']}")
+        return (None, 'deleted')
+
+    person = Person.objects.filter(email__address=reg_data['email']).first()
+    if not person:
+        log(f"ERROR: meeting registration email unknown {reg_data['email']}")
+
+    registration, created = Registration.objects.get_or_create(
+        email=reg_data['email'],
+        meeting=meeting,
+        defaults={
+            'first_name': reg_data['first_name'],
+            'last_name': reg_data['last_name'],
+            'person': person,
+            'affiliation': reg_data['affiliation'],
+            'country_code': reg_data['country_code'],
+            'checkedin': reg_data['checkedin'],
+        }
+    )
+
+    # If not created, check if we need to update
+    if not created:
+        for field in ['first_name', 'last_name', 'affiliation', 'country_code', 'checkedin']:
+            if getattr(registration, field) != reg_data[field]:
+                log(f"sync_reg: found update {reg_data['email']}, {field} different, data from reg: {reg_data}")
+                setattr(registration, field, reg_data[field])
+                fields_updated = True
+
+    if fields_updated:
+        registration.save()
+
+    # Process tickets - handle counting properly for multiple same-type tickets
+    # Build count dictionaries for existing and new tickets
+    existing_ticket_counts = {}
+    for ticket in registration.tickets.all():
+        key = (ticket.attendance_type.slug, ticket.ticket_type.slug)
+        existing_ticket_counts[key] = existing_ticket_counts.get(key, 0) + 1
+
+    # Get new tickets from reg_data and count them
+    reg_data_ticket_counts = {}
+    for ticket_data in reg_data.get('tickets', []):
+        key = (ticket_data['attendance_type'], ticket_data['ticket_type'])
+        reg_data_ticket_counts[key] = reg_data_ticket_counts.get(key, 0) + 1
+
+    # Calculate tickets to add and remove
+    all_ticket_types = set(existing_ticket_counts.keys()) | set(reg_data_ticket_counts.keys())
+
+    for ticket_type in all_ticket_types:
+        existing_count = existing_ticket_counts.get(ticket_type, 0)
+        new_count = reg_data_ticket_counts.get(ticket_type, 0)
+
+        # Delete excess tickets
+        if existing_count > new_count:
+            tickets_to_delete = existing_count - new_count
+            # Get all tickets of this type
+            matching_tickets = registration.tickets.filter(
+                attendance_type__slug=ticket_type[0],
+                ticket_type__slug=ticket_type[1]
+            ).order_by('id')  # Use a consistent order for deterministic deletion
+
+            # Delete the required number
+            log(f"sync_reg: deleting {tickets_to_delete} of {ticket_type[0]}:{ticket_type[1]} of {reg_data['email']}")
+            for ticket in matching_tickets[:tickets_to_delete]:
+                ticket.delete()
+            tickets_modified = True
+
+        # Add missing tickets
+        elif new_count > existing_count:
+            tickets_to_add = new_count - existing_count
+
+            # Create the new tickets
+            log(f"sync_reg: adding {tickets_to_add} of {ticket_type[0]}:{ticket_type[1]} of {reg_data['email']}")
+            for _ in range(tickets_to_add):
+                try:
+                    RegistrationTicket.objects.create(
+                        registration=registration,
+                        attendance_type_id=ticket_type[0],
+                        ticket_type_id=ticket_type[1],
+                    )
+                    tickets_modified = True
+                except IntegrityError as e:
+                    log(f"Error adding RegistrationTicket {e}")
+    # handle nomcom volunteer
+    if reg_data['is_nomcom_volunteer'] and person:
+        try:
+            nomcom = NomCom.objects.get(is_accepting_volunteers=True)
+        except (NomCom.DoesNotExist, NomCom.MultipleObjectsReturned):
+            nomcom = None
+        if nomcom:
+            Volunteer.objects.get_or_create(
+                nomcom=nomcom,
+                person=person,
+                defaults={
+                    "affiliation": reg_data["affiliation"],
+                    "origin": "registration"
+                }
+            )
+
+    # set action_taken
+    if created:
+        log(f"sync_reg: created record. {reg_data['email']}")
+        action_taken = 'created'
+    elif fields_updated or tickets_modified:
+        action_taken = 'updated'
+
+    return registration, action_taken
+
+
+def fetch_attendance_from_meetings(meetings):
+    return [sync_registration_data(meeting) for meeting in meetings]
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index a50ba1ad93..67a81305b4 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -1,62 +1,79 @@
-# Copyright The IETF Trust 2007-2020, All Rights Reserved
+# Copyright The IETF Trust 2007-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import csv
 import datetime
-import glob
 import io
 import itertools
 import json
 import math
 import os
+
 import pytz
 import re
 import tarfile
 import tempfile
+import shutil
 
 from calendar import timegm
 from collections import OrderedDict, Counter, deque, defaultdict, namedtuple
-from urllib.parse import unquote
+from functools import partialmethod
+import jsonschema
+from pathlib import Path
+from urllib.parse import parse_qs, unquote, urlencode, urlsplit, urlunsplit, urlparse
 from tempfile import mkstemp
 from wsgiref.handlers import format_date_time
+from itertools import chain
 
 from django import forms
+from django.core.cache import caches
+from django.core.files.storage import storages
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import (HttpResponse, HttpResponseRedirect, HttpResponseForbidden,
                          HttpResponseNotFound, Http404, HttpResponseBadRequest,
-                         JsonResponse, HttpResponseGone)
+                         JsonResponse, HttpResponseGone, HttpResponseNotAllowed,
+                         FileResponse)
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ValidationError
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.validators import URLValidator
-from django.urls import reverse,reverse_lazy
+from django.urls import reverse, reverse_lazy, NoReverseMatch
 from django.db.models import F, Max, Q
 from django.forms.models import modelform_factory, inlineformset_factory
 from django.template import TemplateDoesNotExist
 from django.template.loader import render_to_string
+from django.utils import timezone
 from django.utils.encoding import force_str
-from django.utils.functional import curry
 from django.utils.text import slugify
-from django.utils.timezone import now
 from django.views.decorators.cache import cache_page
 from django.views.decorators.csrf import ensure_csrf_cookie, csrf_exempt
 from django.views.generic import RedirectView
+from rest_framework.status import HTTP_404_NOT_FOUND
 
 import debug                            # pyflakes:ignore
 
 from ietf.doc.fields import SearchableDocumentsField
-from ietf.doc.models import Document, State, DocEvent, NewRevisionDocEvent, DocAlias
+from ietf.doc.models import Document, State, DocEvent, NewRevisionDocEvent
+from ietf.doc.storage_utils import (
+    remove_from_storage,
+    retrieve_bytes,
+    store_file,
+)
 from ietf.group.models import Group
 from ietf.group.utils import can_manage_session_materials, can_manage_some_groups, can_manage_group
 from ietf.person.models import Person, User
 from ietf.ietfauth.utils import role_required, has_role, user_is_person
 from ietf.mailtrigger.utils import gather_address_lists
-from ietf.meeting.models import Meeting, Session, Schedule, FloorPlan, SessionPresentation, TimeSlot, SlideSubmission
-from ietf.meeting.models import SessionStatusName, SchedulingEvent, SchedTimeSessAssignment, Room, TimeSlotTypeName
+from ietf.meeting.models import Meeting, Session, Schedule, FloorPlan, \
+    SessionPresentation, TimeSlot, SlideSubmission, Attended
+from ..blobdb.models import ResolvedMaterial
+from ietf.meeting.models import ImportantDate, SessionStatusName, SchedulingEvent, SchedTimeSessAssignment, Room, TimeSlotTypeName
+from ietf.meeting.models import Registration
 from ietf.meeting.forms import ( CustomDurationField, SwapDaysForm, SwapTimeslotsForm, ImportMinutesForm,
-                                 TimeSlotCreateForm, TimeSlotEditForm, SessionEditForm )
+                                 TimeSlotCreateForm, TimeSlotEditForm, SessionCancelForm, SessionEditForm )
 from ietf.meeting.helpers import get_person_by_email, get_schedule_by_name
 from ietf.meeting.helpers import get_meeting, get_ietf_meeting, get_current_ietf_meeting_num
 from ietf.meeting.helpers import get_schedule, schedule_permissions
@@ -71,7 +88,14 @@
 from ietf.meeting.helpers import send_interim_approval
 from ietf.meeting.helpers import send_interim_approval_request
 from ietf.meeting.helpers import send_interim_announcement_request, sessions_post_cancel
-from ietf.meeting.utils import finalize, sort_accept_tuple, condition_slide_order
+from ietf.meeting.utils import (
+    condition_slide_order,
+    finalize,
+    generate_proceedings_content,
+    organize_proceedings_sessions,
+    resolve_uploaded_material,
+    sort_accept_tuple, store_blobs_for_one_material_doc,
+)
 from ietf.meeting.utils import add_event_info_to_session_qs
 from ietf.meeting.utils import session_time_for_sorting
 from ietf.meeting.utils import session_requested_by, SaveMaterialsError
@@ -82,27 +106,37 @@
 from ietf.meeting.utils import swap_meeting_schedule_timeslot_assignments, bulk_create_timeslots
 from ietf.meeting.utils import preprocess_meeting_important_dates
 from ietf.meeting.utils import new_doc_for_session, write_doc_for_session
+from ietf.meeting.utils import get_activity_stats, post_process, create_recording, delete_recording
+from ietf.meeting.utils import participants_for_meeting, generate_bluesheet, bluesheet_data, save_bluesheet
 from ietf.message.utils import infer_message
-from ietf.name.models import SlideSubmissionStatusName, ProceedingsMaterialTypeName, SessionPurposeName
-from ietf.secr.proceedings.proc_utils import (get_progress_stats, post_process, import_audio_files,
-    create_recording)
+from ietf.name.models import SlideSubmissionStatusName, ProceedingsMaterialTypeName, SessionPurposeName, CountryName
 from ietf.utils import markdown
 from ietf.utils.decorators import require_api_key
 from ietf.utils.hedgedoc import Note, NoteError
-from ietf.utils.history import find_history_replacements_active_at
-from ietf.utils.log import assertion
+from ietf.utils.meetecho import MeetechoAPIError, SlidesManager
+from ietf.utils.log import assertion, log
 from ietf.utils.mail import send_mail_message, send_mail_text
 from ietf.utils.mime import get_mime_type
 from ietf.utils.pipe import pipe
 from ietf.utils.pdf import pdf_pages
 from ietf.utils.response import permission_denied
 from ietf.utils.text import xslugify
+from ietf.utils.timezone import datetime_today, date_today
+from ietf.settings import YOUTUBE_DOMAINS
 
 from .forms import (InterimMeetingModelForm, InterimAnnounceForm, InterimSessionModelForm,
     InterimCancelForm, InterimSessionInlineFormSet, RequestMinutesForm,
-    UploadAgendaForm, UploadBlueSheetForm, UploadMinutesForm, UploadSlidesForm)
+    UploadAgendaForm, UploadBlueSheetForm, UploadMinutesForm, UploadSlidesForm,
+    UploadNarrativeMinutesForm)
+
+from icalendar import Calendar, Event
+from ietf.doc.templatetags.ietf_filters import absurl
+from ..api.ietf_utils import requires_api_token
+from ..blobdb.storage import BlobdbStorage, BlobFile
 
+request_summary_exclude_group_types = ['team']
 
+    
 def get_interim_menu_entries(request):
     '''Setup menu entries for interim meeting view tabs'''
     entries = []
@@ -119,6 +153,10 @@ def send_interim_change_notice(request, meeting):
     message.related_groups.add(group)
     send_mail_message(request, message)
 
+def parse_ical_line_endings(ical):
+    """Parse icalendar line endings to ensure they are RFC 5545 compliant"""
+    return re.sub(r'\r(?!\n)|(?<!\r)\n', '\r\n', ical)
+
 # -------------------------------------------------
 # View Functions
 # -------------------------------------------------
@@ -128,22 +166,23 @@ def materials(request, num=None):
     begin_date = meeting.get_submission_start_date()
     cut_off_date = meeting.get_submission_cut_off_date()
     cor_cut_off_date = meeting.get_submission_correction_date()
-    now = datetime.date.today()
-    old = datetime.datetime.now() - datetime.timedelta(days=1)
+    today_utc = date_today(datetime.UTC)
+    old = timezone.now() - datetime.timedelta(days=1)
     if settings.SERVER_MODE != 'production' and '_testoverride' in request.GET:
         pass
-    elif now > cor_cut_off_date:
+    elif today_utc > cor_cut_off_date:
         if meeting.number.isdigit() and int(meeting.number) > 96:
             return redirect('ietf.meeting.views.proceedings', num=meeting.number)
         else:
-            return render(request, "meeting/materials_upload_closed.html", {
-                'meeting_num': meeting.number,
-                'begin_date': begin_date,
-                'cut_off_date': cut_off_date,
-                'cor_cut_off_date': cor_cut_off_date
-            })
+            with timezone.override(meeting.tz()):
+                return render(request, "meeting/materials_upload_closed.html", {
+                    'meeting_num': meeting.number,
+                    'begin_date': begin_date,
+                    'cut_off_date': cut_off_date,
+                    'cor_cut_off_date': cor_cut_off_date
+                })
 
-    past_cutoff_date = datetime.date.today() > meeting.get_submission_correction_date()
+    past_cutoff_date = today_utc > meeting.get_submission_correction_date()
 
     schedule = get_schedule(meeting, None)
 
@@ -153,22 +192,23 @@ def materials(request, num=None):
     ).distinct().select_related('meeting__schedule', 'group__state', 'group__parent')).order_by('group__acronym')
 
     plenaries = sessions.filter(name__icontains='plenary')
-    ietf      = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym='edu')
+    ietf      = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym='edu').order_by('group__parent__acronym', 'group__acronym')
     irtf      = sessions.filter(group__parent__acronym = 'irtf')
     training  = sessions.filter(group__acronym__in=['edu','iaoc'], type_id__in=['regular', 'other', ])
     iab       = sessions.filter(group__parent__acronym = 'iab')
+    editorial      = sessions.filter(group__acronym__in=['rsab','rswg'])
 
-    session_pks = [s.pk for ss in [plenaries, ietf, irtf, training, iab] for s in ss]
+    session_pks = [s.pk for ss in [plenaries, ietf, irtf, training, iab, editorial] for s in ss]
     other     = sessions.filter(type__in=['regular'], group__type__features__has_meetings=True).exclude(pk__in=session_pks)
 
-    for topic in [plenaries, ietf, training, irtf, iab]:
+    for topic in [plenaries, ietf, training, irtf, iab, editorial]:
         for event in topic:
             date_list = []
             for slide_event in event.all_meeting_slides(): date_list.append(slide_event.time)
             for agenda_event in event.all_meeting_agendas(): date_list.append(agenda_event.time)
             if date_list: setattr(event, 'last_update', sorted(date_list, reverse=True)[0])
 
-    for session_list in [plenaries, ietf, training, irtf, iab, other]:
+    for session_list in [plenaries, ietf, training, irtf, iab, editorial, other]:
         for session in session_list:
             session.past_cutoff_date = past_cutoff_date
 
@@ -177,100 +217,288 @@ def materials(request, num=None):
         for type_name in ProceedingsMaterialTypeName.objects.all()
     ]
 
-    return render(request, "meeting/materials.html", {
-        'meeting': meeting,
-        'proceedings_materials': proceedings_materials,
-        'plenaries': plenaries,
-        'ietf': ietf,
-        'training': training,
-        'irtf': irtf,
-        'iab': iab,
-        'other': other,
-        'cut_off_date': cut_off_date,
-        'cor_cut_off_date': cor_cut_off_date,
-        'submission_started': now > begin_date,
-        'old': old,
-    })
+    plenaries, _ = organize_proceedings_sessions(plenaries)
+    irtf, _ = organize_proceedings_sessions(irtf)
+    training, _ = organize_proceedings_sessions(training)
+    iab, _ = organize_proceedings_sessions(iab)
+    editorial, _ = organize_proceedings_sessions(editorial)
+    other, _ = organize_proceedings_sessions(other)
+
+    ietf_areas = []
+    for area, area_sessions in itertools.groupby(
+            ietf,
+            key=lambda s: s.group.parent
+    ):
+        meeting_groups, not_meeting_groups = organize_proceedings_sessions(area_sessions)
+        ietf_areas.append((area, meeting_groups, not_meeting_groups))
+
+    with timezone.override(meeting.tz()):
+        return render(request, "meeting/materials.html", {
+            'meeting': meeting,
+            'proceedings_materials': proceedings_materials,
+            'plenaries': plenaries,
+            'ietf_areas': ietf_areas,
+            'training': training,
+            'irtf': irtf,
+            'iab': iab,
+            'editorial': editorial,
+            'other': other,
+            'cut_off_date': cut_off_date,
+            'cor_cut_off_date': cor_cut_off_date,
+            'submission_started': today_utc > begin_date,
+            'old': old,
+        })
 
 def current_materials(request):
-    today = datetime.date.today()
+    today = date_today()
     meetings = Meeting.objects.exclude(number__startswith='interim-').filter(date__lte=today).order_by('-date')
     if meetings:
         return redirect(materials, meetings[0].number)
     else:
         raise Http404('No such meeting')
 
+
+def _get_materials_doc(name, meeting=None):
+    """Get meeting materials document named by name
+
+    Raises Document.DoesNotExist if a match cannot be found. If meeting is None,
+    matches a name that is associated with _any_ meeting.
+    """
+
+    def _matches_meeting(doc, meeting=None):
+        if meeting is None:
+            return doc.get_related_meeting() is not None
+        return doc.get_related_meeting() == meeting
+
+    # try an exact match first
+    doc = Document.objects.filter(name=name).first()
+    if doc is not None and _matches_meeting(doc, meeting):
+        return doc, None
+
+    # try parsing a rev number
+    if "-" in name:
+        docname, rev = name.rsplit("-", 1)
+        if len(rev) == 2 and rev.isdigit():
+            doc = Document.objects.get(name=docname)  # may raise Document.DoesNotExist
+            if (
+                _matches_meeting(doc, meeting)
+                and rev in doc.revisions_by_newrevisionevent()
+            ):
+                return doc, rev
+    # give up
+    raise Document.DoesNotExist
+
+
 @cache_page(1 * 60)
 def materials_document(request, document, num=None, ext=None):
-    meeting=get_meeting(num,type_in=['ietf','interim'])
-    num = meeting.number
-    if (re.search(r'^\w+-\d+-.+-\d\d$', document) or
-        re.search(r'^\w+-interim-\d+-.+-\d\d-\d\d$', document) or
-        re.search(r'^\w+-interim-\d+-.+-sess[a-z]-\d\d$', document) or
-        re.search(r'^minutes-interim-\d+-.+-\d\d$', document) or
-        re.search(r'^slides-interim-\d+-.+-\d\d$', document)):
-        name, rev = document.rsplit('-', 1)
-    else:
-        name, rev = document, None
-    # This view does not allow the use of DocAliases. Right now we are probably only creating one (identity) alias, but that may not hold in the future.
-    doc = Document.objects.filter(name=name).first()
-    # Handle edge case where the above name, rev splitter misidentifies the end of a document name as a revision mumber
-    if not doc:
-        if rev:
-            name = name + '-' + rev
-            rev = None
-            doc = get_object_or_404(Document, name=name)
-        else:
-            raise Http404("No such document")
+    """Materials document view
 
-    if not doc.meeting_related():
-        raise Http404("Not a meeting related document")
-    if doc.get_related_meeting() != meeting:
+    :param request: Django request
+    :param document: Name of document without an extension
+    :param num: meeting number
+    :param ext: extension including preceding '.'
+    """
+    meeting = get_meeting(num, type_in=["ietf", "interim"])
+    num = meeting.number
+    try:
+        doc, rev = _get_materials_doc(name=document, meeting=meeting)
+    except Document.DoesNotExist:
         raise Http404("No such document for meeting %s" % num)
+
     if not rev:
-        filename = doc.get_file_name()
+        filename = Path(doc.get_file_name())
     else:
-        filename = os.path.join(doc.get_file_path(), document)
+        filename = Path(doc.get_file_path()) / document
     if ext:
-        if not filename.endswith(ext):
-            name, _ = os.path.splitext(filename)
-            filename = name + ext
-    else:
-        filenames = glob.glob(filename+'.*')
-        if filenames:
-            filename = filenames[0]
-    _, basename = os.path.split(filename)
-    if not os.path.exists(filename):
-        raise Http404("File not found: %s" % filename)
+        filename = filename.with_suffix(ext)
+    elif filename.suffix == "":
+        # If we don't already have an extension, try to add one
+        ext_choices = {
+            # Construct a map from suffix to full filename
+            fn.suffix: fn
+            for fn in sorted(filename.parent.glob(filename.stem + ".*"))
+        }
+        if len(ext_choices) > 0:
+            if ".pdf" in ext_choices:
+                filename = ext_choices[".pdf"]
+            else:
+                filename = list(ext_choices.values())[0]
+    if not filename.exists():
+        raise Http404(f"File not found: {filename}")
 
     old_proceedings_format = meeting.number.isdigit() and int(meeting.number) <= 96
     if settings.MEETING_MATERIALS_SERVE_LOCALLY or old_proceedings_format:
-        with io.open(filename, 'rb') as file:
-            bytes = file.read()
-        
-        mtype, chset = get_mime_type(bytes)
+        bytes = filename.read_bytes()
+        mtype, chset = get_mime_type(bytes)  # chset does not consider entire file!
         content_type = "%s; charset=%s" % (mtype, chset)
 
-        file_ext = os.path.splitext(filename)
-        if len(file_ext) == 2 and file_ext[1] == '.md' and mtype == 'text/plain':
-            sorted_accept = sort_accept_tuple(request.META.get('HTTP_ACCEPT'))
+        if filename.suffix == ".md" and mtype == "text/plain":
+            sorted_accept = sort_accept_tuple(request.META.get("HTTP_ACCEPT"))
             for atype in sorted_accept:
-                if atype[0] == 'text/markdown':
-                    content_type = content_type.replace('plain', 'markdown', 1)
-                    break;
-                elif atype[0] == 'text/html':
-                    bytes = "<html>\n<head><base target=\"_blank\" /></head>\n<body>\n%s\n</body>\n</html>\n" % markdown.markdown(bytes.decode())
-                    content_type = content_type.replace('plain', 'html', 1)
-                    break;
-                elif atype[0] == 'text/plain':
-                    break;
+                if atype[0] == "text/markdown":
+                    content_type = content_type.replace("plain", "markdown", 1)
+                    break
+                elif atype[0] == "text/html":
+                    # Render markdown, allowing that charset may be inaccurate.
+                    try:
+                        md_src = bytes.decode(
+                            "utf-8" if chset in ["ascii", "us-ascii"] else chset
+                        )
+                    except UnicodeDecodeError:
+                        # latin-1, aka iso8859-1, accepts all 8-bit code points
+                        md_src = bytes.decode("latin-1")
+                    content = markdown.markdown(md_src)  # a string
+                    bytes = render_to_string(
+                        "minimal.html",
+                        {
+                            "content": content,
+                            "title": filename.name,
+                            "static_ietf_org": settings.STATIC_IETF_ORG,
+                        },
+                    ).encode("utf-8")
+                    content_type = "text/html; charset=utf-8"
+                    break
+                elif atype[0] == "text/plain":
+                    break
 
         response = HttpResponse(bytes, content_type=content_type)
-        response['Content-Disposition'] = 'inline; filename="%s"' % basename
+        response["Content-Disposition"] = f'inline; filename="{filename.name}"'
         return response
     else:
         return HttpResponseRedirect(redirect_to=doc.get_href(meeting=meeting))
 
+
+@requires_api_token("ietf.meeting.views.api_resolve_materials_name")
+def api_resolve_materials_name_cached(request, document, num=None, ext=None):
+    """Resolve materials name into document to a blob spec
+
+    Returns the bucket/name of a blob in the blob store that corresponds to the named
+    document. Handles resolution of revision if it is not specified and determines the
+    best extension if one is not provided. Response is JSON.
+
+    As of 2025-10-10 we do not have blobs for all materials documents or for every
+    format of every document. This API still returns the bucket/name as if the blob
+    exists. Another API will allow the caller to obtain the file contents using that
+    name if it cannot be retrieved from the blob store.
+    """
+
+    def _error_response(status: int, detail: str):
+        return JsonResponse(
+            {
+                "status": status,
+                "title": "Error",
+                "detail": detail,
+            },
+            status=status,
+        )
+
+    def _response(bucket: str, name: str):
+        return JsonResponse(
+            {
+                "bucket": bucket,
+                "name": name,
+            }
+        )
+
+    try:
+        resolved = ResolvedMaterial.objects.get(
+            meeting_number=num, name=document
+        )
+    except ResolvedMaterial.DoesNotExist:
+        return _error_response(
+            HTTP_404_NOT_FOUND, f"No suitable file for {document} for meeting {num}"
+        )
+    return _response(bucket=resolved.bucket, name=resolved.blob)
+
+
+@requires_api_token
+def api_retrieve_materials_blob(request, bucket, name):
+    """Retrieve contents of a meeting materials blob
+    
+    This is intended as a fallback if the web worker cannot retrieve a blob from
+    the blobstore itself. The most likely cause is retrieving an old materials document
+    that has not been backfilled.
+    
+    If a blob is requested that does not exist, this checks for it on the filesystem
+    and if found, adds it to the blobstore, creates a StoredObject record, and returns
+    the contents as it would have done if the blob was already present.
+    
+    As a special case, if a requested file with extension `.md.html` does not exist
+    but a file with the same name but extension `.md` does, `.md` file will be rendered
+    from markdown to html and returned / stored.
+    """
+    DEFAULT_CONTENT_TYPES = {
+        ".html": "text/html;charset=utf-8",
+        ".md": "text/markdown;charset=utf-8",
+        ".pdf": "application/pdf",
+        ".txt": "text/plain;charset=utf-8",
+    }
+    
+    def _default_content_type(blob_name: str):
+        return DEFAULT_CONTENT_TYPES.get(Path(name).suffix, "application/octet-stream") 
+
+    if not (
+        settings.ENABLE_BLOBSTORAGE
+        and bucket in settings.MATERIALS_TYPES_SERVED_BY_WORKER
+    ):
+        return HttpResponseNotFound(f"Bucket {bucket} not found.")
+    storage = storages[bucket]  # if not configured, a server error will result
+    assert isinstance(storage, BlobdbStorage)
+    try:
+        blob = storage.open(name, "rb")
+    except FileNotFoundError:
+        pass
+    else:
+        # found the blob - return it
+        assert isinstance(blob, BlobFile)
+        log(f"Materials blob: directly returning {bucket}:{name}")
+        return FileResponse(
+            blob,
+            filename=name,
+            content_type=blob.content_type or _default_content_type(name),
+        )
+    
+    # Did not find the blob. Create it if we can 
+    name_as_path = Path(name)
+    if name_as_path.suffixes == [".md", ".html"]:
+        # special case: .md.html means we want to create the .md and the .md.html
+        # will come along as a bonus
+        name_to_store = name_as_path.stem  # removes the .html
+    else:
+        name_to_store = name
+    
+    # See if we have a meeting-related document that matches the requested bucket and
+    # name.
+    try: 
+        doc, rev = _get_materials_doc(Path(name_to_store).stem)
+        if doc.type_id != bucket:
+            raise Document.DoesNotExist
+    except Document.DoesNotExist:
+        log(f"Materials blob: no doc for {bucket}:{name}")
+        return HttpResponseNotFound(
+            f"Document corresponding to {bucket}:{name} not found."
+        )
+    else:
+        # create all missing blobs for the doc while we're at it
+        log(f"Materials blob: storing blobs for {doc.name}-{doc.rev}")
+        store_blobs_for_one_material_doc(doc)
+    
+    # If we can make the blob at all, it now exists, so return it or a 404
+    try:
+        blob = storage.open(name, "rb")
+    except FileNotFoundError:
+        log(f"Materials blob: no blob for {bucket}:{name}")
+        return HttpResponseNotFound(f"Object {bucket}:{name} not found.")
+    else:
+        # found the blob - return it
+        assert isinstance(blob, BlobFile)
+        return FileResponse(
+            blob,
+            filename=name,
+            content_type=blob.content_type or _default_content_type(name),
+        )
+    
+
 @login_required
 def materials_editable_groups(request, num=None):
     meeting = get_meeting(num)
@@ -280,62 +508,69 @@ def materials_editable_groups(request, num=None):
 
 @role_required('Secretariat')
 def edit_timeslots(request, num=None):
-
     meeting = get_meeting(num)
+    if 'sched' in request.GET:
+        schedule = Schedule.objects.filter(pk=request.GET.get('sched', None)).first()
+        schedule_edit_url = _schedule_edit_url(meeting, schedule)
+    else:
+        schedule_edit_url = None
+
+    with timezone.override(meeting.tz()):
+        if request.method == 'POST':
+            # handle AJAX requests
+            action = request.POST.get('action')
+            if action == 'delete':
+                # delete a timeslot
+                # Parameters:
+                #   slot_id: comma-separated list of TimeSlot PKs to delete
+                slot_id = request.POST.get('slot_id')
+                if slot_id is None:
+                    return HttpResponseBadRequest('missing slot_id')
+                slot_ids = [id.strip() for id in slot_id.split(',')]
+                try:
+                    timeslots = meeting.timeslot_set.filter(pk__in=slot_ids)
+                except ValueError:
+                    return HttpResponseBadRequest('invalid slot_id specification')
+                missing_ids = set(slot_ids).difference(str(ts.pk) for ts in timeslots)
+                if len(missing_ids) != 0:
+                    return HttpResponseNotFound('TimeSlot ids not found in meeting {}: {}'.format(
+                        meeting.number,
+                        ', '.join(sorted(missing_ids))
+                    ))
+                timeslots.delete()
+                return HttpResponse(content='; '.join('Deleted TimeSlot {}'.format(id) for id in slot_ids))
+            else:
+                return HttpResponseBadRequest('unknown action')
+
+        # Labels here differ from those in the build_timeslices() method. The labels here are
+        # relative to the table: time_slices are the row headings (ie, days), date_slices are
+        # the column headings (i.e., time intervals), and slots are the per-day list of timeslots
+        # (with only one timeslot per unique time/duration)
+        time_slices, date_slices, slots = meeting.build_timeslices()
+
+        ts_list = deque()
+        rooms = meeting.room_set.order_by("capacity","name","id")
+        for room in rooms:
+            for day in time_slices:
+                for slice in date_slices[day]:
+                    ts_list.append(room.timeslot_set.filter(time=slice[0],duration=datetime.timedelta(seconds=slice[2])))
+
+        # Grab these in one query each to identify sessions that are in use and should be handled with care
+        ts_with_official_assignments = meeting.timeslot_set.filter(sessionassignments__schedule=meeting.schedule)
+        ts_with_any_assignments = meeting.timeslot_set.filter(sessionassignments__isnull=False)
+
+        return render(request, "meeting/timeslot_edit.html",
+                                             {"rooms":rooms,
+                                              "time_slices":time_slices,
+                                              "slot_slices": slots,
+                                              "date_slices":date_slices,
+                                              "meeting":meeting,
+                                              "schedule_edit_url": schedule_edit_url,
+                                              "ts_list":ts_list,
+                                              "ts_with_official_assignments": ts_with_official_assignments,
+                                              "ts_with_any_assignments": ts_with_any_assignments,
+                                          })
 
-    if request.method == 'POST':
-        # handle AJAX requests
-        action = request.POST.get('action')
-        if action == 'delete':
-            # delete a timeslot
-            # Parameters:
-            #   slot_id: comma-separated list of TimeSlot PKs to delete
-            slot_id = request.POST.get('slot_id')
-            if slot_id is None:
-                return HttpResponseBadRequest('missing slot_id')
-            slot_ids = [id.strip() for id in slot_id.split(',')]
-            try:
-                timeslots = meeting.timeslot_set.filter(pk__in=slot_ids)
-            except ValueError:
-                return HttpResponseBadRequest('invalid slot_id specification')
-            missing_ids = set(slot_ids).difference(str(ts.pk) for ts in timeslots)
-            if len(missing_ids) != 0:
-                return HttpResponseNotFound('TimeSlot ids not found in meeting {}: {}'.format(
-                    meeting.number,
-                    ', '.join(sorted(missing_ids))
-                ))
-            timeslots.delete()
-            return HttpResponse(content='; '.join('Deleted TimeSlot {}'.format(id) for id in slot_ids))
-        else:
-            return HttpResponseBadRequest('unknown action')
-
-    # Labels here differ from those in the build_timeslices() method. The labels here are
-    # relative to the table: time_slices are the row headings (ie, days), date_slices are
-    # the column headings (i.e., time intervals), and slots are the per-day list of timeslots
-    # (with only one timeslot per unique time/duration)
-    time_slices, date_slices, slots = meeting.build_timeslices()
-
-    ts_list = deque()
-    rooms = meeting.room_set.order_by("capacity","name","id")
-    for room in rooms:
-        for day in time_slices:
-            for slice in date_slices[day]:
-                ts_list.append(room.timeslot_set.filter(time=slice[0],duration=datetime.timedelta(seconds=slice[2])))
-
-    # Grab these in one query each to identify sessions that are in use and should be handled with care
-    ts_with_official_assignments = meeting.timeslot_set.filter(sessionassignments__schedule=meeting.schedule)
-    ts_with_any_assignments = meeting.timeslot_set.filter(sessionassignments__isnull=False)
-    
-    return render(request, "meeting/timeslot_edit.html",
-                                         {"rooms":rooms,
-                                          "time_slices":time_slices,
-                                          "slot_slices": slots,
-                                          "date_slices":date_slices,
-                                          "meeting":meeting,
-                                          "ts_list":ts_list,
-                                          "ts_with_official_assignments": ts_with_official_assignments,
-                                          "ts_with_any_assignments": ts_with_any_assignments,
-                                      })
 
 class NewScheduleForm(forms.ModelForm):
     class Meta:
@@ -429,7 +664,6 @@ def edit_meeting_schedule(request, num=None, owner=None, name=None):
     """
     # Need to coordinate this list with types of session requests
     # that can be created (see, e.g., SessionQuerySet.requests())
-    IGNORE_TIMESLOT_TYPES = ('offagenda', 'reserved', 'unavail')
     meeting = get_meeting(num)
     if name is None:
         schedule = meeting.schedule
@@ -443,9 +677,7 @@ def edit_meeting_schedule(request, num=None, owner=None, name=None):
 
     lock_time = settings.MEETING_SESSION_LOCK_TIME
     def timeslot_locked(ts):
-        meeting_now = now().astimezone(pytz.timezone(meeting.time_zone))
-        if not settings.USE_TZ:
-            meeting_now = meeting_now.replace(tzinfo=None)
+        meeting_now = timezone.now().astimezone(meeting.tz())
         return schedule.is_official and (ts.time - meeting_now < lock_time)
 
     if not can_see:
@@ -479,18 +711,18 @@ def timeslot_locked(ts):
 
     tombstone_states = ['canceled', 'canceledpa', 'resched']
 
-    sessions = Session.objects.filter(meeting=meeting)
+    sessions = meeting.session_set.with_current_status()
     if include_timeslot_types is not None:
         sessions = sessions.filter(type__in=include_timeslot_types)
+    sessions_to_schedule = sessions.that_can_be_scheduled()
+    session_tombstones = sessions.filter(
+        current_status__in=tombstone_states, pk__in={a.session_id for a in assignments}
+    )
+    sessions = sessions_to_schedule | session_tombstones
     sessions = add_event_info_to_session_qs(
-        sessions.exclude(
-            type__in=IGNORE_TIMESLOT_TYPES,
-        ).order_by('pk'),
+        sessions.order_by('pk'),
         requested_time=True,
         requested_by=True,
-    ).filter(
-        Q(current_status__in=['appr', 'schedw', 'scheda', 'sched'])
-        | Q(current_status__in=tombstone_states, pk__in={a.session_id for a in assignments})
     ).prefetch_related(
         'resources', 'group', 'group__parent', 'group__type', 'joint_with_groups', 'purpose',
     )
@@ -498,9 +730,7 @@ def timeslot_locked(ts):
     timeslots_qs = TimeSlot.objects.filter(meeting=meeting)
     if include_timeslot_types is not None:
         timeslots_qs = timeslots_qs.filter(type__in=include_timeslot_types)
-    timeslots_qs = timeslots_qs.exclude(
-        type__in=IGNORE_TIMESLOT_TYPES,
-    ).prefetch_related('type').order_by('location', 'time', 'name')
+    timeslots_qs = timeslots_qs.that_can_be_scheduled().prefetch_related('type').order_by('location', 'time', 'name')
 
     if timeslots_qs.count() > 0:
         min_duration = min(t.duration for t in timeslots_qs)
@@ -642,7 +872,7 @@ def prepare_timeslots_for_display(timeslots, rooms):
             rd = room_data[t.location_id]
             rd['timeslot_count'] += 1
             rd['start_and_duration'].append((t.time, t.duration))
-            ttd = t.time.date()
+            ttd = t.local_start_time().date()  # date in meeting timezone
             all_days.add(ttd)
             if ttd not in rd['timeslots_by_day']:
                 rd['timeslots_by_day'][ttd] = []
@@ -662,7 +892,9 @@ def prepare_timeslots_for_display(timeslots, rooms):
         sorted_rooms = sorted(
             rooms_with_timeslots,
             key=lambda room: (
-                # First, sort regular session rooms ahead of others - these will usually
+                # Sort lower capacity rooms first.
+                room.capacity if room.capacity is not None else math.inf,  # sort rooms with capacity = None at end
+                # Sort regular session rooms ahead of others - these will usually
                 # have more timeslots than other room types.
                 0 if room_data[room.pk]['timeslot_count'] == max_timeslots else 1,
                 # Sort rooms with earlier timeslots ahead of later
@@ -672,8 +904,6 @@ def prepare_timeslots_for_display(timeslots, rooms):
                 # Sort by list of starting time and duration so that groups with identical
                 # timeslot structure will be neighbors. The grouping algorithm relies on this!
                 room_data[room.pk]['start_and_duration'],
-                # Within each group, sort higher capacity rooms first.
-                room.capacity,
                 # Finally, sort alphabetically by name
                 room.name
             )
@@ -786,7 +1016,7 @@ def _json_response(success, status=None, **extra_data):
                         timeslot=old_timeslot,
                     )
 
-                existing_assignments.update(timeslot=timeslot, modified=datetime.datetime.now())
+                existing_assignments.update(timeslot=timeslot, modified=timezone.now())
             else:
                 SchedTimeSessAssignment.objects.create(
                     session=session,
@@ -827,8 +1057,8 @@ def _json_response(success, status=None, **extra_data):
             source_day = swap_days_form.cleaned_data['source_day']
             target_day = swap_days_form.cleaned_data['target_day']
 
-            source_timeslots = [ts for ts in timeslots_qs if ts.time.date() == source_day]
-            target_timeslots = [ts for ts in timeslots_qs if ts.time.date() == target_day]
+            source_timeslots = [ts for ts in timeslots_qs if ts.local_start_time().date() == source_day]
+            target_timeslots = [ts for ts in timeslots_qs if ts.local_start_time().date() == target_day]
             if any(timeslot_locked(ts) for ts in source_timeslots + target_timeslots):
                 return HttpResponseBadRequest("Can't swap these days.")
 
@@ -885,8 +1115,8 @@ def _json_response(success, status=None, **extra_data):
     # possible timeslot start/ends
     timeslot_groups = defaultdict(set)
     for ts in timeslots_qs:
-        ts.start_end_group = "ts-group-{}-{}".format(ts.time.strftime("%Y%m%d-%H%M"), int(ts.duration.total_seconds() / 60))
-        timeslot_groups[ts.time.date()].add((ts.time, ts.end_time(), ts.start_end_group))
+        ts.start_end_group = "ts-group-{}-{}".format(ts.local_start_time().strftime("%Y%m%d-%H%M"), int(ts.duration.total_seconds() / 60))
+        timeslot_groups[ts.local_start_time().date()].add((ts.local_start_time(), ts.local_end_time(), ts.start_end_group))
 
     # prepare sessions
     prepare_sessions_for_display(sessions)
@@ -936,6 +1166,7 @@ def cubehelix(i, total, hue=1.2, start_angle=0.5):
         'rtg' : { 'dark' : (222, 219, 124) , 'light' : (247, 247, 233) },
         'sec' : { 'dark' : (0, 114, 178) , 'light' : (245, 252, 248) },
         'tsv' : { 'dark' : (117,201,119) , 'light' : (251, 252, 255) },
+        'wit' : { 'dark' : (117,201,119) , 'light' : (251, 252, 255) }, # intentionally the same as tsv
     }    
     for i, p in enumerate(session_parents):
         if p.acronym in liz_preferred_colors:
@@ -967,22 +1198,23 @@ def cubehelix(i, total, hue=1.2, start_angle=0.5):
             if ts_type.slug in session_data.get('enabled_timeslot_types', [])
         ]
 
-    return render(request, "meeting/edit_meeting_schedule.html", {
-        'meeting': meeting,
-        'schedule': schedule,
-        'can_edit': can_edit,
-        'can_edit_properties': can_edit or secretariat,
-        'secretariat': secretariat,
-        'days': days,
-        'timeslot_groups': sorted((d, list(sorted(t_groups))) for d, t_groups in timeslot_groups.items()),
-        'unassigned_sessions': unassigned_sessions,
-        'session_parents': session_parents,
-        'session_purposes': session_purposes,
-        'timeslot_types': timeslot_types,
-        'hide_menu': True,
-        'lock_time': lock_time,
-        'enabled_timeslot_types': enabled_timeslot_types,
-    })
+    with timezone.override(meeting.tz()):
+        return render(request, "meeting/edit_meeting_schedule.html", {
+            'meeting': meeting,
+            'schedule': schedule,
+            'can_edit': can_edit,
+            'can_edit_properties': can_edit or secretariat,
+            'secretariat': secretariat,
+            'days': days,
+            'timeslot_groups': sorted((d, list(sorted(t_groups))) for d, t_groups in timeslot_groups.items()),
+            'unassigned_sessions': unassigned_sessions,
+            'session_parents': session_parents,
+            'session_purposes': session_purposes,
+            'timeslot_types': timeslot_types,
+            'hide_menu': True,
+            'lock_time': lock_time,
+            'enabled_timeslot_types': enabled_timeslot_types,
+        })
 
 
 class RoomNameModelChoiceField(forms.ModelChoiceField):
@@ -990,7 +1222,7 @@ def label_from_instance(self, obj):
         return obj.name
 
 class TimeSlotForm(forms.Form):
-    day = forms.TypedChoiceField(coerce=lambda t: datetime.datetime.strptime(t, "%Y-%m-%d").date())
+    day = forms.TypedChoiceField(coerce=lambda t: datetime.datetime.strptime(t, "%Y-%m-%d").date())  # all dates, no tz
     time = forms.TimeField()
     duration = CustomDurationField() # this is just to make 1:30 turn into 1.5 hours instead of 1.5 minutes
     location = RoomNameModelChoiceField(queryset=Room.objects.all(), required=False, empty_label="(No location)")
@@ -1030,8 +1262,8 @@ def __init__(self, meeting, schedule, *args, timeslot=None, **kwargs):
 
         if timeslot:
             self.initial = {
-                'day': timeslot.time.date(),
-                'time': timeslot.time.time(),
+                'day': timeslot.local_start_time().date(),
+                'time': timeslot.local_start_time().time(),
                 'duration': timeslot.duration,
                 'location': timeslot.location_id,
                 'show_location': timeslot.show_location,
@@ -1110,230 +1342,239 @@ def edit_meeting_timeslots_and_misc_sessions(request, num=None, owner=None, name
 
     can_edit = has_role(request.user, 'Secretariat')
 
-    if request.method == 'GET' and request.GET.get('action') == "edit-timeslot":
-        timeslot_pk = request.GET.get('timeslot')
-        if not timeslot_pk or not timeslot_pk.isdecimal():
-            raise Http404
-        timeslot = get_object_or_404(timeslot_qs, pk=timeslot_pk)
-
-        assigned_session = add_event_info_to_session_qs(Session.objects.filter(
-            timeslotassignments__schedule__in=[schedule, schedule.base],
-            timeslotassignments__timeslot=timeslot,
-        )).first()
-
-        timeslot.can_cancel = not assigned_session or assigned_session.current_status not in ['canceled', 'canceled', 'resched']
-
-        return JsonResponse({
-            'form': render_to_string("meeting/edit_timeslot_form.html", {
-                'timeslot_form_action': 'edit',
-                'timeslot_form': TimeSlotForm(meeting, schedule, timeslot=timeslot),
-                'timeslot': timeslot,
-                'schedule': schedule,
-                'meeting': meeting,
-                'can_edit': can_edit,
-            }, request=request)
-        })
+    with timezone.override(meeting.tz()):
+        if request.method == 'GET' and request.GET.get('action') == "edit-timeslot":
+            timeslot_pk = request.GET.get('timeslot')
+            if not timeslot_pk or not timeslot_pk.isdecimal():
+                raise Http404
+            timeslot = get_object_or_404(timeslot_qs, pk=timeslot_pk)
 
-    scroll = request.POST.get('scroll')
-
-    def redirect_with_scroll():
-        url = request.get_full_path()
-        if scroll and scroll.isdecimal():
-            url += "#scroll={}".format(scroll)
-        return HttpResponseRedirect(url)
-
-    add_timeslot_form = None
-    if request.method == 'POST' and request.POST.get('action') == 'add-timeslot' and can_edit:
-        add_timeslot_form = TimeSlotForm(meeting, schedule, request.POST)
-        if add_timeslot_form.is_valid():
-            c = add_timeslot_form.cleaned_data
-
-            timeslot, created = TimeSlot.objects.get_or_create(
-                meeting=meeting,
-                type=c['type'],
-                name=c['name'],
-                time=datetime.datetime.combine(c['day'], c['time']),
-                duration=c['duration'],
-                location=c['location'],
-                show_location=c['show_location'],
-            )
+            assigned_session = add_event_info_to_session_qs(Session.objects.filter(
+                timeslotassignments__schedule__in=[schedule, schedule.base],
+                timeslotassignments__timeslot=timeslot,
+            )).first()
+
+            timeslot.can_cancel = not assigned_session or assigned_session.current_status not in ['canceled', 'canceled', 'resched']
+
+            return JsonResponse({
+                'form': render_to_string("meeting/edit_timeslot_form.html", {
+                    'timeslot_form_action': 'edit',
+                    'timeslot_form': TimeSlotForm(meeting, schedule, timeslot=timeslot),
+                    'timeslot': timeslot,
+                    'schedule': schedule,
+                    'meeting': meeting,
+                    'can_edit': can_edit,
+                }, request=request)
+            })
 
-            if timeslot.type_id != 'regular':
-                if not created:
-                    Session.objects.filter(timeslotassignments__timeslot=timeslot).delete()
+        scroll = request.POST.get('scroll')
+
+        def redirect_with_scroll():
+            url = request.get_full_path()
+            if scroll and scroll.isdecimal():
+                url += "#scroll={}".format(scroll)
+            return HttpResponseRedirect(url)
 
-                session = Session.objects.create(
+        add_timeslot_form = None
+        if request.method == 'POST' and request.POST.get('action') == 'add-timeslot' and can_edit:
+            add_timeslot_form = TimeSlotForm(meeting, schedule, request.POST)
+            if add_timeslot_form.is_valid():
+                c = add_timeslot_form.cleaned_data
+
+                timeslot, created = TimeSlot.objects.get_or_create(
                     meeting=meeting,
-                    name=c['name'],
-                    short=c['short'],
-                    group=c['group'],
                     type=c['type'],
-                    purpose=c['purpose'],
-                    agenda_note=c.get('agenda_note') or "",
-                )
-
-                SchedulingEvent.objects.create(
-                    session=session,
-                    status=SessionStatusName.objects.get(slug='sched'),
-                    by=request.user.person,
+                    name=c['name'],
+                    time=meeting.tz().localize(datetime.datetime.combine(c['day'], c['time'])),
+                    duration=c['duration'],
+                    location=c['location'],
+                    show_location=c['show_location'],
                 )
 
-                SchedTimeSessAssignment.objects.create(
-                    timeslot=timeslot,
-                    session=session,
-                    schedule=schedule
-                )
+                if timeslot.type_id != 'regular':
+                    if not created:
+                        Session.objects.filter(timeslotassignments__timeslot=timeslot).delete()
+
+                    session = Session.objects.create(
+                        meeting=meeting,
+                        name=c['name'],
+                        short=c['short'],
+                        group=c['group'],
+                        type=c['type'],
+                        purpose=c['purpose'],
+                        agenda_note=c.get('agenda_note') or "",
+                    )
 
-            return redirect_with_scroll()
+                    SchedulingEvent.objects.create(
+                        session=session,
+                        status=SessionStatusName.objects.get(slug='sched'),
+                        by=request.user.person,
+                    )
 
-    edit_timeslot_form = None
-    if request.method == 'POST' and request.POST.get('action') == 'edit-timeslot' and can_edit:
-        timeslot_pk = request.POST.get('timeslot')
-        if not timeslot_pk or not timeslot_pk.isdecimal():
-            raise Http404
+                    SchedTimeSessAssignment.objects.create(
+                        timeslot=timeslot,
+                        session=session,
+                        schedule=schedule
+                    )
 
-        timeslot = get_object_or_404(TimeSlot, pk=timeslot_pk)
+                return redirect_with_scroll()
+
+        edit_timeslot_form = None
+        if request.method == 'POST' and request.POST.get('action') == 'edit-timeslot' and can_edit:
+            timeslot_pk = request.POST.get('timeslot')
+            if not timeslot_pk or not timeslot_pk.isdecimal():
+                raise Http404
+
+            timeslot = get_object_or_404(TimeSlot, pk=timeslot_pk)
+
+            edit_timeslot_form = TimeSlotForm(meeting, schedule, request.POST, timeslot=timeslot)
+            if edit_timeslot_form.is_valid() and edit_timeslot_form.active_assignment.schedule_id == schedule.pk:
+
+                c = edit_timeslot_form.cleaned_data
+
+                timeslot.type = c['type']
+                timeslot.name = c['name']
+                timeslot.time = meeting.tz().localize(datetime.datetime.combine(c['day'], c['time']))
+                timeslot.duration = c['duration']
+                timeslot.location = c['location']
+                timeslot.show_location = c['show_location']
+                timeslot.save()
+
+                session = Session.objects.filter(
+                    timeslotassignments__schedule__in=[schedule, schedule.base if schedule else None],
+                    timeslotassignments__timeslot=timeslot,
+                ).select_related('group').first()
+
+                if session:
+                    if timeslot.type_id != 'regular':
+                        session.name = c['name']
+                        session.short = c['short']
+                        session.group = c['group']
+                        session.type = c['type']
+                    session.agenda_note = c.get('agenda_note') or ""
+                    session.save()
 
-        edit_timeslot_form = TimeSlotForm(meeting, schedule, request.POST, timeslot=timeslot)
-        if edit_timeslot_form.is_valid() and edit_timeslot_form.active_assignment.schedule_id == schedule.pk:
+                return redirect_with_scroll()
 
-            c = edit_timeslot_form.cleaned_data
+        if request.method == 'POST' and request.POST.get('action') == 'cancel-timeslot' and can_edit:
+            timeslot_pk = request.POST.get('timeslot')
+            if not timeslot_pk or not timeslot_pk.isdecimal():
+                raise Http404
 
-            timeslot.type = c['type']
-            timeslot.name = c['name']
-            timeslot.time = datetime.datetime.combine(c['day'], c['time'])
-            timeslot.duration = c['duration']
-            timeslot.location = c['location']
-            timeslot.show_location = c['show_location']
-            timeslot.save()
+            timeslot = get_object_or_404(TimeSlot, pk=timeslot_pk)
+            if timeslot.type_id != 'break':
+                sessions = add_event_info_to_session_qs(
+                    Session.objects.filter(timeslotassignments__schedule=schedule, timeslotassignments__timeslot=timeslot),
+                ).exclude(current_status__in=['canceled', 'resched'])
+                for session in sessions:
+                    SchedulingEvent.objects.create(
+                        session=session,
+                        status=SessionStatusName.objects.get(slug='canceled'),
+                        by=request.user.person,
+                    )
 
-            session = Session.objects.filter(
-                timeslotassignments__schedule__in=[schedule, schedule.base if schedule else None],
-                timeslotassignments__timeslot=timeslot,
-            ).select_related('group').first()
+            return redirect_with_scroll()
 
-            if session:
-                if timeslot.type_id != 'regular':
-                    session.name = c['name']
-                    session.short = c['short']
-                    session.group = c['group']
-                    session.type = c['type']
-                session.agenda_note = c.get('agenda_note') or ""
-                session.save()
+        if request.method == 'POST' and request.POST.get('action') == 'delete-timeslot' and can_edit:
+            timeslot_pk = request.POST.get('timeslot')
+            if not timeslot_pk or not timeslot_pk.isdecimal():
+                raise Http404
 
-            return redirect_with_scroll()
+            timeslot = get_object_or_404(TimeSlot, pk=timeslot_pk)
 
-    if request.method == 'POST' and request.POST.get('action') == 'cancel-timeslot' and can_edit:
-        timeslot_pk = request.POST.get('timeslot')
-        if not timeslot_pk or not timeslot_pk.isdecimal():
-            raise Http404
+            if timeslot.type_id != 'regular':
+                for session in Session.objects.filter(timeslotassignments__schedule=schedule, timeslotassignments__timeslot=timeslot):
+                    for doc in session.materials.all():
+                        doc.set_state(State.objects.get(type=doc.type_id, slug='deleted'))
+                        e = DocEvent(doc=doc, rev=doc.rev, by=request.user.person, type='deleted')
+                        e.desc = "Deleted meeting session"
+                        e.save()
 
-        timeslot = get_object_or_404(TimeSlot, pk=timeslot_pk)
-        if timeslot.type_id != 'break':
-            sessions = add_event_info_to_session_qs(
-                Session.objects.filter(timeslotassignments__schedule=schedule, timeslotassignments__timeslot=timeslot),
-            ).exclude(current_status__in=['canceled', 'resched'])
-            for session in sessions:
-                SchedulingEvent.objects.create(
-                    session=session,
-                    status=SessionStatusName.objects.get(slug='canceled'),
-                    by=request.user.person,
-                )
+                    session.delete()
 
-        return redirect_with_scroll()
+            timeslot.delete()
 
-    if request.method == 'POST' and request.POST.get('action') == 'delete-timeslot' and can_edit:
-        timeslot_pk = request.POST.get('timeslot')
-        if not timeslot_pk or not timeslot_pk.isdecimal():
-            raise Http404
+            return redirect_with_scroll()
 
-        timeslot = get_object_or_404(TimeSlot, pk=timeslot_pk)
+        sessions_by_pk = {
+            s.pk: s for s in
+            add_event_info_to_session_qs(
+                Session.objects.filter(
+                    meeting=meeting,
+                ).order_by('pk'),
+                requested_time=True,
+                requested_by=True,
+            ).filter(
+                current_status__in=['appr', 'schedw', 'scheda', 'sched', 'canceled', 'canceledpa', 'resched']
+            ).prefetch_related(
+                'group', 'group', 'group__type',
+            )
+        }
 
-        if timeslot.type_id != 'regular':
-            for session in Session.objects.filter(timeslotassignments__schedule=schedule, timeslotassignments__timeslot=timeslot):
-                for doc in session.materials.all():
-                    doc.set_state(State.objects.get(type=doc.type_id, slug='deleted'))
-                    e = DocEvent(doc=doc, rev=doc.rev, by=request.user.person, type='deleted')
-                    e.desc = "Deleted meeting session"
-                    e.save()
+        assignments_by_timeslot = defaultdict(list)
+        for a in SchedTimeSessAssignment.objects.filter(schedule__in=[schedule, schedule.base]):
+            assignments_by_timeslot[a.timeslot_id].append(a)
+
+        days = [meeting.date + datetime.timedelta(days=i) for i in range(meeting.days)]
+
+        timeslots_by_day_and_room = defaultdict(list)
+        for t in timeslot_qs:
+            timeslots_by_day_and_room[(t.time.date(), t.location_id)].append(t)
+
+        # Calculate full time range for display in meeting-local time, always showing at least 8am to 10pm
+        min_time = min([t.local_start_time().time() for t in timeslot_qs] + [datetime.time(8)])
+        max_time = max([t.local_end_time().time() for t in timeslot_qs] + [datetime.time(22)])
+        min_max_delta = datetime.datetime.combine(meeting.date, max_time) - datetime.datetime.combine(meeting.date, min_time)
+
+        day_grid = []
+        for d in days:
+            room_timeslots = []
+            for r in rooms:
+                ts = []
+                for t in timeslots_by_day_and_room.get((d, r.pk), []):
+                    # FIXME: the database (as of 2020) contains spurious
+                    # regular timeslots in rooms not intended for regular
+                    # sessions - once those are gone, this filter can go
+                    # away
+                    if t.type_id == 'regular' and not any(t.slug == 'regular' for t in r.session_types.all()):
+                        continue
 
-                session.delete()
+                    t.assigned_sessions = []
+                    for a in assignments_by_timeslot.get(t.pk, []):
+                        s = sessions_by_pk.get(a.session_id)
+                        if s:
+                            t.assigned_sessions.append(s)
+
+                    local_start_dt = t.local_start_time()
+                    local_min_dt = local_start_dt.replace(
+                        hour=min_time.hour,
+                        minute=min_time.minute,
+                        second=min_time.second,
+                        microsecond=min_time.microsecond,
+                    )
+                    t.left_offset = 100.0 * (local_start_dt - local_min_dt) / min_max_delta
+                    t.layout_width = min(100.0 * t.duration / min_max_delta, 100 - t.left_offset)
+                    ts.append(t)
 
-        timeslot.delete()
+                room_timeslots.append((r, ts))
 
-        return redirect_with_scroll()
-    
-    sessions_by_pk = {
-        s.pk: s for s in
-        add_event_info_to_session_qs(
-            Session.objects.filter(
-                meeting=meeting,
-            ).order_by('pk'),
-            requested_time=True,
-            requested_by=True,
-        ).filter(
-            current_status__in=['appr', 'schedw', 'scheda', 'sched', 'canceled', 'canceledpa', 'resched']
-        ).prefetch_related(
-            'group', 'group', 'group__type',
-        )
-    }
+            day_grid.append({
+                'day': d,
+                'room_timeslots': room_timeslots
+            })
 
-    assignments_by_timeslot = defaultdict(list)
-    for a in SchedTimeSessAssignment.objects.filter(schedule__in=[schedule, schedule.base]):
-        assignments_by_timeslot[a.timeslot_id].append(a)
-
-    days = [meeting.date + datetime.timedelta(days=i) for i in range(meeting.days)]
-
-    timeslots_by_day_and_room = defaultdict(list)
-    for t in timeslot_qs:
-        timeslots_by_day_and_room[(t.time.date(), t.location_id)].append(t)
-
-    min_time = min([t.time.time() for t in timeslot_qs] + [datetime.time(8)])
-    max_time = max([t.end_time().time() for t in timeslot_qs] + [datetime.time(22)])
-    min_max_delta = datetime.datetime.combine(meeting.date, max_time) - datetime.datetime.combine(meeting.date, min_time)
-
-    day_grid = []
-    for d in days:
-        room_timeslots = []
-        for r in rooms:
-            ts = []
-            for t in timeslots_by_day_and_room.get((d, r.pk), []):
-                # FIXME: the database (as of 2020) contains spurious
-                # regular timeslots in rooms not intended for regular
-                # sessions - once those are gone, this filter can go
-                # away
-                if t.type_id == 'regular' and not any(t.slug == 'regular' for t in r.session_types.all()):
-                    continue
-
-                t.assigned_sessions = []
-                for a in assignments_by_timeslot.get(t.pk, []):
-                    s = sessions_by_pk.get(a.session_id)
-                    if s:
-                        t.assigned_sessions.append(s)
-
-                t.left_offset = 100.0 * (t.time - datetime.datetime.combine(t.time.date(), min_time)) / min_max_delta
-                t.layout_width = min(100.0 * t.duration / min_max_delta, 100 - t.left_offset)
-                ts.append(t)
-
-            room_timeslots.append((r, ts))
-
-        day_grid.append({
-            'day': d,
-            'room_timeslots': room_timeslots
+        return render(request, "meeting/edit_meeting_timeslots_and_misc_sessions.html", {
+            'meeting': meeting,
+            'schedule': schedule,
+            'can_edit': can_edit,
+            'day_grid': day_grid,
+            'empty_timeslot_form': TimeSlotForm(meeting, schedule),
+            'add_timeslot_form': add_timeslot_form,
+            'edit_timeslot_form': edit_timeslot_form,
+            'scroll': scroll,
+            'hide_menu': True,
         })
 
-    return render(request, "meeting/edit_meeting_timeslots_and_misc_sessions.html", {
-        'meeting': meeting,
-        'schedule': schedule,
-        'can_edit': can_edit,
-        'day_grid': day_grid,
-        'empty_timeslot_form': TimeSlotForm(meeting, schedule),
-        'add_timeslot_form': add_timeslot_form,
-        'edit_timeslot_form': edit_timeslot_form,
-        'scroll': scroll,
-        'hide_menu': True,
-    })
-
 
 class SchedulePropertiesForm(forms.ModelForm):
     class Meta:
@@ -1434,6 +1675,11 @@ def list_schedules(request, num):
 class DiffSchedulesForm(forms.Form):
     from_schedule = forms.ChoiceField()
     to_schedule = forms.ChoiceField()
+    show_room_changes = forms.BooleanField(
+        initial=False,
+        required=False,
+        help_text="Include changes to room without a date or time change",
+    )
 
     def __init__(self, meeting, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1466,6 +1712,14 @@ def diff_schedules(request, num):
             raw_diffs = diff_meeting_schedules(from_schedule, to_schedule)
 
             diffs = prefetch_schedule_diff_objects(raw_diffs)
+            if not form.cleaned_data["show_room_changes"]:
+                # filter out room-only changes
+                diffs = [
+                    d
+                    for d in diffs
+                    if (d["change"] != "move") or (d["from"].time != d["to"].time)
+                ]
+
             for d in diffs:
                 s = d['session']
                 s.session_label = s.short_name
@@ -1503,7 +1757,7 @@ def get_assignments_for_agenda(schedule):
 
 
 @ensure_csrf_cookie
-def agenda_plain(request, num=None, name=None, base=None, ext=None, owner=None, utc=""):
+def agenda_plain(request, num=None, name=None, base=None, ext=None, owner=None, utc=None):
     base = base if base else 'agenda'
     ext = ext if ext else '.txt'
     mimetype = {
@@ -1532,7 +1786,7 @@ def agenda_plain(request, num=None, name=None, base=None, ext=None, owner=None,
         person   = get_person_by_email(owner)
         schedule = get_schedule_by_name(meeting, person, name)
 
-    if schedule == None:
+    if schedule is None:
         base = base.replace("-utc", "")
         return render(request, "meeting/no-"+base+ext, {'meeting':meeting }, content_type=mimetype[ext])
 
@@ -1547,25 +1801,31 @@ def agenda_plain(request, num=None, name=None, base=None, ext=None, owner=None,
 
     # Done processing for CSV output
     if ext == ".csv":
-        return agenda_csv(schedule, filtered_assignments)
+        return agenda_csv(schedule, filtered_assignments, utc=utc is not None)
 
     filter_organizer = AgendaFilterOrganizer(assignments=filtered_assignments)
 
     is_current_meeting = (num is None) or (num == get_current_ietf_meeting_num())
 
-    rendered_page = render(request, "meeting/"+base+ext, {
-        "personalize": False,
-        "schedule": schedule,
-        "filtered_assignments": filtered_assignments,
-        "updated": updated,
-        "filter_categories": filter_organizer.get_filter_categories(),
-        "non_area_keywords": filter_organizer.get_non_area_keywords(),
-        "now": datetime.datetime.now().astimezone(pytz.UTC),
-        "timezone": meeting.time_zone,
-        "is_current_meeting": is_current_meeting,
-        "use_codimd": True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False,
-        "cache_time": 150 if is_current_meeting else 3600,
-    }, content_type=mimetype[ext])
+    display_timezone = meeting.time_zone if utc is None else 'UTC'
+    with timezone.override(display_timezone):
+        rendered_page = render(
+            request,
+            "meeting/" + base + ext,
+            {
+                "personalize": False,
+                "schedule": schedule,
+                "filtered_assignments": filtered_assignments,
+                "updated": updated,
+                "filter_categories": filter_organizer.get_filter_categories(),
+                "non_area_keywords": filter_organizer.get_non_area_keywords(),
+                "now": timezone.now().astimezone(meeting.tz()),
+                "display_timezone": display_timezone,
+                "is_current_meeting": is_current_meeting,
+                "cache_time": 150 if is_current_meeting else 3600,
+            },
+            content_type=mimetype[ext],
+        )
 
     return rendered_page
 
@@ -1592,15 +1852,33 @@ def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc=""
         }
     })
 
-@cache_page(5 * 60)
-def api_get_agenda_data (request, num=None):
+
+def generate_agenda_data(num=None, force_refresh=False):
+    """Generate data for the api_get_agenda_data endpoint
+    
+    :num: meeting number
+    :force_refresh: True to force a refresh of the cache
+    """
     meeting = get_ietf_meeting(num)
     if meeting is None:
         raise Http404("No such full IETF meeting")
     elif int(meeting.number) <= 64:
-        return Http404("Pre-IETF 64 meetings are not available through this API")
-    else:
-        pass
+        raise Http404("Pre-IETF 64 meetings are not available through this API")
+    is_current_meeting = meeting.number == get_current_ietf_meeting_num()
+
+    cache = caches["agenda"]
+    cache_timeout = (
+        settings.AGENDA_CACHE_TIMEOUT_CURRENT_MEETING
+        if is_current_meeting
+        else settings.AGENDA_CACHE_TIMEOUT_DEFAULT
+    )
+    cache_format = "1"  # bump this on backward-incompatible data format changes
+
+    cache_key = f"generate_agenda_data:{meeting.number}:v{cache_format}"
+    if not force_refresh:
+        cached_value = cache.get(cache_key)
+        if cached_value is not None:
+            return cached_value
 
     # Select the schedule to show
     schedule = get_schedule(meeting, None)
@@ -1616,12 +1894,13 @@ def api_get_agenda_data (request, num=None):
 
     filter_organizer = AgendaFilterOrganizer(assignments=filtered_assignments)
 
-    is_current_meeting = (num is None) or (num == get_current_ietf_meeting_num())
-
     # Get Floor Plans
     floors = FloorPlan.objects.filter(meeting=meeting).order_by('order')
+    
+    # Get Preliminary Agenda Date
+    prelimAgendaDate = ImportantDate.objects.filter(name_id="prelimagenda", meeting=meeting).first()
 
-    return JsonResponse({
+    result = {
         "meeting": {
             "number": schedule.meeting.number,
             "city": schedule.meeting.city,
@@ -1630,99 +1909,123 @@ def api_get_agenda_data (request, num=None):
             "updated": updated,
             "timezone": meeting.time_zone,
             "infoNote": schedule.meeting.agenda_info_note,
-            "warningNote": schedule.meeting.agenda_warning_note
+            "warningNote": schedule.meeting.agenda_warning_note,
+            "prelimAgendaDate": prelimAgendaDate.date.isoformat() if prelimAgendaDate else ""
         },
         "categories": filter_organizer.get_filter_categories(),
         "isCurrentMeeting": is_current_meeting,
-        "useHedgeDoc": True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False,
+        "usesNotes": meeting.uses_notes(),
         "schedule": list(map(agenda_extract_schedule, filtered_assignments)),
         "floors": list(map(agenda_extract_floorplan, floors))
-    })
+    }
+    cache.set(cache_key, result, timeout=cache_timeout)
+    return result
 
-def api_get_session_materials (request, session_id=None):
-    session = get_object_or_404(Session,pk=session_id)
+
+def api_get_agenda_data(request, num=None):
+    return JsonResponse(generate_agenda_data(num, force_refresh=False))
+
+
+def api_get_session_materials(request, session_id=None):
+    session = get_object_or_404(Session, pk=session_id)
 
     minutes = session.minutes()
     slides_actions = []
-    if can_manage_session_materials(request.user, session.group, session):
-        slides_actions.append({
-            'label': 'Upload slides',
-            'url': reverse(
-                'ietf.meeting.views.upload_session_slides',
-                kwargs={'num': session.meeting.number, 'session_id': session.pk},
-            ),
-        })
-    elif not session.is_material_submission_cutoff():
-        slides_actions.append({
-            'label': 'Propose slides',
-            'url': reverse(
-                'ietf.meeting.views.propose_session_slides',
-                kwargs={'num': session.meeting.number, 'session_id': session.pk},
-            ),
-        })
+    if can_manage_session_materials(request.user, session.group, session) or not session.is_material_submission_cutoff():
+        slides_actions.append(
+            {
+                "label": "Upload slides",
+                "url": reverse(
+                    "ietf.meeting.views.upload_session_slides",
+                    kwargs={"num": session.meeting.number, "session_id": session.pk},
+                ),
+            }
+        )
     else:
         pass  # no action available if it's past cutoff
 
-    return JsonResponse({
-        "url": session.agenda().get_href(),
-        "slides": {
-            "decks": list(map(agenda_extract_slide, session.slides())),
-            "actions": slides_actions,
-        },
-        "minutes": {
-            "id": minutes.id,
-            "title": minutes.title,
-            "url": minutes.get_href(),
-            "ext": minutes.file_extension()
-        } if minutes is not None else None
-    })
+    agenda = session.agenda()
+    agenda_url = agenda.get_href() if agenda is not None else None
+    return JsonResponse(
+        {
+            "url": agenda_url,
+            "slides": {
+                "decks": [
+                    agenda_extract_slide(slide) | {"order": order}  # add "order" field
+                    for order, slide in enumerate(session.slides())
+                ],
+                "actions": slides_actions,
+            },
+            "minutes": {
+                "id": minutes.id,
+                "title": minutes.title,
+                "url": minutes.get_href(),
+                "ext": minutes.file_extension(),
+            }
+            if minutes is not None
+            else None,
+        }
+    )
+
 
-def agenda_extract_schedule (item):
+def agenda_extract_schedule(item):
+    if item.session.current_status == "resched":
+        resched_to = item.session.tombstone_for.official_timeslotassignment()
+    else:
+        resched_to = None
     return {
         "id": item.id,
+        "slug": item.slug(),
         "sessionId": item.session.id,
-        "room": item.room_name,
+        "room": (item.timeslot.get_location() or None) if item.timeslot else None,
         "location": {
             "short": item.timeslot.location.floorplan.short,
             "name": item.timeslot.location.floorplan.name,
-        } if (item.timeslot.location and item.timeslot.location.floorplan) else {},
+        } if (item.timeslot.show_location and item.timeslot.location and item.timeslot.location.floorplan) else {},
         "acronym": item.acronym,
-        "duration": item.timeslot.duration.seconds,
-        "name": item.timeslot.name,
+        "duration": item.timeslot.duration.total_seconds(),
+        "name": item.session.name,
+        "slotId": item.timeslot.id,
+        "slotName": item.timeslot.name,
+        "slotModified": item.timeslot.modified.isoformat(),
         "startDateTime": item.timeslot.time.isoformat(),
         "status": item.session.current_status,
+        "rescheduledTo": {
+            "startDateTime": resched_to.timeslot.time.isoformat(),
+            "duration": resched_to.timeslot.duration.total_seconds(),
+        } if resched_to is not None else {},
         "type": item.session.type.slug,
-        "isBoF": item.session.historic_group.state_id == "bof",
+        "purpose": item.session.purpose.slug,
+        "isBoF": item.session.group_at_the_time().state_id == "bof",
+        "isProposed": item.session.group_at_the_time().state_id == "proposed",
         "filterKeywords": item.filter_keywords,
-        "groupAcronym": item.session.historic_group.acronym if item.session.historic_group else item.session.group.acronym,
-        "groupName": item.session.historic_group.name,
-        "groupParent": {
-            "acronym": item.session.historic_group.parent.acronym
-            # "name": item.session.historic_group.parent.name,
-            # "description": item.session.historic_group.parent.description
-        } if item.session.historic_group.parent else {},
+        "groupAcronym": item.session.group_at_the_time().acronym,
+        "groupName": item.session.group_at_the_time().name,
+        "groupParent": ({
+            "acronym": item.session.group_parent_at_the_time().acronym
+        } if item.session.group_parent_at_the_time() else {}),
         "note": item.session.agenda_note,
         "remoteInstructions": item.session.remote_instructions,
         "flags": {
             "agenda": True if item.session.agenda() is not None else False,
-            "showAgenda": True if (item.session.agenda() is not None or item.session.remote_instructions or item.session.agenda_note) else False
+            "showAgenda": True if (item.session.agenda() is not None or item.session.remote_instructions) else False
         },
         "agenda": {
-            "url": item.session.agenda().get_href()
+            "url": item.session.agenda().get_versionless_href()
         } if item.session.agenda() is not None else {
             "url": None
         },
-        "orderInMeeting": item.session.order_in_meeting(),
+        "orderInMeeting": item.session.order_number,
         "short": item.session.short if item.session.short else item.session.short_name,
         "sessionToken": item.session.docname_token_only_for_multiple(),
         "links": {
             "chat" : item.session.chat_room_url(),
             "chatArchive" : item.session.chat_archive_url(),
             "recordings": list(map(agenda_extract_recording, item.session.recordings())),
-            "videoStream": item.timeslot.location.video_stream_url() if item.timeslot.location else "",
-            "audioStream": item.timeslot.location.audio_stream_url() if item.timeslot.location else "",
+            "videoStream": item.session.video_stream_url() or "",
+            "audioStream": item.session.audio_stream_url() or "",
             "webex": item.timeslot.location.webex_url() if item.timeslot.location else "",
-            "onsiteTool": item.timeslot.location.onsite_tool_url() if item.timeslot.location else "",
+            "onsiteTool": item.session.onsite_tool_url() or "",
             "calendar": reverse(
                 'ietf.meeting.views.agenda_ical',
                 kwargs={'num': item.schedule.meeting.number, 'session_id': item.session.id},
@@ -1733,7 +2036,8 @@ def agenda_extract_schedule (item):
         # }
     }
 
-def agenda_extract_floorplan (item):
+
+def agenda_extract_floorplan(item):
     try:
         item.image.width
     except FileNotFoundError:
@@ -1746,10 +2050,11 @@ def agenda_extract_floorplan (item):
         "short": item.short,
         "width": item.image.width,
         "height": item.image.height,
-        "rooms": list(map(agenda_extract_room, item.room_set.all()))
+        "rooms": list(map(agenda_extract_room, item.room_set.all())),
     }
 
-def agenda_extract_room (item):
+
+def agenda_extract_room(item):
     return {
         "id": item.id,
         "name": item.name,
@@ -1761,7 +2066,8 @@ def agenda_extract_room (item):
         "bottom": item.bottom()
     }
 
-def agenda_extract_recording (item):
+
+def agenda_extract_recording(item):
     return {
         "id": item.id,
         "name": item.name,
@@ -1769,27 +2075,30 @@ def agenda_extract_recording (item):
         "url": item.external_url
     }
 
-def agenda_extract_slide (item):
+
+def agenda_extract_slide(item):
     return {
         "id": item.id,
         "title": item.title,
-        "url": item.get_versionless_href(),
-        "ext": item.file_extension()
+        "rev": item.rev,
+        "url": item.get_href(),
+        "ext": item.file_extension(),
     }
 
-def agenda_csv(schedule, filtered_assignments):
-    response = HttpResponse(content_type="text/csv; charset=%s"%settings.DEFAULT_CHARSET)
+
+def agenda_csv(schedule, filtered_assignments, utc=False):
+    encoding = 'utf-8'
+    response = HttpResponse(content_type=f"text/csv; charset={encoding}")
     writer = csv.writer(response, delimiter=str(','), quoting=csv.QUOTE_ALL)
 
     headings = ["Date", "Start", "End", "Session", "Room", "Area", "Acronym", "Type", "Description", "Session ID", "Agenda", "Slides"]
 
     def write_row(row):
-        encoded_row = [v.encode('utf-8') if isinstance(v, str) else v for v in row]
-
-        while len(encoded_row) < len(headings):
-            encoded_row.append(None) # produce empty entries at the end as necessary
-
-        writer.writerow(encoded_row)
+        if len(row) < len(headings):
+            padding = [None] * (len(headings) - len(row))  # produce empty entries at the end as necessary
+        else:
+            padding = []
+        writer.writerow(row + padding)
 
     def agenda_field(item):
         agenda_doc = item.session.agenda()
@@ -1803,11 +2112,12 @@ def slides_field(item):
 
     write_row(headings)
 
+    tz = datetime.UTC if utc else schedule.meeting.tz()
     for item in filtered_assignments:
         row = []
-        row.append(item.timeslot.time.strftime("%Y-%m-%d"))
-        row.append(item.timeslot.time.strftime("%H%M"))
-        row.append(item.timeslot.end_time().strftime("%H%M"))
+        row.append(item.timeslot.time.astimezone(tz).strftime("%Y-%m-%d"))
+        row.append(item.timeslot.time.astimezone(tz).strftime("%H%M"))
+        row.append(item.timeslot.end_time().astimezone(tz).strftime("%H%M"))
 
         if item.slot_type().slug == "break":
             row.append(item.slot_type().name)
@@ -1829,15 +2139,15 @@ def slides_field(item):
             row.append("None")
             row.append(item.timeslot.location.name if item.timeslot.location else "")
             row.append("")
-            row.append(item.session.historic_group.acronym)
-            row.append(item.session.historic_group.historic_parent.acronym.upper() if item.session.historic_group.historic_parent else "")
+            row.append(item.session.group_at_the_time().acronym)
+            row.append(item.session.group_parent_at_the_time().acronym.upper() if item.session.group_parent_at_the_time() else "")
             row.append(item.session.name)
             row.append(item.session.pk)
         elif item.slot_type().slug == "plenary":
             row.append(item.session.name)
             row.append(item.timeslot.location.name if item.timeslot.location else "")
             row.append("")
-            row.append(item.session.historic_group.acronym if item.session.historic_group else "")
+            row.append(item.session.group_at_the_time().acronym)
             row.append("")
             row.append(item.session.name)
             row.append(item.session.pk)
@@ -1846,10 +2156,10 @@ def slides_field(item):
         elif item.slot_type().slug == 'regular':
             row.append(item.timeslot.name)
             row.append(item.timeslot.location.name if item.timeslot.location else "")
-            row.append(item.session.historic_group.historic_parent.acronym.upper() if item.session.historic_group.historic_parent else "")
-            row.append(item.session.historic_group.acronym if item.session.historic_group else "")
-            row.append("BOF" if item.session.historic_group.state_id in ("bof", "bof-conc") else item.session.historic_group.type.name)
-            row.append(item.session.historic_group.name if item.session.historic_group else "")
+            row.append(item.session.group_parent_at_the_time().acronym.upper() if item.session.group_parent_at_the_time() else "")
+            row.append(item.session.group_at_the_time().acronym)
+            row.append("BOF" if item.session.group_at_the_time().state_id in ("bof", "bof-conc") else item.session.group_at_the_time().type.name)
+            row.append(item.session.group_at_the_time().name)
             row.append(item.session.pk)
             row.append(agenda_field(item))
             row.append(slides_field(item))
@@ -1870,8 +2180,10 @@ def agenda_by_type_ics(request,num=None,type=None):
     ).order_by('session__type__slug','timeslot__time')
     if type:
         assignments = assignments.filter(session__type__slug=type)
-    updated = meeting.updated()
-    return render(request,"meeting/agenda.ics",{"schedule":schedule,"updated":updated,"assignments":assignments},content_type="text/calendar")
+
+    return render_icalendar(schedule, assignments)
+
+
 
 def session_draft_list(num, acronym):
     try:
@@ -1991,92 +2303,375 @@ def ical_session_status(assignment):
     else:
         return "CONFIRMED"
 
-def parse_agenda_filter_params(querydict):
-    """Parse agenda filter parameters from a request"""
-    if len(querydict) == 0:
-        return None
 
-    # Parse group filters from GET parameters. Other params are ignored.
-    filt_params = {'show': set(), 'hide': set(), 'showtypes': set(), 'hidetypes': set()}
+def render_icalendar_precomp(agenda_data):
+    ical_content = generate_agenda_ical_precomp(agenda_data)
+    return HttpResponse(ical_content, content_type="text/calendar")
 
-    for key, value in querydict.items():
-        if key in filt_params:
-            vals = unquote(value).lower().split(',')
-            vals = [v.strip() for v in vals]
-            filt_params[key] = set([v for v in vals if len(v) > 0])  # remove empty strings
 
-    return filt_params
+def render_icalendar(schedule, assignments):
+    ical_content = generate_agenda_ical(schedule, assignments)
+    return HttpResponse(ical_content, content_type="text/calendar")
 
 
-def should_include_assignment(filter_params, assignment):
-    """Decide whether to include an assignment
+def generate_agenda_ical_precomp(agenda_data):
+    """Generate iCalendar from precomputed data using the icalendar library"""
 
-    When filtering by wg, uses historic_group if available as an attribute
-    on the session, otherwise falls back to using group.
-    """
-    shown = len(set(filter_params['show']).intersection(assignment.filter_keywords)) > 0
-    hidden = len(set(filter_params['hide']).intersection(assignment.filter_keywords)) > 0
-    return shown and not hidden
+    cal = Calendar()
+    cal.add("prodid", "-//IETF//datatracker.ietf.org ical agenda//EN")
+    cal.add("version", "2.0")
+    cal.add("method", "PUBLISH")
+    
+    meeting_data = agenda_data["meeting"]
+    for item in agenda_data["schedule"]:
+        event = Event()
+        
+        uid = f"ietf-{meeting_data["number"]}-{item["slotId"]}-{item["acronym"]}"
+        event.add("uid", uid)
 
-def agenda_ical(request, num=None, name=None, acronym=None, session_id=None):
-    """Agenda ical view
+        # add custom field with meeting's local TZ
+        event.add("x-meeting-tz", meeting_data["timezone"])
+        
+        if item["name"]:
+            summary = item["name"]
+        else:
+            summary = f"{item["groupAcronym"]} - {item["groupName"]}"
 
-    By default, all agenda items will be shown. A filter can be specified in 
-    the querystring. It has the format
-    
-      ?show=...&hide=...&showtypes=...&hidetypes=...
+        if item["note"]:
+            summary += f" ({item["note"]})"
 
-    where any of the parameters can be omitted. The right-hand side of each
-    '=' is a comma separated list, which can be empty. If none of the filter
-    parameters are specified, no filtering will be applied, even if the query
-    string is not empty.
+        event.add("summary", summary)
 
-    The show and hide parameters each take a list of working group (wg) acronyms.    
-    The showtypes and hidetypes parameters take a list of session types. 
+        if item["room"]:
+            event.add("location", item["room"])  # room name
 
-    Hiding (by wg or type) takes priority over showing.
-    """
-    meeting = get_meeting(num, type_in=None)
-    schedule = get_schedule(meeting, name)
-    updated = meeting.updated()
+        if item["status"] == "canceled":
+            status = "CANCELLED"
+        elif item["status"] == "resched":
+            resched_to = item["rescheduledTo"]
+            if resched_to is None:
+                status = "RESCHEDULED"
+            else:
+                resched_start = datetime.datetime.fromisoformat(
+                    resched_to["startDateTime"]
+                )
+                dur = datetime.timedelta(seconds=resched_to["duration"])
+                resched_end = resched_start + dur
+                formatted_start = resched_start.strftime("%A %H:%M").upper()
+                formatted_end = resched_end.strftime("%H:%M")
+                status = f"RESCHEDULED TO {formatted_start}-{formatted_end}"
+        else:
+            status = "CONFIRMED"
+        event.add("status", status)
 
-    if schedule is None and acronym is None and session_id is None:
-        raise Http404
+        event.add("class", "PUBLIC")
 
-    assignments = SchedTimeSessAssignment.objects.filter(
-        schedule__in=[schedule, schedule.base],
-        session__on_agenda=True,
-    )
-    assignments = preprocess_assignments_for_agenda(assignments, meeting)
-    AgendaKeywordTagger(assignments=assignments).apply()
+        start_time = datetime.datetime.fromisoformat(item["startDateTime"])
+        duration = datetime.timedelta(seconds=item["duration"])
+        event.add("dtstart", start_time)
+        event.add("dtend", start_time + duration)
 
-    try:
-        filt_params = parse_agenda_filter_params(request.GET)
-    except ValueError as e:
-        return HttpResponseBadRequest(str(e))
+        # DTSTAMP: when the event was created or last modified (in UTC)
+        # n.b. timeslot.modified may not be an accurate measure of this
+        event.add("dtstamp", datetime.datetime.fromisoformat(item["slotModified"]))
 
-    if filt_params is not None:
-        # Apply the filter
-        assignments = [a for a in assignments if should_include_assignment(filt_params, a)]
+        description_parts = [item["slotName"]]
 
-    if acronym:
-        assignments = [ a for a in assignments if a.session.historic_group and a.session.historic_group.acronym == acronym ]
-    elif session_id:
-        assignments = [ a for a in assignments if a.session_id == int(session_id) ]
+        if item["note"]:
+            description_parts.append(f"Note: {item["note"]}")
 
-    for a in assignments:
-        if a.session:
-            a.session.ical_status = ical_session_status(a)
+        links = item["links"]
+        if links["onsiteTool"]:
+            description_parts.append(f"Onsite tool: {links["onsiteTool"]}")
+
+        if links["videoStream"]:
+            description_parts.append(f"Meetecho: {links["videoStream"]}")
+
+        if links["webex"]:
+            description_parts.append(f"Webex: {links["webex"]}")
+
+        if item["remoteInstructions"]:
+            description_parts.append(
+                f"Remote instructions: {item["remoteInstructions"]}"
+            )
+
+        try:
+            materials_url = absurl(
+                "ietf.meeting.views.session_details",
+                num=meeting_data["number"],
+                acronym=item["acronym"],
+            )
+        except NoReverseMatch:
+            pass
+        else:
+            description_parts.append(f"Session materials: {materials_url}")
+            event.add("url", materials_url)
+
+        if meeting_data["number"].isdigit():
+            try:
+                agenda_url = absurl("agenda", num=meeting_data["number"])
+            except NoReverseMatch:
+                pass
+            else:
+                description_parts.append(f"See in schedule: {agenda_url}#row-{item["slug"]}")
+
+        if item["agenda"] and item["agenda"]["url"]:
+            description_parts.append(f"Agenda {item["agenda"]["url"]}")
+
+        # Join all description parts with 2 newlines
+        description = "\n\n".join(description_parts)
+        event.add("description", description)
+
+        # Add event to calendar
+        cal.add_component(event)
+
+    return cal.to_ical().decode("utf-8")
+
+
+def generate_agenda_ical(schedule, assignments):
+    """Generate iCalendar using the icalendar library"""
+
+    cal = Calendar()
+    cal.add("prodid", "-//IETF//datatracker.ietf.org ical agenda//EN")
+    cal.add("version", "2.0")
+    cal.add("method", "PUBLISH")
+
+    for item in assignments:
+        event = Event()
+
+        uid = f"ietf-{schedule.meeting.number}-{item.timeslot.pk}-{item.session.group.acronym}"
+        event.add("uid", uid)
+
+        # add custom field with meeting's local TZ
+        event.add("x-meeting-tz", schedule.meeting.time_zone)
+
+        if item.session.name:
+            summary = item.session.name
+        else:
+            group = item.session.group_at_the_time()
+            summary = f"{group.acronym} - {group.name}"
+
+        if item.session.agenda_note:
+            summary += f" ({item.session.agenda_note})"
+
+        event.add("summary", summary)
+
+        if item.timeslot.show_location and item.timeslot.get_location():
+            event.add("location", item.timeslot.get_location())
+
+        if item.session and hasattr(item.session, "current_status"):
+            status = ical_session_status(item)
+        else:
+            status = ""
+        event.add("status", status)
+
+        event.add("class", "PUBLIC")
+
+        event.add("dtstart", item.timeslot.utc_start_time())
+        event.add("dtend", item.timeslot.utc_end_time())
+
+        # DTSTAMP: when the event was created or last modified (in UTC)
+        dtstamp = item.timeslot.modified.astimezone(pytz.UTC)
+        event.add("dtstamp", dtstamp)
+
+        description_parts = [item.timeslot.name]
+
+        if item.session.agenda_note:
+            description_parts.append(f"Note: {item.session.agenda_note}")
+
+        if hasattr(item.session, "onsite_tool_url") and callable(
+            item.session.onsite_tool_url
+        ):
+            onsite_url = item.session.onsite_tool_url()
+            if onsite_url:
+                description_parts.append(f"Onsite tool: {onsite_url}")
+
+        if hasattr(item.session, "video_stream_url") and callable(
+            item.session.video_stream_url
+        ):
+            video_url = item.session.video_stream_url()
+            if video_url:
+                description_parts.append(f"Meetecho: {video_url}")
+
+        if (
+            item.timeslot.location
+            and hasattr(item.timeslot.location, "webex_url")
+            and callable(item.timeslot.location.webex_url)
+            and item.timeslot.location.webex_url() is not None
+        ):
+            description_parts.append(f"Webex: {item.timeslot.location.webex_url()}")
+
+        if item.session.remote_instructions:
+            description_parts.append(
+                f"Remote instructions: {item.session.remote_instructions}"
+            )
+
+        try:
+            materials_url = absurl(
+                "ietf.meeting.views.session_details",
+                num=schedule.meeting.number,
+                acronym=item.session.group.acronym,
+            )
+            description_parts.append(f"Session materials: {materials_url}")
+            event.add("url", materials_url)
+        except:
+            pass
+
+        if (
+            hasattr(schedule.meeting, "get_number")
+            and schedule.meeting.get_number() is not None
+        ):
+            try:
+                agenda_url = absurl("agenda", num=schedule.meeting.number)
+                description_parts.append(
+                    f"See in schedule: {agenda_url}#row-{item.slug()}"
+                )
+            except:
+                pass
+
+        agenda = item.session.agenda()
+        if agenda and hasattr(agenda, "get_versionless_href"):
+            agenda_url = agenda.get_versionless_href()
+            description_parts.append(f"{agenda.type} {agenda_url}")
+
+        # Join all description parts with 2 newlines
+        description = "\n\n".join(description_parts)
+        event.add("description", description)
+
+        # Add event to calendar
+        cal.add_component(event)
+
+    return cal.to_ical().decode("utf-8")
+
+def parse_agenda_filter_params(querydict):
+    """Parse agenda filter parameters from a request"""
+    if len(querydict) == 0:
+        return None
+
+    # Parse group filters from GET parameters. Other params are ignored.
+    filt_params = {'show': set(), 'hide': set(), 'showtypes': set(), 'hidetypes': set()}
+
+    for key, value in querydict.items():
+        if key in filt_params:
+            vals = unquote(value).lower().split(',')
+            vals = [v.strip() for v in vals]
+            filt_params[key] = set([v for v in vals if len(v) > 0])  # remove empty strings
+
+    return filt_params
+
+
+def should_include_assignment(filter_params, assignment):
+    """Decide whether to include an assignment"""
+    if hasattr(assignment, "filter_keywords"):
+        kw = assignment.filter_keywords
+    elif isinstance(assignment, dict):
+        kw = assignment.get("filterKeywords", [])
+    else:
+        raise ValueError("Unsupported assignment instance")
+    shown = len(set(filter_params['show']).intersection(kw)) > 0
+    hidden = len(set(filter_params['hide']).intersection(kw)) > 0
+    return shown and not hidden
+
+
+def agenda_ical_ietf(meeting, filt_params, acronym=None, session_id=None):
+    agenda_data = generate_agenda_data(meeting.number, force_refresh=False)
+    if acronym:
+        agenda_data["schedule"] = [
+            item
+            for item in agenda_data["schedule"]
+            if item["groupAcronym"] == acronym
+        ]
+    elif session_id:
+        agenda_data["schedule"] = [
+            item
+            for item in agenda_data["schedule"]
+            if item["sessionId"] == session_id
+        ]
+    if filt_params is not None:
+        # Apply the filter
+        agenda_data["schedule"] = [
+            item
+            for item in agenda_data["schedule"]
+            if should_include_assignment(filt_params, item)
+        ]
+    return render_icalendar_precomp(agenda_data)
+
+
+def agenda_ical_interim(meeting, filt_params, acronym=None, session_id=None):
+    schedule = get_schedule(meeting)
+
+    if schedule is None and acronym is None and session_id is None:
+        raise Http404
+
+    assignments = SchedTimeSessAssignment.objects.filter(
+        schedule__in=[schedule, schedule.base],
+        session__on_agenda=True,
+    )
+    assignments = preprocess_assignments_for_agenda(assignments, meeting)
+    AgendaKeywordTagger(assignments=assignments).apply()
+
+    if filt_params is not None:
+        # Apply the filter
+        assignments = [a for a in assignments if should_include_assignment(filt_params, a)]
+
+    if acronym:
+        assignments = [ a for a in assignments if a.session.group_at_the_time().acronym == acronym ]
+    elif session_id:
+        assignments = [ a for a in assignments if a.session_id == int(session_id) ]
+
+    return render_icalendar(schedule, assignments)
+
+
+def agenda_ical(request, num=None, acronym=None, session_id=None):
+    """Agenda ical view
+
+    If num is None, looks for the next IETF meeting. Otherwise, uses the requested meeting
+    regardless of its type.
+
+    By default, all agenda items will be shown. A filter can be specified in
+    the querystring. It has the format
+    
+      ?show=...&hide=...&showtypes=...&hidetypes=...
+
+    where any of the parameters can be omitted. The right-hand side of each
+    '=' is a comma separated list, which can be empty. If none of the filter
+    parameters are specified, no filtering will be applied, even if the query
+    string is not empty.
+
+    The show and hide parameters each take a list of working group (wg) acronyms.    
+    The showtypes and hidetypes parameters take a list of session types. 
+
+    Hiding (by wg or type) takes priority over showing.
+    """
+    if num is None:
+        meeting = get_ietf_meeting()
+        if meeting is None:
+            raise Http404
+    else:
+        meeting = get_meeting(num, type_in=None)  # get requested meeting, whatever its type
+
+    if isinstance(session_id, str) and session_id.isdigit():
+        session_id = int(session_id)
+
+    try:
+        filt_params = parse_agenda_filter_params(request.GET)
+    except ValueError as e:
+        return HttpResponseBadRequest(str(e))
+
+    if meeting.type_id == "ietf":
+        return agenda_ical_ietf(meeting, filt_params, acronym, session_id)
+    else:
+        return agenda_ical_interim(meeting, filt_params, acronym, session_id)
 
-    return render(request, "meeting/agenda.ics", {
-        "schedule": schedule,
-        "assignments": assignments,
-        "updated": updated
-    }, content_type="text/calendar")
 
 @cache_page(15 * 60)
 def agenda_json(request, num=None):
-    meeting = get_meeting(num, type_in=['ietf','interim'])
+    if num is None:
+        meeting = get_ietf_meeting()
+        if meeting is None:
+            raise Http404
+    else:
+        meeting = get_meeting(num, type_in=None)  # get requested meeting, whatever its type
 
     sessions = []
     locations = set()
@@ -2091,7 +2686,7 @@ def agenda_json(request, num=None):
     # time of the meeting
     assignments = preprocess_assignments_for_agenda(assignments, meeting, extra_prefetches=[
         "session__materials__docevent_set",
-        "session__sessionpresentation_set",
+        "session__presentations",
         "timeslot__meeting"
     ])
     for asgn in assignments:
@@ -2099,23 +2694,23 @@ def agenda_json(request, num=None):
         sessdict['objtype'] = 'session'
         sessdict['id'] = asgn.pk
         sessdict['is_bof'] = False
-        if asgn.session.historic_group:
+        if asgn.session.group_at_the_time():
             sessdict['group'] = {
-                    "acronym": asgn.session.historic_group.acronym,
-                    "name": asgn.session.historic_group.name,
-                    "type": asgn.session.historic_group.type_id,
-                    "state": asgn.session.historic_group.state_id,
+                    "acronym": asgn.session.group_at_the_time().acronym,
+                    "name": asgn.session.group_at_the_time().name,
+                    "type": asgn.session.group_at_the_time().type_id,
+                    "state": asgn.session.group_at_the_time().state_id,
                 }
-            if asgn.session.historic_group.is_bof():
+            if asgn.session.group_at_the_time().is_bof():
                 sessdict['is_bof'] = True
-            if asgn.session.historic_group.type_id in ['wg','rg', 'ag', 'rag'] or asgn.session.historic_group.acronym in ['iesg',]: # TODO: should that first list be groupfeatures driven?
-                if asgn.session.historic_group.historic_parent:
-                    sessdict['group']['parent'] = asgn.session.historic_group.historic_parent.acronym
-                    parent_acronyms.add(asgn.session.historic_group.historic_parent.acronym)
+            if asgn.session.group_at_the_time().type_id in ['wg','rg', 'ag', 'rag'] or asgn.session.group_at_the_time().acronym in ['iesg',]: # TODO: should that first list be groupfeatures driven?
+                if asgn.session.group_parent_at_the_time():
+                    sessdict['group']['parent'] = asgn.session.group_parent_at_the_time().acronym
+                    parent_acronyms.add(asgn.session.group_parent_at_the_time().acronym)
         if asgn.session.name:
             sessdict['name'] = asgn.session.name
         else:
-            sessdict['name'] = asgn.session.historic_group.name
+            sessdict['name'] = asgn.session.group_at_the_time().name
         if asgn.session.short:
             sessdict['short'] = asgn.session.short
         if asgn.session.agenda_note:
@@ -2191,19 +2786,81 @@ def agenda_json(request, num=None):
     meetinfo.sort(key=lambda x: x['modified'],reverse=True)
     last_modified = meetinfo and meetinfo[0]['modified']
 
-    tz = pytz.timezone(settings.PRODUCTION_TIMEZONE)
-
     for obj in meetinfo:
-        obj['modified'] = tz.localize(obj['modified']).astimezone(pytz.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
+        obj['modified'] = obj['modified'].astimezone(pytz.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 
     data = {"%s"%num: meetinfo}
 
     response = HttpResponse(json.dumps(data, indent=2, sort_keys=True), content_type='application/json;charset=%s'%settings.DEFAULT_CHARSET)
     if last_modified:
-        last_modified = tz.localize(last_modified).astimezone(pytz.utc)
+        last_modified = last_modified.astimezone(pytz.utc)
         response['Last-Modified'] = format_date_time(timegm(last_modified.timetuple()))
     return response
 
+def request_summary_filter(session):
+    if (session.group.area is None
+            or session.group.type.slug in request_summary_exclude_group_types
+            or session.current_status == 'notmeet'):
+        return False
+    return True
+
+def get_area_column(area):
+    if area is None:
+        return ''
+    if area.type.slug in ['rfcedtyp']:
+        name = 'OTHER'
+    else:
+        name = area.acronym.upper()
+    return name
+
+def get_summary_by_area(sessions):
+    """Returns summary by area for list of session requests.
+    Summary is a two dimensional array[row=session duration][col=session area count]
+    It also includes row and column headers as well as a totals row.
+    """
+
+    # first build a dictionary of counts, key=(duration,area)
+    durations = set()
+    areas = set()
+    duration_totals = defaultdict(int)
+    data = defaultdict(int)
+    for session in sessions:
+        area_column = get_area_column(session.group.area)
+        duration = session.requested_duration.seconds / 3600
+        key = (duration, area_column)
+        data[key] = data[key] + 1
+        durations.add(duration)
+        areas.add(area_column)
+        duration_totals[duration] = duration_totals[duration] + 1
+
+    # build two dimensional array for use in template
+    rows = []
+    sorted_areas = sorted(areas)
+    # move "other" to end
+    if 'OTHER' in sorted_areas:
+        sorted_areas.remove('OTHER')
+        sorted_areas.append('OTHER')
+    # add header row
+    rows.append(['Duration'] + sorted_areas + ['TOTAL SLOTS', 'TOTAL HOURS'])
+    for duration in sorted(durations):
+        rows.append([duration] + [data[(duration, a)] for a in sorted_areas] + [duration_totals[duration]] + [duration_totals[duration] * duration])
+    # add total row
+    rows.append(['Total Slots'] + [sum([rows[r][c] for r in range(1, len(rows))]) for c in range(1, len(rows[0]))])
+    rows.append(['Total Hours'] + [sum([d * data[(d, area)] for d in durations]) for area in sorted_areas])
+    return rows
+
+def get_summary_by_type(sessions):
+    counter = Counter([s.group.type.name for s in sessions])
+    data = counter.most_common()
+    data.insert(0, ('Group Type', 'Count'))
+    return data
+
+def get_summary_by_purpose(sessions):
+    counter = Counter([s.purpose.name for s in sessions])
+    data = counter.most_common()
+    data.insert(0, ('Purpose', 'Count'))
+    return data
+
 def meeting_requests(request, num=None):
     meeting = get_meeting(num)
     groups_to_show = Group.objects.filter(
@@ -2219,7 +2876,7 @@ def meeting_requests(request, num=None):
         ).with_current_status().with_requested_by().exclude(
             requested_by=0
         ).prefetch_related(
-            "group","group__ad_role__person"
+            "group", "group__ad_role__person", "group__type"
         )
     )
 
@@ -2242,12 +2899,14 @@ def meeting_requests(request, num=None):
     )
 
     groups_not_meeting = groups_to_show.exclude(
-        acronym__in = [session.group.acronym for session in sessions]
+        acronym__in=[session.group.acronym for session in sessions]
     ).order_by(
         "parent__acronym",
         "acronym",
     ).prefetch_related("parent")
 
+    summary_sessions = list(filter(request_summary_filter, sessions))
+
     return render(
         request,
         "meeting/requests.html",
@@ -2255,6 +2914,9 @@ def meeting_requests(request, num=None):
             "meeting": meeting,
             "sessions": sessions,
             "groups_not_meeting": groups_not_meeting,
+            "summary_by_area": get_summary_by_area(summary_sessions),
+            "summary_by_group_type": get_summary_by_type(summary_sessions),
+            "summary_by_purpose": get_summary_by_purpose(summary_sessions),
         },
     )
 
@@ -2273,22 +2935,9 @@ def session_details(request, num, acronym):
     if not sessions:
         raise Http404
 
-    # Find the time of the meeting, so that we can look back historically 
-    # for what the group was called at the time. 
-    meeting_time = datetime.datetime.combine(meeting.date, datetime.time()) 
-
-    groups = list(set([ s.group for s in sessions ]))
-    group_replacements = find_history_replacements_active_at(groups, meeting_time) 
-
     status_names = {n.slug: n.name for n in SessionStatusName.objects.all()}
     for session in sessions:
 
-        session.historic_group = None 
-        if session.group: 
-            session.historic_group = group_replacements.get(session.group_id) 
-            if session.historic_group: 
-                session.historic_group.historic_parent = None 
-
         session.type_counter = Counter()
         ss = session.timeslotassignments.filter(schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None]).order_by('timeslot__time')
         if ss:
@@ -2307,12 +2956,28 @@ def session_details(request, num, acronym):
             session.cancelled = session.current_status in Session.CANCELED_STATUSES
             session.status = status_names.get(session.current_status, session.current_status)
 
-        session.filtered_artifacts = list(session.sessionpresentation_set.filter(document__type__slug__in=['agenda','minutes','bluesheets']))
-        session.filtered_artifacts.sort(key=lambda d:['agenda','minutes','bluesheets'].index(d.document.type.slug))
-        session.filtered_slides    = session.sessionpresentation_set.filter(document__type__slug='slides').order_by('order')
-        session.filtered_drafts    = session.sessionpresentation_set.filter(document__type__slug='draft')
-        session.filtered_chatlog_and_polls = session.sessionpresentation_set.filter(document__type__slug__in=('chatlog', 'polls')).order_by('document__type__slug')
-        # TODO FIXME Deleted materials shouldn't be in the sessionpresentation_set
+        if session.meeting.type_id == 'ietf' and not session.meeting.proceedings_final:
+            artifact_types = ['agenda','minutes','narrativeminutes']
+            if Attended.objects.filter(session=session).exists():
+                session.type_counter.update(['bluesheets'])
+                ota = session.official_timeslotassignment()
+                sess_time = ota and ota.timeslot.time
+                session.bluesheet_title = 'Attendance IETF%s: %s : %s' % (session.meeting.number, 
+                                                                          session.group.acronym, 
+                                                                          sess_time.strftime("%a %H:%M"))
+        else:
+            artifact_types = ['agenda','minutes','narrativeminutes','bluesheets']
+        session.filtered_artifacts = list(session.presentations.filter(document__type__slug__in=artifact_types))
+        session.filtered_artifacts.sort(key=lambda d:artifact_types.index(d.document.type.slug))
+        session.filtered_slides    = session.presentations.filter(document__type__slug='slides').order_by('order')
+        session.filtered_drafts    = session.presentations.filter(document__type__slug='draft')
+        
+        filtered_polls = session.presentations.filter(document__type__slug=('polls'))
+        filtered_chatlogs = session.presentations.filter(document__type__slug=('chatlog'))
+        session.filtered_chatlog_and_polls = chain(filtered_chatlogs, filtered_polls)
+        session.chatlog = filtered_chatlogs.first()
+
+        # TODO FIXME Deleted materials shouldn't be in the presentations
         for qs in [session.filtered_artifacts,session.filtered_slides,session.filtered_drafts]:
             qs = [p for p in qs if p.document.get_state_slug(p.document.type_id)!='deleted']
             session.type_counter.update([p.document.type.slug for p in qs])
@@ -2321,31 +2986,35 @@ def session_details(request, num, acronym):
 
     # we somewhat arbitrarily use the group of the last session we get from
     # get_sessions() above when checking can_manage_session_materials()
-    can_manage = can_manage_session_materials(request.user, session.group, session)
+    group = session.group
+    can_manage = can_manage_session_materials(request.user, group, session)
     can_view_request = can_view_interim_request(meeting, request.user)
 
     scheduled_sessions = [s for s in sessions if s.current_status == 'sched']
     unscheduled_sessions = [s for s in sessions if s.current_status != 'sched']
 
-    pending_suggestions = None
-    if request.user.is_authenticated:
-        if can_manage:
-            pending_suggestions = session.slidesubmission_set.filter(status__slug='pending')
-        else:
-            pending_suggestions = session.slidesubmission_set.filter(status__slug='pending', submitter=request.user.person)
+    # Start with all the pending suggestions for all the group's sessions
+    pending_suggestions = SlideSubmission.objects.filter(session__in=sessions, status__slug='pending')
+    if can_manage:
+        pass  # keep the full set
+    elif hasattr(request.user, "person"):
+        pending_suggestions = pending_suggestions.filter(submitter=request.user.person)
+    else:
+        pending_suggestions = SlideSubmission.objects.none()
 
+    tsa = session.official_timeslotassignment()
+    future = tsa is not None and timezone.now() < tsa.timeslot.end_time()
     return render(request, "meeting/session_details.html",
                   { 'scheduled_sessions':scheduled_sessions ,
                     'unscheduled_sessions':unscheduled_sessions , 
                     'pending_suggestions' : pending_suggestions,
                     'meeting' :meeting ,
-                    'acronym' :acronym,
+                    'group': group,
                     'is_materials_manager' : session.group.has_role(request.user, session.group.features.matman_roles),
                     'can_manage_materials' : can_manage,
                     'can_view_request': can_view_request,
-                    'thisweek': datetime.date.today()-datetime.timedelta(days=7),
-                    'now': datetime.datetime.now(),
-                    'use_codimd': True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False,
+                    'thisweek': datetime_today()-datetime.timedelta(days=7),
+                    'future': future,
                   })
 
 class SessionDraftsForm(forms.Form):
@@ -2370,7 +3039,7 @@ def add_session_drafts(request, session_id, num):
     if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
         raise Http404
 
-    already_linked = [sp.document for sp in session.sessionpresentation_set.filter(document__type_id='draft')]
+    already_linked = [sp.document for sp in session.presentations.filter(document__type_id='draft')]
 
     session_number = None
     sessions = get_sessions(session.meeting.number,session.group.acronym)
@@ -2381,7 +3050,7 @@ def add_session_drafts(request, session_id, num):
         form = SessionDraftsForm(request.POST,already_linked=already_linked)
         if form.is_valid():
             for draft in form.cleaned_data['drafts']:
-                session.sessionpresentation_set.create(document=draft,rev=None)
+                session.presentations.create(document=draft,rev=None)
                 c = DocEvent(type="added_comment", doc=draft, rev=draft.rev, by=request.user.person)
                 c.desc = "Added to session: %s" % session
                 c.save()
@@ -2392,10 +3061,153 @@ def add_session_drafts(request, session_id, num):
     return render(request, "meeting/add_session_drafts.html",
                   { 'session': session,
                     'session_number': session_number,
-                    'already_linked': session.sessionpresentation_set.filter(document__type_id='draft'),
+                    'already_linked': session.presentations.filter(document__type_id='draft'),
                     'form': form,
                   })
 
+class SessionRecordingsForm(forms.Form):
+    title = forms.CharField(max_length=255)
+    url = forms.URLField(label="URL of the recording (YouTube only)")
+
+    def clean_url(self):
+        url = self.cleaned_data['url']
+        parsed_url = urlparse(url)
+        if parsed_url.hostname not in YOUTUBE_DOMAINS:
+            raise forms.ValidationError("Must be a YouTube URL")
+        return url
+
+
+def add_session_recordings(request, session_id, num):
+    # num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
+    session = get_object_or_404(Session, pk=session_id)
+    if not session.can_manage_materials(request.user):
+        permission_denied(
+            request, "You don't have permission to manage recordings for this session."
+        )
+    if session.is_material_submission_cutoff() and not has_role(
+        request.user, "Secretariat"
+    ):
+        raise Http404
+
+    session_number = None
+    official_timeslotassignment = session.official_timeslotassignment()
+    assertion("official_timeslotassignment is not None")
+    initial = {
+        "title": "Video recording of {acronym} for {timestamp}".format(
+            acronym=session.group.acronym,
+            timestamp=official_timeslotassignment.timeslot.utc_start_time().strftime(
+                "%Y-%m-%d %H:%M"
+            ),
+        )
+    }
+
+    # find session number if WG has more than one session at the meeting
+    sessions = get_sessions(session.meeting.number, session.group.acronym)
+    if len(sessions) > 1:
+        session_number = 1 + sessions.index(session)
+
+    presentations = session.presentations.filter(
+        document__in=session.get_material("recording", only_one=False),
+    ).order_by("document__title", "document__external_url")
+
+    if request.method == "POST":
+        pk_to_delete = request.POST.get("delete", None)
+        if pk_to_delete is not None:
+            session_presentation = get_object_or_404(presentations, pk=pk_to_delete)
+            try:
+                delete_recording(session_presentation)
+            except ValueError as err:
+                log(f"Error deleting recording from session {session.pk}: {err}")
+                messages.error(
+                    request,
+                    "Unable to delete this recording. Please contact the secretariat for assistance.",
+                )
+            form = SessionRecordingsForm(initial=initial)
+        else:
+            form = SessionRecordingsForm(request.POST)
+            if form.is_valid():
+                title = form.cleaned_data["title"]
+                url = form.cleaned_data["url"]
+                create_recording(session, url, title=title, user=request.user.person)
+                return redirect(
+                    "ietf.meeting.views.session_details",
+                    num=session.meeting.number,
+                    acronym=session.group.acronym,
+                )
+    else:
+        form = SessionRecordingsForm(initial=initial)
+
+    return render(
+        request,
+        "meeting/add_session_recordings.html",
+        {
+            "session": session,
+            "session_number": session_number,
+            "already_linked": presentations,
+            "form": form,
+        },
+    )
+
+
+def session_attendance(request, session_id, num):
+    """Session attendance view
+
+    GET - retrieve the current session attendance or redirect to the published bluesheet if finalized
+
+    POST - self-attest attendance for logged-in user; falls through to GET for AnonymousUser or invalid request
+    """
+    # num is redundant, but we're dragging it along as an artifact of where we are in the current URL structure
+    session = get_object_or_404(Session, pk=session_id)
+    if session.meeting.type_id != "ietf" or session.meeting.proceedings_final:
+        bluesheets = session.presentations.filter(
+            document__type_id="bluesheets"
+        )
+        if bluesheets:
+            bluesheet = bluesheets[0].document
+            return redirect(bluesheet.get_href(session.meeting))
+        else:
+            raise Http404("Bluesheets not found")
+
+    cor_cut_off_date = session.meeting.get_submission_correction_date()
+    today_utc = date_today(datetime.UTC)
+    was_there = False
+    can_add = False
+    if request.user.is_authenticated:
+        # use getattr() instead of request.user.person because it's a reverse OneToOne field
+        person = getattr(request.user, "person", None)
+        # Consider allowing self-declared attendance if we have a person and at least one Attended instance exists.
+        # The latter condition will be satisfied when Meetecho pushes their attendee records - assuming that at least
+        # one person will have accessed the meeting tool. This prevents people from self-declaring before they are
+        # marked as attending if they did log in to the meeting tool (except for a tiny window while records are
+        # being processed).
+        if person is not None and Attended.objects.filter(session=session).exists():
+            was_there = Attended.objects.filter(session=session, person=person).exists()
+            can_add = (
+                today_utc <= cor_cut_off_date
+                and Registration.objects.filter(
+                    meeting=session.meeting, person=person
+                ).exists()
+                and not was_there
+            )
+            if can_add and request.method == "POST":
+                session.attended_set.get_or_create(
+                    person=person, defaults={"origin": "self declared"}
+                )
+                can_add = False
+                was_there = True
+
+    data = bluesheet_data(session)
+    return render(
+        request,
+        "meeting/attendance.html",
+        {
+            "session": session,
+            "data": data,
+            "can_add": can_add,
+            "was_there": was_there,
+        },
+    )
+
 
 def upload_session_bluesheets(request, session_id, num):
     # num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
@@ -2422,7 +3234,10 @@ def upload_session_bluesheets(request, session_id, num):
             ota = session.official_timeslotassignment()
             sess_time = ota and ota.timeslot.time
             if not sess_time:
-                return HttpResponseGone("Cannot receive uploads for an unscheduled session.  Please check the session ID.", content_type="text/plain")
+                return HttpResponseGone(
+                    "Cannot receive uploads for an unscheduled session.  Please check the session ID.",
+                    content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+                )
 
 
             save_error = save_bluesheet(request, session, file, encoding=form.file_encoding[file.name])
@@ -2434,7 +3249,7 @@ def upload_session_bluesheets(request, session_id, num):
     else: 
         form = UploadBlueSheetForm()
 
-    bluesheet_sp = session.sessionpresentation_set.filter(document__type='bluesheets').first()
+    bluesheet_sp = session.presentations.filter(document__type='bluesheets').first()
 
     return render(request, "meeting/upload_session_bluesheets.html", 
                   {'session': session,
@@ -2444,48 +3259,6 @@ def upload_session_bluesheets(request, session_id, num):
                   })
 
 
-def save_bluesheet(request, session, file, encoding='utf-8'):
-    bluesheet_sp = session.sessionpresentation_set.filter(document__type='bluesheets').first()
-    _, ext = os.path.splitext(file.name)
-
-    if bluesheet_sp:
-        doc = bluesheet_sp.document
-        doc.rev = '%02d' % (int(doc.rev)+1)
-        bluesheet_sp.rev = doc.rev
-        bluesheet_sp.save()
-    else:
-        ota = session.official_timeslotassignment()
-        sess_time = ota and ota.timeslot.time
-
-        if session.meeting.type_id=='ietf':
-            name = 'bluesheets-%s-%s-%s' % (session.meeting.number, 
-                                            session.group.acronym, 
-                                            sess_time.strftime("%Y%m%d%H%M"))
-            title = 'Bluesheets IETF%s: %s : %s' % (session.meeting.number, 
-                                                    session.group.acronym, 
-                                                    sess_time.strftime("%a %H:%M"))
-        else:
-            name = 'bluesheets-%s-%s' % (session.meeting.number, sess_time.strftime("%Y%m%d%H%M"))
-            title = 'Bluesheets %s: %s' % (session.meeting.number, sess_time.strftime("%a %H:%M"))
-        doc = Document.objects.create(
-                  name = name,
-                  type_id = 'bluesheets',
-                  title = title,
-                  group = session.group,
-                  rev = '00',
-              )
-        doc.states.add(State.objects.get(type_id='bluesheets',slug='active'))
-        DocAlias.objects.create(name=doc.name).docs.add(doc)
-        session.sessionpresentation_set.create(document=doc,rev='00')
-    filename = '%s-%s%s'% ( doc.name, doc.rev, ext)
-    doc.uploaded_filename = filename
-    e = NewRevisionDocEvent.objects.create(doc=doc, rev=doc.rev, by=request.user.person, type='new_revision', desc='New revision available: %s'%doc.rev)
-    save_error = handle_upload_file(file, filename, session.meeting, 'bluesheets', request=request, encoding=encoding)
-    if not save_error:
-        doc.save_with_history([e])
-    return save_error
-
-
 def upload_session_minutes(request, session_id, num):
     # num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
     session = get_object_or_404(Session,pk=session_id)
@@ -2501,7 +3274,7 @@ def upload_session_minutes(request, session_id, num):
     if len(sessions) > 1:
        session_number = 1 + sessions.index(session)
 
-    minutes_sp = session.sessionpresentation_set.filter(document__type='minutes').first()
+    minutes_sp = session.presentations.filter(document__type='minutes').first()
     
     if request.method == 'POST':
         form = UploadMinutesForm(show_apply_to_all_checkbox,request.POST,request.FILES)
@@ -2525,24 +3298,130 @@ def upload_session_minutes(request, session_id, num):
             except SessionNotScheduledError:
                 return HttpResponseGone(
                     "Cannot receive uploads for an unscheduled session. Please check the session ID.",
-                    content_type="text/plain",
+                    content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
                 )
             except SaveMaterialsError as err:
                 form.add_error(None, str(err))
             else:
                 # no exception -- success!
+                resolve_uploaded_material(meeting=session.meeting, doc=session.minutes())
                 messages.success(request, f'Successfully uploaded minutes as revision {session.minutes().rev}.')
                 return redirect('ietf.meeting.views.session_details', num=num, acronym=session.group.acronym)
     else:
         form = UploadMinutesForm(show_apply_to_all_checkbox)
 
+    tsa = session.official_timeslotassignment()
+    future = tsa is not None and timezone.now() < tsa.timeslot.end_time()
     return render(request, "meeting/upload_session_minutes.html", 
                   {'session': session,
                    'session_number': session_number,
                    'minutes_sp' : minutes_sp,
                    'form': form,
+                   'future': future,
                   })
 
+@role_required("Secretariat")
+def upload_session_narrativeminutes(request, session_id, num):
+    # num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
+    session = get_object_or_404(Session,pk=session_id)
+    if session.group.acronym != "iesg":
+        raise Http404()
+    
+    session_number = None
+    sessions = get_sessions(session.meeting.number,session.group.acronym)
+    show_apply_to_all_checkbox = len(sessions) > 1 if session.type_id == 'regular' else False
+    if len(sessions) > 1:
+       session_number = 1 + sessions.index(session)
+
+    narrativeminutes_sp = session.presentations.filter(document__type='narrativeminutes').first()
+    
+    if request.method == 'POST':
+        form = UploadNarrativeMinutesForm(show_apply_to_all_checkbox,request.POST,request.FILES)
+        if form.is_valid():
+            file = request.FILES['file']
+            _, ext = os.path.splitext(file.name)
+            apply_to_all = session.type_id == 'regular'
+            if show_apply_to_all_checkbox:
+                apply_to_all = form.cleaned_data['apply_to_all']
+
+            # Set up the new revision
+            try:
+                save_session_minutes_revision(
+                    session=session,
+                    apply_to_all=apply_to_all,
+                    file=file,
+                    ext=ext,
+                    encoding=form.file_encoding[file.name],
+                    request=request,
+                    narrative=True
+                )
+            except SessionNotScheduledError:
+                return HttpResponseGone(
+                    "Cannot receive uploads for an unscheduled session. Please check the session ID.",
+                    content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+                )
+            except SaveMaterialsError as err:
+                form.add_error(None, str(err))
+            else:
+                # no exception -- success!
+                resolve_uploaded_material(meeting=session.meeting, doc=session.narrative_minutes())
+                messages.success(request, f'Successfully uploaded narrative minutes as revision {session.narrative_minutes().rev}.')
+                return redirect('ietf.meeting.views.session_details', num=num, acronym=session.group.acronym)
+    else:
+        form = UploadMinutesForm(show_apply_to_all_checkbox)
+
+    return render(request, "meeting/upload_session_narrativeminutes.html", 
+                  {'session': session,
+                   'session_number': session_number,
+                   'minutes_sp' : narrativeminutes_sp,
+                   'form': form,
+                  })
+
+class UploadOrEnterAgendaForm(UploadAgendaForm):
+    ACTIONS = [
+        ("upload", "Upload agenda"),
+        ("enter", "Enter agenda"),
+    ]
+    submission_method = forms.ChoiceField(choices=ACTIONS, widget=forms.RadioSelect)
+
+    content = forms.CharField(widget=forms.Textarea, required=False, strip=False, label="Agenda text")
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["file"].required=False
+        self.order_fields(["submission_method", "file", "content"])
+
+    def clean_content(self):
+        return self.cleaned_data["content"].replace("\r", "")
+
+    def clean_file(self):
+        submission_method = self.cleaned_data.get("submission_method")
+        if submission_method == "upload":
+            if self.cleaned_data.get("file", None) is not None:
+                return super().clean_file()
+        return None
+
+    def clean(self):
+        def require_field(f):
+            if not self.cleaned_data.get(f):
+                self.add_error(f, ValidationError("You must fill in this field."))
+
+        submission_method = self.cleaned_data.get("submission_method")
+        if submission_method == "upload":
+            require_field("file")
+        elif submission_method == "enter":
+            require_field("content")
+
+    def get_file(self):
+        """Get content as a file-like object"""
+        if self.cleaned_data.get("submission_method") == "upload":
+            return self.cleaned_data["file"]
+        else:
+            return SimpleUploadedFile(
+                name="uploaded.md",
+                content=self.cleaned_data["content"].encode("utf-8"),
+                content_type="text/markdown;charset=utf-8",
+            )
 
 def upload_session_agenda(request, session_id, num):
     # num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
@@ -2559,12 +3438,12 @@ def upload_session_agenda(request, session_id, num):
     if len(sessions) > 1:
        session_number = 1 + sessions.index(session)
 
-    agenda_sp = session.sessionpresentation_set.filter(document__type='agenda').first()
+    agenda_sp = session.presentations.filter(document__type='agenda').first()
     
     if request.method == 'POST':
-        form = UploadAgendaForm(show_apply_to_all_checkbox,request.POST,request.FILES)
+        form = UploadOrEnterAgendaForm(show_apply_to_all_checkbox,request.POST,request.FILES)
         if form.is_valid():
-            file = request.FILES['file']
+            file = form.get_file()
             _, ext = os.path.splitext(file.name)
             apply_to_all = session.type.slug == 'regular'
             if show_apply_to_all_checkbox:
@@ -2578,7 +3457,10 @@ def upload_session_agenda(request, session_id, num):
                 ota = session.official_timeslotassignment()
                 sess_time = ota and ota.timeslot.time
                 if not sess_time:
-                    return HttpResponseGone("Cannot receive uploads for an unscheduled session.  Please check the session ID.", content_type="text/plain")
+                    return HttpResponseGone(
+                        "Cannot receive uploads for an unscheduled session.  Please check the session ID.",
+                        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+                    )
                 if session.meeting.type_id=='ietf':
                     name = 'agenda-%s-%s' % (session.meeting.number, 
                                                  session.group.acronym) 
@@ -2604,32 +3486,40 @@ def upload_session_agenda(request, session_id, num):
                               group = session.group,
                               rev = '00',
                           )
-                    DocAlias.objects.create(name=doc.name).docs.add(doc)
                 doc.states.add(State.objects.get(type_id='agenda',slug='active'))
-            if session.sessionpresentation_set.filter(document=doc).exists():
-                sp = session.sessionpresentation_set.get(document=doc)
+            if session.presentations.filter(document=doc).exists():
+                sp = session.presentations.get(document=doc)
                 sp.rev = doc.rev
                 sp.save()
             else:
-                session.sessionpresentation_set.create(document=doc,rev=doc.rev)
+                session.presentations.create(document=doc,rev=doc.rev)
             if apply_to_all:
                 for other_session in sessions:
                     if other_session != session:
-                        other_session.sessionpresentation_set.filter(document__type='agenda').delete()
-                        other_session.sessionpresentation_set.create(document=doc,rev=doc.rev)
+                        other_session.presentations.filter(document__type='agenda').delete()
+                        other_session.presentations.create(document=doc,rev=doc.rev)
             filename = '%s-%s%s'% ( doc.name, doc.rev, ext)
             doc.uploaded_filename = filename
             e = NewRevisionDocEvent.objects.create(doc=doc,by=request.user.person,type='new_revision',desc='New revision available: %s'%doc.rev,rev=doc.rev)
             # The way this function builds the filename it will never trigger the file delete in handle_file_upload.
-            save_error = handle_upload_file(file, filename, session.meeting, 'agenda', request=request, encoding=form.file_encoding[file.name])
+            try:
+                encoding=form.file_encoding[file.name]
+            except AttributeError:
+                encoding=None
+            save_error = handle_upload_file(file, filename, session.meeting, 'agenda', request=request, encoding=encoding)
             if save_error:
                 form.add_error(None, save_error)
             else:
                 doc.save_with_history([e])
+                resolve_uploaded_material(meeting=session.meeting, doc=doc)
                 messages.success(request, f'Successfully uploaded agenda as revision {doc.rev}.')
                 return redirect('ietf.meeting.views.session_details',num=num,acronym=session.group.acronym)
     else: 
-        form = UploadAgendaForm(show_apply_to_all_checkbox, initial={'apply_to_all':session.type_id=='regular'})
+        initial={'apply_to_all':session.type_id=='regular', 'submission_method':'upload'}
+        if agenda_sp:
+            doc = agenda_sp.document
+            initial['content'] = doc.text()
+        form = UploadOrEnterAgendaForm(show_apply_to_all_checkbox, initial=initial)
 
     return render(request, "meeting/upload_session_agenda.html", 
                   {'session': session,
@@ -2639,299 +3529,495 @@ def upload_session_agenda(request, session_id, num):
                   })
 
 
-def upload_session_slides(request, session_id, num, name):
+@login_required
+def upload_session_slides(request, session_id, num, name=None):
+    """Upload new or replacement slides for a session
+    
+    If name is None or "", expects a new set of slides. Otherwise, replaces the named slides with a new rev.
+    """
     # num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
-    session = get_object_or_404(Session,pk=session_id)
-    if not session.can_manage_materials(request.user):
-        permission_denied(request, "You don't have permission to upload slides for this session.")
-    if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
-        permission_denied(request, "The materials cutoff for this session has passed. Contact the secretariat for further action.")
+    session = get_object_or_404(Session, pk=session_id)
+    can_manage = session.can_manage_materials(request.user)
+    if session.is_material_submission_cutoff() and not has_role(
+        request.user, "Secretariat"
+    ):
+        permission_denied(
+            request,
+            "The materials cutoff for this session has passed. Contact the secretariat for further action.",
+        )
 
     session_number = None
-    sessions = get_sessions(session.meeting.number,session.group.acronym)
-    show_apply_to_all_checkbox = len(sessions) > 1 if session.type_id == 'regular' else False
+    sessions = get_sessions(session.meeting.number, session.group.acronym)
+    show_apply_to_all_checkbox = (
+        len(sessions) > 1 if session.type_id == "regular" else False
+    )
     if len(sessions) > 1:
-       session_number = 1 + sessions.index(session)
+        session_number = 1 + sessions.index(session)
 
-    slides = None
-    slides_sp = None
+    doc = None
     if name:
-        slides = Document.objects.filter(name=name).first()
-        if not (slides and slides.type_id=='slides'):
-            raise Http404
-        slides_sp = session.sessionpresentation_set.filter(document=slides).first()
-    
-    if request.method == 'POST':
-        form = UploadSlidesForm(session, show_apply_to_all_checkbox,request.POST,request.FILES)
+        doc = get_object_or_404(
+            session.presentations, document__name=name, document__type_id="slides"
+        ).document
+
+    if request.method == "POST":
+        form = UploadSlidesForm(
+            session, show_apply_to_all_checkbox, can_manage, request.POST, request.FILES
+        )
         if form.is_valid():
-            file = request.FILES['file']
+            file = request.FILES["file"]
             _, ext = os.path.splitext(file.name)
-            apply_to_all = session.type_id == 'regular'
+            apply_to_all = session.type_id == "regular"
             if show_apply_to_all_checkbox:
-                apply_to_all = form.cleaned_data['apply_to_all']
-            if slides_sp:
-                doc = slides_sp.document
-                doc.rev = '%02d' % (int(doc.rev)+1)
-                doc.title = form.cleaned_data['title']
-                slides_sp.rev = doc.rev
-                slides_sp.save()
+                apply_to_all = form.cleaned_data["apply_to_all"]
+            if can_manage:
+                approved = form.cleaned_data["approved"]
             else:
+                approved = False
+
+            # Propose slides if not auto-approved
+            if not approved:
                 title = form.cleaned_data['title']
+                submission = SlideSubmission.objects.create(session = session, title = title, filename = '', apply_to_all = apply_to_all, submitter=request.user.person)
+
                 if session.meeting.type_id=='ietf':
                     name = 'slides-%s-%s' % (session.meeting.number, 
-                                             session.group.acronym) 
+                                         session.group.acronym) 
                     if not apply_to_all:
                         name += '-%s' % (session.docname_token(),)
                 else:
                     name = 'slides-%s-%s' % (session.meeting.number, session.docname_token())
                 name = name + '-' + slugify(title).replace('_', '-')[:128]
+                filename = '%s-ss%d%s'% (name, submission.id, ext)
+                destination = io.open(os.path.join(settings.SLIDE_STAGING_PATH, filename),'wb+')
+                for chunk in file.chunks():
+                    destination.write(chunk)
+                destination.close()
+                file.seek(0)
+                store_file("staging", filename, file)
+
+                submission.filename = filename
+                submission.save()
+
+                (to, cc) = gather_address_lists('slides_proposed', group=session.group, proposer=request.user.person).as_strings()
+                msg_txt = render_to_string("meeting/slides_proposed.txt", {
+                        "to": to,
+                        "cc": cc,
+                        "submission": submission,
+                        "settings": settings,
+                     })
+                msg = infer_message(msg_txt)
+                msg.by = request.user.person
+                msg.save()
+                send_mail_message(request, msg)
+                messages.success(request, 'Successfully submitted proposed slides.')
+                return redirect('ietf.meeting.views.session_details',num=num,acronym=session.group.acronym)
+
+            # Handle creation / update of the Document (but do not save yet)
+            if doc is not None:
+                # This is a revision - bump the version and update the title.
+                doc.rev = "%02d" % (int(doc.rev) + 1)
+                doc.title = form.cleaned_data["title"]
+            else:
+                # This is a new slide deck - create a new doc unless one exists with that name
+                title = form.cleaned_data["title"]
+                if session.meeting.type_id == "ietf":
+                    name = "slides-%s-%s" % (
+                        session.meeting.number,
+                        session.group.acronym,
+                    )
+                    if not apply_to_all:
+                        name += "-%s" % (session.docname_token(),)
+                else:
+                    name = "slides-%s-%s" % (
+                        session.meeting.number,
+                        session.docname_token(),
+                    )
+                name = name + "-" + slugify(title).replace("_", "-")[:128]
                 if Document.objects.filter(name=name).exists():
-                   doc = Document.objects.get(name=name)
-                   doc.rev = '%02d' % (int(doc.rev)+1)
-                   doc.title = form.cleaned_data['title']
+                    doc = Document.objects.get(name=name)
+                    doc.rev = "%02d" % (int(doc.rev) + 1)
+                    doc.title = form.cleaned_data["title"]
                 else:
                     doc = Document.objects.create(
-                              name = name,
-                              type_id = 'slides',
-                              title = title,
-                              group = session.group,
-                              rev = '00',
-                          )
-                    DocAlias.objects.create(name=doc.name).docs.add(doc)
-                doc.states.add(State.objects.get(type_id='slides',slug='active'))
-                doc.states.add(State.objects.get(type_id='reuse_policy',slug='single'))
-            if session.sessionpresentation_set.filter(document=doc).exists():
-                sp = session.sessionpresentation_set.get(document=doc)
-                sp.rev = doc.rev
-                sp.save()
-            else:
-                max_order = session.sessionpresentation_set.filter(document__type='slides').aggregate(Max('order'))['order__max'] or 0
-                session.sessionpresentation_set.create(document=doc,rev=doc.rev,order=max_order+1)
-            if apply_to_all:
-                for other_session in sessions:
-                    if other_session != session and not other_session.sessionpresentation_set.filter(document=doc).exists():
-                        max_order = other_session.sessionpresentation_set.filter(document__type='slides').aggregate(Max('order'))['order__max'] or 0
-                        other_session.sessionpresentation_set.create(document=doc,rev=doc.rev,order=max_order+1)
-            filename = '%s-%s%s'% ( doc.name, doc.rev, ext)
+                        name=name,
+                        type_id="slides",
+                        title=title,
+                        group=session.group,
+                        rev="00",
+                    )
+                doc.states.add(State.objects.get(type_id="slides", slug="active"))
+                doc.states.add(State.objects.get(type_id="reuse_policy", slug="single"))
+
+            # Now handle creation / update of the SessionPresentation(s)
+            sessions_to_apply = sessions if apply_to_all else [session]
+            added_presentations = []
+            revised_presentations = []
+            for sess in sessions_to_apply:
+                sp = sess.presentations.filter(document=doc).first()
+                if sp is not None:
+                    sp.rev = doc.rev
+                    sp.save()
+                    revised_presentations.append(sp)
+                else:
+                    max_order = (
+                        sess.presentations.filter(document__type="slides").aggregate(
+                            Max("order")
+                        )["order__max"]
+                        or 0
+                    )
+                    sp = sess.presentations.create(
+                        document=doc, rev=doc.rev, order=max_order + 1
+                    )
+                    added_presentations.append(sp)
+
+            # Now handle the uploaded file
+            filename = "%s-%s%s" % (doc.name, doc.rev, ext)
             doc.uploaded_filename = filename
-            e = NewRevisionDocEvent.objects.create(doc=doc,by=request.user.person,type='new_revision',desc='New revision available: %s'%doc.rev,rev=doc.rev)
+            e = NewRevisionDocEvent.objects.create(
+                doc=doc,
+                by=request.user.person,
+                type="new_revision",
+                desc="New revision available: %s" % doc.rev,
+                rev=doc.rev,
+            )
             # The way this function builds the filename it will never trigger the file delete in handle_file_upload.
-            save_error = handle_upload_file(file, filename, session.meeting, 'slides', request=request, encoding=form.file_encoding[file.name])
+            save_error = handle_upload_file(
+                file,
+                filename,
+                session.meeting,
+                "slides",
+                request=request,
+                encoding=form.file_encoding[file.name],
+            )
             if save_error:
                 form.add_error(None, save_error)
             else:
                 doc.save_with_history([e])
                 post_process(doc)
+                resolve_uploaded_material(meeting=session.meeting, doc=doc)
+
+            # Send MeetEcho updates even if we had a problem saving - that will keep it in sync with the
+            # SessionPresentation, which was already saved regardless of problems saving the file.
+            if hasattr(settings, "MEETECHO_API_CONFIG"):
+                sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+                for sp in added_presentations:
+                    try:
+                        sm.add(session=sp.session, slides=doc, order=sp.order)
+                    except MeetechoAPIError as err:
+                        log(f"Error in SlidesManager.add(): {err}")
+                for sp in revised_presentations:
+                    try:
+                        sm.revise(session=sp.session, slides=doc)
+                    except MeetechoAPIError as err:
+                        log(f"Error in SlidesManager.revise(): {err}")
+
+            if not save_error:
                 messages.success(
                     request,
-                    f'Successfully uploaded slides as revision {doc.rev} of {doc.name}.')
-                return redirect('ietf.meeting.views.session_details',num=num,acronym=session.group.acronym)
-    else: 
+                    f"Successfully uploaded slides as revision {doc.rev} of {doc.name}.",
+                )
+                return redirect(
+                    "ietf.meeting.views.session_details",
+                    num=num,
+                    acronym=session.group.acronym,
+                )
+    else:
         initial = {}
-        if slides:
-            initial = {'title':slides.title}
-        form = UploadSlidesForm(session, show_apply_to_all_checkbox, initial=initial)
-
-    return render(request, "meeting/upload_session_slides.html", 
-                  {'session': session,
-                   'session_number': session_number,
-                   'slides_sp' : slides_sp,
-                   'form': form,
-                  })
-@login_required
-def propose_session_slides(request, session_id, num):
-    session = get_object_or_404(Session,pk=session_id)
-    if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
-        permission_denied(request, "The materials cutoff for this session has passed. Contact the secretariat for further action.")
+        if doc is not None:
+            initial = {"title": doc.title}
+        form = UploadSlidesForm(session, show_apply_to_all_checkbox, can_manage, initial=initial)
 
-    session_number = None
-    sessions = get_sessions(session.meeting.number,session.group.acronym)
-    show_apply_to_all_checkbox = len(sessions) > 1 if session.type_id == 'regular' else False
-    if len(sessions) > 1:
-       session_number = 1 + sessions.index(session)
-
-    
-    if request.method == 'POST':
-        form = UploadSlidesForm(session, show_apply_to_all_checkbox,request.POST,request.FILES)
-        if form.is_valid():
-            file = request.FILES['file']
-            _, ext = os.path.splitext(file.name)
-            apply_to_all = session.type_id == 'regular'
-            if show_apply_to_all_checkbox:
-                apply_to_all = form.cleaned_data['apply_to_all']
-            title = form.cleaned_data['title']
-
-            submission = SlideSubmission.objects.create(session = session, title = title, filename = '', apply_to_all = apply_to_all, submitter=request.user.person)
-
-            if session.meeting.type_id=='ietf':
-                name = 'slides-%s-%s' % (session.meeting.number, 
-                                         session.group.acronym) 
-                if not apply_to_all:
-                    name += '-%s' % (session.docname_token(),)
-            else:
-                name = 'slides-%s-%s' % (session.meeting.number, session.docname_token())
-            name = name + '-' + slugify(title).replace('_', '-')[:128]
-            filename = '%s-ss%d%s'% (name, submission.id, ext)
-            destination = io.open(os.path.join(settings.SLIDE_STAGING_PATH, filename),'wb+')
-            for chunk in file.chunks():
-                destination.write(chunk)
-            destination.close()
-
-            submission.filename = filename
-            submission.save()
-
-            (to, cc) = gather_address_lists('slides_proposed', group=session.group).as_strings() 
-            msg_txt = render_to_string("meeting/slides_proposed.txt", {
-                    "to": to,
-                    "cc": cc,
-                    "submission": submission,
-                    "settings": settings,
-                 })
-            msg = infer_message(msg_txt)
-            msg.by = request.user.person
-            msg.save()
-            send_mail_message(request, msg)
-            messages.success(request, 'Successfully submitted proposed slides.')
-            return redirect('ietf.meeting.views.session_details',num=num,acronym=session.group.acronym)
-    else: 
-        initial = {}
-        form = UploadSlidesForm(session, show_apply_to_all_checkbox, initial=initial)
+    return render(
+        request,
+        "meeting/upload_session_slides.html",
+        {
+            "session": session,
+            "session_number": session_number,
+            "slides_sp": session.presentations.filter(document=doc).first() if doc else None,
+            "manage": session.can_manage_materials(request.user),
+            "form": form,
+        },
+    )
 
-    return render(request, "meeting/propose_session_slides.html", 
-                  {'session': session,
-                   'session_number': session_number,
-                   'form': form,
-                  })
 
 def remove_sessionpresentation(request, session_id, num, name):
-    sp = get_object_or_404(SessionPresentation,session_id=session_id,document__name=name)
+    sp = get_object_or_404(
+        SessionPresentation, session_id=session_id, document__name=name
+    )
     session = sp.session
     if not session.can_manage_materials(request.user):
-        permission_denied(request, "You don't have permission to manage materials for this session.")
-    if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
-        permission_denied(request, "The materials cutoff for this session has passed. Contact the secretariat for further action.")
-    if request.method == 'POST':
-        session.sessionpresentation_set.filter(pk=sp.pk).delete()
-        c = DocEvent(type="added_comment", doc=sp.document, rev=sp.document.rev, by=request.user.person)
+        permission_denied(
+            request, "You don't have permission to manage materials for this session."
+        )
+    if session.is_material_submission_cutoff() and not has_role(
+        request.user, "Secretariat"
+    ):
+        permission_denied(
+            request,
+            "The materials cutoff for this session has passed. Contact the secretariat for further action.",
+        )
+    if request.method == "POST":
+        session.presentations.filter(pk=sp.pk).delete()
+        c = DocEvent(
+            type="added_comment",
+            doc=sp.document,
+            rev=sp.document.rev,
+            by=request.user.person,
+        )
         c.desc = "Removed from session: %s" % (session)
         c.save()
-        messages.success(request, f'Successfully removed {name}.')
-        return redirect('ietf.meeting.views.session_details', num=session.meeting.number, acronym=session.group.acronym)
+        messages.success(request, f"Successfully removed {name}.")
+        if sp.document.type_id == "slides" and hasattr(settings, "MEETECHO_API_CONFIG"):
+            sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+            try:
+                sm.delete(session=session, slides=sp.document)
+            except MeetechoAPIError as err:
+                log(f"Error in SlidesManager.delete(): {err}")
+
+        return redirect(
+            "ietf.meeting.views.session_details",
+            num=session.meeting.number,
+            acronym=session.group.acronym,
+        )
+
+    return render(request, "meeting/remove_sessionpresentation.html", {"sp": sp})
 
-    return render(request,'meeting/remove_sessionpresentation.html', {'sp': sp })
 
 def ajax_add_slides_to_session(request, session_id, num):
-    session = get_object_or_404(Session,pk=session_id)
+    session = get_object_or_404(Session, pk=session_id)
 
     if not session.can_manage_materials(request.user):
-        permission_denied(request, "You don't have permission to upload slides for this session.")
-    if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
-        permission_denied(request, "The materials cutoff for this session has passed. Contact the secretariat for further action.")
+        permission_denied(
+            request, "You don't have permission to upload slides for this session."
+        )
+    if session.is_material_submission_cutoff() and not has_role(
+        request.user, "Secretariat"
+    ):
+        permission_denied(
+            request,
+            "The materials cutoff for this session has passed. Contact the secretariat for further action.",
+        )
 
-    if request.method != 'POST' or not request.POST:
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'No data submitted or not POST' }),content_type='application/json')
+    if request.method != "POST" or not request.POST:
+        return HttpResponse(
+            json.dumps({"success": False, "error": "No data submitted or not POST"}),
+            content_type="application/json",
+        )
 
-    order_str = request.POST.get('order', None)    
+    order_str = request.POST.get("order", None)
     try:
         order = int(order_str)
     except (ValueError, TypeError):
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied order is not valid' }),content_type='application/json')
-    if order < 1 or order > session.sessionpresentation_set.filter(document__type_id='slides').count() + 1 :
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied order is not valid' }),content_type='application/json')
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied order is not valid"}),
+            content_type="application/json",
+        )
+    if (
+        order < 1
+        or order > session.presentations.filter(document__type_id="slides").count() + 1
+    ):
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied order is not valid"}),
+            content_type="application/json",
+        )
 
-    name = request.POST.get('name', None)
+    name = request.POST.get("name", None)
     doc = Document.objects.filter(name=name).first()
     if not doc:
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied name is not valid' }),content_type='application/json')
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied name is not valid"}),
+            content_type="application/json",
+        )
 
-    if not session.sessionpresentation_set.filter(document=doc).exists():
+    if not session.presentations.filter(document=doc).exists():
         condition_slide_order(session)
-        session.sessionpresentation_set.filter(document__type_id='slides', order__gte=order).update(order=F('order')+1)
-        session.sessionpresentation_set.create(document=doc,rev=doc.rev,order=order)
-        DocEvent.objects.create(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person, desc="Added to session: %s" % session)
+        session.presentations.filter(
+            document__type_id="slides", order__gte=order
+        ).update(order=F("order") + 1)
+        session.presentations.create(document=doc, rev=doc.rev, order=order)
+        DocEvent.objects.create(
+            type="added_comment",
+            doc=doc,
+            rev=doc.rev,
+            by=request.user.person,
+            desc="Added to session: %s" % session,
+        )
+
+        # Notify Meetecho of new slides if the API is configured
+        if hasattr(settings, "MEETECHO_API_CONFIG"):
+            sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+            try:
+                sm.add(session=session, slides=doc, order=order)
+            except MeetechoAPIError as err:
+                log(f"Error in SlidesManager.add(): {err}")
 
-    return HttpResponse(json.dumps({'success':True}), content_type='application/json')
+    return HttpResponse(json.dumps({"success": True}), content_type="application/json")
 
 
 def ajax_remove_slides_from_session(request, session_id, num):
-    session = get_object_or_404(Session,pk=session_id)
+    session = get_object_or_404(Session, pk=session_id)
 
     if not session.can_manage_materials(request.user):
-        permission_denied(request, "You don't have permission to upload slides for this session.")
-    if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
-        permission_denied(request, "The materials cutoff for this session has passed. Contact the secretariat for further action.")
+        permission_denied(
+            request, "You don't have permission to upload slides for this session."
+        )
+    if session.is_material_submission_cutoff() and not has_role(
+        request.user, "Secretariat"
+    ):
+        permission_denied(
+            request,
+            "The materials cutoff for this session has passed. Contact the secretariat for further action.",
+        )
 
-    if request.method != 'POST' or not request.POST:
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'No data submitted or not POST' }),content_type='application/json')  
+    if request.method != "POST" or not request.POST:
+        return HttpResponse(
+            json.dumps({"success": False, "error": "No data submitted or not POST"}),
+            content_type="application/json",
+        )
 
-    oldIndex_str = request.POST.get('oldIndex', None)
+    oldIndex_str = request.POST.get("oldIndex", None)
     try:
         oldIndex = int(oldIndex_str)
     except (ValueError, TypeError):
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
-    if oldIndex < 1 or oldIndex > session.sessionpresentation_set.filter(document__type_id='slides').count() :
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied index is not valid"}),
+            content_type="application/json",
+        )
+    if (
+        oldIndex < 1
+        or oldIndex > session.presentations.filter(document__type_id="slides").count()
+    ):
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied index is not valid"}),
+            content_type="application/json",
+        )
 
-    name = request.POST.get('name', None)
+    name = request.POST.get("name", None)
     doc = Document.objects.filter(name=name).first()
     if not doc:
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied name is not valid' }),content_type='application/json')
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied name is not valid"}),
+            content_type="application/json",
+        )
 
     condition_slide_order(session)
-    affected_presentations = session.sessionpresentation_set.filter(document=doc).first()
+    affected_presentations = session.presentations.filter(document=doc).first()
     if affected_presentations:
         if affected_presentations.order == oldIndex:
             affected_presentations.delete()
-            session.sessionpresentation_set.filter(document__type_id='slides', order__gt=oldIndex).update(order=F('order')-1)    
-            DocEvent.objects.create(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person, desc="Removed from session: %s" % session)
-            return HttpResponse(json.dumps({'success':True}), content_type='application/json')
+            session.presentations.filter(
+                document__type_id="slides", order__gt=oldIndex
+            ).update(order=F("order") - 1)
+            DocEvent.objects.create(
+                type="added_comment",
+                doc=doc,
+                rev=doc.rev,
+                by=request.user.person,
+                desc="Removed from session: %s" % session,
+            )
+            # Notify Meetecho of removed slides if the API is configured
+            if hasattr(settings, "MEETECHO_API_CONFIG"):
+                sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+                try:
+                    sm.delete(session=session, slides=doc)
+                except MeetechoAPIError as err:
+                    log(f"Error in SlidesManager.delete(): {err}")
+            # Report success
+            return HttpResponse(
+                json.dumps({"success": True}), content_type="application/json"
+            )
         else:
-            return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Name does not match index' }),content_type='application/json')
+            return HttpResponse(
+                json.dumps({"success": False, "error": "Name does not match index"}),
+                content_type="application/json",
+            )
     else:
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'SessionPresentation not found' }),content_type='application/json')
+        return HttpResponse(
+            json.dumps({"success": False, "error": "SessionPresentation not found"}),
+            content_type="application/json",
+        )
 
 
 def ajax_reorder_slides_in_session(request, session_id, num):
-    session = get_object_or_404(Session,pk=session_id)
+    session = get_object_or_404(Session, pk=session_id)
 
     if not session.can_manage_materials(request.user):
-        permission_denied(request, "You don't have permission to upload slides for this session.")
-    if session.is_material_submission_cutoff() and not has_role(request.user, "Secretariat"):
-        permission_denied(request, "The materials cutoff for this session has passed. Contact the secretariat for further action.")
+        permission_denied(
+            request, "You don't have permission to upload slides for this session."
+        )
+    if session.is_material_submission_cutoff() and not has_role(
+        request.user, "Secretariat"
+    ):
+        permission_denied(
+            request,
+            "The materials cutoff for this session has passed. Contact the secretariat for further action.",
+        )
 
-    if request.method != 'POST' or not request.POST:
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'No data submitted or not POST' }),content_type='application/json')  
+    if request.method != "POST" or not request.POST:
+        return HttpResponse(
+            json.dumps({"success": False, "error": "No data submitted or not POST"}),
+            content_type="application/json",
+        )
 
-    num_slides_in_session = session.sessionpresentation_set.filter(document__type_id='slides').count()
-    oldIndex_str = request.POST.get('oldIndex', None)
+    session_slides = session.presentations.filter(document__type_id="slides")
+    num_slides_in_session = session_slides.count()
+    oldIndex_str = request.POST.get("oldIndex", None)
     try:
         oldIndex = int(oldIndex_str)
     except (ValueError, TypeError):
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
-    if oldIndex < 1 or oldIndex > num_slides_in_session :
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied index is not valid"}),
+            content_type="application/json",
+        )
+    if oldIndex < 1 or oldIndex > num_slides_in_session:
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied index is not valid"}),
+            content_type="application/json",
+        )
 
-    newIndex_str = request.POST.get('newIndex', None)
+    newIndex_str = request.POST.get("newIndex", None)
     try:
         newIndex = int(newIndex_str)
     except (ValueError, TypeError):
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
-    if newIndex < 1 or newIndex > num_slides_in_session :
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied index is not valid"}),
+            content_type="application/json",
+        )
+    if newIndex < 1 or newIndex > num_slides_in_session:
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied index is not valid"}),
+            content_type="application/json",
+        )
 
     if newIndex == oldIndex:
-        return HttpResponse(json.dumps({ 'success' : False, 'error' : 'Supplied index is not valid' }),content_type='application/json')
+        return HttpResponse(
+            json.dumps({"success": False, "error": "Supplied index is not valid"}),
+            content_type="application/json",
+        )
 
     condition_slide_order(session)
-    sp = session.sessionpresentation_set.get(order=oldIndex)
+    sp = session_slides.get(order=oldIndex)
     if oldIndex < newIndex:
-        session.sessionpresentation_set.filter(order__gt=oldIndex, order__lte=newIndex).update(order=F('order')-1)
+        session_slides.filter(order__gt=oldIndex, order__lte=newIndex).update(
+            order=F("order") - 1
+        )
     else:
-        session.sessionpresentation_set.filter(order__gte=newIndex, order__lt=oldIndex).update(order=F('order')+1)
+        session_slides.filter(order__gte=newIndex, order__lt=oldIndex).update(
+            order=F("order") + 1
+        )
     sp.order = newIndex
     sp.save()
 
-    return HttpResponse(json.dumps({'success':True}), content_type='application/json')
+    # Update slide order with Meetecho if the API is configured
+    if hasattr(settings, "MEETECHO_API_CONFIG"):
+        sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+        try:
+            sm.send_update(session)
+        except MeetechoAPIError as err:
+            log(f"Error in SlidesManager.send_update(): {err}")
+
+    return HttpResponse(json.dumps({"success": True}), content_type="application/json")
 
 
 @role_required('Secretariat')
@@ -3009,43 +4095,6 @@ def delete_schedule(request, num, owner, name):
 # -------------------------------------------------
 # Interim Views
 # -------------------------------------------------
-
-
-def ajax_get_utc(request):
-    '''Ajax view that takes arguments time, timezone, date and returns UTC data'''
-    time = request.GET.get('time')
-    timezone = request.GET.get('timezone')
-    date = request.GET.get('date')
-    time_re = re.compile(r'^\d{2}:\d{2}$')
-    # validate input
-    if not time_re.match(time) or not date:
-        return HttpResponse(json.dumps({'error': True}),
-                            content_type='application/json')
-    hour, minute = time.split(':')
-    if not (int(hour) <= 23 and int(minute) <= 59):
-        return HttpResponse(json.dumps({'error': True}),
-                            content_type='application/json')
-    year, month, day = date.split('-')
-    dt = datetime.datetime(int(year), int(month), int(day), int(hour), int(minute))
-    tz = pytz.timezone(timezone)
-    aware_dt = tz.localize(dt, is_dst=None)
-    utc_dt = aware_dt.astimezone(pytz.utc)
-    utc = utc_dt.strftime('%H:%M')
-    # calculate utc day offset
-    naive_utc_dt = utc_dt.replace(tzinfo=None)
-    utc_day_offset = (naive_utc_dt.date() - dt.date()).days
-    html = "<span>{utc} UTC</span>".format(utc=utc)
-    if utc_day_offset != 0:
-        html = html + '<span class="day-offset"> {0:+d} Day</span>'.format(utc_day_offset)
-    context_data = {'timezone': timezone, 
-                    'time': time, 
-                    'utc': utc, 
-                    'utc_day_offset': utc_day_offset,
-                    'html': html}
-    return HttpResponse(json.dumps(context_data),
-                        content_type='application/json')
-
-
 def interim_announce(request):
     '''View which shows interim meeting requests awaiting announcement'''
     meetings = data_for_meetings_overview(Meeting.objects.filter(type='interim').order_by('date'), interim_status='scheda')
@@ -3156,8 +4205,8 @@ def interim_request(request):
             if meeting_type in ('single', 'multi-day'):
                 meeting = form.save(date=get_earliest_session_date(formset))
 
-                # need to use curry here to pass custom variable to form init
-                SessionFormset.form.__init__ = curry(
+                # need to use partialmethod here to pass custom variable to form init
+                SessionFormset.form.__init__ = partialmethod(
                     InterimSessionModelForm.__init__,
                     user=request.user,
                     group=group,
@@ -3179,7 +4228,7 @@ def interim_request(request):
             # subsequently dealt with individually
             elif meeting_type == 'series':
                 series = []
-                SessionFormset.form.__init__ = curry(
+                SessionFormset.form.__init__ = partialmethod(
                     InterimSessionModelForm.__init__,
                     user=request.user,
                     group=group,
@@ -3399,7 +4448,7 @@ def interim_request_edit(request, number):
         group = Group.objects.get(pk=form.data['group'])
         is_approved = is_interim_meeting_approved(meeting)
 
-        SessionFormset.form.__init__ = curry(
+        SessionFormset.form.__init__ = partialmethod(
             InterimSessionModelForm.__init__,
             user=request.user,
             group=group,
@@ -3429,10 +4478,9 @@ def interim_request_edit(request, number):
         "form": form,
         "formset": formset})
 
-@cache_page(60*60)
 def past(request):
     '''List of past meetings'''
-    today = datetime.datetime.today()
+    today = timezone.now()
 
     meetings = data_for_meetings_overview(Meeting.objects.filter(date__lte=today).order_by('-date'))
 
@@ -3442,12 +4490,10 @@ def past(request):
 
 def upcoming(request):
     '''List of upcoming meetings'''
-    today = datetime.date.today()
+    today = datetime_today()
 
     # Get ietf meetings starting 7 days ago, and interim meetings starting today
     ietf_meetings = Meeting.objects.filter(type_id='ietf', date__gte=today-datetime.timedelta(days=7))
-    for m in ietf_meetings:
-        m.end = m.date + datetime.timedelta(days=m.days-1)  # subtract 1 to avoid counting an extra day
 
     interim_sessions = add_event_info_to_session_qs(
         Session.objects.filter(
@@ -3457,21 +4503,26 @@ def upcoming(request):
         )
     ).filter(current_status__in=('sched','canceled'))
 
-    for session in interim_sessions:
-        session.historic_group = session.group
-
     # Set up for agenda filtering - only one filter_category here
     AgendaKeywordTagger(sessions=interim_sessions).apply()
     filter_organizer = AgendaFilterOrganizer(sessions=interim_sessions, single_category=True)
+    # Allow filtering to show only IETF Meetings. This adds a button labeled "IETF Meetings" to the
+    # "Other" column of the filter UI. When enabled, this adds the keyword "ietf-meetings" to the "show"
+    # filter list. The IETF meetings are explicitly labeled with this keyword in upcoming.html.
+    filter_organizer.add_extra_filter('IETF Meetings')
 
     entries = list(ietf_meetings)
     entries.extend(list(interim_sessions))
-    entries.sort(key = lambda o: pytz.utc.localize(datetime.datetime.combine(o.date, datetime.datetime.min.time())) if isinstance(o,Meeting) else o.official_timeslotassignment().timeslot.utc_start_time())
-    
+    entries.sort(
+        key=lambda o: (
+            pytz.utc.localize(datetime.datetime.combine(o.date, datetime.datetime.min.time())) if isinstance(o, Meeting) else o.official_timeslotassignment().timeslot.utc_start_time(),
+            o.number if isinstance(o, Meeting) else o.meeting.number,
+        )
+    )
     for o in entries:
         if isinstance(o, Meeting):
             o.start_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.date, datetime.time.min)).timestamp())
-            o.end_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.end, datetime.time.max)).timestamp())
+            o.end_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.end_date(), datetime.time.max)).timestamp())
         else:
             o.start_timestamp = int(o.official_timeslotassignment().timeslot.utc_start_time().timestamp())
             o.end_timestamp = int(o.official_timeslotassignment().timeslot.utc_end_time().timestamp())
@@ -3505,8 +4556,7 @@ def upcoming(request):
                   'menu_actions': actions,
                   'menu_entries': menu_entries,
                   'selected_menu_entry': selected_menu_entry,
-                  'now': datetime.datetime.now(),
-                  'use_codimd': True if datetime.date.today()>=settings.MEETING_USES_CODIMD_DATE else False,
+                  'now': timezone.now(),
                   })
 
 
@@ -3520,7 +4570,7 @@ def upcoming_ical(request):
     except ValueError as e:
         return HttpResponseBadRequest(str(e))
         
-    today = datetime.date.today()
+    today = datetime_today()
 
     # get meetings starting 7 days ago -- we'll filter out sessions in the past further down
     meetings = data_for_meetings_overview(Meeting.objects.filter(date__gte=today-datetime.timedelta(days=7)).prefetch_related('schedule').order_by('date'))
@@ -3530,7 +4580,7 @@ def upcoming_ical(request):
         session__in=[s.pk for m in meetings for s in m.sessions if m.type_id != 'ietf'],
         timeslot__time__gte=today,
     ).order_by(
-        'schedule__meeting__date', 'session__type', 'timeslot__time'
+        'schedule__meeting__date', 'session__type', 'timeslot__time', 'schedule__meeting__number',
     ).select_related(
         'session__group', 'session__group__parent', 'timeslot', 'schedule', 'schedule__meeting'
     ).distinct())
@@ -3548,26 +4598,150 @@ def upcoming_ical(request):
             a.session = sessions.get(a.session_id) or a.session
             a.session.ical_status = ical_session_status(a)
 
-    # handle IETFs separately
-    ietfs = [m for m in meetings if m.type_id == 'ietf']
-    preprocess_meeting_important_dates(ietfs)
+    # Handle IETFs separately. Manually apply the 'ietf-meetings' filter.
+    if filter_params is None or (
+            'ietf-meetings' in filter_params['show'] and 'ietf-meetings' not in filter_params['hide']
+    ):
+        ietfs = [m for m in meetings if m.type_id == 'ietf']
+        preprocess_meeting_important_dates(ietfs)
+    else:
+        ietfs = []
 
-    # icalendar response file should have '\r\n' line endings per RFC5545
-    response = render_to_string('meeting/upcoming.ics', {
-        'vtimezones': ''.join(sorted(list({meeting.vtimezone() for meeting in meetings if meeting.vtimezone()}))),
-        'assignments': assignments,
-        'ietfs': ietfs,
-    }, request=request)
-    response = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", response)
+    response = render_upcoming_ical(assignments, ietfs, request)
 
     response = HttpResponse(response, content_type='text/calendar')
     response['Content-Disposition'] = 'attachment; filename="upcoming.ics"'
     return response
     
+def render_important_dates_ical(meetings, request):
+    """Generate important dates using the icalendar library"""
+    cal = Calendar()
+    cal.add("prodid", "-//IETF//datatracker.ietf.org ical importantdates//EN")
+    cal.add("version", "2.0")
+    cal.add("method", "PUBLISH")
+
+    for meeting in meetings:
+        for important_date in meeting.important_dates:
+            event = Event()
+            event.add("uid", f"ietf-{meeting.number}-{important_date.name_id}-"
+                     f"{important_date.date.isoformat()}")
+            event.add("summary", f"IETF {meeting.number}: {important_date.name.name}")
+            event.add("class", "PUBLIC")
+
+            if not important_date.midnight_cutoff:
+                event.add("dtstart", important_date.date)
+            else:
+                event.add("dtstart", datetime.datetime.combine(
+                    important_date.date, 
+                    datetime.time(23, 59, 0, tzinfo=pytz.UTC))
+                )
+
+            event.add("transp", "TRANSPARENT")
+            event.add("dtstamp", meeting.cached_updated)
+            description_lines = [important_date.name.desc]
+            if important_date.name.slug in ('openreg', 'earlybird'):
+                description_lines.append(
+                    "Register here: https://www.ietf.org/how/meetings/register/")
+            if important_date.name.slug == 'opensched':
+                description_lines.append("To request a Working Group session, use the "
+                                         "IETF Meeting Session Request Tool:")
+                description_lines.append(f"{request.scheme}://{request.get_host()}"
+                    f"{reverse('ietf.meeting.views_session_request.list_view')}")
+                description_lines.append("If you are working on a BOF request, it is "
+                                         "highly recommended to tell the IESG")
+                description_lines.append("now by sending an email to iesg@ietf.org "
+                                         "to get advance help with the request.")
+            if important_date.name.slug == 'cutoffwgreq':
+                description_lines.append("To request a Working Group session, use the "
+                                         "IETF Meeting Session Request Tool:")
+                description_lines.append(f"{request.scheme}://{request.get_host()}"
+                    f"{reverse('ietf.meeting.views_session_request.list_view')}")
+            if important_date.name.slug == 'cutoffbofreq':
+                description_lines.append("To request a BOF, please see instructions on "
+                                         "Requesting a BOF:")
+                description_lines.append("https://www.ietf.org/how/bofs/bof-procedures/")
+            if important_date.name.slug == 'idcutoff':
+                description_lines.append("Upload using the I-D Submission Tool:")
+                description_lines.append(f"{request.scheme}://{request.get_host()}"
+                    f"{reverse('ietf.submit.views.upload_submission')}")
+            if important_date.name.slug in (
+                    'draftwgagenda', 
+                    'revwgagenda', 
+                    'procsub', 
+                    'revslug'
+                ):
+                description_lines.append("Upload using the Meeting Materials "
+                                         "Management Tool:")
+                description_lines.append(f"{request.scheme}://{request.get_host()}"
+                    f"{reverse('ietf.meeting.views.materials', 
+                               kwargs={'num': meeting.number})}")
+
+            event.add("description", "\n".join(description_lines))
+            cal.add_component(event)
+
+    return cal.to_ical().decode("utf-8")
+
+def render_upcoming_ical(assignments, meetings, request):
+    """Generate upcoming using the icalendar library"""
+
+    cal = Calendar()
+    cal.add("prodid", "-//IETF//datatracker.ietf.org ical upcoming//EN")
+    cal.add("version", "2.0")
+    cal.add("method", "PUBLISH")
+
+    for item in assignments:
+        event = Event()
+
+        event.add("uid", f"ietf-{item.session.meeting.number}-{item.timeslot.pk}")
+        event.add("summary", f"{item.session.group.acronym.lower()} - {item.session.name if item.session.name else item.session.group.name}")
+
+        if item.schedule.meeting.city:
+            event.add("location", f"{item.schedule.meeting.city},{item.schedule.meeting.country}")
+
+        event.add("status", item.session.ical_status)
+        event.add("class", "PUBLIC")
+
+        event.add("dtstart", item.timeslot.utc_start_time())
+        event.add("dtend", item.timeslot.utc_end_time())
+        event.add("dtstamp", item.timeslot.modified)
+        if item.session.agenda():
+            event.add("url", item.session.agenda().get_href())
+
+        description_lines = []
+        if item.timeslot.name:
+            description_lines.append(f"{item.timeslot.name}")
+        if item.session.agenda_note:
+            description_lines.append(f"Note: {item.session.agenda_note}")
+        
+        for material in item.session.materials.all():
+            title_part = f" ({material.title})" if material.type.name != "Agenda" else ""
+            description_lines.append(f"{material.type}{title_part}: {material.get_href()}")
+
+        if item.session.remote_instructions:
+            description_lines.append(f"Remote instructions: {item.session.remote_instructions}")
+
+        event.add("description", "\n".join(description_lines))
+        cal.add_component(event)
+
+    for meeting in meetings:
+        event = Event()
+        event.add("uid", f"ietf-{meeting.number}")
+        event.add("summary", f"IETF {meeting.number}")
+        if meeting.city:
+            event.add("location", f"{meeting.city},{meeting.country}")
+        event.add("class", "PUBLIC")
+        event.add("dtstart", meeting.date)
+        event.add("dtend", meeting.end_date() + datetime.timedelta(days=1))
+        event.add("dtstamp", meeting.cached_updated)
+        event.add("url", f"{request.scheme}://{request.get_host()}{reverse('agenda', kwargs={'num': meeting.number})}")
+
+        cal.add_component(event)
+
+    return cal.to_ical().decode("utf-8")
 
 def upcoming_json(request):
     '''Return Upcoming meetings in json format'''
-    today = datetime.date.today()
+    today = date_today()
 
     # get meetings starting 7 days ago -- we'll filter out sessions in the past further down
     meetings = data_for_meetings_overview(Meeting.objects.filter(date__gte=today-datetime.timedelta(days=7)).order_by('date'))
@@ -3581,10 +4755,10 @@ def upcoming_json(request):
     response = HttpResponse(json.dumps(data, indent=2, sort_keys=False), content_type='application/json;charset=%s'%settings.DEFAULT_CHARSET)
     return response
 
-def proceedings(request, num=None):
 
+def proceedings(request, num=None):
     meeting = get_meeting(num)
-
+    
     # Early proceedings were hosted on www.ietf.org rather than the datatracker
     if meeting.proceedings_format_version == 1:
         return HttpResponseRedirect(settings.PROCEEDINGS_V1_BASE_URL.format(meeting=meeting))
@@ -3595,63 +4769,23 @@ def proceedings(request, num=None):
             kwargs['num'] = num
         return redirect('ietf.meeting.views.materials', **kwargs)
 
-    begin_date = meeting.get_submission_start_date()
-    cut_off_date = meeting.get_submission_cut_off_date()
-    cor_cut_off_date = meeting.get_submission_correction_date()
-    now = datetime.date.today()
-
-    schedule = get_schedule(meeting, None)
-    sessions  = add_event_info_to_session_qs(
-        Session.objects.filter(meeting__number=meeting.number)
-    ).filter(
-        Q(timeslotassignments__schedule__in=[schedule, schedule.base if schedule else None]) | Q(current_status='notmeet')
-    ).select_related().order_by('-current_status')
-    plenaries = sessions.filter(name__icontains='plenary').exclude(current_status='notmeet')
-    ietf      = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym='edu')
-    irtf      = sessions.filter(group__parent__acronym = 'irtf')
-    training  = sessions.filter(group__acronym__in=['edu','iaoc'], type_id__in=['regular', 'other',]).exclude(current_status='notmeet')
-    iab       = sessions.filter(group__parent__acronym = 'iab').exclude(current_status='notmeet')
-
-    cache_version = Document.objects.filter(session__meeting__number=meeting.number).aggregate(Max('time'))["time__max"]
-
-    ietf_areas = []
-    for area, sessions in itertools.groupby(sorted(ietf, key=lambda s: (s.group.parent.acronym, s.group.acronym)), key=lambda s: s.group.parent):
-        sessions = list(sessions)
-        meeting_groups = set(s.group_id for s in sessions if s.current_status != 'notmeet')
-        meeting_sessions = []
-        not_meeting_sessions = []
-        for s in sessions:
-            if s.current_status == 'notmeet' and s.group_id not in meeting_groups:
-                not_meeting_sessions.append(s)
-            else:
-                meeting_sessions.append(s)
-        ietf_areas.append((area, meeting_sessions, not_meeting_sessions))
 
-    return render(request, "meeting/proceedings.html", {
-        'meeting': meeting,
-        'plenaries': plenaries, 'ietf': ietf, 'training': training, 'irtf': irtf, 'iab': iab,
-        'ietf_areas': ietf_areas,
-        'cut_off_date': cut_off_date,
-        'cor_cut_off_date': cor_cut_off_date,
-        'submission_started': now > begin_date,
-        'cache_version': cache_version,
-        'attendance': meeting.get_attendance(),
-        'meetinghost_logo': {
-            'max_height': settings.MEETINGHOST_LOGO_MAX_DISPLAY_HEIGHT,
-            'max_width': settings.MEETINGHOST_LOGO_MAX_DISPLAY_WIDTH,
-        }
-    })
+    with timezone.override(meeting.tz()):
+        return render(request, "meeting/proceedings_wrapper.html", {
+            'meeting': meeting,
+            'attendance': meeting.get_attendance(),
+            'proceedings_content': generate_proceedings_content(meeting),
+        })
 
 @role_required('Secretariat')
 def finalize_proceedings(request, num=None):
 
     meeting = get_meeting(num)
-
     if (meeting.number.isdigit() and int(meeting.number) <= 64) or not meeting.schedule or not meeting.schedule.assignments.exists() or meeting.proceedings_final:
         raise Http404
 
     if request.method=='POST':
-        finalize(meeting)
+        finalize(request, meeting)
         return HttpResponseRedirect(reverse('ietf.meeting.views.proceedings',kwargs={'num':meeting.number}))
     
     return render(request, "meeting/finalize.html", {'meeting':meeting,})
@@ -3674,14 +4808,53 @@ def proceedings_attendees(request, num=None):
     meeting = get_meeting(num)
     if meeting.proceedings_format_version == 1:
         return HttpResponseRedirect(f'{settings.PROCEEDINGS_V1_BASE_URL.format(meeting=meeting)}/attendee.html')
-    overview_template = '/meeting/proceedings/%s/attendees.html' % meeting.number
-    try:
-        template = render_to_string(overview_template, {})
-    except TemplateDoesNotExist:
-        raise Http404
+
+    template = None
+    registrations = None
+
+    stats = None
+    chart_data = None
+
+    if int(meeting.number) >= 118:
+        checked_in, attended = participants_for_meeting(meeting)
+        regs = list(Registration.objects.onsite().filter(meeting__number=num, checkedin=True))
+        onsite_count = len(regs)
+        regs += [
+            reg
+            for reg in Registration.objects.remote().filter(meeting__number=num).select_related('person')
+            if reg.person.pk in attended and reg.person.pk not in checked_in
+        ]
+        remote_count = len(regs) - onsite_count
+
+        registrations = sorted(regs, key=lambda x: (x.last_name, x.first_name))
+
+        country_codes = [r.country_code for r in registrations if r.country_code]
+        stats = {
+            'total': onsite_count + remote_count,
+            'onsite': onsite_count,
+            'remote': remote_count,
+        }
+
+        code_to_name = dict(CountryName.objects.values_list('slug', 'name'))
+        country_counts = Counter(code_to_name.get(c, c) for c in country_codes).most_common()
+
+        chart_data = {
+            'type': [['Onsite', onsite_count], ['Remote', remote_count]],
+            'countries': country_counts,
+        }
+    else:
+        overview_template = "/meeting/proceedings/%s/attendees.html" % meeting.number
+        try:
+            template = render_to_string(overview_template, {})
+        except TemplateDoesNotExist:
+            raise Http404
+
     return render(request, "meeting/proceedings_attendees.html", {
         'meeting': meeting,
+        'registrations': registrations,
         'template': template,
+        'stats': stats,
+        'chart_data': chart_data,
     })
 
 def proceedings_overview(request, num=None):
@@ -3701,9 +4874,8 @@ def proceedings_overview(request, num=None):
         'template': template,
     })
 
-@cache_page( 60 * 60 )
-def proceedings_progress_report(request, num=None):
-    '''Display Progress Report (stats since last meeting)'''
+def proceedings_activity_report(request, num=None):
+    '''Display Activity Report (stats since last meeting)'''
     if not (num and num.isdigit()):
         raise Http404
     meeting = get_meeting(num)
@@ -3711,30 +4883,143 @@ def proceedings_progress_report(request, num=None):
         return HttpResponseRedirect(f'{settings.PROCEEDINGS_V1_BASE_URL.format(meeting=meeting)}/progress-report.html')
     sdate = meeting.previous_meeting().date
     edate = meeting.date
-    context = get_progress_stats(sdate,edate)
+    context = get_activity_stats(sdate,edate)
     context['meeting'] = meeting
-    return render(request, "meeting/proceedings_progress_report.html", context)
+    context['is_meeting_report'] = True
+    return render(request, "meeting/proceedings_activity_report.html", context)
     
 class OldUploadRedirect(RedirectView):
     def get_redirect_url(self, **kwargs):
         return reverse_lazy('ietf.meeting.views.session_details',kwargs=self.kwargs)
 
+
+@require_api_key
+@role_required("Recording Manager")
 @csrf_exempt
-def api_import_recordings(request, number):
-    '''REST API to check for recording files and import'''
-    if request.method == 'POST':
-        meeting = get_meeting(number)
-        import_audio_files(meeting)
-        return HttpResponse(status=201)
-    else:
-        return HttpResponse(status=405)
+def api_set_meetecho_recording_name(request):
+    """Set name for meetecho recording
+
+    parameters:
+        apikey: the poster's personal API key
+        session_id: id of the session to update
+        name: the name to use for the recording at meetecho player
+    """
+    def err(code, text):
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
+
+    if request.method != "POST":
+        return HttpResponseNotAllowed(
+            content="Method not allowed",
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+            permitted_methods=('POST',),
+        )
+
+    session_id = request.POST.get('session_id', None)
+    if session_id is None:
+        return err(400, 'Missing session_id parameter')
+    name = request.POST.get('name', None)
+    if name is None:
+        return err(400, 'Missing name parameter')
+
+    try:
+        session = Session.objects.get(pk=session_id)
+    except Session.DoesNotExist:
+        return err(400, f"Session not found with session_id '{session_id}'")
+    except ValueError:
+        return err(400, "Invalid session_id: {session_id}")
+
+    session.meetecho_recording_name = name
+    session.save()
+
+    return HttpResponse(
+        "Done",
+        status=200,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
 
 @require_api_key
 @role_required('Recording Manager')
 @csrf_exempt
 def api_set_session_video_url(request):
+    """Set video URL for session
+
+    parameters:
+      apikey: the poster's personal API key
+      session_id: id of session to update
+      url: The recording url (on YouTube, or whatever)
+    """
+    def err(code, text):
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
+
+    if request.method != 'POST':
+        return HttpResponseNotAllowed(
+            content="Method not allowed",
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+            permitted_methods=('POST',),
+        )
+
+    # Temporary: fall back to deprecated interface if we have old-style parameters.
+    # Do away with this once meetecho is using the new pk-based interface.
+    if any(k in request.POST for k in ['meeting', 'group', 'item']):
+        return deprecated_api_set_session_video_url(request)
+
+    session_id = request.POST.get('session_id', None)
+    if session_id is None:
+        return err(400, 'Missing session_id parameter')
+    incoming_url = request.POST.get('url', None)
+    if incoming_url is None:
+        return err(400, 'Missing url parameter')
+
+    try:
+        session = Session.objects.get(pk=session_id)
+    except Session.DoesNotExist:
+        return err(400, f"Session not found with session_id '{session_id}'")
+    except ValueError:
+        return err(400, "Invalid session_id: {session_id}")
+
+    try:
+        URLValidator()(incoming_url)
+    except ValidationError:
+        return err(400, f"Invalid url value: '{incoming_url}'")
+
+    recordings = [(r.name, r.title, r) for r in session.recordings() if 'video' in r.title.lower()]
+    if recordings:
+        r = recordings[-1][-1]
+        if r.external_url != incoming_url:
+            e = DocEvent.objects.create(doc=r, rev=r.rev, type="added_comment", by=request.user.person,
+                                        desc="External url changed from %s to %s" % (r.external_url, incoming_url))
+            r.external_url = incoming_url
+            r.save_with_history([e])
+    else:
+        time = session.official_timeslotassignment().timeslot.time
+        title = 'Video recording for %s on %s at %s' % (session.group.acronym, time.date(), time.time())
+        create_recording(session, incoming_url, title=title, user=request.user.person)
+    return HttpResponse(
+        "Done",
+        status=200,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
+
+
+def deprecated_api_set_session_video_url(request):
+    """Set video URL for session (deprecated)
+
+    Uses meeting/group/item to identify session.
+    """
     def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
     if request.method == 'POST':
         # parameters:
         #   apikey: the poster's personal API key
@@ -3788,46 +5073,136 @@ def err(code, text):
     else:
         return err(405, "Method not allowed")
 
-    return HttpResponse("Done", status=200, content_type='text/plain')
+    return HttpResponse(
+        "Done",
+        status=200,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
+
 
 @require_api_key
 @role_required('Recording Manager') # TODO : Rework how Meetecho interacts via APIs. There may be better paths to pursue than Personal API keys as they are currently defined.
 @csrf_exempt
 def api_add_session_attendees(request):
+    """Upload attendees for one or more sessions
+
+    parameters:
+        apikey: the poster's personal API key
+        attended: json blob with
+            {
+                "session_id": session pk,
+                "attendees": [
+                    {"user_id": user-pk-1, "join_time": "2024-02-21T18:00:00Z"},
+                    {"user_id": user-pk-2, "join_time": "2024-02-21T18:00:01Z"},
+                    {"user_id": user-pk-3, "join_time": "2024-02-21T18:00:02Z"},
+                    ...
+                ]
+            }
+    """
+    json_validator = jsonschema.Draft202012Validator(
+        schema={
+            "type": "object",
+            "properties": {
+                "session_id": {"type": "integer"},
+                "attendees": {
+                    # Allow either old or new format until after IETF 119
+                    "anyOf": [
+                        {"type": "array", "items": {"type": "integer"}},  # old: array of user PKs
+                        {
+                            # new: array of user_id / join_time objects
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "user_id": {"type": "integer", },
+                                    "join_time": {"type": "string", "format": "date-time"}
+                                },
+                                "required": ["user_id", "join_time"],
+                            },
+                        },
+                    ],
+                }
+            },
+            "required": ["session_id", "attendees"],
+        },
+        format_checker=jsonschema.Draft202012Validator.FORMAT_CHECKER,  # format-checks disabled by default
+    )
 
     def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
 
-    if request.method != 'POST':
+    if request.method != "POST":
         return err(405, "Method not allowed")
-    attended_post = request.POST.get('attended')
+    attended_post = request.POST.get("attended")
     if not attended_post:
         return err(400, "Missing attended parameter")
+
+    # Validate the request payload
     try:
-        attended = json.loads(attended_post)
-    except json.decoder.JSONDecodeError:
-        return err(400, "Malformed post") 
-    if not ( 'session_id' in attended and type(attended['session_id']) is int ):
-        return err(400, "Malformed post")
-    session_id = attended['session_id']
-    if not ( 'attendees' in attended and type(attended['attendees']) is list and all([type(el) is int for el in attended['attendees']]) ):
+        payload = json.loads(attended_post)
+        json_validator.validate(payload)
+    except (json.decoder.JSONDecodeError, jsonschema.exceptions.ValidationError):
         return err(400, "Malformed post")
+
+    session_id = payload["session_id"]
     session = Session.objects.filter(pk=session_id).first()
     if not session:
         return err(400, "Invalid session")
-    users = User.objects.filter(pk__in=attended['attendees'])
-    if users.count() != len(attended['attendees']):
-        return err(400, "Invalid attendee")
-    for user in users:
-        session.attended_set.get_or_create(person=user.person)
-    return HttpResponse("Done", status=200, content_type='text/plain')  
+
+    attendees = payload["attendees"]
+    if len(attendees) > 0:
+        # Check whether we have old or new format
+        if type(attendees[0]) == int:
+            # it's the old format
+            users = User.objects.filter(pk__in=attendees)
+            if users.count() != len(payload["attendees"]):
+                return err(400, "Invalid attendee")
+            for user in users:
+                session.attended_set.get_or_create(person=user.person)
+        else:
+            # it's the new format
+            join_time_by_pk = {
+                att["user_id"]: datetime.datetime.fromisoformat(
+                    att["join_time"].replace("Z", "+00:00")  # Z not understood until py311
+                )
+                for att in attendees
+            }
+            persons = list(Person.objects.filter(user__pk__in=join_time_by_pk))
+            if len(persons) != len(join_time_by_pk):
+                return err(400, "Invalid attendee")
+            to_create = [
+                Attended(session=session, person=person, time=join_time_by_pk[person.user_id])
+                for person in persons
+            ]
+            # Create in bulk, ignoring any that already exist
+            Attended.objects.bulk_create(to_create, ignore_conflicts=True)
+
+    if session.meeting.type_id == "interim":
+        save_error = generate_bluesheet(request, session)
+        if save_error:
+            return err(400, save_error)
+
+    return HttpResponse(
+        "Done",
+        status=200,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
+
 
 @require_api_key
 @role_required('Recording Manager')
 @csrf_exempt
 def api_upload_chatlog(request):
     def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
     if request.method != 'POST':
         return err(405, "Method not allowed")
     apidata_post = request.POST.get('apidata')
@@ -3836,7 +5211,7 @@ def err(code, text):
     try:
         apidata = json.loads(apidata_post)
     except json.decoder.JSONDecodeError:
-        return err(400, "Malformed post") 
+        return err(400, "Malformed post")
     if not ( 'session_id' in apidata and type(apidata['session_id']) is int ):
         return err(400, "Malformed post")
     session_id = apidata['session_id']
@@ -3845,7 +5220,7 @@ def err(code, text):
     session = Session.objects.filter(pk=session_id).first()
     if not session:
         return err(400, "Invalid session")
-    chatlog_sp = session.sessionpresentation_set.filter(document__type='chatlog').first()
+    chatlog_sp = session.presentations.filter(document__type='chatlog').first()
     if chatlog_sp:
         doc = chatlog_sp.document
         doc.rev = f"{(int(doc.rev)+1):02d}"
@@ -3860,14 +5235,23 @@ def err(code, text):
     write_doc_for_session(session, 'chatlog', filename, json.dumps(apidata['chatlog']))
     e = NewRevisionDocEvent.objects.create(doc=doc, rev=doc.rev, by=request.user.person, type='new_revision', desc='New revision available: %s'%doc.rev)
     doc.save_with_history([e])
-    return HttpResponse("Done", status=200, content_type='text/plain')  
+    resolve_uploaded_material(meeting=session.meeting, doc=doc)
+    return HttpResponse(
+        "Done",
+        status=200,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
 
 @require_api_key
 @role_required('Recording Manager')
 @csrf_exempt
 def api_upload_polls(request):
     def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
     if request.method != 'POST':
         return err(405, "Method not allowed")
     apidata_post = request.POST.get('apidata')
@@ -3876,7 +5260,7 @@ def err(code, text):
     try:
         apidata = json.loads(apidata_post)
     except json.decoder.JSONDecodeError:
-        return err(400, "Malformed post") 
+        return err(400, "Malformed post")
     if not ( 'session_id' in apidata and type(apidata['session_id']) is int ):
         return err(400, "Malformed post")
     session_id = apidata['session_id']
@@ -3885,7 +5269,7 @@ def err(code, text):
     session = Session.objects.filter(pk=session_id).first()
     if not session:
         return err(400, "Invalid session")
-    polls_sp = session.sessionpresentation_set.filter(document__type='polls').first()
+    polls_sp = session.presentations.filter(document__type='polls').first()
     if polls_sp:
         doc = polls_sp.document
         doc.rev = f"{(int(doc.rev)+1):02d}"
@@ -3900,68 +5284,76 @@ def err(code, text):
     write_doc_for_session(session, 'polls', filename, json.dumps(apidata['polls']))
     e = NewRevisionDocEvent.objects.create(doc=doc, rev=doc.rev, by=request.user.person, type='new_revision', desc='New revision available: %s'%doc.rev)
     doc.save_with_history([e])
-    return HttpResponse("Done", status=200, content_type='text/plain') 
+    resolve_uploaded_material(meeting=session.meeting, doc=doc)
+    return HttpResponse(
+        "Done",
+        status=200,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
 
 @require_api_key
 @role_required('Recording Manager', 'Secretariat')
 @csrf_exempt
 def api_upload_bluesheet(request):
+    """Upload bluesheet for a session
+
+    parameters:
+      apikey: the poster's personal API key
+      session_id: id of session to update
+      bluesheet: json blob with
+          [{'name': 'Name', 'affiliation': 'Organization', }, ...]
+    """
     def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
-    if request.method == 'POST':
-        # parameters:
-        #   apikey: the poster's personal API key
-        #   meeting: number as string, i.e., '101', or 'interim-2018-quic-02'
-        #   group: acronym or special, i.e., 'quic' or 'plenary'
-        #   item: '1', '2', '3' (the group's first, second, third etc.
-        #                           session during the week)
-        #   bluesheet: json blob with
-        #       [{'name': 'Name', 'affiliation': 'Organization', }, ...]
-        for item in ['meeting', 'group', 'item', 'bluesheet',]:
-            value = request.POST.get(item)
-            if not value:
-                return err(400, "Missing %s parameter" % item)
-        number = request.POST.get('meeting')
-        sessions = Session.objects.filter(meeting__number=number)
-        if not sessions.exists():
-            return err(400, "No sessions found for meeting '%s'" % (number, ))
-        acronym = request.POST.get('group')
-        sessions = sessions.filter(group__acronym=acronym)
-        if not sessions.exists():
-            return err(400, "No sessions found in meeting '%s' for group '%s'" % (number, acronym))
-        session_times = [ (s.official_timeslotassignment().timeslot.time, s.id, s) for s in sessions if s.official_timeslotassignment() ]
-        session_times.sort()
-        item = request.POST.get('item')
-        if not item.isdigit():
-            return err(400, "Expected a numeric value for 'item', found '%s'" % (item, ))
-        n = int(item)-1              # change 1-based to 0-based
-        try:
-            time, __, session = session_times[n]
-        except IndexError:
-            return err(400, "No item '%s' found in list of sessions for group" % (item, ))
-        bjson = request.POST.get('bluesheet')
-        try:
-            data = json.loads(bjson)
-        except json.decoder.JSONDecodeError:
-            return err(400, "Invalid json value: '%s'" % (bjson, ))
+        return HttpResponse(
+            text,
+            status=code,
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+        )
 
-        text = render_to_string('meeting/bluesheet.txt', {
-                'data': data,
-                'session': session,
-            })
+    if request.method != 'POST':
+        return HttpResponseNotAllowed(
+            content="Method not allowed",
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+            permitted_methods=('POST',),
+        )
 
-        fd, name = tempfile.mkstemp(suffix=".txt", text=True)
-        os.close(fd)
-        with open(name, "w") as file:
-            file.write(text)
-        with open(name, "br") as file:
-            save_err = save_bluesheet(request, session, file)
-        if save_err:
-            return err(400, save_err)
-    else:
-        return err(405, "Method not allowed")
+    session_id = request.POST.get('session_id', None)
+    if session_id is None:
+        return err(400, 'Missing session_id parameter')
+    bjson = request.POST.get('bluesheet', None)
+    if bjson is None:
+        return err(400, 'Missing bluesheet parameter')
+
+    try:
+        session = Session.objects.get(pk=session_id)
+    except Session.DoesNotExist:
+        return err(400, f"Session not found with session_id '{session_id}'")
+    except ValueError:
+        return err(400, f"Invalid session_id '{session_id}'")
+
+    try:
+        data = json.loads(bjson)
+    except json.decoder.JSONDecodeError:
+        return err(400, f"Invalid json value: '{bjson}'")
+
+    text = render_to_string('meeting/bluesheet.txt', {
+            'data': data,
+            'session': session,
+        })
 
-    return HttpResponse("Done", status=200, content_type='text/plain')
+    fd, name = tempfile.mkstemp(suffix=".txt", text=True)
+    os.close(fd)
+    with open(name, "w") as file:
+        file.write(text)
+    with open(name, "br") as file:
+        save_err = save_bluesheet(request, session, file)
+    if save_err:
+        return err(400, save_err)
+    return HttpResponse(
+        "Done",
+        status=200,
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
 
 
 def important_dates(request, num=None, output_format=None):
@@ -3974,7 +5366,7 @@ def important_dates(request, num=None, output_format=None):
     base_num = int(meeting.number)
 
     user = request.user
-    today = datetime.date.today()
+    today = date_today()
     meetings = []
     if meeting.show_important_dates or meeting.date < today:
         meetings.append(meeting)
@@ -3987,11 +5379,8 @@ def important_dates(request, num=None, output_format=None):
     if output_format == 'ics':
         preprocess_meeting_important_dates(meetings)
 
-        ics = render_to_string('meeting/important_dates.ics', {
-            'meetings': meetings,
-        }, request=request)
-        # icalendar response file should have '\r\n' line endings per RFC5545
-        response = HttpResponse(re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", ics), content_type='text/calendar')
+        response = HttpResponse(render_important_dates_ical(meetings, request), 
+                                content_type='text/calendar')
         response['Content-Disposition'] = 'attachment; filename="important-dates.ics"'
         return response
 
@@ -4026,23 +5415,32 @@ def edit_timeslot(request, num, slot_id):
     meeting = get_object_or_404(Meeting, number=num)
     if timeslot.meeting != meeting:
         raise Http404()
-    if request.method == 'POST':
-        form = TimeSlotEditForm(instance=timeslot, data=request.POST)
-        if form.is_valid():
-            form.save()
-            return HttpResponseRedirect(reverse('ietf.meeting.views.edit_timeslots', kwargs={'num': num}))
-    else:
-        form = TimeSlotEditForm(instance=timeslot)
+    with timezone.override(meeting.tz()):  # specifies current_timezone used for rendering and form handling
+        if request.method == 'POST':
+            form = TimeSlotEditForm(instance=timeslot, data=request.POST)
+            if form.is_valid():
+                form.save()
+                redirect_to = reverse('ietf.meeting.views.edit_timeslots', kwargs={'num': num})
+                if 'sched' in request.GET:
+                    # Preserve 'sched' as a query parameter
+                    urlparts = list(urlsplit(redirect_to))
+                    query = parse_qs(urlparts[3])
+                    query['sched'] = request.GET['sched']
+                    urlparts[3] = urlencode(query)
+                    redirect_to = urlunsplit(urlparts)
+                return HttpResponseRedirect(redirect_to)
+        else:
+            form = TimeSlotEditForm(instance=timeslot)
 
-    sessions = timeslot.sessions.filter(
-        timeslotassignments__schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None])
+        sessions = timeslot.sessions.filter(
+            timeslotassignments__schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None])
 
-    return render(
-        request,
-        'meeting/edit_timeslot.html',
-        {'timeslot': timeslot, 'form': form, 'sessions': sessions},
-        status=400 if form.errors else 200,
-    )
+        return render(
+            request,
+            'meeting/edit_timeslot.html',
+            {'timeslot': timeslot, 'form': form, 'sessions': sessions},
+            status=400 if form.errors else 200,
+        )
 
 
 @role_required('Secretariat')
@@ -4053,7 +5451,7 @@ def create_timeslot(request, num):
         if form.is_valid():
             bulk_create_timeslots(
                 meeting,
-                [datetime.datetime.combine(day, form.cleaned_data['time'])
+                [meeting.tz().localize(datetime.datetime.combine(day, form.cleaned_data['time']))
                  for day in form.cleaned_data.get('days', [])],
                 form.cleaned_data['locations'],
                 dict(
@@ -4063,7 +5461,15 @@ def create_timeslot(request, num):
                     show_location=form.cleaned_data['show_location'],
                 )
             )
-            return HttpResponseRedirect(reverse('ietf.meeting.views.edit_timeslots',kwargs={'num':num}))
+            redirect_to = reverse('ietf.meeting.views.edit_timeslots',kwargs={'num':num})
+            if 'sched' in request.GET:
+                # Preserve 'sched' as a query parameter
+                urlparts = list(urlsplit(redirect_to))
+                query = parse_qs(urlparts[3])
+                query['sched'] = request.GET['sched']
+                urlparts[3] = urlencode(query)
+                redirect_to = urlunsplit(urlparts)
+            return HttpResponseRedirect(redirect_to)
     else:
         form = TimeSlotCreateForm(meeting)
 
@@ -4078,21 +5484,61 @@ def create_timeslot(request, num):
 @role_required('Secretariat')
 def edit_session(request, session_id):
     session = get_object_or_404(Session, pk=session_id)
+    schedule = Schedule.objects.filter(pk=request.GET.get('sched', None)).first()
+    editor_url = _schedule_edit_url(session.meeting, schedule)
     if request.method == 'POST':
         form = SessionEditForm(instance=session, data=request.POST)
         if form.is_valid():
             form.save()
-            return HttpResponseRedirect(
-                reverse('ietf.meeting.views.edit_meeting_schedule',
-                        kwargs={'num': form.instance.meeting.number}))
+            return HttpResponseRedirect(editor_url)
     else:
         form = SessionEditForm(instance=session)
     return render(
         request,
         'meeting/edit_session.html',
-        {'session': session, 'form': form},
+        {'session': session, 'form': form, 'editor_url': editor_url},
+    )
+
+def _schedule_edit_url(meeting, schedule):
+    """Get the preferred URL to edit a schedule
+
+    Returns a link to the official schedule if schedule is None
+    """
+    url_args = {'num': meeting.number}
+    if schedule and not schedule.is_official:
+        url_args.update({
+            'name': schedule.name if schedule and not schedule.is_official else None,
+            'owner': schedule.owner_email() if schedule and not schedule.is_official else None,
+        })
+    return reverse('ietf.meeting.views.edit_meeting_schedule', kwargs=url_args)
+
+@role_required('Secretariat')
+def cancel_session(request, session_id):
+    session = get_object_or_404(Session.objects.with_current_status(), pk=session_id)
+    schedule = Schedule.objects.filter(pk=request.GET.get('sched', None)).first()
+    editor_url = _schedule_edit_url(session.meeting, schedule)
+    if session.current_status in Session.CANCELED_STATUSES:
+        messages.info(request, 'Session is already canceled.')
+        return HttpResponseRedirect(editor_url)
+    if request.method == 'POST':
+        form = SessionCancelForm(data=request.POST)
+        if form.is_valid():
+            SchedulingEvent.objects.create(
+                session=session,
+                status_id='canceled',
+                by=request.user.person,
+            )
+            messages.success(request, 'Session canceled.')
+            return HttpResponseRedirect(editor_url)
+    else:
+        form = SessionCancelForm()
+    return render(
+        request,
+        'meeting/cancel_session.html',
+        {'session': session, 'form': form, 'editor_url': editor_url},
     )
 
+
 @role_required('Secretariat')
 def request_minutes(request, num=None):
     meeting = get_ietf_meeting(num)
@@ -4171,7 +5617,7 @@ def approve_proposed_slides(request, slidesubmission_id, num):
             if request.POST.get('approve'):
                 # Ensure that we have a file to approve.  The system gets cranky otherwise.
                 if submission.filename is None or submission.filename == '' or not os.path.isfile(submission.staged_filepath()):
-                    return HttpResponseNotFound("The slides you attempted to approve could not be found.  Please disapprove and delete them instead.")
+                    return HttpResponseNotFound("The slides you attempted to approve could not be found.  Please decline and delete them instead.")
                 title = form.cleaned_data['title']
                 if existing_doc:
                    doc = Document.objects.get(name=name)
@@ -4185,21 +5631,27 @@ def approve_proposed_slides(request, slidesubmission_id, num):
                               group = submission.session.group,
                               rev = '00',
                           )
-                    DocAlias.objects.create(name=doc.name).docs.add(doc)
                 doc.states.add(State.objects.get(type_id='slides',slug='active'))
                 doc.states.add(State.objects.get(type_id='reuse_policy',slug='single'))
-                if submission.session.sessionpresentation_set.filter(document=doc).exists():
-                    sp = submission.session.sessionpresentation_set.get(document=doc)
+                added_presentations = []
+                revised_presentations = []
+                if submission.session.presentations.filter(document=doc).exists():
+                    sp = submission.session.presentations.get(document=doc)
                     sp.rev = doc.rev
                     sp.save()
+                    revised_presentations.append(sp)
                 else:
-                    max_order = submission.session.sessionpresentation_set.filter(document__type='slides').aggregate(Max('order'))['order__max'] or 0
-                    submission.session.sessionpresentation_set.create(document=doc,rev=doc.rev,order=max_order+1)
+                    max_order = submission.session.presentations.filter(document__type='slides').aggregate(Max('order'))['order__max'] or 0
+                    added_presentations.append(
+                        submission.session.presentations.create(document=doc,rev=doc.rev,order=max_order+1)
+                    )
                 if apply_to_all:
                     for other_session in sessions:
-                        if other_session != submission.session and not other_session.sessionpresentation_set.filter(document=doc).exists():
-                            max_order = other_session.sessionpresentation_set.filter(document__type='slides').aggregate(Max('order'))['order__max'] or 0
-                            other_session.sessionpresentation_set.create(document=doc,rev=doc.rev,order=max_order+1)
+                        if other_session != submission.session and not other_session.presentations.filter(document=doc).exists():
+                            max_order = other_session.presentations.filter(document__type='slides').aggregate(Max('order'))['order__max'] or 0
+                            added_presentations.append(
+                                other_session.presentations.create(document=doc,rev=doc.rev,order=max_order+1)
+                            )
                 sub_name, sub_ext = os.path.splitext(submission.filename)
                 target_filename = '%s-%s%s' % (sub_name[:sub_name.rfind('-ss')],doc.rev,sub_ext)
                 doc.uploaded_filename = target_filename
@@ -4208,23 +5660,55 @@ def approve_proposed_slides(request, slidesubmission_id, num):
                 path = os.path.join(submission.session.meeting.get_materials_path(),'slides')
                 if not os.path.exists(path):
                     os.makedirs(path)
-                os.rename(submission.staged_filepath(), os.path.join(path, target_filename))
+                shutil.move(submission.staged_filepath(), os.path.join(path, target_filename))
+                doc.store_bytes(target_filename, retrieve_bytes("staging", submission.filename))
+                remove_from_storage("staging", submission.filename)
                 post_process(doc)
+                resolve_uploaded_material(meeting=submission.session.meeting, doc=doc)
+                DocEvent.objects.create(type="approved_slides", doc=doc, rev=doc.rev, by=request.user.person, desc="Slides approved")
+
+                # update meetecho slide info if configured
+                if hasattr(settings, "MEETECHO_API_CONFIG"):
+                    sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+                    for sp in added_presentations:
+                        try:
+                            sm.add(session=sp.session, slides=doc, order=sp.order)
+                        except MeetechoAPIError as err:
+                            log(f"Error in SlidesManager.add(): {err}")
+                    for sp in revised_presentations:
+                        try:
+                            sm.revise(session=sp.session, slides=doc)
+                        except MeetechoAPIError as err:
+                            log(f"Error in SlidesManager.revise(): {err}")
+
                 acronym = submission.session.group.acronym
                 submission.status = SlideSubmissionStatusName.objects.get(slug='approved')
                 submission.doc = doc
                 submission.save()
+                (to, cc) = gather_address_lists('slides_approved', group=submission.session.group, proposer=submission.submitter).as_strings()
+                subject = f"Slides approved for {submission.session.meeting} : {submission.session.group.acronym}{' : '+submission.session.name if submission.session.name else ''}"
+                body = render_to_string("meeting/slides_approved.txt", {
+                    "to": to,
+                    "cc": cc,
+                    "submission": submission,
+                    "settings": settings,
+                    "approver": request.user.person
+                })
+                send_mail_text(request, to, None, subject, body, cc=cc)
                 return redirect('ietf.meeting.views.session_details',num=num,acronym=acronym)
             elif request.POST.get('disapprove'):
                 # Errors in processing a submit request sometimes result
                 # in a SlideSubmission object without a file.  Handle
                 # this case and keep processing the 'disapprove' even if
                 # the filename doesn't exist.
-                try:
-                    if submission.filename != None and submission.filename != '':
+
+                if submission.filename != None and submission.filename != '':
+                    try:
                         os.unlink(submission.staged_filepath())
-                except (FileNotFoundError, IsADirectoryError):
-                    pass
+                    except (FileNotFoundError, IsADirectoryError):
+                        pass
+                    remove_from_storage("staging", submission.filename)
+
                 acronym = submission.session.group.acronym
                 submission.status = SlideSubmissionStatusName.objects.get(slug='rejected')
                 submission.save()
@@ -4241,7 +5725,7 @@ def approve_proposed_slides(request, slidesubmission_id, num):
         }
         form = ApproveSlidesForm(show_apply_to_all_checkbox, initial=initial )
 
-    return render(request, "meeting/approve_proposed_slides.html", 
+    return render(request, "meeting/approve_proposed_slides.html",
                   {'submission': submission,
                    'session_number': session_number,
                    'existing_doc' : existing_doc,
@@ -4249,6 +5733,52 @@ def approve_proposed_slides(request, slidesubmission_id, num):
                   })
 
 
+@role_required("Secretariat")
+def notify_meetecho_of_all_slides(request, num, acronym):
+    """Notify meetecho of state of all slides for the group
+
+    Respects the usual notification window around each session. Meetecho will ignore
+    notices outside that window anyway, so no sense sending them.
+    """
+    meeting = get_meeting(num=num, type_in=None)  # raises 404
+    if request.method != "POST":
+        return HttpResponseNotAllowed(
+            content="Method not allowed",
+            content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+            permitted_methods=("POST",),
+        )
+    scheduled_sessions = [
+        session
+        for session in get_sessions(meeting.number, acronym)
+        if session.current_status == "sched"
+    ]
+    sm = SlidesManager(api_config=settings.MEETECHO_API_CONFIG)
+    updated = []
+    for session in scheduled_sessions:
+        if sm.send_update(session):
+            updated.append(session)
+    if len(updated) > 0:
+        messages.success(
+            request,
+            f"Notified Meetecho about slides for {','.join(str(s) for s in updated)}",
+        )
+    elif sm.slides_notify_time is not None:
+        messages.warning(
+            request,
+            "No sessions were eligible for Meetecho slides update. Updates are "
+            f"only sent within {sm.slides_notify_time} before or after the session.",
+        )
+    else:
+        messages.warning(
+            request,
+            "No sessions were eligible for Meetecho slides update. Updates are "
+            "currently disabled.",
+        )
+    return redirect(
+        "ietf.meeting.views.session_details", num=meeting.number, acronym=acronym
+    )
+
+
 def import_session_minutes(request, session_id, num):
     """Import session minutes from the ietf.notes.org site
 
@@ -4291,11 +5821,12 @@ def import_session_minutes(request, session_id, num):
             except SessionNotScheduledError:
                 return HttpResponseGone(
                     "Cannot import minutes for an unscheduled session. Please check the session ID.",
-                    content_type="text/plain",
+                    content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
                 )
             except SaveMaterialsError as err:
                 form.add_error(None, str(err))
             else:
+                resolve_uploaded_material(meeting=session.meeting, doc=session.minutes())
                 messages.success(request, f'Successfully imported minutes as revision {session.minutes().rev}.')
                 return redirect('ietf.meeting.views.session_details', num=num, acronym=session.group.acronym)
     else:
@@ -4331,3 +5862,4 @@ def import_session_minutes(request, session_id, num):
             'contents_unchanged': not contents_changed,
         },
     )
+
diff --git a/ietf/meeting/views_proceedings.py b/ietf/meeting/views_proceedings.py
index 87b7ffea35..639efa1da4 100644
--- a/ietf/meeting/views_proceedings.py
+++ b/ietf/meeting/views_proceedings.py
@@ -8,13 +8,13 @@
 import debug                            # pyflakes:ignore
 
 from ietf.doc.utils import add_state_change_event
-from ietf.doc.models import DocAlias, DocEvent, Document, NewRevisionDocEvent, State
+from ietf.doc.models import DocEvent, Document, NewRevisionDocEvent, State
 from ietf.ietfauth.utils import role_required
 from ietf.meeting.forms import FileUploadForm
 from ietf.meeting.models import Meeting, MeetingHost
 from ietf.meeting.helpers import get_meeting
 from ietf.name.models import ProceedingsMaterialTypeName
-from ietf.meeting.utils import handle_upload_file
+from ietf.meeting.utils import handle_upload_file, resolve_uploaded_material
 from ietf.utils.text import xslugify
 
 class UploadProceedingsMaterialForm(FileUploadForm):
@@ -98,10 +98,6 @@ def save_proceedings_material_doc(meeting, material_type, title, request, file=N
         )
         created = True
 
-    # do this even if we did not create the document, just to be sure the alias exists
-    alias, _ = DocAlias.objects.get_or_create(name=doc.name)
-    alias.docs.add(doc)
-
     if file:
         if not created:
             doc.rev = '{:02}'.format(int(doc.rev) + 1)
@@ -154,7 +150,7 @@ def save_proceedings_material_doc(meeting, material_type, title, request, file=N
 
     if events:
         doc.save_with_history(events)
-
+    resolve_uploaded_material(meeting, doc)
     return doc
 
 
diff --git a/ietf/meeting/views_session_request.py b/ietf/meeting/views_session_request.py
new file mode 100644
index 0000000000..a1ef74f1b8
--- /dev/null
+++ b/ietf/meeting/views_session_request.py
@@ -0,0 +1,931 @@
+# Copyright The IETF Trust 2007-2025, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+import datetime
+import inflect
+from collections import defaultdict, OrderedDict
+
+from django.conf import settings
+from django.contrib import messages
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Q
+from django.shortcuts import render, get_object_or_404, redirect
+from django.http import Http404
+
+from ietf.group.models import Group, GroupFeatures
+from ietf.ietfauth.utils import has_role, role_required
+from ietf.meeting.helpers import get_meeting
+from ietf.meeting.models import Session, Meeting, Constraint, ResourceAssociation, SchedulingEvent
+from ietf.meeting.utils import add_event_info_to_session_qs
+from ietf.meeting.forms import (SessionRequestStatusForm, SessionRequestForm, allowed_conflicting_groups,
+    JOINT_FOR_SESSION_CHOICES)
+from ietf.name.models import SessionStatusName, ConstraintName
+from ietf.secr.utils.decorators import check_permissions
+from ietf.utils.mail import send_mail
+from ietf.mailtrigger.utils import gather_address_lists
+
+# -------------------------------------------------
+# Globals
+# -------------------------------------------------
+# TODO: This needs to be replaced with something that pays attention to groupfeatures
+AUTHORIZED_ROLES = (
+    'WG Chair',
+    'WG Secretary',
+    'RG Chair',
+    'IAB Group Chair',
+    'Area Director',
+    'Secretariat',
+    'Team Chair',
+    'IRTF Chair',
+    'Program Chair',
+    'Program Lead',
+    'Program Secretary',
+    'EDWG Chair')
+
+# -------------------------------------------------
+# Helper Functions
+# -------------------------------------------------
+
+
+def check_app_locked(meeting=None):
+    '''
+    This function returns True if the application is locked to non-secretariat users.
+    '''
+    if not meeting:
+        meeting = get_meeting(days=14)
+    return bool(meeting.session_request_lock_message)
+
+
+def get_lock_message(meeting=None):
+    '''
+    Returns the message to display to non-secretariat users when the tool is locked.
+    '''
+    if not meeting:
+        meeting = get_meeting(days=14)
+    return meeting.session_request_lock_message
+
+
+def get_my_groups(user, conclude=False):
+    '''
+    Takes a Django user object (from request)
+    Returns a list of groups the user has access to.  Rules are as follows
+    secretariat - has access to all groups
+    area director - has access to all groups in their area
+    wg chair or secretary - has access to their own group
+    chair of irtf has access to all irtf groups
+
+    If user=None than all groups are returned.
+    concluded=True means include concluded groups.  Need this to upload materials for groups
+    after they've been concluded.  it happens.
+    '''
+    my_groups = set()
+    states = ['bof', 'proposed', 'active']
+    if conclude:
+        states.extend(['conclude', 'bof-conc'])
+
+    all_groups = Group.objects.filter(type__features__has_meetings=True, state__in=states).order_by('acronym')
+    if user is None or has_role(user, 'Secretariat'):
+        return all_groups
+
+    try:
+        person = user.person
+    except ObjectDoesNotExist:
+        return list()
+
+    for group in all_groups:
+        if group.role_set.filter(person=person, name__in=('chair', 'secr', 'ad')):
+            my_groups.add(group)
+            continue
+        if group.parent and group.parent.role_set.filter(person=person, name__in=('ad', 'chair')):
+            my_groups.add(group)
+            continue
+
+    return list(my_groups)
+
+
+def get_initial_session(sessions, prune_conflicts=False):
+    '''
+    This function takes a queryset of sessions ordered by 'id' for consistency.  It returns
+    a dictionary to be used as the initial for a legacy session form
+    '''
+    initial = {}
+    if len(sessions) == 0:
+        return initial
+
+    meeting = sessions[0].meeting
+    group = sessions[0].group
+
+    constraints = group.constraint_source_set.filter(meeting=meeting)  # all constraints with this group as source
+    conflicts = constraints.filter(name__is_group_conflict=True)  # only the group conflict constraints
+
+    if group.features.acts_like_wg:
+        # even if there are three sessions requested, the old form has 2 in this field
+        initial['num_session'] = min(sessions.count(), 2)
+        initial['third_session'] = sessions.count() > 2
+    else:
+        initial['num_session'] = sessions.count()
+        initial['third_session'] = False
+    initial['attendees'] = sessions[0].attendees
+
+    def valid_conflict(conflict):
+        return conflict.target != sessions[0].group and allowed_conflicting_groups().filter(pk=conflict.target_id).exists()
+    if prune_conflicts:
+        conflicts = [c for c in conflicts if valid_conflict(c)]
+
+    conflict_name_ids = set(c.name_id for c in conflicts)
+    for name_id in conflict_name_ids:
+        target_acros = [c.target.acronym for c in conflicts if c.name_id == name_id]
+        initial['constraint_{}'.format(name_id)] = ' '.join(target_acros)
+
+    initial['comments'] = sessions[0].comments
+    initial['resources'] = sessions[0].resources.all()
+    initial['bethere'] = [x.person for x in sessions[0].constraints().filter(name='bethere').select_related("person")]
+    wg_adjacent = constraints.filter(name__slug='wg_adjacent')
+    initial['adjacent_with_wg'] = wg_adjacent[0].target.acronym if wg_adjacent else None
+    time_relation = constraints.filter(name__slug='time_relation')
+    initial['session_time_relation'] = time_relation[0].time_relation if time_relation else None
+    initial['session_time_relation_display'] = time_relation[0].get_time_relation_display if time_relation else None
+    timeranges = constraints.filter(name__slug='timerange')
+    initial['timeranges'] = timeranges[0].timeranges.all() if timeranges else []
+    initial['timeranges_display'] = [t.desc for t in initial['timeranges']]
+    for idx, session in enumerate(sessions):
+        if session.joint_with_groups.count():
+            initial['joint_with_groups'] = ' '.join(session.joint_with_groups_acronyms())
+            initial['joint_for_session'] = str(idx + 1)
+            initial['joint_for_session_display'] = dict(JOINT_FOR_SESSION_CHOICES)[initial['joint_for_session']]
+    return initial
+
+
+def inbound_session_conflicts_as_string(group, meeting):
+    '''
+    Takes a Group object and Meeting object and returns a string of other groups which have
+    a conflict with this one
+    '''
+    constraints = group.constraint_target_set.filter(meeting=meeting, name__is_group_conflict=True)
+    group_set = set(constraints.values_list('source__acronym', flat=True))  # set to de-dupe
+    group_list = sorted(group_set)  # give a consistent order
+    return ', '.join(group_list)
+
+
+def get_outbound_conflicts(form: SessionRequestForm):
+    """extract wg conflict constraint data from a SessionForm"""
+    outbound_conflicts = []
+    for conflictname, cfield_id in form.wg_constraint_field_ids():
+        conflict_groups = form.cleaned_data[cfield_id]
+        if len(conflict_groups) > 0:
+            outbound_conflicts.append(dict(name=conflictname, groups=conflict_groups))
+    return outbound_conflicts
+
+
+def save_conflicts(group, meeting, conflicts, name):
+    '''
+    This function takes a Group, Meeting a string which is a list of Groups acronyms (conflicts),
+    and the constraint name (conflict|conflic2|conflic3) and creates Constraint records
+    '''
+    constraint_name = ConstraintName.objects.get(slug=name)
+    acronyms = conflicts.replace(',',' ').split()
+    for acronym in acronyms:
+        target = Group.objects.get(acronym=acronym)
+
+        constraint = Constraint(source=group,
+                                target=target,
+                                meeting=meeting,
+                                name=constraint_name)
+        constraint.save()
+
+
+def get_requester_text(person, group):
+    """
+    This function takes a Person object and a Group object and returns the text to use
+    in the session request notification email, ie. Joe Smith, a Chair of the ancp
+    working group
+    """
+    roles = group.role_set.filter(name__in=("chair", "secr", "ad"), person=person)
+    if roles:
+        rolename = str(roles[0].name)
+        return "%s, %s of the %s %s" % (
+            person.name,
+            inflect.engine().a(rolename),
+            group.acronym.upper(),
+            group.type.verbose_name,
+        )
+    if person.role_set.filter(name="secr", group__acronym="secretariat"):
+        return "%s, on behalf of the %s %s" % (
+            person.name,
+            group.acronym.upper(),
+            group.type.verbose_name,
+        )
+
+
+def send_notification(group, meeting, login, sreq_data, session_data, action):
+    '''
+    This function generates email notifications for various session request activities.
+    sreq_data argument is a dictionary of fields from the session request form
+    session_data is an array of data from individual session subforms
+    action argument is a string [new|update].
+    '''
+    (to_email, cc_list) = gather_address_lists('session_requested', group=group, person=login)
+    from_email = (settings.SESSION_REQUEST_FROM_EMAIL)
+    subject = '%s - New Meeting Session Request for IETF %s' % (group.acronym, meeting.number)
+    template = 'meeting/session_request_notification.txt'
+
+    # send email
+    context = {}
+    context['session'] = sreq_data
+    context['group'] = group
+    context['meeting'] = meeting
+    context['login'] = login
+    context['header'] = 'A new'
+    context['requester'] = get_requester_text(login, group)
+
+    # update overrides
+    if action == 'update':
+        subject = '%s - Update to a Meeting Session Request for IETF %s' % (group.acronym, meeting.number)
+        context['header'] = 'An update to a'
+
+    # if third session requested approval is required
+    # change headers TO=ADs, CC=session-request, submitter and cochairs
+    if len(session_data) > 2:
+        (to_email, cc_list) = gather_address_lists('session_requested_long', group=group, person=login)
+        subject = '%s - Request for meeting session approval for IETF %s' % (group.acronym, meeting.number)
+        template = 'meeting/session_approval_notification.txt'
+        # status_text = 'the %s Directors for approval' % group.parent
+
+    context['session_lengths'] = [sd['requested_duration'] for sd in session_data]
+
+    send_mail(None,
+              to_email,
+              from_email,
+              subject,
+              template,
+              context,
+              cc=cc_list)
+
+
+def session_changed(session):
+    latest_event = SchedulingEvent.objects.filter(session=session).order_by('-time', '-id').first()
+
+    if latest_event and latest_event.status_id == "schedw" and session.meeting.schedule is not None:
+        # send an email to iesg-secretariat to alert to change
+        pass
+
+
+def status_slug_for_new_session(session, session_number):
+    if session.group.features.acts_like_wg and session_number == 2:
+        return 'apprw'
+    return 'schedw'
+
+# -------------------------------------------------
+# View Functions
+# -------------------------------------------------
+
+
+@role_required(*AUTHORIZED_ROLES)
+def list_view(request):
+    '''
+    Display list of groups the user has access to.
+    '''
+    meeting = get_meeting(days=14)
+
+    # check for locked flag
+    is_locked = check_app_locked()
+    if is_locked and not has_role(request.user, 'Secretariat'):
+        message = get_lock_message()
+        return render(request, 'meeting/session_request_locked.html', {
+            'message': message,
+            'meeting': meeting})
+
+    scheduled_groups = []
+    unscheduled_groups = []
+
+    group_types = GroupFeatures.objects.filter(has_meetings=True).values_list('type', flat=True)
+
+    my_groups = [g for g in get_my_groups(request.user, conclude=True) if g.type_id in group_types]
+
+    sessions_by_group = defaultdict(list)
+    for s in add_event_info_to_session_qs(Session.objects.filter(meeting=meeting, group__in=my_groups)).filter(current_status__in=['schedw', 'apprw', 'appr', 'sched']):
+        sessions_by_group[s.group_id].append(s)
+
+    for group in my_groups:
+        group.meeting_sessions = sessions_by_group.get(group.pk, [])
+
+        if group.pk in sessions_by_group:
+            # include even if concluded as we need to to see that the
+            # sessions are there
+            scheduled_groups.append(group)
+        else:
+            if group.state_id not in ['conclude', 'bof-conc']:
+                # too late for unscheduled if concluded
+                unscheduled_groups.append(group)
+
+    # warn if there are no associated groups
+    if not scheduled_groups and not unscheduled_groups:
+        messages.warning(request, 'The account %s is not associated with any groups.  If you have multiple Datatracker accounts you may try another or report a problem to %s' % (request.user, settings.SECRETARIAT_ACTION_EMAIL))
+
+    # add session status messages for use in template
+    for group in scheduled_groups:
+        if not group.features.acts_like_wg or (len(group.meeting_sessions) < 3):
+            group.status_message = group.meeting_sessions[0].current_status
+        else:
+            group.status_message = 'First two sessions: %s, Third session: %s' % (group.meeting_sessions[0].current_status, group.meeting_sessions[2].current_status)
+
+    # add not meeting indicators for use in template
+    for group in unscheduled_groups:
+        if any(s.current_status == 'notmeet' for s in group.meeting_sessions):
+            group.not_meeting = True
+
+    return render(request, 'meeting/session_request_list.html', {
+        'is_locked': is_locked,
+        'meeting': meeting,
+        'scheduled_groups': scheduled_groups,
+        'unscheduled_groups': unscheduled_groups},
+    )
+
+
+@role_required('Secretariat')
+def status(request):
+    '''
+    This view handles locking and unlocking of the session request tool to the public.
+    '''
+    meeting = get_meeting(days=14)
+    is_locked = check_app_locked(meeting=meeting)
+
+    if request.method == 'POST':
+        button_text = request.POST.get('submit', '')
+        if button_text == 'Back':
+            return redirect('ietf.meeting.views_session_request.list_view')
+
+        form = SessionRequestStatusForm(request.POST)
+
+        if button_text == 'Lock':
+            if form.is_valid():
+                meeting.session_request_lock_message = form.cleaned_data['message']
+                meeting.save()
+                messages.success(request, 'Session Request Tool is now Locked')
+                return redirect('ietf.meeting.views_session_request.list_view')
+
+        elif button_text == 'Unlock':
+            meeting.session_request_lock_message = ''
+            meeting.save()
+            messages.success(request, 'Session Request Tool is now Unlocked')
+            return redirect('ietf.meeting.views_session_request.list_view')
+
+    else:
+        if is_locked:
+            message = get_lock_message()
+            initial = {'message': message}
+            form = SessionRequestStatusForm(initial=initial)
+        else:
+            form = SessionRequestStatusForm()
+
+    return render(request, 'meeting/session_request_status.html', {
+        'is_locked': is_locked,
+        'form': form},
+    )
+
+
+@check_permissions
+def new_request(request, acronym):
+    '''
+    This view gathers details for a new session request.  The user proceeds to confirm()
+    to create the request.
+    '''
+    group = get_object_or_404(Group, acronym=acronym)
+    if len(group.features.session_purposes) == 0:
+        raise Http404(f'Cannot request sessions for group "{acronym}"')
+    meeting = get_meeting(days=14)
+    session_conflicts = dict(inbound=inbound_session_conflicts_as_string(group, meeting))
+
+    # check if app is locked
+    is_locked = check_app_locked()
+    if is_locked and not has_role(request.user, 'Secretariat'):
+        messages.warning(request, "The Session Request Tool is closed")
+        return redirect('ietf.meeting.views_session_request.list_view')
+
+    if request.method == 'POST':
+        button_text = request.POST.get('submit', '')
+        if button_text == 'Cancel':
+            return redirect('ietf.meeting.views_session_request.list_view')
+
+        form = SessionRequestForm(group, meeting, request.POST, notifications_optional=has_role(request.user, "Secretariat"))
+        if form.is_valid():
+            return confirm(request, acronym)
+
+    # the "previous" querystring causes the form to be returned
+    # pre-populated with data from last meeeting's session request
+    elif request.method == 'GET' and 'previous' in request.GET:
+        latest_session = add_event_info_to_session_qs(Session.objects.filter(meeting__type_id='ietf', group=group)).exclude(current_status__in=['notmeet', 'deleted', 'canceled',]).order_by('-meeting__date').first()
+        if latest_session:
+            previous_meeting = Meeting.objects.get(number=latest_session.meeting.number)
+            previous_sessions = add_event_info_to_session_qs(Session.objects.filter(meeting=previous_meeting, group=group)).exclude(current_status__in=['notmeet', 'deleted']).order_by('id')
+            if not previous_sessions:
+                messages.warning(request, 'This group did not meet at %s' % previous_meeting)
+                return redirect('ietf.meeting.views_session_request.new_request', acronym=acronym)
+            else:
+                messages.info(request, 'Fetched session info from %s' % previous_meeting)
+        else:
+            messages.warning(request, 'Did not find any previous meeting')
+            return redirect('ietf.meeting.views_session_request.new_request', acronym=acronym)
+
+        initial = get_initial_session(previous_sessions, prune_conflicts=True)
+        if 'resources' in initial:
+            initial['resources'] = [x.pk for x in initial['resources']]
+        form = SessionRequestForm(group, meeting, initial=initial, notifications_optional=has_role(request.user, "Secretariat"))
+
+    else:
+        initial = {}
+        form = SessionRequestForm(group, meeting, initial=initial, notifications_optional=has_role(request.user, "Secretariat"))
+
+    return render(request, 'meeting/session_request_form.html', {
+        'meeting': meeting,
+        'form': form,
+        'group': group,
+        'is_create': True,
+        'session_conflicts': session_conflicts},
+    )
+
+
+@role_required(*AUTHORIZED_ROLES)
+def confirm(request, acronym):
+    '''
+    This view displays details of the new session that has been requested for the user
+    to confirm for submission.
+    '''
+    # FIXME: this should be using form.is_valid/form.cleaned_data - invalid input will make it crash
+    group = get_object_or_404(Group, acronym=acronym)
+    if len(group.features.session_purposes) == 0:
+        raise Http404(f'Cannot request sessions for group "{acronym}"')
+    meeting = get_meeting(days=14)
+    form = SessionRequestForm(group, meeting, request.POST, hidden=True, notifications_optional=has_role(request.user, "Secretariat"))
+    form.is_valid()
+
+    login = request.user.person
+
+    # check if request already exists for this group
+    if add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(Q(current_status__isnull=True) | ~Q(current_status__in=['deleted', 'notmeet'])):
+        messages.warning(request, 'Sessions for working group %s have already been requested once.' % group.acronym)
+        return redirect('ietf.meeting.views_session_request.list_view')
+
+    session_data = form.data.copy()
+    # use cleaned_data for the 'bethere' field so we get the Person instances
+    session_data['bethere'] = form.cleaned_data['bethere'] if 'bethere' in form.cleaned_data else []
+    if session_data.get('session_time_relation'):
+        session_data['session_time_relation_display'] = dict(Constraint.TIME_RELATION_CHOICES)[session_data['session_time_relation']]
+    if session_data.get('joint_for_session'):
+        session_data['joint_for_session_display'] = dict(JOINT_FOR_SESSION_CHOICES)[session_data['joint_for_session']]
+    if form.cleaned_data.get('timeranges'):
+        session_data['timeranges_display'] = [t.desc for t in form.cleaned_data['timeranges']]
+    session_data['resources'] = [ResourceAssociation.objects.get(pk=pk) for pk in request.POST.getlist('resources')]
+
+    # extract wg conflict constraint data for the view / notifications
+    outbound_conflicts = get_outbound_conflicts(form)
+
+    button_text = request.POST.get('submit', '')
+    if button_text == 'Cancel':
+        messages.success(request, 'Session Request has been cancelled')
+        return redirect('ietf.meeting.views_session_request.list_view')
+
+    if request.method == 'POST' and button_text == 'Submit':
+        # delete any existing session records with status = canceled or notmeet
+        add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(current_status__in=['canceled', 'notmeet']).delete()
+        num_sessions = int(form.cleaned_data['num_session']) + (1 if form.cleaned_data['third_session'] else 0)
+        # Create new session records
+        form.session_forms.save()
+        for count, sess_form in enumerate(form.session_forms[:num_sessions]):
+            new_session = sess_form.instance
+            SchedulingEvent.objects.create(
+                session=new_session,
+                status=SessionStatusName.objects.get(slug=status_slug_for_new_session(new_session, count)),
+                by=login,
+            )
+            if 'resources' in form.data:
+                new_session.resources.set(session_data['resources'])
+            jfs = form.data.get('joint_for_session', '-1')
+            if not jfs:  # jfs might be ''
+                jfs = '-1'
+            if int(jfs) == count + 1:  # count is zero-indexed
+                groups_split = form.cleaned_data.get('joint_with_groups').replace(',', ' ').split()
+                joint = Group.objects.filter(acronym__in=groups_split)
+                new_session.joint_with_groups.set(joint)
+            new_session.save()
+            session_changed(new_session)
+
+        # write constraint records
+        for conflictname, cfield_id in form.wg_constraint_field_ids():
+            save_conflicts(group, meeting, form.data.get(cfield_id, ''), conflictname.slug)
+        save_conflicts(group, meeting, form.data.get('adjacent_with_wg', ''), 'wg_adjacent')
+
+        if form.cleaned_data.get('session_time_relation'):
+            cn = ConstraintName.objects.get(slug='time_relation')
+            Constraint.objects.create(source=group, meeting=meeting, name=cn,
+                                      time_relation=form.cleaned_data['session_time_relation'])
+
+        if form.cleaned_data.get('timeranges'):
+            cn = ConstraintName.objects.get(slug='timerange')
+            constraint = Constraint.objects.create(source=group, meeting=meeting, name=cn)
+            constraint.timeranges.set(form.cleaned_data['timeranges'])
+
+        if 'bethere' in form.data:
+            bethere_cn = ConstraintName.objects.get(slug='bethere')
+            for p in session_data['bethere']:
+                Constraint.objects.create(name=bethere_cn, source=group, person=p, meeting=new_session.meeting)
+
+        # clear not meeting
+        add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(current_status='notmeet').delete()
+
+        # send notification
+        if form.cleaned_data.get("send_notifications"):
+            session_data['outbound_conflicts'] = [f"{d['name']}: {d['groups']}" for d in outbound_conflicts]
+            send_notification(
+                group,
+                meeting,
+                login,
+                session_data,
+                [sf.cleaned_data for sf in form.session_forms[:num_sessions]],
+                'new',
+            )
+
+        status_text = 'IETF Agenda to be scheduled'
+        messages.success(request, 'Your request has been sent to %s' % status_text)
+        return redirect('ietf.meeting.views_session_request.list_view')
+
+    # POST from request submission
+    session_conflicts = dict(
+        outbound=outbound_conflicts,  # each is a dict with name and groups as keys
+        inbound=inbound_session_conflicts_as_string(group, meeting),
+    )
+    if form.cleaned_data.get('third_session'):
+        messages.warning(request, 'Note: Your request for a third session must be approved by an area director before being submitted to agenda@ietf.org.  Click "Submit" below to email an approval request to the area directors')
+
+    return render(request, 'meeting/session_request_confirm.html', {
+        'form': form,
+        'session': session_data,
+        'group': group,
+        'meeting': meeting,
+        'session_conflicts': session_conflicts},
+    )
+
+
+@role_required(*AUTHORIZED_ROLES)
+def view_request(request, acronym, num=None):
+    '''
+    This view displays the session request info
+    '''
+    meeting = get_meeting(num, days=14)
+    group = get_object_or_404(Group, acronym=acronym)
+    query = Session.objects.filter(meeting=meeting, group=group)
+    status_is_null = Q(current_status__isnull=True)
+    status_allowed = ~Q(current_status__in=("canceled", "notmeet", "deleted"))
+    sessions = (
+        add_event_info_to_session_qs(query)
+        .filter(status_is_null | status_allowed)
+        .order_by("id")
+    )
+
+    # check if app is locked
+    is_locked = check_app_locked()
+    if is_locked:
+        messages.warning(request, "The Session Request Tool is closed")
+
+    # if there are no session requests yet, redirect to new session request page
+    if not sessions:
+        if is_locked:
+            return redirect('ietf.meeting.views_session_request.list_view')
+        else:
+            return redirect('ietf.meeting.views_session_request.new_request', acronym=acronym)
+
+    activities = [{
+        'act_date': e.time.strftime('%b %d, %Y'),
+        'act_time': e.time.strftime('%H:%M:%S'),
+        'activity': e.status.name,
+        'act_by': e.by,
+    } for e in sessions[0].schedulingevent_set.select_related('status', 'by')]
+
+    # gather outbound conflicts
+    outbound_dict = OrderedDict()
+    for obc in group.constraint_source_set.filter(meeting=meeting, name__is_group_conflict=True):
+        if obc.name.slug not in outbound_dict:
+            outbound_dict[obc.name.slug] = []
+        outbound_dict[obc.name.slug].append(obc.target.acronym)
+
+    session_conflicts = dict(
+        inbound=inbound_session_conflicts_as_string(group, meeting),
+        outbound=[dict(name=ConstraintName.objects.get(slug=slug), groups=' '.join(groups))
+                  for slug, groups in outbound_dict.items()],
+    )
+
+    show_approve_button = False
+
+    # if sessions include a 3rd session waiting approval and the user is a secretariat or AD of the group
+    # display approve button
+    if any(s.current_status == 'apprw' for s in sessions):
+        if has_role(request.user, 'Secretariat') or group.parent.role_set.filter(name='ad', person=request.user.person):
+            show_approve_button = True
+
+    # build session dictionary (like querydict from new session request form) for use in template
+    session = get_initial_session(sessions)
+
+    return render(request, 'meeting/session_request_view.html', {
+        'can_edit': (not is_locked) or has_role(request.user, 'Secretariat'),
+        'can_cancel': (not is_locked) or has_role(request.user, 'Secretariat'),
+        'session': session,  # legacy processed data
+        'sessions': sessions,  # actual session instances
+        'activities': activities,
+        'meeting': meeting,
+        'group': group,
+        'session_conflicts': session_conflicts,
+        'show_approve_button': show_approve_button},
+    )
+
+
+@check_permissions
+def edit_request(request, acronym, num=None):
+    '''
+    This view allows the user to edit details of the session request
+    '''
+    meeting = get_meeting(num, days=14)
+    group = get_object_or_404(Group, acronym=acronym)
+    if len(group.features.session_purposes) == 0:
+        raise Http404(f'Cannot request sessions for group "{acronym}"')
+    sessions = add_event_info_to_session_qs(
+        Session.objects.filter(group=group, meeting=meeting)
+    ).filter(
+        Q(current_status__isnull=True) | ~Q(current_status__in=['canceled', 'notmeet', 'deleted'])
+    ).order_by('id')
+    initial = get_initial_session(sessions)
+
+    if 'resources' in initial:
+        initial['resources'] = [x.pk for x in initial['resources']]
+
+    # check if app is locked
+    is_locked = check_app_locked(meeting=meeting)
+    if is_locked:
+        messages.warning(request, "The Session Request Tool is closed")
+
+    # Only need the inbound conflicts here, the form itself renders the outbound
+    session_conflicts = dict(
+        inbound=inbound_session_conflicts_as_string(group, meeting),
+    )
+    login = request.user.person
+
+    first_session = Session()
+    if (len(sessions) > 0):
+        first_session = sessions[0]
+
+    if request.method == 'POST':
+        button_text = request.POST.get('submit', '')
+        if button_text == 'Cancel':
+            return redirect('ietf.meeting.views_session_request.view_request', acronym=acronym)
+
+        form = SessionRequestForm(group, meeting, request.POST, initial=initial, notifications_optional=has_role(request.user, "Secretariat"))
+        if form.is_valid():
+            if form.has_changed():
+                changed_session_forms = [sf for sf in form.session_forms.forms_to_keep if sf.has_changed()]
+                form.session_forms.save()
+                for n, subform in enumerate(form.session_forms):
+                    if subform.instance in form.session_forms.new_objects:
+                        SchedulingEvent.objects.create(
+                            session=subform.instance,
+                            status_id=status_slug_for_new_session(subform.instance, n),
+                            by=request.user.person,
+                        )
+                for sf in changed_session_forms:
+                    session_changed(sf.instance)
+
+                # New sessions may have been created, refresh the sessions list
+                sessions = add_event_info_to_session_qs(
+                    Session.objects.filter(group=group, meeting=meeting)).filter(
+                    Q(current_status__isnull=True) | ~Q(
+                        current_status__in=['canceled', 'notmeet'])).order_by('id')
+
+                if 'joint_with_groups' in form.changed_data or 'joint_for_session' in form.changed_data:
+                    joint_with_groups_list = form.cleaned_data.get('joint_with_groups').replace(',', ' ').split()
+                    new_joint_with_groups = Group.objects.filter(acronym__in=joint_with_groups_list)
+                    new_joint_for_session_idx = int(form.data.get('joint_for_session', '-1')) - 1
+                    current_joint_for_session_idx = None
+                    current_joint_with_groups = None
+                    for idx, sess in enumerate(sessions):
+                        if sess.joint_with_groups.count():
+                            current_joint_for_session_idx = idx
+                            current_joint_with_groups = sess.joint_with_groups.all()
+
+                    if current_joint_with_groups != new_joint_with_groups or current_joint_for_session_idx != new_joint_for_session_idx:
+                        if current_joint_for_session_idx is not None:
+                            sessions[current_joint_for_session_idx].joint_with_groups.clear()
+                            session_changed(sessions[current_joint_for_session_idx])
+                        sessions[new_joint_for_session_idx].joint_with_groups.set(new_joint_with_groups)
+                        session_changed(sessions[new_joint_for_session_idx])
+
+                # Update sessions to match changes to shared form fields
+                if 'attendees' in form.changed_data:
+                    sessions.update(attendees=form.cleaned_data['attendees'])
+                if 'comments' in form.changed_data:
+                    sessions.update(comments=form.cleaned_data['comments'])
+
+                # Handle constraints
+                for cname, cfield_id in form.wg_constraint_field_ids():
+                    if cfield_id in form.changed_data:
+                        Constraint.objects.filter(meeting=meeting, source=group, name=cname.slug).delete()
+                        save_conflicts(group, meeting, form.cleaned_data[cfield_id], cname.slug)
+
+                # see if any inactive constraints should be deleted
+                for cname, field_id in form.inactive_wg_constraint_field_ids():
+                    if form.cleaned_data[field_id]:
+                        Constraint.objects.filter(meeting=meeting, source=group, name=cname.slug).delete()
+
+                if 'adjacent_with_wg' in form.changed_data:
+                    Constraint.objects.filter(meeting=meeting, source=group, name='wg_adjacent').delete()
+                    save_conflicts(group, meeting, form.cleaned_data['adjacent_with_wg'], 'wg_adjacent')
+
+                if 'resources' in form.changed_data:
+                    new_resource_ids = form.cleaned_data['resources']
+                    new_resources = [ResourceAssociation.objects.get(pk=a)
+                                     for a in new_resource_ids]
+                    first_session.resources = new_resources
+
+                if 'bethere' in form.changed_data and set(form.cleaned_data['bethere']) != set(initial['bethere']):
+                    first_session.constraints().filter(name='bethere').delete()
+                    bethere_cn = ConstraintName.objects.get(slug='bethere')
+                    for p in form.cleaned_data['bethere']:
+                        Constraint.objects.create(name=bethere_cn, source=group, person=p, meeting=first_session.meeting)
+
+                if 'session_time_relation' in form.changed_data:
+                    Constraint.objects.filter(meeting=meeting, source=group, name='time_relation').delete()
+                    if form.cleaned_data['session_time_relation']:
+                        cn = ConstraintName.objects.get(slug='time_relation')
+                        Constraint.objects.create(source=group, meeting=meeting, name=cn,
+                                                  time_relation=form.cleaned_data['session_time_relation'])
+
+                if 'timeranges' in form.changed_data:
+                    Constraint.objects.filter(meeting=meeting, source=group, name='timerange').delete()
+                    if form.cleaned_data['timeranges']:
+                        cn = ConstraintName.objects.get(slug='timerange')
+                        constraint = Constraint.objects.create(source=group, meeting=meeting, name=cn)
+                        constraint.timeranges.set(form.cleaned_data['timeranges'])
+
+                # deprecated
+                # log activity
+                # add_session_activity(group,'Session Request was updated',meeting,user)
+
+                # send notification
+                if form.cleaned_data.get("send_notifications"):
+                    outbound_conflicts = get_outbound_conflicts(form)
+                    session_data = form.cleaned_data.copy()  # do not add things to the original cleaned_data
+                    session_data['outbound_conflicts'] = [f"{d['name']}: {d['groups']}" for d in outbound_conflicts]
+                    send_notification(
+                        group,
+                        meeting,
+                        login,
+                        session_data,
+                        [sf.cleaned_data for sf in form.session_forms.forms_to_keep],
+                        'update',
+                    )
+
+            messages.success(request, 'Session Request updated')
+            return redirect('ietf.meeting.views_session_request.view_request', acronym=acronym)
+
+    else:  # method is not POST
+        # gather outbound conflicts for initial value
+        outbound_constraints = defaultdict(list)
+        for obc in group.constraint_source_set.filter(meeting=meeting, name__is_group_conflict=True):
+            outbound_constraints[obc.name.slug].append(obc.target.acronym)
+        for slug, groups in outbound_constraints.items():
+            initial['constraint_{}'.format(slug)] = ' '.join(groups)
+
+        if not sessions:
+            return redirect('ietf.meeting.views_session_request.new_request', acronym=acronym)
+        form = SessionRequestForm(group, meeting, initial=initial, notifications_optional=has_role(request.user, "Secretariat"))
+
+    return render(request, 'meeting/session_request_form.html', {
+        'is_locked': is_locked and not has_role(request.user, 'Secretariat'),
+        'meeting': meeting,
+        'form': form,
+        'group': group,
+        'is_create': False,
+        'session_conflicts': session_conflicts},
+    )
+
+
+@check_permissions
+def approve_request(request, acronym):
+    '''
+    This view approves the third session.  For use by ADs or Secretariat.
+    '''
+    meeting = get_meeting(days=14)
+    group = get_object_or_404(Group, acronym=acronym)
+
+    session = add_event_info_to_session_qs(Session.objects.filter(meeting=meeting, group=group)).filter(current_status='apprw').first()
+    if session is None:
+        raise Http404
+
+    if has_role(request.user, 'Secretariat') or group.parent.role_set.filter(name='ad', person=request.user.person):
+        SchedulingEvent.objects.create(
+            session=session,
+            status=SessionStatusName.objects.get(slug='appr'),
+            by=request.user.person,
+        )
+        session_changed(session)
+
+        messages.success(request, 'Third session approved')
+        return redirect('ietf.meeting.views_session_request.view_request', acronym=acronym)
+    else:
+        # if an unauthorized user gets here return error
+        messages.error(request, 'Not authorized to approve the third session')
+        return redirect('ietf.meeting.views_session_request.view_request', acronym=acronym)
+
+
+@check_permissions
+def no_session(request, acronym):
+    '''
+    The user has indicated that the named group will not be having a session this IETF meeting.
+    Actions:
+    - send notification
+    - update session_activity log
+    '''
+    meeting = get_meeting(days=14)
+    group = get_object_or_404(Group, acronym=acronym)
+    login = request.user.person
+
+    # delete canceled record if there is one
+    add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(current_status='canceled').delete()
+
+    # skip if state is already notmeet
+    if add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(current_status='notmeet'):
+        messages.info(request, 'The group %s is already marked as not meeting' % group.acronym)
+        return redirect('ietf.meeting.views_session_request.list_view')
+
+    session = Session.objects.create(
+        group=group,
+        meeting=meeting,
+        requested_duration=datetime.timedelta(0),
+        type_id='regular',
+        purpose_id='regular',
+        has_onsite_tool=group.features.acts_like_wg,
+    )
+    SchedulingEvent.objects.create(
+        session=session,
+        status=SessionStatusName.objects.get(slug='notmeet'),
+        by=login,
+    )
+    session_changed(session)
+
+    # send notification
+    (to_email, cc_list) = gather_address_lists('session_request_not_meeting', group=group, person=login)
+    from_email = (settings.SESSION_REQUEST_FROM_EMAIL)
+    subject = '%s - Not having a session at IETF %s' % (group.acronym, meeting.number)
+    send_mail(request, to_email, from_email, subject, 'meeting/session_not_meeting_notification.txt',
+              {'login': login,
+               'group': group,
+               'meeting': meeting}, cc=cc_list)
+
+    # deprecated?
+    # log activity
+    # text = 'A message was sent to notify not having a session at IETF %d' % meeting.meeting_num
+    # add_session_activity(group,text,meeting,request.person)
+
+    # redirect
+    messages.success(request, 'A message was sent to notify not having a session at IETF %s' % meeting.number)
+    return redirect('ietf.meeting.views_session_request.list_view')
+
+
+@check_permissions
+def cancel_request(request, acronym):
+    '''
+    This view cancels a session request and sends a notification.
+    To cancel, or withdraw the request set status = deleted.
+    "canceled" status is used by the secretariat.
+
+    NOTE: this function can also be called after a session has been
+    scheduled during the period when the session request tool is
+    reopened.  In this case be sure to clear the timeslot assignment as well.
+    '''
+    meeting = get_meeting(days=14)
+    group = get_object_or_404(Group, acronym=acronym)
+    sessions = Session.objects.filter(meeting=meeting, group=group).order_by('id')
+    login = request.user.person
+
+    # delete conflicts
+    Constraint.objects.filter(meeting=meeting, source=group).delete()
+
+    # mark sessions as deleted
+    for session in sessions:
+        SchedulingEvent.objects.create(
+            session=session,
+            status=SessionStatusName.objects.get(slug='deleted'),
+            by=request.user.person,
+        )
+        session_changed(session)
+
+        # clear schedule assignments if already scheduled
+        session.timeslotassignments.all().delete()
+
+    # send notifitcation
+    (to_email, cc_list) = gather_address_lists('session_request_cancelled', group=group, person=login)
+    from_email = (settings.SESSION_REQUEST_FROM_EMAIL)
+    subject = '%s - Cancelling a meeting request for IETF %s' % (group.acronym, meeting.number)
+    send_mail(request, to_email, from_email, subject, 'meeting/session_cancel_notification.txt',
+              {'requester': get_requester_text(login, group),
+               'meeting': meeting}, cc=cc_list)
+
+    messages.success(request, 'The %s Session Request has been cancelled' % group.acronym)
+    return redirect('ietf.meeting.views_session_request.list_view')
diff --git a/ietf/message/admin.py b/ietf/message/admin.py
index c2564c04b9..6a876cdc70 100644
--- a/ietf/message/admin.py
+++ b/ietf/message/admin.py
@@ -1,32 +1,104 @@
-from django.contrib import admin
+# Copyright The IETF Trust 2012-2025, All Rights Reserved
+from django.contrib import admin, messages
+from django.db.models import QuerySet
+from rangefilter.filters import DateRangeQuickSelectListFilterBuilder
 
 from ietf.message.models import Message, MessageAttachment, SendQueue, AnnouncementFrom
+from ietf.message.tasks import retry_send_messages_by_pk_task
+
+
+class MessageSentStatusListFilter(admin.SimpleListFilter):
+    """Filter Messages by whether or not they were sent"""
+
+    title = "status"
+    parameter_name = "status"
+
+    def lookups(self, request, model_admin):
+        return [
+            ("sent", "Sent"),
+            ("unsent", "Not sent"),
+        ]
+
+    def queryset(self, request, queryset):
+        if self.value() == "unsent":
+            return queryset.filter(sent__isnull=True)
+        elif self.value() == "sent":
+            return queryset.filter(sent__isnull=False)
+
 
 class MessageAdmin(admin.ModelAdmin):
-    list_display = ["subject", "by", "time", "groups"]
+    list_display = ["sent_status", "display_subject", "by", "time", "groups"]
+    list_display_links = ["display_subject"]
     search_fields = ["subject", "body"]
     raw_id_fields = ["by", "related_groups", "related_docs"]
+    list_filter = [
+        MessageSentStatusListFilter,
+        ("time", DateRangeQuickSelectListFilterBuilder()),
+    ]
     ordering = ["-time"]
+    actions = ["retry_send"]
+
+    @admin.display(description="Subject", empty_value="(no subject)")
+    def display_subject(self, instance):
+        return instance.subject or None  # None triggers the empty_value
 
     def groups(self, instance):
         return ", ".join(g.acronym for g in instance.related_groups.all())
+
+    @admin.display(description="Sent", boolean=True)
+    def sent_status(self, instance):
+        return instance.sent is not None
+
+    @admin.action(description="Send selected messages if unsent")
+    def retry_send(self, request, queryset: QuerySet[Message]):
+        try:
+            retry_send_messages_by_pk_task.delay(
+                message_pks=list(queryset.values_list("pk", flat=True)),
+                resend=False,
+            )
+        except Exception as err:
+            self.message_user(
+                request,
+                f"Error: {repr(err)}",
+                messages.ERROR,
+            )
+        else:
+            self.message_user(request, "Messages queued for delivery", messages.SUCCESS)
+
+
 admin.site.register(Message, MessageAdmin)
 
+
 class MessageAttachmentAdmin(admin.ModelAdmin):
-    list_display = ['id', 'message', 'filename', 'removed',]
-    raw_id_fields = ['message']
+    list_display = [
+        "id",
+        "message",
+        "filename",
+        "removed",
+    ]
+    raw_id_fields = ["message"]
+
+
 admin.site.register(MessageAttachment, MessageAttachmentAdmin)
 
+
 class SendQueueAdmin(admin.ModelAdmin):
     list_display = ["time", "by", "message", "send_at", "sent_at"]
     list_filter = ["time", "send_at", "sent_at"]
     search_fields = ["message__body"]
     raw_id_fields = ["by", "message"]
     ordering = ["-time"]
+
+
 admin.site.register(SendQueue, SendQueueAdmin)
 
+
 class AnnouncementFromAdmin(admin.ModelAdmin):
-    list_display = ['name', 'group', 'address', ]
-admin.site.register(AnnouncementFrom, AnnouncementFromAdmin)
+    list_display = [
+        "name",
+        "group",
+        "address",
+    ]
 
 
+admin.site.register(AnnouncementFrom, AnnouncementFromAdmin)
diff --git a/ietf/message/factories.py b/ietf/message/factories.py
new file mode 100644
index 0000000000..72781512e4
--- /dev/null
+++ b/ietf/message/factories.py
@@ -0,0 +1,27 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+import factory
+
+from ietf.person.models import Person 
+from .models import Message, SendQueue
+
+
+class MessageFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = Message
+
+    by = factory.LazyFunction(lambda: Person.objects.get(name="(System)"))
+    subject = factory.Faker("sentence")
+    to = factory.Faker("email")
+    frm = factory.Faker("email")
+    cc = factory.Faker("email")
+    bcc = factory.Faker("email")
+    body = factory.Faker("paragraph")
+    content_type = "text/plain"
+
+
+class SendQueueFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = SendQueue
+
+    by = factory.LazyFunction(lambda: Person.objects.get(name="(System)"))
+    message = factory.SubFactory(MessageFactory)
diff --git a/ietf/message/management/commands/show_messages.py b/ietf/message/management/commands/show_messages.py
index b232da481e..8741b2129a 100644
--- a/ietf/message/management/commands/show_messages.py
+++ b/ietf/message/management/commands/show_messages.py
@@ -6,6 +6,7 @@
 import datetime
 
 from django.core.management.base import BaseCommand
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
@@ -25,7 +26,7 @@ class Command(BaseCommand):
     """
 
     def add_arguments(self, parser):
-        default_start = datetime.datetime.now() - datetime.timedelta(days=14)
+        default_start = timezone.now() - datetime.timedelta(days=14)
         parser.add_argument(
             '-t', '--start', '--from', type=str, default=default_start.strftime('%Y-%m-%d %H:%M'),
             help='Limit the list to messages saved after the given time (default %(default)s).',
diff --git a/ietf/message/migrations/0001_initial.py b/ietf/message/migrations/0001_initial.py
index c9e850dfb6..108e9d2db5 100644
--- a/ietf/message/migrations/0001_initial.py
+++ b/ietf/message/migrations/0001_initial.py
@@ -1,12 +1,10 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
+# Generated by Django 2.2.28 on 2023-03-30 19:14
 
-
-import datetime
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
 import email.utils
+import ietf.message.models
 import ietf.utils.models
 
 
@@ -16,41 +14,45 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('group', '0001_initial'),
-        ('name', '0001_initial'),
         ('person', '0001_initial'),
+        ('name', '0001_initial'),
         ('doc', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='AnnouncementFrom',
+            name='Message',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('address', models.CharField(max_length=255)),
-                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
-                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.RoleName')),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('subject', ietf.message.models.HeaderField()),
+                ('frm', ietf.message.models.HeaderField()),
+                ('to', ietf.message.models.HeaderField()),
+                ('cc', ietf.message.models.HeaderField(blank=True)),
+                ('bcc', ietf.message.models.HeaderField(blank=True)),
+                ('reply_to', ietf.message.models.HeaderField(blank=True)),
+                ('body', models.TextField()),
+                ('content_type', models.CharField(blank=True, default='text/plain', max_length=255)),
+                ('msgid', ietf.message.models.HeaderField(blank=True, default=email.utils.make_msgid, null=True)),
+                ('sent', models.DateTimeField(blank=True, null=True)),
+                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('related_docs', models.ManyToManyField(blank=True, to='doc.Document')),
+                ('related_groups', models.ManyToManyField(blank=True, to='group.Group')),
             ],
             options={
-                'verbose_name_plural': 'Announcement From addresses',
+                'ordering': ['time'],
             },
         ),
         migrations.CreateModel(
-            name='Message',
+            name='SendQueue',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('subject', models.CharField(max_length=255)),
-                ('frm', models.CharField(max_length=255)),
-                ('to', models.CharField(max_length=1024)),
-                ('cc', models.CharField(blank=True, max_length=1024)),
-                ('bcc', models.CharField(blank=True, max_length=255)),
-                ('reply_to', models.CharField(blank=True, max_length=255)),
-                ('body', models.TextField()),
-                ('content_type', models.CharField(blank=True, default='text/plain', max_length=255)),
-                ('msgid', models.CharField(blank=True, default=email.utils.make_msgid, max_length=255, null=True)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('send_at', models.DateTimeField(blank=True, null=True)),
+                ('sent_at', models.DateTimeField(blank=True, null=True)),
+                ('note', models.TextField(blank=True)),
                 ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('related_docs', models.ManyToManyField(blank=True, to='doc.Document')),
-                ('related_groups', models.ManyToManyField(blank=True, to='group.Group')),
+                ('message', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='message.Message')),
             ],
             options={
                 'ordering': ['time'],
@@ -69,18 +71,23 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='SendQueue',
+            name='AnnouncementFrom',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('send_at', models.DateTimeField(blank=True, null=True)),
-                ('sent_at', models.DateTimeField(blank=True, null=True)),
-                ('note', models.TextField(blank=True)),
-                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('message', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='message.Message')),
+                ('address', models.CharField(max_length=255)),
+                ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('name', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.RoleName')),
             ],
             options={
-                'ordering': ['time'],
+                'verbose_name_plural': 'Announcement From addresses',
             },
         ),
+        migrations.AddIndex(
+            model_name='sendqueue',
+            index=models.Index(fields=['time'], name='message_sen_time_07ab31_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='message',
+            index=models.Index(fields=['time'], name='message_mes_time_20eabf_idx'),
+        ),
     ]
diff --git a/ietf/message/migrations/0002_add_message_docs2_m2m.py b/ietf/message/migrations/0002_add_message_docs2_m2m.py
deleted file mode 100644
index c6a138ba6d..0000000000
--- a/ietf/message/migrations/0002_add_message_docs2_m2m.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 14:23
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='MessageDocs',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('message', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='message.Message')),
-                ('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='message',
-            name='related_docs2',
-            field=models.ManyToManyField(blank=True, related_name='messages', through='message.MessageDocs', to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/message/migrations/0003_set_document_m2m_keys.py b/ietf/message/migrations/0003_set_document_m2m_keys.py
deleted file mode 100644
index 6429af4432..0000000000
--- a/ietf/message/migrations/0003_set_document_m2m_keys.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 14:27
-
-
-import sys
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-
-    Document                    = apps.get_model('doc','Document')
-    Message                     = apps.get_model('message', 'Message')
-    MessageDocs                 = apps.get_model('message', 'MessageDocs')
-
-
-    # Document id fixup ------------------------------------------------------------
-
-    objs = Document.objects.in_bulk()
-    nameid = { o.name: o.id for id, o in objs.items() }
-
-    sys.stderr.write('\n')
-
-    sys.stderr.write(' %s.%s:\n' % (Message.__name__, 'related_docs'))
-    count = 0
-    for m in tqdm(Message.objects.all()):
-        for d in m.related_docs.all():
-            count += 1;
-            MessageDocs.objects.get_or_create(message=m, document_id=nameid[d.name])
-    sys.stderr.write(' %s MessageDocs objects created\n' % (count, ))
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0002_add_message_docs2_m2m'),
-        ('doc', '0014_set_document_docalias_id'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/message/migrations/0004_1_del_docs_m2m_table.py b/ietf/message/migrations/0004_1_del_docs_m2m_table.py
deleted file mode 100644
index 7b116789d5..0000000000
--- a/ietf/message/migrations/0004_1_del_docs_m2m_table.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-22 08:01
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0003_set_document_m2m_keys'),
-    ]
-
-    # The implementation of AlterField in Django 1.11 applies
-    #   'ALTER TABLE <table> MODIFY <field> ...;' in order to fix foregn keys
-    #   to the altered field, but as it seems does _not_ fix up m2m
-    #   intermediary tables in an equivalent manner, so here we remove and
-    #   then recreate the m2m tables so they will have the appropriate field
-    #   types.
-
-    operations = [
-        migrations.RemoveField(
-            model_name='message',
-            name='related_docs',
-        ),
-        migrations.AddField(
-            model_name='message',
-            name='related_docs',
-            field=models.ManyToManyField(to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/message/migrations/0004_2_add_docs_m2m_table.py b/ietf/message/migrations/0004_2_add_docs_m2m_table.py
deleted file mode 100644
index 4f24a26fe8..0000000000
--- a/ietf/message/migrations/0004_2_add_docs_m2m_table.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-22 08:01
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0004_1_del_docs_m2m_table'),
-    ]
-
-    # The implementation of AlterField in Django 1.11 applies
-    #   'ALTER TABLE <table> MODIFY <field> ...;' in order to fix foregn keys
-    #   to the altered field, but as it seems does _not_ fix up m2m
-    #   intermediary tables in an equivalent manner, so here we remove and
-    #   then recreate the m2m tables so they will have the appropriate field
-    #   types.
-
-    operations = [
-        migrations.RemoveField(
-            model_name='message',
-            name='related_docs',
-        ),
-        migrations.AddField(
-            model_name='message',
-            name='related_docs',
-            field=models.ManyToManyField(blank=True, to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/message/migrations/0005_copy_docs_m2m_table.py b/ietf/message/migrations/0005_copy_docs_m2m_table.py
deleted file mode 100644
index 8f7c185886..0000000000
--- a/ietf/message/migrations/0005_copy_docs_m2m_table.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-27 05:56
-
-
-import sys, time
-
-from django.db import migrations
-
-
-def timestamp(apps, schema_editor):
-    sys.stderr.write('\n %s' % time.strftime('%Y-%m-%d %H:%M:%S'))
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0004_2_add_docs_m2m_table'),
-    ]
-
-    operations = [
-        #migrations.RunPython(forward, reverse),
-        migrations.RunPython(timestamp, timestamp),
-        migrations.RunSQL(
-            "INSERT INTO message_message_related_docs SELECT * FROM message_messagedocs;",
-            ""
-        ),
-        migrations.RunPython(timestamp, timestamp),
-    ]
diff --git a/ietf/message/migrations/0006_remove_docs2_m2m.py b/ietf/message/migrations/0006_remove_docs2_m2m.py
deleted file mode 100644
index 97e3ef5f0e..0000000000
--- a/ietf/message/migrations/0006_remove_docs2_m2m.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-30 03:32
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0005_copy_docs_m2m_table'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='messagedocs',
-            name='document',
-        ),
-        migrations.RemoveField(
-            model_name='messagedocs',
-            name='message',
-        ),
-        migrations.RemoveField(
-            model_name='message',
-            name='related_docs2',
-        ),
-        migrations.DeleteModel(
-            name='MessageDocs',
-        ),
-    ]
diff --git a/ietf/message/migrations/0007_message_sent.py b/ietf/message/migrations/0007_message_sent.py
deleted file mode 100644
index 9ab1a4041e..0000000000
--- a/ietf/message/migrations/0007_message_sent.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-02-22 09:29
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0006_remove_docs2_m2m'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='message',
-            name='sent',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]
diff --git a/ietf/message/migrations/0008_set_message_sent.py b/ietf/message/migrations/0008_set_message_sent.py
deleted file mode 100644
index 281099305f..0000000000
--- a/ietf/message/migrations/0008_set_message_sent.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 14:27
-
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-
-    Message                     = apps.get_model('message', 'Message')
-
-    for m in tqdm(Message.objects.filter(sent=None)):
-        if m.sendqueue_set.exists():
-            q = m.sendqueue_set.last()
-            m.sent = q.sent_at
-        else:
-            m.sent = m.time
-        m.save()
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0007_message_sent'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/message/migrations/0009_fix_address_lists.py b/ietf/message/migrations/0009_fix_address_lists.py
deleted file mode 100644
index e14b6511c3..0000000000
--- a/ietf/message/migrations/0009_fix_address_lists.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 14:27
-
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-import debug                            # pyflakes:ignore
-
-
-def forward(apps, schema_editor):
-
-    Message                     = apps.get_model('message', 'Message')
-
-    for m in tqdm(Message.objects.all()):
-        dirty = False
-        for fieldname in ['to', 'cc', 'bcc', ]:
-            f = getattr(m, fieldname)
-            if f.startswith("['") or f.startswith('[]') or f.startswith("[u'"):
-                l = eval(f)
-                if isinstance(l, list):
-                    f = ','.join(l)
-                    setattr(m, fieldname, f)
-                    dirty = True
-        if dirty:
-            m.save()
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0008_set_message_sent'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/message/migrations/0010_fix_content_type.py b/ietf/message/migrations/0010_fix_content_type.py
deleted file mode 100644
index 0741142905..0000000000
--- a/ietf/message/migrations/0010_fix_content_type.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 14:27
-
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-import debug                            # pyflakes:ignore
-
-
-def forward(apps, schema_editor):
-
-    Message                     = apps.get_model('message', 'Message')
-
-    for m in tqdm(Message.objects.filter(content_type='')):
-        m.content_type = 'text/plain'
-        m.save()
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0009_fix_address_lists'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/message/migrations/0011_auto_20201109_0439.py b/ietf/message/migrations/0011_auto_20201109_0439.py
deleted file mode 100644
index 5134592cff..0000000000
--- a/ietf/message/migrations/0011_auto_20201109_0439.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('message', '0010_fix_content_type'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='message',
-            index=models.Index(fields=['time'], name='message_mes_time_20eabf_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='sendqueue',
-            index=models.Index(fields=['time'], name='message_sen_time_07ab31_idx'),
-        ),
-    ]
diff --git a/ietf/message/models.py b/ietf/message/models.py
index 01162a4b63..dfa23abd4d 100644
--- a/ietf/message/models.py
+++ b/ietf/message/models.py
@@ -2,10 +2,11 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
 import email.utils
 
+from django.forms import TextInput
 from django.db import models
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
@@ -16,19 +17,26 @@
 from ietf.utils.models import ForeignKey
 from ietf.utils.mail import get_email_addresses_from_text
 
+
+class HeaderField(models.TextField):
+    """TextField that defaults to a TextInput widget"""
+    def formfield(self, **kwargs):
+        return super().formfield(**{'widget': TextInput, **kwargs})
+
+
 class Message(models.Model):
-    time = models.DateTimeField(default=datetime.datetime.now)
+    time = models.DateTimeField(default=timezone.now)
     by = ForeignKey(Person)
 
-    subject = models.CharField(max_length=255)
-    frm = models.CharField(max_length=255)
-    to = models.CharField(max_length=1024)
-    cc = models.CharField(max_length=1024, blank=True)
-    bcc = models.CharField(max_length=255, blank=True)
-    reply_to = models.CharField(max_length=255, blank=True)
+    subject = HeaderField()
+    frm = HeaderField()
+    to = HeaderField()
+    cc = HeaderField(blank=True)
+    bcc = HeaderField(blank=True)
+    reply_to = HeaderField(blank=True)
     body = models.TextField()
     content_type = models.CharField(default="text/plain", max_length=255, blank=True)
-    msgid = models.CharField(max_length=255, blank=True, null=True, default=email.utils.make_msgid)
+    msgid = HeaderField(blank=True, null=True, default=email.utils.make_msgid)
 
     related_groups = models.ManyToManyField(Group, blank=True)
     related_docs = models.ManyToManyField(Document, blank=True)
@@ -62,7 +70,7 @@ def __str__(self):
 
 
 class SendQueue(models.Model):
-    time = models.DateTimeField(default=datetime.datetime.now)
+    time = models.DateTimeField(default=timezone.now)
     by = ForeignKey(Person)
     
     message = ForeignKey(Message)
diff --git a/ietf/message/tasks.py b/ietf/message/tasks.py
new file mode 100644
index 0000000000..1fdff7bea4
--- /dev/null
+++ b/ietf/message/tasks.py
@@ -0,0 +1,47 @@
+# Copyright The IETF Trust 2024 All Rights Reserved
+#
+# Celery task definitions
+#
+from celery import shared_task
+from smtplib import SMTPException
+
+from ietf.message.utils import send_scheduled_message_from_send_queue, retry_send_messages
+from ietf.message.models import SendQueue, Message
+from ietf.utils import log
+from ietf.utils.mail import log_smtp_exception, send_error_email
+
+
+@shared_task
+def send_scheduled_mail_task():
+    """Send scheduled email
+    
+    This is equivalent to `ietf/bin/send-scheduled-mail all`, which was the only form used in the cron job.
+    """
+    needs_sending = SendQueue.objects.filter(sent_at=None).select_related("message")
+    for s in needs_sending:
+        try:
+            send_scheduled_message_from_send_queue(s)
+            log.log('Sent scheduled message %s "%s"' % (s.id, s.message.subject))
+        except SMTPException as e:
+            log_smtp_exception(e)
+            send_error_email(e)
+
+
+@shared_task
+def retry_send_messages_by_pk_task(message_pks: list, resend=False):
+    """Task to retry sending Messages by PK
+    
+    Sends Messages whose PK is included in the list.
+    Only previously unsent messages are sent unless `resend` is true.
+    """
+    log.log(
+        "retry_send_messages_by_pk_task: "
+        "retrying send of Message PKs [{}] (resend={})".format(
+            ", ".join(str(pk) for pk in message_pks),
+            resend,
+        )
+    )
+    retry_send_messages(
+        messages=Message.objects.filter(pk__in=message_pks),
+        resend=resend,
+    )
diff --git a/ietf/message/tests.py b/ietf/message/tests.py
index 4ab7906997..e1bad9a1e6 100644
--- a/ietf/message/tests.py
+++ b/ietf/message/tests.py
@@ -1,23 +1,30 @@
 # Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
-
-
 import datetime
+from unittest import mock
+
+from smtplib import SMTPException
 
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
 from ietf.group.factories import GroupFactory
+from ietf.message.factories import MessageFactory, SendQueueFactory
 from ietf.message.models import Message, SendQueue
-from ietf.message.utils import send_scheduled_message_from_send_queue
+from ietf.message.tasks import send_scheduled_mail_task, retry_send_messages_by_pk_task
+from ietf.message.utils import send_scheduled_message_from_send_queue, retry_send_messages
 from ietf.person.models import Person
 from ietf.utils.mail import outbox, send_mail_text, send_mail_message, get_payload_text
 from ietf.utils.test_utils import TestCase
+from ietf.utils.timezone import date_today
+
+
 
 class MessageTests(TestCase):
     def test_message_view(self):
-        nomcom = GroupFactory(name="nomcom%s" % datetime.date.today().year, type_id="nomcom")
+        nomcom = GroupFactory(name="nomcom%s" % date_today().year, type_id="nomcom")
         msg = Message.objects.create(
             by=Person.objects.get(name="(System)"),
             subject="This is a test",
@@ -87,7 +94,7 @@ def test_send_plain_announcement(self):
         q = SendQueue.objects.create(
             by=Person.objects.get(name="(System)"),
             message=msg,
-            send_at=datetime.datetime.now() + datetime.timedelta(hours=12)
+            send_at=timezone.now() + datetime.timedelta(hours=12)
             )
 
         mailbox_before = len(outbox)
@@ -113,7 +120,7 @@ def test_send_mime_announcement(self):
         q = SendQueue.objects.create(
             by=Person.objects.get(name="(System)"),
             message=msg,
-            send_at=datetime.datetime.now() + datetime.timedelta(hours=12)
+            send_at=timezone.now() + datetime.timedelta(hours=12)
             )
         
         mailbox_before = len(outbox)
@@ -124,3 +131,75 @@ def test_send_mime_announcement(self):
         self.assertTrue("This is a test" in outbox[-1]["Subject"])
         self.assertTrue("--NextPart" in outbox[-1].as_string())
         self.assertTrue(SendQueue.objects.get(id=q.id).sent_at)
+
+
+class UtilsTests(TestCase):
+    @mock.patch("ietf.message.utils.send_mail_message")
+    def test_retry_send_messages(self, mock_send_mail_message):
+        sent_message = MessageFactory(sent=timezone.now())
+        unsent_messages = MessageFactory.create_batch(2, sent=None)
+        
+        # Send the sent message and one of the unsent messages
+        retry_send_messages(
+            Message.objects.filter(pk__in=[
+                sent_message.pk,
+                unsent_messages[0].pk,
+            ]),
+            resend=False,
+        )
+        self.assertEqual(mock_send_mail_message.call_count, 1)
+        self.assertEqual(
+            mock_send_mail_message.call_args.args[1],
+            unsent_messages[0],
+        )
+        
+        mock_send_mail_message.reset_mock()
+        # Once again, send the sent message and one of the unsent messages 
+        # (we can use the same one because our mock prevented it from having
+        # its status updated to sent)
+        retry_send_messages(
+            Message.objects.filter(pk__in=[
+                sent_message.pk,
+                unsent_messages[0].pk,
+            ]),
+            resend=True,
+        )
+        self.assertEqual(mock_send_mail_message.call_count, 2)
+        self.assertCountEqual(
+            [call_args.args[1] for call_args in mock_send_mail_message.call_args_list],
+            [sent_message, unsent_messages[0]],
+        )
+
+
+class TaskTests(TestCase):
+    @mock.patch("ietf.message.tasks.log_smtp_exception")
+    @mock.patch("ietf.message.tasks.send_scheduled_message_from_send_queue")
+    def test_send_scheduled_mail_task(self, mock_send_message, mock_log_smtp_exception):
+        not_yet_sent = SendQueueFactory()
+        SendQueueFactory(sent_at=timezone.now())  # already sent
+        send_scheduled_mail_task()
+        self.assertEqual(mock_send_message.call_count, 1)
+        self.assertEqual(mock_send_message.call_args[0], (not_yet_sent,))
+        self.assertFalse(mock_log_smtp_exception.called)
+
+        mock_send_message.reset_mock()
+        mock_send_message.side_effect = SMTPException
+        send_scheduled_mail_task()
+        self.assertEqual(mock_send_message.call_count, 1)
+        self.assertEqual(mock_send_message.call_args[0], (not_yet_sent,))
+        self.assertTrue(mock_log_smtp_exception.called)
+
+    @mock.patch("ietf.message.tasks.retry_send_messages")
+    def test_retry_send_messages_by_pk_task(self, mock_retry_send):
+        msgs = MessageFactory.create_batch(3)
+        MessageFactory()  # an extra message that won't be resent
+
+        retry_send_messages_by_pk_task([msg.pk for msg in msgs], resend=False)
+        called_with_messages = mock_retry_send.call_args.kwargs["messages"]
+        self.assertCountEqual(msgs, called_with_messages)
+        self.assertFalse(mock_retry_send.call_args.kwargs["resend"])
+
+        retry_send_messages_by_pk_task([msg.pk for msg in msgs], resend=True)
+        called_with_messages = mock_retry_send.call_args.kwargs["messages"]
+        self.assertCountEqual(msgs, called_with_messages)
+        self.assertTrue(mock_retry_send.call_args.kwargs["resend"])
diff --git a/ietf/message/utils.py b/ietf/message/utils.py
index 65c018a397..74448ca7c9 100644
--- a/ietf/message/utils.py
+++ b/ietf/message/utils.py
@@ -1,12 +1,17 @@
 # Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+import email
+import email.utils
+import re
+import smtplib
 
-import re, datetime, email
-
+from django.db.models import QuerySet
+from django.utils import timezone
 from django.utils.encoding import force_str
 
-from ietf.utils.mail import send_mail_text, send_mail_mime
+from ietf.utils import log
+from ietf.utils.mail import send_mail_text, send_mail_mime, send_mail_message
 from ietf.message.models import Message
 
 first_dot_on_line_re = re.compile(r'^\.', re.MULTILINE)
@@ -52,8 +57,34 @@ def send_scheduled_message_from_send_queue(queue_item):
         send_mail_mime(None, message.to, message.frm, message.subject,
                        msg, cc=message.cc, bcc=message.bcc)
 
-    queue_item.sent_at = datetime.datetime.now()
+    queue_item.sent_at = timezone.now()
     queue_item.save()
 
     queue_item.message.sent = queue_item.sent_at
     queue_item.message.save()
+
+
+def retry_send_messages(messages: QuerySet[Message], resend=False):
+    """Attempt delivery of Messages"""
+    if not resend:
+        # only include sent messages on explicit request
+        for already_sent in messages.filter(sent__isnull=False):
+            assert already_sent.sent is not None  # appease mypy type checking
+            log.log(
+                f"retry_send_messages: skipping {already_sent.pk} "
+                f"(already sent {already_sent.sent.isoformat(timespec='milliseconds')})"
+            )
+        messages = messages.filter(sent__isnull=True)
+    for msg in messages:
+        to = ",".join(a[1] for a in email.utils.getaddresses([msg.to]))
+        try:
+            send_mail_message(None, msg)
+            log.log(
+                f'retry_send_messages: '
+                f'sent {msg.pk} {msg.frm} -> {to} "{msg.subject.strip()}"'
+            )
+        except smtplib.SMTPException as e:
+            log.log(
+                f'retry_send_messages: '
+                f'Failure {e}:  {msg.pk}  {msg.frm} -> {to}  "{msg.subject.strip()}"'
+            )
diff --git a/ietf/message/views.py b/ietf/message/views.py
index e4cca63017..355dcdd8d2 100644
--- a/ietf/message/views.py
+++ b/ietf/message/views.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2025, All Rights Reserved
 from django.shortcuts import render, get_object_or_404
 
 from ietf.message.models import Message
diff --git a/ietf/middleware.py b/ietf/middleware.py
index 48146abf5e..fa2e8efd0c 100644
--- a/ietf/middleware.py
+++ b/ietf/middleware.py
@@ -8,6 +8,7 @@
 from django.http import HttpResponsePermanentRedirect
 from ietf.utils.log import log, exc_parts
 from ietf.utils.mail import log_smtp_exception
+from opentelemetry.propagate import inject
 import re
 import smtplib
 import unicodedata
@@ -17,45 +18,61 @@ def sql_log_middleware(get_response):
     def sql_log(request):
         response = get_response(request)
         for q in connection.queries:
-            if re.match('(update|insert)', q['sql'], re.IGNORECASE):
-                log(q['sql'])
+            if re.match("(update|insert)", q["sql"], re.IGNORECASE):
+                log(q["sql"])
         return response
+
     return sql_log
 
+
 class SMTPExceptionMiddleware(object):
     def __init__(self, get_response):
         self.get_response = get_response
+
     def __call__(self, request):
         return self.get_response(request)
+
     def process_exception(self, request, exception):
         if isinstance(exception, smtplib.SMTPException):
             (extype, value, tb) = log_smtp_exception(exception)
-            return render(request, 'email_failed.html',
-                          {'exception': extype, 'args': value, 'traceback': "".join(tb)} )
+            return render(
+                request,
+                "email_failed.html",
+                {"exception": extype, "args": value, "traceback": "".join(tb)},
+            )
         return None
 
+
 class Utf8ExceptionMiddleware(object):
     def __init__(self, get_response):
         self.get_response = get_response
+
     def __call__(self, request):
         return self.get_response(request)
+
     def process_exception(self, request, exception):
         if isinstance(exception, OperationalError):
             extype, e, tb = exc_parts()
             if e.args[0] == 1366:
                 log("Database 4-byte utf8 exception: %s: %s" % (extype, e))
-                return render(request, 'utf8_4byte_failed.html',
-                              {'exception': extype, 'args': e.args, 'traceback': "".join(tb)} )
+                return render(
+                    request,
+                    "utf8_4byte_failed.html",
+                    {"exception": extype, "args": e.args, "traceback": "".join(tb)},
+                )
         return None
 
+
 def redirect_trailing_period_middleware(get_response):
     def redirect_trailing_period(request):
         response = get_response(request)
         if response.status_code == 404 and request.path.endswith("."):
             return HttpResponsePermanentRedirect(request.path.rstrip("."))
         return response
+
     return redirect_trailing_period
 
+
 def unicode_nfkc_normalization_middleware(get_response):
     def unicode_nfkc_normalization(request):
         """Do Unicode NFKC normalization to turn ligatures into individual characters.
@@ -65,9 +82,30 @@ def unicode_nfkc_normalization(request):
         There are probably other elements of a request which may need this normalization
         too, but let's put that in as it comes up, rather than guess ahead.
         """
-        request.META["PATH_INFO"] = unicodedata.normalize('NFKC', request.META["PATH_INFO"])
-        request.path_info = unicodedata.normalize('NFKC', request.path_info)
+        request.META["PATH_INFO"] = unicodedata.normalize(
+            "NFKC", request.META["PATH_INFO"]
+        )
+        request.path_info = unicodedata.normalize("NFKC", request.path_info)
         response = get_response(request)
         return response
+
     return unicode_nfkc_normalization
-        
+
+
+def is_authenticated_header_middleware(get_response):
+    """Middleware to add an is-authenticated header to the response"""
+    def add_header(request):
+        response = get_response(request)
+        response["X-Datatracker-Is-Authenticated"] = "yes" if request.user.is_authenticated else "no"
+        return response
+
+    return add_header
+
+def add_otel_traceparent_header(get_response):
+    """Middleware to add the OpenTelemetry traceparent id header to the response"""
+    def add_header(request):
+        response = get_response(request)
+        inject(response)
+        return response
+
+    return add_header
diff --git a/ietf/name/admin.py b/ietf/name/admin.py
index dd659d1135..b89d6d141c 100644
--- a/ietf/name/admin.py
+++ b/ietf/name/admin.py
@@ -2,63 +2,145 @@
 from django.contrib import admin
 
 from ietf.name.models import (
-    AgendaTypeName, BallotPositionName, ConstraintName, ContinentName, CountryName, DBTemplateTypeName,
-    DocRelationshipName, DocReminderTypeName, DocTagName, DocTypeName, DraftSubmissionStateName,
-    FeedbackTypeName, FormalLanguageName, GroupMilestoneStateName, GroupStateName, GroupTypeName,
-    ImportantDateName, IntendedStdLevelName, IprDisclosureStateName, IprEventTypeName,
-    IprLicenseTypeName, LiaisonStatementEventTypeName, LiaisonStatementPurposeName,
-    LiaisonStatementState, LiaisonStatementTagName, MeetingTypeName, NomineePositionStateName,
-    ReviewRequestStateName, ReviewResultName, ReviewTypeName, RoleName, RoomResourceName,
-    SessionStatusName, StdLevelName, StreamName, TimeSlotTypeName, TopicAudienceName,
-    DocUrlTagName, ReviewAssignmentStateName, ReviewerQueuePolicyName, TimerangeName,
-    ExtResourceName, ExtResourceTypeName, SlideSubmissionStatusName, ProceedingsMaterialTypeName,
-    AgendaFilterTypeName, SessionPurposeName )
+    AgendaTypeName,
+    AttendanceTypeName,
+    BallotPositionName,
+    ConstraintName,
+    ContinentName,
+    CountryName,
+    DBTemplateTypeName,
+    DocRelationshipName,
+    DocReminderTypeName,
+    DocTagName,
+    DocTypeName,
+    DraftSubmissionStateName,
+    FeedbackTypeName,
+    FormalLanguageName,
+    GroupMilestoneStateName,
+    GroupStateName,
+    GroupTypeName,
+    ImportantDateName,
+    IntendedStdLevelName,
+    IprDisclosureStateName,
+    IprEventTypeName,
+    IprLicenseTypeName,
+    LiaisonStatementEventTypeName,
+    LiaisonStatementPurposeName,
+    LiaisonStatementState,
+    LiaisonStatementTagName,
+    MeetingTypeName,
+    NomineePositionStateName,
+    RegistrationTicketTypeName,
+    ReviewRequestStateName,
+    ReviewResultName,
+    ReviewTypeName,
+    RoleName,
+    RoomResourceName,
+    SessionStatusName,
+    StdLevelName,
+    StreamName,
+    TimeSlotTypeName,
+    TopicAudienceName,
+    DocUrlTagName,
+    ReviewAssignmentStateName,
+    ReviewerQueuePolicyName,
+    TimerangeName,
+    ExtResourceName,
+    ExtResourceTypeName,
+    SlideSubmissionStatusName,
+    ProceedingsMaterialTypeName,
+    AgendaFilterTypeName,
+    SessionPurposeName,
+    TelechatAgendaSectionName,
+    AppealArtifactTypeName,
+)
 
 
 from ietf.stats.models import CountryAlias
+from ietf.utils.admin import SaferTabularInline
+
 
 class NameAdmin(admin.ModelAdmin):
     list_display = ["slug", "name", "desc", "used", "order"]
     search_fields = ["slug", "name"]
-    prepopulate_from = { "slug": ("name",) }
+    prepopulate_from = {"slug": ("name",)}
+
 
 class DocRelationshipNameAdmin(NameAdmin):
     list_display = ["slug", "name", "revname", "desc", "used"]
+
+
 admin.site.register(DocRelationshipName, DocRelationshipNameAdmin)
-    
+
+
 class DocTypeNameAdmin(NameAdmin):
     list_display = ["slug", "name", "prefix", "desc", "used"]
+
+
 admin.site.register(DocTypeName, DocTypeNameAdmin)
 
+
 class GroupTypeNameAdmin(NameAdmin):
     list_display = ["slug", "name", "verbose_name", "desc", "used"]
+
+
 admin.site.register(GroupTypeName, GroupTypeNameAdmin)
 
-class CountryAliasInline(admin.TabularInline):
+
+class CountryAliasInline(SaferTabularInline):
     model = CountryAlias
     extra = 1
 
+
 class CountryNameAdmin(NameAdmin):
     list_display = ["slug", "name", "continent", "in_eu"]
     list_filter = ["continent", "in_eu"]
     inlines = [CountryAliasInline]
+
+
 admin.site.register(CountryName, CountryNameAdmin)
 
+
 class ImportantDateNameAdmin(NameAdmin):
     list_display = ["slug", "name", "desc", "used", "default_offset_days"]
-    ordering = ('-used','default_offset_days',)
-admin.site.register(ImportantDateName,ImportantDateNameAdmin)
+    ordering = (
+        "-used",
+        "default_offset_days",
+    )
+
+
+admin.site.register(ImportantDateName, ImportantDateNameAdmin)
+
 
 class ExtResourceNameAdmin(NameAdmin):
-    list_display = ["slug", "name", "type", "desc", "used",]
-admin.site.register(ExtResourceName,ExtResourceNameAdmin)
+    list_display = [
+        "slug",
+        "name",
+        "type",
+        "desc",
+        "used",
+    ]
+
+
+admin.site.register(ExtResourceName, ExtResourceNameAdmin)
+
 
 class ProceedingsMaterialTypeNameAdmin(NameAdmin):
-    list_display = ["slug", "name", "desc", "used", "order",]
+    list_display = [
+        "slug",
+        "name",
+        "desc",
+        "used",
+        "order",
+    ]
+
+
 admin.site.register(ProceedingsMaterialTypeName, ProceedingsMaterialTypeNameAdmin)
 
 admin.site.register(AgendaFilterTypeName, NameAdmin)
 admin.site.register(AgendaTypeName, NameAdmin)
+admin.site.register(AppealArtifactTypeName, NameAdmin)
+admin.site.register(AttendanceTypeName, NameAdmin)
 admin.site.register(BallotPositionName, NameAdmin)
 admin.site.register(ConstraintName, NameAdmin)
 admin.site.register(ContinentName, NameAdmin)
@@ -80,6 +162,7 @@ class ProceedingsMaterialTypeNameAdmin(NameAdmin):
 admin.site.register(LiaisonStatementTagName, NameAdmin)
 admin.site.register(MeetingTypeName, NameAdmin)
 admin.site.register(NomineePositionStateName, NameAdmin)
+admin.site.register(RegistrationTicketTypeName, NameAdmin)
 admin.site.register(ReviewRequestStateName, NameAdmin)
 admin.site.register(ReviewAssignmentStateName, NameAdmin)
 admin.site.register(ReviewResultName, NameAdmin)
@@ -97,3 +180,4 @@ class ProceedingsMaterialTypeNameAdmin(NameAdmin):
 admin.site.register(ExtResourceTypeName, NameAdmin)
 admin.site.register(SlideSubmissionStatusName, NameAdmin)
 admin.site.register(SessionPurposeName, NameAdmin)
+admin.site.register(TelechatAgendaSectionName, NameAdmin)
diff --git a/ietf/name/factories.py b/ietf/name/factories.py
new file mode 100644
index 0000000000..73399dcbb4
--- /dev/null
+++ b/ietf/name/factories.py
@@ -0,0 +1,13 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+import factory
+
+from .models import (
+    AppealArtifactTypeName,
+)
+
+class AppealArtifactTypeNameFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = AppealArtifactTypeName
+        django_get_or_create = ("slug",)
diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
index f6a3a7d7ca..64e26e503a 100644
--- a/ietf/name/fixtures/names.json
+++ b/ietf/name/fixtures/names.json
@@ -147,6 +147,23 @@
     "model": "doc.ballottype",
     "pk": 7
   },
+  {
+    "fields": {
+      "doc_type": "draft",
+      "name": "RSAB Approve",
+      "order": 0,
+      "positions": [
+        "concern",
+        "yes",
+        "recuse"
+      ],
+      "question": "Is this draft ready for publication in the Editorial stream?",
+      "slug": "rsab-approve",
+      "used": true
+    },
+    "model": "doc.ballottype",
+    "pk": 8
+  },
   {
     "fields": {
       "desc": "",
@@ -295,7 +312,7 @@
       "order": 42,
       "slug": "watching",
       "type": "draft-iesg",
-      "used": true
+      "used": false
     },
     "model": "doc.state",
     "pk": 11
@@ -385,7 +402,7 @@
   },
   {
     "fields": {
-      "desc": "The document is in the RFC editor Queue (as confirmed by http://www.rfc-editor.org/queue.html).",
+      "desc": "The document is in the RFC editor Queue (as confirmed by https://www.rfc-editor.org/queue.html).",
       "name": "RFC Ed Queue",
       "next_states": [
         7
@@ -633,7 +650,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.1\" target=\"_blank\">4.2.1. Call for Adoption by WG Issued</a>\r\n\r\n The \"Call for Adoption by WG Issued\" state should be used to indicate when an I-D is being considered for adoption by an IETF WG. An I-D that is in this state is actively being considered for adoption and has not yet achieved consensus, preference, or selection in the WG.\r\n\r\n This state may be used to describe an I-D that someone has asked a WG to consider for adoption, if the WG Chair has agreed with the request. This state may also be used to identify an I-D that a WG Chair asked an author to write specifically for consideration as a candidate WG item [WGDTSPEC], and/or an I-D that is listed as a 'candidate draft' in the WG's charter.\r\n\r\n Under normal conditions, it should not be possible for an I-D to be in the \"Call for Adoption by WG Issued\" state in more than one working group at the same time. This said, it is not uncommon for authors to \"shop\" their I-Ds to more than one WG at a time, with the hope of getting their documents adopted somewhere.\r\n\r\n After this state is implemented in the Datatracker, an I-D that is in the \"Call for Adoption by WG Issued\" state will not be able to be \"shopped\" to any other WG without the consent of the WG Chairs and the responsible ADs impacted by the shopping.\r\n\r\n Note that Figure 1 includes an arc leading from this state to outside of the WG state machine. This illustrates that some I-Ds that are considered do not get adopted as WG drafts. An I-D that is not adopted as a WG draft will transition out of the WG state machine and revert back to having no stream-specific state; however, the status change history log of the I-D will record that the I-D was previously in the \"Call for Adoption by WG Issued\" state.",
+      "desc": "A call for adoption of the individual submission document has been issued by the Working Group (WG) chairs.  This call is still running but the WG has not yet reached consensus for adoption.",
       "name": "Call For Adoption By WG Issued",
       "next_states": [
         36,
@@ -649,7 +666,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.2\" target=\"_blank\">4.2.2. Adopted by a WG</a>\r\n\r\n The \"Adopted by a WG\" state describes an individual submission I-D that an IETF WG has agreed to adopt as one of its WG drafts.\r\n\r\n WG Chairs who use this state will be able to clearly indicate when their WGs adopt individual submission I-Ds. This will facilitate the Datatracker's ability to correctly capture \"Replaces\" information for WG drafts and correct \"Replaced by\" information for individual submission I-Ds that have been replaced by WG drafts.\r\n\r\n This state is needed because the Datatracker uses the filename of an I-D as a key to search its database for status information about the I-D, and because the filename of a WG I-D is supposed to be different from the filename of an individual submission I-D. The filename of an individual submission I-D will typically be formatted as 'draft-author-wgname-topic-nn'.\r\n\r\n The filename of a WG document is supposed to be formatted as 'draft- ietf-wgname-topic-nn'.\r\n\r\n An individual I-D that is adopted by a WG may take weeks or months to be resubmitted by the author as a new (version-00) WG draft. If the \"Adopted by a WG\" state is not used, the Datatracker has no way to determine that an I-D has been adopted until a new version of the I-D is submitted to the WG by the author and until the I-D is approved for posting by a WG Chair.",
+      "desc": "The individual submission document has been adopted by the Working Group (WG), but a WG document replacing this document with the typical naming convention of 'draft- ietf-wgname-topic-nn' has not yet been submitted.",
       "name": "Adopted by a WG",
       "next_states": [
         38
@@ -664,7 +681,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.3\" target=\"_blank\">4.2.3. Adopted for WG Info Only</a>\r\n\r\n The \"Adopted for WG Info Only\" state describes a document that contains useful information for the WG that adopted it, but the document is not intended to be published as an RFC. The WG will not actively develop the contents of the I-D or progress it for publication as an RFC. The only purpose of the I-D is to provide information for internal use by the WG.",
+      "desc": "The document is adopted by the Working Group (WG) for its internal use.  The WG has decided that it will not pursue publication of it as an RFC.",
       "name": "Adopted for WG Info Only",
       "next_states": [],
       "order": 3,
@@ -677,7 +694,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.4\" target=\"_blank\">4.2.4. WG Document</a>\r\n\r\n The \"WG Document\" state describes an I-D that has been adopted by an IETF WG and is being actively developed.\r\n\r\n A WG Chair may transition an I-D into the \"WG Document\" state at any time as long as the I-D is not being considered or developed in any other WG.\r\n\r\n Alternatively, WG Chairs may rely upon new functionality to be added to the Datatracker to automatically move version-00 drafts into the \"WG Document\" state as described in Section 4.1.\r\n\r\n Under normal conditions, it should not be possible for an I-D to be in the \"WG Document\" state in more than one WG at a time. This said, I-Ds may be transferred from one WG to another with the consent of the WG Chairs and the responsible ADs.",
+      "desc": "The document has been adopted by the Working Group (WG) and is under development.  A document can only be adopted by one WG at a time.  However, a document may be transferred between WGs.",
       "name": "WG Document",
       "next_states": [
         39,
@@ -695,7 +712,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.5\" target=\"_blank\">4.2.5. Parked WG Document</a>\r\n\r\n A \"Parked WG Document\" is an I-D that has lost its author or editor, is waiting for another document to be written or for a review to be completed, or cannot be progressed by the working group for some other reason.\r\n\r\n Some of the annotation tags described in Section 4.3 may be used in conjunction with this state to indicate why an I-D has been parked, and/or what may need to happen for the I-D to be un-parked.\r\n\r\n Parking a WG draft will not prevent it from expiring; however, this state can be used to indicate why the I-D has stopped progressing in the WG.\r\n\r\n A \"Parked WG Document\" that is not expired may be transferred from one WG to another with the consent of the WG Chairs and the responsible ADs.",
+      "desc": "The Working Group (WG) document is in a temporary state where it will not be actively developed.  The reason for the pause is explained via a datatracker comments section.",
       "name": "Parked WG Document",
       "next_states": [
         38
@@ -710,7 +727,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.6\" target=\"_blank\">4.2.6. Dead WG Document</a>\r\n\r\n A \"Dead WG Document\" is an I-D that has been abandoned. Note that 'Dead' is not always a final state for a WG I-D. If consensus is subsequently achieved, a \"Dead WG Document\" may be resurrected. A \"Dead WG Document\" that is not resurrected will eventually expire.\r\n\r\n Note that an I-D that is declared to be \"Dead\" in one WG and that is not expired may be transferred to a non-dead state in another WG with the consent of the WG Chairs and the responsible ADs.",
+      "desc": "The Working Group (WG) document has been abandoned by the WG.  No further development is planned in this WG.  A decision to resume work on this document and move it out of this state is possible.",
       "name": "Dead WG Document",
       "next_states": [
         38
@@ -725,7 +742,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.7\" target=\"_blank\">4.2.7. In WG Last Call</a>\r\n\r\n A document \"In WG Last Call\" is an I-D for which a WG Last Call (WGLC) has been issued and is in progress.\r\n\r\n Note that conducting a WGLC is an optional part of the IETF WG process, per Section 7.4 of RFC 2418 [RFC2418].\r\n\r\n If a WG Chair decides to conduct a WGLC on an I-D, the \"In WG Last Call\" state can be used to track the progress of the WGLC. The Chair may configure the Datatracker to send a WGLC message to one or more mailing lists when the Chair moves the I-D into this state. The WG Chair may also be able to select a different set of mailing lists for a different document undergoing a WGLC; some documents may deserve coordination with other WGs.\r\n\r\n A WG I-D in this state should remain \"In WG Last Call\" until the WG Chair moves it to another state. The WG Chair may configure the Datatracker to send an e-mail after a specified period of time to remind or 'nudge' the Chair to conclude the WGLC and to determine the next state for the document.\r\n\r\n It is possible for one WGLC to lead into another WGLC for the same document. For example, an I-D that completed a WGLC as an \"Informational\" document may need another WGLC if a decision is taken to convert the I-D into a Standards Track document.",
+      "desc": "The Working Group (WG) document is currently subject to an active WG Last Call (WGLC) review per Section 7.4 of RFC2418.",
       "name": "In WG Last Call",
       "next_states": [
         38,
@@ -742,7 +759,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.8\" target=\"_blank\">4.2.8. Waiting for WG Chair Go-Ahead</a>\r\n\r\n A WG Chair may wish to place an I-D that receives a lot of comments during a WGLC into the \"Waiting for WG Chair Go-Ahead\" state. This state describes an I-D that has undergone a WGLC; however, the Chair is not yet ready to call consensus on the document.\r\n\r\n If comments from the WGLC need to be responded to, or a revision to the I-D is needed, the Chair may place an I-D into this state until all of the WGLC comments are adequately addressed and the (possibly revised) document is in the I-D repository.",
+      "desc": "The Working Group (WG) document has completed Working Group Last Call (WGLC), but the WG chair(s) are not yet ready to call consensus on the document. The reasons for this may include comments from the WGLC need to be responded to, or a revision to the document is needed",
       "name": "Waiting for WG Chair Go-Ahead",
       "next_states": [
         41,
@@ -758,7 +775,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.9\" target=\"_blank\">4.2.9. WG Consensus: Waiting for Writeup</a>\r\n\r\n A document in the \"WG Consensus: Waiting for Writeup\" state has essentially completed its development within the working group, and is nearly ready to be sent to the IESG for publication. The last thing to be done is the preparation of a protocol writeup by a Document Shepherd. The IESG requires that a document shepherd writeup be completed before publication of the I-D is requested. The IETF document shepherding process and the role of a WG Document Shepherd is described in RFC 4858 [RFC4858]\r\n\r\n A WG Chair may call consensus on an I-D without a formal WGLC and transition an I-D that was in the \"WG Document\" state directly into this state.\r\n\r\n The name of this state includes the words \"Waiting for Writeup\" because a good document shepherd writeup takes time to prepare.",
+      "desc": "The Working Group (WG) document has consensus to proceed to publication.  However, the document is waiting for a document shepherd write-up per RFC4858.",
       "name": "WG Consensus: Waiting for Write-Up",
       "next_states": [
         44
@@ -773,7 +790,7 @@
   },
   {
     "fields": {
-      "desc": "<a href=\"https://www.rfc-editor.org/rfc/rfc6174.html#section-4.2.10\" target=\"_blank\">4.2.10. Submitted to IESG for Publication</a>\r\n\r\n This state describes a WG document that has been submitted to the IESG for publication and that has not been sent back to the working group for revision.\r\n\r\n An I-D in this state may be under review by the IESG, it may have been approved and be in the RFC Editor's queue, or it may have been published as an RFC. Other possibilities exist too. The document may be \"Dead\" (in the IESG state machine) or in a \"Do Not Publish\" state.",
+      "desc": "The Working Group (WG) document has left the WG and been submitted to the Internet Engineering Steering Group (IESG) for evaluation and publication.  See the “IESG State” or “RFC Editor State” for further details on the state of the document.",
       "name": "Submitted to IESG for Publication",
       "next_states": [
         38
@@ -827,10 +844,10 @@
   },
   {
     "fields": {
-      "desc": "This document is awaiting the IAB itself to come to internal consensus.",
+      "desc": "The document has completed community review and is now being formally reviewed by the entire IAB in order to make a decision about whether it is ready to be published as an IAB-stream RFC.",
       "name": "IAB Review",
       "next_states": [],
-      "order": 4,
+      "order": 5,
       "slug": "review-i",
       "type": "draft-stream-iab",
       "used": true
@@ -843,7 +860,7 @@
       "desc": "This document has completed internal consensus within the IAB and is now under community review.",
       "name": "Community Review",
       "next_states": [],
-      "order": 5,
+      "order": 4,
       "slug": "review-c",
       "type": "draft-stream-iab",
       "used": true
@@ -2003,7 +2020,7 @@
   },
   {
     "fields": {
-      "desc": "The document has been marked as a candidate for WG adoption by the WG Chair.  This state can be used before a call for adoption is issued (and the document is put in the \"Call For Adoption By WG Issued\" state), to indicate that the document is in the queue for a call for adoption, even if none has been issued yet.",
+      "desc": "The individual submission document has been marked by the Working Group (WG) chairs as a candidate for adoption by the WG, but no adoption call has been started.",
       "name": "Candidate for WG Adoption",
       "next_states": [
         35
@@ -2135,7 +2152,7 @@
   },
   {
     "fields": {
-      "desc": "In some areas, it can be desirable to wait for multiple interoperable implementations before progressing a draft to be an RFC, and in some WGs this is required.  This state should be entered after WG Last Call has completed.",
+      "desc": "The progression of this Working Group (WG) document towards publication is paused as it awaits implementation. The process governing the approach to implementations is WG-specific.",
       "name": "Waiting for Implementation",
       "next_states": [],
       "order": 8,
@@ -2148,7 +2165,7 @@
   },
   {
     "fields": {
-      "desc": "Held by WG, see document history for details.",
+      "desc": "Held by Working Group (WG) chairs for administrative reasons.  See document history for details.",
       "name": "Held by WG",
       "next_states": [],
       "order": 9,
@@ -2457,6 +2474,188 @@
     "model": "doc.state",
     "pk": 168
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Replaced editorial stream document",
+      "next_states": [],
+      "order": 0,
+      "slug": "repl",
+      "type": "draft-stream-editorial",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 170
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Active editorial stream document",
+      "next_states": [],
+      "order": 2,
+      "slug": "active",
+      "type": "draft-stream-editorial",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 171
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Editorial stream document under RSAB review",
+      "next_states": [],
+      "order": 3,
+      "slug": "rsabpoll",
+      "type": "draft-stream-editorial",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 172
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Published RFC",
+      "next_states": [],
+      "order": 4,
+      "slug": "pub",
+      "type": "draft-stream-editorial",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 173
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Dead editorial stream document",
+      "next_states": [],
+      "order": 5,
+      "slug": "dead",
+      "type": "draft-stream-editorial",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 174
+  },
+  {
+    "fields": {
+      "desc": "The statement is active",
+      "name": "Active",
+      "next_states": [],
+      "order": 0,
+      "slug": "active",
+      "type": "statement",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 175
+  },
+  {
+    "fields": {
+      "desc": "The statement has been replaced",
+      "name": "Replaced",
+      "next_states": [],
+      "order": 0,
+      "slug": "replaced",
+      "type": "statement",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 176
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Published",
+      "next_states": [],
+      "order": 1,
+      "slug": "published",
+      "type": "rfc",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 177
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Active",
+      "next_states": [],
+      "order": 0,
+      "slug": "active",
+      "type": "narrativeminutes",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 178
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Deleted",
+      "next_states": [],
+      "order": 1,
+      "slug": "deleted",
+      "type": "narrativeminutes",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 179
+  },
+  {
+    "fields": {
+      "desc": "The editorial stream processing of this document is complete and it has been sent to the RFC Editor for publication. The document may be in the RFC Editor's queue, or it may have been published as an RFC; this state doesn't distinguish between different states occurring after the document has left the RSAB.",
+      "name": "Sent to the RFC Editor",
+      "next_states": [],
+      "order": 10,
+      "slug": "rfc-edit",
+      "type": "draft-stream-editorial",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 180
+  },
+  {
+    "fields": {
+      "desc": "The BOF request is spam",
+      "name": "Spam",
+      "next_states": [],
+      "order": 5,
+      "slug": "spam",
+      "type": "bofreq",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 181
+  },
+  {
+    "fields": {
+      "desc": "The statement has been marked historic",
+      "name": "Historic",
+      "next_states": [],
+      "order": 0,
+      "slug": "historic",
+      "type": "statement",
+      "used": false
+    },
+    "model": "doc.state",
+    "pk": 182
+  },
+  {
+    "fields": {
+      "desc": "The statement is no longer active",
+      "name": "Inactive",
+      "next_states": [],
+      "order": 0,
+      "slug": "inactive",
+      "type": "statement",
+      "used": true
+    },
+    "model": "doc.state",
+    "pk": 183
+  },
   {
     "fields": {
       "label": "State"
@@ -2464,6 +2663,13 @@
     "model": "doc.statetype",
     "pk": "agenda"
   },
+  {
+    "fields": {
+      "label": "bcp state"
+    },
+    "model": "doc.statetype",
+    "pk": "bcp"
+  },
   {
     "fields": {
       "label": "State"
@@ -2506,13 +2712,6 @@
     "model": "doc.statetype",
     "pk": "draft"
   },
-  {
-    "fields": {
-      "label": "IANA state"
-    },
-    "model": "doc.statetype",
-    "pk": "draft-iana"
-  },
   {
     "fields": {
       "label": "IANA Action state"
@@ -2548,6 +2747,13 @@
     "model": "doc.statetype",
     "pk": "draft-rfceditor"
   },
+  {
+    "fields": {
+      "label": "Editorial stream state"
+    },
+    "model": "doc.statetype",
+    "pk": "draft-stream-editorial"
+  },
   {
     "fields": {
       "label": "IAB state"
@@ -2576,6 +2782,13 @@
     "model": "doc.statetype",
     "pk": "draft-stream-ise"
   },
+  {
+    "fields": {
+      "label": "fyi state"
+    },
+    "model": "doc.statetype",
+    "pk": "fyi"
+  },
   {
     "fields": {
       "label": "State"
@@ -2585,7 +2798,7 @@
   },
   {
     "fields": {
-      "label": "Liason Statement State"
+      "label": "Liaison Statement State"
     },
     "model": "doc.statetype",
     "pk": "liaison"
@@ -2597,6 +2810,13 @@
     "model": "doc.statetype",
     "pk": "minutes"
   },
+  {
+    "fields": {
+      "label": "State"
+    },
+    "model": "doc.statetype",
+    "pk": "narrativeminutes"
+  },
   {
     "fields": {
       "label": "State"
@@ -2632,6 +2852,13 @@
     "model": "doc.statetype",
     "pk": "review"
   },
+  {
+    "fields": {
+      "label": "State"
+    },
+    "model": "doc.statetype",
+    "pk": "rfc"
+  },
   {
     "fields": {
       "label": "Shepherd's Writeup State"
@@ -2653,11 +2880,27 @@
     "model": "doc.statetype",
     "pk": "statchg"
   },
+  {
+    "fields": {
+      "label": "Statement State"
+    },
+    "model": "doc.statetype",
+    "pk": "statement"
+  },
+  {
+    "fields": {
+      "label": "std state"
+    },
+    "model": "doc.statetype",
+    "pk": "std"
+  },
   {
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "special",
       "agenda_type": "ietf",
       "create_wiki": true,
@@ -2665,10 +2908,24 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"matman\",\n    \"ad\",\n    \"chair\",\n    \"lead\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"lead\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "matman",
+        "ad",
+        "chair",
+        "lead",
+        "delegate"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair",
+        "lead",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": true,
       "has_documents": false,
@@ -2678,15 +2935,29 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": true,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"lead\",\n    \"delegate\",\n    \"matman\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "lead",
+        "delegate",
+        "matman"
+      ],
       "need_parent": false,
       "parent_types": [
         "ietf"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"lead\",\n    \"delegate\",\n    \"matman\"\n]",
-      "session_purposes": "[\n    \"presentation\"\n]",
+      "role_order": [
+        "chair",
+        "lead",
+        "delegate",
+        "matman"
+      ],
+      "session_purposes": [
+        "presentation"
+      ],
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",
@@ -2696,35 +2967,55 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
-      "agenda_filter_type": "none",
+      "admin_roles": [
+        "chair"
+      ],
+      "agenda_filter_type": "heading",
       "agenda_type": "ietf",
       "create_wiki": false,
       "custom_group_roles": false,
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"member\",\n    \"chair\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\"\n]",
+      "default_used_roles": [
+        "member",
+        "chair"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
-      "has_meetings": false,
+      "has_meetings": true,
       "has_milestones": false,
       "has_nonsession_materials": false,
       "has_reviews": false,
       "has_session_materials": false,
-      "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\"\n]",
+      "is_schedulable": true,
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair"
+      ],
       "need_parent": false,
       "parent_types": [],
       "req_subm_approval": false,
-      "role_order": "[\n    \"chair\"\n]",
-      "session_purposes": "[\n    \"closed_meeting\",\n    \"officehours\"\n]",
-      "show_on_agenda": false
+      "role_order": [
+        "chair"
+      ],
+      "session_purposes": [
+        "closed_meeting",
+        "officehours"
+      ],
+      "show_on_agenda": true
     },
     "model": "group.groupfeatures",
     "pk": "adm"
@@ -2733,7 +3024,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": true,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "normal",
       "agenda_type": "ietf",
       "create_wiki": true,
@@ -2741,10 +3034,26 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"ad\",\n    \"chair\",\n    \"secr\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\",\n    \"Area Director\"\n]",
-      "groupman_roles": "[\n    \"ad\",\n    \"chair\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "ad",
+        "chair",
+        "secr",
+        "delegate"
+      ],
+      "docman_roles": [
+        "chair",
+        "delegate",
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat",
+        "Area Director"
+      ],
+      "groupman_roles": [
+        "ad",
+        "chair",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": true,
@@ -2754,16 +3063,28 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": true,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"ad\",\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "ad",
+        "chair",
+        "delegate",
+        "secr"
+      ],
       "need_parent": false,
       "parent_types": [
         "area",
         "ietf"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"regular\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "regular"
+      ],
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",
@@ -2773,7 +3094,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"ad\"\n]",
+      "admin_roles": [
+        "ad"
+      ],
       "agenda_filter_type": "heading",
       "agenda_type": "ietf",
       "create_wiki": true,
@@ -2781,10 +3104,22 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"ad\",\n    \"liaison_contact\",\n    \"liaison_cc_contact\"\n]",
-      "docman_roles": "[\n    \"ad\",\n    \"delegate\",\n    \"secr\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"ad\"\n]",
+      "default_used_roles": [
+        "ad",
+        "liaison_contact",
+        "liaison_cc_contact"
+      ],
+      "docman_roles": [
+        "ad",
+        "delegate",
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "ad"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -2794,15 +3129,27 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"ad\",\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "ad",
+        "chair",
+        "delegate",
+        "secr"
+      ],
       "need_parent": true,
       "parent_types": [
         "ietf"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"regular\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "regular"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -2812,7 +3159,10 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\",\n    \"secr\"\n]",
+      "admin_roles": [
+        "chair",
+        "secr"
+      ],
       "agenda_filter_type": "special",
       "agenda_type": "ad",
       "create_wiki": true,
@@ -2820,10 +3170,25 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"ad\",\n    \"chair\",\n    \"reviewer\",\n    \"secr\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"ad\",\n    \"secr\",\n    \"delegate\",\n    \"chair\"\n]",
+      "default_used_roles": [
+        "ad",
+        "chair",
+        "reviewer",
+        "secr",
+        "delegate"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "ad",
+        "secr",
+        "delegate",
+        "chair"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -2833,15 +3198,31 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"ad\",\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "ad",
+        "chair",
+        "delegate",
+        "secr"
+      ],
       "need_parent": true,
       "parent_types": [
         "area"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"open_meeting\",\n    \"presentation\",\n    \"regular\",\n    \"social\",\n    \"tutorial\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "open_meeting",
+        "presentation",
+        "regular",
+        "social",
+        "tutorial"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -2851,44 +3232,124 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
-      "agenda_filter_type": "none",
-      "agenda_type": "side",
+      "admin_roles": [
+        "chair"
+      ],
+      "agenda_filter_type": "normal",
+      "agenda_type": "ietf",
       "create_wiki": false,
-      "custom_group_roles": true,
+      "custom_group_roles": false,
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"auth\",\n    \"chair\"\n]",
-      "docman_roles": "[]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[]",
+      "default_used_roles": [
+        "chair",
+        "member"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair"
+      ],
       "has_chartering_process": false,
-      "has_default_chat": false,
+      "has_default_chat": true,
       "has_documents": false,
-      "has_meetings": false,
+      "has_meetings": true,
       "has_milestones": false,
       "has_nonsession_materials": false,
       "has_reviews": false,
-      "has_session_materials": false,
-      "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[]",
+      "has_session_materials": true,
+      "is_schedulable": true,
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair"
+      ],
       "need_parent": false,
       "parent_types": [],
+      "req_subm_approval": false,
+      "role_order": [
+        "chair",
+        "member"
+      ],
+      "session_purposes": [
+        "officehours",
+        "regular"
+      ],
+      "show_on_agenda": true
+    },
+    "model": "group.groupfeatures",
+    "pk": "edappr"
+  },
+  {
+    "fields": {
+      "about_page": "ietf.group.views.group_about",
+      "acts_like_wg": true,
+      "admin_roles": [
+        "chair"
+      ],
+      "agenda_filter_type": "normal",
+      "agenda_type": "ietf",
+      "create_wiki": false,
+      "custom_group_roles": false,
+      "customize_workflow": true,
+      "default_parent": "",
+      "default_tab": "ietf.group.views.group_documents",
+      "default_used_roles": [
+        "chair"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair"
+      ],
+      "has_chartering_process": false,
+      "has_default_chat": true,
+      "has_documents": true,
+      "has_meetings": true,
+      "has_milestones": false,
+      "has_nonsession_materials": false,
+      "has_reviews": false,
+      "has_session_materials": true,
+      "is_schedulable": true,
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair"
+      ],
+      "need_parent": false,
+      "parent_types": [
+        "rfcedtyp"
+      ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"officehours\"\n]",
-      "show_on_agenda": false
+      "role_order": [
+        "chair"
+      ],
+      "session_purposes": [
+        "regular"
+      ],
+      "show_on_agenda": true
     },
     "model": "group.groupfeatures",
-    "pk": "editorial"
+    "pk": "edwg"
   },
   {
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "normal",
       "agenda_type": "ietf",
       "create_wiki": false,
@@ -2896,10 +3357,16 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"chair\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[]",
+      "default_used_roles": [
+        "chair"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -2909,15 +3376,26 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "delegate"
+      ],
       "need_parent": false,
       "parent_types": [
         "ietf"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"closed_meeting\",\n    \"regular\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "closed_meeting",
+        "regular"
+      ],
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",
@@ -2927,7 +3405,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"lead\"\n]",
+      "admin_roles": [
+        "lead"
+      ],
       "agenda_filter_type": "none",
       "agenda_type": "ad",
       "create_wiki": false,
@@ -2935,10 +3415,27 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"member\",\n    \"chair\",\n    \"lead\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"lead\",\n    \"chair\",\n    \"secr\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\",\n    \"IAB\"\n]",
-      "groupman_roles": "[\n    \"lead\",\n    \"chair\",\n    \"secr\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "member",
+        "chair",
+        "lead",
+        "delegate"
+      ],
+      "docman_roles": [
+        "lead",
+        "chair",
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat",
+        "IAB"
+      ],
+      "groupman_roles": [
+        "lead",
+        "chair",
+        "secr",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": true,
@@ -2948,15 +3445,29 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"lead\",\n    \"chair\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "lead",
+        "chair",
+        "secr"
+      ],
       "need_parent": false,
       "parent_types": [
         "ietf"
       ],
       "req_subm_approval": false,
-      "role_order": "[\n    \"lead\",\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"closed_meeting\",\n    \"officehours\",\n    \"open_meeting\"\n]",
+      "role_order": [
+        "lead",
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "closed_meeting",
+        "officehours",
+        "open_meeting"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -2966,7 +3477,71 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
+      "agenda_filter_type": "none",
+      "agenda_type": "ietf",
+      "create_wiki": false,
+      "custom_group_roles": false,
+      "customize_workflow": false,
+      "default_parent": "iab",
+      "default_tab": "ietf.group.views.group_about",
+      "default_used_roles": [],
+      "docman_roles": [
+        "ad",
+        "chair",
+        "delegate",
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "ad",
+        "chair"
+      ],
+      "has_chartering_process": false,
+      "has_default_chat": true,
+      "has_documents": true,
+      "has_meetings": true,
+      "has_milestones": false,
+      "has_nonsession_materials": false,
+      "has_reviews": false,
+      "has_session_materials": true,
+      "is_schedulable": false,
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "ad",
+        "chair",
+        "delegate",
+        "secr"
+      ],
+      "need_parent": true,
+      "parent_types": [
+        "ietf"
+      ],
+      "req_subm_approval": false,
+      "role_order": [
+        "chair",
+        "secr",
+        "member"
+      ],
+      "session_purposes": "[\"regular\"]",
+      "show_on_agenda": false
+    },
+    "model": "group.groupfeatures",
+    "pk": "iabworkshop"
+  },
+  {
+    "fields": {
+      "about_page": "ietf.group.views.group_about",
+      "acts_like_wg": false,
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "none",
       "agenda_type": "ietf",
       "create_wiki": false,
@@ -2974,10 +3549,18 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"auth\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\"\n]",
+      "default_used_roles": [
+        "auth"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -2987,13 +3570,21 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair"
+      ],
       "need_parent": false,
       "parent_types": [],
       "req_subm_approval": false,
-      "role_order": "[\n    \"chair\"\n]",
-      "session_purposes": "[\n    \"officehours\"\n]",
+      "role_order": [
+        "chair"
+      ],
+      "session_purposes": [
+        "officehours"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3003,7 +3594,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "none",
       "agenda_type": "ad",
       "create_wiki": false,
@@ -3011,10 +3604,19 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "delegate"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3024,13 +3626,24 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "\"[]\"",
-      "matman_roles": "[\n    \"chair\",\n    \"delegate\",\n    \"member\"\n]",
+      "material_types": "[]",
+      "matman_roles": [
+        "chair",
+        "delegate",
+        "member"
+      ],
       "need_parent": false,
       "parent_types": [],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"delegate\",\n    \"member\"\n]",
-      "session_purposes": "[\n    \"closed_meeting\",\n    \"open_meeting\"\n]",
+      "role_order": [
+        "chair",
+        "delegate",
+        "member"
+      ],
+      "session_purposes": [
+        "closed_meeting",
+        "open_meeting"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3040,7 +3653,10 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\",\n    \"lead\"\n]",
+      "admin_roles": [
+        "chair",
+        "lead"
+      ],
       "agenda_filter_type": "heading",
       "agenda_type": "ietf",
       "create_wiki": false,
@@ -3048,10 +3664,26 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"ad\",\n    \"member\",\n    \"comdir\",\n    \"delegate\",\n    \"execdir\",\n    \"recman\",\n    \"secr\",\n    \"trac-editor\",\n    \"trac-admin\",\n    \"chair\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "ad",
+        "member",
+        "comdir",
+        "delegate",
+        "execdir",
+        "recman",
+        "secr",
+        "chair"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3061,15 +3693,29 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "delegate"
+      ],
       "need_parent": false,
       "parent_types": [
         "ietf"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"admin\",\n    \"plenary\",\n    \"presentation\",\n    \"social\",\n    \"officehours\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "admin",
+        "plenary",
+        "presentation",
+        "social",
+        "officehours"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3079,18 +3725,26 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "none",
-      "agenda_type": null,
+      "agenda_type": "ad",
       "create_wiki": false,
       "custom_group_roles": true,
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"ad\"\n]",
-      "docman_roles": "[\n    \"auth\"\n]",
-      "groupman_authroles": "[]",
-      "groupman_roles": "[]",
+      "default_used_roles": [
+        "ad"
+      ],
+      "docman_roles": [
+        "auth"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3100,15 +3754,20 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [],
       "need_parent": true,
       "parent_types": [
         "area"
       ],
       "req_subm_approval": false,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3118,7 +3777,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "heading",
       "agenda_type": "ietf",
       "create_wiki": false,
@@ -3126,10 +3787,20 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"member\",\n    \"atlarge\",\n    \"chair\",\n    \"delegate\"\n]",
-      "docman_roles": "[]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "member",
+        "atlarge",
+        "chair",
+        "delegate"
+      ],
+      "docman_roles": [],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3139,15 +3810,24 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "delegate",
+        "secr"
+      ],
       "need_parent": false,
       "parent_types": [
         "irtf"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3157,35 +3837,59 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\",\n    \"lead\"\n]",
-      "agenda_filter_type": "none",
-      "agenda_type": "ad",
+      "admin_roles": [
+        "chair",
+        "lead"
+      ],
+      "agenda_filter_type": "heading",
+      "agenda_type": "ietf",
       "create_wiki": false,
       "custom_group_roles": true,
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "chair",
+        "delegate"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": true,
-      "has_meetings": false,
+      "has_meetings": true,
       "has_milestones": false,
       "has_nonsession_materials": false,
       "has_reviews": false,
       "has_session_materials": false,
-      "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "is_schedulable": true,
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "delegate"
+      ],
       "need_parent": false,
       "parent_types": [],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"delegate\"\n]",
-      "session_purposes": "[\n    \"officehours\"\n]",
-      "show_on_agenda": false
+      "role_order": [
+        "chair",
+        "delegate"
+      ],
+      "session_purposes": [
+        "officehours",
+        "regular"
+      ],
+      "show_on_agenda": true
     },
     "model": "group.groupfeatures",
     "pk": "ise"
@@ -3194,7 +3898,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "none",
       "agenda_type": null,
       "create_wiki": false,
@@ -3202,10 +3908,17 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"chair\",\n    \"ceo\"\n]",
-      "docman_roles": "[]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\"\n]",
+      "default_used_roles": [
+        "chair",
+        "ceo"
+      ],
+      "docman_roles": [],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3215,15 +3928,27 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "secr"
+      ],
       "need_parent": false,
       "parent_types": [
         "isoc"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"officehours\",\n    \"open_meeting\",\n    \"presentation\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "officehours",
+        "open_meeting",
+        "presentation"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3233,7 +3958,10 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\",\n    \"advisor\"\n]",
+      "admin_roles": [
+        "chair",
+        "advisor"
+      ],
       "agenda_filter_type": "none",
       "agenda_type": "side",
       "create_wiki": true,
@@ -3241,10 +3969,23 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"member\",\n    \"advisor\",\n    \"liaison\",\n    \"chair\",\n    \"techadv\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"advisor\"\n]",
+      "default_used_roles": [
+        "member",
+        "advisor",
+        "liaison",
+        "chair",
+        "techadv"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair",
+        "advisor"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3254,15 +3995,26 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair"
+      ],
       "need_parent": false,
       "parent_types": [
         "area"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"member\",\n    \"advisor\"\n]",
-      "session_purposes": "[\n    \"closed_meeting\",\n    \"officehours\"\n]",
+      "role_order": [
+        "chair",
+        "member",
+        "advisor"
+      ],
+      "session_purposes": [
+        "closed_meeting",
+        "officehours"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3272,7 +4024,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"lead\"\n]",
+      "admin_roles": [
+        "lead"
+      ],
       "agenda_filter_type": "normal",
       "agenda_type": "ad",
       "create_wiki": false,
@@ -3280,10 +4034,27 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"member\",\n    \"chair\",\n    \"lead\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"lead\",\n    \"chair\",\n    \"secr\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\",\n    \"IAB\"\n]",
-      "groupman_roles": "[\n    \"lead\",\n    \"chair\",\n    \"secr\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "member",
+        "chair",
+        "lead",
+        "delegate"
+      ],
+      "docman_roles": [
+        "lead",
+        "chair",
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat",
+        "IAB"
+      ],
+      "groupman_roles": [
+        "lead",
+        "chair",
+        "secr",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": true,
@@ -3293,15 +4064,28 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"lead\",\n    \"chair\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "lead",
+        "chair",
+        "secr"
+      ],
       "need_parent": false,
       "parent_types": [
         "ietf"
       ],
       "req_subm_approval": false,
-      "role_order": "[\n    \"lead\",\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"regular\",\n    \"tutorial\"\n]",
+      "role_order": [
+        "lead",
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "regular",
+        "tutorial"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3311,7 +4095,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": true,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "normal",
       "agenda_type": "ietf",
       "create_wiki": true,
@@ -3319,10 +4105,24 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"chair\",\n    \"secr\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\",\n    \"IRTF Chair\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "chair",
+        "secr",
+        "delegate"
+      ],
+      "docman_roles": [
+        "chair",
+        "delegate",
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat",
+        "IRTF Chair"
+      ],
+      "groupman_roles": [
+        "chair",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": true,
@@ -3332,15 +4132,26 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": true,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "delegate",
+        "secr"
+      ],
       "need_parent": false,
       "parent_types": [
         "irtf"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"regular\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "regular"
+      ],
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",
@@ -3350,7 +4161,10 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\",\n    \"secr\"\n]",
+      "admin_roles": [
+        "chair",
+        "secr"
+      ],
       "agenda_filter_type": "normal",
       "agenda_type": "ietf",
       "create_wiki": true,
@@ -3358,10 +4172,24 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.review_requests",
-      "default_used_roles": "[\n    \"ad\",\n    \"chair\",\n    \"reviewer\",\n    \"secr\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"secr\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"ad\",\n    \"secr\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "ad",
+        "chair",
+        "reviewer",
+        "secr",
+        "delegate"
+      ],
+      "docman_roles": [
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "ad",
+        "secr",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3371,15 +4199,26 @@
       "has_reviews": true,
       "has_session_materials": true,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"ad\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "ad",
+        "secr"
+      ],
       "need_parent": true,
       "parent_types": [
         "area"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"open_meeting\",\n    \"social\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "open_meeting",
+        "social"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3389,7 +4228,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "normal",
       "agenda_type": "ietf",
       "create_wiki": false,
@@ -3397,10 +4238,19 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"auth\",\n    \"chair\"\n]",
-      "docman_roles": "[]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[\n    \"chair\"\n]",
+      "default_used_roles": [
+        "auth",
+        "chair"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [
+        "chair"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3410,13 +4260,23 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair"
+      ],
       "need_parent": false,
       "parent_types": [],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"officehours\",\n    \"regular\"\n]",
+      "role_order": [
+        "chair",
+        "secr"
+      ],
+      "session_purposes": [
+        "officehours",
+        "regular"
+      ],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3426,7 +4286,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": true,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "normal",
       "agenda_type": "ietf",
       "create_wiki": true,
@@ -3434,10 +4296,25 @@
       "customize_workflow": true,
       "default_parent": "irtf",
       "default_tab": "ietf.group.views.group_documents",
-      "default_used_roles": "[\n    \"chair\",\n    \"techadv\",\n    \"secr\",\n    \"delegate\"\n]",
-      "docman_roles": "[\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\",\n    \"IRTF Chair\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "chair",
+        "techadv",
+        "secr",
+        "delegate"
+      ],
+      "docman_roles": [
+        "chair",
+        "delegate",
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat",
+        "IRTF Chair"
+      ],
+      "groupman_roles": [
+        "chair",
+        "delegate"
+      ],
       "has_chartering_process": true,
       "has_default_chat": true,
       "has_documents": true,
@@ -3447,15 +4324,27 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": true,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "delegate",
+        "secr"
+      ],
       "need_parent": true,
       "parent_types": [
         "irtf"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
-      "session_purposes": "[\n    \"regular\"\n]",
+      "role_order": [
+        "chair",
+        "delegate",
+        "secr"
+      ],
+      "session_purposes": [
+        "regular"
+      ],
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",
@@ -3465,7 +4354,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "none",
       "agenda_type": null,
       "create_wiki": false,
@@ -3473,10 +4364,23 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"liaiman\",\n    \"ceo\",\n    \"coord\",\n    \"auth\",\n    \"chair\",\n    \"liaison_contact\",\n    \"liaison_cc_contact\"\n]",
-      "docman_roles": "[\n    \"liaiman\",\n    \"matman\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\"\n]",
-      "groupman_roles": "[]",
+      "default_used_roles": [
+        "liaiman",
+        "ceo",
+        "coord",
+        "auth",
+        "chair",
+        "liaison_contact",
+        "liaison_cc_contact"
+      ],
+      "docman_roles": [
+        "liaiman",
+        "matman"
+      ],
+      "groupman_authroles": [
+        "Secretariat"
+      ],
+      "groupman_roles": [],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3486,16 +4390,20 @@
       "has_reviews": false,
       "has_session_materials": false,
       "is_schedulable": false,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [],
       "need_parent": false,
       "parent_types": [
         "area",
         "sdo"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"liaiman\"\n]",
-      "session_purposes": "[]",
+      "role_order": [
+        "liaiman"
+      ],
+      "session_purposes": [],
       "show_on_agenda": false
     },
     "model": "group.groupfeatures",
@@ -3505,7 +4413,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": false,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "special",
       "agenda_type": "ietf",
       "create_wiki": true,
@@ -3513,10 +4423,28 @@
       "customize_workflow": false,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_about",
-      "default_used_roles": "[\n    \"ad\",\n    \"member\",\n    \"delegate\",\n    \"secr\",\n    \"liaison\",\n    \"atlarge\",\n    \"chair\",\n    \"matman\",\n    \"techadv\"\n]",
-      "docman_roles": "[\n    \"chair\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\",\n    \"Area Director\"\n]",
-      "groupman_roles": "[\n    \"chair\",\n    \"delegate\"\n]",
+      "default_used_roles": [
+        "ad",
+        "member",
+        "delegate",
+        "secr",
+        "liaison",
+        "atlarge",
+        "chair",
+        "matman",
+        "techadv"
+      ],
+      "docman_roles": [
+        "chair"
+      ],
+      "groupman_authroles": [
+        "Secretariat",
+        "Area Director"
+      ],
+      "groupman_roles": [
+        "chair",
+        "delegate"
+      ],
       "has_chartering_process": false,
       "has_default_chat": false,
       "has_documents": false,
@@ -3526,15 +4454,30 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": true,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"chair\",\n    \"matman\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "chair",
+        "matman"
+      ],
       "need_parent": false,
       "parent_types": [
         "area"
       ],
       "req_subm_approval": false,
-      "role_order": "[\n    \"chair\",\n    \"member\",\n    \"matman\"\n]",
-      "session_purposes": "[\n    \"coding\",\n    \"presentation\",\n    \"social\",\n    \"tutorial\"\n]",
+      "role_order": [
+        "chair",
+        "member",
+        "matman"
+      ],
+      "session_purposes": [
+        "coding",
+        "open_meeting",
+        "presentation",
+        "social",
+        "tutorial"
+      ],
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",
@@ -3544,7 +4487,9 @@
     "fields": {
       "about_page": "ietf.group.views.group_about",
       "acts_like_wg": true,
-      "admin_roles": "[\n    \"chair\"\n]",
+      "admin_roles": [
+        "chair"
+      ],
       "agenda_filter_type": "normal",
       "agenda_type": "ietf",
       "create_wiki": true,
@@ -3552,10 +4497,32 @@
       "customize_workflow": true,
       "default_parent": "",
       "default_tab": "ietf.group.views.group_documents",
-      "default_used_roles": "[\n    \"ad\",\n    \"editor\",\n    \"delegate\",\n    \"secr\",\n    \"chair\",\n    \"matman\",\n    \"techadv\",\n    \"liaison_contact\",\n    \"liaison_cc_contact\"\n]",
-      "docman_roles": "[\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
-      "groupman_authroles": "[\n    \"Secretariat\",\n    \"Area Director\"\n]",
-      "groupman_roles": "[\n    \"ad\",\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
+      "default_used_roles": [
+        "ad",
+        "editor",
+        "delegate",
+        "secr",
+        "chair",
+        "matman",
+        "techadv",
+        "liaison_contact",
+        "liaison_cc_contact"
+      ],
+      "docman_roles": [
+        "chair",
+        "delegate",
+        "secr"
+      ],
+      "groupman_authroles": [
+        "Secretariat",
+        "Area Director"
+      ],
+      "groupman_roles": [
+        "ad",
+        "chair",
+        "delegate",
+        "secr"
+      ],
       "has_chartering_process": true,
       "has_default_chat": true,
       "has_documents": true,
@@ -3565,15 +4532,28 @@
       "has_reviews": false,
       "has_session_materials": true,
       "is_schedulable": true,
-      "material_types": "[\n    \"slides\"\n]",
-      "matman_roles": "[\n    \"ad\",\n    \"chair\",\n    \"delegate\",\n    \"secr\"\n]",
+      "material_types": [
+        "slides"
+      ],
+      "matman_roles": [
+        "ad",
+        "chair",
+        "delegate",
+        "secr"
+      ],
       "need_parent": false,
       "parent_types": [
         "area"
       ],
       "req_subm_approval": true,
-      "role_order": "[\n    \"chair\",\n    \"secr\",\n    \"delegate\"\n]",
-      "session_purposes": "[\n    \"regular\"\n]",
+      "role_order": [
+        "chair",
+        "secr",
+        "delegate"
+      ],
+      "session_purposes": [
+        "regular"
+      ],
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",
@@ -3611,7 +4591,7 @@
       ],
       "desc": "Recipients when a charter is approved",
       "to": [
-        "ietf_announce"
+        "group_stream_announce"
       ]
     },
     "model": "mailtrigger.mailtrigger",
@@ -3844,7 +4824,7 @@
   {
     "fields": {
       "cc": [],
-      "desc": "Recipients for message to adminstrators when a charter state edit needs followon administrative action",
+      "desc": "Recipients for message to administrators when a charter state edit needs follow-on administrative action",
       "to": [
         "iesg_secretary"
       ]
@@ -3972,8 +4952,8 @@
         "doc_ad",
         "doc_group_chairs",
         "doc_group_delegates",
-        "doc_shepherd",
-        "doc_stream_manager"
+        "doc_non_ietf_stream_manager",
+        "doc_shepherd"
       ]
     },
     "model": "mailtrigger.mailtrigger",
@@ -4150,6 +5130,34 @@
     "model": "mailtrigger.mailtrigger",
     "pk": "doc_telechat_details_changed"
   },
+  {
+    "fields": {
+      "cc": [],
+      "desc": "Recipients when a working group call for adoption is issued",
+      "to": [
+        "doc_authors",
+        "doc_group_chairs",
+        "doc_group_mail_list",
+        "doc_shepherd"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "doc_wg_call_for_adoption_issued"
+  },
+  {
+    "fields": {
+      "cc": [],
+      "desc": "Recipients when a working group last call is issued",
+      "to": [
+        "doc_authors",
+        "doc_group_chairs",
+        "doc_group_mail_list",
+        "doc_shepherd"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "doc_wg_last_call_issued"
+  },
   {
     "fields": {
       "cc": [],
@@ -4526,13 +5534,30 @@
         "liaison_response_contacts",
         "liaison_technical_contacts"
       ],
-      "desc": "Recipient for a message when a new liaison statement is posted",
+      "desc": "Recipients for a message when a new incoming liaison statement is posted",
       "to": [
         "liaison_to_contacts"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "liaison_statement_posted"
+    "pk": "liaison_statement_posted_incoming"
+  },
+  {
+    "fields": {
+      "cc": [
+        "liaison_cc",
+        "liaison_coordinators",
+        "liaison_from_contact",
+        "liaison_response_contacts",
+        "liaison_technical_contacts"
+      ],
+      "desc": "Recipients for a message when a new outgoing liaison statement is posted",
+      "to": [
+        "liaison_to_contacts"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "liaison_statement_posted_outgoing"
   },
   {
     "fields": {
@@ -4701,36 +5726,124 @@
       "cc": [],
       "desc": "Recipients for a change to a review assignment",
       "to": [
-        "review_assignment_reviewer",
-        "review_assignment_review_req_by",
-        "review_secretaries"
+        "review_assignment_reviewer",
+        "review_assignment_review_req_by",
+        "review_secretaries"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "review_assignment_changed"
+  },
+  {
+    "fields": {
+      "cc": [],
+      "desc": "Recipients when an review team secretary send a summary of open review assignments",
+      "to": [
+        "group_mail_list"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "review_assignments_summarized"
+  },
+  {
+    "fields": {
+      "cc": [],
+      "desc": "Recipients for a change to a reviewer's availability",
+      "to": [
+        "group_secretaries",
+        "review_reviewer"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "review_availability_changed"
+  },
+  {
+    "fields": {
+      "cc": [
+        "ietf_last_call",
+        "review_doc_all_parties",
+        "review_doc_group_mail_list"
+      ],
+      "desc": "Default template for recipients when an review is completed - customised mail triggers are used/created per team and review type.",
+      "to": [
+        "review_team_mail_list"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "review_completed"
+  },
+  {
+    "fields": {
+      "cc": [
+        "review_doc_all_parties",
+        "review_doc_group_mail_list"
+      ],
+      "desc": "Recipients when a artart ReviewTypeName object review is completed",
+      "to": [
+        "review_team_mail_list"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "review_completed_artart_early"
+  },
+  {
+    "fields": {
+      "cc": [
+        "ietf_last_call",
+        "review_doc_all_parties",
+        "review_doc_group_mail_list"
+      ],
+      "desc": "Recipients when a artart ReviewTypeName object review is completed",
+      "to": [
+        "review_team_mail_list"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "review_completed_artart_lc"
+  },
+  {
+    "fields": {
+      "cc": [
+        "ietf_last_call",
+        "review_doc_all_parties",
+        "review_doc_group_mail_list"
+      ],
+      "desc": "Recipients when a artart ReviewTypeName object review is completed",
+      "to": [
+        "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_assignment_changed"
+    "pk": "review_completed_artart_telechat"
   },
   {
     "fields": {
-      "cc": [],
-      "desc": "Recipients when an review team secretary send a summary of open review assignments",
+      "cc": [
+        "review_doc_all_parties",
+        "review_doc_group_mail_list"
+      ],
+      "desc": "Recipients when a dnsdir Early review is completed",
       "to": [
-        "group_mail_list"
+        "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_assignments_summarized"
+    "pk": "review_completed_dnsdir_early"
   },
   {
     "fields": {
-      "cc": [],
-      "desc": "Recipients for a change to a reviewer's availability",
+      "cc": [
+        "ietf_last_call",
+        "review_doc_all_parties",
+        "review_doc_group_mail_list"
+      ],
+      "desc": "Recipients when a dnsdir Last Call review is completed",
       "to": [
-        "group_secretaries",
-        "review_reviewer"
+        "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_availability_changed"
+    "pk": "review_completed_dnsdir_lc"
   },
   {
     "fields": {
@@ -4739,13 +5852,13 @@
         "review_doc_all_parties",
         "review_doc_group_mail_list"
       ],
-      "desc": "Default template for recipients when an review is completed - customised mail triggers are used/created per team and review type.",
+      "desc": "Recipients when a dnsdir Telechat review is completed",
       "to": [
         "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_completed"
+    "pk": "review_completed_dnsdir_telechat"
   },
   {
     "fields": {
@@ -4753,13 +5866,13 @@
         "review_doc_all_parties",
         "review_doc_group_mail_list"
       ],
-      "desc": "Recipients when a artart ReviewTypeName object review is completed",
+      "desc": "Recipients when a genart ReviewTypeName object review is completed",
       "to": [
         "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_completed_artart_early"
+    "pk": "review_completed_genart_early"
   },
   {
     "fields": {
@@ -4768,13 +5881,13 @@
         "review_doc_all_parties",
         "review_doc_group_mail_list"
       ],
-      "desc": "Recipients when a artart ReviewTypeName object review is completed",
+      "desc": "Recipients when a genart ReviewTypeName object review is completed",
       "to": [
         "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_completed_artart_lc"
+    "pk": "review_completed_genart_lc"
   },
   {
     "fields": {
@@ -4783,13 +5896,13 @@
         "review_doc_all_parties",
         "review_doc_group_mail_list"
       ],
-      "desc": "Recipients when a artart ReviewTypeName object review is completed",
+      "desc": "Recipients when a genart ReviewTypeName object review is completed",
       "to": [
         "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_completed_artart_telechat"
+    "pk": "review_completed_genart_telechat"
   },
   {
     "fields": {
@@ -4797,13 +5910,13 @@
         "review_doc_all_parties",
         "review_doc_group_mail_list"
       ],
-      "desc": "Recipients when a genart ReviewTypeName object review is completed",
+      "desc": "Recipients when a httpdir Early review is completed",
       "to": [
         "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_completed_genart_early"
+    "pk": "review_completed_httpdir_early"
   },
   {
     "fields": {
@@ -4812,13 +5925,13 @@
         "review_doc_all_parties",
         "review_doc_group_mail_list"
       ],
-      "desc": "Recipients when a genart ReviewTypeName object review is completed",
+      "desc": "Recipients when a httpdir Last Call review is completed",
       "to": [
         "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_completed_genart_lc"
+    "pk": "review_completed_httpdir_lc"
   },
   {
     "fields": {
@@ -4827,13 +5940,13 @@
         "review_doc_all_parties",
         "review_doc_group_mail_list"
       ],
-      "desc": "Recipients when a genart ReviewTypeName object review is completed",
+      "desc": "Recipients when a httpdir Telechat review is completed",
       "to": [
         "review_team_mail_list"
       ]
     },
     "model": "mailtrigger.mailtrigger",
-    "pk": "review_completed_genart_telechat"
+    "pk": "review_completed_httpdir_telechat"
   },
   {
     "fields": {
@@ -5011,6 +6124,36 @@
     "model": "mailtrigger.mailtrigger",
     "pk": "review_completed_opsdir_telechat"
   },
+  {
+    "fields": {
+      "cc": [
+        "ietf_last_call",
+        "review_doc_all_parties",
+        "review_doc_group_mail_list"
+      ],
+      "desc": "Recipients when a perfmetrdir IETF Last Call review is completed",
+      "to": [
+        "review_team_mail_list"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "review_completed_perfmetrdir_lc"
+  },
+  {
+    "fields": {
+      "cc": [
+        "ietf_last_call",
+        "review_doc_all_parties",
+        "review_doc_group_mail_list"
+      ],
+      "desc": "Recipients when a perfmetrdir Telechat review is completed",
+      "to": [
+        "review_team_mail_list"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "review_completed_perfmetrdir_telechat"
+  },
   {
     "fields": {
       "cc": [
@@ -5224,6 +6367,46 @@
     "model": "mailtrigger.mailtrigger",
     "pk": "review_req_changed"
   },
+  {
+    "fields": {
+      "cc": [
+        "doc_affecteddoc_authors",
+        "doc_affecteddoc_group_chairs",
+        "doc_affecteddoc_notify",
+        "doc_authors",
+        "doc_group_chairs",
+        "doc_group_mail_list",
+        "doc_notify",
+        "doc_shepherd"
+      ],
+      "desc": "Recipients when a new RSAB ballot is issued",
+      "to": [
+        "rsab"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "rsab_ballot_issued"
+  },
+  {
+    "fields": {
+      "cc": [
+        "doc_affecteddoc_authors",
+        "doc_affecteddoc_group_chairs",
+        "doc_affecteddoc_notify",
+        "doc_authors",
+        "doc_group_chairs",
+        "doc_group_mail_list",
+        "doc_notify",
+        "doc_shepherd"
+      ],
+      "desc": "Recipients when a new RSAB ballot position with comments is saved",
+      "to": [
+        "rsab"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "rsab_ballot_saved"
+  },
   {
     "fields": {
       "cc": [
@@ -5318,7 +6501,22 @@
   },
   {
     "fields": {
-      "cc": [],
+      "cc": [
+        "group_chairs"
+      ],
+      "desc": "Recipients when slides are approved for a given session",
+      "to": [
+        "slides_proposer"
+      ]
+    },
+    "model": "mailtrigger.mailtrigger",
+    "pk": "slides_approved"
+  },
+  {
+    "fields": {
+      "cc": [
+        "slides_proposer"
+      ],
       "desc": "Recipients when slides are proposed for a given session",
       "to": [
         "group_chairs",
@@ -5560,7 +6758,7 @@
   {
     "fields": {
       "desc": "The document's authors",
-      "template": "{% if doc.type_id == \"draft\" %}<{{doc.name}}@ietf.org>{% endif %}"
+      "template": "{% if doc.type_id == \"draft\" or doc.type_id == \"rfc\" %}<{{doc.name}}@ietf.org>{% endif %}"
     },
     "model": "mailtrigger.recipient",
     "pk": "doc_authors"
@@ -5815,7 +7013,7 @@
   },
   {
     "fields": {
-      "desc": "The internet drafts ticketing system",
+      "desc": "The Internet-Draft ticketing system",
       "template": "<internet-drafts@ietf.org>"
     },
     "model": "mailtrigger.recipient",
@@ -5879,7 +7077,7 @@
   },
   {
     "fields": {
-      "desc": "The set of people who can approve this liasion statemetns",
+      "desc": "The set of people who can approve this liaison statement",
       "template": "{{liaison.approver_emails|join:\", \"}}"
     },
     "model": "mailtrigger.recipient",
@@ -5901,6 +7099,14 @@
     "model": "mailtrigger.recipient",
     "pk": "liaison_coordinators"
   },
+  {
+    "fields": {
+      "desc": "Email address of the formal sender of the statement",
+      "template": "{{liaison.from_contact}}"
+    },
+    "model": "mailtrigger.recipient",
+    "pk": "liaison_from_contact"
+  },
   {
     "fields": {
       "desc": "The assigned liaison manager for an external group ",
@@ -6085,6 +7291,14 @@
     "model": "mailtrigger.recipient",
     "pk": "rfc_editor_if_doc_in_queue"
   },
+  {
+    "fields": {
+      "desc": "The RFC Series Approval Board",
+      "template": "The RSAB <rsab@rfc-editor.org>"
+    },
+    "model": "mailtrigger.recipient",
+    "pk": "rsab"
+  },
   {
     "fields": {
       "desc": "The person that requested a meeting slot for a given group",
@@ -6101,6 +7315,14 @@
     "model": "mailtrigger.recipient",
     "pk": "session_requests"
   },
+  {
+    "fields": {
+      "desc": "Person who proposed slides",
+      "template": "{{ proposer.email }}"
+    },
+    "model": "mailtrigger.recipient",
+    "pk": "slides_proposer"
+  },
   {
     "fields": {
       "desc": "The managers of any related streams",
@@ -6325,6 +7547,116 @@
     "model": "name.agendatypename",
     "pk": "workshop"
   },
+  {
+    "fields": {
+      "desc": "The content of an appeal",
+      "name": "Appeal",
+      "order": 1,
+      "used": true
+    },
+    "model": "name.appealartifacttypename",
+    "pk": "appeal"
+  },
+  {
+    "fields": {
+      "desc": "The content of an appeal combined with the content of a response",
+      "name": "Response (with appeal included)",
+      "order": 2,
+      "used": true
+    },
+    "model": "name.appealartifacttypename",
+    "pk": "appeal_with_response"
+  },
+  {
+    "fields": {
+      "desc": "Other content related to an appeal",
+      "name": "Other content",
+      "order": 5,
+      "used": true
+    },
+    "model": "name.appealartifacttypename",
+    "pk": "other_content"
+  },
+  {
+    "fields": {
+      "desc": "The content of a reply to an appeal response",
+      "name": "Reply to response",
+      "order": 4,
+      "used": true
+    },
+    "model": "name.appealartifacttypename",
+    "pk": "reply_to_response"
+  },
+  {
+    "fields": {
+      "desc": "The content of a response to an appeal",
+      "name": "Response",
+      "order": 3,
+      "used": true
+    },
+    "model": "name.appealartifacttypename",
+    "pk": "response"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "ANRW Onsite",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.attendancetypename",
+    "pk": "anrw_onsite"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Hackathon Onsite",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.attendancetypename",
+    "pk": "hackathon_onsite"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Hackathon Remote",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.attendancetypename",
+    "pk": "hackathon_remote"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Onsite",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.attendancetypename",
+    "pk": "onsite"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Remote",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.attendancetypename",
+    "pk": "remote"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Unknown",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.attendancetypename",
+    "pk": "unknown"
+  },
   {
     "fields": {
       "blocking": false,
@@ -6347,6 +7679,17 @@
     "model": "name.ballotpositionname",
     "pk": "block"
   },
+  {
+    "fields": {
+      "blocking": true,
+      "desc": "",
+      "name": "Concern",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.ballotpositionname",
+    "pk": "concern"
+  },
   {
     "fields": {
       "blocking": true,
@@ -9632,6 +10975,17 @@
     "model": "name.dbtemplatetypename",
     "pk": "rst"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "became RFC",
+      "order": 0,
+      "revname": "came from draft",
+      "used": true
+    },
+    "model": "name.docrelationshipname",
+    "pk": "became_rfc"
+  },
   {
     "fields": {
       "desc": "",
@@ -9643,6 +10997,17 @@
     "model": "name.docrelationshipname",
     "pk": "conflrev"
   },
+  {
+    "fields": {
+      "desc": "This document contains other documents (e.g., STDs contain RFCs)",
+      "name": "Contains",
+      "order": 0,
+      "revname": "Is part of",
+      "used": true
+    },
+    "model": "name.docrelationshipname",
+    "pk": "contains"
+  },
   {
     "fields": {
       "desc": "Approval for downref",
@@ -10159,6 +11524,17 @@
     "model": "name.doctypename",
     "pk": "agenda"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Best Current Practice",
+      "order": 0,
+      "prefix": "bcp",
+      "used": true
+    },
+    "model": "name.doctypename",
+    "pk": "bcp"
+  },
   {
     "fields": {
       "desc": "",
@@ -10217,13 +11593,24 @@
   {
     "fields": {
       "desc": "",
-      "name": "Draft",
+      "name": "Draft",
+      "order": 0,
+      "prefix": "draft",
+      "used": true
+    },
+    "model": "name.doctypename",
+    "pk": "draft"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "For Your Information",
       "order": 0,
-      "prefix": "draft",
+      "prefix": "fyi",
       "used": true
     },
     "model": "name.doctypename",
-    "pk": "draft"
+    "pk": "fyi"
   },
   {
     "fields": {
@@ -10258,6 +11645,17 @@
     "model": "name.doctypename",
     "pk": "minutes"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Narrative Minutes",
+      "order": 0,
+      "prefix": "narrative-minutes",
+      "used": true
+    },
+    "model": "name.doctypename",
+    "pk": "narrativeminutes"
+  },
   {
     "fields": {
       "desc": "",
@@ -10302,6 +11700,17 @@
     "model": "name.doctypename",
     "pk": "review"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "RFC",
+      "order": 0,
+      "prefix": "rfc",
+      "used": true
+    },
+    "model": "name.doctypename",
+    "pk": "rfc"
+  },
   {
     "fields": {
       "desc": "",
@@ -10335,6 +11744,28 @@
     "model": "name.doctypename",
     "pk": "statchg"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Statement",
+      "order": 0,
+      "prefix": "statement",
+      "used": true
+    },
+    "model": "name.doctypename",
+    "pk": "statement"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Standard",
+      "order": 0,
+      "prefix": "std",
+      "used": true
+    },
+    "model": "name.doctypename",
+    "pk": "std"
+  },
   {
     "fields": {
       "desc": "",
@@ -10669,6 +12100,17 @@
     "model": "name.extresourcename",
     "pk": "mailing_list_archive"
   },
+  {
+    "fields": {
+      "desc": "ORCID",
+      "name": "ORCID",
+      "order": 0,
+      "type": "url",
+      "used": true
+    },
+    "model": "name.extresourcename",
+    "pk": "orcid"
+  },
   {
     "fields": {
       "desc": "Related Implementations",
@@ -10704,8 +12146,8 @@
   },
   {
     "fields": {
-      "desc": "Issuer Tracker",
-      "name": "Issuer Tracker",
+      "desc": "Issue Tracker",
+      "name": "Issue Tracker",
       "order": 0,
       "type": "url",
       "used": true
@@ -10801,8 +12243,9 @@
   {
     "fields": {
       "desc": "",
+      "legend": "C",
       "name": "Comment",
-      "order": 0,
+      "order": 1,
       "used": true
     },
     "model": "name.feedbacktypename",
@@ -10811,8 +12254,9 @@
   {
     "fields": {
       "desc": "",
+      "legend": "J",
       "name": "Junk",
-      "order": 0,
+      "order": 5,
       "used": true
     },
     "model": "name.feedbacktypename",
@@ -10821,8 +12265,9 @@
   {
     "fields": {
       "desc": "",
+      "legend": "N",
       "name": "Nomination",
-      "order": 0,
+      "order": 2,
       "used": true
     },
     "model": "name.feedbacktypename",
@@ -10831,8 +12276,20 @@
   {
     "fields": {
       "desc": "",
+      "legend": "O",
+      "name": "Overcome by events",
+      "order": 4,
+      "used": true
+    },
+    "model": "name.feedbacktypename",
+    "pk": "obe"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "legend": "Q",
       "name": "Questionnaire response",
-      "order": 0,
+      "order": 3,
       "used": true
     },
     "model": "name.feedbacktypename",
@@ -10841,8 +12298,9 @@
   {
     "fields": {
       "desc": "",
+      "legend": "R",
       "name": "Read",
-      "order": 0,
+      "order": 6,
       "used": true
     },
     "model": "name.feedbacktypename",
@@ -11095,14 +12553,25 @@
   },
   {
     "fields": {
-      "desc": "Editorial Stream Group",
-      "name": "Editorial",
+      "desc": "Editorial Stream Approval Group",
+      "name": "Editorial Stream Approval Group",
       "order": 0,
       "used": true,
-      "verbose_name": ""
+      "verbose_name": "Editorial Stream Approval Group"
     },
     "model": "name.grouptypename",
-    "pk": "editorial"
+    "pk": "edappr"
+  },
+  {
+    "fields": {
+      "desc": "Editorial Stream Working Group",
+      "name": "Editorial Stream Working Group",
+      "order": 0,
+      "used": true,
+      "verbose_name": "Editorial Stream Working Group"
+    },
+    "model": "name.grouptypename",
+    "pk": "edwg"
   },
   {
     "fields": {
@@ -11126,6 +12595,17 @@
     "model": "name.grouptypename",
     "pk": "iabasg"
   },
+  {
+    "fields": {
+      "desc": "IAB Workshop",
+      "name": "IAB Workshop",
+      "order": 0,
+      "used": true,
+      "verbose_name": "IAB Workshop"
+    },
+    "model": "name.grouptypename",
+    "pk": "iabworkshop"
+  },
   {
     "fields": {
       "desc": "",
@@ -11220,7 +12700,7 @@
       "name": "Program",
       "order": 0,
       "used": true,
-      "verbose_name": ""
+      "verbose_name": "IAB Program"
     },
     "model": "name.grouptypename",
     "pk": "program"
@@ -11242,7 +12722,7 @@
       "name": "Directorate (with reviews)",
       "order": 0,
       "used": true,
-      "verbose_name": ""
+      "verbose_name": "Review Team"
     },
     "model": "name.grouptypename",
     "pk": "review"
@@ -11305,8 +12785,8 @@
   {
     "fields": {
       "default_offset_days": -19,
-      "desc": "Internet Draft submission cut-off for -00 drafts by UTC 23:59",
-      "name": "00 ID Cutoff",
+      "desc": "Internet-Draft submission cut-off for -00 I-Ds by UTC 23:59",
+      "name": "00 I-D Cutoff",
       "order": 0,
       "used": false
     },
@@ -11316,8 +12796,8 @@
   {
     "fields": {
       "default_offset_days": -12,
-      "desc": "Internet Draft submission cut-off for revised (-01 and above) drafts by UTC 23:59",
-      "name": "01 ID Cutoff",
+      "desc": "Internet-Draft submission cut-off for revised (-01 and above) I-Ds by UTC 23:59",
+      "name": "01 I-D Cutoff",
       "order": 0,
       "used": false
     },
@@ -11327,7 +12807,7 @@
   {
     "fields": {
       "default_offset_days": -57,
-      "desc": "Cut-off date for BOF proposal requests. To request a BOF, please see instructions at https://www.ietf.org/how/bofs/bof-procedures on Requesting a BOF",
+      "desc": "Cut-off date for BOF proposal requests. To request a __BoF__ session use the [IETF BoF Request Tool](/doc/bof-requests).",
       "name": "Cut-off preliminary BOF requests",
       "order": 0,
       "used": true
@@ -11338,7 +12818,7 @@
   {
     "fields": {
       "default_offset_days": -57,
-      "desc": "Preliminary BOF proposals requested. To request a BOF, please see instructions on requesting a BOF at https://www.ietf.org/how/bofs/bof-procedures/",
+      "desc": "Preliminary BOF proposals requested. To request a __BoF__ session use the [IETF BoF Request Tool](/doc/bof-requests).",
       "name": "Preliminary BOF proposals requested",
       "order": 0,
       "used": false
@@ -11371,7 +12851,7 @@
   {
     "fields": {
       "default_offset_days": -43,
-      "desc": "Cut-off date for BOF proposal requests to Area Directors at UTC 23:59",
+      "desc": "Cut-off date for BOF proposal requests to Area Directors at UTC 23:59. To request a __BoF__ session use the [IETF BoF Request Tool](/doc/bof-requests).",
       "name": "Cut-off BOF scheduling Requests",
       "order": 0,
       "used": false
@@ -11415,7 +12895,7 @@
   {
     "fields": {
       "default_offset_days": -43,
-      "desc": "Cut-off date for requests to schedule Working Group Meetings at UTC 23:59",
+      "desc": "Cut-off date for requests to schedule Working Group Meetings at UTC 23:59. To request a __Working Group__ session, use the [IETF Meeting Session Request Tool](/secr/sreq/).",
       "name": "Cut-off WG scheduling Requests",
       "order": 0,
       "used": true
@@ -11434,13 +12914,24 @@
     "model": "name.importantdatename",
     "pk": "draftwgagenda"
   },
+  {
+    "fields": {
+      "default_offset_days": -12,
+      "desc": "Early registration and payment cut-off at UTC 23:59",
+      "name": "Early cutoff",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.importantdatename",
+    "pk": "early"
+  },
   {
     "fields": {
       "default_offset_days": -47,
       "desc": "Early Bird registration and payment cut-off at UTC 23:59",
       "name": "Earlybird cutoff",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.importantdatename",
     "pk": "earlybird"
@@ -11459,8 +12950,8 @@
   {
     "fields": {
       "default_offset_days": -12,
-      "desc": "Internet Draft submission cut-off (for all drafts, including -00) by UTC 23:59",
-      "name": "ID Cutoff",
+      "desc": "Internet-Draft submission cut-off (for all Internet-Drafts, including -00) by UTC 23:59. Upload using the [I-D Submission Tool](/submit/).",
+      "name": "I-D Cutoff",
       "order": 0,
       "used": true
     },
@@ -11492,7 +12983,7 @@
   {
     "fields": {
       "default_offset_days": -82,
-      "desc": "IETF Online Registration Opens",
+      "desc": "IETF Online Registration Opens [Register Here](https://www.ietf.org/how/meetings/register/).",
       "name": "Registration Opens",
       "order": 0,
       "used": true
@@ -11503,7 +12994,7 @@
   {
     "fields": {
       "default_offset_days": -89,
-      "desc": "Working Group and BOF scheduling begins",
+      "desc": "Working Group and BOF scheduling begins. To request a Working Group session, use the [IETF Meeting Session Request Tool](/secr/sreq/). If you are working on a BOF request, it is highly recommended to tell the IESG now by sending an [email to iesg@ietf.org](mailtp:iesg@ietf.org) to get advance help with the request.",
       "name": "Scheduling Opens",
       "order": 0,
       "used": true
@@ -11561,11 +13052,22 @@
       "desc": "Standard rate registration and payment cut-off at UTC 23:59.",
       "name": "Standard rate registration ends",
       "order": 18,
-      "used": true
+      "used": false
     },
     "model": "name.importantdatename",
     "pk": "stdratecutoff"
   },
+  {
+    "fields": {
+      "default_offset_days": -47,
+      "desc": "Super Early registration cutoff at UTC 23:59",
+      "name": "Super Early cutoff",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.importantdatename",
+    "pk": "superearly"
+  },
   {
     "fields": {
       "desc": "",
@@ -11686,6 +13188,16 @@
     "model": "name.iprdisclosurestatename",
     "pk": "removed"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Removed Objectively False",
+      "order": 5,
+      "used": true
+    },
+    "model": "name.iprdisclosurestatename",
+    "pk": "removed_objfalse"
+  },
   {
     "fields": {
       "desc": "",
@@ -11796,6 +13308,16 @@
     "model": "name.ipreventtypename",
     "pk": "removed"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Removed Objectively False",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.ipreventtypename",
+    "pk": "removed_objfalse"
+  },
   {
     "fields": {
       "desc": "",
@@ -12196,6 +13718,86 @@
     "model": "name.proceedingsmaterialtypename",
     "pk": "wiki"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "ANRW Combo",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.registrationtickettypename",
+    "pk": "anrw_combo"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "ANRW Only",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.registrationtickettypename",
+    "pk": "anrw_only"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Hackathon Combo",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.registrationtickettypename",
+    "pk": "hackathon_combo"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Hackathon Only",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.registrationtickettypename",
+    "pk": "hackathon_only"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "One Day",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.registrationtickettypename",
+    "pk": "one_day"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Student",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.registrationtickettypename",
+    "pk": "student"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Unknown",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.registrationtickettypename",
+    "pk": "unknown"
+  },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Week Pass",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.registrationtickettypename",
+    "pk": "week_pass"
+  },
   {
     "fields": {
       "desc": "The reviewer has accepted the assignment",
@@ -12529,7 +14131,7 @@
   {
     "fields": {
       "desc": "",
-      "name": "Last Call",
+      "name": "IETF Last Call",
       "order": 2,
       "used": true
     },
@@ -12706,6 +14308,16 @@
     "model": "name.rolename",
     "pk": "lead"
   },
+  {
+    "fields": {
+      "desc": "",
+      "name": "Lead Maintainer",
+      "order": 0,
+      "used": true
+    },
+    "model": "name.rolename",
+    "pk": "leadmaintainer"
+  },
   {
     "fields": {
       "desc": "",
@@ -12731,7 +14343,7 @@
       "desc": "",
       "name": "Liaison CC Contact",
       "order": 9,
-      "used": true
+      "used": false
     },
     "model": "name.rolename",
     "pk": "liaison_cc_contact"
@@ -12741,11 +14353,21 @@
       "desc": "",
       "name": "Liaison Contact",
       "order": 8,
-      "used": true
+      "used": false
     },
     "model": "name.rolename",
     "pk": "liaison_contact"
   },
+  {
+    "fields": {
+      "desc": "Coordinates liaison handling for the IAB",
+      "name": "Liaison Coordinator",
+      "order": 14,
+      "used": true
+    },
+    "model": "name.rolename",
+    "pk": "liaison_coordinator"
+  },
   {
     "fields": {
       "desc": "",
@@ -12831,7 +14453,7 @@
       "desc": "Assigned permission TRAC_ADMIN in datatracker-managed Trac Wiki instances",
       "name": "Trac Admin",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.rolename",
     "pk": "trac-admin"
@@ -12841,7 +14463,7 @@
       "desc": "Provides log-in permission to restricted Trac instances.  Used by the generate_apache_perms management command, called from ../../scripts/Cron-runner",
       "name": "Trac Editor",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.rolename",
     "pk": "trac-editor"
@@ -12911,7 +14533,7 @@
       "desc": "Flipchars",
       "name": "Flipcharts",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.roomresourcename",
     "pk": "flipcharts"
@@ -12961,7 +14583,7 @@
       "desc": "Experimental Room Setup (U-Shape and classroom, subject to availability)",
       "name": "Experimental Room Setup (U-Shape and classroom)",
       "order": 0,
-      "used": true
+      "used": false
     },
     "model": "name.roomresourcename",
     "pk": "u-shape"
@@ -12982,7 +14604,10 @@
       "name": "Administrative",
       "on_agenda": true,
       "order": 5,
-      "timeslot_types": "[\n    \"other\",\n    \"reg\"\n]",
+      "timeslot_types": [
+        "other",
+        "reg"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -12994,7 +14619,10 @@
       "name": "Closed meeting",
       "on_agenda": false,
       "order": 10,
-      "timeslot_types": "[\n    \"other\",\n    \"regular\"\n]",
+      "timeslot_types": [
+        "other",
+        "regular"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13006,7 +14634,9 @@
       "name": "Coding",
       "on_agenda": true,
       "order": 4,
-      "timeslot_types": "[\n    \"other\"\n]",
+      "timeslot_types": [
+        "other"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13018,7 +14648,7 @@
       "name": "None",
       "on_agenda": true,
       "order": 0,
-      "timeslot_types": "[]",
+      "timeslot_types": [],
       "used": false
     },
     "model": "name.sessionpurposename",
@@ -13030,7 +14660,9 @@
       "name": "Office hours",
       "on_agenda": true,
       "order": 3,
-      "timeslot_types": "[\n    \"other\"\n]",
+      "timeslot_types": [
+        "other"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13042,7 +14674,9 @@
       "name": "Open meeting",
       "on_agenda": true,
       "order": 9,
-      "timeslot_types": "[\n    \"other\"\n]",
+      "timeslot_types": [
+        "other"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13054,7 +14688,9 @@
       "name": "Plenary",
       "on_agenda": true,
       "order": 7,
-      "timeslot_types": "[\n    \"plenary\"\n]",
+      "timeslot_types": [
+        "plenary"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13066,7 +14702,10 @@
       "name": "Presentation",
       "on_agenda": true,
       "order": 8,
-      "timeslot_types": "[\n    \"other\",\n    \"regular\"\n]",
+      "timeslot_types": [
+        "other",
+        "regular"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13078,7 +14717,9 @@
       "name": "Regular",
       "on_agenda": true,
       "order": 1,
-      "timeslot_types": "[\n    \"regular\"\n]",
+      "timeslot_types": [
+        "regular"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13090,7 +14731,10 @@
       "name": "Social",
       "on_agenda": true,
       "order": 6,
-      "timeslot_types": "[\n    \"break\",\n    \"other\"\n]",
+      "timeslot_types": [
+        "break",
+        "other"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13102,7 +14746,9 @@
       "name": "Tutorial",
       "on_agenda": true,
       "order": 2,
-      "timeslot_types": "[\n    \"other\"\n]",
+      "timeslot_types": [
+        "other"
+      ],
       "used": true
     },
     "model": "name.sessionpurposename",
@@ -13380,7 +15026,7 @@
   },
   {
     "fields": {
-      "desc": "Legacy stream",
+      "desc": "Legacy",
       "name": "Legacy",
       "order": 6,
       "used": true
@@ -13388,6 +15034,36 @@
     "model": "name.streamname",
     "pk": "legacy"
   },
+  {
+    "fields": {
+      "desc": "Action items section",
+      "name": "Action Items",
+      "order": 3,
+      "used": true
+    },
+    "model": "name.telechatagendasectionname",
+    "pk": "action_items"
+  },
+  {
+    "fields": {
+      "desc": "Minutes section",
+      "name": "Minutes",
+      "order": 2,
+      "used": true
+    },
+    "model": "name.telechatagendasectionname",
+    "pk": "minutes"
+  },
+  {
+    "fields": {
+      "desc": "Roll call section",
+      "name": "Roll Call",
+      "order": 1,
+      "used": true
+    },
+    "model": "name.telechatagendasectionname",
+    "pk": "roll_call"
+  },
   {
     "fields": {
       "desc": "Friday early afternoon",
@@ -16081,49 +17757,5 @@
     },
     "model": "stats.countryalias",
     "pk": 303
-  },
-  {
-    "fields": {
-      "command": "xym",
-      "switch": "--version",
-      "time": "2022-09-22T00:09:27.552",
-      "used": true,
-      "version": "xym 0.5"
-    },
-    "model": "utils.versioninfo",
-    "pk": 1
-  },
-  {
-    "fields": {
-      "command": "pyang",
-      "switch": "--version",
-      "time": "2022-09-22T00:09:27.867",
-      "used": true,
-      "version": "pyang 2.5.3"
-    },
-    "model": "utils.versioninfo",
-    "pk": 2
-  },
-  {
-    "fields": {
-      "command": "yanglint",
-      "switch": "--version",
-      "time": "2022-09-22T00:09:27.886",
-      "used": true,
-      "version": "yanglint SO 1.9.2"
-    },
-    "model": "utils.versioninfo",
-    "pk": 3
-  },
-  {
-    "fields": {
-      "command": "xml2rfc",
-      "switch": "--version",
-      "time": "2022-09-22T00:09:28.809",
-      "used": true,
-      "version": "xml2rfc 3.14.2"
-    },
-    "model": "utils.versioninfo",
-    "pk": 4
   }
 ]
diff --git a/ietf/name/management/commands/generate_name_fixture.py b/ietf/name/management/commands/generate_name_fixture.py
index 02dc08faf5..ef30e54c73 100644
--- a/ietf/name/management/commands/generate_name_fixture.py
+++ b/ietf/name/management/commands/generate_name_fixture.py
@@ -67,7 +67,7 @@ def output(seq):
                 pprint(connection.queries)
                 raise
 
-        objects = []                    # type: List[object]
+        objects: List[object] = []  # type: ignore[annotation-unchecked]
         model_objects = {}
 
         import ietf.name.models
@@ -77,7 +77,6 @@ def output(seq):
         from ietf.mailtrigger.models import MailTrigger, Recipient
         from ietf.meeting.models import BusinessConstraint
         from ietf.stats.models import CountryAlias
-        from ietf.utils.models import VersionInfo
 
         # Grab all ietf.name.models
         for n in dir(ietf.name.models):
@@ -87,7 +86,7 @@ def output(seq):
                     model_objects[model_name(item)] = list(item.objects.all().order_by('pk'))
 
         for m in ( BallotType, State, StateType, GroupFeatures, MailTrigger, Recipient,
-                    CountryAlias, VersionInfo, BusinessConstraint ):
+                    CountryAlias, BusinessConstraint ):
             model_objects[model_name(m)] = list(m.objects.all().order_by('pk'))
 
         for m in ( DBTemplate, ):
diff --git a/ietf/name/migrations/0001_initial.py b/ietf/name/migrations/0001_initial.py
index 0750545040..9781e65db1 100644
--- a/ietf/name/migrations/0001_initial.py
+++ b/ietf/name/migrations/0001_initial.py
@@ -1,32 +1,29 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from typing import List, Tuple      # pyflakes:ignore
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
+from typing import List, Tuple
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models
+import ietf.utils.validators
+import jsonfield.fields
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]                                   # type: List[Tuple[str]]
+    dependencies: List[Tuple[str, str]] = [
+    ]
 
     operations = [
         migrations.CreateModel(
-            name='BallotPositionName',
+            name='AgendaFilterTypeName',
             fields=[
                 ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=255)),
                 ('desc', models.TextField(blank=True)),
                 ('used', models.BooleanField(default=True)),
                 ('order', models.IntegerField(default=0)),
-                ('blocking', models.BooleanField(default=False)),
             ],
             options={
                 'ordering': ['order', 'name'],
@@ -34,14 +31,13 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='ConstraintName',
+            name='AgendaTypeName',
             fields=[
                 ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=255)),
                 ('desc', models.TextField(blank=True)),
                 ('used', models.BooleanField(default=True)),
                 ('order', models.IntegerField(default=0)),
-                ('penalty', models.IntegerField(default=0, help_text='The penalty for violating this kind of constraint; for instance 10 (small penalty) or 10000 (large penalty)')),
             ],
             options={
                 'ordering': ['order', 'name'],
@@ -49,13 +45,14 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='ContinentName',
+            name='BallotPositionName',
             fields=[
                 ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=255)),
                 ('desc', models.TextField(blank=True)),
                 ('used', models.BooleanField(default=True)),
                 ('order', models.IntegerField(default=0)),
+                ('blocking', models.BooleanField(default=False)),
             ],
             options={
                 'ordering': ['order', 'name'],
@@ -63,15 +60,29 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='CountryName',
+            name='ConstraintName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+                ('penalty', models.IntegerField(default=0, help_text='The penalty for violating this kind of constraint; for instance 10 (small penalty) or 10000 (large penalty)')),
+                ('is_group_conflict', models.BooleanField(default=False, help_text='Does this constraint capture a conflict between groups?')),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='ContinentName',
             fields=[
                 ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=255)),
                 ('desc', models.TextField(blank=True)),
                 ('used', models.BooleanField(default=True)),
                 ('order', models.IntegerField(default=0)),
-                ('in_eu', models.BooleanField(default=False, verbose_name='In EU')),
-                ('continent', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ContinentName')),
             ],
             options={
                 'ordering': ['order', 'name'],
@@ -165,14 +176,13 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='DraftSubmissionStateName',
+            name='ExtResourceTypeName',
             fields=[
                 ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=255)),
                 ('desc', models.TextField(blank=True)),
                 ('used', models.BooleanField(default=True)),
                 ('order', models.IntegerField(default=0)),
-                ('next_states', models.ManyToManyField(blank=True, related_name='previous_states', to='name.DraftSubmissionStateName')),
             ],
             options={
                 'ordering': ['order', 'name'],
@@ -405,6 +415,48 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.CreateModel(
+            name='ProceedingsMaterialTypeName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='ReviewAssignmentStateName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='ReviewerQueuePolicyName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
         migrations.CreateModel(
             name='ReviewRequestStateName',
             fields=[
@@ -475,6 +527,22 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.CreateModel(
+            name='SessionPurposeName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+                ('timeslot_types', jsonfield.fields.JSONField(default=[], help_text='Allowed TimeSlotTypeNames', max_length=256, validators=[ietf.utils.validators.JSONForeignKeyListValidator('name.TimeSlotTypeName')])),
+                ('on_agenda', models.BooleanField(default=True, help_text='Are sessions of this purpose visible on the agenda by default?')),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
         migrations.CreateModel(
             name='SessionStatusName',
             fields=[
@@ -489,6 +557,20 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.CreateModel(
+            name='SlideSubmissionStatusName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
         migrations.CreateModel(
             name='StdLevelName',
             fields=[
@@ -517,6 +599,20 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.CreateModel(
+            name='TimerangeName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
         migrations.CreateModel(
             name='TimeSlotTypeName',
             fields=[
@@ -545,4 +641,50 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.CreateModel(
+            name='ExtResourceName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+                ('type', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceTypeName')),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='DraftSubmissionStateName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+                ('next_states', models.ManyToManyField(blank=True, related_name='previous_states', to='name.DraftSubmissionStateName')),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='CountryName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+                ('in_eu', models.BooleanField(default=False, verbose_name='In EU')),
+                ('continent', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ContinentName')),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
     ]
diff --git a/ietf/name/migrations/0002_agendatypename.py b/ietf/name/migrations/0002_agendatypename.py
deleted file mode 100644
index f916f60da1..0000000000
--- a/ietf/name/migrations/0002_agendatypename.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-07-10 13:47
-
-
-from django.db import migrations, models
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AgendaTypeName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-    ]
diff --git a/ietf/name/migrations/0002_telechatagendasectionname.py b/ietf/name/migrations/0002_telechatagendasectionname.py
new file mode 100644
index 0000000000..d9fedeae75
--- /dev/null
+++ b/ietf/name/migrations/0002_telechatagendasectionname.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.2.28 on 2023-03-10 16:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TelechatAgendaSectionName',
+            fields=[
+                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('desc', models.TextField(blank=True)),
+                ('used', models.BooleanField(default=True)),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'ordering': ['order', 'name'],
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/ietf/name/migrations/0003_agendatypename_data.py b/ietf/name/migrations/0003_agendatypename_data.py
deleted file mode 100644
index 4db2056d73..0000000000
--- a/ietf/name/migrations/0003_agendatypename_data.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-07-10 13:47
-
-
-from django.db import migrations
-
-agenda_type_names = (
-    {
-        'slug': 'ietf',
-        'name': 'IETF Agenda',
-        'desc': '',
-        'used': True,
-        'order': 0,
-    },
-    {
-        'slug': 'ad',
-        'name': 'AD Office Hours',
-        'desc': '',
-        'used': True,
-        'order': 0,
-    },
-    {
-        'slug': 'side',
-        'name': 'Side Meetings',
-        'desc': '',
-        'used': True,
-        'order': 0,
-    },
-    {
-        'slug': 'workshop',
-        'name': 'Workshops',
-        'desc': '',
-        'used': True,
-        'order': 0,
-    },
-)
-
-def forward(apps, schema_editor):
-    AgendaTypeName = apps.get_model('name', 'AgendaTypeName')
-    for entry in agenda_type_names:
-        AgendaTypeName.objects.create(**entry)
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0002_agendatypename'),
-        ('group', '0002_groupfeatures_historicalgroupfeatures'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0003_populate_telechatagendasectionname.py b/ietf/name/migrations/0003_populate_telechatagendasectionname.py
new file mode 100644
index 0000000000..41d4f86727
--- /dev/null
+++ b/ietf/name/migrations/0003_populate_telechatagendasectionname.py
@@ -0,0 +1,28 @@
+# Generated by Django 2.2.28 on 2023-03-10 16:30
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    TelechatAgendaSectionName = apps.get_model('name', 'TelechatAgendaSectionName')
+    for slug, name, desc, order in (
+            ('roll_call', 'Roll Call', 'Roll call section', 1),
+            ('minutes', 'Minutes', 'Minutes section', 2),
+            ('action_items', 'Action Items', 'Action items section', 3),
+    ):
+        TelechatAgendaSectionName.objects.create(slug=slug, name=name, desc=desc, order=order)
+
+
+def reverse(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0002_telechatagendasectionname'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/name/migrations/0004_add_prefix_to_doctypenames.py b/ietf/name/migrations/0004_add_prefix_to_doctypenames.py
deleted file mode 100644
index 05c103319f..0000000000
--- a/ietf/name/migrations/0004_add_prefix_to_doctypenames.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-10-19 11:34
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DocTypeName = apps.get_model('name','DocTypeName')
-    DocTypeName.objects.filter(slug='liaison').update(prefix='liaison')
-    DocTypeName.objects.filter(slug='review').update(prefix='review')
-    DocTypeName.objects.filter(slug='shepwrit').update(prefix='shepherd')
-
-def reverse(apps, schema_editor):
-    DocTypeName = apps.get_model('name','DocTypeName')
-    DocTypeName.objects.filter(slug='liaison').update(prefix='')
-    DocTypeName.objects.filter(slug='review').update(prefix='')
-    DocTypeName.objects.filter(slug='shepwrit').update(prefix='')
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0003_agendatypename_data'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0004_statements.py b/ietf/name/migrations/0004_statements.py
new file mode 100644
index 0000000000..ea37799746
--- /dev/null
+++ b/ietf/name/migrations/0004_statements.py
@@ -0,0 +1,21 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    DocTypeName = apps.get_model("name", "DocTypeName")
+    DocTypeName.objects.create(slug="statement", name="Statement", prefix="statement", desc="", used=True)
+
+
+def reverse(apps, schema_editor):
+    DocTypeName = apps.get_model("name", "DocTypeName")
+    DocTypeName.objects.filter(slug="statement").delete()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0003_populate_telechatagendasectionname"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/name/migrations/0005_feedbacktypename_schema.py b/ietf/name/migrations/0005_feedbacktypename_schema.py
new file mode 100644
index 0000000000..cedb129be3
--- /dev/null
+++ b/ietf/name/migrations/0005_feedbacktypename_schema.py
@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations, models
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0004_statements"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="FeedbackTypeName",
+            name="legend",
+            field=models.CharField(
+                default="",
+                help_text="One-character legend for feedback classification form",
+                max_length=1,
+            ),
+        ),
+    ]
diff --git a/ietf/name/migrations/0005_reviewassignmentstatename.py b/ietf/name/migrations/0005_reviewassignmentstatename.py
deleted file mode 100644
index d75f9b7748..0000000000
--- a/ietf/name/migrations/0005_reviewassignmentstatename.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-04 13:59
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0004_add_prefix_to_doctypenames'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ReviewAssignmentStateName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-    ]
diff --git a/ietf/name/migrations/0006_adjust_statenames.py b/ietf/name/migrations/0006_adjust_statenames.py
deleted file mode 100644
index 6c6092407f..0000000000
--- a/ietf/name/migrations/0006_adjust_statenames.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-04 14:02
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    ReviewRequestStateName = apps.get_model('name','ReviewRequestStateName')
-    ReviewAssignmentStateName = apps.get_model('name','ReviewAssignmentStateName')
-
-    # TODO: Remove these newly unused states in a future release
-    ReviewRequestStateName.objects.filter(slug__in=['accepted', 'rejected', 'no-response', 'part-completed', 'completed', 'unknown']).update(used=False)
-    name, created = ReviewRequestStateName.objects.get_or_create(slug = 'assigned')
-    if created:
-        name.name = 'Assigned'
-        name.desc = 'The ReviewRequest has been assigned to at least one reviewer'
-        name.used = True
-        name.order = 0
-        name.save()
-
-    assignment_states = [
-        { 'slug': 'assigned',
-          'name': 'Assigned',
-          'desc': 'The review has been assigned to this reviewer',
-          'used': True,
-          'order': 0
-        },
-        { 'slug':'accepted', 
-          'name':'Accepted', 
-          'desc':'The reviewer has accepted the assignment', 
-          'used': True, 
-          'order':0 
-        },
-        { 'slug':'rejected', 
-          'name':'Rejected', 
-          'desc':'The reviewer has rejected the assignment', 
-          'used': True, 
-          'order':0 
-        },
-        { 'slug':'withdrawn', 
-          'name':'Withdrawn by Team', 
-          'desc':'The team secretary has withdrawn the assignment', 
-          'used': True, 
-          'order':0 
-        },
-        { 'slug':'overtaken', 
-          'name':'Overtaken By Events', 
-          'desc':'The review was abandoned because of circumstances', 
-          'used': True, 
-          'order':0 
-        },
-        { 'slug':'no-response', 
-          'name':'No Response', 
-          'desc':'The reviewer did not provide a review by the deadline', 
-          'used': True, 
-          'order':0 
-        },
-        { 'slug':'part-completed', 
-          'name':'Partially Completed', 
-          'desc':'The reviewer partially completed the assignment', 
-          'used': True, 
-          'order':0 
-        },
-        { 'slug':'completed', 
-          'name':'Completed', 
-          'desc':'The reviewer completed the assignment', 
-          'used': True, 
-          'order':0 
-        },
-        { 'slug':'unknown',
-          'name':'Unknown',
-          'desc':'The assignment is was imported from an earlier database and its state could not be computed',
-          'used':'True',
-          'order':0
-        }
-    ]
-
-    for entry in assignment_states:
-        name, created = ReviewAssignmentStateName.objects.get_or_create(slug=entry['slug'])
-        if created:
-            for k, v in entry.items():
-                setattr(name, k, v)
-            name.save()
-
-def reverse(apps, schema_editor):
-    ReviewRequestStateName = apps.get_model('name','ReviewRequestStateName')
-    ReviewAssignmentStateName = apps.get_model('name','ReviewAssignmentStateName')
-    ReviewRequestStateName.objects.filter(slug__in=['accepted', 'rejected', 'no-response', 'part-completed', 'completed', 'unknown']).update(used=True)
-    ReviewRequestStateName.objects.filter(slug='assigned').update(used=False)
-    ReviewAssignmentStateName.objects.update(used=False)
-    
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0005_reviewassignmentstatename'),
-        ('doc','0011_reviewassignmentdocevent'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0006_feedbacktypename_data.py b/ietf/name/migrations/0006_feedbacktypename_data.py
new file mode 100644
index 0000000000..f11fca889b
--- /dev/null
+++ b/ietf/name/migrations/0006_feedbacktypename_data.py
@@ -0,0 +1,36 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    FeedbackTypeName = apps.get_model("name", "FeedbackTypeName")
+    FeedbackTypeName.objects.create(slug="obe", name="Overcome by events")
+    for slug, legend, order in (
+        ('comment', 'C', 1),
+        ('nomina',  'N', 2),
+        ('questio', 'Q', 3),
+        ('obe',     'O', 4),
+        ('junk',    'J', 5),
+        ('read',    'R', 6),
+    ):
+        ft = FeedbackTypeName.objects.get(slug=slug)
+        ft.legend = legend
+        ft.order = order
+        ft.save()
+
+def reverse(apps, schema_editor):
+    FeedbackTypeName = apps.get_model("name", "FeedbackTypeName")
+    FeedbackTypeName.objects.filter(slug="obe").delete()
+    for ft in FeedbackTypeName.objects.all():
+        ft.legend = ""
+        ft.order = 0
+        ft.save()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0005_feedbacktypename_schema"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/name/migrations/0007_appeal_artifact_typename.py b/ietf/name/migrations/0007_appeal_artifact_typename.py
new file mode 100644
index 0000000000..1a604dad84
--- /dev/null
+++ b/ietf/name/migrations/0007_appeal_artifact_typename.py
@@ -0,0 +1,59 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations, models
+
+
+def forward(apps, schema_editor):
+    AppealArtifactTypeName = apps.get_model("name", "AppealArtifactTypeName")
+    for slug, name, desc, order in [
+        ("appeal", "Appeal", "The content of an appeal", 1),
+        (
+            "appeal_with_response",
+            "Response (with appeal included)",
+            "The content of an appeal combined with the content of a response",
+            2,
+        ),
+        ("response", "Response", "The content of a response to an appeal", 3),
+        (
+            "reply_to_response",
+            "Reply to response",
+            "The content of a reply to an appeal response",
+            4,
+        ),
+        ("other_content", "Other content", "Other content related to an appeal", 5),
+    ]:
+        AppealArtifactTypeName.objects.create(
+            slug=slug, name=name, desc=desc, order=order
+        )
+
+
+def reverse(apps, schema_editor):
+    AppealArtifactTypeName = apps.get_model("name", "AppealArtifactTypeName")
+    AppealArtifactTypeName.objects.delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0006_feedbacktypename_data"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="AppealArtifactTypeName",
+            fields=[
+                (
+                    "slug",
+                    models.CharField(max_length=32, primary_key=True, serialize=False),
+                ),
+                ("name", models.CharField(max_length=255)),
+                ("desc", models.TextField(blank=True)),
+                ("used", models.BooleanField(default=True)),
+                ("order", models.IntegerField(default=0)),
+            ],
+            options={
+                "ordering": ["order", "name"],
+                "abstract": False,
+            },
+        ),
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/name/migrations/0007_fix_m2m_slug_id_length.py b/ietf/name/migrations/0007_fix_m2m_slug_id_length.py
deleted file mode 100644
index 578415bc58..0000000000
--- a/ietf/name/migrations/0007_fix_m2m_slug_id_length.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0006_adjust_statenames'),
-    ]
-
-    operations = [
-        migrations.RunSQL("ALTER TABLE doc_ballottype_positions MODIFY ballotpositionname_id varchar(32);", ""),
-        migrations.RunSQL("ALTER TABLE doc_dochistory_tags MODIFY doctagname_id varchar(32);", ""),
-        migrations.RunSQL("ALTER TABLE group_group_unused_tags MODIFY doctagname_id varchar(32);", ""),
-        migrations.RunSQL("ALTER TABLE group_grouphistory_unused_tags MODIFY doctagname_id varchar(32);", ""),
-    ]
diff --git a/ietf/name/migrations/0008_removed_objfalse.py b/ietf/name/migrations/0008_removed_objfalse.py
new file mode 100644
index 0000000000..2c1f7e759d
--- /dev/null
+++ b/ietf/name/migrations/0008_removed_objfalse.py
@@ -0,0 +1,24 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    IprDisclosureStateName = apps.get_model("name", "IprDisclosureStateName")
+    IprDisclosureStateName.objects.create(slug="removed_objfalse", name="Removed Objectively False", order=5)
+    IprEventTypeName = apps.get_model("name", "IprEventTypeName")
+    IprEventTypeName.objects.create(slug="removed_objfalse", name="Removed Objectively False")
+
+def reverse(apps, schema_editor):
+    IprDisclosureStateName = apps.get_model("name", "IprDisclosureStateName")
+    IprDisclosureStateName.objects.filter(slug="removed_objfalse").delete()
+    IprEventTypeName = apps.get_model("name", "IprEventTypeName")
+    IprEventTypeName.objects.filter(slug="removed_objfalse").delete()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0007_appeal_artifact_typename"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/name/migrations/0008_reviewerqueuepolicyname.py b/ietf/name/migrations/0008_reviewerqueuepolicyname.py
deleted file mode 100644
index caee6384b3..0000000000
--- a/ietf/name/migrations/0008_reviewerqueuepolicyname.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.23 on 2019-11-18 08:35
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    def forward(apps, schema_editor):
-        ReviewerQueuePolicyName = apps.get_model('name', 'ReviewerQueuePolicyName')
-        ReviewerQueuePolicyName.objects.create(slug='RotateAlphabetically', name='Rotate alphabetically')
-        ReviewerQueuePolicyName.objects.create(slug='LeastRecentlyUsed', name='Least recently used')
-
-    def reverse(self, apps):
-        pass
-    
-    dependencies = [
-        ('name', '0007_fix_m2m_slug_id_length'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ReviewerQueuePolicyName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0009_add_verified_errata_to_doctagname.py b/ietf/name/migrations/0009_add_verified_errata_to_doctagname.py
deleted file mode 100644
index 94c1134d67..0000000000
--- a/ietf/name/migrations/0009_add_verified_errata_to_doctagname.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DocTagName = apps.get_model('name','DocTagName')
-    DocTagName.objects.get_or_create(slug='verified-errata', name='Has verified errata', desc='', used=True, order=0)
-
-def reverse(apps, schema_editor):
-    DocTagName = apps.get_model('name','DocTagName')
-    DocTagName.objects.filter(slug='verified-errata').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0008_reviewerqueuepolicyname'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0009_iabworkshops.py b/ietf/name/migrations/0009_iabworkshops.py
new file mode 100644
index 0000000000..1819815860
--- /dev/null
+++ b/ietf/name/migrations/0009_iabworkshops.py
@@ -0,0 +1,29 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    GroupTypeName = apps.get_model("name", "GroupTypeName")
+    GroupTypeName.objects.create(
+        slug = "iabworkshop",
+        name = "IAB Workshop",
+        desc = "IAB Workshop",
+        used = True,
+        order = 0,
+        verbose_name = "IAB Workshop",
+
+    )
+
+def reverse(apps, schema_editor):
+    GroupTypeName = apps.get_model("name", "GroupTypeName")
+    GroupTypeName.objects.filter(slug="iabworkshop").delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0008_removed_objfalse"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]
diff --git a/ietf/name/migrations/0010_rfc_doctype_names.py b/ietf/name/migrations/0010_rfc_doctype_names.py
new file mode 100644
index 0000000000..8d7a565f23
--- /dev/null
+++ b/ietf/name/migrations/0010_rfc_doctype_names.py
@@ -0,0 +1,30 @@
+# Generated by Django 4.2.2 on 2023-06-14 20:39
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    DocTypeName = apps.get_model("name", "DocTypeName")
+    DocTypeName.objects.get_or_create(
+        slug="rfc",
+        name="RFC",
+        used=True,
+        prefix="rfc",
+    )
+    
+    DocRelationshipName = apps.get_model("name", "DocRelationshipName")
+    DocRelationshipName.objects.get_or_create(
+        slug="became_rfc",
+        name="became RFC",
+        used=True,
+        revname="came from draft",
+    )
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0009_iabworkshops"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward),
+    ]
diff --git a/ietf/name/migrations/0010_timerangename.py b/ietf/name/migrations/0010_timerangename.py
deleted file mode 100644
index b6b17c9da4..0000000000
--- a/ietf/name/migrations/0010_timerangename.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-02-04 05:43
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-def forward(apps, schema_editor):
-    TimerangeName = apps.get_model('name', 'TimerangeName')
-    timeranges = [
-        ('monday-morning', 'Monday morning'),
-        ('monday-afternoon-early', 'Monday early afternoon'),
-        ('monday-afternoon-late', 'Monday late afternoon'),
-        ('tuesday-morning', 'Tuesday morning'),
-        ('tuesday-afternoon-early', 'Tuesday early afternoon'),
-        ('tuesday-afternoon-late', 'Tuesday late afternoon'),
-        ('wednesday-morning', 'Wednesday morning'),
-        ('wednesday-afternoon-early', 'Wednesday early afternoon'),
-        ('wednesday-afternoon-late', 'Wednesday late afternoon'),
-        ('thursday-morning', 'Thursday morning'),
-        ('thursday-afternoon-early', 'Thursday early afternoon'),
-        ('thursday-afternoon-late', 'Thursday late afternoon'),
-        ('friday-morning', 'Friday morning'),
-        ('friday-afternoon-early', 'Friday early afternoon'),
-        ('friday-afternoon-late', 'Friday late afternoon'),
-    ]
-    for order, (slug, desc) in enumerate(timeranges):
-        TimerangeName.objects.create(slug=slug, name=slug, desc=desc, used=True, order=order)
-        
-        
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0009_add_verified_errata_to_doctagname'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='TimerangeName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0011_constraintname_editor_label.py b/ietf/name/migrations/0011_constraintname_editor_label.py
deleted file mode 100644
index 0425785a48..0000000000
--- a/ietf/name/migrations/0011_constraintname_editor_label.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0010_timerangename'),
-    ]
-
-    def fill_in_editor_labels(apps, schema_editor):
-        ConstraintName = apps.get_model('name', 'ConstraintName')
-        for cn in ConstraintName.objects.all():
-            cn.editor_label = {
-                'conflict': "(1)",
-                'conflic2': "(2)",
-                'conflic3': "(3)",
-                'bethere': "(person)",
-            }.get(cn.slug, cn.slug)
-            cn.save()
-
-    def noop(apps, schema_editor):
-        pass
-
-    operations = [
-        migrations.AddField(
-            model_name='constraintname',
-            name='editor_label',
-            field=models.CharField(blank=True, help_text='Very short label for producing warnings inline in the sessions in the schedule editor.', max_length=32),
-        ),
-        migrations.RunPython(fill_in_editor_labels, noop, elidable=True),
-    ]
diff --git a/ietf/name/migrations/0011_subseries.py b/ietf/name/migrations/0011_subseries.py
new file mode 100644
index 0000000000..b3fe107924
--- /dev/null
+++ b/ietf/name/migrations/0011_subseries.py
@@ -0,0 +1,38 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    DocTypeName = apps.get_model("name", "DocTypeName")
+    DocRelationshipName = apps.get_model("name", "DocRelationshipName")
+    for slug, name, prefix in [
+        ("std", "Standard", "std"),
+        ("bcp", "Best Current Practice", "bcp"),
+        ("fyi", "For Your Information", "fyi"),
+    ]:
+        DocTypeName.objects.create(
+            slug=slug, name=name, prefix=prefix, desc="", used=True
+        )
+    DocRelationshipName.objects.create(
+        slug="contains",
+        name="Contains",
+        revname="Is part of",
+        desc="This document contains other documents (e.g., STDs contain RFCs)",
+        used=True,
+    )
+
+
+def reverse(apps, schema_editor):
+    DocTypeName = apps.get_model("name", "DocTypeName")
+    DocRelationshipName = apps.get_model("name", "DocRelationshipName")
+    DocTypeName.objects.filter(slug__in=["std", "bcp", "fyi"]).delete()
+    DocRelationshipName.objects.filter(slug="contains").delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0010_rfc_doctype_names"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/name/migrations/0012_adjust_important_dates.py b/ietf/name/migrations/0012_adjust_important_dates.py
new file mode 100644
index 0000000000..7a3252bb5c
--- /dev/null
+++ b/ietf/name/migrations/0012_adjust_important_dates.py
@@ -0,0 +1,29 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+def markdown_names(apps, schema_editor):
+    ImportantDateName = apps.get_model("name", "ImportantDateName")
+    changes = [
+        ('bofproposals', "Preliminary BOF proposals requested. To request a __BoF__ session use the [IETF BoF Request Tool](/doc/bof-requests)."),
+        ('openreg', "IETF Online Registration Opens [Register Here](https://www.ietf.org/how/meetings/register/)."),
+        ('opensched', "Working Group and BOF scheduling begins. To request a Working Group session, use the [IETF Meeting Session Request Tool](/secr/sreq/). If you are working on a BOF request, it is highly recommended to tell the IESG now by sending an [email to iesg@ietf.org](mailtp:iesg@ietf.org) to get advance help with the request."),
+        ('cutoffwgreq', "Cut-off date for requests to schedule Working Group Meetings at UTC 23:59. To request a __Working Group__ session, use the [IETF Meeting Session Request Tool](/secr/sreq/)."),
+        ('idcutoff', "Internet-Draft submission cut-off (for all Internet-Drafts, including -00) by UTC 23:59. Upload using the [I-D Submission Tool](/submit/)."),
+        ('cutoffwgreq', "Cut-off date for requests to schedule Working Group Meetings at UTC 23:59. To request a __Working Group__ session, use the [IETF Meeting Session Request Tool](/secr/sreq/)."),
+        ('bofprelimcutoff', "Cut-off date for BOF proposal requests. To request a __BoF__ session use the [IETF BoF Request Tool](/doc/bof-requests)."),
+        ('cutoffbofreq', "Cut-off date for BOF proposal requests to Area Directors at UTC 23:59. To request a __BoF__ session use the [IETF BoF Request Tool](/doc/bof-requests)."),
+    ]
+    for slug, newDescription in changes:
+        datename = ImportantDateName.objects.get(pk=slug) # If the slug does not exist, then Django will throw an exception :-)
+        datename.desc = newDescription
+        datename.save()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0011_subseries"),
+    ]
+
+    operations = [
+        migrations.RunPython(markdown_names),
+    ]
diff --git a/ietf/name/migrations/0012_role_name_robots.py b/ietf/name/migrations/0012_role_name_robots.py
deleted file mode 100644
index bc5c37980e..0000000000
--- a/ietf/name/migrations/0012_role_name_robots.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    RoleName = apps.get_model('name','RoleName')
-    RoleName.objects.get_or_create(slug='robot', name='Automation Robot', desc='A role for API access by external scripts or entities, such as the mail archive, registrations system, etc.', used=True, order=0)
-
-def reverse(apps, schema_editor):
-    RoleName = apps.get_model('name','RoleName')
-    RoleName.objects.filter(slug='robot').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0011_constraintname_editor_label'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0013_add_auth48_docurltagname.py b/ietf/name/migrations/0013_add_auth48_docurltagname.py
deleted file mode 100644
index 6bede736be..0000000000
--- a/ietf/name/migrations/0013_add_auth48_docurltagname.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 2.0.13 on 2020-06-02 10:13
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DocUrlTagName = apps.get_model('name', 'DocUrlTagName')
-    DocUrlTagName.objects.create(
-        slug='auth48',
-        name='RFC Editor Auth48 status',
-        used=True,
-    )
-
-def reverse(apps, schema_editor):
-    DocUrlTagName = apps.get_model('name', 'DocUrlTagName')
-    auth48_tag = DocUrlTagName.objects.get(slug='auth48')
-    auth48_tag.delete()
-
-class Migration(migrations.Migration):
-    """Add DocUrlTagName entry for RFC Ed Auth48 URL"""
-    dependencies = [
-        ('name', '0012_role_name_robots'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0013_narrativeminutes.py b/ietf/name/migrations/0013_narrativeminutes.py
new file mode 100644
index 0000000000..89aa75a371
--- /dev/null
+++ b/ietf/name/migrations/0013_narrativeminutes.py
@@ -0,0 +1,35 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations, models
+
+
+def forward(apps, schema_editor):
+    DocTypeName = apps.get_model("name", "DocTypeName")
+    DocTypeName.objects.create(
+        slug="narrativeminutes",
+        name="Narrative Minutes",
+        desc="",
+        used=True,
+        order=0,
+        prefix="narrative-minutes",
+    )
+
+
+def reverse(apps, schema_editor):
+    DocTypeName = apps.get_model("name", "DocTypeName")
+    DocTypeName.objects.filter(slug="narrativeminutes").delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0012_adjust_important_dates"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="doctypename",
+            name="prefix",
+            field=models.CharField(default="", max_length=32),
+        ),
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/name/migrations/0014_change_legacy_stream_desc.py b/ietf/name/migrations/0014_change_legacy_stream_desc.py
new file mode 100644
index 0000000000..8297e86274
--- /dev/null
+++ b/ietf/name/migrations/0014_change_legacy_stream_desc.py
@@ -0,0 +1,21 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    StreamName = apps.get_model("name", "StreamName")
+    StreamName.objects.filter(pk="legacy").update(desc="Legacy")
+
+def reverse(apps, schema_editor):
+    StreamName = apps.get_model("name", "StreamName")
+    StreamName.objects.filter(pk="legacy").update(desc="Legacy stream")
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("name", "0013_narrativeminutes"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]
diff --git a/ietf/name/migrations/0014_extres.py b/ietf/name/migrations/0014_extres.py
deleted file mode 100644
index 576a98ea36..0000000000
--- a/ietf/name/migrations/0014_extres.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-03-19 13:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0013_add_auth48_docurltagname'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ExtResourceName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-        migrations.CreateModel(
-            name='ExtResourceTypeName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-        migrations.AddField(
-            model_name='extresourcename',
-            name='type',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceTypeName'),
-        ),
-    ]
diff --git a/ietf/name/migrations/0015_last_call_name.py b/ietf/name/migrations/0015_last_call_name.py
new file mode 100644
index 0000000000..ac210a274f
--- /dev/null
+++ b/ietf/name/migrations/0015_last_call_name.py
@@ -0,0 +1,22 @@
+# Copyright 2025, IETF Trust
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    ReviewTypeName = apps.get_model("name", "ReviewTypeName")
+    ReviewTypeName.objects.filter(slug="lc").update(name="IETF Last Call")
+
+def reverse(apps, schema_editor):
+    ReviewTypeName = apps.get_model("name", "ReviewTypeName")
+    ReviewTypeName.objects.filter(slug="lc").update(name="Last Call")
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("name", "0014_change_legacy_stream_desc"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]
diff --git a/ietf/name/migrations/0015_populate_extres.py b/ietf/name/migrations/0015_populate_extres.py
deleted file mode 100644
index 64a6bf08ae..0000000000
--- a/ietf/name/migrations/0015_populate_extres.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-03-19 11:42
-from __future__ import unicode_literals
-
-from collections import namedtuple
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    ExtResourceName = apps.get_model('name','ExtResourceName')
-    ExtResourceTypeName = apps.get_model('name','ExtResourceTypeName')
-
-    ExtResourceTypeName.objects.create(slug='email', name="Email address", desc="Email address", used=True, order=0)
-    ExtResourceTypeName.objects.create(slug='url', name="URL", desc="URL", used=True, order=0)
-    ExtResourceTypeName.objects.create(slug='string', name="string", desc="string", used=True, order=0)
-
-    resourcename = namedtuple('resourcename', ['slug', 'name', 'type'])
-    resourcenames= [
-        resourcename("webpage", "Additional Web Page", "url"),
-        resourcename("faq", "Frequently Asked Questions", "url"),
-        resourcename("github_username","GitHub Username", "string"),
-        resourcename("github_org","GitHub Organization", "url"),
-        resourcename("github_repo","GitHub Repository", "url"),
-        resourcename("gitlab_username","GitLab Username", "string"),
-        resourcename("tracker","Issuer Tracker", "url"),
-        resourcename("slack","Slack Channel", "url"),
-        resourcename("wiki","Wiki", "url"),
-        resourcename("yc_entry","Yang Catalog Entry", "url"),
-        resourcename("yc_impact","Yang Impact Analysis", "url"),
-        resourcename("jabber_room","Jabber Room", "url"),
-        resourcename("jabber_log","Jabber Log", "url"),
-        resourcename("mailing_list","Mailing List", "url"),
-        resourcename("mailing_list_archive","Mailing List Archive","url"),
-        resourcename("repo","Other Repository", "url")
-    ]
-
-    for name in resourcenames:
-        ExtResourceName.objects.create(slug=name.slug, name=name.name, desc=name.name, used=True, order=0, type_id=name.type)
-
-
-
-def reverse(apps, schema_editor):
-    ExtResourceName = apps.get_model('name','ExtResourceName')
-    ExtResourceTypeName = apps.get_model('name','ExtResourceTypeName')
-
-    ExtResourceName.objects.all().delete()
-    ExtResourceTypeName.objects.all().delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0014_extres'),
-        ('group', '0033_extres'),
-        ('doc', '0034_extres'),
-        ('person', '0015_extres'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0016_add_research_area_groups.py b/ietf/name/migrations/0016_add_research_area_groups.py
deleted file mode 100644
index 79ab86d40d..0000000000
--- a/ietf/name/migrations/0016_add_research_area_groups.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 2.2.14 on 2020-07-28 09:29
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    GroupTypeName = apps.get_model('name','GroupTypeName')
-    GroupTypeName.objects.create(
-        slug = 'rag',
-        name = 'RAG',
-        desc = 'Research Area Group',
-        used = True,
-        order = 0,
-        verbose_name='Research Area Group'
-    )
-
-def reverse(apps, schema_editor):
-    GroupTypeName = apps.get_model('name','GroupTypeName')
-    GroupTypeName.objects.filter(slug='rag').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0015_populate_extres'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-    ]
diff --git a/ietf/name/migrations/0016_attendancetypename_registrationtickettypename.py b/ietf/name/migrations/0016_attendancetypename_registrationtickettypename.py
new file mode 100644
index 0000000000..9376d3a4c6
--- /dev/null
+++ b/ietf/name/migrations/0016_attendancetypename_registrationtickettypename.py
@@ -0,0 +1,47 @@
+# Generated by Django 4.2.17 on 2025-01-02 18:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("name", "0015_last_call_name"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="AttendanceTypeName",
+            fields=[
+                (
+                    "slug",
+                    models.CharField(max_length=32, primary_key=True, serialize=False),
+                ),
+                ("name", models.CharField(max_length=255)),
+                ("desc", models.TextField(blank=True)),
+                ("used", models.BooleanField(default=True)),
+                ("order", models.IntegerField(default=0)),
+            ],
+            options={
+                "ordering": ["order", "name"],
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="RegistrationTicketTypeName",
+            fields=[
+                (
+                    "slug",
+                    models.CharField(max_length=32, primary_key=True, serialize=False),
+                ),
+                ("name", models.CharField(max_length=255)),
+                ("desc", models.TextField(blank=True)),
+                ("used", models.BooleanField(default=True)),
+                ("order", models.IntegerField(default=0)),
+            ],
+            options={
+                "ordering": ["order", "name"],
+                "abstract": False,
+            },
+        ),
+    ]
diff --git a/ietf/name/migrations/0017_populate_new_reg_names.py b/ietf/name/migrations/0017_populate_new_reg_names.py
new file mode 100644
index 0000000000..51954885c0
--- /dev/null
+++ b/ietf/name/migrations/0017_populate_new_reg_names.py
@@ -0,0 +1,39 @@
+# Generated by Django 4.2.17 on 2025-01-02 18:26
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    AttendanceTypeName = apps.get_model('name', 'AttendanceTypeName')
+    RegistrationTicketTypeName = apps.get_model('name', 'RegistrationTicketTypeName')
+    AttendanceTypeName.objects.create(slug='onsite', name='Onsite')
+    AttendanceTypeName.objects.create(slug='remote', name='Remote')
+    AttendanceTypeName.objects.create(slug='hackathon_onsite', name='Hackathon Onsite')
+    AttendanceTypeName.objects.create(slug='hackathon_remote', name='Hackathon Remote')
+    AttendanceTypeName.objects.create(slug='anrw_onsite', name='ANRW Onsite')
+    AttendanceTypeName.objects.create(slug='unknown', name='Unknown')
+    RegistrationTicketTypeName.objects.create(slug='week_pass', name='Week Pass')
+    RegistrationTicketTypeName.objects.create(slug='one_day', name='One Day')
+    RegistrationTicketTypeName.objects.create(slug='student', name='Student')
+    RegistrationTicketTypeName.objects.create(slug='hackathon_only', name='Hackathon Only')
+    RegistrationTicketTypeName.objects.create(slug='hackathon_combo', name='Hackathon Combo')
+    RegistrationTicketTypeName.objects.create(slug='anrw_only', name='ANRW Only')
+    RegistrationTicketTypeName.objects.create(slug='anrw_combo', name='ANRW Combo')
+    RegistrationTicketTypeName.objects.create(slug='unknown', name='Unknown')
+
+
+def reverse(apps, schema_editor):
+    AttendanceTypeName = apps.get_model('name', 'AttendanceTypeName')
+    RegistrationTicketTypeName = apps.get_model('name', 'RegistrationTicketTypeName')
+    AttendanceTypeName.objects.delete()
+    RegistrationTicketTypeName.objects.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("name", "0016_attendancetypename_registrationtickettypename"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/name/migrations/0017_update_constraintname_order_and_label.py b/ietf/name/migrations/0017_update_constraintname_order_and_label.py
deleted file mode 100644
index 3b552baf61..0000000000
--- a/ietf/name/migrations/0017_update_constraintname_order_and_label.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('name', '0016_add_research_area_groups'),
-    ]
-
-    def update_editor_labels(apps, schema_editor):
-        ConstraintName = apps.get_model('name', 'ConstraintName')
-        for cn in ConstraintName.objects.all():
-            cn.editor_label = {
-                'bethere': "<i class=\"bi bi-person\"></i>{count}",
-                'wg_adjacent': "<i class=\"bi bi-skip-end\"></i>",
-                'conflict': "<span class=\"encircled\">1</span>",
-                'conflic2': "<span class=\"encircled\">2</span>",
-                'conflic3': "<span class=\"encircled\">3</span>",
-                'time_relation': "&Delta;",
-                'timerange': "<i class=\"bi bi-calendar\"></i>",
-            }.get(cn.slug, cn.editor_label)
-
-            cn.order = {
-                'conflict': 1,
-                'conflic2': 2,
-                'conflic3': 3,
-                'bethere': 4,
-                'timerange': 5,
-                'time_relation': 6,
-                'wg_adjacent': 7,
-            }.get(cn.slug, cn.order)
-
-            cn.save()
-
-    def noop(apps, schema_editor):
-        pass
-
-    operations = [
-        migrations.AlterField(
-            model_name='constraintname',
-            name='editor_label',
-            field=models.CharField(blank=True, help_text='Very short label for producing warnings inline in the sessions in the schedule editor.', max_length=64),
-        ),
-        migrations.RunPython(update_editor_labels, noop, elidable=True),
-    ]
diff --git a/ietf/name/migrations/0018_alter_rolenames.py b/ietf/name/migrations/0018_alter_rolenames.py
new file mode 100644
index 0000000000..f931de2e97
--- /dev/null
+++ b/ietf/name/migrations/0018_alter_rolenames.py
@@ -0,0 +1,36 @@
+# Copyright The IETF Trust 2025, All Rights Reserved# Generated by Django 4.2.21 on 2025-05-30 16:35
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    RoleName = apps.get_model("name", "RoleName")
+    RoleName.objects.filter(slug__in=["liaison_contact", "liaison_cc_contact"]).update(
+        used=False
+    )
+    RoleName.objects.get_or_create(
+        slug="liaison_coordinator",
+        defaults={
+            "name": "Liaison Coordinator",
+            "desc": "Coordinates liaison handling for the IAB",
+            "order": 14,
+        },
+    )
+    RoleName.objects.filter(slug__contains="trac-").update(used=False)
+
+
+def reverse(apps, schema_editor):
+    RoleName = apps.get_model("name", "RoleName")
+    RoleName.objects.filter(slug__in=["liaison_contact", "liaison_cc_contact"]).update(
+        used=True
+    )
+    RoleName.objects.filter(slug="liaison_coordinator").delete()
+    # Intentionally not restoring trac-* RoleNames to used=True
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0017_populate_new_reg_names"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/name/migrations/0018_slidesubmissionstatusname.py b/ietf/name/migrations/0018_slidesubmissionstatusname.py
deleted file mode 100644
index b0f1e18e4d..0000000000
--- a/ietf/name/migrations/0018_slidesubmissionstatusname.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated by Django 2.2.14 on 2020-08-03 11:53
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0017_update_constraintname_order_and_label'),
-    ]
-
-    def forward(apps, schema_editor):
-        SlideSubmissionStatusName = apps.get_model('name', 'SlideSubmissionStatusName')
-        slide_submission_status_names = [
-            ('pending', 'Pending'),
-            ('approved', 'Approved'),
-            ('rejected', 'Rejected'),
-        ]
-        for order, (slug, desc) in enumerate(slide_submission_status_names):
-            SlideSubmissionStatusName.objects.create(slug=slug, name=slug, desc=desc, used=True, order=order)
-
-
-    def reverse(apps, schema_editor):
-        pass
-
-    operations = [
-        migrations.CreateModel(
-            name='SlideSubmissionStatusName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0019_add_timeslottypename_private.py b/ietf/name/migrations/0019_add_timeslottypename_private.py
deleted file mode 100644
index f515769aa6..0000000000
--- a/ietf/name/migrations/0019_add_timeslottypename_private.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generated by Django 2.2.15 on 2020-08-20 02:40
-
-from django.db import migrations, models
-
-def set_private_bit_on_timeslottypename(apps, schema_editor):
-    TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
-
-    TimeSlotTypeName.objects.filter(slug__in=['lead', 'offagenda']).update(private=True)
-
-def noop(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0018_slidesubmissionstatusname'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='timeslottypename',
-            name='private',
-            field=models.BooleanField(default=False, help_text='Whether sessions of this type should be kept off the public agenda'),
-        ),
-        migrations.RunPython(set_private_bit_on_timeslottypename, noop),
-    ]
diff --git a/ietf/name/migrations/0019_alter_sessionpurposename_timeslot_types.py b/ietf/name/migrations/0019_alter_sessionpurposename_timeslot_types.py
new file mode 100644
index 0000000000..a0ca81836d
--- /dev/null
+++ b/ietf/name/migrations/0019_alter_sessionpurposename_timeslot_types.py
@@ -0,0 +1,27 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+import ietf.utils.validators
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("name", "0018_alter_rolenames"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sessionpurposename",
+            name="timeslot_types",
+            field=models.JSONField(
+                default=list,
+                help_text="Allowed TimeSlotTypeNames",
+                max_length=256,
+                validators=[
+                    ietf.utils.validators.JSONForeignKeyListValidator(
+                        "name.TimeSlotTypeName"
+                    )
+                ],
+            ),
+        ),
+    ]
diff --git a/ietf/name/migrations/0020_add_rescheduled_session_name.py b/ietf/name/migrations/0020_add_rescheduled_session_name.py
deleted file mode 100644
index d86c5237fc..0000000000
--- a/ietf/name/migrations/0020_add_rescheduled_session_name.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0019_add_timeslottypename_private'),
-    ]
-
-    def add_rescheduled_session_status_name(apps, schema_editor):
-        SessionStatusName = apps.get_model('name', 'SessionStatusName')
-        SessionStatusName.objects.get_or_create(
-            slug='resched',
-            name="Rescheduled",
-        )
-
-    def noop(apps, schema_editor):
-        pass
-
-    operations = [
-        migrations.RunPython(add_rescheduled_session_status_name, noop, elidable=True),
-    ]
diff --git a/ietf/name/migrations/0021_add_ad_appr_draftsubmissionstatename.py b/ietf/name/migrations/0021_add_ad_appr_draftsubmissionstatename.py
deleted file mode 100644
index 825c93e6a0..0000000000
--- a/ietf/name/migrations/0021_add_ad_appr_draftsubmissionstatename.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-18 07:41
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0020_add_rescheduled_session_name'),
-    ]
-
-    def up(apps, schema_editor):
-        DraftSubmissionStateName = apps.get_model('name', 'DraftSubmissionStateName')
-        new_state_name = DraftSubmissionStateName.objects.create(
-            slug='ad-appr',
-            name='Awaiting AD Approval', 
-            used=True,
-        )
-        new_state_name.next_states.add(DraftSubmissionStateName.objects.get(slug='posted'))
-        new_state_name.next_states.add(DraftSubmissionStateName.objects.get(slug='cancel'))
-        DraftSubmissionStateName.objects.get(slug='uploaded').next_states.add(new_state_name)
-
-        # Order so the '-appr' states are together
-        for slug, order in (
-            ('confirmed', 0),
-            ('uploaded', 1),
-            ('auth', 2),
-            ('aut-appr', 3),
-            ('grp-appr', 4),
-            ('ad-appr', 5),
-            ('manual', 6),
-            ('cancel', 7),
-            ('posted', 8),
-            ('waiting-for-draft', 9),
-        ):
-            state_name = DraftSubmissionStateName.objects.get(slug=slug)
-            state_name.order = order
-            state_name.save()
-
-    def down(apps, schema_editor):
-        DraftSubmissionStateName = apps.get_model('name', 'DraftSubmissionStateName')
-        Submission = apps.get_model('submit', 'Submission')
-        
-        name_to_delete = DraftSubmissionStateName.objects.get(slug='ad-appr')
-        
-        # Refuse to migrate if there are any Submissions using the state we're about to remove
-        assert(Submission.objects.filter(state=name_to_delete).count() == 0)
-        
-        DraftSubmissionStateName.objects.get(slug='uploaded').next_states.remove(name_to_delete)
-        name_to_delete.delete()
-
-        # restore original order
-        for slug, order in (
-            ('confirmed', 0),
-            ('uploaded', 1),
-            ('auth', 2),
-            ('aut-appr', 3),
-            ('grp-appr', 4),
-            ('manual', 5),
-            ('cancel', 6),
-            ('posted', 7),
-            ('waiting-for-draft', 8),
-        ):
-            state_name = DraftSubmissionStateName.objects.get(slug=slug)
-            state_name.order = order
-            state_name.save()
-
-    operations = [
-        migrations.RunPython(up, down),
-    ]
diff --git a/ietf/name/migrations/0022_add_liaison_contact_rolenames.py b/ietf/name/migrations/0022_add_liaison_contact_rolenames.py
deleted file mode 100644
index e5edb23998..0000000000
--- a/ietf/name/migrations/0022_add_liaison_contact_rolenames.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Generated by Django 2.2.17 on 2020-12-09 07:02
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    """Perform forward migration
-    
-    Adds RoleNames for liaison contacts
-    """
-    RoleName = apps.get_model('name', 'RoleName')
-    RoleName.objects.create(
-        slug='liaison_contact',
-        name='Liaison Contact',
-    )
-    RoleName.objects.create(
-        slug='liaison_cc_contact',
-        name='Liaison CC Contact',
-    )
-    
-
-def reverse(apps, schema_editor):
-    """Perform reverse migration
-    
-    Removes RoleNames for liaison contacts
-    """
-    RoleName = apps.get_model('name', 'RoleName')
-    RoleName.objects.filter(
-        slug__in=['liaison_contact', 'liaison_cc_contact']
-    ).delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0021_add_ad_appr_draftsubmissionstatename'),
-        ('group', '0040_lengthen_used_roles_fields'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0023_change_stream_descriptions.py b/ietf/name/migrations/0023_change_stream_descriptions.py
deleted file mode 100644
index e6e578e229..0000000000
--- a/ietf/name/migrations/0023_change_stream_descriptions.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright The IETF Trust 2019-2021, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    # Change the StreamName descriptions to match what appears in modern RFCs
-    StreamName = apps.get_model('name', 'StreamName')
-    for streamName in StreamName.objects.all():
-        if streamName.name == "IETF":
-            streamName.desc = "Internent Engineering Task Force (IETF)"
-        elif streamName.name == "IRTF":
-            streamName.desc = "Internet Research Task Force (IRTF)"
-        elif streamName.name == "IAB":
-            streamName.desc = "Internet Architecture Board (IAB)"
-        elif streamName.name == "ISE":
-            streamName.desc = "Independent Submission"
-        streamName.save()
-
-
-def reverse(apps, schema_editor):
-    StreamName = apps.get_model('name', 'StreamName')
-    for streamName in StreamName.objects.all():
-        if streamName.name == "IETF":
-            streamName.desc = "IETF stream"
-        elif streamName.name == "IRTF":
-            streamName.desc = "IRTF Stream"
-        elif streamName.name == "IAB":
-            streamName.desc = "IAB stream"
-        elif streamName.name == "ISE":
-            streamName.desc = "Independent Submission Editor stream"
-        streamName.save()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0022_add_liaison_contact_rolenames'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-
-    ]
-
diff --git a/ietf/name/migrations/0024_constraintname_is_group_conflict.py b/ietf/name/migrations/0024_constraintname_is_group_conflict.py
deleted file mode 100644
index 47810c6da0..0000000000
--- a/ietf/name/migrations/0024_constraintname_is_group_conflict.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-19 09:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('name', '0023_change_stream_descriptions'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='constraintname',
-            name='is_group_conflict',
-            field=models.BooleanField(default=False,
-                                      help_text='Does this constraint capture a conflict between groups?'),
-        ),
-    ]
diff --git a/ietf/name/migrations/0025_set_constraintname_is_group_conflict.py b/ietf/name/migrations/0025_set_constraintname_is_group_conflict.py
deleted file mode 100644
index 86deb9bd2d..0000000000
--- a/ietf/name/migrations/0025_set_constraintname_is_group_conflict.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-19 09:55
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    """Set is_group_conflict for ConstraintNames that need it to be True"""
-    ConstraintName = apps.get_model('name', 'ConstraintName')
-    ConstraintName.objects.filter(
-        slug__in=['conflict', 'conflic2', 'conflic3']
-    ).update(is_group_conflict=True)
-
-
-def reverse(apps, schema_editor):
-    pass  # nothing to be done
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('name', '0024_constraintname_is_group_conflict'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0026_add_conflict_constraintnames.py b/ietf/name/migrations/0026_add_conflict_constraintnames.py
deleted file mode 100644
index d404e2cf30..0000000000
--- a/ietf/name/migrations/0026_add_conflict_constraintnames.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Generated by Django 2.2.20 on 2021-05-05 10:05
-
-from collections import namedtuple
-from django.db import migrations
-from django.db.models import Max
-
-
-# Simple type for representing constraint name data that will be
-# modified.
-ConstraintInfo = namedtuple(
-    'ConstraintInfo',
-    ['replaces', 'slug', 'name', 'desc', 'editor_label'],
-)
-
-constraint_names_to_add = [
-    ConstraintInfo(
-        replaces='conflict',
-        slug='chair_conflict',
-        name='Chair conflict',
-        desc='Indicates other WGs the chairs also lead or will be active participants in',
-        editor_label='<i class="bi bi-person-plus"></i>',
-    ),
-    ConstraintInfo(
-        replaces='conflic2',
-        slug='tech_overlap',
-        name='Technology overlap',
-        desc='Indicates WGs with a related technology or a closely related charter',
-        editor_label='<i class="bi bi-link"></i>',
-    ),
-    ConstraintInfo(
-        replaces='conflic3',
-        slug='key_participant',
-        name='Key participant conflict',
-        desc='Indicates WGs with which key participants (presenter, secretary, etc.)  may overlap',
-        editor_label='<i class="bi bi-key"></i>',
-    )
-]
-
-
-def forward(apps, schema_editor):
-    ConstraintName = apps.get_model('name', 'ConstraintName')
-    max_order = ConstraintName.objects.all().aggregate(Max('order'))['order__max']
-
-    for index, new_constraint in enumerate(constraint_names_to_add):
-        # hack_constraint is the constraint type relabeled by the hack fix in #2754
-        hack_constraint = ConstraintName.objects.get(slug=new_constraint.replaces)
-        ConstraintName.objects.create(
-            slug=new_constraint.slug,
-            name=new_constraint.name,
-            desc=new_constraint.desc,
-            used=hack_constraint.used,
-            order=max_order + index + 1,
-            penalty=hack_constraint.penalty,
-            editor_label=new_constraint.editor_label,
-            is_group_conflict=True,
-        )
-
-
-def reverse(apps, schema_editor):
-    ConstraintName = apps.get_model('name', 'ConstraintName')
-    for new_constraint in constraint_names_to_add:
-        ConstraintName.objects.filter(slug=new_constraint.slug).delete()
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('name', '0025_set_constraintname_is_group_conflict'),
-        # Reversing this migration requires that the 'day' field be removed from
-        # the Constraint model, so we indirectly depend on the migration that
-        # removed it.
-        ('meeting', '0027_add_constraint_options_and_joint_groups'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
\ No newline at end of file
diff --git a/ietf/name/migrations/0027_add_bofrequest.py b/ietf/name/migrations/0027_add_bofrequest.py
deleted file mode 100644
index c4e31bb2db..0000000000
--- a/ietf/name/migrations/0027_add_bofrequest.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.23 on 2021-05-21 12:48
-
-from django.db import migrations
-
-def forward(apps,schema_editor):
-    DocTypeName = apps.get_model('name','DocTypeName')
-    DocTypeName.objects.create(prefix='bofreq', slug='bofreq', name="BOF Request", desc="", used=True, order=0)
-
-def reverse(apps,schema_editor):
-    DocTypeName = apps.get_model('name','DocTypeName')
-    DocTypeName.objects.filter(slug='bofreq').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0026_add_conflict_constraintnames'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0028_iabasg.py b/ietf/name/migrations/0028_iabasg.py
deleted file mode 100644
index f339341ea9..0000000000
--- a/ietf/name/migrations/0028_iabasg.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    GroupTypeName.objects.create(slug='iabasg', name='IAB ASG', verbose_name='IAB Administrative Support Group', desc='')
-
-def reverse(apps, schema_editor):
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    GroupTypeName.objects.filter(slug='iabasg').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0027_add_bofrequest'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0029_proceedingsmaterialtypename.py b/ietf/name/migrations/0029_proceedingsmaterialtypename.py
deleted file mode 100644
index 97606c17b3..0000000000
--- a/ietf/name/migrations/0029_proceedingsmaterialtypename.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.24 on 2021-07-26 16:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0028_iabasg'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ProceedingsMaterialTypeName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-    ]
diff --git a/ietf/name/migrations/0030_populate_proceedingsmaterialtypename.py b/ietf/name/migrations/0030_populate_proceedingsmaterialtypename.py
deleted file mode 100644
index 3e3936a50d..0000000000
--- a/ietf/name/migrations/0030_populate_proceedingsmaterialtypename.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.24 on 2021-07-26 16:55
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    ProceedingsMaterialTypeName = apps.get_model('name', 'ProceedingsMaterialTypeName')
-    names = [
-        {'slug': 'supporters', 'name': 'Sponsors and Supporters', 'desc': 'Sponsors and supporters', 'order': 0},
-        {'slug': 'host_speaker_series', 'name': 'Host Speaker Series', 'desc': 'Host speaker series', 'order': 1},
-        {'slug': 'social_event', 'name': 'Social Event', 'desc': 'Social event', 'order': 2},
-        {'slug': 'wiki', 'name': 'Meeting Wiki', 'desc': 'Meeting wiki', 'order': 3},
-        {'slug': 'additional_information', 'name': 'Additional Information', 'desc': 'Any other materials', 'order': 4},
-    ]
-    for name in names:
-        ProceedingsMaterialTypeName.objects.create(used=True, **name)
-
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0029_proceedingsmaterialtypename'),
-        ('meeting', '0046_meetinghost'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0031_add_procmaterials.py b/ietf/name/migrations/0031_add_procmaterials.py
deleted file mode 100644
index 3ceb575a99..0000000000
--- a/ietf/name/migrations/0031_add_procmaterials.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.24 on 2021-07-27 08:04
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    DocTypeName = apps.get_model('name', 'DocTypeName')
-    DocTypeName.objects.create(
-        prefix='proc-materials',
-        slug='procmaterials',
-        name="Proceedings Materials",
-        desc="",
-        used=True,
-        order=0
-    )
-
-
-def reverse(apps, schema_editor):
-    DocTypeName = apps.get_model('name', 'DocTypeName')
-    DocTypeName.objects.filter(slug='procmaterials').delete()
-
-
-class Migration(migrations.Migration):
-    # Most of these dependencies are needed to permit the reverse migration
-    # to work. Without them Django does not replay enough migrations and during
-    # migration believes that there are foreign key references to the old
-    # PK (name)  on the Document model.
-    dependencies = [
-        ('doc', '0043_bofreq_docevents'),
-        ('group', '0044_populate_groupfeatures_parent_type_fields'),
-        ('liaisons', '0006_document_primary_key_cleanup'),
-        ('meeting', '0018_document_primary_key_cleanup'),
-        ('name', '0030_populate_proceedingsmaterialtypename'),
-        ('review', '0014_document_primary_key_cleanup'),
-        ('submit', '0008_submissionextresource'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0032_agendafiltertypename.py b/ietf/name/migrations/0032_agendafiltertypename.py
deleted file mode 100644
index 6c6fa4eab2..0000000000
--- a/ietf/name/migrations/0032_agendafiltertypename.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 2.2.19 on 2021-04-02 12:03
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0031_add_procmaterials'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AgendaFilterTypeName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-    ]
diff --git a/ietf/name/migrations/0033_populate_agendafiltertypename.py b/ietf/name/migrations/0033_populate_agendafiltertypename.py
deleted file mode 100644
index 9f450ca24d..0000000000
--- a/ietf/name/migrations/0033_populate_agendafiltertypename.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 2.2.20 on 2021-04-20 13:56
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    AgendaFilterTypeName = apps.get_model('name', 'AgendaFilterTypeName')
-    names = (
-        ('none', 'None', 'Not used except for a timeslot-type column (e.g., officehours)'),
-        ('normal', 'Normal', 'Non-heading filter button'),
-        ('heading', 'Heading', 'Column heading button'),
-        ('special', 'Special', 'Button in the catch-all column'),
-    )
-    for order, (slug, name, desc) in enumerate(names):
-        AgendaFilterTypeName.objects.get_or_create(
-            slug=slug,
-            defaults=dict(name=name, desc=desc, order=order, used=True)
-        )
-
-
-def reverse(apps, schema_editor):
-    pass  # nothing to do, model about to be destroyed anyway
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0032_agendafiltertypename'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0034_sessionpurposename.py b/ietf/name/migrations/0034_sessionpurposename.py
deleted file mode 100644
index ca22e1a155..0000000000
--- a/ietf/name/migrations/0034_sessionpurposename.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.24 on 2021-09-16 09:42
-
-from django.db import migrations, models
-import ietf.name.models
-import jsonfield
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0033_populate_agendafiltertypename'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SessionPurposeName',
-            fields=[
-                ('slug', models.CharField(max_length=32, primary_key=True, serialize=False)),
-                ('name', models.CharField(max_length=255)),
-                ('desc', models.TextField(blank=True)),
-                ('used', models.BooleanField(default=True)),
-                ('order', models.IntegerField(default=0)),
-                ('timeslot_types', jsonfield.fields.JSONField(default=[], help_text='Allowed TimeSlotTypeNames', max_length=256, validators=[ietf.name.models.JSONForeignKeyListValidator('name.TimeSlotTypeName')])),
-                ('on_agenda', models.BooleanField(default=True, help_text='Are sessions of this purpose visible on the agenda by default?')),
-            ],
-            options={
-                'ordering': ['order', 'name'],
-                'abstract': False,
-            },
-        ),
-    ]
diff --git a/ietf/name/migrations/0035_populate_sessionpurposename.py b/ietf/name/migrations/0035_populate_sessionpurposename.py
deleted file mode 100644
index 8af7d60d1e..0000000000
--- a/ietf/name/migrations/0035_populate_sessionpurposename.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-
-# Generated by Django 2.2.24 on 2021-09-16 09:42
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    SessionPurposeName = apps.get_model('name', 'SessionPurposeName')
-    TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
-
-    for order, (slug, name, desc, tstypes, on_agenda, used) in enumerate((
-            ('none', 'None', 'Value not set (do not use for new sessions)', [], True, False),
-            ('regular', 'Regular', 'Regular group session', ['regular'], True, True),
-            ('tutorial', 'Tutorial', 'Tutorial or training session', ['other'], True, True),
-            ('officehours', 'Office hours', 'Office hours session', ['other'], True, True),
-            ('coding', 'Coding', 'Coding session', ['other'], True, True),
-            ('admin', 'Administrative', 'Meeting administration', ['other', 'reg'], True, True),
-            ('social', 'Social', 'Social event or activity', ['break', 'other'], True, True),
-            ('plenary', 'Plenary', 'Plenary session', ['plenary'], True, True),
-            ('presentation', 'Presentation', 'Presentation session', ['other', 'regular'], True, True),
-            ('open_meeting', 'Open meeting', 'Open meeting', ['other'], True, True),
-            ('closed_meeting', 'Closed meeting', 'Closed meeting', ['other', 'regular'], False, True),
-    )):
-        # verify that we're not about to use an invalid type
-        for ts_type in tstypes:
-            TimeSlotTypeName.objects.get(pk=ts_type)  # throws an exception unless exists
-
-        SessionPurposeName.objects.create(
-            slug=slug,
-            name=name,
-            desc=desc,
-            used=used,
-            order=order,
-            timeslot_types = tstypes,
-            on_agenda=on_agenda,
-        )
-
-
-def reverse(apps, schema_editor):
-    SessionPurposeName = apps.get_model('name', 'SessionPurposeName')
-    SessionPurposeName.objects.all().delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0034_sessionpurposename'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0036_depopulate_timeslottypename_private.py b/ietf/name/migrations/0036_depopulate_timeslottypename_private.py
deleted file mode 100644
index 352ab8d582..0000000000
--- a/ietf/name/migrations/0036_depopulate_timeslottypename_private.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-25 16:58
-
-from django.db import migrations
-
-
-PRIVATE_TIMESLOT_SLUGS = {'lead', 'offagenda'}  # from DB 2021 Oct
-
-
-def forward(apps, schema_editor):
-    TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
-    slugs = TimeSlotTypeName.objects.filter(private=True).values_list('slug', flat=True)
-    if set(slugs) != PRIVATE_TIMESLOT_SLUGS:
-        # the reverse migration will not restore the database, refuse to migrate
-        raise ValueError('Disagreement between migration data and database')
-
-
-def reverse(apps, schema_editor):
-    TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
-    TimeSlotTypeName.objects.filter(slug__in=PRIVATE_TIMESLOT_SLUGS).update(private=True)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0035_populate_sessionpurposename'),
-        ('meeting', '0051_populate_session_on_agenda'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0037_remove_timeslottypename_private.py b/ietf/name/migrations/0037_remove_timeslottypename_private.py
deleted file mode 100644
index 2a86780564..0000000000
--- a/ietf/name/migrations/0037_remove_timeslottypename_private.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-25 17:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0036_depopulate_timeslottypename_private'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='timeslottypename',
-            name='private',
-        ),
-    ]
diff --git a/ietf/name/migrations/0038_disuse_offagenda_and_reserved.py b/ietf/name/migrations/0038_disuse_offagenda_and_reserved.py
deleted file mode 100644
index be0b507bde..0000000000
--- a/ietf/name/migrations/0038_disuse_offagenda_and_reserved.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-29 06:44
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
-    TimeSlotTypeName.objects.filter(slug__in=('offagenda', 'reserved')).update(used=False)
-
-
-def reverse(apps, schema_editor):
-    TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
-    TimeSlotTypeName.objects.filter(slug__in=('offagenda', 'reserved')).update(used=True)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0037_remove_timeslottypename_private'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0039_depopulate_constraintname_editor_label.py b/ietf/name/migrations/0039_depopulate_constraintname_editor_label.py
deleted file mode 100644
index 9949002bec..0000000000
--- a/ietf/name/migrations/0039_depopulate_constraintname_editor_label.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated by Django 2.2.27 on 2022-03-11 07:55
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    pass  # nothing to do, row will be dropped
-
-
-def reverse(apps, schema_editor):
-    # Restore data from when this migration was written. Dumped with:
-    # >>> from pprint import pp
-    # >>> from ietf.name.models import ConstraintName
-    # >>> pp(list(ConstraintName.objects.values_list('slug', 'editor_label')))
-    ConstraintName = apps.get_model('name', 'ConstraintName')
-    for slug, editor_label in [
-        ('conflict', '<span class="encircled">1</span>'),
-        ('conflic2', '<span class="encircled">2</span>'),
-        ('conflic3', '<span class="encircled">3</span>'),
-        ('bethere', '<i class="fa fa-user-o"></i>{count}'),
-        ('timerange', '<i class="fa fa-calendar-o"></i>'),
-        ('time_relation', '&Delta;'),
-        ('wg_adjacent', '<i class="fa fa-step-forward"></i>'),
-        ('chair_conflict', '<i class="fa fa-gavel"></i>'),
-        ('tech_overlap', '<i class="fa fa-rocket"></i>'),
-        ('key_participant', '<i class="fa fa-key"></i>'),
-    ]:
-        ConstraintName.objects.filter(slug=slug).update(editor_label=editor_label)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0038_disuse_offagenda_and_reserved'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0040_remove_constraintname_editor_label.py b/ietf/name/migrations/0040_remove_constraintname_editor_label.py
deleted file mode 100644
index 85390c77a6..0000000000
--- a/ietf/name/migrations/0040_remove_constraintname_editor_label.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.27 on 2022-03-11 10:05
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0039_depopulate_constraintname_editor_label'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='constraintname',
-            name='editor_label',
-        ),
-    ]
diff --git a/ietf/name/migrations/0041_update_rfcedtyp.py b/ietf/name/migrations/0041_update_rfcedtyp.py
deleted file mode 100644
index 8ebae6aa11..0000000000
--- a/ietf/name/migrations/0041_update_rfcedtyp.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2022 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    GroupTypeName.objects.filter(slug='rfcedtyp').update(order=2, verbose_name='RFC Editor Group')
-
-def reverse(apps, schema_editor):
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    GroupTypeName.objects.filter(slug='rfcedtyp').update(order=0, verbose_name='The RFC Editor')
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0040_remove_constraintname_editor_label'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse),
-    ]
diff --git a/ietf/name/migrations/0042_editorial_stream.py b/ietf/name/migrations/0042_editorial_stream.py
deleted file mode 100644
index 1b9aaaf076..0000000000
--- a/ietf/name/migrations/0042_editorial_stream.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright The IETF Trust 2022 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    StreamName = apps.get_model('name', 'StreamName')
-    StreamName.objects.create(
-        slug = 'editorial',
-        name = 'Editorial',
-        desc = 'Editorial',
-        used = True,
-        order = 5,
-    )
-    StreamName.objects.filter(slug='legacy').update(order=6)
-
-
-def reverse(apps, schema_editor):
-    StreamName = apps.get_model('name', 'StreamName')
-    StreamName.objects.filter(slug='editorial').delete()
-    StreamName.objects.filter(slug='legacy').update(order=5)
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0041_update_rfcedtyp'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0043_editorial_stream_grouptype.py b/ietf/name/migrations/0043_editorial_stream_grouptype.py
deleted file mode 100644
index 5fe839174f..0000000000
--- a/ietf/name/migrations/0043_editorial_stream_grouptype.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2022 All Rights Reserved
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    GroupTypeName.objects.create(
-        slug = 'editorial',
-        name = 'Editorial',
-        desc = 'Editorial Stream Group',
-        used = True,
-    )
-
-def reverse(apps, schema_editor):
-    GroupTypeName = apps.get_model('name', 'GroupTypeName')
-    GroupTypeName.objects.filter(slug='editorial').delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0042_editorial_stream'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/name/migrations/0044_validating_draftsubmissionstatename.py b/ietf/name/migrations/0044_validating_draftsubmissionstatename.py
deleted file mode 100644
index de82bbeef9..0000000000
--- a/ietf/name/migrations/0044_validating_draftsubmissionstatename.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Generated by Django 2.2.28 on 2022-05-17 11:35
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    DraftSubmissionStateName = apps.get_model('name', 'DraftSubmissionStateName')
-    new_state = DraftSubmissionStateName.objects.create(
-        slug='validating',
-        name='Validating Submitted Draft',
-        desc='Running validation checks on received submission',
-        used=True,
-        order=1 + DraftSubmissionStateName.objects.order_by('-order').first().order,
-    )
-    new_state.next_states.set(
-        DraftSubmissionStateName.objects.filter(
-            slug__in=['cancel', 'uploaded'],
-        )
-    )
-
-
-def reverse(apps, schema_editor):
-    Submission = apps.get_model('submit', 'Submission')
-    # Any submissions in the state we are about to delete would be deleted.
-    # Remove these manually if you really mean to do this.
-    assert Submission.objects.filter(state__slug='validating').count() == 0
-    DraftSubmissionStateName = apps.get_model('name', 'DraftSubmissionStateName')
-    DraftSubmissionStateName.objects.filter(slug='validating').delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0043_editorial_stream_grouptype'),
-        ('submit', '0001_initial'),  # ensure Submission model exists
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/migrations/0045_polls_and_chatlogs.py b/ietf/name/migrations/0045_polls_and_chatlogs.py
deleted file mode 100644
index 1014a9dcef..0000000000
--- a/ietf/name/migrations/0045_polls_and_chatlogs.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    DocTypeName = apps.get_model("name", "DocTypeName")
-    DocTypeName.objects.create(
-        slug = "chatlog",
-        name = "Chat Log",
-        prefix = "chatlog",
-        desc = "",
-        order = 0,
-        used = True,
-    )
-    DocTypeName.objects.create(
-        slug = "polls",
-        name = "Polls",
-        prefix = "polls",
-        desc = "",
-        order = 0,
-        used = True,
-    )
-
-def reverse(apps, schema_editor):
-    DocTypeName = apps.get_model("name", "DocTypeName")
-    DocTypeName.objects.filter(slug__in=("chatlog", "polls")).delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0044_validating_draftsubmissionstatename'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/name/models.py b/ietf/name/models.py
index f0d56523d8..24104c5f45 100644
--- a/ietf/name/models.py
+++ b/ietf/name/models.py
@@ -1,8 +1,6 @@
 # Copyright The IETF Trust 2010-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import jsonfield
-
 from django.db import models
 
 from ietf.utils.models import ForeignKey
@@ -42,8 +40,8 @@ class DocRelationshipName(NameModel):
 
 class DocTypeName(NameModel):
     """Draft, Agenda, Minutes, Charter, Discuss, Guideline, Email,
-    Review, Issue, Wiki"""
-    prefix =  models.CharField(max_length=16, default="")
+    Review, Issue, Wiki, RFC"""
+    prefix =  models.CharField(max_length=32, default="")
 class DocTagName(NameModel):
     """Waiting for Reference, IANA Coordination, Revised ID Needed,
     External Party, AD Followup, Point Raised - Writeup Needed, ..."""
@@ -73,8 +71,8 @@ class SessionStatusName(NameModel):
     """Waiting for Approval, Approved, Waiting for Scheduling, Scheduled, Cancelled, Disapproved"""
 class SessionPurposeName(NameModel):
     """Regular, Tutorial, Office Hours, Coding, Social, Admin"""
-    timeslot_types = jsonfield.JSONField(
-        max_length=256, blank=False, default=[],
+    timeslot_types = models.JSONField(
+        max_length=256, blank=False, default=list,
         help_text='Allowed TimeSlotTypeNames',
         validators=[JSONForeignKeyListValidator('name.TimeSlotTypeName')],
     )
@@ -94,13 +92,14 @@ class NomineePositionStateName(NameModel):
     """Status of a candidate for a position: None, Accepted, Declined"""
 class FeedbackTypeName(NameModel):
     """Type of feedback: questionnaires, nominations, comments"""
+    legend = models.CharField(max_length=1, default="", help_text="One-character legend for feedback classification form")
 class DBTemplateTypeName(NameModel):
     """reStructuredText, Plain, Django"""
 class DraftSubmissionStateName(NameModel):
     """Uploaded, Awaiting Submitter Authentication, Awaiting Approval from
     Previous Version Authors, Awaiting Initial Version Approval, Awaiting
     Manual Post, Cancelled, Posted"""
-    next_states = models.ManyToManyField('DraftSubmissionStateName', related_name="previous_states", blank=True)
+    next_states = models.ManyToManyField('name.DraftSubmissionStateName', related_name="previous_states", blank=True)
 class RoomResourceName(NameModel):
     "Room resources: Audio Stream, Meetecho, . . ."
 class IprDisclosureStateName(NameModel):
@@ -148,3 +147,11 @@ class ExtResourceName(NameModel):
     type = ForeignKey(ExtResourceTypeName)
 class SlideSubmissionStatusName(NameModel):
     "Pending, Accepted, Rejected"
+class TelechatAgendaSectionName(NameModel):
+    """roll_call, minutes, action_items"""
+class AppealArtifactTypeName(NameModel):
+    pass
+class AttendanceTypeName(NameModel):
+    """onsite, remote, hackathon_onsite, hackathon_remote"""
+class RegistrationTicketTypeName(NameModel):
+    """week, one_day, student"""
diff --git a/ietf/name/resources.py b/ietf/name/resources.py
index 764c5e1089..0cb0e41e0b 100644
--- a/ietf/name/resources.py
+++ b/ietf/name/resources.py
@@ -18,7 +18,8 @@
     ReviewAssignmentStateName, ReviewRequestStateName, ReviewResultName, ReviewTypeName,
     RoleName, RoomResourceName, SessionStatusName, StdLevelName, StreamName, TimeSlotTypeName,
     TopicAudienceName, ReviewerQueuePolicyName, TimerangeName, ExtResourceTypeName, ExtResourceName,
-    SlideSubmissionStatusName, ProceedingsMaterialTypeName, SessionPurposeName )
+    SlideSubmissionStatusName, ProceedingsMaterialTypeName, SessionPurposeName, TelechatAgendaSectionName,
+    AppealArtifactTypeName, AttendanceTypeName, RegistrationTicketTypeName )
 
 class TimeSlotTypeNameResource(ModelResource):
     class Meta:
@@ -720,3 +721,64 @@ class Meta:
             "on_agenda": ALL,
         }
 api.name.register(SessionPurposeNameResource())
+
+
+class TelechatAgendaSectionNameResource(ModelResource):
+    class Meta:
+        queryset = TelechatAgendaSectionName.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'telechatagendasectionname'
+        ordering = ['slug', ]
+        filtering = { 
+            "slug": ALL,
+            "name": ALL,
+            "desc": ALL,
+            "used": ALL,
+            "order": ALL,
+        }
+api.name.register(TelechatAgendaSectionNameResource())
+
+class AppealArtifactTypeNameResource(ModelResource):
+    class Meta:
+        cache = SimpleCache()
+        queryset = AppealArtifactTypeName.objects.all()
+        serializer = api.Serializer()
+        filtering = { 
+            "slug": ALL,
+            "name": ALL,
+            "desc": ALL,
+            "used": ALL,
+            "order": ALL,
+        }
+api.name.register(AppealArtifactTypeNameResource())
+
+
+class AttendanceTypeNameResource(ModelResource):
+    class Meta:
+        cache = SimpleCache()
+        queryset = AttendanceTypeName.objects.all()
+        serializer = api.Serializer()
+        filtering = { 
+            "slug": ALL,
+            "name": ALL,
+            "desc": ALL,
+            "used": ALL,
+            "order": ALL,
+        }
+api.name.register(AttendanceTypeNameResource())
+
+
+class RegistrationTicketTypeNameResource(ModelResource):
+    class Meta:
+        cache = SimpleCache()
+        queryset = RegistrationTicketTypeName.objects.all()
+        serializer = api.Serializer()
+        filtering = { 
+            "slug": ALL,
+            "name": ALL,
+            "desc": ALL,
+            "used": ALL,
+            "order": ALL,
+        }
+api.name.register(RegistrationTicketTypeNameResource())
diff --git a/ietf/name/serializers.py b/ietf/name/serializers.py
new file mode 100644
index 0000000000..a764f56051
--- /dev/null
+++ b/ietf/name/serializers.py
@@ -0,0 +1,11 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+"""django-rest-framework serializers"""
+from rest_framework import serializers
+
+from .models import StreamName
+
+
+class StreamNameSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = StreamName
+        fields = ["slug", "name", "desc"]
diff --git a/ietf/nomcom/admin.py b/ietf/nomcom/admin.py
index 4b18cc005c..1675d731a5 100644
--- a/ietf/nomcom/admin.py
+++ b/ietf/nomcom/admin.py
@@ -21,9 +21,9 @@ class NomComAdmin(admin.ModelAdmin):
 admin.site.register(NomCom, NomComAdmin)
 
 class NominationAdmin(admin.ModelAdmin):
-    list_display = ['id', 'position', 'candidate_name', 'candidate_email', 'candidate_phone', 'nominee', 'comments', 'nominator_email', 'user', 'time', 'share_nominator']
+    list_display = ['id', 'position', 'candidate_name', 'candidate_email', 'candidate_phone', 'nominee', 'comments', 'nominator_email', 'person', 'time', 'share_nominator']
     list_filter = ['time', 'share_nominator']
-    raw_id_fields = ['nominee', 'comments', 'user']
+    raw_id_fields = ['nominee', 'comments', 'person']
 admin.site.register(Nomination, NominationAdmin)
 
 class NomineeAdmin(admin.ModelAdmin):
@@ -51,9 +51,9 @@ def nominee(self, obj):
         return ", ".join(n.person.ascii for n in obj.nominees.all())
     nominee.admin_order_field = 'nominees__person__ascii' # type: ignore # https://github.com/python/mypy/issues/2087
 
-    list_display = ['id', 'nomcom', 'author', 'nominee', 'subject', 'type', 'user', 'time']
+    list_display = ['id', 'nomcom', 'author', 'nominee', 'subject', 'type', 'person', 'time']
     list_filter = ['nomcom', 'type', 'time', ]
-    raw_id_fields = ['positions', 'topics', 'user']
+    raw_id_fields = ['positions', 'topics', 'person']
 admin.site.register(Feedback, FeedbackAdmin)
 
 
diff --git a/ietf/nomcom/decorators.py b/ietf/nomcom/decorators.py
index a002f7c7e0..43250bd306 100644
--- a/ietf/nomcom/decorators.py
+++ b/ietf/nomcom/decorators.py
@@ -3,10 +3,11 @@
 
 
 import functools
+from urllib.parse import quote as urlquote
 
 from django.urls import reverse
 from django.http import HttpResponseRedirect
-from django.utils.http import urlquote
+
 
 
 def nomcom_private_key_required(view_func):
diff --git a/ietf/nomcom/factories.py b/ietf/nomcom/factories.py
index 8ef4e07faa..286e0229ab 100644
--- a/ietf/nomcom/factories.py
+++ b/ietf/nomcom/factories.py
@@ -9,7 +9,7 @@
 
 from ietf.nomcom.models import NomCom, Position, Feedback, Nominee, NomineePosition, Nomination, Topic
 from ietf.group.factories import GroupFactory
-from ietf.person.factories import PersonFactory, UserFactory
+from ietf.person.factories import PersonFactory
 
 import debug                            # pyflakes:ignore
 
@@ -66,7 +66,7 @@
 
 def provide_private_key_to_test_client(testcase):
     session = testcase.client.session
-    session['NOMCOM_PRIVATE_KEY_%s'%testcase.nc.year()] = key
+    session['NOMCOM_PRIVATE_KEY_%s'%testcase.nc.year()] = key.decode("utf8")
     session.save()
 
 def nomcom_kwargs_for_year(year=None, *args, **kwargs):
@@ -84,6 +84,7 @@ def nomcom_kwargs_for_year(year=None, *args, **kwargs):
 class NomComFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = NomCom
+        skip_postgeneration_save = True
 
     group = factory.SubFactory(GroupFactory,type_id='nomcom')
 
@@ -167,6 +168,7 @@ class Meta:
 class FeedbackFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Feedback
+        skip_postgeneration_save = True
 
     nomcom = factory.SubFactory(NomComFactory)
     subject = factory.Faker('sentence')
@@ -176,6 +178,7 @@ class Meta:
     def comments(obj, create, extracted, **kwargs):
         comment_text = Faker().paragraph()
         obj.comments = obj.nomcom.encrypt(comment_text)
+        obj.save()
 
 class TopicFactory(factory.django.DjangoModelFactory):
     class Meta:
@@ -196,7 +199,7 @@ class Meta:
     candidate_email = factory.LazyAttribute(lambda obj: obj.nominee.person.email())
     candidate_phone = factory.Faker('phone_number')
     comments = factory.SubFactory(FeedbackFactory)
-    nominator_email = factory.LazyAttribute(lambda obj: obj.user.email)
-    user = factory.SubFactory(UserFactory)
+    nominator_email = factory.LazyAttribute(lambda obj: obj.person.user.email)
+    person = factory.SubFactory(PersonFactory)
     share_nominator = False
     
diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py
index f0b00a485c..5987b22637 100644
--- a/ietf/nomcom/forms.py
+++ b/ietf/nomcom/forms.py
@@ -15,12 +15,13 @@
 from ietf.nomcom.models import ( NomCom, Nomination, Nominee, NomineePosition,
                                  Position, Feedback, ReminderDates, Topic, Volunteer )
 from ietf.nomcom.utils import (NOMINATION_RECEIPT_TEMPLATE, FEEDBACK_RECEIPT_TEMPLATE,
-                               get_user_email, validate_private_key, validate_public_key,
+                               get_person_email, validate_private_key, validate_public_key,
                                make_nomineeposition, make_nomineeposition_for_newperson,
                                create_feedback_email)
 from ietf.person.models import Email
 from ietf.person.fields import (SearchableEmailField, SearchableEmailsField,
                                 SearchablePersonField, SearchablePersonsField )
+from ietf.utils.fields import ModelMultipleChoiceField
 from ietf.utils.mail import send_mail
 from ietf.mailtrigger.utils import gather_address_lists
 
@@ -175,7 +176,7 @@ def clean(self):
         secondary_emails = self.cleaned_data.get("secondary_emails")
         if primary_email and secondary_emails:
             if primary_email in secondary_emails:
-                msg = "Primary and secondary email address must be differents"
+                msg = "Primary and secondary email address must be different"
                 self._errors["primary_email"] = self.error_class([msg])
         return self.cleaned_data
 
@@ -256,7 +257,7 @@ class NominateForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         self.nomcom = kwargs.pop('nomcom', None)
-        self.user = kwargs.pop('user', None)
+        self.person = kwargs.pop('person', None)
         self.public = kwargs.pop('public', None)
 
         super(NominateForm, self).__init__(*args, **kwargs)
@@ -273,7 +274,7 @@ def __init__(self, *args, **kwargs):
 
         if not self.public:
             self.fields.pop('confirmation')
-            author = get_user_email(self.user)
+            author = get_person_email(self.person)
             if author:
                 self.fields['nominator_email'].initial = author.address
                 help_text = """(Nomcom Chair/Member: please fill this in. Use your own email address if the person making the
@@ -303,7 +304,7 @@ def save(self, commit=True):
 
         author = None
         if self.public:
-            author = get_user_email(self.user)
+            author = get_person_email(self.person)
         else:
             if nominator_email:
                 emails = Email.objects.filter(address=nominator_email)
@@ -314,7 +315,7 @@ def save(self, commit=True):
         feedback = Feedback.objects.create(nomcom=self.nomcom,
                                            comments=self.nomcom.encrypt(qualifications),
                                            type=FeedbackTypeName.objects.get(slug='nomina'),
-                                           user=self.user)
+                                           person=self.person)
         feedback.positions.add(position)
         feedback.nominees.add(nominee)
 
@@ -326,7 +327,7 @@ def save(self, commit=True):
         nomination.nominee = nominee
         nomination.comments = feedback
         nomination.share_nominator = share_nominator
-        nomination.user = self.user
+        nomination.person = self.person
 
         if commit:
             nomination.save()
@@ -343,7 +344,7 @@ def save(self, commit=True):
                           'year': self.nomcom.year(),
                       }
                 path = nomcom_template_path + NOMINATION_RECEIPT_TEMPLATE
-                send_mail(None, to_email, from_email, subject, path, context, cc=cc)
+                send_mail(None, to_email, from_email, subject, path, context, cc=cc, copy=False, save=False)
 
         return nomination
 
@@ -361,7 +362,7 @@ class NominateNewPersonForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         self.nomcom = kwargs.pop('nomcom', None)
-        self.user = kwargs.pop('user', None)
+        self.person = kwargs.pop('person', None)
         self.public = kwargs.pop('public', None)
 
         super(NominateNewPersonForm, self).__init__(*args, **kwargs)
@@ -375,7 +376,7 @@ def __init__(self, *args, **kwargs):
 
         if not self.public:
             self.fields.pop('confirmation')
-            author = get_user_email(self.user)
+            author = get_person_email(self.person)
             if author:
                 self.fields['nominator_email'].initial = author.address
                 help_text = """(Nomcom Chair/Member: please fill this in. Use your own email address if the person making the
@@ -416,7 +417,7 @@ def save(self, commit=True):
 
         author = None
         if self.public:
-            author = get_user_email(self.user)
+            author = get_person_email(self.person)
         else:
             if nominator_email:
                 emails = Email.objects.filter(address=nominator_email)
@@ -429,7 +430,7 @@ def save(self, commit=True):
         feedback = Feedback.objects.create(nomcom=self.nomcom,
                                            comments=self.nomcom.encrypt(qualifications),
                                            type=FeedbackTypeName.objects.get(slug='nomina'),
-                                           user=self.user)
+                                           person=self.person)
         feedback.positions.add(position)
         feedback.nominees.add(nominee)
 
@@ -441,7 +442,7 @@ def save(self, commit=True):
         nomination.nominee = nominee
         nomination.comments = feedback
         nomination.share_nominator = share_nominator
-        nomination.user = self.user
+        nomination.person = self.person
 
         if commit:
             nomination.save()
@@ -458,7 +459,7 @@ def save(self, commit=True):
                           'year': self.nomcom.year(),
                       }
                 path = nomcom_template_path + NOMINATION_RECEIPT_TEMPLATE
-                send_mail(None, to_email, from_email, subject, path, context, cc=cc)
+                send_mail(None, to_email, from_email, subject, path, context, cc=cc, copy=False, save=False)
 
         return nomination
 
@@ -476,7 +477,7 @@ class FeedbackForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         self.nomcom = kwargs.pop('nomcom', None)
-        self.user = kwargs.pop('user', None)
+        self.person = kwargs.pop('person', None)
         self.public = kwargs.pop('public', None)
         self.position = kwargs.pop('position', None)
         self.nominee = kwargs.pop('nominee', None)
@@ -484,7 +485,7 @@ def __init__(self, *args, **kwargs):
 
         super(FeedbackForm, self).__init__(*args, **kwargs)
 
-        author = get_user_email(self.user)
+        author = get_person_email(self.person)
 
         if self.public:
             self.fields.pop('nominator_email')
@@ -514,7 +515,7 @@ def save(self, commit=True):
 
         author = None
         if self.public:
-            author = get_user_email(self.user)
+            author = get_person_email(self.person)
         else:
             nominator_email = self.cleaned_data['nominator_email']
             if nominator_email:
@@ -525,7 +526,7 @@ def save(self, commit=True):
             feedback.author = author.address
 
         feedback.nomcom = self.nomcom
-        feedback.user = self.user
+        feedback.person = self.person
         feedback.type = FeedbackTypeName.objects.get(slug='comment')
         feedback.comments = self.nomcom.encrypt(comment_text)
         feedback.save()
@@ -551,7 +552,7 @@ def save(self, commit=True):
                        }
                 path = nomcom_template_path + FEEDBACK_RECEIPT_TEMPLATE
                 # TODO - make the thing above more generic
-                send_mail(None, to_email, from_email, subject, path, context, cc=cc, copy=False)
+                send_mail(None, to_email, from_email, subject, path, context, cc=cc, copy=False, save=False)
 
     class Meta:
         model = Feedback
@@ -578,7 +579,7 @@ class QuestionnaireForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         self.nomcom = kwargs.pop('nomcom', None)
-        self.user = kwargs.pop('user', None)
+        self.person = kwargs.pop('person', None)
 
         super(QuestionnaireForm, self).__init__(*args, **kwargs)
         self.fields['nominee'] = PositionNomineeField(nomcom=self.nomcom, required=True)
@@ -588,13 +589,13 @@ def save(self, commit=True):
         comment_text = self.cleaned_data['comment_text']
         (position, nominee) = self.cleaned_data['nominee']
 
-        author = get_user_email(self.user)
+        author = get_person_email(self.person)
 
         if author:
             feedback.author = author
 
         feedback.nomcom = self.nomcom
-        feedback.user = self.user
+        feedback.person = self.person
         feedback.type = FeedbackTypeName.objects.get(slug='questio')
         feedback.comments = self.nomcom.encrypt(comment_text)
         feedback.save()
@@ -653,15 +654,15 @@ def clean_key(self):
 
 class PendingFeedbackForm(forms.ModelForm):
 
-    type = forms.ModelChoiceField(queryset=FeedbackTypeName.objects.all().order_by('pk'), widget=forms.RadioSelect, empty_label='Unclassified', required=False)
+    type = forms.ModelChoiceField(queryset=FeedbackTypeName.objects.all(), widget=forms.RadioSelect, empty_label='Unclassified', required=False)
 
     class Meta:
         model = Feedback
         fields = ('type', )
 
-    def set_nomcom(self, nomcom, user):
+    def set_nomcom(self, nomcom, person):
         self.nomcom = nomcom
-        self.user = user
+        self.person = person
         #self.fields['nominee'] = MultiplePositionNomineeField(nomcom=self.nomcom,
                                                               #required=True,
                                                               #widget=forms.SelectMultiple,
@@ -670,7 +671,7 @@ def set_nomcom(self, nomcom, user):
     def save(self, commit=True):
         feedback = super(PendingFeedbackForm, self).save(commit=False)
         feedback.nomcom = self.nomcom
-        feedback.user = self.user
+        feedback.person = self.person
         feedback.save()
         return feedback
 
@@ -700,9 +701,9 @@ class Meta:
         model = Feedback
         fields = ('type', )
 
-    def set_nomcom(self, nomcom, user, instances=None):
+    def set_nomcom(self, nomcom, person, instances=None):
         self.nomcom = nomcom
-        self.user = user
+        self.person = person
         instances = instances or []
         self.feedback_type = None
         for i in instances:
@@ -719,9 +720,9 @@ def set_nomcom(self, nomcom, user, instances=None):
                                                                   required= self.feedback_type.slug != 'comment',
                                                                   help_text='Hold down "Control", or "Command" on a Mac, to select more than one.')
             if self.feedback_type.slug == 'comment':
-                self.fields['topic'] = forms.ModelMultipleChoiceField(queryset=self.nomcom.topic_set.all(),
-                                                                      help_text='Hold down "Control" or "Command" on a Mac, to select more than one.',
-                                                                      required=False,)
+                self.fields['topic'] = ModelMultipleChoiceField(queryset=self.nomcom.topic_set.all(),
+                                                                help_text='Hold down "Control" or "Command" on a Mac, to select more than one.',
+                                                                required=False,)
         else:
             self.fields['position'] = forms.ModelChoiceField(queryset=Position.objects.get_by_nomcom(self.nomcom).filter(is_open=True), label="Position")
             self.fields['searched_email'] = SearchableEmailField(only_users=False,help_text="Try to find the candidate you are classifying with this field first. Only use the name and email fields below if this search does not find the candidate.",label="Candidate",required=False)
@@ -782,7 +783,7 @@ def save(self, commit=True):
                 nominee=nominee,
                 comments=feedback,
                 nominator_email=nominator_email,
-                user=self.user)
+                person=self.person)
             return feedback
         else:
             feedback.save()
@@ -847,7 +848,7 @@ class Meta:
 class NominationResponseCommentForm(forms.Form):
     comments = forms.CharField(widget=forms.Textarea,required=False,help_text="Any comments provided will be encrypted and will only be visible to the NomCom.", strip=False)
 
-class NomcomVolunteerMultipleChoiceField(forms.ModelMultipleChoiceField):
+class NomcomVolunteerMultipleChoiceField(ModelMultipleChoiceField):
     def label_from_instance(self, obj):
         year = obj.year()
         return f'Volunteer for the {year}/{year+1} Nominating Committee'
@@ -865,4 +866,4 @@ def __init__(self, person, *args, **kargs):
          self.fields['nomcoms'].queryset = NomCom.objects.filter(is_accepting_volunteers=True).exclude(volunteer__person=person)
          self.fields['nomcoms'].help_text = 'You may volunteer even if the datatracker does not currently calculate that you are eligible. Eligibility will be assessed when the selection process is performed.'
          self.fields['affiliation'].help_text = 'Affiliation to show in the volunteer list'
-         self.fields['affiliation'].required = True
\ No newline at end of file
+         self.fields['affiliation'].required = True
diff --git a/ietf/nomcom/management/commands/create_test_nomcom.py b/ietf/nomcom/management/commands/create_test_nomcom.py
new file mode 100644
index 0000000000..3365ea8f40
--- /dev/null
+++ b/ietf/nomcom/management/commands/create_test_nomcom.py
@@ -0,0 +1,64 @@
+# Copyright The IETF Trust 2017-2020, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+import socket
+
+from django.core.management.base import BaseCommand
+
+import debug                            # pyflakes:ignore
+
+from ietf.nomcom.factories import nomcom_kwargs_for_year, NomComFactory, NomineePositionFactory, key
+from ietf.person.factories import EmailFactory
+from ietf.group.models import Group
+from ietf.person.models import Person, User
+
+class Command(BaseCommand):
+    help = ("Create (or delete) a nomcom for test and development purposes.")
+
+    def add_arguments(self, parser):
+        parser.add_argument('--delete', dest='delete', action='store_true', help='Delete the test and development nomcom')
+
+    def handle(self, *args, **options):
+        if socket.gethostname().split('.')[0] in ['core3', 'ietfa', 'ietfb', 'ietfc', ]:
+            raise EnvironmentError("Refusing to create a test nomcom on a production server")
+
+        opt_delete = options.get('delete', False)
+        if opt_delete:
+            if Group.objects.filter(acronym='nomcom7437').exists():
+                Group.objects.filter(acronym='nomcom7437').delete()
+                users_to_delete = ['testchair','testmember','testcandidate']
+                Person.objects.filter(user__username__in=users_to_delete).delete()
+                User.objects.filter(username__in=users_to_delete).delete()
+                self.stdout.write("Deleted test group 'nomcom7437' and its related objects.")
+            else:
+                self.stderr.write("test nomcom 'nomcom7437' does not exist; nothing to do.\n")
+        else:
+            if Group.objects.filter(acronym='nomcom7437').exists():
+                self.stderr.write("test nomcom 'nomcom7437' already exists; nothing to do.\n")
+            else:
+                nc = NomComFactory.create(**nomcom_kwargs_for_year(year=7437,
+                                                                  populate_personnel=False,
+                                                                  populate_positions=False))
+
+                e = EmailFactory(person__name='Test Chair', address='testchair@example.com', person__user__username='testchair', person__default_emails=False, origin='testchair')
+                e.person.user.set_password('password')
+                e.person.user.save()
+                nc.group.role_set.create(name_id='chair',person=e.person,email=e)
+
+                e = EmailFactory(person__name='Test Member', address='testmember@example.com', person__user__username='testmember', person__default_emails=False, origin='testmember')
+                e.person.user.set_password('password')
+                e.person.user.save()
+                nc.group.role_set.create(name_id='member',person=e.person,email=e)
+
+
+                e = EmailFactory(person__name='Test Candidate', address='testcandidate@example.com', person__user__username='testcandidate', person__default_emails=False, origin='testcandidate')
+                e.person.user.set_password('password')
+                e.person.user.save()
+                NomineePositionFactory(nominee__nomcom=nc, nominee__person=e.person,
+                                       position__nomcom=nc, position__name='Test Area Director', position__is_iesg_position=True,
+                                      )
+
+                self.stdout.write("%s\n" % key.decode())
+                self.stdout.write("Nomcom 7437 created. The private key can also be found at any time\nin ietf/nomcom/factories.py. Note that it is NOT a secure key.\n")
+
diff --git a/ietf/nomcom/management/commands/feedback_email.py b/ietf/nomcom/management/commands/feedback_email.py
index 32e9c9aa28..3846208d58 100644
--- a/ietf/nomcom/management/commands/feedback_email.py
+++ b/ietf/nomcom/management/commands/feedback_email.py
@@ -42,8 +42,11 @@ def handle(self, *args, **options):
         except NomCom.DoesNotExist:
             raise CommandError("NomCom %s does not exist or it isn't active" % year)
 
-        binary_input = io.open(email, 'rb') if email else sys.stdin.buffer
-        self.msg = binary_input.read()
+        if email:
+            with io.open(email, 'rb') as binary_input:
+                self.msg = binary_input.read()
+        else:
+            self.msg = sys.stdin.buffer.read()
 
         try:
             feedback = create_feedback_email(self.nomcom, self.msg)
diff --git a/ietf/nomcom/management/commands/make_dummy_nomcom.py b/ietf/nomcom/management/commands/make_dummy_nomcom.py
deleted file mode 100644
index 417182b79c..0000000000
--- a/ietf/nomcom/management/commands/make_dummy_nomcom.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright The IETF Trust 2017-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import socket
-
-from django.core.management.base import BaseCommand
-
-import debug                            # pyflakes:ignore
-
-from ietf.nomcom.factories import nomcom_kwargs_for_year, NomComFactory, NomineePositionFactory, key
-from ietf.person.factories import EmailFactory
-from ietf.group.models import Group
-from ietf.person.models import User
-
-class Command(BaseCommand):
-    help = ("Create (or delete) a dummy nomcom for test and development purposes.")
-
-    def add_arguments(self, parser):
-        parser.add_argument('--delete', dest='delete', action='store_true', help='Delete the test and development dummy nomcom')
-
-    def handle(self, *args, **options):
-        if socket.gethostname().split('.')[0] in ['core3', 'ietfa', 'ietfb', 'ietfc', ]:
-            raise EnvironmentError("Refusing to create a dummy nomcom on a production server")
-
-        opt_delete = options.get('delete', False)
-        if opt_delete:
-            if Group.objects.filter(acronym='nomcom7437').exists():
-                Group.objects.filter(acronym='nomcom7437').delete()
-                User.objects.filter(username__in=['dummychair','dummymember','dummycandidate']).delete()
-                self.stdout.write("Deleted dummy group 'nomcom7437' and its related objects.")
-            else:
-                self.stderr.write("Dummy nomcom 'nomcom7437' does not exist; nothing to do.\n")
-        else:
-            if Group.objects.filter(acronym='nomcom7437').exists():
-                self.stderr.write("Dummy nomcom 'nomcom7437' already exists; nothing to do.\n")
-            else:
-                nc = NomComFactory.create(**nomcom_kwargs_for_year(year=7437,
-                                                                  populate_personnel=False,
-                                                                  populate_positions=False))
-
-                e = EmailFactory(person__name='Dummy Chair', address='dummychair@example.com', person__user__username='dummychair', person__default_emails=False, origin='dummychair')
-                e.person.user.set_password('password')
-                e.person.user.save()
-                nc.group.role_set.create(name_id='chair',person=e.person,email=e)
-
-                e = EmailFactory(person__name='Dummy Member', address='dummymember@example.com', person__user__username='dummymember', person__default_emails=False, origin='dummymember')
-                e.person.user.set_password('password')
-                e.person.user.save()
-                nc.group.role_set.create(name_id='member',person=e.person,email=e)
-
-
-                e = EmailFactory(person__name='Dummy Candidate', address='dummycandidate@example.com', person__user__username='dummycandidate', person__default_emails=False, origin='dummycandidate')
-                e.person.user.set_password('password')
-                e.person.user.save()
-                NomineePositionFactory(nominee__nomcom=nc, nominee__person=e.person,
-                                       position__nomcom=nc, position__name='Dummy Area Director', position__is_iesg_position=True,
-                                      )
-
-                self.stdout.write("%s\n" % key)
-                self.stdout.write("Nomcom 7437 created. The private key can also be found at any time\nin ietf/nomcom/factories.py. Note that it is NOT a secure key.\n")
-
diff --git a/ietf/nomcom/management/commands/send_reminders.py b/ietf/nomcom/management/commands/send_reminders.py
deleted file mode 100644
index 3dce0a3615..0000000000
--- a/ietf/nomcom/management/commands/send_reminders.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import datetime
-import syslog
-
-from django.core.management.base import BaseCommand
-
-from ietf.nomcom.models import NomCom, NomineePosition
-from ietf.nomcom.utils import send_accept_reminder_to_nominee,send_questionnaire_reminder_to_nominee
-
-def log(message):
-    syslog.syslog(message)
-
-def is_time_to_send(nomcom,send_date,nomination_date):
-    if nomcom.reminder_interval:
-        days_passed = (send_date - nomination_date).days
-        return days_passed > 0 and days_passed % nomcom.reminder_interval == 0
-    else:
-        return bool(nomcom.reminderdates_set.filter(date=send_date))
-
-class Command(BaseCommand):
-    help = ("Send acceptance and questionnaire reminders to nominees")
-
-    def handle(self, *args, **options):
-        for nomcom in NomCom.objects.filter(group__state__slug='active'):
-            nps = NomineePosition.objects.filter(nominee__nomcom=nomcom,nominee__duplicated__isnull=True)
-            for nominee_position in nps.pending():
-                if is_time_to_send(nomcom, datetime.date.today(), nominee_position.time.date()):
-                    send_accept_reminder_to_nominee(nominee_position)
-                    log('Sent accept reminder to %s' % nominee_position.nominee.email.address)
-            for nominee_position in nps.accepted().without_questionnaire_response():
-                if is_time_to_send(nomcom, datetime.date.today(), nominee_position.time.date()):
-                    send_questionnaire_reminder_to_nominee(nominee_position)
-                    log('Sent questionnaire reminder to %s' % nominee_position.nominee.email.address)
diff --git a/ietf/nomcom/management/tests.py b/ietf/nomcom/management/tests.py
index 7bda2b5aa5..08c0e1fe32 100644
--- a/ietf/nomcom/management/tests.py
+++ b/ietf/nomcom/management/tests.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2021, All Rights Reserved
 # -*- coding: utf-8 -*-
 """Tests of nomcom management commands"""
-import mock
+from unittest import mock
 import sys
 
 from collections import namedtuple
diff --git a/ietf/nomcom/migrations/0001_initial.py b/ietf/nomcom/migrations/0001_initial.py
index 9ef8e54767..81eaabc604 100644
--- a/ietf/nomcom/migrations/0001_initial.py
+++ b/ietf/nomcom/migrations/0001_initial.py
@@ -1,12 +1,8 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import ietf.nomcom.fields
 import ietf.nomcom.models
 import ietf.utils.models
 import ietf.utils.storage
@@ -17,11 +13,11 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('group', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('dbtemplate', '0001_initial'),
         ('name', '0001_initial'),
         ('person', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('group', '0001_initial'),
     ]
 
     operations = [
@@ -31,20 +27,13 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('author', models.EmailField(blank=True, max_length=254, verbose_name='Author')),
                 ('subject', models.TextField(blank=True, verbose_name='Subject')),
-                ('comments', ietf.nomcom.fields.EncryptedTextField(verbose_name='Comments')),
+                ('comments', models.BinaryField(verbose_name='Comments')),
                 ('time', models.DateTimeField(auto_now_add=True)),
             ],
             options={
                 'ordering': ['time'],
             },
         ),
-        migrations.CreateModel(
-            name='FeedbackLastSeen',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(auto_now=True)),
-            ],
-        ),
         migrations.CreateModel(
             name='NomCom',
             fields=[
@@ -54,6 +43,9 @@ class Migration(migrations.Migration):
                 ('reminder_interval', models.PositiveIntegerField(blank=True, help_text='If the nomcom user sets the interval field then a cron command will send reminders to the nominees who have not responded using the following formula: (today - nomination_date) % interval == 0.', null=True)),
                 ('initial_text', models.TextField(blank=True, verbose_name='Help text for nomination form')),
                 ('show_nominee_pictures', models.BooleanField(default=True, help_text='Display pictures of each nominee (if available) on the feedback pages', verbose_name='Show nominee pictures')),
+                ('show_accepted_nominees', models.BooleanField(default=True, help_text='Show accepted nominees on the public nomination page', verbose_name='Show accepted nominees')),
+                ('is_accepting_volunteers', models.BooleanField(default=False, help_text='Is this nomcom currently accepting volunteers?', verbose_name='Accepting volunteers')),
+                ('first_call_for_volunteers', models.DateField(blank=True, null=True, verbose_name='Date of the first call for volunteers')),
                 ('group', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
             ],
             options={
@@ -61,22 +53,6 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'NomComs',
             },
         ),
-        migrations.CreateModel(
-            name='Nomination',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('candidate_name', models.CharField(max_length=255, verbose_name='Candidate name')),
-                ('candidate_email', models.EmailField(max_length=255, verbose_name='Candidate email')),
-                ('candidate_phone', models.CharField(blank=True, max_length=255, verbose_name='Candidate phone')),
-                ('nominator_email', models.EmailField(blank=True, max_length=254, verbose_name='Nominator Email')),
-                ('time', models.DateTimeField(auto_now_add=True)),
-                ('share_nominator', models.BooleanField(default=False, help_text='Check this box to allow the NomCom to let the person you are nominating know that you were one of the people who nominated them. If you do not check this box, your name will be confidential and known only within NomCom.', verbose_name='Share nominator name with candidate')),
-                ('comments', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Feedback')),
-            ],
-            options={
-                'verbose_name_plural': 'Nominations',
-            },
-        ),
         migrations.CreateModel(
             name='Nominee',
             fields=[
@@ -86,38 +62,41 @@ class Migration(migrations.Migration):
                 ('nomcom', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.NomCom')),
             ],
             options={
-                'ordering': ['-nomcom__group__acronym', 'email__address'],
                 'verbose_name_plural': 'Nominees',
+                'ordering': ['-nomcom__group__acronym', 'person__name'],
             },
         ),
         migrations.CreateModel(
-            name='NomineePosition',
+            name='Topic',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(auto_now_add=True)),
-                ('nominee', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Nominee')),
+                ('subject', models.CharField(help_text='This short description will appear on the Feedback pages.', max_length=255, verbose_name='Name')),
+                ('accepting_feedback', models.BooleanField(default=False, verbose_name='Is accepting feedback')),
+                ('audience', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.TopicAudienceName', verbose_name='Who can provide feedback (intended audience)')),
+                ('description', ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='description', to='dbtemplate.DBTemplate')),
+                ('nomcom', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.NomCom')),
             ],
             options={
-                'ordering': ['nominee'],
-                'verbose_name': 'Nominee position',
-                'verbose_name_plural': 'Nominee positions',
+                'verbose_name_plural': 'Topics',
             },
         ),
         migrations.CreateModel(
-            name='Position',
+            name='Volunteer',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='This short description will appear on the Nomination and Feedback pages. Be as descriptive as necessary. Past examples: "Transport AD", "IAB Member"', max_length=255, verbose_name='Name')),
-                ('is_open', models.BooleanField(default=False, help_text='Set is_open when the nomcom is working on a position. Clear it when an appointment is confirmed.', verbose_name='Is open')),
-                ('accepting_nominations', models.BooleanField(default=False, verbose_name='Is accepting nominations')),
-                ('accepting_feedback', models.BooleanField(default=False, verbose_name='Is accepting feedback')),
+                ('affiliation', models.CharField(blank=True, max_length=255)),
                 ('nomcom', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.NomCom')),
-                ('questionnaire', ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='questionnaire', to='dbtemplate.DBTemplate')),
-                ('requirement', ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='requirement', to='dbtemplate.DBTemplate')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TopicFeedbackLastSeen',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField(auto_now=True)),
+                ('reviewer', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('topic', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Topic')),
             ],
-            options={
-                'verbose_name_plural': 'Positions',
-            },
         ),
         migrations.CreateModel(
             name='ReminderDates',
@@ -128,37 +107,37 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='Topic',
+            name='Position',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('subject', models.CharField(help_text='This short description will appear on the Feedback pages.', max_length=255, verbose_name='Name')),
+                ('name', models.CharField(help_text='This short description will appear on the Nomination and Feedback pages. Be as descriptive as necessary. Past examples: "Transport AD", "IAB Member"', max_length=255, verbose_name='Name')),
+                ('is_open', models.BooleanField(default=False, help_text='Set is_open when the nomcom is working on a position. Clear it when an appointment is confirmed.', verbose_name='Is open')),
+                ('accepting_nominations', models.BooleanField(default=False, verbose_name='Is accepting nominations')),
                 ('accepting_feedback', models.BooleanField(default=False, verbose_name='Is accepting feedback')),
-                ('audience', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.TopicAudienceName')),
-                ('description', ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='description', to='dbtemplate.DBTemplate')),
+                ('is_iesg_position', models.BooleanField(default=False, verbose_name='Is IESG Position')),
                 ('nomcom', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.NomCom')),
+                ('questionnaire', ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='questionnaire', to='dbtemplate.DBTemplate')),
+                ('requirement', ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='requirement', to='dbtemplate.DBTemplate')),
             ],
             options={
-                'verbose_name_plural': 'Topics',
+                'verbose_name_plural': 'Positions',
             },
         ),
         migrations.CreateModel(
-            name='TopicFeedbackLastSeen',
+            name='NomineePosition',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(auto_now=True)),
-                ('reviewer', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('topic', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Topic')),
+                ('time', models.DateTimeField(auto_now_add=True)),
+                ('nominee', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Nominee')),
+                ('position', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Position')),
+                ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.NomineePositionStateName')),
             ],
-        ),
-        migrations.AddField(
-            model_name='nomineeposition',
-            name='position',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Position'),
-        ),
-        migrations.AddField(
-            model_name='nomineeposition',
-            name='state',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.NomineePositionStateName'),
+            options={
+                'verbose_name': 'Nominee position',
+                'verbose_name_plural': 'Nominee positions',
+                'ordering': ['nominee'],
+                'unique_together': {('position', 'nominee')},
+            },
         ),
         migrations.AddField(
             model_name='nominee',
@@ -170,30 +149,33 @@ class Migration(migrations.Migration):
             name='person',
             field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
         ),
-        migrations.AddField(
-            model_name='nomination',
-            name='nominee',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Nominee'),
-        ),
-        migrations.AddField(
-            model_name='nomination',
-            name='position',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Position'),
-        ),
-        migrations.AddField(
-            model_name='nomination',
-            name='user',
-            field=ietf.utils.models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='feedbacklastseen',
-            name='nominee',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Nominee'),
+        migrations.CreateModel(
+            name='Nomination',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('candidate_name', models.CharField(max_length=255, verbose_name='Candidate name')),
+                ('candidate_email', models.EmailField(max_length=255, verbose_name='Candidate email')),
+                ('candidate_phone', models.CharField(blank=True, max_length=255, verbose_name='Candidate phone')),
+                ('nominator_email', models.EmailField(blank=True, max_length=254, verbose_name='Nominator Email')),
+                ('time', models.DateTimeField(auto_now_add=True)),
+                ('share_nominator', models.BooleanField(default=False, help_text='Check this box to allow the NomCom to let the person you are nominating know that you were one of the people who nominated them. If you do not check this box, your name will be confidential and known only within NomCom.', verbose_name='Share nominator name with candidate')),
+                ('comments', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Feedback')),
+                ('nominee', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Nominee')),
+                ('position', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Position')),
+                ('user', ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name_plural': 'Nominations',
+            },
         ),
-        migrations.AddField(
-            model_name='feedbacklastseen',
-            name='reviewer',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        migrations.CreateModel(
+            name='FeedbackLastSeen',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField(auto_now=True)),
+                ('nominee', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.Nominee')),
+                ('reviewer', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+            ],
         ),
         migrations.AddField(
             model_name='feedback',
@@ -223,14 +205,14 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='feedback',
             name='user',
-            field=ietf.utils.models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterUniqueTogether(
-            name='nomineeposition',
-            unique_together=set([('position', 'nominee')]),
+            field=ietf.utils.models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
         ),
         migrations.AlterUniqueTogether(
             name='nominee',
-            unique_together=set([('email', 'nomcom')]),
+            unique_together={('email', 'nomcom')},
+        ),
+        migrations.AddIndex(
+            model_name='feedback',
+            index=models.Index(fields=['time'], name='nomcom_feed_time_35cf38_idx'),
         ),
     ]
diff --git a/ietf/nomcom/migrations/0002_add_uncheck_reminder.py b/ietf/nomcom/migrations/0002_add_uncheck_reminder.py
new file mode 100644
index 0000000000..c7a57601f2
--- /dev/null
+++ b/ietf/nomcom/migrations/0002_add_uncheck_reminder.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-03-25 02:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nomcom', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='nomcom',
+            name='send_questionnaire',
+            field=models.BooleanField(default=False, help_text='If you check this box, questionnaires are sent automatically after nominations. DO NOT CHECK if they are not ready yet.', verbose_name='Send questionnaires automatically'),
+        ),
+    ]
diff --git a/ietf/nomcom/migrations/0002_auto_20180918_0550.py b/ietf/nomcom/migrations/0002_auto_20180918_0550.py
deleted file mode 100644
index 44fd8d4df8..0000000000
--- a/ietf/nomcom/migrations/0002_auto_20180918_0550.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-18 05:50
-
-
-from django.conf import settings
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='feedback',
-            name='user',
-            field=ietf.utils.models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='nomination',
-            name='user',
-            field=ietf.utils.models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0003_alter_nomination_share_nominator.py b/ietf/nomcom/migrations/0003_alter_nomination_share_nominator.py
new file mode 100644
index 0000000000..d5108c3fdc
--- /dev/null
+++ b/ietf/nomcom/migrations/0003_alter_nomination_share_nominator.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.2 on 2023-06-08 18:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("nomcom", "0002_add_uncheck_reminder"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="nomination",
+            name="share_nominator",
+            field=models.BooleanField(
+                default=False,
+                help_text="Check this box to allow the NomCom to let the person you are nominating know that you were one of the people who nominated them. If you do not check this box, your name will be confidential and known only within NomCom.",
+                verbose_name="OK to share nominator's name with candidate",
+            ),
+        ),
+    ]
diff --git a/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py b/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py
deleted file mode 100644
index cc7d732834..0000000000
--- a/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-26 11:10
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0002_auto_20180918_0550'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='nomcom',
-            name='show_accepted_nominees',
-            field=models.BooleanField(default=True, help_text='Show accepted nominees on the public nomination page', verbose_name='Show accepted nominees'),
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py b/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py
deleted file mode 100644
index 7f4746a274..0000000000
--- a/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-26 11:12
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    NomCom = apps.get_model('nomcom','NomCom')
-    NomCom.objects.update(show_accepted_nominees=False)
-
-def reverse(apps, schema_editor):
-    pass
-    
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0003_nomcom_show_accepted_nominees'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
-
diff --git a/ietf/nomcom/migrations/0004_volunteer_origin_volunteer_time_volunteer_withdrawn.py b/ietf/nomcom/migrations/0004_volunteer_origin_volunteer_time_volunteer_withdrawn.py
new file mode 100644
index 0000000000..9eaebf2069
--- /dev/null
+++ b/ietf/nomcom/migrations/0004_volunteer_origin_volunteer_time_volunteer_withdrawn.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.7 on 2023-11-05 09:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("nomcom", "0003_alter_nomination_share_nominator"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="volunteer",
+            name="origin",
+            field=models.CharField(default="datatracker", max_length=32),
+        ),
+        migrations.AddField(
+            model_name="volunteer",
+            name="time",
+            field=models.DateTimeField(auto_now_add=True, null=True, blank=True),
+        ),
+        migrations.AddField(
+            model_name="volunteer",
+            name="withdrawn",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]
diff --git a/ietf/nomcom/migrations/0005_auto_20181008_0602.py b/ietf/nomcom/migrations/0005_auto_20181008_0602.py
deleted file mode 100644
index cd56b09938..0000000000
--- a/ietf/nomcom/migrations/0005_auto_20181008_0602.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-10-08 06:02
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0004_set_show_accepted_nominees_false_on_existing_nomcoms'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='nominee',
-            options={'ordering': ['-nomcom__group__acronym', 'person__name'], 'verbose_name_plural': 'Nominees'},
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0005_user_to_person.py b/ietf/nomcom/migrations/0005_user_to_person.py
new file mode 100644
index 0000000000..66a6e99642
--- /dev/null
+++ b/ietf/nomcom/migrations/0005_user_to_person.py
@@ -0,0 +1,100 @@
+# Generated by Django 4.2.2 on 2023-06-14 19:47
+
+from django.db import migrations
+from django.db.models import OuterRef, Subquery
+import django.db.models.deletion
+import ietf.utils.models
+
+
+def forward(apps, schema_editor):
+    Nomination = apps.get_model('nomcom', 'Nomination')
+    Person = apps.get_model("person", "Person")
+    Nomination.objects.exclude(
+        user__isnull=True
+    ).update(
+        person=Subquery(
+            Person.objects.filter(user_id=OuterRef("user_id")).values("pk")[:1]
+        )
+    )
+
+    Feedback = apps.get_model('nomcom', 'Feedback')
+    Feedback.objects.exclude(
+        user__isnull=True
+    ).update(
+        person=Subquery(
+            Person.objects.filter(user_id=OuterRef("user_id")).values("pk")[:1]
+        )
+    )
+
+def reverse(apps, schema_editor):
+    Nomination = apps.get_model('nomcom', 'Nomination')
+    Person = apps.get_model("person", "Person")
+    Nomination.objects.exclude(
+        person__isnull=True
+    ).update(
+        user_id=Subquery(
+            Person.objects.filter(pk=OuterRef("person_id")).values("user_id")[:1]
+        )
+    )
+
+    Feedback = apps.get_model('nomcom', 'Feedback')
+    Feedback.objects.exclude(
+        person__isnull=True
+    ).update(
+        user_id=Subquery(
+            Person.objects.filter(pk=OuterRef("person_id")).values("user_id")[:1]
+        )
+    )
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("person", "0001_initial"),
+        ("nomcom", "0004_volunteer_origin_volunteer_time_volunteer_withdrawn"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="feedback",
+            name="person",
+            field=ietf.utils.models.ForeignKey(
+                blank=True,
+                editable=False,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="person.person",
+            ),
+        ),
+        migrations.AddField(
+            model_name="nomination",
+            name="person",
+            field=ietf.utils.models.ForeignKey(
+                editable=False,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="person.person",
+            ),
+        ),
+        migrations.RunPython(forward, reverse),
+        migrations.RemoveField(
+            model_name="feedback",
+            name="user",
+            field=ietf.utils.models.ForeignKey(
+                blank=True,
+                editable=False,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="user.user",
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="nomination",
+            name="user",
+            field=ietf.utils.models.ForeignKey(
+                blank=True,
+                editable=False,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="user.user",
+            ),
+        ),
+    ]
diff --git a/ietf/nomcom/migrations/0006_auto_20190716_1216.py b/ietf/nomcom/migrations/0006_auto_20190716_1216.py
deleted file mode 100644
index 7c3a374f4b..0000000000
--- a/ietf/nomcom/migrations/0006_auto_20190716_1216.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.22 on 2019-07-16 12:16
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0005_auto_20181008_0602'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='feedback',
-            name='comments',
-            field=models.BinaryField(verbose_name='Comments'),
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0007_position_is_iesg_position.py b/ietf/nomcom/migrations/0007_position_is_iesg_position.py
deleted file mode 100644
index edd4cf0f08..0000000000
--- a/ietf/nomcom/migrations/0007_position_is_iesg_position.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-01-07 14:41
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0006_auto_20190716_1216'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='position',
-            name='is_iesg_position',
-            field=models.BooleanField(default=False, verbose_name='Is IESG Position'),
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0008_auto_20201008_0506.py b/ietf/nomcom/migrations/0008_auto_20201008_0506.py
deleted file mode 100644
index b14e8da276..0000000000
--- a/ietf/nomcom/migrations/0008_auto_20201008_0506.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.2.16 on 2020-10-08 05:06
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0007_position_is_iesg_position'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='topic',
-            name='audience',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.TopicAudienceName', verbose_name='Who can provide feedback (intended audience)'),
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0009_auto_20201109_0439.py b/ietf/nomcom/migrations/0009_auto_20201109_0439.py
deleted file mode 100644
index 8b6efe2a86..0000000000
--- a/ietf/nomcom/migrations/0009_auto_20201109_0439.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0008_auto_20201008_0506'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='feedback',
-            index=models.Index(fields=['time'], name='nomcom_feed_time_35cf38_idx'),
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0010_nomcom_first_call_for_volunteers.py b/ietf/nomcom/migrations/0010_nomcom_first_call_for_volunteers.py
deleted file mode 100644
index 01f2f3335c..0000000000
--- a/ietf/nomcom/migrations/0010_nomcom_first_call_for_volunteers.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.20 on 2021-04-22 14:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0009_auto_20201109_0439'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='nomcom',
-            name='first_call_for_volunteers',
-            field=models.DateField(blank=True, null=True, verbose_name='Date of the first call for volunteers'),
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0011_volunteers.py b/ietf/nomcom/migrations/0011_volunteers.py
deleted file mode 100644
index 651e1dc54a..0000000000
--- a/ietf/nomcom/migrations/0011_volunteers.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated by Django 2.2.24 on 2021-06-09 12:15
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0019_auto_20210604_1443'),
-        ('nomcom', '0010_nomcom_first_call_for_volunteers'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='nomcom',
-            name='is_accepting_volunteers',
-            field=models.BooleanField(default=False, help_text='Is this nomcom is currently accepting volunteers?', verbose_name='Accepting volunteers'),
-        ),
-        migrations.CreateModel(
-            name='Volunteer',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('affiliation', models.CharField(blank=True, max_length=255)),
-                ('nomcom', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nomcom.NomCom')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-            ],
-        ),
-    ]
diff --git a/ietf/nomcom/migrations/0012_populate_volunteers.py b/ietf/nomcom/migrations/0012_populate_volunteers.py
deleted file mode 100644
index 4da1bbaf09..0000000000
--- a/ietf/nomcom/migrations/0012_populate_volunteers.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright The IETF Trust 2021 All Rights Reserved
-# Generated by Django 2.2.24 on 2021-06-10 12:50
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    NomCom = apps.get_model('nomcom','NomCom')
-    nc = NomCom.objects.filter(group__acronym='nomcom2021').first()
-    if nc is None:
-        return  # nothing to do if the NomCom in question does not exist
-
-    nc.is_accepting_volunteers = True
-    nc.save()
-    
-    volunteers = [
-        (21684, 'Futurewei Technologies'), # Barry Leiba
-        (117988, 'Google LLC'), # Benjamin M. Schwartz
-        (122671, 'Fastmail Pty Ltd'), # Bron Gondwana
-        (124329, 'Huawei'), # Cheng Li
-        (113580, 'China Mobile'), # Weiqiang Cheng
-        (22933, 'LabN Consulting'), # Christian Hopps
-        (102391, 'Futurewei Technologies, Inc'), # Donald E. Eastlake 3rd
-        (111477, 'Huawei'), # Dhruv Dhody
-        (12695, 'Mozilla'), # Eric Rescorla
-        (17141, 'APNIC'), # George G. Michaelson
-        (108833, 'Huawei'), # Luigi Iannone
-        (118908, 'Huawei Technologies'), # Giuseppe Fioccola
-        (5376, 'Vigil Security, LLC'), # Russ Housley
-        (118100, 'Equinix'), # Ignas Bagdonas
-        (107287, 'rtfm llp'), # Jim Reid
-        (123344, 'Netflix'), # Theresa Enghardt
-        (109226, 'Huawei'), # Italo Busi
-        (113152, 'Ericsson'), # Jaime Jimenez
-        (111354, 'Juniper Networks'), # John Drake
-        (112342, 'Cisco Systems, Inc.'), # Jakob Heitz
-        (109207, 'Huawei Technologies Co., Ltd.'), # 江元龙
-        (110737, 'Huawei Technologies'), # Jie Dong
-        (109330, 'Ericsson'), # John Preuß Mattsson
-        (123589, 'Nokia'), # Julien Maisonneuve
-        (124655, 'UK National Cyber Security Centre (NCSC)'), # Kirsty Paine
-        (119463, 'Akamai Technologies, Inc.'), # Kyle Rose
-        (109983, 'Huawei Technologies Co.,Ltd.'), # Bo Wu
-        (2097, 'Cisco Systems'), # Eliot Lear
-        (567, 'UCLA'), # Lixia Zhang
-        (107762, 'Huawei'), # Mach Chen
-        (125198, 'Juniper Networks'), # Melchior Aelmans
-        (104294, 'Ericsson'), # Magnus Westerlund
-        (104495, 'Impedance Mismatch LLC'), # Marc Petit-Huguenin
-        (119947, 'Painless Security, LLC'), # Margaret Cullen
-        (102830, 'Independent'), # Mary Barnes
-        (116593, 'Fastly'), # Patrick McManus
-        (102254, 'Sandelman Software Works'), # Michael Richardson
-        (20356, 'Apple'), # Ted Lemon
-        (103881, 'Fastly'), # Mark Nottingham
-        (106741, 'NthPermutation Security'), # Michael StJohns
-        (116323, 'Moulay Ismail University of Meknes, Morocco'), # Nabil Benamar
-        (20106, 'W3C/MIT'), # Samuel Weiler
-        (105691, 'cisco'), # Ole Trøan
-        (121160, 'Independent, Amazon'), # Padma Pillay-Esnault
-        (115824, 'Cisco Systems'), # Pascal Thubert
-        (122637, 'Huawei Technologies Co.,Ltd.'), # Shuping Peng
-        (112952, 'Huawei'), # Haibo Wang
-        (5234, 'IIJ Research Lab & Arrcus Inc'), # Randy Bush
-        (101568, 'Juniper Networks'), # Ron Bonica
-        (123443, 'Huawei Technologies Co.,Ltd.'), # Bing Liu (Remy)
-        (18321, 'Episteme Technology Consulting LLC'), # Pete Resnick
-        (18427, 'Akamai'), # Rich Salz
-        (126259, 'Huawei Technologies Co.,Ltd.'), # Fan Yang
-        (115724, 'Juniper Networks'), # Shraddha Hegde
-        (125509, 'Tencent'), # Shuai Zhao
-        (110614, 'Huawei'), # Tal Mizrahi
-        (123395, 'APNIC'), # Tom Harrison
-        (116516, 'Juniper Networks'), # Tarek Saad
-        (11834, 'Futurewei USA'), # Toerless Eckert
-        (123962, 'Open-Xchange'), # Vittorio Bertola
-        (126530, 'Huawei'), # Yali Wang
-        (106199, 'Ericsson'), # Wassim Haddad
-        (125173, 'Huawei'), # Wei Pan
-        (111299, 'ZTE Corporation'), # Xiao Min
-        (113285, 'Huawei Technologies'), # XiPeng Xiao
-        (116337, 'Futurewei Technologies Inc.'), # Yingzhen Qu
-        (123974, 'ZTE'), # Zheng Zhang
-        (117500, 'Huawei'), # Guangying Zheng
-        (115934, 'Huawei Technologies'), # Haomian Zheng
-        (110966, 'Juniper'), # Zhaohui (Jeffrey) Zhang
-    ]
-
-    for pk, affiliation in volunteers:
-        nc.volunteer_set.create(person_id=pk, affiliation=affiliation)
-
-def reverse(apps, schema_editor):
-    Volunteer = apps.get_model('nomcom','Volunteer')
-    Volunteer.objects.all().delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0011_volunteers'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward,reverse)
-    ]
diff --git a/ietf/nomcom/migrations/0013_update_accepting_volunteers_helptext.py b/ietf/nomcom/migrations/0013_update_accepting_volunteers_helptext.py
deleted file mode 100644
index 718e3b49f6..0000000000
--- a/ietf/nomcom/migrations/0013_update_accepting_volunteers_helptext.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2022-07-23 13:14
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('nomcom', '0012_populate_volunteers'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='nomcom',
-            name='is_accepting_volunteers',
-            field=models.BooleanField(default=False, help_text='Is this nomcom currently accepting volunteers?', verbose_name='Accepting volunteers'),
-        ),
-    ]
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
index 868787429f..c206e467bd 100644
--- a/ietf/nomcom/models.py
+++ b/ietf/nomcom/models.py
@@ -7,7 +7,6 @@
 from django.db import models
 from django.db.models.signals import post_delete
 from django.conf import settings
-from django.contrib.auth.models import User
 from django.template.loader import render_to_string
 from django.template.defaultfilters import linebreaks # type: ignore
 
@@ -43,12 +42,13 @@ class ReminderDates(models.Model):
 
 
 class NomCom(models.Model):
+    # TODO-BLOBSTORE: migrate this to a database field instead of a FileField and update code accordingly
     public_key = models.FileField(storage=NoLocationMigrationFileSystemStorage(location=settings.NOMCOM_PUBLIC_KEYS_DIR),
                                   upload_to=upload_path_handler, blank=True, null=True)
 
     group = ForeignKey(Group)
     send_questionnaire = models.BooleanField(verbose_name='Send questionnaires automatically', default=False,
-                                             help_text='If you check this box, questionnaires are sent automatically after nominations.')
+                                             help_text='If you check this box, questionnaires are sent automatically after nominations. DO NOT CHECK if they are not ready yet.')
     reminder_interval = models.PositiveIntegerField(help_text='If the nomcom user sets the interval field then a cron command will '
                                                               'send reminders to the nominees who have not responded using '
                                                               'the following formula: (today - nomination_date) % interval == 0.',
@@ -128,9 +128,9 @@ class Nomination(models.Model):
     nominee = ForeignKey('Nominee')
     comments = ForeignKey('Feedback')
     nominator_email = models.EmailField(verbose_name='Nominator Email', blank=True)
-    user = ForeignKey(User, editable=False, null=True, on_delete=models.SET_NULL)
+    person = ForeignKey(Person, editable=False, null=True, on_delete=models.SET_NULL)
     time = models.DateTimeField(auto_now_add=True)
-    share_nominator = models.BooleanField(verbose_name='Share nominator name with candidate', default=False,
+    share_nominator = models.BooleanField(verbose_name='OK to share nominator\'s name with candidate', default=False,
                                           help_text='Check this box to allow the NomCom to let the '
                                                     'person you are nominating know that you were '
                                                     'one of the people who nominated them. If you '
@@ -148,7 +148,7 @@ class Nominee(models.Model):
 
     email = ForeignKey(Email)
     person = ForeignKey(Person, blank=True, null=True)
-    nominee_position = models.ManyToManyField('Position', through='NomineePosition')
+    nominee_position = models.ManyToManyField('nomcom.Position', through='nomcom.NomineePosition')
     duplicated = ForeignKey('Nominee', blank=True, null=True)
     nomcom = ForeignKey('NomCom')
 
@@ -188,8 +188,9 @@ class Meta:
 
     def save(self, **kwargs):
         if not self.pk and not self.state_id:
+            # Don't need to set update_fields because the self.pk test means this is a new instance
             self.state = NomineePositionStateName.objects.get(slug='pending')
-        super(NomineePosition, self).save(**kwargs)
+        super().save(**kwargs)
 
     def __str__(self):
         return "%s - %s - %s" % (self.nominee, self.state, self.position)
@@ -292,13 +293,13 @@ def get_description(self):
 class Feedback(models.Model):
     nomcom = ForeignKey('NomCom')
     author = models.EmailField(verbose_name='Author', blank=True)
-    positions = models.ManyToManyField('Position', blank=True)
-    nominees = models.ManyToManyField('Nominee', blank=True)
-    topics = models.ManyToManyField('Topic', blank=True)
+    positions = models.ManyToManyField('nomcom.Position', blank=True)
+    nominees = models.ManyToManyField('nomcom.Nominee', blank=True)
+    topics = models.ManyToManyField('nomcom.Topic', blank=True)
     subject = models.TextField(verbose_name='Subject', blank=True)
     comments = models.BinaryField(verbose_name='Comments')
     type = ForeignKey(FeedbackTypeName, blank=True, null=True)
-    user = ForeignKey(User, editable=False, blank=True, null=True, on_delete=models.SET_NULL)
+    person = ForeignKey(Person, editable=False, blank=True, null=True, on_delete=models.SET_NULL)
     time = models.DateTimeField(auto_now_add=True)
 
     objects = FeedbackManager()
@@ -326,7 +327,10 @@ class Volunteer(models.Model):
     nomcom = ForeignKey('NomCom')
     person = ForeignKey(Person)
     affiliation = models.CharField(blank=True, max_length=255)
-
+    time = models.DateTimeField(auto_now_add=True, null=True, blank=True)
+    origin = models.CharField(max_length=32, default='datatracker')
+    withdrawn = models.DateTimeField(blank=True, null=True)
+    
     def __str__(self):
         return f'{self.person} for {self.nomcom}'
     
diff --git a/ietf/nomcom/resources.py b/ietf/nomcom/resources.py
index c87e72eae6..109a136419 100644
--- a/ietf/nomcom/resources.py
+++ b/ietf/nomcom/resources.py
@@ -115,11 +115,11 @@ class Meta:
 api.nomcom.register(NomineePositionResource())
 
 from ietf.name.resources import FeedbackTypeNameResource
-from ietf.utils.resources import UserResource
+from ietf.person.resources import PersonResource
 class FeedbackResource(ModelResource):
     nomcom           = ToOneField(NomComResource, 'nomcom')
     type             = ToOneField(FeedbackTypeNameResource, 'type', null=True)
-    user             = ToOneField(UserResource, 'user', null=True)
+    person           = ToOneField(PersonResource, 'person', null=True)
     positions        = ToManyField(PositionResource, 'positions', null=True)
     nominees         = ToManyField(NomineeResource, 'nominees', null=True)
     class Meta:
@@ -136,18 +136,18 @@ class Meta:
             "time": ALL,
             "nomcom": ALL_WITH_RELATIONS,
             "type": ALL_WITH_RELATIONS,
-            "user": ALL_WITH_RELATIONS,
+            "person": ALL_WITH_RELATIONS,
             "positions": ALL_WITH_RELATIONS,
             "nominees": ALL_WITH_RELATIONS,
         }
 api.nomcom.register(FeedbackResource())
 
-from ietf.utils.resources import UserResource
+from ietf.person.resources import PersonResource
 class NominationResource(ModelResource):
     position         = ToOneField(PositionResource, 'position')
     nominee          = ToOneField(NomineeResource, 'nominee')
     comments         = ToOneField(FeedbackResource, 'comments')
-    user             = ToOneField(UserResource, 'user', null=True)
+    person           = ToOneField(PersonResource, 'person', null=True)
     class Meta:
         cache = SimpleCache()
         queryset = Nomination.objects.all()
@@ -164,7 +164,7 @@ class Meta:
             "position": ALL_WITH_RELATIONS,
             "nominee": ALL_WITH_RELATIONS,
             "comments": ALL_WITH_RELATIONS,
-            "user": ALL_WITH_RELATIONS,
+            "person": ALL_WITH_RELATIONS,
         }
 api.nomcom.register(NominationResource())
 
diff --git a/ietf/nomcom/tasks.py b/ietf/nomcom/tasks.py
new file mode 100644
index 0000000000..3d063a6b26
--- /dev/null
+++ b/ietf/nomcom/tasks.py
@@ -0,0 +1,10 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+
+from celery import shared_task
+
+from .utils import send_reminders
+
+
+@shared_task
+def send_nomcom_reminders_task():
+    send_reminders()
diff --git a/ietf/nomcom/templatetags/nomcom_tags.py b/ietf/nomcom/templatetags/nomcom_tags.py
index 05a2c2e8b8..8f795be80e 100644
--- a/ietf/nomcom/templatetags/nomcom_tags.py
+++ b/ietf/nomcom/templatetags/nomcom_tags.py
@@ -1,12 +1,14 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
+# Copyright The IETF Trust 2013-2023, All Rights Reserved
 import os
 import tempfile
 import re
 
+from collections import defaultdict
+
 from django import template
 from django.conf import settings
 from django.template.defaultfilters import linebreaksbr, force_escape
-from django.utils.encoding import force_text, DjangoUnicodeDecodeError
+from django.utils.encoding import force_str, DjangoUnicodeDecodeError
 from django.utils.safestring import mark_safe
 
 import debug           # pyflakes:ignore
@@ -55,8 +57,10 @@ def formatted_email(address):
 
 @register.simple_tag
 def decrypt(string, request, year, plain=False):
-    key = retrieve_nomcom_private_key(request, year)
-
+    try:
+        key = retrieve_nomcom_private_key(request, year)
+    except UnicodeError:
+        return f"-*- Encrypted text [Error retrieving private key, contact the secretariat ({settings.SECRETARIAT_SUPPORT_EMAIL})]"
     if not key:
         return '-*- Encrypted text [No private key provided] -*-'
 
@@ -68,7 +72,7 @@ def decrypt(string, request, year, plain=False):
     code, out, error = pipe(command % (settings.OPENSSL_COMMAND,
                             encrypted_file.name), key)
     try:
-        out = force_text(out)
+        out = force_str(out)
     except DjangoUnicodeDecodeError:
         pass
     if code != 0:
@@ -82,3 +86,11 @@ def decrypt(string, request, year, plain=False):
     if not plain:
         return force_escape(linebreaksbr(out))
     return mark_safe(force_escape(out))
+
+@register.filter
+def feedback_totals(staterank_list):
+    totals = defaultdict(lambda: 0)
+    for fb_dict in staterank_list:
+        for fbtype_name, fbtype_count, _ in fb_dict['feedback']:
+            totals[fbtype_name] += fbtype_count
+    return totals.values()
diff --git a/ietf/nomcom/test_data.py b/ietf/nomcom/test_data.py
index fc4c4fded0..c969022ec6 100644
--- a/ietf/nomcom/test_data.py
+++ b/ietf/nomcom/test_data.py
@@ -94,7 +94,8 @@ def check_comments(encryped, plain, privatekey_file):
 
     decrypted_file.close()
     encrypted_file.close()
-    decrypted_comments = io.open(decrypted_file.name, 'rb').read().decode('utf-8')
+    with io.open(decrypted_file.name, 'rb') as fd:
+        decrypted_comments = fd.read().decode('utf-8')
     os.unlink(encrypted_file.name)
     os.unlink(decrypted_file.name)
 
@@ -116,7 +117,8 @@ def nomcom_test_data():
         nomcom_test_cert_file, privatekey_file = generate_cert()
 
     nomcom.public_key.storage = FileSystemStorage(location=settings.NOMCOM_PUBLIC_KEYS_DIR)
-    nomcom.public_key.save('cert', File(io.open(nomcom_test_cert_file.name, 'r')))
+    with io.open(nomcom_test_cert_file.name, 'r') as fd:
+        nomcom.public_key.save('cert', File(fd))
 
     # chair and member
     create_person(group, "chair", username=CHAIR_USER, email_address='%s%s'%(CHAIR_USER,EMAIL_DOMAIN))
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index 27f55329b6..210788ce07 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -1,15 +1,16 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
+# Copyright The IETF Trust 2012-2025, All Rights Reserved
 
 
 import datetime
 import io
+from unittest import mock
 import random
 import shutil
 
 from pyquery import PyQuery
 from urllib.parse import urlparse
 from itertools import combinations
+from zoneinfo import ZoneInfo
 
 from django.db import IntegrityError
 from django.db.models import Max
@@ -17,38 +18,58 @@
 from django.core.files import File
 from django.contrib.auth.models import User
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.encoding import force_str
 
 import debug                            # pyflakes:ignore
 
+from ietf.api.views import EmailIngestionError
 from ietf.dbtemplate.factories import DBTemplateFactory
 from ietf.dbtemplate.models import DBTemplate
-from ietf.doc.factories import DocEventFactory, WgDocumentAuthorFactory, \
-                               NewRevisionDocEventFactory, DocumentAuthorFactory
+from ietf.doc.factories import (
+    DocEventFactory,
+    WgDocumentAuthorFactory,
+    NewRevisionDocEventFactory,
+    DocumentAuthorFactory,
+    RfcAuthorFactory,
+    WgDraftFactory, WgRfcFactory,
+)
 from ietf.group.factories import GroupFactory, GroupHistoryFactory, RoleFactory, RoleHistoryFactory
 from ietf.group.models import Group, Role
-from ietf.meeting.factories import MeetingFactory, AttendedFactory
+from ietf.meeting.factories import MeetingFactory, AttendedFactory, RegistrationFactory
+from ietf.meeting.models import Registration
 from ietf.message.models import Message
 from ietf.nomcom.test_data import nomcom_test_data, generate_cert, check_comments, \
                                   COMMUNITY_USER, CHAIR_USER, \
                                   MEMBER_USER, SECRETARIAT_USER, EMAIL_DOMAIN, NOMCOM_YEAR
 from ietf.nomcom.models import NomineePosition, Position, Nominee, \
                                NomineePositionStateName, Feedback, FeedbackTypeName, \
-                               Nomination, FeedbackLastSeen, TopicFeedbackLastSeen, ReminderDates
-from ietf.nomcom.management.commands.send_reminders import Command, is_time_to_send
+                               Nomination, FeedbackLastSeen, TopicFeedbackLastSeen, ReminderDates, \
+                               NomCom
 from ietf.nomcom.factories import NomComFactory, FeedbackFactory, TopicFactory, \
                                   nomcom_kwargs_for_year, provide_private_key_to_test_client, \
                                   key
-from ietf.nomcom.utils import get_nomcom_by_year, make_nomineeposition, \
-                              get_hash_nominee_position, is_eligible, list_eligible, \
-                              get_eligibility_date, suggest_affiliation, \
-                              decorate_volunteers_with_qualifications
+from ietf.nomcom.tasks import send_nomcom_reminders_task
+from ietf.nomcom.utils import (
+    get_nomcom_by_year,
+    make_nomineeposition,
+    get_hash_nominee_position,
+    is_eligible,
+    list_eligible,
+    get_eligibility_date,
+    suggest_affiliation,
+    ingest_feedback_email,
+    decorate_volunteers_with_qualifications,
+    send_reminders,
+    _is_time_to_send_reminder,
+    get_qualified_author_queryset,
+)
 from ietf.person.factories import PersonFactory, EmailFactory
 from ietf.person.models import Email, Person
-from ietf.stats.models import MeetingRegistration
-from ietf.stats.factories import MeetingRegistrationFactory
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
+from ietf.utils.timezone import date_today, datetime_today, datetime_from_date, DEADLINE_TZINFO
+
 
 client_test_cert_files = None
 
@@ -94,6 +115,7 @@ def setUp(self):
         self.private_nominate_newperson_url = reverse('ietf.nomcom.views.private_nominate_newperson', kwargs={'year': self.year})
         self.add_questionnaire_url = reverse('ietf.nomcom.views.private_questionnaire', kwargs={'year': self.year})
         self.private_feedback_url = reverse('ietf.nomcom.views.private_feedback', kwargs={'year': self.year})
+        self.private_feedback_email_url = reverse('ietf.nomcom.views.private_feedback_email', kwargs={'year': self.year})
         self.positions_url = reverse('ietf.nomcom.views.list_positions', kwargs={'year': self.year})        
         self.edit_position_url = reverse('ietf.nomcom.views.edit_position', kwargs={'year': self.year})
 
@@ -116,7 +138,7 @@ def access_member_url(self, url):
         self.check_url_status(url, 200)
         self.client.logout()
         login_testing_unauthorized(self, MEMBER_USER, url)
-        return self.check_url_status(url, 200)
+        self.check_url_status(url, 200)
 
     def access_chair_url(self, url):
         login_testing_unauthorized(self, COMMUNITY_USER, url)
@@ -128,7 +150,7 @@ def access_secretariat_url(self, url):
         login_testing_unauthorized(self, COMMUNITY_USER, url)
         login_testing_unauthorized(self, CHAIR_USER, url)
         login_testing_unauthorized(self, SECRETARIAT_USER, url)
-        return self.check_url_status(url, 200)
+        self.check_url_status(url, 200)
 
     def test_private_index_view(self):
         """Verify private home view"""
@@ -593,6 +615,8 @@ def test_public_nominate(self):
         self.nominate_view(public=True,confirmation=True)
 
         self.assertEqual(len(outbox), messages_before + 3)
+        self.assertEqual(Message.objects.count(), 2)
+        self.assertFalse(Message.objects.filter(subject="Nomination receipt").exists())
 
         self.assertEqual('IETF Nomination Information', outbox[-3]['Subject'])
         self.assertEqual(self.email_from, outbox[-3]['From'])
@@ -619,8 +643,7 @@ def test_public_nominate(self):
 
     def test_private_nominate(self):
         self.access_member_url(self.private_nominate_url)
-        return self.nominate_view(public=False)
-        self.client.logout()
+        self.nominate_view(public=False)
 
     def test_public_nominate_newperson(self):
         login_testing_unauthorized(self, COMMUNITY_USER, self.public_nominate_url)
@@ -660,13 +683,13 @@ def test_public_nominate_newperson(self):
 
     def test_private_nominate_newperson(self):
         self.access_member_url(self.private_nominate_url)
-        return self.nominate_newperson_view(public=False)
-        self.client.logout()
+        self.nominate_newperson_view(public=False, confirmation=True)
+        self.assertFalse(Message.objects.filter(subject="Nomination receipt").exists())
 
     def test_private_nominate_newperson_who_already_exists(self):
         EmailFactory(address='nominee@example.com')
         self.access_member_url(self.private_nominate_newperson_url)
-        return self.nominate_newperson_view(public=False)       
+        self.nominate_newperson_view(public=False)       
 
     def test_public_nominate_with_automatic_questionnaire(self):
         nomcom = get_nomcom_by_year(self.year)
@@ -682,20 +705,16 @@ def test_public_nominate_with_automatic_questionnaire(self):
         self.assertIn('nominee@', outbox[1]['To'])
 
 
-    def nominate_view(self, *args, **kwargs):
-        public = kwargs.pop('public', True)
-        searched_email = kwargs.pop('searched_email', None)
-        nominee_email = kwargs.pop('nominee_email', 'nominee@example.com')
+    def nominate_view(self, public=True, searched_email=None,
+                      nominee_email='nominee@example.com',
+                      nominator_email=COMMUNITY_USER+EMAIL_DOMAIN,
+                      position='IAOC', confirmation=False):
+
         if not searched_email:
-            searched_email = Email.objects.filter(address=nominee_email).first() 
-            if not searched_email:
-                searched_email = EmailFactory(address=nominee_email, primary=True, origin='test')
+            searched_email = Email.objects.filter(address=nominee_email).first() or EmailFactory(address=nominee_email, primary=True, origin='test')
         if not searched_email.person:
             searched_email.person = PersonFactory()
             searched_email.save()
-        nominator_email = kwargs.pop('nominator_email', "%s%s" % (COMMUNITY_USER, EMAIL_DOMAIN))
-        position_name = kwargs.pop('position', 'IAOC')
-        confirmation = kwargs.pop('confirmation', False)
 
         if public:
             nominate_url = self.public_nominate_url
@@ -711,14 +730,15 @@ def nominate_view(self, *args, **kwargs):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
+        with io.open(self.cert_file.name, 'r') as fd:
+            nomcom.public_key.save('cert', File(fd))
 
         response = self.client.get(nominate_url)
         self.assertEqual(response.status_code, 200)
         q = PyQuery(response.content)
         self.assertEqual(len(q("#nominate-form")), 1)
 
-        position = Position.objects.get(name=position_name)
+        position = Position.objects.get(name=position)
         comment_text = 'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
         candidate_phone = '123456'
 
@@ -756,12 +776,9 @@ def nominate_view(self, *args, **kwargs):
                                comments=feedback,
                                nominator_email="%s%s" % (COMMUNITY_USER, EMAIL_DOMAIN))
 
-    def nominate_newperson_view(self, *args, **kwargs):
-        public = kwargs.pop('public', True)
-        nominee_email = kwargs.pop('nominee_email', 'nominee@example.com')
-        nominator_email = kwargs.pop('nominator_email', "%s%s" % (COMMUNITY_USER, EMAIL_DOMAIN))
-        position_name = kwargs.pop('position', 'IAOC')
-        confirmation = kwargs.pop('confirmation', False)
+    def nominate_newperson_view(self, public=True, nominee_email='nominee@example.com',
+                                nominator_email=COMMUNITY_USER+EMAIL_DOMAIN,
+                                position='IAOC', confirmation=False):
 
         if public:
             nominate_url = self.public_nominate_newperson_url
@@ -777,14 +794,15 @@ def nominate_newperson_view(self, *args, **kwargs):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
+        with io.open(self.cert_file.name, 'r') as fd:
+            nomcom.public_key.save('cert', File(fd))
 
         response = self.client.get(nominate_url)
         self.assertEqual(response.status_code, 200)
         q = PyQuery(response.content)
         self.assertEqual(len(q("#nominate-form")), 1)
 
-        position = Position.objects.get(name=position_name)
+        position = Position.objects.get(name=position)
         candidate_email = nominee_email
         candidate_name = 'nominee'
         comment_text = 'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
@@ -836,18 +854,15 @@ def nominate_newperson_view(self, *args, **kwargs):
 
     def test_add_questionnaire(self):
         self.access_chair_url(self.add_questionnaire_url)
-        return self.add_questionnaire()
-        self.client.logout()
+        self.add_questionnaire()
 
-    def add_questionnaire(self, *args, **kwargs):
-        public = kwargs.pop('public', False)
-        nominee_email = kwargs.pop('nominee_email', 'nominee@example.com')
-        nominator_email = kwargs.pop('nominator_email', "%s%s" % (COMMUNITY_USER, EMAIL_DOMAIN))
-        position_name = kwargs.pop('position', 'IAOC')
+    def add_questionnaire(self, public=False, nominee_email='nominee@example.com',
+                          nominator_email=COMMUNITY_USER+EMAIL_DOMAIN,
+                          position='IAOC'):
 
         self.nominate_view(public=public,
                            nominee_email=nominee_email,
-                           position=position_name,
+                           position=position,
                            nominator_email=nominator_email)
 
         response = self.client.get(self.add_questionnaire_url)
@@ -859,13 +874,14 @@ def add_questionnaire(self, *args, **kwargs):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
+        with io.open(self.cert_file.name, 'r') as fd:
+            nomcom.public_key.save('cert', File(fd))
 
         response = self.client.get(self.add_questionnaire_url)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "questionnnaireform")
 
-        position = Position.objects.get(name=position_name)
+        position = Position.objects.get(name=position)
         nominee = Nominee.objects.get(email__address=nominee_email)
 
         comment_text = 'Test add questionnaire view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
@@ -897,6 +913,8 @@ def test_public_feedback(self):
         # We're interested in the confirmation receipt here
         self.assertEqual(len(outbox),3)
         self.assertEqual('NomCom comment confirmation', outbox[2]['Subject'])
+        self.assertEqual(Message.objects.count(), 2)
+        self.assertFalse(Message.objects.filter(subject="NomCom comment confirmation").exists())
         email_body = get_payload_text(outbox[2])
         self.assertIn(position, email_body)
         self.assertNotIn('$', email_body)
@@ -911,18 +929,15 @@ def test_public_feedback(self):
 
     def test_private_feedback(self):
         self.access_member_url(self.private_feedback_url)
-        return self.feedback_view(public=False)
+        self.feedback_view(public=False)
 
-    def feedback_view(self, *args, **kwargs):
-        public = kwargs.pop('public', True)
-        nominee_email = kwargs.pop('nominee_email', 'nominee@example.com')
-        nominator_email = kwargs.pop('nominator_email', "%s%s" % (COMMUNITY_USER, EMAIL_DOMAIN))
-        position_name = kwargs.pop('position', 'IAOC')
-        confirmation = kwargs.pop('confirmation', False)
+    def feedback_view(self, public=True, nominee_email='nominee@example.com',
+                      nominator_email=COMMUNITY_USER+EMAIL_DOMAIN,
+                      position='IAOC', confirmation=False):
 
         self.nominate_view(public=public,
                            nominee_email=nominee_email,
-                           position=position_name,
+                           position=position,
                            nominator_email=nominator_email)
 
         feedback_url = self.public_feedback_url
@@ -938,13 +953,14 @@ def feedback_view(self, *args, **kwargs):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
+        with io.open(self.cert_file.name, 'r') as fd:
+            nomcom.public_key.save('cert', File(fd))
 
         response = self.client.get(feedback_url)
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, "feedbackform")
 
-        position = Position.objects.get(name=position_name)
+        position = Position.objects.get(name=position)
         nominee = Nominee.objects.get(email__address=nominee_email)
 
         feedback_url += "?nominee=%d&position=%d" % (nominee.id, position.id)
@@ -960,7 +976,7 @@ def feedback_view(self, *args, **kwargs):
         comments = 'Test feedback view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
 
         test_data = {'comment_text': comments,
-                     'position_name': position.name,
+                     'position': position.name,
                      'nominee_name': nominee.email.person.name,
                      'nominee_email': nominee.email.address,
                      'confirmation': confirmation}
@@ -1003,6 +1019,43 @@ def feedback_view(self, *args, **kwargs):
             nominee_position.save()
 
 
+    def test_private_feedback_email(self):
+        self.access_chair_url(self.private_feedback_email_url)
+
+        feedback_url = self.private_feedback_email_url
+        response = self.client.get(feedback_url)
+        self.assertEqual(response.status_code, 200)
+
+        nomcom = get_nomcom_by_year(self.year)
+        if not nomcom.public_key:
+            self.assertNotContains(response, "paste-email-feedback-form")
+
+        # save the cert file in tmp
+        with io.open(self.cert_file.name, 'r') as fd:
+            nomcom.public_key.save('cert', File(fd))
+
+        response = self.client.get(feedback_url)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "paste-email-feedback-form")
+
+        headers = \
+            "From: Zaphod Beeblebrox <president@galaxy>\n" \
+            "Subject: Ford Prefect\n\n"
+        body = \
+            "Hey, you sass that hoopy Ford Prefect?\n" \
+            "There's a frood who really knows where his towel is.\n"
+
+        test_data = {'email_text': body}
+        response = self.client.post(feedback_url, test_data)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, 'Missing email headers')
+
+        test_data = {'email_text': headers + body}
+        response = self.client.post(feedback_url, test_data)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, 'The feedback email has been registered.')
+
+
 class NomineePositionStateSaveTest(TestCase):
     """Tests for the NomineePosition save override method"""
 
@@ -1031,8 +1084,8 @@ def test_state_specified(self):
                                                           state=NomineePositionStateName.objects.get(slug='accepted'))
         self.assertEqual(nominee_position.state.slug, 'accepted')
 
-    def test_nomine_position_unique(self):
-        """Verify nomine and position are unique together"""
+    def test_nominee_position_unique(self):
+        """Verify nominee and position are unique together"""
         position = Position.objects.get(name='OAM')
         NomineePosition.objects.create(position=position,
                                        nominee=self.nominee)
@@ -1062,7 +1115,8 @@ def test_encrypted_comments(self):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
+        with io.open(self.cert_file.name, 'r') as fd:
+            nomcom.public_key.save('cert', File(fd))
 
         comment_text = 'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
         comments = nomcom.encrypt(comment_text)
@@ -1076,6 +1130,47 @@ def test_encrypted_comments(self):
         self.assertNotEqual(feedback.comments, comment_text)
         self.assertEqual(check_comments(feedback.comments, comment_text, self.privatekey_file), True)
 
+    @mock.patch("ietf.nomcom.utils.create_feedback_email")
+    def test_ingest_feedback_email(self, mock_create_feedback_email):
+        message = b"This is nomcom feedback"
+        no_nomcom_year = date_today().year + 10  # a guess at a year with no nomcoms
+        while NomCom.objects.filter(group__acronym__icontains=no_nomcom_year).exists():
+            no_nomcom_year += 1
+        inactive_nomcom = NomComFactory(group__state_id="conclude", group__acronym=f"nomcom{no_nomcom_year + 1}")
+
+        # cases where the nomcom does not exist, so admins are notified
+        for bad_year in (no_nomcom_year, inactive_nomcom.year()):
+            with self.assertRaises(EmailIngestionError) as context:
+                ingest_feedback_email(message, bad_year)
+            self.assertIn("does not exist", context.exception.msg)
+            self.assertIsNotNone(context.exception.email_body)  # error message to be sent
+            self.assertIsNone(context.exception.email_recipients)  # default recipients (i.e., admin)
+            self.assertIsNone(context.exception.email_original_message)  # no original message
+            self.assertFalse(context.exception.email_attach_traceback)  # no traceback
+            self.assertFalse(mock_create_feedback_email.called)
+        
+        # nomcom exists but an error occurs, so feedback goes to the nomcom chair
+        active_nomcom = NomComFactory(group__acronym=f"nomcom{no_nomcom_year + 2}")
+        mock_create_feedback_email.side_effect = ValueError("ouch!")
+        with self.assertRaises(EmailIngestionError) as context:
+            ingest_feedback_email(message, active_nomcom.year())
+        self.assertIn(f"Error ingesting nomcom {active_nomcom.year()}", context.exception.msg)
+        self.assertIsNotNone(context.exception.email_body)  # error message to be sent
+        self.assertEqual(context.exception.email_recipients, active_nomcom.chair_emails())
+        self.assertEqual(context.exception.email_original_message, message)
+        self.assertFalse(context.exception.email_attach_traceback)  # no traceback
+        self.assertTrue(mock_create_feedback_email.called)
+        self.assertEqual(mock_create_feedback_email.call_args, mock.call(active_nomcom, message))
+        mock_create_feedback_email.reset_mock()
+
+        # and, finally, success
+        mock_create_feedback_email.side_effect = None
+        mock_create_feedback_email.return_value = FeedbackFactory(author="someone@example.com")
+        ingest_feedback_email(message, active_nomcom.year())
+        self.assertTrue(mock_create_feedback_email.called)
+        self.assertEqual(mock_create_feedback_email.call_args, mock.call(active_nomcom, message))
+
+
 class ReminderTest(TestCase):
 
     def setUp(self):
@@ -1085,13 +1180,14 @@ def setUp(self):
         self.nomcom = get_nomcom_by_year(NOMCOM_YEAR)
         self.cert_file, self.privatekey_file = get_cert_files()
         #self.nomcom.public_key.storage.location = tempfile.gettempdir()
-        self.nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
+        with io.open(self.cert_file.name, 'r') as fd:
+            self.nomcom.public_key.save('cert', File(fd))
 
         gen = Position.objects.get(nomcom=self.nomcom,name='GEN')
         rai = Position.objects.get(nomcom=self.nomcom,name='RAI')
         iab = Position.objects.get(nomcom=self.nomcom,name='IAB')
 
-        today = datetime.date.today()
+        today = datetime_today()
         t_minus_3 = today - datetime.timedelta(days=3)
         t_minus_4 = today - datetime.timedelta(days=4)
         e1 = EmailFactory(address="nominee1@example.org", person=PersonFactory(name="Nominee 1"), origin='test')
@@ -1117,7 +1213,7 @@ def setUp(self):
         feedback = Feedback.objects.create(nomcom=self.nomcom,
                                            comments=self.nomcom.encrypt('some non-empty comments'),
                                            type=FeedbackTypeName.objects.get(slug='questio'),
-                                           user=User.objects.get(username=CHAIR_USER))
+                                           person=User.objects.get(username=CHAIR_USER).person)
         feedback.positions.add(gen)
         feedback.nominees.add(n)
 
@@ -1125,36 +1221,41 @@ def tearDown(self):
         teardown_test_public_keys_dir(self)
         super().tearDown()
 
-    def test_is_time_to_send(self):
+    def test_is_time_to_send_reminder(self):
         self.nomcom.reminder_interval = 4
-        today = datetime.date.today()
-        self.assertTrue(is_time_to_send(self.nomcom,today+datetime.timedelta(days=4),today))
+        today = date_today()
+        self.assertTrue(
+            _is_time_to_send_reminder(self.nomcom, today + datetime.timedelta(days=4), today)
+        )
         for delta in range(4):
-            self.assertFalse(is_time_to_send(self.nomcom,today+datetime.timedelta(days=delta),today))
+            self.assertFalse(
+                _is_time_to_send_reminder(
+                    self.nomcom, today + datetime.timedelta(days=delta), today
+                )
+            )
         self.nomcom.reminder_interval = None
-        self.assertFalse(is_time_to_send(self.nomcom,today,today))
+        self.assertFalse(_is_time_to_send_reminder(self.nomcom, today, today))
         self.nomcom.reminderdates_set.create(date=today)
-        self.assertTrue(is_time_to_send(self.nomcom,today,today))
+        self.assertTrue(_is_time_to_send_reminder(self.nomcom, today, today))
 
-    def test_command(self):
-        c = Command()
-        messages_before=len(outbox)
+    def test_send_reminders(self):
+        messages_before = len(outbox)
         self.nomcom.reminder_interval = 3
         self.nomcom.save()
-        c.handle(None,None)
+        send_reminders()
         self.assertEqual(len(outbox), messages_before + 2)
         self.assertIn('nominee1@example.org', outbox[-1]['To'])
         self.assertIn('please complete', outbox[-1]['Subject'])
         self.assertIn('nominee1@example.org', outbox[-2]['To'])
         self.assertIn('please accept', outbox[-2]['Subject'])
-        messages_before=len(outbox)
+        messages_before = len(outbox)
         self.nomcom.reminder_interval = 4
         self.nomcom.save()
-        c.handle(None,None)
+        send_reminders()
         self.assertEqual(len(outbox), messages_before + 1)
         self.assertIn('nominee2@example.org', outbox[-1]['To'])
         self.assertIn('please accept', outbox[-1]['Subject'])
-     
+
     def test_remind_accept_view(self):
         url = reverse('ietf.nomcom.views.send_reminder_mail', kwargs={'year': NOMCOM_YEAR,'type':'accept'})
         login_testing_unauthorized(self, CHAIR_USER, url)
@@ -1233,7 +1334,7 @@ def test_nominations_closed(self):
             self.assertIn( 'closed', q('.alert-warning').text())
 
     def test_acceptance_closed(self):
-        today = datetime.date.today().strftime('%Y%m%d')
+        today = date_today().strftime('%Y%m%d')
         pid = self.nc.position_set.first().nomineeposition_set.order_by('pk').first().id 
         url = reverse('ietf.nomcom.views.process_nomination_status', kwargs = {
                       'year' : self.nc.year(),
@@ -1276,6 +1377,36 @@ def test_cannot_modify_nominees(self):
         q = PyQuery(response.content)
         self.assertIn('not active', q('.alert-warning').text() )
 
+    def test_filter_nominees(self):
+        url = reverse(
+            "ietf.nomcom.views.private_index", kwargs={"year": self.nc.year()}
+        )
+        login_testing_unauthorized(self, self.chair.user.username, url)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+        states = list(NomineePositionStateName.objects.values_list("slug", flat=True))
+        states += ["not-declined", "questionnaire"]
+        for state in states:
+            response = self.client.get(url, {"state": state})
+            self.assertEqual(response.status_code, 200)
+            q = PyQuery(response.content)
+            nps = []
+            if state == "not-declined":
+                nps = NomineePosition.objects.exclude(state__slug="declined")
+            elif state == "questionnaire":
+                nps = [
+                    np
+                    for np in NomineePosition.objects.not_duplicated()
+                    if np.questionnaires
+                ]
+            else:
+                nps = NomineePosition.objects.filter(state__slug=state)
+            # nomination state is in third table column
+            self.assertEqual(
+                len(nps), len(q("#nominee-position-table td:nth-child(3)"))
+            )
+
     def test_email_pasting_closed(self):
         url = reverse('ietf.nomcom.views.private_feedback_email', kwargs={'year':self.nc.year()})
         login_testing_unauthorized(self, self.chair.user.username, url)
@@ -1372,6 +1503,35 @@ def test_can_view_but_not_edit_templates(self):
         q = PyQuery(response.content)
         self.assertFalse( q('#templateform') )
 
+class FeedbackIndexTests(TestCase):
+
+    def setUp(self):
+        super().setUp()
+        setup_test_public_keys_dir(self)
+        self.nc = NomComFactory.create(**nomcom_kwargs_for_year())
+        self.author = PersonFactory.create().email_set.first().address
+        self.member = self.nc.group.role_set.filter(name='member').first().person
+        self.nominee = self.nc.nominee_set.order_by('pk').first()
+        self.position = self.nc.position_set.first()
+        for type_id in ['comment','nomina','questio']:
+            f = FeedbackFactory.create(author=self.author,nomcom=self.nc,type_id=type_id)
+            f.positions.add(self.position)
+            f.nominees.add(self.nominee)
+
+    def tearDown(self):
+        teardown_test_public_keys_dir(self)
+        super().tearDown()
+
+    def test_feedback_index_totals(self):
+        url = reverse('ietf.nomcom.views.view_feedback',kwargs={'year':self.nc.year()})
+        login_testing_unauthorized(self, self.member.user.username, url)
+        provide_private_key_to_test_client(self)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code,200)
+        q = PyQuery(response.content)
+        r = q('tfoot').eq(0).find('td').contents()
+        self.assertEqual([a.strip() for a in r], ['1', '1', '1', '0'])
+
 class FeedbackLastSeenTests(TestCase):
 
     def setUp(self):
@@ -1389,7 +1549,7 @@ def setUp(self):
             f.nominees.add(self.nominee)
         f = FeedbackFactory.create(author=self.author,nomcom=self.nc,type_id='comment')
         f.topics.add(self.topic)
-        now = datetime.datetime.now() 
+        now = timezone.now() 
         self.hour_ago = now - datetime.timedelta(hours=1)
         self.half_hour_ago = now - datetime.timedelta(minutes=30)
         self.second_from_now = now + datetime.timedelta(seconds=1)
@@ -1405,7 +1565,7 @@ def test_feedback_index_badges(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 4 )
+        self.assertEqual( len(q('.text-bg-success')), 4 )
 
         f = self.nc.feedback_set.first()
         f.time = self.hour_ago
@@ -1415,20 +1575,20 @@ def test_feedback_index_badges(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 3 )
+        self.assertEqual( len(q('.text-bg-success')), 3 )
 
         FeedbackLastSeen.objects.update(time=self.second_from_now)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 1 )
+        self.assertEqual( len(q('.text-bg-success')), 1 )
 
         TopicFeedbackLastSeen.objects.create(reviewer=self.member,topic=self.topic)
         TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 0 )
+        self.assertEqual( len(q('.text-bg-success')), 0 )
 
     def test_feedback_nominee_badges(self):
         url = reverse('ietf.nomcom.views.view_feedback_nominee', kwargs={'year':self.nc.year(), 'nominee_id':self.nominee.id})
@@ -1437,7 +1597,7 @@ def test_feedback_nominee_badges(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 3 )
+        self.assertEqual( len(q('.text-bg-success')), 3 )
 
         f = self.nc.feedback_set.first()
         f.time = self.hour_ago
@@ -1447,13 +1607,13 @@ def test_feedback_nominee_badges(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 2 )
+        self.assertEqual( len(q('.text-bg-success')), 2 )
 
         FeedbackLastSeen.objects.update(time=self.second_from_now)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 0 )
+        self.assertEqual( len(q('.text-bg-success')), 0 )
 
     def test_feedback_topic_badges(self):
         url = reverse('ietf.nomcom.views.view_feedback_topic', kwargs={'year':self.nc.year(), 'topic_id':self.topic.id})
@@ -1462,7 +1622,7 @@ def test_feedback_topic_badges(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 1 )
+        self.assertEqual( len(q('.text-bg-success')), 1 )
 
         f = self.topic.feedback_set.first()
         f.time = self.hour_ago
@@ -1472,20 +1632,23 @@ def test_feedback_topic_badges(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 0 )
+        self.assertEqual( len(q('.text-bg-success')), 0 )
 
         TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q = PyQuery(response.content)
-        self.assertEqual( len(q('.bg-success')), 0 )
+        self.assertEqual( len(q('.text-bg-success')), 0 )
 
 class NewActiveNomComTests(TestCase):
 
     def setUp(self):
         super().setUp()
         setup_test_public_keys_dir(self)
-        self.nc = NomComFactory.create(**nomcom_kwargs_for_year(year=random.randint(1992,2100)))
+        # Pin nomcom years to be after 2008 or later so that ietf.nomcom.utils.list_eligible can 
+        # return something other than empty. Note that anything after 2022 is suspect, and that
+        # we should revisit this when implementing RFC 9389.
+        self.nc = NomComFactory.create(**nomcom_kwargs_for_year(year=random.randint(2008,2100)))
         self.chair = self.nc.group.role_set.filter(name='chair').first().person
         self.saved_days_to_expire_nomination_link = settings.DAYS_TO_EXPIRE_NOMINATION_LINK
 
@@ -1503,11 +1666,12 @@ def test_help(self):
     def test_accept_reject_nomination_edges(self):
         self.client.logout()
         np = self.nc.nominee_set.order_by('pk').first().nomineeposition_set.order_by('pk').first()
+        date_str = np.time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime("%Y%m%d")
         kwargs={'year':self.nc.year(),
                 'nominee_position_id':np.id,
                 'state':'accepted',
-                'date':np.time.strftime("%Y%m%d"),
-                'hash':get_hash_nominee_position(np.time.strftime("%Y%m%d"),np.id),
+                'date':date_str,
+                'hash':get_hash_nominee_position(date_str, np.id),
                }
         url = reverse('ietf.nomcom.views.process_nomination_status', kwargs=kwargs)
         response = self.client.get(url)
@@ -1517,8 +1681,9 @@ def test_accept_reject_nomination_edges(self):
         settings.DAYS_TO_EXPIRE_NOMINATION_LINK = 2
         np.time = np.time - datetime.timedelta(days=3)
         np.save()
-        kwargs['date'] = np.time.strftime("%Y%m%d")
-        kwargs['hash'] = get_hash_nominee_position(np.time.strftime("%Y%m%d"),np.id)
+        date_str = np.time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime("%Y%m%d")
+        kwargs['date'] = date_str
+        kwargs['hash'] = get_hash_nominee_position(date_str, np.id)
         url = reverse('ietf.nomcom.views.process_nomination_status', kwargs=kwargs)
         response = self.client.get(url)
         self.assertEqual(response.status_code,403)
@@ -1532,12 +1697,13 @@ def test_accept_reject_nomination_edges(self):
 
     def test_accept_reject_nomination_comment(self):
         np = self.nc.nominee_set.order_by('pk').first().nomineeposition_set.order_by('pk').first()
-        hash = get_hash_nominee_position(np.time.strftime("%Y%m%d"),np.id)
+        date_str = np.time.astimezone(ZoneInfo(settings.TIME_ZONE)).strftime("%Y%m%d")
+        hash = get_hash_nominee_position(date_str, np.id)
         url = reverse('ietf.nomcom.views.process_nomination_status',
                       kwargs={'year':self.nc.year(),
                               'nominee_position_id':np.id,
                               'state':'accepted',
-                              'date':np.time.strftime("%Y%m%d"),
+                              'date':date_str,
                               'hash':hash,
                              }
                      )
@@ -1561,6 +1727,16 @@ def test_provide_private_key(self):
         login_testing_unauthorized(self,self.chair.user.username,url)
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
+        # Check that we get an error if there's an encoding problem talking to openssl
+        # "\xc3\x28" is an invalid utf8 string
+        with mock.patch("ietf.nomcom.utils.pipe", return_value=(0, b"\xc3\x28", None)):
+            response = self.client.post(url, {'key': force_str(key)})
+        self.assertFormError(
+            response.context["form"],
+            None,
+            "An internal error occurred while adding your private key to your session."
+            f"Please contact the secretariat for assistance ({settings.SECRETARIAT_SUPPORT_EMAIL})",
+        )
         response = self.client.post(url,{'key': force_str(key)})
         self.assertEqual(response.status_code,302)
 
@@ -1605,7 +1781,7 @@ def test_simple_feedback_pending(self):
         fb = Feedback.objects.get(id=fb.id)
         self.assertEqual(fb.type_id,'junk')
 
-        # comments, nominations, and questionnare responses are catagorized via a second 
+        # comments, nominations, and questionnaire responses are categorized via a second
         # formset presented by the view (signaled by having 'end' appear in the POST)
         fb = FeedbackFactory(nomcom=self.nc,type_id=None)
         np = NomineePosition.objects.filter(position__nomcom = self.nc,state='accepted').first()
@@ -1889,7 +2065,7 @@ def first_meeting_of_year(year):
             assert year >= 1990
             return (year-1985)*3+2
         # Create meetings to ensure we have the 'last 5'
-        meeting_start = first_meeting_of_year(datetime.date.today().year-2)
+        meeting_start = first_meeting_of_year(date_today().year-2)
         # Populate the meeting registration records
         for number in range(meeting_start, meeting_start+10):
             meeting = MeetingFactory.create(type_id='ietf', number=number)
@@ -1899,7 +2075,15 @@ def first_meeting_of_year(year):
                 if not ' ' in ascii:
                     continue
                 first_name, last_name = ascii.rsplit(None, 1)
-                MeetingRegistration.objects.create(meeting=meeting, first_name=first_name, last_name=last_name, person=person, country_code='WO', email=email, attended=True)
+                RegistrationFactory(
+                    meeting=meeting,
+                    first_name=first_name,
+                    last_name=last_name,
+                    person=person,
+                    country_code='WO',
+                    email=email,
+                    attended=True
+                )
         for view in ('public_eligible','private_eligible'):
             url = reverse(f'ietf.nomcom.views.{view}',kwargs={'year':self.nc.year()})
             for username in (self.chair.user.username,'secretary'):
@@ -1922,7 +2106,7 @@ def first_meeting_of_year(year):
         for number in range(meeting_start, meeting_start+8):
             m = MeetingFactory.create(type_id='ietf', number=number)
             for p in people:
-                m.meetingregistration_set.create(person=p)
+                RegistrationFactory(meeting=m, person=p, checkedin=True, attended=True)
         for p in people:
             self.nc.volunteer_set.create(person=p,affiliation='something')
         for view in ('public_volunteers','private_volunteers'):
@@ -1940,9 +2124,13 @@ def first_meeting_of_year(year):
         login_testing_unauthorized(self,self.chair.user.username,url)
         response = self.client.get(url)
         self.assertContains(response,people[-1].email(),status_code=200)
-
-
-
+        unqualified_person = PersonFactory()
+        url = reverse('ietf.nomcom.views.qualified_volunteer_list_for_announcement',kwargs={'year':year})
+        self.client.logout()
+        login_testing_unauthorized(self,self.chair.user.username,url)
+        response = self.client.get(url)
+        self.assertContains(response, people[-1].plain_name(), status_code=200)
+        self.assertNotContains(response, unqualified_person.plain_name())
 
 class NomComIndexTests(TestCase):
     def setUp(self):
@@ -1966,10 +2154,10 @@ def do_common_work(self,url,expected_form):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q=PyQuery(response.content)
-        text_bits = [x.xpath('./text()') for x in q('.alert-warning')]
+        text_bits = [x.xpath('.//text()') for x in q('.alert-warning')]
         flat_text_bits = [item for sublist in text_bits for item in sublist]
         self.assertTrue(any(['not yet' in y for y in flat_text_bits]))
-        self.assertEqual(bool(q('form:not(.navbar-form)')),expected_form)
+        self.assertEqual(bool(q('#content form:not(.navbar-form)')),expected_form)
         self.client.logout()
 
     def test_not_yet(self):
@@ -2058,7 +2246,7 @@ def test_public_accepting_feedback(self):
         self.assertIn('not currently accepting feedback', unicontent(response))
 
         test_data = {'comment_text': 'junk',
-                     'position_name': pos.name,
+                     'position': pos.name,
                      'nominee_name': pos.nominee_set.first().email.person.name,
                      'nominee_email': pos.nominee_set.first().email.address,
                      'confirmation': False,
@@ -2241,7 +2429,8 @@ class EligibilityUnitTests(TestCase):
     def test_get_eligibility_date(self):
 
         # No Nomcoms exist:
-        self.assertEqual(get_eligibility_date(), datetime.date(datetime.date.today().year,5,1))
+        this_year = date_today().year
+        self.assertEqual(get_eligibility_date(), datetime.date(this_year,5,1))
 
         # a provided date trumps anything in the database
         self.assertEqual(get_eligibility_date(date=datetime.date(2001,2,3)), datetime.date(2001,2,3))
@@ -2255,7 +2444,7 @@ def test_get_eligibility_date(self):
         n.save()
         self.assertEqual(get_eligibility_date(nomcom=n), datetime.date(2015,5,17))
         # No nomcoms in the database with seated members
-        self.assertEqual(get_eligibility_date(), datetime.date(datetime.date.today().year,5,1))
+        self.assertEqual(get_eligibility_date(), datetime.date(this_year,5,1))
 
         RoleFactory(group=n.group,name_id='member')
         self.assertEqual(get_eligibility_date(),datetime.date(2016,5,1))
@@ -2263,10 +2452,88 @@ def test_get_eligibility_date(self):
         NomComFactory(group__acronym='nomcom2016', populate_personnel=False, first_call_for_volunteers=datetime.date(2016,5,4))
         self.assertEqual(get_eligibility_date(),datetime.date(2016,5,4))
 
-        this_year = datetime.date.today().year
         NomComFactory(group__acronym=f'nomcom{this_year}', first_call_for_volunteers=datetime.date(this_year,5,6))
         self.assertEqual(get_eligibility_date(),datetime.date(this_year,5,6))
 
+    def test_get_qualified_author_queryset(self):
+        """get_qualified_author_queryset implements the eligiblity rules correctly
+
+        This is not an exhaustive test of corner cases. Overlaps considerably with
+        rfc8989EligibilityTests.test_elig_by_author().
+        """
+        people = PersonFactory.create_batch(2)
+        extra_person = PersonFactory()
+        base_qs = Person.objects.filter(pk__in=[person.pk for person in people])
+        now = datetime.datetime.now(tz=datetime.UTC)
+        one_year = datetime.timedelta(days=365)
+
+        # Authors with no qualifying drafts
+        self.assertCountEqual(
+            get_qualified_author_queryset(base_qs, now - 5 * one_year, now), []
+        )
+
+        # Authors with one qualifying draft
+        approved_draft = WgDraftFactory(authors=people, states=[("draft", "active")])
+        DocEventFactory(
+            type="iesg_approved",
+            doc=approved_draft,
+            time=now - 4 * one_year,
+        )
+        self.assertCountEqual(
+            get_qualified_author_queryset(base_qs, now - 5 * one_year, now), []
+        )
+
+        # Create a draft that was published into an RFC. Give it an extra author who
+        # should not be eligible.
+        published_draft = WgDraftFactory(authors=people, states=[("draft", "rfc")])
+        DocEventFactory(
+            type="iesg_approved",
+            doc=published_draft,
+            time=now - 5.5 * one_year,  # < 6 years ago
+        )
+        rfc = WgRfcFactory(
+            authors=people + [extra_person],
+            group=published_draft.group,
+        )
+        DocEventFactory(
+            type="published_rfc",
+            doc=rfc,
+            time=now - 0.5 * one_year,  # < 1 year ago
+        )
+        # Period 6 years ago to 1 year ago - authors are eligible due to the
+        # iesg-approved draft in this window
+        self.assertCountEqual(
+            get_qualified_author_queryset(base_qs, now - 6 * one_year, now - one_year),
+            people,
+        )
+
+        # Period 5 years ago to now - authors are eligible due to the RFC publication
+        self.assertCountEqual(
+            get_qualified_author_queryset(base_qs, now - 5 * one_year, now),
+            people,
+        )
+        
+        # Use the extra_person to check that a single doc can't count both as an
+        # RFC _and_ an approved draft. Use an eligibility interval that includes both
+        # the approval and the RFC publication
+        self.assertCountEqual(
+            get_qualified_author_queryset(base_qs, now - 6 * one_year, now),
+            people,  # does not include extra_person!
+        )
+
+        # Now add an RfcAuthor for only one of the two authors to the RFC. This should
+        # remove the other author from the eligibility list because the DocumentAuthor
+        # records are no longer used.
+        RfcAuthorFactory(
+            document=rfc,
+            person=people[0],
+            titlepage_name="P. Zero",
+        )
+        self.assertCountEqual(
+            get_qualified_author_queryset(base_qs, now - 5 * one_year, now),
+            [people[0]],
+        )
+
 
 class rfc8713EligibilityTests(TestCase):
 
@@ -2285,16 +2552,29 @@ def setUp(self):
         self.eligible_people = list()
         self.ineligible_people = list()
 
+        # Section 4.14 qualification criteria
         for combo_len in range(0,6):
             for combo in combinations(meetings,combo_len):
                 p = PersonFactory()
                 for m in combo:
-                    MeetingRegistrationFactory(person=p, meeting=m, attended=True)
+                    RegistrationFactory(person=p, meeting=m, attended=True)
                 if combo_len<3:
                     self.ineligible_people.append(p)
                 else:
                     self.eligible_people.append(p)
 
+        # Section 4.15 disqualification criteria
+        def ineligible_person_with_role(**kwargs):
+            p = RoleFactory(**kwargs).person
+            for m in meetings:
+                RegistrationFactory(person=p, meeting=m, attended=True)
+            self.ineligible_people.append(p)
+        for group in ['isocbot', 'ietf-trust', 'llc-board', 'iab']:
+            for role in ['member', 'chair']:
+                ineligible_person_with_role(group__acronym=group, name_id=role)
+        ineligible_person_with_role(group__type_id='area', group__state_id='active',name_id='ad')
+        ineligible_person_with_role(group=self.nomcom.group, name_id='chair')
+
         # No-one is eligible for the other_nomcom
         self.other_nomcom = NomComFactory(group__acronym='nomcom2018',first_call_for_volunteers=datetime.date(2018,5,1))
 
@@ -2302,8 +2582,7 @@ def setUp(self):
         self.other_date = datetime.date(2009,5,1)
         self.other_people = PersonFactory.create_batch(1)
         for date in (datetime.date(2009,3,1), datetime.date(2008,11,1), datetime.date(2008,7,1)):
-            MeetingRegistrationFactory(person=self.other_people[0],meeting__date=date, meeting__type_id='ietf', attended=True)
-
+            RegistrationFactory(person=self.other_people[0], meeting__date=date, meeting__type_id='ietf', attended=True)
 
     def test_is_person_eligible(self):
         for person in self.eligible_people:
@@ -2347,7 +2626,7 @@ def setUp(self):
             for combo in combinations(meetings,combo_len):
                 p = PersonFactory()
                 for m in combo:
-                    MeetingRegistrationFactory(person=p, meeting=m, attended=True)
+                    RegistrationFactory(person=p, meeting=m, attended=True)
                 if combo_len<3:
                     self.ineligible_people.append(p)
                 else:
@@ -2395,7 +2674,7 @@ def test_elig_by_meetings(self):
                 for combo in combinations(prev_five,combo_len):
                     p = PersonFactory()
                     for m in combo:
-                        MeetingRegistrationFactory(person=p, meeting=m, attended=True) # not checkedin because this forces looking at older meetings
+                        RegistrationFactory(person=p, meeting=m, attended=True) # not checkedin because this forces looking at older meetings
                         AttendedFactory(session__meeting=m, session__type_id='plenary',person=p)
                     if combo_len<3:
                         ineligible_people.append(p)
@@ -2410,14 +2689,16 @@ def test_elig_by_meetings(self):
             for person in ineligible_people:
                 self.assertFalse(is_eligible(person,nomcom))
 
-            Person.objects.filter(pk__in=[p.pk for p in eligible_people+ineligible_people]).delete()
-
+            people = Person.objects.filter(pk__in=[p.pk for p in eligible_people + ineligible_people])
+            Registration.objects.filter(person__in=people).delete()
+            people.delete()
 
     def test_elig_by_office_active_groups(self):
 
         nobody=PersonFactory()
         for nomcom in self.nomcoms:
-            before_elig_date = nomcom.first_call_for_volunteers - datetime.timedelta(days=5)
+            elig_datetime = datetime_from_date(nomcom.first_call_for_volunteers, DEADLINE_TZINFO)
+            before_elig_date = elig_datetime - datetime.timedelta(days=5)
 
             chair = RoleFactory(name_id='chair',group__time=before_elig_date).person
 
@@ -2435,7 +2716,7 @@ def test_elig_by_office_active_groups(self):
     def test_elig_by_office_edge(self):
 
         for nomcom in self.nomcoms:
-            elig_date=get_eligibility_date(nomcom)
+            elig_date = datetime_from_date(get_eligibility_date(nomcom), DEADLINE_TZINFO)
             day_after = elig_date + datetime.timedelta(days=1)
             two_days_after = elig_date + datetime.timedelta(days=2)
 
@@ -2450,15 +2731,15 @@ def test_elig_by_office_edge(self):
     def test_elig_by_office_closed_groups(self):
 
         for nomcom in self.nomcoms:
-            elig_date=get_eligibility_date(nomcom)
+            elig_date=datetime_from_date(get_eligibility_date(nomcom), DEADLINE_TZINFO)
             day_before = elig_date-datetime.timedelta(days=1)
             # special case for Feb 29
             if elig_date.month == 2 and elig_date.day == 29:
-                year_before = datetime.date(elig_date.year - 1, 2, 28)
-                three_years_before = datetime.date(elig_date.year - 3, 2, 28)
+                year_before = elig_date.replace(year=elig_date.year - 1, day=28)
+                three_years_before = elig_date.replace(year=elig_date.year - 3, day=28)
             else:
-                year_before = datetime.date(elig_date.year - 1, elig_date.month, elig_date.day)
-                three_years_before = datetime.date(elig_date.year - 3, elig_date.month, elig_date.day)
+                year_before = elig_date.replace(year=elig_date.year - 1)
+                three_years_before = elig_date.replace(year=elig_date.year - 3)
             just_after_three_years_before = three_years_before + datetime.timedelta(days=1)
             just_before_three_years_before = three_years_before - datetime.timedelta(days=1)
 
@@ -2468,6 +2749,7 @@ def test_elig_by_office_closed_groups(self):
             p1 = RoleHistoryFactory(
                 name_id='chair',
                 group__time=day_before,
+                group__state_id='active',
                 group__group__state_id='conclude',
             ).person
             eligible.append(p1)
@@ -2475,6 +2757,7 @@ def test_elig_by_office_closed_groups(self):
             p2 = RoleHistoryFactory(
                 name_id='secr',
                 group__time=year_before,
+                group__state_id='active',
                 group__group__state_id='conclude',
             ).person
             eligible.append(p2)
@@ -2482,6 +2765,7 @@ def test_elig_by_office_closed_groups(self):
             p3 = RoleHistoryFactory(
                 name_id='secr',
                 group__time=just_after_three_years_before,
+                group__state_id='active',
                 group__group__state_id='conclude',
             ).person
             eligible.append(p3)
@@ -2489,6 +2773,7 @@ def test_elig_by_office_closed_groups(self):
             p4 = RoleHistoryFactory(
                 name_id='chair',
                 group__time=three_years_before,
+                group__state_id='active',
                 group__group__state_id='conclude',
             ).person
             eligible.append(p4)
@@ -2496,6 +2781,7 @@ def test_elig_by_office_closed_groups(self):
             p5 = RoleHistoryFactory(
                 name_id='chair',
                 group__time=just_before_three_years_before,
+                group__state_id='active',
                 group__group__state_id='conclude',
             ).person
             ineligible.append(p5)
@@ -2517,14 +2803,14 @@ def test_elig_by_author(self):
         for nomcom in self.nomcoms:
             elig_date = get_eligibility_date(nomcom)
 
-            last_date = elig_date
+            last_date = datetime_from_date(elig_date, DEADLINE_TZINFO)
             # special case for Feb 29
             if last_date.month == 2 and last_date.day == 29:
-                first_date = datetime.date(last_date.year - 5, 2, 28)
-                middle_date = datetime.date(last_date.year - 3, 2, 28)
+                first_date = last_date.replace(year = last_date.year - 5, day=28)
+                middle_date = last_date.replace(year=first_date.year - 3, day=28)
             else:
-                first_date = datetime.date(last_date.year - 5, last_date.month, last_date.day)
-                middle_date = datetime.date(last_date.year - 3, last_date.month, last_date.day)
+                first_date = last_date.replace(year=last_date.year - 5)
+                middle_date = last_date.replace(year=first_date.year - 3)
             day_after_last_date = last_date+datetime.timedelta(days=1)
             day_before_first_date = first_date-datetime.timedelta(days=1)
 
@@ -2532,33 +2818,41 @@ def test_elig_by_author(self):
             ineligible = set()
 
             p = PersonFactory()
-            ineligible.add(p)
-
+            ineligible.add(p)  # no RFCs or iesg-approved drafts
             p = PersonFactory()
-            da = WgDocumentAuthorFactory(person=p)
-            DocEventFactory(type='published_rfc',doc=da.document,time=middle_date)
-            ineligible.add(p)
+            doc = WgRfcFactory(authors=[p])
+            DocEventFactory(type='published_rfc', doc=doc, time=middle_date)
+            ineligible.add(p)  # only one RFC
 
             p = PersonFactory()
-            da = WgDocumentAuthorFactory(person=p)
+            da = WgDocumentAuthorFactory(
+                person=p,
+                document__states=[("draft", "active"), ("draft-rfceditor", "ref")],
+            )
             DocEventFactory(type='iesg_approved',doc=da.document,time=last_date)
-            da = WgDocumentAuthorFactory(person=p)
-            DocEventFactory(type='published_rfc',doc=da.document,time=first_date)
-            eligible.add(p)
+            doc = WgRfcFactory(authors=[p])
+            DocEventFactory(type='published_rfc', doc=doc, time=first_date)
+            eligible.add(p)  # one RFC and one iesg-approved draft
 
             p = PersonFactory()
-            da = WgDocumentAuthorFactory(person=p)
+            da = WgDocumentAuthorFactory(
+                person=p,
+                document__states=[("draft", "active"), ("draft-rfceditor", "ref")],
+            )
             DocEventFactory(type='iesg_approved',doc=da.document,time=middle_date)
-            da = WgDocumentAuthorFactory(person=p)
-            DocEventFactory(type='published_rfc',doc=da.document,time=day_before_first_date)
-            ineligible.add(p)
+            doc = WgRfcFactory(authors=[p])
+            DocEventFactory(type='published_rfc', doc=doc, time=day_before_first_date)
+            ineligible.add(p)  # RFC is out of the eligibility window
 
             p = PersonFactory()
-            da = WgDocumentAuthorFactory(person=p)
+            da = WgDocumentAuthorFactory(
+                person=p,
+                document__states=[("draft", "active"), ("draft-rfceditor", "ref")],
+            )
             DocEventFactory(type='iesg_approved',doc=da.document,time=day_after_last_date)
-            da = WgDocumentAuthorFactory(person=p)
-            DocEventFactory(type='published_rfc',doc=da.document,time=middle_date)
-            ineligible.add(p)
+            doc = WgRfcFactory(authors=[p])
+            DocEventFactory(type='published_rfc', doc=doc, time=middle_date)
+            ineligible.add(p)  # iesg approval is outside the eligibility window
 
             for person in eligible:
                 self.assertTrue(is_eligible(person,nomcom))
@@ -2569,7 +2863,7 @@ def test_elig_by_author(self):
             self.assertEqual(set(list_eligible(nomcom=nomcom)),set(eligible))
             Person.objects.filter(pk__in=[p.pk for p in eligible.union(ineligible)]).delete()
 
-class rfc8989bisEligibilityTests(TestCase):
+class rfc9389EligibilityTests(TestCase):
 
     def setUp(self):
         super().setUp()
@@ -2589,7 +2883,7 @@ def setUp(self):
     def test_registration_is_not_enough(self):
         p = PersonFactory()
         for meeting in self.meetings:
-            MeetingRegistrationFactory(person=p, meeting=meeting, checkedin=False)
+            RegistrationFactory(person=p, meeting=meeting, checkedin=False)
         self.assertFalse(is_eligible(p, self.nomcom))
 
     def test_elig_by_meetings(self):
@@ -2606,7 +2900,7 @@ def test_elig_by_meetings(self):
                 for method in attendance_methods:
                     p = PersonFactory()
                     for meeting in combo:
-                        MeetingRegistrationFactory(person=p, meeting=meeting, reg_type='onsite', checkedin=(method in ('checkedin', 'both')))
+                        RegistrationFactory(person=p, meeting=meeting, checkedin=(method in ('checkedin', 'both')))
                         if method in ('session', 'both'):
                             AttendedFactory(session__meeting=meeting, session__type_id='plenary',person=p)
                         if combo_len<3:
@@ -2622,6 +2916,7 @@ def test_elig_by_meetings(self):
         for person in ineligible_people:
             self.assertFalse(is_eligible(person,self.nomcom))
 
+
 class VolunteerTests(TestCase):
 
     def test_volunteer(self):
@@ -2632,13 +2927,13 @@ def test_volunteer(self):
         r = self.client.get(url)
         self.assertContains(r, 'NomCom is not accepting volunteers at this time', status_code=200)
 
-        year = datetime.date.today().year
-        nomcom = NomComFactory(group__acronym=f'nomcom{year}', is_accepting_volunteers=False)
+        this_year = date_today().year
+        nomcom = NomComFactory(group__acronym=f'nomcom{this_year}', is_accepting_volunteers=False)
         r = self.client.get(url)
         self.assertContains(r, 'NomCom is not accepting volunteers at this time', status_code=200)
         nomcom.is_accepting_volunteers = True
         nomcom.save()
-        MeetingRegistrationFactory(person=person, affiliation='mtg_affiliation', checkedin=True)
+        RegistrationFactory(person=person, affiliation='mtg_affiliation', checkedin=True)
         r = self.client.get(url)
         self.assertContains(r, 'Volunteer for NomCom', status_code=200)
         self.assertContains(r, 'mtg_affiliation')
@@ -2656,7 +2951,7 @@ def test_volunteer(self):
         self.assertContains(r, 'already volunteered', status_code=200)
 
         person.volunteer_set.all().delete()
-        nomcom2 = NomComFactory(group__acronym=f'nomcom{year-1}', is_accepting_volunteers=True)
+        nomcom2 = NomComFactory(group__acronym=f'nomcom{this_year-1}', is_accepting_volunteers=True)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -2685,15 +2980,38 @@ def test_volunteer(self):
 
     def test_suggest_affiliation(self):
         person = PersonFactory()
-        self.assertEqual(suggest_affiliation(person), '')
-        da = DocumentAuthorFactory(person=person,affiliation='auth_affil')
+        self.assertEqual(suggest_affiliation(person), "")
+        rfc_da = DocumentAuthorFactory(
+            person=person,
+            document__type_id="rfc",
+            affiliation="",
+        )
+        rfc = rfc_da.document
+        DocEventFactory(doc=rfc, type="published_rfc")
+        self.assertEqual(suggest_affiliation(person), "")
+
+        rfc_da.affiliation = "rfc_da_affil"
+        rfc_da.save()
+        self.assertEqual(suggest_affiliation(person), "rfc_da_affil")
+
+        rfc_ra = RfcAuthorFactory(person=person, document=rfc, affiliation="")
+        self.assertEqual(suggest_affiliation(person), "")
+
+        rfc_ra.affiliation = "rfc_ra_affil"
+        rfc_ra.save()
+        self.assertEqual(suggest_affiliation(person), "rfc_ra_affil")
+
+        da = DocumentAuthorFactory(person=person, affiliation="auth_affil")
         NewRevisionDocEventFactory(doc=da.document)
-        self.assertEqual(suggest_affiliation(person), 'auth_affil')
+        self.assertEqual(suggest_affiliation(person), "auth_affil")
+
         nc = NomComFactory()
-        nc.volunteer_set.create(person=person,affiliation='volunteer_affil')
-        self.assertEqual(suggest_affiliation(person), 'volunteer_affil')
-        MeetingRegistrationFactory(person=person, affiliation='meeting_affil')
-        self.assertEqual(suggest_affiliation(person), 'meeting_affil')
+        nc.volunteer_set.create(person=person, affiliation="volunteer_affil")
+        self.assertEqual(suggest_affiliation(person), "volunteer_affil")
+
+        RegistrationFactory(person=person, affiliation="meeting_affil")
+        self.assertEqual(suggest_affiliation(person), "meeting_affil")
+
 
 class VolunteerDecoratorUnitTests(TestCase):
     def test_decorate_volunteers_with_qualifications(self):
@@ -2710,30 +3028,36 @@ def test_decorate_volunteers_with_qualifications(self):
             ('106', datetime.date(2019, 11, 16)),
         ]]
         for m in meetings:
-            MeetingRegistrationFactory(meeting=m, person=meeting_person, attended=True)
+            RegistrationFactory(meeting=m, person=meeting_person, attended=True)
             AttendedFactory(session__meeting=m, session__type_id='plenary', person=meeting_person)
         nomcom.volunteer_set.create(person=meeting_person)
 
         office_person = PersonFactory()
+        history_time = datetime_from_date(elig_date) - datetime.timedelta(days=365)
         RoleHistoryFactory(
             name_id='chair',
-            group__time= elig_date - datetime.timedelta(days=365),
+            group__time=history_time,
+            group__group__time=history_time,
+            group__state_id='active',
             group__group__state_id='conclude',
             person=office_person,
         )
+
         nomcom.volunteer_set.create(person=office_person)
 
         author_person = PersonFactory()
         for i in range(2):
-            da = WgDocumentAuthorFactory(person=author_person)
+            doc = WgRfcFactory(authors=[author_person])
             DocEventFactory(
                 type='published_rfc',
-                doc=da.document,
-                time=datetime.date(
+                doc=doc,
+                time=datetime.datetime(
                     elig_date.year - 3,
                     elig_date.month,
                     28 if elig_date.month == 2 and elig_date.day == 29 else elig_date.day,
-                ))
+                    tzinfo=datetime.UTC,
+                )
+            )
         nomcom.volunteer_set.create(person=author_person)
 
         volunteers = nomcom.volunteer_set.all()
@@ -2747,3 +3071,120 @@ def test_decorate_volunteers_with_qualifications(self):
                 self.assertEqual(v.qualifications,'path_2')
             if v.person == author_person:
                 self.assertEqual(v.qualifications,'path_3')
+
+class ReclassifyFeedbackTests(TestCase):
+    """Tests for feedback reclassification"""
+
+    def setUp(self):
+        super().setUp()
+        setup_test_public_keys_dir(self)
+        self.nc = NomComFactory.create(**nomcom_kwargs_for_year())
+        self.chair = self.nc.group.role_set.filter(name='chair').first().person
+        self.member = self.nc.group.role_set.filter(name='member').first().person
+        self.nominee = self.nc.nominee_set.order_by('pk').first()
+        self.position = self.nc.position_set.first()
+        self.topic = self.nc.topic_set.first()
+
+    def tearDown(self):
+        teardown_test_public_keys_dir(self)
+        super().tearDown()
+
+    def test_download_feedback_nominee(self):
+        # not really a reclassification test, but in closely adjacent code
+        fb = FeedbackFactory.create(nomcom=self.nc,type_id='questio')
+        fb.positions.add(self.position)
+        fb.nominees.add(self.nominee)
+        fb.save()
+        self.assertEqual(Feedback.objects.questionnaires().count(), 1)
+
+        url = reverse('ietf.nomcom.views.view_feedback_nominee', kwargs={'year':self.nc.year(), 'nominee_id':self.nominee.id})
+        login_testing_unauthorized(self,self.member.user.username,url)
+        provide_private_key_to_test_client(self)
+        response = self.client.post(url, {'feedback_id': fb.id, 'submit': 'download'})
+        self.assertEqual(response.status_code, 403)
+
+        self.client.logout()
+        self.client.login(username=self.chair.user.username, password=self.chair.user.username + "+password")
+        provide_private_key_to_test_client(self)
+
+        response = self.client.post(url, {'feedback_id': fb.id, 'submit': 'download'})
+        self.assertEqual(response.status_code, 200)
+        self.assertIn('questionnaire-', response['Content-Disposition'])
+
+    def test_reclassify_feedback_nominee(self):
+        fb = FeedbackFactory.create(nomcom=self.nc,type_id='comment')
+        fb.positions.add(self.position)
+        fb.nominees.add(self.nominee)
+        fb.save()
+        self.assertEqual(Feedback.objects.comments().count(), 1)
+
+        url = reverse('ietf.nomcom.views.view_feedback_nominee', kwargs={'year':self.nc.year(), 'nominee_id':self.nominee.id})
+        login_testing_unauthorized(self,self.member.user.username,url)
+        provide_private_key_to_test_client(self)
+        response = self.client.post(url, {'feedback_id': fb.id, 'type': 'obe', 'submit': 'reclassify'})
+        self.assertEqual(response.status_code, 403)
+
+        self.client.logout()
+        self.client.login(username=self.chair.user.username, password=self.chair.user.username + "+password")
+        provide_private_key_to_test_client(self)
+
+        response = self.client.post(url, {'feedback_id': fb.id, 'type': 'obe', 'submit': 'reclassify'})
+        self.assertEqual(response.status_code, 200)
+
+        fb = Feedback.objects.get(id=fb.id)
+        self.assertEqual(fb.type_id,'obe')
+        self.assertEqual(Feedback.objects.comments().count(), 0)
+        self.assertEqual(Feedback.objects.filter(type='obe').count(), 1)
+
+    def test_reclassify_feedback_topic(self):
+        fb = FeedbackFactory.create(nomcom=self.nc,type_id='comment')
+        fb.topics.add(self.topic)
+        fb.save()
+        self.assertEqual(Feedback.objects.comments().count(), 1)
+
+        url = reverse('ietf.nomcom.views.view_feedback_topic', kwargs={'year':self.nc.year(), 'topic_id':self.topic.id})
+        login_testing_unauthorized(self,self.member.user.username,url)
+        provide_private_key_to_test_client(self)
+        response = self.client.post(url, {'feedback_id': fb.id, 'type': 'unclassified'})
+        self.assertEqual(response.status_code, 403)
+
+        self.client.logout()
+        self.client.login(username=self.chair.user.username, password=self.chair.user.username + "+password")
+        provide_private_key_to_test_client(self)
+
+        response = self.client.post(url, {'feedback_id': fb.id, 'type': 'unclassified'})
+        self.assertEqual(response.status_code, 200)
+
+        fb = Feedback.objects.get(id=fb.id)
+        self.assertEqual(fb.type_id,None)
+        self.assertEqual(Feedback.objects.comments().count(), 0)
+        self.assertEqual(Feedback.objects.filter(type=None).count(), 1)
+
+    def test_reclassify_feedback_unrelated(self):
+        fb = FeedbackFactory(nomcom=self.nc, type_id='read')
+        self.assertEqual(Feedback.objects.filter(type='read').count(), 1)
+
+        url = reverse('ietf.nomcom.views.view_feedback_unrelated', kwargs={'year':self.nc.year()})
+        login_testing_unauthorized(self,self.member.user.username,url)
+        provide_private_key_to_test_client(self)
+        response = self.client.post(url, {'feedback_id': fb.id, 'type': 'junk'})
+        self.assertEqual(response.status_code, 403)
+
+        self.client.logout()
+        self.client.login(username=self.chair.user.username, password=self.chair.user.username + "+password")
+        provide_private_key_to_test_client(self)
+
+        response = self.client.post(url, {'feedback_id': fb.id, 'type': 'junk'})
+        self.assertEqual(response.status_code, 200)
+
+        fb = Feedback.objects.get(id=fb.id)
+        self.assertEqual(fb.type_id, 'junk')
+        self.assertEqual(Feedback.objects.filter(type='read').count(), 0)
+        self.assertEqual(Feedback.objects.filter(type='junk').count(), 1)
+
+
+class TaskTests(TestCase):
+    @mock.patch("ietf.nomcom.tasks.send_reminders")
+    def test_send_nomcom_reminders_task(self, mock_send):
+        send_nomcom_reminders_task()
+        self.assertEqual(mock_send.call_count, 1)
diff --git a/ietf/nomcom/urls.py b/ietf/nomcom/urls.py
index f7a19e2226..a3b0c42d3c 100644
--- a/ietf/nomcom/urls.py
+++ b/ietf/nomcom/urls.py
@@ -22,8 +22,8 @@
     url(r'^(?P<year>\d{4})/private/view-feedback/nominee/(?P<nominee_id>\d+)$', views.view_feedback_nominee),
     url(r'^(?P<year>\d{4})/private/view-feedback/topic/(?P<topic_id>\d+)$', views.view_feedback_topic),
     url(r'^(?P<year>\d{4})/private/edit/nominee/(?P<nominee_id>\d+)$', views.edit_nominee),
-    url(r'^(?P<year>\d{4})/private/merge-nominee/?$', views.private_merge_nominee),
-    url(r'^(?P<year>\d{4})/private/merge-person/?$', views.private_merge_person),
+    url(r'^(?P<year>\d{4})/private/merge-nominee/$', views.private_merge_nominee),
+    url(r'^(?P<year>\d{4})/private/merge-person/$', views.private_merge_person),
     url(r'^(?P<year>\d{4})/private/send-reminder-mail/(?P<type>\w+)/$', views.send_reminder_mail),
     url(r'^(?P<year>\d{4})/private/extract-email-lists/$', views.extract_email_lists),
     url(r'^(?P<year>\d{4})/private/edit-members/$', views.edit_members),
@@ -41,6 +41,7 @@
     url(r'^(?P<year>\d{4})/private/chair/eligible/$', views.private_eligible),
     url(r'^(?P<year>\d{4})/private/chair/volunteers/$', views.private_volunteers),
     url(r'^(?P<year>\d{4})/private/chair/volunteers/csv/$', views.private_volunteers_csv),
+    url(r'^(?P<year>\d{4})/private/chair/volunteers/announce-list/$', views.qualified_volunteer_list_for_announcement),
 
     url(r'^(?P<year>\d{4})/$', views.year_index),
     url(r'^(?P<year>\d{4})/requirements/$', views.requirements),
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
index 2bf63e1942..a2ab680df6 100644
--- a/ietf/nomcom/utils.py
+++ b/ietf/nomcom/utils.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2012-2022, All Rights Reserved
+# Copyright The IETF Trust 2012-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -12,11 +12,13 @@
 
 from collections import defaultdict
 from email import message_from_string, message_from_bytes
+from email.errors import HeaderParseError
 from email.header import decode_header
 from email.iterators import typed_subpart_iterator
 from email.utils import parseaddr
+from textwrap import dedent
 
-from django.db.models import Q, Count
+from django.db.models import Q, Count, F, QuerySet
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.exceptions import ObjectDoesNotExist
@@ -25,15 +27,17 @@
 from django.shortcuts import get_object_or_404
 
 from ietf.dbtemplate.models import DBTemplate
-from ietf.doc.models import DocEvent, NewRevisionDocEvent
+from ietf.doc.models import DocEvent, NewRevisionDocEvent, Document
 from ietf.group.models import Group, Role
 from ietf.person.models import Email, Person
 from ietf.mailtrigger.utils import gather_address_lists
-from ietf.meeting.models import Meeting, Attended
+from ietf.meeting.models import Meeting
+from ietf.meeting.utils import participants_for_meeting
 from ietf.utils.pipe import pipe
 from ietf.utils.mail import send_mail_text, send_mail, get_payload_text
 from ietf.utils.log import log
 from ietf.person.name import unidecode_name
+from ietf.utils.timezone import date_today, datetime_from_date, DEADLINE_TZINFO
 
 import debug                            # pyflakes:ignore
 
@@ -64,8 +68,11 @@
                         ]
 
 # See RFC8713 section 4.15
+# This potentially over-disqualifies past nomcom chairs if some 
+# nomcom 2+ nomcoms ago is still in the active state
 DISQUALIFYING_ROLE_QUERY_EXPRESSION = (   Q(group__acronym__in=['isocbot', 'ietf-trust', 'llc-board', 'iab'], name_id__in=['member', 'chair'])
                                         | Q(group__type_id='area', group__state='active',name_id='ad')
+                                        | Q(group__type_id='nomcom', group__state='active', name_id='chair')
                                       )
 
 
@@ -82,26 +89,21 @@ def get_year_by_nomcom(nomcom):
     return m.group(0)
 
 
-def get_user_email(user):
-    # a user object already has an email field, but we don't want to
-    # overwrite anything that might be there, and we don't know that
-    # what's there is the right thing, so we cache the lookup results in a
-    # separate attribute
-    if not hasattr(user, "_email_cache"):
-        user._email_cache = None
-        if hasattr(user, "person"):
-            emails = user.person.email_set.filter(active=True).order_by('-time')
-            if emails:
-                user._email_cache = emails[0]
-                for email in emails:
-                    if email.address == user.username:
-                        user._email_cache = email
+def get_person_email(person):
+    if not hasattr(person, "_email_cache"):
+        person._email_cache = None
+        emails = person.email_set.filter(active=True).order_by('-time')
+        if emails:
+            person._email_cache = emails[0]
+            for email in emails:
+                if email.address.lower() == person.user.username.lower():
+                    person._email_cache = email
         else:
             try: 
-                user._email_cache = Email.objects.get(address=user.username)
+                person._email_cache = Email.objects.get(address=person.user.username)
             except ObjectDoesNotExist:
                 pass
-    return user._email_cache
+    return person._email_cache
 
 def get_hash_nominee_position(date, nominee_position_id):
     return hmac.new(settings.NOMCOM_APP_SECRET, f"{date}{nominee_position_id}".encode('utf-8'), hashlib.sha256).hexdigest()
@@ -171,18 +173,25 @@ def command_line_safe_secret(secret):
     return base64.encodebytes(secret).decode('utf-8').rstrip()
 
 def retrieve_nomcom_private_key(request, year):
+    """Retrieve decrypted nomcom private key from the session store
+
+    Retrieves encrypted, ascii-armored private key from the session store, encodes 
+    as utf8 bytes, then decrypts. Raises UnicodeError if the value in the session
+    store cannot be encoded as utf8.
+    """
     private_key = request.session.get('NOMCOM_PRIVATE_KEY_%s' % year, None)
 
     if not private_key:
         return private_key
 
-    command = "%s bf -d -in /dev/stdin -k \"%s\" -a"
+    command = "%s aes-128-ecb -d -in /dev/stdin -k \"%s\" -a -iter 1000"
     code, out, error = pipe(
         command % (
             settings.OPENSSL_COMMAND,
             command_line_safe_secret(settings.NOMCOM_APP_SECRET)
         ),
-        private_key
+        # The openssl command expects ascii-armored input, so utf8 encoding should be valid
+        private_key.encode("utf8")
     )
     if code != 0:
         log("openssl error: %s:\n  Error %s: %s" %(command, code, error))        
@@ -190,10 +199,16 @@ def retrieve_nomcom_private_key(request, year):
 
 
 def store_nomcom_private_key(request, year, private_key):
+    """Put encrypted nomcom private key in the session store
+    
+    Encrypts the private key using openssl, then decodes the ascii-armored output
+    as utf8 and adds to the session store. Raises UnicodeError if the openssl's
+    output cannot be decoded as utf8.
+    """
     if not private_key:
         request.session['NOMCOM_PRIVATE_KEY_%s' % year] = ''
     else:
-        command = "%s bf -e -in /dev/stdin -k \"%s\" -a"
+        command = "%s aes-128-ecb -e -in /dev/stdin -k \"%s\" -a -iter 1000"
         code, out, error = pipe(
             command % (
                 settings.OPENSSL_COMMAND,
@@ -204,8 +219,9 @@ def store_nomcom_private_key(request, year, private_key):
         if code != 0:
             log("openssl error: %s:\n  Error %s: %s" %(command, code, error))        
         if error and error!=b"*** WARNING : deprecated key derivation used.\nUsing -iter or -pbkdf2 would be better.\n":
-            out = ''
-        request.session['NOMCOM_PRIVATE_KEY_%s' % year] = out
+            out = b''
+        # The openssl command output in 'out' is an ascii-armored value, so should be utf8-decodable
+        request.session['NOMCOM_PRIVATE_KEY_%s' % year] = out.decode("utf8")
 
 
 def validate_private_key(key):
@@ -240,7 +256,7 @@ def validate_public_key(public_key):
 
 
 def send_accept_reminder_to_nominee(nominee_position):
-    today = datetime.date.today().strftime('%Y%m%d')
+    today = date_today().strftime('%Y%m%d')
     subject = 'Reminder: please accept (or decline) your nomination.'
     domain = Site.objects.get_current().domain
     position = nominee_position.position
@@ -332,7 +348,7 @@ def make_nomineeposition(nomcom, candidate, position, author):
         from_email = settings.NOMCOM_FROM_EMAIL.format(year=nomcom.year())
         (to_email, cc) = gather_address_lists('nomination_new_nominee',nominee=nominee.email.address)
         domain = Site.objects.get_current().domain
-        today = datetime.date.today().strftime('%Y%m%d')
+        today = date_today().strftime('%Y%m%d')
         hash = get_hash_nominee_position(today, nominee_position.id)
         accept_url = reverse('ietf.nomcom.views.process_nomination_status',
                               None,
@@ -424,15 +440,19 @@ def make_nomineeposition_for_newperson(nomcom, candidate_name, candidate_email,
 
     return make_nomineeposition(nomcom, email.person, position, author)
 
-def getheader(header_text, default="ascii"):
+def getheader(header_text, default="utf-8"):
     """Decode the specified header"""
 
-    tuples = decode_header(header_text)
+    try:
+        tuples = decode_header(header_text)
+    except TypeError:
+        return ""
+
     header_sections = [ text.decode(charset or default) if isinstance(text, bytes) else text for text, charset in tuples]
     return "".join(header_sections)
 
 
-def get_charset(message, default="ascii"):
+def get_charset(message, default="utf-8"):
     """Get the message charset"""
 
     if message.get_content_charset():
@@ -476,6 +496,9 @@ def parse_email(text):
     body = get_body(msg)
     subject = getheader(msg['Subject'])
     __, addr = parseaddr(msg['From'])
+    if not addr:
+        raise HeaderParseError
+
     return addr.lower(), subject, body
 
 
@@ -512,7 +535,7 @@ def list_eligible(nomcom=None, date=None, base_qs=None):
     elif eligibility_date.year in (2021,2022):
         return list_eligible_8989(date=eligibility_date, base_qs=base_qs)
     elif eligibility_date.year > 2022:
-        return list_eligible_8989bis(date=eligibility_date, base_qs=base_qs)
+        return list_eligible_9389(date=eligibility_date, base_qs=base_qs)
     else:
         return Person.objects.none()
 
@@ -530,7 +553,7 @@ def decorate_volunteers_with_qualifications(volunteers, nomcom=None, date=None,
                 qualifications.append('path_2')
             if v.person in author_qs:
                 qualifications.append('path_3')
-            v.qualifications = ", ".join(qualifications)
+            v.qualifications = "+".join(qualifications)
     else:
         for v in volunteers:
             v.qualifications = ''
@@ -550,48 +573,106 @@ def list_eligible_8788(date, base_qs=None):
 def get_8989_eligibility_querysets(date, base_qs):
     return get_threerule_eligibility_querysets(date, base_qs, three_of_five_callable=three_of_five_eligible_8713)
 
-def get_8989bis_eligibility_querysets(date, base_qs):
-    return get_threerule_eligibility_querysets(date, base_qs, three_of_five_callable=three_of_five_eligible_8989bis)
+def get_9389_eligibility_querysets(date, base_qs):
+    return get_threerule_eligibility_querysets(date, base_qs, three_of_five_callable=three_of_five_eligible_9389)
+
+
+def get_qualified_author_queryset(
+    base_qs: QuerySet[Person],
+    eligibility_period_start: datetime.datetime,
+    eligibility_period_end: datetime.datetime,
+):
+    """Filter a Person queryset, keeping those qualified by RFC 8989's author path
+    
+    The author path is defined by "path 3" in section 4 of RFC 8989. It qualifies
+    a person who has been a front-page listed author or editor of at least two IETF-
+    stream RFCs within the last five years. An I-D in the RFC Editor queue that was
+    approved by the IESG is treated as an RFC, using the date of entry to the RFC
+    Editor queue as the date for qualification.
+    
+    This method does not strictly enforce "in the RFC Editor queue" for IESG-approved
+    drafts when computing eligibility. In the overwhelming majority of cases, an IESG-
+    approved draft immediately enters the queue and goes on to be published, so this
+    simplification makes the calculation much easier and virtually never affects
+    eligibility.  
+    
+    Arguments eligibility_period_start and eligibility_period_end are datetimes that
+    mark the start and end of the eligibility period. These should be five years apart.
+    """
+    # First, get the RFCs using publication date
+    qualifying_rfc_pub_events = DocEvent.objects.filter(
+        type='published_rfc',
+        time__gte=eligibility_period_start,
+        time__lte=eligibility_period_end,
+    )
+    qualifying_rfcs = Document.objects.filter(
+        type_id="rfc",
+        docevent__in=qualifying_rfc_pub_events
+    ).annotate(
+        rfcauthor_count=Count("rfcauthor")
+    )
+    rfcs_with_rfcauthors = qualifying_rfcs.filter(rfcauthor_count__gt=0).distinct()
+    rfcs_without_rfcauthors = qualifying_rfcs.filter(rfcauthor_count=0).distinct()
+
+    # Second, get the IESG-approved I-Ds excluding any we're already counting as rfcs
+    qualifying_approval_events = DocEvent.objects.filter(
+        type='iesg_approved',
+        time__gte=eligibility_period_start,
+        time__lte=eligibility_period_end,
+    )
+    qualifying_drafts = Document.objects.filter(
+        type_id="draft",
+        docevent__in=qualifying_approval_events,
+    ).exclude(
+        relateddocument__relationship_id="became_rfc",
+        relateddocument__target__in=qualifying_rfcs,
+    ).distinct()
+
+    return base_qs.filter(
+        Q(documentauthor__document__in=qualifying_drafts)
+        | Q(rfcauthor__document__in=rfcs_with_rfcauthors)
+        | Q(documentauthor__document__in=rfcs_without_rfcauthors)
+    ).annotate(
+        document_author_count=Count('documentauthor'),
+        rfc_author_count=Count("rfcauthor")
+    ).annotate(
+        authorship_count=F("document_author_count") + F("rfc_author_count")
+    ).filter(authorship_count__gte=2)
+
 
 def get_threerule_eligibility_querysets(date, base_qs, three_of_five_callable):
     if not base_qs:
         base_qs = Person.objects.all()
 
     previous_five = previous_five_meetings(date)
+    date_as_dt = datetime_from_date(date, DEADLINE_TZINFO)
     three_of_five_qs = three_of_five_callable(previous_five=previous_five, queryset=base_qs)
 
     # If date is Feb 29, neither 3 nor 5 years ago has a Feb 29. Use Feb 28 instead.
     if date.month == 2 and date.day == 29:
-        three_years_ago = datetime.date(date.year - 3, 2, 28)
-        five_years_ago = datetime.date(date.year - 5, 2, 28)
+        three_years_ago = datetime.datetime(date.year - 3, 2, 28, tzinfo=DEADLINE_TZINFO)
+        five_years_ago = datetime.datetime(date.year - 5, 2, 28, tzinfo=DEADLINE_TZINFO)
     else:
-        three_years_ago = datetime.date(date.year - 3, date.month, date.day)
-        five_years_ago = datetime.date(date.year - 5, date.month, date.day)
+        three_years_ago = datetime.datetime(date.year - 3, date.month, date.day, tzinfo=DEADLINE_TZINFO)
+        five_years_ago = datetime.datetime(date.year - 5, date.month, date.day, tzinfo=DEADLINE_TZINFO)
 
     officer_qs = base_qs.filter(
         # is currently an officer
         Q(role__name_id__in=('chair','secr'),
           role__group__state_id='active',
           role__group__type_id='wg',
-          role__group__time__lte=date, ## TODO - inspect - lots of things affect group__time...
+          role__group__time__lte=date_as_dt, ## TODO - inspect - lots of things affect group__time...
         )
         # was an officer since the given date (I think this is wrong - it looks at when roles _start_, not when roles end)
       | Q(rolehistory__group__time__gte=three_years_ago,
-          rolehistory__group__time__lte=date,
+          rolehistory__group__time__lte=date_as_dt,
           rolehistory__name_id__in=('chair','secr'),
           rolehistory__group__state_id='active',
           rolehistory__group__type_id='wg',
          )
     ).distinct()
 
-    rfc_pks = set(DocEvent.objects.filter(type='published_rfc',time__gte=five_years_ago,time__lte=date).values_list('doc__pk',flat=True))
-    iesgappr_pks = set(DocEvent.objects.filter(type='iesg_approved',time__gte=five_years_ago,time__lte=date).values_list('doc__pk',flat=True))
-    qualifying_pks = rfc_pks.union(iesgappr_pks.difference(rfc_pks))
-    author_qs = base_qs.filter(
-            documentauthor__document__pk__in=qualifying_pks
-        ).annotate(
-            document_author_count = Count('documentauthor')
-        ).filter(document_author_count__gte=2)
+    author_qs = get_qualified_author_queryset(base_qs, five_years_ago, date_as_dt)
     return three_of_five_qs, officer_qs, author_qs
 
 def list_eligible_8989(date, base_qs=None):
@@ -603,10 +684,10 @@ def list_eligible_8989(date, base_qs=None):
     author_pks = author_qs.values_list('pk',flat=True)
     return remove_disqualified(Person.objects.filter(pk__in=set(three_of_five_pks).union(set(officer_pks)).union(set(author_pks))))
 
-def list_eligible_8989bis(date, base_qs=None):
+def list_eligible_9389(date, base_qs=None):
     if not base_qs:
         base_qs = Person.objects.all()
-    three_of_five_qs, officer_qs, author_qs = get_8989bis_eligibility_querysets(date, base_qs)
+    three_of_five_qs, officer_qs, author_qs = get_9389_eligibility_querysets(date, base_qs)
     three_of_five_pks = three_of_five_qs.values_list('pk',flat=True)
     officer_pks = officer_qs.values_list('pk',flat=True)
     author_pks = author_qs.values_list('pk',flat=True)
@@ -624,7 +705,7 @@ def get_eligibility_date(nomcom=None, date=None):
         last_seated=Role.objects.filter(group__type_id='nomcom',name_id='member').order_by('-group__acronym').first()
         if last_seated:
             last_nomcom_year = int(last_seated.group.acronym[6:])
-            if last_nomcom_year == datetime.date.today().year:
+            if last_nomcom_year == date_today().year:
                 next_nomcom_year = last_nomcom_year
             else:
                 next_nomcom_year = int(last_seated.group.acronym[6:])+1
@@ -634,54 +715,75 @@ def get_eligibility_date(nomcom=None, date=None):
             else:
                 return datetime.date(next_nomcom_year,5,1)
         else:
-            return datetime.date(datetime.date.today().year,5,1)
+            return datetime.date(date_today().year,5,1)
 
 def previous_five_meetings(date = None):
     if date is None:
-        date = datetime.date.today()
+        date = date_today()
     return Meeting.objects.filter(type='ietf',date__lte=date).order_by('-date')[:5]
 
 def three_of_five_eligible_8713(previous_five, queryset=None):
-    """ Return a list of Person records who attended at least 
+    """ Return a list of Person records who attended at least
         3 of the 5 type_id='ietf' meetings before the given
         date. Does not disqualify anyone based on held roles.
         This variant bases the calculation on MeetingRegistration.attended
     """
     if queryset is None:
         queryset = Person.objects.all()
-    return queryset.filter(meetingregistration__meeting__in=list(previous_five),meetingregistration__attended=True).annotate(mtg_count=Count('meetingregistration')).filter(mtg_count__gte=3)
+    return queryset.filter(registration__meeting__in=list(previous_five), registration__attended=True).annotate(mtg_count=Count('registration')).filter(mtg_count__gte=3)
 
-def three_of_five_eligible_8989bis(previous_five, queryset=None):
+def three_of_five_eligible_9389(previous_five, queryset=None):
     """ Return a list of Person records who attended at least
         3 of the 5 type_id='ietf' meetings before the given
         date. Does not disqualify anyone based on held roles.
         This variant bases the calculation on Meeting.Session and MeetingRegistration.checked_in
-        Leadership will have to create a new RFC specifying eligibility (RFC8989 is timing out) before it can be used.
     """
     if queryset is None:
         queryset = Person.objects.all()
 
     counts = defaultdict(lambda: 0)
     for meeting in previous_five:
-        checked_in = meeting.meetingregistration_set.filter(reg_type='onsite', checkedin=True).values_list('person', flat=True)
-        sessions = meeting.session_set.filter(Q(type='plenary') | Q(group__type__in=['wg', 'rg']))
-        attended = Attended.objects.filter(session__in=sessions).values_list('person', flat=True)
+        checked_in, attended = participants_for_meeting(meeting)
         for id in set(checked_in) | set(attended):
             counts[id] += 1
     return queryset.filter(pk__in=[id for id, count in counts.items() if count >= 3])
 
-def suggest_affiliation(person):
-    recent_meeting = person.meetingregistration_set.order_by('-meeting__date').first()
-    affiliation = recent_meeting.affiliation if recent_meeting else ''
-    if not affiliation:
-        recent_volunteer = person.volunteer_set.order_by('-nomcom__group__acronym').first()
-        if recent_volunteer:
-            affiliation = recent_volunteer.affiliation 
-    if not affiliation:
-        recent_draft_revision =  NewRevisionDocEvent.objects.filter(doc__type_id='draft',doc__documentauthor__person=person).order_by('-time').first()
-        if recent_draft_revision:
-            affiliation = recent_draft_revision.doc.documentauthor_set.filter(person=person).first().affiliation
-    return affiliation
+def suggest_affiliation(person) -> str:
+    """Heuristically suggest a current affiliation for a Person"""
+    recent_meeting = person.registration_set.order_by('-meeting__date').first()
+    if recent_meeting and recent_meeting.affiliation:
+        return recent_meeting.affiliation
+
+    recent_volunteer = person.volunteer_set.order_by('-nomcom__group__acronym').first()
+    if recent_volunteer and recent_volunteer.affiliation:
+        return recent_volunteer.affiliation 
+
+    recent_draft_revision =  NewRevisionDocEvent.objects.filter(
+        doc__type_id="draft",
+        doc__documentauthor__person=person,
+    ).order_by("-time").first()
+    if recent_draft_revision:
+        draft_author = recent_draft_revision.doc.documentauthor_set.filter(
+            person=person
+        ).first()
+        if draft_author and draft_author.affiliation:
+            return draft_author.affiliation
+    
+    recent_rfc_publication = DocEvent.objects.filter(
+        Q(doc__documentauthor__person=person) | Q(doc__rfcauthor__person=person),
+        doc__type_id="rfc",
+        type="published_rfc",
+    ).order_by("-time").first()
+    if recent_rfc_publication:
+        rfc = recent_rfc_publication.doc
+        if rfc.rfcauthor_set.exists():
+            rfc_author = rfc.rfcauthor_set.filter(person=person).first()
+        else:
+            rfc_author = rfc.documentauthor_set.filter(person=person).first()
+        if rfc_author and rfc_author.affiliation:
+            return rfc_author.affiliation
+    return ""
+
 
 def extract_volunteers(year):
     nomcom = get_nomcom_by_year(year)
@@ -695,3 +797,58 @@ def extract_volunteers(year):
     decorate_volunteers_with_qualifications(volunteers,nomcom=nomcom)
     volunteers = sorted(volunteers,key=lambda v:(not v.eligible,v.person.last_name()))
     return nomcom, volunteers
+
+
+def ingest_feedback_email(message: bytes, year: int):
+    from ietf.api.views import EmailIngestionError  # avoid circular import
+    from .models import NomCom
+    try:
+        nomcom = NomCom.objects.get(group__acronym__icontains=str(year),
+                                         group__state__slug='active')
+    except NomCom.DoesNotExist:
+        raise EmailIngestionError(
+            f"Error ingesting nomcom email: nomcom {year} does not exist or is not active",
+            email_body=dedent(f"""\
+                An email for nomcom {year} was posted to ingest_feedback_email, but no
+                active nomcom exists for that year.
+                """),
+        )
+
+    try:
+        feedback = create_feedback_email(nomcom, message)
+    except Exception as err:
+        raise EmailIngestionError(
+            f"Error ingesting nomcom {year} feedback email",
+            email_recipients=nomcom.chair_emails(),
+            email_body=dedent(f"""\
+                An error occurred while ingesting feedback email for nomcom {year}.
+                
+                {{error_summary}}
+                """),
+            email_original_message=message,
+        ) from err
+    log("Received nomcom email from %s" % feedback.author)
+
+
+def _is_time_to_send_reminder(nomcom, send_date, nomination_date):
+    if nomcom.reminder_interval:
+        days_passed = (send_date - nomination_date).days
+        return days_passed > 0 and days_passed % nomcom.reminder_interval == 0
+    else:
+        return bool(nomcom.reminderdates_set.filter(date=send_date))
+
+
+def send_reminders():
+    from .models import NomCom, NomineePosition
+    for nomcom in NomCom.objects.filter(group__state__slug="active"):
+        nps = NomineePosition.objects.filter(
+            nominee__nomcom=nomcom, nominee__duplicated__isnull=True
+        )
+        for nominee_position in nps.pending():
+            if _is_time_to_send_reminder(nomcom, date_today(), nominee_position.time.date()):
+                send_accept_reminder_to_nominee(nominee_position)
+                log(f"Sent accept reminder to {nominee_position.nominee.email.address}")
+        for nominee_position in nps.accepted().without_questionnaire_response():
+            if _is_time_to_send_reminder(nomcom, date_today(), nominee_position.time.date()):
+                send_questionnaire_reminder_to_nominee(nominee_position)
+                log(f"Sent questionnaire reminder to {nominee_position.nominee.email.address}")
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index 9f752e49e7..3f90be5253 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -1,10 +1,10 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
 import re
-from collections import OrderedDict, Counter
+from collections import Counter
 import csv
 import hmac
 
@@ -14,12 +14,14 @@
 from django.contrib.auth.models import AnonymousUser
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.forms.models import modelformset_factory, inlineformset_factory 
-from django.http import Http404, HttpResponseRedirect, HttpResponse
+from django.http import Http404, HttpResponseRedirect, HttpResponse, HttpResponseForbidden
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.loader import render_to_string
 from django.urls import reverse
-from django.utils.encoding import force_bytes, force_text
+from django.utils.encoding import force_bytes, force_str
+from django.utils.text import slugify
 
+from email.errors import HeaderParseError
 
 from ietf.dbtemplate.models import DBTemplate
 from ietf.dbtemplate.views import group_template_edit, group_template_show
@@ -45,6 +47,8 @@
 from ietf.ietfauth.utils import role_required
 from ietf.person.models import Person
 from ietf.utils.response import permission_denied
+from ietf.utils.timezone import date_today
+
 
 import debug                  # pyflakes:ignore
 
@@ -53,7 +57,7 @@ def index(request):
     for nomcom in nomcom_list:
         year = int(nomcom.acronym[6:])
         nomcom.year = year
-        nomcom.label = "%s/%s" % (year, year+1)
+        nomcom.label = str(year)
         if year > 2012:
             nomcom.url = "/nomcom/%04d" % year
         else:
@@ -73,7 +77,6 @@ def year_index(request, year):
     return render(request, 'nomcom/year_index.html',
                               {'nomcom': nomcom,
                                'year': year,
-                               'selected': 'index',
                                'template': template})
 
 def announcements(request):
@@ -156,8 +159,16 @@ def private_key(request, year):
     if request.method == 'POST':
         form = PrivateKeyForm(data=request.POST)
         if form.is_valid():
-            store_nomcom_private_key(request, year, force_bytes(form.cleaned_data.get('key', '')))
-            return HttpResponseRedirect(back_url)
+            try:
+                store_nomcom_private_key(request, year, force_bytes(form.cleaned_data.get('key', '')))
+            except UnicodeError:
+                form.add_error(
+                    None, 
+                    "An internal error occurred while adding your private key to your session."
+                    f"Please contact the secretariat for assistance ({settings.SECRETARIAT_SUPPORT_EMAIL})"
+                )
+            else:
+                return HttpResponseRedirect(back_url)
     else:
         form = PrivateKeyForm()
 
@@ -170,8 +181,7 @@ def private_key(request, year):
                               {'nomcom': nomcom,
                                'year': year,
                                'back_url': back_url,
-                               'form': form,
-                               'selected': 'private_key'})
+                               'form': form})
 
 
 @role_required("Nomcom")
@@ -179,6 +189,7 @@ def private_index(request, year):
     nomcom = get_nomcom_by_year(year)
     all_nominee_positions = NomineePosition.objects.get_by_nomcom(nomcom).not_duplicated()
     is_chair = nomcom.group.has_role(request.user, "chair")
+    mailto = None
     if is_chair and request.method == 'POST':
         if nomcom.group.state_id != 'active':
             messages.warning(request, "This nomcom is not active. Request administrative assistance if Nominee state needs to change.")
@@ -196,15 +207,18 @@ def private_index(request, year):
                 elif action == "set_as_pending":
                     nominations.update(state='pending')
                     messages.success(request,'The selected nominations have been set as pending')
+                elif action == 'email':
+                    mailto = ','.join([np.nominee.email.email_address() for np in nominations])
             else:
                 messages.warning(request, "Please, select some nominations to work with")
 
     filters = {}
     questionnaire_state = "questionnaire"
+    not_declined_state = "not-declined"
     selected_state = request.GET.get('state')
     selected_position = request.GET.get('position')
 
-    if selected_state and not selected_state == questionnaire_state:
+    if selected_state and selected_state not in [questionnaire_state, not_declined_state]:
         filters['state__slug'] = selected_state
 
     if selected_position:
@@ -216,13 +230,15 @@ def private_index(request, year):
 
     if selected_state == questionnaire_state:
         nominee_positions = [np for np in nominee_positions if np.questionnaires]
+    elif selected_state == not_declined_state:
+        nominee_positions = nominee_positions.exclude(state__slug='declined')
 
     positions = Position.objects.get_by_nomcom(nomcom=nomcom)
     stats = [ { 'position__name':p.name,
                 'position__id':p.pk,
                 'position': p,
               } for p in positions]
-    states = list(NomineePositionStateName.objects.values('slug', 'name')) + [{'slug': questionnaire_state, 'name': 'Questionnaire'}]
+    states = [{'slug': questionnaire_state, 'name': 'Accepted and sent Questionnaire'}, {'slug': not_declined_state, 'name': 'Not declined'}] + list(NomineePositionStateName.objects.values('slug', 'name'))
     positions = set([ n.position for n in all_nominee_positions.order_by('position__name') ])
     for s in stats:
         for state in states:
@@ -265,8 +281,8 @@ def private_index(request, year):
                                'positions': positions,
                                'selected_state': selected_state,
                                'selected_position': selected_position and int(selected_position) or None,
-                               'selected': 'index',
                                'is_chair': is_chair,
+                               'mailto': mailto,
                               })
 
 
@@ -289,13 +305,11 @@ def send_reminder_mail(request, year, type):
         interesting_state = 'pending'
         mail_path = nomcom_template_path + NOMINEE_ACCEPT_REMINDER_TEMPLATE
         reminder_description = 'accept (or decline) a nomination'
-        selected_tab = 'send_accept_reminder'
         state_description = NomineePositionStateName.objects.get(slug=interesting_state).name
     elif type=='questionnaire':
         interesting_state = 'accepted'
         mail_path = nomcom_template_path + NOMINEE_QUESTIONNAIRE_REMINDER_TEMPLATE
         reminder_description = 'complete the questionnaire for a nominated position'
-        selected_tab = 'send_questionnaire_reminder'
         state_description =  NomineePositionStateName.objects.get(slug=interesting_state).name+' but no questionnaire has been received'
     else:
         raise Http404
@@ -330,7 +344,6 @@ def send_reminder_mail(request, year, type):
                                'year': year,
                                'nominees': annotated_nominees,
                                'mail_template': mail_template,
-                               'selected': selected_tab,
                                'reminder_description': reminder_description,
                                'state_description': state_description,
                                'is_chair_task' : True,
@@ -357,7 +370,6 @@ def private_merge_person(request, year):
                               {'nomcom': nomcom,
                                'year': year,
                                'form': form,
-                               'selected': 'merge_person',
                                'is_chair_task' : True,
                               })
 
@@ -382,7 +394,6 @@ def private_merge_nominee(request, year):
                               {'nomcom': nomcom,
                                'year': year,
                                'form': form,
-                               'selected': 'merge_nominee',
                                'is_chair_task' : True,
                               })
 
@@ -392,8 +403,7 @@ def requirements(request, year):
     return render(request, 'nomcom/requirements.html',
                               {'nomcom': nomcom,
                                'positions': positions,
-                               'year': year,
-                               'selected': 'requirements'})
+                               'year': year})
 
 
 def questionnaires(request, year):
@@ -402,8 +412,7 @@ def questionnaires(request, year):
     return render(request, 'nomcom/questionnaires.html',
                               {'nomcom': nomcom,
                                'positions': positions,
-                               'year': year,
-                               'selected': 'questionnaires'})
+                               'year': year})
 
 
 @login_required
@@ -437,40 +446,38 @@ def nominate(request, year, public, newperson):
         messages.warning(request, "This Nomcom is not yet accepting nominations")
         return render(request, template,
                               {'nomcom': nomcom,
-                               'year': year,
-                               'selected': 'nominate'})
+                               'year': year})
 
     if nomcom.group.state_id == 'conclude':
         messages.warning(request, "Nominations to this Nomcom are closed.")
         return render(request, template,
                               {'nomcom': nomcom,
-                               'year': year,
-                               'selected': 'nominate'})
+                               'year': year})
 
+    person = request.user.person
     if request.method == 'POST':
         if newperson:
-            form = NominateNewPersonForm(data=request.POST, nomcom=nomcom, user=request.user, public=public)
+            form = NominateNewPersonForm(data=request.POST, nomcom=nomcom, person=person, public=public)
         else:
-            form = NominateForm(data=request.POST, nomcom=nomcom, user=request.user, public=public)
+            form = NominateForm(data=request.POST, nomcom=nomcom, person=person, public=public)
         if form.is_valid():
             form.save()
             messages.success(request, 'Your nomination has been registered. Thank you for the nomination.')
             if newperson:
                 return redirect('ietf.nomcom.views.%s_nominate' % ('public' if public else 'private'), year=year)
             else:
-                form = NominateForm(nomcom=nomcom, user=request.user, public=public)
+                form = NominateForm(nomcom=nomcom, person=person, public=public)
     else:
         if newperson:
-            form = NominateNewPersonForm(nomcom=nomcom, user=request.user, public=public)
+            form = NominateNewPersonForm(nomcom=nomcom, person=person, public=public)
         else:
-            form = NominateForm(nomcom=nomcom, user=request.user, public=public)
+            form = NominateForm(nomcom=nomcom, person=person, public=public)
 
     return render(request, template,
                               {'form': form,
                                'nomcom': nomcom,
                                'year': year,
-                               'positions': nomcom.position_set.filter(is_open=True),
-                               'selected': 'nominate'})
+                               'positions': nomcom.position_set.filter(is_open=True)})
 
 @login_required
 def public_feedback(request, year):
@@ -488,6 +495,7 @@ def feedback(request, year, public):
     nominee = None
     position = None
     topic = None
+    person = request.user.person
     if nomcom.group.state_id != 'conclude':
         selected_nominee = request.GET.get('nominee')
         selected_position = request.GET.get('position')
@@ -499,7 +507,7 @@ def feedback(request, year, public):
             topic = get_object_or_404(Topic,id=selected_topic)
             if topic.audience_id == 'nomcom' and not nomcom.group.has_role(request.user, ['chair','advisor','liaison','member']):
                 raise Http404()
-            if topic.audience_id == 'nominees' and not nomcom.nominee_set.filter(person=request.user.person).exists():
+            if topic.audience_id == 'nominees' and not nomcom.nominee_set.filter(person=person).exists():
                 raise Http404()
 
     if public:
@@ -511,12 +519,12 @@ def feedback(request, year, public):
 
     if not nomcom.group.has_role(request.user, ['chair','advisor','liaison','member']):
         topics = topics.exclude(audience_id='nomcom')
-    if not nomcom.nominee_set.filter(person=request.user.person).exists():
+    if not nomcom.nominee_set.filter(person=person).exists():
         topics = topics.exclude(audience_id='nominees')
 
     user_comments = Feedback.objects.filter(nomcom=nomcom,
                                             type='comment',
-                                            author__in=request.user.person.email_set.filter(active='True')) 
+                                            author__in=person.email_set.filter(active='True')) 
     counter = Counter(user_comments.values_list('positions','nominees'))
     counts = dict()
     for pos,nom in counter:
@@ -534,7 +542,6 @@ def feedback(request, year, public):
             return render(request, 'nomcom/feedback.html', {
                 'nomcom': nomcom,
                 'year': year,
-                'selected': 'feedback',
                 'counts' : counts,
                 'base_template': base_template
             })
@@ -545,7 +552,6 @@ def feedback(request, year, public):
                 'form': None,
                 'nomcom': nomcom,
                 'year': year,
-                'selected': 'feedback',
                 'positions': positions,
                 'topics': topics,
                 'counts' : counts,
@@ -559,7 +565,6 @@ def feedback(request, year, public):
                 'form': None,
                 'nomcom': nomcom,
                 'year': year,
-                'selected': 'feedback',
                 'positions': positions,
                 'topics': topics,
                 'counts' : counts,
@@ -569,11 +574,11 @@ def feedback(request, year, public):
     if request.method == 'POST':
         if nominee and position:
             form = FeedbackForm(data=request.POST,
-                                nomcom=nomcom, user=request.user,
+                                nomcom=nomcom, person=person,
                                 public=public, position=position, nominee=nominee)
         elif topic:
             form = FeedbackForm(data=request.POST,
-                                nomcom=nomcom, user=request.user,
+                                nomcom=nomcom, person=person,
                                 public=public, topic=topic)
         else:
             form = None
@@ -592,10 +597,10 @@ def feedback(request, year, public):
                 pass
     else:
         if nominee and position:
-            form = FeedbackForm(nomcom=nomcom, user=request.user, public=public,
+            form = FeedbackForm(nomcom=nomcom, person=person, public=public,
                                 position=position, nominee=nominee)
         elif topic:
-            form = FeedbackForm(nomcom=nomcom, user=request.user, public=public,
+            form = FeedbackForm(nomcom=nomcom, person=person, public=public,
                                 topic=topic)
         else:
             form = None
@@ -606,7 +611,6 @@ def feedback(request, year, public):
         'year': year,
         'positions': positions,
         'topics': topics,
-        'selected': 'feedback',
         'counts': counts,
         'topic_counts': topic_counts,
         'base_template': base_template
@@ -632,7 +636,6 @@ def private_feedback_email(request, year):
         return render(request, template,
                           {'nomcom': nomcom,
                            'year': year,
-                           'selected': 'feedback_email',
                            'is_chair_task' : True,
                           })
 
@@ -642,15 +645,17 @@ def private_feedback_email(request, year):
         form = FeedbackEmailForm(data=request.POST,
                                  nomcom=nomcom)
         if form.is_valid():
-            form.save()
-            form = FeedbackEmailForm(nomcom=nomcom)
-            messages.success(request, 'The feedback email has been registered.')
+            try:
+                form.save()
+                form = FeedbackEmailForm(nomcom=nomcom)
+                messages.success(request, 'The feedback email has been registered.')
+            except HeaderParseError:
+                messages.error(request, 'Missing email headers')
 
     return render(request, template,
                               {'form': form,
                                'nomcom': nomcom,
-                               'year': year,
-                               'selected': 'feedback_email'})
+                               'year': year})
 
 @role_required("Nomcom Chair", "Nomcom Advisor")
 def private_questionnaire(request, year):
@@ -658,6 +663,7 @@ def private_questionnaire(request, year):
     has_publickey = nomcom.public_key and True or False
     questionnaire_response = None
     template = 'nomcom/private_questionnaire.html'
+    person = request.user.person
 
     if not has_publickey:
         messages.warning(request, "This Nomcom is not yet accepting questionnaires.")
@@ -672,27 +678,25 @@ def private_questionnaire(request, year):
         return render(request, template,
                           {'nomcom': nomcom,
                            'year': year,
-                           'selected': 'questionnaire',
                            'is_chair_task' : True,
                           })
 
     if request.method == 'POST':
         form = QuestionnaireForm(data=request.POST,
-                                 nomcom=nomcom, user=request.user)
+                                 nomcom=nomcom, person=person)
         if form.is_valid():
             form.save()
             messages.success(request, 'The questionnaire response has been registered.')
-            questionnaire_response = force_text(form.cleaned_data['comment_text'])
-            form = QuestionnaireForm(nomcom=nomcom, user=request.user)
+            questionnaire_response = force_str(form.cleaned_data['comment_text'])
+            form = QuestionnaireForm(nomcom=nomcom, person=person)
     else:
-        form = QuestionnaireForm(nomcom=nomcom, user=request.user)
+        form = QuestionnaireForm(nomcom=nomcom, person=person)
 
     return render(request, template,
                               {'form': form,
                                'questionnaire_response': questionnaire_response,
                                'nomcom': nomcom,
-                               'year': year,
-                               'selected': 'questionnaire'})
+                               'year': year})
 
 
 def process_nomination_status(request, year, nominee_position_id, state, date, hash):
@@ -702,7 +706,7 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h
     expiration_days = getattr(settings, 'DAYS_TO_EXPIRE_NOMINATION_LINK', None)
     if expiration_days:
         request_date = datetime.date(int(date[:4]), int(date[4:6]), int(date[6:]))
-        if datetime.date.today() > (request_date + datetime.timedelta(days=settings.DAYS_TO_EXPIRE_NOMINATION_LINK)):
+        if date_today() > (request_date + datetime.timedelta(days=expiration_days)):
             permission_denied(request, "Link expired.")
 
     need_confirmation = True
@@ -724,15 +728,13 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h
             if form.cleaned_data['comments']:
                 # This Feedback object is of type comment instead of nomina in order to not
                 # make answering "who nominated themselves" harder.
-                who = request.user
-                if isinstance(who,AnonymousUser):
-                    who = None
+                who = None if isinstance(request.user, AnonymousUser) else request.user.person
                 f = Feedback.objects.create(nomcom = nomcom,
                                             author = nominee_position.nominee.email,
                                             subject = '%s nomination %s'%(nominee_position.nominee.name(),state),
                                             comments = nomcom.encrypt(form.cleaned_data['comments']),
                                             type_id = 'comment', 
-                                            user = who,
+                                            person = who,
                                            )
                 f.positions.add(nominee_position.position)
                 f.nominees.add(nominee_position.nominee)
@@ -746,10 +748,8 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h
                                'nominee_position': nominee_position,
                                'state': state,
                                'need_confirmation': need_confirmation,
-                               'selected': 'feedback',
                                'form': form })
 
-
 @role_required("Nomcom")
 @nomcom_private_key_required
 def view_feedback(request, year):
@@ -757,7 +757,7 @@ def view_feedback(request, year):
     nominees = Nominee.objects.get_by_nomcom(nomcom).not_duplicated().distinct()
     independent_feedback_types = []
     nominee_feedback_types = []
-    for ft in FeedbackTypeName.objects.all():
+    for ft in FeedbackTypeName.objects.filter(used=True):
         if ft.slug in settings.NOMINEE_FEEDBACK_TYPES:
             nominee_feedback_types.append(ft)
         else:
@@ -780,8 +780,9 @@ def nominee_staterank(nominee):
 
     sorted_nominees = sorted(nominees,key=lambda x:x.staterank)
 
+    reviewer = request.user.person
     for nominee in sorted_nominees:
-        last_seen = FeedbackLastSeen.objects.filter(reviewer=request.user.person,nominee=nominee).first()
+        last_seen = FeedbackLastSeen.objects.filter(reviewer=reviewer,nominee=nominee).first()
         nominee_feedback = []
         for ft in nominee_feedback_types:
             qs = nominee.feedback_set.by_type(ft.slug)
@@ -796,7 +797,7 @@ def nominee_staterank(nominee):
         nominees_feedback.append( {'nominee':nominee, 'feedback':nominee_feedback} )
     independent_feedback = [ft.feedback_set.get_by_nomcom(nomcom).count() for ft in independent_feedback_types]
     for topic in nomcom.topic_set.all():
-        last_seen = TopicFeedbackLastSeen.objects.filter(reviewer=request.user.person,topic=topic).first()
+        last_seen = TopicFeedbackLastSeen.objects.filter(reviewer=reviewer,topic=topic).first()
         topic_feedback = []
         for ft in topic_feedback_types:
             qs = topic.feedback_set.by_type(ft.slug)
@@ -812,7 +813,6 @@ def nominee_staterank(nominee):
 
     return render(request, 'nomcom/view_feedback.html',
                               {'year': year,
-                               'selected': 'view_feedback',
                                'nominees': nominees,
                                'nominee_feedback_types': nominee_feedback_types,
                                'independent_feedback_types': independent_feedback_types,
@@ -820,7 +820,8 @@ def nominee_staterank(nominee):
                                'topics_feedback': topics_feedback,
                                'independent_feedback': independent_feedback,
                                'nominees_feedback': nominees_feedback,
-                               'nomcom': nomcom})
+                               'nomcom': nomcom,
+                               })
 
 
 @role_required("Nomcom Chair", "Nomcom Advisor")
@@ -843,6 +844,7 @@ def view_feedback_pending(request, year):
     except EmptyPage:
         feedback_page = paginator.page(paginator.num_pages)
     extra_step = False
+    person = request.user.person
     if request.method == 'POST' and request.POST.get('end'):
         extra_ids = request.POST.get('extra_ids', None)
         extra_step = True
@@ -851,7 +853,7 @@ def view_feedback_pending(request, year):
         formset.absolute_max = 2000     
         formset.validate_max = False
         for form in formset.forms:
-            form.set_nomcom(nomcom, request.user)
+            form.set_nomcom(nomcom, person)
         if formset.is_valid():
             formset.save()
             if extra_ids:
@@ -863,7 +865,7 @@ def view_feedback_pending(request, year):
                     extra.append(feedback)
                 formset = FullFeedbackFormSet(queryset=Feedback.objects.filter(id__in=[i.id for i in extra]))
                 for form in formset.forms:
-                    form.set_nomcom(nomcom, request.user, extra)
+                    form.set_nomcom(nomcom, person, extra)
                 extra_ids = None
             else:
                 messages.success(request, 'Feedback saved')
@@ -871,7 +873,7 @@ def view_feedback_pending(request, year):
     elif request.method == 'POST':
         formset = FeedbackFormSet(request.POST)
         for form in formset.forms:
-            form.set_nomcom(nomcom, request.user)
+            form.set_nomcom(nomcom, person)
         if formset.is_valid():
             extra = []
             nominations = []
@@ -891,12 +893,12 @@ def view_feedback_pending(request, year):
                 if nominations:
                     formset = FullFeedbackFormSet(queryset=Feedback.objects.filter(id__in=[i.id for i in nominations]))
                     for form in formset.forms:
-                        form.set_nomcom(nomcom, request.user, nominations)
+                        form.set_nomcom(nomcom, person, nominations)
                     extra_ids = ','.join(['%s:%s' % (i.id, i.type.pk) for i in extra])
                 else:
                     formset = FullFeedbackFormSet(queryset=Feedback.objects.filter(id__in=[i.id for i in extra]))
                     for form in formset.forms:
-                        form.set_nomcom(nomcom, request.user, extra)
+                        form.set_nomcom(nomcom, person, extra)
                 if moved:
                     messages.success(request, '%s messages classified. You must enter more information for the following feedback.' % moved)
             else:
@@ -905,24 +907,13 @@ def view_feedback_pending(request, year):
     else:
         formset = FeedbackFormSet(queryset=feedback_page.object_list)
         for form in formset.forms:
-            form.set_nomcom(nomcom, request.user)
-    type_dict = OrderedDict()
-    for t in FeedbackTypeName.objects.all().order_by('pk'):
-        rest = t.name
-        slug = rest[0]
-        rest = rest[1:]
-        while slug in type_dict and rest:
-            slug = rest[0]
-            rest = rest[1]
-        type_dict[slug] = t
+            form.set_nomcom(nomcom, person)
     return render(request, 'nomcom/view_feedback_pending.html',
                               {'year': year,
-                               'selected': 'feedback_pending',
                                'formset': formset,
                                'extra_step': extra_step,
-                               'type_dict': type_dict,
                                'extra_ids': extra_ids,
-                               'types': FeedbackTypeName.objects.all().order_by('pk'),
+                               'types': FeedbackTypeName.objects.filter(used=True),
                                'nomcom': nomcom,
                                'is_chair_task' : True,
                                'page': feedback_page,
@@ -933,60 +924,139 @@ def view_feedback_pending(request, year):
 @nomcom_private_key_required
 def view_feedback_unrelated(request, year):
     nomcom = get_nomcom_by_year(year)
+
+    if request.method == 'POST':
+        if not nomcom.group.has_role(request.user, ['chair','advisor']):
+            return HttpResponseForbidden('Restricted to roles: Nomcom Chair, Nomcom Advisor')
+        feedback_id = request.POST.get('feedback_id', None)
+        feedback = get_object_or_404(Feedback, id=feedback_id)
+        type = request.POST.get('type', None)
+        if type:
+            if type == 'unclassified':
+                feedback.type = None
+                messages.success(request, 'The selected feedback has been de-classified. Please reclassify it in the Pending emails tab.')
+            else:
+                feedback.type = FeedbackTypeName.objects.get(slug=type)
+                messages.success(request, f'The selected feedback has been reclassified as {feedback.type.name}.')
+            feedback.save()
+        else:
+            return render(request, 'nomcom/view_feedback_unrelated.html',
+                              {'year': year,
+                               'nomcom': nomcom,
+                               'feedback_types': FeedbackTypeName.objects.filter(used=True).exclude(slug__in=settings.NOMINEE_FEEDBACK_TYPES),
+                               'reclassify_feedback': feedback,
+                               'is_chair_task' : True,
+                              })
+
     feedback_types = []
-    for ft in FeedbackTypeName.objects.exclude(slug__in=settings.NOMINEE_FEEDBACK_TYPES):
+    for ft in FeedbackTypeName.objects.filter(used=True).exclude(slug__in=settings.NOMINEE_FEEDBACK_TYPES):
         feedback_types.append({'ft': ft,
                                'feedback': ft.feedback_set.get_by_nomcom(nomcom)})
-
     return render(request, 'nomcom/view_feedback_unrelated.html',
                               {'year': year,
-                               'selected': 'view_feedback',
                                'feedback_types': feedback_types,
-                               'nomcom': nomcom})
+                               'nomcom': nomcom,
+                               })
 
 @role_required("Nomcom")
 @nomcom_private_key_required
 def view_feedback_topic(request, year, topic_id):
-    nomcom = get_nomcom_by_year(year)
+    # At present, the only feedback type for topics is 'comment'.
+    # Reclassifying from 'comment' to 'comment' is a no-op,
+    # so the only meaningful action is to de-classify it.
+    if request.method == 'POST':
+        nomcom = get_nomcom_by_year(year)
+        if not nomcom.group.has_role(request.user, ['chair','advisor']):
+            return HttpResponseForbidden('Restricted to roles: Nomcom Chair, Nomcom Advisor')
+        feedback_id = request.POST.get('feedback_id', None)
+        feedback = get_object_or_404(Feedback, id=feedback_id)
+        feedback.type = None
+        feedback.topics.clear()
+        feedback.save()
+        messages.success(request, 'The selected feedback has been de-classified. Please reclassify it in the Pending emails tab.')
+
     topic = get_object_or_404(Topic, id=topic_id)
+    nomcom = get_nomcom_by_year(year)
     feedback_types = FeedbackTypeName.objects.filter(slug__in=['comment',])
+    reviewer = request.user.person
 
-    last_seen = TopicFeedbackLastSeen.objects.filter(reviewer=request.user.person,topic=topic).first()
-    last_seen_time = (last_seen and last_seen.time) or datetime.datetime(year=1,month=1,day=1)
+    last_seen = TopicFeedbackLastSeen.objects.filter(reviewer=reviewer,topic=topic).first()
+    last_seen_time = (last_seen and last_seen.time) or datetime.datetime(year=1, month=1, day=1, tzinfo=datetime.UTC)
     if last_seen:
         last_seen.save()
     else:
-        TopicFeedbackLastSeen.objects.create(reviewer=request.user.person,topic=topic)
+        TopicFeedbackLastSeen.objects.create(reviewer=reviewer,topic=topic)
 
     return render(request, 'nomcom/view_feedback_topic.html',
                               {'year': year,
-                               'selected': 'view_feedback',
                                'topic': topic,
                                'feedback_types': feedback_types,
                                'last_seen_time' : last_seen_time,
-                               'nomcom': nomcom})
+                               'nomcom': nomcom,
+                               })
 
 @role_required("Nomcom")
 @nomcom_private_key_required
 def view_feedback_nominee(request, year, nominee_id):
     nomcom = get_nomcom_by_year(year)
     nominee = get_object_or_404(Nominee, id=nominee_id)
-    feedback_types = FeedbackTypeName.objects.filter(slug__in=settings.NOMINEE_FEEDBACK_TYPES)
-
-    last_seen = FeedbackLastSeen.objects.filter(reviewer=request.user.person,nominee=nominee).first()
-    last_seen_time = (last_seen and last_seen.time) or datetime.datetime(year=1,month=1,day=1)
+    feedback_types = FeedbackTypeName.objects.filter(used=True, slug__in=settings.NOMINEE_FEEDBACK_TYPES)
+    reviewer = request.user.person
+    if request.method == 'POST':
+        if not nomcom.group.has_role(request.user, ['chair','advisor']):
+            return HttpResponseForbidden('Restricted to roles: Nomcom Chair, Nomcom Advisor')
+        feedback_id = request.POST.get('feedback_id', None)
+        feedback = get_object_or_404(Feedback, id=feedback_id)
+        submit = request.POST.get('submit', None)
+        if submit == 'download':
+            fn = f'questionnaire-{slugify(nominee.name())}-{feedback.time.date()}.txt'
+            response = render_to_string('nomcom/download_questionnaire.txt',
+                                        {'year': year,
+                                         'nominee': nominee,
+                                         'feedback': feedback,
+                                         'positions': ','.join([str(p) for p in feedback.positions.all()]),
+                                         },
+                                        request=request)
+            response = HttpResponse(
+                response,
+                content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+            )
+            response['Content-Disposition'] = f'attachment; filename="{fn}"'
+            return response
+        elif submit == 'reclassify':
+            type = request.POST.get('type', None)
+            if type:
+                if type == 'unclassified':
+                    feedback.type = None
+                    feedback.nominees.clear()
+                    messages.success(request, 'The selected feedback has been de-classified. Please reclassify it in the Pending emails tab.')
+                else:
+                    feedback.type = FeedbackTypeName.objects.get(slug=type)
+                    messages.success(request, f'The selected feedback has been reclassified as {feedback.type.name}.')
+                feedback.save()
+            else:
+                return render(request, 'nomcom/view_feedback_nominee.html',
+                                  {'year': year,
+                                   'nomcom': nomcom,
+                                   'feedback_types': feedback_types,
+                                   'reclassify_feedback': feedback,
+                                   'is_chair_task': True,
+                                  })
+
+    last_seen = FeedbackLastSeen.objects.filter(reviewer=reviewer,nominee=nominee).first()
+    last_seen_time = (last_seen and last_seen.time) or datetime.datetime(year=1, month=1, day=1, tzinfo=datetime.UTC)
     if last_seen:
         last_seen.save()
     else:
-        FeedbackLastSeen.objects.create(reviewer=request.user.person,nominee=nominee)
+        FeedbackLastSeen.objects.create(reviewer=reviewer,nominee=nominee)
 
     return render(request, 'nomcom/view_feedback_nominee.html',
                               {'year': year,
-                               'selected': 'view_feedback',
                                'nominee': nominee,
                                'feedback_types': feedback_types,
                                'last_seen_time' : last_seen_time,
-                               'nomcom': nomcom})
+                               'nomcom': nomcom,
+                               })
 
 
 @role_required("Nomcom Chair", "Nomcom Advisor")
@@ -1006,7 +1076,6 @@ def edit_nominee(request, year, nominee_id):
 
     return render(request, 'nomcom/edit_nominee.html',
                               {'year': year,
-                               'selected': 'index',
                                'nominee': nominee,
                                'form': form,
                                'nomcom': nomcom,
@@ -1044,7 +1113,6 @@ def edit_nomcom(request, year):
                                'formset': formset,
                                'nomcom': nomcom,
                                'year': year,
-                               'selected': 'edit_nomcom',
                                'is_chair_task' : True,
                               })
 
@@ -1058,7 +1126,6 @@ def list_templates(request, year):
     return render(request, 'nomcom/list_templates.html',
                               {'template_list': template_list,
                                'year': year,
-                               'selected': 'edit_templates',
                                'nomcom': nomcom,
                                'is_chair_task' : True,
                               })
@@ -1092,11 +1159,45 @@ def edit_template(request, year, template_id):
 def list_positions(request, year):
     nomcom = get_nomcom_by_year(year)
     positions = nomcom.position_set.order_by('-is_open')
+    if request.method == 'POST':
+        if nomcom.group.state_id != 'active':
+            messages.warning(request, "This nomcom is not active. Request administrative assistance if Position state needs to change.")
+        else:
+            action = request.POST.get('action')
+            positions_to_modify = request.POST.getlist('selected')
+            if positions_to_modify:
+                positions = positions.filter(id__in=positions_to_modify)
+                if action == "set_iesg":
+                    positions.update(is_iesg_position=True)
+                    messages.success(request,'The selected positions have been set as IESG Positions')
+                elif action == "unset_iesg":
+                    positions.update(is_iesg_position=False)
+                    messages.success(request,'The selected positions have been set as NOT IESG Positions')
+                elif action == "set_open":
+                    positions.update(is_open=True)
+                    messages.success(request,'The selected positions have been set as Open')
+                elif action == "unset_open":
+                    positions.update(is_open=False)
+                    messages.success(request,'The selected positions have been set as NOT Open')
+                elif action == "set_accept_nom":
+                    positions.update(accepting_nominations=True)
+                    messages.success(request,'The selected positions have been set as Accepting Nominations')
+                elif action == "unset_accept_nom":
+                    positions.update(accepting_nominations=False)
+                    messages.success(request,'The selected positions have been set as NOT Accepting Nominations')
+                elif action == "set_accept_fb":
+                    positions.update(accepting_feedback=True)
+                    messages.success(request,'The selected positions have been set as Accepting Feedback')
+                elif action == "unset_accept_fb":
+                    positions.update(accepting_feedback=False)
+                    messages.success(request,'The selected positions have been set as NOT Accepting Feedback')
+                positions = nomcom.position_set.order_by('-is_open')
+            else:
+                messages.warning(request, "Please select some positions to work with")
 
     return render(request, 'nomcom/list_positions.html',
                               {'positions': positions,
                                'year': year,
-                               'selected': 'edit_positions',
                                'nomcom': nomcom,
                                'is_chair_task' : True,
                               })
@@ -1163,7 +1264,6 @@ def list_topics(request, year):
     return render(request, 'nomcom/list_topics.html',
                               {'topics': topics,
                                'year': year,
-                               'selected': 'edit_topics',
                                'nomcom': nomcom,
                                'is_chair_task' : True,
                               })
@@ -1229,15 +1329,15 @@ def configuration_help(request, year):
 @role_required("Nomcom Chair", "Nomcom Advisor")
 def edit_members(request, year):
     nomcom = get_nomcom_by_year(year)
-
     if nomcom.group.state_id=='conclude':
         permission_denied(request, 'This nomcom is closed.')
 
+    person = request.user.person
     if request.method=='POST':
         form = EditMembersForm(nomcom, data=request.POST)
         if form.is_valid():
-            update_role_set(nomcom.group, 'member', form.cleaned_data['members'], request.user.person)
-            update_role_set(nomcom.group, 'liaison', form.cleaned_data['liaisons'], request.user.person)
+            update_role_set(nomcom.group, 'member', form.cleaned_data['members'], person)
+            update_role_set(nomcom.group, 'liaison', form.cleaned_data['liaisons'], person)
             return HttpResponseRedirect(reverse('ietf.nomcom.views.private_index',kwargs={'year':year}))
     else:
         form = EditMembersForm(nomcom)
@@ -1245,8 +1345,7 @@ def edit_members(request, year):
     return render(request, 'nomcom/new_edit_members.html',
                               {'nomcom' : nomcom,
                                'year' : year,
-                               'form': form,
-                              })
+                               'form': form})
 
 @role_required("Nomcom Chair", "Nomcom Advisor")
 def extract_email_lists(request, year):
@@ -1266,8 +1365,7 @@ def extract_email_lists(request, year):
                               'pending': pending,
                               'accepted': accepted,
                               'noresp': noresp,
-                              'bypos': bypos,
-                             })
+                              'bypos': bypos})
 
 @login_required
 def volunteer(request):
@@ -1282,7 +1380,7 @@ def volunteer(request):
         form = VolunteerForm(person=person, data=request.POST)
         if form.is_valid():
             for nc in form.cleaned_data['nomcoms']:
-                nc.volunteer_set.create(person=person, affiliation=form.cleaned_data['affiliation'])
+                nc.volunteer_set.get_or_create(person=person, defaults={"affiliation": form.cleaned_data["affiliation"], "origin":"datatracker"})
             return redirect('ietf.ietfauth.views.profile')
     else:
         form = VolunteerForm(person=person,initial=dict(nomcoms=can_volunteer, affiliation=suggest_affiliation(person)))
@@ -1331,3 +1429,12 @@ def private_volunteers_csv(request, year, public=False):
         writer.writerow([v.person.last_name(), v.person.first_name(), v.person.ascii_name(), v.affiliation, v.person.email(), v.qualifications, v.eligible])
     return response
 
+@role_required("Nomcom Chair", "Nomcom Advisor", "Secretariat")
+def qualified_volunteer_list_for_announcement(request, year, public=False):
+    _, volunteers = extract_volunteers(year)
+    qualified_volunteers = [v for v in volunteers if v.eligible]
+    return render(request, 'nomcom/qualified_volunteer_list_for_announcement.txt',
+                dict(volunteers=qualified_volunteers),
+                content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
+
+
diff --git a/ietf/person/admin.py b/ietf/person/admin.py
index 3569c03349..f46edcf8ae 100644
--- a/ietf/person/admin.py
+++ b/ietf/person/admin.py
@@ -7,6 +7,7 @@
 from ietf.person.models import Email, Alias, Person, PersonalApiKey, PersonEvent, PersonApiKeyEvent, PersonExtResource
 from ietf.person.name import name_parts
 
+from ietf.utils.admin import SaferStackedInline, SaferTabularInline
 from ietf.utils.validators import validate_external_resource_value
 
 
@@ -16,7 +17,7 @@ class EmailAdmin(simple_history.admin.SimpleHistoryAdmin):
     search_fields = ["address", "person__name", ]
 admin.site.register(Email, EmailAdmin)
     
-class EmailInline(admin.TabularInline):
+class EmailInline(SaferTabularInline):
     model = Email
 
 class AliasAdmin(admin.ModelAdmin):
@@ -25,7 +26,7 @@ class AliasAdmin(admin.ModelAdmin):
     raw_id_fields = ["person"]
 admin.site.register(Alias, AliasAdmin)
 
-class AliasInline(admin.StackedInline):
+class AliasInline(SaferStackedInline):
     model = Alias
 
 class PersonAdmin(simple_history.admin.SimpleHistoryAdmin):
@@ -36,7 +37,7 @@ def plain_name(self, obj):
             prefix, first, middle, last, suffix = name_parts(obj.name)
             return "%s %s" % (first, last)
     list_display = ["name", "short", "plain_name", "time", "user", ]
-    fields = ("user", "time", "name", "plain", "name_from_draft", "ascii", "ascii_short", "pronouns_selectable", "pronouns_freetext", "biography", "photo", "photo_thumb", "consent",)
+    fields = ("user", "time", "name", "plain", "name_from_draft", "ascii", "ascii_short", "pronouns_selectable", "pronouns_freetext", "biography", "photo", "photo_thumb",)
     readonly_fields = ("name_from_draft", )
     search_fields = ["name", "ascii"]
     raw_id_fields = ["user"]
diff --git a/ietf/person/api.py b/ietf/person/api.py
new file mode 100644
index 0000000000..960785a3d4
--- /dev/null
+++ b/ietf/person/api.py
@@ -0,0 +1,45 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+"""DRF API Views"""
+from rest_framework import mixins, viewsets
+from rest_framework.decorators import action
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+
+from ietf.api.permissions import BelongsToOwnPerson, IsOwnPerson
+from ietf.ietfauth.utils import send_new_email_confirmation_request
+
+from .models import Email, Person
+from .serializers import NewEmailSerializer, EmailSerializer, PersonSerializer
+
+
+class EmailViewSet(mixins.UpdateModelMixin, viewsets.GenericViewSet):
+    """Email viewset
+    
+    Only allows updating an existing email for now.
+    """
+    permission_classes = [IsAuthenticated & BelongsToOwnPerson]
+    queryset = Email.objects.all()
+    serializer_class = EmailSerializer
+    lookup_value_regex = '.+@.+'  # allow @-sign in the pk
+
+
+class PersonViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
+    """Person viewset"""
+    permission_classes = [IsAuthenticated & IsOwnPerson]
+    queryset = Person.objects.all()
+    serializer_class = PersonSerializer
+
+    @action(detail=True, methods=["post"], serializer_class=NewEmailSerializer)
+    def email(self, request, pk=None):
+        """Add an email address for this Person
+        
+        Always succeeds if the email address is valid. Causes a confirmation email to be sent to the
+        requested address and completion of that handshake will actually add the email address. If the
+        address already exists, an alert will be sent instead of the confirmation email.
+        """
+        person = self.get_object()
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        # This may or may not actually send a confirmation, but doesn't reveal that to the user.
+        send_new_email_confirmation_request(person, serializer.validated_data["address"])
+        return Response(serializer.data)
diff --git a/ietf/person/factories.py b/ietf/person/factories.py
index aad1f44f00..98756f26c8 100644
--- a/ietf/person/factories.py
+++ b/ietf/person/factories.py
@@ -8,14 +8,15 @@
 import faker.config
 import os
 import random
-import shutil
+from PIL import Image
 
 from unidecode import unidecode
+from unicodedata import normalize
 
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.utils.text import slugify
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 import debug                            # pyflakes:ignore
 
@@ -25,45 +26,55 @@
 
 fake = faker.Factory.create()
 
-def setup():
-    global acceptable_fakers
-    # The transliteration of some arabic and devanagari names introduces
-    # non-alphabetic characgters that don't work with the draft author
-    # extraction code, and also don't seem to match the way people with arabic
-    # names romanize arabic names.  Exlude those locales from name generation
-    # in order to avoid test failures.
-    locales = set( [ l for l in faker.config.AVAILABLE_LOCALES if not (l.startswith('ar_') or l.startswith('sg_') or l=='fr_QC') ] )
-    acceptable_fakers = [faker.Faker(locale) for locale in locales]
-setup()
+# The transliteration of some Arabic and Devanagari names introduces
+# non-alphabetic characters that don't work with the draft author
+# extraction code, and also don't seem to match the way people with Arabic
+# names romanize Arabic names.  Exclude those locales from name generation
+# in order to avoid test failures.
+_acceptable_fakers = [
+    faker.Faker(locale)
+    for locale in set(faker.config.AVAILABLE_LOCALES)
+    if not (locale.startswith('ar_') or locale.startswith('sg_') or locale == 'fr_QC')
+]
+
 
 def random_faker():
-    global acceptable_fakers
-    return random.sample(acceptable_fakers, 1)[0]
+    """Helper to get a random faker acceptable for User names"""
+    return random.sample(_acceptable_fakers, 1)[0]
+
 
 class UserFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = User
         django_get_or_create = ('username',)
         exclude = ['faker', ]
+        skip_postgeneration_save = True
 
     faker = factory.LazyFunction(random_faker)
-    first_name = factory.LazyAttribute(lambda o: o.faker.first_name())
-    last_name = factory.LazyAttribute(lambda o: o.faker.last_name())
+    # normalize these i18n Unicode strings in the same way the database does
+    first_name = factory.LazyAttribute(lambda o: normalize("NFKC", o.faker.first_name()))
+    last_name = factory.LazyAttribute(lambda o: normalize("NFKC", o.faker.last_name()))
     email = factory.LazyAttributeSequence(lambda u, n: '%s.%s_%d@%s'%( slugify(unidecode(u.first_name)),
                                                 slugify(unidecode(u.last_name)), n, fake.domain_name())) # type: ignore
     username = factory.LazyAttribute(lambda u: u.email)
 
+    # Consider using PostGenerationMethodCall instead
     @factory.post_generation
     def set_password(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         obj.set_password( '%s+password' % obj.username ) # pylint: disable=no-value-for-parameter
+        obj.save()
 
 class PersonFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Person
+        skip_postgeneration_save = True
 
     user = factory.SubFactory(UserFactory)
     name = factory.LazyAttribute(lambda p: normalize_name('%s %s'%(p.user.first_name, p.user.last_name)))
-    ascii = factory.LazyAttribute(lambda p: force_text(unidecode_name(p.name)))
+    # Some i18n names, e.g., "शिला के.सी." have a dot at the end that is also part of the ASCII, e.g., "Shilaa Kesii."
+    # That trailing dot breaks extract_authors(). Avoid this issue by stripping the dot from the ASCII.
+    # Some others have a trailing semicolon (e.g., "உயிரோவியம் தங்கராஐ;") - strip those, too.
+    ascii = factory.LazyAttribute(lambda p: force_str(unidecode_name(p.name)).rstrip(".;"))
 
     class Params:
         with_bio = factory.Trait(biography = "\n\n".join(fake.paragraphs())) # type: ignore
@@ -94,13 +105,13 @@ def default_photo(obj, create, extracted, **kwargs): # pylint: disable=no-self-a
             media_name = "%s/%s.jpg" % (settings.PHOTOS_DIRNAME, photo_name)
             obj.photo = media_name
             obj.photo_thumb = media_name
-            photosrc = os.path.join(settings.TEST_DATA_DIR, "profile-default.jpg")
             photodst = os.path.join(settings.PHOTOS_DIR,  photo_name + '.jpg')
-            if not os.path.exists(photodst):
-                shutil.copy(photosrc, photodst)
+            img = Image.new('RGB', (200, 200))
+            img.save(photodst)
             def delete_file(file):
                 os.unlink(file)
             atexit.register(delete_file, photodst)
+            obj.save()
 
 class AliasFactory(factory.django.DjangoModelFactory):
     class Meta:
@@ -149,10 +160,22 @@ class Meta:
 
 class PersonalApiKeyFactory(factory.django.DjangoModelFactory):
     person = factory.SubFactory(PersonFactory)
-    endpoint = FuzzyChoice(PERSON_API_KEY_ENDPOINTS)
-
+    endpoint = FuzzyChoice(v for v, n in PERSON_API_KEY_ENDPOINTS)
+    
     class Meta:
         model = PersonalApiKey
+        skip_postgeneration_save = True
+
+    @factory.post_generation
+    def validate_model(obj, create, extracted, **kwargs):
+        """Validate the model after creation
+        
+        Passing validate_model=False will disable the validation.
+        """
+        do_clean =  True if extracted is None else extracted
+        if do_clean:
+            obj.full_clean()
+
 
 class PersonApiKeyEventFactory(factory.django.DjangoModelFactory):
     key = factory.SubFactory(PersonalApiKeyFactory)
diff --git a/ietf/person/forms.py b/ietf/person/forms.py
index 81ee362561..7eef8aa17b 100644
--- a/ietf/person/forms.py
+++ b/ietf/person/forms.py
@@ -1,15 +1,26 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
+# Copyright The IETF Trust 2018-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 from django import forms
+
 from ietf.person.models import Person
+from ietf.utils.fields import MultiEmailField, NameAddrEmailField
 
 
 class MergeForm(forms.Form):
     source = forms.IntegerField(label='Source Person ID')
     target = forms.IntegerField(label='Target Person ID')
 
+    def __init__(self, *args, **kwargs):
+        self.readonly = False
+        if 'readonly' in kwargs:
+            self.readonly = kwargs.pop('readonly')
+        super().__init__(*args, **kwargs)
+        if self.readonly:
+            self.fields['source'].widget.attrs['readonly'] = True
+            self.fields['target'].widget.attrs['readonly'] = True
+
     def clean_source(self):
         return self.get_person(self.cleaned_data['source'])
 
@@ -21,3 +32,11 @@ def get_person(self, pk):
             return Person.objects.get(pk=pk)
         except Person.DoesNotExist:
             raise forms.ValidationError("ID does not exist")
+
+
+class MergeRequestForm(forms.Form):
+    to = MultiEmailField()
+    frm = NameAddrEmailField()
+    reply_to = MultiEmailField()
+    subject = forms.CharField()
+    body = forms.CharField(widget=forms.Textarea)
diff --git a/ietf/person/management/commands/deactivate_email_addresses.py b/ietf/person/management/commands/deactivate_email_addresses.py
index c917619872..fea8d8ee87 100644
--- a/ietf/person/management/commands/deactivate_email_addresses.py
+++ b/ietf/person/management/commands/deactivate_email_addresses.py
@@ -84,7 +84,7 @@ def handle(self, *args, **options):
                     email.origin = email.person.user.username if email.person.user_id else ('script: %s deactivation' % options['reason'])
                     email.save()
                     PersonEvent.objects.create(person=email.person, type='email_address_deactivated',
-                        desc="Deactivated the email addres <%s>. Reason: %s" % (email.address, options['reason']) )
+                        desc="Deactivated the email address <%s>. Reason: %s" % (email.address, options['reason']) )
                 else:
                     if email is None:
                         not_found.append(a)
diff --git a/ietf/person/management/commands/purge_old_personal_api_key_events.py b/ietf/person/management/commands/purge_old_personal_api_key_events.py
deleted file mode 100644
index e60f784b5d..0000000000
--- a/ietf/person/management/commands/purge_old_personal_api_key_events.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright The IETF Trust 2021, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-from datetime import datetime, timedelta
-from django.core.management.base import BaseCommand, CommandError
-from django.db.models import Max, Min
-
-from ietf.person.models import PersonApiKeyEvent
-
-
-class Command(BaseCommand):
-    help = 'Purge PersonApiKeyEvent instances older than KEEP_DAYS days'
-
-    def add_arguments(self, parser):
-        parser.add_argument('keep_days', type=int,
-                            help='Delete events older than this many days')
-        parser.add_argument('-n', '--dry-run', action='store_true', default=False,
-                            help="Don't delete events, just show what would be done")
-
-    def handle(self, *args, **options):
-        keep_days = options['keep_days']
-        dry_run = options['dry_run']
-
-        def _format_count(count, unit='day'):
-            return '{} {}{}'.format(count, unit, ('' if count == 1 else 's'))
-
-        if keep_days < 0:
-            raise CommandError('Negative keep_days not allowed ({} was specified)'.format(keep_days))
-
-        if dry_run:
-            self.stdout.write('Dry run requested, records will not be deleted\n')
-
-        self.stdout.write('Finding events older than {}\n'.format(_format_count(keep_days)))
-        self.stdout.flush()
-
-        now = datetime.now()
-        old_events = PersonApiKeyEvent.objects.filter(
-            time__lt=now - timedelta(days=keep_days)
-        )
-
-        stats = old_events.aggregate(Min('time'), Max('time'))
-        old_count = old_events.count()
-        if old_count == 0:
-            self.stdout.write('No events older than {} found\n'.format(_format_count(keep_days)))
-            return
-
-        oldest_date = stats['time__min']
-        oldest_ago = now - oldest_date
-        newest_date = stats['time__max']
-        newest_ago = now - newest_date
-
-        action_fmt = 'Would delete {}\n' if dry_run else 'Deleting {}\n'
-        self.stdout.write(action_fmt.format(_format_count(old_count, 'event')))
-        self.stdout.write('    Oldest at {} ({} ago)\n'.format(oldest_date, _format_count(oldest_ago.days)))
-        self.stdout.write('    Most recent at {} ({} ago)\n'.format(newest_date, _format_count(newest_ago.days)))
-        self.stdout.flush()
-
-        if not dry_run:
-            old_events.delete()
diff --git a/ietf/person/management/commands/tests.py b/ietf/person/management/commands/tests.py
deleted file mode 100644
index f30a80bf51..0000000000
--- a/ietf/person/management/commands/tests.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright The IETF Trust 2021, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-import datetime
-from io import StringIO
-
-from django.core.management import call_command, CommandError
-
-from ietf.person.factories import PersonApiKeyEventFactory
-from ietf.person.models import PersonApiKeyEvent, PersonEvent
-from ietf.utils.test_utils import TestCase
-
-
-class CommandTests(TestCase):
-    @staticmethod
-    def _call_command(command_name, *args, **options):
-        out = StringIO()
-        options['stdout'] = out
-        call_command(command_name, *args, **options)
-        return out.getvalue()
-
-    def _assert_purge_results(self, cmd_output, expected_delete_count, expected_kept_events):
-        self.assertNotIn('Dry run requested', cmd_output)
-        if expected_delete_count == 0:
-            delete_text = 'No events older than'
-        else:
-            delete_text = 'Deleting {} event'.format(expected_delete_count)
-        self.assertIn(delete_text, cmd_output)
-        self.assertCountEqual(
-            PersonApiKeyEvent.objects.all(),
-            expected_kept_events,
-            'Wrong events were deleted'
-        )
-
-    def _assert_purge_dry_run_results(self, cmd_output, expected_delete_count, expected_kept_events):
-        self.assertIn('Dry run requested', cmd_output)
-        if expected_delete_count == 0:
-            delete_text = 'No events older than'
-        else:
-            delete_text = 'Would delete {} event'.format(expected_delete_count)
-        self.assertIn(delete_text, cmd_output)
-        self.assertCountEqual(
-            PersonApiKeyEvent.objects.all(),
-            expected_kept_events,
-            'Events were deleted when dry-run option was used'
-        )
-
-    def test_purge_old_personal_api_key_events(self):
-        keep_days = 10
-
-        # Remember how many PersonEvents were present so we can verify they're cleaned up properly.
-        personevents_before = PersonEvent.objects.count()
-
-        now = datetime.datetime.now()
-        # The first of these events will be timestamped a fraction of a second more than keep_days
-        # days ago by the time we call the management command, so will just barely chosen for purge.
-        old_events = [
-            PersonApiKeyEventFactory(time=now - datetime.timedelta(days=n))
-            for n in range(keep_days, 2 * keep_days + 1)
-        ]
-        num_old_events = len(old_events)
-
-        recent_events = [
-            PersonApiKeyEventFactory(time=now - datetime.timedelta(days=n))
-            for n in range(0, keep_days)
-        ]
-        # We did not create recent_event timestamped exactly keep_days ago because it would
-        # be treated as an old_event by the management command. Create an event a few seconds
-        # on the "recent" side of keep_days old to test the threshold.
-        recent_events.append(
-            PersonApiKeyEventFactory(
-                time=now + datetime.timedelta(seconds=3) - datetime.timedelta(days=keep_days)
-            )
-        )
-        num_recent_events = len(recent_events)
-
-        # call with dry run
-        output = self._call_command('purge_old_personal_api_key_events', str(keep_days), '--dry-run')
-        self._assert_purge_dry_run_results(output, num_old_events, old_events + recent_events)
-
-        # call for real
-        output = self._call_command('purge_old_personal_api_key_events', str(keep_days))
-        self._assert_purge_results(output, num_old_events, recent_events)
-        self.assertEqual(PersonEvent.objects.count(), personevents_before + num_recent_events,
-                         'PersonEvents were not cleaned up properly')
-
-        # repeat - there should be nothing left to delete
-        output = self._call_command('purge_old_personal_api_key_events', '--dry-run', str(keep_days))
-        self._assert_purge_dry_run_results(output, 0, recent_events)
-
-        output = self._call_command('purge_old_personal_api_key_events', str(keep_days))
-        self._assert_purge_results(output, 0, recent_events)
-        self.assertEqual(PersonEvent.objects.count(), personevents_before + num_recent_events,
-                         'PersonEvents were not cleaned up properly')
-
-        # and now delete the remaining events
-        output = self._call_command('purge_old_personal_api_key_events', '0')
-        self._assert_purge_results(output, num_recent_events, [])
-        self.assertEqual(PersonEvent.objects.count(), personevents_before,
-                         'PersonEvents were not cleaned up properly')
-
-    def test_purge_old_personal_api_key_events_rejects_invalid_arguments(self):
-        """The purge_old_personal_api_key_events command should reject invalid arguments"""
-        event = PersonApiKeyEventFactory(time=datetime.datetime.now() - datetime.timedelta(days=30))
-
-        with self.assertRaises(CommandError):
-            self._call_command('purge_old_personal_api_key_events')
-
-        with self.assertRaises(CommandError):
-            self._call_command('purge_old_personal_api_key_events', '-15')
-
-        with self.assertRaises(CommandError):
-            self._call_command('purge_old_personal_api_key_events', '15.3')
-
-        with self.assertRaises(CommandError):
-            self._call_command('purge_old_personal_api_key_events', '15', '15')
-
-        with self.assertRaises(CommandError):
-            self._call_command('purge_old_personal_api_key_events', 'abc', '15')
-
-        self.assertCountEqual(PersonApiKeyEvent.objects.all(), [event])
diff --git a/ietf/person/migrations/0001_initial.py b/ietf/person/migrations/0001_initial.py
index 72f6c9105b..d0f6f239a3 100644
--- a/ietf/person/migrations/0001_initial.py
+++ b/ietf/person/migrations/0001_initial.py
@@ -1,16 +1,16 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
-
-import datetime
 from django.conf import settings
+import django.contrib.postgres.fields.citext
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
 import ietf.person.models
 import ietf.utils.models
 import ietf.utils.storage
+import jsonfield.fields
+import simple_history.models
 
 
 class Migration(migrations.Migration):
@@ -19,53 +19,64 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('name', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Alias',
+            name='Person',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(db_index=True, max_length=255)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('name', models.CharField(db_index=True, help_text='Preferred long form of name.', max_length=255, validators=[ietf.person.models.name_character_validator], verbose_name='Full Name (Unicode)')),
+                ('plain', models.CharField(blank=True, default='', help_text="Use this if you have a Spanish double surname.  Don't use this for nicknames, and don't use it unless you've actually observed that the datatracker shows your name incorrectly.", max_length=64, verbose_name='Plain Name correction (Unicode)')),
+                ('ascii', models.CharField(help_text='Name as rendered in ASCII (Latin, unaccented) characters.', max_length=255, verbose_name='Full Name (ASCII)')),
+                ('ascii_short', models.CharField(blank=True, help_text='Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).', max_length=32, null=True, verbose_name='Abbreviated Name (ASCII)')),
+                ('pronouns_selectable', jsonfield.fields.JSONCharField(blank=True, default=list, max_length=120, null=True, verbose_name='Pronouns')),
+                ('pronouns_freetext', models.CharField(blank=True, help_text='Optionally provide your personal pronouns. These will be displayed on your public profile page and alongside your name in Meetecho and, in future, other systems. Select any number of the checkboxes OR provide a custom string up to 30 characters.', max_length=30, null=True, verbose_name=' ')),
+                ('biography', models.TextField(blank=True, help_text='Short biography for use on leadership pages. Use plain text or reStructuredText markup.')),
+                ('photo', models.ImageField(blank=True, default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to='photo')),
+                ('photo_thumb', models.ImageField(blank=True, default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to='photo')),
+                ('name_from_draft', models.CharField(editable=False, help_text='Name as found in an Internet-Draft submission.', max_length=255, null=True, verbose_name='Full Name (from submission)')),
+                ('user', ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='PersonEvent',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField(default=django.utils.timezone.now, help_text='When the event happened')),
+                ('type', models.CharField(choices=[('apikey_login', 'API key login'), ('email_address_deactivated', 'Email address deactivated')], max_length=50)),
+                ('desc', models.TextField()),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
             options={
-                'verbose_name_plural': 'Aliases',
+                'ordering': ['-time', '-id'],
             },
         ),
         migrations.CreateModel(
-            name='Email',
+            name='PersonApiKeyEvent',
             fields=[
-                ('address', models.CharField(max_length=64, primary_key=True, serialize=False, validators=[django.core.validators.EmailValidator()])),
-                ('time', models.DateTimeField(auto_now_add=True)),
-                ('primary', models.BooleanField(default=False)),
-                ('active', models.BooleanField(default=True)),
+                ('personevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='person.PersonEvent')),
             ],
+            bases=('person.personevent',),
         ),
         migrations.CreateModel(
-            name='Person',
+            name='PersonExtResource',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('name', models.CharField(db_index=True, help_text='Preferred form of name.', max_length=255, verbose_name='Full Name (Unicode)')),
-                ('ascii', models.CharField(help_text='Name as rendered in ASCII (Latin, unaccented) characters.', max_length=255, verbose_name='Full Name (ASCII)')),
-                ('ascii_short', models.CharField(blank=True, help_text='Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).', max_length=32, null=True, verbose_name='Abbreviated Name (ASCII)')),
-                ('affiliation', models.CharField(blank=True, help_text='Employer, university, sponsor, etc.', max_length=255)),
-                ('address', models.TextField(blank=True, help_text='Postal mailing address.', max_length=255)),
-                ('biography', models.TextField(blank=True, help_text='Short biography for use on leadership pages. Use plain text or reStructuredText markup.')),
-                ('photo', models.ImageField(blank=True, default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to='photo')),
-                ('photo_thumb', models.ImageField(blank=True, default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to='photo')),
-                ('user', ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('display_name', models.CharField(blank=True, default='', max_length=255)),
+                ('value', models.CharField(max_length=2083)),
+                ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceName')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
-            options={
-                'abstract': False,
-            },
         ),
         migrations.CreateModel(
             name='PersonalApiKey',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('endpoint', models.CharField(choices=[('/api/iesg/position', '/api/iesg/position')], max_length=128)),
-                ('created', models.DateTimeField(default=datetime.datetime.now)),
+                ('endpoint', models.CharField(choices=[('/api/appauth/authortools', '/api/appauth/authortools'), ('/api/appauth/bibxml', '/api/appauth/bibxml'), ('/api/iesg/position', '/api/iesg/position'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/bluesheet', '/api/notify/meeting/bluesheet'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration'), ('/api/notify/session/attendees', '/api/notify/session/attendees'), ('/api/notify/session/chatlog', '/api/notify/session/chatlog'), ('/api/notify/session/polls', '/api/notify/session/polls'), ('/api/v2/person/person', '/api/v2/person/person')], max_length=128)),
+                ('created', models.DateTimeField(default=django.utils.timezone.now)),
                 ('valid', models.BooleanField(default=True)),
                 ('salt', models.BinaryField(default=ietf.person.models.salt, max_length=12)),
                 ('count', models.IntegerField(default=0)),
@@ -74,58 +85,87 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='PersonEvent',
+            name='HistoricalPerson',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now, help_text='When the event happened')),
-                ('type', models.CharField(choices=[('apikey_login', 'API key login')], max_length=50)),
-                ('desc', models.TextField()),
+                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('name', models.CharField(db_index=True, help_text='Preferred long form of name.', max_length=255, validators=[ietf.person.models.name_character_validator], verbose_name='Full Name (Unicode)')),
+                ('plain', models.CharField(blank=True, default='', help_text="Use this if you have a Spanish double surname.  Don't use this for nicknames, and don't use it unless you've actually observed that the datatracker shows your name incorrectly.", max_length=64, verbose_name='Plain Name correction (Unicode)')),
+                ('ascii', models.CharField(help_text='Name as rendered in ASCII (Latin, unaccented) characters.', max_length=255, verbose_name='Full Name (ASCII)')),
+                ('ascii_short', models.CharField(blank=True, help_text='Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).', max_length=32, null=True, verbose_name='Abbreviated Name (ASCII)')),
+                ('pronouns_selectable', jsonfield.fields.JSONCharField(blank=True, default=list, max_length=120, null=True, verbose_name='Pronouns')),
+                ('pronouns_freetext', models.CharField(blank=True, help_text='Optionally provide your personal pronouns. These will be displayed on your public profile page and alongside your name in Meetecho and, in future, other systems. Select any number of the checkboxes OR provide a custom string up to 30 characters.', max_length=30, null=True, verbose_name=' ')),
+                ('biography', models.TextField(blank=True, help_text='Short biography for use on leadership pages. Use plain text or reStructuredText markup.')),
+                ('photo', models.TextField(blank=True, default=None, max_length=100)),
+                ('photo_thumb', models.TextField(blank=True, default=None, max_length=100)),
+                ('name_from_draft', models.CharField(editable=False, help_text='Name as found in an Internet-Draft submission.', max_length=255, null=True, verbose_name='Full Name (from submission)')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'ordering': ['-time', '-id'],
+                'verbose_name': 'historical person',
+                'verbose_name_plural': 'historical persons',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
             },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
         ),
         migrations.CreateModel(
-            name='PersonHistory',
+            name='HistoricalEmail',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('name', models.CharField(db_index=True, help_text='Preferred form of name.', max_length=255, verbose_name='Full Name (Unicode)')),
-                ('ascii', models.CharField(help_text='Name as rendered in ASCII (Latin, unaccented) characters.', max_length=255, verbose_name='Full Name (ASCII)')),
-                ('ascii_short', models.CharField(blank=True, help_text='Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).', max_length=32, null=True, verbose_name='Abbreviated Name (ASCII)')),
-                ('affiliation', models.CharField(blank=True, help_text='Employer, university, sponsor, etc.', max_length=255)),
-                ('address', models.TextField(blank=True, help_text='Postal mailing address.', max_length=255)),
-                ('biography', models.TextField(blank=True, help_text='Short biography for use on leadership pages. Use plain text or reStructuredText markup.')),
-                ('photo', models.ImageField(blank=True, default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to='photo')),
-                ('photo_thumb', models.ImageField(blank=True, default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to='photo')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='person.Person')),
-                ('user', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('address', django.contrib.postgres.fields.citext.CICharField(db_index=True, max_length=64, validators=[django.core.validators.EmailValidator()])),
+                ('time', models.DateTimeField(blank=True, editable=False)),
+                ('primary', models.BooleanField(default=False)),
+                ('origin', models.CharField(help_text="The origin of the address: the user's email address, or 'author: DRAFTNAME' if an Internet-Draft, or 'role: GROUP/ROLE' if a role.", max_length=150)),
+                ('active', models.BooleanField(default=True)),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_change_reason', models.CharField(max_length=100, null=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('person', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Person')),
             ],
             options={
-                'abstract': False,
+                'verbose_name': 'historical email',
+                'verbose_name_plural': 'historical emails',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
             },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
         ),
         migrations.CreateModel(
-            name='PersonApiKeyEvent',
+            name='Email',
             fields=[
-                ('personevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='person.PersonEvent')),
-                ('key', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.PersonalApiKey')),
+                ('address', django.contrib.postgres.fields.citext.CICharField(max_length=64, primary_key=True, serialize=False, validators=[django.core.validators.EmailValidator()])),
+                ('time', models.DateTimeField(auto_now_add=True)),
+                ('primary', models.BooleanField(default=False)),
+                ('origin', models.CharField(help_text="The origin of the address: the user's email address, or 'author: DRAFTNAME' if an Internet-Draft, or 'role: GROUP/ROLE' if a role.", max_length=150)),
+                ('active', models.BooleanField(default=True)),
+                ('person', ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
-            bases=('person.personevent',),
         ),
-        migrations.AddField(
-            model_name='personevent',
-            name='person',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        migrations.CreateModel(
+            name='Alias',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(db_index=True, max_length=255)),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+            ],
+            options={
+                'verbose_name_plural': 'Aliases',
+            },
         ),
-        migrations.AddField(
-            model_name='email',
-            name='person',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+        migrations.AddIndex(
+            model_name='personevent',
+            index=models.Index(fields=['-time', '-id'], name='person_pers_time_8dfbc5_idx'),
         ),
         migrations.AddField(
-            model_name='alias',
-            name='person',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+            model_name='personapikeyevent',
+            name='key',
+            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.PersonalApiKey'),
         ),
     ]
diff --git a/ietf/person/migrations/0002_alter_historicalperson_ascii_and_more.py b/ietf/person/migrations/0002_alter_historicalperson_ascii_and_more.py
new file mode 100644
index 0000000000..98d5da75d6
--- /dev/null
+++ b/ietf/person/migrations/0002_alter_historicalperson_ascii_and_more.py
@@ -0,0 +1,82 @@
+# Generated by Django 4.2.13 on 2024-05-22 18:50
+
+from django.db import migrations, models
+import ietf.person.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("person", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalperson",
+            name="ascii",
+            field=models.CharField(
+                help_text="Name as rendered in ASCII (Latin, unaccented) characters.",
+                max_length=255,
+                validators=[ietf.person.models.name_character_validator],
+                verbose_name="Full Name (ASCII)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalperson",
+            name="ascii_short",
+            field=models.CharField(
+                blank=True,
+                help_text="Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).",
+                max_length=32,
+                null=True,
+                validators=[ietf.person.models.name_character_validator],
+                verbose_name="Abbreviated Name (ASCII)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalperson",
+            name="plain",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Use this if you have a Spanish double surname.  Don't use this for nicknames, and don't use it unless you've actually observed that the datatracker shows your name incorrectly.",
+                max_length=64,
+                validators=[ietf.person.models.name_character_validator],
+                verbose_name="Plain Name correction (Unicode)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="person",
+            name="ascii",
+            field=models.CharField(
+                help_text="Name as rendered in ASCII (Latin, unaccented) characters.",
+                max_length=255,
+                validators=[ietf.person.models.name_character_validator],
+                verbose_name="Full Name (ASCII)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="person",
+            name="ascii_short",
+            field=models.CharField(
+                blank=True,
+                help_text="Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).",
+                max_length=32,
+                null=True,
+                validators=[ietf.person.models.name_character_validator],
+                verbose_name="Abbreviated Name (ASCII)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="person",
+            name="plain",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Use this if you have a Spanish double surname.  Don't use this for nicknames, and don't use it unless you've actually observed that the datatracker shows your name incorrectly.",
+                max_length=64,
+                validators=[ietf.person.models.name_character_validator],
+                verbose_name="Plain Name correction (Unicode)",
+            ),
+        ),
+    ]
diff --git a/ietf/person/migrations/0002_auto_20180330_0808.py b/ietf/person/migrations/0002_auto_20180330_0808.py
deleted file mode 100644
index ec2d2d8938..0000000000
--- a/ietf/person/migrations/0002_auto_20180330_0808.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-03-30 08:08
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/iesg/position', '/api/iesg/position'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0003_alter_personalapikey_endpoint.py b/ietf/person/migrations/0003_alter_personalapikey_endpoint.py
new file mode 100644
index 0000000000..202af4b101
--- /dev/null
+++ b/ietf/person/migrations/0003_alter_personalapikey_endpoint.py
@@ -0,0 +1,42 @@
+# Generated by Django 4.2.16 on 2024-10-24 21:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("person", "0002_alter_historicalperson_ascii_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="personalapikey",
+            name="endpoint",
+            field=models.CharField(
+                choices=[
+                    ("/api/appauth/authortools", "/api/appauth/authortools"),
+                    ("/api/appauth/bibxml", "/api/appauth/bibxml"),
+                    ("/api/iesg/position", "/api/iesg/position"),
+                    (
+                        "/api/meeting/session/recording-name",
+                        "/api/meeting/session/recording-name",
+                    ),
+                    (
+                        "/api/meeting/session/video/url",
+                        "/api/meeting/session/video/url",
+                    ),
+                    ("/api/notify/meeting/bluesheet", "/api/notify/meeting/bluesheet"),
+                    (
+                        "/api/notify/meeting/registration",
+                        "/api/notify/meeting/registration",
+                    ),
+                    ("/api/notify/session/attendees", "/api/notify/session/attendees"),
+                    ("/api/notify/session/chatlog", "/api/notify/session/chatlog"),
+                    ("/api/notify/session/polls", "/api/notify/session/polls"),
+                    ("/api/v2/person/person", "/api/v2/person/person"),
+                ],
+                max_length=128,
+            ),
+        ),
+    ]
diff --git a/ietf/person/migrations/0003_auto_20180504_1519.py b/ietf/person/migrations/0003_auto_20180504_1519.py
deleted file mode 100644
index 928c637c53..0000000000
--- a/ietf/person/migrations/0003_auto_20180504_1519.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.12 on 2018-05-04 15:19
-
-
-import datetime
-from django.conf import settings
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('person', '0002_auto_20180330_0808'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='HistoricalEmail',
-            fields=[
-                ('address', models.CharField(db_index=True, max_length=64, validators=[django.core.validators.EmailValidator()])),
-                ('time', models.DateTimeField(blank=True, editable=False)),
-                ('primary', models.BooleanField(default=False)),
-                ('origin', models.CharField(default='', editable=False, max_length=150)),
-                ('active', models.BooleanField(default=True)),
-                ('history_id', models.AutoField(primary_key=True, serialize=False)),
-                ('history_date', models.DateTimeField()),
-                ('history_change_reason', models.CharField(max_length=100, null=True)),
-                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
-                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'ordering': ('-history_date', '-history_id'),
-                'get_latest_by': 'history_date',
-                'verbose_name': 'historical email',
-            },
-        ),
-        migrations.CreateModel(
-            name='HistoricalPerson',
-            fields=[
-                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('name', models.CharField(db_index=True, help_text='Preferred form of name.', max_length=255, verbose_name='Full Name (Unicode)')),
-                ('ascii', models.CharField(help_text='Name as rendered in ASCII (Latin, unaccented) characters.', max_length=255, verbose_name='Full Name (ASCII)')),
-                ('ascii_short', models.CharField(blank=True, help_text='Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).', max_length=32, null=True, verbose_name='Abbreviated Name (ASCII)')),
-                ('biography', models.TextField(blank=True, help_text='Short biography for use on leadership pages. Use plain text or reStructuredText markup.')),
-                ('photo', models.TextField(blank=True, default=None, max_length=100)),
-                ('photo_thumb', models.TextField(blank=True, default=None, max_length=100)),
-                ('name_from_draft', models.CharField(editable=False, help_text='Name as found in a draft submission.', max_length=255, null=True, verbose_name='Full Name (from submission)')),
-                ('history_id', models.AutoField(primary_key=True, serialize=False)),
-                ('history_date', models.DateTimeField()),
-                ('history_change_reason', models.CharField(max_length=100, null=True)),
-                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
-                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
-                ('user', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'ordering': ('-history_date', '-history_id'),
-                'get_latest_by': 'history_date',
-                'verbose_name': 'historical person',
-            },
-        ),
-        migrations.RemoveField(
-            model_name='personhistory',
-            name='person',
-        ),
-        migrations.RemoveField(
-            model_name='personhistory',
-            name='user',
-        ),
-        migrations.RemoveField(
-            model_name='person',
-            name='address',
-        ),
-        migrations.RemoveField(
-            model_name='person',
-            name='affiliation',
-        ),
-        migrations.AddField(
-            model_name='email',
-            name='origin',
-            field=models.CharField(default='', editable=False, max_length=150),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='name_from_draft',
-            field=models.CharField(editable=False, help_text='Name as found in a draft submission.', max_length=255, null=True, verbose_name='Full Name (from submission)'),
-        ),
-        migrations.DeleteModel(
-            name='PersonHistory',
-        ),
-        migrations.AddField(
-            model_name='historicalemail',
-            name='person',
-            field=ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Person'),
-        ),
-        migrations.AddField(
-            model_name='historicalperson',
-            name='consent',
-            field=models.NullBooleanField(default=None, verbose_name='I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='consent',
-            field=models.NullBooleanField(default=None, verbose_name='I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker'),
-        ),
-    ]
diff --git a/ietf/person/migrations/0004_alter_person_photo_alter_person_photo_thumb.py b/ietf/person/migrations/0004_alter_person_photo_alter_person_photo_thumb.py
new file mode 100644
index 0000000000..f34382fa70
--- /dev/null
+++ b/ietf/person/migrations/0004_alter_person_photo_alter_person_photo_thumb.py
@@ -0,0 +1,38 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+import ietf.utils.storage
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("person", "0003_alter_personalapikey_endpoint"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="person",
+            name="photo",
+            field=models.ImageField(
+                blank=True,
+                default=None,
+                storage=ietf.utils.storage.BlobShadowFileSystemStorage(
+                    kind="", location=None
+                ),
+                upload_to="photo",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="person",
+            name="photo_thumb",
+            field=models.ImageField(
+                blank=True,
+                default=None,
+                storage=ietf.utils.storage.BlobShadowFileSystemStorage(
+                    kind="", location=None
+                ),
+                upload_to="photo",
+            ),
+        ),
+    ]
diff --git a/ietf/person/migrations/0004_populate_email_origin.py b/ietf/person/migrations/0004_populate_email_origin.py
deleted file mode 100644
index 147b7b70c1..0000000000
--- a/ietf/person/migrations/0004_populate_email_origin.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.12 on 2018-05-10 05:28
-
-
-import sys
-
-from django.db import migrations
-
-import debug                            # pyflakes:ignore
-
-def populate_email_origin(apps, schema_editor):
-    Submission      = apps.get_model('submit', 'Submission')
-    Document        = apps.get_model('doc', 'Document')
-    DocHistory      = apps.get_model('doc', 'DocHistory')
-    DocumentAuthor  = apps.get_model('doc', 'DocumentAuthor')
-    DocHistoryAuthor= apps.get_model('doc', 'DocHistoryAuthor')
-    Role            = apps.get_model('group', 'Role')
-    RoleHistory     = apps.get_model('group', 'RoleHistory')
-    ReviewRequest   = apps.get_model('review', 'ReviewRequest')
-    LiaisonStatement= apps.get_model('liaisons', 'LiaisonStatement')
-    #
-    Email           = apps.get_model('person', 'Email')
-    #
-    sys.stdout.write("\n")
-    #
-    sys.stdout.write("\n    ** This migration may take some time.  Expect at least a few minutes **.\n\n")
-    sys.stdout.write("    Initializing data structures...\n")
-    emails = dict([ (e.address, e) for e in Email.objects.filter(origin='') ])
-
-    count = 0
-    sys.stdout.write("    Assigning email origins from Submission records...\n")
-    for o in Submission.objects.all().order_by('-submission_date'):
-        for a in o.authors:
-            addr = a['email']
-            if addr in emails:
-                e = emails[addr]
-                if e.origin != o.name:
-                    e.origin = "author: %s" % o.name
-                    count += 1
-                    e.save()
-                    del emails[addr]
-    sys.stdout.write("    Submission email origins assigned: %d\n" % count)
-
-    for model in (DocumentAuthor, DocHistoryAuthor, ):
-        count = 0
-        sys.stdout.write("    Assigning email origins from %s records...\n" % model.__name__)
-        for o in model.objects.filter(email__origin=''):
-            if not o.email.origin:
-                o.email.origin = "author: %s" % o.document.name
-                o.email.save()
-                count += 1
-        sys.stdout.write("    %s email origins assigned: %d\n" % (model.__name__, count))
-
-    for model in (Role, RoleHistory, ):
-        count = 0
-        sys.stdout.write("    Assigning email origins from %s records...\n" % model.__name__)
-        for o in model.objects.filter(email__origin=''):
-            if not o.email.origin:
-                o.email.origin = "role: %s %s" % (o.group.acronym, o.name.slug)
-                o.email.save()
-                count += 1
-        sys.stdout.write("    %s email origins assigned: %d\n" % (model.__name__, count))
-
-    for model in (ReviewRequest, ):
-        count = 0
-        sys.stdout.write("    Assigning email origins from %s records...\n" % model.__name__)
-        for o in model.objects.filter(reviewer__origin=''):
-            if not o.reviewer.origin:
-                o.reviewer.origin = "reviewer: %s" % (o.doc.name)
-                o.reviewer.save()
-                count += 1
-        sys.stdout.write("    %s email origins assigned: %d\n" % (model.__name__, count))
-
-    for model in (LiaisonStatement, ):
-        count = 0
-        sys.stdout.write("    Assigning email origins from %s records...\n" % model.__name__)
-        for o in model.objects.filter(from_contact__origin=''):
-            if not o.from_contact.origin:
-                o.from_contact.origin = "liaison: %s" % (','.join([ g.acronym for g in o.from_groups.all() ]))
-                o.from_contact.save()
-                count += 1
-        sys.stdout.write("    %s email origins assigned: %d\n" % (model.__name__, count))
-
-    for model in (Document, DocHistory, ):
-        count = 0
-        sys.stdout.write("    Assigning email origins from %s records...\n" % model.__name__)
-        for o in model.objects.filter(shepherd__origin=''):
-            if not o.shepherd.origin:
-                o.shepherd.origin = "shepherd: %s" % o.name
-                o.shepherd.save()
-                count += 1
-        sys.stdout.write("    %s email origins assigned: %d\n" % (model.__name__, count))
-
-    sys.stdout.write("\n")
-    sys.stdout.write("    Email records with origin indication: %d\n" % Email.objects.exclude(origin='').count())
-    sys.stdout.write("    Email records without origin indication: %d\n" % Email.objects.filter(origin='').count())
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0003_auto_20180504_1519'),
-    ]
-
-    operations = [
-        migrations.RunPython(populate_email_origin, reverse)
-    ]
diff --git a/ietf/person/migrations/0005_alter_historicalperson_pronouns_selectable_and_more.py b/ietf/person/migrations/0005_alter_historicalperson_pronouns_selectable_and_more.py
new file mode 100644
index 0000000000..2af874b1fa
--- /dev/null
+++ b/ietf/person/migrations/0005_alter_historicalperson_pronouns_selectable_and_more.py
@@ -0,0 +1,34 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("person", "0004_alter_person_photo_alter_person_photo_thumb"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalperson",
+            name="pronouns_selectable",
+            field=models.JSONField(
+                blank=True,
+                default=list,
+                max_length=120,
+                null=True,
+                verbose_name="Pronouns",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="person",
+            name="pronouns_selectable",
+            field=models.JSONField(
+                blank=True,
+                default=list,
+                max_length=120,
+                null=True,
+                verbose_name="Pronouns",
+            ),
+        ),
+    ]
diff --git a/ietf/person/migrations/0005_populate_person_name_from_draft.py b/ietf/person/migrations/0005_populate_person_name_from_draft.py
deleted file mode 100644
index d83dd22844..0000000000
--- a/ietf/person/migrations/0005_populate_person_name_from_draft.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.12 on 2018-05-10 05:28
-
-
-import sys
-
-from django.db import migrations
-
-import debug                            # pyflakes:ignore
-
-def populate_person_name_from_draft(apps, schema_editor):
-    Submission      = apps.get_model('submit', 'Submission')
-    Email           = apps.get_model('person', 'Email')
-    #
-    sys.stdout.write("\n")
-    #
-    sys.stdout.write("\n    ** This migration may take some time.  Expect at least a few minutes **.\n\n")
-    sys.stdout.write("    Initializing data structures...\n")
-    persons = dict([ (e.address, e.person) for e in Email.objects.all() ])
-
-    count = 0
-    sys.stdout.write("    Assigning Person.name_from_draft from Submission records...\n")
-    for o in Submission.objects.all().order_by('-submission_date'):
-        for a in o.authors:
-            name  = a['name']
-            email = a['email']
-            if email in persons:
-                p = persons[email]
-                if not p.name_from_draft:
-                    p.name_from_draft = name
-                    count += 1
-                    p.save()
-                del persons[email]
-    sys.stdout.write("    Submission author names assigned: %d\n" % count)
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0004_populate_email_origin'),
-    ]
-
-    operations = [
-        migrations.RunPython(populate_person_name_from_draft, reverse)
-    ]
diff --git a/ietf/person/migrations/0006_auto_20180910_0719.py b/ietf/person/migrations/0006_auto_20180910_0719.py
deleted file mode 100644
index 9e17137a86..0000000000
--- a/ietf/person/migrations/0006_auto_20180910_0719.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-09-10 07:19
-
-
-from django.conf import settings
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0005_populate_person_name_from_draft'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='person',
-            name='user',
-            field=ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/ietf/person/migrations/0007_auto_20180929_1303.py b/ietf/person/migrations/0007_auto_20180929_1303.py
deleted file mode 100644
index b4e41d7fa2..0000000000
--- a/ietf/person/migrations/0007_auto_20180929_1303.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-29 13:03
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0006_auto_20180910_0719'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personevent',
-            name='type',
-            field=models.CharField(choices=[('apikey_login', 'API key login'), ('gdpr_notice_email', 'GDPR consent request email sent'), ('email_address_deactivated', 'Email address deactivated')], max_length=50),
-        ),
-    ]
diff --git a/ietf/person/migrations/0008_auto_20181014_1448.py b/ietf/person/migrations/0008_auto_20181014_1448.py
deleted file mode 100644
index f6d765b02f..0000000000
--- a/ietf/person/migrations/0008_auto_20181014_1448.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-10-14 14:48
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0007_auto_20180929_1303'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/iesg/position', '/api/iesg/position'), ('/api/v2/person/person', '/api/v2/person/person'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0009_auto_20190118_0725.py b/ietf/person/migrations/0009_auto_20190118_0725.py
deleted file mode 100644
index be609f109f..0000000000
--- a/ietf/person/migrations/0009_auto_20190118_0725.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-18 07:25
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0008_auto_20181014_1448'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='email',
-            name='origin',
-            field=models.CharField(help_text="The origin of the address: the user's email address, or 'author: DRAFTNAME' if a draft, or 'role: GROUP/ROLE' if a role.", max_length=150),
-        ),
-        migrations.AlterField(
-            model_name='historicalemail',
-            name='origin',
-            field=models.CharField(help_text="The origin of the address: the user's email address, or 'author: DRAFTNAME' if a draft, or 'role: GROUP/ROLE' if a role.", max_length=150),
-        ),
-    ]
diff --git a/ietf/person/migrations/0010_auto_20200415_1133.py b/ietf/person/migrations/0010_auto_20200415_1133.py
deleted file mode 100644
index 80aea5efa9..0000000000
--- a/ietf/person/migrations/0010_auto_20200415_1133.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-04-15 11:33
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0009_auto_20190118_0725'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/iesg/position', '/api/iesg/position'), ('/api/v2/person/person', '/api/v2/person/person'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/person/access/meetecho', '/api/person/access/meetecho')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0011_auto_20200608_1212.py b/ietf/person/migrations/0011_auto_20200608_1212.py
deleted file mode 100644
index ea64411aa7..0000000000
--- a/ietf/person/migrations/0011_auto_20200608_1212.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2020-06-08 12:12
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0010_auto_20200415_1133'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/iesg/position', '/api/iesg/position'), ('/api/v2/person/person', '/api/v2/person/person'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/person/access/meetecho', '/api/person/access/meetecho'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0012_auto_20200624_1332.py b/ietf/person/migrations/0012_auto_20200624_1332.py
deleted file mode 100644
index bba2ff621e..0000000000
--- a/ietf/person/migrations/0012_auto_20200624_1332.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 2.1.15 on 2020-06-24 13:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0011_auto_20200608_1212'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='historicalperson',
-            name='consent',
-            field=models.BooleanField(default=None, null=True, verbose_name='I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker'),
-        ),
-        migrations.AlterField(
-            model_name='person',
-            name='consent',
-            field=models.BooleanField(default=None, null=True, verbose_name='I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker'),
-        ),
-    ]
diff --git a/ietf/person/migrations/0013_auto_20200711_1036.py b/ietf/person/migrations/0013_auto_20200711_1036.py
deleted file mode 100644
index df031f6daf..0000000000
--- a/ietf/person/migrations/0013_auto_20200711_1036.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 2.2.14 on 2020-07-11 13:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0012_auto_20200624_1332'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='historicalperson',
-            name='plain',
-            field=models.CharField(blank=True, default='', help_text='Preferred plain form of name, if different from the automatic plain form.', max_length=64, verbose_name='Plain Name (Unicode)'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='plain',
-            field=models.CharField(blank=True, default='', help_text='Preferred plain form of name, if different from the automatic plain form.', max_length=64, verbose_name='Plain Name (Unicode)'),
-        ),
-        migrations.AlterField(
-            model_name='historicalperson',
-            name='name',
-            field=models.CharField(db_index=True, help_text='Preferred long form of name.', max_length=255, verbose_name='Full Name (Unicode)'),
-        ),
-        migrations.AlterField(
-            model_name='person',
-            name='name',
-            field=models.CharField(db_index=True, help_text='Preferred long form of name.', max_length=255, verbose_name='Full Name (Unicode)'),
-        ),
-    ]
diff --git a/ietf/person/migrations/0014_auto_20200717_0743.py b/ietf/person/migrations/0014_auto_20200717_0743.py
deleted file mode 100644
index 4c8742685c..0000000000
--- a/ietf/person/migrations/0014_auto_20200717_0743.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.14 on 2020-07-17 07:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0013_auto_20200711_1036'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/iesg/position', '/api/iesg/position'), ('/api/v2/person/person', '/api/v2/person/person'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0015_extres.py b/ietf/person/migrations/0015_extres.py
deleted file mode 100644
index 1b98285857..0000000000
--- a/ietf/person/migrations/0015_extres.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-04-15 10:20
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0014_extres'),
-        ('person', '0014_auto_20200717_0743'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='PersonExtResource',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('display_name', models.CharField(blank=True, default='', max_length=255)),
-                ('value', models.CharField(max_length=2083)),
-                ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceName')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-            ],
-        ),
-    ]
diff --git a/ietf/person/migrations/0016_auto_20200807_0750.py b/ietf/person/migrations/0016_auto_20200807_0750.py
deleted file mode 100644
index a956d608ba..0000000000
--- a/ietf/person/migrations/0016_auto_20200807_0750.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.15 on 2020-08-07 07:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0015_extres'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/iesg/position', '/api/iesg/position'), ('/api/v2/person/person', '/api/v2/person/person'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration'), ('/api/notify/meeting/bluesheet', '/api/notify/meeting/bluesheet')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0017_auto_20201028_0902.py b/ietf/person/migrations/0017_auto_20201028_0902.py
deleted file mode 100644
index 275de3e1bf..0000000000
--- a/ietf/person/migrations/0017_auto_20201028_0902.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 2.2.16 on 2020-10-28 09:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0016_auto_20200807_0750'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='historicalperson',
-            name='plain',
-            field=models.CharField(blank=True, default='', help_text="Use this if you have a Spanish double surname.  Don't use this for nicknames, and don't use it unless you've actually observed that the datatracker shows your name incorrectly.", max_length=64, verbose_name='Plain Name correction (Unicode)'),
-        ),
-        migrations.AlterField(
-            model_name='person',
-            name='plain',
-            field=models.CharField(blank=True, default='', help_text="Use this if you have a Spanish double surname.  Don't use this for nicknames, and don't use it unless you've actually observed that the datatracker shows your name incorrectly.", max_length=64, verbose_name='Plain Name correction (Unicode)'),
-        ),
-    ]
diff --git a/ietf/person/migrations/0018_auto_20201109_0439.py b/ietf/person/migrations/0018_auto_20201109_0439.py
deleted file mode 100644
index 51f1d2d917..0000000000
--- a/ietf/person/migrations/0018_auto_20201109_0439.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0017_auto_20201028_0902'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='personevent',
-            index=models.Index(fields=['-time', '-id'], name='person_pers_time_8dfbc5_idx'),
-        ),
-    ]
diff --git a/ietf/person/migrations/0019_auto_20210604_1443.py b/ietf/person/migrations/0019_auto_20210604_1443.py
deleted file mode 100644
index 432f7541d5..0000000000
--- a/ietf/person/migrations/0019_auto_20210604_1443.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.20 on 2021-06-04 14:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0018_auto_20201109_0439'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/iesg/position', '/api/iesg/position'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/bluesheet', '/api/notify/meeting/bluesheet'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration'), ('/api/v2/person/person', '/api/v2/person/person')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0020_auto_20210920_0924.py b/ietf/person/migrations/0020_auto_20210920_0924.py
deleted file mode 100644
index bcb9dc1c3e..0000000000
--- a/ietf/person/migrations/0020_auto_20210920_0924.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.24 on 2021-09-20 09:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0019_auto_20210604_1443'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/appauth/authortools', '/api/appauth/authortools'), ('/api/iesg/position', '/api/iesg/position'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/bluesheet', '/api/notify/meeting/bluesheet'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration'), ('/api/v2/person/person', '/api/v2/person/person')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0021_auto_20211210_0805.py b/ietf/person/migrations/0021_auto_20211210_0805.py
deleted file mode 100644
index d65b1a99bd..0000000000
--- a/ietf/person/migrations/0021_auto_20211210_0805.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.25 on 2021-12-10 08:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0020_auto_20210920_0924'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/appauth/authortools', '/api/appauth/authortools'), ('/api/appauth/bibxml', '/api/appauth/bibxml'), ('/api/iesg/position', '/api/iesg/position'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/bluesheet', '/api/notify/meeting/bluesheet'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration'), ('/api/v2/person/person', '/api/v2/person/person')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0022_auto_20220513_1456.py b/ietf/person/migrations/0022_auto_20220513_1456.py
deleted file mode 100644
index 96f942496d..0000000000
--- a/ietf/person/migrations/0022_auto_20220513_1456.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Generated by Django 2.2.28 on 2022-05-13 14:56
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0021_auto_20211210_0805'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='historicalemail',
-            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical email', 'verbose_name_plural': 'historical emails'},
-        ),
-        migrations.AlterModelOptions(
-            name='historicalperson',
-            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical person', 'verbose_name_plural': 'historical persons'},
-        ),
-        migrations.AlterField(
-            model_name='historicalemail',
-            name='history_date',
-            field=models.DateTimeField(db_index=True),
-        ),
-        migrations.AlterField(
-            model_name='historicalperson',
-            name='history_date',
-            field=models.DateTimeField(db_index=True),
-        ),
-    ]
diff --git a/ietf/person/migrations/0023_auto_20220615_1006.py b/ietf/person/migrations/0023_auto_20220615_1006.py
deleted file mode 100644
index 22b50a25a3..0000000000
--- a/ietf/person/migrations/0023_auto_20220615_1006.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2022-06-15 10:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0022_auto_20220513_1456'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/appauth/authortools', '/api/appauth/authortools'), ('/api/appauth/bibxml', '/api/appauth/bibxml'), ('/api/iesg/position', '/api/iesg/position'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/bluesheet', '/api/notify/meeting/bluesheet'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration'), ('/api/notify/session/attendees', '/api/notify/session/attendees'), ('/api/v2/person/person', '/api/v2/person/person')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/migrations/0024_pronouns.py b/ietf/person/migrations/0024_pronouns.py
deleted file mode 100644
index 1ef9514b03..0000000000
--- a/ietf/person/migrations/0024_pronouns.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
-# Generated by Django 2.2.28 on 2022-06-17 15:09
-
-from django.db import migrations, models
-import jsonfield.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0023_auto_20220615_1006'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='historicalperson',
-            name='pronouns_freetext',
-            field=models.CharField(blank=True, help_text='Optionally provide your personal pronouns. These will be displayed on your public profile page and alongside your name in Meetecho and, in future, other systems. Select any number of the checkboxes OR provide a custom string up to 30 characters.', max_length=30, null=True, verbose_name=' '),
-        ),
-        migrations.AddField(
-            model_name='historicalperson',
-            name='pronouns_selectable',
-            field=jsonfield.fields.JSONCharField(blank=True, default=list, max_length=120, null=True, verbose_name='Pronouns'),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='pronouns_freetext',
-            field=models.CharField(blank=True, help_text='Optionally provide your personal pronouns. These will be displayed on your public profile page and alongside your name in Meetecho and, in future, other systems. Select any number of the checkboxes OR provide a custom string up to 30 characters.', max_length=30, null=True, verbose_name=' '),
-        ),
-        migrations.AddField(
-            model_name='person',
-            name='pronouns_selectable',
-            field=jsonfield.fields.JSONCharField(blank=True, default=list, max_length=120, null=True, verbose_name='Pronouns'),
-        ),
-        migrations.AlterField(
-            model_name='historicalperson',
-            name='consent',
-            field=models.BooleanField(default=None, null=True, verbose_name='I hereby give my consent to the use of the personal details I have provided (photo, bio, name, pronouns, email) within the IETF Datatracker'),
-        ),
-        migrations.AlterField(
-            model_name='person',
-            name='consent',
-            field=models.BooleanField(default=None, null=True, verbose_name='I hereby give my consent to the use of the personal details I have provided (photo, bio, name, pronouns, email) within the IETF Datatracker'),
-        ),
-    ]
diff --git a/ietf/person/migrations/0025_chat_and_polls_apikey.py b/ietf/person/migrations/0025_chat_and_polls_apikey.py
deleted file mode 100644
index 03afdc5999..0000000000
--- a/ietf/person/migrations/0025_chat_and_polls_apikey.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
-
-from django.db import migrations, models
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0024_pronouns'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='personalapikey',
-            name='endpoint',
-            field=models.CharField(choices=[('/api/appauth/authortools', '/api/appauth/authortools'), ('/api/appauth/bibxml', '/api/appauth/bibxml'), ('/api/iesg/position', '/api/iesg/position'), ('/api/meeting/session/video/url', '/api/meeting/session/video/url'), ('/api/notify/meeting/bluesheet', '/api/notify/meeting/bluesheet'), ('/api/notify/meeting/registration', '/api/notify/meeting/registration'), ('/api/notify/session/attendees', '/api/notify/session/attendees'), ('/api/notify/session/chatlog', '/api/notify/session/chatlog'), ('/api/notify/session/polls', '/api/notify/session/polls'), ('/api/v2/person/person', '/api/v2/person/person')], max_length=128),
-        ),
-    ]
diff --git a/ietf/person/models.py b/ietf/person/models.py
index c4401b4178..3ab89289a6 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -2,10 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
 import email.utils
 import email.header
-import jsonfield
 import uuid
 
 from hashids import Hashids
@@ -13,11 +11,13 @@
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.postgres.fields import CICharField
+from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
 from django.db import models
 from django.template.loader import render_to_string
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 from django.utils.encoding import smart_bytes
 from django.utils.text import slugify
 
@@ -28,32 +28,50 @@
 from ietf.name.models import ExtResourceName
 from ietf.person.name import name_parts, initials, plain_name
 from ietf.utils.mail import send_mail_preformatted
-from ietf.utils.storage import NoLocationMigrationFileSystemStorage
+from ietf.utils.storage import BlobShadowFileSystemStorage
 from ietf.utils.mail import formataddr
 from ietf.person.name import unidecode_name
 from ietf.utils import log
 from ietf.utils.models import ForeignKey, OneToOneField
 
 
+def name_character_validator(value):
+    disallowed = "@:/"
+    found = set(disallowed).intersection(value)
+    if len(found) > 0:
+        raise ValidationError(
+            f"This name cannot contain the characters {', '.join(disallowed)}"
+        )
+
+
 class Person(models.Model):
     history = HistoricalRecords()
     user = OneToOneField(User, blank=True, null=True, on_delete=models.SET_NULL)
-    time = models.DateTimeField(default=datetime.datetime.now)      # When this Person record entered the system
+    time = models.DateTimeField(default=timezone.now)      # When this Person record entered the system
     # The normal unicode form of the name.  This must be
     # set to the same value as the ascii-form if equal.
-    name = models.CharField("Full Name (Unicode)", max_length=255, db_index=True, help_text="Preferred long form of name.")
-    plain = models.CharField("Plain Name correction (Unicode)", max_length=64, default='', blank=True, help_text="Use this if you have a Spanish double surname.  Don't use this for nicknames, and don't use it unless you've actually observed that the datatracker shows your name incorrectly.")
+    name = models.CharField("Full Name (Unicode)", max_length=255, db_index=True, help_text="Preferred long form of name.", validators=[name_character_validator])
+    plain = models.CharField("Plain Name correction (Unicode)", max_length=64, default='', blank=True, help_text="Use this if you have a Spanish double surname.  Don't use this for nicknames, and don't use it unless you've actually observed that the datatracker shows your name incorrectly.", validators=[name_character_validator])
     # The normal ascii-form of the name.
-    ascii = models.CharField("Full Name (ASCII)", max_length=255, help_text="Name as rendered in ASCII (Latin, unaccented) characters.")
+    ascii = models.CharField("Full Name (ASCII)", max_length=255, help_text="Name as rendered in ASCII (Latin, unaccented) characters.", validators=[name_character_validator])
     # The short ascii-form of the name.  Also in alias table if non-null
-    ascii_short = models.CharField("Abbreviated Name (ASCII)", max_length=32, null=True, blank=True, help_text="Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).")
-    pronouns_selectable = jsonfield.JSONCharField("Pronouns", max_length=120, blank=True, null=True, default=list )
+    ascii_short = models.CharField("Abbreviated Name (ASCII)", max_length=32, null=True, blank=True, help_text="Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).", validators=[name_character_validator])
+    pronouns_selectable = models.JSONField("Pronouns", max_length=120, blank=True, null=True, default=list )
     pronouns_freetext = models.CharField(" ", max_length=30, null=True, blank=True, help_text="Optionally provide your personal pronouns. These will be displayed on your public profile page and alongside your name in Meetecho and, in future, other systems. Select any number of the checkboxes OR provide a custom string up to 30 characters.")
     biography = models.TextField(blank=True, help_text="Short biography for use on leadership pages. Use plain text or reStructuredText markup.")
-    photo = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None)
-    photo_thumb = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=settings.PHOTOS_DIRNAME, blank=True, default=None)
-    name_from_draft = models.CharField("Full Name (from submission)", null=True, max_length=255, editable=False, help_text="Name as found in a draft submission.")
-    consent = models.BooleanField("I hereby give my consent to the use of the personal details I have provided (photo, bio, name, pronouns, email) within the IETF Datatracker", null=True, default=None)
+    photo = models.ImageField(
+        storage=BlobShadowFileSystemStorage(kind="photo"),
+        upload_to=settings.PHOTOS_DIRNAME,
+        blank=True,
+        default=None,
+    )
+    photo_thumb = models.ImageField(
+        storage=BlobShadowFileSystemStorage(kind="photo"),
+        upload_to=settings.PHOTOS_DIRNAME,
+        blank=True,
+        default=None,
+    )
+    name_from_draft = models.CharField("Full Name (from submission)", null=True, max_length=255, editable=False, help_text="Name as found in an Internet-Draft submission.")
 
     def __str__(self):
         return self.plain_name()
@@ -69,7 +87,7 @@ def short(self):
         else:
             prefix, first, middle, last, suffix = self.ascii_parts()
             return (first and first[0]+"." or "")+(middle or "")+" "+last+(suffix and " "+suffix or "")
-    def plain_name(self):
+    def plain_name(self) -> str:
         if not hasattr(self, '_cached_plain_name'):
             if self.plain:
                 self._cached_plain_name = self.plain
@@ -140,6 +158,14 @@ def email(self):
                 e = self.email_set.filter(active=True).order_by("-time").first()
             self._cached_email = e
         return self._cached_email
+    def email_allowing_inactive(self):
+        if not hasattr(self, "_cached_email_allowing_inactive"):
+            e = self.email()
+            if not e:
+                e = self.email_set.order_by("-time").first()
+            log.assertion(statement="e is not None", note=f"Person {self.pk} has no Email objects")
+            self._cached_email_allowing_inactive = e
+        return self._cached_email_allowing_inactive
     def email_address(self):
         e = self.email()
         if e:
@@ -177,44 +203,40 @@ def has_drafts(self):
 
     def rfcs(self):
         from ietf.doc.models import Document
-        rfcs = list(Document.objects.filter(documentauthor__person=self, type='draft', states__slug='rfc'))
-        rfcs.sort(key=lambda d: d.canonical_name() )
+        # When RfcAuthors are populated, this may over-return if an author is dropped
+        # from the author list between the final draft and the published RFC. Should
+        # ignore DocumentAuthors when an RfcAuthor exists for a draft.
+        rfcs = list(Document.objects.filter(type="rfc").filter(models.Q(documentauthor__person=self)|models.Q(rfcauthor__person=self)).distinct())
+        rfcs.sort(key=lambda d: d.name )
         return rfcs
 
     def active_drafts(self):
         from ietf.doc.models import Document
-        return Document.objects.filter(documentauthor__person=self, type='draft', states__slug='active').distinct().order_by('-time')
+
+        return (
+            Document.objects.filter(
+                documentauthor__person=self,
+                type="draft",
+                states__type="draft",
+                states__slug="active",
+            )
+            .distinct()
+            .order_by("-time")
+        )
 
     def expired_drafts(self):
         from ietf.doc.models import Document
-        return Document.objects.filter(documentauthor__person=self, type='draft', states__slug__in=['repl', 'expired', 'auth-rm', 'ietf-rm']).distinct().order_by('-time')
 
-    def needs_consent(self):
-        """
-        Returns an empty list or a list of fields which holds information that
-        requires consent to be given.
-        """
-        needs_consent = []
-        if self.name != self.name_from_draft:
-            needs_consent.append("full name")
-        if self.ascii != self.name_from_draft:
-            needs_consent.append("ascii name")
-        if self.biography and not (self.role_set.exists() or self.rolehistory_set.exists()):
-            needs_consent.append("biography")
-        if self.user_id:
-            needs_consent.append("login")
-            try:
-                if self.user.communitylist_set.exists():
-                    needs_consent.append("draft notification subscription(s)")
-            except ObjectDoesNotExist:
-                pass
-        for email in self.email_set.all():
-            if not email.origin.split(':')[0] in ['author', 'role', 'reviewer', 'liaison', 'shepherd', ]:
-                needs_consent.append("email address(es)")
-                break
-        if self.pronouns_freetext or self.pronouns_selectable:
-            needs_consent.append("pronouns")
-        return needs_consent
+        return (
+            Document.objects.filter(
+                documentauthor__person=self,
+                type="draft",
+                states__type="draft",
+                states__slug__in=["repl", "expired", "auth-rm", "ietf-rm"],
+            )
+            .distinct()
+            .order_by("-time")
+        )
 
     def save(self, *args, **kwargs):
         created = not self.pk
@@ -247,11 +269,16 @@ def available_api_endpoints(self):
     def cdn_photo_url(self, size=80):
         if self.photo:
             if settings.SERVE_CDN_PHOTOS:
+                if settings.SERVER_MODE != "production":
+                    original_media_dir = settings.MEDIA_URL
+                    settings.MEDIA_URL = "https://www.ietf.org/lib/dt/media/"
                 source_url = self.photo.url
                 if source_url.startswith(settings.IETF_HOST_URL):
                     source_url = source_url[len(settings.IETF_HOST_URL):]
                 elif source_url.startswith('/'):
                     source_url = source_url[1:]
+                if settings.SERVER_MODE != "production":
+                    settings.MEDIA_URL = original_media_dir
                 return f'{settings.IETF_HOST_URL}cdn-cgi/image/fit=scale-down,width={size},height={size}/{source_url}'
             else:
                 datatracker_photo_path = urlreverse('ietf.person.views.photo', kwargs={'email_or_name': self.email()})
@@ -262,7 +289,7 @@ def cdn_photo_url(self, size=80):
 
 
 class PersonExtResource(models.Model):
-    person = ForeignKey(Person) 
+    person = ForeignKey(Person)
     name = models.ForeignKey(ExtResourceName, on_delete=models.CASCADE)
     display_name = models.CharField(max_length=255, default='', blank=True)
     value = models.CharField(max_length=2083) # 2083 is the maximum legal URL length
@@ -299,11 +326,11 @@ class Meta:
 
 class Email(models.Model):
     history = HistoricalRecords()
-    address = models.CharField(max_length=64, primary_key=True, validators=[validate_email])
+    address = CICharField(max_length=64, primary_key=True, validators=[validate_email])
     person = ForeignKey(Person, null=True)
     time = models.DateTimeField(auto_now_add=True)
     primary = models.BooleanField(default=False)
-    origin = models.CharField(max_length=150, blank=False, help_text="The origin of the address: the user's email address, or 'author: DRAFTNAME' if a draft, or 'role: GROUP/ROLE' if a role.")       # User.username or Document.name
+    origin = models.CharField(max_length=150, blank=False, help_text="The origin of the address: the user's email address, or 'author: DRAFTNAME' if an Internet-Draft, or 'role: GROUP/ROLE' if a role.")       # User.username or Document.name
     active = models.BooleanField(default=True)      # Old email addresses are *not* purged, as history
                                                     # information points to persons through these
 
@@ -366,7 +393,8 @@ def salt():
     ("/api/iesg/position", "/api/iesg/position", "Area Director"),
     ("/api/v2/person/person", "/api/v2/person/person", "Robot"),
     ("/api/meeting/session/video/url", "/api/meeting/session/video/url", "Recording Manager"),
-    ("/api/notify/meeting/registration", "/api/notify/meeting/registration", "Robot"), 
+    ("/api/meeting/session/recording-name", "/api/meeting/session/recording-name", "Recording Manager"),
+    ("/api/notify/meeting/registration", "/api/notify/meeting/registration", "Robot"),
     ("/api/notify/meeting/bluesheet", "/api/notify/meeting/bluesheet", "Recording Manager"),
     ("/api/notify/session/attendees", "/api/notify/session/attendees", "Recording Manager"),
     ("/api/notify/session/chatlog", "/api/notify/session/chatlog", "Recording Manager"),
@@ -379,7 +407,7 @@ def salt():
 class PersonalApiKey(models.Model):
     person   = ForeignKey(Person, related_name='apikeys')
     endpoint = models.CharField(max_length=128, null=False, blank=False, choices=PERSON_API_KEY_ENDPOINTS)
-    created  = models.DateTimeField(default=datetime.datetime.now, null=False)
+    created  = models.DateTimeField(default=timezone.now, null=False)
     valid    = models.BooleanField(default=True)
     salt     = models.BinaryField(default=salt, max_length=12, null=False, blank=False)
     count    = models.IntegerField(default=0, null=False, blank=False)
@@ -423,13 +451,12 @@ def __str__(self):
 
 PERSON_EVENT_CHOICES = [
     ("apikey_login", "API key login"),
-    ("gdpr_notice_email", "GDPR consent request email sent"),
     ("email_address_deactivated", "Email address deactivated"),
     ]
 
 class PersonEvent(models.Model):
     person = ForeignKey(Person)
-    time = models.DateTimeField(default=datetime.datetime.now, help_text="When the event happened")
+    time = models.DateTimeField(default=timezone.now, help_text="When the event happened")
     type = models.CharField(max_length=50, choices=PERSON_EVENT_CHOICES)
     desc = models.TextField()
 
@@ -444,4 +471,4 @@ class Meta:
 
 class PersonApiKeyEvent(PersonEvent):
     key = ForeignKey(PersonalApiKey)
-    
+
diff --git a/ietf/person/name.py b/ietf/person/name.py
index dc57f58f4b..0dbeaa9b99 100644
--- a/ietf/person/name.py
+++ b/ietf/person/name.py
@@ -59,7 +59,7 @@ def name_parts(name):
         last = parts[0]
     if len(parts) >= 2:
         # Handle reverse-order names with uppercase surname correctly
-        if len(first)>1 and re.search("^[A-Z-]+$", first):
+        if len(first)>1 and re.search("^[A-Z-]+$", first) and first != "JP":
             first, last = last, first.capitalize()
     # Handle exception for RFC Editor
     if (prefix, first, middle, last, suffix) == ('', 'Editor', '', 'Rfc', ''):
diff --git a/ietf/person/serializers.py b/ietf/person/serializers.py
new file mode 100644
index 0000000000..023d77d4bc
--- /dev/null
+++ b/ietf/person/serializers.py
@@ -0,0 +1,39 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+"""DRF Serializers"""
+
+from rest_framework import serializers
+
+from ietf.ietfauth.validators import is_allowed_address
+
+from .models import Email, Person
+
+
+class EmailSerializer(serializers.ModelSerializer):
+    """Email serializer for read/update"""
+
+    address = serializers.EmailField(read_only=True)
+
+    class Meta:
+        model = Email
+        fields = [
+            "person",
+            "address",
+            "primary",
+            "active",
+            "origin",
+        ]
+        read_only_fields = ["person", "address", "origin"]
+
+
+class NewEmailSerializer(serializers.Serializer):
+    """Serialize a new email address request"""
+    address = serializers.EmailField(validators=[is_allowed_address])
+
+
+class PersonSerializer(serializers.ModelSerializer):
+    """Person serializer"""
+    emails = EmailSerializer(many=True, source="email_set")
+
+    class Meta:
+        model = Person
+        fields = ["id", "name", "emails"]
diff --git a/ietf/person/tasks.py b/ietf/person/tasks.py
new file mode 100644
index 0000000000..f0c979fa26
--- /dev/null
+++ b/ietf/person/tasks.py
@@ -0,0 +1,59 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+#
+# Celery task definitions
+#
+import datetime
+
+from celery import shared_task
+
+from django.conf import settings
+from django.utils import timezone
+
+from ietf.utils import log
+from ietf.utils.mail import send_mail
+from .models import PersonalApiKey, PersonApiKeyEvent
+
+
+@shared_task
+def send_apikey_usage_emails_task(days):
+    """Send usage emails to Persons who have API keys"""
+    earliest = timezone.now() - datetime.timedelta(days=days)
+    keys = PersonalApiKey.objects.filter(
+        valid=True,
+        personapikeyevent__time__gt=earliest,
+    ).distinct()
+    for key in keys:
+        events = PersonApiKeyEvent.objects.filter(key=key, time__gt=earliest)
+        count = events.count()
+        events = events[:32]
+        if count:
+            key_name = key.hash()[:8]
+            subject = "API key usage for key '%s' for the last %s days" % (
+                key_name,
+                days,
+            )
+            to = key.person.email_address()
+            frm = settings.DEFAULT_FROM_EMAIL
+            send_mail(
+                None,
+                to,
+                frm,
+                subject,
+                "utils/apikey_usage_report.txt",
+                {
+                    "person": key.person,
+                    "days": days,
+                    "key": key,
+                    "key_name": key_name,
+                    "count": count,
+                    "events": events,
+                },
+            )
+
+@shared_task
+def purge_personal_api_key_events_task(keep_days):
+    keep_since = timezone.now() - datetime.timedelta(days=keep_days)
+    old_events = PersonApiKeyEvent.objects.filter(time__lt=keep_since)
+    count = len(old_events)
+    old_events.delete()
+    log.log(f"Deleted {count} PersonApiKeyEvents older than {keep_since}")
diff --git a/ietf/person/templatetags/person_filters.py b/ietf/person/templatetags/person_filters.py
index 96696456f7..017b29c63a 100644
--- a/ietf/person/templatetags/person_filters.py
+++ b/ietf/person/templatetags/person_filters.py
@@ -1,13 +1,12 @@
 # Copyright The IETF Trust 2017-2020, All Rights Reserved
 
-import datetime
-
 from django import template
 
 import debug  # pyflakes:ignore
 
 from ietf.nomcom.utils import is_eligible
 from ietf.person.models import Alias
+from ietf.utils.timezone import date_today
 
 register = template.Library()
 
@@ -15,7 +14,7 @@
 @register.filter
 def is_nomcom_eligible(person, date=None):
     if date is None:
-        date = datetime.date.today()
+        date = date_today()
     return is_eligible(person=person, date=date)
 
 
diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index 59228a7953..f55d8b8a34 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -1,18 +1,20 @@
-# Copyright The IETF Trust 2014-2022, All Rights Reserved
+# Copyright The IETF Trust 2014-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
 import json
+from unittest import mock
 
 from io import StringIO, BytesIO
 from PIL import Image
 from pyquery import PyQuery
 
-
+from django.core.exceptions import ValidationError
 from django.http import HttpRequest
 from django.test import override_settings
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 from django.utils.encoding import iri_to_uri
 
 import debug                            # pyflakes:ignore
@@ -20,14 +22,16 @@
 from ietf.community.models import CommunityList
 from ietf.group.factories import RoleFactory
 from ietf.group.models import Group
+from ietf.message.models import Message
 from ietf.nomcom.models import NomCom
 from ietf.nomcom.test_data import nomcom_test_data
 from ietf.nomcom.factories import NomComFactory, NomineeFactory, NominationFactory, FeedbackFactory, PositionFactory
-from ietf.person.factories import EmailFactory, PersonFactory, UserFactory
-from ietf.person.models import Person, Alias
+from ietf.person.factories import EmailFactory, PersonFactory, PersonApiKeyEventFactory
+from ietf.person.models import Person, Alias, PersonApiKeyEvent
+from ietf.person.tasks import purge_personal_api_key_events_task
 from ietf.person.utils import (merge_persons, determine_merge_order, send_merge_notification,
     handle_users, get_extra_primary, dedupe_aliases, move_related_objects, merge_nominees,
-    handle_reviewer_settings, merge_users, get_dots)
+    handle_reviewer_settings, get_dots)
 from ietf.review.models import ReviewerSettings
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
@@ -102,6 +106,48 @@ def test_person_profile(self):
         r = self.client.get(photo_url)
         self.assertEqual(r.status_code, 200)
 
+    def test_person_profile_without_email(self):
+        person = PersonFactory(name="foobar@example.com")
+        # delete Email record
+        person.email().delete()
+        url = urlreverse("ietf.person.views.profile", kwargs={ "email_or_name": person.plain_name()})
+        r = self.client.get(url)
+        self.assertContains(r, person.name, status_code=200)
+
+    def test_case_insensitive(self):
+        # Case insensitive seach
+        person = PersonFactory(name="Test Person")
+        url = urlreverse("ietf.person.views.profile", kwargs={ "email_or_name": "test person"})
+        r = self.client.get(url)
+        self.assertContains(r, person.name, status_code=200)
+        self.assertNotIn('More than one person', r.content.decode())
+
+    def test_person_profile_duplicates(self):
+        # same Person name and email - should not show on the profile as multiple Person records
+        person = PersonFactory(name="bazquux@example.com", user__email="bazquux@example.com")
+        url = urlreverse("ietf.person.views.profile", kwargs={ "email_or_name": person.plain_name()})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertNotIn('More than one person', r.content.decode())
+
+        # Change that person's name but leave their email address. Create a new person whose name
+        # is the email address. This *should* be flagged as multiple Person records on the profile.
+        person.name = 'different name'
+        person.save()
+        PersonFactory(name="bazquux@example.com")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertIn('More than one person', r.content.decode())
+
+    def test_person_profile_404(self):
+        urls = [
+                urlreverse("ietf.person.views.profile", kwargs={ "email_or_name": "nonexistent@example.com"}),
+                urlreverse("ietf.person.views.profile", kwargs={ "email_or_name": "Nonexistent Person"}),]
+
+        for url in urls:
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 404)
+
     def test_person_photo(self):
         person = PersonFactory(with_bio=True)
         
@@ -121,6 +167,14 @@ def test_person_photo(self):
         img = Image.open(BytesIO(r.content))
         self.assertEqual(img.width, 200)
 
+    def test_person_photo_duplicates(self):
+        person = PersonFactory(name="bazquux@example.com", user__username="bazquux@example.com", with_bio=True)
+        PersonFactory(name="bazquux@example.com", user__username="foobar@example.com", with_bio=True)
+
+        url = urlreverse("ietf.person.views.photo", kwargs={ "email_or_name": person.plain_name()})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 404)
+
     def test_name_methods(self):
         person = PersonFactory(name="Dr. Jens F. Möller", )
 
@@ -154,13 +208,13 @@ def test_merge(self):
     def test_merge_with_params(self):
         p1 = get_person_no_user()
         p2 = PersonFactory()
-        url = urlreverse("ietf.person.views.merge") + "?source={}&target={}".format(p1.pk, p2.pk)
+        url = urlreverse("ietf.person.views.merge_submit") + "?source={}&target={}".format(p1.pk, p2.pk)
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertContains(r, 'retaining login', status_code=200)
 
     def test_merge_with_params_bad_id(self):
-        url = urlreverse("ietf.person.views.merge") + "?source=1000&target=2000"
+        url = urlreverse("ietf.person.views.merge_submit") + "?source=1000&target=2000"
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertContains(r, 'ID does not exist', status_code=200)
@@ -168,7 +222,7 @@ def test_merge_with_params_bad_id(self):
     def test_merge_post(self):
         p1 = get_person_no_user()
         p2 = PersonFactory()
-        url = urlreverse("ietf.person.views.merge")
+        url = urlreverse("ietf.person.views.merge_submit")
         expected_url = urlreverse("ietf.secr.rolodex.views.view", kwargs={'id': p2.pk})
         login_testing_unauthorized(self, "secretary", url)
         data = {'source': p1.pk, 'target': p2.pk}
@@ -191,6 +245,14 @@ def test_cdn_photo_url_cdn_off(self):
         p = PersonFactory(with_bio=True)
         self.assertNotIn('cdn-cgi/photo',p.cdn_photo_url())
 
+    def test_invalid_name_characters_rejected(self):
+        for disallowed in "/:@":
+            # build() does not save the new object
+            person_with_bad_name = PersonFactory.build(name=f"I have a {disallowed}", user=None)
+            with self.assertRaises(ValidationError, msg=f"Name with a {disallowed} char should be rejected"):
+                person_with_bad_name.full_clean()  # calls validators (save() does *not*)
+
+
 class PersonUtilsTests(TestCase):
     def test_determine_merge_order(self):
         p1 = get_person_no_user()
@@ -211,7 +273,7 @@ def test_determine_merge_order(self):
         self.assertEqual(results,(p1,p3))
 
         # both have User
-        today = datetime.datetime.today()
+        today = timezone.now()
         p2.user.last_login = today
         p2.user.save()
         p4.user.last_login = today - datetime.timedelta(days=30)
@@ -331,13 +393,24 @@ def test_merge_persons(self):
         request.user = user
         source = PersonFactory()
         target = PersonFactory()
+        mars = RoleFactory(name_id='chair',group__acronym='mars').group
         source_id = source.pk
         source_email = source.email_set.first()
         source_alias = source.alias_set.first()
         source_user = source.user
+        communitylist = CommunityList.objects.create(person=source, group=mars)
+        nomcom = NomComFactory()
+        position = PositionFactory(nomcom=nomcom)
+        nominee = NomineeFactory(nomcom=nomcom, person=mars.get_chair().person)
+        feedback = FeedbackFactory(person=source, author=source.email().address, nomcom=nomcom)
+        feedback.nominees.add(nominee)
+        nomination = NominationFactory(nominee=nominee, person=source, position=position, comments=feedback)
         merge_persons(request, source, target, file=StringIO())
         self.assertTrue(source_email in target.email_set.all())
         self.assertTrue(source_alias in target.alias_set.all())
+        self.assertIn(communitylist, target.communitylist_set.all())
+        self.assertIn(feedback, target.feedback_set.all())
+        self.assertIn(nomination, target.nomination_set.all())
         self.assertFalse(Person.objects.filter(id=source_id))
         self.assertFalse(source_user.is_active)
 
@@ -357,24 +430,6 @@ def test_merge_persons_reviewer_settings(self):
         rs = target.reviewersettings_set.first()
         self.assertEqual(rs.min_interval, 7)
 
-    def test_merge_users(self):
-        person = PersonFactory()
-        source = person.user
-        target = UserFactory()
-        mars = RoleFactory(name_id='chair',group__acronym='mars').group
-        communitylist = CommunityList.objects.create(user=source, group=mars)
-        nomcom = NomComFactory()
-        position = PositionFactory(nomcom=nomcom)
-        nominee = NomineeFactory(nomcom=nomcom, person=mars.get_chair().person)
-        feedback = FeedbackFactory(user=source, author=person.email().address, nomcom=nomcom)
-        feedback.nominees.add(nominee)
-        nomination = NominationFactory(nominee=nominee, user=source, position=position, comments=feedback)
-
-        merge_users(source, target)
-        self.assertIn(communitylist, target.communitylist_set.all())
-        self.assertIn(feedback, target.feedback_set.all())
-        self.assertIn(nomination, target.nomination_set.all())
-
     def test_dots(self):
         noroles = PersonFactory()
         self.assertEqual(get_dots(noroles),[])
@@ -396,7 +451,39 @@ def test_dots(self):
         ncchair = RoleFactory(group__acronym='nomcom2020',group__type_id='nomcom',name_id='chair').person
         self.assertEqual(get_dots(ncchair),['nomcom'])
 
-
-
-
-       
\ No newline at end of file
+    def test_send_merge_request(self):
+        empty_outbox()
+        message_count_before = Message.objects.count()
+        source = PersonFactory()
+        target = PersonFactory()
+        url = urlreverse('ietf.person.views.send_merge_request')
+        url = url + f'?source={source.pk}&target={target.pk}'
+        login_testing_unauthorized(self, 'secretary', url)
+        r = self.client.get(url)
+        initial = r.context['form'].initial
+        subject = 'Action requested: Merging possible duplicate IETF Datatracker accounts'
+        self.assertEqual(initial['to'], ', '.join([source.user.username, target.user.username]))
+        self.assertEqual(initial['subject'], subject)
+        self.assertEqual(initial['reply_to'], 'support@ietf.org')
+        self.assertEqual(r.status_code, 200)
+        r = self.client.post(url, data=initial)
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(len(outbox), 1)
+        self.assertIn(source.user.username, outbox[0]['To'])
+        message_count_after = Message.objects.count()
+        message = Message.objects.last()
+        self.assertEqual(message_count_after, message_count_before + 1)
+        self.assertIn(source.user.username, message.to)
+
+
+class TaskTests(TestCase):
+    @mock.patch("ietf.person.tasks.log.log")
+    def test_purge_personal_api_key_events_task(self, mock_log):
+        now = timezone.now()
+        old_event = PersonApiKeyEventFactory(time=now - datetime.timedelta(days=1, minutes=1))
+        young_event = PersonApiKeyEventFactory(time=now - datetime.timedelta(days=1, minutes=-1))
+        purge_personal_api_key_events_task(keep_days=1)
+        self.assertFalse(PersonApiKeyEvent.objects.filter(pk=old_event.pk).exists())
+        self.assertTrue(PersonApiKeyEvent.objects.filter(pk=young_event.pk).exists())
+        self.assertTrue(mock_log.called)
+        self.assertIn("Deleted 1", mock_log.call_args[0][0])
diff --git a/ietf/person/urls.py b/ietf/person/urls.py
index f37d8b46cf..f3eccd04b7 100644
--- a/ietf/person/urls.py
+++ b/ietf/person/urls.py
@@ -1,8 +1,12 @@
+# Copyright The IETF Trust 2009-2025, All Rights Reserved
+# -*- coding: utf-8 -*-
 from ietf.person import views, ajax
 from ietf.utils.urls import url
 
 urlpatterns = [
-    url(r'^merge/$', views.merge),
+    url(r'^merge/?$', views.merge),
+    url(r'^merge/submit/?$', views.merge_submit),
+    url(r'^merge/send_request/?$', views.send_merge_request),
     url(r'^search/(?P<model_name>(person|email))/$', views.ajax_select2_search),
     url(r'^(?P<personid>[0-9]+)/email.json$', ajax.person_email_json),
     url(r'^(?P<email_or_name>[^/]+)$', views.profile),
diff --git a/ietf/person/utils.py b/ietf/person/utils.py
index 54c2f5dbee..5ed90591f9 100755
--- a/ietf/person/utils.py
+++ b/ietf/person/utils.py
@@ -3,27 +3,26 @@
 
 
 import datetime
-import os
 import pprint 
 import sys
-import syslog
 
 from django.contrib import admin
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Q
+from django.http import Http404
 
 import debug                            # pyflakes:ignore
 
-from ietf.person.models import Person
+from ietf.person.models import Person, Alias, Email
+from ietf.utils import log
 from ietf.utils.mail import send_mail
 
 def merge_persons(request, source, target, file=sys.stdout, verbose=False):
     changes = []
 
     # write log
-    syslog.openlog(str(os.path.basename(__file__)), syslog.LOG_PID, syslog.LOG_USER)
-    syslog.syslog("Merging person records {} => {}".format(source.pk,target.pk))
+    log.log(f"Merging person records {source.pk} => {target.pk}")
     
     # handle primary emails
     for email in get_extra_primary(source,target):
@@ -31,6 +30,20 @@ def merge_persons(request, source, target, file=sys.stdout, verbose=False):
         email.save()
         changes.append('EMAIL ACTION: {} no longer marked as primary'.format(email.address))
 
+    # handle community list
+    for communitylist in source.communitylist_set.all():
+        source.communitylist_set.remove(communitylist)
+        target.communitylist_set.add(communitylist)
+
+    # handle feedback
+    for feedback in source.feedback_set.all():
+        feedback.person = target
+        feedback.save()
+    # handle nominations
+    for nomination in source.nomination_set.all():
+        nomination.person = target
+        nomination.save()
+
     changes.append(handle_users(source, target))
     reviewer_changes = handle_reviewer_settings(source, target)
     if reviewer_changes:
@@ -40,17 +53,16 @@ def merge_persons(request, source, target, file=sys.stdout, verbose=False):
     dedupe_aliases(target)
 
     # copy other attributes
-    for field in ('ascii','ascii_short', 'biography', 'photo', 'photo_thumb', 'name_from_draft', 'consent'):
+    for field in ('ascii','ascii_short', 'biography', 'photo', 'photo_thumb', 'name_from_draft'):
         if getattr(source,field) and not getattr(target,field):
             setattr(target,field,getattr(source,field))
             target.save()
 
     # check for any remaining relationships and exit if more found
     objs = [source]
-#    request.user = User.objects.filter(is_superuser=True).first()
     deletable_objects = admin.utils.get_deleted_objects(objs, request, admin.site)
     deletable_objects_summary = deletable_objects[1]
-    if len(deletable_objects_summary) > 1:    # should only inlcude one object (Person)
+    if len(deletable_objects_summary) > 1:    # should only include one object (Person)
         print("Not Deleting Person: {}({})".format(source.ascii,source.pk), file=file)
         print("Related objects remain:", file=file)
         pprint.pprint(deletable_objects[1], stream=file)
@@ -104,8 +116,7 @@ def handle_users(source,target,check_only=False):
     if source.user and target.user:
         message = "DATATRACKER LOGIN ACTION: retaining login: {}, removing login: {}".format(target.user,source.user)
         if not check_only:
-            merge_users(source.user, target.user)
-            syslog.syslog('merge-person-records: deactivating user {}'.format(source.user.username))
+            log.log(f"merge-person-records: deactivating user {source.user.username}")
             user = source.user
             source.user = None
             source.save()
@@ -127,21 +138,6 @@ def move_related_objects(source, target, file, verbose=False):
         kwargs = { field_name:target }
         queryset.update(**kwargs)
 
-def merge_users(source, target):
-    '''Move related objects from source user to target user'''
-    # handle community list
-    for communitylist in source.communitylist_set.all():
-        source.communitylist_set.remove(communitylist)
-        target.communitylist_set.add(communitylist)
-    # handle feedback
-    for feedback in source.feedback_set.all():
-        feedback.user = target
-        feedback.save()
-    # handle nominations
-    for nomination in source.nomination_set.all():
-        nomination.user = target
-        nomination.save()
-
 def dedupe_aliases(person):
     '''Check person for duplicate aliases and purge'''
     seen = []
@@ -199,11 +195,13 @@ def determine_merge_order(source,target):
     return source,target
 
 def get_active_balloters(ballot_type):
-    if (ballot_type.slug != "irsg-approve"):
-        active_balloters = get_active_ads()
+    if ballot_type.slug == 'irsg-approve':
+        return get_active_irsg()
+    elif ballot_type.slug == 'rsab-approve':
+        return get_active_rsab()
     else:
-        active_balloters = get_active_irsg()
-    return active_balloters
+        return get_active_ads()
+
 
 def get_active_ads():
     cache_key = "doc:active_ads"
@@ -219,7 +217,15 @@ def get_active_irsg():
     if not active_irsg_balloters:
         active_irsg_balloters = list(Person.objects.filter(role__group__acronym='irsg',role__name__in=['chair','member','atlarge']).distinct())
         cache.set(cache_key, active_irsg_balloters)
-    return active_irsg_balloters        
+    return active_irsg_balloters
+
+def get_active_rsab():
+    cache_key = "doc:active_rsab_balloters"
+    active_rsab_balloters = cache.get(cache_key)
+    if not active_rsab_balloters:
+        active_rsab_balloters = list(Person.objects.filter(role__group__acronym='rsab', role__name="member").distinct())
+        cache.set(cache_key, active_rsab_balloters)
+    return active_rsab_balloters
 
 def get_dots(person):
         roles = person.role_set.filter(group__state_id__in=('active','bof','proposed'))
@@ -239,3 +245,17 @@ def get_dots(person):
         if roles.filter(group__acronym__startswith='nomcom', name_id__in=('chair','member')).exists():
             dots.append('nomcom')
         return dots
+
+def lookup_persons(email_or_name):
+    aliases = Alias.objects.filter(name__iexact=email_or_name)
+    persons = set(a.person for a in aliases)
+
+    if '@' in email_or_name:
+        emails = Email.objects.filter(address__iexact=email_or_name)
+        persons.update(e.person for e in emails)
+
+    persons = [p for p in persons if p and p.id]
+    if not persons:
+        raise Http404
+    persons.sort(key=lambda p: p.id)
+    return persons
diff --git a/ietf/person/views.py b/ietf/person/views.py
index fca943e2dd..d0b5912431 100644
--- a/ietf/person/views.py
+++ b/ietf/person/views.py
@@ -1,23 +1,26 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-import datetime
 from io import StringIO, BytesIO
 from PIL import Image
 
+from django.conf import settings
 from django.contrib import messages
 from django.db.models import Q
 from django.http import HttpResponse, Http404
-from django.shortcuts import render, get_object_or_404, redirect
+from django.shortcuts import render, redirect
+from django.template.loader import render_to_string
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
 from ietf.ietfauth.utils import role_required
-from ietf.person.models import Email, Person, Alias
+from ietf.person.models import Email, Person
 from ietf.person.fields import select2_id_name_json
-from ietf.person.forms import MergeForm
-from ietf.person.utils import handle_users, merge_persons
+from ietf.person.forms import MergeForm, MergeRequestForm
+from ietf.person.utils import handle_users, merge_persons, lookup_persons
+from ietf.utils.mail import send_mail_text
 
 
 def ajax_select2_search(request, model_name):
@@ -62,33 +65,22 @@ def ajax_select2_search(request, model_name):
         page = int(request.GET.get("p", 1)) - 1
     except ValueError:
         page = 0
-
-    objs = objs.distinct()[page:page + 10]
+    PAGE_SIZE = 10
+    first_item = page * PAGE_SIZE
+    objs = objs.distinct()[first_item:first_item + PAGE_SIZE]
 
     return HttpResponse(select2_id_name_json(objs), content_type='application/json')
 
+
 def profile(request, email_or_name):
-    if '@' in email_or_name:
-        persons = [ get_object_or_404(Email, address=email_or_name).person, ]
-    else:
-        aliases = Alias.objects.filter(name=email_or_name)
-        persons = list(set([ a.person for a in aliases ]))
-    persons = [ p for p in persons if p and p.id ]
-    if not persons:
-        raise Http404
-    return render(request, 'person/profile.html', {'persons': persons, 'today':datetime.date.today()})
+    persons = lookup_persons(email_or_name)
+    return render(request, 'person/profile.html', {'persons': persons, 'today': timezone.now()})
 
 
 def photo(request, email_or_name):
-    if '@' in email_or_name:
-        persons = [ get_object_or_404(Email, address=email_or_name).person, ]
-    else:
-        aliases = Alias.objects.filter(name=email_or_name)
-        persons = list(set([ a.person for a in aliases ]))
-        if not persons:
-            raise Http404("No such person")
+    persons = lookup_persons(email_or_name)
     if len(persons) > 1:
-        return HttpResponse(r"\r\n".join([p.email() for p in persons]), status=300)
+        raise Http404("No photo found")
     person = persons[0]
     if not person.photo:
         raise Http404("No photo found")
@@ -96,29 +88,32 @@ def photo(request, email_or_name):
     if not size.isdigit():
         return HttpResponse("Size must be integer", status=400)
     size = int(size)
-    img = Image.open(person.photo)
-    img = img.resize((size, img.height*size//img.width))
-    bytes = BytesIO()
-    try:
-        img.save(bytes, format='JPEG')
-        return HttpResponse(bytes.getvalue(), content_type='image/jpg')
-    except OSError:
-        raise Http404
+    with Image.open(person.photo) as img:
+        img = img.resize((size, img.height*size//img.width))
+        bytes = BytesIO()
+        try:
+            img.save(bytes, format='JPEG')
+            return HttpResponse(bytes.getvalue(), content_type='image/jpg')
+        except OSError:
+            raise Http404
 
 
 @role_required("Secretariat")
 def merge(request):
     form = MergeForm()
-    method = 'get'
+    return render(request, 'person/merge.html', {'form': form})
+
+
+@role_required("Secretariat")
+def merge_submit(request):
     change_details = ''
     warn_messages = []
     source = None
     target = None
 
     if request.method == "GET":
-        form = MergeForm()
         if request.GET:
-            form = MergeForm(request.GET)
+            form = MergeForm(request.GET, readonly=True)
             if form.is_valid():
                 source = form.cleaned_data.get('source')
                 target = form.cleaned_data.get('target')
@@ -127,12 +122,9 @@ def merge(request):
                     if source.user.last_login and target.user.last_login and source.user.last_login > target.user.last_login:
                         warn_messages.append('WARNING: The most recently used login is being deleted!')
                 change_details = handle_users(source, target, check_only=True)
-                method = 'post'
-            else:
-                method = 'get'
 
     if request.method == "POST":
-        form = MergeForm(request.POST)
+        form = MergeForm(request.POST, readonly=True)
         if form.is_valid():
             source = form.cleaned_data.get('source')
             source_id = source.id
@@ -147,11 +139,72 @@ def merge(request):
                 messages.error(request, output)
             return redirect('ietf.secr.rolodex.views.view', id=target.pk)
 
-    return render(request, 'person/merge.html', {
+    return render(request, 'person/merge_submit.html', {
         'form': form,
-        'method': method,
         'change_details': change_details,
         'source': source,
         'target': target,
         'warn_messages': warn_messages,
     })
+
+
+@role_required("Secretariat")
+def send_merge_request(request):
+    if request.method == 'GET':
+        merge_form = MergeForm(request.GET)
+        if merge_form.is_valid():
+            source = merge_form.cleaned_data['source']
+            target = merge_form.cleaned_data['target']
+            to = []
+            if source.email():
+                to.append(source.email().address)
+            if target.email():
+                to.append(target.email().address)
+            if source.user:
+                source_account = source.user.username
+            else:
+                source_account = source.email()
+            if target.user:
+                target_account = target.user.username
+            else:
+                target_account = target.email()
+            sender_name = request.user.person.name
+            subject = 'Action requested: Merging possible duplicate IETF Datatracker accounts'
+            context = {
+                'source_account': source_account,
+                'target_account': target_account,
+                'sender_name': sender_name,
+            }
+            body = render_to_string('person/merge_request_email.txt', context)
+            initial = {
+                'to': ', '.join(to),
+                'frm': settings.DEFAULT_FROM_EMAIL,
+                'reply_to': 'support@ietf.org',
+                'subject': subject,
+                'body': body,
+                'by': request.user.person.pk,
+            }
+            form = MergeRequestForm(initial=initial)
+        else:
+            messages.error(request, "Error requesting merge email: " + merge_form.errors.as_text())
+            return redirect("ietf.person.views.merge")
+
+    if request.method == 'POST':
+        form = MergeRequestForm(request.POST)
+        if form.is_valid():
+            extra = {"Reply-To": form.cleaned_data.get("reply_to")}
+            send_mail_text(
+                request,
+                form.cleaned_data.get("to"),
+                form.cleaned_data.get("frm"),
+                form.cleaned_data.get("subject"),
+                form.cleaned_data.get("body"),
+                extra=extra,
+            )
+
+            messages.success(request, "The merge confirmation email was sent.")
+            return redirect("ietf.person.views.merge")
+
+    return render(request, "person/send_merge_request.html", {
+        "form": form,
+    })
diff --git a/ietf/redirects/.gitignore b/ietf/redirects/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/redirects/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/redirects/fixtures/.gitignore b/ietf/redirects/fixtures/.gitignore
deleted file mode 100644
index c7013ced9d..0000000000
--- a/ietf/redirects/fixtures/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py
diff --git a/ietf/redirects/migrations/0001_initial.py b/ietf/redirects/migrations/0001_initial.py
new file mode 100644
index 0000000000..7a28072a32
--- /dev/null
+++ b/ietf/redirects/migrations/0001_initial.py
@@ -0,0 +1,51 @@
+# Generated by Django 2.2.28 on 2023-03-20 19:22
+
+from typing import List, Tuple
+from django.db import migrations, models
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies: List[Tuple[str, str]] = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Redirect',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('cgi', models.CharField(blank=True, max_length=50, unique=True)),
+                ('url', models.CharField(max_length=255)),
+                ('rest', models.CharField(blank=True, max_length=100)),
+                ('remove', models.CharField(blank=True, max_length=50)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Suffix',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('rest', models.CharField(blank=True, max_length=100)),
+                ('remove', models.CharField(blank=True, max_length=50)),
+            ],
+            options={
+                'verbose_name_plural': 'Suffixes',
+            },
+        ),
+        migrations.CreateModel(
+            name='Command',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('command', models.CharField(max_length=50)),
+                ('url', models.CharField(blank=True, max_length=50)),
+                ('script', ietf.utils.models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='commands', to='redirects.Redirect')),
+                ('suffix', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='redirects.Suffix')),
+            ],
+            options={
+                'unique_together': {('script', 'command')},
+            },
+        ),
+    ]
diff --git a/ietf/secr/groups/__init__.py b/ietf/redirects/migrations/__init__.py
similarity index 100%
rename from ietf/secr/groups/__init__.py
rename to ietf/redirects/migrations/__init__.py
diff --git a/ietf/redirects/views.py b/ietf/redirects/views.py
index af8cbf5558..af4e898261 100644
--- a/ietf/redirects/views.py
+++ b/ietf/redirects/views.py
@@ -48,7 +48,7 @@ def redirect(request, path="", script=""):
             pass	# it's ok, request didn't have 'command'.
         except:
             pass	# strange exception like the one described in
-                        # https://trac.ietf.org/trac/ietfdb/ticket/179?
+                        # https://github.com/ietf-tools/datatracker/issues/179
                         # just ignore the command string.
     if cmd is not None:
         remove_args.append('command')
diff --git a/ietf/review/factories.py b/ietf/review/factories.py
index cf66f1ed88..158251317e 100644
--- a/ietf/review/factories.py
+++ b/ietf/review/factories.py
@@ -2,6 +2,8 @@
 import factory
 import datetime
 
+from django.utils import timezone
+
 from ietf.review.models import ReviewTeamSettings, ReviewRequest, ReviewAssignment, ReviewerSettings
 from ietf.name.models import ReviewTypeName, ReviewResultName
 
@@ -9,6 +11,7 @@
 class ReviewTeamSettingsFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = ReviewTeamSettings
+        skip_postgeneration_save = True
 
     group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='review')
     reviewer_queue_policy_id = 'RotateAlphabetically'
@@ -39,7 +42,7 @@ class Meta:
     type_id = 'lc'
     doc = factory.SubFactory('ietf.doc.factories.DocumentFactory',type_id='draft')
     team = factory.SubFactory('ietf.group.factories.ReviewTeamFactory',type_id='review')
-    deadline = datetime.datetime.today()+datetime.timedelta(days=14)
+    deadline = timezone.now()+datetime.timedelta(days=14)
     requested_by = factory.SubFactory('ietf.person.factories.PersonFactory')
 
 class ReviewAssignmentFactory(factory.django.DjangoModelFactory):
@@ -49,7 +52,7 @@ class Meta:
     review_request = factory.SubFactory('ietf.review.factories.ReviewRequestFactory')
     state_id = 'assigned'
     reviewer = factory.SubFactory('ietf.person.factories.EmailFactory')
-    assigned_on = datetime.datetime.now()
+    assigned_on = timezone.now()
 
 class ReviewerSettingsFactory(factory.django.DjangoModelFactory):
     class Meta:
diff --git a/ietf/review/mailarch.py b/ietf/review/mailarch.py
index 2ca6c9566a..61abc83aa5 100644
--- a/ietf/review/mailarch.py
+++ b/ietf/review/mailarch.py
@@ -6,25 +6,20 @@
 # mailarchive.ietf.org
 
 import base64
-import contextlib
 import datetime
 import email.utils
 import hashlib
-import mailbox
-import tarfile
-import tempfile
-
-from urllib.parse import urlencode
-from urllib.request import urlopen
+import requests
 
 import debug                            # pyflakes:ignore
 
-from pyquery import PyQuery
 
 from django.conf import settings
 from django.utils.encoding import force_bytes, force_str
 
-from ietf.utils.mail import get_payload_text
+from ietf.utils.log import log
+from ietf.utils.timezone import date_today
+
 
 def list_name_from_email(list_email):
     if not list_email.endswith("@ietf.org"):
@@ -41,7 +36,7 @@ def hash_list_message_id(list_name, msgid):
     sha.update(force_bytes(list_name))
     return force_str(base64.urlsafe_b64encode(sha.digest()).rstrip(b"="))
 
-def construct_query_urls(doc, team, query=None):
+def construct_query_data(doc, team, query=None):
     list_name = list_name_from_email(team.list_email)
     if not list_name:
         return None
@@ -49,82 +44,48 @@ def construct_query_urls(doc, team, query=None):
     if not query:
         query = doc.name
 
-    encoded_query = "?" + urlencode({
-        "qdr": "c", # custom time frame
-        "start_date": (datetime.date.today() - datetime.timedelta(days=180)).isoformat(),
-        "email_list": list_name,
-        "q": "subject:({})".format(query),
-        "as": "1", # this is an advanced search
-    })
-
-    return {
-        "query": query,
-        "query_url": settings.MAILING_LIST_ARCHIVE_URL + "/arch/search/" + encoded_query,
-        "query_data_url": settings.MAILING_LIST_ARCHIVE_URL + "/arch/export/mbox/" + encoded_query,
+    query_data = {
+        'start_date': (date_today() - datetime.timedelta(days=180)).isoformat(),
+        'email_list': list_name,
+        'query_value': query,
+        'query': f'subject:({query})',
+        'limit': '30',
     }
+    return query_data
 
 def construct_message_url(list_name, msgid):
     return "{}/arch/msg/{}/{}".format(settings.MAILING_LIST_ARCHIVE_URL, list_name, hash_list_message_id(list_name, msgid))
 
-def retrieve_messages_from_mbox(mbox_fileobj):
-    """Return selected content in message from mbox from mailarch."""
-    res = []
-    with tempfile.NamedTemporaryFile(suffix=".mbox") as mbox_file:
-        # mailbox.mbox needs a path, so we need to put the contents
-        # into a file
-        mbox_data = mbox_fileobj.read()
-        mbox_file.write(mbox_data)
-        mbox_file.flush()
-
-        mbox = mailbox.mbox(mbox_file.name, create=False)
-        for msg in mbox:
-            content = ""
-
-            for part in msg.walk():
-                if part.get_content_type() == "text/plain":
-                    charset = part.get_content_charset() or "utf-8"
-                    content += get_payload_text(part, default_charset=charset)
-
-            # parse a couple of things for the front end
-            utcdate = None
-            d = email.utils.parsedate_tz(msg["Date"])
-            if d:
-                utcdate = datetime.datetime.fromtimestamp(email.utils.mktime_tz(d))
-
-            res.append({
-                "from": msg["From"],
-                "splitfrom": email.utils.parseaddr(msg["From"]),
-                "subject": msg["Subject"],
-                "content": content.replace("\r\n", "\n").replace("\r", "\n").strip("\n"),
-                "message_id": email.utils.unquote(msg["Message-ID"].strip()),
-                "url": email.utils.unquote(msg["Archived-At"].strip()),
-                "date": msg["Date"],
-                "utcdate": (utcdate.date().isoformat(), utcdate.time().isoformat()) if utcdate else ("", ""),
-            })
-
-    return res
-
-def retrieve_messages(query_data_url):
+def retrieve_messages(query_data):
     """Retrieve and return selected content from mailarch."""
-    res = []
-
-    # This has not been rewritten to use requests.get() because get() does
-    # not handle file URLs out of the box, which we need for tesing
-    with contextlib.closing(urlopen(query_data_url, timeout=15)) as fileobj:
-        content_type = fileobj.info()["Content-type"]
-        if not content_type.startswith("application/x-tar"):
-            if content_type.startswith("text/html"):
-                r = fileobj.read(20000)
-                q = PyQuery(r)
-                div = q('div[class~="no-results"]')
-                if div:
-                    raise KeyError("No results: %s -> %s" % (query_data_url, div.text(), ))
-            raise Exception("Export failed - this usually means no matches were found")
-
-        with tarfile.open(fileobj=fileobj, mode='r|*') as tar:
-            for entry in tar:
-                if entry.isfile():
-                    mbox_fileobj = tar.extractfile(entry)
-                    res.extend(retrieve_messages_from_mbox(mbox_fileobj))
-
-    return res
+
+    headers = {'X-Api-Key': settings.MAILING_LIST_ARCHIVE_API_KEY}
+    try:
+        response = requests.post(
+            settings.MAILING_LIST_ARCHIVE_SEARCH_URL,
+            headers=headers,
+            json=query_data,
+            timeout=settings.DEFAULT_REQUESTS_TIMEOUT)
+    except requests.Timeout as exc:
+        log(f'POST request failed for [{query_data["url"]}]: {exc}')
+        raise RuntimeError(f'Timeout retrieving [{query_data["url"]}]') from exc
+
+    results = []
+    jresponse = response.json()
+    if 'results' not in jresponse or len(jresponse['results']) == 0:
+        raise KeyError(f'No results: {query_data["query"]}')
+    for msg in jresponse['results']:
+        # datetime is already UTC
+        dt = datetime.datetime.fromisoformat(msg['date'])
+        dt_utc = dt.replace(tzinfo=datetime.timezone.utc)
+        results.append({
+            "from": msg["from"],
+            "splitfrom": email.utils.parseaddr(msg["from"]),
+            "subject": msg["subject"],
+            "content": msg["content"].replace("\r\n", "\n").replace("\r", "\n").strip("\n"),
+            "message_id": msg["message_id"],
+            "url": msg["url"],
+            "utcdate": (dt_utc.date().isoformat(), dt_utc.time().isoformat()),
+        })
+
+    return results
diff --git a/ietf/review/migrations/0001_initial.py b/ietf/review/migrations/0001_initial.py
index 5e7fde9ec7..4fc32caeef 100644
--- a/ietf/review/migrations/0001_initial.py
+++ b/ietf/review/migrations/0001_initial.py
@@ -1,14 +1,14 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
-
-import datetime
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
 import ietf.review.models
 import ietf.utils.models
+import ietf.utils.timezone
 import ietf.utils.validators
+import simple_history.models
 
 
 class Migration(migrations.Migration):
@@ -16,109 +16,238 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('group', '0001_initial'),
         ('name', '0001_initial'),
         ('person', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('group', '0001_initial'),
         ('doc', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='NextReviewerInTeam',
+            name='UnavailablePeriod',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('next_reviewer', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('team', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('start_date', models.DateField(default=ietf.utils.timezone.date_today, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.", null=True)),
+                ('end_date', models.DateField(blank=True, help_text='Leaving the end date blank means that the period continues indefinitely. You can end it later.', null=True)),
+                ('availability', models.CharField(choices=[('canfinish', 'Can do follow-ups'), ('unavailable', 'Completely unavailable')], max_length=30)),
+                ('reason', models.TextField(blank=True, default='', help_text="Provide (for the secretary's benefit) the reason why the review is unavailable", max_length=2048, verbose_name='Reason why reviewer is unavailable (Optional)')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('team', ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ReviewWish',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('doc', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
+                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('team', ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
             ],
             options={
-                'verbose_name': 'next reviewer in team setting',
-                'verbose_name_plural': 'next reviewer in team settings',
+                'verbose_name_plural': 'review wishes',
             },
         ),
         migrations.CreateModel(
-            name='ReviewerSettings',
+            name='ReviewTeamSettings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('min_interval', models.IntegerField(blank=True, choices=[(7, 'Once per week'), (14, 'Once per fortnight'), (30, 'Once per month'), (61, 'Once per two months'), (91, 'Once per quarter')], null=True, verbose_name='Can review at most')),
-                ('filter_re', models.CharField(blank=True, help_text='Draft names matching this regular expression should not be assigned', max_length=255, validators=[ietf.utils.validators.RegexStringValidator()], verbose_name='Filter regexp')),
-                ('skip_next', models.IntegerField(default=0, verbose_name='Skip next assignments')),
-                ('remind_days_before_deadline', models.IntegerField(blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.", null=True)),
-                ('expertise', models.TextField(blank=True, default='', help_text="Describe the reviewer's expertise in this team's area", max_length=2048, verbose_name="Reviewer's expertise in this team's area")),
+                ('autosuggest', models.BooleanField(default=True, verbose_name='Automatically suggest possible review requests')),
+                ('secr_mail_alias', models.CharField(blank=True, help_text='Email alias for all of the review team secretaries', max_length=255, verbose_name='Email alias for all of the review team secretaries')),
+                ('remind_days_unconfirmed_assignments', models.PositiveIntegerField(blank=True, help_text="To send a periodic email reminder to reviewers of review assignments they have neither accepted nor rejected, enter the number of days between these reminders. Clear the field if you don't want these reminders to be sent.", null=True, verbose_name='Periodic reminder of not yet accepted or rejected review assignments to reviewer every X days')),
+                ('group', ietf.utils.models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('notify_ad_when', models.ManyToManyField(blank=True, related_name='reviewteamsettings_notify_ad_set', to='name.ReviewResultName')),
+                ('review_results', models.ManyToManyField(default=ietf.review.models.get_default_review_results, related_name='reviewteamsettings_review_results_set', to='name.ReviewResultName')),
+                ('review_types', models.ManyToManyField(default=ietf.review.models.get_default_review_types, to='name.ReviewTypeName')),
+                ('reviewer_queue_policy', models.ForeignKey(default='RotateAlphabetically', on_delete=django.db.models.deletion.PROTECT, to='name.ReviewerQueuePolicyName')),
+            ],
+            options={
+                'verbose_name': 'Review team settings',
+                'verbose_name_plural': 'Review team settings',
+            },
+        ),
+        migrations.CreateModel(
+            name='ReviewSecretarySettings',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('remind_days_before_deadline', models.IntegerField(blank=True, help_text="To get an email reminder in case a reviewer forgets to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.", null=True)),
+                ('max_items_to_show_in_reviewer_list', models.IntegerField(blank=True, help_text='Maximum number of completed items to show for one reviewer in the reviewer list view, the list is also filtered by the days to show in reviews list setting.', null=True)),
+                ('days_to_show_in_reviewer_list', models.IntegerField(blank=True, help_text='Maximum number of days to show in reviewer list for completed items.', null=True)),
                 ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('team', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('team', ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
             ],
             options={
-                'verbose_name_plural': 'reviewer settings',
+                'verbose_name_plural': 'review secretary settings',
             },
         ),
         migrations.CreateModel(
             name='ReviewRequest',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('old_id', models.IntegerField(blank=True, help_text='ID in previous review system', null=True)),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
                 ('deadline', models.DateField()),
                 ('requested_rev', models.CharField(blank=True, help_text='Fill in if a specific revision is to be reviewed, e.g. 02', max_length=16, verbose_name='requested revision')),
                 ('comment', models.TextField(blank=True, default='', help_text='Provide any additional information to show to the review team secretary and reviewer', max_length=2048, verbose_name="Requester's comments and instructions")),
-                ('reviewed_rev', models.CharField(blank=True, max_length=16, verbose_name='reviewed revision')),
                 ('doc', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviewrequest_set', to='doc.Document')),
                 ('requested_by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('result', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.ReviewResultName')),
-                ('review', ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('reviewer', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
                 ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ReviewRequestStateName')),
-                ('team', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('team', ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
                 ('type', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ReviewTypeName')),
             ],
         ),
         migrations.CreateModel(
-            name='ReviewSecretarySettings',
+            name='ReviewerSettings',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('remind_days_before_deadline', models.IntegerField(blank=True, help_text="To get an email reminder in case a reviewer forgets to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.", null=True)),
+                ('min_interval', models.IntegerField(blank=True, choices=[(7, 'Once per week'), (14, 'Once per fortnight'), (30, 'Once per month'), (61, 'Once per two months'), (91, 'Once per quarter')], null=True, verbose_name='Can review at most')),
+                ('filter_re', models.CharField(blank=True, help_text='Internet-Draft names matching this regular expression should not be assigned', max_length=255, validators=[ietf.utils.validators.RegexStringValidator()], verbose_name='Filter regexp')),
+                ('skip_next', models.IntegerField(default=0, verbose_name='Skip next assignments')),
+                ('remind_days_before_deadline', models.IntegerField(blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want this reminder.", null=True)),
+                ('remind_days_open_reviews', models.PositiveIntegerField(blank=True, help_text="To get a periodic email reminder of all your open reviews, enter the number of days between these reminders. Clear the field if you don't want these reminders.", null=True, verbose_name='Periodic reminder of open reviews every X days')),
+                ('request_assignment_next', models.BooleanField(default=False, help_text='If you would like to be assigned to a review as soon as possible, select this option. It is automatically reset once you receive any assignment.', verbose_name='Select me next for an assignment')),
+                ('expertise', models.TextField(blank=True, default='', help_text="Describe the reviewer's expertise in this team's area", max_length=2048, verbose_name="Reviewer's expertise in this team's area")),
                 ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('team', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('team', ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
             ],
             options={
-                'verbose_name_plural': 'review secretary settings',
+                'verbose_name_plural': 'reviewer settings',
             },
         ),
         migrations.CreateModel(
-            name='ReviewTeamSettings',
+            name='ReviewAssignment',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('autosuggest', models.BooleanField(default=True, verbose_name='Automatically suggest possible review requests')),
-                ('group', ietf.utils.models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
-                ('review_results', models.ManyToManyField(default=ietf.review.models.get_default_review_results, to='name.ReviewResultName')),
-                ('review_types', models.ManyToManyField(default=ietf.review.models.get_default_review_types, to='name.ReviewTypeName')),
+                ('assigned_on', models.DateTimeField(blank=True, null=True)),
+                ('completed_on', models.DateTimeField(blank=True, null=True)),
+                ('reviewed_rev', models.CharField(blank=True, max_length=16, verbose_name='reviewed revision')),
+                ('mailarch_url', models.URLField(blank=True, null=True)),
+                ('result', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.ReviewResultName')),
+                ('review', ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
+                ('review_request', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.ReviewRequest')),
+                ('reviewer', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
+                ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ReviewAssignmentStateName')),
             ],
-            options={
-                'verbose_name': 'Review team settings',
-                'verbose_name_plural': 'Review team settings',
-            },
         ),
         migrations.CreateModel(
-            name='ReviewWish',
+            name='NextReviewerInTeam',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('doc', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('team', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('next_reviewer', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('team', ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
             ],
             options={
-                'verbose_name_plural': 'review wishes',
+                'verbose_name': 'next reviewer in team setting',
+                'verbose_name_plural': 'next reviewer in team settings',
             },
         ),
         migrations.CreateModel(
-            name='UnavailablePeriod',
+            name='HistoricalUnavailablePeriod',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('start_date', models.DateField(default=datetime.date.today, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away.", null=True)),
+                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('history_change_reason', models.TextField(null=True)),
+                ('start_date', models.DateField(default=ietf.utils.timezone.date_today, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.", null=True)),
                 ('end_date', models.DateField(blank=True, help_text='Leaving the end date blank means that the period continues indefinitely. You can end it later.', null=True)),
                 ('availability', models.CharField(choices=[('canfinish', 'Can do follow-ups'), ('unavailable', 'Completely unavailable')], max_length=30)),
-                ('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-                ('team', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('reason', models.TextField(blank=True, default='', help_text="Provide (for the secretary's benefit) the reason why the review is unavailable", max_length=2048, verbose_name='Reason why reviewer is unavailable (Optional)')),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('person', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Person')),
+                ('team', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group')),
             ],
+            options={
+                'verbose_name': 'historical unavailable period',
+                'verbose_name_plural': 'historical unavailable periods',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalReviewRequest',
+            fields=[
+                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('history_change_reason', models.TextField(null=True)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('deadline', models.DateField()),
+                ('requested_rev', models.CharField(blank=True, help_text='Fill in if a specific revision is to be reviewed, e.g. 02', max_length=16, verbose_name='requested revision')),
+                ('comment', models.TextField(blank=True, default='', help_text='Provide any additional information to show to the review team secretary and reviewer', max_length=2048, verbose_name="Requester's comments and instructions")),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('doc', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='doc.Document')),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('requested_by', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Person')),
+                ('state', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.ReviewRequestStateName')),
+                ('team', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group')),
+                ('type', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.ReviewTypeName')),
+            ],
+            options={
+                'verbose_name': 'historical review request',
+                'verbose_name_plural': 'historical review requests',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalReviewerSettings',
+            fields=[
+                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('history_change_reason', models.TextField(null=True)),
+                ('min_interval', models.IntegerField(blank=True, choices=[(7, 'Once per week'), (14, 'Once per fortnight'), (30, 'Once per month'), (61, 'Once per two months'), (91, 'Once per quarter')], null=True, verbose_name='Can review at most')),
+                ('filter_re', models.CharField(blank=True, help_text='Internet-Draft names matching this regular expression should not be assigned', max_length=255, validators=[ietf.utils.validators.RegexStringValidator()], verbose_name='Filter regexp')),
+                ('skip_next', models.IntegerField(default=0, verbose_name='Skip next assignments')),
+                ('remind_days_before_deadline', models.IntegerField(blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want this reminder.", null=True)),
+                ('remind_days_open_reviews', models.PositiveIntegerField(blank=True, help_text="To get a periodic email reminder of all your open reviews, enter the number of days between these reminders. Clear the field if you don't want these reminders.", null=True, verbose_name='Periodic reminder of open reviews every X days')),
+                ('request_assignment_next', models.BooleanField(default=False, help_text='If you would like to be assigned to a review as soon as possible, select this option. It is automatically reset once you receive any assignment.', verbose_name='Select me next for an assignment')),
+                ('expertise', models.TextField(blank=True, default='', help_text="Describe the reviewer's expertise in this team's area", max_length=2048, verbose_name="Reviewer's expertise in this team's area")),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('person', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Person')),
+                ('team', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group')),
+            ],
+            options={
+                'verbose_name': 'historical reviewer settings',
+                'verbose_name_plural': 'historical reviewer settings',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.CreateModel(
+            name='HistoricalReviewAssignment',
+            fields=[
+                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
+                ('history_change_reason', models.TextField(null=True)),
+                ('assigned_on', models.DateTimeField(blank=True, null=True)),
+                ('completed_on', models.DateTimeField(blank=True, null=True)),
+                ('reviewed_rev', models.CharField(blank=True, max_length=16, verbose_name='reviewed revision')),
+                ('mailarch_url', models.URLField(blank=True, null=True)),
+                ('history_id', models.AutoField(primary_key=True, serialize=False)),
+                ('history_date', models.DateTimeField(db_index=True)),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+                ('result', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.ReviewResultName')),
+                ('review', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='doc.Document')),
+                ('review_request', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='review.ReviewRequest')),
+                ('reviewer', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Email')),
+                ('state', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.ReviewAssignmentStateName')),
+            ],
+            options={
+                'verbose_name': 'historical review assignment',
+                'verbose_name_plural': 'historical review assignments',
+                'ordering': ('-history_date', '-history_id'),
+                'get_latest_by': ('history_date', 'history_id'),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+        migrations.AddConstraint(
+            model_name='reviewersettings',
+            constraint=models.UniqueConstraint(fields=('team', 'person'), name='unique_reviewer_settings_per_team_person'),
         ),
     ]
diff --git a/ietf/review/migrations/0002_reviewteamsettings_allow_reviewer_to_reject_after_deadline.py b/ietf/review/migrations/0002_reviewteamsettings_allow_reviewer_to_reject_after_deadline.py
new file mode 100644
index 0000000000..08990fbcc0
--- /dev/null
+++ b/ietf/review/migrations/0002_reviewteamsettings_allow_reviewer_to_reject_after_deadline.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-03-25 06:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('review', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='reviewteamsettings',
+            name='allow_reviewer_to_reject_after_deadline',
+            field=models.BooleanField(default=False, verbose_name='Allow reviewer to reject request after deadline.'),
+        ),
+    ]
diff --git a/ietf/review/migrations/0002_unavailableperiod_reason.py b/ietf/review/migrations/0002_unavailableperiod_reason.py
deleted file mode 100644
index e4c81ad7cd..0000000000
--- a/ietf/review/migrations/0002_unavailableperiod_reason.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.14 on 2018-07-23 15:11
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='unavailableperiod',
-            name='reason',
-            field=models.TextField(blank=True, default='', help_text="Provide (for the secretary's benefit) the reason why the review is unavailable", max_length=2048, verbose_name='Reason why reviewer is unavailable (Optional)'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0003_add_notify_ad_when.py b/ietf/review/migrations/0003_add_notify_ad_when.py
deleted file mode 100644
index 78e0d79595..0000000000
--- a/ietf/review/migrations/0003_add_notify_ad_when.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-11-02 10:10
-
-
-from django.db import migrations, models
-import ietf.review.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0004_add_prefix_to_doctypenames'),
-        ('review', '0002_unavailableperiod_reason'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='reviewteamsettings',
-            name='notify_ad_when',
-            field=models.ManyToManyField(related_name='reviewteamsettings_notify_ad_set', to='name.ReviewResultName'),
-        ),
-        migrations.AlterField(
-            model_name='reviewteamsettings',
-            name='review_results',
-            field=models.ManyToManyField(default=ietf.review.models.get_default_review_results, related_name='reviewteamsettings_review_results_set', to='name.ReviewResultName'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py b/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py
deleted file mode 100644
index 96fb0ba1cf..0000000000
--- a/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-11-03 03:10
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0003_add_notify_ad_when'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='reviewteamsettings',
-            name='secr_mail_alias',
-            field=models.CharField(blank=True, help_text='Email alias for all of the review team secretaries', max_length=255, verbose_name='Email alias for all of the review team secretaries'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0005_set_secdir_notify_ad_when.py b/ietf/review/migrations/0005_set_secdir_notify_ad_when.py
deleted file mode 100644
index 66b768a50d..0000000000
--- a/ietf/review/migrations/0005_set_secdir_notify_ad_when.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-11-02 10:20
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    ReviewTeamSettings = apps.get_model('review','ReviewTeamSettings')
-    ReviewTeamSettings.objects.get(group__acronym='secdir').notify_ad_when.set(['serious-issues', 'issues', 'not-ready'])
-
-def reverse(apps, schema_editor):
-    ReviewTeamSettings = apps.get_model('review','ReviewTeamSettings')
-    ReviewTeamSettings.objects.get(group__acronym='secdir').notify_ad_when.set([])
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0004_reviewteamsettings_secr_mail_alias'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/review/migrations/0006_historicalreviewersettings.py b/ietf/review/migrations/0006_historicalreviewersettings.py
deleted file mode 100644
index 4129ab409f..0000000000
--- a/ietf/review/migrations/0006_historicalreviewersettings.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-11-09 08:31
-
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-import ietf.utils.validators
-import simple_history.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('group', '0003_groupfeatures_data'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('person', '0008_auto_20181014_1448'),
-        ('review', '0005_set_secdir_notify_ad_when'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='HistoricalReviewerSettings',
-            fields=[
-                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
-                ('min_interval', models.IntegerField(blank=True, choices=[(7, 'Once per week'), (14, 'Once per fortnight'), (30, 'Once per month'), (61, 'Once per two months'), (91, 'Once per quarter')], null=True, verbose_name='Can review at most')),
-                ('filter_re', models.CharField(blank=True, help_text='Draft names matching this regular expression should not be assigned', max_length=255, validators=[ietf.utils.validators.RegexStringValidator()], verbose_name='Filter regexp')),
-                ('skip_next', models.IntegerField(default=0, verbose_name='Skip next assignments')),
-                ('remind_days_before_deadline', models.IntegerField(blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.", null=True)),
-                ('expertise', models.TextField(blank=True, default='', help_text="Describe the reviewer's expertise in this team's area", max_length=2048, verbose_name="Reviewer's expertise in this team's area")),
-                ('history_id', models.AutoField(primary_key=True, serialize=False)),
-                ('history_change_reason', models.CharField(max_length=100, null=True)),
-                ('history_date', models.DateTimeField()),
-                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
-                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
-                ('person', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Person')),
-                ('team', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group')),
-            ],
-            options={
-                'ordering': ('-history_date', '-history_id'),
-                'get_latest_by': 'history_date',
-                'verbose_name': 'historical reviewer settings',
-            },
-            bases=(simple_history.models.HistoricalChanges, models.Model),
-        ),
-    ]
diff --git a/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py b/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py
deleted file mode 100644
index 11da10b36d..0000000000
--- a/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2018-12-06 13:16
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0006_historicalreviewersettings'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='reviewteamsettings',
-            name='notify_ad_when',
-            field=models.ManyToManyField(blank=True, related_name='reviewteamsettings_notify_ad_set', to='name.ReviewResultName'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0008_remove_reviewrequest_old_id.py b/ietf/review/migrations/0008_remove_reviewrequest_old_id.py
deleted file mode 100644
index 7f3e0b24ca..0000000000
--- a/ietf/review/migrations/0008_remove_reviewrequest_old_id.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2019-01-03 12:34
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0007_allow_notify_ad_when_to_be_blank'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='reviewrequest',
-            name='old_id',
-        ),
-    ]
diff --git a/ietf/review/migrations/0009_refactor_review_request.py b/ietf/review/migrations/0009_refactor_review_request.py
deleted file mode 100644
index d3b22e138b..0000000000
--- a/ietf/review/migrations/0009_refactor_review_request.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-04 14:27
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0009_move_non_url_externalurls_to_uploaded_filename'),
-        ('name', '0005_reviewassignmentstatename'),
-        ('person', '0008_auto_20181014_1448'),
-        ('review', '0008_remove_reviewrequest_old_id'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ReviewAssignment',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('assigned_on', models.DateTimeField(blank=True, null=True)),
-                ('completed_on', models.DateTimeField(blank=True, null=True)),
-                ('reviewed_rev', models.CharField(blank=True, max_length=16, verbose_name='reviewed revision')),
-                ('mailarch_url', models.URLField(blank=True, null=True)),
-                ('result', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.ReviewResultName')),
-                ('review', ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
-            ],
-        ),
-        migrations.RenameField(
-            model_name='reviewrequest',
-            old_name='result',
-            new_name='unused_result',
-        ),
-        migrations.RenameField(
-            model_name='reviewrequest',
-            old_name='review',
-            new_name='unused_review',
-        ),
-        migrations.RenameField(
-            model_name='reviewrequest',
-            old_name='reviewed_rev',
-            new_name='unused_reviewed_rev',
-        ),
-        migrations.RenameField(
-            model_name='reviewrequest',
-            old_name='reviewer',
-            new_name='unused_reviewer',
-        ),
-        migrations.AddField(
-            model_name='reviewassignment',
-            name='review_request',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.ReviewRequest'),
-        ),
-        migrations.AddField(
-            model_name='reviewassignment',
-            name='reviewer',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Email'),
-        ),
-        migrations.AddField(
-            model_name='reviewassignment',
-            name='state',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ReviewAssignmentStateName'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0010_populate_review_assignments.py b/ietf/review/migrations/0010_populate_review_assignments.py
deleted file mode 100644
index 83f87325bd..0000000000
--- a/ietf/review/migrations/0010_populate_review_assignments.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.18 on 2019-01-04 14:34
-
-
-import sys
-
-from tqdm import tqdm
-
-from django.db import migrations
-
-def assigned_time(model, request):
-    e = model.objects.filter(doc=request.doc, type="assigned_review_request", review_request=request).order_by('-time', '-id').first()
-    return e.time if e and e.time else None
-
-def done_time(model, request):
-    if request.unused_review and request.unused_review.time:
-        return request.unused_review.time
-    e = model.objects.filter(doc=request.doc, type="closed_review_request", review_request=request).order_by('-time', '-id').first()
-    time = e.time if e and e.time else None
-    return time if time else request.time
-
-def map_request_state_to_assignment_state(req_state_id):
-    if req_state_id == 'requested':
-        return 'assigned'
-    elif req_state_id in ('no-review-document', 'no-review-version'):
-        return 'withdrawn'
-    else:
-        return req_state_id
-
-def forward(apps, schema_editor):
-    ReviewRequest = apps.get_model('review', 'ReviewRequest')
-    ReviewAssignment = apps.get_model('review', 'ReviewAssignment')
-    Document = apps.get_model('doc', 'Document')
-    ReviewRequestDocEvent = apps.get_model('doc','ReviewRequestDocEvent')
-    ReviewAssignmentDocEvent = apps.get_model('doc','ReviewAssignmentDocEvent')
-
-    sys.stderr.write('\n') # introduce a newline before tqdm starts writing
-    for request in tqdm(ReviewRequest.objects.exclude(unused_reviewer__isnull=True)):
-        assignment_state = map_request_state_to_assignment_state(request.state_id)
-        if not (assignment_state in ('assigned', 'accepted', 'completed', 'no-response', 'overtaken', 'part-completed', 'rejected', 'withdrawn', 'unknown')):
-            print(("Trouble with review_request",request.pk,"with state",request.state_id))
-            exit(-1)
-        ReviewAssignment.objects.create(
-            review_request = request,
-            state_id = assignment_state,
-            reviewer = request.unused_reviewer,
-            assigned_on = assigned_time(ReviewRequestDocEvent, request),
-            completed_on = done_time(ReviewRequestDocEvent, request),
-            review = request.unused_review,
-            reviewed_rev = request.unused_reviewed_rev,
-            result = request.unused_result,
-            mailarch_url = request.unused_review and request.unused_review.external_url,
-        )
-    Document.objects.filter(type_id='review').update(external_url='')
-    ReviewRequest.objects.filter(state_id__in=('accepted', 'rejected', 'no-response', 'part-completed', 'completed', 'unknown')).update(state_id='assigned')
-    ReviewRequest.objects.filter(state_id='requested',unused_reviewer__isnull=False).update(state_id='assigned')
-
-    for req_event in tqdm(ReviewRequestDocEvent.objects.filter(type="assigned_review_request",review_request__unused_reviewer__isnull=False)):
-        ReviewAssignmentDocEvent.objects.create(
-            time = req_event.time,
-            type = req_event.type,
-            by = req_event.by,
-            doc = req_event.doc,
-            rev = req_event.rev,
-            desc = req_event.desc,
-            review_assignment = req_event.review_request.reviewassignment_set.first(),
-            state_id = 'assigned'
-        )
-
-    for req_event in tqdm(ReviewRequestDocEvent.objects.filter(type="closed_review_request", 
-                                                               state_id__in=('completed', 'no-response', 'part-completed', 'rejected', 'unknown', 'withdrawn'),
-                                                               review_request__unused_reviewer__isnull=False)):
-        ReviewAssignmentDocEvent.objects.create(
-            time = req_event.time,
-            type = req_event.type,
-            by = req_event.by,
-            doc = req_event.doc,
-            rev = req_event.rev,
-            desc = req_event.desc,
-            review_assignment = req_event.review_request.reviewassignment_set.first(),
-            state_id = req_event.state_id
-        )
-
-    ReviewRequestDocEvent.objects.filter(type="closed_review_request", 
-                                         state_id__in=('completed', 'no-response', 'part-completed', 'rejected', 'unknown', 'withdrawn'),
-                                         review_request__unused_reviewer__isnull=False).delete()
-
-
-def reverse(apps, schema_editor):
-    ReviewAssignment = apps.get_model('review', 'ReviewAssignment')
-    ReviewRequestDocEvent = apps.get_model('doc','ReviewRequestDocEvent')
-    ReviewAssignmentDocEvent = apps.get_model('doc','ReviewAssignmentDocEvent')
-
-    sys.stderr.write('\n')
-    for assignment in tqdm(ReviewAssignment.objects.all()):
-        if assignment.review_request.unused_review:
-            assignment.review_request.unused_review.external_url = assignment.mailarch_url
-            assignment.review_request.unused_review.save()
-        assignment.review_request.state_id = assignment.state_id
-        assignment.review_request.save()
-
-    for asgn_event in tqdm(ReviewAssignmentDocEvent.objects.filter(state_id__in=('completed', 'no-response', 'part-completed', 'rejected', 'unknown', 'withdrawn'))):
-        ReviewRequestDocEvent.objects.create(
-            time = asgn_event.time,
-            type = asgn_event.type,
-            by = asgn_event.by,
-            doc = asgn_event.doc,
-            rev = asgn_event.rev,
-            desc = asgn_event.desc,
-            review_request = asgn_event.review_assignment.review_request,
-            state_id = asgn_event.state_id            
-        )
-    ReviewAssignmentDocEvent.objects.all().delete()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0009_refactor_review_request'),
-        ('doc','0011_reviewassignmentdocevent')
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/review/migrations/0011_review_document2_fk.py b/ietf/review/migrations/0011_review_document2_fk.py
deleted file mode 100644
index 1fca4fd4e8..0000000000
--- a/ietf/review/migrations/0011_review_document2_fk.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 11:58
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0015_1_add_fk_to_document_id'),
-        ('review', '0010_populate_review_assignments'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='reviewrequest',
-            name='doc2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reviewrequest_set', to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='reviewwish',
-            name='doc2',
-            field=ietf.utils.models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field=b'id'),
-        ),
-        migrations.AddField(
-            model_name='reviewrequest',
-            name='unused_review2',
-            field=ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='id'),
-        ),
-        migrations.AddField(
-            model_name='reviewassignment',
-            name='review2',
-            field=ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='id'),
-        ),
-        migrations.AlterField(
-            model_name='reviewrequest',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_revreq', to='doc.Document', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='reviewwish',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='old_revwish', to='doc.Document', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='reviewrequest',
-            name='unused_review',
-            field=ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='old_unused_review', to='doc.Document', to_field=b'name'),
-        ),
-        migrations.AlterField(
-            model_name='reviewassignment',
-            name='review',
-            field=ietf.utils.models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='old_reviewassignment', to='doc.Document', to_field=b'name'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0012_remove_old_document_field.py b/ietf/review/migrations/0012_remove_old_document_field.py
deleted file mode 100644
index 2c5b5c2776..0000000000
--- a/ietf/review/migrations/0012_remove_old_document_field.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-20 09:53
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0011_review_document2_fk'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='reviewrequest',
-            name='doc',
-        ),
-        migrations.RemoveField(
-            model_name='reviewrequest',
-            name='unused_reviewer',
-        ),
-        migrations.RemoveField(
-            model_name='reviewrequest',
-            name='unused_review',
-        ),
-        migrations.RemoveField(
-            model_name='reviewrequest',
-            name='unused_review2',
-        ),
-        migrations.RemoveField(
-            model_name='reviewrequest',
-            name='unused_reviewed_rev',
-        ),
-        migrations.RemoveField(
-            model_name='reviewrequest',
-            name='unused_result',
-        ),
-        migrations.RemoveField(
-            model_name='reviewwish',
-            name='doc',
-        ),
-        migrations.RemoveField(
-            model_name='reviewassignment',
-            name='review',
-        ),
-    ]
diff --git a/ietf/review/migrations/0013_rename_field_document2.py b/ietf/review/migrations/0013_rename_field_document2.py
deleted file mode 100644
index 0577b0d31c..0000000000
--- a/ietf/review/migrations/0013_rename_field_document2.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-21 05:31
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0019_rename_field_document2'),
-        ('review', '0012_remove_old_document_field'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='reviewrequest',
-            old_name='doc2',
-            new_name='doc',
-        ),
-        migrations.RenameField(
-            model_name='reviewwish',
-            old_name='doc2',
-            new_name='doc',
-        ),
-        migrations.RenameField(
-            model_name='reviewassignment',
-            old_name='review2',
-            new_name='review',
-        ),
-    ]
diff --git a/ietf/review/migrations/0014_document_primary_key_cleanup.py b/ietf/review/migrations/0014_document_primary_key_cleanup.py
deleted file mode 100644
index 20c28ace6d..0000000000
--- a/ietf/review/migrations/0014_document_primary_key_cleanup.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-06-10 03:47
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0013_rename_field_document2'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='reviewrequest',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviewrequest_set', to='doc.Document'),
-        ),
-        migrations.AlterField(
-            model_name='reviewwish',
-            name='doc',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0015_populate_completed_on_for_rejected.py b/ietf/review/migrations/0015_populate_completed_on_for_rejected.py
deleted file mode 100644
index feed8ea1c7..0000000000
--- a/ietf/review/migrations/0015_populate_completed_on_for_rejected.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.24 on 2019-09-30 08:17
-
-
-from django.db import migrations
-
-def forward(apps, schema_editor):
-    ReviewAssignmentDocEvent = apps.get_model('doc','ReviewAssignmentDocEvent')
-    for event in ReviewAssignmentDocEvent.objects.filter(type="closed_review_assignment",state_id='rejected',review_assignment__completed_on__isnull=True):
-        event.review_assignment.completed_on = event.time
-        event.review_assignment.save()
-
-
-def reverse(apps, schema_editor):
-    # There's no harm in leaving the newly set completed_on values even if this is rolled back
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0014_document_primary_key_cleanup'),
-        ('doc', '0026_add_draft_rfceditor_state'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/review/migrations/0016_add_remind_days_open_reviews.py b/ietf/review/migrations/0016_add_remind_days_open_reviews.py
deleted file mode 100644
index 57e9911475..0000000000
--- a/ietf/review/migrations/0016_add_remind_days_open_reviews.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.23 on 2019-09-05 05:03
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0015_populate_completed_on_for_rejected'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='historicalreviewersettings',
-            name='remind_days_open_reviews',
-            field=models.PositiveIntegerField(blank=True, name="Periodic reminder of open reviews every X days", help_text="To get a periodic email reminder of all your open reviews, enter the number of days between these reminders. Clear the field if you don't want these reminders.", null=True),
-        ),
-        migrations.AddField(
-            model_name='reviewersettings',
-            name='remind_days_open_reviews',
-            field=models.PositiveIntegerField(blank=True, verbose_name="Periodic reminder of open reviews every X days", help_text="To get a periodic email reminder of all your open reviews, enter the number of days between these reminders. Clear the field if you don't want these reminders.", null=True),
-        ),
-    ]
diff --git a/ietf/review/migrations/0017_add_review_team_remind_days_unconfirmed_assignments.py b/ietf/review/migrations/0017_add_review_team_remind_days_unconfirmed_assignments.py
deleted file mode 100644
index af48a42435..0000000000
--- a/ietf/review/migrations/0017_add_review_team_remind_days_unconfirmed_assignments.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.23 on 2019-10-01 04:40
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0016_add_remind_days_open_reviews'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='reviewteamsettings',
-            name='remind_days_unconfirmed_assignments',
-            field=models.PositiveIntegerField(blank=True, help_text="To send a periodic email reminder to reviewers of review assignments that are not accepted yet, enter the number of days between these reminders. Clear the field if you don't want these reminders to be sent.", null=True, verbose_name='Periodic reminder of not yet accepted or rejected review assignments to reviewer every X days'),
-        ),
-
-    ]
diff --git a/ietf/review/migrations/0018_auto_20191015_1014.py b/ietf/review/migrations/0018_auto_20191015_1014.py
deleted file mode 100644
index f61c755024..0000000000
--- a/ietf/review/migrations/0018_auto_20191015_1014.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-15 10:14
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0017_add_review_team_remind_days_unconfirmed_assignments'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='remind_days_before_deadline',
-            field=models.IntegerField(blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want this reminder.", null=True),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='remind_days_open_reviews',
-            field=models.PositiveIntegerField(blank=True, help_text="To get a periodic email reminder of all your open reviews, enter the number of days between these reminders. Clear the field if you don't want these reminders.", null=True, verbose_name='Periodic reminder of open reviews every X days'),
-        ),
-        migrations.AlterField(
-            model_name='reviewersettings',
-            name='remind_days_before_deadline',
-            field=models.IntegerField(blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want this reminder.", null=True),
-        ),
-        migrations.AlterField(
-            model_name='reviewteamsettings',
-            name='remind_days_unconfirmed_assignments',
-            field=models.PositiveIntegerField(blank=True, help_text="To send a periodic email reminder to reviewers of review assignments they have neither accepted nor rejected, enter the number of days between these reminders. Clear the field if you don't want these reminders to be sent.", null=True, verbose_name='Periodic reminder of not yet accepted or rejected review assignments to reviewer every X days'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0019_auto_20191023_0829.py b/ietf/review/migrations/0019_auto_20191023_0829.py
deleted file mode 100644
index c5e84573c1..0000000000
--- a/ietf/review/migrations/0019_auto_20191023_0829.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.25 on 2019-10-23 08:29
-
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0018_auto_20191015_1014'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='unavailableperiod',
-            name='start_date',
-            field=models.DateField(default=datetime.date.today, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.", null=True),
-        ),
-    ]
diff --git a/ietf/review/migrations/0020_auto_20191115_2059.py b/ietf/review/migrations/0020_auto_20191115_2059.py
deleted file mode 100644
index 025e3d2d32..0000000000
--- a/ietf/review/migrations/0020_auto_20191115_2059.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.26 on 2019-11-15 20:59
-
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0019_auto_20191023_0829'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='reviewsecretarysettings',
-            name='days_to_show_in_reviewer_list',
-            field=models.IntegerField(blank=True, help_text='Maximum number of days to show in reviewer list for completed items.', null=True),
-        ),
-        migrations.AddField(
-            model_name='reviewsecretarysettings',
-            name='max_items_to_show_in_reviewer_list',
-            field=models.IntegerField(blank=True, help_text='Maximum number of completed items to show for one reviewer in the reviewer list view, the list is also filtered by the days to show in reviews list setting.', null=True),
-        ),
-    ]
diff --git a/ietf/review/migrations/0021_add_additional_history.py b/ietf/review/migrations/0021_add_additional_history.py
deleted file mode 100644
index 58dc709ec8..0000000000
--- a/ietf/review/migrations/0021_add_additional_history.py
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.23 on 2019-11-19 04:36
-
-
-import datetime
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-import ietf.utils.validators
-import simple_history.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('person', '0009_auto_20190118_0725'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('doc', '0026_add_draft_rfceditor_state'),
-        ('name', '0007_fix_m2m_slug_id_length'),
-        ('group', '0019_rename_field_document2'),
-        ('review', '0020_auto_20191115_2059'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='HistoricalReviewAssignment',
-            fields=[
-                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
-                ('history_change_reason', models.TextField(null=True)),
-                ('assigned_on', models.DateTimeField(blank=True, null=True)),
-                ('completed_on', models.DateTimeField(blank=True, null=True)),
-                ('reviewed_rev', models.CharField(blank=True, max_length=16, verbose_name='reviewed revision')),
-                ('mailarch_url', models.URLField(blank=True, null=True)),
-                ('history_id', models.AutoField(primary_key=True, serialize=False)),
-                ('history_date', models.DateTimeField()),
-                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
-                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
-                ('result', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.ReviewResultName')),
-                ('review', models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='doc.Document')),
-            ],
-            options={
-                'verbose_name': 'historical review assignment',
-                'ordering': ('-history_date', '-history_id'),
-                'get_latest_by': 'history_date',
-            },
-            bases=(simple_history.models.HistoricalChanges, models.Model),
-        ),
-        migrations.CreateModel(
-            name='HistoricalReviewRequest',
-            fields=[
-                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
-                ('history_change_reason', models.TextField(null=True)),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('deadline', models.DateField()),
-                ('requested_rev', models.CharField(blank=True, help_text='Fill in if a specific revision is to be reviewed, e.g. 02', max_length=16, verbose_name='requested revision')),
-                ('comment', models.TextField(blank=True, default='', help_text='Provide any additional information to show to the review team secretary and reviewer', max_length=2048, verbose_name="Requester's comments and instructions")),
-                ('history_id', models.AutoField(primary_key=True, serialize=False)),
-                ('history_date', models.DateTimeField()),
-                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
-                ('doc', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='doc.Document')),
-                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
-                ('requested_by', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Person')),
-                ('state', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.ReviewRequestStateName')),
-                ('team', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group')),
-                ('type', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.ReviewTypeName')),
-            ],
-            options={
-                'verbose_name': 'historical review request',
-                'ordering': ('-history_date', '-history_id'),
-                'get_latest_by': 'history_date',
-            },
-            bases=(simple_history.models.HistoricalChanges, models.Model),
-        ),
-        migrations.CreateModel(
-            name='HistoricalUnavailablePeriod',
-            fields=[
-                ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')),
-                ('history_change_reason', models.TextField(null=True)),
-                ('start_date', models.DateField(default=datetime.date.today, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.", null=True)),
-                ('end_date', models.DateField(blank=True, help_text='Leaving the end date blank means that the period continues indefinitely. You can end it later.', null=True)),
-                ('availability', models.CharField(choices=[('canfinish', 'Can do follow-ups'), ('unavailable', 'Completely unavailable')], max_length=30)),
-                ('reason', models.TextField(blank=True, default='', help_text="Provide (for the secretary's benefit) the reason why the review is unavailable", max_length=2048, verbose_name='Reason why reviewer is unavailable (Optional)')),
-                ('history_id', models.AutoField(primary_key=True, serialize=False)),
-                ('history_date', models.DateTimeField()),
-                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
-                ('history_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
-                ('person', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Person')),
-                ('team', ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group')),
-            ],
-            options={
-                'verbose_name': 'historical unavailable period',
-                'ordering': ('-history_date', '-history_id'),
-                'get_latest_by': 'history_date',
-            },
-            bases=(simple_history.models.HistoricalChanges, models.Model),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='expertise',
-            field=models.TextField(blank=True, default='', help_text="Describe the reviewer's expertise in this team's area", max_length=2048, verbose_name="Reviewer's expertise in this team's area"),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='filter_re',
-            field=models.CharField(blank=True, help_text='Draft names matching this regular expression should not be assigned', max_length=255, validators=[ietf.utils.validators.RegexStringValidator()], verbose_name='Filter regexp'),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='min_interval',
-            field=models.IntegerField(blank=True, choices=[(7, 'Once per week'), (14, 'Once per fortnight'), (30, 'Once per month'), (61, 'Once per two months'), (91, 'Once per quarter')], null=True, verbose_name='Can review at most'),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='remind_days_before_deadline',
-            field=models.IntegerField(blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want this reminder.", null=True),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='remind_days_open_reviews',
-            field=models.PositiveIntegerField(blank=True, help_text="To get a periodic email reminder of all your open reviews, enter the number of days between these reminders. Clear the field if you don't want these reminders.", null=True, verbose_name='Periodic reminder of open reviews every X days'),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='skip_next',
-            field=models.IntegerField(default=0, verbose_name='Skip next assignments'),
-        ),
-        migrations.AlterField(
-            model_name='reviewassignment',
-            name='reviewed_rev',
-            field=models.CharField(blank=True, max_length=16, verbose_name='reviewed revision'),
-        ),
-        migrations.AlterField(
-            model_name='reviewersettings',
-            name='expertise',
-            field=models.TextField(blank=True, default='', help_text="Describe the reviewer's expertise in this team's area", max_length=2048, verbose_name="Reviewer's expertise in this team's area"),
-        ),
-        migrations.AlterField(
-            model_name='reviewersettings',
-            name='filter_re',
-            field=models.CharField(blank=True, help_text='Draft names matching this regular expression should not be assigned', max_length=255, validators=[ietf.utils.validators.RegexStringValidator()], verbose_name='Filter regexp'),
-        ),
-        migrations.AlterField(
-            model_name='reviewersettings',
-            name='min_interval',
-            field=models.IntegerField(blank=True, choices=[(7, 'Once per week'), (14, 'Once per fortnight'), (30, 'Once per month'), (61, 'Once per two months'), (91, 'Once per quarter')], null=True, verbose_name='Can review at most'),
-        ),
-        migrations.AlterField(
-            model_name='reviewersettings',
-            name='remind_days_before_deadline',
-            field=models.IntegerField(blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want this reminder.", null=True),
-        ),
-        migrations.AlterField(
-            model_name='reviewersettings',
-            name='skip_next',
-            field=models.IntegerField(default=0, verbose_name='Skip next assignments'),
-        ),
-        migrations.AlterField(
-            model_name='reviewrequest',
-            name='comment',
-            field=models.TextField(blank=True, default='', help_text='Provide any additional information to show to the review team secretary and reviewer', max_length=2048, verbose_name="Requester's comments and instructions"),
-        ),
-        migrations.AlterField(
-            model_name='reviewrequest',
-            name='requested_rev',
-            field=models.CharField(blank=True, help_text='Fill in if a specific revision is to be reviewed, e.g. 02', max_length=16, verbose_name='requested revision'),
-        ),
-        migrations.AlterField(
-            model_name='reviewsecretarysettings',
-            name='remind_days_before_deadline',
-            field=models.IntegerField(blank=True, help_text="To get an email reminder in case a reviewer forgets to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.", null=True),
-        ),
-        migrations.AlterField(
-            model_name='reviewteamsettings',
-            name='autosuggest',
-            field=models.BooleanField(default=True, verbose_name='Automatically suggest possible review requests'),
-        ),
-        migrations.AlterField(
-            model_name='reviewteamsettings',
-            name='remind_days_unconfirmed_assignments',
-            field=models.PositiveIntegerField(blank=True, help_text="To send a periodic email reminder to reviewers of review assignments they have neither accepted nor rejected, enter the number of days between these reminders. Clear the field if you don't want these reminders to be sent.", null=True, verbose_name='Periodic reminder of not yet accepted or rejected review assignments to reviewer every X days'),
-        ),
-        migrations.AlterField(
-            model_name='reviewteamsettings',
-            name='secr_mail_alias',
-            field=models.CharField(blank=True, help_text='Email alias for all of the review team secretaries', max_length=255, verbose_name='Email alias for all of the review team secretaries'),
-        ),
-        migrations.AlterField(
-            model_name='unavailableperiod',
-            name='availability',
-            field=models.CharField(choices=[('canfinish', 'Can do follow-ups'), ('unavailable', 'Completely unavailable')], max_length=30),
-        ),
-        migrations.AlterField(
-            model_name='unavailableperiod',
-            name='end_date',
-            field=models.DateField(blank=True, help_text='Leaving the end date blank means that the period continues indefinitely. You can end it later.', null=True),
-        ),
-        migrations.AlterField(
-            model_name='unavailableperiod',
-            name='reason',
-            field=models.TextField(blank=True, default='', help_text="Provide (for the secretary's benefit) the reason why the review is unavailable", max_length=2048, verbose_name='Reason why reviewer is unavailable (Optional)'),
-        ),
-        migrations.AlterField(
-            model_name='unavailableperiod',
-            name='start_date',
-            field=models.DateField(default=datetime.date.today, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.", null=True),
-        ),
-        migrations.AddField(
-            model_name='historicalreviewassignment',
-            name='review_request',
-            field=ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='review.ReviewRequest'),
-        ),
-        migrations.AddField(
-            model_name='historicalreviewassignment',
-            name='reviewer',
-            field=ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='person.Email'),
-        ),
-        migrations.AddField(
-            model_name='historicalreviewassignment',
-            name='state',
-            field=ietf.utils.models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='name.ReviewAssignmentStateName'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0022_reviewer_queue_policy_and_request_assignment_next.py b/ietf/review/migrations/0022_reviewer_queue_policy_and_request_assignment_next.py
deleted file mode 100644
index 9d705ea143..0000000000
--- a/ietf/review/migrations/0022_reviewer_queue_policy_and_request_assignment_next.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.23 on 2019-11-18 08:50
-
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0008_reviewerqueuepolicyname'),
-        ('review', '0021_add_additional_history'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='reviewteamsettings',
-            name='reviewer_queue_policy',
-            field=models.ForeignKey(default='RotateAlphabetically', on_delete=django.db.models.deletion.PROTECT, to='name.ReviewerQueuePolicyName'),
-        ),
-        migrations.AddField(
-            model_name='historicalreviewersettings',
-            name='request_assignment_next',
-            field=models.BooleanField(default=False,
-                                      help_text='If you would like to be assigned to a review as soon as possible, select this option. It is automatically reset once you receive any assignment.',
-                                      verbose_name='Select me next for an assignment'),
-        ),
-        migrations.AddField(
-            model_name='reviewersettings',
-            name='request_assignment_next',
-            field=models.BooleanField(default=False,
-                                      help_text='If you would like to be assigned to a review as soon as possible, select this option. It is automatically reset once you receive any assignment.',
-                                      verbose_name='Select me next for an assignment'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0023_historicalreviewersettings_change_reason_text_field.py b/ietf/review/migrations/0023_historicalreviewersettings_change_reason_text_field.py
deleted file mode 100644
index 543fa34517..0000000000
--- a/ietf/review/migrations/0023_historicalreviewersettings_change_reason_text_field.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright The IETF Trust 2020, All Rights Reserved
-# Generated by Django 1.11.26 on 2019-12-21 11:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0022_reviewer_queue_policy_and_request_assignment_next'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='history_change_reason',
-            field=models.TextField(null=True),
-        ),
-    ]
diff --git a/ietf/review/migrations/0024_auto_20200520_0017.py b/ietf/review/migrations/0024_auto_20200520_0017.py
deleted file mode 100644
index 1b1cba31fe..0000000000
--- a/ietf/review/migrations/0024_auto_20200520_0017.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Generated by Django 2.0.13 on 2020-05-20 00:17
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0023_historicalreviewersettings_change_reason_text_field'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='team',
-            field=ietf.utils.models.ForeignKey(blank=True, db_constraint=False, limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group'),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewrequest',
-            name='team',
-            field=ietf.utils.models.ForeignKey(blank=True, db_constraint=False, limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group'),
-        ),
-        migrations.AlterField(
-            model_name='historicalunavailableperiod',
-            name='team',
-            field=ietf.utils.models.ForeignKey(blank=True, db_constraint=False, limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='group.Group'),
-        ),
-        migrations.AlterField(
-            model_name='nextreviewerinteam',
-            name='team',
-            field=ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AlterField(
-            model_name='reviewersettings',
-            name='team',
-            field=ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AlterField(
-            model_name='reviewrequest',
-            name='team',
-            field=ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AlterField(
-            model_name='reviewsecretarysettings',
-            name='team',
-            field=ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AlterField(
-            model_name='reviewwish',
-            name='team',
-            field=ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-        migrations.AlterField(
-            model_name='unavailableperiod',
-            name='team',
-            field=ietf.utils.models.ForeignKey(limit_choices_to=models.Q(_negated=True, reviewteamsettings=None), on_delete=django.db.models.deletion.CASCADE, to='group.Group'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0025_repair_assignments.py b/ietf/review/migrations/0025_repair_assignments.py
deleted file mode 100644
index 6f727255e7..0000000000
--- a/ietf/review/migrations/0025_repair_assignments.py
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright The IETF Trust 2020 All Rights Reserved
-
-import os
-
-from django.conf import settings
-from django.db import migrations
-
-
-class Helper(object):
-
-    def __init__(self, review_path, comments_by, document_class):
-        self.review_path = review_path
-        self.comments_by = comments_by
-        self.document_class = document_class
-
-    def remove_file(self,name):
-        filename = os.path.join(self.review_path, '{}.txt'.format(name))
-        os.remove(filename)
-
-    def rename_file(self, old_name, new_name):
-        old_filename = os.path.join(self.review_path, '{}.txt'.format(old_name))
-        new_filename = os.path.join(self.review_path, '{}.txt'.format(new_name))
-        os.rename(old_filename, new_filename)
-
-    def add_comment(self, name, comment):
-        doc = self.document_class.objects.get(name=name)
-        doc.docevent_set.create(
-            type = 'added_comment',
-            by = self.comments_by,
-            rev = doc.rev,
-            desc = comment,
-        )
-
-def forward(apps, schema_editor):
-    ReviewAssignment = apps.get_model('review','ReviewAssignment')
-    Document = apps.get_model('doc','Document')
-    Person = apps.get_model('person','Person')
-
-    # The calculation of review_path makes the assumption that DOCUMENT_PATH_PATTERN only uses 
-    # things that are invariant for review documents. For production, as of this commit, that's 
-    # DOCUMENT_PATH_PATTERN = '/a/www/ietf-ftp/{doc.type_id}/'
-
-    helper = Helper(
-        review_path = settings.DOCUMENT_PATH_PATTERN.format(doc=Document.objects.filter(type_id='review').last()),
-        comments_by = Person.objects.get(name='(System)'),
-        document_class = Document,
-    )
-
-    # review-allan-5g-fmc-encapsulation-04-tsvart-lc-black is a double-submit
-    # In [120]: for d in Document.objects.filter(name__contains='review-allan-5g-fmc-encapsulation-04-tsvart
-    #      ...: ').order_by('name'):
-    #      ...:     print(d.name, d.time)
-    #      ...:
-    # review-allan-5g-fmc-encapsulation-04-tsvart-lc-black-2020-06-30 2020-06-30 11:06:30
-    # review-allan-5g-fmc-encapsulation-04-tsvart-lc-black-2020-06-30-2 2020-06-30 11:06:30
-    # (I've put some more detail below on this as my understanding of double-submit improved)
-    # The recommendation is to point the reviewassignment at the first submission, and delete the -2.
-    #   
-    a = ReviewAssignment.objects.get(review_request__doc__name='draft-allan-5g-fmc-encapsulation', review_request__team__acronym='tsvart')
-    a.review = Document.objects.get(name='review-allan-5g-fmc-encapsulation-04-tsvart-lc-black-2020-06-30')
-    a.save()
-    Document.objects.filter(name='review-allan-5g-fmc-encapsulation-04-tsvart-lc-black-2020-06-30-2').delete()
-    helper.remove_file('review-allan-5g-fmc-encapsulation-04-tsvart-lc-black-2020-06-30-2')
-    helper.add_comment('draft-allan-5g-fmc-encapsulation', 'Removed an unintended duplicate version of the tsvart lc review')
-
-
-    # This one is just simply disconnected. No duplicates or anything to remove.
-    a = ReviewAssignment.objects.get(review_request__doc__name='draft-ietf-6lo-minimal-fragment',review_request__team__acronym='opsdir')
-    r = Document.objects.get(name='review-ietf-6lo-minimal-fragment-09-opsdir-lc-banks-2020-01-31')
-    a.review = r
-    a.state_id = 'completed'
-    a.result_id = 'nits'
-    a.reviewed_rev = '09'
-    a.completed_on = r.time
-    a.save()
-    helper.add_comment('draft-ietf-6lo-minimal-fragment', 'Reconnected opsdir lc review')
-
-    # This review took place when we were spinning up the review tool. I suspect there were bugs at the time that we no longer have insight into.
-    # These two do not exist on disk
-    # review-ietf-6lo-privacy-considerations-04-secdir-lc-kaduk-2016-11-30
-    # review-ietf-6lo-privacy-considerations-04-secdir-lc-kaduk-2016-11-30-2
-    # These are identical except for 0d0a vs 0a and newline at end of file
-    # review-ietf-6lo-privacy-considerations-04-secdir-lc-kaduk-2016-11-30-3
-    # review-ietf-6lo-privacy-considerations-04-secdir-lc-kaduk-2016-12-01
-    # -12-01 is already reachable from the assignment. I suggest:
-    Document.objects.filter(name__startswith='review-ietf-6lo-privacy-considerations-04-secdir-lc-kaduk-2016-11-30').delete()
-    helper.remove_file('review-ietf-6lo-privacy-considerations-04-secdir-lc-kaduk-2016-11-30-3')
-    helper.add_comment('draft-ietf-6lo-privacy-considerations','Removed unintended duplicates of secdir lc review')
-
-    a = ReviewAssignment.objects.get(review_request__doc__name='draft-ietf-bess-nsh-bgp-control-plane',review_request__team__acronym='rtgdir',reviewer__person__name__icontains='singh')
-    r = Document.objects.get(name='review-ietf-bess-nsh-bgp-control-plane-13-rtgdir-lc-singh-2020-01-29')
-    a.review = r
-    a.state_id = 'completed'
-    a.reviewed_rev='13'
-    a.result_id='issues'
-    a.completed_on=r.time
-    a.save()
-    helper.add_comment('draft-ietf-bess-nsh-bgp-control-plane','Reconnected rtgdir lc review')
-
-    # In [121]: for d in Document.objects.filter(name__contains='review-ietf-capport-architecture-08-genart-lc-halpern').order_by('name'):
-    #      ...:     print(d.name, d.time)
-    # review-ietf-capport-architecture-08-genart-lc-halpern-2020-05-16 2020-05-16 15:34:35
-    # review-ietf-capport-architecture-08-genart-lc-halpern-2020-05-16-2 2020-05-16 15:35:55
-    # Not the same as the other double-submits, but likely a failure on the first submit midway through processing that led to the second.
-    # rjsparks@ietfa:/a/www/ietf-ftp/review> ls review-ietf-capport-architecture-08-genart-lc-halpern*
-    # review-ietf-capport-architecture-08-genart-lc-halpern-2020-05-16-2.txt
-    # Only -2 exists on disk
-    # -2 is what is currently pointed to by the review assignment.
-    helper.rename_file('review-ietf-capport-architecture-08-genart-lc-halpern-2020-05-16-2','review-ietf-capport-architecture-08-genart-lc-halpern-2020-05-16')
-    a = ReviewAssignment.objects.get(review_request__doc__name='draft-ietf-capport-architecture',review_request__type_id='lc',reviewer__person__name='Joel M. Halpern')
-    a.review = Document.objects.get(name='review-ietf-capport-architecture-08-genart-lc-halpern-2020-05-16')
-    a.save()
-    Document.objects.filter(name='review-ietf-capport-architecture-08-genart-lc-halpern-2020-05-16-2').delete()    
-    helper.add_comment('draft-ietf-capport-architecture','Removed an unintended duplicate version of the genart lc review')
-    # Any external references to -05-16-2 will now break, but I'm reticent to start down the path of putting something sensical there. 
-    # Right now, any review document not pointed to by a reviewassignment is a database error, and the view code assumes it won't happen. 
-    # We can make it more robust against crashing, but I don't think we should try to adapt the models to model the corruption.
-
-
-    # Opsdir last call review of draft-ietf-cbor-array-tags-07
-    # Got sent to the opsdir list (which is has a private archive) twice - no resulting thread from either
-    # rjsparks@ietfa:/a/www/ietf-ftp/review> ls review-ietf-cbor-array-tags-07-opsdir-lc-dunbar*
-    # review-ietf-cbor-array-tags-07-opsdir-lc-dunbar-2019-08-26-2.txt
-    # review-ietf-cbor-array-tags-07-opsdir-lc-dunbar-2019-08-26.txt
-    # In [122]: for d in Document.objects.filter(name__contains='review-ietf-cbor-array-tags-07-opsdir-lc-dunbar').order_by('name'):
-    #      ...:     print(d.name, d.time)
-    # review-ietf-cbor-array-tags-07-opsdir-lc-dunbar-2019-08-26 2019-08-26 14:13:29
-    # review-ietf-cbor-array-tags-07-opsdir-lc-dunbar-2019-08-26-2 2019-08-26 14:13:29
-    # This is a double-submit.
-    # The ReviewAssignment already points to 08-26
-    Document.objects.filter(name='review-ietf-cbor-array-tags-07-opsdir-lc-dunbar-2019-08-26-2').delete()
-    helper.remove_file('review-ietf-cbor-array-tags-07-opsdir-lc-dunbar-2019-08-26-2')
-    helper.add_comment('draft-ietf-cbor-array-tags','Removed unintended duplicate of opsdir lc review')
-
-    # In [73]: for d in Document.objects.filter(name__startswith='review-ietf-detnet-mpls-over-udp-ip'):
-    #     ...:     print(d.name, d.time)
-    # <snip/>
-    # review-ietf-detnet-mpls-over-udp-ip-06-genart-lc-holmberg-2020-09-01 2020-09-01 13:47:55
-    # review-ietf-detnet-mpls-over-udp-ip-06-genart-lc-holmberg-2020-09-01-2 2020-09-01 13:47:55
-    # review-ietf-detnet-mpls-over-udp-ip-06-opsdir-lc-romascanu-2020-09-03 2020-09-03 02:49:33
-    # review-ietf-detnet-mpls-over-udp-ip-06-opsdir-lc-romascanu-2020-09-03-2 2020-09-03 02:49:33
-    # <snip/>
-    # Both of those are places where the submit button got hit twice in rapid successsion.
-    # Messages went to the list twice. No threads were started
-    # The review assignments currently point to the -2 versions. I think we change them to point to the not -2 versions and delete the -2 version documents.
-    #
-    a = ReviewAssignment.objects.get(review__name='review-ietf-detnet-mpls-over-udp-ip-06-genart-lc-holmberg-2020-09-01-2')
-    a.review = Document.objects.get(name='review-ietf-detnet-mpls-over-udp-ip-06-genart-lc-holmberg-2020-09-01')
-    a.save()
-    Document.objects.filter(name='review-ietf-detnet-mpls-over-udp-ip-06-genart-lc-holmberg-2020-09-01-2').delete()
-    helper.remove_file('review-ietf-detnet-mpls-over-udp-ip-06-genart-lc-holmberg-2020-09-01-2')
-    #
-    a = ReviewAssignment.objects.get(review__name='review-ietf-detnet-mpls-over-udp-ip-06-opsdir-lc-romascanu-2020-09-03-2')
-    a.review = Document.objects.get(name='review-ietf-detnet-mpls-over-udp-ip-06-opsdir-lc-romascanu-2020-09-03')
-    a.save()
-    Document.objects.filter(name='review-ietf-detnet-mpls-over-udp-ip-06-opsdir-lc-romascanu-2020-09-03-2').delete()
-    helper.remove_file('review-ietf-detnet-mpls-over-udp-ip-06-opsdir-lc-romascanu-2020-09-03-2')
-    helper.add_comment('draft-ietf-detnet-mpls-over-udp-ip','Removed unintended duplicate of opsdir and genart lc reviews')
-
-    # This draft had a contentious last call (not because of this review)
-    # rjsparks@ietfa:/a/www/ietf-ftp/review> ls -l review-ietf-dprive-rfc7626-bis-03-genart*
-    # -rw-r--r-- 1 wwwrun www 1087 Dec  4  2019 review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04-2.txt
-    # -rw-r--r-- 1 wwwrun www 1087 Dec  4  2019 review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04-3.txt
-    # -rw-r--r-- 1 wwwrun www 1087 Dec  4  2019 review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04.txt
-    # These files are identical.
-    # In [75]: Document.objects.filter(name__startswith='review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04').values_list('time',flat=True)
-    # Out[75]: <QuerySet [datetime.datetime(2019, 12, 4, 13, 40, 30), datetime.datetime(2019, 12, 4, 13, 40, 30), datetime.datetime(2019, 12, 4, 13, 40, 32)]>
-    # So again, the submit button got hit several times in rapid succession
-    # Interestingly, this was a case where the review was sent to the list first and then Meral told the datatracker about it, so it's only on the list(s) once.
-    # I think we change the assignment to point to 12-04 and delete -2 and -3.
-    a = ReviewAssignment.objects.get(review__name='review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04-3')
-    a.review = Document.objects.get(name='review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04')
-    a.save()
-    Document.objects.filter(name__startswith='review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04-').delete()
-    helper.remove_file('review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04-2')
-    helper.remove_file('review-ietf-dprive-rfc7626-bis-03-genart-lc-shirazipour-2019-12-04-3')
-    helper.add_comment('draft-ietf-dprive-rfc7626-bis','Removed unintended duplicates of genart lc review')
-
-    # In [76]: Document.objects.filter(name__startswith='review-ietf-emu-rfc5448bis-06-secdir-lc-rose')
-    # Out[76]: <QuerySet [<Document: review-ietf-emu-rfc5448bis-06-secdir-lc-rose-2020-01-27>, <Document: review-ietf-emu-rfc5448bis-06-secdir-lc-rose-2020-02-06>]>
-    # rjsparks@ietfa:/a/www/ietf-ftp/review> ls review-ietf-emu-rfc5448bis-06-secdir-lc-rose*
-    # review-ietf-emu-rfc5448bis-06-secdir-lc-rose-2020-02-06.txt
-    # review assignment points to 02-06.
-    # Suggest we delete -01-27 Document object. There's nothing matching on disk to remove.
-    Document.objects.filter(name='review-ietf-emu-rfc5448bis-06-secdir-lc-rose-2020-01-27').delete()
-    helper.add_comment('draft-ietf-emu-rfc5448bis','Removed duplicate secdir lc review')
-
-    # rjsparks@ietfa:/a/www/ietf-ftp/review> ls review-ietf-mmusic-t140-usage-data-channel-11-tsvart*
-    # review-ietf-mmusic-t140-usage-data-channel-11-tsvart-lc-scharf-2020-01-28.txt
-    # review-ietf-mmusic-t140-usage-data-channel-11-tsvart-lc-scharf-2020-03-27.txt
-    # The second was derived from the list post, so it has "Reviewer: Michael Scharf Review result: Ready with Nits" added and is reflowed, but is otherwise identical.
-    # In [80]: Document.objects.filter(name__startswith='review-ietf-mmusic-t140-usage
-    #     ...: -data-channel-11-tsvart-lc-scharf')
-    # Out[80]: <QuerySet [<Document: review-ietf-mmusic-t140-usage-data-channel-11-tsvart-lc-scharf-2020-01-28>, <Document: review-ietf-mmusic-t140-usage-data-channel-11-tsvart-lc-scharf-2020-03-27>]>
-    # the 03-27 version was a resubmission by a secretary (Wes). The assignment currently points to 03-07, and it points to the 01-29 (! date there is in UTC) list entry.
-    # 01-29 is in the window of confusion.
-    # Suggest we just delete the -01-28 document object.
-    Document.objects.filter(name='review-ietf-mmusic-t140-usage-data-channel-11-tsvart-lc-scharf-2020-01-28').delete()
-    helper.remove_file('review-ietf-mmusic-t140-usage-data-channel-11-tsvart-lc-scharf-2020-01-28')
-    helper.add_comment('draft-ietf-mmusic-t140-usage-data-channel','Removed duplicate tsvart lc review')
-
-    # In [81]: Document.objects.filter(name__startswith='review-ietf-mpls-spl-terminology-03-opsdir-lc-jaeggli').values_list('time',flat=True)
-    # Out[81]: <QuerySet [datetime.datetime(2020, 8, 15, 16, 38, 37), datetime.datetime(2020, 8, 15, 16, 38, 37)]>
-    # Another double-submit.
-    # The review assignment already points to -08-15. Suggest we delete -08-15-2
-    Document.objects.filter(name='review-ietf-mpls-spl-terminology-03-opsdir-lc-jaeggli-2020-08-15-2').delete()
-    helper.remove_file('review-ietf-mpls-spl-terminology-03-opsdir-lc-jaeggli-2020-08-15-2')
-    helper.add_comment('draft-ietf-mpls-spl-terminology','Removed unintended duplicate opsdir lc review')
-
-
-    # In [82]: Document.objects.filter(name__startswith='review-ietf-netconf-subscribed-notifications-23-rtgdir').values_list('time',flat=True)
-    # Out[82]: <QuerySet [datetime.datetime(2019, 4, 16, 3, 45, 4), datetime.datetime(2019, 4, 16, 3, 45, 6)]>
-    # Another double-submit. This time the second won and the review assignments points to -2. I suggest we change it to point to the base and delete -2.
-    a = ReviewAssignment.objects.get(review__name='review-ietf-netconf-subscribed-notifications-23-rtgdir-lc-singh-2019-04-16-2')
-    a.review = Document.objects.get(name='review-ietf-netconf-subscribed-notifications-23-rtgdir-lc-singh-2019-04-16')
-    a.save()
-    Document.objects.filter(name='review-ietf-netconf-subscribed-notifications-23-rtgdir-lc-singh-2019-04-16-2').delete()
-    helper.remove_file('review-ietf-netconf-subscribed-notifications-23-rtgdir-lc-singh-2019-04-16-2')
-    helper.add_comment('draft-ietf-netconf-subscribed-notifications','Removed unintended duplicate rtgdir lc review')
-
-    # In [84]: Document.objects.filter(name__contains='ietf-netconf-yang-push-22-genart-lc-bryant').values_list('time',flat=True)
-    # Out[84]: <QuerySet [datetime.datetime(2019, 4, 10, 13, 40, 41), datetime.datetime(2019, 4, 10, 13, 40, 41)]>
-    # In [85]: ReviewAssignment.objects.get(review__name__contains='ietf-netconf-yang-
-    #     ...: push-22-genart-lc-bryant').review
-    # Out[85]: <Document: review-ietf-netconf-yang-push-22-genart-lc-bryant-2019-04-10-2>
-    # Same as above.
-    a = ReviewAssignment.objects.get(review__name='review-ietf-netconf-yang-push-22-genart-lc-bryant-2019-04-10-2')
-    a.review = Document.objects.get(name='review-ietf-netconf-yang-push-22-genart-lc-bryant-2019-04-10')
-    a.save()
-    Document.objects.filter(name='review-ietf-netconf-yang-push-22-genart-lc-bryant-2019-04-10-2').delete()
-    helper.remove_file('review-ietf-netconf-yang-push-22-genart-lc-bryant-2019-04-10-2')
-    helper.add_comment('draft-ietf-netconf-yang-push','Removed unintended duplicate genart lc review')
-
-    # In [92]: for d in Document.objects.filter(name__contains='ietf-nfsv4-rpcrdma-cm-pvt-data-06').order_by('name'):
-    #     ...:     print(d.name, d.external_url)
-    #     ...:
-    # review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-genart-lc-nandakumar-2020-01-27 https://mailarchive.ietf.org/arch/msg/gen-art/b'rGU9fbpAGtmz55Rcdfnl9ZsqMIo'
-    # review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-genart-lc-nandakumar-2020-01-30 https://mailarchive.ietf.org/arch/msg/gen-art/rGU9fbpAGtmz55Rcdfnl9ZsqMIo
-    # review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-opsdir-lc-comstedt-2020-01-27 https://mailarchive.ietf.org/arch/msg/ops-dir/b'BjEE4Y0ZDRALgueoS_lbL5U06js'
-    # review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-opsdir-lc-comstedt-2020-02-10 https://mailarchive.ietf.org/arch/msg/ops-dir/BjEE4Y0ZDRALgueoS_lbL5U06js
-    # review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-secdir-lc-sheffer-2020-01-26 https://mailarchive.ietf.org/arch/msg/secdir/hY6OTDbplzp9uONAvEjkcfa-N4A
-    # This straddled the period of confusion.
-    # For genart, Jean completed the review for the reviewer twice
-    # for opsdir the reviewer submitted on different dates.
-    # In both cases, the review only went to the list once, (the links above that are b'<>' are broken anyhow).
-    # rjsparks@ietfa:/a/www/ietf-ftp/review> ls review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-genart-lc-nandakumar*
-    # review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-genart-lc-nandakumar-2020-01-30.txt
-    # rjsparks@ietfa:/a/www/ietf-ftp/review> ls review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-opsdir-lc-comstedt*
-    # review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-opsdir-lc-comstedt-2020-02-10.txt
-    # The review assignment objects point to the ones that are backed by disk files. I suggest we delete the others.
-    Document.objects.filter(name='review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-genart-lc-nandakumar-2020-01-27').delete()
-    Document.objects.filter(name='review-ietf-nfsv4-rpcrdma-cm-pvt-data-06-opsdir-lc-comstedt-2020-01-27').delete()
-    ReviewAssignment.objects.filter(review_request__doc__name='draft-ietf-nfsv4-rpcrdma-cm-pvt-data').exclude(review__type_id='review').delete()
-    helper.add_comment('draft-ietf-nfsv4-rpcrdma-cm-pvt-data','Removed unintended duplicate genart and opsdir lc reviews')
-    
-    # In [101]: ReviewAssignment.objects.filter(review__name__contains='review-ietf-pce-pcep-flowspec-09-tsvart').values_list('review__name',flat=True)
-    # Out[101]: <QuerySet ['review-ietf-pce-pcep-flowspec-09-tsvart-lc-touch-2020-07-03-2']>
-    # In [102]: for d in Document.objects.filter(name__contains='review-ietf-pce-pcep-flowspec-09-tsvart').order_by('name'):
-    #      ...:     print(d.name, d.time)
-    # review-ietf-pce-pcep-flowspec-09-tsvart-lc-touch-2020-07-03 2020-07-03 19:20:49
-    # review-ietf-pce-pcep-flowspec-09-tsvart-lc-touch-2020-07-03-2 2020-07-03 19:20:49
-    # Same as double-submits above. 
-    a = ReviewAssignment.objects.get(review__name='review-ietf-pce-pcep-flowspec-09-tsvart-lc-touch-2020-07-03-2')
-    a.review = Document.objects.get(name='review-ietf-pce-pcep-flowspec-09-tsvart-lc-touch-2020-07-03')
-    a.save()
-    Document.objects.filter(name='review-ietf-pce-pcep-flowspec-09-tsvart-lc-touch-2020-07-03-2').delete()
-    helper.remove_file('review-ietf-pce-pcep-flowspec-09-tsvart-lc-touch-2020-07-03-2')
-    helper.add_comment('draft-ietf-pce-pcep-flowspec','Removed unintended duplicate tsvart lc review')
-
-    # draft-ietf-pim-msdp-yang history is a bit more complicated.
-    # It is currently (23Sep2020) in AUTH48...
-    # There is a combination of secretaries trying to route around the confusion and a reviewer accidentally updating the wrong review.
-    # Everything went to lists.
-    # In [110]: for rq in ReviewRequest.objects.filter(doc__name__contains='ietf-pim-msdp-yang'):
-    #      ...:     print(rq)
-    # Early review on draft-ietf-pim-msdp-yang by YANG Doctors Assigned
-    # Last Call review on draft-ietf-pim-msdp-yang by YANG Doctors Assigned
-    # Last Call review on draft-ietf-pim-msdp-yang by Routing Area Directorate Assigned
-    # Last Call review on draft-ietf-pim-msdp-yang by General Area Review Team (Gen-ART) Overtaken by Events
-    # Last Call review on draft-ietf-pim-msdp-yang by Security Area Directorate Overtaken by Events
-    # Last Call review on draft-ietf-pim-msdp-yang by Ops Directorate Assigned
-    # Last Call review on draft-ietf-pim-msdp-yang by Transport Area Review Team Team Will not Review Document
-    # Telechat review on draft-ietf-pim-msdp-yang by Security Area Directorate Team Will not Review Version
-    # In [107]: for a in ReviewAssignment.objects.filter(review__name__contains='review-ietf-pim-msdp-yang').order_by('review__name'):
-    #      ...:     print (a)
-    # Assignment for Reshad Rahman (Completed) : yangdoctors Early of draft-ietf-pim-msdp-yang
-    # Assignment for Yingzhen Qu (Completed) : rtgdir Last Call of draft-ietf-pim-msdp-yang
-    # Assignment for Reshad Rahman (Completed) : yangdoctors Last Call of draft-ietf-pim-msdp-yang
-    # In [105]: for d in Document.objects.filter(name__contains='review-ietf-pim-msdp-yang').order_by('name'):
-    #      ...:     print(d.name, d.time)
-    # review-ietf-pim-msdp-yang-01-yangdoctors-early-rahman-2018-01-12 2020-02-12 15:00:06
-    # review-ietf-pim-msdp-yang-08-rtgdir-lc-qu-2020-01-20 2020-01-20 15:00:00
-    # review-ietf-pim-msdp-yang-12-secdir-lc-roca-2020-01-29 2020-01-29 00:18:10
-    # review-ietf-pim-msdp-yang-12-yangdoctors-lc-rahman-2020-01-28 2020-01-28 19:05:44
-    # review-ietf-pim-msdp-yang-16-yangdoctors-lc-rahman-2020-03-20 2020-03-20 06:16:25
-    # But
-    # In [113]: for a in ReviewAssignment.objects.filter(review_request__doc__name='draft-ietf-pim-msdp-yang'):
-    #      ...:     print(a)
-    # Assignment for Reshad Rahman (Completed) : yangdoctors Early of draft-ietf-pim-msdp-yang
-    # Assignment for Reshad Rahman (Completed) : yangdoctors Last Call of draft-ietf-pim-msdp-yang
-    # Assignment for Yingzhen Qu (Completed) : rtgdir Last Call of draft-ietf-pim-msdp-yang
-    # Assignment for Meral Shirazipour (No Response) : genart Last Call of draft-ietf-pim-msdp-yang
-    # Assignment for Vincent Roca (No Response) : secdir Last Call of draft-ietf-pim-msdp-yang
-    # Assignment for Shwetha Bhandari (Accepted) : opsdir Last Call of draft-ietf-pim-msdp-yang
-    # So, the secdir assignment that exists needs to have the review added and its state changed.
-    a = ReviewAssignment.objects.get(review_request__doc__name='draft-ietf-pim-msdp-yang',review_request__type_id='lc',reviewer__person__name="Vincent Roca")
-    r = Document.objects.get(name='review-ietf-pim-msdp-yang-12-secdir-lc-roca-2020-01-29')
-    a.review = r
-    a.state_id = 'completed'
-    a.completed_on = r.time
-    a.reviewed_rev = '12'
-    a.save()
-    # A new ReviewAssignment needs to be added to point to the yangdoctor review of -12
-    a16 = ReviewAssignment.objects.get(review__name='review-ietf-pim-msdp-yang-16-yangdoctors-lc-rahman-2020-03-20')
-    r12 = Document.objects.get(name='review-ietf-pim-msdp-yang-12-yangdoctors-lc-rahman-2020-01-28')
-    ReviewAssignment.objects.create(
-        review_request = a16.review_request,
-        state_id = 'completed',
-        reviewer = a16.reviewer,
-        # Intentionally not making up assigned_on
-        completed_on = r12.time,
-        review = r12,
-        reviewed_rev = '12',
-        result_id = 'ready-issues',
-        mailarch_url = r12.external_url,
-    )
-    # The secdir review request state is not the best, but it's not worth changing that history.
-    # Intentionally not changing the state of the opsdir assignment
-    # No suggestions to delete anything here.
-    helper.add_comment('draft-ietf-pim-msdp-yang', 'Reconnected secdir lc review and changed assignment state to completed. Reconnected yangdoctors review of -12.')
-
-    # review-ietf-spring-srv6-network-programming-17-opsdir-lc-romascanu-2020-08-20 2020-08-20 02:43:08
-    # review-ietf-spring-srv6-network-programming-17-opsdir-lc-romascanu-2020-08-20-2 2020-08-20 02:43:08 
-    # Assignment currently points to -2. Another double-submit. Resolve as above.
-    a = ReviewAssignment.objects.get(review__name='review-ietf-spring-srv6-network-programming-17-opsdir-lc-romascanu-2020-08-20-2')
-    a.review = Document.objects.get(name='review-ietf-spring-srv6-network-programming-17-opsdir-lc-romascanu-2020-08-20')
-    a.save()
-    Document.objects.filter(name='review-ietf-spring-srv6-network-programming-17-opsdir-lc-romascanu-2020-08-20-2').delete()
-    helper.remove_file('review-ietf-spring-srv6-network-programming-17-opsdir-lc-romascanu-2020-08-20-2')
-    helper.add_comment('draft-ietf-spring-srv6-network-programming','Removed unintended duplicate opsdir lc review')
-
-    # In [116]: ReviewAssignment.objects.filter(review__name__contains='review-ietf-stir-passport-divert-07-
-    #      ...: opsdir').values_list('review__name',flat=True)
-    # Out[116]: <QuerySet ['review-ietf-stir-passport-divert-07-opsdir-lc-dunbar-2019-12-02-2']>
-    # In [117]: for d in Document.objects.filter(name__contains='review-ietf-stir-passport-divert-07-opsdir').order_by('name'):
-    #      ...:     print(d.name, d.time)
-    # review-ietf-stir-passport-divert-07-opsdir-lc-dunbar-2019-12-02 2019-12-02 14:59:57
-    # review-ietf-stir-passport-divert-07-opsdir-lc-dunbar-2019-12-02-2 2019-12-02 14:59:57
-    # Another double-submit. Same treatment as above.
-    a = ReviewAssignment.objects.get(review__name='review-ietf-stir-passport-divert-07-opsdir-lc-dunbar-2019-12-02-2')
-    a.review = Document.objects.get(name='review-ietf-stir-passport-divert-07-opsdir-lc-dunbar-2019-12-02')
-    a.save()
-    Document.objects.filter(name='review-ietf-stir-passport-divert-07-opsdir-lc-dunbar-2019-12-02-2').delete()
-    helper.remove_file('review-ietf-stir-passport-divert-07-opsdir-lc-dunbar-2019-12-02-2')
-    helper.add_comment('draft-ietf-stir-passport-divert','Removed unintended duplicate opsdir lc review')
-
-    # After the above...
-    # In [57]: for d in Document.objects.filter(type_id='review',reviewassignment__isnull=True):
-    #     ...:     print (d)
-    # review-ietf-dots-architecture-15-tsvart-lc-tuexen-2020-01-27
-    # There are no files on disk matching that and nothing references it. 
-    Document.objects.filter(name='review-ietf-dots-architecture-15-tsvart-lc-tuexen-2020-01-27').delete()
-
-def reverse(apps, schema_editor):
-    # There is no point in trying to return to the broken objects
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0024_auto_20200520_0017'),
-        ('doc','0036_orgs_vs_repos'),
-        ('person','0016_auto_20200807_0750'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/review/migrations/0026_repair_more_assignments.py b/ietf/review/migrations/0026_repair_more_assignments.py
deleted file mode 100644
index 50c24f03be..0000000000
--- a/ietf/review/migrations/0026_repair_more_assignments.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright The IETF Trust 2020 All Rights Reserved
-
-import os
-
-from django.conf import settings
-from django.db import migrations
-
-class Helper(object):
-
-    def __init__(self, review_path, comments_by, document_class):
-        self.review_path = review_path
-        self.comments_by = comments_by
-        self.document_class = document_class
-
-    def remove_file(self,name):
-        filename = os.path.join(self.review_path, '{}.txt'.format(name))
-        os.remove(filename)
-
-    def rename_file(self, old_name, new_name):
-        old_filename = os.path.join(self.review_path, '{}.txt'.format(old_name))
-        new_filename = os.path.join(self.review_path, '{}.txt'.format(new_name))
-        os.rename(old_filename, new_filename)
-
-    def add_comment(self, name, comment):
-        doc = self.document_class.objects.get(name=name)
-        doc.docevent_set.create(
-            type = 'added_comment',
-            by = self.comments_by,
-            rev = doc.rev,
-            desc = comment,
-        )
-
-def forward(apps,schema_editor):
-    Document = apps.get_model('doc','Document')
-    Person = apps.get_model('person','Person')
-
-    # The calculation of review_path makes the assumption that DOCUMENT_PATH_PATTERN only uses 
-    # things that are invariant for review documents. For production, as of this commit, that's 
-    # DOCUMENT_PATH_PATTERN = '/a/www/ietf-ftp/{doc.type_id}/'. There are plans to change that pattern
-    # soon to '/a/ietfdata/doc/{doc.type_id}/'
-
-    helper = Helper(
-        review_path = settings.DOCUMENT_PATH_PATTERN.format(doc=Document.objects.filter(type_id='review').last()),
-        comments_by = Person.objects.get(name='(System)'),
-        document_class = Document,
-    )
-
-    # In [2]: for d in Document.objects.filter(name__startswith='review-ietf-capport-api-07-opsdir'):
-    #    ...:     print(d.name,d.time)
-    # review-ietf-capport-api-07-opsdir-lc-dunbar-2020-05-09 2020-05-09 14:59:40
-    # review-ietf-capport-api-07-opsdir-lc-dunbar-2020-05-09-2 2020-05-09 15:06:44
-    # This is similar to draft-ietf-capport-architecture-08-genart-lc-halpern...
-    # Only -2 exists on disk.
-    # But the Document for ...-2020-05-09 has not type or state - it was very incompletely set up - deleting it results in:
-    # (3,
-    #  {'community.CommunityList_added_docs': 0,
-    #   'community.SearchRule_name_contains_index': 0,
-    #   'doc.RelatedDocument': 0,
-    #   'doc.DocumentAuthor': 0,
-    #   'doc.Document_states': 0,
-    #   'doc.Document_tags': 0,
-    #   'doc.Document_formal_languages': 0,
-    #   'doc.DocumentURL': 0,
-    #   'doc.DocExtResource': 0,
-    #   'doc.DocAlias_docs': 1,
-    #   'doc.DocReminder': 0,
-    #   'group.GroupMilestone_docs': 0,
-    #   'group.GroupMilestoneHistory_docs': 0,
-    #   'liaisons.LiaisonStatementAttachment': 0,
-    #   'meeting.SessionPresentation': 0,
-    #   'message.Message_related_docs': 0,
-    #   'review.ReviewWish': 0,
-    #   'doc.DocEvent': 1,
-    #   'doc.Document': 1})
-    # Repairing that back to remove the -2 will hide more information than simply removing the incompletely set up document object.
-    # But the -2 document currently has no type (see #3145)
-    Document.objects.get(name='review-ietf-capport-api-07-opsdir-lc-dunbar-2020-05-09').delete()
-    review = Document.objects.get(name='review-ietf-capport-api-07-opsdir-lc-dunbar-2020-05-09-2')
-    review.type_id='review'
-    review.save()
-    helper.add_comment('draft-ietf-capport-api','Removed an unintended duplicate version of the opsdir lc review')
-
-def reverse(apps,schema_editor):
-    # There is no point in returning to the broken version
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0025_repair_assignments'),
-        ('doc','0039_auto_20201109_0439'),
-        ('person','0018_auto_20201109_0439'),
-    ]
-
-    operations = [
-            migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/review/migrations/0027_unique_constraint_for_reviewersettings.py b/ietf/review/migrations/0027_unique_constraint_for_reviewersettings.py
deleted file mode 100644
index ecd192e1bc..0000000000
--- a/ietf/review/migrations/0027_unique_constraint_for_reviewersettings.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# Generated by Django 2.2.17 on 2021-01-24 07:24
-
-from django.db import migrations, models
-
-
-
-def forward(apps, schema_editor):
-    """Forward migration
-    
-    Attempts to reconcile and remove duplicate ReviewerSettings
-    """
-    ReviewerSettings = apps.get_model('review', 'ReviewerSettings')
-    HistoricalReviewerSettings = apps.get_model('review', 'HistoricalReviewerSettings')
-
-    def reconcile_duplicate_settings(duplicate_settings, histories):
-        """Helper to decide how to handle duplicate settings"""
-        team = duplicate_settings[0].team
-        person = duplicate_settings[0].person
-        assert(all((s.person == person and s.team == team for s in duplicate_settings)))
-    
-        print('\n>> Found duplicate settings for {}'.format(duplicate_settings[0]))
-        # In the DB as of Dec 2020, the only duplicate settings sets were pairs where the
-        # earlier PK had a change history and the latter PK did not. Based on this, assuming
-        # a change history indicates that the settings are important. If only one has history,
-        # use that one. If multiple have a history, throw an error.
-        settings_with_history = [s for s in duplicate_settings if histories[s.pk].count() > 0]
-        if len(settings_with_history) == 0:
-            duplicate_settings.sort(key=lambda s: s.pk)
-            keep = duplicate_settings[-1]
-            reason = 'chosen by pk'
-        elif len(settings_with_history) == 1:
-            keep = settings_with_history[0]
-            reason = 'chosen because has change history'
-        else:
-            # Don't try to guess what to do if multiple settings have change histories
-            raise RuntimeError(
-                'Multiple ReviewerSettings with change history for {}. Please resolve manually.'.format(
-                    settings_with_history[0]
-                )
-            )
-            
-        print('>>    Keeping pk={} ({})'.format(keep.pk, reason))
-        for settings in duplicate_settings:
-            if settings.pk != keep.pk:
-                print('>>    Deleting pk={}'.format(settings.pk))
-                settings.delete()
-    
-    # forward migration starts here
-    if ReviewerSettings.objects.count() == 0:
-        return  # nothing to do
-
-    records = dict()  # list of records, keyed by (person_id, team_id)
-    for rs in ReviewerSettings.objects.all().order_by('pk'):
-        key = (rs.person_id, rs.team_id)
-        if key in records:
-            records[key].append(rs)
-        else:
-            records[key] = [rs]
-
-    for duplicate_settings in records.values():
-        if len(duplicate_settings) > 1:
-            histories = dict()
-            for ds in duplicate_settings:
-                histories[ds.pk] = HistoricalReviewerSettings.objects.filter(
-                    id=ds.pk
-                )
-            reconcile_duplicate_settings(duplicate_settings, histories)
-
-def reverse(apps, schema_editor):
-    """Reverse migration
-    
-    Does nothing, but no harm in reverse migration.
-    """
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0026_repair_more_assignments'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-        migrations.AddConstraint(
-            model_name='reviewersettings',
-            constraint=models.UniqueConstraint(fields=('team', 'person'), name='unique_reviewer_settings_per_team_person'),
-        ),
-    ]
diff --git a/ietf/review/migrations/0028_auto_20220513_1456.py b/ietf/review/migrations/0028_auto_20220513_1456.py
deleted file mode 100644
index 44cb9ae3b9..0000000000
--- a/ietf/review/migrations/0028_auto_20220513_1456.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Generated by Django 2.2.28 on 2022-05-13 14:56
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0027_unique_constraint_for_reviewersettings'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='historicalreviewassignment',
-            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical review assignment', 'verbose_name_plural': 'historical review assignments'},
-        ),
-        migrations.AlterModelOptions(
-            name='historicalreviewersettings',
-            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical reviewer settings', 'verbose_name_plural': 'historical reviewer settings'},
-        ),
-        migrations.AlterModelOptions(
-            name='historicalreviewrequest',
-            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical review request', 'verbose_name_plural': 'historical review requests'},
-        ),
-        migrations.AlterModelOptions(
-            name='historicalunavailableperiod',
-            options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical unavailable period', 'verbose_name_plural': 'historical unavailable periods'},
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewassignment',
-            name='history_date',
-            field=models.DateTimeField(db_index=True),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewersettings',
-            name='history_date',
-            field=models.DateTimeField(db_index=True),
-        ),
-        migrations.AlterField(
-            model_name='historicalreviewrequest',
-            name='history_date',
-            field=models.DateTimeField(db_index=True),
-        ),
-        migrations.AlterField(
-            model_name='historicalunavailableperiod',
-            name='history_date',
-            field=models.DateTimeField(db_index=True),
-        ),
-    ]
diff --git a/ietf/review/models.py b/ietf/review/models.py
index 96355417d1..d1b50c7117 100644
--- a/ietf/review/models.py
+++ b/ietf/review/models.py
@@ -2,11 +2,10 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
-
 from simple_history.models import HistoricalRecords
 
 from django.db import models
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
@@ -17,6 +16,8 @@
     ReviewAssignmentStateName, ReviewerQueuePolicyName
 from ietf.utils.validators import validate_regular_expression_string
 from ietf.utils.models import ForeignKey, OneToOneField
+from ietf.utils.timezone import date_today
+
 
 class ReviewerSettings(models.Model):
     """Keeps track of admin data associated with a reviewer in a team."""
@@ -33,7 +34,7 @@ class ReviewerSettings(models.Model):
     min_interval = models.IntegerField(verbose_name="Can review at most", choices=INTERVALS, blank=True, null=True)
     filter_re   = models.CharField(max_length=255, verbose_name="Filter regexp", blank=True,
         validators=[validate_regular_expression_string, ],
-        help_text="Draft names matching this regular expression should not be assigned")
+        help_text="Internet-Draft names matching this regular expression should not be assigned")
     skip_next   = models.IntegerField(default=0, verbose_name="Skip next assignments")
     remind_days_before_deadline = models.IntegerField(null=True, blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want this reminder.")
     remind_days_open_reviews = models.PositiveIntegerField(null=True, blank=True, verbose_name="Periodic reminder of open reviews every X days", help_text="To get a periodic email reminder of all your open reviews, enter the number of days between these reminders. Clear the field if you don't want these reminders.")
@@ -66,7 +67,7 @@ class UnavailablePeriod(models.Model):
     history      = HistoricalRecords(history_change_reason_field=models.TextField(null=True))
     team         = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
     person       = ForeignKey(Person)
-    start_date   = models.DateField(default=datetime.date.today, null=True, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.")
+    start_date   = models.DateField(default=date_today, null=True, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.")
     end_date     = models.DateField(blank=True, null=True, help_text="Leaving the end date blank means that the period continues indefinitely. You can end it later.")
     AVAILABILITY_CHOICES = [
         ("canfinish", "Can do follow-ups"),
@@ -80,8 +81,7 @@ class UnavailablePeriod(models.Model):
     reason       = models.TextField(verbose_name="Reason why reviewer is unavailable (Optional)", max_length=2048, blank=True, help_text="Provide (for the secretary's benefit) the reason why the review is unavailable", default='')
 
     def state(self):
-        import datetime
-        today = datetime.date.today()
+        today = date_today()
         if self.start_date is None or self.start_date <= today:
             if not self.end_date or today <= self.end_date:
                 return "active"
@@ -95,7 +95,7 @@ def __str__(self):
 
 class ReviewWish(models.Model):
     """Reviewer wishes to review a document when it becomes available for review."""
-    time        = models.DateTimeField(default=datetime.datetime.now)
+    time        = models.DateTimeField(default=timezone.now)
     team        = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
     person      = ForeignKey(Person)
     doc         = ForeignKey(Document)
@@ -125,7 +125,7 @@ class ReviewRequest(models.Model):
 
     # Fields filled in on the initial record creation - these
     # constitute the request part.
-    time          = models.DateTimeField(default=datetime.datetime.now)
+    time          = models.DateTimeField(default=timezone.now)
     type          = ForeignKey(ReviewTypeName)
     doc           = ForeignKey(Document, related_name='reviewrequest_set')
     team          = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
@@ -143,6 +143,10 @@ def all_completed_assignments_for_doc(self):
     def request_closed_time(self):
         return self.doc.request_closed_time(self) or self.time
 
+    def add_history(self, description):
+        self._change_reason = description
+        self.save()
+
 class ReviewAssignment(models.Model):
     """ One of possibly many reviews assigned in response to a ReviewRequest """
     history        = HistoricalRecords(history_change_reason_field=models.TextField(null=True))
@@ -191,6 +195,7 @@ class ReviewTeamSettings(models.Model):
     """Holds configuration specific to groups that are review teams"""
     group = OneToOneField(Group)
     autosuggest = models.BooleanField(default=True, verbose_name="Automatically suggest possible review requests")
+    allow_reviewer_to_reject_after_deadline = models.BooleanField(default=False, verbose_name="Allow reviewer to reject request after deadline.")
     reviewer_queue_policy = models.ForeignKey(ReviewerQueuePolicyName, default='RotateAlphabetically', on_delete=models.PROTECT)
     review_types = models.ManyToManyField(ReviewTypeName, default=get_default_review_types)
     review_results = models.ManyToManyField(ReviewResultName, default=get_default_review_results, related_name='reviewteamsettings_review_results_set')
diff --git a/ietf/review/policies.py b/ietf/review/policies.py
index 8799cd3d50..91398a1b24 100644
--- a/ietf/review/policies.py
+++ b/ietf/review/policies.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2019-2021, All Rights Reserved
+# Copyright The IETF Trust 2019-2023, All Rights Reserved
 
 
 import re
@@ -7,9 +7,10 @@
 from django.utils import timezone
 from simple_history.utils import bulk_update_with_history
 
-from ietf.doc.models import DocumentAuthor, DocAlias
+from ietf.doc.models import DocumentAuthor
 from ietf.doc.utils import extract_complete_replaces_ancestor_mapping_for_docs
 from ietf.group.models import Role
+from ietf.name.models import ReviewAssignmentStateName
 from ietf.person.models import Person
 import debug                            # pyflakes:ignore
 from ietf.review.models import NextReviewerInTeam, ReviewerSettings, ReviewWish, ReviewRequest, \
@@ -23,7 +24,7 @@
 """
 This file contains policies regarding reviewer queues.
 The policies are documented in more detail on:
-https://trac.ietf.org/trac/ietfdb/wiki/ReviewerQueuePolicy
+https://github.com/ietf-tools/datatracker/wiki/ReviewerQueuePolicy
 Terminology used here should match terminology used in that document.
 """
 
@@ -55,8 +56,6 @@ def persons_with_previous_review(team, review_req, possible_person_ids, state_id
         reviewassignment__state=state_id,
         team=team,
     ).distinct()
-    if review_req.pk is not None:
-        has_reviewed_previous = has_reviewed_previous.exclude(pk=review_req.pk)
     has_reviewed_previous = set(
         has_reviewed_previous.values_list("reviewassignment__reviewer__person", flat=True))
     return has_reviewed_previous
@@ -70,7 +69,14 @@ def assign_reviewer(self, review_req, reviewer, add_skip):
         """Assign a reviewer to a request and update policy state accordingly"""
         # Update policy state first - needed by LRU policy to correctly compute whether assignment was in-order
         self.update_policy_state_for_assignment(review_req, reviewer.person, add_skip)
-        return review_req.reviewassignment_set.create(state_id='assigned', reviewer=reviewer, assigned_on=timezone.now())
+        assignment = review_req.reviewassignment_set.filter(reviewer=reviewer).first()
+        if assignment:
+            assignment.state = ReviewAssignmentStateName.objects.get(slug='assigned', used=True)
+            assignment.assigned_on = timezone.now()
+            assignment.save()
+            return assignment
+        else:
+            return review_req.reviewassignment_set.create(state_id='assigned', reviewer=reviewer, assigned_on=timezone.now())
 
     def default_reviewer_rotation_list(self, include_unavailable=False):
         """ Return a list of reviewers (Person objects) in the default reviewer rotation for a policy.
@@ -84,7 +90,7 @@ def default_reviewer_rotation_list(self, include_unavailable=False):
             rotation_list = self._filter_unavailable_reviewers(rotation_list)
         return rotation_list
 
-    def return_reviewer_to_rotation_top(self, reviewer_person):
+    def set_wants_to_be_next(self, reviewer_person):
         """
         Return a reviewer to the top of the rotation, e.g. because they rejected a review,
         and should retroactively not have been rotated over.
@@ -125,12 +131,15 @@ def _update_skip_next(self, rotation_pks, assignee_person):
         assignee_index = rotation_pks.index(assignee_person.pk)
         skipped = rotation_pks[0:assignee_index]
         skipped_settings = self.team.reviewersettings_set.filter(person__in=skipped)  # list of PKs is valid here
+        changed = []
         for ss in skipped_settings:
-            ss.skip_next = max(0, ss.skip_next - 1)  # ensure we don't go negative
-        bulk_update_with_history(skipped_settings,
+            if ss.skip_next > 0:
+                ss.skip_next = max(0, ss.skip_next - 1)  # ensure we don't go negative
+                ss._change_reason = "Skip count decremented"
+                changed.append(ss)
+        bulk_update_with_history(changed,
                                  ReviewerSettings,
-                                 ['skip_next'],
-                                 default_change_reason='skipped')
+                                 ['skip_next'])
 
     def _assignment_in_order(self, rotation_pks, assignee_person):
         """Is this an in-order assignment?"""
@@ -168,24 +177,27 @@ def setup_reviewer_field(self, field, review_req):
             PersonEmailChoiceField(label="Assign Reviewer", empty_label="(None)")
         """
 
-        # Collect a set of person IDs for people who have either not responded
-        # to or outright rejected reviewing this document in the past
+        # Collect a set of person IDs for people who have not responded
+        # to this document in the past
         rejecting_reviewer_ids = review_req.doc.reviewrequest_set.filter(
-            reviewassignment__state__slug__in=('rejected', 'no-response')
+            reviewassignment__state__slug='no-response'
         ).values_list(
             'reviewassignment__reviewer__person_id', flat=True
         )
 
-        # Query the Email objects for reviewers who haven't rejected or
+        # Query the Email objects for reviewers who haven't
         # not responded to this document in the past
         field.queryset = field.queryset.filter(
             role__name="reviewer",
             role__group=review_req.team
         ).exclude( person_id__in=rejecting_reviewer_ids )
 
-        one_assignment = (review_req.reviewassignment_set
-                          .exclude(state__slug__in=('rejected', 'no-response'))
-                          .first())
+        one_assignment = None
+        if review_req.pk is not None:
+            # cannot use reviewassignment_set relation until review_req has been created
+            one_assignment = (review_req.reviewassignment_set
+                              .exclude(state__slug__in=('rejected', 'no-response'))
+                              .first())
         if one_assignment:
             field.initial = one_assignment.reviewer_id
 
@@ -253,12 +265,15 @@ def _filter_unavailable_reviewers(self, reviewers, review_req=None):
 
     def _clear_request_next_assignment(self, person):
         s = self._reviewer_settings_for(person)
-        s.request_assignment_next = False
-        s.save()
+        if s.request_assignment_next:
+            s.request_assignment_next = False
+            s._change_reason = "Clearing request next assignment"
+            s.save()
 
     def _add_skip(self, person):
         s = self._reviewer_settings_for(person)
         s.skip_next += 1
+        s._change_reason = "Incrementing skip count"
         s.save()
 
     def _reviewer_settings_for(self, person):
@@ -284,8 +299,6 @@ def __init__(self, email_queryset, review_req, rotation_list):
     def _collect_context(self):
         """Collect all relevant data about this team, document and review request."""
 
-        self.doc_aliases = DocAlias.objects.filter(docs=self.doc).values_list("name", flat=True)
-
         # This data is collected as a dict, keys being person IDs, values being numbers/objects.
         self.rotation_index = {p.pk: i for i, p in enumerate(self.rotation_list)}
         self.reviewer_settings = self._reviewer_settings_for_person_ids(self.possible_person_ids)
@@ -351,8 +364,7 @@ def format_period(p):
         add_boolean_score(+1, email.person_id in self.wish_to_review, "wishes to review document")
         add_boolean_score(-1, email.person_id in self.connections,
                           self.connections.get(email.person_id))  # reviewer is somehow connected: bad
-        add_boolean_score(-1, settings.filter_re and any(
-            re.search(settings.filter_re, n) for n in self.doc_aliases), "filter regexp matches")
+        add_boolean_score(-1, settings.filter_re and re.search(settings.filter_re, self.doc.name), "filter regexp matches")
         
         # minimum interval between reviews
         days_needed = self.days_needed_for_reviewers.get(email.person_id, 0)
@@ -472,12 +484,13 @@ def default_reviewer_rotation_list(self, include_unavailable=False):
     
         return reviewers[next_reviewer_index:] + reviewers[:next_reviewer_index]
 
-    def return_reviewer_to_rotation_top(self, reviewer_person):
+    def set_wants_to_be_next(self, reviewer_person):
         # As RotateAlphabetically does not keep a full rotation list,
         # returning someone to a particular order is complex.
         # Instead, the "assign me next" flag is set.
         settings = self._reviewer_settings_for(reviewer_person)
         settings.request_assignment_next = True
+        settings._change_reason = "Setting request next assignment"
         settings.save()
 
     def _update_skip_next(self, rotation_pks, assignee_person):
@@ -517,20 +530,22 @@ def _update_skip_next(self, rotation_pks, assignee_person):
             min_skip_next = min([rs.skip_next for rs in rotation_settings.values()])
 
         next_reviewer_index = None
+        changed = []
         for index, pk in enumerate(unfolded_rotation_pks):
             rs = rotation_settings.get(pk)
             if (rs is None) or (rs.skip_next == min_skip_next):
                 next_reviewer_index = index
                 break
             else:
-                rs.skip_next = max(0, rs.skip_next - 1)  # ensure never negative
+                if rs.skip_next > 0:
+                    rs.skip_next = max(0, rs.skip_next - 1)  # ensure never negative
+                    rs._change_reason = "Skip count decremented"
+                    changed.append(rs)
                 
         log.assertion('next_reviewer_index is not None')  # some entry in the list must have the minimum value
-
-        bulk_update_with_history(rotation_settings.values(),
+        bulk_update_with_history(changed,
                                  ReviewerSettings,
-                                 ['skip_next'],
-                                 default_change_reason='skipped')
+                                 ['skip_next'])
 
         next_reviewer_pk = unfolded_rotation_pks[next_reviewer_index]
         NextReviewerInTeam.objects.update_or_create(
@@ -566,11 +581,14 @@ def default_reviewer_rotation_list(self, include_unavailable=False):
         rotation_list += reviewers_with_assignment
         return rotation_list
 
-    def return_reviewer_to_rotation_top(self, reviewer_person):
+    def set_wants_to_be_next(self, reviewer_person):
         # Reviewer rotation for this policy ignores rejected/withdrawn
         # reviews, so it automatically adjusts the position of someone
         # who rejected a review and no further action is needed.
-        pass
+        settings = self._reviewer_settings_for(reviewer_person)
+        settings.request_assignment_next = True
+        settings._change_reason = "Setting request next assignment"
+        settings.save()
 
 
 QUEUE_POLICY_NAME_MAPPING = {
diff --git a/ietf/review/tasks.py b/ietf/review/tasks.py
new file mode 100644
index 0000000000..5d8afa6943
--- /dev/null
+++ b/ietf/review/tasks.py
@@ -0,0 +1,43 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+#
+# Celery task definitions
+#
+from celery import shared_task
+
+from ietf.review.utils import (
+    review_assignments_needing_reviewer_reminder, email_reviewer_reminder,
+    review_assignments_needing_secretary_reminder, email_secretary_reminder,
+    send_unavailability_period_ending_reminder, send_reminder_all_open_reviews,
+    send_review_reminder_overdue_assignment, send_reminder_unconfirmed_assignments)
+from ietf.utils.log import log
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
+
+
+@shared_task
+def send_review_reminders_task():
+    today = date_today(DEADLINE_TZINFO)
+    
+    for assignment in review_assignments_needing_reviewer_reminder(today):
+        email_reviewer_reminder(assignment)
+        log("Emailed reminder to {} for review of {} in {} (req. id {})".format(assignment.reviewer.address, assignment.review_request.doc_id, assignment.review_request.team.acronym, assignment.review_request.pk))
+    
+    for assignment, secretary_role in review_assignments_needing_secretary_reminder(today):
+        email_secretary_reminder(assignment, secretary_role)
+        review_req = assignment.review_request
+        log("Emailed reminder to {} for review of {} in {} (req. id {})".format(secretary_role.email.address, review_req.doc_id, review_req.team.acronym, review_req.pk))
+    
+    period_end_reminders_sent = send_unavailability_period_ending_reminder(today)
+    for msg in period_end_reminders_sent:
+        log(msg)
+    
+    overdue_reviews_reminders_sent = send_review_reminder_overdue_assignment(today)
+    for msg in overdue_reviews_reminders_sent:
+        log(msg)
+    
+    open_reviews_reminders_sent = send_reminder_all_open_reviews(today)
+    for msg in open_reviews_reminders_sent:
+        log(msg)
+    
+    unconfirmed_assignment_reminders_sent = send_reminder_unconfirmed_assignments(today)
+    for msg in unconfirmed_assignment_reminders_sent:
+        log(msg)
diff --git a/ietf/review/tests.py b/ietf/review/tests.py
index 1ecdb4040f..5dc8f11e8e 100644
--- a/ietf/review/tests.py
+++ b/ietf/review/tests.py
@@ -1,18 +1,27 @@
 # Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 import datetime
+from unittest import mock
+import debug # pyflakes:ignore
+
+from pyquery import PyQuery
 
 from ietf.group.factories import RoleFactory
+from ietf.doc.factories import WgDraftFactory
 from ietf.utils.mail import empty_outbox, get_payload_text, outbox
 from ietf.utils.test_utils import TestCase, reload_db_objects
+from ietf.utils.test_utils import login_testing_unauthorized, unicontent
+from ietf.utils.timezone import date_today, datetime_from_date
 from .factories import ReviewAssignmentFactory, ReviewRequestFactory, ReviewerSettingsFactory
 from .mailarch import hash_list_message_id
 from .models import ReviewerSettings, ReviewSecretarySettings, ReviewTeamSettings, UnavailablePeriod
+from .tasks import send_review_reminders_task
 from .utils import (email_secretary_reminder, review_assignments_needing_secretary_reminder,
                     email_reviewer_reminder, review_assignments_needing_reviewer_reminder,
                     send_reminder_unconfirmed_assignments, send_review_reminder_overdue_assignment,
                     send_reminder_all_open_reviews, send_unavailability_period_ending_reminder,
                     ORIGIN_DATE_PERIODIC_REMINDERS)
+from django.urls import reverse as urlreverse
 
 class HashTest(TestCase):
 
@@ -74,7 +83,7 @@ def test_no_update_review_req_status_when_review_req_withdrawn(self):
 
 
 class ReviewAssignmentReminderTests(TestCase):
-    today = datetime.date.today()
+    today = date_today()
     deadline = today + datetime.timedelta(days=6)
 
     def setUp(self):
@@ -345,7 +354,7 @@ def test_send_reminder_unconfirmed_assignments_respects_remind_days(self):
     def test_send_unavailability_period_ending_reminder(self):
         secretary = self.make_secretary(username='reviewsecretary')
         empty_outbox()
-        today = datetime.date.today()
+        today = date_today()
         UnavailablePeriod.objects.create(
             team=self.team,
             person=self.reviewer,
@@ -383,10 +392,10 @@ def test_send_unavailability_period_ending_reminder(self):
         self.assertTrue(self.reviewer.email_address() in outbox[0]["To"])
         self.assertTrue(secretary.person.email_address() in outbox[0]["To"])
         message = get_payload_text(outbox[0])
-        self.assertTrue(self.reviewer.name in message)
+        self.assertTrue(self.reviewer.plain_name() in message)
         self.assertTrue(self.team.acronym in message)
         self.assertEqual(len(log), 1)
-        self.assertTrue(self.reviewer.name in log[0])
+        self.assertTrue(self.reviewer.plain_name() in log[0])
         self.assertTrue(self.team.acronym in log[0])
 
     def test_send_review_reminder_overdue_assignment(self):
@@ -408,7 +417,7 @@ def test_send_review_reminder_overdue_assignment(self):
             review_request__state_id='assigned',
             review_request__deadline=self.deadline,
             state_id='assigned',
-            assigned_on=self.deadline,
+            assigned_on=datetime_from_date(self.deadline),
             reviewer=self.reviewer.email_set.first(),
         ).review_request.team
         second_team.reviewteamsettings.delete()  # prevent it from being sent reminders
@@ -420,7 +429,7 @@ def test_send_review_reminder_overdue_assignment(self):
             review_request__state_id='assigned',
             review_request__deadline=not_overdue,
             state_id='assigned',
-            assigned_on=not_overdue,
+            assigned_on=datetime_from_date(not_overdue),
             reviewer=self.reviewer.email_set.first(),
         )
         ReviewAssignmentFactory(
@@ -428,7 +437,7 @@ def test_send_review_reminder_overdue_assignment(self):
             review_request__state_id='assigned',
             review_request__deadline=not_overdue,
             state_id='assigned',
-            assigned_on=not_overdue,
+            assigned_on=datetime_from_date(not_overdue),
             reviewer=self.reviewer.email_set.first(),
         )
 
@@ -439,7 +448,7 @@ def test_send_review_reminder_overdue_assignment(self):
             review_request__state_id='assigned',
             review_request__deadline=in_grace_period,
             state_id='assigned',
-            assigned_on=in_grace_period,
+            assigned_on=datetime_from_date(in_grace_period),
             reviewer=self.reviewer.email_set.first(),
         )
         ReviewAssignmentFactory(
@@ -447,7 +456,7 @@ def test_send_review_reminder_overdue_assignment(self):
             review_request__state_id='assigned',
             review_request__deadline=in_grace_period,
             state_id='assigned',
-            assigned_on=in_grace_period,
+            assigned_on=datetime_from_date(in_grace_period),
             reviewer=self.reviewer.email_set.first(),
         )
 
@@ -469,7 +478,7 @@ def test_send_review_reminder_overdue_assignment(self):
         self.assertIn('1 overdue review', log[0])
 
     def test_send_reminder_all_open_reviews(self):
-        today = datetime.date.today()
+        today = date_today()
         self.make_secretary(username='reviewsecretary')
         ReviewerSettingsFactory(team=self.team, person=self.reviewer, remind_days_open_reviews=1)
 
@@ -507,3 +516,103 @@ def test_send_reminder_all_open_reviews(self):
         self.assertTrue(self.reviewer.email_address() in log[0])
         self.assertTrue('1 open review' in log[0])
 
+class AddReviewCommentTestCase(TestCase):
+    def test_review_add_comment(self):
+        draft = WgDraftFactory(name='draft-ietf-mars-test',group__acronym='mars')
+        review_req = ReviewRequestFactory(doc=draft, state_id='assigned')
+        ReviewAssignmentFactory(review_request=review_req, state_id='assigned')
+
+        url_post = urlreverse('ietf.doc.views_review.add_request_comment', kwargs=dict(name=draft.name, request_id=review_req.pk))
+        url_page = urlreverse('ietf.doc.views_review.review_request', kwargs=dict(name=draft.name, request_id=review_req.pk))
+
+        login_testing_unauthorized(self, "secretary", url_post)
+
+        # Check that we do not have entry on the page
+        r = self.client.get(url_page)
+        self.assertEqual(r.status_code, 200)
+        # Needs to have history
+        self.assertContains(r, 'History')
+        # But can't have the comment we are goint to add.
+        self.assertNotContains(r, 'This is a test.')
+
+        # Get the form
+        r = self.client.get(url_post)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(unicontent(r))
+        self.assertEqual(len(q('form textarea[name=comment]')), 1)
+
+        # Post the comment
+        r = self.client.post(url_post, dict(comment="This is a test."))
+        self.assertEqual(r.status_code, 302)
+
+        # Get the main page again
+        r = self.client.get(url_page)
+        self.assertEqual(r.status_code, 200)
+        # Needs to have history
+        self.assertContains(r, 'History')
+        # But can't have the comment we are goint to add.
+        self.assertContains(r, 'This is a test.')
+
+
+class TaskTests(TestCase):
+    # hyaaa it's mockzilla
+    @mock.patch("ietf.review.tasks.date_today")
+    @mock.patch("ietf.review.tasks.review_assignments_needing_reviewer_reminder")
+    @mock.patch("ietf.review.tasks.email_reviewer_reminder")
+    @mock.patch("ietf.review.tasks.review_assignments_needing_secretary_reminder")
+    @mock.patch("ietf.review.tasks.email_secretary_reminder")
+    @mock.patch("ietf.review.tasks.send_unavailability_period_ending_reminder") 
+    @mock.patch("ietf.review.tasks.send_reminder_all_open_reviews")
+    @mock.patch("ietf.review.tasks.send_review_reminder_overdue_assignment")
+    @mock.patch("ietf.review.tasks.send_reminder_unconfirmed_assignments")
+    def test_send_review_reminders_task(
+        self,
+        mock_send_reminder_unconfirmed_assignments,
+        mock_send_review_reminder_overdue_assignment,
+        mock_send_reminder_all_open_reviews,
+        mock_send_unavailability_period_ending_reminder,
+        mock_email_secretary_reminder,
+        mock_review_assignments_needing_secretary_reminder,
+        mock_email_reviewer_reminder,
+        mock_review_assignments_needing_reviewer_reminder,
+        mock_date_today,
+    ):
+        """Test that send_review_reminders calls functions correctly
+        
+        Does not test individual methods, just that they are called as expected.
+        """
+        mock_today = object()
+        assignment = ReviewAssignmentFactory()
+        secretary_role = RoleFactory(name_id="secr")
+
+        mock_date_today.return_value = mock_today 
+        mock_review_assignments_needing_reviewer_reminder.return_value = [assignment]
+        mock_review_assignments_needing_secretary_reminder.return_value = [[assignment, secretary_role]]
+        mock_send_unavailability_period_ending_reminder.return_value = ["pretending I sent a period end reminder"]
+        mock_send_review_reminder_overdue_assignment.return_value = ["pretending I sent an overdue reminder"]
+        mock_send_reminder_all_open_reviews.return_value = ["pretending I sent an open review reminder"]
+        mock_send_reminder_unconfirmed_assignments.return_value = ["pretending I sent an unconfirmed reminder"]
+        
+        send_review_reminders_task()
+
+        self.assertEqual(mock_review_assignments_needing_reviewer_reminder.call_count, 1)
+        self.assertEqual(mock_review_assignments_needing_reviewer_reminder.call_args[0], (mock_today,))
+        self.assertEqual(mock_email_reviewer_reminder.call_count, 1)
+        self.assertEqual(mock_email_reviewer_reminder.call_args[0], (assignment,))
+
+        self.assertEqual(mock_review_assignments_needing_secretary_reminder.call_count, 1)
+        self.assertEqual(mock_review_assignments_needing_secretary_reminder.call_args[0], (mock_today,))
+        self.assertEqual(mock_email_secretary_reminder.call_count, 1)
+        self.assertEqual(mock_email_secretary_reminder.call_args[0], (assignment, secretary_role))
+
+        self.assertEqual(mock_send_unavailability_period_ending_reminder.call_count, 1)
+        self.assertEqual(mock_send_unavailability_period_ending_reminder.call_args[0], (mock_today,))
+
+        self.assertEqual(mock_send_review_reminder_overdue_assignment.call_count, 1)
+        self.assertEqual(mock_send_review_reminder_overdue_assignment.call_args[0], (mock_today,))
+
+        self.assertEqual(mock_send_reminder_all_open_reviews.call_count, 1)
+        self.assertEqual(mock_send_reminder_all_open_reviews.call_args[0], (mock_today,))
+
+        self.assertEqual(mock_send_reminder_unconfirmed_assignments.call_count, 1)
+        self.assertEqual(mock_send_reminder_unconfirmed_assignments.call_args[0], (mock_today,))
diff --git a/ietf/review/tests_policies.py b/ietf/review/tests_policies.py
index b675b2384b..1eb57a8bec 100644
--- a/ietf/review/tests_policies.py
+++ b/ietf/review/tests_policies.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016-2021, All Rights Reserved
+# Copyright The IETF Trust 2016-2023, All Rights Reserved
 
 import debug                            # pyflakes:ignore
 import datetime
@@ -115,7 +115,7 @@ def reviewer_settings_for(self, person):
             return (ReviewerSettings.objects.filter(team=self.team, person=person).first()
                     or ReviewerSettings(team=self.team, person=person))
 
-        def test_return_reviewer_to_rotation_top(self):
+        def test_set_wants_to_be_next(self):
             # Subclass must implement this
             raise NotImplementedError
 
@@ -471,9 +471,6 @@ def test_setup_reviewer_field(self):
             
             addresses = list( map( lambda choice: choice[0], field.choices ) )
             
-            self.assertNotIn(
-                str(rejected_reviewer.email()), addresses,
-                "Reviews should not suggest people who have rejected this request in the past")
             self.assertNotIn(
                 str(no_response_reviewer.email()), addresses,
                 "Reviews should not suggest people who have not responded to this request in the past.")
@@ -507,10 +504,10 @@ def test_default_reviewer_rotation_list_with_nextreviewerinteam(self):
         rotation = self.policy.default_reviewer_rotation_list()
         self.assertEqual(rotation, available_reviewers[2:] + available_reviewers[:1])
 
-    def test_return_reviewer_to_rotation_top(self):
+    def test_set_wants_to_be_next(self):
         reviewer = self.append_reviewer()
-        self.policy.return_reviewer_to_rotation_top(reviewer)
-        self.assertTrue(ReviewerSettings.objects.get(person=reviewer).request_assignment_next)
+        self.policy.set_wants_to_be_next(reviewer)
+        self.assertTrue(self.reviewer_settings_for(reviewer).request_assignment_next)
 
     def test_update_policy_state_for_assignment(self):
         # make a bunch of reviewers
@@ -723,9 +720,10 @@ def test_default_review_rotation_list_uses_assigned_on_date(self):
         self.assertEqual(self.policy.default_reviewer_rotation_list(),
                          available_reviewers[2:] + [first_reviewer, second_reviewer])
 
-    def test_return_reviewer_to_rotation_top(self):
-        # Should do nothing, this is implicit in this policy, no state change is needed.
-        self.policy.return_reviewer_to_rotation_top(self.append_reviewer())
+    def test_set_wants_to_be_next(self):
+        reviewer = self.append_reviewer()
+        self.policy.set_wants_to_be_next(reviewer)
+        self.assertTrue(self.reviewer_settings_for(reviewer).request_assignment_next)
 
     def test_assign_reviewer_updates_skip_next_without_add_skip(self):
         """Skipping reviewers with add_skip=False should update skip_counts properly"""
@@ -835,7 +833,7 @@ def test_determine_ranking(self):
         self.assertEqual(len(ranking), 2)
         self.assertEqual(ranking[0]['email'], reviewer_high.email())
         self.assertEqual(ranking[1]['email'], reviewer_low.email())
-        # These scores follow the ordering of https://trac.ietf.org/trac/ietfdb/wiki/ReviewerQueuePolicy,
+        # These scores follow the ordering of https://github.com/ietf-tools/datatracker/wiki/ReviewerQueuePolicy,
         self.assertEqual(ranking[0]['scores'], [ 1,  1,  1,  1,  1,  1,   0,  0, -1])
         self.assertEqual(ranking[1]['scores'], [-1, -1, -1, -1, -1, -1, -91, -2,  0])
         self.assertEqual(ranking[0]['label'], 'Test Reviewer-high: unavailable indefinitely (Can do follow-ups); requested to be selected next for assignment; reviewed document before; wishes to review document; #2; 1 no response, 1 partially complete, 1 fully completed')
diff --git a/ietf/review/utils.py b/ietf/review/utils.py
index e94dfb2a43..61494738d3 100644
--- a/ietf/review/utils.py
+++ b/ietf/review/utils.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
+# Copyright The IETF Trust 2016-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -12,6 +12,8 @@
 from django.template.loader import render_to_string
 from django.urls import reverse as urlreverse
 from django.contrib.sites.models import Site
+from django.utils import timezone
+
 from simple_history.utils import update_change_reason
 
 import debug                            # pyflakes:ignore
@@ -30,6 +32,8 @@
 from ietf.utils.mail import send_mail
 from ietf.doc.utils import extract_complete_replaces_ancestor_mapping_for_docs
 from ietf.utils import log
+from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO
+
 
 # The origin date is used to have a single reference date for "every X days".
 # This date is arbitrarily chosen and has no special meaning, but should be consistent.
@@ -46,6 +50,8 @@ def can_request_review_of_doc(user, doc):
     if not user.is_authenticated:
         return False
 
+    # This is in a strange place as it has nothing to do with the user
+    # but this utility is used in too many places to move this quickly.
     if doc.type_id == 'draft' and doc.get_state_slug() != 'active':
         return False
 
@@ -75,6 +81,11 @@ def review_assignments_to_list_for_docs(docs):
 
     return extract_revision_ordered_review_assignments_for_documents_and_replaced(assignment_qs, doc_names)
 
+def review_requests_to_list_for_docs(docs):
+    review_requests_qs = ReviewRequest.objects.filter(Q(state_id='requested'))
+    doc_names = [d.name for d in docs]
+    return extract_revision_ordered_review_requests_for_documents_and_replaced(review_requests_qs, doc_names)
+
 def augment_review_requests_with_events(review_reqs):
     req_dict = { r.pk: r for r in review_reqs }
     for e in ReviewRequestDocEvent.objects.filter(review_request__in=review_reqs, type__in=["assigned_review_request", "closed_review_request"]).order_by("time"):
@@ -89,12 +100,12 @@ def no_review_from_teams_on_doc(doc, rev):
 
 def unavailable_periods_to_list(past_days=14):
     return UnavailablePeriod.objects.filter(
-        Q(end_date=None) | Q(end_date__gte=datetime.date.today() - datetime.timedelta(days=past_days)),
+        Q(end_date=None) | Q(end_date__gte=date_today() - datetime.timedelta(days=past_days)),
     ).order_by("start_date")
 
 def current_unavailable_periods_for_reviewers(team):
     """Return dict with currently active unavailable periods for reviewers."""
-    today = datetime.date.today()
+    today = date_today()
 
     unavailable_period_qs = UnavailablePeriod.objects.filter(
         Q(end_date__gte=today) | Q(end_date=None),
@@ -119,7 +130,7 @@ def days_needed_to_fulfill_min_interval_for_reviewers(team):
 
     min_intervals = dict(ReviewerSettings.objects.filter(team=team).values_list("person_id", "min_interval"))
 
-    now = datetime.datetime.now()
+    now = timezone.now()
 
     res = {}
     for person_id, latest_assignment_time in latest_assignments.items():
@@ -192,7 +203,10 @@ def positive_days(time_from, time_to):
         assigned_time = assigned_on
         closed_time = completed_on
 
-        late_days = positive_days(datetime.datetime.combine(deadline, datetime.time.max), closed_time)
+        late_days = positive_days(
+            datetime.datetime.combine(deadline, datetime.time.max, tzinfo=DEADLINE_TZINFO),
+            closed_time,
+        )
         request_to_assignment_days = positive_days(requested_time, assigned_time)
         assignment_to_closure_days = positive_days(assigned_time, closed_time)
         request_to_closure_days = positive_days(requested_time, closed_time)
@@ -283,7 +297,7 @@ def latest_review_assignments_for_reviewers(team, days_back=365):
 
     extracted_data = extract_review_assignment_data(
         teams=[team],
-        time_from=datetime.date.today() - datetime.timedelta(days=days_back),
+        time_from=datetime_today(DEADLINE_TZINFO) - datetime.timedelta(days=days_back),
         ordering=["reviewer"],
     )
 
@@ -301,7 +315,7 @@ def email_review_assignment_change(request, review_assignment, subject, msg, by,
         doc=review_assignment.review_request.doc,
         group=review_assignment.review_request.team,
         review_assignment=review_assignment,
-        skip_review_secretary=not notify_secretary,
+        skip_secretary=not notify_secretary,
         skip_review_reviewer=not notify_reviewer,
         skip_review_requested_by=not notify_requested_by,
     )
@@ -321,11 +335,11 @@ def email_review_request_change(request, review_req, subject, msg, by, notify_se
     was done by that party."""    
     (to, cc) = gather_address_lists(
         'review_req_changed',
-        skipped_recipients=[Person.objects.get(name="(System)").formatted_email(), by.email_address()],
+        skipped_recipients=[Person.objects.get(name="(System)").formatted_email()],
         doc=review_req.doc,
         group=review_req.team,
         review_request=review_req,
-        skip_review_secretary=not notify_secretary,
+        skip_secretary=not notify_secretary,
         skip_review_reviewer=not notify_reviewer,
         skip_review_requested_by=not notify_requested_by,
     )
@@ -375,8 +389,13 @@ def assign_review_request_to_reviewer(request, review_req, reviewer, add_skip=Fa
     # with a different view on a ReviewAssignment.
     log.assertion('reviewer is not None')
 
-    if review_req.reviewassignment_set.filter(reviewer=reviewer).exists():
-        return
+    # cannot reference reviewassignment_set relation until pk exists
+    if review_req.pk is not None:
+        reviewassignment_set = review_req.reviewassignment_set.filter(reviewer=reviewer)
+        if (reviewassignment_set.exists() and not
+            (reviewassignment_set.filter(state_id='rejected').exists() or
+             reviewassignment_set.filter(state_id='withdrawn').exists())):
+            return
 
     # Note that assigning a review no longer unassigns other reviews
 
@@ -391,15 +410,6 @@ def assign_review_request_to_reviewer(request, review_req, reviewer, add_skip=Fa
             review_req.team.acronym.upper(),
             reviewer.person if reviewer else "(None)")
     update_change_reason(assignment, descr)
-    ReviewRequestDocEvent.objects.create(
-        type="assigned_review_request",
-        doc=review_req.doc,
-        rev=review_req.doc.rev,
-        by=request.user.person,
-        desc=descr,
-        review_request=review_req,
-        state_id='assigned',
-    )
 
     ReviewAssignmentDocEvent.objects.create(
         type="assigned_review_request",
@@ -409,7 +419,7 @@ def assign_review_request_to_reviewer(request, review_req, reviewer, add_skip=Fa
         desc="Request for {} review by {} is assigned to {}".format(
             review_req.type.name,
             review_req.team.acronym.upper(),
-            reviewer.person,
+            reviewer.person if reviewer else "(None)",
         ),
         review_assignment=assignment,
         state_id='assigned',
@@ -432,9 +442,9 @@ def assign_review_request_to_reviewer(request, review_req, reviewer, add_skip=Fa
 
     email_review_request_change(
         request, review_req,
-        "%s %s assignment: %s" % (review_req.team.acronym.capitalize(), review_req.type.name,review_req.doc.name),
+        "For %s, %s %s review by %s assigned: %s" % (reviewer.person.name, review_req.team.acronym.capitalize(), review_req.type.name, review_req.deadline, review_req.doc.name),
         msg ,
-        by=request.user.person, notify_secretary=False, notify_reviewer=True, notify_requested_by=False)
+        by=request.user.person, notify_secretary=True, notify_reviewer=True, notify_requested_by=True)
 
 
 def close_review_request(request, review_req, close_state, close_comment=''):
@@ -495,7 +505,7 @@ def suggested_review_requests_for_team(team):
 
     requests = {}
 
-    now = datetime.datetime.now()
+    now = timezone.now().astimezone(DEADLINE_TZINFO)
 
     reviewable_docs_qs = Document.objects.filter(type="draft").exclude(stream="ise")
 
@@ -511,7 +521,7 @@ def suggested_review_requests_for_team(team):
         for doc in last_call_docs:
             e = last_call_expiry_events[doc.pk] if doc.pk in last_call_expiry_events else LastCallDocEvent(expires=now, time=now)
 
-            deadline = e.expires.date()
+            deadline = e.expires.astimezone(DEADLINE_TZINFO).date()
 
             if deadline > seen_deadlines.get(doc.pk, datetime.date.max) or deadline < now.date():
                 continue
@@ -590,17 +600,21 @@ def blocks(existing, request):
                    and existing.reviewassignment_set.filter(state_id__in=("assigned", "accepted")).exists()
                    and (not existing.requested_rev or existing.requested_rev == request.doc.rev))
         request_closed = existing.state_id not in ('requested','assigned')
+        # Is there a review request for this document already in system
+        requested = existing.state_id in ('requested') and (not existing.requested_rev or existing.requested_rev == request.doc.rev)
         # at least one assignment was completed for the requested version or the current doc version if no specific version was requested:
         some_assignment_completed = existing.reviewassignment_set.filter(reviewed_rev=existing.requested_rev or existing.doc.rev, state_id='completed').exists()
 
-        return any([no_review_document, no_review_rev, pending, request_closed, some_assignment_completed])
+        return any([no_review_document, no_review_rev, pending, request_closed, requested, some_assignment_completed])
 
     res = [r for r in requests.values()
            if not any(blocks(e, r) for e in existing_requests[r.doc_id])]
     res.sort(key=lambda r: (r.deadline, r.doc_id), reverse=True)
     return res
 
-def extract_revision_ordered_review_assignments_for_documents_and_replaced(review_assignment_queryset, names):
+def extract_revision_ordered_review_assignments_for_documents_and_replaced(
+    review_assignment_queryset, names
+):
     """Extracts all review assignments for document names (including replaced ancestors), return them neatly sorted."""
 
     names = set(names)
@@ -609,8 +623,13 @@ def extract_revision_ordered_review_assignments_for_documents_and_replaced(revie
 
     assignments_for_each_doc = defaultdict(list)
     replacement_name_set = set(e for l in replaces.values() for e in l) | names
-    for r in ( review_assignment_queryset.filter(review_request__doc__name__in=replacement_name_set)
-                                        .order_by("-reviewed_rev","-assigned_on", "-id").iterator()):
+    for r in (
+        review_assignment_queryset.filter(
+            review_request__doc__name__in=replacement_name_set
+        )
+        .order_by("-reviewed_rev", "-assigned_on", "-id")
+        .iterator(chunk_size=2000)  # chunk_size not tested, using pre-Django 5 default value
+    ):
         assignments_for_each_doc[r.review_request.doc.name].append(r)
 
     # now collect in breadth-first order to keep the revision order intact
@@ -648,7 +667,10 @@ def extract_revision_ordered_review_assignments_for_documents_and_replaced(revie
 
     return res
 
-def extract_revision_ordered_review_requests_for_documents_and_replaced(review_request_queryset, names):
+
+def extract_revision_ordered_review_requests_for_documents_and_replaced(
+    review_request_queryset, names
+):
     """Extracts all review requests for document names (including replaced ancestors), return them neatly sorted."""
 
     names = set(names)
@@ -656,7 +678,13 @@ def extract_revision_ordered_review_requests_for_documents_and_replaced(review_r
     replaces = extract_complete_replaces_ancestor_mapping_for_docs(names)
 
     requests_for_each_doc = defaultdict(list)
-    for r in review_request_queryset.filter(doc__name__in=set(e for l in replaces.values() for e in l) | names).order_by("-time", "-id").iterator():
+    for r in (
+        review_request_queryset.filter(
+            doc__name__in=set(e for l in replaces.values() for e in l) | names
+        )
+        .order_by("-time", "-id")
+        .iterator(chunk_size=2000)  # chunk_size not tested, using pre-Django 5 default value
+    ):
         requests_for_each_doc[r.doc.name].append(r)
 
     # now collect in breadth-first order to keep the revision order intact
@@ -870,7 +898,7 @@ def email_reviewer_reminder(assignment):
     review_request = assignment.review_request
     team = review_request.team
 
-    deadline_days = (review_request.deadline - datetime.date.today()).days
+    deadline_days = (review_request.deadline - date_today(DEADLINE_TZINFO)).days
 
     subject = "Reminder: deadline for review of {} in {} is {}".format(review_request.doc.name, team.acronym, review_request.deadline.isoformat())
 
@@ -936,7 +964,7 @@ def email_secretary_reminder(assignment, secretary_role):
     review_request = assignment.review_request
     team = review_request.team
 
-    deadline_days = (review_request.deadline - datetime.date.today()).days
+    deadline_days = (review_request.deadline - date_today(DEADLINE_TZINFO)).days
 
     subject = "Reminder: deadline for review of {} in {} is {}".format(review_request.doc.name, team.acronym, review_request.deadline.isoformat())
 
diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py
index 3aacbfe622..91004ea270 100644
--- a/ietf/secr/announcement/forms.py
+++ b/ietf/secr/announcement/forms.py
@@ -14,93 +14,133 @@
 # Globals
 # ---------------------------------------------
 
-TO_LIST = ('IETF Announcement List <ietf-announce@ietf.org>',
-           'I-D Announcement List <i-d-announce@ietf.org>',
-           'RFP Announcement List <rfp-announce@ietf.org>',
-           'The IESG <iesg@ietf.org>',
-           'Working Group Chairs <wgchairs@ietf.org>',
-           'BOF Chairs <bofchairs@ietf.org>',
-           'Other...')
+TO_LIST = (
+    "IETF Announcement List <ietf-announce@ietf.org>",
+    "I-D Announcement List <i-d-announce@ietf.org>",
+    "RFP Announcement List <rfp-announce@ietf.org>",
+    "The IESG <iesg@ietf.org>",
+    "Working Group Chairs <wgchairs@ietf.org>",
+    "BOF Chairs <bofchairs@ietf.org>",
+    "Other...",
+)
 
 # ---------------------------------------------
 # Helper Functions
 # ---------------------------------------------
 
+
 def get_from_choices(user):
-    '''
+    """
     This function returns a choices tuple containing
     all the Announced From choices.  Including
     leadership chairs and other entities.
-    '''
+    """
     addresses = []
-    if has_role(user,'Secretariat'):
-        addresses = AnnouncementFrom.objects.values_list('address', flat=True).order_by('address').distinct()
+    if has_role(user, "Secretariat"):
+        addresses = (
+            AnnouncementFrom.objects.values_list("address", flat=True)
+            .order_by("address")
+            .distinct()
+        )
     else:
         for role in user.person.role_set.all():
-            addresses.extend(AnnouncementFrom.objects.filter(name=role.name, group=role.group).values_list('address', flat=True).order_by('address'))
+            addresses.extend(
+                AnnouncementFrom.objects.filter(name=role.name, group=role.group)
+                .values_list("address", flat=True)
+                .order_by("address")
+            )
 
     nomcom_choices = get_nomcom_choices(user)
     if nomcom_choices:
         addresses = list(addresses) + nomcom_choices
-    
-    return list(zip(addresses, addresses))
+
+    choices = list(zip(addresses, addresses))
+    if len(choices) > 1:
+        choices.insert(0, ("", "(Choose an option)"))
+    return choices
 
 
 def get_nomcom_choices(user):
-    '''
+    """
     Returns the list of nomcom email addresses for given user
-    '''
-    nomcoms = Role.objects.filter(name="chair",
-                                  group__acronym__startswith="nomcom",
-                                  group__state="active",
-                                  group__type="nomcom",
-                                  person=user.person)
+    """
+    nomcoms = Role.objects.filter(
+        name="chair",
+        group__acronym__startswith="nomcom",
+        group__state="active",
+        group__type="nomcom",
+        person=user.person,
+    )
     addresses = []
     for nomcom in nomcoms:
         year = nomcom.group.acronym[-4:]
-        addresses.append('NomCom Chair %s <nomcom-chair-%s@ietf.org>' % (year,year))
+        addresses.append("NomCom Chair %s <nomcom-chair-%s@ietf.org>" % (year, year))
 
     return addresses
-        
+
 
 def get_to_choices():
-    return list(zip(TO_LIST,TO_LIST))
+    return list(zip(TO_LIST, TO_LIST))
 
 
 # ---------------------------------------------
 # Forms
 # ---------------------------------------------
 
+
 class AnnounceForm(forms.ModelForm):
-    nomcom = forms.ModelChoiceField(queryset=Group.objects.filter(acronym__startswith='nomcom',type='nomcom',state='active'),required=False)
+    nomcom = forms.ModelChoiceField(
+        queryset=Group.objects.filter(
+            acronym__startswith="nomcom", type="nomcom", state="active"
+        ),
+        required=False,
+    )
     to_custom = MultiEmailField(required=False)
 
     class Meta:
         model = Message
-        fields = ('nomcom', 'to','to_custom','frm','cc','bcc','reply_to','subject','body')
+        fields = (
+            "nomcom",
+            "to",
+            "to_custom",
+            "frm",
+            "cc",
+            "bcc",
+            "reply_to",
+            "subject",
+            "body",
+        )
+        labels = {"frm": "From"}
+        help_texts = {
+            "to": "Select name OR select Other... and enter email below",
+            "cc": "Use comma separated lists for emails (Cc, Bcc, Reply To)",
+        }
 
     def __init__(self, *args, **kwargs):
-        if 'hidden' in kwargs:
-            self.hidden = kwargs.pop('hidden')
+        if "hidden" in kwargs:
+            self.hidden = kwargs.pop("hidden")
         else:
             self.hidden = False
-        user = kwargs.pop('user')
+        user = kwargs.pop("user")
         person = user.person
         super(AnnounceForm, self).__init__(*args, **kwargs)
-        self.fields['to'].widget = forms.Select(choices=get_to_choices())
-        self.fields['to'].help_text = 'Select name OR select Other... and enter email below'
-        self.fields['cc'].help_text = 'Use comma separated lists for emails (Cc, Bcc, Reply To)'
-        self.fields['frm'].widget = forms.Select(choices=get_from_choices(user))
-        self.fields['frm'].label = 'From'
-        self.fields['reply_to'].required = True
-        self.fields['nomcom'].label = 'NomCom message:'
-        nomcom_roles = person.role_set.filter(group__in=self.fields['nomcom'].queryset,name='chair')
-        secr_roles = person.role_set.filter(group__acronym='secretariat',name='secr')
+        self.fields["to"].widget = forms.Select(choices=get_to_choices())
+        self.fields["frm"].widget = forms.Select(choices=get_from_choices(user))
+        self.fields["reply_to"].required = True
+        # nomcom field is defined declaratively so label and help_text must be set here
+        self.fields["nomcom"].label = "NomCom message:"
+        self.fields["nomcom"].help_text = (
+            "If this is a NomCom announcement specify which NomCom group here"
+        )
+        nomcom_roles = person.role_set.filter(
+            group__in=self.fields["nomcom"].queryset, name="chair"
+        )
+        secr_roles = person.role_set.filter(group__acronym="secretariat", name="secr")
         if nomcom_roles:
-            self.initial['nomcom'] = nomcom_roles[0].group.pk
+            self.initial["nomcom"] = nomcom_roles[0].group.pk
         if not nomcom_roles and not secr_roles:
-            self.fields['nomcom'].widget = forms.HiddenInput()
-        
+            self.fields["nomcom"].widget = forms.HiddenInput()
+
         if self.hidden:
             for key in list(self.fields.keys()):
                 self.fields[key].widget = forms.HiddenInput()
@@ -110,25 +150,29 @@ def clean(self):
         data = self.cleaned_data
         if self.errors:
             return self.cleaned_data
-        if data['to'] == 'Other...' and not data['to_custom']:
+        if data["to"] == "Other..." and not data["to_custom"]:
             raise forms.ValidationError('You must enter a "To" email address')
-        for k in ['to', 'frm', 'cc',]:
+        for k in [
+            "to",
+            "frm",
+            "cc",
+        ]:
             data[k] = unescape(data[k])
 
         return data
 
     def save(self, *args, **kwargs):
-        user = kwargs.pop('user')
+        user = kwargs.pop("user")
         message = super(AnnounceForm, self).save(commit=False)
         message.by = user.person
-        if self.cleaned_data['to'] == 'Other...':
-            message.to = self.cleaned_data['to_custom']
-        if kwargs['commit']:
+        if self.cleaned_data["to"] == "Other...":
+            message.to = self.cleaned_data["to_custom"]
+        if kwargs["commit"]:
             message.save()
 
         # handle nomcom message
-        nomcom = self.cleaned_data.get('nomcom',False)
+        nomcom = self.cleaned_data.get("nomcom", False)
         if nomcom:
             message.related_groups.add(nomcom)
 
-        return message
\ No newline at end of file
+        return message
diff --git a/ietf/secr/announcement/tests.py b/ietf/secr/announcement/tests.py
index c50e997f97..f08e824397 100644
--- a/ietf/secr/announcement/tests.py
+++ b/ietf/secr/announcement/tests.py
@@ -6,7 +6,7 @@
 
 from django.urls import reverse
 
-import debug                            # pyflakes:ignore
+import debug  # pyflakes:ignore
 
 from ietf.utils.test_utils import TestCase
 from ietf.group.factories import RoleFactory
@@ -17,97 +17,102 @@
 from ietf.message.models import AnnouncementFrom
 from ietf.utils.mail import outbox, empty_outbox
 
-SECR_USER='secretary'
-WG_USER=''
-AD_USER=''
+SECR_USER = "secretary"
+WG_USER = ""
+AD_USER = ""
+
 
 class SecrAnnouncementTestCase(TestCase):
     def setUp(self):
         super().setUp()
-        chair = RoleName.objects.get(slug='chair')
-        secr = RoleName.objects.get(slug='secr')
-        ietf = Group.objects.get(acronym='ietf')
-        iab = Group.objects.get(acronym='iab')
-        secretariat = Group.objects.get(acronym='secretariat')
-        AnnouncementFrom.objects.create(name=secr,group=secretariat,address='IETF Secretariat <ietf-secretariat@ietf.org>')
-        AnnouncementFrom.objects.create(name=chair,group=ietf,address='IETF Chair <chair@ietf.org>')
-        AnnouncementFrom.objects.create(name=chair,group=iab,address='IAB Chair <iab-chair@iab.org>')
+        chair = RoleName.objects.get(slug="chair")
+        secr = RoleName.objects.get(slug="secr")
+        ietf = Group.objects.get(acronym="ietf")
+        iab = Group.objects.get(acronym="iab")
+        secretariat = Group.objects.get(acronym="secretariat")
+        AnnouncementFrom.objects.create(
+            name=secr,
+            group=secretariat,
+            address="IETF Secretariat <ietf-secretariat@ietf.org>",
+        )
+        AnnouncementFrom.objects.create(
+            name=chair, group=ietf, address="IETF Chair <chair@ietf.org>"
+        )
+        AnnouncementFrom.objects.create(
+            name=chair, group=iab, address="IAB Chair <iab-chair@iab.org>"
+        )
 
     def test_main(self):
         "Main Test"
-        url = reverse('ietf.secr.announcement.views.main')
+        url = reverse("ietf.secr.announcement.views.main")
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-    
+
     def test_main_announce_from(self):
-        url = reverse('ietf.secr.announcement.views.main')
+        url = reverse("ietf.secr.announcement.views.main")
 
         # Secretariat
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('#id_frm option')),3)
+        self.assertEqual(len(q("#id_frm option")), 4)
 
         # IAB Chair
         self.client.login(username="iab-chair", password="iab-chair+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('#id_frm option')),1)
-        self.assertTrue('<iab-chair@iab.org>' in q('#id_frm option').val())
+        self.assertEqual(len(q("#id_frm option")), 1)
+        self.assertTrue("<iab-chair@iab.org>" in q("#id_frm option").val())
 
         # IETF Chair
         self.client.login(username="ietf-chair", password="ietf-chair+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('#id_frm option')),1)
-        self.assertTrue('<chair@ietf.org>' in q('#id_frm option').val())
+        self.assertEqual(len(q("#id_frm option")), 1)
+        self.assertTrue("<chair@ietf.org>" in q("#id_frm option").val())
+
 
 class UnauthorizedAnnouncementCase(TestCase):
     def test_unauthorized(self):
         "Unauthorized Test"
-        url = reverse('ietf.secr.announcement.views.main')
-        person = RoleFactory(name_id='chair',group__acronym='mars').person
-        self.client.login(username=person.user.username, password=person.user.username+"+password")
+        url = reverse("ietf.secr.announcement.views.main")
+        person = RoleFactory(name_id="chair", group__acronym="mars").person
+        self.client.login(
+            username=person.user.username, password=person.user.username + "+password"
+        )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 403)
-    
+
+
 class SubmitAnnouncementCase(TestCase):
-    def test_invalid_submit(self):
-        "Invalid Submit"
-        url = reverse('ietf.secr.announcement.views.main')
-        post_data = {'id_subject':''}
-        self.client.login(username="secretary", password="secretary+password")
-        r = self.client.post(url,post_data)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
-        
     def test_valid_submit(self):
         "Valid Submit"
         nomcom_test_data()
         empty_outbox()
-        url = reverse('ietf.secr.announcement.views.main')
-        confirm_url = reverse('ietf.secr.announcement.views.confirm')
-        nomcom = Group.objects.get(type='nomcom')
-        post_data = {'nomcom': nomcom.pk,
-                     'to':'Other...',
-                     'to_custom':'rcross@amsl.com',
-                     'frm':'IETF Secretariat &lt;ietf-secretariat@ietf.org&gt;',
-                     'reply_to':'secretariat@ietf.org',
-                     'subject':'Test Subject',
-                     'body':'This is a test.'}
+        url = reverse("ietf.secr.announcement.views.main")
+        confirm_url = reverse("ietf.secr.announcement.views.confirm")
+        nomcom = Group.objects.get(type="nomcom")
+        post_data = {
+            "nomcom": nomcom.pk,
+            "to": "Other...",
+            "to_custom": "phil@example.com",
+            "frm": "IETF Secretariat &lt;ietf-secretariat@ietf.org&gt;",
+            "reply_to": "secretariat@ietf.org",
+            "subject": "Test Subject",
+            "body": "This is a test.",
+        }
         self.client.login(username="secretary", password="secretary+password")
-        response = self.client.post(url,post_data)
-        self.assertContains(response, 'Confirm Announcement')
-        response = self.client.post(confirm_url,post_data,follow=True)
+        response = self.client.post(url, post_data)
+        self.assertContains(response, "Confirm Announcement")
+        response = self.client.post(confirm_url, post_data, follow=True)
         self.assertRedirects(response, url)
-        self.assertEqual(len(outbox),1)
-        self.assertEqual(outbox[0]['subject'],'Test Subject')
-        self.assertEqual(outbox[0]['to'],'<rcross@amsl.com>')
-        message = Message.objects.filter(by__user__username='secretary').last()
-        self.assertEqual(message.subject,'Test Subject')
+        self.assertEqual(len(outbox), 1)
+        self.assertEqual(outbox[0]["subject"], "Test Subject")
+        self.assertEqual(outbox[0]["to"], "<phil@example.com>")
+        message = Message.objects.filter(by__user__username="secretary").last()
+        self.assertEqual(message.subject, "Test Subject")
         self.assertTrue(nomcom in message.related_groups.all())
diff --git a/ietf/secr/announcement/urls.py b/ietf/secr/announcement/urls.py
index 3c3c05a09c..dc534f64ae 100644
--- a/ietf/secr/announcement/urls.py
+++ b/ietf/secr/announcement/urls.py
@@ -1,8 +1,7 @@
-
 from ietf.secr.announcement import views
 from ietf.utils.urls import url
 
 urlpatterns = [
-    url(r'^$', views.main),
-    url(r'^confirm/$', views.confirm),
+    url(r"^$", views.main),
+    url(r"^confirm/$", views.confirm),
 ]
diff --git a/ietf/secr/announcement/views.py b/ietf/secr/announcement/views.py
index 42de089c59..5617ae9e6f 100644
--- a/ietf/secr/announcement/views.py
+++ b/ietf/secr/announcement/views.py
@@ -18,86 +18,93 @@
 # Helper Functions
 # -------------------------------------------------
 def check_access(user):
-    '''
+    """
     This function takes a Django User object and returns true if the user has access to
     the Announcement app.
-    '''
+    """
     if hasattr(user, "person"):
         person = user.person
         if has_role(user, "Secretariat"):
             return True
-        
+
         for role in person.role_set.all():
-            if AnnouncementFrom.objects.filter(name=role.name,group=role.group):
+            if AnnouncementFrom.objects.filter(name=role.name, group=role.group):
                 return True
 
-        if Role.objects.filter(name="chair",
-                               group__acronym__startswith="nomcom",
-                               group__state="active",
-                               group__type="nomcom",
-                               person=person):
+        if Role.objects.filter(
+            name="chair",
+            group__acronym__startswith="nomcom",
+            group__state="active",
+            group__type="nomcom",
+            person=person,
+        ):
             return True
 
     return False
 
+
 # --------------------------------------------------
 # STANDARD VIEW FUNCTIONS
 # --------------------------------------------------
 # this seems to cause some kind of circular problem
 # @check_for_cancel(reverse('home'))
 @login_required
-@check_for_cancel('../')
+@check_for_cancel("../")
 def main(request):
-    '''
+    """
     Main view for Announcement tool.  Authrozied users can fill out email details: header, body, etc
     and send.
-    '''
+    """
     if not check_access(request.user):
-        permission_denied(request, 'Restricted to: Secretariat, IAD, or chair of IETF, IAB, RSOC, RSE, IAOC, ISOC, NomCom.')
+        permission_denied(
+            request,
+            "Restricted to: Secretariat, IAD, or chair of IETF, IAB, RSOC, RSE, IAOC, ISOC, NomCom.",
+        )
 
-    form = AnnounceForm(request.POST or None,user=request.user)
+    form = AnnounceForm(request.POST or None, user=request.user)
 
     if form.is_valid():
         # recast as hidden form for next page of process
         form = AnnounceForm(request.POST, user=request.user, hidden=True)
-        if form.data['to'] == 'Other...':
-            to = form.data['to_custom']
+        if form.data["to"] == "Other...":
+            to = form.data["to_custom"]
         else:
-            to = form.data['to']
+            to = form.data["to"]
 
-        return render(request, 'announcement/confirm.html', {
-            'message': form.data,
-            'to': to,
-            'form': form},
+        return render(
+            request,
+            "announcement/confirm.html",
+            {"message": form.data, "to": to, "form": form},
         )
 
-    return render(request, 'announcement/main.html', { 'form': form} )
+    return render(request, "announcement/index.html", {"form": form})
+
 
 @login_required
-@check_for_cancel('../')
+@check_for_cancel("../")
 def confirm(request):
 
     if not check_access(request.user):
-        permission_denied(request, 'Restricted to: Secretariat, IAD, or chair of IETF, IAB, RSOC, RSE, IAOC, ISOC, NomCom.')
+        permission_denied(
+            request,
+            "Restricted to: Secretariat, IAD, or chair of IETF, IAB, RSOC, RSE, IAOC, ISOC, NomCom.",
+        )
 
-    if request.method == 'POST':
+    if request.method == "POST":
         form = AnnounceForm(request.POST, user=request.user)
-        if request.method == 'POST':
-            message = form.save(user=request.user,commit=True)
-            extra = {'Reply-To': message.get('reply_to') }
-            send_mail_text(None,
-                           message.to,
-                           message.frm,
-                           message.subject,
-                           message.body,
-                           cc=message.cc,
-                           bcc=message.bcc,
-                           extra=extra,
-                       )
-
-            messages.success(request, 'The announcement was sent.')
-            return redirect('ietf.secr.announcement.views.main')
-
-
-
-
+        if request.method == "POST":
+            message = form.save(user=request.user, commit=True)
+            extra = {"Reply-To": message.get("reply_to")}
+            send_mail_text(
+                None,
+                message.to,
+                message.frm,
+                message.subject,
+                message.body,
+                cc=message.cc,
+                bcc=message.bcc,
+                extra=extra,
+            )
+
+            messages.success(request, "The announcement was sent.")
+            return redirect("ietf.secr.announcement.views.main")
diff --git a/ietf/secr/areas/forms.py b/ietf/secr/areas/forms.py
deleted file mode 100644
index 2a34408ad4..0000000000
--- a/ietf/secr/areas/forms.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from django import forms
-
-from ietf.person.models import Person, Email
-
-import re
-
-STATE_CHOICES = (
-    (1, 'Active'),
-    (2, 'Concluded')
-)
-
-
-        
-class AreaDirectorForm(forms.Form):
-    ad_name = forms.CharField(max_length=100,label='Name',help_text="To see a list of people type the first name, or last name, or both.")
-    #login = forms.EmailField(max_length=75,help_text="This should be the person's primary email address.")
-    #email = forms.ChoiceField(help_text="This should be the person's primary email address.")
-    email = forms.CharField(help_text="Select the email address to associate with this AD Role")
-    
-    # set css class=name-autocomplete for name field (to provide select list)
-    def __init__(self, *args, **kwargs):
-        super(AreaDirectorForm, self).__init__(*args, **kwargs)
-        self.fields['ad_name'].widget.attrs['class'] = 'name-autocomplete'
-        self.fields['email'].widget = forms.Select(choices=[])
-
-    def clean_ad_name(self):
-        name = self.cleaned_data.get('ad_name', '')
-        # check for tag within parenthesis to ensure name was selected from the list 
-        m = re.search(r'\((\d+)\)', name)
-        if not name or not m:
-            raise forms.ValidationError("You must select an entry from the list!")
-        try:
-            id = m.group(1)
-            person = Person.objects.get(id=id)
-        except Person.DoesNotExist:
-            raise forms.ValidationError("ERROR finding Person with ID: %s" % id)
-        return person
-
-    def clean_email(self):
-        # this ChoiceField gets populated by javascript so skip regular validation
-        # which raises an error
-        email = self.cleaned_data['email']
-        if not email:
-            raise forms.ValidationError("You must select an email.  If none are listed you'll need to add one first.")
-        try:
-            obj = Email.objects.get(address=email)
-        except Email.DoesNotExist:
-            raise forms.ValidationError("Can't find this email.")
-        return obj
diff --git a/ietf/secr/areas/tests.py b/ietf/secr/areas/tests.py
deleted file mode 100644
index f7341dfa9e..0000000000
--- a/ietf/secr/areas/tests.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from django.urls import reverse
-
-from ietf.group.factories import GroupFactory, GroupEventFactory
-from ietf.group.models import Group, GroupEvent
-from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase
-
-
-SECR_USER='secretary'
-
-def augment_data():
-    system = Person.objects.get(name="(System)")
-    area = Group.objects.get(acronym='farfut')
-    GroupEvent.objects.create(group=area,
-                              type='started',
-                              by=system)
-                              
-class SecrAreasTestCase(TestCase):
-    def test_main(self):
-        "Main Test"
-        GroupFactory(type_id='area')
-        url = reverse('ietf.secr.areas.views.list_areas')
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_view(self):
-        "View Test"
-        area = GroupEventFactory(type='started',group__type_id='area').group
-        url = reverse('ietf.secr.areas.views.view', kwargs={'name':area.acronym})
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
diff --git a/ietf/secr/areas/urls.py b/ietf/secr/areas/urls.py
deleted file mode 100644
index cbb9a4a2f3..0000000000
--- a/ietf/secr/areas/urls.py
+++ /dev/null
@@ -1,12 +0,0 @@
-
-from ietf.secr.areas import views
-from ietf.utils.urls import url
-
-urlpatterns = [
-    url(r'^$', views.list_areas),
-    url(r'^getemails', views.getemails),
-    url(r'^getpeople', views.getpeople),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/$', views.view),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/$', views.people),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/modify/$', views.modify),
-]
diff --git a/ietf/secr/areas/views.py b/ietf/secr/areas/views.py
deleted file mode 100644
index 93e438cf8d..0000000000
--- a/ietf/secr/areas/views.py
+++ /dev/null
@@ -1,203 +0,0 @@
-import json
- 
-from django.contrib import messages
-from django.http import HttpResponse
-from django.shortcuts import render, get_object_or_404, redirect
-
-from ietf.group.models import Group, GroupEvent, Role
-from ietf.group.utils import save_group_in_history
-from ietf.ietfauth.utils import role_required
-from ietf.person.models import Person
-from ietf.secr.areas.forms import AreaDirectorForm
-
-# --------------------------------------------------
-# AJAX FUNCTIONS
-# --------------------------------------------------
-def getpeople(request):
-    """
-    Ajax function to find people.  Takes one or two terms (ignores rest) and
-    returns JSON format response: first name, last name, primary email, tag
-    """
-    result = []
-    term = request.GET.get('term','')
-
-    qs = Person.objects.filter(name__icontains=term)
-    for item in qs:
-        full = '%s - (%s)' % (item.name,item.id)
-        result.append(full)
-        
-    return HttpResponse(json.dumps(result), content_type='application/javascript')
-    
-def getemails(request):
-    """
-    Ajax function to get emails for given Person Id.  Used for adding Area ADs.
-    returns JSON format response: [{id:email, value:email},...]
-    """
-    
-    results=[]
-    id = request.GET.get('id','')
-    person = Person.objects.get(id=id)
-    for item in person.email_set.filter(active=True):
-        d = {'id': item.address, 'value': item.address}
-        results.append(d)
-        
-    return HttpResponse(json.dumps(results), content_type='application/javascript')
-    
-# --------------------------------------------------
-# STANDARD VIEW FUNCTIONS
-# --------------------------------------------------
-
-
-@role_required('Secretariat')
-def list_areas(request):
-    """ 
-    List IETF Areas 
-
-    **Templates:**
-
-    * ``areas/list.html``
-
-    **Template Variables:**
-
-    * results 
-
-    """
-
-    results = Group.objects.filter(type="area").order_by('name')
-    
-    return render(request, 'areas/list.html', { 'results': results} )
-
-@role_required('Secretariat')
-def people(request, name):
-    """ 
-    Edit People associated with Areas, Area Directors.
-    
-    # Legacy ------------------
-    When a new Director is first added they get a user_level of 4, read-only.
-    Then, when Director is made active (Enable Voting) user_level = 1.
-    
-    # New ---------------------
-    First Director's are assigned the Role 'pre-ad' Incoming Area director
-    Then they get 'ad' role
-    
-    **Templates:**
-
-    * ``areas/people.html``
-
-    **Template Variables:**
-
-    * directors, area
-
-    """
-    area = get_object_or_404(Group, type='area', acronym=name)
-
-    if request.method == 'POST':
-        if request.POST.get('submit', '') == "Add":
-            form = AreaDirectorForm(request.POST)
-            if form.is_valid():
-                email = form.cleaned_data['email']
-                person = form.cleaned_data['ad_name']
-
-                # save group
-                save_group_in_history(area)
-                
-                # create role
-                Role.objects.create(name_id='pre-ad',group=area,email=email,person=person)
-                
-                if not email.origin or email.origin == person.user.username:
-                    email.origin = "role: %s %s" % (area.acronym, 'pre-ad')
-                    email.save()
-
-                messages.success(request, 'New Area Director added successfully!')
-                return redirect('ietf.secr.areas.views.view', name=name)
-    else:
-        form = AreaDirectorForm()
-
-    directors = area.role_set.filter(name__slug__in=('ad','pre-ad'))
-    return render(request, 'areas/people.html', {
-        'area': area,
-        'form': form,
-        'directors': directors},
-    )
-
-@role_required('Secretariat')
-def modify(request, name):
-    """ 
-    Handle state changes of Area Directors (enable voting, retire)
-    # Legacy --------------------------
-    Enable Voting actions
-    - user_level = 1
-    - create TelechatUser object
-    Per requirements, the Retire button shall perform the following DB updates
-    - update iesg_login row, user_level = 2 (per Matt Feb 7, 2011)
-    - remove telechat_user row (to revoke voting rights)
-    - update IETFWG(groups) set area_director = TBD 
-    - remove area_director row
-    # New ------------------------------
-    Enable Voting: change Role from 'pre-ad' to 'ad'
-    Retire: save in history, delete role record, set group assn to TBD
-
-    **Templates:**
-
-    * none
-
-    Redirects to view page on success.
-    """
-
-    area = get_object_or_404(Group, type='area', acronym=name)
-
-    # should only get here with POST method
-    if request.method == 'POST':
-        # setup common request variables
-        tag = request.POST.get('tag', '')
-        person = Person.objects.get(id=tag)
-        
-        # save group
-        save_group_in_history(area)
-                
-        # handle retire request
-        if request.POST.get('submit', '') == "Retire":
-            role = Role.objects.get(group=area,name__in=('ad','pre-ad'),person=person)
-            role.delete()
-            
-            # update groups that have this AD as primary AD
-            Role.objects.filter(name__in=('ad','pre-ad'),person=person,group__type='wg',group__state__in=('active','bof')).delete()
-            
-            messages.success(request, 'The Area Director has been retired successfully!')
-
-        # handle voting request
-        if request.POST.get('submit', '') == "Enable Voting":
-            role = Role.objects.get(group=area,name__slug='pre-ad',person=person)
-            role.name_id = 'ad'
-            role.save()
-            
-            messages.success(request, 'Voting rights have been granted successfully!')
-
-        return redirect('ietf.secr.areas.views.view', name=name)
-
-@role_required('Secretariat')
-def view(request, name):
-    """ 
-    View Area information.
-
-    **Templates:**
-
-    * ``areas/view.html``
-
-    **Template Variables:**
-
-    * area, directors
-
-    """
-    area = get_object_or_404(Group, type='area', acronym=name)
-    try:
-        area.start_date = area.groupevent_set.order_by('time')[0].time
-        area.concluded_date = area.groupevent_set.get(type='concluded').time
-    except GroupEvent.DoesNotExist:
-        pass
-    directors = area.role_set.filter(name__slug__in=('ad','pre-ad'))
-    
-    return render(request, 'areas/view.html', {
-        'area': area,
-        'directors': directors},
-    )
diff --git a/ietf/secr/console/tests.py b/ietf/secr/console/tests.py
deleted file mode 100644
index 9de5707955..0000000000
--- a/ietf/secr/console/tests.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-"""
-This file demonstrates two different styles of tests (one doctest and one
-unittest). These will both pass when you run "manage.py test".
-
-Replace these with more appropriate tests for your application.
-"""
-
-from ietf.utils.test_utils import TestCase
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)
-
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
-
->>> 1 + 1 == 2
-True
-"""}
-
diff --git a/ietf/secr/console/urls.py b/ietf/secr/console/urls.py
deleted file mode 100644
index 5c76a6867f..0000000000
--- a/ietf/secr/console/urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-
-from ietf.secr.console import views
-from ietf.utils.urls import url
-
-urlpatterns = [
-    url(r'^$', views.main),
-]
diff --git a/ietf/secr/console/views.py b/ietf/secr/console/views.py
deleted file mode 100644
index 9e582fd089..0000000000
--- a/ietf/secr/console/views.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-from django.shortcuts import render
-
-from ietf.doc.models import DocEvent
-from ietf.ietfauth.utils import role_required
-
-@role_required('Secretariat')
-def main(request):
-    '''
-    Main view for the Console
-    '''
-
-    latest_docevent = DocEvent.objects.all().order_by('-time')[0]
-    
-    return render(request, 'console/main.html', {
-        'latest_docevent': latest_docevent},
-    )
diff --git a/ietf/secr/groups/forms.py b/ietf/secr/groups/forms.py
deleted file mode 100644
index 7b9611515e..0000000000
--- a/ietf/secr/groups/forms.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import re
-
-from django import forms
-from django.db.models import Count
-
-from ietf.group.models import Group, Role
-from ietf.name.models import GroupStateName, GroupTypeName, RoleName
-from ietf.person.models import Person, Email
-
-
-# ---------------------------------------------
-# Select Choices 
-# ---------------------------------------------
-SEARCH_MEETING_CHOICES = (('',''),('NO','NO'),('YES','YES'))
-
-# ---------------------------------------------
-# Functions
-# ---------------------------------------------
-def get_person(name):
-    '''
-    This function takes a string which is in the name autocomplete format "name - (id)"
-    and returns a person object
-    '''
- 
-    match = re.search(r'\((\d+)\)', name)
-    if not match:
-        return None
-    id = match.group(1)
-    try:
-       person = Person.objects.get(id=id)
-    except (Person.ObjectDoesNoExist, Person.MultipleObjectsReturned):
-        return None
-    return person
-
-def get_parent_group_choices():
-    area_choices = [(g.id, g.name) for g in Group.objects.filter(type='area',state='active')]
-    other_parents = Group.objects.annotate(children=Count('group')).filter(children__gt=0).order_by('name').exclude(type='area')
-    other_choices = [(g.id, g.name) for g in other_parents]
-    choices = (('Working Group Areas',area_choices),('Other',other_choices))
-    return choices
-
-# ---------------------------------------------
-# Forms
-# ---------------------------------------------
-
-class DescriptionForm (forms.Form):
-    description = forms.CharField(widget=forms.Textarea(attrs={'rows':'20'}),required=True, strip=False)
-
-
-
-class RoleForm(forms.Form):
-    name = forms.ModelChoiceField(RoleName.objects.filter(slug__in=('chair','editor','secr','techadv')),empty_label=None)
-    person = forms.CharField(max_length=50,widget=forms.TextInput(attrs={'class':'name-autocomplete'}),help_text="To see a list of people type the first name, or last name, or both.")
-    email = forms.CharField(widget=forms.Select(),help_text="Select an email")
-    group_acronym = forms.CharField(widget=forms.HiddenInput(),required=False)
-    
-    def __init__(self, *args, **kwargs):
-        self.group = kwargs.pop('group')
-        super(RoleForm, self).__init__(*args,**kwargs)
-        # this form is re-used in roles app, use different roles in select
-        if self.group.features.custom_group_roles:
-            self.fields['name'].queryset = RoleName.objects.all()
-        
-    # check for id within parenthesis to ensure name was selected from the list 
-    def clean_person(self):
-        person = self.cleaned_data.get('person', '')
-        m = re.search(r'(\d+)', person)
-        if person and not m:
-            raise forms.ValidationError("You must select an entry from the list!") 
-        
-        # return person object
-        return get_person(person)
-    
-    # check that email exists and return the Email object
-    def clean_email(self):
-        email = self.cleaned_data['email']
-        try:
-            obj = Email.objects.get(address=email)
-        except Email.ObjectDoesNoExist:
-            raise forms.ValidationError("Email address not found!")
-        
-        # return email object
-        return obj
-    
-    def clean(self):
-        # here we abort if there are any errors with individual fields
-        # One predictable problem is that the user types a name rather then
-        # selecting one from the list, as instructed to do.  We need to abort
-        # so the error is displayed before trying to call get_person()
-        if any(self.errors):
-            # Don't bother validating the formset unless each form is valid on its own
-            return
-        super(RoleForm, self).clean()
-        cleaned_data = self.cleaned_data
-        person = cleaned_data['person']
-        email = cleaned_data['email']
-        name = cleaned_data['name']
-        group_acronym = cleaned_data['group_acronym']
-        
-        if email.person != person:
-            raise forms.ValidationError('ERROR: The person associated with the chosen email address is different from the chosen person')
-
-        if Role.objects.filter(name=name,group=self.group,person=person,email=email):
-            raise forms.ValidationError('ERROR: This is a duplicate entry')
-        
-        if not group_acronym:
-            raise forms.ValidationError('You must select a group.')
-
-        return cleaned_data
-        
-class SearchForm(forms.Form):
-    group_acronym = forms.CharField(max_length=12,required=False)
-    group_name = forms.CharField(max_length=80,required=False)
-    primary_area = forms.ModelChoiceField(queryset=Group.objects.filter(type='area',state='active'),required=False)
-    type = forms.ModelChoiceField(queryset=GroupTypeName.objects.all(),required=False)
-    meeting_scheduled = forms.CharField(widget=forms.Select(choices=SEARCH_MEETING_CHOICES),required=False)
-    state = forms.ModelChoiceField(queryset=GroupStateName.objects.exclude(slug__in=('dormant','unknown')),required=False)
diff --git a/ietf/secr/groups/tests.py b/ietf/secr/groups/tests.py
deleted file mode 100644
index f4772abcfa..0000000000
--- a/ietf/secr/groups/tests.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.urls import reverse
-from ietf.utils.test_utils import TestCase
-from ietf.group.models import Group
-from ietf.secr.groups.forms import get_parent_group_choices
-from ietf.group.factories import GroupFactory, RoleFactory
-from ietf.meeting.factories import MeetingFactory
-from ietf.person.factories import PersonFactory
-import debug                            # pyflakes:ignore
-
-class GroupsTest(TestCase):
-    def test_get_parent_group_choices(self):
-        GroupFactory(type_id='area')
-        choices = get_parent_group_choices()
-        area = Group.objects.filter(type='area',state='active').first()
-        # This is opaque. Can it be rewritten to be more self-documenting?
-        self.assertEqual(choices[0][1][0][0],area.id)
-
-    # ------- Test Search -------- #
-    def test_search(self):
-        "Test Search"
-        MeetingFactory(type_id='ietf')
-        group = GroupFactory()
-        url = reverse('ietf.secr.groups.views.search')
-        post_data = {'group_acronym':group.acronym,'submit':'Search'}
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.post(url,post_data,follow=True)
-        self.assertContains(response, group.acronym)
-
-    # ------- Test View -------- #
-    def test_view(self):
-        MeetingFactory(type_id='ietf')
-        group = GroupFactory()
-        url = reverse('ietf.secr.groups.views.view', kwargs={'acronym':group.acronym})
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-
-    # ------- Test People -------- #
-    def test_people_delete(self):
-        role = RoleFactory(name_id='member')
-        group = role.group
-        id = role.id
-        url = reverse('ietf.secr.groups.views.delete_role', kwargs={'acronym':group.acronym,'id':role.id})
-        target = reverse('ietf.secr.groups.views.people', kwargs={'acronym':group.acronym})
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        response = self.client.post(url, {'post':'yes'})
-        self.assertRedirects(response, target)
-        self.assertFalse(group.role_set.filter(id=id))
-
-    def test_people_add(self):
-        person = PersonFactory()
-        group = GroupFactory()
-        url = reverse('ietf.secr.groups.views.people', kwargs={'acronym':group.acronym})
-        post_data = {'group_acronym':group.acronym,
-                     'name':'chair',
-                     'person':'Joe Smith - (%s)' % person.id,
-                     'email':person.email_set.all()[0].address,
-                     'submit':'Add'}
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.post(url,post_data,follow=True)
-        self.assertRedirects(response, url)
-        self.assertContains(response, 'added successfully')
diff --git a/ietf/secr/groups/urls.py b/ietf/secr/groups/urls.py
deleted file mode 100644
index 60d3566cab..0000000000
--- a/ietf/secr/groups/urls.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from django.conf import settings
-
-from ietf.secr.groups import views
-from ietf.utils.urls import url
-
-urlpatterns = [
-    url(r'^$', views.search),
-    url(r'^blue-dot-report/$', views.blue_dot),
-    #(r'^ajax/get_ads/$', views.get_ads),
-    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, views.view),
-    url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, views.delete_role),
-    url(r'^%(acronym)s/charter/$' % settings.URL_REGEXPS, views.charter),
-    url(r'^%(acronym)s/people/$' % settings.URL_REGEXPS, views.people),
-]
diff --git a/ietf/secr/groups/views.py b/ietf/secr/groups/views.py
deleted file mode 100644
index 16b41a55aa..0000000000
--- a/ietf/secr/groups/views.py
+++ /dev/null
@@ -1,301 +0,0 @@
-from django.contrib import messages
-from django.conf import settings
-from django.shortcuts import render, get_object_or_404, redirect
-
-from ietf.group.models import Group, GroupEvent, Role
-from ietf.group.utils import save_group_in_history, get_charter_text
-from ietf.ietfauth.utils import role_required
-from ietf.person.models import Person
-from ietf.secr.groups.forms import RoleForm, SearchForm
-from ietf.secr.utils.meeting import get_current_meeting
-from ietf.liaisons.views import contacts_from_roles
-
-# -------------------------------------------------
-# Helper Functions
-# -------------------------------------------------
-
-def add_legacy_fields(group):
-    '''
-    This function takes a Group object as input and adds legacy attributes:
-    start_date,proposed_date,concluded_date,meeting_scheduled
-    '''
-    # it's possible there could be multiple records of a certain type in which case
-    # we just return the latest record
-    query = GroupEvent.objects.filter(group=group, type="changed_state").order_by('time')
-    proposed = query.filter(changestategroupevent__state="proposed")
-    meeting = get_current_meeting()
-
-    if proposed:
-        group.proposed_date = proposed[0].time
-    active = query.filter(changestategroupevent__state="active")
-    if active:
-        group.start_date = active[0].time
-    concluded = query.filter(changestategroupevent__state="conclude")
-    if concluded:
-        group.concluded_date = concluded[0].time
-
-    if group.session_set.filter(meeting__number=meeting.number):
-        group.meeting_scheduled = 'YES'
-    else:
-        group.meeting_scheduled = 'NO'
-
-    group.chairs = group.role_set.filter(name="chair")
-    group.techadvisors = group.role_set.filter(name="techadv")
-    group.editors = group.role_set.filter(name="editor")
-    group.secretaries = group.role_set.filter(name="secr")
-    # Note: liaison_contacts is now a dict instead of a model instance with fields. In
-    # templates, the dict can still be accessed using '.contacts' and .cc_contacts', though.
-    group.liaison_contacts = dict(
-        contacts=contacts_from_roles(group.role_set.filter(name='liaison_contact')),
-        cc_contacts=contacts_from_roles(group.role_set.filter(name='liaison_cc_contact')),
-    )
-
-    #fill_in_charter_info(group)
-
-#--------------------------------------------------
-# AJAX Functions
-# -------------------------------------------------
-'''
-def get_ads(request):
-    """ AJAX function which takes a URL parameter, "area" and returns the area directors
-    in the form of a list of dictionaries with "id" and "value" keys(in json format).
-    Used to populate select options.
-    """
-
-    results=[]
-    area = request.GET.get('area','')
-    qs = AreaDirector.objects.filter(area=area)
-    for item in qs:
-        d = {'id': item.id, 'value': item.person.first_name + ' ' + item.person.last_name}
-        results.append(d)
-
-    return HttpResponse(json.dumps(results), content_type='application/javascript')
-'''
-# -------------------------------------------------
-# Standard View Functions
-# -------------------------------------------------
-
-
-
-@role_required('Secretariat')
-def blue_dot(request):
-    '''
-    This is a report view.  It returns a text/plain listing of working group chairs.
-    '''
-    people = Person.objects.filter(role__name__slug='chair',
-                                   role__group__type='wg',
-                                   role__group__state__slug__in=('active','bof','proposed')).distinct()
-    chairs = []
-    for person in people:
-        parts = person.name_parts()
-        groups = [ r.group.acronym for r in person.role_set.filter(name__slug='chair',
-                                                                   group__type='wg',
-                                                                   group__state__slug__in=('active','bof','proposed')) ]
-        entry = {'name':'%s, %s' % (parts[3], parts[1]),
-                 'groups': ', '.join(groups)}
-        chairs.append(entry)
-
-    # sort the list
-    sorted_chairs = sorted(chairs, key = lambda a: a['name'])
-
-    return render(request, 'groups/blue_dot_report.txt', { 'chairs':sorted_chairs },
-        content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET,
-    )
-
-@role_required('Secretariat')
-def charter(request, acronym):
-    """
-    View Group Charter
-
-    **Templates:**
-
-    * ``groups/charter.html``
-
-    **Template Variables:**
-
-    * group, charter_text
-
-    """
-
-    group = get_object_or_404(Group, acronym=acronym)
-    # TODO: get_charter_text() should be updated to return None
-    if group.charter:
-        charter_text = get_charter_text(group)
-    else:
-        charter_text = ''
-
-    return render(request, 'groups/charter.html', {
-        'group': group,
-        'charter_text': charter_text},
-    )
-
-@role_required('Secretariat')
-def delete_role(request, acronym, id):
-    """
-    Handle deleting roles for groups (chair, editor, advisor, secretary)
-
-    **Templates:**
-
-    * none
-
-    Redirects to people page on success.
-
-    """
-    group = get_object_or_404(Group, acronym=acronym)
-    role = get_object_or_404(Role, id=id)
-    
-    if request.method == 'POST' and request.POST['post'] == 'yes':
-        # save group
-        save_group_in_history(group)
-
-        role.delete()
-        messages.success(request, 'The entry was deleted successfully')
-        return redirect('ietf.secr.groups.views.people', acronym=acronym)
-
-    return render(request, 'confirm_delete.html', {'object': role})
-
-
-@role_required('Secretariat')
-def people(request, acronym):
-    """
-    Edit Group Roles (Chairs, Secretary, etc)
-
-    **Templates:**
-
-    * ``groups/people.html``
-
-    **Template Variables:**
-
-    * form, group
-
-    """
-
-    group = get_object_or_404(Group, acronym=acronym)
-
-    if request.method == 'POST':
-        # we need to pass group for form validation
-        form = RoleForm(request.POST,group=group)
-        if form.is_valid():
-            name = form.cleaned_data['name']
-            person = form.cleaned_data['person']
-            email = form.cleaned_data['email']
-
-            # save group
-            save_group_in_history(group)
-
-            Role.objects.create(name=name,
-                                person=person,
-                                email=email,
-                                group=group)
-
-            if not email.origin or email.origin == person.user.username:
-                email.origin = "role: %s %s" % (group.acronym, name.slug)
-                email.save()
-
-            messages.success(request, 'New %s added successfully!' % name)
-            return redirect('ietf.secr.groups.views.people', acronym=group.acronym)
-    else:
-        form = RoleForm(initial={'name':'chair', 'group_acronym':group.acronym}, group=group)
-
-    return render(request, 'groups/people.html', {
-        'form':form,
-        'group':group},
-    )
-
-@role_required('Secretariat')
-def search(request):
-    """
-    Search IETF Groups
-
-    **Templates:**
-
-    * ``groups/search.html``
-
-    **Template Variables:**
-
-    * form, results
-
-    """
-    results = []
-    if request.method == 'POST':
-        form = SearchForm(request.POST)
-
-        if form.is_valid():
-            kwargs = {}
-            group_acronym = form.cleaned_data['group_acronym']
-            group_name = form.cleaned_data['group_name']
-            primary_area = form.cleaned_data['primary_area']
-            meeting_scheduled = form.cleaned_data['meeting_scheduled']
-            state = form.cleaned_data['state']
-            type = form.cleaned_data['type']
-            meeting = get_current_meeting()
-
-            # construct seach query
-            if group_acronym:
-                kwargs['acronym__istartswith'] = group_acronym
-            if group_name:
-                kwargs['name__istartswith'] = group_name
-            if primary_area:
-                kwargs['parent'] = primary_area
-            if state:
-                kwargs['state'] = state
-            if type:
-                kwargs['type'] = type
-            #else:
-            #    kwargs['type__in'] = ('wg','rg','ietf','ag','sdo','team')
-
-            if meeting_scheduled == 'YES':
-                kwargs['session__meeting__number'] = meeting.number
-            # perform query
-            if kwargs:
-                if meeting_scheduled == 'NO':
-                    qs = Group.objects.filter(**kwargs).exclude(session__meeting__number=meeting.number).distinct()
-                else:
-                    qs = Group.objects.filter(**kwargs).distinct()
-            else:
-                qs = Group.objects.all()
-            results = qs.order_by('acronym')
-
-            # if there's just one result go straight to view
-            if len(results) == 1:
-                return redirect('ietf.secr.groups.views.view', acronym=results[0].acronym)
-
-    # process GET argument to support link from area app
-    elif 'primary_area' in request.GET:
-        area = request.GET.get('primary_area','')
-        results = Group.objects.filter(parent__id=area,type='wg',state__in=('bof','active','proposed')).order_by('name')
-        form = SearchForm({'primary_area':area,'state':'','type':'wg'})
-    else:
-        form = SearchForm(initial={'state':'active'})
-
-    # loop through results and tack on meeting_scheduled because it is no longer an
-    # attribute of the meeting model
-    for result in results:
-        add_legacy_fields(result)
-
-    return render(request, 'groups/search.html', {
-        'results': results,
-        'form': form},
-    )
-
-@role_required('Secretariat')
-def view(request, acronym):
-    """
-    View IETF Group details
-
-    **Templates:**
-
-    * ``groups/view.html``
-
-    **Template Variables:**
-
-    * group
-
-    """
-
-    group = get_object_or_404(Group, acronym=acronym)
-
-    add_legacy_fields(group)
-
-    return render(request, 'groups/view.html', { 'group': group } )
-
diff --git a/ietf/secr/meetings/blue_sheets.py b/ietf/secr/meetings/blue_sheets.py
deleted file mode 100644
index 6175541212..0000000000
--- a/ietf/secr/meetings/blue_sheets.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import io
-
-from django.conf import settings
-from django.utils.encoding import force_bytes
-
-r'''
-RTF quick reference (from Word2007RTFSpec9.doc):
-\fs24       : sets the font size to 24 half points
-\header     : header on all pages
-\headerf    : header on first page only
-\pard       : resets any previous paragraph formatting
-\plain      : resets any previous character formatting
-\qr         : right-aligned
-\tqc        : centered tab
-\tqr        : flush-right tab
-\tx         : tab position in twips (1440/inch) from the left margin
-\nowidctlpar    : no window/orphan control
-\widctlpar      : window/orphan control
-'''
-
-def create_blue_sheets(meeting, groups):
-    file = io.open(settings.SECR_BLUE_SHEET_PATH, 'wb')
-    
-    header = b'''{\\rtf1\\ansi\\ansicpg1252\\uc1 \\deff0\\deflang1033\\deflangfe1033
- {\\fonttbl{\\f0\\froman\\fcharset0\\fprq2{\\*\\panose 02020603050405020304}Times New Roman;}}
- {\\colortbl;\\red0\\green0\\blue0;\\red0\\green0\\blue255;\\red0\\green255\\blue255;\\red0\\green255\\blue0;
-\\red255\\green0\\blue255;\\red255\\green0\\blue0;\\red255\\green255\\blue0;\\red255\\green255\\blue255;
-\\red0\\green0\\blue128;\\red0\\green128\\blue128;\\red0\\green128\\blue0;\\red128\\green0\\blue128;
-\\red128\\green0\\blue0;\\red128\\green128\\blue0;\\red128\\green128\\blue128;
-\\red192\\green192\\blue192;}
- \\widowctrl\\ftnbj\\aenddoc\\hyphcaps0\\formshade\\viewkind1\\viewscale100\\pgbrdrhead\\pgbrdrfoot
- \\fet0\\sectd \\pgnrestart\\linex0\\endnhere\\titlepg\\sectdefaultcl'''
-
-    file.write(header)
-    
-    for group in groups:
-        group_header = b''' {\\header \\pard\\plain \\s15\\nowidctlpar\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright \\fs20\\cgrid
- { Mailing List: %s \\tab\\tab Meeting # %s  %s (%s) \\par }
- \\pard \\s15\\nowidctlpar\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright
- {\\b\\fs24
- \\par
- \\par \\tab The NOTE WELL statement applies to this meeting.  Participants acknowledge that these attendance records will be made available to the public.
- \\par
- \\par                 NAME                          ORGANIZATION
- \\par \\tab
- \\par }}
- {\\footer \\pard\\plain \\s16\\qc\\nowidctlpar\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright \\fs20\\cgrid {\\cs17 Page }
- {\\field{\\*\\fldinst {\\cs17  PAGE }}}
- { \\par }}
-  {\\headerf \\pard\\plain \\s15\\qr\\nowidctlpar\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright \\fs20\\cgrid
-  {\\b\\fs24 Meeting # %s %s (%s) \\par }}
- {\\footerf \\pard\\plain \\s16\\qc\\nowidctlpar\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright \\fs20\\cgrid
-  {Page 1 \\par }}
-  \\pard\\plain \\qc\\nowidctlpar\\widctlpar\\adjustright \\fs20\\cgrid
-  {\\b\\fs32 %s IETF Working Group Roster \\par }
-  \\pard \\nowidctlpar\\widctlpar\\adjustright
-  {\\fs28 \\par Working Group Session: %s \\par \\par }
-{\\b \\fs24 Mailing List: %s \\tx5300\\tab Date: ___________________     \\par \\par Chairperson:_________________________________________________________ \\par \\par }
- {\\tab \\tab      }
-{\\par \\tab The NOTE WELL statement applies to this meeting.  Participants acknowledge that these attendance records will be made available to the public. \\par 
-\\par\\b                   NAME                                   ORGANIZATION
-\\par }
-  \\pard \\fi-90\\li90\\nowidctlpar\\widctlpar\\adjustright
- {\\fs16
-''' % (force_bytes(group.list_email),
-       force_bytes(meeting.number),
-       force_bytes(group.acronym),
-       force_bytes(group.type),
-       force_bytes(meeting.number),
-       force_bytes(group.acronym),
-       force_bytes(group.type),
-       force_bytes(meeting.number),
-       force_bytes(group.name),
-       force_bytes(group.list_email),
-       )
-       
-        file.write(group_header)
-        for x in range(1,117):
-            line = b'''\\par %s._________________________________________________ \\tab _____________________________________________________
- \\par
- ''' % force_bytes(x)
-            file.write(line)
-            
-        footer = b'''}
-\\pard \\nowidctlpar\\widctlpar\\adjustright
-{\\fs16 \\sect }
-\\sectd \\pgnrestart\\linex0\\endnhere\\titlepg\\sectdefaultcl
-'''
-        file.write(footer)
-
-    file.write(b'\n}')
-    file.close()
diff --git a/ietf/secr/meetings/forms.py b/ietf/secr/meetings/forms.py
index 50ccddbb72..1be22a9d6c 100644
--- a/ietf/secr/meetings/forms.py
+++ b/ietf/secr/meetings/forms.py
@@ -166,6 +166,15 @@ def get_day_choices(self):
         for n in range(-self.meeting.days, self.meeting.days):
             date = start + datetime.timedelta(days=n)
             choices.append((n, date.strftime("%a %b %d")))
+        # make sure the choices include the initial day
+        if self.initial and 'day' in self.initial:
+            day = self.initial['day']
+            date = start + datetime.timedelta(days=day)
+            datestr = date.strftime("%a %b %d")
+            if day < -self.meeting.days:
+                choices.insert(0, (day, datestr))
+            elif day >= self.meeting.days:
+                choices.append((day, datestr))
         return choices
 
 
@@ -229,17 +238,8 @@ def clean_group(self):
             raise forms.ValidationError("ERROR: can't change group after materials have been uploaded")
         return group
 
-class UploadBlueSheetForm(forms.Form):
-    file = forms.FileField(help_text='example: bluesheets-84-ancp-01.pdf')
-    
-    def clean_file(self):
-        file = self.cleaned_data['file']
-        if not re.match(r'bluesheets-\d+',file.name):
-            raise forms.ValidationError('Incorrect filename format')
-        return file
 
 class RegularSessionEditForm(forms.ModelForm):
     class Meta:
         model = Session
         fields = ['agenda_note']
-
diff --git a/ietf/secr/proceedings/__init__.py b/ietf/secr/meetings/migrations/__init__.py
similarity index 100%
rename from ietf/secr/proceedings/__init__.py
rename to ietf/secr/meetings/migrations/__init__.py
diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py
index c6576a0cce..08c792ce1e 100644
--- a/ietf/secr/meetings/tests.py
+++ b/ietf/secr/meetings/tests.py
@@ -3,17 +3,13 @@
 
 
 import datetime
-import os
-import shutil
 
-from pathlib import Path
 from pyquery import PyQuery
-from io import StringIO
 
 import debug         # pyflakes:ignore
 
-from django.conf import settings
 from django.urls import reverse
+from django.utils import timezone
 
 from ietf.group.models import Group, GroupEvent
 from ietf.meeting.factories import MeetingFactory
@@ -28,24 +24,6 @@
 
 class SecrMeetingTestCase(TestCase):
     settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['AGENDA_PATH']
-    def setUp(self):
-        super().setUp()
-        self.bluesheet_dir = self.tempdir('bluesheet')
-        self.bluesheet_path = os.path.join(self.bluesheet_dir,'blue_sheet.rtf')
-        self.saved_secr_blue_sheet_path = settings.SECR_BLUE_SHEET_PATH
-        settings.SECR_BLUE_SHEET_PATH = self.bluesheet_path
-
-        # n.b., the bluesheet upload relies on SECR_PROCEEDINGS_DIR being the same
-        # as AGENDA_PATH. This is probably a bug, but may not be worth fixing if
-        # the secr app is on the way out.
-        self.saved_secr_proceedings_dir = settings.SECR_PROCEEDINGS_DIR
-        settings.SECR_PROCEEDINGS_DIR = settings.AGENDA_PATH
-
-    def tearDown(self):
-        settings.SECR_PROCEEDINGS_DIR = self.saved_secr_proceedings_dir
-        settings.SECR_BLUE_SHEET_PATH = self.saved_secr_blue_sheet_path
-        shutil.rmtree(self.bluesheet_dir)
-        super().tearDown()
 
     def test_main(self):
         "Main Test"
@@ -104,6 +82,10 @@ def test_add_meeting(self):
             [cn.slug for cn in new_meeting.group_conflict_types.all()],
             post_data['group_conflict_types'],
         )
+        self.assertEqual(
+            new_meeting.session_request_lock_message, 
+            "Session requests for this meeting have not yet opened.",
+        )
 
     def test_add_meeting_default_conflict_types(self):
         """Add meeting should default to same conflict types as previous meeting"""
@@ -137,7 +119,10 @@ def test_edit_meeting(self):
         "Edit Meeting"
         meeting = make_meeting_test_data()
         url = reverse('ietf.secr.meetings.views.edit_meeting',kwargs={'meeting_id':meeting.number})
-        post_data = dict(number=meeting.number,date='2014-07-20',city='Toronto',
+        post_data = dict(number=meeting.number,
+                         date='2014-07-20',
+                         city='Toronto',
+                         time_zone='America/Toronto',
                          days=7,
                          idsubmit_cutoff_day_offset_00=13,
                          idsubmit_cutoff_day_offset_01=20,
@@ -166,34 +151,6 @@ def test_edit_meeting(self):
             [cn.slug for cn in meeting.group_conflict_types.all()],
             post_data['group_conflict_types'],
         )
-
-    def test_blue_sheets_upload(self):
-        "Test Bluesheets"
-        meeting = make_meeting_test_data()
-        (Path(settings.SECR_PROCEEDINGS_DIR) / str(meeting.number) / 'bluesheets').mkdir(parents=True)
-
-        url = reverse('ietf.secr.meetings.views.blue_sheet',kwargs={'meeting_id':meeting.number})
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        
-        # test upload
-        group = Group.objects.filter(type='wg',state='active').first()
-        file = StringIO('dummy bluesheet')
-        file.name = "bluesheets-%s-%s.pdf" % (meeting.number,group.acronym)
-        files = {'file':file}
-        response = self.client.post(url, files)
-        self.assertEqual(response.status_code, 302)
-        path = os.path.join(settings.SECR_PROCEEDINGS_DIR,str(meeting.number),'bluesheets')
-        self.assertEqual(len(os.listdir(path)),1)
-
-    def test_blue_sheets_generate(self):
-        meeting = make_meeting_test_data()
-        url = reverse('ietf.secr.meetings.views.blue_sheet_generate',kwargs={'meeting_id':meeting.number})
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, 302)
-        self.assertTrue(os.path.exists(self.bluesheet_path))
         
     def test_notifications(self):
         "Test Notifications"
@@ -212,8 +169,8 @@ def test_notifications(self):
         self.assertEqual(q('#id_notification_list').html(),'ames, mars')
 
         # test that only changes since last notification show up
-        now = datetime.datetime.now()
-        then = datetime.datetime.now()+datetime.timedelta(hours=1)
+        now = timezone.now()
+        then = timezone.now()+datetime.timedelta(hours=1)
         person = Person.objects.get(name="(System)")
         GroupEvent.objects.create(group=mars_group,time=now,type='sent_notification',
                                   by=person,desc='sent scheduled notification for %s' % meeting)
@@ -285,7 +242,7 @@ def test_meetings_times_delete(self):
         url = reverse('ietf.secr.meetings.views.times_delete',kwargs={
             'meeting_id':meeting.number,
             'schedule_name':meeting.schedule.name,
-            'time':qs.first().time.strftime("%Y:%m:%d:%H:%M")
+            'time':qs.first().time.astimezone(meeting.tz()).strftime("%Y:%m:%d:%H:%M")
         })
         redirect_url = reverse('ietf.secr.meetings.views.times',kwargs={
             'meeting_id':meeting.number,
@@ -305,7 +262,7 @@ def test_meetings_times_edit(self):
         url = reverse('ietf.secr.meetings.views.times_edit',kwargs={
             'meeting_id':72,
             'schedule_name':'test-schedule',
-            'time':timeslot.time.strftime("%Y:%m:%d:%H:%M")
+            'time':timeslot.time.astimezone(meeting.tz()).strftime("%Y:%m:%d:%H:%M")
         })
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url, {
@@ -371,7 +328,7 @@ def test_meetings_misc_session_edit(self):
         timeslot = session.official_timeslotassignment().timeslot
         url = reverse('ietf.secr.meetings.views.misc_session_edit',kwargs={'meeting_id':72,'schedule_name':meeting.schedule.name,'slot_id':timeslot.pk})
         redirect_url = reverse('ietf.secr.meetings.views.misc_sessions',kwargs={'meeting_id':72,'schedule_name':'test-schedule'})
-        new_time = timeslot.time + datetime.timedelta(days=1)
+        new_time = (timeslot.time + datetime.timedelta(days=1)).astimezone(meeting.tz())
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -388,8 +345,9 @@ def test_meetings_misc_session_edit(self):
             'remote_instructions': 'http://webex.com/foobar',
         })
         self.assertRedirects(response, redirect_url)
+        session = Session.objects.get(pk=session.pk)  # get a clean instance to avoid cache problems
         timeslot = session.official_timeslotassignment().timeslot
-        self.assertEqual(timeslot.time,new_time)
+        self.assertEqual(timeslot.time, new_time)
 
     def test_meetings_misc_session_delete(self):
         meeting = make_meeting_test_data()
@@ -441,4 +399,4 @@ def test_get_times(self):
         times = get_times(meeting,day)
         values = [ x[0] for x in times ]
         self.assertTrue(times)
-        self.assertTrue(timeslot.time.strftime('%H%M') in values)
\ No newline at end of file
+        self.assertTrue(timeslot.time.strftime('%H%M') in values)
diff --git a/ietf/secr/meetings/urls.py b/ietf/secr/meetings/urls.py
index 96c61d47b4..cc51bb0584 100644
--- a/ietf/secr/meetings/urls.py
+++ b/ietf/secr/meetings/urls.py
@@ -7,10 +7,7 @@
     url(r'^$', views.main),
     url(r'^add/$', views.add),
     # url(r'^ajax/get-times/(?P<meeting_id>\d{1,6})/(?P<day>\d)/$', views.ajax_get_times), # Not in use
-    url(r'^blue_sheet/$', views.blue_sheet_redirect),
     url(r'^(?P<meeting_id>\d{1,6})/$', views.view),
-    url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/$', views.blue_sheet),
-    url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/generate/$', views.blue_sheet_generate),
     url(r'^(?P<meeting_id>\d{1,6})/edit/$', views.edit_meeting),
     url(r'^(?P<meeting_id>\d{1,6})/notifications/$', views.notifications),
     url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/$', views.rooms),
diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py
index 7d6a227dcc..1f6f2f3297 100644
--- a/ietf/secr/meetings/views.py
+++ b/ietf/secr/meetings/views.py
@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2007-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 import datetime
-import os
-import time
 
 from django.conf import settings
 from django.contrib import messages
@@ -11,6 +9,7 @@
 from django.db.models.functions import Cast
 from django.forms.models import inlineformset_factory
 from django.shortcuts import render, get_object_or_404, redirect
+from django.utils import timezone
 from django.utils.text import slugify
 
 import debug                            # pyflakes:ignore
@@ -18,18 +17,18 @@
 from ietf.ietfauth.utils import role_required
 from ietf.utils.mail import send_mail
 from ietf.meeting.forms import duration_string
-from ietf.meeting.helpers import get_meeting, make_materials_directories, populate_important_dates
+from ietf.meeting.helpers import make_materials_directories, populate_important_dates
 from ietf.meeting.models import Meeting, Session, Room, TimeSlot, SchedTimeSessAssignment, Schedule, SchedulingEvent
-from ietf.meeting.utils import add_event_info_to_session_qs, handle_upload_file
+from ietf.meeting.utils import add_event_info_to_session_qs
+from ietf.meeting.views_session_request import get_initial_session
 from ietf.name.models import SessionStatusName
 from ietf.group.models import Group, GroupEvent
-from ietf.secr.meetings.blue_sheets import create_blue_sheets
 from ietf.secr.meetings.forms import ( BaseMeetingRoomFormSet, MeetingModelForm, MeetingSelectForm,
     MeetingRoomForm, MiscSessionForm, TimeSlotForm, RegularSessionEditForm,
-    UploadBlueSheetForm, MeetingRoomOptionsForm )
-from ietf.secr.sreq.views import get_initial_session
+    MeetingRoomOptionsForm )
 from ietf.secr.utils.meeting import get_session, get_timeslot
 from ietf.mailtrigger.utils import gather_address_lists
+from ietf.utils.timezone import make_aware
 
 
 # prep for agenda changes
@@ -62,15 +61,23 @@ def build_timeslots(meeting,room=None):
         else:
             source_meeting = get_last_meeting(meeting)
 
-        delta = meeting.date - source_meeting.date
         timeslots = []
-        time_seen = set()
+        time_seen = set()  # time of source_meeting timeslot
         for t in source_meeting.timeslot_set.filter(type='regular'):
             if not t.time in time_seen:
                 time_seen.add(t.time)
                 timeslots.append(t)
         for t in timeslots:
-            new_time = t.time + delta
+            # Create new timeslot at the same wall clock time on the same day relative to meeting start
+            day_offset = t.local_start_time().date() - source_meeting.date
+            new_date = meeting.date + day_offset
+            new_time = make_aware(
+                datetime.datetime.combine(
+                    new_date,
+                    t.local_start_time().time(),
+                ),
+                meeting.tz(),
+            )
             for room in rooms:
                 TimeSlot.objects.create(type_id='regular',
                                         meeting=meeting,
@@ -119,9 +126,9 @@ def is_combined(session,meeting,schedule=None):
 def send_notifications(meeting, groups, person):
     '''
     Send session scheduled email notifications for each group in groups.  Person is the
-    user who initiated this action, request.uesr.get_profile().
+    user who initiated this action, request.user.get_profile().
     '''
-    now = datetime.datetime.now()
+    now = timezone.now()
     for group in groups:
         sessions = group.session_set.filter(meeting=meeting)
         addrs = gather_address_lists('session_scheduled',group=group,session=sessions[0])
@@ -140,7 +147,7 @@ def send_notifications(meeting, groups, person):
             t = d['timeslot']
             dur = s.requested_duration.seconds/60
             items[i]['duration'] = "%d:%02d" % (dur//60, dur%60)
-            items[i]['period'] = '%s-%s' % (t.time.strftime('%H%M'),(t.time + t.duration).strftime('%H%M'))
+            items[i]['period'] = f"{t.local_start_time().strftime('%H%M')}-{t.local_end_time().strftime('%H%M')} {t.tz()}"
 
         # send email
         first_event = SchedulingEvent.objects.filter(session=sessions[0]).select_related('by').order_by('time', 'id').first()
@@ -216,9 +223,8 @@ def add(request):
             )
             meeting.schedule = schedule
 
-            # we want to carry session request lock status over from previous meeting
-            previous_meeting = get_meeting( int(meeting.number) - 1 )
-            meeting.session_request_lock_message = previous_meeting.session_request_lock_message
+            # Create meeting with session requests locked
+            meeting.session_request_lock_message = "Session requests for this meeting have not yet opened."
             meeting.save()
 
             populate_important_dates(meeting)
@@ -246,72 +252,6 @@ def add(request):
         'form': form},
     )
 
-@role_required('Secretariat')
-def blue_sheet(request, meeting_id):
-    '''
-    Blue Sheet view.  The user can generate blue sheets or upload scanned bluesheets
-    '''
-    meeting = get_object_or_404(Meeting, number=meeting_id)
-    url = settings.SECR_BLUE_SHEET_URL
-    blank_sheets_path = settings.SECR_BLUE_SHEET_PATH
-    try:
-        last_run = time.ctime(os.stat(blank_sheets_path).st_ctime)
-    except OSError:
-        last_run = None
-    uploaded_sheets_path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'bluesheets')
-    uploaded_files = sorted(os.listdir(uploaded_sheets_path))
-    
-    if request.method == 'POST':
-        form = UploadBlueSheetForm(request.POST,request.FILES)
-        if form.is_valid():
-            file = request.FILES['file']
-            save_error = handle_upload_file(file,file.name,meeting,'bluesheets')
-            if save_error:
-                form.add_error(None, save_error)
-            else:
-                messages.success(request, 'File Uploaded')
-                return redirect('ietf.secr.meetings.views.blue_sheet', meeting_id=meeting.number)
-    else:
-        form = UploadBlueSheetForm()
-
-    return render(request, 'meetings/blue_sheet.html', {
-        'meeting': meeting,
-        'url': url,
-        'form': form,
-        'last_run': last_run,
-        'uploaded_files': uploaded_files},
-    )
-
-@role_required('Secretariat')
-def blue_sheet_generate(request, meeting_id):
-    '''
-    Generate bluesheets
-    '''
-    meeting = get_object_or_404(Meeting, number=meeting_id)
-
-    if request.method == "POST":
-        groups = Group.objects.filter(
-            type__in=['wg','rg','ag','rag','program'],
-            session__timeslotassignments__schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None]).order_by('acronym')
-        create_blue_sheets(meeting, groups)
-
-        messages.success(request, 'Blue Sheets generated')
-    return redirect('ietf.secr.meetings.views.blue_sheet', meeting_id=meeting.number)
-
-@role_required('Secretariat')
-def blue_sheet_redirect(request):
-    '''
-    This is the generic blue sheet URL.  It gets the next IETF meeting and redirects
-    to the meeting specific URL.
-    '''
-    today = datetime.date.today()
-    qs = Meeting.objects.filter(date__gt=today,type='ietf').order_by('date')
-    if qs:
-        meeting = qs[0]
-    else:
-        meeting = Meeting.objects.filter(type='ietf').order_by('-date')[0]
-    return redirect('ietf.secr.meetings.views.blue_sheet', meeting_id=meeting.number)
-
 @role_required('Secretariat')
 def edit_meeting(request, meeting_id):
     '''
@@ -341,7 +281,6 @@ def edit_meeting(request, meeting_id):
 
     else:
         form = MeetingModelForm(instance=meeting)
-
     return render(request, 'meetings/edit_meeting.html', {
         'meeting': meeting,
         'form' : form, },
@@ -557,7 +496,7 @@ def misc_session_edit(request, meeting_id, schedule_name, slot_id):
                    'name':session.name,
                    'short':session.short,
                    'day':delta.days,
-                   'time':slot.time.strftime('%H:%M'),
+                   'time':slot.time.astimezone(meeting.tz()).strftime('%H:%M'),
                    'duration':duration_string(slot.duration),
                    'show_location':slot.show_location,
                    'purpose': session.purpose,
@@ -798,7 +737,8 @@ def get_timeslot_time(form, meeting):
     day = form.cleaned_data['day']
 
     date = meeting.date + datetime.timedelta(days=int(day))
-    return datetime.datetime(date.year,date.month,date.day,time.hour,time.minute)
+    return make_aware(datetime.datetime(date.year,date.month,date.day,time.hour,time.minute), meeting.tz())
+
 
 @role_required('Secretariat')
 def times_edit(request, meeting_id, schedule_name, time):
@@ -809,15 +749,22 @@ def times_edit(request, meeting_id, schedule_name, time):
     schedule = get_object_or_404(Schedule, meeting=meeting, name=schedule_name)
     
     parts = [ int(x) for x in time.split(':') ]
-    dtime = datetime.datetime(*parts)
+    dtime = make_aware(datetime.datetime(*parts), meeting.tz())
     timeslots = TimeSlot.objects.filter(meeting=meeting,time=dtime)
+    day = (dtime.date() - meeting.date).days
+    initial = {'day': day,
+               'time': dtime.strftime('%H:%M'),
+               'duration': timeslots.first().duration,
+               'name': timeslots.first().name}
 
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
             return redirect('ietf.secr.meetings.views.times', meeting_id=meeting_id,schedule_name=schedule_name)
 
-        form = TimeSlotForm(request.POST, meeting=meeting)
+        # Pass "initial" even for a POST so the choices initialize correctly if day is outside
+        # the standard set of options. See TimeSlotForm.get_day_choices().
+        form = TimeSlotForm(request.POST, initial=initial, meeting=meeting)
         if form.is_valid():
             day = form.cleaned_data['day']
             time = get_timeslot_time(form, meeting)
@@ -836,13 +783,6 @@ def times_edit(request, meeting_id, schedule_name, time):
     else:
         # we need to pass the session to the form in order to disallow changing
         # of group after materials have been uploaded
-        day = dtime.strftime('%w')
-        if day == 6:
-            day = -1
-        initial = {'day':day,
-                   'time':dtime.strftime('%H:%M'),
-                   'duration':timeslots.first().duration,
-                   'name':timeslots.first().name}
         form = TimeSlotForm(initial=initial, meeting=meeting)
 
     return render(request, 'meetings/times_edit.html', {
@@ -860,7 +800,7 @@ def times_delete(request, meeting_id, schedule_name, time):
     meeting = get_object_or_404(Meeting, number=meeting_id)
     
     parts = [ int(x) for x in time.split(':') ]
-    dtime = datetime.datetime(*parts)
+    dtime = make_aware(datetime.datetime(*parts), meeting.tz())
     status = SessionStatusName.objects.get(slug='schedw')
 
     if request.method == 'POST' and request.POST['post'] == 'yes':
diff --git a/ietf/secr/middleware/dbquery.py b/ietf/secr/middleware/dbquery.py
deleted file mode 100644
index 34c96bd12b..0000000000
--- a/ietf/secr/middleware/dbquery.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright The IETF Trust 2014-2019, All Rights Reserved
-#import logging
-
-from django.db import connection
-from django.utils.log import getLogger  # type: ignore
-
-
-logger = getLogger(__name__)
-#logger.setLevel(logging.DEBUG)
-#logger.addHandler(logging.FileHandler(settings.SECR_LOG_FILE))
-
-class QueryCountDebugMiddleware(object):
-    """
-    This middleware will log the number of queries run
-    and the total time taken for each request (with a
-    status code of 200). It does not currently support
-    multi-db setups.
-    """
-    def process_response(self, request, response):
-        #assert False, request.path
-        logger.debug('called middleware. %s:%s' % (request.path,len(connection.queries)))
-        if response.status_code == 200:
-            total_time = 0
-            #for query in connection.queries:
-            #    query_time = query.get('time')
-            #    if query_time is None:
-                    # django-debug-toolbar monkeypatches the connection
-                    # cursor wrapper and adds extra information in each
-                    # item in connection.queries. The query time is stored
-                    # under the key "duration" rather than "time" and is
-                    # in milliseconds, not seconds.
-            #        query_time = query.get('duration', 0) / 1000
-            #    total_time += float(query_time)
-            logger.debug('%s: %s queries run, total %s seconds' % (request.path,len(connection.queries), total_time))
-        return response
diff --git a/ietf/secr/proceedings/forms.py b/ietf/secr/proceedings/forms.py
deleted file mode 100644
index 26dd419d66..0000000000
--- a/ietf/secr/proceedings/forms.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
-
-from django import forms
-
-from ietf.doc.models import Document
-from ietf.meeting.models import Session
-from ietf.meeting.utils import add_event_info_to_session_qs
-
-
-# ---------------------------------------------
-# Globals
-# ---------------------------------------------
-
-VALID_SLIDE_EXTENSIONS = ('.doc','.docx','.pdf','.ppt','.pptx','.txt','.zip')
-VALID_MINUTES_EXTENSIONS = ('.txt','.html','.htm','.pdf')
-VALID_AGENDA_EXTENSIONS = ('.txt','.html','.htm')
-VALID_BLUESHEET_EXTENSIONS = ('.pdf','.jpg','.jpeg')
-
-#----------------------------------------------------------
-# Forms
-#----------------------------------------------------------
-
-class RecordingForm(forms.Form):
-    external_url = forms.URLField(label='Url')
-    session = forms.ModelChoiceField(queryset=Session.objects)
-    session.widget.attrs['class'] = "select2-field"
-    session.widget.attrs['data-minimum-input-length'] = 0
-    
-    def __init__(self, *args, **kwargs):
-        self.meeting = kwargs.pop('meeting')
-        super(RecordingForm, self).__init__(*args,**kwargs)
-        self.fields['session'].queryset = add_event_info_to_session_qs(
-            Session.objects.filter(meeting=self.meeting, type__in=['regular','plenary','other'])
-        ).filter(current_status='sched').order_by('group__acronym')
-
-class RecordingEditForm(forms.ModelForm):
-    class Meta:
-        model = Document
-        fields = ['external_url']
-        
-    def __init__(self, *args, **kwargs):
-        super(RecordingEditForm, self).__init__(*args, **kwargs)
-        self.fields['external_url'].label='Url'
-
diff --git a/ietf/secr/proceedings/migrations/0001_initial.py b/ietf/secr/proceedings/migrations/0001_initial.py
deleted file mode 100644
index 2aee67d708..0000000000
--- a/ietf/secr/proceedings/migrations/0001_initial.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('meeting', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='InterimMeeting',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-                'indexes': [],
-            },
-            bases=('meeting.meeting',),
-        ),
-    ]
diff --git a/ietf/secr/proceedings/models.py b/ietf/secr/proceedings/models.py
deleted file mode 100644
index 75563429e5..0000000000
--- a/ietf/secr/proceedings/models.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import os
-
-from django.conf import settings
-from django.db import models
-
-from ietf.meeting.models import Meeting
-
-
-class InterimManager(models.Manager):
-    '''A custom manager to limit objects to type=interim'''
-    def get_queryset(self):
-        return super(InterimManager, self).get_queryset().filter(type='interim')
-        
-class InterimMeeting(Meeting):
-    '''
-    This class is a proxy of Meeting.  It's purpose is to provide extra methods that are 
-    useful for an interim meeting, to help in templates.  Most information is derived from 
-    the session associated with this meeting.  We are assuming there is only one.
-    '''
-    class Meta:
-        proxy = True
-        
-    objects = InterimManager()
-    
-    def group(self):
-        return self.session_set.all()[0].group
-
-    def agenda(self):                   # pylint: disable=method-hidden
-        session = self.session_set.all()[0]
-        agendas = session.materials.exclude(states__slug='deleted').filter(type='agenda')
-        if agendas:
-            return agendas[0]
-        else:
-            return None
-            
-    def minutes(self):
-        session = self.session_set.all()[0]
-        minutes = session.materials.exclude(states__slug='deleted').filter(type='minutes')
-        if minutes:
-            return minutes[0]
-        else:
-            return None
-        
-    def get_proceedings_path(self, group=None):
-        return os.path.join(self.get_materials_path(),'proceedings.html')
-    
-    def get_proceedings_url(self, group=None):
-        '''
-        If the proceedings file doesn't exist return empty string.  For use in templates.
-        '''
-        if os.path.exists(self.get_proceedings_path()):
-            url = "%sproceedings/%s/proceedings.html" % (
-                settings.IETF_HOST_URL,
-                self.number)
-            return url
-        else:
-            return ''
-
diff --git a/ietf/secr/proceedings/new_tables.sql b/ietf/secr/proceedings/new_tables.sql
deleted file mode 100644
index 43d590f3d8..0000000000
--- a/ietf/secr/proceedings/new_tables.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-CREATE TABLE `interim_slides` (
-    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
-    `meeting_num` integer NOT NULL,
-    `group_acronym_id` integer,
-    `slide_num` integer,
-    `slide_type_id` integer NOT NULL,
-    `slide_name` varchar(255) NOT NULL,
-    `irtf` integer NOT NULL,
-    `interim` bool NOT NULL,
-    `order_num` integer,
-    `in_q` integer
-)
-;
-CREATE TABLE `interim_minutes` (
-    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
-    `meeting_num` integer NOT NULL,
-    `group_acronym_id` integer NOT NULL,
-    `filename` varchar(255) NOT NULL,
-    `irtf` integer NOT NULL,
-    `interim` bool NOT NULL
-)
-;
-CREATE TABLE `interim_agenda` (
-    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
-    `meeting_num` integer NOT NULL,
-    `group_acronym_id` integer NOT NULL,
-    `filename` varchar(255) NOT NULL,
-    `irtf` integer NOT NULL,
-    `interim` bool NOT NULL
-)
-;
-CREATE TABLE `interim_meetings` (
-    `meeting_num` integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    `start_date` date ,
-    `end_date` date ,
-    `city` varchar(255) ,
-    `state` varchar(255) ,
-    `country` varchar(255) ,
-    `time_zone` integer,
-    `ack` longtext ,
-    `agenda_html` longtext ,
-    `agenda_text` longtext ,
-    `future_meeting` longtext ,
-    `overview1` longtext ,
-    `overview2` longtext ,
-    `group_acronym_id` integer 
-)
-;
-alter table interim_meetings auto_increment=201;
-
diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py
deleted file mode 100644
index 505bcdcc77..0000000000
--- a/ietf/secr/proceedings/proc_utils.py
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-'''
-proc_utils.py
-
-This module contains all the functions for generating static proceedings pages
-'''
-import datetime
-import os
-import re
-import subprocess
-from urllib.parse import urlencode
-
-import debug        # pyflakes:ignore
-
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
-
-from ietf.doc.models import Document, DocAlias, DocEvent, NewRevisionDocEvent, State
-from ietf.group.models import Group
-from ietf.meeting.models import Meeting, SessionPresentation, TimeSlot, SchedTimeSessAssignment, Session
-from ietf.person.models import Person
-from ietf.utils.log import log
-from ietf.utils.mail import send_mail
-
-AUDIO_FILE_RE = re.compile(r'ietf(?P<number>[\d]+)-(?P<room>.*)-(?P<time>[\d]{8}-[\d]{4})')
-VIDEO_TITLE_RE = re.compile(r'IETF(?P<number>[\d]+)-(?P<name>.*)-(?P<date>\d{8})-(?P<time>\d{4})')
-
-
-def _get_session(number,name,date,time):
-    '''Lookup session using data from video title'''
-    meeting = Meeting.objects.get(number=number)
-    timeslot_time = datetime.datetime.strptime(date + time,'%Y%m%d%H%M')
-    try:
-        assignment = SchedTimeSessAssignment.objects.get(
-            schedule__in = [meeting.schedule, meeting.schedule.base],
-            session__group__acronym = name.lower(),
-            timeslot__time = timeslot_time,
-        )
-    except (SchedTimeSessAssignment.DoesNotExist, SchedTimeSessAssignment.MultipleObjectsReturned):
-        return None
-
-    return assignment.session
-
-def _get_urls_from_json(doc):
-    '''Returns list of dictonary titel,url from search results'''
-    urls = []
-    for item in doc['items']:
-        title = item['snippet']['title']
-        #params = dict(v=item['snippet']['resourceId']['videoId'], list=item['snippet']['playlistId'])
-        params = [('v',item['snippet']['resourceId']['videoId']), ('list',item['snippet']['playlistId'])]
-        url = settings.YOUTUBE_BASE_URL + '?' + urlencode(params)
-        urls.append(dict(title=title, url=url))
-    return urls
-
-def import_audio_files(meeting):
-    '''
-    Checks for audio files and creates corresponding materials (docs) for the Session
-    Expects audio files in the format ietf[meeting num]-[room]-YYYMMDD-HHMM.*,
-    
-    Example: ietf90-salonb-20140721-1710.mp3
-    '''
-    from ietf.meeting.utils import add_event_info_to_session_qs
-
-    unmatched_files = []
-    path = os.path.join(settings.MEETING_RECORDINGS_DIR, meeting.type.slug + meeting.number)
-    if not os.path.exists(path):
-        return None
-    for filename in os.listdir(path):
-        timeslot = get_timeslot_for_filename(filename)
-        if timeslot:
-            sessions = add_event_info_to_session_qs(Session.objects.filter(
-                timeslotassignments__schedule=timeslot.meeting.schedule_id,
-            ).exclude(
-                agenda_note__icontains='canceled'
-            )).filter(
-                current_status='sched',
-            ).order_by('timeslotassignments__timeslot__time')
-            if not sessions:
-                continue
-            url = settings.IETF_AUDIO_URL + 'ietf{}/{}'.format(meeting.number, filename)
-            doc = get_or_create_recording_document(url, sessions[0])
-            attach_recording(doc, sessions)
-        else:
-            # use for reconciliation email
-            unmatched_files.append(filename)
-    
-    if unmatched_files:
-        send_audio_import_warning(unmatched_files)
-
-def get_timeslot_for_filename(filename):
-    '''Returns a timeslot matching the filename given.
-    NOTE: currently only works with ietfNN prefix (regular meetings)
-    '''
-    from ietf.meeting.utils import add_event_info_to_session_qs
-
-    basename, _ = os.path.splitext(filename)
-    match = AUDIO_FILE_RE.match(basename)
-    if match:
-        try:
-            meeting = Meeting.objects.get(number=match.groupdict()['number'])
-            room_mapping = {normalize_room_name(room.name): room.name for room in meeting.room_set.all()}
-            time = datetime.datetime.strptime(match.groupdict()['time'],'%Y%m%d-%H%M')
-            slots = TimeSlot.objects.filter(
-                meeting=meeting,
-                location__name=room_mapping[match.groupdict()['room']],
-                time=time,
-                sessionassignments__schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None],
-            ).distinct()
-            uncancelled_slots = [t for t in slots if not add_event_info_to_session_qs(t.sessions.all()).filter(current_status='canceled').exists()]
-            return uncancelled_slots[0]
-        except (ObjectDoesNotExist, KeyError, IndexError):
-            return None
-
-def attach_recording(doc, sessions):
-    '''Associate recording document with sessions'''
-    for session in sessions:
-        if doc not in session.materials.all():
-            # add document to session
-            presentation = SessionPresentation.objects.create(
-                session=session,
-                document=doc,
-                rev=doc.rev)
-            session.sessionpresentation_set.add(presentation)
-            if not doc.docalias.filter(name__startswith='recording-{}-{}'.format(session.meeting.number,session.group.acronym)):
-                sequence = get_next_sequence(session.group,session.meeting,'recording')
-                name = 'recording-{}-{}-{}'.format(session.meeting.number,session.group.acronym,sequence)
-                DocAlias.objects.create(name=name).docs.add(doc)
-
-def normalize_room_name(name):
-    '''Returns room name converted to be used as portion of filename'''
-    return name.lower().replace(' ','').replace('/','_')
-
-def get_or_create_recording_document(url,session):
-    try:
-        return Document.objects.get(external_url=url)
-    except ObjectDoesNotExist:
-        return create_recording(session,url)
-
-def create_recording(session, url, title=None, user=None):
-    '''
-    Creates the Document type=recording, setting external_url and creating
-    NewRevisionDocEvent
-    '''
-    sequence = get_next_sequence(session.group,session.meeting,'recording')
-    name = 'recording-{}-{}-{}'.format(session.meeting.number,session.group.acronym,sequence)
-    time = session.official_timeslotassignment().timeslot.time.strftime('%Y-%m-%d %H:%M')
-    if not title:
-        if url.endswith('mp3'):
-            title = 'Audio recording for {}'.format(time)
-        else:
-            title = 'Video recording for {}'.format(time)
-        
-    doc = Document.objects.create(name=name,
-                                  title=title,
-                                  external_url=url,
-                                  group=session.group,
-                                  rev='00',
-                                  type_id='recording')
-    doc.set_state(State.objects.get(type='recording', slug='active'))
-
-    DocAlias.objects.create(name=doc.name).docs.add(doc)
-    
-    # create DocEvent
-    NewRevisionDocEvent.objects.create(type='new_revision',
-                                       by=user or Person.objects.get(name='(System)'),
-                                       doc=doc,
-                                       rev=doc.rev,
-                                       desc='New revision available',
-                                       time=doc.time)
-    pres = SessionPresentation.objects.create(session=session,document=doc,rev=doc.rev)
-    session.sessionpresentation_set.add(pres)
-
-    return doc
-
-def get_next_sequence(group,meeting,type):
-    '''
-    Returns the next sequence number to use for a document of type = type.
-    Takes a group=Group object, meeting=Meeting object, type = string
-    '''
-    aliases = DocAlias.objects.filter(name__startswith='{}-{}-{}-'.format(type,meeting.number,group.acronym))
-    if not aliases:
-        return 1
-    aliases = aliases.order_by('name')
-    sequence = int(aliases.last().name.split('-')[-1]) + 1
-    return sequence
-
-def send_audio_import_warning(unmatched_files):
-    '''Send email to interested parties that some audio files weren't matched to timeslots'''
-    send_mail(request = None,
-              to       = settings.AUDIO_IMPORT_EMAIL,
-              frm      = "IETF Secretariat <ietf-secretariat@ietf.org>",
-              subject  = "Audio file import warning",
-              template = "proceedings/audio_import_warning.txt",
-              context  = dict(unmatched_files=unmatched_files),
-              extra    = {})
-
-# -------------------------------------------------
-# End Recording Functions
-# -------------------------------------------------
-
-def get_progress_stats(sdate,edate):
-    '''
-    This function takes a date range and produces a dictionary of statistics / objects for
-    use in a progress report.  Generally the end date will be the date of the last meeting
-    and the start date will be the date of the meeting before that.
-    '''
-    data = {}
-    data['sdate'] = sdate
-    data['edate'] = edate
-
-    events = DocEvent.objects.filter(doc__type='draft',time__gte=sdate,time__lt=edate)
-    
-    data['actions_count'] = events.filter(type='iesg_approved').count()
-    data['last_calls_count'] = events.filter(type='sent_last_call').count()
-    new_draft_events = events.filter(newrevisiondocevent__rev='00')
-    new_drafts = list(set([ e.doc_id for e in new_draft_events ]))
-    data['new_docs'] = list(set([ e.doc for e in new_draft_events ]))
-    data['new_drafts_count'] = len(new_drafts)
-    data['new_drafts_updated_count'] = events.filter(doc__id__in=new_drafts,newrevisiondocevent__rev='01').count()
-    data['new_drafts_updated_more_count'] = events.filter(doc__id__in=new_drafts,newrevisiondocevent__rev='02').count()
-    
-    update_events = events.filter(type='new_revision').exclude(doc__id__in=new_drafts)
-    data['updated_drafts_count'] = len(set([ e.doc_id for e in update_events ]))
-    
-    # Calculate Final Four Weeks stats (ffw)
-    ffwdate = edate - datetime.timedelta(days=28)
-    ffw_new_count = events.filter(time__gte=ffwdate,newrevisiondocevent__rev='00').count()
-    try:
-        ffw_new_percent = format(ffw_new_count / float(data['new_drafts_count']),'.0%')
-    except ZeroDivisionError:
-        ffw_new_percent = 0
-        
-    data['ffw_new_count'] = ffw_new_count
-    data['ffw_new_percent'] = ffw_new_percent
-    
-    ffw_update_events = events.filter(time__gte=ffwdate,type='new_revision').exclude(doc__id__in=new_drafts)
-    ffw_update_count = len(set([ e.doc_id for e in ffw_update_events ]))
-    try:
-        ffw_update_percent = format(ffw_update_count / float(data['updated_drafts_count']),'.0%')
-    except ZeroDivisionError:
-        ffw_update_percent = 0
-    
-    data['ffw_update_count'] = ffw_update_count
-    data['ffw_update_percent'] = ffw_update_percent
-
-    rfcs = events.filter(type='published_rfc')
-    data['rfcs'] = rfcs.select_related('doc').select_related('doc__group').select_related('doc__intended_std_level')
-
-    data['counts'] = {'std':rfcs.filter(doc__intended_std_level__in=('ps','ds','std')).count(),
-                      'bcp':rfcs.filter(doc__intended_std_level='bcp').count(),
-                      'exp':rfcs.filter(doc__intended_std_level='exp').count(),
-                      'inf':rfcs.filter(doc__intended_std_level='inf').count()}
-
-    data['new_groups'] = Group.objects.filter(
-        type='wg',
-        groupevent__changestategroupevent__state='active',
-        groupevent__time__gte=sdate,
-        groupevent__time__lt=edate)
-        
-    data['concluded_groups'] = Group.objects.filter(
-        type='wg',
-        groupevent__changestategroupevent__state='conclude',
-        groupevent__time__gte=sdate,
-        groupevent__time__lt=edate)
-
-    return data
-
-def is_powerpoint(doc):
-    '''
-    Returns true if document is a Powerpoint presentation
-    '''
-    return doc.file_extension() in ('ppt','pptx')
-
-def post_process(doc):
-    '''
-    Does post processing on uploaded file.
-    - Convert PPT to PDF
-    '''
-    if is_powerpoint(doc) and hasattr(settings,'SECR_PPT2PDF_COMMAND'):
-        try:
-            cmd = list(settings.SECR_PPT2PDF_COMMAND) # Don't operate on the list actually in settings
-            cmd.append(doc.get_file_path())                                 # outdir
-            cmd.append(os.path.join(doc.get_file_path(),doc.uploaded_filename))  # filename
-            subprocess.check_call(cmd)
-        except (subprocess.CalledProcessError, OSError) as error:
-            log("Error converting PPT: %s" % (error))
-            return
-        # change extension
-        base,ext = os.path.splitext(doc.uploaded_filename)
-        doc.uploaded_filename = base + '.pdf'
-
-        e = DocEvent.objects.create(
-            type='changed_document',
-            by=Person.objects.get(name="(System)"),
-            doc=doc,
-            rev=doc.rev,
-            desc='Converted document to PDF',
-        )
-        doc.save_with_history([e])
diff --git a/ietf/secr/proceedings/reports.py b/ietf/secr/proceedings/reports.py
deleted file mode 100644
index 115e4facdf..0000000000
--- a/ietf/secr/proceedings/reports.py
+++ /dev/null
@@ -1,103 +0,0 @@
-import datetime
-
-from django.template.loader import render_to_string
-
-from ietf.meeting.models import Meeting
-from ietf.doc.models import DocEvent, Document
-from ietf.secr.proceedings.proc_utils import get_progress_stats
-
-def report_id_activity(start,end):
-
-    # get previous meeting
-    meeting = Meeting.objects.filter(date__lt=datetime.datetime.now(),type='ietf').order_by('-date')[0]
-    syear,smonth,sday = start.split('-')
-    eyear,emonth,eday = end.split('-')
-    sdate = datetime.datetime(int(syear),int(smonth),int(sday))
-    edate = datetime.datetime(int(eyear),int(emonth),int(eday))
-    
-    #queryset = Document.objects.filter(type='draft').annotate(start_date=Min('docevent__time'))
-    new_docs = Document.objects.filter(type='draft').filter(docevent__type='new_revision',
-                                                            docevent__newrevisiondocevent__rev='00',
-                                                            docevent__time__gte=sdate,
-                                                            docevent__time__lte=edate)
-    new = new_docs.count()
-    updated = 0
-    updated_more = 0
-    for d in new_docs:
-        updates = d.docevent_set.filter(type='new_revision',time__gte=sdate,time__lte=edate).count()
-        if updates > 1:
-            updated += 1
-        if updates > 2:
-            updated_more +=1
-    
-    # calculate total documents updated, not counting new, rev=00
-    result = set()
-    events = DocEvent.objects.filter(doc__type='draft',time__gte=sdate,time__lte=edate)
-    for e in events.filter(type='new_revision').exclude(newrevisiondocevent__rev='00'):
-        result.add(e.doc)
-    total_updated = len(result)
-    
-    # calculate sent last call
-    last_call = events.filter(type='sent_last_call').count()
-    
-    # calculate approved
-    approved = events.filter(type='iesg_approved').count()
-    
-    # get 4 weeks
-    monday = Meeting.get_current_meeting().get_ietf_monday()
-    cutoff = monday + datetime.timedelta(days=3)
-    ff1_date = cutoff - datetime.timedelta(days=28)
-    #ff2_date = cutoff - datetime.timedelta(days=21)
-    #ff3_date = cutoff - datetime.timedelta(days=14)
-    #ff4_date = cutoff - datetime.timedelta(days=7)
-    
-    ff_docs = Document.objects.filter(type='draft').filter(docevent__type='new_revision',
-                                                           docevent__newrevisiondocevent__rev='00',
-                                                           docevent__time__gte=ff1_date,
-                                                           docevent__time__lte=cutoff)
-    ff_new_count = ff_docs.count()
-    ff_new_percent = format(ff_new_count / float(new),'.0%')
-    
-    # calculate total documents updated in final four weeks, not counting new, rev=00
-    result = set()
-    events = DocEvent.objects.filter(doc__type='draft',time__gte=ff1_date,time__lte=cutoff)
-    for e in events.filter(type='new_revision').exclude(newrevisiondocevent__rev='00'):
-        result.add(e.doc)
-    ff_update_count = len(result)
-    ff_update_percent = format(ff_update_count / float(total_updated),'.0%')
-    
-    #aug_docs = augment_with_start_time(new_docs)
-    '''
-    ff1_new = aug_docs.filter(start_date__gte=ff1_date,start_date__lt=ff2_date)
-    ff2_new = aug_docs.filter(start_date__gte=ff2_date,start_date__lt=ff3_date)
-    ff3_new = aug_docs.filter(start_date__gte=ff3_date,start_date__lt=ff4_date)
-    ff4_new = aug_docs.filter(start_date__gte=ff4_date,start_date__lt=edate)
-    ff_new_iD = ff1_new + ff2_new + ff3_new + ff4_new
-    '''
-    context = {'meeting':meeting,
-               'new':new,
-               'updated':updated,
-               'updated_more':updated_more,
-               'total_updated':total_updated,
-               'last_call':last_call,
-               'approved':approved,
-               'ff_new_count':ff_new_count,
-               'ff_new_percent':ff_new_percent,
-               'ff_update_count':ff_update_count,
-               'ff_update_percent':ff_update_percent}
-    
-    report = render_to_string('proceedings/report_id_activity.txt', context)
-    
-    return report
-    
-def report_progress_report(start_date,end_date):
-    syear,smonth,sday = start_date.split('-')
-    eyear,emonth,eday = end_date.split('-')
-    sdate = datetime.datetime(int(syear),int(smonth),int(sday))
-    edate = datetime.datetime(int(eyear),int(emonth),int(eday))
-    
-    context = get_progress_stats(sdate,edate)
-    
-    report = render_to_string('proceedings/report_progress_report.txt', context)
-    
-    return report
diff --git a/ietf/secr/proceedings/templatetags/ams_filters.py b/ietf/secr/proceedings/templatetags/ams_filters.py
deleted file mode 100644
index ebf166e3ce..0000000000
--- a/ietf/secr/proceedings/templatetags/ams_filters.py
+++ /dev/null
@@ -1,75 +0,0 @@
-from django import template
-
-from ietf.person.models import Person
-
-
-register = template.Library()
-
-@register.filter
-def abbr_status(value):
-    """
-    Converts RFC Status to a short abbreviation
-    """
-    d = {'Proposed Standard':'PS',
-         'Draft Standard':'DS',
-         'Standard':'S',
-         'Historic':'H',
-         'Informational':'I',
-         'Experimental':'E',
-         'Best Current Practice':'BCP',
-         'Internet Standard':'IS'}
-
-    return d.get(value,value)
-
-@register.filter(name='display_duration')
-def display_duration(value):
-    """
-    Maps a session requested duration from select index to 
-    label."""
-    map = {'0':'None',
-           '1800':'30 Minutes',
-           '3600':'1 Hour',
-           '5400':'1.5 Hours',
-           '7200':'2 Hours',
-           '9000':'2.5 Hours'}
-    if value in map:
-        return map[value]
-    else:
-        x=int(value)
-        return "%d Hours %d Minutes %d Seconds"%(x//3600,(x%3600)//60,x%60)
-
-@register.filter
-def get_published_date(doc):
-    '''
-    Returns the published date for a RFC Document
-    '''
-    event = doc.latest_event(type='published_rfc')
-    if event:
-        return event.time
-    event = doc.latest_event(type='new_revision')
-    if event:
-        return event.time
-    else:
-        return None
-        
-@register.filter
-def is_ppt(value):
-    '''
-    Checks if the value ends in ppt or pptx
-    '''
-    if value.endswith('ppt') or value.endswith('pptx'):
-        return True
-    else:
-        return False
-        
-@register.filter
-def smart_login(user):
-    '''
-    Expects a Person object.  If person is a Secretariat returns "on behalf of the"
-    '''
-    if not isinstance (user, Person):
-        return user
-    if user.role_set.filter(name='secr',group__acronym='secretariat'):
-        return '%s, on behalf of the' % user
-    else:
-        return '%s, a chair of the' % user
diff --git a/ietf/secr/proceedings/tests.py b/ietf/secr/proceedings/tests.py
deleted file mode 100644
index 9d3f3d27bd..0000000000
--- a/ietf/secr/proceedings/tests.py
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import debug                            # pyflakes:ignore
-import io
-import json
-import os
-
-from django.conf import settings
-from django.urls import reverse
-
-from ietf.doc.models import Document
-from ietf.group.factories import RoleFactory
-from ietf.meeting.models import SchedTimeSessAssignment, SchedulingEvent
-from ietf.meeting.factories import MeetingFactory, SessionFactory
-from ietf.person.models import Person
-from ietf.name.models import SessionStatusName
-from ietf.utils.test_utils import TestCase
-from ietf.utils.mail import outbox
-
-from ietf.secr.proceedings.proc_utils import (import_audio_files,
-    get_timeslot_for_filename, normalize_room_name, send_audio_import_warning,
-    get_or_create_recording_document, create_recording, get_next_sequence,
-    _get_session, _get_urls_from_json)
-
-
-SECR_USER='secretary'
-
-class ProceedingsTestCase(TestCase):
-    def test_main(self):
-        "Main Test"
-        MeetingFactory(type_id='ietf')
-        RoleFactory(name_id='chair',person__user__username='marschairman')
-        url = reverse('ietf.secr.proceedings.views.main')
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        # test chair access
-        self.client.logout()
-        self.client.login(username="marschairman", password="marschairman+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-
-class VideoRecordingTestCase(TestCase):
-
-    def test_get_session(self):
-        session = SessionFactory()
-        meeting = session.meeting
-        number = meeting.number
-        name = session.group.acronym
-        date = session.official_timeslotassignment().timeslot.time.strftime('%Y%m%d')
-        time = session.official_timeslotassignment().timeslot.time.strftime('%H%M')
-        self.assertEqual(_get_session(number,name,date,time),session)
-
-    def test_get_urls_from_json(self):
-        path = os.path.join(settings.BASE_DIR, "../test/data/youtube-playlistitems.json")
-        with io.open(path) as f:
-            doc = json.load(f)
-        urls = _get_urls_from_json(doc)
-        self.assertEqual(len(urls),2)
-        self.assertEqual(urls[0]['title'],'IETF98 Wrap Up')
-        self.assertEqual(urls[0]['url'],'https://www.youtube.com/watch?v=lhYWB5FFkg4&list=PLC86T-6ZTP5jo6kIuqdyeYYhsKv9sUwG1')
-        
-class RecordingTestCase(TestCase):
-    settings_temp_path_overrides = TestCase.settings_temp_path_overrides + ['MEETING_RECORDINGS_DIR']
-
-    def test_page(self):
-        meeting = MeetingFactory(type_id='ietf')
-        url = reverse('ietf.secr.proceedings.views.recording', kwargs={'meeting_num':meeting.number})
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_post(self):
-        session = SessionFactory(status_id='sched',meeting__type_id='ietf')
-        meeting = session.meeting
-        group = session.group
-        url = reverse('ietf.secr.proceedings.views.recording', kwargs={'meeting_num':meeting.number})
-        data = dict(group=group.acronym,external_url='http://youtube.com/xyz',session=session.pk)
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.post(url,data,follow=True)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, group.acronym)
-        
-        # now test edit
-        doc = session.materials.filter(type='recording').first()
-        external_url = 'http://youtube.com/aaa'
-        url = reverse('ietf.secr.proceedings.views.recording_edit', kwargs={'meeting_num':meeting.number,'name':doc.name})
-        response = self.client.post(url,dict(external_url=external_url),follow=True)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, external_url)
-            
-    def test_import_audio_files(self):
-        session = SessionFactory(status_id='sched',meeting__type_id='ietf')
-        meeting = session.meeting
-        timeslot = session.official_timeslotassignment().timeslot
-        self.create_audio_file_for_timeslot(timeslot)
-        import_audio_files(meeting)
-        self.assertEqual(session.materials.filter(type='recording').count(),1)
-
-    def create_audio_file_for_timeslot(self, timeslot):
-        filename = self.get_filename_for_timeslot(timeslot)
-        path = os.path.join(settings.MEETING_RECORDINGS_DIR,'ietf' + timeslot.meeting.number,filename)
-        if not os.path.exists(os.path.dirname(path)):
-            os.makedirs(os.path.dirname(path))
-        with io.open(path, "w") as f:
-            f.write('dummy')
-
-    def get_filename_for_timeslot(self, timeslot):
-        '''Returns the filename of a session recording given timeslot'''
-        return "{prefix}-{room}-{date}.mp3".format(
-            prefix=timeslot.meeting.type.slug + timeslot.meeting.number,
-            room=normalize_room_name(timeslot.location.name),
-            date=timeslot.time.strftime('%Y%m%d-%H%M'))
-
-    def test_import_audio_files_shared_timeslot(self):
-        meeting = MeetingFactory(type_id='ietf',number='72')
-        mars_session = SessionFactory(meeting=meeting,status_id='sched',group__acronym='mars')
-        ames_session = SessionFactory(meeting=meeting,status_id='sched',group__acronym='ames')
-        scheduled = SessionStatusName.objects.get(slug='sched')
-        SchedulingEvent.objects.create(
-            session=mars_session,
-            status=scheduled,
-            by=Person.objects.get(name='(System)')
-        )
-        SchedulingEvent.objects.create(
-            session=ames_session,
-            status=scheduled,
-            by=Person.objects.get(name='(System)')
-        )
-        timeslot = mars_session.official_timeslotassignment().timeslot
-        SchedTimeSessAssignment.objects.create(timeslot=timeslot,session=ames_session,schedule=meeting.schedule)
-        self.create_audio_file_for_timeslot(timeslot)
-        import_audio_files(meeting)
-        doc = mars_session.materials.filter(type='recording').first()
-        self.assertTrue(doc in ames_session.materials.all())
-        self.assertTrue(doc.docalias.filter(name='recording-72-mars-1'))
-        self.assertTrue(doc.docalias.filter(name='recording-72-ames-1'))
-
-    def test_normalize_room_name(self):
-        self.assertEqual(normalize_room_name('Test Room'),'testroom')
-        self.assertEqual(normalize_room_name('Rome/Venice'), 'rome_venice')
-
-    def test_get_timeslot_for_filename(self):
-        session = SessionFactory(meeting__type_id='ietf')
-        timeslot = session.timeslotassignments.first().timeslot
-        name = self.get_filename_for_timeslot(timeslot)
-        self.assertEqual(get_timeslot_for_filename(name),timeslot)
-
-    def test_get_or_create_recording_document(self):
-        session = SessionFactory(meeting__type_id='ietf', meeting__number=72, group__acronym='mars')
-        
-        # test create
-        filename = 'ietf42-testroom-20000101-0800.mp3'
-        docs_before = Document.objects.filter(type='recording').count()
-        doc = get_or_create_recording_document(filename,session)
-        docs_after = Document.objects.filter(type='recording').count()
-        self.assertEqual(docs_after,docs_before + 1)
-        self.assertTrue(doc.external_url.endswith(filename))
-
-        # test get
-        docs_before = docs_after
-        doc2 = get_or_create_recording_document(filename,session)
-        docs_after = Document.objects.filter(type='recording').count()
-        self.assertEqual(docs_after,docs_before)
-        self.assertEqual(doc,doc2)
-
-    def test_create_recording(self):
-        session = SessionFactory(meeting__type_id='ietf', meeting__number=72, group__acronym='mars')
-        filename = 'ietf42-testroomt-20000101-0800.mp3'
-        url = settings.IETF_AUDIO_URL + 'ietf{}/{}'.format(session.meeting.number, filename)
-        doc = create_recording(session, url)
-        self.assertEqual(doc.name,'recording-72-mars-1')
-        self.assertEqual(doc.group,session.group)
-        self.assertEqual(doc.external_url,url)
-        self.assertTrue(doc in session.materials.all())
-
-    def test_get_next_sequence(self):
-        session = SessionFactory(meeting__type_id='ietf', meeting__number=72, group__acronym='mars')
-        meeting = session.meeting
-        group = session.group
-        sequence = get_next_sequence(group,meeting,'recording')
-        self.assertEqual(sequence,1)
-
-    def test_send_audio_import_warning(self):
-        length_before = len(outbox)
-        send_audio_import_warning(['recording-43-badroom-20000101-0800.mp3'])
-        self.assertEqual(len(outbox), length_before + 1)
-        self.assertTrue('Audio file import' in outbox[-1]['Subject'])
diff --git a/ietf/secr/proceedings/tests_reports.py b/ietf/secr/proceedings/tests_reports.py
deleted file mode 100644
index 6039cfced1..0000000000
--- a/ietf/secr/proceedings/tests_reports.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import datetime
-import debug    # pyflakes:ignore
-
-from ietf.doc.factories import DocumentFactory,NewRevisionDocEventFactory
-from ietf.secr.proceedings.reports import report_id_activity, report_progress_report
-from ietf.utils.test_utils import TestCase
-from ietf.meeting.factories import MeetingFactory
-
-class ReportsTestCase(TestCase):
-
-    def test_report_id_activity(self):
-
-        today = datetime.datetime.today()
-        yesterday = today - datetime.timedelta(days=1)
-        last_quarter = today - datetime.timedelta(days=3*30)
-        next_week = today+datetime.timedelta(days=7)
-
-        m1 = MeetingFactory(type_id='ietf',date=last_quarter)
-        m2 = MeetingFactory(type_id='ietf',date=next_week,number=int(m1.number)+1)
-
-        doc = DocumentFactory(type_id='draft',time=yesterday,rev="00")
-        NewRevisionDocEventFactory(doc=doc,time=today,rev="01")
-        result = report_id_activity(m1.date.strftime("%Y-%m-%d"),m2.date.strftime("%Y-%m-%d"))
-        self.assertTrue('IETF Activity since last IETF Meeting' in result)
-
-    def test_report_progress_report(self):
-        today = datetime.datetime.today()
-        last_quarter = today - datetime.timedelta(days=3*30)
-        next_week = today+datetime.timedelta(days=7)
-
-        m1 = MeetingFactory(type_id='ietf',date=last_quarter)
-        m2 = MeetingFactory(type_id='ietf',date=next_week,number=int(m1.number)+1)
-        result = report_progress_report(m1.date.strftime('%Y-%m-%d'),m2.date.strftime('%Y-%m-%d'))
-        self.assertTrue('IETF Activity since last IETF Meeting' in result)
diff --git a/ietf/secr/proceedings/urls.py b/ietf/secr/proceedings/urls.py
deleted file mode 100644
index 5091a01e9f..0000000000
--- a/ietf/secr/proceedings/urls.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.conf import settings
-from ietf.meeting.views import OldUploadRedirect
-from ietf.utils.urls import url
-
-from ietf.secr.proceedings import views
-
-urlpatterns = [
-    url(r'^$', views.main),
-    # special offline URL for testing proceedings build
-    url(r'^process-pdfs/(?P<meeting_num>\d{1,3})/$', views.process_pdfs),
-    url(r'^(?P<meeting_num>\d{1,3})/$', views.select),
-    url(r'^(?P<meeting_num>\d{1,3})/recording/$', views.recording),
-    url(r'^(?P<meeting_num>\d{1,3})/recording/edit/(?P<name>[A-Za-z0-9_\-\+]+)$', views.recording_edit),
-    url(r'^(?P<num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/%(acronym)s/$' % settings.URL_REGEXPS,
-         OldUploadRedirect.as_view(permanent=True)),
-]
diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py
deleted file mode 100644
index b083751762..0000000000
--- a/ietf/secr/proceedings/views.py
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import datetime
-import glob
-import itertools
-import os
-
-import debug                            # pyflakes:ignore
-
-from django.conf import settings
-from django.contrib import messages
-from django.urls import reverse
-from django.db.models import Max
-from django.http import HttpResponseRedirect
-from django.shortcuts import render, get_object_or_404, redirect
-
-from ietf.secr.utils.decorators import sec_only
-from ietf.secr.utils.group import get_my_groups
-from ietf.secr.utils.meeting import get_timeslot, get_proceedings_url
-from ietf.doc.models import Document, DocEvent
-from ietf.person.models import Person
-from ietf.ietfauth.utils import has_role, role_required
-from ietf.meeting.models import Meeting, Session
-from ietf.meeting.utils import add_event_info_to_session_qs
-
-from ietf.secr.proceedings.forms import RecordingForm, RecordingEditForm 
-from ietf.secr.proceedings.proc_utils import (create_recording)
-
-# -------------------------------------------------
-# Globals 
-# -------------------------------------------------
-AUTHORIZED_ROLES=('WG Chair','WG Secretary','RG Chair','RG Secretary', 'AG Secretary', 'RAG Secretary', 'IRTF Chair','IETF Trust Chair','IAB Group Chair','IAOC Chair','IAD','Area Director','Secretariat','Team Chair')
-# -------------------------------------------------
-# Helper Functions
-# -------------------------------------------------
-
-def build_choices(queryset):
-    '''
-    This function takes a queryset (or list) of Groups and builds a list of tuples for use
-    as choices in a select widget.  Using acronym for both value and label.
-    '''
-    choices = [ (g.acronym,g.acronym) for g in queryset ]
-    return sorted(choices, key=lambda choices: choices[1])
-
-def find_index(slide_id, qs):
-    '''
-    This function looks up a slide in a queryset of slides,
-    returning the index.
-    '''
-    for i in range(0,qs.count()):
-        if str(qs[i].pk) == slide_id:
-            return i
-
-def get_doc_filename(doc):
-    '''
-    This function takes a Document of type slides,minute or agenda and returns
-    the full path to the file on disk.  
-    '''
-    session = doc.session_set.all()[0]
-    meeting = session.meeting
-    if doc.external_url:
-        return os.path.join(meeting.get_materials_path(),doc.type.slug,doc.uploaded_filename)
-    else:
-        path = os.path.join(meeting.get_materials_path(),doc.type.slug,doc.name)
-        files = glob.glob(path + '.*')
-        # TODO we might want to choose from among multiple files using some logic
-        return files[0]
-
-def get_unmatched_recordings(meeting):
-    '''
-    Returns a list of recording filenames that haven't been matched to a session
-    '''
-    unmatched_recordings = []
-    path = os.path.join(settings.MEETING_RECORDINGS_DIR,'ietf{}'.format(meeting.number))
-    try:
-        files = os.listdir(path)
-    except OSError:
-        files = []
-    url = settings.IETF_AUDIO_URL + 'ietf%s' % meeting.number 
-    recordings = Document.objects.filter(type='recording',external_url__startswith=url)
-    filenames = [ d.external_url.split('/')[-1] for d in recordings ]
-    for file in files:
-        if file not in filenames:
-            unmatched_recordings.append(file)
-    return unmatched_recordings
-
-def get_extras(meeting):
-    '''
-    Gather "extras" which are one off groups. ie iab-wcit(86)
-    '''
-    groups = []
-    sessions = Session.objects.filter(meeting=meeting).exclude(group__parent__type__in=('area','irtf'))
-    for session in sessions:
-        timeslot = get_timeslot(session)
-        if timeslot and timeslot.type_id == 'regular' and session.materials.all():
-            groups.append(session.group)
-    return groups
-
-def get_next_slide_num(session):
-    '''
-    This function takes a session object and returns the
-    next slide number to use for a newly added slide as a string.
-    '''
-
-    if session.meeting.type_id == 'ietf':
-        pattern = 'slides-%s-%s' % (session.meeting.number,session.group.acronym)
-    elif session.meeting.type_id == 'interim':
-        pattern = 'slides-%s' % (session.meeting.number)
-    slides = Document.objects.filter(type='slides',name__startswith=pattern)
-    if slides:
-        nums = [ s.name.split('-')[-1] for s in slides ]
-        nums.sort(key=int)
-        return str(int(nums[-1]) + 1)
-    else:
-        return '0'
-
-def get_next_order_num(session):
-    '''
-    This function takes a session object and returns the
-    next slide order number to use for a newly added slide as an integer.
-    '''
-    max_order = session.materials.aggregate(Max('order'))['order__max']
-
-    return max_order + 1 if max_order else 1
-
-def parsedate(d):
-    '''
-    This function takes a date object and returns a tuple of year,month,day
-    '''
-    return (d.strftime('%Y'),d.strftime('%m'),d.strftime('%d'))
-
-# --------------------------------------------------
-# STANDARD VIEW FUNCTIONS
-# --------------------------------------------------
-
-@role_required(*AUTHORIZED_ROLES)
-def main(request):
-    '''
-    List IETF Meetings.  If the user is Secratariat list includes all meetings otherwise
-    show only those meetings whose corrections submission date has not passed.
-
-    **Templates:**
-
-    * ``proceedings/main.html``
-
-    **Template Variables:**
-
-    * meetings, interim_meetings, today
-
-    '''
-    if has_role(request.user,'Secretariat'):
-        meetings = Meeting.objects.filter(type='ietf').order_by('-number')
-    else:
-        # select meetings still within the cutoff period
-        today = datetime.date.today()
-        meetings = [m for m in Meeting.objects.filter(type='ietf').order_by('-number') if m.get_submission_correction_date()>=today]
-
-    groups = get_my_groups(request.user)
-    interim_sessions = add_event_info_to_session_qs(Session.objects.filter(group__in=groups, meeting__type='interim')).filter(current_status='sched').select_related('meeting')
-    interim_meetings = sorted({s.meeting for s in interim_sessions}, key=lambda m: m.date, reverse=True)
-    # tac on group for use in templates
-    for m in interim_meetings:
-        m.group = m.session_set.first().group
-
-    # we today's date to see if we're past the submissio cutoff
-    today = datetime.date.today()
-
-    return render(request, 'proceedings/main.html',{
-        'meetings': meetings,
-        'interim_meetings': interim_meetings,
-        'today': today},
-    )
-
-@sec_only
-def process_pdfs(request, meeting_num):
-    '''
-    This function is used to update the database once meeting materials in PPT format
-    are converted to PDF format and uploaded to the server.  It basically finds every PowerPoint
-    slide document for the given meeting and checks to see if there is a PDF version.  If there
-    is external_url is changed.  Then when proceedings are generated the URL will refer to the
-    PDF document.
-    '''
-    warn_count = 0
-    count = 0
-    meeting = get_object_or_404(Meeting, number=meeting_num)
-    ppt = Document.objects.filter(session__meeting=meeting,type='slides',uploaded_filename__endswith='.ppt').exclude(states__slug='deleted')
-    pptx = Document.objects.filter(session__meeting=meeting,type='slides',uploaded_filename__endswith='.pptx').exclude(states__slug='deleted')
-    for doc in itertools.chain(ppt,pptx):
-        base,ext = os.path.splitext(doc.uploaded_filename)
-        pdf_file = base + '.pdf'
-        path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting_num,'slides',pdf_file)
-        if os.path.exists(path):
-            doc.uploaded_filename = pdf_file
-            e = DocEvent.objects.create(
-                type='changed_document',
-                by=Person.objects.get(name="(System)"),
-                doc=doc,
-                rev=doc.rev,
-                desc='Set URL to PDF version',
-            )
-            doc.save_with_history([e])
-            count += 1
-        else:
-            warn_count += 1
-
-    if warn_count:
-        messages.warning(request, '%s PDF files processed.  %s PowerPoint files still not converted.' % (count, warn_count))
-    else:
-        messages.success(request, '%s PDF files processed' % count)
-    url = reverse('ietf.secr.proceedings.views.select', kwargs={'meeting_num':meeting_num})
-    return HttpResponseRedirect(url)
-
-@role_required('Secretariat')
-def recording(request, meeting_num):
-    '''
-    Enter Session recording info.  Creates Document and associates it with Session.
-    For auditing purposes, lists all scheduled sessions and associated recordings, if
-    any.  Also lists those audio recording files which haven't been matched to a
-    session.
-    '''
-    meeting = get_object_or_404(Meeting, number=meeting_num)
-    sessions = Session.objects.filter(
-        timeslotassignments__schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None]
-    ).exclude(
-        type__in=['reg','break']
-    ).order_by('group__acronym')
-
-    if request.method == 'POST':
-        form = RecordingForm(request.POST,meeting=meeting)
-        if form.is_valid():
-            external_url =  form.cleaned_data['external_url']
-            session = form.cleaned_data['session']
-            
-            if Document.objects.filter(type='recording',external_url=external_url):
-                messages.error(request, "Recording already exists")
-                return redirect('ietf.secr.proceedings.views.recording', meeting_num=meeting_num)
-            else:
-                create_recording(session,external_url)
-            
-            messages.success(request,'Recording added')
-            return redirect('ietf.secr.proceedings.views.recording', meeting_num=meeting_num)
-    
-    else:
-        form = RecordingForm(meeting=meeting)
-    
-    return render(request, 'proceedings/recording.html',{
-        'meeting':meeting,
-        'form':form,
-        'sessions':sessions,
-        'unmatched_recordings': get_unmatched_recordings(meeting)},
-    )
-
-@role_required('Secretariat')
-def recording_edit(request, meeting_num, name):
-    '''
-    Edit recording Document
-    '''
-    recording = get_object_or_404(Document, name=name)
-    meeting = get_object_or_404(Meeting, number=meeting_num)
-    
-    if request.method == 'POST':
-        button_text = request.POST.get('submit', '')
-        if button_text == 'Cancel':
-            return redirect('ietf.secr.proceedings.views.recording', meeting_num=meeting_num)
-            
-        form = RecordingEditForm(request.POST, instance=recording)
-        if form.is_valid():
-            # save record and rebuild proceedings
-            form.save(commit=False)
-            e = DocEvent.objects.create(
-                type='changed_document',
-                by=request.user.person,
-                doc=recording,
-                rev=recording.rev,
-                desc='Changed URL to %s' % recording.external_url,
-            )
-            recording.save_with_history([e])
-
-            messages.success(request,'Recording saved')
-            return redirect('ietf.secr.proceedings.views.recording', meeting_num=meeting_num)
-    else:
-        form = RecordingEditForm(instance=recording)
-    
-    return render(request, 'proceedings/recording_edit.html',{
-        'meeting':meeting,
-        'form':form,
-        'recording':recording},
-    )
-    
-# TODO - should probably rename this since it's not selecting groups anymore
-def select(request, meeting_num):
-    '''
-        Provide the secretariat only functions related to meeting materials management
-    '''
-
-    if not has_role(request.user,'Secretariat'):
-        return HttpResponseRedirect(reverse('ietf.meeting.views.materials_editable_groups', kwargs={'num':meeting_num}))
-
-    meeting = get_object_or_404(Meeting, number=meeting_num)
-    proceedings_url = get_proceedings_url(meeting)
-
-    # get the time proceedings were generated
-    path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'index.html')
-    if os.path.exists(path):
-        last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path))
-    else:
-        last_run = None
-
-    # count PowerPoint files waiting to be converted
-    # TODO : This should look at SessionPresentation instead
-    ppt = Document.objects.filter(session__meeting=meeting,type='slides',uploaded_filename__endswith='.ppt').exclude(states__slug='deleted')
-    pptx = Document.objects.filter(session__meeting=meeting,type='slides',uploaded_filename__endswith='.pptx').exclude(states__slug='deleted')
-    ppt_count = ppt.count() + pptx.count()
-
-    return render(request, 'proceedings/select.html', {
-        'meeting': meeting,
-        'last_run': last_run,
-        'proceedings_url': proceedings_url,
-        'ppt_count': ppt_count},
-    )
-
diff --git a/ietf/secr/roles/__init__.py b/ietf/secr/roles/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ietf/secr/roles/tests.py b/ietf/secr/roles/tests.py
deleted file mode 100644
index 8c14ec239d..0000000000
--- a/ietf/secr/roles/tests.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django.urls import reverse
-from ietf.utils.test_utils import TestCase
-
-from ietf.group.factories import GroupFactory, RoleFactory
-from ietf.person.models import Person
-
-import debug                            # pyflakes:ignore
-
-SECR_USER='secretary'
-
-class SecrRolesMainTestCase(TestCase):
-
-    def setUp(self):
-        super().setUp()
-        GroupFactory(type_id='sdo') # need this for the RoleForm initialization
-
-    def test_main(self):
-        "Main Test"
-        url = reverse('ietf.secr.roles.views.main')
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-
-    def test_roles_delete(self):
-        role = RoleFactory(name_id='chair',group__acronym='mars')
-        group = role.group
-        id = role.id
-        url = reverse('ietf.secr.roles.views.delete_role', kwargs={'acronym':group.acronym,'id':role.id})
-        target = reverse('ietf.secr.roles.views.main')
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        response = self.client.post(url, {'post':'yes'})
-        self.assertRedirects(response, target)
-        self.assertFalse(group.role_set.filter(id=id))
-        
-    def test_roles_add(self):
-        person = Person.objects.get(name='Areað Irector')
-        group = GroupFactory()
-        url = reverse('ietf.secr.roles.views.main')
-        target = reverse('ietf.secr.roles.views.main') + '?group=%s' % group.acronym
-        post_data = {'group_acronym':group.acronym,
-                     'name':'chair',
-                     'person':'Joe Smith - (%s)' % person.id,
-                     'email':person.email_set.all()[0].address,
-                     'submit':'Add'}
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.post(url,post_data,follow=True)
-        self.assertRedirects(response, target)
-        self.assertContains(response, 'added successfully')
-
-    def test_roles_add_no_group(self):
-        person = Person.objects.get(name='Areað Irector')
-        url = reverse('ietf.secr.roles.views.main')
-        post_data = {'group_acronym':'',
-                     'name':'chair',
-                     'person':'Joe Smith - (%s)' % person.id,
-                     'email':person.email_set.all()[0].address,
-                     'submit':'Add'}
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.post(url,post_data,follow=True)
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, 'You must select a group')
diff --git a/ietf/secr/roles/urls.py b/ietf/secr/roles/urls.py
deleted file mode 100644
index 34f0fd6464..0000000000
--- a/ietf/secr/roles/urls.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.conf import settings
-
-from ietf.secr.roles import views
-from ietf.utils.urls import url
-
-urlpatterns = [
-    url(r'^$', views.main),
-    url(r'^ajax/get-roles/%(acronym)s/$' % settings.URL_REGEXPS, views.ajax_get_roles),
-    url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, views.delete_role),
-]
diff --git a/ietf/secr/roles/views.py b/ietf/secr/roles/views.py
deleted file mode 100644
index 1063b92715..0000000000
--- a/ietf/secr/roles/views.py
+++ /dev/null
@@ -1,113 +0,0 @@
-from django.contrib import messages
-from django.urls import reverse
-from django.http import HttpResponseRedirect
-from django.shortcuts import render, get_object_or_404, redirect
-
-from ietf.group.models import Group, Role
-from ietf.group.utils import save_group_in_history
-from ietf.ietfauth.utils import role_required
-from ietf.secr.groups.forms import RoleForm
-from ietf.secr.sreq.forms import GroupSelectForm
-
-
-# -------------------------------------------------
-# Helper Functions
-# -------------------------------------------------
-
-def build_choices(queryset):
-    '''
-    This function takes a queryset (or list) of Groups and builds a list of tuples for use 
-    as choices in a select widget.  Using acronym for both value and label.
-    '''
-    choices = [ (g.acronym,g.acronym) for g in queryset ]
-    return sorted(choices, key=lambda choices: choices[1])
-
-# -------------------------------------------------
-# AJAX Functions
-# -------------------------------------------------
-def ajax_get_roles(request, acronym):
-    '''
-    Ajax function which takes a group acronym and returns the
-    roles for the group in the form of a table
-    '''
-    group = get_object_or_404(Group, acronym=acronym)
-    
-    return render(request, 'roles/roles.html', {
-        'group': group,
-        'roles': group.role_set.all()},
-    )
-# --------------------------------------------------
-# STANDARD VIEW FUNCTIONS
-# --------------------------------------------------
-@role_required('Secretariat')
-def delete_role(request, acronym, id):
-    """ 
-    Handle deleting roles
-
-    **Templates:**
-
-    * none
-
-    """
-    role = get_object_or_404(Role, id=id)
-    group = get_object_or_404(Group, acronym=acronym)
-
-    if request.method == 'POST' and request.POST['post'] == 'yes':
-        # save group
-        save_group_in_history(group)
-
-        role.delete()
-        messages.success(request, 'The entry was deleted successfully')
-        return redirect('ietf.secr.roles.views.main')
-
-    return render(request, 'confirm_delete.html', {'object': role})
-
-@role_required('Secretariat')
-def main(request):
-    '''
-    Main view for generic Roles App
-    '''
-    groups = Group.objects.filter(type__in=('sdo','ietf')).order_by('acronym')
-    choices=build_choices(groups)
-    choices.insert(0,('','------------'))
-    group_form = GroupSelectForm(choices=choices)
-    
-    # prime form with random sdo group so all roles are available
-    group = Group.objects.filter(type='sdo')[0]
-    
-    if request.method == 'POST':
-        role_form = RoleForm(request.POST,group=group)
-        if role_form.is_valid():
-            name = role_form.cleaned_data['name']
-            person = role_form.cleaned_data['person']
-            email = role_form.cleaned_data['email']
-            acronym = role_form.cleaned_data['group_acronym']
-            
-            group = Group.objects.get(acronym=acronym)
-            
-            # save group
-            save_group_in_history(group)
-                
-            Role.objects.create(name=name,
-                                person=person,
-                                email=email,
-                                group=group)
-
-            if not email.origin or email.origin == person.user.username:
-                email.origin = "role: %s %s" % (group.acronym, name.slug)
-                email.save()
-
-            messages.success(request, 'New %s added successfully!' % name)
-            url = reverse('ietf.secr.roles.views.main') + '?group=%s' % group.acronym
-            return HttpResponseRedirect(url)
-    
-    else:
-        role_form = RoleForm(initial={'name':'chair'},group=group)
-        # accept get argument to select group if we're returning after a change
-        if 'group' in request.GET:
-            group_form = GroupSelectForm(choices=choices,initial={'group':request.GET['group']})
-            
-    return render(request, 'roles/main.html', {
-        'group_form': group_form,
-        'role_form': role_form},
-    )
diff --git a/ietf/secr/rolodex/forms.py b/ietf/secr/rolodex/forms.py
index 8c95da88da..468fad0be5 100644
--- a/ietf/secr/rolodex/forms.py
+++ b/ietf/secr/rolodex/forms.py
@@ -81,13 +81,13 @@ def __init__(self, *args, **kwargs):
             self.initial['user'] = self.instance.user.username
         
     def clean_user(self):
-        user = self.cleaned_data['user']
+        user = self.cleaned_data['user'].lower()
         if user:
             # if Django User object exists return it, otherwise create one
             try:
-                user_obj = User.objects.get(username=user)
+                user_obj = User.objects.get(username__iexact=user)
             except User.DoesNotExist:
-                user_obj = User.objects.create_user(user,user)
+                user_obj = User.objects.create_user(username=user, email=user)
                 
             return user_obj
         else:
@@ -133,11 +133,11 @@ class Meta:
         exclude = ('time','user')
 
     def clean_email(self):
-        email = self.cleaned_data['email']
+        email = self.cleaned_data['email'].lower()
         
         # error if there is already an account (User, Person) associated with this email
         try:
-            user = User.objects.get(username=email)
+            user = User.objects.get(username__iexact=email)
             person = Person.objects.get(user=user)
             if user and person:
                 raise forms.ValidationError("This account already exists. [name=%s, id=%s, email=%s]" % (person.name,person.id,email))
diff --git a/ietf/secr/rolodex/views.py b/ietf/secr/rolodex/views.py
index be3cd5b02c..9fd4a8b107 100644
--- a/ietf/secr/rolodex/views.py
+++ b/ietf/secr/rolodex/views.py
@@ -1,6 +1,5 @@
 from django.contrib import messages
 from django.contrib.auth.models import User
-from django.db import IntegrityError
 from django.forms.models import inlineformset_factory
 from django.shortcuts import render, get_object_or_404, redirect
 from django.utils.http import urlencode
@@ -8,7 +7,6 @@
 
 from ietf.ietfauth.utils import role_required
 from ietf.person.models import Person, Email, Alias
-from ietf.person.utils import merge_users
 from ietf.secr.rolodex.forms import EditPersonForm, EmailForm, NameForm, NewPersonForm, SearchForm
 
 
@@ -91,10 +89,10 @@ def add_proceed(request):
                              )
 
             # in theory a user record could exist which wasn't associated with a Person
-            try:
-                user = User.objects.create_user(email, email)
-            except IntegrityError:
-                user = User.objects.get(username=email)
+            
+            user = User.objects.filter(username__iexact=email).first()
+            if not user:
+                user = User.objects.create_user(username=email, email=email)
                 
             person.user = user
             person.save()
@@ -179,8 +177,7 @@ def edit(request, id):
             
             if 'user' in person_form.changed_data and person_form.initial['user']:
                 try:
-                    source = User.objects.get(username=person_form.initial['user'])
-                    merge_users(source, person_form.cleaned_data['user'])
+                    source = User.objects.get(username__iexact=person_form.initial['user'])
                     source.is_active = False
                     source.save()
                 except User.DoesNotExist:
diff --git a/ietf/secr/sreq/__init__.py b/ietf/secr/sreq/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py
deleted file mode 100644
index 44df58de42..0000000000
--- a/ietf/secr/sreq/forms.py
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright The IETF Trust 2013-2022, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-from django import forms
-
-import debug                            # pyflakes:ignore
-
-from ietf.name.models import TimerangeName, ConstraintName
-from ietf.group.models import Group
-from ietf.meeting.forms import sessiondetailsformset_factory
-from ietf.meeting.models import ResourceAssociation, Constraint
-from ietf.person.fields import SearchablePersonsField
-from ietf.person.models import Person
-from ietf.utils.html import clean_text_field
-from ietf.utils import log
-
-# -------------------------------------------------
-# Globals
-# -------------------------------------------------
-
-NUM_SESSION_CHOICES = (('','--Please select'),('1','1'),('2','2'))
-SESSION_TIME_RELATION_CHOICES = (('', 'No preference'),) + Constraint.TIME_RELATION_CHOICES
-JOINT_FOR_SESSION_CHOICES = (('1', 'First session'), ('2', 'Second session'), ('3', 'Third session'), )
-
-# -------------------------------------------------
-# Helper Functions
-# -------------------------------------------------
-def allowed_conflicting_groups():
-    return Group.objects.filter(type__in=['wg', 'ag', 'rg', 'rag', 'program'], state__in=['bof', 'proposed', 'active'])
-
-def check_conflict(groups, source_group):
-    '''
-    Takes a string which is a list of group acronyms.  Checks that they are all active groups
-    '''
-    # convert to python list (allow space or comma separated lists)
-    items = groups.replace(',',' ').split()
-    active_groups = allowed_conflicting_groups()
-    for group in items:
-        if group == source_group.acronym:
-            raise forms.ValidationError("Cannot declare a conflict with the same group: %s" % group)
-
-        if not active_groups.filter(acronym=group):
-            raise forms.ValidationError("Invalid or inactive group acronym: %s" % group)
-
-# -------------------------------------------------
-# Forms
-# -------------------------------------------------
-
-class GroupSelectForm(forms.Form):
-    group = forms.ChoiceField()
-
-    def __init__(self,*args,**kwargs):
-        choices = kwargs.pop('choices')
-        super(GroupSelectForm, self).__init__(*args,**kwargs)
-        self.fields['group'].widget.choices = choices
-
-
-class NameModelMultipleChoiceField(forms.ModelMultipleChoiceField):
-    def label_from_instance(self, name):
-        return name.desc
-
-
-class SessionForm(forms.Form):
-    num_session = forms.ChoiceField(choices=NUM_SESSION_CHOICES)
-    # session fields are added in __init__()
-    session_time_relation = forms.ChoiceField(choices=SESSION_TIME_RELATION_CHOICES, required=False)
-    attendees = forms.IntegerField()
-    # FIXME: it would cleaner to have these be
-    # ModelMultipleChoiceField, and just customize the widgetry, that
-    # way validation comes for free (applies to this CharField and the
-    # constraints dynamically instantiated in __init__())
-    joint_with_groups = forms.CharField(max_length=255,required=False)
-    joint_with_groups_selector = forms.ChoiceField(choices=[], required=False)  # group select widget for prev field
-    joint_for_session = forms.ChoiceField(choices=JOINT_FOR_SESSION_CHOICES, required=False)
-    comments = forms.CharField(max_length=200,required=False)
-    third_session = forms.BooleanField(required=False)
-    resources     = forms.MultipleChoiceField(widget=forms.CheckboxSelectMultiple,required=False)
-    bethere       = SearchablePersonsField(label="Must be present", required=False)
-    timeranges    = NameModelMultipleChoiceField(widget=forms.CheckboxSelectMultiple, required=False,
-                                                 queryset=TimerangeName.objects.all())
-    adjacent_with_wg = forms.ChoiceField(required=False)
-
-    def __init__(self, group, meeting, data=None, *args, **kwargs):
-        if 'hidden' in kwargs:
-            self.hidden = kwargs.pop('hidden')
-        else:
-            self.hidden = False
-
-        self.group = group
-        formset_class = sessiondetailsformset_factory(max_num=3 if group.features.acts_like_wg else 50)
-        self.session_forms = formset_class(group=self.group, meeting=meeting, data=data)
-        super(SessionForm, self).__init__(data=data, *args, **kwargs)
-
-        # Allow additional sessions for non-wg-like groups
-        if not self.group.features.acts_like_wg:
-            self.fields['num_session'].choices = ((n, str(n)) for n in range(1, 51))
-
-        self.fields['comments'].widget = forms.Textarea(attrs={'rows':'3','cols':'65'})
-
-        other_groups = list(allowed_conflicting_groups().exclude(pk=group.pk).values_list('acronym', 'acronym').order_by('acronym'))
-        self.fields['adjacent_with_wg'].choices = [('', '--No preference')] + other_groups
-        group_acronym_choices = [('','--Select WG(s)')] + other_groups
-        self.fields['joint_with_groups_selector'].choices = group_acronym_choices
-
-        # Set up constraints for the meeting
-        self._wg_field_data = []
-        for constraintname in meeting.group_conflict_types.all():
-            # two fields for each constraint: a CharField for the group list and a selector to add entries
-            constraint_field = forms.CharField(max_length=255, required=False)
-            constraint_field.widget.attrs['data-slug'] = constraintname.slug
-            constraint_field.widget.attrs['data-constraint-name'] = str(constraintname).title()
-            self._add_widget_class(constraint_field.widget, 'wg_constraint')
-
-            selector_field = forms.ChoiceField(choices=group_acronym_choices, required=False)
-            selector_field.widget.attrs['data-slug'] = constraintname.slug  # used by onchange handler
-            self._add_widget_class(selector_field.widget, 'wg_constraint_selector')
-
-            cfield_id = 'constraint_{}'.format(constraintname.slug)
-            cselector_id = 'wg_selector_{}'.format(constraintname.slug)
-            # keep an eye out for field name conflicts
-            log.assertion('cfield_id not in self.fields')
-            log.assertion('cselector_id not in self.fields')
-            self.fields[cfield_id] = constraint_field
-            self.fields[cselector_id] = selector_field
-            self._wg_field_data.append((constraintname, cfield_id, cselector_id))
-
-        # Show constraints that are not actually used by the meeting so these don't get lost
-        self._inactive_wg_field_data = []
-        inactive_cnames = ConstraintName.objects.filter(
-            is_group_conflict=True  # Only collect group conflicts...
-        ).exclude(
-            meeting=meeting  # ...that are not enabled for this meeting...
-        ).filter(
-            constraint__source=group,  # ...but exist for this group...
-            constraint__meeting=meeting,  # ... at this meeting.
-        ).distinct()
-
-        for inactive_constraint_name in inactive_cnames:
-            field_id = 'delete_{}'.format(inactive_constraint_name.slug)
-            self.fields[field_id] = forms.BooleanField(required=False, label='Delete this conflict', help_text='Delete this inactive conflict?')
-            constraints = group.constraint_source_set.filter(meeting=meeting, name=inactive_constraint_name)
-            self._inactive_wg_field_data.append(
-                (inactive_constraint_name,
-                 ' '.join([c.target.acronym for c in constraints]),
-                 field_id)
-            )
-
-        self.fields['joint_with_groups_selector'].widget.attrs['onchange'] = "document.form_post.joint_with_groups.value=document.form_post.joint_with_groups.value + ' ' + this.options[this.selectedIndex].value; return 1;"
-        self.fields["resources"].choices = [(x.pk,x.desc) for x in ResourceAssociation.objects.filter(name__used=True).order_by('name__order') ]
-
-        if self.hidden:
-            # replace all the widgets to start...
-            for key in list(self.fields.keys()):
-                self.fields[key].widget = forms.HiddenInput()
-            # re-replace a couple special cases
-            self.fields['resources'].widget = forms.MultipleHiddenInput()
-            self.fields['timeranges'].widget = forms.MultipleHiddenInput()
-            # and entirely replace bethere - no need to support searching if input is hidden
-            self.fields['bethere'] = forms.ModelMultipleChoiceField(
-                widget=forms.MultipleHiddenInput, required=False,
-                queryset=Person.objects.all(),
-            )
-
-    def wg_constraint_fields(self):
-        """Iterates over wg constraint fields
-
-        Intended for use in the template.
-        """
-        for cname, cfield_id, cselector_id in self._wg_field_data:
-            yield cname, self[cfield_id], self[cselector_id]
-
-    def wg_constraint_count(self):
-        """How many wg constraints are there?"""
-        return len(self._wg_field_data)
-
-    def wg_constraint_field_ids(self):
-        """Iterates over wg constraint field IDs"""
-        for cname, cfield_id, _ in self._wg_field_data:
-            yield cname, cfield_id
-
-    def inactive_wg_constraints(self):
-        for cname, value, field_id in self._inactive_wg_field_data:
-            yield cname, value, self[field_id]
-
-    def inactive_wg_constraint_count(self):
-        return len(self._inactive_wg_field_data)
-
-    def inactive_wg_constraint_field_ids(self):
-        """Iterates over wg constraint field IDs"""
-        for cname, _, field_id in self._inactive_wg_field_data:
-            yield cname, field_id
-
-    @staticmethod
-    def _add_widget_class(widget, new_class):
-        """Add a new class, taking care in case some already exist"""
-        existing_classes = widget.attrs.get('class', '').split()
-        widget.attrs['class'] = ' '.join(existing_classes + [new_class])
-
-    def _join_conflicts(self, cleaned_data, slugs):
-        """Concatenate constraint fields from cleaned data into a single list"""
-        conflicts = []
-        for cname, cfield_id, _ in self._wg_field_data:
-            if cname.slug in slugs and cfield_id in cleaned_data:
-                groups = cleaned_data[cfield_id]
-                # convert to python list (allow space or comma separated lists)
-                items = groups.replace(',',' ').split()
-                conflicts.extend(items)
-        return conflicts
-
-    def _validate_duplicate_conflicts(self, cleaned_data):
-        """Validate that no WGs appear in more than one constraint that does not allow duplicates
-
-        Raises ValidationError
-        """
-        # Only the older constraints (conflict, conflic2, conflic3) need to be mutually exclusive.
-        all_conflicts = self._join_conflicts(cleaned_data, ['conflict', 'conflic2', 'conflic3'])
-        seen = []
-        duplicated = []
-        errors = []
-        for c in all_conflicts:
-            if c not in seen:
-                seen.append(c)
-            elif c not in duplicated:  # only report once
-                duplicated.append(c)
-                errors.append(forms.ValidationError('%s appears in conflicts more than once' % c))
-        return errors
-
-    def clean_joint_with_groups(self):
-        groups = self.cleaned_data['joint_with_groups']
-        check_conflict(groups, self.group)
-        return groups
-
-    def clean_comments(self):
-        return clean_text_field(self.cleaned_data['comments'])
-
-    def is_valid(self):
-        return super().is_valid() and self.session_forms.is_valid()
-
-    def clean(self):
-        super(SessionForm, self).clean()
-        self.session_forms.clean()
-
-        data = self.cleaned_data
-
-        # Validate the individual conflict fields
-        for _, cfield_id, _ in self._wg_field_data:
-            try:
-                check_conflict(data[cfield_id], self.group)
-            except forms.ValidationError as e:
-                self.add_error(cfield_id, e)
-
-        # Skip remaining tests if individual field tests had errors,
-        if self.errors:
-            return data
-
-        # error if conflicts contain disallowed dupes
-        for error in self._validate_duplicate_conflicts(data):
-            self.add_error(None, error)
-
-        # Verify expected number of session entries are present
-        num_sessions_with_data = len(self.session_forms.forms_to_keep)
-        num_sessions_expected = -1
-        try:
-            num_sessions_expected = int(data.get('num_session', ''))
-        except ValueError:
-            self.add_error('num_session', 'Invalid value for number of sessions')
-        if num_sessions_with_data < num_sessions_expected:
-            self.add_error('num_session', 'Must provide data for all sessions')
-
-        # if default (empty) option is selected, cleaned_data won't include num_session key
-        if num_sessions_expected != 2 and num_sessions_expected is not None:
-            if data.get('session_time_relation'):
-                self.add_error(
-                    'session_time_relation',
-                    forms.ValidationError('Time between sessions can only be used when two sessions are requested.')
-                )
-
-        joint_session = data.get('joint_for_session', '')
-        if joint_session != '':
-            joint_session = int(joint_session)
-            if joint_session > num_sessions_with_data:
-                self.add_error(
-                    'joint_for_session',
-                    forms.ValidationError(
-                        f'Session {joint_session} can not be the joint session, the session has not been requested.'
-                    )
-                )
-
-        return data
-
-    @property
-    def media(self):
-        # get media for our formset
-        return super().media + self.session_forms.media + forms.Media(js=('secr/js/session_form.js',))
-
-
-# Used for totally virtual meetings during COVID-19 to omit the expected
-# number of attendees since there were no room size limitations
-#
-# class VirtualSessionForm(SessionForm):
-#     '''A SessionForm customized for special virtual meeting requirements'''
-#     attendees = forms.IntegerField(required=False)
-
-
-class ToolStatusForm(forms.Form):
-    message = forms.CharField(widget=forms.Textarea(attrs={'rows':'3','cols':'80'}), strip=False)
-
diff --git a/ietf/secr/sreq/templatetags/__init__.py b/ietf/secr/sreq/templatetags/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ietf/secr/sreq/templatetags/ams_filters.py b/ietf/secr/sreq/templatetags/ams_filters.py
deleted file mode 100644
index 125acdeda8..0000000000
--- a/ietf/secr/sreq/templatetags/ams_filters.py
+++ /dev/null
@@ -1,79 +0,0 @@
-from django import template
-from ietf.person.models import Person
-
-
-register = template.Library()
-
-@register.filter
-def abbr_status(value):
-    """
-    Converts RFC Status to a short abbreviation
-    """
-    d = {'Proposed Standard':'PS',
-         'Draft Standard':'DS',
-         'Standard':'S',
-         'Historic':'H',
-         'Informational':'I',
-         'Experimental':'E',
-         'Best Current Practice':'BCP',
-         'Internet Standard':'IS'}
-
-    return d.get(value,value)
-
-@register.filter(name='display_duration')
-def display_duration(value):
-    """
-    Maps a session requested duration from select index to 
-    label."""
-    if value in (None, ''):
-        return 'unspecified'
-    value = int(value)
-    map = {0: 'None',
-           1800: '30 Minutes',
-           3600: '1 Hour',
-           5400: '1.5 Hours',
-           7200: '2 Hours',
-           9000: '2.5 Hours',
-           10800: '3 Hours',
-           12600: '3.5 Hours',
-           14400: '4 Hours'}
-    if value in map:
-        return map[value]
-    else:
-        return "%d Hours %d Minutes %d Seconds"%(value//3600,(value%3600)//60,value%60)
-
-@register.filter
-def get_published_date(doc):
-    '''
-    Returns the published date for a RFC Document
-    '''
-    event = doc.latest_event(type='published_rfc')
-    if event:
-        return event.time
-    event = doc.latest_event(type='new_revision')
-    if event:
-        return event.time
-    else:
-        return None
-        
-@register.filter
-def is_ppt(value):
-    '''
-    Checks if the value ends in ppt or pptx
-    '''
-    if value.endswith('ppt') or value.endswith('pptx'):
-        return True
-    else:
-        return False
-        
-@register.filter
-def smart_login(user):
-    '''
-    Expects a Person object.  If person is a Secretariat returns "on behalf of the"
-    '''
-    if not isinstance (user, Person):
-        return user
-    if user.role_set.filter(name='secr',group__acronym='secretariat'):
-        return '%s, on behalf of the' % user
-    else:
-        return '%s, a chair of the' % user
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
deleted file mode 100644
index fabbc0807b..0000000000
--- a/ietf/secr/sreq/tests.py
+++ /dev/null
@@ -1,1098 +0,0 @@
-# Copyright The IETF Trust 2013-2022, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import datetime
-
-from django.urls import reverse
-
-import debug                            # pyflakes:ignore
-
-from ietf.utils.test_utils import TestCase
-from ietf.group.factories import GroupFactory, RoleFactory
-from ietf.meeting.models import Session, ResourceAssociation, SchedulingEvent, Constraint
-from ietf.meeting.factories import MeetingFactory, SessionFactory
-from ietf.name.models import ConstraintName, TimerangeName
-from ietf.person.models import Person
-from ietf.secr.sreq.forms import SessionForm
-from ietf.utils.mail import outbox, empty_outbox, get_payload_text
-
-from pyquery import PyQuery
-
-SECR_USER='secretary'
-
-class SreqUrlTests(TestCase):
-    def test_urls(self):
-        MeetingFactory(type_id='ietf',date=datetime.date.today())
-
-        self.client.login(username="secretary", password="secretary+password")
-
-        r = self.client.get("/secr/")
-        self.assertEqual(r.status_code, 200)
-
-        r = self.client.get("/secr/sreq/")
-        self.assertEqual(r.status_code, 200)
-
-        testgroup=GroupFactory()
-        r = self.client.get("/secr/sreq/%s/new/" % testgroup.acronym)
-        self.assertEqual(r.status_code, 200)
-
-class SessionRequestTestCase(TestCase):
-    def test_main(self):
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        SessionFactory.create_batch(2, meeting=meeting, status_id='sched')
-        SessionFactory.create_batch(2, meeting=meeting, status_id='disappr')
-        # An additional unscheduled group comes from make_immutable_base_data
-        url = reverse('ietf.secr.sreq.views.main')
-        self.client.login(username="secretary", password="secretary+password")
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        sched = r.context['scheduled_groups']
-        self.assertEqual(len(sched), 2)
-        unsched = r.context['unscheduled_groups']
-        self.assertEqual(len(unsched), 11)
-
-    def test_approve(self):
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        ad = Person.objects.get(user__username='ad')
-        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
-        mars = GroupFactory(parent=area, acronym='mars')
-        # create session waiting for approval
-        session = SessionFactory(meeting=meeting, group=mars, status_id='apprw')
-        url = reverse('ietf.secr.sreq.views.approve', kwargs={'acronym':'mars'})
-        self.client.login(username="ad", password="ad+password")
-        r = self.client.get(url)
-        self.assertRedirects(r,reverse('ietf.secr.sreq.views.view', kwargs={'acronym':'mars'}))
-        self.assertEqual(SchedulingEvent.objects.filter(session=session).order_by('-id')[0].status_id, 'appr')
-        
-    def test_cancel(self):
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        ad = Person.objects.get(user__username='ad')
-        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
-        session = SessionFactory(meeting=meeting, group__parent=area, group__acronym='mars', status_id='sched')
-        url = reverse('ietf.secr.sreq.views.cancel', kwargs={'acronym':'mars'})
-        self.client.login(username="ad", password="ad+password")
-        r = self.client.get(url)
-        self.assertRedirects(r,reverse('ietf.secr.sreq.views.main'))
-        self.assertEqual(SchedulingEvent.objects.filter(session=session).order_by('-id')[0].status_id, 'deleted')
-
-    def test_edit(self):
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group
-        group2 = GroupFactory()
-        group3 = GroupFactory()
-        group4 = GroupFactory()
-        iabprog = GroupFactory(type_id='program')
-
-        SessionFactory(meeting=meeting,group=mars,status_id='sched')
-
-        url = reverse('ietf.secr.sreq.views.edit', kwargs={'acronym':'mars'})
-        self.client.login(username="marschairman", password="marschairman+password")
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        attendees = 10
-        comments = 'need lights'
-        mars_sessions = meeting.session_set.filter(group__acronym='mars')
-        empty_outbox()
-        post_data = {'num_session':'2',
-                     'attendees': attendees,
-                     'constraint_chair_conflict':iabprog.acronym,
-                     'session_time_relation': 'subsequent-days',
-                     'adjacent_with_wg': group2.acronym,
-                     'joint_with_groups': group3.acronym + ' ' + group4.acronym,
-                     'joint_for_session': '2',
-                     'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
-                     'session_set-TOTAL_FORMS': '3',  # matches what view actually sends, even with only 2 filled in
-                     'session_set-INITIAL_FORMS': '1',
-                     'session_set-MIN_NUM_FORMS': '1',
-                     'session_set-MAX_NUM_FORMS': '3',
-                     'session_set-0-id':mars_sessions[0].pk,
-                     'session_set-0-name': mars_sessions[0].name,
-                     'session_set-0-short': mars_sessions[0].short,
-                     'session_set-0-purpose': mars_sessions[0].purpose_id,
-                     'session_set-0-type': mars_sessions[0].type_id,
-                     'session_set-0-requested_duration': '3600',
-                     'session_set-0-on_agenda': mars_sessions[0].on_agenda,
-                     'session_set-0-remote_instructions': mars_sessions[0].remote_instructions,
-                     'session_set-0-attendees': attendees,
-                     'session_set-0-comments': comments,
-                     'session_set-0-DELETE': '',
-                     # no session_set-1-id because it's a new request
-                     'session_set-1-name': '',
-                     'session_set-1-short': '',
-                     'session_set-1-purpose': 'regular',
-                     'session_set-1-type': 'regular',
-                     'session_set-1-requested_duration': '3600',
-                     'session_set-1-on_agenda': True,
-                     'session_set-1-remote_instructions': mars_sessions[0].remote_instructions,
-                     'session_set-1-attendees': attendees,
-                     'session_set-1-comments': comments,
-                     'session_set-1-DELETE': '',
-                     'session_set-2-id': '',
-                     'session_set-2-name': '',
-                     'session_set-2-short': '',
-                     'session_set-2-purpose': 'regular',
-                     'session_set-2-type': 'regular',
-                     'session_set-2-requested_duration': '',
-                     'session_set-2-on_agenda': 'True',
-                     'session_set-2-attendees': attendees,
-                     'session_set-2-comments': '',
-                     'session_set-2-DELETE': 'on',
-                     'submit': 'Continue'}
-        r = self.client.post(url, post_data, HTTP_HOST='example.com')
-        redirect_url = reverse('ietf.secr.sreq.views.view', kwargs={'acronym': 'mars'})
-        self.assertRedirects(r, redirect_url)
-
-        # Check whether updates were stored in the database
-        sessions = Session.objects.filter(meeting=meeting, group=mars)
-        self.assertEqual(len(sessions), 2)
-        session = sessions[0]
-
-        self.assertEqual(session.constraints().get(name='chair_conflict').target.acronym, iabprog.acronym)
-        self.assertEqual(session.constraints().get(name='time_relation').time_relation, 'subsequent-days')
-        self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
-        self.assertEqual(
-            list(session.constraints().get(name='timerange').timeranges.all().values('name')),
-            list(TimerangeName.objects.filter(name__in=['thursday-afternoon-early', 'thursday-afternoon-late']).values('name'))
-        )
-        self.assertFalse(sessions[0].joint_with_groups.count())
-        self.assertEqual(list(sessions[1].joint_with_groups.all()), [group3, group4])
-
-        # Check whether the updated data is visible on the view page
-        r = self.client.get(redirect_url)
-        self.assertContains(r, 'Schedule the sessions on subsequent days')
-        self.assertContains(r, 'Thursday early afternoon, Thursday late afternoon')
-        self.assertContains(r, group2.acronym)
-        self.assertContains(r, 'Second session with: {} {}'.format(group3.acronym, group4.acronym))
-
-        # check that a notification was sent
-        self.assertEqual(len(outbox), 1)
-        notification_payload = get_payload_text(outbox[0])
-        self.assertIn('1 Hour, 1 Hour', notification_payload)
-        self.assertNotIn('1 Hour, 1 Hour, 1 Hour', notification_payload)
-
-        # Edit again, changing the joint sessions and clearing some fields. The behaviour of
-        # edit is different depending on whether previous joint sessions were recorded.
-        empty_outbox()
-        post_data = {'num_session':'2',
-                     'attendees':attendees,
-                     'constraint_chair_conflict':'',
-                     'comments':'need lights',
-                     'joint_with_groups': group2.acronym,
-                     'joint_for_session': '1',
-                     'session_set-TOTAL_FORMS': '3',  # matches what view actually sends, even with only 2 filled in
-                     'session_set-INITIAL_FORMS': '2',
-                     'session_set-MIN_NUM_FORMS': '1',
-                     'session_set-MAX_NUM_FORMS': '3',
-                     'session_set-0-id':sessions[0].pk,
-                     'session_set-0-name': sessions[0].name,
-                     'session_set-0-short': sessions[0].short,
-                     'session_set-0-purpose': sessions[0].purpose_id,
-                     'session_set-0-type': sessions[0].type_id,
-                     'session_set-0-requested_duration': '3600',
-                     'session_set-0-on_agenda': sessions[0].on_agenda,
-                     'session_set-0-remote_instructions': sessions[0].remote_instructions,
-                     'session_set-0-attendees': sessions[0].attendees,
-                     'session_set-0-comments': sessions[1].comments,
-                     'session_set-0-DELETE': '',
-                     'session_set-1-id': sessions[1].pk,
-                     'session_set-1-name': sessions[1].name,
-                     'session_set-1-short': sessions[1].short,
-                     'session_set-1-purpose': sessions[1].purpose_id,
-                     'session_set-1-type': sessions[1].type_id,
-                     'session_set-1-requested_duration': '3600',
-                     'session_set-1-on_agenda': sessions[1].on_agenda,
-                     'session_set-1-remote_instructions': sessions[1].remote_instructions,
-                     'session_set-1-attendees': sessions[1].attendees,
-                     'session_set-1-comments': sessions[1].comments,
-                     'session_set-1-DELETE': '',
-                     'session_set-2-id': '',
-                     'session_set-2-name': '',
-                     'session_set-2-short': '',
-                     'session_set-2-purpose': 'regular',
-                     'session_set-2-type': 'regular',
-                     'session_set-2-requested_duration': '',
-                     'session_set-2-on_agenda': 'True',
-                     'session_set-2-attendees': attendees,
-                     'session_set-2-comments': '',
-                     'session_set-2-DELETE': 'on',
-                     'submit': 'Continue'}
-        r = self.client.post(url, post_data, HTTP_HOST='example.com')
-        self.assertRedirects(r, redirect_url)
-
-        # Check whether updates were stored in the database
-        sessions = Session.objects.filter(meeting=meeting, group=mars)
-        self.assertEqual(len(sessions), 2)
-        session = sessions[0]
-        self.assertFalse(session.constraints().filter(name='time_relation'))
-        self.assertFalse(session.constraints().filter(name='wg_adjacent'))
-        self.assertFalse(session.constraints().filter(name='timerange'))
-        self.assertEqual(list(sessions[0].joint_with_groups.all()), [group2])
-        self.assertFalse(sessions[1].joint_with_groups.count())
-
-        # check that a notification was sent
-        self.assertEqual(len(outbox), 1)
-        notification_payload = get_payload_text(outbox[0])
-        self.assertIn('1 Hour, 1 Hour', notification_payload)
-        self.assertNotIn('1 Hour, 1 Hour, 1 Hour', notification_payload)
-
-        # Check whether the updated data is visible on the view page
-        r = self.client.get(redirect_url)
-        self.assertContains(r, 'First session with: {}'.format(group2.acronym))
-
-
-    def test_edit_constraint_bethere(self):
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group
-        session = SessionFactory(meeting=meeting, group=mars, status_id='sched')
-        Constraint.objects.create(
-            meeting=meeting,
-            source=mars,
-            person=Person.objects.get(user__username='marschairman'),
-            name_id='bethere',
-        )
-        self.assertEqual(session.people_constraints.count(), 1)
-        url = reverse('ietf.secr.sreq.views.edit', kwargs=dict(acronym='mars'))
-        self.client.login(username='marschairman', password='marschairman+password')
-        attendees = '10'
-        ad = Person.objects.get(user__username='ad')
-        post_data = {
-            'num_session': '1',
-            'attendees': attendees,
-            'bethere': str(ad.pk),
-            'constraint_chair_conflict':'',
-            'comments':'',
-            'joint_with_groups': '',
-            'joint_for_session': '',
-            'delete_conflict': 'on',
-            'session_set-TOTAL_FORMS': '3',  # matches what view actually sends, even with only 2 filled in
-            'session_set-INITIAL_FORMS': '1',
-            'session_set-MIN_NUM_FORMS': '1',
-            'session_set-MAX_NUM_FORMS': '3',
-            'session_set-0-id':session.pk,
-            'session_set-0-name': session.name,
-            'session_set-0-short': session.short,
-            'session_set-0-purpose': session.purpose_id,
-            'session_set-0-type': session.type_id,
-            'session_set-0-requested_duration': '3600',
-            'session_set-0-on_agenda': session.on_agenda,
-            'session_set-0-remote_instructions': session.remote_instructions,
-            'session_set-0-attendees': attendees,
-            'session_set-0-comments': '',
-            'session_set-0-DELETE': '',
-            'session_set-1-id': '',
-            'session_set-1-name': '',
-            'session_set-1-short': '',
-            'session_set-1-purpose':'regular',
-            'session_set-1-type':'regular',
-            'session_set-1-requested_duration': '',
-            'session_set-1-on_agenda': 'True',
-            'session_set-1-attendees': attendees,
-            'session_set-1-comments': '',
-            'session_set-1-DELETE': 'on',
-            'session_set-2-id': '',
-            'session_set-2-name': '',
-            'session_set-2-short': '',
-            'session_set-2-purpose': 'regular',
-            'session_set-2-type': 'regular',
-            'session_set-2-requested_duration': '',
-            'session_set-2-on_agenda': 'True',
-            'session_set-2-attendees': attendees,
-            'session_set-2-comments': '',
-            'session_set-2-DELETE': 'on',
-            'submit': 'Save',
-        }
-        r = self.client.post(url, post_data, HTTP_HOST='example.com')
-        redirect_url = reverse('ietf.secr.sreq.views.view', kwargs={'acronym': 'mars'})
-        self.assertRedirects(r, redirect_url)
-        self.assertEqual([pc.person for pc in session.people_constraints.all()], [ad])
-
-    def test_edit_inactive_conflicts(self):
-        """Inactive conflicts should be displayed and removable"""
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today(), group_conflicts=['chair_conflict'])
-        mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group
-        session = SessionFactory(meeting=meeting, group=mars, status_id='sched')
-        other_group = GroupFactory()
-        Constraint.objects.create(
-            meeting=meeting,
-            name_id='conflict',  # not in group_conflicts for the meeting
-            source=mars,
-            target=other_group,
-        )
-
-        url = reverse('ietf.secr.sreq.views.edit', kwargs=dict(acronym='mars'))
-        self.client.login(username='marschairman', password='marschairman+password')
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-
-        # check that the inactive session is displayed
-        found = q('input#id_delete_conflict[type="checkbox"]')
-        self.assertEqual(len(found), 1)
-        delete_checkbox = found[0]
-        # check that the label on the checkbox is correct
-        self.assertIn('Delete this conflict', delete_checkbox.tail)
-        # check that the target is displayed correctly in the UI
-        self.assertIn(other_group.acronym, delete_checkbox.find('../input[@type="text"]').value)
-
-        attendees = '10'
-        post_data = {
-            'num_session': '1',
-            'attendees': attendees,
-            'constraint_chair_conflict':'',
-            'comments':'',
-            'joint_with_groups': '',
-            'joint_for_session': '',
-            'delete_conflict': 'on',
-            'session_set-TOTAL_FORMS': '1',
-            'session_set-INITIAL_FORMS': '1',
-            'session_set-MIN_NUM_FORMS': '1',
-            'session_set-MAX_NUM_FORMS': '3',
-            'session_set-0-id':session.pk,
-            'session_set-0-name': session.name,
-            'session_set-0-short': session.short,
-            'session_set-0-purpose': session.purpose_id,
-            'session_set-0-type': session.type_id,
-            'session_set-0-requested_duration': '3600',
-            'session_set-0-on_agenda': session.on_agenda,
-            'session_set-0-remote_instructions': session.remote_instructions,
-            'session_set-0-attendees': attendees,
-            'session_set-0-comments': '',
-            'session_set-0-DELETE': '',
-            'submit': 'Save',
-        }
-        r = self.client.post(url, post_data, HTTP_HOST='example.com')
-        redirect_url = reverse('ietf.secr.sreq.views.view', kwargs={'acronym': 'mars'})
-        self.assertRedirects(r, redirect_url)
-        self.assertEqual(len(mars.constraint_source_set.filter(name_id='conflict')), 0)
-
-    def test_tool_status(self):
-        MeetingFactory(type_id='ietf', date=datetime.date.today())
-        url = reverse('ietf.secr.sreq.views.tool_status')
-        self.client.login(username="secretary", password="secretary+password")
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        r = self.client.post(url, {'message':'locked', 'submit':'Lock'})
-        self.assertRedirects(r,reverse('ietf.secr.sreq.views.main'))
-
-    def test_new_req_constraint_types(self):
-        """Configurable constraint types should be handled correctly in a new request
-
-        Relies on SessionForm representing constraint values with element IDs
-        like id_constraint_<ConstraintName slug>
-        """
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars')
-        url = reverse('ietf.secr.sreq.views.new', kwargs=dict(acronym='mars'))
-        self.client.login(username="marschairman", password="marschairman+password")
-
-        for expected in [
-            ['conflict', 'conflic2', 'conflic3'],
-            ['chair_conflict', 'tech_overlap', 'key_participant'],
-        ]:
-            meeting.group_conflict_types.clear()
-            for slug in expected:
-                meeting.group_conflict_types.add(ConstraintName.objects.get(slug=slug))
-
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertCountEqual(
-                [elt.attr('id') for elt in q.items('*[id^=id_constraint_]')],
-                ['id_constraint_{}'.format(conf_name) for conf_name in expected],
-            )
-
-    def test_edit_req_constraint_types(self):
-        """Editing a request constraint should show the expected constraints"""
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        SessionFactory(group__acronym='mars',
-                       status_id='schedw',
-                       meeting=meeting,
-                       add_to_schedule=False)
-        RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars')
-
-        url = reverse('ietf.secr.sreq.views.edit', kwargs=dict(acronym='mars'))
-        self.client.login(username='marschairman', password='marschairman+password')
-
-        for expected in [
-            ['conflict', 'conflic2', 'conflic3'],
-            ['chair_conflict', 'tech_overlap', 'key_participant'],
-        ]:
-            meeting.group_conflict_types.clear()
-            for slug in expected:
-                meeting.group_conflict_types.add(ConstraintName.objects.get(slug=slug))
-
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertCountEqual(
-                [elt.attr('id') for elt in q.items('*[id^=id_constraint_]')],
-                ['id_constraint_{}'.format(conf_name) for conf_name in expected],
-            )
-
-class SubmitRequestCase(TestCase):
-    def setUp(self):
-        super(SubmitRequestCase, self).setUp()
-        # Ensure meeting numbers are predictable. Temporarily needed while basing
-        # constraint types on meeting number, expected to go away when #2770 is resolved.
-        MeetingFactory.reset_sequence(0)
-
-    def test_submit_request(self):
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        ad = Person.objects.get(user__username='ad')
-        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
-        group = GroupFactory(parent=area)
-        group2 = GroupFactory(parent=area)
-        group3 = GroupFactory(parent=area)
-        group4 = GroupFactory(parent=area)
-        session_count_before = Session.objects.filter(meeting=meeting, group=group).count()
-        url = reverse('ietf.secr.sreq.views.new',kwargs={'acronym':group.acronym})
-        confirm_url = reverse('ietf.secr.sreq.views.confirm',kwargs={'acronym':group.acronym})
-        main_url = reverse('ietf.secr.sreq.views.main')
-        attendees = '10'
-        comments = 'need projector'
-        post_data = {'num_session':'1',
-                     'attendees':attendees,
-                     'constraint_chair_conflict':'',
-                     'comments':comments,
-                     'adjacent_with_wg': group2.acronym,
-                     'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
-                     'joint_with_groups': group3.acronym + ' ' + group4.acronym,
-                     'joint_for_session': '1',
-                     'session_set-TOTAL_FORMS': '1',
-                     'session_set-INITIAL_FORMS': '0',
-                     'session_set-MIN_NUM_FORMS': '1',
-                     'session_set-MAX_NUM_FORMS': '3',
-                     # no 'session_set-0-id' to create a new session
-                     'session_set-0-name': '',
-                     'session_set-0-short': '',
-                     'session_set-0-purpose': 'regular',
-                     'session_set-0-type': 'regular',
-                     'session_set-0-requested_duration': '3600',
-                     'session_set-0-on_agenda': True,
-                     'session_set-0-remote_instructions': '',
-                     'session_set-0-attendees': attendees,
-                     'session_set-0-comments': comments,
-                     'session_set-0-DELETE': '',
-                     'submit': 'Continue'}
-        self.client.login(username="secretary", password="secretary+password")
-        r = self.client.post(url,post_data)
-        self.assertEqual(r.status_code, 200)
-
-        # Verify the contents of the confirm view
-        self.assertContains(r, 'Thursday early afternoon, Thursday late afternoon')
-        self.assertContains(r, group2.acronym)
-        self.assertContains(r, 'First session with: {} {}'.format(group3.acronym, group4.acronym))
-
-        post_data['submit'] = 'Submit'
-        r = self.client.post(confirm_url,post_data)
-        self.assertRedirects(r, main_url)
-        session_count_after = Session.objects.filter(meeting=meeting, group=group, type='regular').count()
-        self.assertEqual(session_count_after, session_count_before + 1)
-
-        # test that second confirm does not add sessions
-        r = self.client.post(confirm_url,post_data)
-        self.assertRedirects(r, main_url)
-        session_count_after = Session.objects.filter(meeting=meeting, group=group, type='regular').count()
-        self.assertEqual(session_count_after, session_count_before + 1)
-
-        # Verify database content
-        session = Session.objects.get(meeting=meeting, group=group)
-        self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
-        self.assertEqual(
-            list(session.constraints().get(name='timerange').timeranges.all().values('name')),
-            list(TimerangeName.objects.filter(name__in=['thursday-afternoon-early', 'thursday-afternoon-late']).values('name'))
-        )
-        self.assertEqual(list(session.joint_with_groups.all()), [group3, group4])
-
-    def test_submit_request_invalid(self):
-        MeetingFactory(type_id='ietf', date=datetime.date.today())
-        ad = Person.objects.get(user__username='ad')
-        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
-        group = GroupFactory(parent=area)
-        url = reverse('ietf.secr.sreq.views.new',kwargs={'acronym':group.acronym})
-        attendees = '10'
-        comments = 'need projector'
-        post_data = {
-            'num_session':'2',
-            'attendees':attendees,
-            'constraint_chair_conflict':'',
-            'comments':comments,
-            'session_set-TOTAL_FORMS': '1',
-            'session_set-INITIAL_FORMS': '1',
-            'session_set-MIN_NUM_FORMS': '1',
-            'session_set-MAX_NUM_FORMS': '3',
-            # no 'session_set-0-id' to create a new session
-            'session_set-0-name': '',
-            'session_set-0-short': '',
-            'session_set-0-purpose': 'regular',
-            'session_set-0-type': 'regular',
-            'session_set-0-requested_duration': '3600',
-            'session_set-0-on_agenda': True,
-            'session_set-0-remote_instructions': '',
-            'session_set-0-attendees': attendees,
-            'session_set-0-comments': comments,
-            'session_set-0-DELETE': '',
-        }
-        self.client.login(username="secretary", password="secretary+password")
-        r = self.client.post(url,post_data)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('#session-request-form')),1)
-        self.assertContains(r, 'Must provide data for all sessions')
-
-    def test_submit_request_check_constraints(self):
-        m1 = MeetingFactory(type_id='ietf', date=datetime.date.today() - datetime.timedelta(days=100))
-        MeetingFactory(type_id='ietf', date=datetime.date.today(),
-                       group_conflicts=['chair_conflict', 'conflic2', 'conflic3'])
-        ad = Person.objects.get(user__username='ad')
-        area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
-        group = GroupFactory(parent=area)
-        still_active_group = GroupFactory(parent=area)
-        Constraint.objects.create(
-            meeting=m1,
-            source=group,
-            target=still_active_group,
-            name_id='chair_conflict',
-        )
-        inactive_group = GroupFactory(parent=area, state_id='conclude')
-        inactive_group.save()
-        Constraint.objects.create(
-            meeting=m1,
-            source=group,
-            target=inactive_group,
-            name_id='chair_conflict',
-        )
-        session = SessionFactory(group=group, meeting=m1)
-
-        self.client.login(username="secretary", password="secretary+password")
-
-        url = reverse('ietf.secr.sreq.views.new',kwargs={'acronym':group.acronym})
-        r = self.client.get(url + '?previous')
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        conflict1 = q('[name="constraint_chair_conflict"]').val()
-        self.assertIn(still_active_group.acronym, conflict1)
-        self.assertNotIn(inactive_group.acronym, conflict1)
-
-        attendees = '10'
-        comments = 'need projector'
-        post_data = {'num_session':'1',
-                     'attendees':attendees,
-                     'constraint_chair_conflict': group.acronym,
-                     'comments':comments,
-                     'session_set-TOTAL_FORMS': '1',
-                     'session_set-INITIAL_FORMS': '1',
-                     'session_set-MIN_NUM_FORMS': '1',
-                     'session_set-MAX_NUM_FORMS': '3',
-                     # no 'session_set-0-id' to create a new session
-                     'session_set-0-name': '',
-                     'session_set-0-short': '',
-                     'session_set-0-purpose': session.purpose_id,
-                     'session_set-0-type': session.type_id,
-                     'session_set-0-requested_duration': '3600',
-                     'session_set-0-on_agenda': session.on_agenda,
-                     'session_set-0-remote_instructions': session.remote_instructions,
-                     'session_set-0-attendees': attendees,
-                     'session_set-0-comments': comments,
-                     'session_set-0-DELETE': '',
-                     'submit': 'Continue'}
-        r = self.client.post(url,post_data)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('#session-request-form')),1)
-        self.assertContains(r, "Cannot declare a conflict with the same group")
-
-    def test_request_notification(self):
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        ad = Person.objects.get(user__username='ad')
-        area = GroupFactory(type_id='area')
-        RoleFactory(name_id='ad', person=ad, group=area)
-        group = GroupFactory(acronym='ames', parent=area)
-        group2 = GroupFactory(acronym='ames2', parent=area)
-        group3 = GroupFactory(acronym='ames2', parent=area)
-        group4 = GroupFactory(acronym='ames3', parent=area)
-        RoleFactory(name_id='chair', group=group, person__user__username='ameschairman')
-        resource = ResourceAssociation.objects.create(name_id='project')
-        # Bit of a test data hack - the fixture now has no used resources to pick from
-        resource.name.used=True
-        resource.name.save()
-
-        url = reverse('ietf.secr.sreq.views.new',kwargs={'acronym':group.acronym})
-        confirm_url = reverse('ietf.secr.sreq.views.confirm',kwargs={'acronym':group.acronym})
-        len_before = len(outbox)
-        attendees = '10'
-        post_data = {'num_session':'2',
-                     'attendees':attendees,
-                     'bethere':str(ad.pk),
-                     'constraint_chair_conflict':group4.acronym,
-                     'comments':'',
-                     'resources': resource.pk,
-                     'session_time_relation': 'subsequent-days',
-                     'adjacent_with_wg': group2.acronym,
-                     'joint_with_groups': group3.acronym,
-                     'joint_for_session': '2',
-                     'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
-                     'session_set-TOTAL_FORMS': '2',
-                     'session_set-INITIAL_FORMS': '0',
-                     'session_set-MIN_NUM_FORMS': '1',
-                     'session_set-MAX_NUM_FORMS': '3',
-                     # no 'session_set-0-id' for new session
-                     'session_set-0-name': '',
-                     'session_set-0-short': '',
-                     'session_set-0-purpose': 'regular',
-                     'session_set-0-type': 'regular',
-                     'session_set-0-requested_duration': '3600',
-                     'session_set-0-on_agenda': True,
-                     'session_set-0-remote_instructions': '',
-                     'session_set-0-attendees': attendees,
-                     'session_set-0-comments': '',
-                     'session_set-0-DELETE': '',
-                     # no 'session_set-1-id' for new session
-                     'session_set-1-name': '',
-                     'session_set-1-short': '',
-                     'session_set-1-purpose': 'regular',
-                     'session_set-1-type': 'regular',
-                     'session_set-1-requested_duration': '3600',
-                     'session_set-1-on_agenda': True,
-                     'session_set-1-remote_instructions': '',
-                     'session_set-1-attendees': attendees,
-                     'session_set-1-comments': '',
-                     'session_set-1-DELETE': '',
-                     'submit': 'Continue'}
-        self.client.login(username="ameschairman", password="ameschairman+password")
-        # submit
-        r = self.client.post(url,post_data)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertTrue('Confirm' in str(q("title")), r.context['form'].errors)
-        # confirm
-        post_data['submit'] = 'Submit'
-        r = self.client.post(confirm_url,post_data)
-        self.assertRedirects(r, reverse('ietf.secr.sreq.views.main'))
-        self.assertEqual(len(outbox),len_before+1)
-        notification = outbox[-1]
-        notification_payload = get_payload_text(notification)
-        sessions = Session.objects.filter(meeting=meeting,group=group)
-        self.assertEqual(len(sessions), 2)
-        session = sessions[0]
-
-        self.assertEqual(session.resources.count(),1)
-        self.assertEqual(session.people_constraints.count(),1)
-        self.assertEqual(session.constraints().get(name='time_relation').time_relation, 'subsequent-days')
-        self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
-        self.assertEqual(
-            list(session.constraints().get(name='timerange').timeranges.all().values('name')),
-            list(TimerangeName.objects.filter(name__in=['thursday-afternoon-early', 'thursday-afternoon-late']).values('name'))
-        )
-        resource = session.resources.first()
-        self.assertTrue(resource.desc in notification_payload)
-        self.assertTrue('Schedule the sessions on subsequent days' in notification_payload)
-        self.assertTrue(group2.acronym in notification_payload)
-        self.assertTrue("Can't meet: Thursday early afternoon, Thursday late" in notification_payload)
-        self.assertTrue('Second session joint with: {}'.format(group3.acronym) in notification_payload)
-        self.assertTrue(ad.ascii_name() in notification_payload)
-        self.assertIn(ConstraintName.objects.get(slug='chair_conflict').name, notification_payload)
-        self.assertIn(group.acronym, notification_payload)
-        self.assertIn('1 Hour, 1 Hour', notification_payload)
-        self.assertNotIn('1 Hour, 1 Hour, 1 Hour', notification_payload)
-        self.assertNotIn('The third session requires your approval', notification_payload)
-
-    def test_request_notification_third_session(self):
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
-        ad = Person.objects.get(user__username='ad')
-        area = GroupFactory(type_id='area')
-        RoleFactory(name_id='ad', person=ad, group=area)
-        group = GroupFactory(acronym='ames', parent=area)
-        group2 = GroupFactory(acronym='ames2', parent=area)
-        group3 = GroupFactory(acronym='ames2', parent=area)
-        group4 = GroupFactory(acronym='ames3', parent=area)
-        RoleFactory(name_id='chair', group=group, person__user__username='ameschairman')
-        resource = ResourceAssociation.objects.create(name_id='project')
-        # Bit of a test data hack - the fixture now has no used resources to pick from
-        resource.name.used=True
-        resource.name.save()
-
-        url = reverse('ietf.secr.sreq.views.new',kwargs={'acronym':group.acronym})
-        confirm_url = reverse('ietf.secr.sreq.views.confirm',kwargs={'acronym':group.acronym})
-        len_before = len(outbox)
-        attendees = '10'
-        post_data = {'num_session':'2',
-                     'third_session': 'true',
-                     'attendees':attendees,
-                     'bethere':str(ad.pk),
-                     'constraint_chair_conflict':group4.acronym,
-                     'comments':'',
-                     'resources': resource.pk,
-                     'session_time_relation': 'subsequent-days',
-                     'adjacent_with_wg': group2.acronym,
-                     'joint_with_groups': group3.acronym,
-                     'joint_for_session': '2',
-                     'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
-                     'session_set-TOTAL_FORMS': '3',
-                     'session_set-INITIAL_FORMS': '0',
-                     'session_set-MIN_NUM_FORMS': '1',
-                     'session_set-MAX_NUM_FORMS': '3',
-                     # no 'session_set-0-id' for new session
-                     'session_set-0-name': '',
-                     'session_set-0-short': '',
-                     'session_set-0-purpose': 'regular',
-                     'session_set-0-type': 'regular',
-                     'session_set-0-requested_duration': '3600',
-                     'session_set-0-on_agenda': True,
-                     'session_set-0-remote_instructions': '',
-                     'session_set-0-attendees': attendees,
-                     'session_set-0-comments': '',
-                     'session_set-0-DELETE': '',
-                     # no 'session_set-1-id' for new session
-                     'session_set-1-name': '',
-                     'session_set-1-short': '',
-                     'session_set-1-purpose': 'regular',
-                     'session_set-1-type': 'regular',
-                     'session_set-1-requested_duration': '3600',
-                     'session_set-1-on_agenda': True,
-                     'session_set-1-remote_instructions': '',
-                     'session_set-1-attendees': attendees,
-                     'session_set-1-comments': '',
-                     'session_set-1-DELETE': '',
-                     # no 'session_set-2-id' for new session
-                     'session_set-2-name': '',
-                     'session_set-2-short': '',
-                     'session_set-2-purpose': 'regular',
-                     'session_set-2-type': 'regular',
-                     'session_set-2-requested_duration': '3600',
-                     'session_set-2-on_agenda': True,
-                     'session_set-2-remote_instructions': '',
-                     'session_set-2-attendees': attendees,
-                     'session_set-2-comments': '',
-                     'session_set-2-DELETE': '',
-                     'submit': 'Continue'}
-        self.client.login(username="ameschairman", password="ameschairman+password")
-        # submit
-        r = self.client.post(url,post_data)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertTrue('Confirm' in str(q("title")), r.context['form'].errors)
-        # confirm
-        post_data['submit'] = 'Submit'
-        r = self.client.post(confirm_url,post_data)
-        self.assertRedirects(r, reverse('ietf.secr.sreq.views.main'))
-        self.assertEqual(len(outbox),len_before+1)
-        notification = outbox[-1]
-        notification_payload = get_payload_text(notification)
-        sessions = Session.objects.filter(meeting=meeting,group=group)
-        self.assertEqual(len(sessions), 3)
-        session = sessions[0]
-
-        self.assertEqual(session.resources.count(),1)
-        self.assertEqual(session.people_constraints.count(),1)
-        self.assertEqual(session.constraints().get(name='time_relation').time_relation, 'subsequent-days')
-        self.assertEqual(session.constraints().get(name='wg_adjacent').target.acronym, group2.acronym)
-        self.assertEqual(
-            list(session.constraints().get(name='timerange').timeranges.all().values('name')),
-            list(TimerangeName.objects.filter(name__in=['thursday-afternoon-early', 'thursday-afternoon-late']).values('name'))
-        )
-        resource = session.resources.first()
-        self.assertTrue(resource.desc in notification_payload)
-        self.assertTrue('Schedule the sessions on subsequent days' in notification_payload)
-        self.assertTrue(group2.acronym in notification_payload)
-        self.assertTrue("Can't meet: Thursday early afternoon, Thursday late" in notification_payload)
-        self.assertTrue('Second session joint with: {}'.format(group3.acronym) in notification_payload)
-        self.assertTrue(ad.ascii_name() in notification_payload)
-        self.assertIn(ConstraintName.objects.get(slug='chair_conflict').name, notification_payload)
-        self.assertIn(group.acronym, notification_payload)
-        self.assertIn('1 Hour, 1 Hour, 1 Hour', notification_payload)
-        self.assertIn('The third session requires your approval', notification_payload)
-
-class LockAppTestCase(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.meeting = MeetingFactory(type_id='ietf', date=datetime.date.today(),session_request_lock_message='locked')
-        self.group = GroupFactory(acronym='mars')
-        RoleFactory(name_id='chair', group=self.group, person__user__username='marschairman')
-        SessionFactory(group=self.group,meeting=self.meeting)
-
-    def test_edit_request(self):
-        url = reverse('ietf.secr.sreq.views.edit',kwargs={'acronym':self.group.acronym})
-        self.client.login(username="secretary", password="secretary+password")
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q(':disabled[name="submit"]')), 0)
-        chair = self.group.role_set.filter(name_id='chair').first().person.user.username
-        self.client.login(username=chair, password=f'{chair}+password')
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q(':disabled[name="submit"]')), 1)
-    
-    def test_view_request(self):
-        url = reverse('ietf.secr.sreq.views.view',kwargs={'acronym':self.group.acronym})
-        self.client.login(username="secretary", password="secretary+password")
-        r = self.client.get(url,follow=True)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q(':disabled[name="edit"]')), 1)
-        
-    def test_new_request(self):
-        url = reverse('ietf.secr.sreq.views.new',kwargs={'acronym':self.group.acronym})
-        
-        # try as WG Chair
-        self.client.login(username="marschairman", password="marschairman+password")
-        r = self.client.get(url, follow=True)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('#session-request-form')),0)
-        
-        # try as Secretariat
-        self.client.login(username="secretary", password="secretary+password")
-        r = self.client.get(url,follow=True)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('#session-request-form')),1)
-    
-class NotMeetingCase(TestCase):
-    def test_not_meeting(self):
-        MeetingFactory(type_id='ietf',date=datetime.date.today())
-        group = GroupFactory(acronym='mars')
-        url = reverse('ietf.secr.sreq.views.no_session',kwargs={'acronym':group.acronym}) 
-        self.client.login(username="secretary", password="secretary+password")
-
-        empty_outbox()
-
-        r = self.client.get(url,follow=True)
-        # If the view invoked by that get throws an exception (such as an integrity error),
-        # the traceback from this test will talk about a TransactionManagementError and
-        # yell about executing queries before the end of an 'atomic' block
-
-        # This is a sign of a problem - a get shouldn't have a side-effect like this one does
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, 'A message was sent to notify not having a session')
-
-        r = self.client.get(url,follow=True)
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, 'is already marked as not meeting')
-
-        self.assertEqual(len(outbox),1)
-        self.assertTrue('Not having a session' in outbox[0]['Subject'])
-        self.assertTrue('session-request@' in outbox[0]['To'])
-
-class RetrievePreviousCase(TestCase):
-    pass
-
-    # test error if already scheduled
-    # test get previous exists/doesn't exist
-    # test that groups scheduled and unscheduled add up to total groups
-    # test access by unauthorized
-
-
-class SessionFormTest(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.meeting = MeetingFactory(type_id='ietf')
-        self.group1 = GroupFactory()
-        self.group2 = GroupFactory()
-        self.group3 = GroupFactory()
-        self.group4 = GroupFactory()
-        self.group5 = GroupFactory()
-        self.group6 = GroupFactory()
-
-        attendees = '10'
-        comments = 'need lights'
-        self.valid_form_data = {
-            'num_session': '2',
-            'third_session': 'true',
-            'attendees': attendees,
-            'constraint_chair_conflict': self.group2.acronym,
-            'constraint_tech_overlap': self.group3.acronym,
-            'constraint_key_participant': self.group4.acronym,
-            'comments': comments,
-            'session_time_relation': 'subsequent-days',
-            'adjacent_with_wg': self.group5.acronym,
-            'joint_with_groups': self.group6.acronym,
-            'joint_for_session': '3',
-            'timeranges': ['thursday-afternoon-early', 'thursday-afternoon-late'],
-            'submit': 'Continue',
-            'session_set-TOTAL_FORMS': '3',
-            'session_set-INITIAL_FORMS': '0',
-            'session_set-MIN_NUM_FORMS': '1',
-            'session_set-MAX_NUM_FORMS': '3',
-            # no 'session_set-0-id' for new session
-            'session_set-0-name': '',
-            'session_set-0-short': '',
-            'session_set-0-purpose': 'regular',
-            'session_set-0-type': 'regular',
-            'session_set-0-requested_duration': '3600',
-            'session_set-0-on_agenda': True,
-            'session_set-0-remote_instructions': '',
-            'session_set-0-attendees': attendees,
-            'session_set-0-comments': '',
-            'session_set-0-DELETE': '',
-            # no 'session_set-1-id' for new session
-            'session_set-1-name': '',
-            'session_set-1-short': '',
-            'session_set-1-purpose': 'regular',
-            'session_set-1-type': 'regular',
-            'session_set-1-requested_duration': '3600',
-            'session_set-1-on_agenda': True,
-            'session_set-1-remote_instructions': '',
-            'session_set-1-attendees': attendees,
-            'session_set-1-comments': '',
-            'session_set-1-DELETE': '',
-            # no 'session_set-2-id' for new session
-            'session_set-2-name': '',
-            'session_set-2-short': '',
-            'session_set-2-purpose': 'regular',
-            'session_set-2-type': 'regular',
-            'session_set-2-requested_duration': '3600',
-            'session_set-2-on_agenda': True,
-            'session_set-2-remote_instructions': '',
-            'session_set-2-attendees': attendees,
-            'session_set-2-comments': '',
-            'session_set-2-DELETE': '',
-        }
-        
-    def test_valid(self):
-        # Test with three sessions
-        form = SessionForm(data=self.valid_form_data, group=self.group1, meeting=self.meeting)
-        self.assertTrue(form.is_valid())
-        
-        # Test with two sessions
-        self.valid_form_data.update({
-            'third_session': '',
-            'session_set-TOTAL_FORMS': '2',
-            'joint_for_session': '2'
-        })
-        form = SessionForm(data=self.valid_form_data, group=self.group1, meeting=self.meeting)
-        self.assertTrue(form.is_valid())
-
-        # Test with one session
-        self.valid_form_data.update({
-            'num_session': 1,
-            'session_set-TOTAL_FORMS': '1',
-            'joint_for_session': '1',
-            'session_time_relation': '',
-        })
-        form = SessionForm(data=self.valid_form_data, group=self.group1, meeting=self.meeting)
-        self.assertTrue(form.is_valid())
-    
-    def test_invalid_groups(self):
-        new_form_data = {
-            'constraint_chair_conflict': 'doesnotexist',
-            'constraint_tech_overlap': 'doesnotexist',
-            'constraint_key_participant': 'doesnotexist',
-            'adjacent_with_wg': 'doesnotexist',
-            'joint_with_groups': 'doesnotexist',
-        }
-        form = self._invalid_test_helper(new_form_data)
-        self.assertEqual(set(form.errors.keys()), set(new_form_data.keys()))
-
-    def test_valid_group_appears_in_multiple_conflicts(self):
-        """Some conflict types allow overlapping groups"""
-        new_form_data = {
-            'constraint_chair_conflict': self.group2.acronym,
-            'constraint_tech_overlap': self.group2.acronym,
-        }
-        self.valid_form_data.update(new_form_data)
-        form = SessionForm(data=self.valid_form_data, group=self.group1, meeting=self.meeting)
-        self.assertTrue(form.is_valid())
-
-    def test_invalid_group_appears_in_multiple_conflicts(self):
-        """Some conflict types do not allow overlapping groups"""
-        self.meeting.group_conflict_types.clear()
-        self.meeting.group_conflict_types.add(ConstraintName.objects.get(slug='conflict'))
-        self.meeting.group_conflict_types.add(ConstraintName.objects.get(slug='conflic2'))
-        new_form_data = {
-            'constraint_conflict': self.group2.acronym,
-            'constraint_conflic2': self.group2.acronym,
-        }
-        form = self._invalid_test_helper(new_form_data)
-        self.assertEqual(form.non_field_errors(), ['%s appears in conflicts more than once' % self.group2.acronym])
-
-    def test_invalid_conflict_with_self(self):
-        new_form_data = {
-            'constraint_chair_conflict': self.group1.acronym,
-        }
-        self._invalid_test_helper(new_form_data)
-
-    def test_invalid_session_time_relation(self):
-        form = self._invalid_test_helper({
-            'third_session': '',
-            'session_set-TOTAL_FORMS': 1,
-            'num_session': 1,
-            'joint_for_session': '1',
-        })
-        self.assertEqual(form.errors,
-                         {
-                             'session_time_relation': ['Time between sessions can only be used when two '
-                                                       'sessions are requested.']
-                         })
-
-    def test_invalid_joint_for_session(self):
-        form = self._invalid_test_helper({
-            'third_session': '',
-            'session_set-TOTAL_FORMS': '2',
-            'num_session': 2,
-            'joint_for_session': '3',
-        })
-        self.assertEqual(form.errors,
-                         {
-                             'joint_for_session': [
-                                 'Session 3 can not be the joint session, the session has not been requested.']
-                         })
-
-        form = self._invalid_test_helper({
-            'third_session': '',
-            'session_set-TOTAL_FORMS': '1',
-            'num_session': 1,
-            'joint_for_session': '2',
-            'session_time_relation': '',
-        })
-        self.assertEqual(form.errors,
-                         {
-                             'joint_for_session': [
-                                 'Session 2 can not be the joint session, the session has not been requested.']
-                         })
-    
-    def test_invalid_missing_session_length(self):
-        form = self._invalid_test_helper({
-            'session_set-TOTAL_FORMS': '2',
-            'session_set-1-requested_duration': '',
-            'third_session': 'false',
-            'joint_for_session': None,
-        })
-        self.assertEqual(form.session_forms.errors,
-                         [
-                             {},
-                             {'requested_duration': ['This field is required.']},
-                         ])
-
-        form = self._invalid_test_helper({
-            'session_set-1-requested_duration': '',
-            'session_set-2-requested_duration': '',
-            'joint_for_session': None,
-        })
-        self.assertEqual(
-            form.session_forms.errors,
-            [
-                {},
-                {'requested_duration': ['This field is required.']},
-                {'requested_duration': ['This field is required.']},
-            ])
-
-        form = self._invalid_test_helper({
-            'session_set-2-requested_duration': '',
-            'joint_for_session': None,
-        })
-        self.assertEqual(form.session_forms.errors,
-                         [
-                             {},
-                             {},
-                             {'requested_duration': ['This field is required.']},
-                         ])
-
-    def _invalid_test_helper(self, new_form_data):
-        form_data = dict(self.valid_form_data, **new_form_data)
-        form = SessionForm(data=form_data, group=self.group1, meeting=self.meeting)
-        self.assertFalse(form.is_valid())
-        return form
diff --git a/ietf/secr/sreq/urls.py b/ietf/secr/sreq/urls.py
deleted file mode 100644
index 7e0db8117a..0000000000
--- a/ietf/secr/sreq/urls.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
-
-from django.conf import settings
-
-from ietf.secr.sreq import views
-from ietf.utils.urls import url
-
-urlpatterns = [
-    url(r'^$', views.main),
-    url(r'^status/$', views.tool_status),
-    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, views.view),
-    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/view/$' % settings.URL_REGEXPS, views.view),
-    url(r'^%(acronym)s/approve/$' % settings.URL_REGEXPS, views.approve),
-    url(r'^%(acronym)s/cancel/$' % settings.URL_REGEXPS, views.cancel),
-    url(r'^%(acronym)s/confirm/$' % settings.URL_REGEXPS, views.confirm),
-    url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, views.edit),
-    url(r'^%(acronym)s/new/$' % settings.URL_REGEXPS, views.new),
-    url(r'^%(acronym)s/no_session/$' % settings.URL_REGEXPS, views.no_session),
-    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/edit/$' % settings.URL_REGEXPS, views.edit),
-]
diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py
deleted file mode 100644
index fab408e03d..0000000000
--- a/ietf/secr/sreq/views.py
+++ /dev/null
@@ -1,852 +0,0 @@
-# Copyright The IETF Trust 2013-2022, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import datetime
-from collections import defaultdict, OrderedDict
-
-from django.conf import settings
-from django.contrib import messages
-from django.db.models import Q
-from django.shortcuts import render, get_object_or_404, redirect
-from django.http import Http404
-
-import debug                            # pyflakes:ignore
-
-from ietf.group.models import Group, GroupFeatures
-from ietf.ietfauth.utils import has_role, role_required
-from ietf.meeting.models import Meeting, Session, Constraint, ResourceAssociation, SchedulingEvent
-from ietf.meeting.helpers import get_meeting
-from ietf.meeting.utils import add_event_info_to_session_qs
-from ietf.name.models import SessionStatusName, ConstraintName
-from ietf.secr.sreq.forms import (SessionForm, ToolStatusForm, allowed_conflicting_groups,
-    JOINT_FOR_SESSION_CHOICES)
-from ietf.secr.utils.decorators import check_permissions
-from ietf.secr.utils.group import get_my_groups
-from ietf.utils.mail import send_mail
-from ietf.person.models import Person
-from ietf.mailtrigger.utils import gather_address_lists
-
-# -------------------------------------------------
-# Globals
-# -------------------------------------------------
-# TODO: This needs to be replaced with something that pays attention to groupfeatures
-AUTHORIZED_ROLES=('WG Chair','WG Secretary','RG Chair','IAB Group Chair','Area Director','Secretariat','Team Chair','IRTF Chair','Program Chair','Program Lead','Program Secretary')
-
-# -------------------------------------------------
-# Helper Functions
-# -------------------------------------------------
-
-def check_app_locked(meeting=None):
-    '''
-    This function returns True if the application is locked to non-secretariat users.
-    '''
-    if not meeting:
-        meeting = get_meeting(days=14)
-    return bool(meeting.session_request_lock_message)
-
-def get_initial_session(sessions, prune_conflicts=False):
-    '''
-    This function takes a queryset of sessions ordered by 'id' for consistency.  It returns
-    a dictionary to be used as the initial for a legacy session form
-    '''
-    initial = {}
-    if len(sessions) == 0:
-        return initial
-
-    meeting = sessions[0].meeting
-    group = sessions[0].group
-
-    constraints = group.constraint_source_set.filter(meeting=meeting)  # all constraints with this group as source
-    conflicts = constraints.filter(name__is_group_conflict=True)  # only the group conflict constraints
-
-    if group.features.acts_like_wg:
-        # even if there are three sessions requested, the old form has 2 in this field
-        initial['num_session'] = min(sessions.count(), 2)
-        initial['third_session'] = sessions.count() > 2
-    else:
-        initial['num_session'] = sessions.count()
-        initial['third_session'] = False
-    initial['attendees'] = sessions[0].attendees
-
-    def valid_conflict(conflict):
-        return conflict.target != sessions[0].group and allowed_conflicting_groups().filter(pk=conflict.target_id).exists()
-    if prune_conflicts:
-        conflicts = [c for c in conflicts if valid_conflict(c)]
-
-    conflict_name_ids = set(c.name_id for c in conflicts)
-    for name_id in conflict_name_ids:
-        target_acros = [c.target.acronym for c in conflicts if c.name_id == name_id]
-        initial['constraint_{}'.format(name_id)] = ' '.join(target_acros)
-
-    initial['comments'] = sessions[0].comments
-    initial['resources'] = sessions[0].resources.all()
-    initial['bethere'] = [x.person for x in sessions[0].constraints().filter(name='bethere').select_related("person")]
-    wg_adjacent = constraints.filter(name__slug='wg_adjacent')
-    initial['adjacent_with_wg'] = wg_adjacent[0].target.acronym if wg_adjacent else None
-    time_relation = constraints.filter(name__slug='time_relation')
-    initial['session_time_relation'] = time_relation[0].time_relation if time_relation else None
-    initial['session_time_relation_display'] = time_relation[0].get_time_relation_display if time_relation else None
-    timeranges = constraints.filter(name__slug='timerange')
-    initial['timeranges'] = timeranges[0].timeranges.all() if timeranges else []
-    initial['timeranges_display'] = [t.desc for t in initial['timeranges']]
-    for idx, session in enumerate(sessions):
-        if session.joint_with_groups.count():
-            initial['joint_with_groups'] = ' '.join(session.joint_with_groups_acronyms())
-            initial['joint_for_session'] = str(idx + 1)
-            initial['joint_for_session_display'] = dict(JOINT_FOR_SESSION_CHOICES)[initial['joint_for_session']]
-    return initial
-
-def get_lock_message(meeting=None):
-    '''
-    Returns the message to display to non-secretariat users when the tool is locked.
-    '''
-    if not meeting:
-        meeting = get_meeting(days=14)
-    return meeting.session_request_lock_message
-
-def get_requester_text(person,group):
-    '''
-    This function takes a Person object and a Group object and returns the text to use in the
-    session request notification email, ie. Joe Smith, a Chair of the ancp working group
-    '''
-    roles = group.role_set.filter(name__in=('chair','secr'),person=person)
-    if roles:
-        return '%s, a %s of the %s working group' % (person.ascii, roles[0].name, group.acronym)
-    if group.parent and group.parent.role_set.filter(name='ad',person=person):
-        return '%s, a %s Area Director' % (person.ascii, group.parent.acronym.upper())
-    if person.role_set.filter(name='secr',group__acronym='secretariat'):
-        return '%s, on behalf of the %s working group' % (person.ascii, group.acronym)
-
-def save_conflicts(group, meeting, conflicts, name):
-    '''
-    This function takes a Group, Meeting a string which is a list of Groups acronyms (conflicts),
-    and the constraint name (conflict|conflic2|conflic3) and creates Constraint records
-    '''
-    constraint_name = ConstraintName.objects.get(slug=name)
-    acronyms = conflicts.replace(',',' ').split()
-    for acronym in acronyms:
-        target = Group.objects.get(acronym=acronym)
-
-        constraint = Constraint(source=group,
-                                target=target,
-                                meeting=meeting,
-                                name=constraint_name)
-        constraint.save()
-
-def send_notification(group, meeting, login, sreq_data, session_data, action):
-    '''
-    This function generates email notifications for various session request activities.
-    sreq_data argument is a dictionary of fields from the session request form
-    session_data is an array of data from individual session subforms
-    action argument is a string [new|update].
-    '''
-    (to_email, cc_list) = gather_address_lists('session_requested',group=group,person=login)
-    from_email = (settings.SESSION_REQUEST_FROM_EMAIL)
-    subject = '%s - New Meeting Session Request for IETF %s' % (group.acronym, meeting.number)
-    template = 'sreq/session_request_notification.txt'
-
-    # send email
-    context = {}
-    context['session'] = sreq_data
-    context['group'] = group
-    context['meeting'] = meeting
-    context['login'] = login
-    context['header'] = 'A new'
-    context['requester'] = get_requester_text(login,group)
-
-    # update overrides
-    if action == 'update':
-        subject = '%s - Update to a Meeting Session Request for IETF %s' % (group.acronym, meeting.number)
-        context['header'] = 'An update to a'
-
-    # if third session requested approval is required
-    # change headers TO=ADs, CC=session-request, submitter and cochairs
-    if len(session_data) > 2:
-        (to_email, cc_list) = gather_address_lists('session_requested_long',group=group,person=login)
-        subject = '%s - Request for meeting session approval for IETF %s' % (group.acronym, meeting.number)
-        template = 'sreq/session_approval_notification.txt'
-        #status_text = 'the %s Directors for approval' % group.parent
-
-    context['session_lengths'] = [sd['requested_duration'] for sd in session_data]
-
-    send_mail(None,
-              to_email,
-              from_email,
-              subject,
-              template,
-              context,
-              cc=cc_list)
-
-def inbound_session_conflicts_as_string(group, meeting):
-    '''
-    Takes a Group object and Meeting object and returns a string of other groups which have
-    a conflict with this one
-    '''
-    constraints = group.constraint_target_set.filter(meeting=meeting, name__is_group_conflict=True)
-    group_set = set(constraints.values_list('source__acronym', flat=True))  # set to de-dupe
-    group_list = sorted(group_set)  # give a consistent order
-    return ', '.join(group_list)
-
-# -------------------------------------------------
-# View Functions
-# -------------------------------------------------
-@check_permissions
-def approve(request, acronym):
-    '''
-    This view approves the third session.  For use by ADs or Secretariat.
-    '''
-    meeting = get_meeting(days=14)
-    group = get_object_or_404(Group, acronym=acronym)
-
-    session = add_event_info_to_session_qs(Session.objects.filter(meeting=meeting, group=group)).filter(current_status='apprw').first()
-    if session is None:
-        raise Http404
-
-    if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.person):
-        SchedulingEvent.objects.create(
-            session=session,
-            status=SessionStatusName.objects.get(slug='appr'),
-            by=request.user.person,
-        )
-        session_changed(session)
-
-        messages.success(request, 'Third session approved')
-        return redirect('ietf.secr.sreq.views.view', acronym=acronym)
-    else:
-        # if an unauthorized user gets here return error
-        messages.error(request, 'Not authorized to approve the third session')
-        return redirect('ietf.secr.sreq.views.view', acronym=acronym)
-
-@check_permissions
-def cancel(request, acronym):
-    '''
-    This view cancels a session request and sends a notification.
-    To cancel, or withdraw the request set status = deleted.
-    "canceled" status is used by the secretariat.
-
-    NOTE: this function can also be called after a session has been
-    scheduled during the period when the session request tool is
-    reopened.  In this case be sure to clear the timeslot assignment as well.
-    '''
-    meeting = get_meeting(days=14)
-    group = get_object_or_404(Group, acronym=acronym)
-    sessions = Session.objects.filter(meeting=meeting,group=group).order_by('id')
-    login = request.user.person
-
-    # delete conflicts
-    Constraint.objects.filter(meeting=meeting,source=group).delete()
-
-    # mark sessions as deleted
-    for session in sessions:
-        SchedulingEvent.objects.create(
-            session=session,
-            status=SessionStatusName.objects.get(slug='deleted'),
-            by=request.user.person,
-        )
-        session_changed(session)
-
-        # clear schedule assignments if already scheduled
-        session.timeslotassignments.all().delete()
-
-    # send notifitcation
-    (to_email, cc_list) = gather_address_lists('session_request_cancelled',group=group,person=login)
-    from_email = (settings.SESSION_REQUEST_FROM_EMAIL)
-    subject = '%s - Cancelling a meeting request for IETF %s' % (group.acronym, meeting.number)
-    send_mail(request, to_email, from_email, subject, 'sreq/session_cancel_notification.txt',
-              {'requester':get_requester_text(login,group),
-               'meeting':meeting}, cc=cc_list)
-
-    messages.success(request, 'The %s Session Request has been cancelled' % group.acronym)
-    return redirect('ietf.secr.sreq.views.main')
-
-
-def status_slug_for_new_session(session, session_number):
-    if session.group.features.acts_like_wg and session_number == 2:
-        return 'apprw'
-    return 'schedw'
-
-
-@role_required(*AUTHORIZED_ROLES)
-def confirm(request, acronym):
-    '''
-    This view displays details of the new session that has been requested for the user
-    to confirm for submission.
-    '''
-    # FIXME: this should be using form.is_valid/form.cleaned_data - invalid input will make it crash
-    group = get_object_or_404(Group,acronym=acronym)
-    if len(group.features.session_purposes) == 0:
-        raise Http404(f'Cannot request sessions for group "{acronym}"')
-    meeting = get_meeting(days=14)
-    form = SessionForm(group, meeting, request.POST, hidden=True)
-    form.is_valid()
-
-    login = request.user.person
-
-    # check if request already exists for this group
-    if add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(Q(current_status__isnull=True) | ~Q(current_status__in=['deleted', 'notmeet'])):
-        messages.warning(request, 'Sessions for working group %s have already been requested once.' % group.acronym)
-        return redirect('ietf.secr.sreq.views.main')
-                
-    session_data = form.data.copy()
-    # use cleaned_data for the 'bethere' field so we get the Person instances
-    session_data['bethere'] = form.cleaned_data['bethere'] if 'bethere' in form.cleaned_data else []
-    if session_data.get('session_time_relation'):
-        session_data['session_time_relation_display'] = dict(Constraint.TIME_RELATION_CHOICES)[session_data['session_time_relation']]
-    if session_data.get('joint_for_session'):
-        session_data['joint_for_session_display'] = dict(JOINT_FOR_SESSION_CHOICES)[session_data['joint_for_session']]
-    if form.cleaned_data.get('timeranges'):
-        session_data['timeranges_display'] = [t.desc for t in form.cleaned_data['timeranges']]
-    session_data['resources'] = [ ResourceAssociation.objects.get(pk=pk) for pk in request.POST.getlist('resources') ]
-
-    # extract wg conflict constraint data for the view
-    outbound_conflicts = []
-    for conflictname, cfield_id in form.wg_constraint_field_ids():
-        conflict_groups = form.cleaned_data[cfield_id]
-        if len(conflict_groups) > 0:
-            outbound_conflicts.append(dict(name=conflictname, groups=conflict_groups))
-
-    button_text = request.POST.get('submit', '')
-    if button_text == 'Cancel':
-        messages.success(request, 'Session Request has been cancelled')
-        return redirect('ietf.secr.sreq.views.main')
-
-    if request.method == 'POST' and button_text == 'Submit':
-        # delete any existing session records with status = canceled or notmeet
-        add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(current_status__in=['canceled', 'notmeet']).delete()
-        num_sessions = int(form.cleaned_data['num_session']) + (1 if form.cleaned_data['third_session'] else 0)
-        # Create new session records
-        form.session_forms.save()
-        for count, sess_form in enumerate(form.session_forms[:num_sessions]):
-            new_session = sess_form.instance
-            SchedulingEvent.objects.create(
-                session=new_session,
-                status=SessionStatusName.objects.get(slug=status_slug_for_new_session(new_session, count)),
-                by=login,
-            )
-            if 'resources' in form.data:
-                new_session.resources.set(session_data['resources'])
-            jfs = form.data.get('joint_for_session', '-1')
-            if not jfs: # jfs might be ''
-                jfs = '-1'
-            if int(jfs) == count + 1:  # count is zero-indexed
-                groups_split = form.cleaned_data.get('joint_with_groups').replace(',',' ').split()
-                joint = Group.objects.filter(acronym__in=groups_split)
-                new_session.joint_with_groups.set(joint)
-            new_session.save()
-            session_changed(new_session)
-
-        # write constraint records
-        for conflictname, cfield_id in form.wg_constraint_field_ids():
-            save_conflicts(group, meeting, form.data.get(cfield_id, ''), conflictname.slug)
-        save_conflicts(group, meeting, form.data.get('adjacent_with_wg', ''), 'wg_adjacent')
-
-        if form.cleaned_data.get('session_time_relation'):
-            cn = ConstraintName.objects.get(slug='time_relation')
-            Constraint.objects.create(source=group, meeting=meeting, name=cn,
-                                      time_relation=form.cleaned_data['session_time_relation'])
-
-        if form.cleaned_data.get('timeranges'):
-            cn = ConstraintName.objects.get(slug='timerange')
-            constraint = Constraint.objects.create(source=group, meeting=meeting, name=cn)
-            constraint.timeranges.set(form.cleaned_data['timeranges'])
-
-        if 'bethere' in form.data:
-            bethere_cn = ConstraintName.objects.get(slug='bethere')
-            for p in session_data['bethere']:
-                Constraint.objects.create(name=bethere_cn, source=group, person=p, meeting=new_session.meeting)
-
-        # clear not meeting
-        add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(current_status='notmeet').delete()
-
-        # send notification
-        session_data['outbound_conflicts'] = [f"{d['name']}: {d['groups']}" for d in outbound_conflicts]
-        send_notification(
-            group,
-            meeting,
-            login,
-            session_data,
-            [sf.cleaned_data for sf in form.session_forms[:num_sessions]],
-            'new',
-        )
-
-        status_text = 'IETF Agenda to be scheduled'
-        messages.success(request, 'Your request has been sent to %s' % status_text)
-        return redirect('ietf.secr.sreq.views.main')
-
-    # POST from request submission
-    session_conflicts = dict(
-        outbound=outbound_conflicts,  # each is a dict with name and groups as keys
-        inbound=inbound_session_conflicts_as_string(group, meeting),
-    )
-
-    return render(request, 'sreq/confirm.html', {
-        'form': form,
-        'session': session_data,
-        'group': group,
-        'session_conflicts': session_conflicts},
-    )
-
-#Move this into make_initial
-def add_essential_people(group,initial):
-    # This will be easier when the form uses Person instead of Email
-    people = set()
-    if 'bethere' in initial:
-        people.update(initial['bethere'])
-    people.update(Person.objects.filter(role__group=group, role__name__in=['chair','ad']))
-    initial['bethere'] = list(people)
-    
-
-def session_changed(session):
-    latest_event = SchedulingEvent.objects.filter(session=session).order_by('-time', '-id').first()
-
-    if latest_event and latest_event.status_id == "schedw" and session.meeting.schedule != None:
-        # send an email to iesg-secretariat to alert to change
-        pass
-
-@check_permissions
-def edit(request, acronym, num=None):
-    '''
-    This view allows the user to edit details of the session request
-    '''
-    meeting = get_meeting(num,days=14)
-    group = get_object_or_404(Group, acronym=acronym)
-    if len(group.features.session_purposes) == 0:
-        raise Http404(f'Cannot request sessions for group "{acronym}"')
-    sessions = add_event_info_to_session_qs(
-        Session.objects.filter(group=group, meeting=meeting)
-    ).filter(
-        Q(current_status__isnull=True) | ~Q(current_status__in=['canceled', 'notmeet', 'deleted'])
-    ).order_by('id')
-    initial = get_initial_session(sessions)
-
-    if 'resources' in initial:
-        initial['resources'] = [x.pk for x in initial['resources']]
-
-    # check if app is locked
-    is_locked = check_app_locked(meeting=meeting)
-    if is_locked:
-        messages.warning(request, "The Session Request Tool is closed")
-
-    # Only need the inbound conflicts here, the form itself renders the outbound
-    session_conflicts = dict(
-        inbound=inbound_session_conflicts_as_string(group, meeting),
-    )
-    login = request.user.person
-
-    first_session = Session()
-    if(len(sessions) > 0):
-        first_session = sessions[0]
-
-    if request.method == 'POST':
-        button_text = request.POST.get('submit', '')
-        if button_text == 'Cancel':
-            return redirect('ietf.secr.sreq.views.view', acronym=acronym)
-
-        form = SessionForm(group, meeting, request.POST, initial=initial)
-        if form.is_valid():
-            if form.has_changed():
-                changed_session_forms = [sf for sf in form.session_forms.forms_to_keep if sf.has_changed()]
-                form.session_forms.save()
-                for n, subform in enumerate(form.session_forms):
-                    if subform.instance in form.session_forms.new_objects:
-                        SchedulingEvent.objects.create(
-                            session=subform.instance,
-                            status_id=status_slug_for_new_session(subform.instance, n),
-                            by=request.user.person,
-                        )
-                for sf in changed_session_forms:
-                    session_changed(sf.instance)
-
-                # New sessions may have been created, refresh the sessions list
-                sessions = add_event_info_to_session_qs(
-                    Session.objects.filter(group=group, meeting=meeting)).filter(
-                    Q(current_status__isnull=True) | ~Q(
-                        current_status__in=['canceled', 'notmeet'])).order_by('id')
-
-                if 'joint_with_groups' in form.changed_data or 'joint_for_session' in form.changed_data:
-                    joint_with_groups_list = form.cleaned_data.get('joint_with_groups').replace(',', ' ').split()
-                    new_joint_with_groups = Group.objects.filter(acronym__in=joint_with_groups_list)
-                    new_joint_for_session_idx = int(form.data.get('joint_for_session', '-1')) - 1
-                    current_joint_for_session_idx = None
-                    current_joint_with_groups = None
-                    for idx, sess in enumerate(sessions):
-                        if sess.joint_with_groups.count():
-                            current_joint_for_session_idx = idx
-                            current_joint_with_groups = sess.joint_with_groups.all()
-
-                    if current_joint_with_groups != new_joint_with_groups or current_joint_for_session_idx != new_joint_for_session_idx:
-                        if current_joint_for_session_idx is not None:
-                            sessions[current_joint_for_session_idx].joint_with_groups.clear()
-                            session_changed(sessions[current_joint_for_session_idx])
-                        sessions[new_joint_for_session_idx].joint_with_groups.set(new_joint_with_groups)
-                        session_changed(sessions[new_joint_for_session_idx])
-
-                # Update sessions to match changes to shared form fields
-                if 'attendees' in form.changed_data:
-                    sessions.update(attendees=form.cleaned_data['attendees'])
-                if 'comments' in form.changed_data:
-                    sessions.update(comments=form.cleaned_data['comments'])
-
-                # Handle constraints
-                for cname, cfield_id in form.wg_constraint_field_ids():
-                    if cfield_id in form.changed_data:
-                        Constraint.objects.filter(meeting=meeting, source=group, name=cname.slug).delete()
-                        save_conflicts(group, meeting, form.cleaned_data[cfield_id], cname.slug)
-
-                # see if any inactive constraints should be deleted
-                for cname, field_id in form.inactive_wg_constraint_field_ids():
-                    if form.cleaned_data[field_id]:
-                        Constraint.objects.filter(meeting=meeting, source=group, name=cname.slug).delete()
-
-                if 'adjacent_with_wg' in form.changed_data:
-                    Constraint.objects.filter(meeting=meeting, source=group, name='wg_adjacent').delete()
-                    save_conflicts(group, meeting, form.cleaned_data['adjacent_with_wg'], 'wg_adjacent')
-
-                if 'resources' in form.changed_data:
-                    new_resource_ids = form.cleaned_data['resources']
-                    new_resources = [ ResourceAssociation.objects.get(pk=a)
-                                      for a in new_resource_ids]
-                    first_session.resources = new_resources
-
-                if 'bethere' in form.changed_data and set(form.cleaned_data['bethere'])!=set(initial['bethere']):
-                    first_session.constraints().filter(name='bethere').delete()
-                    bethere_cn = ConstraintName.objects.get(slug='bethere')
-                    for p in form.cleaned_data['bethere']:
-                        Constraint.objects.create(name=bethere_cn, source=group, person=p, meeting=first_session.meeting)
-
-                if 'session_time_relation' in form.changed_data:
-                    Constraint.objects.filter(meeting=meeting, source=group, name='time_relation').delete()
-                    if form.cleaned_data['session_time_relation']:
-                        cn = ConstraintName.objects.get(slug='time_relation')
-                        Constraint.objects.create(source=group, meeting=meeting, name=cn,
-                                                  time_relation=form.cleaned_data['session_time_relation'])
-
-                if 'timeranges' in form.changed_data:
-                    Constraint.objects.filter(meeting=meeting, source=group, name='timerange').delete()
-                    if form.cleaned_data['timeranges']:
-                        cn = ConstraintName.objects.get(slug='timerange')
-                        constraint = Constraint.objects.create(source=group, meeting=meeting, name=cn)
-                        constraint.timeranges.set(form.cleaned_data['timeranges'])
-
-                # deprecated
-                # log activity
-                #add_session_activity(group,'Session Request was updated',meeting,user)
-
-                # send notification
-                send_notification(
-                    group,
-                    meeting,
-                    login,
-                    form.cleaned_data,
-                    [sf.cleaned_data for sf in form.session_forms.forms_to_keep],
-                    'update',
-                )
-
-            messages.success(request, 'Session Request updated')
-            return redirect('ietf.secr.sreq.views.view', acronym=acronym)
-
-    else:  # method is not POST
-        # gather outbound conflicts for initial value
-        outbound_constraints = defaultdict(list)
-        for obc in group.constraint_source_set.filter(meeting=meeting, name__is_group_conflict=True):
-            outbound_constraints[obc.name.slug].append(obc.target.acronym)
-        for slug, groups in outbound_constraints.items():
-            initial['constraint_{}'.format(slug)] = ' '.join(groups)
-
-        if not sessions:
-            return redirect('ietf.secr.sreq.views.new', acronym=acronym)
-        form = SessionForm(group, meeting, initial=initial)
-
-    return render(request, 'sreq/edit.html', {
-        'is_locked': is_locked and not has_role(request.user,'Secretariat'),
-        'meeting': meeting,
-        'form': form,
-        'group': group,
-        'session_conflicts': session_conflicts},
-    )
-
-@role_required(*AUTHORIZED_ROLES)
-def main(request):
-    '''
-    Display list of groups the user has access to.
-
-    Template variables
-    form: a select box populated with unscheduled groups
-    meeting: the current meeting
-    scheduled_sessions:
-    '''
-    # check for locked flag
-    is_locked = check_app_locked()
-
-    if is_locked and not has_role(request.user,'Secretariat'):
-        message = get_lock_message()
-        return render(request, 'sreq/locked.html', {
-        'message': message},
-    )
-
-    meeting = get_meeting(days=14)
-
-    scheduled_groups = []
-    unscheduled_groups = []
-
-    group_types = GroupFeatures.objects.filter(has_meetings=True).values_list('type', flat=True)
-
-    my_groups = [g for g in get_my_groups(request.user, conclude=True) if g.type_id in group_types]
-
-    sessions_by_group = defaultdict(list)
-    for s in add_event_info_to_session_qs(Session.objects.filter(meeting=meeting, group__in=my_groups)).filter(current_status__in=['schedw', 'apprw', 'appr', 'sched']):
-        sessions_by_group[s.group_id].append(s)
-
-    for group in my_groups:
-        group.meeting_sessions = sessions_by_group.get(group.pk, [])
-
-        if group.pk in sessions_by_group:
-            # include even if concluded as we need to to see that the
-            # sessions are there
-            scheduled_groups.append(group)
-        else:
-            if group.state_id not in ['conclude', 'bof-conc']:
-                # too late for unscheduled if concluded
-                unscheduled_groups.append(group)
-
-    # warn if there are no associated groups
-    if not scheduled_groups and not unscheduled_groups:
-        messages.warning(request, 'The account %s is not associated with any groups.  If you have multiple Datatracker accounts you may try another or report a problem to %s' % (request.user, settings.SECRETARIAT_ACTION_EMAIL))
-     
-    # add session status messages for use in template
-    for group in scheduled_groups:
-        if not group.features.acts_like_wg or (len(group.meeting_sessions) < 3):
-            group.status_message = group.meeting_sessions[0].current_status
-        else:
-            group.status_message = 'First two sessions: %s, Third session: %s' % (group.meeting_sessions[0].current_status, group.meeting_sessions[2].current_status)
-
-    # add not meeting indicators for use in template
-    for group in unscheduled_groups:
-        if any(s.current_status == 'notmeet' for s in group.meeting_sessions):
-            group.not_meeting = True
-
-    return render(request, 'sreq/main.html', {
-        'is_locked': is_locked,
-        'meeting': meeting,
-        'scheduled_groups': scheduled_groups,
-        'unscheduled_groups': unscheduled_groups},
-    )
-
-@check_permissions
-def new(request, acronym):
-    '''
-    This view gathers details for a new session request.  The user proceeds to confirm()
-    to create the request.
-    '''
-    group = get_object_or_404(Group, acronym=acronym)
-    if len(group.features.session_purposes) == 0:
-        raise Http404(f'Cannot request sessions for group "{acronym}"')
-    meeting = get_meeting(days=14)
-    session_conflicts = dict(inbound=inbound_session_conflicts_as_string(group, meeting))
-
-    # check if app is locked
-    is_locked = check_app_locked()
-    if is_locked and not has_role(request.user,'Secretariat'):
-        messages.warning(request, "The Session Request Tool is closed")
-        return redirect('ietf.secr.sreq.views.main')
-    
-    if request.method == 'POST':
-        button_text = request.POST.get('submit', '')
-        if button_text == 'Cancel':
-            return redirect('ietf.secr.sreq.views.main')
-
-        form = SessionForm(group, meeting, request.POST)
-        if form.is_valid():
-            return confirm(request, acronym)
-
-    # the "previous" querystring causes the form to be returned
-    # pre-populated with data from last meeeting's session request
-    elif request.method == 'GET' and 'previous' in request.GET:
-        latest_session = add_event_info_to_session_qs(Session.objects.filter(meeting__type_id='ietf', group=group)).exclude(current_status__in=['notmeet', 'deleted', 'canceled',]).order_by('-meeting__date').first()
-        if latest_session:
-            previous_meeting = Meeting.objects.get(number=latest_session.meeting.number)
-            previous_sessions = add_event_info_to_session_qs(Session.objects.filter(meeting=previous_meeting, group=group)).exclude(current_status__in=['notmeet', 'deleted']).order_by('id')
-            if not previous_sessions:
-                messages.warning(request, 'This group did not meet at %s' % previous_meeting)
-                return redirect('ietf.secr.sreq.views.new', acronym=acronym)
-            else:
-                messages.info(request, 'Fetched session info from %s' % previous_meeting)
-        else:
-            messages.warning(request, 'Did not find any previous meeting')
-            return redirect('ietf.secr.sreq.views.new', acronym=acronym)
-
-        initial = get_initial_session(previous_sessions, prune_conflicts=True)
-        add_essential_people(group,initial)
-        if 'resources' in initial:
-            initial['resources'] = [x.pk for x in initial['resources']]
-        form = SessionForm(group, meeting, initial=initial)
-
-    else:
-        initial={}
-        add_essential_people(group,initial)
-        form = SessionForm(group, meeting, initial=initial)
-
-    return render(request, 'sreq/new.html', {
-        'meeting': meeting,
-        'form': form,
-        'group': group,
-        'session_conflicts': session_conflicts},
-    )
-
-@check_permissions
-def no_session(request, acronym):
-    '''
-    The user has indicated that the named group will not be having a session this IETF meeting.
-    Actions:
-    - send notification
-    - update session_activity log
-    '''
-    meeting = get_meeting(days=14)
-    group = get_object_or_404(Group, acronym=acronym)
-    login = request.user.person
-
-    # delete canceled record if there is one
-    add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(current_status='canceled').delete()
-
-    # skip if state is already notmeet
-    if add_event_info_to_session_qs(Session.objects.filter(group=group, meeting=meeting)).filter(current_status='notmeet'):
-        messages.info(request, 'The group %s is already marked as not meeting' % group.acronym)
-        return redirect('ietf.secr.sreq.views.main')
-
-    session = Session.objects.create(
-        group=group,
-        meeting=meeting,
-        requested_duration=datetime.timedelta(0),
-        type_id='regular',
-        purpose_id='regular',
-    )
-    SchedulingEvent.objects.create(
-        session=session,
-        status=SessionStatusName.objects.get(slug='notmeet'),
-        by=login,
-    )
-    session_changed(session)
-
-    # send notification
-    (to_email, cc_list) = gather_address_lists('session_request_not_meeting',group=group,person=login)
-    from_email = (settings.SESSION_REQUEST_FROM_EMAIL)
-    subject = '%s - Not having a session at IETF %s' % (group.acronym, meeting.number)
-    send_mail(request, to_email, from_email, subject, 'sreq/not_meeting_notification.txt',
-              {'login':login,
-               'group':group,
-               'meeting':meeting}, cc=cc_list)
-
-    # deprecated?
-    # log activity
-    #text = 'A message was sent to notify not having a session at IETF %d' % meeting.meeting_num
-    #add_session_activity(group,text,meeting,request.person)
-
-    # redirect
-    messages.success(request, 'A message was sent to notify not having a session at IETF %s' % meeting.number)
-    return redirect('ietf.secr.sreq.views.main')
-
-@role_required('Secretariat')
-def tool_status(request):
-    '''
-    This view handles locking and unlocking of the tool to the public.
-    '''
-    meeting = get_meeting(days=14)
-    is_locked = check_app_locked(meeting=meeting)
-    
-    if request.method == 'POST':
-        button_text = request.POST.get('submit', '')
-        if button_text == 'Back':
-            return redirect('ietf.secr.sreq.views.main')
-
-        form = ToolStatusForm(request.POST)
-
-        if button_text == 'Lock':
-            if form.is_valid():
-                meeting.session_request_lock_message = form.cleaned_data['message']
-                meeting.save()
-                messages.success(request, 'Session Request Tool is now Locked')
-                return redirect('ietf.secr.sreq.views.main')
-
-        elif button_text == 'Unlock':
-            meeting.session_request_lock_message = ''
-            meeting.save()
-            messages.success(request, 'Session Request Tool is now Unlocked')
-            return redirect('ietf.secr.sreq.views.main')
-
-    else:
-        if is_locked:
-            message = get_lock_message()
-            initial = {'message': message}
-            form = ToolStatusForm(initial=initial)
-        else:
-            form = ToolStatusForm()
-
-    return render(request, 'sreq/tool_status.html', {
-        'is_locked': is_locked,
-        'form': form},
-    )
-
-@role_required(*AUTHORIZED_ROLES)
-def view(request, acronym, num = None):
-    '''
-    This view displays the session request info
-    '''
-    meeting = get_meeting(num,days=14)
-    group = get_object_or_404(Group, acronym=acronym)
-    sessions = add_event_info_to_session_qs(Session.objects.filter(meeting=meeting, group=group)).filter(Q(current_status__isnull=True) | ~Q(current_status__in=('canceled','notmeet','deleted'))).order_by('id')
-
-    # check if app is locked
-    is_locked = check_app_locked()
-    if is_locked:
-        messages.warning(request, "The Session Request Tool is closed")
-
-    # if there are no session requests yet, redirect to new session request page
-    if not sessions:
-        if is_locked:
-            return redirect('ietf.secr.sreq.views.main')
-        else:
-            return redirect('ietf.secr.sreq.views.new', acronym=acronym)
-
-    activities = [{
-        'act_date': e.time.strftime('%b %d, %Y'),
-        'act_time': e.time.strftime('%H:%M:%S'),
-        'activity': e.status.name,
-        'act_by': e.by,
-    } for e in sessions[0].schedulingevent_set.select_related('status', 'by')]
-
-    # gather outbound conflicts
-    outbound_dict = OrderedDict()
-    for obc in group.constraint_source_set.filter(meeting=meeting, name__is_group_conflict=True):
-        if obc.name.slug not in outbound_dict:
-            outbound_dict[obc.name.slug] = []
-        outbound_dict[obc.name.slug].append(obc.target.acronym)
-
-    session_conflicts = dict(
-        inbound=inbound_session_conflicts_as_string(group, meeting),
-        outbound=[dict(name=ConstraintName.objects.get(slug=slug), groups=' '.join(groups))
-                  for slug, groups in outbound_dict.items()],
-    )
-
-    show_approve_button = False
-
-    # if sessions include a 3rd session waiting approval and the user is a secretariat or AD of the group
-    # display approve button
-    if any(s.current_status == 'apprw' for s in sessions):
-        if has_role(request.user,'Secretariat') or group.parent.role_set.filter(name='ad',person=request.user.person):
-            show_approve_button = True
-
-    # build session dictionary (like querydict from new session request form) for use in template
-    session = get_initial_session(sessions)
-
-    return render(request, 'sreq/view.html', {
-        'is_locked': is_locked,
-        'session': session,  # legacy processed data
-        'sessions': sessions,  # actual session instances
-        'activities': activities,
-        'meeting': meeting,
-        'group': group,
-        'session_conflicts': session_conflicts,
-        'show_approve_button': show_approve_button},
-    )
-
diff --git a/ietf/secr/static/css/custom.css b/ietf/secr/static/css/custom.css
index 8816b3f13d..8a622cba5d 100644
--- a/ietf/secr/static/css/custom.css
+++ b/ietf/secr/static/css/custom.css
@@ -319,11 +319,6 @@ input.draft-file-input {
     width: 4em;
 }
 
-.draft-container #id_internal_comments {
-    height: 4em;
-    width: 40em;
-}
-
 .draft-container #id_abstract {
     height: 15em;
     width: 40em;
@@ -842,4 +837,4 @@ td, th, li, h2 {
 
 thead th {
     font-size: 12px;
-}
\ No newline at end of file
+}
diff --git a/ietf/secr/static/js/dynamic_inlines.js b/ietf/secr/static/js/dynamic_inlines.js
index a1abc2d0e5..d0753a3a63 100644
--- a/ietf/secr/static/js/dynamic_inlines.js
+++ b/ietf/secr/static/js/dynamic_inlines.js
@@ -1,71 +1,71 @@
-/* Following functions based off code written by Arne Brodowski
-http://www.arnebrodowski.de/blog/507-Add-and-remove-Django-Admin-Inlines-with-JavaScript.html
-
-2012-02-01 customized for new Rolodex.  Email formset doesn't have an id field, rather a "address"
-field as primary key.  Also for some reason the "active" boolean field doesn't get saved properly
-if the checkbox input has an empty "value" argument.
-*/
-import $ from 'jquery';
-
-function increment_form_ids(el, to, name) {
-    var from = to-1
-    $(':input', $(el)).each(function(i,e){
-        var old_name = $(e).attr('name')
-        var old_id = $(e).attr('id')
-        $(e).attr('name', old_name.replace(from, to))
-        $(e).attr('id', old_id.replace(from, to))
-        if ($(e).attr('type') != 'checkbox') {
-           $(e).val('')
-        }
-    })
-}
-
-function add_inline_form(name) {
-    if (name=="email") {
-        var first = $('#id_'+name+'-0-address').parents('.inline-related')
-    }
-    else {
-        var first = $('#id_'+name+'-0-id').parents('.inline-related')
-    }
-    // check to see if this is a stacked or tabular inline
-    if (first.hasClass("tabular")) {
-        var field_table = first.parent().find('table > tbody')
-        const children = field_table.children('tr.dynamic-inline')
-        var count = children.length
-        const last = $(children[count-1])
-        var copy = last.clone(true)
-        copy.removeClass("row1 row2")
-        copy.find("input[name$='address']").attr("readonly", false)
-        copy.addClass("row"+((count % 2) ? 2 : 1))
-        copy.insertAfter(last)
-        increment_form_ids($(copy), count, name)
-    }
-    else {
-        var last = $(first).parent().children('.last-related')
-        var copy = $(last).clone(true)
-        var count = $(first).parent().children('.inline-related').length
-        $(last).removeClass('last-related')
-        var header = $('h3', copy)
-        header.html(header.html().replace("#"+count, "#"+(count+1)))
-        $(last).after(copy)
-        increment_form_ids($(first).parents('.inline-group').children('.last-related'), count, name)
-    }
-    $('input#id_'+name+'-TOTAL_FORMS').val(count+1)
-    return false;
-}
-
-// Add all the "Add Another" links to the bottom of each inline group
-$(function() {
-    var html_template = '<ul class="tools">'+
-        '<li>'+
-            '<a id="addlink-{{prefix}}" class="addlink" href="#">'+
-            'Add another</a>'+
-        '</li>'+
-    '</ul>'
-    $('.inline-group').each(function(i) {
-        //prefix is in the name of the input fields before the "-"
-        var prefix = $("input[type='hidden'][name!='csrfmiddlewaretoken']", this).attr("name").split("-")[0];
-        $(this).append(html_template.replace("{{prefix}}", prefix));
-        $('#addlink-' + prefix).on('click', () => add_inline_form(prefix));
-    })
-})
+/* Following functions based off code written by Arne Brodowski
+http://www.arnebrodowski.de/blog/507-Add-and-remove-Django-Admin-Inlines-with-JavaScript.html
+
+2012-02-01 customized for new Rolodex.  Email formset doesn't have an id field, rather a "address"
+field as primary key.  Also for some reason the "active" boolean field doesn't get saved properly
+if the checkbox input has an empty "value" argument.
+*/
+import $ from 'jquery';
+
+function increment_form_ids(el, to, name) {
+    var from = to-1
+    $(':input', $(el)).each(function(i,e){
+        var old_name = $(e).attr('name')
+        var old_id = $(e).attr('id')
+        $(e).attr('name', old_name.replace(from, to))
+        $(e).attr('id', old_id.replace(from, to))
+        if ($(e).attr('type') != 'checkbox') {
+           $(e).val('')
+        }
+    })
+}
+
+function add_inline_form(name) {
+    if (name=="email") {
+        var first = $('#id_'+name+'-0-address').parents('.inline-related')
+    }
+    else {
+        var first = $('#id_'+name+'-0-id').parents('.inline-related')
+    }
+    // check to see if this is a stacked or tabular inline
+    if (first.hasClass("tabular")) {
+        var field_table = first.parent().find('table > tbody')
+        const children = field_table.children('tr.dynamic-inline')
+        var count = children.length
+        const last = $(children[count-1])
+        var copy = last.clone(true)
+        copy.removeClass("row1 row2")
+        copy.find("input[name$='address']").attr("readonly", false)
+        copy.addClass("row"+((count % 2) ? 2 : 1))
+        copy.insertAfter(last)
+        increment_form_ids($(copy), count, name)
+    }
+    else {
+        var last = $(first).parent().children('.last-related')
+        var copy = $(last).clone(true)
+        var count = $(first).parent().children('.inline-related').length
+        $(last).removeClass('last-related')
+        var header = $('h3', copy)
+        header.html(header.html().replace("#"+count, "#"+(count+1)))
+        $(last).after(copy)
+        increment_form_ids($(first).parents('.inline-group').children('.last-related'), count, name)
+    }
+    $('input#id_'+name+'-TOTAL_FORMS').val(count+1)
+    return false;
+}
+
+// Add all the "Add Another" links to the bottom of each inline group
+$(function() {
+    var html_template = '<ul class="tools">'+
+        '<li>'+
+            '<a id="addlink-{{prefix}}" class="addlink" href="#">'+
+            'Add another</a>'+
+        '</li>'+
+    '</ul>'
+    $('.inline-group').each(function(i) {
+        //prefix is in the name of the input fields before the "-"
+        var prefix = $("input[type='hidden'][name!='csrfmiddlewaretoken']", this).attr("name").split("-")[0];
+        $(this).append(html_template.replace("{{prefix}}", prefix));
+        $('#addlink-' + prefix).on('click', () => add_inline_form(prefix));
+    })
+})
diff --git a/ietf/secr/static/js/sessions.js b/ietf/secr/static/js/sessions.js
deleted file mode 100644
index a2770e6262..0000000000
--- a/ietf/secr/static/js/sessions.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright The IETF Trust 2015-2021, All Rights Reserved
-/* global alert */
-var ietf_sessions; // public interface
-
-(function() {
-  'use strict';
-
-  function get_formset_management_data(prefix) {
-    return {
-      total_forms: document.getElementById('id_' + prefix + '-TOTAL_FORMS').value,
-    };
-  }
-
-  function update_session_form_visibility(session_num, is_visible) {
-    const elt = document.getElementById('session_row_' + session_num);
-    if (elt) {
-      elt.hidden = !is_visible;
-      elt.querySelector('[name$="DELETE"]').value = is_visible ? '' : 'on';
-    }
-  }
-
-  function have_additional_session() {
-    const elt = document.getElementById('id_third_session');
-    return elt && elt.checked;
-  }
-
-  function update_for_num_sessions(val) {
-    const total_forms = get_formset_management_data('session_set').total_forms;
-    val = Number(val);
-    if (have_additional_session()) {
-      val++;
-    }
-
-    for (let i=0; i < total_forms; i++) {
-      update_session_form_visibility(i, i < val);
-    }
-
-    const only_one_session = (val === 1);
-    if (document.form_post.session_time_relation) {
-      document.form_post.session_time_relation.disabled = only_one_session;
-      document.form_post.session_time_relation.closest('tr').hidden = only_one_session;
-    }
-    if (document.form_post.joint_for_session) {
-      document.form_post.joint_for_session.disabled = only_one_session;
-    }
-    const third_session_row = document.getElementById('third_session_row');
-    if (third_session_row) {
-      third_session_row.hidden = val < 2;
-    }
-  }
-
-  function delete_last_joint_with_groups () {
-    var b = document.form_post.joint_with_groups.value;
-    var temp = b.split(' ');
-    temp.pop();
-    b = temp.join(' ');
-    document.form_post.joint_with_groups.value = b;
-    document.form_post.joint_with_groups_selector.selectedIndex=0;
-  }
-
-/*******************************************************************/
-// WG constraint UI support
-
-// get the constraint field element for a given slug
-  function constraint_field(slug) {
-    return document.getElementById('id_constraint_' + slug);
-  }
-
-// get the wg selection element for a given slug
-  function constraint_selector(slug) {
-    return document.getElementById('id_wg_selector_' + slug);
-  }
-
-  /**
-   * Handler for constraint select input 'change' event
-   */
-  function wg_constraint_selector_changed() {
-    let slug = this.getAttribute('data-slug');
-    let cfield = constraint_field(slug);
-    // add selected value to constraint_field
-    cfield.value += ' ' + this.options[this.selectedIndex].value;
-  }
-
-  /**
-   * Remove the last group in a WG constraint field
-   *
-   * @param slug ConstraintName slug
-   */
-  function delete_last_wg_constraint(slug) {
-    let cfield = constraint_field(slug);
-    if (cfield) {
-      var b = cfield.value;
-      var temp = b.split(' ');
-      temp.pop();
-      b = temp.join(' ');
-      cfield.value = b;
-      constraint_selector(slug).selectedIndex = 0;
-    }
-  }
-
-  /**
-   * Handle click event on a WG constraint's delete button
-   *
-   * @param slug ConstraintName slug
-   */
-  function delete_wg_constraint_clicked(slug) {
-    delete_last_wg_constraint(slug);
-  }
-
-  /**
-   * Handler for the change event on the session count select or 'third session' checkbox
-   */
-  function handle_num_session_change(event) {
-    const num_select_value = Number(event.target.value);
-    if (num_select_value !== 2) {
-      if (document.form_post.third_session) {
-        document.form_post.third_session.checked = false;
-      }
-    }
-    update_for_num_sessions(num_select_value);
-  }
-
-  function handle_third_session_change(event) {
-    const num_select_value = Number(document.getElementById('id_num_session').value);
-    if (num_select_value === 2) {
-      update_for_num_sessions(num_select_value);
-    } else {
-      event.target.checked = false;
-    }
-  }
-
-  /* Initialization */
-  function on_load() {
-    // Attach event handler to session count select
-    const num_session_select = document.getElementById('id_num_session');
-    num_session_select.addEventListener('change', handle_num_session_change);
-    const third_session_input = document.getElementById('id_third_session');
-    if (third_session_input) {
-      third_session_input.addEventListener('change', handle_third_session_change);
-    }
-    update_for_num_sessions(num_session_select.value);
-
-    // Attach event handlers to constraint selectors
-    let selectors = document.getElementsByClassName('wg_constraint_selector');
-    for (let index = 0; index < selectors.length; index++) {
-      selectors[index].addEventListener('change', wg_constraint_selector_changed, false)
-    }
-
-  }
-
-  // initialize after page loads
-  window.addEventListener('load', on_load, false);
-
-  // expose public interface methods
-  ietf_sessions = {
-    delete_last_joint_with_groups: delete_last_joint_with_groups,
-    delete_wg_constraint_clicked: delete_wg_constraint_clicked
-  }
-})();
\ No newline at end of file
diff --git a/ietf/secr/telechat/tests.py b/ietf/secr/telechat/tests.py
index f664745d76..91ccde2187 100644
--- a/ietf/secr/telechat/tests.py
+++ b/ietf/secr/telechat/tests.py
@@ -13,7 +13,9 @@
     IndividualDraftFactory, ConflictReviewFactory)
 from ietf.doc.models import BallotDocEvent, BallotType, BallotPositionDocEvent, State, Document
 from ietf.doc.utils import update_telechat, create_ballot_if_not_open
+from ietf.meeting.factories import MeetingFactory
 from ietf.utils.test_utils import TestCase
+from ietf.utils.timezone import date_today, datetime_today
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
 from ietf.person.factories import PersonFactory
@@ -22,7 +24,27 @@
 SECR_USER='secretary'
 
 def augment_data():
-    TelechatDate.objects.create(date=datetime.datetime.today())
+    TelechatDate.objects.create(date=date_today())
+
+class SecrUrlTests(TestCase):
+    def test_urls(self):
+        MeetingFactory(type_id='ietf', date=date_today())
+
+        # check public options
+        response = self.client.get("/secr/")
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        links = q('div.secr-menu a')
+        self.assertEqual(len(links), 1)
+        self.assertEqual(PyQuery(links[0]).text(), 'Announcements')
+
+        # check secretariat only options
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.get("/secr/")
+        self.assertEqual(response.status_code, 200)
+        q = PyQuery(response.content)
+        links = q('div.secr-menu a')
+        self.assertEqual(len(links), 4)
 
 class SecrTelechatTestCase(TestCase):
     def test_main(self):
@@ -66,10 +88,8 @@ def test_doc_detail_draft(self):
     def test_doc_detail_draft_with_downref(self):
         ad = Person.objects.get(user__username="ad")
         draft = WgDraftFactory(ad=ad, intended_std_level_id='ps', states=[('draft-iesg','pub-req'),])
-        rfc = IndividualRfcFactory.create(stream_id='irtf', other_aliases=['rfc6666',],
-                  states=[('draft','rfc'),('draft-iesg','pub')], std_level_id='inf', )
-        draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'),
-                  relationship_id='refnorm')
+        rfc = IndividualRfcFactory.create(stream_id='irtf', rfc_number=6666, std_level_id='inf')
+        draft.relateddocument_set.create(target=rfc, relationship_id='refnorm')
         create_ballot_if_not_open(None, draft, ad, 'approve')
         d = get_next_telechat_date()
         date = d.strftime('%Y-%m-%d')
@@ -119,7 +139,7 @@ def test_doc_detail_draft_no_ballot(self):
     def test_doc_detail_charter(self):
         by=Person.objects.get(name="(System)")
         charter = CharterFactory(states=[('charter','intrev')])
-        last_week = datetime.date.today()-datetime.timedelta(days=7)
+        last_week = datetime_today()-datetime.timedelta(days=7)
         BallotDocEvent.objects.create(type='created_ballot',by=by,doc=charter, rev=charter.rev,
                                       ballot_type=BallotType.objects.get(doc_type=charter.type,slug='r-extrev'),
                                       time=last_week)
@@ -138,7 +158,7 @@ def test_doc_detail_charter(self):
         self.assertEqual(q("#telechat-positions-table").find("th:contains('No Record')").length,1)
 
     def test_bash(self):
-        today = datetime.datetime.today() 
+        today = date_today()
         TelechatDate.objects.create(date=today)
         url = reverse('ietf.secr.telechat.views.bash',kwargs={'date':today.strftime('%Y-%m-%d')})
         self.client.login(username="secretary", password="secretary+password")
@@ -148,7 +168,7 @@ def test_bash(self):
     def test_doc_detail_post_update_ballot(self):
         by=Person.objects.get(name="(System)")
         charter = CharterFactory(states=[('charter','intrev')])
-        last_week = datetime.date.today()-datetime.timedelta(days=7)
+        last_week = datetime_today()-datetime.timedelta(days=7)
         BallotDocEvent.objects.create(type='created_ballot',by=by,doc=charter, rev=charter.rev,
                                       ballot_type=BallotType.objects.get(doc_type=charter.type,slug='r-extrev'),
                                       time=last_week)
@@ -186,7 +206,7 @@ def test_doc_detail_post_update_ballot(self):
     def test_doc_detail_post_update_state(self):
         by=Person.objects.get(name="(System)")
         charter = CharterFactory(states=[('charter','intrev')])
-        last_week = datetime.date.today()-datetime.timedelta(days=7)
+        last_week = datetime_today()-datetime.timedelta(days=7)
         BallotDocEvent.objects.create(type='created_ballot',by=by,doc=charter, rev=charter.rev,
                                       ballot_type=BallotType.objects.get(doc_type=charter.type,slug='r-extrev'),
                                       time=last_week)
@@ -214,7 +234,7 @@ def test_doc_detail_post_update_state_action_holder_automation(self):
             ad=Person.objects.get(user__username='ad'),
             authors=PersonFactory.create_batch(3),
         )
-        last_week = datetime.date.today()-datetime.timedelta(days=7)
+        last_week = datetime_today()-datetime.timedelta(days=7)
         BallotDocEvent.objects.create(type='created_ballot',by=by,doc=draft, rev=draft.rev,
                                       ballot_type=BallotType.objects.get(doc_type=draft.type,slug='approve'),
                                       time=last_week)
@@ -236,7 +256,7 @@ def test_doc_detail_post_update_state_action_holder_automation(self):
         self.assertEqual(response.status_code,302)
         draft = Document.objects.get(name=draft.name)
         self.assertEqual(draft.get_state('draft-iesg').slug,'defer')
-        self.assertCountEqual(draft.action_holders.all(), [draft.ad] + draft.authors())
+        self.assertCountEqual(draft.action_holders.all(), [draft.ad] + draft.author_persons())
         self.assertEqual(draft.docevent_set.filter(type='changed_action_holders').count(), 1)
 
         # Removing need-rev should remove authors
@@ -253,7 +273,7 @@ def test_doc_detail_post_update_state_action_holder_automation(self):
 
         # Setting to approved should remove all action holders
         # noinspection DjangoOrm
-        draft.action_holders.add(*(draft.authors()))  # add() with through model ok in Django 2.2+
+        draft.action_holders.add(*(draft.author_persons()))  # add() with through model ok in Django 2.2+
         response = self.client.post(url,{
             'submit': 'update_state',
             'state': State.objects.get(type_id='draft-iesg', slug='approved').pk,
diff --git a/ietf/secr/telechat/urls.py b/ietf/secr/telechat/urls.py
index 0f2ff4aace..08c51eab5f 100644
--- a/ietf/secr/telechat/urls.py
+++ b/ietf/secr/telechat/urls.py
@@ -11,5 +11,4 @@
     url(r'^(?P<date>[0-9\-]+)/management/$', views.management),
     url(r'^(?P<date>[0-9\-]+)/minutes/$', views.minutes),
     url(r'^(?P<date>[0-9\-]+)/roll-call/$', views.roll_call),
-    url(r'^new/$', views.new),
 ]
diff --git a/ietf/secr/telechat/views.py b/ietf/secr/telechat/views.py
index b3f064fa1e..c39aecf748 100644
--- a/ietf/secr/telechat/views.py
+++ b/ietf/secr/telechat/views.py
@@ -4,10 +4,11 @@
 
 import datetime
 
+from functools import partialmethod
+
 from django.contrib import messages
 from django.forms.formsets import formset_factory
 from django.shortcuts import render, get_object_or_404, redirect
-from django.utils.functional import curry
 
 import debug                            # pyflakes:ignore
 
@@ -16,10 +17,12 @@
 from ietf.person.models import Person
 from ietf.doc.lastcall import request_last_call
 from ietf.doc.mails import email_state_changed
-from ietf.iesg.models import TelechatDate, TelechatAgendaItem, Telechat
+from ietf.iesg.models import TelechatDate, TelechatAgendaItem
 from ietf.iesg.agenda import agenda_data, get_doc_section
 from ietf.ietfauth.utils import role_required
 from ietf.secr.telechat.forms import BallotForm, ChangeStateForm, DateSelectForm, TELECHAT_TAGS
+from ietf.utils.timezone import date_today
+
 
 '''
 EXPECTED CHANGES:
@@ -80,14 +83,14 @@ def get_last_telechat_date():
     This function returns the date of the last telechat
     Tried TelechatDocEvent.objects.latest but that will return today's telechat
     '''
-    return TelechatDate.objects.filter(date__lt=datetime.date.today()).order_by('-date')[0].date
+    return TelechatDate.objects.filter(date__lt=date_today()).order_by('-date')[0].date
     #return '2011-11-01' # uncomment for testing
 
 def get_next_telechat_date():
     '''
     This function returns the date of the next telechat
     '''
-    return TelechatDate.objects.filter(date__gte=datetime.date.today()).order_by('date')[0].date
+    return TelechatDate.objects.filter(date__gte=date_today()).order_by('date')[0].date
 
 def get_section_header(doc, agenda):
     '''
@@ -172,7 +175,7 @@ def doc_detail(request, date, name):
     This view displays the ballot information for the document, and lets the user make
     changes to ballot positions and document state.
     '''
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     if not is_doc_on_telechat(doc, date):
         messages.warning(request, 'Dcoument: {name} is not on the Telechat agenda for {date}'.format(
             name=doc.name,
@@ -213,7 +216,7 @@ def doc_detail(request, date, name):
     initial_state = {'state':doc.get_state(state_type).pk,
                      'substate':tag}
 
-    # need to use curry here to pass custom variable to form init
+    # need to use partialmethod here to pass custom variable to form init
     if doc.active_ballot():
         ballot_type = doc.active_ballot().ballot_type
     elif doc.type.slug == 'draft':
@@ -221,7 +224,7 @@ def doc_detail(request, date, name):
     else:
         ballot_type = BallotType.objects.get(doc_type=doc.type)
     BallotFormset = formset_factory(BallotForm, extra=0)
-    BallotFormset.form.__init__ = curry(BallotForm.__init__, ballot_type=ballot_type)
+    BallotFormset.form.__init__ = partialmethod(BallotForm.__init__, ballot_type=ballot_type)
     
     agenda = agenda_data(date=date)
     header = get_section_header(doc, agenda)
@@ -310,7 +313,7 @@ def doc_detail(request, date, name):
 
         # if this is a conflict review document add referenced document
         if doc.type_id == 'conflrev':
-            conflictdoc = doc.relateddocument_set.get(relationship__slug='conflrev').target.document
+            conflictdoc = doc.relateddocument_set.get(relationship__slug='conflrev').target
         else:
             conflictdoc = None
 
@@ -339,7 +342,7 @@ def doc_navigate(request, date, name, nav):
     nav  - [next|previous] which direction the user wants to navigate in the list of docs
     The view retrieves the appropriate document and redirects to the doc view.
     '''
-    doc = get_object_or_404(Document, docalias__name=name)
+    doc = get_object_or_404(Document, name=name)
     agenda = agenda_data(date=date)
     target = name
 
@@ -416,18 +419,6 @@ def minutes(request, date):
         'da_docs': da_docs},
     )
 
-@role_required('Secretariat')
-def new(request):
-    '''
-    This view creates a new telechat agenda and redirects to the default view
-    '''
-    if request.method == 'POST':
-        date = request.POST['date']
-        # create legacy telechat record
-        Telechat.objects.create(telechat_date=date)
-
-        messages.success(request,'New Telechat Agenda created')
-        return redirect('ietf.secr.telechat.views.doc', date=date)
 
 @role_required('Secretariat')
 def roll_call(request, date):
diff --git a/ietf/secr/templates/announcement/confirm.html b/ietf/secr/templates/announcement/confirm.html
index 7ad745a09e..0e1f72c54b 100644
--- a/ietf/secr/templates/announcement/confirm.html
+++ b/ietf/secr/templates/announcement/confirm.html
@@ -1,22 +1,17 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
+{# Copyright The IETF Trust 2024, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static %}
+{% load ietf_filters %}
+{% load django_bootstrap5 %}
 {% block title %}Announcement{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Announcement
-{% endblock %}
-
 {% block content %}
+    <h1>Announcement</h1>
+
 
     <div class="module">
         <h2>Confirm Announcement</h2>
 
-        <form action="{% url "ietf.secr.announcement.views.confirm" %}" method="post">{% csrf_token %}
+        <form action="{% url 'ietf.secr.announcement.views.confirm' %}" method="post">{% csrf_token %}
 
             <pre id="announce-confirm">
 To: {{ to }}
@@ -29,15 +24,13 @@ <h2>Confirm Announcement</h2>
 {{ message.body }}
             </pre>
 
-            {{ form }}
-            <div class="button-group">
-                <ul id="announcement-button-list">
-                    <li><button type="submit" name="submit" value="Send">Send</button></li>
-                    <li><button type="button" onclick="history.go(-1);return false">Back</button></li>
-                    <li><button type="submit" name="submit" value="Cancel">Cancel</button></li>
-                </ul>
-            </div> <!-- button-group -->
+            {% bootstrap_form form %}
 
+            <div class="d-flex justify-content-around">
+                <button class="btn btn-primary" type="submit" name="submit" value="Send">Send</button>
+                <button class="btn btn-secondary" type="button" onclick="history.go(-1);return false">Back</button>
+                <button class="btn btn-danger" type="submit" name="submit" value="Cancel">Cancel</button>
+            </div>
         </form>
     </div> <!-- module -->
 
diff --git a/ietf/secr/templates/announcement/index.html b/ietf/secr/templates/announcement/index.html
new file mode 100644
index 0000000000..ad7226e3bc
--- /dev/null
+++ b/ietf/secr/templates/announcement/index.html
@@ -0,0 +1,31 @@
+{# Copyright The IETF Trust 2024, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static %}
+{% load ietf_filters %}
+{% load django_bootstrap5 %}
+{% block title %}Announcement{% endblock %}
+{% block content %}
+    <h1 class="announcement">Announcement</h1>
+    {% if form.non_field_errors %}<div class="my-3 alert alert-danger">{{ form.non_field_errors }}</div>{% endif %}
+
+    <form id="announcement-form" method="post">
+        {% csrf_token %}
+        {% bootstrap_field form.nomcom layout='horizontal' %}
+        {% bootstrap_field form.to layout='horizontal' %}
+        {% bootstrap_field form.to_custom layout='horizontal' %}
+        {% bootstrap_field form.frm layout='horizontal' %}
+        {% bootstrap_field form.cc layout='horizontal' %}
+        {% bootstrap_field form.bcc layout='horizontal' %}
+        {% bootstrap_field form.reply_to layout='horizontal' %}
+        {% bootstrap_field form.subject layout='horizontal' %}
+        {% bootstrap_field form.body layout='horizontal' %}
+
+        <button type="submit" class="btn btn-primary">Continue</button>
+        <a class="btn btn-secondary float-end"
+               href="{% url 'ietf.secr' %}">Cancel</a>
+    </form>
+
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/announcement.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/announcement/main.html b/ietf/secr/templates/announcement/main.html
deleted file mode 100644
index c88b4a2406..0000000000
--- a/ietf/secr/templates/announcement/main.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "base_site.html" %}
-
-{% block title %}Announcement{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Announcement
-{% endblock %}
-
-{% block content %}
-
-    <div class="module">
-        <h2>Announcement</h2>
-
-        <form method="post">{% csrf_token %}
-            <table class="new-style full-width amstable" id="announce-table">
-                <tbody>
-                {% if form.non_field_errors %}{{ form.non_field_errors }}{% endif %}
-                {% for field in form.visible_fields %}
-                    <tr>
-                        <th scope="row">{{ field.label_tag }}{% if field.field.required %}<span class="required"> *</span>{% endif %}</th>
-                        <td>{{ field.errors }}{{ field }}{% if field.help_text %}<br>{{ field.help_text }}{% endif %}</td>
-                    </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-            <div class="button-group">
-                <ul id="announcement-button-list">
-                    <li><button type="submit" name="submit" value="Continue">Continue</button></li>
-                    <li><button type="button" onclick="window.location='../'" value="Cancel">Cancel</button></li>
-                </ul>
-            </div> <!-- button-group -->
-
-        </form>
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/areas/list.html b/ietf/secr/templates/areas/list.html
deleted file mode 100644
index a0ed1ae4a3..0000000000
--- a/ietf/secr/templates/areas/list.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-{% block title %}Areas{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Areas
-{% endblock %}
-
-{% block content %}
-
-    <div class="module">
-        <h2>Areas</h2>
-        <table id="areas-list-table" class="full-width">
-            <thead>
-                <tr>
-                    <th scope="col">Name</th>
-                    <th scope="col">Acronym</th>
-                    <th scope="col">Status</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for item in results %}
-                    <tr class="{% cycle 'row1' 'row2' %} {{ item.state|lower }}">
-                        <td><a href="{% url "ietf.secr.areas.views.view" name=item.acronym %}">{{ item.name }}</a></td>
-                        <td>{{ item.acronym }}</td>
-                        <td>{{ item.state }}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-
-        <div class="button-group">
-            <ul id="areas-button-list">
-            </ul>
-        </div> <!-- button-group -->
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/areas/people.html b/ietf/secr/templates/areas/people.html
deleted file mode 100644
index c5598f911d..0000000000
--- a/ietf/secr/templates/areas/people.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-{% block title %}Areas - People{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}">
-    <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../../">Areas</a>
-    &raquo; <a href="../">{{ area.acronym }}</a>
-    &raquo; People
-{% endblock %}
-
-{% block content %}
-
-    <div class="module">
-        <h2>Area Directors ({{ area.acronym }})</h2>
-        <table class="center">
-            {% for director in directors %}
-                <form action="modify/" method="post">{% csrf_token %}
-                    <input type="hidden" name="tag" value="{{ director.person.id }}">
-                    <tr>
-                        <td id="id-ad-name"><a href="#">{{ director.person.name }}</a></td>
-                        <td>{% if director.name.slug == "ad" %}
-                            Voting Enabled
-                        {% else %}
-                            <button type="submit" name="submit">Enable Voting</button></td>
-                        {% endif %}
-                            <td><button type="submit" name="submit">Retire</button></td>
-                        </tr>
-                    </form>
-            {% endfor %}
-        </table>
-
-        <div class="inline-related">
-            <h3><b>Add new Director</b></h3>
-            <p>
-                <form action="." method="post">{% csrf_token %}
-                    <table class="center">
-                        <tbody>
-                        <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
-                        {{ form.as_table }}
-                        <tr>
-                            <td></td>
-                            <td><button type="submit" name="submit">Add</button></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </form>
-            </div> <!-- iniline-related -->
-
-            <div class="button-group">
-                <ul>
-                    <li><button type="button" onclick="history.go(-1);return true">Back</button></li>
-                </ul>
-            </div> <!-- button-group -->
-        </div> <!-- module -->
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/areas/view.html b/ietf/secr/templates/areas/view.html
deleted file mode 100644
index 3b95988682..0000000000
--- a/ietf/secr/templates/areas/view.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-{% block title %}Areas - View{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../">Areas</a>
-    &raquo; {{ area.acronym }}
-{% endblock %}
-
-{% block content %}
-
-    <div class="module">
-        <h2>Area - View</h2>
-        <table class="full-width">
-            <tbody>
-            <tr><td>Area Acronym:</td><td>{{ area.acronym }}</td></tr>
-            <tr><td>Area Name:</td><td>{{ area.name }}</td></tr>
-            <tr><td>Status:</td><td>{{ area.state }}</td></tr>
-            <tr><td>Start Date:</td><td>{{ area.start_date|date:"Y-m-d" }}</td></tr>
-            <tr><td>Concluded Date:</td><td>{{ area.concluded_date|date:"Y-m-d" }}</td></tr>
-            <tr><td>Last Modified Date:</td><td>{{ area.time|date:"Y-m-d" }}</td></tr>
-            <tr><td>Comments:</td><td>{{ area.comments}}</td></tr>
-            </tbody>
-        </table>
-
-        <div class="inline-related">
-            <h2>Directors</h2>
-            <table  class="full-width">
-                <tbody>
-                {% for director in directors %}
-                    <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=director.person.id %}">{{ director.person.name }}</a>{% if director.name.slug == "pre-ad" %} (Incoming){% endif %}</td></tr>
-                {% endfor %}
-                </tbody>
-            </table>
-        </div> <!-- inline-group -->
-
-        <div class="button-group">
-            <ul>
-                <!-- <li><button type="button" onclick="window.location='../../'">Back</button></li> -->
-                <li><button type="button" onclick="window.location='edit/'">Edit</button></li>
-                <li><button type="button" onclick="window.location='people/'">People</button></li>
-                <li><button type="button" onclick="window.location='{% url 'ietf.secr.groups.views.search' %}?primary_area={{ area.id }}'">Groups</button></li>
-            </ul>
-        </div> <!-- button-group -->
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/base_secr.html b/ietf/secr/templates/base_secr.html
index 47b893f043..18d77e47ba 100644
--- a/ietf/secr/templates/base_secr.html
+++ b/ietf/secr/templates/base_secr.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% load staticfiles %}
+{% load static %}
 <html lang="en">
     <head>
         <meta charset="utf-8">
diff --git a/ietf/secr/templates/base_secr_bootstrap.html b/ietf/secr/templates/base_secr_bootstrap.html
index 2eee566a12..a326346847 100644
--- a/ietf/secr/templates/base_secr_bootstrap.html
+++ b/ietf/secr/templates/base_secr_bootstrap.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% load staticfiles %}
+{% load static %}
 <html lang="en">
     <head>
         <meta charset="utf-8">
diff --git a/ietf/secr/templates/base_site.html b/ietf/secr/templates/base_site.html
index d369a40ec1..5e3ddc62d8 100644
--- a/ietf/secr/templates/base_site.html
+++ b/ietf/secr/templates/base_site.html
@@ -1,7 +1,7 @@
 {% extends "base_secr.html" %}
 {% load i18n %}
 {% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} IETF Dashboard {% endif %}{% endblock %}
 
diff --git a/ietf/secr/templates/base_site_bootstrap.html b/ietf/secr/templates/base_site_bootstrap.html
index c1c2fdac6b..1653b26b85 100644
--- a/ietf/secr/templates/base_site_bootstrap.html
+++ b/ietf/secr/templates/base_site_bootstrap.html
@@ -1,7 +1,7 @@
 {% extends "base_secr_bootstrap.html" %}
 {% load i18n %}
 {% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}{% endblock %}
 
diff --git a/ietf/secr/templates/confirm_cancel.html b/ietf/secr/templates/confirm_cancel.html
index 6bae631a7e..541c82863f 100644
--- a/ietf/secr/templates/confirm_cancel.html
+++ b/ietf/secr/templates/confirm_cancel.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Confirm Cancel{% endblock %}
 
diff --git a/ietf/secr/templates/confirm_delete.html b/ietf/secr/templates/confirm_delete.html
index ccfc7b1c2f..3f8fd19c8f 100644
--- a/ietf/secr/templates/confirm_delete.html
+++ b/ietf/secr/templates/confirm_delete.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Confirm Delete{% endblock %}
 
diff --git a/ietf/secr/templates/console/main.html b/ietf/secr/templates/console/main.html
deleted file mode 100644
index 5aadefc558..0000000000
--- a/ietf/secr/templates/console/main.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "base_site.html" %}
-
-{% block title %}Console{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Console
-{% endblock %}
-
-{% block content %}
-
-    <div class="module">
-        <h2>Console</h2>
-
-        <table class="full-width amstable" id="announce-table">
-            <tbody>
-            <tr><th scope="row">Latest DocEvent</th><td>{{ latest_docevent }}</td></tr>
-            </tbody>
-        </table>
-
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/groups/blue_dot_report.txt b/ietf/secr/templates/groups/blue_dot_report.txt
deleted file mode 100644
index 7516b01dad..0000000000
--- a/ietf/secr/templates/groups/blue_dot_report.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-BLUE DOT REPORT
-
-NAMES                            ROSTER                              BADGE
---------------------------------------------------------------------------
-{% for chair in chairs %}{{ chair.name|safe|stringformat:"-33s" }}{{ chair.groups|stringformat:"-36s" }}BLUE
-{% endfor %}
\ No newline at end of file
diff --git a/ietf/secr/templates/groups/charter.html b/ietf/secr/templates/groups/charter.html
deleted file mode 100644
index 84649f4fde..0000000000
--- a/ietf/secr/templates/groups/charter.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Groups - Charter{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../../">Groups</a>
-    &raquo; <a href="../">{{ group.acronym }}</a>
-    &raquo; Charter
-{% endblock %}
-
-{% block content %}
-
-    <div class="module group-container">
-        <h2>Groups - Charter</h2>
-        <pre>
-    {% if charter_txt %}{{ charter_text }}{% else %}Charter not found.{% endif %}
-    </pre>
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/groups/people.html b/ietf/secr/templates/groups/people.html
deleted file mode 100644
index 3c207d3dbf..0000000000
--- a/ietf/secr/templates/groups/people.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles widget_tweaks %}
-
-{% block title %}Groups - People{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}">
-    <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../../">Groups</a>
-    &raquo; <a href="../">{{ group.acronym }}</a>
-    &raquo; People
-{% endblock %}
-
-{% block content %}
-
-    <div class="module">
-        <h2>People</h2>
-        <table class="full-width">
-            <thead>
-                <tr>
-                    <th scope="col">Role</th>
-                    <th scope="col">Name</th>
-                    <th scope="col">Email</th>
-                    <th scope="col">Action</th>
-                </tr>
-            </thead>
-            {% if group.role_set.all %}
-                <tbody>
-                    {% for role in group.role_set.all %}
-                        <tr class="{% cycle 'row1' 'row2' %}">
-                            <td>{{ role.name }}</td>
-                            <td>{{ role.person }}</td>
-                            <td>{{ role.email }}</td>
-                            <td><a href="{% url 'ietf.secr.groups.views.delete_role' acronym=group.acronym id=role.id %}">Delete</a></td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            {% endif %}
-        </table>
-
-        <div class="inline-related">
-            <!-- <hr><br> -->
-            <h3>Add Role</h3>
-            <form id="groups-people" method="post">{% csrf_token %}
-                {{ form.non_field_errors }}
-                {{ form.group_acronym }}
-                <table class="full-width">
-                    <tbody>
-                    <tr>
-                        <td>{{ form.name.errors }}{{ form.name|attr:"aria-label:Name" }}</td>
-                        <td>{{ form.person.errors }}{{ form.person|attr:"aria-label:Person" }}{% if form.person.help_text %}<br>{{ form.person.help_text }}{% endif %}</td>
-                        <td>{{ form.email.errors }}{{ form.email|attr:"aria-label:Email" }}{% if form.email.help_text %}<br>{{ form.email.help_text }}{% endif %}</td>
-                        <td><button type="submit" name="submit">Add</button></td>
-                    </tr>
-                    </tbody>
-                </table>
-            </form>
-        </div> <!-- inline-related -->
-
-        <div class="button-group">
-            <ul>
-                <li><button type="button" onclick="window.location='../'">Back</button></li>
-            </ul>
-        </div> <!-- button-group -->
-
-    </div> <!-- module -->
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/groups/search.html b/ietf/secr/templates/groups/search.html
deleted file mode 100644
index 4a1de0e4ae..0000000000
--- a/ietf/secr/templates/groups/search.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Groups - Search{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-    <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Groups
-{% endblock %}
-
-{% block content %}
-
-    <div class="module group-container">
-        <h2>Groups - Search</h2>
-        <form enctype="multipart/form-data" method="post">{% csrf_token %}
-            <table class="full-width amstable">
-                <tbody>
-                <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
-                 {{ form.as_table }}
-                 </tbody>
-            </table>
-
-            {% include "includes/buttons_search.html" %}
-
-        </form>
-
-        <div class="inline-related">
-            <h2>Search Results</h2>
-            {% include "includes/group_search_results.html" %}
-            {% if not_found %}{{ not_found }}{% endif %}
-        </div> <!-- inline-group -->
-    </div> <!-- module -->
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/groups/view.html b/ietf/secr/templates/groups/view.html
deleted file mode 100644
index a0509b0630..0000000000
--- a/ietf/secr/templates/groups/view.html
+++ /dev/null
@@ -1,123 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Groups - View{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../">Groups</a>
-    &raquo; {{ group.acronym }}
-{% endblock %}
-
-{% block content %}
-
-    <div class="module group-container">
-        <div id="groups-view-col1">
-            <h2>Groups - View</h2>
-            <table >
-                <tbody>
-                <tr><td>Group Acronym:</td><td>{{ group.acronym }}</td></tr>
-                <tr><td>Group Name:</td><td>{{ group.name }}</td></tr>
-                <tr><td>Status:</td><td>{{ group.state }}</td></tr>
-                <tr><td>Type:</td><td>{{ group.type }}</td></tr>
-                <tr><td>Proposed Date:</td><td>{{ group.proposed_date|date:"Y-m-d" }}</td></tr>
-                <tr><td>Start Date:</td><td>{{ group.start_date|date:"Y-m-d" }}</td></tr>
-                <tr><td>Concluded Date:</td><td>{{ group.concluded_date|date:"Y-m-d" }}</td></tr>
-                {% comment %}
-        Here we need to check that group.area_director and group.area_director.area are defined before referencing.
-        Otherwise the template would raise errors if the group area director record didn't exist or
-        in the case of Area Director = TBD, the area field is NULL
-        {% endcomment %}
-                <tr><td>Primary Area:</td>
-                    <td>{% if not group.parent %}(No Data){% else %}
-                        <a href="{% url "ietf.secr.areas.views.view" name=group.parent.acronym %}">{{ group.parent }}</a>
-                    {% endif %}
-                    </td>
-                </tr>
-                <tr><td>Primary Area Director:</td>
-                    <td>{% if group.ad_role %}
-                        <a href="{% url 'ietf.secr.rolodex.views.view' id=group.ad_role.person.id %}">{{ group.ad_role.person }}</a>
-                    {% endif %}
-                    </td></tr>
-                <tr><td>Meeting Scheduled:</td><td>{{ group.meeting_scheduled}}</td></tr>
-                <tr><td>Email Address:</td><td>{{ group.list_email }}</td></tr>
-                <tr><td>Email Subscription:</td><td>{{ group.list_subscribe }}</td></tr>
-                <tr><td>Email Archive:</td><td>{{ group.list_archive }}</td></tr>
-                {% if group.liaison_contacts %}
-                    <tr><td>Default Liaison Contacts:</td><td>{{ group.liaison_contacts.contacts }}</td></tr>
-                {% endif %}
-                {% if group.features.has_chartering_process %}
-                    <tr><td>Charter:</td><td><a href="{% url 'ietf.secr.groups.views.charter' acronym=group.acronym %}">View Charter</a></td></tr>
-                {% else %}
-                    <tr><td>Description:</td><td>{{ group.description }}</td></tr>
-                {% endif %}
-                <tr><td>Comments:</td><td>{{ group.comments }}</td></tr>
-                <tr><td>Last Modified Date:</td><td>{{ group.time }}</td></tr>
-                </tbody>
-            </table>
-
-
-        </div> <!-- groups-view-col1 -->
-        <div id="groups-view-col2">
-            <div class="inline-related">
-                <h2>Chairperson(s)</h2>
-                {% if group.chairs %}
-                    <table>
-                        {% for role in group.chairs %}
-                            <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
-                        {% endfor %}
-                    </table>
-                {% endif %}
-            </div> <!-- inline-related -->
-
-            <div class="inline-related">
-                <h2>Document Editor(s)</h2>
-                {% if group.editors %}
-                    <table>
-                        {% for role in group.editors %}
-                            <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
-                        {% endfor %}
-                    </table>
-                {% endif %}
-            </div> <!-- inline-related -->
-
-            <div class="inline-related">
-                <h2>Technical Advisor(s)</h2>
-                {% if group.techadvisors %}
-                    <table>
-                        {% for role in group.techadvisors %}
-                            <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
-                        {% endfor %}
-                    </table>
-                {% endif %}
-            </div> <!-- inline-related -->
-
-            <div class="inline-related">
-                <h2>Secretary(ies)</h2>
-                {% if group.secretaries %}
-                    <table>
-                        {% for role in group.secretaries %}
-                            <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
-                        {% endfor %}
-                    </table>
-                {% endif %}
-            </div> <!-- inline-related -->
-
-        </div> <!-- groups-view-col2 -->
-
-        <div class="button-group">
-            <ul>
-                <li><button type="button" onclick="window.location='edit/'">Edit</button></li>
-                <li><button type="button" onclick="window.location='people/'">People</button></li>
-                {% comment %}
-          <li><button type="button" onclick="window.location='{% url "sec.ids.views.search" id=group.group_acronym.acronym_id %}'">Drafts</button></li>
-          <li><button type="button" onclick="window.location='{% url "sec.rfcs.views.search" id=group.group_acronym.acronym_id %}'">RFCs</button></li>
-          {% endcomment %}
-            </ul>
-        </div> <!-- button-group -->
-    </div> <!-- module -->
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/activities.html b/ietf/secr/templates/includes/activities.html
deleted file mode 100644
index 3e79c9aed4..0000000000
--- a/ietf/secr/templates/includes/activities.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2>Activies Log</h2>
-<div class="inline-related last-related">
-    <table class="full-width">
-        <thead>
-            <tr>
-                <th scope="col">Date</th>
-                <th scope="col">Time</th>
-                <th scope="col">Action</th>
-                <th scope="col">Name</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for entry in activities %}
-                <tr class="{% cycle 'row1' 'row2' %}">
-                    <td>{{ entry.act_date }}</td>
-                    <td>{{ entry.act_time }}</td>
-                    <td>{{ entry.activity }}</td>
-                    <td>{{ entry.act_by }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</div> <!-- inline-related -->
diff --git a/ietf/secr/templates/includes/buttons_next_cancel.html b/ietf/secr/templates/includes/buttons_next_cancel.html
deleted file mode 100644
index 95d25f55bc..0000000000
--- a/ietf/secr/templates/includes/buttons_next_cancel.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="button-group">
-    <ul>
-        <li><button type="submit" name="submit" value="Next">Next</button></li>
-        <li><button type="submit" name="submit" value="Cancel">Cancel</button></li>
-    </ul>
-</div> <!-- button-group -->
diff --git a/ietf/secr/templates/includes/buttons_submit_cancel.html b/ietf/secr/templates/includes/buttons_submit_cancel.html
deleted file mode 100644
index df40c98255..0000000000
--- a/ietf/secr/templates/includes/buttons_submit_cancel.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="button-group">
-    <ul>
-        <li><button type="submit" name="submit" value="Submit">Submit</button></li>
-        <li><button type="submit" name="submit" value="Cancel">Cancel</button></li>
-    </ul>
-</div> <!-- button-group -->
diff --git a/ietf/secr/templates/includes/group_search_results.html b/ietf/secr/templates/includes/group_search_results.html
deleted file mode 100644
index fb8b2b06e3..0000000000
--- a/ietf/secr/templates/includes/group_search_results.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<table id="group-search-results" class="center" cellspacing="0">
-    <thead>
-        <tr>
-            <th scope="col">Group Name</th>
-            <th scope="col">Group Acronym</th>
-            <th scope="col">Status</th>
-            <th scope="col">Type</th>
-            <th scope="col">Meeting Scheduled</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for item in results %}
-            <tr class="{% cycle 'row1' 'row2' %}">
-                <td><a href="{% url 'ietf.secr.groups.views.view' acronym=item.acronym %}">{{item.name}}</a></td>
-                <td>{{item.acronym}}</td>
-                <td>{{item.state}}</td>
-                <td>{{item.type}}</td>
-                <td>{{item.meeting_scheduled}}</td>
-            </tr>
-        {% empty %}
-            <tr><td><b>No Results</b></td></tr>
-        {% endfor %}
-    </tbody>
-</table>
diff --git a/ietf/secr/templates/includes/proceedings_functions.html b/ietf/secr/templates/includes/proceedings_functions.html
deleted file mode 100644
index 33e11a1489..0000000000
--- a/ietf/secr/templates/includes/proceedings_functions.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<p>Use this to process meeting materials files that have been converted to PDF and uploaded to the server.</p>
-<ul class="none">
-    <li>
-        <button type="button" onclick="window.location='{% url 'ietf.secr.proceedings.views.process_pdfs' meeting_num=meeting.number %}'">Process PDFs</button>
-        &nbsp;&nbsp;<span class="{% if ppt_count > 0 %}alert{% endif %}">{{ ppt_count }} PowerPoint files waiting to be converted</span>
-    </li>
-</ul>
-<p>Use this to input session recording information.</p>
-<ul class="none">
-    <li><button type="button" onclick="window.location='{% url 'ietf.secr.proceedings.views.recording' meeting_num=meeting.number %}'">Recordings</button>
-    </li>
-</ul>
diff --git a/ietf/secr/templates/includes/session_info.txt b/ietf/secr/templates/includes/session_info.txt
index eea4a5f174..bffc13e3ef 100644
--- a/ietf/secr/templates/includes/session_info.txt
+++ b/ietf/secr/templates/includes/session_info.txt
@@ -14,7 +14,7 @@ Conflicts to Avoid:
 {% if session.adjacent_with_wg %} Adjacent with WG: {{ session.adjacent_with_wg }}{% endif %}       
 {% if session.timeranges_display %} Can't meet: {{ session.timeranges_display|join:", " }}{% endif %}
 
-People who must be present:
+Participants who must be present:
 {% for person in session.bethere %}  {{ person.ascii_name }}
 {% endfor %}
 Resources Requested:
diff --git a/ietf/secr/templates/includes/sessions_footer.html b/ietf/secr/templates/includes/sessions_footer.html
deleted file mode 100755
index a41a8b8db3..0000000000
--- a/ietf/secr/templates/includes/sessions_footer.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul>
-<li><a href="https://www.ietf.org/chairs/session-request-tool-instructions/" target="_blank">Instructions</a>.</li>
-<li><a href="{% url 'ietf.secr.proceedings.views.main' %}">IETF Meeting Materials Management Tool</a>.</li>
-<li>If you require assistance in using this tool, or wish to report a bug, then please send a message to <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>.</li>
-<li>To submit your request via email, please send your request to <a href="mailto:agenda@ietf.org">agenda@ietf.org</a>.</li>
-</ul>
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/sessions_request_form.html b/ietf/secr/templates/includes/sessions_request_form.html
deleted file mode 100755
index 6d43447102..0000000000
--- a/ietf/secr/templates/includes/sessions_request_form.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<span class="required">*</span> Required Field
-<form id="session-request-form" action="." method="post" name="form_post">{% csrf_token %}
-    {{ form.session_forms.management_form }}
-    {% if form.non_field_errors %}
-        {{ form.non_field_errors }}
-    {% endif %}
-    <table id="sessions-new-table">
-        <tbody>
-        <tr class="bg1"><td>Working Group Name:</td><td>{{ group.name }} ({{ group.acronym }})</td></tr>
-        <tr class="bg2"><td>Area Name:</td><td>{% if group.parent %}{{ group.parent.name }} ({{ group.parent.acronym }}){% endif %}</td></tr>
-        <tr class="bg1"><td>Number of Sessions:<span class="required">*</span></td><td>{{ form.num_session.errors }}{{ form.num_session }}</td></tr>
-        {% if group.features.acts_like_wg %}<tr class="bg2" id="session_row_0"><td>Session 1:<span class="required">*</span></td><td>{% include 'meeting/session_details_form.html' with form=form.session_forms.0 only %}</td></tr>
-            <tr class="bg2" id="session_row_1"><td>Session 2:<span class="required">*</span></td><td>{% include 'meeting/session_details_form.html' with form=form.session_forms.1 only %}</td></tr>
-            {% if not is_virtual %}
-                <tr class="bg2"><td>Time between two sessions:</td><td>{{ form.session_time_relation.errors }}{{ form.session_time_relation }}</td></tr>
-            {% endif %}
-            <tr class="bg2" id="third_session_row"><td>Additional Session Request:</td><td>{{ form.third_session }} Check this box to request an additional session.<br>
-                Additional slot may be available after agenda scheduling has closed and with the approval of an Area Director.<br>
-                <div id="session_row_2">
-                    Third Session:
-                    {% include 'meeting/session_details_form.html' with form=form.session_forms.2 only %}
-                </div>
-            </td></tr>
-        {% else %}{# else not group.features.acts_like_wg #}
-            {% for session_form in form.session_forms %}
-                <tr class="bg2" id="session_row_{{ forloop.counter0 }}"><td>Session {{ forloop.counter }}:<span class="required">*</span></td><td>{% include 'meeting/session_details_form.html' with form=session_form only %}</td></tr>
-            {% endfor %}
-        {% endif %}
-        <tr class="bg1"><td>Number of Attendees:{% if not is_virtual %}<span class="required">*</span>{% endif %}</td><td>{{ form.attendees.errors }}{{ form.attendees }}</td></tr>
-        <tr class="bg2">
-            <td>People who must be present:</td>
-            <td>
-                {{ form.bethere.errors }}
-                {{ form.bethere }}
-                <p class="fw-bold text-danger">
-                    You should not include the Area Directors; they will be added automatically.
-                </p>
-            </td>
-        </tr>
-        <tr class="bg1"><td>Conflicts to Avoid:</td>
-            <td>
-                <table>
-                    <tbody>
-                    <tr>
-                        <td colspan="2">Other WGs that included {{ group.name }} in their conflict lists:</td>
-                        <td>{{ session_conflicts.inbound|default:"None" }}</td>
-                    </tr>
-                    {% for cname, cfield, cselector  in form.wg_constraint_fields %}
-                        <tr class="bg1">
-                            {% if forloop.first %}<td rowspan="{{ form.wg_constraint_count }}" >WG Sessions:<br>You may select multiple WGs within each category</td>{% endif %}
-                            <td>{{ cname|title }}</td>
-                            <td>{{ cselector }}
-                                <button type="button" id="wg_delete_{{ cname.slug }}" onclick="ietf_sessions.delete_wg_constraint_clicked('{{ cname.slug }}')">Delete the last entry</button><br>
-                                {{ cfield.errors }}{{ cfield }}
-                            </td>
-                        </tr>
-                    {% empty %}{# shown if there are no constraint fields #}
-                        <tr class="bg1"><td ></td><td colspan="2">No constraints are enabled for this meeting.</td></tr>
-                    {% endfor %}
-                    {% if form.inactive_wg_constraints %}
-                        {% for cname, value, field in form.inactive_wg_constraints %}
-                            <tr class="bg1">
-                                {% if forloop.first %}
-                                    <td rowspan="{{ form.inactive_wg_constraint_count }}" >
-                                        Disabled for this meeting
-                                    </td>
-                                {% endif %}
-                                <td>{{ cname|title }}</td>
-                                <td><input type="text" value="{{ value }}" maxlength="255" class="wg_constraint" disabled><br>{{ field }} {{ field.label }}</td>
-                        </tr>
-                        {% endfor %}
-                    {% endif %}
-                    <tr>
-                        <td colspan="2">BOF Sessions:</td>
-                        <td>If the sessions can not be found in the fields above, please enter free form requests in the Special Requests field below.</td>
-                    </tr>
-                    </tbody>
-                </table>
-            </td>
-        </tr>
-
-        {% if not is_virtual %}
-
-            <tr class="bg2"><td>Resources requested:</td>
-                <td>
-                    {{ form.resources.errors }} {{ form.resources }}
-                </td>
-            </tr>
-            <tr class="bg1">
-                <td>Times during which this WG can <strong>not</strong> meet:<br>Please explain any selections in Special Requests below.</td>
-                 <!-- [html-validate-disable-block no-redundant-for -- FIXME: form renders with redundant for attributes] -->
-                <td>{{ form.timeranges.errors }}{{ form.timeranges }}</td>
-            </tr>
-            <tr class="bg2">
-                <td>
-                    Plan session adjacent with another WG:<br>
-                    (Immediately before or after another WG, no break in between, in the same room.)
-                </td>
-                <td>{{ form.adjacent_with_wg.errors }}{{ form.adjacent_with_wg }}</td>
-            </tr>
-            <tr class="bg1">
-                <td>
-                    Joint session with:<br>
-                    (To request one session for multiple WGs together.)
-                </td>
-                <td>{{ form.joint_with_groups_selector }}
-                    <button type="button" onclick="ietf_sessions.delete_last_joint_with_groups(); return 1;">Delete the last entry</button><br>
-                    {{ form.joint_with_groups.errors }}{{ form.joint_with_groups }}
-                </td>
-            </tr>
-            <tr class="bg1">
-                <td>
-                    Of the sessions requested by this WG, the joint session, if applicable, is:
-                </td>
-                <td>{{ form.joint_for_session.errors }}{{ form.joint_for_session }}</td>
-            </tr>
-
-        {% endif %}
-
-        <tr class="bg2">
-            <td>Special Requests:<br>&nbsp;<br>i.e. restrictions on meeting times / days, etc.<br>  (limit 200 characters)</td>
-            <td>{{ form.comments.errors }}{{ form.comments }}</td>
-        </tr>
-        </tbody>
-    </table>
-
-    <div class="button-group">
-        <ul>
-            <li><button type="submit" name="submit" value="Save"{% if is_locked %} disabled{% endif %}>Save</button></li>
-            <li><button type="button" onclick="history.back()">Back</button></li>
-        </ul>
-    </div>
-</form>
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/sessions_request_view.html b/ietf/secr/templates/includes/sessions_request_view.html
deleted file mode 100644
index 3854651d38..0000000000
--- a/ietf/secr/templates/includes/sessions_request_view.html
+++ /dev/null
@@ -1,63 +0,0 @@
-{% load ams_filters %}
-<table class="full-width">
-    <tbody>
-    <tr class="row1"><td>Working Group Name:</td><td>{{ group.name }} ({{ group.acronym }})</td></tr>
-    <tr class="row2"><td>Area Name:</td><td>{{ group.parent }}</td></tr>
-    <tr class="row1"><td>Number of Sessions Requested:</td><td>{% if session.third_session %}3{% else %}{{ session.num_session }}{% endif %}</td></tr>
-    {% if form %}
-        {% include 'includes/sessions_request_view_formset.html' with formset=form.session_forms group=group session=session only %}
-    {% else %}
-        {% include 'includes/sessions_request_view_session_set.html' with session_set=sessions group=group session=session only %}
-    {% endif %}
-    <tr class="row1"><td>Number of Attendees:</td><td>{{ session.attendees }}</td></tr>
-    <tr class="row2">
-        <td>Conflicts to Avoid:</td>
-        <td>
-            {% if session_conflicts.outbound %}
-                <table>
-                    <tbody>
-                    {% for conflict in session_conflicts.outbound %}
-                        <tr><td>{{ conflict.name|title }}: </td><td>{{ conflict.groups }}</td></tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            {% else %}<i>None</i>{% endif %}
-        </td>
-    </tr>
-    <tr class="row1">
-        <td>Other WGs that included {{ group }} in their conflict list:</td>
-        <td>{% if session_conflicts.inbound %}{{ session_conflicts.inbound }}{% else %}<i>None so far</i>{% endif %}</td>
-    </tr>
-    {% if not is_virtual %}
-        <tr class="row2">
-            <td>Resources requested:</td>
-            <td>{% if session.resources %}<ul>{% for resource in session.resources %}<li>{{ resource.desc }}</li>{% endfor %}</ul>{% else %}<i>None so far</i>{% endif %}</td>
-        </tr>
-    {% endif %}
-    <tr class="row1">
-        <td>People who must be present:</td>
-        <td>{% if session.bethere %}<ul>{% for person in session.bethere %}<li>{{ person }}</li>{% endfor %}</ul>{% else %}<i>None</i>{% endif %}</td>
-    </tr>
-    <tr class="row2">
-        <td>Can not meet on:</td>
-        <td>{% if session.timeranges_display %}{{ session.timeranges_display|join:', ' }}{% else %}No constraints{% endif %}</td>
-    </tr>
-    {% if not is_virtual %}
-        <tr class="row1">
-            <td>Adjacent with WG:</td>
-            <td>{{ session.adjacent_with_wg|default:'No preference' }}</td>
-        </tr>
-        <tr class="row2">
-            <td>Joint session:</td>
-            <td>
-                {% if session.joint_with_groups %}
-                    {{ session.joint_for_session_display }} with: {{ session.joint_with_groups }}
-                {% else %}
-                    Not a joint session
-                {% endif %}
-            </td>
-        </tr>
-    {% endif %}
-    <tr class="row1"><td>Special Requests:</td><td>{{ session.comments }}</td></tr>
-    </tbody>
-</table>
diff --git a/ietf/secr/templates/includes/sessions_request_view_formset.html b/ietf/secr/templates/includes/sessions_request_view_formset.html
deleted file mode 100644
index ff502dea30..0000000000
--- a/ietf/secr/templates/includes/sessions_request_view_formset.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load ams_filters %}{# keep this in sync with sessions_request_view_session_set.html #}
-{% for sess_form in formset %}{% if sess_form.cleaned_data and not sess_form.cleaned_data.DELETE %}
-  <tr class="row2">
-    <td>Session {{ forloop.counter }}:</td>
-    <td>
-      <dl>
-        <dt>Length</dt>
-        <dd>{{ sess_form.cleaned_data.requested_duration.total_seconds|display_duration }}</dd>
-        {% if sess_form.cleaned_data.name %}
-          <dt>Name</dt>
-          <dd>{{ sess_form.cleaned_data.name }}</dd>{% endif %}
-        {% if sess_form.cleaned_data.purpose.slug != 'regular' %}
-          <dt>Purpose</dt>
-          <dd>
-            {{ sess_form.cleaned_data.purpose }}
-            {% if sess_form.cleaned_data.purpose.timeslot_types|length > 1 %}({{ sess_form.cleaned_data.type }}
-              ){% endif %}
-          </dd>
-        {% endif %}
-      </dl>
-    </td>
-  </tr>
-  {% if group.features.acts_like_wg and forloop.counter == 2 and not is_virtual %}
-    <tr class="row2">
-      <td>Time between sessions:</td>
-      <td>{% if session.session_time_relation_display %}{{ session.session_time_relation_display }}{% else %}No
-        preference{% endif %}</td>
-    </tr>
-  {% endif %}
-{% endif %}{% endfor %}
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/sessions_request_view_session_set.html b/ietf/secr/templates/includes/sessions_request_view_session_set.html
deleted file mode 100644
index 1f953ae3a7..0000000000
--- a/ietf/secr/templates/includes/sessions_request_view_session_set.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load ams_filters %}{# keep this in sync with sessions_request_view_formset.html #}
-{% for sess in session_set %}
-  <tr class="row2">
-    <td>Session {{ forloop.counter }}:</td>
-    <td>
-      <dl>
-        <dt>Length</dt>
-        <dd>{{ sess.requested_duration.total_seconds|display_duration }}</dd>
-        {% if sess.name %}
-          <dt>Name</dt>
-          <dd>{{ sess.name }}</dd>{% endif %}
-        {% if sess.purpose.slug != 'regular' %}
-          <dt>Purpose</dt>
-          <dd>
-            {{ sess.purpose }}
-            {% if sess.purpose.timeslot_types|length > 1 %}({{ sess.type }}
-              ){% endif %}
-          </dd>
-        {% endif %}
-      </dl>
-    </td>
-  </tr>
-  {% if group.features.acts_like_wg and forloop.counter == 2 and not is_virtual %}
-    <tr class="row2">
-      <td>Time between sessions:</td>
-      <td>{% if session.session_time_relation_display %}{{ session.session_time_relation_display }}{% else %}No
-        preference{% endif %}</td>
-    </tr>
-  {% endif %}
-{% endfor %}
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/upload_footer.html b/ietf/secr/templates/includes/upload_footer.html
deleted file mode 100755
index cc7858e1f7..0000000000
--- a/ietf/secr/templates/includes/upload_footer.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul>
-<li><a href="https://www.ietf.org/instructions/meeting_materials_tool.html" target="_blank">Instructions</a>.</li>
-<li>If you require assistance in using this tool, or wish to report a bug, then please send a message to <a href="mailto:{{settings.SECRETARIAT_ACTION_EMAIL}}">ietf-action@ietf.org</a>.</li>
-<li>To submit your materials via email, please send agendas to <a href="mailto:agenda@ietf.org">agenda@ietf.org</a> and minutes/presentation slides to <a href="mailto:proceedings@ietf.org">proceedings@ietf.org</a>.</li>
-<li><b>Note:</b> Normal session materials materials management is now performed using the {% if meeting.number %}<a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">{% endif %}materials page{% if meeting.number %}</a>{% endif %}</li>
-</ul>
diff --git a/ietf/secr/templates/index.html b/ietf/secr/templates/index.html
new file mode 100644
index 0000000000..9ea7021279
--- /dev/null
+++ b/ietf/secr/templates/index.html
@@ -0,0 +1,31 @@
+{# Copyright The IETF Trust 2007-2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static %}
+{% load ietf_filters %}
+{% block title %}Secretariat Dashboard{% endblock %}
+{% block content %}
+    <h1>Secretariat Dashboard</h1>
+    <div class="secr-menu">
+        {% if user|has_role:"Secretariat" %}
+            <h2>IESG</h2>
+            <ul>
+                <li><a href="{% url 'ietf.secr.announcement.views.main' %}"><b>Announcement</b></a></li>
+                <li><a href="{% url 'ietf.secr.telechat.views.main' %}"><b>Telechat</b></a></li>
+            </ul>
+
+            <h2>IDs and WGs Process</h2>
+            <ul>
+                <li> <a href="{% url 'ietf.secr.rolodex.views.search' %}"><b>Rolodex</b></a></li>
+            </ul>
+
+            <h2>Meetings and Proceedings</h2>
+            <ul>
+                <li> <a href="{% url 'ietf.secr.meetings.views.main' %}"><b>Meeting Manager</b></a></li>
+            </ul>
+        {% else %}
+            <ul>
+                <li> <a href="{% url 'ietf.secr.announcement.views.main' %}"><b>Announcements</b></a></li>
+            </ul>
+        {% endif %}
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/main.html b/ietf/secr/templates/main.html
deleted file mode 100644
index dcda4718de..0000000000
--- a/ietf/secr/templates/main.html
+++ /dev/null
@@ -1,81 +0,0 @@
-{% extends "base_site.html" %}
-{% load ietf_filters %}
-
-{% block content %}
-    <div id="content-main">
-
-        {% if user|has_role:"Secretariat" %}
-
-            <table class="menu">
-                <tbody>
-                <tr>
-                    <td>
-                        <h2>IESG</h2>
-                        <ul>
-                        <li> <a href="{% url 'ietf.secr.announcement.views.main' %}"><b>Announcement</b></a></li>
-                        <li> <a href="{% url 'ietf.secr.telechat.views.main' %}"><b>Telechat</b></a></li>
-                        <li> <a href="{% url 'ietf.secr.console.views.main' %}"><b>Console</b></a></li>
-                        </ul>
-                    </td>
-                    <td>
-                        <h2>IDs and WGs Process</h2>
-                        <ul>
-                        <li> <a href="{% url "ietf.secr.areas.views.list_areas" %}"><b>Areas</b></a></li>
-                        <li> <a href="{% url 'ietf.secr.groups.views.search' %}"><b>Groups</b></a></li>
-                        <li> <a href="{% url 'ietf.secr.rolodex.views.search' %}"><b>Rolodex</b></a></li>
-                        <li> <a href="{% url 'ietf.secr.roles.views.main' %}"><b>Roles</b></a></li>
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <h2>Meetings and Proceedings</h2>
-                        <ul>
-                        <li> <a href="{% url "ietf.secr.sreq.views.main" %}"><b>Session Requests</b></a></li>
-                        <li> <a href="{% url 'ietf.secr.proceedings.views.main' %}"><b>Meeting Materials Manager (Proceedings)</b></a></li>
-                        <li> <a href="{% url "ietf.secr.meetings.views.main" %}"><b>Meeting Manager</b></a></li>
-                        <li> <a href="{% url "ietf.secr.meetings.views.blue_sheet_redirect" %}"><b>Blue Sheets</b></a></li>
-                        </ul>
-                    </td>
-                    <td>
-                        <h2>IPR</h2>
-                        <ul>
-                        <li> <a href="{% url 'ietf.ipr.views.admin' state='pending' %}"><b>IPR Admin</b></a></li>
-                        </ul>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-
-        {% else %}
-
-            <table class="menu">
-                <tbody>
-                <tr>
-                    <td>
-                        <h2>Section 1</h2>
-                        <ul>
-                        <li> <a href="{% url "ietf.secr.sreq.views.main" %}"><b>Session Requests</b></a></li>
-                        <li> <a href="{% url 'ietf.secr.proceedings.views.main' %}"><b>Meeting Material Manager</b></a></li>
-                        <li> <a href="{% url 'ietf.secr.announcement.views.main' %}"><b>Announcements</b></a></li>
-                        </ul>
-                    </td>
-                    <td>
-                        <h2>Section 2</h2>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <h2>Section 3</h2>
-                    </td>
-                    <td>
-                        <h2>Section 4</h2>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-
-        {% endif %}
-
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/meetings/add.html b/ietf/secr/templates/meetings/add.html
index 12b5cd47b6..b2cc2617dc 100644
--- a/ietf/secr/templates/meetings/add.html
+++ b/ietf/secr/templates/meetings/add.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Meetings - Add{% endblock %}
 
@@ -19,7 +19,7 @@ <h2>Proceedings - Add</h2>
         <form id="proceedings-add-form" enctype="multipart/form-data" method="post">{% csrf_token %}
             <table id="proceedings-add-table">
                 <tbody>
-                <!-- [html-validate-disable-block element-required-attributes, no-redundant-for -- FIXME: as_table renders without scope] -->
+                <!-- [html-validate-disable-block wcag/h63, no-redundant-for -- FIXME: as_table renders without scope] -->
                 {{ form.as_table }}
                 </tbody>
             </table>
diff --git a/ietf/secr/templates/meetings/base_rooms_times.html b/ietf/secr/templates/meetings/base_rooms_times.html
index dc08e9eb50..263418fabf 100644
--- a/ietf/secr/templates/meetings/base_rooms_times.html
+++ b/ietf/secr/templates/meetings/base_rooms_times.html
@@ -1,11 +1,9 @@
 {% extends "base_site_bootstrap.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Meetings{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}">
-    <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
     <script src="{% static 'secr/js/utils.js' %}"></script>
     <script src="{% static 'secr/js/dynamic_inlines.js' %}"></script>
 {% endblock %}
diff --git a/ietf/secr/templates/meetings/blue_sheet.html b/ietf/secr/templates/meetings/blue_sheet.html
deleted file mode 100644
index d67efd9f63..0000000000
--- a/ietf/secr/templates/meetings/blue_sheet.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Meetings - Blue Sheet{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../../">Meetings</a>
-    &raquo; <a href="../">{{ meeting.number }}</a>
-    &raquo; Blue Sheets
-{% endblock %}
-
-{% block content %}
-
-    <div  class="module">
-        <h2>IETF {{ meeting.number }} - Blue Sheet</h2>
-
-        <p>Use this to generate blue sheets for meeting sessions.</p>
-        <ul class="none">
-            <li>
-                <form class="d-inline" method="post" action="{% url "ietf.secr.meetings.views.blue_sheet_generate" meeting_id=meeting.number%}">{% csrf_token %}
-                    <button type="submit">Generate Blue Sheets</button>
-                </form>
-                &nbsp;&nbsp;Last run:
-                {% if last_run %}
-                    {{ last_run }}
-                {% else %}
-                    Never
-                {% endif %}
-            </li>
-        </ul>
-        <p>Use this to download the blue sheets from the server.</p>
-        <ul class="none">
-            <li>
-                <button type="button" onclick="window.location='{{ url }}'">Download Blue Sheets</button>
-            </li>
-        </ul>
-
-        <hr>
-        <p>
-            Use the session details page for a group to upload scanned bluesheets. The session details pages for a group can be reached from the meeting's <a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">materials page</a>.
-        </p>
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/meetings/edit_meeting.html b/ietf/secr/templates/meetings/edit_meeting.html
index 0d7159346a..474373dbee 100644
--- a/ietf/secr/templates/meetings/edit_meeting.html
+++ b/ietf/secr/templates/meetings/edit_meeting.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Meetings - Edit{% endblock %}
 
@@ -20,7 +20,7 @@
             <h2>Meetings - Edit</h2>
             <table id="proceedings-edit-table">
                 <tbody>
-                <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                 {{ form.as_table }}
                 </tbody>
             </table>
diff --git a/ietf/secr/templates/meetings/main.html b/ietf/secr/templates/meetings/main.html
index e4cfa5ce8e..ff110dd978 100755
--- a/ietf/secr/templates/meetings/main.html
+++ b/ietf/secr/templates/meetings/main.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Meetings{% endblock %}
 
@@ -30,7 +30,7 @@ <h3><b>Select a meeting to manage</b></h3>
             <form method="post">{% csrf_token %}
                 <table>
                     <tbody>
-                     <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                     <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                     {{ form.as_table }}
                     </tbody>
                 </table>
diff --git a/ietf/secr/templates/meetings/misc_session_edit.html b/ietf/secr/templates/meetings/misc_session_edit.html
index af4d1bdbd7..69f935212d 100755
--- a/ietf/secr/templates/meetings/misc_session_edit.html
+++ b/ietf/secr/templates/meetings/misc_session_edit.html
@@ -8,7 +8,7 @@ <h3>Session: {{ slot.name }}</h3>
         <form id="misc-session-edit-form" enctype="multipart/form-data" action="." method="post">{% csrf_token %}
             <table class="full-width amstable">
                 <tbody>
-                <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                 {{ form.as_table }}
                 </tbody>
             </table>
diff --git a/ietf/secr/templates/meetings/misc_sessions.html b/ietf/secr/templates/meetings/misc_sessions.html
index 9f9eb0f7aa..a5a48266a2 100644
--- a/ietf/secr/templates/meetings/misc_sessions.html
+++ b/ietf/secr/templates/meetings/misc_sessions.html
@@ -1,7 +1,7 @@
 {% extends "meetings/base_rooms_times.html" %}
-{% load agenda_custom_tags %}
+{% load agenda_custom_tags tz %}
 {% block subsection %}
-
+{% timezone meeting.time_zone %}
     <div class="module">
         <h2>TimeSlots</h2>
 
@@ -57,7 +57,7 @@ <h3>No timeslots exist for this meeting. Add rooms with the "duplicate timeslots
             <form id="timeslot-form" method="post">{% csrf_token %}
                 <table class="full-width amstable">
                     <tbody>
-                    <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                    <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                     {{ form.as_table }}
                     <tr><td colspan="2" class="text-center"><button type="submit" name="submit">Add</button></td></tr>
                     </tbody>
@@ -73,7 +73,7 @@ <h3>No timeslots exist for this meeting. Add rooms with the "duplicate timeslots
 
     </div> <!-- module -->
 
-
+{% endtimezone %}
 {% endblock %}
 
 {% block extrahead %}
diff --git a/ietf/secr/templates/meetings/notifications.html b/ietf/secr/templates/meetings/notifications.html
index bf7099577e..dbe66ff283 100644
--- a/ietf/secr/templates/meetings/notifications.html
+++ b/ietf/secr/templates/meetings/notifications.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Meetings{% endblock %}
 
diff --git a/ietf/secr/templates/meetings/regular_session_edit.html b/ietf/secr/templates/meetings/regular_session_edit.html
index 479cef8af8..9993858be1 100644
--- a/ietf/secr/templates/meetings/regular_session_edit.html
+++ b/ietf/secr/templates/meetings/regular_session_edit.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static tz %}
 
 {% block title %}Meetings{% endblock %}
 
@@ -19,7 +19,7 @@ <h2>Edit Session</h2>
 
         <form id="meetings-schedule-form" method="post">{% csrf_token %}
             <div class="inline-related{% if forloop.last %} last-related{% endif %}">
-                <table class="full-width amstable">
+                <table class="full-width amstable">{% timezone meeting.time_zone %}
                     <tbody>
                     <tr>
                         <th scope="row">Day:</th>
@@ -37,10 +37,10 @@ <h2>Edit Session</h2>
                         <th scope="row">Status:</th>
                         <td>{{ current_status_name }}</td>
                     </tr>
-                     <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                     <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                     {{ form.as_table }}
                 </tbody>
-                </table>
+                {% endtimezone %}</table>
             </div> <!-- inline-related -->
 
         <div class="button-group">
diff --git a/ietf/secr/templates/meetings/session_schedule_notification.txt b/ietf/secr/templates/meetings/session_schedule_notification.txt
index 95cbf35351..5ad129f705 100644
--- a/ietf/secr/templates/meetings/session_schedule_notification.txt
+++ b/ietf/secr/templates/meetings/session_schedule_notification.txt
@@ -1,4 +1,4 @@
-Dear {{ to_name }},
+{% load tz %}{% timezone meeting.time_zone %}Dear {{ to_name }},
 
 The session(s) that you have requested have been scheduled.
 Below is the scheduled session information followed by
@@ -16,4 +16,4 @@ iCalendar: {{ baseurl }}{% url "ietf.meeting.views.agenda_ical" num=meeting.numb
 
 Request Information:
 
-{% include "includes/session_info.txt" %}
+{% include "includes/session_info.txt" %}{% endtimezone %}
diff --git a/ietf/secr/templates/meetings/sessions.html b/ietf/secr/templates/meetings/sessions.html
index 03b4d8489b..e774d83ca5 100644
--- a/ietf/secr/templates/meetings/sessions.html
+++ b/ietf/secr/templates/meetings/sessions.html
@@ -1,5 +1,5 @@
 {% extends "meetings/base_rooms_times.html" %}
-{% load django_bootstrap5 %}
+{% load django_bootstrap5 tz %}
 
 {% block subsection %}
 
@@ -18,7 +18,7 @@ <h2>Sessions</h2>
                     <th scope="col"></th>
                 </tr>
             </thead>
-            <tbody>
+            <tbody>{% timezone meeting.time_zone %}
                 {% for session in sessions %}
                     <tr>
                         <td>{{ session.group.acronym }}</td>
@@ -46,7 +46,7 @@ <h2>Sessions</h2>
                         </td>
                     </tr>
                 {% endfor %}
-            </tbody>
+            {% endtimezone %}</tbody>
         </table>
     </div> <!-- module -->
 
diff --git a/ietf/secr/templates/meetings/times.html b/ietf/secr/templates/meetings/times.html
index 0ec175f030..559e2fd772 100644
--- a/ietf/secr/templates/meetings/times.html
+++ b/ietf/secr/templates/meetings/times.html
@@ -1,5 +1,5 @@
 {% extends "meetings/base_rooms_times.html" %}
-
+{% load tz %}
 {% block subsection %}
 
     <div class="module">
@@ -16,7 +16,7 @@ <h2>Times</h2>
                         <th scope="col"></th>
                     </tr>
                 </thead>
-                <tbody>
+                <tbody>{% timezone meeting.time_zone %}
                     {% for item in times %}
                         <tr class="{% cycle 'row1' 'row2' %}">
                             <td>{{ item.time|date:"D M d" }}</td>
@@ -26,7 +26,7 @@ <h2>Times</h2>
                             <td><a href="{% url "ietf.secr.meetings.views.times_delete" meeting_id=meeting.number schedule_name=schedule.name time=item.time|date:"Y:m:d:H:i" %}">Delete</a></td>
                         </tr>
                     {% endfor %}
-                </tbody>
+                {% endtimezone %}</tbody>
             </table>
         {% else %}
             <h3>No timeslots exist for this meeting. Add rooms with the "duplicate timeslots" option enabled to copy timeslots from the last meeting.</h3>
diff --git a/ietf/secr/templates/meetings/times_edit.html b/ietf/secr/templates/meetings/times_edit.html
index 1f52e34f10..9718d73d9b 100755
--- a/ietf/secr/templates/meetings/times_edit.html
+++ b/ietf/secr/templates/meetings/times_edit.html
@@ -8,7 +8,7 @@ <h2>Meeting - {{ meeting }}</h2>
         <form id="times-edit-form" enctype="multipart/form-data" action="." method="post">{% csrf_token %}
             <table class="full-width amstable">
                 <tbody>
-                  <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                  <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                  {{ form.as_table }}
                  </tbody>
             </table>
diff --git a/ietf/secr/templates/meetings/view.html b/ietf/secr/templates/meetings/view.html
index d552d38dca..89bd8f7e03 100644
--- a/ietf/secr/templates/meetings/view.html
+++ b/ietf/secr/templates/meetings/view.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Meetings{% endblock %}
 
@@ -37,7 +37,6 @@ <h2>IETF  {{ meeting.number }} - View</h2>
             <ul>
                 <li><button type="button" onclick="window.location='{% url "ietf.secr.meetings.views.edit_meeting" meeting_id=meeting.number %}'">Edit</button></li>
                 <li><button type="button" onclick="window.location='{% url "ietf.secr.meetings.views.notifications" meeting_id=meeting.number %}'">Notifications</button></li>
-                <li><button type="button" onclick="window.location='{% url "ietf.secr.meetings.views.blue_sheet" meeting_id=meeting.number %}'">Blue Sheets</button></li>
                 <li><button type="button" onclick="window.location='{% url "ietf.meeting.views.list_schedules" num=meeting.number %}'">Agenda List</button></li>
                 <li>
                     <!-- [html-validate-disable-block wcag/h32 -- FIXME: no submit button] -->
diff --git a/ietf/secr/templates/proceedings/audio_import_warning.txt b/ietf/secr/templates/proceedings/audio_import_warning.txt
deleted file mode 100644
index 322a43f5fd..0000000000
--- a/ietf/secr/templates/proceedings/audio_import_warning.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-WARNING:
-
-After the last meeting session audio file import there are {{ unmatched_files|length }}
-file(s) that were not matched to a timeslot.
-
-{% for file in unmatched_files %}{{ file }}
-{% endfor %}
-
diff --git a/ietf/secr/templates/proceedings/interim_directory.html b/ietf/secr/templates/proceedings/interim_directory.html
deleted file mode 100644
index 66d0b9714c..0000000000
--- a/ietf/secr/templates/proceedings/interim_directory.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "base_site.html" %}
-
-{% block content %}
-
-    <h2>Interim Meeting Proceedings</h2>
-    <table id="interim-directory-table">
-        <tr>
-            <td><a href="https://www.ietf.org/meeting/interim/proceedings.html">Date</a></td>
-            <td><a href="https://www.ietf.org/meeting/interim/proceedings-bygroup.html">Group</a></td>
-            <td></td>
-            <td></td>
-        </tr>
-        {% for meeting in meetings %}
-            <tr class="{% cycle 'row1' 'row2' %}">
-                <td class="text-start text-nowrap">{{ meeting.date }}</td>
-                <td><a href="{% url 'ietf.group.views.group_home' acronym=meeting.group.acronym %}">{{ meeting.group.acronym }}</a></td>
-                {% if meeting.schedule %}
-                    <td class="text-center"><a href="{{ meeting.schedule.get_absolute_url }}">Agenda</a></td>
-                {% else %}
-                    <td class="text-center">Agenda</td>
-                {% endif %}
-                {% if meeting.minutes %}
-                    <td class="text-center"><a href="{{ meeting.minutes.get_absolute_url }}">Minutes</a></td>
-                {% else %}
-                    <td class="text-center">Minutes</td>
-                {% endif %}
-                {% if meeting.get_proceedings_url %}
-                    <td><a href="{{ meeting.get_proceedings_url }}">Proceedings</a></td>
-                {% else %}
-                    <td>Proceedings</td>
-                {% endif %}
-            </tr>
-        {% endfor %}
-    </table>
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/proceedings/main.html b/ietf/secr/templates/proceedings/main.html
deleted file mode 100644
index a9689430a9..0000000000
--- a/ietf/secr/templates/proceedings/main.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{% extends "base_site.html" %}
-{% load ietf_filters %}
-{% load staticfiles %}
-{% block title %}Proceeding manager{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Proceedings
-{% endblock %}
-
-{% block content %}
-
-    <div  class="module" >
-        <h2>Proceedings</h2>
-        <div id="proceedings-left-col">
-            <table id="proceedings-list-table" class="full-width{% if user|has_role:"Secretariat" %} secretariat{% endif %}">
-                <thead>
-                    <tr>
-                        <th scope="col">IETF Meeting</th>
-                    </tr>
-                </thead>
-                {% if meetings %}
-                    <tbody>
-                        {% for meeting in meetings %}
-                            <tr class="{% cycle 'row1' 'row2' %}{% if meeting.get_submission_correction_date < today %} frozen{% else %} open{% endif %}">
-                                <td>
-                                    <a href="{% url 'ietf.secr.proceedings.views.select' meeting_num=meeting.number %}">{{ meeting.number }}</a>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                {% endif %}
-            </table>
-            {% if user|has_role:"Secretariat" %}
-                <div class="button-group">
-                    <ul id="proceedings-meeting-buttons">
-                        <li><button type="button" onclick="window.location='{% url "ietf.secr.meetings.views.add" %}'">Add</button></li>
-                    </ul>
-                </div> <!-- button-group -->
-            {% endif %}
-        </div>
-
-        <div id="proceedings-right-col">
-            <div class="interim-scroll">
-                <table id="proceedings-interim-table" class="full-width{% if user|has_role:"Secretariat" %} secretariat{% endif %}">
-                    <thead>
-                        <tr>
-                            <th scope="col">Interim Meeting</th>
-                        </tr>
-                    </thead>
-                    {% if interim_meetings %}
-                        <tbody>
-                            {% for meeting in interim_meetings %}
-
-                                <tr class="{% cycle 'row1' 'row2' %}">
-                                    <td>{{ meeting.group.acronym }}</td>
-                                    <td><a href="{% url "ietf.meeting.views.session_details" num=meeting.number acronym=meeting.group.acronym %}">{{ meeting.date }}</a></td>
-                                </tr>
-                            {% endfor %}
-                        </tbody>
-                    {% endif %}
-                </table>
-            </div> <!-- scroll -->
-            <div class="button-group">
-                <ul id="proceedings-interim-buttons">
-                    <li><button type="button" onclick="window.location='{% url "ietf.meeting.views.interim_request" %}'">Request Interim Meeting</button></li>
-                </ul>
-            </div> <!-- button-group -->
-        </div>
-
-        <br>
-        {% if not user|has_role:"Secretariat" %}
-            <br>
-            <hr>
-            <p>The list(s) above includes those meetings which you can upload materials for.  Click on the meeting number or interim meeting date to continue.</p>
-        {% endif %}
-
-
-        <div class="button-group">
-            <ul id="proceedings-button-list">
-                <li><button type="button" onclick="window.location='../'">Back</button></li>
-            </ul>
-        </div> <!-- button-group -->
-    </div> <!-- module -->
-
-{% endblock %}
-
-{% block footer-extras %}
-    {% include "includes/upload_footer.html" %}
-{% endblock %}
-~
-~
-~
\ No newline at end of file
diff --git a/ietf/secr/templates/proceedings/recording.html b/ietf/secr/templates/proceedings/recording.html
deleted file mode 100755
index 906218f971..0000000000
--- a/ietf/secr/templates/proceedings/recording.html
+++ /dev/null
@@ -1,121 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Proceedings{% endblock %}
-
-{% block extrastyle %}{{ block.super }}
-    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}">
-    <link rel="stylesheet" href="{% static 'ietf/css/select2.css' %}">
-{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
-    <script src="{% static 'ietf/js/select2.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    {% if meeting.type_id == "interim" %}
-        &raquo; <a href="{% url 'ietf.secr.proceedings.views.main' %}">Proceedings</a>
-        &raquo; {{ meeting }}
-    {% else %}
-        &raquo; <a href="{% url 'ietf.secr.proceedings.views.main' %}">Proceedings</a>
-        &raquo; <a href="{% url 'ietf.secr.proceedings.views.select' meeting_num=meeting.number %}">{{ meeting.number }}</a>
-        &raquo; Recording
-    {% endif %}
-{% endblock %}
-
-{% block content %}
-
-    <div class="module interim-container">
-
-        <h2>Recording Metadata</h2>
-        <form id="recording-form" enctype="multipart/form-data" action="." method="post">{% csrf_token %}
-            <table class="center" id="proceedings-upload-table">
-                <tbody>
-                <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
-                {{ form.as_table }}
-                </tbody>
-            </table>
-
-            <div class="button-group">
-                <ul>
-                    <li><button type="submit" name="submit" value="Submit">Submit</button></li>
-                    <li><button type="button" onclick="window.location='../'">Back</button></li>
-                </ul>
-            </div> <!-- button-group -->
-
-        </form>
-
-        <div class="inline-related">
-            <h2>{{ meeting }} - Recordings</h2>
-            <table class="center">
-                <thead>
-                    <tr>
-                        <th scope="col">Group</th>
-                        <th scope="col">Session</th>
-                        <th scope="col">Name</th>
-                        <th scope="col">URL</th>
-                        <th scope="col">Edit</th>
-                    </tr>
-                </thead>
-                {% if sessions %}
-                    <tbody>
-
-                        {% for session in sessions %}
-                            {% if session.recordings %}
-                                {% for recording in session.recordings %}
-                                    <tr>
-                                        <td>{{ session.group.acronym }}</td>
-                                        <td>{{ session.official_timeslotassignment.timeslot.time|date:"m-d H:i" }}</td>
-                                        <td class="document-name" >{{ recording.name }}</td>
-                                        <td><a href="{{ recording.get_href }}">{{ recording.get_href }}</a></td>
-                                        <td><a href="{% url 'ietf.secr.proceedings.views.recording_edit' meeting_num=meeting.number name=recording.name %}">Edit</a></td>
-                                    </tr>
-                                {% endfor %}
-                            {% else %}
-                                <tr>
-                                    <td>{{ session.group.acronym }}</td>
-                                    <td>{{ session.official_timeslotassignment.timeslot.time|date:"m-d H:i" }}</td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                            {% endif %}
-
-                        {% endfor %}
-
-                    </tbody>
-                {% endif %}
-            </table>
-        </div> <!-- inline-group -->
-
-        {% if unmatched_recordings %}
-            <div class="inline-related">
-                <h2>Unmatched Recording Files</h2>
-                <table class="center">
-                    <thead>
-                        <tr>
-                            <th scope="col">Filename</th>
-                        </tr>
-                    </thead>
-                    {% if unmatched_recordings %}
-                        <tbody>
-                            {% for file in unmatched_recordings %}
-                                <tr>
-                                    <td>{{ file }}</td>
-                                </tr>
-                            {% endfor %}
-                        </tbody>
-                    {% endif %}
-                </table>
-            </div> <!-- inline-group -->
-        {% endif %}
-
-    </div> <!-- module -->
-
-
-{% endblock %}
-
-{% block footer-extras %}
-    {% include "includes/upload_footer.html" %}
-{% endblock %}
diff --git a/ietf/secr/templates/proceedings/recording_edit.html b/ietf/secr/templates/proceedings/recording_edit.html
deleted file mode 100755
index 83587c6158..0000000000
--- a/ietf/secr/templates/proceedings/recording_edit.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-{% block title %}Edit Recording{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    {% if meeting.type_id == "interim" %}
-        &raquo; <a href="{% url 'ietf.secr.proceedings.views.main' %}">Proceedings</a>
-        &raquo; {{ meeting }}
-        &raquo; <a href="{% url 'ietf.secr.proceedings.views.recording' meeting_num=meeting.number %}">Recording</a>
-        &raquo; {{ recording.name }}
-    {% else %}
-        &raquo; <a href="{% url 'ietf.secr.proceedings.views.main' %}">Proceedings</a>
-        &raquo; <a href="{% url 'ietf.secr.proceedings.views.select' meeting_num=meeting.number %}">{{ meeting.number }}</a>
-        &raquo; <a href="{% url 'ietf.secr.proceedings.views.recording' meeting_num=meeting.number %}">Recording</a>
-        &raquo; {{ recording.name }}
-    {% endif %}
-{% endblock %}
-
-{% block content %}
-
-    <div class="module interim-container">
-        <h2>Recording Metadata for Group: {{ form.instance.group.acronym }} | Session: {{ form.instance.session_set.first.official_scheduledsession.timeslot.time }}</h2>
-        <p><h3>Edit Recording Metadata:</h3></p>
-        <form id="recording-form" method="post">{% csrf_token %}
-            <table>
-                <tbody>
-                <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
-                {{ form.as_table }}
-                </tbody>
-            </table>
-
-            {% include "includes/buttons_save_cancel.html" %}
-
-        </form>
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/proceedings/report_id_activity.txt b/ietf/secr/templates/proceedings/report_id_activity.txt
deleted file mode 100644
index 6f2aaf097a..0000000000
--- a/ietf/secr/templates/proceedings/report_id_activity.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-IETF Activity since last IETF Meeting
---------------------
-
-IETF Activity since last IETF Meeting ({{ meeting.city }})
-
-{{ new|stringformat:"3s" }}    New I-Ds   ({{ updated }} of which were updated, some ({{ updated_more }}) more than once)
-{{ total_updated|stringformat:"3s" }}    I-Ds were updated   (Some more than once)
-{{ last_call|stringformat:"3s" }}    I-Ds Last Called
-{{ approved|stringformat:"3s" }}    I-Ds approved for publication
-
-In the final 4 weeks before meeting
-
-{{ ff_new_count|stringformat:"3s" }}    New I-Ds were received - {{ ff_new_percent }} of total newbies since last meeting
-{{ ff_update_count|stringformat:"3s" }}    I-Ds were updated - {{ ff_update_percent }} of total updated since last meeting
-
-		Week1	0	%
-		Week2	0	%
-		Week3	0	%
-		Week4	0	%
-
-The IESG Secretary.
diff --git a/ietf/secr/templates/proceedings/report_progress_report.txt b/ietf/secr/templates/proceedings/report_progress_report.txt
deleted file mode 100644
index 8c3d87548e..0000000000
--- a/ietf/secr/templates/proceedings/report_progress_report.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-{% load ams_filters %}
-                       IETF Activity since last IETF Meeting
-                       {{ start_date }} to {{ end_date }}
-
- 1) {{ action_events.count }} IESG Protocol and Document Actions this period
-{% for event in action_events %}
-    {{ event.doc.title }} ({{ event.doc.intended_std_level }})
-{% endfor %}
-
- 2) {{ lc_events.count }} IESG Last Calls issued to the IETF this period
-{% for event in lc_events %}
-    {{ event.doc.title }}
-        {{ event.doc.file_tag|safe }}  ({{ event.doc.intended_std_level }})
-{% endfor %}
-
- 3) {{ new_groups.count }} New Working Group(s) formed this period
- {% for group in new_groups %}
-    {{ group }} ({{ group.acronym }})
- {% endfor %}
- 
- 4) {{ concluded_groups.count }} Working Group(s) concluded this period
- {% for group in concluded_groups %}
-    {{ group }} ({{ group.acronym }})
- {% endfor %}
- 
- 5) {{ new_docs|length }} new or revised Internet-Drafts this period
- 
- (o - Revised Internet-Draft; + - New Internet-Draft)
-
-   WG          I-D Title              <Filename>
- -------    ------------------------------------------
- {% for doc in new_docs %}
- ({{ doc.group.acronym|stringformat:"8s" }})  {% if doc.rev == "00" %}  +  {% else %}  o  {% endif %}{{ doc.title }}
-                   {{ doc.file_tag|safe }}
- {% endfor %}
- 
- 6) {{ rfcs.count }} RFC(s) produced this period
- 
-    S - Standard; PS - Proposed Standard; DS - Draft Standard;
-    B - Best Current Practices; E - Experimental; I - Informational
-
- RFC    Stat    WG       Published         Title
--------  -- ----------   ----------   -----------------------------------------
-{% for event in rfcs %}
-{{ event.doc.canonical_name|upper }}  {{ event.doc.intended_std_level.name|abbr_status|stringformat:"2s" }} ({{ event.doc.group.acronym|stringformat:"8s" }})   {{ event.time|date:"M d" }}       {{ event.doc.title }}
-{% endfor %}
-
-    {{ counts.std }} Standards Track;   {{ counts.bcp }} BCP;   {{ counts.exp }} Experimental;   {{ counts.inf }} Informational 
diff --git a/ietf/secr/templates/proceedings/select.html b/ietf/secr/templates/proceedings/select.html
deleted file mode 100755
index e2ac7e50bf..0000000000
--- a/ietf/secr/templates/proceedings/select.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "base_site.html" %}
-{% load ietf_filters %}
-{% load staticfiles %}
-{% block title %}Proceedings{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="{% url 'ietf.secr.proceedings.views.main' %}">Proceedings</a>
-    &raquo; {{ meeting.number }}
-{% endblock %}
-
-{% block instructions %}
-    <a href="https://www.ietf.org/instructions/meeting_materials_tool.html" target="_blank">Instructions</a>
-{% endblock %}
-
-{% block content %}
-
-    <div class="module interim-container">
-
-        <div class="inline-related">
-            <h2>Secretariat Only Functions</h2>
-            <div id="private-functions">
-
-                {% include "includes/proceedings_functions.html" %}
-
-            </div> <!-- private-functions -->
-        </div> <!-- inline-group -->
-
-    </div> <!-- module -->
-
-{% endblock %}
-
-{% block footer-extras %}
-    {% include "includes/upload_footer.html" %}
-{% endblock %}
diff --git a/ietf/secr/templates/proceedings/status.html b/ietf/secr/templates/proceedings/status.html
deleted file mode 100644
index f4b1160c55..0000000000
--- a/ietf/secr/templates/proceedings/status.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-{% block title %}Proceedings - Status{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../../">Proceedings</a>
-    &raquo; <a href="../">{{ meeting.meeting_num }}</a>
-    &raquo; Status
-{% endblock %}
-
-{% block content %}
-
-
-    <ul class="errorlist"><li>Changing one of the status below will result in changing the status of Proceedings {{ meeting.meeting_num }}. </li></ul>
-
-    <div class="module">
-        <h2>IETF  {{ meeting.meeting_num }}</h2>
-        <table class="center">
-            <form action="modify/" method="post">{% csrf_token %}
-                <tr>
-                    <input type="hidden" name="frozen" value="{{ proceeding.frozen }}">
-                    {% if not proceeding.frozen %}
-                        <tr>
-                            <td>Active Proceeding</td>
-                            <td><button type="submit" name="submit">Freeze</button></td>
-                    {% endif %}
-                    {% if proceeding.frozen %}
-                        <tr>
-                            <td>Frozen Proceeding</td>
-                            <td><button type="submit" name="submit">Activate</button></td>
-                    {% endif %}
-                </tr>
-            </form>
-        </table>
-
-        <div class="button-group">
-            <ul>
-                <li><button type="button" onclick="history.go(-1);return true">Back</button></li>
-            </ul>
-        </div> <!-- button-group -->
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/proceedings/view.html b/ietf/secr/templates/proceedings/view.html
deleted file mode 100644
index c21d5c94b0..0000000000
--- a/ietf/secr/templates/proceedings/view.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-{% block title %}Proceedings - View{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../">Proceedings</a>
-    &raquo; {{ meeting.number }}
-{% endblock %}
-
-{% block content %}
-
-    <div class="module">
-        <h2>IETF  {{meeting.number}} Meeting - View</h2>
-        {% if meeting.frozen == 1 %}
-            <ul class="errorlist"><li> THIS IS A FROZEN PROCEEDING</li></ul>
-        {% endif %}
-        <table class="full-width" id="proceedings-view-first-col">
-            <tbody>
-            <tr><td>Meeting Start Date:</td><td> {{ meeting.date }}</td></tr>
-            <tr><td>Meeting End Date:</td><td> {{ meeting.end_date }} </td></tr>
-            <tr><td>Meeting City:</td><td> {{ meeting.city }} </td></tr>
-            <tr><td>Meeting Country:</td><td> {{ meeting.country }} </td></tr>
-            </tbody>
-        </table>
-
-        <div class="inline-related">
-            <h2>Dates</h2>
-            <table class="full-width" id="proceedings-view-first-col">
-                <tbody>
-                <tr><td>Submission Start Date:</td><td> {{ meeting.get_submission_start_date }} </td></tr>
-                <tr><td>Submission Cut Off Date:</td><td> {{ meeting.get_submission_cut_off_date }} </td></tr>
-                <tr><td>Submission Correction Cut Off Date:</td><td> {{ meeting.get_submission_correction_date }} </td></tr>
-                <tr><td>Progress Report Start:</td><td> {{ meeting.pr_from_date }}  </td></tr>
-                <tr><td>Progress Report End:</td><td> {{ meeting.pr_to_date }} </td></tr>
-                </tbody>
-            </table>
-        </div><!-- inline-related-->
-
-        <div class="button-group">
-            {% if meeting.frozen == 0 %}
-                <ul>
-                    <li><button type="button" onclick="window.location='{% url 'ietf.secr.proceedings.views.select' meeting_num=meeting.number %}'">Upload Materials</button></li>
-                    <li><button type="button" onclick="window.location='convert/'">Convert Materials</button></li>
-                    <li><button type="button" onclick="window.location='status/'">Proceedings {{ meeting.number }} Status</button></li>
-                </ul>
-            {% endif %}
-            {% if meeting.frozen == 1 %}
-                <ul>
-                    <li><button type="button" onclick="window.location='status/'">Proceedings {{ meeting.number }} Status</button></li>
-                </ul>
-            {% endif %}
-        </div> <!-- button-group -->
-    </div> <!-- module -->
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/proceedings/wait.html b/ietf/secr/templates/proceedings/wait.html
deleted file mode 100644
index 9590f78541..0000000000
--- a/ietf/secr/templates/proceedings/wait.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-{% block title %}Proceeding manager{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Proceedings
-{% endblock %}
-
-{% block content %}
-
-    <div  class="module" >
-        <h2>Proceedings</h2>
-        <hr>
-        <h2>{{ message }}</h2>
-        <img class="loading" src="{% static "secr/images/ajax-loader.webp" %}" alt="loading...">
-    </div> <!-- module -->
-
-{% endblock %}
-
-{% block footer-extras %}
-    {% include "includes/upload_footer.html" %}
-{% endblock %}
-~
-~
-~
-
diff --git a/ietf/secr/templates/roles/main.html b/ietf/secr/templates/roles/main.html
deleted file mode 100755
index 88be7cdccf..0000000000
--- a/ietf/secr/templates/roles/main.html
+++ /dev/null
@@ -1,84 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Roles{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}">
-    <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-
-    <script>
-        $(document).ready(function() {
-            $.ajaxSetup ({
-                cache: false
-            });
-
-            $('#id_group').change(function(){
-                var loadUrl = "/secr/roles/ajax/get-roles/" + $(this).val() + "/";
-                var ajax_load = '<img class="loading" src="{% static "secr/images/ajax-loader.webp" %}" alt="loading...">';
-                var text = $(this).val();
-                $("#id_group_acronym").val(text);
-                $("#roles-list").html(ajax_load).load(loadUrl);
-            });
-
-            var sel = $('#id_group').val();
-            if (sel != '') { $('#id_group').change(); }
-
-        });
-
-    </script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Roles
-{% endblock %}
-{% block instructions %}
-    <a href="#" target="_blank">Instructions</a>
-{% endblock %}
-
-{% block content %}
-
-    <div class="module interim-container">
-        <form id="roles-form" method="post">{% csrf_token %}
-        <h2>Role Tool</h2>
-        <div class="inline-related">
-            <h3><b>Select Group</b></h3>
-            <p>Select a Group to change roles.</p>
-                {{ group_form.as_p }}
-        </div> <!-- inline-related -->
-        <br>
-
-        <div class="inline-related">
-            <h3>Role Details</h3>
-            <div id="roles-list"></div>
-        </div> <!-- inline-related -->
-
-        <div class="inline-related">
-            <h3>Add Role</h3>
-            {% with role_form as form %}
-                    {{ role_form.non_field_errors }}
-                    <table class="full-width">
-                        <tbody>
-                        <tr>
-                            <td>{{ form.group_acronym.errors }}{{ form.group_acronym }}</td>
-                            <td>{{ form.name.errors }}{{ form.name }}</td>
-                            <td>{{ form.person.errors }}{{ form.person }}{% if form.person.help_text %}<br>{{ form.person.help_text }}{% endif %}</td>
-                            <td>{{ form.email.errors }}{{ form.email }}{% if form.email.help_text %}<br>{{ form.email.help_text }}{% endif %}</td>
-                            <td><button type="submit" name="submit">Add</button></td>
-                        </tr>
-                        </tbody>
-                    </table>
-            {% endwith %}
-        </div> <!-- inline-related -->
-        </form>
-
-        <div class="button-group">
-            <ul>
-                <li><button type="button" onclick="window.location='../'">Back</button></li>
-            </ul>
-        </div> <!-- button-group -->
-
-    </div> <!-- module -->
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/roles/roles.html b/ietf/secr/templates/roles/roles.html
deleted file mode 100644
index 615452a486..0000000000
--- a/ietf/secr/templates/roles/roles.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<table class="full-width">
-    <thead>
-        <tr>
-            <th scope="col">Role</th>
-            <th scope="col">Name</th>
-            <th scope="col">Email</th>
-            <th scope="col">Action</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for role in roles %}
-            <tr class="{% cycle 'row1' 'row2' %}">
-                <td>{{ role.name }}</td>
-                <td>{{ role.person }}</td>
-                <td>{{ role.email }}</td>
-                <td><a href="{% url 'ietf.secr.roles.views.delete_role' acronym=group.acronym id=role.id %}">Delete</a></td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
diff --git a/ietf/secr/templates/rolodex/add.html b/ietf/secr/templates/rolodex/add.html
index 08a9798660..5adb738f2b 100644
--- a/ietf/secr/templates/rolodex/add.html
+++ b/ietf/secr/templates/rolodex/add.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Rolodex - Add{% endblock %}
 
@@ -41,7 +41,7 @@ <h2>Name</h2>
             <form id="rolodex-add-form" enctype="multipart/form-data" method="post">{% csrf_token %}
                 <table class="full-width amstable">
                     <tbody>
-                    <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                    <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                     {{ form.as_table }}
                     </tbody>
                 </table>
diff --git a/ietf/secr/templates/rolodex/add_proceed.html b/ietf/secr/templates/rolodex/add_proceed.html
index 0251cc44d4..0b1acfbb17 100644
--- a/ietf/secr/templates/rolodex/add_proceed.html
+++ b/ietf/secr/templates/rolodex/add_proceed.html
@@ -15,7 +15,7 @@ <h2>Adding {{ name }}</h2>
             <h3>Rolodex - Add</h3>
             <table class="full-width amstable">
                 <tbody>
-                <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                 {{ form.as_table }}
                 </tbody>
             </table>
diff --git a/ietf/secr/templates/rolodex/edit.html b/ietf/secr/templates/rolodex/edit.html
index 61f48e5ec2..ed4c0f97e2 100644
--- a/ietf/secr/templates/rolodex/edit.html
+++ b/ietf/secr/templates/rolodex/edit.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Rolodex - Edit{% endblock %}
 
@@ -19,7 +19,7 @@
             <h2>Rolodex - Edit</h2>
             <table id="rolodex-edit-table" class="full-width amstable">
                 <tbody>
-                <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                 {{ person_form.as_table }}
                 </tbody>
             </table>
diff --git a/ietf/secr/templates/rolodex/search.html b/ietf/secr/templates/rolodex/search.html
index 7dcaf28246..065b0463f8 100644
--- a/ietf/secr/templates/rolodex/search.html
+++ b/ietf/secr/templates/rolodex/search.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Rolodex - Search{% endblock %}
 
@@ -17,7 +17,7 @@ <h2>Rolodex - Search <span class="unlocked"><a href="add/" class="addlink">Add</
         <form id="rolodex-search-form" action="." method="post">{% csrf_token %}
             <table class="full-width amstable">
                 <tbody>
-                <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                 {{ form.as_table }}
                 </tbody>
             </table>
diff --git a/ietf/secr/templates/rolodex/view.html b/ietf/secr/templates/rolodex/view.html
index 738ab3361a..d1a78cfaa5 100644
--- a/ietf/secr/templates/rolodex/view.html
+++ b/ietf/secr/templates/rolodex/view.html
@@ -44,9 +44,9 @@ <h2><b>Roles</b></h2>
                                         <td>{{ role.name }} </td>
                                         <td>
                                             {% if role.group.type.slug == "area" %}
-                                                <a href="{% url "ietf.secr.areas.views.view" name=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
+                                                {{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}
                                             {% else %}
-                                                <a href="{% url 'ietf.secr.groups.views.view' acronym=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
+                                                <a href="{% url 'ietf.group.views.group_home' acronym=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
                                             {% endif %}
                                         </td>
                                         <td>{{ role.email }}</td>
diff --git a/ietf/secr/templates/sreq/confirm.html b/ietf/secr/templates/sreq/confirm.html
deleted file mode 100755
index 4bf26dd858..0000000000
--- a/ietf/secr/templates/sreq/confirm.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Sessions - Confirm{% endblock %}
-
-{% block extrastyle %}
-    <style>
-        dl {width: 100%;}
-        dt {float: left; width: 15%; margin: 0.1em 0 0.1em 0; }
-        dt::after {content: ":";}
-        dd {float: left; width: 85%; margin: 0.1em 0 0.1em 0;}
-    </style>
-{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-    {{ form.media }}
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="{% url "ietf.secr.sreq.views.main" %}">Sessions</a>
-    &raquo; <a href="../">New</a>
-    &raquo; Session Request Confirmation
-{% endblock %}
-
-{% block content %}
-
-    <div class="module interim-container">
-        <h2>Sessions - Confirm</h2>
-
-        {% include "includes/sessions_request_view.html" %}
-
-        {% if group.features.acts_like_wg and form.session_forms.forms_to_keep|length > 2 %}
-            <br>
-            <p class="alert">
-                <b>
-                    Note: Your request for a third session must be approved by an area director before
-                    being submitted to agenda@ietf.org.  Click "Submit" below to email an approval
-                    request to the area directors.
-                </b>
-            </p>
-            <br>
-        {% endif %}
-
-        <form action="{% url "ietf.secr.sreq.views.confirm" acronym=group.acronym %}" method="post">
-            {% csrf_token %}
-            {{ form }}
-            {{ form.session_forms.management_form }}
-            {% for sf in form.session_forms %}
-                {% include 'meeting/session_details_form.html' with form=sf hidden=True only %}
-            {% endfor %}
-            {% include "includes/buttons_submit_cancel.html" %}
-        </form>
-
-    </div>
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/sreq/edit.html b/ietf/secr/templates/sreq/edit.html
deleted file mode 100755
index b0bfbc1e0c..0000000000
--- a/ietf/secr/templates/sreq/edit.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-{% block title %}Sessions - Edit{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-    <script src="{% static 'secr/js/sessions.js' %}"></script>
-    {{ form.media }}
-  <style>
-      .hidden {display: none !important;}
-      div.form-group {display: inline;}
-  </style>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../../">Sessions</a>
-    &raquo; <a href="../">{{ group.acronym }}</a>
-    &raquo; Edit
-{% endblock %}
-
-{% block instructions %}
-    <a href="https://www.ietf.org/chairs/session-request-tool-instructions/" target="_blank">Instructions</a>
-{% endblock %}
-
-{% block content %}
-    <div class="module interim-container">
-        <h2>IETF {{ meeting.number }}: Edit Session Request</h2>
-        <div class="inline-related">
-            <br>
-
-            {% include "includes/sessions_request_form.html" %}
-
-        </div> <!-- module -->
-    </div>
-{% endblock %}
-
-{% block footer-extras %}
-    {% include "includes/sessions_footer.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/sreq/locked.html b/ietf/secr/templates/sreq/locked.html
deleted file mode 100755
index 5f619f37cb..0000000000
--- a/ietf/secr/templates/sreq/locked.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Sessions{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Sessions (Locked)
-{% endblock %}
-
-{% block content %}
-    <p>&raquo; <a href="{% url 'ietf.meeting.views.meeting_requests' %}">View list of timeslot requests</a></p>
-    <div class="module interim-container">
-        <h2>Sessions - Status</h2>
-
-        <p>{{ message }}</p>
-
-        <div class="button-group">
-            <ul>
-                <li><button type="button" onclick="window.location='../'">Back</button></li>
-            </ul>
-        </div> <!-- button-group -->
-
-
-    </div> <!-- module -->
-
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/sreq/main.html b/ietf/secr/templates/sreq/main.html
deleted file mode 100755
index bdb33bb77d..0000000000
--- a/ietf/secr/templates/sreq/main.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% extends "base_site.html" %}
-{% load ietf_filters %}
-{% load staticfiles %}
-
-{% block title %}Sessions{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; Sessions
-{% endblock %}
-{% block instructions %}
-    <a href="https://www.ietf.org/chairs/session-request-tool-instructions/" target="_blank">Instructions</a>
-{% endblock %}
-
-{% block content %}
-    <p>&raquo; <a href="{% url 'ietf.meeting.views.meeting_requests' %}">View list of timeslot requests</a></p>
-    <div class="module interim-container">
-        <h2>
-            Sessions Request Tool: IETF {{ meeting.number }}
-            {% if user|has_role:"Secretariat" %}
-                {% if is_locked %}
-                    <span class="locked"><a href="{% url "ietf.secr.sreq.views.tool_status" %}">Tool Status: Locked</a></span>
-                {% else %}
-                    <span class="unlocked"><a href="{% url "ietf.secr.sreq.views.tool_status" %}">Tool Status: Unlocked</a></span>
-                {% endif %}
-            {% endif %}
-        </h2>
-        <div class="inline-related">
-            <h3><b>Request New Session</b></h3>
-            <p>The list below includes those working groups that you currently chair which do not already have a session scheduled. You can click on an acronym to initiate a request for a new session at the upcoming IETF meeting.  Click "Group will not meet" to send a notification that the group does not plan to meet.</p>
-            <ul>
-                {% for group in unscheduled_groups %}
-                    <li>
-                        <a href="{% url "ietf.secr.sreq.views.new" acronym=group.acronym %}">{{ group.acronym }}</a>
-                        {% if group.not_meeting %}
-                            <span class="required"> (Currently, this group does not plan to hold a session at IETF {{ meeting.number }})</span>
-                        {% endif %}
-                    </li>
-                {% empty %}
-                    <li><i>NONE</i></li>
-                {% endfor %}
-            </ul>
-        </div> <!-- inline-related -->
-        <br>
-        <div class="inline-related">
-            <h3>Edit / Cancel Previously Requested Sessions</h3>
-            <p>The list below includes those working groups for which you or your co-chair has requested sessions at the upcoming IETF meeting. You can click on an acronym to initiate changes to a session, or cancel a session.</p>
-            <ul>
-                {% for group in scheduled_groups %}
-                    <li><a href="{% url "ietf.secr.sreq.views.view" acronym=group.acronym %}">{{ group.acronym }} - {{ group.status_message }}</a></li>
-                {% empty %}
-                    <li><i>NONE</i></li>
-                {% endfor %}
-            </ul>
-        </div> <!-- inline-related -->
-    </div> <!-- module -->
-
-{% endblock %}
-
-{% block footer-extras %}
-    {% include "includes/sessions_footer.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/sreq/new.html b/ietf/secr/templates/sreq/new.html
deleted file mode 100755
index 2c6afb5576..0000000000
--- a/ietf/secr/templates/sreq/new.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Sessions- New{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-    <script src="{% static 'secr/js/sessions.js' %}"></script>
-    {{ form.media }}
-  <style>
-      .hidden {display: none !important;}
-      div.form-group {display: inline;}
-  </style>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../../">Sessions</a>
-    &raquo; New Session Request
-{% endblock %}
-
-{% block instructions %}
-    <a href="https://www.ietf.org/chairs/session-request-tool-instructions/" target="_blank">Instructions</a>
-{% endblock %}
-
-{% block content %}
-    <div class="module interim-container">
-        <h2>IETF {{ meeting.number }}: New Session Request</h2>
-        <div class="inline-related">
-            <br>
-            <ul class="session-buttons">
-                <li><button type="button" onclick="if (window.confirm('A message will be sent to agenda@ietf.com as well as to the area director(s).\n\nContinue?')) { window.location='{% url "ietf.secr.sreq.views.no_session" acronym=group.acronym %}'};">Send a notification that the group does not plan to hold a session at IETF {{ meeting.number }}</button></li>
-                <li><button type="button" onclick="window.location='{% url "ietf.secr.sreq.views.new" acronym=group.acronym %}?previous'">Retrieve all information from previous meeting</button></li>
-            </ul>
-        </div>
-            {% include "includes/sessions_request_form.html" %}
-
-        </div> <!-- module -->
-
-{% endblock %}
-
-{% block footer-extras %}
-    {% include "includes/sessions_footer.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/sreq/not_meeting_notification.txt b/ietf/secr/templates/sreq/not_meeting_notification.txt
deleted file mode 100644
index 1120f8480c..0000000000
--- a/ietf/secr/templates/sreq/not_meeting_notification.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load ams_filters %}
-
-{{ login|smart_login }} {{ group.acronym }} working group, indicated that the {{ group.acronym }} working group does not plan to hold a session at IETF {{ meeting.number }}.
-
-This message was generated and sent by the IETF Meeting Session Request Tool.
-
-
diff --git a/ietf/secr/templates/sreq/session_approval_notification.txt b/ietf/secr/templates/sreq/session_approval_notification.txt
deleted file mode 100644
index 7bb63aa3fa..0000000000
--- a/ietf/secr/templates/sreq/session_approval_notification.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Dear {{ group.parent }} Director(s):
-
-{{ header }} meeting session request has just been
-submitted by {{ requester }}.
-The third session requires your approval.
-
-To approve the session go to the session request view here:
-{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.secr.sreq.views.view" acronym=group.acronym %}
-and click "Approve Third Session".
-
-Regards,
-
-The IETF Secretariat.
-
-{% include "includes/session_info.txt" %}
diff --git a/ietf/secr/templates/sreq/session_cancel_notification.txt b/ietf/secr/templates/sreq/session_cancel_notification.txt
deleted file mode 100644
index 3e6dd43f69..0000000000
--- a/ietf/secr/templates/sreq/session_cancel_notification.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{% load ams_filters %}
-
-A request to cancel a meeting session has just been submitted by {{ requester }}.
-
diff --git a/ietf/secr/templates/sreq/session_request_notification.txt b/ietf/secr/templates/sreq/session_request_notification.txt
deleted file mode 100644
index db20060406..0000000000
--- a/ietf/secr/templates/sreq/session_request_notification.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{% load ams_filters %}
-
-{{ header }} meeting session request has just been submitted by {{ requester }}.
-
-{% include "includes/session_info.txt" %}
diff --git a/ietf/secr/templates/sreq/tool_status.html b/ietf/secr/templates/sreq/tool_status.html
deleted file mode 100755
index 5e30d5a018..0000000000
--- a/ietf/secr/templates/sreq/tool_status.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Sessions{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../">Sessions</a>
-    &raquo; Session Status
-{% endblock %}
-
-{% block content %}
-
-    <div class="module interim-container">
-        <h2>Sessions - Status</h2>
-        <p>Enter the message that you would like displayed to the WG Chair when this tool is locked.</p>
-        <form method="post">{% csrf_token %}
-            <table>
-                <tbody>
-                 <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
-                 {{ form.as_table }}
-                 </tbody>
-            </table>
-            <div class="button-group">
-                <ul>
-                    {% if is_locked %}
-                        <li><button type="submit" name="submit" value="Unlock">Unlock</button></li>
-                    {% else %}
-                        <li><button type="submit" name="submit" value="Lock">Lock</button></li>
-                    {% endif %}
-                    <li><button type="submit" name="submit" value="Back">Back</button></li>
-                </ul>
-            </div> <!-- button-group -->
-
-        </form>
-
-    </div> <!-- module -->
-
-{% endblock %}
diff --git a/ietf/secr/templates/sreq/view.html b/ietf/secr/templates/sreq/view.html
deleted file mode 100644
index 34994c4fb1..0000000000
--- a/ietf/secr/templates/sreq/view.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% extends "base_site.html" %}
-{% load staticfiles %}
-
-{% block title %}Sessions - View{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-    <script src="{% static 'secr/js/utils.js' %}"></script>
-{% endblock %}
-
-{% block breadcrumbs %}{{ block.super }}
-    &raquo; <a href="../">Sessions</a>
-    &raquo; {{ group.acronym }}
-{% endblock %}
-
-{% block instructions %}
-    <a href="https://www.ietf.org/chairs/session-request-tool-instructions/" target="_blank">Instructions</a>
-{% endblock %}
-
-{% block content %}
-
-    <div class="module interim-container">
-        <h2>Sessions - View (meeting: {{ meeting.number }})</h2>
-
-        {% include "includes/sessions_request_view.html" %}
-
-        <br>
-
-        {% include "includes/activities.html" %}
-
-        <div class="button-group">
-            <ul>
-                <li><button type="button" name="edit" onclick="window.location='{% url "ietf.secr.sreq.views.edit" acronym=group.acronym num=meeting.number %}'"{% if is_locked %} disabled{% endif %}>Edit</button></li>
-                {% if show_approve_button %}
-                    <li><button type="button" onclick="window.location='approve/'">Approve Third Session</button></li>
-                {% endif %}
-                <li><button type="button" onclick="if (window.confirm('Do you really want to cancel this session?')) { window.location='cancel/' };" {% if is_locked %} disabled{% endif %}>Cancel this Request</button></li>
-                <li><button type="button" onclick="window.location='{% url "ietf.secr.sreq.views.main" %}'">Back</button></li>
-            </ul>
-        </div> <!-- button-group -->
-    </div> <!-- module -->
-
-{% endblock %}
-
-{% block footer-extras %}
-    {% include "includes/sessions_footer.html" %}
-{% endblock %}
diff --git a/ietf/secr/templates/telechat/base_telechat.html b/ietf/secr/templates/telechat/base_telechat.html
index 73d42ea71e..1c8feaff6f 100644
--- a/ietf/secr/templates/telechat/base_telechat.html
+++ b/ietf/secr/templates/telechat/base_telechat.html
@@ -1,5 +1,5 @@
 {% extends "base_site.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Telechat{% endblock %}
 
diff --git a/ietf/secr/templates/telechat/doc.html b/ietf/secr/templates/telechat/doc.html
index b7fc782d91..6727e157f5 100644
--- a/ietf/secr/templates/telechat/doc.html
+++ b/ietf/secr/templates/telechat/doc.html
@@ -61,7 +61,7 @@ <h3>{{ document.name }}-{{ document.rev }} ({{ document.intended_std_level }})</
             <form method="post">{% csrf_token %}
                 <table>
                     <tbody>
-                    <!-- [html-validate-disable-block element-required-attributes -- FIXME: as_table renders without scope] -->
+                    <!-- [html-validate-disable-block wcag/h63 -- FIXME: as_table renders without scope] -->
                     {{ state_form.as_table }}
                     </tbody>
                 </table>
@@ -85,13 +85,13 @@ <h2 id="writeup">Ballot Writeup</h2>
             {% if downrefs %}
                 <h2 id="downrefs">Downward References</h2>
                 {% for ref in downrefs %}
-                    <p>Add {{ref.target.document.canonical_name}}
-                        ({{ref.target.document.std_level}} - {{ref.target.document.stream.desc}})
+                    <p>Add {{ref.target.name}}
+                        ({{ref.target.std_level}} - {{ref.target.stream.desc}} stream)
                         to downref registry.<br>
-                        {% if not ref.target.document.std_level %}
+                        {% if not ref.target.std_level %}
                             +++ Warning: The standards level has not been set yet!!!<br>
                         {% endif %}
-                        {% if not ref.target.document.stream %}
+                        {% if not ref.target.stream %}
                             +++ Warning: document stream has not been set yet!!!<br>
                         {% endif %}
                 {% endfor %}</p>
diff --git a/ietf/secr/templates/telechat/group.html b/ietf/secr/templates/telechat/group.html
index 288316e900..4e04f0e16e 100644
--- a/ietf/secr/templates/telechat/group.html
+++ b/ietf/secr/templates/telechat/group.html
@@ -3,9 +3,9 @@
         <b>Does anyone have an objection to the creation of this working group being sent for EXTERNAL REVIEW?</b><br><br>
         <input type="radio" name="wg_action_status" value="1"> External Review APPROVED; "The Secretariat will send a Working Group Review announcement with a copy to new-work and place it back on the agenda for the next telechat."<br><br>
         <input type="radio" name="wg_action_status" value="2"> External Review NOT APPROVED;
-        <blockquote>
+        <blockquote style="border-left: 0">
             <input type="radio" name="wg_action_status_sub" value="1"> The Secretariat will wait for instructions from <select name="note_draft_by"></select><br>
-            <input type="radio" name="wg_action_status_sub" value="2"> The IESG decides the document needs more thime in INTERNAL REVIEW.  The Secreatriat will put it back on the agenda for the next teleconference in the same category.<br>
+            <input type="radio" name="wg_action_status_sub" value="2"> The IESG decides the document needs more time in INTERNAL REVIEW.  The Secretariat will put it back on the agenda for the next teleconference in the same category.<br>
             <input type="radio" name="wg_action_status_sub" value="3"> The IESG has made changes since the charter was seen in INTERNAL REVIEW, and decides to send it back to INTERNAL REVIEW the charter again.
         </blockquote>
     {% endif %}
@@ -30,4 +30,4 @@
         <input type="radio" name="wg_action_status" value="2"> Yes, the charter is NOT APPROVED; The charter needs more work, or the IESG decides to shelve formation of the working group.  "The Secretariat will await further instruction from <select name="note_draft_by"></select> regarding the rechartering of this working group."<br><br>
     {% endif %}
 
-</form>
+</form>
\ No newline at end of file
diff --git a/ietf/secr/urls.py b/ietf/secr/urls.py
index 196f139b2e..ab21046654 100644
--- a/ietf/secr/urls.py
+++ b/ietf/secr/urls.py
@@ -1,16 +1,22 @@
-from django.conf.urls import url, include
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.conf import settings
+from django.urls import re_path, include
 from django.views.generic import TemplateView
+from django.views.generic.base import RedirectView
 
 urlpatterns = [
-    url(r'^$', TemplateView.as_view(template_name='main.html')),
-    url(r'^announcement/', include('ietf.secr.announcement.urls')),
-    url(r'^areas/', include('ietf.secr.areas.urls')),
-    url(r'^console/', include('ietf.secr.console.urls')),
-    url(r'^groups/', include('ietf.secr.groups.urls')),
-    url(r'^meetings/', include('ietf.secr.meetings.urls')),
-    url(r'^proceedings/', include('ietf.secr.proceedings.urls')),
-    url(r'^roles/', include('ietf.secr.roles.urls')),
-    url(r'^rolodex/', include('ietf.secr.rolodex.urls')),
-    url(r'^sreq/', include('ietf.secr.sreq.urls')),
-    url(r'^telechat/', include('ietf.secr.telechat.urls')),
+    re_path(r'^$', TemplateView.as_view(template_name='index.html'), name='ietf.secr'),
+    re_path(r'^announcement/', include('ietf.secr.announcement.urls')),
+    re_path(r'^meetings/', include('ietf.secr.meetings.urls')),
+    re_path(r'^rolodex/', include('ietf.secr.rolodex.urls')),
+    # remove these redirects after 125
+    re_path(r'^sreq/$', RedirectView.as_view(url='/meeting/session/request/', permanent=True)),
+    re_path(r'^sreq/%(acronym)s/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/session/request/%(acronym)s/view/', permanent=True)),
+    re_path(r'^sreq/%(acronym)s/edit/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/session/request/%(acronym)s/edit/', permanent=True)),
+    re_path(r'^sreq/%(acronym)s/new/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/session/request/%(acronym)s/new/', permanent=True)),
+    re_path(r'^sreq/(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/view/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/%(num)s/session/request/%(acronym)s/view/', permanent=True)),
+    re_path(r'^sreq/(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/edit/$' % settings.URL_REGEXPS, RedirectView.as_view(url='/meeting/%(num)s/session/request/%(acronym)s/edit/', permanent=True)),
+    # ---------------------------------
+    re_path(r'^telechat/', include('ietf.secr.telechat.urls')),
 ]
diff --git a/ietf/secr/utils/decorators.py b/ietf/secr/utils/decorators.py
index 3dcba2c966..5887c3c9cc 100644
--- a/ietf/secr/utils/decorators.py
+++ b/ietf/secr/utils/decorators.py
@@ -1,12 +1,12 @@
 # Copyright The IETF Trust 2013-2020, All Rights Reserved
 from functools import wraps
+from urllib.parse import quote as urlquote
 
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404
-from django.utils.http import urlquote
 
 from ietf.ietfauth.utils import has_role
 from ietf.doc.models import Document
@@ -18,7 +18,7 @@
             
 def check_for_cancel(redirect_url):
     """
-    Decorator to make a view redirect to the given url if the reuqest is a POST which contains
+    Decorator to make a view redirect to the given url if the request is a POST which contains
     a submit=Cancel.
     """
     def decorator(func):
diff --git a/ietf/secr/utils/document.py b/ietf/secr/utils/document.py
index 0a34512a17..361bf836df 100644
--- a/ietf/secr/utils/document.py
+++ b/ietf/secr/utils/document.py
@@ -13,15 +13,6 @@ def get_full_path(doc):
         return None
     return os.path.join(doc.get_file_path(), doc.uploaded_filename)
     
-def get_rfc_num(doc):
-    qs = doc.docalias.filter(name__startswith='rfc')
-    return qs[0].name[3:] if qs else None
-
-def is_draft(doc):
-    if doc.docalias.filter(name__startswith='rfc'):
-        return False
-    else:
-        return True
 
 def get_start_date(doc):
     '''
diff --git a/ietf/secr/utils/group.py b/ietf/secr/utils/group.py
deleted file mode 100644
index 44ef5f0222..0000000000
--- a/ietf/secr/utils/group.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-# Python imports
-import io
-import os
-
-# Django imports
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
-
-# Datatracker imports
-from ietf.group.models import Group
-from ietf.ietfauth.utils import has_role
-
-
-
-
-def current_nomcom():
-    qs = Group.objects.filter(acronym__startswith='nomcom',state__slug="active").order_by('-time')
-    if qs.count():
-        return qs[0]
-    else:
-        return None
-
-def get_charter_text(group):
-    '''
-    Takes a group object and returns the text or the group's charter as a string
-    '''
-    charter = group.charter
-    path = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev))
-    f = io.open(path,'r')
-    text = f.read()
-    f.close()
-
-    return text
-
-def get_my_groups(user,conclude=False):
-    '''
-    Takes a Django user object (from request)
-    Returns a list of groups the user has access to.  Rules are as follows
-    secretariat - has access to all groups
-    area director - has access to all groups in their area
-    wg chair or secretary - has acceses to their own group
-    chair of irtf has access to all irtf groups
-
-    If user=None than all groups are returned.
-    concluded=True means include concluded groups.  Need this to upload materials for groups
-    after they've been concluded.  it happens.
-    '''
-    my_groups = set()
-    states = ['bof','proposed','active']
-    if conclude:
-        states.extend(['conclude','bof-conc'])
-
-    all_groups = Group.objects.filter(type__features__has_meetings=True, state__in=states).order_by('acronym')
-    if user == None or has_role(user,'Secretariat'):
-        return all_groups
-    
-    try:
-        person = user.person
-    except ObjectDoesNotExist:
-        return list()
-
-    for group in all_groups:
-        if group.role_set.filter(person=person,name__in=('chair','secr','ad')):
-            my_groups.add(group)
-            continue
-        if group.parent and group.parent.role_set.filter(person=person,name__in=('ad','chair')):
-            my_groups.add(group)
-            continue
-
-    return list(my_groups)
diff --git a/ietf/settings.py b/ietf/settings.py
index 5e4912d85c..3aa45a453c 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007-2022, All Rights Reserved
+# Copyright The IETF Trust 2007-2026, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -9,24 +9,42 @@
 import os
 import sys
 import datetime
+import pathlib
 import warnings
+from hashlib import sha384
 from typing import Any, Dict, List, Tuple # pyflakes:ignore
+from django.http import UnreadablePostError
 
+# DeprecationWarnings are suppressed by default, enable them
 warnings.simplefilter("always", DeprecationWarning)
-warnings.filterwarnings("ignore", message="'urllib3\[secure\]' extra is deprecated")
-warnings.filterwarnings("ignore", message="The logout\(\) view is superseded by")
+
+# Warnings that must be resolved for Django 5.x
+warnings.filterwarnings("ignore", "Log out via GET requests is deprecated")  # caused by oidc_provider
+warnings.filterwarnings("ignore", message="The django.utils.timezone.utc alias is deprecated.", module="oidc_provider")
+warnings.filterwarnings("ignore", message="The django.utils.datetime_safe module is deprecated.", module="tastypie")
+warnings.filterwarnings("ignore", message="The USE_DEPRECATED_PYTZ setting,")  # https://github.com/ietf-tools/datatracker/issues/5635
+warnings.filterwarnings("ignore", message="The is_dst argument to make_aware\\(\\)")  # caused by django-filters when USE_DEPRECATED_PYTZ is true 
+warnings.filterwarnings("ignore", message="The USE_L10N setting is deprecated.")  # https://github.com/ietf-tools/datatracker/issues/5648
+warnings.filterwarnings("ignore", message="django.contrib.auth.hashers.CryptPasswordHasher is deprecated.")  # https://github.com/ietf-tools/datatracker/issues/5663
+
+# Other DeprecationWarnings
+warnings.filterwarnings("ignore", message="pkg_resources is deprecated as an API", module="pyang.plugin")
 warnings.filterwarnings("ignore", message="Report.file_reporters will no longer be available in Coverage.py 4.2", module="coverage.report")
-warnings.filterwarnings("ignore", message="{% load staticfiles %} is deprecated")
-warnings.filterwarnings("ignore", message="Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated", module="bleach")
+warnings.filterwarnings("ignore", message="currentThread\\(\\) is deprecated", module="coverage.pytracer")
+warnings.filterwarnings("ignore", message="co_lnotab is deprecated", module="coverage.parser")
+warnings.filterwarnings("ignore", message="datetime.datetime.utcnow\\(\\) is deprecated", module="botocore.auth")
+warnings.filterwarnings("ignore", message="datetime.datetime.utcnow\\(\\) is deprecated", module="oic.utils.time_util")
+warnings.filterwarnings("ignore", message="datetime.datetime.utcfromtimestamp\\(\\) is deprecated", module="oic.utils.time_util")
+warnings.filterwarnings("ignore", message="datetime.datetime.utcfromtimestamp\\(\\) is deprecated", module="pytz.tzinfo")
+warnings.filterwarnings("ignore", message="'instantiateVariableFont' is deprecated", module="weasyprint")
 
-try:
-    import syslog
-    syslog.openlog(str("datatracker"), syslog.LOG_PID, syslog.LOG_USER)
-except ImportError:
-    pass
 
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.abspath(BASE_DIR + "/.."))
+base_path = pathlib.Path(__file__).resolve().parent
+BASE_DIR = str(base_path)
+
+project_path = base_path.parent
+PROJECT_DIR = str(project_path)  
+sys.path.append(PROJECT_DIR)
 
 from ietf import __version__
 import debug
@@ -44,17 +62,12 @@
 # Domain name of the IETF
 IETF_DOMAIN = 'ietf.org'
 
+# Overriden in settings_local
 ADMINS = [
-#    ('Henrik Levkowetz', 'henrik@levkowetz.com'),
-    ('Robert Sparks', 'rjsparks@nostrum.com'),
-#    ('Ole Laursen', 'olau@iola.dk'),
-    ('Ryan Cross', 'rcross@amsl.com'),
-    ('Glen Barney', 'glen@amsl.com'),
-    ('Maddy Conner', 'maddy@amsl.com'),
-    ('Kesara Rathnayaka', 'krathnayake@ietf.org'),
+    ('Tools Help', 'tools-help@ietf.org'),
 ]                                       # type: List[Tuple[str, str]]
 
-BUG_REPORT_EMAIL = "datatracker-project@ietf.org"
+BUG_REPORT_EMAIL = "tools-help@ietf.org"
 
 PASSWORD_HASHERS = [
     'django.contrib.auth.hashers.Argon2PasswordHasher',
@@ -64,6 +77,26 @@
     'django.contrib.auth.hashers.CryptPasswordHasher',
 ]
 
+
+PASSWORD_POLICY_MIN_LENGTH = 12
+PASSWORD_POLICY_ENFORCE_AT_LOGIN = False  # should turn this on for prod
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+        "OPTIONS": {
+            "min_length": PASSWORD_POLICY_MIN_LENGTH,
+        }
+    },
+    {
+        "NAME": "ietf.ietfauth.password_validation.StrongPasswordValidator",
+    },
+]
+# In dev environments, settings_local overrides the password validators. Save
+# a handle to the original value so settings_test can restore it so tests match
+# production.
+ORIG_AUTH_PASSWORD_VALIDATORS = AUTH_PASSWORD_VALIDATORS
+
 ALLOWED_HOSTS = [".ietf.org", ".ietf.org.", "209.208.19.216", "4.31.198.44", "127.0.0.1", "localhost", ]
 
 # Server name of the tools server
@@ -80,21 +113,13 @@
 
 DATABASES = {
     'default': {
-        'NAME': 'ietf_utf8',
-        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'datatracker',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'USER': 'ietf',
-        #'PASSWORD': 'ietf',
-        'OPTIONS': {
-            'sql_mode': 'STRICT_TRANS_TABLES',
-            'init_command': 'SET storage_engine=MyISAM; SET names "utf8"'
-        },
+        #'PASSWORD': 'somepassword',
     },
 }
 
-DATABASE_TEST_OPTIONS = {
-    # Comment this out if your database doesn't support InnoDB
-    'init_command': 'SET storage_engine=InnoDB',
-}
 
 # Local time zone for this installation. Choices can be found here:
 # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
@@ -114,7 +139,27 @@
 # to load the internationalization machinery.
 USE_I18N = False
 
-USE_TZ = False
+# Django 4.0 changed the default setting of USE_L10N to True. The setting
+# is deprecated and will be removed in Django 5.0.
+USE_L10N = False
+
+USE_TZ = True
+USE_DEPRECATED_PYTZ = True  # supported until Django 5
+
+# The DjangoDivFormRenderer is a transitional class that opts in to defaulting to the div.html
+# template for formsets. This will become the default behavior in Django 5.0. This configuration
+# can be removed at that point.
+# See https://docs.djangoproject.com/en/4.2/releases/4.1/#forms
+FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer"
+
+# Default primary key field type to use for models that don’t have a field with primary_key=True.
+# In the future (relative to 4.2), the default will become 'django.db.models.BigAutoField.'
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
+# OIDC configuration
+_SITE_URL = os.environ.get("OIDC_SITE_URL", None)
+if _SITE_URL is not None:
+    SITE_URL = _SITE_URL
 
 if SERVER_MODE == 'production':
     MEDIA_ROOT = '/a/www/www6s/lib/dt/media/'
@@ -150,7 +195,6 @@
 # Absolute path to the directory static files should be collected to.
 # Example: "/var/www/example.com/static/"
 
-
 SERVE_CDN_PHOTOS = True
 
 SERVE_CDN_FILES_LOCALLY_IN_DEV_MODE = True
@@ -160,7 +204,7 @@
     STATIC_URL = "/static/"
     STATIC_ROOT = os.path.abspath(BASE_DIR + "/../static/")
 else:
-    STATIC_URL = "https://www.ietf.org/lib/dt/%s/"%__version__
+    STATIC_URL = "https://static.ietf.org/dt/%s/"%__version__
     STATIC_ROOT = "/a/www/www6s/lib/dt/%s/"%__version__
 
 # List of finder classes that know how to find static files in
@@ -170,165 +214,145 @@
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
+# Client-side static.ietf.org URL
+STATIC_IETF_ORG = "https://static.ietf.org"
+# Server-side static.ietf.org URL (used in pdfized)
+STATIC_IETF_ORG_INTERNAL = STATIC_IETF_ORG
+
+ENABLE_BLOBSTORAGE = True
+
+# "standard" retry mode is used, which does exponential backoff with a base factor of 2
+# and a cap of 20. 
+BLOBSTORAGE_MAX_ATTEMPTS = 5  # boto3 default is 3 (for "standard" retry mode)
+BLOBSTORAGE_CONNECT_TIMEOUT = 10  # seconds; boto3 default is 60
+BLOBSTORAGE_READ_TIMEOUT = 10  # seconds; boto3 default is 60
+
+# Caching for agenda data in seconds
+AGENDA_CACHE_TIMEOUT_DEFAULT = 8 * 24 * 60 * 60  # 8 days
+AGENDA_CACHE_TIMEOUT_CURRENT_MEETING = 6 * 60  # 6 minutes
+
 WSGI_APPLICATION = "ietf.wsgi.application"
 
-AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', )
+AUTHENTICATION_BACKENDS = ( 'ietf.ietfauth.backends.CaseInsensitiveModelBackend', )
 
-FILE_UPLOAD_PERMISSIONS = 0o644          
+FILE_UPLOAD_PERMISSIONS = 0o644
 
-# ------------------------------------------------------------------------
-# Django/Python Logging Framework Modifications
+FIRST_V3_RFC = 8650
 
-# Filter out "Invalid HTTP_HOST" emails
-# Based on http://www.tiwoc.de/blog/2013/03/django-prevent-email-notification-on-suspiciousoperation/
-from django.core.exceptions import SuspiciousOperation
-def skip_suspicious_operations(record):
-    if record.exc_info:
-        exc_value = record.exc_info[1]
-        if isinstance(exc_value, SuspiciousOperation):
-            return False
-    return True
 
-# Filter out UreadablePostError:
-from django.http import UnreadablePostError
+#
+# Logging config
+#
+
+# Callback to filter out UnreadablePostError:
 def skip_unreadable_post(record):
     if record.exc_info:
-        exc_type, exc_value = record.exc_info[:2] # pylint: disable=unused-variable
+        exc_type, exc_value = record.exc_info[:2]  # pylint: disable=unused-variable
         if isinstance(exc_value, UnreadablePostError):
             return False
     return True
 
-# Copied from DEFAULT_LOGGING as of Django 1.10.5 on 22 Feb 2017, and modified
-# to incorporate html logging, invalid http_host filtering, and more.
-# Changes from the default has comments.
-
-# The Python logging flow is as follows:
-# (see https://docs.python.org/2.7/howto/logging.html#logging-flow)
-#
-#   Init: get a Logger: logger = logging.getLogger(name)
-#
-#   Logging call, e.g. logger.error(level, msg, *args, exc_info=(...), extra={...})
-#   --> Logger (discard if level too low for this logger)
-#       (create log record from level, msg, args, exc_info, extra)
-#       --> Filters (discard if any filter attach to logger rejects record)
-#           --> Handlers (discard if level too low for handler)
-#               --> Filters (discard if any filter attached to handler rejects record)
-#                   --> Formatter (format log record and emit)
-#
-
 LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    #
-    'loggers': {
-        'django': {
-            'handlers': ['debug_console', 'mail_admins'],
-            'level': 'INFO',
+    "version": 1,
+    "disable_existing_loggers": False,
+    "loggers": {
+        "celery": {
+            "handlers": ["console"],
+            "level": "INFO",
         },
-        'django.request': {
-            'handlers': ['debug_console'],
-            'level': 'ERROR',
+        "datatracker": {
+            "handlers": ["console"],
+            "level": "INFO",
         },
-        'django.server': {
-            'handlers': ['django.server'],
-            'level': 'INFO',
+        "django": {
+            "handlers": ["console", "mail_admins"],
+            "level": "INFO",
         },
-        'django.security': {
-	    'handlers': ['debug_console', ],
-            'level': 'INFO',
+        "django.request": {"level": "ERROR"},  # only log 5xx, ignore 4xx
+        "django.security": {
+            # SuspiciousOperation errors - log to console only
+            "handlers": ["console"],
+            "propagate": False,  # no further handling please
         },
- 	'oidc_provider': {
-	    'handlers': ['debug_console', ],
-	    'level': 'DEBUG',
-	},
-    },
-    #
-    # No logger filters
-    #
-    'handlers': {
-        'console': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-            'formatter': 'plain',
+        "django.server": {
+            # Only used by Django's runserver development server
+            "handlers": ["django.server"],
+            "level": "INFO",
+        },
+        "oidc_provider": {
+            "handlers": ["console"],
+            "level": "DEBUG",
         },
-        'syslog': {
-            'level': 'DEBUG',
-            'class': 'logging.handlers.SysLogHandler',
-            'facility': 'user',
-            'formatter': 'plain',
-            'address': '/dev/log',
+    },
+    "handlers": {
+        "console": {
+            "level": "DEBUG",
+            "class": "logging.StreamHandler",
+            "formatter": "plain",
         },
-        'debug_console': {
-            # Active only when DEBUG=True
-            'level': 'DEBUG',
-            'filters': ['require_debug_true'],
-            'class': 'logging.StreamHandler',
-            'formatter': 'plain',
+        "debug_console": {
+            "level": "DEBUG",
+            "filters": ["require_debug_true"],
+            "class": "logging.StreamHandler",
+            "formatter": "plain",
         },
-        'django.server': {
-            'level': 'INFO',
-            'class': 'logging.StreamHandler',
-            'formatter': 'django.server',
+        "django.server": {
+            "level": "INFO",
+            "class": "logging.StreamHandler",
+            "formatter": "django.server",
         },
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': [
-                'require_debug_false',
-                'skip_suspicious_operations', # custom
-                'skip_unreadable_posts', # custom
+        "mail_admins": {
+            "level": "ERROR",
+            "filters": [
+                "require_debug_false",
+                "skip_unreadable_posts",
             ],
-            'class': 'django.utils.log.AdminEmailHandler',
-            'include_html': True,       # non-default
-        }
+            "class": "django.utils.log.AdminEmailHandler",
+            "include_html": True,
+        },
     },
-    #
     # All these are used by handlers
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse',
-        },
-        'require_debug_true': {
-            '()': 'django.utils.log.RequireDebugTrue',
+    "filters": {
+        "require_debug_false": {
+            "()": "django.utils.log.RequireDebugFalse",
         },
-        # custom filter, function defined above:
-        'skip_suspicious_operations': {
-            '()': 'django.utils.log.CallbackFilter',
-            'callback': skip_suspicious_operations,
+        "require_debug_true": {
+            "()": "django.utils.log.RequireDebugTrue",
         },
         # custom filter, function defined above:
-        'skip_unreadable_posts': {
-            '()': 'django.utils.log.CallbackFilter',
-            'callback': skip_unreadable_post,
+        "skip_unreadable_posts": {
+            "()": "django.utils.log.CallbackFilter",
+            "callback": skip_unreadable_post,
         },
     },
-    # And finally the formatters
-    'formatters': {
-        'django.server': {
-            '()': 'django.utils.log.ServerFormatter',
-            'format': '[%(server_time)s] %(message)s',
+    "formatters": {
+        "django.server": {
+            "()": "django.utils.log.ServerFormatter",
+            "format": "[%(server_time)s] %(message)s",
+        },
+        "plain": {
+            "style": "{",
+            "format": "{levelname}: {name}:{lineno}: {message}",
         },
-        'plain': {
-            'style': '{',
-            'format': '{levelname}: {name}:{lineno}: {message}',
+        "json": {
+            "class": "ietf.utils.jsonlogger.DatatrackerJsonFormatter",
+            "style": "{",
+            "format": (
+                "{asctime}{levelname}{message}{name}{pathname}{lineno}{funcName}"
+                "{process}{status_code}"
+            ),
         },
     },
 }
 
-# This should be overridden by settings_local for any logger where debug (or
-# other) custom log settings are wanted.  Use "ietf/manage.py showloggers -l"
-# to show registered loggers.  The content here should match the levels above
-# and is shown as an example:
-UTILS_LOGGER_LEVELS: Dict[str, str] = {
-#    'django':           'INFO',
-#    'django.server':    'INFO',
-}
-
-# End logging
-# ------------------------------------------------------------------------
-
 
 X_FRAME_OPTIONS = 'SAMEORIGIN'
-CSRF_TRUSTED_ORIGINS = ['ietf.org', '*.ietf.org', 'meetecho.com', '*.meetecho.com', 'gather.town', '*.gather.town', ]
+CSRF_TRUSTED_ORIGINS = [
+    "https://ietf.org",
+    "https://*.ietf.org",
+    'https://meetecho.com',
+    'https://*.meetecho.com',
+]
 CSRF_COOKIE_SAMESITE = 'None'
 CSRF_COOKIE_SECURE = True
 
@@ -338,11 +362,7 @@ def skip_unreadable_post(record):
 SESSION_COOKIE_SECURE = True
 
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
-# We want to use the JSON serialisation, as it's safer -- but there is /secr/
-# code which stashes objects in the session that can't be JSON serialized.
-# Switch when that code is rewritten.
-#SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer"
-SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
+SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer"
 SESSION_ENGINE = "django.contrib.sessions.backends.cache"
 SESSION_SAVE_EVERY_REQUEST = True
 SESSION_CACHE_ALIAS = 'sessions'
@@ -358,6 +378,7 @@ def skip_unreadable_post(record):
         ],
         'OPTIONS': {
             'context_processors': [
+                'ietf.context_processors.traceparent_id',
                 'django.contrib.auth.context_processors.auth',
                 'django.template.context_processors.debug',     # makes 'sql_queries' available in templates
                 'django.template.context_processors.i18n',
@@ -372,6 +393,7 @@ def skip_unreadable_post(record):
                 'ietf.context_processors.settings_info',
                 'ietf.secr.context_processors.secr_revision_info',
                 'ietf.context_processors.rfcdiff_base_url',
+                'ietf.context_processors.timezone_now',
             ],
             'loaders': [
                 ('django.template.loaders.cached.Loader', (
@@ -389,42 +411,45 @@ def skip_unreadable_post(record):
 
 
 MIDDLEWARE = [
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'corsheaders.middleware.CorsMiddleware', # see docs on CORS_REPLACE_HTTPS_REFERER before using it
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.http.ConditionalGetMiddleware',
-    'simple_history.middleware.HistoryRequestMiddleware',
+    "ietf.middleware.add_otel_traceparent_header",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "corsheaders.middleware.CorsMiddleware", # see docs on CORS_REPLACE_HTTPS_REFERER before using it
+    "django.middleware.common.CommonMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "ietf.middleware.is_authenticated_header_middleware",
+    "django.middleware.http.ConditionalGetMiddleware",
+    "simple_history.middleware.HistoryRequestMiddleware",
     # comment in this to get logging of SQL insert and update statements:
-    #'ietf.middleware.sql_log_middleware',
-    'ietf.middleware.SMTPExceptionMiddleware',
-    'ietf.middleware.Utf8ExceptionMiddleware',
-    'ietf.middleware.redirect_trailing_period_middleware',
-    'django_referrer_policy.middleware.ReferrerPolicyMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
- #   'csp.middleware.CSPMiddleware',
-    'ietf.middleware.unicode_nfkc_normalization_middleware',
+    #"ietf.middleware.sql_log_middleware",
+    "ietf.middleware.SMTPExceptionMiddleware",
+    "ietf.middleware.Utf8ExceptionMiddleware",
+    "ietf.middleware.redirect_trailing_period_middleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "django.middleware.security.SecurityMiddleware",
+    "ietf.middleware.unicode_nfkc_normalization_middleware",
 ]
 
 ROOT_URLCONF = 'ietf.urls'
 
-DJANGO_VITE_ASSETS_PATH = os.path.join(BASE_DIR, 'static/dist-neue')
+# Configure django_vite
+DJANGO_VITE: dict = {"default": {}}
 if DEBUG:
-    DJANGO_VITE_MANIFEST_PATH = os.path.join(BASE_DIR, 'static/dist-neue/manifest.json')
+    DJANGO_VITE["default"]["manifest_path"] = os.path.join(
+        BASE_DIR, 'static/dist-neue/manifest.json'
+    )
 
 # Additional locations of static files (in addition to each app's static/ dir)
 STATICFILES_DIRS = (
-    DJANGO_VITE_ASSETS_PATH,
+    os.path.join(BASE_DIR, "static/dist-neue"),  # for django_vite
     os.path.join(BASE_DIR, 'static/dist'),
     os.path.join(BASE_DIR, 'secr/static/dist'),
 )
 
 INSTALLED_APPS = [
     # Django apps
-    'django.contrib.admin',
+    'ietf.admin',  # replaces django.contrib.admin
     'django.contrib.admindocs',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -439,16 +464,21 @@ def skip_unreadable_post(record):
     'django_vite',
     'django_bootstrap5',
     'django_celery_beat',
+    'django_celery_results',
     'corsheaders',
     'django_markup',
-    'django_password_strength',
-    'form_utils',
+    'django_filters',
     'oidc_provider',
+    'drf_spectacular',
+    'drf_standardized_errors',
+    'rest_framework',
+    'rangefilter',
     'simple_history',
     'tastypie',
     'widget_tweaks',
     # IETF apps
     'ietf.api',
+    'ietf.blobdb',
     'ietf.community',
     'ietf.dbtemplate',
     'ietf.doc',
@@ -469,18 +499,14 @@ def skip_unreadable_post(record):
     'ietf.release',
     'ietf.review',
     'ietf.stats',
+    'ietf.status',
     'ietf.submit',
     'ietf.sync',
     'ietf.utils',
     # IETF Secretariat apps
     'ietf.secr.announcement',
-    'ietf.secr.areas',
-    'ietf.secr.groups',
     'ietf.secr.meetings',
-    'ietf.secr.proceedings',
-    'ietf.secr.roles',
     'ietf.secr.rolodex',
-    'ietf.secr.sreq',
     'ietf.secr.telechat',
 ]
 
@@ -520,8 +546,6 @@ def skip_unreadable_post(record):
 CORS_ALLOW_METHODS = ( 'GET', 'OPTIONS', )
 CORS_URLS_REGEX = r'^(/api/.*|.*\.json|.*/json/?)$'
 
-# Setting for django_referrer_policy.middleware.ReferrerPolicyMiddleware
-REFERRER_POLICY = 'strict-origin-when-cross-origin'
 
 # django.middleware.security.SecurityMiddleware 
 SECURE_BROWSER_XSS_FILTER       = True
@@ -532,6 +556,9 @@ def skip_unreadable_post(record):
 #SECURE_REDIRECT_EXEMPT
 #SECURE_SSL_HOST 
 #SECURE_SSL_REDIRECT             = True
+# Relax the COOP policy to allow Meetecho authentication pop-up
+SECURE_CROSS_ORIGIN_OPENER_POLICY = "unsafe-none"
+SECURE_REFERRER_POLICY = "strict-origin-when-cross-origin"
 
 # Override this in your settings_local with the IP addresses relevant for you:
 INTERNAL_IPS = (
@@ -540,15 +567,83 @@ def skip_unreadable_post(record):
         '::1',
 )
 
+# django-rest-framework configuration
+REST_FRAMEWORK = {
+    "DEFAULT_AUTHENTICATION_CLASSES": [
+        "ietf.api.authentication.ApiKeyAuthentication",
+        "rest_framework.authentication.SessionAuthentication",
+    ],
+    "DEFAULT_PERMISSION_CLASSES": [
+        "ietf.api.permissions.HasApiKey",
+    ],
+    "DEFAULT_RENDERER_CLASSES": [
+        "rest_framework.renderers.JSONRenderer",
+    ],
+    "DEFAULT_PARSER_CLASSES": [
+        "rest_framework.parsers.JSONParser",
+    ],
+    "DEFAULT_SCHEMA_CLASS": "drf_standardized_errors.openapi.AutoSchema",
+    "EXCEPTION_HANDLER": "drf_standardized_errors.handler.exception_handler",
+}
+
+# DRF OpenApi schema settings
+SPECTACULAR_SETTINGS = {
+    "TITLE": "Datatracker API",
+    "DESCRIPTION": "Datatracker API",
+    "VERSION": "1.0.0",
+    "SCHEMA_PATH_PREFIX": "/api/",
+    "COMPONENT_SPLIT_REQUEST": True,
+    "COMPONENT_NO_READ_ONLY_REQUIRED": True,
+    "SERVERS": [
+        {"url": "http://localhost:8000", "description": "local dev server"},
+        {"url": "https://datatracker.ietf.org", "description": "production server"},
+    ],
+    # The following settings are needed for drf-standardized-errors
+    "ENUM_NAME_OVERRIDES": {
+        "ValidationErrorEnum": "drf_standardized_errors.openapi_serializers.ValidationErrorEnum.choices",
+        "ClientErrorEnum": "drf_standardized_errors.openapi_serializers.ClientErrorEnum.choices",
+        "ServerErrorEnum": "drf_standardized_errors.openapi_serializers.ServerErrorEnum.choices",
+        "ErrorCode401Enum": "drf_standardized_errors.openapi_serializers.ErrorCode401Enum.choices",
+        "ErrorCode403Enum": "drf_standardized_errors.openapi_serializers.ErrorCode403Enum.choices",
+        "ErrorCode404Enum": "drf_standardized_errors.openapi_serializers.ErrorCode404Enum.choices",
+        "ErrorCode405Enum": "drf_standardized_errors.openapi_serializers.ErrorCode405Enum.choices",
+        "ErrorCode406Enum": "drf_standardized_errors.openapi_serializers.ErrorCode406Enum.choices",
+        "ErrorCode415Enum": "drf_standardized_errors.openapi_serializers.ErrorCode415Enum.choices",
+        "ErrorCode429Enum": "drf_standardized_errors.openapi_serializers.ErrorCode429Enum.choices",
+        "ErrorCode500Enum": "drf_standardized_errors.openapi_serializers.ErrorCode500Enum.choices",
+    },
+    "POSTPROCESSING_HOOKS": ["drf_standardized_errors.openapi_hooks.postprocess_schema_enums"],
+}
+
+# DRF Standardized Errors settings
+DRF_STANDARDIZED_ERRORS = {
+    # enable the standardized errors when DEBUG=True for unhandled exceptions.
+    # By default, this is set to False so you're able to view the traceback in
+    # the terminal and get more information about the exception.
+    "ENABLE_IN_DEBUG_FOR_UNHANDLED_EXCEPTIONS": False,
+    # ONLY the responses that correspond to these status codes will appear
+    # in the API schema.
+    "ALLOWED_ERROR_STATUS_CODES": [
+        "400",
+        # "401",
+        # "403",
+        "404",
+        # "405",
+        # "406",
+        # "415",
+        # "429",
+        # "500",
+    ],
+
+}
+
 # no slash at end
 IDTRACKER_BASE_URL = "https://datatracker.ietf.org"
-RFCDIFF_BASE_URL = "https://www.ietf.org/rfcdiff"
+RFCDIFF_BASE_URL = "https://author-tools.ietf.org/iddiff"
 IDNITS_BASE_URL = "https://author-tools.ietf.org/api/idnits"
+IDNITS3_BASE_URL = "https://author-tools.ietf.org/idnits3/results"
 IDNITS_SERVICE_URL = "https://author-tools.ietf.org/idnits"
 
-# Content security policy configuration (django-csp)
-CSP_DEFAULT_SRC = ("'self'", "'unsafe-inline'", f"data: {IDTRACKER_BASE_URL} https://www.ietf.org/ https://analytics.ietf.org/ https://fonts.googleapis.com/")
-
 # The name of the method to use to invoke the test suite
 TEST_RUNNER = 'ietf.utils.test_runner.IetfTestRunner'
 
@@ -558,8 +653,6 @@ def skip_unreadable_post(record):
 
 TEST_DIFF_FAILURE_DIR = "/tmp/test/failure/"
 
-TEST_GHOSTDRIVER_LOG_PATH = "ghostdriver.log"
-
 # These are regexes
 TEST_URL_COVERAGE_EXCLUDE = [
     r"^\^admin/",
@@ -586,9 +679,10 @@ def skip_unreadable_post(record):
     "ietf/utils/test_runner.py",
     "ietf/name/generate_fixtures.py",
     "ietf/review/import_from_review_tool.py",
-    "ietf/stats/backfill_data.py",
     "ietf/utils/patch.py",
     "ietf/utils/test_data.py",
+    "ietf/utils/jstest.py",
+    "ietf/utils/coverage.py",
 ]
 
 # These are code line regex patterns
@@ -602,21 +696,24 @@ def skip_unreadable_post(record):
 ]
 
 # These are filename globs.  They are used by test_parse_templates() and
-# get_template_paths()
+# get_template_paths(). Globs are applied via pathlib.Path().match, using
+# the path to the template from the project root.
 TEST_TEMPLATE_IGNORE = [
-    ".*",                             # dot-files
-    "*~",                             # tilde temp-files
-    "#*",                             # files beginning with a hashmark
-    "500.html"                        # isn't loaded by regular loader, but checked by test_500_page()
+    ".*",  # dot-files
+    "*~",  # tilde temp-files
+    "#*",  # files beginning with a hashmark
+    "500.html",  # isn't loaded by regular loader, but checked by test_500_page()
+    "ietf/templates/admin/meeting/RegistrationTicket/change_list.html",
+    "ietf/templates/admin/meeting/Registration/change_list.html",
 ]
 
-TEST_COVERAGE_MASTER_FILE = os.path.join(BASE_DIR, "../release-coverage.json")
+TEST_COVERAGE_MAIN_FILE = os.path.join(BASE_DIR, "../release-coverage.json")
 TEST_COVERAGE_LATEST_FILE = os.path.join(BASE_DIR, "../latest-coverage.json")
 
 TEST_CODE_COVERAGE_CHECKER = None
 if SERVER_MODE != 'production':
-    import coverage
-    TEST_CODE_COVERAGE_CHECKER = coverage.Coverage(source=[ BASE_DIR ], cover_pylib=False, omit=TEST_CODE_COVERAGE_EXCLUDE_FILES)
+    from ietf.utils.coverage import CoverageManager
+    TEST_CODE_COVERAGE_CHECKER = CoverageManager()
 
 TEST_CODE_COVERAGE_REPORT_PATH = "coverage/"
 TEST_CODE_COVERAGE_REPORT_URL = os.path.join(STATIC_URL, TEST_CODE_COVERAGE_REPORT_PATH, "index.html")
@@ -630,7 +727,7 @@ def skip_unreadable_post(record):
 # document state:
 GROUP_STATES_WITH_EXTRA_PROCESSING = ["sub-pub", "rfc-edit", ]
 
-# Review team releated settings
+# Review team related settings
 GROUP_REVIEW_MAX_ITEMS_TO_SHOW_IN_REVIEWER_LIST = 10
 GROUP_REVIEW_DAYS_TO_SHOW_IN_REVIEWER_LIST = 365
 
@@ -643,6 +740,7 @@ def skip_unreadable_post(record):
     "acronym": r"(?P<acronym>[-a-z0-9]+)",
     "bofreq": r"(?P<name>bofreq-[-a-z0-9]+)",
     "charter": r"(?P<name>charter-[-a-z0-9]+)",
+    "statement": r"(?P<name>statement-[-a-z0-9]+)",
     "date": r"(?P<date>\d{4}-\d{2}-\d{2})",
     "name": r"(?P<name>[A-Za-z0-9._+-]+?)",
     "document": r"(?P<document>[a-z][-a-z0-9]+)", # regular document names
@@ -651,40 +749,98 @@ def skip_unreadable_post(record):
     "schedule_name": r"(?P<name>[A-Za-z0-9-:_]+)",
 }
 
+STORAGES: dict[str, Any] = {
+    "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
+    "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"},
+}
+
+# Storages for artifacts stored as blobs
+ARTIFACT_STORAGE_NAMES: list[str] = [
+    "active-draft",
+    "agenda",
+    "bibxml-ids",
+    "bluesheets",
+    "bofreq",
+    "charter",
+    "chatlog",
+    "conflrev",
+    "draft",
+    "floorplan",
+    "indexes",
+    "liai-att",
+    "meetinghostlogo",
+    "minutes",
+    "narrativeminutes",
+    "photo",
+    "polls",
+    "procmaterials",
+    "review",
+    "rfc",
+    "slides",
+    "staging",
+    "statchg",
+    "statement",
+]
+for storagename in ARTIFACT_STORAGE_NAMES:
+    STORAGES[storagename] = {
+        "BACKEND": "ietf.doc.storage.StoredObjectBlobdbStorage",
+        "OPTIONS": {"bucket_name": storagename},
+    }
+
+# Buckets / doc types of meeting materials the CF worker is allowed to serve. This
+# differs from the list in Session.meeting_related() by the omission of "recording"
+MATERIALS_TYPES_SERVED_BY_WORKER = [
+    "agenda",
+    "bluesheets",
+    "chatlog",
+    "minutes",
+    "narrativeminutes",
+    "polls",
+    "procmaterials",
+    "slides",
+]
+
+# Other storages
+STORAGES["red_bucket"] = {
+    "BACKEND": "django.core.files.storage.InMemoryStorage",
+    "OPTIONS": {"location": "red_bucket"},
+}
+
 # Override this in settings_local.py if needed
 # *_PATH variables ends with a slash/ .
 
-#DOCUMENT_PATH_PATTERN = '/a/www/ietf-ftp/{doc.type_id}/'
 DOCUMENT_PATH_PATTERN = '/a/ietfdata/doc/{doc.type_id}/'
 INTERNET_DRAFT_PATH = '/a/ietfdata/doc/draft/repository'
 INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/'
 RFC_PATH = '/a/www/ietf-ftp/rfc/'
 CHARTER_PATH = '/a/ietfdata/doc/charter/'
+CHARTER_COPY_PATH = '/a/www/ietf-ftp/ietf'  # copy 1wg-charters files here if set
+CHARTER_COPY_OTHER_PATH = '/a/ftp/ietf'
+CHARTER_COPY_THIRD_PATH = '/a/ftp/charter'
+GROUP_SUMMARY_PATH = '/a/www/ietf-ftp/ietf'
 BOFREQ_PATH = '/a/ietfdata/doc/bofreq/'
 CONFLICT_REVIEW_PATH = '/a/ietfdata/doc/conflict-review'
 STATUS_CHANGE_PATH = '/a/ietfdata/doc/status-change'
 AGENDA_PATH = '/a/www/www6s/proceedings/'
 MEETINGHOST_LOGO_PATH = AGENDA_PATH  # put these in the same place as other proceedings files
-IPR_DOCUMENT_PATH = '/a/www/ietf-ftp/ietf/IPR/'
-IESG_TASK_FILE = '/a/www/www6/iesg/internal/task.txt'
-IESG_ROLL_CALL_FILE = '/a/www/www6/iesg/internal/rollcall.txt'
-IESG_ROLL_CALL_URL = 'https://www6.ietf.org/iesg/internal/rollcall.txt'
-IESG_MINUTES_FILE = '/a/www/www6/iesg/internal/minutes.txt'
-IESG_MINUTES_URL = 'https://www6.ietf.org/iesg/internal/minutes.txt'
-IESG_WG_EVALUATION_DIR = "/a/www/www6/iesg/evaluation"
 # Move drafts to this directory when they expire
 INTERNET_DRAFT_ARCHIVE_DIR = '/a/ietfdata/doc/draft/collection/draft-archive/'
-# The following directory contains linked copies of all drafts, but don't
-# write anything to this directory -- its content is maintained by ghostlinkd:
+# The following directory contains copies of all drafts - it used to be
+# a set of hardlinks maintained by ghostlinkd, but is now explicitly written to
 INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/a/ietfdata/doc/draft/archive'
 MEETING_RECORDINGS_DIR = '/a/www/audio'
 DERIVED_DIR = '/a/ietfdata/derived'
+FTP_DIR = '/a/ftp'
+ALL_ID_DOWNLOAD_DIR = '/a/www/www6s/download'
+NFS_METRICS_TMP_DIR = '/a/tmp'
 
-DOCUMENT_FORMAT_WHITELIST = ["txt", "ps", "pdf", "xml", "html", ]
+DOCUMENT_FORMAT_ALLOWLIST = ["txt", "ps", "pdf", "xml", "html", ]
 
 # Mailing list info URL for lists hosted on the IETF servers
-MAILING_LIST_INFO_URL = "https://www.ietf.org/mailman/listinfo/%(list_addr)s"
+MAILING_LIST_INFO_URL = "https://mailman3.%(domain)s/mailman3/lists/%(list_addr)s.%(domain)s"
 MAILING_LIST_ARCHIVE_URL = "https://mailarchive.ietf.org"
+MAILING_LIST_ARCHIVE_SEARCH_URL = "https://mailarchive.ietf.org/api/v1/message/search/"
+MAILING_LIST_ARCHIVE_API_KEY = "changeme"
 
 # Liaison Statement Tool settings (one is used in DOC_HREFS below)
 LIAISON_UNIVERSAL_FROM = 'Liaison Statement Management Tool <statements@' + IETF_DOMAIN + '>'
@@ -696,7 +852,7 @@ def skip_unreadable_post(record):
 DOC_HREFS = {
     "charter":  "https://www.ietf.org/charter/{doc.name}-{doc.rev}.txt",
     "draft":    "https://www.ietf.org/archive/id/{doc.name}-{doc.rev}.txt",
-    "rfc":      "https://www.rfc-editor.org/rfc/rfc{doc.rfcnum}.txt",
+    "rfc":      "https://www.rfc-editor.org/rfc/rfc{doc.rfc_number}.txt",
     "slides": "https://www.ietf.org/slides/{doc.name}-{doc.rev}",
     "procmaterials": "https://www.ietf.org/procmaterials/{doc.name}-{doc.rev}",
     "conflrev": "https://www.ietf.org/cr/{doc.name}-{doc.rev}.txt",
@@ -716,44 +872,6 @@ def skip_unreadable_post(record):
 CACHE_MIDDLEWARE_SECONDS = 300
 CACHE_MIDDLEWARE_KEY_PREFIX = ''
 
-# The default with no CACHES setting is 'django.core.cache.backends.locmem.LocMemCache'
-# This setting is possibly overridden further down, after the import of settings_local
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '127.0.0.1:11211',
-        'VERSION': __version__,
-        'KEY_PREFIX': 'ietf:dt',
-    },
-    'sessions': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '127.0.0.1:11211',
-        # No release-specific VERSION setting.
-        'KEY_PREFIX': 'ietf:dt',
-    },
-    'htmlized': {
-        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-        'LOCATION': '/a/cache/datatracker/htmlized',
-        'OPTIONS': {
-            'MAX_ENTRIES': 100000,      # 100,000
-        },
-    },
-    'pdfized': {
-        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-        'LOCATION': '/a/cache/datatracker/pdfized',
-        'OPTIONS': {
-            'MAX_ENTRIES': 100000,      # 100,000
-        },
-    },
-    'slowpages': {
-        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-        'LOCATION': '/a/cache/datatracker/slowpages',
-        'OPTIONS': {
-            'MAX_ENTRIES': 5000,
-        },
-    },
-}
-
 HTMLIZER_VERSION = 1
 HTMLIZER_URL_PREFIX = "/doc/html"
 HTMLIZER_CACHE_TIME = 60*60*24*14       # 14 days
@@ -766,16 +884,14 @@ def skip_unreadable_post(record):
 SESSION_REQUEST_FROM_EMAIL = 'IETF Meeting Session Request Tool <session-request@ietf.org>' 
 
 SECRETARIAT_SUPPORT_EMAIL = "support@ietf.org"
-SECRETARIAT_ACTION_EMAIL = "ietf-action@ietf.org"
-SECRETARIAT_INFO_EMAIL = "ietf-info@ietf.org"
+SECRETARIAT_ACTION_EMAIL = SECRETARIAT_SUPPORT_EMAIL
+SECRETARIAT_INFO_EMAIL = SECRETARIAT_SUPPORT_EMAIL
 
 # Put real password in settings_local.py
 IANA_SYNC_PASSWORD = "secret"
 IANA_SYNC_CHANGES_URL = "https://datatracker.iana.org:4443/data-tracker/changes"
 IANA_SYNC_PROTOCOLS_URL = "https://www.iana.org/protocols/"
 
-RFC_TEXT_RSYNC_SOURCE="ftp.rfc-editor.org::rfcs-text-only"
-
 RFC_EDITOR_SYNC_PASSWORD="secret"
 RFC_EDITOR_SYNC_NOTIFICATION_URL = "https://www.rfc-editor.org/parser/parser.php"
 RFC_EDITOR_GROUP_NOTIFICATION_EMAIL = "webmaster@rfc-editor.org"
@@ -783,17 +899,18 @@ def skip_unreadable_post(record):
 RFC_EDITOR_QUEUE_URL = "https://www.rfc-editor.org/queue2.xml"
 RFC_EDITOR_INDEX_URL = "https://www.rfc-editor.org/rfc/rfc-index.xml"
 RFC_EDITOR_ERRATA_JSON_URL = "https://www.rfc-editor.org/errata.json"
-RFC_EDITOR_ERRATA_URL = "https://www.rfc-editor.org/errata_search.php?rfc={rfc_number}&amp;rec_status=0"
 RFC_EDITOR_INLINE_ERRATA_URL = "https://www.rfc-editor.org/rfc/inline-errata/rfc{rfc_number}.html"
+RFC_EDITOR_ERRATA_BASE_URL = "https://www.rfc-editor.org/errata/"
 RFC_EDITOR_INFO_BASE_URL = "https://www.rfc-editor.org/info/"
 
+
 # NomCom Tool settings
 ROLODEX_URL = ""
 NOMCOM_PUBLIC_KEYS_DIR = '/a/www/nomcom/public_keys/'
 NOMCOM_FROM_EMAIL = 'nomcom-chair-{year}@ietf.org'
 OPENSSL_COMMAND = '/usr/bin/openssl'
 DAYS_TO_EXPIRE_NOMINATION_LINK = ''
-NOMINEE_FEEDBACK_TYPES = ['comment', 'questio', 'nomina']
+NOMINEE_FEEDBACK_TYPES = ['comment', 'questio', 'nomina', 'obe']
 
 # SlideSubmission settings
 SLIDE_STAGING_PATH = '/a/www/www6s/staging/'
@@ -848,7 +965,8 @@ def skip_unreadable_post(record):
 # Max time to allow for validation before a submission is subject to cancellation
 IDSUBMIT_MAX_VALIDATION_TIME = datetime.timedelta(minutes=20)
 
-IDSUBMIT_MANUAL_STAGING_DIR = '/tmp/'
+# Age at which a submission expires if not posted
+IDSUBMIT_EXPIRATION_AGE = datetime.timedelta(days=14)
 
 IDSUBMIT_FILE_TYPES = (
     'txt',
@@ -888,6 +1006,7 @@ def skip_unreadable_post(record):
 MEETING_DOC_LOCAL_HREFS = {
     "agenda": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}",
     "minutes": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}",
+    "narrativeminutes": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}",
     "slides": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}",
     "chatlog": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}",
     "polls": "/meeting/{meeting.number}/materials/{doc.name}-{doc.rev}",
@@ -899,6 +1018,7 @@ def skip_unreadable_post(record):
 MEETING_DOC_CDN_HREFS = {
     "agenda": "https://www.ietf.org/proceedings/{meeting.number}/agenda/{doc.name}-{doc.rev}",
     "minutes": "https://www.ietf.org/proceedings/{meeting.number}/minutes/{doc.name}-{doc.rev}",
+    "narrativeminutes": "https://www.ietf.org/proceedings/{meeting.number}/narrative-minutes/{doc.name}-{doc.rev}",
     "slides": "https://www.ietf.org/proceedings/{meeting.number}/slides/{doc.name}-{doc.rev}",
     "recording": "{doc.external_url}",
     "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}",
@@ -910,6 +1030,7 @@ def skip_unreadable_post(record):
 MEETING_DOC_OLD_HREFS = {
     "agenda": "/meeting/{meeting.number}/materials/{doc.name}",
     "minutes": "/meeting/{meeting.number}/materials/{doc.name}",
+    "narrativeminutes" : "/meeting/{meeting.number}/materials/{doc.name}",
     "slides": "/meeting/{meeting.number}/materials/{doc.name}",
     "recording": "{doc.external_url}",
     "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}",
@@ -919,6 +1040,7 @@ def skip_unreadable_post(record):
 MEETING_DOC_GREFS = {
     "agenda": "/meeting/{meeting.number}/materials/{doc.name}",
     "minutes": "/meeting/{meeting.number}/materials/{doc.name}",
+    "narrativeminutes": "/meeting/{meeting.number}/materials/{doc.name}",
     "slides": "/meeting/{meeting.number}/materials/{doc.name}",
     "recording": "{doc.external_url}",
     "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.uploaded_filename}",
@@ -932,6 +1054,7 @@ def skip_unreadable_post(record):
 MEETING_VALID_UPLOAD_EXTENSIONS = {
     'agenda':       ['.txt','.html','.htm', '.md', ],
     'minutes':      ['.txt','.html','.htm', '.md', '.pdf', ],
+    'narrativeminutes': ['.txt','.html','.htm', '.md', '.pdf', ],
     'slides':       ['.doc','.docx','.pdf','.ppt','.pptx','.txt', ], # Note the removal of .zip
     'bluesheets':   ['.pdf', '.txt', ],
     'procmaterials':['.pdf', ],
@@ -941,6 +1064,7 @@ def skip_unreadable_post(record):
 MEETING_VALID_UPLOAD_MIME_TYPES = {
     'agenda':       ['text/plain', 'text/html', 'text/markdown', 'text/x-markdown', ],
     'minutes':      ['text/plain', 'text/html', 'application/pdf', 'text/markdown', 'text/x-markdown', ],
+    'narrativeminutes': ['text/plain', 'text/html', 'application/pdf', 'text/markdown', 'text/x-markdown', ],
     'slides':       [],
     'bluesheets':   ['application/pdf', 'text/plain', ],
     'procmaterials':['application/pdf', ],
@@ -972,8 +1096,6 @@ def skip_unreadable_post(record):
 FLOORPLAN_MEDIA_DIR = 'floor'
 FLOORPLAN_DIR = os.path.join(MEDIA_ROOT, FLOORPLAN_MEDIA_DIR)
 
-
-MEETING_USES_CODIMD_DATE = datetime.date(2020,7,6)
 MEETING_LEGACY_OFFICE_HOURS_END = 112  # last meeting to use legacy office hours representation
 
 # Maximum dimensions to accept at all
@@ -997,32 +1119,35 @@ def skip_unreadable_post(record):
 # ==============================================================================
 
 
-RSYNC_BINARY = '/usr/bin/rsync'
 YANGLINT_BINARY = '/usr/bin/yanglint'
 DE_GFM_BINARY = '/usr/bin/de-gfm.ruby2.5'
 
 # Account settings
 DAYS_TO_EXPIRE_REGISTRATION_LINK = 3
 MINUTES_TO_EXPIRE_RESET_PASSWORD_LINK = 60
-HTPASSWD_COMMAND = "/usr/bin/htpasswd"
-HTPASSWD_FILE = "/www/htpasswd"
 
 # Generation of pdf files
 GHOSTSCRIPT_COMMAND = "/usr/bin/gs"
 
-# Generation of bibxml files (currently only for internet drafts)
+# Generation of bibxml files (currently only for Internet-Drafts)
 BIBXML_BASE_PATH = '/a/ietfdata/derived/bibxml'
 
 # Timezone files for iCalendar
 TZDATA_ICS_PATH = BASE_DIR + '/../vzic/zoneinfo/'
 
-SECR_BLUE_SHEET_PATH = '/a/www/ietf-datatracker/documents/blue_sheet.rtf'
-SECR_BLUE_SHEET_URL = IDTRACKER_BASE_URL + '/documents/blue_sheet.rtf'
-SECR_INTERIM_LISTING_DIR = '/a/www/www6/meeting/interim'
-SECR_MAX_UPLOAD_SIZE = 40960000
-SECR_PROCEEDINGS_DIR = '/a/www/www6s/proceedings/'
-SECR_PPT2PDF_COMMAND = ['/usr/bin/soffice','--headless','--convert-to','pdf:writer_globaldocument_pdf_Export','--outdir']
-STATS_REGISTRATION_ATTENDEES_JSON_URL = 'https://registration.ietf.org/{number}/attendees/'
+DATATRACKER_MAX_UPLOAD_SIZE = 40960000
+PPT2PDF_COMMAND = [
+    "/usr/bin/soffice",
+    "--headless", # no GUI
+    "--safe-mode", # use a new libreoffice profile every time (ensures no reliance on accumulated profile config)
+    "--norestore", # don't attempt to restore files after a previous crash (ensures that one crash won't block future conversions until UI intervention)
+    "--convert-to", "pdf:writer_globaldocument_pdf_Export",
+    "--outdir"
+]
+
+REGISTRATION_PARTICIPANTS_API_URL = 'https://registration.ietf.org/api/v1/participants-dt/'
+REGISTRATION_PARTICIPANTS_API_KEY = 'changeme'
+
 PROCEEDINGS_VERSION_CHANGES = [
     0,   # version 1
     97,  # version 2: meeting 97 and later (was number was NEW_PROCEEDINGS_START)
@@ -1041,10 +1166,7 @@ def skip_unreadable_post(record):
 # If we need to revert to xmpp
 # CHAT_ARCHIVE_URL_PATTERN = 'https://www.ietf.org/jabber/logs/{chat_room_name}?C=M;O=D'
 
-PRODUCTION_TIMEZONE = "America/Los_Angeles"
-
 PYFLAKES_DEFAULT_ARGS= ["ietf", ]
-VULTURE_DEFAULT_ARGS= ["ietf", ]
 
 # Automatic Scheduling
 #
@@ -1091,16 +1213,6 @@ def skip_unreadable_post(record):
 
 TEST_DATA_DIR = os.path.abspath(BASE_DIR + "/../test/data")
 
-# Path to the email alias lists.  Used by ietf.utils.aliases
-DRAFT_ALIASES_PATH = os.path.join(TEST_DATA_DIR, "draft-aliases")
-DRAFT_VIRTUAL_PATH = os.path.join(TEST_DATA_DIR, "draft-virtual")
-DRAFT_VIRTUAL_DOMAIN = "virtual.ietf.org"
-
-GROUP_ALIASES_PATH = os.path.join(TEST_DATA_DIR, "group-aliases")
-GROUP_VIRTUAL_PATH = os.path.join(TEST_DATA_DIR, "group-virtual")
-GROUP_VIRTUAL_DOMAIN = "virtual.ietf.org"
-
-POSTCONFIRM_PATH   = "/a/postconfirm/wrapper"
 
 USER_PREFERENCE_DEFAULTS = {
     "expires_soon"  : "14",
@@ -1116,21 +1228,23 @@ def skip_unreadable_post(record):
     "@ietf.org$",
 ]
 
+# Configuration for django-markup
 MARKUP_SETTINGS = {
     'restructuredtext': {
         'settings_overrides': {
+            'report_level': 3,  # error (3) or severe (4) only
             'initial_header_level': 3,
             'doctitle_xform': False,
             'footnote_references': 'superscript',
             'trim_footnote_reference_space': True,
             'default_reference_context': 'view',
+            'raw_enabled': False,  # critical for security
+            'file_insertion_enabled': False,  # critical for security
             'link_base': ''
         }
     }
 }
 
-MAILMAN_LIB_DIR = '/usr/lib/mailman'
-
 # This is the number of seconds required between subscribing to an ietf
 # mailing list and datatracker account creation being accepted
 LIST_ACCOUNT_DELAY = 60*60*25           # 25 hours
@@ -1139,14 +1253,13 @@ def skip_unreadable_post(record):
 
 SILENCED_SYSTEM_CHECKS = [
     "fields.W342",  # Setting unique=True on a ForeignKey has the same effect as using a OneToOneField.
+    "fields.W905",  # django.contrib.postgres.fields.CICharField is deprecated. (see https://github.com/ietf-tools/datatracker/issues/5660)
 ]
 
 CHECKS_LIBRARY_PATCHES_TO_APPLY = [
     'patch/change-oidc-provider-field-sizes-228.patch',
     'patch/fix-oidc-access-token-post.patch',
     'patch/fix-jwkest-jwt-logging.patch',
-    'patch/fix-django-password-strength-kwargs.patch',
-    'patch/add-django-http-cookie-value-none.patch',
     'patch/django-cookie-delete-with-all-settings.patch',
     'patch/tastypie-django22-fielderror-response.patch',
 ]
@@ -1189,8 +1302,19 @@ def skip_unreadable_post(record):
 CELERY_BROKER_URL = 'amqp://mq/'
 CELERY_BEAT_SCHEDULER = 'django_celery_beat.schedulers:DatabaseScheduler'
 CELERY_BEAT_SYNC_EVERY = 1  # update DB after every event
-assert not USE_TZ, 'Drop DJANGO_CELERY_BEAT_TZ_AWARE setting once USE_TZ is True!'
-DJANGO_CELERY_BEAT_TZ_AWARE = False
+CELERY_BEAT_CRON_STARTING_DEADLINE = 1800  # seconds after a missed deadline before abandoning a cron task
+CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP = True  # the default, but setting it squelches a warning
+# Use a result backend so we can chain tasks. This uses the rpc backend, see
+# https://docs.celeryq.dev/en/stable/userguide/tasks.html#rpc-result-backend-rabbitmq-qpid
+# Results can be retrieved only once and only by the caller of the task. Results will be
+# lost if the message broker restarts.
+CELERY_RESULT_BACKEND = 'django-cache'  # use a Django cache for results
+CELERY_CACHE_BACKEND = 'celery-results'  # which Django cache to use
+CELERY_RESULT_EXPIRES = datetime.timedelta(minutes=5)  # how long are results valid? (Default is 1 day)
+CELERY_TASK_IGNORE_RESULT = True  # ignore results unless specifically enabled for a task
+CELERY_TASK_ROUTES = {
+    "ietf.blobdb.tasks.pybob_the_blob_replicator_task": {"queue": "blobdb"}
+}
 
 # Meetecho API setup: Uncomment this and provide real credentials to enable
 # Meetecho conference creation for interim session requests
@@ -1200,8 +1324,22 @@ def skip_unreadable_post(record):
 #     'client_id': 'datatracker',
 #     'client_secret': 'some secret',
 #     'request_timeout': 3.01,  # python-requests doc recommend slightly > a multiple of 3 seconds
+#     # How many minutes before/after session to enable slide update API. Defaults to 15. Set to None to disable,
+#     # or < 0 to _always_ send updates (useful for debugging)
+#     'slides_notify_time': 15, 
+#     'debug': False,  # if True, API calls will be echoed as debug instead of sent (only works for slides for now)
 # }
 
+# Meetecho URLs - instantiate with url.format(session=some_session)
+MEETECHO_ONSITE_TOOL_URL = "https://meetings.conf.meetecho.com/onsite{session.meeting.number}/?session={session.pk}"
+MEETECHO_VIDEO_STREAM_URL = "https://meetings.conf.meetecho.com/ietf{session.meeting.number}/?session={session.pk}"
+MEETECHO_AUDIO_STREAM_URL = "https://mp3.conf.meetecho.com/ietf{session.meeting.number}/{session.pk}.m3u"
+MEETECHO_SESSION_RECORDING_URL = "https://meetecho-player.ietf.org/playout/?session={session_label}"
+
+# Errata system api configuration
+# settings should provide
+# ERRATA_METADATA_NOTIFICATION_URL
+# ERRATA_METADATA_NOTIFICATION_API_KEY
 
 # Put the production SECRET_KEY in settings_local.py, and also any other
 # sensitive or site-specific changes.  DO NOT commit settings_local.py to svn.
@@ -1222,6 +1360,143 @@ def skip_unreadable_post(record):
     MIDDLEWARE += DEV_MIDDLEWARE
     TEMPLATES[0]['OPTIONS']['context_processors'] += DEV_TEMPLATE_CONTEXT_PROCESSORS
 
+if "CACHES" not in locals():
+    if SERVER_MODE == "production":
+        MEMCACHED_HOST = os.environ.get("MEMCACHED_SERVICE_HOST", "127.0.0.1")
+        MEMCACHED_PORT = os.environ.get("MEMCACHED_SERVICE_PORT", "11211")
+        CACHES = {
+            "default": {
+                "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+                "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+                "VERSION": __version__,
+                "KEY_PREFIX": "ietf:dt",
+                # Key function is default except with sha384-encoded key
+                "KEY_FUNCTION": lambda key, key_prefix, version: (
+                    f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+                ),
+            },
+            "agenda": {
+                "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+                "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+                # No release-specific VERSION setting.
+                "KEY_PREFIX": "ietf:dt:agenda",
+                # Key function is default except with sha384-encoded key
+                "KEY_FUNCTION": lambda key, key_prefix, version: (
+                    f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+                ),
+            },
+            "proceedings": {
+                "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+                "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+                # No release-specific VERSION setting.
+                "KEY_PREFIX": "ietf:dt:proceedings",
+                # Key function is default except with sha384-encoded key
+                "KEY_FUNCTION": lambda key, key_prefix, version: (
+                    f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+                ),
+            },
+            "sessions": {
+                "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+                "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+                # No release-specific VERSION setting.
+                "KEY_PREFIX": "ietf:dt",
+            },
+            "htmlized": {
+                "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
+                "LOCATION": "/a/cache/datatracker/htmlized",
+                "OPTIONS": {
+                    "MAX_ENTRIES": 100000,  # 100,000
+                },
+            },
+            "pdfized": {
+                "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
+                "LOCATION": "/a/cache/datatracker/pdfized",
+                "OPTIONS": {
+                    "MAX_ENTRIES": 100000,  # 100,000
+                },
+            },
+            "slowpages": {
+                "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
+                "LOCATION": "/a/cache/datatracker/slowpages",
+                "OPTIONS": {
+                    "MAX_ENTRIES": 5000,
+                },
+            },
+            "celery-results": {
+                "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
+                "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+                "KEY_PREFIX": "ietf:celery",
+            },
+        }
+    else:
+        CACHES = {
+            "default": {
+                "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+                #'BACKEND': 'ietf.utils.cache.LenientMemcacheCache',
+                #'LOCATION': '127.0.0.1:11211',
+                #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+                "VERSION": __version__,
+                "KEY_PREFIX": "ietf:dt",
+            },
+            "agenda": {
+                "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+                # "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+                # "LOCATION": "127.0.0.1:11211",
+                # No release-specific VERSION setting.
+                "KEY_PREFIX": "ietf:dt:agenda",
+                # Key function is default except with sha384-encoded key
+                "KEY_FUNCTION": lambda key, key_prefix, version: (
+                    f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+                ),
+            },
+            "proceedings": {
+                "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+                # "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+                # "LOCATION": "127.0.0.1:11211",
+                # No release-specific VERSION setting.
+                "KEY_PREFIX": "ietf:dt:proceedings",
+                # Key function is default except with sha384-encoded key
+                "KEY_FUNCTION": lambda key, key_prefix, version: (
+                    f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+                ),
+            },
+            "sessions": {
+                "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+            },
+            "htmlized": {
+                "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+                #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+                "LOCATION": "/var/cache/datatracker/htmlized",
+                "OPTIONS": {
+                    "MAX_ENTRIES": 1000,
+                },
+            },
+            "pdfized": {
+                "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+                #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+                "LOCATION": "/var/cache/datatracker/pdfized",
+                "OPTIONS": {
+                    "MAX_ENTRIES": 1000,
+                },
+            },
+            "slowpages": {
+                "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+                #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+                "LOCATION": "/var/cache/datatracker/",
+                "OPTIONS": {
+                    "MAX_ENTRIES": 5000,
+                },
+            },
+            "celery-results": {
+                "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
+                "LOCATION": "app:11211",
+                "KEY_PREFIX": "ietf:celery",
+            },
+        }
+
+PUBLISH_IPR_STATES = ['posted', 'removed', 'removed_objfalse']
+
+ADVERTISE_VERSIONS = ["markdown", "pyang", "rfc2html", "xml2rfc"]
 
 # We provide a secret key only for test and development modes.  It's
 # absolutely vital that django fails to start in production mode unless a
@@ -1232,44 +1507,6 @@ def skip_unreadable_post(record):
     loaders = TEMPLATES[0]['OPTIONS']['loaders']
     loaders = tuple(l for e in loaders for l in (e[1] if isinstance(e, tuple) and "cached.Loader" in e[0] else (e,)))
     TEMPLATES[0]['OPTIONS']['loaders'] = loaders
-
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-            #'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-            #'LOCATION': '127.0.0.1:11211',
-            #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-            'VERSION': __version__,
-            'KEY_PREFIX': 'ietf:dt',
-        },
-        'sessions': {
-            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        },
-        'htmlized': {
-            'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-            #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-            'LOCATION': '/var/cache/datatracker/htmlized',
-            'OPTIONS': {
-                'MAX_ENTRIES': 1000,
-            },
-        },
-        'pdfized': {
-            'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-            #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-            'LOCATION': '/var/cache/datatracker/pdfized',
-            'OPTIONS': {
-                'MAX_ENTRIES': 1000,
-            },
-        },
-        'slowpages': {
-            'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-            #'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-            'LOCATION': '/var/cache/datatracker/',
-            'OPTIONS': {
-                'MAX_ENTRIES': 5000,
-            },
-        },
-    }
     SESSION_ENGINE = "django.contrib.sessions.backends.db"
 
     if 'SECRET_KEY' not in locals():
@@ -1278,17 +1515,28 @@ def skip_unreadable_post(record):
         NOMCOM_APP_SECRET = b'\x9b\xdas1\xec\xd5\xa0SI~\xcb\xd4\xf5t\x99\xc4i\xd7\x9f\x0b\xa9\xe8\xfeY\x80$\x1e\x12tN:\x84'
 
     ALLOWED_HOSTS = ['*',]
-    
+
     try:
         # see https://github.com/omarish/django-cprofile-middleware
-        import django_cprofile_middleware # pyflakes:ignore
-        MIDDLEWARE = MIDDLEWARE + ['django_cprofile_middleware.middleware.ProfilerMiddleware', ]
+        import django_cprofile_middleware  # pyflakes:ignore
+
+        MIDDLEWARE = MIDDLEWARE + [
+            "django_cprofile_middleware.middleware.ProfilerMiddleware",
+        ]
+        DJANGO_CPROFILE_MIDDLEWARE_REQUIRE_STAFF = (
+            False  # Do not use this setting for a public site!
+        )
     except ImportError:
         pass
 
     # Cannot have this set to True if we're using http: from the dev-server:
     CSRF_COOKIE_SECURE = False
     CSRF_COOKIE_SAMESITE = 'Lax'
+    CSRF_TRUSTED_ORIGINS += ['http://localhost:8000', 'http://127.0.0.1:8000', 'http://[::1]:8000']
     SESSION_COOKIE_SECURE = False
     SESSION_COOKIE_SAMESITE = 'Lax'
-    
+
+
+YOUTUBE_DOMAINS = ['www.youtube.com', 'youtube.com', 'youtu.be', 'm.youtube.com', 'youtube-nocookie.com', 'www.youtube-nocookie.com']
+
+IETF_DOI_PREFIX = "10.17487"
diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py
deleted file mode 100644
index 784e8dea64..0000000000
--- a/ietf/settings_sqlitetest.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright The IETF Trust 2010-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-# Standard settings except we use SQLite and skip migrations, this is
-# useful for speeding up tests that depend on the test database, try
-# for instance:
-#
-#   ./manage.py test --settings=settings_sqlitetest doc.ChangeStateTestCase
-#
-
-import os 
-from ietf.settings import *                                          # pyflakes:ignore
-from ietf.settings import TEST_CODE_COVERAGE_CHECKER, BASE_DIR, PHOTOS_DIRNAME
-import debug                            # pyflakes:ignore
-debug.debug = True
-
-# Use a different hostname, to catch hardcoded values
-IDTRACKER_BASE_URL = "https://sqlitetest.ietf.org"
-
-# Workaround to avoid spending minutes stepping through the migrations in
-# every test run.  The result of this is to use the 'syncdb' way of creating
-# the test database instead of doing it through the migrations.  Taken from
-# https://gist.github.com/NotSqrt/5f3c76cd15e40ef62d09
-
-class DisableMigrations(object):
- 
-    def __contains__(self, item):
-        return True
- 
-    def __getitem__(self, item):
-        return None
-
-MIGRATION_MODULES = DisableMigrations()
-
-
-DATABASES = {
-    'default': {
-        'NAME': 'test.db',
-        'ENGINE': 'django.db.backends.sqlite3',
-        },
-    }
-
-if TEST_CODE_COVERAGE_CHECKER and not TEST_CODE_COVERAGE_CHECKER._started: # pyflakes:ignore
-    TEST_CODE_COVERAGE_CHECKER.start()                          # pyflakes:ignore
-
-NOMCOM_PUBLIC_KEYS_DIR=os.path.abspath("tmp-nomcom-public-keys-dir")
-
-MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'test/media/') # pyflakes:ignore
-MEDIA_URL = '/test/media/'
-PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME                            # pyflakes:ignore
-
-# Undo any developer-dependent middleware when running the tests
-MIDDLEWARE = [ c for c in MIDDLEWARE if not c in DEV_MIDDLEWARE ] # pyflakes:ignore
-
-TEMPLATES[0]['OPTIONS']['context_processors'] = [ p for p in TEMPLATES[0]['OPTIONS']['context_processors'] if not p in DEV_TEMPLATE_CONTEXT_PROCESSORS ] # pyflakes:ignore
-
-REQUEST_PROFILE_STORE_ANONYMOUS_SESSIONS = False
diff --git a/ietf/settings_test.py b/ietf/settings_test.py
new file mode 100755
index 0000000000..e7ebc13eb2
--- /dev/null
+++ b/ietf/settings_test.py
@@ -0,0 +1,126 @@
+# Copyright The IETF Trust 2010-2023, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+# Standard settings except we use Postgres and skip migrations, this is
+# useful for speeding up tests that depend on the test database, try
+# for instance:
+#
+#   ./manage.py test --settings=settings_test doc.ChangeStateTestCase
+#
+
+import atexit
+import os
+import shutil
+import tempfile
+from ietf.settings import *                                          # pyflakes:ignore
+from ietf.settings import ORIG_AUTH_PASSWORD_VALIDATORS, STORAGES
+import debug                            # pyflakes:ignore
+debug.debug = True
+
+# Use a different hostname, to catch hardcoded values
+IDTRACKER_BASE_URL = "https://postgrestest.ietf.org"
+
+# Workaround to avoid spending minutes stepping through the migrations in
+# every test run.  The result of this is to use the 'syncdb' way of creating
+# the test database instead of doing it through the migrations.  Taken from
+# https://gist.github.com/NotSqrt/5f3c76cd15e40ef62d09
+
+class DisableMigrations(object):
+ 
+    def __contains__(self, item):
+        return True
+ 
+    def __getitem__(self, item):
+        return None
+
+MIGRATION_MODULES = DisableMigrations()
+
+
+DATABASES = {
+    'default': {
+        'HOST': 'db',
+        'PORT': '5432',
+        'NAME': 'test.db',
+        'ENGINE': 'django.db.backends.postgresql',
+        'USER': 'django',
+        'PASSWORD': 'RkTkDPFnKpko',
+        },
+    }
+
+# test with a single DB - do not use a DB router
+BLOBDB_DATABASE = "default"
+DATABASE_ROUTERS = []  # type: ignore
+
+if TEST_CODE_COVERAGE_CHECKER: # pyflakes:ignore
+    TEST_CODE_COVERAGE_CHECKER.start()                          # pyflakes:ignore
+
+def tempdir_with_cleanup(**kwargs):
+    """Utility to create a temporary dir and arrange cleanup"""
+    _dir = tempfile.mkdtemp(**kwargs)
+    atexit.register(shutil.rmtree, _dir)
+    return _dir
+
+
+NOMCOM_PUBLIC_KEYS_DIR = tempdir_with_cleanup(suffix="-nomcom-public-keys-dir")
+
+MEDIA_ROOT = tempdir_with_cleanup(suffix="-media")
+PHOTOS_DIRNAME = "photo"
+PHOTOS_DIR = os.path.join(MEDIA_ROOT, PHOTOS_DIRNAME)
+os.mkdir(PHOTOS_DIR)
+
+# Undo any developer-dependent middleware when running the tests
+MIDDLEWARE = [ c for c in MIDDLEWARE if not c in DEV_MIDDLEWARE ] # pyflakes:ignore
+
+TEMPLATES[0]['OPTIONS']['context_processors'] = [ p for p in TEMPLATES[0]['OPTIONS']['context_processors'] if not p in DEV_TEMPLATE_CONTEXT_PROCESSORS ] # pyflakes:ignore
+
+REQUEST_PROFILE_STORE_ANONYMOUS_SESSIONS = False
+
+# Override loggers with a safer set in case things go to the log during testing. Specifically,
+# make sure there are no syslog loggers that might send things to a real syslog.
+LOGGING["loggers"] = {  # pyflakes:ignore
+    'django': {
+        'handlers': ['debug_console'],
+        'level': 'INFO',
+    },
+    'django.request': {
+        'handlers': ['debug_console'],
+        'level': 'ERROR',
+    },
+    'django.server': {
+        'handlers': ['django.server'],
+        'level': 'INFO',
+    },
+    'django.security': {
+        'handlers': ['debug_console', ],
+        'level': 'INFO',
+    },
+    'oidc_provider': {
+        'handlers': ['debug_console', ],
+        'level': 'DEBUG',
+    },
+    'datatracker': {
+        'handlers': ['debug_console'],
+        'level': 'INFO',
+    },
+    'celery': {
+        'handlers': ['debug_console'],
+        'level': 'INFO',
+    },
+}
+
+# Restore AUTH_PASSWORD_VALIDATORS if they were reset in settings_local
+try:
+    AUTH_PASSWORD_VALIDATORS = ORIG_AUTH_PASSWORD_VALIDATORS
+except NameError:
+    pass
+
+# Use InMemoryStorage for red bucket and r2-rfc storages
+STORAGES["red_bucket"] = {
+    "BACKEND": "django.core.files.storage.InMemoryStorage",
+    "OPTIONS": {"location": "red_bucket"},
+}
+STORAGES["r2-rfc"] = {
+    "BACKEND": "django.core.files.storage.InMemoryStorage",
+    "OPTIONS": {"location": "r2-rfc"},
+}
diff --git a/ietf/settings_testcrawl.py b/ietf/settings_testcrawl.py
index a1b5ce8946..edb978757a 100644
--- a/ietf/settings_testcrawl.py
+++ b/ietf/settings_testcrawl.py
@@ -27,9 +27,14 @@
             'MAX_ENTRIES': 10000,
         },
     },
+    'agenda': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+    },
+    'proceedings': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+    },
     'sessions': {
         'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        # No version-specific VERSION setting.
     },
     'htmlized': {
         'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
diff --git a/ietf/static/css/custom-bs-import.scss b/ietf/static/css/custom-bs-import.scss
new file mode 100644
index 0000000000..644efdcf10
--- /dev/null
+++ b/ietf/static/css/custom-bs-import.scss
@@ -0,0 +1,58 @@
+@import "bootstrap/scss/functions";
+
+// Enable negative margin classes.
+$enable-negative-margins: true;
+
+// Don't add carets to dropdowns by default.
+// $enable-caret: false;
+
+$popover-max-width: 100%;
+
+// Override default fonts
+
+$font-family-sans-serif: "Inter",
+system-ui,
+-apple-system,
+"Segoe UI",
+Roboto,
+"Helvetica Neue",
+"Noto Sans",
+"Liberation Sans",
+Arial,
+sans-serif,
+"Apple Color Emoji",
+"Segoe UI Emoji",
+"Segoe UI Symbol",
+"Noto Color Emoji";
+$font-family-monospace: "Noto Sans Mono",
+SFMono-Regular,
+Menlo,
+Monaco,
+Consolas,
+"Liberation Mono",
+"Courier New",
+monospace;
+
+// Enable color modes
+$color-mode-type: data;
+
+@import "bootstrap/scss/variables";
+@import "bootstrap/scss/variables-dark";
+
+$h1-font-size: $font-size-base * 2.2;
+$h2-font-size: $font-size-base * 1.8;
+$h3-font-size: $font-size-base * 1.6;
+$h4-font-size: $font-size-base * 1.4;
+$h5-font-size: $font-size-base * 1.2;
+$h6-font-size: $font-size-base;
+
+// Default is gray-800, which is the same as the range slider background.
+$light-bg-subtle-dark: mix($gray-800, $black);
+
+@import "bootstrap/scss/maps";
+@import "bootstrap/scss/mixins";
+@import "bootstrap/scss/utilities";
+@import "bootstrap/scss/root";
+
+
+
diff --git a/ietf/static/css/datepicker.scss b/ietf/static/css/datepicker.scss
index c25b790e0b..b193ccda3a 100644
--- a/ietf/static/css/datepicker.scss
+++ b/ietf/static/css/datepicker.scss
@@ -1,683 +1,32 @@
-/*!
- * Datepicker for Bootstrap v1.9.0 (https://github.com/uxsolutions/bootstrap-datepicker)
- *
- * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
+@import "custom-bs-import";
 
- .datepicker {
-    border-radius: 4px;
-    direction: ltr;
-  }
-  .datepicker-inline {
-    width: 220px;
-  }
-  .datepicker-rtl {
-    direction: rtl;
-  }
-  .datepicker-rtl.dropdown-menu {
-    left: auto;
-  }
-  .datepicker-rtl table tr td span {
-    float: right;
-  }
-  .datepicker-dropdown {
-    top: 0;
-    left: 0;
-    padding: 4px;
-  }
-  .datepicker-dropdown:before {
-    content: '';
-    display: inline-block;
-    border-left: 7px solid transparent;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid rgba(0, 0, 0, 0.15);
-    border-top: 0;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    position: absolute;
-  }
-  .datepicker-dropdown:after {
-    content: '';
-    display: inline-block;
-    border-left: 6px solid transparent;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-top: 0;
-    position: absolute;
-  }
-  .datepicker-dropdown.datepicker-orient-left:before {
-    left: 6px;
-  }
-  .datepicker-dropdown.datepicker-orient-left:after {
-    left: 7px;
-  }
-  .datepicker-dropdown.datepicker-orient-right:before {
-    right: 6px;
-  }
-  .datepicker-dropdown.datepicker-orient-right:after {
-    right: 7px;
-  }
-  .datepicker-dropdown.datepicker-orient-bottom:before {
-    top: -7px;
-  }
-  .datepicker-dropdown.datepicker-orient-bottom:after {
-    top: -6px;
-  }
-  .datepicker-dropdown.datepicker-orient-top:before {
-    bottom: -7px;
-    border-bottom: 0;
-    border-top: 7px solid rgba(0, 0, 0, 0.15);
-  }
-  .datepicker-dropdown.datepicker-orient-top:after {
-    bottom: -6px;
-    border-bottom: 0;
-    border-top: 6px solid #fff;
-  }
-  .datepicker table {
-    margin: 0;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-  }
-  .datepicker table tr td,
-  .datepicker table tr th {
-    text-align: center;
-    width: 30px;
-    height: 30px;
-    border-radius: 4px;
-    border: none;
-  }
-  .table-striped .datepicker table tr td,
-  .table-striped .datepicker table tr th {
-    background-color: transparent;
-  }
-  .datepicker table tr td.old,
-  .datepicker table tr td.new {
-    color: #777777;
-  }
-  .datepicker table tr td.day:hover,
-  .datepicker table tr td.focused {
-    background: #eeeeee;
-    cursor: pointer;
-  }
-  .datepicker table tr td.disabled,
-  .datepicker table tr td.disabled:hover {
-    background: none;
-    color: #777777;
-    cursor: default;
-  }
-  .datepicker table tr td.highlighted {
-    color: #000;
-    background-color: #d9edf7;
-    border-color: #85c5e5;
-    border-radius: 0;
-  }
-  .datepicker table tr td.highlighted:focus,
-  .datepicker table tr td.highlighted.focus {
-    color: #000;
-    background-color: #afd9ee;
-    border-color: #298fc2;
-  }
-  .datepicker table tr td.highlighted:hover {
-    color: #000;
-    background-color: #afd9ee;
-    border-color: #52addb;
-  }
-  .datepicker table tr td.highlighted:active,
-  .datepicker table tr td.highlighted.active {
-    color: #000;
-    background-color: #afd9ee;
-    border-color: #52addb;
-  }
-  .datepicker table tr td.highlighted:active:hover,
-  .datepicker table tr td.highlighted.active:hover,
-  .datepicker table tr td.highlighted:active:focus,
-  .datepicker table tr td.highlighted.active:focus,
-  .datepicker table tr td.highlighted:active.focus,
-  .datepicker table tr td.highlighted.active.focus {
-    color: #000;
-    background-color: #91cbe8;
-    border-color: #298fc2;
-  }
-  .datepicker table tr td.highlighted.disabled:hover,
-  .datepicker table tr td.highlighted[disabled]:hover,
-  fieldset[disabled] .datepicker table tr td.highlighted:hover,
-  .datepicker table tr td.highlighted.disabled:focus,
-  .datepicker table tr td.highlighted[disabled]:focus,
-  fieldset[disabled] .datepicker table tr td.highlighted:focus,
-  .datepicker table tr td.highlighted.disabled.focus,
-  .datepicker table tr td.highlighted[disabled].focus,
-  fieldset[disabled] .datepicker table tr td.highlighted.focus {
-    background-color: #d9edf7;
-    border-color: #85c5e5;
-  }
-  .datepicker table tr td.highlighted.focused {
-    background: #afd9ee;
-  }
-  .datepicker table tr td.highlighted.disabled,
-  .datepicker table tr td.highlighted.disabled:active {
-    background: #d9edf7;
-    color: #777777;
-  }
-  .datepicker table tr td.today {
-    color: #000;
-    background-color: #ffdb99;
-    border-color: #ffb733;
-  }
-  .datepicker table tr td.today:focus,
-  .datepicker table tr td.today.focus {
-    color: #000;
-    background-color: #ffc966;
-    border-color: #b37400;
-  }
-  .datepicker table tr td.today:hover {
-    color: #000;
-    background-color: #ffc966;
-    border-color: #f59e00;
-  }
-  .datepicker table tr td.today:active,
-  .datepicker table tr td.today.active {
-    color: #000;
-    background-color: #ffc966;
-    border-color: #f59e00;
-  }
-  .datepicker table tr td.today:active:hover,
-  .datepicker table tr td.today.active:hover,
-  .datepicker table tr td.today:active:focus,
-  .datepicker table tr td.today.active:focus,
-  .datepicker table tr td.today:active.focus,
-  .datepicker table tr td.today.active.focus {
-    color: #000;
-    background-color: #ffbc42;
-    border-color: #b37400;
-  }
-  .datepicker table tr td.today.disabled:hover,
-  .datepicker table tr td.today[disabled]:hover,
-  fieldset[disabled] .datepicker table tr td.today:hover,
-  .datepicker table tr td.today.disabled:focus,
-  .datepicker table tr td.today[disabled]:focus,
-  fieldset[disabled] .datepicker table tr td.today:focus,
-  .datepicker table tr td.today.disabled.focus,
-  .datepicker table tr td.today[disabled].focus,
-  fieldset[disabled] .datepicker table tr td.today.focus {
-    background-color: #ffdb99;
-    border-color: #ffb733;
-  }
-  .datepicker table tr td.today.focused {
-    background: #ffc966;
-  }
-  .datepicker table tr td.today.disabled,
-  .datepicker table tr td.today.disabled:active {
-    background: #ffdb99;
-    color: #777777;
-  }
-  .datepicker table tr td.range {
-    color: #000;
-    background-color: #eeeeee;
-    border-color: #bbbbbb;
-    border-radius: 0;
-  }
-  .datepicker table tr td.range:focus,
-  .datepicker table tr td.range.focus {
-    color: #000;
-    background-color: #d5d5d5;
-    border-color: #7c7c7c;
-  }
-  .datepicker table tr td.range:hover {
-    color: #000;
-    background-color: #d5d5d5;
-    border-color: #9d9d9d;
-  }
-  .datepicker table tr td.range:active,
-  .datepicker table tr td.range.active {
-    color: #000;
-    background-color: #d5d5d5;
-    border-color: #9d9d9d;
-  }
-  .datepicker table tr td.range:active:hover,
-  .datepicker table tr td.range.active:hover,
-  .datepicker table tr td.range:active:focus,
-  .datepicker table tr td.range.active:focus,
-  .datepicker table tr td.range:active.focus,
-  .datepicker table tr td.range.active.focus {
-    color: #000;
-    background-color: #c3c3c3;
-    border-color: #7c7c7c;
-  }
-  .datepicker table tr td.range.disabled:hover,
-  .datepicker table tr td.range[disabled]:hover,
-  fieldset[disabled] .datepicker table tr td.range:hover,
-  .datepicker table tr td.range.disabled:focus,
-  .datepicker table tr td.range[disabled]:focus,
-  fieldset[disabled] .datepicker table tr td.range:focus,
-  .datepicker table tr td.range.disabled.focus,
-  .datepicker table tr td.range[disabled].focus,
-  fieldset[disabled] .datepicker table tr td.range.focus {
-    background-color: #eeeeee;
-    border-color: #bbbbbb;
-  }
-  .datepicker table tr td.range.focused {
-    background: #d5d5d5;
-  }
-  .datepicker table tr td.range.disabled,
-  .datepicker table tr td.range.disabled:active {
-    background: #eeeeee;
-    color: #777777;
-  }
-  .datepicker table tr td.range.highlighted {
-    color: #000;
-    background-color: #e4eef3;
-    border-color: #9dc1d3;
-  }
-  .datepicker table tr td.range.highlighted:focus,
-  .datepicker table tr td.range.highlighted.focus {
-    color: #000;
-    background-color: #c1d7e3;
-    border-color: #4b88a6;
-  }
-  .datepicker table tr td.range.highlighted:hover {
-    color: #000;
-    background-color: #c1d7e3;
-    border-color: #73a6c0;
-  }
-  .datepicker table tr td.range.highlighted:active,
-  .datepicker table tr td.range.highlighted.active {
-    color: #000;
-    background-color: #c1d7e3;
-    border-color: #73a6c0;
-  }
-  .datepicker table tr td.range.highlighted:active:hover,
-  .datepicker table tr td.range.highlighted.active:hover,
-  .datepicker table tr td.range.highlighted:active:focus,
-  .datepicker table tr td.range.highlighted.active:focus,
-  .datepicker table tr td.range.highlighted:active.focus,
-  .datepicker table tr td.range.highlighted.active.focus {
-    color: #000;
-    background-color: #a8c8d8;
-    border-color: #4b88a6;
-  }
-  .datepicker table tr td.range.highlighted.disabled:hover,
-  .datepicker table tr td.range.highlighted[disabled]:hover,
-  fieldset[disabled] .datepicker table tr td.range.highlighted:hover,
-  .datepicker table tr td.range.highlighted.disabled:focus,
-  .datepicker table tr td.range.highlighted[disabled]:focus,
-  fieldset[disabled] .datepicker table tr td.range.highlighted:focus,
-  .datepicker table tr td.range.highlighted.disabled.focus,
-  .datepicker table tr td.range.highlighted[disabled].focus,
-  fieldset[disabled] .datepicker table tr td.range.highlighted.focus {
-    background-color: #e4eef3;
-    border-color: #9dc1d3;
-  }
-  .datepicker table tr td.range.highlighted.focused {
-    background: #c1d7e3;
-  }
-  .datepicker table tr td.range.highlighted.disabled,
-  .datepicker table tr td.range.highlighted.disabled:active {
-    background: #e4eef3;
-    color: #777777;
-  }
-  .datepicker table tr td.range.today {
-    color: #000;
-    background-color: #f7ca77;
-    border-color: #f1a417;
-  }
-  .datepicker table tr td.range.today:focus,
-  .datepicker table tr td.range.today.focus {
-    color: #000;
-    background-color: #f4b747;
-    border-color: #815608;
-  }
-  .datepicker table tr td.range.today:hover {
-    color: #000;
-    background-color: #f4b747;
-    border-color: #bf800c;
-  }
-  .datepicker table tr td.range.today:active,
-  .datepicker table tr td.range.today.active {
-    color: #000;
-    background-color: #f4b747;
-    border-color: #bf800c;
-  }
-  .datepicker table tr td.range.today:active:hover,
-  .datepicker table tr td.range.today.active:hover,
-  .datepicker table tr td.range.today:active:focus,
-  .datepicker table tr td.range.today.active:focus,
-  .datepicker table tr td.range.today:active.focus,
-  .datepicker table tr td.range.today.active.focus {
-    color: #000;
-    background-color: #f2aa25;
-    border-color: #815608;
-  }
-  .datepicker table tr td.range.today.disabled:hover,
-  .datepicker table tr td.range.today[disabled]:hover,
-  fieldset[disabled] .datepicker table tr td.range.today:hover,
-  .datepicker table tr td.range.today.disabled:focus,
-  .datepicker table tr td.range.today[disabled]:focus,
-  fieldset[disabled] .datepicker table tr td.range.today:focus,
-  .datepicker table tr td.range.today.disabled.focus,
-  .datepicker table tr td.range.today[disabled].focus,
-  fieldset[disabled] .datepicker table tr td.range.today.focus {
-    background-color: #f7ca77;
-    border-color: #f1a417;
-  }
-  .datepicker table tr td.range.today.disabled,
-  .datepicker table tr td.range.today.disabled:active {
-    background: #f7ca77;
-    color: #777777;
-  }
-  .datepicker table tr td.selected,
-  .datepicker table tr td.selected.highlighted {
-    color: #fff;
-    background-color: #777777;
-    border-color: #555555;
-    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  }
-  .datepicker table tr td.selected:focus,
-  .datepicker table tr td.selected.highlighted:focus,
-  .datepicker table tr td.selected.focus,
-  .datepicker table tr td.selected.highlighted.focus {
-    color: #fff;
-    background-color: #5e5e5e;
-    border-color: #161616;
-  }
-  .datepicker table tr td.selected:hover,
-  .datepicker table tr td.selected.highlighted:hover {
-    color: #fff;
-    background-color: #5e5e5e;
-    border-color: #373737;
-  }
-  .datepicker table tr td.selected:active,
-  .datepicker table tr td.selected.highlighted:active,
-  .datepicker table tr td.selected.active,
-  .datepicker table tr td.selected.highlighted.active {
-    color: #fff;
-    background-color: #5e5e5e;
-    border-color: #373737;
-  }
-  .datepicker table tr td.selected:active:hover,
-  .datepicker table tr td.selected.highlighted:active:hover,
-  .datepicker table tr td.selected.active:hover,
-  .datepicker table tr td.selected.highlighted.active:hover,
-  .datepicker table tr td.selected:active:focus,
-  .datepicker table tr td.selected.highlighted:active:focus,
-  .datepicker table tr td.selected.active:focus,
-  .datepicker table tr td.selected.highlighted.active:focus,
-  .datepicker table tr td.selected:active.focus,
-  .datepicker table tr td.selected.highlighted:active.focus,
-  .datepicker table tr td.selected.active.focus,
-  .datepicker table tr td.selected.highlighted.active.focus {
-    color: #fff;
-    background-color: #4c4c4c;
-    border-color: #161616;
-  }
-  .datepicker table tr td.selected.disabled:hover,
-  .datepicker table tr td.selected.highlighted.disabled:hover,
-  .datepicker table tr td.selected[disabled]:hover,
-  .datepicker table tr td.selected.highlighted[disabled]:hover,
-  fieldset[disabled] .datepicker table tr td.selected:hover,
-  fieldset[disabled] .datepicker table tr td.selected.highlighted:hover,
-  .datepicker table tr td.selected.disabled:focus,
-  .datepicker table tr td.selected.highlighted.disabled:focus,
-  .datepicker table tr td.selected[disabled]:focus,
-  .datepicker table tr td.selected.highlighted[disabled]:focus,
-  fieldset[disabled] .datepicker table tr td.selected:focus,
-  fieldset[disabled] .datepicker table tr td.selected.highlighted:focus,
-  .datepicker table tr td.selected.disabled.focus,
-  .datepicker table tr td.selected.highlighted.disabled.focus,
-  .datepicker table tr td.selected[disabled].focus,
-  .datepicker table tr td.selected.highlighted[disabled].focus,
-  fieldset[disabled] .datepicker table tr td.selected.focus,
-  fieldset[disabled] .datepicker table tr td.selected.highlighted.focus {
-    background-color: #777777;
-    border-color: #555555;
-  }
-  .datepicker table tr td.active,
-  .datepicker table tr td.active.highlighted {
-    color: #fff;
-    background-color: #337ab7;
-    border-color: #2e6da4;
-    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  }
-  .datepicker table tr td.active:focus,
-  .datepicker table tr td.active.highlighted:focus,
-  .datepicker table tr td.active.focus,
-  .datepicker table tr td.active.highlighted.focus {
-    color: #fff;
-    background-color: #286090;
-    border-color: #122b40;
-  }
-  .datepicker table tr td.active:hover,
-  .datepicker table tr td.active.highlighted:hover {
-    color: #fff;
-    background-color: #286090;
-    border-color: #204d74;
-  }
-  .datepicker table tr td.active:active,
-  .datepicker table tr td.active.highlighted:active,
-  .datepicker table tr td.active.active,
-  .datepicker table tr td.active.highlighted.active {
-    color: #fff;
-    background-color: #286090;
-    border-color: #204d74;
-  }
-  .datepicker table tr td.active:active:hover,
-  .datepicker table tr td.active.highlighted:active:hover,
-  .datepicker table tr td.active.active:hover,
-  .datepicker table tr td.active.highlighted.active:hover,
-  .datepicker table tr td.active:active:focus,
-  .datepicker table tr td.active.highlighted:active:focus,
-  .datepicker table tr td.active.active:focus,
-  .datepicker table tr td.active.highlighted.active:focus,
-  .datepicker table tr td.active:active.focus,
-  .datepicker table tr td.active.highlighted:active.focus,
-  .datepicker table tr td.active.active.focus,
-  .datepicker table tr td.active.highlighted.active.focus {
-    color: #fff;
-    background-color: #204d74;
-    border-color: #122b40;
-  }
-  .datepicker table tr td.active.disabled:hover,
-  .datepicker table tr td.active.highlighted.disabled:hover,
-  .datepicker table tr td.active[disabled]:hover,
-  .datepicker table tr td.active.highlighted[disabled]:hover,
-  fieldset[disabled] .datepicker table tr td.active:hover,
-  fieldset[disabled] .datepicker table tr td.active.highlighted:hover,
-  .datepicker table tr td.active.disabled:focus,
-  .datepicker table tr td.active.highlighted.disabled:focus,
-  .datepicker table tr td.active[disabled]:focus,
-  .datepicker table tr td.active.highlighted[disabled]:focus,
-  fieldset[disabled] .datepicker table tr td.active:focus,
-  fieldset[disabled] .datepicker table tr td.active.highlighted:focus,
-  .datepicker table tr td.active.disabled.focus,
-  .datepicker table tr td.active.highlighted.disabled.focus,
-  .datepicker table tr td.active[disabled].focus,
-  .datepicker table tr td.active.highlighted[disabled].focus,
-  fieldset[disabled] .datepicker table tr td.active.focus,
-  fieldset[disabled] .datepicker table tr td.active.highlighted.focus {
-    background-color: #337ab7;
-    border-color: #2e6da4;
-  }
-  .datepicker table tr td span {
-    display: block;
-    width: 23%;
-    height: 54px;
-    line-height: 54px;
-    float: left;
-    margin: 1%;
-    cursor: pointer;
-    border-radius: 4px;
-  }
-  .datepicker table tr td span:hover,
-  .datepicker table tr td span.focused {
-    background: #eeeeee;
-  }
-  .datepicker table tr td span.disabled,
-  .datepicker table tr td span.disabled:hover {
-    background: none;
-    color: #777777;
-    cursor: default;
-  }
-  .datepicker table tr td span.active,
-  .datepicker table tr td span.active:hover,
-  .datepicker table tr td span.active.disabled,
-  .datepicker table tr td span.active.disabled:hover {
-    color: #fff;
-    background-color: #337ab7;
-    border-color: #2e6da4;
-    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  }
-  .datepicker table tr td span.active:focus,
-  .datepicker table tr td span.active:hover:focus,
-  .datepicker table tr td span.active.disabled:focus,
-  .datepicker table tr td span.active.disabled:hover:focus,
-  .datepicker table tr td span.active.focus,
-  .datepicker table tr td span.active:hover.focus,
-  .datepicker table tr td span.active.disabled.focus,
-  .datepicker table tr td span.active.disabled:hover.focus {
-    color: #fff;
-    background-color: #286090;
-    border-color: #122b40;
-  }
-  .datepicker table tr td span.active:hover,
-  .datepicker table tr td span.active:hover:hover,
-  .datepicker table tr td span.active.disabled:hover,
-  .datepicker table tr td span.active.disabled:hover:hover {
-    color: #fff;
-    background-color: #286090;
-    border-color: #204d74;
-  }
-  .datepicker table tr td span.active:active,
-  .datepicker table tr td span.active:hover:active,
-  .datepicker table tr td span.active.disabled:active,
-  .datepicker table tr td span.active.disabled:hover:active,
-  .datepicker table tr td span.active.active,
-  .datepicker table tr td span.active:hover.active,
-  .datepicker table tr td span.active.disabled.active,
-  .datepicker table tr td span.active.disabled:hover.active {
-    color: #fff;
-    background-color: #286090;
-    border-color: #204d74;
-  }
-  .datepicker table tr td span.active:active:hover,
-  .datepicker table tr td span.active:hover:active:hover,
-  .datepicker table tr td span.active.disabled:active:hover,
-  .datepicker table tr td span.active.disabled:hover:active:hover,
-  .datepicker table tr td span.active.active:hover,
-  .datepicker table tr td span.active:hover.active:hover,
-  .datepicker table tr td span.active.disabled.active:hover,
-  .datepicker table tr td span.active.disabled:hover.active:hover,
-  .datepicker table tr td span.active:active:focus,
-  .datepicker table tr td span.active:hover:active:focus,
-  .datepicker table tr td span.active.disabled:active:focus,
-  .datepicker table tr td span.active.disabled:hover:active:focus,
-  .datepicker table tr td span.active.active:focus,
-  .datepicker table tr td span.active:hover.active:focus,
-  .datepicker table tr td span.active.disabled.active:focus,
-  .datepicker table tr td span.active.disabled:hover.active:focus,
-  .datepicker table tr td span.active:active.focus,
-  .datepicker table tr td span.active:hover:active.focus,
-  .datepicker table tr td span.active.disabled:active.focus,
-  .datepicker table tr td span.active.disabled:hover:active.focus,
-  .datepicker table tr td span.active.active.focus,
-  .datepicker table tr td span.active:hover.active.focus,
-  .datepicker table tr td span.active.disabled.active.focus,
-  .datepicker table tr td span.active.disabled:hover.active.focus {
-    color: #fff;
-    background-color: #204d74;
-    border-color: #122b40;
-  }
-  .datepicker table tr td span.active.disabled:hover,
-  .datepicker table tr td span.active:hover.disabled:hover,
-  .datepicker table tr td span.active.disabled.disabled:hover,
-  .datepicker table tr td span.active.disabled:hover.disabled:hover,
-  .datepicker table tr td span.active[disabled]:hover,
-  .datepicker table tr td span.active:hover[disabled]:hover,
-  .datepicker table tr td span.active.disabled[disabled]:hover,
-  .datepicker table tr td span.active.disabled:hover[disabled]:hover,
-  fieldset[disabled] .datepicker table tr td span.active:hover,
-  fieldset[disabled] .datepicker table tr td span.active:hover:hover,
-  fieldset[disabled] .datepicker table tr td span.active.disabled:hover,
-  fieldset[disabled] .datepicker table tr td span.active.disabled:hover:hover,
-  .datepicker table tr td span.active.disabled:focus,
-  .datepicker table tr td span.active:hover.disabled:focus,
-  .datepicker table tr td span.active.disabled.disabled:focus,
-  .datepicker table tr td span.active.disabled:hover.disabled:focus,
-  .datepicker table tr td span.active[disabled]:focus,
-  .datepicker table tr td span.active:hover[disabled]:focus,
-  .datepicker table tr td span.active.disabled[disabled]:focus,
-  .datepicker table tr td span.active.disabled:hover[disabled]:focus,
-  fieldset[disabled] .datepicker table tr td span.active:focus,
-  fieldset[disabled] .datepicker table tr td span.active:hover:focus,
-  fieldset[disabled] .datepicker table tr td span.active.disabled:focus,
-  fieldset[disabled] .datepicker table tr td span.active.disabled:hover:focus,
-  .datepicker table tr td span.active.disabled.focus,
-  .datepicker table tr td span.active:hover.disabled.focus,
-  .datepicker table tr td span.active.disabled.disabled.focus,
-  .datepicker table tr td span.active.disabled:hover.disabled.focus,
-  .datepicker table tr td span.active[disabled].focus,
-  .datepicker table tr td span.active:hover[disabled].focus,
-  .datepicker table tr td span.active.disabled[disabled].focus,
-  .datepicker table tr td span.active.disabled:hover[disabled].focus,
-  fieldset[disabled] .datepicker table tr td span.active.focus,
-  fieldset[disabled] .datepicker table tr td span.active:hover.focus,
-  fieldset[disabled] .datepicker table tr td span.active.disabled.focus,
-  fieldset[disabled] .datepicker table tr td span.active.disabled:hover.focus {
-    background-color: #337ab7;
-    border-color: #2e6da4;
-  }
-  .datepicker table tr td span.old,
-  .datepicker table tr td span.new {
-    color: #777777;
-  }
-  .datepicker .datepicker-switch {
-    width: 145px;
-  }
-  .datepicker .datepicker-switch,
-  .datepicker .prev,
-  .datepicker .next,
-  .datepicker tfoot tr th {
-    cursor: pointer;
-  }
-  .datepicker .datepicker-switch:hover,
-  .datepicker .prev:hover,
-  .datepicker .next:hover,
-  .datepicker tfoot tr th:hover {
-    background: #eeeeee;
-  }
-  .datepicker .prev.disabled,
-  .datepicker .next.disabled {
-    visibility: hidden;
-  }
-  .datepicker .cw {
-    font-size: 10px;
-    width: 12px;
-    padding: 0 2px 0 5px;
-    vertical-align: middle;
-  }
-  .input-group.date .input-group-addon {
-    cursor: pointer;
-  }
-  .input-daterange {
-    width: 100%;
-  }
-  .input-daterange input {
-    text-align: center;
-  }
-  .input-daterange input:first-child {
-    border-radius: 3px 0 0 3px;
-  }
-  .input-daterange input:last-child {
-    border-radius: 0 3px 3px 0;
-  }
-  .input-daterange .input-group-addon {
-    width: auto;
-    min-width: 16px;
-    padding: 4px 5px;
-    line-height: 1.42857143;
-    border-width: 1px 0;
-    margin-left: -5px;
-    margin-right: -5px;
-  }
-  /*# sourceMappingURL=bootstrap-datepicker3.css.map */
+// FIXME: color.scale doesn't seem to work with CSS variables, so avoid those:`
+$dp-cell-focus-background-color: $dropdown-link-hover-bg !default;
+
+@import "vanillajs-datepicker/sass/datepicker-bs5";
+
+[data-bs-theme="dark"] .datepicker-picker {
+    .datepicker-header, 
+    .datepicker-controls .btn,
+    .datepicker-main,
+    .datepicker-footer {
+        background-color: $gray-800;
+    }
+
+    .datepicker-cell:hover {
+        background-color: $gray-700;
+    }
+
+    .datepicker-cell.day.focused {
+        background-color: $gray-600;
+    }
+
+     .datepicker-cell.day.selected.focused {
+        background-color: $blue;
+    }
+
+     .datepicker-controls .btn:hover {
+        background-color:$gray-700;
+        color: $gray-400;
+     }
+}
diff --git a/ietf/static/css/document_html.scss b/ietf/static/css/document_html.scss
new file mode 100644
index 0000000000..47ef8d64b4
--- /dev/null
+++ b/ietf/static/css/document_html.scss
@@ -0,0 +1,386 @@
+@use "sass:map";
+
+@import "custom-bs-import";
+
+// Layout & components
+// Only import what we need:
+@import "bootstrap/scss/reboot";
+@import "bootstrap/scss/type";
+// @import "bootstrap/scss/images";
+@import "bootstrap/scss/containers";
+@import "bootstrap/scss/grid";
+// @import "bootstrap/scss/tables";
+@import "bootstrap/scss/forms";
+@import "bootstrap/scss/buttons";
+@import "bootstrap/scss/transitions";
+@import "bootstrap/scss/dropdown";
+@import "bootstrap/scss/button-group";
+@import "bootstrap/scss/nav";
+@import "bootstrap/scss/navbar";
+// @import "bootstrap/scss/card";
+// @import "bootstrap/scss/accordion";
+// @import "bootstrap/scss/breadcrumb";
+@import "bootstrap/scss/pagination";
+@import "bootstrap/scss/badge";
+@import "bootstrap/scss/alert";
+// @import "bootstrap/scss/progress";
+// @import "bootstrap/scss/list-group";
+// @import "bootstrap/scss/close";
+// @import "bootstrap/scss/toasts";
+// @import "bootstrap/scss/modal";
+@import "bootstrap/scss/tooltip";
+// @import "bootstrap/scss/popover";
+// @import "bootstrap/scss/carousel";
+// @import "bootstrap/scss/spinners";
+// @import "bootstrap/scss/offcanvas";
+// @import "bootstrap/scss/placeholders";
+
+// Helpers
+@import "bootstrap/scss/helpers";
+
+// Utilities
+@import "bootstrap/scss/utilities/api";
+
+:root {
+    --doc-ptsize-max: 16pt;
+}
+
+.overscroll-none {
+    overscroll-behavior: none;
+}
+
+.no-scrollbar {
+    scrollbar-width: none;
+}
+
+.sidebar-toggle[aria-expanded="true"] .sidebar-shown {
+    display: none;
+}
+
+.sidebar-toggle[aria-expanded="false"] .sidebar-collapsed {
+    display: none;
+}
+
+.sidebar-toolbar {
+    z-index: 1;
+}
+
+// Toggle classes for dark/light modes
+[data-bs-theme="dark"] {
+    .d-dm-none {
+        display: none;
+    }
+
+    .d-lm-none {
+        display: initial;
+    }
+}
+
+[data-bs-theme="light"] {
+    .d-dm-none {
+        display: initial;
+    }
+
+    .d-lm-none {
+        display: none;
+    }
+}
+
+// Show theme toggler checkbox
+.dropdown-menu .active .bi {
+    display: block !important;
+}
+
+@media screen {
+    @include media-breakpoint-down(md) {
+        body {
+            padding-top: 60px;
+        }
+
+        html {
+            scroll-padding-top: 60px;
+        }
+    }
+
+    @include media-breakpoint-down(sm) {
+        body {
+            padding-top: 70px;
+        }
+
+        html {
+            scroll-padding-top: 70px;
+        }
+    }
+}
+
+.rfcmarkup,
+.rfchtml {
+    font-family: var(--bs-font-monospace);
+
+    caption {
+        padding: 0;
+        color: var(--bs-body-color);
+    }
+
+    code {
+        font-size: 1em;
+        color: inherit;
+    }
+
+    @media screen {
+
+        // the viewport-width ("vw") constants are magic; they seem to work for
+        // many monospace fonts, but may need tweaking
+        @include media-breakpoint-up(xs) {
+            font-size: min(2.2vw, var(--doc-ptsize-max));
+        }
+
+        @include media-breakpoint-up(md) {
+            font-size: min(1.6vw, var(--doc-ptsize-max));
+        }
+
+        .grey,
+        hr {
+            opacity: $hr-opacity;
+        }
+    }
+
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
+        font-weight: bold;
+        font-size: 1em;
+    }
+
+    pre,
+    code {
+        font-size: 1em;
+        overflow: visible;
+    }
+
+    pre {
+        margin: 0;
+        padding: 0;
+    }
+
+    .bcp14 {
+        font-weight: bold;
+        // color: $gray-700;
+    }
+}
+
+.rfcmarkup {
+
+    // A lot of plaintext documents seem to have line lengths >72ch.
+    // To handle that, we calculate with 80ch here and adjust some of the
+    // font sizes down accordingly.
+    pre {
+        width: 80ch;
+        white-space: pre-wrap;
+    }
+
+    @media screen {
+
+        // the viewport-width ("vw") constants are magic; they seem to work for
+        // many monospace fonts, but may need tweaking
+        @include media-breakpoint-up(xs) {
+            font-size: min(2vw, var(--doc-ptsize-max));
+        }
+
+        @include media-breakpoint-up(md) {
+            font-size: min(1.5vw, var(--doc-ptsize-max));
+        }
+    }
+
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
+        white-space: pre;
+        display: inline;
+    }
+
+    .newpage {
+        margin-top: -1.25em;
+    }
+
+}
+
+tbody.meta tr {
+
+    td:first-child,
+    th:first-child,
+    td.edit {
+        display: none;
+    }
+}
+
+.sidebar {
+    height: 100vh;
+
+    .toplink,
+    #name-table-of-contents {
+        display: none;
+    }
+
+    th,
+    td {
+        display: block;
+        padding: 0;
+    }
+
+    td {
+        margin-bottom: map.get($spacers, 3);
+    }
+}
+
+.navbar {
+
+    td:not(:first-child),
+    th:not(:first-child) {
+        padding-top: map.get($spacers, 3);
+    }
+
+}
+
+// Add some padding when there are multiple buttons in a line that can wrap
+.buttonlist .btn {
+    margin-bottom: map.get($spacers, 1);
+}
+
+// Make revision numbers pagination items fixed-width
+.revision-list {
+    .page-item {
+        width: 2.2rem;
+    }
+
+    .page-item.rfc {
+        width: 6.6rem;
+    }
+}
+
+#docinfo {
+    max-height: 70vh;
+    z-index: -1;
+}
+
+
+.badge-obs {
+    color: white;
+    background-color: $orange-800;
+}
+
+.badge-ps {
+    color: black;
+    background-color: $blue-300;
+}
+
+.badge-exp {
+    color: black;
+    background-color: $yellow-200;
+}
+
+.badge-inf {
+    color: white;
+    background-color: $orange;
+}
+
+.badge-ds {
+    color: black;
+    background-color: $cyan-200;
+}
+
+.badge-hist {
+    color: white;
+    background-color: $gray-700;
+}
+
+.badge-std {
+    color: black;
+    background-color: $teal-200;
+}
+
+.badge-bcp {
+    color: white;
+    background-color: $pink-500;
+}
+
+.badge-unkn {
+    color: black;
+    background-color: $gray-300;
+}
+
+.badge-draft {
+    color: white;
+    background-color: $danger;
+}
+
+.badge-generic {
+    color: white;
+    background-color: $danger;
+}
+
+#toc-nav {
+    width: inherit;
+    overscroll-behavior-y: none; // Prevent overscrolling from scrolling the main content
+}
+
+
+@media print {
+    @page {
+        size: letter;
+        margin: .75in;
+    }
+
+    .rfcmarkup {
+        font-size: 9.75pt !important;
+        line-height: 1.25em !important;
+    }
+
+    .rfchtml {
+        font-size: 9.75pt;
+        line-height: 1.25em;
+    }
+
+    body {
+        margin: 0;
+        padding: 0;
+    }
+
+    pre {
+        page-break-inside: avoid;
+    }
+
+    /*
+    a:link,
+    a:visited {
+        // color: inherit;
+        // text-decoration: none;
+    }
+*/
+
+    .newpage {
+        page-break-before: always !important;
+    }
+
+    .noprint {
+        display: none;
+    }
+}
+
+// Select2 styling
+@import "select2";
+
+.select2-results__option,
+.select2-search__field {
+    font-size: small !important;
+}
+
+.select2-container--open {
+    z-index: 9999999;
+}
diff --git a/ietf/static/css/document_html_inline.scss b/ietf/static/css/document_html_inline.scss
new file mode 100644
index 0000000000..a757534381
--- /dev/null
+++ b/ietf/static/css/document_html_inline.scss
@@ -0,0 +1,6 @@
+@import "document_html";
+
+// Make the bootstrap icons available via data-url.
+$bootstrap-icons-font-src: url(data-url:npm:bootstrap-icons/font/fonts/bootstrap-icons.woff2) format("woff2"),
+url(data-url:npm:bootstrap-icons/font/fonts/bootstrap-icons.woff) format("woff");
+@import "bootstrap-icons/font/bootstrap-icons";
diff --git a/ietf/static/css/document_html_referenced.scss b/ietf/static/css/document_html_referenced.scss
new file mode 100644
index 0000000000..5342989405
--- /dev/null
+++ b/ietf/static/css/document_html_referenced.scss
@@ -0,0 +1,6 @@
+@import "document_html";
+
+// Make the bootstrap icons available.
+$bootstrap-icons-font-src: url("npm:bootstrap-icons/font/fonts/bootstrap-icons.woff2") format("woff2"),
+url("npm:bootstrap-icons/font/fonts/bootstrap-icons.woff") format("woff");
+@import "bootstrap-icons/font/bootstrap-icons";
diff --git a/ietf/static/css/document_html_txt.scss b/ietf/static/css/document_html_txt.scss
new file mode 100644
index 0000000000..a5991056c9
--- /dev/null
+++ b/ietf/static/css/document_html_txt.scss
@@ -0,0 +1,468 @@
+// Based on https://github.com/martinthomson/rfc-txt-html/blob/main/txt.css
+
+:root {
+  --line: 1.3em;
+  --block: 0 0 0 3ch;
+  --paragraph: var(--line) 0 var(--line) 3ch;
+}
+
+// WeasyPrint can't handle CSS variables in multi-attribute properties, so work
+// around that
+// https://github.com/Kozea/WeasyPrint/issues/1219
+
+@mixin margin-paragraph {
+  margin-top: var(--line);
+  margin-right: 0;
+  margin-bottom: var(--line);
+  margin-left: 3ch;
+}
+
+@mixin margin-line {
+  margin-top: var(--line);
+  margin-right: 0;
+  margin-bottom: var(--line);
+  margin-left: 0;
+}
+
+@mixin margin-block {
+  margin-top: 0;
+  margin-right: 0;
+  margin-bottom: 0;
+  margin-left: 3ch;
+}
+
+.rfchtml {
+// body {
+//   color: black;
+//   font-family: monospace;
+//   font-size: 1em;
+  line-height: var(--line);
+  width: 72ch;
+  // margin: var(--line) 3ch;
+  margin-top: var(--line);
+  margin-right: 3ch;
+  margin-bottom: var(--line);
+  margin-left: 3ch;
+
+
+h1, h2, h3, h4, h5 {
+  font-weight: bold;
+  font-size: inherit;
+  line-height: inherit;
+  @include margin-line; // margin: var(--line) 0;
+}
+.section-number {
+  margin-right: 1ch;
+}
+p {
+  margin: 0;
+}
+section > p, section > div > p {
+  @include margin-paragraph; // margin: var(--paragraph);
+}
+aside {
+  @include margin-block; // margin: var(--block);
+}
+figure {
+  margin: 0;
+}
+blockquote {
+  @include margin-paragraph; // margin: var(--paragraph);
+  padding-left: calc(2ch - 2px);
+  border-left: 2px solid var(--bs-border-color);
+}
+
+/* Header junk */
+#external-metadata {
+  display: none !important; /* metadata.min.js is evil because it produces unstyleable goop */
+}
+#identifiers dt:is(.label-stream, .label-rfc, .label-std, .label-bcp, .label-internet-draft,
+                   .label-workgroup, .label-intended-status, .label-obsoletes, .label-updates,
+                   .label-published, .label-expires, .label-category, .label-issn,
+                   .label-authors), .ears {
+  display: none;
+}
+#identifiers {
+  margin: 0;
+}
+#identifiers dt {
+  margin: 0 1ch 0 0;
+  float: revert;
+  display: inline-block;
+}
+#identifiers dd {
+  margin: 0;
+  margin-left: 0 !important; /* grr */
+  width: 47ch;
+  /* HAXX: this gets around the lack of text-content-trim support */
+  display: flex;
+  flex-wrap: wrap;
+}
+#identifiers dd::before {
+  margin: 0 1ch 0 0;
+}
+#identifiers dd.rfc::before {
+  content: "Request for Comments:";
+}
+#identifiers dd.std::before {
+  content: "STD:";
+}
+#identifiers dd.bcp::before {
+  content: "BCP:";
+}
+#identifiers dd.internet-draft::before {
+  content: "Internet-Draft:";
+}
+#identifiers dd.workgroup::before {
+  content: "Workgroup:";
+}
+#identifiers dd.intended-status::before {
+  content: "Intended Status:";
+}
+#identifiers dd.obsoletes::before {
+  content: "Obsoletes:";
+  margin: 0 0 0 -10ch;
+}
+#identifiers dd.obsoletes {
+  padding-left: 10ch;
+}
+#identifiers dd.updates::before {
+  content: "Updates:";
+  margin: 0 0 0 -8ch;
+}
+#identifiers dd.updates {
+  padding-left: 8ch;
+}
+#identifiers dd:is(.updates, .obsoletes) a {
+  margin: 0 0 0 1ch;
+}
+#identifiers dd:is(.updates, .obsoletes) a:last-of-type {
+  margin-right: 1ch;
+}
+#identifiers dd.published::before {
+  content: "Published:";
+}
+#identifiers dd.expires::before {
+  content: "Expires:";
+}
+#identifiers dd.category::before {
+  content: "Category:";
+}
+#identifiers dd.issn::before {
+  content: "ISSN:";
+}
+
+/* Thanks WeasyPrint for not supporting @supports */
+/* @supports not (display: grid) { */
+  #identifiers dd.authors {
+    padding-left: 8ch;
+    width: 64ch;
+  }
+  #identifiers dd.authors::before {
+    content: "Authors:";
+    margin: 0 0 0 -8ch;
+  }
+  #identifiers dd.authors .author {
+    display: inline-block;
+    margin: 0 2ch 0 1ch;
+    min-height: calc(2 * var(--line));
+  }
+  #identifiers dd.authors .author:last-of-type {
+    margin-right: 0;
+  }
+/* } */
+/* #identifiers styling for when grid layout is supported, or not */
+@supports(display: grid) {
+  #identifiers {
+    display: grid;
+    grid-template-columns: 47ch 24ch;
+    grid-auto-rows: auto;
+    gap: 0 1ch;
+  }
+  #identifiers dd {
+    grid-column: 1;
+  }
+  #identifiers dd.authors {
+    grid-area: 1 / 2 / 100 / 3;
+    width: 24ch;
+    text-align: right;
+    display: block;
+    /* overrides for @supports not block */
+    padding-left: 0;
+  }
+  /* more overrides for @supports not block */
+  #identifiers dd.authors::before {
+    display: none;
+  }
+  #identifiers dd.authors .author {
+    display: block;
+    margin: 0;
+  }
+}
+
+#title {
+  clear: left;
+  text-align: center;
+  margin-top: calc(2 * var(--line));
+}
+#rfcnum {
+  display: none;
+}
+:is(#status-of-memo, #copyright) a {
+  white-space: nowrap;
+}
+.toplink {
+  display: none;
+}
+nav.toc ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+nav.toc ul > li {
+  padding-left: 2ch;
+}
+nav.toc > ul > li {
+  padding-left: 3ch;
+}
+nav.toc ul > li > p {
+  margin: 0;
+}
+
+/* Lists */
+ol, ul {
+  padding: 0;
+}
+ol {
+  margin: 0 0 0 6ch; /* todo: deal with lists that have >= 10 items */
+}
+:is(ol, ul) ol {
+  margin: 0 0 0 3ch;
+}
+ul {
+  margin: 0 0 0 4ch;
+}
+ul.ulEmpty {
+  list-style: none;
+}
+ul:not(.ulEmpty) {
+  list-style-type: '*';
+}
+ul ul:not(.ulEmpty) {
+  list-style-type: '-';
+}
+:is(ul, ol) ul {
+  margin-left: 1ch;
+}
+ul ul ul:not(.ulEmpty) {
+  list-style-type: 'o';
+}
+li {
+  @include margin-line; // margin: var(--line) 0;
+  padding: 0 0 0 2ch;
+}
+dl {
+  margin: 0;
+}
+section > dl, section > div > dl {
+  @include margin-block; // margin: var(--block);
+}
+dl, dt {
+  clear: left;
+}
+dt {
+  float: left;
+  font-weight: bold;
+  margin: 0 2ch 0 0;
+  break-after: avoid;
+}
+dd {
+  @include margin-paragraph; // margin: var(--paragraph);
+  margin-left: 3ch !important; /* override attribute added by xml2rfc */
+  padding: 0;
+  break-before: avoid;
+}
+dl.dlNewline > dd {
+  clear: left;
+}
+dl.olPercent > dt {
+  min-width: 4ch;
+}
+dl.olPercent > dd {
+  margin-left: 6ch !important; /* as above */
+}
+dl > dd > dl {
+  margin-top: var(--line);
+  margin-bottom: 0;
+}
+dl.references dt {
+  margin-right: 1ch;
+}
+dl.references dd {
+  margin-left: 11ch !important; /* grr */
+}
+:is(dd, span).break {
+  display: none;
+}
+:is(li, dd, blockquote, aside) :is(p, ol, ul:not(.toc), dl):not(:first-child) {
+  margin-top: var(--line);
+}
+:is(li, dd, blockquote, aside) .break:first-child + :is(p, ol, ul, dl) {
+  margin-top: 0;
+}
+:is(ol:is(.compact, .olCompact), ul:is(.compact, .ulCompact)) > li,
+:is(dl.compact, .dlCompact) > :is(dt, dd) {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+/* Figures, tables */
+pre {
+  @include margin-line; // margin: var(--line) 0;
+}
+div:is(.artwork, .sourcecode) {
+  margin-top: var(--line);
+  margin-bottom: var(--line);
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: end;
+}
+div:is(.artwork, .sourcecode).alignCenter {
+  justify-content: center;
+}
+div:is(.artwork, .sourcecode).alignRight {
+  justify-content: end;
+}
+div:is(.artwork, .sourcecode)::before {
+  flex: 0 1 3ch;
+  content: "";
+}
+div:is(.artwork, .sourcecode).alignRight::before {
+  flex-grow: 1;
+}
+div:is(.artwork, .sourcecode) pre {
+  flex: 0 0 content;
+  margin: 0;
+  max-width: 72ch;
+  overflow: auto clip;
+}
+div:is(.artwork, .sourcecode) .pilcrow {
+  flex: 0 0 1ch;
+}
+figcaption, table caption {
+  text-align: center;
+  margin-top: var(--line);
+}
+table {
+  --half-line: calc(var(--line) / 2 - 1px);
+  caption-side: bottom;
+  // margin: var(--line) 0 var(--half-line) 3ch;
+  margin-top: var(--line);
+  margin-right: 0;
+  margin-bottom: var(--half-line);
+  margin-left: 3ch;
+  border-collapse: collapse;
+}
+table.center {
+  margin-left: auto; /* todo: add 3ch */
+  margin-right: auto;
+}
+table caption {
+  margin-top: calc(var(--half-line) + var(--line));
+}
+thead, tfoot {
+  border-top-style: double;
+  border-bottom-style: double;
+}
+td, th {
+  border: 1px solid var(--bs-border-color);
+  // padding: var(--half-line) 1ch;
+  padding-top: var(--half-line);
+  padding-right: 1ch;
+  padding-bottom: var(--half-line);
+  padding-left: 1ch;
+}
+.text-left {
+  text-align: left;
+}
+.text-center {
+  text-align: center;
+}
+.text-right {
+  text-align: right;
+}
+
+/* Links */
+a.selfRef, a.pilcrow, .iref + a.internal {
+  color: inherit;
+  text-decoration: none;
+}
+a.relref, a.xref {
+  hyphens: none;
+}
+a:is(.relref, .xref:is(.cite, .auto.internal)) {
+  white-space: nowrap;
+}
+.pilcrow {
+  display: inline-block;
+  margin-right: -1ch;
+  opacity: 0.01;
+  text-decoration: none;
+  user-select: none;
+}
+:hover > .pilcrow {
+  opacity: 0.2;
+}
+* > .pilcrow[href]:hover {
+  opacity: 0.6;
+}
+
+/* sup, sub */
+sup, sub {
+  line-height: 1.1;
+}
+
+/* Authors */
+address, address.vcard {
+  font-style: normal;
+  // margin: var(--line) 0 var(--line) 3ch
+  margin-top: var(--line);
+  margin-right: 0;
+  margin-bottom: var(--line);
+  margin-left: 3ch;
+}
+address .tel, address .email {
+  // margin: var(--line) 0 0;
+  margin-top: var(--line);
+  margin-right: 0;
+  margin-bottom: 0;
+  margin-left: 0;
+}
+address .tel + .email {
+  margin: 0;
+}
+
+/* haxx */
+section > p, section > dl.references > dd {
+  /* Really long lines can wrap when all else fails.
+   * This won't affect <pre> or <table>, or cases where soft-wrapping occurs.
+   * Mostly this exists so that long URLs wrap properly in Safari, which
+   * doesn't break words at '/' like other browsers. */
+  overflow-wrap: break-word;
+}
+
+/* From https://github.com/martinthomson/rfc-css/blob/main/rfc.css */
+/* SVG Trick: a prefix match works because only black and white are allowed */
+svg :is([stroke="black"], [stroke^="#000"]) {
+    stroke: var(--bs-body-color);
+}
+svg :is([stroke="white"], [stroke^="#fff"]) {
+    stroke: var(--bs-body-bg);
+}
+svg :is([fill="black"], [fill^="#000"], :not([fill])) {
+    fill: var(--bs-body-color);
+}
+svg :is([fill="white"], [fill^="#fff"]) {
+    fill: var(--bs-body-bg);
+}
+}
diff --git a/ietf/static/css/edit-meeting-schedule.scss b/ietf/static/css/edit-meeting-schedule.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ietf/static/css/highcharts.scss b/ietf/static/css/highcharts.scss
new file mode 100644
index 0000000000..d2f5d5e0e7
--- /dev/null
+++ b/ietf/static/css/highcharts.scss
@@ -0,0 +1,6 @@
+@import "npm:highcharts/css/highcharts.css";
+@import "custom-bs-import";
+
+.highcharts-container {
+    font-family: $font-family-sans-serif;
+}
diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss
index 86b71f1545..6695c57b13 100644
--- a/ietf/static/css/ietf.scss
+++ b/ietf/static/css/ietf.scss
@@ -1,32 +1,9 @@
 @use "sass:map";
 
-@import "bootstrap/scss/functions";
-
-// Enable negative margin classes.
-$enable-negative-margins: true;
-
-// Don't add carets to dropdowns by default.
-// $enable-caret: false;
-
-$popover-max-width: 100%;
-
-// Only import what we need:
-
-@import "bootstrap/scss/variables";
-
-$h1-font-size: $font-size-base * 2.2;
-$h2-font-size: $font-size-base * 1.8;
-$h3-font-size: $font-size-base * 1.6;
-$h4-font-size: $font-size-base * 1.4;
-$h5-font-size: $font-size-base * 1.2;
-$h6-font-size: $font-size-base;
-
-@import "bootstrap/scss/maps";
-@import "bootstrap/scss/mixins";
-@import "bootstrap/scss/utilities";
-@import "bootstrap/scss/root";
+@import "custom-bs-import";
 
 // Layout & components
+// Only import what we need:
 @import "bootstrap/scss/reboot";
 @import "bootstrap/scss/type";
 @import "bootstrap/scss/images";
@@ -70,7 +47,7 @@ url("npm:bootstrap-icons/font/fonts/bootstrap-icons.woff") format("woff");
 @import "bootstrap-icons/font/bootstrap-icons";
 
 // Leave room for fixed-top navbar...
-body {
+body.navbar-offset {
     padding-top: 60px;
 }
 
@@ -79,6 +56,55 @@ html {
     scroll-padding-top: 60px;
 }
 
+// Toggle classes for dark/light modes
+[data-bs-theme="dark"] {
+    .d-dm-none {
+        display: none;
+    }
+
+    .d-lm-none {
+        display: initial;
+    }
+}
+
+[data-bs-theme="light"] {
+    .d-dm-none {
+        display: initial;
+    }
+
+    .d-lm-none {
+        display: none;
+    }
+}
+
+// Make submenus open on hover.
+@include media-breakpoint-up(lg) {
+    .dropdown-menu>li>ul {
+        display: none;
+    }
+
+    .dropdown-menu>li:hover>ul {
+        display: block;
+    }
+
+}
+
+@include media-breakpoint-up(md) {
+    .leftmenu .nav>li>ul {
+        display: none;
+    }
+
+    .leftmenu .nav>li:hover>ul {
+        display: block;
+    }
+}
+
+:is(.dropdown-menu, .leftmenu .nav) .dropdown-menu {
+    top: 0;
+    left: 100%;
+    right: auto;
+}
+
 // Make textareas in forms use a monospace font
 textarea.form-control {
     font-family: $font-family-code;
@@ -97,6 +123,11 @@ pre {
     width: 60px;
 }
 
+// Style preformatted alert messages better.
+.preformatted {
+    white-space: pre-line;
+}
+
 .leftmenu {
     width: 13em;
 
@@ -122,8 +153,8 @@ pre {
         --#{$prefix}dropdown-divider-bg: #{$dropdown-divider-bg};
         --#{$prefix}dropdown-divider-margin-y: #{$dropdown-divider-margin-y};
         --#{$prefix}dropdown-box-shadow: #{$dropdown-box-shadow};
-        --#{$prefix}dropdown-link-color: #{$dropdown-link-color};
-        --#{$prefix}dropdown-link-hover-color: #{$dropdown-link-hover-color};
+        --#{$prefix}dropdown-link-color: #{$nav-link-color};
+        --#{$prefix}dropdown-link-hover-color: #{$nav-link-hover-color};
         --#{$prefix}dropdown-link-hover-bg: #{$dropdown-link-hover-bg};
         --#{$prefix}dropdown-link-active-color: #{$dropdown-link-active-color};
         --#{$prefix}dropdown-link-active-bg: #{$dropdown-link-active-bg};
@@ -168,8 +199,9 @@ table tbody.meta {
     }
 }
 
-// Try and hyphenate table headings
-th {
+// Try and hyphenate table headings and other things
+th,
+.hyphenate {
     hyphens: auto;
 }
 
@@ -197,16 +229,37 @@ th {
 .group-menu .dropdown-menu {
     height: auto;
     width: auto;
-    max-height: 35em;
+    max-height: 95vh;
     overflow-x: hidden;
     overflow-y: auto;
 }
 
 // Helper to constrain the size of the main logo
 .ietflogo {
-    width: 75%;
+    width: 100%;
     max-width: 300px;
 }
+.ietflogo > img {
+    min-width: 100px;
+    width: 100%;
+}
+
+// Make revision numbers pagination items fixed-width
+.revision-list {
+    .page-item {
+        width: 2.2rem;
+    }
+
+    .page-item.rfc {
+        width: 6.6rem;
+    }
+}
+
+.charter.revision-list {
+    .page-item {
+        width: auto;
+    }
+}
 
 // Style the photo cards
 .photo {
@@ -244,13 +297,13 @@ th {
 }
 
 // Styles for d3.js graphical SVG timelines
-#timeline {
+#doc-timeline {
     font-size: small;
 
     .axis path,
     .axis line {
         fill: none;
-        stroke: black;
+        stroke: var(--bs-body-color);
     }
 
     .axis.y path,
@@ -267,7 +320,7 @@ th {
     }
 
     .bar text {
-        fill: black;
+        fill: var(--bs-body-color);
         dominant-baseline: central;
         pointer-events: none;
     }
@@ -306,7 +359,7 @@ th {
 }
 
 .ballot-icon table .my {
-    border: 2 * $table-border-width solid #000;
+    border: calc(2 * $table-border-width) solid var(--bs-emphasis-color);
 }
 
 // See https://getbootstrap.com/docs/5.1/customize/color/#all-colors
@@ -418,36 +471,64 @@ td.position-recuse {
 }
 
 td.position-norecord {
-    background-color: $white; // $color-norecord;
+    background-color: transparent;
 }
 
 td.position-empty {
     border: none !important;
 }
 
-tr.position-moretime-row,
-tr.position-notready-row,
-tr.position-discuss-row,
-tr.position-block-row {
-    background-color: tint-color($color-discuss, 85%);
-}
+[data-bs-theme="light"] {
 
-tr.position-yes-row {
-    background-color: tint-color($color-yes, 75%);
-}
+    tr.position-moretime-row,
+    tr.position-notready-row,
+    tr.position-discuss-row,
+    tr.position-block-row {
+        background-color: tint-color($color-discuss, 85%);
+    }
 
-tr.position-noobj-row {
-    background-color: tint-color($color-noobj, 50%);
-}
+    tr.position-yes-row {
+        background-color: tint-color($color-yes, 75%);
+    }
 
-tr.position-abstain-row {
-    background-color: tint-color($color-abstain, 85%);
-}
+    tr.position-noobj-row {
+        background-color: tint-color($color-noobj, 50%);
+    }
 
-tr.position-recuse-row {
-    background-color: tint-color($color-recuse, 85%);
+    tr.position-abstain-row {
+        background-color: tint-color($color-abstain, 85%);
+    }
+
+    tr.position-recuse-row {
+        background-color: tint-color($color-recuse, 85%);
+    }
 }
 
+[data-bs-theme="dark"] {
+
+    tr.position-moretime-row,
+    tr.position-notready-row,
+    tr.position-discuss-row,
+    tr.position-block-row {
+        background-color: shade-color($color-discuss, 65%);
+    }
+
+    tr.position-yes-row {
+        background-color: shade-color($color-yes, 65%);
+    }
+
+    tr.position-noobj-row {
+        background-color: shade-color($color-noobj, 65%);
+    }
+
+    tr.position-abstain-row {
+        background-color: shade-color($color-abstain, 65%);
+    }
+
+    tr.position-recuse-row {
+        background-color: shade-color($color-recuse, 65%);
+    }
+}
 
 /* === Edit Meeting Schedule ====================================== */
 
@@ -485,7 +566,7 @@ tr.position-recuse-row {
 }
 
 .edit-meeting-schedule .edit-grid .day-label .swap-days:hover {
-    color: #666;
+    color: var(--bs-secondary-color);
 }
 
 .edit-meeting-schedule #swap-days-modal .modal-body label {
@@ -517,15 +598,15 @@ tr.position-recuse-row {
 }
 
 .edit-meeting-schedule .edit-grid .time-header .time-label.would-violate-hint {
-    background-color: #ffe0e0;
-    outline: #ffe0e0 solid 0.4em;
+    background-color: var(--bs-danger-bg-subtle);
+    outline: var(--bs-danger-bg-subtle) solid 0.4em;
 }
 
 .edit-meeting-schedule .edit-grid .time-header .time-label span {
     display: inline-block;
     width: 100%;
     text-align: center;
-    color: #444444;
+    color: var(--bs-secondary-color);
 }
 
 .edit-meeting-schedule .edit-grid .timeslots {
@@ -537,7 +618,7 @@ tr.position-recuse-row {
 .edit-meeting-schedule .edit-grid .timeslot {
     position: relative;
     display: inline-block;
-    background-color: #f4f4f4;
+    background-color: var(--bs-secondary-bg);
     height: 100%;
     overflow: hidden;
 }
@@ -550,7 +631,7 @@ tr.position-recuse-row {
     width: 100%;
     align-items: center;
     justify-content: center;
-    color: #999;
+    color: var(--bs-tertiary-color);
 }
 
 .edit-meeting-schedule .edit-grid .timeslot .drop-target {
@@ -567,22 +648,22 @@ tr.position-recuse-row {
 }
 
 .edit-meeting-schedule .edit-grid .timeslot.overfull {
-    border-right: 0.3em dashed #f55000;
+    border-right: 0.3em dashed var(--bs-danger);
     /* cut-off illusion */
 }
 
 .edit-meeting-schedule .edit-grid .timeslot.would-violate-hint {
-    background-color: #ffe0e0;
-    outline: #ffe0e0 solid 0.4em;
+    background-color: var(--bs-danger-bg-subtle);
+    outline: var(--bs-danger-bg-subtle) solid 0.4em;
 }
 
 .edit-meeting-schedule .edit-grid .timeslot.would-violate-hint.dropping {
-    background-color: #ccb3b3;
+    background-color: var(--bs-danger);
 }
 
 .edit-meeting-schedule .constraints .encircled,
 .edit-meeting-schedule .formatted-constraints .encircled {
-    border: 1px solid #000;
+    border: 1px solid var( --bs-body-color);
     border-radius: 1em;
     padding: 0 0.3em;
     text-align: center;
@@ -595,7 +676,7 @@ tr.position-recuse-row {
 
 /* sessions */
 .edit-meeting-schedule .session {
-    background-color: #fff;
+    background-color: var(--bs-body-bg);
     margin: 0.2em;
     padding-right: 0.2em;
     padding-left: 0.5em;
@@ -607,15 +688,15 @@ tr.position-recuse-row {
 
 .edit-meeting-schedule .session.selected {
     cursor: grabbing;
-    outline: #0000ff solid 0.2em;
-    /* blue, width matches margin on .session */
+    outline: var(--bs-primary) solid 0.2em;
+    /* width matches margin on .session */
     z-index: 2;
     /* render above timeslot outlines */
 }
 
 .edit-meeting-schedule .session.other-session-selected {
-    outline: #00008b solid 0.2em;
-    /* darkblue, width matches margin on .session */
+    outline: 0.3em solid var(--bs-info);
+    box-shadow: 0 0 1em var(--bs-info);
     z-index: 2;
     /* render above timeslot outlines */
 }
@@ -626,7 +707,7 @@ tr.position-recuse-row {
 
 .edit-meeting-schedule .session.readonly {
     cursor: default;
-    background-color: #ddd;
+    background-color: var(--bs-dark-bg-subtle);
 }
 
 .edit-meeting-schedule .session.hidden-parent * {
@@ -640,13 +721,12 @@ tr.position-recuse-row {
 }
 
 .edit-meeting-schedule .session.highlight {
-    outline-color: #ff8c00;
-    /* darkorange */
-    background-color: #f3f3f3;
+    outline-color: var(--bs-warning);
+    background-color: var(--bs-light);
 }
 
 .edit-meeting-schedule .session.would-violate-hint {
-    outline: 0.3em solid #F55000;
+    outline: 0.3em solid var(--bs-danger);
     z-index: 1;
     /* raise up so the outline is not overdrawn */
 }
@@ -668,6 +748,7 @@ tr.position-recuse-row {
 
 .edit-meeting-schedule .edit-grid,
 .edit-meeting-schedule .session {
+    // Removing this font-family style causes selenium tests to fail :-(
     font-family: arial, helvetica, sans-serif;
     font-size: 11px;
 }
@@ -739,9 +820,9 @@ tr.position-recuse-row {
     bottom: 0;
     left: 0;
     width: 100%;
-    border-top: 0.2em solid #ccc;
+    border-top: 0.2em solid var(--bs-border-color);
     margin-bottom: 2em;
-    background-color: #fff;
+    background-color: var(--bs-body-bg);
     opacity: 0.95;
     z-index: 5;
     /* raise above edit-grid items */
@@ -756,7 +837,7 @@ tr.position-recuse-row {
     min-height: 4em;
     max-height: 13em;
     overflow-y: auto;
-    background-color: #f4f4f4;
+    background-color: var(--bs-secondary-bg);
 }
 
 .edit-meeting-schedule .unassigned-sessions.dropping {
@@ -813,7 +894,7 @@ tr.position-recuse-row {
     font-weight: normal;
     margin-right: 1em;
     padding: 0 1em;
-    border: 0.1em solid #eee;
+    border: 0.1em solid var(--bs-border-color);
     cursor: pointer;
 }
 
@@ -879,7 +960,7 @@ tr.position-recuse-row {
 }
 
 .edit-meeting-timeslots-and-misc-sessions .room-row {
-    border-bottom: 1px solid #ccc;
+    border-bottom: 1px solid var(--bs-border-color);
     // height: 20px;
     display: flex;
     cursor: pointer;
@@ -899,13 +980,13 @@ tr.position-recuse-row {
 }
 
 .edit-meeting-timeslots-and-misc-sessions .timeline.hover {
-    background: radial-gradient(#999 1px, transparent 1px);
+    background: radial-gradient(var(--bs-tertiary-color) 1px, transparent 1px);
     background-size: 20px 20px;
 }
 
 .edit-meeting-timeslots-and-misc-sessions .timeline.selected.hover,
 .edit-meeting-timeslots-and-misc-sessions .timeline.selected {
-    background: radial-gradient(#999 2px, transparent 2px);
+    background: radial-gradient(var(--bs-tertiary-color) 2px, transparent 2px);
     background-size: 20px 20px;
 }
 
@@ -921,8 +1002,8 @@ tr.position-recuse-row {
     white-space: nowrap;
     cursor: pointer;
     padding-left: 0.2em;
-    border-left: 1px solid #999;
-    border-right: 1px solid #999;
+    border-left: 1px solid var(--bs-border-color);
+    border-right: 1px solid var(--bs-border-color);
 }
 
 .edit-meeting-timeslots-and-misc-sessions .timeslot:hover {
@@ -942,10 +1023,10 @@ tr.position-recuse-row {
     bottom: 0;
     left: 0;
     width: 100%;
-    border-top: 0.2em solid #ccc;
+    border-top: 0.2em solid var(--bs-border-color);
     padding-top: 0.2em;
     margin-bottom: 2em;
-    background-color: #fff;
+    background-color: var(--bs-body-bg);
     opacity: 0.95;
 }
 
@@ -993,7 +1074,7 @@ tr.position-recuse-row {
 }
 
 .timeslot-edit .tstable div.timeslot {
-    border: #000000 solid 1px;
+    border: var(--bs-body-color) solid 1px;
     border-radius: 0.5em;
     padding: 0.5em;
 }
@@ -1023,7 +1104,7 @@ tr.position-recuse-row {
 }
 
 .timeslot-edit .tstable .tstype_unavail {
-    background-color: #666;
+    background-color: var(--bs-secondary-color);
 }
 
 .timeslot-edit .official-use-warning {
@@ -1106,3 +1187,49 @@ tr.position-recuse-row {
         }
     }
 }
+
+blockquote {
+    padding-left: 1rem;
+    border-left: solid 1px var(--bs-body-color);
+}
+
+iframe.status {
+    background-color:transparent;
+    border:none;
+    width:100%;
+    height:3.5em;
+}
+
+.overflow-shadows {
+    transition: box-shadow 0.5s;
+}
+
+.overflow-shadows--both {
+    box-shadow: inset 0px 21px 18px -20px var(--bs-body-color),
+                inset 0px -21px 18px -20px var(--bs-body-color);
+}
+
+.overflow-shadows--top-only {
+    box-shadow: inset 0px 21px 18px -20px var(--bs-body-color);
+}
+
+.overflow-shadows--bottom-only {
+    box-shadow: inset 0px -21px 18px -20px var(--bs-body-color);
+}
+
+#navbar-doc-search-wrapper {
+    position: relative;
+}
+
+#navbar-doc-search-results {
+    max-height: 400px;
+    overflow-y: auto;
+    min-width: auto;
+    left: 0;
+    right: 0;
+
+    .dropdown-item {
+        white-space: normal;
+        overflow-wrap: break-word;
+    }
+}
diff --git a/ietf/static/css/list.scss b/ietf/static/css/list.scss
index d52fc879a7..595bf360d5 100644
--- a/ietf/static/css/list.scss
+++ b/ietf/static/css/list.scss
@@ -1,6 +1,4 @@
-// Import bootstrap helpers
-@import "bootstrap/scss/functions";
-@import "bootstrap/scss/variables";
+@import "custom-bs-import";
 
 table .sort {
     cursor: pointer;
diff --git a/ietf/static/css/select2.scss b/ietf/static/css/select2.scss
index 44824a358a..c8e3da7adc 100644
--- a/ietf/static/css/select2.scss
+++ b/ietf/static/css/select2.scss
@@ -1,5 +1,7 @@
-@import "bootstrap/scss/functions";
-@import "bootstrap/scss/variables";
-@import "bootstrap/scss/mixins";
+@import "custom-bs-import";
+
+// FIXME: bs-5.3.0 workaround from https://github.com/apalfrey/select2-bootstrap-5-theme/issues/75#issuecomment-1573265695
+$s2bs5-border-color: $border-color;
+
 @import "select2/src/scss/core";
 @import "select2-bootstrap-5-theme/src/include-all";
diff --git a/ietf/static/images/arrow-ani.webp b/ietf/static/images/arrow-ani.webp
deleted file mode 100644
index 379407db15..0000000000
Binary files a/ietf/static/images/arrow-ani.webp and /dev/null differ
diff --git a/ietf/static/images/iab-logo-white.svg b/ietf/static/images/iab-logo-white.svg
new file mode 100644
index 0000000000..264b7bb842
--- /dev/null
+++ b/ietf/static/images/iab-logo-white.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="201.333"
+   height="155.949"
+   version="1.1"
+   id="svg14"
+   sodipodi:docname="iab-logo-white.svg"
+   inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <sodipodi:namedview
+     id="namedview16"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="6.1887522"
+     inkscape:cx="75.944227"
+     inkscape:cy="79.579855"
+     inkscape:window-width="2403"
+     inkscape:window-height="1303"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg14" />
+  <path
+     d="m131.984 101.1 16.918-16.918a1.998 1.998 0 0 0 0-2.828l-33.836-33.84a2 2 0 0 0-2.828 0l-33.84 33.84a2 2 0 0 0 0 2.828l33.84 33.836a2 2 0 0 0 2.828 0z"
+     style="fill:#183f80;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.33333 0 0 -1.33333 -2.183 158.801)"
+     id="path2" />
+  <path
+     d="m95.316 101.1 16.922-16.918a1.998 1.998 0 0 0 0-2.828l-33.84-33.84a2 2 0 0 0-2.828 0l-33.84 33.84a2 2 0 0 0 0 2.828l33.84 33.836a2 2 0 0 0 2.828 0z"
+     style="fill:#999;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.33333 0 0 -1.33333 -2.183 158.801)"
+     id="path4" />
+  <path
+     d="M58.652 101.1 75.57 84.182a1.998 1.998 0 0 0 0-2.828v0l-33.836-33.84a2 2 0 0 0-2.828 0v0l-33.84 33.84a2 2 0 0 0 0 2.828v0l33.84 33.836a2 2 0 0 0 2.828 0z"
+     style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.33333 0 0 -1.33333 -2.183 158.801)"
+     id="path6" />
+  <path
+     d="m4.77 84.662-2.633-2.753 19.582-19.332L40.098 80.85l18.703-18.641 36.668 36.325 18.613-18.325 18.148 17.957 17.086-16.992 2.821 2.754-19.907 19.606s-18.195-17.864-18.195-18c0-.137-18.75 18.414-18.609 18.414.136 0-36.625-36.461-36.625-36.461l-18.61 18.414-18.382-17.906Z"
+     style="fill:#ff0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.33333 0 0 -1.33333 -2.183 158.801)"
+     id="path8" />
+  <path
+     d="M109.223 32.963h18.414s6.508-.414 7.062-6.785c.555-6.367-5.539-7.336-5.539-7.336s7.617-.14 7.34-7.617c-.277-7.477-9-8.445-9-8.445l-3.047-.141h-15.371zm8.722-6.367v-5.402h5.125s2.629.832 2.629 2.91c0 2.074-2.769 2.492-2.769 2.492zm0-11.769v-5.68h5.953s2.911.832 2.911 2.91c0 2.074-3.047 2.77-3.047 2.77h-5.403z"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#183f80;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.33333 0 0 -1.33333 -2.183 158.801)"
+     id="path10" />
+  <path
+     d="M71.758 33.1h10.25L93.684 2.776h-9.825L82 7.756H71.48l-1.714-4.832-9.825.133Zm5.105-8.258-3.113-9.75h6.09zM27 33.1h8.527V2.776H27Z"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#183f80;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     transform="matrix(1.33333 0 0 -1.33333 -2.183 158.801)"
+     id="path12" />
+</svg>
diff --git a/ietf/static/images/ietf-logo-nor-white.svg b/ietf/static/images/ietf-logo-nor-white.svg
index 004e58af80..42c033600f 100644
--- a/ietf/static/images/ietf-logo-nor-white.svg
+++ b/ietf/static/images/ietf-logo-nor-white.svg
@@ -1,26 +1,136 @@
-<svg version="1.1" id="svg41" width="290.41" height="159.08"
-	xmlns="http://www.w3.org/2000/svg">
-	<defs id="defs11">
-		<style id="style9">.cls-2{fill:#bbbcc1}.cls-3{fill:#221e1f}</style>
-	</defs>
-	<path id="path6" class="cls-2" d="M97.57 0h.07c6.78 6.78 13.59 13.52 20.36 20.36-3 3.11-6.15 6.16-9.21 9.24L97.68 40.69a.57.57 0 0 0-.34-.18c-.78-.68-1.48-1.46-2.22-2.18L77.3 20.52c-.17-.12 0-.28.08-.38q7.94-7.9 15.84-15.84c1.5-1.39 2.9-2.87 4.35-4.3z" style="fill:#bbbcc1"/>
-	<path id="path8" class="cls-2" d="M145.54 0h.06c4.84 4.72 9.59 9.52 14.4 14.33 1.91 1.93 3.88 3.8 5.74 5.78l-20.39 20.41a10.44 10.44 0 0 1-.77-.71c-6.39-6.34-12.72-12.73-19.1-19.07-.09-.12-.33-.27-.18-.44C132 13.52 138.81 6.77 145.54 0Z" style="fill:#bbbcc1"/>
-	<path id="path10" class="cls-2" d="M193.57 0h.07q8.63 8.64 17.27 17.26c1 1 2 1.92 2.9 3-6.69 6.69-13.4 13.36-20.06 20.08-1.65-1.54-3.19-3.18-4.8-4.75l-15.39-15.4a2.65 2.65 0 0 1 .77-.93z" style="fill:#bbbcc1"/>
-	<path id="path12" class="cls-2" d="M25.25 23.97c.14-.2.32 0 .44.11 4.33 4.37 8.72 8.7 13.08 13.06 1.4 1.44 2.87 2.8 4.23 4.28H9.75v-1.55h-.29a7 7 0 0 1 .82-.9z" style="fill:#bbbcc1"/>
-	<path id="path14" class="cls-2" d="M73.2 23.99c.12-.17.34-.09.45.05l20.09 20.09Q83.66 54.21 73.57 64.29 63.4 54.07 53.19 43.89l.28-.17q9.86-9.87 19.73-19.73Z" style="fill:#bbbcc1"/>
-	<path id="path16" class="cls-2" d="M120.75 24.52c.22-.2.39-.49.68-.59a3.06 3.06 0 0 1 .69.61l11.66 11.65c2.63 2.67 5.32 5.27 7.92 8q-10.14 10.14-20.28 20.27c-3.58-3.55-7.13-7.13-10.7-10.69-3.16-3.19-6.38-6.3-9.53-9.49a1 1 0 0 1 .25-.45c6.45-6.49 12.86-12.94 19.31-19.31z" style="fill:#bbbcc1"/>
-	<path id="path18" class="cls-2" d="M249.25 40.3c5.51-5.49 11-11 16.52-16.48l13.83 13.82c.72.76 1.52 1.45 2.2 2.25h-1.16v1.78h-32.66c.37-.5.83-.92 1.27-1.37z" style="fill:#bbbcc1"/>
-	<path id="path20" class="cls-2" d="M169.35 24.52c.12-.21.29 0 .39.1l19.82 19.9c-6.66 6.74-13.41 13.4-20.09 20.13a23.82 23.82 0 0 1-1.78-1.7l-15.48-15.54c-.94-1-2-1.86-2.83-2.89q9.99-10 19.97-20z" style="fill:#bbbcc1"/>
-	<path id="path22" class="cls-2" d="M211.48 30.37c2-2 4-4 6-5.93.62.5 1.14 1.13 1.72 1.68l18.35 18.4q-9.65 9.69-19.33 19.35a3.93 3.93 0 0 1-.87.76c-1.1-1.18-2.27-2.29-3.4-3.44-5.54-5.56-11.11-11.08-16.64-16.66 4.69-4.73 9.43-9.46 14.17-14.16z" style="fill:#bbbcc1"/>
-	<path id="path24" class="cls-2" d="M9.75 46.92H43a3.58 3.58 0 0 1-.47.56L29.32 60.7c-1.32 1.3-2.6 2.66-4 3.92-4.8-4.84-9.64-9.64-14.45-14.47a11.2 11.2 0 0 1-1.16-1.23c.06-.67.04-1.33.04-2z" style="fill:#bbbcc1"/>
-	<path id="path26" class="cls-2" d="M248.51 47.3h32.12v1.61h.73a8.79 8.79 0 0 1-1.1 1.18l-9.47 9.47c-1.7 1.67-3.34 3.41-5.09 5q-7.63-7.65-15.3-15.3a21.1 21.1 0 0 1-1.89-1.96z" style="fill:#bbbcc1"/>
-	<path id="path28" class="cls-2" d="m193.48 48.36.27-.29c2.73 2.76 5.52 5.46 8.26 8.21l12 12c-.88 1.07-2 1.94-2.94 2.94L198.7 83.6c-1.72 1.68-3.38 3.44-5.13 5.08q-7.57-7.55-15.18-15.16c-1.74-1.72-3.43-3.49-5.21-5.17.92-1.08 2-2 3-3 5.72-5.7 11.41-11.43 17.14-17.12z" style="fill:#bbbcc1"/>
-	<path id="path30" class="cls-2" d="M125.39 68.52q10.19-10.17 20.36-20.36c1 .82 1.83 1.8 2.76 2.68L166 68.31q-10.19 10.21-20.4 20.4c-1.86-1.79-3.65-3.65-5.48-5.45-4.91-4.92-9.83-9.82-14.73-14.74Z" style="fill:#bbbcc1"/>
-	<path id="path32" class="cls-2" d="m77.42 68.52 20.15-20.15 20.18 20.15q-8.43 8.46-16.89 16.9c-1.11 1.07-2.15 2.22-3.29 3.25-5.48-5.43-10.91-10.91-16.37-16.35-1.2-1.26-2.57-2.48-3.78-3.8Z" style="fill:#bbbcc1"/>
-	<path id="path35" class="cls-3" d="M169.58 16.22c1.36 1.28 2.65 2.64 4 3.94L189 35.52c1.61 1.57 3.15 3.21 4.8 4.75 6.66-6.72 13.37-13.39 20.06-20.08 1.26-1.24 2.49-2.51 3.76-3.74 8.4 8.39 16.79 16.81 25.22 25.17h37.82v-1.78h9.75v9h-9.73V47.3h-40.33c-.93-.93-1.86-1.87-2.8-2.8l-18.39-18.38c-.58-.55-1.1-1.18-1.72-1.68-2 1.95-4 4-6 5.93-4.74 4.7-9.44 9.43-14.17 14.14l-3.56 3.56-.27.29-.18-.16-3.7-3.68-19.82-19.88c-.1-.1-.27-.31-.39-.1l-20 20q-1.83 1.8-3.63 3.63-10.15 10.17-20.33 20.35c-1.29 1.27-2.55 2.56-3.84 3.82l-3.8-3.82-20.18-20.15-20.15 20.15c-1.25 1.22-2.46 2.48-3.72 3.69Q61.07 59.52 48.44 46.93H9.75v2H0v-9h8.34a5.76 5.76 0 0 0 1.1 0h.29c.05.52 0 1 0 1.55h41c.82.83 1.65 1.64 2.47 2.47q10.2 10.18 20.38 20.4 10.09-10.06 20.17-20.16c1.2-1.21 2.42-2.39 3.6-3.62a.57.57 0 0 1 .34.18c1.16 1.19 2.34 2.35 3.51 3.52 3.15 3.19 6.37 6.3 9.53 9.49 3.57 3.56 7.12 7.14 10.7 10.69l20.27-20.33 3.65-3.6 20.37-20.37c1.29-1.29 2.6-2.57 3.86-3.89m0 1.31c-1.76 1.84-3.59 3.6-5.38 5.42q-21.4 21.32-42.79 42.71l-24-24Q85.52 53.64 73.6 65.59c-2.47-2.41-4.88-4.88-7.33-7.31L53.48 45.52c-1.08-1.06-2.11-2.16-3.22-3.17H9.77v3.69h38.31c.27 0 .61-.1.83.1l24.81 24.78q11.86-11.9 23.76-23.76h.15l14.07 14.03c3.26 3.28 6.57 6.52 9.79 9.83a4.33 4.33 0 0 0 .75-.67q23.63-23.62 47.26-47.25l24 24c2.17-2.27 4.46-4.43 6.67-6.67l17.2-17.2c.33-.11.51.42.78.58q11.31 11.3 22.62 22.61h39.88v-3.9h-38.31c-7.58-7.65-15.24-15.22-22.85-22.83-.67-.63-1.27-1.35-2-1.93a9.69 9.69 0 0 1-.94 1c-7.59 7.62-15.22 15.2-22.79 22.82a2 2 0 0 1-.61-.5l-18.43-18.45c-1.72-1.69-3.39-3.44-5.15-5.11z" style="fill:#221e1f"/>
-	<path id="path39" class="cls-3" d="M8.51 125.08h12v34h-12q.02-17.02 0-34z" style="fill:#FFF"/>
-	<path id="path41" class="cls-3" d="M82.39 125.07h25.48v7.22H94.34v5.94h12.41v7.17h-12.4v6.45h13.76v7.17H82.39q-.01-16.96 0-33.95z" style="fill:#FFF"/>
-	<path id="path43" class="cls-3" d="M166.5 125.08h33.19v8.56h-10.64v25.41h-11.91v-25.41h-10.63c-.01-2.86 0-5.71-.01-8.56z" style="fill:#FFF"/>
-	<path id="path45" class="cls-3" d="M259.25 125.07h24.85v7.22h-12.89v6.1h12.13v7.21h-12.13v13.42h-11.96z" style="fill:#FFF"/>
-	<path id="path50" d="M169.57 17.52c1.76 1.66 3.43 3.41 5.15 5.1l18.45 18.46a2 2 0 0 0 .61.5c7.57-7.62 15.2-15.2 22.79-22.82a9.69 9.69 0 0 0 .94-1c.71.58 1.31 1.3 2 1.93 7.61 7.61 15.27 15.18 22.85 22.83h38.29v3.83h-39.88q-11.33-11.3-22.62-22.61c-.27-.16-.45-.69-.78-.58l-17.2 17.2c-2.21 2.24-4.5 4.4-6.67 6.67l-24-24q-23.66 23.61-47.26 47.25a4.33 4.33 0 0 1-.75.67c-3.22-3.31-6.53-6.55-9.79-9.83l-14.07-14h-.15Q85.6 59.03 73.72 70.92L48.89 46.1c-.22-.2-.56-.06-.83-.1H9.75v-3.69h40.49c1.11 1 2.14 2.11 3.22 3.17l12.81 12.8c2.45 2.43 4.86 4.9 7.33 7.31q11.93-11.94 23.86-23.85l24 24q21.43-21.34 42.78-42.75c1.76-1.86 3.57-3.62 5.33-5.47z" style="fill:#fdd34f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg41"
+   width="290.41"
+   height="159.08"
+   sodipodi:docname="ietf-logo-nor-white.svg"
+   inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview25"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="4.2904858"
+     inkscape:cx="144.73885"
+     inkscape:cy="74.000944"
+     inkscape:window-width="1390"
+     inkscape:window-height="1205"
+     inkscape:window-x="365"
+     inkscape:window-y="125"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg41" />
+  <defs
+     id="defs11">
+    <style
+       id="style9">.cls-2{fill:#bbbcc1}.cls-3{fill:#221e1f}</style>
+  </defs>
+  <path
+     id="path6"
+     class="cls-2"
+     d="M97.57 0h.07c6.78 6.78 13.59 13.52 20.36 20.36-3 3.11-6.15 6.16-9.21 9.24L97.68 40.69a.57.57 0 0 0-.34-.18c-.78-.68-1.48-1.46-2.22-2.18L77.3 20.52c-.17-.12 0-.28.08-.38q7.94-7.9 15.84-15.84c1.5-1.39 2.9-2.87 4.35-4.3z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path8"
+     class="cls-2"
+     d="M145.54 0h.06c4.84 4.72 9.59 9.52 14.4 14.33 1.91 1.93 3.88 3.8 5.74 5.78l-20.39 20.41a10.44 10.44 0 0 1-.77-.71c-6.39-6.34-12.72-12.73-19.1-19.07-.09-.12-.33-.27-.18-.44C132 13.52 138.81 6.77 145.54 0Z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path10"
+     class="cls-2"
+     d="M193.57 0h.07q8.63 8.64 17.27 17.26c1 1 2 1.92 2.9 3-6.69 6.69-13.4 13.36-20.06 20.08-1.65-1.54-3.19-3.18-4.8-4.75l-15.39-15.4a2.65 2.65 0 0 1 .77-.93z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path12"
+     class="cls-2"
+     d="M25.25 23.97c.14-.2.32 0 .44.11 4.33 4.37 8.72 8.7 13.08 13.06 1.4 1.44 2.87 2.8 4.23 4.28H9.75v-1.55h-.29a7 7 0 0 1 .82-.9z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path14"
+     class="cls-2"
+     d="M73.2 23.99c.12-.17.34-.09.45.05l20.09 20.09Q83.66 54.21 73.57 64.29 63.4 54.07 53.19 43.89l.28-.17q9.86-9.87 19.73-19.73Z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path16"
+     class="cls-2"
+     d="M120.75 24.52c.22-.2.39-.49.68-.59a3.06 3.06 0 0 1 .69.61l11.66 11.65c2.63 2.67 5.32 5.27 7.92 8q-10.14 10.14-20.28 20.27c-3.58-3.55-7.13-7.13-10.7-10.69-3.16-3.19-6.38-6.3-9.53-9.49a1 1 0 0 1 .25-.45c6.45-6.49 12.86-12.94 19.31-19.31z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path18"
+     class="cls-2"
+     d="M249.25 40.3c5.51-5.49 11-11 16.52-16.48l13.83 13.82c.72.76 1.52 1.45 2.2 2.25h-1.16v1.78h-32.66c.37-.5.83-.92 1.27-1.37z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path20"
+     class="cls-2"
+     d="M169.35 24.52c.12-.21.29 0 .39.1l19.82 19.9c-6.66 6.74-13.41 13.4-20.09 20.13a23.82 23.82 0 0 1-1.78-1.7l-15.48-15.54c-.94-1-2-1.86-2.83-2.89q9.99-10 19.97-20z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path22"
+     class="cls-2"
+     d="M211.48 30.37c2-2 4-4 6-5.93.62.5 1.14 1.13 1.72 1.68l18.35 18.4q-9.65 9.69-19.33 19.35a3.93 3.93 0 0 1-.87.76c-1.1-1.18-2.27-2.29-3.4-3.44-5.54-5.56-11.11-11.08-16.64-16.66 4.69-4.73 9.43-9.46 14.17-14.16z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path24"
+     class="cls-2"
+     d="M9.75 46.92H43a3.58 3.58 0 0 1-.47.56L29.32 60.7c-1.32 1.3-2.6 2.66-4 3.92-4.8-4.84-9.64-9.64-14.45-14.47a11.2 11.2 0 0 1-1.16-1.23c.06-.67.04-1.33.04-2z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path26"
+     class="cls-2"
+     d="M248.51 47.3h32.12v1.61h.73a8.79 8.79 0 0 1-1.1 1.18l-9.47 9.47c-1.7 1.67-3.34 3.41-5.09 5q-7.63-7.65-15.3-15.3a21.1 21.1 0 0 1-1.89-1.96z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path28"
+     class="cls-2"
+     d="m193.48 48.36.27-.29c2.73 2.76 5.52 5.46 8.26 8.21l12 12c-.88 1.07-2 1.94-2.94 2.94L198.7 83.6c-1.72 1.68-3.38 3.44-5.13 5.08q-7.57-7.55-15.18-15.16c-1.74-1.72-3.43-3.49-5.21-5.17.92-1.08 2-2 3-3 5.72-5.7 11.41-11.43 17.14-17.12z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path30"
+     class="cls-2"
+     d="M125.39 68.52q10.19-10.17 20.36-20.36c1 .82 1.83 1.8 2.76 2.68L166 68.31q-10.19 10.21-20.4 20.4c-1.86-1.79-3.65-3.65-5.48-5.45-4.91-4.92-9.83-9.82-14.73-14.74Z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path32"
+     class="cls-2"
+     d="m77.42 68.52 20.15-20.15 20.18 20.15q-8.43 8.46-16.89 16.9c-1.11 1.07-2.15 2.22-3.29 3.25-5.48-5.43-10.91-10.91-16.37-16.35-1.2-1.26-2.57-2.48-3.78-3.8Z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path35"
+     class="cls-3"
+     d="M169.58 16.22c1.36 1.28 2.65 2.64 4 3.94L189 35.52c1.61 1.57 3.15 3.21 4.8 4.75 6.66-6.72 13.37-13.39 20.06-20.08 1.26-1.24 2.49-2.51 3.76-3.74 8.4 8.39 16.79 16.81 25.22 25.17h37.82v-1.78h9.75v9h-9.73V47.3h-40.33c-.93-.93-1.86-1.87-2.8-2.8l-18.39-18.38c-.58-.55-1.1-1.18-1.72-1.68-2 1.95-4 4-6 5.93-4.74 4.7-9.44 9.43-14.17 14.14l-3.56 3.56-.27.29-.18-.16-3.7-3.68-19.82-19.88c-.1-.1-.27-.31-.39-.1l-20 20q-1.83 1.8-3.63 3.63-10.15 10.17-20.33 20.35c-1.29 1.27-2.55 2.56-3.84 3.82l-3.8-3.82-20.18-20.15-20.15 20.15c-1.25 1.22-2.46 2.48-3.72 3.69Q61.07 59.52 48.44 46.93H9.75v2H0v-9h8.34a5.76 5.76 0 0 0 1.1 0h.29c.05.52 0 1 0 1.55h41c.82.83 1.65 1.64 2.47 2.47q10.2 10.18 20.38 20.4 10.09-10.06 20.17-20.16c1.2-1.21 2.42-2.39 3.6-3.62a.57.57 0 0 1 .34.18c1.16 1.19 2.34 2.35 3.51 3.52 3.15 3.19 6.37 6.3 9.53 9.49 3.57 3.56 7.12 7.14 10.7 10.69l20.27-20.33 3.65-3.6 20.37-20.37c1.29-1.29 2.6-2.57 3.86-3.89m0 1.31c-1.76 1.84-3.59 3.6-5.38 5.42q-21.4 21.32-42.79 42.71l-24-24Q85.52 53.64 73.6 65.59c-2.47-2.41-4.88-4.88-7.33-7.31L53.48 45.52c-1.08-1.06-2.11-2.16-3.22-3.17H9.77v3.69h38.31c.27 0 .61-.1.83.1l24.81 24.78q11.86-11.9 23.76-23.76h.15l14.07 14.03c3.26 3.28 6.57 6.52 9.79 9.83a4.33 4.33 0 0 0 .75-.67q23.63-23.62 47.26-47.25l24 24c2.17-2.27 4.46-4.43 6.67-6.67l17.2-17.2c.33-.11.51.42.78.58q11.31 11.3 22.62 22.61h39.88v-3.9h-38.31c-7.58-7.65-15.24-15.22-22.85-22.83-.67-.63-1.27-1.35-2-1.93a9.69 9.69 0 0 1-.94 1c-7.59 7.62-15.22 15.2-22.79 22.82a2 2 0 0 1-.61-.5l-18.43-18.45c-1.72-1.69-3.39-3.44-5.15-5.11z"
+     style="fill:#ffffff" />
+  <path
+     id="path39"
+     class="cls-3"
+     d="M8.51 125.08h12v34h-12q.02-17.02 0-34z"
+     style="fill:#FFF" />
+  <path
+     id="path41"
+     class="cls-3"
+     d="M82.39 125.07h25.48v7.22H94.34v5.94h12.41v7.17h-12.4v6.45h13.76v7.17H82.39q-.01-16.96 0-33.95z"
+     style="fill:#FFF" />
+  <path
+     id="path43"
+     class="cls-3"
+     d="M166.5 125.08h33.19v8.56h-10.64v25.41h-11.91v-25.41h-10.63c-.01-2.86 0-5.71-.01-8.56z"
+     style="fill:#FFF" />
+  <path
+     id="path45"
+     class="cls-3"
+     d="M259.25 125.07h24.85v7.22h-12.89v6.1h12.13v7.21h-12.13v13.42h-11.96z"
+     style="fill:#FFF" />
+  <path
+     id="path50"
+     d="M169.57 17.52c1.76 1.66 3.43 3.41 5.15 5.1l18.45 18.46a2 2 0 0 0 .61.5c7.57-7.62 15.2-15.2 22.79-22.82a9.69 9.69 0 0 0 .94-1c.71.58 1.31 1.3 2 1.93 7.61 7.61 15.27 15.18 22.85 22.83h38.29v3.83h-39.88q-11.33-11.3-22.62-22.61c-.27-.16-.45-.69-.78-.58l-17.2 17.2c-2.21 2.24-4.5 4.4-6.67 6.67l-24-24q-23.66 23.61-47.26 47.25a4.33 4.33 0 0 1-.75.67c-3.22-3.31-6.53-6.55-9.79-9.83l-14.07-14h-.15Q85.6 59.03 73.72 70.92L48.89 46.1c-.22-.2-.56-.06-.83-.1H9.75v-3.69h40.49c1.11 1 2.14 2.11 3.22 3.17l12.81 12.8c2.45 2.43 4.86 4.9 7.33 7.31q11.93-11.94 23.86-23.85l24 24q21.43-21.34 42.78-42.75c1.76-1.86 3.57-3.62 5.33-5.47z"
+     style="fill:#fdd34f" />
 </svg>
diff --git a/ietf/static/images/ietf-logo-white.svg b/ietf/static/images/ietf-logo-white.svg
new file mode 100644
index 0000000000..2417f917ce
--- /dev/null
+++ b/ietf/static/images/ietf-logo-white.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg41"
+   width="300"
+   height="159.08"
+   sodipodi:docname="ietf-logo-white.svg"
+   inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview27"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="4.1533333"
+     inkscape:cx="150"
+     inkscape:cy="79.574639"
+     inkscape:window-width="1390"
+     inkscape:window-height="1205"
+     inkscape:window-x="436"
+     inkscape:window-y="99"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg41" />
+  <defs
+     id="defs11">
+    <style
+       id="style9">.cls-2{fill:#bbbcc1}.cls-3{fill:#221e1f}</style>
+  </defs>
+  <path
+     id="path6"
+     class="cls-2"
+     d="M97.57 0h.07c6.78 6.78 13.59 13.52 20.36 20.36-3 3.11-6.15 6.16-9.21 9.24L97.68 40.69a.57.57 0 0 0-.34-.18c-.78-.68-1.48-1.46-2.22-2.18L77.3 20.52c-.17-.12 0-.28.08-.38q7.94-7.9 15.84-15.84c1.5-1.39 2.9-2.87 4.35-4.3z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path8"
+     class="cls-2"
+     d="M145.54 0h.06c4.84 4.72 9.59 9.52 14.4 14.33 1.91 1.93 3.88 3.8 5.74 5.78l-20.39 20.41a10.44 10.44 0 0 1-.77-.71c-6.39-6.34-12.72-12.73-19.1-19.07-.09-.12-.33-.27-.18-.44C132 13.52 138.81 6.77 145.54 0Z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path10"
+     class="cls-2"
+     d="M193.57 0h.07q8.63 8.64 17.27 17.26c1 1 2 1.92 2.9 3-6.69 6.69-13.4 13.36-20.06 20.08-1.65-1.54-3.19-3.18-4.8-4.75l-15.39-15.4a2.65 2.65 0 0 1 .77-.93z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path12"
+     class="cls-2"
+     d="M25.25 23.97c.14-.2.32 0 .44.11 4.33 4.37 8.72 8.7 13.08 13.06 1.4 1.44 2.87 2.8 4.23 4.28H9.75v-1.55h-.29a7 7 0 0 1 .82-.9z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path14"
+     class="cls-2"
+     d="M73.2 23.99c.12-.17.34-.09.45.05l20.09 20.09Q83.66 54.21 73.57 64.29 63.4 54.07 53.19 43.89l.28-.17q9.86-9.87 19.73-19.73Z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path16"
+     class="cls-2"
+     d="M120.75 24.52c.22-.2.39-.49.68-.59a3.06 3.06 0 0 1 .69.61l11.66 11.65c2.63 2.67 5.32 5.27 7.92 8q-10.14 10.14-20.28 20.27c-3.58-3.55-7.13-7.13-10.7-10.69-3.16-3.19-6.38-6.3-9.53-9.49a1 1 0 0 1 .25-.45c6.45-6.49 12.86-12.94 19.31-19.31z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path18"
+     class="cls-2"
+     d="M249.25 40.3c5.51-5.49 11-11 16.52-16.48l13.83 13.82c.72.76 1.52 1.45 2.2 2.25h-1.16v1.78h-32.66c.37-.5.83-.92 1.27-1.37z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path20"
+     class="cls-2"
+     d="M169.35 24.52c.12-.21.29 0 .39.1l19.82 19.9c-6.66 6.74-13.41 13.4-20.09 20.13a23.82 23.82 0 0 1-1.78-1.7l-15.48-15.54c-.94-1-2-1.86-2.83-2.89q9.99-10 19.97-20z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path22"
+     class="cls-2"
+     d="M211.48 30.37c2-2 4-4 6-5.93.62.5 1.14 1.13 1.72 1.68l18.35 18.4q-9.65 9.69-19.33 19.35a3.93 3.93 0 0 1-.87.76c-1.1-1.18-2.27-2.29-3.4-3.44-5.54-5.56-11.11-11.08-16.64-16.66 4.69-4.73 9.43-9.46 14.17-14.16z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path24"
+     class="cls-2"
+     d="M9.75 46.92H43a3.58 3.58 0 0 1-.47.56L29.32 60.7c-1.32 1.3-2.6 2.66-4 3.92-4.8-4.84-9.64-9.64-14.45-14.47a11.2 11.2 0 0 1-1.16-1.23c.06-.67.04-1.33.04-2z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path26"
+     class="cls-2"
+     d="M248.51 47.3h32.12v1.61h.73a8.79 8.79 0 0 1-1.1 1.18l-9.47 9.47c-1.7 1.67-3.34 3.41-5.09 5q-7.63-7.65-15.3-15.3a21.1 21.1 0 0 1-1.89-1.96z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path28"
+     class="cls-2"
+     d="m193.48 48.36.27-.29c2.73 2.76 5.52 5.46 8.26 8.21l12 12c-.88 1.07-2 1.94-2.94 2.94L198.7 83.6c-1.72 1.68-3.38 3.44-5.13 5.08q-7.57-7.55-15.18-15.16c-1.74-1.72-3.43-3.49-5.21-5.17.92-1.08 2-2 3-3 5.72-5.7 11.41-11.43 17.14-17.12z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path30"
+     class="cls-2"
+     d="M125.39 68.52q10.19-10.17 20.36-20.36c1 .82 1.83 1.8 2.76 2.68L166 68.31q-10.19 10.21-20.4 20.4c-1.86-1.79-3.65-3.65-5.48-5.45-4.91-4.92-9.83-9.82-14.73-14.74Z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path32"
+     class="cls-2"
+     d="m77.42 68.52 20.15-20.15 20.18 20.15q-8.43 8.46-16.89 16.9c-1.11 1.07-2.15 2.22-3.29 3.25-5.48-5.43-10.91-10.91-16.37-16.35-1.2-1.26-2.57-2.48-3.78-3.8Z"
+     style="fill:#bbbcc1" />
+  <path
+     id="path35"
+     class="cls-3"
+     d="M169.58 16.22c1.36 1.28 2.65 2.64 4 3.94L189 35.52c1.61 1.57 3.15 3.21 4.8 4.75 6.66-6.72 13.37-13.39 20.06-20.08 1.26-1.24 2.49-2.51 3.76-3.74 8.4 8.39 16.79 16.81 25.22 25.17h37.82v-1.78h9.75v9h-9.73V47.3h-40.33c-.93-.93-1.86-1.87-2.8-2.8l-18.39-18.38c-.58-.55-1.1-1.18-1.72-1.68-2 1.95-4 4-6 5.93-4.74 4.7-9.44 9.43-14.17 14.14l-3.56 3.56-.27.29-.18-.16-3.7-3.68-19.82-19.88c-.1-.1-.27-.31-.39-.1l-20 20q-1.83 1.8-3.63 3.63-10.15 10.17-20.33 20.35c-1.29 1.27-2.55 2.56-3.84 3.82l-3.8-3.82-20.18-20.15-20.15 20.15c-1.25 1.22-2.46 2.48-3.72 3.69Q61.07 59.52 48.44 46.93H9.75v2H0v-9h8.34a5.76 5.76 0 0 0 1.1 0h.29c.05.52 0 1 0 1.55h41c.82.83 1.65 1.64 2.47 2.47q10.2 10.18 20.38 20.4 10.09-10.06 20.17-20.16c1.2-1.21 2.42-2.39 3.6-3.62a.57.57 0 0 1 .34.18c1.16 1.19 2.34 2.35 3.51 3.52 3.15 3.19 6.37 6.3 9.53 9.49 3.57 3.56 7.12 7.14 10.7 10.69l20.27-20.33 3.65-3.6 20.37-20.37c1.29-1.29 2.6-2.57 3.86-3.89m0 1.31c-1.76 1.84-3.59 3.6-5.38 5.42q-21.4 21.32-42.79 42.71l-24-24Q85.52 53.64 73.6 65.59c-2.47-2.41-4.88-4.88-7.33-7.31L53.48 45.52c-1.08-1.06-2.11-2.16-3.22-3.17H9.77v3.69h38.31c.27 0 .61-.1.83.1l24.81 24.78q11.86-11.9 23.76-23.76h.15l14.07 14.03c3.26 3.28 6.57 6.52 9.79 9.83a4.33 4.33 0 0 0 .75-.67q23.63-23.62 47.26-47.25l24 24c2.17-2.27 4.46-4.43 6.67-6.67l17.2-17.2c.33-.11.51.42.78.58q11.31 11.3 22.62 22.61h39.88v-3.9h-38.31c-7.58-7.65-15.24-15.22-22.85-22.83-.67-.63-1.27-1.35-2-1.93a9.69 9.69 0 0 1-.94 1c-7.59 7.62-15.22 15.2-22.79 22.82a2 2 0 0 1-.61-.5l-18.43-18.45c-1.72-1.69-3.39-3.44-5.15-5.11z"
+     style="fill:#ffffff" />
+  <path
+     id="path37"
+     class="cls-3"
+     d="M289.31 128.3a5.54 5.54 0 0 1 10.69 1.38v1.19a5.55 5.55 0 0 1-10 2.65 5.52 5.52 0 0 1-.72-5.21m4.26-2.38a4.42 4.42 0 1 0 4.4 7 4.42 4.42 0 0 0-4.4-7z"
+     style="fill:#ffffff" />
+  <path
+     id="path39"
+     class="cls-3"
+     d="M8.51 125.08h12v34h-12q.02-17.02 0-34z"
+     style="fill:#ffffff" />
+  <path
+     id="path41"
+     class="cls-3"
+     d="M82.39 125.07h25.48v7.22H94.34v5.94h12.41v7.17h-12.4v6.45h13.76v7.17H82.39q-.01-16.96 0-33.95z"
+     style="fill:#ffffff" />
+  <path
+     id="path43"
+     class="cls-3"
+     d="M166.5 125.08h33.19v8.56h-10.64v25.41h-11.91v-25.41h-10.63c-.01-2.86 0-5.71-.01-8.56z"
+     style="fill:#ffffff" />
+  <path
+     id="path45"
+     class="cls-3"
+     d="M259.25 125.07h24.85v7.22h-12.89v6.1h12.13v7.21h-12.13v13.42h-11.96z"
+     style="fill:#ffffff" />
+  <path
+     id="path47"
+     class="cls-3"
+     d="M292 127.3h3.08a1.63 1.63 0 0 1 1.63 2.2 1.54 1.54 0 0 1-1.51 1.02c.66.3 1 1 1.32 1.57.2.36.44.7.61 1.08h-1.51a7.69 7.69 0 0 0-1.39-2.19 1.43 1.43 0 0 0-1-.21v2.4a10.26 10.26 0 0 1-1.24 0v-5.88m1.25.95v1.56a5.58 5.58 0 0 0 1.87-.14.72.72 0 0 0 .07-1.25 5.39 5.39 0 0 0-1.95-.16z"
+     style="fill:#ffffff" />
+  <path
+     id="path50"
+     d="M169.57 17.52c1.76 1.66 3.43 3.41 5.15 5.1l18.45 18.46a2 2 0 0 0 .61.5c7.57-7.62 15.2-15.2 22.79-22.82a9.69 9.69 0 0 0 .94-1c.71.58 1.31 1.3 2 1.93 7.61 7.61 15.27 15.18 22.85 22.83h38.29v3.83h-39.88q-11.33-11.3-22.62-22.61c-.27-.16-.45-.69-.78-.58l-17.2 17.2c-2.21 2.24-4.5 4.4-6.67 6.67l-24-24q-23.66 23.61-47.26 47.25a4.33 4.33 0 0 1-.75.67c-3.22-3.31-6.53-6.55-9.79-9.83l-14.07-14h-.15Q85.6 59.03 73.72 70.92L48.89 46.1c-.22-.2-.56-.06-.83-.1H9.75v-3.69h40.49c1.11 1 2.14 2.11 3.22 3.17l12.81 12.8c2.45 2.43 4.86 4.9 7.33 7.31q11.93-11.94 23.86-23.85l24 24q21.43-21.34 42.78-42.75c1.76-1.86 3.57-3.62 5.33-5.47z"
+     style="fill:#fdd34f" />
+</svg>
diff --git a/ietf/static/images/irtf-logo-white.svg b/ietf/static/images/irtf-logo-white.svg
new file mode 100644
index 0000000000..a67412581e
--- /dev/null
+++ b/ietf/static/images/irtf-logo-white.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="627.284"
+   height="449.19662"
+   style="display:inline"
+   version="1.1"
+   id="svg303"
+   sodipodi:docname="irtf-logo-white.svg"
+   inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs307" />
+  <sodipodi:namedview
+     id="namedview305"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.0373737"
+     inkscape:cx="303.65142"
+     inkscape:cy="192.31257"
+     inkscape:window-width="1797"
+     inkscape:window-height="1083"
+     inkscape:window-x="392"
+     inkscape:window-y="162"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg303" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;line-height:0%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black,';text-align:start;letter-spacing:0;word-spacing:0;writing-mode:lr-tb;text-anchor:start;fill:#fccf34;fill-opacity:1;stroke:#fccf34;stroke-width:1.908;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="170.22"
+     y="448.24261"
+     id="text289"><tspan
+       x="170.22"
+       y="448.24261"
+       style="font-size:102.5px;line-height:1.25;fill:#fccf34;fill-opacity:1;stroke:#fccf34;stroke-opacity:1"
+       id="tspan287">R</tspan></text>
+  <path
+     style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="m 54.872,156.1246 -44.033,44.031 44.033,44.034 44.032,-44.034 -44.032,-44.03 m 519.185,-0.001 -44.032,44.031 44.032,44.034 44.031,-44.034 -44.03,-44.03 m -311.778,-0.001 -44.032,44.031 44.032,44.034 44.032,-44.034 -44.032,-44.03 m 103.693,-0.001 -44.032,44.031 44.032,44.034 44.032,-44.034 -44.032,-44.03 m 103.693,-0.001 -44.032,44.031 44.032,44.034 44.033,-44.034 -44.033,-44.03 m -258.863,52.051 -44.032,44.032 44.032,44.032 44.032,-44.032 -44.032,-44.032 m -52.217,-52.052 -44.033,44.031 44.033,44.034 44.033,-44.034 -44.033,-44.03 m 155.911,52.051 -44.032,44.032 44.032,44.032 44.032,-44.032 -44.032,-44.032 m 103.693,0 -44.032,44.032 44.032,44.032 44.032,-44.032 -44.032,-44.032 m -207.387,-103.58 -44.032,44.03 44.032,44.034 44.032,-44.033 -44.032,-44.031 m 103.694,0 -44.032,44.03 44.032,44.034 44.032,-44.033 -44.032,-44.031 m 103.693,0 -44.032,44.03 44.032,44.034 44.032,-44.033 -44.032,-44.031"
+     id="path291" />
+  <path
+     style="fill:#fccf34;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="m 18.434,195.0236 h 90.633 l 49.886,49.886 51.52,-51.52 51.807,51.807 104.12,-104.12 52.06,52.059 51.52,-51.52 53.948,53.949 h 88.475 v 10.248 h -92.79 l -49.903,-49.901 -51.79,51.79 -51.79,-51.79 -103.58,103.581 -51.79,-51.792 -51.52,51.522 -54.22,-54.22 H 17.893 l 0.54,-9.98"
+     id="path293" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 18.434,195.0236 h 90.633 l 49.886,49.886 51.52,-51.52 51.807,51.807 104.12,-104.12 52.06,52.059 51.52,-51.52 53.948,53.949 h 88.475 v 10.248 h -92.79 l -49.903,-49.901 -51.79,51.79 -51.79,-51.79 -103.58,103.581 -51.79,-51.792 -51.52,51.522 -54.22,-54.22 H 17.893 l 0.54,-9.98 z"
+     id="path295" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     d="m 0,210.2616 h 21.04 v -19.421 H 0 Z m 606.244,0 h 21.04 v -19.421 h -21.04 z M 18.471,448.2426 h 25.715 v -73.378 H 18.471 Z m 341.277,-54.979 v -18.399 h 71.55 v 18.399 h -22.919 v 54.979 h -25.714 v -54.98 h -22.917 m 200.334,-18.398 h 53.58 v 15.494 h -27.867 v 13.34 h 26.145 v 15.495 h -26.145 v 29.049 h -25.712 v -73.378"
+     id="path297" />
+  <path
+     style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.908;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 366.286,52.2036 -29.062,29.06 29.062,29.062 29.06,-29.062 -29.06,-29.06 m -111.179,7.485 -29.061,29.06 29.06,29.062 29.062,-29.062 -29.061,-29.06 m -148.231,44.032 -29.061,29.06 29.061,29.063 29.061,-29.062 -29.061,-29.06 m 37.408,171.686 -29.061,29.06 29.061,29.063 29.061,-29.062 -29.06,-29.06 m 222.358,-14.971 -29.061,29.06 29.06,29.062 29.062,-29.062 -29.061,-29.06 m 155.211,-22.201 -29.061,29.06 29.061,29.062 29.061,-29.062 -29.061,-29.06 m -377.706,-171.283 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.531 m 52.217,-22.027 -14.53,14.53 14.53,14.531 14.53,-14.531 -14.53,-14.53 m 14.751,-44.252 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.531 m 74.192,29.501 -14.531,14.53 14.531,14.53 14.53,-14.53 -14.53,-14.53 m 118.444,-14.751 -14.531,14.53 14.53,14.531 14.532,-14.53 -14.531,-14.53 m 29.501,29.501 -14.53,14.53 14.53,14.531 14.53,-14.531 -14.53,-14.53 m 51.477,22.027 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.531 m -362.872,185.713 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.531 m 89.615,59.823 -14.531,14.53 14.531,14.53 14.53,-14.53 -14.53,-14.53 m 103.693,0 -14.53,14.53 14.53,14.53 14.53,-14.53 -14.53,-14.53 m 140.42,-37.302 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.53 m -36.726,37.301 -14.531,14.53 14.53,14.53 14.531,-14.53 -14.53,-14.53 m -140.94,-37.082 -29.06,29.06 29.06,29.063 29.062,-29.062 -29.062,-29.06 m 243.488,-171.688 -14.531,14.53 14.53,14.532 14.531,-14.531 -14.53,-14.53 m -28.713,-73.546 -14.531,14.53 14.53,14.53 14.531,-14.53 -14.53,-14.53"
+     id="path299" />
+</svg>
diff --git a/ietf/static/images/irtf-logo.svg b/ietf/static/images/irtf-logo.svg
index ad339fe2be..10b2a96816 100644
--- a/ietf/static/images/irtf-logo.svg
+++ b/ietf/static/images/irtf-logo.svg
@@ -1 +1,76 @@
-<svg width="765" height="990" style="display:inline" xmlns="http://www.w3.org/2000/svg"><g style="display:inline"><text xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;line-height:0%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black,';text-align:start;letter-spacing:0;word-spacing:0;writing-mode:lr-tb;text-anchor:start;fill:#fff;fill-opacity:1;stroke:#000;stroke-width:1.908;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" x="250.217" y="565.473" transform="translate(0 -62.362)"><tspan x="250.217" y="565.473" style="font-size:102.5px;line-height:1.25">R</tspan></text><path style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m134.869 273.355-44.033 44.031 44.033 44.034 44.032-44.034-44.032-44.03m519.185-.001-44.032 44.031 44.032 44.034 44.031-44.034-44.03-44.03m-311.778-.001-44.032 44.031 44.032 44.034 44.032-44.034-44.032-44.03m103.693-.001-44.032 44.031 44.032 44.034 44.032-44.034-44.032-44.03m103.693-.001-44.032 44.031 44.032 44.034 44.033-44.034-44.033-44.03M290.8 325.407l-44.032 44.032 44.032 44.032 44.032-44.032-44.032-44.032m-52.217-52.052-44.033 44.031 44.033 44.034 44.033-44.034-44.033-44.03m155.911 52.051-44.032 44.032 44.032 44.032 44.032-44.032-44.032-44.032m103.693 0-44.032 44.032 44.032 44.032 44.032-44.032-44.032-44.032M290.8 221.827l-44.032 44.03 44.032 44.034 44.032-44.033-44.032-44.031m103.694 0-44.032 44.03 44.032 44.034 44.032-44.033-44.032-44.031m103.693 0-44.032 44.03 44.032 44.034 44.032-44.033-44.032-44.031" transform="translate(0 -62.362)"/><path style="fill:#fccf34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M98.431 312.254h90.633l49.886 49.886 51.52-51.52 51.807 51.807 104.12-104.12 52.06 52.059 51.52-51.52 53.948 53.949H692.4v10.248h-92.79l-49.903-49.901-51.79 51.79-51.79-51.79-103.58 103.581-51.79-51.792-51.52 51.522-54.22-54.22H97.89l.54-9.98" transform="translate(0 -62.362)"/><path style="fill:none;stroke:#0c0a08;stroke-width:1.90799999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M98.431 312.254h90.633l49.886 49.886 51.52-51.52 51.807 51.807 104.12-104.12 52.06 52.059 51.52-51.52 53.948 53.949H692.4v10.248h-92.79l-49.903-49.901-51.79 51.79-51.79-51.79-103.58 103.581-51.79-51.792-51.52 51.522-54.22-54.22H97.89l.54-9.98z" transform="translate(0 -62.362)"/><path style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M79.997 327.492h21.04v-19.421h-21.04v19.421zm606.244 0h21.04v-19.421h-21.04v19.421zM98.468 565.473h25.715v-73.378H98.468v73.378zm341.277-54.979v-18.399h71.55v18.399h-22.919v54.979h-25.714v-54.98h-22.917m200.334-18.398h53.58v15.494h-27.867v13.34h26.145v15.495h-26.145v29.049H640.08v-73.378" transform="translate(0 -62.362)"/><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:1.90800011;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" d="m446.283 169.434-29.062 29.06 29.062 29.062 29.06-29.062-29.06-29.06m-111.179 7.485-29.061 29.06 29.06 29.062 29.062-29.062-29.061-29.06m-148.231 44.032-29.061 29.06 29.061 29.063 29.061-29.062-29.061-29.06m37.408 171.686-29.061 29.06 29.061 29.063 29.061-29.062-29.06-29.06m222.358-14.971-29.061 29.06 29.06 29.062 29.062-29.062-29.061-29.06m155.211-22.201-29.061 29.06 29.061 29.062 29.061-29.062-29.061-29.06M224.145 184.184l-14.531 14.53 14.53 14.531 14.531-14.53-14.53-14.531m52.217-22.027-14.53 14.53 14.53 14.531 14.53-14.531-14.53-14.53m14.751-44.252-14.531 14.53 14.53 14.531 14.531-14.53-14.53-14.531m74.192 29.501-14.531 14.53 14.531 14.53 14.53-14.53-14.53-14.53m118.444-14.751-14.531 14.53 14.53 14.531 14.532-14.53-14.531-14.53m29.501 29.501-14.53 14.53 14.53 14.531 14.53-14.531-14.53-14.53m51.477 22.027-14.531 14.53 14.53 14.531 14.531-14.53-14.53-14.531M201.855 369.897l-14.531 14.53 14.53 14.531 14.531-14.53-14.53-14.531m89.615 59.823-14.531 14.53 14.531 14.53L306 444.25l-14.53-14.53m103.693 0-14.53 14.53 14.53 14.53 14.53-14.53-14.53-14.53m140.42-37.302-14.531 14.53 14.53 14.531 14.531-14.53-14.53-14.53m-36.726 37.301-14.531 14.53 14.53 14.53 14.531-14.53-14.53-14.53m-140.94-37.082-29.06 29.06 29.06 29.063 29.062-29.062-29.062-29.06m243.488-171.688-14.531 14.53 14.53 14.532 14.531-14.531-14.53-14.53m-28.713-73.546-14.531 14.53 14.53 14.53 14.531-14.53-14.53-14.53" transform="translate(0 -62.362)"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="627.284"
+   height="449.19662"
+   style="display:inline"
+   version="1.1"
+   id="svg303"
+   sodipodi:docname="irtf-logo.svg"
+   inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs307" />
+  <sodipodi:namedview
+     id="namedview305"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.0373737"
+     inkscape:cx="303.65142"
+     inkscape:cy="447.76535"
+     inkscape:window-width="1797"
+     inkscape:window-height="1083"
+     inkscape:window-x="951"
+     inkscape:window-y="417"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg303" />
+  <g
+     style="display:inline"
+     id="g301"
+     transform="translate(-79.997,-54.868397)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;line-height:0%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black,';text-align:start;letter-spacing:0;word-spacing:0;writing-mode:lr-tb;text-anchor:start;fill:#fccf34;fill-opacity:1;stroke:#000000;stroke-width:1.908;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       x="250.217"
+       y="565.47302"
+       transform="translate(0,-62.362)"
+       id="text289"><tspan
+         x="250.217"
+         y="565.47302"
+         style="font-size:102.5px;line-height:1.25;fill:#fccf34;fill-opacity:1"
+         id="tspan287">R</tspan></text>
+    <path
+       style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 134.869,273.355 -44.033,44.031 44.033,44.034 44.032,-44.034 -44.032,-44.03 m 519.185,-10e-4 -44.032,44.031 44.032,44.034 44.031,-44.034 -44.03,-44.03 m -311.778,-10e-4 -44.032,44.031 44.032,44.034 44.032,-44.034 -44.032,-44.03 m 103.693,-10e-4 -44.032,44.031 44.032,44.034 44.032,-44.034 -44.032,-44.03 m 103.693,-10e-4 -44.032,44.031 44.032,44.034 44.033,-44.034 -44.033,-44.03 M 290.8,325.407 246.768,369.439 290.8,413.471 334.832,369.439 290.8,325.407 m -52.217,-52.052 -44.033,44.031 44.033,44.034 44.033,-44.034 -44.033,-44.03 m 155.911,52.051 -44.032,44.032 44.032,44.032 44.032,-44.032 -44.032,-44.032 m 103.693,0 -44.032,44.032 44.032,44.032 44.032,-44.032 -44.032,-44.032 M 290.8,221.827 246.768,265.857 290.8,309.891 334.832,265.858 290.8,221.827 m 103.694,0 -44.032,44.03 44.032,44.034 44.032,-44.033 -44.032,-44.031 m 103.693,0 -44.032,44.03 44.032,44.034 44.032,-44.033 -44.032,-44.031"
+       transform="translate(0,-62.362)"
+       id="path291" />
+    <path
+       style="fill:#fccf34;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 98.431,312.254 h 90.633 l 49.886,49.886 51.52,-51.52 51.807,51.807 104.12,-104.12 52.06,52.059 51.52,-51.52 53.948,53.949 H 692.4 v 10.248 h -92.79 l -49.903,-49.901 -51.79,51.79 -51.79,-51.79 -103.58,103.581 -51.79,-51.792 -51.52,51.522 -54.22,-54.22 H 97.89 l 0.54,-9.98"
+       transform="translate(0,-62.362)"
+       id="path293" />
+    <path
+       style="fill:none;stroke:#0c0a08;stroke-width:1.908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 98.431,312.254 h 90.633 l 49.886,49.886 51.52,-51.52 51.807,51.807 104.12,-104.12 52.06,52.059 51.52,-51.52 53.948,53.949 H 692.4 v 10.248 h -92.79 l -49.903,-49.901 -51.79,51.79 -51.79,-51.79 -103.58,103.581 -51.79,-51.792 -51.52,51.522 -54.22,-54.22 H 97.89 l 0.54,-9.98 z"
+       transform="translate(0,-62.362)"
+       id="path295" />
+    <path
+       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 79.997,327.492 h 21.04 v -19.421 h -21.04 z m 606.244,0 h 21.04 v -19.421 h -21.04 z M 98.468,565.473 h 25.715 V 492.095 H 98.468 Z m 341.277,-54.979 v -18.399 h 71.55 v 18.399 h -22.919 v 54.979 h -25.714 v -54.98 h -22.917 m 200.334,-18.398 h 53.58 v 15.494 h -27.867 v 13.34 h 26.145 v 15.495 h -26.145 v 29.049 H 640.08 v -73.378"
+       transform="translate(0,-62.362)"
+       id="path297" />
+    <path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.908;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 446.283,169.434 -29.062,29.06 29.062,29.062 29.06,-29.062 -29.06,-29.06 m -111.179,7.485 -29.061,29.06 29.06,29.062 29.062,-29.062 -29.061,-29.06 m -148.231,44.032 -29.061,29.06 29.061,29.063 29.061,-29.062 -29.061,-29.06 m 37.408,171.686 -29.061,29.06 29.061,29.063 29.061,-29.062 -29.06,-29.06 m 222.358,-14.971 -29.061,29.06 29.06,29.062 29.062,-29.062 -29.061,-29.06 m 155.211,-22.201 -29.061,29.06 29.061,29.062 29.061,-29.062 -29.061,-29.06 m -377.706,-171.283 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.531 m 52.217,-22.027 -14.53,14.53 14.53,14.531 14.53,-14.531 -14.53,-14.53 m 14.751,-44.252 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.531 m 74.192,29.501 -14.531,14.53 14.531,14.53 14.53,-14.53 -14.53,-14.53 m 118.444,-14.751 -14.531,14.53 14.53,14.531 14.532,-14.53 -14.531,-14.53 m 29.501,29.501 -14.53,14.53 14.53,14.531 14.53,-14.531 -14.53,-14.53 m 51.477,22.027 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.531 m -362.872,185.713 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.531 m 89.615,59.823 -14.531,14.53 14.531,14.53 14.53,-14.53 -14.53,-14.53 m 103.693,0 -14.53,14.53 14.53,14.53 14.53,-14.53 -14.53,-14.53 m 140.42,-37.302 -14.531,14.53 14.53,14.531 14.531,-14.53 -14.53,-14.53 m -36.726,37.301 -14.531,14.53 14.53,14.53 14.531,-14.53 -14.53,-14.53 m -140.94,-37.082 -29.06,29.06 29.06,29.063 29.062,-29.062 -29.062,-29.06 m 243.488,-171.688 -14.531,14.53 14.53,14.532 14.531,-14.531 -14.53,-14.53 m -28.713,-73.546 -14.531,14.53 14.53,14.53 14.531,-14.53 -14.53,-14.53"
+       transform="translate(0,-62.362)"
+       id="path299" />
+  </g>
+</svg>
diff --git a/ietf/static/js/add_session_recordings.js b/ietf/static/js/add_session_recordings.js
new file mode 100644
index 0000000000..c1c5932a48
--- /dev/null
+++ b/ietf/static/js/add_session_recordings.js
@@ -0,0 +1,30 @@
+// Copyright The IETF Trust 2024-2025, All Rights Reserved
+document.addEventListener('DOMContentLoaded', () => {
+    const form = document.getElementById('delete_recordings_form')
+    const dialog = document.getElementById('delete_confirm_dialog')
+    const dialog_link = document.getElementById('delete_confirm_link')
+    const dialog_submit = document.getElementById('delete_confirm_submit')
+    const dialog_cancel = document.getElementById('delete_confirm_cancel')
+
+    dialog.style.maxWidth = '30vw'
+
+    form.addEventListener('submit', (e) => {
+        e.preventDefault()
+        dialog_submit.value = e.submitter.value
+        const recording_link = e.submitter.closest('tr').querySelector('a')
+        dialog_link.setAttribute('href', recording_link.getAttribute('href'))
+        dialog_link.textContent = recording_link.textContent
+        dialog.showModal()
+    })
+
+    dialog_cancel.addEventListener('click', (e) => {
+        e.preventDefault()
+        dialog.close()
+    })
+
+    document.addEventListener('keydown', (e) => {
+        if (dialog.open && e.key === 'Escape') {
+            dialog.close()
+        }
+    })
+})
diff --git a/ietf/static/js/agenda_personalize.js b/ietf/static/js/agenda_personalize.js
deleted file mode 100644
index edb2787f3c..0000000000
--- a/ietf/static/js/agenda_personalize.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright The IETF Trust 2021, All Rights Reserved
-
-/**
- * Agenda personalization JS methods
- *
- * Requires agenda_timezone.js and timezone.js be included.
- */
-'use strict';
-
-/**
- * Update the checkbox state to match the filter parameters
- */
-function updateAgendaCheckboxes(filter_params) {
-    var selection_inputs = document.getElementsByName('selected-sessions');
-    selection_inputs.forEach((inp) => {
-        const item_keywords = inp.dataset.filterKeywords.toLowerCase()
-            .split(',');
-        if (
-            agenda_filter.keyword_match(item_keywords, filter_params.show) &&
-            !agenda_filter.keyword_match(item_keywords, filter_params.hide)
-        ) {
-            inp.checked = true;
-        } else {
-            inp.checked = false;
-        }
-    });
-}
-
-window.handleFilterParamUpdate = function (filter_params) {
-    updateAgendaCheckboxes(filter_params);
-};
-
-window.handleTableClick = function (event) {
-    if (event.target.name === 'selected-sessions') {
-        // hide the tooltip after clicking on a checkbox
-        const jqElt = jQuery(event.target);
-        if (jqElt.tooltip) {
-            jqElt.tooltip('hide');
-        }
-    }
-};
\ No newline at end of file
diff --git a/ietf/static/js/agenda_timezone.js b/ietf/static/js/agenda_timezone.js
deleted file mode 100644
index 187bea0e88..0000000000
--- a/ietf/static/js/agenda_timezone.js
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright The IETF Trust 2021, All Rights Reserved
-/*
- Timezone support specific to the agenda page
-
- To properly handle timezones other than local, needs a method to retrieve
- the current timezone. Set this by passing a method taking no parameters and
- returning the current timezone to the set_current_tz_cb() method.
- This should be done before calling anything else in the file.
- */
-(function() {
-    'use strict';
-
-    const local_timezone = moment.tz.guess();
-
-    // get_current_tz_cb must be overwritten using set_current_tz_cb
-    let get_current_tz_cb = function() {
-        throw new Error('Tried to get current timezone before callback registered. Use set_current_tz_cb().');
-    };
-
-    // Initialize moments
-    function initialize_moments() {
-        const times = $('.time');
-        $.each(times, function (i, item) {
-            item.start_ts = moment.unix(this.getAttribute("data-start-time"))
-                .utc();
-            item.end_ts = moment.unix(this.getAttribute("data-end-time"))
-                .utc();
-            if (this.hasAttribute("data-weekday")) {
-                item.format = 2;
-            } else {
-                item.format = 1;
-            }
-            if (this.hasAttribute("format")) {
-                item.format = +this.getAttribute("format");
-            }
-        });
-        const things_with_slots = $('[data-slot-start-ts]');
-        $.each(things_with_slots, function (i, item) {
-            item.slot_start_ts = moment.unix(this.getAttribute("data-slot-start-ts"))
-                .utc();
-            item.slot_end_ts = moment.unix(this.getAttribute("data-slot-end-ts"))
-                .utc();
-        });
-    }
-
-    function format_time(t, tz, fmt) {
-        let out;
-        const mtz = window.meeting_timezone || "UTC";
-        switch (fmt) {
-        case 0:
-            out = t.tz(tz)
-                .format('dddd, ') + '<span>' +
-                t.tz(tz)
-                    .format('MMMM Do YYYY, ') + '</span>' +
-                t.tz(tz)
-                    .format('HH:mm') + '<span>' +
-                t.tz(tz)
-                    .format(' Z z') + '</span>';
-            break;
-        case 1:
-            // Note, this code does not work if the meeting crosses the
-            // year boundary.
-            out = t.tz(tz)
-                .format("HH:mm");
-            if (+t.tz(tz)
-                .dayOfYear() < +t.tz(mtz)
-                .dayOfYear()) {
-                out = out + " (-1)";
-            } else if (+t.tz(tz)
-                .dayOfYear() > +t.tz(mtz)
-                .dayOfYear()) {
-                out = out + " (+1)";
-            }
-            break;
-        case 2:
-            out = t.tz(mtz)
-                .format("dddd, ")
-                .toUpperCase() +
-                t.tz(tz)
-                    .format("HH:mm");
-            if (+t.tz(tz)
-                .dayOfYear() < +t.tz(mtz)
-                .dayOfYear()) {
-                out = out + " (-1)";
-            } else if (+t.tz(tz)
-                .dayOfYear() > +t.tz(mtz)
-                .dayOfYear()) {
-                out = out + " (+1)";
-            }
-            break;
-        case 3:
-            out = t.utc()
-                .format("YYYY-MM-DD");
-            break;
-        case 4:
-            out = t.tz(tz)
-                .format("YYYY-MM-DD HH:mm");
-            break;
-        case 5:
-            out = t.tz(tz)
-                .format("HH:mm");
-            break;
-        }
-        return out;
-    }
-
-    // Format tooltip notice
-    function format_tooltip_notice(start, end) {
-        let notice = "";
-
-        if (end.isBefore()) {
-            notice = "Event ended " + end.fromNow();
-        } else if (start.isAfter()) {
-            notice = "Event will start " + start.fromNow();
-        } else {
-            notice = "Event started " + start.fromNow() + " and will end " +
-                end.fromNow();
-        }
-        return '<span class="tooltipnotice">' + notice + '</span>';
-    }
-
-    // Format tooltip table
-    function format_tooltip_table(start, end) {
-        const current_timezone = get_current_tz_cb();
-        let out = '<div class="text-start"><table class="table table-sm"><thead><tr><th scope="col"></th><th scope="col">Session start</th><th scope="col">Session end</th></tr></thead>';
-        if (window.meeting_timezone !== "") {
-            out += '<tr><th class="timehead">Meeting timezone</th><td>' +
-                format_time(start, window.meeting_timezone, 0) + '</td><td>' +
-                format_time(end, window.meeting_timezone, 0) + '</td></tr>';
-        }
-        out += '<tr><th class="timehead">Local timezone</th><td>' +
-            format_time(start, local_timezone, 0) + '</td><td>' +
-            format_time(end, local_timezone, 0) + '</td></tr>';
-        if (current_timezone !== 'UTC') {
-            out += '<tr><th class="timehead">Selected Timezone</th><td>' +
-                format_time(start, current_timezone, 0) + '</td><td>' +
-                format_time(end, current_timezone, 0) + '</td></tr>';
-        }
-        out += '<tr><th class="timehead">UTC</th><td>' +
-            format_time(start, 'UTC', 0) + '</td><td>' +
-            format_time(end, 'UTC', 0) + '</td></tr>';
-        out += '</table>' + format_tooltip_notice(start, end) + '</div>';
-        return out;
-    }
-
-    // Format tooltip for item
-    function format_tooltip(start, end) {
-        return '<div class="timetooltiptext">' +
-            format_tooltip_table(start, end) +
-            '</div>';
-    }
-
-    // Add tooltips
-    function add_tooltips() {
-        $('.time')
-            .each(function () {
-                const tooltip = $(format_tooltip(this.start_ts, this.end_ts));
-                tooltip[0].start_ts = this.start_ts;
-                tooltip[0].end_ts = this.end_ts;
-                tooltip[0].ustart_ts = moment(this.start_ts)
-                    .add(-2, 'hours');
-                tooltip[0].uend_ts = moment(this.end_ts)
-                    .add(2, 'hours');
-                $(this)
-                    .closest("th, td")
-                    .attr("data-bs-toggle", "popover")
-                    .attr("data-bs-content", $(tooltip)
-                        .html())
-                    .popover({
-                        html: true,
-                        sanitize: false,
-                        trigger: "hover"
-                    });
-            });
-    }
-
-    // Update times on the agenda based on the selected timezone
-    function update_times(newtz) {
-        $('.current-tz')
-            .html(newtz.replaceAll("_", " ").replaceAll("/", " / "));
-        $('.time')
-            .each(function () {
-                if (this.format === 4) {
-                    const tz = this.start_ts.tz(newtz).format(" z");
-                    const start_doy = this.start_ts.tz(newtz).dayOfYear();
-                    const end_doy = this.end_ts.tz(newtz).dayOfYear();
-                    if (start_doy === end_doy) {
-                        $(this)
-                            .html(format_time(this.start_ts, newtz, this.format) +
-                                '<span class="d-lg-none"><br></span>-' + format_time(this.end_ts, newtz, 5) + tz);
-                    } else {
-                        $(this)
-                            .html(format_time(this.start_ts, newtz, this.format) +
-                                '<span class="d-lg-none"><br></span>-' +
-                                format_time(this.end_ts, newtz, this.format) + tz);
-                    }
-                } else {
-                    $(this)
-                        .html(format_time(this.start_ts, newtz, this.format) + '<span class="d-lg-none"><br></span>-' +
-                            format_time(this.end_ts, newtz, this.format));
-                }
-            });
-        update_tooltips_all();
-        update_clock();
-    }
-
-    // Update hrefs in anchor tags with the "now-link" class. Mark the target with the "current-session" class.
-    function update_now_link(agenda_rows, ongoing_rows, later_rows) {
-        agenda_rows.removeClass('current-session');
-        const links_to_update = $('a.now-link');
-        if (ongoing_rows.length > 0) {
-            // sessions are ongoing - find those with the latest start time and mark the first of them as "now"
-            const last_start_time = ongoing_rows[ongoing_rows.length - 1].slot_start_ts;
-            for (let ii=0; ii < ongoing_rows.length; ii++) {
-                const dt = ongoing_rows[ii].slot_start_ts.diff(last_start_time, 'seconds');
-                if (Math.abs(dt) < 1) {
-                    $(ongoing_rows[ii]).addClass('current-session');
-                    links_to_update.attr('href', '#' + ongoing_rows[ii].id);
-                    break;
-                }
-            }
-        } else if (later_rows.length > 0) {
-            // There were no ongoing sessions, look for the next one to start and mark as current
-            $(later_rows[0]).addClass('current-session');
-            links_to_update.attr('href', '#' + later_rows[0].id);
-        } else {
-            // No sessions in the future - meeting has apparently ended
-            links_to_update.attr('href', '#');
-            links_to_update.addClass('disabled'); // mark link
-        }
-    }
-
-    function update_ongoing_sessions() {
-        const agenda_rows = $('[data-slot-start-ts]');
-        const now_moment = moment();
-        const ongoing_rows = agenda_rows.filter(function () {
-            return now_moment.isBetween(this.slot_start_ts, this.slot_end_ts);
-        });
-        const later_rows = agenda_rows.filter(function() { return now_moment.isBefore(this.slot_start_ts); });
-        // Highlight ongoing based on the current time
-        agenda_rows.removeClass("table-warning");
-        ongoing_rows.addClass("table-warning");
-        update_now_link(agenda_rows, ongoing_rows, later_rows); // update any "now-link" anchors
-    }
-
-    // Update tooltips
-    function update_tooltips() {
-        const tooltips = $('.timetooltiptext');
-        tooltips.filter(function () {
-            return moment()
-                .isBetween(this.ustart_ts, this.uend_ts);
-        })
-            .each(function () {
-                $(this)
-                    .html(format_tooltip_table(this.start_ts, this.end_ts));
-            });
-    }
-
-    // Update all tooltips
-    function update_tooltips_all() {
-        const tooltips = $('.timetooltiptext');
-        tooltips.each(function () {
-            $(this)
-                .html(format_tooltip_table(this.start_ts, this.end_ts));
-        });
-    }
-
-    // Update clock
-    function update_clock() {
-        $('span.current-time')
-            .html(format_time(moment(), get_current_tz_cb(), 0));
-    }
-
-    function urlParam(name) {
-        const results = new RegExp('[\?&]' + name + '=([^&#]*)')
-            .exec(window.location.href);
-        if (results === null) {
-            return null;
-        } else {
-            return results[1] || 0;
-        }
-    }
-
-    function init_timers(speedup) {
-        speedup = speedup || 1;
-        const fast_timer = 60000 / (speedup > 600 ? 600 : speedup);
-        update_clock();
-        update_ongoing_sessions();
-        setInterval(function () { update_clock(); }, fast_timer);
-        setInterval(function () { update_ongoing_sessions(); }, fast_timer);
-        setInterval(function () { update_tooltips(); }, fast_timer);
-        setInterval(function () { update_tooltips_all(); }, 3600000 / speedup);
-    }
-
-    /***** make public interface available on window *****/
-    window.initialize_moments = initialize_moments;
-    window.add_tooltips = add_tooltips;
-    window.update_times = update_times;
-    window.urlParam = urlParam;
-    window.init_timers = init_timers;
-
-    // set method used to find current time zone
-    window.set_current_tz_cb = function (fn) {
-        get_current_tz_cb = fn;
-    };
-})();
diff --git a/ietf/static/js/announcement.js b/ietf/static/js/announcement.js
new file mode 100644
index 0000000000..95465120fa
--- /dev/null
+++ b/ietf/static/js/announcement.js
@@ -0,0 +1,57 @@
+const announcementApp = (function() {
+    'use strict';
+    return {
+        // functions for Announcement
+        checkToField: function() {
+            document.documentElement.scrollTop = 0; // For most browsers
+            const toField = document.getElementById('id_to');
+            const toCustomInput = document.getElementById('id_to_custom');
+            const toCustomDiv = toCustomInput.closest('div.row');
+            
+            if (toField.value === 'Other...') {
+                toCustomDiv.style.display = 'flex'; // Show the custom field
+            } else {
+                toCustomDiv.style.display = 'none'; // Hide the custom field
+                toCustomInput.value = ''; // Optionally clear the input value if hidden
+            }
+        }
+    };
+})();
+
+// Extra care is required to ensure the back button 
+// works properly for the optional to_custom field.
+// Take the case when a user selects "Other..." for
+// "To" field. The "To custom" field appears and they
+// enter a new address there.
+// In Chrome, when the form is submitted and then the user
+// uses the back button (or browser back), the page loads
+// from bfcache then the javascript DOMContentLoaded event
+// handler is run, hiding the empty to_custom field, THEN the
+// browser autofills the form fields. Because to_submit
+// is now hidden it does not get a value. This is a very
+// bad experience for the user because the to_custom field
+// was unexpectedly cleared and hidden. If they notice this
+// they would need to know to first select another "To"
+// option, then select "Other..." again just to get the
+// to_custom field visible so they can re-enter the custom
+// address.
+// The solution is to use setTimeout to run checkToField
+// after a short delay, giving the browser time to autofill
+// the form fields before it checks to see if the to_custom
+// field is empty and hides it.
+
+document.addEventListener('DOMContentLoaded', function() {
+    // Run the visibility check after allowing cache to populate values
+    setTimeout(announcementApp.checkToField, 300);
+
+    const toField = document.getElementById('id_to');
+    toField.addEventListener('change', announcementApp.checkToField);
+});
+
+// Handle back/forward navigation with pageshow
+window.addEventListener('pageshow', function(event) {
+    if (event.persisted) {
+        // Then apply visibility logic after cache restoration
+        setTimeout(announcementApp.checkToField, 300);
+    }
+});
\ No newline at end of file
diff --git a/ietf/static/js/attendees-chart.js b/ietf/static/js/attendees-chart.js
new file mode 100644
index 0000000000..fed3b1289c
--- /dev/null
+++ b/ietf/static/js/attendees-chart.js
@@ -0,0 +1,58 @@
+(function () {
+    var raw = document.getElementById('attendees-chart-data');
+    if (!raw) return;
+    var chartData = JSON.parse(raw.textContent);
+    var chart = null;
+    var currentBreakdown = 'type';
+
+    // Override the global transparent background set by highcharts.js so the
+    // export menu and fullscreen view use the page background color.
+    var container = document.getElementById('attendees-pie-chart');
+    var bodyBg = getComputedStyle(document.body).backgroundColor;
+    container.style.setProperty('--highcharts-background-color', bodyBg);
+
+    function renderChart(breakdown) {
+        var seriesData = chartData[breakdown].map(function (item) {
+            return { name: item[0], y: item[1] };
+        });
+        if (chart) chart.destroy();
+        chart = Highcharts.chart(container, {
+            chart: { type: 'pie', height: 400 },
+            title: { text: null },
+            tooltip: { pointFormat: '{point.name}: <b>{point.y}</b> ({point.percentage:.1f}%)' },
+            plotOptions: {
+                pie: {
+                    dataLabels: {
+                        enabled: true,
+                        format: '<b>{point.name}</b><br>{point.y} ({point.percentage:.1f}%)',
+                    },
+                    showInLegend: false,
+                }
+            },
+            series: [{ name: 'Attendees', data: seriesData }],
+        });
+    }
+
+    var modal = document.getElementById('attendees-chart-modal');
+
+    // Render (or re-render) the chart each time the modal becomes fully visible,
+    // so Highcharts can measure the container dimensions correctly.
+    modal.addEventListener('shown.bs.modal', function () {
+        renderChart(currentBreakdown);
+    });
+
+    // Release the chart when the modal closes to avoid stale renders.
+    modal.addEventListener('hidden.bs.modal', function () {
+        if (chart) {
+            chart.destroy();
+            chart = null;
+        }
+    });
+
+    document.querySelectorAll('[name="attendees-breakdown"]').forEach(function (radio) {
+        radio.addEventListener('change', function () {
+            currentBreakdown = this.value;
+            renderChart(currentBreakdown);
+        });
+    });
+})();
diff --git a/ietf/static/js/complete-review.js b/ietf/static/js/complete-review.js
index a359dac237..3a58ba9700 100644
--- a/ietf/static/js/complete-review.js
+++ b/ietf/static/js/complete-review.js
@@ -24,6 +24,8 @@ $(document)
             .before(mailArchiveSearchTemplate);
 
         var mailArchiveSearch = form.find(".mail-archive-search");
+        const isReviewer = mailArchiveSearch.data('isReviewer');
+        const searchMailArchiveUrl = mailArchiveSearch.data('searchMailArchiveUrl');
 
         var retrievingData = null;
 
@@ -190,4 +192,4 @@ $(document)
             form.find("[name=review_submission][value=link]")
                 .trigger("click");
         }
-    });
\ No newline at end of file
+    });
diff --git a/ietf/static/js/custom_striped.js b/ietf/static/js/custom_striped.js
new file mode 100644
index 0000000000..480ad7cf82
--- /dev/null
+++ b/ietf/static/js/custom_striped.js
@@ -0,0 +1,16 @@
+// Copyright The IETF Trust 2025, All Rights Reserved
+
+document.addEventListener('DOMContentLoaded', () => {
+    // add stripes
+    const firstRow = document.querySelector('.custom-stripe .row')
+    if (firstRow) {
+        const parent = firstRow.parentElement;
+        const allRows = Array.from(parent.children).filter(child => child.classList.contains('row'))
+        allRows.forEach((row, index) => {
+            row.classList.remove('bg-light')
+            if (index % 2 === 1) {
+                row.classList.add('bg-light')
+            }
+        })
+    }
+})
diff --git a/ietf/static/js/datepicker.js b/ietf/static/js/datepicker.js
index a94f79fc11..43d80acb5f 100644
--- a/ietf/static/js/datepicker.js
+++ b/ietf/static/js/datepicker.js
@@ -1,2039 +1,54 @@
-/*!
- * Datepicker for Bootstrap v1.9.0 (https://github.com/uxsolutions/bootstrap-datepicker)
- *
- * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-(function(factory){
-    if (typeof define === 'function' && define.amd) {
-        define(['jquery'], factory);
-    } else if (typeof exports === 'object') {
-        factory(require('jquery'));
-    } else {
-        factory(jQuery);
-    }
-}(function($, undefined){
-	function UTCDate(){
-		return new Date(Date.UTC.apply(Date, arguments));
-	}
-	function UTCToday(){
-		var today = new Date();
-		return UTCDate(today.getFullYear(), today.getMonth(), today.getDate());
-	}
-	function isUTCEquals(date1, date2) {
-		return (
-			date1.getUTCFullYear() === date2.getUTCFullYear() &&
-			date1.getUTCMonth() === date2.getUTCMonth() &&
-			date1.getUTCDate() === date2.getUTCDate()
-		);
-	}
-	function alias(method, deprecationMsg){
-		return function(){
-			if (deprecationMsg !== undefined) {
-				$.fn.datepicker.deprecated(deprecationMsg);
-			}
-
-			return this[method].apply(this, arguments);
-		};
-	}
-	function isValidDate(d) {
-		return d && !isNaN(d.getTime());
-	}
-
-	var DateArray = (function(){
-		var extras = {
-			get: function(i){
-				return this.slice(i)[0];
-			},
-			contains: function(d){
-				// Array.indexOf is not cross-browser;
-				// $.inArray doesn't work with Dates
-				var val = d && d.valueOf();
-				for (var i=0, l=this.length; i < l; i++)
-          // Use date arithmetic to allow dates with different times to match
-          if (0 <= this[i].valueOf() - val && this[i].valueOf() - val < 1000*60*60*24)
-						return i;
-				return -1;
-			},
-			remove: function(i){
-				this.splice(i,1);
-			},
-			replace: function(new_array){
-				if (!new_array)
-					return;
-				if (!$.isArray(new_array))
-					new_array = [new_array];
-				this.clear();
-				this.push.apply(this, new_array);
-			},
-			clear: function(){
-				this.length = 0;
-			},
-			copy: function(){
-				var a = new DateArray();
-				a.replace(this);
-				return a;
-			}
-		};
-
-		return function(){
-			var a = [];
-			a.push.apply(a, arguments);
-			$.extend(a, extras);
-			return a;
-		};
-	})();
-
-
-	// Picker object
-
-	var Datepicker = function(element, options){
-		$.data(element, 'datepicker', this);
-
-		this._events = [];
-		this._secondaryEvents = [];
-
-		this._process_options(options);
-
-		this.dates = new DateArray();
-		this.viewDate = this.o.defaultViewDate;
-		this.focusDate = null;
-
-		this.element = $(element);
-		this.isInput = this.element.is('input');
-		this.inputField = this.isInput ? this.element : this.element.find('input');
-		this.component = this.element.hasClass('date') ? this.element.find('.add-on, .input-group-addon, .input-group-append, .input-group-prepend, .btn') : false;
-		if (this.component && this.component.length === 0)
-			this.component = false;
-		this.isInline = !this.component && this.element.is('div');
-
-		this.picker = $(DPGlobal.template);
-
-		// Checking templates and inserting
-		if (this._check_template(this.o.templates.leftArrow)) {
-			this.picker.find('.prev').html(this.o.templates.leftArrow);
-		}
-
-		if (this._check_template(this.o.templates.rightArrow)) {
-			this.picker.find('.next').html(this.o.templates.rightArrow);
-		}
-
-		this._buildEvents();
-		this._attachEvents();
-
-		if (this.isInline){
-			this.picker.addClass('datepicker-inline').appendTo(this.element);
-		}
-		else {
-			this.picker.addClass('datepicker-dropdown dropdown-menu');
-		}
-
-		if (this.o.rtl){
-			this.picker.addClass('datepicker-rtl');
-		}
-
-		if (this.o.calendarWeeks) {
-			this.picker.find('.datepicker-days .datepicker-switch, thead .datepicker-title, tfoot .today, tfoot .clear')
-				.attr('colspan', function(i, val){
-					return Number(val) + 1;
-				});
-		}
-
-		this._process_options({
-			startDate: this._o.startDate,
-			endDate: this._o.endDate,
-			daysOfWeekDisabled: this.o.daysOfWeekDisabled,
-			daysOfWeekHighlighted: this.o.daysOfWeekHighlighted,
-			datesDisabled: this.o.datesDisabled
-		});
-
-		this._allow_update = false;
-		this.setViewMode(this.o.startView);
-		this._allow_update = true;
-
-		this.fillDow();
-		this.fillMonths();
-
-		this.update();
-
-		if (this.isInline){
-			this.show();
-		}
-	};
-
-	Datepicker.prototype = {
-		constructor: Datepicker,
-
-		_resolveViewName: function(view){
-			$.each(DPGlobal.viewModes, function(i, viewMode){
-				if (view === i || $.inArray(view, viewMode.names) !== -1){
-					view = i;
-					return false;
-				}
-			});
-
-			return view;
-		},
-
-		_resolveDaysOfWeek: function(daysOfWeek){
-			if (!$.isArray(daysOfWeek))
-				daysOfWeek = daysOfWeek.split(/[,\s]*/);
-			return $.map(daysOfWeek, Number);
-		},
-
-		_check_template: function(tmp){
-			try {
-				// If empty
-				if (tmp === undefined || tmp === "") {
-					return false;
-				}
-				// If no html, everything ok
-				if ((tmp.match(/[<>]/g) || []).length <= 0) {
-					return true;
-				}
-				// Checking if html is fine
-				var jDom = $(tmp);
-				return jDom.length > 0;
-			}
-			catch (ex) {
-				return false;
-			}
-		},
-
-		_process_options: function(opts){
-			// Store raw options for reference
-			this._o = $.extend({}, this._o, opts);
-			// Processed options
-			var o = this.o = $.extend({}, this._o);
-
-			// Check if "de-DE" style date is available, if not language should
-			// fallback to 2 letter code eg "de"
-			var lang = o.language;
-			if (!dates[lang]){
-				lang = lang.split('-')[0];
-				if (!dates[lang])
-					lang = defaults.language;
-			}
-			o.language = lang;
-
-			// Retrieve view index from any aliases
-			o.startView = this._resolveViewName(o.startView);
-			o.minViewMode = this._resolveViewName(o.minViewMode);
-			o.maxViewMode = this._resolveViewName(o.maxViewMode);
-
-			// Check view is between min and max
-			o.startView = Math.max(this.o.minViewMode, Math.min(this.o.maxViewMode, o.startView));
-
-			// true, false, or Number > 0
-			if (o.multidate !== true){
-				o.multidate = Number(o.multidate) || false;
-				if (o.multidate !== false)
-					o.multidate = Math.max(0, o.multidate);
-			}
-			o.multidateSeparator = String(o.multidateSeparator);
-
-			o.weekStart %= 7;
-			o.weekEnd = (o.weekStart + 6) % 7;
-
-			var format = DPGlobal.parseFormat(o.format);
-			if (o.startDate !== -Infinity){
-				if (!!o.startDate){
-					if (o.startDate instanceof Date)
-						o.startDate = this._local_to_utc(this._zero_time(o.startDate));
-					else
-						o.startDate = DPGlobal.parseDate(o.startDate, format, o.language, o.assumeNearbyYear);
-				}
-				else {
-					o.startDate = -Infinity;
-				}
-			}
-			if (o.endDate !== Infinity){
-				if (!!o.endDate){
-					if (o.endDate instanceof Date)
-						o.endDate = this._local_to_utc(this._zero_time(o.endDate));
-					else
-						o.endDate = DPGlobal.parseDate(o.endDate, format, o.language, o.assumeNearbyYear);
-				}
-				else {
-					o.endDate = Infinity;
-				}
-			}
-
-			o.daysOfWeekDisabled = this._resolveDaysOfWeek(o.daysOfWeekDisabled||[]);
-			o.daysOfWeekHighlighted = this._resolveDaysOfWeek(o.daysOfWeekHighlighted||[]);
-
-			o.datesDisabled = o.datesDisabled||[];
-			if (!$.isArray(o.datesDisabled)) {
-				o.datesDisabled = o.datesDisabled.split(',');
-			}
-			o.datesDisabled = $.map(o.datesDisabled, function(d){
-				return DPGlobal.parseDate(d, format, o.language, o.assumeNearbyYear);
-			});
-
-			var plc = String(o.orientation).toLowerCase().split(/\s+/g),
-				_plc = o.orientation.toLowerCase();
-			plc = $.grep(plc, function(word){
-				return /^auto|left|right|top|bottom$/.test(word);
-			});
-			o.orientation = {x: 'auto', y: 'auto'};
-			if (!_plc || _plc === 'auto')
-				; // no action
-			else if (plc.length === 1){
-				switch (plc[0]){
-					case 'top':
-					case 'bottom':
-						o.orientation.y = plc[0];
-						break;
-					case 'left':
-					case 'right':
-						o.orientation.x = plc[0];
-						break;
-				}
-			}
-			else {
-				_plc = $.grep(plc, function(word){
-					return /^left|right$/.test(word);
-				});
-				o.orientation.x = _plc[0] || 'auto';
-
-				_plc = $.grep(plc, function(word){
-					return /^top|bottom$/.test(word);
-				});
-				o.orientation.y = _plc[0] || 'auto';
-			}
-			if (o.defaultViewDate instanceof Date || typeof o.defaultViewDate === 'string') {
-				o.defaultViewDate = DPGlobal.parseDate(o.defaultViewDate, format, o.language, o.assumeNearbyYear);
-			} else if (o.defaultViewDate) {
-				var year = o.defaultViewDate.year || new Date().getFullYear();
-				var month = o.defaultViewDate.month || 0;
-				var day = o.defaultViewDate.day || 1;
-				o.defaultViewDate = UTCDate(year, month, day);
-			} else {
-				o.defaultViewDate = UTCToday();
-			}
-		},
-		_applyEvents: function(evs){
-			for (var i=0, el, ch, ev; i < evs.length; i++){
-				el = evs[i][0];
-				if (evs[i].length === 2){
-					ch = undefined;
-					ev = evs[i][1];
-				} else if (evs[i].length === 3){
-					ch = evs[i][1];
-					ev = evs[i][2];
-				}
-				el.on(ev, ch);
-			}
-		},
-		_unapplyEvents: function(evs){
-			for (var i=0, el, ev, ch; i < evs.length; i++){
-				el = evs[i][0];
-				if (evs[i].length === 2){
-					ch = undefined;
-					ev = evs[i][1];
-				} else if (evs[i].length === 3){
-					ch = evs[i][1];
-					ev = evs[i][2];
-				}
-				el.off(ev, ch);
-			}
-		},
-		_buildEvents: function(){
-            var events = {
-                keyup: $.proxy(function(e){
-                    if ($.inArray(e.keyCode, [27, 37, 39, 38, 40, 32, 13, 9]) === -1)
-                        this.update();
-                }, this),
-                keydown: $.proxy(this.keydown, this),
-                paste: $.proxy(this.paste, this)
+import {
+    Datepicker
+} from 'vanillajs-datepicker';
+
+global.enable_datepicker = function (el) {
+    // we need to translate from bootstrap-datepicker options to
+    // vanillajs-datepicker options
+    const view_mode = {
+        day: 0,
+        days: 0,
+        month: 1,
+        months: 1,
+        year: 2,
+        years: 2,
+        decade: 3,
+        decades: 3
+    };
+
+    let options = {
+        buttonClass: "btn"
+    };
+    if (el.dataset.dateFormat) {
+        options = { ...options,
+            format: el.dataset.dateFormat
+        };
+        if (!el.dataset.dateFormat.includes("dd")) {
+            options = { ...options,
+                pickLevel: 1
             };
-
-            if (this.o.showOnFocus === true) {
-                events.focus = $.proxy(this.show, this);
-            }
-
-            if (this.isInput) { // single input
-                this._events = [
-                    [this.element, events]
-                ];
-            }
-            // component: input + button
-            else if (this.component && this.inputField.length) {
-                this._events = [
-                    // For components that are not readonly, allow keyboard nav
-                    [this.inputField, events],
-                    [this.component, {
-                        click: $.proxy(this.show, this)
-                    }]
-                ];
-            }
-			else {
-				this._events = [
-					[this.element, {
-						click: $.proxy(this.show, this),
-						keydown: $.proxy(this.keydown, this)
-					}]
-				];
-			}
-			this._events.push(
-				// Component: listen for blur on element descendants
-				[this.element, '*', {
-					blur: $.proxy(function(e){
-						this._focused_from = e.target;
-					}, this)
-				}],
-				// Input: listen for blur on element
-				[this.element, {
-					blur: $.proxy(function(e){
-						this._focused_from = e.target;
-					}, this)
-				}]
-			);
-
-			if (this.o.immediateUpdates) {
-				// Trigger input updates immediately on changed year/month
-				this._events.push([this.element, {
-					'changeYear changeMonth': $.proxy(function(e){
-						this.update(e.date);
-					}, this)
-				}]);
-			}
-
-			this._secondaryEvents = [
-				[this.picker, {
-					click: $.proxy(this.click, this)
-				}],
-				[this.picker, '.prev, .next', {
-					click: $.proxy(this.navArrowsClick, this)
-				}],
-				[this.picker, '.day:not(.disabled)', {
-					click: $.proxy(this.dayCellClick, this)
-				}],
-				[$(window), {
-					resize: $.proxy(this.place, this)
-				}],
-				[$(document), {
-					'mousedown touchstart': $.proxy(function(e){
-						// Clicked outside the datepicker, hide it
-						if (!(
-							this.element.is(e.target) ||
-							this.element.find(e.target).length ||
-							this.picker.is(e.target) ||
-							this.picker.find(e.target).length ||
-							this.isInline
-						)){
-							this.hide();
-						}
-					}, this)
-				}]
-			];
-		},
-		_attachEvents: function(){
-			this._detachEvents();
-			this._applyEvents(this._events);
-		},
-		_detachEvents: function(){
-			this._unapplyEvents(this._events);
-		},
-		_attachSecondaryEvents: function(){
-			this._detachSecondaryEvents();
-			this._applyEvents(this._secondaryEvents);
-		},
-		_detachSecondaryEvents: function(){
-			this._unapplyEvents(this._secondaryEvents);
-		},
-		_trigger: function(event, altdate){
-			var date = altdate || this.dates.get(-1),
-				local_date = this._utc_to_local(date);
-
-			this.element.trigger({
-				type: event,
-				date: local_date,
-				viewMode: this.viewMode,
-				dates: $.map(this.dates, this._utc_to_local),
-				format: $.proxy(function(ix, format){
-					if (arguments.length === 0){
-						ix = this.dates.length - 1;
-						format = this.o.format;
-					} else if (typeof ix === 'string'){
-						format = ix;
-						ix = this.dates.length - 1;
-					}
-					format = format || this.o.format;
-					var date = this.dates.get(ix);
-					return DPGlobal.formatDate(date, format, this.o.language);
-				}, this)
-			});
-		},
-
-		show: function(){
-			if (this.inputField.is(':disabled') || (this.inputField.prop('readonly') && this.o.enableOnReadonly === false))
-				return;
-			if (!this.isInline)
-				this.picker.appendTo(this.o.container);
-			this.place();
-			this.picker.show();
-			this._attachSecondaryEvents();
-			this._trigger('show');
-			if ((window.navigator.msMaxTouchPoints || 'ontouchstart' in document) && this.o.disableTouchKeyboard) {
-				$(this.element).blur();
-			}
-			return this;
-		},
-
-		hide: function(){
-			if (this.isInline || !this.picker.is(':visible'))
-				return this;
-			this.focusDate = null;
-			this.picker.hide().detach();
-			this._detachSecondaryEvents();
-			this.setViewMode(this.o.startView);
-
-			if (this.o.forceParse && this.inputField.val())
-				this.setValue();
-			this._trigger('hide');
-			return this;
-		},
-
-		destroy: function(){
-			this.hide();
-			this._detachEvents();
-			this._detachSecondaryEvents();
-			this.picker.remove();
-			delete this.element.data().datepicker;
-			if (!this.isInput){
-				delete this.element.data().date;
-			}
-			return this;
-		},
-
-		paste: function(e){
-			var dateString;
-			if (e.originalEvent.clipboardData && e.originalEvent.clipboardData.types
-				&& $.inArray('text/plain', e.originalEvent.clipboardData.types) !== -1) {
-				dateString = e.originalEvent.clipboardData.getData('text/plain');
-			} else if (window.clipboardData) {
-				dateString = window.clipboardData.getData('Text');
-			} else {
-				return;
-			}
-			this.setDate(dateString);
-			this.update();
-			e.preventDefault();
-		},
-
-		_utc_to_local: function(utc){
-			if (!utc) {
-				return utc;
-			}
-
-			var local = new Date(utc.getTime() + (utc.getTimezoneOffset() * 60000));
-
-			if (local.getTimezoneOffset() !== utc.getTimezoneOffset()) {
-				local = new Date(utc.getTime() + (local.getTimezoneOffset() * 60000));
-			}
-
-			return local;
-		},
-		_local_to_utc: function(local){
-			return local && new Date(local.getTime() - (local.getTimezoneOffset()*60000));
-		},
-		_zero_time: function(local){
-			return local && new Date(local.getFullYear(), local.getMonth(), local.getDate());
-		},
-		_zero_utc_time: function(utc){
-			return utc && UTCDate(utc.getUTCFullYear(), utc.getUTCMonth(), utc.getUTCDate());
-		},
-
-		getDates: function(){
-			return $.map(this.dates, this._utc_to_local);
-		},
-
-		getUTCDates: function(){
-			return $.map(this.dates, function(d){
-				return new Date(d);
-			});
-		},
-
-		getDate: function(){
-			return this._utc_to_local(this.getUTCDate());
-		},
-
-		getUTCDate: function(){
-			var selected_date = this.dates.get(-1);
-			if (selected_date !== undefined) {
-				return new Date(selected_date);
-			} else {
-				return null;
-			}
-		},
-
-		clearDates: function(){
-			this.inputField.val('');
-			this.update();
-			this._trigger('changeDate');
-
-			if (this.o.autoclose) {
-				this.hide();
-			}
-		},
-
-		setDates: function(){
-			var args = $.isArray(arguments[0]) ? arguments[0] : arguments;
-			this.update.apply(this, args);
-			this._trigger('changeDate');
-			this.setValue();
-			return this;
-		},
-
-		setUTCDates: function(){
-			var args = $.isArray(arguments[0]) ? arguments[0] : arguments;
-			this.setDates.apply(this, $.map(args, this._utc_to_local));
-			return this;
-		},
-
-		setDate: alias('setDates'),
-		setUTCDate: alias('setUTCDates'),
-		remove: alias('destroy', 'Method `remove` is deprecated and will be removed in version 2.0. Use `destroy` instead'),
-
-		setValue: function(){
-			var formatted = this.getFormattedDate();
-			this.inputField.val(formatted);
-			return this;
-		},
-
-		getFormattedDate: function(format){
-			if (format === undefined)
-				format = this.o.format;
-
-			var lang = this.o.language;
-			return $.map(this.dates, function(d){
-				return DPGlobal.formatDate(d, format, lang);
-			}).join(this.o.multidateSeparator);
-		},
-
-		getStartDate: function(){
-			return this.o.startDate;
-		},
-
-		setStartDate: function(startDate){
-			this._process_options({startDate: startDate});
-			this.update();
-			this.updateNavArrows();
-			return this;
-		},
-
-		getEndDate: function(){
-			return this.o.endDate;
-		},
-
-		setEndDate: function(endDate){
-			this._process_options({endDate: endDate});
-			this.update();
-			this.updateNavArrows();
-			return this;
-		},
-
-		setDaysOfWeekDisabled: function(daysOfWeekDisabled){
-			this._process_options({daysOfWeekDisabled: daysOfWeekDisabled});
-			this.update();
-			return this;
-		},
-
-		setDaysOfWeekHighlighted: function(daysOfWeekHighlighted){
-			this._process_options({daysOfWeekHighlighted: daysOfWeekHighlighted});
-			this.update();
-			return this;
-		},
-
-		setDatesDisabled: function(datesDisabled){
-			this._process_options({datesDisabled: datesDisabled});
-			this.update();
-			return this;
-		},
-
-		place: function(){
-			if (this.isInline)
-				return this;
-			var calendarWidth = this.picker.outerWidth(),
-				calendarHeight = this.picker.outerHeight(),
-				visualPadding = 10,
-				container = $(this.o.container),
-				windowWidth = container.width(),
-				scrollTop = this.o.container === 'body' ? $(document).scrollTop() : container.scrollTop(),
-				appendOffset = container.offset();
-
-			var parentsZindex = [0];
-			this.element.parents().each(function(){
-				var itemZIndex = $(this).css('z-index');
-				if (itemZIndex !== 'auto' && Number(itemZIndex) !== 0) parentsZindex.push(Number(itemZIndex));
-			});
-			var zIndex = Math.max.apply(Math, parentsZindex) + this.o.zIndexOffset;
-			var offset = this.component ? this.component.parent().offset() : this.element.offset();
-			var height = this.component ? this.component.outerHeight(true) : this.element.outerHeight(false);
-			var width = this.component ? this.component.outerWidth(true) : this.element.outerWidth(false);
-			var left = offset.left - appendOffset.left;
-			var top = offset.top - appendOffset.top;
-
-			if (this.o.container !== 'body') {
-				top += scrollTop;
-			}
-
-			this.picker.removeClass(
-				'datepicker-orient-top datepicker-orient-bottom '+
-				'datepicker-orient-right datepicker-orient-left'
-			);
-
-			if (this.o.orientation.x !== 'auto'){
-				this.picker.addClass('datepicker-orient-' + this.o.orientation.x);
-				if (this.o.orientation.x === 'right')
-					left -= calendarWidth - width;
-			}
-			// auto x orientation is best-placement: if it crosses a window
-			// edge, fudge it sideways
-			else {
-				if (offset.left < 0) {
-					// component is outside the window on the left side. Move it into visible range
-					this.picker.addClass('datepicker-orient-left');
-					left -= offset.left - visualPadding;
-				} else if (left + calendarWidth > windowWidth) {
-					// the calendar passes the widow right edge. Align it to component right side
-					this.picker.addClass('datepicker-orient-right');
-					left += width - calendarWidth;
-				} else {
-					if (this.o.rtl) {
-						// Default to right
-						this.picker.addClass('datepicker-orient-right');
-					} else {
-						// Default to left
-						this.picker.addClass('datepicker-orient-left');
-					}
-				}
-			}
-
-			// auto y orientation is best-situation: top or bottom, no fudging,
-			// decision based on which shows more of the calendar
-			var yorient = this.o.orientation.y,
-				top_overflow;
-			if (yorient === 'auto'){
-				top_overflow = -scrollTop + top - calendarHeight;
-				yorient = top_overflow < 0 ? 'bottom' : 'top';
-			}
-
-			this.picker.addClass('datepicker-orient-' + yorient);
-			if (yorient === 'top')
-				top -= calendarHeight + parseInt(this.picker.css('padding-top'));
-			else
-				top += height;
-
-			if (this.o.rtl) {
-				var right = windowWidth - (left + width);
-				this.picker.css({
-					top: top,
-					right: right,
-					zIndex: zIndex
-				});
-			} else {
-				this.picker.css({
-					top: top,
-					left: left,
-					zIndex: zIndex
-				});
-			}
-			return this;
-		},
-
-		_allow_update: true,
-		update: function(){
-			if (!this._allow_update)
-				return this;
-
-			var oldDates = this.dates.copy(),
-				dates = [],
-				fromArgs = false;
-			if (arguments.length){
-				$.each(arguments, $.proxy(function(i, date){
-					if (date instanceof Date)
-						date = this._local_to_utc(date);
-					dates.push(date);
-				}, this));
-				fromArgs = true;
-			} else {
-				dates = this.isInput
-						? this.element.val()
-						: this.element.data('date') || this.inputField.val();
-				if (dates && this.o.multidate)
-					dates = dates.split(this.o.multidateSeparator);
-				else
-					dates = [dates];
-				delete this.element.data().date;
-			}
-
-			dates = $.map(dates, $.proxy(function(date){
-				return DPGlobal.parseDate(date, this.o.format, this.o.language, this.o.assumeNearbyYear);
-			}, this));
-			dates = $.grep(dates, $.proxy(function(date){
-				return (
-					!this.dateWithinRange(date) ||
-					!date
-				);
-			}, this), true);
-			this.dates.replace(dates);
-
-			if (this.o.updateViewDate) {
-				if (this.dates.length)
-					this.viewDate = new Date(this.dates.get(-1));
-				else if (this.viewDate < this.o.startDate)
-					this.viewDate = new Date(this.o.startDate);
-				else if (this.viewDate > this.o.endDate)
-					this.viewDate = new Date(this.o.endDate);
-				else
-					this.viewDate = this.o.defaultViewDate;
-			}
-
-			if (fromArgs){
-				// setting date by clicking
-				this.setValue();
-				this.element.change();
-			}
-			else if (this.dates.length){
-				// setting date by typing
-				if (String(oldDates) !== String(this.dates) && fromArgs) {
-					this._trigger('changeDate');
-					this.element.change();
-				}
-			}
-			if (!this.dates.length && oldDates.length) {
-				this._trigger('clearDate');
-				this.element.change();
-			}
-
-			this.fill();
-			return this;
-		},
-
-		fillDow: function(){
-      if (this.o.showWeekDays) {
-			var dowCnt = this.o.weekStart,
-				html = '<tr>';
-			if (this.o.calendarWeeks){
-				html += '<th class="cw">&#160;</th>';
-			}
-			while (dowCnt < this.o.weekStart + 7){
-				html += '<th class="dow';
-        if ($.inArray(dowCnt, this.o.daysOfWeekDisabled) !== -1)
-          html += ' disabled';
-        html += '">'+dates[this.o.language].daysMin[(dowCnt++)%7]+'</th>';
-			}
-			html += '</tr>';
-			this.picker.find('.datepicker-days thead').append(html);
-      }
-		},
-
-		fillMonths: function(){
-      var localDate = this._utc_to_local(this.viewDate);
-			var html = '';
-			var focused;
-			for (var i = 0; i < 12; i++){
-				focused = localDate && localDate.getMonth() === i ? ' focused' : '';
-				html += '<span class="month' + focused + '">' + dates[this.o.language].monthsShort[i] + '</span>';
-			}
-			this.picker.find('.datepicker-months td').html(html);
-		},
-
-		setRange: function(range){
-			if (!range || !range.length)
-				delete this.range;
-			else
-				this.range = $.map(range, function(d){
-					return d.valueOf();
-				});
-			this.fill();
-		},
-
-		getClassNames: function(date){
-			var cls = [],
-				year = this.viewDate.getUTCFullYear(),
-				month = this.viewDate.getUTCMonth(),
-				today = UTCToday();
-			if (date.getUTCFullYear() < year || (date.getUTCFullYear() === year && date.getUTCMonth() < month)){
-				cls.push('old');
-			} else if (date.getUTCFullYear() > year || (date.getUTCFullYear() === year && date.getUTCMonth() > month)){
-				cls.push('new');
-			}
-			if (this.focusDate && date.valueOf() === this.focusDate.valueOf())
-				cls.push('focused');
-			// Compare internal UTC date with UTC today, not local today
-			if (this.o.todayHighlight && isUTCEquals(date, today)) {
-				cls.push('today');
-			}
-			if (this.dates.contains(date) !== -1)
-				cls.push('active');
-			if (!this.dateWithinRange(date)){
-				cls.push('disabled');
-			}
-			if (this.dateIsDisabled(date)){
-				cls.push('disabled', 'disabled-date');
-			}
-			if ($.inArray(date.getUTCDay(), this.o.daysOfWeekHighlighted) !== -1){
-				cls.push('highlighted');
-			}
-
-			if (this.range){
-				if (date > this.range[0] && date < this.range[this.range.length-1]){
-					cls.push('range');
-				}
-				if ($.inArray(date.valueOf(), this.range) !== -1){
-					cls.push('selected');
-				}
-				if (date.valueOf() === this.range[0]){
-          cls.push('range-start');
-        }
-        if (date.valueOf() === this.range[this.range.length-1]){
-          cls.push('range-end');
         }
-			}
-			return cls;
-		},
-
-		_fill_yearsView: function(selector, cssClass, factor, year, startYear, endYear, beforeFn){
-			var html = '';
-			var step = factor / 10;
-			var view = this.picker.find(selector);
-			var startVal = Math.floor(year / factor) * factor;
-			var endVal = startVal + step * 9;
-			var focusedVal = Math.floor(this.viewDate.getFullYear() / step) * step;
-			var selected = $.map(this.dates, function(d){
-				return Math.floor(d.getUTCFullYear() / step) * step;
-			});
-
-			var classes, tooltip, before;
-			for (var currVal = startVal - step; currVal <= endVal + step; currVal += step) {
-				classes = [cssClass];
-				tooltip = null;
-
-				if (currVal === startVal - step) {
-					classes.push('old');
-				} else if (currVal === endVal + step) {
-					classes.push('new');
-				}
-				if ($.inArray(currVal, selected) !== -1) {
-					classes.push('active');
-				}
-				if (currVal < startYear || currVal > endYear) {
-					classes.push('disabled');
-				}
-				if (currVal === focusedVal) {
-				  classes.push('focused');
-        }
-
-				if (beforeFn !== $.noop) {
-					before = beforeFn(new Date(currVal, 0, 1));
-					if (before === undefined) {
-						before = {};
-					} else if (typeof before === 'boolean') {
-						before = {enabled: before};
-					} else if (typeof before === 'string') {
-						before = {classes: before};
-					}
-					if (before.enabled === false) {
-						classes.push('disabled');
-					}
-					if (before.classes) {
-						classes = classes.concat(before.classes.split(/\s+/));
-					}
-					if (before.tooltip) {
-						tooltip = before.tooltip;
-					}
-				}
-
-				html += '<span class="' + classes.join(' ') + '"' + (tooltip ? ' title="' + tooltip + '"' : '') + '>' + currVal + '</span>';
-			}
-
-			view.find('.datepicker-switch').text(startVal + '-' + endVal);
-			view.find('td').html(html);
-		},
-
-		fill: function(){
-			var d = new Date(this.viewDate),
-				year = d.getUTCFullYear(),
-				month = d.getUTCMonth(),
-				startYear = this.o.startDate !== -Infinity ? this.o.startDate.getUTCFullYear() : -Infinity,
-				startMonth = this.o.startDate !== -Infinity ? this.o.startDate.getUTCMonth() : -Infinity,
-				endYear = this.o.endDate !== Infinity ? this.o.endDate.getUTCFullYear() : Infinity,
-				endMonth = this.o.endDate !== Infinity ? this.o.endDate.getUTCMonth() : Infinity,
-				todaytxt = dates[this.o.language].today || dates['en'].today || '',
-				cleartxt = dates[this.o.language].clear || dates['en'].clear || '',
-        titleFormat = dates[this.o.language].titleFormat || dates['en'].titleFormat,
-        todayDate = UTCToday(),
-        titleBtnVisible = (this.o.todayBtn === true || this.o.todayBtn === 'linked') && todayDate >= this.o.startDate && todayDate <= this.o.endDate && !this.weekOfDateIsDisabled(todayDate),
-				tooltip,
-				before;
-			if (isNaN(year) || isNaN(month))
-				return;
-			this.picker.find('.datepicker-days .datepicker-switch')
-						.text(DPGlobal.formatDate(d, titleFormat, this.o.language));
-			this.picker.find('tfoot .today')
-						.text(todaytxt)
-            .css('display', titleBtnVisible ? 'table-cell' : 'none');
-			this.picker.find('tfoot .clear')
-						.text(cleartxt)
-						.css('display', this.o.clearBtn === true ? 'table-cell' : 'none');
-			this.picker.find('thead .datepicker-title')
-						.text(this.o.title)
-						.css('display', typeof this.o.title === 'string' && this.o.title !== '' ? 'table-cell' : 'none');
-			this.updateNavArrows();
-			this.fillMonths();
-			var prevMonth = UTCDate(year, month, 0),
-				day = prevMonth.getUTCDate();
-			prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.o.weekStart + 7)%7);
-			var nextMonth = new Date(prevMonth);
-			if (prevMonth.getUTCFullYear() < 100){
-        nextMonth.setUTCFullYear(prevMonth.getUTCFullYear());
-      }
-			nextMonth.setUTCDate(nextMonth.getUTCDate() + 42);
-			nextMonth = nextMonth.valueOf();
-			var html = [];
-			var weekDay, clsName;
-			while (prevMonth.valueOf() < nextMonth){
-				weekDay = prevMonth.getUTCDay();
-				if (weekDay === this.o.weekStart){
-					html.push('<tr>');
-					if (this.o.calendarWeeks){
-						// ISO 8601: First week contains first thursday.
-						// ISO also states week starts on Monday, but we can be more abstract here.
-						var
-							// Start of current week: based on weekstart/current date
-							ws = new Date(+prevMonth + (this.o.weekStart - weekDay - 7) % 7 * 864e5),
-							// Thursday of this week
-							th = new Date(Number(ws) + (7 + 4 - ws.getUTCDay()) % 7 * 864e5),
-							// First Thursday of year, year from thursday
-							yth = new Date(Number(yth = UTCDate(th.getUTCFullYear(), 0, 1)) + (7 + 4 - yth.getUTCDay()) % 7 * 864e5),
-							// Calendar week: ms between thursdays, div ms per day, div 7 days
-							calWeek = (th - yth) / 864e5 / 7 + 1;
-						html.push('<td class="cw">'+ calWeek +'</td>');
-					}
-				}
-				clsName = this.getClassNames(prevMonth);
-				clsName.push('day');
-
-				var content = prevMonth.getUTCDate();
-
-				if (this.o.beforeShowDay !== $.noop){
-					before = this.o.beforeShowDay(this._utc_to_local(prevMonth));
-					if (before === undefined)
-						before = {};
-					else if (typeof before === 'boolean')
-						before = {enabled: before};
-					else if (typeof before === 'string')
-						before = {classes: before};
-					if (before.enabled === false)
-						clsName.push('disabled');
-					if (before.classes)
-						clsName = clsName.concat(before.classes.split(/\s+/));
-					if (before.tooltip)
-						tooltip = before.tooltip;
-					if (before.content)
-						content = before.content;
-				}
-
-				//Check if uniqueSort exists (supported by jquery >=1.12 and >=2.2)
-				//Fallback to unique function for older jquery versions
-				if ($.isFunction($.uniqueSort)) {
-					clsName = $.uniqueSort(clsName);
-				} else {
-					clsName = $.unique(clsName);
-				}
-
-				html.push('<td class="'+clsName.join(' ')+'"' + (tooltip ? ' title="'+tooltip+'"' : '') + ' data-date="' + prevMonth.getTime().toString() + '">' + content + '</td>');
-				tooltip = null;
-				if (weekDay === this.o.weekEnd){
-					html.push('</tr>');
-				}
-				prevMonth.setUTCDate(prevMonth.getUTCDate() + 1);
-			}
-			this.picker.find('.datepicker-days tbody').html(html.join(''));
-
-			var monthsTitle = dates[this.o.language].monthsTitle || dates['en'].monthsTitle || 'Months';
-			var months = this.picker.find('.datepicker-months')
-						.find('.datepicker-switch')
-							.text(this.o.maxViewMode < 2 ? monthsTitle : year)
-							.end()
-						.find('tbody span').removeClass('active');
-
-			$.each(this.dates, function(i, d){
-				if (d.getUTCFullYear() === year)
-					months.eq(d.getUTCMonth()).addClass('active');
-			});
-
-			if (year < startYear || year > endYear){
-				months.addClass('disabled');
-			}
-			if (year === startYear){
-				months.slice(0, startMonth).addClass('disabled');
-			}
-			if (year === endYear){
-				months.slice(endMonth+1).addClass('disabled');
-			}
-
-			if (this.o.beforeShowMonth !== $.noop){
-				var that = this;
-				$.each(months, function(i, month){
-          var moDate = new Date(year, i, 1);
-          var before = that.o.beforeShowMonth(moDate);
-					if (before === undefined)
-						before = {};
-					else if (typeof before === 'boolean')
-						before = {enabled: before};
-					else if (typeof before === 'string')
-						before = {classes: before};
-					if (before.enabled === false && !$(month).hasClass('disabled'))
-					    $(month).addClass('disabled');
-					if (before.classes)
-					    $(month).addClass(before.classes);
-					if (before.tooltip)
-					    $(month).prop('title', before.tooltip);
-				});
-			}
-
-			// Generating decade/years picker
-			this._fill_yearsView(
-				'.datepicker-years',
-				'year',
-				10,
-				year,
-				startYear,
-				endYear,
-				this.o.beforeShowYear
-			);
-
-			// Generating century/decades picker
-			this._fill_yearsView(
-				'.datepicker-decades',
-				'decade',
-				100,
-				year,
-				startYear,
-				endYear,
-				this.o.beforeShowDecade
-			);
-
-			// Generating millennium/centuries picker
-			this._fill_yearsView(
-				'.datepicker-centuries',
-				'century',
-				1000,
-				year,
-				startYear,
-				endYear,
-				this.o.beforeShowCentury
-			);
-		},
-
-		updateNavArrows: function(){
-			if (!this._allow_update)
-				return;
-
-			var d = new Date(this.viewDate),
-				year = d.getUTCFullYear(),
-				month = d.getUTCMonth(),
-				startYear = this.o.startDate !== -Infinity ? this.o.startDate.getUTCFullYear() : -Infinity,
-				startMonth = this.o.startDate !== -Infinity ? this.o.startDate.getUTCMonth() : -Infinity,
-				endYear = this.o.endDate !== Infinity ? this.o.endDate.getUTCFullYear() : Infinity,
-				endMonth = this.o.endDate !== Infinity ? this.o.endDate.getUTCMonth() : Infinity,
-				prevIsDisabled,
-				nextIsDisabled,
-				factor = 1;
-			switch (this.viewMode){
-				case 4:
-					factor *= 10;
-					/* falls through */
-				case 3:
-					factor *= 10;
-					/* falls through */
-				case 2:
-					factor *= 10;
-					/* falls through */
-				case 1:
-					prevIsDisabled = Math.floor(year / factor) * factor <= startYear;
-					nextIsDisabled = Math.floor(year / factor) * factor + factor > endYear;
-					break;
-				case 0:
-					prevIsDisabled = year <= startYear && month <= startMonth;
-					nextIsDisabled = year >= endYear && month >= endMonth;
-					break;
-			}
-
-			this.picker.find('.prev').toggleClass('disabled', prevIsDisabled);
-			this.picker.find('.next').toggleClass('disabled', nextIsDisabled);
-		},
-
-		click: function(e){
-			e.preventDefault();
-			e.stopPropagation();
-
-			var target, dir, day, year, month;
-			target = $(e.target);
-
-			// Clicked on the switch
-			if (target.hasClass('datepicker-switch') && this.viewMode !== this.o.maxViewMode){
-				this.setViewMode(this.viewMode + 1);
-			}
-
-			// Clicked on today button
-			if (target.hasClass('today') && !target.hasClass('day')){
-				this.setViewMode(0);
-				this._setDate(UTCToday(), this.o.todayBtn === 'linked' ? null : 'view');
-			}
-
-			// Clicked on clear button
-			if (target.hasClass('clear')){
-				this.clearDates();
-			}
-
-			if (!target.hasClass('disabled')){
-				// Clicked on a month, year, decade, century
-				if (target.hasClass('month')
-						|| target.hasClass('year')
-						|| target.hasClass('decade')
-						|| target.hasClass('century')) {
-					this.viewDate.setUTCDate(1);
-
-					day = 1;
-					if (this.viewMode === 1){
-						month = target.parent().find('span').index(target);
-						year = this.viewDate.getUTCFullYear();
-						this.viewDate.setUTCMonth(month);
-					} else {
-						month = 0;
-						year = Number(target.text());
-						this.viewDate.setUTCFullYear(year);
-					}
-
-					this._trigger(DPGlobal.viewModes[this.viewMode - 1].e, this.viewDate);
-
-					if (this.viewMode === this.o.minViewMode){
-						this._setDate(UTCDate(year, month, day));
-					} else {
-						this.setViewMode(this.viewMode - 1);
-						this.fill();
-					}
-				}
-			}
-
-			if (this.picker.is(':visible') && this._focused_from){
-				this._focused_from.focus();
-			}
-			delete this._focused_from;
-		},
-
-		dayCellClick: function(e){
-			var $target = $(e.currentTarget);
-			var timestamp = $target.data('date');
-			var date = new Date(timestamp);
-
-			if (this.o.updateViewDate) {
-				if (date.getUTCFullYear() !== this.viewDate.getUTCFullYear()) {
-					this._trigger('changeYear', this.viewDate);
-				}
-
-				if (date.getUTCMonth() !== this.viewDate.getUTCMonth()) {
-					this._trigger('changeMonth', this.viewDate);
-				}
-			}
-			this._setDate(date);
-		},
-
-		// Clicked on prev or next
-		navArrowsClick: function(e){
-			var $target = $(e.currentTarget);
-			var dir = $target.hasClass('prev') ? -1 : 1;
-			if (this.viewMode !== 0){
-				dir *= DPGlobal.viewModes[this.viewMode].navStep * 12;
-			}
-			this.viewDate = this.moveMonth(this.viewDate, dir);
-			this._trigger(DPGlobal.viewModes[this.viewMode].e, this.viewDate);
-			this.fill();
-		},
-
-		_toggle_multidate: function(date){
-			var ix = this.dates.contains(date);
-			if (!date){
-				this.dates.clear();
-			}
-
-			if (ix !== -1){
-				if (this.o.multidate === true || this.o.multidate > 1 || this.o.toggleActive){
-					this.dates.remove(ix);
-				}
-			} else if (this.o.multidate === false) {
-				this.dates.clear();
-				this.dates.push(date);
-			}
-			else {
-				this.dates.push(date);
-			}
-
-			if (typeof this.o.multidate === 'number')
-				while (this.dates.length > this.o.multidate)
-					this.dates.remove(0);
-		},
-
-		_setDate: function(date, which){
-			if (!which || which === 'date')
-				this._toggle_multidate(date && new Date(date));
-			if ((!which && this.o.updateViewDate) || which === 'view')
-				this.viewDate = date && new Date(date);
-
-			this.fill();
-			this.setValue();
-			if (!which || which !== 'view') {
-				this._trigger('changeDate');
-			}
-			this.inputField.trigger('change');
-			if (this.o.autoclose && (!which || which === 'date')){
-				this.hide();
-			}
-		},
-
-		moveDay: function(date, dir){
-			var newDate = new Date(date);
-			newDate.setUTCDate(date.getUTCDate() + dir);
-
-			return newDate;
-		},
-
-		moveWeek: function(date, dir){
-			return this.moveDay(date, dir * 7);
-		},
-
-		moveMonth: function(date, dir){
-			if (!isValidDate(date))
-				return this.o.defaultViewDate;
-			if (!dir)
-				return date;
-			var new_date = new Date(date.valueOf()),
-				day = new_date.getUTCDate(),
-				month = new_date.getUTCMonth(),
-				mag = Math.abs(dir),
-				new_month, test;
-			dir = dir > 0 ? 1 : -1;
-			if (mag === 1){
-				test = dir === -1
-					// If going back one month, make sure month is not current month
-					// (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02)
-					? function(){
-						return new_date.getUTCMonth() === month;
-					}
-					// If going forward one month, make sure month is as expected
-					// (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02)
-					: function(){
-						return new_date.getUTCMonth() !== new_month;
-					};
-				new_month = month + dir;
-				new_date.setUTCMonth(new_month);
-				// Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11
-				new_month = (new_month + 12) % 12;
-			}
-			else {
-				// For magnitudes >1, move one month at a time...
-				for (var i=0; i < mag; i++)
-					// ...which might decrease the day (eg, Jan 31 to Feb 28, etc)...
-					new_date = this.moveMonth(new_date, dir);
-				// ...then reset the day, keeping it in the new month
-				new_month = new_date.getUTCMonth();
-				new_date.setUTCDate(day);
-				test = function(){
-					return new_month !== new_date.getUTCMonth();
-				};
-			}
-			// Common date-resetting loop -- if date is beyond end of month, make it
-			// end of month
-			while (test()){
-				new_date.setUTCDate(--day);
-				new_date.setUTCMonth(new_month);
-			}
-			return new_date;
-		},
-
-		moveYear: function(date, dir){
-			return this.moveMonth(date, dir*12);
-		},
-
-		moveAvailableDate: function(date, dir, fn){
-			do {
-				date = this[fn](date, dir);
-
-				if (!this.dateWithinRange(date))
-					return false;
-
-				fn = 'moveDay';
-			}
-			while (this.dateIsDisabled(date));
-
-			return date;
-		},
-
-		weekOfDateIsDisabled: function(date){
-			return $.inArray(date.getUTCDay(), this.o.daysOfWeekDisabled) !== -1;
-		},
-
-		dateIsDisabled: function(date){
-			return (
-				this.weekOfDateIsDisabled(date) ||
-				$.grep(this.o.datesDisabled, function(d){
-					return isUTCEquals(date, d);
-				}).length > 0
-			);
-		},
-
-		dateWithinRange: function(date){
-			return date >= this.o.startDate && date <= this.o.endDate;
-		},
-
-		keydown: function(e){
-			if (!this.picker.is(':visible')){
-				if (e.keyCode === 40 || e.keyCode === 27) { // allow down to re-show picker
-					this.show();
-					e.stopPropagation();
-        }
-				return;
-			}
-			var dateChanged = false,
-				dir, newViewDate,
-				focusDate = this.focusDate || this.viewDate;
-			switch (e.keyCode){
-				case 27: // escape
-					if (this.focusDate){
-						this.focusDate = null;
-						this.viewDate = this.dates.get(-1) || this.viewDate;
-						this.fill();
-					}
-					else
-						this.hide();
-					e.preventDefault();
-					e.stopPropagation();
-					break;
-				case 37: // left
-				case 38: // up
-				case 39: // right
-				case 40: // down
-					if (!this.o.keyboardNavigation || this.o.daysOfWeekDisabled.length === 7)
-						break;
-					dir = e.keyCode === 37 || e.keyCode === 38 ? -1 : 1;
-          if (this.viewMode === 0) {
-  					if (e.ctrlKey){
-  						newViewDate = this.moveAvailableDate(focusDate, dir, 'moveYear');
-
-  						if (newViewDate)
-  							this._trigger('changeYear', this.viewDate);
-  					} else if (e.shiftKey){
-  						newViewDate = this.moveAvailableDate(focusDate, dir, 'moveMonth');
-
-  						if (newViewDate)
-  							this._trigger('changeMonth', this.viewDate);
-  					} else if (e.keyCode === 37 || e.keyCode === 39){
-  						newViewDate = this.moveAvailableDate(focusDate, dir, 'moveDay');
-  					} else if (!this.weekOfDateIsDisabled(focusDate)){
-  						newViewDate = this.moveAvailableDate(focusDate, dir, 'moveWeek');
-  					}
-          } else if (this.viewMode === 1) {
-            if (e.keyCode === 38 || e.keyCode === 40) {
-              dir = dir * 4;
-            }
-            newViewDate = this.moveAvailableDate(focusDate, dir, 'moveMonth');
-          } else if (this.viewMode === 2) {
-            if (e.keyCode === 38 || e.keyCode === 40) {
-              dir = dir * 4;
-            }
-            newViewDate = this.moveAvailableDate(focusDate, dir, 'moveYear');
-          }
-					if (newViewDate){
-						this.focusDate = this.viewDate = newViewDate;
-						this.setValue();
-						this.fill();
-						e.preventDefault();
-					}
-					break;
-				case 13: // enter
-					if (!this.o.forceParse)
-						break;
-					focusDate = this.focusDate || this.dates.get(-1) || this.viewDate;
-					if (this.o.keyboardNavigation) {
-						this._toggle_multidate(focusDate);
-						dateChanged = true;
-					}
-					this.focusDate = null;
-					this.viewDate = this.dates.get(-1) || this.viewDate;
-					this.setValue();
-					this.fill();
-					if (this.picker.is(':visible')){
-						e.preventDefault();
-						e.stopPropagation();
-						if (this.o.autoclose)
-							this.hide();
-					}
-					break;
-				case 9: // tab
-					this.focusDate = null;
-					this.viewDate = this.dates.get(-1) || this.viewDate;
-					this.fill();
-					this.hide();
-					break;
-			}
-			if (dateChanged){
-				if (this.dates.length)
-					this._trigger('changeDate');
-				else
-					this._trigger('clearDate');
-				this.inputField.trigger('change');
-			}
-		},
-
-		setViewMode: function(viewMode){
-			this.viewMode = viewMode;
-			this.picker
-				.children('div')
-				.hide()
-				.filter('.datepicker-' + DPGlobal.viewModes[this.viewMode].clsName)
-					.show();
-			this.updateNavArrows();
-      this._trigger('changeViewMode', new Date(this.viewDate));
-		}
-	};
-
-	var DateRangePicker = function(element, options){
-		$.data(element, 'datepicker', this);
-		this.element = $(element);
-		this.inputs = $.map(options.inputs, function(i){
-			return i.jquery ? i[0] : i;
-		});
-		delete options.inputs;
-
-		this.keepEmptyValues = options.keepEmptyValues;
-		delete options.keepEmptyValues;
-
-		datepickerPlugin.call($(this.inputs), options)
-			.on('changeDate', $.proxy(this.dateUpdated, this));
-
-		this.pickers = $.map(this.inputs, function(i){
-			return $.data(i, 'datepicker');
-		});
-		this.updateDates();
-	};
-	DateRangePicker.prototype = {
-		updateDates: function(){
-			this.dates = $.map(this.pickers, function(i){
-				return i.getUTCDate();
-			});
-			this.updateRanges();
-		},
-		updateRanges: function(){
-			var range = $.map(this.dates, function(d){
-				return d.valueOf();
-			});
-			$.each(this.pickers, function(i, p){
-				p.setRange(range);
-			});
-		},
-		clearDates: function(){
-			$.each(this.pickers, function(i, p){
-				p.clearDates();
-			});
-		},
-		dateUpdated: function(e){
-			// `this.updating` is a workaround for preventing infinite recursion
-			// between `changeDate` triggering and `setUTCDate` calling.  Until
-			// there is a better mechanism.
-			if (this.updating)
-				return;
-			this.updating = true;
-
-			var dp = $.data(e.target, 'datepicker');
-
-			if (dp === undefined) {
-				return;
-			}
-
-			var new_date = dp.getUTCDate(),
-				keep_empty_values = this.keepEmptyValues,
-				i = $.inArray(e.target, this.inputs),
-				j = i - 1,
-				k = i + 1,
-				l = this.inputs.length;
-			if (i === -1)
-				return;
-
-			$.each(this.pickers, function(i, p){
-				if (!p.getUTCDate() && (p === dp || !keep_empty_values))
-					p.setUTCDate(new_date);
-			});
-
-			if (new_date < this.dates[j]){
-				// Date being moved earlier/left
-				while (j >= 0 && new_date < this.dates[j]){
-					this.pickers[j--].setUTCDate(new_date);
-				}
-			} else if (new_date > this.dates[k]){
-				// Date being moved later/right
-				while (k < l && new_date > this.dates[k]){
-					this.pickers[k++].setUTCDate(new_date);
-				}
-			}
-			this.updateDates();
-
-			delete this.updating;
-		},
-		destroy: function(){
-			$.map(this.pickers, function(p){ p.destroy(); });
-			$(this.inputs).off('changeDate', this.dateUpdated);
-			delete this.element.data().datepicker;
-		},
-		remove: alias('destroy', 'Method `remove` is deprecated and will be removed in version 2.0. Use `destroy` instead')
-	};
-
-	function opts_from_el(el, prefix){
-		// Derive options from element data-attrs
-		var data = $(el).data(),
-			out = {}, inkey,
-			replace = new RegExp('^' + prefix.toLowerCase() + '([A-Z])');
-		prefix = new RegExp('^' + prefix.toLowerCase());
-		function re_lower(_,a){
-			return a.toLowerCase();
-		}
-		for (var key in data)
-			if (prefix.test(key)){
-				inkey = key.replace(replace, re_lower);
-				out[inkey] = data[key];
-			}
-		return out;
-	}
-
-	function opts_from_locale(lang){
-		// Derive options from locale plugins
-		var out = {};
-		// Check if "de-DE" style date is available, if not language should
-		// fallback to 2 letter code eg "de"
-		if (!dates[lang]){
-			lang = lang.split('-')[0];
-			if (!dates[lang])
-				return;
-		}
-		var d = dates[lang];
-		$.each(locale_opts, function(i,k){
-			if (k in d)
-				out[k] = d[k];
-		});
-		return out;
-	}
-
-	var old = $.fn.datepicker;
-	var datepickerPlugin = function(option){
-		var args = Array.apply(null, arguments);
-		args.shift();
-		var internal_return;
-		this.each(function(){
-			var $this = $(this),
-				data = $this.data('datepicker'),
-				options = typeof option === 'object' && option;
-			if (!data){
-				var elopts = opts_from_el(this, 'date'),
-					// Preliminary otions
-					xopts = $.extend({}, defaults, elopts, options),
-					locopts = opts_from_locale(xopts.language),
-					// Options priority: js args, data-attrs, locales, defaults
-					opts = $.extend({}, defaults, locopts, elopts, options);
-				if ($this.hasClass('input-daterange') || opts.inputs){
-					$.extend(opts, {
-						inputs: opts.inputs || $this.find('input').toArray()
-					});
-					data = new DateRangePicker(this, opts);
-				}
-				else {
-					data = new Datepicker(this, opts);
-				}
-				$this.data('datepicker', data);
-			}
-			if (typeof option === 'string' && typeof data[option] === 'function'){
-				internal_return = data[option].apply(data, args);
-			}
-		});
-
-		if (
-			internal_return === undefined ||
-			internal_return instanceof Datepicker ||
-			internal_return instanceof DateRangePicker
-		)
-			return this;
-
-		if (this.length > 1)
-			throw new Error('Using only allowed for the collection of a single element (' + option + ' function)');
-		else
-			return internal_return;
-	};
-	$.fn.datepicker = datepickerPlugin;
-
-	var defaults = $.fn.datepicker.defaults = {
-		assumeNearbyYear: false,
-		autoclose: false,
-		beforeShowDay: $.noop,
-		beforeShowMonth: $.noop,
-		beforeShowYear: $.noop,
-		beforeShowDecade: $.noop,
-		beforeShowCentury: $.noop,
-		calendarWeeks: false,
-		clearBtn: false,
-		toggleActive: false,
-		daysOfWeekDisabled: [],
-		daysOfWeekHighlighted: [],
-		datesDisabled: [],
-		endDate: Infinity,
-		forceParse: true,
-		format: 'mm/dd/yyyy',
-		keepEmptyValues: false,
-		keyboardNavigation: true,
-		language: 'en',
-		minViewMode: 0,
-		maxViewMode: 4,
-		multidate: false,
-		multidateSeparator: ',',
-		orientation: "auto",
-		rtl: false,
-		startDate: -Infinity,
-		startView: 0,
-		todayBtn: false,
-		todayHighlight: false,
-		updateViewDate: true,
-		weekStart: 0,
-		disableTouchKeyboard: false,
-		enableOnReadonly: true,
-		showOnFocus: true,
-		zIndexOffset: 10,
-		container: 'body',
-		immediateUpdates: false,
-		title: '',
-		templates: {
-			leftArrow: '&#x00AB;',
-			rightArrow: '&#x00BB;'
-		},
-    showWeekDays: true
-	};
-	var locale_opts = $.fn.datepicker.locale_opts = [
-		'format',
-		'rtl',
-		'weekStart'
-	];
-	$.fn.datepicker.Constructor = Datepicker;
-	var dates = $.fn.datepicker.dates = {
-		en: {
-			days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
-			daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
-			daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
-			months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-			monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
-			today: "Today",
-			clear: "Clear",
-			titleFormat: "MM yyyy"
-		}
-	};
-
-	var DPGlobal = {
-		viewModes: [
-			{
-				names: ['days', 'month'],
-				clsName: 'days',
-				e: 'changeMonth'
-			},
-			{
-				names: ['months', 'year'],
-				clsName: 'months',
-				e: 'changeYear',
-				navStep: 1
-			},
-			{
-				names: ['years', 'decade'],
-				clsName: 'years',
-				e: 'changeDecade',
-				navStep: 10
-			},
-			{
-				names: ['decades', 'century'],
-				clsName: 'decades',
-				e: 'changeCentury',
-				navStep: 100
-			},
-			{
-				names: ['centuries', 'millennium'],
-				clsName: 'centuries',
-				e: 'changeMillennium',
-				navStep: 1000
-			}
-		],
-		validParts: /dd?|DD?|mm?|MM?|yy(?:yy)?/g,
-		nonpunctuation: /[^ -\/:-@\u5e74\u6708\u65e5\[-`{-~\t\n\r]+/g,
-		parseFormat: function(format){
-			if (typeof format.toValue === 'function' && typeof format.toDisplay === 'function')
-                return format;
-            // IE treats \0 as a string end in inputs (truncating the value),
-			// so it's a bad format delimiter, anyway
-			var separators = format.replace(this.validParts, '\0').split('\0'),
-				parts = format.match(this.validParts);
-			if (!separators || !separators.length || !parts || parts.length === 0){
-				throw new Error("Invalid date format.");
-			}
-			return {separators: separators, parts: parts};
-		},
-		parseDate: function(date, format, language, assumeNearby){
-			if (!date)
-				return undefined;
-			if (date instanceof Date)
-				return date;
-			if (typeof format === 'string')
-				format = DPGlobal.parseFormat(format);
-			if (format.toValue)
-				return format.toValue(date, format, language);
-			var fn_map = {
-					d: 'moveDay',
-					m: 'moveMonth',
-					w: 'moveWeek',
-					y: 'moveYear'
-				},
-				dateAliases = {
-					yesterday: '-1d',
-					today: '+0d',
-					tomorrow: '+1d'
-				},
-				parts, part, dir, i, fn;
-			if (date in dateAliases){
-				date = dateAliases[date];
-			}
-			if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/i.test(date)){
-				parts = date.match(/([\-+]\d+)([dmwy])/gi);
-				date = new Date();
-				for (i=0; i < parts.length; i++){
-					part = parts[i].match(/([\-+]\d+)([dmwy])/i);
-					dir = Number(part[1]);
-					fn = fn_map[part[2].toLowerCase()];
-					date = Datepicker.prototype[fn](date, dir);
-				}
-				return Datepicker.prototype._zero_utc_time(date);
-			}
-
-			parts = date && date.match(this.nonpunctuation) || [];
-
-			function applyNearbyYear(year, threshold){
-				if (threshold === true)
-					threshold = 10;
-
-				// if year is 2 digits or less, than the user most likely is trying to get a recent century
-				if (year < 100){
-					year += 2000;
-					// if the new year is more than threshold years in advance, use last century
-					if (year > ((new Date()).getFullYear()+threshold)){
-						year -= 100;
-					}
-				}
-
-				return year;
-			}
-
-			var parsed = {},
-				setters_order = ['yyyy', 'yy', 'M', 'MM', 'm', 'mm', 'd', 'dd'],
-				setters_map = {
-					yyyy: function(d,v){
-						return d.setUTCFullYear(assumeNearby ? applyNearbyYear(v, assumeNearby) : v);
-					},
-					m: function(d,v){
-						if (isNaN(d))
-							return d;
-						v -= 1;
-						while (v < 0) v += 12;
-						v %= 12;
-						d.setUTCMonth(v);
-						while (d.getUTCMonth() !== v)
-							d.setUTCDate(d.getUTCDate()-1);
-						return d;
-					},
-					d: function(d,v){
-						return d.setUTCDate(v);
-					}
-				},
-				val, filtered;
-			setters_map['yy'] = setters_map['yyyy'];
-			setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
-			setters_map['dd'] = setters_map['d'];
-			date = UTCToday();
-			var fparts = format.parts.slice();
-			// Remove noop parts
-			if (parts.length !== fparts.length){
-				fparts = $(fparts).filter(function(i,p){
-					return $.inArray(p, setters_order) !== -1;
-				}).toArray();
-			}
-			// Process remainder
-			function match_part(){
-				var m = this.slice(0, parts[i].length),
-					p = parts[i].slice(0, m.length);
-				return m.toLowerCase() === p.toLowerCase();
-			}
-			if (parts.length === fparts.length){
-				var cnt;
-				for (i=0, cnt = fparts.length; i < cnt; i++){
-					val = parseInt(parts[i], 10);
-					part = fparts[i];
-					if (isNaN(val)){
-						switch (part){
-							case 'MM':
-								filtered = $(dates[language].months).filter(match_part);
-								val = $.inArray(filtered[0], dates[language].months) + 1;
-								break;
-							case 'M':
-								filtered = $(dates[language].monthsShort).filter(match_part);
-								val = $.inArray(filtered[0], dates[language].monthsShort) + 1;
-								break;
-						}
-					}
-					parsed[part] = val;
-				}
-				var _date, s;
-				for (i=0; i < setters_order.length; i++){
-					s = setters_order[i];
-					if (s in parsed && !isNaN(parsed[s])){
-						_date = new Date(date);
-						setters_map[s](_date, parsed[s]);
-						if (!isNaN(_date))
-							date = _date;
-					}
-				}
-			}
-			return date;
-		},
-		formatDate: function(date, format, language){
-			if (!date)
-				return '';
-			if (typeof format === 'string')
-				format = DPGlobal.parseFormat(format);
-			if (format.toDisplay)
-                return format.toDisplay(date, format, language);
-            var val = {
-				d: date.getUTCDate(),
-				D: dates[language].daysShort[date.getUTCDay()],
-				DD: dates[language].days[date.getUTCDay()],
-				m: date.getUTCMonth() + 1,
-				M: dates[language].monthsShort[date.getUTCMonth()],
-				MM: dates[language].months[date.getUTCMonth()],
-				yy: date.getUTCFullYear().toString().substring(2),
-				yyyy: date.getUTCFullYear()
-			};
-			val.dd = (val.d < 10 ? '0' : '') + val.d;
-			val.mm = (val.m < 10 ? '0' : '') + val.m;
-			date = [];
-			var seps = $.extend([], format.separators);
-			for (var i=0, cnt = format.parts.length; i <= cnt; i++){
-				if (seps.length)
-					date.push(seps.shift());
-				date.push(val[format.parts[i]]);
-			}
-			return date.join('');
-		},
-		headTemplate: '<thead>'+
-			              '<tr>'+
-			                '<th colspan="7" class="datepicker-title"></th>'+
-			              '</tr>'+
-							'<tr>'+
-								'<th class="prev">'+defaults.templates.leftArrow+'</th>'+
-								'<th colspan="5" class="datepicker-switch"></th>'+
-								'<th class="next">'+defaults.templates.rightArrow+'</th>'+
-							'</tr>'+
-						'</thead>',
-		contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>',
-		footTemplate: '<tfoot>'+
-							'<tr>'+
-								'<th colspan="7" class="today"></th>'+
-							'</tr>'+
-							'<tr>'+
-								'<th colspan="7" class="clear"></th>'+
-							'</tr>'+
-						'</tfoot>'
-	};
-	DPGlobal.template = '<div class="datepicker">'+
-							'<div class="datepicker-days">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									'<tbody></tbody>'+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datepicker-months">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datepicker-years">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datepicker-decades">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-							'<div class="datepicker-centuries">'+
-								'<table class="table-condensed">'+
-									DPGlobal.headTemplate+
-									DPGlobal.contTemplate+
-									DPGlobal.footTemplate+
-								'</table>'+
-							'</div>'+
-						'</div>';
-
-	$.fn.datepicker.DPGlobal = DPGlobal;
-
-
-	/* DATEPICKER NO CONFLICT
-	* =================== */
-
-	$.fn.datepicker.noConflict = function(){
-		$.fn.datepicker = old;
-		return this;
-	};
-
-	/* DATEPICKER VERSION
-	 * =================== */
-	$.fn.datepicker.version = '1.9.0';
-
-	$.fn.datepicker.deprecated = function(msg){
-		var console = window.console;
-		if (console && console.warn) {
-			console.warn('DEPRECATED: ' + msg);
-		}
-	};
-
-
-	/* DATEPICKER DATA-API
-	* ================== */
+    }
+    if (el.dataset.dateMinViewMode && view_mode[el.dataset.dateMinViewMode]) {
+        options = { ...options,
+            startView: view_mode[el.dataset.dateMinViewMode]
+        };
+    }
+    if (el.dataset.dateViewMode && view_mode[el.dataset.dateViewMode]) {
+        options = { ...options,
+            maxView: view_mode[el.dataset.dateViewMode]
+        };
+    }
+    if (el.dataset.dateAutoclose) {
+        options = { ...options,
+            autohide: el.dataset.dateAutoclose
+        };
+    }
 
-	$(document).on(
-		'focus.datepicker.data-api click.datepicker.data-api',
-		'[data-provide="datepicker"]',
-		function(e){
-			var $this = $(this);
-			if ($this.data('datepicker'))
-				return;
-			e.preventDefault();
-			// component click requires us to explicitly show it
-			datepickerPlugin.call($this, 'show');
-		}
-	);
-	$(function(){
-		datepickerPlugin.call($('[data-provide="datepicker-inline"]'));
-	});
+    new Datepicker(el, options);
+}
 
-}));
+document.addEventListener("DOMContentLoaded", function () {
+    const elems = document.querySelectorAll('[data-provide="datepicker"]');
+    elems.forEach(el => enable_datepicker(el));
+});
diff --git a/ietf/static/js/document_html.js b/ietf/static/js/document_html.js
new file mode 100644
index 0000000000..3e609f3965
--- /dev/null
+++ b/ietf/static/js/document_html.js
@@ -0,0 +1,199 @@
+import {
+    Tooltip as Tooltip,
+    // Button as Button,
+    // Collapse as Collapse,
+    // ScrollSpy as ScrollSpy,
+    Tab as Tab
+} from "bootstrap";
+
+import Cookies from "js-cookie";
+import { populate_nav } from "./nav.js";
+import "./select2.js";
+
+const cookies = Cookies.withAttributes({ sameSite: "strict" });
+
+// set initial point size from cookie before DOM is ready, to avoid flickering
+const ptsize_var = "doc-ptsize-max";
+
+function change_ptsize(ptsize) {
+    document.documentElement.style.setProperty(`--${ptsize_var}`,
+        `${ptsize}pt`);
+    localStorage.setItem(ptsize_var, ptsize);
+}
+
+const ptsize = localStorage.getItem(ptsize_var);
+change_ptsize(ptsize ? Math.min(Math.max(7, ptsize), 16) : 12);
+
+document.addEventListener("DOMContentLoaded", function (event) {
+    // handle point size slider
+    document.getElementById("ptsize")
+        .oninput = function () { change_ptsize(this.value) };
+
+    // Use the Bootstrap tooltip plugin for all elements with a title attribute
+    const tt_triggers = document.querySelectorAll(
+        "[title]:not([title=''])");
+    [...tt_triggers].map(tt_el => {
+        const tooltip = Tooltip.getOrCreateInstance(tt_el);
+        tt_el.addEventListener("click", el => {
+            tooltip.hide();
+            tt_el.blur();
+        });
+    });
+
+    // Set up a nav pane
+    const toc_pane = document.getElementById("toc-nav");
+    const headings = document.querySelectorAll(`#content :is(h2, h3, h4, h5, h6, .h2, .h3, .h4, .h5, .h6)`);
+    populate_nav(toc_pane, headings, ["py-0"]);
+
+    // activate pref buttons selected by pref cookies or localStorage
+    const in_localStorage = ["deftab", "reflinks"];
+    const btn_pref = {
+        "sidebar": "on",
+        "deftab": "docinfo",
+        "htmlconf": "html",
+        "pagedeps": "reference",
+        "reflinks": "refsection"
+    };
+    document.querySelectorAll("#pref-tab-pane .btn-check")
+        .forEach(btn => {
+            const id = btn.id.replace("-radio", "");
+
+            const val = in_localStorage.includes(btn.name) ?
+                localStorage.getItem(btn.name) : cookies.get(btn.name);
+            if (val === id || (val === null && btn_pref[btn.name] === id)) {
+                btn.checked = true;
+            }
+
+            btn.addEventListener("click", el => {
+                // only use cookies for things used in HTML templates
+                if (in_localStorage.includes(btn.name)) {
+                    localStorage.setItem(btn.name, id)
+                } else {
+                    cookies.set(btn.name, id);
+                }
+                window.location.reload();
+            });
+        });
+
+    // activate tab selected in prefs
+    let defpane;
+    try {
+        defpane = Tab.getOrCreateInstance(
+            `#${localStorage.getItem("deftab")}-tab`);
+    } catch (err) {
+        defpane = Tab.getOrCreateInstance("#docinfo-tab");
+    };
+    defpane.show();
+    document.activeElement.blur();
+
+    if (localStorage.getItem("reflinks") != "refsection") {
+        // make links to references go directly to the referenced doc
+        document.querySelectorAll("a[href^='#'].xref")
+            .forEach(ref => {
+                const loc = document
+                    .getElementById(ref.hash.substring(1))
+                    .nextElementSibling;
+
+                if (!loc ||
+                    loc.tagName != "DD" ||
+                    !loc.closest(".references")) {
+                    return;
+                }
+
+                const url = loc.querySelector(
+                    "a:not([href='']:last-of-type)");
+                if (url) {
+                    const rfc = url.href.match(/(rfc\d+)$/i);
+                    if (rfc) {
+                        // keep RFC links within the datatracker
+                        const base = ref.href.match(
+                            /^(.*\/)rfc\d+.*$/i);
+                        if (base) {
+                            ref.href = base[1] + rfc[1];
+                            return;
+                        }
+                    }
+                    ref.href = url.href;
+                }
+            });
+    }
+
+    // Rewrite these CSS properties so that the values are available for restyling.
+    document.querySelectorAll("svg [style]").forEach(el => {
+        // Push these CSS properties into their own attributes
+        const SVG_PRESENTATION_ATTRS = new Set([
+            'alignment-baseline', 'baseline-shift', 'clip', 'clip-path', 'clip-rule',
+            'color', 'color-interpolation', 'color-interpolation-filters',
+            'color-rendering', 'cursor', 'direction', 'display', 'dominant-baseline',
+            'fill', 'fill-opacity', 'fill-rule', 'filter', 'flood-color',
+            'flood-opacity', 'font-family', 'font-size', 'font-size-adjust',
+            'font-stretch', 'font-style', 'font-variant', 'font-weight',
+            'image-rendering', 'letter-spacing', 'lighting-color', 'marker-end',
+            'marker-mid', 'marker-start', 'mask', 'opacity', 'overflow', 'paint-order',
+            'pointer-events', 'shape-rendering', 'stop-color', 'stop-opacity',
+            'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap',
+            'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width',
+            'text-anchor', 'text-decoration', 'text-rendering', 'unicode-bidi',
+            'vector-effect', 'visibility', 'word-spacing', 'writing-mode',
+        ]);
+
+        // Simple CSS splitter: respects quoted strings and parens so semicolons
+        // inside url(...) or "..." don't get treated as declaration boundaries.
+        function parseDeclarations(styleText) {
+            const decls = [];
+            let buf = '';
+            let inStr = false;
+            let strChar = '';
+            let escaped = false;
+            let depth = 0;
+
+            for (const ch of styleText) {
+                if (inStr) {
+                    if (escaped) {
+                        escaped = false;
+                    } else if (ch === '\\') {
+                        escaped = true;
+                    } else if (ch === strChar) {
+                        inStr = false;
+                    }
+                } else if (ch === '"' || ch === "'") {
+                    inStr = true;
+                    strChar = ch;
+                } else if (ch === '(') {
+                    depth++;
+                } else if (ch === ')') {
+                    depth--;
+                } else if (ch === ';' && depth === 0) {
+                    const trimmed = buf.trim();
+                    if (trimmed) {
+                        decls.push(trimmed);
+                    }
+                    buf = '';
+                    continue;
+                }
+                buf += ch;
+            }
+            const trimmed = buf.trim();
+            if (trimmed) {
+                decls.push(trimmed);
+            }
+            return decls;
+        }
+
+        const remainder = [];
+        for (const decl of parseDeclarations(el.getAttribute('style'))) {
+            const [prop, val] = decl.split(":", 2).map(v => v.trim());
+            if (val && !/!important$/.test(val) && SVG_PRESENTATION_ATTRS.has(prop)) {
+                el.setAttribute(prop, val);
+            } else {
+                remainder.push(decl);
+            }
+        }
+
+        if (remainder.length > 0) {
+            el.setAttribute('style', remainder.join('; '));
+        } else {
+            el.removeAttribute('style');
+        }
+    });
+});
diff --git a/ietf/static/js/document_relations.js b/ietf/static/js/document_relations.js
index 013b852597..07a85d0da5 100644
--- a/ietf/static/js/document_relations.js
+++ b/ietf/static/js/document_relations.js
@@ -315,7 +315,7 @@ function draw_graph(data, group) {
         })
     ];
 
-    // // See https://github.com/d3/d3-force/blob/master/README.md#simulation_tick
+    // // See https://github.com/d3/d3-force/blob/main/README.md#simulation_tick
     // for (let i = 0, n = Math.ceil(Math.log(simulation.alphaMin()) /
     //         Math.log(1 - simulation.alphaDecay())); i <
     //     n; ++i) {
diff --git a/ietf/static/js/document_timeline.js b/ietf/static/js/document_timeline.js
index babde0deeb..d8532c3623 100644
--- a/ietf/static/js/document_timeline.js
+++ b/ietf/static/js/document_timeline.js
@@ -86,7 +86,7 @@ function scale_x() {
 }
 
 function update_x_axis() {
-    d3.select("#timeline svg .x.axis")
+    d3.select("#doc-timeline svg .x.axis")
         .call(x_axis)
         .selectAll("text")
         .style("text-anchor", "end")
@@ -96,7 +96,7 @@ function update_x_axis() {
 function update_timeline() {
     bar_y = {};
     scale_x();
-    var chart = d3.select("#timeline svg")
+    var chart = d3.select("#doc-timeline svg")
         .attr("width", width);
     // enter data (skip the last pseudo entry)
     var bar = chart.selectAll("g")
@@ -111,12 +111,12 @@ function draw_timeline() {
     bar_height = parseFloat($("body")
         .css("line-height"));
 
-    var div = $("#timeline");
+    var div = $("#doc-timeline");
     div.addClass("my-3");
     if (div.is(":empty")) {
         div.append("<svg></svg>");
     }
-    var chart = d3.select("#timeline svg")
+    var chart = d3.select("#doc-timeline svg")
         .attr("width", width);
 
     var defs = chart.append("defs");
@@ -249,7 +249,7 @@ d3.json("doc.json")
                 published: expiration_date(data[data.length - 1])
             });
 
-            width = $("#timeline")
+            width = $("#doc-timeline")
                 .width();
             draw_timeline();
         }
@@ -258,11 +258,11 @@ d3.json("doc.json")
 $(window)
     .on({
         resize: function () {
-            var g = $("#timeline svg");
+            var g = $("#doc-timeline svg");
             g.remove();
-            width = $("#timeline")
+            width = $("#doc-timeline")
                 .width();
-            $("#timeline")
+            $("#doc-timeline")
                 .append(g);
             update_timeline();
         }
diff --git a/ietf/static/js/draft-submit.js b/ietf/static/js/draft-submit.js
index d3657a8377..38ac7eb263 100644
--- a/ietf/static/js/draft-submit.js
+++ b/ietf/static/js/draft-submit.js
@@ -1,69 +1,96 @@
-$(document)
-    .ready(function () {
-        // fill in submitter info when an author button is clicked
-        $("form.idsubmit button.author")
-            .on("click", function () {
-                var name = $(this)
-                    .data("name");
-                var email = $(this)
-                    .data("email");
+$(function () {
+    // fill in submitter info when an author button is clicked
+    $("form.idsubmit button.author")
+        .on("click", function () {
+            var name = $(this)
+                .data("name");
+            var email = $(this)
+                .data("email");
 
-                $(this)
-                    .parents("form")
-                    .find("input[name=submitter-name]")
-                    .val(name || "");
-                $(this)
-                    .parents("form")
-                    .find("input[name=submitter-email]")
-                    .val(email || "");
-            });
+            $(this)
+                .parents("form")
+                .find("input[name=submitter-name]")
+                .val(name || "");
+            $(this)
+                .parents("form")
+                .find("input[name=submitter-email]")
+                .val(email || "");
+        });
 
-        $("form.idsubmit")
-            .on("submit", function () {
-                if (this.submittedAlready)
-                    return false;
-                else {
-                    this.submittedAlready = true;
-                    return true;
-                }
-            });
+    $("form.idsubmit")
+        .on("submit", function () {
+            if (this.submittedAlready)
+                return false;
+            else {
+                this.submittedAlready = true;
+                return true;
+            }
+        });
 
-        $("form.idsubmit #add-author")
-            .on("click", function () {
-                // clone the last author block and make it empty
-                var cloner = $("#cloner");
-                var next = cloner.clone();
-                next.find('input:not([type=hidden])')
-                    .val('');
+    $("form.idsubmit #add-author")
+        .on("click", function () {
+            // clone the last author block and make it empty
+            var cloner = $("#cloner");
+            var next = cloner.clone();
+            next.find('input:not([type=hidden])')
+                .val('');
 
-                // find the author number
-                var t = next.children('h3')
-                    .text();
-                var n = parseInt(t.replace(/\D/g, ''));
+            // find the author number
+            var t = next.children('h3')
+                .text();
+            var n = parseInt(t.replace(/\D/g, ''));
 
-                // change the number in attributes and text
-                next.find('*')
-                    .each(function () {
-                        var e = this;
-                        $.each(['id', 'for', 'name', 'value'], function (i, v) {
-                            if ($(e)
-                                .attr(v)) {
-                                $(e)
-                                    .attr(v, $(e)
-                                        .attr(v)
-                                        .replace(n - 1, n));
-                            }
-                        });
+            // change the number in attributes and text
+            next.find('*')
+                .each(function () {
+                    var e = this;
+                    $.each(['id', 'for', 'name', 'value'], function (i, v) {
+                        if ($(e)
+                            .attr(v)) {
+                            $(e)
+                                .attr(v, $(e)
+                                    .attr(v)
+                                    .replace(n - 1, n));
+                        }
                     });
+                });
+
+            t = t.replace(n, n + 1);
+            next.children('h3')
+                .text(t);
 
-                t = t.replace(n, n + 1);
-                next.children('h3')
-                    .text(t);
+            // move the cloner id to next and insert next into the DOM
+            cloner.removeAttr('id');
+            next.attr('id', 'cloner');
+            next.insertAfter(cloner);
 
-                // move the cloner id to next and insert next into the DOM
-                cloner.removeAttr('id');
-                next.attr('id', 'cloner');
-                next.insertAfter(cloner);
+        });
 
-            });
-    });
+    // If draft is validating, poll until validation is complete, then reload the page
+    const submissionValidatingAlert = document.getElementById('submission-validating-alert');
+    if (submissionValidatingAlert) {
+        let statusPollTimer;
+        const statusUrl = submissionValidatingAlert.dataset['submissionStatusUrl'];
+        let statusPollInterval = 2000; // ms
+        const maxPollInterval = 32000; // ms
+
+        function checkStatus() {
+            if (statusPollInterval < maxPollInterval) {
+                statusPollInterval *= 2;
+            }
+            const xhr = new XMLHttpRequest();
+            xhr.open("GET", statusUrl, true);
+            xhr.onload = (e) => {
+                if (xhr.response && xhr.response.state !== 'validating') {
+                    location.reload();
+                } else {
+                    statusPollTimer = setTimeout(checkStatus, statusPollInterval);
+                }
+            };
+            xhr.onerror = (e) => {statusPollTimer = setTimeout(checkStatus, statusPollInterval);};
+            xhr.responseType = 'json';
+            xhr.send('');
+        }
+        statusPollTimer = setTimeout(checkStatus, statusPollInterval);
+    }
+});
diff --git a/ietf/static/js/edit-meeting-schedule.js b/ietf/static/js/edit-meeting-schedule.js
index cf0bd364cf..2a73a8c29d 100644
--- a/ietf/static/js/edit-meeting-schedule.js
+++ b/ietf/static/js/edit-meeting-schedule.js
@@ -50,6 +50,7 @@ $(function () {
     let sessionPurposeInputs = schedEditor.find('.session-purpose-toggles input');
     let timeSlotGroupInputs = schedEditor.find("#timeslot-group-toggles-modal .modal-body .individual-timeslots input");
     let sessionParentInputs = schedEditor.find(".session-parent-toggles input");
+    let sessionParentToggleAll = schedEditor.find(".session-parent-toggles .session-parent-toggle-all")
     const classes_to_hide = '.hidden-timeslot-group,.hidden-timeslot-type';
 
     // hack to work around lack of position sticky support in old browsers, see https://caniuse.com/#feat=css-sticky
@@ -487,13 +488,13 @@ $(function () {
 
         // Disable a particular swap modal radio input
         let updateSwapRadios = function (labels, radios, disableValue, datePrecision) {
-            labels.removeClass('text-muted');
+            labels.removeClass('text-body-secondary');
             radios.prop('disabled', false);
             radios.prop('checked', false);
             // disable the input requested by value
             let disableInput = radios.filter('[value="' + disableValue + '"]');
             if (disableInput) {
-                disableInput.parent().addClass('text-muted');
+                disableInput.parent().addClass('text-body-secondary');
                 disableInput.prop('disabled', true);
             }
             if (officialSchedule) {
@@ -502,7 +503,7 @@ $(function () {
                 const past_radios = radios.filter(
                     (_, radio) => parseISOTimestamp(radio.closest('*[data-start]').dataset.start).isSameOrBefore(now, datePrecision)
                 );
-                past_radios.parent().addClass('text-muted');
+                past_radios.parent().addClass('text-body-secondary');
                 past_radios.prop('disabled', true);
             }
             return disableInput; // return the input that was specifically disabled, if any
@@ -647,12 +648,9 @@ $(function () {
 
     function updateTimeSlotDurationViolations() {
         timeslots.each(function () {
-            let total = 0;
-            jQuery(this).find(".session").each(function () {
-                total += +jQuery(this).data("duration");
-            });
-
-            jQuery(this).toggleClass("overfull", total > +jQuery(this).data("duration"));
+            const sessionsInSlot = Array.from(this.getElementsByClassName('session'));
+            const requiredDuration = Math.max(sessionsInSlot.map(elt => Number(elt.dataset.duration)));
+            this.classList.toggle('overfull', requiredDuration > Number(this.dataset.duration));
         });
     }
 
@@ -772,6 +770,17 @@ $(function () {
     sessionParentInputs.on("click", updateSessionParentToggling);
     updateSessionParentToggling();
 
+    // Toggle _all_ session parents
+    function toggleAllSessionParents() {
+        if (sessionParentInputs.filter(":checked").length < sessionParentInputs.length) {
+            sessionParentInputs.prop("checked", true);
+        } else {
+            sessionParentInputs.prop("checked", false);
+        }
+        updateSessionParentToggling();
+    }
+    sessionParentToggleAll.on("click", toggleAllSessionParents);
+
     // Toggling timeslot types
     function updateTimeSlotTypeToggling() {
         const checkedTypes = jQuery.map(timeSlotTypeInputs.filter(":checked"), elt => elt.value);
@@ -862,10 +871,10 @@ $(function () {
                 .not('.hidden')
                 .length === 0) {
                 purpose_input.setAttribute('disabled', 'disabled');
-                purpose_input.closest('.session-purpose-toggle').classList.add('text-muted');
+                purpose_input.closest('.session-purpose-toggle').classList.add('text-body-secondary');
             } else {
                 purpose_input.removeAttribute('disabled');
-                purpose_input.closest('.session-purpose-toggle').classList.remove('text-muted');
+                purpose_input.closest('.session-purpose-toggle').classList.remove('text-body-secondary');
             }
         });
     }
@@ -1023,4 +1032,4 @@ $(function () {
         .on("mouseleave", ".other-session", function () {
             sessions.filter("#session" + this.dataset.othersessionid).removeClass("highlight");
         });
-});
\ No newline at end of file
+});
diff --git a/ietf/static/js/edit-milestones.js b/ietf/static/js/edit-milestones.js
index 2a7e2ce2ae..2b64900d6c 100644
--- a/ietf/static/js/edit-milestones.js
+++ b/ietf/static/js/edit-milestones.js
@@ -134,6 +134,11 @@ $(document)
                         window.setupSelect2Field($(this)); // from select2-field.js
                     });
 
+                new_edit_milestone.find("[data-provide='datepicker']")
+                    .each(function () {
+                        enable_datepicker($(this)[0]); // from datepicker.js
+                    });
+
                 if (!group_uses_milestone_dates) {
                     setOrderControlValue();
                 }
@@ -231,4 +236,4 @@ $(document)
             var el = document.getElementById('dragdropcontainer');
             Sortable.create(el, options);
         }
-    });
\ No newline at end of file
+    });
diff --git a/ietf/static/js/fullcalendar.js b/ietf/static/js/fullcalendar.js
index 0d58a24e70..dfdad730e9 100644
--- a/ietf/static/js/fullcalendar.js
+++ b/ietf/static/js/fullcalendar.js
@@ -1,5 +1,9 @@
 import { Calendar } from '@fullcalendar/core';
 import dayGridPlugin from '@fullcalendar/daygrid';
+import iCalendarPlugin from '@fullcalendar/icalendar';
+import bootstrap5Plugin from '@fullcalendar/bootstrap5';
 
 global.FullCalendar = Calendar;
-global.dayGridPlugin = dayGridPlugin;
\ No newline at end of file
+global.dayGridPlugin = dayGridPlugin;
+global.iCalendarPlugin = iCalendarPlugin;
+global.bootstrap5Plugin = bootstrap5Plugin;
diff --git a/ietf/static/js/highcharts.js b/ietf/static/js/highcharts.js
index f9b7aa6154..6c3b68051f 100644
--- a/ietf/static/js/highcharts.js
+++ b/ietf/static/js/highcharts.js
@@ -3,11 +3,113 @@ import Highcharts from "highcharts";
 import Highcharts_Exporting from "highcharts/modules/exporting";
 import Highcharts_Offline_Exporting from "highcharts/modules/offline-exporting";
 import Highcharts_Export_Data from "highcharts/modules/export-data";
-import Highcharts_Accessibility from"highcharts/modules/accessibility";
+import Highcharts_Accessibility from "highcharts/modules/accessibility";
+import Highcharts_Sunburst from "highcharts/modules/sunburst";
+
+document.documentElement.style.setProperty("--highcharts-background-color", "transparent");
 
 Highcharts_Exporting(Highcharts);
 Highcharts_Offline_Exporting(Highcharts);
 Highcharts_Export_Data(Highcharts);
 Highcharts_Accessibility(Highcharts);
+Highcharts_Sunburst(Highcharts);
+
+Highcharts.setOptions({
+    chart: {
+        height: "100%",
+        styledMode: true,
+    },
+    credits: {
+        enabled: false
+    },
+});
 
 window.Highcharts = Highcharts;
+
+window.group_stats = function (url, chart_selector) {
+    $.getJSON(url, function (data) {
+        $(chart_selector)
+            .each(function (_, e) {
+                const dataset = e.dataset.dataset;
+                if (!dataset) {
+                    console.log("dataset data attribute not set");
+                    return;
+                }
+                const area = e.dataset.area;
+                if (!area) {
+                    console.log("area data attribute not set");
+                    return;
+                }
+
+                const chart = Highcharts.chart(e, {
+                    title: {
+                        text: `${dataset == "docs" ? "Documents" : "Pages"} in ${area.toUpperCase()}`
+                    },
+                    series: [{
+                        type: "sunburst",
+                        data: [],
+                        tooltip: {
+                            pointFormatter: function () {
+                                return `There ${this.value == 1 ? "is" : "are"} ${this.value} ${dataset == "docs" ? "documents" : "pages"} in ${this.name}.`;
+                            }
+                        },
+                        dataLabels: {
+                            formatter() {
+                                return this.point.active ? this.point.name : `(${this.point.name})`;
+                            }
+                        },
+                        allowDrillToNode: true,
+                        cursor: 'pointer',
+                        levels: [{
+                            level: 1,
+                            color: "transparent",
+                            levelSize: {
+                                value: .5
+                            }
+                        }, {
+                            level: 2,
+                            colorByPoint: true
+                        }, {
+                            level: 3,
+                            colorVariation: {
+                                key: "brightness",
+                                to: 0.5
+                            }
+                        }]
+                    }],
+                });
+
+                // limit data to area if set and (for now) drop docs
+                const slice = data.filter(d => (area == "ietf" && d.grandparent == area) || d.parent == area || d.id == area)
+                    .map((d) => {
+                        return {
+                            value: d[dataset],
+                            id: d.id,
+                            parent: d.parent,
+                            grandparent: d.grandparent,
+                            active: d.active,
+                        };
+                    })
+                    .sort((a, b) => {
+                        if (a.parent != b.parent) {
+                            if (a.parent < b.parent) {
+                                return -1;
+                            }
+                            if (a.parent > b.parent) {
+                                return 1;
+                            }
+                        } else if (a.parent == area) {
+                            if (a.id < b.id) {
+                                return 1;
+                            }
+                            if (a.id > b.id) {
+                                return -1;
+                            }
+                            return 0;
+                        }
+                        return b.value - a.value;
+                    });
+                chart.series[0].setData(slice);
+            });
+    });
+}
diff --git a/ietf/static/js/highstock.js b/ietf/static/js/highstock.js
index e1965acb62..05b1250ed0 100644
--- a/ietf/static/js/highstock.js
+++ b/ietf/static/js/highstock.js
@@ -5,9 +5,20 @@ import Highcharts_Offline_Exporting from "highcharts/modules/offline-exporting";
 import Highcharts_Export_Data from "highcharts/modules/export-data";
 import Highcharts_Accessibility from"highcharts/modules/accessibility";
 
+document.documentElement.style.setProperty("--highcharts-background-color", "transparent");
+
 Highcharts_Exporting(Highcharts);
 Highcharts_Offline_Exporting(Highcharts);
 Highcharts_Export_Data(Highcharts);
 Highcharts_Accessibility(Highcharts);
 
+Highcharts.setOptions({
+    chart: {
+        styledMode: true,
+    },
+    credits: {
+        enabled: false
+    },
+});
+
 window.Highcharts = Highcharts;
diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js
index c30fe6fcb9..09fa324e42 100644
--- a/ietf/static/js/ietf.js
+++ b/ietf/static/js/ietf.js
@@ -13,7 +13,7 @@ import "bootstrap/js/dist/scrollspy";
 import "bootstrap/js/dist/tab";
 // import "bootstrap/js/dist/toast";
 import "bootstrap/js/dist/tooltip";
-
+import { debounce } from 'lodash-es';
 import jquery from "jquery";
 
 window.$ = window.jQuery = jquery;
@@ -24,7 +24,7 @@ if (!process.env.BUILD_DEPLOY) {
 
 import Cookies from "js-cookie";
 
-import debounce from "lodash/debounce";
+import { populate_nav } from "./nav.js";
 
 // setup CSRF protection using jQuery
 function csrfSafeMethod(method) {
@@ -57,7 +57,7 @@ $(document)
                 var text = $(this)
                     .text();
                 // insert some <wbr> at strategic places
-                var newtext = text.replace(/([@._])/g, "$1<wbr>");
+                var newtext = text.replace(/(\S)([@._+])(\S)/g, "$1$2<wbr>$3");
                 if (newtext === text) {
                     return;
                 }
@@ -91,20 +91,57 @@ $(document)
         //     });
     });
 
-$(document)
-    .ready(function () {
+function overflowShadows(el) {
+    function handleScroll(){
+        const canScrollUp = el.scrollTop > 0
+        const canScrollDown = el.offsetHeight + el.scrollTop < el.scrollHeight
+        el.classList.toggle("overflow-shadows--both", canScrollUp && canScrollDown)
+        el.classList.toggle("overflow-shadows--top-only", canScrollUp && !canScrollDown)
+        el.classList.toggle("overflow-shadows--bottom-only", !canScrollUp && canScrollDown)
+    }
 
-        function dropdown_hover(e) {
-            var navbar = $(this)
-                .closest(".navbar");
-            if (navbar.length === 0 || navbar.find(".navbar-toggler")
-                .is(":hidden")) {
-                $(this)
-                    .children(".dropdown-toggle")
-                    .dropdown(e.type == "mouseenter" ? "show" : "hide");
-            }
+    el.addEventListener("scroll", handleScroll, {passive: true})
+    handleScroll()
+
+    const observer = new IntersectionObserver(handleScroll)
+    observer.observe(el) // el won't have scrollTop etc when hidden, so we need to recalculate when it's revealed
+
+    return () => {
+        el.removeEventListener("scroll", handleScroll)
+        observer.unobserve(el)
+    }
+}
+
+function ensureDropdownOnscreen(elm) {
+    const handlePlacement = () => {
+        if(!(elm instanceof HTMLElement)) {
+            return
+        }
+        const rect = elm.getBoundingClientRect()
+        const BUFFER_PX = 5 // additional distance from bottom of viewport
+        const existingStyleTop = parseInt(elm.style.top, 10)
+        const offscreenBy = Math.round(window.innerHeight - (rect.top + rect.height) - BUFFER_PX)
+        if(existingStyleTop === offscreenBy) {
+            console.log(`Already set top to ${offscreenBy}. Ignoring`)
+            // already set, nothing to do
+            return
         }
+        if(offscreenBy < 0) {
+            elm.style.top = `${offscreenBy}px`
+        } 
+    }
+
+    const debouncedHandler = debounce(handlePlacement, 100)
+        
+    const observer = new MutationObserver(debouncedHandler)
+
+    observer.observe(elm, {
+        attributes: true
+    })
+}
 
+$(document)
+    .ready(function () {
         // load data for the menu
         $.ajax({
             url: $(document.body)
@@ -120,7 +157,7 @@ $(document)
                     }
                     attachTo.find(".dropdown-menu")
                         .remove();
-                    var menu = ['<ul class="dropdown-menu ms-n1 mt-n1">'];
+                    var menu = ['<ul class="dropdown-menu ms-n1 mt-n1 overflow-shadows">'];
                     var groups = data[parentId];
                     var gtype = "";
                     for (var i = 0; i < groups.length; ++i) {
@@ -135,15 +172,17 @@ $(document)
                             g.acronym + " &mdash; " + g.name + "</a></li>");
                     }
                     menu.push("</ul>");
-                    for (i = 0; i < attachTo.length; i++) {
-                        attachTo.closest(".dropdown-menu");
-                    }
+
                     attachTo.append(menu.join(""));
-                }
 
-                if (!("ontouchstart" in document.documentElement)) {
-                    $("ul.nav li.dropdown, ul.nav li.dropend")
-                        .on("mouseenter mouseleave", dropdown_hover);
+                    attachTo.find(".overflow-shadows").each(function(){
+                        // needs to be a function(){} so that we can access jQuery's `this`
+                        overflowShadows(this)
+                    })
+                    attachTo.find(".dropdown-menu").each(function(){
+                        // needs to be a function(){} so that we can access jQuery's `this`
+                        ensureDropdownOnscreen(this)
+                    })
                 }
             }
         });
@@ -154,9 +193,10 @@ $(document)
 $(function () {
     const contentElement = $('#content.ietf-auto-nav');
     if (contentElement.length > 0) {
+        const heading_selector = ":is(h2, h3, h4, h5, h6, .h2, .h3, .h4, .h5, .h6, .nav-heading):not([style='display:none']):not(.navskip)";
         const headings = contentElement
-            .find("h1:visible, h2:visible, h3:visible, h4:visible, h5:visible, h6:visible, .nav-heading:visible")
-            .not(".navskip");
+            .find(heading_selector)
+            .filter((i, el) => !el.closest(".navskip,.modal"));
 
         const contents = (headings.length > 0) &&
             ($(headings)
@@ -178,16 +218,14 @@ $(function () {
 
         if (pageTooTall || haveExtraNav) {
             // console.log("Enabling nav.");
-            let n = 0;
-            let last_level;
 
             contentElement
                 .attr("data-bs-offset", 0)
                 .attr("tabindex", 0)
                 .after($(`
                  <div class="col-xl-2 ps-0 small">
-                     <div id="righthand-panel" class="position-fixed col-xl-2 bg-light d-flex flex-column justify-content-between align-items-start">
-                         <nav id="righthand-nav" class="navbar navbar-light w-100 overflow-auto align-items-start flex-fill"></nav>
+                     <div id="righthand-panel" class="position-fixed col-xl-2 bg-light-subtle d-flex flex-column justify-content-between align-items-start">
+                         <nav id="righthand-nav" class="navbar w-100 overflow-auto align-items-start flex-fill"></nav>
                      </div>
                  </div>
                  `));
@@ -197,48 +235,7 @@ $(function () {
                 .children()
                 .last();
 
-            contentElement
-                .find("h1:visible, h2:visible, h3:visible, h4:visible, h5:visible, h6:visible, .nav-heading:visible")
-                .not(".navskip")
-                .each(function () {
-                    // Some headings have line breaks in them - only use first line in that case.
-                    const frag = $(this)
-                        .html()
-                        .split("<br")
-                        .shift();
-                    const text = $.parseHTML(frag)
-                        .map(x => $(x)
-                            .text())
-                        .join(" ");
-
-                    if (text === undefined || text === "") {
-                        // Nothing to do for empty headings.
-                        return;
-                    }
-                    let id = $(this)
-                        .attr("id");
-
-                    if (id === undefined) {
-                        id = `autoid-${++n}`;
-                        $(this)
-                            .attr("id", id);
-                    }
-
-                    const level = parseInt(this.nodeName.substring(1)) - 1;
-                    if (!last_level) {
-                        last_level = level;
-                    }
-
-                    if (level > last_level) {
-                        last_level = level;
-                    } else
-                        while (level < last_level) {
-                            last_level--;
-                        }
-
-                    $(nav)
-                        .append(`<a class="nav-link" href="#${id}">${text}</a>`);
-                });
+            populate_nav(nav[0], headings.toArray());
 
             if (haveExtraNav) {
                 $('#righthand-panel').append('<div id="righthand-extra" class="w-100 py-3"></div>');
@@ -246,18 +243,6 @@ $(function () {
                 extraNav.remove();
             }
 
-            $(document)
-                // Chrome apparently wants this debounced to something >10ms,
-                // otherwise the main view doesn't scroll?
-                .on("scroll", debounce(function () {
-                    const item = $('#righthand-nav')
-                        .find(".active")
-                        .last();
-                    if (item.length) {
-                        item[0].scrollIntoView({ block: "center", behavior: "smooth" });
-                    }
-                }, 100));
-
             // offset the scrollspy to account for the menu bar
             const contentOffset = contentElement ? contentElement.offset().top : 0;
 
@@ -311,25 +296,26 @@ $(document)
 
 // Bootstrap doesn't load modals via href anymore, so let's do it ourselves.
 // See https://stackoverflow.com/a/48934494/2240756
+// Instead of attaching to the modal elements as in that example, though,
+// listen on document and filter with the .modal selector. This allows handling
+// of modals that are added dynamically (e.g., list.js apparently replaces DOM 
+// elements with identical copies, minus any attached listeners).
 $(document)
-    .ready(function () {
-        $('.modal')
-            .on('show.bs.modal', function (e) {
-                var button = $(e.relatedTarget);
-                if (!$(button)
-                    .attr("href")) {
-                    return;
-                }
-                var loc = $(button)
-                    .attr("href")
-                    .trim();
-                // load content from value of button href
-                if (loc !== undefined && loc !== "#") {
-                    $(this)
-                        .find('.modal-content')
-                        .load(loc);
-                }
-            });
+    .on('show.bs.modal', '.modal', function (e) {
+        var button = $(e.relatedTarget);
+        if (!$(button)
+            .attr("href")) {
+            return;
+        }
+        var loc = $(button)
+            .attr("href")
+            .trim();
+        // load content from value of button href
+        if (loc !== undefined && loc !== "#") {
+            $(this)
+                .find('.modal-content')
+                .load(loc);
+        }
     });
 
 // Handle history snippet expansion.
diff --git a/ietf/static/js/investigate.js b/ietf/static/js/investigate.js
new file mode 100644
index 0000000000..ee1c545147
--- /dev/null
+++ b/ietf/static/js/investigate.js
@@ -0,0 +1,53 @@
+// Copyright The IETF Trust 2025, All Rights Reserved
+document.addEventListener('DOMContentLoaded', () => {
+    const investigateForm = document.forms['investigate']
+    investigateForm.addEventListener('submit', (event) => {
+        // Intercept submission unless we've filled in the task_id field
+        if (!investigateForm.elements['id_task_id'].value) {
+            event.preventDefault()
+            runInvestigation()
+        }
+    })
+
+    const runInvestigation = async () => {
+        // Submit the request
+        const response = await fetch('', {
+            method: investigateForm.method, body: new FormData(investigateForm)
+        })
+        if (!response.ok) {
+            loadResultsFromTask('bogus-task-id') // bad task id will generate an error from Django
+        }
+        const taskId = (await response.json()).id
+        // Poll for completion of the investigation up to 60*10 = 600 seconds 
+        waitForResults(taskId, 60)
+    }
+
+    const waitForResults = async (taskId, retries) => {
+        // indicate that investigation is in progress
+        document.querySelectorAll('.investigation-indicator').forEach(elt => elt.classList.remove('d-none'))
+        document.getElementById('investigate-button').disabled = true
+        investigateForm.elements['id_name_fragment'].disabled = true
+
+        const response = await fetch('?' + new URLSearchParams({ id: taskId }))
+        if (!response.ok) {
+            loadResultsFromTask('bogus-task-id') // bad task id will generate an error from Django
+        }
+        const result = await response.json()
+        if (result.status !== 'ready' && retries > 0) {
+            // 10 seconds per retry
+            setTimeout(waitForResults, 10000, taskId, retries - 1)
+        } else {
+            /* Either the response is ready or we timed out waiting. In either case, submit
+               the task_id via POST and let Django display an error if it's not ready. Before
+               submitting, re-enable the form fields so the POST is valid. Other in-progress
+               indicators will be reset when the POST response is loaded. */
+            loadResultsFromTask(taskId)
+        }
+    }
+
+    const loadResultsFromTask = (taskId) => {
+        investigateForm.elements['id_name_fragment'].disabled = false
+        investigateForm.elements['id_task_id'].value = taskId
+        investigateForm.submit()
+    }
+})
diff --git a/ietf/static/js/ipr-edit.js b/ietf/static/js/ipr-edit.js
index 40ca4e352f..9d07503791 100644
--- a/ietf/static/js/ipr-edit.js
+++ b/ietf/static/js/ipr-edit.js
@@ -18,7 +18,7 @@ $(document)
                         ["for", "id", "name"].forEach(function (at) {
                             var val = x.attr(at);
                             if (val && val.match("iprdocrel")) {
-                                x.attr(at, val.replace('-1-', '-' + total + '-'));
+                                x.attr(at, val.replace('__prefix__', total.toString()));
                             }
                         });
                     });
@@ -27,6 +27,8 @@ $(document)
                 totalField.val(total);
 
                 template.before(el);
+
+                el.find('.select2-field').each((index, element) => setupSelect2Field($(element)));
             });
 
         function updateRevisions() {
@@ -67,4 +69,69 @@ $(document)
             form.find(".draft-row")
                 .each(updateRevisions);
         }, 10);
-    });
\ No newline at end of file
+
+        // Manage fields that depend on the Blanket IPR Disclosure choice
+        const blanketCheckbox = document.getElementById('id_is_blanket_disclosure') 
+        if (blanketCheckbox) {
+            const patentDetailInputs = [
+                // The ids are from the HolderIprDisclosureForm and its base form class,
+                // intentionally excluding patent_notes because it's never required
+                'id_patent_number',
+                'id_patent_inventor',
+                'id_patent_title',
+                'id_patent_date'
+            ].map((id) => document.getElementById(id))
+            const patentDetailRowDivs = patentDetailInputs.map(
+                (elt) => elt.closest('div.row')
+            )
+            const royaltyFreeLicensingRadio = document.querySelector(
+                '#id_licensing input[value="royalty-free"]'
+            )
+            let lastSelectedLicensingRadio
+            const otherLicensingRadios = document.querySelectorAll(
+                '#id_licensing input:not([value="royalty-free"])'
+            ) 
+            
+            const handleBlanketCheckboxChange = () => {
+                const isBlanket = blanketCheckbox.checked
+                // Update required fields
+                for (elt of patentDetailInputs) {
+                    // disable the input element
+                    elt.required = !isBlanket
+                }
+                for (elt of patentDetailRowDivs) {
+                    // update the styling on the row that indicates required field
+                    if (isBlanket) {
+                        elt.classList.remove('required')
+                    } else {
+                        elt.classList.add('required')
+                    }
+                }
+                // Update licensing selection
+                if (isBlanket) {
+                    lastSelectedLicensingRadio = document.querySelector(
+                        '#id_licensing input:checked'
+                    )
+                    royaltyFreeLicensingRadio.checked = true
+                    otherLicensingRadios
+                        .forEach(
+                            (elt) => elt.setAttribute('disabled', '')
+                        )
+                } else {
+                    royaltyFreeLicensingRadio.checked = false
+                    if (lastSelectedLicensingRadio) {
+                        lastSelectedLicensingRadio.checked = true
+                    }
+                    otherLicensingRadios
+                        .forEach(
+                            (elt) => elt.removeAttribute('disabled')
+                        )
+                }
+            }
+            handleBlanketCheckboxChange()
+            blanketCheckbox.addEventListener(
+                'change', 
+                (evt) => handleBlanketCheckboxChange()
+            )
+        }
+    });
diff --git a/ietf/static/js/jquery-ui.js b/ietf/static/js/jquery-ui.js
deleted file mode 100644
index e935ce8e98..0000000000
--- a/ietf/static/js/jquery-ui.js
+++ /dev/null
@@ -1 +0,0 @@
-import "jquery-ui-dist/jquery-ui.js";
\ No newline at end of file
diff --git a/ietf/static/js/liaisons.js b/ietf/static/js/liaisons.js
index e7a76660c9..6c46cb6dfc 100644
--- a/ietf/static/js/liaisons.js
+++ b/ietf/static/js/liaisons.js
@@ -197,16 +197,6 @@ var liaisonForm = {
         }
     },
 
-    checkPostOnly: function (post_only) {
-        if (post_only) {
-            $("button[name=send]")
-                .hide();
-        } else {
-            $("button[name=send]")
-                .show();
-        }
-    },
-
     updateInfo: function (first_time, sender) {
         // don't overwrite fields when editing existing liaison
         if (liaisonForm.is_edit_form) {
@@ -239,7 +229,6 @@ var liaisonForm = {
                         liaisonForm.toggleApproval(response.needs_approval);
                         liaisonForm.response_contacts.val(response.response_contacts);
                     }
-                    liaisonForm.checkPostOnly(response.post_only);
                 }
             }
         });
@@ -326,4 +315,4 @@ $(document)
             .each(liaisonForm.init);
         $('#liaison_search_form')
             .each(searchForm.init);
-    });
\ No newline at end of file
+    });
diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js
index a74e811cb6..c03368cd72 100644
--- a/ietf/static/js/list.js
+++ b/ietf/static/js/list.js
@@ -1,16 +1,24 @@
-import * as List from "list.js";
-
-var dummy = new List();
+import {
+    default as List
+} from "list.js";
 
 function text_sort(a, b, options) {
+
+    function prep(e, options) {
+        const el = $($.parseHTML(e.values()[options.valueName]));
+        const cell_el = e.elm.querySelector(`.${options.valueName}`)
+        const sort_by_number = cell_el?.getAttribute('data-sort-number')
+        return sort_by_number ?? el.text()
+            .trim()
+            .replaceAll(/\s+/g, ' ');
+    }
+
     // sort by text content
-    return dummy.utils.naturalSort.caseInsensitive($($.parseHTML(a.values()[options.valueName]))
-        .text()
-        .trim()
-        .replaceAll(/\s+/g, ' '), $($.parseHTML(b.values()[options.valueName]))
-        .text()
-        .trim()
-        .replaceAll(/\s+/g, ' '));
+    return prep(a, options).localeCompare(prep(b, options), "en", {
+        sensitivity: "base",
+        ignorePunctuation: false,
+        numeric: true
+    });
 }
 
 function replace_with_internal(table, internal_table, i) {
@@ -20,15 +28,13 @@ function replace_with_internal(table, internal_table, i) {
         .replaceWith(internal_table[i]
             .children("table")
             .children("tbody")
-            .clone());
+            .clone(true));
 }
 
 function field_magic(i, e, fields) {
-    if ($(e)
-        .attr("colspan") === undefined &&
-        (fields[i] == "num" || fields[i] == "count" ||
-            fields[i] == "percent" || fields[i] == "id" ||
-            fields[i].endsWith("-num") || fields[i].endsWith("-date"))) {
+    if (fields[i] == "num" || fields[i] == "count" ||
+        fields[i] == "percent" || fields[i] == "id" ||
+        fields[i].endsWith("-num") || fields[i].endsWith("-date")) {
         $(e)
             .addClass("text-end");
     }
@@ -62,12 +68,21 @@ $(document)
                 // get field classes from first thead row
                 var fields = $(header_row)
                     .find("th, td")
-                    .map(function () {
-                        return $(this)
-                            .attr("data-sort") ? $(this)
+                    .toArray()
+                    .map((el) => {
+                        let colspan = parseInt($(el)
+                            .attr("colspan")) || 1;
+                        // create a dense (non-sparse) array
+                        let data_sort = new Array();
+                        for (var i = 0; i < colspan; i++) {
+                            data_sort[i] = "";
+                        }
+                        data_sort[0] = $(el)
+                            .attr("data-sort") ? $(el)
                             .attr("data-sort") : "";
+                        return data_sort;
                     })
-                    .toArray();
+                    .flat();
 
                 if (fields.length == 0 || !fields.filter(field => field != "")) {
                     // console.log("No table fields defined, disabling search/sort.");
@@ -79,10 +94,9 @@ $(document)
                 $(header_row)
                     .children("[data-sort]")
                     .addClass("sort");
-                // $(header_row)
-                //     .children("th, td")
-                //     .wrapInner('<span class="tablesorter-th"></span>');
-                //     // .each((i, e) => field_magic(i, e, fields));
+                $(header_row)
+                    .children("th, td")
+                    .each((i, e) => field_magic(i, e, fields));
 
                 if ($(header_row)
                     .text()
@@ -154,10 +168,10 @@ $(document)
                         // create the internal table and add list.js to them
                         var thead = $(this)
                             .siblings("thead:first")
-                            .clone();
+                            .clone(true);
 
                         var tbody = $(this)
-                            .clone();
+                            .clone(true);
 
                         var tbody_rows = $(tbody)
                             .find("tr")
@@ -172,7 +186,7 @@ $(document)
 
                         var parent = $(table)
                             .parent()
-                            .clone();
+                            .clone(true);
 
                         $(parent)
                             .children("table")
@@ -198,12 +212,12 @@ $(document)
                         }
 
                         let newlist = new List(hook, pagination ? {
-                                valueNames: fields,
-                                pagination: pagination,
-                                page: items_per_page
-                            } : {
-                                valueNames: fields
-                            });
+                            valueNames: fields,
+                            pagination: pagination,
+                            page: items_per_page
+                        } : {
+                            valueNames: fields
+                        });
                         // override search module with a patched version
                         // see https://github.com/javve/list.js/issues/699
                         // TODO: check if this is still needed if list.js ever sees an update
@@ -214,7 +228,7 @@ $(document)
                 if (enable_search) {
                     reset_search.on("click", function () {
                         search_field.val("");
-                        $.each(list_instance, (i, e) => {
+                        $.each(list_instance, (_, e) => {
                             e.search();
                         });
                     });
@@ -223,7 +237,7 @@ $(document)
                         if (event.key == "Escape") {
                             reset_search.trigger("click");
                         } else {
-                            $.each(list_instance, (i, e) => {
+                            $.each(list_instance, (_, e) => {
                                 e.search($(this)
                                     .val());
                             });
@@ -233,18 +247,23 @@ $(document)
 
                 $(table)
                     .find(".sort")
-                    .on("click", function () {
+                    .on("click", function (ev) {
+                        ev.preventDefault()
                         var order = $(this)
                             .hasClass("asc") ? "desc" : "asc";
-                        $.each(list_instance, (i, e) => {
+                        $.each(list_instance, (_, e) => {
                             e.sort($(this)
-                                .attr("data-sort"), { order: order, sortFunction: text_sort });
+                                .attr("data-sort"), {
+                                    order: order,
+                                    sortFunction: text_sort
+                                });
                         });
                     });
 
                 $.each(list_instance, (i, e) => {
                     e.on("sortComplete", function () {
                         replace_with_internal(table, internal_table, i);
+                        $(table).find("[data-bs-original-title]").tooltip();
                         if (i == list_instance.length - 1) {
                             $(table)
                                 .find("thead:first tr")
@@ -260,43 +279,35 @@ $(document)
                                 });
                         }
                     });
-
                     e.on("searchComplete", function () {
-                        var last_show_with_children = {};
-                        e.items.forEach((item) => {
-                            if ($(item.elm)
-                                .hasClass("show-with-children")) {
-                                var kind = $(item.elm)
-                                    .attr("class")
-                                    .split(/\s+/)
-                                    .join();
-                                last_show_with_children[kind] = item;
-                            }
-
-                            if (item.found) {
-                                Object.entries(last_show_with_children)
-                                    .forEach(([key, val]) => {
-                                        val.found = true;
-                                        val.show();
-                                        delete last_show_with_children[key];
-                                    });
-                            }
-
-                            if ($(item.elm)
-                                .hasClass("show-always")) {
-                                item.found = true;
-                                item.show();
-                            }
-                        });
-
-                        e.update();
                         replace_with_internal(table, internal_table, i);
                     });
                 });
+
                 $(table.addClass("tablesorter-done"));
                 n++;
                 $(table)[0]
                     .dispatchEvent(new Event("tablesorter:done"));
+
+                // check if there is a sort query argument, and leave the table alone if so
+                const params = new Proxy(new URLSearchParams(window.location.search), {
+                    get: (searchParams, prop) => searchParams.get(prop),
+                });
+                if (!params.sort) {
+                    // else, if there is a data-default-sort attribute on a column, pre-sort the table on that
+                    const presort_col = $(header_row).children("[data-default-sort]:first");
+                    if (presort_col) {
+                        const order = presort_col.attr("data-default-sort");
+                        if (order === "asc" || order === "desc") {
+                            $.each(list_instance, (_, e) => {
+                                e.sort(presort_col.attr("data-sort"), {
+                                    order: order,
+                                    sortFunction: text_sort
+                                });
+                            });
+                        }
+                    }
+                }
             });
 
         // if the URL contains a #, scroll to it again, since we modified the DOM
diff --git a/ietf/static/js/listjs-search.js b/ietf/static/js/listjs-search.js
index da921b25ed..61a253375f 100644
--- a/ietf/static/js/listjs-search.js
+++ b/ietf/static/js/listjs-search.js
@@ -119,7 +119,7 @@ module.exports = function (list) {
       var target = e.target || e.srcElement, // IE have srcElement
         alreadyCleared = target.value === '' && !list.searched
       if (!alreadyCleared) {
-        // If oninput already have resetted the list, do nothing
+        // If oninput has already reset the list, do nothing
         searchMethod(target.value)
       }
     }, list.searchDelay)
diff --git a/ietf/static/js/login.js b/ietf/static/js/login.js
new file mode 100644
index 0000000000..770d091bf1
--- /dev/null
+++ b/ietf/static/js/login.js
@@ -0,0 +1,14 @@
+/**
+* Disable Submit Button on Form Submit
+*/
+function onLoginSubmit (ev) {
+    const submitBtn = document.querySelector('#dt-login-form button[type=submit]')
+    if (submitBtn) {
+        submitBtn.disabled = true
+        submitBtn.innerHTML = 'Signing in...'
+    }
+}
+
+$(function() {
+    document.querySelector('#dt-login-form').addEventListener('submit', onLoginSubmit)
+})
diff --git a/ietf/static/js/meeting-interim-request.js b/ietf/static/js/meeting-interim-request.js
index 5715fce2d7..b7f7e3d997 100644
--- a/ietf/static/js/meeting-interim-request.js
+++ b/ietf/static/js/meeting-interim-request.js
@@ -18,17 +18,14 @@ const interimRequest = (function() {
                 .on("blur", interimRequest.calculateEndTime);
             const timeInput = $('input[name$="-time"]');
             timeInput.on("blur", interimRequest.calculateEndTime);
-            timeInput.on("blur", interimRequest.updateInfo);
             $('input[name$="-end_time"]')
-                .prop('disabled', true)
-                .on("change", interimRequest.updateInfo);
+                .prop('disabled', true);
             interimRequest.timezone.on("change", interimRequest.timezoneChange);
             // init
             interimRequest.inPerson.each(interimRequest.toggleLocation);
             interimRequest.checkAddButton();
             interimRequest.initTimezone();
             timeInput.each(interimRequest.calculateEndTime);
-            timeInput.each(interimRequest.updateInfo);
             const remoteParticipations = $('select[id$="-remote_participation"]');
             remoteParticipations.on(
                 'change',
@@ -47,13 +44,15 @@ const interimRequest = (function() {
             // increment formset counter
             template.find(':input')
                 .each(function () {
-                    const name = $(this)
-                        .attr('name')
-                        .replace('-' + (total - 1) + '-', '-' + total + '-');
-                    const id = 'id_' + name;
-                    $(this)
-                        .attr({ name: name, id: id })
-                        .val('');
+                    let name = $(this)
+                        .attr('name');
+                    if (name) {
+                        name.replace('-' + (total - 1) + '-', '-' + total + '-');
+                        const id = 'id_' + name;
+                        $(this)
+                            .attr({ name: name, id: id })
+                            .val('');
+                    }
                 });
 
             template.find('label')
@@ -91,43 +90,6 @@ const interimRequest = (function() {
                 .removeClass("d-none");
         },
 
-        updateInfo: function () {
-            // makes ajax call to server and sets UTC field
-            const time = $(this)
-                .val();
-            if (!time) {
-                return;
-            }
-            const url = "/meeting/ajax/get-utc";
-            const fieldset = $(this)
-                .parents(".fieldset");
-            const date = fieldset.find("input[name$='-date']")
-                .val();
-            const timezone = interimRequest.timezone.val();
-            const name = $(this)
-                .attr("id") + "_utc";
-            const utc = fieldset.find("#" + name);
-            //console.log(name,utc.attr("id"));
-            $.ajax({
-                url: url,
-                type: 'GET',
-                cache: false,
-                async: true,
-                dataType: 'json',
-                data: {
-                    date: date,
-                    time: time,
-                    timezone: timezone
-                },
-                success: function (response) {
-                    if (!response.error && response.html) {
-                        utc.html(response.html);
-                    }
-                }
-            });
-            return false;
-        },
-
         calculateEndTime: function () {
             // gets called when either start_time or duration change
             const fieldset = $(this)
@@ -245,11 +207,12 @@ const interimRequest = (function() {
 
         toggleLocation: function () {
             if (this.checked) {
-                $(".location")
+                $(".location input, .location select")
                     .prop('disabled', false);
             } else {
-                $(".location")
-                    .prop('disabled', true);
+                $(".location input, .location select")
+                    .prop('disabled', true)
+                    .val('');
             }
         },
 
diff --git a/ietf/static/js/nav.js b/ietf/static/js/nav.js
new file mode 100644
index 0000000000..dcb5409602
--- /dev/null
+++ b/ietf/static/js/nav.js
@@ -0,0 +1,98 @@
+import debounce from "lodash/debounce";
+
+function make_nav() {
+    const nav = document.createElement("nav");
+    nav.classList.add("nav-pills", "ps-3", "flex-column");
+    return nav;
+}
+
+function get_level(el) {
+    let h;
+    if (el.tagName.match(/^h\d/i)) {
+        h = el.tagName
+    } else {
+        el.classList.forEach(cl => {
+            if (cl.match(/^h\d/i)) {
+                h = cl;
+                return;
+            }
+        });
+    }
+    return h.charAt(h.length - 1);
+}
+
+export function populate_nav(nav, headings, classes) {
+    // Extract section headings from document
+    const min_level = Math.min(...Array.from(headings)
+        .map(get_level));
+
+    let nav_stack = [nav];
+    let cur_level = 0;
+    let n = 0;
+
+    headings.forEach(el => {
+        const level = get_level(el) - min_level;
+
+        if (level < cur_level) {
+            while (level < cur_level) {
+                let nav = nav_stack.pop();
+                cur_level--;
+                nav_stack[cur_level].appendChild(nav);
+            }
+        } else {
+            while (level > cur_level) {
+                nav_stack.push(make_nav());
+                cur_level++;
+            }
+        }
+
+        const link = document.createElement("a");
+        link.classList.add("nav-link", "ps-1", "d-flex", "hyphenate",
+            classes);
+
+        if (!el.id) {
+            el.id = `autoid-${++n}`;
+        }
+        link.href = `#${el.id}`;
+
+        const words = el.innerText.split(/\s+/);
+        let nr = "";
+        if (words[0].includes(".")) {
+            nr = words.shift();
+        } else if (words.length > 1 && words[1].includes(".")) {
+            nr = words.shift() + " " + words.shift();
+            nr = nr.replace(/\s*Appendix\s*/, "");
+        }
+
+        if (nr) {
+            const number = document.createElement("div");
+            number.classList.add("pe-1");
+            number.textContent = nr;
+            link.appendChild(number);
+        }
+
+        const text = document.createElement("div");
+        text.classList.add("text-break");
+        text.textContent = words.join(" ");
+        link.appendChild(text);
+
+        nav_stack[level].appendChild(link);
+    });
+
+    for (var i = nav_stack.length - 1; i > 0; i--) {
+        nav_stack[i - 1].appendChild(nav_stack[i]);
+    }
+
+    // Chrome apparently wants this debounced to something >10ms,
+    // otherwise the main view doesn't scroll?
+    document.addEventListener("scroll", debounce(function () {
+        const items = nav.querySelectorAll(".active");
+        const item = [...items].pop();
+        if (item) {
+            item.scrollIntoView({
+                block: "center",
+                behavior: "smooth"
+            });
+        }
+    }, 100));
+}
diff --git a/ietf/static/js/navbar-doc-search.js b/ietf/static/js/navbar-doc-search.js
new file mode 100644
index 0000000000..c36c032310
--- /dev/null
+++ b/ietf/static/js/navbar-doc-search.js
@@ -0,0 +1,113 @@
+$(function () {
+    var $input = $('#navbar-doc-search');
+    var $results = $('#navbar-doc-search-results');
+    var ajaxUrl = $input.data('ajax-url');
+    var debounceTimer = null;
+    var highlightedIndex = -1;
+    var keyboardHighlight = false;
+    var currentItems = [];
+
+    function showDropdown() {
+        $results.addClass('show');
+    }
+
+    function hideDropdown() {
+        $results.removeClass('show');
+        highlightedIndex = -1;
+        keyboardHighlight = false;
+        updateHighlight();
+    }
+
+    function updateHighlight() {
+        $results.find('.dropdown-item').removeClass('active');
+        if (highlightedIndex >= 0 && highlightedIndex < currentItems.length) {
+            $results.find('.dropdown-item').eq(highlightedIndex).addClass('active');
+        }
+    }
+
+    function doSearch(query) {
+        if (query.length < 2) {
+            hideDropdown();
+            return;
+        }
+        $.ajax({
+            url: ajaxUrl,
+            dataType: 'json',
+            data: { q: query },
+            success: function (data) {
+                currentItems = data;
+                highlightedIndex = -1;
+                $results.empty();
+                if (data.length === 0) {
+                    $results.append('<li><span class="dropdown-item text-muted">No results found</span></li>');
+                } else {
+                    data.forEach(function (item) {
+                        var $li = $('<li>');
+                        var $a = $('<a class="dropdown-item" href="' + item.url + '">' + item.text + '</a>');
+                        $li.append($a);
+                        $results.append($li);
+                    });
+                }
+                showDropdown();
+            }
+        });
+    }
+
+    $input.on('input', function () {
+        clearTimeout(debounceTimer);
+        var query = $(this).val().trim();
+        debounceTimer = setTimeout(function () {
+            doSearch(query);
+        }, 250);
+    });
+
+    $input.on('keydown', function (e) {
+        if (e.key === 'ArrowDown') {
+            e.preventDefault();
+            if (highlightedIndex < currentItems.length - 1) {
+                highlightedIndex++;
+                keyboardHighlight = true;
+                updateHighlight();
+            }
+        } else if (e.key === 'ArrowUp') {
+            e.preventDefault();
+            if (highlightedIndex > 0) {
+                highlightedIndex--;
+                keyboardHighlight = true;
+                updateHighlight();
+            }
+        } else if (e.key === 'Enter') {
+            e.preventDefault();
+            if (keyboardHighlight && highlightedIndex >= 0 && highlightedIndex < currentItems.length) {
+                window.location.href = currentItems[highlightedIndex].url;
+            } else {
+                var query = $(this).val().trim();
+                if (query) {
+                    window.location.href = '/doc/search/?name=' + encodeURIComponent(query) + '&rfcs=on&activedrafts=on&olddrafts=on';
+                }
+            }
+        } else if (e.key === 'Escape') {
+            hideDropdown();
+            $input.blur();
+        }
+    });
+
+    // Hover highlights (visual only — Enter still submits the text)
+    $results.on('mouseenter', '.dropdown-item', function () {
+        highlightedIndex = $results.find('.dropdown-item').index(this);
+        keyboardHighlight = false;
+        updateHighlight();
+    });
+
+    $results.on('mouseleave', '.dropdown-item', function () {
+        highlightedIndex = -1;
+        updateHighlight();
+    });
+
+    // Click outside closes dropdown
+    $(document).on('click', function (e) {
+        if (!$(e.target).closest('#navbar-doc-search-wrapper').length) {
+            hideDropdown();
+        }
+    });
+});
diff --git a/ietf/static/js/password_strength.js b/ietf/static/js/password_strength.js
index fddcca7bea..74a245fb5c 100644
--- a/ietf/static/js/password_strength.js
+++ b/ietf/static/js/password_strength.js
@@ -30,13 +30,13 @@
 
             widget
                 .find(".label-danger")
-                .addClass("bg-danger")
+                .addClass("text-bg-danger")
                 .removeClass("label-danger");
 
             widget
-                .find(".text-muted")
+                .find(".text-body-secondary")
                 .addClass("form-text")
-                .removeClass("text-muted");
+                .removeClass("text-body-secondary");
 
             self.initListeners();
         },
@@ -57,22 +57,40 @@
                         .parent()
                         .parent()
                         .find('.password_strength_offline_info');
+                    let password_improvement_hint = $(password_strength_info)
+                        .find('.password_improvement_hint');
 
                     if ($(this)
                         .val()) {
                         var result = zxcvbn($(this)
                             .val());
-
-                        if (result.score < 3) {
-                            password_strength_bar.removeClass('bg-success')
-                                .addClass('bg-warning');
-                            password_strength_info.find('.badge')
-                                .removeClass('d-none');
+                        const enforceStrength = !('disableStrengthEnforcement' in this.dataset);
+                        const strongEnough = !enforceStrength || (result.score >= 3);
+                        if (strongEnough) {
+                            // Mark input as valid
+                            this.setCustomValidity('');
                         } else {
-                            password_strength_bar.removeClass('bg-warning')
-                                .addClass('bg-success');
+                            // Mark input as invalid
+                            this.setCustomValidity('This password does not meet complexity requirements');
+                        }
+                        
+                        if (this.checkValidity()) {
+                            password_strength_bar.removeClass('text-bg-warning')
+                                .addClass('text-bg-success');
                             password_strength_info.find('.badge')
                                 .addClass('d-none');
+                            this.classList.remove('is-invalid')
+                            password_improvement_hint.addClass('d-none');
+                            password_improvement_hint.text('')
+                        } else {
+                            this.classList.add('is-invalid')
+                            password_improvement_hint.text(this.validationMessage)
+                            password_improvement_hint.removeClass('d-none');
+
+                            password_strength_bar.removeClass('text-bg-success')
+                                .addClass('text-bg-warning');
+                            password_strength_info.find('.badge')
+                                .removeClass('d-none');
                         }
 
                         password_strength_bar.width(((result.score + 1) / 5) * 100 + '%')
@@ -86,8 +104,8 @@
                             .html(result.crack_times_display.offline_slow_hashing_1e4_per_second);
                         password_strength_offline_info.removeClass('d-none');
                     } else {
-                        password_strength_bar.removeClass('bg-success')
-                            .addClass('bg-warning');
+                        password_strength_bar.removeClass('text-bg-success')
+                            .addClass('text-bg-warning');
                         password_strength_bar.width('0%')
                             .attr('aria-valuenow', 0);
                         password_strength_info.addClass('d-none');
@@ -152,23 +170,31 @@
                     .data('confirm-with');
 
                 if (confirm_with && confirm_with == password_field.attr('id')) {
-                    if (confirm_value && password) {
+                    if (password) {
                         if (confirm_value === password) {
                             $(confirm_field)
                                 .parent()
                                 .find('.password_strength_info')
                                 .addClass('d-none');
+                            confirm_field.setCustomValidity('')
+                            confirm_field.classList.remove('is-invalid')
                         } else {
-                            $(confirm_field)
-                                .parent()
-                                .find('.password_strength_info')
-                                .removeClass('d-none');
+                            if (confirm_value !== '') {
+                                $(confirm_field)
+                                    .parent()
+                                    .find('.password_strength_info')
+                                    .removeClass('d-none');
+                            }
+                            confirm_field.setCustomValidity('Does not match new password')
+                            confirm_field.classList.add('is-invalid')
                         }
                     } else {
                         $(confirm_field)
                             .parent()
                             .find('.password_strength_info')
                             .addClass('d-none');
+                        confirm_field.setCustomValidity('')
+                        confirm_field.classList.remove('is-invalid')
                     }
                 }
             });
@@ -186,4 +212,4 @@
     // Call the init for backwards compatibility
     djangoPasswordStrength.init();
 
-})(jQuery, window, document);
\ No newline at end of file
+})(jQuery, window, document);
diff --git a/ietf/static/js/room_params.js b/ietf/static/js/room_params.js
deleted file mode 100644
index ef32c2fa0d..0000000000
--- a/ietf/static/js/room_params.js
+++ /dev/null
@@ -1,188 +0,0 @@
-var verbose = 0;
-
-// Given a name like "foo-ab" or "foo-X-and-Y", change it to the "list-of-room-names" format, "foo-a/foo-b".
-window.suffixmap = function (nm) {
-    var andsuffix = /^(.*-)([^-]+)-and-(.*)$/;
-    var andMatch = andsuffix.exec(nm);
-    if (andMatch && andMatch[0] != '') {
-        nm = andMatch[1] + andMatch[2] + "-" + andMatch[3];
-    }
-    // xyz-a/b/c => xyz-a/xyz-b/xyz-c
-    var abcsuffix = /^(.*)-([a-h0-9]+)[-/]([a-h0-9]+)([-/][a-h0-9]+)?$/;
-    var suffixMatch = abcsuffix.exec(nm);
-    // if (verbose) console.log("nm=" + nm);
-    if (suffixMatch && suffixMatch[0] != '') {
-        // if (verbose) console.log("matched");
-        nm = suffixMatch[1] + "-" + suffixMatch[2] + "/" +
-            suffixMatch[1] + "-" + suffixMatch[3];
-        // if (verbose) console.log("nm=>" + nm);
-        if (suffixMatch[4] && suffixMatch[4] != '')
-            nm += "/" + suffixMatch[1] + "-" + suffixMatch[4];
-        // if (verbose) console.log("nm=>" + nm);
-    }
-    // xyz-abc => xyz-a/xyz-b/xyz-c
-    abcsuffix = /^(.*)-([a-h])([a-h]+)([a-h])?$/;
-    var suffixMatch = abcsuffix.exec(nm);
-    if (suffixMatch && suffixMatch[0] != '') {
-        nm = suffixMatch[1] + "-" + suffixMatch[2] + "/" +
-            suffixMatch[1] + "-" + suffixMatch[3];
-        if (suffixMatch[4] && suffixMatch[4] != '')
-            nm += "/" + suffixMatch[1] + "-" + suffixMatch[4];
-    }
-    // if (verbose) console.log("suffixmap returning: " + nm);
-    return nm;
-};
-
-// Find the coordinates of a room or list of room names separated by "/".
-// Calls the function findroom() to get the coordinates for a specific room.
-window.roomcoords = function (nm) {
-    if (!nm) return null;
-
-    if (nm.match("/")) {
-        var nms = nm.split("/");
-        var nm0 = findroom(nms[0]);
-        if (!nm0) return null;
-        for (var i = 1; i < nms.length; i++) {
-            var nmi = roomcoords(nms[i]);
-            if (!nmi) return null;
-            if (nmi[0] < nm0[0]) nm0[0] = nmi[0];
-            if (nmi[1] < nm0[1]) nm0[1] = nmi[1];
-            if (nmi[2] > nm0[2]) nm0[2] = nmi[2];
-            if (nmi[3] > nm0[3]) nm0[3] = nmi[3];
-        }
-        return [nm0[0], nm0[1], nm0[2], nm0[3], nm0[4], nm0[5]];
-    } else {
-        return findroom(nm);
-    }
-};
-
-// Place an arrow at the center of a given room name (or list of room names separated by "/").
-window.setarrow = function (nm) {
-    for (var f = 0; f < floorlist.length; f++) {
-        floor = floorlist[f];
-        for (var i = 0; i < arrowsuffixlist.length; i++) {
-            removearrow(arrowsuffixlist[i], floor);
-        }
-    }
-
-    for (i = 0; i < arguments.length; i += 2) {
-        nm = roommap(arguments[i]);
-        // if (verbose) console.log("nm=" + nm);
-        var rooms = nm.split(/[|]/);
-        for (var j = 0; j < rooms.length; j++) {
-            var room = rooms[j];
-            var ret = roomcoords(room);
-            // if (verbose) console.log("roomcoords returned: " + ret);
-            if (!ret) continue;
-
-            var left = ret[0],
-                top = ret[1],
-                right = ret[2],
-                bottom = ret[3],
-                floor = ret[4],
-                width = ret[5],
-                offsetleft = -25,
-                offsettop = -25;
-            // if (verbose) console.log("left=" + left + ", top=" + top + ", right=" + right + ", bottom=" + bottom + ", floor=" + floor + ", width=" + width);
-            // calculate arrow position
-            var arrow_left = (left + (right - left) / 2);
-            var arrow_top = (top + (bottom - top) / 2);
-            // scale the coordinates to match image scaling
-            // if (verbose) console.log(floor + "-image");
-            var img = document.getElementById(floor + "-image");
-            var scale = img.width / width;
-            arrow_left = arrow_left * scale;
-            arrow_top = arrow_top * scale;
-            var arrowdiv = floor + '-arrowdiv' + j;
-            // if (verbose) console.log("arrowdiv: " + arrowdiv);
-            var adiv = document.getElementById(arrowdiv);
-            if (adiv) {
-                adiv.style.left = arrow_left + offsetleft + "px";
-                adiv.style.top = arrow_top + offsettop + "px";
-                adiv.hidden = false;
-                window.location.hash = floor;
-                const url = new URL(location.href);
-                url.searchParams.set('room', nm);
-                history.pushState(null, '', url);
-            }
-        }
-    }
-};
-
-window.removearrow = function (which, fl) {
-    for (var i = 0; i < arguments.length; i++) {
-        which = arguments[i];
-        var arrowdiv = fl + '-arrowdiv' + (which ? which : "");
-        var adiv = document.getElementById(arrowdiv);
-        // if (verbose) console.log("looking for '" + arrowdiv + "'");
-        if (adiv) {
-            // if (verbose) console.log("adiv found");
-            adiv.style.left = -500;
-            adiv.style.top = -500;
-            adiv.hidden = true;
-        }
-    }
-};
-
-window.setarrowlist = function (which, names) {
-    for (var i = 1; i < arguments.length; i++) {
-        setarrow(arguments[i], which);
-    }
-};
-
-// Create a QueryString object
-window.QueryString = function () {
-    // get the query string, ignore the ? at the front.
-    var querystring = location.search.substring(1);
-
-    // parse out name/value pairs separated via &
-    var args = querystring.split('&');
-
-    // split out each name = value pair
-    for (var i = 0; i < args.length; i++) {
-        var pair = args[i].split('=');
-
-        // Fix broken unescaping
-        var temp = unescape(pair[0])
-            .split('+');
-        var name_ = temp.join(' ');
-
-        var value_ = '';
-        if (typeof pair[1] == 'string') {
-            temp = unescape(pair[1])
-                .split('+');
-            value_ = temp.join(' ');
-        }
-
-        this[name_] = value_;
-    }
-
-    this.get = function (nm, def) {
-        var value_ = this[nm];
-        if (value_ == null) return def;
-        else return value_;
-    };
-};
-
-// Check the parameters for one named "room". If found, call setarrow(room).
-window.checkParams = function () {
-    var querystring = new QueryString();
-    var room = querystring.get("room");
-    if (room && room != "") setarrow(room);
-};
-
-// new functions
-window.located = function (loc) {
-    if (loc.civic && loc.civic.ROOM) {
-        // map from "TerminalRoom" to "terminal-room" as necessary.
-        setarrow(loc.civic.ROOM.replace(/([a-z])([A-Z])/g, '$1-$2')
-            .toLowerCase(), "-green");
-    }
-};
-
-// this needs to be called onload
-window.automaticarrow = function () {
-    //   if (navigator.geolocation) {
-    //      navigator.geolocation.getCurrentPosition(located);
-    //   }
-};
diff --git a/ietf/static/js/select2.js b/ietf/static/js/select2.js
index 5e282e6f87..153a11a10e 100644
--- a/ietf/static/js/select2.js
+++ b/ietf/static/js/select2.js
@@ -19,6 +19,24 @@ function prettify_tz(x) {
     return x.text.replaceAll("_", " ").replaceAll("/", " / ");
 }
 
+function search_template_result(data) {
+    if (data.url == null) {
+        return data.text;
+    }
+    var $link = $("<a>" + data.text + "</a>");
+    $link.prop("href", data.url);
+    $link.on("mouseup", function (evt) {
+        // Do not propagate any events which have modifiers keys
+        // or if some other mouse button than 1 (left) was used.
+        if (evt.shiftKey || evt.ctrlKey || evt.metaKey || evt.altKey ||
+            evt.which != 1) {
+            evt.stopPropagation();
+        }
+    });
+
+    return $link;
+}
+
 // Copyright The IETF Trust 2015-2021, All Rights Reserved
 // JS for ietf.utils.fields.SearchableField subclasses
 window.setupSelect2Field = function (e) {
@@ -37,7 +55,21 @@ window.setupSelect2Field = function (e) {
         );
     }
 
-    template_modify = e.hasClass("tz-select") ? prettify_tz : undefined;
+    template_modify = e.hasClass("tz-select") ? prettify_tz :
+	(e.hasClass("search-select") ? search_template_result : undefined);
+
+    // focus the search field automatically
+    $(document)
+        .on("select2:open", () => {
+            document.querySelector(
+                    ".select2-container--open .select2-search__field")
+                .focus()
+        });
+
+    // Remove spurious title attribute (https://github.com/select2/select2/pull/3988)
+    $(document)
+        .on("mouseenter", ".select2-selection__rendered", function () { $(this)
+                .removeAttr("title"); });
 
     e.select2({
         multiple: maxEntries !== 1,
diff --git a/ietf/static/js/session_details.js b/ietf/static/js/session_details.js
new file mode 100644
index 0000000000..03d1b2d3d9
--- /dev/null
+++ b/ietf/static/js/session_details.js
@@ -0,0 +1,53 @@
+// Copyright The IETF Trust 2026, All Rights Reserved
+// Relies on other scripts being loaded, see usage in session_details.html
+document.addEventListener('DOMContentLoaded', () => {
+    // Init with best guess at local timezone.
+    ietf_timezone.set_tz_change_callback(timezone_changed) // cb is in upcoming.js
+    ietf_timezone.initialize('local')
+
+    // Set up sortable elements if the user can manage materials
+    if (document.getElementById('can-manage-materials-flag')) {
+        const sortables = []
+        const options = {
+            group: 'slides',
+            animation: 150,
+            handle: '.drag-handle',
+            onAdd: function (event) {onAdd(event)},
+            onRemove: function (event) {onRemove(event)},
+            onEnd: function (event) {onEnd(event)}
+        }
+
+        function onAdd (event) {
+            const old_session = event.from.getAttribute('data-session')
+            const new_session = event.to.getAttribute('data-session')
+            $.post(event.to.getAttribute('data-add-to-session'), {
+                'order': event.newIndex + 1,
+                'name': event.item.getAttribute('name')
+            })
+            $(event.item).find('td:eq(1)').find('a').each(function () {
+                $(this).attr('href', $(this).attr('href').replace(old_session, new_session))
+            })
+        }
+
+        function onRemove (event) {
+            const old_session = event.from.getAttribute('data-session')
+            $.post(event.from.getAttribute('data-remove-from-session'), {
+                'oldIndex': event.oldIndex + 1,
+                'name': event.item.getAttribute('name')
+            })
+        }
+
+        function onEnd (event) {
+            if (event.to == event.from) {
+                $.post(event.from.getAttribute('data-reorder-in-session'), {
+                    'oldIndex': event.oldIndex + 1,
+                    'newIndex': event.newIndex + 1
+                })
+            }
+        }
+
+        for (const elt of document.querySelectorAll('.slides tbody')) {
+            sortables.push(Sortable.create(elt, options))
+        }
+    }
+})
diff --git a/ietf/static/js/session_details_form.js b/ietf/static/js/session_details_form.js
index 84dbc51736..04b11875a7 100644
--- a/ietf/static/js/session_details_form.js
+++ b/ietf/static/js/session_details_form.js
@@ -55,9 +55,19 @@
 
     function update_name_field_visibility(name_elts, purpose) {
         if (!purpose || purpose === 'regular') {
-            name_elts.forEach(e => e.closest('.form-group').classList.add('hidden'));
+            name_elts.forEach(e => {
+                const formGroup = e.closest('.form-group');
+                if (formGroup) {
+                    formGroup.classList.add('hidden');
+                }
+            });
         } else {
-            name_elts.forEach(e => e.closest('.form-group').classList.remove('hidden'));
+            name_elts.forEach(e => {
+                const formGroup = e.closest('.form-group');
+                if (formGroup) {
+                    formGroup.classList.remove('hidden');
+                }
+            });
         }
     }
 
@@ -113,4 +123,4 @@
         }
     }
     window.addEventListener('load', on_load, false);
-})();
\ No newline at end of file
+})();
diff --git a/ietf/secr/static/js/session_form.js b/ietf/static/js/session_form.js
similarity index 92%
rename from ietf/secr/static/js/session_form.js
rename to ietf/static/js/session_form.js
index 6f28f16db4..bd61293d7c 100644
--- a/ietf/secr/static/js/session_form.js
+++ b/ietf/static/js/session_form.js
@@ -1,4 +1,4 @@
-/* Copyright The IETF Trust 2021, All Rights Reserved
+/* Copyright The IETF Trust 2021-2025, All Rights Reserved
  *
  * JS support for the SessionForm
  * */
diff --git a/ietf/static/js/session_request.js b/ietf/static/js/session_request.js
new file mode 100644
index 0000000000..dfb169f675
--- /dev/null
+++ b/ietf/static/js/session_request.js
@@ -0,0 +1,167 @@
+// Copyright The IETF Trust 2015-2025, All Rights Reserved
+/* global alert */
+var ietf_sessions; // public interface
+
+(function() {
+  'use strict';
+
+  function get_formset_management_data(prefix) {
+    return {
+      total_forms: document.getElementById('id_' + prefix + '-TOTAL_FORMS').value,
+    };
+  }
+
+  function update_session_form_visibility(session_num, is_visible) {
+    const elt = document.getElementById('session_row_' + session_num);
+    if (elt) {
+      elt.hidden = !is_visible;
+      elt.querySelector('[name$="DELETE"]').value = is_visible ? '' : 'on';
+    }
+  }
+
+  function have_additional_session() {
+    const elt = document.getElementById('id_third_session');
+    return elt && elt.checked;
+  }
+
+  function update_for_num_sessions(val) {
+    const total_forms = get_formset_management_data('session_set').total_forms;
+    val = Number(val);
+    if (have_additional_session()) {
+      val++;
+    }
+
+    for (let i=0; i < total_forms; i++) {
+      update_session_form_visibility(i, i < val);
+    }
+
+    const only_one_session = (val === 1);
+    if (document.form_post.session_time_relation) {
+      document.form_post.session_time_relation.disabled = only_one_session;
+      document.form_post.session_time_relation.closest('div.row').hidden = only_one_session;
+    }
+    if (document.form_post.joint_for_session) {
+      document.form_post.joint_for_session.disabled = only_one_session;
+    }
+    const third_session_row = document.getElementById('third_session_row');
+    if (third_session_row) {
+      third_session_row.hidden = val < 2;
+    }
+  }
+
+  function delete_last_joint_with_groups () {
+    var b = document.form_post.joint_with_groups.value;
+    var temp = b.split(' ');
+    temp.pop();
+    b = temp.join(' ');
+    document.form_post.joint_with_groups.value = b;
+    document.form_post.joint_with_groups_selector.selectedIndex=0;
+  }
+
+/*******************************************************************/
+// WG constraint UI support
+
+// get the constraint field element for a given slug
+  function constraint_field(slug) {
+    return document.getElementById('id_constraint_' + slug);
+  }
+
+// get the wg selection element for a given slug
+  function constraint_selector(slug) {
+    return document.getElementById('id_wg_selector_' + slug);
+  }
+
+  /**
+   * Handler for constraint select input 'change' event
+   */
+  function wg_constraint_selector_changed() {
+    let slug = this.getAttribute('data-slug');
+    let cfield = constraint_field(slug);
+    // add selected value to constraint_field
+    cfield.value += ' ' + this.options[this.selectedIndex].value;
+  }
+
+  /**
+   * Remove the last group in a WG constraint field
+   *
+   * @param slug ConstraintName slug
+   */
+  function delete_last_wg_constraint(slug) {
+    let cfield = constraint_field(slug);
+    if (cfield) {
+      var b = cfield.value;
+      var temp = b.split(' ');
+      temp.pop();
+      b = temp.join(' ');
+      cfield.value = b;
+      constraint_selector(slug).selectedIndex = 0;
+    }
+  }
+
+  /**
+   * Handle click event on a WG constraint's delete button
+   *
+   * @param slug ConstraintName slug
+   */
+  function delete_wg_constraint_clicked(slug) {
+    delete_last_wg_constraint(slug);
+  }
+
+  /**
+   * Handler for the change event on the session count select or 'third session' checkbox
+   */
+  function handle_num_session_change(event) {
+    const num_select_value = Number(event.target.value);
+    if (num_select_value !== 2) {
+      if (document.form_post.third_session) {
+        document.form_post.third_session.checked = false;
+      }
+    }
+    update_for_num_sessions(num_select_value);
+  }
+
+  function handle_third_session_change(event) {
+    const num_select_value = Number(document.getElementById('id_num_session').value);
+    if (num_select_value === 2) {
+      update_for_num_sessions(num_select_value);
+    } else {
+      event.target.checked = false;
+    }
+  }
+
+  function wg_constraint_delete_clicked(event) {
+    const constraint_name = event.currentTarget.dataset.constraint_name;
+    delete_last_wg_constraint(constraint_name);
+  }
+
+  /* Initialization */
+  function on_load() {
+    // Attach event handler to session count select
+    const num_session_select = document.getElementById('id_num_session');
+    num_session_select.addEventListener('change', handle_num_session_change);
+    const third_session_input = document.getElementById('id_third_session');
+    if (third_session_input) {
+      third_session_input.addEventListener('change', handle_third_session_change);
+    }
+    update_for_num_sessions(num_session_select.value);
+
+    // Attach event handlers to constraint selectors
+    let selectors = document.getElementsByClassName('wg_constraint_selector');
+    for (let index = 0; index < selectors.length; index++) {
+      selectors[index].addEventListener('change', wg_constraint_selector_changed, false)
+    }
+
+    // Attach event handler to constraint delete buttons
+    document.querySelectorAll('.wg_constraint_delete')
+      .forEach(btn => btn.addEventListener('click', wg_constraint_delete_clicked));
+  }
+
+  // initialize after page loads
+  window.addEventListener('load', on_load, false);
+
+  // expose public interface methods
+  ietf_sessions = {
+    delete_last_joint_with_groups: delete_last_joint_with_groups,
+    delete_wg_constraint_clicked: delete_wg_constraint_clicked
+  }
+})();
\ No newline at end of file
diff --git a/ietf/static/js/status-change-edit-relations.js b/ietf/static/js/status-change-edit-relations.js
index c5dd44b675..53547eec5e 100644
--- a/ietf/static/js/status-change-edit-relations.js
+++ b/ietf/static/js/status-change-edit-relations.js
@@ -14,12 +14,12 @@ $(document)
                 .remove();
         });
 
-        form.on("keydown", ".new-relation-row input[type=text]", function () {
+        form.on("keydown change", ".new-relation-row select", function () {
             var top = $(this)
                 .closest(".new-relation-row");
             top.removeClass("new-relation-row");
             top.find(".delete")
-                .prop('Disabled', false)
+                .prop('disabled', false)
                 .removeClass("btn-outline-danger")
                 .addClass("btn-danger");
             top.find("input,select")
@@ -28,5 +28,6 @@ $(document)
                 });
             ++counter;
             top.after(newRowHtml);
+            setupSelect2Field(form.find(".new-relation-row .select2-field"));
         });
-    });
\ No newline at end of file
+    });
diff --git a/ietf/static/js/theme.js b/ietf/static/js/theme.js
new file mode 100644
index 0000000000..d10a472569
--- /dev/null
+++ b/ietf/static/js/theme.js
@@ -0,0 +1,93 @@
+/*!
+ * Color mode toggler for Bootstrap's docs (https://getbootstrap.com/)
+ * Copyright 2011-2023 The Bootstrap Authors
+ * Licensed under the Creative Commons Attribution 3.0 Unported License.
+ *
+ * Based on the below, with some changes for the datatracker:
+ * https://github.com/twbs/bootstrap/blob/main/site/static/docs/5.3/assets/js/color-modes.js
+ */
+
+(() => {
+  'use strict'
+
+  const getStoredTheme = () => localStorage.getItem('theme') || 'auto'
+  const setStoredTheme = theme => localStorage.setItem('theme', theme)
+
+  const getPreferredTheme = () => {
+    const storedTheme = getStoredTheme()
+    if (storedTheme) {
+      return storedTheme
+    }
+
+    return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+  }
+
+  const setTheme = theme => {
+    if (theme === 'auto') {
+        if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+          document.documentElement.setAttribute('data-bs-theme', 'dark')
+        } else if (window.matchMedia('(prefers-color-scheme: light)').matches) {
+          document.documentElement.setAttribute('data-bs-theme', 'light')
+        }
+    } else {
+      document.documentElement.setAttribute('data-bs-theme', theme)
+    }
+  }
+
+  setTheme(getPreferredTheme())
+
+  const showActiveTheme = (theme, focus = false) => {
+    const themeSwitcher = document.querySelector('#bd-theme')
+
+    if (!themeSwitcher) {
+      return
+    }
+
+    // Commented-out lines are from the original bs5 js, which uses a more complicated pref dropdown.
+    // Kept them here for easier future diffing.
+    const themeSwitcherText = document.querySelector('#bd-theme-text')
+    const activeThemeIcon = document.querySelector('.theme-icon-active')
+    const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
+    const iconPattern = new RegExp(/\bbi-[\w-]+\b/);
+    const iconOfActiveBtn = btnToActive.querySelector('i').className.match(iconPattern)[0]
+
+    document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
+      element.classList.remove('active')
+      element.setAttribute('aria-pressed', 'false')
+    })
+
+    btnToActive.classList.add('active')
+    btnToActive.setAttribute('aria-pressed', 'true')
+    if (activeThemeIcon) {
+        activeThemeIcon.className = activeThemeIcon.className.replace(iconPattern, iconOfActiveBtn)
+    }
+    if (themeSwitcherText) {
+        const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})`
+        themeSwitcher.setAttribute('aria-label', themeSwitcherLabel)
+    }
+    if (focus) {
+      themeSwitcher.focus()
+    }
+  }
+
+  window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
+    const storedTheme = getStoredTheme()
+    if (storedTheme !== 'light' && storedTheme !== 'dark') {
+      setTheme(getPreferredTheme())
+    }
+  })
+
+  window.addEventListener('DOMContentLoaded', () => {
+    showActiveTheme(getPreferredTheme())
+
+    document.querySelectorAll('[data-bs-theme-value]')
+      .forEach(toggle => {
+        toggle.addEventListener('click', () => {
+          const theme = toggle.getAttribute('data-bs-theme-value')
+          setStoredTheme(theme)
+          setTheme(theme)
+          showActiveTheme(theme, true)
+        })
+      })
+  })
+})()
diff --git a/ietf/static/js/upcoming.js b/ietf/static/js/upcoming.js
index 1eb2a46352..9ab5821c04 100644
--- a/ietf/static/js/upcoming.js
+++ b/ietf/static/js/upcoming.js
@@ -3,6 +3,12 @@ var display_events = []; // filtered events, processed for calendar display
 var event_calendar; // handle on the calendar object
 var current_tz = 'UTC';
 
+const primary = getComputedStyle(document.body)
+    .getPropertyValue('--bs-primary');
+const secondary = getComputedStyle(document.body)
+    .getPropertyValue('--bs-secondary');
+
+
 // Test whether an event should be visible given a set of filter parameters
 function calendar_event_visible(filter_params, event) {
     // Visible if filtering is disabled or event has no keywords
@@ -28,7 +34,7 @@ function filter_calendar_events(filter_params, event_list) {
 }
 
 // format a moment in a tz
-var moment_formats = { time: 'HH:mm', date: 'YYYY-MM-DD', datetime: 'YYYY-MM-DD HH:mm' };
+var moment_formats = { time: 'HH:mm', date: 'YYYY-MM-DD', datetime: 'YYYY-MM-DD HH:mm' , timezone: 'z'};
 
 function format_moment(t_moment, tz, fmt_type) {
     return t_moment.tz(tz)
@@ -37,6 +43,9 @@ function format_moment(t_moment, tz, fmt_type) {
 
 function make_display_events(event_data, tz) {
     var calendarEl = document.getElementById('calendar');
+    if (!calendarEl) {
+        return;
+    }
     var glue = calendarEl.clientWidth > 720 ? ' ' : '\n';
     return $.map(event_data, function (src_event) {
         var title;
@@ -49,10 +58,14 @@ function make_display_events(event_data, tz) {
                 glue + (src_event.group || 'Invalid event'));
         }
         return {
-            title: title,
+            title: src_event.current_status != "canceled" ? title : `<del>${title}</del>`,
+            extendedProps: {
+                desc: src_event.current_status != "canceled" ? title : `CANCELLED: ${title}`
+            },
             start: format_moment(src_event.start_moment, tz, 'datetime'),
             end: format_moment(src_event.end_moment, tz, 'datetime'),
-            url: src_event.url
+            url: src_event.url,
+            backgroundColor: src_event.current_status != "canceled" ? primary: secondary
         }; // all events have the URL
     });
 }
@@ -73,14 +86,21 @@ function update_calendar(tz, filter_params) {
          * filtered events.
          */
         var calendarEl = document.getElementById('calendar');
+        if (!calendarEl) {
+            return;
+        }
         event_calendar = new FullCalendar(calendarEl, {
-            plugins: [dayGridPlugin],
+            plugins: [dayGridPlugin, bootstrap5Plugin],
             initialView: 'dayGridMonth',
+            themeSystem: 'bootstrap5',
             displayEventTime: false,
             events: function (fInfo, success) { success(display_events); },
+            eventContent: function(info) {
+                return {html: info.event.title};
+            },
             eventDidMount: function (info) {
                 $(info.el)
-                    .tooltip({ title: info.event.title });
+                    .tooltip({ title: info.event.extendedProps.desc });
             },
             eventDisplay: 'block'
         });
@@ -122,7 +142,7 @@ function format_session_time(session_elt, tz) {
         .attr('data-start-utc'));
     var end = moment.utc($(session_elt)
         .attr('data-end-utc'));
-    return format_moment(start, tz, 'datetime') + '-' + format_moment(end, tz, 'time');
+    return format_moment(start, tz, 'datetime') + '-' + format_moment(end, tz, 'time') + ' ' + format_moment(start, tz, 'timezone');
 }
 
 function format_meeting_time(meeting_elt, tz) {
@@ -158,4 +178,4 @@ window.timezone_changed = function (newtz) {
     }
 
     update_calendar(newtz);
-};
\ No newline at end of file
+};
diff --git a/ietf/static/js/upload-session-agenda.js b/ietf/static/js/upload-session-agenda.js
new file mode 100644
index 0000000000..b63d460ed8
--- /dev/null
+++ b/ietf/static/js/upload-session-agenda.js
@@ -0,0 +1,28 @@
+$(document)
+    .ready(function () {
+        var form = $("form.my-3");
+
+        // review submission selection
+        form.find("[name=submission_method]")
+            .on("click change", function () {
+                var val = form.find("[name=submission_method]:checked")
+                    .val();
+
+                var shouldBeVisible = {
+                    upload: ['[name="file"]'],
+                    enter: ['[name="content"]']
+                };
+
+                for (var v in shouldBeVisible) {
+                    for (var i in shouldBeVisible[v]) {
+                        var selector = shouldBeVisible[v][i];
+                        var row = form.find(selector).parent();
+                        if ($.inArray(selector, shouldBeVisible[val]) != -1)
+                            row.show();
+                        else
+                            row.hide();
+                    }
+                }
+            })
+            .trigger("change");
+    });
\ No newline at end of file
diff --git a/ietf/static/js/upload_statement.js b/ietf/static/js/upload_statement.js
new file mode 100644
index 0000000000..7e8a4e8643
--- /dev/null
+++ b/ietf/static/js/upload_statement.js
@@ -0,0 +1,29 @@
+$(document)
+    .ready(function () {
+        var form = $("form.upload-content");
+        // review submission selection
+        form.find("[name=statement_submission]")
+            .on("click change", function () {
+                var val = form.find("[name=statement_submission]:checked")
+                    .val();
+
+                var shouldBeVisible = {
+                    enter: ['[name="statement_content"]'],
+                    upload: ['[name="statement_file"]'],
+                };
+
+                for (var v in shouldBeVisible) {
+                    for (var i in shouldBeVisible[v]) {
+                        var selector = shouldBeVisible[v][i];
+                        var row = form.find(selector);
+                        if (!row.is(".row"))
+                            row = row.closest(".row");
+                        if ($.inArray(selector, shouldBeVisible[val]) != -1)
+                            row.show();
+                        else
+                            row.hide();
+                    }
+                }
+            })
+            .trigger("change");
+    });
diff --git a/ietf/static/js/week-view.js b/ietf/static/js/week-view.js
deleted file mode 100644
index b9fb80ee1a..0000000000
--- a/ietf/static/js/week-view.js
+++ /dev/null
@@ -1,637 +0,0 @@
-var color = {
-    'app': { fg: "#008", bg: "#eef" },
-    'art': { fg: "#808", bg: "#fef" },
-    'gen': { fg: "#080", bg: "#efe" },
-    'int': { fg: "#088", bg: "#eff" },
-    'ops': { fg: "#800", bg: "#fee" },
-    'rai': { fg: "#808", bg: "#fef" },
-    'rtg': { fg: "#880", bg: "#ffe" },
-    'sec': { fg: "#488", bg: "#dff" },
-    'tsv': { fg: "#484", bg: "#dfd" },
-    'irtf': { fg: "#448", bg: "#ddf" },
-    'break': { fg: "#000", bg: "#fff" },
-}
-
-var day = [
-    'Saturday',
-    'Sunday',
-    'Monday',
-    'Tuesday',
-    'Wednesday',
-    'Thursday',
-    'Friday'
-];
-
-var padding = 2;
-var border = 1;
-
-//===========================================================================
-function compute_swimlanes(items) {
-    var start_map = items.map(function (el, i) {
-        return { day: parseInt(el.day, 10), start_time: el.start_time, index: i };
-    });
-
-    start_map.sort(function (a, b) {
-        if (a.day != b.day) { return (a.day - b.day); }
-        return (a.start_time - b.start_time);
-    });
-
-    var end_map = items.map(function (el, i) {
-        return { day: parseInt(el.day, 10), end_time: el.end_time, index: i };
-    });
-
-    end_map.sort(function (a, b) {
-        if (a.day != b.day) { return (a.day - b.day); }
-        return (a.end_time - b.end_time);
-    });
-
-    var si = 0; // start index
-    var ei = 0; // end index
-    var overlap = 0;
-    var max_lanes = 0;
-    var next_lane = [];
-
-    var start_overlap = si;
-    while (si < items.length) {
-        var start_day_change = false;
-        while (!start_day_change &&
-            si < items.length &&
-            start_map[si].start_time < end_map[ei].end_time) {
-            overlap++;
-            // Set item.lane - the lane in which it is located (cf. item.lanes)
-            if (next_lane.length > 0) {
-                items[start_map[si].index].lane = next_lane.shift();
-            } else {
-                items[start_map[si].index].lane = max_lanes;
-                max_lanes++;
-            }
-            start_day_change = (si + 1 == items.length ||
-                start_map[si].day != start_map[si + 1].day);
-            si++;
-        }
-        var end_day_change = false;
-        while (ei < items.length &&
-            !end_day_change &&
-            (start_day_change ||
-                si == items.length ||
-                start_map[si].start_time >= end_map[ei].end_time)) {
-            next_lane.push(items[end_map[ei].index].lane);
-            overlap--;
-            end_day_change = (ei + 1 == items.length ||
-                end_map[ei].day != end_map[ei + 1].day);
-            ei++;
-        }
-        if (overlap == 0) {
-            // set item.lanes - the number of lanes it covers when expanded (cf. item.lane)
-            for (var i = start_overlap; i < si; i++) {
-                items[start_map[i].index].lanes = max_lanes;
-            }
-            max_lanes = 0;
-            next_lane = [];
-            start_overlap = si;
-        }
-    }
-}
-
-//===========================================================================
-
-function is_visible(filter_params) {
-    // Returns a method to filter objects for visibility
-    // Accepts show and hide filters. No longer accepts
-    // '@<state>' to show sessions in a particular state (e.g., @bof).
-    return function (item) {
-        var filter_keywords = item.filter_keywords.split(',');
-        return (!agenda_filter.keyword_match(filter_keywords, filter_params.hide) &&
-            agenda_filter.keyword_match(filter_keywords, filter_params.show));
-    }
-}
-
-//===========================================================================
-
-window.draw_calendar = function (items, filter_params) {
-    var width = document.body.clientWidth;
-    var height = document.body.clientHeight;
-
-    var visible_items = items;
-    if (agenda_filter.filtering_is_enabled(filter_params)) {
-        visible_items = visible_items.filter(is_visible(filter_params));
-    }
-
-    var start_day;
-    var day_start;
-    if (visible_items.length > 0) {
-        start_day = visible_items[0].day;
-        day_start = visible_items[0].start_time;
-    } else {
-        // fallback in case all items were filtered
-        start_day = items[0].day;
-        day_start = items[0].start_time;
-    }
-    var end_day = start_day;
-    var day_end = 0;
-
-    compute_swimlanes(visible_items);
-
-    /* Find our boundaries */
-    visible_items.forEach(function (item) {
-        day_start = Math.min(day_start, item.start_time);
-        day_end = Math.max(day_end, item.end_time);
-        start_day = Math.min(start_day, item.day)
-        end_day = Math.max(start_day, item.day)
-    });
-
-    var header_height = height * 0.05;
-
-    var num_days = end_day - start_day + 1;
-    var num_minutes = day_end - day_start;
-    var day_width = width / num_days;
-    var minute_height = (height - header_height) / num_minutes;
-
-    while (document.body.firstChild) {
-        document.body.removeChild(document.body.firstChild);
-    }
-
-    var j = start_day;
-    for (var i = 0; i < num_days; i++) {
-        //-----------------------------------------------------------------
-        // Draw weekday name
-        //-----------------------------------------------------------------
-        var e = document.createElement("div");
-
-        e.style.border = "solid";
-        e.style.borderWidth = border;
-
-        e.style.background = "#2647a0";
-        e.style.color = "#fff";
-        e.style.borderColor = "#000 #fff";
-        e.style.borderColor = "#2647a0 #2647a0 #000 #2647a0";
-
-        e.style.display = "block";
-        e.style.overflow = "hidden";
-        e.style.position = "absolute";
-
-        e.style.top = 0;
-        e.style.left = i * day_width;
-        e.style.width = day_width - 2 * (padding + border);
-        e.style.height = header_height;
-
-        e.style.margin = 0;
-        e.style.padding = padding;
-        e.style.fontFamily = "sans-serif";
-        e.style.fontSize = header_height * 0.6;
-
-        e.style.textAlign = "center";
-
-        e.classList.add('agenda-weekview-day'); // for cypress tests
-
-        var div = document.createElement("div");
-        div.appendChild(document.createTextNode(day[((j + 1) % 7 + 7) % 7])); // js % is remainder, not modulus
-        j++;
-        e.appendChild(div);
-        document.body.appendChild(e);
-
-        //-----------------------------------------------------------------
-        // Draw weekday column border
-        //-----------------------------------------------------------------
-        e = document.createElement("div");
-
-        e.style.border = "solid";
-        e.style.borderWidth = border;
-
-        e.style.background = "#fff";
-        e.style.color = "#000";
-        e.style.borderColor = "#fff #000";
-
-        e.style.display = "block";
-        e.style.overflow = "hidden";
-        e.style.position = "absolute";
-
-        e.style.top = header_height;
-        e.style.left = i * day_width;
-        e.style.width = day_width - 2 * (padding + border);
-        e.style.height = height -
-            2 * (padding + border) - header_height;
-
-        e.style.margin = 0;
-        e.style.padding = padding;
-
-        e.classList.add('agenda-weekview-column'); // for cypress tests
-
-        document.body.appendChild(e);
-    }
-
-    //-----------------------------------------------------------------
-    // Draw a block for each meeting
-    //-----------------------------------------------------------------
-    visible_items.forEach(function (item) {
-        var sess_width = day_width / item.lanes;
-        var sess_height = ((item.end_time - item.start_time) * minute_height) -
-            2 * (padding + border);
-        var day_left = ((item.day - start_day) * day_width);
-        var sess_left = day_left + sess_width * item.lane;
-        var sess_top = ((item.start_time - day_start) * minute_height) + header_height;
-
-        sess_width = sess_width - 2 * (padding + border);
-
-        var e = document.createElement("div");
-        e.style.border = "solid";
-        e.style.borderWidth = border;
-
-        if (item.area && color[item.area]) {
-            e.style.background = color[item.area].bg;
-            e.style.color = color[item.area].fg;
-            e.style.borderColor = color[item.area].fg;
-        } else {
-            if (item.area) {
-                console.log("No color for " + item.area + ": using default");
-            }
-            e.style.background = "#e0e0e0";
-            e.style.color = "#000000";
-            e.style.borderColor = "#000000";
-        }
-
-        e.style.display = "block";
-        e.style.overflow = "hidden";
-        e.style.position = "absolute";
-        e.style.top = sess_top;
-        e.style.left = sess_left;
-        e.style.width = sess_width;
-        e.style.height = sess_height;
-        e.style.margin = 0;
-        e.style.padding = padding;
-        e.style.fontFamily = "sans-serif";
-        e.style.fontSize = "8pt";
-        e.item = item;
-
-        // for cypress tests
-        e.classList.add('agenda-weekview-meeting');
-        if (day_width !== sess_width) {
-            e.classList.add('agenda-weekview-meeting-mini');
-        }
-
-        e.onmouseenter = function () {
-            resize(e, sess_top, day_left,
-                day_width - 2 * (padding + border),
-                sess_height, true)
-        };
-
-        e.onmouseleave = function () { resize(e, sess_top, sess_left, sess_width, sess_height, false) };
-
-        if (item.agenda) {
-            e.onclick = function () { maximize(e) };
-            e.style.cursor = "pointer";
-        }
-
-        var div = document.createElement("div");
-        div.appendChild(document.createTextNode(item.time));
-        div.appendChild(document.createElement("br"));
-
-        var label = item.name;
-        if (label.length === 0) {
-            label = "Free Slot";
-        }
-        if (item.group && color[item.area]) {
-            label = label + " (" + item.group + ")";
-        }
-
-        var bold = document.createElement("span");
-        bold.appendChild(document.createTextNode(label));
-        bold.style.fontWeight = "bold";
-        div.appendChild(bold);
-
-        if (item.room) {
-            div.appendChild(document.createElement("br"));
-            var italics = document.createElement("span");
-            italics.appendChild(document.createTextNode(item.room));
-            italics.style.fontStyle = "oblique";
-            div.appendChild(italics);
-        }
-
-        e.appendChild(div);
-
-        document.body.appendChild(e);
-    });
-
-    // Div to indicate rendering has occurred, for testing purposes.
-    var elt = document.createElement('div');
-    elt.id = 'wv-end';
-    document.body.appendChild(elt);
-}
-
-//===========================================================================
-// Note: if "to_fit" is true and the text won't fit in the dimensions
-// provided, then the height parameter is ignored, and the item is resized to
-// be tall enough to contain the entire contents
-
-var animation_counter = 0;
-
-function resize(div, top, left, width, height, to_fit) {
-    var from_top = (div.style.top.replace("px", ""));
-    var from_left = (div.style.left.replace("px", ""));
-    var from_width = (div.style.width.replace("px", ""));
-    var from_height = (div.style.height.replace("px", ""));
-
-    // If we're fitting the height to the content, and there is overflow,
-    // calculate the new (larger) height
-    if (to_fit) {
-        div.style.removeProperty("height");
-        div.style.width = width;
-        var clientHeight = div.clientHeight;
-        div.style.height = from_height;
-        div.style.width = from_width;
-        if (clientHeight > height) {
-            height = clientHeight;
-        }
-    }
-
-    var animationId = "animation-" + (animation_counter++);
-
-    // Move the element to the front
-    div.style.zIndex = animation_counter;
-
-    var style = document.createElement('style');
-    style.textContent = "@keyframes " + animationId + " {" +
-        "  from {" +
-        "    top: " + from_top + ";" +
-        "    left: " + from_left + ";" +
-        "    width: " + from_width + ";" +
-        "    height: " + from_height + ";" +
-        "  }" +
-        "  to {" +
-        "    top: " + top + ";" +
-        "    left: " + left + ";" +
-        "    width: " + width + ";" +
-        "    height: " + height + ";" +
-        "  }" +
-        "}";
-    document.head.appendChild(style);
-
-    var callback = function () {
-        div.removeEventListener('animationend', callback);
-        document.head.removeChild(style);
-
-        div.style.top = top;
-        div.style.left = left;
-        div.style.width = width;
-        div.style.height = height;
-
-        if (div.callback) {
-            div.callback();
-            div.callback = undefined;
-        }
-    };
-
-    div.addEventListener('animationend', callback, false);
-
-    div.style.animationName = animationId;
-    div.style.animationDuration = "0.25s";
-    div.style.animationIterationCount = "1";
-    div.style.animationFillMode = "forwards";
-}
-
-//===========================================================================
-
-function finish_maximize(e) {
-    if (!e.item.agenda) {
-        console.log("Element has no agenda: " + JSON.stringify(e.item));
-        return;
-    }
-
-    e.insertBefore(document.createElement("br"), e.firstChild);
-
-    var i = document.createElement("i");
-    i.classList.add('bi', 'bi-x-lg');
-    i.style.cssFloat = "right";
-    i.onclick = function () { minimize(e); };
-    i.style.cursor = "pointer";
-    e.insertBefore(i, e.firstChild);
-
-    var h = document.createElement("span");
-    h.appendChild(document.createTextNode(e.item.dayname));
-    h.style.fontWeight = "bold";
-    e.insertBefore(h, e.firstChild);
-    e.style.fontSize = "10pt";
-
-    var tmp = e.style.height;
-    e.style.removeProperty("height");
-    var used_height = e.clientHeight;
-    e.style.height = tmp;
-
-    var frame = document.createElement("iframe");
-    frame.setAttribute("src", e.item.agenda);
-
-    frame.style.position = "absolute";
-    frame.style.left = 8;
-    frame.style.width = e.clientWidth - 16 - 2 * (padding + border);
-    frame.style.top = used_height + 8;
-    frame.style.height = e.clientHeight - used_height - 16 - 2 * (padding + border);
-
-    frame.style.background = "#fff";
-    frame.style.overflow = "auto";
-    frame.id = "agenda";
-
-    frame.style.border = e.style.border;
-    frame.style.borderWidth = border;
-    frame.style.padding = padding;
-    frame.style.borderColor = e.style.borderColor;
-
-    e.appendChild(frame);
-
-    e.keyHandler = function (event) {
-        console.log(event.code);
-        if (event.code === "Escape") {
-            minimize(e);
-        }
-    };
-
-    document.addEventListener('keydown', e.keyHandler, false);
-}
-
-//===========================================================================
-
-function finish_minimize(e) {
-    e.onmouseenter = e.oldmouseenter;
-    e.onmouseleave = e.oldmouseleave;
-    e.oldmouseenter = undefined;
-    e.oldmouseleave = undefined;
-    e.style.cursor = "pointer";
-}
-
-//===========================================================================
-
-function maximize(e) {
-    if (e.onmouseenter) {
-        e.oldmouseenter = e.onmouseenter;
-        e.oldmouseleave = e.onmouseleave;
-        e.onmouseenter = undefined;
-        e.onmouseleave = undefined;
-        e.style.cursor = "auto";
-        e.callback = function () { finish_maximize(e); }
-        resize(e, 0, 0,
-            document.body.clientWidth - 2 * (padding + border),
-            document.body.clientHeight - 2 * (padding + border), false);
-    }
-}
-
-//===========================================================================
-
-function minimize(e) {
-    var agenda = document.getElementById("agenda");
-    if (agenda) {
-        e.removeChild(agenda);
-    }
-    document.removeEventListener('keydown', e.keyHandler, false);
-    e.callback = function () { finish_minimize(e); };
-    e.oldmouseleave();
-    e.removeChild(e.firstChild);
-    e.removeChild(e.firstChild);
-    e.removeChild(e.firstChild);
-    e.style.fontSize = "8pt";
-}
-
-//===========================================================================
-//
-function get_first_item(items, type) {
-    var earliest;
-    for (var ii = 0; ii < items.length; ii++) {
-        var this_item = items[ii];
-        if (type && (this_item.type !== type)) {
-            continue;
-        }
-        // Update earliest if we don't have an earliest item yet or this_item is earlier
-        if (!earliest || (items[ii].utc_time < earliest.utc_time)) {
-            earliest = items[ii];
-        }
-    }
-    return earliest;
-}
-
-//===========================================================================
-//
-window.prepare_items = function (items, timezone_name) {
-    /**
-     * @param item item to render
-     * @param day day of meeting
-     * @param start_time starting time in minutes since start-of-day
-     * @param duration duration in minutes
-     * @param formatted_time time label for rendered event
-     * @param dayname day name label for rendered event
-     * @returns {{area, end_time: *, type, agenda, room, start_time, dayname, name, time, filter_keywords: ([string]|*), day, key, group}}
-     */
-    function make_display_item(item, day, start_time, duration, formatted_time, dayname) {
-        return {
-            name: item.name,
-            group: item.group,
-            area: item.area,
-            room: item.room,
-            agenda: item.agenda,
-            key: item.key,
-            type: item.type,
-            filter_keywords: item.filter_keywords,
-            day: day,
-            start_time: start_time,
-            end_time: start_time + duration,
-            time: formatted_time,
-            dayname: dayname
-        }
-    }
-
-    /* Ported from Django view, which had the following comment:
-     *    Only show assignments from the traditional meeting "week" (Sat-Fri).
-     *    We'll determine this using the saturday before the first scheduled regular session. */
-    var first_session = get_first_item(items, 'Regular');
-    if (!first_session) {
-        first_session = get_first_item(items); // any type
-    }
-    var first_session_time = moment(first_session.utc_time)
-        .utc();
-    if (timezone_name) {
-        first_session_time.tz(timezone_name); // mutates the moment
-    }
-
-    // Moment.js day() uses 0 == Sunday, 6 == Saturday
-    days_since_saturday = first_session_time.day() - 6;
-    if (days_since_saturday < 0) {
-        days_since_saturday += 7;
-    }
-    saturday_before = first_session_time.clone()
-        .startOf('day')
-        .subtract(days_since_saturday, 'days');
-
-    var display_items = [];
-    for (var ii = 0; ii < items.length; ii++) {
-        var this_item = items[ii];
-
-        /* It's possible an event overlaps the moment of a daylight savings shift.
-         * Calculate the end_moment in utc() time, which has no DST. Once we switch
-         * to a time zone, end time minus start time may not equal duration. */
-        var start_moment = moment(this_item.utc_time)
-            .utc();
-        var end_moment = start_moment.clone()
-            .add(this_item.duration, 'seconds');
-        if (timezone_name) {
-            start_moment.tz(timezone_name);
-            end_moment.tz(timezone_name);
-        }
-        // Avoid off-by-one day number calculations if a session ends at midnight
-        var just_before_end_moment = end_moment.clone()
-            .subtract(1, 'millisecond');
-
-        var start_day = start_moment.diff(saturday_before, 'days') - 1; // shift so sunday = 0
-        var end_day = just_before_end_moment.diff(saturday_before, 'days') - 1; // shift so sunday = 0
-
-        /* Generate display item or items
-         *
-         * Around DST switchover, days may be 23 or 25 hours long instead of 24 hours, and events
-         * may end at a clock time that is before they started. To prevent problems, do not do
-         * direct math between start_moment and end_moment.
-         */
-        const formatted_time = start_moment.format('HHmm') + '-' + end_moment.format('HHmm');
-        const dayname = start_moment.format('dddd, ')
-          .toUpperCase() +
-          start_moment.format('MMMM D, Y');
-        if (start_day === end_day) {
-            // one day - add a single display item
-            const start_of_day = start_moment.clone().startOf('day');
-            display_items.push(make_display_item(
-              this_item,
-              start_day,
-              start_moment.diff(start_of_day, 'minutes'),
-              this_item.duration / 60,
-              formatted_time,
-              dayname
-            ));
-        } else {
-            // split across days - add multiple items
-            for (var day = start_day; day <= end_day; day++) {
-                let start_time;
-                let duration;
-                if (day === start_day) {
-                    // First day of session - start at correct start time position
-                    const start_of_day = start_moment.clone().startOf('day');
-                    const end_of_day = start_moment.clone().endOf('day');
-                    start_time = start_moment.diff(start_of_day, 'minutes');
-                    duration = end_of_day.diff(start_moment, 'minutes');
-                } else {
-                    // Not the first day of session
-                    const start_of_day = just_before_end_moment.clone().startOf('day');
-                    start_time = 0;
-                    if (day === end_day) {
-                        // Last day of session - end at correct end time position
-                        duration = just_before_end_moment.diff(start_of_day, 'minutes');
-                    } else {
-                        // Not the last day of the session - end at the end of the day
-                        const end_of_day = just_before_end_moment.clone().endOf('day');
-                        duration = end_of_day.clone().diff(start_of_day, 'minutes');
-                    }
-                }
-                const display_item = make_display_item(this_item, day, start_time, duration, formatted_time, dayname);
-                if (day !== start_day) {
-                    display_item.name += " - continued";
-                }
-                display_items.push(display_item);
-            }
-        }
-    }
-    return display_items;
-}
\ No newline at end of file
diff --git a/ietf/stats/backfill_data.py b/ietf/stats/backfill_data.py
deleted file mode 100755
index 176ee3335b..0000000000
--- a/ietf/stats/backfill_data.py
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env python
-# Copyright The IETF Trust 2017-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import io
-import sys
-import os
-import os.path
-import argparse
-import time
-
-from typing import Set, Optional    # pyflakes:ignore
-
-basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path = [ basedir ] + sys.path
-os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
-
-virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
-if os.path.exists(virtualenv_activation):
-    exec(compile(io.open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
-
-import django
-django.setup()
-
-from django.conf import settings
-
-import debug                            # pyflakes:ignore
-
-from ietf.doc.models import Document
-from ietf.name.models import FormalLanguageName
-from ietf.utils.draft import PlaintextDraft
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--document", help="specific document name")
-parser.add_argument("--words", action="store_true", help="fill in word count")
-parser.add_argument("--formlang", action="store_true", help="fill in formal languages")
-parser.add_argument("--authors", action="store_true", help="fill in author info")
-args = parser.parse_args()
-
-formal_language_dict = { l.pk: l for l in FormalLanguageName.objects.all() }
-
-docs_qs = Document.objects.filter(type="draft")
-
-if args.document:
-    docs_qs = docs_qs.filter(docalias__name=args.document)
-
-ts = time.strftime("%Y-%m-%d_%H:%M%z")
-logfile = io.open('backfill-authorstats-%s.log'%ts, 'w')
-print("Writing log to %s" % os.path.abspath(logfile.name))
-
-def say(msg):
-    msg = msg.encode('utf8')
-    sys.stderr.write(msg)
-    sys.stderr.write('\n')
-    logfile.write(msg)
-    logfile.write('\n')
-
-def unicode(text):
-    if text is None:
-        return text
-    # order matters here:
-    for encoding in ['ascii', 'utf8', 'latin1', ]:
-        try:
-            utext = text.decode(encoding) 
-#             if encoding == 'latin1':
-#                 say("Warning: falling back to latin1 decoding for %s ..." % utext[:216]])
-            return utext
-        except UnicodeDecodeError:
-            pass
-
-start = time.time()
-say("Running query for documents to process ...")
-for doc in docs_qs.prefetch_related("docalias", "formal_languages", "documentauthor_set", "documentauthor_set__person", "documentauthor_set__person__alias_set"):
-    canonical_name = doc.name
-    for n in doc.docalias.all():
-        if n.name.startswith("rfc"):
-            canonical_name = n.name
-
-    if canonical_name.startswith("rfc"):
-        path = os.path.join(settings.RFC_PATH, canonical_name + ".txt")
-    else:
-        path = os.path.join(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR, canonical_name + "-" + doc.rev + ".txt")
-
-    if not os.path.exists(path):
-        say("Skipping %s, no txt file found at %s" % (doc.name, path))
-        continue
-
-    with io.open(path, 'rb') as f:
-        say("\nProcessing %s" % doc.name)
-        sys.stdout.flush()
-        d = PlaintextDraft(unicode(f.read()), path)
-
-        updated = False
-
-        updates = {}
-
-        if args.words:
-            words = d.get_wordcount()
-            if words != doc.words:
-                updates["words"] = words
-
-        if args.formlang:
-            langs = d.get_formal_languages()
-
-            new_formal_languages = set(formal_language_dict[l] for l in langs)
-            old_formal_languages = set(doc.formal_languages.all())
-
-            if new_formal_languages != old_formal_languages:
-                for l in new_formal_languages - old_formal_languages:
-                    doc.formal_languages.add(l)
-                    updated = True
-                for l in old_formal_languages - new_formal_languages:
-                    doc.formal_languages.remove(l)
-                    updated = True
-
-        if args.authors:
-            old_authors = doc.documentauthor_set.all()
-            old_authors_by_name = {}
-            old_authors_by_email = {}
-            for author in old_authors:
-                for alias in author.person.alias_set.all():
-                    old_authors_by_name[alias.name] = author
-                old_authors_by_name[author.person.plain_name()] = author
-
-                if author.email_id:
-                    old_authors_by_email[author.email_id] = author
-
-            # the draft parser sometimes has a problem when
-            # affiliation isn't in the second line and it then thinks
-            # it's an extra author - skip those extra authors
-            seen = set()                # type: Set[Optional[str]]
-            for full, _, _, _, _, email, country, company in d.get_author_list():
-                assert full is None or    isinstance(full,    str)
-                assert email is None or   isinstance(email,   str)
-                assert country is None or isinstance(country, str)
-                assert                    isinstance(company, str)
-                #full, email, country, company = [ unicode(s) for s in [full, email, country, company, ] ]
-                if email in seen:
-                    continue
-                seen.add(email)
-
-                old_author = None
-                if email:
-                    old_author = old_authors_by_email.get(email)
-                if not old_author:
-                    old_author = old_authors_by_name.get(full)
-
-                if not old_author:
-                    say("UNKNOWN AUTHOR: %s, %s, %s, %s, %s" % (doc.name, full, email, country, company))
-                    continue
-
-                if old_author.affiliation != company:
-                    say("new affiliation: %s [ %s <%s> ] %s -> %s" % (canonical_name, full, email, old_author.affiliation, company))
-                    old_author.affiliation = company
-                    old_author.save(update_fields=["affiliation"])
-                    updated = True
-
-                if country is None:
-                    country = ""
-
-                if old_author.country != country:
-                    say("new country: %s [ %s <%s> ] %s -> %s" % (canonical_name , full, email, old_author.country, country))
-                    old_author.country = country
-                    old_author.save(update_fields=["country"])
-                    updated = True
-                    
-
-        if updates:
-            Document.objects.filter(pk=doc.pk).update(**updates)
-            updated = True
-
-        if updated:
-            say("updated: %s" % canonical_name)
-
-stop = time.time()
-dur = stop-start
-sec = dur%60
-min = dur//60
-say("Processing time %d:%02d" % (min, sec))
-
-print("\n\nWrote log to %s" % os.path.abspath(logfile.name))
-logfile.close()
-
diff --git a/ietf/stats/management/commands/fetch_meeting_attendance.py b/ietf/stats/management/commands/fetch_meeting_attendance.py
deleted file mode 100644
index 5078c7cee1..0000000000
--- a/ietf/stats/management/commands/fetch_meeting_attendance.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright The IETF Trust 2017-2019, All Rights Reserved
-# Copyright 2016 IETF Trust
-
-import datetime
-import syslog
-
-from django.core.management.base import BaseCommand, CommandError
-
-import debug                            # pyflakes:ignore
-
-from ietf.meeting.models import Meeting
-from ietf.stats.utils import get_meeting_registration_data
-
-logtag = __name__.split('.')[-1]
-logname = "user.log"
-syslog.openlog(str(logtag), syslog.LOG_PID, syslog.LOG_USER)
-
-class Command(BaseCommand):
-    help = "Fetch meeting attendee figures from ietf.org/registration/attendees."
-
-    def add_arguments(self, parser):
-        parser.add_argument("--meeting", help="meeting to fetch data for")
-        parser.add_argument("--all", action="store_true", help="fetch data for all meetings")
-        parser.add_argument("--latest", type=int, help="fetch data for latest N meetings")
-
-    def handle(self, *args, **options):
-        self.verbosity = options['verbosity']
-
-        meetings = Meeting.objects.none()
-        if options['meeting']:
-            meetings = Meeting.objects.filter(number=options['meeting'], type="ietf")
-        elif options['all']:
-            meetings = Meeting.objects.filter(type="ietf").order_by("date")
-        elif options['latest']:
-            meetings = Meeting.objects.filter(type="ietf", date__lte=datetime.datetime.today()).order_by("-date")[:options['latest']]
-        else:
-            raise CommandError("Please use one of --meeting, --all or --latest")
-
-        for meeting in meetings:
-            added, processed, total = get_meeting_registration_data(meeting)
-            msg = "Fetched data for meeting %3s: %4d processed, %4d added, %4d in table" % (meeting.number, processed, added, total)
-            if self.stdout.isatty():
-                self.stdout.write(msg+'\n') # make debugging a bit easier
-            else:
-                syslog.syslog(msg)
-        
diff --git a/ietf/stats/management/commands/find_meetingregistration_person_issues.py b/ietf/stats/management/commands/find_meetingregistration_person_issues.py
deleted file mode 100644
index 4eaf6ac238..0000000000
--- a/ietf/stats/management/commands/find_meetingregistration_person_issues.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright The IETF Trust 2021, All Rights Reserved
-
-import debug # pyflakes:ignore
-
-from django.core.management.base import BaseCommand
-
-from ietf.stats.utils import find_meetingregistration_person_issues
-
-class Command(BaseCommand):
-    help = "Find possible Person/Email objects to repair based on MeetingRegistration objects"
-
-    def add_arguments(self, parser):
-        parser.add_argument('--meeting',action='append')
-
-    def handle(self, *args, **options):
-        meetings = options['meeting'] or None
-        summary = find_meetingregistration_person_issues(meetings)
-
-        print(f'{summary.ok_records} records are OK')
-
-        for msg in summary.could_be_fixed:
-            print(msg)
-
-        for msg in summary.maybe_address:
-            print(msg)
-
-        for msg in summary.different_person:
-            print(msg)
-
-        for msg in summary.no_person:
-            print(msg)
-
-        for msg in summary.maybe_person:
-            print(msg)
-
-        for msg in summary.no_email:
-            print(msg)
diff --git a/ietf/stats/management/commands/repair_meetingregistration_person.py b/ietf/stats/management/commands/repair_meetingregistration_person.py
deleted file mode 100644
index 74b1a807a6..0000000000
--- a/ietf/stats/management/commands/repair_meetingregistration_person.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright The IETF Trust 2021, All Rights Reserved
-
-import debug # pyflakes:ignore
-
-from django.core.management.base import BaseCommand
-
-from ietf.stats.utils import repair_meetingregistration_person
-
-class Command(BaseCommand):
-    help = "Repair MeetingRegistration objects that have no person but an email matching a person"
-
-    def add_arguments(self, parser):
-        parser.add_argument('--meeting',action='append')
-
-    def handle(self, *args, **options):
-        meetings = options['meeting'] or None
-        repaired = repair_meetingregistration_person(meetings)
-        print(f'Repaired {repaired} MeetingRegistration objects')
\ No newline at end of file
diff --git a/ietf/stats/migrations/0001_initial.py b/ietf/stats/migrations/0001_initial.py
index bf702b9a41..7150114058 100644
--- a/ietf/stats/migrations/0001_initial.py
+++ b/ietf/stats/migrations/0001_initial.py
@@ -1,7 +1,4 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -13,9 +10,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('meeting', '0001_initial'),
         ('name', '0001_initial'),
         ('person', '0001_initial'),
+        ('meeting', '0001_initial'),
     ]
 
     operations = [
@@ -37,17 +34,6 @@ class Migration(migrations.Migration):
                 ('ending', models.CharField(help_text="Regexp with ending, e.g. 'Inc\\.?' - remember to escape .!", max_length=255)),
             ],
         ),
-        migrations.CreateModel(
-            name='CountryAlias',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('alias', models.CharField(help_text="Note that lower-case aliases are matched case-insensitive while aliases with at least one uppercase letter is matched case-sensitive. So 'United States' is best entered as 'united states' so it both matches 'United States' and 'United states' and 'UNITED STATES', whereas 'US' is best entered as 'US' so it doesn't accidentally match an ordinary word like 'us'.", max_length=255)),
-                ('country', ietf.utils.models.ForeignKey(max_length=255, on_delete=django.db.models.deletion.CASCADE, to='name.CountryName')),
-            ],
-            options={
-                'verbose_name_plural': 'country aliases',
-            },
-        ),
         migrations.CreateModel(
             name='MeetingRegistration',
             fields=[
@@ -57,8 +43,23 @@ class Migration(migrations.Migration):
                 ('affiliation', models.CharField(blank=True, max_length=255)),
                 ('country_code', models.CharField(max_length=2)),
                 ('email', models.EmailField(blank=True, max_length=254, null=True)),
+                ('reg_type', models.CharField(blank=True, max_length=255)),
+                ('ticket_type', models.CharField(blank=True, max_length=255)),
+                ('attended', models.BooleanField(default=False)),
+                ('checkedin', models.BooleanField(default=False)),
                 ('meeting', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting')),
                 ('person', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
             ],
         ),
+        migrations.CreateModel(
+            name='CountryAlias',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('alias', models.CharField(help_text="Note that lower-case aliases are matched case-insensitive while aliases with at least one uppercase letter is matched case-sensitive. So 'United States' is best entered as 'united states' so it both matches 'United States' and 'United states' and 'UNITED STATES', whereas 'US' is best entered as 'US' so it doesn't accidentally match an ordinary word like 'us'.", max_length=255)),
+                ('country', ietf.utils.models.ForeignKey(max_length=255, on_delete=django.db.models.deletion.CASCADE, to='name.CountryName')),
+            ],
+            options={
+                'verbose_name_plural': 'country aliases',
+            },
+        ),
     ]
diff --git a/ietf/stats/migrations/0002_add_meetingregistration_fields.py b/ietf/stats/migrations/0002_add_meetingregistration_fields.py
deleted file mode 100644
index de0cfb11ec..0000000000
--- a/ietf/stats/migrations/0002_add_meetingregistration_fields.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 2.0.13 on 2020-06-07 15:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('stats', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='meetingregistration',
-            name='reg_type',
-            field=models.CharField(blank=True, max_length=255),
-        ),
-        migrations.AddField(
-            model_name='meetingregistration',
-            name='ticket_type',
-            field=models.CharField(blank=True, max_length=255),
-        ),
-    ]
diff --git a/ietf/stats/migrations/0002_fix_meeting_registration_reg_type.py b/ietf/stats/migrations/0002_fix_meeting_registration_reg_type.py
new file mode 100644
index 0000000000..c1c516b290
--- /dev/null
+++ b/ietf/stats/migrations/0002_fix_meeting_registration_reg_type.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.2.6 on 2023-10-27 17:57
+
+'''
+MeetingRegistration reg_type and checkedin fields are not populated for meetings 
+prior to 108. For meetings 72-106, all records are for onsite checkedin participants.
+For meeting 107 all records are for remote paticipants. Set accordingly.
+'''
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    MeetingRegistration = apps.get_model("stats", "MeetingRegistration")
+    MeetingRegistration.objects.filter(meeting__number=107).update(reg_type='remote')
+    MeetingRegistration.objects.filter(meeting__number__lte=106, reg_type='').update(reg_type='onsite', checkedin=True)
+
+
+def reverse(apps, schema_editor):
+    MeetingRegistration = apps.get_model("stats", "MeetingRegistration")
+    MeetingRegistration.objects.filter(meeting__number=107).update(reg_type='')
+    MeetingRegistration.objects.filter(meeting__number__lte=106, reg_type='onsite').update(reg_type='', checkedin=False)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("stats", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]
diff --git a/ietf/stats/migrations/0003_meetingregistration_attended.py b/ietf/stats/migrations/0003_meetingregistration_attended.py
deleted file mode 100644
index 6500f7f5ae..0000000000
--- a/ietf/stats/migrations/0003_meetingregistration_attended.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated by Django 2.0.13 on 2020-06-09 04:39
-
-from django.db import migrations, models
-
-
-def forward(apps, schema_editor):
-    MeetingRegistration = apps.get_model('stats', 'MeetingRegistration')
-    # Set attended=True on all existing records,
-    #
-    # Going forward, this will be unset on registration
-    # (ietf.api.views.api_new_meeting_registration()), and set on attendee
-    # import (ietf.stats.utils.get_meeting_registration_data() )
-    MeetingRegistration.objects.update(attended=True)
-
-def reverse(apps, schema_editor):
-    pass
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('stats', '0002_add_meetingregistration_fields'),
-        ('group', '0029_add_used_roles_and_default_used_roles'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='meetingregistration',
-            name='attended',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/stats/migrations/0004_split_records.py b/ietf/stats/migrations/0004_split_records.py
deleted file mode 100644
index 83b2be24a4..0000000000
--- a/ietf/stats/migrations/0004_split_records.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 2.2.26 on 2022-01-19 16:36
-
-from django.db import migrations
-
-
-def forward(apps, schema_editor):
-    '''Split records that have 2 reg_types into two separate records'''
-    MeetingRegistration = apps.get_model('stats', 'MeetingRegistration')
-    meetings = [108, 109, 110, 111, 112, 113, 114]
-    for reg in MeetingRegistration.objects.filter(meeting__number__in=meetings):
-        reg_types = reg.reg_type.split()
-        if len(reg_types) == 2:
-            reg.reg_type = reg_types[0]
-            reg.save()
-            # create copy
-            reg.pk = None
-            reg.reg_type = reg_types[1]
-            reg.save()
-
-
-def reverse(apps, schema_editor):
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('stats', '0003_meetingregistration_attended'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse)
-    ]
diff --git a/ietf/stats/migrations/0005_meetingregistration_checkedin.py b/ietf/stats/migrations/0005_meetingregistration_checkedin.py
deleted file mode 100644
index 73b6f76430..0000000000
--- a/ietf/stats/migrations/0005_meetingregistration_checkedin.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2022-07-26 08:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('stats', '0004_split_records'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='meetingregistration',
-            name='checkedin',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/ietf/stats/models.py b/ietf/stats/models.py
index 422c5b78a8..66e359f50c 100644
--- a/ietf/stats/models.py
+++ b/ietf/stats/models.py
@@ -11,6 +11,10 @@
 from ietf.person.models import Person
 from ietf.utils.models import ForeignKey
 
+### NOTE WELL: These models are expected to be removed and the stats app reimplemented.
+#   A bare python file that should have been a management command was used to populate
+#   these models when the app was first installed - it has been removed from main, but
+#   can be seen at https://github.com/ietf-tools/datatracker/blob/f2b716fc052a0152c32b86b428ba6ebfdcdf5cd2/ietf/stats/backfill_data.py
 
 class AffiliationAlias(models.Model):
     """Records that alias should be treated as name for statistical
@@ -24,7 +28,8 @@ def __str__(self):
 
     def save(self, *args, **kwargs):
         self.alias = self.alias.lower()
-        super(AffiliationAlias, self).save(*args, **kwargs)
+        update_fields = {"alias"}.union(kwargs.pop("update_fields", set()))
+        super(AffiliationAlias, self).save(update_fields=update_fields, *args, **kwargs)
 
     class Meta:
         verbose_name_plural = "affiliation aliases"
@@ -61,7 +66,10 @@ class MeetingRegistration(models.Model):
     email =  models.EmailField(blank=True, null=True)
     reg_type = models.CharField(blank=True, max_length=255)
     ticket_type = models.CharField(blank=True, max_length=255)
+    # attended was used prior to the introduction of the ietf.meeting.Attended model and is still used by
+    # Meeting.get_attendance() for older meetings. It should not be used except for dealing with legacy data.
     attended = models.BooleanField(default=False)
+    # checkedin indicates that the badge was picked up
     checkedin = models.BooleanField(default=False)
 
     def __str__(self):
diff --git a/ietf/stats/tests.py b/ietf/stats/tests.py
index 32a0dfea80..48552c8fba 100644
--- a/ietf/stats/tests.py
+++ b/ietf/stats/tests.py
@@ -3,12 +3,9 @@
 
 
 import calendar
-import datetime
 import json
 
-from mock import patch
 from pyquery import PyQuery
-from requests import Response
 
 import debug    # pyflakes:ignore
 
@@ -17,18 +14,11 @@
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 import ietf.stats.views
 
-from ietf.submit.models import Submission
-from ietf.doc.factories import WgDraftFactory, WgRfcFactory
-from ietf.doc.models import Document, DocAlias, State, RelatedDocument, NewRevisionDocEvent, DocumentAuthor
+
 from ietf.group.factories import RoleFactory
-from ietf.meeting.factories import MeetingFactory, AttendedFactory
 from ietf.person.factories import PersonFactory
-from ietf.person.models import Person, Email
-from ietf.name.models import FormalLanguageName, DocRelationshipName, CountryName
 from ietf.review.factories import ReviewRequestFactory, ReviewerSettingsFactory, ReviewAssignmentFactory
-from ietf.stats.models import MeetingRegistration, CountryAlias
-from ietf.stats.factories import MeetingRegistrationFactory
-from ietf.stats.utils import get_meeting_registration_data
+from ietf.utils.timezone import date_today
 
 
 class StatisticsTests(TestCase):
@@ -38,122 +28,14 @@ def test_stats_index(self):
         self.assertEqual(r.status_code, 200)
 
     def test_document_stats(self):
-        WgRfcFactory()
-        draft = WgDraftFactory()
-        DocumentAuthor.objects.create(
-            document=draft,
-            person=Person.objects.get(email__address="aread@example.org"),
-            email=Email.objects.get(address="aread@example.org"),
-            country="Germany",
-            affiliation="IETF",
-            order=1
-        )
-
-        # create some data for the statistics
-        Submission.objects.create(
-            authors=[ { "name": "Some Body", "email": "somebody@example.com", "affiliation": "Some Inc.", "country": "US" }],
-            pages=30,
-            rev=draft.rev,
-            words=4000,
-            draft=draft,
-            file_types=".txt",
-            state_id="posted",
-        )
-
-        draft.formal_languages.add(FormalLanguageName.objects.get(slug="xml"))
-        Document.objects.filter(pk=draft.pk).update(words=4000)
-        # move it back so it shows up in the yearly summaries
-        NewRevisionDocEvent.objects.filter(doc=draft, rev=draft.rev).update(
-            time=datetime.datetime.now() - datetime.timedelta(days=500))
-
-        referencing_draft = Document.objects.create(
-            name="draft-ietf-mars-referencing",
-            type_id="draft",
-            title="Referencing",
-            stream_id="ietf",
-            abstract="Test",
-            rev="00",
-            pages=2,
-            words=100
-            )
-        referencing_draft.set_state(State.objects.get(used=True, type="draft", slug="active"))
-        DocAlias.objects.create(name=referencing_draft.name).docs.add(referencing_draft)
-        RelatedDocument.objects.create(
-            source=referencing_draft,
-            target=draft.docalias.first(),
-            relationship=DocRelationshipName.objects.get(slug="refinfo")
-        )
-        NewRevisionDocEvent.objects.create(
-            type="new_revision",
-            by=Person.objects.get(name="(System)"),
-            doc=referencing_draft,
-            desc="New revision available",
-            rev=referencing_draft.rev,
-            time=datetime.datetime.now() - datetime.timedelta(days=1000)
-        )
-
-
-        # check redirect
-        url = urlreverse(ietf.stats.views.document_stats)
-
-        authors_url = urlreverse(ietf.stats.views.document_stats, kwargs={ "stats_type": "authors" })
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 302)
-        self.assertTrue(authors_url in r["Location"])
+        r = self.client.get(urlreverse("ietf.stats.views.document_stats"))
+        self.assertRedirects(r, urlreverse("ietf.stats.views.stats_index"))
 
-        # check various stats types
-        for stats_type in ["authors", "pages", "words", "format", "formlang",
-                           "author/documents", "author/affiliation", "author/country",
-                           "author/continent", "author/citations", "author/hindex",
-                           "yearly/affiliation", "yearly/country", "yearly/continent"]:
-            for document_type in ["", "rfc", "draft"]:
-                for time_choice in ["", "5y"]:
-                    url = urlreverse(ietf.stats.views.document_stats, kwargs={ "stats_type": stats_type })
-                    r = self.client.get(url, {
-                        "type": document_type,
-                        "time": time_choice,
-                    })
-                    self.assertEqual(r.status_code, 200)
-                    q = PyQuery(r.content)
-                    self.assertTrue(q('#chart'))
-                    if not stats_type.startswith("yearly"):
-                        self.assertTrue(q('table.stats-data'))
 
     def test_meeting_stats(self):
-        # create some data for the statistics
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date.today(), number="96")
-        MeetingRegistrationFactory(first_name='John', last_name='Smith', country_code='US', email="john.smith@example.us", meeting=meeting, attended=True)
-        CountryAlias.objects.get_or_create(alias="US", country=CountryName.objects.get(slug="US"))
-        p = MeetingRegistrationFactory(first_name='Jaume', last_name='Guillaume', country_code='FR', email="jaume.guillaume@example.fr", meeting=meeting, attended=False).person
-        CountryAlias.objects.get_or_create(alias="FR", country=CountryName.objects.get(slug="FR"))
-        AttendedFactory(session__meeting=meeting,person=p)
-        # check redirect
-        url = urlreverse(ietf.stats.views.meeting_stats)
+        r = self.client.get(urlreverse("ietf.stats.views.meeting_stats"))
+        self.assertRedirects(r, urlreverse("ietf.stats.views.stats_index"))
 
-        authors_url = urlreverse(ietf.stats.views.meeting_stats, kwargs={ "stats_type": "overview" })
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 302)
-        self.assertTrue(authors_url in r["Location"])
-
-        # check various stats types
-        for stats_type in ["overview", "country", "continent"]:
-            url = urlreverse(ietf.stats.views.meeting_stats, kwargs={ "stats_type": stats_type })
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertTrue(q('#chart'))
-            if stats_type == "overview":
-                self.assertTrue(q('table.stats-data'))
-
-        for stats_type in ["country", "continent"]:
-            url = urlreverse(ietf.stats.views.meeting_stats, kwargs={ "stats_type": stats_type, "num": meeting.number })
-            r = self.client.get(url)
-            self.assertEqual(r.status_code, 200)
-            q = PyQuery(r.content)
-            self.assertTrue(q('#chart'))
-            self.assertTrue(q('table.stats-data'))
                 
     def test_known_country_list(self):
         # check redirect
@@ -198,7 +80,7 @@ def test_review_stats(self):
                 self.assertTrue(q('.review-stats td:contains("1")'))
 
         # check stacked chart
-        expected_date = datetime.date.today().replace(day=1)
+        expected_date = date_today().replace(day=1)
         expected_js_timestamp = calendar.timegm(expected_date.timetuple()) * 1000
         url = urlreverse(ietf.stats.views.review_stats, kwargs={ "stats_type": "time" })
         url += "?team={}".format(review_req.team.acronym)
@@ -227,47 +109,3 @@ def test_review_stats(self):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertTrue(q('.review-stats td:contains("1")'))
-
-    @patch('requests.get')
-    def test_get_meeting_registration_data(self, mock_get):
-        '''Test function to get reg data.  Confirm leading/trailing spaces stripped'''
-        person = PersonFactory()
-        data = {
-            'LastName': person.last_name() + ' ',
-            'FirstName': person.first_name(),
-            'Company': 'ABC',
-            'Country': 'US',
-            'Email': person.email().address,
-            'RegType': 'onsite',
-            'TicketType': 'week_pass',
-            'CheckedIn': 'True',
-        }
-        data2 = data.copy()
-        data2['RegType'] = 'hackathon'
-        response_a = Response()
-        response_a.status_code = 200
-        response_a._content = json.dumps([data, data2]).encode('utf8')
-        # second response one less record, it's been deleted
-        response_b = Response()
-        response_b.status_code = 200
-        response_b._content = json.dumps([data]).encode('utf8')
-        # mock_get.return_value = response
-        mock_get.side_effect = [response_a, response_b]
-        meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016, 7, 14), number="96")
-        get_meeting_registration_data(meeting)
-        query = MeetingRegistration.objects.filter(
-            first_name=person.first_name(),
-            last_name=person.last_name(),
-            country_code='US')
-        self.assertEqual(query.count(), 2)
-        self.assertEqual(query.filter(reg_type='onsite').count(), 1)
-        self.assertEqual(query.filter(reg_type='hackathon').count(), 1)
-        onsite = query.get(reg_type='onsite')
-        self.assertEqual(onsite.ticket_type, 'week_pass')
-        self.assertEqual(onsite.checkedin, True)
-        # call a second time to test delete
-        get_meeting_registration_data(meeting)
-        query = MeetingRegistration.objects.filter(meeting=meeting, email=person.email())
-        self.assertEqual(query.count(), 1)
-        self.assertEqual(query.filter(reg_type='onsite').count(), 1)
-        self.assertEqual(query.filter(reg_type='hackathon').count(), 0)
diff --git a/ietf/stats/utils.py b/ietf/stats/utils.py
index ca1163e073..a13e87a4f4 100644
--- a/ietf/stats/utils.py
+++ b/ietf/stats/utils.py
@@ -3,18 +3,12 @@
 
 
 import re
-import requests
 from collections import defaultdict
 
-from django.conf import settings
-from django.db.models import Q
-
 import debug                            # pyflakes:ignore
 
-from ietf.stats.models import AffiliationAlias, AffiliationIgnoredEnding, CountryAlias, MeetingRegistration
+from ietf.stats.models import AffiliationAlias, AffiliationIgnoredEnding, CountryAlias
 from ietf.name.models import CountryName
-from ietf.person.models import Person, Email
-from ietf.utils.log import log
 
 import logging
 logger = logging.getLogger('django')
@@ -221,165 +215,3 @@ def compute_hirsch_index(citation_counts):
         i += 1
 
     return i
-
-
-def get_meeting_registration_data(meeting):
-    """"Retrieve registration attendee data and summary statistics.  Returns number
-    of Registration records created.
-    
-    MeetingRegistration records are created in realtime as people register for a 
-    meeting. This function serves as an audit / reconciliation. Most records are
-    expected to already exist. The function has been optimized with this in mind.
-    """
-    num_created = 0
-    num_processed = 0
-    try:
-        response = requests.get(
-            settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number),
-            timeout=settings.DEFAULT_REQUESTS_TIMEOUT,
-        )
-    except requests.Timeout as exc:
-        log(f'GET request timed out for [{settings.STATS_REGISTRATION_ATTENDEES_JSON_URL}]: {exc}')
-        raise RuntimeError("Timeout retrieving data from registrations API") from exc
-    if response.status_code == 200:
-        decoded = []
-        try:
-            decoded = response.json()
-        except ValueError:
-            if response.content.strip() == 'Invalid meeting':
-                logger.info('Invalid meeting: {}'.format(meeting.number))
-                return (0,0,0)
-            else:
-                raise RuntimeError("Could not decode response from registrations API: '%s...'" % (response.content[:64], ))
-
-        records = MeetingRegistration.objects.filter(meeting_id=meeting.pk).select_related('person')
-        meeting_registrations = {(r.email, r.reg_type):r for r in records}
-        for registration in decoded:
-            person = None
-            # capture the stripped registration values for later use
-            first_name      = registration['FirstName'].strip()
-            last_name       = registration['LastName'].strip()
-            affiliation     = registration['Company'].strip()
-            country_code    = registration['Country'].strip()
-            address         = registration['Email'].strip()
-            reg_type        = registration['RegType'].strip()
-            ticket_type     = registration['TicketType'].strip()
-            checkedin       = bool(registration['CheckedIn'].strip().lower() == 'true')
-
-            if (address, reg_type) in meeting_registrations:
-                object = meeting_registrations.pop((address, reg_type))
-                created = False
-            else:
-                object = MeetingRegistration.objects.create(
-                    meeting_id=meeting.pk,
-                    email=address,
-                    reg_type=reg_type)
-                created = True
-            
-            if (object.first_name != first_name[:200] or
-                object.last_name != last_name[:200] or
-                object.affiliation != affiliation or
-                object.country_code != country_code or
-                object.ticket_type != ticket_type or
-                object.checkedin != checkedin):
-                    object.first_name=first_name[:200]
-                    object.last_name=last_name[:200]
-                    object.affiliation=affiliation
-                    object.country_code=country_code
-                    object.ticket_type=ticket_type
-                    object.checkedin=checkedin
-                    object.save()
-
-            # Add a Person object to MeetingRegistration object
-            # if valid email is available
-            if object and not object.person and address:
-                # If the person already exists do not try to create a new one
-                emails = Email.objects.filter(address=address)
-                # there can only be on Email object with a unique email address (primary key)
-                if emails.exists():
-                    person = emails.first().person
-                # Create a new Person object
-                else:
-                    logger.error("No Person record for registration. email={}".format(address))
-                # update the person object to an actual value
-                object.person = person
-                object.save()
-            
-            if created:
-                num_created += 1
-            num_processed += 1
-
-        # any registrations left in meeting_registrations no longer exist in reg
-        # so must have been deleted
-        for r in meeting_registrations:
-            try:
-                MeetingRegistration.objects.get(meeting=meeting,email=r[0],reg_type=r[1]).delete()
-                logger.info('Removing deleted registration. email={}, reg_type={}'.format(r[0], r[1]))
-            except MeetingRegistration.DoesNotExist:
-                pass
-    else:
-        raise RuntimeError("Bad response from registrations API: %s, '%s'" % (response.status_code, response.content))
-    num_total = MeetingRegistration.objects.filter(
-        meeting_id=meeting.pk,
-        reg_type__in=['onsite', 'remote']
-    ).filter(
-        Q(attended=True) | Q(checkedin=True)
-    ).count()
-    if meeting.attendees is None or num_total > meeting.attendees:
-        meeting.attendees = num_total
-        meeting.save()
-    return num_created, num_processed, num_total
-
-def repair_meetingregistration_person(meetings=None):
-    repaired_records = 0
-    qs = MeetingRegistration.objects.all()
-    if meetings:
-        qs = qs.filter(meeting__number__in=meetings)
-    for mr in qs:
-        if mr.email and not mr.person:
-            email_person = Person.objects.filter(email__address=mr.email).first()
-            if email_person:
-                mr.person = email_person
-                mr.save()
-                repaired_records += 1            
-    return repaired_records
-
-class MeetingRegistrationIssuesSummary(object):
-    pass
-
-def find_meetingregistration_person_issues(meetings=None):
-    summary = MeetingRegistrationIssuesSummary()
-
-    summary.could_be_fixed = set()
-    summary.maybe_address = set()
-    summary.different_person = set()
-    summary.no_person = set()
-    summary.maybe_person = set()
-    summary.no_email = set()
-    summary.ok_records = 0
-
-    qs = MeetingRegistration.objects.all()
-    if meetings:
-        qs = qs.filter(meeting__number__in=meetings)
-    for mr in qs:
-        if mr.person and mr.email and mr.email in mr.person.email_set.values_list('address',flat=True):
-            summary.ok_records += 1
-        elif mr.email:
-            email_person = Person.objects.filter(email__address=mr.email).first()
-            if mr.person:
-                if not email_person:
-                    summary.maybe_address.add(f'{mr.email} is not present in any Email object. The MeetingRegistration object implies this is an address for {mr.person} ({mr.person.pk})')
-                elif email_person != mr.person:
-                    summary.different_person.add(f'{mr} ({mr.pk}) has person {mr.person} ({mr.person.pk}) but an email {mr.email} attached to a different person {email_person} ({email_person.pk}).')
-            elif email_person:
-                summary.could_be_fixed.add(f'{mr} ({mr.pk}) has no person, but email {mr.email} matches {email_person} ({email_person.pk})')
-            else:
-                maybe_person_qs = Person.objects.filter(name__icontains=mr.last_name).filter(name__icontains=mr.first_name)
-                if maybe_person_qs.exists():
-                    summary.maybe_person.add(f'{mr} ({mr.pk}) has email address {mr.email} which cannot be associated with any Person. Consider these possible people {[(p,p.pk) for p in maybe_person_qs]}')
-                else:
-                    summary.no_person.add(f'{mr} ({mr.pk}) has email address {mr.email} which cannot be associated with any Person')
-        else:
-            summary.no_email.add(f'{mr} ({mr.pk}) provides no email address')
-
-    return summary
diff --git a/ietf/stats/views.py b/ietf/stats/views.py
index 1667387bce..504d84e86d 100644
--- a/ietf/stats/views.py
+++ b/ietf/stats/views.py
@@ -2,24 +2,18 @@
 # -*- coding: utf-8 -*-
 
 
-import os
 import calendar
 import datetime
-import email.utils
 import itertools
 import json
 import dateutil.relativedelta
 from collections import defaultdict
 
-from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.core.cache import cache
-from django.db.models import Count, Q
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import render
 from django.urls import reverse as urlreverse
-from django.utils.safestring import mark_safe
-from django.utils.text import slugify
+
 
 import debug                            # pyflakes:ignore
 
@@ -28,17 +22,13 @@
                                ReviewAssignmentData,
                                sum_period_review_assignment_stats,
                                sum_raw_review_assignment_aggregations)
-from ietf.submit.models import Submission
 from ietf.group.models import Role, Group
 from ietf.person.models import Person
-from ietf.name.models import ReviewResultName, CountryName, DocRelationshipName, ReviewAssignmentStateName
-from ietf.person.name import plain_name
-from ietf.doc.models import DocAlias, Document, State, DocEvent
-from ietf.meeting.models import Meeting
-from ietf.stats.models import MeetingRegistration, CountryAlias
-from ietf.stats.utils import get_aliased_affiliations, get_aliased_countries, compute_hirsch_index
+from ietf.name.models import ReviewResultName, CountryName, ReviewAssignmentStateName
 from ietf.ietfauth.utils import has_role
 from ietf.utils.response import permission_denied
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
+
 
 def stats_index(request):
     return render(request, "stats/index.html")
@@ -132,621 +122,8 @@ def add_labeled_top_series_from_bins(chart_data, bins, limit):
         })
 
 def document_stats(request, stats_type=None):
-    def build_document_stats_url(stats_type_override=Ellipsis, get_overrides=None):
-        if get_overrides is None:
-            get_overrides={}
-        kwargs = {
-            "stats_type": stats_type if stats_type_override is Ellipsis else stats_type_override,
-        }
-
-        return urlreverse(document_stats, kwargs={ k: v for k, v in kwargs.items() if v is not None }) + generate_query_string(request.GET, get_overrides)
-
-    # the length limitation is to keep the key shorter than memcached's limit
-    # of 250 after django has added the key_prefix and key_version parameters
-    cache_key = ("stats:document_stats:%s:%s" % (stats_type, slugify(request.META.get('QUERY_STRING',''))))[:228]
-    data = cache.get(cache_key)
-    if not data:
-        names_limit = settings.STATS_NAMES_LIMIT
-        # statistics types
-        possible_document_stats_types = add_url_to_choices([
-            ("authors", "Number of authors"),
-            ("pages", "Pages"),
-            ("words", "Words"),
-            ("format", "Format"),
-            ("formlang", "Formal languages"),
-        ], lambda slug: build_document_stats_url(stats_type_override=slug))
-
-        possible_author_stats_types = add_url_to_choices([
-            ("author/documents", "Number of documents"),
-            ("author/affiliation", "Affiliation"),
-            ("author/country", "Country"),
-            ("author/continent", "Continent"),
-            ("author/citations", "Citations"),
-            ("author/hindex", "h-index"),
-        ], lambda slug: build_document_stats_url(stats_type_override=slug))
-
-        possible_yearly_stats_types = add_url_to_choices([
-            ("yearly/affiliation", "Affiliation"),
-            ("yearly/country", "Country"),
-            ("yearly/continent", "Continent"),
-        ], lambda slug: build_document_stats_url(stats_type_override=slug))
-
-
-        if not stats_type:
-            return HttpResponseRedirect(build_document_stats_url(stats_type_override=possible_document_stats_types[0][0]))
-
-
-        possible_document_types = add_url_to_choices([
-            ("", "All"),
-            ("rfc", "RFCs"),
-            ("draft", "Drafts"),
-        ], lambda slug: build_document_stats_url(get_overrides={ "type": slug }))
-
-        document_type = get_choice(request, "type", possible_document_types) or ""
-
-
-        possible_time_choices = add_url_to_choices([
-            ("", "All time"),
-            ("5y", "Past 5 years"),
-        ], lambda slug: build_document_stats_url(get_overrides={ "time": slug }))
-
-        time_choice = request.GET.get("time") or ""
-
-        from_time = None
-        if "y" in time_choice:
-            try:
-                y = int(time_choice.rstrip("y"))
-                from_time = datetime.datetime.today() - dateutil.relativedelta.relativedelta(years=y)
-            except ValueError:
-                pass
-
-        chart_data = []
-        table_data = []
-        stats_title = ""
-        template_name = stats_type.replace("/", "_")
-        bin_size = 1
-        alias_data = []
-        eu_countries = None
-
-
-        if any(stats_type == t[0] for t in possible_document_stats_types):
-            # filter documents
-            docalias_filters = Q(docs__type="draft")
-
-            rfc_state = State.objects.get(type="draft", slug="rfc")
-            if document_type == "rfc":
-                docalias_filters &= Q(docs__states=rfc_state)
-            elif document_type == "draft":
-                docalias_filters &= ~Q(docs__states=rfc_state)
-
-            if from_time:
-                # this is actually faster than joining in the database,
-                # despite the round-trip back and forth
-                docs_within_time_constraint = list(Document.objects.filter(
-                    type="draft",
-                    docevent__time__gte=from_time,
-                    docevent__type__in=["published_rfc", "new_revision"],
-                ).values_list("pk"))
-
-                docalias_filters &= Q(docs__in=docs_within_time_constraint)
-
-            docalias_qs = DocAlias.objects.filter(docalias_filters)
-
-            if document_type == "rfc":
-                doc_label = "RFC"
-            elif document_type == "draft":
-                doc_label = "draft"
-            else:
-                doc_label = "document"
-
-            total_docs = docalias_qs.values_list("docs__name").distinct().count()
-
-            def generate_canonical_names(values):
-                for doc_id, ts in itertools.groupby(values.order_by("docs__name"), lambda a: a[0]):
-                    chosen = None
-                    for t in ts:
-                        if chosen is None:
-                            chosen = t
-                        else:
-                            if t[1].startswith("rfc"):
-                                chosen = t
-                            elif t[1].startswith("draft") and not chosen[1].startswith("rfc"):
-                                chosen = t
-                    yield chosen
-
-            if stats_type == "authors":
-                stats_title = "Number of authors for each {}".format(doc_label)
-
-                bins = defaultdict(set)
-
-                for name, canonical_name, author_count in generate_canonical_names(docalias_qs.values_list("docs__name", "name").annotate(Count("docs__documentauthor"))):
-                    bins[author_count or 0].add(canonical_name)
-
-                series_data = []
-                for author_count, names in sorted(bins.items(), key=lambda t: t[0]):
-                    percentage = len(names) * 100.0 / (total_docs or 1)
-                    series_data.append((author_count, percentage))
-                    table_data.append((author_count, percentage, len(names), list(names)[:names_limit]))
-
-                chart_data.append({ "data": series_data })
-
-            elif stats_type == "pages":
-                stats_title = "Number of pages for each {}".format(doc_label)
-
-                bins = defaultdict(set)
-
-                for name, canonical_name, pages in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__pages")):
-                    bins[pages or 0].add(canonical_name)
-
-                series_data = []
-                for pages, names in sorted(bins.items(), key=lambda t: t[0]):
-                    percentage = len(names) * 100.0 / (total_docs or 1)
-                    if pages is not None:
-                        series_data.append((pages, len(names)))
-                        table_data.append((pages, percentage, len(names), list(names)[:names_limit]))
-
-                chart_data.append({ "data": series_data })
-
-            elif stats_type == "words":
-                stats_title = "Number of words for each {}".format(doc_label)
-
-                bin_size = 500
-
-                bins = defaultdict(set)
-
-                for name, canonical_name, words in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__words")):
-                    bins[put_into_bin(words, bin_size)].add(canonical_name)
-
-                series_data = []
-                for (value, words), names in sorted(bins.items(), key=lambda t: t[0][0]):
-                    percentage = len(names) * 100.0 / (total_docs or 1)
-                    if words is not None:
-                        series_data.append((value, len(names)))
-
-                    table_data.append((words, percentage, len(names), list(names)[:names_limit]))
-
-                chart_data.append({ "data": series_data })
-
-            elif stats_type == "format":
-                stats_title = "Submission formats for each {}".format(doc_label)
-
-                bins = defaultdict(set)
-
-                # on new documents, we should have a Submission row with the file types
-                submission_types = {}
-
-                for doc_name, file_types in Submission.objects.values_list("draft", "file_types").order_by("submission_date", "id"):
-                    submission_types[doc_name] = file_types
-
-                doc_names_with_missing_types = {}
-                for doc_name, canonical_name, rev in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__rev")):
-                    types = submission_types.get(doc_name)
-                    if types:
-                        for dot_ext in types.split(","):
-                            bins[dot_ext.lstrip(".").upper()].add(canonical_name)
-
-                    else:
-
-                        if canonical_name.startswith("rfc"):
-                            filename = canonical_name
-                        else:
-                            filename = canonical_name + "-" + rev
-
-                        doc_names_with_missing_types[filename] = canonical_name
-
-                # look up the remaining documents on disk
-                for filename in itertools.chain(os.listdir(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR), os.listdir(settings.RFC_PATH)):
-                    t = filename.split(".", 1)
-                    if len(t) != 2:
-                        continue
-
-                    basename, ext = t
-                    ext = ext.lower()
-                    if not any(ext==whitelisted_ext for whitelisted_ext in settings.DOCUMENT_FORMAT_WHITELIST):
-                        continue
-
-                    canonical_name = doc_names_with_missing_types.get(basename)
-
-                    if canonical_name:
-                        bins[ext.upper()].add(canonical_name)
-
-                series_data = []
-                for fmt, names in sorted(bins.items(), key=lambda t: t[0]):
-                    percentage = len(names) * 100.0 / (total_docs or 1)
-                    series_data.append((fmt, len(names)))
-
-                    table_data.append((fmt, percentage, len(names), list(names)[:names_limit]))
-
-                chart_data.append({ "data": series_data })
-
-            elif stats_type == "formlang":
-                stats_title = "Formal languages used for each {}".format(doc_label)
-
-                bins = defaultdict(set)
-
-                for name, canonical_name, formal_language_name in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__formal_languages__name")):
-                    bins[formal_language_name or ""].add(canonical_name)
-
-                series_data = []
-                for formal_language, names in sorted(bins.items(), key=lambda t: t[0]):
-                    percentage = len(names) * 100.0 / (total_docs or 1)
-                    if formal_language is not None:
-                        series_data.append((formal_language, len(names)))
-                        table_data.append((formal_language, percentage, len(names), list(names)[:names_limit]))
-
-                chart_data.append({ "data": series_data })
-
-        elif any(stats_type == t[0] for t in possible_author_stats_types):
-            person_filters = Q(documentauthor__document__type="draft")
-
-            # filter persons
-            rfc_state = State.objects.get(type="draft", slug="rfc")
-            if document_type == "rfc":
-                person_filters &= Q(documentauthor__document__states=rfc_state)
-            elif document_type == "draft":
-                person_filters &= ~Q(documentauthor__document__states=rfc_state)
-
-            if from_time:
-                # this is actually faster than joining in the database,
-                # despite the round-trip back and forth
-                docs_within_time_constraint = set(Document.objects.filter(
-                    type="draft",
-                    docevent__time__gte=from_time,
-                    docevent__type__in=["published_rfc", "new_revision"],
-                ).values_list("pk"))
-
-                person_filters &= Q(documentauthor__document__in=docs_within_time_constraint)
-
-            person_qs = Person.objects.filter(person_filters)
-
-            if document_type == "rfc":
-                doc_label = "RFC"
-            elif document_type == "draft":
-                doc_label = "draft"
-            else:
-                doc_label = "document"
-
-            if stats_type == "author/documents":
-                stats_title = "Number of {}s per author".format(doc_label)
-
-                bins = defaultdict(set)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                for name, document_count in person_qs.values_list("name").annotate(Count("documentauthor")):
-                    bins[document_count or 0].add(name)
-
-                total_persons = count_bins(bins)
-
-                series_data = []
-                for document_count, names in sorted(bins.items(), key=lambda t: t[0]):
-                    percentage = len(names) * 100.0 / (total_persons or 1)
-                    series_data.append((document_count, percentage))
-                    plain_names = sorted([ plain_name(n) for n in names ])
-                    table_data.append((document_count, percentage, len(plain_names), list(plain_names)[:names_limit]))
-
-                chart_data.append({ "data": series_data })
-
-            elif stats_type == "author/affiliation":
-                stats_title = "Number of {} authors per affiliation".format(doc_label)
-
-                bins = defaultdict(set)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                # Since people don't write the affiliation names in the
-                # same way, and we don't want to go back and edit them
-                # either, we transform them here.
-
-                name_affiliation_set = {
-                    (name, affiliation)
-                    for name, affiliation in person_qs.values_list("name", "documentauthor__affiliation")
-                }
-
-                aliases = get_aliased_affiliations(affiliation for _, affiliation in name_affiliation_set)
-
-                for name, affiliation in name_affiliation_set:
-                    bins[aliases.get(affiliation, affiliation)].add(name)
-
-                prune_unknown_bin_with_known(bins)
-                total_persons = count_bins(bins)
-
-                series_data = []
-                for affiliation, names in sorted(bins.items(), key=lambda t: t[0].lower()):
-                    percentage = len(names) * 100.0 / (total_persons or 1)
-                    if affiliation:
-                        series_data.append((affiliation, len(names)))
-                    plain_names = sorted([ plain_name(n) for n in names ])
-                    table_data.append((affiliation, percentage, len(plain_names), list(plain_names)[:names_limit]))
-
-                series_data.sort(key=lambda t: t[1], reverse=True)
-                series_data = series_data[:30]
-
-                chart_data.append({ "data": series_data })
-
-                for alias, name in sorted(aliases.items(), key=lambda t: t[1]):
-                    alias_data.append((name, alias))
-
-            elif stats_type == "author/country":
-                stats_title = "Number of {} authors per country".format(doc_label)
-
-                bins = defaultdict(set)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                # Since people don't write the country names in the
-                # same way, and we don't want to go back and edit them
-                # either, we transform them here.
-
-                name_country_set = {
-                    (name, country)
-                    for name, country in person_qs.values_list("name", "documentauthor__country")
-                }
-
-                aliases = get_aliased_countries(country for _, country in name_country_set)
-
-                countries = { c.name: c for c in CountryName.objects.all() }
-                eu_name = "EU"
-                eu_countries = { c for c in countries.values() if c.in_eu }
-
-                for name, country in name_country_set:
-                    country_name = aliases.get(country, country)
-                    bins[country_name].add(name)
-
-                    c = countries.get(country_name)
-                    if c and c.in_eu:
-                        bins[eu_name].add(name)
-
-                prune_unknown_bin_with_known(bins)
-                total_persons = count_bins(bins)
-
-                series_data = []
-                for country, names in sorted(bins.items(), key=lambda t: t[0].lower()):
-                    percentage = len(names) * 100.0 / (total_persons or 1)
-                    if country:
-                        series_data.append((country, len(names)))
-                    plain_names = sorted([ plain_name(n) for n in names ])
-                    table_data.append((country, percentage, len(plain_names), list(plain_names)[:names_limit]))
+    return HttpResponseRedirect(urlreverse("ietf.stats.views.stats_index"))
 
-                series_data.sort(key=lambda t: t[1], reverse=True)
-                series_data = series_data[:30]
-
-                chart_data.append({ "data": series_data })
-
-                for alias, country_name in aliases.items():
-                    alias_data.append((country_name, alias, countries.get(country_name)))
-
-                alias_data.sort()
-
-            elif stats_type == "author/continent":
-                stats_title = "Number of {} authors per continent".format(doc_label)
-
-                bins = defaultdict(set)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                name_country_set = {
-                    (name, country)
-                    for name, country in person_qs.values_list("name", "documentauthor__country")
-                }
-
-                aliases = get_aliased_countries(country for _, country in name_country_set)
-
-                country_to_continent = dict(CountryName.objects.values_list("name", "continent__name"))
-
-                for name, country in name_country_set:
-                    country_name = aliases.get(country, country)
-                    continent_name = country_to_continent.get(country_name, "")
-                    bins[continent_name].add(name)
-
-                prune_unknown_bin_with_known(bins)
-                total_persons = count_bins(bins)
-
-                series_data = []
-                for continent, names in sorted(bins.items(), key=lambda t: t[0].lower()):
-                    percentage = len(names) * 100.0 / (total_persons or 1)
-                    if continent:
-                        series_data.append((continent, len(names)))
-                    plain_names = sorted([ plain_name(n) for n in names ])
-                    table_data.append((continent, percentage, len(plain_names), list(plain_names)[:names_limit]))
-
-                series_data.sort(key=lambda t: t[1], reverse=True)
-
-                chart_data.append({ "data": series_data })
-
-            elif stats_type == "author/citations":
-                stats_title = "Number of citations of {}s written by author".format(doc_label)
-
-                bins = defaultdict(set)
-
-                cite_relationships = list(DocRelationshipName.objects.filter(slug__in=['refnorm', 'refinfo', 'refunk', 'refold']))
-                person_filters &= Q(documentauthor__document__docalias__relateddocument__relationship__in=cite_relationships)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                for name, citations in person_qs.values_list("name").annotate(Count("documentauthor__document__docalias__relateddocument")):
-                    bins[citations or 0].add(name)
-
-                total_persons = count_bins(bins)
-
-                series_data = []
-                for citations, names in sorted(bins.items(), key=lambda t: t[0], reverse=True):
-                    percentage = len(names) * 100.0 / (total_persons or 1)
-                    series_data.append((citations, percentage))
-                    plain_names = sorted([ plain_name(n) for n in names ])
-                    table_data.append((citations, percentage, len(plain_names), list(plain_names)[:names_limit]))
-
-                chart_data.append({ "data": sorted(series_data, key=lambda t: t[0]) })
-
-            elif stats_type == "author/hindex":
-                stats_title = "h-index for {}s written by author".format(doc_label)
-
-                bins = defaultdict(set)
-
-                cite_relationships = list(DocRelationshipName.objects.filter(slug__in=['refnorm', 'refinfo', 'refunk', 'refold']))
-                person_filters &= Q(documentauthor__document__docalias__relateddocument__relationship__in=cite_relationships)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                values = person_qs.values_list("name", "documentauthor__document").annotate(Count("documentauthor__document__docalias__relateddocument"))
-                for name, ts in itertools.groupby(values.order_by("name"), key=lambda t: t[0]):
-                    h_index = compute_hirsch_index([citations for _, document, citations in ts])
-                    bins[h_index or 0].add(name)
-
-                total_persons = count_bins(bins)
-
-                series_data = []
-                for citations, names in sorted(bins.items(), key=lambda t: t[0], reverse=True):
-                    percentage = len(names) * 100.0 / (total_persons or 1)
-                    series_data.append((citations, percentage))
-                    plain_names = sorted([ plain_name(n) for n in names ])
-                    table_data.append((citations, percentage, len(plain_names), list(plain_names)[:names_limit]))
-
-                chart_data.append({ "data": sorted(series_data, key=lambda t: t[0]) })
-
-        elif any(stats_type == t[0] for t in possible_yearly_stats_types):
-
-            person_filters = Q(documentauthor__document__type="draft")
-
-            # filter persons
-            rfc_state = State.objects.get(type="draft", slug="rfc")
-            if document_type == "rfc":
-                person_filters &= Q(documentauthor__document__states=rfc_state)
-            elif document_type == "draft":
-                person_filters &= ~Q(documentauthor__document__states=rfc_state)
-
-            doc_years = defaultdict(set)
-
-            docevent_qs = DocEvent.objects.filter(
-                doc__type="draft",
-                type__in=["published_rfc", "new_revision"],
-            ).values_list("doc", "time").order_by("doc")
-
-            for doc, time in docevent_qs.iterator():
-                doc_years[doc].add(time.year)
-
-            person_qs = Person.objects.filter(person_filters)
-
-            if document_type == "rfc":
-                doc_label = "RFC"
-            elif document_type == "draft":
-                doc_label = "draft"
-            else:
-                doc_label = "document"
-
-            template_name = "yearly"
-
-            years_from = from_time.year if from_time else 1
-            years_to = datetime.date.today().year - 1
-
-
-            if stats_type == "yearly/affiliation":
-                stats_title = "Number of {} authors per affiliation over the years".format(doc_label)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                name_affiliation_doc_set = {
-                    (name, affiliation, doc)
-                    for name, affiliation, doc in person_qs.values_list("name", "documentauthor__affiliation", "documentauthor__document")
-                }
-
-                aliases = get_aliased_affiliations(affiliation for _, affiliation, _ in name_affiliation_doc_set)
-
-                bins = defaultdict(set)
-                for name, affiliation, doc in name_affiliation_doc_set:
-                    a = aliases.get(affiliation, affiliation)
-                    if a:
-                        for year in doc_years.get(doc):
-                            if years_from <= year <= years_to:
-                                bins[(year, a)].add(name)
-
-                add_labeled_top_series_from_bins(chart_data, bins, limit=8)
-
-            elif stats_type == "yearly/country":
-                stats_title = "Number of {} authors per country over the years".format(doc_label)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                name_country_doc_set = {
-                    (name, country, doc)
-                    for name, country, doc in person_qs.values_list("name", "documentauthor__country", "documentauthor__document")
-                }
-
-                aliases = get_aliased_countries(country for _, country, _ in name_country_doc_set)
-
-                countries = { c.name: c for c in CountryName.objects.all() }
-                eu_name = "EU"
-                eu_countries = { c for c in countries.values() if c.in_eu }
-
-                bins = defaultdict(set)
-
-                for name, country, doc in name_country_doc_set:
-                    country_name = aliases.get(country, country)
-                    c = countries.get(country_name)
-
-                    years = doc_years.get(doc)
-                    if country_name and years:
-                        for year in years:
-                            if years_from <= year <= years_to:
-                                bins[(year, country_name)].add(name)
-
-                                if c and c.in_eu:
-                                    bins[(year, eu_name)].add(name)
-
-                add_labeled_top_series_from_bins(chart_data, bins, limit=8)
-
-
-            elif stats_type == "yearly/continent":
-                stats_title = "Number of {} authors per continent".format(doc_label)
-
-                person_qs = Person.objects.filter(person_filters)
-
-                name_country_doc_set = {
-                    (name, country, doc)
-                    for name, country, doc in person_qs.values_list("name", "documentauthor__country", "documentauthor__document")
-                }
-
-                aliases = get_aliased_countries(country for _, country, _ in name_country_doc_set)
-
-                country_to_continent = dict(CountryName.objects.values_list("name", "continent__name"))
-
-                bins = defaultdict(set)
-
-                for name, country, doc in name_country_doc_set:
-                    country_name = aliases.get(country, country)
-                    continent_name = country_to_continent.get(country_name, "")
-
-                    if continent_name:
-                        for year in doc_years.get(doc):
-                            if years_from <= year <= years_to:
-                                bins[(year, continent_name)].add(name)
-
-                add_labeled_top_series_from_bins(chart_data, bins, limit=8)
-
-        data = {
-            "chart_data": mark_safe(json.dumps(chart_data)),
-            "table_data": table_data,
-            "stats_title": stats_title,
-            "possible_document_stats_types": possible_document_stats_types,
-            "possible_author_stats_types": possible_author_stats_types,
-            "possible_yearly_stats_types": possible_yearly_stats_types,
-            "stats_type": stats_type,
-            "possible_document_types": possible_document_types,
-            "document_type": document_type,
-            "possible_time_choices": possible_time_choices,
-            "time_choice": time_choice,
-            "doc_label": doc_label,
-            "bin_size": bin_size,
-            "show_aliases_url": build_document_stats_url(get_overrides={ "showaliases": "1" }),
-            "hide_aliases_url": build_document_stats_url(get_overrides={ "showaliases": None }),
-            "alias_data": alias_data,
-            "eu_countries": sorted(eu_countries or [], key=lambda c: c.name),
-            "content_template": "stats/document_stats_{}.html".format(template_name),
-        }
-        # Logs are full of these, but nobody is using them
-        # log("Cache miss for '%s'.  Data size: %sk" % (cache_key, len(str(data))/1000))
-        cache.set(cache_key, data, 24*60*60)
-    return render(request, "stats/document_stats.html", data)
 
 def known_countries_list(request, stats_type=None, acronym=None):
     countries = CountryName.objects.prefetch_related("countryalias_set")
@@ -760,252 +137,7 @@ def known_countries_list(request, stats_type=None, acronym=None):
     })
 
 def meeting_stats(request, num=None, stats_type=None):
-    meeting = None
-    if num is not None:
-        meeting = get_object_or_404(Meeting, number=num, type="ietf")
-
-    def build_meeting_stats_url(number=None, stats_type_override=Ellipsis, get_overrides=None):
-        if get_overrides is None:
-            get_overrides = {}
-        kwargs = {
-            "stats_type": stats_type if stats_type_override is Ellipsis else stats_type_override,
-        }
-
-        if number is not None:
-            kwargs["num"] = number
-
-        return urlreverse(meeting_stats, kwargs={ k: v for k, v in kwargs.items() if v is not None }) + generate_query_string(request.GET, get_overrides)
-
-    cache_key = ("stats:meeting_stats:%s:%s:%s" % (num, stats_type, slugify(request.META.get('QUERY_STRING',''))))[:228]
-    data = cache.get(cache_key)
-    if not data:
-        names_limit = settings.STATS_NAMES_LIMIT
-        # statistics types
-        if meeting:
-            possible_stats_types = add_url_to_choices([
-                ("country", "Country"),
-                ("continent", "Continent"),
-            ], lambda slug: build_meeting_stats_url(number=meeting.number, stats_type_override=slug))
-        else:
-            possible_stats_types = add_url_to_choices([
-                ("overview", "Overview"),
-                ("country", "Country"),
-                ("continent", "Continent"),
-            ], lambda slug: build_meeting_stats_url(number=None, stats_type_override=slug))
-
-        if not stats_type:
-            return HttpResponseRedirect(build_meeting_stats_url(number=num, stats_type_override=possible_stats_types[0][0]))
-
-        chart_data = []
-        piechart_data = []
-        table_data = []
-        stats_title = ""
-        template_name = stats_type
-        bin_size = 1
-        eu_countries = None
-
-        def get_country_mapping(attendees):
-            return {
-                alias.alias: alias.country
-                for alias in CountryAlias.objects.filter(alias__in=set(r.country_code for r in attendees)).select_related("country", "country__continent")
-                if alias.alias.isupper()
-            }
-
-        def reg_name(r):
-            return email.utils.formataddr(((r.first_name + " " + r.last_name).strip(), r.email))
-
-        if meeting and any(stats_type == t[0] for t in possible_stats_types):
-            attendees = MeetingRegistration.objects.filter(
-                meeting=meeting,
-                reg_type__in=['onsite', 'remote']
-            ).filter(
-                Q( attended=True) | Q( checkedin=True )
-            )
-
-            if stats_type == "country":
-                stats_title = "Number of attendees for {} {} per country".format(meeting.type.name, meeting.number)
-
-                bins = defaultdict(set)
-
-                country_mapping = get_country_mapping(attendees)
-
-                eu_name = "EU"
-                eu_countries = set(CountryName.objects.filter(in_eu=True))
-
-                for r in attendees:
-                    name = reg_name(r)
-                    c = country_mapping.get(r.country_code)
-                    bins[c.name if c else ""].add(name)
-
-                    if c and c.in_eu:
-                        bins[eu_name].add(name)
-
-                prune_unknown_bin_with_known(bins)
-                total_attendees = count_bins(bins)
-
-                series_data = []
-                for country, names in sorted(bins.items(), key=lambda t: t[0].lower()):
-                    percentage = len(names) * 100.0 / (total_attendees or 1)
-                    if country:
-                        series_data.append((country, len(names)))
-                    table_data.append((country, percentage, len(names), list(names)[:names_limit]))
-
-                    if country and country != eu_name:
-                        piechart_data.append({ "name": country, "y": percentage })
-
-                series_data.sort(key=lambda t: t[1], reverse=True)
-                series_data = series_data[:20]
-
-                piechart_data.sort(key=lambda d: d["y"], reverse=True)
-                pie_cut_off = 8
-                piechart_data = piechart_data[:pie_cut_off] + [{ "name": "Other", "y": sum(d["y"] for d in piechart_data[pie_cut_off:])}]
-
-                chart_data.append({ "data": series_data })
-
-            elif stats_type == "continent":
-                stats_title = "Number of attendees for {} {} per continent".format(meeting.type.name, meeting.number)
-
-                bins = defaultdict(set)
-
-                country_mapping = get_country_mapping(attendees)
-
-                for r in attendees:
-                    name = reg_name(r)
-                    c = country_mapping.get(r.country_code)
-                    bins[c.continent.name if c else ""].add(name)
-
-                prune_unknown_bin_with_known(bins)
-                total_attendees = count_bins(bins)
-
-                series_data = []
-                for continent, names in sorted(bins.items(), key=lambda t: t[0].lower()):
-                    percentage = len(names) * 100.0 / (total_attendees or 1)
-                    if continent:
-                        series_data.append((continent, len(names)))
-                    table_data.append((continent, percentage, len(names), list(names)[:names_limit]))
-
-                series_data.sort(key=lambda t: t[1], reverse=True)
-
-                chart_data.append({ "data": series_data })
-
-
-        elif not meeting and any(stats_type == t[0] for t in possible_stats_types):
-            template_name = "overview"
-
-            attendees = MeetingRegistration.objects.filter(
-                meeting__type="ietf",
-                attended=True,
-                reg_type__in=['onsite', 'remote']
-            ).filter(
-                Q( attended=True) | Q( checkedin=True )  
-            ).select_related('meeting')
-
-            if stats_type == "overview":
-                stats_title = "Number of attendees per meeting"
-
-                continents = {}
-                
-                meetings = Meeting.objects.filter(type='ietf', date__lte=datetime.date.today()).order_by('number')
-                for m in meetings:
-                    country = CountryName.objects.get(slug=m.country)
-                    continents[country.continent.name] = country.continent.name
-
-                bins = defaultdict(set)
-
-                for r in attendees:
-                    meeting_number = int(r.meeting.number)
-                    name = reg_name(r)
-                    bins[meeting_number].add(name)
-
-                series_data = {}
-                for continent in list(continents.keys()):
-                    series_data[continent] = []
-
-                for m in meetings:
-                    country = CountryName.objects.get(slug=m.country)
-                    url = build_meeting_stats_url(number=m.number,
-                                                  stats_type_override="country")
-                    for continent in list(continents.keys()):
-                        if continent == country.continent.name:
-                            d = {
-                                "name": "IETF {} - {}, {}".format(int(m.number), m.city, country),
-                                "x": int(m.number),
-                                "y": m.attendees,
-                                "date": m.date.strftime("%d %b %Y"),
-                                "url": url,
-                                }
-                        else:
-                            d = {
-                                "x": int(m.number),
-                                "y": 0,
-                                }
-                        series_data[continent].append(d)
-                    table_data.append((m, url,
-                                       m.attendees, country))
-
-                for continent in list(continents.keys()):
-#                    series_data[continent].sort(key=lambda t: t[0]["x"])
-                    chart_data.append( { "name": continent,
-                                         "data": series_data[continent] })
-                    
-                table_data.sort(key=lambda t: int(t[0].number), reverse=True)
-
-            elif stats_type == "country":
-                stats_title = "Number of attendees per country across meetings"
-
-                country_mapping = get_country_mapping(attendees)
-
-                eu_name = "EU"
-                eu_countries = set(CountryName.objects.filter(in_eu=True))
-
-                bins = defaultdict(set)
-
-                for r in attendees:
-                    meeting_number = int(r.meeting.number)
-                    name = reg_name(r)
-                    c = country_mapping.get(r.country_code)
-
-                    if c:
-                        bins[(meeting_number, c.name)].add(name)
-                        if c.in_eu:
-                            bins[(meeting_number, eu_name)].add(name)
-
-                add_labeled_top_series_from_bins(chart_data, bins, limit=8)
-
-
-            elif stats_type == "continent":
-                stats_title = "Number of attendees per continent across meetings"
-
-                country_mapping = get_country_mapping(attendees)
-
-                bins = defaultdict(set)
-
-                for r in attendees:
-                    meeting_number = int(r.meeting.number)
-                    name = reg_name(r)
-                    c = country_mapping.get(r.country_code)
-
-                    if c:
-                        bins[(meeting_number, c.continent.name)].add(name)
-
-                add_labeled_top_series_from_bins(chart_data, bins, limit=8)
-        data = {
-            "chart_data": mark_safe(json.dumps(chart_data)),
-            "piechart_data": mark_safe(json.dumps(piechart_data)),
-            "table_data": table_data,
-            "stats_title": stats_title,
-            "possible_stats_types": possible_stats_types,
-            "stats_type": stats_type,
-            "bin_size": bin_size,
-            "meeting": meeting,
-            "eu_countries": sorted(eu_countries or [], key=lambda c: c.name),
-            "content_template": "stats/meeting_stats_{}.html".format(template_name),
-        }
-        # Logs are full of these, but nobody is using them...
-        # log("Cache miss for '%s'.  Data size: %sk" % (cache_key, len(str(data))/1000))
-        cache.set(cache_key, data, 24*60*60)
-    #
-    return render(request, "stats/meeting_stats.html", data)
+    return HttpResponseRedirect(urlreverse("ietf.stats.views.stats_index"))
 
 
 @login_required
@@ -1070,12 +202,12 @@ def parse_date(s):
         except ValueError:
             return None
 
-    today = datetime.date.today()
+    today = date_today(DEADLINE_TZINFO)
     from_date = parse_date(request.GET.get("from")) or today - dateutil.relativedelta.relativedelta(years=1)
     to_date = parse_date(request.GET.get("to")) or today
 
-    from_time = datetime.datetime.combine(from_date, datetime.time.min)
-    to_time = datetime.datetime.combine(to_date, datetime.time.max)
+    from_time = datetime.datetime.combine(from_date, datetime.time.min, tzinfo=DEADLINE_TZINFO)
+    to_time = datetime.datetime.combine(to_date, datetime.time.max, tzinfo=DEADLINE_TZINFO)
 
     # teams/reviewers
     teams = list(Group.objects.exclude(reviewrequest=None).distinct().order_by("name"))
diff --git a/ietf/secr/proceedings/migrations/__init__.py b/ietf/status/__init__.py
similarity index 100%
rename from ietf/secr/proceedings/migrations/__init__.py
rename to ietf/status/__init__.py
diff --git a/ietf/status/admin.py b/ietf/status/admin.py
new file mode 100644
index 0000000000..f9c4e891a7
--- /dev/null
+++ b/ietf/status/admin.py
@@ -0,0 +1,19 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from datetime import datetime
+from django.contrib import admin
+from django.template.defaultfilters import slugify
+from .models import Status
+
+class StatusAdmin(admin.ModelAdmin):
+    list_display = ['title', 'body', 'active', 'date', 'by', 'page']
+    raw_id_fields = ['by']
+
+    def get_changeform_initial_data(self, request):
+        date = datetime.now()
+        return {
+            "slug": slugify(f"{date.year}-{date.month}-{date.day}-"),
+        }
+    
+admin.site.register(Status, StatusAdmin)
diff --git a/ietf/status/apps.py b/ietf/status/apps.py
new file mode 100644
index 0000000000..ba64a41afc
--- /dev/null
+++ b/ietf/status/apps.py
@@ -0,0 +1,9 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from django.apps import AppConfig
+
+
+class StatusConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "ietf.status"
diff --git a/ietf/status/migrations/0001_initial.py b/ietf/status/migrations/0001_initial.py
new file mode 100644
index 0000000000..5185189496
--- /dev/null
+++ b/ietf/status/migrations/0001_initial.py
@@ -0,0 +1,75 @@
+# Generated by Django 4.2.13 on 2024-07-21 22:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ("person", "0002_alter_historicalperson_ascii_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Status",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date", models.DateTimeField(default=django.utils.timezone.now)),
+                ("slug", models.SlugField(unique=True)),
+                (
+                    "title",
+                    models.CharField(
+                        help_text="Your site status notification title.",
+                        max_length=255,
+                        verbose_name="Status title",
+                    ),
+                ),
+                (
+                    "body",
+                    models.CharField(
+                        help_text="Your site status notification body.",
+                        max_length=255,
+                        verbose_name="Status body",
+                    ),
+                ),
+                (
+                    "active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Only active messages will be shown.",
+                        verbose_name="Active?",
+                    ),
+                ),
+                (
+                    "page",
+                    models.TextField(
+                        blank=True,
+                        help_text="More detail shown after people click 'Read more'. If empty no 'read more' will be shown",
+                        null=True,
+                        verbose_name="More detail (markdown)",
+                    ),
+                ),
+                (
+                    "by",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="person.person"
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name_plural": "statuses",
+            },
+        ),
+    ]
diff --git a/ietf/secr/proceedings/templatetags/__init__.py b/ietf/status/migrations/__init__.py
similarity index 100%
rename from ietf/secr/proceedings/templatetags/__init__.py
rename to ietf/status/migrations/__init__.py
diff --git a/ietf/status/models.py b/ietf/status/models.py
new file mode 100644
index 0000000000..c551920275
--- /dev/null
+++ b/ietf/status/models.py
@@ -0,0 +1,23 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from django.utils import timezone
+from django.db import models
+from django.db.models import ForeignKey
+
+import debug                            # pyflakes:ignore
+
+class Status(models.Model):
+    
+    date = models.DateTimeField(default=timezone.now)
+    slug = models.SlugField(blank=False, null=False, unique=True)
+    title = models.CharField(max_length=255, verbose_name="Status title", help_text="Your site status notification title.")
+    body = models.CharField(max_length=255, verbose_name="Status body", help_text="Your site status notification body.", unique=False)    
+    active = models.BooleanField(default=True, verbose_name="Active?", help_text="Only active messages will be shown.")
+    by = ForeignKey('person.Person', on_delete=models.CASCADE)
+    page = models.TextField(blank=True, null=True, verbose_name="More detail (markdown)", help_text="More detail shown after people click 'Read more'. If empty no 'read more' will be shown")
+
+    def __str__(self):
+        return "{} {} {} {}".format(self.date, self.active, self.by, self.title)
+    class Meta:
+        verbose_name_plural = "statuses"
diff --git a/ietf/status/tests.py b/ietf/status/tests.py
new file mode 100644
index 0000000000..9c0dd9114e
--- /dev/null
+++ b/ietf/status/tests.py
@@ -0,0 +1,120 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+import debug    # pyflakes:ignore
+
+from django.urls import reverse as urlreverse
+from ietf.utils.test_utils import TestCase
+from ietf.person.models import Person
+from ietf.status.models import Status
+
+class StatusTests(TestCase):
+    def test_status_latest_html(self):
+        status = Status.objects.create(
+            title = "my title 1",
+            body = "my body 1",
+            active = True,
+            by = Person.objects.get(user__username='ad'),
+            slug = "2024-1-1-my-title-1"
+        )
+        status.save()
+
+        url = urlreverse('ietf.status.views.status_latest_html')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, 'my title 1')
+        self.assertContains(r, 'my body 1')
+
+        status.delete()
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertNotContains(r, 'my title 1')
+        self.assertNotContains(r, 'my body 1')
+
+    def test_status_latest_json(self):
+        url = urlreverse('ietf.status.views.status_latest_json')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        data = r.json()
+        self.assertFalse(data["hasMessage"])
+
+        status = Status.objects.create(
+            title = "my title 1",
+            body = "my body 1",
+            active = True,
+            by = Person.objects.get(user__username='ad'),
+            slug = "2024-1-1-my-title-1"
+        )
+        status.save()
+
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        data = r.json()
+        self.assertTrue(data["hasMessage"])
+        self.assertEqual(data["title"], "my title 1")
+        self.assertEqual(data["body"], "my body 1")
+        self.assertEqual(data["slug"], '2024-1-1-my-title-1')
+        self.assertEqual(data["url"], '/status/2024-1-1-my-title-1')
+
+        status.delete()
+
+    def test_status_latest_redirect(self):
+        url = urlreverse('ietf.status.views.status_latest_redirect')
+        r = self.client.get(url)
+        # without a Status it should return Not Found
+        self.assertEqual(r.status_code, 404)
+
+        status = Status.objects.create(
+            title = "my title 1",
+            body = "my body 1",
+            active = True,
+            by = Person.objects.get(user__username='ad'),
+            slug = "2024-1-1-my-title-1"
+        )
+        status.save()
+
+        r = self.client.get(url)
+        # with a Status it should redirect
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(r.headers["Location"], "/status/2024-1-1-my-title-1")
+        
+        status.delete()
+
+    def test_status_page(self):
+        slug = "2024-1-1-my-unique-slug"
+        r = self.client.get(f'/status/{slug}/')
+        # without a Status it should return Not Found
+        self.assertEqual(r.status_code, 404)
+
+        # status without `page` markdown should still 200
+        status = Status.objects.create(
+            title = "my title 1",
+            body = "my body 1",
+            active = True,
+            by = Person.objects.get(user__username='ad'),
+            slug = slug
+        )
+        status.save()
+
+        r = self.client.get(f'/status/{slug}/')
+        self.assertEqual(r.status_code, 200)
+        
+        status.delete()
+
+        test_string = 'a string that'
+        status = Status.objects.create(
+            title = "my title 1",
+            body = "my body 1",
+            active = True,
+            by = Person.objects.get(user__username='ad'),
+            slug = slug,
+            page = f"# {test_string}"
+        )
+        status.save()
+
+        r = self.client.get(f'/status/{slug}/')
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, test_string)
+        
+        status.delete()
diff --git a/ietf/status/urls.py b/ietf/status/urls.py
new file mode 100644
index 0000000000..060c0257e5
--- /dev/null
+++ b/ietf/status/urls.py
@@ -0,0 +1,12 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from ietf.status import views
+from ietf.utils.urls import url
+
+urlpatterns = [
+    url(r"^$", views.status_latest_redirect),
+    url(r"^latest$", views.status_latest_html),
+    url(r"^latest.json$", views.status_latest_json),
+    url(r"(?P<slug>.*)", views.status_page)
+]
diff --git a/ietf/status/views.py b/ietf/status/views.py
new file mode 100644
index 0000000000..9037d01dc2
--- /dev/null
+++ b/ietf/status/views.py
@@ -0,0 +1,46 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from django.urls import reverse as urlreverse
+from django.http import HttpResponseRedirect, HttpResponseNotFound, JsonResponse
+from ietf.utils import markdown
+from django.shortcuts import render, get_object_or_404
+from ietf.status.models import Status
+
+import debug                            # pyflakes:ignore
+
+def get_last_active_status():
+    status = Status.objects.filter(active=True).order_by("-date").first()
+    if status is None:
+        return { "hasMessage": False }
+
+    context = {
+        "hasMessage": True,
+        "id": status.id,
+        "slug": status.slug,
+        "title": status.title,
+        "body": status.body,
+        "url": urlreverse("ietf.status.views.status_page", kwargs={ "slug": status.slug }),
+        "date": status.date.isoformat()
+    }
+    return context
+
+def status_latest_html(request):
+    return render(request, "status/latest.html", context=get_last_active_status())
+
+def status_page(request, slug):
+    sanitised_slug = slug.rstrip("/")
+    status = get_object_or_404(Status, slug=sanitised_slug)
+    return render(request, "status/status.html", context={
+        'status': status,
+        'status_page_html': markdown.markdown(status.page or ""),
+    })
+
+def status_latest_json(request):
+    return JsonResponse(get_last_active_status())
+
+def status_latest_redirect(request):
+    context = get_last_active_status()
+    if context["hasMessage"] == True:
+        return HttpResponseRedirect(context["url"])
+    return HttpResponseNotFound()
diff --git a/ietf/submit/.gitignore b/ietf/submit/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/submit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py
index 5822f155f5..e02b686576 100644
--- a/ietf/submit/checkers.py
+++ b/ietf/submit/checkers.py
@@ -4,6 +4,7 @@
 
 import io
 import os
+from pathlib import Path
 import re
 import shutil
 import sys
@@ -14,10 +15,10 @@
 
 import debug                            # pyflakes:ignore
 
+from ietf.utils import tool_version
 from ietf.utils.log import log, assertion
-from ietf.utils.models import VersionInfo
 from ietf.utils.pipe import pipe
-from ietf.utils.test_runner import set_coverage_checking
+from ietf.utils.test_runner import disable_coverage
 
 class DraftSubmissionChecker(object):
     name = ""
@@ -177,8 +178,10 @@ def check_file_txt(self, path):
         model_list = list(set(model_list))
 
         command = "xym"
-        cmd_version = VersionInfo.objects.get(command=command).version
-        message = "%s:\n%s\n\n" % (cmd_version, out.replace('\n\n','\n').strip() if code == 0 else err)
+        message = "{version}:\n{output}\n\n".format(
+            version=tool_version[command], 
+            output=out.replace('\n\n', '\n').strip() if code == 0 else err,
+        )
 
         results.append({
             "name": name,
@@ -209,7 +212,6 @@ def check_file_txt(self, path):
                 # pyang
                 cmd_template = settings.SUBMIT_PYANG_COMMAND
                 command = [ w for w in cmd_template.split() if not '=' in w ][0]
-                cmd_version = VersionInfo.objects.get(command=command).version
                 cmd = cmd_template.format(libs=modpath, model=path)
                 venv_path = os.environ.get('VIRTUAL_ENV') or os.path.join(os.getcwd(), 'env')
                 venv_bin = os.path.join(venv_path, 'bin')
@@ -238,40 +240,55 @@ def check_file_txt(self, path):
                             except ValueError:
                                 pass
                 #passed = passed and code == 0 # For the submission tool.  Yang checks always pass
-                message += "%s: %s:\n%s\n" % (cmd_version, cmd_template, out+"No validation errors\n" if (code == 0 and len(err) == 0) else out+err)
+                message += "{version}: {template}:\n{output}\n".format(
+                    version=tool_version[command],
+                    template=cmd_template,
+                    output=out + "No validation errors\n" if (code == 0 and len(err) == 0) else out + err,
+                )
 
                 # yanglint
-                set_coverage_checking(False) # we can't count the following as it may or may not be run, depending on setup
-                if settings.SUBMIT_YANGLINT_COMMAND and os.path.exists(settings.YANGLINT_BINARY):
-                    cmd_template = settings.SUBMIT_YANGLINT_COMMAND
-                    command = [ w for w in cmd_template.split() if not '=' in w ][0]
-                    cmd_version = VersionInfo.objects.get(command=command).version
-                    cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, tmplib=workdir,
-                        draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, ianalib=settings.SUBMIT_YANG_IANA_MODEL_DIR,
-                        cataloglib=settings.SUBMIT_YANG_CATALOG_MODEL_DIR, )
-                    code, out, err = pipe(cmd)
-                    out = out.decode('utf-8')
-                    err = err.decode('utf-8')
-                    if code > 0 or len(err.strip()) > 0:
-                        err_lines = err.splitlines()
-                        for line in err_lines:
-                            if line.strip():
-                                try:
-                                    if 'err : ' in line:
-                                        errors += 1
-                                    if 'warn: ' in line:
-                                        warnings += 1
-                                except ValueError:
-                                    pass
-                    #passed = passed and code == 0 # For the submission tool.  Yang checks always pass
-                    message += "%s: %s:\n%s\n" % (cmd_version, cmd_template, out+"No validation errors\n" if (code == 0 and len(err) == 0) else out+err)
-                set_coverage_checking(True)
+                with disable_coverage():  # pragma: no cover
+                    if settings.SUBMIT_YANGLINT_COMMAND and os.path.exists(settings.YANGLINT_BINARY):
+                        cmd_template = settings.SUBMIT_YANGLINT_COMMAND
+                        command = [ w for w in cmd_template.split() if not '=' in w ][0]
+                        cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, tmplib=workdir,
+                            draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, ianalib=settings.SUBMIT_YANG_IANA_MODEL_DIR,
+                            cataloglib=settings.SUBMIT_YANG_CATALOG_MODEL_DIR, )
+                        code, out, err = pipe(cmd)
+                        out = out.decode('utf-8')
+                        err = err.decode('utf-8')
+                        if code > 0 or len(err.strip()) > 0:
+                            err_lines = err.splitlines()
+                            for line in err_lines:
+                                if line.strip():
+                                    try:
+                                        if 'err : ' in line:
+                                            errors += 1
+                                        if 'warn: ' in line:
+                                            warnings += 1
+                                    except ValueError:
+                                        pass
+                        #passed = passed and code == 0 # For the submission tool.  Yang checks always pass
+                        message += "{version}: {template}:\n{output}\n".format(
+                            version=tool_version[command],
+                            template=cmd_template,
+                            output=out + "No validation errors\n" if (code == 0 and len(err) == 0) else out + err,
+                        )
             else:
                 errors += 1
                 message += "No such file: %s\nPossible mismatch between extracted xym file name and returned module name?\n" % (path)
 
             dest = os.path.join(settings.SUBMIT_YANG_DRAFT_MODEL_DIR, model)
             shutil.move(path, dest)
+            ftp_dest = Path(settings.FTP_DIR) / "yang" / "draftmod" / model
+            try:
+                os.link(dest, ftp_dest)
+            except IOError as ex:
+                log(
+                    "There was an error creating a hardlink at %s pointing to %s: %s"
+                    % (ftp_dest, dest, ex)
+                )
+
 
             # summary result
             results.append({
@@ -293,4 +310,4 @@ def check_file_txt(self, path):
         items  = [ e for res in results for e in res["items"] ]
         info['items'] = items
         info['code']['yang'] = model_list
-        return passed, message, errors, warnings, info
\ No newline at end of file
+        return passed, message, errors, warnings, info
diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
index 34f568d2ed..183e081242 100644
--- a/ietf/submit/forms.py
+++ b/ietf/submit/forms.py
@@ -1,26 +1,23 @@
-# Copyright The IETF Trust 2011-2022, All Rights Reserved
+# Copyright The IETF Trust 2011-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-import io
 import os
 import re
 import datetime
 import email
-import pytz
 import sys
 import tempfile
-import xml2rfc
 from contextlib import ExitStack
 
 from email.utils import formataddr
-from unidecode import unidecode
-from urllib.parse import urljoin
+from typing import Tuple
 
 from django import forms
 from django.conf import settings
 from django.utils.html import mark_safe, format_html # type:ignore
 from django.urls import reverse as urlreverse
+from django.utils import timezone
 from django.utils.encoding import force_str
 
 import debug                            # pyflakes:ignore
@@ -28,26 +25,27 @@
 from ietf.doc.models import Document
 from ietf.group.models import Group
 from ietf.ietfauth.utils import has_role
-from ietf.doc.fields import SearchableDocAliasesField
-from ietf.doc.models import DocAlias
+from ietf.doc.fields import SearchableDocumentsField
 from ietf.ipr.mail import utc_from_string
 from ietf.meeting.models import Meeting
 from ietf.message.models import Message
 from ietf.name.models import FormalLanguageName, GroupTypeName
 from ietf.submit.models import Submission, Preapproval
 from ietf.submit.utils import validate_submission_name, validate_submission_rev, validate_submission_document_date, remote_ip
-from ietf.submit.parsers.pdf_parser import PDFParser
 from ietf.submit.parsers.plain_parser import PlainParser
 from ietf.submit.parsers.xml_parser import XMLParser
-from ietf.utils import log
 from ietf.utils.draft import PlaintextDraft
-from ietf.utils.text import normalize_text
-from ietf.utils.xmldraft import XMLDraft, XMLParseError
+from ietf.utils.fields import ModelMultipleChoiceField
+from ietf.utils.timezone import date_today
+from ietf.utils.xmldraft import InvalidXMLError, XMLDraft, XMLParseError
 
 
 class SubmissionBaseUploadForm(forms.Form):
     xml = forms.FileField(label='.xml format', required=True)
 
+    formats: Tuple[str, ...] = ('xml',)  # allowed formats
+    base_formats: Tuple[str, ...] = ('xml',)  # at least one of these is required
+
     def __init__(self, request, *args, **kwargs):
         super(SubmissionBaseUploadForm, self).__init__(*args, **kwargs)
 
@@ -65,21 +63,14 @@ def __init__(self, request, *args, **kwargs):
         self.title = None
         self.abstract = None
         self.authors = []
-        self.parsed_draft = None
         self.file_types = []
         self.file_info = {}             # indexed by file field name, e.g., 'txt', 'xml', ...
         self.xml_version = None
-        # No code currently (14 Sep 2017) uses this class directly; it is
-        # only used through its subclasses.  The two assignments below are
-        # set to trigger an exception if it is used directly only to make
-        # sure that adequate consideration is made if it is decided to use it
-        # directly in the future.  Feel free to set these appropriately to
-        # avoid the exceptions in that case:
-        self.formats = None             # None will raise an exception in clean() if this isn't changed in a subclass
-        self.base_formats = None        # None will raise an exception in clean() if this isn't changed in a subclass
+
+        self._extracted_filenames_and_revisions = {}
 
     def set_cutoff_warnings(self):
-        now = datetime.datetime.now(pytz.utc)
+        now = timezone.now()
         meeting = Meeting.get_current_meeting()
         if not meeting:
             return
@@ -102,7 +93,7 @@ def set_cutoff_warnings(self):
             elif now <= cutoff_00:
                 self.cutoff_warning = (
                     'The last submission time for new Internet-Drafts before the meeting is %s.<br>'
-                    'After that, you will not be able to submit drafts until after %s (IETF-meeting local time)' % (cutoff_00_str, reopen_str, ))
+                    'After that, you will not be able to submit Internet-Drafts until after %s (IETF-meeting local time)' % (cutoff_00_str, reopen_str, ))
         else:
             if now.date() >= (cutoff_00.date() - meeting.idsubmit_cutoff_warning_days) and now.date() < cutoff_00.date():
                 self.cutoff_warning = ( 'The last submission time for new documents (i.e., version -00 Internet-Drafts) before %s is %s.<br><br>' % (meeting, cutoff_00_str) +
@@ -125,20 +116,17 @@ def set_cutoff_warnings(self):
                 'The I-D submission tool will be reopened after %s (IETF-meeting local time).' % (cutoff_01_str, reopen_str))
             self.shutdown = True
 
-    def clean_file(self, field_name, parser_class):
+    def _clean_file(self, field_name, parser_class):
         f = self.cleaned_data[field_name]
         if not f:
             return f
 
         self.file_info[field_name] = parser_class(f).critical_parse()
         if self.file_info[field_name].errors:
-            raise forms.ValidationError(self.file_info[field_name].errors)
+            raise forms.ValidationError(self.file_info[field_name].errors, code="critical_error")
         return f
 
     def clean_xml(self):
-        return self.clean_file("xml", XMLParser)
-
-    def clean(self):
         def format_messages(where, e, log_msgs):
             m = str(e)
             if m:
@@ -147,38 +135,12 @@ def format_messages(where, e, log_msgs):
                 import traceback
                 typ, val, tb = sys.exc_info()
                 m = traceback.format_exception(typ, val, tb)
-                m = [ l.replace('\n ', ':\n ') for l in m ]
-            msgs = [s for s in (["Error from xml2rfc (%s):" % (where,)] + m + log_msgs) if s]
+                m = [l.replace('\n ', ':\n ') for l in m]
+            msgs = [s for s in ([f"Error from xml2rfc ({where}):"] + m + log_msgs) if s]
             return msgs
 
-        if self.shutdown and not has_role(self.request.user, "Secretariat"):
-            raise forms.ValidationError('The submission tool is currently shut down')
-
-        # check general submission rate thresholds before doing any more work
-        today = datetime.date.today()
-        self.check_submissions_thresholds(
-            "for the same submitter",
-            dict(remote_ip=self.remote_ip, submission_date=today),
-            settings.IDSUBMIT_MAX_DAILY_SAME_SUBMITTER, settings.IDSUBMIT_MAX_DAILY_SAME_SUBMITTER_SIZE,
-        )
-        self.check_submissions_thresholds(
-            "across all submitters",
-            dict(submission_date=today),
-            settings.IDSUBMIT_MAX_DAILY_SUBMISSIONS, settings.IDSUBMIT_MAX_DAILY_SUBMISSIONS_SIZE,
-        )
-
-        for ext in self.formats:
-            f = self.cleaned_data.get(ext, None)
-            if not f:
-                continue
-            self.file_types.append('.%s' % ext)
-        if not ('.txt' in self.file_types or '.xml' in self.file_types):
-            if not self.errors:
-                raise forms.ValidationError('Unexpected submission file types; found %s, but %s is required' % (', '.join(self.file_types), ' or '.join(self.base_formats)))
-
-        # Determine the draft name and revision. Try XML first.
-        if self.cleaned_data.get('xml'):
-            xml_file = self.cleaned_data.get('xml')
+        xml_file = self._clean_file("xml", XMLParser)
+        if xml_file:
             tfn = None
             with ExitStack() as stack:
                 @stack.callback
@@ -201,88 +163,151 @@ def cleanup():  # called when context exited, even in case of exception
 
                 try:
                     xml_draft = XMLDraft(tfn)
+                except InvalidXMLError:
+                    raise forms.ValidationError(
+                        "The uploaded file is not valid XML. Please make sure you are uploading the correct file.",
+                        code="invalid_xml_error",
+                    )
                 except XMLParseError as e:
                     msgs = format_messages('xml', e, e.parser_msgs())
-                    self.add_error('xml', msgs)
-                    return
+                    raise forms.ValidationError(msgs, code="xml_parse_error")
                 except Exception as e:
-                    self.add_error('xml', f'Error parsing XML draft: {e}')
-                    return
-
-                self.filename = xml_draft.filename
-                self.revision = xml_draft.revision
-        elif self.cleaned_data.get('txt'):
-            # no XML available, extract from the text if we have it
-            # n.b., this code path is unused until a subclass with a 'txt' field is created.
-            txt_file = self.cleaned_data['txt']
-            txt_file.seek(0)
-            bytes = txt_file.read()
-            try:
-                text = bytes.decode(self.file_info['txt'].charset)
-                self.parsed_draft = PlaintextDraft(text, txt_file.name)
-                self.filename = self.parsed_draft.filename
-                self.revision = self.parsed_draft.revision
-            except (UnicodeDecodeError, LookupError) as e:
-                self.add_error('txt', 'Failed decoding the uploaded file: "%s"' % str(e))
+                    raise forms.ValidationError(f"Error parsing XML Internet-Draft: {e}", code="parse_exception")
+                if not xml_draft.filename:
+                    raise forms.ValidationError(
+                        "Could not extract a valid Internet-Draft name from the XML.  "
+                        "Please make sure that the top-level <rfc/> "
+                        "element has a docName attribute which provides the full Internet-Draft name including "
+                        "revision number.", 
+                        code="parse_error_filename",
+                    )
+                if not xml_draft.revision:
+                    raise forms.ValidationError(
+                        "Could not extract a valid Internet-Draft revision from the XML.  "
+                        "Please make sure that the top-level <rfc/> "
+                        "element has a docName attribute which provides the full Internet-Draft name including "
+                        "revision number.", 
+                        code="parse_error_revision",
+                    )
+                self._extracted_filenames_and_revisions['xml'] = (xml_draft.filename, xml_draft.revision)
+        return xml_file
 
-        rev_error = validate_submission_rev(self.filename, self.revision)
-        if rev_error:
-            raise forms.ValidationError(rev_error)
+    def clean(self):
+        if self.shutdown and not has_role(self.request.user, "Secretariat"):
+            raise forms.ValidationError(self.cutoff_warning)
+
+        # check general submission rate thresholds before doing any more work
+        today = date_today()
+        self.check_submissions_thresholds(
+            "for the same submitter",
+            dict(remote_ip=self.remote_ip, submission_date=today),
+            settings.IDSUBMIT_MAX_DAILY_SAME_SUBMITTER, settings.IDSUBMIT_MAX_DAILY_SAME_SUBMITTER_SIZE,
+        )
+        self.check_submissions_thresholds(
+            "across all submitters",
+            dict(submission_date=today),
+            settings.IDSUBMIT_MAX_DAILY_SUBMISSIONS, settings.IDSUBMIT_MAX_DAILY_SUBMISSIONS_SIZE,
+        )
+
+        for ext in self.formats:
+            f = self.cleaned_data.get(ext, None)
+            if not f:
+                continue
+            self.file_types.append('.%s' % ext)
+        if not any(f".{bt}" in self.file_types for bt in self.base_formats):
+            if not self.errors:
+                raise forms.ValidationError(
+                    "Unexpected submission file types; found {}, but {} is required".format(
+                        ", ".join(ft.lstrip(".") for ft in self.file_types),
+                        " or ".join(self.base_formats),
+                    )
+                )
 
         # The following errors are likely noise if we have previous field
         # errors:
         if self.errors:
             raise forms.ValidationError('')
 
+        # Check that all formats agree on draft name/rev
+        filename_from = None
+        for fmt, (extracted_name, extracted_rev) in self._extracted_filenames_and_revisions.items():
+            if self.filename is None:
+                filename_from = fmt
+                self.filename = extracted_name
+                self.revision = extracted_rev
+            elif self.filename != extracted_name:
+                raise forms.ValidationError(
+                    {fmt: f"Extracted filename '{extracted_name}' does not match filename '{self.filename}' from {filename_from} format"},
+                    code="filename_mismatch",
+                )
+            elif self.revision != extracted_rev:
+                raise forms.ValidationError(
+                    {fmt: f"Extracted revision ({extracted_rev}) does not match revision from {filename_from} format ({self.revision})"},
+                    code="revision_mismatch",
+                )
+        # Not expected to encounter missing filename/revision here because
+        # the individual fields should fail validation, but just in case
         if not self.filename:
-            raise forms.ValidationError("Could not extract a valid draft name from the upload.  "
-                "To fix this in a text upload, please make sure that the full draft name including "
-                "revision number appears centered on its own line below the document title on the "
-                "first page.  In an xml upload, please make sure that the top-level <rfc/> "
-                "element has a docName attribute which provides the full draft name including "
-                "revision number.")
-
+            raise forms.ValidationError(
+                "Unable to extract a filename from any uploaded format.",
+                code="no_filename",
+            )
         if not self.revision:
-            raise forms.ValidationError("Could not extract a valid draft revision from the upload.  "
-                "To fix this in a text upload, please make sure that the full draft name including "
-                "revision number appears centered on its own line below the document title on the "
-                "first page.  In an xml upload, please make sure that the top-level <rfc/> "
-                "element has a docName attribute which provides the full draft name including "
-                "revision number.")
-
-        if self.cleaned_data.get('txt') or self.cleaned_data.get('xml'):
-            # check group
-            self.group = self.deduce_group(self.filename)
-            # check existing
-            existing = Submission.objects.filter(name=self.filename, rev=self.revision).exclude(state__in=("posted", "cancel", "waiting-for-draft"))
-            if existing:
-                raise forms.ValidationError(
-                    format_html(
-                        'A submission with same name and revision is currently being processed. <a href="{}">Check the status here.</a>',
-                        urljoin(
-                            settings.IDTRACKER_BASE_URL,
-                            urlreverse("ietf.submit.views.submission_status", kwargs={'submission_id': existing[0].pk}),
-                        )
-                    )
+            raise forms.ValidationError(
+                "Unable to extract a revision from any uploaded format.",
+                code="no_revision",
+            )
+
+        name_error = validate_submission_name(self.filename)
+        if name_error:
+            raise forms.ValidationError(name_error)
+
+        rev_error = validate_submission_rev(self.filename, self.revision)
+        if rev_error:
+            raise forms.ValidationError(rev_error)
+
+        self.check_for_old_uppercase_collisions(self.filename)    
+
+        # check group
+        self.group = self.deduce_group(self.filename)
+        # check existing
+        existing = Submission.objects.filter(name=self.filename, rev=self.revision).exclude(state__in=("posted", "cancel", "waiting-for-draft"))
+        if existing:
+            raise forms.ValidationError(
+                format_html(
+                    'A submission with same name and revision is currently being processed. <a href="{}">Check the status here.</a>',
+                    urlreverse("ietf.submit.views.submission_status", kwargs={'submission_id': existing[0].pk}),
                 )
+            )
 
-            # cut-off
-            if self.revision == '00' and self.in_first_cut_off:
-                raise forms.ValidationError(mark_safe(self.cutoff_warning))
-            # check thresholds that depend on the draft / group
+        # cut-off
+        if self.revision == '00' and self.in_first_cut_off:
+            raise forms.ValidationError(mark_safe(self.cutoff_warning))
+        # check thresholds that depend on the draft / group
+        self.check_submissions_thresholds(
+            "for the Internet-Draft %s" % self.filename,
+            dict(name=self.filename, rev=self.revision, submission_date=today),
+            settings.IDSUBMIT_MAX_DAILY_SAME_DRAFT_NAME, settings.IDSUBMIT_MAX_DAILY_SAME_DRAFT_NAME_SIZE,
+        )
+        if self.group:
             self.check_submissions_thresholds(
-                "for the draft %s" % self.filename,
-                dict(name=self.filename, rev=self.revision, submission_date=today),
-                settings.IDSUBMIT_MAX_DAILY_SAME_DRAFT_NAME, settings.IDSUBMIT_MAX_DAILY_SAME_DRAFT_NAME_SIZE,
+                "for the group \"%s\"" % (self.group.acronym),
+                dict(group=self.group, submission_date=today),
+                settings.IDSUBMIT_MAX_DAILY_SAME_GROUP, settings.IDSUBMIT_MAX_DAILY_SAME_GROUP_SIZE,
             )
-            if self.group:
-                self.check_submissions_thresholds(
-                    "for the group \"%s\"" % (self.group.acronym),
-                    dict(group=self.group, submission_date=today),
-                    settings.IDSUBMIT_MAX_DAILY_SAME_GROUP, settings.IDSUBMIT_MAX_DAILY_SAME_GROUP_SIZE,
-                )
         return super().clean()
 
+    @staticmethod
+    def check_for_old_uppercase_collisions(name):
+        possible_collision = Document.objects.filter(name__iexact=name).first()
+        if possible_collision and possible_collision.name != name:
+            raise forms.ValidationError(
+                f"Case-conflicting draft name found: {possible_collision.name}. "
+                "Please choose a different draft name. Case-conflicting names with "
+                "the small number of legacy Internet-Drafts with names containing "
+                "upper-case letters are not permitted."
+            )
+
     @staticmethod
     def check_submissions_thresholds(which, filter_kwargs, max_amount, max_size):
         submissions = Submission.objects.filter(**filter_kwargs)
@@ -305,7 +330,7 @@ def deduce_group(name):
         else:
             name_parts = name.split("-")
             if len(name_parts) < 3:
-                raise forms.ValidationError("The draft name \"%s\" is missing a third part, please rename it" % name)
+                raise forms.ValidationError("The Internet-Draft name \"%s\" is missing a third part, please rename it" % name)
 
             if name.startswith('draft-ietf-') or name.startswith("draft-irtf-"):
                 if name_parts[1] == "ietf":
@@ -323,7 +348,7 @@ def deduce_group(name):
                 try:
                     return Group.objects.get(acronym=name_parts[2], type=group_type)
                 except Group.DoesNotExist:
-                    raise forms.ValidationError('There is no active group with acronym \'%s\', please rename your draft' % name_parts[2])
+                    raise forms.ValidationError('There is no active group with acronym \'%s\', please rename your Internet-Draft' % name_parts[2])
 
             elif name.startswith("draft-rfc-"):
                 return Group.objects.get(acronym="iesg")
@@ -337,347 +362,95 @@ def deduce_group(name):
                     if group:
                         return group
                     else:
-                        raise forms.ValidationError('Draft names starting with draft-%s- are restricted, please pick a differen name' % ntype)
+                        raise forms.ValidationError('Internet-Draft names starting with draft-%s- are restricted, please pick a different name' % ntype)
             return None
 
 
-class DeprecatedSubmissionBaseUploadForm(SubmissionBaseUploadForm):
-    def clean(self):
-        def format_messages(where, e, log):
-            out = log.write_out.getvalue().splitlines()
-            err = log.write_err.getvalue().splitlines()
-            m = str(e)
-            if m:
-                m = [ m ]
-            else:
-                import traceback
-                typ, val, tb = sys.exc_info()
-                m = traceback.format_exception(typ, val, tb)
-                m = [ l.replace('\n ', ':\n ') for l in m ]
-            msgs = [s for s in (["Error from xml2rfc (%s):" % (where,)] + m + out +  err) if s]
-            return msgs
-
-        if self.shutdown and not has_role(self.request.user, "Secretariat"):
-            raise forms.ValidationError('The submission tool is currently shut down')
-
-        for ext in self.formats:
-            f = self.cleaned_data.get(ext, None)
-            if not f:
-                continue
-            self.file_types.append('.%s' % ext)
-        if not ('.txt' in self.file_types or '.xml' in self.file_types):
-            if not self.errors:
-                raise forms.ValidationError('Unexpected submission file types; found %s, but %s is required' % (', '.join(self.file_types), ' or '.join(self.base_formats)))
-
-        #debug.show('self.cleaned_data["xml"]')
-        if self.cleaned_data.get('xml'):
-            #if not self.cleaned_data.get('txt'):
-            xml_file = self.cleaned_data.get('xml')
-            file_name = {}
-            xml2rfc.log.write_out = io.StringIO()   # open(os.devnull, "w")
-            xml2rfc.log.write_err = io.StringIO()   # open(os.devnull, "w")
-            tfn = None
-            with ExitStack() as stack:
-                @stack.callback
-                def cleanup():  # called when context exited, even in case of exception
-                    if tfn is not None:
-                        os.unlink(tfn)
-
-                # We need to write the xml file to disk in order to hand it
-                # over to the xml parser.  XXX FIXME: investigate updating
-                # xml2rfc to be able to work with file handles to in-memory
-                # files.
-                name, ext = os.path.splitext(os.path.basename(xml_file.name))
-                with tempfile.NamedTemporaryFile(prefix=name+'-',
-                                                 suffix='.xml',
-                                                 mode='wb+',
-                                                 delete=False) as tf:
-                    tfn = tf.name
-                    for chunk in xml_file.chunks():
-                        tf.write(chunk)
-
-                parser = xml2rfc.XmlRfcParser(str(tfn), quiet=True)
-                # --- Parse the xml ---
-                try:
-                    self.xmltree = parser.parse(remove_comments=False)
-                    # If we have v2, run it through v2v3. Keep track of the submitted version, though.
-                    self.xmlroot = self.xmltree.getroot()
-                    self.xml_version = self.xmlroot.get('version', '2')
-                    if self.xml_version == '2':
-                        v2v3 = xml2rfc.V2v3XmlWriter(self.xmltree)
-                        self.xmltree.tree = v2v3.convert2to3()
-                        self.xmlroot = self.xmltree.getroot()  # update to the new root
-
-                    draftname = self.xmlroot.attrib.get('docName')
-                    if draftname is None:
-                        self.add_error('xml', "No docName attribute found in the xml root element")
-                    name_error = validate_submission_name(draftname)
-                    if name_error:
-                        self.add_error('xml', name_error) # This is a critical and immediate failure - do not proceed with other validation.
-                    else:
-                        revmatch = re.search("-[0-9][0-9]$", draftname)
-                        if revmatch:
-                            self.revision = draftname[-2:]
-                            self.filename = draftname[:-3]
-                        else:
-                            self.revision = None
-                            self.filename = draftname
-                        self.title = self.xmlroot.findtext('front/title').strip()
-                        if type(self.title) is str:
-                            self.title = unidecode(self.title)
-                        self.title = normalize_text(self.title)
-                        self.abstract = (self.xmlroot.findtext('front/abstract') or '').strip()
-                        if type(self.abstract) is str:
-                            self.abstract = unidecode(self.abstract)
-                        author_info = self.xmlroot.findall('front/author')
-                        for author in author_info:
-                            info = {
-                                "name": author.attrib.get('fullname'),
-                                "email": author.findtext('address/email'),
-                                "affiliation": author.findtext('organization'),
-                            }
-                            elem = author.find('address/postal/country')
-                            if elem != None:
-                                ascii_country = elem.get('ascii', None)
-                                info['country'] = ascii_country if ascii_country else elem.text
-
-                            for item in info:
-                                if info[item]:
-                                    info[item] = info[item].strip()
-                            self.authors.append(info)
-
-                        # --- Prep the xml ---
-                        file_name['xml'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s%s' % (self.filename, self.revision, ext))
-                        try:
-                            prep = xml2rfc.PrepToolWriter(self.xmltree, quiet=True, liberal=True, keep_pis=[xml2rfc.V3_PI_TARGET])
-                            prep.options.accept_prepped = True
-                            self.xmltree.tree = prep.prep()
-                            if self.xmltree.tree == None:
-                                self.add_error('xml', "Error from xml2rfc (prep): %s" % prep.errors)
-                        except Exception as e:
-                                msgs = format_messages('prep', e, xml2rfc.log)
-                                self.add_error('xml', msgs)
-
-                        # --- Convert to txt ---
-                        if not ('txt' in self.cleaned_data and self.cleaned_data['txt']):
-                            file_name['txt'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (self.filename, self.revision))
-                            try:
-                                writer = xml2rfc.TextWriter(self.xmltree, quiet=True)
-                                writer.options.accept_prepped = True
-                                writer.write(file_name['txt'])
-                                log.log("In %s: xml2rfc %s generated %s from %s (version %s)" %
-                                        (   os.path.dirname(file_name['xml']),
-                                            xml2rfc.__version__,
-                                            os.path.basename(file_name['txt']),
-                                            os.path.basename(file_name['xml']),
-                                            self.xml_version))
-                            except Exception as e:
-                                msgs = format_messages('txt', e, xml2rfc.log)
-                                log.log('\n'.join(msgs))
-                                self.add_error('xml', msgs)
-
-                        # --- Convert to html ---
-                        try:
-                            file_name['html'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.html' % (self.filename, self.revision))
-                            writer = xml2rfc.HtmlWriter(self.xmltree, quiet=True)
-                            writer.write(file_name['html'])
-                            self.file_types.append('.html')
-                            log.log("In %s: xml2rfc %s generated %s from %s (version %s)" %
-                                (   os.path.dirname(file_name['xml']),
-                                    xml2rfc.__version__,
-                                    os.path.basename(file_name['html']),
-                                    os.path.basename(file_name['xml']),
-                                    self.xml_version))
-                        except Exception as e:
-                            msgs = format_messages('html', e, xml2rfc.log)
-                            self.add_error('xml', msgs)
-
-                except Exception as e:
-                    try:
-                        msgs = format_messages('txt', e, xml2rfc.log)
-                        log.log('\n'.join(msgs))
-                        self.add_error('xml', msgs)
-                    except Exception:
-                        self.add_error('xml', "An exception occurred when trying to process the XML file: %s" % e)
+class SubmissionManualUploadForm(SubmissionBaseUploadForm):
+    txt = forms.FileField(label='.txt format', required=False)
+    formats = SubmissionBaseUploadForm.formats + ('txt',)
+    base_formats =  SubmissionBaseUploadForm.base_formats + ('txt',)
 
-        # The following errors are likely noise if we have previous field
-        # errors:
-        if self.errors:
-            raise forms.ValidationError('')
+    def __init__(self, request, *args, **kwargs):
+        super().__init__(request, *args, **kwargs)
+        self.fields['xml'].required = False
 
-        if self.cleaned_data.get('txt'):
-            # try to parse it
-            txt_file = self.cleaned_data['txt']
+    def clean_txt(self):
+        txt_file = self._clean_file("txt", PlainParser)
+        if txt_file is not None:
             txt_file.seek(0)
             bytes = txt_file.read()
-            txt_file.seek(0)
             try:
-                text = bytes.decode(self.file_info['txt'].charset)
-            #
-                self.parsed_draft = PlaintextDraft(text, txt_file.name)
-                if self.filename == None:
-                    self.filename = self.parsed_draft.filename
-                elif self.filename != self.parsed_draft.filename:
-                    self.add_error('txt', "Inconsistent name information: xml:%s, txt:%s" % (self.filename, self.parsed_draft.filename))
-                if self.revision == None:
-                    self.revision = self.parsed_draft.revision
-                elif self.revision != self.parsed_draft.revision:
-                    self.add_error('txt', "Inconsistent revision information: xml:%s, txt:%s" % (self.revision, self.parsed_draft.revision))
-                if self.title == None:
-                    self.title = self.parsed_draft.get_title()
-                elif self.title != self.parsed_draft.get_title():
-                    self.add_error('txt', "Inconsistent title information: xml:%s, txt:%s" % (self.title, self.parsed_draft.get_title()))
+                text = bytes.decode(PlainParser.encoding)
+                parsed_draft = PlaintextDraft(text, txt_file.name)
+                self._extracted_filenames_and_revisions["txt"] = (parsed_draft.filename, parsed_draft.revision)
             except (UnicodeDecodeError, LookupError) as e:
-                self.add_error('txt', 'Failed decoding the uploaded file: "%s"' % str(e))
-
-        rev_error = validate_submission_rev(self.filename, self.revision)
-        if rev_error:
-            raise forms.ValidationError(rev_error)
-
-        # The following errors are likely noise if we have previous field
-        # errors:
-        if self.errors:
-            raise forms.ValidationError('')
-
-        if not self.filename:
-            raise forms.ValidationError("Could not extract a valid draft name from the upload.  "
-                "To fix this in a text upload, please make sure that the full draft name including "
-                "revision number appears centered on its own line below the document title on the "
-                "first page.  In an xml upload, please make sure that the top-level <rfc/> "
-                "element has a docName attribute which provides the full draft name including "
-                "revision number.")
-
-        if not self.revision:
-            raise forms.ValidationError("Could not extract a valid draft revision from the upload.  "
-                "To fix this in a text upload, please make sure that the full draft name including "
-                "revision number appears centered on its own line below the document title on the "
-                "first page.  In an xml upload, please make sure that the top-level <rfc/> "
-                "element has a docName attribute which provides the full draft name including "
-                "revision number.")
-
-        if not self.title:
-            raise forms.ValidationError("Could not extract a valid title from the upload")
-
-        if self.cleaned_data.get('txt') or self.cleaned_data.get('xml'):
-            # check group
-            self.group = self.deduce_group(self.filename)
-
-            # check existing
-            existing = Submission.objects.filter(name=self.filename, rev=self.revision).exclude(state__in=("posted", "cancel", "waiting-for-draft"))
-            if existing:
-                raise forms.ValidationError(mark_safe('A submission with same name and revision is currently being processed. <a href="%s">Check the status here.</a>' % urlreverse("ietf.submit.views.submission_status", kwargs={ 'submission_id': existing[0].pk })))
-
-            # cut-off
-            if self.revision == '00' and self.in_first_cut_off:
-                raise forms.ValidationError(mark_safe(self.cutoff_warning))
-
-            # check thresholds
-            today = datetime.date.today()
-
-            self.check_submissions_thresholds(
-                "for the draft %s" % self.filename,
-                dict(name=self.filename, rev=self.revision, submission_date=today),
-                settings.IDSUBMIT_MAX_DAILY_SAME_DRAFT_NAME, settings.IDSUBMIT_MAX_DAILY_SAME_DRAFT_NAME_SIZE,
-            )
-            self.check_submissions_thresholds(
-                "for the same submitter",
-                dict(remote_ip=self.remote_ip, submission_date=today),
-                settings.IDSUBMIT_MAX_DAILY_SAME_SUBMITTER, settings.IDSUBMIT_MAX_DAILY_SAME_SUBMITTER_SIZE,
-            )
-            if self.group:
-                self.check_submissions_thresholds(
-                    "for the group \"%s\"" % (self.group.acronym),
-                    dict(group=self.group, submission_date=today),
-                    settings.IDSUBMIT_MAX_DAILY_SAME_GROUP, settings.IDSUBMIT_MAX_DAILY_SAME_GROUP_SIZE,
+                raise forms.ValidationError(f'Failed decoding the uploaded file: "{str(e)}"', code="decode_failed")
+            if not parsed_draft.filename:
+                raise forms.ValidationError(
+                    "Could not extract a valid Internet-Draft name from the plaintext.  "
+                    "Please make sure that the full Internet-Draft name including "
+                    "revision number appears centered on its own line below the document title on the "
+                    "first page.", 
+                    code="parse_error_filename",
                 )
-            self.check_submissions_thresholds(
-                "across all submitters",
-                dict(submission_date=today),
-                settings.IDSUBMIT_MAX_DAILY_SUBMISSIONS, settings.IDSUBMIT_MAX_DAILY_SUBMISSIONS_SIZE,
-            )
-
-        return super().clean()
-
-
-class SubmissionManualUploadForm(DeprecatedSubmissionBaseUploadForm):
-    xml = forms.FileField(label='.xml format', required=False) # xml field with required=False instead of True
-    txt = forms.FileField(label='.txt format', required=False)
-    # We won't permit html upload until we can verify that the content
-    # reasonably matches the text and/or xml upload.  Till then, we generate
-    # html for version 3 xml submissions.
-    # html = forms.FileField(label='.html format', required=False)
-    pdf = forms.FileField(label='.pdf format', required=False)
-
-    def __init__(self, request, *args, **kwargs):
-        super(SubmissionManualUploadForm, self).__init__(request, *args, **kwargs)
-        self.formats = settings.IDSUBMIT_FILE_TYPES
-        self.base_formats = ['txt', 'xml', ]
-
-    def clean_txt(self):
-        return self.clean_file("txt", PlainParser)
-
-    def clean_pdf(self):
-        return self.clean_file("pdf", PDFParser)
-
-class DeprecatedSubmissionAutoUploadForm(DeprecatedSubmissionBaseUploadForm):
-    """Full-service upload form, replaced by the asynchronous version"""
-    user = forms.EmailField(required=True)
+            if not parsed_draft.revision:
+                raise forms.ValidationError(
+                    "Could not extract a valid Internet-Draft revision from the plaintext.  "
+                    "Please make sure that the full Internet-Draft name including "
+                    "revision number appears centered on its own line below the document title on the "
+                    "first page.", 
+                    code="parse_error_revision",
+                )
+        return txt_file
 
-    def __init__(self, request, *args, **kwargs):
-        super(DeprecatedSubmissionAutoUploadForm, self).__init__(request, *args, **kwargs)
-        self.formats = ['xml', ]
-        self.base_formats = ['xml', ]
 
 class SubmissionAutoUploadForm(SubmissionBaseUploadForm):
     user = forms.EmailField(required=True)
     replaces = forms.CharField(required=False, max_length=1000, strip=True)
 
-    def __init__(self, request, *args, **kwargs):
-        super().__init__(request, *args, **kwargs)
-        self.formats = ['xml', ]
-        self.base_formats = ['xml', ]
-
     def clean(self):
-        super().clean()
+        cleaned_data = super().clean()
 
         # Clean the replaces field after the rest of the cleaning so we know the name of the
         # uploaded draft via self.filename
         if self.cleaned_data['replaces']:
             names_replaced = [s.strip() for s in self.cleaned_data['replaces'].split(',')]
             self.cleaned_data['replaces'] = ','.join(names_replaced)
-            aliases_replaced = DocAlias.objects.filter(name__in=names_replaced)
-            if len(names_replaced) != len(aliases_replaced):
-                known_names = aliases_replaced.values_list('name', flat=True)
+            documents_replaced = Document.objects.filter(name__in=names_replaced)
+            if len(names_replaced) != len(documents_replaced):
+                known_names = documents_replaced.values_list('name', flat=True)
                 unknown_names = [n for n in names_replaced if n not in known_names]
                 self.add_error(
                     'replaces',
                     forms.ValidationError(
-                        'Unknown draft name(s): ' + ', '.join(unknown_names)
+                        'Unknown Internet-Draft name(s): ' + ', '.join(unknown_names)
                     ),
                 )
-            for alias in aliases_replaced:
-                if alias.document.name == self.filename:
+            for doc in documents_replaced:
+                if doc.name == self.filename:
                     self.add_error(
                         'replaces',
-                        forms.ValidationError("A draft cannot replace itself"),
+                        forms.ValidationError("An Internet-Draft cannot replace itself"),
                     )
-                elif alias.document.type_id != "draft":
+                elif doc.type_id != "draft":
                     self.add_error(
                         'replaces',
-                        forms.ValidationError("A draft can only replace another draft"),
+                        forms.ValidationError("An Internet-Draft can only replace another Internet-Draft"),
                     )
-                elif alias.document.get_state_slug() == "rfc":
+                elif doc.get_state_slug() == "rfc":
                     self.add_error(
                         'replaces',
-                        forms.ValidationError("A draft cannot replace an RFC"),
+                        forms.ValidationError("An Internet-Draft cannot replace another Internet-Draft that has become an RFC"),
                     )
-                elif alias.document.get_state_slug('draft-iesg') in ('approved', 'ann', 'rfcqueue'):
+                elif doc.get_state_slug('draft-iesg') in ('approved', 'ann', 'rfcqueue'):
                     self.add_error(
                         'replaces',
                         forms.ValidationError(
-                            alias.name + " is approved by the IESG and cannot be replaced"
+                            doc.name + " is approved by the IESG and cannot be replaced"
                         ),
                     )
+            return cleaned_data
 
 
 class NameEmailForm(forms.Form):
@@ -714,23 +487,35 @@ def cleaned_line(self):
             line = formataddr((line, email))
         return line
 
+    def clean_name(self):
+        name = super(SubmitterForm, self).clean_name()
+        if name.startswith('=?'):
+            msg = f'"{name}" appears to be a MIME-encoded string.'
+            try:
+                import email.header
+                text, encoding = email.header.decode_header(name)[0]
+                decoded_name = text.decode(encoding)
+                msg += f' Did you mean "{decoded_name}"?'
+            except:
+                pass
+            raise forms.ValidationError(msg)
+        return name
+
 class ReplacesForm(forms.Form):
-    replaces = SearchableDocAliasesField(required=False, help_text="Any drafts that this document replaces (approval required for replacing a draft you are not the author of)")
+    replaces = SearchableDocumentsField(required=False, help_text='Do not enter anything here if you are only submitting the next version of your Internet-Draft. Only enter items here if this submission is intended to replace an I-D with a different name. A typical use of this field is to note what individual I-Ds are replaced by a new -00 Working group I-D. Note that additional approval will be required to replace an I-D for which you are not an author.')
 
     def __init__(self, *args, **kwargs):
         self.name = kwargs.pop("name")
         super(ReplacesForm, self).__init__(*args, **kwargs)
 
     def clean_replaces(self):
-        for alias in self.cleaned_data['replaces']:
-            if alias.document.name == self.name:
-                raise forms.ValidationError("A draft cannot replace itself.")
-            if alias.document.type_id != "draft":
-                raise forms.ValidationError("A draft can only replace another draft")
-            if alias.document.get_state_slug() == "rfc":
-                raise forms.ValidationError("A draft cannot replace an RFC")
-            if alias.document.get_state_slug('draft-iesg') in ('approved','ann','rfcqueue'):
-                raise forms.ValidationError(alias.name+" is approved by the IESG and cannot be replaced")
+        for doc in self.cleaned_data['replaces']:
+            if doc.name == self.name:
+                raise forms.ValidationError("An Internet-Draft cannot replace itself.")
+            if doc.type_id != "draft":
+                raise forms.ValidationError("An Internet-Draft can only replace another Internet-Draft")
+            if doc.get_state_slug('draft-iesg') in ('approved','ann','rfcqueue'):
+                raise forms.ValidationError(doc.name+" is approved by the IESG and cannot be replaced")
         return self.cleaned_data['replaces']
 
 class EditSubmissionForm(forms.ModelForm):
@@ -738,7 +523,7 @@ class EditSubmissionForm(forms.ModelForm):
     rev = forms.CharField(label='Revision', max_length=2, required=True)
     document_date = forms.DateField(required=True)
     pages = forms.IntegerField(required=True)
-    formal_languages = forms.ModelMultipleChoiceField(queryset=FormalLanguageName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False)
+    formal_languages = ModelMultipleChoiceField(queryset=FormalLanguageName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False)
     abstract = forms.CharField(widget=forms.Textarea, required=True, strip=False)
 
     note = forms.CharField(label=mark_safe('Comment to the Secretariat'), widget=forms.Textarea, required=False, strip=False)
@@ -780,15 +565,15 @@ def clean_name(self):
         if components[-1] == "00":
             raise forms.ValidationError("Name appears to end with a revision number -00 - do not include the revision.")
         if len(components) < 4:
-            raise forms.ValidationError("Name has less than four dash-delimited components - can't form a valid group draft name.")
+            raise forms.ValidationError("Name has less than four dash-delimited components - can't form a valid group Internet-Draft name.")
         acronym = components[2]
         if acronym not in [ g.acronym for g in self.groups ]:
-            raise forms.ValidationError("Group acronym not recognized as one you can approve drafts for.")
+            raise forms.ValidationError("Group acronym not recognized as one you can approve Internet-Drafts for.")
 
         if Preapproval.objects.filter(name=n):
             raise forms.ValidationError("Pre-approval for this name already exists.")
         if Submission.objects.filter(state="posted", name=n):
-            raise forms.ValidationError("A draft with this name has already been submitted and accepted. A pre-approval would not make any difference.")
+            raise forms.ValidationError("An Internet-Draft with this name has already been submitted and accepted. A pre-approval would not make any difference.")
 
         return n
 
@@ -798,10 +583,10 @@ class SubmissionEmailForm(forms.Form):
     Used to add a message to a submission or to create a new submission.
     This message is NOT a reply to a previous message but has arrived out of band
     
-    if submission_pk is None we are startign a new submission and name
-    must be unique. Otehrwise the name must match the submission.name.
+    if submission_pk is None we are starting a new submission and name
+    must be unique. Otherwise the name must match the submission.name.
     '''
-    name = forms.CharField(required=True, max_length=255, label="Draft name")
+    name = forms.CharField(required=True, max_length=255, label="Internet-Draft name")
     submission_pk = forms.IntegerField(required=False, widget=forms.HiddenInput())
     direction = forms.ChoiceField(choices=(("incoming", "Incoming"), ("outgoing", "Outgoing")),
                                   widget=forms.RadioSelect)
@@ -874,3 +659,13 @@ def __init__(self, *args, **kwargs):
         self.fields['frm'].label='From'
         self.fields['frm'].widget.attrs['readonly'] = True
         self.fields['reply_to'].widget.attrs['readonly'] = True
+
+
+class SubmissionSearchForm(forms.Form):
+    """Form used for search_submission"""
+
+    name = forms.CharField(max_length=255, required=True, label="I-D name")
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["name"].widget.attrs["placeholder"] = "draft-..."
diff --git a/ietf/submit/mail.py b/ietf/submit/mail.py
index 16d1f09734..d7da7e21e0 100644
--- a/ietf/submit/mail.py
+++ b/ietf/submit/mail.py
@@ -1,34 +1,24 @@
 # Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-
-import re
-import email
-import datetime
-import base64
 import os
-import pyzmail
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
-from django.core.exceptions import ValidationError
 from django.contrib.sites.models import Site
 from django.template.loader import render_to_string
-from django.utils.encoding import force_text, force_str
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.log import log
 from ietf.utils.mail import send_mail, send_mail_message
 from ietf.doc.models import Document
-from ietf.ipr.mail import utc_from_string
 from ietf.person.models import Person
-from ietf.message.models import Message, MessageAttachment
+from ietf.message.models import Message
 from ietf.utils.accesstoken import generate_access_token
-from ietf.mailtrigger.utils import gather_address_lists, get_base_submission_message_address
-from ietf.submit.models import SubmissionEmailEvent, Submission
+from ietf.mailtrigger.utils import gather_address_lists
 from ietf.submit.checkers import DraftIdnitsChecker
 
+
 def send_submission_confirmation(request, submission, chair_notice=False):
     subject = 'Confirm submission of I-D %s' % submission.name
     from_email = settings.IDSUBMIT_FROM_EMAIL
@@ -51,7 +41,7 @@ def send_submission_confirmation(request, submission, chair_notice=False):
     return all_addrs
 
 def send_full_url(request, submission):
-    subject = 'Full URL for managing submission of draft %s' % submission.name
+    subject = 'Full URL for managing submission of Internet-Draft %s' % submission.name
     from_email = settings.IDSUBMIT_FROM_EMAIL
     (to_email, cc) = gather_address_lists('sub_management_url_requested',submission=submission)
     url = settings.IDTRACKER_BASE_URL + urlreverse('ietf.submit.views.submission_status', kwargs=dict(submission_id=submission.pk, access_token=submission.access_token()))
@@ -74,7 +64,7 @@ def send_approval_request(request, submission, replaced_doc=None):
     If replaced_doc is not None, requests will be sent to the wg chairs or ADs
     responsible for that doc's group instead of the submission. 
     """
-    subject = 'New draft waiting for approval: %s' % submission.name
+    subject = 'New Internet-Draft waiting for approval: %s' % submission.name
     from_email = settings.IDSUBMIT_FROM_EMAIL
 
     # Sort out which MailTrigger to use
@@ -195,181 +185,3 @@ def announce_to_authors(request, submission):
                'group': group},
               cc=cc)
 
-
-def get_reply_to():
-    """Returns a new reply-to address for use with an outgoing message.  This is an
-    address with "plus addressing" using a random string.  Guaranteed to be unique"""
-    local,domain = get_base_submission_message_address().split('@')
-    while True:
-        rand = force_text(base64.urlsafe_b64encode(os.urandom(12)))
-        address = "{}+{}@{}".format(local,rand,domain)
-        q = Message.objects.filter(reply_to=address)
-        if not q:
-            return address
-
-
-def process_response_email(msg):
-    """Saves an incoming message.  msg=string.  Message "To" field is expected to
-    be in the format ietf-submit+[identifier]@ietf.org.  Expect to find a message with
-    a matching value in the reply_to field, associated to a submission.
-    Create a Message object for the incoming message and associate it to
-    the original message via new SubmissionEvent"""
-    message = email.message_from_string(force_str(msg))
-    to = message.get('To')
-
-    # exit if this isn't a response we're interested in (with plus addressing)
-    local,domain = get_base_submission_message_address().split('@')
-    if not re.match(r'^{}\+[a-zA-Z0-9_\-]{}@{}'.format(local,'{16}',domain),to):
-        return None
-
-    try:
-        to_message = Message.objects.get(reply_to=to)
-    except Message.DoesNotExist:
-        log('Error finding matching message ({})'.format(to))
-        return None
-
-    try:
-        submission = to_message.manualevents.first().submission
-    except:
-        log('Error processing message ({})'.format(to))
-        return None
-
-    if not submission:
-        log('Error processing message - no submission ({})'.format(to))
-        return None
-
-    parts = pyzmail.parse.get_mail_parts(message)
-    body=''
-    for part in parts:
-        if part.is_body == 'text/plain' and part.disposition == None:
-            payload, used_charset = pyzmail.decode_text(part.get_payload(), part.charset, None)
-            body = body + payload + '\n'
-
-    by = Person.objects.get(name="(System)")
-    msg = submit_message_from_message(message, body, by)
-
-    desc = "Email: received message - manual post - {}-{}".format(
-            submission.name,
-            submission.rev)
-    
-    submission_email_event = SubmissionEmailEvent.objects.create(
-            submission = submission,
-            desc = desc,
-            msgtype = 'msgin',
-            by = by,
-            message = msg,
-            in_reply_to = to_message
-    )
-
-    save_submission_email_attachments(submission_email_event, parts)
-
-    log("Received submission email from %s" % msg.frm)
-    return msg
-
-
-def add_submission_email(request, remote_ip, name, rev, submission_pk, message, by, msgtype):
-    """Add email to submission history"""
-
-    #in_reply_to = form.cleaned_data['in_reply_to']
-    # create Message
-    parts = pyzmail.parse.get_mail_parts(message)
-    body=''
-    for part in parts:
-        if part.is_body == 'text/plain' and part.disposition == None:
-            payload, used_charset = pyzmail.decode_text(part.get_payload(), part.charset, None)
-            body = body + payload + '\n'
-
-    msg = submit_message_from_message(message, body, by)
-
-    if (submission_pk != None):
-        # Must exist - we're adding a message to an existing submission
-        submission = Submission.objects.get(pk=submission_pk)
-    else:
-        # Must not exist
-        submissions = Submission.objects.filter(name=name,rev=rev).exclude(state_id='cancel')
-        if submissions.count() > 0:
-            raise ValidationError("Submission {} already exists".format(name))
-            
-        # create Submission using the name
-        try:
-            submission = Submission.objects.create(
-                    state_id="waiting-for-draft",
-                    remote_ip=remote_ip,
-                    name=name,
-                    rev=rev,
-                    title=name,
-                    note="",
-                    submission_date=datetime.date.today(),
-                    replaces="",
-            )
-            from ietf.submit.utils import create_submission_event, docevent_from_submission
-            desc = "Submission created for rev {} in response to email".format(rev)
-            create_submission_event(request, 
-                                    submission,
-                                    desc)
-            docevent_from_submission(submission, desc)
-        except Exception as e:
-            log("Exception: %s\n" % e)
-            raise
-
-    if msgtype == 'msgin':
-        rs = "Received"
-    else:
-        rs = "Sent"
-
-    desc = "{} message - manual post - {}-{}".format(rs, name, rev)
-    submission_email_event = SubmissionEmailEvent.objects.create(
-            desc = desc,
-            submission = submission,
-            msgtype = msgtype,
-            by = by,
-            message = msg)
-    #in_reply_to = in_reply_to
-
-    save_submission_email_attachments(submission_email_event, parts)
-    return submission, submission_email_event
-        
-        
-def submit_message_from_message(message,body,by=None):
-    """Returns a ietf.message.models.Message.  msg=email.Message
-        A copy of mail.message_from_message with different body handling
-    """
-    if not by:
-        by = Person.objects.get(name="(System)")
-    msg = Message.objects.create(
-            by = by,
-            subject = message.get('subject',''),
-            frm = message.get('from',''),
-            to = message.get('to',''),
-            cc = message.get('cc',''),
-            bcc = message.get('bcc',''),
-            reply_to = message.get('reply_to',''),
-            body = body,
-            time = utc_from_string(message.get('date', '')),
-            content_type = message.get('content_type', 'text/plain'),
-    )
-    return msg
-
-def save_submission_email_attachments(submission_email_event, parts):
-    for part in parts:
-        if part.disposition != 'attachment':
-            continue
-
-        if part.type == 'text/plain':
-            payload, used_charset = pyzmail.decode_text(part.get_payload(), 
-                                                        part.charset, 
-                                                        None)
-            encoding = ""
-        else:
-            # Need a better approach - for the moment we'll just handle these 
-            # and encode as base64
-            payload = base64.b64encode(part.get_payload())
-            encoding = "base64"
-
-        #name = submission_email_event.submission.name
-
-        MessageAttachment.objects.create(message = submission_email_event.message,
-                                         content_type = part.type,
-                                         encoding = encoding,
-                                         filename=part.filename,
-                                         body=payload)
diff --git a/ietf/submit/management/commands/manualpost_email.py b/ietf/submit/management/commands/manualpost_email.py
deleted file mode 100644
index aaabfb39b7..0000000000
--- a/ietf/submit/management/commands/manualpost_email.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import io
-import sys
-
-from django.core.management.base import BaseCommand, CommandError
-
-from ietf.submit.mail import process_response_email
-
-import debug                            # pyflakes:ignore
-
-class Command(BaseCommand):
-    help = ("Process incoming manual post email responses")
-
-    def add_arguments(self, parser):
-        parser.add_argument('--email-file', dest='email', help='File containing email (default: stdin)')
-
-    def handle(self, *args, **options):
-        email = options.get('email', None)
-        msg = None
-
-        if not email:
-            msg = sys.stdin.read()
-        else:
-            msg = io.open(email, "r").read()
-
-        try:
-            process_response_email(msg)
-        except ValueError as e:
-            raise CommandError(e)
diff --git a/ietf/submit/migrations/0001_initial.py b/ietf/submit/migrations/0001_initial.py
index 619260600a..8c657c6427 100644
--- a/ietf/submit/migrations/0001_initial.py
+++ b/ietf/submit/migrations/0001_initial.py
@@ -1,13 +1,11 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
-
-import datetime
 from django.db import migrations, models
 import django.db.models.deletion
+import django.utils.timezone
 import ietf.utils.accesstoken
 import ietf.utils.models
+import ietf.utils.timezone
 import jsonfield.fields
 
 
@@ -17,22 +15,13 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('message', '0001_initial'),
-        ('group', '0001_initial'),
         ('name', '0001_initial'),
         ('person', '0001_initial'),
+        ('group', '0001_initial'),
         ('doc', '0001_initial'),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='Preapproval',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(db_index=True, max_length=255)),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
-            ],
-        ),
         migrations.CreateModel(
             name='Submission',
             fields=[
@@ -53,7 +42,8 @@ class Migration(migrations.Migration):
                 ('file_types', models.CharField(blank=True, max_length=50)),
                 ('file_size', models.IntegerField(blank=True, null=True)),
                 ('document_date', models.DateField(blank=True, null=True)),
-                ('submission_date', models.DateField(default=datetime.date.today)),
+                ('submission_date', models.DateField(default=ietf.utils.timezone.date_today)),
+                ('xml_version', models.CharField(default=None, max_length=4, null=True)),
                 ('submitter', models.CharField(blank=True, help_text='Name and email of submitter, e.g. "John Doe &lt;john@example.org&gt;".', max_length=255)),
                 ('draft', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
                 ('formal_languages', models.ManyToManyField(blank=True, help_text='Formal languages used in document', to='name.FormalLanguageName')),
@@ -61,27 +51,14 @@ class Migration(migrations.Migration):
                 ('state', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DraftSubmissionStateName')),
             ],
         ),
-        migrations.CreateModel(
-            name='SubmissionCheck',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
-                ('checker', models.CharField(blank=True, max_length=256)),
-                ('passed', models.NullBooleanField(default=False)),
-                ('message', models.TextField(blank=True, null=True)),
-                ('errors', models.IntegerField(blank=True, default=None, null=True)),
-                ('warnings', models.IntegerField(blank=True, default=None, null=True)),
-                ('items', jsonfield.fields.JSONField(blank=True, default='{}', null=True)),
-                ('symbol', models.CharField(default='', max_length=64)),
-                ('submission', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checks', to='submit.Submission')),
-            ],
-        ),
         migrations.CreateModel(
             name='SubmissionEvent',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=datetime.datetime.now)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
                 ('desc', models.TextField()),
+                ('by', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+                ('submission', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submit.Submission')),
             ],
             options={
                 'ordering': ('-time', '-id'),
@@ -92,22 +69,65 @@ class Migration(migrations.Migration):
             fields=[
                 ('submissionevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='submit.SubmissionEvent')),
                 ('msgtype', models.CharField(max_length=25)),
-                ('in_reply_to', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='irtomanual', to='message.Message')),
-                ('message', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='manualevents', to='message.Message')),
             ],
             options={
                 'ordering': ['-time', '-id'],
             },
             bases=('submit.submissionevent',),
         ),
-        migrations.AddField(
+        migrations.CreateModel(
+            name='SubmissionExtResource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('display_name', models.CharField(blank=True, default='', max_length=255)),
+                ('value', models.CharField(max_length=2083)),
+                ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceName')),
+                ('submission', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='external_resources', to='submit.Submission')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='SubmissionCheck',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('checker', models.CharField(blank=True, max_length=256)),
+                ('passed', models.BooleanField(default=False, null=True)),
+                ('message', models.TextField(blank=True, null=True)),
+                ('errors', models.IntegerField(blank=True, default=None, null=True)),
+                ('warnings', models.IntegerField(blank=True, default=None, null=True)),
+                ('items', jsonfield.fields.JSONField(blank=True, default='{}', null=True)),
+                ('symbol', models.CharField(default='', max_length=64)),
+                ('submission', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checks', to='submit.Submission')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Preapproval',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(db_index=True, max_length=255)),
+                ('time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('by', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
+            ],
+        ),
+        migrations.AddIndex(
             model_name='submissionevent',
-            name='by',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person'),
+            index=models.Index(fields=['-time', '-id'], name='submit_subm_time_fcd790_idx'),
         ),
         migrations.AddField(
-            model_name='submissionevent',
-            name='submission',
-            field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submit.Submission'),
+            model_name='submissionemailevent',
+            name='in_reply_to',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='irtomanual', to='message.Message'),
+        ),
+        migrations.AddField(
+            model_name='submissionemailevent',
+            name='message',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='manualevents', to='message.Message'),
+        ),
+        migrations.AddIndex(
+            model_name='submission',
+            index=models.Index(fields=['submission_date'], name='submit_subm_submiss_8e58a9_idx'),
         ),
     ]
diff --git a/ietf/submit/migrations/0002_alter_submission_xml_version.py b/ietf/submit/migrations/0002_alter_submission_xml_version.py
new file mode 100644
index 0000000000..275e6efd95
--- /dev/null
+++ b/ietf/submit/migrations/0002_alter_submission_xml_version.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.23 on 2025-08-01 19:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("submit", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="submission",
+            name="xml_version",
+            field=models.CharField(blank=True, default=None, max_length=4, null=True),
+        ),
+    ]
diff --git a/ietf/submit/migrations/0002_submission_document2_fk.py b/ietf/submit/migrations/0002_submission_document2_fk.py
deleted file mode 100644
index 7885cff321..0000000000
--- a/ietf/submit/migrations/0002_submission_document2_fk.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-08 11:58
-
-
-from django.db import migrations
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0015_1_add_fk_to_document_id'),
-        ('submit', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='submission',
-            name='draft2',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.Document', to_field='id'),
-        ),
-        migrations.AlterField(
-            model_name='submission',
-            name='draft',
-            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='old_submission', to='doc.Document', to_field='name'),
-        ),
-    ]
diff --git a/ietf/submit/migrations/0003_alter_submission_authors_alter_submissioncheck_items.py b/ietf/submit/migrations/0003_alter_submission_authors_alter_submissioncheck_items.py
new file mode 100644
index 0000000000..2c51659204
--- /dev/null
+++ b/ietf/submit/migrations/0003_alter_submission_authors_alter_submissioncheck_items.py
@@ -0,0 +1,46 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+
+from django.db import migrations, models
+
+
+def forward(apps, schema_editor):
+    JSON_ENCODED_NULL = r"\u0000"
+    NULL = "\x00"
+    NUL_SYMBOL = "\u2400"  # Unicode single-char "NUL" symbol 
+    
+    Submission = apps.get_model("submit", "Submission")
+    # The qs filter sees the serialized JSON string...
+    null_in_authors = Submission.objects.filter(authors__contains=JSON_ENCODED_NULL)
+    for submission in null_in_authors:
+        # submission.authors is now deserialized into Python objects
+        for author in submission.authors:
+            for k in author:
+                author[k] = author[k].replace(NULL, NUL_SYMBOL)
+        submission.save()
+
+
+def reverse(apps, schema_editor):
+    pass  # don't restore invalid data
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("submit", "0002_alter_submission_xml_version"),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+        migrations.AlterField(
+            model_name="submission",
+            name="authors",
+            field=models.JSONField(
+                default=list,
+                help_text="List of authors with name, email, affiliation and country.",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="submissioncheck",
+            name="items",
+            field=models.JSONField(blank=True, default=dict, null=True),
+        ),
+    ]
diff --git a/ietf/submit/migrations/0003_remove_old_document_field.py b/ietf/submit/migrations/0003_remove_old_document_field.py
deleted file mode 100644
index f8deb2ff99..0000000000
--- a/ietf/submit/migrations/0003_remove_old_document_field.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-25 06:44
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submit', '0002_submission_document2_fk'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='submission',
-            name='draft',
-        ),
-    ]
diff --git a/ietf/submit/migrations/0004_rename_field_document2.py b/ietf/submit/migrations/0004_rename_field_document2.py
deleted file mode 100644
index 4222659234..0000000000
--- a/ietf/submit/migrations/0004_rename_field_document2.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright The IETF Trust 2019-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-05-25 06:46
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('doc', '0019_rename_field_document2'),
-        ('submit', '0003_remove_old_document_field'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='submission',
-            old_name='draft2',
-            new_name='draft',
-        ),
-    ]
diff --git a/ietf/submit/migrations/0005_auto_20200624_1332.py b/ietf/submit/migrations/0005_auto_20200624_1332.py
deleted file mode 100644
index 74a5fa9fb0..0000000000
--- a/ietf/submit/migrations/0005_auto_20200624_1332.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.1.15 on 2020-06-24 13:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submit', '0004_rename_field_document2'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='submissioncheck',
-            name='passed',
-            field=models.BooleanField(default=False, null=True),
-        ),
-    ]
diff --git a/ietf/submit/migrations/0006_submission_xml_version.py b/ietf/submit/migrations/0006_submission_xml_version.py
deleted file mode 100644
index da5dd6cd51..0000000000
--- a/ietf/submit/migrations/0006_submission_xml_version.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.15 on 2020-08-28 07:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submit', '0005_auto_20200624_1332'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='submission',
-            name='xml_version',
-            field=models.CharField(default=None, max_length=4, null=True),
-        ),
-    ]
diff --git a/ietf/submit/migrations/0007_auto_20201109_0439.py b/ietf/submit/migrations/0007_auto_20201109_0439.py
deleted file mode 100644
index c52f905397..0000000000
--- a/ietf/submit/migrations/0007_auto_20201109_0439.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.17 on 2020-11-09 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submit', '0006_submission_xml_version'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='submissionevent',
-            index=models.Index(fields=['-time', '-id'], name='submit_subm_time_fcd790_idx'),
-        ),
-    ]
diff --git a/ietf/submit/migrations/0008_submissionextresource.py b/ietf/submit/migrations/0008_submissionextresource.py
deleted file mode 100644
index be51e2c6db..0000000000
--- a/ietf/submit/migrations/0008_submissionextresource.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 2.2.17 on 2021-01-27 12:23
-
-from django.db import migrations, models
-import django.db.models.deletion
-import ietf.utils.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('name', '0020_add_rescheduled_session_name'),
-        ('submit', '0007_auto_20201109_0439'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='SubmissionExtResource',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('display_name', models.CharField(blank=True, default='', max_length=255)),
-                ('value', models.CharField(max_length=2083)),
-                ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ExtResourceName')),
-                ('submission', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='external_resources', to='submit.Submission')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-    ]
diff --git a/ietf/submit/migrations/0009_auto_20220427_1223.py b/ietf/submit/migrations/0009_auto_20220427_1223.py
deleted file mode 100644
index 6f8e214252..0000000000
--- a/ietf/submit/migrations/0009_auto_20220427_1223.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.2.28 on 2022-04-27 12:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submit', '0008_submissionextresource'),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name='submission',
-            index=models.Index(fields=['submission_date'], name='submit_subm_submiss_8e58a9_idx'),
-        ),
-    ]
diff --git a/ietf/submit/migrations/0010_create_cancel_stale_submissions_task.py b/ietf/submit/migrations/0010_create_cancel_stale_submissions_task.py
deleted file mode 100644
index 5d8511054c..0000000000
--- a/ietf/submit/migrations/0010_create_cancel_stale_submissions_task.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Generated by Django 2.2.28 on 2022-08-23 08:45
-
-from django.db import migrations
-from django.utils import timezone
-
-
-def forward(apps, schema_editor):
-    IntervalSchedule = apps.get_model('django_celery_beat', 'IntervalSchedule')
-    PeriodicTask = apps.get_model('django_celery_beat', 'PeriodicTask')
-    PeriodicTasks = apps.get_model('django_celery_beat', 'PeriodicTasks')
-    every_five_minutes, _ = IntervalSchedule.objects.get_or_create(
-        every=5,
-        period='minutes',  # in non-migration code, use IntervalSchedule.MINUTES instead
-    )
-    task, _ = PeriodicTask.objects.get_or_create(
-        interval=every_five_minutes,
-        name='Cancel stale submissions',
-        task='ietf.submit.tasks.cancel_stale_submissions',
-    )
-    # this replicates the PeriodicTasks.changed() call as of django-celery-beat==2.3.0
-    PeriodicTasks.objects.update_or_create(ident=1, defaults={'last_update': timezone.now()})
-
-
-def reverse(apps, schema_editor):
-    IntervalSchedule = apps.get_model('django_celery_beat', 'IntervalSchedule')
-    PeriodicTask = apps.get_model('django_celery_beat', 'PeriodicTask')
-    PeriodicTasks = apps.get_model('django_celery_beat', 'PeriodicTasks')
-    every_five_minutes = IntervalSchedule.objects.get(
-        every=5,
-        period='minutes',  # in non-migration code, use IntervalSchedule.MINUTES instead
-    )
-    task = PeriodicTask.objects.get(
-        interval=every_five_minutes,
-        name='Cancel stale submissions',
-        task='ietf.submit.tasks.cancel_stale_submissions',
-    )
-    task.delete()
-    every_five_minutes.delete()
-    # this replicates the PeriodicTasks.changed() call as of django-celery-beat==2.3.0
-    PeriodicTasks.objects.update_or_create(ident=1, defaults={'last_update': timezone.now()})
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('submit', '0009_auto_20220427_1223'),
-        ('django_celery_beat', '0016_alter_crontabschedule_timezone'),
-    ]
-
-    operations = [
-        migrations.RunPython(forward, reverse),
-    ]
diff --git a/ietf/submit/models.py b/ietf/submit/models.py
index 9f0e2fa337..576ba3e114 100644
--- a/ietf/submit/models.py
+++ b/ietf/submit/models.py
@@ -2,11 +2,10 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
 import email
-import jsonfield
 
 from django.db import models
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
@@ -18,6 +17,7 @@
 from ietf.utils.accesstoken import generate_random_key, generate_access_token
 from ietf.utils.text import parse_unicode
 from ietf.utils.models import ForeignKey
+from ietf.utils.timezone import date_today
 
 
 def parse_email_line(line):
@@ -45,7 +45,9 @@ class Submission(models.Model):
     words = models.IntegerField(null=True, blank=True)
     formal_languages = models.ManyToManyField(FormalLanguageName, blank=True, help_text="Formal languages used in document")
 
-    authors = jsonfield.JSONField(default=list, help_text="List of authors with name, email, affiliation and country.")
+    authors = models.JSONField(default=list, help_text="List of authors with name, email, affiliation and country.")
+    # Schema note: authors is a list of authors. Each author is a JSON object with 
+    # "name", "email", "affiliation", and "country" keys. All values are strings.
     note = models.TextField(blank=True)
     replaces = models.CharField(max_length=1000, blank=True)
 
@@ -53,8 +55,8 @@ class Submission(models.Model):
     file_types = models.CharField(max_length=50, blank=True)
     file_size = models.IntegerField(null=True, blank=True)
     document_date = models.DateField(null=True, blank=True)
-    submission_date = models.DateField(default=datetime.date.today)
-    xml_version = models.CharField(null=True, max_length=4, default=None)
+    submission_date = models.DateField(default=date_today)
+    xml_version = models.CharField(null=True, blank=True, max_length=4, default=None)
 
     submitter = models.CharField(max_length=255, blank=True, help_text="Name and email of submitter, e.g. \"John Doe &lt;john@example.org&gt;\".")
 
@@ -78,11 +80,18 @@ def existing_document(self):
         return Document.objects.filter(name=self.name).first()
 
     def latest_checks(self):
-        checks = [ self.checks.filter(checker=c).latest('time') for c in self.checks.values_list('checker', flat=True).distinct() ]
-        return checks
+        """Latest check of each type, excluding any that did not apply
+        
+        Ignores any checks where passed is None
+        """
+        latest_for_each_checker = [
+            self.checks.filter(checker=c).latest("time")
+            for c in self.checks.values_list("checker", flat=True).distinct()
+        ]
+        return [check for check in latest_for_each_checker if check.passed is not None]
 
     def has_yang(self):
-        return any ( [ c.checker=='yang validation' and c.passed is not None for c in self.latest_checks()] )
+        return any(c.checker == "yang validation" for c in self.latest_checks())
 
     @property
     def replaces_names(self):
@@ -107,27 +116,27 @@ def revises_wg_draft(self):
     @property
     def active_wg_drafts_replaced(self):
         return Document.objects.filter(
-            docalias__name__in=self.replaces.split(','),
+            name__in=self.replaces.split(','),
             group__in=Group.objects.active_wgs()
         )
 
     @property
     def closed_wg_drafts_replaced(self):
         return Document.objects.filter(
-            docalias__name__in=self.replaces.split(','),
+            name__in=self.replaces.split(','),
             group__in=Group.objects.closed_wgs()
         )
 
 
 class SubmissionCheck(models.Model):
-    time = models.DateTimeField(default=datetime.datetime.now)
+    time = models.DateTimeField(default=timezone.now)
     submission = ForeignKey(Submission, related_name='checks')
     checker = models.CharField(max_length=256, blank=True)
     passed = models.BooleanField(null=True, default=False)
     message = models.TextField(null=True, blank=True)
     errors = models.IntegerField(null=True, blank=True, default=None)
     warnings = models.IntegerField(null=True, blank=True, default=None)
-    items = jsonfield.JSONField(null=True, blank=True, default='{}')
+    items = models.JSONField(null=True, blank=True, default=dict)
     symbol = models.CharField(max_length=64, default='')
     #
     def __str__(self):
@@ -139,7 +148,7 @@ def has_errors(self):
 
 class SubmissionEvent(models.Model):
     submission = ForeignKey(Submission)
-    time = models.DateTimeField(default=datetime.datetime.now)
+    time = models.DateTimeField(default=timezone.now)
     by = ForeignKey(Person, null=True, blank=True)
     desc = models.TextField()
 
@@ -157,7 +166,7 @@ class Preapproval(models.Model):
     """Pre-approved draft submission name."""
     name = models.CharField(max_length=255, db_index=True)
     by = ForeignKey(Person)
-    time = models.DateTimeField(default=datetime.datetime.now)
+    time = models.DateTimeField(default=timezone.now)
 
     def __str__(self):
         return self.name
diff --git a/ietf/submit/parsers/.gitignore b/ietf/submit/parsers/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/submit/parsers/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/submit/parsers/base.py b/ietf/submit/parsers/base.py
index 5c5d0d6fc5..d38ab1d7b8 100644
--- a/ietf/submit/parsers/base.py
+++ b/ietf/submit/parsers/base.py
@@ -1,19 +1,19 @@
-# Copyright The IETF Trust 2011-2020, All Rights Reserved
+# Copyright The IETF Trust 2011-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import re
-import datetime
-import debug                            # pyflakes:ignore
+import debug  # pyflakes:ignore
 
-from typing import List, Optional   # pyflakes:ignore
+from typing import List, Optional  # pyflakes:ignore
 
 from django.conf import settings
 from django.template.defaultfilters import filesizeformat
 
-from ietf.utils.mime import get_mime_type
+from ietf.utils.timezone import date_today
 
-class MetaData(object):
+
+class MetaData:
     rev = None
     name = None
     group = None
@@ -24,7 +24,8 @@ class MetaData(object):
     document_date = None
     authors = None
 
-class ParseInfo(object):
+
+class ParseInfo:
     """Collect errors from a parse"""
 
     def __init__(self):
@@ -45,9 +46,9 @@ def add_warning(self, warning_type, warning_str):
         self.warnings[warning_type] = warn_list + [warning_str]
 
 
-class FileParser(object):
-    ext = None                          # type: Optional[str]
-    mimetypes = []                      # type: List[str]
+class FileParser:
+    ext: Optional[str] = None
+    encoding = "utf8"
 
     def __init__(self, fd):
         self.fd = fd
@@ -57,35 +58,49 @@ def __init__(self, fd):
     # no other file parsing is recommended
     def critical_parse(self):
         self.parse_invalid_chars_in_filename()
-        self.parse_max_size();
+        self.parse_max_size()
         self.parse_filename_extension()
-        self.parse_file_type()
-        self.parsed_info.metadata.submission_date = datetime.date.today()
+        self.validate_encoding()
+        self.parsed_info.metadata.submission_date = date_today()
         return self.parsed_info
 
     def parse_invalid_chars_in_filename(self):
         name = self.fd.name
-        regexp = re.compile(r'&|\|\/|;|\*|\s|\$')
+        regexp = re.compile(r"&|\\|/|;|\*|\s|\$")
         chars = regexp.findall(name)
         if chars:
-            self.parsed_info.add_error('Invalid characters were found in the name of the file which was just submitted: %s' % ', '.join(set(chars)))
+            self.parsed_info.add_error(
+                "Invalid characters were found in the name of the file which was just submitted: %s"
+                % ", ".join(set(chars))
+            )
 
     def parse_max_size(self):
         max_size = settings.IDSUBMIT_MAX_DRAFT_SIZE[self.ext]
         if self.fd.size > max_size:
-            self.parsed_info.add_error('File size is larger than the permitted maximum of %s' % filesizeformat(max_size))
+            self.parsed_info.add_error(
+                "File size is larger than the permitted maximum of %s"
+                % filesizeformat(max_size)
+            )
         self.parsed_info.metadata.file_size = self.fd.size
 
     def parse_filename_extension(self):
-        if not self.fd.name.lower().endswith('.'+self.ext):
-            self.parsed_info.add_error('Expected the %s file to have extension ".%s", found the name "%s"' % (self.ext.upper(), self.ext, self.fd.name))
-
-    def parse_file_type(self):
-        self.fd.file.seek(0)
-        content = self.fd.file.read(64*1024)
-        mimetype, charset = get_mime_type(content)
-        if not mimetype in self.mimetypes:
-            self.parsed_info.add_error('Expected an %s file of type "%s", found one of type "%s"' % (self.ext.upper(), '" or "'.join(self.mimetypes), mimetype))
-        self.parsed_info.mimetype = mimetype
-        self.parsed_info.charset = charset
-        
\ No newline at end of file
+        if not self.fd.name.lower().endswith("." + self.ext):
+            self.parsed_info.add_error(
+                'Expected the %s file to have extension ".%s", found the name "%s"'
+                % (self.ext.upper(), self.ext, self.fd.name)
+            )
+
+    def validate_encoding(self):
+        self.fd.seek(0)
+        bytes = self.fd.read()
+        try:
+            bytes.decode(self.encoding)
+        except UnicodeDecodeError as err:
+            invalid_bytes = bytes[err.start : err.end]
+            self.parsed_info.add_error(
+                "Invalid {} byte(s) starting at byte {}: [{}]".format(
+                    err.encoding,
+                    err.start + 1,
+                    ", ".join(f"0x{b:x}" for b in invalid_bytes)
+                )
+            )
diff --git a/ietf/submit/parsers/plain_parser.py b/ietf/submit/parsers/plain_parser.py
index a3338e35a3..091179d992 100644
--- a/ietf/submit/parsers/plain_parser.py
+++ b/ietf/submit/parsers/plain_parser.py
@@ -10,7 +10,6 @@
 
 class PlainParser(FileParser):
     ext = 'txt'
-    mimetypes = ['text/plain', ]
 
     def __init__(self, fd):
         super(PlainParser, self).__init__(fd)
@@ -19,54 +18,41 @@ def __init__(self, fd):
     # no other file parsing is recommended
     def critical_parse(self):
         super(PlainParser, self).critical_parse()
-        self.check_file_charset()
         self.parse_name()
         return self.parsed_info
 
-    def check_file_charset(self):
-        charset = self.parsed_info.charset
-        if not charset in ['us-ascii', 'utf-8',]:
-            self.parsed_info.add_error('A plain text ASCII document is required.  '
-                'Found an unexpected encoding: "%s".  '
-                'You probably have one or more non-ascii characters in your file.'  % charset
-            )
-        if self.fd.charset and charset != self.fd.charset:
-            self.parsed_info.add_error("Unexpected charset mismatch: upload: %s, libmagic: %s" % (self.fd.charset, charset))
-
-
     def parse_name(self):
         self.fd.file.seek(0)
         draftre = re.compile(r'(draft-\S+)')
         revisionre = re.compile(r'.*-(\d+)$')
         limit = 80
-        if self.parsed_info.charset in ['us-ascii', 'utf-8']:
-            while limit:
-                limit -= 1
-                try:
-                    line = self.fd.readline().decode(self.parsed_info.charset)
-                except UnicodeDecodeError:
-                    return
-                match = draftre.search(line)
-                if not match:
-                    continue
-                name = match.group(1)
-                name = re.sub(r'^[^\w]+', '', name)
-                name = re.sub(r'[^\w]+$', '', name)
-                name = re.sub(r'\.txt$', '', name)
-                extra_chars = re.sub(r'[0-9a-z\-]', '', name)
-                if extra_chars:
-                    if len(extra_chars) == 1:
-                        self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name, ord(extra_chars[0]))) +
-                                                    '(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
-                    else:
-                        self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name, (', '.join([ str(ord(c)) for c in extra_chars] )))) +
-                                                    '(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
-                match_revision = revisionre.match(name)
-                if match_revision:
-                    self.parsed_info.metadata.rev = match_revision.group(1)
-                else:
-                    self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name,))
-                name = re.sub(r'-\d+$', '', name)
-                self.parsed_info.metadata.name = name
+        while limit:
+            limit -= 1
+            try:
+                line = self.fd.readline().decode(self.encoding)
+            except UnicodeDecodeError:
                 return
+            match = draftre.search(line)
+            if not match:
+                continue
+            name = match.group(1)
+            name = re.sub(r'^[^\w]+', '', name)
+            name = re.sub(r'[^\w]+$', '', name)
+            name = re.sub(r'\.txt$', '', name)
+            extra_chars = re.sub(r'[0-9a-z\-]', '', name)
+            if extra_chars:
+                if len(extra_chars) == 1:
+                    self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name, ord(extra_chars[0]))) +
+                                                '(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
+                else:
+                    self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name, (', '.join([ str(ord(c)) for c in extra_chars] )))) +
+                                                '(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
+            match_revision = revisionre.match(name)
+            if match_revision:
+                self.parsed_info.metadata.rev = match_revision.group(1)
+            else:
+                self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name,))
+            name = re.sub(r'-\d+$', '', name)
+            self.parsed_info.metadata.name = name
+            return
         self.parsed_info.add_error('The first page of the document does not contain a legitimate name that starts with draft-*')
diff --git a/ietf/submit/parsers/tests.py b/ietf/submit/parsers/tests.py
new file mode 100644
index 0000000000..9ab529a2fe
--- /dev/null
+++ b/ietf/submit/parsers/tests.py
@@ -0,0 +1,78 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test.utils import override_settings
+
+from ietf.utils.test_utils import TestCase
+
+from .base import FileParser
+
+
+@override_settings(IDSUBMIT_MAX_DRAFT_SIZE={"txt": 100})
+class FileParserTests(TestCase):
+    class MyParser(FileParser):
+        """Test parser class (FileParser is not usable on its own)"""
+
+        ext = "txt"
+
+    def test_invalid_encoding(self):
+        fp = self.MyParser(
+            SimpleUploadedFile(
+                name="valid-name.txt",
+                content=b"This is not valid utf-8 -> \xfe",
+                content_type="text/plain",
+            )
+        )
+        parse_info = fp.critical_parse()
+        self.assertEqual(len(parse_info.errors), 1)
+        self.assertIn("Invalid utf-8 byte(s)", parse_info.errors[0])
+        self.assertIn("0xfe", parse_info.errors[0])
+
+    def test_file_too_big(self):
+        fp = self.MyParser(
+            SimpleUploadedFile(
+                name="valid-name.txt",
+                content=b"1" + b"ten chars!" * 10,  # exceeds max size of 100
+                content_type="text/plain",
+            )
+        )
+        parse_info = fp.critical_parse()
+        self.assertEqual(len(parse_info.errors), 1)
+        self.assertIn("File size is larger", parse_info.errors[0])
+
+    def test_wrong_extension(self):
+        fp = self.MyParser(
+            SimpleUploadedFile(
+                name="invalid-ext.xml",
+                content=b"This is fine",
+                content_type="text/plain",
+            )
+        )
+        parse_info = fp.critical_parse()
+        self.assertEqual(len(parse_info.errors), 1)
+        self.assertIn("Expected the TXT file to have extension", parse_info.errors[0])
+
+    def test_invalid_char_in_filename(self):
+        # Can't test "/" in the filename because SimpleUploadedFile treats it as a path separator
+        for invalid_char in r"&\;*$ ":
+            uploaded_file = SimpleUploadedFile(
+                name="invalid" + invalid_char + "name.txt",
+                content=b"This is fine",
+                content_type="text/plain",
+            )
+            fp = self.MyParser(uploaded_file)
+            parse_info = fp.critical_parse()
+            self.assertEqual(
+                len(parse_info.errors), 1, f"{invalid_char} should trigger 1 error"
+            )
+            self.assertIn(
+                "Invalid characters were found",
+                parse_info.errors[0],
+                f"{invalid_char} is an invalid char",
+            )
+            self.assertIn(
+                f": {invalid_char}",
+                parse_info.errors[0],
+                f"{invalid_char} is the invalid char",
+            )
diff --git a/ietf/submit/parsers/xml_parser.py b/ietf/submit/parsers/xml_parser.py
index 674646e103..8068579926 100644
--- a/ietf/submit/parsers/xml_parser.py
+++ b/ietf/submit/parsers/xml_parser.py
@@ -3,7 +3,6 @@
 
 class XMLParser(FileParser):
     ext = 'xml'
-    mimetypes = ['application/xml', 'text/xml', ]
 
     # If some error is found after this method invocation
     # no other file parsing is recommended
diff --git a/ietf/submit/tasks.py b/ietf/submit/tasks.py
index 21d4275b75..9e279fa9f0 100644
--- a/ietf/submit/tasks.py
+++ b/ietf/submit/tasks.py
@@ -9,7 +9,9 @@
 from django.utils import timezone
 
 from ietf.submit.models import Submission
-from ietf.submit.utils import cancel_submission, create_submission_event, process_uploaded_submission
+from ietf.submit.utils import (cancel_submission, create_submission_event, process_uploaded_submission,
+                               process_and_accept_uploaded_submission, run_all_yang_model_checks,
+                               populate_yang_model_dirs)
 from ietf.utils import log
 
 
@@ -23,23 +25,54 @@ def process_uploaded_submission_task(submission_id):
         process_uploaded_submission(submission)
 
 
+@shared_task
+def process_and_accept_uploaded_submission_task(submission_id):
+    try:
+        submission = Submission.objects.get(pk=submission_id)
+    except Submission.DoesNotExist:
+        log.log(f'process_uploaded_submission_task called for missing submission_id={submission_id}')
+    else:
+        process_and_accept_uploaded_submission(submission)
+
+
 @shared_task
 def cancel_stale_submissions():
     now = timezone.now()
-    stale_submissions = Submission.objects.filter(
+    # first check for submissions gone stale awaiting validation
+    stale_unvalidated_submissions = Submission.objects.filter(
         state_id='validating',
     ).annotate(
         submitted_at=Min('submissionevent__time'),
     ).filter(
         submitted_at__lt=now - settings.IDSUBMIT_MAX_VALIDATION_TIME,
     )
-    for subm in stale_submissions:
+    for subm in stale_unvalidated_submissions:
         age = now - subm.submitted_at
         log.log(f'Canceling stale submission (id={subm.id}, age={age})')
         cancel_submission(subm)
         create_submission_event(None, subm, 'Submission canceled: validation checks took too long')
 
+    # now check for expired submissions
+    expired_submissions = Submission.objects.exclude(
+        state_id__in=["posted", "cancel"],
+    ).annotate(
+        submitted_at=Min("submissionevent__time"),
+    ).filter(
+        submitted_at__lt=now - settings.IDSUBMIT_EXPIRATION_AGE,
+    )
+    for subm in expired_submissions:
+        age = now - subm.submitted_at
+        log.log(f'Canceling expired submission (id={subm.id}, age={age})')
+        cancel_submission(subm)
+        create_submission_event(None, subm, 'Submission canceled: expired without being posted')
+
+
+@shared_task
+def run_yang_model_checks_task():
+    populate_yang_model_dirs()
+    run_all_yang_model_checks()
 
+    
 @shared_task(bind=True)
 def poke(self):
     log.log(f'Poked {self.name}, request id {self.request.id}')
diff --git a/ietf/submit/templatetags/.gitignore b/ietf/submit/templatetags/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/submit/templatetags/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/submit/test_submission.nonascii b/ietf/submit/test_submission.nonascii.txt
similarity index 100%
rename from ietf/submit/test_submission.nonascii
rename to ietf/submit/test_submission.nonascii.txt
diff --git a/ietf/submit/test_submission.txt b/ietf/submit/test_submission.txt
index 37a433ef8e..5e828e53ff 100644
--- a/ietf/submit/test_submission.txt
+++ b/ietf/submit/test_submission.txt
@@ -2,7 +2,7 @@
 
 
 
-Network Working Group                                            %(initials)s %(surname)s
+Network Working Group             %(firstpagename)37s
 Internet-Draft                                          Test Centre Inc.
 Intended status: Informational                                %(month)s %(year)s
 Expires: %(expiration)s
@@ -10,7 +10,6 @@ Expires: %(expiration)s
 
                              %(title)s
                          %(name)s
-
 Abstract
 
    This document describes how to test tests.
diff --git a/ietf/submit/test_submission_invalid_yang.txt b/ietf/submit/test_submission_invalid_yang.txt
index ef90b3fcb0..7b09706c32 100644
--- a/ietf/submit/test_submission_invalid_yang.txt
+++ b/ietf/submit/test_submission_invalid_yang.txt
@@ -2,7 +2,7 @@
 
 
 
-Network Working Group                                            A. Name
+Network Working Group             %(firstpagename)37s
 Internet-Draft                                          Test Centre Inc.
 Intended status: Informational                                %(month)s %(year)s
 Expires: %(expiration)s
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index 70baff4328..ad361d31b2 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -1,17 +1,18 @@
-# Copyright The IETF Trust 2011-2022, All Rights Reserved
+# Copyright The IETF Trust 2011-2026, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
 import email
 import io
+from unittest import mock
 import os
 import re
 import sys
-import mock
 
 from io import StringIO
 from pyquery import PyQuery
+from typing import Tuple
 
 from pathlib import Path
 
@@ -23,35 +24,40 @@
 from django.test.client import RequestFactory
 from django.urls import reverse as urlreverse
 from django.utils import timezone
-from django.utils.encoding import force_str, force_text
+from django.utils.encoding import force_str
 import debug                            # pyflakes:ignore
 
-from ietf.submit.utils import (expirable_submissions, expire_submission, find_submission_filenames,
-                               post_submission, validate_submission_name, validate_submission_rev,
-                               process_uploaded_submission, SubmissionError, process_submission_text)
-from ietf.doc.factories import (DocumentFactory, WgDraftFactory, IndividualDraftFactory, IndividualRfcFactory,
+from ietf.doc.factories import (DocumentFactory, WgDraftFactory, IndividualDraftFactory,
                                 ReviewFactory, WgRfcFactory)
-from ietf.doc.models import ( Document, DocAlias, DocEvent, State,
+from ietf.doc.models import ( Document, DocEvent, State,
     BallotPositionDocEvent, DocumentAuthor, SubmissionDocEvent )
+from ietf.doc.storage_utils import exists_in_storage, retrieve_str, store_str
 from ietf.doc.utils import create_ballot_if_not_open, can_edit_docextresources, update_action_holders
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.group.models import Group
 from ietf.group.utils import setup_default_community_list_for_group
 from ietf.meeting.models import Meeting
 from ietf.meeting.factories import MeetingFactory
-from ietf.message.models import Message
-from ietf.name.models import FormalLanguageName
+from ietf.name.models import DraftSubmissionStateName, FormalLanguageName
 from ietf.person.models import Person
-from ietf.person.factories import UserFactory, PersonFactory, EmailFactory
+from ietf.person.factories import UserFactory, PersonFactory
 from ietf.submit.factories import SubmissionFactory, SubmissionExtResourceFactory
 from ietf.submit.forms import SubmissionBaseUploadForm, SubmissionAutoUploadForm
 from ietf.submit.models import Submission, Preapproval, SubmissionExtResource
-from ietf.submit.mail import add_submission_email, process_response_email
-from ietf.submit.tasks import cancel_stale_submissions, process_uploaded_submission_task
-from ietf.utils.accesstoken import generate_access_token
-from ietf.utils.mail import outbox, empty_outbox, get_payload_text
-from ietf.utils.models import VersionInfo
+from ietf.submit.tasks import cancel_stale_submissions, process_and_accept_uploaded_submission_task
+from ietf.submit.utils import (expirable_submissions, expire_submission, find_submission_filenames,
+                               post_submission, validate_submission_name, validate_submission_rev,
+                               process_and_accept_uploaded_submission, SubmissionError, process_submission_text,
+                               process_submission_xml, process_uploaded_submission, 
+                               process_and_validate_submission, apply_yang_checker_to_draft, 
+                               run_all_yang_model_checks)
+from ietf.submit.views import access_token_is_valid, auth_token_is_valid
+from ietf.utils import tool_version
+from ietf.utils.accesstoken import generate_access_token, generate_random_key
+from ietf.utils.mail import outbox, get_payload_text
+from ietf.utils.test_runner import TestBlobstoreManager
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase
+from ietf.utils.timezone import date_today
 from ietf.utils.draft import PlaintextDraft
 
 
@@ -90,8 +96,29 @@ def repository_dir(self):
     def archive_dir(self):
         return settings.INTERNET_DRAFT_ARCHIVE_DIR
 
-def submission_file(name_in_doc, name_in_post, group, templatename, author=None, email=None, title=None, year=None, ascii=True):
-    _today = datetime.date.today()
+    def post_to_upload_submission(self, *args, **kwargs):
+        """POST to the upload_submission endpoint
+        
+        Use this instead of directly POSTing to be sure that the appropriate celery
+        tasks would be queued (but are not actually queued during testing)
+        """
+        # Mock task so we can check that it's called without actually submitting a celery task.
+        # Also mock on_commit() because otherwise the test transaction prevents the call from
+        # ever being made.
+        with mock.patch("ietf.submit.views.process_uploaded_submission_task") as mocked_task:
+            with mock.patch("ietf.submit.views.transaction.on_commit", side_effect=lambda x: x()):
+                response = self.client.post(*args, **kwargs)
+        if response.status_code == 302:
+            # A 302 indicates we're being redirected to the status page, meaning the upload
+            # was accepted. Check that the task would have been queued.
+            self.assertTrue(mocked_task.delay.called)
+        else:
+            self.assertFalse(mocked_task.delay.called)
+        return response
+
+
+def submission_file_contents(name_in_doc, group, templatename, author=None, email=None, title=None, year=None, ascii=True):
+    _today = date_today()
     # construct appropriate text draft
     f = io.open(os.path.join(settings.BASE_DIR, "submit", templatename))
     template = f.read()
@@ -106,6 +133,10 @@ def submission_file(name_in_doc, name_in_post, group, templatename, author=None,
     if year is None:
         year = _today.strftime("%Y")
 
+    # extract_authors() cuts the author line off at the first space past 80 characters
+    # very long factory-generated names can hence be truncated, causing a failure
+    # ietf/submit/test_submission.txt was changed so that 37-character names and shorter will work
+    # this may need further adjustment if longer names still cause failures
     submission_text = template % dict(
             date=_today.strftime("%d %B %Y"),
             expiration=(_today + datetime.timedelta(days=100)).strftime("%d %B, %Y"),
@@ -118,14 +149,23 @@ def submission_file(name_in_doc, name_in_post, group, templatename, author=None,
             asciiAuthor=author.ascii,
             initials=author.initials(),
             surname=author.ascii_parts()[3] if ascii else author.name_parts()[3],
+            firstpagename=f"{author.initials()} {author.ascii_parts()[3] if ascii else author.name_parts()[3]}",
             asciiSurname=author.ascii_parts()[3],
             email=email,
             title=title,
     )
+    return submission_text, author
+
+
+def submission_file(name_in_doc, name_in_post, group, templatename, author=None, email=None, title=None, year=None, ascii=True):
+    submission_text, author = submission_file_contents(
+        name_in_doc, group, templatename, author, email, title, year, ascii
+    )
     file = StringIO(submission_text)
     file.name = name_in_post
     return file, author
 
+
 def create_draft_submission_with_rev_mismatch(rev='01'):
     """Create a draft and submission with mismatched version
 
@@ -146,7 +186,7 @@ def create_draft_submission_with_rev_mismatch(rev='01'):
     sub = Submission.objects.create(
         name=draft_name,
         group=None,
-        submission_date=datetime.date.today() - datetime.timedelta(days=1),
+        submission_date=date_today() - datetime.timedelta(days=1),
         rev=rev,
         state_id='posted',
     )
@@ -160,37 +200,77 @@ def create_draft_submission_with_rev_mismatch(rev='01'):
     return draft, sub
 
 
+class ManualSubmissionTests(TestCase):
+    def test_manualpost_view(self):
+        submission = SubmissionFactory(state_id="manual")
+        url = urlreverse("ietf.submit.views.manualpost")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        # Validate that the basic submission status URL is on the manual post page
+        # _without_ an access token, even if logged in as various users.
+        expected_url = urlreverse(
+            "ietf.submit.views.submission_status", 
+            kwargs=dict(submission_id=submission.pk)
+        )
+        selected_elts = q("#manual.submissions td a")
+        self.assertEqual(expected_url, selected_elts.attr("href"))
+        self.assertIn(submission.name, selected_elts.text())
+        for username in ["plain", "secretary"]:
+            self.client.login(username=username, password=username + "+password")
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            selected_elts = q("#manual.submissions td a")
+            self.assertEqual(expected_url, selected_elts.attr("href"))
+            self.assertIn(submission.name, selected_elts.text())
+
+
 class SubmitTests(BaseSubmitTestCase):
     def setUp(self):
         super().setUp()
+        (Path(settings.FTP_DIR) / "internet-drafts").mkdir()
         # Submit views assume there is a "next" IETF to look for cutoff dates against
-        MeetingFactory(type_id='ietf', date=datetime.date.today()+datetime.timedelta(days=180))
+        MeetingFactory(type_id='ietf', date=date_today()+datetime.timedelta(days=180))
 
-    def create_and_post_submission(self, name, rev, author, group=None, formats=("txt",), base_filename=None):
+    def create_and_post_submission(self, name, rev, author, group=None, formats=("txt",), base_filename=None, ascii=True):
         """Helper to create and post a submission
 
-        If base_filename is None, defaults to 'test_submission'
+        If base_filename is None, defaults to 'test_submission'.
         """
         url = urlreverse('ietf.submit.views.upload_submission')
         files = dict()
 
         for format in formats:
             fn = '.'.join((base_filename or 'test_submission', format))
-            files[format], __ = submission_file(f'{name}-{rev}', f'{name}-{rev}.{format}', group, fn, author=author)
+            files[format], __ = submission_file(f'{name}-{rev}', f'{name}-{rev}.{format}', group, fn, author=author, ascii=ascii)
 
-        r = self.client.post(url, files)
-        if r.status_code != 302:
+        r = self.post_to_upload_submission(url, files)
+        if r.status_code == 302:
+            # A redirect means the upload was accepted and queued for processing
+            process_submission = True
+            last_submission = Submission.objects.order_by("-pk").first()
+            self.assertEqual(last_submission.state_id, "validating")
+        else:
+            process_submission = False
             q = PyQuery(r.content)
             print(q('div.invalid-feedback').text())
         self.assertNoFormPostErrors(r, ".invalid-feedback,.alert-danger")
-
-        for format in formats:
-            self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.%s" % (name, rev, format))))
-            if format == 'xml':
-                self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.%s" % (name, rev, 'html'))))
+        
+        # Now process the submission like the task would do
+        if process_submission:
+            process_uploaded_submission(Submission.objects.order_by('-pk').first())
+            for format in formats:
+                self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.%s" % (name, rev, format))))
+                if format == 'xml':
+                    self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.%s" % (name, rev, 'html'))))
         return r
 
-    def do_submission(self, name, rev, group=None, formats=["txt",], author=None):
+    def do_submission(self, name, rev, group=None, formats: Tuple[str, ...]=("txt",), author=None, base_filename=None, ascii=True):
+        """Simulate uploading a draft and waiting for validation results
+        
+        Returns the "full access" status URL and the author associated with the submitted draft.
+        """
         # break early in case of missing configuration
         self.assertTrue(os.path.exists(settings.IDSUBMIT_IDNITS_BINARY))
 
@@ -205,7 +285,9 @@ def do_submission(self, name, rev, group=None, formats=["txt",], author=None):
         # submit
         if author is None:
             author = PersonFactory()
-        r = self.create_and_post_submission(name, rev, author, group, formats)
+        r = self.create_and_post_submission(
+            name=name, rev=rev, author=author, group=group, formats=formats, base_filename=base_filename, ascii=ascii
+        )
         status_url = r["Location"]
 
         self.assertEqual(Submission.objects.filter(name=name).count(), 1)
@@ -217,8 +299,10 @@ def do_submission(self, name, rev, group=None, formats=["txt",], author=None):
             sys.stderr.write("Author initials: %s\n" % author.initials())
         self.assertEqual(len(submission.authors), 1)
         a = submission.authors[0]
-        self.assertEqual(a["name"], author.ascii_name())
-        self.assertEqual(a["email"], author.email().address.lower())
+        if ascii:
+            self.assertEqual(a["name"], author.ascii_name())
+        if author.email():
+            self.assertEqual(a["email"], author.email().address.lower())
         self.assertEqual(a["affiliation"], "Test Centre Inc.")
         self.assertEqual(a["country"], "UK")
 
@@ -247,7 +331,7 @@ def supply_extra_metadata(self, name, status_url, submitter_name, submitter_emai
             submission = Submission.objects.get(name=name)
             self.assertEqual(submission.submitter, email.utils.formataddr((submitter_name, submitter_email)))
             self.assertEqual([] if submission.replaces == "" else submission.replaces.split(','),
-                             [ d.name for d in DocAlias.objects.filter(pk__in=replaces) ])
+                             [ d.name for d in Document.objects.filter(pk__in=replaces) ])
             self.assertCountEqual(
                 [str(r) for r in submission.external_resources.all()],
                 [str(r) for r in extresources] if extresources else [],
@@ -278,6 +362,7 @@ def verify_bibxml_ids_creation(self, draft):
 
     def submit_new_wg(self, formats):
         # submit new -> supply submitter info -> approve
+        TestBlobstoreManager().emptyTestBlobstores()
         GroupFactory(type_id='wg',acronym='ames')
         mars = GroupFactory(type_id='wg', acronym='mars')
         RoleFactory(name_id='chair', group=mars, person__user__username='marschairman')
@@ -287,7 +372,7 @@ def submit_new_wg(self, formats):
         # prepare draft to suggest replace
         sug_replaced_draft = Document.objects.create(
             name="draft-ietf-ames-sug-replaced",
-            time=datetime.datetime.now(),
+            time=timezone.now(),
             type_id="draft",
             title="Draft to be suggested to be replaced",
             stream_id="ietf",
@@ -298,13 +383,10 @@ def submit_new_wg(self, formats):
             words=100,
             intended_std_level_id="ps",
             ad=draft.ad,
-            expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
+            expires=timezone.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             notify="aliens@example.mars",
-            note="",
         )
         sug_replaced_draft.set_state(State.objects.get(used=True, type="draft", slug="active"))
-        sug_replaced_alias = DocAlias.objects.create(name=sug_replaced_draft.name)
-        sug_replaced_alias.docs.add(sug_replaced_draft)
 
         name = "draft-ietf-mars-testing-tests"
         rev = "00"
@@ -314,14 +396,13 @@ def submit_new_wg(self, formats):
 
         # supply submitter info, then draft should be in and ready for approval
         mailbox_before = len(outbox)
-        replaced_alias = draft.docalias.first()
         r = self.supply_extra_metadata(name, status_url, author.ascii, author.email().address.lower(),
-                                       replaces=[str(replaced_alias.pk), str(sug_replaced_alias.pk)])
+                                       replaces=[str(draft.pk), str(sug_replaced_draft.pk)])
 
         self.assertEqual(r.status_code, 302)
         status_url = r["Location"]
         self.assertEqual(len(outbox), mailbox_before + 1)
-        self.assertTrue("New draft waiting for approval" in outbox[-1]["Subject"])
+        self.assertTrue("New Internet-Draft waiting for approval" in outbox[-1]["Subject"])
         self.assertTrue(name in outbox[-1]["Subject"])
 
         # as chair of WG, we should see approval button
@@ -346,7 +427,7 @@ def submit_new_wg(self, formats):
         r = self.client.post(status_url, dict(action=action))
         self.assertEqual(r.status_code, 302)
 
-        draft = Document.objects.get(docalias__name=name)
+        draft = Document.objects.get(name=name)
         self.assertEqual(draft.rev, rev)
         new_revision = draft.latest_event(type="new_revision")
         self.assertEqual(draft.group.acronym, "mars")
@@ -355,18 +436,25 @@ def submit_new_wg(self, formats):
         self.assertTrue(draft.latest_event(type="added_suggested_replaces"))
         self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
         self.assertTrue(os.path.exists(os.path.join(self.repository_dir, "%s-%s.txt" % (name, rev))))
+        check_ext = ["xml", "txt", "html"] if "xml" in formats else ["txt"]
+        for ext in check_ext:
+            basename=f"{name}-{rev}.{ext}"
+            extname=f"{ext}/{basename}"
+            self.assertFalse(exists_in_storage("staging", basename))
+            self.assertTrue(exists_in_storage("active-draft", extname))
+            self.assertTrue(exists_in_storage("draft", extname))            
         self.assertEqual(draft.type_id, "draft")
         self.assertEqual(draft.stream_id, "ietf")
-        self.assertTrue(draft.expires >= datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE - 1))
+        self.assertTrue(draft.expires >= timezone.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE - 1))
         self.assertEqual(draft.get_state("draft-stream-%s" % draft.stream_id).slug, "wg-doc")
         authors = draft.documentauthor_set.all()
         self.assertEqual(len(authors), 1)
         self.assertEqual(authors[0].person, author)
         self.assertEqual(set(draft.formal_languages.all()), set(FormalLanguageName.objects.filter(slug="json")))
         self.assertEqual(draft.relations_that_doc("replaces").count(), 1)
-        self.assertTrue(draft.relations_that_doc("replaces").first().target, replaced_alias)
+        self.assertTrue(draft.relations_that_doc("replaces").first().target, draft)
         self.assertEqual(draft.relations_that_doc("possibly-replaces").count(), 1)
-        self.assertTrue(draft.relations_that_doc("possibly-replaces").first().target, sug_replaced_alias)
+        self.assertTrue(draft.relations_that_doc("possibly-replaces").first().target, sug_replaced_draft)
         self.assertEqual(len(outbox), mailbox_before + 5)
         self.assertIn(("I-D Action: %s" % name), outbox[-4]["Subject"])
         self.assertIn(author.ascii, get_payload_text(outbox[-4]))
@@ -379,7 +467,7 @@ def submit_new_wg(self, formats):
         # Check "Review of suggested possible replacements for..." mail
         self.assertIn("review", outbox[-1]["Subject"].lower())
         self.assertIn(name, get_payload_text(outbox[-1]))
-        self.assertIn(sug_replaced_alias.name, get_payload_text(outbox[-1]))
+        self.assertIn(sug_replaced_draft.name, get_payload_text(outbox[-1]))
         self.assertIn("ames-chairs@", outbox[-1]["To"].lower())
         self.assertIn("mars-chairs@", outbox[-1]["To"].lower())
         # Check submission settings
@@ -432,7 +520,7 @@ def test_submit_new_wg_as_author(self):
 
         # Approval request notification should be sent to the WG chair
         self.assertEqual(len(outbox), mailbox_before + 1)
-        self.assertTrue("New draft waiting for approval" in outbox[-1]["Subject"])
+        self.assertTrue("New Internet-Draft waiting for approval" in outbox[-1]["Subject"])
         self.assertTrue(name in outbox[-1]["Subject"])
         self.assertTrue('mars-chairs@ietf.org' in outbox[-1]['To'])
 
@@ -441,8 +529,28 @@ def test_submit_new_wg_as_author(self):
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'The submission is pending approval by the group chairs.')
 
+    def test_submit_new_wg_as_author_bad_submitter(self):
+        # submit new -> supply submitter info -> approve
+        mars = GroupFactory(type_id='wg', acronym='mars')
+        draft = WgDraftFactory(group=mars)
+        setup_default_community_list_for_group(draft.group)
+
+        name = "draft-ietf-mars-testing-tests"
+        rev = "00"
+        group = "mars"
+
+        status_url, author = self.do_submission(name, rev, group)
+        username = author.user.email
+
+        # supply submitter info with MIME-encoded name
+        self.client.login(username=username, password=username+'+password')  # log in as the author
+        r = self.supply_extra_metadata(name, status_url, '=?utf-8?q?Peter_Christen_Asbj=C3=B8rnsen?=', author.email().address.lower(), replaces=[])
+        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, 'appears to be a MIME-encoded string')
+
     def submit_new_concluded_wg_as_author(self, group_state_id='conclude'):
         """A new concluded WG submission by a logged-in author needs AD approval"""
+        TestBlobstoreManager().emptyTestBlobstores()
         mars = GroupFactory(type_id='wg', acronym='mars', state_id=group_state_id)
         draft = WgDraftFactory(group=mars)
         setup_default_community_list_for_group(draft.group)
@@ -488,9 +596,10 @@ def test_submit_new_wg_with_extresources(self):
 
     def submit_existing(self, formats, change_authors=True, group_type='wg', stream_type='ietf'):
         # submit new revision of existing -> supply submitter info -> prev authors confirm
+        TestBlobstoreManager().emptyTestBlobstores()
 
         def _assert_authors_are_action_holders(draft, expect=True):
-            for author in draft.authors():
+            for author in draft.author_persons():
                 if expect:
                     self.assertIn(author, draft.action_holders.all())
                 else:
@@ -630,7 +739,7 @@ def _assert_authors_are_action_holders(draft, expect=True):
         self.assertTrue('New version approved' in edescs)
         self.assertTrue('Uploaded new revision' in edescs)
 
-        draft = Document.objects.get(docalias__name=name)
+        draft = Document.objects.get(name=name)
         self.assertEqual(draft.rev, rev)
         self.assertEqual(draft.group.acronym, name.split("-")[2])
         #
@@ -679,6 +788,13 @@ def inspect_docevents(docevents, event_delta, event_type, be_in_desc, by_name):
         self.assertTrue(os.path.exists(os.path.join(self.archive_dir, "%s-%s.txt" % (name, old_rev))))
         self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
         self.assertTrue(os.path.exists(os.path.join(self.repository_dir, "%s-%s.txt" % (name, rev))))
+        check_ext = ["xml", "txt", "html"] if "xml" in formats else ["txt"]
+        for ext in check_ext:
+            basename=f"{name}-{rev}.{ext}"
+            extname=f"{ext}/{basename}"
+            self.assertFalse(exists_in_storage("staging", basename))
+            self.assertTrue(exists_in_storage("active-draft", extname))
+            self.assertTrue(exists_in_storage("draft", extname))  
         self.assertEqual(draft.type_id, "draft")
         if stream_type == 'ietf':
             self.assertEqual(draft.stream_id, "ietf")
@@ -695,10 +811,10 @@ def inspect_docevents(docevents, event_delta, event_type, be_in_desc, by_name):
         self.assertTrue("New Version Notification" in outbox[-2]["Subject"])
         self.assertTrue(name in get_payload_text(outbox[-2]))
         interesting_address = {'ietf':'mars', 'irtf':'irtf-chair', 'iab':'iab-chair', 'ise':'rfc-ise'}[draft.stream_id]
-        self.assertTrue(interesting_address in force_text(outbox[-2].as_string()))
+        self.assertTrue(interesting_address in force_str(outbox[-2].as_string()))
         if draft.stream_id == 'ietf':
-            self.assertTrue(draft.ad.role_email("ad").address in force_text(outbox[-2].as_string()))
-            self.assertTrue(ballot_position.balloter.role_email("ad").address in force_text(outbox[-2].as_string()))
+            self.assertTrue(draft.ad.role_email("ad").address in force_str(outbox[-2].as_string()))
+            self.assertTrue(ballot_position.balloter.role_email("ad").address in force_str(outbox[-2].as_string()))
         self.assertTrue("New Version Notification" in outbox[-1]["Subject"])
         self.assertTrue(name in get_payload_text(outbox[-1]))
         r = self.client.get(urlreverse('ietf.doc.views_search.recent_drafts'))
@@ -785,7 +901,7 @@ def do_submit_existing_concluded_wg_test(self, group_state_id='conclude', submit
 
         # Approval request notification should be sent to the AD for the group
         self.assertEqual(len(outbox), mailbox_before + 1)
-        self.assertTrue("New draft waiting for approval" in outbox[-1]["Subject"])
+        self.assertTrue("New Internet-Draft waiting for approval" in outbox[-1]["Subject"])
         self.assertTrue(name in outbox[-1]["Subject"])
         self.assertTrue(ad.user.email in outbox[-1]['To'])
 
@@ -817,6 +933,7 @@ def test_submit_existing_iab_with_extresources(self):
 
     def submit_new_individual(self, formats):
         # submit new -> supply submitter info -> confirm
+        TestBlobstoreManager().emptyTestBlobstores()
 
         name = "draft-authorname-testing-tests"
         rev = "00"
@@ -857,13 +974,37 @@ def submit_new_individual(self, formats):
         r = self.client.post(confirmation_url, {'action':'confirm'})
         self.assertEqual(r.status_code, 302)
 
-        draft = Document.objects.get(docalias__name=name)
+        draft = Document.objects.get(name=name)
         self.assertEqual(draft.rev, rev)
         new_revision = draft.latest_event()
         self.assertEqual(new_revision.type, "new_revision")
         self.assertEqual(new_revision.by.name, "Submitter Name")
         self.verify_bibxml_ids_creation(draft)
 
+        repository_path = Path(draft.get_file_name())
+        self.assertTrue(repository_path.exists()) # Note that this doesn't check that it has the right _content_
+        ftp_path = Path(settings.FTP_DIR) / "internet-drafts" / repository_path.name
+        self.assertTrue(repository_path.samefile(ftp_path))
+        all_archive_path = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR) / repository_path.name
+        self.assertTrue(repository_path.samefile(all_archive_path))
+        for ext in settings.IDSUBMIT_FILE_TYPES:
+            if ext == "txt":
+                continue
+            variant_path = repository_path.parent / f"{repository_path.stem}.{ext}"
+            if variant_path.exists():
+                variant_ftp_path = Path(settings.FTP_DIR) / "internet-drafts" / variant_path.name
+                self.assertTrue(variant_path.samefile(variant_ftp_path))
+                variant_all_archive_path = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR) / variant_path.name
+                self.assertTrue(variant_path.samefile(variant_all_archive_path))
+        check_ext = ["xml", "txt", "html"] if "xml" in formats else ["txt"]
+        for ext in check_ext:
+            basename=f"{name}-{rev}.{ext}"
+            extname=f"{ext}/{basename}"
+            self.assertFalse(exists_in_storage("staging", basename))
+            self.assertTrue(exists_in_storage("active-draft", extname))
+            self.assertTrue(exists_in_storage("draft", extname))  
+
+
     def test_submit_new_individual_txt(self):
         self.submit_new_individual(["txt"])
 
@@ -878,6 +1019,7 @@ def test_submit_new_individual_txt_xml(self):
         self.submit_new_individual(["txt", "xml"])
 
     def submit_new_draft_no_org_or_address(self, formats):
+        TestBlobstoreManager().emptyTestBlobstores()
         name = 'draft-testing-no-org-or-address'
 
         author = PersonFactory()
@@ -897,7 +1039,7 @@ def submit_new_draft_no_org_or_address(self, formats):
         action = force_post_button.parents("form").find('input[type=hidden][name="action"]').val()
         r = self.client.post(status_url, dict(action=action))
 
-        doc = Document.objects.get(docalias__name=name)
+        doc = Document.objects.get(name=name)
         self.assertEqual(doc.documentauthor_set.count(), 1)
         docauth = doc.documentauthor_set.first()
         self.assertEqual(docauth.person, author)
@@ -968,6 +1110,7 @@ def _assert_extresource_change_event(self, doc, is_present=True):
             self.assertIsNone(event, 'External resource change event was unexpectedly created')
 
     def submit_new_draft_with_extresources(self, group):
+        TestBlobstoreManager().emptyTestBlobstores()
         name = 'draft-testing-with-extresources'
 
         status_url, author = self.do_submission(name, rev='00', group=group)
@@ -997,6 +1140,7 @@ def test_submit_new_individual_with_extresources(self):
 
     def submit_new_individual_logged_in(self, formats):
         # submit new -> supply submitter info -> done
+        TestBlobstoreManager().emptyTestBlobstores()
 
         name = "draft-authorname-testing-logged-in"
         rev = "00"
@@ -1030,7 +1174,7 @@ def submit_new_individual_logged_in(self, formats):
         self.assertIn("New Version Notification", notification_email["Subject"])
         self.assertIn(author.email().address.lower(), notification_email["To"])
 
-        draft = Document.objects.get(docalias__name=name)
+        draft = Document.objects.get(name=name)
         self.assertEqual(draft.rev, rev)
         self.assertEqual(draft.docextresource_set.count(), 0)
         new_revision = draft.latest_event()
@@ -1078,7 +1222,7 @@ def test_submit_new_logged_in_with_extresources(self):
         self._assert_extresources_form_not_present(r)
 
         # Check that the draft itself got the resources        
-        draft = Document.objects.get(docalias__name=name)
+        draft = Document.objects.get(name=name)
         self.assertCountEqual(
             [str(r) for r in draft.docextresource_set.all()],
             [str(r) for r in resources],
@@ -1087,7 +1231,7 @@ def test_submit_new_logged_in_with_extresources(self):
         self.verify_bibxml_ids_creation(draft)
 
     def test_submit_update_individual(self):
-        IndividualDraftFactory(name='draft-ietf-random-thing', states=[('draft','rfc')], other_aliases=['rfc9999',], pages=5)
+        IndividualDraftFactory(name='draft-ietf-random-thing', states=[('draft','active'),('draft-iesg','approved')], pages=5)
         ad=Person.objects.get(user__username='ad')
         # Group of None here does not reflect real individual submissions
         draft = IndividualDraftFactory(group=None, ad = ad, authors=[ad,], notify='aliens@example.mars', pages=5)
@@ -1097,23 +1241,14 @@ def test_submit_update_individual(self):
         status_url, author = self.do_submission(name,rev)
         mailbox_before = len(outbox)
 
-        replaced_alias = draft.docalias.first()
-        r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(replaced_alias.pk)])
+        r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(draft.pk)])
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'cannot replace itself')
         self._assert_extresources_in_table(r, [])
         self._assert_extresources_form(r, [])
 
-        replaced_alias = DocAlias.objects.get(name='draft-ietf-random-thing')
-        r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(replaced_alias.pk)])
-        self.assertEqual(r.status_code, 200)
-        self.assertContains(r, 'cannot replace an RFC')
-        self._assert_extresources_in_table(r, [])
-        self._assert_extresources_form(r, [])
-
-        replaced_alias.document.set_state(State.objects.get(type='draft-iesg',slug='approved'))
-        replaced_alias.document.set_state(State.objects.get(type='draft',slug='active'))
-        r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(replaced_alias.pk)])
+        replaced = Document.objects.get(name='draft-ietf-random-thing')
+        r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=[str(replaced.pk)])
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'approved by the IESG and cannot')
         self._assert_extresources_in_table(r, [])
@@ -1133,7 +1268,7 @@ def test_submit_update_individual(self):
         r = self.client.post(confirmation_url, {'action':'confirm'})
         self.assertEqual(r.status_code, 302)
         self.assertEqual(len(outbox), mailbox_before+3)
-        draft = Document.objects.get(docalias__name=name)
+        draft = Document.objects.get(name=name)
         self.assertEqual(draft.rev, rev)
         self.assertEqual(draft.relateddocument_set.filter(relationship_id='replaces').count(), replaces_count)
         self.assertEqual(draft.docextresource_set.count(), 0)
@@ -1149,15 +1284,16 @@ def submit_existing_with_extresources(self, group_type, stream_type='ietf'):
         
         Unlike some other tests in this module, does not confirm draft if this would be required.
         """
-        orig_draft = DocumentFactory(
+        TestBlobstoreManager().emptyTestBlobstores()
+        orig_draft: Document = DocumentFactory(  # type: ignore[annotation-unchecked]
             type_id='draft',
             group=GroupFactory(type_id=group_type) if group_type else None,
             stream_id=stream_type,
-        )  # type: Document
+        )
         name = orig_draft.name
         group = orig_draft.group
         new_rev = '%02d' % (int(orig_draft.rev) + 1)
-        author = PersonFactory()  # type: Person
+        author: Person = PersonFactory()  # type: ignore[annotation-unchecked]
         DocumentAuthor.objects.create(person=author, document=orig_draft)
         orig_draft.docextresource_set.create(name_id='faq', value='https://faq.example.com/')
         orig_draft.docextresource_set.create(name_id='wiki', value='https://wiki.example.com', display_name='Test Wiki')
@@ -1189,6 +1325,7 @@ def test_submit_update_individual_with_extresources(self):
 
     def submit_new_individual_replacing_wg(self, logged_in=False, group_state_id='active', notify_ad=False):
         """Chair of an active WG should be notified if individual draft is proposed to replace a WG draft"""
+        TestBlobstoreManager().emptyTestBlobstores()
         name = "draft-authorname-testing-tests"
         rev = "00"
         group = None
@@ -1207,7 +1344,7 @@ def submit_new_individual_replacing_wg(self, logged_in=False, group_state_id='ac
             status_url,
             "Submitter Name",
             "submitter@example.com",
-            replaces=[str(replaced_draft.docalias.first().pk)],
+            replaces=[str(replaced_draft.pk)],
         )
         
         submission = Submission.objects.get(name=name, rev=rev)
@@ -1218,7 +1355,7 @@ def submit_new_individual_replacing_wg(self, logged_in=False, group_state_id='ac
             ad.user.email if notify_ad else '%s-chairs@ietf.org' % replaced_draft.group.acronym,
             notice['To']
         )
-        self.assertIn('New draft waiting for approval', notice['Subject'])
+        self.assertIn('New Internet-Draft waiting for approval', notice['Subject'])
 
     def test_submit_new_individual_replacing_wg(self):
         self.submit_new_individual_replacing_wg()
@@ -1251,16 +1388,13 @@ def test_submit_cancel_confirmation(self):
         r = self.client.post(confirmation_url, {'action':'cancel'})
         self.assertEqual(r.status_code, 302)
         self.assertEqual(len(outbox), mailbox_before)
-        draft = Document.objects.get(docalias__name=name)
+        draft = Document.objects.get(name=name)
         self.assertEqual(draft.rev, old_rev)
 
     def test_submit_new_wg_with_dash(self):
         group = Group.objects.create(acronym="mars-special", name="Mars Special", type_id="wg", state_id="active")
-
         name = "draft-ietf-%s-testing-tests" % group.acronym
-
-        self.do_submission(name, "00")
-
+        self.create_and_post_submission(name=name, rev="00", author=PersonFactory())
         self.assertEqual(Submission.objects.get(name=name).group.acronym, group.acronym)
 
     def test_submit_new_wg_v2_country_only(self):
@@ -1286,19 +1420,15 @@ def test_submit_new_wg_v2_country_only(self):
 
     def test_submit_new_irtf(self):
         group = Group.objects.create(acronym="saturnrg", name="Saturn", type_id="rg", state_id="active")
-
         name = "draft-irtf-%s-testing-tests" % group.acronym
-
-        self.do_submission(name, "00")
-
-        self.assertEqual(Submission.objects.get(name=name).group.acronym, group.acronym)
-        self.assertEqual(Submission.objects.get(name=name).group.type_id, group.type_id)
+        self.create_and_post_submission(name=name, rev="00", author=PersonFactory())
+        submission = Submission.objects.get(name=name)
+        self.assertEqual(submission.group.acronym, group.acronym)
+        self.assertEqual(submission.group.type_id, group.type_id)
 
     def test_submit_new_iab(self):
         name = "draft-iab-testing-tests"
-
-        self.do_submission(name, "00")
-
+        self.create_and_post_submission(name=name, rev="00", author=PersonFactory())
         self.assertEqual(Submission.objects.get(name=name).group.acronym, "iab")
 
     def test_cancel_submission(self):
@@ -1322,6 +1452,7 @@ def test_cancel_submission(self):
         # cancel
         r = self.client.post(status_url, dict(action=action))
         self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
+        self.assertFalse(exists_in_storage("staging",f"{name}-{rev}.txt"))
 
     def test_edit_submission_and_force_post(self):
         # submit -> edit
@@ -1355,7 +1486,7 @@ def test_edit_submission_and_force_post(self):
         # edit
         mailbox_before = len(outbox)
         # FIXME If this test is started before midnight, and ends after, it will fail
-        document_date = datetime.date.today() - datetime.timedelta(days=-3)
+        document_date = date_today() - datetime.timedelta(days=-3)
         r = self.client.post(edit_url, {
             "edit-title": "some title",
             "edit-rev": "00",
@@ -1364,8 +1495,7 @@ def test_edit_submission_and_force_post(self):
             "edit-pages": "123",
             "submitter-name": "Some Random Test Person",
             "submitter-email": "random@example.com",
-            "replaces": [str(draft.docalias.first().pk)],
-            "edit-note": "no comments",
+            "replaces": [str(draft.pk)],
             "authors-0-name": "Person 1",
             "authors-0-email": "person1@example.com",
             "authors-1-name": "Person 2",
@@ -1381,9 +1511,8 @@ def test_edit_submission_and_force_post(self):
         self.assertEqual(submission.document_date, document_date)
         self.assertEqual(submission.abstract, "some abstract")
         self.assertEqual(submission.pages, 123)
-        self.assertEqual(submission.note, "no comments")
         self.assertEqual(submission.submitter, "Some Random Test Person <random@example.com>")
-        self.assertEqual(submission.replaces, draft.docalias.first().name)
+        self.assertEqual(submission.replaces, draft.name)
         self.assertEqual(submission.state_id, "manual")
 
         authors = submission.authors
@@ -1415,7 +1544,7 @@ def test_edit_submission_and_force_post(self):
         r = self.client.post(status_url, dict(action=action))
         self.assertEqual(r.status_code, 302)
 
-        draft = Document.objects.get(docalias__name=name)
+        draft = Document.objects.get(name=name)
         self.assertEqual(draft.rev, rev)
         self.assertEqual(draft.docextresource_set.count(), 0)
         self.verify_bibxml_ids_creation(draft)
@@ -1444,7 +1573,7 @@ def test_search_for_submission_and_edit_as_secretariat(self):
         self.assertEqual(r.status_code, 302)
         unprivileged_status_url = r['Location']
 
-        # status page as unpriviliged => no edit button
+        # status page as unprivileged => no edit button
         r = self.client.get(unprivileged_status_url)
         self.assertContains(r, "Submission status of %s" % name)
         q = PyQuery(r.content)
@@ -1508,22 +1637,31 @@ def test_submit_all_file_types(self):
         rev = "00"
         group = "mars"
 
-        self.do_submission(name, rev, group, ["txt", "xml", "pdf"])
+        self.do_submission(name, rev, group, ["txt", "xml"])
 
         self.assertEqual(Submission.objects.filter(name=name).count(), 1)
 
         self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
-        self.assertTrue(name in io.open(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))).read())
+        self.assertTrue(exists_in_storage("staging",f"{name}-{rev}.txt"))
+        fd = io.open(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev)))
+        txt_contents = fd.read()
+        fd.close()
+        self.assertTrue(name in txt_contents)
         self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))))
-        self.assertTrue(name in io.open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))).read())
-        self.assertTrue('<?xml version="1.0" encoding="UTF-8"?>' in io.open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))).read())
-        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.pdf" % (name, rev))))
-        self.assertTrue('This is PDF' in io.open(os.path.join(self.staging_dir, "%s-%s.pdf" % (name, rev))).read())
+        self.assertTrue(exists_in_storage("staging",f"{name}-{rev}.txt"))
+        fd = io.open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev)))
+        xml_contents = fd.read()
+        fd.close()
+        self.assertTrue(name in xml_contents)
+        self.assertTrue('<?xml version="1.0" encoding="UTF-8"?>' in xml_contents)
+        xml_contents = retrieve_str("staging", f"{name}-{rev}.xml")
+        self.assertTrue(name in xml_contents)
+        self.assertTrue('<?xml version="1.0" encoding="UTF-8"?>' in xml_contents)       
 
     def test_expire_submissions(self):
         s = Submission.objects.create(name="draft-ietf-mars-foo",
                                       group=None,
-                                      submission_date=datetime.date.today() - datetime.timedelta(days=10),
+                                      submission_date=date_today() - datetime.timedelta(days=10),
                                       rev="00",
                                       state_id="uploaded")
 
@@ -1557,7 +1695,7 @@ def test_blackout_access(self):
 
         # Put today in the blackout period
         meeting = Meeting.get_current_meeting()
-        meeting.importantdate_set.create(name_id='idcutoff',date=datetime.date.today()-datetime.timedelta(days=2))
+        meeting.importantdate_set.create(name_id='idcutoff',date=date_today()-datetime.timedelta(days=2))
         
         # regular user, no access
         r = self.client.get(url)
@@ -1576,30 +1714,30 @@ def test_no_blackout_at_all(self):
         url = urlreverse('ietf.submit.views.upload_submission')
 
         meeting = Meeting.get_current_meeting()
-        meeting.date = datetime.date.today()+datetime.timedelta(days=7)
+        meeting.date = date_today()+datetime.timedelta(days=7)
         meeting.save()
         meeting.importantdate_set.filter(name_id='idcutoff').delete()
-        meeting.importantdate_set.create(name_id='idcutoff', date=datetime.date.today()+datetime.timedelta(days=7))
+        meeting.importantdate_set.create(name_id='idcutoff', date=date_today()+datetime.timedelta(days=7))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
         self.assertEqual(len(q('input[type=file][name=txt]')), 1)        
 
         meeting = Meeting.get_current_meeting()
-        meeting.date = datetime.date.today()
+        meeting.date = date_today()
         meeting.save()
         meeting.importantdate_set.filter(name_id='idcutoff').delete()
-        meeting.importantdate_set.create(name_id='idcutoff', date=datetime.date.today())
+        meeting.importantdate_set.create(name_id='idcutoff', date=date_today())
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
         self.assertEqual(len(q('input[type=file][name=txt]')), 1)        
 
         meeting = Meeting.get_current_meeting()
-        meeting.date = datetime.date.today()-datetime.timedelta(days=1)
+        meeting.date = date_today()-datetime.timedelta(days=1)
         meeting.save()
         meeting.importantdate_set.filter(name_id='idcutoff').delete()
-        meeting.importantdate_set.create(name_id='idcutoff', date=datetime.date.today()-datetime.timedelta(days=1))
+        meeting.importantdate_set.create(name_id='idcutoff', date=date_today()-datetime.timedelta(days=1))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
@@ -1624,7 +1762,7 @@ def submit_bad_file(self, name, formats):
         for format in formats:
             files[format], author = submission_file(f'{name}-{rev}', f'{name}-{rev}.bad', group, "test_submission.bad")
 
-        r = self.client.post(url, files)
+        r = self.post_to_upload_submission(url, files)
 
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -1643,44 +1781,31 @@ def submit_bad_doc_name_with_ext(self, name_in_doc, name_in_post, formats):
             files[format], author = submission_file(name_in_doc, name_in_post, group, "test_submission.%s" % format)
             files[format].name = name_in_post
 
-        r = self.client.post(url, files)
-
+        r = self.post_to_upload_submission(url, files)
         self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertTrue(len(q("form .invalid-feedback")) > 0)
-        m = q('div.invalid-feedback').text()
-
-        return r, q, m
+        return r
         
     def test_submit_bad_file_txt(self):
         r, q, m = self.submit_bad_file("some name", ["txt"])
         self.assertIn('Invalid characters were found in the name', m)
         self.assertIn('Expected the TXT file to have extension ".txt"', m)
-        self.assertIn('Expected an TXT file of type "text/plain"', m)
         self.assertIn('document does not contain a legitimate name', m)
 
     def test_submit_bad_doc_name(self):
-        r, q, m = self.submit_bad_doc_name_with_ext(name_in_doc="draft-foo.dot-bar", name_in_post="draft-foo.dot-bar", formats=["txt"])
-        self.assertIn('contains a disallowed character with byte code: 46', m)
+        r = self.submit_bad_doc_name_with_ext(name_in_doc="draft-foo.dot-bar", name_in_post="draft-foo.dot-bar", formats=["txt"])
+        self.assertContains(r, "contains a disallowed character with byte code: 46")
         # This actually is allowed by the existing code. A significant rework of the validation mechanics is needed.
         # r, q, m = self.submit_bad_doc_name_with_ext(name_in_doc="draft-foo-bar-00.txt", name_in_post="draft-foo-bar-00.txt", formats=["txt"])
         # self.assertIn('Did you include a filename extension in the name by mistake?', m)
-        r, q, m = self.submit_bad_doc_name_with_ext(name_in_doc="draft-foo-bar-00.xml", name_in_post="draft-foo-bar-00.xml", formats=["xml"])
-        self.assertIn('Did you include a filename extension in the name by mistake?', m)
-        r, q, m = self.submit_bad_doc_name_with_ext(name_in_doc="../malicious-name-in-content-00", name_in_post="../malicious-name-in-post-00.xml", formats=["xml"])
-        self.assertIn('Did you include a filename extension in the name by mistake?', m)
+        r = self.submit_bad_doc_name_with_ext(name_in_doc="draft-foo-bar-00.xml", name_in_post="draft-foo-bar-00.xml", formats=["xml"])
+        self.assertContains(r, "Could not extract a valid Internet-Draft revision from the XML")
+        r = self.submit_bad_doc_name_with_ext(name_in_doc="../malicious-name-in-content-00", name_in_post="../malicious-name-in-post-00.xml", formats=["xml"])
+        self.assertContains(r, "Did you include a filename extension in the name by mistake?")
 
     def test_submit_bad_file_xml(self):
         r, q, m = self.submit_bad_file("some name", ["xml"])
         self.assertIn('Invalid characters were found in the name', m)
         self.assertIn('Expected the XML file to have extension ".xml"', m)
-        self.assertIn('Expected an XML file of type "application/xml"', m)
-
-    def test_submit_bad_file_pdf(self):
-        r, q, m = self.submit_bad_file("some name", ["pdf"])
-        self.assertIn('Invalid characters were found in the name', m)
-        self.assertIn('Expected the PDF file to have extension ".pdf"', m)
-        self.assertIn('Expected an PDF file of type "application/pdf"', m)
 
     def test_submit_file_in_archive(self):
         name = "draft-authorname-testing-file-exists"
@@ -1705,7 +1830,7 @@ def test_submit_file_in_archive(self):
                 with io.open(fn, 'w') as f:
                     f.write("a" * 2000)
                 files[format], author = submission_file(f'{name}-{rev}', f'{name}-{rev}.{format}', group, "test_submission.%s" % format)
-            r = self.client.post(url, files)
+            r = self.post_to_upload_submission(url, files)
 
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
@@ -1716,25 +1841,11 @@ def test_submit_file_in_archive(self):
     def test_submit_nonascii_name(self):
         name = "draft-authorname-testing-nonascii"
         rev = "00"
-        group = None
-
-        # get
-        url = urlreverse('ietf.submit.views.upload_submission')
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
 
-        # submit
-        #author = PersonFactory(name=u"Jörgen Nilsson".encode('latin1'))
         user = UserFactory(first_name="Jörgen", last_name="Nilsson")
         author = PersonFactory(user=user)
 
-        file, __ = submission_file(f'{name}-{rev}', f'{name}-{rev}.txt', group, "test_submission.nonascii", author=author, ascii=False)
-        files = {"txt": file }
-
-        r = self.client.post(url, files)
-        self.assertEqual(r.status_code, 302)
-        status_url = r["Location"]
+        status_url, _ = self.do_submission(name=name, rev=rev, author=author, base_filename="test_submission.nonascii", ascii=False)
         r = self.client.get(status_url)
         q = PyQuery(r.content)
         m = q('p.alert-warning').text()
@@ -1744,19 +1855,12 @@ def test_submit_nonascii_name(self):
     def test_submit_missing_author_email(self):
         name = "draft-authorname-testing-noemail"
         rev = "00"
-        group = None
 
         author = PersonFactory()
         for e in author.email_set.all():
             e.delete()
 
-        files = {"txt": submission_file(f'{name}-{rev}', f'{name}-{rev}.txt', group, "test_submission.txt", author=author, ascii=True)[0] }
-
-        # submit
-        url = urlreverse('ietf.submit.views.upload_submission')
-        r = self.client.post(url, files)
-        self.assertEqual(r.status_code, 302)
-        status_url = r["Location"]
+        status_url, _ = self.do_submission(name=name, rev=rev, author=author)
         r = self.client.get(status_url)
         q = PyQuery(r.content)
         m = q('p.text-danger').text()
@@ -1767,20 +1871,13 @@ def test_submit_missing_author_email(self):
     def test_submit_bad_author_email(self):
         name = "draft-authorname-testing-bademail"
         rev = "00"
-        group = None
 
         author = PersonFactory()
         email = author.email_set.first()
         email.address = '@bad.email'
         email.save()
 
-        files = {"xml": submission_file(f'{name}-{rev}',f'{name}-{rev}.xml', group, "test_submission.xml", author=author, ascii=False)[0] }
-
-        # submit
-        url = urlreverse('ietf.submit.views.upload_submission')
-        r = self.client.post(url, files)
-        self.assertEqual(r.status_code, 302)
-        status_url = r["Location"]
+        status_url, _ = self.do_submission(name=name, rev=rev, author=author, formats=('xml',))
         r = self.client.get(status_url)
         q = PyQuery(r.content)
         m = q('p.text-danger').text()
@@ -1791,29 +1888,22 @@ def test_submit_bad_author_email(self):
     def test_submit_invalid_yang(self):
         name = "draft-yang-testing-invalid"
         rev = "00"
-        group = None
 
-        # submit
-        files = {"txt": submission_file(f'{name}-{rev}', f'{name}-{rev}.txt', group, "test_submission_invalid_yang.txt")[0] }
-
-        url = urlreverse('ietf.submit.views.upload_submission')
-        r = self.client.post(url, files)
-        self.assertEqual(r.status_code, 302)
-        status_url = r["Location"]
+        status_url, _ = self.do_submission(name=name, rev=rev, base_filename="test_submission_invalid_yang")
         r = self.client.get(status_url)
         q = PyQuery(r.content)
         #
-        self.assertContains(r, 'The yang validation returned 1 error')
+        self.assertContains(r, 'The yang validation returned 3 errors')
         #
         m = q('#yang-validation-message').text()
         for command in ['xym', 'pyang', 'yanglint']:
-            version = VersionInfo.objects.get(command=command).version
+            version = tool_version[command]
             if command != 'yanglint' or (settings.SUBMIT_YANGLINT_COMMAND and os.path.exists(settings.YANGLINT_BINARY)):
                 self.assertIn(version, m)
         self.assertIn("draft-yang-testing-invalid-00.txt", m)
         self.assertIn("error: syntax error: illegal keyword: ;", m)
         if settings.SUBMIT_YANGLINT_COMMAND and os.path.exists(settings.YANGLINT_BINARY):
-            self.assertIn("No validation errors", m)
+            self.assertIn('libyang err : Parsing module "ietf-yang-metadata" failed.', m)
 
     def submit_conflicting_submissiondocevent_rev(self, new_rev='01', existing_rev='01'):
         """Test submitting a rev when an equal or later SubmissionDocEvent rev exists
@@ -1853,6 +1943,7 @@ def do_wg_approval_auth_test(self, state, chair_can_approve=False):
         
         Assumes approval allowed by AD and secretary and, optionally, chair of WG
         """
+        TestBlobstoreManager().emptyTestBlobstores()
         class _SubmissionFactory:
             """Helper class to generate fresh submissions"""
             def __init__(self, author, state):
@@ -1864,7 +1955,7 @@ def next(self):
                 self.index += 1
                 sub = Submission.objects.create(name="draft-ietf-mars-bar-%d" % self.index,
                                                 group=Group.objects.get(acronym="mars"),
-                                                submission_date=datetime.date.today(),
+                                                submission_date=date_today(),
                                                 authors=[dict(name=self.author.name,
                                                               email=self.author.user.email,
                                                               affiliation='affiliation',
@@ -1976,7 +2067,7 @@ def group_approve_with_extresources(self, permitted):
         group = GroupFactory()
         # someone to be notified of resource suggestion when permission not granted
         RoleFactory(group=group, person=PersonFactory(), name_id='chair')
-        submission = SubmissionFactory(state_id='grp-appr', group=group)  # type: Submission
+        submission: Submission = SubmissionFactory(state_id='grp-appr', group=group)  # type: ignore[annotation-unchecked]
         SubmissionExtResourceFactory(submission=submission)
 
         # use secretary user to ensure we have permission to approve
@@ -1994,7 +2085,7 @@ def confirm_with_extresources(self, state, permitted):
         group = GroupFactory()
         # someone to be notified of resource suggestion when permission not granted
         RoleFactory(group=group, person=PersonFactory(), name_id='chair')
-        submission = SubmissionFactory(state_id=state, group=group)  # type: Submission
+        submission: Submission = SubmissionFactory(state_id=state, group=group)  # type: ignore[annotation-unchecked]
         SubmissionExtResourceFactory(submission=submission)
 
         url = urlreverse(
@@ -2046,7 +2137,7 @@ def test_can_edit_docextresources(self):
 
     def test_forcepost_with_extresources(self):
         # state needs to be one that has 'posted' as a next state
-        submission = SubmissionFactory(state_id='grp-appr')  # type: Submission
+        submission: Submission = SubmissionFactory(state_id='grp-appr')  # type: ignore[annotation-unchecked]
         SubmissionExtResourceFactory(submission=submission)
 
         url = urlreverse(
@@ -2136,17 +2227,17 @@ def test_approvals(self):
 
         Submission.objects.create(name="draft-ietf-mars-foo",
                                   group=Group.objects.get(acronym="mars"),
-                                  submission_date=datetime.date.today(),
+                                  submission_date=date_today(),
                                   rev="00",
                                   state_id="posted")
         Submission.objects.create(name="draft-ietf-mars-bar",
                                   group=Group.objects.get(acronym="mars"),
-                                  submission_date=datetime.date.today(),
+                                  submission_date=date_today(),
                                   rev="00",
                                   state_id="grp-appr")
         Submission.objects.create(name="draft-ietf-mars-quux",
                                   group=Group.objects.get(acronym="mars"),
-                                  submission_date=datetime.date.today(),
+                                  submission_date=date_today(),
                                   rev="00",
                                   state_id="ad-appr")
 
@@ -2285,457 +2376,24 @@ def test_cancel_preapproval(self):
 
         self.assertEqual(len(Preapproval.objects.filter(name=preapproval.name)), 0)
 
-class ManualPostsTestCase(BaseSubmitTestCase):
-    def test_manual_posts(self):
-        GroupFactory(acronym='mars')
-
-        url = urlreverse('ietf.submit.views.manualpost')
-        # Secretariat has access
-        self.client.login(username="secretary", password="secretary+password")
-
-        Submission.objects.create(name="draft-ietf-mars-foo",
-                                  group=Group.objects.get(acronym="mars"),
-                                  submission_date=datetime.date.today(),
-                                  state_id="manual")
-        Submission.objects.create(name="draft-ietf-mars-bar",
-                                  group=Group.objects.get(acronym="mars"),
-                                  submission_date=datetime.date.today(),
-                                  rev="00",
-                                  state_id="grp-appr")
-
-        # get
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-
-        self.assertEqual(len(q('.submissions a:contains("draft-ietf-mars-foo")')), 1)
-        self.assertEqual(len(q('.submissions a:contains("draft-ietf-mars-bar")')), 0)
-
-    def test_waiting_for_draft(self):
-        message_string = """To: somebody@ietf.org
-From: joe@test.com
-Date: {}
-Subject: test submission via email
-
-Please submit my draft at http://test.com/mydraft.txt
-
-Thank you
-""".format(datetime.datetime.now().ctime())
-        message = email.message_from_string(force_str(message_string))
-        submission, submission_email_event = (
-            add_submission_email(request=None,
-                                 remote_ip ="192.168.0.1",
-                                 name = "draft-my-new-draft",
-                                 rev='00',
-                                 submission_pk=None,
-                                 message = message,
-                                 by = Person.objects.get(name="(System)"),
-                                 msgtype = "msgin") )
-
-        url = urlreverse('ietf.submit.views.manualpost')
-        # Secretariat has access
-        self.client.login(username="secretary", password="secretary+password")
-
-        # get
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-
-        self.assertEqual(len(q('.waiting-for-draft a:contains("draft-my-new-draft")')), 1)
-
-        # Same name should raise an error
-        with self.assertRaises(Exception):
-            add_submission_email(request=None,
-                                 remote_ip ="192.168.0.1",
-                                 name = "draft-my-new-draft",
-                                 rev='00',
-                                 submission_pk=None,
-                                 message = message,
-                                 by = Person.objects.get(name="(System)"),
-                                 msgtype = "msgin")
-
-        # Cancel this one
-        r = self.client.post(urlreverse("ietf.submit.views.cancel_waiting_for_draft"), {
-            "submission_id": submission.pk,
-            "access_token": submission.access_token(),
-        })
-        self.assertEqual(r.status_code, 302)
-        url = r["Location"]
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('.waiting-for-draft a:contains("draft-my-new-draft")')), 0)
-
-        # Should now be able to add it again
-        submission, submission_email_event = (
-            add_submission_email(request=None,
-                                 remote_ip ="192.168.0.1",
-                                 name = "draft-my-new-draft",
-                                 rev='00',
-                                 submission_pk=None,
-                                 message = message,
-                                 by = Person.objects.get(name="(System)"),
-                                 msgtype = "msgin") )
-
-
-    def test_waiting_for_draft_with_attachment(self):
-        frm = "joe@test.com"
-        
-        message_string = """To: somebody@ietf.org
-From: {}
-Date: {}
-Subject: A very important message with a small attachment
-Content-Type: multipart/mixed; boundary="------------090908050800030909090207"
-
-This is a multi-part message in MIME format.
---------------090908050800030909090207
-Content-Type: text/plain; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 7bit
-
-The message body will probably say something about the attached document
-
---------------090908050800030909090207
-Content-Type: text/plain; charset=UTF-8; name="attach.txt"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="attach.txt"
-
-QW4gZXhhbXBsZSBhdHRhY2htZW50IHd0aG91dCB2ZXJ5IG11Y2ggaW4gaXQuCgpBIGNvdXBs
-ZSBvZiBsaW5lcyAtIGJ1dCBpdCBjb3VsZCBiZSBhIGRyYWZ0Cg==
---------------090908050800030909090207--
-""".format(frm, datetime.datetime.now().ctime())
-
-        message = email.message_from_string(force_str(message_string))
-        submission, submission_email_event = (
-            add_submission_email(request=None,
-                                 remote_ip ="192.168.0.1",
-                                 name = "draft-my-new-draft",
-                                 rev='00',
-                                 submission_pk=None,
-                                 message = message,
-                                 by = Person.objects.get(name="(System)"),
-                                 msgtype = "msgin") )
-
-        manualpost_page_url = urlreverse('ietf.submit.views.manualpost')
-        # Secretariat has access
-        self.client.login(username="secretary", password="secretary+password")
-
-        self.check_manualpost_page(submission=submission, 
-                                   submission_email_event=submission_email_event,
-                                   the_url=manualpost_page_url, 
-                                   submission_name_fragment='draft-my-new-draft',
-                                   frm=frm,
-                                   is_secretariat=True)
- 
-        # Try the status page with no credentials
-        self.client.logout()
-
-        self.check_manualpost_page(submission=submission, 
-                                   submission_email_event=submission_email_event,
-                                   the_url=manualpost_page_url, 
-                                   submission_name_fragment='draft-my-new-draft',
-                                   frm=frm,
-                                   is_secretariat=False)
-        
-        # Post another message to this submission using the link
-        message_string = """To: somebody@ietf.org
-From: joe@test.com
-Date: {}
-Subject: A new submission message with a small attachment
-Content-Type: multipart/mixed; boundary="------------090908050800030909090207"
-
-This is a multi-part message in MIME format.
---------------090908050800030909090207
-Content-Type: text/plain; charset=utf-8; format=flowed
-Content-Transfer-Encoding: 7bit
-
-The message body will probably say something more about the attached document
-
---------------090908050800030909090207
-Content-Type: text/plain; charset=UTF-8; name="attach.txt"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="attachment.txt"
-
-QW4gZXhhbXBsZSBhdHRhY2htZW50IHd0aG91dCB2ZXJ5IG11Y2ggaW4gaXQuCgpBIGNvdXBs
-ZSBvZiBsaW5lcyAtIGJ1dCBpdCBjb3VsZCBiZSBhIGRyYWZ0Cg==
---------------090908050800030909090207--
-""".format(datetime.datetime.now().ctime())
-
-        # Back to secretariat
-        self.client.login(username="secretary", password="secretary+password")
 
-        r, q = self.request_and_parse(manualpost_page_url)
-
-        url = self.get_href(q, "a#new-submission-email:contains('New submission from email')")
-
-        # Get the form
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        #self.assertEqual(len(q('input[name=edit-title]')), 1)
-
-        # Post the new message
-        r = self.client.post(url, {
-            "name": "draft-my-next-new-draft-00",
-            "direction": "incoming",
-            "message": message_string,
-        })
-
-        if r.status_code != 302:
-            q = PyQuery(r.content)
-            print(q)
-
-        self.assertEqual(r.status_code, 302)
-        
-
-        #self.check_manualpost_page(submission, submission_email_event,
-        #                        url, 'draft-my-next-new-draft'
-        #                        'Another very important message',
-        #                        true)
-
-    def check_manualpost_page(self, submission, submission_email_event,
-                              the_url, submission_name_fragment,
-                              frm,
-                              is_secretariat):
-        # get the page listing manual posts
-        r, q = self.request_and_parse(the_url)
-        selector = "#waiting-for-draft a#add-submission-email%s:contains('Add email')" % submission.pk
-
-        if is_secretariat:
-            # Can add an email to the submission
-            add_email_url = self.get_href(q, selector)
-        else:
-            # No add email button button
-            self.assertEqual(len(q(selector)), 0)
-
-        # Find the link for our submission in those awaiting drafts
-        submission_url = self.get_href(q, "#waiting-for-draft a#aw{}:contains('{}')".
-                                       format(submission.pk, submission_name_fragment))
-
-        # Follow the link to the status page for this submission
-        r, q = self.request_and_parse(submission_url)
-        
-        selector = "#history a#reply%s:contains('Reply')" % submission.pk
-
-        if is_secretariat:
-            # check that reply button is visible and get the form
-            reply_url = self.get_href(q, selector)
-
-            # Get the form
-            r = self.client.get(reply_url)
-            self.assertEqual(r.status_code, 200)
-            reply_q = PyQuery(r.content)
-            self.assertEqual(len(reply_q('input[name=to]')), 1)
-        else:
-            # No reply button
-            self.assertEqual(len(q(selector)), 0)
-
-        if is_secretariat:
-            # Now try to send an email using the send email link
-    
-            selector = "a#send%s:contains('Send Email')" % submission.pk
-            send_url = self.get_href(q, selector)
-
-            self.do_submission_email(the_url = send_url,
-                                     to = frm,
-                                     body = "A new message")
-
-        # print q
-        # print submission.pk
-        # print submission_email_event.pk
-        
-        # Find the link for our message in the list
-        url = self.get_href(q, "#aw{}-{}:contains('{}')".format(submission.pk, 
-                                                                submission_email_event.message.pk,
-                                                                "Received message - manual post"))
-        
-        # Page displaying message details
-        r, q = self.request_and_parse(url)
-        
-        if is_secretariat:
-            # check that reply button is visible
-
-            reply_href = self.get_href(q, "a#reply%s:contains('Reply')" % submission.pk)
-
-        else:
-            # No reply button
-            self.assertEqual(len(q(selector)), 0)
-            reply_href = None
-
-        # check that attachment link is visible
-
-        url = self.get_href(q, "#email-details a#attach{}:contains('attach.txt')".format(submission.pk))
-
-        # Fetch the attachment
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        
-        # Attempt a reply if we can
-        if reply_href == None:
-            return
-
-        self.do_submission_email(the_url = reply_href,
-                                 to = frm,
-                                 body = "A reply to the message")
-        
-        # try adding an email to the submission
-        # Use the add email link from the manual post listing page
-
-        if is_secretariat:
-            # Can add an email to the submission
-            # add_email_url set previously
-            r = self.client.get(add_email_url)
-            self.assertEqual(r.status_code, 200)
-            add_email_q = PyQuery(r.content)
-            self.assertEqual(len(add_email_q('input[name=submission_pk]')), 1)
-
-            # Add a simple email
-            new_message_string = """To: somebody@ietf.org
-From: joe@test.com
-Date: {}
-Subject: Another message
-
-About my submission
-
-Thank you
-""".format(datetime.datetime.now().ctime())
-
-            r = self.client.post(add_email_url, {
-                "name": "{}-{}".format(submission.name, submission.rev),
-                "direction": "incoming",
-                "submission_pk": submission.pk,
-                "message": new_message_string,
-            })
-
-            if r.status_code != 302:
-                q = PyQuery(r.content)
-                print(q)
-
-            self.assertEqual(r.status_code, 302)
-
-    def request_and_parse(self, url):
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        return r, PyQuery(r.content)
-
-        
-    def get_href(self, q, query):
-        link = q(query)
-        self.assertEqual(len(link), 1)
-
-        return PyQuery(link[0]).attr('href')
-
-
-    def do_submission_email(self, the_url, to, body):
-        # check the page
-        r = self.client.get(the_url)
-        q = PyQuery(r.content)
-        post_button = q('[type=submit]:contains("Send email")')
-        self.assertEqual(len(post_button), 1)
-        subject = post_button.parents("form").find('input[name="subject"]').val()
-        frm = post_button.parents("form").find('input[name="frm"]').val()
-        cc = post_button.parents("form").find('input[name="cc"]').val()
-        reply_to = post_button.parents("form").find('input[name="reply_to"]').val()
-
-        empty_outbox()
-        
-        # post submitter info
-        r = self.client.post(the_url, {
-            "subject": subject,
-            "frm": frm,
-            "to": to,
-            "cc": cc,
-            "reply_to": reply_to,
-            "body": body,
-        })
-
-        self.assertEqual(r.status_code, 302)
-
-        self.assertEqual(len(outbox), 1)
-
-        outmsg = outbox[0]
-        self.assertTrue(to in outmsg['To'])
-        
-        reply_to = outmsg['Reply-To']
-        self.assertIsNotNone(reply_to, "Expected Reply-To")
-        
-        # Build a reply
-
-        message_string = """To: {}
-From: {}
-Date: {}
-Subject: test
-""".format(reply_to, to, datetime.datetime.now().ctime())
-
-        result = process_response_email(message_string)
-        self.assertIsInstance(result, Message)
-
-        return r
-
-    def do_submission(self, name, rev, group=None, formats=["txt",]):
-        # We're not testing the submission process - just the submission status 
-
-        # get
-        url = urlreverse('ietf.submit.views.upload_submission')
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('input[type=file][name=txt]')), 1)
-        self.assertEqual(len(q('input[type=file][name=xml]')), 1)
-
-        # submit
-        files = {}
-        for format in formats:
-            files[format], author = submission_file(f'{name}-{rev}', f'{name}-{rev}.{format}', group, "test_submission.%s" % format)
-
-        r = self.client.post(url, files)
-        if r.status_code != 302:
-            q = PyQuery(r.content)
-            print(q('div.invalid-feedback span.form-text div').text())
-
-        self.assertEqual(r.status_code, 302)
-
-        status_url = r["Location"]
-        for format in formats:
-            self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.%s" % (name, rev, format))))
-        self.assertEqual(Submission.objects.filter(name=name).count(), 1)
-        submission = Submission.objects.get(name=name)
-        self.assertTrue(all([ c.passed!=False for c in submission.checks.all() ]))
-        self.assertEqual(len(submission.authors), 1)
-        author = submission.authors[0]
-        self.assertEqual(author["name"], "Author Name")
-        self.assertEqual(author["email"], "author@example.com")
-
-        return status_url
-
-
-    def supply_extra_metadata(self, name, status_url, submitter_name, submitter_email):
-        # check the page
-        r = self.client.get(status_url)
-        q = PyQuery(r.content)
-        post_button = q('[type=submit]:contains("Post")')
-        self.assertEqual(len(post_button), 1)
-        action = post_button.parents("form").find('input[type=hidden][name="action"]').val()
-
-        # post submitter info
-        r = self.client.post(status_url, {
-            "action": action,
-            "submitter-name": submitter_name,
-            "submitter-email": submitter_email,
-            "approvals_received": True,
-        })
-
-        if r.status_code == 302:
-            submission = Submission.objects.get(name=name)
-            self.assertEqual(submission.submitter, email.utils.formataddr((submitter_name, submitter_email)))
-
-        return r
-
-
-# Transaction.on_commit() requires use of TransactionTestCase, but that has a performance penalty. Replace it
-# with a no-op for testing purposes.
+# Transaction.on_commit() interacts badly with TestCase's transaction behavior. Replace it
+# with a pass-through for testing purposes.
 @mock.patch.object(transaction, 'on_commit', lambda x: x())
 @override_settings(IDTRACKER_BASE_URL='https://datatracker.example.com')
 class ApiSubmissionTests(BaseSubmitTestCase):
+    TASK_TO_MOCK = "ietf.submit.views.process_and_accept_uploaded_submission_task"
+
+    def setUp(self):
+        super().setUp()
+        MeetingFactory(type_id='ietf', date=date_today()+datetime.timedelta(days=60))
+
+    def test_api_submit_tombstone(self):
+        """Tombstone for obsolete API endpoint should return 410 Gone"""
+        url = urlreverse("ietf.submit.views.api_submit_tombstone")
+        self.assertEqual(self.client.get(url).status_code, 410)
+        self.assertEqual(self.client.post(url).status_code, 410)
+
     def test_upload_draft(self):
         """api_submission accepts a submission and queues it for processing"""
         url = urlreverse('ietf.submit.views.api_submission')
@@ -2744,13 +2402,13 @@ def test_upload_draft(self):
             'xml': xml,
             'user': author.user.username,
         }
-        with mock.patch('ietf.submit.views.process_uploaded_submission_task') as mock_task:
+        with mock.patch(self.TASK_TO_MOCK) as mock_task:
             r = self.client.post(url, data)
         self.assertEqual(r.status_code, 200)
         response = r.json()
         self.assertCountEqual(
             response.keys(),
-            ['id', 'name', 'rev', 'status_url'],
+            ['id', 'name', 'rev', 'status_url', 'submission_url'],
         )
         submission_id = int(response['id'])
         self.assertEqual(response['name'], 'draft-somebody-test')
@@ -2762,6 +2420,13 @@ def test_upload_draft(self):
                 kwargs={'submission_id': submission_id},
             ),
         )
+        self.assertEqual(
+            response['submission_url'],
+            'https://datatracker.example.com' + urlreverse(
+                'ietf.submit.views.submission_status',
+                kwargs={'submission_id': submission_id},
+            )
+        )
         self.assertEqual(mock_task.delay.call_count, 1)
         self.assertEqual(mock_task.delay.call_args.args, (submission_id,))
         submission = Submission.objects.get(pk=submission_id)
@@ -2782,7 +2447,7 @@ def test_upload_draft_with_replaces(self):
             'replaces': existing_draft.name,
         }
         # mock out the task so we don't call to celery during testing!
-        with mock.patch('ietf.submit.views.process_uploaded_submission_task'):
+        with mock.patch(self.TASK_TO_MOCK):
             r = self.client.post(url, data)
         self.assertEqual(r.status_code, 200)
         submission = Submission.objects.last()
@@ -2800,7 +2465,7 @@ def test_rejects_broken_upload(self):
             'xml': xml,
             'user': 'i.dont.exist@nowhere.example.com',
         }
-        with mock.patch('ietf.submit.views.process_uploaded_submission_task') as mock_task:
+        with mock.patch(self.TASK_TO_MOCK) as mock_task:
             r = self.client.post(url, data)
         self.assertEqual(r.status_code, 400)
         response = r.json()
@@ -2814,7 +2479,7 @@ def test_rejects_broken_upload(self):
             'xml': xml,
             'user': author.user.username,
         }
-        with mock.patch('ietf.submit.views.process_uploaded_submission_task') as mock_task:
+        with mock.patch(self.TASK_TO_MOCK) as mock_task:
             r = self.client.post(url, data)
         self.assertEqual(r.status_code, 400)
         response = r.json()
@@ -2828,7 +2493,7 @@ def test_rejects_broken_upload(self):
             'xml': xml,
             'user': author.user.username,
         }
-        with mock.patch('ietf.submit.views.process_uploaded_submission_task') as mock_task:
+        with mock.patch(self.TASK_TO_MOCK) as mock_task:
             r = self.client.post(url, data)
         self.assertEqual(r.status_code, 400)
         response = r.json()
@@ -2844,7 +2509,7 @@ def test_rejects_broken_upload(self):
             'xml': xml,
             'user': author.user.username,
         }
-        with mock.patch('ietf.submit.views.process_uploaded_submission_task') as mock_task:
+        with mock.patch(self.TASK_TO_MOCK) as mock_task:
             r = self.client.post(url, data)
         self.assertEqual(r.status_code, 400)
         response = r.json()
@@ -2866,7 +2531,7 @@ def test_submission_status(self):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(
             r.json(),
-            {'id': str(s.pk), 'state': 'validating'},
+            {'id': str(s.pk), 'state': 'validating', 'state_desc': s.state.name},
         )
 
         s.state_id = 'uploaded'
@@ -2875,17 +2540,35 @@ def test_submission_status(self):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(
             r.json(),
-            {'id': str(s.pk), 'state': 'uploaded'},
+            {'id': str(s.pk), 'state': 'uploaded', 'state_desc': s.state.name},
         )
 
         # try an invalid one
         r = self.client.get(urlreverse('ietf.submit.views.api_submission_status', kwargs={'submission_id': '999999'}))
         self.assertEqual(r.status_code, 404)
 
+    def test_upload_blackout(self):
+        """api_submission returns a useful error in the blackout period"""
+        # Put today in the blackout period
+        meeting = Meeting.get_current_meeting()
+        meeting.importantdate_set.create(name_id='idcutoff',date=date_today()-datetime.timedelta(days=2))
+
+        url = urlreverse('ietf.submit.views.api_submission')
+        xml, author = submission_file('draft-somebody-test-00', 'draft-somebody-test-00.xml', None, 'test_submission.xml')
+        data = {
+            'xml': xml,
+            'user': author.user.username,
+        }
+
+        with mock.patch('ietf.submit.views.process_uploaded_submission_task'):
+            r = self.client.post(url, data)
+        self.assertContains(r, 'The last submission time for the I-D submission was', status_code=400)
+
+ 
 
 class SubmissionUploadFormTests(BaseSubmitTestCase):
     def test_check_submission_thresholds(self):
-        today = datetime.date.today()
+        today = date_today()
         yesterday = today - datetime.timedelta(days=1)
         (this_group, that_group) = GroupFactory.create_batch(2, type_id='wg')
         this_ip = '10.0.0.1'
@@ -3055,7 +2738,7 @@ def test_replaces_field(self):
             files=files_dict,
         )
         self.assertFalse(form.is_valid())
-        self.assertIn('A draft cannot replace itself', form.errors['replaces'])
+        self.assertIn('An Internet-Draft cannot replace itself', form.errors['replaces'])
 
         # can't replace non-draft
         review = ReviewFactory()
@@ -3065,17 +2748,19 @@ def test_replaces_field(self):
             files=files_dict,
         )
         self.assertFalse(form.is_valid())
-        self.assertIn('A draft can only replace another draft', form.errors['replaces'])
+        self.assertIn('An Internet-Draft can only replace another Internet-Draft', form.errors['replaces'])
 
         # can't replace RFC
         rfc = WgRfcFactory()
+        draft = WgDraftFactory(states=[("draft", "rfc")])
+        draft.relateddocument_set.create(relationship_id="became_rfc", target=rfc)
         form = SubmissionAutoUploadForm(
             request_factory.get('/some/url'),
-            data={'user': auth.user.username, 'replaces': rfc.name},
+            data={'user': auth.user.username, 'replaces': draft.name},
             files=files_dict,
         )
         self.assertFalse(form.is_valid())
-        self.assertIn('A draft cannot replace an RFC', form.errors['replaces'])
+        self.assertIn('An Internet-Draft cannot replace another Internet-Draft that has become an RFC', form.errors['replaces'])
 
         # can't replace draft approved by iesg
         existing_drafts[0].set_state(State.objects.get(type='draft-iesg', slug='approved'))
@@ -3096,12 +2781,27 @@ def test_replaces_field(self):
         )
         self.assertFalse(form.is_valid())
 
+    def test_invalid_xml(self):
+        """Test error message for invalid XML"""
+        not_xml = SimpleUploadedFile(
+            name="not-xml.xml",
+            content=b"this is not xml at all",
+            content_type="application/xml",
+        )
+        form = SubmissionBaseUploadForm(RequestFactory().post('/some/url'), files={"xml": not_xml})
+        self.assertFalse(form.is_valid())
+        self.assertFormError(
+            form,
+            "xml",
+            "The uploaded file is not valid XML. Please make sure you are uploading the correct file.",
+        )
 
 class AsyncSubmissionTests(BaseSubmitTestCase):
     """Tests of async submission-related tasks"""
-    def test_process_uploaded_submission(self):
-        """process_uploaded_submission should properly process a submission"""
-        _today = datetime.date.today()
+    def test_process_and_accept_uploaded_submission(self):
+        """process_and_accept_uploaded_submission should properly process a submission"""
+        TestBlobstoreManager().emptyTestBlobstores()
+        _today = date_today()
         xml, author = submission_file('draft-somebody-test-00', 'draft-somebody-test-00.xml', None, 'test_submission.xml')
         xml_data = xml.read()
         xml.close()
@@ -3116,11 +2816,14 @@ def test_process_uploaded_submission(self):
         xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml'
         with xml_path.open('w') as f:
             f.write(xml_data)
+        store_str("staging", "draft-somebody-test-00.xml", xml_data)
         txt_path = xml_path.with_suffix('.txt')
         self.assertFalse(txt_path.exists())
         html_path = xml_path.with_suffix('.html')
         self.assertFalse(html_path.exists())
-        process_uploaded_submission(submission)
+        for ext in ["txt", "html"]:
+            self.assertFalse(exists_in_storage("staging",f"draft-somebody-test-00.{ext}"))
+        process_and_accept_uploaded_submission(submission)
 
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertEqual(submission.state_id, 'auth', 'accepted submission should be in auth state')
@@ -3135,11 +2838,13 @@ def test_process_uploaded_submission(self):
         # at least test that these were created
         self.assertTrue(txt_path.exists())
         self.assertTrue(html_path.exists())
+        for ext in ["txt", "html"]:
+            self.assertTrue(exists_in_storage("staging", f"draft-somebody-test-00.{ext}"))
         self.assertEqual(submission.file_size, os.stat(txt_path).st_size)
         self.assertIn('Completed submission validation checks', submission.submissionevent_set.last().desc)
 
-    def test_process_uploaded_submission_invalid(self):
-        """process_uploaded_submission should properly process an invalid submission"""
+    def test_process_and_accept_uploaded_submission_invalid(self):
+        """process_and_accept_uploaded_submission should properly process an invalid submission"""
         xml, author = submission_file('draft-somebody-test-00', 'draft-somebody-test-00.xml', None, 'test_submission.xml')
         xml_data = xml.read()
         xml.close()
@@ -3149,6 +2854,7 @@ def test_process_uploaded_submission_invalid(self):
         txt.close()
 
         # submitter is not an author
+        TestBlobstoreManager().emptyTestBlobstores()
         submitter = PersonFactory()
         submission = SubmissionFactory(
             name='draft-somebody-test',
@@ -3160,12 +2866,14 @@ def test_process_uploaded_submission_invalid(self):
         xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml'
         with xml_path.open('w') as f:
             f.write(xml_data)
-        process_uploaded_submission(submission)
+        store_str("staging", "draft-somebody-test-00.xml", xml_data)
+        process_and_accept_uploaded_submission(submission)
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertEqual(submission.state_id, 'cancel')
         self.assertIn('not one of the document authors', submission.submissionevent_set.last().desc)
 
         # author has no email address in XML
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SubmissionFactory(
             name='draft-somebody-test',
             rev='00',
@@ -3176,12 +2884,14 @@ def test_process_uploaded_submission_invalid(self):
         xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml'
         with xml_path.open('w') as f:
             f.write(re.sub(r'<email>.*</email>', '', xml_data))
-        process_uploaded_submission(submission)
+        store_str("staging", "draft-somebody-test-00.xml", re.sub(r'<email>.*</email>', '', xml_data))
+        process_and_accept_uploaded_submission(submission)
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertEqual(submission.state_id, 'cancel')
-        self.assertIn('Missing email address', submission.submissionevent_set.last().desc)
+        self.assertIn('Email address not found for all authors', submission.submissionevent_set.last().desc)
 
         # no title
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SubmissionFactory(
             name='draft-somebody-test',
             rev='00',
@@ -3192,12 +2902,14 @@ def test_process_uploaded_submission_invalid(self):
         xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml'
         with xml_path.open('w') as f:
             f.write(re.sub(r'<title>.*</title>', '<title></title>', xml_data))
-        process_uploaded_submission(submission)
+        store_str("staging", "draft-somebody-test-00.xml", re.sub(r'<title>.*</title>', '<title></title>', xml_data))
+        process_and_accept_uploaded_submission(submission)
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertEqual(submission.state_id, 'cancel')
         self.assertIn('Could not extract a valid title', submission.submissionevent_set.last().desc)
 
         # draft name mismatch
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SubmissionFactory(
             name='draft-different-name',
             rev='00',
@@ -3208,12 +2920,14 @@ def test_process_uploaded_submission_invalid(self):
         xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-different-name-00.xml'
         with xml_path.open('w') as f:
             f.write(xml_data)
-        process_uploaded_submission(submission)
+        store_str("staging", "draft-different-name-00.xml", xml_data)
+        process_and_accept_uploaded_submission(submission)
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertEqual(submission.state_id, 'cancel')
-        self.assertIn('draft filename disagrees', submission.submissionevent_set.last().desc)
+        self.assertIn('Submission rejected: XML Internet-Draft filename', submission.submissionevent_set.last().desc)
 
         # rev mismatch
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SubmissionFactory(
             name='draft-somebody-test',
             rev='01',
@@ -3224,12 +2938,14 @@ def test_process_uploaded_submission_invalid(self):
         xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-01.xml'
         with xml_path.open('w') as f:
             f.write(xml_data)
-        process_uploaded_submission(submission)
+        store_str("staging", "draft-somebody-test-01.xml", xml_data)
+        process_and_accept_uploaded_submission(submission)
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertEqual(submission.state_id, 'cancel')
-        self.assertIn('revision disagrees', submission.submissionevent_set.last().desc)
+        self.assertIn('Submission rejected: XML Internet-Draft revision', submission.submissionevent_set.last().desc)
 
         # not xml
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SubmissionFactory(
             name='draft-somebody-test',
             rev='00',
@@ -3240,12 +2956,14 @@ def test_process_uploaded_submission_invalid(self):
         txt_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.txt'
         with txt_path.open('w') as f:
             f.write(txt_data)
-        process_uploaded_submission(submission)
+        store_str("staging", "draft-somebody-test-00.txt", txt_data)
+        process_and_accept_uploaded_submission(submission)
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertEqual(submission.state_id, 'cancel')
-        self.assertIn('Only XML draft submissions', submission.submissionevent_set.last().desc)
+        self.assertIn('Only XML Internet-Draft submissions', submission.submissionevent_set.last().desc)
 
         # wrong state
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SubmissionFactory(
             name='draft-somebody-test',
             rev='00',
@@ -3254,15 +2972,17 @@ def test_process_uploaded_submission_invalid(self):
             state_id='uploaded',
         )
         xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml'
-        with xml_path.open('w') as f:
+        with xml_path.open('w') as f: # Why is this state being written if the thing that uses it is mocked out?
             f.write(xml_data)
+        store_str("staging", "draft-somebody-test-00.xml", xml_data)
         with mock.patch('ietf.submit.utils.process_submission_xml') as mock_proc_xml:
-            process_uploaded_submission(submission)
+            process_and_accept_uploaded_submission(submission)
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertFalse(mock_proc_xml.called, 'Should not process submission not in "validating" state')
         self.assertEqual(submission.state_id, 'uploaded', 'State should not be changed')
 
         # failed checker
+        TestBlobstoreManager().emptyTestBlobstores()
         submission = SubmissionFactory(
             name='draft-somebody-test',
             rev='00',
@@ -3273,6 +2993,7 @@ def test_process_uploaded_submission_invalid(self):
         xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.xml'
         with xml_path.open('w') as f:
             f.write(xml_data)
+        store_str("staging", "draft-somebody-test-00.xml", xml_data, allow_overwrite=True)
         with mock.patch(
                 'ietf.submit.utils.apply_checkers',
                 side_effect = lambda _, __: submission.checks.create(
@@ -3285,237 +3006,296 @@ def test_process_uploaded_submission_invalid(self):
                     symbol='x',
                 )
         ):
-            process_uploaded_submission(submission)
+            process_and_accept_uploaded_submission(submission)
         submission = Submission.objects.get(pk=submission.pk)  # refresh
         self.assertEqual(submission.state_id, 'cancel')
         self.assertIn('fake failure', submission.submissionevent_set.last().desc)
 
 
-    @mock.patch('ietf.submit.tasks.process_uploaded_submission')
-    def test_process_uploaded_submission_task(self, mock_method):
-        """process_uploaded_submission_task task should properly call its method"""
+    @mock.patch('ietf.submit.tasks.process_and_accept_uploaded_submission')
+    def test_process_and_accept_uploaded_submission_task(self, mock_method):
+        """process_and_accept_uploaded_submission_task task should properly call its method"""
         s = SubmissionFactory()
-        process_uploaded_submission_task(s.pk)
+        process_and_accept_uploaded_submission_task(s.pk)
         self.assertEqual(mock_method.call_count, 1)
         self.assertEqual(mock_method.call_args.args, (s,))
 
-    @mock.patch('ietf.submit.tasks.process_uploaded_submission')
-    def test_process_uploaded_submission_task_ignores_invalid_id(self, mock_method):
-        """process_uploaded_submission_task should ignore an invalid submission_id"""
+    @mock.patch('ietf.submit.tasks.process_and_accept_uploaded_submission')
+    def test_process_and_accept_uploaded_submission_task_ignores_invalid_id(self, mock_method):
+        """process_and_accept_uploaded_submission_task should ignore an invalid submission_id"""
         SubmissionFactory()  # be sure there is a Submission
         bad_pk = 9876
         self.assertEqual(Submission.objects.filter(pk=bad_pk).count(), 0)
-        process_uploaded_submission_task(bad_pk)
+        process_and_accept_uploaded_submission_task(bad_pk)
         self.assertEqual(mock_method.call_count, 0)
 
-    def test_process_submission_text_consistency_checks(self):
-        """process_submission_text should check draft metadata against submission"""
-        submission = SubmissionFactory(
-            name='draft-somebody-test',
-            rev='00',
-            title='Correct Draft Title',
+    def test_process_submission_xml(self):
+        TestBlobstoreManager().emptyTestBlobstores()
+        xml_path = Path(settings.IDSUBMIT_STAGING_PATH) / "draft-somebody-test-00.xml"
+        xml, _ = submission_file(
+            "draft-somebody-test-00",
+            "draft-somebody-test-00.xml",
+            None,
+            "test_submission.xml",
+            title="Correct Draft Title",
         )
-        txt_path = Path(settings.IDSUBMIT_STAGING_PATH) / 'draft-somebody-test-00.txt'
+        xml_contents = xml.read()
+        xml_path.write_text(xml_contents)
+        store_str("staging", "draft-somebody-test-00.xml", xml_contents)
+        output = process_submission_xml("draft-somebody-test", "00")
+        self.assertEqual(output["filename"], "draft-somebody-test")
+        self.assertEqual(output["rev"], "00")
+        self.assertEqual(output["title"], "Correct Draft Title")
+        self.assertIsNone(output["abstract"])
+        self.assertEqual(len(output["authors"]), 1)  # not checking in detail, parsing is unreliable
+        self.assertEqual(output["document_date"], date_today())
+        self.assertIsNone(output["pages"])
+        self.assertIsNone(output["words"])
+        self.assertIsNone(output["first_two_pages"])
+        self.assertIsNone(output["file_size"])
+        self.assertIsNone(output["formal_languages"])
+        self.assertEqual(output["xml_version"], "3")
+
+        # Should behave on missing or partial <date> elements
+        TestBlobstoreManager().emptyTestBlobstores()
+        xml_path.write_text(re.sub(r"<date.+>", "", xml_contents))  # strip <date...> entirely
+        store_str("staging", "draft-somebody-test-00.xml", re.sub(r"<date.+>", "", xml_contents), allow_overwrite=True)
+        output = process_submission_xml("draft-somebody-test", "00")
+        self.assertEqual(output["document_date"], None)
+
+        TestBlobstoreManager().emptyTestBlobstores()
+        xml_path.write_text(re.sub(r"<date year=.+ month", "<date month", xml_contents))  # remove year
+        store_str("staging", "draft-somebody-test-00.xml", re.sub(r"<date year=.+ month", "<date month", xml_contents), allow_overwrite=True)
+        output = process_submission_xml("draft-somebody-test", "00")
+        self.assertEqual(output["document_date"], date_today())
+
+        TestBlobstoreManager().emptyTestBlobstores()
+        xml_path.write_text(re.sub(r"(<date.+) month=.+day=(.+>)", r"\1 day=\2", xml_contents))  # remove month
+        store_str("staging", "draft-somebody-test-00.xml", re.sub(r"(<date.+) month=.+day=(.+>)", r"\1 day=\2", xml_contents), allow_overwrite=True)
+        output = process_submission_xml("draft-somebody-test", "00")
+        self.assertEqual(output["document_date"], date_today())
+
+        TestBlobstoreManager().emptyTestBlobstores()
+        xml_path.write_text(re.sub(r"<date(.+) day=.+>", r"<date\1>", xml_contents))  # remove day
+        store_str("staging", "draft-somebody-test-00.xml", re.sub(r"<date(.+) day=.+>", r"<date\1>", xml_contents), allow_overwrite=True)
+        output = process_submission_xml("draft-somebody-test", "00")
+        self.assertEqual(output["document_date"], date_today())
 
         # name mismatch
-        txt, _ = submission_file(
-            'draft-somebody-wrong-name-00',  # name that appears in the file
-            'draft-somebody-test-00.xml',
+        TestBlobstoreManager().emptyTestBlobstores()
+        xml, _ = submission_file(
+            "draft-somebody-wrong-name-00",  # name that appears in the file
+            "draft-somebody-test-00.xml",
             None,
-            'test_submission.txt',
-            title='Correct Draft Title',
+            "test_submission.xml",
+            title="Correct Draft Title",
         )
-        txt_path.open('w').write(txt.read())
-        with self.assertRaisesMessage(SubmissionError, 'disagrees with submission filename'):
-            process_submission_text(submission)
+        xml_path.write_text(xml.read())
+        xml.seek(0)
+        store_str("staging", "draft-somebody-test-00.xml", xml.read(), allow_overwrite=True)
+        with self.assertRaisesMessage(SubmissionError, "disagrees with submission filename"):
+            process_submission_xml("draft-somebody-test", "00")
 
         # rev mismatch
+        TestBlobstoreManager().emptyTestBlobstores()
+        xml, _ = submission_file(
+            "draft-somebody-test-01",  # name that appears in the file
+            "draft-somebody-test-00.xml",
+            None,
+            "test_submission.xml",
+            title="Correct Draft Title",
+        )
+        xml_path.write_text(xml.read())
+        xml.seek(0)
+        store_str("staging", "draft-somebody-test-00.xml", xml.read(), allow_overwrite=True)
+        with self.assertRaisesMessage(SubmissionError, "disagrees with submission revision"):
+            process_submission_xml("draft-somebody-test", "00")
+
+        # missing title
+        TestBlobstoreManager().emptyTestBlobstores()
+        xml, _ = submission_file(
+            "draft-somebody-test-00",  # name that appears in the file
+            "draft-somebody-test-00.xml",
+            None,
+            "test_submission.xml",
+            title="",
+        )
+        xml_path.write_text(xml.read())
+        xml.seek(0)
+        store_str("staging", "draft-somebody-test-00.xml", xml.read(), allow_overwrite=True)
+        with self.assertRaisesMessage(SubmissionError, "Could not extract a valid title"):
+            process_submission_xml("draft-somebody-test", "00")
+
+    def test_process_submission_text(self):
+        TestBlobstoreManager().emptyTestBlobstores()
+        txt_path = Path(settings.IDSUBMIT_STAGING_PATH) / "draft-somebody-test-00.txt"
         txt, _ = submission_file(
-            'draft-somebody-test-01',  # name that appears in the file
-            'draft-somebody-test-00.xml',
+            "draft-somebody-test-00",
+            "draft-somebody-test-00.txt",
             None,
-            'test_submission.txt',
-            title='Correct Draft Title',
+            "test_submission.txt",
+            title="Correct Draft Title",
         )
-        txt_path.open('w').write(txt.read())
-        with self.assertRaisesMessage(SubmissionError, 'disagrees with submission revision'):
-            process_submission_text(submission)
+        txt_path.write_text(txt.read())
+        txt.seek(0)
+        store_str("staging", "draft-somebody-test-00.txt", txt.read())
+        output = process_submission_text("draft-somebody-test", "00")
+        self.assertEqual(output["filename"], "draft-somebody-test")
+        self.assertEqual(output["rev"], "00")
+        self.assertEqual(output["title"], "Correct Draft Title")
+        self.assertEqual(output["abstract"].strip(), "This document describes how to test tests.")
+        self.assertEqual(len(output["authors"]), 1)  # not checking in detail, parsing is unreliable
+        self.assertLessEqual(output["document_date"] - date_today(), datetime.timedelta(days=1))
+        self.assertEqual(output["pages"], 2)
+        self.assertGreater(output["words"], 0)  # make sure it got something
+        self.assertGreater(len(output["first_two_pages"]), 0)  # make sure it got something
+        self.assertGreater(output["file_size"], 0)  # make sure it got something
+        self.assertEqual(output["formal_languages"].count(), 1)
+        self.assertIsNone(output["xml_version"])
 
-        # title mismatch
+        # name mismatch
+        TestBlobstoreManager().emptyTestBlobstores()
         txt, _ = submission_file(
-            'draft-somebody-test-00',  # name that appears in the file
-            'draft-somebody-test-00.xml',
+            "draft-somebody-wrong-name-00",  # name that appears in the file
+            "draft-somebody-test-00.txt",
             None,
-            'test_submission.txt',
-            title='Not Correct Draft Title',
+            "test_submission.txt",
+            title="Correct Draft Title",
         )
-        txt_path.open('w').write(txt.read())
-        with self.assertRaisesMessage(SubmissionError, 'disagrees with submission title'):
-            process_submission_text(submission)
+        with txt_path.open('w') as fd:
+            fd.write(txt.read())
+        txt.seek(0)
+        store_str("staging", "draft-somebody-test-00.txt", txt.read(), allow_overwrite=True)
+        txt.close()
+        with self.assertRaisesMessage(SubmissionError, 'disagrees with submission filename'):
+            process_submission_text("draft-somebody-test", "00")
+
+        # rev mismatch
+        TestBlobstoreManager().emptyTestBlobstores()
+        txt, _ = submission_file(
+            "draft-somebody-test-01",  # name that appears in the file
+            "draft-somebody-test-00.txt",
+            None,
+            "test_submission.txt",
+            title="Correct Draft Title",
+        )
+        with txt_path.open('w') as fd:
+            fd.write(txt.read())
+        txt.seek(0)
+        store_str("staging", "draft-somebody-test-00.txt", txt.read(), allow_overwrite=True)
+        txt.close()
+        with self.assertRaisesMessage(SubmissionError, 'disagrees with submission revision'):
+            process_submission_text("draft-somebody-test", "00")
+
+    def test_process_and_validate_submission(self):
+        xml_data = {
+            "title": "The Title",
+            "authors": [{
+                "name": "Jane Doe",
+                "email": "jdoe@example.com",
+                "affiliation": "Test Centre",
+                "country": "UK",
+            }],
+            "xml_version": "3",
+        }
+        text_data = {
+            "title": "The Title",
+            "abstract": "This is an abstract.",
+            "authors": [{
+                "name": "John Doh",
+                "email": "ignored@example.com",
+                "affiliation": "Ignored",
+                "country": "CA",
+            }],
+            "document_date": date_today(),
+            "pages": 25,
+            "words": 1234,
+            "first_two_pages": "Pages One and Two",
+            "file_size": 4321,
+            "formal_languages": FormalLanguageName.objects.none(),
+        }
+        submission = SubmissionFactory(
+            state_id="validating",
+            file_types=".xml,.txt",
+        )
+        with mock.patch("ietf.submit.utils.process_submission_xml", return_value=xml_data):
+            with mock.patch("ietf.submit.utils.process_submission_text", return_value=text_data):
+                with mock.patch("ietf.submit.utils.render_missing_formats") as mock_render:
+                    with mock.patch("ietf.submit.utils.apply_checkers") as mock_checkers:
+                        process_and_validate_submission(submission)
+        self.assertTrue(mock_render.called)
+        self.assertTrue(mock_checkers.called)
+        submission = Submission.objects.get(pk=submission.pk)
+        self.assertEqual(submission.title, text_data["title"])
+        self.assertEqual(submission.abstract, text_data["abstract"])
+        self.assertEqual(submission.authors, xml_data["authors"])
+        self.assertEqual(submission.document_date, text_data["document_date"])
+        self.assertEqual(submission.pages, text_data["pages"])
+        self.assertEqual(submission.words, text_data["words"])
+        self.assertEqual(submission.first_two_pages, text_data["first_two_pages"])
+        self.assertEqual(submission.file_size, text_data["file_size"])
+        self.assertEqual(submission.xml_version, xml_data["xml_version"])
 
     def test_status_of_validating_submission(self):
         s = SubmissionFactory(state_id='validating')
         url = urlreverse('ietf.submit.views.submission_status', kwargs={'submission_id': s.pk})
         r = self.client.get(url)
         self.assertContains(r, s.name)
-        self.assertContains(r, 'still being processed and validated', status_code=200)
+        self.assertContains(r, 'This submission is being processed and validated.', status_code=200)
 
-    @override_settings(IDSUBMIT_MAX_VALIDATION_TIME=datetime.timedelta(minutes=30))
+    @override_settings(
+        IDSUBMIT_MAX_VALIDATION_TIME=datetime.timedelta(minutes=30),
+        IDSUBMIT_EXPIRATION_AGE=datetime.timedelta(minutes=90),
+    )
     def test_cancel_stale_submissions(self):
+        # these will be lists of (Submission, "state_id") pairs
+        submissions_to_skip = []
+        submissions_to_cancel = []
+
+        # submissions in the validating state
         fresh_submission = SubmissionFactory(state_id='validating')
         fresh_submission.submissionevent_set.create(
             desc='fake created event',
             time=timezone.now() - datetime.timedelta(minutes=15),
         )
+        submissions_to_skip.append((fresh_submission, "validating"))
+
         stale_submission = SubmissionFactory(state_id='validating')
         stale_submission.submissionevent_set.create(
             desc='fake created event',
             time=timezone.now() - datetime.timedelta(minutes=30, seconds=1),
         )
+        submissions_to_cancel.append((stale_submission, "validating"))
+        
+        # submissions in other states
+        for state in DraftSubmissionStateName.objects.filter(used=True).exclude(slug="validating"):
+            to_skip = SubmissionFactory(state_id=state.pk)
+            to_skip.submissionevent_set.create(
+                desc="fake created event",
+                time=timezone.now() - datetime.timedelta(minutes=45),  # would be canceled if it were "validating"
+            )
+            submissions_to_skip.append((to_skip, state.pk))
+            to_expire = SubmissionFactory(state_id=state.pk)
+            to_expire.submissionevent_set.create(
+                desc="fake created event",
+                time=timezone.now() - datetime.timedelta(minutes=90, seconds=1),
+            )
+            if state.pk in ["posted", "cancel"]:
+                submissions_to_skip.append((to_expire, state.pk))  # these ones should not be expired regardless of age
+            else:
+                submissions_to_cancel.append(((to_expire, state.pk)))
 
         cancel_stale_submissions()
 
-        fresh_submission = Submission.objects.get(pk=fresh_submission.pk)
-        self.assertEqual(fresh_submission.state_id, 'validating')
-        self.assertEqual(fresh_submission.submissionevent_set.count(), 1)
-
-        stale_submission = Submission.objects.get(pk=stale_submission.pk)
-        self.assertEqual(stale_submission.state_id, 'cancel')
-        self.assertEqual(stale_submission.submissionevent_set.count(), 2)
-
-
-class ApiSubmitTests(BaseSubmitTestCase):
-    def setUp(self):
-        super().setUp()
-        # break early in case of missing configuration
-        self.assertTrue(os.path.exists(settings.IDSUBMIT_IDNITS_BINARY))
-        MeetingFactory(type_id='ietf', date=datetime.date.today()+datetime.timedelta(days=60))
-
-    def do_post_submission(self, rev, author=None, name=None, group=None, email=None, title=None, year=None):
-        url = urlreverse('ietf.submit.views.api_submit')
-        if author is None:
-            author = PersonFactory()
-        if name is None:
-            slug = re.sub('[^a-z0-9-]+', '', author.ascii_parts()[3].lower())
-            name = 'draft-%s-foo' % slug
-        if email is None:
-            email = author.user.username
-        # submit
-        data = {}
-        data['xml'], author = submission_file(f'{name}-{rev}', f'{name}-{rev}.xml', group, "test_submission.xml", author=author, email=email, title=title, year=year)
-        data['user'] = email
-        r = self.client.post(url, data)
-        return r, author, name
-
-    def test_api_submit_info(self):
-        url = urlreverse('ietf.submit.views.api_submit')
-        r = self.client.get(url)
-        expected = "A simplified draft submission interface, intended for automation"
-        self.assertContains(r, expected, status_code=200)
-
-    def test_api_submit_bad_method(self):
-        url = urlreverse('ietf.submit.views.api_submit')
-        r = self.client.put(url)
-        self.assertEqual(r.status_code, 405)
-
-    def test_api_submit_ok(self):
-        r, author, name = self.do_post_submission('00')
-        expected = "Upload of %s OK, confirmation requests sent to:\n  %s" % (name, author.formatted_email().replace('\n',''))
-        self.assertContains(r, expected, status_code=200)
-
-    def test_api_submit_secondary_email_active(self):
-        person = PersonFactory()
-        email = EmailFactory(person=person)
-        r, author, name = self.do_post_submission('00', author=person, email=email.address)
-        for expected in [
-                "Upload of %s OK, confirmation requests sent to:" % (name, ),
-                author.formatted_email().replace('\n',''),
-            ]:
-            self.assertContains(r, expected, status_code=200)
-
-    def test_api_submit_secondary_email_inactive(self):
-        person = PersonFactory()
-        prim = person.email()
-        prim.primary = True
-        prim.save()
-        email = EmailFactory(person=person, active=False)
-        r, author, name = self.do_post_submission('00', author=person, email=email.address)
-        expected = "No such user: %s" % email.address
-        self.assertContains(r, expected, status_code=400)
-
-    def test_api_submit_no_user(self):
-        email='nonexistant.user@example.org'
-        r, author, name = self.do_post_submission('00', email=email)
-        expected = "No such user: %s" % email
-        self.assertContains(r, expected, status_code=400)
-
-    def test_api_submit_no_person(self):
-        user = UserFactory()
-        email = user.username
-        r, author, name = self.do_post_submission('00', email=email)
-        expected = "No person with username %s" % email
-        self.assertContains(r, expected, status_code=400)
-
-    def test_api_submit_wrong_revision(self):
-        r, author, name = self.do_post_submission('01')
-        expected = "Invalid revision (revision 00 is expected)"
-        self.assertContains(r, expected, status_code=400)
-
-    def test_api_submit_update_existing_submissiondocevent_rev(self):
-        draft, _ = create_draft_submission_with_rev_mismatch(rev='01')
-        r, _, __ = self.do_post_submission(rev='01', name=draft.name)
-        expected = "Submission failed"
-        self.assertContains(r, expected, status_code=409)
-
-    def test_api_submit_update_later_submissiondocevent_rev(self):
-        draft, _ = create_draft_submission_with_rev_mismatch(rev='02')
-        r, _, __ = self.do_post_submission(rev='01', name=draft.name)
-        expected = "Submission failed"
-        self.assertContains(r, expected, status_code=409)
-
-    def test_api_submit_pending_submission(self):
-        r, author, name = self.do_post_submission('00')
-        expected = "Upload of"
-        self.assertContains(r, expected, status_code=200)
-        r, author, name = self.do_post_submission('00', author=author, name=name)
-        expected = "A submission with same name and revision is currently being processed"
-        self.assertContains(r, expected, status_code=400)
-
-    def test_api_submit_no_title(self):
-        r, author, name = self.do_post_submission('00', title=" ")
-        expected = "Could not extract a valid title from the upload"
-        self.assertContains(r, expected, status_code=400)
-
-    def test_api_submit_failed_idnits(self):
-        r, author, name = self.do_post_submission('00', year="2010")
-        expected = "Document date must be within 3 days of submission date"
-        self.assertContains(r, expected, status_code=400)
-
-    def test_api_submit_keeps_extresources(self):
-        """API submit should not disturb doc external resources
-        
-        Tests that the submission inherits the existing doc's docextresource_set.
-        Relies on separate testing that Submission external_resources will be
-        handled appropriately.
-        """
-        draft = WgDraftFactory()
+        for _subm, original_state_id in submissions_to_skip:
+            subm = Submission.objects.get(pk=_subm.pk)
+            self.assertEqual(subm.state_id, original_state_id)
+            self.assertEqual(subm.submissionevent_set.count(), 1)
 
-        # add an external resource
-        self.assertEqual(draft.docextresource_set.count(), 0)
-        extres = draft.docextresource_set.create(
-            name_id='faq',
-            display_name='this is a display name',
-            value='https://example.com/faq-for-test.html',
-        )
-        
-        r, _, __ = self.do_post_submission('01', name=draft.name)
-        self.assertEqual(r.status_code, 200)
-        # draft = Document.objects.get(pk=draft.pk)  # update the draft
-        sub = Submission.objects.get(name=draft.name)
-        self.assertEqual(
-            [str(r) for r in sub.external_resources.all()],
-            [str(extres)],
-        )
+        for _subm, _ in submissions_to_cancel:
+            subm = Submission.objects.get(pk=_subm.pk)
+            self.assertEqual(subm.state_id, "cancel")
+            self.assertEqual(subm.submissionevent_set.count(), 2)
 
         
 class RefsTests(BaseSubmitTestCase):
@@ -3533,30 +3313,15 @@ def test_draft_refs_identification(self):
 
 
 class PostSubmissionTests(BaseSubmitTestCase):
-    @override_settings(RFC_FILE_TYPES=('txt', 'xml'), IDSUBMIT_FILE_TYPES=('pdf', 'md'))
-    def test_find_submission_filenames_rfc(self):
-        """Posting an RFC submission should use RFC_FILE_TYPES"""
-        rfc = IndividualRfcFactory()
-        path = Path(self.staging_dir)
-        for ext in ['txt', 'xml', 'pdf', 'md']:
-            (path / f'{rfc.name}-{rfc.rev}.{ext}').touch()
-        files = find_submission_filenames(rfc)
-        self.assertCountEqual(
-            files,
-            {
-                'txt': f'{path}/{rfc.name}-{rfc.rev}.txt',
-                'xml': f'{path}/{rfc.name}-{rfc.rev}.xml',
-                # should NOT find the pdf or md
-            }
-        )
 
     @override_settings(RFC_FILE_TYPES=('txt', 'xml'), IDSUBMIT_FILE_TYPES=('pdf', 'md'))
-    def test_find_submission_filenames_draft(self):
+    def test_find_submission_filenames(self):
         """Posting an I-D submission should use IDSUBMIT_FILE_TYPES"""
         draft = WgDraftFactory()
         path = Path(self.staging_dir)
         for ext in ['txt', 'xml', 'pdf', 'md']:
             (path / f'{draft.name}-{draft.rev}.{ext}').touch()
+            store_str("staging", f"{draft.name}-{draft.rev}.{ext}", "")
         files = find_submission_filenames(draft)
         self.assertCountEqual(
             files,
@@ -3616,6 +3381,7 @@ def test_validate_submission_rev(self):
         new_wg_doc = WgDraftFactory(rev='01', relations=[('replaces',old_wg_doc)])
         path = Path(self.archive_dir) / f'{new_wg_doc.name}-{new_wg_doc.rev}.txt'
         path.touch()
+        store_str("staging", f"{new_wg_doc.name}-{new_wg_doc.rev}.txt", "")
 
         bad_revs = (None, '', '2', 'aa', '00', '01', '100', '002', u'öö')
         for rev in bad_revs:
@@ -3632,3 +3398,145 @@ def test_validate_submission_rev(self):
 
         msg = validate_submission_rev(new_wg_doc.name, '02')
         self.assertIsNone(msg)
+
+class TestOldNamesAreProtected(BaseSubmitTestCase):
+    
+    def test_submit_case_conflited_name_fails(self):
+        WgDraftFactory(name="draft-something-HasCapitalLetters")
+        with self.assertRaisesMessage(ValidationError, "Case-conflicting draft name found"):
+            SubmissionBaseUploadForm.check_for_old_uppercase_collisions("draft-something-hascapitalletters")
+        url = urlreverse("ietf.submit.views.upload_submission")
+        files = {}
+        files["xml"], _ = submission_file("draft-something-hascapitalletters-00", "draft-something-hascapitalletters-00.xml", None, "test_submission.xml")
+        r = self.post_to_upload_submission(url, files)
+        self.assertContains(r,"Case-conflicting draft name found",status_code=200)
+
+
+class SubmissionStatusTests(BaseSubmitTestCase):
+    """Tests of the submission_status view
+
+    Many tests are interspersed in the monolithic tests above. We can aspire to break these
+    out more modularly, though.
+    """
+
+    def test_submission_checks(self):
+        for state_slug in ("uploaded", "cancel", "posted"):
+            submission = SubmissionFactory(state_id=state_slug)
+            url = urlreverse(
+                "ietf.submit.views.submission_status",
+                kwargs={"submission_id": submission.pk},
+            )
+            # No checks
+            r = self.client.get(url)
+            self.assertContains(
+                r,
+                "No submission checks were applied to your Internet-Draft.",
+                status_code=200,
+            )
+            # Inapplicable check
+            submission.checks.create(
+                checker="yang validation", passed=None, message="Yang message"
+            )
+            r = self.client.get(url)
+            self.assertContains(
+                r,
+                "No submission checks were applied to your Internet-Draft.",
+                status_code=200,
+            )
+            # Passed check
+            submission.checks.create(
+                checker="idnits check", passed=True, message="idnits ok"
+            )
+            r = self.client.get(url)
+            self.assertContains(
+                r,
+                "Your Internet-Draft has been verified to pass the submission checks.",
+                status_code=200,
+            )
+            # Failed check + passed check
+            submission.checks.filter(checker="yang validation").update(passed=False)
+            r = self.client.get(url)
+            self.assertContains(
+                r,
+                "Your Internet-Draft failed at least one submission check.",
+                status_code=200,
+            )
+
+
+class YangCheckerTests(TestCase):
+    @mock.patch("ietf.submit.utils.apply_yang_checker_to_draft")
+    def test_run_all_yang_model_checks(self, mock_apply):
+        active_drafts = WgDraftFactory.create_batch(3)
+        WgDraftFactory(states=[("draft", "expired")])
+        run_all_yang_model_checks()
+        self.assertEqual(mock_apply.call_count, 3)
+        self.assertCountEqual(
+            [args[0][1] for args in mock_apply.call_args_list],
+            active_drafts,
+        )
+
+    def test_apply_yang_checker_to_draft(self):
+        draft = WgDraftFactory()
+        submission = SubmissionFactory(name=draft.name, rev=draft.rev)
+        submission.checks.create(checker="my-checker")
+        checker = mock.Mock()
+        checker.name = "my-checker"
+        checker.symbol = "X"
+        checker.check_file_txt.return_value = (True, "whee", None, None, {})
+        apply_yang_checker_to_draft(checker, draft)
+        self.assertEqual(checker.check_file_txt.call_args, mock.call(draft.get_file_name()))
+
+
+@override_settings(IDSUBMIT_REPOSITORY_PATH="/some/path/", IDSUBMIT_STAGING_PATH="/some/other/path")
+class SubmissionErrorTests(TestCase):
+    def test_sanitize_message(self):
+        sanitized = SubmissionError.sanitize_message(
+            "This refers to /some/path/with-a-file\n"
+            "and also /some/other/path/with-a-different-file isn't that neat?\n"
+            "and has /some/path//////with-slashes"
+        )
+        self.assertEqual(
+            sanitized,
+            "This refers to **/with-a-file\n"
+            "and also **/with-a-different-file isn't that neat?\n"
+            "and has **/with-slashes"
+        )
+    
+    @mock.patch.object(SubmissionError, "sanitize_message")
+    def test_submissionerror(self, mock_sanitize_message):
+        SubmissionError()
+        self.assertFalse(mock_sanitize_message.called)
+        SubmissionError("hi", "there")
+        self.assertTrue(mock_sanitize_message.called)
+        self.assertCountEqual(
+            mock_sanitize_message.call_args_list,
+            [mock.call("hi"), mock.call("there")],
+        )
+
+
+class HelperTests(TestCase):
+    def test_access_token_is_valid(self):
+        submission: Submission = SubmissionFactory()  # type: ignore
+        valid_token = submission.access_token()
+        access_key = submission.access_key  # accept this for backwards compat
+        invalid_token = "not the valid token"
+        self.assertTrue(access_token_is_valid(submission, valid_token))
+        self.assertTrue(access_token_is_valid(submission, access_key))
+        self.assertFalse(access_token_is_valid(submission, invalid_token))
+
+    def test_auth_token_is_valid(self):
+        auth_key = generate_random_key()
+        submission: Submission = SubmissionFactory(auth_key = auth_key)  # type: ignore
+        valid_token = generate_access_token(submission.auth_key)
+        auth_key = submission.auth_key  # accept this for backwards compat
+        invalid_token = "not the valid token"
+        self.assertTrue(auth_token_is_valid(submission, valid_token))
+        self.assertTrue(auth_token_is_valid(submission, auth_key))
+        self.assertFalse(auth_token_is_valid(submission, invalid_token))
+
+        submission.auth_key = ""
+        submission.save()
+        self.assertFalse(auth_token_is_valid(submission, valid_token))
+        self.assertFalse(auth_token_is_valid(submission, auth_key))
+        self.assertFalse(auth_token_is_valid(submission, invalid_token))
+        self.assertFalse(auth_token_is_valid(submission, ""))
diff --git a/ietf/submit/urls.py b/ietf/submit/urls.py
index 2309ec55cd..4f53103c2c 100644
--- a/ietf/submit/urls.py
+++ b/ietf/submit/urls.py
@@ -17,15 +17,6 @@
     url(r'^approvals/cancelpreapproval/(?P<preapproval_id>[a-f\d]+)/$', views.cancel_preapproval),
 
     url(r'^manualpost/$', views.manualpost),
-    url(r'^manualpost/addemail$', views.add_manualpost_email),
-    url(r'^manualpost/addemail/(?P<submission_id>\d+)/(?P<access_token>[a-f\d]*)/$', views.add_manualpost_email),
-    url(r'^manualpost/attachment/(?P<submission_id>\d+)/(?P<message_id>\d+)/(?P<filename>.*)$', views.show_submission_email_attachment),
-    url(r'^manualpost/cancel$', views.cancel_waiting_for_draft),
-    url(r'^manualpost/email/(?P<submission_id>\d+)/(?P<message_id>\d+)/$', views.show_submission_email_message),
-    url(r'^manualpost/email/(?P<submission_id>\d+)/(?P<message_id>\d+)/(?P<access_token>[a-f\d]*)/$', views.show_submission_email_message),
-    url(r'^manualpost/replyemail/(?P<submission_id>\d+)/(?P<message_id>\d+)/$', views.send_submission_email),
-    url(r'^manualpost/sendemail/(?P<submission_id>\d+)/$', views.send_submission_email),
-
     # proof-of-concept for celery async tasks
     url(r'^async-poke/?$', views.async_poke_test),
-]
\ No newline at end of file
+]
diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py
index eb6838d94e..7e3106f723 100644
--- a/ietf/submit/utils.py
+++ b/ietf/submit/utils.py
@@ -4,15 +4,22 @@
 
 import datetime
 import io
+import json
 import os
 import pathlib
 import re
+import subprocess
+import sys
 import time
 import traceback
 import xml2rfc
 
-from typing import Optional  # pyflakes:ignore
+from pathlib import Path
+from shutil import move
+from typing import Optional, Union  # pyflakes:ignore
 from unidecode import unidecode
+from xml2rfc import RfcWriterError
+from xym import xym
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -21,13 +28,15 @@
 from django.http import HttpRequest     # pyflakes:ignore
 from django.utils.module_loading import import_string
 from django.contrib.auth.models import AnonymousUser
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( Document, State, DocAlias, DocEvent, SubmissionDocEvent,
+from ietf.doc.models import ( Document, State, DocEvent, SubmissionDocEvent,
     DocumentAuthor, AddedMessageEvent )
 from ietf.doc.models import NewRevisionDocEvent
 from ietf.doc.models import RelatedDocument, DocRelationshipName, DocExtResource
+from ietf.doc.storage_utils import remove_from_storage, retrieve_bytes, store_bytes, store_file, store_str
 from ietf.doc.utils import (add_state_change_event, rebuild_reference_relations,
     set_replaces_for_document, prettify_std_name, update_doc_extresources, 
     can_edit_docextresources, update_documentauthors, update_action_holders,
@@ -39,7 +48,8 @@
 from ietf.person.models import Person, Email
 from ietf.community.utils import update_name_contains_indexes_with_new_doc
 from ietf.submit.mail import ( announce_to_lists, announce_new_version, announce_to_authors,
-    send_approval_request, send_submission_confirmation, announce_new_wg_00 )
+    send_approval_request, send_submission_confirmation, announce_new_wg_00, send_manual_post_request )
+from ietf.submit.checkers import DraftYangChecker
 from ietf.submit.models import ( Submission, SubmissionEvent, Preapproval, DraftSubmissionStateName,
     SubmissionCheck, SubmissionExtResource )
 from ietf.utils import log
@@ -47,7 +57,8 @@
 from ietf.utils.draft import PlaintextDraft
 from ietf.utils.mail import is_valid_email
 from ietf.utils.text import parse_unicode, normalize_text
-from ietf.utils.xmldraft import XMLDraft
+from ietf.utils.timezone import date_today
+from ietf.utils.xmldraft import InvalidMetadataError, XMLDraft, capture_xml2rfc_output
 from ietf.person.name import unidecode_name
 
 
@@ -124,7 +135,7 @@ def validate_submission_name(name):
         if re.search(r'-\d\d$', name):
             name = name[:-3]
         if len(name) > 50:
-            return "Expected the draft name to be at most 50 ascii characters long; found %d." % len(name)
+            return "Expected the Internet-Draft name to be at most 50 ascii characters long; found %d." % len(name)
         else:
             msg = "Expected name 'draft-...' using lowercase ascii letters, digits, and hyphen; found '%s'." % name
             if '.' in name:
@@ -163,7 +174,10 @@ def validate_submission_rev(name, rev):
 
         if rev != expected:
             return 'Invalid revision (revision %02d is expected)' % expected
-
+        
+        # This is not really correct, though the edges that it doesn't cover are not likely.
+        # It might be better just to look in the combined archive to make sure we're not colliding with
+        # a thing that exists there already because it was included from an approved personal collection.
         for dirname in [settings.INTERNET_DRAFT_PATH, settings.INTERNET_DRAFT_ARCHIVE_DIR, ]:
             dir = pathlib.Path(dirname)
             pattern = '%s-%02d.*' % (name, rev)
@@ -285,7 +299,7 @@ def find_submission_filenames(draft):
     """
     path = pathlib.Path(settings.IDSUBMIT_STAGING_PATH)
     stem = f'{draft.name}-{draft.rev}'
-    allowed_types = settings.RFC_FILE_TYPES if draft.get_state_slug() == 'rfc' else settings.IDSUBMIT_FILE_TYPES
+    allowed_types = settings.IDSUBMIT_FILE_TYPES
     candidates = {ext: path / f'{stem}.{ext}' for ext in allowed_types}
     return {ext: str(filename) for ext, filename in candidates.items() if filename.exists()}
 
@@ -307,10 +321,10 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
     # update draft attributes
     try:
         draft = Document.objects.get(name=submission.name)
-        log.log(f"{submission.name}: retrieved draft: {draft}")
+        log.log(f"{submission.name}: retrieved Internet-Draft: {draft}")
     except Document.DoesNotExist:
         draft = Document.objects.create(name=submission.name, type_id="draft")
-        log.log(f"{submission.name}: created draft: {draft}")
+        log.log(f"{submission.name}: created Internet-Draft: {draft}")
 
     prev_rev = draft.rev
 
@@ -338,8 +352,8 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
         if stream_slug:
             draft.stream = StreamName.objects.get(slug=stream_slug)
 
-    draft.expires = datetime.datetime.now() + datetime.timedelta(settings.INTERNET_DRAFT_DAYS_TO_EXPIRE)
-    log.log(f"{submission.name}: got draft details")
+    draft.expires = timezone.now() + datetime.timedelta(settings.INTERNET_DRAFT_DAYS_TO_EXPIRE)
+    log.log(f"{submission.name}: got Internet-Draft details")
 
     events = []
 
@@ -373,10 +387,6 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
     events.append(e)
     log.log(f"{submission.name}: created doc events")
 
-    # update related objects
-    alias, __ = DocAlias.objects.get_or_create(name=submission.name)
-    alias.docs.add(draft)
-
     draft.set_state(State.objects.get(used=True, type="draft", slug="active"))
 
     update_authors(draft, submission)
@@ -385,10 +395,7 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
 
     log.log(f"{submission.name}: updated state and info")
 
-    trouble = rebuild_reference_relations(draft, find_submission_filenames(draft))
-    if trouble:
-        log.log('Rebuild_reference_relations trouble: %s'%trouble)
-    log.log(f"{submission.name}: rebuilt reference relations")
+    rebuild_reference_relations(draft, find_submission_filenames(draft))
     
     if draft.stream_id == "ietf" and draft.group.type_id == "wg" and draft.rev == "00":
         # automatically set state "WG Document"
@@ -415,9 +422,9 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
 
         e = DocEvent(type="changed_document", doc=draft, rev=draft.rev)
         if draft.stream_id == 'ietf':
-            e.desc = "Sub state has been changed to <b>AD Followup</b> from <b>Revised ID Needed</b>"
+            e.desc = "Sub state has been changed to <b>AD Followup</b> from <b>Revised I-D Needed</b>"
         else:
-            e.desc = "<b>Revised ID Needed</b> tag cleared"
+            e.desc = "<b>Revised I-D Needed</b> tag cleared"
         e.by = system
         e.save()
         events.append(e)
@@ -446,6 +453,7 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
         from ietf.doc.expire import move_draft_files_to_archive
         move_draft_files_to_archive(draft, prev_rev)
 
+    submission.draft = draft
     move_files_to_repository(submission)
     submission.state = DraftSubmissionStateName.objects.get(slug="posted")
     log.log(f"{submission.name}: moved files")
@@ -479,7 +487,6 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
     if new_possibly_replaces:
         send_review_possibly_replaces_request(request, draft, submitter_info)
 
-    submission.draft = draft
     submission.save()
 
     create_submission_event(request, submission, approved_subm_desc)
@@ -489,6 +496,7 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
     ref_rev_file_name = os.path.join(os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids'), 'reference.I-D.%s-%s.xml' % (draft.name, draft.rev ))
     with io.open(ref_rev_file_name, "w", encoding='utf-8') as f:
         f.write(ref_text)
+    store_str("bibxml-ids", f"reference.I-D.{draft.name}-{draft.rev}.txt", ref_text) # TODO-BLOBSTORE verify with test
 
     log.log(f"{submission.name}: done")
     
@@ -502,7 +510,7 @@ def update_replaces_from_submission(request, submission, draft):
     if request.user.is_authenticated:
         is_chair_of = list(Group.objects.filter(role__person__user=request.user, role__name="chair"))
 
-    replaces = DocAlias.objects.filter(name__in=submission.replaces.split(",")).prefetch_related("docs", "docs__group")
+    replaces = Document.objects.filter(name__in=submission.replaces.split(",")).prefetch_related("group")
     existing_replaces = list(draft.related_that_doc("replaces"))
     existing_suggested = set(draft.related_that_doc("possibly-replaces"))
 
@@ -514,14 +522,12 @@ def update_replaces_from_submission(request, submission, draft):
         if r in existing_replaces:
             continue
 
-        rdoc = r.document
-
-        if rdoc == draft:
+        if r == draft:
             continue
 
         if (is_secretariat
-            or (draft.group in is_chair_of and (rdoc.group.type_id == "individ" or rdoc.group in is_chair_of))
-            or (submitter_email and rdoc.documentauthor_set.filter(email__address__iexact=submitter_email).exists())):
+            or (draft.group in is_chair_of and (r.group.type_id == "individ" or r.group in is_chair_of))
+            or (submitter_email and r.documentauthor_set.filter(email__address__iexact=submitter_email).exists())):
             approved.append(r)
         else:
             if r not in existing_suggested:
@@ -609,7 +615,7 @@ def ensure_person_email_info_exists(name, email, docname):
             email.active = active
         email.person = person
         if email.time is None:
-            email.time = datetime.datetime.now()
+            email.time = timezone.now()
         email.origin = "author: %s" % docname
         email.save()
 
@@ -637,40 +643,51 @@ def cancel_submission(submission):
     submission.save()
     remove_submission_files(submission)
 
+
 def rename_submission_files(submission, prev_rev, new_rev):
+    log.unreachable("2025-2-19")
     for ext in settings.IDSUBMIT_FILE_TYPES:
-        source = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, prev_rev, ext))
-        dest = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, new_rev, ext))
-        if os.path.exists(source):
-            os.rename(source, dest)
+        staging_path = Path(settings.IDSUBMIT_STAGING_PATH) 
+        source = staging_path / f"{submission.name}-{prev_rev}.{ext}"
+        dest = staging_path / f"{submission.name}-{new_rev}.{ext}"
+        if source.exists():
+            move(source, dest)
+
 
 def move_files_to_repository(submission):
     for ext in settings.IDSUBMIT_FILE_TYPES:
-        source = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, submission.rev, ext))
-        dest = os.path.join(settings.IDSUBMIT_REPOSITORY_PATH, '%s-%s.%s' % (submission.name, submission.rev, ext))
-        if os.path.exists(source):
-            os.rename(source, dest)
-        else:
-            if os.path.exists(dest):
-                log.log("Intended to move '%s' to '%s', but found source missing while destination exists.")
-            elif ext in submission.file_types.split(','):
-                raise ValueError("Intended to move '%s' to '%s', but found source and destination missing.")
-
-
-def remove_staging_files(name, rev, exts=None):
-    """Remove staging files corresponding to a submission
-    
-    exts is a list of extensions to be removed. If None, defaults to settings.IDSUBMIT_FILE_TYPES.
-    """
-    if exts is None:
-        exts = [f'.{ext}' for ext in settings.IDSUBMIT_FILE_TYPES]
+        fname = f"{submission.name}-{submission.rev}.{ext}"
+        source = Path(settings.IDSUBMIT_STAGING_PATH) / fname
+        dest = Path(settings.IDSUBMIT_REPOSITORY_PATH) / fname
+        if source.exists():
+            move(source, dest)
+            all_archive_dest = Path(settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR) / dest.name
+            ftp_dest = Path(settings.FTP_DIR) / "internet-drafts" / dest.name
+            os.link(dest, all_archive_dest)
+            os.link(dest, ftp_dest)
+            # Shadow what's happening to the fs in the blobstores. When the stores become
+            # authoritative, the source and dest checks will need to apply to the stores instead.
+            content_bytes = retrieve_bytes("staging", fname)
+            store_bytes("active-draft", f"{ext}/{fname}", content_bytes)
+            submission.draft.store_bytes(f"{ext}/{fname}", content_bytes)
+            remove_from_storage("staging", fname)
+        elif dest.exists():
+            log.log("Intended to move '%s' to '%s', but found source missing while destination exists.")
+        elif f".{ext}" in submission.file_types.split(','):
+            raise ValueError("Intended to move '%s' to '%s', but found source and destination missing.")
+
+
+def remove_staging_files(name, rev):
+    """Remove staging files corresponding to a submission"""
     basename = pathlib.Path(settings.IDSUBMIT_STAGING_PATH) / f'{name}-{rev}' 
+    exts = [f'.{ext}' for ext in settings.IDSUBMIT_FILE_TYPES]
     for ext in exts:
         basename.with_suffix(ext).unlink(missing_ok=True)
+        remove_from_storage("staging", basename.with_suffix(ext).name, warn_if_missing=False)
 
 
 def remove_submission_files(submission):
-    remove_staging_files(submission.name, submission.rev, submission.file_types.split(','))
+    remove_staging_files(submission.name, submission.rev)
 
 
 def approvable_submissions_for_user(user):
@@ -725,7 +742,7 @@ def recently_approved_by_user(user, since):
     )
 
 def expirable_submissions(older_than_days):
-    cutoff = datetime.date.today() - datetime.timedelta(days=older_than_days)
+    cutoff = date_today() - datetime.timedelta(days=older_than_days)
     return Submission.objects.exclude(state__in=("cancel", "posted")).filter(submission_date__lt=cutoff)
 
 def expire_submission(submission, by):
@@ -755,72 +772,10 @@ def save_files(form):
             for chunk in f.chunks():
                 destination.write(chunk)
         log.log("saved file %s" % name)
+        f.seek(0)
+        store_file("staging", f"{form.filename}-{form.revision}.{ext}", f)
     return file_name
 
-def get_draft_meta(form, saved_files):
-    authors = []
-    file_name = saved_files
-
-    if form.cleaned_data['xml']:
-        # Some meta-information, such as the page-count, can only
-        # be retrieved from the generated text file.  Provide a
-        # parsed draft object to get at that kind of information.
-        file_name['txt'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (form.filename, form.revision))
-        file_size = os.stat(file_name['txt']).st_size
-        with io.open(file_name['txt']) as txt_file:
-            form.parsed_draft = PlaintextDraft(txt_file.read(), txt_file.name)
-    else:
-        file_size = form.cleaned_data['txt'].size
-
-    if form.authors:
-        authors = form.authors
-    else:
-        # If we don't have an xml file, try to extract the
-        # relevant information from the text file
-        for author in form.parsed_draft.get_author_list():
-            full_name, first_name, middle_initial, last_name, name_suffix, email, country, company = author
-
-            name = full_name.replace("\n", "").replace("\r", "").replace("<", "").replace(">", "").strip()
-
-            if email:
-                try:
-                    validate_email(email)
-                except ValidationError:
-                    email = ""
-
-            def turn_into_unicode(s):
-                if s is None:
-                    return ""
-
-                if isinstance(s, str):
-                    return s
-                else:
-                    try:
-                        return s.decode("utf-8")
-                    except UnicodeDecodeError:
-                        try:
-                            return s.decode("latin-1")
-                        except UnicodeDecodeError:
-                            return ""
-
-            name = turn_into_unicode(name)
-            email = turn_into_unicode(email)
-            company = turn_into_unicode(company)
-
-            authors.append({
-                "name": name,
-                "email": email,
-                "affiliation": company,
-                "country": country
-            })
-
-    if form.abstract:
-        abstract = form.abstract
-    else:
-        abstract = form.parsed_draft.get_abstract()
-
-    return authors, abstract, file_name, file_size
-
 
 def get_submission(form):
     # See if there is a Submission in state waiting-for-draft
@@ -848,7 +803,7 @@ def fill_in_submission(form, submission, authors, abstract, file_size):
     submission.file_size = file_size
     submission.file_types = ','.join(form.file_types)
     submission.xml_version = form.xml_version
-    submission.submission_date = datetime.date.today()
+    submission.submission_date = date_today()
     submission.replaces = ""
     if form.parsed_draft is not None:
         submission.pages = form.parsed_draft.get_pagecount()
@@ -906,8 +861,54 @@ def accept_submission_requires_group_approval(submission):
 
 
 class SubmissionError(Exception):
-    """Exception for errors during submission processing"""
-    pass
+    """Exception for errors during submission processing
+    
+    Sanitizes paths appearing in exception messages.
+    """
+    def __init__(self, *args):
+        if len(args) > 0:
+            args = (self.sanitize_message(arg) for arg in args)
+        super().__init__(*args)
+
+    @staticmethod
+    def sanitize_message(msg):
+        # Paths likely to appear in submission-related errors
+        paths = [
+            p for p in (
+                getattr(settings, "ALL_ID_DOWNLOAD_DIR", None),
+                getattr(settings, "BIBXML_BASE_PATH", None),
+                getattr(settings, "DERIVED_DIR", None),
+                getattr(settings, "FTP_DIR", None),
+                getattr(settings, "IDSUBMIT_REPOSITORY_PATH", None),
+                getattr(settings, "IDSUBMIT_STAGING_PATH", None),
+                getattr(settings, "INTERNET_ALL_DRAFTS_ARCHIVE_DIR", None),
+                getattr(settings, "INTERNET_DRAFT_PATH", None),
+                getattr(settings, "INTERNET_DRAFT_ARCHIVE_DIR", None),
+                getattr(settings, "INTERNET_DRAFT_PDF_PATH", None),
+                getattr(settings, "RFC_PATH", None),
+                getattr(settings, "SUBMIT_YANG_CATALOG_MODEL_DIR", None),
+                getattr(settings, "SUBMIT_YANG_DRAFT_MODEL_DIR", None),
+                getattr(settings, "SUBMIT_YANG_IANA_MODEL_DIR", None),
+                getattr(settings, "SUBMIT_YANG_RFC_MODEL_DIR", None),
+                "/tmp/",
+            ) if p is not None
+        ]
+        return re.sub(fr"({'|'.join(paths)})/*", "**/", msg)
+
+
+class XmlRfcError(SubmissionError):
+    """SubmissionError caused by xml2rfc
+    
+    Includes the output from xml2rfc, if any, in xml2rfc_stdout / xml2rfc_stderr
+    """
+    def __init__(self, *args, xml2rfc_stdout: str, xml2rfc_stderr: str):
+        super().__init__(*args)
+        self.xml2rfc_stderr = xml2rfc_stderr
+        self.xml2rfc_stdout = xml2rfc_stdout
+
+
+class InconsistentRevisionError(SubmissionError):
+    """SubmissionError caused by an inconsistent revision"""
 
 
 def staging_path(filename, revision, ext):
@@ -922,55 +923,103 @@ def render_missing_formats(submission):
     If a txt file already exists, leaves it in place. Overwrites an existing html file
     if there is one.
     """
-    xml2rfc.log.write_out = io.StringIO()   # open(os.devnull, "w")
-    xml2rfc.log.write_err = io.StringIO()   # open(os.devnull, "w")
-    xml_path = staging_path(submission.name, submission.rev, '.xml')
-    parser = xml2rfc.XmlRfcParser(str(xml_path), quiet=True)
-    # --- Parse the xml ---
-    xmltree = parser.parse(remove_comments=False)
-    # If we have v2, run it through v2v3. Keep track of the submitted version, though.
-    xmlroot = xmltree.getroot()
-    xml_version = xmlroot.get('version', '2')
-    if xml_version == '2':
-        v2v3 = xml2rfc.V2v3XmlWriter(xmltree)
-        xmltree.tree = v2v3.convert2to3()
-
-    # --- Prep the xml ---
-    prep = xml2rfc.PrepToolWriter(xmltree, quiet=True, liberal=True, keep_pis=[xml2rfc.V3_PI_TARGET])
-    prep.options.accept_prepped = True
-    xmltree.tree = prep.prep()
-    if xmltree.tree == None:
-        raise SubmissionError(f'Error from xml2rfc (prep): {prep.errors}')
-
-    # --- Convert to txt ---
-    txt_path = staging_path(submission.name, submission.rev, '.txt')
-    if not txt_path.exists():
-        writer = xml2rfc.TextWriter(xmltree, quiet=True)
-        writer.options.accept_prepped = True
-        writer.write(txt_path)
+    with capture_xml2rfc_output() as xml2rfc_logs:
+        xml_path = staging_path(submission.name, submission.rev, '.xml')
+        parser = xml2rfc.XmlRfcParser(str(xml_path), quiet=True)
+        try:
+            # --- Parse the xml ---
+            xmltree = parser.parse(remove_comments=False)
+        except Exception as err:
+            raise XmlRfcError(
+                "Error parsing XML",
+                xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(),
+                xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(),
+            ) from err
+        # If we have v2, run it through v2v3. Keep track of the submitted version, though.
+        xmlroot = xmltree.getroot()
+        xml_version = xmlroot.get('version', '2')
+        if xml_version == '2':
+            v2v3 = xml2rfc.V2v3XmlWriter(xmltree)
+            try:
+                xmltree.tree = v2v3.convert2to3()
+            except Exception as err:
+                raise XmlRfcError(
+                    "Error converting v2 XML to v3",
+                    xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(),
+                    xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(),
+                ) from err
+    
+        # --- Prep the xml ---
+        today = date_today()
+        prep = xml2rfc.PrepToolWriter(xmltree, quiet=True, liberal=True, keep_pis=[xml2rfc.V3_PI_TARGET])
+        prep.options.accept_prepped = True
+        prep.options.date = today
+        try:
+            xmltree.tree = prep.prep()
+        except RfcWriterError:
+            raise XmlRfcError(
+                f"Error during xml2rfc prep: {prep.errors}",
+                xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(),
+                xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(),
+            )
+        except Exception as err:
+            raise XmlRfcError(
+                "Unexpected error during xml2rfc prep",
+                xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(),
+                xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(),
+            ) from err
+    
+        # --- Convert to txt ---
+        txt_path = staging_path(submission.name, submission.rev, '.txt')
+        if not txt_path.exists():
+            writer = xml2rfc.TextWriter(xmltree, quiet=True)
+            writer.options.accept_prepped = True
+            writer.options.date = today
+            try:
+                writer.write(txt_path)
+            except Exception as err:
+                raise XmlRfcError(
+                    "Error generating text format from XML",
+                    xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(),
+                    xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(),
+                ) from err
+            log.log(
+                'In %s: xml2rfc %s generated %s from %s (version %s)' % (
+                    str(xml_path.parent),
+                    xml2rfc.__version__,
+                    txt_path.name,
+                    xml_path.name,
+                    xml_version,
+                )
+            )
+            # When the blobstores become autoritative - the guard at the
+            # containing if statement needs to be based on the store
+            with Path(txt_path).open("rb") as f:
+                store_file("staging", f"{submission.name}-{submission.rev}.txt", f)
+    
+        # --- Convert to html ---
+        html_path = staging_path(submission.name, submission.rev, '.html')
+        writer = xml2rfc.HtmlWriter(xmltree, quiet=True)
+        writer.options.date = today
+        try:
+            writer.write(str(html_path))
+        except Exception as err:
+            raise XmlRfcError(
+                "Error generating HTML format from XML",
+                xml2rfc_stdout=xml2rfc_logs["stdout"].getvalue(),
+                xml2rfc_stderr=xml2rfc_logs["stderr"].getvalue(),
+            ) from err
         log.log(
             'In %s: xml2rfc %s generated %s from %s (version %s)' % (
                 str(xml_path.parent),
                 xml2rfc.__version__,
-                txt_path.name,
+                html_path.name,
                 xml_path.name,
                 xml_version,
             )
         )
-
-    # --- Convert to html ---
-    html_path = staging_path(submission.name, submission.rev, '.html')
-    writer = xml2rfc.HtmlWriter(xmltree, quiet=True)
-    writer.write(str(html_path))
-    log.log(
-        'In %s: xml2rfc %s generated %s from %s (version %s)' % (
-            str(xml_path.parent),
-            xml2rfc.__version__,
-            html_path.name,
-            xml_path.name,
-            xml_version,
-        )
-    )
+    with Path(html_path).open("rb") as f:
+        store_file("staging", f"{submission.name}-{submission.rev}.html", f)
 
 
 def accept_submission(submission: Submission, request: Optional[HttpRequest] = None, autopost=False):
@@ -993,7 +1042,7 @@ def accept_submission(submission: Submission, request: Optional[HttpRequest] = N
     docevent_from_submission(submission, desc="Uploaded new revision",
                              who=requester if requester_is_author else None)
 
-    replaces = DocAlias.objects.filter(name__in=submission.replaces_names)
+    replaces = Document.objects.filter(name__in=submission.replaces_names)
     pretty_replaces = '(none)' if not replaces else (
         ', '.join(prettify_std_name(r.name) for r in replaces)
     )
@@ -1126,102 +1175,193 @@ def _normalize_title(title):
     return normalize_text(title)  # normalize whitespace
 
 
-def process_submission_xml(submission):
+def process_submission_xml(filename, revision):
     """Validate and extract info from an uploaded submission"""
-    xml_path = staging_path(submission.name, submission.rev, '.xml')
+    xml_path = staging_path(filename, revision, '.xml')
     xml_draft = XMLDraft(xml_path)
 
-    if submission.name != xml_draft.filename:
-        raise SubmissionError('XML draft filename disagrees with submission filename')
-    if submission.rev != xml_draft.revision:
-        raise SubmissionError('XML draft revision disagrees with submission revision')
-
-    authors = xml_draft.get_author_list()
-    for a in authors:
-        if not a['email']:
-            raise SubmissionError(f'Missing email address for author {a}')
+    if filename != xml_draft.filename:
+        raise SubmissionError(
+            f"XML Internet-Draft filename ({xml_draft.filename}) "
+            f"disagrees with submission filename ({filename})"
+        )
+    if revision != xml_draft.revision:
+        raise SubmissionError(
+            f"XML Internet-Draft revision ({xml_draft.revision}) "
+            f"disagrees with submission revision ({revision})"
+        )
+    title = _normalize_title(xml_draft.get_title())
+    if not title:
+        raise SubmissionError("Could not extract a valid title from the XML")
+    
+    try:
+        document_date = xml_draft.get_creation_date()
+    except InvalidMetadataError as err:
+        raise SubmissionError(str(err)) from err
+
+    return {
+        "filename": xml_draft.filename,
+        "rev": xml_draft.revision,
+        "title": title,
+        "authors": [
+            {key: auth[key] for key in ('name', 'email', 'affiliation', 'country')}
+            for auth in xml_draft.get_author_list()
+        ],
+        "abstract": None,  # not supported from XML
+        "document_date": document_date,
+        "pages": None,  # not supported from XML
+        "words": None,  # not supported from XML
+        "first_two_pages": None,  # not supported from XML
+        "file_size": None,  # not supported from XML
+        "formal_languages": None,  # not supported from XML
+        "xml_version": xml_draft.xml_version,
+    }
+
+
+def _turn_into_unicode(s: Optional[Union[str, bytes]]):
+    """Decode a possibly null string-like item as a string
+    
+    Would be nice to ditch this.
+    """
+    if s is None:
+        return ""
 
-    author_emails = [a['email'].lower() for a in authors]
-    submitter = get_person_from_name_email(**submission.submitter_parsed())  # the ** expands dict into kwargs
-    if not any(
-            email.address.lower() in author_emails
-            for email in submitter.email_set.filter(active=True)
-    ):
-        raise SubmissionError(f'Submitter ({submitter}) is not one of the document authors')
+    if isinstance(s, str):
+        return s
+    else:
+        try:
+            return s.decode("utf-8")
+        except UnicodeDecodeError:
+            try:
+                return s.decode("latin-1")
+            except UnicodeDecodeError:
+                return ""
 
-    # Fill in the submission data
-    submission.title = _normalize_title(xml_draft.get_title())
-    if not submission.title:
-        raise SubmissionError('Could not extract a valid title from the XML')
-    submission.authors = [
-        {key: auth[key] for key in ('name', 'email', 'affiliation', 'country')}
-        for auth in authors
-    ]
-    submission.xml_version = xml_draft.xml_version
-    submission.save()
 
+def _is_valid_email(addr):
+    try:
+        validate_email(addr)
+    except ValidationError:
+        return False
+    return True
 
-def process_submission_text(submission):
-    """Validate/extract data from the text version of a submitted draft
 
-    This assumes the draft was uploaded as XML and extracts data that is not
-    currently available directly from the XML. Additional processing, e.g. from
-    get_draft_meta(), would need to be added in order to support direct text
-    draft uploads.
-    """
-    text_path = staging_path(submission.name, submission.rev, '.txt')
+def process_submission_text(filename, revision):
+    """Validate/extract data from the text version of a submitted draft"""
+    text_path = staging_path(filename, revision, '.txt')
     text_draft = PlaintextDraft.from_file(text_path)
 
-    if submission.name != text_draft.filename:
+    if filename != text_draft.filename:
         raise SubmissionError(
-            f'Text draft filename ({text_draft.filename}) disagrees with submission filename ({submission.name})'
+            f"Text Internet-Draft filename ({text_draft.filename}) "
+            f"disagrees with submission filename ({filename})"
         )
-    if submission.rev != text_draft.revision:
-        raise SubmissionError(
-            f'Text draft revision ({text_draft.revision}) disagrees with submission revision ({submission.rev})')
-    text_title = _normalize_title(text_draft.get_title())
-    if not text_title:
-        raise SubmissionError('Could not extract a valid title from the text')
-    if text_title != submission.title:
+    if revision != text_draft.revision:
         raise SubmissionError(
-            f'Text draft title ({text_title}) disagrees with submission title ({submission.title})')
-
-    submission.abstract = text_draft.get_abstract()
-    submission.document_date = text_draft.get_creation_date()
-    submission.pages = text_draft.get_pagecount()
-    submission.words = text_draft.get_wordcount()
-    submission.first_two_pages = ''.join(text_draft.pages[:2])
-    submission.file_size = os.stat(text_path).st_size
-    submission.save()
-
-    submission.formal_languages.set(
-        FormalLanguageName.objects.filter(
-            slug__in=text_draft.get_formal_languages()
+            f"Text Internet-Draft revision ({text_draft.revision}) "
+            f"disagrees with submission revision ({revision})"
         )
-    )
-
+    title = text_draft.get_title()
+    if title:
+        title = _normalize_title(title)
+
+    # Translation table drops \r, \n, <, >.
+    trans_table = str.maketrans("", "", "\r\n<>")
+    authors = [
+        {
+            "name": fullname.translate(trans_table).strip(),
+            "email": _turn_into_unicode(email if _is_valid_email(email) else ""),
+            "affiliation": _turn_into_unicode(company),
+            "country": _turn_into_unicode(country),
+        }
+        for (fullname, _, _, _, _, email, country, company) in text_draft.get_author_list()
+    ]
+    return {
+        "filename": text_draft.filename,
+        "rev": text_draft.revision,
+        "title": title,
+        "authors": authors,
+        "abstract": text_draft.get_abstract(),
+        "document_date": text_draft.get_creation_date(),
+        "pages": text_draft.get_pagecount(),
+        "words": text_draft.get_wordcount(),
+        "first_two_pages": ''.join(text_draft.pages[:2]),
+        "file_size": os.stat(text_path).st_size,
+        "formal_languages": FormalLanguageName.objects.filter(
+            slug__in=text_draft.get_formal_languages()
+        ),
+        "xml_version": None,  # not supported from text
+    }
 
-def process_uploaded_submission(submission):
-    def abort_submission(error):
-        cancel_submission(submission)
-        create_submission_event(None, submission, f'Submission rejected: {error}')
 
-    if submission.state_id != 'validating':
-        log.log(f'Submission {submission.pk} is not in "validating" state, skipping.')
-        return  # do nothing
+def process_and_validate_submission(submission):
+    """Process and validate a submission
 
-    if submission.file_types != '.xml':
-        abort_submission('Only XML draft submissions can be processed.')
+    Raises SubmissionError or a subclass if an error is encountered.
+    """
+    if len(set(submission.file_types.split(",")).intersection({".xml", ".txt"})) == 0:
+        raise SubmissionError("Require XML and/or text format to process an Internet-Draft submission.")
 
     try:
-        process_submission_xml(submission)
-        if check_submission_revision_consistency(submission):
+        xml_metadata = None
+        # Parse XML first, if we have it
+        if ".xml" in submission.file_types:
+            xml_metadata = process_submission_xml(submission.name, submission.rev)
+            try:
+                render_missing_formats(submission)  # makes HTML and text, unless text was uploaded
+            except XmlRfcError as err:
+                # log stdio/stderr
+                log.log(
+                    f"xml2rfc failure when rendering missing formats for {submission.name}-{submission.rev}:\n"
+                    f">> stdout:\n{err.xml2rfc_stdout}\n"
+                    f">> stderr:\n{err.xml2rfc_stderr}"
+                )
+                raise
+        # Parse text, whether uploaded or generated from XML
+        text_metadata = process_submission_text(submission.name, submission.rev)
+
+        if (
+            ".txt" in submission.file_types
+            and xml_metadata
+            and xml_metadata["title"] != text_metadata["title"]
+        ):
             raise SubmissionError(
-                'Document revision inconsistency error in the database. '
-                'Please contact the secretariat for assistance.'
+                f"Text Internet-Draft title ({text_metadata['title']}) "
+                f"disagrees with XML Internet-Draft title ({xml_metadata['title']})"
             )
-        render_missing_formats(submission)
-        process_submission_text(submission)
+
+        # Fill in the submission from the parsed XML/text metadata
+        if xml_metadata is not None:
+            # Items preferred / only available from XML
+            submission.xml_version = xml_metadata["xml_version"]
+            submission.title = xml_metadata["title"] or ""
+            submission.authors = xml_metadata["authors"]
+        else:
+            # Items to get from text only if XML not available
+            submission.title = text_metadata["title"] or ""
+            submission.authors = text_metadata["authors"]
+
+        if not submission.title:
+            raise SubmissionError("Could not determine the title of the draft")
+
+        # Items to get from text only when not available from XML
+        if xml_metadata and xml_metadata.get("document_date", None) is not None:
+            submission.document_date = xml_metadata["document_date"]
+        else:
+            submission.document_date = text_metadata["document_date"]
+
+        # Items always to get from text, even when XML is available
+        submission.abstract = text_metadata["abstract"]
+        submission.pages = text_metadata["pages"]
+        submission.words = text_metadata["words"]
+        submission.first_two_pages = text_metadata["first_two_pages"]
+        submission.file_size = text_metadata["file_size"]
+        submission.save()
+        submission.formal_languages.set(text_metadata["formal_languages"])
+
+        consistency_error = check_submission_revision_consistency(submission)
+        if consistency_error:
+            raise InconsistentRevisionError(consistency_error)
         set_extresources_from_existing_draft(submission)
         apply_checkers(
             submission,
@@ -1233,16 +1373,245 @@ def abort_submission(error):
         errors = [c.message for c in submission.checks.filter(passed__isnull=False) if not c.passed]
         if len(errors) > 0:
             raise SubmissionError('Checks failed: ' + ' / '.join(errors))
-    except SubmissionError as err:
-        abort_submission(err)
-    except Exception:
+    except SubmissionError:
+        raise  # pass SubmissionErrors up the stack
+    except Exception as err:
+        # (this is a good point to just `raise err` when diagnosing Submission test failures)
+        # convert other exceptions into SubmissionErrors
         log.log(f'Unexpected exception while processing submission {submission.pk}.')
         log.log(traceback.format_exc())
-        abort_submission('A system error occurred while processing the submission.')
+        raise SubmissionError('A system error occurred while processing the submission.') from err
+
+
+def submitter_is_author(submission):
+    submitter = get_person_from_name_email(**submission.submitter_parsed())
+    if submitter:
+        author_emails = [
+            author["email"].strip().lower()
+            for author in submission.authors
+            if "email" in author
+        ]
+        return any(
+            email.address.lower() in author_emails
+            for email in submitter.email_set.filter(active=True)
+        )
+    return False
+
+
+def all_authors_have_emails(submission):
+    return all(a["email"] for a in submission.authors)
+
+
+def process_and_accept_uploaded_submission(submission):
+    """Process, validate, and, if valid, accept an uploaded submission
+
+    Requires that the submitter already be set and is an author of the submitted draft.
+    The submission must be in the "validating" state. On success, it will be in the
+    "posted" state. On error, it wil be in the "cancel" state.
+    """
+    if submission.state_id != "validating":
+        log.log(f'Submission {submission.pk} is not in "validating" state, skipping.')
+        return  # do nothing
+
+    if submission.file_types != '.xml':
+        # permit only XML uploads for automatic acceptance
+        cancel_submission(submission)
+        create_submission_event(
+            None, 
+            submission, 
+            "Only XML Internet-Draft submissions can be processed.",
+        )
+        return
+
+    try:
+        process_and_validate_submission(submission)
+    except SubmissionError as err:
+        submission.refresh_from_db()  # guard against incomplete changes in submission validation / processing
+        cancel_submission(submission)  # changes Submission.state
+        create_submission_event(None, submission, f"Submission rejected: {err}")
+        return
+
+    if not all_authors_have_emails(submission):
+        cancel_submission(submission)  # changes Submission.state
+        create_submission_event(
+            None,
+            submission,
+            "Submission rejected: Email address not found for all authors"
+        )
+        return
+        
+    if not submitter_is_author(submission):
+        cancel_submission(submission)  # changes Submission.state
+        create_submission_event(
+            None,
+            submission,
+            f"Submission rejected: Submitter ({submission.submitter}) is not one of the document authors",
+        )
+        return
+
+    create_submission_event(None, submission, desc="Completed submission validation checks")
+    accept_submission(submission)
+
 
-    # if we get here and are still "validating", accept the draft
-    if submission.state_id == 'validating':
-        submission.state_id = 'uploaded'
+def process_uploaded_submission(submission):
+    """Process and validate an uploaded submission
+
+    The submission must be in the "validating" state. On success, it will be in the "uploaded"
+    state. On error, it will be in the "cancel" state.
+    """
+    if submission.state_id != "validating":
+        log.log(f'Submission {submission.pk} is not in "validating" state, skipping.')
+        return  # do nothing
+
+    try:
+        process_and_validate_submission(submission)
+    except InconsistentRevisionError as consistency_error:
+        submission.refresh_from_db()  # guard against incomplete changes in submission validation / processing
+        submission.state_id = "manual"
+        submission.save()
+        create_submission_event(None, submission, desc="Uploaded submission (diverted to manual process)")
+        send_manual_post_request(None, submission, errors=dict(consistency=str(consistency_error)))
+    except SubmissionError as err:
+        # something generic went wrong
+        submission.refresh_from_db()  # guard against incomplete changes in submission validation / processing
+        cancel_submission(submission)  # changes Submission.state
+        create_submission_event(None, submission, f"Submission rejected: {err}")
+    else:
+        submission.state_id = "uploaded"
         submission.save()
         create_submission_event(None, submission, desc="Completed submission validation checks")
-        accept_submission(submission)
+
+
+def apply_yang_checker_to_draft(checker, draft):
+    submission = Submission.objects.filter(name=draft.name, rev=draft.rev).order_by('-id').first()
+    if submission:
+        check = submission.checks.filter(checker=checker.name).order_by('-id').first()
+        if check:
+            result = checker.check_file_txt(draft.get_file_name())
+            passed, message, errors, warnings, items = result
+            items = json.loads(json.dumps(items))
+            new_res = (passed, errors, warnings, message)
+            old_res = (check.passed, check.errors, check.warnings, check.message) if check else ()
+            if new_res != old_res:
+                log.log(f"Saving new yang checker results for {draft.name}-{draft.rev}")
+                qs = submission.checks.filter(checker=checker.name).order_by('time')
+                submission.checks.filter(checker=checker.name).exclude(pk=qs.first().pk).delete()
+                submission.checks.create(submission=submission, checker=checker.name, passed=passed,
+                                         message=message, errors=errors, warnings=warnings, items=items,
+                                         symbol=checker.symbol)
+    else:
+        log.log(f"Could not run yang checker for {draft.name}-{draft.rev}: missing submission object")
+
+
+def run_all_yang_model_checks():
+    checker = DraftYangChecker()
+    for draft in Document.objects.filter(
+        type_id="draft",
+        states=State.objects.get(type="draft", slug="active"),
+    ):
+        apply_yang_checker_to_draft(checker, draft)
+
+
+def populate_yang_model_dirs():
+    """Update the yang model dirs
+
+     * All yang modules from published RFCs should be extracted and be
+       available in an rfc-yang repository.
+
+     * All valid yang modules from active, not replaced, Internet-Drafts
+       should be extracted and be available in a draft-valid-yang repository.
+
+     * All, valid and invalid, yang modules from active, not replaced,
+       Internet-Drafts should be available in a draft-all-yang repository.
+       (Actually, given precedence ordering, it would be enough to place
+       non-validating modules in a draft-invalid-yang repository instead).
+
+     * In all cases, example modules should be excluded.
+
+     * Precedence is established by the search order of the repository as
+       provided to pyang.
+
+     * As drafts expire, models should be removed in order to catch cases
+       where a module being worked on depends on one which has slipped out
+       of the work queue.
+
+    """
+    def extract_from(file, dir, strict=True):
+        saved_stdout = sys.stdout
+        saved_stderr = sys.stderr
+        xymerr = io.StringIO()
+        xymout = io.StringIO()
+        sys.stderr = xymerr
+        sys.stdout = xymout
+        model_list = []
+        try:
+            model_list = xym.xym(str(file), str(file.parent), str(dir), strict=strict, debug_level=-2)
+            for name in model_list:
+                modfile = moddir / name
+                mtime = file.stat().st_mtime
+                os.utime(str(modfile), (mtime, mtime))
+                if '"' in name:
+                    name = name.replace('"', '')
+                    modfile.rename(str(moddir / name))
+            model_list = [n.replace('"', '') for n in model_list]
+        except Exception as e:
+            log.log("Error when extracting from %s: %s" % (file, str(e)))
+        finally:
+            sys.stdout = saved_stdout
+            sys.stderr = saved_stderr
+        return model_list
+
+    # Extract from new RFCs
+
+    rfcdir = Path(settings.RFC_PATH)
+
+    moddir = Path(settings.SUBMIT_YANG_RFC_MODEL_DIR)
+    if not moddir.exists():
+        moddir.mkdir(parents=True)
+
+    latest = 0
+    for item in moddir.iterdir():
+        if item.stat().st_mtime > latest:
+            latest = item.stat().st_mtime
+
+    log.log(f"Extracting RFC Yang models to {moddir} ...")
+    for item in rfcdir.iterdir():
+        if item.is_file() and item.name.startswith('rfc') and item.name.endswith('.txt') and item.name[3:-4].isdigit():
+            if item.stat().st_mtime > latest:
+                model_list = extract_from(item, moddir)
+                for name in model_list:
+                    if not (name.startswith('ietf') or name.startswith('iana')):
+                        modfile = moddir / name
+                        modfile.unlink()
+
+    # Extract valid modules from drafts
+
+    six_months_ago = time.time() - 6 * 31 * 24 * 60 * 60
+
+    def active(dirent):
+        return dirent.stat().st_mtime > six_months_ago
+
+    draftdir = Path(settings.INTERNET_DRAFT_PATH)
+    moddir = Path(settings.SUBMIT_YANG_DRAFT_MODEL_DIR)
+    if not moddir.exists():
+        moddir.mkdir(parents=True)
+    log.log(f"Emptying {moddir} ...")
+    for item in moddir.iterdir():
+        item.unlink()
+
+    log.log(f"Extracting draft Yang models to {moddir} ...")
+    for item in draftdir.iterdir():
+        try:
+            if item.is_file() and item.name.startswith('draft') and item.name.endswith('.txt') and active(item):
+                model_list = extract_from(item, moddir, strict=False)
+                for name in model_list:
+                    if name.startswith('example'):
+                        modfile = moddir / name
+                        modfile.unlink()
+        except UnicodeDecodeError as e:
+            log.log(f"Error processing {item.name}: {e}")
+
+    ftp_moddir = Path(settings.FTP_DIR) / "yang" / "draftmod/"
+    if not moddir.endswith("/"):
+        moddir += "/"
+    subprocess.call(("/usr/bin/rsync", "-aq", "--delete", moddir, ftp_moddir))
diff --git a/ietf/submit/views.py b/ietf/submit/views.py
index bab8597021..2db3f51098 100644
--- a/ietf/submit/views.py
+++ b/ietf/submit/views.py
@@ -1,10 +1,8 @@
 # Copyright The IETF Trust 2011-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
-
-
 import re
-import base64
 import datetime
+from secrets import compare_digest
 
 from typing import Optional, cast         # pyflakes:ignore
 from urllib.parse import urljoin
@@ -12,7 +10,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.models import User
-from django.db import DataError, transaction
+from django.db import transaction
 from django.urls import reverse as urlreverse
 from django.core.exceptions import ValidationError
 from django.http import HttpResponseRedirect, Http404, HttpResponseForbidden, HttpResponse, JsonResponse
@@ -22,92 +20,93 @@
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import Document, DocAlias, AddedMessageEvent
+from ietf.doc.models import Document
 from ietf.doc.forms import ExtResourceForm
 from ietf.group.models import Group
 from ietf.group.utils import group_features_group_filter
 from ietf.ietfauth.utils import has_role, role_required
 from ietf.mailtrigger.utils import gather_address_lists
-from ietf.message.models import Message, MessageAttachment
 from ietf.person.models import Email
-from ietf.submit.forms import ( SubmissionManualUploadForm, SubmissionAutoUploadForm, AuthorForm,
-    SubmitterForm, EditSubmissionForm, PreapprovalForm, ReplacesForm, SubmissionEmailForm, MessageModelForm,
-    DeprecatedSubmissionAutoUploadForm )
-from ietf.submit.mail import send_full_url, send_manual_post_request, add_submission_email, get_reply_to
-from ietf.submit.models import (Submission, Preapproval, SubmissionExtResource,
-    DraftSubmissionStateName, SubmissionEmailEvent )
-from ietf.submit.tasks import process_uploaded_submission_task, poke
-from ietf.submit.utils import ( approvable_submissions_for_user, preapprovals_for_user,
-    recently_approved_by_user, validate_submission, create_submission_event, docevent_from_submission,
-    post_submission, cancel_submission, rename_submission_files, remove_submission_files, get_draft_meta,
-    get_submission, fill_in_submission, apply_checkers, save_files, clear_existing_files,
-    check_submission_revision_consistency, accept_submission, accept_submission_requires_group_approval,
-    accept_submission_requires_prev_auth_approval, update_submission_external_resources, remote_ip )
+from ietf.submit.forms import (
+    SubmissionAutoUploadForm,
+    AuthorForm,
+    SubmitterForm,
+    EditSubmissionForm,
+    PreapprovalForm,
+    ReplacesForm,
+    SubmissionManualUploadForm,
+    SubmissionSearchForm,
+)
+from ietf.submit.mail import send_full_url, send_manual_post_request
+from ietf.submit.models import (
+    Submission,
+    Preapproval,
+    SubmissionExtResource,
+    DraftSubmissionStateName,
+)
+from ietf.submit.tasks import (
+    process_uploaded_submission_task,
+    process_and_accept_uploaded_submission_task,
+    poke,
+)
+from ietf.submit.utils import (
+    approvable_submissions_for_user,
+    preapprovals_for_user,
+    recently_approved_by_user,
+    validate_submission,
+    create_submission_event,
+    docevent_from_submission,
+    post_submission,
+    cancel_submission,
+    rename_submission_files,
+    remove_submission_files,
+    get_submission,
+    save_files,
+    clear_existing_files,
+    accept_submission,
+    accept_submission_requires_group_approval,
+    accept_submission_requires_prev_auth_approval,
+    update_submission_external_resources,
+)
 from ietf.stats.utils import clean_country_name
 from ietf.utils.accesstoken import generate_access_token
 from ietf.utils.log import log
-from ietf.utils.mail import parseaddr, send_mail_message
+from ietf.utils.mail import parseaddr
 from ietf.utils.response import permission_denied
+from ietf.utils.timezone import date_today
 
-def upload_submission(request):
-    if request.method == 'POST':
-        try:
-            form = SubmissionManualUploadForm(request, data=request.POST, files=request.FILES)
-            if form.is_valid():
-                log('got valid submission form for %s' % form.filename)
-                saved_files = save_files(form)
-                authors, abstract, file_name, file_size = get_draft_meta(form, saved_files)
 
-                submission = get_submission(form)
-                try:
-                    fill_in_submission(form, submission, authors, abstract, file_size)
-                except Exception as e:
-                    log("Exception: %s\n" % e)
-                    if submission and submission.id:
-                        submission.delete()
-                    raise
-
-                apply_checkers(submission, file_name)
-
-                consistency_error = check_submission_revision_consistency(submission)
-                if consistency_error:
-                    # A data consistency problem diverted this to manual processing - send notification
-                    submission.state = DraftSubmissionStateName.objects.get(slug="manual")
-                    submission.save()
-                    create_submission_event(request, submission, desc="Uploaded submission (diverted to manual process)")
-                    send_manual_post_request(request, submission, errors=dict(consistency=consistency_error))
-                else:
-                    # This is the usual case
-                    create_submission_event(request, submission, desc="Uploaded submission")
-
-                # Don't add an "Uploaded new revision doevent yet, in case of cancellation
-
-                return redirect("ietf.submit.views.submission_status", submission_id=submission.pk, access_token=submission.access_token())
-        except IOError as e:
-            if "read error" in str(e): # The server got an IOError when trying to read POST data
-                form = SubmissionManualUploadForm(request=request)
-                form._errors = {}
-                form._errors["__all__"] = form.error_class(["There was a failure receiving the complete form data -- please try again."])
-            else:
-                raise
-        except ValidationError as e:
-            form = SubmissionManualUploadForm(request=request)
-            form._errors = {}
-            form._errors["__all__"] = form.error_class(["There was a failure converting the xml file to text -- please verify that your xml file is valid.  (%s)" % e.message])
-            if debug.debug:
-                raise
-        except DataError as e:
-            form = SubmissionManualUploadForm(request=request)
-            form._errors = {}
-            form._errors["__all__"] = form.error_class(["There was a failure processing your upload -- please verify that your draft passes idnits.  (%s)" % e.message])
-            if debug.debug:
-                raise
+def upload_submission(request):
+    if request.method == "POST":
+        form = SubmissionManualUploadForm(
+            request, data=request.POST, files=request.FILES
+        )
+        if form.is_valid():
+            submission = get_submission(form)
+            submission.state = DraftSubmissionStateName.objects.get(slug="validating")
+            submission.remote_ip = form.remote_ip
+            submission.file_types = ",".join(form.file_types)
+            submission.submission_date = date_today()
+            submission.save()
+            clear_existing_files(form)
+            save_files(form)
+            create_submission_event(request, submission, desc="Uploaded submission")
+            # Wrap in on_commit in case a transaction is open
+            # (As of 2024-11-08, this only runs in a transaction during tests)
+            transaction.on_commit(
+                lambda: process_uploaded_submission_task.delay(submission.pk)
+            )
+            return redirect(
+                "ietf.submit.views.submission_status",
+                submission_id=submission.pk,
+                access_token=submission.access_token(),
+            )
     else:
         form = SubmissionManualUploadForm(request=request)
 
-    return render(request, 'submit/upload_submission.html',
-                              {'selected': 'index',
-                               'form': form})
+    return render(
+        request, "submit/upload_submission.html", {"selected": "index", "form": form}
+    )
 
 @csrf_exempt
 def api_submission(request):
@@ -127,7 +126,7 @@ def err(code, error, messages=None):
             if form.is_valid():
                 log('got valid submission form for %s' % form.filename)
                 username = form.cleaned_data['user']
-                user = User.objects.filter(username=username)
+                user = User.objects.filter(username__iexact=username)
                 if user.count() == 0:
                     # See if a secondary login was being used
                     email = Email.objects.filter(address=username, active=True)
@@ -161,7 +160,7 @@ def err(code, error, messages=None):
                 submission.state = DraftSubmissionStateName.objects.get(slug="validating")
                 submission.remote_ip = form.remote_ip
                 submission.file_types = ','.join(form.file_types)
-                submission.submission_date = datetime.date.today()
+                submission.submission_date = date_today()
                 submission.submitter = user.person.formatted_email()
                 submission.replaces = form.cleaned_data['replaces']
                 submission.save()
@@ -169,9 +168,10 @@ def err(code, error, messages=None):
                 save_files(form)
                 create_submission_event(request, submission, desc="Uploaded submission through API")
 
-                # Wrap in on_commit so the delayed task cannot start until the view is done with the DB
+                # Wrap in on_commit in case a transaction is open
+                # (As of 2024-11-08, this only runs in a transaction during tests)
                 transaction.on_commit(
-                    lambda: process_uploaded_submission_task.delay(submission.pk)
+                    lambda: process_and_accept_uploaded_submission_task.delay(submission.pk)
                 )
                 return JsonResponse(
                     {
@@ -182,6 +182,10 @@ def err(code, error, messages=None):
                             settings.IDTRACKER_BASE_URL,
                             urlreverse(api_submission_status, kwargs={'submission_id': submission.pk}),
                         ),
+                        'submission_url': urljoin(
+                            settings.IDTRACKER_BASE_URL,
+                            urlreverse("ietf.submit.views.submission_status", kwargs={'submission_id': submission.pk}),
+                        ),
                     }
                 )
             else:
@@ -210,141 +214,102 @@ def api_submission_status(request, submission_id):
         {
             'id': str(submission.pk),
             'state': submission.state.slug,
+            'state_desc': submission.state.name,
         }
     )
 
 
 @csrf_exempt
-def api_submit(request):
-    "Automated submission entrypoint"
-    submission = None
-    def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
-        
-    if request.method == 'GET':
-        return render(request, 'submit/api_submit_info.html')
-    elif request.method == 'POST':
-        exception = None
-        try:
-            form = DeprecatedSubmissionAutoUploadForm(request, data=request.POST, files=request.FILES)
-            if form.is_valid():
-                log('got valid submission form for %s' % form.filename)
-                username = form.cleaned_data['user']
-                user = User.objects.filter(username=username)
-                if user.count() == 0:
-                    # See if a secondary login was being used
-                    email = Email.objects.filter(address=username, active=True)
-                    # The error messages don't talk about 'email', as the field we're
-                    # looking at is still the 'username' field.
-                    if email.count() == 0:
-                        return err(400, "No such user: %s" % username)
-                    elif email.count() > 1:
-                        return err(500, "Multiple matching accounts for %s" % username)
-                    email = email.first()
-                    if not hasattr(email, 'person'):
-                        return err(400, "No person matches %s" % username)
-                    person = email.person
-                    if not hasattr(person, 'user'):
-                        return err(400, "No user matches: %s" % username)
-                    user = person.user
-                elif user.count() > 1:
-                    return err(500, "Multiple matching accounts for %s" % username)
-                else:
-                    user = user.first()
-                if not hasattr(user, 'person'):
-                    return err(400, "No person with username %s" % username)
-
-                saved_files = save_files(form)
-                authors, abstract, file_name, file_size = get_draft_meta(form, saved_files)
-                for a in authors:
-                    if not a['email']:
-                        raise ValidationError("Missing email address for author %s" % a)
+def api_submit_tombstone(request):
+    """Tombstone for removed automated submission entrypoint"""
+    return render(
+        request, 
+        'submit/api_submit_info.html',
+        status=410,  # Gone
+    )
 
-                submission = get_submission(form)
-                fill_in_submission(form, submission, authors, abstract, file_size)
-                apply_checkers(submission, file_name)
 
-                create_submission_event(request, submission, desc="Uploaded submission")
+def tool_instructions(request):
+    return render(request, 'submit/tool_instructions.html', {'selected': 'instructions'})
 
-                errors = validate_submission(submission)
-                if errors:
-                    raise ValidationError(errors)
 
-                # must do this after validate_submission() or data needed for check may be invalid
-                if check_submission_revision_consistency(submission):
-                    return err( 409, "Submission failed due to a document revision inconsistency error "
-                                     "in the database. Please contact the secretariat for assistance.")
+def search_submission(request):
+    if request.method == "POST":
+        form = SubmissionSearchForm(request.POST)
+        if form.is_valid():
+            name = form.cleaned_data["name"]
+            submission = Submission.objects.filter(name=name).order_by("-pk").first()
+            if submission:
+                return redirect(submission_status, submission_id=submission.pk)
+            else:
+                if re.search(r"-\d\d$", name):
+                    submission = (
+                        Submission.objects.filter(name=name[:-3])
+                        .order_by("-pk")
+                        .first()
+                    )
+                    if submission:
+                        return redirect(submission_status, submission_id=submission.pk)
+            form.add_error(None, f"No valid submission found for {name}")
+    else:
+        form = SubmissionSearchForm()
+    return render(
+        request,
+        "submit/search_submission.html",
+        {"selected": "status", "form": form},
+    )
 
-                errors = [ c.message for c in submission.checks.all() if c.passed==False ]
-                if errors:
-                    raise ValidationError(errors)
 
-                if not username.lower() in [ a['email'].lower() for a in authors ]:
-                    raise ValidationError('Submitter %s is not one of the document authors' % user.username)
+def access_token_is_valid(submission: Submission, access_token: str):
+    """Check whether access_token is valid for submission, in constant time"""
+    token_matched = compare_digest(submission.access_token(), access_token)
+    # also compare key directly for backwards compatibility
+    key_matched = compare_digest(submission.access_key, access_token)
+    return token_matched or key_matched
 
-                submission.submitter = user.person.formatted_email()
-                sent_to = accept_submission(submission, request)
 
-                return HttpResponse(
-                    "Upload of %s OK, confirmation requests sent to:\n  %s" % (submission.name, ',\n  '.join(sent_to)),
-                    content_type="text/plain")
-            else:
-                raise ValidationError(form.errors)
-        except IOError as e:
-            exception = e
-            return err(500, "IO Error: %s" % str(e))
-        except ValidationError as e:
-            exception = e
-            return err(400, "Validation Error: %s" % str(e))
-        except Exception as e:
-            exception = e
-            raise
-            return err(500, "Exception: %s" % str(e))            
-        finally:
-            if exception and submission:
-                remove_submission_files(submission)
-                submission.delete()
+def auth_token_is_valid(submission: Submission, auth_token: str):
+    """Check whether auth_token is valid for submission, in constant time"""
+    auth_key = submission.auth_key
+    if not auth_key:
+        # Make the same calls as the other branch to keep constant time, then
+        # return False because there is no auth key
+        compare_digest(generate_access_token("fake"), auth_token)
+        compare_digest("fake", auth_token)
+        return False
     else:
-        return err(405, "Method not allowed")
+        token_matched = compare_digest(generate_access_token(auth_key), auth_token)
+        # also compare key directly for backwards compatibility
+        key_matched = compare_digest(auth_key, auth_token)
+        return token_matched or key_matched
 
-def tool_instructions(request):
-    return render(request, 'submit/tool_instructions.html', {'selected': 'instructions'})
 
-def search_submission(request):
-    error = None
-    name = None
-    if request.method == 'POST':
-        name = request.POST.get('name', '')
-        submission = Submission.objects.filter(name=name).order_by('-pk').first()
-        if submission:
-            return redirect(submission_status, submission_id=submission.pk)
-        else:
-            if re.search(r'-\d\d$', name):
-                submission = Submission.objects.filter(name=name[:-3]).order_by('-pk').first()
-                if submission:
-                    return redirect(submission_status, submission_id=submission.pk)
-        error = 'No valid submission found for %s' % name
-    return render(request, 'submit/search_submission.html',
-                              {'selected': 'status',
-                               'error': error,
-                               'name': name})
+def can_edit_submission(user, submission: Submission, access_token: str | None):
+    if  has_role(user, "Secretariat"):
+        return True
+    elif not access_token:
+        return False
+    return access_token_is_valid(submission, access_token)
 
-def can_edit_submission(user, submission, access_token):
-    key_matched = access_token and submission.access_token() == access_token
-    if not key_matched: key_matched = submission.access_key == access_token # backwards-compat
-    return key_matched or has_role(user, "Secretariat")
 
 def submission_status(request, submission_id, access_token=None):
     # type: (HttpRequest, str, Optional[str]) -> HttpResponse
     submission = get_object_or_404(Submission, pk=submission_id)
 
-    key_matched = access_token and submission.access_token() == access_token
-    if not key_matched: key_matched = submission.access_key == access_token # backwards-compat
-    if access_token and not key_matched:
-        raise Http404
+    if access_token:
+        key_matched = access_token_is_valid(submission, access_token)
+        if not key_matched:
+            raise Http404
+    else:
+        key_matched = False
 
-    errors = validate_submission(submission)
-    passes_checks = all([ c.passed!=False for c in submission.checks.all() ])
+    if submission.state.slug == "cancel":
+        errors = {}
+    else:
+        errors = validate_submission(submission)
+    latest_checks = submission.latest_checks()
+    applied_any_checks = len(latest_checks) > 0
+    passes_checks = applied_any_checks and all(c.passed for c in latest_checks)
 
     is_secretariat = has_role(request.user, "Secretariat")
     is_chair = submission.group and submission.group.has_role(request.user, "chair")
@@ -379,7 +344,21 @@ def submission_status(request, submission_id, access_token=None):
     message = None
 
     if submission.state_id == "cancel":
-        message = ('error', 'This submission has been cancelled, modification is no longer possible.')
+        # would be nice to have a less heuristic mechansim for reporting async processing failure
+        async_processing_error = submission.submissionevent_set.filter(
+            desc__startswith="Submission rejected: A system error occurred"
+        ).exists()
+        if async_processing_error:
+            message = (
+                "error",
+                "This submission has been cancelled due to a system error during processing. "
+                "Modification is no longer possible.",
+            )
+        else:
+            message = (
+                "error",
+                "This submission has been cancelled, modification is no longer possible.",
+            )
     elif submission.state_id == "auth":
         message = ('success', 'The submission is pending email authentication. An email has been sent to: %s' % ", ".join(confirmation_list))
     elif submission.state_id == "grp-appr":
@@ -436,7 +415,7 @@ def submission_status(request, submission_id, access_token=None):
         )
 
     submitter_form = SubmitterForm(initial=submission.submitter_parsed(), prefix="submitter")
-    replaces_form = ReplacesForm(name=submission.name,initial=DocAlias.objects.filter(name__in=submission.replaces.split(",")))
+    replaces_form = ReplacesForm(name=submission.name,initial=Document.objects.filter(name__in=submission.replaces.split(",")))
     extresources_form = ExtResourceForm(
         initial=dict(resources=[er['res'] for er in external_resources]),
         extresource_model=SubmissionExtResource,
@@ -468,9 +447,9 @@ def submission_status(request, submission_id, access_token=None):
                 update_submission_external_resources(submission, extresources)
 
                 approvals_received = submitter_form.cleaned_data['approvals_received']
-                
+
                 if submission.rev == '00' and submission.group and not submission.group.is_active:
-                    permission_denied(request, 'Posting a new draft for an inactive group is not permitted.')
+                    permission_denied(request, 'Posting a new Internet-Draft for an inactive group is not permitted.')
 
                 if approvals_received:
                     if not is_secretariat:
@@ -556,6 +535,7 @@ def submission_status(request, submission_id, access_token=None):
         'selected': 'status',
         'submission': submission,
         'errors': errors,
+        'applied_any_checks': applied_any_checks,
         'passes_checks': passes_checks,
         'submitter_form': submitter_form,
         'replaces_form': replaces_form,
@@ -652,7 +632,7 @@ def edit_submission(request, submission_id, access_token=None):
     else:
         edit_form = EditSubmissionForm(instance=submission, prefix="edit")
         submitter_form = SubmitterForm(initial=submission.submitter_parsed(), prefix="submitter")
-        replaces_form = ReplacesForm(name=submission.name,initial=DocAlias.objects.filter(name__in=submission.replaces.split(",")))
+        replaces_form = ReplacesForm(name=submission.name, initial=Document.objects.filter(name__in=submission.replaces.split(",")))
         author_forms = [ AuthorForm(initial=author, prefix="authors-%s" % i)
                          for i, author in enumerate(submission.authors) ]
 
@@ -675,8 +655,7 @@ def edit_submission(request, submission_id, access_token=None):
 def confirm_submission(request, submission_id, auth_token):
     submission = get_object_or_404(Submission, pk=submission_id)
 
-    key_matched = submission.auth_key and auth_token == generate_access_token(submission.auth_key)
-    if not key_matched: key_matched = auth_token == submission.auth_key # backwards-compat
+    key_matched = submission.auth_key and auth_token_is_valid(submission, auth_token)
 
     if request.method == 'POST' and submission.state_id in ("auth", "aut-appr") and key_matched:
         # Set a temporary state 'confirmed' to avoid entering this code
@@ -708,7 +687,7 @@ def confirm_submission(request, submission_id, auth_token):
                 messages.error(request, 'The submission is not in a state where it can be cancelled.')
 
             return redirect("ietf.submit.views.submission_status", submission_id=submission_id)
-            
+
         else:
             raise RuntimeError("Unexpected state in confirm_submission()")
 
@@ -723,7 +702,7 @@ def approvals(request):
     preapprovals = preapprovals_for_user(request.user)
 
     days = 30
-    recently_approved = recently_approved_by_user(request.user, datetime.date.today() - datetime.timedelta(days=days))
+    recently_approved = recently_approved_by_user(request.user, date_today() - datetime.timedelta(days=days))
 
     return render(request, 'submit/approvals.html',
                               {'selected': 'approvals',
@@ -781,249 +760,20 @@ def manualpost(request):
     '''
 
     manual = Submission.objects.filter(state_id = "manual").distinct()
-    
+
     for s in manual:
         s.passes_checks = all([ c.passed!=False for c in s.checks.all() ])
         s.errors = validate_submission(s)
 
-    waiting_for_draft = Submission.objects.filter(state_id = "waiting-for-draft").distinct()
-
-    return render(request, 'submit/manual_post.html',
-                  {'manual': manual,
-                   'selected': 'manual_posts',
-                   'waiting_for_draft': waiting_for_draft})
-
-
-def cancel_waiting_for_draft(request):
-    if request.method == 'POST':
-        can_cancel = has_role(request.user, "Secretariat")
-        
-        if not can_cancel:
-            permission_denied(request, 'You do not have permission to perform this action.')
-
-        submission_id = request.POST.get('submission_id', '')
-        access_token = request.POST.get('access_token', '')
-
-        submission = get_submission_or_404(submission_id, access_token = access_token)
-        cancel_submission(submission)
-    
-        create_submission_event(request, submission, "Cancelled submission")
-        if (submission.rev != "00"):
-            # Add a doc event
-            docevent_from_submission(submission, "Cancelled submission for rev {}".format(submission.rev))
-    
-    return redirect("ietf.submit.views.manualpost")
-
-
-@role_required('Secretariat',)
-def add_manualpost_email(request, submission_id=None, access_token=None):
-    """Add email to submission history"""
-
-    if request.method == 'POST':
-        try:
-            button_text = request.POST.get('submit', '')
-            if button_text == 'Cancel':
-                return redirect("submit/manual_post.html")
-    
-            form = SubmissionEmailForm(request.POST)
-            if form.is_valid():
-                submission_pk = form.cleaned_data['submission_pk']
-                message = form.cleaned_data['message']
-                #in_reply_to = form.cleaned_data['in_reply_to']
-                # create Message
-    
-                if form.cleaned_data['direction'] == 'incoming':
-                    msgtype = 'msgin'
-                else:
-                    msgtype = 'msgout'
-    
-                submission, submission_email_event = (
-                    add_submission_email(request=request,
-                                         remote_ip=remote_ip(request),
-                                         name = form.draft_name,
-                                         rev=form.revision,
-                                         submission_pk = submission_pk,
-                                         message = message,
-                                         by = request.user.person,
-                                         msgtype = msgtype) )
-    
-                messages.success(request, 'Email added.')
-    
-                try:
-                    draft = Document.objects.get(name=submission.name)
-                except Document.DoesNotExist:
-                    # Assume this is revision 00 - we'll do this later
-                    draft = None
-        
-                if (draft != None):
-                    e = AddedMessageEvent(type="added_message", doc=draft)
-                    e.message = submission_email_event.submissionemailevent.message
-                    e.msgtype = submission_email_event.submissionemailevent.msgtype
-                    e.in_reply_to = submission_email_event.submissionemailevent.in_reply_to
-                    e.by = request.user.person
-                    e.desc = submission_email_event.desc
-                    e.time = submission_email_event.time
-                    e.save()
-    
-                return redirect("ietf.submit.views.manualpost")
-        except ValidationError as e:
-            form = SubmissionEmailForm(request.POST)
-            form._errors = {}
-            form._errors["__all__"] = form.error_class(["There was a failure uploading your message. (%s)" % e.message])
-    else:
-        initial = {
-        }
-
-        if (submission_id != None):
-            submission = get_submission_or_404(submission_id, access_token)
-            initial['name'] = "{}-{}".format(submission.name, submission.rev)
-            initial['direction'] = 'incoming'
-            initial['submission_pk'] = submission.pk
-        else:
-            initial['direction'] = 'incoming'
-            
-        form = SubmissionEmailForm(initial=initial)
-
-    return render(request, 'submit/add_submit_email.html',dict(form=form))
-
-
-@role_required('Secretariat',)
-def send_submission_email(request, submission_id, message_id=None):
-    """Send an email related to a submission"""
-    submission = get_submission_or_404(submission_id, access_token = None)
-
-    if request.method == 'POST':
-        button_text = request.POST.get('submit', '')
-        if button_text == 'Cancel':
-            return redirect('ietf.submit.views.submission_status',
-                            submission_id=submission.id,
-                            access_token=submission.access_token())
-
-        form = MessageModelForm(request.POST)
-        if form.is_valid():
-            # create Message
-            msg = Message.objects.create(
-                    by = request.user.person,
-                    subject = form.cleaned_data['subject'],
-                    frm = form.cleaned_data['frm'],
-                    to = form.cleaned_data['to'],
-                    cc = form.cleaned_data['cc'],
-                    bcc = form.cleaned_data['bcc'],
-                    reply_to = form.cleaned_data['reply_to'],
-                    body = form.cleaned_data['body']
-            )
-            
-            in_reply_to_id = form.cleaned_data['in_reply_to_id']
-            in_reply_to = None
-            rp = ""
-            
-            if in_reply_to_id:
-                rp = " reply"
-                try:
-                    in_reply_to = Message.objects.get(id=in_reply_to_id)
-                except Message.DoesNotExist:
-                    log("Unable to retrieve in_reply_to message: %s" % in_reply_to_id)
-    
-            desc = "Sent message {} - manual post - {}-{}".format(rp,
-                                                                  submission.name, 
-                                                                  submission.rev)
-            SubmissionEmailEvent.objects.create(
-                    submission = submission,
-                    desc = desc,
-                    msgtype = 'msgout',
-                    by = request.user.person,
-                    message = msg,
-                    in_reply_to = in_reply_to)
-
-            # send email
-            send_mail_message(None,msg)
-
-            messages.success(request, 'Email sent.')
-            return redirect('ietf.submit.views.submission_status', 
-                            submission_id=submission.id,
-                            access_token=submission.access_token())
-
-    else:
-        reply_to = get_reply_to()
-        msg = None
-        
-        if not message_id:
-            addrs = gather_address_lists('sub_confirmation_requested',submission=submission).as_strings(compact=False)
-            to_email = addrs.to
-            cc = addrs.cc
-            subject = 'Regarding {}'.format(submission.name)
-        else:
-            try:
-                submitEmail = SubmissionEmailEvent.objects.get(id=message_id)
-                msg = submitEmail.message
-                
-                if msg:
-                    to_email = msg.frm
-                    cc = msg.cc
-                    subject = 'Re:{}'.format(msg.subject)
-                else:
-                    to_email = None
-                    cc = None
-                    subject = 'Regarding {}'.format(submission.name)
-            except Message.DoesNotExist:
-                to_email = None
-                cc = None
-                subject = 'Regarding {}'.format(submission.name)
-
-        initial = {
-            'to': to_email,
-            'cc': cc,
-            'frm': settings.IDSUBMIT_FROM_EMAIL,
-            'subject': subject,
-            'reply_to': reply_to,
+    return render(
+        request, 
+        'submit/manual_post.html',
+        {
+            'manual': manual,
+            'selected': 'manual_posts'
         }
-        
-        if msg:
-            initial['in_reply_to_id'] = msg.id
-        
-        form = MessageModelForm(initial=initial)
+    )
 
-    return render(request, "submit/email.html",  {
-        'submission': submission,
-        'access_token': submission.access_token(),
-        'form':form})
-    
-
-def show_submission_email_message(request, submission_id, message_id, access_token=None):
-    submission = get_submission_or_404(submission_id, access_token)
-
-    submitEmail = get_object_or_404(SubmissionEmailEvent, pk=message_id)    
-    attachments = submitEmail.message.messageattachment_set.all()
-    
-    return render(request, 'submit/submission_email.html',
-                  {'submission': submission,
-                   'message': submitEmail,
-                   'attachments': attachments})
-
-def show_submission_email_attachment(request, submission_id, message_id, filename, access_token=None):
-    get_submission_or_404(submission_id, access_token)
-
-    message = get_object_or_404(SubmissionEmailEvent, pk=message_id)
-
-    attach = get_object_or_404(MessageAttachment, 
-                               message=message.message, 
-                               filename=filename)
-    
-    if attach.encoding == "base64":
-        body = base64.b64decode(attach.body)
-    else:
-        body = attach.body.encode('utf-8')
-    
-    if attach.content_type is None:
-        content_type='text/plain'
-    else:
-        content_type=attach.content_type
-        
-    response = HttpResponse(body, content_type=content_type)
-    response['Content-Disposition'] = 'attachment; filename=%s' % attach.filename
-    response['Content-Length'] = len(body)
-    return response
-    
 
 def get_submission_or_404(submission_id, access_token=None):
     submission = get_object_or_404(Submission, pk=submission_id)
@@ -1038,4 +788,7 @@ def get_submission_or_404(submission_id, access_token=None):
 
 def async_poke_test(request):
     result = poke.delay()
-    return HttpResponse(f'Poked {result}', content_type='text/plain')
+    return HttpResponse(
+        f'Poked {result}',
+        content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
+    )
diff --git a/ietf/sync/discrepancies.py b/ietf/sync/discrepancies.py
index 0828308048..55c6c02ccb 100644
--- a/ietf/sync/discrepancies.py
+++ b/ietf/sync/discrepancies.py
@@ -4,27 +4,27 @@
 def find_discrepancies():
     res = []
 
-    title = "Drafts that have been sent to the RFC Editor but do not have an RFC Editor state"
+    title = "Internet-Drafts that have been sent to the RFC Editor but do not have an RFC Editor state"
 
-    docs = Document.objects.filter(states__in=list(State.objects.filter(used=True, type="draft-iesg", slug__in=("ann", "rfcqueue")))).exclude(states__in=list(State.objects.filter(used=True, type="draft-rfceditor")))
+    docs = Document.objects.filter(states__in=list(State.objects.filter(used=True, type="draft-iesg", slug__in=("ann", "rfcqueue")))).exclude(states__in=list(State.objects.filter(used=True, type="draft-rfceditor"))).distinct()
 
     res.append((title, docs))
 
-    title = "Drafts that have the IANA Action state \"In Progress\" but do not have a \"IANA\" RFC-Editor state/tag"
+    title = "Internet-Drafts that have the IANA Action state \"In Progress\" but do not have a \"IANA\" RFC-Editor state/tag"
 
-    docs = Document.objects.filter(states__in=list(State.objects.filter(used=True, type="draft-iana-action", slug__in=("inprog",)))).exclude(tags="iana").exclude(states__in=list(State.objects.filter(used=True, type="draft-rfceditor", slug="iana")))
+    docs = Document.objects.filter(states__in=list(State.objects.filter(used=True, type="draft-iana-action", slug__in=("inprog",)))).exclude(tags="iana").exclude(states__in=list(State.objects.filter(used=True, type="draft-rfceditor", slug="iana"))).distinct()
 
     res.append((title, docs))
 
-    title = "Drafts that have the IANA Action state \"Waiting on RFC Editor\" or \"RFC-Ed-Ack\" but are in the RFC Editor state \"IANA\"/tagged with \"IANA\""
+    title = "Internet-Drafts that have the IANA Action state \"Waiting on RFC Editor\" or \"RFC-Ed-Ack\" but are in the RFC Editor state \"IANA\"/tagged with \"IANA\""
 
-    docs = Document.objects.filter(states__in=list(State.objects.filter(used=True, type="draft-iana-action", slug__in=("waitrfc", "rfcedack")))).filter(models.Q(tags="iana") | models.Q(states__in=list(State.objects.filter(used=True, type="draft-rfceditor", slug="iana"))))
+    docs = Document.objects.filter(states__in=list(State.objects.filter(used=True, type="draft-iana-action", slug__in=("waitrfc", "rfcedack")))).filter(models.Q(tags="iana") | models.Q(states__in=list(State.objects.filter(used=True, type="draft-rfceditor", slug="iana")))).distinct()
 
     res.append((title, docs))
 
-    title = "Drafts that have a state other than \"RFC Ed Queue\", \"RFC Published\" or \"Sent to the RFC Editor\" and have an RFC Editor or IANA Action state"
+    title = "Internet-Drafts that have a state other than \"RFC Ed Queue\", \"RFC Published\" or \"Sent to the RFC Editor\" and have an RFC Editor or IANA Action state"
 
-    docs = Document.objects.exclude(states__in=list(State.objects.filter(used=True, type="draft-iesg", slug__in=("rfcqueue", "pub"))) + list(State.objects.filter(used=True, type__in=("draft-stream-iab", "draft-stream-ise", "draft-stream-irtf"), slug="rfc-edit"))).filter(states__in=list(State.objects.filter(used=True, type__in=("draft-iana-action", "draft-rfceditor"))))
+    docs = Document.objects.exclude(states__in=list(State.objects.filter(used=True, type="draft-iesg", slug__in=("rfcqueue", "pub"))) + list(State.objects.filter(used=True, type__in=("draft-stream-iab", "draft-stream-ise", "draft-stream-irtf"), slug="rfc-edit"))).filter(states__in=list(State.objects.filter(used=True, type__in=("draft-iana-action", "draft-rfceditor")))).distinct()
 
     res.append((title, docs))
 
diff --git a/ietf/sync/errata.py b/ietf/sync/errata.py
new file mode 100644
index 0000000000..113d987291
--- /dev/null
+++ b/ietf/sync/errata.py
@@ -0,0 +1,184 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+import datetime
+import json
+from collections import defaultdict
+from typing import DefaultDict
+
+from django.conf import settings
+from django.core.files.storage import storages
+from django.db import transaction
+from django.db.models import Q
+
+from ietf.doc.models import Document, DocEvent
+from ietf.name.models import DocTagName
+from ietf.person.models import Person
+from ietf.utils.log import log
+from ietf.utils.models import DirtyBits
+
+
+DEFAULT_ERRATA_JSON_BLOB_NAME = "other/errata.json"
+
+type ErrataJsonEntry = dict[str, str]
+
+def get_errata_last_updated() -> datetime.datetime:
+    """Get timestamp of the last errata.json update
+
+    May raise FileNotFoundError or other storage/S3 exceptions. Be prepared.
+    """
+    red_bucket = storages["red_bucket"]
+    return red_bucket.get_modified_time(
+        getattr(settings, "ERRATA_JSON_BLOB_NAME", DEFAULT_ERRATA_JSON_BLOB_NAME)
+    )
+
+
+def get_errata_data() -> list[ErrataJsonEntry]:
+    red_bucket = storages["red_bucket"]
+    with red_bucket.open(
+        getattr(settings, "ERRATA_JSON_BLOB_NAME", DEFAULT_ERRATA_JSON_BLOB_NAME), "r"
+    ) as f:
+        errata_data = json.load(f)
+    return errata_data
+
+
+def errata_map_from_json(errata_data: list[ErrataJsonEntry]):
+    """Create a dict mapping RFC number to a list of applicable errata records"""
+    errata = defaultdict(list)
+    for item in errata_data:
+        doc_id = item["doc-id"]
+        if doc_id.upper().startswith("RFC"):
+            rfc_number = int(doc_id[3:])
+            errata[rfc_number].append(item)
+    return dict(errata)
+
+
+def update_errata_tags(errata_data: list[ErrataJsonEntry]):
+    tag_has_errata = DocTagName.objects.get(slug="errata")
+    tag_has_verified_errata = DocTagName.objects.get(slug="verified-errata")
+    system = Person.objects.get(name="(System)")
+
+    errata_map = errata_map_from_json(errata_data)
+    nums_with_errata = [
+        num
+        for num, errata in errata_map.items()
+        if any(er["errata_status_code"] != "Rejected" for er in errata)
+    ]
+    nums_with_verified_errata = [
+        num
+        for num, errata in errata_map.items()
+        if any(er["errata_status_code"] == "Verified" for er in errata)
+    ]
+
+    rfcs_gaining_errata_tag = Document.objects.filter(
+        type_id="rfc", rfc_number__in=nums_with_errata
+    ).exclude(tags=tag_has_errata)
+
+    rfcs_gaining_verified_errata_tag = Document.objects.filter(
+        type_id="rfc", rfc_number__in=nums_with_verified_errata
+    ).exclude(tags=tag_has_verified_errata)
+
+    rfcs_losing_errata_tag = Document.objects.filter(
+        type_id="rfc", tags=tag_has_errata
+    ).exclude(rfc_number__in=nums_with_errata)
+
+    rfcs_losing_verified_errata_tag = Document.objects.filter(
+        type_id="rfc", tags=tag_has_verified_errata
+    ).exclude(rfc_number__in=nums_with_verified_errata)
+
+    # map rfc_number to add/remove lists
+    changes: DefaultDict[Document, dict[str, list[DocTagName]]] = defaultdict(
+        lambda: {"add": [], "remove": []}
+    )
+    for rfc in rfcs_gaining_errata_tag:
+        changes[rfc]["add"].append(tag_has_errata)
+    for rfc in rfcs_gaining_verified_errata_tag:
+        changes[rfc]["add"].append(tag_has_verified_errata)
+    for rfc in rfcs_losing_errata_tag:
+        changes[rfc]["remove"].append(tag_has_errata)
+    for rfc in rfcs_losing_verified_errata_tag:
+        changes[rfc]["remove"].append(tag_has_verified_errata)
+
+    for rfc, changeset in changes.items():
+        # Update in a transaction per RFC to keep tags and DocEvents consistent.
+        # With this in place, an interrupted task will be cleanly completed on the
+        # next run.
+        with transaction.atomic():
+            change_descs = []
+            for tag in changeset["add"]:
+                rfc.tags.add(tag)
+                change_descs.append(f"added {tag.slug} tag")
+            for tag in changeset["remove"]:
+                rfc.tags.remove(tag)
+                change_descs.append(f"removed {tag.slug} tag")
+            summary = "Update from RFC Editor: " + ", ".join(change_descs)
+            if rfc.rfc_number in errata_map and all(
+                er["errata_status_code"] == "Rejected"
+                for er in errata_map[rfc.rfc_number]
+            ):
+                summary += " (all errata rejected)"
+            DocEvent.objects.create(
+                doc=rfc,
+                rev=rfc.rev,  # expect no rev
+                by=system,
+                type="sync_from_rfc_editor",
+                desc=summary,
+            )
+
+
+def update_errata_from_rfceditor():
+    errata_data = get_errata_data()
+    update_errata_tags(errata_data)
+
+
+## DirtyBits management for the errata tags
+
+ERRATA_SLUG = DirtyBits.Slugs.ERRATA
+
+
+def update_errata_dirty_time() -> DirtyBits | None:
+    try:
+        last_update = get_errata_last_updated()
+    except Exception as err:
+        log(f"Error in get_errata_last_updated: {err}")
+        return None
+    else:
+        dirty_work, created = DirtyBits.objects.update_or_create(
+            slug=ERRATA_SLUG, defaults={"dirty_time": last_update}
+        )
+        if created:
+            log(f"Created DirtyBits(slug='{ERRATA_SLUG}')")
+        return dirty_work
+
+
+def mark_errata_as_processed(when: datetime.datetime):
+    n_updated = DirtyBits.objects.filter(
+        Q(processed_time__isnull=True) | Q(processed_time__lt=when),
+        slug=ERRATA_SLUG,
+    ).update(processed_time=when)
+    if n_updated > 0:
+        log(f"processed_time is now {when.isoformat()}")
+    else:
+        log("processed_time not updated, no matching record found")
+
+
+def errata_are_dirty():
+    """Does the rfc index need to be updated?"""
+    dirty_work = update_errata_dirty_time()  # creates DirtyBits if needed
+    if dirty_work is None:
+        # A None indicates we could not check the timestamp of errata.json. In that
+        # case, we are not likely to be able to read the blob either, so don't try
+        # to process it. An error was already logged.
+        return False
+    display_processed_time = (
+        dirty_work.processed_time.isoformat()
+        if dirty_work.processed_time is not None
+        else "never"
+    )
+    log(
+        f"DirtyBits(slug='{ERRATA_SLUG}'): "
+        f"dirty_time={dirty_work.dirty_time.isoformat()} "
+        f"processed_time={display_processed_time}"
+    )
+    return (
+        dirty_work.processed_time is None
+        or dirty_work.dirty_time >= dirty_work.processed_time
+    )
diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py
index 9d0f66435b..0d40c5337e 100644
--- a/ietf/sync/iana.py
+++ b/ietf/sync/iana.py
@@ -9,9 +9,12 @@
 import re
 import requests
 
+from email.utils import parsedate_to_datetime
+from urllib.parse import quote as urlquote
+
 from django.conf import settings
+from django.utils import timezone
 from django.utils.encoding import smart_bytes, force_str
-from django.utils.http import urlquote
 
 import debug                            # pyflakes:ignore
 
@@ -21,7 +24,6 @@
 from ietf.person.models import Person
 from ietf.utils.log import log
 from ietf.utils.mail import parseaddr, get_payload_text
-from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timezone, utc_to_local_timezone
 
 
 #PROTOCOLS_URL = "https://www.iana.org/protocols/"
@@ -43,7 +45,7 @@ def update_rfc_log_from_protocol_page(rfc_names, rfc_must_published_later_than):
 
     updated = []
 
-    docs = Document.objects.filter(docalias__name__in=rfc_names).exclude(
+    docs = Document.objects.filter(name__in=rfc_names).exclude(
         docevent__type="rfc_in_iana_registry").filter(
         # only take those that were published after cutoff since we
         # have a big bunch of old RFCs that we unfortunately don't have data for
@@ -64,8 +66,8 @@ def update_rfc_log_from_protocol_page(rfc_names, rfc_must_published_later_than):
     
 
 def fetch_changes_json(url, start, end):
-    url += "?start=%s&end=%s" % (urlquote(local_timezone_to_utc(start).strftime("%Y-%m-%d %H:%M:%S")),
-                                 urlquote(local_timezone_to_utc(end).strftime("%Y-%m-%d %H:%M:%S")))
+    url += "?start=%s&end=%s" % (urlquote(start.astimezone(datetime.UTC).strftime("%Y-%m-%d %H:%M:%S")),
+                                 urlquote(end.astimezone(datetime.UTC).strftime("%Y-%m-%d %H:%M:%S")))
     # HTTP basic auth
     username = "ietfsync"
     password = settings.IANA_SYNC_PASSWORD
@@ -159,8 +161,7 @@ def update_history_with_changes(changes, send_email=True):
 
     for c in changes:
         docname = c['doc']
-        timestamp = datetime.datetime.strptime(c["time"], "%Y-%m-%d %H:%M:%S")
-        timestamp = utc_to_local_timezone(timestamp) # timestamps are in UTC
+        timestamp = datetime.datetime.strptime(c["time"], "%Y-%m-%d %H:%M:%S",).replace(tzinfo=datetime.UTC)
 
         if c['type'] in ("iana_state", "iana_review"):
             if c['type'] == "iana_state":
@@ -188,13 +189,13 @@ def update_history_with_changes(changes, send_email=True):
                                              state_type=state_type, state=state)
             if not e:
                 try:
-                    doc = Document.objects.get(docalias__name=docname)
+                    doc = Document.objects.get(name=docname)
                 except Document.DoesNotExist:
                     warnings.append("Document %s not found" % docname)
                     continue
 
                 # the naive way of extracting prev_state here means
-                # that we assume these changes are cronologically
+                # that we assume these changes are chronologically
                 # applied
                 prev_state = doc.get_state(state_type)
                 e = add_state_change_event(doc, system, prev_state, state, timestamp=timestamp)
@@ -241,9 +242,12 @@ def parse_review_email(text):
     doc_name = strip_version_extension(doc_name)
 
     # date
-    review_time = datetime.datetime.now()
+    review_time = timezone.now()
     if "Date" in msg:
-        review_time = email_time_to_local_timezone(msg["Date"])
+        review_time = parsedate_to_datetime(msg["Date"])
+        # parsedate_to_datetime() may return a naive timezone - treat as UTC
+        if review_time.tzinfo is None or review_time.tzinfo.utcoffset(review_time) is None:
+            review_time = review_time.replace(tzinfo=datetime.UTC)
 
     # by
     by = None
@@ -300,3 +304,22 @@ def add_review_comment(doc_name, review_time, by, comment):
         e.by = by
 
         e.save()
+
+
+def ingest_review_email(message: bytes):
+    from ietf.api.views import EmailIngestionError  # avoid circular import
+    try:
+        doc_name, review_time, by, comment = parse_review_email(message)
+    except Exception as err:
+        raise EmailIngestionError("Unable to parse message as IANA review email") from err
+    log(f"Read IANA review email for {doc_name} at {review_time} by {by}")
+    if by.name == "(System)":
+        log("WARNING: person responsible for email does not have a IANA role")  # (sic)
+    try:
+        add_review_comment(doc_name, review_time, by, comment)
+    except Document.DoesNotExist:
+        log(f"ERROR: unknown document {doc_name}")
+        raise EmailIngestionError(f"Unknown document {doc_name}")
+    except Exception as err:
+        raise EmailIngestionError("Error ingesting IANA review email") from err
+    
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
index c2264a0d3a..aa0e643b20 100644
--- a/ietf/sync/rfceditor.py
+++ b/ietf/sync/rfceditor.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -7,27 +7,33 @@
 import re
 import requests
 
+from typing import Iterator, Optional, Union
 from urllib.parse import urlencode
 from xml.dom import pulldom, Node
 
 from django.conf import settings
-from django.utils.encoding import smart_bytes, force_str, force_text
+from django.db import transaction
+from django.db.models import Subquery, OuterRef, F, Q
+from django.utils import timezone
+from django.utils.encoding import smart_bytes, force_str
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import ( Document, DocAlias, State, StateType, DocEvent, DocRelationshipName,
-    DocTagName, DocTypeName, RelatedDocument )
+from ietf.doc.models import ( Document, State, StateType, DocEvent, DocRelationshipName,
+    DocTagName, RelatedDocument, RelatedDocHistory )
 from ietf.doc.expire import move_draft_files_to_archive
-from ietf.doc.utils import add_state_change_event, prettify_std_name, update_action_holders
+from ietf.doc.utils import add_state_change_event, new_state_change_event, prettify_std_name, update_action_holders
 from ietf.group.models import Group
+from ietf.ipr.models import IprDocRel
 from ietf.name.models import StdLevelName, StreamName
 from ietf.person.models import Person
 from ietf.utils.log import log
 from ietf.utils.mail import send_mail_text
+from ietf.utils.timezone import datetime_from_date, RPC_TZINFO
 
-#QUEUE_URL = "https://www.rfc-editor.org/queue2.xml"
-#INDEX_URL = "https://www.rfc-editor.org/rfc/rfc-index.xml"
-#POST_APPROVED_DRAFT_URL = "https://www.rfc-editor.org/sdev/jsonexp/jsonparser.php"
+# QUEUE_URL = "https://www.rfc-editor.org/queue2.xml"
+# INDEX_URL = "https://www.rfc-editor.org/rfc/rfc-index.xml"
+# POST_APPROVED_DRAFT_URL = "https://www.rfc-editor.org/sdev/jsonexp/jsonparser.php"
 
 MIN_ERRATA_RESULTS = 5000
 MIN_INDEX_RESULTS = 8000
@@ -109,6 +115,8 @@ def parse_queue(response):
                     stream = "irtf"
                 elif name.startswith("INDEPENDENT"):
                     stream = "ise"
+                elif name.startswith("Editorial Stream"):
+                    stream = "editorial"
                 else:
                     stream = None
                     warnings.append("unrecognized section " + name)
@@ -153,7 +161,7 @@ def update_drafts_from_queue(drafts):
     names = [t[0] for t in drafts]
 
     drafts_in_db = dict((d.name, d)
-                        for d in Document.objects.filter(type="draft", docalias__name__in=names))
+                        for d in Document.objects.filter(type="draft", name__in=names))
 
     changed = set()
 
@@ -197,11 +205,14 @@ def update_drafts_from_queue(drafts):
         if prev_state != next_state:
             d.set_state(next_state)
 
-            e = add_state_change_event(d, system, prev_state, next_state)
+            e = new_state_change_event(d, system, prev_state, next_state)  # unsaved
+            if e:
+                if auth48:
+                    e.desc = re.sub(r"(<b>.*</b>)", "<a href=\"%s\">\\1</a>" % auth48, e.desc)
+                e.save()
+                events.append(e)
 
             if auth48:
-                e.desc = re.sub(r"(<b>.*</b>)", "<a href=\"%s\">\\1</a>" % auth48, e.desc)
-                e.save()
                 # Create or update the auth48 URL whether or not this is a state expected to have one.
                 d.documenturl_set.update_or_create(
                     tag_id='auth48',  # look up existing based on this field
@@ -210,8 +221,6 @@ def update_drafts_from_queue(drafts):
             else:
                 # Remove any existing auth48 URL when an update does not have one.
                 d.documenturl_set.filter(tag_id='auth48').delete()
-            if e:
-                events.append(e)
 
             changed.add(name)
 
@@ -226,7 +235,7 @@ def update_drafts_from_queue(drafts):
 
 
     # remove tags and states for those not in the queue anymore
-    for d in Document.objects.exclude(docalias__name__in=names).filter(states__type="draft-rfceditor").distinct():
+    for d in Document.objects.exclude(name__in=names).filter(states__type="draft-rfceditor").distinct():
         d.tags.remove(*list(tag_mapping.values()))
         d.unset_state("draft-rfceditor")
         # we do not add a history entry here - most likely we already
@@ -324,20 +333,28 @@ def extract_doc_list(parentNode, tagName):
             log("node: %s" % node)
             raise
     for d in data:
-        k = "RFC%04d" % d[0]
+        k = "RFC%d" % d[0]
         if k in also_list:
             d[9].extend(also_list[k])
     return data
 
 
-def update_docs_from_rfc_index(index_data, errata_data, skip_older_than_date=None):
-    """Given parsed data from the RFC Editor index, update the documents
-    in the database. Yields a list of change descriptions for each
-    document, if any."""
+def update_docs_from_rfc_index(
+    index_data, errata_data, skip_older_than_date: Optional[datetime.date] = None
+) -> Iterator[tuple[int, list[str], Document, bool]]:
+    """Given parsed data from the RFC Editor index, update the documents in the database
+
+    Returns an iterator that yields (rfc_number, change_list, doc, rfc_published) for the
+    RFC document and, if applicable, the I-D that it came from.
 
-    errata = {}
+    The skip_older_than_date is a bare date, not a datetime.
+    """
+    # Create dict mapping doc-id to list of errata records that apply to it
+    errata: dict[str, list[dict]] = {}
     for item in errata_data:
-        name = item['doc-id']
+        name = item["doc-id"]
+        if name.upper().startswith("RFC"):
+            name = f"RFC{int(name[3:])}"  # removes leading 0s on the rfc number
         if not name in errata:
             errata[name] = []
         errata[name].append(item)
@@ -352,98 +369,256 @@ def update_docs_from_rfc_index(index_data, errata_data, skip_older_than_date=Non
         "Best Current Practice": StdLevelName.objects.get(slug="bcp"),
         "Historic": StdLevelName.objects.get(slug="hist"),
         "Unknown": StdLevelName.objects.get(slug="unkn"),
-        }
+    }
 
     stream_mapping = {
         "IETF": StreamName.objects.get(slug="ietf"),
         "INDEPENDENT": StreamName.objects.get(slug="ise"),
         "IRTF": StreamName.objects.get(slug="irtf"),
         "IAB": StreamName.objects.get(slug="iab"),
+        "Editorial": StreamName.objects.get(slug="editorial"),
         "Legacy": StreamName.objects.get(slug="legacy"),
     }
 
-    tag_has_errata = DocTagName.objects.get(slug='errata')
-    tag_has_verified_errata = DocTagName.objects.get(slug='verified-errata')
+    tag_has_errata = DocTagName.objects.get(slug="errata")
+    tag_has_verified_errata = DocTagName.objects.get(slug="verified-errata")
     relationship_obsoletes = DocRelationshipName.objects.get(slug="obs")
     relationship_updates = DocRelationshipName.objects.get(slug="updates")
+    rfc_published_state = State.objects.get(type_id="rfc", slug="published")
 
     system = Person.objects.get(name="(System)")
 
-    for rfc_number, title, authors, rfc_published_date, current_status, updates, updated_by, obsoletes, obsoleted_by, also, draft, has_errata, stream, wg, file_formats, pages, abstract in index_data:
-
+    first_sync_creating_subseries = not Document.objects.filter(type_id__in=["bcp","std","fyi"]).exists()
+
+    for (
+        rfc_number,
+        title,
+        authors,
+        rfc_published_date,
+        current_status,
+        updates,
+        updated_by,
+        obsoletes,
+        obsoleted_by,
+        also,
+        draft_name,
+        has_errata,
+        stream,
+        wg,
+        file_formats,
+        pages,
+        abstract,
+    ) in index_data:
         if skip_older_than_date and rfc_published_date < skip_older_than_date:
-            # speed up the process by skipping old entries
+            # speed up the process by skipping old entries (n.b., the comparison above is a
+            # lexical comparison between "YYYY-MM-DD"-formatted dates)
             continue
 
         # we assume two things can happen: we get a new RFC, or an
         # attribute has been updated at the RFC Editor (RFC Editor
         # attributes take precedence over our local attributes)
-        events = []
-        changes = []
+        rfc_events = []
+        rfc_changes = []
         rfc_published = False
 
-        # make sure we got the document and alias
-        doc = None
-        name = "rfc%s" % rfc_number
-        a = DocAlias.objects.filter(name=name)
-        if a:
-            doc = a[0].document
-        else:
+        # Find the draft, if any
+        draft = None
+        if draft_name:
+            try:
+                draft = Document.objects.get(name=draft_name, type_id="draft")
+            except Document.DoesNotExist:
+                pass
+                # Logging below warning turns out to be unhelpful - there are many references
+                # to such things in the index:
+                # * all april-1 RFCs have an internal name that looks like a draft name, but there
+                # was never such a draft. More of these will exist in the future
+                # * Several documents were created with out-of-band input to the RFC-editor, for a
+                # variety of reasons.
+                #
+                # What this exposes is that the rfc-index needs to stop talking about these things.
+                # If there is no draft to point to, don't point to one, even if there was an RPC
+                # internal name in use (and in the RPC database). This will be a requirement on the
+                # reimplementation of the creation of the rfc-index.
+                #
+                # log(f"Warning: RFC index for {rfc_number} referred to unknown draft {draft_name}")
+
+        # Find or create the RFC document
+        creation_args: dict[str, Optional[Union[str, int]]] = {"name": f"rfc{rfc_number}"}
+        if draft:
+            creation_args.update(
+                {
+                    "title": draft.title,
+                    "stream": draft.stream,
+                    "group": draft.group,
+                    "abstract": draft.abstract,
+                    "pages": draft.pages,
+                    "words": draft.words,
+                    "std_level": draft.std_level,
+                    "ad": draft.ad,
+                    "external_url": draft.external_url,
+                    "uploaded_filename": draft.uploaded_filename,
+                    "note": draft.note,
+                }
+            )
+        doc, created_rfc = Document.objects.get_or_create(
+            rfc_number=rfc_number, type_id="rfc", defaults=creation_args
+        )
+        if created_rfc:
+            rfc_changes.append(f"created document {prettify_std_name(doc.name)}")
+            doc.set_state(rfc_published_state)
             if draft:
-                try:
-                    doc = Document.objects.get(name=draft)
-                except Document.DoesNotExist:
-                    pass
-
-            if not doc:
-                changes.append("created document %s" % prettify_std_name(name))
-                doc = Document.objects.create(name=name, type=DocTypeName.objects.get(slug="draft"))
-
-            # add alias
-            alias, __ = DocAlias.objects.get_or_create(name=name)
-            alias.docs.add(doc)
-            changes.append("created alias %s" % prettify_std_name(name))
+                doc.formal_languages.set(draft.formal_languages.all())
+                # Create authors based on the last draft in the datatracker. This
+                # path will go away when we publish via the modernized RPC workflow
+                # but until then, these are the only data we have for authors that
+                # are easily connected to Person records.
+                for documentauthor in draft.documentauthor_set.all():
+                    # Copy the author but point at the new doc.
+                    # See https://docs.djangoproject.com/en/4.2/topics/db/queries/#copying-model-instances
+                    documentauthor.pk = None
+                    documentauthor.id = None
+                    documentauthor._state.adding = True
+                    documentauthor.document = doc
+                    documentauthor.save()
+
+        if draft:
+            draft_events = []
+            draft_changes = []
+
+            # Ensure the draft is in the "rfc" state and move its files to the archive
+            # if necessary.
+            if draft.get_state_slug() != "rfc":
+                draft.set_state(
+                    State.objects.get(used=True, type="draft", slug="rfc")
+                )
+                move_draft_files_to_archive(draft, draft.rev)
+                draft_changes.append(f"changed state to {draft.get_state()}")
+
+            # Ensure the draft and rfc are linked with a "became_rfc" relationship
+            r, created_relateddoc = RelatedDocument.objects.get_or_create(
+                source=draft, target=doc, relationship_id="became_rfc"
+            )
+            if created_relateddoc:
+                change = "created {rel_name} relationship between {pretty_draft_name} and {pretty_rfc_name}".format(
+                    rel_name=r.relationship.name.lower(),
+                    pretty_draft_name=prettify_std_name(draft_name),
+                    pretty_rfc_name=prettify_std_name(doc.name),
+                )
+                draft_changes.append(change)
+                rfc_changes.append(change)
+
+            # Always set the "draft-iesg" state. This state should be set for all drafts, so
+            # log a warning if it is not set. What should happen here is that ietf stream
+            # RFCs come in as "rfcqueue" and are set to "pub" when they appear in the RFC index.
+            # Other stream documents should normally be "idexists" and be left that way. The
+            # code here *actually* leaves "draft-iesg" state alone if it is "idexists" or "pub",
+            # and changes any other state to "pub". If unset, it changes it to "idexists".
+            # This reflects historical behavior and should probably be updated, but a migration
+            # of existing drafts (and validation of the change) is needed before we change the
+            # handling.
+            prev_iesg_state = draft.get_state("draft-iesg")
+            if prev_iesg_state is None:
+                log(f'Warning while processing {doc.name}: {draft.name} has no "draft-iesg" state')
+                new_iesg_state = State.objects.get(type_id="draft-iesg", slug="idexists")
+            elif prev_iesg_state.slug not in ("pub", "idexists"):
+                if prev_iesg_state.slug != "rfcqueue":
+                    log(
+                        'Warning while processing {}: {} is in "draft-iesg" state {} (expected "rfcqueue")'.format(
+                            doc.name, draft.name, prev_iesg_state.slug
+                        )
+                    )
+                new_iesg_state = State.objects.get(type_id="draft-iesg", slug="pub")
+            else:
+                new_iesg_state = prev_iesg_state
+
+            if new_iesg_state != prev_iesg_state:
+                draft.set_state(new_iesg_state)
+                draft_changes.append(f"changed {new_iesg_state.type.label} to {new_iesg_state}")
+                e = update_action_holders(draft, prev_iesg_state, new_iesg_state)
+                if e:
+                    draft_events.append(e)
+
+            # If the draft and RFC streams agree, move draft to "pub" stream state. If not, complain.
+            if draft.stream != doc.stream:
+                log("Warning while processing {}: draft {} stream is {} but RFC stream is {}".format(
+                    doc.name, draft.name, draft.stream, doc.stream
+                ))
+            elif draft.stream.slug in ["iab", "irtf", "ise"]:
+                stream_slug = f"draft-stream-{draft.stream.slug}"
+                prev_state = draft.get_state(stream_slug)
+                if prev_state is not None and prev_state.slug != "pub":
+                    new_state = State.objects.select_related("type").get(used=True, type__slug=stream_slug, slug="pub")
+                    draft.set_state(new_state)
+                    draft_changes.append(
+                        f"changed {new_state.type.label} to {new_state}"
+                    )
+                    e = update_action_holders(draft, prev_state, new_state)
+                    if e:
+                        draft_events.append(e)
+            if draft_changes:
+                draft_events.append(
+                    DocEvent.objects.create(
+                        doc=draft,
+                        rev=doc.rev,
+                        by=system,
+                        type="sync_from_rfc_editor",
+                        desc=f"Received changes through RFC Editor sync ({', '.join(draft_changes)})",
+                    )
+                )
+                draft.save_with_history(draft_events)
+                yield rfc_number, draft_changes, draft, False  # yield changes to the draft
 
         # check attributes
+        verbed = "set" if created_rfc else "changed"
         if title != doc.title:
             doc.title = title
-            changes.append("changed title to '%s'" % doc.title)
+            rfc_changes.append(f"{verbed} title to '{doc.title}'")
 
         if abstract and abstract != doc.abstract:
             doc.abstract = abstract
-            changes.append("changed abstract to '%s'" % doc.abstract)
+            rfc_changes.append(f"{verbed} abstract to '{doc.abstract}'")
 
         if pages and int(pages) != doc.pages:
             doc.pages = int(pages)
-            changes.append("changed pages to %s" % doc.pages)
+            rfc_changes.append(f"{verbed} pages to {doc.pages}")
 
         if std_level_mapping[current_status] != doc.std_level:
             doc.std_level = std_level_mapping[current_status]
-            changes.append("changed standardization level to %s" % doc.std_level)
-
-        if doc.get_state_slug() != "rfc":
-            doc.set_state(State.objects.get(used=True, type="draft", slug="rfc"))
-            move_draft_files_to_archive(doc, doc.rev)
-            changes.append("changed state to %s" % doc.get_state())
+            rfc_changes.append(f"{verbed} standardization level to {doc.std_level}")
 
         if doc.stream != stream_mapping[stream]:
             doc.stream = stream_mapping[stream]
-            changes.append("changed stream to %s" % doc.stream)
+            rfc_changes.append(f"{verbed} stream to {doc.stream}")
+
+        if doc.get_state() != rfc_published_state:
+            doc.set_state(rfc_published_state)
+            rfc_changes.append(f"{verbed} {rfc_published_state.type.label} to {rfc_published_state}")
 
-        if not doc.group: # if we have no group assigned, check if RFC Editor has a suggestion
+        # if we have no group assigned, check if RFC Editor has a suggestion
+        if not doc.group:  
             if wg:
                 doc.group = Group.objects.get(acronym=wg)
-                changes.append("set group to %s" % doc.group)
+                rfc_changes.append(f"set group to {doc.group}")
             else:
-                doc.group = Group.objects.get(type="individ") # fallback for newly created doc
+                doc.group = Group.objects.get(
+                    type="individ"
+                )  # fallback for newly created doc
 
         if not doc.latest_event(type="published_rfc"):
             e = DocEvent(doc=doc, rev=doc.rev, type="published_rfc")
             # unfortunately, rfc_published_date doesn't include the correct day
             # at the moment because the data only has month/year, so
             # try to deduce it
-            d = datetime.datetime.combine(rfc_published_date, datetime.time())
-            synthesized = datetime.datetime.now()
+            #
+            # Note: This is in done PST8PDT to preserve compatibility with events created when
+            # USE_TZ was False. The published_rfc event was created with a timestamp whose
+            # server-local datetime (PST8PDT) matched the publication date from the RFC index.
+            # When switching to USE_TZ=True, the timestamps were migrated so they still
+            # matched the publication date in PST8PDT. When interpreting the event timestamp
+            # as a publication date, you must treat it in the PST8PDT time zone. The
+            # RPC_TZINFO constant in ietf.utils.timezone is defined for this purpose.
+            d = datetime_from_date(rfc_published_date, RPC_TZINFO)
+            synthesized = timezone.now().astimezone(RPC_TZINFO)
             if abs(d - synthesized) > datetime.timedelta(days=60):
                 synthesized = d
             else:
@@ -454,90 +629,222 @@ def update_docs_from_rfc_index(index_data, errata_data, skip_older_than_date=Non
             e.by = system
             e.desc = "RFC published"
             e.save()
-            events.append(e)
+            rfc_events.append(e)
 
-            changes.append("added RFC published event at %s" % e.time.strftime("%Y-%m-%d"))
+            rfc_changes.append(
+                f"added RFC published event at {e.time.strftime('%Y-%m-%d')}"
+            )
             rfc_published = True
 
-        for t in ("draft-iesg", "draft-stream-iab", "draft-stream-irtf", "draft-stream-ise"):
-            prev_state = doc.get_state(t)
-            if prev_state is not None:
-                if prev_state.slug not in ("pub", "idexists"):
-                    new_state = State.objects.select_related("type").get(used=True, type=t, slug="pub")
-                    doc.set_state(new_state)
-                    changes.append("changed %s to %s" % (new_state.type.label, new_state))
-                    e = update_action_holders(doc, prev_state, new_state)
-                    if e:
-                        events.append(e)
-            elif t == 'draft-iesg':
-                doc.set_state(State.objects.get(type_id='draft-iesg', slug='idexists'))
-
-        def parse_relation_list(l):
-            res = []
-            for x in l:
-                if x[:3] in ("NIC", "IEN", "STD", "RTR"):
-                    # try translating this to RFCs that we can handle
-                    # sensibly; otherwise we'll have to ignore them
-                    l = DocAlias.objects.filter(name__startswith="rfc", docs__docalias__name=x.lower())
-                else:
-                    l = DocAlias.objects.filter(name=x.lower())
-
-                for a in l:
-                    if a not in res:
-                        res.append(a)
-            return res
-
-        for x in parse_relation_list(obsoletes):
-            if not RelatedDocument.objects.filter(source=doc, target=x, relationship=relationship_obsoletes):
-                r = RelatedDocument.objects.create(source=doc, target=x, relationship=relationship_obsoletes)
-                changes.append("created %s relation between %s and %s" % (r.relationship.name.lower(), prettify_std_name(r.source.name), prettify_std_name(r.target.name)))
-
-        for x in parse_relation_list(updates):
-            if not RelatedDocument.objects.filter(source=doc, target=x, relationship=relationship_updates):
-                r = RelatedDocument.objects.create(source=doc, target=x, relationship=relationship_updates)
-                changes.append("created %s relation between %s and %s" % (r.relationship.name.lower(), prettify_std_name(r.source.name), prettify_std_name(r.target.name)))
+        def parse_relation_list(rel_list: list[str]) -> list[Document]:
+            return list(
+                Document.objects.filter(
+                    name__in=[name.strip().lower() for name in rel_list],
+                    type_id="rfc"
+                )
+            )
+
+        # Create missing obsoletes relations
+        docs_this_obsoletes = parse_relation_list(obsoletes)
+        for obs_doc in docs_this_obsoletes:
+            if not doc.relateddocument_set.filter(
+                target=obs_doc, relationship=relationship_obsoletes
+            ):
+                r = doc.relateddocument_set.create(
+                    target=obs_doc, relationship=relationship_obsoletes
+                )
+                rfc_changes.append(
+                    "created {rel_name} relation between {src} and {tgt}".format(
+                        rel_name=r.relationship.name.lower(),
+                        src=prettify_std_name(r.source.name),
+                        tgt=prettify_std_name(r.target.name),
+                    )
+                )
+        # Remove stale obsoletes relations
+        for r in doc.relateddocument_set.filter(
+            relationship=relationship_obsoletes
+        ).exclude(target_id__in=[d.pk for d in docs_this_obsoletes]):
+            r.delete()
+            rfc_changes.append(
+                "removed {rel_name} relation between {src} and {tgt}".format(
+                    rel_name=r.relationship.name.lower(),
+                    src=prettify_std_name(r.source.name),
+                    tgt=prettify_std_name(r.target.name),
+                )
+            )
+
+        docs_this_updates = parse_relation_list(updates)
+        for upd_doc in docs_this_updates:
+            if not RelatedDocument.objects.filter(
+                source=doc, target=upd_doc, relationship=relationship_updates
+            ):
+                r = doc.relateddocument_set.create(
+                    target=upd_doc, relationship=relationship_updates
+                )
+                rfc_changes.append(
+                    "created {rel_name} relation between {src} and {tgt}".format(
+                        rel_name=r.relationship.name.lower(),
+                        src=prettify_std_name(r.source.name),
+                        tgt=prettify_std_name(r.target.name),
+                    )
+                )
+        # Remove stale updates relations
+        for r in doc.relateddocument_set.filter(
+            relationship=relationship_updates
+        ).exclude(target_id__in=[d.pk for d in docs_this_updates]):
+            r.delete()
+            rfc_changes.append(
+                "removed {rel_name} relation between {src} and {tgt}".format(
+                    rel_name=r.relationship.name.lower(),
+                    src=prettify_std_name(r.source.name),
+                    tgt=prettify_std_name(r.target.name),
+                )
+            )
 
         if also:
+            # recondition also to have proper subseries document names:
+            conditioned_also = []
             for a in also:
                 a = a.lower()
-                if not DocAlias.objects.filter(name=a):
-                    DocAlias.objects.create(name=a).docs.add(doc)
-                    changes.append("created alias %s" % prettify_std_name(a))
+                subseries_slug = a[:3]
+                if subseries_slug not in ["bcp", "std", "fyi"]:
+                    log(f"Unexpected 'also' relationship of {a} encountered for {doc}")
+                    continue
+                maybe_number = a[3:].strip()
+                if not maybe_number.isdigit():
+                    log(f"Unexpected 'also' subseries element identifier {a} encountered for {doc}")
+                    continue
+                else:
+                    subseries_number = int(maybe_number)
+                    conditioned_also.append(f"{subseries_slug}{subseries_number}") # Note the lack of leading zeros
+            also = conditioned_also
 
-        doc_errata = errata.get('RFC%04d'%rfc_number, [])
-        all_rejected = doc_errata and all( er['errata_status_code']=='Rejected' for er in doc_errata )
+            for a in also:
+                subseries_doc_name = a
+                subseries_slug=a[:3]
+                # Leaving most things to the default intentionally
+                # Of note, title and stream are left to the defaults of "" and none.
+                subseries_doc, created = Document.objects.get_or_create(type_id=subseries_slug, name=subseries_doc_name)
+                if created:
+                    if first_sync_creating_subseries:
+                        subseries_doc.docevent_set.create(type=f"{subseries_slug}_history_marker", by=system, desc=f"No history of this {subseries_slug.upper()} document is currently available in the datatracker before this point")
+                        subseries_doc.docevent_set.create(type=f"{subseries_slug}_doc_created", by=system, desc=f"Imported {subseries_doc_name} into the datatracker via sync to the rfc-index")
+                    else:
+                        subseries_doc.docevent_set.create(type=f"{subseries_slug}_doc_created", by=system, desc=f"Created {subseries_doc_name} via sync to the rfc-index")
+                _, relationship_created = subseries_doc.relateddocument_set.get_or_create(relationship_id="contains", target=doc)
+                if relationship_created:
+                    if first_sync_creating_subseries:
+                        subseries_doc.docevent_set.create(type="sync_from_rfc_editor", by=system, desc=f"Imported membership of {doc.name} in {subseries_doc.name} via sync to the rfc-index")
+                        rfc_events.append(doc.docevent_set.create(type=f"{subseries_slug}_history_marker", by=system, desc=f"No history of {subseries_doc.name.upper()} is currently available in the datatracker before this point"))
+                        rfc_events.append(doc.docevent_set.create(type="sync_from_rfc_editor", by=system, desc=f"Imported membership of {doc.name} in {subseries_doc.name} via sync to the rfc-index"))
+                    else:
+                        subseries_doc.docevent_set.create(type="sync_from_rfc_editor", by=system, desc=f"Added {doc.name} to {subseries_doc.name}")
+                        rfc_events.append(doc.docevent_set.create(type="sync_from_rfc_editor", by=system, desc=f"Added {doc.name} to {subseries_doc.name}"))
+
+        # Delete subseries relations that are no longer current. Use a transaction
+        # so we are sure we iterate over the same relations that we delete!
+        with transaction.atomic():
+            stale_subseries_relations = doc.relations_that("contains").exclude(
+                source__name__in=also
+            )
+            for stale_relation in stale_subseries_relations:
+                stale_subseries_doc = stale_relation.source
+                rfc_events.append(
+                    doc.docevent_set.create(
+                        type="sync_from_rfc_editor",
+                        by=system,
+                        desc=f"Removed {doc.name} from {stale_subseries_doc.name}",
+                    )
+                )
+                stale_subseries_doc.docevent_set.create(
+                    type="sync_from_rfc_editor",
+                    by=system,
+                    desc=f"Removed {doc.name} from {stale_subseries_doc.name}",
+                )
+            stale_subseries_relations.delete()
+
+        doc_errata = errata.get(f"RFC{rfc_number}", [])
+        all_rejected = doc_errata and all(
+            er["errata_status_code"] == "Rejected" for er in doc_errata
+        )
         if has_errata and not all_rejected:
             if not doc.tags.filter(pk=tag_has_errata.pk).exists():
                 doc.tags.add(tag_has_errata)
-                changes.append("added Errata tag")
-            has_verified_errata = any([ er['errata_status_code']=='Verified' for er in doc_errata ])
-            if has_verified_errata and not doc.tags.filter(pk=tag_has_verified_errata.pk).exists():
+                rfc_changes.append("added Errata tag")
+            has_verified_errata = any(
+                [er["errata_status_code"] == "Verified" for er in doc_errata]
+            )
+            if (
+                has_verified_errata
+                and not doc.tags.filter(pk=tag_has_verified_errata.pk).exists()
+            ):
                 doc.tags.add(tag_has_verified_errata)
-                changes.append("added Verified Errata tag")
+                rfc_changes.append("added Verified Errata tag")
         else:
             if doc.tags.filter(pk=tag_has_errata.pk):
                 doc.tags.remove(tag_has_errata)
                 if all_rejected:
-                    changes.append("removed Errata tag (all errata rejected)")
+                    rfc_changes.append("removed Errata tag (all errata rejected)")
                 else:
-                    changes.append("removed Errata tag")
+                    rfc_changes.append("removed Errata tag")
             if doc.tags.filter(pk=tag_has_verified_errata.pk):
                 doc.tags.remove(tag_has_verified_errata)
-                changes.append("removed Verified Errata tag")
-
-        if changes:
-            events.append(DocEvent.objects.create(
-                doc=doc,
-                rev=doc.rev,
-                by=system,
-                type="sync_from_rfc_editor",
-                desc="Received changes through RFC Editor sync (%s)" % ", ".join(changes),
-            ))
-
-            doc.save_with_history(events)
-
-        if changes:
-            yield changes, doc, rfc_published
+                rfc_changes.append("removed Verified Errata tag")
+
+        if rfc_changes:
+            rfc_events.append(
+                DocEvent.objects.create(
+                    doc=doc,
+                    rev=doc.rev,
+                    by=system,
+                    type="sync_from_rfc_editor",
+                    desc=f"Received changes through RFC Editor sync ({', '.join(rfc_changes)})",
+                )
+            )
+            doc.save_with_history(rfc_events)
+            yield rfc_number, rfc_changes, doc, rfc_published  # yield changes to the RFC
+
+    if first_sync_creating_subseries:
+        # First - create the known subseries documents that have ghosted.
+        # The RFC editor (as of 31 Oct 2023) claims these subseries docs do not exist.
+        # The datatracker, on the other hand, will say that the series doc currently contains no RFCs.
+        for name in ["fyi17", "std1", "bcp12", "bcp113", "bcp66"]:
+            # Leaving most things to the default intentionally
+            # Of note, title and stream are left to the defaults of "" and none.
+            subseries_doc, created = Document.objects.get_or_create(type_id=name[:3], name=name)
+            if not created:
+                log(f"Warning: {name} unexpectedly already exists")
+            else:
+                subseries_slug = name[:3]
+                subseries_doc.docevent_set.create(type=f"{subseries_slug}_history_marker", by=system, desc=f"No history of this {subseries_slug.upper()} document is currently available in the datatracker before this point")
+
+        RelatedDocument.objects.filter(
+            Q(originaltargetaliasname__startswith="bcp") |
+            Q(originaltargetaliasname__startswith="std") |
+            Q(originaltargetaliasname__startswith="fyi")
+        ).annotate(
+            subseries_target=Subquery(
+                Document.objects.filter(name=OuterRef("originaltargetaliasname")).values_list("pk",flat=True)[:1]
+            )
+        ).update(target=F("subseries_target"))
+        RelatedDocHistory.objects.filter(
+            Q(originaltargetaliasname__startswith="bcp") |
+            Q(originaltargetaliasname__startswith="std") |
+            Q(originaltargetaliasname__startswith="fyi")
+        ).annotate(
+            subseries_target=Subquery(
+                Document.objects.filter(name=OuterRef("originaltargetaliasname")).values_list("pk",flat=True)[:1]
+            )
+        ).update(target=F("subseries_target"))
+        IprDocRel.objects.filter(
+            Q(originaldocumentaliasname__startswith="bcp") |
+            Q(originaldocumentaliasname__startswith="std") |
+            Q(originaldocumentaliasname__startswith="fyi")
+        ).annotate(
+            subseries_target=Subquery(
+                Document.objects.filter(name=OuterRef("originaldocumentaliasname")).values_list("pk",flat=True)[:1]
+            )
+        ).update(document=F("subseries_target"))
 
 
 def post_approved_draft(url, name):
@@ -545,6 +852,10 @@ def post_approved_draft(url, name):
     the data from the Datatracker and start processing it. Returns
     response and error (empty string if no error)."""
 
+    if settings.SERVER_MODE != "production":
+        log(f"In production, would have posted RFC-Editor notification of approved I-D '{name}' to '{url}'")
+        return "", ""
+
     # HTTP basic auth
     username = "dtracksync"
     password = settings.RFC_EDITOR_SYNC_PASSWORD
@@ -554,7 +865,7 @@ def post_approved_draft(url, name):
             "Authorization": "Basic %s" % force_str(base64.encodebytes(smart_bytes("%s:%s" % (username, password)))).replace("\n", ""),
         }
 
-    log("Posting RFC-Editor notifcation of approved draft '%s' to '%s'" % (name, url))
+    log("Posting RFC-Editor notification of approved Internet-Draft '%s' to '%s'" % (name, url))
     text = error = ""
 
     try:
@@ -565,18 +876,18 @@ def post_approved_draft(url, name):
             timeout=settings.DEFAULT_REQUESTS_TIMEOUT,
         )
 
-        log("RFC-Editor notification result for draft '%s': %s:'%s'" % (name, r.status_code, r.text))
+        log("RFC-Editor notification result for Internet-Draft '%s': %s:'%s'" % (name, r.status_code, r.text))
 
         if r.status_code != 200:
             raise RuntimeError("Status code is not 200 OK (it's %s)." % r.status_code)
 
-        if force_text(r.text) != "OK":
+        if force_str(r.text) != "OK":
             raise RuntimeError('Response is not "OK" (it\'s "%s").' % r.text)
 
     except Exception as e:
         # catch everything so we don't leak exceptions, convert them
         # into string instead
-        msg = "Exception on RFC-Editor notification for draft '%s': %s: %s" % (name, type(e), str(e))
+        msg = "Exception on RFC-Editor notification for Internet-Draft '%s': %s: %s" % (name, type(e), str(e))
         log(msg)
         if settings.SERVER_MODE == 'test':
             debug.say(msg)
diff --git a/ietf/sync/rfcindex.py b/ietf/sync/rfcindex.py
new file mode 100644
index 0000000000..d1a0ed432f
--- /dev/null
+++ b/ietf/sync/rfcindex.py
@@ -0,0 +1,791 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+import datetime
+import json
+from collections import defaultdict
+from collections.abc import Container
+from dataclasses import dataclass
+from itertools import chain
+from operator import attrgetter, itemgetter
+from pathlib import Path
+from textwrap import fill
+from urllib.parse import urljoin
+
+from django.conf import settings
+from django.core.files.base import ContentFile
+from django.db.models import Q
+from lxml import etree
+
+from django.core.files.storage import storages
+from django.db import models
+from django.db.models.functions import Substr, Cast
+from django.template.loader import render_to_string
+from django.utils import timezone
+
+from ietf.doc.models import Document
+from ietf.name.models import StdLevelName
+from ietf.utils.log import log
+from ietf.utils.models import DirtyBits
+
+FORMATS_FOR_INDEX = ["txt", "html", "pdf", "xml", "ps"]
+SS_TXT_MARGIN = 3
+SS_TXT_CUE_COL_WIDTH = 14
+
+
+def format_rfc_number(n):
+    """Format an RFC number (or subseries doc number)
+
+    Set settings.RFCINDEX_MATCH_LEGACY_XML=True for the legacy (leading-zero) format.
+    That is for debugging only - tests will fail.
+    """
+    if getattr(settings, "RFCINDEX_MATCH_LEGACY_XML", False):
+        return format(n, "04")
+    else:
+        return format(n)
+
+
+def errata_url(rfc: Document):
+    return urljoin(settings.RFC_EDITOR_ERRATA_BASE_URL + "/", f"rfc{rfc.rfc_number}")
+
+
+def save_to_red_bucket(filename: str, content: str | bytes):
+    red_bucket = storages["red_bucket"]
+    bucket_path = str(Path(getattr(settings, "RFCINDEX_OUTPUT_PATH", "")) / filename)
+    if getattr(settings, "RFCINDEX_DELETE_THEN_WRITE", True):
+        # Django 4.2's FileSystemStorage does not support allow_overwrite.
+        red_bucket.delete(bucket_path)
+    red_bucket.save(
+        bucket_path,
+        ContentFile(content if isinstance(content, bytes) else content.encode("utf-8")),
+    )
+    log(f"Saved {bucket_path} in red_bucket storage")
+
+
+@dataclass
+class UnusableRfcNumber:
+    rfc_number: int
+    comment: str
+
+
+def get_unusable_rfc_numbers() -> list[UnusableRfcNumber]:
+    FILENAME = "unusable-rfc-numbers.json"
+    bucket_path = str(Path(getattr(settings, "RFCINDEX_INPUT_PATH", "")) / FILENAME)
+    try:
+        with storages["red_bucket"].open(bucket_path) as urn_file:
+            records = json.load(urn_file)
+    except FileNotFoundError:
+        if settings.SERVER_MODE == "development":
+            log(
+                f"Unable to open {bucket_path} in red_bucket storage. This is okay in dev "
+                "but generated rfc-index will not agree with RFC Editor values."
+            )  # pragma: no cover
+            return []  # pragma: no cover
+        log(f"Error: unable to open {bucket_path} in red_bucket storage")
+        raise
+    except json.JSONDecodeError:
+        log(f"Error: unable to parse {bucket_path} in red_bucket storage")
+        if settings.SERVER_MODE == "development":
+            return []  # pragma: no cover
+        raise
+    assert all(isinstance(record["number"], int) for record in records)
+    assert all(isinstance(record["comment"], str) for record in records)
+    return [
+        UnusableRfcNumber(rfc_number=record["number"], comment=record["comment"])
+        for record in sorted(records, key=itemgetter("number"))
+    ]
+
+
+def get_april1_rfc_numbers() -> Container[int]:
+    FILENAME = "april-first-rfc-numbers.json"
+    bucket_path = str(Path(getattr(settings, "RFCINDEX_INPUT_PATH", "")) / FILENAME)
+    try:
+        with storages["red_bucket"].open(bucket_path) as urn_file:
+            records = json.load(urn_file)
+    except FileNotFoundError:
+        if settings.SERVER_MODE == "development":
+            log(
+                f"Unable to open {bucket_path} in red_bucket storage. This is okay in dev "
+                "but generated rfc-index will not agree with RFC Editor values."
+            )  # pragma: no cover
+            return []  # pragma: no cover
+        log(f"Error: unable to open {bucket_path} in red_bucket storage")
+        raise
+    except json.JSONDecodeError:
+        log(f"Error: unable to parse {bucket_path} in red_bucket storage")
+        if settings.SERVER_MODE == "development":
+            return []  # pragma: no cover
+        raise
+    assert all(isinstance(record, int) for record in records)
+    return records
+
+
+def get_publication_std_levels() -> dict[int, StdLevelName]:
+    FILENAME = "publication-std-levels.json"
+    bucket_path = str(Path(getattr(settings, "RFCINDEX_INPUT_PATH", "")) / FILENAME)
+    values: dict[int, StdLevelName] = {}
+    try:
+        with storages["red_bucket"].open(bucket_path) as urn_file:
+            records = json.load(urn_file)
+    except FileNotFoundError:
+        if settings.SERVER_MODE == "development":
+            log(
+                f"Unable to open {bucket_path} in red_bucket storage. This is okay in dev "
+                "but generated rfc-index will not agree with RFC Editor values."
+            )  # pragma: no cover
+            # intentionally fall through instead of return here
+        else:
+            log(f"Error: unable to open {bucket_path} in red_bucket storage")
+            raise
+    except json.JSONDecodeError:
+        log(f"Error: unable to parse {bucket_path} in red_bucket storage")
+        if settings.SERVER_MODE != "development":
+            raise
+    else:
+        assert all(isinstance(record["number"], int) for record in records)
+        values = {
+            record["number"]: StdLevelName.objects.get(
+                slug=record["publication_std_level"]
+            )
+            for record in records
+        }
+    # defaultdict to return "unknown" for any missing values
+    unknown_std_level = StdLevelName.objects.get(slug="unkn")
+    return defaultdict(lambda: unknown_std_level, values)
+
+
+def format_ordering(rfc_number):
+    if rfc_number < settings.FIRST_V3_RFC:
+        ordering = ["txt", "ps", "pdf", "html", "xml"]
+    else:
+        ordering = ["html", "txt", "ps", "pdf", "xml"]
+    return ordering.index  # return the method
+
+
+def get_rfc_text_index_entries():
+    """Returns RFC entries for rfc-index.txt"""
+    entries = []
+    april1_rfc_numbers = get_april1_rfc_numbers()
+    published_rfcs = Document.objects.filter(type_id="rfc").order_by("rfc_number")
+    rfcs = sorted(
+        chain(published_rfcs, get_unusable_rfc_numbers()), key=attrgetter("rfc_number")
+    )
+    for rfc in rfcs:
+        if isinstance(rfc, UnusableRfcNumber):
+            entries.append(f"{format_rfc_number(rfc.rfc_number)} Not Issued.")
+        else:
+            assert isinstance(rfc, Document)
+            authors = ", ".join(
+                author.format_for_titlepage() for author in rfc.rfcauthor_set.all()
+            )
+            published_at = rfc.pub_date()
+            date = (
+                published_at.strftime("1 %B %Y")
+                if rfc.rfc_number in april1_rfc_numbers
+                else published_at.strftime("%B %Y")
+            )
+
+            # formats
+            formats = ", ".join(
+                sorted(
+                    [
+                        format["fmt"]
+                        for format in rfc.formats()
+                        if format["fmt"] in FORMATS_FOR_INDEX
+                    ],
+                    key=format_ordering(rfc.rfc_number),
+                )
+            ).upper()
+
+            # obsoletes
+            obsoletes = ""
+            obsoletes_documents = sorted(
+                rfc.related_that_doc("obs"),
+                key=attrgetter("rfc_number"),
+            )
+            if len(obsoletes_documents) > 0:
+                obsoletes_names = ", ".join(
+                    f"RFC{format_rfc_number(doc.rfc_number)}"
+                    for doc in obsoletes_documents
+                )
+                obsoletes = f" (Obsoletes {obsoletes_names})"
+
+            # obsoleted by
+            obsoleted_by = ""
+            obsoleted_by_documents = sorted(
+                rfc.related_that("obs"),
+                key=attrgetter("rfc_number"),
+            )
+            if len(obsoleted_by_documents) > 0:
+                obsoleted_by_names = ", ".join(
+                    f"RFC{format_rfc_number(doc.rfc_number)}"
+                    for doc in obsoleted_by_documents
+                )
+                obsoleted_by = f" (Obsoleted by {obsoleted_by_names})"
+
+            # updates
+            updates = ""
+            updates_documents = sorted(
+                rfc.related_that_doc("updates"),
+                key=attrgetter("rfc_number"),
+            )
+            if len(updates_documents) > 0:
+                updates_names = ", ".join(
+                    f"RFC{format_rfc_number(doc.rfc_number)}"
+                    for doc in updates_documents
+                )
+                updates = f" (Updates {updates_names})"
+
+            # updated by
+            updated_by = ""
+            updated_by_documents = sorted(
+                rfc.related_that("updates"),
+                key=attrgetter("rfc_number"),
+            )
+            if len(updated_by_documents) > 0:
+                updated_by_names = ", ".join(
+                    f"RFC{format_rfc_number(doc.rfc_number)}"
+                    for doc in updated_by_documents
+                )
+                updated_by = f" (Updated by {updated_by_names})"
+
+            doc_relations = f"{obsoletes}{obsoleted_by}{updates}{updated_by} "
+
+            # subseries
+            subseries = ",".join(
+                f"{container.type.slug}{format_rfc_number(int(container.name[3:]))}"
+                for container in rfc.part_of()
+            ).upper()
+            if subseries:
+                subseries = f"(Also {subseries}) "
+
+            entry = fill(
+                (
+                    f"{format_rfc_number(rfc.rfc_number)} {rfc.title}. {authors}. {date}. "
+                    f"(Format: {formats}){doc_relations}{subseries}"
+                    f"(Status: {str(rfc.std_level).upper()}) "
+                    f"(DOI: {rfc.doi})"
+                ),
+                width=73,
+                subsequent_indent=" " * 5,
+            )
+            entries.append(entry)
+
+    return entries
+
+
+def subseries_text_line(line, first=False):
+    """Return subseries text entry line"""
+    indent = " " * SS_TXT_CUE_COL_WIDTH
+    if first:
+        initial_indent = " " * SS_TXT_MARGIN
+    else:
+        initial_indent = indent
+    return fill(
+        line,
+        initial_indent=initial_indent,
+        subsequent_indent=indent,
+        width=80,
+        break_on_hyphens=False,
+    )
+
+
+def get_bcp_text_index_entries():
+    """Returns BCP entries for bcp-index.txt"""
+    entries = []
+
+    highest_bcp_number = (
+        Document.objects.filter(type_id="bcp")
+        .annotate(
+            number=Cast(
+                Substr("name", 4, None),
+                output_field=models.IntegerField(),
+            )
+        )
+        .order_by("-number")
+        .first()
+        .number
+    )
+
+    for bcp_number in range(1, highest_bcp_number + 1):
+        bcp_name = f"BCP{bcp_number}"
+        bcp = Document.objects.filter(type_id="bcp", name=f"{bcp_name.lower()}").first()
+
+        if bcp:
+            entry = subseries_text_line(
+                (
+                    f"[{bcp_name}]"
+                    f"{' ' * (SS_TXT_CUE_COL_WIDTH - len(bcp_name) - 2 - SS_TXT_MARGIN)}"
+                    f"Best Current Practice {bcp_number},"
+                ),
+                first=True,
+            )
+            entry += "\n"
+            entry += subseries_text_line(
+                f"<{settings.RFC_EDITOR_INFO_BASE_URL}{bcp_name.lower()}>."
+            )
+            entry += "\n"
+            entry += subseries_text_line(
+                "At the time of writing, this BCP comprises the following:"
+            )
+            entry += "\n\n"
+            rfcs = sorted(bcp.contains(), key=lambda x: x.rfc_number)
+            for rfc in rfcs:
+                authors = ", ".join(
+                    author.format_for_titlepage() for author in rfc.rfcauthor_set.all()
+                )
+                entry += subseries_text_line(
+                    (
+                        f'{authors}, "{rfc.title}", BCP¶{bcp_number}, RFC¶{rfc.rfc_number}, '
+                        f"DOI¶{rfc.doi}, {rfc.pub_date().strftime('%B %Y')}, "
+                        f"<{settings.RFC_EDITOR_INFO_BASE_URL}rfc{rfc.rfc_number}>."
+                    )
+                ).replace("¶", " ")
+                entry += "\n\n"
+        else:
+            entry = subseries_text_line(
+                (
+                    f"[{bcp_name}]"
+                    f"{' ' * (SS_TXT_CUE_COL_WIDTH - len(bcp_name) - 2 - SS_TXT_MARGIN)}"
+                    f"Best Current Practice {bcp_number} currently contains no RFCs"
+                ),
+                first=True,
+            )
+        entries.append(entry)
+    return entries
+
+
+def get_std_text_index_entries():
+    """Returns STD entries for std-index.txt"""
+    entries = []
+
+    highest_std_number = (
+        Document.objects.filter(type_id="std")
+        .annotate(
+            number=Cast(
+                Substr("name", 4, None),
+                output_field=models.IntegerField(),
+            )
+        )
+        .order_by("-number")
+        .first()
+        .number
+    )
+
+    for std_number in range(1, highest_std_number + 1):
+        std_name = f"STD{std_number}"
+        std = Document.objects.filter(type_id="std", name=f"{std_name.lower()}").first()
+
+        if std and std.contains():
+            entry = subseries_text_line(
+                (
+                    f"[{std_name}]"
+                    f"{' ' * (SS_TXT_CUE_COL_WIDTH - len(std_name) - 2 - SS_TXT_MARGIN)}"
+                    f"Internet Standard {std_number},"
+                ),
+                first=True,
+            )
+            entry += "\n"
+            entry += subseries_text_line(
+                f"<{settings.RFC_EDITOR_INFO_BASE_URL}{std_name.lower()}>."
+            )
+            entry += "\n"
+            entry += subseries_text_line(
+                "At the time of writing, this STD comprises the following:"
+            )
+            entry += "\n\n"
+            rfcs = sorted(std.contains(), key=lambda x: x.rfc_number)
+            for rfc in rfcs:
+                authors = ", ".join(
+                    author.format_for_titlepage() for author in rfc.rfcauthor_set.all()
+                )
+                entry += subseries_text_line(
+                    (
+                        f'{authors}, "{rfc.title}", STD¶{std_number}, RFC¶{rfc.rfc_number}, '
+                        f"DOI¶{rfc.doi}, {rfc.pub_date().strftime('%B %Y')}, "
+                        f"<{settings.RFC_EDITOR_INFO_BASE_URL}rfc{rfc.rfc_number}>."
+                    )
+                ).replace("¶", " ")
+                entry += "\n\n"
+        else:
+            entry = subseries_text_line(
+                (
+                    f"[{std_name}]"
+                    f"{' ' * (SS_TXT_CUE_COL_WIDTH - len(std_name) - 2 - SS_TXT_MARGIN)}"
+                    f"Internet Standard {std_number} currently contains no RFCs"
+                ),
+                first=True,
+            )
+        entries.append(entry)
+    return entries
+
+
+def get_fyi_text_index_entries():
+    """Returns FYI entries for fyi-index.txt"""
+    entries = []
+
+    highest_fyi_number = (
+        Document.objects.filter(type_id="fyi")
+        .annotate(
+            number=Cast(
+                Substr("name", 4, None),
+                output_field=models.IntegerField(),
+            )
+        )
+        .order_by("-number")
+        .first()
+        .number
+    )
+
+    for fyi_number in range(1, highest_fyi_number + 1):
+        fyi_name = f"FYI{fyi_number}"
+        fyi = Document.objects.filter(type_id="fyi", name=f"{fyi_name.lower()}").first()
+
+        if fyi and fyi.contains():
+            entry = subseries_text_line(
+                (
+                    f"[{fyi_name}]"
+                    f"{' ' * (SS_TXT_CUE_COL_WIDTH - len(fyi_name) - 2 - SS_TXT_MARGIN)}"
+                    f"For Your Information {fyi_number},"
+                ),
+                first=True,
+            )
+            entry += "\n"
+            entry += subseries_text_line(
+                f"<{settings.RFC_EDITOR_INFO_BASE_URL}{fyi_name.lower()}>."
+            )
+            entry += "\n"
+            entry += subseries_text_line(
+                "At the time of writing, this FYI comprises the following:"
+            )
+            entry += "\n\n"
+            rfcs = sorted(fyi.contains(), key=lambda x: x.rfc_number)
+            for rfc in rfcs:
+                authors = ", ".join(
+                    author.format_for_titlepage() for author in rfc.rfcauthor_set.all()
+                )
+                entry += subseries_text_line(
+                    (
+                        f'{authors}, "{rfc.title}", FYI¶{fyi_number}, RFC¶{rfc.rfc_number}, '
+                        f"DOI¶{rfc.doi}, {rfc.pub_date().strftime('%B %Y')}, "
+                        f"<{settings.RFC_EDITOR_INFO_BASE_URL}rfc{rfc.rfc_number}>."
+                    )
+                ).replace("¶", " ")
+                entry += "\n\n"
+        else:
+            entry = subseries_text_line(
+                (
+                    f"[{fyi_name}]"
+                    f"{' ' * (SS_TXT_CUE_COL_WIDTH - len(fyi_name) - 2 - SS_TXT_MARGIN)}"
+                    f"For Your Information {fyi_number} currently contains no RFCs"
+                ),
+                first=True,
+            )
+        entries.append(entry)
+    return entries
+
+
+def add_subseries_xml_index_entries(rfc_index, ss_type, include_all=False):
+    """Add subseries entries for rfc-index.xml"""
+    # subseries docs annotated with numeric number
+    ss_docs = list(
+        Document.objects.filter(type_id=ss_type)
+        .annotate(
+            number=Cast(
+                Substr("name", 4, None),
+                output_field=models.IntegerField(),
+            )
+        )
+        .order_by("-number")
+    )
+    if len(ss_docs) == 0:
+        return  # very much not expected
+    highest_number = ss_docs[0].number
+    for ss_number in range(1, highest_number + 1):
+        if ss_docs[-1].number == ss_number:
+            this_ss_doc = ss_docs.pop()
+            contained_rfcs = this_ss_doc.contains()
+        else:
+            contained_rfcs = []
+        if len(contained_rfcs) == 0 and not include_all:
+            continue
+        entry = etree.SubElement(rfc_index, f"{ss_type}-entry")
+        etree.SubElement(
+            entry, "doc-id"
+        ).text = f"{ss_type.upper()}{format_rfc_number(ss_number)}"
+        if len(contained_rfcs) > 0:
+            is_also = etree.SubElement(entry, "is-also")
+            for rfc in sorted(contained_rfcs, key=attrgetter("rfc_number")):
+                etree.SubElement(
+                    is_also, "doc-id"
+                ).text = f"RFC{format_rfc_number(rfc.rfc_number)}"
+
+
+def add_related_xml_index_entries(root: etree.Element, rfc: Document, tag: str):
+    relation_getter = {
+        "obsoletes": lambda doc: doc.related_that_doc("obs"),
+        "obsoleted-by": lambda doc: doc.related_that("obs"),
+        "updates": lambda doc: doc.related_that_doc("updates"),
+        "updated-by": lambda doc: doc.related_that("updates"),
+    }
+    related_docs = sorted(
+        relation_getter[tag](rfc),
+        key=attrgetter("rfc_number"),
+    )
+    if len(related_docs) > 0:
+        element = etree.SubElement(root, tag)
+        for doc in related_docs:
+            etree.SubElement(
+                element, "doc-id"
+            ).text = f"RFC{format_rfc_number(doc.rfc_number)}"
+
+
+def add_rfc_xml_index_entries(rfc_index):
+    """Add RFC entries for rfc-index.xml"""
+    entries = []
+    april1_rfc_numbers = get_april1_rfc_numbers()
+    publication_statuses = get_publication_std_levels()
+
+    published_rfcs = Document.objects.filter(type_id="rfc").order_by("rfc_number")
+
+    # Iterators for unpublished and published, both sorted by number
+    unpublished_iter = iter(get_unusable_rfc_numbers())
+    published_iter = iter(published_rfcs)
+
+    # Prime the next_* values
+    next_unpublished = next(unpublished_iter, None)
+    next_published = next(published_iter, None)
+
+    while next_published is not None or next_unpublished is not None:
+        if next_unpublished is not None and (
+            next_published is None
+            or next_unpublished.rfc_number < next_published.rfc_number
+        ):
+            entry = etree.SubElement(rfc_index, "rfc-not-issued-entry")
+            etree.SubElement(
+                entry, "doc-id"
+            ).text = f"RFC{format_rfc_number(next_unpublished.rfc_number)}"
+            entries.append(entry)
+            next_unpublished = next(unpublished_iter, None)
+            continue
+
+        rfc = next_published  # hang on to this
+        next_published = next(published_iter, None)  # prep for next iteration
+        entry = etree.SubElement(rfc_index, "rfc-entry")
+
+        etree.SubElement(
+            entry, "doc-id"
+        ).text = f"RFC{format_rfc_number(rfc.rfc_number)}"
+        etree.SubElement(entry, "title").text = rfc.title
+
+        for author in rfc.rfcauthor_set.all():
+            author_element = etree.SubElement(entry, "author")
+            etree.SubElement(author_element, "name").text = author.titlepage_name
+            if author.is_editor:
+                etree.SubElement(author_element, "title").text = "Editor"
+
+        date = etree.SubElement(entry, "date")
+        published_at = rfc.pub_date()
+        etree.SubElement(date, "month").text = published_at.strftime("%B")
+        if rfc.rfc_number in april1_rfc_numbers:
+            etree.SubElement(date, "day").text = str(published_at.day)
+        etree.SubElement(date, "year").text = str(published_at.year)
+
+        format_ = etree.SubElement(entry, "format")
+        fmts = [ff["fmt"] for ff in rfc.formats() if ff["fmt"] in FORMATS_FOR_INDEX]
+        for fmt in sorted(fmts, key=format_ordering(rfc.rfc_number)):
+            match_legacy = getattr(settings, "RFCINDEX_MATCH_LEGACY_XML", False)
+            etree.SubElement(format_, "file-format").text = (
+                "ASCII" if match_legacy and fmt == "txt" else fmt.upper()
+            )
+
+        etree.SubElement(entry, "page-count").text = str(rfc.pages)
+
+        if len(rfc.keywords) > 0:
+            keywords = etree.SubElement(entry, "keywords")
+            for keyword in rfc.keywords:
+                etree.SubElement(keywords, "kw").text = keyword.strip()
+
+        if rfc.abstract:
+            abstract = etree.SubElement(entry, "abstract")
+            for paragraph in rfc.abstract.split("\n\n"):
+                etree.SubElement(abstract, "p").text = paragraph.strip()
+
+        draft = rfc.came_from_draft()
+        if draft is not None:
+            etree.SubElement(entry, "draft").text = f"{draft.name}-{draft.rev}"
+
+        part_of_documents = rfc.part_of()
+        if len(part_of_documents) > 0:
+            is_also = etree.SubElement(entry, "is-also")
+            for doc in part_of_documents:
+                etree.SubElement(is_also, "doc-id").text = doc.name.upper()
+
+        add_related_xml_index_entries(entry, rfc, "obsoletes")
+        add_related_xml_index_entries(entry, rfc, "obsoleted-by")
+        add_related_xml_index_entries(entry, rfc, "updates")
+        add_related_xml_index_entries(entry, rfc, "updated-by")
+
+        etree.SubElement(entry, "current-status").text = rfc.std_level.name.upper()
+        etree.SubElement(entry, "publication-status").text = publication_statuses[
+            rfc.rfc_number
+        ].name.upper()
+        etree.SubElement(entry, "stream").text = (
+            "INDEPENDENT" if rfc.stream_id == "ise" else rfc.stream.name
+        )
+
+        # Add area / wg_acronym
+        if rfc.stream_id == "ietf":
+            if rfc.group.type_id in ["individ", "area"]:
+                etree.SubElement(entry, "wg_acronym").text = "NON WORKING GROUP"
+            else:
+                if rfc.area is not None:
+                    etree.SubElement(entry, "area").text = rfc.area.acronym
+                if rfc.group:
+                    etree.SubElement(entry, "wg_acronym").text = rfc.group.acronym
+
+        if rfc.tags.filter(slug="errata").exists():
+            etree.SubElement(entry, "errata-url").text = errata_url(rfc)
+        etree.SubElement(entry, "doi").text = rfc.doi
+        entries.append(entry)
+
+
+def create_rfc_txt_index():
+    """Create text index of published documents"""
+    DATE_FMT = "%m/%d/%Y"
+    created_on = timezone.now().strftime(DATE_FMT)
+    log("Creating rfc-index.txt")
+    index = render_to_string(
+        "sync/rfc-index.txt",
+        {
+            "created_on": created_on,
+            "rfcs": get_rfc_text_index_entries(),
+        },
+    )
+    save_to_red_bucket("rfc-index.txt", index)
+
+
+def create_rfc_xml_index():
+    """Create XML index of published documents"""
+    XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance"
+    XSI = "{" + XSI_NAMESPACE + "}"
+
+    log("Creating rfc-index.xml")
+    rfc_index = etree.Element(
+        "rfc-index",
+        nsmap={
+            None: "https://www.rfc-editor.org/rfc-index",
+            "xsi": XSI_NAMESPACE,
+        },
+        attrib={
+            XSI + "schemaLocation": (
+                "https://www.rfc-editor.org/rfc-index "
+                "https://www.rfc-editor.org/rfc-index.xsd"
+            ),
+        },
+    )
+
+    # add data
+    add_subseries_xml_index_entries(rfc_index, "bcp", include_all=True)
+    add_subseries_xml_index_entries(rfc_index, "fyi")
+    add_rfc_xml_index_entries(rfc_index)
+    add_subseries_xml_index_entries(rfc_index, "std")
+
+    # make it pretty
+    pretty_index = etree.tostring(
+        rfc_index,
+        encoding="utf-8",
+        xml_declaration=True,
+        pretty_print=4,
+    )
+    save_to_red_bucket("rfc-index.xml", pretty_index)
+
+
+def create_bcp_txt_index():
+    """Create text index of BCPs"""
+    DATE_FMT = "%m/%d/%Y"
+    created_on = timezone.now().strftime(DATE_FMT)
+    log("Creating bcp-index.txt")
+    index = render_to_string(
+        "sync/bcp-index.txt",
+        {
+            "created_on": created_on,
+            "bcps": get_bcp_text_index_entries(),
+        },
+    )
+    save_to_red_bucket("bcp-index.txt", index)
+
+
+def create_std_txt_index():
+    """Create text index of STDs"""
+    DATE_FMT = "%m/%d/%Y"
+    created_on = timezone.now().strftime(DATE_FMT)
+    log("Creating std-index.txt")
+    index = render_to_string(
+        "sync/std-index.txt",
+        {
+            "created_on": created_on,
+            "stds": get_std_text_index_entries(),
+        },
+    )
+    save_to_red_bucket("std-index.txt", index)
+
+
+def create_fyi_txt_index():
+    """Create text index of FYIs"""
+    DATE_FMT = "%m/%d/%Y"
+    created_on = timezone.now().strftime(DATE_FMT)
+    log("Creating fyi-index.txt")
+    index = render_to_string(
+        "sync/fyi-index.txt",
+        {
+            "created_on": created_on,
+            "fyis": get_fyi_text_index_entries(),
+        },
+    )
+    save_to_red_bucket("fyi-index.txt", index)
+
+
+## DirtyBits management for the RFC index
+
+RFCINDEX_SLUG = DirtyBits.Slugs.RFCINDEX
+
+
+def mark_rfcindex_as_dirty():
+    _, created = DirtyBits.objects.update_or_create(
+        slug=RFCINDEX_SLUG, defaults={"dirty_time": timezone.now()}
+    )
+    if created:
+        log(f"Created DirtyBits(slug='{RFCINDEX_SLUG}')")
+
+
+def mark_rfcindex_as_processed(when: datetime.datetime):
+    n_updated = DirtyBits.objects.filter(
+        Q(processed_time__isnull=True) | Q(processed_time__lt=when),
+        slug=RFCINDEX_SLUG,
+    ).update(processed_time=when)
+    if n_updated > 0:
+        log(f"processed_time is now {when.isoformat()}")
+    else:
+        log("processed_time not updated, no matching record found")
+
+
+def rfcindex_is_dirty():
+    """Does the rfc index need to be updated?"""
+    dirty_work, created = DirtyBits.objects.get_or_create(
+        slug=RFCINDEX_SLUG, defaults={"dirty_time": timezone.now()}
+    )
+    if created:
+        log(f"Created DirtyBits(slug='{RFCINDEX_SLUG}')")
+    display_processed_time = (
+        dirty_work.processed_time.isoformat()
+        if dirty_work.processed_time is not None
+        else "never"
+    )
+    log(
+        f"DirtyBits(slug='{RFCINDEX_SLUG}'): "
+        f"dirty_time={dirty_work.dirty_time.isoformat()} "
+        f"processed_time={display_processed_time}"
+    )
+    return (
+        dirty_work.processed_time is None
+        or dirty_work.dirty_time >= dirty_work.processed_time
+    )
diff --git a/ietf/sync/tasks.py b/ietf/sync/tasks.py
new file mode 100644
index 0000000000..34b2efeb5c
--- /dev/null
+++ b/ietf/sync/tasks.py
@@ -0,0 +1,344 @@
+# Copyright The IETF Trust 2024-2026, All Rights Reserved
+#
+# Celery task definitions
+#
+import datetime
+import io
+from pathlib import Path
+from tempfile import NamedTemporaryFile
+import requests
+
+from celery import shared_task
+
+from django.conf import settings
+from django.utils import timezone
+
+from ietf.doc.models import DocEvent, RelatedDocument
+from ietf.doc.tasks import rebuild_reference_relations_task
+from ietf.sync import iana
+from ietf.sync import rfceditor
+from ietf.sync.errata import (
+    errata_are_dirty,
+    mark_errata_as_processed,
+    update_errata_from_rfceditor,
+)
+from ietf.sync.rfceditor import MIN_QUEUE_RESULTS, parse_queue, update_drafts_from_queue
+from ietf.sync.rfcindex import (
+    create_bcp_txt_index,
+    create_fyi_txt_index,
+    create_rfc_txt_index,
+    create_rfc_xml_index,
+    create_std_txt_index,
+    rfcindex_is_dirty, mark_rfcindex_as_processed, mark_rfcindex_as_dirty,
+)
+from ietf.sync.utils import build_from_file_content, load_rfcs_into_blobdb, rsync_helper
+from ietf.utils import log
+from ietf.utils.timezone import date_today
+
+
+@shared_task
+def rfc_editor_index_update_task(full_index=False):
+    """Update metadata from the RFC index
+
+    Default is to examine only changes in the past 365 days. Call with full_index=True to update
+    the full RFC index.
+
+    According to comments on the original script, a year's worth took about 20s on production as of
+    August 2022
+
+    The original rfc-editor-index-update script had a long-disabled provision for running the
+    rebuild_reference_relations scripts after the update. That has not been brought over
+    at all because it should be implemented as its own task if it is needed.
+    """
+    skip_date = None if full_index else date_today() - datetime.timedelta(days=365)
+    log.log(
+        "Updating document metadata from RFC index going back to {since}, from {url}".format(
+            since=skip_date if skip_date is not None else "the beginning",
+            url=settings.RFC_EDITOR_INDEX_URL,
+        )
+    )
+    try:
+        response = requests.get(
+            settings.RFC_EDITOR_INDEX_URL,
+            timeout=30,  # seconds
+        )
+    except requests.Timeout as exc:
+        log.log(f"GET request timed out retrieving RFC editor index: {exc}")
+        return  # failed
+    rfc_index_xml = response.text
+    index_data = rfceditor.parse_index(io.StringIO(rfc_index_xml))
+    try:
+        response = requests.get(
+            settings.RFC_EDITOR_ERRATA_JSON_URL,
+            timeout=30,  # seconds
+        )
+    except requests.Timeout as exc:
+        log.log(f"GET request timed out retrieving RFC editor errata: {exc}")
+        return  # failed
+    errata_data = response.json()
+    if len(index_data) < rfceditor.MIN_INDEX_RESULTS:
+        log.log("Not enough index entries, only %s" % len(index_data))
+        return  # failed
+    if len(errata_data) < rfceditor.MIN_ERRATA_RESULTS:
+        log.log("Not enough errata entries, only %s" % len(errata_data))
+        return  # failed
+    newly_published = set()
+    for rfc_number, changes, doc, rfc_published in rfceditor.update_docs_from_rfc_index(
+        index_data, errata_data, skip_older_than_date=skip_date
+    ):
+        for c in changes:
+            log.log("RFC%s, %s: %s" % (rfc_number, doc.name, c))
+        if rfc_published:
+            newly_published.add(rfc_number)
+    if len(newly_published) > 0:
+        rsync_rfcs_from_rfceditor_task.delay(list(newly_published))
+
+
+@shared_task
+def rfc_editor_queue_updates_task():
+    log.log(f"Updating RFC Editor queue states from {settings.RFC_EDITOR_QUEUE_URL}")
+    try:
+        response = requests.get(
+            settings.RFC_EDITOR_QUEUE_URL,
+            timeout=30,  # seconds
+        )
+    except requests.Timeout as exc:
+        log.log(f"GET request timed out retrieving RFC editor queue: {exc}")
+        return  # failed
+    drafts, warnings = parse_queue(io.StringIO(response.text))
+    for w in warnings:
+        log.log(f"Warning: {w}")
+
+    if len(drafts) < MIN_QUEUE_RESULTS:
+        log.log("Not enough results, only %s" % len(drafts))
+        return  # failed
+
+    changed, warnings = update_drafts_from_queue(drafts)
+    for w in warnings:
+        log.log(f"Warning: {w}")
+
+    for c in changed:
+        log.log(f"Updated {c}")
+
+
+@shared_task
+def iana_changes_update_task():
+    # compensate to avoid we ask for something that happened now and then
+    # don't get it back because our request interval is slightly off
+    CLOCK_SKEW_COMPENSATION = 5  # seconds
+
+    # actually the interface accepts 24 hours, but then we get into
+    # trouble with daylights savings - meh
+    MAX_INTERVAL_ACCEPTED_BY_IANA = datetime.timedelta(hours=23)
+
+    start = (
+        timezone.now()
+        - datetime.timedelta(hours=23)
+        + datetime.timedelta(
+            seconds=CLOCK_SKEW_COMPENSATION,
+        )
+    )
+    end = start + datetime.timedelta(hours=23)
+
+    t = start
+    while t < end:
+        # the IANA server doesn't allow us to fetch more than a certain
+        # period, so loop over the requested period and make multiple
+        # requests if necessary
+
+        text = iana.fetch_changes_json(
+            settings.IANA_SYNC_CHANGES_URL,
+            t,
+            min(end, t + MAX_INTERVAL_ACCEPTED_BY_IANA),
+        )
+        log.log(f"Retrieved the JSON: {text}")
+
+        changes = iana.parse_changes_json(text)
+        added_events, warnings = iana.update_history_with_changes(
+            changes, send_email=True
+        )
+
+        for e in added_events:
+            log.log(
+                f"Added event for {e.doc_id} {e.time}: {e.desc} (parsed json: {e.json})"
+            )
+
+        for w in warnings:
+            log.log(f"WARNING: {w}")
+
+        t += MAX_INTERVAL_ACCEPTED_BY_IANA
+
+
+@shared_task
+def iana_protocols_update_task():
+    # Earliest date for which we have data suitable to update (was described as
+    # "this needs to be the date where this tool is first deployed" in the original
+    # iana-protocols-updates script)"
+    rfc_must_published_later_than = datetime.datetime(
+        2012,
+        11,
+        26,
+        tzinfo=datetime.UTC,
+    )
+
+    try:
+        response = requests.get(
+            settings.IANA_SYNC_PROTOCOLS_URL,
+            timeout=30,
+        )
+    except requests.Timeout as exc:
+        log.log(f"GET request timed out retrieving IANA protocols page: {exc}")
+        return
+
+    rfc_numbers = iana.parse_protocol_page(response.text)
+
+    def batched(l, n):
+        """Split list l up in batches of max size n.
+
+        For Python 3.12 or later, replace this with itertools.batched()
+        """
+        return (l[i : i + n] for i in range(0, len(l), n))
+
+    for batch in batched(rfc_numbers, 100):
+        updated = iana.update_rfc_log_from_protocol_page(
+            batch,
+            rfc_must_published_later_than,
+        )
+
+        for d in updated:
+            log.log("Added history entry for %s" % d.display_name())
+
+
+@shared_task
+def fix_subseries_docevents_task():
+    """Repairs DocEvents related to bugs around removing docs from subseries
+
+    Removes bogus and repairs the date of non-bogus DocEvents
+    about removing RFCs from subseries
+
+    This is designed to be a one-shot task that should be removed
+    after running it. It is intended to be safe if it runs more than once.
+    """
+    log.log("Repairing DocEvents related to bugs around removing docs from subseries")
+    bogus_event_descs = [
+        "Removed rfc8499 from bcp218",
+        "Removed rfc7042 from bcp184",
+        "Removed rfc9499 from bcp238",
+        "Removed rfc5033 from std74",
+        "Removed rfc3228 from bcp55",
+        "Removed rfc8109 from std85",
+    ]
+    DocEvent.objects.filter(
+        type="sync_from_rfc_editor", desc__in=bogus_event_descs
+    ).delete()
+    needs_moment_fix = [
+        "Removed rfc8499 from bcp219",
+        "Removed rfc7042 from bcp141",
+        "Removed rfc5033 from bcp133",
+        "Removed rfc3228 from bcp57",
+    ]
+    # Assumptions (which have been manually verified):
+    # 1) each of the above RFCs is obsoleted by exactly one other RFC
+    # 2) each of the obsoleting RFCs has exactly one published_rfc docevent
+    for desc in needs_moment_fix:
+        obsoleted_rfc_name = desc.split(" ")[1]
+        obsoleting_rfc = RelatedDocument.objects.get(
+            relationship_id="obs", target__name=obsoleted_rfc_name
+        ).source
+        obsoleting_time = obsoleting_rfc.docevent_set.get(type="published_rfc").time
+        DocEvent.objects.filter(type="sync_from_rfc_editor", desc=desc).update(
+            time=obsoleting_time
+        )
+
+
+@shared_task
+def rsync_rfcs_from_rfceditor_task(rfc_numbers: list[int]):
+    log.log(f"Rsyncing rfcs from rfc-editor: {rfc_numbers}")
+    from_file = None
+    with NamedTemporaryFile(mode="w", delete_on_close=False) as fp:
+        fp.write(build_from_file_content(rfc_numbers))
+        fp.close()
+        from_file = Path(fp.name)
+        rsync_helper(
+            [
+                "-a",
+                "--ignore-existing",
+                f"--include-from={from_file}",
+                "--exclude=*",
+                "rsync.rfc-editor.org::rfcs/",
+                f"{settings.RFC_PATH}",
+            ]
+        )
+    load_rfcs_into_blobdb(rfc_numbers)
+
+    rebuild_reference_relations_task.delay([f"rfc{num}" for num in rfc_numbers])
+
+
+@shared_task
+def load_rfcs_into_blobdb_task(start: int, end: int):
+    """Move file content for rfcs from rfc{start} to rfc{end} inclusive
+
+    As this is expected to be removed once the blobdb is populated, it
+    will truncate its work to a coded max end.
+    This will not overwrite any existing blob content, and will only
+    log a small complaint if asked to load a non-exsiting RFC.
+    """
+    # Protect us from ourselves
+    if end < start:
+        return
+    if start < 1:
+        start = 1
+    if end > 11000:  # Arbitrarily chosen
+        end = 11000
+    load_rfcs_into_blobdb(list(range(start, end + 1)))
+
+
+@shared_task
+def update_errata_from_rfceditor_task():
+    if errata_are_dirty():
+        # new_processed_time is the *start* of processing so that any changes after
+        # this point will trigger another refresh
+        new_processed_time = timezone.now()
+        update_errata_from_rfceditor()
+        mark_errata_as_processed(new_processed_time)
+        mark_rfcindex_as_dirty()  # ensure any changes are reflected in the indexes
+
+
+@shared_task
+def refresh_rfc_index_task():
+    if rfcindex_is_dirty():
+        # new_processed_time is the *start* of processing so that any changes after
+        # this point will trigger another refresh
+        new_processed_time = timezone.now()
+
+        try:
+            create_rfc_txt_index()
+        except Exception as e:
+            log.log(f"Error: failure in creating rfc-index.txt. {e}")
+            pass
+
+        try:
+            create_rfc_xml_index()
+        except Exception as e:
+            log.log(f"Error: failure in creating rfc-index.xml. {e}")
+            pass
+
+        try:
+            create_bcp_txt_index()
+        except Exception as e:
+            log.log(f"Error: failure in creating bcp-index.txt. {e}")
+            pass
+
+        try:
+            create_std_txt_index()
+        except Exception as e:
+            log.log(f"Error: failure in creating std-index.txt. {e}")
+            pass
+
+        try:
+            create_fyi_txt_index()
+        except Exception as e:
+            log.log(f"Error: failure in creating fyi-index.txt. {e}")
+            pass
+
+        mark_rfcindex_as_processed(new_processed_time)
diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py
index 61bab795c8..e83b6a5e0a 100644
--- a/ietf/sync/tests.py
+++ b/ietf/sync/tests.py
@@ -1,45 +1,81 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
+# Copyright The IETF Trust 2012-2026, All Rights Reserved
 
 
 import os
 import io
 import json
 import datetime
+from unittest import mock
 import quopri
+import requests
+
+from dataclasses import dataclass
 
 from django.conf import settings
+from django.core.files.base import ContentFile
+from django.core.files.storage import storages
 from django.urls import reverse as urlreverse
+from django.utils import timezone
+from django.test.utils import override_settings
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.factories import WgDraftFactory
-from ietf.doc.models import Document, DocAlias, DocEvent, DeletedEvent, DocTagName, RelatedDocument, State, StateDocEvent
+from ietf.api.views import EmailIngestionError
+from ietf.doc.factories import (
+    WgDraftFactory,
+    RfcFactory,
+    DocumentAuthorFactory,
+    DocEventFactory,
+    BcpFactory, WgRfcFactory,
+)
+from ietf.doc.models import (
+    Document,
+    DocEvent,
+    DeletedEvent,
+    DocTagName,
+    RelatedDocument,
+    State,
+    StateDocEvent,
+)
 from ietf.doc.utils import add_state_change_event
 from ietf.group.factories import GroupFactory
+from ietf.person.factories import PersonFactory
 from ietf.person.models import Person
-from ietf.sync import iana, rfceditor
+from ietf.sync import iana, rfceditor, tasks
+from ietf.sync.errata import (
+    update_errata_from_rfceditor,
+    get_errata_last_updated,
+    get_errata_data,
+    errata_map_from_json,
+    update_errata_dirty_time,
+    mark_errata_as_processed,
+    update_errata_tags,
+)
+from ietf.sync.tasks import update_errata_from_rfceditor_task
 from ietf.utils.mail import outbox, empty_outbox
+from ietf.utils.models import DirtyBits
 from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.test_utils import TestCase
+from ietf.utils.timezone import date_today, RPC_TZINFO
 
 
 class IANASyncTests(TestCase):
     def test_protocol_page_sync(self):
         draft = WgDraftFactory()
-        DocAlias.objects.create(name="rfc1234").docs.add(draft)
-        DocEvent.objects.create(doc=draft, rev=draft.rev, type="published_rfc", by=Person.objects.get(name="(System)"))
+        rfc = RfcFactory(rfc_number=1234)
+        draft.relateddocument_set.create(relationship_id="became_rfc", target = rfc)
+        DocEvent.objects.create(doc=rfc, rev="", type="published_rfc", by=Person.objects.get(name="(System)"))
 
         rfc_names = iana.parse_protocol_page('<html><a href="/go/rfc1234/">RFC 1234</a></html>')
         self.assertEqual(len(rfc_names), 1)
         self.assertEqual(rfc_names[0], "rfc1234")
 
-        iana.update_rfc_log_from_protocol_page(rfc_names, datetime.datetime.now() - datetime.timedelta(days=1))
-        self.assertEqual(DocEvent.objects.filter(doc=draft, type="rfc_in_iana_registry").count(), 1)
+        iana.update_rfc_log_from_protocol_page(rfc_names, timezone.now() - datetime.timedelta(days=1))
+        self.assertEqual(DocEvent.objects.filter(doc=rfc, type="rfc_in_iana_registry").count(), 1)
 
         # make sure it doesn't create duplicates
-        iana.update_rfc_log_from_protocol_page(rfc_names, datetime.datetime.now() - datetime.timedelta(days=1))
-        self.assertEqual(DocEvent.objects.filter(doc=draft, type="rfc_in_iana_registry").count(), 1)
+        iana.update_rfc_log_from_protocol_page(rfc_names, timezone.now() - datetime.timedelta(days=1))
+        self.assertEqual(DocEvent.objects.filter(doc=rfc, type="rfc_in_iana_registry").count(), 1)
 
     def test_changes_sync(self):
         draft = WgDraftFactory(ad=Person.objects.get(user__username='ad'))
@@ -190,7 +226,7 @@ def test_iana_review_mail(self):
                         doc_name, review_time, by, comment = iana.parse_review_email(msg.encode('utf-8'))
     
                         self.assertEqual(doc_name, draft.name)
-                        self.assertEqual(review_time, datetime.datetime(2012, 5, 10, 5, 0, rtime))
+                        self.assertEqual(review_time, datetime.datetime(2012, 5, 10, 12, 0, rtime, tzinfo=datetime.UTC))
                         self.assertEqual(by, Person.objects.get(user__username="iana"))
                         self.assertIn("there are no IANA Actions", comment.replace("\n", ""))
     
@@ -206,6 +242,61 @@ def test_iana_review_mail(self):
                         iana.add_review_comment(doc_name, review_time, by, comment)
                         self.assertEqual(DocEvent.objects.filter(doc=draft, type="iana_review").count(), events_before+1)
 
+    @mock.patch("ietf.sync.iana.add_review_comment")
+    @mock.patch("ietf.sync.iana.parse_review_email")
+    def test_ingest_review_email(self, mock_parse_review_email, mock_add_review_comment):
+        mock_parse_review_email.side_effect = ValueError("ouch!")
+        message = b"message"
+        
+        # Error parsing mail
+        with self.assertRaises(EmailIngestionError) as context:
+            iana.ingest_review_email(message)
+        self.assertIsNone(context.exception.as_emailmessage())  # no email
+        self.assertEqual("Unable to parse message as IANA review email", str(context.exception))
+        self.assertTrue(mock_parse_review_email.called)
+        self.assertEqual(mock_parse_review_email.call_args, mock.call(message))
+        self.assertFalse(mock_add_review_comment.called)
+        mock_parse_review_email.reset_mock()
+
+        args = (
+            "doc-name",
+            datetime.datetime.now(tz=datetime.UTC),
+            PersonFactory(),
+            "yadda yadda yadda",
+        )
+        mock_parse_review_email.side_effect = None
+        mock_parse_review_email.return_value = args
+        mock_add_review_comment.side_effect = Document.DoesNotExist
+        with self.assertRaises(EmailIngestionError) as context:
+            iana.ingest_review_email(message)
+        self.assertIsNone(context.exception.as_emailmessage())  # no email
+        self.assertEqual(str(context.exception), "Unknown document doc-name")
+        self.assertTrue(mock_parse_review_email.called)
+        self.assertEqual(mock_parse_review_email.call_args, mock.call(message))
+        self.assertTrue(mock_add_review_comment.called)
+        self.assertEqual(mock_add_review_comment.call_args, mock.call(*args))
+        mock_parse_review_email.reset_mock()
+        mock_add_review_comment.reset_mock()
+
+        mock_add_review_comment.side_effect = ValueError("ouch!")
+        with self.assertRaises(EmailIngestionError) as context:
+            iana.ingest_review_email(message)
+        self.assertIsNone(context.exception.as_emailmessage())  # no email
+        self.assertEqual("Error ingesting IANA review email", str(context.exception))
+        self.assertTrue(mock_parse_review_email.called)
+        self.assertEqual(mock_parse_review_email.call_args, mock.call(message))
+        self.assertTrue(mock_add_review_comment.called)
+        self.assertEqual(mock_add_review_comment.call_args, mock.call(*args))
+        mock_parse_review_email.reset_mock()
+        mock_add_review_comment.reset_mock()
+
+        mock_add_review_comment.side_effect = None
+        iana.ingest_review_email(message)
+        self.assertTrue(mock_parse_review_email.called)
+        self.assertEqual(mock_parse_review_email.call_args, mock.call(message))
+        self.assertTrue(mock_add_review_comment.called)
+        self.assertEqual(mock_add_review_comment.call_args, mock.call(*args))
+
     def test_notify_page(self):
         # check that we can get the notify page
         url = urlreverse("ietf.sync.views.notify", kwargs=dict(org="iana", notification="changes"))
@@ -224,20 +315,20 @@ def write_draft_file(self, name, size):
 
     def test_rfc_index(self):
         area = GroupFactory(type_id='area')
-        doc = WgDraftFactory(
+        draft_doc = WgDraftFactory(
             group__parent=area,
-            states=[('draft-iesg','rfcqueue'),('draft-stream-ise','rfc-edit')],
+            states=[('draft-iesg','rfcqueue')],
             ad=Person.objects.get(user__username='ad'),
+            external_url="http://my-external-url.example.com",
+            note="this is a note",
+            pages=54,  # make sure this is not 42
         )
-        # it's a bit strange to have draft-stream-ise set when draft-iesg is set
-        # too, but for testing purposes ...
-        doc.action_holders.add(doc.ad)  # not normally set, but add to be sure it's cleared
+        DocumentAuthorFactory.create_batch(2, document=draft_doc)
+        draft_doc.action_holders.add(draft_doc.ad)  # not normally set, but add to be sure it's cleared
 
-        updated_doc = Document.objects.create(name="draft-ietf-something")
-        DocAlias.objects.create(name=updated_doc.name).docs.add(updated_doc)
-        DocAlias.objects.create(name="rfc123").docs.add(updated_doc)
+        RfcFactory(rfc_number=123)
 
-        today = datetime.date.today()
+        today = date_today()
 
         t = '''<?xml version="1.0" encoding="UTF-8"?>
 <rfc-index xmlns="http://www.rfc-editor.org/rfc-index"
@@ -258,7 +349,7 @@ def test_rfc_index(self):
         </is-also>
     </fyi-entry>
     <std-entry>
-        <doc-id>STD0001</doc-id>
+        <doc-id>STD0002</doc-id>
         <title>Test</title>
         <is-also>
             <doc-id>RFC1234</doc-id>
@@ -298,14 +389,14 @@ def test_rfc_index(self):
     </rfc-entry>
 </rfc-index>''' % dict(year=today.strftime("%Y"),
                        month=today.strftime("%B"),
-                       name=doc.name,
-                       rev=doc.rev,
-                       area=doc.group.parent.acronym,
-                       group=doc.group.acronym)
+                       name=draft_doc.name,
+                       rev=draft_doc.rev,
+                       area=draft_doc.group.parent.acronym,
+                       group=draft_doc.group.acronym)
 
         errata = [{
                 "errata_id":1,
-                "doc-id":"RFC123",
+                "doc-id":"RFC123",  # n.b. this is not the same RFC as in the above index XML!
                 "errata_status_code":"Verified",
                 "errata_type_code":"Editorial",
                 "section": "4.1",
@@ -321,7 +412,6 @@ def test_rfc_index(self):
 
         data = rfceditor.parse_index(io.StringIO(t))
         self.assertEqual(len(data), 1)
-
         rfc_number, title, authors, rfc_published_date, current_status, updates, updated_by, obsoletes, obsoleted_by, also, draft, has_errata, stream, wg, file_formats, pages, abstract = data[0]
 
         # currently, we only check what we actually use
@@ -331,49 +421,234 @@ def test_rfc_index(self):
         self.assertEqual(rfc_published_date.month, today.month)
         self.assertEqual(current_status, "Proposed Standard")
         self.assertEqual(updates, ["RFC123"])
-        self.assertEqual(set(also), set(["BCP1", "FYI1", "STD1"]))
-        self.assertEqual(draft, doc.name)
-        self.assertEqual(wg, doc.group.acronym)
+        self.assertEqual(set(also), set(["BCP1", "FYI1", "STD2"]))
+        self.assertEqual(draft, draft_doc.name)
+        self.assertEqual(wg, draft_doc.group.acronym)
         self.assertEqual(has_errata, True)
         self.assertEqual(stream, "IETF")
         self.assertEqual(pages, "42")
         self.assertEqual(abstract, "This is some interesting text.")
 
-        draft_filename = "%s-%s.txt" % (doc.name, doc.rev)
+        draft_filename = "%s-%s.txt" % (draft_doc.name, draft_doc.rev)
         self.write_draft_file(draft_filename, 5000)
 
-        changes = []
-        for cs, d, rfc_published in rfceditor.update_docs_from_rfc_index(data, errata, today - datetime.timedelta(days=30)):
-            changes.append(cs)
-
-        doc = Document.objects.get(name=doc.name)
+        event_count_before = draft_doc.docevent_set.count()
+        draft_title_before = draft_doc.title
+        draft_abstract_before = draft_doc.abstract
+        draft_pages_before = draft_doc.pages
 
-        events = doc.docevent_set.all()
-        self.assertEqual(events[0].type, "sync_from_rfc_editor")
-        self.assertEqual(events[1].type, "changed_action_holders")
-        self.assertEqual(events[2].type, "published_rfc")
-        self.assertEqual(events[2].time.date(), today)
-        self.assertTrue("errata" in doc.tags.all().values_list("slug", flat=True))
-        self.assertTrue(DocAlias.objects.filter(name="rfc1234", docs=doc))
-        self.assertTrue(DocAlias.objects.filter(name="bcp1", docs=doc))
-        self.assertTrue(DocAlias.objects.filter(name="fyi1", docs=doc))
-        self.assertTrue(DocAlias.objects.filter(name="std1", docs=doc))
-        self.assertTrue(RelatedDocument.objects.filter(source=doc, target__name="rfc123", relationship="updates"))
-        self.assertEqual(doc.title, "A Testing RFC")
-        self.assertEqual(doc.abstract, "This is some interesting text.")
-        self.assertEqual(doc.get_state_slug(), "rfc")
-        self.assertEqual(doc.get_state_slug("draft-iesg"), "pub")
-        self.assertCountEqual(doc.action_holders.all(), [])
-        self.assertEqual(doc.get_state_slug("draft-stream-ise"), "pub")
-        self.assertEqual(doc.std_level_id, "ps")
-        self.assertEqual(doc.pages, 42)
+        changes = []
+        with mock.patch("ietf.sync.rfceditor.log") as mock_log:
+            for rfc_number, _, d, rfc_published in rfceditor.update_docs_from_rfc_index(data, errata, today - datetime.timedelta(days=30)):
+                changes.append({"doc_pk": d.pk, "rfc_published": rfc_published})  # we ignore the actual change list
+                self.assertEqual(rfc_number, 1234)
+                if rfc_published:
+                    self.assertEqual(d.type_id, "rfc")
+                    self.assertEqual(d.rfc_number, rfc_number)
+                else:
+                    self.assertEqual(d.type_id, "draft")
+                    self.assertIsNone(d.rfc_number)
+                    
+        self.assertFalse(mock_log.called, "No log messages expected")
+
+        draft_doc = Document.objects.get(name=draft_doc.name)
+        draft_events = draft_doc.docevent_set.all()
+        self.assertEqual(len(draft_events) - event_count_before, 2)
+        self.assertEqual(draft_events[0].type, "sync_from_rfc_editor")
+        self.assertEqual(draft_events[1].type, "changed_action_holders")
+        self.assertEqual(draft_doc.get_state_slug(), "rfc")
+        self.assertEqual(draft_doc.get_state_slug("draft-iesg"), "pub")
+        self.assertCountEqual(draft_doc.action_holders.all(), [])
+        self.assertEqual(draft_doc.title, draft_title_before)
+        self.assertEqual(draft_doc.abstract, draft_abstract_before)
+        self.assertEqual(draft_doc.pages, draft_pages_before)
         self.assertTrue(not os.path.exists(os.path.join(settings.INTERNET_DRAFT_PATH, draft_filename)))
         self.assertTrue(os.path.exists(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR, draft_filename)))
 
+        rfc_doc = Document.objects.filter(rfc_number=1234, type_id="rfc").first()
+        self.assertIsNotNone(rfc_doc, "RFC document should have been created")
+        self.assertEqual(rfc_doc.author_persons_or_names(), draft_doc.author_persons_or_names())
+        rfc_events = rfc_doc.docevent_set.all()
+        self.assertEqual(len(rfc_events), 8)
+        expected_events = [
+            ["sync_from_rfc_editor", ""], # Not looking for exact desc match here - see detailed tests below
+            ["sync_from_rfc_editor", "Imported membership of rfc1234 in std2 via sync to the rfc-index"],
+            ["std_history_marker", "No history of STD2 is currently available in the datatracker before this point"],
+            ["sync_from_rfc_editor", "Imported membership of rfc1234 in fyi1 via sync to the rfc-index"],
+            ["fyi_history_marker", "No history of FYI1 is currently available in the datatracker before this point"],
+            ["sync_from_rfc_editor", "Imported membership of rfc1234 in bcp1 via sync to the rfc-index"],
+            ["bcp_history_marker", "No history of BCP1 is currently available in the datatracker before this point"],
+            ["published_rfc", "RFC published"]
+        ]
+        for index, [event_type, desc] in enumerate(expected_events):
+            self.assertEqual(rfc_events[index].type, event_type)
+            if index == 0:
+                self.assertIn("Received changes through RFC Editor sync (created document RFC 1234,", rfc_events[0].desc)
+                self.assertIn(f"created became rfc relationship between {rfc_doc.came_from_draft().name} and RFC 1234", rfc_events[0].desc)
+                self.assertIn("set title to 'A Testing RFC'", rfc_events[0].desc)
+                self.assertIn("set abstract to 'This is some interesting text.'", rfc_events[0].desc)
+                self.assertIn("set pages to 42", rfc_events[0].desc)
+                self.assertIn("set standardization level to Proposed Standard", rfc_events[0].desc)
+                self.assertIn(f"added RFC published event at {rfc_events[0].time.astimezone(RPC_TZINFO):%Y-%m-%d}", rfc_events[0].desc)
+                self.assertIn("created updates relation between RFC 1234 and RFC 123", rfc_events[0].desc)
+                self.assertIn("added Errata tag", rfc_events[0].desc)
+            else:
+                self.assertEqual(rfc_events[index].desc, desc)
+        self.assertEqual(rfc_events[7].time.astimezone(RPC_TZINFO).date(), today)
+        for subseries_name in ["bcp1", "fyi1", "std2"]:
+            sub = Document.objects.filter(type_id=subseries_name[:3],name=subseries_name).first()
+            self.assertIsNotNone(sub, f"{subseries_name} not created")
+            self.assertTrue(rfc_doc in sub.contains())
+            self.assertTrue(sub in rfc_doc.part_of())
+        self.assertEqual(rfc_doc.get_state_slug(), "published")
+        # Should have an "errata" tag because there is an errata-url in the index XML, but no "verified-errata" tag
+        # because there is no verified item in the errata JSON with doc-id matching the RFC document.
+        tag_slugs = rfc_doc.tags.values_list("slug", flat=True)
+        self.assertTrue("errata" in tag_slugs)
+        self.assertFalse("verified-errata" in tag_slugs)
+        # TODO: adjust these when we have subseries document types
+        # self.assertTrue(DocAlias.objects.filter(name="rfc1234", docs=rfc_doc))
+        # self.assertTrue(DocAlias.objects.filter(name="bcp1", docs=rfc_doc))
+        # self.assertTrue(DocAlias.objects.filter(name="fyi1", docs=rfc_doc))
+        # self.assertTrue(DocAlias.objects.filter(name="std1", docs=rfc_doc))
+        self.assertTrue(RelatedDocument.objects.filter(source=rfc_doc, target__name="rfc123", relationship="updates").exists())
+        self.assertTrue(RelatedDocument.objects.filter(source=draft_doc, target=rfc_doc, relationship="became_rfc").exists())
+        self.assertEqual(rfc_doc.title, "A Testing RFC")
+        self.assertEqual(rfc_doc.abstract, "This is some interesting text.")
+        self.assertEqual(rfc_doc.std_level_id, "ps")
+        self.assertEqual(rfc_doc.pages, 42)
+        self.assertEqual(rfc_doc.stream, draft_doc.stream)
+        self.assertEqual(rfc_doc.group, draft_doc.group)
+        self.assertEqual(rfc_doc.words, draft_doc.words)
+        self.assertEqual(rfc_doc.ad, draft_doc.ad)
+        self.assertEqual(rfc_doc.external_url, draft_doc.external_url)
+        self.assertEqual(rfc_doc.note, draft_doc.note)
+
+        # check that we got the expected changes
+        self.assertEqual(len(changes), 2)
+        self.assertEqual(changes[0]["doc_pk"], draft_doc.pk)
+        self.assertEqual(changes[0]["rfc_published"], False)
+        self.assertEqual(changes[1]["doc_pk"], rfc_doc.pk)
+        self.assertEqual(changes[1]["rfc_published"], True)
+
         # make sure we can apply it again with no changes
         changed = list(rfceditor.update_docs_from_rfc_index(data, errata, today - datetime.timedelta(days=30)))
         self.assertEqual(len(changed), 0)
 
+    def test_rfc_index_subseries_replacement(self):
+        today = date_today()
+        author = PersonFactory(name="Some Bozo")
+
+        # Start with two BCPs, each containing an rfc
+        rfc1, rfc2, rfc3 = RfcFactory.create_batch(3, authors=[author])
+        bcp1 = BcpFactory(contains=[rfc1])
+        bcp2 = BcpFactory(contains=[rfc2])
+        
+        def _nameify(doc):
+            """Convert a name like 'rfc1' to 'RFC0001"""
+            return f"{doc.name[:3].upper()}{int(doc.name[3:]):04d}"
+
+        # RFC index that replaces rfc2 with rfc3 in bcp2
+        index_xml = f"""<?xml version="1.0" encoding="UTF-8"?>
+<rfc-index xmlns="http://www.rfc-editor.org/rfc-index"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+           xsi:schemaLocation="http://www.rfc-editor.org/rfc-index 
+                               http://www.rfc-editor.org/rfc-index.xsd">
+    <bcp-entry>
+        <doc-id>{_nameify(bcp1)}</doc-id>
+        <is-also>
+            <doc-id>{_nameify(rfc1)}</doc-id>
+        </is-also>
+    </bcp-entry>
+    <bcp-entry>
+        <doc-id>{_nameify(bcp2)}</doc-id>
+        <is-also>
+            <doc-id>{_nameify(rfc3)}</doc-id>
+        </is-also>
+    </bcp-entry>
+    <rfc-entry>
+        <doc-id>{_nameify(rfc1)}</doc-id>
+        <title>{rfc1.title}</title>
+        <author>
+            <name>Some Bozo</name>
+        </author>
+        <date>
+            <month>{today.strftime('%B')}</month>
+            <year>{today.strftime('%Y')}</year>
+        </date>
+        <format>
+            <file-format>ASCII</file-format>
+        </format>
+        <page-count>42</page-count>
+        <keywords>
+            <kw>test</kw>
+        </keywords>
+        <abstract><p>This is some interesting text.</p></abstract>
+        <is-also>
+            <doc-id>{_nameify(bcp1)}</doc-id>
+        </is-also>
+        <current-status>PROPOSED STANDARD</current-status>
+        <publication-status>PROPOSED STANDARD</publication-status>
+        <stream>IETF</stream>
+    </rfc-entry>
+    <rfc-entry>
+        <doc-id>{_nameify(rfc2)}</doc-id>
+        <title>{rfc2.title}</title>
+        <author>
+            <name>Some Bozo</name>
+        </author>
+        <date>
+            <month>{today.strftime('%B')}</month>
+            <year>{today.strftime('%Y')}</year>
+        </date>
+        <format>
+            <file-format>ASCII</file-format>
+        </format>
+        <page-count>42</page-count>
+        <keywords>
+            <kw>test</kw>
+        </keywords>
+        <abstract><p>This is some interesting text.</p></abstract>
+        <current-status>PROPOSED STANDARD</current-status>
+        <publication-status>PROPOSED STANDARD</publication-status>
+        <stream>IETF</stream>
+    </rfc-entry>
+    <rfc-entry>
+        <doc-id>{_nameify(rfc3)}</doc-id>
+        <title>{rfc3.title}</title>
+        <author>
+            <name>Some Bozo</name>
+        </author>
+        <date>
+            <month>{today.strftime('%B')}</month>
+            <year>{today.strftime('%Y')}</year>
+        </date>
+        <format>
+            <file-format>ASCII</file-format>
+        </format>
+        <page-count>42</page-count>
+        <keywords>
+            <kw>test</kw>
+        </keywords>
+        <abstract><p>This is some interesting text.</p></abstract>
+        <is-also>
+            <doc-id>{_nameify(bcp2)}</doc-id>
+        </is-also>
+        <current-status>PROPOSED STANDARD</current-status>
+        <publication-status>PROPOSED STANDARD</publication-status>
+        <stream>IETF</stream>
+    </rfc-entry>
+</rfc-index>"""
+        data = rfceditor.parse_index(io.StringIO(index_xml))  # parse index
+        self.assertEqual(len(data), 3)  # check that we parsed 3 RFCs
+        # Process the data by consuming the generator
+        for _ in rfceditor.update_docs_from_rfc_index(data, []):
+            pass
+        # Confirm that the expected changes were made
+        self.assertCountEqual(rfc1.related_that("contains"), [bcp1])
+        self.assertCountEqual(rfc2.related_that("contains"), [])
+        self.assertCountEqual(rfc3.related_that("contains"), [bcp2])
+
     def _generate_rfc_queue_xml(self, draft, state, auth48_url=None):
         """Generate an RFC queue xml string for a draft"""
         t = '''<rfc-editor-queue xmlns="http://www.rfc-editor.org/rfc-editor-queue">
@@ -520,6 +795,29 @@ def test_update_draft_auth48_url(self):
         auth48_docurl = draft.documenturl_set.filter(tag_id='auth48').first()
         self.assertIsNone(auth48_docurl)
 
+    def test_post_approved_draft_in_production_only(self):
+        self.requests_mock.post("https://rfceditor.example.com/", status_code=200, text="OK")
+
+        # be careful playing with SERVER_MODE!
+        with override_settings(SERVER_MODE="test"):
+            self.assertEqual(
+                rfceditor.post_approved_draft("https://rfceditor.example.com/", "some-draft"),
+                ("", "")
+            )
+            self.assertFalse(self.requests_mock.called)
+        with override_settings(SERVER_MODE="development"):
+            self.assertEqual(
+                rfceditor.post_approved_draft("https://rfceditor.example.com/", "some-draft"),
+                ("", "")
+            )
+            self.assertFalse(self.requests_mock.called)
+        with override_settings(SERVER_MODE="production"):
+            self.assertEqual(
+                rfceditor.post_approved_draft("https://rfceditor.example.com/", "some-draft"),
+                ("", "")
+            )
+            self.assertTrue(self.requests_mock.called)
+
 
 class DiscrepanciesTests(TestCase):
     def test_discrepancies(self):
@@ -559,6 +857,7 @@ def test_discrepancies(self):
         r = self.client.get(urlreverse("ietf.sync.views.discrepancies"))
         self.assertContains(r, doc.name)
 
+
 class RFCEditorUndoTests(TestCase):
     def test_rfceditor_undo(self):
         draft = WgDraftFactory()
@@ -600,4 +899,549 @@ def test_rfceditor_undo(self):
         e = DeletedEvent.objects.all().order_by("-time", "-id")[0]
 
         e.content_type.model_class().objects.create(**json.loads(e.json))
-        self.assertTrue(StateDocEvent.objects.filter(desc="First", doc=draft))
\ No newline at end of file
+        self.assertTrue(StateDocEvent.objects.filter(desc="First", doc=draft))
+
+
+class ErrataTests(TestCase):
+    @override_settings(ERRATA_JSON_BLOB_NAME="myblob.json")
+    def test_get_errata_last_update(self):
+        red_bucket = storages["red_bucket"]  # InMemoryStorage in test
+        red_bucket.save("myblob.json", ContentFile("file"))
+        self.assertEqual(
+            get_errata_last_updated(), red_bucket.get_modified_time("myblob.json")
+        )
+    
+    @override_settings(ERRATA_JSON_BLOB_NAME="myblob.json")
+    def test_get_errata_data(self):
+        red_bucket = storages["red_bucket"]  # InMemoryStorage in test
+        red_bucket.save("myblob.json", ContentFile('[{"value": 3}]'))
+        self.assertEqual(
+            get_errata_data(),
+            [{"value": 3}],
+        )
+
+    def test_errata_map_from_json(self):
+        input_data = [
+            {
+                "doc-id": "not-an-rfc",
+                "errata_status_code": "Verified",
+            },
+            {
+                "doc-id": "rfc01234",
+                "errata_status_code": "Reported",
+            },
+            {
+                "doc-id": "RFC1001",
+                "errata_status_code": "Verified"
+            },
+            {
+                "doc-id": "RfC1234",
+                "errata_status_code": "Verified",
+            },
+        ]
+        expected_output = {1001: [input_data[2]], 1234: [input_data[1], input_data[3]]}
+        self.assertDictEqual(errata_map_from_json(input_data), expected_output)
+
+    @mock.patch("ietf.sync.errata.update_errata_tags")
+    @mock.patch("ietf.sync.errata.get_errata_data")
+    def test_update_errata_from_rfceditor(self, mock_get_data, mock_update):
+        fake_data = object()
+        mock_get_data.return_value = fake_data
+        update_errata_from_rfceditor()
+        self.assertTrue(mock_get_data.called)
+        self.assertTrue(mock_update.called)
+        self.assertEqual(mock_update.call_args, mock.call(fake_data))
+
+    def test_update_errata_tags(self):
+        tag_has_errata = DocTagName.objects.get(slug="errata")
+        tag_has_verified_errata = DocTagName.objects.get(slug="verified-errata")
+
+        rfcs = WgRfcFactory.create_batch(10)
+        rfcs[0].tags.set([tag_has_errata])
+        rfcs[1].tags.set([tag_has_errata, tag_has_verified_errata])
+        rfcs[2].tags.set([tag_has_errata])
+        rfcs[3].tags.set([tag_has_errata, tag_has_verified_errata])
+        rfcs[4].tags.set([tag_has_errata])
+        rfcs[5].tags.set([tag_has_errata, tag_has_verified_errata])
+
+        # Only contains the fields we care about, not the full JSON
+        errata_data = [
+            # rfcs[0] had errata and should keep it
+            {"doc-id": rfcs[0].name, "errata_status_code": "Held for Document Update"},
+            {"doc-id": rfcs[0].name, "errata_status_code": "Rejected"},
+            # rfcs[1] had errata+verified-errata and should keep both
+            {"doc-id": rfcs[1].name, "errata_status_code": "Verified"},
+            # rfcs[2] had errata and should gain verified-errata
+            {"doc-id": rfcs[2].name, "errata_status_code": "Verified"},
+            # rfcs[3] had errata+verified errata and should lose both
+            {"doc-id": rfcs[3].name, "errata_status_code": "Rejected"},
+            # rfcs[4] had errata and should gain verified-errata
+            {"doc-id": rfcs[4].name, "errata_status_code": "Verified"},
+            {"doc-id": rfcs[4].name, "errata_status_code": "Reported"},
+            # rfcs[5] had errata+verified-errata and should lose verified-errata
+            {"doc-id": rfcs[5].name, "errata_status_code": "Reported"},
+            # rfcs[6] had none and should gain errata
+            {"doc-id": rfcs[6].name, "errata_status_code": "Reported"},
+            # rfcs[7] had none and should gain errata+verified-errata
+            {"doc-id": rfcs[7].name, "errata_status_code": "Verified"},
+            # rfcs[8] had none and it should stay that way
+            {"doc-id": rfcs[8].name, "errata_status_code": "Rejected"},
+            # rfcs[9] had none and it should stay that way (no entry at all)
+        ]
+        update_errata_tags(errata_data)
+
+        self.assertCountEqual(rfcs[0].tags.all(), [tag_has_errata])
+        self.assertIsNone(rfcs[0].docevent_set.first())  # no change
+
+        self.assertCountEqual(
+            rfcs[1].tags.all(), [tag_has_errata, tag_has_verified_errata]
+        )
+        self.assertIsNone(rfcs[1].docevent_set.first())  # no change
+
+        self.assertCountEqual(
+            rfcs[2].tags.all(), [tag_has_errata, tag_has_verified_errata]
+        )
+        self.assertEqual(rfcs[2].docevent_set.count(), 1)
+        self.assertIn(": added verified-errata tag", rfcs[2].docevent_set.first().desc)
+
+        self.assertCountEqual(rfcs[3].tags.all(), [])
+        self.assertEqual(rfcs[3].docevent_set.count(), 1)
+        self.assertIn(
+            ": removed errata tag, removed verified-errata tag (all errata rejected)",
+            rfcs[3].docevent_set.first().desc,
+        )
+
+        self.assertCountEqual(
+            rfcs[4].tags.all(), [tag_has_errata, tag_has_verified_errata]
+        )
+        self.assertEqual(rfcs[4].docevent_set.count(), 1)
+        self.assertIn(": added verified-errata tag", rfcs[4].docevent_set.first().desc)
+
+        self.assertCountEqual(rfcs[5].tags.all(), [tag_has_errata])
+        self.assertEqual(rfcs[5].docevent_set.count(), 1)
+        self.assertIn(
+            ": removed verified-errata tag", rfcs[5].docevent_set.first().desc
+        )
+
+        self.assertCountEqual(rfcs[6].tags.all(), [tag_has_errata])
+        self.assertEqual(rfcs[6].docevent_set.count(), 1)
+        self.assertIn(": added errata tag", rfcs[6].docevent_set.first().desc)
+
+        self.assertCountEqual(
+            rfcs[7].tags.all(), [tag_has_errata, tag_has_verified_errata]
+        )
+        self.assertEqual(rfcs[7].docevent_set.count(), 1)
+        self.assertIn(
+            ": added errata tag, added verified-errata tag",
+            rfcs[7].docevent_set.first().desc,
+        )
+
+        self.assertCountEqual(rfcs[8].tags.all(), [])
+        self.assertIsNone(rfcs[8].docevent_set.first())  # no change
+
+        self.assertCountEqual(rfcs[9].tags.all(), [])
+        self.assertIsNone(rfcs[9].docevent_set.first())  # no change
+
+    @override_settings(ERRATA_JSON_BLOB_NAME="myblob.json")
+    @mock.patch("ietf.sync.errata.get_errata_last_updated")
+    def test_update_errata_dirty_time(self, mock_last_updated):
+        ERRATA_SLUG = DirtyBits.Slugs.ERRATA
+        
+        # No time available
+        mock_last_updated.side_effect = FileNotFoundError
+        self.assertIsNone(DirtyBits.objects.filter(slug=ERRATA_SLUG).first())
+        self.assertIsNone(update_errata_dirty_time())  # no blob yet
+        self.assertIsNone(DirtyBits.objects.filter(slug=ERRATA_SLUG).first())
+
+        # Now set a time
+        first_timestamp = timezone.now() - datetime.timedelta(hours=3)
+        mock_last_updated.return_value = first_timestamp
+        mock_last_updated.side_effect = None
+        result = update_errata_dirty_time()
+        self.assertTrue(isinstance(result, DirtyBits))
+        result.refresh_from_db()
+        self.assertEqual(result.slug, ERRATA_SLUG)
+        self.assertEqual(result.processed_time, None)
+        self.assertEqual(result.dirty_time, first_timestamp)
+        
+        # Update the time
+        second_timestamp = timezone.now()
+        mock_last_updated.return_value = second_timestamp
+        second_result = update_errata_dirty_time()
+        self.assertEqual(result.pk, second_result.pk)  # should be the same record
+        result.refresh_from_db()
+        self.assertEqual(result.slug, ERRATA_SLUG)
+        self.assertEqual(result.processed_time, None)
+        self.assertEqual(result.dirty_time, second_timestamp)
+
+    def test_mark_errata_as_processed(self):
+        ERRATA_SLUG = DirtyBits.Slugs.ERRATA
+        first_timestamp = timezone.now()
+        mark_errata_as_processed(first_timestamp)  # no DirtyBits is not an error
+        self.assertIsNone(DirtyBits.objects.filter(slug=ERRATA_SLUG).first())
+        dbits = DirtyBits.objects.create(slug=ERRATA_SLUG, dirty_time=first_timestamp)
+        second_timestamp = timezone.now()
+        mark_errata_as_processed(second_timestamp)
+        dbits.refresh_from_db()
+        self.assertEqual(dbits.dirty_time, first_timestamp)
+        self.assertEqual(dbits.processed_time, second_timestamp)
+        
+
+class TaskTests(TestCase):
+    @override_settings(
+        RFC_EDITOR_INDEX_URL="https://rfc-editor.example.com/index/",
+        RFC_EDITOR_ERRATA_JSON_URL="https://rfc-editor.example.com/errata/",
+    )
+    @mock.patch("ietf.sync.tasks.rfceditor.update_docs_from_rfc_index")
+    @mock.patch("ietf.sync.tasks.rfceditor.parse_index")
+    @mock.patch("ietf.sync.tasks.requests.get")
+    @mock.patch("ietf.sync.tasks.rsync_rfcs_from_rfceditor_task.delay")
+    def test_rfc_editor_index_update_task(
+        self, rsync_task_mock, requests_get_mock, parse_index_mock, update_docs_mock
+    ) -> None:  # the annotation here prevents mypy from complaining about annotation-unchecked
+        """rfc_editor_index_update_task calls helpers correctly
+        
+        This tests that data flow is as expected. Assumes the individual helpers are
+        separately tested to function correctly.
+        """
+        @dataclass
+        class MockIndexData:
+            """Mock index item that claims to be a specified length"""
+            length: int
+
+            def __len__(self):
+                return self.length
+
+        @dataclass
+        class MockResponse:
+            """Mock object that contains text and json() that claims to be a specified length"""
+            text: str
+            json_length: int = 0
+
+            def json(self):
+                return MockIndexData(length=self.json_length)
+
+        # Response objects
+        index_response = MockResponse(text="this is the index")
+        errata_response = MockResponse(
+            text="these are the errata", json_length=rfceditor.MIN_ERRATA_RESULTS
+        )
+        rfc = RfcFactory()
+    
+        # Test with full_index = False
+        rsync_task_mock.return_value = None
+        requests_get_mock.side_effect = (index_response, errata_response)  # will step through these
+        parse_index_mock.return_value = MockIndexData(length=rfceditor.MIN_INDEX_RESULTS)
+        update_docs_mock.return_value = (
+            (rfc.rfc_number, ("something changed",), rfc, False),
+        )
+
+        tasks.rfc_editor_index_update_task(full_index=False)
+
+        # Check parse_index() call
+        self.assertTrue(parse_index_mock.called)
+        (parse_index_args, _) = parse_index_mock.call_args
+        self.assertEqual(
+            parse_index_args[0].read(),  # arg is a StringIO
+            "this is the index",
+            "parse_index is called with the index text in a StringIO",
+        )
+
+        # Check update_docs_from_rfc_index call
+        self.assertTrue(update_docs_mock.called)
+        (update_docs_args, update_docs_kwargs) = update_docs_mock.call_args
+        self.assertEqual(
+            update_docs_args, (parse_index_mock.return_value, errata_response.json())
+        )
+        self.assertIsNotNone(update_docs_kwargs["skip_older_than_date"])
+
+        self.assertFalse(rsync_task_mock.called)
+
+        # Test again with full_index = True
+        requests_get_mock.reset_mock()
+        parse_index_mock.reset_mock()
+        update_docs_mock.reset_mock()
+        rsync_task_mock.reset_mock()
+        requests_get_mock.side_effect = (index_response, errata_response)  # will step through these
+        tasks.rfc_editor_index_update_task(full_index=True)
+
+        # Check parse_index() call
+        self.assertTrue(parse_index_mock.called)
+        (parse_index_args, _) = parse_index_mock.call_args
+        self.assertEqual(
+            parse_index_args[0].read(),  # arg is a StringIO
+            "this is the index",
+            "parse_index is called with the index text in a StringIO",
+        )
+
+        # Check update_docs_from_rfc_index call
+        self.assertTrue(update_docs_mock.called)
+        (update_docs_args, update_docs_kwargs) = update_docs_mock.call_args
+        self.assertEqual(
+            update_docs_args, (parse_index_mock.return_value, errata_response.json())
+        )
+        self.assertIsNone(update_docs_kwargs["skip_older_than_date"])
+
+        self.assertFalse(rsync_task_mock.called)
+
+        # Test again where the index would cause a new RFC to come into existance
+        requests_get_mock.reset_mock()
+        parse_index_mock.reset_mock()
+        update_docs_mock.reset_mock()
+        rsync_task_mock.reset_mock()
+        requests_get_mock.side_effect = (
+            index_response,
+            errata_response,
+        )  # will step through these
+        update_docs_mock.return_value = (
+            (rfc.rfc_number, ("something changed",), rfc, True),
+        )
+        tasks.rfc_editor_index_update_task(full_index=True)
+        self.assertTrue(rsync_task_mock.called)
+        rsync_task_args, rsync_task_kwargs = rsync_task_mock.call_args
+        self.assertEqual((([rfc.rfc_number],), {}), (rsync_task_args, rsync_task_kwargs))
+
+        # Test error handling
+        requests_get_mock.reset_mock()
+        parse_index_mock.reset_mock()
+        update_docs_mock.reset_mock()
+        rsync_task_mock.reset_mock()
+        requests_get_mock.side_effect = requests.Timeout  # timeout on every get()
+        tasks.rfc_editor_index_update_task(full_index=False)
+        self.assertFalse(parse_index_mock.called)
+        self.assertFalse(update_docs_mock.called)
+        self.assertFalse(rsync_task_mock.called)
+        
+        requests_get_mock.reset_mock()
+        parse_index_mock.reset_mock()
+        update_docs_mock.reset_mock()
+        rsync_task_mock.reset_mock()
+        requests_get_mock.side_effect = [index_response, requests.Timeout]  # timeout second get()
+        tasks.rfc_editor_index_update_task(full_index=False)
+        self.assertFalse(update_docs_mock.called)
+        self.assertFalse(rsync_task_mock.called)
+
+        requests_get_mock.reset_mock()
+        parse_index_mock.reset_mock()
+        update_docs_mock.reset_mock()
+        rsync_task_mock.reset_mock()
+        requests_get_mock.side_effect = [index_response, errata_response]
+        # feed in an index that is too short
+        parse_index_mock.return_value = MockIndexData(length=rfceditor.MIN_INDEX_RESULTS - 1)
+        tasks.rfc_editor_index_update_task(full_index=False)
+        self.assertTrue(parse_index_mock.called)
+        self.assertFalse(update_docs_mock.called)
+        self.assertFalse(rsync_task_mock.called)
+
+        requests_get_mock.reset_mock()
+        parse_index_mock.reset_mock()
+        update_docs_mock.reset_mock()
+        rsync_task_mock.reset_mock()
+        requests_get_mock.side_effect = [index_response, errata_response]
+        errata_response.json_length = rfceditor.MIN_ERRATA_RESULTS - 1  # too short
+        parse_index_mock.return_value = MockIndexData(length=rfceditor.MIN_INDEX_RESULTS)
+        tasks.rfc_editor_index_update_task(full_index=False)
+        self.assertFalse(update_docs_mock.called)
+        self.assertFalse(rsync_task_mock.called)
+
+    @override_settings(RFC_EDITOR_QUEUE_URL="https://rfc-editor.example.com/queue/")
+    @mock.patch("ietf.sync.tasks.update_drafts_from_queue")
+    @mock.patch("ietf.sync.tasks.parse_queue")
+    def test_rfc_editor_queue_updates_task(self, mock_parse, mock_update):
+        # test a request timeout
+        self.requests_mock.get("https://rfc-editor.example.com/queue/", exc=requests.exceptions.Timeout)
+        tasks.rfc_editor_queue_updates_task()
+        self.assertFalse(mock_parse.called)
+        self.assertFalse(mock_update.called)
+        
+        # now return a value rather than an exception
+        self.requests_mock.get("https://rfc-editor.example.com/queue/", text="the response")
+
+        # mock returning < MIN_QUEUE_RESULTS values - treated as an error, so no update takes place
+        mock_parse.return_value = ([n for n in range(rfceditor.MIN_QUEUE_RESULTS - 1)], ["a warning"])
+        tasks.rfc_editor_queue_updates_task()
+        self.assertEqual(mock_parse.call_count, 1)
+        self.assertEqual(mock_parse.call_args[0][0].read(), "the response")
+        self.assertFalse(mock_update.called)
+        mock_parse.reset_mock()
+        
+        # mock returning +. MIN_QUEUE_RESULTS - should succeed
+        mock_parse.return_value = ([n for n in range(rfceditor.MIN_QUEUE_RESULTS)], ["a warning"])
+        mock_update.return_value = ([1,2,3], ["another warning"])
+        tasks.rfc_editor_queue_updates_task()
+        self.assertEqual(mock_parse.call_count, 1)
+        self.assertEqual(mock_parse.call_args[0][0].read(), "the response")
+        self.assertEqual(mock_update.call_count, 1)
+        self.assertEqual(mock_update.call_args, mock.call([n for n in range(rfceditor.MIN_QUEUE_RESULTS)]))
+
+    @override_settings(IANA_SYNC_CHANGES_URL="https://iana.example.com/sync/")
+    @mock.patch("ietf.sync.tasks.iana.update_history_with_changes")
+    @mock.patch("ietf.sync.tasks.iana.parse_changes_json")
+    @mock.patch("ietf.sync.tasks.iana.fetch_changes_json")
+    def test_iana_changes_update_task(
+        self, 
+        fetch_changes_mock,
+        parse_changes_mock,
+        update_history_mock,
+    ):
+        # set up mocks
+        fetch_return_val = object()
+        fetch_changes_mock.return_value = fetch_return_val
+        parse_return_val = object()
+        parse_changes_mock.return_value = parse_return_val
+        event_with_json = DocEventFactory()
+        event_with_json.json = "hi I'm json"
+        update_history_mock.return_value = [
+            [event_with_json],  # events
+            ["oh no!"],  # warnings
+        ]
+        
+        tasks.iana_changes_update_task()
+        self.assertEqual(fetch_changes_mock.call_count, 1)
+        self.assertEqual(
+            fetch_changes_mock.call_args[0][0],
+            "https://iana.example.com/sync/",
+        )
+        self.assertTrue(parse_changes_mock.called)
+        self.assertEqual(
+            parse_changes_mock.call_args,
+            ((fetch_return_val,), {}),
+        )
+        self.assertTrue(update_history_mock.called)
+        self.assertEqual(
+            update_history_mock.call_args,
+            ((parse_return_val,), {"send_email": True}),
+        )
+
+    @override_settings(IANA_SYNC_PROTOCOLS_URL="https://iana.example.com/proto/")
+    @mock.patch("ietf.sync.tasks.iana.update_rfc_log_from_protocol_page")
+    @mock.patch("ietf.sync.tasks.iana.parse_protocol_page")
+    @mock.patch("ietf.sync.tasks.requests.get")
+    def test_iana_protocols_update_task(
+        self,
+        requests_get_mock,
+        parse_protocols_mock,
+        update_rfc_log_mock,
+    ):
+        # set up mocks
+        requests_get_mock.return_value = mock.Mock(text="fetched response")
+        parse_protocols_mock.return_value = range(110)  # larger than batch size of 100
+        update_rfc_log_mock.return_value = [
+            mock.Mock(display_name=mock.Mock(return_value="name"))
+        ]
+        
+        # call the task
+        tasks.iana_protocols_update_task()
+        
+        # check that it did the right things
+        self.assertTrue(requests_get_mock.called)
+        self.assertEqual(
+            requests_get_mock.call_args[0], 
+            ("https://iana.example.com/proto/",),
+        )
+        self.assertTrue(parse_protocols_mock.called)
+        self.assertEqual(
+            parse_protocols_mock.call_args[0],
+            ("fetched response",),
+        )
+        self.assertEqual(update_rfc_log_mock.call_count, 2)
+        self.assertEqual(
+            update_rfc_log_mock.call_args_list[0][0][0],
+            range(100),  # first batch
+        )
+        self.assertEqual(
+            update_rfc_log_mock.call_args_list[1][0][0],
+            range(100, 110),  # second batch
+        )
+        # make sure the calls use the same later_than date and that it's the expected one
+        published_later_than = set(
+            update_rfc_log_mock.call_args_list[n][0][1] for n in (0, 1)
+        )
+        self.assertEqual(
+            published_later_than, 
+            {datetime.datetime(2012,11,26,tzinfo=datetime.UTC)}
+        )
+
+        # try with an exception
+        requests_get_mock.reset_mock()
+        parse_protocols_mock.reset_mock()
+        update_rfc_log_mock.reset_mock()
+        requests_get_mock.side_effect = requests.Timeout
+
+        tasks.iana_protocols_update_task()
+        self.assertTrue(requests_get_mock.called)
+        self.assertFalse(parse_protocols_mock.called)
+        self.assertFalse(update_rfc_log_mock.called)
+
+    @mock.patch("ietf.sync.tasks.rsync_helper")
+    @mock.patch("ietf.sync.tasks.load_rfcs_into_blobdb")
+    @mock.patch("ietf.sync.tasks.rebuild_reference_relations_task.delay")
+    def test_rsync_rfcs_from_rfceditor_task(
+        self,
+        rebuild_relations_mock,
+        load_blobs_mock,
+        rsync_helper_mock,
+    ):
+        tasks.rsync_rfcs_from_rfceditor_task([12345, 54321])
+        self.assertTrue(rsync_helper_mock.called)
+        self.assertTrue(load_blobs_mock.called)
+        load_blobs_args, load_blobs_kwargs = load_blobs_mock.call_args
+        self.assertEqual(load_blobs_args, ([12345, 54321],))
+        self.assertEqual(load_blobs_kwargs, {})
+        self.assertTrue(rebuild_relations_mock.called)
+        rebuild_args, rebuild_kwargs = rebuild_relations_mock.call_args
+        self.assertEqual(rebuild_args, (["rfc12345", "rfc54321"],))
+        self.assertEqual(rebuild_kwargs, {})
+
+    @mock.patch("ietf.sync.tasks.load_rfcs_into_blobdb")
+    def test_load_rfcs_into_blobdb_task(
+        self,
+        load_blobs_mock,
+    ):
+        tasks.load_rfcs_into_blobdb_task(5, 3)
+        self.assertFalse(load_blobs_mock.called)
+        load_blobs_mock.reset_mock()
+        tasks.load_rfcs_into_blobdb_task(-1, 1)
+        self.assertTrue(load_blobs_mock.called)
+        mock_args, mock_kwargs = load_blobs_mock.call_args
+        self.assertEqual(mock_args, ([1],))
+        self.assertEqual(mock_kwargs, {})
+        load_blobs_mock.reset_mock()
+        tasks.load_rfcs_into_blobdb_task(10999, 50000)
+        self.assertTrue(load_blobs_mock.called)
+        mock_args, mock_kwargs = load_blobs_mock.call_args
+        self.assertEqual(mock_args, ([10999, 11000],))
+        self.assertEqual(mock_kwargs, {})
+        load_blobs_mock.reset_mock()
+        tasks.load_rfcs_into_blobdb_task(3261, 3263)
+        self.assertTrue(load_blobs_mock.called)
+        mock_args, mock_kwargs = load_blobs_mock.call_args
+        self.assertEqual(mock_args, ([3261, 3262, 3263],))
+        self.assertEqual(mock_kwargs, {})
+
+
+    @mock.patch("ietf.sync.tasks.update_errata_from_rfceditor")
+    @mock.patch("ietf.sync.tasks.mark_rfcindex_as_dirty")
+    @mock.patch("ietf.sync.tasks.mark_errata_as_processed")
+    @mock.patch("ietf.sync.tasks.errata_are_dirty")
+    def test_update_errata_from_rfceditor_task(
+        self,
+        mock_errata_are_dirty,
+        mock_mark_errata_processed,
+        mock_mark_rfcindex_dirty,
+        mock_update,
+    ):
+        mock_errata_are_dirty.return_value = False
+        update_errata_from_rfceditor_task()
+        self.assertTrue(mock_errata_are_dirty.called)
+        self.assertFalse(mock_mark_errata_processed.called)
+        self.assertFalse(mock_mark_rfcindex_dirty.called)
+        self.assertFalse(mock_update.called)
+
+        mock_errata_are_dirty.reset_mock()
+        mock_errata_are_dirty.return_value = True
+        update_errata_from_rfceditor_task()
+        self.assertTrue(mock_errata_are_dirty.called)
+        self.assertTrue(mock_mark_errata_processed.called)
+        self.assertTrue(mock_mark_rfcindex_dirty.called)
+        self.assertTrue(mock_update.called)
diff --git a/ietf/sync/tests_rfcindex.py b/ietf/sync/tests_rfcindex.py
new file mode 100644
index 0000000000..541ffbb228
--- /dev/null
+++ b/ietf/sync/tests_rfcindex.py
@@ -0,0 +1,413 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+import json
+from unittest import mock
+
+from django.core.files.base import ContentFile
+from django.core.files.storage import storages
+from django.test.utils import override_settings
+from lxml import etree
+
+from ietf.doc.factories import (
+    BcpFactory,
+    FyiFactory,
+    StdFactory,
+    IndividualRfcFactory,
+    PublishedRfcDocEventFactory,
+)
+from ietf.name.models import DocTagName
+from ietf.sync.rfcindex import (
+    create_bcp_txt_index,
+    create_fyi_txt_index,
+    create_rfc_txt_index,
+    create_rfc_xml_index,
+    create_std_txt_index,
+    format_rfc_number,
+    get_april1_rfc_numbers,
+    get_publication_std_levels,
+    get_unusable_rfc_numbers,
+    save_to_red_bucket,
+    subseries_text_line,
+)
+from ietf.utils.test_utils import TestCase
+
+
+class RfcIndexTests(TestCase):
+    """Tests of rfc-index generation
+
+    Tests are limited and should cover more cases. Needs:
+      * test of subseries docs
+      * test of related docs (obsoletes/updates + reverse directions)
+      * more thorough validation of index contents
+
+    Be careful when calling create_rfc_txt_index() or create_rfc_xml_index(). These
+    will save to a storage by default, which can introduce cross-talk between tests.
+    Best to patch that method with a mock.
+    """
+
+    def setUp(self):
+        super().setUp()
+        red_bucket = storages["red_bucket"]
+
+        # Create an unused RFC number
+        red_bucket.save(
+            "input/unusable-rfc-numbers.json",
+            ContentFile(json.dumps([{"number": 123, "comment": ""}])),
+        )
+
+        # actual April 1 RFC
+        self.april_fools_rfc = PublishedRfcDocEventFactory(
+            time="2020-04-01T12:00:00Z",
+            doc=IndividualRfcFactory(
+                name="rfc4560",
+                rfc_number=4560,
+                stream_id="ise",
+                std_level_id="inf",
+            ),
+        ).doc
+        # Set up a JSON file to flag the April 1 RFC
+        red_bucket.save(
+            "input/april-first-rfc-numbers.json",
+            ContentFile(json.dumps([self.april_fools_rfc.rfc_number])),
+        )
+
+        # non-April Fools RFC that happens to have been published on April 1
+        self.rfc = PublishedRfcDocEventFactory(
+            time="2021-04-01T12:00:00Z",
+            doc__name="rfc10000",
+            doc__rfc_number=10000,
+            doc__std_level_id="std",
+        ).doc
+        self.rfc.tags.add(DocTagName.objects.get(slug="errata"))
+
+        # Create a BCP with non-April Fools RFC
+        self.bcp = BcpFactory(contains=[self.rfc], name="bcp11")
+
+        # Create a STD with non-April Fools RFC
+        self.std = StdFactory(contains=[self.rfc], name="std11")
+
+        # Create a FYI with non-April Fools RFC
+        self.fyi = FyiFactory(contains=[self.rfc], name="fyi11")
+
+        # Set up a publication-std-levels.json file to indicate the publication
+        # standard of self.rfc as different from its current value
+        red_bucket.save(
+            "input/publication-std-levels.json",
+            ContentFile(
+                json.dumps(
+                    [{"number": self.rfc.rfc_number, "publication_std_level": "ps"}]
+                )
+            ),
+        )
+
+    def tearDown(self):
+        red_bucket = storages["red_bucket"]
+        red_bucket.delete("input/unusable-rfc-numbers.json")
+        red_bucket.delete("input/april-first-rfc-numbers.json")
+        red_bucket.delete("input/publication-std-levels.json")
+        super().tearDown()
+
+    @override_settings(RFCINDEX_INPUT_PATH="input/")
+    @mock.patch("ietf.sync.rfcindex.save_to_red_bucket")
+    def test_create_rfc_txt_index(self, mock_save):
+        create_rfc_txt_index()
+        self.assertEqual(mock_save.call_count, 1)
+        self.assertEqual(mock_save.call_args[0][0], "rfc-index.txt")
+        contents = mock_save.call_args[0][1]
+        self.assertTrue(isinstance(contents, str))
+        self.assertIn(
+            "123 Not Issued.",
+            contents,
+        )
+        # No zero prefix!
+        self.assertNotIn(
+            "0123 Not Issued.",
+            contents,
+        )
+        self.assertIn(
+            f"{self.april_fools_rfc.rfc_number} {self.april_fools_rfc.title}",
+            contents,
+        )
+        self.assertIn("1 April 2020", contents)  # from the April 1 RFC
+        self.assertIn(
+            f"{self.rfc.rfc_number} {self.rfc.title}",
+            contents,
+        )
+        self.assertIn("April 2021", contents)  # from the non-April 1 RFC
+        self.assertNotIn("1 April 2021", contents)
+
+    @override_settings(RFCINDEX_INPUT_PATH="input/")
+    @mock.patch("ietf.sync.rfcindex.save_to_red_bucket")
+    def test_create_rfc_xml_index(self, mock_save):
+        create_rfc_xml_index()
+        self.assertEqual(mock_save.call_count, 1)
+        self.assertEqual(mock_save.call_args[0][0], "rfc-index.xml")
+        contents = mock_save.call_args[0][1]
+        self.assertTrue(isinstance(contents, bytes))
+        ns = "{https://www.rfc-editor.org/rfc-index}"  # NOT an f-string
+        index = etree.fromstring(contents)
+
+        # We can aspire to validating the schema - currently does not conform because
+        # XSD expects 4-digit RFC numbers (etc).
+        #
+        # xmlschema = etree.XMLSchema(etree.fromstring(
+        #     Path(__file__).with_name("rfc-index.xsd").read_bytes())
+        # )
+        # xmlschema.assertValid(index)
+
+        children = list(index)  # elements as list
+        # Should be one rfc-not-issued-entry
+        self.assertEqual(len(children), 16)
+        self.assertEqual(
+            [
+                c.find(f"{ns}doc-id").text
+                for c in children
+                if c.tag == f"{ns}rfc-not-issued-entry"
+            ],
+            ["RFC123"],
+        )
+        # Should be two rfc-entries
+        rfc_entries = {
+            c.find(f"{ns}doc-id").text: c for c in children if c.tag == f"{ns}rfc-entry"
+        }
+
+        # Check the April Fool's entry
+        april_fools_entry = rfc_entries[self.april_fools_rfc.name.upper()]
+        self.assertEqual(
+            april_fools_entry.find(f"{ns}title").text,
+            self.april_fools_rfc.title,
+        )
+        self.assertEqual(
+            [(c.tag, c.text) for c in april_fools_entry.find(f"{ns}date")],
+            [(f"{ns}month", "April"), (f"{ns}day", "1"), (f"{ns}year", "2020")],
+        )
+        self.assertEqual(
+            april_fools_entry.find(f"{ns}current-status").text,
+            "INFORMATIONAL",
+        )
+        self.assertEqual(
+            april_fools_entry.find(f"{ns}publication-status").text,
+            "UNKNOWN",
+        )
+
+        # Check the Regular entry
+        rfc_entry = rfc_entries[self.rfc.name.upper()]
+        self.assertEqual(rfc_entry.find(f"{ns}title").text, self.rfc.title)
+        self.assertEqual(
+            rfc_entry.find(f"{ns}current-status").text, "INTERNET STANDARD"
+        )
+        self.assertEqual(
+            rfc_entry.find(f"{ns}publication-status").text, "PROPOSED STANDARD"
+        )
+        self.assertEqual(
+            [(c.tag, c.text) for c in rfc_entry.find(f"{ns}date")],
+            [(f"{ns}month", "April"), (f"{ns}year", "2021")],
+        )
+
+    @override_settings(RFCINDEX_INPUT_PATH="input/")
+    @mock.patch("ietf.sync.rfcindex.save_to_red_bucket")
+    def test_create_bcp_txt_index(self, mock_save):
+        create_bcp_txt_index()
+        self.assertEqual(mock_save.call_count, 1)
+        self.assertEqual(mock_save.call_args[0][0], "bcp-index.txt")
+        contents = mock_save.call_args[0][1]
+        self.assertTrue(isinstance(contents, str))
+        # starts from 1
+        self.assertIn(
+            "[BCP1]",
+            contents,
+        )
+        # fill up to 11
+        self.assertIn(
+            "[BCP10]",
+            contents,
+        )
+        # but not to 12
+        self.assertNotIn(
+            "[BCP12]",
+            contents,
+        )
+        # Test empty BCPs
+        self.assertIn(
+            "Best Current Practice 9 currently contains no RFCs",
+            contents,
+        )
+        # No zero prefix!
+        self.assertNotIn(
+            "[BCP0001]",
+            contents,
+        )
+        # Has BCP11 with a RFC
+        self.assertIn(
+            "Best Current Practice 11,",
+            contents,
+        )
+        self.assertIn(
+            f'"{self.rfc.title}"',
+            contents,
+        )
+        self.assertIn(
+            "BCP 11,",
+            contents,
+        )
+        self.assertIn(
+            f"RFC {self.rfc.rfc_number},",
+            contents,
+        )
+
+    @override_settings(RFCINDEX_INPUT_PATH="input/")
+    @mock.patch("ietf.sync.rfcindex.save_to_red_bucket")
+    def test_create_std_txt_index(self, mock_save):
+        create_std_txt_index()
+        self.assertEqual(mock_save.call_count, 1)
+        self.assertEqual(mock_save.call_args[0][0], "std-index.txt")
+        contents = mock_save.call_args[0][1]
+        self.assertTrue(isinstance(contents, str))
+        # starts from 1
+        self.assertIn(
+            "[STD1]",
+            contents,
+        )
+        # fill up to 11
+        self.assertIn(
+            "[STD10]",
+            contents,
+        )
+        # but not to 12
+        self.assertNotIn(
+            "[STD12]",
+            contents,
+        )
+        # Test empty STDs
+        self.assertIn(
+            "Internet Standard 9 currently contains no RFCs",
+            contents,
+        )
+        # No zero prefix!
+        self.assertNotIn(
+            "[STD0001]",
+            contents,
+        )
+        # Has STD11 with a RFC
+        self.assertIn(
+            "Internet Standard 11,",
+            contents,
+        )
+        self.assertIn(
+            f'"{self.rfc.title}"',
+            contents,
+        )
+        self.assertIn(
+            "STD 11,",
+            contents,
+        )
+        self.assertIn(
+            f"RFC {self.rfc.rfc_number},",
+            contents,
+        )
+
+    @override_settings(RFCINDEX_INPUT_PATH="input/")
+    @mock.patch("ietf.sync.rfcindex.save_to_red_bucket")
+    def test_create_fyi_txt_index(self, mock_save):
+        create_fyi_txt_index()
+        self.assertEqual(mock_save.call_count, 1)
+        self.assertEqual(mock_save.call_args[0][0], "fyi-index.txt")
+        contents = mock_save.call_args[0][1]
+        self.assertTrue(isinstance(contents, str))
+        # starts from 1
+        self.assertIn(
+            "[FYI1]",
+            contents,
+        )
+        # fill up to 11
+        self.assertIn(
+            "[FYI10]",
+            contents,
+        )
+        # but not to 12
+        self.assertNotIn(
+            "[FYI12]",
+            contents,
+        )
+        # Test empty FYIs
+        self.assertIn(
+            "For Your Information 9 currently contains no RFCs",
+            contents,
+        )
+        # No zero prefix!
+        self.assertNotIn(
+            "[FYI0001]",
+            contents,
+        )
+        # Has FYI11 with a RFC
+        self.assertIn(
+            "For Your Information 11,",
+            contents,
+        )
+        self.assertIn(
+            f'"{self.rfc.title}"',
+            contents,
+        )
+        self.assertIn(
+            "FYI 11,",
+            contents,
+        )
+        self.assertIn(
+            f"RFC {self.rfc.rfc_number},",
+            contents,
+        )
+
+
+class HelperTests(TestCase):
+    def test_format_rfc_number(self):
+        self.assertEqual(format_rfc_number(10), "10")
+        with override_settings(RFCINDEX_MATCH_LEGACY_XML=True):
+            self.assertEqual(format_rfc_number(10), "0010")
+
+    def test_save_to_red_bucket(self):
+        red_bucket = storages["red_bucket"]
+        with override_settings(RFCINDEX_DELETE_THEN_WRITE=False):
+            save_to_red_bucket("test", "contents \U0001f600")
+        # Read as binary and explicitly decode to confirm encoding
+        with red_bucket.open("test", "rb") as f:
+            self.assertEqual(f.read().decode("utf-8"), "contents \U0001f600")
+        with override_settings(RFCINDEX_DELETE_THEN_WRITE=True):
+            save_to_red_bucket("test", "new contents \U0001fae0".encode("utf-8"))
+        # Read as binary and explicitly decode to confirm encoding
+        with red_bucket.open("test", "rb") as f:
+            self.assertEqual(f.read().decode("utf-8"), "new contents \U0001fae0")
+        red_bucket.delete("test")  # clean up like a good child
+
+    def test_get_unusable_rfc_numbers_raises(self):
+        """get_unusable_rfc_numbers should bail on errors"""
+        with self.assertRaises(FileNotFoundError):
+            get_unusable_rfc_numbers()
+        red_bucket = storages["red_bucket"]
+        red_bucket.save("unusable-rfc-numbers.json", ContentFile("not json"))
+        with self.assertRaises(json.JSONDecodeError):
+            get_unusable_rfc_numbers()
+        red_bucket.delete("unusable-rfc-numbers.json")
+
+    def test_get_april1_rfc_numbers_raises(self):
+        """get_april1_rfc_numbers should bail on errors"""
+        with self.assertRaises(FileNotFoundError):
+            get_april1_rfc_numbers()
+        red_bucket = storages["red_bucket"]
+        red_bucket.save("april-first-rfc-numbers.json", ContentFile("not json"))
+        with self.assertRaises(json.JSONDecodeError):
+            get_april1_rfc_numbers()
+        red_bucket.delete("april-first-rfc-numbers.json")
+
+    def test_get_publication_std_levels_raises(self):
+        """get_publication_std_levels should bail on errors"""
+        with self.assertRaises(FileNotFoundError):
+            get_publication_std_levels()
+        red_bucket = storages["red_bucket"]
+        red_bucket.save("publication-std-levels.json", ContentFile("not json"))
+        with self.assertRaises(json.JSONDecodeError):
+            get_publication_std_levels()
+        red_bucket.delete("publication-std-levels.json")
+
+    def test_subseries_text_line(self):
+        text = "foobar"
+        self.assertEqual(subseries_text_line(line=text, first=True), f"   {text}")
+        self.assertEqual(subseries_text_line(line=text), f"              {text}")
diff --git a/ietf/sync/tests_utils.py b/ietf/sync/tests_utils.py
new file mode 100644
index 0000000000..bb4a859e30
--- /dev/null
+++ b/ietf/sync/tests_utils.py
@@ -0,0 +1,84 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+from django.test import override_settings
+from ietf import settings
+from ietf.doc.factories import RfcFactory
+from ietf.doc.storage_utils import exists_in_storage, retrieve_str
+from ietf.sync.utils import build_from_file_content, load_rfcs_into_blobdb, rsync_helper
+from ietf.utils.test_utils import TestCase
+
+
+class RsyncHelperTests(TestCase):
+    def test_rsync_helper(self):
+        with (
+            TemporaryDirectory() as source_dir,
+            TemporaryDirectory() as dest_dir,
+        ):
+            with (Path(source_dir) / "canary.txt").open("w") as canary_source_file:
+                canary_source_file.write("chirp")
+            rsync_helper(
+                [
+                    "-a",
+                    f"{source_dir}/",
+                    f"{dest_dir}/",
+                ]
+            )
+            with (Path(dest_dir) / "canary.txt").open("r") as canary_dest_file:
+                chirp = canary_dest_file.read()
+            self.assertEqual(chirp, "chirp")
+
+    def test_build_from_file_content(self):
+        content = build_from_file_content([12345, 54321])
+        self.assertEqual(
+            content,
+            """prerelease/
+rfc12345.txt
+rfc12345.html
+rfc12345.xml
+rfc12345.pdf
+rfc12345.ps
+rfc12345.json
+prerelease/rfc12345.notprepped.xml
+rfc54321.txt
+rfc54321.html
+rfc54321.xml
+rfc54321.pdf
+rfc54321.ps
+rfc54321.json
+prerelease/rfc54321.notprepped.xml
+""",
+        )
+
+
+class RfcBlobUploadTests(TestCase):
+    def test_load_rfcs_into_blobdb(self):
+        with TemporaryDirectory() as faux_rfc_path:
+            with override_settings(RFC_PATH=faux_rfc_path):
+                rfc_path = Path(faux_rfc_path)
+                (rfc_path / "prerelease").mkdir()
+                for num in [12345, 54321]:
+                    RfcFactory(rfc_number=num)
+                    for ext in settings.RFC_FILE_TYPES + ("json",):
+                        with (rfc_path / f"rfc{num}.{ext}").open("w") as f:
+                            f.write(ext)
+                    with (rfc_path / "rfc{num}.bogon").open("w") as f:
+                        f.write("bogon")
+                    with (rfc_path / "prerelease" / f"rfc{num}.notprepped.xml").open(
+                        "w"
+                    ) as f:
+                        f.write("notprepped")
+                load_rfcs_into_blobdb([12345, 54321])
+                for num in [12345, 54321]:
+                    for ext in settings.RFC_FILE_TYPES + ("json",):
+                        self.assertEqual(
+                            retrieve_str("rfc", f"{ext}/rfc{num}.{ext}"),
+                            ext,
+                        )
+                    self.assertFalse(exists_in_storage("rfc", f"bogon/rfc{num}.bogon"))
+                    self.assertEqual(
+                        retrieve_str("rfc", f"notprepped/rfc{num}.notprepped.xml"),
+                        "notprepped",
+                    )
diff --git a/ietf/sync/utils.py b/ietf/sync/utils.py
new file mode 100644
index 0000000000..b3bdd8d206
--- /dev/null
+++ b/ietf/sync/utils.py
@@ -0,0 +1,77 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+import datetime
+import subprocess
+
+from pathlib import Path
+
+from django.conf import settings
+from ietf.utils import log
+from ietf.doc.models import Document
+from ietf.doc.storage_utils import AlreadyExistsError, store_bytes
+
+
+def rsync_helper(subprocess_arg_array: list[str]):
+    subprocess.run(["/usr/bin/rsync"]+subprocess_arg_array)
+
+def build_from_file_content(rfc_numbers: list[int]) -> str:
+    types_to_sync = settings.RFC_FILE_TYPES + ("json",)
+    lines = []
+    lines.append("prerelease/")
+    for num in rfc_numbers:
+        for ext in types_to_sync:
+            lines.append(f"rfc{num}.{ext}")
+        lines.append(f"prerelease/rfc{num}.notprepped.xml")
+    return "\n".join(lines)+"\n"
+
+def load_rfcs_into_blobdb(numbers: list[int]):
+    types_to_load = settings.RFC_FILE_TYPES + ("json",)
+    rfc_docs = Document.objects.filter(type="rfc", rfc_number__in=numbers).values_list("rfc_number", flat=True)
+    for num in numbers:
+        if num in rfc_docs:
+            for ext in types_to_load:
+                fs_path = Path(settings.RFC_PATH) / f"rfc{num}.{ext}"
+                if fs_path.is_file():
+                    with fs_path.open("rb") as f:
+                        bytes = f.read()
+                    mtime = fs_path.stat().st_mtime
+                    try:
+                        store_bytes(
+                            kind="rfc",
+                            name=f"{ext}/rfc{num}.{ext}",
+                            content=bytes,
+                            allow_overwrite=False,  # Intentionally not allowing overwrite.
+                            doc_name=f"rfc{num}",
+                            doc_rev=None,
+                            # Not setting content_type
+                            mtime=datetime.datetime.fromtimestamp(
+                                mtime, tz=datetime.UTC
+                            ),
+                        )
+                    except AlreadyExistsError as e:
+                        log.log(str(e))
+
+            # store the not-prepped xml
+            name = f"rfc{num}.notprepped.xml"
+            source = Path(settings.RFC_PATH) / "prerelease" / name
+            if source.is_file():
+                with open(source, "rb") as f:
+                    bytes = f.read()
+                mtime = source.stat().st_mtime
+                try:
+                    store_bytes(
+                        kind="rfc",
+                        name=f"notprepped/{name}",
+                        content=bytes,
+                        allow_overwrite=False,  # Intentionally not allowing overwrite.
+                        doc_name=f"rfc{num}",
+                        doc_rev=None,
+                        # Not setting content_type
+                        mtime=datetime.datetime.fromtimestamp(mtime, tz=datetime.UTC),
+                    )
+                except AlreadyExistsError as e:
+                    log.log(str(e))
+        else:
+            log.log(
+                f"Skipping loading rfc{num} into blobdb as no matching Document exists"
+            )
diff --git a/ietf/sync/views.py b/ietf/sync/views.py
index d6fc505c28..bd539d4e18 100644
--- a/ietf/sync/views.py
+++ b/ietf/sync/views.py
@@ -1,29 +1,27 @@
 # Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-
 import datetime
-import subprocess
-import os
 import json
 
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
+from django.db import transaction
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import render
+from django.utils import timezone
 from django.views.decorators.csrf import csrf_exempt
 
 from ietf.doc.models import DeletedEvent, StateDocEvent, DocEvent
 from ietf.ietfauth.utils import role_required, has_role
+from ietf.sync import tasks
 from ietf.sync.discrepancies import find_discrepancies
 from ietf.utils.serialize import object_as_shallow_dict
 from ietf.utils.log import log
 from ietf.utils.response import permission_denied
 
 
-SYNC_BIN_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../bin"))
-
 #@role_required('Secretariat', 'IANA', 'RFC Editor')
 def discrepancies(request):
     sections = find_discrepancies()
@@ -52,12 +50,11 @@ def notify(request, org, notification):
     password = request.POST.get("password") or request.GET.get("password")
 
     if username != None and password != None:
-        if settings.SERVER_MODE == "production" and not request.is_secure():
-            permission_denied(request, "You must use HTTPS when sending username/password.")
-
+        # Used to reject non-https traffic here, but that's now enforced by a domain-wide upgrade
+        # from http to https. Django's request.is_secure() is always False now.
         if not user.is_authenticated:
             try:
-                user = User.objects.get(username=username)
+                user = User.objects.get(username__iexact=username)
             except User.DoesNotExist:
                 return HttpResponse("Invalid username/password")
 
@@ -78,31 +75,34 @@ def notify(request, org, notification):
         raise Http404
 
     if request.method == "POST":
-        def runscript(name):
-            python = os.path.join(os.path.dirname(settings.BASE_DIR), "env", "bin", "python")
-            cmd = [python, os.path.join(SYNC_BIN_PATH, name)]
-            cmdstring = " ".join(cmd)
-            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            out, err = p.communicate()
-            out = out.decode('utf-8')
-            err = err.decode('utf-8')
-            if p.returncode:
-                log("Subprocess error %s when running '%s': %s %s" % (p.returncode, cmd, err, out))
-                raise subprocess.CalledProcessError(p.returncode, cmdstring, "\n".join([err, out]))
-
-        log("Running sync script from notify view POST")
-
-        if notification == "protocols":
-            runscript("iana-protocols-updates")
-
-        if notification == "changes":
-            runscript("iana-changes-updates")
-
-        if notification == "queue":
-            runscript("rfc-editor-queue-updates")
-
         if notification == "index":
-            runscript("rfc-editor-index-updates")
+            log("Queuing RFC Editor index sync from notify view POST")
+            # Wrap in on_commit in case a transaction is open
+            # (As of 2024-11-08, this only runs in a transaction during tests)
+            transaction.on_commit(
+                lambda: tasks.rfc_editor_index_update_task.delay()
+            )
+        elif notification == "queue":
+            log("Queuing RFC Editor queue sync from notify view POST")
+            # Wrap in on_commit in case a transaction is open
+            # (As of 2024-11-08, this only runs in a transaction during tests)
+            transaction.on_commit(
+                lambda: tasks.rfc_editor_queue_updates_task.delay()
+            )
+        elif notification == "changes":
+            log("Queuing IANA changes sync from notify view POST")
+            # Wrap in on_commit in case a transaction is open
+            # (As of 2024-11-08, this only runs in a transaction during tests)
+            transaction.on_commit(
+                lambda: tasks.iana_changes_update_task.delay()
+            )
+        elif notification == "protocols":
+            log("Queuing IANA protocols sync from notify view POST")
+            # Wrap in on_commit in case a transaction is open
+            # (As of 2024-11-08, this only runs in a transaction during tests)
+            transaction.on_commit(
+                lambda: tasks.iana_protocols_update_task.delay()
+            )
 
         return HttpResponse("OK", content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
 
@@ -118,12 +118,12 @@ def rfceditor_undo(request):
     events = []
     events.extend(StateDocEvent.objects.filter(
         state_type="draft-rfceditor",
-        time__gte=datetime.datetime.now() - datetime.timedelta(weeks=1)
+        time__gte=timezone.now() - datetime.timedelta(weeks=1)
     ).order_by("-time", "-id"))
 
     events.extend(DocEvent.objects.filter(
         type="sync_from_rfc_editor",
-        time__gte=datetime.datetime.now() - datetime.timedelta(weeks=1)
+        time__gte=timezone.now() - datetime.timedelta(weeks=1)
     ).order_by("-time", "-id"))
 
     events.sort(key=lambda e: (e.time, e.id), reverse=True)
diff --git a/ietf/templates/.gitignore b/ietf/templates/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/templates/401.html b/ietf/templates/401.html
index a88ce940e5..8c06dff9e1 100644
--- a/ietf/templates/401.html
+++ b/ietf/templates/401.html
@@ -3,9 +3,7 @@
 {% load static %}
 {% block title %}401 Unauthorized{% endblock %}
 {% block content %}
-    <img class="col-2 mb-5"
-         src="{% static 'ietf/images/ietf-logo.svg' %}"
-         alt="IETF">
+    {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}
     <div class="alert alert-warning my-3">
         <h1>Authentication Required</h1>
         <hr>
diff --git a/ietf/templates/403.html b/ietf/templates/403.html
index 155e4ea998..2ea87eb3ad 100644
--- a/ietf/templates/403.html
+++ b/ietf/templates/403.html
@@ -3,9 +3,7 @@
 {% load static %}
 {% block title %}Error: Restricted Access{% endblock %}
 {% block content %}
-    <img class="col-2 mb-5"
-         src="{% static 'ietf/images/ietf-logo.svg' %}"
-         alt="IETF">
+    {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}
     <div class="alert alert-warning my-3">
         <h1>Restricted Access</h1>
         <hr>
diff --git a/ietf/templates/404.html b/ietf/templates/404.html
index de247c89a1..b21bd5d97b 100644
--- a/ietf/templates/404.html
+++ b/ietf/templates/404.html
@@ -3,9 +3,7 @@
 {% load static %}
 {% block title %}Error: Page Not Found{% endblock %}
 {% block content %}
-    <img class="col-2 mb-5"
-         src="{% static 'ietf/images/ietf-logo.svg' %}"
-         alt="IETF">
+    {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}
     <div class="alert alert-warning my-3">
         <h1>The page you were looking for couldn't be found</h1>
         <hr>
diff --git a/ietf/templates/500.html b/ietf/templates/500.html
index b7ea01bdde..bd205dad6b 100644
--- a/ietf/templates/500.html
+++ b/ietf/templates/500.html
@@ -3,9 +3,7 @@
 {% load static %}
 {% block title %}500 Internal Server Error{% endblock %}
 {% block content %}
-    <img class="col-2 mb-5"
-         src="{% static 'ietf/images/ietf-logo.svg' %}"
-         alt="IETF">
+    {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}
     <div class="alert alert-warning my-3">
         <h1>Internal Server Error</h1>
         <hr>
diff --git a/ietf/templates/admin/base.html b/ietf/templates/admin/base.html
new file mode 100644
index 0000000000..d48891dfc4
--- /dev/null
+++ b/ietf/templates/admin/base.html
@@ -0,0 +1,28 @@
+{% extends 'admin/base.html' %}
+{% load static %}
+{% block extrastyle %}{{ block.super }}
+    {% if server_mode and server_mode != "production" %}
+        <style>
+            {# grab colors that match bootstrap so we don't have to import the css #}
+            html, :root{
+                --bs-danger-bg-subtle: #F8D7DAFF; 
+                --bs-danger-text-emphasis: #58151CFF;
+                --bs-danger: #DC3545FF;
+                --bs-secondary: #6C757DFF;
+                --bs-primary-text-emphasis: #052C65FF;
+            }
+            html[data-theme="light"], :root {
+                --primary: var(--bs-danger-bg-subtle);
+                --secondary: var(--bs-danger-bg-subtle);
+                --accent: var(--bs-danger-text-emphasis);
+                --primary-fg: var(--bs-primary-text-emphasis);
+                --link-fg: var(--bs-danger-text-emphasis);
+                --header-color: var(--bs-secondary);
+                --breadcrumbs-fg: var(--bs-secondary);
+                --breadcrumbs-link-fg: var(--link-fg);
+                .calendar caption { background-color: var(--secondary);}
+            }
+            span.text-danger { color: var(--bs-danger); }
+        </style>
+    {% endif %}
+{% endblock %}
diff --git a/ietf/templates/admin/meeting/Registration/change_list.html b/ietf/templates/admin/meeting/Registration/change_list.html
new file mode 100644
index 0000000000..62784b2cb6
--- /dev/null
+++ b/ietf/templates/admin/meeting/Registration/change_list.html
@@ -0,0 +1,10 @@
+{% extends "admin/change_list.html" %}
+
+{% block search %}
+  {{ block.super }} {# This includes the original search form #}
+  {% if cl.search_fields %} {# Only show if search is enabled for the model #}
+    <p class="search-help-text" style="font-size: 0.85em; color: #666; margin-top: 5px;">
+      Hint: Search by: {{ cl.search_fields|join:", "|capfirst }}.
+    </p>
+  {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/admin/meeting/RegistrationTicket/change_list.html b/ietf/templates/admin/meeting/RegistrationTicket/change_list.html
new file mode 100644
index 0000000000..62784b2cb6
--- /dev/null
+++ b/ietf/templates/admin/meeting/RegistrationTicket/change_list.html
@@ -0,0 +1,10 @@
+{% extends "admin/change_list.html" %}
+
+{% block search %}
+  {{ block.super }} {# This includes the original search form #}
+  {% if cl.search_fields %} {# Only show if search is enabled for the model #}
+    <p class="search-help-text" style="font-size: 0.85em; color: #666; margin-top: 5px;">
+      Hint: Search by: {{ cl.search_fields|join:", "|capfirst }}.
+    </p>
+  {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html
index 88d9042697..e21a50101a 100644
--- a/ietf/templates/api/index.html
+++ b/ietf/templates/api/index.html
@@ -9,7 +9,7 @@ <h2 id="framework">Framework API</h2>
         <p>
             This section describes the autogenerated read-only API towards the database tables.  See also
             the
-            <a href="{% url 'ietf.submit.views.api_submit' %}">draft submission API description</a>
+            <a href="{% url 'ietf.submit.views.api_submission' %}">Internet-Draft submission API description</a>
             and the
             <a href="#iesg-position-api">IESG ballot position API description</a>
         </p>
@@ -99,7 +99,7 @@ <h3 id="framework-documents">Framework API: Documents</h3>
             </li>
             <li>
                 States which match <code>states__type__slug__in=draft</code> describe the basic
-                Active/Expired/Dead whatever state of the draft.
+                Active/Expired/Dead whatever state of the Internet-Draft.
             </li>
         </ul>
         <p>
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index 10e9991124..b0df04f30a 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -1,4 +1,4 @@
-{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 <!DOCTYPE html>
 {% load analytical %}
 {% load ietf_filters static %}
@@ -6,7 +6,7 @@
 {% origin %}
 {% load django_bootstrap5 %}
 {% load django_vite %}
-<html lang="en" {% block html_attrs %}{% endblock %}>
+<html data-bs-theme="auto" lang="en" {% block html_attrs %}{% endblock %}>
     <head>
         {% analytical_head_top %}
         <meta charset="utf-8">
@@ -15,14 +15,13 @@
             {% block title %}No title{% endblock %}
         </title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        {% comment Halloween %}
-        <link href='https://fonts.googleapis.com/css?family=IM+Fell+English+SC|IM+Fell+DW+Pica:400,400italic|Nova+Mono|IM+Fell+English:400,400italic&subset=latin-ext,latin' rel='stylesheet'>
-        {% endcomment %}
-        <link rel="preconnect" href="https://fonts.googleapis.com">
-        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-        <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@300..700&display=swap" rel="stylesheet">
+        <meta name="traceparent" content="{{ otel.traceparent }}">
+        <link href="{{ settings.STATIC_IETF_ORG }}/fonts/inter/import.css" rel="stylesheet">
+        <link href="{{ settings.STATIC_IETF_ORG }}/fonts/noto-sans-mono/import.css" rel="stylesheet">
         <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
         <link rel="stylesheet" href="{% static 'ietf/css/select2.css' %}">
+        {# load this in the head, to prevent flickering #}
+        <script src="{% static 'ietf/js/theme.js' %}"></script>
         <style>
             {% block morecss %}{% endblock %}
         </style>
@@ -33,27 +32,27 @@
         <script src="{% static 'ietf/js/ietf.js' %}"></script>
         {% analytical_head_bottom %}
     </head>
-    <body {% block bodyAttrs %}{% endblock %} class="position-relative"
+    <body {% block bodyAttrs %}{% endblock %} class="navbar-offset position-relative"
           data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
         {% analytical_body_top %}
+        {% include "base/status.html" %}
         <a class="visually-hidden visually-hidden-focusable" href="#content">Skip to main content</a>
-        <nav class="navbar navbar-expand-lg {% if server_mode and server_mode != "production" %} navbar-light bg-warning {% else %} navbar-dark bg-secondary {% endif %}  {% if navbar_mode %} {{ navbar_mode }} {% else %} fixed-top {% endif %}">
+        <nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle{% else %}bg-secondary-subtle{% endif %}">
             <div class="container-fluid">
                 <a class="navbar-brand" href="/">
-                    <img alt="IETF Logo" class="me-2"
-                        src="{% static 'ietf/images/ietf-logo-nor-white.svg' %}">
+                    {% include "logo.html" with org="ietf" classes="me-2" nor=True only %}
                     Datatracker
                     {% if server_mode and server_mode != "production" %}
                         <span class="text-danger">&delta;</span>
                     {% endif %}
                 </a>
                 <div class="collapse navbar-collapse" id="navbar-collapse">
-                    <ul class="nav navbar-nav">
+                    <ul class="nav navbar-nav flex-nowrap">
                         {% include "base/menu.html" with flavor="top" %}
                     </ul>
                 </div>
                 <div class="d-flex align-items-center">
-                    <a class="nav-link {% if server_mode and server_mode != "production" %}text-danger{% else %}text-warning{% endif %} d-none d-xl-inline me-xl-4"
+                    <a class="nav-link text-danger d-none d-xl-inline me-xl-4"
                        target="_blank"
                        href="https://github.com/ietf-tools/datatracker/issues/new/choose">
                         Report a bug
@@ -63,18 +62,22 @@
                     {% if not user.is_authenticated %}
                         <a class="btn me-1 {% if server_mode and server_mode == "production" %} btn-warning {% else %} btn-info {% endif %} d-none d-sm-block"
                            rel="nofollow"
-                           href="{% url 'ietf.ietfauth.views.login' %}?next={{ request.get_full_path|removesuffix:'accounts/logout/'|urlencode }}">
+                           href="{% url 'ietf.ietfauth.views.login' %}?next={{ request.get_full_path|removeprefix:'/accounts/logout'|removeprefix:'/accounts/login/?next='|urlencode }}">
                             Sign in
                         </a>
                     {% endif %}
 
-                    <label class="d-none d-md-block" aria-label="Document search">
-                    <input class="form-control select2-field"
-                           id="navbar-doc-search"
-                           data-select2-ajax-url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='docalias' doc_type='draft' %}"
-                           type="text"
-                           data-placeholder="Document search">
-                   </label>
+                    <div class="d-none d-md-block dropdown" id="navbar-doc-search-wrapper">
+                        <input class="form-control"
+                               id="navbar-doc-search"
+                               type="text"
+                               placeholder="Document search"
+                               autocomplete="off"
+                               data-ajax-url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='all' %}"
+                               aria-label="Document search">
+                        <ul class="dropdown-menu" id="navbar-doc-search-results">
+                        </ul>
+                    </div>
                 </div>
                 <button class="navbar-toggler"
                         type="button"
@@ -88,39 +91,38 @@
             </div>
         </nav>
         {% block precontent %}{% endblock %}
-        <div class="pt-3 container-fluid">
+        <main class="pt-3 container-fluid" id="main">
             <div class="row">
                 {% if request.COOKIES.left_menu == "on" and not hide_menu %}
-                    <div class="d-none d-md-block bg-light py-3 leftmenu small">
+                    <div class="d-none d-md-block bg-light-subtle py-3 leftmenu small">
                         <ul class="nav nav-pills flex-column">
                             {% include "base/menu.html" with flavor="left" %}
                         </ul>
                     </div>
                 {% endif %}
                 <div class="col mx-lg-3 ietf-auto-nav" id="content">
-                    <noscript>
+                    <noscript data-nosnippet>
                         <div class="alert alert-danger alert-ignore my-3">
                             <b>Javascript disabled?</b> Like other modern websites, the IETF Datatracker relies on Javascript.
                             Please enable Javascript for full functionality.
                         </div>
                     </noscript>
                     {% for message in messages %}
-                        <div class="alert {% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %} {% endif %} {% if message.extra_tags %} {{ message.extra_tags }}{% endif %} alert-dismissable fade show">
+                        <div class="alert {% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %} {% endif %} alert-dismissable fade show">
                             <button type="button"
                                     class="btn-close float-end"
                                     data-bs-dismiss="alert"
                                     aria-label="Close"></button>
-                            {{ message.message }}
+                            <div{% if message.extra_tags %} class="{{ message.extra_tags }}"{% endif %}>{{ message.message }}</div>
                         </div>
                     {% endfor %}
                     {% block content %}{{ content|safe }}{% endblock %}
                     {% block content_end %}{% endblock %}
                 </div>
             </div>
-        </div>
+        </main>
         {% block footer %}
-            <footer class="col-md-12 col-sm-12 bg-white text-center position-sticky">
-                <hr class="mx-3">
+            <footer class="col-md-12 col-sm-12 border-top mt-5 py-5 bg-light-subtle text-center position-sticky">
                 <a href="https://www.ietf.org/" class="p-3">IETF</a>
                 <a href="https://www.ietf.org/iesg/" class="p-3">IESG</a>
                 <a href="https://www.iab.org/" class="p-3">IAB</a>
@@ -130,7 +132,7 @@
                 <a href="https://www.rfc-editor.org/" class="p-3 text-nowrap">RFC Editor</a>
                 <a href="https://www.iana.org/" class="p-3">IANA</a>
                 <a href="https://www.ietf.org/privacy-statement/" class="p-3 text-nowrap">Privacy Statement</a>
-                <div class="small text-muted py-3">
+                <div class="small text-body-secondary py-3">
                     {% if version_num %}
                         <a class="mx-2" href="/release/about">About IETF Datatracker</a>
                         <span class="mx-2">
@@ -144,6 +146,7 @@
                             {% endif %}
                         </span>
                     {% endif %}
+                    <a class="mx-2" href="https://status.ietf.org" target="_blank">System Status</a>
                     <span class="mx-2 text-danger">
                         <i class="bi bi-bug"></i>
                         Report a bug:
@@ -165,11 +168,7 @@
         {% block js %}
         {% endblock %}
         <script src="{% static 'ietf/js/select2.js' %}"></script>
-        <script>
-            $('#navbar-doc-search').on('select2:select', function (e) {
-                window.location.href = e.params.data.url;
-            });
-        </script>
+        <script src="{% static 'ietf/js/navbar-doc-search.js' %}"></script>
       {% analytical_body_bottom %}
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html
index b48c004f7b..8ff6e952da 100644
--- a/ietf/templates/base/menu.html
+++ b/ietf/templates/base/menu.html
@@ -1,7 +1,7 @@
-{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2025, All Rights Reserved #}
 {% load origin %}
 {% origin %}
-{% load ietf_filters managed_groups wg_menu active_groups_menu group_filters cache %}
+{% load ietf_filters managed_groups wg_menu active_groups_menu group_filters cache meetings_filters %}
 {% if flavor != 'top' %}
     {% include "base/menu_user.html" %}
 {% endif %}
@@ -10,7 +10,6 @@
         <a href="#"
            class="nav-link dropdown-toggle"
            role="button"
-           data-bs-auto-close="false"
            data-bs-toggle="dropdown"
            aria-expanded="false">
             Groups
@@ -23,7 +22,7 @@
     {% if flavor == 'top' %}<li class="dropdown-header">By area/parent</li>{% endif %}
     {% wg_menu flavor %}
     <li class="dropend">
-        <a class="dropdown-item dropdown-toggle {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item dropdown-toggle {% if flavor != 'top' %}text-wrap{% endif %}"
            href="{% url "ietf.group.views.active_groups" %}">
             Other
         </a>
@@ -32,19 +31,19 @@
     {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
     <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>New work</li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.group.views.chartering_groups" %}">
             Chartering groups
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.group.views.bofs" group_type="wg" %}">
             BOFs
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.doc.views_bofreq.bof_requests" %}">
             BOF Requests
         </a>
@@ -52,13 +51,13 @@
     {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
     <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>Other groups</li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.group.views.concluded_groups" %}">
             Concluded groups
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.mailinglists.views.nonwg' %}">
             Non-WG lists
         </a>
@@ -82,68 +81,86 @@
         </li>
     {% endif %}
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.doc.views_search.search" %}">
             Search
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.doc.views_search.recent_drafts" %}">
-            Recent drafts
+            Recent I-Ds
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.submit.views.upload_submission" %}">
-            Draft submission
+            Submit an Internet-Draft
         </a>
     </li>
     {% if user and user.is_authenticated %}
+    <li>
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+            href="{% url "ietf.community.views.view_list" user.username %}">
+            My tracked docs
+        </a>
+    </li>
+    {% if user|has_role:"Area Director,Secretariat" %}
+        {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
-               href="{% url "ietf.community.views.view_list" user.username %}">
-                My tracked docs
+            <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+                href="{% url 'ietf.doc.views_status_change.rfc_status_changes' %}">
+                RFC status changes
             </a>
         </li>
-        {% if user|has_role:"Area Director,Secretariat" %}
-            {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
+    {% endif %}
+    {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
+    <li class="dropend">
+      <a class="dropdown-item dropdown-toggle" href="#">
+        IESG
+      </a>
+      <ul class="dropdown-menu">
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
-                   href="{% url 'ietf.doc.views_status_change.rfc_status_changes' %}">
-                    RFC status changes
+                <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+                href="{% url 'ietf.group.views.appeals' acronym='iesg' %}">
+                    IESG appeals
                 </a>
             </li>
-        {% endif %}
-        {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
-        <li>
-            <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
-               href="{% url 'ietf.doc.views_ballot.irsg_ballot_status' %}">
-                IRSG ballot status
-            </a>
+            <li>
+                <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+                href="{% url 'ietf.doc.views_search.ad_workload' %}">
+                    IESG dashboard
+                </a>
+            </li>
+            <li>
+                <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+                href="{% url 'ietf.group.views.statements' acronym='iesg' %}">
+                    IESG statements
+                </a>
+            </li>
+        </ul>
         </li>
+        <li><hr class="dropdown-divider"></li>
+    <li>
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+            href="{% url 'ietf.doc.views_ballot.irsg_ballot_status' %}">
+            IRSG ballot status
+        </a>
+    </li>
         {% if user|has_role:"WG Chair,RG Chair" %}
             {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
             <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>Manage</li>
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+                <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
                    href="{% url "ietf.submit.views.approvals" %}">
-                    Approve a draft
+                    Approve an I-D
                 </a>
             </li>
             {% for g in user|docman_groups %}
                 <li>
-                    <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+                    <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
                        href="{% url "ietf.group.views.group_documents" g.acronym %}">
-                        {{ g.acronym }} {{ g.type.slug }} docs
-                    </a>
-                </li>
-            {% endfor %}
-            {% for g in user|matman_groups %}
-                <li>
-                    <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
-                       href="{% url "ietf.group.views.meetings" g.acronym %}">
-                        {{ g.acronym }} {{ g.type.slug }} meetings
+                        {{ g.acronym }} {{ g.type_id }} docs
                     </a>
                 </li>
             {% endfor %}
@@ -158,14 +175,14 @@
             </li>
             {% for g in user|managed_review_groups %}
                 <li>
-                    <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+                    <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
                        href="{% url "ietf.group.views.review_requests" g.acronym %}">
                         {{ g.acronym }} reviews
                     </a>
                 </li>
             {% endfor %}
         {% endif %}
-        {% if user|active_nomcoms %}
+        {% with user|active_nomcoms as nomcoms %}{% if nomcoms %}
             {% if flavor == 'top' %}
                 <li><hr class="dropdown-divider">
                 </li>
@@ -173,15 +190,15 @@
             <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
             	NomComs
             </li>
-            {% for g in user|active_nomcoms %}
+            {% for nomcom in nomcoms %}
                 <li>
-                    <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
-                       href="{% url "ietf.nomcom.views.private_index" g.nomcom_set.first.year %}">
-                        {{ g.acronym|capfirst }}
+                    <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+                       href="{% url "ietf.nomcom.views.private_index" nomcom.year %}">
+                        {{ nomcom|capfirst }}
                     </a>
                 </li>
             {% endfor %}
-        {% endif %}
+        {% endif %}{% endwith %}
     {% endif %}
     {% if flavor == 'top' %}
         <li><hr class="dropdown-divider">
@@ -191,29 +208,50 @@
         RFC streams
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.group.views.stream_documents" acronym="iab" %}">
             IAB
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.group.views.stream_documents" acronym="irtf" %}">
             IRTF
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.group.views.stream_documents" acronym="ise" %}">
             ISE
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.group.views.stream_documents" acronym="editorial" %}">
             Editorial
         </a>
     </li>
+    {% if flavor == 'top' %}
+        <li><hr class="dropdown-divider">
+        </li>
+    {% endif %}
+    <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
+        Subseries
+    </li>
+    <li>
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+           href="{% url "ietf.doc.views_search.index_subseries" type_id="std" %}">
+            STD
+        </a>
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+           href="{% url "ietf.doc.views_search.index_subseries" type_id="bcp" %}">
+            BCP
+        </a>
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+           href="{% url "ietf.doc.views_search.index_subseries" type_id="fyi" %}">
+            FYI
+        </a>
+    </li>
     {% if flavor == 'top' %}
     </ul>
 </li>
@@ -235,47 +273,67 @@
         </li>
     {% endif %}
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'agenda' %}">
             Agenda
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.meeting.views.materials' %}">
             Materials
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'floor-plan' %}">
             Floor plan
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="https://www.ietf.org/how/meetings/register/">
             Registration
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.meeting.views.important_dates' %}">
             Important dates
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
-           href="{% url 'ietf.secr.sreq.views.main' %}">
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+           href="{% url 'ietf.meeting.views_session_request.list_view' %}">
             Request a session
         </a>
     </li>
+    {% if user|can_request_interim %}
+        <li>
+            <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+                href="{% url 'ietf.meeting.views.interim_request' %}">
+                Request an interim meeting
+            </a>
+        </li>
+    {% endif %}
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.meeting.views.meeting_requests' %}">
             Session requests
         </a>
     </li>
+    {% if user|matman_groups %}
+        {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
+        <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>Manage</li>
+        {% for g in user|matman_groups %}
+            <li>
+                <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+                    href="{% url "ietf.group.views.meetings" g.acronym %}">
+                    {{ g.acronym }} {{ g.type_id }} meetings
+                </a>
+            </li>
+        {% endfor %}
+    {% endif %}
     {% if flavor == 'top' %}
         {% if flavor == 'top' %}
             <li><hr class="dropdown-divider">
@@ -286,7 +344,7 @@
         </li>
     {% endif %}
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.meeting.views.upcoming' %}">
             Upcoming meetings
         </a>
@@ -301,13 +359,13 @@
         </li>
     {% endif %}
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.meeting.views.past' %}">
             Past meetings
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="https://www.ietf.org/how/meetings/past/">
             Meeting proceedings
         </a>
@@ -333,56 +391,64 @@
         </li>
     {% endif %}
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.ipr.views.showlist' %}">
             IPR disclosures
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.liaisons.views.liaison_list' %}">
             Liaison statements
         </a>
     </li>
+    {% if user|has_role:"Secretariat,IAB,Liaison Manager,Liaison Coordinator" %}
+    <li>
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+           href="{% url 'ietf.liaisons.views.list_other_sdo' %}">
+            List of other SDO groups
+        </a>
+    </li>
+    {% endif %}
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.iesg.views.agenda' %}">
             IESG agenda
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.nomcom.views.index' %}">
             NomComs
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.doc.views_downref.downref_registry' %}">
             Downref registry
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url "ietf.stats.views.stats_index" %}">
             Statistics
         </a>
         <ul class="dropdown-menu {% if flavor == 'top' %}mt-n1{% else %}ms-n1{% endif %}">
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+                <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
                    href="{% url 'ietf.stats.views.document_stats' %}">
-                    Drafts/RFCs
+                    I-Ds/RFCs
                 </a>
             </li>
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+                <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
                    href="{% url 'ietf.stats.views.meeting_stats' %}">
                     Meetings
                 </a>
             </li>
             {% if user and user.is_authenticated %}
                 <li>
-                    <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+                    <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
                        href="{% url 'ietf.stats.views.review_stats' %}">
                         Reviews
                     </a>
@@ -391,29 +457,29 @@
         </ul>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
-           href="{% url "ietf.group.views.materials" acronym='edu' %}">
-            Tutorials
-        </a>
-    </li>
-    <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.api.views.api_help' %}">
             API Help
         </a>
     </li>
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
            href="{% url 'ietf.release.views.release' %}">
             Release notes
         </a>
     </li>
+    <li>
+        <a class="dropdown-item{% if flavor != 'top' %} text-wrap{% endif %}"
+           target="_blank" href="https://status.ietf.org">
+            System status
+        </a>
+    </li>
     {% if flavor == 'top' %}
         <li><hr class="dropdown-divider">
         </li>
     {% endif %}
     <li>
-        <a class="dropdown-item text-danger {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item text-danger {% if flavor != 'top' %}text-wrap{% endif %}"
            target="_blank" href="https://github.com/ietf-tools/datatracker/issues/new/choose">
             <i class="bi bi-bug">
             </i>
@@ -426,4 +492,4 @@
 {% endif %}
 {% if flavor == 'top' %}
     {% include "base/menu_user.html" %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/ietf/templates/base/menu_user.html b/ietf/templates/base/menu_user.html
index 1b1e444822..fd921638a4 100644
--- a/ietf/templates/base/menu_user.html
+++ b/ietf/templates/base/menu_user.html
@@ -1,4 +1,4 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% origin %}
 {% load ietf_filters %}
@@ -23,7 +23,7 @@
     {% url 'django.contrib.auth.views.logout' as logout_url %}
     {% if request.get_full_path == logout_url %}
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                rel="nofollow"
                href="{% url 'ietf.ietfauth.views.login' %}">
                 Sign in
@@ -32,14 +32,16 @@
     {% else %}
         {% if user.is_authenticated %}
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
-                   rel="nofollow"
-                   href="{% url 'django.contrib.auth.views.logout' %}">
-                    Sign out
-                </a>
+                <form id="logout-form" method="post" action="{% url 'django.contrib.auth.views.logout' %}">
+                    {% csrf_token %}
+                    <button class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}" 
+                            type="submit">
+                        Sign out
+                    </button>
+                </form>
             </li>
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                    rel="nofollow"
                    href="{% url 'ietf.ietfauth.views.profile' %}">
                     Account info
@@ -47,35 +49,35 @@
             </li>
             {% if user and user.person %}
                 <li>
-                    <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                    <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                        href="{% url 'ietf.person.views.profile' email_or_name=user.person.name %}">
                         Public profile page
                     </a>
                 </li>
             {% endif %}
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                    href="{% url 'ietf.cookies.views.preferences' %}"
                    rel="nofollow">
                     Preferences
                 </a>
             </li>
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                    href="{% url 'ietf.ietfauth.views.apikey_index' %}"
                    rel="nofollow">
                     API keys
                 </a>
             </li>
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                    rel="nofollow"
                    href="{% url 'ietf.ietfauth.views.change_password' %}">
                     Change password
                 </a>
             </li>
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                    rel="nofollow"
                    href="{% url 'ietf.ietfauth.views.change_username' %}">
                     Change username
@@ -83,45 +85,70 @@
             </li>
         {% else %}
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                    rel="nofollow"
-                   href="{% url 'ietf.ietfauth.views.login' %}?next={{ request.get_full_path|urlencode }}">
+                   href="{% url 'ietf.ietfauth.views.login' %}?next={{ request.get_full_path|removeprefix:'/accounts/login/?next='|urlencode }}">
                     Sign in
                 </a>
             </li>
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                    rel="nofollow"
                    href="{% url 'ietf.ietfauth.views.password_reset' %}">
                     Password reset
                 </a>
             </li>
             <li>
-                <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+                <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                    href="{% url 'ietf.cookies.views.preferences' %}"
                    rel="nofollow">
                     Preferences
                 </a>
             </li>
         {% endif %}
-        <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
-               href="{% url 'personal-information' %}">
-                Handling of personal information
-            </a>
-        </li>
     {% endif %}
     {% if not request.user.is_authenticated %}
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.ietfauth.views.create_account' %}">
                 New account
             </a>
         </li>
     {% endif %}
+    <li class="dropend">
+      <a class="dropdown-item dropdown-toggle" href="#">
+        List subscriptions
+      </a>
+      <ul class="dropdown-menu">
+            <li>
+                <a class="dropdown-item {% if flavor != 'top' %}text-wrap{% endif %}"
+                href="https://mailman3.ietf.org/mailman3/lists/">
+                    IETF Lists
+                </a>
+            </li>
+            <li>
+                <a class="dropdown-item {% if flavor != 'top' %}text-wrap{% endif %}"
+                href="https://mailman3.irtf.org/mailman3/lists/">
+                IRTF Lists
+                </a>
+            </li>
+            <li>
+                <a class="dropdown-item {% if flavor != 'top' %}text-wrap{% endif %}"
+                href="https://mailman3.iab.org/mailman3/lists/">
+                    IAB Lists
+                </a>
+            </li>
+            <li>
+                <a class="dropdown-item {% if flavor != 'top' %}text-wrap{% endif %}"
+                href="https://mailman3.rfc-editor.org/mailman3/lists/">
+                    RFC-Editor Lists
+                </a>
+            </li>
+        </ul>
+    </li>
     {% if user|has_role:"Reviewer" %}
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.ietfauth.views.review_overview' %}">
                 My reviews
             </a>
@@ -131,31 +158,31 @@
         {% if flavor == "top" %}<li><hr class="dropdown-divider"></li>{% endif %}
         <li {% if flavor == "top" %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>AD dashboard</li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.doc.views_search.docs_for_ad' name=user.person.full_name_as_key %}">
                 My docs
             </a>
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.iesg.views.agenda_documents' %}">
                 Next telechat
             </a>
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.iesg.views.discusses' %}">
                 Discusses
             </a>
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.iesg.views.milestones_needing_review' %}">
                 Milestone review
             </a>
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.doc.views_search.drafts_in_last_call' %}">
                 Last Call docs
             </a>
@@ -167,35 +194,29 @@
             IETF secretariat
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'admin:iesg_telechatdate_changelist' %}">
                 Telechat dates
             </a>
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'admin:iesg_telechatagendaitem_changelist' %}">
                 Management items
             </a>
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.iesg.views.milestones_needing_review' %}">
                 Milestones
             </a>
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.sync.views.discrepancies' %}">
                 Sync discrepancies
             </a>
         </li>
-        <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
-               href="{% url 'ietf.ietfauth.views.add_account_whitelist' %}">
-                Account whitelist
-            </a>
-        </li>
     {% endif %}
     {% if user|has_role:"IANA" %}
         {% if flavor == "top" %}
@@ -206,7 +227,7 @@
             IANA
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.sync.views.discrepancies' %}">
                 Sync discrepancies
             </a>
@@ -221,7 +242,7 @@
             RFC Editor
         </li>
         <li>
-            <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
+            <a class="dropdown-item {% if flavor != 'top' %} text-wrap{% endif %}"
                href="{% url 'ietf.sync.views.discrepancies' %}">
                 Sync discrepancies
             </a>
diff --git a/ietf/templates/base/menu_wg.html b/ietf/templates/base/menu_wg.html
index 3ab7ca399b..5ca1be8a4e 100644
--- a/ietf/templates/base/menu_wg.html
+++ b/ietf/templates/base/menu_wg.html
@@ -2,8 +2,11 @@
 {% load origin %}
 {% origin %}
 {% for p in parents %}
+    {% if p.acronym == "iab" %}
+        <li><a class="dropdown-item" href="{% url "ietf.group.views.group_about" acronym="iesg" %}">IESG</a></li>
+    {% endif%}
     <li class="dropend group-menu group-parent-{{ p.id }}">
-        <a class="dropdown-item dropdown-toggle {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item dropdown-toggle {% if flavor != 'top' %}text-wrap{% endif %}"
            href="{{ p.menu_url }}">
             {{ p.short_name }}
         </a>
diff --git a/ietf/templates/base/status.html b/ietf/templates/base/status.html
new file mode 100644
index 0000000000..33e1abf699
--- /dev/null
+++ b/ietf/templates/base/status.html
@@ -0,0 +1,2 @@
+<noscript><iframe class="status" title="Site status" src="/status/latest"></iframe></noscript>
+<div class="vue-embed" data-component="Status"></div>
\ No newline at end of file
diff --git a/ietf/templates/community/atom.xml b/ietf/templates/community/atom.xml
index 32e3b00292..01dcdfeee7 100644
--- a/ietf/templates/community/atom.xml
+++ b/ietf/templates/community/atom.xml
@@ -3,7 +3,7 @@
     <title type="text">{{ title }}</title>
     <subtitle type="text">{{ subtitle }}</subtitle>
     <id>{{ id }}</id>
-    <updated>{{ updated|date:"Y-m-d\TH:i:sO" }}</updated>
+    <updated>{{ updated.isoformat }}</updated>
     <link rel="alternate" type="text/html" hreflang="en" href="https://{{ request.get_host }}/"/>
     <link rel="self" type="application/atom+xml" href="https://{{ request.get_host }}{{ request.get_full_path }}"/>
 
@@ -17,11 +17,11 @@
 
         <link href="{{ entry.doc.get_absolute_url }}"/>
 
-        <id>{{ entry.id }}</id>
+        <id>urn:datatracker-ietf-org:event:{{ entry.id }}</id>
         
-        <updated>{{ entry.time|date:"Y-m-d\TH:i:sO" }}</updated>
+        <updated>{{ entry.time.isoformat }}</updated>
         
-        <published>{{ entry.time|date:"Y-m-d\TH:i:sO" }}</published>
+        <published>{{ entry.time.isoformat }}</published>
         
         <author>
             <name>{{ entry.by }}</name>
diff --git a/ietf/templates/community/list_menu.html b/ietf/templates/community/list_menu.html
index d54695775f..009d01152d 100644
--- a/ietf/templates/community/list_menu.html
+++ b/ietf/templates/community/list_menu.html
@@ -3,18 +3,18 @@
     <div class="btn-group" role="group" aria-labelledby="list-feeds">
         <a class="btn btn-primary"
            title="Feed of all changes"
-           href="{% if clist.group %}{% url "ietf.community.views.feed" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.feed" username=clist.user.username %}{% endif %}">
+           href="{% if clist.group %}{% url "ietf.community.views.feed" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.feed" email_or_name=email_or_name %}{% endif %}">
             <i class="bi bi-rss"></i> All changes
         </a>
         <a class="btn btn-primary"
            title="Feed of only significant state changes"
-           href="{% if clist.group %}{% url "ietf.community.views.feed" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.feed" username=clist.user.username %}{% endif %}?significant=1">
+           href="{% if clist.group %}{% url "ietf.community.views.feed" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.feed" email_or_name=email_or_name %}{% endif %}?significant=1">
             <i class="bi bi-rss"></i> Significant
         </a>
     </div>
     {% if clist.pk != None %}
         <a class="btn btn-primary"
-           href="{% if clist.group %}{% url "ietf.community.views.subscription" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.subscription" username=clist.user.username %}{% endif %}">
+           href="{% if clist.group %}{% url "ietf.community.views.subscription" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.subscription" email_or_name=email_or_name %}{% endif %}">
             <i class="bi bi-envelope"></i>
             {% if subscribed %}
                 Change subscription
@@ -24,7 +24,7 @@
         </a>
     {% endif %}
     <a class="btn btn-primary"
-       href="{% if clist.group %}{% url "ietf.community.views.export_to_csv" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.export_to_csv" username=clist.user.username %}{% endif %}">
+       href="{% if clist.group %}{% url "ietf.community.views.export_to_csv" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.export_to_csv" email_or_name=email_or_name %}{% endif %}">
         <i class="bi bi-file-ruled"></i> Export as CSV
     </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/ietf/templates/community/notification_email.txt b/ietf/templates/community/notification_email.txt
index d3a6c2214b..7c214de30a 100644
--- a/ietf/templates/community/notification_email.txt
+++ b/ietf/templates/community/notification_email.txt
@@ -12,6 +12,6 @@ Change by {{ event.by }} on {{ event.time }}:
 
 Best regards,
 
-        The Datatracker draft tracking service
+        The Datatracker Internet-Draft tracking service
         (for the IETF Secretariat)
 {% endautoescape %}
diff --git a/ietf/templates/community/subscription.html b/ietf/templates/community/subscription.html
index e8b562a47d..4b92a610e1 100644
--- a/ietf/templates/community/subscription.html
+++ b/ietf/templates/community/subscription.html
@@ -32,7 +32,7 @@ <h2>Existing subscriptions</h2>
         </p>
     {% endif %}
     <h2>Add new subscription</h2>
-    <p class="text-muted">
+    <p class="text-body-secondary">
         The email addresses you can choose between are those registered in
         <a href="{% url "ietf.ietfauth.views.profile" %}">your profile</a>.
     </p>
diff --git a/ietf/templates/community/untrack_document.html b/ietf/templates/community/untrack_document.html
index 985dcad89b..fe94081a79 100644
--- a/ietf/templates/community/untrack_document.html
+++ b/ietf/templates/community/untrack_document.html
@@ -1,17 +1,14 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% extends "base.html" %}
 {% load origin %}
 {% origin %}
-{% load django_bootstrap5 %}
 {% block title %}Remove tracking of document {{ name }}{% endblock %}
-{% bootstrap_messages %}
-<form method="post">
-    {% csrf_token %}
-    <p>
-        Remove {{ name }} from the list?
-    </p>
-    <button type="submit"
-           class="btn btn-primary"
-           value="Remove tracking of document">
-        Remove tracking of document
-    </button>
-</form>
+{% block content %}
+    <form method="post">
+        {% csrf_token %}
+        <p>
+            Remove {{ name }} from the list?
+        </p>
+        <button type="submit" class="btn btn-primary" value="Remove tracking of document">Remove tracking of document</button>
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/community/view_list.html b/ietf/templates/community/view_list.html
index 17650beb10..a543eaf7cf 100644
--- a/ietf/templates/community/view_list.html
+++ b/ietf/templates/community/view_list.html
@@ -12,7 +12,7 @@ <h1>{{ clist.long_name }}</h1>
     {% bootstrap_messages %}
     {% if can_manage_list %}
         <a class="btn btn-primary my-3"
-           href="{% url "ietf.community.views.manage_list" username=clist.user.username %}">
+           href="{% url "ietf.community.views.manage_list" email_or_name=email_or_name %}">
             <i class="bi bi-gear"></i>
             Manage list
         </a>
@@ -22,4 +22,4 @@ <h1>{{ clist.long_name }}</h1>
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/cookies/settings.html b/ietf/templates/cookies/settings.html
index 5ded2f3bd6..3515491c35 100644
--- a/ietf/templates/cookies/settings.html
+++ b/ietf/templates/cookies/settings.html
@@ -12,7 +12,7 @@ <h1>User settings</h1>
         cookies disabled then you will not be able to change the settings
         (everything still continues to work by using default settings).
     </p>
-    <h2>How many days is considered "new"?</h2>
+    <h2 class="mt-4">How many days is considered "new"?</h2>
     <p>
         This setting affects how many days are considered "new enough" to get the special highlighting in the documents table. The default setting is {{ defaults.new_enough }} days.
     </p>
@@ -60,7 +60,7 @@ <h2>How many days is considered "new"?</h2>
             90 days
         </a>
     </p>
-    <h2>How many days is considered "soon"?</h2>
+    <h2 class="mt-4">How many days is considered "soon"?</h2>
     <p>
         This setting tells what is considered "soon" when showing documents that are going to be expire soon. The Default setting is {{ defaults.expires_soon }} days.
     </p>
@@ -108,7 +108,7 @@ <h2>How many days is considered "soon"?</h2>
             90 days
         </a>
     </p>
-    <h2>Show full document text by default?</h2>
+    <h2 class="mt-4">Show full document text by default?</h2>
     <p>
         Show the full text immediately on the document page instead of only showing beginning of it. This defaults to {{ defaults.full_draft }}.
     </p>
@@ -128,7 +128,7 @@ <h2>Show full document text by default?</h2>
             On
         </a>
     </p>
-    <h2>Show the left-hand menu?</h2>
+    <h2 class="mt-4">Show the left-hand menu?</h2>
     <p>
         Show the left-hand menu on all regular pages? This defaults to {{ defaults.left_menu }}.
     </p>
@@ -148,4 +148,24 @@ <h2>Show the left-hand menu?</h2>
             On
         </a>
     </p>
+
+
+    <h2 class="mt-4">Which color mode should be used?</h2>
+    <p>
+        Use a light, dark or automatic (as indicated by OS) color mode.
+    </p>
+    <p class="btn-group d-flex" id="bd-theme">
+
+        <a class="btn btn-outline-primary" data-bs-theme-value="light">
+          <i class="theme-icon bi bi-brightness-high-fill"></i> Light
+        </a>
+
+        <a class="btn btn-outline-primary" data-bs-theme-value="dark">
+          <i class="theme-icon bi bi-moon-stars-fill"></i> Dark
+        </a>
+
+        <a class="btn btn-outline-primary" data-bs-theme-value="auto">
+          <i class="theme-icon bi bi-circle-half"></i> Auto
+        </a>
+    </p>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/debug.html b/ietf/templates/debug.html
index 3eea27c195..c459359d3e 100644
--- a/ietf/templates/debug.html
+++ b/ietf/templates/debug.html
@@ -2,7 +2,7 @@
 {% load origin %}
 {% load static %}
 {% origin %}
-{% if debug %}
+{% if settings.DEBUG %}
     {% if sql_debug %}
         {% load debug_filters %}
         {{ sql_queries|length }} queries ({{ sql_queries|timesum }}s)
@@ -103,7 +103,7 @@ <h4 class="modal-title" id="modal-title-{{ forloop.counter }}">QuerySet Origin f
             </div>
         </div>
     {% else %}
-        <small class="text-center text-muted">
+        <small class="text-center text-body-secondary">
             Add <code>ietf.context_processors.sql_debug</code> to <code>settings.DEV_TEMPLATE_CONTEXT_PROCESSORS</code> to turn on the SQL statement table.
         </small>
     {% endif %}
diff --git a/ietf/templates/doc/ad_count.html b/ietf/templates/doc/ad_count.html
deleted file mode 100644
index 38c585925d..0000000000
--- a/ietf/templates/doc/ad_count.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load ietf_filters %}
-
-{% if prev or count %}
-    <span{% if count == 0 %} class="text-muted"{% endif %}>{{ count }}</span>
-    {% if user|has_role:"Area Director,Secretariat" %}
-        <i data-bs-toggle="popover"
-            {% if count != prev %}
-                data-bs-content="
-                    <div class='mb-2 fw-bold'>
-                        {{ delta.days }} days ago, the count was {{ prev }}.
-                    </div>
-                    {% if docs_delta %}
-                       {{ group.group_type }}s in the delta are:
-                       <ul>
-                            {% for d in docs_delta %}
-                                <li><a href='{% url "ietf.doc.views_doc.document_main" d.name %}'>{{ d.name }}</a></li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}"
-            {% endif %}
-        {% with label.2 as up_is_good %}
-            {% if prev < count %}
-                   class="bi bi-arrow-up-right-circle{% if count %}-fill{% endif %} {{ up_is_good|yesno:'text-success,text-danger,text-muted' }}"
-            {% elif prev > count %}
-                   class="bi bi-arrow-down-right-circle{% if count %}-fill{% endif %} {{ up_is_good|yesno:'text-danger,text-success,text-muted' }}"
-            {% else %}
-                   class="bi bi-arrow-right-circle text-muted"
-            {% endif %}
-            ></i>
-        {% endwith %}
-    {% endif %}
-{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/ad_list.html b/ietf/templates/doc/ad_list.html
index 189754e8ac..cac709021e 100644
--- a/ietf/templates/doc/ad_list.html
+++ b/ietf/templates/doc/ad_list.html
@@ -3,42 +3,80 @@
 {% load origin static %}
 {% load ietf_filters %}
 {% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+    <link rel="stylesheet" href="{% static 'ietf/css/list.css' %}">
+    <link rel="stylesheet" href="{% static 'ietf/css/highcharts.css' %}">
 {% endblock %}
-{% block title %}Area directors{% endblock %}
+{% block morecss %}
+    table .border-bottom { border-bottom-color: var(--highcharts-neutral-color-80) !important; }
+    .highcharts-container .highcharts-axis-labels { 
+        font-size: .7rem; 
+        fill: var(--bs-body-color)
+    }
+    .highcharts-container .highcharts-graph { stroke-width: 2.5; }
+    .highcharts-container .highcharts-color-0 {
+        fill: var(--bs-body-color);
+        stroke: var(--bs-primary);
+    }
+    .highcharts-container .highcharts-data-label text {
+        font-size: 1rem;
+        font-weight: inherit;
+        fill: var(--bs-body-color)
+    }
+{% endblock %}
+{% block title %}IESG Dashboard{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Area Director Workload</h1>
+    <h1>IESG Dashboard</h1>
     {% if user|has_role:"Area Director,Secretariat" %}
     <div class="alert alert-info my-3">
-        {{ delta.days }}-day trend indicators
+        {{ delta }}-day trend graphs
         are only shown to logged-in Area Directors.
     </div>
     {% endif %}
-    {% for group in workload %}
-        <h2 class="mt-5" id="{{ group.group_type|slugify }}">{{ group.group_type }} State Counts</h2>
-        <table class="table table-sm table-striped table-bordered tablesorter">
+    <p>
+        <a class="btn btn-primary" href="{% url 'ietf.doc.views_search.docs_for_iesg' %}">Documents in IESG Processing</a>
+        <a class="btn btn-primary" href="{% url 'ietf.iesg.views.working_groups' %}">IESG view of Working Groups</a>
+    </p>
+    {% for dt in metadata %}
+        <h2 class="mt-5" id="{{ dt.type.0 }}">{{ dt.type.1 }} State Counts</h2>
+        <table class="table table-sm table-striped table-bordered tablesorter navskip">
             <thead class="wrap-anywhere">
                 <tr>
                     <th scope="col" data-sort="name">Area Director</th>
-                    {% for g, desc, up_is_good in group.group_names %}
-                        <th scope="col" class="col-1" title="{{ desc }}"
-                            data-sort="{{ g|slugify }}-num">
-                            {{ g|split:'/'|join:'/<wbr>' }}
+                    {% if dt.type.1 == "Internet-Draft" %}
+                        <th scope="col" data-sort="pre-pubreq">Pre pubreq</th>
+                    {% endif %}                    
+                    {% for state, state_name in dt.states %}
+                        <th scope="col" class="col-1" data-sort="{{ state }}-num"
+                        >
+                            <a href="{% url 'ietf.doc.views_help.state_help' type='draft-iesg' %}#{{ state }}">
+                                {{ state_name|split:'/'|join:'/<wbr>' }}
+                            </a>
                         </th>
                     {% endfor %}
                 </tr>
             </thead>
             <tbody class="table-group-divider">
-                {% for ad, ad_data in group.counts %}
+                {% for ad in dt.ads %}
                     <tr>
                         <td>
                             <a href="{{ ad.dashboard }}">{{ ad.name }}</a>
                         </td>
-                        {% for label, count, prev, docs_delta in ad_data %}
-                        <td class="col-1"
-                            id="{{ group.group_type|slugify }}-{{ ad.full_name_as_key|slugify }}-{{ label.0|slugify }}">
-                            {% include 'doc/ad_count.html' %}
+                        {% if dt.type.1 == "Internet-Draft" %}
+                            <td
+                                class="col-1 align-bottom"
+                                data-sum="pre-pubreq"
+                                {% if user|has_role:"Area Director,Secretariat" %}
+                                    data-series-graph
+                                {% endif %}
+                            >
+                                {{ ad.pre_pubreq }}
+                            </td>
+                        {% endif %}            
+                        {% for state, state_name in dt.states %}
+                        <td class="col-1 align-bottom"
+                            id="{{ dt.type.0 }}-{{ ad|slugify }}-{{ state }}">
+                            <div id="chart-{{ dt.type.0 }}-{{ ad|slugify }}-{{ state }}"></div>
                         </td>
                         {% endfor %}
                     </tr>
@@ -47,9 +85,19 @@ <h2 class="mt-5" id="{{ group.group_type|slugify }}">{{ group.group_type }} Stat
             <tfoot class="table-group-divider">
                 <tr>
                     <th scope="row">Sum</th>
-                    {% for label, count, prev in group.sums %}
-                        <td>
-                            {% include 'doc/ad_count.html' %}
+                    {% if dt.type.1 == "Internet-Draft" %}
+                        <td class="align-bottom">
+                            <div
+                                data-sum-result="pre-pubreq"
+                                {% if user|has_role:"Area Director,Secretariat" %}
+                                    data-series-graph
+                                {% endif %}
+                            ></div>
+                        </td>
+                    {% endif %}
+                    {% for state, state_name in dt.states %}
+                        <td class="align-bottom">
+                            <div id="chart-{{ dt.type.0 }}-sum-{{ state }}"></div>
                         </td>
                     {% endfor %}
                 </tr>
@@ -69,4 +117,177 @@ <h2 class="mt-5" id="{{ group.group_type|slugify }}">{{ group.group_type }} Stat
                     });
             });
     </script>
+    <script src="{% static "ietf/js/highcharts.js" %}"></script>
+    {{ data|json_script:"data" }}
+
+    <script>
+        function highchartsConfigFactory({ element, ymax, series }){
+            return {
+                title: { text: undefined },
+                chart: {
+                    type: "line",
+                    animation: false,
+                    renderTo: element,
+                    panning: { enabled: false },
+                    spacing: [4, 0, 5, 0],
+                    height: "45%"
+                },
+                scrollbar: { enabled: false },
+                tooltip: { enabled: false },
+                navigator: { enabled: false },
+                exporting: { enabled: false },
+                legend: { enabled: false },
+                credits: { enabled: false },
+                xAxis: {
+                    title: { text: undefined},
+                    labels: { enabled: false },
+                    zoomEnabled: false,
+                    tickLength: 0
+                },
+                yAxis: {
+                    title: { text: undefined},
+                    zoomEnabled: false,
+                    tickLength: 0,
+                    labels: { x: -3 },
+                    min: 0,
+                    max: ymax,
+                    tickInterval: ymax
+                },
+                plotOptions: {
+                    series: {
+                        animation: false,
+                        dataLabels: {
+                            enabled: true,
+                            inside: true,
+                            padding: 0,
+                            formatter: function() {
+                                // only label the last
+                                // (= current-day) point in
+                                // the curve with today's
+                                // value
+                                if (this.point.index + 1 ==
+                                    this.series.points.length) {
+                                    return this.y
+                                }
+                                return undefined
+                            }
+                        }
+                    }
+                },
+                series: [{
+                    name: undefined,
+                    data: series,
+                    enableMouseTracking: false
+                }]
+            }
+        }
+    </script>
+
+    <script>
+        const GRAPH_BUFFER = 2;
+
+        function safeParseFloat(text) {
+            const trimNumber = text.trim()
+            if(!trimNumber.match(/^[0-9.]+$/)) {
+                console.warn(`Unable to parse "${trimNumber}" as a number.`)
+                return Number.NaN
+            }
+            return parseFloat(text)
+        }
+
+        Array.from(document.querySelectorAll("table"))
+            .filter(table => Boolean(table.querySelector("[data-sum]")))
+            .forEach(table => {
+                const sums = Array.from(table.querySelectorAll("[data-sum]")).reduce((
+                    sumsAccumulator,
+                    cell
+                ) => {                    
+                    const key = cell.dataset.sum
+                    const value = safeParseFloat(cell.textContent)
+                    if(key && !isNaN(value)) {
+                        sumsAccumulator[key] = (sumsAccumulator[key] || 0) + (value || 0)
+                    }
+                    return sumsAccumulator
+                }, {})
+
+                Array.from(table.querySelectorAll('[data-sum-result]')).forEach(result => {
+                    const key = result.dataset.sumResult
+                    const value = sums[key]
+
+                    if(value) {
+                        result.innerText = value
+                    }
+                })
+
+                Array.from(table.querySelectorAll('[data-series-graph]')).forEach(element => {
+                    const endValue = safeParseFloat(element.innerText)
+                    if(isNaN(endValue)) throw Error("Can't render Highcharts chart with non-numerical " + element.innerText)
+
+                    const ymax = Math.max(1, endValue + GRAPH_BUFFER)
+
+                    Highcharts.chart(
+                        highchartsConfigFactory({
+                            element,
+                            ymax,
+                            series: [endValue]
+                        })
+                    )
+                })
+            })
+    </script>
+    <script>
+        const data = JSON.parse(document.getElementById("data").textContent)
+
+        Object.entries(data).forEach(([dt, ads]) => {
+            max = {}
+            Object.entries(ads).forEach(([ad, states]) => {
+                Object.entries(states).forEach(([state, buckets]) => {
+                    buckets.series = buckets.map((x) => x.length)
+                    if (ad != "sum") {
+                        max[state] = Math.max(...buckets.series, max[state] ? max[state] : 0)
+                    }
+                })
+            })
+
+            Object.entries(ads).forEach(([ad, states]) => {
+                Object.entries(states).forEach(([state, buckets]) => {
+                    const cell = `chart-${dt}-${ad}-${state}`
+
+                    // if there is only a single datapoint in the
+                    // bucket, display it without a graph
+                    if (buckets.series.length == 1) {
+                        document.getElementById(cell).innerHTML = buckets.series[0]
+                        return
+                    }
+
+                    // if a bucket has all zeroes, fake a Highcharts
+                    // plot with HTML, to reduce the number of plot
+                    // objects on the page
+                    if (buckets.series.every((x) => x === 0)) {
+                        // document.getElementById(cell).innerHTML = `
+                        //     <div class="position-relative">
+                        //         <div class="position-absolute bottom-0 start-0">
+                        //             <div style="font-size: .7rem;" class="ms-1">0</div>
+                        //         </div>
+                        //         <div class="position-absolute bottom-0 end-0 w-100 ps-1">
+                        //             <div class="border-bottom mb-1 ms-3">0</div>
+                        //         </div>
+                        //     </div>
+                        // `;
+                        return
+                    }
+
+                    // else actually create a graph
+                    const ymax = Math.max(1, ad !== "sum" ? max[state] : Math.max(...buckets.series))
+                    Highcharts.chart(
+                        highchartsConfigFactory({
+                            element: cell,
+                            ymax,
+                            series: buckets.series
+                        })
+                    )
+                })
+            })
+        })
+    </script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/add_comment.html b/ietf/templates/doc/add_comment.html
index 0783b2486c..211cb380db 100644
--- a/ietf/templates/doc/add_comment.html
+++ b/ietf/templates/doc/add_comment.html
@@ -2,13 +2,14 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}Add comment for {{ doc }}{% endblock %}
+{% block title %}Add comment for
+{% if review_req %} {{ review_req }} {% else %} {{ doc }} {% endif %} {% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Add comment
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{% if review_req %} {{ review_req }} {% else %} {{ doc }} {% endif %}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
@@ -17,7 +18,12 @@ <h1>
             The comment will be added to the history trail.
         </p>
         {% bootstrap_button button_type="submit" content="Submit" %}
+	{% if review_req %}
+        <a class="btn btn-secondary float-end"
+           href="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}">Back</a>
+	{% else %}
         <a class="btn btn-secondary float-end"
            href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
+        {% endif %}
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/add_sessionpresentation.html b/ietf/templates/doc/add_sessionpresentation.html
index a5bcf7096a..0bd751a465 100644
--- a/ietf/templates/doc/add_sessionpresentation.html
+++ b/ietf/templates/doc/add_sessionpresentation.html
@@ -8,7 +8,7 @@
     <h1>
         Add document to session
         <br>
-        <small class="text-muted">{{ doc.name }}
+        <small class="text-body-secondary">{{ doc.name }}
             <br>
         {{ doc.title }}</small>
     </h1>
diff --git a/ietf/templates/doc/badge/doc-badge-draft.html b/ietf/templates/doc/badge/doc-badge-draft.html
new file mode 100644
index 0000000000..f7f66b6c5e
--- /dev/null
+++ b/ietf/templates/doc/badge/doc-badge-draft.html
@@ -0,0 +1,16 @@
+{% load origin %}
+{% load static %}
+{% load ietf_filters %}
+{% load person_filters %}
+{% origin %}
+{# Non-RFC #}
+
+{% if doc.became_rfc %} 
+    <div{% if document_html %} class="alert alert-warning small"{% endif %}>This is an older version of an Internet-Draft that was ultimately published as <a href="{% if document_html %}{% url 'ietf.doc.views_doc.document_html' name=doc.became_rfc.name %}{% else %}{% url 'ietf.doc.views_doc.document_main' name=doc.became_rfc.name %}{% endif %}">{{doc.became_rfc.name|prettystdname}}</a>.</div>
+{% elif snapshot and doc.rev != latest_rev  %}
+    <div{% if document_html %} class="alert alert-warning small p-2 mt-2"{% endif %}>This is an older version of an Internet-Draft whose latest revision state is "{{ doc.doc.get_state }}".</div>
+{% else %}
+    <span class="{% if doc.get_state_slug == 'active' %}text-success{% elif doc.get_state_slug == 'expired' or doc.get_state_slug == 'repl' %}text-danger{% endif %}">{% if snapshot and doc.rev == latest_rev %}{{ doc.doc.get_state }}{% else %}{{ doc.get_state }}{% endif %} Internet-Draft</span>
+    {% if submission %}({{ submission|safe }}){% endif %}
+    {% if resurrected_by %}- resurrect requested by {{ resurrected_by }}{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/badge/doc-badge-rfc.html b/ietf/templates/doc/badge/doc-badge-rfc.html
new file mode 100644
index 0000000000..780f14a54f
--- /dev/null
+++ b/ietf/templates/doc/badge/doc-badge-rfc.html
@@ -0,0 +1,13 @@
+{% load origin %}
+{% load static %}
+{% load ietf_filters %}
+{% load person_filters %}
+{% origin %}
+
+<span class="text-success">RFC
+    {% if not document_html %}
+    - {{ doc.std_level }}
+    {% else %}
+        <span class="badge rounded-pill badge-{% if not snapshot %}{{ doc|std_level_to_label_format }}{% else %}generic{% endif %}">{{ doc.std_level }}</span>
+    {% endif %}
+</span>
diff --git a/ietf/templates/doc/ballot/approvaltext.html b/ietf/templates/doc/ballot/approvaltext.html
index 1b228ba375..3cb632b8f8 100644
--- a/ietf/templates/doc/ballot/approvaltext.html
+++ b/ietf/templates/doc/ballot/approvaltext.html
@@ -9,7 +9,7 @@
     <h1>
         Approval announcement writeup
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
@@ -29,7 +29,7 @@ <h1>
                href="{% url 'ietf.doc.views_ballot.approve_ballot' name=doc.name %}">Approve ballot</a>
         {% endif %}
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/ballot/approve_ballot.html b/ietf/templates/doc/ballot/approve_ballot.html
index a146acf4e9..30dd05fa43 100644
--- a/ietf/templates/doc/ballot/approve_ballot.html
+++ b/ietf/templates/doc/ballot/approve_ballot.html
@@ -8,7 +8,7 @@
     <h1>
         Approve ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
@@ -21,7 +21,7 @@ <h1>
             <button class="btn btn-primary" type="submit">Email RFC Editor (DNP) &amp; close ballot"</button>
         {% endif %}
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/ballot/approve_downrefs.html b/ietf/templates/doc/ballot/approve_downrefs.html
index 67caf992c7..ad528c67bf 100644
--- a/ietf/templates/doc/ballot/approve_downrefs.html
+++ b/ietf/templates/doc/ballot/approve_downrefs.html
@@ -8,20 +8,20 @@
     <h1>
         Approve downward references
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         The ballot for
-        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc }}</a>
+        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">{{ doc }}</a>
         was just approved.
     </p>
     {% if not downrefs_to_rfc %}
         <p>
             No downward references for
-            <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc }}</a>
+            <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">{{ doc }}</a>
         </p>
         <a class="btn btn-secondary"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">Back</a>
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     {% else %}
         <p>
             Add downward references to RFCs to the DOWNREF registry, if they were identified in the IETF Last Call and approved by the Sponsoring Area Director.
@@ -41,7 +41,7 @@ <h1>
             {% csrf_token %}
             {% bootstrap_form approve_downrefs_form %}
             <a class="btn btn-primary"
-               href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+               href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
                 Add no DOWNREF entries
             </a>
             <button type="submit" class="btn btn-warning" value="Save checked downrefs">Add checked DOWNREF entries</button>
diff --git a/ietf/templates/doc/ballot/ballot_comment_mail.txt b/ietf/templates/doc/ballot/ballot_comment_mail.txt
index add55c68ef..8fb709b7f5 100644
--- a/ietf/templates/doc/ballot/ballot_comment_mail.txt
+++ b/ietf/templates/doc/ballot/ballot_comment_mail.txt
@@ -5,7 +5,7 @@ When responding, please keep the subject line intact and reply to all
 email addresses included in the To and CC lines. (Feel free to cut this
 introductory paragraph, however.)
 
-{% if doc.type_id == "draft" and doc.stream_id != "irtf" %}
+{% if doc.type_id == "draft" and doc.stream_id == "ietf" %}
 Please refer to https://www.ietf.org/about/groups/iesg/statements/handling-ballot-positions/ 
 for more information about how to handle DISCUSS and COMMENT positions.
 {% endif %}
diff --git a/ietf/templates/doc/ballot/ballot_issued.html b/ietf/templates/doc/ballot/ballot_issued.html
index 5549cd1189..dfa03896e9 100644
--- a/ietf/templates/doc/ballot/ballot_issued.html
+++ b/ietf/templates/doc/ballot/ballot_issued.html
@@ -7,11 +7,11 @@
     <h1>
         Ballot issued
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         Ballot for
-        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc }}</a>
+        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">{{ doc }}</a>
         has been sent out.
     </p>
     {% if doc.telechat_date %}
@@ -24,5 +24,5 @@ <h1>
         </p>
     {% endif %}
     <a class="btn btn-secondary"
-       href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">Back</a>
+       href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
 {% endblock %}
diff --git a/ietf/templates/doc/ballot/clear_ballot.html b/ietf/templates/doc/ballot/clear_ballot.html
index d1f731ba70..09e7dfef1b 100644
--- a/ietf/templates/doc/ballot/clear_ballot.html
+++ b/ietf/templates/doc/ballot/clear_ballot.html
@@ -8,20 +8,20 @@
     <h1>
         Clear ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
         <p class="alert alert-danger my-3">
             <b>Clear the ballot for
-                <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc }}</a>?
+                <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">{{ doc }}</a>?
             </b>
             <br>
             This will clear all ballot positions and discuss entries.
         </p>
         <button type="submit" class="btn btn-danger">Clear</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/ballot/defer_ballot.html b/ietf/templates/doc/ballot/defer_ballot.html
index 85f887c9ab..ae7099e9e1 100644
--- a/ietf/templates/doc/ballot/defer_ballot.html
+++ b/ietf/templates/doc/ballot/defer_ballot.html
@@ -8,20 +8,20 @@
     <h1>
         Defer ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
         <p class="alert alert-danger my-3">
             <b>Defer the ballot for
-                <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc }}</a>?
+                <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">{{ doc }}</a>?
             </b>
             <br>
             The ballot will then be put on the IESG agenda of {{ telechat_date }}.
         </p>
         <button type="submit" class="btn btn-danger">Defer ballot</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index 1b11fbb90a..b57e9a3652 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -8,7 +8,7 @@
     <h1>
         Change position for {{ balloter.plain_name }}
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     {% if ballot.ballot_type.question %}
         <div class="alert alert-warning my-3">
@@ -20,43 +20,86 @@ <h1>
             Ballot deferred by {{ ballot_deferred.by }} on {{ ballot_deferred.time|date:"Y-m-d" }}.
         </p>
     {% endif %}
+    <div class="d-none" id="id_docname" data-value="{{doc.name}}"></div>
+    <div class="d-none" id="id_balloter" data-value="{{balloter.pk}}"></div>
+    {% if form.errors or cc_select_form.errors or additional_cc_form.errors %}
+        <div class="alert alert-danger my-3">
+                There were errors in the submitted form -- see below. Please correct these and resubmit.
+        </div>
+        {% if form.errors %}
+            <div>Position entry</div>
+            {% bootstrap_form_errors form %}
+        {% endif %}
+        {% if cc_select_form.errors %}
+            <div>CC selection</div>
+            {% bootstrap_form_errors cc_select_form %}
+        {% endif %}
+        {% if additional_cc_form.errors %}
+            <div>Additional Cc Addresses</div>
+            {% bootstrap_form_errors additional_cc_form %}
+        {% endif %}
+    {% endif %}
     <form method="post" id="ballot-form" class="my-3">
         {% csrf_token %}
         {% for field in form %}
             {% if field.name == "discuss" %}<div id="div_id_discuss">{% endif %}
             {% bootstrap_field field %}
             {% if field.name == "discuss" and old_pos and old_pos.discuss_time %}
-                <div class="form-text mt-n3 mb-3">Last edited {{ old_pos.discuss_time }}</div>
+                <div class="form-text mt-n3 mb-3">Last saved {{ old_pos.discuss_time }}</div>
             {% elif field.name == "comment" and old_pos and old_pos.comment_time %}
-                <div class="form-text mt-n3 mb-3">Last edited {{ old_pos.comment_time }}</div>
+                <div class="form-text mt-n3 mb-3">Last saved {{ old_pos.comment_time }}</div>
             {% endif %}
             {% if field.name == "discuss" %}</div>{% endif %}
         {% endfor %}
+        {% bootstrap_form cc_select_form %}
+        {% bootstrap_form additional_cc_form %}
         <div class="mt-3">
+            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#emailPreview">
+                Preview email
+            </button>
             <button type="submit"
                     class="btn btn-primary"
                     name="send_mail"
                     value="Save and send email">Save &amp; send email</button>
-            <button type="submit" class="btn btn-primary">Save</button>
+            <button type="submit" class="btn btn-warning">Save without sending email</button>
             {% if doc.type_id == "draft" or doc.type_id == "conflrev" %}
                 {% if doc.stream.slug != "irtf" %}
                     {% if ballot_deferred %}
                         <button type="submit"
                                class="btn btn-warning"
-                               name="Undefer">Undefer ballot</button>
+                               name="Undefer"
+                               value="Undefer">Undefer ballot</button>
                     {% else %}
                         <button type="submit"
                                class="btn btn-danger"
-                               name="Defer">Defer ballot</button>
+                               name="Defer"
+                               value="Defer">Defer ballot</button>
                     {% endif %}
                 {% endif %}
             {% endif %}
             <a class="btn btn-secondary float-end"
-               href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+               href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
                 Back
             </a>
         </div>
-    </form>
+    </form>  
+    <!-- Modal -->
+    <div class="modal fade" id="emailPreview" tabindex="-1" aria-labelledby="emailPreviewLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl">
+        <div class="modal-content">
+        <div class="modal-header">
+            <h1 class="modal-title fs-5" id="emailPreviewLabel">This email has not yet been sent</h1>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <pre class="modal-body">
+            Loading
+        </pre>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+        </div>
+        </div>
+    </div>
+    </div>
 {% endblock %}
 {% block js %}
     <script>
@@ -76,4 +119,44 @@ <h1>
 
         discussToggle($("input[name=position]:checked").val());
     </script>
+
+    <script>
+        function getCheckedCcValues() {
+            const checkedInputs = document.querySelectorAll('#id_cc_choices input:checked')
+            const values = Array.from(checkedInputs).map(input => input.value)
+            return values
+        }
+        const emailPreview = document.getElementById("emailPreview")
+        if (emailPreview) {
+            emailPreview.addEventListener("show.bs.modal", async (event) => {
+                const discuss = document.getElementById("id_discuss").value
+                const comment = document.getElementById("id_comment").value
+                const position = document.getElementById("id_position").querySelector('input[name="position"]:checked').value
+                const docname = document.getElementById("id_docname").dataset.value
+                const balloter = document.getElementById("id_balloter").dataset.value
+                const cc_choices = getCheckedCcValues()
+                const additional_cc = document.getElementById("id_additional_cc").value
+                const postData = {
+                    discuss: discuss,
+                    comment: comment,
+                    position: position,
+                    docname: docname,
+                    balloter: balloter,
+                    cc_choices: cc_choices,
+                    additional_cc: additional_cc
+                }
+                response = await fetch("/doc/build-position-email/", {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                    body: JSON.stringify({"post_data": postData})
+                })
+                // Update the modal's content.
+                const modalBody = emailPreview.querySelector('.modal-body')
+                responseJson = await response.json()
+                modalBody.textContent = responseJson.text
+            })
+        }
+    </script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/ballot/irsg_ballot_approve.html b/ietf/templates/doc/ballot/irsg_ballot_approve.html
index 8b28f04c3a..9eb0cc80be 100644
--- a/ietf/templates/doc/ballot/irsg_ballot_approve.html
+++ b/ietf/templates/doc/ballot/irsg_ballot_approve.html
@@ -12,7 +12,7 @@
     <h1>
         Issue ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p class="mt-3">
         {{ question }}
diff --git a/ietf/templates/doc/ballot/irsg_ballot_close.html b/ietf/templates/doc/ballot/irsg_ballot_close.html
index ab49ec79d7..22405df1c1 100644
--- a/ietf/templates/doc/ballot/irsg_ballot_close.html
+++ b/ietf/templates/doc/ballot/irsg_ballot_close.html
@@ -8,7 +8,7 @@
     <h1>
         Close ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         {{ question }}
diff --git a/ietf/templates/doc/ballot/lastcalltext.html b/ietf/templates/doc/ballot/lastcalltext.html
index 5b49f6b372..fe2b884c2b 100644
--- a/ietf/templates/doc/ballot/lastcalltext.html
+++ b/ietf/templates/doc/ballot/lastcalltext.html
@@ -9,7 +9,7 @@
     <h1 class="mb-3">
         Last call text
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
@@ -39,7 +39,7 @@ <h1 class="mb-3">
                href="{% url 'ietf.doc.views_ballot.make_last_call' name=doc.name %}">Issue last call</a>
         {% endif %}
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/ballot/rfceditornote.html b/ietf/templates/doc/ballot/rfceditornote.html
index ff6ca7078c..8a6d57379d 100644
--- a/ietf/templates/doc/ballot/rfceditornote.html
+++ b/ietf/templates/doc/ballot/rfceditornote.html
@@ -8,7 +8,7 @@
     <h1 class="mb-3">
         RFC Editor Note
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     {% bootstrap_messages %}
     <form method="post">
@@ -31,7 +31,7 @@ <h1 class="mb-3">
             Clear
         </button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/ballot/rsab_ballot_approve.html b/ietf/templates/doc/ballot/rsab_ballot_approve.html
new file mode 100644
index 0000000000..d607348722
--- /dev/null
+++ b/ietf/templates/doc/ballot/rsab_ballot_approve.html
@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2022, All Rights Reserved #}
+{% load origin %}
+{% load static %}
+{% load django_bootstrap5 %}
+{% block title %}Issue ballot for {{ doc }}?{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Issue ballot
+        <br>
+        <small class="text-body-secondary">{{ doc }}</small>
+    </h1>
+    <p class="mt-3">
+        {{ question }}
+    </p>
+    <form method="post">
+        {% csrf_token %}
+        {# curly percent bootstrap_form approval_text_form curly percent #}
+        <button type="submit" class="btn btn-primary" name="rsab_button" value="Yes">Issue ballot</button>
+        <button type="submit" class="btn btn-secondary float-end" name="rsab_button" value="No">Back</button>
+    </form>
+{% endblock %}
diff --git a/ietf/templates/doc/ballot/rsab_ballot_close.html b/ietf/templates/doc/ballot/rsab_ballot_close.html
new file mode 100644
index 0000000000..f6da3e052d
--- /dev/null
+++ b/ietf/templates/doc/ballot/rsab_ballot_close.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2022, All Rights Reserved #}
+{% load origin %}
+{% load django_bootstrap5 %}
+{% block title %}Close ballot for {{ doc }}{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Close ballot
+        <br>
+        <small class="text-body-secondary">{{ doc }}</small>
+    </h1>
+    <p>
+        {{ question }}
+    </p>
+    <form method="post">
+        {% csrf_token %}
+        {# curly percent bootstrap_form approval_text_form curly percent #}
+        <button type="submit" class="btn btn-primary" name="rsab_button" value="Yes">Yes</button>
+        <button type="submit" class="btn btn-primary" name="rsab_button" value="No">No</button>
+    </form>
+{% endblock %}
diff --git a/ietf/templates/doc/ballot/send_ballot_comment.html b/ietf/templates/doc/ballot/send_ballot_comment.html
deleted file mode 100644
index 8f87bf51ad..0000000000
--- a/ietf/templates/doc/ballot/send_ballot_comment.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load django_bootstrap5 %}
-{% load ietf_filters %}
-{% block title %}Send ballot position for {{ balloter }} on {{ doc }}{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>
-        Send ballot position for {{ balloter }}
-        <br>
-        <small class="text-muted">{{ doc }}</small>
-    </h1>
-    <form class="mt-3" method="post">
-        {% csrf_token %}
-        <div class="mb-3">
-            <label class="form-label" for="from">From</label>
-            <input id="from" class="form-control" type="text" placeholder="{{ frm }}" disabled>
-        </div>
-        <div class="mb-3">
-            <label class="form-label" for="to">To</label>
-            <input id="to" class="form-control" type="text" placeholder="{{ to }}" disabled>
-        </div>
-        {% bootstrap_form cc_select_form %}
-        <div class="mb-3">
-            <label class="form-label" for="additional">Additional Cc Addresses</label>
-            <input id="additional" class="form-control" type="text" name="extra_cc">
-            <div class="form-text">Separate email addresses with commas.</div>
-        </div>
-        <div class="mb-3">
-            <label class="form-label" for="subject">Subject</label>
-            <input id="subject" class="form-control" type="text" placeholder="{{ subject }}" disabled>
-        </div>
-        <div class="mb-3">
-            <p class="form-label">Body</p>
-            <pre class="border p-3">{{ body|maybewordwrap }}</pre>
-        </div>
-        <button type="submit" class="btn btn-danger">Send</button>
-        <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
-            Back
-        </a>
-    </form>
-{% endblock %}
diff --git a/ietf/templates/doc/ballot/undefer_ballot.html b/ietf/templates/doc/ballot/undefer_ballot.html
index df2217fa2f..4e86698160 100644
--- a/ietf/templates/doc/ballot/undefer_ballot.html
+++ b/ietf/templates/doc/ballot/undefer_ballot.html
@@ -8,7 +8,7 @@
     <h1>
         Undefer ballot
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="undefer mt-3" method="post">
         {% csrf_token %}
@@ -19,7 +19,7 @@ <h1>
         </p>
         <button class="btn btn-danger" type="submit">Undefer ballot</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/ballot/writeupnotes.html b/ietf/templates/doc/ballot/writeupnotes.html
index 481e00e134..8e985c15c7 100644
--- a/ietf/templates/doc/ballot/writeupnotes.html
+++ b/ietf/templates/doc/ballot/writeupnotes.html
@@ -8,18 +8,23 @@
     <h1>
         Ballot writeup and notes
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form ballot_writeup_form %}
         <div class="form-text my-3">
-            Technical summary, Working Group summary, document quality, personnel, IRTF note, IESG note, IANA note. This text will be appended to all announcements and messages to the IRTF or RFC Editor.
-            {% if ballot_issue_danger %}
+            Technical summary, Working Group summary, document quality, personnel, IANA note. This text will be appended to all announcements and messages to the IRTF or RFC Editor.
+            {% if warn_lc %}
                 <p class="text-danger">
                     This document has not completed IETF Last Call.  Please do not issue the ballot early without good reason.
                 </p>
             {% endif %}
+            {% if warn_unexpected_state %}
+                <p class="text-danger">
+                    This document is in an IESG state of "{{warn_unexpected_state}}". It would be unexpected to issue a ballot while in this state.
+                </p>
+            {% endif %}
         </div>
         <button type="submit"
                 class="btn btn-primary"
@@ -32,8 +37,8 @@ <h1>
             Save &amp; {% if ballot_issued %}re-{% endif %}issue ballot
         </button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/ballot_popup.html b/ietf/templates/doc/ballot_popup.html
index 815a4f3958..d2589cd54c 100644
--- a/ietf/templates/doc/ballot_popup.html
+++ b/ietf/templates/doc/ballot_popup.html
@@ -1,4 +1,4 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
 {% load origin %}
 {% origin %}
 {% load ietf_filters %}
@@ -24,10 +24,10 @@
         <div class="modal-body">{{ ballot_content }}</div>
         <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-            {% if editable and user|has_role:"Area Director,Secretariat,IRSG Member" %}
+            {% if editable and user|has_role:"Area Director,Secretariat,IRSG Member,RSAB Member" %}
                 {% if user|can_ballot:doc %}
                     <a class="btn btn-primary"
-                       href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot_id %}">
+                       href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot_id %}?ballot_edit_return_point={{ ballot_edit_return_point|urlencode }}">
                         Edit position
                     </a>
                 {% endif %}
@@ -39,7 +39,7 @@
                         <a class="btn btn-warning"
                            href="{% url 'ietf.doc.views_ballot.defer_ballot' name=doc.name %}">Defer ballot</a>
                     {% endif %}
-                    {% if user|has_role:"Secretariat" and ballot_type_slug != "irsg-approve" %}
+                    {% if user|has_role:"Secretariat" %}
                         <a class="btn btn-danger"
                            href="{% url 'ietf.doc.views_ballot.clear_ballot' name=doc.name ballot_type_slug=ballot_type_slug %}">
                             Clear ballot
diff --git a/ietf/templates/doc/bibxml.xml b/ietf/templates/doc/bibxml.xml
index d9d534bf32..750789da6d 100644
--- a/ietf/templates/doc/bibxml.xml
+++ b/ietf/templates/doc/bibxml.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<reference anchor="{{doc_bibtype}}.{{name|slice:"6:"}}">
+<reference anchor="{{doc_bibtype}}.{{name|slice:"6:"}}" target="{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.doc.views_doc.document_html" name=doc.name rev=doc.rev %}">
    <front>
       <title>{{doc.title}}</title>{% for author in doc.documentauthor_set.all %}
       <author initials="{{ author.person.initials }}" surname="{{ author.person.last_name }}" fullname="{{ author.person.name }}">
@@ -13,5 +13,5 @@
    </front>
    <seriesInfo name="Internet-Draft" value="{{name}}-{{doc.rev}}" />
    {% if doi %}<seriesInfo name="DOI" value="{{doi}}" />
-   {% endif %}<format type="TXT" target="https://www.ietf.org/archive/id/{{name}}-{{doc.rev}}.txt" />
+   {% endif %}
 </reference>
diff --git a/ietf/templates/doc/bofreq/bof_requests.html b/ietf/templates/doc/bofreq/bof_requests.html
index 2a806b18a5..19c2e5dd13 100644
--- a/ietf/templates/doc/bofreq/bof_requests.html
+++ b/ietf/templates/doc/bofreq/bof_requests.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2021 All Rights Reserved #}
 {% load origin %}
-{% load person_filters %}
+{% load person_filters ietf_filters %}
 {% load static %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
@@ -26,40 +26,42 @@ <h1>BOF Requests</h1>
     {% else %}
         {% regroup reqs by get_state_slug as grouped_reqs %}
         {% for req_group in grouped_reqs %}
-            <h2 class="mt-5">{{ req_group.grouper|capfirst }} BOF Requests</h2>
-            <table id="bofreqs-{{ req_group.grouper }}"
-                   class="table table-sm table-striped tablesorter">
-                <thead>
-                    <tr>
-                        <th scope="col" data-sort="name">Name</th>
-                        <th scope="col" class="d-none d-sm-table-cell" data-sort="date">Date</th>
-                        <th scope="col" data-sort="title">Title</th>
-                        <th scope="col" data-sort="responsible">Responsible</th>
-                        <th scope="col" data-sort="editors">Editors</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for req in req_group.list %}
+            {% if req_group.grouper != "spam" or request.user|has_role:"Secretariat" %}
+                <h2 class="mt-5">{{ req_group.grouper|capfirst }} BOF Requests</h2>
+                <table id="bofreqs-{{ req_group.grouper }}"
+                    class="table table-sm table-striped tablesorter">
+                    <thead>
                         <tr>
-                            <td>
-                                <a href="{% url 'ietf.doc.views_doc.document_main' name=req.name %}">{{ req.name }}-{{ req.rev }}</a>
-                            </td>
-                            <td class="d-none d-sm-table-cell">{{ req.latest_revision_event.time|date:"Y-m-d" }}</td>
-                            <td>{{ req.title }}</td>
-                            <td>
-                                {% for person in req.responsible %}
-                                    {% person_link person %}{% if not forloop.last %},{% endif %}
-                                {% endfor %}
-                            </td>
-                            <td>
-                                {% for person in req.editors %}
-                                    {% person_link person %}{% if not forloop.last %},{% endif %}
-                                {% endfor %}
-                            </td>
+                            <th scope="col" data-sort="name">Name</th>
+                            <th scope="col" class="d-none d-sm-table-cell" data-sort="date">Date</th>
+                            <th scope="col" data-sort="title">Title</th>
+                            <th scope="col" data-sort="responsible">Responsible</th>
+                            <th scope="col" data-sort="editors">Editors</th>
                         </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
+                    </thead>
+                    <tbody>
+                        {% for req in req_group.list %}
+                            <tr>
+                                <td>
+                                    <a href="{% url 'ietf.doc.views_doc.document_main' name=req.name %}">{{ req.name }}-{{ req.rev }}</a>
+                                </td>
+                                <td class="d-none d-sm-table-cell">{{ req.latest_revision_event.time|date:"Y-m-d" }}</td>
+                                <td>{{ req.title }}</td>
+                                <td>
+                                    {% for person in req.responsible %}
+                                        {% person_link person %}{% if not forloop.last %},{% endif %}
+                                    {% endfor %}
+                                </td>
+                                <td>
+                                    {% for person in req.editors %}
+                                        {% person_link person %}{% if not forloop.last %},{% endif %}
+                                    {% endfor %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            {% endif %}
         {% endfor %}
     {% endif %}
 {% endblock %}
diff --git a/ietf/templates/doc/bofreq/bofreq_template.md b/ietf/templates/doc/bofreq/bofreq_template.md
index c6269d7f4f..49c5e511a5 100644
--- a/ietf/templates/doc/bofreq/bofreq_template.md
+++ b/ietf/templates/doc/bofreq/bofreq_template.md
@@ -1,16 +1,15 @@
-# Name: Exact MPLS Edges (EXAMPLE) (There's an acronym for anything if you really want one ;-)
+# Name: EXAct MPLs Edges (EXAMPLE) (There's an acronym for anything if you really want one ;-)
 ## Description 
 Replace this with a few paragraphs describing the BOF request.
 
 Fill in the details below. Keep items in the order they appear here.
 
 ## Required Details
-- Status: (not) WG Forming
-- Responsible AD: name
+- Status: "not WG Forming" or "WG forming"
+- Responsible AD: name (or at least area(s) if you know)
 - BOF proponents: name <email>, name <email> (1-3 people - who are requesting and coordinating discussion for proposal) 
-- BOF chairs: TBD
 - Number of people expected to attend: 100
-- Length of session (1 or 2 hours): 2 hours
+- Length of session (1 or usually 2 hours): 2 hours
 - Conflicts (whole Areas and/or WGs)
    - Chair Conflicts: TBD
    - Technology Overlap: TBD
@@ -25,13 +24,13 @@ To allow evaluation of your proposal, please include the following items:
 - Open source projects (if any) implementing this work:
 
 ## Agenda
-   - Items, drafts, speakers, timing
+   - Items, Internet-Drafts, speakers, timing
    - Or a URL
 
-## Links to the mailing list, draft charter if any, relevant Internet-Drafts, etc.
+## Links to the mailing list, draft charter if any (for WG-forming BoF), relevant Internet-Drafts, etc.
    - Mailing List: https://www.ietf.org/mailman/listinfo/example
    - Draft charter: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name='charter-ietf-EXAMPLE' %}
-   - Relevant drafts:
+   - Relevant Internet-Drafts:
       - Use Cases:
          - {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name='draft-blah-uses' %}
       - Solutions
diff --git a/ietf/templates/doc/bofreq/change_editors.html b/ietf/templates/doc/bofreq/change_editors.html
index 546ad7179b..0c30cdecb4 100644
--- a/ietf/templates/doc/bofreq/change_editors.html
+++ b/ietf/templates/doc/bofreq/change_editors.html
@@ -9,14 +9,14 @@
     <h1>
         Change editors
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/bofreq/change_responsible.html b/ietf/templates/doc/bofreq/change_responsible.html
index 79ca29f22b..8c51c6e1f4 100644
--- a/ietf/templates/doc/bofreq/change_responsible.html
+++ b/ietf/templates/doc/bofreq/change_responsible.html
@@ -9,14 +9,14 @@
     <h1>
         Change Responsible Leadership
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/bofreq/new_bofreq.html b/ietf/templates/doc/bofreq/new_bofreq.html
index 9506d9c8e6..cda6f73b90 100644
--- a/ietf/templates/doc/bofreq/new_bofreq.html
+++ b/ietf/templates/doc/bofreq/new_bofreq.html
@@ -1,20 +1,29 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2021, All Rights Reserved #}
+{# Copyright The IETF Trust 2021-2026, All Rights Reserved #}
 {% load origin django_bootstrap5 static textfilters %}
 {% block title %}Start a new BOF Request{% endblock %}
 {% block content %}
     {% origin %}
     <h1>Start a new BOF Request</h1>
     <p>
-        The IAB will also attempt to provide BoF Shepherds as described in their document on the subject only on request from the IESG. If you feel that your BoF would benefit from an IAB BoF Shepherd, please discuss this with your Area Director.
+        BoF proponents are strongly encouraged to review the following sources before submitting requests:
     </p>
+    <ul>
+        <li>Process: <a href="https://www.rfc-editor.org/rfc/rfc2418.html#section-2.4">RFC 2418 Section 2.4</a></li>
+        <li>Considerations for having a successful BoF: <a href="https://www.rfc-editor.org/rfc/rfc5434.html">RFC 5434</a></li>
+    </ul>
     <p>
-        Choose a short descriptive title for your request. Take time to choose a good initial title - it will be used to make the filename for your request's content. The title can be changed later, but the filename will not change.
+        The IAB will also attempt to provide BoF Shepherds as described in their document on the subject only on request from the IESG. 
+        If you feel that your BoF would benefit from an IAB BoF Shepherd, please discuss this with your Area Director.
+    </p>
+    <p>
+        Choose a short descriptive title for your request. Take time to choose a good initial title - it will be used to make the filename for your request's content.
+        The title can be changed later, but the filename will not change.
     </p>
     <p>
         For example, a request with a title of "A new important bit" will be saved as <code>bofreq-{{ user.person.last_name|xslugify|slice:"64" }}-a-new-important-bit-00.md</code>.
     </p>
-    <p>All the items in the template MUST be filed in.</p>
+    <p>All the items in the template <strong>MUST</strong> be filed in.</p>
     <form class="upload-content form-horizontal"
           method="post"
           enctype="multipart/form-data">
diff --git a/ietf/templates/doc/bofreq/upload_content.html b/ietf/templates/doc/bofreq/upload_content.html
index 902b2900a9..74827dd485 100644
--- a/ietf/templates/doc/bofreq/upload_content.html
+++ b/ietf/templates/doc/bofreq/upload_content.html
@@ -7,7 +7,7 @@
     <h1>
         Upload New Revision
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <form class="upload-content form-horizontal mt-3"
           method="post"
diff --git a/ietf/templates/doc/change_ad.html b/ietf/templates/doc/change_ad.html
index 701929f5d3..9cc7437574 100644
--- a/ietf/templates/doc/change_ad.html
+++ b/ietf/templates/doc/change_ad.html
@@ -8,14 +8,14 @@
     <h1>
         Change responsible AD
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html
index a102ce24ee..755bd5d316 100644
--- a/ietf/templates/doc/change_shepherd.html
+++ b/ietf/templates/doc/change_shepherd.html
@@ -10,7 +10,7 @@
     <h1>
         Change document shepherd
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <p>
         The shepherd needs to have a Datatracker account. A new account can be
diff --git a/ietf/templates/doc/change_shepherd_email.html b/ietf/templates/doc/change_shepherd_email.html
index 36a8b44d15..b608c2d09a 100644
--- a/ietf/templates/doc/change_shepherd_email.html
+++ b/ietf/templates/doc/change_shepherd_email.html
@@ -8,7 +8,7 @@
     <h1>
         Change document shepherd email
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/change_state.html b/ietf/templates/doc/change_state.html
index d405e059b3..9d083e2f3c 100644
--- a/ietf/templates/doc/change_state.html
+++ b/ietf/templates/doc/change_state.html
@@ -8,7 +8,7 @@
     <h1>
         Change state
         <br>
-        <small class="text-muted">{{ doc.title }}</small>
+        <small class="text-body-secondary">{{ doc.title }}</small>
     </h1>
     <p>
         <a class="my-2 btn btn-info" href="{{ help_url }}">Help on states</a>
diff --git a/ietf/templates/doc/change_title.html b/ietf/templates/doc/change_title.html
index 4f419e1dd0..14d7956cfe 100644
--- a/ietf/templates/doc/change_title.html
+++ b/ietf/templates/doc/change_title.html
@@ -8,14 +8,14 @@
     <h1>
         Change title
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/charter/action_announcement_text.html b/ietf/templates/doc/charter/action_announcement_text.html
index 5722b342a1..e087b175b4 100644
--- a/ietf/templates/doc/charter/action_announcement_text.html
+++ b/ietf/templates/doc/charter/action_announcement_text.html
@@ -11,7 +11,7 @@
     <h1>
         {{ charter.chartered_group.type.name }} action announcement writeup
         <br>
-        <small class="text-muted">{{ charter.chartered_group.acronym }}</small>
+        <small class="text-body-secondary">{{ charter.chartered_group.acronym }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
@@ -21,7 +21,7 @@ <h1>
         </button>
         {% if user|has_role:"Secretariat" %}
             <a class="btn btn-primary"
-               href="{% url 'ietf.doc.views_charter.approve' name=charter.canonical_name %}">
+               href="{% url 'ietf.doc.views_charter.approve' name=charter.name %}">
                 Charter approval page
             </a>
         {% endif %}
diff --git a/ietf/templates/doc/charter/action_text.txt b/ietf/templates/doc/charter/action_text.txt
index fbe9ed3fe1..9a1e715222 100644
--- a/ietf/templates/doc/charter/action_text.txt
+++ b/ietf/templates/doc/charter/action_text.txt
@@ -1,4 +1,4 @@
-{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
+{% load ietf_filters %}{% autoescape off %}From: {% if group.type_id == "rg" %}The IRTF <irtf-chair@irtf.org>{% else %}The IESG <iesg-secretary@ietf.org>{% endif %}
 To: {{ to }}{% if cc %}
 Cc: {{ cc }} {% endif %}
 Subject: {{ group.type.name }} Action: {{ action_type }} {{ group.name }} ({{ group.acronym }})
diff --git a/ietf/templates/doc/charter/approve.html b/ietf/templates/doc/charter/approve.html
index f109da6872..2a8654482e 100644
--- a/ietf/templates/doc/charter/approve.html
+++ b/ietf/templates/doc/charter/approve.html
@@ -2,16 +2,16 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}Approve {{ charter.canonical_name }}{% endblock %}
+{% block title %}Approve {{ charter.name }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Approve {{ charter.canonical_name }}-{{ charter.rev }}</h1>
+    <h1>Approve {{ charter.name }}-{{ charter.rev }}</h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
         <pre class="border p-3">{{ announcement }}</pre>
         <button type="submit" class="btn btn-primary">Send announcement, close ballot &amp; update revision</button>
         <a class="btn btn-warning"
-           href="{% url "ietf.doc.views_charter.action_announcement_text" name=charter.canonical_name %}?next=approve">
+           href="{% url "ietf.doc.views_charter.action_announcement_text" name=charter.name %}?next=approve">
             Edit/regenerate announcement
         </a>
         <a class="btn btn-secondary float-end"
diff --git a/ietf/templates/doc/charter/ballot_issued.html b/ietf/templates/doc/charter/ballot_issued.html
index 5923c11599..99659aa923 100644
--- a/ietf/templates/doc/charter/ballot_issued.html
+++ b/ietf/templates/doc/charter/ballot_issued.html
@@ -7,7 +7,7 @@
     <h1>
         Ballot issued
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p>
         Ballot has been sent out.
diff --git a/ietf/templates/doc/charter/ballot_writeup.txt b/ietf/templates/doc/charter/ballot_writeup.txt
index 552fe65e8d..bf753bdfaf 100644
--- a/ietf/templates/doc/charter/ballot_writeup.txt
+++ b/ietf/templates/doc/charter/ballot_writeup.txt
@@ -36,14 +36,6 @@ RFC Editor Note
 
   (Insert RFC Editor Note here or remove section)
 
-IRTF Note
-
-  (Insert IRTF Note here or remove section)
-
-IESG Note
-
-  (Insert IESG Note here or remove section)
-
 IANA Note
 
   (Insert IANA Note here or remove section)
diff --git a/ietf/templates/doc/charter/ballot_writeupnotes.html b/ietf/templates/doc/charter/ballot_writeupnotes.html
index fa4c12b617..a202d48b76 100644
--- a/ietf/templates/doc/charter/ballot_writeupnotes.html
+++ b/ietf/templates/doc/charter/ballot_writeupnotes.html
@@ -8,12 +8,12 @@
     <h1>
         Ballot writeup and notes
         <br>
-        <small class="text-muted">{{ charter.chartered_group }}</small>
+        <small class="text-body-secondary">{{ charter.chartered_group }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form ballot_writeup_form %}
-        <div class="form-text mb-3">Working group summary, personnel, IAB note, IESG note, IANA note.</div>
+        <div class="form-text mb-3">Working group summary, personnel, IANA note.</div>
         <button type="submit"
                 class="btn btn-primary"
                 name="save_ballot_writeup"
diff --git a/ietf/templates/doc/charter/change_ad.html b/ietf/templates/doc/charter/change_ad.html
index 1b33f9f6b6..a85f77478e 100644
--- a/ietf/templates/doc/charter/change_ad.html
+++ b/ietf/templates/doc/charter/change_ad.html
@@ -2,20 +2,20 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}Change responsible AD for {{ charter.canonical_name }}-{{ charter.rev }}{% endblock %}
+{% block title %}Change responsible AD for {{ charter.name }}-{{ charter.rev }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Change responsible AD
         <br>
-        <small class="text-muted">{{ charter.canonical_name }}-{{ charter.rev }}</small>
+        <small class="text-body-secondary">{{ charter.name }}-{{ charter.rev }}</small>
     </h1>
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=charter.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=charter.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/charter/issue_ballot_mail.txt b/ietf/templates/doc/charter/issue_ballot_mail.txt
index 12fc44bbbc..914935bb12 100644
--- a/ietf/templates/doc/charter/issue_ballot_mail.txt
+++ b/ietf/templates/doc/charter/issue_ballot_mail.txt
@@ -1,6 +1,6 @@
-{% load ietf_filters %}{% autoescape off %}To: {{ to }} {% if cc %}
-Cc: {{ cc }}
-{% endif %}From: IESG Secretary <iesg-secretary@ietf.org>
+{% load ietf_filters %}{% autoescape off %}To: {{ to }}{% if cc %}
+Cc: {{ cc }}{% endif %}
+From: IESG Secretary <iesg-secretary@ietf.org>
 Reply-To: IESG Secretary <iesg-secretary@ietf.org>
 Subject: Evaluation: {{ doc.name }}
 
diff --git a/ietf/templates/doc/charter/review_announcement_text.html b/ietf/templates/doc/charter/review_announcement_text.html
index 1e2542edb4..c50f5956bf 100644
--- a/ietf/templates/doc/charter/review_announcement_text.html
+++ b/ietf/templates/doc/charter/review_announcement_text.html
@@ -9,7 +9,7 @@
     <h1>
         WG Review announcement writeup
         <br>
-        <small class="text-muted">{{ charter.chartered_group.acronym }}</small>
+        <small class="text-body-secondary">{{ charter.chartered_group.acronym }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html
index 54bd68a419..d391804071 100644
--- a/ietf/templates/doc/charter/submit.html
+++ b/ietf/templates/doc/charter/submit.html
@@ -39,7 +39,7 @@ <h1>Charter submission</h1>
                 <th scope="row">State</th>
                 <td>
                     {{ group.state.name }}
-                    {% if requested_close %}<div class="badge rounded-pill bg-info">In the process of being closed</div>{% endif %}
+                    {% if requested_close %}<div class="badge rounded-pill text-bg-info">In the process of being closed</div>{% endif %}
                 </td>
             </tr>
         </tbody>
diff --git a/ietf/templates/doc/conflict_review/approval_text.txt b/ietf/templates/doc/conflict_review/approval_text.txt
index cf00e1003d..a52ac11a71 100644
--- a/ietf/templates/doc/conflict_review/approval_text.txt
+++ b/ietf/templates/doc/conflict_review/approval_text.txt
@@ -1,9 +1,9 @@
 {% load ietf_filters %}{% load mail_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
 To: {{ to }}
 Cc: {{ cc }}
-Subject: Results of IETF-conflict review for {{conflictdoc.canonical_name}}-{{conflictdoc.rev}}
+Subject: Results of IETF-conflict review for {{conflictdoc.name}}-{{conflictdoc.rev}}
 
-{% filter wordwrap:78 %}The IESG has completed a review of {{conflictdoc.canonical_name}}-{{conflictdoc.rev}} consistent with RFC5742.
+{% filter wordwrap:78 %}The IESG has completed a review of {{conflictdoc.name}}-{{conflictdoc.rev}} consistent with RFC5742.
 
 {% if review.get_state_slug == 'appr-reqnopub-pend' %}
 The IESG recommends that '{{ conflictdoc.title }}' {{ conflictdoc.file_tag|safe }} NOT be published as {{ conflictdoc|std_level_prompt_with_article }}.
@@ -18,7 +18,7 @@ The IESG would also like the {{receiver}} to review the comments in the datatrac
 The IESG review is documented at:
 {{review_url}}
 
-A URL of the reviewed Internet Draft is:
+A URL of the reviewed Internet-Draft is:
 {{conflictdoc_url}}
 
 The process for such documents is described {% if conflictdoc.stream_id == 'ise' %}at https://www.rfc-editor.org/indsubs.html {% else %}{% if conflictdoc.stream_id == 'irtf' %}in RFC 5743 {% endif %} {% endif %}
diff --git a/ietf/templates/doc/conflict_review/approve.html b/ietf/templates/doc/conflict_review/approve.html
index 5283587f07..ccbac9c4cb 100644
--- a/ietf/templates/doc/conflict_review/approve.html
+++ b/ietf/templates/doc/conflict_review/approve.html
@@ -2,10 +2,10 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}Approve {{ review.canonical_name }}{% endblock %}
+{% block title %}Approve {{ review.name }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Approve {{ review.canonical_name }}</h1>
+    <h1>Approve {{ review.name }}</h1>
     <form class="my-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
diff --git a/ietf/templates/doc/conflict_review/start.html b/ietf/templates/doc/conflict_review/start.html
index f1b33bc6b2..d8abc2b811 100644
--- a/ietf/templates/doc/conflict_review/start.html
+++ b/ietf/templates/doc/conflict_review/start.html
@@ -3,13 +3,13 @@
 {% load origin %}
 {% load django_bootstrap5 %}
 {% load ietf_filters %}
-{% block title %}Begin IETF conflict review for {{ doc_to_review.canonical_name }}-{{ doc_to_review.rev }}{% endblock %}
+{% block title %}Begin IETF conflict review for {{ doc_to_review.name }}-{{ doc_to_review.rev }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Begin IETF conflict review
         <br>
-        <small class="text-muted">{{ doc_to_review.canonical_name }}-{{ doc_to_review.rev }}</small>
+        <small class="text-body-secondary">{{ doc_to_review.name }}-{{ doc_to_review.rev }}</small>
     </h1>
     {% if user|has_role:"Secretariat" %}
         <p class="my-3">
diff --git a/ietf/templates/doc/conflict_review/submit.html b/ietf/templates/doc/conflict_review/submit.html
index a95a3c5776..8259c6b12f 100644
--- a/ietf/templates/doc/conflict_review/submit.html
+++ b/ietf/templates/doc/conflict_review/submit.html
@@ -2,16 +2,16 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}Edit conflict review for {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}{% endblock %}
+{% block title %}Edit conflict review for {{ conflictdoc.name }}-{{ conflictdoc.rev }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Edit conflict review
         <br>
-        <small class="text-muted">{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}</small>
+        <small class="text-body-secondary">{{ conflictdoc.name }}-{{ conflictdoc.rev }}</small>
     </h1>
     <p class="my-3 alert alert-info">
-        The text will be submitted as <strong>{{ review.canonical_name }}-{{ next_rev }}</strong>
+        The text will be submitted as <strong>{{ review.name }}-{{ next_rev }}</strong>
     </p>
     <form class="my-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
@@ -27,7 +27,7 @@ <h1>
             Reset to template text
         </button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=review.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=review.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/disclaimer.html b/ietf/templates/doc/disclaimer.html
new file mode 100644
index 0000000000..db4c42ed68
--- /dev/null
+++ b/ietf/templates/doc/disclaimer.html
@@ -0,0 +1,34 @@
+{# Copyright The IETF Trust 2016-2023, All Rights Reserved #}
+{% load origin %}
+{% load ietf_filters %}
+{% origin %}
+{% if doc.type_id == "rfc" %}
+    {% if doc.stream.slug != "ietf" and doc.stream.desc != "Legacy" and doc.std_level.slug|default:"unk" not in "bcp,ds,ps,std"|split:"," %}
+        <div class="alert alert-warning {% if document_html %}small p-2 mt-2{% endif %}" role="alert">
+            This RFC was published on the {{ doc.stream.desc }} stream.
+            This RFC is <strong>not endorsed by the IETF</strong> and has <strong>no formal standing</strong> in the
+            <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc2026' %}">IETF standards process</a>.
+        </div>
+    {% elif doc.stream.slug != "ietf" and doc.stream.desc == "Legacy" and doc.std_level.slug|default:"unk" not in "bcp,ds,ps,std"|split:"," %}	
+        <div class="alert alert-warning {% if document_html %}small p-2 mt-2{% endif %}" role="alert">
+            This RFC is labeled as "{{ doc.stream.desc }}"; it was published before a formal source was recorded.
+            This RFC is <strong>not endorsed by the IETF</strong> and has <strong>no formal standing</strong> in the
+            <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc2026' %}">IETF standards process</a>.
+        </div>
+    {% endif %}
+{% elif doc|is_in_stream %}
+    {% if doc.stream.slug != "ietf" and doc.std_level.slug|default:"unk" not in "bcp,ds,ps,std"|split:"," %}
+        <div class="alert alert-warning {% if document_html %}small p-2 mt-2{% endif %}" role="alert">
+            This document is an Internet-Draft (I-D) that has been submitted to the {{ doc.stream.desc }} stream.
+            This I-D is <strong>not endorsed by the IETF</strong> and has <strong>no formal standing</strong> in the
+            <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc2026' %}">IETF standards process</a>.
+        </div>
+    {% endif %}
+{% else %}
+    <div class="alert alert-warning {% if document_html %}small p-2 mt-2{% endif %}" role="alert">
+        This document is an Internet-Draft (I-D).
+        Anyone may submit an I-D to the IETF.
+        This I-D is <strong>not endorsed by the IETF</strong> and has <strong>no formal standing</strong> in the
+        <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc2026' %}">IETF standards process</a>.
+    </div>
+{% endif %}
diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html
index 3443b913d1..e0feb78bc7 100644
--- a/ietf/templates/doc/document_ballot_content.html
+++ b/ietf/templates/doc/document_ballot_content.html
@@ -1,20 +1,20 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
 {% load origin %}
 {% origin %}
 {% load ietf_filters %}
 {% load textfilters %}
 <div class="row">
-    <div class="col-md-2 d-none d-md-block d-sm-block d-lg-block d-xl-block d-xxl-block">
+    <div class="col-md-2">
         {% for n, positions in position_groups %}
             <p class="h5">
                 <span class="badge rounded-pill {{ n|pos_to_label_format }}">{{ n.name }}</span>
             </p>
             {% for p in positions %}
                 <div class="balloter-name mb-2">
-                    {% if p.is_old_pos %}<span class="text-muted">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.is_old_pos %})</span>{% endif %}
+                    {% if p.is_old_pos %}<span class="text-body-secondary">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.is_old_pos %})</span>{% endif %}
                 </div>
             {% empty %}
-                <span class="text-muted">(None)</span>
+                <span class="text-body-secondary">(None)</span>
             {% endfor %}
             <br>
         {% endfor %}
@@ -53,43 +53,45 @@
                 <b>Ballot question:</b> "{{ ballot.ballot_type.question }}"
             </p>
         {% endif %}
-        {% if editable and user|has_role:"Area Director,Secretariat,IRSG Member" %}
+        {% if editable and user|has_role:"Area Director,Secretariat,IRSG Member,RSAB Member" %}
             <a class="btn btn-primary my-3"
-               href="https://mailarchive.ietf.org/arch/search/?q=subject:{{ doc.name }}+AND+subject:(discuss+OR+comment+OR+review)">
+               href="https://mailarchive.ietf.org/arch/search/?q=subject:{{ doc.name }}+AND+subject:(discuss+OR+comment+OR+review+OR+concern)">
                 Search Mailarchive
             </a>
             {% if user|can_ballot:doc %}
                 <a class="btn btn-primary"
-                   href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}">
+                   href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?ballot_edit_return_point={{ request.path|urlencode }}">
                     Edit position
                 </a>
             {% endif %}
-            {% if doc.type_id == "draft" or doc.type_id == "conflrev" or doc.type_id == "statchg" %}
+            {% if user|can_defer:doc %}
                 {% if deferred %}
                     <a class="btn btn-warning"
-                       href="{% url 'ietf.doc.views_ballot.undefer_ballot' name=doc.name %}">Undefer ballot</a>
+                    href="{% url 'ietf.doc.views_ballot.undefer_ballot' name=doc.name %}">Undefer ballot</a>
                 {% else %}
                     {% if doc.telechat_date %}
                         <a class="btn btn-warning"
-                           href="{% url 'ietf.doc.views_ballot.defer_ballot' name=doc.name %}">Defer ballot</a>
+                        href="{% url 'ietf.doc.views_ballot.defer_ballot' name=doc.name %}">Defer ballot</a>
                     {% endif %}
                 {% endif %}
-                {% if user|has_role:"Area Director,Secretariat" and ballot.ballot_type.slug != "irsg-approve" %}
+            {% endif %}
+            {% if user|can_clear_ballot:doc %}
                     <a class="btn btn-danger"
-                       href="{% url 'ietf.doc.views_ballot.clear_ballot' name=doc.name ballot_type_slug=ballot.ballot_type.slug %}">
+                    href="{% url 'ietf.doc.views_ballot.clear_ballot' name=doc.name ballot_type_slug=ballot.ballot_type.slug %}">
                         Clear ballot
                     </a>
-                {% endif %}
             {% endif %}
         {% endif %}
         {% for n, positions in position_groups %}
             {% for p in positions %}
                 {% if not p.is_old_pos %}
-                    <p class="h5 mt-4"
-                        id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
-                        {{ p.balloter.plain_name }}
-                        <span class="float-end">
-                            {% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
+                    <div class="h5 d-flex mt-4"
+                         id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
+                        <div class="flex-fill">
+                            {{ p.balloter.plain_name }}
+                        </div>
+                        <div class="flex-fill text-end">
+                            {% if p.old_positions %}<span class="text-body-secondary small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
                             <span class="badge rounded-pill {{ p.pos|pos_to_label_format }}">{{ p.pos }}</span>
                             {% if user|has_role:"Secretariat" %}
                                 <a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?balloter={{ p.balloter.pk }}"
@@ -98,26 +100,35 @@
                                     Edit
                                 </a>
                             {% endif %}
-                        </span>
-                    </p>
+                        </div>
+                    </div>
                     {% if p.pos.blocking and p.discuss %}
                         <div class="card border-danger {% if p.comment %} mb-2{% endif %}">
-                            <div class="card-header bg-danger text-light">
+                            <div class="card-header text-bg-danger">
                                 <div>
                                     <b>{{ p.pos.name }}</b>
                                     ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision and p.get_dochistory.rev %}{% if p.discuss_time %} {% endif %}for -{{ p.get_dochistory.rev }}{% endif %})
+                                    {# TODO: This logic is in place for discusses/ballots/comments, consider centralizing somewhere #}
                                     {% if p.send_email %}
-                                        <i class="bi bi-envelope float-end"
-                                              title="Email requested to be sent for this discuss"></i>
+                                        <span class="badge rounded-pill text-bg-success float-end"
+                                              title="Email requested to be sent for this discuss">
+                                            <i class="bi bi-envelope-fill"></i> Sent
+                                        </span>
                                     {% elif p.any_email_sent == True %}
-                                        <i class="bi bi-envelope float-end"
-                                              title="Email requested to be sent for earlier discuss"></i>
+                                        <span class="badge rounded-pill text-bg-secondary float-end"
+                                              title="Email requested to be sent for earlier discuss">
+                                            <i class="bi bi-envelope-fill"></i> Sent for earlier
+                                        </span>
                                     {% elif p.any_email_sent == False %}
-                                        <i class="bi bi-chat float-end"
-                                              title="No email send requests for this discuss"></i>
+                                        <span class="badge rounded-pill text-bg-danger float-end"
+                                              title="No email send requests for this discuss">
+                                            <i class="bi bi-envelope-fill"></i> Not sent
+                                        </span>
                                     {% else %}
-                                        <i class="bi bi-chat float-end"
-                                              title="No email send requests for this discuss"></i>
+                                        <span class="badge rounded-pill text-bg-light float-end"
+                                              title="No discuss send log available">
+                                            <i class="bi bi-envelope-fill"></i> Unknown
+                                        </span>
                                     {% endif %}
                                 </div>
                             </div>
@@ -133,17 +144,25 @@
                                     <b>Comment</b>
                                     ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision and p.get_dochistory.rev %}{% if p.comment_time %} {% endif %}for -{{ p.get_dochistory.rev }}{% endif %})
                                     {% if p.send_email %}
-                                        <i class="bi bi-envelope-check float-end"
-                                              title="Email requested to be sent for this comment"></i>
+                                        <span class="badge rounded-pill text-bg-success float-end"
+                                              title="Email requested to be sent for this comment">
+                                            <i class="bi bi-envelope-fill"></i> Sent
+                                        </span>
                                     {% elif p.any_email_sent == True %}
-                                        <i class="bi bi-envelope-plus float-end"
-                                              title="Email requested to be sent for earlier comment"></i>
+                                        <span class="badge rounded-pill text-bg-secondary float-end"
+                                              title="Email requested to be sent for earlier comment">
+                                            <i class="bi bi-envelope-fill"></i> Sent for earlier
+                                        </span>
                                     {% elif p.any_email_sent == False %}
-                                        <i class="bi bi-envelope-dash float-end"
-                                              title="No email send requests for this comment"></i>
+                                        <span class="badge rounded-pill text-bg-danger float-end"
+                                              title="No email send requests for this comment">
+                                            <i class="bi bi-envelope-fill"></i> Not sent
+                                        </span>
                                     {% else %}
-                                        <i class="bi bi-envelope-exclamation float-end"
-                                              title="No ballot position send log available"></i>
+                                        <span class="badge rounded-pill text-bg-light float-end"
+                                              title="No comment send log available">
+                                            <i class="bi bi-envelope-fill"></i> Unknown
+                                        </span>
                                     {% endif %}
                                 </div>
                             </div>
@@ -158,10 +177,13 @@
         {% for n, positions in position_groups %}
             {% for p in positions %}
                 {% if p.is_old_pos %}
-                    <p class="h5 mt-4" id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
-                        <span class="text-muted">({{ p.balloter.plain_name }}; former steering group member)</span>
-                        <span class="float-end">
-                            {% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
+                    <div class="h5 d-flex mt-4"
+                         id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
+                        <div class="flex-fill text-body-secondary">
+                            {{ p.balloter.plain_name }} <span class="badge rounded-pill text-bg-secondary">Former IESG member</span>
+                        </div>
+                        <div class="flex-fill text-end">
+                            {% if p.old_positions %}<span class="text-body-secondary small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
                             <span class="badge rounded-pill {{ p.pos|pos_to_label_format }}">{{ p.pos }}</span>
                             {% if user|has_role:"Secretariat" %}
                                 <a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot.pk %}?balloter={{ p.balloter.pk }}"
@@ -170,8 +192,8 @@
                                     Edit
                                 </a>
                             {% endif %}
-                        </span>
-                    </p>
+                        </div>
+                    </div>
                     <div class="card {{ p.pos|pos_to_border_format }}">
                         <div class="card-header {{ p.pos|pos_to_label_format }}">
                             <div>
@@ -183,17 +205,27 @@
                                     ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision and p.get_dochistory.rev %}{% if p.comment_time %} {% endif %}for -{{ p.get_dochistory.rev }}{% endif %})
                                 {% endif %}
                                 {% if p.send_email %}
-                                    <i class="bi bi-envelope float-end"
-                                          title="Email requested to be sent for this ballot position"></i>
+                                    <span class="badge rounded-pill text-bg-success float-end"
+                                          title="Email requested to be sent for this ballot position">
+                                        <i class="bi bi-envelope-fill"></i> Sent
+                                    </span>
                                 {% elif p.any_email_sent == True %}
-                                    <i class="bi bi-envelope float-end"
-                                          title="Email requested to be sent for earlier ballot position"></i>
+                                    <span class="badge rounded-pill text-bg-secondary float-end"
+                                            title="Email requested to be sent for earlier ballot position">
+                                        <i class="bi bi-envelope-fill"></i> Sent for earlier
+                                    </span>
                                 {% elif p.any_email_sent == False %}
-                                    <i class="bi bi-chat float-end"
-                                          title="No email send requests for this ballot position"></i>
+                                    <span class="badge rounded-pill text-bg-danger float-end"
+                                          title="No email send requests for this ballot position">
+                                        <i class="bi bi-envelope-fill"></i> Not sent
+                                    </span>
                                 {% else %}
-                                    <i class="bi bi-envelope-slash float-end"
-                                          title="No ballot position send log available"></i>
+                                    <!-- <i class="bi bi-envelope-slash float-end"
+                                          title="No ballot position send log available"></i> -->
+                                    <span class="badge rounded-pill text-bg-light float-end"
+                                          title="No ballot position send log available">
+                                        <i class="bi bi-envelope-fill"></i> Unknown
+                                    </span>
                                 {% endif %}
                             </div>
                         </div>
@@ -211,4 +243,4 @@
             {% endfor %}
         {% endfor %}
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/ietf/templates/doc/document_bibtex.bib b/ietf/templates/doc/document_bibtex.bib
index 5dda4649eb..5e52ec3c58 100644
--- a/ietf/templates/doc/document_bibtex.bib
+++ b/ietf/templates/doc/document_bibtex.bib
@@ -3,7 +3,7 @@
 {% load ietf_filters %}
 {% load textfilters %}
 
-{% if doc.get_state_slug == "rfc" %}
+{% if doc.type_id == "rfc" %}
 {% if doc.stream|slugify == "legacy" %}
 % Datatracker information for RFCs on the Legacy Stream is unfortunately often
 % incorrect. Please correct the bibtex below based on the information in the
@@ -16,7 +16,7 @@ @misc{
     publisher = {RFC Editor},
     doi =       {% templatetag openbrace %}{{ doi }}{% templatetag closebrace %},
     url =       {% templatetag openbrace %}{{ doc.rfc_number|rfceditor_info_url }}{% templatetag closebrace %},{% else %}
-{% if published %}%% You should probably cite rfc{{ latest_revision.doc.rfc_number }} instead of this I-D.{% else %}{% if replaced_by %}%% You should probably cite {{replaced_by|join:" or "}} instead of this I-D.{% else %}
+{% if published_as %}%% You should probably cite rfc{{ published_as.rfc_number }} instead of this I-D.{% else %}{% if replaced_by %}%% You should probably cite {{replaced_by|join:" or "}} instead of this I-D.{% else %}
 {% if doc.rev != latest_revision.rev %}%% You should probably cite {{latest_revision.doc.name}}-{{latest_revision.rev}} instead of this revision.{%endif%}{% endif %}{% endif %}
 @techreport{% templatetag openbrace %}{{doc.name|slice:"6:"}}-{{doc.rev}},
     number =    {% templatetag openbrace %}{{doc.name}}-{{doc.rev}}{% templatetag closebrace %},
@@ -25,11 +25,11 @@ @techreport{
     publisher = {% templatetag openbrace %}Internet Engineering Task Force{% templatetag closebrace %},
     note =      {% templatetag openbrace %}Work in Progress{% templatetag closebrace %},
     url =       {% templatetag openbrace %}{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=doc.name rev=doc.rev %}{% templatetag closebrace %},{% endif %}
-        author =    {% templatetag openbrace %}{% for author in doc.documentauthor_set.all %}{{ author.person.name|texescape}}{% if not forloop.last %} and {% endif %}{% endfor %}{% templatetag closebrace %},
+    author =    {% templatetag openbrace %}{% for author in doc.documentauthor_set.all %}{{ author.person.name|texescape}}{% if not forloop.last %} and {% endif %}{% endfor %}{% templatetag closebrace %},
     title =     {% templatetag openbrace %}{% templatetag openbrace %}{{doc.title|texescape}}{% templatetag closebrace %}{% templatetag closebrace %},
     pagetotal = {{ doc.pages }},
     year =      {{ doc.pub_date.year }},
-    month =     {{ doc.pub_date|date:"b" }},{% if not doc.rfc_number or doc.pub_date.day == 1 and doc.pub_date.month == 4  %}
+    month =     {{ doc.pub_date|date:"b" }},{% if not doc.type_id == "rfc" or doc.pub_date.day == 1 and doc.pub_date.month == 4  %}
     day =       {{ doc.pub_date.day }},{% endif %}
     abstract =  {% templatetag openbrace %}{{ doc.abstract|clean_whitespace|texescape }}{% templatetag closebrace %},
 {% templatetag closebrace %}
diff --git a/ietf/templates/doc/document_bofreq.html b/ietf/templates/doc/document_bofreq.html
index 6cb5df88b4..cbf64c1484 100644
--- a/ietf/templates/doc/document_bofreq.html
+++ b/ietf/templates/doc/document_bofreq.html
@@ -9,7 +9,7 @@
     {% origin %}
     {{ top|safe }}
     {% include "doc/revisions_list.html" %}
-    <div id="timeline"></div>
+    <div id="doc-timeline"></div>
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning my-3">The information below is for an older version of this BOF request.</div>
     {% endif %}
@@ -21,7 +21,7 @@
                 <td class="edit"></td>
                 <td>
                     {{ doc.get_state.slug|capfirst }} BOF request
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
@@ -135,7 +135,7 @@
                     {% endif %}
                 </td>
                 <td>
-                    {{ doc.notify|default:'<span class="text-muted">(None)</span>' }}
+                    {{ doc.notify|default:'<span class="text-body-secondary">(None)</span>' }}
                 </td>
             </tr>
         </tbody>
@@ -154,7 +154,7 @@
         <div class="card-header">
             {{ doc.name }}-{{ doc.rev }}
         </div>
-        <div class="card-body">
+        <div class="card-body text-break">
             {{ content }}
         </div>
     </div>
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index a811f26aba..7564e1d213 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -14,7 +14,7 @@
     {% origin %}
     {{ top|safe }}
     {% include "doc/revisions_list.html" %}
-    <div id="timeline"></div>
+    <div id="doc-timeline"></div>
     {% if doc.rev|charter_major_rev != latest_rev|charter_major_rev %}
         <div class="alert alert-warning my-3">
             The information below is for an older
@@ -59,7 +59,7 @@
                 <th scope="row">
                     {{ group.name }} {{ group.type.name }}
                     <a href="{{ group.about_url }}">({{ group.acronym }})</a>
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </th>
             </tr>
             <tr>
@@ -94,8 +94,8 @@
                     {% else %}
                         No document state
                     {% endif %}
-                    {% if chartering == "initial" %}<span class="badge rounded-pill bg-info">Initial chartering</span>{% endif %}
-                    {% if chartering == "rechartering" %}<span class="badge rounded-pill bg-info">Rechartering</span>{% endif %}
+                    {% if chartering == "initial" %}<span class="badge rounded-pill text-bg-info">Initial chartering</span>{% endif %}
+                    {% if chartering == "rechartering" %}<span class="badge rounded-pill text-bg-info">Rechartering</span>{% endif %}
                 </td>
             </tr>
         </tbody>
@@ -152,7 +152,7 @@
                     </td>
                     <td>
                         {% if not telechat %}
-                            <span class="text-muted">(None)</span>
+                            <span class="text-body-secondary">(None)</span>
                         {% else %}
                             On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat
                         {% endif %}
@@ -175,7 +175,7 @@
                     {% endif %}
                 </td>
                 <td>
-                    {{ doc.notify|default:'<span class="text-muted">(None)</span>' }}
+                    {{ doc.notify|default:'<span class="text-body-secondary">(None)</span>' }}
                 </td>
             </tr>
         </tbody>
@@ -227,10 +227,10 @@
     {% if doc.rev != "" %}
         <div class="card mt-5">
             <div class="card-header">
-                {{ doc.canonical_name }}-{{ doc.rev }}
+                {{ doc.name }}-{{ doc.rev }}
             </div>
             <div class="card-body">
-                <pre>{{ content|maybewordwrap|urlize_ietf_docs|linkify }}</pre>
+                {{ content }}
             </div>
         </div>
     {% endif %}
diff --git a/ietf/templates/doc/document_chatlog.html b/ietf/templates/doc/document_chatlog.html
index 1e88810fea..7c97471e69 100644
--- a/ietf/templates/doc/document_chatlog.html
+++ b/ietf/templates/doc/document_chatlog.html
@@ -8,7 +8,7 @@
     {% origin %}
     {{ top|safe }}
     {% include "doc/revisions_list.html" %}
-    <div id="timeline"></div>
+    <div id="doc-timeline"></div>
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
@@ -26,13 +26,13 @@
                         <a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a>
                         {{ doc.group.type.name }}
                     {% endif %}
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
                 <th scope="row">Title</th>
                 <td class="edit"></td>
-                <th scope="row">{{ doc.title|default:'<span class="text-muted">(None)</span>' }}</th>
+                <th scope="row">{{ doc.title|default:'<span class="text-body-secondary">(None)</span>' }}</th>
             </tr>
             <tr>
                 <th scope="row">Session</th>
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index 9e9f78b685..8a2361832b 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -10,7 +10,7 @@
     {% origin %}
     {{ top|safe }}
     {% include "doc/revisions_list.html" %}
-    <div id="timeline"></div>
+    <div id="doc-timeline"></div>
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
@@ -27,10 +27,10 @@
                 </th>
                 <td class="edit"></td>
                 <td>
-                    <a href="{% url "ietf.doc.views_doc.document_main" name=conflictdoc.canonical_name %}">
-                        {% if conflictdoc.get_state_slug == 'rfc' %}{{ conflictdoc.canonical_name|prettystdname }}{% else %}{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}{% endif %}</a>
-                    <span class="badge rounded-pill bg-info">{{ conflictdoc.stream }} stream</span>
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    <a href="{% url "ietf.doc.views_doc.document_main" name=conflictdoc.name %}">
+                        {% if conflictdoc.type_id == 'rfc' %}{{ conflictdoc.name|prettystdname }}{% else %}{{ conflictdoc.name }}-{{ conflictdoc.rev }}{% endif %}</a>
+                    <span class="badge rounded-pill text-bg-info">{{ conflictdoc.stream }} stream</span>
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
@@ -54,11 +54,7 @@
                     {% endif %}
                 </td>
                 <td>
-                    {% if "no-problem" in doc.get_state.name|slugify %}
-                        <span class="text-success">{{ doc.get_state.name}}</span>
-                    {% else %}
-                        {{ doc.get_state.name }}
-                    {% endif %}
+                    {{ doc.get_state.name|badgeify }}
                 </td>
             </tr>
         </tbody>
@@ -90,7 +86,7 @@
                     </td>
                     <td>
                         {% if not telechat %}
-                            <span class="text-muted">(None)</span>
+                            <span class="text-body-secondary">(None)</span>
                         {% else %}
                             On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat
                             {% if doc.returning_item %}(returning item){% endif %}
@@ -149,4 +145,4 @@
     </script>
     <script src="{% static 'ietf/js/document_timeline.js' %}">
     </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 63ee22c4f0..eab1d779fb 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2016-2020, All Rights Reserved #}
+{# Copyright The IETF Trust 2016-2024, All Rights Reserved #}
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
@@ -13,11 +13,11 @@
           title="Document changes"
           href="/feed/document-changes/{{ name }}/">
     <meta name="description"
-          content="{{ doc.title }} {% if doc.get_state_slug == 'rfc' and not snapshot %}(RFC {{ rfc_number }}{% if published %}, {{ published.time|date:'F Y' }}{% endif %}{% if obsoleted_by %}; obsoleted by {{ obsoleted_by|join:', ' }}{% endif %}){% else %}(Internet-Draft, {{ doc.time|date:'Y' }}){% endif %}">
+          content="{{ doc.title }} {% if doc.type_id == 'rfc' and not snapshot %}(RFC {{ rfc_number }}{% if published %}, {{ doc.pub_date|date:'F Y' }}{% endif %}{% if obsoleted_by %}; obsoleted by {% for rel in obsoleted_by %}{{ rel.source.name|prettystdname}}{% if not forloop.last%}, {% endif %}{% endfor %}{% endif %}){% endif %}">
 {% endblock %}
 {% block morecss %}.inline { display: inline; }{% endblock %}
 {% block title %}
-    {% if doc.get_state_slug == "rfc" and not snapshot %}
+    {% if doc.type_id == "rfc" and not snapshot %}
         RFC {{ rfc_number }} - {{ doc.title }}
     {% else %}
         {{ name }}-{{ doc.rev }} - {{ doc.title }}
@@ -26,375 +26,20 @@
 {% block content %}
     {% origin %}
     {{ top|safe }}
-    {% include "doc/revisions_list.html" %}
-    <div id="timeline"></div>
+    {% include "doc/revisions_list.html"  with document_html=document_html %}
+    {% include "doc/disclaimer.html" with document_html=document_html %}
+    <div id="doc-timeline"></div>
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% else %}
-        {% if doc.get_state_slug == "rfc" and snapshot %}
+        {% if doc.became_rfc %}
             <div class="alert alert-warning my-3">
                 The information below is for an old version of the document that is already published as an RFC.
             </div>
         {% endif %}
     {% endif %}
     <table class="table table-sm table-borderless">
-        <tbody class="meta border-top">
-            <tr>
-                <th scope="row">Document</th>
-                <th scope="row">Type</th>
-                <td class="edit"></td>
-                <td>
-                    {% if doc.get_state_slug == "rfc" and not snapshot %}
-                        <span class="text-success">RFC - {{ doc.std_level }}</span>
-                        {% if published %}
-                            ({{ published.time|date:"F Y" }})
-                        {% else %}
-                            (Publication date unknown)
-                        {% endif %}
-                        {% if has_verified_errata %}
-                            <a class="badge rounded-pill bg-danger text-decoration-none text-light"
-                               href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}" title="Click to view errata." rel="nofollow">
-                                Errata
-                            </a>
-                        {% elif has_errata %}
-                            <a class="badge rounded-pill bg-warning text-decoration-none text-light"
-                               href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}" title="Click to view errata." rel="nofollow">
-                                Errata
-                            </a>
-                        {% endif %}
-                        {% if obsoleted_by %}<div>Obsoleted by {{ obsoleted_by|urlize_related_source_list|join:", " }}</div>{% endif %}
-                        {% if updated_by %}<div>Updated by {{ updated_by|urlize_related_source_list|join:", " }}</div>{% endif %}
-                        {% if obsoletes %}<div>Obsoletes {{ obsoletes|urlize_related_target_list|join:", " }}</div>{% endif %}
-                        {% if updates %}<div>Updates {{ updates|urlize_related_target_list|join:", " }}</div>{% endif %}
-                        {% if status_changes %}
-                            <div>Status changed by {{ status_changes|urlize_related_source_list|join:", " }}</div>
-                        {% endif %}
-                        {% if proposed_status_changes %}
-                            <div>Proposed status changed by {{ proposed_status_changes|urlize_related_source_list|join:", " }}</div>
-                        {% endif %}
-                        {% if rfc_aliases %}<div>Also known as {{ rfc_aliases|join:", "|urlize_ietf_docs }}</div>{% endif %}
-                        {% if draft_name %}
-                            <div>
-                                Was
-                                <a href="{% url 'ietf.doc.views_doc.document_main' name=draft_name %}">{{ draft_name }}</a>
-                                {% if submission %}({{ submission|safe }}){% endif %}
-                            </div>
-                        {% endif %}
-                    {% else %}
-                        {% if snapshot and doc.doc.get_state_slug == 'rfc' %}
-                           <span>This is an older version of an Internet-Draft that was ultimately published as an RFC.</span> 
-                        {% elif snapshot and doc.rev != latest_rev  %}
-                            <span>This is an older version of an Internet-Draft whose latest revision is {{ doc.doc.get_state }}</span> 
-                         {% else %}
-                            <span class="{% if doc.get_state_slug == 'active' %}text-success{% elif doc.get_state_slug == 'expired' %}text-danger{% endif %}">{% if snapshot and doc.rev == latest_rev %}{{ doc.doc.get_state }}{% else %}{{ doc.get_state }}{% endif %} Internet-Draft</span>
-                            {% if submission %}({{ submission|safe }}){% endif %}
-                            {% if resurrected_by %}- resurrect requested by {{ resurrected_by }}{% endif %}
-                        {% endif %}
-                    {% endif %}
-                </td>
-            </tr>
-            <tr>
-                <td></td>
-                <th scope="row">Author{{ doc.authors|pluralize }}</th>
-                <td class="edit">
-                    {% if can_edit_authors %}
-                        <a class="btn btn-primary btn-sm"
-                           href="{%  url 'ietf.doc.views_doc.edit_authors' name=doc.name %}">Edit</a>
-                    {% endif %}
-                </td>
-                <td>
-                    {# Implementation that uses the current primary email for each author #}
-                    {% for author in doc.authors %}
-                        {% person_link author %}{% if not forloop.last %},{% endif %}
-                    {% endfor %}
-                </td>
-            </tr>
-            <tr>
-                <td></td>
-                <th scope="row">Last updated</th>
-                <td class="edit"></td>
-                <td>
-                    {{ doc.time|date:"Y-m-d" }}
-                    {% if latest_revision and latest_revision.time.date != doc.time.date %}
-                        <span class="text-muted">(Latest revision {{ latest_revision.time|date:"Y-m-d" }})</span>
-                    {% endif %}
-                </td>
-            </tr>
-            {% if replaces or can_edit_stream_info %}
-                <tr>
-                    <td></td>
-                    <th scope="row">Replaces</th>
-                    <td class="edit">
-                        {% if can_edit_stream_info and not snapshot %}
-                            <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.doc.views_draft.replaces' name=doc.name %}">Edit</a>
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if replaces %}
-                            {{ replaces|urlize_related_target_list|join:", " }}
-                        {% else %}
-                            <span class="text-muted">(None)</span>
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if replaced_by %}
-                <tr>
-                    <td></td>
-                    <th scope="row">
-                        Replaced by
-                    </th>
-                    <td class="edit">
-                    </td>
-                    <td>
-                        {{ replaced_by|urlize_related_source_list|join:", " }}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if can_view_possibly_replaces %}
-                {% if possibly_replaces %}
-                    <tr>
-                        <td></td>
-                        <th scope="row">
-                            Possibly Replaces
-                        </th>
-                        <td class="edit">
-                            {% if can_edit_replaces and not snapshot %}
-                                <a class="btn btn-primary btn-sm"
-                                   href="{% url 'ietf.doc.views_draft.review_possibly_replaces' name=doc.name %}">
-                                    Edit
-                                </a>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {{ possibly_replaces|urlize_related_target_list|join:", " }}
-                        </td>
-                    </tr>
-                {% endif %}
-                {% if possibly_replaced_by %}
-                    <tr>
-                        <td></td>
-                        <th scope="row">
-                            Possibly Replaced By
-                        </th>
-                        <td class="edit">
-                            {% if can_edit_replaces and not snapshot %}
-                                {% comment %}<a class="btn btn-primary btn-sm"
-   href="{% url 'ietf.doc.views_draft.review_possibly_replaces' name=doc.name %}">Edit</a>{% endcomment %}
-                            {% endif %}
-                        </td>
-                        <td>
-                            {{ possibly_replaced_by|urlize_related_source_list|join:", " }}
-                        </td>
-                    </tr>
-                {% endif %}
-            {% endif %}
-            <tr>
-                <td></td>
-                <th scope="row">
-                    Stream
-                </th>
-                <td class="edit">
-                    {% if can_change_stream and not snapshot %}
-                        <a class="btn btn-primary btn-sm"
-                           href="{% url 'ietf.doc.views_draft.change_stream' name=doc.name %}">
-                            Edit
-                        </a>
-                    {% endif %}
-                </td>
-                <td {% if stream_desc == "(None)" %}class="text-muted"{%endif%}>
-                    {{ stream_desc }}
-                </td>
-            </tr>
-            {% if doc.get_state_slug != "rfc" and not snapshot %}
-                <tr>
-                    <td></td>
-                    <th scope="row">
-                        Intended RFC status
-                    </th>
-                    <td class="edit">
-                        {% if can_edit_stream_info and not snapshot %}
-                            <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.doc.views_draft.change_intention' name=doc.name %}">
-                                Edit
-                            </a>
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if doc.intended_std_level %}
-                            {{ doc.intended_std_level }}
-                        {% else %}
-                            <span class="text-muted">
-                                (None)
-                            </span>
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endif %}
-            <tr>
-                <td></td>
-                <th scope="row">
-                    Formats
-                </th>
-                <td class="edit">
-                </td>
-                <td>
-                    {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" %}
-                        <div class="badge rounded-pill bg-warning float-end">
-                            Expired &amp; archived
-                        </div>
-                    {% endif %}
-                    {% include "doc/document_format_buttons.html" %}
-                </td>
-            </tr>
-            {% for check in doc.submission.latest_checks %}
-                {% if check.passed != None and check.symbol.strip %}
-                    <tr>
-                        <td></td>
-                        <th scope="row">
-                            {{ check.checker|title }}
-                        </th>
-                        <td class="edit">
-                        </td>
-                        <td>
-                            {% if check.errors or check.warnings %}
-                                <span class="checker-warning"
-                                      data-bs-toggle="modal"
-                                      data-bs-target="#check-{{ check.pk }}"
-                                      title="{{ check.checker|title }} returned warnings or errors.">
-                                    {{ check.symbol|safe }}
-                                </span>
-                            {% else %}
-                                <span class="checker-success"
-                                      data-bs-toggle="modal"
-                                      data-bs-target="#check-{{ check.pk }}"
-                                      title="{{ check.checker|title }} passed">
-                                    {{ check.symbol|safe }}
-                                </span>
-                            {% endif %}
-                            <a href="#"
-                               data-bs-toggle="modal"
-                               data-bs-target="#check-{{ check.pk }}">
-                                {{ check.errors }} errors, {{ check.warnings }} warnings
-                            </a>
-                            {% include "doc/yang-check-modal-overlay.html" %}
-                        </td>
-                    </tr>
-                {% endif %}
-            {% endfor %}
-            {% if review_assignments or can_request_review %}
-                <tr>
-                    <td></td>
-                    <th scope="row">
-                        Reviews
-                    </th>
-                    <td class="edit">
-                    </td>
-                    <td>
-                        {% for review_assignment in review_assignments %}
-                            {% include "doc/review_assignment_summary.html" with current_doc_name=doc.name current_rev=doc.rev %}
-                        {% endfor %}
-                        {% if no_review_from_teams %}
-                            {% for team in no_review_from_teams %}
-                                {{ team.acronym.upper }}{% if not forloop.last %},{% endif %}
-                            {% endfor %}
-                            will not review this version
-                        {% endif %}
-                        {% if can_request_review or can_submit_unsolicited_review_for_teams %}
-                            <div {% if review_assignments or no_review_from_teams %} class="mt-3"{% endif %}>
-                                {% if can_request_review %}
-                                <a class="btn btn-primary btn-sm"
-                                   href="{% url "ietf.doc.views_review.request_review" doc.name %}">
-                                    <i class="bi bi-check-circle">
-                                    </i>
-                                    Request review
-                                </a>
-                                {% endif %}
-                                {% if can_submit_unsolicited_review_for_teams|length == 1 %}
-                                    <a class="btn btn-primary btn-sm"
-                                       href="{% url "ietf.doc.views_review.complete_review" doc.name can_submit_unsolicited_review_for_teams.0.acronym %}">
-                                        <i class="bi bi-pencil-square">
-                                        </i>
-                                        Submit unsolicited review
-                                    </a>
-                                {% elif can_submit_unsolicited_review_for_teams %}
-                                    <a class="btn btn-primary btn-sm"
-                                       href="{% url "ietf.doc.views_review.submit_unsolicited_review_choose_team" doc.name %}">
-                                        <i class="bi bi-pencil-square">
-                                        </i>
-                                        Submit unsolicited review
-                                    </a>
-                                {% endif %}
-                            </div>
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endif %}
-            {% if conflict_reviews %}
-                <tr>
-                    <td></td>
-                    <th scope="row">
-                        IETF conflict review
-                    </th>
-                    <td class="edit">
-                    </td>
-                    <td>
-                        {{ conflict_reviews|join:", "|urlize_ietf_docs }}
-                    </td>
-                </tr>
-            {% endif %}
-            {% with doc.docextresource_set.all as resources %}
-                {% if resources or can_edit_stream_info or can_edit_individual %}
-                    <tr>
-                        <td>
-                        </td>
-                        <th scope="row">
-                            Additional resources
-                        </th>
-                        <td class="edit">
-                            {% if can_edit_stream_info or can_edit_individual %}
-                                <a class="btn btn-primary btn-sm"
-                                   href="{% url 'ietf.doc.views_draft.edit_doc_extresources' name=doc.name %}">
-                                    Edit
-                                </a>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if resources or doc.group and doc.group.list_archive %}
-                                {% for resource in resources|dictsort:"display_name" %}
-                                    {% if resource.name.type.slug == 'url' or resource.name.type.slug == 'email' %}
-                                        <a href="{{ resource.value }}" title="{{ resource.name.name }}">
-                                            {% firstof resource.display_name resource.name.name %}
-                                        </a>
-                                        <br>
-                                        {# Maybe make how a resource displays itself a method on the class so templates aren't doing this switching #}
-                                    {% else %}
-                                        <span title="{{ resource.name.name }}">
-                                            {% firstof resource.display_name resource.name.name %}: {{ resource.value|escape }}
-                                        </span>
-                                        <br>
-                                    {% endif %}
-                                {% endfor %}
-                                {% if doc.group and doc.group.list_archive %}
-                                    {% if doc.group.list_archive|startswith:settings.MAILING_LIST_ARCHIVE_URL %}
-                                        <a href="{{ doc.group.list_archive }}?q={{ doc.name }}">
-                                            Mailing list discussion
-                                        </a>
-                                    {% elif doc.group.list_archive|is_valid_url %}
-                                        <a href="{{ doc.group.list_archive }}">
-                                            Mailing list discussion
-                                        </a>
-                                    {% else %}
-                                        {{ doc.group.list_archive|urlencode }}
-                                    {% endif %}
-                                {% endif %}
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endif %}
-            {% endwith %}
-        </tbody>
+        {% include "doc/document_info.html" %}
         <tbody class="meta border-top">
             <tr>
                 <th scope="row">
@@ -403,7 +48,7 @@
                 {% if doc.stream %}
                     <th scope="row">
                         {% if doc.stream.slug != "legacy" %}
-                            <a href="{% url "ietf.help.views.state" doc=doc.type.slug type=doc.stream.slug %}">
+                            <a href="{% url "ietf.doc.views_help.state_help" type=stream %}">
                                 {% if doc.stream_id == 'ietf' %}
                                     WG
                                 {% else %}
@@ -418,7 +63,12 @@
                     <td class="edit">
                         {% if doc.stream and can_edit_stream_info and doc.stream.slug != "legacy" and not snapshot %}
                             <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.doc.views_draft.change_stream_state' name=doc.name state_type=stream_state_type_slug %}">
+                               {% if doc|is_doc_ietf_adoptable or doc|can_issue_ietf_wg_lc or doc|can_submit_to_iesg %}
+                                 href="{% url 'ietf.doc.views_draft.offer_wg_action_helpers' name=doc.name %}"
+                               {% else %}
+                                 href="{% url 'ietf.doc.views_draft.change_stream_state' name=doc.name state_type=stream_state_type_slug %}"
+                               {% endif %}
+                            >
                                 Edit
                             </a>
                         {% endif %}
@@ -429,7 +79,7 @@
                                 {{ stream_state }}
                             </span>
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                 (None)
                             </span>
                         {% endif %}
@@ -441,7 +91,7 @@
                             </div>
                         {% endif %}
                         {% if due_date %}
-                            <span class="text-muted">(Due date {{ due_date }})</span>
+                            <span class="text-body-secondary">(Due date {{ due_date }})</span>
                         {% endif %}
                     </td>
                 {% else %}
@@ -451,7 +101,7 @@
                     <td class="edit">
                     </td>
                     <td>
-                        <span class="text-muted">(No stream defined)</span>
+                        <span class="text-body-secondary">(No stream defined)</span>
                     </td>
                 {% endif %}
             </tr>
@@ -522,18 +172,18 @@
                                 {% if pres.rev and pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %},{% endif %}
                             {% endfor %}
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                 (None)
                             </span>
                         {% endif %}
                     </td>
                 </tr>
             {% endif %}
-            {% if doc.stream_id == 'ietf' or doc.stream_id == 'ise' or doc.stream_id == 'irtf' or doc.stream_id == 'editorial' %}
+            {% if doc.stream_id == 'ietf' or doc.stream_id == 'ise' or doc.stream_id == 'irtf' or doc.stream_id == 'editorial' or doc.stream_id == 'iab' %}
                 <tr>
                     <td></td>
                     <th scope="row">
-                        Document shepherd
+                        {% if doc.stream_id == 'iab' %}IAB shepherd{% else %}Document shepherd{% endif %}
                     </th>
                     <td class="edit">
                         {% if can_edit_stream_info and not snapshot %}
@@ -552,7 +202,7 @@
                         {% if doc.shepherd %}
                             {% person_link doc.shepherd.person %}
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                     (None)
                                 </span>
                         {% endif %}
@@ -580,9 +230,9 @@
                                    href="{% url 'ietf.doc.views_doc.document_shepherd_writeup' name=doc.name %}">
                                     Show
                                 </a>
-                                <span class="badge rounded-pill bg-secondary">Last changed {{ shepherd_writeup.time|date:"Y-m-d" }}</span>
+                                <span class="badge rounded-pill text-bg-secondary">Last changed {{ shepherd_writeup.time|date:"Y-m-d" }}</span>
                             {% else %}
-                                <span class="text-muted">
+                                <span class="text-body-secondary">
                                     (None)
                                 </span>
                             {% endif %}
@@ -607,7 +257,7 @@
                         {% if doc.has_rfc_editor_note %}
                             (last changed {{ doc.has_rfc_editor_note|date:"Y-m-d" }})
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                 (None)
                             </span>
                         {% endif %}
@@ -623,19 +273,19 @@
                 </tr>
             {% endif %}
         </tbody>
-        {% if not doc.stream_id == 'iab' %}
+        {% if doc.stream_id != 'iab' and doc.stream_id != 'editorial' %}
             <tbody class="meta border-top">
                 <tr>
                     <th scope="row">
                         IESG
                     </th>
                     <th scope="row">
-                        <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">
+                        <a href="{% url "ietf.doc.views_help.state_help" type="draft-iesg" %}">
                             IESG state
                         </a>
                     </th>
                     <td class="edit">
-                        {% if iesg_state.slug != 'idexists' and can_edit %}
+                        {% if iesg_state.slug != 'idexists' and iesg_state.slug != 'dead' and can_edit or user|has_role:"Secretariat" %}
                             <a class="btn btn-primary btn-sm"
                                href="{% url 'ietf.doc.views_draft.change_state' name=doc.name %}">
                                 Edit
@@ -659,7 +309,7 @@
                             Action Holder{{ doc.documentactionholder_set.all|pluralize }}
                         </th>
                         <td class="edit">
-                            {% if can_edit %}
+                            {% if can_edit_action_holders %}
                                 <a class="btn btn-primary btn-sm"
                                    href="{% url 'ietf.doc.views_doc.edit_action_holders' name=doc.name %}">
                                     Edit
@@ -674,7 +324,7 @@
                                             {% person_link action_holder.person title=action_holder.role_for_doc %} {{ action_holder|action_holder_badge }}
                                         </div>
                                     {% endfor %}
-                                    {% if can_edit %}
+                                    {% if can_edit_action_holders %}
                                         <a class="btn btn-primary btn-sm mt-3"
                                            href="{% url "ietf.doc.views_doc.remind_action_holders" name=doc.name %}">
                                             <i class="bi bi-envelope">
@@ -683,7 +333,7 @@
                                         </a>
                                     {% endif %}
                                 {% else %}
-                                    <span class="text-muted">
+                                    <span class="text-body-secondary">
                                         (None)
                                     </span>
                                 {% endif %}
@@ -731,7 +381,7 @@
                                 On agenda of {{ telechat.telechat_date }} IESG telechat
                                 {% if telechat.returning_item %}(returning item){% endif %}
                             {% else %}
-                                <span class="text-muted">
+                                <span class="text-body-secondary">
                                     (None)
                                 </span>
                             {% endif %}
@@ -758,38 +408,25 @@
                             {% if doc.ad %}
                                 {% person_link doc.ad %}
                             {% else %}
-                                <span class="text-muted">
+                                <span class="text-body-secondary">
                                     (None)
                                 </span>
                             {% endif %}
                         </td>
                     </tr>
-                    {% if iesg_state.slug != 'idexists' %}
-                        {% if doc.note or can_edit %}
-                            <tr>
-                                <td></td>
-                                <th scope="row">
-                                    IESG note
-                                </th>
-                                <td class="edit">
-                                    {% if can_edit and not snapshot %}
-                                        <a class="btn btn-primary btn-sm"
-                                           href="{% url 'ietf.doc.views_draft.edit_iesg_note' name=doc.name %}">
-                                            Edit
-                                        </a>
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {% if doc.note %}
-                                        {{ doc.note|linebreaksbr }}
-                                    {% else %}
-                                        <span class="text-muted">
-                                            (None)
-                                        </span>
-                                    {% endif %}
-                                </td>
-                            </tr>
-                        {% endif %}
+                    {% if iesg_state.slug != 'idexists' and doc.note %}
+                        <tr>
+                            <td></td>
+                            <th scope="row">
+                                IESG note
+                            </th>
+                            <td class="edit">
+                                {# IESG Notes are historic and read-only now #}
+                            </td>
+                            <td>
+                                {{ doc.notedoc.note|urlize_ietf_docs|linkify|linebreaksbr }}
+                            </td>
+                        </tr>
                     {% endif %}
                     <tr>
                         <td></td>
@@ -808,7 +445,7 @@
                             {% if doc.notify %}
                                 {{ doc.notify|linkify }}
                             {% else %}
-                                <span class="text-muted">
+                                <span class="text-body-secondary">
                                     (None)
                                 </span>
                             {% endif %}
@@ -816,125 +453,127 @@
                     </tr>
                 </tbody>
             {% endif %}
-            {% if can_edit_iana_state or iana_review_state or iana_experts_state or iana_experts_comment %}
-                <tbody class="meta border-top">
-                    {% if iana_review_state or can_edit_iana_state %}
-                        <tr>
-                            <th scope="row">
-                                IANA
-                            </th>
-                            <th scope="row">
-                                <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">
-                                    IANA review state
-                                </a>
-                            </th>
-                            <td class="edit">
-                                {% if can_edit_iana_state and not snapshot %}
-                                    <a class="btn btn-primary btn-sm"
-                                       href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-review" %}">
-                                        Edit
-                                    </a>
-                                {% endif %}
-                            </td>
-                            <td class="{% if iana_review_state|slugify|slice:7 != "iana-ok" %}text-danger{% else %}text-success{% endif %}">
-                                {% if not iana_review_state %}
-                                    <span class="text-muted">
-                                        (None)
-                                    </span>
-                                {% else %}
-                                    {{ iana_review_state }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endif %}
-                    {% if iana_action_state or can_edit_iana_state %}
-                        <tr>
-                            <th scope="row">
-                                {% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %}
-                            </th>
-                            <th scope="row">
-                                <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-action" %}">
-                                    IANA action state
-                                </a>
-                            </th>
-                            <td class="edit">
-                                {% if can_edit_iana_state and not snapshot %}
-                                    <a class="btn btn-primary btn-sm"
-                                       href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-action" %}">
-                                        Edit
+            {% if doc.stream_id != 'editorial' %}
+                {% if can_edit_iana_state or iana_review_state or iana_experts_state or iana_experts_comment %}
+                    <tbody class="meta border-top">
+                        {% if iana_review_state or can_edit_iana_state %}
+                            <tr>
+                                <th scope="row">
+                                    IANA
+                                </th>
+                                <th scope="row">
+                                    <a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-review" %}">
+                                        IANA review state
                                     </a>
-                                {% endif %}
-                            </td>
-                            <td>
-                                {% if not iana_action_state %}
-                                    <span class="text-muted">
-                                        (None)
-                                    </span>
-                                {% else %}
-                                    {{ iana_action_state }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endif %}
-                    {% if iana_experts_state or can_edit_iana_state %}
-                        <tr>
-                            <th scope="row">
-                                {% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %}
-                            </th>
-                            <th scope="row">
-                                <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-experts" %}">
-                                    IANA expert review state
-                                </a>
-                            </th>
-                            <td class="edit">
-                                {% if can_edit_iana_state and not snapshot %}
-                                    <a class="btn btn-primary btn-sm"
-                                       href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-experts" %}">
-                                        Edit
+                                </th>
+                                <td class="edit">
+                                    {% if can_edit_iana_state and not snapshot %}
+                                        <a class="btn btn-primary btn-sm"
+                                        href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-review" %}">
+                                            Edit
+                                        </a>
+                                    {% endif %}
+                                </td>
+                                <td class="{% if iana_review_state|slugify|slice:7 != "iana-ok" %}text-danger{% else %}text-success{% endif %}">
+                                    {% if not iana_review_state %}
+                                        <span class="text-body-secondary">
+                                            (None)
+                                        </span>
+                                    {% else %}
+                                        {{ iana_review_state }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endif %}
+                        {% if iana_action_state or can_edit_iana_state %}
+                            <tr>
+                                <th scope="row">
+                                    {% if not can_edit_iana_state and not iana_review_state %}IANA{% endif %}
+                                </th>
+                                <th scope="row">
+                                    <a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-action" %}">
+                                        IANA action state
                                     </a>
-                                {% endif %}
-                            </td>
-                            <td class="{% if iana_experts_state|slugify|slice:"-2:" != "ok" %}text-danger{% else %}text-success{% endif %}">
-                                {% if not iana_experts_state %}
-                                    <span class="text-muted">
-                                        (None)
-                                    </span>
-                                {% else %}
-                                    {{ iana_experts_state }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endif %}
-                    {% if iana_experts_comment or can_edit_iana_state %}
-                        <tr>
-                            <th scope="row">
-                                {% if not can_edit_iana_state and not iana_review_state and not iana_action_state and not iana_experts_state %}
-                                    IANA
-                                {% endif %}
-                            </th>
-                            <th scope="row">
-                                IANA expert review comments
-                            </th>
-                            <td class="edit">
-                                {% if can_edit_iana_state and not snapshot %}
-                                    <a class="btn btn-primary btn-sm"
-                                       href="{% url 'ietf.doc.views_draft.add_iana_experts_comment' name=doc.name %}">
-                                        Edit
+                                </th>
+                                <td class="edit">
+                                    {% if can_edit_iana_state and not snapshot %}
+                                        <a class="btn btn-primary btn-sm"
+                                        href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-action" %}">
+                                            Edit
+                                        </a>
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if not iana_action_state %}
+                                        <span class="text-body-secondary">
+                                            (None)
+                                        </span>
+                                    {% else %}
+                                        {{ iana_action_state }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endif %}
+                        {% if iana_experts_state or can_edit_iana_state %}
+                            <tr>
+                                <th scope="row">
+                                    {% if not can_edit_iana_state and not iana_review_state and not iana_action_state %}IANA{% endif %}
+                                </th>
+                                <th scope="row">
+                                    <a href="{% url "ietf.doc.views_help.state_help" type="draft-iana-experts" %}">
+                                        IANA expert review state
                                     </a>
-                                {% endif %}
-                            </td>
-                            <td>
-                                {% if not iana_experts_comment %}
-                                    <span class="text-muted">
-                                        (None)
-                                    </span>
-                                {% else %}
-                                    {{ iana_experts_comment }}
-                                {% endif %}
-                            </td>
-                        </tr>
-                    {% endif %}
-                </tbody>
+                                </th>
+                                <td class="edit">
+                                    {% if can_edit_iana_state and not snapshot %}
+                                        <a class="btn btn-primary btn-sm"
+                                        href="{% url 'ietf.doc.views_draft.change_iana_state' name=doc.name state_type="iana-experts" %}">
+                                            Edit
+                                        </a>
+                                    {% endif %}
+                                </td>
+                                <td class="{% if iana_experts_state|slugify|slice:"-2:" != "ok" %}text-danger{% else %}text-success{% endif %}">
+                                    {% if not iana_experts_state %}
+                                        <span class="text-body-secondary">
+                                            (None)
+                                        </span>
+                                    {% else %}
+                                        {{ iana_experts_state }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endif %}
+                        {% if iana_experts_comment or can_edit_iana_state %}
+                            <tr>
+                                <th scope="row">
+                                    {% if not can_edit_iana_state and not iana_review_state and not iana_action_state and not iana_experts_state %}
+                                        IANA
+                                    {% endif %}
+                                </th>
+                                <th scope="row">
+                                    IANA expert review comments
+                                </th>
+                                <td class="edit">
+                                    {% if can_edit_iana_state and not snapshot %}
+                                        <a class="btn btn-primary btn-sm"
+                                        href="{% url 'ietf.doc.views_draft.add_iana_experts_comment' name=doc.name %}">
+                                            Edit
+                                        </a>
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if not iana_experts_comment %}
+                                        <span class="text-body-secondary">
+                                            (None)
+                                        </span>
+                                    {% else %}
+                                        {{ iana_experts_comment }}
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endif %}
+                    </tbody>
+                {% endif %}
             {% endif %}
             {% if rfc_editor_state %}
                 <tbody class="meta border-top">
@@ -943,7 +582,7 @@
                             RFC Editor
                         </th>
                         <th scope="row">
-                            <a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">
+                            <a href="{% url "ietf.doc.views_help.state_help" type="draft-rfceditor" %}">
                                 RFC Editor state
                             </a>
                         </th>
@@ -1000,20 +639,20 @@
                 </i>
                 IPR
                 {% if doc.related_ipr %}
-                    <span class="badge rounded-pill">
+                    <span class="badge rounded-pill text-bg-secondary">
                         {{ doc.related_ipr|length }}
                     </span>
                 {% endif %}
             </a>
             <a class="btn btn-primary btn-sm"
-               href="{% url 'ietf.doc.views_doc.document_references' doc.canonical_name %}"
+               href="{% url 'ietf.doc.views_doc.document_references' doc.name %}"
                rel="nofollow">
                 <i class="bi bi-arrow-left">
                 </i>
                 References
             </a>
             <a class="btn btn-primary btn-sm"
-               href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.canonical_name %}"
+               href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.name %}"
                rel="nofollow">
                 <i class="bi bi-arrow-right">
                 </i>
@@ -1027,70 +666,50 @@
                 </i>
                 Nits
             </a>
-            <div class="dropdown inline">
-                <button class="btn btn-primary btn-sm dropdown-toggle"
-                        type="button"
-                        id="ddSearchMenu"
-                        data-bs-toggle="dropdown"
-                        aria-expanded="true">
-                    <i class="bi bi-search">
-                    </i>
-                    Search lists
-                </button>
-                <ul class="dropdown-menu" role="menu">
-                    <li role="presentation">
-                        <a class="dropdown-item"
-                           href="https://mailarchive.ietf.org/arch/search?q=%22{{ doc.name }}%22"
-                           rel="nofollow"
-                           target="_blank">
-                            IETF Mail Archive
-                        </a>
-                    </li>
-                    <li role="presentation">
-                        <a class="dropdown-item"
-                           href="https://www.google.com/search?as_q={{ doc.name }}&amp;as_sitesearch={{ search_archive }}"
-                           rel="nofollow"
-                           target="_blank">
-                            Google
-                        </a>
-                    </li>
-                    {% if user|has_role:"Area Director" %}
-                        <li role="presentation">
-                            <a class="dropdown-item"
-                               href="https://www.iesg.org/bin/c5i?mid=6&amp;rid=77&amp;target={{ doc.name }}"
-                               rel="nofollow"
-                               target="_blank">
-                                ARO
-                            </a>
-                        </li>
-                    {% endif %}
-                </ul>
-            </div>
+            {% if user|has_role:"Area Director" %}
+            {# IDNITS3 is an experimental service, so only show it to Area Directors #}
+             <a class="btn btn-primary btn-sm"
+               href="{{ settings.IDNITS3_BASE_URL }}?url=https://www.ietf.org/archive/id/{{ doc.filename_with_rev }}"
+               rel="nofollow"
+               target="_blank">
+                <i class="bi bi-exclamation-diamond">
+                </i>
+                Nits-v3 (Experimental)
+            </a>           
+            {% endif %}
+            <a class="btn btn-primary btn-sm"
+               href="https://mailarchive.ietf.org/arch/search/?q=%22{{ doc.name }}%22"
+               rel="nofollow"
+               target="_blank">
+                <i class="bi bi-search">
+                </i>
+                Search email archive
+            </a>
             {% if user.is_authenticated %}
-                <a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}hide{% endif %}"
-                   href="{% url "ietf.community.views.untrack_document" username=user.username name=doc.name %}"
-                   title="Remove from your personal ID list">
+                <a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}d-none{% endif %}"
+                   href="{% url "ietf.community.views.untrack_document" email_or_name=user.username name=doc.name %}"
+                   title="Remove from your personal I-D list">
                     <i class="bi bi-bookmark-check-fill">
                     </i>
                     Untrack
                 </a>
-                <a class="btn btn-primary btn-sm track-untrack-doc {% if doc.tracked_in_personal_community_list %}hide{% endif %}"
-                   href="{% url "ietf.community.views.track_document" username=user.username name=doc.name %}"
-                   title="Add to your personal ID list">
+                <a class="btn btn-primary btn-sm track-untrack-doc {% if doc.tracked_in_personal_community_list %}d-none{% endif %}"
+                   href="{% url "ietf.community.views.track_document" email_or_name=user.username name=doc.name %}"
+                   title="Add to your personal I-D list">
                     <i class="bi bi-bookmark">
                     </i>
                     Track
                 </a>
             {% endif %}
-            {% if user.review_teams %}
-                <a class="btn btn-primary btn-sm review-wish-add-remove-doc ajax {% if not doc.has_review_wish %}hide{% endif %}"
+            {% if user.person.review_teams %}
+                <a class="btn btn-primary btn-sm review-wish-add-remove-doc ajax {% if not doc.has_review_wish %}d-none{% endif %}"
                    href="{% url "ietf.doc.views_review.review_wishes_remove" name=doc.name %}?next={{ request.get_full_path|urlencode }}"
                    title="Remove from your review wishes for all teams">
                     <i class="bi bi-chat-left-heart-fill">
                     </i>
                     Remove review wishes
                 </a>
-                <a class="btn btn-primary btn-sm review-wish-add-remove-doc {% if user.review_teams|length_is:"1" %}ajax {% endif %}{% if doc.has_review_wish %}hide{% endif %}"
+                <a class="btn btn-primary btn-sm review-wish-add-remove-doc {% if user.person.review_teams|length_is:"1" %}ajax {% endif %}{% if doc.has_review_wish %}d-none{% endif %}"
                    href="{% url "ietf.doc.views_review.review_wish_add" name=doc.name %}?next={{ request.get_full_path|urlencode }}"
                    title="Add to your review wishes">
                     <i class="bi bi-chat-left-heart">
@@ -1120,10 +739,10 @@
                 {% endfor %}
             {% endif %}
         </div>
-        {% if doc.get_state_slug == "active" or doc.get_state_slug == "rfc" %}
+        {% if doc.get_state_slug == "active" or doc.type_id == "rfc" or doc.became_rfc %}
             <div class="card mt-5">
                 <div class="card-header">
-                    {% if doc.get_state_slug == "rfc" and not snapshot %}
+                    {% if doc.type_id == "rfc" and not snapshot %}
                         RFC {{ rfc_number }}
                     {% else %}
                         {{ name }}-{{ doc.rev }}
@@ -1142,7 +761,7 @@
             {% endif %}
         {% else %}
             <div class="card border-warning mt-5">
-                <div class="card-header bg-warning">
+                <div class="card-header text-bg-warning">
                     <p><b>This Internet-Draft is no longer active. A copy of
                     the expired Internet-Draft is available in these formats:</b></p>
 
@@ -1164,7 +783,7 @@
                             {% if not forloop.last %}<br>{% endif %}
                         {% endfor %}
                     </p>
-                    <p class="text-muted card-text">
+                    <p class="text-body-secondary card-text">
                         (Note: The e-mail addresses provided for the authors of this Internet-Draft may no longer be valid.)
                     </p>
                 </div>
@@ -1176,4 +795,4 @@
         </script>
         <script src="{% static 'ietf/js/document_timeline.js' %}">
         </script>
-    {% endblock %}
\ No newline at end of file
+    {% endblock %}
diff --git a/ietf/templates/doc/document_email.html b/ietf/templates/doc/document_email.html
index 768bf78e48..935217367d 100644
--- a/ietf/templates/doc/document_email.html
+++ b/ietf/templates/doc/document_email.html
@@ -49,8 +49,16 @@ <h2 class="my-3">Recipient expansions</h2>
                         <a href="{% url 'ietf.mailtrigger.views.show_triggers' trigger %}"
                            title="{{ desc }}">{{ trigger }}</a>
                     </td>
-                    <td>{{ to|join:', '|linkify }}</td>
-                    <td>{{ cc|join:', '|linkify }}</td>
+                    <td>
+                        {% for addr in to %}
+                            {{ addr|linkify }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    </td>
+                    <td>
+                        {% for addr in cc %}
+                            {{ addr|linkify }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    </td>
                 </tr>
             {% endfor %}
         </tbody>
diff --git a/ietf/templates/doc/document_format_buttons.html b/ietf/templates/doc/document_format_buttons.html
index 1dcf3008cc..043b9a797e 100644
--- a/ietf/templates/doc/document_format_buttons.html
+++ b/ietf/templates/doc/document_format_buttons.html
@@ -1,10 +1,21 @@
 {% if file_urls %}
     <div class="buttonlist">
     {% for label, url in file_urls %}
-        <a class="btn btn-primary btn-sm" href="{{ url }}">
+        {% if label != skip_format %}
+        <a class="btn btn-primary btn-sm"
+          {% if label == 'pdf' or label == 'pdfized' %}
+            download="{% if not snapshot and doc.type_id == 'rfc' %}rfc{{ doc.rfc_number }}{% else %}{{ doc.name }}-{{ doc.rev }}{% endif %}.pdf"
+          {% comment %}
+          TODO: determine if we want bibtex to jiust download
+          {% elif label == 'bibtex' %}
+            download="{% if not snapshot and doc.type_id == 'rfc' %}rfc{{ doc.rfc_number }}{% else %}{{ doc.name }}-{{ doc.rev }}{% endif %}.bib"
+          {% endcomment %}
+         {% endif %}
+          {% if label != 'htmlized' %}target="_blank"{% endif %}
+          href="{{ url }}">
             {% if label == 'pdf' or label == 'pdfized' %}
                 <i class="bi bi-file-pdf"></i> pdf
-            {% elif label == 'xml' or label == 'html' %}
+            {% elif label == 'xml' or label == 'html' or label == 'bibxml' %}
                 <i class="bi bi-file-code"></i> {{ label}}
             {% elif label == 'htmlized' %}
                 <i class="bi bi-file-code"></i> htmlized
@@ -16,8 +27,9 @@
                 <i class="bi bi-file-diff"></i> w/errata
             {% endif %}
         </a>
+        {% endif %}
     {% endfor %}
 </div>
 {% else %}
-    <span class="text-muted">(not online)</span>
+    <span class="text-body-secondary">(not online)</span>
 {% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index c984c773ae..78471e08d6 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -11,94 +11,42 @@
     <link rel="alternate"
           type="application/atom+xml"
           href="/feed/document-changes/{{ doc.name }}/">
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+    <link rel="stylesheet" href="{% static 'ietf/css/list.css' %}">
 {% endblock %}
 {% block content %}
     {% origin %}
     {{ top|safe }}
     {% if diff_revisions and diff_revisions|length > 1 or doc.name|rfcbis %}
         <h2 class="my-3">Revision differences</h2>
-        <form class="form-horizontal diff-form"
-              action="{{ rfcdiff_base_url }}"
-              method="get"
-              target="_blank">
-            <div class="row mb-3">
-                <label for="url1" class="col-form-label col-sm-2 fw-bold">From revision</label>
-                <div class="col-sm-10">
-                    <select class="form-select select2-field" data-max-entries="1" data-minimum-input-length="0" id="url1" name="url1">
-                        {% for name, rev, time, url in diff_revisions %}
-                            <option value="{{ url }}"
-                                    {% if diff_revisions|length > 1 and forloop.counter == 2 %} selected="selected"{% endif %}>
-                                {{ name }}
-                                {% if rev %}-{{ rev }}{% endif %}
-                                ({{ time|date:"Y-m-d" }})
-                            </option>
-                        {% endfor %}
-                        {% if doc.name|rfcbis %}
-                            <option value="{{ doc.name|rfcbis }}"
-                                    {% if diff_revisions and diff_revisions|length == 1 %} selected="selected"{% endif %}>
-                                {{ doc.name|rfcbis }}
-                            </option>
-                        {% endif %}
-                    </select>
-                </div>
-            </div>
-            <div class="row mb-3">
-                <label for="url2" class="col-form-label col-sm-2 fw-bold">To revision</label>
-                <div class="col-sm-10">
-                    <select class="form-select select2-field" data-max-entries="1" data-minimum-input-length="0" id="url2" name="url2">
-                        {% for name, rev, time, url in diff_revisions %}
-                            <option value="{{ url }}"
-                                    {% if forloop.counter == 1 %} selected="selected"{% endif %}>
-                                {{ name }}
-                                {% if rev %}-{{ rev }}{% endif %}
-                                ({{ time|date:"Y-m-d" }})
-                            </option>
-                        {% endfor %}
-                        {% if doc.name|rfcbis %}
-                            <option value="{{ doc.name|rfcbis }}">
-                                {{ doc.name|rfcbis }}
-                            </option>
-                        {% endif %}
-                    </select>
-                </div>
-            </div>
-            <div class="row mb-3">
-                <label class="col-form-label col-sm-2 fw-bold">Diff format</label>
-                <div class="col-sm-10">
-                    <div class="btn-group" data-bs-toggle="buttons">
-                        <input type="radio"
-                               class="btn-check"
-                               checked
-                               name="difftype"
-                               value="--html"
-                               id="html">
-                        <label for="html" class="btn btn-outline-primary">Side-by-side</label>
-                        <input type="radio"
-                               class="btn-check"
-                               name="difftype"
-                               value="--abdiff"
-                               id="abdiff">
-                        <label for="abdiff" class="btn btn-outline-primary">Before-after</label>
-                        <input type="radio"
-                               class="btn-check"
-                               name="difftype"
-                               value="--chbars"
-                               id="chbars">
-                        <label for="chbars" class="btn btn-outline-primary">Change bars</label>
-                        <input type="radio"
-                               class="btn-check"
-                               name="difftype"
-                               value="--hwdiff"
-                               id="hwdiff">
-                        <label for="hwdiff" class="btn btn-outline-primary">Wdiff</label>
-                    </div>
-                </div>
-            </div>
-            <button type="submit" class="btn btn-primary mb-3">Submit</button>
-        </form>
+        {% include "doc/document_history_form.html" with doc=doc diff_revisions=diff_revisions action=rfcdiff_base_url snapshot=snapshot only %}
+    {% endif %}
+    {% if ballot_doc_rev %}
+        <p class="alert alert-info my-3">
+            Your most recent ballot position was provided when the document was at version {{ ballot_doc_rev }}.
+        </p>
     {% endif %}
     <h2 class="my-3">Document history</h2>
+    {% if doc.came_from_draft %}
+        <ul class="nav nav-tabs my-3">
+            <li class="nav-item">
+                <a class="nav-link active">RFC {{doc.name|slice:"3:"}}</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{% url 'ietf.doc.views_doc.document_history' name=doc.came_from_draft.name %}">{{doc.came_from_draft.name}}</a>
+            <li>
+        </ul>
+    {% endif %}
+    {% if doc.became_rfc %}
+        <ul class="nav nav-tabs my-3">
+            <li class="nav-item">
+                <a class="nav-link" href="{% url 'ietf.doc.views_doc.document_history' name=doc.became_rfc.name %}">RFC {{doc.became_rfc.name|slice:"3:"}}</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link active">{{doc.name}}</a>
+            <li>
+        </ul>
+    {% endif %}
+
     {% if can_add_comment %}
         <div class="buttonlist">
             <a class="btn btn-primary"
@@ -112,7 +60,7 @@ <h2 class="my-3">Document history</h2>
         <thead>
             <tr>
                 <th scope="col" data-sort="date">Date</th>
-                <th scope="col" data-sort="rev">Rev.</th>
+                {% if doc.type_id not in "rfc,bcp,std,fyi" %}<th scope="col" data-sort="rev">Rev.</th>{% endif %}
                 <th scope="col" data-sort="by">By</th>
                 <th scope="col" data-sort="action">Action</th>
             </tr>
@@ -123,7 +71,7 @@ <h2 class="my-3">Document history</h2>
                     <td>
                         <div title="{{ e.time|date:'Y-m-d H:i:s O' }}">{{ e.time|date:"Y-m-d" }}</div>
                     </td>
-                    <td class="text-end">{{ e.rev }}</td>
+                    {% if doc.type_id not in "rfc,bcp,std,fyi" %}<td class="text-end">{{ e.rev }}</td>{% endif %}
                     <td>{{ e.by|escape }}</td>
                     <td>{{ e.desc|format_history_text }}</td>
                 </tr>
diff --git a/ietf/templates/doc/document_history_form.html b/ietf/templates/doc/document_history_form.html
new file mode 100644
index 0000000000..646da0038b
--- /dev/null
+++ b/ietf/templates/doc/document_history_form.html
@@ -0,0 +1,96 @@
+{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
+{% load origin %}
+{% load ietf_filters %}
+{% origin %}
+<form class="form-horizontal diff-form"
+      action="{{ action }}"
+      method="get"
+      target="_blank">
+{% if not document_html %}
+    <div class="row mb-3">
+        <label for="url1" class="col-form-label col-sm-2 fw-bold">From revision</label>
+        <div class="col-sm-10">
+{% endif %}
+            <select class="form-select{% if document_html %} form-select-sm mb-1{% endif %} select2-field"
+                    data-max-entries="1"
+                    data-width="resolve"
+                    data-allow-clear="false"
+                    data-minimum-input-length="0"
+                    {% if not document_html %}id="url1"{% else %}aria-label="From revision"{% endif %}
+                    name="url1">
+                {% for name, rev, time, url, is_this_doc, is_previous_doc in diff_revisions %}
+                    <option value="{{ url }}"{% if is_previous_doc %} selected{% endif %}>
+                        {{ name|prettystdname }}{% if rev %}-{{ rev }}{% endif %}
+                        {% if not document_html %}({{ time|date:"Y-m-d" }}){% endif %}
+                    </option>
+                {% endfor %}
+                {% if doc.name|rfcbis %} {# TODO - move this into the diffable versions logic #}
+                    <option value="{{ doc.name|rfcbis }}"{% if diff_revisions and diff_revisions|length == 1 %} selected{% endif %}>
+                        {{ doc.name|rfcbis|prettystdname }}
+                    </option>
+                {% endif %}
+            </select>
+{% if not document_html %}
+        </div>
+    </div>
+    <div class="row mb-3">
+        <label for="url2" class="col-form-label col-sm-2 fw-bold">To revision</label>
+        <div class="col-sm-10">
+{% endif %}
+            <select class="form-select{% if document_html %} form-select-sm mb-1{% endif %} select2-field"
+                    data-max-entries="1"
+                    data-width="resolve"
+                    data-allow-clear="false"
+                    data-minimum-input-length="0"
+                    {% if not document_html %}id="url2"{% else %}aria-label="To revision"{% endif %}
+                    name="url2">
+                {% for name, rev, time, url, is_this_doc, is_previous_doc in diff_revisions %}
+                    <option value="{{ url }}"{% if is_this_doc %} selected{%endif%}>
+                        {{ name|prettystdname }}{% if rev %}-{{ rev }}{% endif %}
+                        {% if not document_html %}({{ time|date:"Y-m-d" }}){% endif %}
+                    </option>
+                {% endfor %}
+                {% if doc.name|rfcbis %}
+                    <option value="{{ doc.name|rfcbis }}">
+                        {{ doc.name|rfcbis|prettystdname }}
+                    </option>
+                {% endif %}
+            </select>
+{% if not document_html %}
+        </div>
+    </div>
+    <div class="row mb-3">
+        <label class="col-form-label col-sm-2 fw-bold">Diff format</label>
+        <div class="col-sm-10">
+{% endif %}
+            <button type="submit"
+                    class="btn btn-primary{% if document_html %} btn-sm{% endif %}"
+                    value="--html"
+                    name="difftype">
+                Side-by-side
+            </button>
+            {% if not document_html %}
+                <button type="submit"
+                        class="btn btn-primary{% if document_html %} btn-sm{% endif %}"
+                        value="--abdiff"
+                        name="difftype">
+                    Before-after
+                </button>
+                <button type="submit"
+                        class="btn btn-primary{% if document_html %} btn-sm{% endif %}"
+                        value="--chbars"
+                        name="difftype">
+                    Change bars
+                </button>
+            {% endif %}
+            <button type="submit"
+                    class="btn btn-primary{% if document_html %} btn-sm{% endif %}"
+                    value="--hwdiff"
+                    name="difftype">
+                Inline
+            </button>
+{% if not document_html %}
+        </div>
+    </div>
+{% endif %}
+</form>
\ No newline at end of file
diff --git a/ietf/templates/doc/document_html.html b/ietf/templates/doc/document_html.html
index 1f0ed51fcc..a85b1f5310 100644
--- a/ietf/templates/doc/document_html.html
+++ b/ietf/templates/doc/document_html.html
@@ -1,92 +1,335 @@
-{% extends "doc/htmlized_base.html" %}
 {# Copyright The IETF Trust 2016, All Rights Reserved #}
+<!DOCTYPE html>
+{% load analytical %}
 {% load origin %}
 {% load static %}
-{% load ietf_filters %}
-{% block pagehead %}
-    <link rel="alternate"
-          type="application/atom+xml"
-          title="Document changes"
-          href="/feed/document-changes/{{ doc.name }}/">
-    <meta name="description"
-          {% if doc.get_state_slug == "rfc" %}
-              content="{{ doc.title }} (RFC {{ doc.rfc_number }}{% if published %}, {{ published.time|date:"F Y" }}{% endif %}{% if obsoleted_by %}; obsoleted by {{ obsoleted_by|join:", " }}{% endif %})"
-          {% else %}
-              content="{{ doc.title }} (Internet-Draft, {{ doc.time|date:"Y" }})"
-          {% endif %}>
-{% endblock %}
-{% block morecss %}
-    .bgwhite  { background-color: white; }
-    .bgred    { background-color: #F44; }
-    .bggrey   { background-color: #666; }
-    .bgbrown  { background-color: #840; }
-    .bgorange { background-color: #FA0; }
-    .bgyellow { background-color: #EE0; }
-    .bgmagenta{ background-color: #F4F; }
-    .bgblue   { background-color: #66F; }
-    .bgcyan   { background-color: #4DD; }
-    .bggreen  { background-color: #4F4; }
-    .draftcontent { margin-top:1em;}
-{% endblock %}
-{% block title %}
-    {% if doc.get_state_slug == "rfc" %}
-        RFC {{ doc.rfc_number }} - {{ doc.title }}
-    {% else %}
-        {{ doc.name }}-{{ doc.rev }}
-    {% endif %}
-{% endblock %}
-{% block content %}
-<!-- [html-validate-disable-block no-inline-style, attr-quotes, void-style -- FIXME: it's everywhere in this old code] -->
-    {% origin %}
-    <div class="rfcmarkup">
-        <div class="noprint" style="height: .5em;">
-            <div onmouseover="this.style.cursor='pointer';"
-                 onclick="showLegend();"
-                 onmouseout="hideLegend()"
-                 style="height: .5em; min-height: .5em; width: 96ex; "
-                 class="meta-info {{ doccolor }}"
-                 title="Click for color legend.">
-            </div>
-            <div id="legend"
-                 class="meta-info noprint pre legend"
-                 style="position:absolute; top: 4px; left: 4ex; visibility:hidden; background-color: white; padding: 4px 9px 5px 7px; border: solid #345 1px; "
-                 onmouseover="showLegend();"
-                 onmouseout="hideLegend();">
+{% load ietf_filters textfilters %}
+{% load document_type_badge %}
+{% load django_vite %}
+{% origin %}
+<html data-bs-theme="auto" lang="en">
+    <head>
+        {% analytical_head_top %}
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>
+            {% if doc.type_id == "rfc" %}
+                RFC {{ doc.rfc_number }} - {{ doc.title }}
+            {% else %}
+                {{ doc.name }}-{{ doc.rev }}
+            {% endif %}
+        </title>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="{{ settings.STATIC_IETF_ORG }}/fonts/inter/import.css" rel="stylesheet">
+        <link href="{{ settings.STATIC_IETF_ORG }}/fonts/noto-sans-mono/import.css" rel="stylesheet">
+        {% if request.COOKIES.pagedeps == 'inline' %}
+            <script>{{ js|safe }}</script>
+            <style>{{ css|safe }}</style>
+        {% else %}
+            <link rel="stylesheet" href="{% static 'ietf/css/document_html_referenced.css' %}">
+            {% if html %}
+                <link rel="stylesheet" href="{% static 'ietf/css/document_html_txt.css' %}">
+            {% endif %}
+            {% vite_asset 'client/embedded.js' %}
+            <script src="{% static 'ietf/js/document_html.js' %}"></script>
+            <script src="{% static 'ietf/js/theme.js' %}"></script>
+        {% endif %}
+        <link rel="alternate" type="application/atom+xml" title="Document changes" href="/feed/document-changes/{{ doc.name }}/">
+        <meta name="description"
+            {% if doc.type_id == "rfc" %}
+                content="{{ doc.title }} (RFC {{ doc.rfc_number }}, {{ published.time|date:'F Y' }}{% if obsoleted_by %}; obsoleted by {% for rel in obsoleted_by %}{{ rel.source.name|prettystdname}}{% if not forloop.last%}, {% endif %}{% endfor %}{% endif %})"
+            {% else %}
+                content="{{ doc.title }} (Internet-Draft, {{ doc.time|date:'Y' }})"
+            {% endif %}>
+        {% include "base/icons.html" %}
+        {% include "doc/opengraph.html" %}
+        {% analytical_head_bottom %}
+        <style>
+            {# Force "text-overflow: ellipsis" to hide the beginning of a doc name #}
+            .diff-form .select2-selection__rendered {
+                direction: rtl;
+                text-align: left;
+            }
+        </style>
+    </head>
+    <body>
+        {% analytical_body_top %}
+        {% include "base/status.html" %}
+        <div class="btn-toolbar sidebar-toolbar position-fixed top-0 end-0 m-2 m-lg-3 d-print-none">
+            <div class="dropdown">
+                <button class="btn btn-outline-secondary btn-sm me-1 dropdown-toggle d-flex align-items-center"
+                    id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown"
+                    aria-label="Toggle theme">
+                        <i class="theme-icon-active bi bi-circle-half"></i>
+                </button>
+
+                <ul class="dropdown-menu" aria-labelledby="bd-theme">
+                    <li>
+                        <button type="button" class="dropdown-item d-flex align-items-center"
+                            data-bs-theme-value="light" aria-pressed="false">
+                            <i class="me-2 opacity-50 theme-icon bi bi-sun-fill"></i>
+                            Light<i class="bi bi-check2 ms-auto d-none"></i>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="dropdown-item d-flex align-items-center"
+                            data-bs-theme-value="dark" aria-pressed="false">
+                            <i class="me-2 opacity-50 theme-icon bi bi-moon-stars-fill"></i>
+                            Dark<i class="bi bi-check2 ms-auto d-none"></i>
+                        </button>
+                    </li>
+                    <li>
+                        <button type="button" class="dropdown-item d-flex align-items-center active"
+                            data-bs-theme-value="auto" aria-pressed="true">
+                            <i class="me-2 opacity-50 theme-icon bi bi-circle-half"></i>
+                            Auto<i class="bi bi-check2 ms-auto d-none"></i>
+                        </button>
+                    </li>
+                </ul>
             </div>
+            <button class="btn btn-outline-secondary btn-sm sidebar-toggle"
+                    type="button"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#sidebar"
+                    aria-expanded="{% if request.COOKIES.sidebar != 'off'%}true{% else %}false{% endif %}"
+                    aria-controls="sidebar"
+                    aria-label="Toggle metadata sidebar"
+                    title="Toggle metadata sidebar">
+            <i class="bi bi-arrow-bar-left sidebar-shown"></i>
+            <i class="bi bi-arrow-bar-right sidebar-collapsed"></i>
+            </button>
         </div>
-        {% if doc.meta %}
-            <div class="noprint">
-                <pre class="pre meta-info">{{ doc.supermeta|safe }}
-{{ doc.meta|safe }}</pre>
+        <nav class="navbar bg-light-subtle px-1 fixed-top d-print-none d-md-none">
+            <a class="nav-link ps-1"
+               href="{% url 'ietf.doc.views_doc.document_main' name=doc.name %}">
+                {% if doc.type_id == "rfc" %}
+                    RFC {{ doc.rfc_number }}
+                {% else %} 
+                    {{ doc.name }}-{{ doc.rev }}
+                {% endif %}
+                <br class="d-sm-none">
+
+                <span class="ms-sm-3 badge rounded-pill badge-{% if not snapshot %}{{ doc|std_level_to_label_format }}{% else %}draft{% endif %}">
+                    {% if not snapshot %}
+                        {{ doc.std_level }}
+                    {% else %}
+                        Internet-Draft
+                    {% endif %}
+                </span>
+            </a>
+            <button class="navbar-toggler p-1"
+                    type="button"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#docinfo-collapse"
+                    aria-controls="docinfo-collapse"
+                    aria-expanded="false"
+                    aria-label="Show document information">
+                <span class="navbar-toggler-icon small"></span>
+            </button>
+            <div class="navbar-nav navbar-nav-scroll overscroll-none collapse pt-1" id="docinfo-collapse">
+                <div class="bg-light-subtle p-0">
+                    <table class="table table-sm table-borderless small">
+                        <tbody class="meta align-top">
+                            <tr>
+                                <th scope="row"></th>
+                                <th scope="row">Title</th>
+                                <td class="edit"></td>
+                                <td>{{ doc.title }}</td>
+                            </tr>
+                        </tbody>
+                        {% include "doc/document_info.html" with sidebar=False %}
+                        <tr>
+                            <th scope="row"></th>
+                            <th scope="row"></th>
+                            <td class="edit"></td>
+                            <td>
+                                <a class="btn btn-sm btn-warning mb-3"
+                                target="_blank"
+                                href="https://github.com/ietf-tools/datatracker/issues/new/choose">
+                                    Report a bug
+                                    <i class="bi bi-bug"></i>
+                                </a>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
             </div>
-        {% endif %}
-        <div class="draftcontent">{{ doc.htmlized|default:"Generation of htmlized text failed"|safe }}</div>
-    </div>
-{% endblock %}
-{% block js %}
-    <script>
-        var legend_html = 'Color legend:<br> \
-        <table> \
-        <tr><td>Unknown:</td>                   <td><span class="bgwhite">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Draft:</td>                     <td><span class="bgred">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Informational:</td>             <td><span class="bgorange">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Experimental:</td>              <td><span class="bgyellow">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Best Common Practice:</td>      <td><span class="bgmagenta">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Proposed Standard:</td>         <td><span class="bgblue">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Draft Standard (old designation):</td> <td><span class="bgcyan">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Internet Standard:</td>         <td><span class="bggreen">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Historic:</td>                  <td><span class="bggrey">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        <tr><td>Obsolete:</td>                  <td><span class="bgbrown">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> \
-        </table>';
-        function showLegend() {
-            var elem = document.getElementById('legend');
-            elem.innerHTML = legend_html
-            elem.style.visibility='visible';
-        }
-        function hideLegend() {
-            var elem = document.getElementById('legend');
-            elem.style.visibility='hidden';
-            elem.innerHTML = "";
-        }
-    </script>
-{% endblock %}
\ No newline at end of file
+        </nav>
+        <div class="row g-0">
+            <div class="col-md-9 d-flex justify-content-center lh-sm"
+                 data-bs-spy="scroll"
+                 data-bs-target="#toc-nav"
+                 data-bs-smooth-scroll="true"
+                 tabindex="0"
+                 id="content">
+                {% if html and request.COOKIES.htmlconf != 'txt' %}
+                    <div class="rfchtml">
+                        <br class="noprint">
+                        {{ html|safe }}
+                    </div>
+                {% else %}
+                    <div class="rfcmarkup">
+                        <br class="noprint">
+                        <!-- [html-validate-disable-block attr-quotes, void-style, element-permitted-content, heading-level -- FIXME: rfcmarkup/rfc2html generates HTML with issues] -->
+                        {{ doc.htmlized|default:"Generation of htmlized text failed"|safe }}
+                    </div>
+                {% endif %}
+            </div>
+            <div class="d-print-none col-md-3 bg-light-subtle collapse{% if request.COOKIES.sidebar != 'off'%} show{% endif %}" id="sidebar">
+                <div class="position-fixed border-start sidebar overflow-scroll overscroll-none no-scrollbar">
+                    <div class="d-flex flex-column vh-100 pt-2 pt-lg-3 ps-3 pl-md-2 pl-lg-3">
+                        <div>
+                            <a class="btn btn-primary btn-sm" href="{% url 'ietf.doc.views_doc.document_main' name=doc.name %}">Datatracker</a>
+                            <p class="fw-bold pt-2">
+                                {% if doc.type_id == "rfc" %}
+                                    RFC {{ doc.rfc_number }}
+                                {% else %}
+                                    {{ doc.name }}-{{ doc.rev }}
+                                {% endif %}
+                                <br>
+                                {% document_type_badge doc snapshot submission resurrected_by %}
+                            </p>
+                        </div>
+                        {% if request.COOKIES.htmlconf and request.COOKIES.htmlconf != 'html' and html %}
+                        <div class="alert alert-info small">
+                            You are viewing the legacy <code><a class="text-decoration-none text-reset" href="https://github.com/ietf-tools/rfc2html">rfc2html</a></code>
+                            rendering of this document. Change the
+                            preferences for a modern <code><a class="text-decoration-none text-reset" href="https://github.com/ietf-tools/xml2rfc">xml2rfc</a></code>-based
+                            HTMLization.
+                        </div>
+                        {% elif request.COOKIES.htmlconf == 'html' and not html %}
+                        <div class="alert alert-info small">
+                            You are viewing the legacy <code><a class="text-decoration-none text-reset" href="https://github.com/ietf-tools/rfc2html">rfc2html</a></code>
+                            rendering, because no <code><a class="text-decoration-none text-reset" href="https://github.com/ietf-tools/xml2rfc">xml2rfc</a></code>-generated
+                            HTML is available for this document.
+                        </div>
+                        {% endif %}
+                        <ul class="nav nav-tabs nav-fill small me-2" role="tablist">
+                            <li class="nav-item" role="presentation" title="Document information">
+                                <button class="nav-link px-2"
+                                        id="docinfo-tab"
+                                        data-bs-toggle="tab"
+                                        data-bs-target="#docinfo-tab-pane"
+                                        type="button"
+                                        role="tab"
+                                        aria-controls="docinfo-tab-pane"
+                                        aria-selected="true">
+                                    <i class="bi bi-info-circle"></i><span class="d-none d-md-block d-xl-inline ms-xl-1">Info</span>
+                                </button>
+                            </li>
+                            <li class="nav-item" role="presentation" title="Table of contents">
+                                <button class="nav-link px-2"
+                                        id="toc-tab"
+                                        data-bs-toggle="tab"
+                                        data-bs-target="#toc-tab-pane"
+                                        type="button"
+                                        role="tab"
+                                        aria-controls="toc-tab-pane"
+                                        aria-selected="false">
+                                    <i class="bi bi-list-ol"></i><span class="d-none d-md-block d-xl-inline ms-xl-1">Contents</span>
+                                </button>
+                            </li>
+                            <li class="nav-item" role="presentation" title="Preferences">
+                                <button class="nav-link px-2"
+                                        id="pref-tab"
+                                        data-bs-toggle="tab"
+                                        data-bs-target="#pref-tab-pane"
+                                        type="button"
+                                        role="tab"
+                                        aria-controls="pref-tab-pane"
+                                        aria-selected="false">
+                                    <i class="bi bi-gear"></i><span class="d-none d-md-block d-xl-inline ms-xl-1">Prefs</span>
+                                </button>
+                            </li>
+                        </ul>
+                        <div class="overflow-auto tab-content pt-2 me-2">
+                            <div class="tab-pane"
+                                 id="docinfo-tab-pane"
+                                 role="tabpanel"
+                                 aria-labelledby="docinfo-tab"
+                                 tabindex="0">
+                                <table class="table table-sm table-borderless">
+                                    {% include "doc/document_info.html" with sidebar=True %}
+                                </table>
+                                <a class="btn btn-sm btn-warning mb-3"
+                                target="_blank"
+                                href="https://github.com/ietf-tools/datatracker/issues/new/choose">
+                                    Report a datatracker bug
+                                    <i class="bi bi-bug"></i>
+                                </a>
+                            </div>
+                            <div class="tab-pane mb-5"
+                                 id="toc-tab-pane"
+                                 role="tabpanel"
+                                 aria-labelledby="toc-tab"
+                                 tabindex="0">
+                                <nav class="nav nav-pills flex-column small" id="toc-nav">
+                                </nav>
+                            </div>
+                            <div class="tab-pane mb-5 small"
+                                 id="pref-tab-pane"
+                                 role="tabpanel"
+                                 aria-labelledby="pref-tab"
+                                 tabindex="0">
+                                <label class="form-label fw-bold mb-2">Show sidebar by default</label>
+                                <div class="btn-group-vertical btn-group-sm d-flex" role="group">
+                                    <input type="radio" class="btn-check" name="sidebar" id="on-radio">
+                                    <label class="btn btn-outline-primary" for="on-radio">Yes</label>
+                                    <input type="radio" class="btn-check" name="sidebar" id="off-radio">
+                                    <label class="btn btn-outline-primary" for="off-radio">No</label>
+                                </div>
+                                <label class="form-label fw-bold mt-4 mb-2">Tab to show by default</label>
+                                <div class="btn-group-vertical btn-group-sm d-flex" role="group">
+                                    <input type="radio" class="btn-check" name="deftab" id="docinfo-radio">
+                                    <label class="btn btn-outline-primary" for="docinfo-radio">
+                                        <i class="bi bi-info-circle me-1"></i>Info
+                                    </label>
+                                    <input type="radio" class="btn-check" name="deftab" id="toc-radio">
+                                    <label class="btn btn-outline-primary" for="toc-radio">
+                                        <i class="bi bi-list-ol me-1"></i>Contents
+                                    </label>
+                                </div>
+                                <label class="form-label fw-bold mt-4 mb-2">HTMLization configuration</label>
+                                <div class="btn-group-vertical btn-group-sm d-flex" role="group">
+                                    <input type="radio" class="btn-check" name="htmlconf" id="txt-radio">
+                                    <label class="btn btn-outline-primary" for="txt-radio" title="This is the traditional HTMLization method.">
+                                        <i class="bi bi-badge-sd me-1"></i>HTMLize the plaintext
+                                    </label>
+                                    <input type="radio" class="btn-check" name="htmlconf" id="html-radio">
+                                    <label class="btn btn-outline-primary" for="html-radio" title="This is the modern HTMLization method.">
+                                        <i class="bi bi-badge-hd me-1"></i>Plaintextify the HTML
+                                    </label>
+                                </div>
+                                <label class="form-label fw-bold mt-4 mb-2" for="ptsize">Maximum font size</label>
+                                <input type="range" class="form-range" min="7" max="16" id="ptsize" oninput="ptdemo.value = ptsize.value">
+                                <label class="form-label fw-bold mt-4 mb-2">Page dependencies</label>
+                                <div class="btn-group-vertical btn-group-sm d-flex" role="group">
+                                    <input type="radio" class="btn-check" name="pagedeps" id="inline-radio">
+                                    <label class="btn btn-outline-primary" for="inline-radio" title="Generate larger, standalone web pages that do not require network access to render.">
+                                        <i class="bi bi-box me-1"></i>Inline
+                                    </label>
+                                    <input type="radio" class="btn-check" name="pagedeps" id="reference-radio">
+                                    <label class="btn btn-outline-primary" for="reference-radio" title="Generate regular web pages that require network access to render.">
+                                        <i class="bi bi-link-45deg me-1"></i>Reference
+                                    </label>
+                                </div>
+                                <label class="form-label fw-bold mt-4 mb-2">Citation links</label>
+                                <div class="btn-group-vertical btn-group-sm d-flex" role="group">
+                                    <input type="radio" class="btn-check" name="reflinks" id="refsection-radio">
+                                    <label class="btn btn-outline-primary" for="refsection-radio" title="Citation links go to the reference section.">
+                                        <i class="bi bi-arrow-clockwise"></i> Go to reference section
+                                    </label>
+                                    <input type="radio" class="btn-check" name="reflinks" id="citation-radio">
+                                    <label class="btn btn-outline-primary" for="citation-radio" title="Citation links go directly to the cited document.">
+                                        <i class="bi bi-link-45deg me-1"></i>Go to linked document
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% analytical_body_bottom %}
+    </body>
+</html>
diff --git a/ietf/templates/doc/document_info.html b/ietf/templates/doc/document_info.html
new file mode 100644
index 0000000000..d6d8d43071
--- /dev/null
+++ b/ietf/templates/doc/document_info.html
@@ -0,0 +1,438 @@
+{# Copyright The IETF Trust 2016-2023, All Rights Reserved #}
+{% load origin %}
+{% load static %}
+{% load ietf_filters %}
+{% load person_filters %}
+{% load document_type_badge %}
+{% origin %}
+
+<tbody class="meta align-top {% if not document_html %} border-top{% endif %}">
+    <tr>
+        <th scope="row">Document</th>
+        <th scope="row">{% if document_html %}Document type{% else %}Type{% endif %}</th>
+        <td class="edit"></td>
+        <td>
+            {% document_type_badge doc snapshot submission resurrected_by %}
+            {% if doc.type_id == "rfc" %}
+                {% if doc.pub_date %}
+                    {% if document_html %}<br>{% else %}({% endif %}{{ doc.pub_date|date:"F Y" }}{% if not document_html %}){% endif %}
+                {% else %}
+                    <span class="text-body-secondary">(Publication date unknown)</span>
+                {% endif %}
+                {% if document_html %}<br>{% endif %}
+                {% if has_verified_errata or has_errata %}
+                    <a class="{% if document_html %}btn btn-primary btn-sm my-1{% else %}badge rounded-pill text-bg-danger text-decoration-none{% endif %}"
+                       href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}" title="Click to view errata." rel="nofollow">
+                        {% if document_html %}View errata{% else %}Errata{% endif %}
+                    </a>
+                {% endif %}
+                {% if document_html and doc.type_id == "rfc" %}
+                    <a class="btn btn-sm btn-warning"
+                       title="Click to report an error in the document."
+                       href="https://www.rfc-editor.org/errata.php#reportnew"
+                       target="_blank">
+                        Report errata
+                    </a>
+                {% endif %}
+                {% if doc.related_ipr %}
+                    <a title="Click to view IPR declarations." class="{% if document_html %}btn btn-warning btn-sm my-1{% else %}badge rounded-pill text-bg-warning text-decoration-none{% endif %}" href="{% url 'ietf.ipr.views.search' %}?submit=draft&amp;id={{ doc.name }}">IPR</a>
+                {% endif %}
+                {% if obsoleted_by %}<div>Obsoleted by {{ obsoleted_by|urlize_related_source_list:document_html|join:", " }}</div>{% endif %}
+                {% if updated_by %}<div>Updated by {{ updated_by|urlize_related_source_list:document_html|join:", " }}</div>{% endif %}
+                {% if obsoletes %}<div>Obsoletes {{ obsoletes|urlize_related_target_list:document_html|join:", " }}</div>{% endif %}
+                {% if updates %}<div>Updates {{ updates|urlize_related_target_list:document_html|join:", " }}</div>{% endif %}
+                {% if status_changes %}
+                    <div>Status changed by {{ status_changes|urlize_related_source_list|join:", " }}</div>
+                {% endif %}
+                {% if proposed_status_changes %}
+                    <div>Proposed status changed by {{ proposed_status_changes|urlize_related_source_list|join:", " }}</div>
+                {% endif %}
+                {% if doc.came_from_draft %}
+                    <div>
+                        Was
+                        <a href="{% url 'ietf.doc.views_doc.document_main' name=doc.came_from_draft.name rev=doc.came_from_draft.rev%}">{{ doc.came_from_draft.name }}</a>
+                        {% if submission %}({{ submission|safe }}){% endif %}
+                    </div>
+                {% endif %}
+            {% endif %}
+            {% if doc.get_state_slug != "active" and doc.get_state_slug != "rfc" and doc.type_id != "rfc" %}
+                <div class="badge rounded-pill text-bg-warning{% if not document_html %} float-end{% endif %}">
+                    Expired &amp; archived
+                </div>
+            {% endif %}
+            {% if document_html %}
+                {% include "doc/disclaimer.html" with document_html=document_html %}
+            {% endif %}
+        </td>
+    </tr>
+    {% if document_html %}
+        <tr>
+            <td></td>
+            <th scope="row">Select version</th>
+            <td class="edit"></td>
+            <td>
+                {% include "doc/revisions_list.html" with document_html=document_html %}
+            </td>
+        </tr>
+        {% if diff_revisions|length > 1 %}
+            <tr>
+                <td></td>
+                <th scope="row">Compare versions</th>
+                <td class="edit"></td>
+                <td>
+                    {% include "doc/document_history_form.html" with doc=doc diff_revisions=diff_revisions action=rfcdiff_base_url document_html=document_html snapshot=snapshot only %}
+                </td>
+            </tr>
+        {% endif %}
+    {% endif %}
+    <tr>
+        <td></td>
+        <th scope="row">Author{% if doc.pk %}{{ doc.author_persons_or_names|pluralize }}{% endif %}</th>
+        <td class="edit">
+            {% if can_edit_authors %}
+                <a class="btn btn-primary btn-sm"
+                   href="{%  url 'ietf.doc.views_doc.edit_authors' name=doc.name %}">Edit</a>
+            {% endif %}
+        </td>
+        <td>
+            {# Implementation that uses the current primary email for each author #}
+            {% if doc.pk %}{% for author in doc.author_persons_or_names %}
+                {% if author.person %}{% person_link author.person %}{% else %}{{ author.titlepage_name }}{% endif %}{% if not forloop.last %},{% endif %}
+            {% endfor %}{% endif %}
+            {% if document_html and not snapshot or document_html and doc.rev == latest_rev%}
+                <br>
+                <a class="btn btn-primary btn-sm mt-1" href="mailto:{{ doc.name }}@ietf.org?subject={{ doc.name}}" title="Send email to the document authors">Email authors</a>
+            {% endif %}
+        </td>
+    </tr>
+    {% if not document_html %}
+    {# FIXME: This shows the date of the last history event, which is not what participants necessarily expect here. #}
+    <tr>
+        <td></td>
+        <th scope="row">Last updated</th>
+        <td class="edit"></td>
+        <td>
+            {{ doc.time|date:"Y-m-d" }}
+            {% if latest_revision and latest_revision.time|date:"Y-m-d" != doc.time|date:"Y-m-d" %}
+                <span class="text-body-secondary">(Latest revision {{ latest_revision.time|date:"Y-m-d" }})</span>
+            {% endif %}
+        </td>
+    </tr>
+    {% endif %}
+    {% if doc.type_id != "rfc" %}
+        {% if replaces or not document_html and can_edit_stream_info %}
+            <tr>
+                <td></td>
+                <th scope="row">Replaces</th>
+                <td class="edit">
+                    {% if can_edit_stream_info and not snapshot %}
+                        <a class="btn btn-primary btn-sm"
+                           href="{% url 'ietf.doc.views_draft.replaces' name=doc.name %}">Edit</a>
+                    {% endif %}
+                </td>
+                <td>
+                    {% if replaces %}
+                        {% if document_html %}
+                            {{ replaces|urlize_related_target_list:document_html|join:"<br>" }}
+                        {% else %}
+                            {{ replaces|urlize_related_target_list:document_html|join:", " }}
+                        {% endif %}
+                    {% else %}
+                        <span class="text-body-secondary">(None)</span>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endif %}
+        {% if replaced_by %}
+            <tr>
+                <td></td>
+                <th scope="row">
+                    Replaced by
+                </th>
+                <td class="edit">
+                </td>
+                <td>
+                    {% if document_html %}
+                        {{ replaced_by|urlize_related_source_list:document_html|join:"<br>" }}
+                    {% else %}
+                        {{ replaced_by|urlize_related_source_list:document_html|join:", " }}
+                    {% endif %}
+                </td>
+            </tr>
+        {% endif %}
+        {% if can_view_possibly_replaces %}
+            {% if possibly_replaces %}
+                <tr>
+                    <td></td>
+                    <th scope="row">
+                        Possibly Replaces
+                    </th>
+                    <td class="edit">
+                        {% if can_edit_replaces and not snapshot %}
+                            <a class="btn btn-primary btn-sm"
+                               href="{% url 'ietf.doc.views_draft.review_possibly_replaces' name=doc.name %}">
+                                Edit
+                            </a>
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if document_html %}
+                            {{ possibly_replaces|urlize_related_target_list:document_html|join:"<br>" }}
+                        {% else %}
+                            {{ possibly_replaces|urlize_related_target_list:document_html|join:", " }}
+                        {% endif %}
+                    </td>
+                </tr>
+            {% endif %}
+            {% if possibly_replaced_by %}
+                <tr>
+                    <td></td>
+                    <th scope="row">
+                        Possibly Replaced By
+                    </th>
+                    <td class="edit">
+                        {% if can_edit_replaces and not snapshot %}
+                            {% comment %}<a class="btn btn-primary btn-sm"
+    href="{% url 'ietf.doc.views_draft.review_possibly_replaces' name=doc.name %}">Edit</a>{% endcomment %}
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if document_html %}
+                            {{ possibly_replaced_by|urlize_related_source_list:document_html|join:"<br>" }}
+                        {% else %}
+                            {{ possibly_replaced_by|urlize_related_source_list:document_html|join:", " }}
+                        {% endif %}
+                    </td>
+                </tr>
+            {% endif %}
+        {% endif %}
+    {% endif %}
+    <tr>
+        <td></td>
+        <th scope="row">
+            RFC stream
+        </th>
+        <td class="edit">
+            {% if can_change_stream and not snapshot %}
+                <a class="btn btn-primary btn-sm"
+                   href="{% url 'ietf.doc.views_draft.change_stream' name=doc.name %}">
+                    Edit
+                </a>
+            {% endif %}
+        </td>
+        <td {% if doc.stream is None %}class="text-body-secondary"{%endif%}>
+            {% if doc.stream is not None %}
+                {% if doc.stream.name|lower in 'iab,irtf,ise,editorial' %}
+                    <a href="{% url 'ietf.group.views.stream_documents' acronym=doc.stream.name|lower %}">
+                {% endif %}
+                {% if document_html %}
+                    {% if doc.stream.name|lower in 'iab,ietf,irtf' %}
+                        {% include "logo.html" with org=doc.stream.name|lower classes="w-25 mt-1" title=stream_desc nor=True only %}
+                    {% else %}
+                        {{ doc.stream.desc }}
+                    {% endif %}
+                {% else %}
+                    {{ doc.stream.desc }}
+                {% endif %}
+                {% if doc.stream.name|lower in 'iab,irtf,ise,editorial' %}
+                    </a>
+                {% endif %}
+            {% else %}
+                (None)
+            {% endif %}
+        </td>
+    </tr>
+    {% if doc.type_id != "rfc" and not snapshot %}
+        <tr>
+            <td></td>
+            <th scope="row">
+                Intended RFC status
+            </th>
+            <td class="edit">
+                {% if can_edit_stream_info and not snapshot %}
+                    <a class="btn btn-primary btn-sm"
+                       href="{% url 'ietf.doc.views_draft.change_intention' name=doc.name %}">
+                        Edit
+                    </a>
+                {% endif %}
+            </td>
+            <td>
+                {% if doc.intended_std_level %}
+                    {{ doc.intended_std_level }}
+                {% else %}
+                    <span class="text-body-secondary">
+                        (None)
+                    </span>
+                {% endif %}
+            </td>
+        </tr>
+    {% endif %}
+    <tr>
+        <td></td>
+        <th scope="row">
+            {% if document_html %}Other formats{% else %}Formats{% endif %}
+        </th>
+        <td class="edit">
+        </td>
+        <td>
+            {% if document_html %}
+                {% include "doc/document_format_buttons.html" with skip_format="htmlized" %}
+            {% else %}
+                {% include "doc/document_format_buttons.html" %}
+            {% endif %}
+        </td>
+    </tr>
+    {% if not document_html %}
+    {% for check in doc.submission.latest_checks %}
+        {% if check.passed != None and check.symbol.strip %}
+            <tr>
+                <td></td>
+                <th scope="row">
+                    {{ check.checker|title }}
+                </th>
+                <td class="edit">
+                </td>
+                <td>
+                    {% if check.errors or check.warnings %}
+                        <span class="checker-warning"
+                              data-bs-toggle="modal"
+                              data-bs-target="#check-{{ check.pk }}"
+                              title="{{ check.checker|title }} returned warnings or errors.">
+                            {{ check.symbol|safe }}
+                        </span>
+                    {% else %}
+                        <span class="checker-success"
+                              data-bs-toggle="modal"
+                              data-bs-target="#check-{{ check.pk }}"
+                              title="{{ check.checker|title }} passed">
+                            {{ check.symbol|safe }}
+                        </span>
+                    {% endif %}
+                    <a href="#"
+                       data-bs-toggle="modal"
+                       data-bs-target="#check-{{ check.pk }}">
+                        {{ check.errors }} errors, {{ check.warnings }} warnings
+                    </a>
+                    {% include "doc/yang-check-modal-overlay.html" %}
+                </td>
+            </tr>
+        {% endif %}
+    {% endfor %}
+        {% if doc.type_id != "rfc" %}{# do not show reviews or conflict_reviews for RFCs, even if present #}
+            {% if review_assignments or can_request_review %}
+                <tr>
+                    <td></td>
+                    <th scope="row">
+                        Reviews
+                    </th>
+                    <td class="edit">
+                    </td>
+                    <td>
+                        {% for review_assignment in review_assignments %}
+                    {% include "doc/review_assignment_summary.html" with current_doc_name=doc.name current_rev=doc.rev review_assignment=review_assignment only %}
+                {% endfor %}
+                {% for review_request in review_requests %}
+                    {% include "doc/review_request_summary.html" with review_request=review_request only %}
+                        {% endfor %}
+                        {% if no_review_from_teams %}
+                            {% for team in no_review_from_teams %}
+                                {{ team.acronym.upper }}{% if not forloop.last %},{% endif %}
+                            {% endfor %}
+                            will not review this version
+                        {% endif %}
+                        {% if can_request_review or can_submit_unsolicited_review_for_teams %}
+                            <div {% if review_assignments or no_review_from_teams %}class="mt-3"{% endif %}>
+                                {% if can_request_review %}
+                                    <a class="btn btn-primary btn-sm"
+                                       href="{% url "ietf.doc.views_review.request_review" doc.name %}">
+                                        <i class="bi bi-check-circle">
+                                        </i>
+                                        Request review
+                                    </a>
+                                {% endif %}
+                                {% if can_submit_unsolicited_review_for_teams|length == 1 %}
+                                    <a class="btn btn-primary btn-sm"
+                                       href="{% url "ietf.doc.views_review.complete_review" doc.name can_submit_unsolicited_review_for_teams.0.acronym %}">
+                                        <i class="bi bi-pencil-square">
+                                        </i>
+                                        Submit unsolicited review
+                                    </a>
+                                {% elif can_submit_unsolicited_review_for_teams %}
+                                    <a class="btn btn-primary btn-sm"
+                                       href="{% url "ietf.doc.views_review.submit_unsolicited_review_choose_team" doc.name %}">
+                                        <i class="bi bi-pencil-square">
+                                        </i>
+                                        Submit unsolicited review
+                                    </a>
+                                {% endif %}
+                            </div>
+                        {% endif %}
+                    </td>
+                </tr>
+            {% endif %}
+            {% if conflict_reviews %}
+                <tr>
+                    <td></td>
+                    <th scope="row">
+                        IETF conflict review
+                    </th>
+                    <td class="edit">
+                    </td>
+                    <td>
+                        {{ conflict_reviews|join:", "|urlize_ietf_docs }}
+                    </td>
+                </tr>
+            {% endif %}
+        {% endif %}
+    {% endif %}
+    {% with doc.docextresource_set.all as resources %}
+        {% if resources or doc.group and doc.group.list_archive or can_edit_stream_info or can_edit_individual %}
+            <tr>
+                <td>
+                </td>
+                <th scope="row">
+                    Additional resources
+                </th>
+                <td class="edit">
+                    {% if can_edit_stream_info or can_edit_individual %}
+                        <a class="btn btn-primary btn-sm"
+                           href="{% url 'ietf.doc.views_draft.edit_doc_extresources' name=doc.name %}">
+                            Edit
+                        </a>
+                    {% endif %}
+                </td>
+                <td>
+                    {% if resources or doc.group and doc.group.list_archive %}
+                        {% for resource in resources|dictsort:"display_name" %}
+                            {% if resource.name.type.slug == 'url' or resource.name.type.slug == 'email' %}
+                                <a href="{{ resource.value }}" title="{{ resource.name.name }}">
+                                    {% firstof resource.display_name resource.name.name %}
+                                </a>
+                                <br>
+                                {# Maybe make how a resource displays itself a method on the class so templates aren't doing this switching #}
+                            {% else %}
+                                <span title="{{ resource.name.name }}">
+                                    {% firstof resource.display_name resource.name.name %}: {{ resource.value|escape }}
+                                </span>
+                                <br>
+                            {% endif %}
+                        {% endfor %}
+                        {% if doc.group and doc.group.list_archive %}
+                            {% if doc.group.list_archive|startswith:settings.MAILING_LIST_ARCHIVE_URL %}
+                                <a href="{{ doc.group.list_archive }}?q={{ doc.name }}{% if doc.came_from_draft %} OR %22{{ doc.came_from_draft.name }}%22{% endif%}">
+                                    Mailing list discussion
+                                </a>
+                            {% elif doc.group.list_archive|is_valid_url %}
+                                <a href="{{ doc.group.list_archive }}">
+                                    Mailing list discussion
+                                </a>
+                            {% else %}
+                                {{ doc.group.list_archive|urlencode }}
+                            {% endif %}
+                        {% endif %}
+                    {% endif %}
+                </td>
+            </tr>
+        {% endif %}
+    {% endwith %}
+</tbody>
\ No newline at end of file
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index f05a478f6d..cf6dd1ab64 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -2,13 +2,13 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load static %}
-{% load ietf_filters textfilters %}
+{% load ietf_filters textfilters tz %}
 {% block title %}{{ doc.title|default:"Untitled" }}{% endblock %}
 {% block content %}
     {% origin %}
     {{ top|safe }}
     {% include "doc/revisions_list.html" %}
-    <div id="timeline"></div>
+    <div id="doc-timeline"></div>
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
@@ -19,16 +19,34 @@
                     {% if doc.meeting_related %}Meeting{% endif %}
                     {{ doc.type.name }}
                 </th>
-                <td></td>
+                <td class="edit"></td>
                 <td>
                     {% if doc.group %}
                         {{ doc.group.name }}
                         <a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a>
                         {{ doc.group.type.name }}
                     {% endif %}
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
+            {% if doc.meeting_related %}
+                <tr>
+                    <th scope="row">
+                        Date and time
+                    </th>
+                    <td class="edit"></td>
+                    <td>
+                        {% with session=doc.get_related_session %}
+                        {% with timeslot=session.official_timeslotassignment.timeslot %}
+                            {% if session.meeting %}
+                                <a href="{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}" class="session-time date me-3" data-start-utc="{{ timeslot.time|utc|date:'Y-m-d H:i' }}" data-end-utc="{{ timeslot.end_time|utc|date:'Y-m-d H:i' }}">{{ timeslot.time|utc|date:'Y-m-d H:i' }}</a>
+                                {% include "meeting/tz-display.html" with meeting_timezone=session.meeting.time_zone id_suffix="" minimal=True only %}
+                            {% endif %}
+                        {% endwith %}
+                        {% endwith %}
+                    </td>
+                </tr>
+            {% endif %}
             <tr>
                 <th scope="row">Title</th>
                 <td class="edit">
@@ -36,7 +54,7 @@
                         {% doc_edit_button 'ietf.doc.views_material.edit_material' name=doc.name action="title" %}
                     {% endif %}
                 </td>
-                <th scope="row">{{ doc.title|default:'<span class="text-muted">(None)</span>' }}</th>
+                <th scope="row">{{ doc.title|default:'<span class="text-body-secondary">(None)</span>' }}</th>
             </tr>
             {% if doc.abstract or doc.type_id == 'slides' and can_manage_material and not snapshot %}
                 <tr>
@@ -60,7 +78,7 @@
                     {% if doc.get_state.name %}
                         {{ doc.get_state.name }}
                     {% else %}
-                        <span class="text-muted">(None)</span>
+                        <span class="text-body-secondary">(None)</span>
                     {% endif %}
                 </td>
             </tr>
@@ -97,10 +115,24 @@
                             {% if presentations %}
                                 {% for pres in presentations %}
                                     {{ pres.session.short_name }} at {{ pres.session.meeting }}
-                                    {% if pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %},{% endif %}
+                                    {% if pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}
+                                    <br>
+                                    <b>Remote instructions:</b>
+                                    {% if pres.session.agenda_note|first_url|conference_url %}
+                                        <a href="{{ pres.session.agenda_note|first_url }}" title="Online conference">
+                                            <i class="bi bi-beople"></i>
+                                        </a>
+                                    {% elif pres.session.remote_instructions|first_url|conference_url %}
+                                        <a href="{{ pres.session.remote_instructions|first_url }}"
+                                           title="Online conference">
+                                            <i class="bi bi-people"></i>
+                                        </a>
+                                    {% endif %}
+                                    {{ pres.session.remote_instructions|linkify }}
+                                    {% if not forloop.last %}<br>{% endif %}
                                 {% endfor %}
                             {% else %}
-                                <span class="text-muted">(None)</span>
+                                <span class="text-body-secondary">(None)</span>
                             {% endif %}
                         </td>
                     </tr>
@@ -121,9 +153,12 @@
             </a>
         {% endif %}
     </p>
+    {% if session_statusid == "canceled" %}
+       <div class="alert alert-warning">The session for this document was cancelled.</div>
+    {% endif %}
     <div id="materials-content" class="card mt-5">
         <div class="card-header">{{ doc.name }}-{{ doc.rev }}</div>
-        <div class="card-body">
+        <div class="card-body{% if content_is_html %} text-break{% endif %}">
             {% if doc.rev and content != None %}
                 {% if content_is_html %}
                     {{ content|sanitize|safe }}
@@ -142,4 +177,16 @@
 {% block js %}
     <script src="{% static 'ietf/js/d3.js' %}"></script>
     <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
+    {% if doc.meeting_related %}
+        <script src="{% static 'ietf/js/moment.js' %}"></script>
+        <script src="{% static 'ietf/js/upcoming.js' %}"></script>
+        <script src="{% static 'ietf/js/timezone.js' %}"></script>
+        <script>
+        $(function () {
+                // Init with best guess at local timezone.
+                ietf_timezone.set_tz_change_callback(timezone_changed);
+                ietf_timezone.initialize('local');
+        });
+        </script>
+    {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_polls.html b/ietf/templates/doc/document_polls.html
index 4f5f2531be..06ddc31b0b 100644
--- a/ietf/templates/doc/document_polls.html
+++ b/ietf/templates/doc/document_polls.html
@@ -8,7 +8,7 @@
     {% origin %}
     {{ top|safe }}
     {% include "doc/revisions_list.html" %}
-    <div id="timeline"></div>
+    <div id="doc-timeline"></div>
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
@@ -26,13 +26,13 @@
                         <a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a>
                         {{ doc.group.type.name }}
                     {% endif %}
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
             <tr>
                 <th scope="row">Title</th>
                 <td class="edit"></td>
-                <th scope="row">{{ doc.title|default:'<span class="text-muted">(None)</span>' }}</th>
+                <th scope="row">{{ doc.title|default:'<span class="text-body-secondary">(None)</span>' }}</th>
             </tr>
             <tr>
                 <th scope="row">Session</th>
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index 30d536d79f..e1137768b7 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin static ietf_filters %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-{% block title %}References to {{ alias_name }}{% endblock %}
+{% block title %}References to {{ name|prettystdname }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>References to {{ alias_name }}</h1>
+    <h1>References to {{ name|prettystdname }}</h1>
     <p class="alert alert-info my-3">
         These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly.
     </p>
@@ -38,33 +38,33 @@ <h1>References to {{ alias_name }}</h1>
         </thead>
         <tbody>
             {% for ref in refs %}
-                {% with ref.source.canonical_name as name %}
+                {% with ref.source.name as src_name %}
                     <tr>
                         <td>
-                            <a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a>
-                            {% if ref.target.name != alias_name %}
+                            <a href="{% url 'ietf.doc.views_doc.document_main' name=src_name %}">{{ src_name|prettystdname }}</a>
+                            {% if ref.target.name != name %}
                                 <br>
-                                <span class="badge rounded-pill bg-info">As {{ ref.target.name }}</span>
+                                <span class="badge rounded-pill text-bg-info">As {{ ref.target.name }}</span>
                             {% endif %}
                         </td>
                         <td>
                             <b>{{ ref.source.title }}</b>
                             <br>
                             <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.doc.views_doc.document_references' name %}"
+                               href="{% url 'ietf.doc.views_doc.document_references' src_name %}"
                                rel="nofollow">
                                 <i class="bi bi-arrow-left"></i>
                                 References
                             </a>
                             <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.doc.views_doc.document_referenced_by' name %}"
+                               href="{% url 'ietf.doc.views_doc.document_referenced_by' src_name %}"
                                rel="nofollow">
                                 <i class="bi bi-arrow-right"></i>
                                 Referenced by
                             </a>
                         </td>
                         <td>
-                            {% ifequal ref.source.get_state.slug 'rfc' %}
+                            {% if ref.source.type_id == "rfc" %}
                                 {% with ref.source.std_level as lvl %}
                                     {% if lvl %}{{ lvl }}{% endif %}
                                 {% endwith %}
@@ -72,7 +72,7 @@ <h1>References to {{ alias_name }}</h1>
                                 {% with ref.source.intended_std_level as lvl %}
                                     {% if lvl %}{{ lvl }}{% endif %}
                                 {% endwith %}
-                            {% endifequal %}
+                            {% endif %}
                         </td>
                         <td>{{ ref.relationship.name }}</td>
                         <td>{{ ref.is_downref|default:'' }}</td>
diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html
index 4578d6b8ce..8725b759c2 100644
--- a/ietf/templates/doc/document_references.html
+++ b/ietf/templates/doc/document_references.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin static ietf_filters %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-{% block title %}References from {{ doc.canonical_name }}{% endblock %}
+{% block title %}References from {{ doc.name|prettystdname }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>References from {{ doc.canonical_name }}</h1>
+    <h1>References from {{ doc.name|prettystdname }}</h1>
     <p class="my-3 alert alert-info">
         These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly.
     </p>
@@ -35,7 +35,7 @@ <h1>References from {{ doc.canonical_name }}</h1>
                             <a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a>
                         </td>
                         <td>
-                            <b>{{ ref.target.document.title }}</b>
+                            <b>{{ ref.target.title }}</b>
                             <br>
                             <a class="btn btn-primary btn-sm"
                                href="{% url 'ietf.doc.views_doc.document_references' name %}"
@@ -51,15 +51,15 @@ <h1>References from {{ doc.canonical_name }}</h1>
                             </a>
                         </td>
                         <td>
-                            {% ifequal ref.target.document.get_state.slug 'rfc' %}
-                                {% with ref.target.document.std_level as lvl %}
+                            {% if ref.target.type_id == "rfc" %}
+                                {% with ref.target.std_level as lvl %}
                                     {% if lvl %}{{ lvl }}{% endif %}
                                 {% endwith %}
                             {% else %}
-                                {% with ref.target.document.intended_std_level as lvl %}
+                                {% with ref.target.intended_std_level as lvl %}
                                     {% if lvl %}{{ lvl }}{% endif %}
                                 {% endwith %}
-                            {% endifequal %}
+                            {% endif %}
                         </td>
                         <td>{{ ref.relationship.name }}</td>
                         <td>{{ ref.is_downref|default:'' }}</td>
diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html
index 113c407fe5..feb30ae93a 100644
--- a/ietf/templates/doc/document_review.html
+++ b/ietf/templates/doc/document_review.html
@@ -29,7 +29,7 @@
                             {% if doc.get_state.name %}
                                 {{ doc.get_state.name }}
                             {% else %}
-                                <span class="text-muted">(None)</span>
+                                <span class="text-body-secondary">(None)</span>
                             {% endif %}
                         </td>
                     </tr>
diff --git a/ietf/templates/doc/document_rfc.html b/ietf/templates/doc/document_rfc.html
new file mode 100644
index 0000000000..d4b309a964
--- /dev/null
+++ b/ietf/templates/doc/document_rfc.html
@@ -0,0 +1,188 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2016-2024, All Rights Reserved #}
+{% load origin %}
+{% load static %}
+{% load ietf_filters %}
+{% load person_filters %}
+{% load textfilters %}
+{% block html_attrs %}prefix="og: http://ogp.me/ns# article: http://ogp.me/ns/article#"{% endblock %}
+{% block pagehead %}
+    {% include "doc/opengraph.html" %}
+    <link rel="alternate"
+          type="application/atom+xml"
+          title="Document changes"
+          href="/feed/document-changes/{{ name }}/">
+    <meta name="description"
+          content="{{ doc.title }} (RFC {{ doc.rfc_number }}, {{ doc.pub_date|date:'F Y' }}{% if obsoleted_by %}; obsoleted by {% for rel in obsoleted_by %}{{ rel.source.name|prettystdname}}{% if not forloop.last%}, {% endif %}{% endfor %}{% endif %})">
+{% endblock %}
+{% block morecss %}.inline { display: inline; }{% endblock %}
+{% block title %}
+        RFC {{ doc.rfc_number }} - {{ doc.title }}
+{% endblock %}
+{% block content %}
+    {% origin %}
+    {{ top|safe }}
+    {% include "doc/disclaimer.html" with document_html=document_html %}
+    <div id="doc-timeline"></div>
+    <table class="table table-sm table-borderless">
+        {% include "doc/document_info.html" %}
+        <tbody class="meta border-top">
+        </tbody>
+        {% if doc.stream_id != 'iab' %}
+            <tbody class="meta border-top">
+                <tr>
+                    <th scope="row">
+                        IESG
+                    </th>
+                        <th scope="row">
+                            Responsible AD
+                        </th>
+                        <td class="edit">
+                            {% if can_edit %}
+                                <a class="btn btn-primary btn-sm"
+                                   href="{% url 'ietf.doc.views_draft.edit_ad' name=doc.name %}">
+                                    Edit
+                                </a>
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if doc.ad %}
+                                {% person_link doc.ad %}
+                            {% else %}
+                                <span class="text-body-secondary">
+                                    (None)
+                                </span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <th scope="row">
+                            Send notices to
+                        </th>
+                        <td class="edit">
+                            {% if can_edit_notify %}
+                                <a class="btn btn-primary btn-sm"
+                                   href="{% url 'ietf.doc.views_doc.edit_notify' name=doc.name %}">
+                                    Edit
+                                </a>
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if doc.notify %}
+                                {{ doc.notify|linkify }}
+                            {% else %}
+                                <span class="text-body-secondary">
+                                    (None)
+                                </span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                </tbody>
+            {% endif %}
+        </table>
+        <div class="buttonlist">
+            {% if mailto_name %}
+                <a class="btn btn-primary btn-sm"
+                   href="mailto:{{ mailto_name }}@ietf.org?subject=Mail%20regarding%20{{ doc.name }}">
+                    <i class="bi bi-envelope">
+                    </i>
+                    Email authors
+                </a>
+            {% endif %}
+            {% if doc.group.type_id == "wg" or doc.group.type_id == "rg" %}
+                <a class="btn btn-primary btn-sm"
+                   href="mailto:{{ doc.group.list_email }}?subject=Mail%20regarding%20{{ doc.name }}">
+                    <i class="bi bi-envelope">
+                    </i>
+                    Email {{ doc.group.type }}
+                </a>
+            {% endif %}
+            <a class="btn btn-primary btn-sm"
+               href="{% url "ietf.ipr.views.search" %}?submit=draft&amp;id={{ doc.name }}"
+               rel="nofollow">
+                <i class="bi bi-lightning">
+                </i>
+                IPR
+                {% if doc.related_ipr %}
+                    <span class="badge rounded-pill">
+                        {{ doc.related_ipr|length }}
+                    </span>
+                {% endif %}
+            </a>
+            <a class="btn btn-primary btn-sm"
+               href="{% url 'ietf.doc.views_doc.document_references' doc.name %}"
+               rel="nofollow">
+                <i class="bi bi-arrow-left">
+                </i>
+                References
+            </a>
+            <a class="btn btn-primary btn-sm"
+               href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.name %}"
+               rel="nofollow">
+                <i class="bi bi-arrow-right">
+                </i>
+                Referenced by
+            </a>
+            {% if doc.rfc_number >= settings.FIRST_V3_RFC %}
+            <a class="btn btn-primary btn-sm"
+              href="{% url 'ietf.doc.views_doc.rfcxml_notprepped_wrapper' number=doc.rfc_number %}"
+              rel="nofollow">
+              <i class="bi bi-vector-pen">
+              </i>
+              Get editor source
+            </a>
+            {% endif %}
+            <a class="btn btn-primary btn-sm"
+                href="https://mailarchive.ietf.org/arch/search?q=%22{{ doc.name }}%22"
+                rel="nofollow"
+                target="_blank">
+                Search Lists
+            </a>
+            {% if user.is_authenticated %}
+                <a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}hide{% endif %}"
+                   href="{% url "ietf.community.views.untrack_document" email_or_name=user.username name=doc.name %}"
+                   title="Remove from your personal I-D list">
+                    <i class="bi bi-bookmark-check-fill">
+                    </i>
+                    Untrack
+                </a>
+                <a class="btn btn-primary btn-sm track-untrack-doc {% if doc.tracked_in_personal_community_list %}hide{% endif %}"
+                   href="{% url "ietf.community.views.track_document" email_or_name=user.username name=doc.name %}"
+                   title="Add to your personal I-D list">
+                    <i class="bi bi-bookmark">
+                    </i>
+                    Track
+                </a>
+            {% endif %}
+            {% if actions %}
+                {% for label, url in actions %}
+                    <a class="btn btn-primary btn-sm" href="{{ url }}">
+                        {{ label|capfirst_allcaps }}
+                    </a>
+                {% endfor %}
+            {% endif %}
+        </div>
+        <div class="card mt-5">
+            <div class="card-header">
+                    RFC {{ doc.rfc_number }}
+            </div>
+            <div class="card-body">
+                <pre>{{ content|sanitize|safe|default:"(Unavailable)" }}</pre>
+            </div>
+        </div>
+        {% if split_content %}
+            <a class="btn btn-primary my-3" href="?include_text=1">
+                <i class="bi bi-caret-down">
+                </i>
+                Show full document
+            </a>
+        {% endif %}
+
+    {% endblock %}
+    {% block js %}
+        <script src="{% static 'ietf/js/d3.js' %}">
+        </script>
+        <script src="{% static 'ietf/js/document_timeline.js' %}">
+        </script>
+    {% endblock %}
diff --git a/ietf/templates/doc/document_statement.html b/ietf/templates/doc/document_statement.html
new file mode 100644
index 0000000000..cc3ea5a44c
--- /dev/null
+++ b/ietf/templates/doc/document_statement.html
@@ -0,0 +1,139 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2023-2025, All Rights Reserved #}
+{% load origin %}
+{% load static %}
+{% load ietf_filters %}
+{% load person_filters textfilters %}
+{% block title %}{{ doc.title }}{% endblock %}
+{% block content %}
+    {% origin %}
+    {{ top|safe }}
+    {% include "doc/revisions_list.html" %}
+    <div id="doc-timeline"></div>
+    {% if doc.rev != latest_rev %}
+        <div class="alert alert-warning my-3">The information below is for an older version of this statement.</div>
+    {% endif %}
+    <table class="table table-sm table-borderless">
+        <tbody class="meta border-top">
+            <tr>
+                <th scope="row">Document</th>
+                <th scope="row">Type</th>
+                <td class="edit"></td>
+                <td>
+                    <span id="statement-type">{% if doc.get_state.slug != "active" %}{{doc.get_state.name}} {% endif %}{% if doc.group %}{{doc.group.acronym|upper}} {%endif%}Statement</span>
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
+                    {% if replaced_by %}<div>Replaced by {{ replaced_by|urlize_related_source_list:False|join:", " }}</div>{% endif %}
+                    {% if replaces %}<div>Replaces {{ replaces|urlize_related_target_list:False|join:", " }}</div>{% endif %}
+                </td>
+            </tr>
+            <tr>
+                <td></td>
+                <th scope="row">Title</th>
+                <td class="edit"></td>
+                <th scope="row" >{{ doc.title }}</th>
+            </tr>
+            <tr>
+                <td></td>
+                <th scope="row">Published</th>
+                <td class="edit"></td>
+                <td id="published">{{ published|date:"Y-m-d" }}</td>
+            </tr>
+            <tr>
+                <td></td>
+                <th scope="row">Metadata last updated</th>
+                <td class="edit"></td>
+                <td>{{ doc.time|date:"Y-m-d" }}</td>
+            </tr>
+            <tr>
+                <td></td>
+                <th scope="row">
+                    <a href="{% url 'ietf.doc.views_help.state_help' type='statement' %}">State</a>
+                </th>
+                <td class="edit">{% if can_manage %}
+                    <a class="btn btn-primary btn-sm"
+                       href="{% url 'ietf.doc.views_statement.change_statement_state' name=doc.name %}">
+                        Edit
+                    </a>
+                {% endif %}</td>
+                <td id="statement-state">
+                    {% if doc.get_state %}
+                        <span title="{{ doc.get_state.desc }}" class="badge rounded-pill {% if doc.get_state.name|slugify == 'active' %}text-bg-success{% else %}text-bg-warning{% endif %}">{{ doc.get_state.name }}</span>
+                    {% else %}
+                        No document state
+                    {% endif %}
+                </td>
+            </tr>
+            {% with doc.docextresource_set.all as resources %}
+                {% if resources or can_manage %}
+                    <tr>
+                        <td></td>
+                        <th scope="row">Additional resources</th>
+                        <td class="edit">
+                            {% if can_manage %}
+                                <a class="btn btn-primary btn-sm"
+                                   href="{% url 'ietf.doc.views_draft.edit_doc_extresources' name=doc.name %}">Edit</a>
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if resources %}
+                                {% for resource in resources|dictsort:"display_name" %}
+                                    {% if resource.name.type.slug == 'url' or resource.name.type.slug == 'email' %}
+                                        <a href="{{ resource.value }}" title="{{ resource.name.name }}">
+                                            {% firstof resource.display_name resource.name.name %}
+                                        </a>
+                                        <br>
+                                        {# Maybe make how a resource displays itself a method on the class so templates aren't doing this switching #}
+                                    {% else %}
+                                        <span title="{{ resource.name.name }}">{% firstof resource.display_name resource.name.name %}: {{ resource.value|escape }}</span>
+                                        <br>
+                                    {% endif %}
+                                {% endfor %}
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endif %}
+            {% endwith %}
+            <tr>
+                <td></td>
+                <th scope="row">
+                    Send notices to
+                </th>
+                <td class="edit">
+                    {% if not snapshot %}
+                        {% if can_manage %}
+                            {% doc_edit_button 'ietf.doc.views_doc.edit_notify' name=doc.name %}
+                        {% endif %}
+                    {% endif %}
+                </td>
+                <td>
+                    {{ doc.notify|default:'<span class="text-muted">(None)</span>' }}
+                </td>
+            </tr>
+        </tbody>
+    </table>
+    {% if not snapshot %}
+    {% if request.user|has_role:"Secretariat" %}
+        <p id="change-statement">
+            <a class="btn btn-primary"
+               href="{% url 'ietf.doc.views_statement.submit' name=doc.name %}">
+                Edit or upload revised statement text
+            </a>
+        </p>
+    {% endif %}
+{% endif %}
+
+    <div class="card mt-5">
+        <div class="card-header">
+            {{ doc.name }}-{{ doc.rev }}
+        </div>
+        <div class="card-body text-break">
+            {{ content }}
+        </div>
+    </div>
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/d3.js' %}">
+    </script>
+    <script src="{% static 'ietf/js/document_timeline.js' %}">
+    </script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index 7926fec8ec..fdb9bab4cd 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -10,7 +10,7 @@
     {% origin %}
     {{ top|safe }}
     {% include "doc/revisions_list.html" %}
-    <div id="timeline"></div>
+    <div id="doc-timeline"></div>
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning my-3">The information below is for an old version of the document.</div>
     {% endif %}
@@ -35,7 +35,7 @@
                 </td>
                 <th scope="row">
                     {{ doc.title }}
-                    {% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
+                    {% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
                 </th>
             </tr>
             <tr>
@@ -52,7 +52,7 @@
                     <td class="edit"></td>
                     <td>
                         {% for rel in relation_group.list %}
-                            {{ rel.target.document.canonical_name|upper|urlize_ietf_docs }}{% if not forloop.last %},{% endif %}
+                            {{ rel.target.name|upper|urlize_ietf_docs }}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
@@ -89,7 +89,7 @@
                 </td>
                 <td>
                     {% if not telechat %}
-                        <span class="text-muted">(None)</span>
+                        <span class="text-body-secondary">(None)</span>
                     {% else %}
                         On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat
                         {% if doc.returning_item %}(returning item){% endif %}
diff --git a/ietf/templates/doc/document_subseries.html b/ietf/templates/doc/document_subseries.html
new file mode 100644
index 0000000000..f0273c9093
--- /dev/null
+++ b/ietf/templates/doc/document_subseries.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin %}
+{% load static %}
+{% load ietf_filters %}
+{% block title %}{{ doc.name|prettystdname }}{% endblock %}
+{% block content %}
+  {% origin %}
+  {{ top|safe }}
+  <h2>{{ doc.name|prettystdname }} {% if doc.contains %}consists of:{% else %}currently contains no RFCs{% endif %}</h2>
+  {% for rfc in doc.contains|dictsort:"rfc_number" %}
+    <p><a href="{% url 'ietf.doc.views_doc.document_main' name=rfc.name %}">RFC {{rfc.name|slice:"3:"}}</a> : {{rfc.title}}</p>
+  {% endfor %}
+  <div class="buttonlist">
+    <a class="btn btn-primary btn-sm"
+    href="{% url 'ietf.doc.views_doc.document_references' doc.name %}"
+    rel="nofollow">
+     <i class="bi bi-arrow-left">
+     </i>
+     References
+    </a>
+    <a class="btn btn-primary btn-sm"
+    href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.name %}"
+    rel="nofollow">
+     <i class="bi bi-arrow-right">
+     </i>
+     Referenced by
+    </a>
+  </div>
+{% endblock %}
diff --git a/ietf/templates/doc/document_subseries_top.html b/ietf/templates/doc/document_subseries_top.html
new file mode 100644
index 0000000000..742ea51372
--- /dev/null
+++ b/ietf/templates/doc/document_subseries_top.html
@@ -0,0 +1,17 @@
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin %}
+{% origin %}
+{% load ietf_filters %}
+<h1>
+    {{ doc.name|prettystdname }}
+</h1>
+<ul class="nav nav-tabs my-3">
+    {% for name, t, url, active, tooltip in tabs %}
+        <li {% if tooltip %}title="{{ tooltip }}"{% endif %} class="nav-item">
+            <a class="nav-link {% if t == selected %}active{% endif %}{% if not active %}disabled{% endif %}"
+               {% if active %}href="{{ url }}"{% endif %}>
+                {{ name|capfirst_allcaps }}
+            </a>
+        </li>
+    {% endfor %}
+</ul>
diff --git a/ietf/templates/doc/document_top.html b/ietf/templates/doc/document_top.html
index 1fa2c22c2a..8a6923ee73 100644
--- a/ietf/templates/doc/document_top.html
+++ b/ietf/templates/doc/document_top.html
@@ -5,7 +5,9 @@
 <h1>
     {{ doc.title|default:"(Untitled)" }}
     <br>
-    <small class="text-muted">{{ name }}</small>
+    <small class="text-body-secondary">{{ name }}{% if doc.part_of %}
+    {% for sub in doc.part_of %}{% if sub.contains|length_is:"1" %} also known as {% else %} part of {% endif %}<a href="{% url 'ietf.doc.views_doc.document_main' name=sub.name%}">{{sub.name|slice:":3"|upper}} {{sub.name|slice:"3:"}}</a>{% if not forloop.last %}, {%endif%}{% endfor %}
+    {% endif %}</small>
 </h1>
 <ul class="nav nav-tabs my-3">
     {% for name, t, url, active, tooltip in tabs %}
diff --git a/ietf/templates/doc/document_writeup.html b/ietf/templates/doc/document_writeup.html
index 30f9c3c905..583c17ed6d 100644
--- a/ietf/templates/doc/document_writeup.html
+++ b/ietf/templates/doc/document_writeup.html
@@ -12,7 +12,7 @@ <h2 class="my-3">
             {{ title|capfirst_allcaps }}
             {% if subtitle %}
                 <br>
-                <small class="text-muted">{{ subtitle|safe }}</small>
+                <small class="text-body-secondary">{{ subtitle|safe }}</small>
             {% endif %}
         </h2>
         {% for name, text, url in writeups %}
diff --git a/ietf/templates/doc/downref.html b/ietf/templates/doc/downref.html
index b82b5027cd..b8598e1ed7 100644
--- a/ietf/templates/doc/downref.html
+++ b/ietf/templates/doc/downref.html
@@ -14,6 +14,15 @@ <h1>{{ title }}</h1>
         <a class="btn btn-warning my-3"
            href="{% url "ietf.doc.views_downref.downref_registry_add" %}">Add downref</a>
     {% endif %}
+    <div class="alert alert-info">
+        <p>
+            <a href="https://www.rfc-editor.org/rfc/rfc3967.html">RFC 3967</a>,
+            titled "Clarifying when Standards Track Documents may Refer Normatively to Documents at a Lower Level", specifies the rules for downward references (DOWNREFs):
+        </p>
+        <p class="mb-0">
+            "IETF procedures generally require that a standards track RFC may not have a normative reference to another standards track document at a lower maturity level or to a non standards track specification (other than specifications from other standards bodies). For example, a standards track document may not have a normative reference to an informational RFC. Exceptions to this rule are sometimes needed as the IETF uses informational RFCs to describe non-IETF standards or IETF-specific modes of use of such standards."
+        </p>
+</div>
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
@@ -41,4 +50,4 @@ <h1>{{ title }}</h1>
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/add_iana_experts_comment.html b/ietf/templates/doc/draft/add_iana_experts_comment.html
index 4816f2f645..193e1ba7ee 100644
--- a/ietf/templates/doc/draft/add_iana_experts_comment.html
+++ b/ietf/templates/doc/draft/add_iana_experts_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add IANA Experts Review State comment
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/adopt_draft.html b/ietf/templates/doc/draft/adopt_draft.html
index 64f25535de..0d41d0a8a5 100644
--- a/ietf/templates/doc/draft/adopt_draft.html
+++ b/ietf/templates/doc/draft/adopt_draft.html
@@ -8,14 +8,11 @@
     <h1>
         Manage Document Adoption
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p class="my-3 alert alert-info">
-        You can begin managing the group state of this draft.
-    </p>
-    <p class="alert alert-info my-3">
-        For a WG, the draft enters the IETF stream.
-        For an RG, the draft enters the IRTF stream.
+        You can begin managing the group state of this Internet-Draft.
+        The document will be moved into the stream of the adopting group.
     </p>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/ask_about_ietf_adoption.html b/ietf/templates/doc/draft/ask_about_ietf_adoption.html
new file mode 100644
index 0000000000..d19e4572b7
--- /dev/null
+++ b/ietf/templates/doc/draft/ask_about_ietf_adoption.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015-2025, All Rights Reserved #}
+{% load django_bootstrap5 ietf_filters origin %}
+{% block title %}Manage Adoption of {{ doc }}{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Manage Adoption
+        <br>
+        <small class="text-body-secondary">{{ doc }}</small>
+    </h1>
+    <div>
+        Do you wish to issue an IETF Working Group call for adoption to one of these working groups?
+    </div>
+    <form method="post">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button type="submit" class="btn btn-primary">Issue IETF WG Call For Adoption</button>
+        <a class="btn btn-secondary" href="{% url 'ietf.doc.views_draft.adopt_draft' name=doc.name %}">No, I wish to manage adoption directly, perhaps with non-IETF-stream groups</a>
+        <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/change_ad.html b/ietf/templates/doc/draft/change_ad.html
index 3730546eec..0eb0babacc 100644
--- a/ietf/templates/doc/draft/change_ad.html
+++ b/ietf/templates/doc/draft/change_ad.html
@@ -2,19 +2,29 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
+{% load ietf_filters %}
 {% block title %}Change responsible AD for {{ doc.name }}-{{ doc.rev }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Change responsible AD
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
+    {% with approved=doc|state:"draft-rfceditor" %}
+    {% if approved %}
+        <div class="alert alert-warning my-3">
+            It is unusual to change the responsible AD for a document that has
+            been sent to the RFC Editor. Please make sure this is really what
+            you want to do.
+        </div>
+    {% endif %}
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-        <button type="submit" class="btn btn-primary">Submit</button>
+        <button type="submit" class="btn {{ approved|yesno:'btn-warning,btn-primary' }}">Submit</button>
         <a class="btn btn-secondary float-end"
            href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     </form>
+    {% endwith %}
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html
index 870c115ae9..cf6348471b 100644
--- a/ietf/templates/doc/draft/change_consensus.html
+++ b/ietf/templates/doc/draft/change_consensus.html
@@ -8,7 +8,7 @@
     <h1>
         Change consensus
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_iana_state.html b/ietf/templates/doc/draft/change_iana_state.html
index f83f271258..1b05624bd6 100644
--- a/ietf/templates/doc/draft/change_iana_state.html
+++ b/ietf/templates/doc/draft/change_iana_state.html
@@ -8,7 +8,7 @@
     <h1>
         Change IANA state
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_intended_status.html b/ietf/templates/doc/draft/change_intended_status.html
index a2ea50174d..28f0121551 100644
--- a/ietf/templates/doc/draft/change_intended_status.html
+++ b/ietf/templates/doc/draft/change_intended_status.html
@@ -8,7 +8,7 @@
     <h1>
         Change intended status
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html
index f839b12874..a219449a29 100644
--- a/ietf/templates/doc/draft/change_replaces.html
+++ b/ietf/templates/doc/draft/change_replaces.html
@@ -10,7 +10,7 @@
     <h1>
         Change documents replaced by
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <h2>Instructions</h2>
     <form method="post">
diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html
index 6a1362b959..f6fc37781b 100644
--- a/ietf/templates/doc/draft/change_shepherd_writeup.html
+++ b/ietf/templates/doc/draft/change_shepherd_writeup.html
@@ -2,13 +2,13 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}{% endblock %}
+{% block title %}Edit shepherd writeup for {{ doc.name }}-{{ doc.rev }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Edit shepherd writeup
         <br>
-        <small class="text-muted">{{ doc.canonical_name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html
index b993552ba4..1cae8358a4 100644
--- a/ietf/templates/doc/draft/change_state.html
+++ b/ietf/templates/doc/draft/change_state.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
 {% block title %}Change state for {{ doc }}{% endblock %}
@@ -8,8 +8,15 @@
     <h1>
         Change state
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
+    {% if state.slug == "dead" %}
+        <p class="alert alert-warning my-3">
+            This document is in IESG state "Dead". It is unusual to change this to
+            anything other than "I-D Exists" and this should never be used as a
+            replacement for Begin IESG Processing.
+        </p>
+    {% endif %}
     <a class="btn btn-info my-3"
        href="{% url 'ietf.doc.views_help.state_help' type="draft-iesg" %}">Help on states</a>
     <form class="mt-3" method="post">
@@ -17,7 +24,7 @@ <h1>
         {% bootstrap_form form %}
         {% if state and state.slug == "rfcqueue" %}
             <div class="form-text">
-                <b>Note:</b> If you pull the draft out of the
+                <b>Note:</b> If you pull the Internet-Draft out of the
                 <i>{{ state.name }}</i> state, the RFC Editor and IANA will be notified
                 by email with this comment, so they can update their queues.
             </div>
diff --git a/ietf/templates/doc/draft/change_stream.html b/ietf/templates/doc/draft/change_stream.html
index b8addc26c1..4141042336 100644
--- a/ietf/templates/doc/draft/change_stream.html
+++ b/ietf/templates/doc/draft/change_stream.html
@@ -8,7 +8,7 @@
     <h1>
         Change stream
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html
index b8dca253f1..7f3132b3c8 100644
--- a/ietf/templates/doc/draft/change_stream_state.html
+++ b/ietf/templates/doc/draft/change_stream_state.html
@@ -1,25 +1,22 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load django_bootstrap5 %}
+{# Copyright The IETF Trust 2015-2025, All Rights Reserved #}
+{% load django_bootstrap5 ietf_filters origin %}
 {% block title %}Change {{ state_type.label }} for {{ doc }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Change {{ state_type.label }}
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     {% if next_states %}
         <a class="my-3 btn btn-info"
            href="{% url 'ietf.doc.views_help.state_help' type=state_type.slug %}">Help on states</a>
         <p>
-            <b>Move document to {{ next_states|pluralize:"to one of" }} the recommended next state{{ next_states|pluralize }}:</b>
+            <b>Move document to {{ next_states|pluralize:"one of" }} the recommended next state{{ next_states|pluralize }}:</b>
         </p>
         {% for state in next_states %}
-            {% if state.slug == 'sub-pub' %}
-                <a type="button" class="btn btn-primary next-state" href="{% url 'ietf.doc.views_draft.to_iesg' name=doc.name %}">{{ state.name }}</a>
-            {% else %}
+            {% if state.slug != 'sub-pub' and state.slug != "wg-lc" %}
                 <button type="button" class="btn btn-primary next-state" data-state="{{ state.pk }}">{{ state.name }}</button>
             {% endif %}
         {% endfor %}
@@ -28,7 +25,13 @@ <h1>
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Submit</button>
-        <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
+        <a class="btn btn-secondary float-end"
+          {% if doc|can_issue_ietf_wg_lc or doc|can_submit_to_iesg %}
+            href="{% url 'ietf.doc.views_draft.offer_wg_action_helpers' name=doc.name %}"
+          {% else %} 
+            href="{{ doc.get_absolute_url }}"
+          {% endif %}
+        >Back</a>
     </form>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/doc/draft/edit_iesg_note.html b/ietf/templates/doc/draft/edit_iesg_note.html
deleted file mode 100644
index 3be3987a60..0000000000
--- a/ietf/templates/doc/draft/edit_iesg_note.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load django_bootstrap5 %}
-{% block title %}Edit IESG note for {{ doc.name }}{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>
-        Edit IESG note
-        <br>
-        <small class="text-muted">{{ doc.name }}</small>
-    </h1>
-    <form class="mt-3" method="post">
-        {% csrf_token %}
-        {% bootstrap_form form %}
-        <button type="submit" class="btn btn-primary">Save</button>
-        <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html
index 3071dd4bc3..67b7423cfb 100644
--- a/ietf/templates/doc/draft/edit_info.html
+++ b/ietf/templates/doc/draft/edit_info.html
@@ -9,7 +9,7 @@
     <h1>
         Edit info
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/draft/expire_warning_email.txt b/ietf/templates/doc/draft/expire_warning_email.txt
index 138b3c223f..d43fadacec 100644
--- a/ietf/templates/doc/draft/expire_warning_email.txt
+++ b/ietf/templates/doc/draft/expire_warning_email.txt
@@ -1,4 +1,4 @@
-{% load ietf_filters %}{% autoescape off %}The following draft will expire soon:
+{% load ietf_filters %}{% autoescape off %}The following Internet-Draft will expire soon:
 
 Name:     {{ doc.name|clean_whitespace }}
 Title:    {{ doc.title}}
diff --git a/ietf/templates/doc/draft/id_expired_email.txt b/ietf/templates/doc/draft/id_expired_email.txt
index ccea8676a2..161146a301 100644
--- a/ietf/templates/doc/draft/id_expired_email.txt
+++ b/ietf/templates/doc/draft/id_expired_email.txt
@@ -1,5 +1,5 @@
-{% autoescape off %}{{ doc.file_tag|safe }} was just expired.
-This draft is in the state "{{ state }}" in the Datatracker.
+{% autoescape off %}{{ doc.file_tag|safe }} just expired.
+This Internet-Draft is in the state "{{ state }}" in the Datatracker.
 
 
 Thanks,
diff --git a/ietf/templates/doc/draft/issue_working_group_call_for_adoption.html b/ietf/templates/doc/draft/issue_working_group_call_for_adoption.html
new file mode 100644
index 0000000000..61094b053a
--- /dev/null
+++ b/ietf/templates/doc/draft/issue_working_group_call_for_adoption.html
@@ -0,0 +1,61 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load origin django_bootstrap5 static %}
+={% block title %}Issue Working Group Call for Adoption of {{ doc }}{% endblock %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static 'ietf/css/datepicker.css' %}">
+{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Issue Working Group Call for Adoption
+        <br>
+        <small class="text-body-secondary">{{ doc }}</small>
+    </h1>
+    {% if form.errors %}
+        <p class="alert alert-danger my-3">
+            Please correct the following:
+        </p>
+    {% endif %}
+    {% bootstrap_form_errors form %}
+    <form class="mt-5" method="post">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <div id="end_date_warn" class="alert alert-warning d-none" role="alert">
+            All dates have been updated automatically in the Subject and Body fields with the End date value. Since you previously edited these fields manually, review both to ensure they match your expectations.
+        </div>
+        <button type="submit" class="btn btn-primary">Submit</button>
+        <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
+    </form>
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/datepicker.js' %}"></script>
+    <script>
+        (function () {
+            const datepickerElm = document.querySelector('#id_end_date')
+            const subjectElm = document.querySelector('#id_subject')
+            const contentElm = document.querySelector('#id_body')
+            const warnElm = document.querySelector('#end_date_warn')
+            let isSubjectOrContentDirty = false
+
+            // Handle date auto-replace in subject + content
+            datepickerElm.addEventListener('changeDate', ev => {
+                subjectElm.value = subjectElm.value.replaceAll(/2[0-9]{3}-[0-9]{2}-[0-9]{2}/g, datepickerElm.value)
+                contentElm.value = contentElm.value.replaceAll(/2[0-9]{3}-[0-9]{2}-[0-9]{2}/g, datepickerElm.value)
+
+                // Warn about auto-replace on dirtied fields
+                if (isSubjectOrContentDirty) {
+                    warnElm.classList.remove('d-none')
+                }
+            })
+
+            // Detect dirtied fields
+            subjectElm.addEventListener('input', () => {
+                isSubjectOrContentDirty = true
+            })
+            contentElm.addEventListener('input', () => {
+                isSubjectOrContentDirty = true
+            })
+        })()
+    </script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/issue_working_group_last_call.html b/ietf/templates/doc/draft/issue_working_group_last_call.html
new file mode 100644
index 0000000000..d6f35a0e82
--- /dev/null
+++ b/ietf/templates/doc/draft/issue_working_group_last_call.html
@@ -0,0 +1,61 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load origin django_bootstrap5 static %}
+={% block title %}Issue Working Group Last Call for {{ doc }}{% endblock %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static 'ietf/css/datepicker.css' %}">
+{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Issue Working Group Last Call
+        <br>
+        <small class="text-body-secondary">{{ doc }}</small>
+    </h1>
+    {% if form.errors %}
+        <p class="alert alert-danger my-3">
+            Please correct the following:
+        </p>
+    {% endif %}
+    {% bootstrap_form_errors form %}
+    <form class="mt-5" method="post">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <div id="end_date_warn" class="alert alert-warning d-none" role="alert">
+            All dates have been updated automatically in the Subject and Body fields with the End date value. Since you previously edited these fields manually, review both to ensure they match your expectations.
+        </div>
+        <button type="submit" class="btn btn-primary">Submit</button>
+        <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
+    </form>
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/datepicker.js' %}"></script>
+    <script>
+        (function () {
+            const datepickerElm = document.querySelector('#id_end_date')
+            const subjectElm = document.querySelector('#id_subject')
+            const contentElm = document.querySelector('#id_body')
+            const warnElm = document.querySelector('#end_date_warn')
+            let isSubjectOrContentDirty = false
+
+            // Handle date auto-replace in subject + content
+            datepickerElm.addEventListener('changeDate', ev => {
+                subjectElm.value = subjectElm.value.replaceAll(/2[0-9]{3}-[0-9]{2}-[0-9]{2}/g, datepickerElm.value)
+                contentElm.value = contentElm.value.replaceAll(/2[0-9]{3}-[0-9]{2}-[0-9]{2}/g, datepickerElm.value)
+
+                // Warn about auto-replace on dirtied fields
+                if (isSubjectOrContentDirty) {
+                    warnElm.classList.remove('d-none')
+                }
+            })
+
+            // Detect dirtied fields
+            subjectElm.addEventListener('input', () => {
+                isSubjectOrContentDirty = true
+            })
+            contentElm.addEventListener('input', () => {
+                isSubjectOrContentDirty = true
+            })
+        })()
+    </script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/make_last_call.html b/ietf/templates/doc/draft/make_last_call.html
index 9a4d5aabad..fd90a3d70a 100644
--- a/ietf/templates/doc/draft/make_last_call.html
+++ b/ietf/templates/doc/draft/make_last_call.html
@@ -8,7 +8,7 @@
     <h1>
         Make last call
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         <b>Last call for:</b>
diff --git a/ietf/templates/doc/draft/release_draft.html b/ietf/templates/doc/draft/release_draft.html
index de6f034340..0de4014a60 100644
--- a/ietf/templates/doc/draft/release_draft.html
+++ b/ietf/templates/doc/draft/release_draft.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}Release draft {{ doc.name }}-{{ doc.rev }}{% endblock %}
+{% block title %}Release I-D {{ doc.name }}-{{ doc.rev }}{% endblock %}
 {% block content %}
     <h1>
-        Release draft
+        Release Internet-Draft
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <div class="my-3 alert alert-warning">
         <b>Warning:</b>
@@ -27,4 +27,4 @@ <h1>
         <a class="btn btn-secondary float-end"
            href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html
index 000b419858..26cb09db13 100644
--- a/ietf/templates/doc/draft/request_publication.html
+++ b/ietf/templates/doc/draft/request_publication.html
@@ -8,7 +8,7 @@
     <h1>
         Request publication
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         Send a publication request to the RFC Editor for {{ doc }} and move it to the <i>{{ next_state.name }}</i> stream state.
diff --git a/ietf/templates/doc/draft/request_resurrect.html b/ietf/templates/doc/draft/request_resurrect.html
index 7b12ae4967..f9559f759e 100644
--- a/ietf/templates/doc/draft/request_resurrect.html
+++ b/ietf/templates/doc/draft/request_resurrect.html
@@ -8,7 +8,7 @@
     <h1>
         Request resurrection
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         Request resurrection of the Internet-Draft <b>{{ doc }}</b>?
diff --git a/ietf/templates/doc/draft/resurrect.html b/ietf/templates/doc/draft/resurrect.html
index 8c1a8d17d3..196b787ceb 100644
--- a/ietf/templates/doc/draft/resurrect.html
+++ b/ietf/templates/doc/draft/resurrect.html
@@ -8,7 +8,7 @@
     <h1>
         Resurrect
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
     <p>
         Resurrect <b>{{ doc }}</b>?
diff --git a/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html b/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html
index 97116ff5ee..1627179a10 100644
--- a/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html
+++ b/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html
@@ -12,6 +12,6 @@ <h1>Duplicate RFC Editor Note</h1>
     </p>
     <p>
         The document writeup can be edited
-        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}writeup/">here</a>.
+        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}writeup/">here</a>.
     </p>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
index aad7202af6..f976ead926 100644
--- a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
+++ b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
@@ -10,7 +10,7 @@ <h1>Posting approved I-D to RFC Editor failed</h1>
         error.
     </p>
     <p>
-        We have not changed the draft state or sent the announcement
+        We have not changed the Internet-Draft state or sent the announcement
         yet so if this is an intermittent error, you can go back and try
         again.
     </p>
diff --git a/ietf/templates/doc/draft/wg_action_helpers.html b/ietf/templates/doc/draft/wg_action_helpers.html
new file mode 100644
index 0000000000..d21f3c0926
--- /dev/null
+++ b/ietf/templates/doc/draft/wg_action_helpers.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015-2025, All Rights Reserved #}
+{% load django_bootstrap5 ietf_filters origin %}
+{% block title %}Change IETF WG state for {{ doc }}{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Change IETF WG state
+        <br>
+        <small class="text-body-secondary">{{ doc }}</small>
+    </h1>
+    <div>
+        {% if doc|is_doc_ietf_adoptable %}
+          <a class="btn btn-primary" href="{% url 'ietf.doc.views_draft.issue_wg_call_for_adoption' name=doc.name acronym=doc.group.acronym %}" id="id_wgadopt_button">Issue WG Call for Adoption</a>
+        {% endif %}
+        {% if doc|can_issue_ietf_wg_lc %}
+          <a class="btn btn-primary" href="{% url 'ietf.doc.views_draft.issue_wg_lc' name=doc.name %}" id="id_wglc_button">Issue{% if doc|has_had_ietf_wg_lc %} Another{% endif %} Working Group Last Call</a>
+        {% endif %}
+        {% if doc|can_submit_to_iesg %}
+          <a class="btn btn-primary" href="{% url 'ietf.doc.views_draft.to_iesg' name=doc.name %}" id="id_pubreq_button">Submit to IESG for Publication</a>
+        {% endif %}
+        <a class="btn btn-primary" href="{% url 'ietf.doc.views_draft.change_stream_state' name=doc.name state_type='draft-stream-ietf' %}">Set any WG state directly</a>
+        <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/drafts_for_ad.html b/ietf/templates/doc/drafts_for_ad.html
index a8d88fc223..18e5960e81 100644
--- a/ietf/templates/doc/drafts_for_ad.html
+++ b/ietf/templates/doc/drafts_for_ad.html
@@ -6,13 +6,13 @@
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-{% block title %}Documents for {{ ad_name }}{% endblock %}
+{% block title %}Documents for {{ ad.name }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Documents for {{ ad_name }}</h1>
+    <h1>Documents for {{ ad.name }}</h1>
     <a class="btn btn-primary my-3" href="{% url 'ietf.doc.views_search.ad_workload' %}">IESG dashboard</a>
     {% if blocked_docs %}
-        <h2 class="mt-4">Blocking positions held by {{ ad_name }}</h2>
+        <h2 class="mt-4">Blocking positions held by {{ ad.name }}</h2>
         <table class="table table-sm table-striped tablesorter">
             <thead>
                 <tr>
@@ -31,12 +31,12 @@ <h2 class="mt-4">Blocking positions held by {{ ad_name }}</h2>
                             {% if doc.ad %}
                                 {% person_link doc.ad %}
                             {% else %}
-                                <span class="text-muted">(None)</span>
+                                <span class="text-body-secondary">(None)</span>
                             {% endif %}
                         </td>
                         <td>
                             {% for p in doc.blocking_positions %}
-                                <span {% if p.is_old_pos %}class="text-muted"{% endif %}>
+                                <span {% if p.is_old_pos %}class="text-body-secondary"{% endif %}>
                                     {% if p.is_old_pos %}
                                         {% person_link p.balloter class="text-reset" %}
                                     {% else %}
@@ -52,8 +52,35 @@ <h2 class="mt-4">Blocking positions held by {{ ad_name }}</h2>
                 {% endfor %}
             </tbody>
         </table>
-        <h2 class="mt-4">Documents for {{ ad_name }}</h2>
     {% endif %}
+    {% if not_balloted_docs %}
+        <h2 class="mt-4">Missing ballot positions for {{ ad.name }}</h2>
+        <table class="table table-sm table-striped tablesorter">
+            <thead>
+                <tr>
+                    <th scope="col" data-sort="document">Document</th>
+                    <th scope="col" data-sort="status">Status</th>
+                    <th scope="col" class="d-none d-sm-table-cell" data-sort="responsible">Responsible AD</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for doc in not_balloted_docs %}
+                    <tr>
+                        <td>{{ doc.displayname_with_link }}</td>
+                        {% include "doc/search/status_columns.html" %}
+                        <td class="d-none d-sm-table-cell">
+                            {% if doc.ad %}
+                                {% person_link doc.ad %}
+                            {% else %}
+                                <span class="text-body-secondary">(None)</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+    <h2 class="mt-4">Documents for {{ ad.name }}</h2>
     {% include "doc/search/search_results.html" with start_table=True end_table=True %}
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/doc/drafts_for_iesg.html b/ietf/templates/doc/drafts_for_iesg.html
new file mode 100644
index 0000000000..d7a79fb714
--- /dev/null
+++ b/ietf/templates/doc/drafts_for_iesg.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin static %}
+{% load cache %}
+{% load ietf_filters %}
+{% load person_filters %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
+{% block title %}Documents for the IESG{% endblock %}
+{% block content %}
+    {% cache 300 ietf_doc_drafts_for_iesg using="slowpages" %}
+    {% origin %}
+    <h1 class="mt-4">Documents for the IESG</h1>
+    {% include "doc/search/search_results.html" with start_table=True end_table=True %}
+    {% endcache %}
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
deleted file mode 100644
index 528678118d..0000000000
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load ietf_filters static %}
-{% load textfilters person_filters %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
-{% block title %}{{ title }}{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>{{ title }}</h1>
-    <table class="table table-sm table-striped tablesorter">
-        <thead>
-            <tr>
-                <th scope="col" data-sort="area">Area</th>
-                <th scope="col" data-sort="date">
-                    {% if state.slug == "lc" %}
-                        Expires at
-                    {% else %}
-                        Date
-                    {% endif %}
-                </th>
-                <th scope="col" data-sort="doc">Document</th>
-                <th scope="col" data-sort="level">Intended level</th>
-                <th scope="col" data-sort="ad">AD</th>
-            </tr>
-        </thead>
-        {% for state, docs in grouped_docs %}
-            <tbody>
-                <tr class="table-info">
-                    <th scope="col" colspan="5">{{ state.name }}</th>
-                </tr>
-            </tbody>
-            <tbody>
-                {% for doc in docs %}
-                    <tr>
-                        <td>
-                            {% if doc.area_acronym %}
-                                <a href="{% url "ietf.group.views.group_home" acronym=doc.area_acronym %}">{{ doc.area_acronym }}</a>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if state.slug == "lc" %}
-                                {% if doc.lc_expires %}{{ doc.lc_expires|date:"Y-m-d" }}{% endif %}
-                            {% else %}
-                                {{ doc.time|date:"Y-m-d" }}
-                            {% endif %}
-                        </td>
-                        <td>
-                            <a href="{% url "ietf.doc.views_doc.document_main" doc.name %}">{{ doc.name }}</a>
-                            <br>
-                            <b>{{ doc.title }}</b>
-                            {% if doc.action_holders_enabled and doc.action_holders.exists %}
-                                <br>
-                                Action holder{{ doc.documentactionholder_set.all|pluralize }}:
-                                {% for action_holder in doc.documentactionholder_set.all %}
-                                    {% person_link action_holder.person title=action_holder.role_for_doc %} {{ action_holder|action_holder_badge }}{% if not forloop.last %},{% endif %}
-                                {% endfor %}
-                            {% endif %}
-                            {% if doc.note %}
-                                <br>
-                                <i>Note: {{ doc.note|urlize_ietf_docs|linkify|linebreaksbr }}</i>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if doc.intended_std_level %}
-                                {{ doc.intended_std_level.name }}
-                            {% else %}
-                                <span class="text-muted">(None)</span>
-                            {% endif %}
-                        </td>
-                        <td>{% person_link doc.ad %}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        {% endfor %}
-    </table>
-{% endblock %}
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
diff --git a/ietf/templates/doc/drafts_in_last_call.html b/ietf/templates/doc/drafts_in_last_call.html
index 76dba79a15..d4cb6b19a9 100644
--- a/ietf/templates/doc/drafts_in_last_call.html
+++ b/ietf/templates/doc/drafts_in_last_call.html
@@ -11,7 +11,7 @@ <h1>
         Internet-Drafts in IETF Last Call
         {% if pages %}
             <br>
-            <small class="text-muted">{{ pages }} pages</small>
+            <small class="text-body-secondary">{{ pages }} pages</small>
         {% endif %}
     </h1>
     {% include "doc/search/search_results.html" with start_table=True end_table=True %}
diff --git a/ietf/templates/doc/edit_action_holders.html b/ietf/templates/doc/edit_action_holders.html
index 24ba4032d3..88c764fe5e 100644
--- a/ietf/templates/doc/edit_action_holders.html
+++ b/ietf/templates/doc/edit_action_holders.html
@@ -10,7 +10,7 @@
     <h1>
         Edit action holders
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form enctype="multipart/form-data" method="post">
         {% csrf_token %}
@@ -40,7 +40,7 @@ <h1>
         </div>
         <button type="submit" class="btn btn-primary" name="submit" value="Save">Submit</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/edit_authors.html b/ietf/templates/doc/edit_authors.html
index ed28855e40..a0b8eb4cc7 100644
--- a/ietf/templates/doc/edit_authors.html
+++ b/ietf/templates/doc/edit_authors.html
@@ -12,7 +12,7 @@
     <h1>
         Edit authors
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form enctype="multipart/form-data" method="post" id="authors-form">
         {% csrf_token %}
@@ -48,7 +48,7 @@ <h1>
         </div>
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/edit_field.html b/ietf/templates/doc/edit_field.html
index d1f4d96411..10a1464581 100644
--- a/ietf/templates/doc/edit_field.html
+++ b/ietf/templates/doc/edit_field.html
@@ -2,13 +2,13 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}{{ title }} {{ doc.canonical_name }}{% endblock %}
+{% block title %}{{ title }} {{ doc.name }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         {{ title }}
         <br>
-        <small class="text-muted">{{ doc.canonical_name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="alert alert-info my-3">
         {{ info|safe }}
@@ -18,7 +18,7 @@ <h1>
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary" name="submit" value="Save">Submit</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/edit_notify.html b/ietf/templates/doc/edit_notify.html
index 6701c58523..9eaede521b 100644
--- a/ietf/templates/doc/edit_notify.html
+++ b/ietf/templates/doc/edit_notify.html
@@ -8,7 +8,7 @@
     <h1>
         Edit notification addresses
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
@@ -22,7 +22,7 @@ <h1>
                name="regenerate_addresses">
                Regenerate address list</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/edit_sessionpresentation.html b/ietf/templates/doc/edit_sessionpresentation.html
index 79508b7836..5cc8e2f566 100644
--- a/ietf/templates/doc/edit_sessionpresentation.html
+++ b/ietf/templates/doc/edit_sessionpresentation.html
@@ -8,7 +8,7 @@
     <h1>
         Change document revision for session
         <br>
-        <small class="text-muted">{{ sp.document.name }}</small>
+        <small class="text-body-secondary">{{ sp.document.name }}</small>
     </h1>
     <h2 class="mt-3">{{ sp.document.title }} at {{ sp.session }}</h2>
     {% if sp.session.is_material_submission_cutoff %}
diff --git a/ietf/templates/doc/edit_telechat_date.html b/ietf/templates/doc/edit_telechat_date.html
index b95b38936d..f3efc80144 100644
--- a/ietf/templates/doc/edit_telechat_date.html
+++ b/ietf/templates/doc/edit_telechat_date.html
@@ -8,7 +8,7 @@
     <h1>
         Set telechat date
         <br>
-        <small class="text-muted">{{ doc.name }} ({{ doc.pages }} page{{ doc.pages|pluralize }})</small>
+        <small class="text-body-secondary">{{ doc.name }} ({{ doc.pages }} page{{ doc.pages|pluralize }})</small>
     </h1>
     {% for warning in warnings %}<div class="alert alert-warning my-3">{{ warning }}</div>{% endfor %}
     <form method="post">
diff --git a/ietf/templates/doc/email_aliases.html b/ietf/templates/doc/email_aliases.html
index 3311f2e28e..111d31b0ba 100644
--- a/ietf/templates/doc/email_aliases.html
+++ b/ietf/templates/doc/email_aliases.html
@@ -3,13 +3,11 @@
 {% load origin %}
 {% block title %}
     Document email aliases
-    {% if doc %}for {{ doc.name }}{% endif %}
 {% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Document email aliases
-        {% if doc %}for {{ doc.name }}{% endif %}
     </h1>
     {% regroup aliases|dictsort:"doc_name" by doc_name as alias_list %}
     <table class="table table-borderless table-sm mt-3">
diff --git a/ietf/templates/doc/frontpage.html b/ietf/templates/doc/frontpage.html
index 38575aab45..b845c2628f 100644
--- a/ietf/templates/doc/frontpage.html
+++ b/ietf/templates/doc/frontpage.html
@@ -11,9 +11,9 @@
     <div class="row">
         <div class="col-md-12">
             <div class="text-center p-5">
-                <img class="ietflogo p-3"
-                     src="{% static 'ietf/images/ietf-logo.svg' %}"
-                     alt="IETF">
+                <div class="ietflogo mx-auto p-3">
+                    {% include "logo.html" with org="ietf" only %}
+                </div>
                 {% if server_mode != "production" %}
                     <h1 class="text-danger">Datatracker &ndash; {{ server_mode|capfirst }} Mode</h1>
                 {% else %}
diff --git a/ietf/templates/doc/htmlized_base.html b/ietf/templates/doc/htmlized_base.html
deleted file mode 100644
index e3624c0dfd..0000000000
--- a/ietf/templates/doc/htmlized_base.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html>
-{% load ietf_filters static %}
-{# Copyright The IETF Trust 2021, All Rights Reserved #}
-{% load origin %}
-{% origin %}
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>
-            {% block title %}No title{% endblock %}
-        </title>
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <style>
-            @media only screen
-            and (min-width: 992px)
-            and (max-width: 1199px) {
-                body { font-size: 14pt; }
-                div.content { width: 96ex; margin: 0 auto; }
-            }
-            @media only screen
-            and (min-width: 768px)
-            and (max-width: 991px) {
-                body { font-size: 14pt; }
-                div.content { width: 96ex; margin: 0 auto; }
-            }
-            @media only screen
-            and (min-width: 480px)
-            and (max-width: 767px) {
-                body { font-size: 11pt; }
-                div.content { width: 96ex; margin: 0 auto; }
-            }
-            @media only screen
-            and (max-width: 479px) {
-                body { font-size: 8pt; }
-                div.content { width: 96ex; margin: 0 auto; }
-            }
-            @media only screen
-            and (min-width : 375px)
-            and (max-width : 667px) {
-                body { font-size: 9.5pt; }
-                div.content { width: 96ex; margin: 0; }
-            }
-            @media only screen
-            and (min-width: 1200px) {
-                body { font-size: 10pt; margin: 0 4em; }
-                div.content { width: 96ex; margin: 0; }
-            }
-            h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-                font-weight: bold;
-                /* line-height: 0pt; */
-                display: inline;
-                white-space: pre;
-                font-family: monospace;
-                font-size: 1em;
-                font-weight: bold;
-            }
-            pre {
-                font-size: 1em;
-                margin-top: 0px;
-                margin-bottom: 0px;
-            }
-            .pre {
-                white-space: pre;
-                font-family: monospace;
-            }
-            .header{
-                font-weight: bold;
-            }
-            .newpage {
-                page-break-before: always;
-            }
-            .invisible {
-                text-decoration: none;
-                color: white;
-            }
-            @media print {
-                body {
-                    margin-top: 5em;
-                    font-family: monospace;
-                    font-size: 10.5pt;
-                }
-                h1, h2, h3, h4, h5, h6 {
-                    font-size: 1em;
-                }
-
-                a:link, a:visited {
-                    color: inherit;
-                    text-decoration: none;
-                }
-                .noprint {
-                    display: none;
-                }
-            }
-            @media screen {
-                .grey, .grey a:link, .grey a:visited {
-                    color: #777;
-                }
-                .meta-info {
-                    background-color: #EEE;
-                    width: 96ex;
-                }
-                .top {
-                    border-top: 7px solid #EEE;
-                }
-                .pad {
-                    padding-top: 7px;
-                    line-height: 24px;
-                    padding-bottom: 4px;
-                }
-                .bgwhite  { background-color: white; }
-                .bgred    { background-color: #F44; }
-                .bggrey   { background-color: #666; }
-                .bgbrown  { background-color: #840; }
-                .bgorange { background-color: #FA0; }
-                .bgyellow { background-color: #EE0; }
-                .bgmagenta{ background-color: #F4F; }
-                .bgblue   { background-color: #66F; }
-                .bgcyan   { background-color: #4DD; }
-                .bggreen  { background-color: #4F4; }
-
-                .legend   { font-size: 90%; }
-                .cplate   { font-size: 70%; border: solid grey 1px; }
-            }
-
-            {% block morecss %}{% endblock %}
-        </style>
-        {% block pagehead %}{% endblock %}
-        {% include "base/icons.html" %}
-    </head>
-    <body {% block bodyAttrs %}{% endblock %}>
-        <div class="content" id="content">
-            {% block content %}{{ content|safe }}{% endblock %}
-            {% block content_end %}{% endblock %}
-        </div>
-        {% block footer %}{% endblock %}
-    {% block js %}{% endblock %}
-</body>
-</html>
\ No newline at end of file
diff --git a/ietf/templates/doc/idnits2-state.txt b/ietf/templates/doc/idnits2-state.txt
index 7706549797..55fc78927a 100644
--- a/ietf/templates/doc/idnits2-state.txt
+++ b/ietf/templates/doc/idnits2-state.txt
@@ -1,7 +1,7 @@
 {% load ietf_filters %}{% filter linebreaks_lf %}{% comment %}
-{% endcomment %}Doc-tag: {{doc.name}};datatracker{% if doc.rfcnum %}
-Doc-rfcnum: {{doc.rfcnum}}{% endif %}
+{% endcomment %}Doc-tag: {{doc.name}};datatracker{% if doc.type_id == "rfc" %}
+Doc-rfcnum: {{doc.rfc_number}}{% endif %}
 Doc-created: {{doc.created|date:"Y-m-d"}};datatracker{% if doc.deststatus %}
 Doc-deststatus: {{doc.deststatus}};datatracker{% endif %}
 Doc-rev: {{doc.rev}};datatracker
-{% endfilter %}
\ No newline at end of file
+{% endfilter %}
diff --git a/ietf/templates/doc/index_active_drafts.html b/ietf/templates/doc/index_active_drafts.html
index 8d561b1c7e..607385f56f 100644
--- a/ietf/templates/doc/index_active_drafts.html
+++ b/ietf/templates/doc/index_active_drafts.html
@@ -5,7 +5,7 @@
 {% load cache %}
 {% block title %}Active Internet-Drafts{% endblock %}
 {% block content %}
-    {% cache 900 ietf_doc_index_active_drafts %}
+    {% cache 900 ietf_doc_index_active_drafts using="slowpages" %}
     {% origin %}
     <h1>Active Internet-Drafts</h1>
     <p>
@@ -29,7 +29,7 @@ <h1>Active Internet-Drafts</h1>
     </p>
     {% for group in groups %}
         <h2 class="mt-3" id="id-{{ group.acronym }}">{{ group.name }} ({{ group.acronym }})</h2>
-        {% for d in group.active_drafts %}
+        {% for d in group.active_drafts %}{# n.b., d is a dict, not a Document #}
             <div class="card mb-3">
                 <div class="card-body">
                     <b>{{ d.title }}.</b>
diff --git a/ietf/templates/doc/index_subseries.html b/ietf/templates/doc/index_subseries.html
new file mode 100644
index 0000000000..3180a4535d
--- /dev/null
+++ b/ietf/templates/doc/index_subseries.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin %}
+{% load static ietf_filters %}
+{% block title %}{{type.name}}s{% endblock %}
+{% block content %}
+  {% origin %}
+  <h1>{{type.name}}s</h1>
+  {% for doc in docs %}
+    <div class="card mb-3" id="{{doc.name}}">
+    <div class="card-header"><a href="{% url 'ietf.doc.views_doc.document_main' name=doc.name %}">{{doc.name|prettystdname}}</a></div>
+      <div class="card-body">
+        {% for rfc in doc.contains|dictsort:"rfc_number" %}
+          <p><a href="{% url 'ietf.doc.views_doc.document_main' name=rfc.name %}">{{rfc.name|prettystdname}}</a> : {{rfc.title}}</p>
+        {% empty %}
+          <p>{{doc.name|prettystdname}} currently contains no RFCs
+        {% endfor %}
+      </div>
+    </div>
+  {% endfor %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/investigate.html b/ietf/templates/doc/investigate.html
new file mode 100644
index 0000000000..8b613117d5
--- /dev/null
+++ b/ietf/templates/doc/investigate.html
@@ -0,0 +1,129 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2024, All Rights Reserved #}
+{% load django_bootstrap5 ietf_filters origin static %}
+{% block title %}Investigate{% endblock %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>Investigate</h1>
+    <div class="mb-3">
+        <form id="investigate" method="post">
+            {% csrf_token %}
+            {% bootstrap_form form %}
+            <button class="btn btn-primary" type="submit" id="investigate-button">
+                <span class="spinner-border spinner-border-sm investigation-indicator d-none"
+                      role="status"
+                      aria-hidden="true">
+                </span>
+                Investigate
+            </button>
+            <div class="alert alert-info mt-3 d-none investigation-indicator">
+                Please be patient, processing may take several minutes.
+            </div>
+        </form>
+    </div>
+    {% if results %}
+        <div id="results">
+            {% if results.can_verify %}
+                <h2>These can be authenticated</h2>
+                <table id="authenticated" class="table table-sm table-striped tablesorter">
+                    <thead>
+                    <tr>
+                        <th scope="col" data-sort="name">Name</th>
+                        <th scope="col" data-sort="modified">Last Modified On</th>
+                        <th scope="col" data-sort="link">Link</th>
+                        <th scope="col" data-sort="source">Source</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for path in results.can_verify %}
+                        {% with url=path|url_for_path %}
+                            <tr>
+                                <td>{{ path.name }}</td>
+                                <td>
+                                    {% if path|mtime_is_epoch %}
+                                        Timestamp has been lost (is Unix Epoch)
+                                    {% else %}
+                                        {{ path|mtime|date:"DATETIME_FORMAT" }}
+                                    {% endif %}
+                                </td>
+                                <td><a href="{{ url }}">{{ url }}</a></td>
+                                <td>{{ path }}</td>
+                            </tr>
+                        {% endwith %}
+                    {% endfor %}
+                    </tbody>
+                </table>
+            {% else %}
+                <h2>Nothing with this name fragment can be authenticated</h2>
+            {% endif %}
+            <hr>
+            {% if results.unverifiable_collections %}
+                <h2>These are in the archive, but cannot be authenticated</h2>
+                <table id="unverifiable" class="table table-sm table-striped tablesorter">
+                    <thead>
+                    <tr>
+                        <th scope="col" data-sort="name">Name</th>
+                        <th scope="col" data-sort="modified">Last Modified On</th>
+                        <th scope="col" data-sort="link">Link</th>
+                        <th scope="col" data-sort="source">Source</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for path in results.unverifiable_collections %}
+                        {% with url=path|url_for_path %}
+                            <tr>
+                                <td>{{ path.name }}</td>
+                                <td>
+                                    {% if path|mtime_is_epoch %}
+                                        Timestamp has been lost (is Unix Epoch)
+                                    {% else %}
+                                        {{ path|mtime|date:"DATETIME_FORMAT" }}
+                                    {% endif %}
+                                </td>
+                                <td><a href="{{ url }}">{{ url }}</a></td>
+                                <td>{{ path }}</td>
+                            </tr>
+                        {% endwith %}
+                    {% endfor %}
+                    </tbody>
+                </table>
+            {% endif %}
+            {% if results.unexpected %}
+                <h2>These are unexpected and we do not know what their origin is. These cannot be authenticated</h2>
+                <table id="unexpected" class="table table-sm table-striped tablesorter">
+                    <thead>
+                    <tr>
+                        <th scope="col" data-sort="name">Name</th>
+                        <th scope="col" data-sort="modified">Last Modified On</th>
+                        <th scope="col" data-sort="link">Link</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for path in results.unexpected %}
+                        {% with url=path|url_for_path %}
+                            <tr>
+                                <td>{{ path.name }}</td>
+                                <td>
+                                    {% if path|mtime_is_epoch %}
+                                        Timestamp has been lost (is Unix Epoch)
+                                    {% else %}
+                                        {{ path|mtime|date:"DATETIME_FORMAT" }}
+                                    {% endif %}
+                                </td>
+                                <td><a href="{{ url }}">{{ url }}</a></td>
+                            </tr>
+                        {% endwith %}
+                    {% endfor %}
+                    </tbody>
+                </table>
+            {% endif %}
+        </div>
+    {% endif %}
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+    <script src="{% static "ietf/js/investigate.js" %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/irsg_ballot_status.html b/ietf/templates/doc/irsg_ballot_status.html
index 017866eb25..f295b968c0 100644
--- a/ietf/templates/doc/irsg_ballot_status.html
+++ b/ietf/templates/doc/irsg_ballot_status.html
@@ -10,24 +10,28 @@
 {% block content %}
     {% origin %}
     <h1>IRSG ballot status</h1>
-    <table class="table table-sm table-striped tablesorter">
-        <thead>
-            <tr>
-                <th scope="col" data-sort="doc">Document</th>
-                <th scope="col" data-sort="status">Status</th>
-            </tr>
-        </thead>
-        {% if docs %}
-            <tbody>
-                {% for doc in docs %}
-                    <tr>
-                        <td>{{ doc.displayname_with_link }}</td>
-                        {% include "doc/search/status_columns.html" %}
-                    </tr>
-                {% endfor %}
-            </tbody>
-        {% endif %}
-    </table>
+    {% if docs %}
+        <table class="table table-sm table-striped tablesorter">
+            <thead>
+                <tr>
+                    <th scope="col" data-sort="doc">Document</th>
+                    <th scope="col" data-sort="status">Status</th>
+                </tr>
+            </thead>
+                <tbody>
+                    {% for doc in docs %}
+                        <tr>
+                            <td>{{ doc.displayname_with_link }}</td>
+                            {% include "doc/search/status_columns.html" %}
+                        </tr>
+                    {% endfor %}
+                </tbody>
+        </table>
+    {% else %}
+        <p class="alert alert-info my-3">
+            No open IRSG ballots.
+        </p>
+    {% endif %}
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
diff --git a/ietf/templates/doc/mail/ballot_writeup.txt b/ietf/templates/doc/mail/ballot_writeup.txt
index c808e5a4a7..74871e5a86 100644
--- a/ietf/templates/doc/mail/ballot_writeup.txt
+++ b/ietf/templates/doc/mail/ballot_writeup.txt
@@ -1,11 +1,12 @@
-{% autoescape off %}
-Technical Summary
-
+{% load ietf_filters %}{% autoescape off %}Technical Summary
+{% if doc.abstract %}
+{{ doc.abstract.rstrip }}
+{% else %}
    Relevant content can frequently be found in the abstract
    and/or introduction of the document.  If not, this may be 
    an indication that there are deficiencies in the abstract
    or introduction.
-
+{% endif %}
 Working Group Summary
 
    Was there anything in the WG process that is worth noting?
@@ -26,23 +27,14 @@ Document Quality
    Review, on what date was the request posted?
 
 Personnel
-
+{% if doc.shepherd and doc.ad %}{% filter wordwrap:"76" %}
+   The Document Shepherd for this document is {{ doc.shepherd.person.name }}. The Responsible Area Director is {{ doc.ad.name }}.{% endfilter %}
+{% else %}
    Who is the Document Shepherd for this document?  Who is the 
-   Responsible Area Director?  If the document requires IANA
-   experts(s), insert 'The IANA Expert(s) for the registries
-   in this document are <TO BE ADDED BY THE AD>.'
-
-IRTF Note
-
-  (Insert IRTF Note here or remove section)
-
-IESG Note
-
-  (Insert IESG Note here or remove section)
-
+   Responsible Area Director?
+{% endif %}
 IANA Note
 {% if iana %}
-  {% load ietf_filters %}{% filter wordwrap:"76"|indent:2 %}{{ iana }}{% endfilter %}
+  {% filter wordwrap:"76"|indent:2 %}{{ iana }}{% endfilter %}
 {% endif %}
-  (Insert IANA Note here or remove section)
-{% endautoescape%}
+  (Insert IANA Note here or remove section){% endautoescape%}
diff --git a/ietf/templates/doc/mail/close_rsab_ballot_mail.txt b/ietf/templates/doc/mail/close_rsab_ballot_mail.txt
new file mode 100644
index 0000000000..10d5c55d4e
--- /dev/null
+++ b/ietf/templates/doc/mail/close_rsab_ballot_mail.txt
@@ -0,0 +1,3 @@
+{% load ietf_filters %}{% load mail_filters %}{% autoescape off %} {% filter wordwrap:78 %}The RSAB ballot for {{ doc.file_tag }} has been closed. The evaluation for this document can be found at {{ doc_url }}{% endfilter %}
+
+{% endautoescape%}
diff --git a/ietf/templates/doc/mail/issue_rsab_ballot_mail.txt b/ietf/templates/doc/mail/issue_rsab_ballot_mail.txt
new file mode 100644
index 0000000000..302fcad8ee
--- /dev/null
+++ b/ietf/templates/doc/mail/issue_rsab_ballot_mail.txt
@@ -0,0 +1,6 @@
+{% load ietf_filters %}{% load mail_filters %}{% autoescape off %}{% filter wordwrap:78 %}Evaluation for {{ doc.file_tag }} can be found at {{ doc_url }}
+
+{% endfilter %}
+{% filter wordwrap:78 %}{{ needed_ballot_positions }}{% endfilter %}
+
+{% endautoescape%}
diff --git a/ietf/templates/doc/mail/last_call_announcement.txt b/ietf/templates/doc/mail/last_call_announcement.txt
index 79abcc1488..5cf2e9c45b 100644
--- a/ietf/templates/doc/mail/last_call_announcement.txt
+++ b/ietf/templates/doc/mail/last_call_announcement.txt
@@ -33,7 +33,7 @@ No IPR declarations have been submitted directly on this I-D.
 {% if downrefs %}
 The document contains these normative downward references.
 See RFC 3967 for additional information: 
-{% for ref in downrefs %}    {{ref.target.document.canonical_name}}: {{ref.target.document.title}} ({{ref.target.document.std_level}} - {{ref.target.document.stream.desc}})
+{% for ref in downrefs %}    {{ref.target.name}}: {{ref.target.title}} ({{ref.target.std_level}} - {{ref.target.stream.desc}} stream)
 {% endfor %}{%endif%}
 
 {% endautoescape %}
diff --git a/ietf/templates/doc/mail/resurrect_completed_email.txt b/ietf/templates/doc/mail/resurrect_completed_email.txt
index 7b5e52be5b..18e3d3dfa8 100644
--- a/ietf/templates/doc/mail/resurrect_completed_email.txt
+++ b/ietf/templates/doc/mail/resurrect_completed_email.txt
@@ -1,4 +1,4 @@
-{% autoescape off %}As you requsted, the Internet Draft {{ doc.file_tag }}
+{% autoescape off %}As you requested, the Internet-Draft {{ doc.file_tag }}
 has been resurrected.
 
 Datatracker URL: {{ url }}
diff --git a/ietf/templates/doc/mail/wg_call_for_adoption_issued.txt b/ietf/templates/doc/mail/wg_call_for_adoption_issued.txt
new file mode 100644
index 0000000000..15ace9495b
--- /dev/null
+++ b/ietf/templates/doc/mail/wg_call_for_adoption_issued.txt
@@ -0,0 +1,31 @@
+{% load ietf_filters %}{% load mail_filters %}{% autoescape off %}{% filter wordwrap:78 %}This message starts a {{group.acronym}} WG Call for Adoption of:
+{{ doc.name }}-{{ doc.rev }}
+
+
+This Working Group Call for Adoption ends on {{ end_date }}
+
+Abstract: 
+{{ doc.abstract }}
+
+Please reply to this message and indicate whether or not you support adoption of this Internet-Draft by the {{group.acronym}} WG. Comments to explain your preference are greatly appreciated. Please reply to all recipients of this message and include this message in your response.
+
+Authors, and WG participants in general, are reminded of the Intellectual Property Rights (IPR) disclosure obligations described in BCP 79 [2]. Appropriate IPR disclosures required for full conformance with the provisions of BCP 78 [1] and BCP 79 [2] must be filed, if you are aware of any. Sanctions available for application to violators of IETF IPR Policy can be found at [3].
+
+Thank you.
+[1] https://datatracker.ietf.org/doc/bcp78/
+[2] https://datatracker.ietf.org/doc/bcp79/
+[3] https://datatracker.ietf.org/doc/rfc6701/
+
+The IETF datatracker status page for this Internet-Draft is:
+{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=doc.name %}
+{% if doc.submission.xml_version == "3" %}
+There is also an HTML version available at:
+{{ settings.IETF_ID_ARCHIVE_URL }}{{ doc.name }}-{{ doc.rev }}.html{% else %}
+There is also an HTMLized version available at:
+{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=doc.name rev=doc.rev %}{% endif %}
+{% if doc.rev != "00" %}
+A diff from the previous version is available at:
+{{settings.RFCDIFF_BASE_URL}}?url2={{ doc.name }}-{{ doc.rev }}
+{% endif %}
+{% endfilter %}
+{% endautoescape %}
diff --git a/ietf/templates/doc/mail/wg_last_call_issued.txt b/ietf/templates/doc/mail/wg_last_call_issued.txt
new file mode 100644
index 0000000000..114f8bc5e2
--- /dev/null
+++ b/ietf/templates/doc/mail/wg_last_call_issued.txt
@@ -0,0 +1,34 @@
+{% load ietf_filters %}{% load mail_filters %}{% autoescape off %}{% filter wordwrap:78 %}This message starts a WG Last Call for:
+{{ doc.name }}-{{ doc.rev }}
+
+This Working Group Last Call ends on {{ end_date }}
+
+Abstract: 
+{{ doc.abstract }}
+
+File can be retrieved from:
+{{ url }}
+
+Please review and indicate your support or objection to proceed with the publication of this document by replying to this email keeping {{ wg_list }} in copy. Objections should be explained and suggestions to resolve them are highly appreciated.
+
+Authors, and WG participants in general, are reminded of the Intellectual Property Rights (IPR) disclosure obligations described in BCP 79 [1]. Appropriate IPR disclosures required for full conformance with the provisions of BCP 78 [1] and BCP 79 [2] must be filed, if you are aware of any. Sanctions available for application to violators of IETF IPR Policy can be found at [3].
+
+Thank you.
+
+[1] https://datatracker.ietf.org/doc/bcp78/
+[2] https://datatracker.ietf.org/doc/bcp79/
+[3] https://datatracker.ietf.org/doc/rfc6701/
+
+The IETF datatracker status page for this Internet-Draft is:
+{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=doc.name %}
+{% if doc.submission.xml_version == "3" %}
+There is also an HTML version available at:
+{{ settings.IETF_ID_ARCHIVE_URL }}{{ doc.name }}-{{ doc.rev }}.html{% else %}
+There is also an HTMLized version available at:
+{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=doc.name rev=doc.rev %}{% endif %}
+{% if doc.rev != "00" %}
+A diff from the previous version is available at:
+{{settings.RFCDIFF_BASE_URL}}?url2={{ doc.name }}-{{ doc.rev }}
+{% endif %}
+{% endfilter %}
+{% endautoescape %}
diff --git a/ietf/templates/doc/material/all_presentations.html b/ietf/templates/doc/material/all_presentations.html
index 4c0a8d698e..b5ea1f3718 100644
--- a/ietf/templates/doc/material/all_presentations.html
+++ b/ietf/templates/doc/material/all_presentations.html
@@ -10,7 +10,7 @@
     <h1>
         Sessions linked to
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     {% if user|has_role:"Secretariat,Area Director,WG Chair,WG Secretary,RG Chair,RG Secretary,IRTF Chair,Team Chair" %}
         <div class="buttonlist">
diff --git a/ietf/templates/doc/material/choose_material_type.html b/ietf/templates/doc/material/choose_material_type.html
index 041209bc6b..f76fcd8304 100644
--- a/ietf/templates/doc/material/choose_material_type.html
+++ b/ietf/templates/doc/material/choose_material_type.html
@@ -8,7 +8,7 @@
     <h1>
         Upload Material
         <br>
-        <small class="text-muted">{{ group.name }} ({{ group.acronym }})</small>
+        <small class="text-body-secondary">{{ group.name }} ({{ group.acronym }})</small>
     </h1>
     <p class="mt-3">
         Select what kind of material you wish to upload:
diff --git a/ietf/templates/doc/material/edit_material.html b/ietf/templates/doc/material/edit_material.html
index 1d64baf532..a613bc1e0b 100644
--- a/ietf/templates/doc/material/edit_material.html
+++ b/ietf/templates/doc/material/edit_material.html
@@ -25,7 +25,7 @@ <h1 class="mb-3">
         {% endif %}
         {{ material_type|lower }}
         <br>
-        <small class="text-muted">
+        <small class="text-body-secondary">
             {% if group is not None %}
                 {{ group.name }} ({{ group.acronym }})
             {% elif doc.meeting_related %}
diff --git a/ietf/templates/doc/notprepped_wrapper.html b/ietf/templates/doc/notprepped_wrapper.html
new file mode 100644
index 0000000000..078db7bc51
--- /dev/null
+++ b/ietf/templates/doc/notprepped_wrapper.html
@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2026, All Rights Reserved #}
+{% load origin %}
+{% block title %}RFC {{ rfc.rfc_number }} — Not-prepped XML{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>RFC {{ rfc.rfc_number }} — Not-prepped XML</h1>
+    <p>
+        The <em>not-prepped</em> XML 
+        is the RFC XML v3 source for an RFC at the moment in the publication process
+        just before the prep tool was used to expand default
+        values, generate section numbers, resolve cross-references, and embed
+        boilerplate.  
+    </p><p>   
+        It is useful for authors who want to begin a new draft based on
+        the RFC's text, such as when creating a bis-draft, and for tools that process 
+        author-facing RFC XML.
+    </p>
+    <p>
+        <a class="btn btn-primary"
+           href="{% url 'ietf.doc.views_doc.rfcxml_notprepped' number=rfc.rfc_number %}">
+            <i class="bi bi-download"></i>
+            Download not-prepped XML for RFC {{ rfc.rfc_number }}
+        </a>
+    </p>
+{% endblock %}
diff --git a/ietf/templates/doc/opengraph.html b/ietf/templates/doc/opengraph.html
index 239b081af4..1c8c5abe91 100644
--- a/ietf/templates/doc/opengraph.html
+++ b/ietf/templates/doc/opengraph.html
@@ -1,9 +1,9 @@
-{# Copyright The IETF Trust 2016-2020, All Rights Reserved #}
+{# Copyright The IETF Trust 2016-2025, All Rights Reserved #}
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
 {% origin %}
-<meta property="og:title" content="{% if doc.get_state_slug == 'rfc' and not snapshot %}RFC {{ rfc_number }}: {% endif %}{{ doc.title }}">
+<meta property="og:title" content="{% if doc.type_id == 'rfc' and not snapshot %}RFC {{ rfc_number }}: {% endif %}{{ doc.title }}">
 <meta property="og:url" content="{{ settings.IDTRACKER_BASE_URL }}{{ request.path }}">
 <link rel="canonical" href="{{ settings.IDTRACKER_BASE_URL }}{{ request.path }}">
 <meta property="og:site_name" content="IETF Datatracker">
@@ -36,7 +36,7 @@
 {% else %}{# TODO: We need a card image for individual I-Ds. #}
 <meta property="article:section" content="Individual Internet-Draft">
 {% endif %}
-{% for author in doc.documentauthor_set.all %}<meta property="article:author" content="{{ author.person.name}}">
-{% endfor %}
+{% if doc.pk %}{% for author_name in doc.author_names %}<meta property="article:author" content="{{ author_name }}">
+{% endfor %}{% endif %}
 {% if published %}<meta property="article:published_time" content="{{ published.time|date:'Y-m-d' }}">{% endif %}
 {% if expires %}<meta property="article:expiration_time" content="{{ expires.time|date:'Y-m-d' }}">{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/recent_drafts.html b/ietf/templates/doc/recent_drafts.html
index 339bb3d3c4..9674ba8b66 100644
--- a/ietf/templates/doc/recent_drafts.html
+++ b/ietf/templates/doc/recent_drafts.html
@@ -13,7 +13,7 @@ <h1>
         Internet-Drafts submitted during the last {{ days|default:7 }} days
         {% if pages %}
             <br>
-            <small class="text-muted">{{ pages }} pages</small>
+            <small class="text-body-secondary">{{ pages }} pages</small>
         {% endif %}
     </h1>
     {% include "doc/search/search_results.html" with start_table=True end_table=True %}
diff --git a/ietf/templates/doc/remind_action_holders.html b/ietf/templates/doc/remind_action_holders.html
index be6a4ed46d..0e7ce9d5ce 100644
--- a/ietf/templates/doc/remind_action_holders.html
+++ b/ietf/templates/doc/remind_action_holders.html
@@ -10,7 +10,7 @@
     <h1>
         Send reminder to action holder{{ doc.action_holders.all|pluralize }}
         <br>
-        <small class="text-muted">{{ titletext }}</small>
+        <small class="text-body-secondary">{{ titletext }}</small>
     </h1>
     <form enctype="multipart/form-data" method="post">
         {% csrf_token %}
@@ -27,7 +27,7 @@ <h1>
                 name="submit"
                 value="Send reminder">Send</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/remove_sessionpresentation.html b/ietf/templates/doc/remove_sessionpresentation.html
index 79bda98b78..b519b73b36 100644
--- a/ietf/templates/doc/remove_sessionpresentation.html
+++ b/ietf/templates/doc/remove_sessionpresentation.html
@@ -8,7 +8,7 @@
     <h1>
         Confirm removing from session
         <br>
-        <small class="text-muted">{{ sp.document.name }}</small>
+        <small class="text-body-secondary">{{ sp.document.name }}</small>
     </h1>
     {% if sp.session.is_material_submission_cutoff %}
         <p class="alert alert-warning my-3">
diff --git a/ietf/templates/doc/review/assign_reviewer.html b/ietf/templates/doc/review/assign_reviewer.html
index c4aca8d0f0..a5c7c6622f 100644
--- a/ietf/templates/doc/review/assign_reviewer.html
+++ b/ietf/templates/doc/review/assign_reviewer.html
@@ -7,7 +7,7 @@
     <h1>
         Assign reviewer
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
     <form method="post">
@@ -15,7 +15,7 @@ <h1>
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary" name="action" value="assign">Assign reviewer</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_review.review_request" name=doc.canonical_name request_id=review_req.pk %}">
+           href="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/review/close_request.html b/ietf/templates/doc/review/close_request.html
index cf0a6d0908..4e0f435911 100644
--- a/ietf/templates/doc/review/close_request.html
+++ b/ietf/templates/doc/review/close_request.html
@@ -7,7 +7,7 @@
     <h1>
         Close review request
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
     <p class="alert alert-info my-3">
@@ -18,7 +18,7 @@ <h1>
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Close request</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_review.review_request" name=doc.canonical_name request_id=review_req.pk %}">
+           href="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html
index 561aa8ca09..8aeb1486a4 100644
--- a/ietf/templates/doc/review/complete_review.html
+++ b/ietf/templates/doc/review/complete_review.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2016, All Rights Reserved #}
+{# Copyright The IETF Trust 2016-2024, All Rights Reserved #}
 {% load origin django_bootstrap5 static person_filters textfilters %}
 {% block title %}
     {% if revising_review %}
@@ -26,7 +26,7 @@ <h1>
         {% endif %}
         review
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     {% if assignment %}
         <table class="my-3 table table-sm table-borderless">
@@ -66,9 +66,7 @@ <h1>
         </p>
         <p>
             If you enter the review below, the review will be sent
-            to {{ review_to|join:", "|linkify }}
-            {% if review_cc %}, with a CC to {{ review_cc|join:", "|linkify }}{% endif %}
-            .
+            to {% for addr in review_to %}{{ addr|linkify }}{% if not forloop.last %}, {% endif %}{% endfor %}{% if review_cc %}, with a CC to {% for addr in review_cc %}{{ addr|linkify }}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}.
         </p>
     {% elif assignment %}
         <p>
@@ -88,21 +86,27 @@ <h1>
         </button>
         {% if assignment %}
             <a class="btn btn-secondary float-end"
-               href="{% url "ietf.doc.views_review.review_request" name=doc.canonical_name request_id=assignment.review_request.pk %}">
+               href="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=assignment.review_request.pk %}">
                 Back
             </a>
         {% else %}
             <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
         {% endif %}
         <div class="template d-none">
-            {% if mail_archive_query_urls %}
-                <div class="mail-archive-search">
+            {% if mail_archive_query_data %}
+                <div class="mail-archive-search"
+                    {% if assignment %}
+                     data-search-mail-archive-url="{% url "ietf.doc.views_review.search_mail_archive" name=doc.name assignment_id=assignment.pk %}"
+                    {% else %}
+                     data-search-mail-archive-url="{% url "ietf.doc.views_review.search_mail_archive" name=doc.name acronym=team.acronym %}"
+                    {% endif %}
+                     data-is-reviewer="{{ is_reviewer|yesno:"true,false" }}">
                     <div class="offset-md-2 col-md-10">
-                        <label for="mail-archive-subjects" class="form-label">Search mail archive subjects for:</label>
+                        <label for="mail-archive-subjects" class="form-label">Search {{team.list_email}} mail archive subjects for:</label>
                         <div class="input-group mb-3">
                             <input type="text" id="mail-archive-subjects"
                                    class="query-input form-control"
-                                   value="{{ mail_archive_query_urls.query }}">
+                                   value="{{ mail_archive_query_data.query_value }}">
                             <button type="button" class="search btn btn-primary">Search</button>
                         </div>
                         <div class="retrieving d-none my-3">
@@ -129,7 +133,7 @@ <h1>
                 </div>
             {% else %}
                 <div class="mail-archive-search">
-                    <small class="text-muted">Mailing list does not have a recognized ietf.org archive. Auto-searching disabled.</small>
+                    <small class="text-body-secondary">Mailing list does not have a recognized ietf.org archive. Auto-searching disabled.</small>
                 </div>
             {% endif %}
         </div>
@@ -146,13 +150,5 @@ <h1>
 {% endblock %}
 {% block js %}
     <script src="{% static 'ietf/js/datepicker.js' %}"></script>
-    <script>
-        {% if assignment %}
-            var searchMailArchiveUrl = "{% url "ietf.doc.views_review.search_mail_archive" name=doc.name assignment_id=assignment.pk %}";
-        {% else %}
-            var searchMailArchiveUrl = "{% url "ietf.doc.views_review.search_mail_archive" name=doc.name acronym=team.acronym %}";
-        {% endif %}
-        var isReviewer = {{ is_reviewer|yesno:'true,false' }};
-    </script>
     <script src="{% static 'ietf/js/complete-review.js' %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/review/edit_request_comment.html b/ietf/templates/doc/review/edit_request_comment.html
index b2196cbcb5..50afa19acb 100644
--- a/ietf/templates/doc/review/edit_request_comment.html
+++ b/ietf/templates/doc/review/edit_request_comment.html
@@ -7,14 +7,14 @@
     <h1>
         Edit review request comment
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Save</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_review.review_request" name=review_req.doc.canonical_name request_id=review_req.pk %}">
+           href="{% url "ietf.doc.views_review.review_request" name=review_req.doc.name request_id=review_req.pk %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/review/edit_request_deadline.html b/ietf/templates/doc/review/edit_request_deadline.html
index a1ae542bd5..7706f96396 100644
--- a/ietf/templates/doc/review/edit_request_deadline.html
+++ b/ietf/templates/doc/review/edit_request_deadline.html
@@ -10,14 +10,14 @@
     <h1>
         Edit review request deadline
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Save</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_review.review_request" name=review_req.doc.canonical_name request_id=review_req.pk %}">
+           href="{% url "ietf.doc.views_review.review_request" name=review_req.doc.name request_id=review_req.pk %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html b/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html
index b2e8f1af75..4bc4254785 100644
--- a/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html
+++ b/ietf/templates/doc/review/mark_reviewer_assignment_no_response.html
@@ -7,7 +7,7 @@
     <h1>
         Review assignment: No-Response
         <br>
-        <small class="text-muted">{{ assignment.review_request.doc.name }}</small>
+        <small class="text-body-secondary">{{ assignment.review_request.doc.name }}</small>
     </h1>
     <p class="my-3">
         Mark review assignment for {% person_link assignment.reviewer.person %} as <strong>No Response</strong>.
@@ -19,7 +19,7 @@ <h1>
                 name="action"
                 value="noresponse">Mark assignment as no-response</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_review.review_request" name=assignment.review_request.doc.canonical_name request_id=assignment.review_request.pk %}">
+           href="{% url "ietf.doc.views_review.review_request" name=assignment.review_request.doc.name request_id=assignment.review_request.pk %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/review/reject_reviewer_assignment.html b/ietf/templates/doc/review/reject_reviewer_assignment.html
index eca2295579..7fbde360cd 100644
--- a/ietf/templates/doc/review/reject_reviewer_assignment.html
+++ b/ietf/templates/doc/review/reject_reviewer_assignment.html
@@ -7,10 +7,10 @@
     <h1>
         Reject review assignment
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
-    {% if not review_request_past_deadline %}
+    {% if allow_reject_request %}
         <p class="alert alert-danger my-3">
             Do you want to reject this assignment?
         </p>
@@ -18,7 +18,7 @@ <h1>
             {% csrf_token %}
             {% bootstrap_form form %}
             <a class="btn btn-secondary float-end"
-               href="{% url "ietf.doc.views_review.review_request" name=doc.canonical_name request_id=review_req.pk %}">
+               href="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}">
                 Back
             </a>
             <button type="submit" class="btn btn-warning" name="action" value="reject">Reject assignment</button>
diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html
index be7a64355c..51aea10a02 100644
--- a/ietf/templates/doc/review/request_info.html
+++ b/ietf/templates/doc/review/request_info.html
@@ -1,7 +1,7 @@
 {# Copyright The IETF Trust 2017, All Rights Reserved #}
 {% load origin django_bootstrap5 %}
 {% origin %}
-{% load person_filters %}
+{% load person_filters ietf_filters %}
 <table class="my-3 table table-sm table-borderless">
     <tbody class="meta border-top">
         <tr>
@@ -27,7 +27,7 @@
                     No specific revision
                 {% endif %}
                 {% if review_req.reviewed_rev != review_req.doc.rev %}
-                    <span class="text-muted">(document currently at {{ review_req.doc.rev }})</span>
+                    <span class="text-body-secondary">(document currently at {{ review_req.doc.rev }})</span>
                 {% endif %}
             </td>
         </tr>
@@ -74,13 +74,13 @@
                 <td>{% person_link review_req.requested_by %}</td>
             </tr>
         {% endif %}
-        {% if review_req.doc.authors %}
+        {% if review_req.doc.author_persons_or_names %}
             <tr>
                 <td></td>
                 <th scope="row">Authors</th>
                 <td>
-                    {% for author in review_req.doc.authors %}
-                        {% person_link author %}{% if not forloop.last %},{% endif %}
+                    {% for person, tp_name in review_req.doc.author_persons_or_names %}
+                        {% if person %}{% person_link person %}{% else %}<span>{{ tp_name }}</span>{% endif %}{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </td>
             </tr>
@@ -96,15 +96,18 @@
                 </td>
             </tr>
         {% endif %}
-        {% if doc.time %}
+        {% if review_req.doc.time %}
             <tr>
                 <th scope="row">
                 </th>
                 <th scope="row">
-                    Draft last updated
+                    I-D last updated
                 </th>
                 <td>
-                    {{ doc.time|date:"Y-m-d" }}
+                    {{ review_req.doc.time|date:"Y-m-d" }}
+                    {% if review_req.doc.pub_date %}
+                        <span class="text-body-secondary">(Latest revision {{ review_req.doc.pub_date|date:"Y-m-d" }})</span>
+                    {% endif %}
                 </td>
             </tr>
         {% endif %}
@@ -177,6 +180,8 @@
                         <div class="reviewer-assignment-not-accepted">
                             {% if assignment.state_id == "assigned" %}
                                 Assignment not accepted yet
+                            {% elif assignment.state_id == "rejected" %}
+                                <span class="text-danger">Assignment rejected</span>
                             {% else %}
                                 <span class="text-success">Assignment accepted</span>
                             {% endif %}
@@ -217,17 +222,29 @@
                     State
                 </th>
                 <td>
-                    <span class="{% if assignment.state.name|slugify == 'accepted' %}text-success{% endif %}">
-                        {{ assignment.state.name }}
-                    </span>
+                    {{ assignment.state.name|badgeify }}
                     {% if snapshot %}
-                        <span class="badge rounded-pill bg-warning">
+                        <span class="badge rounded-pill text-bg-warning">
                             Snapshot
                         </span>
                     {% endif %}
                 </td>
             </tr>
-            {% if assignment.state_id != "withdrawn" and assignment.state_id != "no-response" and assignment.state_id != "rejected" %}
+	    {% if doc == assignment.review %}
+	    <tr>
+	      <th scope="row">
+	      </th>
+	      <th scope="row">
+		Request
+	      </th>
+	      <td>
+		<a href="{% url "ietf.doc.views_review.review_request" request_id=review_req.id name=review_req.doc.name %}">
+		  {{ review_req }}
+		</a>
+	      </td>
+	    </tr>
+	    {% endif %}
+            {% if assignment.state_id != "withdrawn" and assignment.state_id != "no-response" and assignment.state_id != "rejected" and doc != assignment.review%}
                 <tr>
                     <th scope="row">
                     </th>
@@ -312,8 +329,8 @@
                     <th scope="row">
                         Result
                     </th>
-                    <td class="{% if assignment.result.name|slice:5 == 'Ready' %}text-success{% else %}text-danger{% endif %}">
-                        {{ assignment.result.name }}
+                    <td>
+                        {{ assignment.result.name|badgeify }}
                     </td>
                 </tr>
             {% endif %}
@@ -339,4 +356,4 @@
         </i>
         Assign reviewer
     </a>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/ietf/templates/doc/review/request_review.html b/ietf/templates/doc/review/request_review.html
index 220ca4fe90..b765871d65 100644
--- a/ietf/templates/doc/review/request_review.html
+++ b/ietf/templates/doc/review/request_review.html
@@ -11,7 +11,7 @@
     <h1>
         Request review
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="my-3">
         Submit a request to have the document reviewed.
@@ -44,7 +44,7 @@ <h1>
         {% bootstrap_field form.comment layout="horizontal" %}
         <button type="submit" class="btn btn-primary">Request review</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/review/review_request.html b/ietf/templates/doc/review/review_request.html
index 6ae15b08a3..85335aab6e 100644
--- a/ietf/templates/doc/review/review_request.html
+++ b/ietf/templates/doc/review/review_request.html
@@ -10,7 +10,7 @@
     <h1>
         Review request
         <br>
-        <small class="text-muted">{{ review_req.doc.name }}</small>
+        <small class="text-body-secondary">{{ review_req.doc.name }}</small>
     </h1>
     {% include "doc/review/request_info.html" %}
     {% if can_close_request %}
@@ -21,6 +21,15 @@ <h1>
         </a>
     {% endif %}
     <h2 class="mt-5">History</h2>
+    {% if can_add_comment %}
+        <div class="buttonlist">
+            <a class="btn btn-primary"
+               href="{% url 'ietf.doc.views_review.add_request_comment' name=doc.name request_id=review_req.pk %}">
+                <i class="bi bi-plus"></i>
+                Add comment
+            </a>
+        </div>
+    {% endif %}
     <div id="history">
         <table class="table table-sm table-striped tablesorter">
             <thead>
@@ -30,6 +39,7 @@ <h2 class="mt-5">History</h2>
                     <th scope="col" data-sort="description">Description</th>
                 </tr>
             </thead>
+	    <tbody>
             {% for h in history %}
                 {% if h.history_change_reason %}
                     <tr>
@@ -39,6 +49,7 @@ <h2 class="mt-5">History</h2>
                     </tr>
                 {% endif %}
             {% endfor %}
+	    </tbody>
         </table>
     </div>
 {% endblock %}
diff --git a/ietf/templates/doc/review/review_wish_add.html b/ietf/templates/doc/review/review_wish_add.html
index bd2df52ce8..73ce549288 100644
--- a/ietf/templates/doc/review/review_wish_add.html
+++ b/ietf/templates/doc/review/review_wish_add.html
@@ -7,7 +7,7 @@
     <h1>
         Add review wish
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="my-3">
         You are a reviewer for multiple teams, and need to select a team first.
diff --git a/ietf/templates/doc/review/review_wishes_remove.html b/ietf/templates/doc/review/review_wishes_remove.html
index aadf3c5deb..ee30c3cfcc 100644
--- a/ietf/templates/doc/review/review_wishes_remove.html
+++ b/ietf/templates/doc/review/review_wishes_remove.html
@@ -8,7 +8,7 @@ <h1>
         Remove review wish
         {% if doc.name %}
             <br>
-            <small class="text-muted">{{ doc.name }}</small>
+            <small class="text-body-secondary">{{ doc.name }}</small>
         {% endif %}
     </h1>
     <form class="my-3" method="post">
diff --git a/ietf/templates/doc/review/submit_unsolicited_review.html b/ietf/templates/doc/review/submit_unsolicited_review.html
index 3f52c2bc75..5db7e9cd62 100644
--- a/ietf/templates/doc/review/submit_unsolicited_review.html
+++ b/ietf/templates/doc/review/submit_unsolicited_review.html
@@ -7,7 +7,7 @@
     <h1>
         Submit unsolicited review
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         You are submitting an <strong>unsolicited</strong> review for this document.
@@ -18,7 +18,7 @@ <h1>
         {% bootstrap_form form layout="horizontal" %}
         <button type="submit" class="btn btn-primary">Continue</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/review/withdraw_reviewer_assignment.html b/ietf/templates/doc/review/withdraw_reviewer_assignment.html
index 6ff1f926b2..aed48ba78b 100644
--- a/ietf/templates/doc/review/withdraw_reviewer_assignment.html
+++ b/ietf/templates/doc/review/withdraw_reviewer_assignment.html
@@ -7,7 +7,7 @@
     <h1>
         Withdraw review assignment
         <br>
-        <small class="text-muted">{{ assignment.review_request.doc.name }}</small>
+        <small class="text-body-secondary">{{ assignment.review_request.doc.name }}</small>
     </h1>
     <p class="my-3 alert alert-warning">
         Withdraw review assignment for {% person_link assignment.reviewer.person %}.
@@ -16,7 +16,7 @@ <h1>
         {% csrf_token %}
         <button type="submit" class="btn btn-primary" name="action" value="withdraw">Withdraw assignment</button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_review.review_request" name=assignment.review_request.doc.canonical_name request_id=assignment.review_request.pk %}">
+           href="{% url "ietf.doc.views_review.review_request" name=assignment.review_request.doc.name request_id=assignment.review_request.pk %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/review_assignment_summary.html b/ietf/templates/doc/review_assignment_summary.html
index 29781fcad9..6bb42ea074 100644
--- a/ietf/templates/doc/review_assignment_summary.html
+++ b/ietf/templates/doc/review_assignment_summary.html
@@ -1,3 +1,4 @@
+{% load ietf_filters %}
 <div class="review-assignment-summary">
     {% if review_assignment.state_id == "completed" or review_assignment.state_id == "part-completed" %}
         <a href="{% if review_assignment.review %}{% url 'ietf.doc.views_doc.document_main' review_assignment.review.name %}{% else %}{% url 'ietf.doc.views_review.review_request' review_assignment.review_request.doc.name review_assignment.review_request.pk %}{% endif %}">
@@ -7,21 +8,20 @@
                 {% if review_assignment.review_request.doc.name != current_doc_name %}
                     {{ review_assignment.review_request.doc.name }}
                 {% endif %}
-                -{{ review_assignment.reviewed_rev }}){% endif %}</a>
+                -{{ review_assignment.reviewed_rev }}){% endif %}
+            by {{ review_assignment.reviewer.person.plain_name }}</a>
         {% if review_assignment.state_id == "part-completed" %}
-            <span class="badge rounded-pill ms-1 bg-secondary">Partially completed</span>
+            <span class="badge rounded-pill text-bg-secondary ms-1">Partially completed</span>
         {% endif %}
         {% if review_assignment.result %}
-            <span class="badge rounded-pill ms-1 {% if review_assignment.result.name|slice:5|slugify == 'ready' %}bg-success{% else %}bg-info{% endif %}">
-                {{ review_assignment.result.name }}
-            </span>
+            {{ review_assignment.result.name|badgeify }}
         {% endif %}
     {% else %}
-        <a class="text-muted"
+        <a class="text-body-secondary"
            href="{% url 'ietf.doc.views_review.review_request' review_assignment.review_request.doc.name review_assignment.review_request.pk %}">
-            {{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} Review</a>
-        <span class="badge rounded-pill ms-1 bg-secondary">
-            Incomplete, due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}
+            {{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} Review due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}</a>
+        <span class="badge rounded-pill text-bg-secondary ms-1">
+            Incomplete
         </span>
     {% endif %}
 </div>
\ No newline at end of file
diff --git a/ietf/templates/doc/review_request_summary.html b/ietf/templates/doc/review_request_summary.html
new file mode 100644
index 0000000000..af4f2d5f7b
--- /dev/null
+++ b/ietf/templates/doc/review_request_summary.html
@@ -0,0 +1,9 @@
+<div class="review-request-summary">
+   <a class="text-body-secondary"
+      href="{% url 'ietf.doc.views_review.review_request' review_request.doc.name review_request.pk %}">
+      {{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review due {{ review_request.deadline|date:"Y-m-d" }}
+      </a>
+   <span class="badge rounded-pill text-bg-secondary ms-1">
+      Requested
+   </span>
+</div>
\ No newline at end of file
diff --git a/ietf/templates/doc/revisions_list.html b/ietf/templates/doc/revisions_list.html
index 04b12ed091..761d4cd04b 100644
--- a/ietf/templates/doc/revisions_list.html
+++ b/ietf/templates/doc/revisions_list.html
@@ -1,21 +1,53 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin ietf_filters %}
 {% origin %}
-<label class="my-1 fw-bold">Versions:</label>
-<nav class="mb-3">
-    <ul class="pagination pagination-sm flex-wrap">
-        {% for rev in revisions %}
-            <li class="page-item {% if rev == doc.rev %}{% if snapshot or doc.get_state_slug != 'rfc' %}active{% endif %}{% endif %}">
+{% if not document_html %}
+    <label class="my-1 fw-bold">Versions:</label>
+    <nav class="mb-3">
+{% endif %}
+    <ul class="revision-list{%if doc.type.slug == 'charter' %} charter{% endif %} pagination pagination-sm text-center flex-wrap{% if document_html %} my-0{% endif %}">
+        {% if doc.type_id == "rfc" %}
+            {% with doc.came_from_draft as draft %}
+            {% if draft %}
+                {% for rev in draft.revisions_by_dochistory %}
+                    <li class="page-item">
+                        <a class="page-link"
+                        href="{% if document_html %}{% url 'ietf.doc.views_doc.document_html' name=draft.name rev=rev %}{% else %}{% url 'ietf.doc.views_doc.document_main' name=draft.name rev=rev %}{% endif %}"
+                        rel="nofollow">
+                            {{ rev }}
+                        </a>
+                    </li>
+                {% endfor %}
+            {% endif %}
+            {% endwith %}
+            <li class="page-item rfc active">
                 <a class="page-link"
-                   href="{% if snapshot and doc.get_state_slug == 'rfc' %}{% url 'ietf.doc.views_doc.document_main' name=doc.doc.name %}{% else %}{% url 'ietf.doc.views_doc.document_main' name=doc.name %}{% endif %}{% if rev %}{{ rev }}/{% endif %}"
-                   {% if rev != '00' and rev != latest_rev %}rel="nofollow"{% endif %}>
-                    {% if rev %}
-                        {{ rev }}
-                    {% else %}
-                        {{ doc.name }}
-                    {% endif %}
+                href="{% if document_html %}{% url 'ietf.doc.views_doc.document_html' name=doc.name %}{% else %}{% url 'ietf.doc.views_doc.document_main' name=doc.name %}{% endif %}">
+                    RFC {{ doc.rfc_number }}
                 </a>
             </li>
-        {% endfor %}
+        {% else %}
+            {% for rev in revisions %}
+                {% if rev %} {# I think this guard is now unnecessary #}
+                    <li class="page-item {%if doc.type.slug == 'charter' and rev == rev|charter_major_rev %}fw-bold {% endif %}{% if rev == doc.rev %}{% if snapshot or doc.get_state_slug != 'rfc' %}active{% endif %}{% endif %}">
+                        <a class="page-link"
+                        href="{% if document_html %}{% url 'ietf.doc.views_doc.document_html' name=doc.name rev=rev %}{% else %}{% url 'ietf.doc.views_doc.document_main' name=doc.name rev=rev %}{% endif %}"
+                        {% if rev != '00' and rev != latest_rev %}rel="nofollow"{% endif %}>
+                            {{ rev }}
+                        </a>
+                    </li>
+                {% endif %}
+            {% endfor %}
+            {% if doc.became_rfc %}
+                <li class="page-item rfc">
+                    <a class="page-link"
+                    href="{% if document_html %}{% url 'ietf.doc.views_doc.document_html' name=doc.became_rfc.name %}{% else %}{% url 'ietf.doc.views_doc.document_main' name=doc.became_rfc.name %}{% endif %}">
+                        RFC {{ doc.became_rfc.rfc_number }}
+                    </a>
+                </li>
+            {% endif %}
+        {% endif %}
     </ul>
-</nav>
+{% if not document_html %}
+    </nav>
+{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/rsab_ballot_status.html b/ietf/templates/doc/rsab_ballot_status.html
new file mode 100755
index 0000000000..c3c183014f
--- /dev/null
+++ b/ietf/templates/doc/rsab_ballot_status.html
@@ -0,0 +1,38 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin static %}
+{% load ballot_icon %}
+{% load ietf_filters %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
+{% block title %}RSAB ballot status{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>RSAB ballot status</h1>
+    {% if docs %}
+        <table class="table table-sm table-striped tablesorter">
+            <thead>
+                <tr>
+                    <th scope="col" data-sort="doc">Document</th>
+                    <th scope="col" data-sort="status">Status</th>
+                </tr>
+            </thead>
+                <tbody>
+                    {% for doc in docs %}
+                        <tr>
+                            <td>{{ doc.displayname_with_link }}</td>
+                            {% include "doc/search/status_columns.html" %}
+                        </tr>
+                    {% endfor %}
+                </tbody>
+        </table>
+    {% else %}
+        <p class="alert alert-info my-3">
+            No open RSAB ballots.
+        </p>
+    {% endif %}
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/search/search_form.html b/ietf/templates/doc/search/search_form.html
index 1f40e5a525..d4f463ec66 100644
--- a/ietf/templates/doc/search/search_form.html
+++ b/ietf/templates/doc/search/search_form.html
@@ -6,7 +6,6 @@
 <form id="search_form"
       class="form-horizontal"
       action="{% url 'ietf.doc.views_search.search' %}">
-    {% csrf_token %}
     <!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
     <div class="input-group search_field">
         {{ form.name|add_class:"form-control"|attr:"placeholder:Document name/title/RFC number"|attr:"aria-label:Document name/title/RFC number" }}
@@ -180,5 +179,5 @@ <h2 class="accordion-header" id="search-heading">
 </form>
 <p class="text-center pt-5">
     <a class="btn btn-outline-primary btn-sm" href="https://www.ietf.org/search">Search page for www.ietf.org website</a>
-    <a class="btn btn-outline-primary btn-sm" href="https://mailarchive.ietf.org">Search page for IETF mail list archives</a>
+    <a class="btn btn-outline-primary btn-sm" href="https://mailarchive.ietf.org/arch/">Search page for IETF mail list archives</a>
 </p>
\ No newline at end of file
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index 8767f2a52a..476c81f598 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -7,30 +7,30 @@
 {% load person_filters %}
 {% load django_bootstrap5 %}
 <tr {% if color_ad_position %}{% with doc|ballotposition:user as pos %}{% if pos %}class="position-{{ pos.slug }}-row"{% endif %}{% endwith %}{% endif %}>
-    <td>
+    <td class="bg-transparent">
         {% if user.is_authenticated %}
-            <a href="{% url "ietf.community.views.untrack_document" username=request.user.username name=doc.name %}"
+            <a href="{% url "ietf.community.views.untrack_document" email_or_name=request.user.username name=doc.name %}"
                class="track-untrack-doc {% if not doc.tracked_in_personal_community_list %}d-none{% endif %}"
-               aria-label="Remove from your personal ID list"
-               title="Remove from your personal ID list">
+               aria-label="Remove from your personal I-D list"
+               title="Remove from your personal I-D list">
                 <i class="bi bi-bookmark-check-fill"></i>
             </a>
-            <a href="{% url "ietf.community.views.track_document" username=request.user.username name=doc.name %}"
+            <a href="{% url "ietf.community.views.track_document" email_or_name=request.user.username name=doc.name %}"
                class="track-untrack-doc {% if doc.tracked_in_personal_community_list %}d-none{% endif %}"
-               aria-label="Add to your personal ID list"
-               title="Add to your personal ID list">
+               aria-label="Add to your personal I-D list"
+               title="Add to your personal I-D list">
                 <i class="bi bi-bookmark"></i>
             </a>
             <br>
         {% endif %}
-        {% if user.review_teams %}
+        {% if user.person.review_teams %}
             <a class="review-wish-add-remove-doc ajax {% if not doc.has_review_wish %}d-none{% endif %}"
                href="{% url "ietf.doc.views_review.review_wishes_remove" name=doc.name %}?next={{ request.get_full_path|urlencode }}"
                aria-label="Remove from your review wishes for all teams"
                title="Remove from your review wishes for all teams">
                 <i class="bi bi-chat-left-heart-fill"></i>
             </a>
-            <a class="review-wish-add-remove-doc {% if user.review_teams|length_is:"1" %}ajax {% endif %} {% if doc.has_review_wish %}d-none{% endif %}"
+            <a class="review-wish-add-remove-doc {% if user.person.review_teams|length_is:"1" %}ajax {% endif %} {% if doc.has_review_wish %}d-none{% endif %}"
                href="{% url "ietf.doc.views_review.review_wish_add" name=doc.name %}?next={{ request.get_full_path|urlencode }}"
                aria-label="Add to your review wishes"
                title="Add to your review wishes">
@@ -45,17 +45,17 @@
             </a>
         {% endfor %}
     </td>
-    <td class="doc">
-        {% if doc.pages %}<small class="float-end text-muted d-none d-sm-block">{{ doc.pages }} page{{ doc.pages|pluralize }}</small>{% endif %}
+    <td class="doc bg-transparent">
+        {% if doc.pages %}<small class="float-end text-body-secondary d-none d-sm-block">{{ doc.pages }} page{{ doc.pages|pluralize }}</small>{% endif %}
         <div>
             <a href="{{ doc.get_absolute_url }}">
-                {% if doc.get_state_slug == "rfc" %}
+                {% if doc.type_id == "rfc" %}
                     RFC {{ doc.rfc_number }}
                 {% else %}
                     {{ doc.name }}-{{ doc.rev }}
                 {% endif %}
             </a>
-            {% if doc.get_state_slug == "rfc" and "draft" in doc.name %}<i class="text-muted">(was {{ doc.name }})</i>{% endif %}
+{#            {% if doc.type_id == "rfc" and "draft" in doc.name %}<i class="text-body-secondary">(was {{ doc.name }})</i>{% endif %} TODO drop this or look up the corresponding draft name#}
             <br>
             {% comment %}
             <div class="float-end">
@@ -85,12 +85,12 @@
             {% endcomment %}
             <b>{{ doc.title }}</b>
             {% if doc.has_verified_errata %}
-                <a class="badge rounded-pill bg-danger text-decoration-none text-light float-end"
+                <a class="badge rounded-pill text-bg-danger text-decoration-none float-end"
                    href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}">
                     Errata
                 </a>
             {% elif doc.has_errata %}
-                <a class="badge rounded-pill bg-warning text-decoration-none text-light float-end"
+                <a class="badge rounded-pill text-bg-warning text-decoration-none float-end"
                    href="https://www.rfc-editor.org/errata_search.php?rfc={{ doc.rfc_number }}">
                     Errata
                 </a>
@@ -105,50 +105,52 @@
             </div>
         {% endif %}
     </td>
-    <td>
-            {% if doc.latest_revision_date|timesince_days|new_enough:request and doc.get_state_slug != "rfc" %}
-                {% if doc.rev != "00" %}
-                    <a href="{{ rfcdiff_base_url }}?url2={{ doc.name }}-{{ doc.rev }}">
-                    {% elif doc.replaces %}
-                        <a href="{{ rfcdiff_base_url }}?url1={{ doc.replaces_canonical_name }}&amp;url2={{ doc.name }}-{{ doc.rev }}">
-                        {% endif %}
-                    {% endif %}
-                    {% if doc.get_state_slug == "rfc" %}
-                        {{ doc.latest_revision_date|date:"Y-m" }}
-                    {% else %}
-                        {{ doc.latest_revision_date|date:"Y-m-d" }}
-                    {% endif %}
-                    {% if doc.latest_revision_date|timesince_days|new_enough:request and doc.get_state_slug != "rfc" %}
-                        {% if doc.rev != "00" or doc.replaces %}</a>{% endif %}
-                    {% endif %}
-                {% if doc.latest_revision_date|timesince_days|new_enough:request %}
-                    <br>
-                    <div class="float-end">
-                        <span class="badge rounded-pill bg-success">New</span>
-                    </div>
-                {% endif %}
-                {% if doc.get_state_slug == "active" and doc.expirable and doc.expires|timesince_days|expires_soon:request %}
-                    <br>
-                    <span class="badge rounded-pill bg-warning">Expires soon</span>
-                {% endif %}
-            </td>
-            {% include "doc/search/status_columns.html" %}
-            <td class="text-center d-none d-sm-table-cell">
-                {% if doc.related_ipr %}
-                    <a href="{% url "ietf.ipr.views.search" %}?submit=draft&amp;id={{ doc.name }}">
-                        <span class="badge rounded-pill bg-info">{{ doc.related_ipr|length }}</span>
-                    </a>
-                {% endif %}
-            </td>
-            {% if ad_name == None or ad_name != doc.ad.plain_name %}
-                <td class="d-none d-sm-table-cell">
-                    {% if doc.ad %}
-                        {% person_link doc.ad title="Area Director" %}
-                    {% endif %}
-                    <br>
-                    {% if doc.shepherd %}
-                        {% email_person_link doc.shepherd title="Shepherd" class="small text-muted" %}
-                    {% endif %}
-                </td>
+    <td class="bg-transparent">
+        {% if doc.latest_revision_date|timesince_days|new_enough:request and doc.type_id != "rfc" %}
+            {% if doc.rev != "00" %}
+                <a href="{{ rfcdiff_base_url }}?url2={{ doc.name }}-{{ doc.rev }}">
+            {% elif doc.replaces %}
+                {% with first_replaces=doc.replaces|first %}
+                    <a href="{{ rfcdiff_base_url }}?url1={{ first_replaces.name }}&amp;url2={{ doc.name }}-{{ doc.rev }}">
+                {% endwith %}
+            {% endif %}
+        {% endif %}
+        {% if doc.type_id == "rfc" %}
+            {{ doc.latest_revision_date|date:"Y-m" }}
+        {% else %}
+            {{ doc.latest_revision_date|date:"Y-m-d" }}
+        {% endif %}
+        {% if doc.latest_revision_date|timesince_days|new_enough:request and doc.type_id != "rfc" %}
+            {% if doc.rev != "00" or doc.replaces %}</a>{% endif %}
+        {% endif %}
+        {% if doc.latest_revision_date|timesince_days|new_enough:request %}
+            <br>
+            <div class="float-end">
+                <span class="badge rounded-pill text-bg-success">New</span>
+            </div>
+        {% endif %}
+        {% if doc.get_state_slug == "active" and doc.expirable and doc.expires|timesince_days|expires_soon:request %}
+            <br>
+            <span class="badge rounded-pill text-bg-warning">Expires soon</span>
+        {% endif %}
+    </td>
+    {% include "doc/search/status_columns.html" %}
+    <td class="text-center d-none d-sm-table-cell bg-transparent">
+        {% if doc.related_ipr %}
+            <a href="{% url "ietf.ipr.views.search" %}?submit=draft&amp;id={{ doc.name }}">
+                <span class="badge rounded-pill text-bg-info">{{ doc.related_ipr|length }}</span>
+            </a>
+        {% endif %}
+    </td>
+    {% if show_ad_and_shepherd %}
+        <td class="d-none d-sm-table-cell bg-transparent">
+            {% if doc.ad %}
+                {% person_link doc.ad title="Area Director" %}
+            {% endif %}
+            <br>
+            {% if doc.shepherd %}
+                {% email_person_link doc.shepherd title="Shepherd" class="small text-body-secondary" %}
             {% endif %}
-        </tr>
+        </td>
+    {% endif %}
+</tr>
diff --git a/ietf/templates/doc/search/search_results.html b/ietf/templates/doc/search/search_results.html
index cb00462729..bd6b072f0d 100644
--- a/ietf/templates/doc/search/search_results.html
+++ b/ietf/templates/doc/search/search_results.html
@@ -20,6 +20,8 @@
                         <th scope="col" data-sort="{{ h.key }}"
                             {% if h.title|slugify == "ipr" or h.title|slugify == "ad-shepherd" %}
                               class="d-none d-sm-table-cell"
+                            {% elif h.title|slugify == 'date' %}
+                              data-default-sort="desc"
                             {% endif %}>
                             {% if "sort_url" in h %}
                                 <a href="{{ h.sort_url }}">
@@ -53,7 +55,7 @@
     </tbody>
     <tbody>
         {% for doc in doc_group.list %}
-            {% include "doc/search/search_result_row.html" %}
+            {% include "doc/search/search_result_row.html" with show_ad_and_shepherd=meta.show_ad_and_shepherd %}
         {% endfor %}
     </tbody>
 {% endfor %}
diff --git a/ietf/templates/doc/search/status_columns.html b/ietf/templates/doc/search/status_columns.html
index 91660f1dbb..5ba41bb9c4 100644
--- a/ietf/templates/doc/search/status_columns.html
+++ b/ietf/templates/doc/search/status_columns.html
@@ -2,11 +2,9 @@
 {% load origin %}
 {% origin %}
 {% load ietf_filters ballot_icon person_filters %}
-<td class="status">
-    {% if doc.ballot %}
-        <div class="float-end ms-1 mb-1" id="ballot-icon-{{ doc.name }}">{% ballot_icon doc %}</div>
-    {% endif %}
-    {% if not doc.get_state_slug == "rfc" %}
+<td class="status bg-transparent">
+    <div class="float-end ms-1 mb-1" id="ballot-icon-{{ doc.name }}">{% ballot_icon doc %}</div>
+    {% if not doc.type_id == "rfc" %}
         {% if '::' in doc.friendly_state %}
             {{ doc.friendly_state|safe }}
         {% else %}
@@ -52,9 +50,9 @@
             {% for review_assignment in doc.review_assignments %}
                 {% if review_assignment.state_id == "completed" or review_assignment.state_id == "part-completed" %}
                     <span title="{{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} review {% if review_assignment.reviewed_rev and review_assignment.reviewed_rev != current_rev or review_assignment.review_request.doc.name != current_doc_name %}of {% if review_assignment.review_request.doc.name != current_doc_name %}{{ review_assignment.review_request.doc.name }}{% endif %}-{{ review_assignment.reviewed_rev }}{% endif %}: {{review_assignment.result}}"
-                    class="badge rounded-pill {% if review_assignment.result.name|slice:5|slugify == 'ready' %}bg-success{% elif review_assignment.result.name|slice:9|slugify == 'not-ready' %}bg-danger{% elif review_assignment.result.name|slice:10|slugify == 'has-issues' %}bg-warning{% else %}bg-info{% endif %}">
+                    class="badge rounded-pill {% if review_assignment.result.name|slice:5|slugify == 'ready' %}text-bg-success{% elif review_assignment.result.name|slice:9|slugify == 'not-ready' %}text-bg-danger{% elif review_assignment.result.name|slice:10|slugify == 'has-issues' %}text-bg-warning{% else %}text-bg-info{% endif %}">
                     {% else %}
-                        <span title="Incomplete, due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}" class="badge rounded-pill bg-secondary">
+                        <span title="Incomplete, due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}" class="badge rounded-pill text-bg-secondary">
                     {% endif %}
                     <a class="text-reset text-decoration-none" href="{% if review_assignment.review %}{% url 'ietf.doc.views_doc.document_main' review_assignment.review.name %}{% else %}{% url 'ietf.doc.views_review.review_request' review_assignment.review_request.doc.name review_assignment.review_request.pk %}{% endif %}">
                         {{ review_assignment.review_request.team.acronym }}
@@ -80,16 +78,24 @@
                 {% person_link action_holder.person title=action_holder.role_for_doc %}{% if action_holder|action_holder_badge %} {{ action_holder|action_holder_badge }}{% endif %}{% if not forloop.last %},{% endif %}
             {% endfor %}
         {% endif %}
+        {% if doc|is_unexpected_wg_state %}
+            <br>
+            <span class="badge rounded-pill text-bg-warning">Unexpected WG state</span>
+        {% endif %}
     {% else %}
         {# RFC #}
         {{ doc.std_level|safe }} RFC
         {% if doc.obsoleted_by_list %}
             <br>
-            <span class="text-muted">Obsoleted by {{ doc.obsoleted_by_list|join:", "|urlize_ietf_docs }}</span>
+            <span class="text-body-secondary">Obsoleted by {{ doc.obsoleted_by_list|join:", "|urlize_ietf_docs }}</span>
         {% endif %}
         {% if doc.updated_by_list %}
             <br>
-            <span class="text-muted">Updated by {{ doc.updated_by_list|join:", "|urlize_ietf_docs }}</span>
+            <span class="text-body-secondary">Updated by {{ doc.updated_by_list|join:", "|urlize_ietf_docs }}</span>
+        {% endif %}
+        {% if doc.part_of %}
+            <br>
+            <span class="text-body-secondary">{% for sub in doc.part_of %}{% if sub.contains|length_is:"1" %} Also known as {% else %} Part of {% endif %}<a href="{% url 'ietf.doc.views_doc.document_main' name=sub.name%}">{{sub.name|slice:":3"|upper}} {{sub.name|slice:"3:"}}</a>{% if not forloop.last %}, {%endif%}{% endfor %}</span>
         {% endif %}
     {% endif %}
-</td>
+</td>
\ No newline at end of file
diff --git a/ietf/templates/doc/shepherd_writeup.html b/ietf/templates/doc/shepherd_writeup.html
index 8cf99aff02..09fb179fa6 100644
--- a/ietf/templates/doc/shepherd_writeup.html
+++ b/ietf/templates/doc/shepherd_writeup.html
@@ -3,13 +3,13 @@
 {% load origin %}
 {% load ietf_filters %}
 {% load textfilters %}
-{% block title %}Shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}{% endblock %}
+{% block title %}Shepherd writeup for {{ doc.name }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Shepherd writeup
         <br>
-        <small class="text-muted">{{ doc.canonical_name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <pre class="border p-3 my-3">{{writeup|maybewordwrap|urlize_ietf_docs|linkify}}</pre>
     {% if can_edit %}
diff --git a/ietf/templates/doc/shepherd_writeup.txt b/ietf/templates/doc/shepherd_writeup.txt
index ef37e897c6..54821e5916 100644
--- a/ietf/templates/doc/shepherd_writeup.txt
+++ b/ietf/templates/doc/shepherd_writeup.txt
@@ -125,9 +125,9 @@ to answer all of them.
 [1]: https://www.ietf.org/about/groups/iesg/
 [2]: https://www.rfc-editor.org/rfc/rfc4858.html
 [3]: https://www.rfc-editor.org/rfc/rfc7942.html
-[4]: https://trac.ietf.org/trac/ops/wiki/yang-review-tools
+[4]: https://wiki.ietf.org/group/ops/yang-review-tools
 [5]: https://www.rfc-editor.org/rfc/rfc8342.html
-[6]: https://trac.ietf.org/trac/iesg/wiki/ExpertTopics
+[6]: https://wiki.ietf.org/group/iesg/ExpertTopics
 [7]: https://www.rfc-editor.org/info/bcp79
 [8]: https://www.ietf.org/tools/idnits/
 [9]: https://www.rfc-editor.org/rfc/rfc3967.html
diff --git a/ietf/templates/doc/state_help.html b/ietf/templates/doc/state_help.html
index d7678987ac..606e13cbac 100644
--- a/ietf/templates/doc/state_help.html
+++ b/ietf/templates/doc/state_help.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load static %}
+{% load origin static ietf_filters textfilters %}
 {% block title %}{{ title }}{% endblock %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
@@ -27,7 +26,7 @@ <h1>{{ title }}</h1>
             {% for state in states %}
                 <tr id="{{ state.slug|default:"idexists" }}">
                     <th scope="row">{{ state.name }}</th>
-                    <td>{{ state.desc|safe|linebreaksbr }}</td>
+                    <td>{{ state.desc|safe|urlize_ietf_docs|linkify }}</td>
                     {% if has_next_states %}
                         <td>
                             {% for s in state.next_states.all %}
diff --git a/ietf/templates/doc/state_index.html b/ietf/templates/doc/state_index.html
new file mode 100644
index 0000000000..602d54d1c4
--- /dev/null
+++ b/ietf/templates/doc/state_index.html
@@ -0,0 +1,48 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
+{% block title %}Document state index{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>Document state index</h1>
+    <p>
+        Document state information is available for the following document and document state groups.
+    </p>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="document">Document</th>
+                <th scope="col" data-sort="state">State groups</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for type in types %}
+                {% if type.stategroups != None %}
+                    <tr>
+                        <td>
+                            <a href="{% url 'ietf.doc.views_help.state_help' type=type.slug %}">{{ type.slug }}</a>
+                        </td>
+                        <td>
+                            {% for group in type.stategroups %}
+                                {# djlint:off #}
+                                    {% if type.slug == "draft" %}
+                                        <a href="{% url 'ietf.doc.views_help.state_help' type=type.slug|add:'-'|add:group %}">
+                                    {% else %}
+                                        <a href="{% url 'ietf.help.views.state' doc=type.slug type=group %}">
+                                    {% endif %}
+                                    {{ group }}</a>{% if not forloop.last %},{% endif %}
+                                {# djlint:on #}
+                            {% endfor %}
+                        </td>
+                    </tr>
+                {% endif %}
+            {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/statement/change_statement_state.html b/ietf/templates/doc/statement/change_statement_state.html
new file mode 100644
index 0000000000..aa5cb934e8
--- /dev/null
+++ b/ietf/templates/doc/statement/change_statement_state.html
@@ -0,0 +1,22 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load origin %}
+{% load django_bootstrap5 %}
+{% block title %}Change state for {{ statement }}{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Change state
+        <br>
+        <small class="text-body-secondary">{{ statement }}</small>
+    </h1>
+    <form class="mt-3" method="post">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+        <a class="btn btn-secondary float-end"
+           href="{{ statement.get_absolute_url }}">
+            Back
+        </a>
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/statement/new_statement.html b/ietf/templates/doc/statement/new_statement.html
new file mode 100644
index 0000000000..0742314ed1
--- /dev/null
+++ b/ietf/templates/doc/statement/new_statement.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin django_bootstrap5 static textfilters %}
+{% block title %}Start a new Statement{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>Start a new Statement</h1>
+    <form class="upload-content form-horizontal"
+          method="post"
+          enctype="multipart/form-data">
+        {% csrf_token %}
+        {% bootstrap_form form layout="horizontal" %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+    </form>
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/upload_statement.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/statement/statement_template.md b/ietf/templates/doc/statement/statement_template.md
new file mode 100644
index 0000000000..cc311530ec
--- /dev/null
+++ b/ietf/templates/doc/statement/statement_template.md
@@ -0,0 +1 @@
+Replace this with the content of the statement in markdown source
diff --git a/ietf/templates/doc/statement/upload_content.html b/ietf/templates/doc/statement/upload_content.html
new file mode 100644
index 0000000000..712c44043d
--- /dev/null
+++ b/ietf/templates/doc/statement/upload_content.html
@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin django_bootstrap5 static %}
+{% block title %}Upload new revision: {{ doc.name }}{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Upload New Revision
+        <br>
+        <small class="text-muted">{{ doc.name }}</small>
+    </h1>
+    <form class="upload-content form-horizontal mt-3"
+          method="post"
+          enctype="multipart/form-data">
+        {% csrf_token %}
+        {% bootstrap_form form layout="horizontal" %}
+        <button type="submit" class="btn btn-primary">Submit</button>
+        <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
+    </form>
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/upload_statement.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/stats/highstock.html b/ietf/templates/doc/stats/highstock.html
deleted file mode 100644
index d6a36f58e1..0000000000
--- a/ietf/templates/doc/stats/highstock.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load static %}
-{% load ietf_filters %}
-{% block js %}
-    <script src="{% static 'ietf/js/highstock.js' %}"></script>
-    <script>
-        $(function () {
-            var chart;
-            $.getJSON('{{ confurl }}?{{ queryargs }}', function (conf) {
-                chart = Highcharts.stockChart('chart', conf);
-                chart.showLoading();
-                $.getJSON('{{ dataurl }}?{{ queryargs }}', function (data) {
-                    chart.series[0].setData(data);
-                    chart.hideLoading();
-                });
-            });
-        });
-    </script>
-{% endblock %}
-{% block title %}Document Statistics{% endblock %}
-{% block content %}
-    {% origin %}
-    <div id="chart"></div>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/status_change/ad_approval_pending_email.txt b/ietf/templates/doc/status_change/ad_approval_pending_email.txt
index 23ef471554..7d132a322e 100644
--- a/ietf/templates/doc/status_change/ad_approval_pending_email.txt
+++ b/ietf/templates/doc/status_change/ad_approval_pending_email.txt
@@ -1,7 +1,7 @@
 {% load ietf_filters %}{% load mail_filters %}{% autoescape off %}
 {% filter wordwrap:78 %}The AD has approved changing the status of the following {% if related_doc_info|length == 1 %}document{% else %}documents{% endif %}:
 {% for relateddoc in related_doc_info %}- {{relateddoc.title }}
-  ({{relateddoc.canonical_name }}) to {{ relateddoc.newstatus }}
+  ({{relateddoc.name }}) to {{ relateddoc.newstatus }}
 {% endfor %}
 An announcement has not yet been sent.
 {% endfilter %}
diff --git a/ietf/templates/doc/status_change/approval_text.txt b/ietf/templates/doc/status_change/approval_text.txt
index bf722dccee..e2bbe3bf68 100644
--- a/ietf/templates/doc/status_change/approval_text.txt
+++ b/ietf/templates/doc/status_change/approval_text.txt
@@ -1,11 +1,11 @@
 {% load ietf_filters %}{% load mail_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
 To: {{ to }}{% if cc %} 
 Cc: {{ cc }}{% endif %}
-Subject: {{action}}: {{relateddoc.target.document.title}} to {{newstatus}} 
+Subject: {{action}}: {{relateddoc.target.title}} to {{newstatus}} 
 
 {% filter wordwrap:78 %}The IESG has approved changing the status of the following document:
-- {{relateddoc.target.document.title }}
-  ({{relateddoc.target.document.canonical_name }}) to {{ newstatus }}
+- {{relateddoc.target.title }}
+  ({{relateddoc.target.name }}) to {{ newstatus }}
 
 This {{action|lower}} is documented at:
 {{status_change_url}}
diff --git a/ietf/templates/doc/status_change/approve.html b/ietf/templates/doc/status_change/approve.html
index 7984329766..786ec451ca 100644
--- a/ietf/templates/doc/status_change/approve.html
+++ b/ietf/templates/doc/status_change/approve.html
@@ -2,13 +2,13 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-{% block title %}Approve {{ doc.canonical_name }}{% endblock %}
+{% block title %}Approve {{ doc.name }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Approve
         <br>
-        <small class="text-muted">{{ doc.canonical_name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <form class="my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/status_change/edit_related_rows.html b/ietf/templates/doc/status_change/edit_related_rows.html
index 8912c99fda..044ebb1dbc 100644
--- a/ietf/templates/doc/status_change/edit_related_rows.html
+++ b/ietf/templates/doc/status_change/edit_related_rows.html
@@ -5,7 +5,7 @@
 {% for rfc,choice_slug in form.relations.items %}
     <div class="input-group mb-3">
         <select class="form-control select2-field"
-                data-select2-ajax-url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='draft' %}"
+                data-select2-ajax-url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='rfc' %}"
                 data-max-entries="1"
                 data-width="resolve"
                 data-result-key="text"
@@ -39,7 +39,7 @@
             id="new_relation_row_rfc"
             aria-label="Enter new affected RFC"
             class="form-control select2-field"
-            data-select2-ajax-url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='docalias' doc_type='draft' %}"
+            data-select2-ajax-url="{% url 'ietf.doc.views_search.ajax_select2_search_docs' model_name='document' doc_type='rfc' %}"
             data-result-key="text"
             data-max-entries="1"
             data-width="resolve"
diff --git a/ietf/templates/doc/status_change/edit_relations.html b/ietf/templates/doc/status_change/edit_relations.html
index 5823cd21f5..697d844d61 100644
--- a/ietf/templates/doc/status_change/edit_relations.html
+++ b/ietf/templates/doc/status_change/edit_relations.html
@@ -9,7 +9,7 @@
     <h1>
         Edit RFCs affected by status change
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <form class="mt-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/status_change/last_call.html b/ietf/templates/doc/status_change/last_call.html
index 682a27b073..2f1f9666a9 100644
--- a/ietf/templates/doc/status_change/last_call.html
+++ b/ietf/templates/doc/status_change/last_call.html
@@ -9,8 +9,13 @@
     <h1>
         Last call text
         <br>
-        <small class="text-muted">{{ doc }}</small>
+        <small class="text-body-secondary">{{ doc }}</small>
     </h1>
+    {% if doc.ad is None %}
+    <div class="alert alert-warning my-3">
+        A responsible AD must be set before last call can be requested.
+    </div>
+    {% endif %}
     <form class="my-3 edit-last-call-text" method="post">
         {% csrf_token %}
         {% bootstrap_form last_call_form %}
@@ -18,15 +23,17 @@ <h1>
                 class="btn btn-primary"
                 name="save_last_call_text"
                 value="Save Last Call Text">Save text</button>
-        <button type="submit"
-                class="btn btn-warning"
-                name="send_last_call_request"
-                value="Save and Request Last Call">
-            Save text &amp; request last call
-        </button>
-        {% if user|has_role:"Secretariat" %}
-            <a class="btn btn-warning"
-               href="{% url 'ietf.doc.views_ballot.make_last_call' name=doc.name %}">Issue last call</a>
+        {% if doc.ad is not None %}
+            <button type="submit"
+                    class="btn btn-warning"
+                    name="send_last_call_request"
+                    value="Save and Request Last Call">
+                Save text &amp; request last call
+            </button>
+            {% if user|has_role:"Secretariat" %}
+                <a class="btn btn-warning"
+                href="{% url 'ietf.doc.views_ballot.make_last_call' name=doc.name %}">Issue last call</a>
+            {% endif %}
         {% endif %}
         <button type="submit"
                 class="btn btn-danger"
diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html
index 2733363373..7554853875 100644
--- a/ietf/templates/doc/status_change/make_last_call.html
+++ b/ietf/templates/doc/status_change/make_last_call.html
@@ -12,7 +12,7 @@
     <h1>
         Make last call
         <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        <small class="text-body-secondary">{{ doc.name }}</small>
     </h1>
     <div class="my-3">
         <label>Last call text</label>
diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html
index 31d6130a3e..bdb6c7a50b 100644
--- a/ietf/templates/doc/status_change/status_changes.html
+++ b/ietf/templates/doc/status_change/status_changes.html
@@ -46,4 +46,4 @@ <h1>RFC status changes</h1>
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/status_change/submit.html b/ietf/templates/doc/status_change/submit.html
index 68e9e81230..2d85859f61 100644
--- a/ietf/templates/doc/status_change/submit.html
+++ b/ietf/templates/doc/status_change/submit.html
@@ -8,10 +8,10 @@
     <h1>
         Edit status change text
         <br>
-        <small class="text-muted">{{ doc.title }}</small>
+        <small class="text-body-secondary">{{ doc.title }}</small>
     </h1>
     <p class="my-3 alert alert-info">
-        The text will be submitted as <b>{{ doc.canonical_name }}-{{ next_rev }}</b>.
+        The text will be submitted as <b>{{ doc.name }}-{{ next_rev }}</b>.
     </p>
     <form class="my-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
@@ -27,7 +27,7 @@ <h1>
             Reset to template text
         </button>
         <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/doc/submit_to_iesg.html b/ietf/templates/doc/submit_to_iesg.html
index d9e7cc6f68..7f4bb06250 100644
--- a/ietf/templates/doc/submit_to_iesg.html
+++ b/ietf/templates/doc/submit_to_iesg.html
@@ -8,7 +8,7 @@
     <h1>
         Publication request
         <br>
-        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+        <small class="text-body-secondary">{{ doc.name }}-{{ doc.rev }}</small>
     </h1>
     <p class="my-3">
         Please verify the following information:
diff --git a/ietf/templates/doc/weasyprint_failed.html b/ietf/templates/doc/weasyprint_failed.html
new file mode 100644
index 0000000000..985fe12fe1
--- /dev/null
+++ b/ietf/templates/doc/weasyprint_failed.html
@@ -0,0 +1,17 @@
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% extends "base.html" %}
+{% load origin %}
+{% block title %}Error while rendering PDF{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>Error while rendering PDF</h1>
+    <p>
+        An error was encountered while trying to render your document as PDF.
+	In case this was a temporary error, you may want to try again in a
+        little while.
+    </p>
+    <p>
+        A failure report with details about what happened has been sent to the
+        server administrators.
+    </p>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_areas.html b/ietf/templates/group/active_areas.html
index d3fe45f453..8355d13bbc 100644
--- a/ietf/templates/group/active_areas.html
+++ b/ietf/templates/group/active_areas.html
@@ -1,6 +1,9 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin textfilters ietf_filters%}
+{% load origin textfilters ietf_filters static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/highcharts.css" %}">
+{% endblock %}
 {% block title %}Active areas{% endblock %}
 {% block content %}
     {% origin %}
@@ -43,15 +46,40 @@ <h1>Areas</h1>
             </li>
         {% endfor %}
     </ul>
+    <p>
+        The following diagrams show the sizes of the different areas and working groups,
+        based on the number of documents - and pages - a group has worked on in the last three years.
+    </p>
+    <div class="row mt-3">
+        <div class="col-sm chart text-center" data-area="ietf" data-dataset="docs">
+            <div class="spinner-border" role="status">
+              <span class="visually-hidden">Loading...</span>
+            </div>
+        </div>
+        <div class="col-sm chart text-center" data-area="ietf" data-dataset="pages">
+            <div class="spinner-border" role="status">
+              <span class="visually-hidden">Loading...</span>
+            </div>
+        </div>
+    </div>
     {% for area in areas %}
-        <h2 class="mt-3" id="id-{{ area.acronym|slugify }}">
+        <h2 class="mt-5" id="id-{{ area.acronym|slugify }}">
             {{ area.name }}
-            <a href="{% url 'ietf.group.views.active_groups' group_type='wg' %}#{{ area.acronym }}">({{ area.acronym|upper }})</a>
+            <a href="{% url 'ietf.group.views.active_groups' group_type='wg' %}#{{ area.acronym|upper }}">({{ area.acronym|upper }})</a>
         </h2>
         {% if area.description %}
             <p>
                 {{ area.description|urlize_ietf_docs|linkify|safe }}
             </p>
         {% endif %}
+        {% include "group/group_stats_modal.html" with group=area only %}
     {% endfor %}
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/highcharts.js' %}"></script>
+    <script>
+        $(function () {
+            group_stats("{% url 'ietf.group.views.group_stats_data' %}", ".chart");
+        });
+    </script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_iabgroups.html b/ietf/templates/group/active_iabgroups.html
index ac542cd3c3..cd8e3cfd64 100644
--- a/ietf/templates/group/active_iabgroups.html
+++ b/ietf/templates/group/active_iabgroups.html
@@ -44,4 +44,4 @@ <h1>Active IAB groups</h1>
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_teams.html b/ietf/templates/group/active_teams.html
index 502d971a20..771dfda290 100644
--- a/ietf/templates/group/active_teams.html
+++ b/ietf/templates/group/active_teams.html
@@ -16,21 +16,29 @@ <h1>Active teams</h1>
                 <th scope="col" data-sort="chairs">Chairs</th>
             </tr>
         </thead>
-        <tbody>
-            {% for group in teams %}
-                <tr>
-                    <td>
-                        <a href="{% url "ietf.group.views.group_home" acronym=group.acronym %}">{{ group.acronym }}</a>
-                    </td>
-                    <td>{{ group.name }}</td>
-                    <td>
-                        {% for chair in group.chairs %}
-                            {% person_link chair.person %}{% if not forloop.last %},{% endif %}
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% regroup teams by parent as grouped_teams %}
+        {% for group_entry in grouped_teams %}
+            <tbody>
+                <tr class="table-info"><th scope="col" colspan="3">
+                    {% if group_entry.grouper %}{{ group_entry.grouper.name }}{% else %}Other{% endif %}
+                </th></tr>
+            </tbody>
+            <tbody>
+                {% for group in group_entry.list %}
+                    <tr>
+                        <td>
+                            <a href="{% url "ietf.group.views.group_home" acronym=group.acronym %}">{{ group.acronym }}</a>
+                        </td>
+                        <td>{{ group.name }}</td>
+                        <td>
+                            {% for chair in group.chairs %}
+                                {% person_link chair.person %}{% if not forloop.last %},{% endif %}
+                            {% endfor %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endfor %}
     </table>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
index 412601424b..0e581ea7cc 100644
--- a/ietf/templates/group/active_wgs.html
+++ b/ietf/templates/group/active_wgs.html
@@ -17,34 +17,24 @@ <h1>Active IETF working groups</h1>
            href="{% url "ietf.group.views.chair_photos" group_type="wg" %}">Chair photos</a>
     </div>
     {% for area in areas %}
-        <h2 class="mt-5" id="{{ area.acronym }}">{{ area.name }} ({{ area.acronym }})</h2>
+        <h2 class="mt-5" id="{{ area.acronym|upper }}">{{ area.name }} ({{ area.acronym|upper }})</h2>
         {% if area.ads_and_pre_ads %}
             <h3 class="mt-3 navskip">
-                {{ area.acronym }} Area Director{{ area.ads_and_pre_ads|pluralize }} (AD{{ area.ads_and_pre_ads|pluralize }})
+                {{ area.acronym|upper }} Area Director{{ area.ads_and_pre_ads|pluralize }} (AD{{ area.ads_and_pre_ads|pluralize }})
             </h3>
             <ul class="list-unstyled">
                 {% for ad in area.ads_and_pre_ads %}
                     <li>
                         {% person_link ad.person %}
-                        {% if ad.name == "pre-ad" %}<span class="badge rounded-pill bg-info">Incoming AD</span>{% endif %}
-                    </li>
-                {% endfor %}
-            </ul>
-        {% endif %}
-        {% if area.urls %}
-            <h3 class="mt-3 navskip">{{ area.acronym }} Area-specific web page{{ area.urls|pluralize }}</h3>
-            <ul class="list-unstyled">
-                {% for url in area.urls %}
-                    <li>
-                        <a href="{{ url.value }}">{{ url.name }}</a>
+                        {% if ad.name == "pre-ad" %}<span class="badge rounded-pill text-bg-info">Incoming AD</span>{% endif %}
                     </li>
                 {% endfor %}
             </ul>
         {% endif %}
         {% if area.groups %}
             <h3 class="mt-3 navskip">
-                {{ area.acronym }} active WG{{ area.groups|pluralize }}
-                <span class="text-muted">({{ area.groups.count }})</span>
+                {{ area.acronym|upper }} active WG{{ area.groups|pluralize }}
+                <span class="text-body-secondary">({{ area.groups.count }})</span>
             </h3>
             <table class="table table-sm table-striped tablesorter">
                 <thead>
@@ -84,7 +74,7 @@ <h3 class="mt-3 navskip">
                 </tbody>
             </table>
         {% else %}
-            <h3 class="mt-3 navskip">No active {{ area.acronym }} WGs</h3>
+            <h3 class="mt-3 navskip">No active {{ area.acronym|upper }} WGs</h3>
         {% endif %}
     {% endfor %}
 {% endblock %}
diff --git a/ietf/templates/group/add_comment.html b/ietf/templates/group/add_comment.html
index 0aea914f02..05313edda0 100644
--- a/ietf/templates/group/add_comment.html
+++ b/ietf/templates/group/add_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add comment
         <br>
-        <small class="text-muted">{{ group }} ({{ group.acronym }})</small>
+        <small class="text-body-secondary">{{ group }} ({{ group.acronym }})</small>
     </h1>
     <form class="my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/group/all_photos.html b/ietf/templates/group/all_photos.html
index d32cccb4e3..0b4947ccba 100644
--- a/ietf/templates/group/all_photos.html
+++ b/ietf/templates/group/all_photos.html
@@ -8,7 +8,8 @@
     <h1>{{ group_type | upper }} {{ role }} photos</h1>
     {% regroup roles|dictsort:"last_initial" by last_initial as alphabet_blocks %}
     {% for letter in alphabet_blocks %}
-        <h2 class="mt-4" {% if letter.grouper|slugify %}id="{{ letter.grouper|slugify }}"{% endif %}>{{ letter.grouper }}</h2>
+        <!-- [html-validate-disable-next valid-id -- Unicode IDs are OK in HTML5] -->
+        <h2 class="mt-4" {% if letter.grouper|slugify %}id="{{ letter.grouper }}"{% endif %}>{{ letter.grouper }}</h2>
         {% regroup letter.list by person as person_groups %}
         {# keep in sync with group_photos.html #}
         <div class="mt-0 row row-cols-2 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-4 row-cols-xxl-5 g-2">
@@ -17,4 +18,4 @@ <h2 class="mt-4" {% if letter.grouper|slugify %}id="{{ letter.grouper|slugify }}
             {% endfor %}
         </div>
     {% endfor %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/all_status.html b/ietf/templates/group/all_status.html
index c480dac5f2..7a4c6b6512 100644
--- a/ietf/templates/group/all_status.html
+++ b/ietf/templates/group/all_status.html
@@ -17,7 +17,7 @@ <h2 class="mt-3">{{ area_item.grouper.name }} ({{ area_item.grouper.acronym|uppe
                 <div class="card-header">
                     {{ rpt.group.acronym }}
                     {% if rpt.group.state.slug != "active" %}
-                        <span class="badge rounded-pill bg-success">{{ rpt.group.state.slug|upper }}</span>
+                        <span class="badge rounded-pill text-bg-success">{{ rpt.group.state.slug|upper }}</span>
                     {% endif %}
                     {{ rpt.time|date:"Y-m-d" }}
                 </div>
@@ -33,7 +33,7 @@ <h2 class="mt-3">Internet Research Task Force (IRTF)</h2>
             <div class="card-header">
                 {{ rpt.group.acronym }}
                 {% if rpt.group.state.slug != "active" %}
-                    <span class="badge rounded-pill bg-success">{{ rpt.group.state.slug|upper }}</span>
+                    <span class="badge rounded-pill text-bg-success">{{ rpt.group.state.slug|upper }}</span>
                 {% endif %}
                 {{ rpt.time|date:"Y-m-d" }}
             </div>
diff --git a/ietf/templates/group/appeal_artifact.html b/ietf/templates/group/appeal_artifact.html
new file mode 100644
index 0000000000..4f810078a2
--- /dev/null
+++ b/ietf/templates/group/appeal_artifact.html
@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+{% load ietf_filters %}
+{# Copyright The IETF Trust 2023. All Rights Reserved. #}
+{% load origin %}
+{% block title %}{{artifact.display_title}} - {{artifact.appeal.name}}{% endblock %}
+{% block pagehead %}
+    <meta name="description"
+          content="{{artifact.date}} = {{artifact.display_title}} - {{artifact.appeal.name}}">
+{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        {{artifact.appeal.name}} - {{artifact.appeal.date}}
+        <br>
+        <small class="text-body-secondary">{{ artifact.display_title }} - {{ artifact.date }}</small>
+    </h1>
+    {{ artifact_html }}
+    {% if request.user|has_role:"Secretariat" %}
+    <hr>
+    <div>
+    <a class="btn btn-primary btn-sm" download="{{artifact.download_name}}" href="{% url 'ietf.group.views.appeal_artifact_markdown' acronym=artifact.appeal.group.acronym artifact_id=artifact.pk %}">Download markdown source</a>
+    </div>
+    {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/appeals.html b/ietf/templates/group/appeals.html
new file mode 100644
index 0000000000..2e0ab65464
--- /dev/null
+++ b/ietf/templates/group/appeals.html
@@ -0,0 +1,38 @@
+{% extends "group/group_base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin %}
+{% load ietf_filters person_filters textfilters %}
+{% load static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
+{% block group_content %}
+    {% origin %}
+    <h2 class="my-3">{{group.acronym|upper}} Appeals</h2>
+
+    <table id="appeals" class="my-3 table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th class="col-1" scope="col" data-sort="date">Date</th>
+                <th scope="col" data-sort="appeal">Appeal</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for appeal in appeals %}
+            <tr id="appeal-{{forloop.counter}}">
+                <td id="appeal-{{forloop.counter}}-date">{{ appeal.date|date:"Y-m-d" }}</td>
+                <td>{{appeal.name}}
+                    <div class="buttonlist">
+                    {% for part in appeal.appealartifact_set.all %}
+                        <a id="artifact-{{forloop.parentloop.counter}}-{{forloop.counter}}" class="btn btn-primary btn-sm" href="{% url 'ietf.group.views.appeal_artifact' acronym=group.acronym artifact_id=part.pk %}"{% if not part.is_markdown %} download="{{part.download_name}}"{%endif%}>{{part.display_title}} - {{part.date|date:"Y-m-d"}}</a>
+                    {% endfor %}
+                    </div>
+                </td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/change_reviewer_settings.html b/ietf/templates/group/change_reviewer_settings.html
index 91964ff3c9..75451fdd75 100644
--- a/ietf/templates/group/change_reviewer_settings.html
+++ b/ietf/templates/group/change_reviewer_settings.html
@@ -13,7 +13,7 @@
     <h1>
         Change {{ group.acronym }} reviewer settings
         <br>
-        <small class="text-muted">{{ reviewer_email }}</small>
+        <small class="text-body-secondary">{{ reviewer_email }}</small>
     </h1>
     <h2 class="mt-5">Settings</h2>
     <form class="my-3 change-reviewer-settings" method="post">
@@ -89,7 +89,7 @@ <h2 class="mt-5">Unavailable periods</h2>
             <button type="submit"
                     class="btn btn-primary"
                     name="action"
-                    value="add_period">Add period</button>
+                    value="add_period">Save new period</button>
         </form>
     </div>
     <h2 class="mt-5">History of settings</h2>
@@ -105,11 +105,17 @@ <h2 class="mt-5">History of settings</h2>
             {% if reviewersettings.history.all %}
                 <tbody>
                     {% for h in reviewersettings.history.all %}
+                        {% if h|simple_history_delta_change_cnt > 0 or h.history_change_reason != "skipped" and h.history_change_reason %}
                         <tr>
                             <td>{{ h.history_date|date }}</td>
                             <td>{% person_link h.history_user.person %}</td>
-                            <td>{{ h.history_change_reason }}</td>
+                            <td>{% if h.history_change_reason != "skipped" and h.history_change_reason %} {{ h.history_change_reason }}<br> {% endif %}
+                                {% for change in h|simple_history_delta_changes %}
+                                   {{ change.field }} changed from "{{change.old}}" to "{{change.new}}"<br>
+                                {% endfor %}
+                            </td>
                         </tr>
+                        {% endif %}
                     {% endfor %}
                 </tbody>
             {% endif %}
diff --git a/ietf/templates/group/conclude.html b/ietf/templates/group/conclude.html
index 1742bafa13..3f99877336 100644
--- a/ietf/templates/group/conclude.html
+++ b/ietf/templates/group/conclude.html
@@ -8,7 +8,7 @@
     <h1>Request closing of {{ group.acronym }} {{ group.type.name }}</h1>
     <p class="alert alert-info my-3">
         Please provide instructions regarding the disposition of each
-        active Internet-Draft (such as to withdraw the draft, move it to
+        active Internet-Draft (such as to withdraw it, move it to
         another group, convert it to an individual submission, and so on),
         wording for the closure announcement, and the status of the group
         mailing list (will it remain open or should it be closed).
diff --git a/ietf/templates/group/concluded_groups.html b/ietf/templates/group/concluded_groups.html
index c748c2061b..725e8bd3cc 100644
--- a/ietf/templates/group/concluded_groups.html
+++ b/ietf/templates/group/concluded_groups.html
@@ -40,8 +40,8 @@ <h2 class="mt-5" id="{{ label|slugify }}">{{ label }}</h2>
                         <tr>
                             <th scope="col" data-sort="group">Group</th>
                             <th scope="col" data-sort="name">Name</th>
-                            <th scope="col" data-sort="date">Start</th>
-                            <th scope="col" data-sort="date">Concluded</th>
+                            <th scope="col" data-sort="date-start">Start</th>
+                            <th scope="col" data-sort="date-concluded">Concluded</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -51,8 +51,8 @@ <h2 class="mt-5" id="{{ label|slugify }}">{{ label }}</h2>
                                     <a href="{{ g.about_url }}">{{ g.acronym }}</a>
                                 </td>
                                 <td>{{ g.name }}</td>
-                                <td>{{ g.start_date|date:"Y-m" }}</td>
-                                <td>{{ g.conclude_date|date:"Y-m" }}</td>
+                                <td data-sort-number="{{ g.start_date|date:"U" }}">{{ g.start_date|date:"Y-m" }}</td>
+                                <td data-sort-number="{{ g.conclude_date|date:"U" }}">{{ g.conclude_date|date:"Y-m" }}</td>
                             </tr>
                         {% endfor %}
                     </tbody>
diff --git a/ietf/templates/group/customize_workflow.html b/ietf/templates/group/customize_workflow.html
index 8ebf004a06..e0904d2f4c 100644
--- a/ietf/templates/group/customize_workflow.html
+++ b/ietf/templates/group/customize_workflow.html
@@ -12,10 +12,10 @@
     <h1>
         Customize Workflow
         <br>
-        <small class="text-muted">{{ group.acronym }} {{ group.type.name }}</small>
+        <small class="text-body-secondary">{{ group.acronym }} {{ group.type.name }}</small>
     </h1>
     <p class="my-3">
-        Below you can customize the draft states and tags used in the
+        Below you can customize the Internet-Draft states and tags used in the
         <a href="{{ group.about_url }}">{{ group.acronym }} {{ group.type.name }}</a>.
         Note that some states are
         mandatory for group operation and cannot be deactivated.
@@ -48,8 +48,8 @@ <h2 class="mt-5">States</h2>
                               title="{{ state.desc|striptags|truncatewords:40 }}">
                             {{ state.name }}
                         </span>
-                        {% if not state.used %}<span class="text-muted">(not used in {{ group.acronym }})</span>{% endif %}
-                        {% if state.mandatory %}<span class="badge rounded-pill bg-success">Mandatory</span>{% endif %}
+                        {% if not state.used %}<span class="text-body-secondary">(not used in {{ group.acronym }})</span>{% endif %}
+                        {% if state.mandatory %}<span class="badge rounded-pill text-bg-success">Mandatory</span>{% endif %}
                     </td>
                     <td class="next-states">
                         {% if state.used_next_states %}
@@ -79,7 +79,7 @@ <h2 class="mt-5">States</h2>
                                     <input class="form-check-input" type="checkbox" name="next_states" value="{{ s.pk }}" id="id-{{ s.pk }}-{{ state.pk }}" {% if checked %} checked{% endif %}>
                                     <label class="form-check-label" for="id-{{ s.pk }}-{{ state.pk }}">
                                         {{ s.name }}
-                                        {% if default %}<span class="badge rounded-pill bg-secondary">Default</span>{% endif %}
+                                        {% if default %}<span class="badge rounded-pill text-bg-secondary">Default</span>{% endif %}
                                     </label>
                                 </div>
                             {% endfor %}
@@ -124,7 +124,7 @@ <h2 class="mt-5">Tags</h2>
                 <tr>
                     <td class="name">
                         <span {% if not tag.used %}class="text-decoration-line-through"{% endif %}>{{ tag.name }}</span>
-                        {% if not tag.used %}<span class="text-muted">(not used in {{ group.acronym }})</span>{% endif %}
+                        {% if not tag.used %}<span class="text-body-secondary">(not used in {{ group.acronym }})</span>{% endif %}
                     </td>
                     <td>
                         <form class="set-tag text-end" method="post">
diff --git a/ietf/templates/group/edit.html b/ietf/templates/group/edit.html
index 5544f862e2..1afe9116f7 100644
--- a/ietf/templates/group/edit.html
+++ b/ietf/templates/group/edit.html
@@ -18,7 +18,7 @@ <h1>
         {% if action == "edit" %}
             Edit {{ group.type.name }}
             <br>
-            <small class="text-muted">{{ group.acronym }}</small>
+            <small class="text-body-secondary">{{ group.acronym }}</small>
         {% elif action == "charter" %}
             Start chartering new group
         {% else %}
diff --git a/ietf/templates/group/edit_milestones.html b/ietf/templates/group/edit_milestones.html
index 36a4a714ca..b576ace184 100644
--- a/ietf/templates/group/edit_milestones.html
+++ b/ietf/templates/group/edit_milestones.html
@@ -14,8 +14,8 @@ <h1>{{ title }}</h1>
         <a class="btn btn-primary" href="{{ group.about_url }}">{{ group.acronym }} {{ group.type.name }}</a>
         {% if group.charter %}
             <a class="btn btn-primary"
-               href="{% url "ietf.doc.views_doc.document_main" name=group.charter.canonical_name %}">
-                {{ group.charter.canonical_name }}
+               href="{% url "ietf.doc.views_doc.document_main" name=group.charter.name %}">
+                {{ group.charter.name }}
             </a>
         {% endif %}
         {% if can_change_uses_milestone_dates %}
@@ -65,7 +65,7 @@ <h1>{{ title }}</h1>
                     <div class="row milestone{% if form.delete.data %} delete{% endif %}">
                         <div class="due handle col-md-2 col-form-label col-form-label-md">
                             {% if form.milestone.resolved %}
-                                <span class="badge rounded-pill bg-success">{{ form.milestone.resolved }}</span>
+                                <span class="badge rounded-pill text-bg-success">{{ form.milestone.resolved }}</span>
                             {% elif group.uses_milestone_dates and form.milestone.due %}
                                 <b>{{ form.milestone.due|date:"M Y" }}</b>
                             {% endif %}
@@ -74,12 +74,12 @@ <h1>{{ title }}</h1>
                             <b>{{ form.milestone.desc|urlize_ietf_docs }}</b>
                             {% if form.needs_review %}
                                 <span title="This milestone is not active yet, awaiting {{ reviewer }} acceptance"
-                                      class="badge rounded-pill bg-warning">
+                                      class="badge rounded-pill text-bg-warning">
                                     Awaiting accept
                                 </span>
                             {% endif %}
-                            {% if form.changed %}<span class="badge rounded-pill bg-info">Changed</span>{% endif %}
-                            {% if form.delete.data %}<span class="badge rounded-pill bg-danger">Deleted</span>{% endif %}
+                            {% if form.changed %}<span class="badge rounded-pill text-bg-info">Changed</span>{% endif %}
+                            {% if form.delete.data %}<span class="badge rounded-pill text-bg-danger">Deleted</span>{% endif %}
                             {% for d in form.docs_names %}<div class="doc">{{ d }}</div>{% endfor %}
                         </div>
                     </div>
@@ -106,7 +106,7 @@ <h1>{{ title }}</h1>
             </div>
         </div>
         <a class="btn btn-secondary float-end"
-           href="{% if milestone_set == "charter" %}{% url "ietf.doc.views_doc.document_main" name=group.charter.canonical_name %}{% else %}{{ group.about_url }}{% endif %}">
+           href="{% if milestone_set == "charter" %}{% url "ietf.doc.views_doc.document_main" name=group.charter.name %}{% else %}{{ group.about_url }}{% endif %}">
             Cancel
         </a>
         <button class="btn btn-primary hidden"
diff --git a/ietf/templates/group/email.html b/ietf/templates/group/email.html
index 5dace72911..4a1f4b6de1 100644
--- a/ietf/templates/group/email.html
+++ b/ietf/templates/group/email.html
@@ -47,8 +47,16 @@ <h2 class="mt-3">Recipient expansions</h2>
                         <a href="{% url 'ietf.mailtrigger.views.show_triggers' trigger %}"
                            title="{{ desc }}">{{ trigger }}</a>
                     </td>
-                    <td>{{ to|join:', '|unescape|linkify }}</td>
-                    <td>{{ cc|join:', '|unescape|linkify }}</td>
+                    <td>
+                        {% for addr in to %}
+                            {{ addr|linkify }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    </td>
+                    <td>
+                        {% for addr in cc %}
+                            {{ addr|linkify }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    </td>
                 </tr>
             {% endfor %}
         </tbody>
diff --git a/ietf/templates/group/email_aliases.html b/ietf/templates/group/email_aliases.html
index 415f9950c2..f36be7f0f3 100644
--- a/ietf/templates/group/email_aliases.html
+++ b/ietf/templates/group/email_aliases.html
@@ -14,7 +14,7 @@ <h1>
         Group email aliases
         {% if group %}
             <br>
-            <span class="text-muted">{{ group.acronym }}</span>
+            <span class="text-body-secondary">{{ group.acronym }}</span>
         {% endif %}
     </h1>
     {% regroup aliases|dictsort:"acronym" by acronym as alias_list %}
diff --git a/ietf/templates/group/email_open_review_assignments.html b/ietf/templates/group/email_open_review_assignments.html
index 4f72e1c80e..64b9c2e064 100644
--- a/ietf/templates/group/email_open_review_assignments.html
+++ b/ietf/templates/group/email_open_review_assignments.html
@@ -9,7 +9,7 @@
     <h1>
         Email summary of assigned review requests
         <br>
-        <small class="text-muted">{{ group.acronym }}</small>
+        <small class="text-body-secondary">{{ group.acronym }}</small>
     </h1>
     {% if review_assignments %}
         <form class="my-3 email-open-review-assignments" method="post">
diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html
index 261ffe31f0..0a8b9194f2 100644
--- a/ietf/templates/group/group_about.html
+++ b/ietf/templates/group/group_about.html
@@ -12,6 +12,10 @@
     text-decoration: none;
 }
 {% endblock %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+    <link rel="stylesheet" href="{% static "ietf/css/highcharts.css" %}">
+{% endblock %}
 {% block group_content %}
     {% origin %}
     {% if group.state_id == "conclude" %}
@@ -47,6 +51,13 @@
                         {{ group.parent.name }}
                         <a href="{% url "ietf.group.views.group_home" acronym=group.parent.acronym %}">({{ group.parent.acronym }})</a>
                     </td>
+                {% elif group.parent and group.type_id == "team" %}
+                    <th scope="row">Parent</th>
+                    <td class="edit"></td>
+                    <td>
+                        {{ group.parent.name }}
+                        <a href="{% url "ietf.group.views.group_home" acronym=group.parent.acronym %}">({{ group.parent.acronym }})</a>
+                    </td>
                 {% else %}
                     <td></td>
                     <td class="edit"></td>
@@ -64,7 +75,7 @@
                 </td>
                 <td>
                     <span class="{% if group.state.name|slugify == 'active' %}text-success{% elif group.state.name|slugify == 'concluded' %}text-danger{% endif %}">{{ group.state.name }}</span>
-                    {% if requested_close %}<div class="badge rounded-pill bg-info">Being closed</div>{% endif %}
+                    {% if requested_close %}<div class="badge rounded-pill text-bg-info">Being closed</div>{% endif %}
                 </td>
             </tr>
             {% if group.features.has_chartering_process %}
@@ -77,10 +88,10 @@
                             <a href="{% url "ietf.doc.views_doc.document_main" name=group.charter.name %}">
                                 {{ group.charter.name }}-{{ group.charter.rev }}</a>
                             {% if group.charter.get_state.name %}
-                                <span class="badge rounded-pill bg-info">{{ group.charter.get_state.name }}</span>
+                                <span class="badge rounded-pill text-bg-info">{{ group.charter.get_state.name }}</span>
                             {% endif %}
                         {% else %}
-                            <span class="text-muted">(None)</span>
+                            <span class="text-body-secondary">(None)</span>
                             {% if user|has_role:"Area Director,Secretariat" %}
                                 <a class="btn btn-warning btn-sm" href="{{ charter_submit_url }}">Submit charter</a>
                             {% endif %}
@@ -109,11 +120,11 @@
                                href="{% url "ietf.group.views.group_about_status" acronym=group.acronym %}">
                                 Show
                             </a>
-                            <span class="badge rounded-pill bg-secondary">
+                            <span class="badge rounded-pill text-bg-secondary">
                                 Changed {{ status_update.time|date:"Y-m-d" }}
                             </span>
                         {% else %}
-                            <span class="text-muted">
+                            <span class="text-body-secondary">
                                 (None)
                             </span>
                         {% endif %}
@@ -154,7 +165,7 @@
                                     </div>
                                     <div class="modal-footer">
                                         <div class="btn-group me-auto" role="group" aria-label="Pan and zoom the diagram">
-                                            <small class="text-muted">Pan and zoom the dependency
+                                            <small class="text-body-secondary">Pan and zoom the dependency
                                                 graph after the layout settles.</small>
                                         </div>
                                         <div class="form-check">
@@ -211,6 +222,18 @@
                     </tr>
                 {% endif %}
             {% endwith %}
+            {% if group.type.slug == "area" %}
+            <tr>
+                <td></td>
+                <th scope="row">
+                    Group statistics
+                </th>
+                <td class="edit"></td>
+                <td>
+                    {% include "group/group_stats_modal.html" with group=group only %}
+                </td>
+            </tr>
+            {% endif %}
         </tbody>
         {% if group.personnel %}
         <tbody class="meta border-top">
@@ -364,8 +387,7 @@ <h2 class="mt-3">
             {% if group.state_id == "proposed" %}proposed{% endif %}
             {{ group.type.desc.title }}
         </h2>
-        {# the linebreaks filter adds <p>, no surrounding <p> necessary: #}
-        {{ group.charter_text|urlize_ietf_docs|linkify|linebreaks }}
+        {{ group.charter_html }}
     {% else %}
         <h2 class="mt-3">
             {% if requested_close or group.state_id == "conclude" %}Final{% endif %}
@@ -389,8 +411,44 @@ <h2 class="mt-3">
             </p>
         {% endif %}
     {% endif %}
+    {% if subgroups %}
+        <h2 class="mt-4">
+            Groups in {{ group.acronym|upper }}
+        </h2>
+        <table class="table table-sm table-striped tablesorter">
+            <thead>
+                <tr>
+                    <th scope="col" data-sort="group">Group</th>
+                    <th scope="col" data-sort="name">Name</th>
+                    <th scope="col" data-sort="type">Type</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for sg in subgroups %}
+                    <tr>
+                        <td>
+                            <div id="{{ sg.acronym }}">
+                                <a href="{% url "ietf.group.views.group_home" acronym=sg.acronym %}">
+                                    {{ sg.acronym }}
+                                </a>
+                            </div>
+                        </td>
+                        <td>{{ sg.name }}</td>
+                        <td>{{ sg.type }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
 {% endblock %}
 {% block js %}
+<script src="{% static "ietf/js/list.js" %}"></script>
 <script src="{% static 'ietf/js/d3.js' %}"></script>
 <script src="{% static 'ietf/js/document_relations.js' %}"></script>
-{% endblock %}
\ No newline at end of file
+    <script src="{% static 'ietf/js/highcharts.js' %}"></script>
+    <script>
+        $(function () {
+            group_stats("{% url 'ietf.group.views.group_stats_data' %}", ".chart");
+        });
+    </script>
+{% endblock %}
diff --git a/ietf/templates/group/group_about_rendertest.html b/ietf/templates/group/group_about_rendertest.html
deleted file mode 100644
index 3f57bccc70..0000000000
--- a/ietf/templates/group/group_about_rendertest.html
+++ /dev/null
@@ -1,54 +0,0 @@
-{% extends "group/group_base.html" %}
-{# Copyright The IETF Trust 2021, All Rights Reserved #}
-{% load origin %}
-{% load ietf_filters %}
-{% block group_content %}
-    {% if charter %}
-        {% comment %}
-    <div class="row">
-        <div class="col-md-6 h2 text-center bg-info border-end">Current about page rendering</div>
-        <div class="col-md-6 h2 text-center bg-info">Markdown rendering</div>
-    </div>
-    <div class="row border-bottom text-center">
-        <div class="col-md-6 border-end">&nbsp;</div>
-        <div class="col-md-6"><input type="checkbox" class="form-check-input" name="widthconstraint"> Constrain width</input></div>
-    </div>
-    <div class="row">
-        <div class="col-md-6 border-end">{{charter|linebreaks}}</div>
-        <div class="col-md-6 rightcontent">{{rendered|sanitize|safe}}</div>
-    </div>
-        {% endcomment %}
-        <div class="my-3 row">
-            <div class="col-md-6 border-end">
-                <div class="h2 text-center bg-info">Current about page rendering</div>
-                <div class="border-bottom text-center">&nbsp;</div>
-                <div>{{ charter|linebreaks }}</div>
-            </div>
-            <div class="col-md-6 rightpanel">
-                <div class="h2 text-center bg-info">Markdown rendering</div>
-                <div class="border-bottom text-center">
-                    <label class="form-label" for="widthconstraint">Constrain width</label>
-                    <input type="checkbox" class="form-check-input" name="widthconstraint" id="widthconstraint">
-            </div>
-            <div class="rightcontent">{{ rendered|sanitize|safe }}</div>
-        </div>
-    </div>
-{% else %}
-    <div>Group has no charter document</div>
-{% endif %}
-{% endblock %}
-{% block js %}
-    <script>
-        $(document).ready(function() {
-            $('input[name=widthconstraint]').trigger("change", function() {
-                if ($(this).is(':checked')) {
-                    $('.rightcontent').css('max-width','700px')
-                } else {
-                    $('.rightcontent').css('max-width','')
-                }
-            });
-            $('input[name=widthconstraint').prop('checked', true);
-            $('.rightcontent').css('max-width','700px')
-        });
-    </script>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/group_about_status.html b/ietf/templates/group/group_about_status.html
index c2fe7e0ae9..19f60d67f8 100644
--- a/ietf/templates/group/group_about_status.html
+++ b/ietf/templates/group/group_about_status.html
@@ -11,20 +11,20 @@
     <h1>
         Status update for {{ group.type.name }}
         <br>
-        <small class="text-muted">{{ group.acronym }}</small>
+        <small class="text-body-secondary">{{ group.acronym }}</small>
     </h1>
     {% if can_provide_status_update %}
         <div class="my-3 alert alert-info">
             <h2>About Status Updates</h2>
             <p>
                 Capturing group status updates in the datatracker allows including them in meeting proceedings. This capability was added to address the IESG request at
-                <a href="https://trac.ietf.org/trac/ietfdb/ticket/1773">ticket 1773</a>.
+                <a href="https://github.com/ietf-tools/datatracker/issues/1773">ticket 1773</a>.
                 Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see
                 <a href="https://mailarchive.ietf.org/arch/msg/saag/fo2b3KA47SM4MuQuYj5VIh-Tjok">
                     the Kitten report sent to SAAG for IETF94
                 </a>
                 or the
-                <a href="https://trac.ietf.org/trac/rtg/wiki/IETF94summary">Routing area high level summaries for IETF94</a>.
+                <a href="https://wiki.ietf.org/group/rtg/IETF94summary">Routing area high level summaries for IETF94</a>.
             </p>
         </div>
     {% endif %}
diff --git a/ietf/templates/group/group_about_status_edit.html b/ietf/templates/group/group_about_status_edit.html
index a69bab23b7..6406e536da 100644
--- a/ietf/templates/group/group_about_status_edit.html
+++ b/ietf/templates/group/group_about_status_edit.html
@@ -8,19 +8,19 @@
     <h1>
         Edit status update for {{ group.type.name }}
         <br>
-        <small class="text-muted">{{ group.acronym }}</small>
+        <small class="text-body-secondary">{{ group.acronym }}</small>
     </h1>
     <div class="my-3 alert alert-info">
         <h2>About Status Updates</h2>
         <p>
             Capturing group status updates in the datatracker allows including them in meeting proceedings. This capability was added to address the IESG request at
-            <a href="https://trac.ietf.org/trac/ietfdb/ticket/1773">ticket 1773</a>.
+            <a href="https://github.com/ietf-tools/datatracker/issues/1773">ticket 1773</a>.
             Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see
             <a href="https://mailarchive.ietf.org/arch/msg/saag/fo2b3KA47SM4MuQuYj5VIh-Tjok">
                 the Kitten report sent to SAAG for IETF94
             </a>
             or the
-            <a href="https://trac.ietf.org/trac/rtg/wiki/IETF94summary">Routing area high level summaries for IETF94</a>.
+            <a href="https://wiki.ietf.org/group/rtg/IETF94summary">Routing area high level summaries for IETF94</a>.
         </p>
     </div>
     <form enctype="multipart/form-data" method="post">
diff --git a/ietf/templates/group/group_base.html b/ietf/templates/group/group_base.html
index b6c3f99bac..f6dcc8cdd9 100644
--- a/ietf/templates/group/group_base.html
+++ b/ietf/templates/group/group_base.html
@@ -10,10 +10,10 @@
     {% origin %}
     <h1>
         {% if group.state_id == "dormant" or group.state_id == "conclude" %}
-            <span class="badge rounded-pill bg-warning float-end ms-3">Concluded {{ group.type.name }}</span>
+            <span class="badge rounded-pill text-bg-warning float-end ms-3">Concluded {{ group.type.name }}</span>
         {% endif %}
-        {% if group.state_id == "replaced" %}<span class="badge rounded-pill bg-warning float-end ms-3">Replaced {{ group.type.name }}</span>{% endif %}
-        {% if group.state_id == "proposed" %}<span class="badge rounded-pill bg-info float-end ms-3">Proposed {{ group.type.name }}</span>{% endif %}
+        {% if group.state_id == "replaced" %}<span class="badge rounded-pill text-bg-warning float-end ms-3">Replaced {{ group.type.name }}</span>{% endif %}
+        {% if group.state_id == "proposed" %}<span class="badge rounded-pill text-bg-info float-end ms-3">Proposed {{ group.type.name }}</span>{% endif %}
         {{ group.name }} ({{ group.acronym }})
     </h1>
     <ul class="nav nav-tabs my-3">
diff --git a/ietf/templates/group/group_entry_with_charter.txt b/ietf/templates/group/group_entry_with_charter.txt
index cfce907fbc..846cc395b8 100644
--- a/ietf/templates/group/group_entry_with_charter.txt
+++ b/ietf/templates/group/group_entry_with_charter.txt
@@ -37,12 +37,12 @@ Goals and Milestones:
 {% for milestone in group.milestones %}  {% if milestone.resolved %}{{ milestone.resolved }}    {% else %}{{ milestone.due|date:"M Y" }}{% endif %} - {{ milestone.desc }}
 {% endfor %}
 Internet-Drafts:
-{% for alias in group.drafts %}  - {{ alias.document.title }} [{{ alias.name }}-{{ alias.document.rev }}] ({{ alias.document.pages }} pages)
+{% for document in group.drafts %}  - {{ document.title|clean_whitespace }} [{{ document.name }}-{{ document.rev }}] ({{ document.pages }} pages)
 {% endfor %}
 {% if group.rfcs %}Requests for Comments:
-{% for alias in group.rfcs %}  {{ alias.name.upper }}: {{ alias.document.title}} ({{ alias.document.pages }} pages){% for r in alias.rel %}
-           * {{ r.action }} {{ r.target.name|upper }}{% endfor %}{% for r in alias.invrel %}
-           * {% if r.relationsship == "obs" %}{{ r.inverse_action|upper }}{% else %}{{ r.action }}{% endif %} {{ r.source.canonical_name|upper }}{% endfor %}
+{% for document in group.rfcs %}  {{ document.name.upper }}: {{ document.title}} ({{ document.pages }} pages){% for r in document.rel %}
+           * {{ r.action }} {{ r.target.name|upper }}{% endfor %}{% for r in document.invrel %}
+           * {% if r.relationsship == "obs" %}{{ r.inverse_action|upper }}{% else %}{{ r.action }}{% endif %} {{ r.source.name|upper }}{% endfor %}
 {% endfor %}
 {% else %}No Requests for Comments{% endif %}
 {% endautoescape %}
diff --git a/ietf/templates/group/group_leadership.html b/ietf/templates/group/group_leadership.html
new file mode 100644
index 0000000000..644be3e150
--- /dev/null
+++ b/ietf/templates/group/group_leadership.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2024, All Rights Reserved #}
+{% load origin static person_filters ietf_filters %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static 'ietf/css/list.css' %}">
+{% endblock %}
+{% block title %}Group Leadership{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>Group Leadership ({{ group_type }})</h1>
+    {% if user|has_role:"Secretariat" %}
+        <div class="text-end">
+            <a class="btn btn-primary" href="{% url 'ietf.group.views.group_leadership_csv' group_type=group_type %}">
+            <i class="bi bi-file-ruled"></i> Export as CSV
+            </a>
+        </div>
+    {% endif %}
+    <table class="table table-sm table-striped">
+        <thead>
+            <tr>
+                <th scope="col">Leader</th>
+                <th scope="col">Groups</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for leader in leaders %}
+                <tr>
+                    <td>{{ leader.name }}</td>
+                    <td>{{ leader.groups }}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}
diff --git a/ietf/templates/group/group_stats_modal.html b/ietf/templates/group/group_stats_modal.html
new file mode 100644
index 0000000000..6431b675b5
--- /dev/null
+++ b/ietf/templates/group/group_stats_modal.html
@@ -0,0 +1,45 @@
+<button type="button"
+        class="btn btn-sm btn-primary"
+        data-bs-toggle="modal"
+        data-bs-target="#stats-modal-{{ group.acronym|slugify }}">
+    <i class="bi bi-pie-chart-fill"></i> Show {{ group.acronym|upper }} statistics
+</button>
+<div class="modal fade"
+     id="stats-modal-{{ group.acronym|slugify }}"
+     tabindex="-1"
+     aria-labelledby="stats-modal-label-{{ group.acronym|slugify }}"
+     aria-hidden="true">
+    <div class="modal-dialog modal-dialog-scrollable modal-xl">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h1 class="modal-title fs-5"
+                    id="stats-modal-label-{{ group.acronym|slugify }}">{{ group.acronym|upper }} statistics</h1>
+                <button type="button"
+                        class="btn-close"
+                        data-bs-dismiss="modal"
+                        aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-lg chart text-center"
+                         data-area="{{ group.acronym|lower }}"
+                         data-dataset="docs">
+                        <div class="spinner-border" role="status">
+                            <span class="visually-hidden">Loading...</span>
+                        </div>
+                    </div>
+                    <div class="col-lg chart text-center"
+                         data-area="{{ group.acronym|lower }}"
+                         data-dataset="pages">
+                        <div class="spinner-border" role="status">
+                            <span class="visually-hidden">Loading...</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html
index 4087ebfe8a..609c650180 100644
--- a/ietf/templates/group/index.html
+++ b/ietf/templates/group/index.html
@@ -27,7 +27,7 @@ <h1>Other RFC streams</h1>
                     <td>
                         {% with stream.get_chair as role %}
                             {% person_link role.person %}
-                            {% if role %}<span class="badge rounded-pill bg-info">{{ role.name }}</span>{% endif %}
+                            {% if role %}<span class="badge rounded-pill text-bg-info">{{ role.name }}</span>{% endif %}
                         {% endwith %}
                     </td>
                 </tr>
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index 175bfff5c9..d240ef24fa 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -12,7 +12,7 @@
     <h1>
         Manage {{ assignment_status }} open review requests
         <br>
-        <small class="text-muted">{{ group.acronym }}</small>
+        <small class="text-body-secondary">{{ group.acronym }}</small>
     </h1>
     {% if newly_closed > 0 or newly_opened > 0 or newly_assigned > 0 %}
         <p class="alert alert-danger my-3">
@@ -36,7 +36,7 @@ <h1>
                                 {{ r.type.name }}
                             {% endif %}
                             deadline {{ r.deadline|date:"Y-m-d" }}
-                            {% if r.due %}<span class="badge rounded-pill bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
+                            {% if r.due %}<span class="badge rounded-pill text-bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
                         </span>
                         <a href="{% if r.requested_rev %}{% url "ietf.doc.views_doc.document_main" name=r.doc.name rev=r.requested_rev %}{% else %}{% url "ietf.doc.views_doc.document_main" name=r.doc.name %}{% endif %}?include_text=1">
                             {{ r.doc.name }}-
@@ -63,13 +63,13 @@ <h1>
                                     {% endif %}
                                     <br>
                                 {% else %}
-                                    <span class="badge rounded-pill bg-info">Auto-suggested</span>
+                                    <span class="badge rounded-pill text-bg-info">Auto-suggested</span>
                                     <br>
                                 {% endif %}
-                                {% if r.doc.authors %}
+                                {% if r.doc.author_persons_or_names %}
                                     <span class="fw-bold">Authors:</span>
-                                    {% for person in r.doc.authors %}
-                                        {% person_link person %}{% if not forloop.last %},{% endif %}
+                                    {% for person, tp_name in r.doc.author_persons_or_names %}
+                                        {% if person %}{% person_link person %}{% else %}<span>{{ tp_name }}</span>{% endif %}{% if not forloop.last %},{% endif %}
                                     {% endfor %}
                                     <br>
                                 {% endif %}
@@ -135,10 +135,10 @@ <h1>
                                     {% endfor %}
                                 {% endif %}
                                 <div>
-                                    <span class="badge rounded-pill bg-secondary">{{ r.doc.pages }} page{{ r.doc.pages|pluralize }}</span>
-                                    <span class="badge rounded-pill bg-info">{{ r.doc.friendly_state }}</span>
+                                    <span class="badge rounded-pill text-bg-secondary">{{ r.doc.pages }} page{{ r.doc.pages|pluralize }}</span>
+                                    <span class="badge rounded-pill text-bg-info">{{ r.doc.friendly_state }}</span>
                                 </div>
-                                {% if r.doc.telechat_date %}<span class="badge rounded-pill bg-warning">IESG telechat {{ r.doc.telechat_date }}</span>{% endif %}
+                                {% if r.doc.telechat_date %}<span class="badge rounded-pill text-bg-warning">IESG telechat {{ r.doc.telechat_date }}</span>{% endif %}
                                 {% if r.comment %}<pre class="border p-3 pasted">{{ r.comment }}</pre>{% endif %}
                             </div>
                             <div class="col-sm-6">
@@ -169,8 +169,8 @@ <h1>
                                             title="Click to reassign reviewer">
                                         {% person_link r.reviewer.person %}
                                     </button>
-                                    {% if r.state_id == "accepted" %}<span class="badge rounded-pill bg-secondary">Accepted</span>{% endif %}
-                                    {% if r.reviewer_unavailable %}<span class="badge rounded-pill bg-danger">Unavailable</span>{% endif %}
+                                    {% if r.state_id == "accepted" %}<span class="badge rounded-pill text-bg-secondary">Accepted</span>{% endif %}
+                                    {% if r.reviewer_unavailable %}<span class="badge rounded-pill text-bg-danger">Unavailable</span>{% endif %}
                                 {% else %}
                                     <button type="button"
                                             class="btn btn-sm btn-primary btn-success"
diff --git a/ietf/templates/group/materials.html b/ietf/templates/group/materials.html
index 2bfb8fe3e0..8ab6fb5121 100644
--- a/ietf/templates/group/materials.html
+++ b/ietf/templates/group/materials.html
@@ -39,7 +39,7 @@ <h2 class="mt-3">{{ doc_type.name }}</h2>
                                 {% for p in past_pres_list %}
                                     {{ p.grouper }}
                                     {% if p.list|length > 1 %}
-                                        <span class="badge rounded-pill bg-info">{{ p.list|length }} sessions</span>
+                                        <span class="badge rounded-pill text-bg-info">{{ p.list|length }} sessions</span>
                                     {% else %}
                                         {% for pr in p.list %}
                                             {% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %}
@@ -52,7 +52,7 @@ <h2 class="mt-3">{{ doc_type.name }}</h2>
                                 {% for p in meeting_pres_list %}
                                     {{ p.grouper }}
                                     {% if p.list|length > 1 %}
-                                        <span class="badge rounded-pill bg-info">{{ p.list|length }} sessions</span>
+                                        <span class="badge rounded-pill text-bg-info">{{ p.list|length }} sessions</span>
                                     {% else %}
                                         {% for pr in p.list %}
                                             {% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %}
diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html
index ff3b3af376..8927eb61a2 100644
--- a/ietf/templates/group/meetings-row.html
+++ b/ietf/templates/group/meetings-row.html
@@ -1,3 +1,6 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load origin tz %}
+{% origin %}
 {% for s in sessions %}
     <tr>
         <td>
@@ -8,28 +11,33 @@
             {% endif %}
         </td>
         <td>
-            {% if s.name %}{{ s.name }}{% endif %}
             {% if s.current_status == "sched" %}
-                {{ s.time|date:"Y-m-d" }}
+                {% with timeslot=s.official_timeslotassignment.timeslot %}
+                <span class="session-time date me-3" data-start-utc="{{ timeslot.time|utc|date:'Y-m-d H:i' }}" data-end-utc="{{ timeslot.end_time|utc|date:'Y-m-d H:i' }}"></span>
+                {% endwith %}
             {% else %}
-                <i>{{ s.current_status_name }}</i>
+                <div class="badge rounded-pill text-bg-secondary">{{ s.current_status_name }}</div>
+                {% if s.current_status == "canceled" %}
+                    {% with timeslot=s.official_timeslotassignment.timeslot %}
+                        <span class="text-decoration-line-through text-secondary session-time date me-3" data-start-utc="{{ timeslot.time|utc|date:'Y-m-d H:i' }}" data-end-utc="{{ timeslot.end_time|utc|date:'Y-m-d H:i' }}"></span>
+                    {% endwith %}
+                {% endif %}
             {% endif %}
             {% if show_request and s.meeting.type_id == 'ietf' %}
                 {% if can_edit %}
                     <a class="btn btn-primary btn-sm"
-                       href="{% url 'ietf.secr.sreq.views.view' num=s.meeting.number acronym=s.group.acronym %}">
+                       href="{% url 'ietf.meeting.views_session_request.view_request' num=s.meeting.number acronym=s.group.acronym %}">
                         Edit Session Request
                     </a>
                 {% endif %}
             {% endif %}
         </td>
         <td>
-            {% if s.current_status == "sched" %}{{ s.time|date:"D" }}{% endif %}
+            {% if s.name %}{{ s.name }}{% endif %}
         </td>
         <td>
-            {% if show_ical %}
+            {% if show_ical and s.current_status == "sched" %}
                 {% if s.meeting.type_id == 'ietf' %}
-                    {{ s.time|date:"H:i" }}
                     <a class="btn btn-primary btn-sm"
                        aria-label="icalendar entry for {{s.group.acronym}} at IETF {{s.meeting.number}}"
                        title="icalendar entry for {{s.group.acronym}} at IETF {{s.meeting.number}}"
@@ -53,15 +61,29 @@
                {% if s.minutes %}href="{{ s.minutes.get_absolute_url }}"{% endif %}>
                 Minutes
             </a>
+            {% if group.acronym == "iesg" %}
+            <a class="btn btn-sm {% if not s.narrative_minutes %}btn-secondary disabled{% else %}btn-primary{% endif %}"
+               {% if s.narrative_minutes %}href="{{ s.narrative_minutes.get_absolute_url }}"{% endif %}>
+                Narrative Minutes
+            </a>
+            {% endif %}
             <a class="btn btn-primary btn-sm"
-               href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">
+                href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">
+                {% if can_always_edit or can_edit_materials %}
+                    <i class="bi bi-pencil-square">
+                    </i>
+                {% endif %}
                 Materials
             </a>
-            {% if can_always_edit or can_edit_materials %}
-                <a class="btn btn-info btn-sm float-end"
-                   href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">
-                    Edit Materials
-                </a>
+            {% if not s.cancelled %}
+                <div class="regular float-end">
+                    {# see note in the included templates re: show_agenda parameter and required JS import #}
+                    {% if s.meeting.type.slug == 'interim' %}
+                        {% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False session=s meeting=s.meeting %}
+                    {% else %}
+                        {% include "meeting/session_buttons_include.html" with show_agenda=False item=s.official_timeslotassignment session=s meeting=s.meeting %}
+                    {% endif %}
+                </div>
             {% endif %}
         </td>
     </tr>
diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html
index 69ec5458cc..30f478da13 100644
--- a/ietf/templates/group/meetings.html
+++ b/ietf/templates/group/meetings.html
@@ -1,6 +1,6 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
 {% extends "group/group_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin static %}
 {% block title %}
     Meetings
     {% if group %}for {{ group.acronym }}{% endif %}
@@ -10,7 +10,7 @@
     <a class="btn btn-primary"
        href="{% url 'ietf.meeting.views.meeting_requests' %}">Session requests</a>
     {% if can_edit or can_always_edit %}
-        <a class="btn btn-primary" href="{% url 'ietf.secr.sreq.views.main' %}">Request a session</a>
+        <a class="btn btn-primary" href="{% url 'ietf.meeting.views_session_request.list_view' %}">Request a session</a>
         <a class="btn btn-primary"
            href="{% url 'ietf.meeting.views.interim_request' %}?group={{ group.id }}">
             Request an interim meeting
@@ -19,14 +19,15 @@
 {% endblock %}
 {% block group_content %}
     {% origin %}
+    {% include "meeting/tz-display.html" with meeting_timezone=None id_suffix="" minimal=False only %}
     {% if in_progress %}
-        <h2 class="mt-3" id="inprogressmeets">Meetings in progress</h2>
+        <h2 class="mt-5" id="inprogressmeets">Meetings in progress</h2>
         {% with sessions=in_progress show_request=True show_ical=True can_edit_materials=can_edit %}
             <table class="table table-sm table-striped tablesorter">
                 <thead>
                     <tr>
-                        <th scope="col" data-sort="meeting">Meeting</th>
-                        <th scope="col" data-sort="date">Date</th>
+                        <th class="col-3" scope="col" data-sort="meeting">Meeting</th>
+                        <th class="col-3" scope="col" data-sort="date">Date</th>
                         <th scope="col"></th>
                         <th scope="col">Materials</th>
                     </tr>
@@ -38,20 +39,20 @@ <h2 class="mt-3" id="inprogressmeets">Meetings in progress</h2>
         {% endwith %}
     {% endif %}
     {% if future %}
-        <h2 class="mt-3" id="futuremeets">
+        <h2 class="mt-5" id="futuremeets">
             Future Meetings
-            <a class="float-end"
-               aria-label="icalendar entry for all scheduled future {{ group.acronym }} meetings"
-               title="icalendar entry for all scheduled future {{ group.acronym }} meetings"
-               href="{% url 'ietf.meeting.views.upcoming_ical' %}?show={{ group.acronym }}">
-                <i class="bi bi-calendar"></i>
-            </a>
+            {% for cal_action in cal_actions %}
+                <a class="btn btn-primary"
+                   href="{{ cal_action.url }}">
+                    {{ cal_action.label }}
+                </a>
+            {% endfor %}
         </h2>
         <table class="table table-sm table-striped tablesorter">
             <thead>
                 <tr>
-                    <th scope="col" data-sort="meeting">Meeting</th>
-                    <th scope="col" data-sort="date">Date</th>
+                    <th class="col-3" scope="col" data-sort="meeting">Meeting</th>
+                    <th class="col-3" scope="col" data-sort="date">Date</th>
                     <th scope="col"></th>
                     <th scope="col">Materials</th>
                 </tr>
@@ -64,12 +65,12 @@ <h2 class="mt-3" id="futuremeets">
         </table>
     {% endif %}
     {% if past or recent %}
-        <h2 class="mt-3" id="pastmeets">Past Meetings</h2>
+        <h2 class="mt-5" id="pastmeets">Past Meetings (within the last four years)</h2>
         <table class="table table-sm table-striped tablesorter">
             <thead>
                 <tr>
-                    <th scope="col" data-sort="meeting">Meeting</th>
-                    <th scope="col" data-sort="date">Date</th>
+                    <th class="col-3" scope="col" data-sort="meeting">Meeting</th>
+                    <th class="col-3" scope="col" data-sort="date">Date</th>
                     <th scope="col"></th>
                     <th scope="col">Materials</th>
                 </tr>
@@ -84,7 +85,94 @@ <h2 class="mt-3" id="pastmeets">Past Meetings</h2>
             </tbody>
         </table>
     {% endif %}
-    <p class="alert alert-info my-3">
-        This page shows meetings within the last four years. For earlier meetings, please see the proceedings.
-    </p>
-{% endblock %}
\ No newline at end of file
+    {# The following is a temporary performance workaround, not long term design #}
+    {% if group.acronym != "iab" and group.acronym != "iesg" %}
+        <p class="alert alert-info my-3">
+            This page shows meetings within the last four years. For earlier meetings, please see the
+            <a href="https://www.ietf.org/how/meetings/past/">proceedings</a>.
+        </p>
+    {% else %}
+        {% comment %}
+            Note: This block is only capable of correctly processing interim sessions.
+            If the view starts sending other types of meetings with a non-empty 
+            older_sessions value, this block will need to be adjusted.
+        {% endcomment %}
+        {% if far_past %}
+            <h2 class="mt-5" id="farpastmeets">Meetings more than four years ago</h2>
+            <table class="table table-sm table-striped tablesorter">
+                <thead>
+                    <tr>
+                        <th class="col-3" scope="col" data-sort="meeting">Meeting</th>
+                        <th class="col-3" scope="col" data-sort="date">Date</th>
+                        <th scope="col"></th>
+                        <th scope="col">Materials</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for s in far_past %}
+                    <tr>
+                        <td>
+                            {% if s.meeting.type.slug == 'ietf' %}
+                                IETF {{ s.meeting.number }}
+                            {% else %}
+                                {{ s.meeting.number }}
+                            {% endif %}                    </td>
+                        <td>
+                            {% if s.current_status == "sched" %}
+                                {{ s.time|date:"Y-m-d" }}
+                            {% else %}
+                                <i>{{ s.current_status_name }}</i>
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if s.name %}{{ s.name }}{% endif %}
+                        </td>
+                        <td>
+                            {% if s.current_status == "sched" %}{{ s.time|date:"D" }}{% endif %}
+                        </td>
+                        <td>
+                            {% if not s.canceled %}
+                                <a class="btn btn-sm {% if not s.agenda %}btn-secondary disabled{% else %}btn-primary{% endif %}"
+                                {% if s.agenda %}href="{{ s.agenda.get_absolute_url }}"{% endif %}>
+                                    Agenda
+                                </a>
+                                <a class="btn btn-sm {% if not s.minutes %}btn-secondary disabled{% else %}btn-primary{% endif %}"
+                                {% if s.minutes %}href="{{ s.minutes.get_absolute_url }}"{% endif %}>
+                                    Minutes
+                                </a>
+                                {% if group.acronym == "iesg" %}
+                                <a class="btn btn-sm {% if not s.narrative_minutes %}btn-secondary disabled{% else %}btn-primary{% endif %}"
+                                {% if s.narrative_minutes %}href="{{ s.narrative_minutes.get_absolute_url }}"{% endif %}>
+                                    Narrative Minutes
+                                </a>                                
+                                {% endif %}
+                                <a class="btn btn-primary btn-sm"
+                                    href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">
+                                    {% if can_always_edit or can_edit_materials %}
+                                        <i class="bi bi-pencil-square">
+                                        </i>
+                                    {% endif %}
+                                    Materials
+                                </a>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+    {% endif %}
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/list.js' %}"></script>
+    <script src="{% static 'ietf/js/moment.js' %}"></script>
+    <script src="{% static 'ietf/js/upcoming.js' %}"></script>
+    <script src="{% static 'ietf/js/timezone.js' %}"></script>
+    <script>
+    $(function () {
+            // Init with best guess at local timezone.
+            ietf_timezone.set_tz_change_callback(timezone_changed);
+            ietf_timezone.initialize('local');
+    });
+    </script>
+{% endblock %}
diff --git a/ietf/templates/group/milestones.html b/ietf/templates/group/milestones.html
index 8375a51e81..51579ce80a 100644
--- a/ietf/templates/group/milestones.html
+++ b/ietf/templates/group/milestones.html
@@ -7,7 +7,7 @@
     {% if heading %}
         <h2 class="my-3">
             {% if milestoneset.grouper %}
-                {{ milestoneset.grouper }} milestones
+                {{ milestoneset.grouper|title }} milestones
             {% else %}
                 {% if group.state_id == "proposed" %}
                     Proposed milestones
@@ -20,15 +20,15 @@ <h2 class="my-3">
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
-                <th scope="col"{% if group.uses_milestone_dates %} data-sort="num"{% endif %}>
+                <th class="col-2" scope="col"{% if group.uses_milestone_dates %} data-sort="num"{% endif %} data-default-sort="asc">
                     {% if group.uses_milestone_dates %}
                         Date
                     {% else %}
                         Order
                     {% endif %}
                 </th>
-                <th scope="col" data-sort="milestone">Milestone</th>
-                <th scope="col" data-sort="docs">Associated documents</th>
+                <th class="col-5" scope="col" data-sort="milestone">Milestone</th>
+                <th class="col-5" scope="col" data-sort="docs">Associated documents</th>
             </tr>
         </thead>
         <tbody>
@@ -36,10 +36,10 @@ <h2 class="my-3">
                 <tr>
                     <td>
                         {% if milestone.resolved %}
-                            <span class="badge rounded-pill bg-success">{{ milestone.resolved }}</span>
+                            <span class="badge rounded-pill {% if milestone.resolved|slugify == 'done' %}text-bg-success{% else %}text-bg-warning{% endif %}">{{ milestone.resolved|title }}</span>
                         {% else %}
                             {% if group.uses_milestone_dates %}
-                                {{ milestone.due|date:"M Y" }}
+                                 <span class="d-none" aria-hidden="true">{{ milestone.due }}</span>{{ milestone.due|date:"M Y" }}
                             {% else %}
                                 {% if forloop.first %}Last{% endif %}
                                 {% if forloop.last %}Next{% endif %}
@@ -49,7 +49,7 @@ <h2 class="my-3">
                     <td>{{ milestone.desc|urlize_ietf_docs }}</td>
                     <td>
                         {% for d in milestone.docs.all %}
-                            <a href="{% url "ietf.doc.views_doc.document_main" name=d.name %}">{{ d.name }}</a>
+                            <a href="{% url "ietf.doc.views_doc.document_main" name=d.name %}">{% if d.became_rfc %}{{ d.became_rfc }} (was {% endif %}{{ d.name }}{% if d.became_rfc %}){% endif %}</a>
                             <br>
                         {% endfor %}
                     </td>
diff --git a/ietf/templates/group/reset_charter_milestones.html b/ietf/templates/group/reset_charter_milestones.html
index 00f4917ef8..79f26e3e36 100644
--- a/ietf/templates/group/reset_charter_milestones.html
+++ b/ietf/templates/group/reset_charter_milestones.html
@@ -8,7 +8,7 @@
     <h1>
         Reset Charter Milestones
         <br>
-        <small class="text-muted">{{ group.acronym }} {{ group.type.name }}</small>
+        <small class="text-body-secondary">{{ group.acronym }} {{ group.type.name }}</small>
     </h1>
     <p class="mt-3">
         Select which of the current {{ group.type.name }} milestones you would like to copy to the charter:
@@ -30,7 +30,7 @@ <h1>
                     <label class="form-check-label" for="id-{{ milestone.id }}">
                         {{ milestone.desc }}
                     </label>
-                    <span class="badge rounded-pill {% if milestone.resolved %}bg-success{% else %}bg-info{% endif %}">
+                    <span class="badge rounded-pill {% if milestone.resolved %}text-bg-success{% else %}text-bg-info{% endif %}">
                         {% if milestone.resolved %}
                             {{ milestone.resolved }}
                         {% else %}
diff --git a/ietf/templates/group/reset_next_reviewer.html b/ietf/templates/group/reset_next_reviewer.html
index e543907895..ce8dde1de8 100644
--- a/ietf/templates/group/reset_next_reviewer.html
+++ b/ietf/templates/group/reset_next_reviewer.html
@@ -4,7 +4,7 @@
 {% origin %}
 {% load ietf_filters static django_bootstrap5 %}
 {% block content %}
-    <h1>Set next reviewer in queue<br><small class="text-muted">{{ group.acronym }}</small></h1>
+    <h1>Set next reviewer in queue<br><small class="text-body-secondary">{{ group.acronym }}</small></h1>
     <form class="my-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index 59beb0ff84..61b93de2b6 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% origin %}
-{% load ietf_filters static person_filters %}
+{% load ietf_filters static person_filters ietf_filters %}
 {% block group_subtitle %}Review requests{% endblock %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
@@ -48,13 +48,13 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
                                 {% if r.pk %}
                                     {{ r.time|date:"Y-m-d" }} by {% person_link r.requested_by %}
                                 {% else %}
-                                    <span class="badge rounded-pill bg-info">Auto-suggested</span>
+                                    <span class="badge rounded-pill text-bg-info">Auto-suggested</span>
                                 {% endif %}
                             </td>
                             <td>
                                 {{ r.deadline|date:"Y-m-d" }}
                                 {% if r.due %}
-                                    <span class="badge rounded-pill bg-warning"
+                                    <span class="badge rounded-pill text-bg-warning"
                                           title="{{ r.due }} day{{ r.due|pluralize }} past deadline">{{ r.due }} day{{ r.due|pluralize }}</span>
                                 {% endif %}
                             </td>
@@ -96,14 +96,13 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
                             <td>
                                 {{ a.review_request.deadline|date:"Y-m-d" }}
                                 {% if a.due %}
-                                    <span class="badge rounded-pill bg-warning"
+                                    <span class="badge rounded-pill text-bg-warning"
                                           title="{{ a.due }} day{{ a.due|pluralize }} past deadline">{{ a.due }} day{{ a.due|pluralize }}</span>
                                 {% endif %}
                             </td>
                             <td>
                                 {% person_link a.reviewer.person %}
-                                {% if a.state_id == "accepted" %}<span class="badge rounded-pill bg-success">Accepted</span>{% endif %}
-                                {% if a.reviewer_unavailable %}<span class="badge rounded-pill bg-danger">Unavailable</span>{% endif %}
+                                {{ a.state_id|badgeify }}
                             </td>
                             <td>{{ a.review_request.doc.friendly_state }}</td>
                             <td>
@@ -178,7 +177,7 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
                                 {{ r.request_closed_time|date:"Y-m-d" }}
                             </td>
                             <td>
-                                {{ r.state.name }}
+                                {{ r.state.name|badgeify }}
                             </td>
                         </tr>
                     {% endfor %}
@@ -242,10 +241,10 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
                                 {% person_link a.reviewer.person %}
                             </td>
                             <td>
-                                {{ a.state }}
+                                {{ a.state|badgeify }}
                             </td>
                             <td>
-                                {% if a.result %}{{ a.result }}{% endif %}
+                                {% if a.result %}{{ a.result|badgeify }}{% endif %}
                             </td>
                         </tr>
                     {% endfor %}
@@ -255,4 +254,4 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
     {% block js %}
         <script src="{% static "ietf/js/list.js" %}">
         </script>
-    {% endblock %}
+    {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/review_requests_history.html b/ietf/templates/group/review_requests_history.html
new file mode 100644
index 0000000000..1b1fb4d263
--- /dev/null
+++ b/ietf/templates/group/review_requests_history.html
@@ -0,0 +1,90 @@
+{% extends "group/group_base.html" %}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin %}
+{% load tz %}
+{% load ietf_filters person_filters textfilters %}
+{% load static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
+{% block group_content %}
+    {% origin %}
+    {% if reviewer_email %}
+    <h2 class="my-3">Review requests history of {{ reviewer_email }}</h2>
+    {% else %}
+    <h2 class="my-3">Review requests history</h2>
+    {% endif %}
+    <form class="reviews-history-filter" action="#reviewshistory">
+      <div>
+	<label for="reviewer_email"
+	       class="query-input-label">Reviewer filter:</label>
+	<input type="text" class="query-input" id="reviewer_email"
+	       value="{{ reviewer_email }}" name="reviewer_email">
+	<button class="btn btn-primary" type="submit">Filter</button>
+      </div>
+      <div>
+	Past:
+	<div class="btn-group btn-group-sm" role="group">
+          {% for key, label in since_choices %}
+          <button class="btn btn-outline-primary {% if since == key %}active{% endif %}"
+                  {% if key %}name="since" value="{{ key }}"{% endif %}
+                  type="submit">
+            {{ label }}
+          </button>
+          {% endfor %}
+	</div>
+      </div>
+    </form>
+
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="date">Date (UTC)</th>
+                <th scope="col" data-sort="by">By</th>
+                <th scope="col" data-sort="doc">Document</th>
+                <th scope="col" data-sort="state">State</th>
+                <th scope="col" data-sort="review">Reviewer</th>
+                <th scope="col" data-sort="result">Result</th>
+                <th scope="col" data-sort="description">Description</th>
+            </tr>
+        </thead>
+        {% if history %}
+            <tbody>
+                {% for h in history %}
+                    <tr>
+                        <td>{{ h.history_date|utc|date:"Y-m-d H:i:s" }}</td>
+                        <td>{% person_link h.history_user.person %}</td>
+                        <td>{% if h.reviewed_rev %}
+			  <a href="{% url "ietf.doc.views_doc.document_main" name=h.review_request.doc.name rev=h.reviewed_rev %}">
+                        {{ h.review_request.doc.name }}-{{ h.reviewed_rev }}
+			  </a>
+			  {% else %}
+			  <a href="{% url "ietf.doc.views_doc.document_main" name=h.review_request.doc.name %}">{{ h.review_request.doc.name }}</a>
+			  {% endif %}
+			</td>
+                        <td data-text="{{ h.state }}">
+			  <a href="{% url "ietf.doc.views_review.review_request" name=h.review_request.doc.name request_id=h.review_request.pk %}">{{ h.state }} </a>
+			</td>
+                        <td data-text="{{ h.reviewer }}">
+			  {% person_link h.reviewer.person %}
+			  <a href="?reviewer_email={{h.reviewer.email_address}}#reviewshistory">
+			    (set&nbsp;as&nbsp;filter)
+			  </a>
+			</td>
+                        <td data-text="{{ h.result }}">
+			  {% if h.review %}<a href="{{ h.review.get_absolute_url }}">
+			    {{ h.result }}</a>
+			  {% else %}
+			  {{ h.result }}
+			  {% endif %}
+			</td>
+                        <td>{{ h.history_change_reason }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
+    </table>
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+{% endblock %}
diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html
index 39ba7606a9..75bd15f1d3 100644
--- a/ietf/templates/group/reviewer_overview.html
+++ b/ietf/templates/group/reviewer_overview.html
@@ -24,7 +24,7 @@ <h2 class="mt-3">Reviewers</h2>
         rotation with the next reviewer in the rotation at the top. Rows with darker backgrounds have the following meaning:
     </p>
     <div class="reviewer-overview">
-        <p class="alert alert-secondary my-3">
+        <p class="alert alert-info my-3">
             Has already been assigned a document within the given interval.
         </p>
         <p class="alert alert-warning my-3">
@@ -44,89 +44,102 @@ <h2 class="mt-3">Reviewers</h2>
         </div>
     {% endif %}
     {% if reviewers %}
-        <table class="table reviewer-overview tablesorter">
+        <table class="table table-sm table-striped reviewer-overview tablesorter">
             <thead>
                 <tr>
-                    <th scope="col" data-sort="num">Next</th>
+                    <th scope="col" data-sort="next">Next</th>
                     <th scope="col" data-sort="reviewer">Reviewer</th>
-                    <th scope="col" data-sort="assigned">Recent history</th>
-                    <th scope="col" data-sort="num">Days since completed</th>
-                    <th scope="col" data-sort="settings">Settings</th>
+                    <th scope="col">
+                        <div class="row">
+                            <div class="col-md-2 me-1">Assigned</div>
+                            <div class="col-md-2 me-1 d-none d-lg-block">Deadline</div>
+                            <div class="col-md-2 me-1">State</div>
+                            <div class="col-md-1 me-1 d-none d-lg-block">Days for review</div>
+                            <div class="col">Document</div>
+                        </div>
+                    </th>
+                    <th scope="col" data-sort="num">Days since review</th>
+                    <th scope="col" class="d-none d-xl-table-cell w-25">Settings</th>
                 </tr>
             </thead>
             <tbody>
                 {% for person in reviewers %}
-                    <tr {% if person.completely_unavailable %}class="table-danger" title="Is not available to do reviews at this time." {% elif person.busy %}class="table-secondary" title="Has already been assigned a document within the given interval." {% elif person.settings.skip_next %}class="table-warning" title="Will be skipped the next time at the top of rotation." {% endif %}>
+                    <tr {% if person.completely_unavailable %}class="table-danger" title="Is not available to do reviews at this time." {% elif person.busy %}class="table-info" title="Has already been assigned a document within the given interval." {% elif person.settings.skip_next %}class="table-warning" title="Will be skipped the next time at the top of rotation." {% endif %}>
                         <td>{{ forloop.counter }}</td>
+
                         <td>
-                            {% person_link person %}
-                            {% if person.settings_url %}
-                                <a href="{{ person.settings_url }}" class="btn btn-primary btn-small float-end"
-                                    title="{{ person.settings.expertise }}">Edit
-                                </a>
-                            {% endif %}
+                            {% person_link person with_email=False %}
+
+                            <div class="text-nowrap">
+                                {% if person.settings_url %}
+                                    <a href="{{ person.settings_url }}" class="btn btn-primary btn-sm"
+                                        aria-label="Change settings for {{ person.name }}">
+                                        <i class="bi bi-gear"></i>
+                                    </a>
+                                {% endif %}
+                                <button type="button"
+                                        class="btn btn-primary btn-sm d-xl-none"
+                                        aria-label="View settings for {{ person.name }}"
+                                        data-bs-toggle="modal"
+                                        data-bs-target="#modal{{ forloop.counter }}">
+                                  <i class="bi bi-search"></i>
+                                </button>
+                            </div>
                         </td>
+
                         <td>
                             {% if person.latest_reqs %}
-                                <table class="table table-sm table-borderless">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col">Assigned</th>
-                                            <th scope="col">Deadline</th>
-                                            <th scope="col">State</th>
-                                            <th scope="col">Review time</th>
-                                            <th scope="col">Document</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                    {% for assn_pk, req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %}
-                                        <tr>
-                                            <td>
-                                                {{ assigned_time|date }}
-                                            </td>
-                                            <td>
-                                                <a href="{% url 'ietf.doc.views_review.review_request' name=doc_name request_id=req_pk %}">{{ deadline|date }}</a>
-                                            </td>
-                                            <td>
-                                                <span class="badge rounded-pill bg-{% if state.slug == 'completed' or state.slug == 'part-completed' %}success{% elif state.slug == 'no-response' %}danger{% elif state.slug == 'overtaken' %}warning{% elif state.slug == 'requested' or state.slug == 'accepted' %}primary{% else %}secondary{% endif %}">{{ state.name }}</span>
-                                            </td>
-                                            <td>
-                                                {% if assignment_to_closure_days != None %}
-                                                    {{ assignment_to_closure_days }} day{{ assignment_to_closure_days|pluralize }}
-                                                {% endif %}
-                                            </td>
-                                            <td class="text-nowrap">
-                                                {{ doc_name }}
-                                                {% if reviewed_rev %}-{{ reviewed_rev }}{% endif %}
-                                            </td>
-                                        </tr>
-                                    {% endfor %}
-                                    </tbody>
-                                </table>
+                                {% for assn_pk, req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %}
+                                    <div class="row {% if not forloop.last %}border-bottom mb-1 pb-1{% endif %}">
+                                        <div class="col-md-2 me-1">
+                                            {{ assigned_time|date|split:"-"|join:"-<wbr>" }}
+                                        </div>
+                                        <div class="col-md-2 me-1 d-none d-lg-block">
+                                            <a href="{% url 'ietf.doc.views_review.review_request' name=doc_name request_id=req_pk %}">{{ deadline|date|split:"-"|join:"-<wbr>" }}</a>
+                                        </div>
+                                        <div class="col-md-2 me-1">
+                                            {{ state.name|badgeify }}
+                                        </div>
+                                        <div class="col-md-1 me-1 text-end d-none d-lg-block">
+                                            {% if assignment_to_closure_days != None %}
+                                                {{ assignment_to_closure_days }}
+                                            {% endif %}
+                                        </div>
+                                        <div class="col">
+                                            {{ doc_name }}{% if reviewed_rev %}-{{ reviewed_rev }}{% endif %}
+                                        </div>
+                                    </div>
+                                {% endfor %}
                             {% endif %}
                         </td>
-                        <td>
+
+                        <td class="text-end">
                             {% if person.days_since_completed_review != 9999 %}
                                 {{ person.days_since_completed_review }}
                             {% endif %}
                         </td>
-                        <td>
-                            {% if person.settings.min_interval %}
-                                <b>{{ person.settings.get_min_interval_display }}</b>
-                                <br>
-                            {% endif %}
-                            {% if person.settings.skip_next %}
-                                <b>Skip:</b> {{ person.settings.skip_next }}
-                                <br>
-                            {% endif %}
-                            {% if person.settings.filter_re %}
-                                <b>Filter:</b> <code title="{{ person.settings.filter_re }}">{{ person.settings.filter_re|truncatechars:15 }}</code>
-                                <br>
-                            {% endif %}
-                            {% if person.unavailable_periods %}
-                                {% include "review/unavailable_table.html" with unavailable_periods=person.unavailable_periods %}
-                            {% endif %}
+
+                        <td class="d-none d-xl-table-cell w-25">
+                            {% include "review/unavailable_table.html" with person=person unavailable_periods=person.unavailable_periods %}
+                            <div class="modal modal-xl fade" id="modal{{ forloop.counter }}" tabindex="-1" aria-labelledby="modallabel{{ forloop.counter }}" aria-hidden="true">
+                              <div class="modal-dialog">
+                                <div class="modal-content">
+                                  <div class="modal-header">
+                                    <h1 class="modal-title fs-5" id="modallabel{{ forloop.counter }}">Reviewer settings</h1>
+                                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                  </div>
+                                  <div class="modal-body">
+                                    {% include "review/unavailable_table.html" with person=person unavailable_periods=person.unavailable_periods %}
+                                  </div>
+                                  <div class="modal-footer">
+                                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                                    <button type="button" class="btn btn-primary">Save changes</button>
+                                  </div>
+                                </div>
+                              </div>
+                            </div>
                         </td>
+
                     </tr>
                 {% endfor %}
             </tbody>
diff --git a/ietf/templates/group/statements.html b/ietf/templates/group/statements.html
new file mode 100644
index 0000000000..6bbe3cb394
--- /dev/null
+++ b/ietf/templates/group/statements.html
@@ -0,0 +1,51 @@
+{% extends "group/group_base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin %}
+{% load ietf_filters person_filters textfilters %}
+{% load static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
+{% block group_content %}
+    {% origin %}
+    <h2 class="my-3">{{group.acronym|upper}} Statements</h2>
+    {% if request.user|has_role:"Secretariat" %}
+    <div class="buttonlist">
+        <a id="start_button"
+        class="btn btn-primary"
+        href="{% url 'ietf.doc.views_statement.new_statement' %}">
+            Start New Statement
+        </a>
+    </div>
+    {% endif %}
+    <table class="my-3 table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th class="col-1" scope="col" data-sort="date">Date</th>
+                <th scope="col" data-sort="statement">Statement</th>
+            </tr>
+        </thead>
+{% regroup statements by status as grouped_statements %}
+{% for statement_group in grouped_statements %}
+        <tbody>
+            <tr class="table-info">
+                <th scope="col" colspan="2">
+                {{ statement_group.grouper|title }} {{"Statement"|plural:statement_group.list }} ({{ statement_group.list|length }} {{"hit"|plural:statement_group.list }})
+                </th>
+            </tr>
+        </tbody>
+        <tbody>
+        {% for statement in statement_group.list %}
+            <tr>
+                <td title="{{ statement.published|date:'Y-m-d H:i:s O' }}">{{ statement.published|date:"Y-m-d" }}</td>
+                <td><a href="{% url 'ietf.doc.views_doc.document_main' name=statement.name %}">{{statement.title}}</a>
+                </td>
+            </tr>
+        {% endfor %}   
+        </tbody>
+{% endfor %}
+    </table>
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/help/personal-information.html b/ietf/templates/help/personal-information.html
deleted file mode 100644
index d60ee93b61..0000000000
--- a/ietf/templates/help/personal-information.html
+++ /dev/null
@@ -1,86 +0,0 @@
-{# Copyright The IETF Trust 2018-2018, All Rights Reserved #}
-{% extends "base.html" %}
-{% load origin %}
-{% block title %}
-    Personal Information in the Datatracker
-{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>Personal Information in the Datatracker</h1>
-    <p>
-        <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc3935' %}">RFC 3935, "A Mission Statement for the IETF"</a>
-        lays out
-        the goal and the mission of the IETF as follows
-    </p>
-    <pre>
-    The goal of the IETF is to make the Internet work better.
-
-    The mission of the IETF is to produce high quality, relevant
-    technical and engineering documents that influence the way people
-    design, use, and manage the Internet in such a way as to make the
-    Internet work better.  These documents include protocol standards,
-    best current practices, and informational documents of various kinds.
-
-</pre>
-    {% comment %}
-    The following text has been reviewed by legal counsel (Thomas Zych)
-    on Thu, 26 Apr 2018 17:24:03 -0400
-    *** DO NOT CHANGE WITHOUT LEGAL REVIEW ***
-{% endcomment %}
-    <p>
-        In order to fulfill its mission, the IETF provides various ways to distribute
-        and discuss Internet-Drafts, and otherwise process them until there is
-        consensus that they are ready for publication.
-    </p>
-    <p>
-        This makes the information in the content of the draft documents, as well
-        as contributions related to the draft documents and their processing as
-        laid out in the
-        <a href="https://www.ietf.org/about/note-well/">"Note Well"</a>
-        statement, of legitimate interest to the IETF when it pursues
-        its mission; not only in general terms, but specifically under Article
-        6(1)&nbsp;f) of
-        <a href="https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679#d1e1888-1-1">
-            EU's General Data Protection Regulation
-        </a>.
-    </p>
-    <p>
-        The datatracker treats all personal information derived from draft documents and
-        documents published as RFC, as well as personal information derived from
-        processing draft documents through the IETF procedures, in accordance with
-        applicable law, including the GDPR.  This includes author names,
-        email addresses and other address information provided in draft documents or as
-        contact information for IETF roles such as Working Group chairs, secretaries,
-        Area Directors and other roles.
-    </p>
-    <p>
-        There is however additional personal information held in the datatracker that
-        is used for other purposes. This information requires the consent of the
-        individuals whose information is stored and processed which IETF secures
-        through various means, and the person it relates to may at any time request
-        its correction or removal. This includes:
-    </p>
-    <ul>
-        <li>Personal photograph or other likeness;</li>
-        <li>Personal biography;</li>
-        <li>Personal email addresses not derived from IETF contributions; and</li>
-        <li>Personal account login information</li>
-        <li>Personal notification subscriptions</li>
-    </ul>
-    <p>
-        Most of this information can be edited on the individual's
-        <a href="{% url 'ietf.ietfauth.views.profile' %}">Account Info</a>
-        page by the individual
-        after logging in to the account.  If the datatracker holds such
-        information about a person, and they don't have an account, a request to
-        the
-        <a href="mailto:{{ settings.SECRETARIAT_ACTION_EMAIL }}">IETF secretariat</a>
-        to change
-        or remove the information will be honoured to the extent feasible and
-        legally permitted.
-    </p>
-    <p>
-        Please also see the IETF's overall
-        <a href="https://www.ietf.org/privacy-statement/">Statement concerning personal data.</a>
-    </p>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/help/state_index.html b/ietf/templates/help/state_index.html
deleted file mode 100644
index 29233cca09..0000000000
--- a/ietf/templates/help/state_index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
-{% block title %}Document state index{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>Document state index</h1>
-    <p>
-        Document state information is available for the following document and document state groups.
-    </p>
-    <table class="table table-sm table-striped tablesorter">
-        <thead>
-            <tr>
-                <th scope="col" data-sort="document">Document</th>
-                <th scope="col" data-sort="state">State groups</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for type in types %}
-                {% if type.stategroups != None %}
-                    <tr>
-                        <td>
-                            <a href="{% url 'ietf.help.views.state' doc=type.slug %}">{{ type.slug }}</a>
-                        </td>
-                        <td>
-                            {% for group in type.stategroups %}
-                                {# djlint:off #}
-                                    <a href="{% url 'ietf.help.views.state' doc=type.slug type=group %}">{{ group }}</a>{% if not forloop.last %},{% endif %}
-                                {# djlint:on #}
-                            {% endfor %}
-                        </td>
-                    </tr>
-                {% endif %}
-            {% endfor %}
-        </tbody>
-    </table>
-{% endblock %}
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/help/states.html b/ietf/templates/help/states.html
deleted file mode 100644
index b68625811d..0000000000
--- a/ietf/templates/help/states.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
-{% block title %}{{ type.label|cut:"state"|cut:"state" }} states{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>{{ type.label|cut:"state"|cut:"State" }} states</h1>
-    <table class="table table-sm table-striped tablesorter">
-        <thead>
-            <tr>
-                <th scope="col" data-sort="state">State</th>
-                <th scope="col" data-sort="desc">Description</th>
-                <th scope="col" data-sort="next">Next states</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for state in states %}
-                <tr>
-                    <th scope="row">{{ state.name }}</th>
-                    <td>{{ state.desc|safe }}</td>
-                    <td>
-                        <ul>
-                            {% for s in state.next_states.all %}
-                                <li>{{ s.name }}</li>
-                            {% endfor %}
-                        </ul>
-                    </td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-{% endblock %}
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/idindex/.gitignore b/ietf/templates/idindex/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/templates/idindex/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/templates/idindex/all_id2.txt b/ietf/templates/idindex/all_id2.txt
index 5d810ab96b..29c43231e4 100644
--- a/ietf/templates/idindex/all_id2.txt
+++ b/ietf/templates/idindex/all_id2.txt
@@ -3,29 +3,29 @@
 # generated: {% now "Y-m-d H:i:s T" %}
 #
 # Description of fields:
-# 0   draft name and latest revision
+# 0   Internet-Draft name and latest revision
 # 1   always -1 (was internal numeric database id in earlier schema)
 # 2   one of "Active", "Expired", "RFC", "Withdrawn by Submitter",
 #     "Replaced", or "Withdrawn by IETF"
 # 3   if #2 is "Active", the IESG state for the document (such as
-#     "In Last Call", "AD Evaluation::Revised ID Needed", or "I-D Exists");
+#     "In Last Call", "AD Evaluation::Revised I-D Needed", or "I-D Exists");
 #     otherwise empty
 # 4   if #2 is "RFC", the RFC number (otherwise empty)
-# 5   if #2 is "Replaced", the replacing draft name (otherwise empty)
+# 5   if #2 is "Replaced", the replacing Internet-Draft name (otherwise empty)
 # 6   revision date (YYYY-MM-DD)
 # 7   group acronym (or empty if no group/not known)
 # 8   area acronym (or empty if not known; not necessarily accurate
-#     for older drafts)
+#     for older Internet-Drafts)
 # 9   responsible AD name (or empty if not known)
 # 10  intended maturity level (or empty if not known)
 # 11  if #3 is "In Last Call" (with any substate), the last call
 #     end date (YYYY-MM-DD); otherwise empty
 # 12  if #2 is "Active", list of file types; otherwise empty
-# 13  draft title
-# 14  draft authors (often quite inaccurate, especially the email
+# 13  Internet-Draft title
+# 14  Internet-Draft authors (often quite inaccurate, especially the email
 #     addresses...)
-# 15  draft shepherd (Shep Erd <shep@erd.example>)
-# 16  draft areadirector (Aread Irector <aread.irector@example.org>)
+# 15  Internet-Draft shepherd (Shep Erd <shep@erd.example>)
+# 16  Internet-Draft areadirector (Aread Irector <aread.irector@example.org>)
 #
 # new fields can be added to the end in the future, so remember to
 # ignore those in your code
diff --git a/ietf/templates/idindex/id_index.txt b/ietf/templates/idindex/id_index.txt
index 95cf504883..f4707b5d01 100644
--- a/ietf/templates/idindex/id_index.txt
+++ b/ietf/templates/idindex/id_index.txt
@@ -2,10 +2,10 @@
 {% if with_abstracts %}
    This summary sheet provides a short synopsis of each Internet-Draft
 available within the "internet-drafts" directory at the shadow
-sites directory.  These drafts are listed alphabetically by working
+sites directory.  These Internet-Drafts are listed alphabetically by working
 group acronym and start date.{% else %}
    This summary sheet provides an index of each Internet-Draft. These
-drafts are listed alphabetically by Working Group acronym and initial
+Internet-Drafts are listed alphabetically by Working Group acronym and initial
 post date.{% endif %} Generated {{ time }}.
 
 {% for group in groups %}
diff --git a/ietf/templates/iesg/.gitignore b/ietf/templates/iesg/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/templates/iesg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html
index 629c0946f4..8567d5e357 100644
--- a/ietf/templates/iesg/agenda.html
+++ b/ietf/templates/iesg/agenda.html
@@ -9,9 +9,15 @@
     <h1>
         IESG agenda
         <br>
-        <small class="text-muted">{{ date }}</small>
+        <small class="text-body-secondary">{{ date }}</small>
     </h1>
     {% include "iesg/nav.html" with active="agenda" %}
+    {% if user|has_role:"Secretariat" %}
+        <a class="btn btn-outline-primary float-end"
+           href="{% url 'ietf.iesg.views.telechat_agenda_content_manage' %}">
+          Manage administrivia
+        </a>
+    {% endif %}
     {% for num, section in sections %}
         {% if num|sectionlevel == 1 %}
             <h2 class="mt-3" id="sec-{{ num|slugify }}">{{ num }}. {{ section.title|safe }}</h2>
@@ -45,48 +51,48 @@ <h4 class="mt-3" id="sec-{{ num|slugify }}">{{ num }} {{ section.title|safe }}</
                 </p>
             {% endif %}
             {% if num == "3.4" %}
-                <p class="alert alert-info my-3">
-                    The IESG will use RFC 5742 responses:
-                </p>
-                <ol>
-                    <li>
-                        The IESG has concluded
-                        that there is no conflict between this document and IETF work;
-                    </li>
-                    <li>
-                        The IESG has concluded that this work is related to IETF work done
-                        in WG &lt;X&gt;, but this relationship does not prevent
-                        publishing;
-                    </li>
-                    <li>
-                        The IESG has concluded that publication could
-                        potentially disrupt the IETF work done in WG &lt;X&gt; and
-                        recommends not publishing the document at this time;
-                    </li>
-                    <li>
-                        The IESG
-                        has concluded that this document violates IETF procedures for
-                        &lt;Y&gt; and should therefore not be published without IETF
-                        review and IESG approval; or
-                    </li>
-                    <li>
-                        The IESG has concluded that this
-                        document extends an IETF protocol in a way that requires IETF
-                        review and should therefore not be published without IETF review
-                        and IESG approval.
-                    </li>
-                </ol>
-                <p>
-                    The document shepherd must propose one of these responses in the
-                    conflict-review document, and the document shepherd may supply text
-                    for an IESG Note in that document. The Area Director ballot positions
-                    indicate consensus with the response proposed by the document shepherd
-                    and agreement that the IESG should request inclusion of the IESG Note.
-                </p>
-                <p>
-                    Other matters may be recorded in comments, and the comments will
-                    be passed on to the RFC Editor as community review of the document.
-                </p>
+                <div class="alert alert-info my-3">
+                    <p>The IESG will use RFC 5742 responses:</p>
+                    <ol>
+                        <li>
+                            The IESG has concluded
+                            that there is no conflict between this document and IETF work;
+                        </li>
+                        <li>
+                            The IESG has concluded that this work is related to IETF work done
+                            in WG &lt;X&gt;, but this relationship does not prevent
+                            publishing;
+                        </li>
+                        <li>
+                            The IESG has concluded that publication could
+                            potentially disrupt the IETF work done in WG &lt;X&gt; and
+                            recommends not publishing the document at this time;
+                        </li>
+                        <li>
+                            The IESG
+                            has concluded that this document violates IETF procedures for
+                            &lt;Y&gt; and should therefore not be published without IETF
+                            review and IESG approval; or
+                        </li>
+                        <li>
+                            The IESG has concluded that this
+                            document extends an IETF protocol in a way that requires IETF
+                            review and should therefore not be published without IETF review
+                            and IESG approval.
+                        </li>
+                    </ol>
+                    <p>
+                        The document shepherd must propose one of these responses in the
+                        conflict-review document, and the document shepherd may supply text
+                        for an IESG Note in that document. The Area Director ballot positions
+                        indicate consensus with the response proposed by the document shepherd
+                        and agreement that the IESG should request inclusion of the IESG Note.
+                    </p>
+                    <p class="mb-0">
+                        Other matters may be recorded in comments, and the comments will
+                        be passed on to the RFC Editor as community review of the document.
+                    </p>
+                </div>
             {% endif %}
             {% if "docs" in section %}
                 {% for doc in section.docs %}
@@ -100,7 +106,7 @@ <h4 class="mt-3" id="sec-{{ num|slugify }}">{{ num }} {{ section.title|safe }}</
                         {% include "iesg/agenda_charter.html" %}
                     {% endif %}
                 {% empty %}
-                    <p class="text-muted">
+                    <p class="text-body-secondary">
                         (None)
                     </p>
                 {% endfor %}
@@ -111,4 +117,4 @@ <h4 class="mt-3" id="sec-{{ num|slugify }}">{{ num }} {{ section.title|safe }}</
         {% endif %}
     {% endfor %}
 {% endblock %}
-{% block js %}<script>// automatically generate a right-hand navigation tab for long pages</script>{% endblock %}
+{% block js %}<script>// automatically generate a right-hand navigation tab for long pages</script>{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/agenda_charter.html b/ietf/templates/iesg/agenda_charter.html
index 20bd23e06f..b4124914db 100644
--- a/ietf/templates/iesg/agenda_charter.html
+++ b/ietf/templates/iesg/agenda_charter.html
@@ -24,7 +24,7 @@
         <div class="row">
             <div class="col-3 text-end fw-bold">Area</div>
             <div class="col">
-                <a href="{% url 'ietf.group.views.active_groups' group_type='wg' %}#{{ doc.group.parent.acronym }}">
+                <a href="{% url 'ietf.group.views.active_groups' group_type='wg' %}#{{ doc.group.parent.acronym|upper }}">
                     {{ doc.group.parent.acronym|upper }}</a>
                 ({% person_link doc.ad %})
             </div>
diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html
index ceb84199cf..316dd8e2cc 100644
--- a/ietf/templates/iesg/agenda_conflict_doc.html
+++ b/ietf/templates/iesg/agenda_conflict_doc.html
@@ -1,7 +1,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% origin %}
-{% load ietf_filters ballot_icon person_filters %}
+{% load ietf_filters ballot_icon person_filters textfilters %}
 <div class="card mb-3">
     <div class="position-absolute top-0 end-0 m-3">{% ballot_icon doc %}</div>
     <div class="card-body">
@@ -11,7 +11,7 @@
                 <div class="col pe-5 me-5">
                     <div class="fw-bold">{{ doc.title }}</div>
                     <a href="{{ doc.get_href }}" aria-label="Content"><i class="bi bi-file-earmark-fill"></i></a>
-                    <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc.canonical_name }}</a>
+                    <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">{{ doc.name }}</a>
                 </div>
             </div>
             <div class="row">
@@ -27,7 +27,7 @@
             {% if conflictdoc.note %}
                 <div class="row">
                     <div class="col-3 text-end fw-bold">Note</div>
-                    <div class="col">{{ conflictdoc.note|linebreaksbr }}</div>
+                    <div class="col">{{ conflictdoc.note|urlize_ietf_docs|linkify|linebreaksbr }}</div>
                 </div>
             {% endif %}
             <div class="row">
diff --git a/ietf/templates/iesg/agenda_conflict_doc.txt b/ietf/templates/iesg/agenda_conflict_doc.txt
index 4ff2e3b00c..e4fbcc32b3 100644
--- a/ietf/templates/iesg/agenda_conflict_doc.txt
+++ b/ietf/templates/iesg/agenda_conflict_doc.txt
@@ -1,8 +1,7 @@
 {% load ietf_filters %}{% with doc.conflictdoc as conflictdoc %}
-  o {{ doc.canonical_name }}-{{ doc.rev }}
+  o {{ doc.name }}-{{ doc.rev }}
     {% filter wordwrap:"68"|indent|indent %}{{ doc.title }}{% endfilter %}
-      {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}
+      {{ conflictdoc.name }}-{{ conflictdoc.rev }}
       {% filter wordwrap:"66"|indent:"4" %}{{ conflictdoc.title }} ({{ conflictdoc.stream }}: {{ conflictdoc.intended_std_level }}){% endfilter %}
-{% if conflictdoc.note %}{# note: note is not escaped #}      {% filter wordwrap:"64"|indent:"6" %}Note: {{ conflictdoc.note|striptags }}{% endfilter %}
-{% endif %}    Token: {{ doc.ad }}
+    Token: {{ doc.ad }}
 {% with doc.active_defer_event as defer %}{% if defer %}    Was deferred by {{defer.by}} on {{defer.time|date:"Y-m-d"}}{% endif %}{% endwith %}{% endwith %}
diff --git a/ietf/templates/iesg/agenda_doc.html b/ietf/templates/iesg/agenda_doc.html
index 16b223186c..87051fda26 100644
--- a/ietf/templates/iesg/agenda_doc.html
+++ b/ietf/templates/iesg/agenda_doc.html
@@ -19,9 +19,9 @@
                 {% with doc.rfc_number as rfc_number %}
                     <a href="{% if rfc_number %} https://www.rfc-editor.org/rfc/rfc{{ rfc_number }}/ {% else %} {{ doc.get_href }} {% endif %}" aria-label="Content"><i class="bi bi-file-earmark-fill"></i></a>
                 {% endwith %}
-                <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">{{ doc.canonical_name }}</a>
+                <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">{{ doc.name }}</a>
                 {% if doc.has_rfc_editor_note %}
-                    <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}writeup/">
+                    <a href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}writeup/">
                         <em>(Has RFC Editor Note)</em>
                     </a>
                 {% endif %}
@@ -37,7 +37,7 @@
             <div class="col-3 text-end fw-bold">Token</div>
             <div class="col">
                 {% person_link doc.ad %}
-                <a href="{% url 'ietf.group.views.active_groups' group_type='wg' %}#{{ doc.group.parent.acronym }}">
+                <a href="{% url 'ietf.group.views.active_groups' group_type='wg' %}#{{ doc.group.parent.acronym|upper }}">
                     ({{ doc.group.parent.acronym|upper }})
                 </a>
             </div>
diff --git a/ietf/templates/iesg/agenda_doc.txt b/ietf/templates/iesg/agenda_doc.txt
index 247d456a5a..015af32409 100644
--- a/ietf/templates/iesg/agenda_doc.txt
+++ b/ietf/templates/iesg/agenda_doc.txt
@@ -1,8 +1,7 @@
 {% load ietf_filters %}{% with doc.rfc_number as rfc_number %}
-  o {{doc.canonical_name}}{% if not rfc_number %}-{{doc.rev}}{% endif %}{% endwith %}{%if doc.has_rfc_editor_note %} (Has RFC Editor Note){% endif %}{% if doc.stream %}  - {{ doc.stream }} stream{% endif %}
+  o {{doc.name}}{% if not rfc_number %}-{{doc.rev}}{% endif %}{% endwith %}{%if doc.has_rfc_editor_note %} (Has RFC Editor Note){% endif %}{% if doc.stream %}  - {{ doc.stream }} stream{% endif %}
     {% filter wordwrap:"68"|indent|indent %}{{ doc.title }} ({{ doc.intended_std_level }}){% endfilter %}
-{% if doc.note %}{# note: note is not escaped #}    {% filter wordwrap:"68"|indent|indent %}Note: {{ doc.note|striptags }}{% endfilter %}
-{% endif %}    Token: {{ doc.ad }}{% if doc.iana_review_state %}
+    Token: {{ doc.ad }}{% if doc.iana_review_state %}
     IANA Review: {{ doc.iana_review_state }}{% endif %}{% if doc.consensus %}
     Consensus: {{ doc.consensus }}{% endif %}{% if doc.lastcall_expires %}
     Last call expires: {{ doc.lastcall_expires|date:"Y-m-d" }}{% endif %}{% if doc.review_assignments %}
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index 1935c44e03..f732672df0 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -21,7 +21,12 @@ <h1>Documents on future IESG telechat agendas</h1>
             <h2>
                 IESG telechat {{ t.date }}
                 <br>
-                <small class="text-muted">{{ t.pages }} page{{ t.pages|pluralize }}</small>
+                <small class="text-body-secondary">
+                    {{ t.pages }} page{{ t.pages|pluralize }}
+                    {% if t.ad_pages_left_to_ballot_on %}
+                        ({{ t.ad_pages_left_to_ballot_on }} pages left to ballot on)
+                    {% endif %}
+                </small>
             </h2>
             <div class="buttonlist">
                 <a class="btn btn-primary" role="button" href="{% url 'ietf.iesg.views.agenda' %}">
@@ -55,7 +60,7 @@ <h2>
                         </thead>
                         <tbody>
                             {% for doc in section.docs %}
-                                {% include "doc/search/search_result_row.html" with color_ad_position=True %}
+                                {% include "doc/search/search_result_row.html" with color_ad_position=True show_ad_and_shepherd=True %}
                             {% endfor %}
                         </tbody>
                     </table>
diff --git a/ietf/templates/iesg/agenda_package.txt b/ietf/templates/iesg/agenda_package.txt
index ad95c39d31..99188bcb33 100644
--- a/ietf/templates/iesg/agenda_package.txt
+++ b/ietf/templates/iesg/agenda_package.txt
@@ -3,13 +3,13 @@
 Contents:
 
 1. Roll Call and Dial-In Instructions
-   {{ roll_call_url }}
+   {% url "ietf.iesg.views.telechat_agenda_content_view" section="roll_call" %}
 2. Agenda
    {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.iesg.views.agenda' %}
 3. Management Item Details
    {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.iesg.views.agenda' %}#6
 4. Previous minutes
-   {{ minutes_url }}
+   {% url "ietf.iesg.views.telechat_agenda_content_view" section="minutes" %}
 
 ------------------------------------------------------------------------
 1. ROLL CALL AND DIAL-IN INSTRUCTIONS
diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html
index 8237b162d2..ca031e2bc2 100644
--- a/ietf/templates/iesg/discusses.html
+++ b/ietf/templates/iesg/discusses.html
@@ -60,7 +60,7 @@ <h1>IESG discuss positions</h1>
                     <td class="d-none d-sm-table-cell">{% person_link doc.ad %}</td>
                     <td>
                         {% for p in doc.blocking_positions %}
-                            {% if p.is_old_pos %}<span class="text-muted">{% endif %}
+                            {% if p.is_old_pos %}<span class="text-body-secondary">{% endif %}
                             {% person_link p.balloter %}
                             ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}{% if doc.get_state_url != "rfc" and p.rev != doc.rev %} for -{{ p.rev }}{% endif %})
                             <br>
diff --git a/ietf/templates/iesg/ietf_activity_report.html b/ietf/templates/iesg/ietf_activity_report.html
new file mode 100644
index 0000000000..030110026a
--- /dev/null
+++ b/ietf/templates/iesg/ietf_activity_report.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% load ams_filters ietf_filters django_bootstrap5 %}
+{% block title %}IETF Activity Report{% endblock %}
+{% block content %}
+    <h1 class="mt-3">IETF Activity Report</h1>
+    <h2 class="mt-3"><small class="text-body-secondary">{{ sdate|date:"F Y" }}</small></h2>
+    
+    <form action="." method="GET">
+        <div class="row">
+            <div class="col-2">
+                {% bootstrap_field form.month show_label=True layout="inline" %}
+            </div>
+            <div class="col-2">
+                {% bootstrap_field form.year layout="inline" %}
+            </div>
+            <div class="col-2">
+                <button type="submit" class="btn btn-primary">Submit</button>
+            </div>
+        </div>
+    </form>
+
+    <h3 class="mt-3">Draft Activity</h3>
+    {% include "meeting/activity_report.html" %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/moderator_doc.html b/ietf/templates/iesg/moderator_doc.html
index fb48b75be1..1a06ffa1d4 100644
--- a/ietf/templates/iesg/moderator_doc.html
+++ b/ietf/templates/iesg/moderator_doc.html
@@ -93,7 +93,7 @@
 
     <p>If APPROVED with caveats - The Secretariat will send a working
         group submission, Protocol Action Announcement that includes the
-        [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that
+        [RFC Editor Note, etc.] to be drafted by [Name that
         AD].</p>
 {% endif %}
 
@@ -103,7 +103,7 @@
 
     <p>If APPROVED with caveats - The Secretariat will send an
         individual submission, Protocol Action Announcement that includes
-        the [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that
+        the [RFC Editor Note, etc.] to be drafted by [Name that
         AD].</p>
 {% endif %}
 
@@ -113,7 +113,7 @@
 
     <p>If APPROVED with caveats - The Secretariat will send the
         associated status change Protocol Action Announcements that includes the
-        [RFC Editor Note, IESG Note, etc.] to be drafted by [Name that
+        [RFC Editor Note, etc.] to be drafted by [Name that
         AD].</p>
 {% endif %}
 
@@ -123,7 +123,7 @@
 
     <p>If APPROVED with caveats - The Secretariat will send a working
         group submission Document Action announcement that includes the [RFC
-        Ed. Note, IESG, note, etc.] from [Name that AD].</p>
+        Ed. Note, etc.] from [Name that AD].</p>
 {% endif %}
 
 {% if num|startswith:"3.2.1" or num|startswith:"3.2.2" %}
@@ -132,7 +132,7 @@
 
     <p>If APPROVED with caveats - The Secretariat will send an
         individual submission Document Action announcement that includes the
-        [RFC Ed. Note, IESG, note, etc.] from [Name that AD].</p>
+        [RFC Ed. Note, etc.] from [Name that AD].</p>
 {% endif %}
 
 {% if num|startswith:"3.3.1" or num|startswith:"3.3.2" %}
@@ -141,13 +141,12 @@
 
     <p>If APPROVED with caveats - The Secretariat will send the associated
         status change Document Action announcements that includes the [RFC
-        Ed. Note, IESG, note, etc.] from [Name that AD].</p>
+        Ed. Note, etc.] from [Name that AD].</p>
 {% endif %}
 
 {% if num|startswith:"3.4.1" or num|startswith:"3.4.2" %}
     <p>If APPROVED - The Secretariat will send a standard no problem
-        message to the RFC Editor. [Name of AD] will you supply the text for
-        the IESG Note?</p>
+        message to the RFC Editor.</p>
 
     <p>If APPROVED with caveats - The Secretariat will send a standard
         no problem message to the RFC Editor that includes the note drafted
@@ -165,13 +164,13 @@
     {% if downrefs %}
         <p>If APPROVED - The Secretariat will add to the downref registry:<br>
             {% for ref in downrefs %}
-                + Add {{ref.target.document.canonical_name}}
-                ({{ref.target.document.std_level}} - {{ref.target.document.stream.desc}})
+                + Add {{ref.target.name}}
+                ({{ref.target.std_level}} - {{ref.target.stream.desc}})
                 to downref registry.<br>
-                {% if not ref.target.document.std_level %}
+                {% if not ref.target.std_level %}
                     +++ Warning: The standards level has not been set yet!!!<br>
                 {% endif %}
-                {% if not ref.target.document.stream %}
+                {% if not ref.target.stream %}
                     +++ Warning: document stream has not been set yet!!!<br>
                 {% endif %}
             {% endfor %}</p>
diff --git a/ietf/templates/iesg/moderator_package.html b/ietf/templates/iesg/moderator_package.html
index 7b7fc9c449..6698486e00 100644
--- a/ietf/templates/iesg/moderator_package.html
+++ b/ietf/templates/iesg/moderator_package.html
@@ -96,9 +96,7 @@ <h2>
                 <p>
                     Are there narrative minutes to approve for today?
                 </p>
-                {% filter linebreaks_crlf %}
-                    <pre>{{ section.text }}</pre>
-                {% endfilter %}
+                <a href="{% url 'ietf.iesg.views.telechat_agenda_content_view' section='minutes' %}">Draft minutes</a>
             {% endif %}
             {% if num == "1.4" %}
                 {% filter linebreaks_crlf %}
diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html
index 72d005d1a8..ee0a2f8288 100644
--- a/ietf/templates/iesg/past_documents.html
+++ b/ietf/templates/iesg/past_documents.html
@@ -12,7 +12,7 @@
     <h1>
         Documents on recent agendas
         <br>
-        <small class="text-muted">in states
+        <small class="text-body-secondary">in states
             {% for state in states %}
                 {{ state.name }}{% if not forloop.last %},{% endif %}
             {% endfor %}
@@ -49,7 +49,7 @@ <h1>
                         <td class="d-none d-sm-table-cell">{% person_link doc.ad %}</td>
                         <td>
                             {% for p in doc.blocking_positions %}
-                                {% if p.is_old_pos %}<span class="text-muted">{% endif %}
+                                {% if p.is_old_pos %}<span class="text-body-secondary">{% endif %}
                                 {% person_link p.balloter %}
                                 ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}{% if doc.get_state_url != "rfc" and p.rev != doc.rev %} for -{{ p.rev }}{% endif %})
                                 <br>
diff --git a/ietf/templates/iesg/telechat_agenda_content_edit.html b/ietf/templates/iesg/telechat_agenda_content_edit.html
new file mode 100644
index 0000000000..f24d81df98
--- /dev/null
+++ b/ietf/templates/iesg/telechat_agenda_content_edit.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin %}
+{% load django_bootstrap5 %}
+{% block pagehead %}{{ form.media.css }}{% endblock %}
+{% block title %}Edit "{{ section }}"{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Edit Telechat Agenda Contents
+        <br>
+        <small class="text-body-secondary">{{ section }}</small>
+    </h1>
+    <form class="my-3" method="post">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button type="submit" class="btn btn-primary">Save</button>
+        <a class="btn btn-secondary float-end" href="{% url 'ietf.iesg.views.telechat_agenda_content_manage' %}">Cancel</a>
+    </form>
+{% endblock %}
+{% block js %}{{ form.media.js }}{% endblock %}
diff --git a/ietf/templates/iesg/telechat_agenda_content_manage.html b/ietf/templates/iesg/telechat_agenda_content_manage.html
new file mode 100644
index 0000000000..045e8affd6
--- /dev/null
+++ b/ietf/templates/iesg/telechat_agenda_content_manage.html
@@ -0,0 +1,49 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load origin %}
+{% load django_bootstrap5 %}
+{% block title %}Telechat agenda contents{% endblock %}
+{% block content %}
+{% origin %}
+<h1>Telechat Agenda Contents</h1>
+<p>
+  <a href="{% url 'ietf.iesg.views.agenda' %}">Go to IESG agenda...</a>
+</p>
+<div class="card">
+  <div class="card-header">
+    <ul class="nav nav-tabs card-header-tabs" role="tablist">
+      {% for item in contents %}
+      <li class="nav-item" role="presentation">
+        <button class="nav-link {% if forloop.first %}active{% endif %}"
+                id="{{ item.section.slug }}-tab"
+                type="button"
+                data-bs-toggle="tab"
+                data-bs-target="#{{ item.section.slug}}"
+                role="tab" aria-controls="{{ item.section.slug }}"
+                aria-selected="true">
+          {{ item.section }}
+        </button>
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
+  <div class="tab-content card-body">
+    {% for item in contents %}
+    <div class="tab-pane {% if forloop.first %}show active{% endif %}"
+         id="{{ item.section.slug }}"
+         role="tabpanel"
+         aria-labelledby="{{ item.section.slug }}-tab">
+      <a class="btn btn-sm btn-outline-primary float-end"
+         href="{% url 'ietf.iesg.views.telechat_agenda_content_edit' section=item.section.slug %}">
+        Edit
+      </a>
+      {% if item.text %}
+      <pre>{{ item.text }}</pre>
+      {% else %}
+      <div class="text-center text-danger">No {{ item.section }}</div>
+      {% endif %}
+    </div>
+    {% endfor %}
+  </div>
+</div>
+{% endblock %}
diff --git a/ietf/templates/iesg/working_groups.html b/ietf/templates/iesg/working_groups.html
new file mode 100644
index 0000000000..b799636857
--- /dev/null
+++ b/ietf/templates/iesg/working_groups.html
@@ -0,0 +1,159 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load origin static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static 'ietf/css/list.css' %}">
+{% endblock %}
+{% block title %}IESG view of working groups{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1 class="mt-4">IESG view of working groups</h1>
+    <h2 class="mt-3'">Area Size and Load</h2>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="areaname">Area Name</th>
+                <th scope="col" data-sort="wgcount">WGs</th>
+                <th scope="col" data-sort="idcount">I-Ds</th>
+                <th scope="col" data-sort="idpages">Pages</th>
+                {# (divider) #}
+                <th scope="col" data-sort="idpercent">% I-Ds</th>
+                <th scope="col" data-sort="pagespercent">% Pages</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for area in area_summary %}
+              <tr>
+                <td>{{area.area}}</td>
+                <td>{{area.groups_in_area}}</td>
+                <td>{{area.doc_count}}</td>
+                <td>{{area.page_count}}</td>
+                <td>{{area.doc_percent|floatformat:1}}</td>
+                <td>{{area.page_percent|floatformat:1}}</td>
+              </tr>
+            {% endfor %}
+        </tbody>
+        <tfoot>
+            <tr>
+                <td>Totals</td>
+                <td>{{totals.group_count}}</td>
+                <td>{{totals.doc_count}}</td>
+                <td>{{totals.page_count}}</td>
+                <td></td>
+                <td></td>
+            </tr>
+        </tfoot>
+    </table>
+
+    <h2 class="mt-3'">Area Director Load: Documents not yet directly assigned to AD</h2>
+    <div class="small text-body-secondary">Typically these are pre-pubreq documents</div>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="areadirname">AD</th>
+                <th scope="col" data-sort="areaname">Area Name</th>
+                <th scope="col" data-sort="areagroups">WGs for AD</th>
+                <th scope="col" data-sort="idcount">I-Ds</th>
+                <th scope="col" data-sort="idpages">Pages</th>
+                {# (divider) #}
+                <th scope="col" data-sort="idpercent">% I-Ds</th>
+                <th scope="col" data-sort="pagespercent">% Pages</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for ad in noad_summary %}
+                <tr>
+                    <td>{{ad.ad}}</td>
+                    <td>{{ad.area}}</td>
+                    <td>{{ad.ad_group_count}}</td>
+                    <td>{{ad.doc_count}}</td>
+                    <td>{{ad.page_count}}</td>
+                    <td>{{ad.doc_percent|floatformat:1}}</td>
+                    <td>{{ad.page_percent|floatformat:1}}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+        <tfoot>
+            <tr>
+                <td>Totals</td>
+                <td></td>
+                <td>{{noad_totals.ad_group_count}}</td>
+                <td>{{noad_totals.doc_count}}</td>
+                <td>{{noad_totals.page_count}}</td>
+                <td></td>
+                <td></td>
+            </tr>
+        </tfoot>
+    </table>    
+
+    <h2 class="mt-3'">Area Director Load: Documents directly assigned to AD</h2>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="areadirname">AD</th>
+                <th scope="col" data-sort="areaname">Area Name</th>
+                <th scope="col" data-sort="areagroups">WGs for AD</th>
+                <th scope="col" data-sort="idcount">I-Ds</th>
+                <th scope="col" data-sort="idpages">Pages</th>
+                {# (divider) #}
+                <th scope="col" data-sort="idpercent">% I-Ds</th>
+                <th scope="col" data-sort="pagespercent">% Pages</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for ad in ad_summary %}
+                <tr>
+                    <td>{{ad.ad}}</td>
+                    <td>{{ad.area}}</td>
+                    <td>{{ad.ad_group_count}}</td>
+                    <td>{{ad.doc_count}}</td>
+                    <td>{{ad.page_count}}</td>
+                    <td>{{ad.doc_percent|floatformat:1}}</td>
+                    <td>{{ad.page_percent|floatformat:1}}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+        <tfoot>
+            <tr>
+                <td>Totals</td>
+                <td></td>
+                <td>{{ad_totals.ad_group_count}}</td>
+                <td>{{ad_totals.doc_count}}</td>
+                <td>{{ad_totals.page_count}}</td>
+                <td></td>
+                <td></td>
+            </tr>
+        </tfoot>
+    </table>  
+
+    <h2 class="mt-3'">Working Group Summary</h2>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="wg">WG</th>
+                <th scope="col" data-sort="area">Area</th>
+                <th scope="col" data-sort="ad">AD</th>
+                <th scope="col" data-sort="ids">I-Ds</th>
+                <th scope="col" data-sort="pages">Pages</th>
+                <th scope="col" data-sort="rfcs">RFCs</th>
+                <th scope="col" data-sort="rfcpubrate">RFCs in last 2 years</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for wg in wg_summary %}
+            <tr>
+                <td>{{wg.wg}}</td>
+                <td>{{wg.area}}</td>
+                <td>{{wg.ad}}</td>
+                <td>{{wg.doc_count}}</td>
+                <td>{{wg.page_count}}</td>
+                <td>{{wg.rfc_count}}</td>
+                <td>{{wg.recent_rfc_count}}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ietfauth/apikeys.html b/ietf/templates/ietfauth/apikeys.html
index ab6194151c..f4769d2d90 100644
--- a/ietf/templates/ietfauth/apikeys.html
+++ b/ietf/templates/ietfauth/apikeys.html
@@ -12,7 +12,7 @@
     <h1>
         API keys
         <br>
-        <small class="text-muted">{{ user.username }}</small>
+        <small class="text-body-secondary">{{ user.username }}</small>
     </h1>
     {% csrf_token %}
     {% if person.apikeys.all %}
@@ -37,9 +37,9 @@ <h1>
                 <td>{{ key.created }}</td>
                 <td>{{ key.latest }}</td>
                 <td>{{ key.count }}</td>
-                <td>{{ key.valid }}</td>
+                <td class="{{ key.valid|yesno:'text-success,text-danger'}}">{{ key.valid }}</td>
                 <td>
-                    <code>{{ key.hash }}</code>
+                    <code {% if not key.valid %}class="text-decoration-line-through"{% endif %}>{{ key.hash }}</code>
                 </td>
                 <td >
                     {% if key.valid %}
@@ -63,4 +63,4 @@ <h1>
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ietfauth/edit_field.html b/ietf/templates/ietfauth/edit_field.html
index 4e8c5177a7..23d1b71982 100644
--- a/ietf/templates/ietfauth/edit_field.html
+++ b/ietf/templates/ietfauth/edit_field.html
@@ -8,7 +8,7 @@
     <h1>
         {{ title }}
         <br>
-        <small class="text-muted">{{ person.plain_name }}</small>
+        <small class="text-body-secondary">{{ person.plain_name }}</small>
     </h1>
     <p class="my-3 alert alert-info">
         {{ info|striptags }}
diff --git a/ietf/templates/ietfauth/review_overview.html b/ietf/templates/ietfauth/review_overview.html
index 0f7e66913f..28c6e05599 100644
--- a/ietf/templates/ietfauth/review_overview.html
+++ b/ietf/templates/ietfauth/review_overview.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015-2019, All Rights Reserved #}
 {% load origin %}
-{% load django_bootstrap5 static %}
+{% load django_bootstrap5 static ietf_filters %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
     {{ review_wish_form.media.css }}
@@ -12,7 +12,7 @@
     <h1>
         Review overview
         <br>
-        <small class="text-muted">{{ request.user }}</small>
+        <small class="text-body-secondary">{{ request.user }}</small>
     </h1>
     <h2 class="mt-4">Assigned reviews</h2>
     {% if open_review_assignments %}
@@ -51,7 +51,7 @@ <h2 class="mt-4">Assigned reviews</h2>
                         <td>{{ r.review_request.type.name }}</td>
                         <td>
                             {{ r.review_request.deadline|date:"Y-m-d" }}
-                            {% if r.due %}<span class="badge rounded-pill bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
+                            {% if r.due %}<span class="badge rounded-pill text-bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
                         </td>
                     </tr>
                 {% endfor %}
@@ -98,10 +98,10 @@ <h2 class="mt-4">Latest closed review assignments</h2>
                         <td>{{ r.review_request.type.name }}</td>
                         <td>
                             {{ r.review_request.deadline|date:"Y-m-d" }}
-                            {% if r.due %}<span class="badge rounded-pill bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
+                            {% if r.due %}<span class="badge rounded-pill text-bg-warning">{{ r.due }} day{{ r.due|pluralize }}</span>{% endif %}
                         </td>
                         <td>
-                            <span class="{% if r.state_id == "completed" or r.state_id == "part-completed" %}bg-success{% endif %}">{{ r.state.name }}</span>
+                            {{ r.state.name|badgeify }}
                         </td>
                         <td>
                             {% if r.result %}{{ r.result.name }}{% endif %}
@@ -169,13 +169,13 @@ <h2 class="mt-4">
     {% endif %}
     {% if teams %}
         <p>
-            Add a draft that you would like to review when it becomes available for review:
+            Add an Internet-Draft that you would like to review when it becomes available for review:
         </p>
         <form method="post" class="form-inline">
             {% csrf_token %}
             {% bootstrap_form review_wish_form %}
             <button class="btn btn-primary" type="submit" name="action" value="add_wish">
-                Add draft
+                Add I-D
             </button>
         </form>
     {% endif %}
@@ -186,10 +186,10 @@ <h2 class="mt-4">
         <table class="table table-sm table-striped tablesorter">
             <thead>
                 <tr>
-                    <th scope="col">
+                    <th scope="col" data-sort="setting">
                         Setting
                     </th>
-                    <th scope="col">
+                    <th scope="col" data-sort="value">
                         Value
                     </th>
                 </tr>
@@ -208,7 +208,7 @@ <h2 class="mt-4">
                         Skip next assignments
                     </th>
                     <td>
-                        {{ t.reviewer_settings.skip_next }}
+                        {{ t.reviewer_settings.skip_next|yesno }}
                     </td>
                 </tr>
                 <tr>
diff --git a/ietf/templates/ietfauth/whitelist_form.html b/ietf/templates/ietfauth/whitelist_form.html
deleted file mode 100644
index 8b5670931c..0000000000
--- a/ietf/templates/ietfauth/whitelist_form.html
+++ /dev/null
@@ -1,78 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2016, All Rights Reserved #}
-{% load origin %}
-{% load django_bootstrap5 %}
-{% block title %}Set up test email address{% endblock %}
-{% block content %}
-    {% origin %}
-    {% if success %}
-        <h1>Whitelist entry creation successful</h1>
-        <p>
-            Please ask the requestor to try the
-            <a href="{% url 'ietf.ietfauth.views.create_account' %}">account creation form</a>
-            again, with the whitelisted email address.
-        </p>
-    {% else %}
-        <h1>Add a whitelist entry for account creation.</h1>
-        <p>
-            When an email request comes in for assistance with account creation
-            because the automated account creation has failed, you can add the
-            address to an account creation whitelist here.
-        </p>
-        <p>
-            Before you do so, please complete the following 3 verification steps:
-        </p>
-        <ol class="d-grid gap-3">
-            <li>
-                Has the person provided relevant information in his request, or has he simply
-                copied the text from the account creation failure message?  All genuine (non-spam)
-                account creation requests seen between 2009 and 2016 for tools.ietf.org have
-                contained a reasonable request message, rather than just copy-pasting the account
-                creation failure message.  If there's no proper request message, step 2 below can
-                be performed to make sure the request is bogus, but if that also fails, no further
-                effort should be needed.
-            </li>
-            <li>
-                Google for the person's name within the ietf.org site: "Jane Doe site:ietf.org".  If
-                found, and the email address matches an address used in drafts or discussions,
-                things are fine, and it's OK to add the address to the whitelist using this form,
-                and ask the person to please try the
-                <a href="{% url 'ietf.ietfauth.views.create_account' %}">account creation form</a>
-                again.
-            </li>
-            <li>
-                <p>
-                    If google finds no trace of the person being an ietf participant, he or she could
-                    still be somebody who is just getting involved in IETF work.  A datatracker account
-                    is probably not necessary, (no account is necessary to 'join' a WG -- the right thing
-                    in that case is to join the right mailing list, and the person could be told so) --
-                    but in case this is a legitimate request, please email the person and ask:
-                    <i>
-                        "Which wgs do you require a password for?"
-                    </i>
-                </p>
-                <p>
-                    This is a bit of a trick question, because it is very unlikely that somebody who
-                    isn't involved in IETF work will give a reasonable response, while almost any answer
-                    from somebody who is doing IETF work will show that they have some clue.
-                </p>
-                <p>
-                    Please note the exact wording.  Do <b><i>not</i></b> ask about "working groups" --
-                    that will make it easier for people to google for IETF working groups.  Ask the
-                    question as given above, with lowercase "wgs".
-                </p>
-                <p>
-                    If the answer to this question shows clue, then add the address to the whitelist
-                    using this form, and ask the person to please try the
-                    <a href="{% url 'ietf.ietfauth.views.create_account' %}">account creation form</a>
-                    again.
-                </p>
-            </li>
-        </ol>
-        <form method="post">
-            {% csrf_token %}
-            {% bootstrap_form form %}
-            <button class="btn btn-primary" type="submit">Add address to account creation whitelist</button>
-        </form>
-    {% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/.gitignore b/ietf/templates/ipr/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/templates/ipr/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/templates/ipr/add_comment.html b/ietf/templates/ipr/add_comment.html
index 7855224c43..18bc37c75c 100644
--- a/ietf/templates/ipr/add_comment.html
+++ b/ietf/templates/ipr/add_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add comment
         <br>
-        <small class="text-muted">{{ ipr }}</small>
+        <small class="text-body-secondary">{{ ipr }}</small>
     </h1>
     <p>
         The comment will be added to the history trail of the disclosure.
diff --git a/ietf/templates/ipr/add_email.html b/ietf/templates/ipr/add_email.html
index 2d3940049a..e7be36f73b 100644
--- a/ietf/templates/ipr/add_email.html
+++ b/ietf/templates/ipr/add_email.html
@@ -8,7 +8,7 @@
     <h1>
         Add email
         <br>
-        <small class="text-muted">{{ ipr }}</small>
+        <small class="text-body-secondary">{{ ipr }}</small>
     </h1>
     <p>
         The email will be added to the history trail of the disclosure.
diff --git a/ietf/templates/ipr/admin_list.html b/ietf/templates/ipr/admin_list.html
index feb6c9d2f5..23e5883eaa 100644
--- a/ietf/templates/ipr/admin_list.html
+++ b/ietf/templates/ipr/admin_list.html
@@ -18,7 +18,7 @@
     <h1>
         IPR Admin
         <br>
-        <small class="text-muted">
+        <small class="text-body-secondary">
             {% for s in states %}
                 {{ s.name }}
                 {% if not forloop.last %}/{% endif %}
diff --git a/ietf/templates/ipr/deleted.html b/ietf/templates/ipr/deleted.html
new file mode 100644
index 0000000000..24f696ebca
--- /dev/null
+++ b/ietf/templates/ipr/deleted.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
+{% load ietf_filters origin %}
+{% block title %}Removed IPR Disclosure{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>Removed IPR disclosure</h1>
+    <p class="alert alert-info my-3">
+        {{ removed.reason }}
+    </p>
+    {% if user|has_role:"Secretariat" and ipr.exists %}
+    <p class="alert alert-warn my-3" id="deletion_warning">
+        This disclosure has not yet been deleted and parts of its content is available through, e.g, the history view and the /api/v1 views.
+    </p>
+    {% endif %}
+    {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html
index 2dc51bc7ed..1aadb5bb3d 100644
--- a/ietf/templates/ipr/details_edit.html
+++ b/ietf/templates/ipr/details_edit.html
@@ -32,7 +32,7 @@ <h1>The Patent Disclosure and Licensing Declaration Template for Third Party IPR
             regarding an IETF document or contribution when the person letting the
             IETF know about the patent has no relationship with the patent owners.
             Click
-            <a href="{% url 'ietf.ipr.views.new' type='specific' %}">here</a>
+            <a href="{% url 'ietf.ipr.views.new' 'specific' %}">here</a>
             if you want to disclose information about patents or patent
             applications where you do have a relationship to the patent owners or
             patent applicants.
@@ -121,47 +121,22 @@ <h2 class="mt-4">
         {% endif %}
         {% if type != "generic" %}
             <h2 class="mt-4">{% cycle section %}. IETF document or other contribution to which this IPR disclosure relates</h2>
-            <p class="form-text">
+            <p>
                 If an Internet-Draft or RFC includes multiple parts and it is not
                 reasonably apparent which part of such Internet-Draft or RFC is alleged
-                to be covered by the patent information disclosed in Section
-                V(A) or V(B), please identify the sections of
-                the Internet-Draft or RFC that are alleged to be so
+                to be covered by the patent information disclosed in Section V,
+                please identify the sections of the Internet-Draft or RFC that are alleged to be so
                 covered.
             </p>
             {{ draft_formset.management_form }}
             {% for draft_form in draft_formset %}
-                <div class="row draft-row {% if forloop.last %}template d-none{% endif %}">
-                    <label class="col-md-2 fw-bold" for="{{ draft_form.document.id_for_label }}">{{ draft_form.document.label }}</label>
-                    <div class="col-md-6">
-                        {{ draft_form.id }}
-                        {{ draft_form.document }}
-                        {% if draft_form.document.errors %}<div class="alert alert-danger my-3">{{ draft_form.document.errors }}</div>{% endif %}
-                    </div>
-                    <div class="col-md-2">
-                        {% bootstrap_field draft_form.revisions class="form-control" placeholder="Revisions, e.g., 04-07" show_help=False show_label=False %}
-                        <label class="d-none" for="{{ draft_form.revisions.id_for_label }}">{{ draft_form.revisions.label }}</label>
-                    </div>
-                    <div class="col-md-2">
-                        {% bootstrap_field draft_form.sections class="form-control" placeholder="Sections" show_help=False show_label=False %}
-                        <label class="d-none" for="{{ draft_form.sections.id_for_label }}">{{ draft_form.sections.label }}</label>
-                    </div>
-                </div>
-            {% endfor %}
-            {% comment %}
-            {% for draft_form in draft_formset %}
-                <div class="row draft-row {% if forloop.last %}template{% endif %}">
-                    <div class="col-md-2 fw-bold">{% bootstrap_label draft_form.document.label %}</div>
-                    <div class="col-md-6">{% bootstrap_field draft_form.document label_class="d-none" show_help=False %}</div>
-                    <div class="col-md-2">
-                        {% bootstrap_field draft_form.revisions placeholder="Revisions, e.g., 04-07" label_class="d-none" show_help=False %}
-                    </div>
-                    <div class="col-md-2">
-                        {% bootstrap_field draft_form.sections placeholder="Sections" label_class="d-none" show_help=False %}
-                    </div>
+                <div class="row draft-row">
+                    {% include "ipr/details_edit_draft.html" with draft_form=draft_form only %}
                 </div>
             {% endfor %}
-            {% endcomment %}
+            <div class="row draft-row template d-none">
+                {% include "ipr/details_edit_draft.html" with draft_form=draft_formset.empty_form only %}
+            </div>
             <div class="mb-3 row">
                 <div class="col-md-2"></div>
                 <div class="col-md-10">
@@ -178,6 +153,13 @@ <h2 class="mt-4">
             <small>i.e., patents or patent applications required to be disclosed by Section 5 of RFC8179</small>
         </h2>
         {% if form.patent_number %}
+            {% if form.is_blanket_disclosure %}
+                <p>
+                    This IPR disclosure must either identify a specific patent or patents in sections V(A) and V(B)
+                    below, or be made as a blanket IPR disclosure. 
+                </p>
+                {% bootstrap_field form.is_blanket_disclosure layout='horizontal' %}
+            {% endif %}
             <p>
                 A. For granted patents or published pending patent applications,
                 please provide the following information:
diff --git a/ietf/templates/ipr/details_edit_draft.html b/ietf/templates/ipr/details_edit_draft.html
new file mode 100644
index 0000000000..64e5afe60a
--- /dev/null
+++ b/ietf/templates/ipr/details_edit_draft.html
@@ -0,0 +1,14 @@
+{% load django_bootstrap5 %}<label class="col-md-2 fw-bold" for="{{ draft_form.document.id_for_label }}">{{ draft_form.document.label }}</label>
+<div class="col-md-6">
+    {{ draft_form.id }}
+    {{ draft_form.document }}
+    {% if draft_form.document.errors %}<div class="alert alert-danger my-3">{{ draft_form.document.errors }}</div>{% endif %}
+</div>
+<div class="col-md-2">
+    {% bootstrap_field draft_form.revisions class="form-control" placeholder="Revisions, e.g., 04-07" show_help=False show_label=False %}
+    <label class="d-none" for="{{ draft_form.revisions.id_for_label }}">{{ draft_form.revisions.label }}</label>
+</div>
+<div class="col-md-2">
+    {% bootstrap_field draft_form.sections class="form-control" placeholder="Sections" show_help=False show_label=False %}
+    <label class="d-none" for="{{ draft_form.sections.id_for_label }}">{{ draft_form.sections.label }}</label>
+</div>
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
index f796901938..11730741b4 100644
--- a/ietf/templates/ipr/details_history.html
+++ b/ietf/templates/ipr/details_history.html
@@ -11,7 +11,7 @@
     <h1>
         History for IPR disclosure
         <br>
-        <small class="text-muted">{{ ipr.title }}</small>
+        <small class="text-body-secondary">{{ ipr.title }}</small>
     </h1>
     {% include "ipr/details_tabs.html" %}
     {% if user|has_role:"Area Director,Secretariat,IANA,RFC Editor" %}
@@ -51,7 +51,7 @@ <h1>
                         <td>{% person_link e.by %}</td>
                         <td class="text-break">
                             {% if e.message %}
-                                {% if e.response_due %}<span class="badge rounded-pill bg-info">Response due {{ e.response_due|date:"Y-m-d" }}</span>{% endif %}
+                                {% if e.response_due %}<span class="badge rounded-pill text-bg-info">Response due {{ e.response_due|date:"Y-m-d" }}</span>{% endif %}
                                 {# FIXME: can't do format_history_text, because that inserts a <div> into the <pre>, which is illegal. Need to rework the snippeting. #}
                                 <pre>{{ e.message|render_message_for_history|urlize_ietf_docs|linkify }}</pre>
                             {% else %}
diff --git a/ietf/templates/ipr/details_view.html b/ietf/templates/ipr/details_view.html
index bdda164a62..9ba63114ae 100644
--- a/ietf/templates/ipr/details_view.html
+++ b/ietf/templates/ipr/details_view.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, 2017. All Rights Reserved. #}
+{# Copyright The IETF Trust 2015-2023. All Rights Reserved. #}
 {% load origin %}
 {% load ietf_filters ipr_filters textfilters %}
 {% block title %}IPR Details - {{ ipr.title }}{% endblock %}
@@ -12,7 +12,7 @@
     <h1>
         IPR Details
         <br>
-        <small class="text-muted">{{ ipr.title }}</small>
+        <small class="text-body-secondary">{{ ipr.title }}</small>
     </h1>
     {% include "ipr/details_tabs.html" %}
     <div class="buttonlist my-3">
@@ -103,6 +103,8 @@ <h2 class="mt-5">Updates</h2>
                             IPR Disclosure ID #{{ item.source.id }},
                             {% if item.source.state.slug == "removed" %}
                                 "{{ item.source.title }}" (which was removed at the request of the submitter)
+                            {% elif item.source.state.slug == "removed_objfalse" %}
+                                "{{ item.source.title }}" (which was removed as objectively false)
                             {% else %}
                                 "<a href="{% url "ietf.ipr.views.show" id=item.source.id %}">{{ item.source.title }}</a>"
                             {% endif %}
@@ -122,6 +124,8 @@ <h2 class="mt-5">Updates</h2>
                             IPR Disclosure ID #{{ item.target.id }},
                             {% if item.target.state.slug == "removed" %}
                                 "{{ item.target.title }}" (which was removed at the request of the submitter)
+                            {% elif item.source.state.slug == "removed_objfalse" %}
+                                "{{ item.source.title }}" (which was removed as objectively false)
                             {% elif item.target.state.slug == "rejected" %}
                                 "{{ item.target.title }}" (which was rejected)
                             {% elif item.target.state.slug == "parked" %}
@@ -379,7 +383,8 @@ <h2 class="mt-5">
                                         {{ iprdocrel.doc_type }}:
                                     </dt>
                                     <dd class="col-sm-8 my-0">
-                                        {{ iprdocrel.formatted_name|urlize_ietf_docs }} ("{{ iprdocrel.document.document.title }}")
+                                        {{ iprdocrel.formatted_name|urlize_ietf_docs }}
+                                        {% if iprdocrel.document.title %}("{{ iprdocrel.document.title }}"){% endif %}
                                     </dd>
                                     {% if iprdocrel.revisions %}
                                         <dt class="col-sm-4 my-0">
@@ -388,6 +393,13 @@ <h2 class="mt-5">
                                         <dd class="col-sm-8 my-0">
                                             {{ iprdocrel.revisions }}
                                         </dd>
+                                    {% elif iprdocrel.doc_type == "Internet-Draft" %}
+                                        <dt class="{% if prev %}col-sm-4{% else %}col-sm-3{% endif %} my-0 fw-bolder fst-italic">
+                                            Notice:
+                                        </dt>
+                                        <dd class="{% if prev %}col-sm-8{% else %}col-sm-9{% endif %} my-0 fst-italic">
+                                            {{ iprdocrel|no_revisions_message }}
+                                        </dd>                                 
                                     {% endif %}
                                     {% if iprdocrel.sections %}
                                         <dt class="col-sm-4 my-0">
@@ -418,7 +430,8 @@ <h2 class="mt-5">
                                     {{ iprdocrel.doc_type }}:
                                 </dt>
                                 <dd class="{% if prev %}col-sm-8{% else %}col-sm-9{% endif %} my-0">
-                                    {{ iprdocrel.formatted_name|urlize_ietf_docs }} ("{{ iprdocrel.document.document.title }}")
+                                    {{ iprdocrel.formatted_name|urlize_ietf_docs }}
+                                    {% if iprdocrel.document.title %}("{{ iprdocrel.document.title }}"){% endif %}
                                 </dd>
                                 {% if iprdocrel.revisions %}
                                     <dt class="{% if prev %}col-sm-4{% else %}col-sm-3{% endif %} my-0">
@@ -427,6 +440,13 @@ <h2 class="mt-5">
                                     <dd class="{% if prev %}col-sm-8{% else %}col-sm-9{% endif %} my-0">
                                         {{ iprdocrel.revisions }}
                                     </dd>
+                                {% elif iprdocrel.doc_type == "Internet-Draft" %}
+                                    <dt class="{% if prev %}col-sm-4{% else %}col-sm-3{% endif %} my-0 fw-bolder fst-italic">
+                                        Notice:
+                                    </dt>
+                                    <dd class="{% if prev %}col-sm-8{% else %}col-sm-9{% endif %} my-0 fst-italic">
+                                        {{ iprdocrel|no_revisions_message }}
+                                    </dd>                              
                                 {% endif %}
                                 {% if iprdocrel.sections %}
                                     <dt class="{% if prev %}col-sm-4{% else %}col-sm-3{% endif %} my-0">
@@ -455,7 +475,7 @@ <h2 class="mt-5">
         <h2 class="mt-5">
             {% cycle section %}. Disclosure of Patent Information
             <br>
-            <small class="text-muted">i.e., patents or patent applications required to be disclosed by {{ in_force_ipr_rfc|urlize_ietf_docs }}</small>
+            <small class="text-body-secondary">i.e., patents or patent applications required to be disclosed by {{ in_force_ipr_rfc|urlize_ietf_docs }}</small>
         </h2>
         <p>
             A. For granted patents or published pending patent applications, please provide the following information:
diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html
index 9830c73113..1291247f90 100644
--- a/ietf/templates/ipr/email.html
+++ b/ietf/templates/ipr/email.html
@@ -12,7 +12,7 @@
     <h1>
         Email submitter
         <br>
-        <small class="text-muted">{{ ipr.title }}</small>
+        <small class="text-body-secondary">{{ ipr.title }}</small>
     </h1>
     <form method="post" class="my-3 show-required">
         {% csrf_token %}
diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html
index ce3982c987..d8247ea587 100644
--- a/ietf/templates/ipr/ipr_table.html
+++ b/ietf/templates/ipr/ipr_table.html
@@ -39,10 +39,13 @@
                                     </small>
                                 {% endif %}
                             {% endfor %}
-                        {% else %}
+                        {% elif ipr.state_id == 'removed' %}
                             <div>{{ ipr.title }}</div>
                             <small><i>This IPR disclosure was removed at the request of the submitter.</i></small>
-                        {% endif %}
+                        {% elif ipr.state_id == 'removed_objfalse' %}
+                            <div>{{ ipr.title }}</div>
+                            <small><i>This IPR disclosure was removed as objectively false.</i></small>
+                        {% endif %} {# Intentionally not emitting anything for any other states #}
                     </td>
                     {% if administrative_list == 'pending' %}
                         {% with ipr.get_latest_event_msgout as latest_msgout %}
diff --git a/ietf/templates/ipr/notify.html b/ietf/templates/ipr/notify.html
index 0ac966a5d8..7afb30add6 100644
--- a/ietf/templates/ipr/notify.html
+++ b/ietf/templates/ipr/notify.html
@@ -8,7 +8,7 @@
     <h1>
         Send Notification{{ formset|pluralize }}
         <br>
-        <small class="text-muted">{{ ipr }}</small>
+        <small class="text-body-secondary">{{ ipr }}</small>
     </h1>
     <form class="my-3 send-notification" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/ipr/posted_document_email.txt b/ietf/templates/ipr/posted_document_email.txt
index 397b686b29..1c56e8deac 100644
--- a/ietf/templates/ipr/posted_document_email.txt
+++ b/ietf/templates/ipr/posted_document_email.txt
@@ -6,7 +6,7 @@ Cc: {{ cc_email }}
 Dear {{ to_name }}:
 
 {% filter wordwrap:78 %}
-An IPR disclosure that pertains to your {{ doc_info }} was submitted to the IETF Secretariat on {{ ipr.get_latest_event_submitted.time|date:"Y-m-d" }} and has been posted on the "IETF Page of Intellectual Property Rights Disclosures" ({{ settings.IDTRACKER_BASE_URL }}{% url "ietf.ipr.views.history" id=ipr.pk %}). The title of the IPR disclosure is "{{ ipr.title }}"
+An IPR disclosure that pertains to your {{ doc_info }} was submitted to the IETF Secretariat on {{ ipr.get_latest_event_submitted.time|date:"Y-m-d" }} and has been posted on the "IETF Page of Intellectual Property Rights Disclosures" ({{ settings.IDTRACKER_BASE_URL }}{% url "ietf.ipr.views.show" id=ipr.pk %}). The title of the IPR disclosure is "{{ ipr.title }}"
 {% endfilter %}
 
 Thank you
diff --git a/ietf/templates/ipr/removed.html b/ietf/templates/ipr/removed.html
index 775819df62..96bf6ab899 100644
--- a/ietf/templates/ipr/removed.html
+++ b/ietf/templates/ipr/removed.html
@@ -1,11 +1,15 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% block title %}{{ ipr.title }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>{{ ipr.title }}</h1>
     <p class="alert alert-info my-3">
-        This IPR disclosure was removed at the submitter's request.
+        {% if ipr.state.slug == "removed" %}
+            This IPR disclosure was removed at the submitter's request.
+        {% elif ipr.state.slug == "removed_objfalse" %}
+            This IPR disclosure was removed as objectively false.
+        {% endif %}
     </p>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/search_doc_list.html b/ietf/templates/ipr/search_doc_list.html
index 24fbfd01ba..e67f67fecd 100644
--- a/ietf/templates/ipr/search_doc_list.html
+++ b/ietf/templates/ipr/search_doc_list.html
@@ -7,15 +7,15 @@
     <h1>
         IPR disclosures
         <br>
-        <small class="text-muted">Select Internet-Draft</small>
+        <small class="text-body-secondary">Select Internet-Draft</small>
     </h1>
     <p>
         Please select one of following I-Ds:
     </p>
     <ul>
-        {% for docalias in docs %}
+        {% for doc in docs %}
             <li>
-                <a href="?submit=draft&amp;id={{ docalias.name }}">{{ docalias.name }}</a>
+                <a href="?submit=draft&amp;id={{ doc.name }}">{{ doc.name }}</a>
             </li>
         {% endfor %}
     </ul>
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index 5a0186c8fd..b003a32108 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
 
-{% block search_header %}Document IPR search results<br><small class="text-muted">{{doc}}</small>{% endblock %}
+{% block search_header %}Document IPR search results<br><small class="text-body-secondary">{{doc}}</small>{% endblock %}
 
 {% block search_result %}
     <p class="alert alert-info my-3">Total number of IPR disclosures found: <b>{{ iprs|length }}</b>.</p>
@@ -28,7 +28,7 @@
                     <tr>
                         <td>{{ ipr.time|date:"Y-m-d" }}</td>
                         <td>{{ ipr.id }}</td>
-                        <td><a href="{% url "ietf.ipr.views.show" id=ipr.id %}">{{ ipr.title }}</a>{% if ipr.state_id == 'removed' %}<span class="badge rounded-pill bg-info">Removed</span>{% endif %}
+                        <td><a href="{% url "ietf.ipr.views.show" id=ipr.id %}">{{ ipr.title }}</a>{% if ipr.state_id == 'removed' or ipr.state_id == 'removed_objfalse' %}<span class="badge rounded-pill text-bg-info">Removed</span>{% endif %}
                             {% if ipr.updates %} <br>(Updates ID#: {% for upd in ipr.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
                         </td>
                     </tr>
@@ -54,23 +54,34 @@
             </tr>
         </thead>
 
-        {% for doc in docs %}
+        {% for d in docs %}
             <tbody>
                 <tr>
                     <th scope="col" class="table-info" colspan="3">
-                        Results for {{ doc.name|prettystdname|urlize_ietf_docs }} ("{{ doc.document.title }}"){% if not forloop.first %}{% if doc.related %}, which was {{ doc.relation|lower }} {{ doc.related.source|prettystdname|urlize_ietf_docs  }} ("{{ doc.related.source.title }}"){% endif %}{% endif %}
+                        Results for {{ d.name|prettystdname|urlize_ietf_docs }}
+                        ("{{ d.title }}"){% if d != doc and d.related %}, which
+                            {% if d == d.related.source %}
+                                {{ d.relation|lower }}
+                                {{ d.related.target|prettystdname|urlize_ietf_docs }}
+                                ("{{ d.related.target.title }}")
+                            {% else %}
+                                was {{ d.relation|lower }}
+                                {{ d.related.source|prettystdname|urlize_ietf_docs }}
+                                ("{{ d.related.source.title }}")
+                            {% endif %}
+                        {% endif %}
                     </th>
                 </tr>
             </tbody>
             <tbody>
-                {% with doc.iprdocrel_set.all as doc_iprs %}
+                {% with d.iprdocrel_set.all as doc_iprs %}
                     {% if doc_iprs %}
                         {% for ipr in doc_iprs %}
                             {% if ipr.disclosure.state_id in states %}
                                 <tr>
                                     <td>{{ ipr.disclosure.time|date:"Y-m-d" }}</td>
                                     <td>{{ ipr.disclosure.id }}</td>
-                                    <td><a href="{% url "ietf.ipr.views.show" id=ipr.disclosure.id %}">{{ ipr.disclosure.title }}</a>{% if ipr.disclosure.state_id == 'removed' %} (Removed) {% endif %}
+                                    <td><a href="{% url "ietf.ipr.views.show" id=ipr.disclosure.id %}">{{ ipr.disclosure.title }}</a>{% if ipr.disclosure.state_id == 'removed' or ipr.disclosure.state_id == 'removed_objfalse' %} (Removed) {% endif %}
                                         {% if ipr.disclosure.updates %} <br>(Updates ID#: {% for upd in ipr.disclosure.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
                                     </td>
                                 </tr>
@@ -81,7 +92,7 @@
                             <td></td>
                             <td></td>
                             <td>
-                                No IPR disclosures have been submitted directly on {{ doc.name|prettystdname|urlize_ietf_docs }}{% if iprs %},
+                                No IPR disclosures have been submitted directly on {{ d.name|prettystdname|urlize_ietf_docs }}{% if iprs %},
                                     but there are disclosures on {% if docs|length == 2 %}a related document{% else %}related documents{% endif %}, listed on this page{% endif %}.
                             </td>
                         </tr>
diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html
index b7a8a8b31e..57fa17e912 100644
--- a/ietf/templates/ipr/search_doctitle_result.html
+++ b/ietf/templates/ipr/search_doctitle_result.html
@@ -24,20 +24,20 @@
                     <th scope="col" data-sort="statement">Statement</th>
                 </tr>
             </thead>
-            {% for alias in docs %}
+            {% for doc in docs %}
                 <tbody>
                     <tr>
                         <th scope="col" class="table-info" colspan="3">
-                            IPR that is related to {{ alias.name|prettystdname:""|urlize_ietf_docs }} ("{{ alias.document.title }}")
-                            {% if alias.related %}
-                                that was {{ alias.relation|lower }} {{ alias.related.source.name|prettystdname:""|urlize_ietf_docs  }} ("{{ alias.related.source.title }}")
+                            IPR that is related to {{ doc.name|prettystdname:""|urlize_ietf_docs }} ("{{ doc.title }}")
+                            {% if doc.related %}
+                                that was {{ doc.relation|lower }} {{ doc.related.source.name|prettystdname:""|urlize_ietf_docs  }} ("{{ doc.related.source.title }}")
                             {% endif %}
                         </th>
                     </tr>
                 </tbody>
                 <tbody>
-                    {% if alias.document.ipr %}
-                        {% for ipr in alias.document.ipr %}
+                    {% if doc.ipr %}
+                        {% for ipr in doc.ipr %}
                             <tr>
                                 <td>{{ ipr.disclosure.time|date:"Y-m-d" }}</td>
                                 <td>{{ ipr.disclosure.id }}</td>
@@ -58,7 +58,7 @@
                         <tr>
                             <td></td>
                             <td></td>
-                            <td>No IPR disclosures related to {{ alias.name|prettystdname|urlize_ietf_docs }} have been submitted.</td>
+                            <td>No IPR disclosures related to {{ doc.name|prettystdname|urlize_ietf_docs }} have been submitted.</td>
                         </tr>
                     {% endif %}
                 </tbody>
diff --git a/ietf/templates/ipr/search_form.html b/ietf/templates/ipr/search_form.html
index e35eafd26e..34f5af87b6 100644
--- a/ietf/templates/ipr/search_form.html
+++ b/ietf/templates/ipr/search_form.html
@@ -3,86 +3,103 @@
 {% load origin %}
 {% origin %}
 <h1>IPR Search</h1>
-<form class="ipr-search">
-    {% if user|has_role:"Secretariat" %}
-        <h2 class="mt-4">State Filter</h2>
-        {% bootstrap_field form.state %}
-    {% endif %}
-    <h2 class="mt-4">Document search</h2>
-    <div class="mb-3">
-        {% bootstrap_label form.draft.label label_for=form.draft.id_for_label label_class="form-label" %}
-        <div class="input-group">
-            {% render_field form.draft class="form-control" placeholder="draft-..." %}
-            <button class="btn btn-primary" type="submit" value="draft">
-                <i class="bi bi-search"></i> Search
-            </button>
-        </div>
+
+<div class="accordion" id="ipr-search-form">
+  <div class="accordion-item">
+    <h2 class="accordion-header" id="ipr-search-form-heading">
+      <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#ipr-search-collapse" aria-expanded="{{ request.GET|yesno:'false,true'}}" aria-controls="ipr-search-collapse">
+        IPR search criteria...
+      </button>
+    </h2>
+    <div id="ipr-search-collapse" class="accordion-collapse collapse{% if not request.GET %} show{% endif %}" aria-labelledby="ipr-search-form-heading" data-bs-parent="#ipr-search-form">
+      <div class="accordion-body">
+
+        <form class="ipr-search">
+            {% if user|has_role:"Secretariat" %}
+                <h2>State Filter</h2>
+                {% bootstrap_field form.state %}
+            {% endif %}
+            <h2>Document search</h2>
+            <div class="mb-3">
+                {% bootstrap_label form.draft.label label_for=form.draft.id_for_label label_class="form-label" %}
+                <div class="input-group">
+                    {% render_field form.draft class="form-control" placeholder="draft-..." %}
+                    <button class="btn btn-primary" type="submit" value="draft">
+                        <i class="bi bi-search"></i> Search
+                    </button>
+                </div>
+            </div>
+            <div class="mb-3">
+                {% bootstrap_label form.rfc.label label_for=form.rfc.id_for_label label_class="form-label" %}
+                <div class="input-group">
+                    {% render_field form.rfc class="form-control" placeholder="123..." %}
+                    <button class="btn btn-primary" type="submit" value="rfc">
+                        <i class="bi bi-search"></i> Search
+                    </button>
+                </div>
+            </div>
+            <div class="mb-3">
+                {% bootstrap_label form.doctitle.label|cut:":" label_for=form.doctitle.id_for_label label_class="form-label" %}
+                <div class="input-group">
+                    {% render_field form.doctitle class="form-control" placeholder="protocol..." %}
+                    <button class="btn btn-primary" type="submit" value="doctitle">
+                        <i class="bi bi-search"></i> Search
+                    </button>
+                </div>
+            </div>
+            <div class="mb-3">
+                {% bootstrap_label form.group.label|cut:":" label_for=form.group.id_for_label label_class="form-label" %}
+                <div class="input-group">
+                    {% render_field form.group class="form-select" %}
+                    <button class="btn btn-primary btn-block"
+                            type="submit"
+                            value="group">
+                        <i class="bi bi-search"></i> Search
+                    </button>
+                </div>
+            </div>
+            <h2>IPR search</h2>
+            <div class="mb-3">
+                {% bootstrap_label form.holder.label|cut:":" label_for=form.holder.id_for_label label_class="form-label" %}
+                <div class="input-group">
+                    {% render_field form.holder class="form-control" placeholder="John Doe..." %}
+                    <button class="btn btn-primary" type="submit" value="holder">
+                        <i class="bi bi-search"></i> Search
+                    </button>
+                </div>
+            </div>
+            <div class="mb-3">
+                {% bootstrap_label form.iprtitle.label|cut:":" label_for=form.iprtitle.id_for_label label_class="form-label" %}
+                <div class="input-group">
+                    {% render_field form.iprtitle class="form-control" placeholder="protocol..." %}
+                    <button class="btn btn-primary" type="submit" value="iprtitle">
+                        <i class="bi bi-search"></i> Search
+                    </button>
+                </div>
+            </div>
+            <div class="mb-3">
+                {% bootstrap_label form.patent.label|cut:":" label_for=form.patent.id_for_label label_class="form-label" %}
+                <div class="input-group">
+                    {% render_field form.patent class="form-control" %}
+                    <button class="btn btn-primary" type="submit" value="patent">
+                        <i class="bi bi-search"></i> Search
+                    </button>
+                </div>
+                <div class="form-text">
+                    This search string must contain at least three characters, including
+                    at least one digit, and include punctuation marks. For best results,
+                    please enter the entire string, or as much of it as possible.
+                </div>
+            </div>
+            <input type="hidden" name="submit">
+        </form>
+
+      </div>
     </div>
-    <div class="mb-3">
-        {% bootstrap_label form.rfc.label label_for=form.rfc.id_for_label label_class="form-label" %}
-        <div class="input-group">
-            {% render_field form.rfc class="form-control" placeholder="123..." %}
-            <button class="btn btn-primary" type="submit" value="rfc">
-                <i class="bi bi-search"></i> Search
-            </button>
-        </div>
-    </div>
-    <div class="mb-3">
-        {% bootstrap_label form.doctitle.label|cut:":" label_for=form.doctitle.id_for_label label_class="form-label" %}
-        <div class="input-group">
-            {% render_field form.doctitle class="form-control" placeholder="protocol..." %}
-            <button class="btn btn-primary" type="submit" value="doctitle">
-                <i class="bi bi-search"></i> Search
-            </button>
-        </div>
-    </div>
-    <div class="mb-3">
-        {% bootstrap_label form.group.label|cut:":" label_for=form.group.id_for_label label_class="form-label" %}
-        <div class="input-group">
-            {% render_field form.group class="form-select" %}
-            <button class="btn btn-primary btn-block"
-                    type="submit"
-                    value="group">
-                <i class="bi bi-search"></i> Search
-            </button>
-        </div>
-    </div>
-    <h2 class="mt-4">IPR search</h2>
-    <div class="mb-3">
-        {% bootstrap_label form.holder.label|cut:":" label_for=form.holder.id_for_label label_class="form-label" %}
-        <div class="input-group">
-            {% render_field form.holder class="form-control" placeholder="John Doe..." %}
-            <button class="btn btn-primary" type="submit" value="holder">
-                <i class="bi bi-search"></i> Search
-            </button>
-        </div>
-    </div>
-    <div class="mb-3">
-        {% bootstrap_label form.iprtitle.label|cut:":" label_for=form.iprtitle.id_for_label label_class="form-label" %}
-        <div class="input-group">
-            {% render_field form.iprtitle class="form-control" placeholder="protocol..." %}
-            <button class="btn btn-primary" type="submit" value="iprtitle">
-                <i class="bi bi-search"></i> Search
-            </button>
-        </div>
-    </div>
-    <div class="mb-3">
-        {% bootstrap_label form.patent.label|cut:":" label_for=form.patent.id_for_label label_class="form-label" %}
-        <div class="input-group">
-            {% render_field form.patent class="form-control" %}
-            <button class="btn btn-primary" type="submit" value="patent">
-                <i class="bi bi-search"></i> Search
-            </button>
-        </div>
-        <div class="form-text">
-            This search string must contain at least three characters, including
-            at least one digit, and include punctuation marks. For best results,
-            please enter the entire string, or as much of it as possible.
-        </div>
-    </div>
-    <input type="hidden" name="submit">
-</form>
-<p class="alert alert-info my-3">
+  </div>
+</div>
+
+<p class="alert alert-warning my-3">
     The material posted as IPR disclosures should be viewed as originating
     from the source of that information, and any issue or question related
     to the material should be directed to the source rather than the
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index a104e45c07..449a6f7f8b 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -54,7 +54,7 @@ <h2 class="mt-5">
                                                 is related to
                                                 {% for item in iprdocrels %}
                                                     {% if forloop.last and forloop.counter > 1 %}and{% endif %}
-                                                    {{ item.formatted_name|urlize_ietf_docs }} ("{{ item.document.document.title }}"){% if not forloop.last and forloop.counter > 1 %},{% endif %}
+                                                    {{ item.formatted_name|urlize_ietf_docs }}{% if item.document.title %} ("{{ item.document.title }}"){% endif %}{% if not forloop.last and forloop.counter > 1 %},{% endif %}
                                                 {% endfor %}
                                             {% endif %}
                                         {% endwith %}
@@ -100,4 +100,4 @@ <h2 class="mt-5">
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
     <script src="{% static 'ietf/js/ipr-search.js' %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html
index ae477a2699..1561e05ba3 100644
--- a/ietf/templates/ipr/search_wg_result.html
+++ b/ietf/templates/ipr/search_wg_result.html
@@ -20,22 +20,22 @@
                     <th scope="col" data-sort="statement">Statement</th>
                 </tr>
             </thead>
-            {% for alias in docs %}
+            {% for doc in docs %}
                 <tbody>
                     <tr class="table-info">
                         <th scope="col" colspan="3">
-                            IPR related to {{ alias.name|prettystdname|urlize_ietf_docs }} ("{{ alias.document.title }}")
-                            {% if alias.related %}
-                                that was {{ alias.relation|lower }} {{ alias.related.source|prettystdname|urlize_ietf_docs  }} ("{{ alias.related.source.title|escape }}")
+                            IPR related to {{ doc.name|prettystdname|urlize_ietf_docs }} ("{{ doc.title }}")
+                            {% if doc.related %}
+                                that was {{ doc.relation|lower }} {{ doc.related.source|prettystdname|urlize_ietf_docs  }} ("{{ doc.related.source.title|escape }}")
                             {% endif %}
-                            {% if alias.product_of_this_wg %}, a product of the {{ q }} WG{% endif %}
+                            {% if doc.product_of_this_wg %}, a product of the {{ q }} WG{% endif %}
                             :
                         </th>
                     </tr>
                 </tbody>
                 <tbody>
-                    {% if alias.document.ipr %}
-                        {% for ipr in alias.document.ipr %}
+                    {% if doc.ipr %}
+                        {% for ipr in doc.ipr %}
                             <tr>
                                 <td>{{ ipr.disclosure.time|date:"Y-m-d" }}</td>
                                 <td>{{ ipr.disclosure.id }}</td>
@@ -57,7 +57,7 @@
                             <td></td>
                             <td></td>
                             <td>
-                                No IPR disclosures related to <i>{{ alias.name|prettystdname|urlize_ietf_docs }}</i> have been submitted.
+                                No IPR disclosures related to <i>{{ doc.name|prettystdname|urlize_ietf_docs }}</i> have been submitted.
                             </td>
                         </tr>
                     {% endif %}
diff --git a/ietf/templates/ipr/state.html b/ietf/templates/ipr/state.html
index 259a007483..0b6391a782 100644
--- a/ietf/templates/ipr/state.html
+++ b/ietf/templates/ipr/state.html
@@ -8,7 +8,7 @@
     <h1>
         Change State
         <br>
-        <small class="text-muted">{{ ipr }}</small>
+        <small class="text-body-secondary">{{ ipr }}</small>
     </h1>
     <form class="add-comment my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/ipr/update_submitter_email.txt b/ietf/templates/ipr/update_submitter_email.txt
index 599ceab54f..f45a9072ab 100644
--- a/ietf/templates/ipr/update_submitter_email.txt
+++ b/ietf/templates/ipr/update_submitter_email.txt
@@ -5,22 +5,25 @@ Reply-To: {{ reply_to }}
 
 Dear {{ to_name }}:
 
-We have just received a request to update the IPR disclosure(s) submitted by you:
+We have just received a request to update one or more IPR disclosures
+previously submitted by you:
 
 {% for ipr in iprs %}
 {{ ipr.title }} {{ ipr.get_absolute_url }}
 {% endfor %}
 
-The name and email address of the person who submitted the update to your IPR disclosure are:
-{{ new_ipr.submitter_name }}, {{ new_ipr.submitter_email }}.
+The name and email address of the person who submitted the update to
+your IPR disclosure are: {{ new_ipr.submitter_name }}, {{ new_ipr.submitter_email }}.
+If this is you or someone known by you to be authorized to update
+the above disclosures, please respond to this message to confirm.
 
-We will not post this update unless we receive positive confirmation from you that
-{{ new_ipr.submitter_name }} is authorized to update your disclosure.
-Please respond to this message to confirm.
+We will not post this update unless we receive positive confirmation
+from you that the update is indeed from you or someone authorized to
+update the above listed disclosures.
 
 If we do not hear from you within 30 days, we will inform {{ new_ipr.submitter_name }}
-that we were not able to secure approval for posting and that we are therefore rejecting
-the update until we can be assured it is authorized.
+that we were not able to secure approval for posting and that we are
+therefore rejecting the update until we can be assured it is authorized.
 
 Thank you
 
diff --git a/ietf/templates/liaisons/.gitignore b/ietf/templates/liaisons/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/templates/liaisons/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/templates/liaisons/add_comment.html b/ietf/templates/liaisons/add_comment.html
index 8497d4c2f3..0bf8bb59af 100644
--- a/ietf/templates/liaisons/add_comment.html
+++ b/ietf/templates/liaisons/add_comment.html
@@ -8,7 +8,7 @@
     <h1>
         Add comment
         <br>
-        <small class="text-muted">{{ liaison.title }}</small>
+        <small class="text-body-secondary">{{ liaison.title }}</small>
     </h1>
     <p>
         The comment will be added to the history trail of the statement.
diff --git a/ietf/templates/liaisons/detail.html b/ietf/templates/liaisons/detail.html
index 63f427f383..d46c8d1c98 100644
--- a/ietf/templates/liaisons/detail.html
+++ b/ietf/templates/liaisons/detail.html
@@ -11,8 +11,9 @@
     <h1>
         Liaison statement
         <br>
-        <small class="text-muted">{% include 'liaisons/liaison_title.html' %}</small>
+        <small class="text-body-secondary">{% include 'liaisons/liaison_title.html' %}</small>
     </h1>
+    {% include "liaisons/liaison_desc.html" only %}
     {% include "liaisons/detail_tabs.html" %}
     <table class="table table-sm table-striped">
         <tbody>
@@ -31,7 +32,7 @@ <h1>
         {% if liaison.from_contact %}
             <tr>
                 <th scope="row">From Contact</th>
-                <td>{% person_link liaison.from_contact.person %}</td>
+                <td>{{ liaison.from_contact }}</td>
             </tr>
         {% endif %}
         <tr>
@@ -87,6 +88,7 @@ <h1>
                             {% csrf_token %}
                             <button class="btn btn-warning btn-sm"
                                    type="submit"
+                                   value="Mark as action taken"
                                    name="do_action_taken">
                                 Mark as action taken
                             </button>
@@ -229,9 +231,10 @@ <h1>
             </a>
         {% endif %}
         {% if liaison.state.slug == 'pending' and can_edit %}
-            <button class="btn btn-primary" type="submit" name="approved">Approve</button>
+            <button class="btn btn-primary" type="submit" value="Approve" name="approved">Approve</button>
             <button class="btn btn-primary"
                    type="submit"
+                   value="Mark as Dead"
                    name="dead">Mark as dead</button>
         {% endif %}
         {% if liaison.state.slug == 'posted' and  user|has_role:"Secretariat" %}
@@ -243,7 +246,8 @@ <h1>
         {% if liaison.state.slug == 'dead' and can_edit %}
             <button class="btn btn-primary"
                    type="submit"
+                   value="Resurrect"
                    name="resurrect">Resurrect</button>
         {% endif %}
     {% if liaison.state.slug == 'pending' and can_edit or liaison.state.slug == 'dead' and can_edit %}</form>{% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html
index fcb91e301f..635466ed3a 100644
--- a/ietf/templates/liaisons/detail_history.html
+++ b/ietf/templates/liaisons/detail_history.html
@@ -8,7 +8,7 @@
     <h1>
         History for Liaison Statement
         <br>
-        <small class="text-muted">{{ liaison.title }}</small>
+        <small class="text-body-secondary">{{ liaison.title }}</small>
     </h1>
     {% include "liaisons/detail_tabs.html" %}
     {% if user|has_role:"Area Director,Secretariat,IANA,RFC Editor" %}
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index 2c7b4b65ba..1684425eb2 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -19,7 +19,7 @@
     {% origin %}
     <h1 class="mb-3">
         {% if liaison %}
-            Edit liaison<br><small class="text-muted">{{ liaison }}</small>
+            Edit liaison<br><small class="text-body-secondary">{{ liaison }}</small>
         {% else %}
             Send Liaison Statement
         {% endif %}
@@ -47,21 +47,43 @@ <h1 class="mb-3">
           method="post"
           enctype="multipart/form-data"
           data-edit-form="{{ form.edit }}"
-          data-ajax-info-url="{% url "ietf.liaisons.views.ajax_get_liaison_info" %}">
+          data-ajax-info-url="{% url 'ietf.liaisons.views.ajax_get_liaison_info' %}">
         {% csrf_token %}
-        {% for fieldset in form.fieldsets %}
-            <h2>{{ fieldset.name }}</h2>
-            {% for field in fieldset %}
-                {% if field.id_for_label != "id_attachments" %}
-                    {% bootstrap_field field layout="horizontal" %}
-                {% else %}
-                    <div class="row mb-3">
-                        <p class="col-md-2 fw-bold col-form-label">{{ field.label }}</p>
-                        <div class="col-md-10">{{ field }}</div>
-                    </div>
-                {% endif %}
-            {% endfor %}
-        {% endfor %}
+        <h2>From</h2>
+            {% bootstrap_field form.from_groups layout="horizontal" %}
+            {% bootstrap_field form.from_contact layout="horizontal" %}
+            {% bootstrap_field form.response_contacts layout="horizontal" %}
+            {% if form.approved %}
+                {% bootstrap_field form.approved layout="horizontal" %}
+            {% endif %}
+        <h2>To</h2>
+            {% bootstrap_field form.to_groups layout="horizontal" %}
+            {% bootstrap_field form.to_contacts layout="horizontal" %}
+        <h2>Other email addresses</h2>
+            {% bootstrap_field form.technical_contacts layout="horizontal" %}
+            {% if form.action_holder_contacts %}
+                {% bootstrap_field form.action_holder_contacts layout="horizontal" %}
+            {% endif %}
+            {% bootstrap_field form.cc_contacts layout="horizontal" %}
+        <h2>Purpose</h2>
+            {% bootstrap_field form.purpose layout="horizontal" %}
+            {% bootstrap_field form.deadline layout="horizontal" %}
+        <h2>Reference</h2>
+            {% bootstrap_field form.other_identifiers layout="horizontal" %}
+            {% bootstrap_field form.related_to layout="horizontal" %}
+        <h2>Liaison Statement</h2>
+            {% bootstrap_field form.title layout="horizontal" %}
+            {% bootstrap_field form.submitted_date layout="horizontal" %}
+            {% bootstrap_field form.body layout="horizontal" %}
+            <div class="row mb-3">
+                <p class="col-md-2 fw-bold col-form-label">{{ form.attachments.label }}</p>
+                <div class="col-md-10">{{ form.attachments }}</div>
+            </div>
+        <h2>Add attachment</h2>
+            {% bootstrap_field form.attach_title layout="horizontal" %}
+            {% bootstrap_field form.attach_file layout="horizontal" %}
+            {% bootstrap_field form.attach_button layout="horizontal" %}
+
         <a class="btn btn-danger float-end"
            href="{% if liaison %}{% url 'ietf.liaisons.views.liaison_detail' object_id=liaison.pk %}{% else %}{% url 'ietf.liaisons.views.liaison_list' %}{% endif %}">
             Cancel
diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html
index 53568d1a4a..226c78d827 100644
--- a/ietf/templates/liaisons/guide_from_ietf.html
+++ b/ietf/templates/liaisons/guide_from_ietf.html
@@ -11,7 +11,7 @@
     <h1>
         Liaison statements from the IETF
         <br>
-        <small class="text-muted">Guidelines for completing the "Cc:" field</small>
+        <small class="text-body-secondary">Guidelines for completing the "Cc:" field</small>
     </h1>
     <p>
         The individuals copied on a liaison statement that is sent by the IETF to another Standards Development Organization (SDO) depend on the IETF entity that is sending the liaison statement.
diff --git a/ietf/templates/liaisons/guide_to_ietf.html b/ietf/templates/liaisons/guide_to_ietf.html
index 4ff53dd6f5..0224443031 100644
--- a/ietf/templates/liaisons/guide_to_ietf.html
+++ b/ietf/templates/liaisons/guide_to_ietf.html
@@ -11,7 +11,7 @@
     <h1>
         Liaison statements to the IETF
         <br>
-        <small class="text-muted">Guidelines for completing the "To:" and "Cc:" fields</small>
+        <small class="text-body-secondary">Guidelines for completing the "To:" and "Cc:" fields</small>
     </h1>
     <p>
         The following table provides guidelines for completing the "To:" and "Cc:" fields of liaison statements that are sent to the IETF by other Standards Development Organizations (SDOs).
diff --git a/ietf/templates/liaisons/liaison_base.html b/ietf/templates/liaisons/liaison_base.html
index aacab6dea0..2181817582 100644
--- a/ietf/templates/liaisons/liaison_base.html
+++ b/ietf/templates/liaisons/liaison_base.html
@@ -11,6 +11,7 @@
 {% block content %}
     {% origin %}
     <h1>Liaison Statements</h1>
+    {% include "liaisons/liaison_desc.html" only %}
     {% if with_search %}
         <div class="ietf-box search-form-box">{% include "liaisons/search_form.html" %}</div>
     {% endif %}
diff --git a/ietf/templates/liaisons/liaison_desc.html b/ietf/templates/liaisons/liaison_desc.html
new file mode 100644
index 0000000000..8fb9fbf045
--- /dev/null
+++ b/ietf/templates/liaisons/liaison_desc.html
@@ -0,0 +1,6 @@
+<div class="alert alert-info">
+    Additional information about IETF liaison relationships is available on the
+    <a href="https://www.ietf.org/about/liaisons/" target="_blank">IETF webpage</a>
+    and the
+    <a href="https://www.iab.org/liaisons/" target="_blank">Internet Architecture Board liaison webpage</a>.
+</div>
\ No newline at end of file
diff --git a/ietf/templates/liaisons/liaison_mail.txt b/ietf/templates/liaisons/liaison_mail.txt
index c92c68ff76..18dfe610fd 100644
--- a/ietf/templates/liaisons/liaison_mail.txt
+++ b/ietf/templates/liaisons/liaison_mail.txt
@@ -1,13 +1,20 @@
-{% load ietf_filters %}{% autoescape off %}Title: {{ liaison.title|clean_whitespace }}
+{% load ietf_filters group_filters %}{% autoescape off %}Title: {{ liaison.title|clean_whitespace }}
 Submission Date: {{ liaison.submitted|date:"Y-m-d" }}
 URL of the IETF Web page: {{ liaison.get_absolute_url }}
+
+To: {% for g in liaison.to_groups.all %}{{g|name_with_conditional_acronym}}{% if not forloop.last %}, {% endif %}{% endfor %}
+From: {% for g in liaison.from_groups.all %}{{g|name_with_conditional_acronym}}{% if not forloop.last %}, {% endif %}{% endfor %}
+Purpose: {{ liaison.purpose.name }}
 {% if liaison.deadline %}Please reply by {{ liaison.deadline }}{% endif %}
-From: {% if liaison.from_contact %}{{ liaison.from_contact.formatted_email }}{% endif %}
+
+Email Addresses
+---------------
+From: {% if liaison.from_contact %}{{ liaison.from_contact }}{% endif %}
 To: {{ liaison.to_contacts }}
 Cc: {{ liaison.cc_contacts }}
 Response Contacts: {{ liaison.response_contacts }}
 Technical Contacts: {{ liaison.technical_contacts }}
-Purpose: {{ liaison.purpose.name }}
+
 {% for related in liaison.source_of_set.all %}
 Referenced liaison: {% if related.target.title %}{{ related.target.title }}{% else %}Liaison #{{ related.target.pk }}{% endif %} ({{ related.target.get_absolute_url }})
 {% endfor %}
diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html
index 03c9b36b75..e74b08f21b 100644
--- a/ietf/templates/liaisons/liaison_table.html
+++ b/ietf/templates/liaisons/liaison_table.html
@@ -24,9 +24,9 @@
                             <span title="{{ liaison.is_outgoing|yesno:'Outgoing,Incoming' }} liaison"
                                   class="badge rounded-pill
                                          {% if liaison.is_outgoing %}
-                                             bg-warning
+                                             text-bg-warning
                                          {% else %}
-                                             bg-info
+                                             text-bg-info
                                          {% endif %}">Action needed</span>
                         {% endif %}
                     </td>
diff --git a/ietf/templates/liaisons/list_other_sdo.html b/ietf/templates/liaisons/list_other_sdo.html
new file mode 100644
index 0000000000..e6a567ae50
--- /dev/null
+++ b/ietf/templates/liaisons/list_other_sdo.html
@@ -0,0 +1,41 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load origin static person_filters %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static 'ietf/css/list.css' %}">
+{% endblock %}
+{% block title %}
+   Other SDO groups
+{% endblock %}
+{% block content %}
+  {% origin %}
+  {% regroup sdos by state.name as sdos_by_state %}
+  {% for sdos_in_state in sdos_by_state %}
+    <h1>{{sdos_in_state.grouper|capfirst}} SDO groups</h1>
+      <table class="table tablesorter table-borderless table-striped table-sm mt-3">
+        <thead>
+          <tr>
+            <th scope="col" data-sort="acronym">Acronym</th>
+            <th scope="col" data-sort="name">Name</th>
+            <th scope="col" data-sort="managers">Liaison Managers</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for group in sdos_in_state.list%}
+          <tr>
+            <td><a href="{% url 'ietf.group.views.group_about' acronym=group.acronym %}">{{ group.acronym }}</a></td>
+            <td>{{ group.name }}</td>
+            <td>
+              {% for person in group.liaison_managers %}
+                {% person_link person %}{% if not forloop.last %}, {% endif %}
+              {% endfor %}
+            </td>
+          </tr>
+          {% endfor %}
+        </tbody>
+    </table>
+  {% endfor %}
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/logo.html b/ietf/templates/logo.html
new file mode 100644
index 0000000000..0de2eaeaea
--- /dev/null
+++ b/ietf/templates/logo.html
@@ -0,0 +1,35 @@
+{% load origin %}
+{% load static %}
+{% origin %}
+
+<img alt="{{ org|upper }} Logo"
+     class="d-lm-none{% if classes %} {{ classes }}{% endif %}"
+     {% if title %}title="{{ title }}"{% endif %}
+     {% if org == "iab" %}
+         src="{% static 'ietf/images/iab-logo-white.svg' %}"
+     {% elif org == "ietf" %}
+        {% if nor %}
+             src="{% static 'ietf/images/ietf-logo-nor-white.svg' %}"
+        {% else %}
+             src="{% static 'ietf/images/ietf-logo-white.svg' %}"
+        {% endif %}
+     {% elif org == "irtf" %}
+        src="{% static 'ietf/images/irtf-logo-white.svg' %}"
+     {% endif %}
+     >
+
+<img alt="{{ org|upper }} Logo"
+     class="d-dm-none{% if classes %} {{ classes }}{% endif %}"
+     {% if title %}title="{{ title }}"{% endif %}
+     {% if org == "iab" %}
+         src="{% static 'ietf/images/iab-logo.svg' %}"
+     {% elif org == "ietf" %}
+        {% if nor %}
+             src="{% static 'ietf/images/ietf-logo-nor.svg' %}"
+        {% else %}
+             src="{% static 'ietf/images/ietf-logo.svg' %}"
+        {% endif %}
+     {% elif org == "irtf" %}
+         src="{% static 'ietf/images/irtf-logo.svg' %}"
+     {% endif %}
+     >
\ No newline at end of file
diff --git a/ietf/templates/mailinglists/.gitignore b/ietf/templates/mailinglists/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/templates/mailinglists/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/templates/mailinglists/nonwg.html b/ietf/templates/mailinglists/nonwg.html
index ae97323288..bee2a8829e 100644
--- a/ietf/templates/mailinglists/nonwg.html
+++ b/ietf/templates/mailinglists/nonwg.html
@@ -5,10 +5,16 @@
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-{% block title %}Non-Working Group email lists{% endblock %}
+{% block title %}Other (not WG) email lists{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Non-Working Group email lists</h1>
+    <h1>Other (not Working Group) email lists</h1>
+    <p>Guidelines for these lists, including how to request a
+    new one to be created, can be found on the
+    <a href="https://www.ietf.org/participate/lists/nonwglist-guidelines/">
+	 Non–Working Group email list guidelines
+    </a> webpage.
+    </p>
     {% cache 900 nonwglisttable %}
     <table class="table table-sm table-striped tablesorter">
         <thead>
diff --git a/ietf/templates/meeting/.gitignore b/ietf/templates/meeting/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/templates/meeting/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/templates/meeting/activity_report.html b/ietf/templates/meeting/activity_report.html
new file mode 100644
index 0000000000..dbfc717dab
--- /dev/null
+++ b/ietf/templates/meeting/activity_report.html
@@ -0,0 +1,60 @@
+    {% load ams_filters ietf_filters %}
+    <ul class="progress-section">
+        <li>{{ actions_count }} IESG Protocol and Document Actions this period</li>
+        <li>{{ last_calls_count }} IESG Last Calls issued to the IETF this period</li>
+        <li>
+            {{ new_drafts_count|stringformat:"3s" }}    New I-Ds   ({{ new_drafts_updated_count }} of which were updated, some ({{ new_drafts_updated_more_count }}) more than once)
+        </li>
+        <li>{{ updated_drafts_count|stringformat:"3s" }}    I-Ds were updated   (Some more than once)</li>
+        {% if is_meeting_report %}
+            <li>
+                <h3 class="mt-3">In the final 4 weeks before meeting</h3>
+            </li>
+            <li>
+                {{ ffw_new_count|stringformat:"3s" }}    New I-Ds were received - {{ ffw_new_percent }} of total newbies since last meeting
+            </li>
+            <li>
+                {{ ffw_update_count|stringformat:"3s" }}    I-Ds were updated - {{ ffw_update_percent }} of total updated since last meeting
+            </li>
+        {% endif %}
+    </ul>
+    <h3 class="mt-3">{{ new_groups.count }} New Working Group(s) formed this period</h3>
+    <ul class="progress-section">
+        {% for group in new_groups %}<li>{{ group.name }} ({{ group.acronym }})</li>{% endfor %}
+    </ul>
+    <h3 class="mt-3">{{ concluded_groups.count }} Working Group(s) concluded this period</h3>
+    <ul class="progress-section">
+        {% for group in concluded_groups %}<li>{{ group.name }} ({{ group.acronym }})</li>{% endfor %}
+    </ul>
+    <h3 class="mt-3">{{ rfcs.count }} RFCs published this period</h3>
+    <p>
+        {{ counts.std }} Standards Track; {{ counts.bcp }} BCP; {{ counts.exp }} Experimental; {{ counts.inf }} Informational
+    </p>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="rfc">RFC</th>
+                <th scope="col" data-sort="status">Status</th>
+                <th scope="col" data-sort="group">Group</th>
+                <th scope="col" data-sort="date">Date</th>
+                <th scope="col" data-sort="title">Title</th>
+            </tr>
+        </thead>
+        {% if rfcs|length > 0 %}
+            <tbody>
+                {% for rfc in rfcs %}
+                    <tr>
+                        <td class="text-nowrap">
+                            <a href="{{ rfc.doc.get_absolute_url }}">{{ rfc.doc.name|prettystdname }}</a>
+                        </td>
+                        <td class="text-nowrap">{{ rfc.doc.std_level.name }}</td>
+                        <td>
+                            <a href="{{ rfc.doc.group.about_url }}">{{ rfc.doc.group.acronym }}</a>
+                        </td>
+                        <td>{{ rfc.time|date:"F Y" }}</td>
+                        <td>{{ rfc.doc.title }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
+    </table>
diff --git a/ietf/templates/meeting/add_session_drafts.html b/ietf/templates/meeting/add_session_drafts.html
index 1efcc5963e..0dd0635d11 100644
--- a/ietf/templates/meeting/add_session_drafts.html
+++ b/ietf/templates/meeting/add_session_drafts.html
@@ -1,15 +1,15 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin static django_bootstrap5 %}
-{% block title %}Add drafts to {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
+{% block title %}Add I-Ds to {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
 {% block pagehead %}{{ form.media.css }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
-        Add drafts to  {{ session.meeting }}
+        Add Internet-Drafts to  {{ session.meeting }}
         {% if session_number %}: Session {{ session_number }}{% endif %}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
@@ -20,9 +20,9 @@ <h1>
         </div>
     {% endif %}
     <div class="alert alert-info my-3">
-        This form will link additional drafts to this session with a revision of "Current at time of presentation". For more fine grained control of versions, or to remove a draft from a session, adjust the sessions associated with a draft from the draft's main page.
+        This form will link additional Internet-Drafts to this session with a revision of "Current at time of presentation". For more fine grained control of versions, or to remove an Internet-Draft from a session, adjust the sessions associated with an Internet-Draft from the Internet-Draft's main page.
     </div>
-    <h2 class="mt-5">Drafts already linked to this sesssion</h2>
+    <h2 class="mt-5">Internet-Drafts already linked to this session</h2>
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
@@ -47,7 +47,7 @@ <h2 class="mt-5">Drafts already linked to this sesssion</h2>
             </tbody>
         {% endif %}
     </table>
-    <h2 class="mt-5">Additional drafts to link to this session</h2>
+    <h2 class="mt-5">Additional Internet-Drafts to link to this session</h2>
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
diff --git a/ietf/templates/meeting/add_session_recordings.html b/ietf/templates/meeting/add_session_recordings.html
new file mode 100644
index 0000000000..4f21e8f4d0
--- /dev/null
+++ b/ietf/templates/meeting/add_session_recordings.html
@@ -0,0 +1,78 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin static django_bootstrap5 %}
+{% block title %}Add I-Ds to {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
+{% block pagehead %}{{ form.media.css }}{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Add Recordings to {{ session.meeting }}
+        {% if session_number %}: Session {{ session_number }}{% endif %}
+        <br>
+        <small class="text-body-secondary">{{ session.group.acronym }}
+            {% if session.name %}: {{ session.name }}{% endif %}
+        </small>
+    </h1>
+    {% if session.is_material_submission_cutoff %}
+        <div class="alert alert-warning my-3">
+            The deadline for submission corrections has passed. This may affect published proceedings.
+        </div>
+    {% endif %}
+    {% if already_linked|length > 0 %}
+        <h2 class="mt-5">Recordings already linked to this session</h2>
+        <form method="post" id="delete_recordings_form">
+            {% csrf_token %}
+            <table class="table table-sm table-striped">
+                <thead>
+                <tr>
+                    <th scope="col">Title</th>
+                    <th scope="col">URL</th>
+                    <th scope="col">Delete</th>
+                </tr>
+                </thead>
+                <tbody>
+                {% for sp in already_linked %}{% with recording_doc=sp.document %}
+                    <tr>
+                        <td>{{ recording_doc.title }}</td>
+                        <td><a href="{{ recording_doc.external_url }}">{{ recording_doc.external_url }}</a></td>
+                        <td>
+                            <button type="submit"
+                                    aria-label="Delete {{ recording_doc.title }}"
+                                    class="btn btn-danger"
+                                    name="delete"
+                                    value="{{ sp.pk }}">
+                                Delete
+                            </button>
+                        </td>
+                    </tr>
+                {% endwith %}{% endfor %}
+                </tbody>
+            </table>
+        </form>
+    {% endif %}
+    <dialog id="delete_confirm_dialog">
+        <p>Really delete the link to <a href="#" id="delete_confirm_link">(default)</a>?</p>
+        <form method="post" class="d-flex justify-content-between">
+            {% csrf_token %}
+            <button class="btn btn-secondary" type="button" id="delete_confirm_cancel">Cancel</button>
+            <button class="btn btn-danger" type="submit" name="delete" id="delete_confirm_submit">Delete</button>
+        </form>
+    </dialog>
+    <h2 class="mt-5">Add a recording to this session</h2>
+    <form method="post">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button class="btn btn-{% if session.is_material_submission_cutoff %}warning{% else %}primary{% endif %}"
+                type="submit">
+            Add recording
+        </button>
+        <a class="btn btn-secondary float-end"
+           href="{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}">
+            Back
+        </a>
+    </form>
+{% endblock %}
+{% block js %}
+    {{ form.media.js }}
+    <script src="{% static 'ietf/js/add_session_recordings.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 65889d7beb..089141bde8 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -6,7 +6,6 @@
 {% load textfilters %}
 {% load htmlfilters agenda_custom_tags %}
 {% load django_vite %}
-
 {% block title %}
     IETF {{ meetingData.meetingNumber }} Meeting Agenda
 {% endblock %}
@@ -17,8 +16,12 @@
     {% vite_asset 'client/main.js' %}
 {% endblock %}
 {% block morecss %}
-body {
-    font-family: 'Montserrat', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+
+/* Avoid hiding the page footer when on mobile with the footer toolbar overlay */
+@media screen and (max-width: 992px) {
+    body {
+        padding-bottom: 50px;
+    }
 }
 
 @keyframes initspinner {
@@ -36,6 +39,10 @@
     backdrop-filter: blur(10px);
 }
 
+.theme-dark #app-loading {
+    background-color: rgba(0,0,0,.75);
+}
+
 #app-loading:before {
     content: '';
     box-sizing: border-box;
@@ -53,6 +60,10 @@
     z-index: 2000000000;
 }
 
+.theme-dark #app-loading:before {
+    border-top-color: #FFF;
+}
+
 #app-loading:after {
     content: 'Loading meeting {{ meetingData.meetingNumber }}...';
     position: absolute;
@@ -65,9 +76,32 @@
     color: #999;
     z-index: 2000000000;
 }
+
+.theme-dark #app-loading:after {
+    color: #FFF;
+}
+
+#app-loading-footer {
+    position: absolute;
+    text-align: center;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 1000000000;
+}
+
+.theme-dark #app-loading-footer .btn-light {
+    background-color: rgba(255,255,255,.1) !important;
+    border-color: rgba(255,255,255,.05) !important;
+    color: #FFF !important;
+}
 {% endblock %}
 {% block content %}
     {% origin %}
     <div id="app"></div>
-    <div id="app-loading"></div>
+    <div id="app-loading">
+        <div id="app-loading-footer">
+            <a class="btn btn-light text-body-secondary mb-3" href="/meeting/{{ meetingData.meetingNumber }}/agenda.txt"><small>Switch to text-only version &raquo;</small></a>
+        </div>
+    </div>
 {% endblock %}
diff --git a/ietf/templates/meeting/agenda.ics b/ietf/templates/meeting/agenda.ics
deleted file mode 100644
index 0c9e847624..0000000000
--- a/ietf/templates/meeting/agenda.ics
+++ /dev/null
@@ -1,28 +0,0 @@
-{% load humanize %}{% autoescape off %}{% load ietf_filters textfilters %}{% load cache %}{% cache 1800 ietf_meeting_agenda_ics schedule.meeting.number request.path request.GET %}BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-PRODID:-//IETF//datatracker.ietf.org ical agenda//EN
-{{schedule.meeting.vtimezone}}{% for item in assignments %}{% if item.session.historic_group %}BEGIN:VEVENT
-UID:ietf-{{schedule.meeting.number}}-{{item.timeslot.pk}}-{{item.session.group.acronym}}
-SUMMARY:{% if item.session.name %}{{item.session.name|ics_esc}}{% else %}{% if not item.session.historic_group %}{{item.timeslot.name|ics_esc}}{% else %}{{item.session.historic_group.acronym|lower}} - {{item.session.historic_group.name}}{% endif%}{%endif%}{% if item.session.agenda_note %} ({{item.session.agenda_note}}){% endif %}
-{% if item.timeslot.show_location %}LOCATION:{{item.timeslot.get_location}}
-{% endif %}STATUS:{{item.session.ical_status}}
-CLASS:PUBLIC
-DTSTART{% if schedule.meeting.time_zone %};TZID={{schedule.meeting.time_zone|ics_esc}}{%endif%}:{{ item.timeslot.time|date:"Ymd" }}T{{item.timeslot.time|date:"Hi"}}00
-DTEND{% if schedule.meeting.time_zone %};TZID={{schedule.meeting.time_zone|ics_esc}}{%endif%}:{{ item.timeslot.end_time|date:"Ymd" }}T{{item.timeslot.end_time|date:"Hi"}}00
-DTSTAMP:{{ item.timeslot.modified|date:"Ymd" }}T{{ item.timeslot.modified|date:"His" }}Z{% if item.session.agenda %}
-URL:{{item.session.agenda.get_versionless_href}}{% endif %}
-DESCRIPTION:{{item.timeslot.name|ics_esc}}\n{% if item.session.agenda_note %}
- Note: {{item.session.agenda_note|ics_esc}}\n{% endif %}{% if item.timeslot.location.webex_url %}
- \n
- Webex: {{ item.timeslot.location.webex_url }}\n{% endif %}{% if item.timeslot.location.video_stream_url %}
- \n
- Meetecho: {{ item.timeslot.location.video_stream_url|format:item.session }}\n{% endif %}{% if item.session.agenda %}{% with agenda=item.session.agenda %}
- \n
- {{agenda.type}} {{agenda.get_versionless_href}}\n{% endwith %}{% endif %}
- \n
- Session materials: {% absurl 'ietf.meeting.views.session_details' num=schedule.meeting.number acronym=item.session.group.acronym %}\n{% if schedule.meeting.get_number is not None %}
- \n{# link agenda for ietf meetings #}
- See in schedule: {% absurl 'agenda' num=schedule.meeting.number %}#row-{{ item.slug }}\n{% endif %}
-END:VEVENT
-{% endif %}{% endfor %}END:VCALENDAR{% endcache %}{% endautoescape %}
diff --git a/ietf/templates/meeting/agenda.txt b/ietf/templates/meeting/agenda.txt
index 489ebbe6aa..7a49dde0c8 100644
--- a/ietf/templates/meeting/agenda.txt
+++ b/ietf/templates/meeting/agenda.txt
@@ -7,25 +7,28 @@
 {% filter center:72 %}{{ schedule.meeting.agenda_info_note|striptags|wordwrap:72|safe }}{% endfilter %}
 {% endif %}
 {% filter center:72 %}{{ schedule.meeting.date|date:"F j" }}-{% if schedule.meeting.date.month != schedule.meeting.end_date.month %}{{ schedule.meeting.end_date|date:"F " }}{% endif %}{{ schedule.meeting.end_date|date:"j, Y" }}{% endfilter %}
+{% if updated %}
 {% filter center:72 %}Updated {{ updated|date:"Y-m-d H:i:s T" }}{% endfilter %}
+{% endif %}
 
 {% filter center:72 %}IETF agendas are subject to change, up to and during the meeting.{% endfilter %}
+{% filter center:72 %}Times are shown in {% if display_timezone.lower == "utc" %}UTC{% else %}the {{ display_timezone }} time zone{% endif %}.{% endfilter %}
 {% for item in filtered_assignments %}{% ifchanged  %}
 
 
 {{ item.timeslot.time|date:"l"|upper }}, {{ item.timeslot.time|date:"F j, Y" }}
 {% endifchanged %}{%       if item.slot_type.slug == "reg" %}
-{{ item.timeslot.time_desc  }}  {{ item.timeslot.name  }}{% if schedule.meeting.reg_area %} - {{ schedule.meeting.reg_area }}{% endif %}{% endif %}{%          if item.slot_type.slug == "plenary" %}
-{{ item.timeslot.time_desc }}  {{ item.session.name }} - {{ item.timeslot.location.name }}
+{{ item.timeslot.time|date:"Hi"  }}-{{ item.timeslot.end_time|date:"Hi" }}  {{ item.timeslot.name  }}{% if schedule.meeting.reg_area %} - {{ schedule.meeting.reg_area }}{% endif %}{% endif %}{%          if item.slot_type.slug == "plenary" %}
+{{ item.timeslot.time|date:"Hi" }}-{{ item.timeslot.end_time|date:"Hi" }}  {{ item.session.name }} - {{ item.timeslot.location.name }}
 
    {{ item.session.agenda_text.strip|indent:"3" }}
-{% endif %}{%          if item.slot_type.slug == 'regular' %}{% if item.session.historic_group  %}{% ifchanged %}
+{% endif %}{%          if item.slot_type.slug == 'regular' %}{% ifchanged %}
 
-{{ item.timeslot.time_desc }}  {{ item.timeslot.name }}
-{% endifchanged %}{{ item.timeslot.location.name|ljust:14 }}  	{{ item.session.historic_group.historic_parent.acronym|upper|ljust:4 }}	{{ item.session.historic_group.acronym|ljust:10 }}  	{{ item.session.historic_group.name }} {% if item.session.historic_group.state_id == "bof" %}BOF{% elif item.session.historic_group.type_id == "wg" %}WG{% endif %}{% if item.session.agenda_note %} - {{ item.session.agenda_note }}{% endif %}{% if item.session.current_status == 'canceled' %}  *** CANCELLED ***{% elif item.session.current_status == 'resched' %} *** RESCHEDULED{% if item.session.rescheduled_to %} TO {{ item.session.rescheduled_to.time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.end_time|date:"G:i" }}{% endif %} ***{% endif %}
-{% endif %}{% endif %}{% if item.slot_type.slug == "break" %}
-{{ item.timeslot.time_desc }}  {{ item.timeslot.name }}{% if schedule.meeting.break_area and item.timeslot.show_location %} - {{ schedule.meeting.break_area }}{% endif %}{% endif %}{%            if item.slot_type.slug == "other" %}
-{{ item.timeslot.time_desc }}  {{ item.timeslot.name }} - {{ item.timeslot.location.name }}{% endif %}{% endfor %}
+{{ item.timeslot.time|date:"Hi" }}-{{ item.timeslot.end_time|date:"Hi" }}  {{ item.timeslot.name }}
+{% endifchanged %}{{ item.timeslot.location.name|truncatechars:18|ljust:18 }}   {% if item.session.group_parent_at_the_time %}{{ item.session.group_parent_at_the_time.acronym|upper|truncatechars:6|ljust:6 }}{% else %}      {% endif %} {{ item.session.group_at_the_time.acronym|truncatechars:12|ljust:12 }}   {{ item.session.group_at_the_time.name }} {% if item.session.group_at_the_time.state_id == "bof" %}BOF{% elif item.session.group_at_the_time.type_id == "wg" %}WG{% endif %}{% if item.session.agenda_note %} - {{ item.session.agenda_note }}{% endif %}{% if item.session.current_status == 'canceled' %}  *** CANCELLED ***{% elif item.session.current_status == 'resched' %}  *** RESCHEDULED{% if item.session.rescheduled_to %} TO {{ item.session.rescheduled_to.time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.end_time|date:"G:i" }}{% endif %} ***{% endif %}
+{% endif %}{% if item.slot_type.slug == "break" %}
+{{ item.timeslot.time|date:"Hi" }}-{{ item.timeslot.end_time|date:"Hi" }}  {{ item.timeslot.name }}{% if schedule.meeting.break_area and item.timeslot.show_location %} - {{ schedule.meeting.break_area }}{% endif %}{% endif %}{%            if item.slot_type.slug == "other" %}
+{{ item.timeslot.time|date:"Hi" }}-{{ item.timeslot.end_time|date:"Hi" }}  {{ item.timeslot.name }} - {{ item.timeslot.location.name }}{% endif %}{% endfor %}
 
 ====================================================================
 {% endautoescape %}
diff --git a/ietf/templates/meeting/approve_proposed_slides.html b/ietf/templates/meeting/approve_proposed_slides.html
index 584e280815..204473f455 100644
--- a/ietf/templates/meeting/approve_proposed_slides.html
+++ b/ietf/templates/meeting/approve_proposed_slides.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static django_bootstrap5 %}
+{% load origin static django_bootstrap5 tz %}
 {% block title %}
     Approve Slides Proposed for {{ submission.session.meeting }} : {{ submission.session.group.acronym }}
 {% endblock %}
@@ -9,13 +9,13 @@
     <h1>
         Approve slides proposed for {{ submission.session.meeting }}
         <br>
-        <small class="text-muted">{{ submission.session.group.acronym }}
+        <small class="text-body-secondary">{{ submission.session.group.acronym }}
             {% if session.name %}: {{ submission.session.name }}{% endif %}
         </small>
     </h1>
     {% if session_number %}
         <h2>
-            Session {{ session_number }} : {{ submission.session.official_timeslotassignment.timeslot.time|date:"D M-d-Y Hi" }}
+            Session {{ session_number }} : {{ submission.session.official_timeslotassignment.timeslot.time|timezone:submission.session.meeting.time_zone|date:"D M-d-Y Hi" }}
         </h2>
     {% endif %}
     <p class="alert alert-info my-3">
@@ -34,6 +34,6 @@ <h2>
         <button type="submit"
                 class="btn btn-warning"
                 name="disapprove"
-                value="disapprove">Disapprove and Delete</button>
+                value="disapprove">Decline and Delete</button>
     </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/meeting/attendance.html b/ietf/templates/meeting/attendance.html
new file mode 100644
index 0000000000..5a9aa2dce2
--- /dev/null
+++ b/ietf/templates/meeting/attendance.html
@@ -0,0 +1,44 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2024, All Rights Reserved #}
+{% load origin %}
+{% block title %}Bluesheet for {{session}}{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Attendance for {{session}}
+    </h1>
+    <div class="alert alert-info my-3">
+        This list will be used to generate the official bluesheet for this session.
+        {% if can_add %}
+            <br>If you attended this session, you can use the "I was there" button at the bottom to add yourself.
+        {% endif %}
+        {% if was_there %}
+            <br>If the affiliation listed here needs to be updated, request the change using support@ietf.org. Note which sessions you are wanting to change in your request.
+        {% endif %}
+    </div>
+    <h2>
+        {{ data|length }} attendees.
+    </h2>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="num">Name</th>
+                <th scope="col" data-sort="document">Affiliation</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for item in data %}
+                <tr>
+                    <td>{{ item.name }}</td>
+                    <td>{{ item.affiliation }}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+    {% if can_add %}
+        <form method="post">
+            {% csrf_token %}
+            <button type="submit" class="btn btn-primary">I was there</button>
+        </form>
+    {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/bluesheet.txt b/ietf/templates/meeting/bluesheet.txt
index dd3bf36ac7..5b3960f3aa 100644
--- a/ietf/templates/meeting/bluesheet.txt
+++ b/ietf/templates/meeting/bluesheet.txt
@@ -1,7 +1,8 @@
-Bluesheet for {{session}}
+{% autoescape off %}Bluesheet for {{session}}
 ========================================================================
 
 {{ data|length }} attendees.
 
 {% for item in data %}
 {{ item.name }}	{{ item.affiliation }}{% endfor %}
+{% endautoescape %}
diff --git a/ietf/templates/meeting/cancel_session.html b/ietf/templates/meeting/cancel_session.html
new file mode 100644
index 0000000000..9bf80e0c49
--- /dev/null
+++ b/ietf/templates/meeting/cancel_session.html
@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2021-2022, All Rights Reserved #}
+{% load origin %}
+{% load django_bootstrap5 %}
+{% block pagehead %}{{ form.media.css }}{% endblock %}
+{% block title %} Cancel session "{{ session }}"{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        Cancel session
+        <br>
+        <small class="text-body-secondary">{{ session }}</small>
+    </h1>
+    <form class="session-details-form my-3" method="post">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button type="submit" class="btn btn-primary">Save</button>
+        <a class="btn btn-secondary float-end"
+           href="{{ editor_url }}">
+            Back
+        </a>
+    </form>
+{% endblock %}
+{% block js %}{{ form.media.js }}{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/create_timeslot.html b/ietf/templates/meeting/create_timeslot.html
index 8a47b9c969..62847c1a08 100755
--- a/ietf/templates/meeting/create_timeslot.html
+++ b/ietf/templates/meeting/create_timeslot.html
@@ -12,7 +12,7 @@ <h1>Create timeslot for {{ meeting }}</h1>
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Save</button>
         <a class="btn btn-secondary float-end"
-           href="{% url 'ietf.meeting.views.edit_timeslots' num=meeting.number %}">Back</a>
+           href="{% url 'ietf.meeting.views.edit_timeslots' num=meeting.number %}{% if 'sched' in request.GET %}?sched={{ request.GET.sched }}{% endif %}">Back</a>
     </form>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/meeting/delete_schedule.html b/ietf/templates/meeting/delete_schedule.html
index 334479ba79..f5012d0f6b 100644
--- a/ietf/templates/meeting/delete_schedule.html
+++ b/ietf/templates/meeting/delete_schedule.html
@@ -12,7 +12,7 @@
     <h1>
         Delete IETF {{ meeting.number }} Schedule
         <br>
-        <small class="text-muted">{{ schedule.owner }}/{{ schedule.name }}</small>
+        <small class="text-body-secondary">{{ schedule.owner }}/{{ schedule.name }}</small>
     </h1>
     <form method="post" class="my-3" enctype="multipart/form-data">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/diff_schedules.html b/ietf/templates/meeting/diff_schedules.html
index c5b117d2d7..67abbe5345 100644
--- a/ietf/templates/meeting/diff_schedules.html
+++ b/ietf/templates/meeting/diff_schedules.html
@@ -2,14 +2,14 @@
 {# Copyright The IETF Trust 2020, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters %}
-{% load django_bootstrap5 %}
+{% load django_bootstrap5 tz %}
 {% block title %}Differences between Meeting Agendas for IETF {{ meeting.number }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Differences between Meeting Agendas
         <br>
-        <small class="text-muted">IETF {{ meeting.number }}</small>
+        <small class="text-body-secondary">IETF {{ meeting.number }}</small>
     </h1>
     <form method="get" class="my-3">
         {% bootstrap_form form layout="horizontal" %}
@@ -26,7 +26,7 @@ <h2 class="mt-4">
                         <th scope="col"></th>
                     </tr>
                 </thead>
-                <tbody>
+                <tbody>{% timezone meeting.time_zone %}
                     {% for d in diffs %}
                         <tr>
                             <td>
@@ -40,7 +40,7 @@ <h2 class="mt-4">
                             </td>
                         </tr>
                     {% endfor %}
-                </tbody>
+                {% endtimezone %}</tbody>
             </table>
         {% else %}
             No differences in scheduled sessions found.
diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html
index 7005ad502d..a975c2e61a 100644
--- a/ietf/templates/meeting/edit_meeting_schedule.html
+++ b/ietf/templates/meeting/edit_meeting_schedule.html
@@ -35,27 +35,27 @@
             <h1>
                 Agenda name: {{ schedule.name }}
                 <br>
-                <small class="text-muted">Owner: {{ schedule.owner }}</small>
+                <small class="text-body-secondary">Owner: {{ schedule.owner }}</small>
             </h1>
             <div class="my-3">
                 {% if can_edit_properties %}
                     <a class="btn btn-primary"
-                       href="{% url "ietf.meeting.views.edit_schedule_properties" schedule.meeting.number schedule.owner_email schedule.name %}">
+                       href="{% url 'ietf.meeting.views.edit_schedule_properties' schedule.meeting.number schedule.owner_email schedule.name %}">
                         Edit properties
                     </a>
                 {% endif %}
                 {% if user|has_role:"Secretariat" %}
                     <a class="btn btn-primary"
-                       href="{% url "ietf.meeting.views.edit_timeslots" num=meeting.number %}">
+                       href="{% url 'ietf.meeting.views.edit_timeslots' num=meeting.number %}?sched={{ schedule.pk }}">
                         Edit timeslots
                     </a>
                 {% endif %}
                 <a class="btn btn-primary"
-                   href="{% url "ietf.meeting.views.new_meeting_schedule" num=meeting.number owner=schedule.owner_email name=schedule.name %}">
+                   href="{% url 'ietf.meeting.views.new_meeting_schedule' num=meeting.number owner=schedule.owner_email name=schedule.name %}">
                     Copy agenda
                 </a>
                 <a class="btn btn-primary"
-                   href="{% url "ietf.meeting.views.list_schedules" num=meeting.number %}">
+                   href="{% url 'ietf.meeting.views.list_schedules' num=meeting.number %}">
                   Other agendas
                 </a>
             </div>
@@ -64,7 +64,7 @@ <h1>
                     You can't edit this schedule.
                     {% if schedule.is_official_record %}This is the official schedule for a meeting in the past.{% endif %}
                     Make a
-                    <a href="{% url "ietf.meeting.views.new_meeting_schedule" num=meeting.number owner=schedule.owner_email name=schedule.name %}">
+                    <a href="{% url 'ietf.meeting.views.new_meeting_schedule' num=meeting.number owner=schedule.owner_email name=schedule.name %}">
                         new agenda from this</a>.
                 </div>
             {% endif %}
@@ -74,7 +74,8 @@ <h1>
                   No timeslots exist for this meeting yet.
                 </p>
                 <p>
-                  <a class="btn btn-primary" href="{% url "ietf.meeting.views.edit_timeslots" num=meeting.number %}">
+                  <a class="btn btn-primary"
+                     href="{% url 'ietf.meeting.views.edit_timeslots' num=meeting.number %}?sched={{ schedule.pk }}">
                     Edit timeslots
                   </a>
                 </p>
@@ -222,6 +223,11 @@ <h1>
                                     {{ p.acronym }}
                                 </label>
                             {% endfor %}
+                            <button type="button"
+                                    class="btn btn-outline-primary btn-sm session-parent-toggle-all">
+                                Toggle All
+                            </button>
+                                    
                         </div>
                         <div class="my-3">
                         {% if session_purposes|length > 1 %}
diff --git a/ietf/templates/meeting/edit_meeting_schedule_session.html b/ietf/templates/meeting/edit_meeting_schedule_session.html
index a9b7c1c4ff..4a2bbfdde7 100644
--- a/ietf/templates/meeting/edit_meeting_schedule_session.html
+++ b/ietf/templates/meeting/edit_meeting_schedule_session.html
@@ -102,9 +102,15 @@
                </div>
             </div>
         {% endfor %}
-        <a class="btn btn-primary btn-sm mt-2"
-           href="{% url 'ietf.meeting.views.edit_session' session_id=session.pk %}">
-            Edit session
-        </a>
+        {% if secretariat %}
+            <a class="btn btn-primary btn-sm mt-2"
+               href="{% url 'ietf.meeting.views.edit_session' session_id=session.pk %}?sched={{ schedule.pk }}">
+                Edit session
+            </a>
+            <a class="btn btn-danger btn-sm mt-2"
+               href="{% url 'ietf.meeting.views.cancel_session' session_id=session.pk %}?sched={{ schedule.pk }}">
+                Cancel session
+            </a>
+        {% endif %}
     </div>
 </div>
\ No newline at end of file
diff --git a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html
index 2148450355..5f08d3d4b6 100644
--- a/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html
+++ b/ietf/templates/meeting/edit_meeting_timeslots_and_misc_sessions.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load django_bootstrap5 %}
 {% block title %}{{ schedule.name }}: IETF {{ meeting.number }} meeting agenda{% endblock %}
@@ -12,7 +12,7 @@
     <h1>
         IETF {{ meeting.number }} meeting agenda
         <br>
-        <small class="text-muted">{{ schedule.name }}</small>
+        <small class="text-body-secondary">{{ schedule.name }}</small>
     </h1>
     {% origin %}
     <div class="my-3 edit-meeting-timeslots-and-misc-sessions {% if not can_edit %}read-only{% endif %}"
@@ -36,7 +36,7 @@ <h1>
                              data-day="{{ day.day.isoformat }}">
                             <div class="room-label" title="{{ room.name }}">
                                 <strong>{{ room.name }}</strong>
-                                {% if room.capacity %}<span class="badge rounded-pill bg-secondary">{{ room.capacity }}</span>{% endif %}
+                                {% if room.capacity %}<span class="badge rounded-pill text-bg-secondary">{{ room.capacity }}</span>{% endif %}
                             </div>
                             <div class="timeline">
                                 <!-- [html-validate-disable-block no-inline-style -- FIXME: should style this better] -->
diff --git a/ietf/templates/meeting/edit_session.html b/ietf/templates/meeting/edit_session.html
index be385e2fa7..90139b8180 100644
--- a/ietf/templates/meeting/edit_session.html
+++ b/ietf/templates/meeting/edit_session.html
@@ -1,24 +1,22 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2021, All Rights Reserved #}
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
+{% load session_filters %}
 {% block pagehead %}{{ form.media.css }}{% endblock %}
-{% block title %}Edit session "{{ session }}"{% endblock %}
+{% block title %}Edit session "{{ session|describe_with_tz }}"{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         Edit session
         <br>
-        <small class="text-muted">{{ session }}</small>
+        <small class="text-body-secondary">{{ session|describe_with_tz }}</small>
     </h1>
     <form class="session-details-form my-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Save</button>
-        <a class="btn btn-secondary float-end"
-           href="{% url 'ietf.meeting.views.edit_meeting_schedule' num=session.meeting.number %}">
-            Back
-        </a>
+        <a class="btn btn-secondary float-end" href="{{ editor_url }}">Back</a>
     </form>
 {% endblock %}
 {% block js %}{{ form.media.js }}{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/edit_timeslot.html b/ietf/templates/meeting/edit_timeslot.html
index c969f171dc..c881cad994 100644
--- a/ietf/templates/meeting/edit_timeslot.html
+++ b/ietf/templates/meeting/edit_timeslot.html
@@ -9,7 +9,7 @@
     <h1>
         Edit {{ timeslot.meeting }} timeslot
         <br>
-        <small class="text-muted">{{ timeslot.name }}</small>
+        <small class="text-body-secondary">{{ timeslot.name }}</small>
     </h1>
     {% if sessions %}
         <div class="alert alert-warning my-3">
@@ -25,7 +25,7 @@ <h1>
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Save</button>
         <a class="btn btn-secondary float-end"
-           href="{% url 'ietf.meeting.views.edit_timeslots' num=timeslot.meeting.number %}">
+           href="{% url 'ietf.meeting.views.edit_timeslots' num=timeslot.meeting.number %}{% if "sched" in request.GET %}?sched={{ request.GET.sched }}{% endif %}">
             Back
         </a>
     </form>
diff --git a/ietf/templates/meeting/edit_timeslot_type.html b/ietf/templates/meeting/edit_timeslot_type.html
index d19cbaaf15..d21e189e51 100644
--- a/ietf/templates/meeting/edit_timeslot_type.html
+++ b/ietf/templates/meeting/edit_timeslot_type.html
@@ -8,7 +8,7 @@
     <h1>
         Edit timeslot type
         <br>
-        <small class="text-muted">{{ timeslot }}</small>
+        <small class="text-body-secondary">{{ timeslot }}</small>
     </h1>
     {% if sessions %}
         <div class="alert alert-warning my-3">
diff --git a/ietf/templates/meeting/finalize.html b/ietf/templates/meeting/finalize.html
index dec518293c..ba218a91ce 100644
--- a/ietf/templates/meeting/finalize.html
+++ b/ietf/templates/meeting/finalize.html
@@ -8,13 +8,13 @@
     <h1>
         Finalize Proceedings
         <br>
-        <small class="text-muted">IETF {{ meeting.number }}</small>
+        <small class="text-body-secondary">IETF {{ meeting.number }}</small>
     </h1>
     <p>
         This will make the proceedings for IETF {{ meeting.number }} final.
     </p>
     <p>
-        All drafts associated with sessions that are marked "current version" will have their version set to whatever the version was at the end of the meeting.
+        All Internet-Drafts associated with sessions that are marked "current version" will have their version set to whatever the version was at the end of the meeting.
     </p>
     {# This would be a good place to put any warnings about important things missing from the proceedings #}
     <form method="post" class="my-3">
diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html
index 8f3fd49a57..74ed8bafca 100644
--- a/ietf/templates/meeting/group_materials.html
+++ b/ietf/templates/meeting/group_materials.html
@@ -1,122 +1,98 @@
-{# Copyright The IETF Trust 2015-2019, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2024, All Rights Reserved #}
 {% load origin %}
 {% origin %}
 {% load ietf_filters proceedings_filters managed_groups %}
 {% load tz %}
 <tr>
     <td>
-        {% if session.name %}
-            <div id="{{ session.name|slugify }}">{{ session.name }}</div>
+        {% if entry.name %}
+            <div id="{{ entry.name|slugify }}">{{ entry.name }}</div>
         {% else %}
-            <div id="{{ session.group.acronym }}">
-                <a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{ session.group.acronym }}</a>
+            <div id="{{ entry.group.acronym }}">
+                <a href="{% url 'ietf.group.views.group_home' acronym=entry.group.acronym %}">{{ entry.group.acronym }}</a>
             </div>
-            {% if session.group.state.slug == "bof" %}
-                <span class="badge rounded-pill bg-success">{{ session.group.state.slug|upper }}</span>
+            {% if entry.group.state.slug == "bof" %}
+                <span class="badge rounded-pill text-bg-success">{{ entry.group.state.slug|upper }}</span>
             {% endif %}
         {% endif %}
     </td>
-    {% if session.all_meeting_sessions_cancelled %}
+    {% if entry.canceled %}
         <td colspan="{% if user|has_role:'Secretariat' or user_groups %}6{% else %}5{% endif %}">
-            <span class="badge rounded-pill bg-danger">Session cancelled</span>
+            <span class="badge rounded-pill text-bg-danger">Session cancelled</span>
         </td>
     {% else %}
         <td>
-            {% if session.all_meeting_agendas %}
-                {% for agenda in session.all_meeting_agendas %}
-                    {% if session.all_meeting_agendas|length == 1 %}
-                        {% if agenda.time > old %}
-                            <i class="small bi bi-bell"
-                                  title="Last Update: {{ agenda.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
-                        {% endif %}
-                        <a href="{{ session.all_meeting_agendas.0|meeting_href:session.meeting }}">Agenda</a>
-                        <br>
-                    {% else %}
-                        <a href="{{ agenda|meeting_href:session.meeting }}">
-                            Agenda {{ agenda.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}
-                        </a>
-                        <br>
-                    {% endif %}
-                {% endfor %}
-            {% else %}
-                {% if show_agenda == "True" %}<span class="badge rounded-pill bg-warning">No agenda</span>{% endif %}
-            {% endif %}
+            {% for agenda in entry.agendas %}
+                {% if entry.agendas|length == 1 and agenda.time > old %}
+                    <i class="small bi bi-bell"
+                       title="Last Update: {{ agenda.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
+                {% endif %}
+                <a href="{{ agenda.material|meeting_href:meeting }}">
+                    Agenda {% if agenda.time %}{{agenda.time|date:"D G:i"}}{% endif %}
+                </a>
+                <br>
+            {% empty %}
+                {% if show_agenda == "True" %}<span class="badge rounded-pill text-bg-warning">No agenda</span>{% endif %}
+            {% endfor %}
         </td>
         <td>
-            {% if session.all_meeting_minutes %}
-                {% if session.all_meeting_minutes|length == 1 %}
-                    <a href="{{ session.all_meeting_minutes.0|meeting_href:session.meeting }}">Minutes</a>
-                    <br>
-                {% else %}
-                    {% for minutes in session.all_meeting_minutes %}
-                        <a href="{{ minutes|meeting_href:session.meeting }}">
-                            Minutes {{ minutes.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}
+            {% for minutes in entry.minutes %}
+                <a href="{{ minutes.material|meeting_href:meeting }}">
+                    Minutes {% if minutes.time %}{{minutes.time|date:"D G:i"}}{% endif %}
+                </a>
+                <br>
+            {% empty %}
+                {% if show_agenda == "True" %}<span class="badge rounded-pill text-bg-warning">No minutes</span>{% endif %}
+            {% endfor %}
+            {% if entry.session.type_id == 'regular' and show_agenda == "True" %}
+                {% for attendance in entry.attendances %}
+                    {% with session=attendance.material %}
+                        <a href="{% url 'ietf.meeting.views.session_attendance' session_id=session.pk num=session.meeting.number %}">
+                            Attendance
+                            {% if attendance.time %}{{ attendance.time|date:"D G:i" }}{% endif %}
                         </a>
-                        <br>
-                    {% endfor %}
-                {% endif %}
-            {% else %}
-                {% if show_agenda == "True" %}<span class="badge rounded-pill bg-warning">No minutes</span>{% endif %}
-            {% endif %}
-            {% if session.type_id == 'regular' and show_agenda == "True" %}
-                {% if session.all_meeting_bluesheets %}
-                    {% if session.all_meeting_bluesheets|length == 1 %}
-                        <a href="{{ session.all_meeting_bluesheets.0|meeting_href:session.meeting }}">Bluesheets</a>
-                        <br>
-                    {% else %}
-                        {% for bluesheets in session.all_meeting_bluesheets %}
-                            <a href="{{ bluesheets|meeting_href:session.meeting }}">
-                                Bluesheets
-                                <br>
-                                <span class="small float-end">{{ bluesheets.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}</span>
-                            </a>
-                            <br>
-                        {% endfor %}
-                    {% endif %}
-                {% else %}
-                    <span class="badge rounded-pill bg-warning">No bluesheets</span>
-                {% endif %}
+                    {% endwith %}
+                    <br>
+                {% endfor %}
             {% endif %}
         </td>
         <td>
-            {% with session.all_meeting_slides as slides %}
-                {% for slide in slides %}
+                {% for slide in entry.slides %}
                     {% if slide.time > old %}
                         <i class="small bi bi-bell"
                               title="Last Update: {{ slide.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
                     {% endif %}
-                    <a href="{{ slide|meeting_href:session.meeting }}">{{ slide.title|clean_whitespace }}</a>
+                    <a href="{{ slide.material|meeting_href:meeting }}">{{ slide.material.title|clean_whitespace }}</a>
                     <br>
                 {% empty %}
-                    <span class="badge rounded-pill bg-warning">No slides</span>
+                    <span class="badge rounded-pill text-bg-warning">No slides</span>
                 {% endfor %}
-            {% endwith %}
         </td>
         <td>
-            {% with session.all_meeting_drafts as drafts %}
-                {% for draft in drafts %}
+                {% for draft in entry.drafts %}
                     {% if draft.time > old %}
                         <i class="small bi bi-bell"
                               title="Last Update: {{ draft.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
                     {% endif %}
-                    <a href="{{ draft.get_href }}">{{ draft.name }}</a>
+                    <a href="{% url "ietf.doc.views_doc.document_main" name=draft.material.name %}">
+                        {{ draft.material.name }}
+                    </a>
                     <br>
                 {% empty %}
-                    <span class="badge rounded-pill bg-warning">No drafts</span>
+                    <span class="badge rounded-pill text-bg-warning">No Internet-Drafts</span>
                 {% endfor %}
-            {% endwith %}
         </td>
         <td>
-            {% if session.last_update %}
-                {{ session.last_update|utc|date:"Y-m-d" }}
+            {% if entry.last_update %}
+                {{ entry.last_update|utc|date:"Y-m-d" }}
                 <br>
-                <small class="text-muted">{{ session.last_update|utc|date:"H:i:s" }}&nbsp;UTC</small>
+                <small class="text-body-secondary">{{ entry.last_update|utc|date:"H:i:s" }}&nbsp;UTC</small>
             {% endif %}
         </td>
         {% if user|has_role:"Secretariat" or user_groups %}
             <td>
-                {% if user|has_role:"Secretariat" or session.group in user_groups %}
-                    <div class="float-end">{% include "meeting/edit_materials_button.html" %}</div>
+                {% if user|has_role:"Secretariat" or entry.group in user_groups %}
+                    <div class="float-end">{% include "meeting/edit_materials_button.html" with session=entry.session only %}</div>
                 {% endif %}
             </td>
         {% endif %}
diff --git a/ietf/templates/meeting/group_proceedings.html b/ietf/templates/meeting/group_proceedings.html
index 99722fca4b..496fa92263 100644
--- a/ietf/templates/meeting/group_proceedings.html
+++ b/ietf/templates/meeting/group_proceedings.html
@@ -1,115 +1,120 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2024, All Rights Reserved #}
 {% load origin %}
 {% origin %}
 {% load ietf_filters %}
 {% load proceedings_filters %}
 <tr>
     <td>
-        {% if session.name %}
-            <div id="{{ session.name|slugify }}">{{ session.name }}</div>
-        {% else %}
-            <div id="{{ session.group.acronym }}">
-                <a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{ session.group.acronym }}</a>
+        {% if entry.name %}
+            <div id="{{ entry.name|slugify }}">{{ entry.name }}</div>
+        {% elif entry.group.acronym %}
+            <div id="{{ entry.group.acronym }}">
+                <a href="{% url 'ietf.group.views.group_home' acronym=entry.group.acronym %}">{{ entry.group.acronym }}</a>
             </div>
-            {% if session.group.state_id == "bof" %}<span class="badge rounded-pill bg-success">BOF</span>{% endif %}
+            {% if entry.group.state_id == "bof" %}<span class="badge rounded-pill text-bg-success">BOF</span>{% endif %}
+        {% else %}
+            <h1>{{ entry.group }}</h1>
         {% endif %}
     </td>
-    {% if session.all_meeting_sessions_cancelled %}
+    {% if entry.canceled %}
         <td colspan="4">
-            <span class="badge rounded-pill bg-danger">Session cancelled</span>
+            <span class="badge rounded-pill text-bg-danger">Session cancelled</span>
         </td>
     {% else %}
+        {# artifacts #}
         <td>
-            {% if session.all_meeting_agendas %}
-                {% if session.all_meeting_agendas|length == 1 %}
-                    <a href="{{ session.all_meeting_agendas.0|meeting_href:meeting }}">Agenda</a>
+            {% for agenda in entry.agendas %}
+                <a href="{{ agenda.material|meeting_href:meeting }}">
+                    Agenda
+                    {% if agenda.time %}{{agenda.time|date:"D G:i"}}{% endif %}
+                </a>
+                <br>
+            {% empty %}
+                {% if show_agenda and not meeting.proceedings_final %}
+                    <span class="badge rounded-pill text-bg-warning">No agenda</span>
                     <br>
-                {% else %}
-                    {% for agenda in session.all_meeting_agendas %}
-                        <a href="{{ agenda|meeting_href:meeting }}">
-                            Agenda {{ agenda.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}
-                        </a>
-                        <br>
-                    {% endfor %}
                 {% endif %}
-            {% else %}
-                {% if show_agenda == "True" and not meeting.proceedings_final %}
-                    <span class="badge rounded-pill bg-warning">No agenda</span>
+            {% endfor %}
+            {% for minutes in entry.minutes %}
+                <a href="{{ minutes.material|meeting_href:meeting }}">
+                    Minutes
+                    {% if minutes.time %}{{minutes.time|date:"D G:i"}}{% endif %}
+                </a>
+                <br>
+            {% empty %}
+                {% if show_agenda and not meeting.proceedings_final %}
+                    <span class="badge rounded-pill text-bg-warning">No minutes</span>
                     <br>
                 {% endif %}
-            {% endif %}
-            {% if session.all_meeting_minutes %}
-                {% if session.all_meeting_minutes|length == 1 %}
-                    <a href="{{ session.all_meeting_minutes.0|meeting_href:meeting }}">Minutes</a>
-                    <br>
-                {% else %}
-                    {% for minutes in session.all_meeting_minutes %}
-                        <a href="{{ minutes|meeting_href:meeting }}">
-                            Minutes {{ minutes.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}
+            {% endfor %}
+            {% if not meeting.proceedings_final %}
+                {% for attendance in entry.attendances %}
+                    {% with session=attendance.material %}
+                        <a href="{% url 'ietf.meeting.views.session_attendance' session_id=session.pk num=session.meeting.number %}">
+                            Attendance
+                            {% if attendance.time %}{{ attendance.time|date:"D G:i" }}{% endif %}
                         </a>
-                        <br>
-                    {% endfor %}
-                {% endif %}
-            {% else %}
-                {% if show_agenda == "True" and not meeting.proceedings_final %}
-                    <span class="badge rounded-pill bg-warning">No minutes</span>
-                    <br>
-                {% endif %}
-            {% endif %}
-            {% if session.all_meeting_bluesheets %}
-                {% if session.all_meeting_bluesheets|length == 1 %}
-                    <a href="{{ session.all_meeting_bluesheets.0|meeting_href:meeting }}">Bluesheets</a>
-                    <br>
-                {% else %}
-                    {% for bs in session.all_meeting_bluesheets %}
-                        <a href="{{ bs|meeting_href:meeting }}">
-                            Bluesheets {{ bs.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}
-                        </a>
-                        <br>
-                    {% endfor %}
-                {% endif %}
-            {% endif %}
-            {% with session.group|status_for_meeting:meeting as status %}
-                {% if status %}
-                    <a href="{% url 'ietf.group.views.group_about_status_meeting' acronym=session.group.acronym num=meeting.number %}">
-                        Status
-                    </a>
-                    <br>
-                {% endif %}
-            {% endwith %}
-        </td>
-        <td>
-            {% if session.all_meeting_sessions_for_group|length == 1 %}
-                {% for rec in session.all_meeting_recordings %}
-                    <a href="{{ rec|meeting_href:meeting|default:"#" }}">{{ rec|hack_recording_title:False }}</a>
+                    {% endwith %}
                     <br>
                 {% endfor %}
             {% else %}
-                {% for rec in session.all_meeting_recordings %}
-                    <a href="{{ rec|meeting_href:meeting|default:"#" }}">{{ rec|hack_recording_title:True }}</a>
+                {% for bs in entry.bluesheets %}
+                    <a href="{{ bs.material|meeting_href:meeting }}">
+                        Bluesheets
+                        {% if bs.time %}{{ bs.time|date:"D G:i" }}{% endif %}
+                    </a>
                     <br>
                 {% endfor %}
             {% endif %}
+            {% for chatlog in entry.chatlogs %}
+                <a href="{{ chatlog.material|meeting_href:meeting }}">
+                    Chatlog
+                    {% if chatlog.time %}{{chatlog.time|date:"D G:i"}}{% endif %}
+                </a>
+                <br>
+            {% empty %}
+                <a href="{{ entry.session.chat_archive_url }}">
+                    Chatlog
+                </a>
+                <br>
+            {% endfor %}
         </td>
+        {# recordings #}
         <td>
-            {% with session.all_meeting_slides as slides %}
-                {% for slide in slides %}
-                    <a href="{{ slide|meeting_href:meeting }}">{{ slide.title|clean_whitespace }}</a>
-                    <br>
-                {% empty %}
-                    {% if not meeting.proceedings_final %}<span class="badge rounded-pill bg-warning">No slides</span>{% endif %}
-                {% endfor %}
-            {% endwith %}
+          {% for rec in entry.recordings %}
+              <a href="{{ rec.material|meeting_href:meeting|default:"#" }}">
+                  {{ rec.material|hack_recording_title }}
+                  {% if rec.time %}{{ rec.time|date:"D G:i"}}{% endif %}
+              </a>
+              <br>
+          {% endfor %}
+          {% for rec in entry.meetecho_recordings %}
+              <a href="{{ rec.material }}">
+                  Session recording 
+                  {% if rec.time %}{{ rec.time|date:"D G:i"}}{% endif %}
+              </a>
+              <br>
+          {% endfor%}
         </td>
+        {# slides #}
         <td>
-            {% with session.all_meeting_drafts as drafts %}
-                {% for draft in drafts %}
-                    <a href="{% url "ietf.doc.views_doc.document_main" name=draft.canonical_name %}">{{ draft.canonical_name }}</a>
-                    <br>
-                {% empty %}
-                    {% if not meeting.proceedings_final %}<span class="badge rounded-pill bg-warning">No drafts</span>{% endif %}
-                {% endfor %}
-            {% endwith %}
+            {% for slide in entry.slides %}
+                <a href="{{ slide.material|meeting_href:meeting }}">{{ slide.material.title|clean_whitespace }}</a>
+                <br>
+            {% empty %}
+                {% if not meeting.proceedings_final %}<span class="badge rounded-pill text-bg-warning">No slides</span>{% endif %}
+            {% endfor %}
+        </td>
+        {# drafts #}
+        <td>
+            {% for draft in entry.drafts %}
+                <a href="{% url "ietf.doc.views_doc.document_main" name=draft.material.name %}">
+                    {{ draft.material.name }}
+                </a>
+                <br>
+            {% empty %}
+                {% if not meeting.proceedings_final %}<span class="badge rounded-pill text-bg-warning">No Internet-Drafts</span>{% endif %}
+            {% endfor %}
         </td>
     {% endif %}
 </tr>
\ No newline at end of file
diff --git a/ietf/templates/meeting/important-dates.html b/ietf/templates/meeting/important-dates.html
index a21fbc4788..568276f566 100644
--- a/ietf/templates/meeting/important-dates.html
+++ b/ietf/templates/meeting/important-dates.html
@@ -1,7 +1,10 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2017, All Rights Reserved #}
 {% load origin %}
-{% load ietf_filters static textfilters ietf_filters %}
+{% load ietf_filters static textfilters htmlfilters %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
 {% block title %}IETF {{ meetings.0.number }}: Important Dates{% endblock %}
 {% block content %}
     {% origin %}
@@ -16,15 +19,15 @@ <h1>Important Dates</h1>
     </a>
     {% for meeting in meetings %}
         {% if meeting.show_important_dates %}
-            <h2 class="mt-5">
+            <h2 class="mt-5" id="IETF{{ meeting.number }}">
                 IETF {{ meeting.number }}
                 <br>
-                <small class="text-muted">{{ meeting.date }}, {{ meeting.city }}, {{ meeting.country }}</small>
+                <small class="text-body-secondary">{{ meeting.date }}, {{ meeting.city }}, {{ meeting.country }}</small>
             </h2>
-            <table class="table table-striped">
+            <table class="table table-striped tablesorter">
                 <thead>
                     <tr>
-                        <th scope="col">Date</th>
+                        <th scope="col" data-sort="date">Date</th>
                         <th scope="col">Weekday</th>
                         <th scope="col">Description</th>
                     </tr>
@@ -42,30 +45,7 @@ <h2 class="mt-5">
                                     {% endif %}
                                 </td>
                                 <td>
-                                    {{ d.name.desc|urlize_ietf_docs|linkify }}
-                                    {% if first and d.name.slug == 'openreg' or first and d.name.slug == 'earlybird' %}
-                                        <a href="https://www.ietf.org/how/meetings/register/">Register here</a>.
-                                    {% endif %}
-                                    {% if d.name.slug == 'opensched' %}
-                                        To request a Working Group session, use the
-                                        <a href="{% url 'ietf.secr.sreq.views.main' %}">IETF Meeting Session Request Tool</a>.
-                                        If you are working on a BOF request, it is highly recommended
-                                        to tell the IESG now by sending an email to
-                                        <a href="mailto:iesg@ietf.org">iesg@ietf.org</a>
-                                        to get advance help with the request.
-                                    {% endif %}
-                                    {% if d.name.slug == 'cutoffwgreq' %}
-                                        To request a Working Group session, use the
-                                        <a href="{% url 'ietf.secr.sreq.views.main' %}">IETF Meeting Session Request Tool</a>.
-                                    {% endif %}
-                                    {% if d.name.slug == 'cutoffbofreq' %}
-                                        To request a BOF, please see instructions on
-                                        <a href="https://www.ietf.org/how/bofs/bof-procedures/">Requesting a BOF</a>.
-                                    {% endif %}
-                                    {% if d.name.slug == 'idcutoff' %}
-                                        Upload using the
-                                        <a href="{% url 'ietf.submit.views.upload_submission' %}">ID Submission Tool</a>.
-                                    {% endif %}
+                                    {{ d.name.desc|urlize_ietf_docs|markdown|linkify }}{% if d.name.desc|slice:"-1:" != "." %}.{% endif %}
                                     {% if d.name.slug == 'draftwgagenda' or d.name.slug == 'revwgagenda' or d.name.slug == 'procsub' or d.name.slug == 'revslug' %}
                                         Upload using the
                                         <a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">Meeting Materials Management Tool</a>.
@@ -78,4 +58,30 @@ <h2 class="mt-5">
             </table>
         {% endif %}
     {% endfor %}
+    <div id="cal" class="navskip mt-5"></div>
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+    <script src="{% static 'ietf/js/fullcalendar.js' %}"></script>
+    <script>
+        document.addEventListener("DOMContentLoaded", function (event) {
+            const el = document.getElementById("cal");
+            var calendar = new FullCalendar(el, {
+                plugins: [dayGridPlugin, bootstrap5Plugin, iCalendarPlugin],
+                themeSystem: 'bootstrap5',
+                displayEventTime: false,
+                eventDidMount: function (info) {
+                    $(info.el)
+                        .tooltip({
+                            title: info.event.title + ": " + info.event.extendedProps.description
+                        });
+                },
+                events: {
+                    url: "{% url 'ietf.meeting.views.important_dates' output_format='ics' %}",
+                    format: "ics"
+                }
+            });
+            calendar.render();
+        });
+    </script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/important_dates.ics b/ietf/templates/meeting/important_dates.ics
deleted file mode 100644
index 35079e01eb..0000000000
--- a/ietf/templates/meeting/important_dates.ics
+++ /dev/null
@@ -1,5 +0,0 @@
-{% load humanize %}{% autoescape off %}{% load ietf_filters %}BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-PRODID:-//IETF//datatracker.ietf.org ical importantdates//EN
-{% for meeting in meetings %}{% include "meeting/important_dates_for_meeting.ics" %}{% endfor %}END:VCALENDAR{% endautoescape %}
diff --git a/ietf/templates/meeting/important_dates_for_meeting.ics b/ietf/templates/meeting/important_dates_for_meeting.ics
deleted file mode 100644
index 25c26eabf2..0000000000
--- a/ietf/templates/meeting/important_dates_for_meeting.ics
+++ /dev/null
@@ -1,23 +0,0 @@
-{% for d in meeting.important_dates %}BEGIN:VEVENT
-UID:ietf-{{ meeting.number }}-{{ d.name_id }}-{{ d.date.isoformat }}
-SUMMARY:IETF {{ meeting.number }}: {{ d.name.name }}
-CLASS:PUBLIC
-DTSTART{% if not d.midnight_cutoff %};VALUE=DATE{% endif %}:{{ d.date|date:"Ymd" }}{% if d.midnight_cutoff %}235900Z{% endif %}
-DTSTAMP:{{ meeting.cached_updated|date:"Ymd" }}T{{ meeting.cached_updated|date:"His" }}Z
-TRANSP:TRANSPARENT
-DESCRIPTION:{{ d.name.desc }}{% if first and d.name.slug == 'openreg' or first and d.name.slug == 'earlybird' %}\n
- Register here: https://www.ietf.org/how/meetings/register/{% endif %}{% if d.name.slug == 'opensched' %}\n
- To request a Working Group session, use the IETF Meeting Session Request Tool:\n
- {{ request.scheme }}://{{ request.get_host}}{% url 'ietf.secr.sreq.views.main' %}\n
- If you are working on a BOF request, it is highly recommended to tell the IESG\n
- now by sending an email to iesg@ietf.org to get advance help with the request.{% endif %}{% if d.name.slug == 'cutoffwgreq' %}\n
- To request a Working Group session, use the IETF Meeting Session Request Tool:\n
- {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.secr.sreq.views.main' %}{% endif %}{% if d.name.slug == 'cutoffbofreq' %}\n
- To request a BOF, please see instructions on Requesting a BOF:\n
- https://www.ietf.org/how/bofs/bof-procedures/{% endif %}{% if d.name.slug == 'idcutoff' %}\n
- Upload using the ID Submission Tool:\n
- {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.submit.views.upload_submission' %}{% endif %}{% if d.name.slug == 'draftwgagenda' or d.name.slug == 'revwgagenda' or d.name.slug == 'procsub' or d.name.slug == 'revslug' %}\n
- Upload using the Meeting Materials Management Tool:\n
- {{ request.scheme }}://{{ request.get_host }}{% url 'ietf.meeting.views.materials' num=meeting.number %}{% endif %}
-END:VEVENT
-{% endfor %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/interim_announcement.txt b/ietf/templates/meeting/interim_announcement.txt
index 0743940996..6ea2e4c9dc 100644
--- a/ietf/templates/meeting/interim_announcement.txt
+++ b/ietf/templates/meeting/interim_announcement.txt
@@ -1,19 +1,22 @@
-{% load ietf_filters %}{% if is_change %}MEETING DETAILS HAVE CHANGED.  SEE LATEST DETAILS BELOW.
+{% load ietf_filters tz %}{% timezone meeting.tz %}{% if is_change %}MEETING DETAILS HAVE CHANGED.  SEE LATEST DETAILS BELOW.
 
-{% endif %}The {{ group.name }} ({{ group.acronym }}) {% if group.type.slug == 'wg' and group.state.slug == 'bof' %}BOF{% else %}{{group.type.name}}{% endif %} will hold
-{% if assignments.count == 1 %}a{% if meeting.city %}n {% else %} virtual {% endif %}interim meeting on {{ meeting.date }} from {{ assignments.first.timeslot.time | date:"H:i" }} to {{ assignments.first.timeslot.end_time | date:"H:i" }} {{ meeting.time_zone}}{% if meeting.time_zone != 'UTC' %} ({{ assignments.first.timeslot.utc_start_time | date:"H:i" }} to {{ assignments.first.timeslot.utc_end_time | date:"H:i" }} UTC){% endif %}.
-{% else %}a multi-day {% if not meeting.city %}virtual {% endif %}interim meeting.
+{% endif %}{% filter wordwrap:78 %}The {{ group.name }} ({{ group.acronym }}) {% if group.type.slug == 'wg' and group.state.slug == 'bof' %}BOF{% else %}{{group.type.name}}{% endif %} will hold {% if assignments.count == 1 %}a{% if meeting.city %}n {% else %} virtual {% endif %}interim meeting on {{ meeting.date }} from {{ assignments.first.timeslot.time | date:"H:i" }} to {{ assignments.first.timeslot.end_time | date:"H:i" }} {{ meeting.time_zone}}{% if meeting.time_zone != 'UTC' %} ({{ assignments.first.timeslot.time | utc | date:"H:i" }} to {{ assignments.first.timeslot.end_time | utc | date:"H:i" }} UTC){% endif %}.{% else %}a multi-day {% if not meeting.city %}virtual {% endif %}interim meeting.
 
 {% for assignment in assignments %}Session {{ forloop.counter }}:
-{{ assignment.timeslot.time | date:"Y-m-d" }}     {{ assignment.timeslot.time | date:"H:i" }} to {{ assignment.timeslot.end_time | date:"H:i" }} {{ meeting.time_zone }}{% if meeting.time_zone != 'UTC' %}({{ assignment.timeslot.utc_start_time | date:"H:i" }} to {{ assignment.timeslot.utc_end_time | date:"H:i" }} UTC){% endif %}
+{{ assignment.timeslot.time | date:"Y-m-d" }}     {{ assignment.timeslot.time | date:"H:i" }} to {{ assignment.timeslot.end_time | date:"H:i" }} {{ meeting.time_zone }}{% if meeting.time_zone != 'UTC' %}({{ assignment.timeslot.time | utc | date:"H:i" }} to {{ assignment.timeslot.end_time | utc | date:"H:i" }} UTC){% endif %}
 {% endfor %}{% endif %}
 {% if meeting.city %}Meeting Location:
 {{ meeting.city }}, {{ meeting.country }}
 
-{% endif %}Agenda:
+{% endif %}{% endfilter %}
+Agenda:
 {{ meeting.session_set.first.agenda | document_content | default_if_none:"(No agenda submitted)" }}
 
 Information about remote participation:
-{{ meeting.session_set.first.remote_instructions }}
+{{ meeting.session_set.first.remote_instructions.rstrip }}
 
-{{ meeting.session_set.first.agenda_note }}
+{{ meeting.session_set.first.agenda_note.rstrip|wordwrap:78 }}{% endtimezone %}
+
+--
+A calendar subscription for all {{ group.acronym }} meetings is available at
+{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.meeting.views.upcoming_ical' %}?show={{ group.acronym }}
diff --git a/ietf/templates/meeting/interim_info.txt b/ietf/templates/meeting/interim_info.txt
index 4bb950b7d5..6180bc664f 100644
--- a/ietf/templates/meeting/interim_info.txt
+++ b/ietf/templates/meeting/interim_info.txt
@@ -1,4 +1,4 @@
-{% load ietf_filters %}
+{% load ietf_filters tz %}{% timezone meeting.time_zone %}
 ---------------------------------------------------------
 {{ group.type.verbose_name }} Name: {{ group.name|safe }}
 {% if group.type.slug == "wg"  or group.type.slug == "directorate" or group.type.slug == "team" %}Area Name: {{ group.parent }}
@@ -17,3 +17,4 @@ Remote Participation Information: {{ session.remote_instructions }}
 Agenda Note: {{ session.agenda_note }}
 {% endfor %}
 ---------------------------------------------------------
+{% endtimezone %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/interim_meeting_cancellation_notice.txt b/ietf/templates/meeting/interim_meeting_cancellation_notice.txt
index 615342d985..83f29bf1ed 100644
--- a/ietf/templates/meeting/interim_meeting_cancellation_notice.txt
+++ b/ietf/templates/meeting/interim_meeting_cancellation_notice.txt
@@ -1,8 +1,8 @@
-{% load ams_filters %}
+{% load ams_filters tz %}{% timezone meeting.time_zone %}
 The {{ group.name }} ({{ group.acronym }}) {% if not meeting.city %}virtual {% endif %}{% if is_multi_day %}multi-day {% endif %}
 interim meeting for {{ meeting.date|date:"Y-m-d" }} from {{ start_time|time:"H:i" }} to {{ end_time|time:"H:i" }} {{ meeting.time_zone }}
 has been cancelled.
 
-{{ meeting.session_set.0.agenda_note }}
-
+{{ meeting.session_set.first.agenda_note }}
+{% endtimezone %}
 
diff --git a/ietf/templates/meeting/interim_pending.html b/ietf/templates/meeting/interim_pending.html
index 7fbc4347bc..b702f64582 100644
--- a/ietf/templates/meeting/interim_pending.html
+++ b/ietf/templates/meeting/interim_pending.html
@@ -31,11 +31,11 @@ <h1>Pending Interim Meetings</h1>
                             <a class="interim-meeting-link"
                                href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">
                                 {{ meeting.number }}
-                                {% if meeting.interim_meeting_cancelled %}<span class="badge rounded-pill bg-warning ms-1">Cancelled</span>{% endif %}
+                                {% if meeting.interim_meeting_cancelled %}<span class="badge rounded-pill text-bg-warning ms-1">Cancelled</span>{% endif %}
                             </a>
                         </td>
                         <td>
-                            {% if meeting.can_approve %}<span class="badge rounded-pill bg-success">Can be approved</span>{% endif %}
+                            {% if meeting.can_approve %}<span class="badge rounded-pill text-bg-success">Can be approved</span>{% endif %}
                         </td>
                     </tr>
                 {% endfor %}
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
index 977eaad3ff..995a612b5a 100644
--- a/ietf/templates/meeting/interim_request.html
+++ b/ietf/templates/meeting/interim_request.html
@@ -24,8 +24,8 @@ <h1>Interim Meeting Request</h1>
             </div>
         {% endif %}
         {% bootstrap_field form.meeting_type layout='horizontal' %}
-        {% bootstrap_field form.city layout='horizontal' %}
-        {% bootstrap_field form.country layout='horizontal' %}
+        {% bootstrap_field form.city layout='horizontal' wrapper_class='location mb-3' %}
+        {% bootstrap_field form.country layout='horizontal' wrapper_class='location mb-3' %}
         {% bootstrap_field form.time_zone layout='horizontal' %}
         {{ formset.management_form }}
         {% if formset.non_form_errors %}<div class="my-3 alert alert-danger">{{ formset.non_form_errors }}</div>{% endif %}
diff --git a/ietf/templates/meeting/interim_request_details.html b/ietf/templates/meeting/interim_request_details.html
index b627fdbb83..89545d14e5 100644
--- a/ietf/templates/meeting/interim_request_details.html
+++ b/ietf/templates/meeting/interim_request_details.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load static django_bootstrap5 widget_tweaks ietf_filters person_filters textfilters %}
+{% load static django_bootstrap5 widget_tweaks ietf_filters person_filters textfilters tz %}
 {% block title %}Interim Request Details{% endblock %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static 'ietf/css/select2.css' %}">
 {% endblock %}
-{% block content %}
+{% block content %}{% timezone meeting.tz %}
     {% origin %}
     <h1>Interim Meeting Request Details</h1>
     <dl class="row my-3">
@@ -67,7 +67,7 @@ <h1>Interim Meeting Request Details</h1>
             <dd class="col-sm-10">
                 {{ assignment.timeslot.time|date:"H:i" }}
                 {% if meeting.time_zone != 'UTC' %}
-                    ({{ assignment.timeslot.utc_start_time|date:"H:i" }} UTC)
+                    ({{ assignment.timeslot.time|utc|date:"H:i" }} UTC)
                 {% endif %}
             </dd>
             <dt class="col-sm-2">
@@ -151,7 +151,7 @@ <h1>Interim Meeting Request Details</h1>
         {% endif %}
         {% if can_approve and status_slug == 'apprw' %}</form>{% endif %}
     {% endwith %}
-{% endblock %}
+{% endtimezone %}{% endblock %}
 {% block js %}
     <script src="{% static 'ietf/js/select2.js' %}"></script>
     <script src="{% static 'ietf/js/meeting-interim-request.js' %}"></script>
diff --git a/ietf/templates/meeting/interim_send_announcement.html b/ietf/templates/meeting/interim_send_announcement.html
index fa05c72346..d54229200a 100644
--- a/ietf/templates/meeting/interim_send_announcement.html
+++ b/ietf/templates/meeting/interim_send_announcement.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% load static django_bootstrap5 widget_tweaks %}
 {% block title %}Announce Interim Meeting{% endblock %}
@@ -11,26 +11,7 @@
     <h1>Announce Interim Meeting</h1>
     <form method="post" class="my-3">
         {% csrf_token %}
-        <div class="row mb-3">
-            <label for="{{ form.to.id_for_label }}" class="col-md-2 fw-bold col-form-label">To</label>
-            <div class="col-md-10">{% render_field form.to class="form-control" readonly="readonly" %}</div>
-        </div>
-        <div class="row mb-3">
-            <label for="{{ form.cc.id_for_label }}" class="col-md-2 fw-bold col-form-label">Cc</label>
-            <div class="col-md-10">{% render_field form.cc class="form-control" %}</div>
-        </div>
-        <div class="row mb-3">
-            <label for="{{ form.frm.id_for_label }}" class="col-md-2 fw-bold col-form-label">From</label>
-            <div class="col-md-10">{% render_field form.frm class="form-control" readonly="readonly" %}</div>
-        </div>
-        <div class="row mb-3">
-            <label for="{{ form.subject.id_for_label }}" class="col-md-2 fw-bold col-form-label">Subject</label>
-            <div class="col-md-10">{% render_field form.subject class="form-control" readonly="readonly" %}</div>
-        </div>
-        <div class="row mb-3">
-            <label for="{{ form.body.id_for_label }}" class="col-md-2 fw-bold col-form-label">Body</label>
-            <div class="col-md-10">{% render_field form.body class="form-control" %}</div>
-        </div>
+        {% bootstrap_form form layout="horizontal" %}
         <button class="btn btn-primary" type="submit" name="send">Send</button>
         <a class="btn btn-secondary float-end"
            href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">
diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html
index b8443851b9..23263b9859 100644
--- a/ietf/templates/meeting/interim_session_buttons.html
+++ b/ietf/templates/meeting/interim_session_buttons.html
@@ -1,13 +1,15 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
 {% load origin %}
 {% load static %}
-{% load textfilters %}
+{% load textfilters tz %}
 {% origin %}
-{% with item=session.official_timeslotassignment acronym=session.historic_group.acronym %}
+{% with item=session.official_timeslotassignment acronym=session.group_at_the_time.acronym %}
+    {% if session.agenda and show_agenda %}
+        {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
+        {% include "meeting/session_agenda_include.html" with slug=item.slug session=session timeslot=item.timeslot only %}
+    {% endif %}
     <div role="group" class="btn-group btn-group-sm">
         {% if session.agenda and show_agenda %}
-            {% include "meeting/session_agenda_include.html" with slug=item.slug session=session timeslot=item.timeslot only %}
-            {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
             {# agenda pop-up button #}
             <a class="btn btn-outline-primary"
                data-bs-toggle="modal"
@@ -31,8 +33,8 @@
                 <i class="bi bi-file-pdf"></i>
             </a>
         {% endif %}
-        {# etherpad #}
-        {% if use_codimd %}
+        {# notes #}
+        {% if session.agenda.uses_notes %}
             <a class="btn btn-outline-primary"
                href="{{ session.notes_url }}"
                aria-label="Notepad for note-takers"
@@ -72,9 +74,9 @@
                     <i class="bi bi-people"></i>
                 </a>
                 {# Video stream (meetecho) #}
-            {% elif item.timeslot.location.video_stream_url %}
+            {% elif session.video_stream_url %}
                 <a class="btn btn-outline-primary"
-                   href="{{ item.timeslot.location.video_stream_url|format:session }}"
+                   href="{{ session.video_stream_url|format:session }}"
                    aria-label="Meetecho video stream"
                    title="Meetecho video stream">
                     <i class="bi bi-camera-video"></i>
@@ -90,8 +92,8 @@
             {# iCalendar item #}
             <a class="btn btn-outline-primary"
                href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
-               aria-label="icalendar entry for {{ acronym }} session on {{ item.timeslot.utc_start_time|date:'Y-m-d H:i' }} UTC"
-               title="icalendar entry for {{ acronym }} session on {{ item.timeslot.utc_start_time|date:'Y-m-d H:i' }} UTC">
+               aria-label="icalendar entry for {{ acronym }} session on {{ item.timeslot.time|utc|date:'Y-m-d H:i' }} UTC"
+               title="icalendar entry for {{ acronym }} session on {{ item.timeslot.time|utc|date:'Y-m-d H:i' }} UTC">
                 <i class="bi bi-calendar"></i>
             </a>
         {% else %}
@@ -144,17 +146,18 @@
                             {% endif %}
                         {% endwith %}
                     {% endfor %}
-                {% elif item.timeslot.location.video_stream_url %}
+                {% elif show_empty  %}
+                    {# <i class="bi"></i> #}
+                {% endif %}
+                {% if session.session_recording_url %}
                     <a class="btn btn-outline-primary"
-                       href="http://www.meetecho.com/ietf{{ meeting.number }}/recordings#{{ acronym.upper }}"
+                       href="{{ session.session_recording_url }}"
                        aria-label="Meetecho session recording"
                        title="Meetecho session recording">
                         <i class="bi bi-file-slides"></i>
                     </a>
-                {% elif show_empty  %}
-                    {# <i class="bi"></i> #}
                 {% endif %}
             {% endwith %}
         {% endif %}
     </div>
-{% endwith %}
\ No newline at end of file
+{% endwith %}
diff --git a/ietf/templates/meeting/interim_session_cancellation_notice.txt b/ietf/templates/meeting/interim_session_cancellation_notice.txt
index 7be4c612bc..b7a7321a24 100644
--- a/ietf/templates/meeting/interim_session_cancellation_notice.txt
+++ b/ietf/templates/meeting/interim_session_cancellation_notice.txt
@@ -1,7 +1,7 @@
-{% load ams_filters %}
+{% load ams_filters tz %}{% timezone session.meeting.time_zone %}
 {% if session.name %}The "{{ session.name }}"{% else %}A{% endif %} session of the {{ group.name }} ({{ group.acronym }}) {% if not session.meeting.city %}virtual {% endif %}{% if is_multi_day %}multi-day {% endif %}
-interim meeting has been cancelled. This session had been scheduled for {{ meeting.date|date:"Y-m-d" }} from {{ start_time|time:"H:i" }} to {{ end_time|time:"H:i" }} {{ meeting.time_zone }}.
+interim meeting has been cancelled. This session had been scheduled for {{ session.meeting.date|date:"Y-m-d" }} from {{ start_time|time:"H:i" }} to {{ end_time|time:"H:i" }} {{ session.meeting.time_zone }}.
 
 {{ session.agenda_note }}
-
+{% endtimezone %}
 
diff --git a/ietf/templates/meeting/make_schedule_official.html b/ietf/templates/meeting/make_schedule_official.html
index 59bccaa967..a35dc7c7f8 100644
--- a/ietf/templates/meeting/make_schedule_official.html
+++ b/ietf/templates/meeting/make_schedule_official.html
@@ -10,7 +10,7 @@
     <h1>
         Make IETF {{ meeting.number }} Schedule Official
         <br>
-        <small class="text-muted">{{ schedule.owner }}/{{ schedule.name }}</small>
+        <small class="text-body-secondary">{{ schedule.owner }}/{{ schedule.name }}</small>
     </h1>
     <form method="post" enctype="multipart/form-data" class="my-3">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html
index c11744bafb..ff4964a973 100644
--- a/ietf/templates/meeting/materials.html
+++ b/ietf/templates/meeting/materials.html
@@ -23,8 +23,6 @@ <h1>IETF {{ meeting.number }} meeting materials</h1>
                    href="{% url 'ietf.meeting.views_proceedings.edit_meetinghosts' num=meeting.number %}">
                     Edit meeting hosts
                 </a>
-                <a class="btn btn-primary"
-                   href="{% url 'ietf.secr.proceedings.views.main' %}">Secretariat proceedings functions</a>
                 {% if meeting.end_date.today > meeting.end_date %}
                     <a class="btn btn-primary"
                        href="{% url 'ietf.meeting.views.request_minutes' num=meeting.number %}">
@@ -46,7 +44,7 @@ <h2 class="mt-4" id="plenaries">Plenaries</h2>
                             <th scope="col" data-sort="agenda">Agenda</th>
                             <th scope="col" data-sort="minutes">Minutes</th>
                             <th scope="col" data-sort="slides">Slides</th>
-                            <th scope="col" data-sort="drafts">Drafts</th>
+                            <th scope="col" data-sort="drafts">Internet-Drafts</th>
                             <th scope="col" data-sort="updated">Updated</th>
                             {% if user|has_role:"Secretariat" or user_groups %}
                                 <th scope="col"></th>
@@ -54,17 +52,16 @@ <h2 class="mt-4" id="plenaries">Plenaries</h2>
                         </tr>
                     </thead>
                     <tbody>
-                        {% for session in plenaries %}
+                        {% for entry in plenaries %}
                             {% include "meeting/group_materials.html" %}
                         {% endfor %}
                     </tbody>
                 </table>
             {% endif %}
             <!-- Working groups -->
-            {% regroup ietf|dictsort:"group.parent.acronym" by group.parent.name as areas %}
-            {% for sessions in areas %}
-                <h2 class="mt-4" id="{{ sessions.list.0.group.parent.acronym }}">
-                    {{ sessions.list.0.group.parent.acronym|upper }} <small>{{ sessions.grouper }}</small>
+            {% for area, meeting_groups, not_meeting_groups in ietf_areas %}
+                <h2 class="mt-4" id="{{ area.acronym }}">
+                    {{ area.acronym|upper }} <small>{{ area.name }}</small>
                 </h2>
                 <table class="table table-sm table-striped tablesorter">
                     <thead>
@@ -73,7 +70,7 @@ <h2 class="mt-4" id="{{ sessions.list.0.group.parent.acronym }}">
                             <th scope="col" data-sort="agenda">Agenda</th>
                             <th scope="col" data-sort="minutes">Minutes</th>
                             <th scope="col" data-sort="slides">Slides</th>
-                            <th scope="col" data-sort="drafts">Drafts</th>
+                            <th scope="col" data-sort="drafts">Internet-Drafts</th>
                             <th scope="col" data-sort="updated">Updated</th>
                             {% if user|has_role:"Secretariat" or user_groups %}
                                 <th scope="col"></th>
@@ -81,10 +78,8 @@ <h2 class="mt-4" id="{{ sessions.list.0.group.parent.acronym }}">
                         </tr>
                     </thead>
                     <tbody>
-                        {% for session in sessions.list|dictsort:"group.acronym" %}
-                            {% ifchanged session.group.acronym %}
-                                {% include "meeting/group_materials.html" %}
-                            {% endifchanged %}
+                        {% for entry in meeting_groups %}
+                            {% include "meeting/group_materials.html" %}
                         {% endfor %}
                     </tbody>
                 </table>
@@ -101,7 +96,7 @@ <h2 class="mt-4" id="training">Training</h2>
                                 <th scope="col" data-sort="minutes">Minutes</th>
                                 <th scope="col" data-sort="slides">Slides</th>
                                 <th scope="col" data-sort="drafts">
-                                    Drafts
+                                    Internet-Drafts
                                 </th>
                                 <th scope="col" data-sort="updated">
                                     Updated
@@ -112,11 +107,8 @@ <h2 class="mt-4" id="training">Training</h2>
                             </tr>
                         </thead>
                         <tbody>
-                            {% for session in training %}
-                                {% ifchanged %}
-                                    {# TODO: Find a better way to represent purposed sessions in both materials and proceedings #}
-                                    {% include "meeting/group_materials.html" %}
-                                {% endifchanged %}
+                            {% for entry in training %}
+                                {% include "meeting/group_materials.html" %}
                             {% endfor %}
                         </tbody>
                     </table>
@@ -143,7 +135,7 @@ <h2 class="mt-4" id="iab">
                                 Slides
                             </th>
                             <th scope="col" data-sort="drafts">
-                                Drafts
+                                Internet-Drafts
                             </th>
                             <th scope="col" data-sort="updated">
                                 Updated
@@ -154,10 +146,8 @@ <h2 class="mt-4" id="iab">
                         </tr>
                     </thead>
                     <tbody>
-                        {% for session in iab %}
-                            {% ifchanged session.group.acronym %}
-                                {% include "meeting/group_materials.html" %}
-                            {% endifchanged %}
+                        {% for entry in iab %}
+                            {% include "meeting/group_materials.html" %}
                         {% endfor %}
                     </tbody>
                 </table>
@@ -183,7 +173,7 @@ <h2 class="mt-4" id="irtf">
                                 Slides
                             </th>
                             <th scope="col" data-sort="drafts">
-                                Drafts
+                                Internet-Drafts
                             </th>
                             <th scope="col" data-sort="updated">
                                 Updated
@@ -194,10 +184,44 @@ <h2 class="mt-4" id="irtf">
                         </tr>
                     </thead>
                     <tbody>
-                        {% for session in irtf|dictsort:"group.acronym" %}
-                            {% ifchanged session.group.acronym %}
-                                {% include "meeting/group_materials.html" %}
-                            {% endifchanged %}
+                        {% for entry in irtf %}
+                            {% include "meeting/group_materials.html" %}
+                        {% endfor %}
+                    </tbody>
+                </table>
+            {% endif %}
+            <!-- Editorial Sessions -->
+            {% if editorial %}
+                <h2 class="mt-4" id="editorial">Editorial Stream</h2>
+                <table class="table table-sm table-striped tablesorter">
+                    <thead>
+                        <tr>
+                            <th scope="col" data-sort="group">
+                                Group
+                            </th>
+                            <th scope="col" data-sort="agenda">
+                                Agenda
+                            </th>
+                            <th scope="col" data-sort="minutes">
+                                Minutes
+                            </th>
+                            <th scope="col" data-sort="slides">
+                                Slides
+                            </th>
+                            <th scope="col" data-sort="drafts">
+                                Internet-Drafts
+                            </th>
+                            <th scope="col" data-sort="updated">
+                                Updated
+                            </th>
+                            {% if user|has_role:"Secretariat" or user_groups %}
+                                <th scope="col"></th>
+                            {% endif %}
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for entry in editorial %}
+                            {% include "meeting/group_materials.html" %}
                         {% endfor %}
                     </tbody>
                 </table>
@@ -222,7 +246,7 @@ <h2 class="mt-4" id="other">
                                 Slides
                             </th>
                             <th scope="col" data-sort="drafts">
-                                Drafts
+                                Internet-Drafts
                             </th>
                             <th scope="col" data-sort="updated">
                                 Updated
@@ -233,10 +257,8 @@ <h2 class="mt-4" id="other">
                         </tr>
                     </thead>
                     <tbody>
-                        {% for session in other|dictsort:"group.acronym" %}
-                            {% ifchanged session.group.acronym %}
-                                {% include "meeting/group_materials.html" %}
-                            {% endifchanged %}
+                        {% for entry in other %}
+                            {% include "meeting/group_materials.html" %}
                         {% endfor %}
                     </tbody>
                 </table>
@@ -247,4 +269,4 @@ <h2 class="mt-4" id="other">
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}">
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/meeting/materials_editable_groups.html b/ietf/templates/meeting/materials_editable_groups.html
index d91e6f2141..5c8645ecff 100644
--- a/ietf/templates/meeting/materials_editable_groups.html
+++ b/ietf/templates/meeting/materials_editable_groups.html
@@ -14,7 +14,7 @@ <h1 class="mb-3">IETF {{ meeting_num }} meeting materials that you can edit</h1>
                             {% if g|has_sessions:meeting_num %}
                                 <a href="{% url 'ietf.meeting.views.session_details' num=meeting_num acronym=g.acronym %}">{{ g.acronym }}</a>
                             {% else %}
-                                {{ g.acronym }} <span class="badge rounded-pill bg-info ms-2">No session requested</span>
+                                {{ g.acronym }} <span class="badge rounded-pill text-bg-info ms-2">No session requested</span>
                             {% endif %}
                         </li>
                     {% endfor %}
diff --git a/ietf/templates/meeting/new_meeting_schedule.html b/ietf/templates/meeting/new_meeting_schedule.html
index c93d72b2ab..d1b5263c53 100644
--- a/ietf/templates/meeting/new_meeting_schedule.html
+++ b/ietf/templates/meeting/new_meeting_schedule.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load django_bootstrap5 %}
 {% block content %}
diff --git a/ietf/templates/meeting/past.html b/ietf/templates/meeting/past.html
index d6ca1466f1..7c8ac621ff 100644
--- a/ietf/templates/meeting/past.html
+++ b/ietf/templates/meeting/past.html
@@ -2,11 +2,13 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters static %}
+{% load cache %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
 {% block title %}Past Meetings{% endblock %}
 {% block content %}
+    {% cache 3600 pastmeetings %}
     {% origin %}
     <h1>Past Meetings</h1>
     {% if meetings %}
@@ -35,9 +37,13 @@ <h1>Past Meetings</h1>
                         <td>
                             {% if meeting.type_id == "interim" %}
                                 <a href="{% url 'ietf.meeting.views.session_details' num=meeting.number acronym=meeting.responsible_group.acronym %}">{{ meeting.number }}</a>
-                                {% if meeting.interim_meeting_cancelled %}<span class="badge rounded-pill bg-warning">Cancelled</span>{% endif %}
+                                {% if meeting.interim_meeting_cancelled %}<span class="badge rounded-pill text-bg-warning">Cancelled</span>{% endif %}
                             {% else %}
-                                <a href="{% url 'agenda' num=meeting.number %}">IETF-{{ meeting.number }}</a>
+                                {% if meeting.get_number > 28 %}
+                                    <a href="{% url 'agenda' num=meeting.number %}">IETF-{{ meeting.number }}</a>
+                                {% else %}
+                                    <a href="https://www.ietf.org/proceedings/{{meeting.get_number|stringformat:'02d'}}.pdf">IETF-{{ meeting.number }}</a>
+                                {% endif %}
                             {% endif %}
                         </td>
                         <td class="d-none d-sm-table-cell">
@@ -55,6 +61,7 @@ <h1>Past Meetings</h1>
     {% else %}
         <h2>No past meetings</h2>
     {% endif %}
+    {% endcache %}
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
diff --git a/ietf/templates/meeting/previously_approved_slides.html b/ietf/templates/meeting/previously_approved_slides.html
index 060be438e0..95975cb63f 100644
--- a/ietf/templates/meeting/previously_approved_slides.html
+++ b/ietf/templates/meeting/previously_approved_slides.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2020, All Rights Reserved #}
-{% load origin staticfiles django_bootstrap5 %}
+{% load origin static django_bootstrap5 %}
 {% block title %}
     Approved Slides for {{ submission.session.meeting }} : {{ submission.session.group.acronym }}
 {% endblock %}
@@ -11,7 +11,7 @@ <h1 class="mb-3">
         {% if submission.status.slug == 'approved' %}
             approved
         {% else %}
-            rejected
+            declined
         {% endif %}
     </h1>
     <p>
@@ -19,7 +19,7 @@ <h1 class="mb-3">
         {% if submission.status.slug == 'approved' %}
             approved.
         {% else %}
-            rejected.
+            declined.
         {% endif %}
         No further action is needed.
     </p>
@@ -33,4 +33,4 @@ <h1 class="mb-3">
             return to this meeting session
         </a>.
     </p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html
index 687c5dac17..0aa8197fe9 100644
--- a/ietf/templates/meeting/proceedings.html
+++ b/ietf/templates/meeting/proceedings.html
@@ -1,201 +1,215 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load ietf_filters static %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
-{% block title %}
-    IETF {{ meeting.number }}
-    {% if not meeting.proceedings_final %}Draft{% endif %}
-    Proceedings
-{% endblock %}
-{% block content %}
-    {% origin %}
-    {% include 'meeting/proceedings/title.html' with meeting=meeting attendance=attendance only %}
-    {% if user|has_role:"Secretariat" and not meeting.proceedings_final %}
-        <a class="btn btn-warning finalize-button"
-           href="{% url 'ietf.meeting.views.finalize_proceedings' num=meeting.number %}">
-            Finalize proceedings
-        </a>
+{% include 'meeting/proceedings/introduction.html' with meeting=meeting only %}
+<!-- Plenaries -->
+{% if plenaries %}
+    <h2 class="mt-5" id="plenaries">Plenaries</h2>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+        <tr>
+            <th scope="col" data-sort="group">Group</th>
+            <th scope="col" data-sort="artifacts">Artifacts</th>
+            <th scope="col" data-sort="recordings">Recordings</th>
+            <th scope="col" data-sort="slides">Slides</th>
+            <th scope="col" data-sort="drafts">Internet-Drafts</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for entry in plenaries %}
+            {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
+        {% endfor %}
+        </tbody>
+    </table>
+{% endif %}
+<!-- Working groups -->
+{% for area, meeting_groups, not_meeting_groups in ietf_areas %}
+    <h2 class="mt-5" id="{{ area.acronym }}">
+        {{ area.acronym|upper }} <small class="text-body-secondary">{{ area.name }}</small>
+    </h2>
+    {% if meeting_groups %}
+        <table class="table table-sm table-striped tablesorter">
+            <thead>
+            <tr>
+                <th scope="col" data-sort="group">Group</th>
+                <th scope="col" data-sort="artifacts">Artifacts</th>
+                <th scope="col" data-sort="recordings">Recordings</th>
+                <th scope="col" data-sort="slides">Slides</th>
+                <th scope="col" data-sort="drafts">Internet-Drafts</th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for entry in meeting_groups %}
+                {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
+            {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+    {% if not_meeting_groups %}
+        <p>
+            {{ area.name }} groups not meeting:
+            {% for entry in not_meeting_groups %}
+                {% if entry.name == "" %}{# do not show named sessions in this list #}
+                    <a href="{% url 'ietf.group.views.group_home' acronym=entry.group.acronym %}">
+                        {{ entry.group.acronym }}
+                    </a>{% if not forloop.last %},{% endif %}
+                {% endif %}
+            {% endfor %}
+        </p>
+        <table class="table table-sm table-striped">
+            <thead>
+            <tr>
+                <th scope="col"></th>
+                <th scope="col"></th>
+                <th scope="col"></th>
+                <th scope="col"></th>
+                <th scope="col"></th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for entry in not_meeting_groups %}{% if entry.has_materials %}
+                {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
+            {% endif %}{% endfor %}
+            </tbody>
+        </table>
     {% endif %}
-    {# cache for 15 minutes, as long as there's no proceedings activity. takes 4-8 seconds to generate. #}
-    {% load cache %}
-    {% cache 900 ietf_meeting_proceedings meeting.number cache_version %}
-    {% include 'meeting/proceedings/introduction.html' with meeting=meeting only %}
-    {% with "True" as show_agenda %}
-        <!-- Plenaries -->
-        {% if plenaries %}
-            <h2 class="mt-5" id="plenaries">Plenaries</h2>
-            <table class="table table-sm table-striped tablesorter">
-                <thead>
-                    <tr>
-                        <th scope="col" data-sort="group">Group</th>
-                        <th scope="col" data-sort="artifacts">Artifacts</th>
-                        <th scope="col" data-sort="recordings">Recordings</th>
-                        <th scope="col" data-sort="slides">Slides</th>
-                        <th scope="col" data-sort="drafts">Drafts</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for session in plenaries %}
-                        {% include "meeting/group_proceedings.html" %}
-                    {% endfor %}
-                </tbody>
-            </table>
-        {% endif %}
-        <!-- Working groups -->
-        {% for area, meeting_sessions, not_meeting_sessions in ietf_areas %}
-            <h2 class="mt-5" id="{{ area.acronym }}">
-                {{ area.acronym|upper }} <small class="text-muted">{{ area.name }}</small>
-            </h2>
-            {% if meeting_sessions %}
-                <table class="table table-sm table-striped tablesorter">
-                    <thead>
-                        <tr>
-                            <th scope="col" data-sort="group">Group</th>
-                            <th scope="col" data-sort="artifacts">Artifacts</th>
-                            <th scope="col" data-sort="recordings">Recordings</th>
-                            <th scope="col" data-sort="slides">Slides</th>
-                            <th scope="col" data-sort="drafts">Drafts</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for session in meeting_sessions %}
-                            {% ifchanged session.group.acronym %}
-                                {% include "meeting/group_proceedings.html" %}
-                            {% endifchanged %}
-                        {% endfor %}
-                    </tbody>
-                </table>
-            {% endif %}
-            {% if not_meeting_sessions %}
-                <p>
-                    {{ area.name }} groups not meeting:
-                    {% for session in not_meeting_sessions %}
-                        {% ifchanged session.group.acronym %}
-                            <a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{ session.group.acronym }}</a>{% if not forloop.last %},{% endif %}
-                        {% endifchanged %}
-                    {% endfor %}
-                </p>
-                <table class="table table-sm table-striped">
-                    <thead>
-                        <tr>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for session in not_meeting_sessions %}
-                            {% ifchanged session.group.acronym %}
-                                {% if session.sessionpresentation_set.exists %}
-                                    {% include "meeting/group_proceedings.html" %}
-                                {% endif %}
-                            {% endifchanged %}
-                        {% endfor %}
-                    </tbody>
-                </table>
-            {% endif %}
+{% endfor %}
+<!-- Training Sessions -->
+{% if training %}
+    <h2 class="mt-5" id="training">Training</h2>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+        <tr>
+            <th scope="col" data-sort="group">Group</th>
+            <th scope="col" data-sort="artifacts">Artifacts</th>
+            <th scope="col" data-sort="recordings">Recordings</th>
+            <th scope="col" data-sort="slides">Slides</th>
+            <th scope="col" data-sort="drafts">Internet-Drafts</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for entry in training %}
+            {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=False only %}
+        {% endfor %}
+        </tbody>
+    </table>
+{% endif %}
+<!-- IAB Sessions -->
+{% if iab %}
+    <h2 class="mt-5" id="iab">
+        IAB <small class="text-body-secondary">Internet Architecture Board</small>
+    </h2>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+        <tr>
+            <th scope="col" data-sort="group">
+                Group
+            </th>
+            <th scope="col" data-sort="artifacts">
+                Artifacts
+            </th>
+            <th scope="col" data-sort="recordings">
+                Recordings
+            </th>
+            <th scope="col" data-sort="slides">
+                Slides
+            </th>
+            <th scope="col" data-sort="drafts">
+                Internet-Drafts
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for entry in iab %}
+            {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
         {% endfor %}
-        <!-- Training Sessions -->
-        {% if training %}
-            {% with "False" as show_agenda %}
-                <h2 class="mt-5" id="training">Training</h2>
-                <table class="table table-sm table-striped tablesorter">
-                    <thead>
-                        <tr>
-                            <th scope="col" data-sort="group">Group</th>
-                            <th scope="col" data-sort="artifacts">Artifacts</th>
-                            <th scope="col" data-sort="recordings">Recordings</th>
-                            <th scope="col" data-sort="slides">Slides</th>
-                            <th scope="col" data-sort="drafts">Drafts</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for session in training %}
-                            {% ifchanged %}
-                                {% include "meeting/group_proceedings.html" %}
-                            {% endifchanged %}
-                        {% endfor %}
-                    </tbody>
-                </table>
-            {% endwith %}
-        {% endif %}
-        <!-- IAB Sessions -->
-        {% if iab %}
-            <h2 class="mt-5" id="iab">
-                IAB <small class="text-muted">Internet Architecture Board</small>
-            </h2>
-            <table class="table table-sm table-striped tablesorter">
-                <thead>
-                    <tr>
-                        <th scope="col" data-sort="group">
-                            Group
-                        </th>
-                        <th scope="col" data-sort="artifacts">
-                            Artifacts
-                        </th>
-                        <th scope="col" data-sort="recordings">
-                            Recordings
-                        </th>
-                        <th scope="col" data-sort="slides">
-                            Slides
-                        </th>
-                        <th scope="col" data-sort="drafts">
-                            Drafts
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for session in iab %}
-                        {% ifchanged %}
-                            {% include "meeting/group_proceedings.html" %}
-                        {% endifchanged %}
-                    {% endfor %}
-                </tbody>
-            </table>
-        {% endif %}
-        <!-- IRTF Sessions -->
-        {% if irtf %}
-            <h2 class="mt-5" id="irtf">
-                IRTF <small class="text-muted">Internet Research Task Force</small>
-            </h2>
-            <table class="table table-sm table-striped tablesorter">
-                <thead>
-                    <tr>
-                        <th scope="col" data-sort="group">
-                            Group
-                        </th>
-                        <th scope="col" data-sort="artifacts">
-                            Artifacts
-                        </th>
-                        <th scope="col" data-sort="recordings">
-                            Recordings
-                        </th>
-                        <th scope="col" data-sort="slides">
-                            Slides
-                        </th>
-                        <th scope="col" data-sort="drafts">
-                            Drafts
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for session in irtf|dictsort:"group.acronym" %}
-                        {% ifchanged %}
-                            {% include "meeting/group_proceedings.html" %}
-                        {% endifchanged %}
-                    {% endfor %}
-                </tbody>
-            </table>
-        {% endif %}
-    {% endwith %}
-{% endcache %}
-{% endblock %}
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}">
-    </script>
-{% endblock %}
\ No newline at end of file
+        </tbody>
+    </table>
+{% endif %}
+<!-- IRTF Sessions -->
+{% if irtf.meeting_groups %}
+    <h2 class="mt-5" id="irtf">
+        IRTF <small class="text-body-secondary">Internet Research Task Force</small>
+    </h2>
+    <table class="table table-sm table-striped tablesorter">
+        <thead>
+        <tr>
+            <th scope="col" data-sort="group">
+                Group
+            </th>
+            <th scope="col" data-sort="artifacts">
+                Artifacts
+            </th>
+            <th scope="col" data-sort="recordings">
+                Recordings
+            </th>
+            <th scope="col" data-sort="slides">
+                Slides
+            </th>
+            <th scope="col" data-sort="drafts">
+                Internet-Drafts
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for entry in irtf.meeting_groups %}
+            {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
+        {% endfor %}
+        </tbody>
+    </table>
+    {% if irtf.not_meeting_groups %}
+        <p>
+            IRTF groups not meeting:
+            {% for entry in irtf.not_meeting_groups %}
+                {% if entry.name == "" %}{# do not show named sessions in this list #}
+                    <a href="{% url 'ietf.group.views.group_home' acronym=entry.group.acronym %}">
+                        {{ entry.group.acronym }}
+                    </a>{% if not forloop.last %},{% endif %}
+                {% endif %}
+            {% endfor %}
+        </p>
+        <table class="table table-sm table-striped">
+            <thead>
+            <tr>
+                <th scope="col"></th>
+                <th scope="col"></th>
+                <th scope="col"></th>
+                <th scope="col"></th>
+                <th scope="col"></th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for entry in irtf.not_meeting %}{% if entry.has_materials %}
+                {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
+            {% endif %}{% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+    <!-- Editorial Sessions -->
+    {% if editorial %}
+        <h2 class="mt-5" id="editorial">Editorial Stream</h2>
+        <table class="table table-sm table-striped tablesorter">
+            <thead>
+            <tr>
+                <th scope="col" data-sort="group">
+                    Group
+                </th>
+                <th scope="col" data-sort="artifacts">
+                    Artifacts
+                </th>
+                <th scope="col" data-sort="recordings">
+                    Recordings
+                </th>
+                <th scope="col" data-sort="slides">
+                    Slides
+                </th>
+                <th scope="col" data-sort="drafts">
+                    Internet-Drafts
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for entry in editorial %}
+                {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
+            {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+{% endif %}
diff --git a/ietf/templates/meeting/proceedings/edit_material_base.html b/ietf/templates/meeting/proceedings/edit_material_base.html
index 173e1d2360..be66fa3305 100644
--- a/ietf/templates/meeting/proceedings/edit_material_base.html
+++ b/ietf/templates/meeting/proceedings/edit_material_base.html
@@ -9,7 +9,7 @@ <h1>
         {% block content_header %}
             Edit Proceedings Material
             <br>
-            <small class="text-muted">{{ meeting }} {{ material_type.name }}</small>
+            <small class="text-body-secondary">{{ meeting }} {{ material_type.name }}</small>
         {% endblock %}
     </h1>
     {% if meeting.proceedings_final %}
diff --git a/ietf/templates/meeting/proceedings/edit_meetinghosts.html b/ietf/templates/meeting/proceedings/edit_meetinghosts.html
index 89e3eb25f3..68c684a2fa 100644
--- a/ietf/templates/meeting/proceedings/edit_meetinghosts.html
+++ b/ietf/templates/meeting/proceedings/edit_meetinghosts.html
@@ -8,7 +8,7 @@
     <h1>
         Edit Meeting Hosts
         <br>
-        <small class="text-muted">{{ meeting }}</small>
+        <small class="text-body-secondary">{{ meeting }}</small>
     </h1>
     {% if meeting.proceedings_final %}
         <div class="alert alert-warning my-3">The proceedings for this meeting have already been finalized.</div>
diff --git a/ietf/templates/meeting/proceedings/introduction.html b/ietf/templates/meeting/proceedings/introduction.html
index 2e409ccf06..9f6f9af002 100644
--- a/ietf/templates/meeting/proceedings/introduction.html
+++ b/ietf/templates/meeting/proceedings/introduction.html
@@ -14,7 +14,7 @@
             <a href="{% url 'agenda' num=meeting.number %}">Meeting Agenda</a>
         </div>
         <div class="proceedings-row">
-            <a href="{% url 'ietf.meeting.views.proceedings_progress_report' num=meeting.number %}">Activity Report</a>
+            <a href="{% url 'ietf.meeting.views.proceedings_activity_report' num=meeting.number %}">Activity Report</a>
         </div>
         <div class="proceedings-row">
             <a href="{% url 'ietf.meeting.views.important_dates' num=meeting.number %}">Important Dates</a>
diff --git a/ietf/templates/meeting/proceedings/material_details.html b/ietf/templates/meeting/proceedings/material_details.html
index 0b5f048c99..aa2c45fde3 100644
--- a/ietf/templates/meeting/proceedings/material_details.html
+++ b/ietf/templates/meeting/proceedings/material_details.html
@@ -7,7 +7,7 @@
     <h1>
         {{ meeting }}
         <br>
-        <small class="text-muted">Proceedings Materials</small>
+        <small class="text-body-secondary">Proceedings Materials</small>
     </h1>
     {% if meeting.proceedings_final %}
         <div class="alert alert-warning my-3">The proceedings have been finalized for this meeting.</div>
@@ -43,7 +43,7 @@ <h1>
                             {% with timestamp=mat.document.time|utc %}
                                 {{ timestamp|date:"Y-m-d" }}
                                 <br>
-                                <small class="text-muted">{{ timestamp|date:"H:i:s" }}&nbsp;UTC</small>
+                                <small class="text-body-secondary">{{ timestamp|date:"H:i:s" }}&nbsp;UTC</small>
                             {% endwith %}
                         </td>
                     {% else %}
diff --git a/ietf/templates/meeting/proceedings/materials_table.html b/ietf/templates/meeting/proceedings/materials_table.html
index 25a1725225..d18f2ce8d7 100644
--- a/ietf/templates/meeting/proceedings/materials_table.html
+++ b/ietf/templates/meeting/proceedings/materials_table.html
@@ -26,7 +26,7 @@ <h2 class="mt-3" id="proceedings-materials">Proceedings Materials</h2>
                                 {% with timestamp=material.document.time|utc %}
                                     {{ timestamp|date:"Y-m-d" }}
                                     <br>
-                                    <small class="text-muted">{{ timestamp|date:"H:i:s" }} UTC</small>
+                                    <small class="text-body-secondary">{{ timestamp|date:"H:i:s" }} UTC</small>
                                 {% endwith %}
                             </td>
                         {% else %}
diff --git a/ietf/templates/meeting/proceedings/upload_material.html b/ietf/templates/meeting/proceedings/upload_material.html
index a581b987f0..4c97d5b366 100644
--- a/ietf/templates/meeting/proceedings/upload_material.html
+++ b/ietf/templates/meeting/proceedings/upload_material.html
@@ -6,7 +6,7 @@
 {% block content_header %}
     Upload Proceedings Material
     <br>
-    <small class="text-muted">{{ meeting }} {{ material_type.name }}</small>
+    <small class="text-body-secondary">{{ meeting }} {{ material_type.name }}</small>
 {% endblock %}
 {% block intro %}
     <p>
diff --git a/ietf/templates/meeting/proceedings_activity_report.html b/ietf/templates/meeting/proceedings_activity_report.html
new file mode 100644
index 0000000000..dd5b082bf5
--- /dev/null
+++ b/ietf/templates/meeting/proceedings_activity_report.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% load ams_filters ietf_filters cache %}
+{% block title %}IETF {{ meeting.number }} Proceedings - Activity Report{% endblock %}
+{% block content %}
+    {% cache 3600 proceedings_activity_report meeting.number %}
+    <h1>
+        <a class="text-decoration-none text-reset"
+           href="{% url 'ietf.meeting.views.proceedings' num=meeting.number %}">
+            IETF {{ meeting.number }} proceedings
+        </a>
+    </h1>
+    <h2 class="mt-3">IETF Activity Report</h2>
+    <h3 class="mt-3">{{ sdate|date:"d-F-y" }} to {{ edate|date:"d-F-y" }}</h3>
+    
+    {% include "meeting/activity_report.html" %}
+
+    {% endcache %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/proceedings_attendees.html b/ietf/templates/meeting/proceedings_attendees.html
index 5d2742863f..0c59d4ab15 100644
--- a/ietf/templates/meeting/proceedings_attendees.html
+++ b/ietf/templates/meeting/proceedings_attendees.html
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin markup_tags %}
+{% load origin markup_tags static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+    {% if chart_data %}<link rel="stylesheet" href="{% static "ietf/css/highcharts.css" %}">{% endif %}
+{% endblock %}
 {% block title %}IETF {{ meeting.number }} proceedings{% endblock %}
 {% block content %}
     {% origin %}
@@ -11,5 +15,82 @@ <h1>
         </a>
     </h1>
     <h2>Attendee list of IETF {{ meeting.number }} meeting</h2>
-    {{ template|safe }}
-{% endblock %}
\ No newline at end of file
+
+    {% if chart_data %}
+    <div class="d-flex align-items-center gap-4 mb-3 flex-wrap">
+        <div class="d-flex gap-4">
+            <div>Onsite: <strong>{{ stats.onsite }}</strong></div>
+            <div>Remote: <strong>{{ stats.remote }}</strong></div>
+            <div>Total: <strong>{{ stats.total }}</strong></div>
+        </div>
+        <button type="button" class="btn btn-primary btn-sm"
+                data-bs-toggle="modal" data-bs-target="#attendees-chart-modal">
+            <i class="bi bi-pie-chart-fill"></i> View chart
+        </button>
+    </div>
+
+    <div class="modal fade" id="attendees-chart-modal" tabindex="-1"
+         aria-labelledby="attendees-chart-modal-label" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h2 class="modal-title fs-5" id="attendees-chart-modal-label">
+                        IETF {{ meeting.number }} attendees
+                    </h2>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="btn-group mb-3" role="group" aria-label="Chart breakdown">
+                        <input type="radio" class="btn-check" name="attendees-breakdown"
+                               id="breakdown-type" value="type" checked>
+                        <label class="btn btn-outline-secondary btn-sm" for="breakdown-type">Onsite/Remote</label>
+                        <input type="radio" class="btn-check" name="attendees-breakdown"
+                               id="breakdown-countries" value="countries">
+                        <label class="btn btn-outline-secondary btn-sm" for="breakdown-countries">Countries</label>
+                    </div>
+                    <div id="attendees-pie-chart" class="bg-body"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    {{ chart_data|json_script:"attendees-chart-data" }}
+    {% endif %}{# chart_data #}
+
+    {% if template %}
+    <div class="alert alert-info" role="alert">
+        Attendee statistics are not available for this meeting.
+    </div>
+      {{template|safe}}
+    {% else %}
+        <table id="id_attendees" class="table table-sm table-striped tablesorter">
+        <thead>
+            <tr>
+                <th scope="col" data-sort="last">Last Name</th>
+                <th scope="col" data-sort="first">First Name</th>
+                <th scope="col" data-sort="organization">Organization</th>
+                <th scope="col" data-sort="country">Country</th>
+                <th scope="col" data-sort="type">Registration Type</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for reg in registrations %}
+            <tr>
+                <td>{{ reg.last_name }}</td>
+                <td>{{ reg.first_name }}</td>
+                <td>{{ reg.affiliation }}</td>
+                <td>{{ reg.country_code }}</td>
+                <td>{{ reg.attendance_type }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+        </table>
+    {% endif %}
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
+    {% if chart_data %}
+    <script src="{% static "ietf/js/highcharts.js" %}"></script>
+    <script src="{% static "ietf/js/attendees-chart.js" %}"></script>
+    {% endif %}
+{% endblock %}
diff --git a/ietf/templates/meeting/proceedings_attendees_table.html b/ietf/templates/meeting/proceedings_attendees_table.html
deleted file mode 100644
index 9ac1fda2ac..0000000000
--- a/ietf/templates/meeting/proceedings_attendees_table.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<table id="id_attendees" class="table table-sm table-striped tablesorter">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="last">Last name</th>
-            <th scope="col" data-sort="first">First name</th>
-            <th scope="col" data-sort="organization">Organization</th>
-            <th scope="col" data-sort="country">Country</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for attendee in attendees %}
-            <tr>
-                <td>{{ attendee.LastName }}</td>
-                <td>{{ attendee.FirstName }}</td>
-                <td>{{ attendee.Company }}</td>
-                <td>{{ attendee.Country }}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/ietf/templates/meeting/proceedings_overview.html b/ietf/templates/meeting/proceedings_overview.html
index 3b43261fee..1590acb2b0 100644
--- a/ietf/templates/meeting/proceedings_overview.html
+++ b/ietf/templates/meeting/proceedings_overview.html
@@ -11,6 +11,6 @@ <h1>
         </a>
     </h1>
     <h2>IETF overview</h2>
-    <!-- [html-validate-disable-block no-deprecated-attr, void-style, element-required-attributes -- FIXME: lots of old HTML in the proceedings] -->
+    <!-- [html-validate-disable-block no-deprecated-attr, void-style, wcag/h63 -- FIXME: lots of old HTML in the proceedings] -->
     {{ template|safe }}
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/proceedings_progress_report.html b/ietf/templates/meeting/proceedings_progress_report.html
deleted file mode 100644
index a51fb01e6c..0000000000
--- a/ietf/templates/meeting/proceedings_progress_report.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{% extends "base.html" %}
-{% load ams_filters ietf_filters %}
-{% block title %}IETF {{ meeting.number }} Proceedings - Progress Report{% endblock %}
-{% block content %}
-    <h1>
-        <a class="text-decoration-none text-reset"
-           href="{% url 'ietf.meeting.views.proceedings' num=meeting.number %}">
-            IETF {{ meeting.number }} proceedings
-        </a>
-    </h1>
-    <h2 class="mt-3">IETF Progress Report</h2>
-    <h3 class="mt-3">{{ sdate|date:"d-F-y" }} to {{ edate|date:"d-F-y" }}</h3>
-    <ul class="progress-section">
-        <li>{{ actions_count }} IESG Protocol and Document Actions this period</li>
-        <li>{{ last_calls_count }} IESG Last Calls issued to the IETF this period</li>
-        <li>
-            {{ new_drafts_count|stringformat:"3s" }}    New I-Ds   ({{ new_drafts_updated_count }} of which were updated, some ({{ new_drafts_updated_more_count }}) more than once)
-        </li>
-        <li>{{ updated_drafts_count|stringformat:"3s" }}    I-Ds were updated   (Some more than once)</li>
-        <li>
-            <h3 class="mt-3">In the final 4 weeks before meeting</h3>
-        </li>
-        <li>
-            {{ ffw_new_count|stringformat:"3s" }}    New I-Ds were received - {{ ffw_new_percent }} of total newbies since last meeting
-        </li>
-        <li>
-            {{ ffw_update_count|stringformat:"3s" }}    I-Ds were updated - {{ ffw_update_percent }} of total updated since last meeting
-        </li>
-    </ul>
-    <h3 class="mt-3">{{ new_groups.count }} New Working Group(s) formed this period</h3>
-    <ul class="progress-section">
-        {% for group in new_groups %}<li>{{ group.name }} ({{ group.acronym }})</li>{% endfor %}
-    </ul>
-    <h3 class="mt-3">{{ concluded_groups.count }} Working Group(s) concluded this period</h3>
-    <ul class="progress-section">
-        {% for group in concluded_groups %}<li>{{ group.name }} ({{ group.acronym }})</li>{% endfor %}
-    </ul>
-    <h3 class="mt-3">{{ rfcs.count }} RFCs published this period</h3>
-    <p>
-        {{ counts.std }} Standards Track; {{ counts.bcp }} BCP; {{ counts.exp }} Experimental; {{ counts.inf }} Informational
-    </p>
-    <table class="table table-sm table-striped tablesorter">
-        <thead>
-            <tr>
-                <th scope="col" data-sort="rfc">RFC</th>
-                <th scope="col" data-sort="status">Status</th>
-                <th scope="col" data-sort="group">Group</th>
-                <th scope="col" data-sort="date">Date</th>
-                <th scope="col" data-sort="title">Title</th>
-            </tr>
-        </thead>
-        {% if rfcs %}
-            <tbody>
-                {% for rfc in rfcs %}
-                    <tr>
-                        <td class="text-nowrap">
-                            <a href="{{ rfc.doc.get_absolute_url }}">{{ rfc.doc.canonical_name|prettystdname }}</a>
-                        </td>
-                        <td class="text-nowrap">{{ rfc.doc.intended_std_level.name }}</td>
-                        <td>
-                            <a href="{{ rfc.doc.group.about_url }}">{{ rfc.doc.group.acronym }}</a>
-                        </td>
-                        <td>{{ rfc.time|date:"F Y" }}</td>
-                        <td>{{ rfc.doc.title }}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        {% endif %}
-    </table>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/proceedings_wrapper.html b/ietf/templates/meeting/proceedings_wrapper.html
new file mode 100644
index 0000000000..a20291a693
--- /dev/null
+++ b/ietf/templates/meeting/proceedings_wrapper.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin %}
+{% load ietf_filters static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
+{% block title %}
+    IETF {{ meeting.number }}
+    {% if not meeting.proceedings_final %}Draft{% endif %}
+    Proceedings
+{% endblock %}
+{% block content %}
+    {% origin %}
+    {% include 'meeting/proceedings/title.html' with meeting=meeting attendance=attendance only %}
+    {% if user|has_role:"Secretariat" and not meeting.proceedings_final %}
+        <a class="btn btn-warning finalize-button"
+           href="{% url 'ietf.meeting.views.finalize_proceedings' num=meeting.number %}">
+            Finalize proceedings
+        </a>
+    {% endif %}
+    {{ proceedings_content }}
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}">
+    </script>
+{% endblock %}
diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html
index a6b6fc477f..57172d86c8 100644
--- a/ietf/templates/meeting/properties_edit.html
+++ b/ietf/templates/meeting/properties_edit.html
@@ -7,7 +7,7 @@
 {% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>IETF {{ meeting.number }} Schedule<br><small class="text-muted">
+    <h1>IETF {{ meeting.number }} Schedule<br><small class="text-body-secondary">
     {{ schedule.owner }}/{{ schedule.name }} ({{ schedule.official_token }})</small></h1>
     <div class="my-3">
         {% if not schedule.is_official %}
diff --git a/ietf/templates/meeting/propose_session_slides.html b/ietf/templates/meeting/propose_session_slides.html
deleted file mode 100644
index 8315c2deba..0000000000
--- a/ietf/templates/meeting/propose_session_slides.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static django_bootstrap5 %}
-{% block title %}Propose Slides for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>
-        Propose Slides for {{ session.meeting }}
-        <br>
-        <small class="text-muted">{{ session.group.acronym }}
-            {% if session.name %}: {{ session.name }}{% endif %}
-        </small>
-    </h1>
-    {% if session_number %}
-        <h2 class="mt-3">
-            Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|date:"D M-d-Y Hi" }}
-        </h2>
-    {% endif %}
-    <p class="alert alert-info my-3">
-        This form will allow you to propose a slide deck to the session chairs. After you upload your proposal, mail will be sent to the session chairs asking for their approval.
-    </p>
-    <form enctype="multipart/form-data" method="post">
-        {% csrf_token %}
-        {% bootstrap_form form %}
-        <button type="submit" class="btn btn-primary">Upload</button>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/request_minutes.html b/ietf/templates/meeting/request_minutes.html
index fc39c034f9..4231b8d12d 100644
--- a/ietf/templates/meeting/request_minutes.html
+++ b/ietf/templates/meeting/request_minutes.html
@@ -9,7 +9,7 @@
     <h1>
         Request Minutes
         <br>
-        <small class="text-muted">IETF {{ meeting.number }}
+        <small class="text-body-secondary">IETF {{ meeting.number }}
             <br>
         {{ meeting.city }}, {{ meeting.country }} – {{ meeting.venue_name }}</small>
     </h1>
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index a80b083c13..0abee95887 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2025, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters static person_filters textfilters %}
 {% block pagehead %}
@@ -11,15 +11,112 @@
     <h1 class="title">
         IETF {{ meeting.number }} timeslot requests
         <br>
-        <small class="text-muted">{{ meeting.city }}, {{ meeting.country }}
+        <small class="text-body-secondary">{{ meeting.city }}, {{ meeting.country }}
             {% if meeting.venue_name %}– {{ meeting.venue_name }}{% endif %}
         </small>
     </h1>
+
+    <h2 class="mt-3">Requests Summary</h2>
+    <p class="mt-2"><em>This summary section focuses on sessions that have conflict lists to manage. It excludes requests from groups of type "team", such as those for the hackathon or for tutorials.</em></p>
+    <div class="mt-3">
+        <table class="table table-sm table-striped">
+            {% for row in summary_by_area %}
+                {% if forloop.first %}
+                    <thead>
+                        <tr class="table-info">
+                            {% for col in row %}
+                                <th scope="col"{% if not forloop.first %} class="text-end"{% endif %}>{{ col }}</th>
+                            {% endfor %}
+                        </tr>
+                    </thead>
+                    <tbody>
+                {% elif forloop.last %}
+                    </tbody>
+                    <tfoot>
+                        <tr>
+                            {% for col in row %}
+                                <th scope="col"{% if not forloop.first %} class="text-end"{% endif %}>{{ col }}</th>
+                            {% endfor %}
+                            {# last line is missing two columns? #}
+                            <td></td><td></td>
+                        </tr>
+                    </tfoot>
+                {% else %}
+                    <tr>
+                    {% for col in row %}
+                        {% if forloop.first %}
+                            <th scope="row">{{ col }}</th>
+                        {% else %}
+                            <td class="text-end">{{ col }}</td>
+                        {% endif %}
+                    {% endfor %}
+                    </tr>
+                {% endif %}
+            {% endfor %}
+        </table>
+    </div>
+    <div class="row mt-3">
+        <div class="col">
+            <table class="table table-sm table-striped">
+                {% for row in summary_by_group_type %}
+                    {% if forloop.first %}
+                        <thead>
+                            <tr class="table-info">
+                                {% for col in row %}
+                                    <th scope="col"{% if not forloop.first %} class="text-end"{% endif %}>{{ col }}</th>
+                                {% endfor %}
+                            </tr>
+                        </thead>
+                        <tbody>
+                    {% else %}
+                        <tr>
+                            {% for col in row %}
+                                {% if forloop.first %}
+                                    <th scope="row">{{ col }}</th>
+                                {% else %}
+                                    <td class="text-end">{{ col }}</td>
+                                {% endif %}
+                            {% endfor %}
+                        </tr>
+                    {% endif %}
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        <div class="col">
+            <table class="table table-sm table-striped">
+                {% for row in summary_by_purpose %}
+                    {% if forloop.first %}
+                        <thead>
+                            <tr class="table-info">
+                                {% for col in row %}
+                                    <th scope="col"{% if not forloop.first %} class="text-end"{% endif %}>{{ col }}</th>
+                                {% endfor %}
+                            </tr>
+                        </thead>
+                        <tbody>
+                    {% else %}
+                        <tr>
+                            {% for col in row %}
+                                {% if forloop.first %}
+                                    <th scope="row">{{ col }}</th>
+                                {% else %}
+                                    <td class="text-end">{{ col }}</td>
+                                {% endif %}
+                            {% endfor %}
+                        </tr>
+                    {% endif %}
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+
     {% regroup sessions by display_area as area_sessions %}
     {% for area in area_sessions %}
         <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
             {% if area.grouper is not None %}
-                {{ area.grouper.acronym|upper }} <small class="text-muted">{{ area.grouper.name }}</small>
+                {{ area.grouper.acronym|upper }} <small class="text-body-secondary">{{ area.grouper.name }}</small>
             {% else %}
                 Other Groups
             {% endif %}
@@ -54,9 +151,12 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
                 {% endifchanged %}
                     <tr>
                         <td>
-                            <a href="{% url "ietf.secr.sreq.views.edit" num=meeting.number acronym=session.group.acronym %}">
+                            <a href="{% url 'ietf.meeting.views_session_request.edit_request' num=meeting.number acronym=session.group.acronym %}">
                                 {{ session.group.acronym }}
                             </a>
+                            {% if session.purpose_id != "regular" and session.purpose_id != "none" %}
+                                <br><span class="badge rounded-pill text-bg-info">{{session.purpose}}</span>
+                            {% endif %}
                             {% if session.joint_with_groups.count %}joint with {{ session.joint_with_groups_acronyms|join:' ' }}{% endif %}
                             {% if session.requested_duration %}
                                 <div class="d-lg-none">
@@ -69,7 +169,7 @@ <h2 class="mt-5" id="{% firstof area.grouper.acronym "other-groups" %}">
                                 </div>
                             {% endif %}
                             {% if session.group.state.slug != "active" %}
-                                <br><span class="badge rounded-pill bg-success">{{ session.group.state.name }}</span>
+                                <br><span class="badge rounded-pill text-bg-success">{{ session.group.state.name }}</span>
                             {% endif %}
                         </td>
                         <td class="d-none d-lg-table-cell">
diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html
index 2a1a829db2..1de121a6b1 100644
--- a/ietf/templates/meeting/schedule_list.html
+++ b/ietf/templates/meeting/schedule_list.html
@@ -9,7 +9,7 @@
     <h1>
         Possible Meeting Agendas
         <br>
-        <small class="text-muted">IETF {{ meeting.number }}</small>
+        <small class="text-body-secondary">IETF {{ meeting.number }}</small>
     </h1>
     {% if can_edit_timeslots %}
         <a class="btn btn-primary my-3"
@@ -70,16 +70,16 @@ <h2 class="mt-4">{{ label }}</h2>
                             <td>{{ schedule.notes|linebreaksbr }}</td>
                             <td>
                                 {% if schedule.visible %}
-                                    <div class="badge rounded-pill bg-success">Visible</div>
+                                    <div class="badge rounded-pill text-bg-success">Visible</div>
                                 {% else %}
-                                    <div class="badge rounded-pill bg-warning">Hidden</div>
+                                    <div class="badge rounded-pill text-bg-warning">Hidden</div>
                                 {% endif %}
                             </td>
                             <td>
                                 {% if schedule.public %}
-                                    <div class="badge rounded-pill bg-success">Public</div>
+                                    <div class="badge rounded-pill text-bg-success">Public</div>
                                 {% else %}
-                                    <div class="badge rounded-pill bg-warning">Private</div>
+                                    <div class="badge rounded-pill text-bg-warning">Private</div>
                                 {% endif %}
                             </td>
                             <td>
diff --git a/ietf/templates/meeting/session_agenda_include.html b/ietf/templates/meeting/session_agenda_include.html
index 098b8c5a96..190b7a8a06 100644
--- a/ietf/templates/meeting/session_agenda_include.html
+++ b/ietf/templates/meeting/session_agenda_include.html
@@ -1,4 +1,4 @@
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
 {# expects slug, session, and timeslot  to be in the context. Calling template must load the agenda_materials.js script. #}
 {% load origin %}
 {% origin %}
@@ -19,7 +19,7 @@
                     {% if timeslot.type.slug == 'plenary' %}
                         {{ timeslot.name }}
                     {% else %}
-                        {{ session.historic_group.name }}
+                        {{ session.group_at_the_time.name }}
                     {% endif %}
                 </p>
                 <button type="button"
diff --git a/ietf/templates/meeting/session_approval_notification.txt b/ietf/templates/meeting/session_approval_notification.txt
new file mode 100644
index 0000000000..74eca09bd8
--- /dev/null
+++ b/ietf/templates/meeting/session_approval_notification.txt
@@ -0,0 +1,16 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+Dear {{ group.parent }} Director(s):
+
+{{ header }} meeting session request has just been
+submitted by {{ requester }}.
+The third session requires your approval.
+
+To approve the session go to the session request view here:
+{{ settings.IDTRACKER_BASE_URL }}{% url "ietf.meeting.views_session_request.view_request" acronym=group.acronym %}
+and click "Approve Third Session".
+
+Regards,
+
+The IETF Secretariat.
+
+{% include "meeting/session_request_info.txt" %}
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
new file mode 100644
index 0000000000..b1fd92ba5b
--- /dev/null
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -0,0 +1,366 @@
+{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
+{% load origin %}
+{% load static %}
+{% load textfilters tz %}
+{% load ietf_filters session_filters %}
+
+{% origin %}
+{% if item and item|should_show_agenda_session_buttons %}
+    {% with slug=item.slug session=item.session timeslot=item.timeslot %}
+        {% if session.agenda and show_agenda %}
+            {# Note: if called with show_agenda=True, calling template must load agenda_materials.js, needed by session_agenda_include.html #}
+            {% include "meeting/session_agenda_include.html" with slug=slug session=session timeslot=timeslot only %}
+        {% endif %}
+        <div id="session-buttons-{{ session.pk }}"
+            role="group"
+            class="btn-group btn-group-sm d-none d-lg-flex">
+            {% with acronym=session.group_at_the_time.acronym %}
+                {% if session.agenda and show_agenda %}
+                    {# agenda pop-up button #}
+                    <button class="btn btn-outline-primary"
+                            data-bs-toggle="modal" type="button"
+                            data-bs-target="#modal-{{ slug }}"
+                            aria-label="Show meeting materials"
+                            title="Show meeting materials">
+                        <i class="bi bi-arrows-fullscreen"></i>
+                    </button>
+                    {# materials tar file #}
+                    <a class="btn btn-outline-primary"
+                        role="button"
+                        href="/meeting/{{ meeting.number }}/agenda/{{ acronym }}-drafts.tgz"
+                        aria-label="Download meeting materials as .tar archive"
+                        title="Download meeting materials as .tar archive">
+                        <i class="bi bi-file-zip"></i>
+                    </a>
+                    {# materials PDF file #}
+                    <a class="btn btn-outline-primary"
+                        role="button"
+                        href="/meeting/{{ meeting.number }}/agenda/{{ acronym }}-drafts.pdf"
+                        aria-label="Download meeting materials as PDF file"
+                        title="Download meeting materials as PDF file">
+                        <i class="bi bi-file-pdf"></i>
+                    </a>
+                {% endif %}
+                {# Notes #}
+                {% if meeting.uses_notes %}
+                    <a class="btn btn-outline-primary"
+                        role="button"
+                        href="{{ session.notes_url }}"
+                        aria-label="Notepad for note-takers"
+                        title="Notepad for note-takers">
+                        <i class="bi bi-journal-text"></i>
+                    </a>
+                {% endif %}
+                {# show stream buttons up till end of session, then show archive buttons #}
+                {% if timezone_now < timeslot.end_time %}
+                    {# chat #}
+                    <a class="btn btn-outline-primary"
+                        role="button"
+                        href="{{ session.chat_room_url }}"
+                        aria-label="Chat room for {{ session.chat_room_name }}"
+                        title="Chat room for {{ session.chat_room_name }}">
+                        <i class="bi bi-chat"></i>
+                    </a>
+                    {# Video stream (meetecho) #}
+                    {% if session.video_stream_url %}
+                        <a class="btn btn-outline-primary"
+                            role="button"
+                            href="{{ session.video_stream_url }}"
+                            aria-label="Video stream"
+                            title="Video stream">
+                            <i class="bi bi-camera-video"></i>
+                        </a>
+                    {% endif %}
+                    {# Onsite tool (meetecho_onsite) #}
+                    {% if session.onsite_tool_url %}
+                        <a class="btn btn-outline-primary"
+                            role="button"
+                            href="{{ session.onsite_tool_url }}"
+                            aria-label="Onsite tool"
+                            title="Onsite tool">
+                            <i class="bi bi-phone"></i>
+                        </a>
+                    {% endif %}
+                    {# Audio stream #}
+                    {% if session.audio_stream_url %}
+                        <a class="btn btn-outline-primary"
+                            role="button"
+                            href="{{ session.audio_stream_url }}"
+                            aria-label="Audio stream"
+                            title="Audio stream">
+                            <i class="bi bi-headphones"></i>
+                        </a>
+                    {% endif %}
+                    {# Remote call-in #}
+                    {% if session.agenda_note|first_url|conference_url %}
+                        <a class="btn btn-outline-primary"
+                            role="button"
+                            href="{{ session.agenda_note|first_url }}"
+                            aria-label="Online conference"
+                            title="Online conference">
+                            <i class="bi bi-people"></i>
+                        </a>
+                    {% elif session.remote_instructions|first_url|conference_url %}
+                        <a class="btn btn-outline-primary"
+                            role="button"
+                            href="{{ session.remote_instructions|first_url }}"
+                            aria-label="Online conference"
+                            title="Online conference">
+                            <i class="bi bi-people"></i>
+                        </a>
+                    {% elif timeslot.location.webex_url %}
+                        <a class="btn btn-outline-primary"
+                            role="button"
+                            href="{{ timeslot.location.webex_url|format:session }}"
+                            aria-label="Webex session"
+                            title="Webex session">
+                            <i class="bi bi-people"></i>
+                        </a>
+                    {% endif %}
+                    {# iCalendar item #}
+                    <a class="btn btn-outline-primary"
+                        role="button"
+                        href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
+                        aria-label="icalendar entry for {{ acronym }} session on {{ timeslot.time|utc|date:'Y-m-d H:i' }} UTC"
+                        title="icalendar entry for {{ acronym }} session on {{ timeslot.time|utc|date:'Y-m-d H:i' }} UTC">
+                        <i class="bi bi-calendar"></i>
+                    </a>
+                {% else %}
+                    {# chat logs #}
+                    {% if meeting.has_chat_logs and session.chatlog %}
+                        <a class="btn btn-outline-primary"
+                            role="button"
+                            href="/doc/{{ session.chatlog.document.name }}"
+                            aria-label="Chat logs for {{ session.chat_room_name }}"
+                            title="Chat logs for {{ session.chat_room_name }}">
+                            <i class="bi bi-file-text"></i>
+                        </a>
+                    {% endif %}
+                    {# Recordings #}
+		    {% if meeting.has_recordings %}
+                        {% with session.recordings as recordings %}
+                            {% if recordings %}
+                                {# There's no guaranteed order, so this is a bit messy: #}
+                                {# First, the audio recordings, if any #}
+                                {% for r in recordings %}
+                                    {% if r.get_href and 'audio' in r.get_href %}
+                                        <a class="btn btn-outline-primary"
+                                            role="button"
+                                            href="{{ r.get_href }}"
+                                            aria-label="{{ r.title }}"
+                                            title="{{ r.title }}">
+                                            <i class="bi bi-file-play"></i>
+                                        </a>
+                                    {% endif %}
+                                {% endfor %}
+                                {# Then the youtube recordings #}
+                                {% for r in recordings %}
+                                    {% if r.get_href and 'youtu' in r.get_href %}
+                                        <a class="btn btn-outline-primary"
+                                            role="button"
+                                            href="{{ r.get_href }}"
+                                            aria-label="{{ r.title }}"
+                                            title="{{ r.title }}">
+                                            <i class="bi bi-file-slides"></i>
+                                        </a>
+                                    {% endif %}
+                                {% endfor %}
+                                {# Finally, any other recordings #}
+                                {% for r in recordings %}
+                                    {% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
+                                        <a class="btn btn-outline-primary"
+                                            role="button"
+                                            href="{{ r.get_href }}"
+                                            aria-label="{{ r.title }}"
+                                            title="{{ r.title }}">
+                                            <i class="bi bi-file-play"></i>
+                                        </a>
+                                    {% endif %}
+                                {% endfor %}
+                            {% endif %}
+                        {% endwith %}
+                        {% if session.video_stream_url %}
+                            <a class="btn btn-outline-primary"
+                                role="button"
+                                href="{{ session.session_recording_url }}"
+                                aria-label="Session recording"
+                                title="Session recording">
+                                <i class="bi bi-file-slides"></i>
+                            </a>
+                        {% endif %}
+                    {% endif %}
+                {% endif %}
+            {% endwith %}
+        </div>
+        <div class="dropdown d-lg-none">
+            <button class="btn btn-outline-primary btn-sm dropdown-toggle"
+                    type="button"
+                    aria-label="Info"
+                    id="session-buttons-dropdown-{{ session.pk }}"
+                    data-bs-toggle="dropdown"
+                    aria-haspopup="true"
+                    aria-expanded="false">
+                <i class="bi bi-info-lg"></i>
+            </button>
+            <ul class="dropdown-menu"
+                aria-labelledby="session-buttons-dropdown-{{ session.pk }}">
+                {% with acronym=session.group_at_the_time.acronym %}
+                    {% if session.agenda and show_agenda %}
+                        {# agenda pop-up button #}
+                        <li>
+                            <button class="dropdown-item" type="button"
+                                    data-bs-toggle="modal"
+                                    data-bs-target="#modal-{{ slug }}">
+                                <i class="bi bi-arrows-fullscreen"></i> Show meeting materials
+                            </button>
+                        </li>
+                        {# materials tar file #}
+                        <li>
+                            <a class="dropdown-item"
+                                href="/meeting/{{ meeting.number }}/agenda/{{ acronym }}-drafts.tgz">
+                                <i class="bi bi-file-zip"></i> Meeting materials archive
+                            </a>
+                        </li>
+                        {# materials PDF file #}
+                        <li>
+                            <a class="dropdown-item"
+                                href="/meeting/{{ meeting.number }}/agenda/{{ acronym }}-drafts.pdf">
+                                <i class="bi bi-file-pdf"></i> Meeting materials PDF
+                            </a>
+                        </li>
+                    {% endif %}
+                    {# Notes #}
+                    {% if meeting.uses_notes %}
+                        <li>
+                            <a class="dropdown-item" href="{{ session.notes_url }}">
+                                <i class="bi bi-journal-text"></i> Notepad for note-takers
+                            </a>
+                        </li>
+                    {% endif %}
+                    {# show stream buttons up till end of session, then show archive buttons #}
+                    {% if timezone_now < timeslot.end_time %}
+                        {# chat #}
+                        <li>
+                            <a class="dropdown-item"
+                                href="{{session.chat_room_url}}">
+                                <i class="bi bi-chat"></i> Chat room
+                            </a>
+                        </li>
+                        {# Video stream (meetecho) #}
+                        {% if session.video_stream_url %}
+                            <li>
+                                <a class="dropdown-item"
+                                    href="{{ session.video_stream_url }}">
+                                    <i class="bi bi-camera-video"></i> Video stream
+                                </a>
+                            </li>
+                        {% endif %}
+                        {# Onsite tool (meetecho_onsite) #}
+                        {% if session.onsite_tool_url %}
+                        <li>
+                            <a class="dropdown-item"
+                                href="{{ session.onsite_tool_url }}">
+                                <i class="bi bi-phone"></i> Onsite tool
+                            </a>
+                        </li>
+                        {% endif %}
+                        {# Audio stream #}
+                        {% if session.audio_stream_url %}
+                            <li>
+                                <a class="dropdown-item"
+                                    href="{{ session.audio_stream_url }}">
+                                    <i class="bi bi-headphones"></i> Audio stream
+                                </a>
+                            </li>
+                        {% endif %}
+                        {# Remote call-in #}
+                        {% if session.agenda_note|first_url|conference_url %}
+                            <li>
+                                <a class="dropdown-item" href="{{ session.agenda_note|first_url }}">
+                                    <i class="bi bi-people"></i> Online conference
+                                </a>
+                            </li>
+                        {% elif session.remote_instructions|first_url|conference_url %}
+                            <li>
+                                <a class="dropdown-item"
+                                    href="{{ session.remote_instructions|first_url }}">
+                                    <i class="bi bi-people"></i> Online conference
+                                </a>
+                            </li>
+                        {% elif timeslot.location.webex_url %}
+                            <li>
+                                <a class="dropdown-item"
+                                    href="{{ timeslot.location.webex_url|format:session }}">
+                                    <i class="bi bi-people"></i> Webex session
+                                </a>
+                            </li>
+                        {% endif %}
+                        {# iCalendar item #}
+                        <li>
+                            <a class="dropdown-item"
+                                href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}">
+                                <i class="bi bi-calendar"></i> Add to calendar
+                            </a>
+                        </li>
+                    {% else %}
+                        {# chat logs #}
+			            {% if meeting.has_chat_logs and session.chatlog %}
+                            <li>
+                                <a class="dropdown-item"
+                                    href="/doc/{{ session.chatlog.document.name }}">
+                                    <i class="bi bi-file-text"></i> Chat logs
+                                </a>
+                            </li>
+                        {% endif %}
+                        {# Recordings #}
+                        {% if meeting.has_recordings %}
+                            {% with session.recordings as recordings %}
+                                {% if recordings %}
+                                    {# There's no guaranteed order, so this is a bit messy: #}
+                                    {# First, the audio recordings, if any #}
+                                    {% for r in recordings %}
+                                        {% if r.get_href and 'audio' in r.get_href %}
+                                            <li>
+                                                <a class="dropdown-item" href="{{ r.get_href }}">
+                                                    <i class="bi bi-file-play"></i> {{ r.title }}
+                                                </a>
+                                            </li>
+                                        {% endif %}
+                                    {% endfor %}
+                                    {# Then the youtube recordings #}
+                                    {% for r in recordings %}
+                                        {% if r.get_href and 'youtu' in r.get_href %}
+                                            <li>
+                                                <a class="dropdown-item" href="{{ r.get_href }}">
+                                                    <i class="bi bi-file-slides"></i> {{ r.title }}
+                                                </a>
+                                            </li>
+                                        {% endif %}
+                                    {% endfor %}
+                                    {# Finally, any other recordings #}
+                                    {% for r in recordings %}
+                                        {% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
+                                            <li>
+                                                <a class="dropdown-item" href="{{ r.get_href }}">
+                                                    <i class="bi bi-file-play"></i> {{ r.title }}
+                                                </a>
+                                            </li>
+                                        {% endif %}
+                                    {% endfor %}
+                                {% endif %}
+                            {% endwith %}
+                            {% if session.video_stream_url %}
+                                <li>
+                                    <a class="dropdown-item"
+                                        href="{{ session.session_recording_url }}">
+                                        <i class="bi bi-file-slides"></i> Session recording
+                                    </a>
+                                </li>
+                            {% endif %}
+                        {% endif %}
+                    {% endif %}
+                {% endwith %}
+            </ul>
+        </div>
+    {% endwith %}
+{% endif %}
diff --git a/ietf/templates/meeting/session_cancel_notification.txt b/ietf/templates/meeting/session_cancel_notification.txt
new file mode 100644
index 0000000000..3de67fc8f4
--- /dev/null
+++ b/ietf/templates/meeting/session_cancel_notification.txt
@@ -0,0 +1,4 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% autoescape off %}{% load ams_filters %}
+
+A request to cancel a meeting session has just been submitted by {{ requester }}.{% endautoescape %}
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index 2ecb7e1d5c..a4d9ba1090 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2026, All Rights Reserved #}
 {% load origin ietf_filters static %}
-{% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
+{% block title %}{{ meeting }} : {{ group.acronym }}{% endblock %}
 {% block morecss %}
-    .slides tr {
-    cursor:pointer;
+    .drag-handle {
+        cursor: move;
     }
 {% endblock %}
 {% block content %}
@@ -12,13 +12,13 @@
     <h1>
         {{ meeting }}
         <br>
-        <small class="text-muted">{{ acronym }}</small>
+        <small class="text-body-secondary"><a href="{% url 'ietf.group.views.group_about' acronym=group.acronym %}">{{ group.acronym }}</a>: {{ group.name }}</small>
     </h1>
-    {% if meeting.date >= thisweek %}
+    {% if meeting.start_datetime >= thisweek %}
         <a class="regular float-end"
-           title="icalendar entry for {{ acronym }}@{{ meeting.number }}"
-           aria-label="icalendar entry for {{ acronym }}@{{ meeting.number }}"
-           href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number acronym=acronym %}">
+           title="icalendar entry for {{ group.acronym }}@{{ meeting.number }}"
+           aria-label="icalendar entry for {{ group.acronym }}@{{ meeting.number }}"
+           href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number acronym=group.acronym %}">
             <i class="bi bi-calendar"></i>
         </a>
     {% endif %}
@@ -31,81 +31,58 @@ <h2 class="mt-3">Scheduled Sessions</h2>
     {% include 'meeting/session_details_panel.html' with sessions=scheduled_sessions %}
     <h2 class="mt-3">Unscheduled Sessions</h2>
     {% include 'meeting/session_details_panel.html' with sessions=unscheduled_sessions %}
-    {% if pending_suggestions %}
-        <h2 class="mt-3">
+    {% for s in pending_suggestions %}
+        {% if forloop.first %}<h2 class="mt-3">
             {% if can_manage_materials %}
                 Proposed slides awaiting your approval
             {% else %}
                 Your proposed slides awaiting chair approval
             {% endif %}
         </h2>
-        <div class="proposedslidelist">
-            {% for s in pending_suggestions %}
-                {% if can_manage_materials %}
-                    <p>
-                        <a href="{% url "ietf.meeting.views.approve_proposed_slides" slidesubmission_id=s.pk num=s.session.meeting.number %}">
-                            {{ s.submitter }} - {{ s.title }} ({{ s.time }})
-                        </a>
-                    </p>
-                {% else %}
-                    <p>
-                        {{ s.title }} ({{ s.time }})
-                    </p>
-                {% endif %}
-            {% endfor %}
+        <div class="proposedslidelist">{% endif %}
+            {% if can_manage_materials %}
+                <p>
+                    <a href="{% url "ietf.meeting.views.approve_proposed_slides" slidesubmission_id=s.pk num=s.session.meeting.number %}">
+                        {{ s.submitter }} - {{ s.title }} ({{ s.time }})
+                    </a>
+                </p>
+            {% else %}
+                <p>
+                    {{ s.title }} ({{ s.time }})
+                </p>
+            {% endif %}
+        {% if forloop.last %}</div>{% endif %}
+    {% endfor %}
+    {% if user|has_role:"Secretariat" %}
+        <div class="card text-dark bg-warning mt-5 mb-3">
+            <div class="card-header">
+                Secretariat Only
+            </div>
+            <div class="card-body">
+                <form method="post"
+                      action="{% url 'ietf.meeting.views.notify_meetecho_of_all_slides' num=meeting.number acronym=group.acronym %}">
+                    {% csrf_token %}
+                    <button class="btn btn-primary" type="submit">
+                        Notify Meetecho of Slides
+                    </button>
+                </form>
+            </div>
         </div>
     {% endif %}
+    {% comment %}
+    The existence of an element with id canManageMaterialsFlag is checked in
+    session_details.js to determine whether it should init the sortable tables.
+    Not the most elegant approach, but it works.
+    {% endcomment %}
+    {% if can_manage_materials %} <div id="can-manage-materials-flag"></div>{% endif %}
 {% endblock %}
 {% block js %}
+    <script src="{% static 'ietf/js/list.js' %}"></script>
+    <script src="{% static 'ietf/js/moment.js' %}"></script>
+    <script src="{% static 'ietf/js/upcoming.js' %}"></script>
+    <script src="{% static 'ietf/js/timezone.js' %}"></script>
     {% if can_manage_materials %}
         <script src="{% static 'ietf/js/sortable.js' %}"></script>
-        <script>
-            var sortables=[];
-            var options = {
-                group: "slides",
-                animation: 150,
-                onAdd: function(event) {onAdd(event)},
-                onRemove: function(event) {onRemove(event)},
-                onEnd: function(event) {onEnd(event)}
-            };
-
-            function onAdd(event) {
-                var old_session = event.from.getAttribute("data-session");
-                var new_session = event.to.getAttribute("data-session");
-                $.post(event.to.getAttribute("data-add-to-session"), {
-                    'order': event.newIndex + 1,
-                    'name': event.item.getAttribute("name")
-                });
-                $(event.item).find("td:eq(1)").find("a").each(function(){
-                    $(this).attr("href", $(this).attr("href").replace(old_session,new_session) );
-                });
-            }
-
-            function onRemove(event) {
-                var old_session = event.from.getAttribute("data-session");
-                $.post(event.from.getAttribute("data-remove-from-session"),{
-                    'oldIndex': event.oldIndex + 1,
-                    'name': event.item.getAttribute("name")
-                });
-            }
-
-            function onEnd(event) {
-                if (event.to == event.from) {
-                    $.post(event.from.getAttribute("data-reorder-in-session"),{
-                        'oldIndex': event.oldIndex + 1,
-                        'newIndex': event.newIndex + 1
-                    });
-                }
-            }
-
-            $(document).ready(function() {
-
-                $(".slides tbody").each(function() {
-                    sortables.push(Sortable.create(this, options));
-                });
-
-            });
-
-        </script>
     {% endif %}
+    <script src="{% static 'ietf/js/session_details.js' %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_details_form.html b/ietf/templates/meeting/session_details_form.html
index 321305f497..9cd1b6e85c 100644
--- a/ietf/templates/meeting/session_details_form.html
+++ b/ietf/templates/meeting/session_details_form.html
@@ -1,34 +1,48 @@
-{# Copyright The IETF Trust 2007-2020, All Rights Reserved #}
+{# Copyright The IETF Trust 2007-2025, All Rights Reserved #}
+{% load django_bootstrap5 %}
+
 <div class="session-details-form my-3" data-prefix="{{ form.prefix }}">
     {% if hidden %}
         {{ form.name.as_hidden }}{{ form.purpose.as_hidden }}{{ form.type.as_hidden }}{{ form.requested_duration.as_hidden }}
+        {{ form.has_onsite_tool.as_hidden }}
     {% else %}
-    <table>
-        <tbody>
         {% comment %}
         The form-group class is used by session_details_form.js to identify the correct element
         to hide the name / purpose / type fields when not needed. This is a bootstrap class - the
         secr app does not use it, so this (and the hidden class, also needed by session_details_form.js)
         are defined in edit.html and new.html as a kludge to make this work.
         {% endcomment %}
-      <tr class="form-group">
-                <th scope="row">{{ form.name.label_tag }}</th>
-                <td>{{ form.name }}{{ form.purpose.errors }}</td>
-            </tr>
-      <tr class="form-group">
-                <th scope="row">{{ form.purpose.label_tag }}</th>
-                <td>
-            {{ form.purpose }} <div class="form-group">{{ form.type }}</div>
-                    {{ form.purpose.errors }}{{ form.type.errors }}
-                </td>
-            </tr>
-            <tr>
-                <th scope="row">{{ form.requested_duration.label_tag }}</th>
-                <td>{{ form.requested_duration }}{{ form.requested_duration.errors }}</td>
-            </tr>
-            </tbody>
-        </table>
+
+        <div class="form-group">
+            {% bootstrap_field form.name layout="horizontal" %}
+        </div>
+
+        <div class="form-group">
+            <div class="row mb-3 g-3">
+                <label class="col-md-2 fw-bold col-form-label" for="{{ form.purpose.id_for_label }}">Purpose</label>
+                <div class="col-md-5">{{ form.purpose }}</div>
+                <div class="col-md-5 form-group">{{ form.type }}</div>
+                {{ form.purpose.errors }}{{ form.type.errors }}
+            </div>
+        </div>
+
+        {% bootstrap_field form.requested_duration layout="horizontal" %}
+        {% if not hide_onsite_tool_prompt %}
+            {% bootstrap_field form.has_onsite_tool layout="horizontal" %}
+        {% endif %}
+        
+        {% if hide_onsite_tool_prompt %}
+            {{ form.has_onsite_tool.as_hidden }}
+        {% endif %}
     {% endif %}
-    {# hidden fields shown whether or not the whole form is hidden #}
-    {{ form.attendees.as_hidden }}{{ form.comments.as_hidden }}{{ form.id.as_hidden }}{{ form.on_agenda.as_hidden }}{{ form.DELETE.as_hidden }}
-</div>
\ No newline at end of file
+
+    {# hidden fields included whether or not the whole form is hidden #}
+    {{ form.attendees.as_hidden }}
+    {{ form.comments.as_hidden }}
+    {{ form.id.as_hidden }}
+    {{ form.on_agenda.as_hidden }}
+    {{ form.DELETE.as_hidden }}
+    {{ form.remote_instructions.as_hidden }}
+    {{ form.short.as_hidden }}
+    {{ form.agenda_note.as_hidden }}
+</div>
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index d481955d0d..7c52ac0b4a 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -1,29 +1,33 @@
 {% load origin ietf_filters textfilters tz dateformat %}
 {% origin %}
 {% for session in sessions %}
-    {% with item=session.official_timeslotassignment %}
-        <h3 class="mt-4" id="session_{{ session.pk }}">
-            {% if sessions|length > 1 %}Session {{ forloop.counter }} :{% endif %}
-            {% for time in session.times %}
-                {% if not forloop.first %},{% endif %}
-                {{ time|dateformat:"l Y-m-d H:i T" }}
-                {% if time.tzinfo.zone != "UTC" %}<span class="small">({{ time|utc|dateformat:"H:i T" }})</span>{% endif %}
-            {% endfor %}
-            {% if session.cancelled %}
-                <small class="badge rounded-pill bg-warning">Cancelled</small>
-            {% else %}
-                {{ session.status }}
+    {% with item=session.official_timeslotassignment %} {% with timeslot=item.timeslot %}
+        <div class="mt-4">
+            {% if not session.cancelled %}
+                <div class="regular ms-3 float-end">
+                    {# see note in the included templates re: show_agenda parameter and required JS import #}
+                    {% if meeting.type.slug == 'interim' %}
+                        {% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %}
+                    {% else %}
+                        {% include "meeting/session_buttons_include.html" with show_agenda=False item=session.official_timeslotassignment %}
+                    {% endif %}
+                </div>
             {% endif %}
-            {% if session.name %}: {{ session.name }}{% endif %}
-        </h3>
-        {% if not session.cancelled %}
-            <div class="regular float-end">
-                {# see note in the included templates re: show_agenda parameter and required JS import #}
-                {% if meeting.type.slug == 'interim' %}
-                    {% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %}
+            <h3 class="" id="session_{{ session.pk }}">
+                {% if sessions|length > 1 %}Session {{ forloop.counter }} :{% endif %}
+                {% for time in session.times %}
+                    {% if not forloop.first %},{% endif %}
+                    <span class="session-time date me-3" data-start-utc="{{ timeslot.time|utc|date:'Y-m-d H:i' }}" data-end-utc="{{ timeslot.end_time|utc|date:'Y-m-d H:i' }}"></span>
+                    {% include "meeting/tz-display.html" with meeting_timezone=session.meeting.time_zone id_suffix=session.pk minimal=True only %}
+                {% endfor %}
+                {% if session.cancelled %}
+                    <small class="badge rounded-pill text-bg-warning">Cancelled</small>
+                {% else %}
+                    {{ session.status }}
                 {% endif %}
-            </div>
-        {% endif %}
+                {% if session.name %}: {{ session.name }}{% endif %}
+            </h3>
+        </div>
         {% if session.agenda_note %}<h3 class="mt-4">{{ session.agenda_note }}</h3>{% endif %}
         {% if can_manage_materials %}
             {% if session.current_status == 'sched' or session.current_status == 'schedw' %}
@@ -58,7 +62,7 @@ <h3 class="mt-4" id="session_{{ session.pk }}">
         {% endif %}
         <h3 class="mt-4">Agenda, Minutes, and Bluesheets</h3>
         <table class="table table-sm table-striped">
-            {% if session.filtered_artifacts %}
+            {% if session.filtered_artifacts or session.bluesheet_title %}
                 <tbody>
                     {% for pres in session.filtered_artifacts %}
                         <tr>
@@ -66,11 +70,11 @@ <h3 class="mt-4">Agenda, Minutes, and Bluesheets</h3>
                             <td>
                                 <a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
                                 <a href="{{ url }}">({{ pres.document.name }})</a>
-                            </td>
-                            <td class="text-end">
                                 {% if user|has_role:"Secretariat" or can_manage_materials %}
                                     {% if pres.document.type.slug == 'minutes' %}
                                         {% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number as upload_url %}
+                                    {% elif pres.document.type.slug == 'narrativeminutes' %}
+                                        {% url 'ietf.meeting.views.upload_session_narrativeminutes' session_id=session.pk num=session.meeting.number as upload_url %}
                                     {% elif pres.document.type.slug == 'agenda' %}
                                         {% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number as upload_url %}
                                     {% else %}
@@ -78,14 +82,22 @@ <h3 class="mt-4">Agenda, Minutes, and Bluesheets</h3>
                                     {% endif %}
                                     {% if pres.document.type.slug != 'bluesheets' or user|has_role:"Secretariat" or meeting.type.slug == 'interim' and can_manage_materials %}
                                         {% if pres.document.type.slug == 'minutes' %}
-                                            <a class="btn btn-primary btn-sm" href="{% url 'ietf.meeting.views.import_session_minutes' num=session.meeting.number session_id=session.pk %}">Import from notes.ietf.org</a>
+                                            <a class="btn btn-primary btn-sm float-end ms-1" href="{% url 'ietf.meeting.views.import_session_minutes' num=session.meeting.number session_id=session.pk %}">Import from notes.ietf.org</a>
                                         {% endif %}
-                                        <a class="btn btn-primary btn-sm" href="{{ upload_url }}">Upload revision</a>
+                                        <a class="btn btn-primary btn-sm float-end ms-1" href="{{ upload_url }}">Upload revision</a>
                                     {% endif %}
+
                                 {% endif %}
                             </td>
                         </tr>
                     {% endfor %}
+                    {% if session.bluesheet_title %}
+                        <tr><td>
+                            <a href="{% url 'ietf.meeting.views.session_attendance' session_id=session.pk num=session.meeting.number %}">
+                                {{ session.bluesheet_title }}
+                            </a>
+                        </td></tr>
+                    {% endif %}
                 </tbody>
             {% endif %}
         </table>
@@ -97,12 +109,18 @@ <h3 class="mt-4">Agenda, Minutes, and Bluesheets</h3>
                 </a>
             {% endif %}
             {% if not session.type_counter.minutes %}
-                <a class="btn btn-primary" href="{% url 'ietf.meeting.views.import_session_minutes' num=session.meeting.number session_id=session.pk %}">Import minutes from notes.ietf.org</a>
+                <a class="btn {% if future %}btn-warning" title="Session has not ended yet{% else %}btn-primary{% endif %}" href="{% url 'ietf.meeting.views.import_session_minutes' num=session.meeting.number session_id=session.pk %}">Import minutes from notes.ietf.org</a>
                 <a class="btn btn-primary"
                    href="{% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number %}">
                     Upload minutes
                 </a>
             {% endif %}
+            {% if not session.type_counter.narrativeminutes and session.group.acronym == "iesg" %}
+                <a class="btn btn-primary"
+                href="{% url 'ietf.meeting.views.upload_session_narrativeminutes' session_id=session.pk num=session.meeting.number %}">
+                    Upload narrative minutes
+                </a>
+        {% endif %}           
         {% endif %}
         {% if user|has_role:"Secretariat" and not session.type_counter.bluesheets or meeting.type.slug == 'interim' and can_manage_materials and not session.type_counter.bluesheets %}
             <a class="btn btn-primary"
@@ -119,8 +137,8 @@ <h3 class="mt-4">Chatlog and polls</h3>
                             <tr data-name="{{ pres.document.name }}">
                                 {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
                                 <td>
-                                    <a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
-                                    <a href="{{ url }}">({{ pres.document.name }})</a>
+                                    <a href="{{ url }}">{{ pres.document.title }}</a>
+                                    <a href="{{ pres.document.get_href }}">( as json )</a>
                                 </td>
                             </tr>
                         {% endfor %}
@@ -136,24 +154,26 @@ <h3 class="mt-4">Slides</h3>
                        data-remove-from-session="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}"
                        data-reorder-in-session="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
                     {% for pres in session.filtered_slides %}
-                        <tr data-name="{{ pres.document.name }}" title="Drag to reorder.">
+                        <tr data-name="{{ pres.document.name }}" {% if can_manage_materials %} class="draggable" {% endif %}>
                             {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
-                            <td><i class="bi bi-grip-vertical"></i></td>
+                            {% if can_manage_materials %}
+                                <td>
+                                    <i class="bi bi-grip-vertical drag-handle" title="Drag to reorder"></i>
+                                </td>
+                            {% endif %}
                             <td>
-                                <a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
-                                <a href="{{ url }}">({{ pres.document.name }})</a>
-                            </td>
-                            <td class="text-end">
                                 {% if can_manage_materials %}
-                                    <a class="btn btn-primary btn-sm"
+                                    <a class="btn btn-primary btn-sm float-end ms-1"
                                        href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
                                         Upload revision
                                     </a>
-                                    <a class="btn btn-danger btn-sm"
+                                    <a class="btn btn-danger btn-sm float-end ms-1"
                                        href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
                                         Remove
                                     </a>
                                 {% endif %}
+                                <a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
+                                <a href="{{ url }}">({{ pres.document.name }})</a>
                             </td>
                         </tr>
                     {% endfor %}
@@ -167,13 +187,13 @@ <h3 class="mt-4">Slides</h3>
             </a>
         {% elif request.user.is_authenticated and not session.is_material_submission_cutoff %}
             <a class="btn btn-primary proposeslides"
-               href="{% url 'ietf.meeting.views.propose_session_slides' session_id=session.pk num=session.meeting.number %}">
+               href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number %}">
                 Propose slides
             </a>
         {% endif %}
 
     {% if can_manage_materials %}<div class="form-text">Drag-and-drop to reorder slides</div>{% endif %}
-    <h3 class="mt-4">Drafts</h3>
+    <h3 class="mt-4">Internet-Drafts</h3>
     <table class="table table-sm table-striped">
         {% if session.filtered_drafts %}
             <tbody>
@@ -202,8 +222,159 @@ <h3 class="mt-4">Drafts</h3>
     {% if can_manage_materials %}
         <a class="btn btn-primary"
            href="{% url 'ietf.meeting.views.add_session_drafts' session_id=session.pk num=session.meeting.number %}">
-            Link additional drafts to session
+            Link additional I-Ds to session
+        </a>
+    {% endif %}
+    {% if timezone_now < timeslot.end_time %}{# show meeting tools until the session ends #}
+        <h3 class="mt-4">Meeting tools</h3>
+        <table class="table table-sm table-striped meeting-tools"
+               id="meeting_tools_{{ session.pk }}">
+            <tbody>
+            {% if meeting.uses_notes %}
+                <tr>
+                    <td>
+                        <a href="{{ session.notes_url }}">
+                            <i class="bi bi-journal-text"></i> Notepad for note-takers
+                        </a>
+                    </td>
+                </tr>
+            {% endif %}
+            {# chat #}
+            <tr>
+                <td>
+                    <a href="{{ session.chat_room_url }}">
+                        <i class="bi bi-chat"></i> Chat room
+                    </a>
+                </td>
+            </tr>
+            {# Video stream (meetecho) #}
+            {% if session.video_stream_url and timezone_now < timeslot.end_time %}
+                <tr>
+                    <td>
+                        <a href="{{ session.video_stream_url }}">
+                            <i class="bi bi-camera-video"></i> Video stream
+                        </a>
+                    </td>
+                </tr>
+            {% endif %}
+            {# Onsite tool (meetecho_onsite) #}
+            {% if session.onsite_tool_url %}
+                <tr>
+                    <td>
+                        <a href="{{ session.onsite_tool_url }}">
+                            <i class="bi bi-phone"></i> Onsite tool
+                        </a>
+                    </td>
+                </tr>
+            {% endif %}
+            {# Audio stream #}
+            {% if session.audio_stream_url %}
+                <tr>
+                    <td>
+                        <a href="{{ session.audio_stream_url }}">
+                            <i class="bi bi-headphones"></i> Audio stream
+                        </a>
+                    </td>
+                </tr>
+            {% endif %}
+            {# Remote call-in #}
+            {% if session.agenda_note|first_url|conference_url %}
+                <tr>
+                    <td>
+                        <a href="{{ session.agenda_note|first_url }}">
+                            <i class="bi bi-people"></i> Online conference
+                        </a>
+                    </td>
+                </tr>
+            {% elif session.remote_instructions|first_url|conference_url %}
+                <tr>
+                    <td>
+                        <a href="{{ session.remote_instructions|first_url }}">
+                            <i class="bi bi-people"></i> Online conference
+                        </a>
+                    </td>
+                </tr>
+            {% elif timeslot.location.webex_url %}
+                <tr>
+                    <td>
+                        <a href="{{ timeslot.location.webex_url|format:session }}">
+                            <i class="bi bi-people"></i> Webex session
+                        </a>
+                    </td>
+                </tr>
+            {% endif %}
+            </tbody>
+        </table>
+    {% else %}{# session is in the past #}
+        <h3 class="mt-4">Notes and recordings</h3>
+        <table class="table table-sm table-striped meeting-tools"
+               id="notes_and_recordings_{{ session.pk }}">
+            <tbody>
+            {% if meeting.uses_notes %}
+                <tr>
+                    <td>
+                        <a href="{{ session.notes_url }}">
+                            <i class="bi bi-journal-text"></i> Notepad for note-takers
+                        </a>
+                    </td>
+                </tr>
+            {% endif %}
+            {# Recordings #}
+            {% with session.recordings as recordings %}
+                {% if recordings %}
+                    {# There's no guaranteed order, so this is a bit messy: #}
+                    {# First, the audio recordings, if any #}
+                    {% for r in recordings %}
+                        {% if r.get_href and 'audio' in r.get_href %}
+                            <tr>
+                                <td>
+                                    <a href="{{ r.get_href }}"><i class="bi bi-file-play"></i> {{ r.title }}</a>
+                                </td>
+                            </tr>
+                        {% endif %}
+                    {% endfor %}
+                    {# Then the youtube recordings #}
+                    {% for r in recordings %}
+                        {% if r.get_href and 'youtu' in r.get_href %}
+                            <tr>
+                                <td>
+                                    <a href="{{ r.get_href }}"><i class="bi bi-file-slides"></i> {{ r.title }}</a>
+                                </td>
+                            </tr>
+                        {% endif %}
+                    {% endfor %}
+                    {# Finally, any other recordings #}
+                    {% for r in recordings %}
+                        {% if r.get_href and not 'audio' in r.get_href and not 'youtu' in r.get_href %}
+                            <tr>
+                                <td>
+                                    <a href="{{ r.get_href }}"><i class="bi bi-file-play"></i> {{ r.title }}</a>
+                                </td>
+                            </tr>
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
+            {% endwith %}
+            {% if session.session_recording_url %}
+                <tr>
+                    <td>
+                        <a href="{{ session.session_recording_url }}">
+                            <i class="bi bi-file-slides"></i>
+                            Meetecho session recording
+                        </a>
+                    </td>
+                </tr>
+            {% endif %}
+            </tbody>
+        </table>
+    {% endif %}
+
+    {% if can_manage_materials %}
+        <a class="btn btn-primary"
+            href="{% url 'ietf.meeting.views.add_session_recordings' session_id=session.pk num=session.meeting.number %}">
+            Link additional recordings to session
         </a>
     {% endif %}
-{% endwith %}
+
+{% endwith %}{% endwith %}
 {% endfor %}
diff --git a/ietf/templates/meeting/session_materials.html b/ietf/templates/meeting/session_materials.html
index 198bb1140b..40d02fb63b 100644
--- a/ietf/templates/meeting/session_materials.html
+++ b/ietf/templates/meeting/session_materials.html
@@ -18,10 +18,10 @@
             <h4 class="mt-4">Agenda</h4>
             <div class="agenda-frame" data-src="{{ agenda.get_href }}"></div>
         {% else %}
-            <span class="badge rounded-pill bg-info">Agenda submitted as {{ agenda.file_extension|upper }}</span>
+            <span class="badge rounded-pill text-bg-info">Agenda submitted as {{ agenda.file_extension|upper }}</span>
         {% endif %}
     {% else %}
-        <span class="badge rounded-pill bg-warning">No agenda submitted</span>
+        <span class="badge rounded-pill text-bg-warning">No agenda submitted</span>
     {% endif %}
 {% endwith %}
 {% if item.session.slides %}
@@ -41,10 +41,10 @@ <h4 class="mt-4">Slides</h4>
             <h4 class="mt-4">Minutes</h4>
             <div class="minutes-frame" data-src="{{ minutes.get_href }}"></div>
         {% else %}
-            <span class="badge rounded-pill bg-info">Minutes submitted as {{ minutes.file_extension|upper }}</span>
+            <span class="badge rounded-pill text-bg-info">Minutes submitted as {{ minutes.file_extension|upper }}</span>
         {% endif %}
     {% else %}
-        <span class="badge rounded-pill bg-warning">No minutes submitted</span>
+        <span class="badge rounded-pill text-bg-warning">No minutes submitted</span>
     {% endif %}
 {% endwith %}
     </body>
diff --git a/ietf/templates/meeting/session_not_meeting_notification.txt b/ietf/templates/meeting/session_not_meeting_notification.txt
new file mode 100644
index 0000000000..0e5c940708
--- /dev/null
+++ b/ietf/templates/meeting/session_not_meeting_notification.txt
@@ -0,0 +1,8 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load ams_filters %}
+
+{{ login|smart_login }} {{ group.acronym }} working group, indicated that the {{ group.acronym }} working group does not plan to hold a session at IETF {{ meeting.number }}.
+
+This message was generated and sent by the IETF Meeting Session Request Tool.
+
+
diff --git a/ietf/templates/meeting/session_request_confirm.html b/ietf/templates/meeting/session_request_confirm.html
new file mode 100644
index 0000000000..09043d3d0c
--- /dev/null
+++ b/ietf/templates/meeting/session_request_confirm.html
@@ -0,0 +1,38 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static ietf_filters django_bootstrap5 %}
+{% block title %}Confirm Session Request{% endblock %}
+    
+{% block content %}
+    <h1 class="">Confirm Session Request - IETF {{ meeting.number }}</h1>
+
+    <div class="d-flex mb-3">
+      <a href="https://www.ietf.org/chairs/session-request-tool-instructions/" class="me-3 btn btn-primary" target="_blank">Instructions</a>
+    </div>
+
+    <hr>
+
+    <div class="custom-stripe">
+
+        {% include "meeting/session_request_view_table.html" %}
+
+        <form action="{% url 'ietf.meeting.views_session_request.confirm' acronym=group.acronym %}" method="post">
+            {% csrf_token %}
+            {{ form }}
+            {{ form.session_forms.management_form }}
+            {% for sf in form.session_forms %}
+                {% include 'meeting/session_details_form.html' with form=sf hidden=True only %}
+            {% endfor %}
+
+            <button class="btn btn-primary" type="submit" name="submit" value="Submit">Submit</button>
+            <button class="btn btn-secondary float-end" type="submit" name="submit" value="Cancel">Cancel</button>
+
+        </form>
+
+    </div> <!-- view-container -->
+
+{% endblock %}
+
+{% block js %}
+    <script src="{% static 'ietf/js/custom_striped.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_request_form.html b/ietf/templates/meeting/session_request_form.html
new file mode 100644
index 0000000000..ecf5cb7268
--- /dev/null
+++ b/ietf/templates/meeting/session_request_form.html
@@ -0,0 +1,206 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static ietf_filters django_bootstrap5 %}
+{% block title %}{% if is_create %}New {% else %}Edit {% endif %}Session Request{% endblock %}
+{% block morecss %}{{ block.super }}
+  .hidden {display: none !important;}
+  div.form-group {display: inline;}
+{% endblock %}
+{% block content %}
+    <h1>{% if is_create %}New {% else %}Edit {% endif %}Session Request</h1>
+
+    {% if is_create %}
+    <div class="buttonlist mb-3">
+        <a class="btn btn-primary me-3"
+           onclick="if (window.confirm('A message will be sent to agenda@ietf.com as well as to the area director(s).\n\nContinue?')) { window.location='{% url "ietf.meeting.views_session_request.no_session" acronym=group.acronym %}'};"
+           href="{% url 'ietf.meeting.views_session_request.no_session' acronym=group.acronym %}">Send a notification that the group does not plan to hold a session at IETF {{ meeting.number }}</a>
+        <a class="btn btn-primary"
+           href="{% url 'ietf.meeting.views_session_request.new_request' acronym=group.acronym %}?previous">Retrieve all information from previous meeting</a>
+    </div>
+    {% endif %}
+
+    <hr>
+
+    <form id="session-request-form" action="." method="post" name="form_post">
+        {% csrf_token %}
+        {{ form.session_forms.management_form }}
+        {% if form.non_field_errors %}
+            <div class="my-3 alert alert-danger">{{ form.non_field_errors }}</div>
+        {% endif %}
+
+        <div class="row mb-3">
+            <label class="col-md-2 fw-bold col-form-label" for="id_group_name">Working Group Name</label>
+            <div class="col-md-10">
+                <input type="text" class="form-control" value="{{ group.name }} ({{ group.acronym }})" id="id_group_name" disabled>
+            </div>
+        </div>
+
+        <div class="row mb-3">
+            <label class="col-md-2 fw-bold col-form-label" for="id_area_name">Area Name</label>
+            <div class="col-md-10">
+                <input type="text" class="form-control" value="{% if group.parent %}{{ group.parent.name }} ({{ group.parent.acronym }}){% endif %}" id="id_area_name" disabled>
+            </div>
+        </div>
+
+        {% bootstrap_field form.num_session layout="horizontal" %}
+
+        {% if group.features.acts_like_wg %}
+
+            <div class="row mb-3" id="session_row_0">
+                <div class="col-md-2 fw-bold col-form-label">Session 1</div>
+                <div class="col-md-10">
+                    {% include 'meeting/session_details_form.html' with form=form.session_forms.0 hide_onsite_tool_prompt=True only %}
+                </div>
+            </div>
+
+            <div class="row mb-3" id="session_row_1">
+                <div class="col-md-2 fw-bold col-form-label">Session 2</div>
+                <div class="col-md-10">
+                    {% include 'meeting/session_details_form.html' with form=form.session_forms.1 hide_onsite_tool_prompt=True only %}
+                </div>
+            </div>
+
+            {% if not is_virtual %}
+                {% bootstrap_field form.session_time_relation layout="horizontal" %}
+            {% endif %}
+
+            <div class="row mb-3" id="third_session_row">
+                <div class="col-md-2 fw-bold col-form-label">Additional Session Request</div>
+                <div class="col-md-10">
+                    <div class="form-check">
+                        {{ form.third_session }}
+                        <label class="form-check-label" for="id_third_session">Check this box to request an additional session</label>
+                        <div id="id_third_session_helptext" class="form-text">Additional slot may be available after agenda scheduling has closed and with the approval of an Area Director.</div>
+                    </div>
+                    
+                </div>
+            </div>
+
+            <div class="row mb-3" id="session_row_2">
+                <div class="col-md-2 fw-bold col-form-label">Third session request</div>
+                <div class="col-md-10">
+                    {% include 'meeting/session_details_form.html' with form=form.session_forms.2 hide_onsite_tool_prompt=True only %}
+                </div>
+            </div>
+
+        {% else %}{# else not group.features.acts_like_wg #}
+            {% for session_form in form.session_forms %}
+            <div class="row mb-3" id="session_row_{{ forloop.counter0 }}">
+                <div class="col-md-2 fw-bold col-form-label">Session {{ forloop.counter }}</div>
+                <div class="col-md-10">
+                    {% include 'meeting/session_details_form.html' with form=session_form only %}
+                </div>
+            </div>
+            {% endfor %}
+        {% endif %}
+
+        {% bootstrap_field form.attendees layout="horizontal" %}
+
+        {% bootstrap_field form.bethere layout="horizontal" %}
+
+        <div class="row mb-3">
+            <div class="col-md-2 fw-bold col-form-label">Conflicts to avoid</div>
+            <div class="col-md-10">
+                <div class="row mb-3">
+                    <div class="col-md-2">Other WGs that included <strong>{{ group.acronym }}</strong> in their conflict lists</div>
+                    <div class="col-md-8">{{ session_conflicts.inbound|default:"None" }}</div>
+                </div>
+                <div class="row mb-3">
+                    <div class="col-md-2">WG Sessions<br>You may select multiple WGs within each category</div>
+                    <div class="col-md">
+                        {% for cname, cfield, cselector  in form.wg_constraint_fields %}
+                        <div class="row mb-2">
+                            <div class="col-md-2"><label for="id_wg_selector_{{ cname.slug }}">{{ cname|title }}</label></div>
+                            <div class="col">
+                                <div class="row g-3 mb-1">
+                                    <div class="col">
+                                        {{ cselector }}
+                                    </div>
+                                    <div class="col">
+                                        <button type="button" class="btn btn-primary wg_constraint_delete" id="wg_delete_{{ cname.slug }}" data-constraint_name="{{ cname.slug }}">Delete the last entry</button>
+                                    </div>
+                                </div>
+                                <div class="row g-3">
+                                    <div class="col">
+                                        {{ cfield.errors }}{{ cfield }}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        {% empty %}{# shown if there are no constraint fields #}
+                            <div class="col-md-1"></div>
+                            <div class="col-md">No constraints are enabled for this meeting.</div>
+                        {% endfor %}
+                    </div>
+                </div>
+                
+                {% if form.inactive_wg_constraint_count %}
+                <div class="row mb-3">
+                    <div class="col-md-2">Disabled for this meeting</div>
+                    <div class="col">
+                        {% for cname, value, field in form.inactive_wg_constraints %}
+                        <div class="row mb2">
+                            <div class="col-md-2">{{ cname|title }}</div>
+                            <div class="col">
+                                <div class="row">
+                                    <div class="col">
+                                        <input type="text" value="{{ value }}" maxlength="255" class="wg_constraint form-control" aria-label="constraint target" disabled>
+                                    </div>
+                                    <div class="col form-check">
+                                        <input type="checkbox" name="{{ field.name }}" id="{{ field.id_for_label }}" class="form-check-input">
+                                        <label class="form-check-label" for="{{ field.id_for_label }}">Delete this conflict</label>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        {% endfor %}
+                    </div>
+                </div>
+                {% endif %}
+
+                <div class="row mb-3">
+                    <div class="col-md-2">BOF Sessions</div>
+                    <div class="col">If the sessions can not be found in the fields above, please enter free form requests in the Special Requests field below.</div>
+                </div>
+            </div>
+        </div>
+
+        {% if not is_virtual %}
+
+            {% bootstrap_field form.resources layout="horizontal" %}
+
+            {% bootstrap_field form.timeranges layout="horizontal" %}
+
+            {% bootstrap_field form.adjacent_with_wg layout="horizontal" %}
+
+            <div class="row mb-3">
+                <div class="col-md-2 fw-bold col-form-label">Joint session with: (To request one session for multiple WGs together)</div>
+                <div class="col-md-10">To request a joint session with another group, please contact the secretariat.</div>
+            </div>
+
+        {% endif %}
+
+        {% bootstrap_field form.comments layout="horizontal" %}
+
+        {% if form.notifications_optional %}
+        <div class="row mb-3">
+            <label class="col-md-2 fw-bold col-form-label" for="id_send_notifications">Notifications</label>
+            <div class="col">
+                <div class="form-check">
+                    <input type="checkbox" name="send_notifications" class="form-check-input" id="id_send_notifications">
+                    <label class="form-check-label" for="id_send_notifications">Send notification emails?</label>
+                </div>
+            </div>
+        </div>
+        {% endif %}
+        
+        <button type="submit" class="btn btn-primary" name="submit" value="Save"{% if is_locked %} disabled{% endif %}>Save</button>
+        <a class="btn btn-secondary float-end"
+               href="{% url 'ietf.meeting.views_session_request.list_view' %}">Cancel</a>
+    </form>
+
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/session_request.js' %}"></script>
+    {{ form.media }}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_request_info.txt b/ietf/templates/meeting/session_request_info.txt
new file mode 100644
index 0000000000..2e96efb31f
--- /dev/null
+++ b/ietf/templates/meeting/session_request_info.txt
@@ -0,0 +1,26 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load ams_filters %}
+---------------------------------------------------------
+Working Group Name: {{ group.name }}
+Area Name: {{ group.parent }}
+Session Requester: {{ login }}
+{% if session.joint_with_groups %}{{ session.joint_for_session_display }} joint with: {{ session.joint_with_groups }}{% endif %}
+
+Number of Sessions: {{ session.num_session }}
+Length of Session(s): {% for session_length in session_lengths %}{{ session_length.total_seconds|display_duration }}{% if not forloop.last %}, {% endif %}{% endfor %}
+Number of Attendees: {{ session.attendees }}
+Conflicts to Avoid: 
+{% for line in session.outbound_conflicts %} {{line}}
+{% endfor %}{% if session.session_time_relation_display %} {{ session.session_time_relation_display }}{% endif %}
+{% if session.adjacent_with_wg %} Adjacent with WG: {{ session.adjacent_with_wg }}{% endif %}       
+{% if session.timeranges_display %} Can't meet: {{ session.timeranges_display|join:", " }}{% endif %}
+
+Participants who must be present:
+{% for person in session.bethere %}  {{ person.ascii_name }}
+{% endfor %}
+Resources Requested:
+{% for resource in session.resources %}  {{ resource.desc }}
+{% endfor %}
+Special Requests:
+  {{ session.comments }}
+---------------------------------------------------------
diff --git a/ietf/templates/meeting/session_request_list.html b/ietf/templates/meeting/session_request_list.html
new file mode 100644
index 0000000000..789b7006e5
--- /dev/null
+++ b/ietf/templates/meeting/session_request_list.html
@@ -0,0 +1,65 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static %}
+{% load ietf_filters %}
+{% load django_bootstrap5 %}
+{% block title %}Session Requests{% endblock %}
+{% block content %}
+    <h1>Session Requests IETF {{ meeting.number }}</h1>
+
+    <div class="d-flex mb-3">
+      <a href="https://www.ietf.org/chairs/session-request-tool-instructions/" class="btn btn-primary me-3" target="_blank">Instructions</a>
+
+      <a href="{% url 'ietf.meeting.views.meeting_requests' %}" class="btn btn-primary me-3">View list of timeslot requests</a>
+      {% if user|has_role:"Secretariat" %}
+        {% if is_locked %}
+          <a href="{% url 'ietf.meeting.views_session_request.status' %}" class="btn btn-danger ms-auto">Unlock Tool</a>
+        {% else %}
+          <a href="{% url 'ietf.meeting.views_session_request.status' %}" class="btn btn-primary ms-auto">Lock Tool</a>
+        {% endif %}
+      {% endif %}
+    </div>
+    
+    <div class="card mb-3">
+      <div class="card-header">
+        Request New Session
+      </div>
+      <div class="card-body">
+        <p class="card-text">The list below includes those working groups that you currently chair which do not already have a session scheduled. You can click on an acronym to complete a request for a new session at the upcoming IETF meeting.  Click "Group will not meet" to send a notification that the group does not plan to meet.</p>
+        <ul>
+            {% for group in unscheduled_groups %}
+                <li>
+                    <a href="{% url 'ietf.meeting.views_session_request.new_request' acronym=group.acronym %}">{{ group.acronym }}</a>
+                    {% if group.not_meeting %}
+                        <span class="required"> (Currently, this group does not plan to hold a session at IETF {{ meeting.number }})</span>
+                    {% endif %}
+                </li>
+            {% empty %}
+                <li><i>NONE</i></li>
+            {% endfor %}
+        </ul>
+      </div>
+    </div> <!-- card -->
+
+
+    <div class="card">
+      <div class="card-header">
+        Edit / Cancel Previously Requested Sessions
+      </div>
+      <div class="card-body">
+        <p class="card-text">The list below includes those working groups for which you or your co-chair has requested sessions at the upcoming IETF meeting. You can click on an acronym to initiate changes to a session, or cancel a session.</p>
+        <ul>
+            {% for group in scheduled_groups %}
+                <li><a href="{% url 'ietf.meeting.views_session_request.view_request' acronym=group.acronym %}">{{ group.acronym }} - {{ group.status_message }}</a></li>
+            {% empty %}
+                <li><i>NONE</i></li>
+            {% endfor %}
+        </ul>
+      </div>
+    </div> <!-- card -->
+
+{% endblock %}
+
+{% block footer-extras %}
+    {% include "includes/sessions_footer.html" %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_request_locked.html b/ietf/templates/meeting/session_request_locked.html
new file mode 100644
index 0000000000..15c023ce33
--- /dev/null
+++ b/ietf/templates/meeting/session_request_locked.html
@@ -0,0 +1,21 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static ietf_filters django_bootstrap5 %}
+{% block title %}Session Request{% endblock %}
+    
+{% block content %}
+    <h1 class="">Session Request - IETF {{ meeting.number }}</h1>
+
+    <a href="{% url 'ietf.meeting.views.meeting_requests' %}" class="btn btn-primary">View list of timeslot requests</a>
+
+    <hr>
+
+    <div class="">
+        <p>{{ message }}</p>
+
+        <div>
+            <button class="btn btn-primary" type="button" onclick="history.back()">Back</button>
+        </div>
+    </div> 
+
+{% endblock %}
diff --git a/ietf/templates/meeting/session_request_notification.txt b/ietf/templates/meeting/session_request_notification.txt
new file mode 100644
index 0000000000..49dbbfc42c
--- /dev/null
+++ b/ietf/templates/meeting/session_request_notification.txt
@@ -0,0 +1,6 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% autoescape off %}{% load ams_filters %}
+
+{% filter wordwrap:78 %}{{ header }} meeting session request has just been submitted by {{ requester }}.{% endfilter %}
+
+{% include "meeting/session_request_info.txt" %}{% endautoescape %}
diff --git a/ietf/templates/meeting/session_request_status.html b/ietf/templates/meeting/session_request_status.html
new file mode 100644
index 0000000000..65e98d6d23
--- /dev/null
+++ b/ietf/templates/meeting/session_request_status.html
@@ -0,0 +1,28 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static %}
+{% load ietf_filters %}
+{% load django_bootstrap5 %}
+{% block title %}Session Request Status{% endblock %}
+{% block content %}
+    <h1>Session Request Status</h1>
+
+    <div class="card">
+      <div class="card-header">
+        Session Request Status
+      </div>
+      <div class="card-body">
+        <p class="card-text">Enter the message that you would like displayed to the WG Chair when this tool is locked.</p>
+        <form method="post">{% csrf_token %}
+            {% bootstrap_form form %}
+            {% if is_locked %}
+                <button class="btn btn-primary" type="submit" name="submit" value="Unlock">Unlock</button>
+            {% else %}
+                <button class="btn btn-primary" type="submit" name="submit" value="Lock">Lock</button>
+            {% endif %}
+            <button class="btn btn-primary ms-auto" type="submit" name="submit" value="Back">Back</button>
+        </form>
+      </div>
+    </div>
+
+{% endblock %}
diff --git a/ietf/templates/meeting/session_request_view.html b/ietf/templates/meeting/session_request_view.html
new file mode 100644
index 0000000000..3db16f56cb
--- /dev/null
+++ b/ietf/templates/meeting/session_request_view.html
@@ -0,0 +1,59 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static ietf_filters django_bootstrap5 %}
+{% block title %}Session Request{% endblock %}
+    
+{% block content %}
+    <h1 class="">Session Request - IETF {{ meeting.number }}</h1>
+
+    <div class="d-flex mb-3">
+      <a href="https://www.ietf.org/chairs/session-request-tool-instructions/" class="me-3 btn btn-primary" target="_blank">Instructions</a>
+    </div>
+
+    <hr>
+
+    <div class="custom-stripe">
+
+        {% include "meeting/session_request_view_table.html" %}
+
+        <hr>
+
+        <h2>Activities Log</h2>
+        <div class="">
+            <table class=" table table-sm full-width">
+                <thead>
+                    <tr>
+                        <th scope="col">Date</th>
+                        <th scope="col">Time</th>
+                        <th scope="col">Action</th>
+                        <th scope="col">Name</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for entry in activities %}
+                        <tr class="{% cycle 'row1' 'row2' %}">
+                            <td>{{ entry.act_date }}</td>
+                            <td>{{ entry.act_time }}</td>
+                            <td>{{ entry.activity }}</td>
+                            <td>{{ entry.act_by }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+
+
+      <button type="button" name="edit" class="btn btn-primary me-2" onclick="window.location='{% url 'ietf.meeting.views_session_request.edit_request' acronym=group.acronym num=meeting.number %}'"{% if not can_edit %} disabled{% endif %}>Edit</button>
+      {% if show_approve_button %}
+        <a href="{% url 'ietf.meeting.views_session_request.approve_request' acronym=group.acronym %}" class="btn btn-primary me-2">Approve Third Session</a>
+      {% endif %}
+      <button type="button" class="btn btn-primary me-2" onclick="if (window.confirm('Do you really want to cancel this session?')) { window.location='{% url 'ietf.meeting.views_session_request.cancel_request' acronym=group.acronym %}' };" {% if not can_cancel %} disabled{% endif %}>Cancel this Request</button>
+      <a href="{% url 'ietf.meeting.views_session_request.list_view' %}" class="btn btn-secondary float-end">Back</a>
+  
+    </div> <!-- view-container -->
+
+{% endblock %}
+
+{% block js %}
+    <script src="{% static 'ietf/js/custom_striped.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_request_view_formset.html b/ietf/templates/meeting/session_request_view_formset.html
new file mode 100644
index 0000000000..72811b8c2c
--- /dev/null
+++ b/ietf/templates/meeting/session_request_view_formset.html
@@ -0,0 +1,49 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load ams_filters %}{# keep this in sync with sessions_request_view_session_set.html #}
+{% for sess_form in formset %}
+    {% if sess_form.cleaned_data and not sess_form.cleaned_data.DELETE %}
+        <div class="row mb-3">
+            <div class="col-md-2 fw-bold">
+                Session {{ forloop.counter }}
+            </div>
+            <div class="col">
+                <div class="row mb-2">
+                    <div class="col-sm-2 fw-bold">Length</div>
+                    <div class="col">{{ sess_form.cleaned_data.requested_duration.total_seconds|display_duration }}</div>
+                </div>
+                {% if sess_form.cleaned_data.name %}
+                    <div class="row mb-2">
+                        <div class="col-sm-2 fw-bold">Name</div>
+                        <div class="col">{{ sess_form.cleaned_data.name }}</div>
+                    </div>
+                {% endif %}
+                {% if sess_form.cleaned_data.purpose.slug != 'regular' %}
+                    <div class="row mb-2">
+                        <div class="col-sm-2 fw-bold">Purpose</div>
+                        <div class="col">
+                            {{ sess_form.cleaned_data.purpose }}
+                            {% if sess_form.cleaned_data.purpose.timeslot_types|length > 1 %}({{ sess_form.cleaned_data.type }}
+                      ){% endif %}
+                        </div>
+                    </div>
+                    <div class="row mb-2">
+                        <div class="col-sm-2 fw-bold">Onsite tool?</div>
+                        <div class="col">{{ sess_form.cleaned_data.has_onsite_tool|yesno }}</div>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+
+        {% if group.features.acts_like_wg and forloop.counter == 2 and not is_virtual %}
+        <div class="row mb-3">
+            <div class="col-md-2 fw-bold">
+                Time between sessions
+            </div>
+            <div class="col">
+                {% if session.session_time_relation_display %}{{ session.session_time_relation_display }}{% else %}No
+            preference{% endif %}
+            </div>
+        </div>
+        {% endif %}
+    {% endif %}
+{% endfor %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_request_view_session_set.html b/ietf/templates/meeting/session_request_view_session_set.html
new file mode 100644
index 0000000000..0b8412b04f
--- /dev/null
+++ b/ietf/templates/meeting/session_request_view_session_set.html
@@ -0,0 +1,47 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load ams_filters %}{# keep this in sync with sessions_request_view_formset.html #}
+{% for sess in session_set %}
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Session {{ forloop.counter }}
+    </div>
+    <div class="col">
+        <div class="row mb-2">
+            <div class="col-sm-2 fw-bold">Length</div>
+            <div class="col">{{ sess.requested_duration.total_seconds|display_duration }}</div>
+        </div>
+        {% if sess.name %}
+            <div class="row mb-2">
+                <div class="col-sm-2 fw-bold">Name</div>
+                <div class="col">{{ sess.name }}</div>
+            </div>
+        {% endif %}
+        {% if sess.purpose.slug != 'regular' %}
+            <div class="row mb-2">
+                <div class="col-sm-2 fw-bold">Purpose</div>
+                <div class="col">
+                    {{ sess.purpose }}
+                    {% if sess.purpose.timeslot_types|length > 1 %}({{ sess.type }}){% endif %}
+                </div>
+            </div>
+            <div class="row mb-2">
+                <div class="col-sm-2 fw-bold">Onsite tool?</div>
+                <div class="col">{{ sess.has_onsite_tool|yesno }}</div>
+            </div>
+        {% endif %}
+    </div>
+</div>
+
+{% if group.features.acts_like_wg and forloop.counter == 2 and not is_virtual %}
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Time between sessions
+    </div>
+    <div class="col">
+        {% if session.session_time_relation_display %}{{ session.session_time_relation_display }}{% else %}No
+    preference{% endif %}
+    </div>
+</div>
+{% endif %}
+
+{% endfor %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_request_view_table.html b/ietf/templates/meeting/session_request_view_table.html
new file mode 100644
index 0000000000..a5cb85c252
--- /dev/null
+++ b/ietf/templates/meeting/session_request_view_table.html
@@ -0,0 +1,146 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% load ams_filters %}
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Working Group Name
+    </div>
+    <div class="col">
+        {{ group.name }} ({{ group.acronym }})
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Area Name
+    </div>
+    <div class="col">
+        {{ group.parent }}
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Number of Sessions Requested
+    </div>
+    <div class="col">
+        {% if session.third_session %}3{% else %}{{ session.num_session }}{% endif %}
+    </div>
+</div>
+
+{% if form %}
+    {% include 'meeting/session_request_view_formset.html' with formset=form.session_forms group=group session=session only %}
+{% else %}
+    {% include 'meeting/session_request_view_session_set.html' with session_set=sessions group=group session=session only %}
+{% endif %}
+
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Number of Attendees
+    </div>
+    <div class="col">
+        {{ session.attendees }}
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Conflicts to Avoid
+    </div>
+    <div class="col">
+        {% if session_conflicts.outbound %}
+            {% for conflict in session_conflicts.outbound %}
+                <div class="row mb-1">
+                    <div class="col-sm-2 fw-bold">
+                        {{ conflict.name|title }}
+                    </div>
+                    <div class="col">
+                        {{ conflict.groups }}
+                    </div>
+                </div>
+            {% endfor %}
+        {% else %}<i>None</i>{% endif %}
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Other WGs that included {{ group }} in their conflict list
+    </div>
+    <div class="col">
+        {% if session_conflicts.inbound %}{{ session_conflicts.inbound }}{% else %}<i>None so far</i>{% endif %}
+    </div>
+</div>
+
+{% if not is_virtual %}
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Resources requested
+    </div>
+    <div class="col">
+        {% if session.resources %}<ul>{% for resource in session.resources %}<li>{{ resource.desc }}</li>{% endfor %}</ul>{% else %}<i>None so far</i>{% endif %}
+    </div>
+</div>
+{% endif %}
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Participants who must be present
+    </div>
+    <div class="col">
+        {% if session.bethere %}<ul>{% for person in session.bethere %}<li>{{ person }}</li>{% endfor %}</ul>{% else %}<i>None</i>{% endif %}
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Can not meet on
+    </div>
+    <div class="col">
+        {% if session.timeranges_display %}{{ session.timeranges_display|join:', ' }}{% else %}No constraints{% endif %}
+    </div>
+</div>
+
+{% if not is_virtual %}
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Adjacent with WG
+    </div>
+    <div class="col">
+        {{ session.adjacent_with_wg|default:'No preference' }}
+    </div>
+</div>
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Joint session
+    </div>
+    <div class="col">
+        {% if session.joint_with_groups %}
+            {{ session.joint_for_session_display }} with: {{ session.joint_with_groups }}
+        {% else %}
+            Not a joint session
+        {% endif %}
+    </div>
+</div>
+{% endif %}
+
+<div class="row mb-3">
+    <div class="col-md-2 fw-bold">
+        Special Requests
+    </div>
+    <div class="col">
+        {{ session.comments }}    
+    </div>
+</div>
+
+{% if form and form.notifications_optional %}
+    <div class="row mb-3">
+        <div class="col-md-2 fw-bold">
+            {{ form.send_notifications.label}}
+        </div>
+        <div class="col">
+            {% if form.cleaned_data.send_notifications %}Yes{% else %}No{% endif %}    
+        </div>
+    </div>
+{% endif %}
diff --git a/ietf/templates/meeting/slides_approved.txt b/ietf/templates/meeting/slides_approved.txt
new file mode 100644
index 0000000000..61ffafcd18
--- /dev/null
+++ b/ietf/templates/meeting/slides_approved.txt
@@ -0,0 +1,5 @@
+{% load ietf_filters %}{% autoescape off %}Your proposed slides have been approved for {{ submission.session.meeting }} : {{ submission.session.group.acronym }}{% if submission.session.name %} : {{submission.session.name}}{% endif %} by {{approver}}
+
+Title: {{submission.title}}
+
+{% endautoescape %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html
index 5c31c81950..3259dba9da 100644
--- a/ietf/templates/meeting/timeslot_edit.html
+++ b/ietf/templates/meeting/timeslot_edit.html
@@ -11,31 +11,33 @@
     {% endcomment %}
     .timeslot-edit { overflow: auto; height: max(30rem, calc(100vh - 25rem));}
     .tstable { width: 100%; border-collapse: separate; } {# "separate" to ensure sticky cells keep their borders #}
-.tstable thead  { position: sticky; top: 0; z-index: 3; background-color: white;}
-.tstable th:first-child, .tstable td:first-child {
-    background-color: white; {# needs to match the lighter of the striped-table colors! #}
-position: sticky;
-left: 0;
-    z-index: 2; {# render above other cells / borders but below thead (z-index 3, above) #}
-}
-.tstable tbody > tr:nth-of-type(odd) > th:first-child {
-    background-color: rgb(249, 249, 249); {# needs to match the darker of the striped-table colors! #}
-}
-.tstable th { white-space: nowrap;}
-.tstable td { white-space: nowrap;}
-.capacity { font-size:80%; font-weight: normal;}
-a.new-timeslot-link { color: lightgray; font-size: large;}
+    .tstable tr th:first-child { min-width: 25rem; max-width: 25rem; overflow: hidden; } 
+    .tstable thead  { position: sticky; top: 0; z-index: 3; background-color: white;}
+    .tstable thead th span.day { position: sticky; left: 25.5rem; }
+    .tstable th:first-child, .tstable td:first-child {
+        background-color: white; {# needs to match the lighter of the striped-table colors! #}
+        position: sticky;
+        left: 0;
+        z-index: 2; {# render above other cells / borders but below thead (z-index 3, above) #}
+    }
+    .tstable tbody > tr:nth-of-type(odd) > th:first-child {
+        background-color: rgb(249, 249, 249); {# needs to match the darker of the striped-table colors! #}
+    }
+    .tstable th { white-space: nowrap;}
+    .tstable td { white-space: nowrap;}
+    .capacity { font-size:80%; font-weight: normal;}
+    a.new-timeslot-link { color: lightgray; font-size: large;}
 {% endblock %}
 {% block content %}
     {% origin %}
     <h1>
         IETF {{ meeting.number }} Meeting Agenda
         <br>
-        <small class="text-muted">Timeslots and Room Availability</small>
+        <small class="text-body-secondary">Timeslots and Room Availability</small>
     </h1>
     <div class="my-3">
         <a class="btn btn-primary"
-           href="{% url "ietf.meeting.views.create_timeslot" num=meeting.number %}">
+           href="{% url "ietf.meeting.views.create_timeslot" num=meeting.number %}{% if "sched" in request.GET %}?sched={{ request.GET.sched }}{% endif %}">
             New timeslot
         </a>
         {% if meeting.schedule %}
@@ -51,6 +53,9 @@ <h1>
            href="{% url "ietf.meeting.views.list_schedules" num=meeting.number %}">
             Agenda list
         </a>
+        {% if schedule_edit_url %}
+            <a class="btn btn-secondary" href="{{ schedule_edit_url }}">Back to agenda</a>
+        {% endif %}
     </div>
    <div class="timeslot-edit">
         {% if rooms|length == 0 %}
@@ -81,12 +86,14 @@ <h1>
                                 <th scope="col"></th>
                                 {% for day in time_slices %}
                                     <th scope="col" class="day-label" colspan="{{ date_slices|colWidth:day }}">
-                                        {{ day|date:'D' }} ({{ day }})
-                                        <i class="bi bi-trash delete-button"
-                                              title="Delete all on this day"
-                                              data-delete-scope="day"
-                                              data-date-id="{{ day.isoformat }}">
-                                        </i>
+                                        <span class="day">
+                                            {{ day|date:'D' }} ({{ day }})
+                                            <i class="bi bi-trash delete-button"
+                                               title="Delete all on this day"
+                                               data-delete-scope="day"
+                                               data-date-id="{{ day.isoformat }}">
+                                            </i>
+                                        </span>
                                     </th>
                                 {% endfor %}
                             {% endif %}
@@ -118,6 +125,7 @@ <h1>
                             <tr>
                                 <th scope="row">
                                     <span class="room-heading">{{ room.name }}
+                                        {% if room.functional_name and room.name != room.functional_name %} - {{ room.functional_name }}{% endif %}
                                         {% if room.capacity %}<span class="capacity">({{ room.capacity }})</span>{% endif %}
                                     </span>
                                 </th>
@@ -126,7 +134,9 @@ <h1>
                                         <p>
                                             No timeslots exist for this meeting yet.
                                         </p>
-                                        <a href="{% url "ietf.meeting.views.create_timeslot" num=meeting.number %}">Create a timeslot.</a>
+                                        <a href="{% url "ietf.meeting.views.create_timeslot" num=meeting.number %}{% if "sched" in request.GET %}?sched={{ request.GET.sched }}{% endif %}">
+                                            Create a timeslot.
+                                        </a>
                                     </td>
                                 {% else %}
                                     {% for day in time_slices %}
@@ -137,11 +147,11 @@ <h1>
                                                     <td class="tscell {% if cell_ts|length > 1 %}timeslot-collision{% endif %}{% for ts in cell_ts %} tstype_{{ ts.type.slug }}{% endfor %}">
                                                         {% if cell_ts %}
                                                             {% for ts in cell_ts %}
-                                                                {% include 'meeting/timeslot_edit_timeslot.html' with ts=ts in_use=ts_with_any_assignments in_official_use=ts_with_official_assignments only %}
+                                                                {% include 'meeting/timeslot_edit_timeslot.html' with ts=ts in_use=ts_with_any_assignments in_official_use=ts_with_official_assignments request=request only %}
                                                             {% endfor %}
                                                         {% endif %}
                                                         <a class="new-timeslot-link text-reset text-decoration-none {% if cell_ts %}hidden{% endif %}" aria-label="+"
-                                                           href="{% url 'ietf.meeting.views.create_timeslot' num=meeting.number %}?day={{ day.toordinal }}&amp;date={{ day|date:'Y-m-d' }}&amp;location={{ room.pk }}&amp;time={{ slot.time|date:'H:i' }}&amp;duration={{ slot.duration }}">
+                                                           href="{% url 'ietf.meeting.views.create_timeslot' num=meeting.number %}?day={{ day.toordinal }}&amp;date={{ day|date:'Y-m-d' }}&amp;location={{ room.pk }}&amp;time={{ slot.time|date:'H:i' }}&amp;duration={{ slot.duration }}{% if "sched" in request.GET %}&amp;sched={{ request.GET.sched }}{% endif %}">
                                                             <i class="bi bi-plus-square"></i>
                                                         </a>
                                                     </td>
diff --git a/ietf/templates/meeting/timeslot_edit_timeslot.html b/ietf/templates/meeting/timeslot_edit_timeslot.html
index 88e1e5a196..e3c51fb75a 100644
--- a/ietf/templates/meeting/timeslot_edit_timeslot.html
+++ b/ietf/templates/meeting/timeslot_edit_timeslot.html
@@ -1,8 +1,8 @@
 <div id="timeslot{{ ts.pk }}"
     class="timeslot {% if ts in in_official_use %}in-official-use{% elif ts in in_use %}in-unofficial-use{% endif %}"
     data-timeslot-pk="{{ ts.pk }}"
-    data-date-id="{{ ts.time.date.isoformat }}"{# used for identifying day/col contents #}
-    data-col-id="{{ ts.time.date.isoformat }}T{{ ts.time|date:"H:i" }}-{{ ts.end_time|date:"H:i" }}" {# used for identifying column contents #}
+    data-date-id="{{ ts.local_start_time.date.isoformat }}"{# used for identifying day/col contents #}
+    data-col-id="{{ ts.local_start_time.date.isoformat }}T{{ ts.time|date:"H:i" }}-{{ ts.end_time|date:"H:i" }}" {# used for identifying column contents #}
 data-timeslot-name="{{ ts.name }}"
 data-timeslot-type="{{ ts.type.slug }}"
 data-timeslot-location="{{ ts.location.name }}"
@@ -16,7 +16,7 @@
 </span>
 </div>
 <div class="timeslot-buttons">
-<a class="text-reset text-decoration-none" aria-label="Edit" href="{% url 'ietf.meeting.views.edit_timeslot' num=ts.meeting.number slot_id=ts.id %}">
+<a class="text-reset text-decoration-none" aria-label="Edit" href="{% url 'ietf.meeting.views.edit_timeslot' num=ts.meeting.number slot_id=ts.id %}{% if "sched" in request.GET %}?sched={{ request.GET.sched }}{% endif %}">
 <i class="bi bi-pencil"></i>
 </a>
 <i class="bi bi-trash delete-button" data-delete-scope="timeslot" title="Delete this timeslot"></i>
diff --git a/ietf/templates/meeting/tz-display.html b/ietf/templates/meeting/tz-display.html
index 16bc35ef38..2d11c6633c 100644
--- a/ietf/templates/meeting/tz-display.html
+++ b/ietf/templates/meeting/tz-display.html
@@ -12,8 +12,8 @@
 {% load origin %}
 {% origin %}
 {% firstof id_suffix "" as suffix %}
-<div class="tz-display flex-fill {% if minimal %}btn-group btn-group-sm my-2{% else %}input-group my-3{% endif %} flex-wrap">
-    {% if not minimal %}<label class="input-group-text border-primary bg-white fw-bold">Time zone:</label>{% endif %}
+<span class="tz-display flex-fill {% if minimal %}btn-group btn-group-sm my-2{% else %}input-group my-3{% endif %} flex-wrap">
+    {% if not minimal %}<label class="input-group-text border-primary bg-transparent fw-bold">Time zone:</label>{% endif %}
     {% if meeting_timezone is not None %}
         <input type="radio"
                name="tzradio{{ suffix }}"
@@ -46,4 +46,4 @@
             </option>
         </select>
     {% endif %}
-</div>
\ No newline at end of file
+</span>
\ No newline at end of file
diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index f3359f4fab..13a27ed910 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -2,10 +2,9 @@
 {# Copyright The IETF Trust 2015, 2020, All Rights Reserved #}
 {% load origin %}
 {% load cache %}
-{% load ietf_filters static classname %}
+{% load ietf_filters static classname tz %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-    <link rel="stylesheet" href="{% static "ietf/js/fullcalendar.css" %}">
 {% endblock %}
 {% block title %}Upcoming Meetings{% endblock %}
 {% block content %}
@@ -46,14 +45,19 @@ <h1>Upcoming Meetings</h1>
             <tbody>
                 {% for entry in entries %}
                     <tr class="entry"
-                        {% if entry|classname == 'Session' %}data-filter-keywords="{{ entry.filter_keywords|join:',' }}"{% endif %}>
+                        {% if entry|classname == 'Session' %}
+                            data-filter-keywords="{{ entry.filter_keywords|join:',' }}"
+                        {% elif entry|classname == 'Meeting' %}
+                            data-filter-keywords="ietf-meetings"
+                        {% endif %}
+                    >
                         {% if entry|classname == 'Meeting' %}
                             {% with meeting=entry %}
                                 <td class="meeting-time"
                                     data-start-date="{{ meeting.date }}"
-                                    data-end-date="{{ meeting.end }}"
+                                    data-end-date="{{ meeting.end_date }}"
                                     data-time-zone="{{ meeting.time_zone }}">
-                                    {{ meeting.date }} to {{ meeting.end }}
+                                    {{ meeting.date }} to {{ meeting.end_date }}
                                 </td>
                                 <td>ietf</td>
                                 <td>
@@ -67,9 +71,9 @@ <h1>Upcoming Meetings</h1>
                         {% elif entry|classname == 'Session' %}
                             {% with session=entry group=entry.group meeting=entry.meeting %}
                                 <td class="session-time"
-                                    data-start-utc="{{ session.official_timeslotassignment.timeslot.utc_start_time | date:'Y-m-d H:i' }}Z"
-                                    data-end-utc="{{ session.official_timeslotassignment.timeslot.utc_end_time | date:'Y-m-d H:i' }}Z">
-                                    {{ session.official_timeslotassignment.timeslot.utc_start_time | date:"Y-m-d H:i" }}-{{ session.official_timeslotassignment.timeslot.utc_end_time | date:"H:i" }}
+                                    data-start-utc="{{ session.official_timeslotassignment.timeslot.time | utc | date:'Y-m-d H:i' }}Z"
+                                    data-end-utc="{{ session.official_timeslotassignment.timeslot.end_time | utc | date:'Y-m-d H:i' }}Z">
+                                    {{ session.official_timeslotassignment.timeslot.time | utc | date:"Y-m-d H:i" }}-{{ session.official_timeslotassignment.timeslot.end_time | utc | date:"H:i" }}
                                 </td>
                                 <td>
                                     <a href="{% url 'ietf.group.views.group_home' acronym=group.acronym %}">{{ group.acronym }}</a>
@@ -82,7 +86,7 @@ <h1>Upcoming Meetings</h1>
                                 </td>
                                 {% if session.current_status == 'canceled' %}
                                     <td class="text-end">
-                                        <span class="badge rounded-pill bg-warning">Cancelled</span>
+                                        <span class="badge rounded-pill text-bg-warning">Cancelled</span>
                                     </td>
                                 {% else %}
                                     <td class="text-end">{% include "meeting/interim_session_buttons.html" with show_agenda=True %}</td>
@@ -90,7 +94,7 @@ <h1>Upcoming Meetings</h1>
                             {% endwith %}
                         {% else %}
                             <td>
-                                <span class="badge rounded-pill bg-warning">Unexpected entry type: {{ entry|classname }}</span>
+                                <span class="badge rounded-pill text-bg-warning">Unexpected entry type: {{ entry|classname }}</span>
                             </td>
                             <td></td>
                             <td></td>
@@ -122,8 +126,9 @@ <h3 class="my-3">No upcoming meetings</h3>
                       {% with meeting=entry %}
                           {
                               ietf_meeting_number: '{{ meeting.number }}',
+                              filter_keywords: ['ietf-meetings'],
                               start_moment: moment.tz('{{meeting.date}}', '{{ meeting.time_zone }}').startOf('day'),
-                              end_moment: moment.tz('{{meeting.end}}', '{{ meeting.time_zone }}').endOf('day'),
+                              end_moment: moment.tz('{{meeting.end_date}}', '{{ meeting.time_zone }}').endOf('day'),
                               url: '{% url 'agenda' num=meeting.number %}'
                           }{% if not forloop.last %}, {% endif %}
                       {% endwith %}
@@ -131,9 +136,10 @@ <h3 class="my-3">No upcoming meetings</h3>
                       {% with session=entry %}
                           {
                               group: '{% if session.group %}{{session.group.acronym}}{% endif %}{% if session.name %} - {{session.name}}{% endif %}',
+                              current_status: '{{ session.current_status }}',
                               filter_keywords: ["{{ session.filter_keywords|join:'","' }}"],
-                              start_moment: moment.utc('{{session.official_timeslotassignment.timeslot.utc_start_time | date:"Y-m-d H:i"}}'),
-                              end_moment: moment.utc('{{session.official_timeslotassignment.timeslot.utc_end_time | date:"Y-m-d H:i"}}'),
+                              start_moment: moment.utc('{{session.official_timeslotassignment.timeslot.time | utc | date:"Y-m-d H:i"}}'),
+                              end_moment: moment.utc('{{session.official_timeslotassignment.timeslot.end_time | utc | date:"Y-m-d H:i"}}'),
                               url: '{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}'
                           }
                       {% endwith %}
@@ -151,4 +157,4 @@ <h3 class="my-3">No upcoming meetings</h3>
                 agenda_filter.enable();
         });
     </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/upcoming.ics b/ietf/templates/meeting/upcoming.ics
deleted file mode 100644
index 0f2e68b274..0000000000
--- a/ietf/templates/meeting/upcoming.ics
+++ /dev/null
@@ -1,31 +0,0 @@
-{% load humanize %}{% autoescape off %}{% load ietf_filters %}BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-PRODID:-//IETF//datatracker.ietf.org ical upcoming//EN
-{{vtimezones}}{% for item in assignments %}BEGIN:VEVENT
-UID:ietf-{{item.session.meeting.number}}-{{item.timeslot.pk}}
-SUMMARY:{% if item.session.name %}{{item.session.group.acronym|lower}} - {{item.session.name|ics_esc}}{% else %}{{item.session.group.acronym|lower}} - {{item.session.group.name}}{%endif%}
-{% if item.schedule.meeting.city %}LOCATION:{{item.schedule.meeting.city}},{{item.schedule.meeting.country}}
-{% endif %}STATUS:{{item.session.ical_status}}
-CLASS:PUBLIC
-DTSTART{% if item.schedule.meeting.time_zone %};TZID={{ item.schedule.meeting.time_zone|ics_esc }}{%endif%}:{{ item.timeslot.time|date:"Ymd" }}T{{item.timeslot.time|date:"Hi"}}00
-DTEND{% if item.schedule.meeting.time_zone %};TZID={{ item.schedule.meeting.time_zone|ics_esc }}{%endif%}:{{ item.timeslot.end_time|date:"Ymd" }}T{{item.timeslot.end_time|date:"Hi"}}00
-DTSTAMP:{{ item.timeslot.modified|date:"Ymd" }}T{{ item.timeslot.modified|date:"His" }}Z
-{% if item.session.agenda %}URL:{{item.session.agenda.get_href}}
-DESCRIPTION:{{item.timeslot.name|ics_esc}}\n{% if item.session.agenda_note %}
- Note: {{item.session.agenda_note|ics_esc}}\n{% endif %}{% for material in item.session.materials.all %}
- \n{{material.type}}{% if material.type.name != "Agenda" %}
-  ({{material.title|ics_esc}}){% endif %}:
-  {{material.get_href}}\n{% endfor %}
-{% endif %}END:VEVENT
-{% endfor %}{% for meeting in ietfs %}BEGIN:VEVENT
-UID:ietf-{{ meeting.number }}
-SUMMARY:IETF {{ meeting.number }}{% if meeting.city %}
-LOCATION:{{ meeting.city }},{{ meeting.country }}{% endif %}
-CLASS:PUBLIC
-DTSTART;VALUE=DATE{% if meeting.time_zone %};TZID={{ meeting.time_zone|ics_esc }}{% endif %}:{{ meeting.date|date:"Ymd" }}
-DTEND;VALUE=DATE{% if meeting.time_zone %};TZID={{ meeting.time_zone|ics_esc }}{% endif %}:{{ meeting.end_date|date:"Ymd" }}
-DTSTAMP:{{ meeting.cached_updated|date:"Ymd" }}T{{ meeting.cached_updated|date:"His" }}Z
-URL:{{ request.scheme }}://{{ request.get_host }}{% url 'agenda' num=meeting.number %}
-END:VEVENT
-{% endfor %}END:VCALENDAR{% endautoescape %}
diff --git a/ietf/templates/meeting/upload_session_agenda.html b/ietf/templates/meeting/upload_session_agenda.html
index 4bd0b8971f..57cba6b53c 100644
--- a/ietf/templates/meeting/upload_session_agenda.html
+++ b/ietf/templates/meeting/upload_session_agenda.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static django_bootstrap5 %}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
+{% load origin static django_bootstrap5 tz %}
 {% block title %}
     {% if agenda_sp %}
         Revise
@@ -19,16 +19,19 @@ <h1>
         {% endif %}
         Agenda for {{ session.meeting }}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
     {% if session_number %}
-        <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|date:"D M-d-Y Hi" }}</h2>
+        <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }}</h2>
     {% endif %}
     <form enctype="multipart/form-data" method="post" class="my-3">
         {% csrf_token %}
         {% bootstrap_form form %}
-        <button type="submit" class="btn btn-primary">Upload</button>
+        <button type="submit" class="btn btn-primary">Save</button>
     </form>
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/upload-session-agenda.js' %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/upload_session_bluesheets.html b/ietf/templates/meeting/upload_session_bluesheets.html
index 4a2f484be9..19af4847ad 100644
--- a/ietf/templates/meeting/upload_session_bluesheets.html
+++ b/ietf/templates/meeting/upload_session_bluesheets.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static django_bootstrap5 %}
+{% load origin static django_bootstrap5 tz %}
 {% block title %}
     {% if bluesheet_sp %}
         Revise
@@ -19,12 +19,12 @@ <h1>
         {% endif %}
         Bluesheets for {{ session.meeting }}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
     {% if session_number %}
-        <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|date:"D M-d-Y Hi" }}</h2>
+        <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }}</h2>
     {% endif %}
     <form enctype="multipart/form-data" method="post" class="my-3">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/upload_session_minutes.html b/ietf/templates/meeting/upload_session_minutes.html
index 2e3f875249..324440681f 100644
--- a/ietf/templates/meeting/upload_session_minutes.html
+++ b/ietf/templates/meeting/upload_session_minutes.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static django_bootstrap5 %}
+{% load origin static django_bootstrap5 tz %}
 {% block title %}
     {% if minutes_sp %}
         Revise
@@ -19,12 +19,17 @@ <h1>
         {% endif %}
         Minutes for {{ session.meeting }}
         <br>
-        <small class="text-muted">{{ session.group.acronym }}
+        <small class="text-body-secondary">{{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
     {% if session_number %}
-        <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|date:"D M-d-Y Hi" }}</h2>
+        <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }}</h2>
+    {% endif %}
+    {% if future %}
+    <p class="alert alert-warning my-3">
+        Caution: Session has not ended yet
+    </p>
     {% endif %}
     <form enctype="multipart/form-data" method="post" class="my-3">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/upload_session_narrativeminutes.html b/ietf/templates/meeting/upload_session_narrativeminutes.html
new file mode 100644
index 0000000000..d990985510
--- /dev/null
+++ b/ietf/templates/meeting/upload_session_narrativeminutes.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2024, All Rights Reserved #}
+{% load origin static django_bootstrap5 tz %}
+{% block title %}
+    {% if narrativeminutes_sp %}
+        Revise
+    {% else %}
+        Upload
+    {% endif %}
+    Narrative Minutes for {{ session.meeting }} : {{ session.group.acronym }}
+{% endblock %}
+{% block content %}
+    {% origin %}
+    <h1>
+        {% if narrativeminutes_sp %}
+            Revise
+        {% else %}
+            Upload
+        {% endif %}
+        Narrative Minutes for {{ session.meeting }}
+        <br>
+        <small class="text-body-secondary">{{ session.group.acronym }}
+            {% if session.name %}: {{ session.name }}{% endif %}
+        </small>
+    </h1>
+    {% if session_number %}
+        <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }}</h2>
+    {% endif %}
+    <form enctype="multipart/form-data" method="post" class="my-3">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button type="submit" class="btn btn-primary">Upload</button>
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/upload_session_slides.html b/ietf/templates/meeting/upload_session_slides.html
index f5cd35d967..059ffae16f 100644
--- a/ietf/templates/meeting/upload_session_slides.html
+++ b/ietf/templates/meeting/upload_session_slides.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static django_bootstrap5 %}
+{% load origin static django_bootstrap5 tz %}
 {% block title %}
     {% if slides_sp %}
         Revise
@@ -17,15 +17,21 @@ <h1>
         {% else %}
             Upload new
         {% endif %}
-        slides for {{ session.meeting }}
-        <br>
-        <small class="text-muted">
+        slides for {{ session.meeting }}        <br>
+        <small class="text-body-secondary">
             {{ session.group.acronym }}
             {% if session.name %}: {{ session.name }}{% endif %}
         </small>
     </h1>
     {% if session_number %}
-        <h2>Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|date:"D M-d-Y Hi" }}</h2>
+        <h2 class="mt-3">
+            Session {{ session_number }} : {{ session.official_timeslotassignment.timeslot.time|timezone:session.meeting.time_zone|date:"D M-d-Y Hi" }}
+        </h2>
+    {% endif %}
+    {% if not manage %}
+    <p class="alert alert-info my-3">
+        This form will allow you to propose a slide deck to the session chairs. After you upload your proposal, mail will be sent to the session chairs asking for their approval.
+    </p>
     {% endif %}
     {% if slides_sp %}<h3>{{ slides_sp.document.name }}</h3>{% endif %}
     <form class="my-3" enctype="multipart/form-data" method="post">
diff --git a/ietf/templates/message/message.html b/ietf/templates/message/message.html
index fba7ba4392..01d72e9638 100644
--- a/ietf/templates/message/message.html
+++ b/ietf/templates/message/message.html
@@ -8,7 +8,7 @@
     <h1>
         {{ message.subject }}
         <br>
-        <small class="text-muted">{{ message.time|date:"F j, Y" }}</small>
+        <small class="text-body-secondary">{{ message.time|date:"F j, Y" }}</small>
     </h1>
     <dl class="row my-3">
         <dt class="col-sm-1">
diff --git a/ietf/templates/minimal.html b/ietf/templates/minimal.html
new file mode 100644
index 0000000000..15c432505e
--- /dev/null
+++ b/ietf/templates/minimal.html
@@ -0,0 +1,21 @@
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
+<!DOCTYPE html>
+{% load static %}
+{% load origin %}
+{% origin %}
+<html data-bs-theme="auto" lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>{{ title }}</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="{{ static_ietf_org }}/fonts/inter/import.css" rel="stylesheet">
+        <link href="{{ static_ietf_org }}/fonts/noto-sans-mono/import.css" rel="stylesheet">
+        <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
+        {# load this in the head, to prevent flickering #}
+        <script src="{% static 'ietf/js/theme.js' %}"></script>
+    </head>
+    <body class="m-2 bg-transparent">
+        {{ content }}
+    </body>
+</html>
\ No newline at end of file
diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html
index aa67fbb68e..771f2b4fb0 100644
--- a/ietf/templates/nomcom/announcements.html
+++ b/ietf/templates/nomcom/announcements.html
@@ -15,7 +15,7 @@ <h1>NomCom</h1>
     </p>
     {% for regime in regimes %}
         <h2 class="mt-5" id="nomcom-{{ regime.group.start_year }}">
-            Messages from {{ regime.group.start_year }}/{{ regime.group.end_year }}
+            Messages from {{ regime.group.start_year }} NomCom
         </h2>
         {# use person email address here rather than the generic nomcom-chair@ietf.org #}
         <p>
@@ -56,9 +56,14 @@ <h2 class="mt-5" id="references">References</h2>
         </li>
         <li>
             <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc8713' %}">
-                IAB, IESG, IETF Trust, and IETF LLC Selection, Confirmation, and Recall Process: Operation of the IETF Nominating and Recall Committees (RFC 8713) (Also BCP10)
+                IAB, IESG, IETF Trust, and IETF LLC Selection, Confirmation, and Recall Process: Operation of the IETF Nominating and Recall Committees (RFC 8713)
             </a>
         </li>
+	<li>
+            <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc9389' %}">
+		Nominating Committee Eligibility (RFC 9389)
+	    </a>
+	</li>
         <li>
             <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc3797' %}">
                 Publicly Verifiable Nominations Committee (NomCom) Random Selection (RFC 3797)
diff --git a/ietf/templates/nomcom/download_questionnaire.txt b/ietf/templates/nomcom/download_questionnaire.txt
new file mode 100644
index 0000000000..71514095c8
--- /dev/null
+++ b/ietf/templates/nomcom/download_questionnaire.txt
@@ -0,0 +1,9 @@
+{# Copyright The IETF Trust 2023, All Rights Reserved #}{% autoescape off %}{% load nomcom_tags %}Questionnaire response from {{ nominee.person.name }}
+
+From:      {{ feedback.author|formatted_email|default:"Anonymous" }}
+Date:      {{ feedback.time|date:"Y-m-d" }}
+Positions: {{ positions }}{% if feedback.subject %}
+Subject:   {{ feedback.subject }}{% endif %}
+
+{% decrypt feedback.comments request year 1 %}
+{% endautoescape %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/edit_nominee.html b/ietf/templates/nomcom/edit_nominee.html
index aa9f6a8046..7f20e204bb 100644
--- a/ietf/templates/nomcom/edit_nominee.html
+++ b/ietf/templates/nomcom/edit_nominee.html
@@ -9,7 +9,7 @@
     <h2>
         Edit email
         <br>
-        <small class="text-muted">{{ nominee }}</small>
+        <small class="text-body-secondary">{{ nominee }}</small>
     </h2>
     <form method="post" class="my-3">
         {% csrf_token %}
diff --git a/ietf/templates/nomcom/edit_position.html b/ietf/templates/nomcom/edit_position.html
index 3dfa62fe1c..fd01a2c4fa 100644
--- a/ietf/templates/nomcom/edit_position.html
+++ b/ietf/templates/nomcom/edit_position.html
@@ -31,5 +31,14 @@ <h2>
                {% if position %}Save{% else %}Add{% endif %}</button>
         <a class="btn btn-secondary float-end" href="../">Back</a>
     </form>
+    {% if position.name %}
+        <h3>
+            Templates
+        </h3>
+        {% for template in position.get_templates %}
+            <a href="{% url 'ietf.nomcom.views.edit_template' year template.id %}">{{ template }}</a>
+            <br>
+        {% endfor %}
+    {% endif %}
 {% endblock %}
-{% block content_end %}{{ form.media.js }}{% endblock %}
\ No newline at end of file
+{% block content_end %}{{ form.media.js }}{% endblock %}
diff --git a/ietf/templates/nomcom/edit_template.html b/ietf/templates/nomcom/edit_template.html
index 5c6ba618df..b901104cf0 100644
--- a/ietf/templates/nomcom/edit_template.html
+++ b/ietf/templates/nomcom/edit_template.html
@@ -8,7 +8,7 @@
     <h2>
         Template
         <br>
-        <small class="text-muted">{{ template }}</small>
+        <small class="text-body-secondary">{{ template }}</small>
     </h2>
     <dl class="row mt-3">
         <dt class="col-sm-2">
diff --git a/ietf/templates/nomcom/eligible.html b/ietf/templates/nomcom/eligible.html
index fcf06e6e51..f5cfc2e2dc 100644
--- a/ietf/templates/nomcom/eligible.html
+++ b/ietf/templates/nomcom/eligible.html
@@ -4,9 +4,6 @@
 {% load django_bootstrap5 textfilters person_filters %}
 {% load static %}
 {% block subtitle %}- Eligible People{% endblock %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
 {% block nomcom_content %}
     {% origin %}
     <h2>Eligible People for {{ nomcom.group }}</h2>
@@ -41,7 +38,4 @@ <h2>Eligible People for {{ nomcom.group }}</h2>
         {% endif %}
     </table>
 }
-{% endblock %}
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/email_list_panel.html b/ietf/templates/nomcom/email_list_panel.html
index 84dc8bec1e..0ee0c8a284 100644
--- a/ietf/templates/nomcom/email_list_panel.html
+++ b/ietf/templates/nomcom/email_list_panel.html
@@ -6,4 +6,6 @@
             <li>{% person_link n.person with_email=False %} ({{ n.email.address|linkify }})</li>
         {% endfor %}
     </ul>
+{% else %}
+<i>None</i>
 {% endif %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/extract_email_lists.html b/ietf/templates/nomcom/extract_email_lists.html
index b2a5fec493..b80119cf01 100644
--- a/ietf/templates/nomcom/extract_email_lists.html
+++ b/ietf/templates/nomcom/extract_email_lists.html
@@ -8,7 +8,7 @@
     <h2>
         Email lists
         <br>
-        <small class="text-muted">{{ nomcom.group }}</small>
+        <small class="text-body-secondary">{{ nomcom.group }}</small>
     </h2>
     {% with title='Nominees Pending Acceptance' list=pending heading="h3" %}
         {% include 'nomcom/email_list_panel.html' %}
diff --git a/ietf/templates/nomcom/feedback.html b/ietf/templates/nomcom/feedback.html
index 880fb42dfd..8c9e8c824f 100644
--- a/ietf/templates/nomcom/feedback.html
+++ b/ietf/templates/nomcom/feedback.html
@@ -9,13 +9,20 @@
     <p id="instructions" class="alert alert-info my-3">
         {% if nomcom.group.state_id == 'conclude' %}
             Feedback to this NomCom is closed.
+        {% elif positions|length != 0 and topics|length != 0 %}
+            Select a nominee or topic from the list on the right to obtain a new feedback form.
+        {% elif positions|length != 0 %}
+            Select a nominee from the list on the right to obtain a new feedback form.
+        {% elif topics|length != 0 %}
+            Select a topic from the list on the right to obtain a new feedback form.
         {% else %}
-            Select a nominee from the list of nominees on the right to obtain a new feedback form.
+            This NomCom is not accepting feedback at this time.
         {% endif %}
     </p>
     {% if nomcom|has_publickey %}
         <div class="row">
             <div id="nominees" class="col-sm-2 order-last">
+                {% if positions|length != 0 %}
                 <h2 class="navskip mt-4">Nominees</h2>
                 <p>
                     A number after a name indicates
@@ -29,13 +36,13 @@ <h2 class="navskip mt-4">Nominees</h2>
                         <h3 class="navskip mt-3">{{ p.name }}</h3>
                         <div class="d-grid gap-3">
                             {% for np in p.nomineeposition_set.accepted.not_duplicated %}
-                                <a class="btn btn-primary position-relative"
+                                <a class="btn btn-primary btn-sm position-relative"
                                    {% if nomcom.group.state_id != 'conclude' %}href="?nominee={{ np.nominee.id }}&amp;position={{ np.position.id }}"{% endif %}
-                                   title="{% if count %}{{ count }} earlier comment{{ count|pluralize }} from you {% else %}You have not yet provided feedback {% endif %} on {{ np.nominee.email.address }} as {{ np.position }}">
-                                    {{ np.nominee.name }}
-                                    {% with count=counts|lookup:np.position.id|lookup:np.nominee.id %}
-                                        <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
-                                            {{ count | default:"0" }}
+                                    {% with count=counts|lookup:np.position.id|lookup:np.nominee.id|default:0 %}
+                                       title="{% if count %}{{ count }} earlier comment{{ count|pluralize }} from you {% else %}You have not yet provided feedback {% endif %} on {{ np.nominee.email.address }} as {{ np.position }}">
+                                        {{ np.nominee.name }}
+                                        <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill {% if count %}text-bg-success{% else %}text-bg-danger{% endif %}">
+                                            {{ count }}
                                         </span>
                                     {% endwith %}
                                 </a>
@@ -43,42 +50,45 @@ <h3 class="navskip mt-3">{{ p.name }}</h3>
                         </div>
                     {% endif %}
                 {% endfor %}
+                {% endif %}
+                {% if topics|length != 0 %}
                 <h2 class="navskip mt-4">Topics</h2>
                 <div class="d-grid gap-3">
                     {% for t in topics %}
-                        <a class="btn btn-primary position-relative"
+                        <a class="btn btn-primary btn-sm position-relative"
                            {% if nomcom.group.state_id != 'conclude' %}href="?topic={{ t.id }}"{% endif %}
                            title="{% if count %}{{ count }} earlier comment{{ count|pluralize }} from you {% else %}You have not yet provided feedback {% endif %} on {{ t.subject }}">
                             {{ t.subject }}
-                            {% with count=topic_counts|lookup:t.id %}
-                                <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
-                                    {{ count | default:"0" }}
+                            {% with count=topic_counts|lookup:t.id|default:0 %}
+                                <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill {% if count %}text-bg-success{% else %}text-bg-danger{% endif %}">
+                                    {{ count }}
                                 </span>
                             {% endwith %}
                         </a>
                     {% endfor %}
                 </div>
+                {% endif %}
             </div>
             <div class="col-sm-10">
                 {% if form %}
                     {% if form.position %}
                         {% if nomcom.show_nominee_pictures and form.nominee.email.person.photo_thumb %}
-                            <div class="float-end mt-4">{% include "person/photo.html" with person=form.nominee.person  %}</div>
+                            <div class="float-end ms-4 my-4">{% include "person/photo.html" with person=form.nominee.person  %}</div>
                         {% endif %}
                         <h2 class="navskip mt-4">
                             Provide feedback
                             <br>
-                            <small class="text-muted">{{ form.nominee.email.person.name }} for {{ form.position.name }}</small>
+                            <small class="text-body-secondary">{{ form.nominee.email.person.name }} for {{ form.position.name }}</small>
                         </h2>
                         <p class="mt-3">
-                            Provide feedback about {% person_link form.nominee.person %}
+                            Provide feedback about {% person_link form.nominee.person with_email=False %}
                             for the <b>{{ form.position.name }}</b> position.
                         </p>
                     {% elif form.topic %}
                         <h2 >
                             Provide feedback
                             <br>
-                            <small class="text-muted">{{ form.topic.subject }}</small>
+                            <small class="text-body-secondary">{{ form.topic.subject }}</small>
                         </h2>
                         <div class="card my-3">
                             <div class="card-header">Description: {{ form.topic.subject }}</div>
@@ -87,10 +97,10 @@ <h2 >
                     {% endif %}
                     <p>
                         This feedback will only be available to
-                        <a href="{% url 'ietf.nomcom.views.year_index' year=year %}">NomCom {{ year }}</a>.
-                        You may have the feedback mailed back to you by selecting the option below.
+                        <a href="{% url 'ietf.nomcom.views.year_index' year=year %}">the current NomCom</a>.
+                        You can have the feedback mailed back to you by selecting the option below.
                     </p>
-                    <form id="feedbackform" method="post">
+                    <form class="float-start" id="feedbackform" method="post">
                         {% csrf_token %}
                         {% bootstrap_form form %}
                         <button class="btn btn-primary" type="submit" name="save">Save</button>
diff --git a/ietf/templates/nomcom/history.html b/ietf/templates/nomcom/history.html
index 74e7efff7b..8262876b11 100644
--- a/ietf/templates/nomcom/history.html
+++ b/ietf/templates/nomcom/history.html
@@ -11,7 +11,7 @@ <h1>NomCom Membership History</h1>
         <b>Note:</b> The data for concluded NomComs is occasionally incorrect.
     </p>
     {% for regime in regimes %}
-        <h2 class="mt-5" id="y{{ regime.year }}">{{ regime.label }}</h2>
+        <h2 class="mt-5" id="y{{ regime.year }}">{{ regime.year }} NomCom</h2>
         <dl class="row">
             {% for slug, label, roles in regime.nomcom.personnel %}
                 <dt class="col-sm-2">
@@ -25,7 +25,7 @@ <h2 class="mt-5" id="y{{ regime.year }}">{{ regime.label }}</h2>
             {% endfor %}
         </dl>
     {% endfor %}
-    <h2 class="mt-5" id="y2012">2012/2013</h2>
+    <h2 class="mt-5" id="y2012">2012 NomCom</h2>
     <dl class="row">
         <dt class="col-sm-2">
             Chair
@@ -58,13 +58,13 @@ <h2 class="mt-5" id="y2012">2012/2013</h2>
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Marc Blanchet <span class="text-muted">(IAB Liaison)</span>,
-            Scott Bradner <span class="text-muted">(IAOC Liaison)</span>,
-            Sean Turner <span class="text-muted">(IESG Liaison)</span>,
-            Rudi Vansnick <span class="text-muted">(ISOC Liaison)</span>
+            Marc Blanchet <span class="text-body-secondary">(IAB Liaison)</span>,
+            Scott Bradner <span class="text-body-secondary">(IAOC Liaison)</span>,
+            Sean Turner <span class="text-body-secondary">(IESG Liaison)</span>,
+            Rudi Vansnick <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
-    <h2 class="mt-5" id="y2011">2011/2012</h2>
+    <h2 class="mt-5" id="y2011">2011 NomCom</h2>
     <dl class="row">
         <dt class="col-sm-2">
             Chair
@@ -77,7 +77,7 @@ <h2 class="mt-5" id="y2011">2011/2012</h2>
         </dt>
         <dd class="col-sm-10">
             Tom Walsh,
-            Henrik Levkowetz <span class="text-muted">(Tools Advisor)</span>
+            Henrik Levkowetz <span class="text-body-secondary">(Tools Advisor)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -98,13 +98,13 @@ <h2 class="mt-5" id="y2011">2011/2012</h2>
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Dave Thaler <span class="text-muted">(IAB Liaison)</span>,
-            Dave Crocker <span class="text-muted">(IAOC Liaison)</span>,
-            Ralph Droms <span class="text-muted">(IESG Liaison)</span>,
-            Jason Livingood <span class="text-muted">(ISOC Liaison)</span>
+            Dave Thaler <span class="text-body-secondary">(IAB Liaison)</span>,
+            Dave Crocker <span class="text-body-secondary">(IAOC Liaison)</span>,
+            Ralph Droms <span class="text-body-secondary">(IESG Liaison)</span>,
+            Jason Livingood <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
-    <h2 class="mt-5" id="y2010">2010/2011</h2>
+    <h2 class="mt-5" id="y2010">2010 NomCom</h2>
     <dl class="row">
         <dt class="col-sm-2">
             Chair
@@ -117,7 +117,7 @@ <h2 class="mt-5" id="y2010">2010/2011</h2>
         </dt>
         <dd class="col-sm-10">
             Mary Barnes,
-            Henrik Levkowetz <span class="text-muted">(Tools Advisor)</span>
+            Henrik Levkowetz <span class="text-body-secondary">(Tools Advisor)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -137,13 +137,13 @@ <h2 class="mt-5" id="y2010">2010/2011</h2>
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Spencer Dawkins <span class="text-muted">(IAB Liaison)</span>,
-            Ole Jacobsen <span class="text-muted">(IAOC Liaison)</span>,
-            Dan Romascanu <span class="text-muted">(IESG Liaison)</span>,
-            Eric Burger <span class="text-muted">(ISOC Liaison)</span>
+            Spencer Dawkins <span class="text-body-secondary">(IAB Liaison)</span>,
+            Ole Jacobsen <span class="text-body-secondary">(IAOC Liaison)</span>,
+            Dan Romascanu <span class="text-body-secondary">(IESG Liaison)</span>,
+            Eric Burger <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
-    <h2 class="mt-5" id="y2009">2009/2010</h2>
+    <h2 class="mt-5" id="y2009">2009 NomCom</h2>
     <dl class="row">
         <dt class="col-sm-2">
             Chair
@@ -156,7 +156,7 @@ <h2 class="mt-5" id="y2009">2009/2010</h2>
         </dt>
         <dd class="col-sm-10">
             Joel Halpern,
-            Henrik Levkowetz <span class="text-muted">(Tools Advisor)</span>
+            Henrik Levkowetz <span class="text-body-secondary">(Tools Advisor)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -177,14 +177,14 @@ <h2 class="mt-5" id="y2009">2009/2010</h2>
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Jon Peterson <span class="text-muted">(IAB Liaison)</span>,
-            Tim Polk <span class="text-muted">(IESG Liaison)</span>,
-            Henk Uijterwall <span class="text-muted">(IAOC liaison)</span>,
-            TBA <span class="text-muted">(ISOC Liaison)</span>
+            Jon Peterson <span class="text-body-secondary">(IAB Liaison)</span>,
+            Tim Polk <span class="text-body-secondary">(IESG Liaison)</span>,
+            Henk Uijterwall <span class="text-body-secondary">(IAOC liaison)</span>,
+            TBA <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2008">
-        2008/2009
+        2008 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -218,13 +218,13 @@ <h2 class="mt-5" id="y2008">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Dave Oran <span class="text-muted">(IAB Liaison)</span>,
-            Ross Callon <span class="text-muted">(IESG Liaison)</span>,
-            Bert Wijnen <span class="text-muted">(ISOC Liaison)</span>
+            Dave Oran <span class="text-body-secondary">(IAB Liaison)</span>,
+            Ross Callon <span class="text-body-secondary">(IESG Liaison)</span>,
+            Bert Wijnen <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2007">
-        2007/2008
+        2007 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -258,13 +258,13 @@ <h2 class="mt-5" id="y2007">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Danny McPherson <span class="text-muted">(IAB Liaison)</span>,
-            Lars Eggert <span class="text-muted">(IESG Liaison)</span>,
-            Fred Baker <span class="text-muted">(ISOC Liaison)</span>
+            Danny McPherson <span class="text-body-secondary">(IAB Liaison)</span>,
+            Lars Eggert <span class="text-body-secondary">(IESG Liaison)</span>,
+            Fred Baker <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2006">
-        2006/2007
+        2006 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -277,7 +277,7 @@ <h2 class="mt-5" id="y2006">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Ralph Droms <span class="text-muted">(Previous Chair)</span>
+            Ralph Droms <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -298,13 +298,13 @@ <h2 class="mt-5" id="y2006">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Olaf Kolkman <span class="text-muted">(IAB Liaison)</span>,
-            Cullen Jennings <span class="text-muted">(IESG Liaison)</span>,
-            Fred Baker <span class="text-muted">(ISOC Liaison)</span>
+            Olaf Kolkman <span class="text-body-secondary">(IAB Liaison)</span>,
+            Cullen Jennings <span class="text-body-secondary">(IESG Liaison)</span>,
+            Fred Baker <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2005">
-        2005/2006
+        2005 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -317,7 +317,7 @@ <h2 class="mt-5" id="y2005">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Danny McPherson <span class="text-muted">(Previous Chair)</span>
+            Danny McPherson <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -338,13 +338,13 @@ <h2 class="mt-5" id="y2005">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            David Meyer <span class="text-muted">(IAB Liaison)</span>,
-            Russ Housley <span class="text-muted">(IESG Liaison)</span>,
-            Steve Crocker <span class="text-muted">(ISOC Liaison)</span>
+            David Meyer <span class="text-body-secondary">(IAB Liaison)</span>,
+            Russ Housley <span class="text-body-secondary">(IESG Liaison)</span>,
+            Steve Crocker <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2004">
-        2004/2005
+        2004 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -357,7 +357,7 @@ <h2 class="mt-5" id="y2004">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Richard Draves <span class="text-muted">(Previous Chair)</span>
+            Richard Draves <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -378,14 +378,14 @@ <h2 class="mt-5" id="y2004">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Eric Rescorla <span class="text-muted">(IAB Liaison)</span>,
-            Alex Zinin <span class="text-muted">(IESG Liaison)</span>,
-            Steve Crocker <span class="text-muted">(ISOC Liaison)</span>,
-            Richard Draves <span class="text-muted">(Previous Chair/Advisor)</span>
+            Eric Rescorla <span class="text-body-secondary">(IAB Liaison)</span>,
+            Alex Zinin <span class="text-body-secondary">(IESG Liaison)</span>,
+            Steve Crocker <span class="text-body-secondary">(ISOC Liaison)</span>,
+            Richard Draves <span class="text-body-secondary">(Previous Chair/Advisor)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2003">
-        2003/2004
+        2003 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -398,7 +398,7 @@ <h2 class="mt-5" id="y2003">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Phil Roberts <span class="text-muted">(Previous Chair)</span>
+            Phil Roberts <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -419,12 +419,12 @@ <h2 class="mt-5" id="y2003">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Geoff Huston <span class="text-muted">(IAB Liaison)</span>,
-            Bill Fenner <span class="text-muted">(IESG liaison)</span>
+            Geoff Huston <span class="text-body-secondary">(IAB Liaison)</span>,
+            Bill Fenner <span class="text-body-secondary">(IESG liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2002">
-        2002/2003
+        2002 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -437,7 +437,7 @@ <h2 class="mt-5" id="y2002">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Theodore Ts'o <span class="text-muted">(Previous Chair)</span>
+            Theodore Ts'o <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -458,12 +458,12 @@ <h2 class="mt-5" id="y2002">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Eric Rescorla <span class="text-muted">(IAB liaison)</span>,
-            Allison Mankin <span class="text-muted">(IETF liaison)</span>
+            Eric Rescorla <span class="text-body-secondary">(IAB liaison)</span>,
+            Allison Mankin <span class="text-body-secondary">(IETF liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2001">
-        2001/2002
+        2001 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -476,7 +476,7 @@ <h2 class="mt-5" id="y2001">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Bernard Aboba <span class="text-muted">(Previous Chair)</span>
+            Bernard Aboba <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -497,12 +497,12 @@ <h2 class="mt-5" id="y2001">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Fred Baker <span class="text-muted">(IAB liaison)</span>,
-            Thomas Narten <span class="text-muted">(IESG Liaison)</span>
+            Fred Baker <span class="text-body-secondary">(IAB liaison)</span>,
+            Thomas Narten <span class="text-body-secondary">(IESG Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y2000">
-        2000/2001
+        2000 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -515,7 +515,7 @@ <h2 class="mt-5" id="y2000">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Avri Doria <span class="text-muted">(Previous Chair)</span>
+            Avri Doria <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -536,12 +536,12 @@ <h2 class="mt-5" id="y2000">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Leslie Daigle <span class="text-muted">(IAB Liaison)</span>,
-            Allison Mankin <span class="text-muted">(IESG Liaison)</span>
+            Leslie Daigle <span class="text-body-secondary">(IAB Liaison)</span>,
+            Allison Mankin <span class="text-body-secondary">(IESG Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y1999">
-        1999/2000
+        1999 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -554,7 +554,7 @@ <h2 class="mt-5" id="y1999">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Donald E. Eastlake <span class="text-muted">(Previous Chair)</span>
+            Donald E. Eastlake <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -575,12 +575,12 @@ <h2 class="mt-5" id="y1999">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Geoff Huston <span class="text-muted">(IAB Liaison)</span>,
-            Thomas Narten <span class="text-muted">(IESG Liaison)</span>
+            Geoff Huston <span class="text-body-secondary">(IAB Liaison)</span>,
+            Thomas Narten <span class="text-body-secondary">(IESG Liaison)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y1998">
-        1998/1999
+        1998 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -593,7 +593,7 @@ <h2 class="mt-5" id="y1998">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Michael St Johns <span class="text-muted">(Previous Chair)</span>
+            Michael St Johns <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -614,13 +614,13 @@ <h2 class="mt-5" id="y1998">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Steven Bellovin <span class="text-muted">(IAB Liaison)</span>,
-            Bert Wijnen <span class="text-muted">(IESG Liaison)</span>,
-            Michael St Johns <span class="text-muted">(Previous Chair)</span>
+            Steven Bellovin <span class="text-body-secondary">(IAB Liaison)</span>,
+            Bert Wijnen <span class="text-body-secondary">(IESG Liaison)</span>,
+            Michael St Johns <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
     </dl>
     <h2 class="mt-5" id="y1997">
-        1997/1998
+        1997 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -633,7 +633,7 @@ <h2 class="mt-5" id="y1997">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Geoff Huston <span class="text-muted">(Previous Chair)</span>
+            Geoff Huston <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -654,12 +654,12 @@ <h2 class="mt-5" id="y1997">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Tony Hain <span class="text-muted">(IAB Liaison)</span>,
-            Scott Bradner <span class="text-muted">(IESG Liaison)</span>,
+            Tony Hain <span class="text-body-secondary">(IAB Liaison)</span>,
+            Scott Bradner <span class="text-body-secondary">(IESG Liaison)</span>,
         </dd>
     </dl>
     <h2 class="mt-5" id="y1996">
-        1996/1997
+        1996 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -672,7 +672,7 @@ <h2 class="mt-5" id="y1996">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Guy Almes <span class="text-muted">(Previous Chair)</span>
+            Guy Almes <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -693,14 +693,14 @@ <h2 class="mt-5" id="y1996">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Radia Perlman <span class="text-muted">(IAB Liaison)</span>,
-            Joyce Reynolds <span class="text-muted">(IESG Liaison)</span>,
-            Christian Huitema <span class="text-muted">(ISOC Liaison)</span>,
-            Guy Almes <span class="text-muted">(Previous Chair)</span>,
+            Radia Perlman <span class="text-body-secondary">(IAB Liaison)</span>,
+            Joyce Reynolds <span class="text-body-secondary">(IESG Liaison)</span>,
+            Christian Huitema <span class="text-body-secondary">(ISOC Liaison)</span>,
+            Guy Almes <span class="text-body-secondary">(Previous Chair)</span>,
         </dd>
     </dl>
     <h2 class="mt-5" id="y1995">
-        1995/1996
+        1995 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -713,7 +713,7 @@ <h2 class="mt-5" id="y1995">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            John Curran <span class="text-muted">(Previous Chair)</span>
+            John Curran <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -734,12 +734,12 @@ <h2 class="mt-5" id="y1995">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Bob Moskowitz <span class="text-muted">(IAB Liaison)</span>,
-            Harald Alvestrand <span class="text-muted">(IESG Liaison)</span>,
+            Bob Moskowitz <span class="text-body-secondary">(IAB Liaison)</span>,
+            Harald Alvestrand <span class="text-body-secondary">(IESG Liaison)</span>,
         </dd>
     </dl>
     <h2 class="mt-5" id="y1994">
-        1994/1995
+        1994 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -752,7 +752,7 @@ <h2 class="mt-5" id="y1994">
             Advisor
         </dt>
         <dd class="col-sm-10">
-            Fred Baker <span class="text-muted">(Previous Chair)</span>
+            Fred Baker <span class="text-body-secondary">(Previous Chair)</span>
         </dd>
         <dt class="col-sm-2">
             Members
@@ -771,7 +771,7 @@ <h2 class="mt-5" id="y1994">
         </dd>
     </dl>
     <h2 class="mt-5" id="y1993">
-        1993/1994
+        1993 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -796,13 +796,13 @@ <h2 class="mt-5" id="y1993">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Bob Braden <span class="text-muted">(IAB Liaison)</span>,
-            Stev Knowles <span class="text-muted">(IESG Liaison)</span>,
-            Jon Postel <span class="text-muted">(IRSG Liaison)</span>,
+            Bob Braden <span class="text-body-secondary">(IAB Liaison)</span>,
+            Stev Knowles <span class="text-body-secondary">(IESG Liaison)</span>,
+            Jon Postel <span class="text-body-secondary">(IRSG Liaison)</span>,
         </dd>
     </dl>
     <h2 class="mt-5" id="y1992">
-        1992/1993
+        1992 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -821,10 +821,10 @@ <h2 class="mt-5" id="y1992">
             Liaison Members
         </dt>
         <dd class="col-sm-10">
-            Barry Leiner <span class="text-muted">(IAB Liaison)</span>,
-            Erik Huizer <span class="text-muted">(IESG Liaison)</span>,
-            Jon Postel <span class="text-muted">(IRSG Liaison)</span>,
-            Geoff Huston <span class="text-muted">(ISOC Liaison)</span>,
+            Barry Leiner <span class="text-body-secondary">(IAB Liaison)</span>,
+            Erik Huizer <span class="text-body-secondary">(IESG Liaison)</span>,
+            Jon Postel <span class="text-body-secondary">(IRSG Liaison)</span>,
+            Geoff Huston <span class="text-body-secondary">(ISOC Liaison)</span>,
         </dd>
     </dl>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/index.html b/ietf/templates/nomcom/index.html
index 91f63f74eb..e765dd7c2e 100644
--- a/ietf/templates/nomcom/index.html
+++ b/ietf/templates/nomcom/index.html
@@ -12,7 +12,7 @@ <h1>NomComs</h1>
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
-                <th scope="col" data-sort="year">Year</th>
+                <th scope="col" data-sort="year">Year Convened</th>
                 <th scope="col" data-sort="chair">Chair</th>
                 <th scope="col"></th>
             </tr>
diff --git a/ietf/templates/nomcom/list_positions.html b/ietf/templates/nomcom/list_positions.html
index e2affefb81..59e549fc3d 100644
--- a/ietf/templates/nomcom/list_positions.html
+++ b/ietf/templates/nomcom/list_positions.html
@@ -1,6 +1,6 @@
 {% extends "nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin static %}
 {% block subtitle %}- Positions{% endblock %}
 {% block nomcom_content %}
     {% origin %}
@@ -13,51 +13,122 @@ <h2 class="mb-3">Positions in {{ nomcom.group }}</h2>
             <a href="{% url 'ietf.nomcom.views.configuration_help' year=nomcom.year %}">Configuration Hints</a>.
         </p>
     {% endif %}
+
+    {% if nomcom.group.state_id == 'active' %}
+        <form class="form-inline" id="batch-action-form" method="post">
+            {% csrf_token %}
+    {% endif %}
     {% if positions %}
-        {% regroup positions by is_open as posgroups %}
-        {% for group in posgroups %}
-            <h3>{{ group.grouper| yesno:"Open Positions,Closed Positions" }}</h3>
-            {% for position in group.list %}
-                <h4>
-                    {{ position.name }}
-                    {% if position.is_iesg_position %}(IESG){% endif %}
-                </h4>
-                {% if group.grouper %}
-                    <dl class="row">
-                        <dt class="col-sm-2">
-                            Accepting
-                        </dt>
-                        <dd class="col-sm-10">
-                            {% if position.accepting_nominations %}Nominations{% endif %}
-                            {% if position.accepting_nominations and position.accepting_feedback %}and{% endif %}
-                            {% if position.accepting_feedback %}Feedback{% endif %}
-                        </dd>
-                    </dl>
-                {% endif %}
-                <dl class="row">
-                    <dt class="col-sm-2">
-                        Templates
-                    </dt>
-                    <dd class="col-sm-10">
-                        {% for template in position.get_templates %}
-                            <a href="{% url 'ietf.nomcom.views.edit_template' year template.id %}">{{ template }}</a>
-                            <br>
-                        {% endfor %}
-                    </dd>
+        <table class="table table-sm table-striped table-hover tablesorter"
+               id="position-table">
+            <thead>
+                <tr>
                     {% if nomcom.group.state_id == 'active' %}
-                        <dt class="col-sm-2">
-                            Actions
-                        </dt>
-                        <dd class="col-sm-10">
-                            <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.nomcom.views.edit_position' year position.id %}">Edit</a>
-                            <a class="btn btn-danger btn-sm"
-                               href="{% url 'ietf.nomcom.views.remove_position' year position.id %}">Remove</a>
-                        </dd>
+                        <th scope="col">
+                            ✓
+                        </th>
+                        <th scope="col"></th>
                     {% endif %}
-                </dl>
-            {% endfor %}
-        {% endfor %}
+                    <th scope="col" data-sort="position">
+                        Position
+                    </th>
+                    <th class="text-center" scope="col" data-sort="iesg">
+                        IESG
+                    </th>
+                    <th class="text-center" scope="col" data-sort="open">
+                        Open
+                    </th>
+                    <th class="text-center" scope="col" data-sort="accept_nom">
+                        Accepting Nominations
+                    </th>
+                    <th class="text-center" scope="col" data-sort="accept_fb">
+                        Accepting Feedback
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
+                {% for position in positions %}
+                    <tr>
+                        {% if nomcom.group.state_id == 'active' %}
+                            <td>
+                                <input class="batch-select form-check-input"
+                                       type="checkbox"
+                                       value="{{ position.id }}"
+                                       id="id-{{ position.id }}"
+                                       aria-label="position.name"
+                                       name="selected">
+                            </td>
+                            <td class="text-nowrap">
+                                <a class="btn btn-primary btn-sm"
+                                   href="{% url 'ietf.nomcom.views.edit_position' year position.id %}">
+                                    Edit
+                                </a>
+                                <a class="btn btn-danger btn-sm"
+                                   href="{% url 'ietf.nomcom.views.remove_position' year position.id %}">
+                                    Remove
+                                </a>
+                            </td>
+                        {% endif %}
+                        <td>
+                            {{ position.name }}
+                        </td>
+                        <td class="text-center">
+                            {{ position.is_iesg_position|yesno:"✓," }}
+                        </td>
+                        <td class="text-center">
+                            {{ position.is_open|yesno:"✓," }}
+                        </td>
+                        <td class="text-center">
+                            {{ position.accepting_nominations|yesno:"✓," }}
+                        </td>
+                        <td class="text-center">
+                            {{ position.accepting_feedback|yesno:"✓," }}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        {% if nomcom.group.state_id == 'active' %}
+            <div class="mb-3">
+                <label class="form-label" for="action">
+                    Action:
+                </label>
+                <select class="form-select" name="action" id="action">
+                    <option value="" selected="selected">
+                        ---------
+                    </option>
+                    <option value="set_iesg">
+                        Is IESG Position: Yes
+                    </option>
+                    <option value="unset_iesg">
+                        Is IESG Position: No
+                    </option>
+                    <option value="set_open">
+                        Is Open: Yes
+                    </option>
+                    <option value="unset_open">
+                        Is Open: No
+                    </option>
+                    <option value="set_accept_nom">
+                        Is Accepting Nominations: Yes
+                    </option>
+                    <option value="unset_accept_nom">
+                        Is Accepting Nominations: No
+                    </option>
+                    <option value="set_accept_fb">
+                        Is Accepting Feedback: Yes
+                    </option>
+                    <option value="unset_accept_fb">
+                        Is Accepting Feedback: No
+                    </option>
+                </select>
+            </div>
+            <button class="btn btn-warning"  type="submit" title="Run action">
+                Apply
+            </button>
+        </form>
+        {% endif %}
     {% else %}
         <p>
             There are no positions defined.
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index 2a0495fbe6..6b12f51369 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -1,147 +1,162 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{% load origin static %}
 {% load nomcom_tags %}
 {% load ietf_filters %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
 {% block title %}
     NomCom {{ year }} Private
     {% block subtitle %}{% endblock %}
 {% endblock %}
 {% block content %}
     {% origin %}
+    {% with selected=request.path|split:'/'|slice:'4:-1'|join:'-' %}
     <h1>
         NomCom {{ year }}
-        {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill bg-info">Concluded</span>{% endif %}
+        {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill text-bg-info">Concluded</span>{% endif %}
         <br>
-        <small class="text-muted">Private area
+        <small class="text-body-secondary">Private area
             {% if is_chair_task %}- Chair/Advisors only{% endif %}
         </small>
     </h1>
     <ul class="nav nav-tabs my-3">
         <li class="nav-item">
-            <a class="nav-link {% if selected == "index" %}active{% endif %}"
+            <a class="nav-link {% if selected == '' %}active{% endif %}"
                href="{% url "ietf.nomcom.views.private_index" year %}">
                 Nominees
             </a>
         </li>
         {% if nomcom|has_publickey %}
             <li class="nav-item">
-                <a class="nav-link {% if selected == "nominate" %}active{% endif %}"
+                <a class="nav-link {% if selected == 'nominate' %}active{% endif %}"
                    href="{% url 'ietf.nomcom.views.private_nominate' year %}">
                     Nominate
                 </a>
             </li>
-            <li class="nav-item">
-                <a class="nav-link {% if selected == "feedback" %}active{% endif %}"
+        {% endif %}
+        <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle {% if selected in 'feedback,view-feedback'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Feedback</a>
+            <ul class="dropdown-menu mt-n1" role="menu">
+            {% if nomcom|has_publickey %}
+            <li>
+                <a class="dropdown-item {% if selected == 'feedback' %}active{% endif %}"
                    href="{% url 'ietf.nomcom.views.private_feedback' year %}">
                     Enter feedback
                 </a>
             </li>
-        {% endif %}
-        <li class="nav-item">
-            <a class="nav-link {% if selected == "view_feedback" %}active{% endif %}"
-               href="{% url 'ietf.nomcom.views.view_feedback' year %}">
-                View feedback
-            </a>
+            {% endif %}
+            <li>
+                <a class="dropdown-item {% if selected == 'view-feedback' %}active{% endif %}"
+                   href="{% url 'ietf.nomcom.views.view_feedback' year %}">
+                    View feedback
+                </a>
+            </li>
+            </ul>
         </li>
         <li class="nav-item">
-            <a class="nav-link {% if selected == "private_key" %}active{% endif %}"
+            <a class="nav-link {% if selected == 'key' %}active{% endif %}"
                href="{% url 'ietf.nomcom.views.private_key' year %}">
                 Private key
             </a>
         </li>
         {% if user|is_chair_or_advisor:year %}
             <li class="nav-item">
-                <a class="nav-link {% if selected == "feedback_pending" %}active{% endif %}"
+                <a class="nav-link {% if selected == 'view-feedback-pending' %}active{% endif %}"
                    href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">
                     Pending emails
-                    {% if nomcom.pending_email_count %}<span class="badge rounded-pill bg-primary">{{ nomcom.pending_email_count }}</span>{% endif %}
+                    {% if nomcom.pending_email_count %}<span class="badge rounded-pill text-bg-primary">{{ nomcom.pending_email_count }}</span>{% endif %}
                 </a>
             </li>
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">Chair/Advisor Tasks</a>
+                <a class="nav-link dropdown-toggle {% if selected in 'feedback-email,questionnaire-response,extract-email-lists,send-reminder-mail-accept,send-reminder-mail-questionnaire,merge-person,merge-nominee,edit-nomcom,chair-templates,chair-position,chair-topic,edit-members,help'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Chair/advisor tasks</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     {% if nomcom.group.state_id == 'active' %}
                         <li role="presentation" class="dropdown-header">Feedback Management</li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.private_feedback_email' year %}">Enter email feedback</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'feedback-email' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_feedback_email' year %}">Enter email feedback</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.private_questionnaire' year %}">Enter questionnaire response</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'questionnaire-response' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_questionnaire' year %}">Enter questionnaire response</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.extract_email_lists' year %}">Extract email lists</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'extract-email-lists' %}active{% endif %}" href="{% url 'ietf.nomcom.views.extract_email_lists' year %}">Extract email lists</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.send_reminder_mail' year "accept" %}">Send accept reminder</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'send-reminder-mail-accept' %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "accept" %}">Send accept reminder</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.send_reminder_mail' year "questionnaire" %}">Send questionnaire reminder</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'send-reminder-mail-questionnaire' %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "questionnaire" %}">Send questionnaire reminder</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url "ietf.nomcom.views.private_merge_person" year %}">Request person record merge</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'merge-person' %}active{% endif %}" href="{% url "ietf.nomcom.views.private_merge_person" year %}">Request person record merge</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url "ietf.nomcom.views.private_merge_nominee" year %}">Merge nominee records</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'merge-nominee' %}active{% endif %}" href="{% url "ietf.nomcom.views.private_merge_nominee" year %}">Merge nominee records</a>
                         </li>
+                        <li><hr class="dropdown-divider"></li>
                     {% endif %}
                     <li role="presentation" class="dropdown-header">NomCom configuration</li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.edit_nomcom' year %}">Edit settings</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'edit-nomcom' %}active{% endif %}" href="{% url 'ietf.nomcom.views.edit_nomcom' year %}">Edit settings</a>
                     </li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.list_templates' year %}">Edit pages</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'chair-templates' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_templates' year %}">Edit pages</a>
                     </li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.list_positions' year %}">Edit positions</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'chair-position' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_positions' year %}">Edit positions</a>
                     </li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.list_topics' year %}">Edit topics</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'chair-topic' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_topics' year %}">Edit topics</a>
                     </li>
                     {% if nomcom.group.state_id == 'active' %}
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.edit_members' year %}">Edit members</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'edit-members' %}active{% endif %}" href="{% url 'ietf.nomcom.views.edit_members' year %}">Edit members</a>
                         </li>
                     {% endif %}
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.configuration_help' year %}">Configuration help</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'help' %}active{% endif %}" href="{% url 'ietf.nomcom.views.configuration_help' year %}">Configuration help</a>
                     </li>
+                    <li><hr class="dropdown-divider"></li>
                     <li role="presentation" class="dropdown-header">Other tools</li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.secr.announcement.views.main' %}">Announcement tool</a>
-                    </li>
-                    <li class="dropdown-item">
-                        <a href="https://www.ietf.org/registration/nomcom_chair/nomcomstaff.py">Secretariat private eligibility checker</a>
-                    </li>
-                    <li class="dropdown-item">
-                        <a href="https://www.ietf.org/registration/nomcom.py">Secretariat public eligibility checker</a>
+                    <li>
+                        <a class="dropdown-item" href="{% url 'ietf.secr.announcement.views.main' %}">Announcement tool</a>
                     </li>
                 </ul>
             </li>
         {% endif %}
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
+                <a class="nav-link dropdown-toggle {% if selected in 'chair-eligible,chair-volunteers'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">
                     Volunteers
                 </a>
                 <ul class="dropdown-menu mt-n1" role="menu">
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.private_eligible' year %}">
+                    <li>
+                        <a class="dropdown-item {% if selected == 'chair-eligible' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_eligible' year %}">
                             View eligible
                         </a>
                     </li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.private_volunteers' year %}">
+                    <li>
+                        <a class="dropdown-item {% if selected == 'chair-volunteers' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_volunteers' year %}">
                             View volunteers
                         </a>
                     </li>
                 </ul>
             </li>
         {% endif %}
+        <li class="nav-item">
+            <a class="nav-link"
+               href="/nomcom/{{ nomcom.year }}">
+                Public pages &raquo;
+            </a>
+        </li>
     </ul>
     {% block nomcom_content %}{% endblock %}
+    {% endwith %}
 {% endblock %}
 {% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
     <script>
         // Javascript to enable link to tab
         var url=document.location.toString();
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index 9e575a59e3..8c5fa16984 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -1,21 +1,26 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
+{# Copyright The IETF Trust 2015-2024, All Rights Reserved #}
+{% load origin static %}
 {% load nomcom_tags %}
 {% load ietf_filters %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
 {% block title %}
     NomCom {{ year }}
     {% block subtitle %}{% endblock %}
 {% endblock %}
 {% block content %}
     {% origin %}
+    {% block nomcom_announce %}{% endblock %}
+    {% with selected=request.path|split:'/'|slice:'3:-1'|join:'-' %}
     <h1>
         NomCom {{ year }}
-        {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill bg-info">Concluded</span>{% endif %}
+        {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill text-bg-info">Concluded</span>{% endif %}
     </h1>
     <ul class="nav nav-tabs my-3">
         <li class="nav-item">
-            <a class="nav-link {% if selected == "index" %}active{% endif %}"
+            <a class="nav-link {% if selected == '' %}active{% endif %}"
                href="{% url 'ietf.nomcom.views.year_index' year %}">
                 Home
             </a>
@@ -35,7 +40,7 @@ <h1>
             </li>
         {% endif %}
         <li class="nav-item">
-            <a class="nav-link {% if selected == "requirements" %}active{% endif %}"
+            <a class="nav-link {% if selected == "expertise" %}active{% endif %}"
                href="{% url 'ietf.nomcom.views.requirements' year %}">
                 Desired expertise
             </a>
@@ -48,14 +53,14 @@ <h1>
         </li>
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">Volunteers</a>
+                <a class="nav-link dropdown-toggle {% if selected in 'eligible,volunteers'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Volunteers</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     <li class="nav-item">
-                        <a class="dropdown-item"
+                        <a class="dropdown-item {% if selected == 'eligible' %}active{% endif %}"
                            href="{% url 'ietf.nomcom.views.public_eligible' year %}">View eligible</a>
                     </li>
                     <li class="nav-item">
-                        <a class="dropdown-item"
+                        <a class="dropdown-item {% if selected == 'volunteers' %}active{% endif %}"
                            href="{% url 'ietf.nomcom.views.public_volunteers' year %}">View volunteers</a>
                     </li>
                 </ul>
@@ -63,8 +68,10 @@ <h1>
         {% endif %}
     </ul>
     {% block nomcom_content %}{% endblock %}
+    {% endwith %}
 {% endblock %}
 {% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
     <script>
         $(document)
             .ready(function () {
diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html
index 2b3859269a..a7cd0c6f9b 100644
--- a/ietf/templates/nomcom/private_index.html
+++ b/ietf/templates/nomcom/private_index.html
@@ -2,13 +2,10 @@
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin static %}
 {% block subtitle %}- Administration{% endblock %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
 {% block nomcom_content %}
     {% origin %}
     <h2 class="mt-3">Nomination status</h2>
-    <table class="table table-sm table-striped table-hover tablesorter">
+    <table class="table table-sm table-striped-columns table-hover tablesorter">
         <thead class="wrap-anywhere">
             <tr>
                 <th scope="col" data-sort="position">Position</th>
@@ -156,7 +153,7 @@ <h2 class="mt-3">
                             <i class="bi bi-check"></i>
                         </th>
                     {% endif %}
-                    <th scope="col" data-sort="nominee" colspan="2">
+                    <th scope="col" data-sort="nominee">
                         Nominee
                     </th>
                     <th scope="col" data-sort="position">
@@ -194,9 +191,7 @@ <h2 class="mt-3">
                             <a href="{% url 'ietf.person.views.profile' email_or_name=np.nominee.name %}">
                                 {{ np.nominee.email.name_and_email }}
                             </a>
-                        </td>
-                        <td>
-                            <a class="btn btn-primary btn-sm"
+                            <a class="btn btn-primary btn-sm float-end"
                                href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=np.nominee.id %}#comment">
                                 View feedback
                             </a>
@@ -236,15 +231,21 @@ <h2 class="mt-3">
                         <option value="set_as_declined">
                             Set as declined
                         </option>
+                        <option value="email">
+                            Generate email list
+                        </option>
                     </select>
                 </div>
                 <button class="btn btn-warning"  type="submit" title="Run action">
                     Apply
                 </button>
             </form>
+            {% if mailto %}
+                <br>
+                <a class="btn btn-primary btn-sm"
+		   href="mailto:{{ mailto }}">Mail to selected nominees
+                </a>
+            {% endif %}
         {% endif %}
     {% endif %}
-{% endblock %}
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/private_key.html b/ietf/templates/nomcom/private_key.html
index 847389e26b..128605ecf3 100644
--- a/ietf/templates/nomcom/private_key.html
+++ b/ietf/templates/nomcom/private_key.html
@@ -7,7 +7,7 @@
     {% origin %}
     <h2>Enter private key</h2>
     <p class="mt-3">
-        In order to access the {{ nomcom.group }} data you have to enter your private key. Please paste it in the text area below. The key must be in the following format:
+        In order to access the {{ nomcom.group }} data you have to enter the NomCom group's private key (which you should have received from the NomCom Chair). The key must be in the following format:
     </p>
     <pre>
   -----BEGIN PRIVATE KEY-----
diff --git a/ietf/templates/nomcom/public_nominate.html b/ietf/templates/nomcom/public_nominate.html
index 084c1ee8d6..5320eb2acf 100644
--- a/ietf/templates/nomcom/public_nominate.html
+++ b/ietf/templates/nomcom/public_nominate.html
@@ -24,7 +24,7 @@ <h2>Nominate Candidate</h2>
                 <h2>
                     Nominees
                     <br>
-                    <small class="text-muted">who accepted nominations</small>
+                    <small class="text-body-secondary">who accepted nominations</small>
                 </h2>
                 {% for p in positions %}
                     {% if p.nomineeposition_set.accepted.not_duplicated %}
diff --git a/ietf/templates/nomcom/qualified_volunteer_list_for_announcement.txt b/ietf/templates/nomcom/qualified_volunteer_list_for_announcement.txt
new file mode 100644
index 0000000000..46fae1e06c
--- /dev/null
+++ b/ietf/templates/nomcom/qualified_volunteer_list_for_announcement.txt
@@ -0,0 +1,4 @@
+{% load ietf_filters %}{% autoescape off %}Name                     Affiliation
+
+{% for volunteer in volunteers %}{{ volunteer.person.plain_name|ljust:"25" }}{{ volunteer.affiliation|default:"No affiliation provided" }}
+{% endfor %}{% endautoescape %}
diff --git a/ietf/templates/nomcom/reclassify_feedback_item.html b/ietf/templates/nomcom/reclassify_feedback_item.html
new file mode 100644
index 0000000000..fb967493cf
--- /dev/null
+++ b/ietf/templates/nomcom/reclassify_feedback_item.html
@@ -0,0 +1,103 @@
+{# Copyright The IETF Trust 2023, All Rights Reserved #}
+{% load nomcom_tags textfilters %}
+    <h2 class="mt-3">Reclassify feedback item</h2>
+    <form method="post">
+        {% csrf_token %}
+        <table class="table table-sm">
+            <thead>
+                <tr>
+                    <th scope="col">Code</th>
+                    <th scope="col">Explanation</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th scope="row">U</th>
+                    <td>Unclassified</td>
+                </tr>
+                {% for ft in feedback_types %}
+                    <tr>
+                        <th scope="row">{{ ft.legend }}</th>
+                        <td>{{ ft.name }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        <table class="table table-sm table-striped">
+            <thead>
+                <tr>
+                    <th scope="col">Date</th>
+                    <th scope="col" class="text-center" title="Unclassified">U</th>
+                    {% for ft in feedback_types %}
+                        <th scope="col" class="text-center" title="{{ ft.name }}">{{ ft.legend }}</th>
+                    {% endfor %}
+                    <th scope="col">Author</th>
+                    <th scope="col">Subject</th>
+                    <th scope="col"></th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <!-- [html-validate-disable-block input-missing-label -- labelled via aria-label] -->
+                    <td>{{ reclassify_feedback.time|date:"r" }}</td>
+                    <td class="text-center">
+                        <input type="radio"
+                               class="form-check-input"
+                               name="type"
+                               value="unclassified"
+                               id="unclassified"
+                               aria-label="Unclassified"
+                               title="Unclassified">
+                    </td>
+                    {% for ft in feedback_types %}
+                        <td class="text-center">
+                            <input type="radio"
+                                   class="form-check-input"
+                                   name="type"
+                                   value="{{ ft.slug }}"
+                                   id="{{ ft.name|slugify }}"
+                                   aria-label="{{ ft.name }}"
+                                   {% if reclassify_feedback.type == t %}checked{% endif %}
+                                   title="{{ ft.name }}">
+                        </td>
+                    {% endfor %}
+                    <td>{{ reclassify_feedback.author }}</td>
+                    <td>{{ reclassify_feedback.subject }}</td>
+                    <td>
+                        <button type="button"
+                                class="btn btn-primary btn-sm"
+                                data-bs-toggle="modal"
+                                data-bs-target="#modal{{ reclassify_feedback.id }}">
+                            View
+                        </button>
+                        <div class="modal fade"
+                             id="modal{{ reclassify_feedback.id }}"
+                             tabindex="-1"
+                             role="dialog"
+                             aria-labelledby="label{{ reclassify_feedback.id }}"
+                             aria-hidden="true">
+                            <div class="modal-dialog modal-dialog-scrollable modal-xl">
+                                <div class="modal-content">
+                                    <div class="modal-header">
+                                        <p class="h5 modal-title" id="label{{ reclassify_feedback.id }}">{{ reclassify_feedback.subject }}</p>
+                                        <button type="button"
+                                                class="btn-close"
+                                                data-bs-dismiss="modal"
+                                                aria-label="Close"></button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <pre>{% decrypt reclassify_feedback.comments request year 1 %}</pre>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <input type="hidden" name="feedback_id" value="{{ reclassify_feedback.id }}">
+        <button class="btn btn-primary" type="submit" name="submit" value="reclassify">Classify</button>
+    </form>
diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html
index 9215d3c82c..93d61b7f42 100644
--- a/ietf/templates/nomcom/view_feedback.html
+++ b/ietf/templates/nomcom/view_feedback.html
@@ -1,11 +1,8 @@
 {% extends "nomcom/nomcom_private_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin static %}
 {% load nomcom_tags %}
 {% block subtitle %}- View feedback{% endblock %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
 {% block nomcom_content %}
     {% origin %}
     <h2 class="mt-3">Feedback related to nominees</h2>
@@ -47,13 +44,25 @@ <h3 class="mt-5" id="declined">Declined each nominated position</h3>
                         </td>
                         {% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
                             <td>
-                                {% if fbtype_newflag %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                                {% if fbtype_newflag %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                                 {{ fbtype_count }}
                             </td>
                         {% endfor %}
                     </tr>
                 {% endfor %}
             </tbody>
+            <tfoot>
+                <tr>
+                    <th scope="row">Totals</th>
+                    <td></td>
+                    <td></td>
+                    {% for fbtype_count in staterank.list|feedback_totals %}
+                    <td>
+                        {{ fbtype_count }}
+                    </td>
+                    {% endfor %}
+                </tr>
+            </tfoot>
         </table>
     {% endfor %}
     <h2 class="mt-5" id="topics">Feedback related to topics</h2>
@@ -74,7 +83,7 @@ <h2 class="mt-5" id="topics">Feedback related to topics</h2>
                     </td>
                     {% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
                         <td>
-                            {% if fbtype_newflag %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                            {% if fbtype_newflag %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                             {{ fbtype_count }}
                         </td>
                     {% endfor %}
@@ -101,7 +110,4 @@ <h2 class="mt-5" id="misc">Feedback not related to Nominees</h2>
             </tbody>
         </table>
     {% endif %}
-{% endblock %}
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index 2dd53d41d2..9194ee84bf 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -1,10 +1,13 @@
 {% extends "nomcom/nomcom_private_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% load nomcom_tags textfilters %}
 {% block subtitle %}- View feedback about {{ nominee.email.person.name }}{% endblock %}
 {% block nomcom_content %}
-    {% origin %}
+{% origin %}
+{% if reclassify_feedback %}
+    {% include "nomcom/reclassify_feedback_item.html" %}
+{% else %}
     <h2>Feedback about {{ nominee }}</h2>
     <ul class="nav nav-tabs my-3" role="tablist">
         {% for ft in feedback_types %}
@@ -26,13 +29,13 @@ <h2>Feedback about {{ nominee }}</h2>
                     {% if feedback.type.slug == ft.slug %}
                         <dl class="row">
                             <dt class="col-sm-2">
-                                {% if feedback.time > last_seen_time %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                                {% if feedback.time > last_seen_time %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                                 From
                             </dt>
                             <dd class="col-sm-10">
                                 {{ feedback.author|formatted_email|default:"Anonymous"|linkify }}
                                 {% if ft.slug == "nomina" and feedback.nomination_set.first.share_nominator %}
-                                    <span class="badge rounded-pill bg-info">OK to share name with nominee</span>
+                                    <span class="badge rounded-pill text-bg-info">OK to share name with nominee</span>
                                 {% endif %}
                             </dd>
                             <dt class="col-sm-2">
@@ -79,8 +82,26 @@ <h2>Feedback about {{ nominee }}</h2>
                                 Feedback
                             </dt>
                             <dd class="col-sm-10 pasted">
-                                {% decrypt feedback.comments request year 1 %}
+                                <pre>{% decrypt feedback.comments request year 1 %}</pre>
                             </dd>
+                            {% if user|is_chair_or_advisor:year %}
+                            <dt class="col-sm-2">
+                                <form id="reclassify-{{ feedback.id }}" method="post">
+                                    {% csrf_token %}
+                                    <input type="hidden" name="feedback_id" value="{{ feedback.id }}">
+                                    {% if ft.slug == "questio" %}
+                                    <p><button class="btn btn-warning btn-sm" type="submit" name="submit" value="download">
+                                        Download
+                                    </button></p>
+                                    {% endif %}
+                                    <button class="btn btn-warning btn-sm" type="submit" name="submit" value="reclassify">
+                                        Reclassify
+                                    </button>
+                                </form>
+                            </dt>
+                            <dd>
+                            </dd>
+                            {% endif %}
                         </dl>
                         {% if not forloop.last %}<hr>{% endif %}
                     {% endif %}
@@ -90,6 +111,7 @@ <h2>Feedback about {{ nominee }}</h2>
     </div>
     <a class="btn btn-secondary"
        href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
+{% endif %}
 {% endblock %}
 {% block js %}
     <script>
@@ -108,4 +130,4 @@ <h2>Feedback about {{ nominee }}</h2>
                     });
             });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
index 72b4beb069..5681ca5d70 100644
--- a/ietf/templates/nomcom/view_feedback_pending.html
+++ b/ietf/templates/nomcom/view_feedback_pending.html
@@ -1,11 +1,11 @@
 {% extends "nomcom/nomcom_private_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
 {% load static %}
 {% load nomcom_tags person_filters %}
 {% block pagehead %}{{ formset.media.css }}{% endblock %}
-{% block subtitle %}- Feeback pending{% endblock %}
+{% block subtitle %}- Feedback pending{% endblock %}
 {% block nomcom_content %}
     {% origin %}
     <h2>Feedback pending from email list</h2>
@@ -42,7 +42,7 @@ <h2>Feedback pending from email list</h2>
                             Type
                         </dt>
                         <dd class="col-sm-10">
-                            <span class="badge rounded-pill bg-info">{{ form.feedback_type }}</span>
+                            <span class="badge rounded-pill text-bg-info">{{ form.feedback_type }}</span>
                         </dd>
                         <dt class="col-sm-2">
                             Feedback
@@ -61,7 +61,7 @@ <h2>Feedback pending from email list</h2>
                 {% endfor %}
                 <button class="btn btn-primary"
                        type="submit"
-                       name="end">Save feedback</button>
+                       name="end" value="1">Save feedback</button>
                 <a class="btn btn-secondary float-end"
                    href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">Back</a>
             {% else %}
@@ -73,13 +73,9 @@ <h2>Feedback pending from email list</h2>
                         </tr>
                     </thead>
                     <tbody>
-                        <tr>
-                            <th scope="row">U</th>
-                            <td>Unclassified</td>
-                        </tr>
-                        {% for legend, t in type_dict.items %}
+                        {% for t in types %}
                             <tr>
-                                <th scope="row">{{ legend }}</th>
+                                <th scope="row">{{ t.legend }}</th>
                                 <td>{{ t.name }}</td>
                             </tr>
                         {% endfor %}
@@ -89,8 +85,7 @@ <h2>Feedback pending from email list</h2>
                     <thead>
                         <tr>
                             <th scope="col">Date</th>
-                            <th scope="col" class="text-center" title="Unclassified">U</th>
-                            {% for legend, t in type_dict.items %}<th scope="col" class="text-center" title="{{ t.name }}">{{ legend }}</th>{% endfor %}
+                            {% for t in types %}<th scope="col" class="text-center" title="{{ t.name }}">{{ t.legend }}</th>{% endfor %}
                             <th scope="col">Author</th>
                             <th scope="col">Subject</th>
                             <th scope="col"></th>
@@ -118,7 +113,7 @@ <h2>Feedback pending from email list</h2>
                                                title="{{ choice.1 }}">
                                     </td>
                                 {% endfor %}
-                                <td>{% person_link form.instance.author %}</td>
+                                <td>{{ form.instance.author }}</td>
                                 <td>{{ form.instance.subject }}</td>
                                 <td>
                                     <button type="button"
diff --git a/ietf/templates/nomcom/view_feedback_topic.html b/ietf/templates/nomcom/view_feedback_topic.html
index 20ee49ad08..795de5f901 100644
--- a/ietf/templates/nomcom/view_feedback_topic.html
+++ b/ietf/templates/nomcom/view_feedback_topic.html
@@ -1,10 +1,13 @@
 {% extends "nomcom/nomcom_private_base.html" %}
-{# Copyright The IETF Trust 2017, All Rights Reserved #}
+{# Copyright The IETF Trust 2017-2023, All Rights Reserved #}
 {% load origin %}
 {% load nomcom_tags textfilters %}
 {% block subtitle %}- View feedback about {{ topic.subject }}{% endblock %}
 {% block nomcom_content %}
-    {% origin %}
+{% origin %}
+{% if reclassify_feedback %}
+    {% include "nomcom/reclassify_feedback_item.html" %}
+{% else %}
     <h2>Feedback about {{ topic.subject }}</h2>
     <ul class="nav nav-tabs my-3" role="tablist">
         {% for ft in feedback_types %}
@@ -26,7 +29,7 @@ <h2>Feedback about {{ topic.subject }}</h2>
                     {% if feedback.type.slug == ft.slug %}
                         <dl class="row">
                             <dt class="col-sm-2">
-                                {% if feedback.time > last_seen_time %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                                {% if feedback.time > last_seen_time %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                                 From
                             </dt>
                             <dd class="col-sm-10">
@@ -42,8 +45,21 @@ <h2>Feedback about {{ topic.subject }}</h2>
                                 Feedback
                             </dt>
                             <dd class="col-sm-10 pasted">
-                                {% decrypt feedback.comments request year 1 %}
+                                <pre>{% decrypt feedback.comments request year 1 %}</pre>
                             </dd>
+                            {% if user|is_chair_or_advisor:year %}
+                            <dt class="col-sm-2">
+                                <form id="reclassify-{{ feedback.id }}" method="post">
+                                    {% csrf_token %}
+                                    <input type="hidden" name="feedback_id" value="{{ feedback.id }}">
+                                    <button class="btn btn-warning btn-sm" type="submit">
+                                        Reclassify
+                                    </button>
+                                </form>
+                            </dt>
+                            <dd>
+                            </dd>
+                            {% endif %}
                         </dl>
                         {% if not forloop.last %}<hr>{% endif %}
                     {% endif %}
@@ -53,6 +69,7 @@ <h2>Feedback about {{ topic.subject }}</h2>
     </div>
     <a class="btn btn-secondary"
        href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
+{% endif %}
 {% endblock %}
 {% block js %}
     <script>
@@ -71,4 +88,4 @@ <h2>Feedback about {{ topic.subject }}</h2>
                     });
             });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
index b098d7748d..0e749e748f 100644
--- a/ietf/templates/nomcom/view_feedback_unrelated.html
+++ b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -1,10 +1,13 @@
 {% extends "nomcom/nomcom_private_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% load nomcom_tags textfilters %}
 {% block subtitle %}- View unrelated feedback{% endblock %}
 {% block nomcom_content %}
-    {% origin %}
+{% origin %}
+{% if reclassify_feedback %}
+    {% include "nomcom/reclassify_feedback_item.html" %}
+{% else %}
     <h2>Feedback not related to nominees</h2>
     <ul role="tablist" class="nav nav-tabs my-3">
         {% for ft in feedback_types %}
@@ -43,8 +46,21 @@ <h2>Feedback not related to nominees</h2>
                             Feedback
                         </dt>
                         <dd class="col-sm-10 pasted">
-                            {% decrypt feedback.comments request year 1 %}
+                            <pre>{% decrypt feedback.comments request year 1 %}</pre>
                         </dd>
+                        {% if user|is_chair_or_advisor:year %}
+                        <dt class="col-sm-2">
+                            <form id="reclassify-{{ feedback.id }}" method="post">
+                                {% csrf_token %}
+                                <input type="hidden" name="feedback_id" value="{{ feedback.id }}">
+                                <button class="btn btn-warning btn-sm" type="submit">
+                                    Reclassify
+                                </button>
+                            </form>
+                        </dt>
+                        <dd>
+                        </dd>
+                        {% endif %}
                     </dl>
                 {% endfor %}
             </div>
@@ -54,6 +70,7 @@ <h2>Feedback not related to nominees</h2>
         <a class="btn btn-secondary"
            href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
     </p>
+{% endif %}
 {% endblock %}
 {% block js %}
     <script>
@@ -72,4 +89,4 @@ <h2>Feedback not related to nominees</h2>
                     });
             });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/nomcom/volunteers.html b/ietf/templates/nomcom/volunteers.html
index 5cc437c23c..008951c44e 100644
--- a/ietf/templates/nomcom/volunteers.html
+++ b/ietf/templates/nomcom/volunteers.html
@@ -1,16 +1,16 @@
 {% extends public|yesno:"nomcom/nomcom_public_base.html,nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2021, All Rights Reserved #}
 {% load origin %}
-{% load django_bootstrap5 textfilters person_filters %}
+{% load django_bootstrap5 textfilters person_filters ietf_filters%}
 {% load static %}
 {% block subtitle %}- Volunteers{% endblock %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
 {% block nomcom_content %}
     {% origin %}
     <h2>Volunteers for {{ nomcom.group }}</h2>
-    {% if not public %}<a href="{% url 'ietf.nomcom.views.private_volunteers_csv' year=year %}">Download as csv</a>{% endif %}
+    {% if not public %}
+        <a class="btn btn-primary" role="button" href="{% url 'ietf.nomcom.views.private_volunteers_csv' year=year %}">Download as csv</a>
+        <a class="btn btn-primary" role="button" href="{% url 'ietf.nomcom.views.qualified_volunteer_list_for_announcement' year=year %}">View simplified list of only qualified volunteers</a>
+    {% endif %}
     {% regroup volunteers by eligible as volunteers_by_eligibility %}
     {% for eligibility_group in volunteers_by_eligibility %}
         <h3 class="mt-3">{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}</h3>
@@ -31,7 +31,7 @@ <h3 class="mt-3">{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}<
                 {% for v in eligibility_group.list %}
                     <tr>
                         <td>{{ forloop.counter }}</td>
-                        <td>{{ v.person.last_name }}</td>
+                        <td>{{ v.person.last_name|split:'+'|join:'+<wbr>' }}</td>
                         <td>{{ v.person.first_name }}</td>
                         <td>{{ v.person.ascii_name }}</td>
                         <td>{% person_link v.person %}</td>
@@ -43,7 +43,4 @@ <h3 class="mt-3">{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}<
             </tbody>
         </table>
     {% endfor %}
-{% endblock %}
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/year_index.html b/ietf/templates/nomcom/year_index.html
index 43a03d9459..74a8cda9a0 100644
--- a/ietf/templates/nomcom/year_index.html
+++ b/ietf/templates/nomcom/year_index.html
@@ -1,7 +1,13 @@
 {% extends "nomcom/nomcom_public_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2024, All Rights Reserved #}
 {% load origin %}
 {% block subtitle %}- Home{% endblock %}
+{% block nomcom_announce %}
+    <p class="alert alert-info my-3">
+        Announcements from this nomcom are available 
+        <a href="{% url "ietf.nomcom.views.announcements" %}#nomcom-{{year}}">here</a>
+    </p>
+{% endblock %}
 {% block nomcom_content %}
     {% origin %}
     <!-- [html-validate-disable-block heading-level -- FIXME: old HTML in the database] -->
diff --git a/ietf/templates/notify_expirations/body.txt b/ietf/templates/notify_expirations/body.txt
index 96bfd759b2..e734068bb4 100644
--- a/ietf/templates/notify_expirations/body.txt
+++ b/ietf/templates/notify_expirations/body.txt
@@ -1,7 +1,7 @@
-{% load ietf_filters %}{% autoescape off %}The following draft will expire soon:
+{% load ietf_filters %}{% autoescape off %}The following Internet-Draft will expire soon:
 
 Filename: {{draft.filename}}
 Title:    {{draft.title|clean_whitespace}}
 State:    {{draft.idstate}}
 Expires:  {{expiration}} (in {{expiration|timeuntil}})
-{% endautoescape %}
\ No newline at end of file
+{% endautoescape %}
diff --git a/ietf/templates/oidc_provider/error.html b/ietf/templates/oidc_provider/error.html
index db41e63950..0499c750ea 100644
--- a/ietf/templates/oidc_provider/error.html
+++ b/ietf/templates/oidc_provider/error.html
@@ -3,9 +3,7 @@
 {% load static %}
 {% block title %}Permission Error{% endblock %}
 {% block content %}
-    <img class="col-2 mb-5"
-         src="{% static 'ietf/images/ietf-logo.svg' %}"
-         alt="IETF">
+    {% include "logo.html" with org="ietf" classes="col-2 mb-5" only %}
     <div class="alert alert-warning my-3">
         <h2>{{ error }}</h2>
         <hr>
diff --git a/ietf/templates/person/merge.html b/ietf/templates/person/merge.html
index 36499ecdbc..5c3e6b0938 100644
--- a/ietf/templates/person/merge.html
+++ b/ietf/templates/person/merge.html
@@ -1,5 +1,5 @@
+{# Copyright The IETF Trust 2018-2025, All Rights Reserved #}
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load static %}
 {% load django_bootstrap5 %}
 {% block title %}Merge Persons{% endblock %}
@@ -8,45 +8,17 @@ <h1>Merge Person Records</h1>
     <p class="alert alert-info my-3">
         This tool will merge two Person records into one.  If both records have logins and you want to retain the one on the left, use the Swap button to swap source and target records.
     </p>
-    <form method="{{ method }}">
-        {% if method == 'post' %}
-            {% csrf_token %}
-        {% endif %}
+    <form method="GET" action="{% url 'ietf.person.views.merge_submit' %}">
         <div class="row mt-3">
             <div class="col-md-6">
                 {% bootstrap_field form.source %}
-                {% if source %}
-                    {% with person=source %}
-                        {% include "person/person_info.html" %}
-                    {% endwith %}
-                {% endif %}
             </div>
             <div class="col-md-6">
                 {% bootstrap_field form.target %}
-                {% if target %}
-                    {% with person=target %}
-                        {% include "person/person_info.html" %}
-                    {% endwith %}
-                {% endif %}
             </div>
         </div>
-        {% if change_details %}<div class="alert alert-info my-3" role="alert">{{ change_details }}</div>{% endif %}
-        {% if warn_messages %}
-            {% for message in warn_messages %}<div class="alert alert-warning my-3" role="alert">{{ message }}</div>{% endfor %}
-        {% endif %}
-        {% if method == 'post' %}
-            <a class="btn btn-primary"
-               href="{% url 'ietf.person.views.merge' %}?source={{ target.pk }}&amp;target={{ source.pk }}"
-               role="button">
-                Swap
-            </a>
-        {% endif %}
-        <button type="submit" class="btn btn-warning">
-            {% if method == 'post' %}
-                Merge
-            {% else %}
-                Submit
-            {% endif %}
+        <button type="submit" class="btn btn-warning" title="Get Person information">
+            Get Info
         </button>
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/person/merge_request_email.txt b/ietf/templates/person/merge_request_email.txt
new file mode 100644
index 0000000000..0a695f036c
--- /dev/null
+++ b/ietf/templates/person/merge_request_email.txt
@@ -0,0 +1,23 @@
+Hello,
+
+We have identified multiple IETF Datatracker accounts that may represent a single person:
+
+https://datatracker.ietf.org/person/{{ source_account }}
+
+and 
+
+https://datatracker.ietf.org/person/{{ target_account }}
+
+If this is so then it is important that we merge the accounts.
+
+This email is being sent to the primary emails associated with each Datatracker account.
+
+Please respond to this message individually from the email account(s) you control so we can take the appropriate action.
+
+If these should be merged, please identify which account you would like to keep the login credentials from.
+
+If you are associated with but no longer have access to one of the email accounts, then please let us know and we will follow up to determine how to proceed.
+
+
+{{ sender_name }}
+IETF Support
\ No newline at end of file
diff --git a/ietf/templates/person/merge_submit.html b/ietf/templates/person/merge_submit.html
new file mode 100644
index 0000000000..30e1999f81
--- /dev/null
+++ b/ietf/templates/person/merge_submit.html
@@ -0,0 +1,57 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static %}
+{% load django_bootstrap5 %}
+{% block title %}Merge Persons{% endblock %}
+{% block content %}
+    <h1>Merge Person Records</h1>
+    <p class="alert alert-info my-3">
+        This tool will merge two Person records into one.  If both records have logins and you want to retain the one on the left, use the Swap button to swap source and target records.
+    </p>
+    <form method="post">
+        {% csrf_token %}
+        <div class="row mt-3">
+            <div class="col-md-6">
+                {% bootstrap_field form.source %}
+                {% if source %}
+                    {% with person=source %}
+                        {% include "person/person_info.html" %}
+                    {% endwith %}
+                {% endif %}
+            </div>
+            <div class="col-md-6">
+                {% bootstrap_field form.target %}
+                {% if target %}
+                    {% with person=target %}
+                        {% include "person/person_info.html" %}
+                    {% endwith %}
+                {% endif %}
+            </div>
+        </div>
+        {% if change_details %}<div class="alert alert-info my-3" role="alert">{{ change_details }}</div>{% endif %}
+        {% if warn_messages %}
+            {% for message in warn_messages %}<div class="alert alert-warning my-3" role="alert">{{ message }}</div>{% endfor %}
+        {% endif %}
+
+        <a class="btn btn-primary"
+           href="{% url 'ietf.person.views.merge_submit' %}?source={{ target.pk }}&amp;target={{ source.pk }}"
+           role="button"
+           title="Swap source and target">
+            Swap
+        </a>
+
+        <button type="submit" class="btn btn-warning" title="Merge Person records">
+            Merge
+        </button>
+
+        <a class="btn btn-primary"
+           href="{% url 'ietf.person.views.send_merge_request' %}?source={{ source.pk }}&amp;target={{ target.pk }}"
+           role="button"
+           title="Send email to both addresses to confirm they are the same person">
+            Send Email
+        </a>
+
+        <a class="btn btn-primary" href="{% url 'ietf.person.views.merge' %}" role="button">Back</a>
+
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/person/person_info.html b/ietf/templates/person/person_info.html
index a9e11462b2..5d3994db7e 100644
--- a/ietf/templates/person/person_info.html
+++ b/ietf/templates/person/person_info.html
@@ -11,7 +11,7 @@
     </dt>
     <dd class="col-md-9">
         {% if person.user %}
-            {{ person.user }} <span class="badge rounded-pill bg-info"> Last login
+            {{ person.user }} <span class="badge rounded-pill text-bg-info"> Last login
             {% if person.user.last_login %}
                 {{ person.user.last_login|date:"Y-m-d" }}
             {% else %}
diff --git a/ietf/templates/person/person_link.html b/ietf/templates/person/person_link.html
index 32506501b5..f3f7e1a5b7 100644
--- a/ietf/templates/person/person_link.html
+++ b/ietf/templates/person/person_link.html
@@ -1,8 +1,8 @@
-{% if email and email == "system@datatracker.ietf.org" or name and name == "(System)" %}<span class="text-muted">(System)</span>{% else %}<span {% if class %}class="{{ class }}"
+{% if email and email == "system@datatracker.ietf.org" or name and name == "(System)" %}<span class="text-body-secondary">(System)</span>{% else %}<span {% if class %}class="{{ class }}"
       {% endif %}>{% if email or name %}<a {% if class %}class="text-reset"{% endif %}
-           title="{% if title %}{{ title }}{% else %}Datatracker profile of {{ name }}.{% endif %}"
+           title="{% if title %}{{ title }}{% else %}Datatracker profile of {{ name }}{% endif %}"
            {% if email %} href="{% url 'ietf.person.views.profile' email_or_name=email %}" {% else %} href="{% url 'ietf.person.views.profile' email_or_name=name %}" {% endif %}>{{ name }}</a>{% if email and with_email %} <a {% if class %}class="text-reset"{% endif %}
                href="mailto:{{ email|urlencode }}"
-               aria-label="Compose email to {{ email }}."
-               title="Compose email to {{ email }}.">
-                <i class="bi bi-envelope"></i></a>{% endif %}{% else %}<span class="text-muted">(None)</span>{% endif %}</span>{% endif %}
\ No newline at end of file
+               aria-label="Compose email to {{ email }}"
+               title="Compose email to {{ email }}">
+                <i class="bi bi-envelope"></i></a>{% endif %}{% else %}<span class="text-body-secondary">(None)</span>{% endif %}</span>{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/person/photo.html b/ietf/templates/person/photo.html
index 4cea8ccb1f..62c1ed991c 100644
--- a/ietf/templates/person/photo.html
+++ b/ietf/templates/person/photo.html
@@ -2,7 +2,7 @@
 {% load origin static person_filters %}
 <div class="card shadow-sm mb-3 text-center photo">
     {% if name or email %}
-        <a title="Datatracker profile of {{ person.name }}."
+        <a title="Datatracker profile of {{ person.name }}"
            href="{% if name %}{% url 'ietf.person.views.profile' email_or_name=name %}{% else %}{% url 'ietf.person.views.profile' email_or_name=email %}{% endif %}">
     {% endif %}
     {% if person.photo_thumb %}
diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html
index 6732804aae..a78a90412f 100644
--- a/ietf/templates/person/profile.html
+++ b/ietf/templates/person/profile.html
@@ -7,6 +7,7 @@
 {% load group_filters %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+    <link rel="stylesheet" href="{% static "ietf/css/highcharts.css" %}">
 {% endblock %}
 {% block title %}Profile for {{ persons.0 }}{% endblock %}
 {% block content %}
@@ -22,11 +23,11 @@ <h1>
             {{ person.name }}
             {% if person.ascii != person.name %}
                 <br>
-                <span class="text-muted fs-2">({{ person.ascii }})</span>
+                <span class="text-body-secondary fs-2">({{ person.ascii }})</span>
             {% endif %}
             {% if person.pronouns %}
                 <br>
-                <span class="text-muted fs-3">Pronouns: {{person.pronouns}}</span>
+                <span class="text-body-secondary fs-3">Pronouns: {{person.pronouns}}</span>
             {% endif %}
         </h1>
         <div class="bio-text">
@@ -49,7 +50,11 @@ <h2 class="mt-5" id="roles-{{ forloop.counter }}">Roles</h2>
                 <tbody>
                     {% for role in person.role_set.all|active_roles %}
                         <tr>
-                            <td>{{ role.name.name }}</td>
+                            <td>{{ role.name.name }}
+                                {% if role.name.name == 'Reviewer' %}
+                                 (<a href="{% url 'ietf.group.views.review_requests_history' acronym=role.group.acronym %}?reviewer_email={{ role.email.address }}&since=1y">See reviews</a>)
+                                {% endif %}
+                            </td>
                             <td>
                                 <a href="{% url 'ietf.group.views.group_about' acronym=role.group.acronym %}">{{ role.group.name }}</a>
                                 (<a href="{% url 'ietf.group.views.group_about' acronym=role.group.acronym %}">{{ role.group.acronym }}</a>)
@@ -62,7 +67,7 @@ <h2 class="mt-5" id="roles-{{ forloop.counter }}">Roles</h2>
                 </tbody>
             </table>
             {% else %}
-                <p>{{ person.first_name }} has no active roles as of {{ today }}.</p>
+                <p>{{ person.first_name }} has no active roles as of {{ today|date:"Y-m-d" }}.</p>
             {% endif %}
         {% endif %}
         {% if person.personextresource_set.exists %}
@@ -87,7 +92,7 @@ <h2 class="mt-5" id="extresources-{{ forloop.counter }}">External Resources</h2>
             </table>
         {% endif %}
         <h2 class="mt-5" id="rfcs-{{ forloop.counter }}">
-            RFCs <small class="text-muted">({{ person.rfcs|length }})</small>
+            RFCs <small class="text-body-secondary">({{ person.rfcs|length }})</small>
         </h2>
         {% if person.rfcs %}
             <table class="table table-sm table-striped tablesorter">
@@ -105,13 +110,13 @@ <h2 class="mt-5" id="rfcs-{{ forloop.counter }}">
                             <td>
                                 <a class="text-nowrap" href="{{ doc.get_absolute_url }}">RFC {{ doc.rfc_number }}</a>
                             </td>
-                            <td>{{ doc.pub_date|date:"b Y"|title }}</td>
+                            <td data-sort-number="{{ doc.pub_date|date:"U" }}">{{ doc.pub_date|date:"b Y"|title }}</td>
                             <td>{{ doc.title|urlize_ietf_docs }}</td>
                             <td class="text-end">
-                                {% with doc.referenced_by_rfcs.count as refbycount %}
+                                {% with doc.referenced_by_rfcs_as_rfc_or_draft.count as refbycount %}
                                     {% if refbycount %}
                                         <a class="text-end"
-                                           href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.canonical_name %}"
+                                           href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.name %}"
                                            rel="nofollow">
                                             {{ refbycount }} RFC{{ refbycount|pluralize }}
                                         </a>
@@ -123,24 +128,24 @@ <h2 class="mt-5" id="rfcs-{{ forloop.counter }}">
                 </tbody>
             </table>
         {% else %}
-            {{ person.first_name }} has no RFCs as of {{ today }}.
+            {{ person.first_name }} has no RFCs as of {{ today|date:"Y-m-d" }}.
         {% endif %}
         <h2 class="mt-5" id="drafts-{{ forloop.counter }}">
-            Active Drafts <small class="text-muted">({{ person.active_drafts|length }})</small>
+            Active Internet-Drafts <small class="text-body-secondary">({{ person.active_drafts|length }})</small>
         </h2>
         {% if person.active_drafts.exists %}
             <ul>
                 {% for doc in person.active_drafts %}
                     <li>
-                        <a href="{{ doc.get_absolute_url }}">{{ doc.canonical_name }}</a>
+                        <a href="{{ doc.get_absolute_url }}">{{ doc.name }}</a>
                     </li>
                 {% endfor %}
             </ul>
         {% else %}
-            {{ person.first_name }} has no active drafts as of {{ today }}.
+            {{ person.first_name }} has no active Internet-Drafts as of {{ today|date:"Y-m-d" }}.
         {% endif %}
         <h2 class="mt-5">
-            Expired Drafts <small class="text-muted">({{ person.expired_drafts|length }})</small>
+            Expired Internet-Drafts <small class="text-body-secondary">({{ person.expired_drafts|length }})</small>
         </h2>
         {% if person.expired_drafts.exists %}
             <ul>
@@ -148,19 +153,19 @@ <h2 class="mt-5">
                     {% if not doc.replaced_by %}
                         <li>
                             <a href="{{ doc.get_absolute_url }}">
-                                {{ doc.canonical_name }}
+                                {{ doc.name }}
                             </a>
                         </li>
                     {% endif %}
                 {% endfor %}
             </ul>
-            (Excluding replaced drafts.)
+            (Excluding replaced Internet-Drafts.)
         {% else %}
-            {{ person.first_name }} has no expired drafts as of {{ today }}.
+            {{ person.first_name }} has no expired Internet-Drafts as of {{ today|date:"Y-m-d" }}.
         {% endif %}
         {% if person.has_drafts %}
             <h2 class="mt-5">
-                Draft Activity
+                Internet-Draft Activity
             </h2>
             <div id="chart-{{ forloop.counter }}">
             </div>
diff --git a/ietf/templates/person/send_merge_request.html b/ietf/templates/person/send_merge_request.html
new file mode 100644
index 0000000000..f0c6272dca
--- /dev/null
+++ b/ietf/templates/person/send_merge_request.html
@@ -0,0 +1,20 @@
+{# Copyright The IETF Trust 2025, All Rights Reserved #}
+{% extends "base.html" %}
+{% load static %}
+{% load django_bootstrap5 %}
+{% block title %}Send Merge Notice{% endblock %}
+{% block content %}
+    <h1>Send Merge Notice</h1>
+    {% if form.non_field_errors %}<div class="my-3 alert alert-danger">{{ form.non_field_errors }}</div>{% endif %}
+    <form id="email-form" method="post">
+        {% csrf_token %}
+        {% bootstrap_field form.to layout='horizontal' %}
+        {% bootstrap_field form.frm layout='horizontal' %}
+        {% bootstrap_field form.reply_to layout='horizontal' %}
+        {% bootstrap_field form.subject layout='horizontal' %}
+        {% bootstrap_field form.body layout='horizontal' %}
+        <button type="submit" class="btn btn-primary">Send</button>
+        <a class="btn btn-secondary float-end"
+               href="{% url 'ietf.person.views.merge' %}">Cancel</a>
+    </form>
+{% endblock %}
diff --git a/ietf/templates/registration/.gitignore b/ietf/templates/registration/.gitignore
deleted file mode 100644
index a74b07aee4..0000000000
--- a/ietf/templates/registration/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.pyc
diff --git a/ietf/templates/registration/add_email_exists_email.txt b/ietf/templates/registration/add_email_exists_email.txt
new file mode 100644
index 0000000000..ed23a746e1
--- /dev/null
+++ b/ietf/templates/registration/add_email_exists_email.txt
@@ -0,0 +1,14 @@
+{% autoescape off %}{% load ietf_filters %}
+Hello,
+
+{% filter wordwrap:78 %}We have received a request to add the email address {{ email }} to the user account '{{ person.user }}' at {{ domain }}.
+This email address {{ email }} is already associated with your account at {{ domain }} and cannot be associated with two accounts.{% endfilter %}
+
+If you did not request this change, you may safely ignore this email,
+as no actions have been taken.
+
+Best regards,
+
+	The datatracker login manager service
+	(for the IETF Secretariat)
+{% endautoescape %}
diff --git a/ietf/templates/registration/change_password.html b/ietf/templates/registration/change_password.html
index 1df189031d..58bc2d2587 100644
--- a/ietf/templates/registration/change_password.html
+++ b/ietf/templates/registration/change_password.html
@@ -6,8 +6,7 @@
 {% block title %}Change password{% endblock %}
 {% block js %}
     {{ block.super }}
-    <script src="{% static 'ietf/js/zxcvbn.js' %}"></script>
-    <script src="{% static 'ietf/js/password_strength.js' %}"></script>
+    {{ form.media.js }}
 {% endblock %}
 {% block content %}
     {% origin %}
@@ -35,11 +34,14 @@ <h1>Change password</h1>
             <button type="submit" class="btn btn-primary">Change password</button>
         </form>
         <div class="alert alert-info mt-5">
-            <b>Online attack: </b>This password form uses the
+            <b>Password strength requirements: </b>
+            You must choose a password at least 12 characters long that scores at least a 3 according to the
             <a href="https://blogs.dropbox.com/tech/2012/04/zxcvbn-realistic-password-strength-estimation/">zxcvbn</a>
-            password strength estimator to give an indication of password strength.
-            The crack time estimate given above assume online attack without rate
-            limiting, at a rate of 10 attempts per second.
+            password strength estimator. A warning will appear if your password does not meet this standard.
+            <hr>
+            <b>Online attack: </b>
+            The crack time estimate given above assumes an online attack at a rate of 10 attempts per second.
+            It is only a very rough guideline.
             <hr>
             <b>Offline cracking: </b>
             The datatracker currently uses the <code>{{ hasher.algorithm }}</code>
diff --git a/ietf/templates/registration/confirm_account.html b/ietf/templates/registration/confirm_account.html
index b419b5f34c..d6639d8e77 100644
--- a/ietf/templates/registration/confirm_account.html
+++ b/ietf/templates/registration/confirm_account.html
@@ -6,8 +6,7 @@
 {% block title %}Complete account creation{% endblock %}
 {% block js %}
     {{ block.super }}
-    <script src="{% static 'ietf/js/zxcvbn.js' %}"></script>
-    <script src="{% static 'ietf/js/password_strength.js' %}"></script>
+    {{ form.media.js }}
 {% endblock %}
 {% block content %}
     {% origin %}
diff --git a/ietf/templates/registration/confirm_new_email.html b/ietf/templates/registration/confirm_new_email.html
index 9599564370..c5449c5e1e 100644
--- a/ietf/templates/registration/confirm_new_email.html
+++ b/ietf/templates/registration/confirm_new_email.html
@@ -13,9 +13,15 @@ <h1>Confirm new email address</h1>
         <a class="btn btn-primary my-3"
            href="{% url "ietf.ietfauth.views.profile" %}">Edit profile</a>
     {% elif new_email_obj %}
-        <p class="alert alert-success my-3">
-            Your account {{ username }} has been updated to include the email address {{ email|linkify }}.
-        </p>
+        {% if already_confirmed %} 
+            <p class="alert alert-info my-3">
+                Your account {{ username }} already includes the email address {{ email|linkify }}.
+            </p>
+        {% else %}
+            <p class="alert alert-success my-3">
+                Your account {{ username }} has been updated to include the email address {{ email|linkify }}.
+            </p>
+        {% endif %}
         <a class="btn btn-primary my-3"
            href="{% url "ietf.ietfauth.views.profile" %}">Edit profile</a>
     {% else %}
diff --git a/ietf/templates/registration/confirm_profile_update.html b/ietf/templates/registration/confirm_profile_update.html
index af9fc33c9d..259b010810 100644
--- a/ietf/templates/registration/confirm_profile_update.html
+++ b/ietf/templates/registration/confirm_profile_update.html
@@ -1,10 +1,10 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% extends "base.html" %}
 {% load origin textfilters %}
-{% block title %}Profile update successful{% endblock %}
+{% block title %}Account information update successful{% endblock %}
     {% block content %}
         {% origin %}
-        <h1>Profile update successful</h1>
+        <h1>Account information update successful</h1>
         <p class="my-3">
             Your account has been updated to reflect the changes you submitted.
         </p>
@@ -14,5 +14,5 @@ <h1>Profile update successful</h1>
             </p>
         {% endfor %}
         <a class="btn btn-primary"
-           href="{% url "ietf.ietfauth.views.profile" %}">Edit profile</a>
+           href="{% url "ietf.ietfauth.views.profile" %}">Edit account information</a>
     {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/creation_exists_email.txt b/ietf/templates/registration/creation_exists_email.txt
new file mode 100644
index 0000000000..a7dc363ac5
--- /dev/null
+++ b/ietf/templates/registration/creation_exists_email.txt
@@ -0,0 +1,17 @@
+{% autoescape off %}{% load ietf_filters %}
+Hello,
+
+{% filter wordwrap:78 %}We have received an account creation request for {{ username }} at {{ domain }}.{% endfilter %}
+
+{% filter wordwrap:78 %}A datatracker account for that email already exists. If you have forgotten the password for the {{ username }} account, please go to the following link and follow the instructions there:{% endfilter %}
+
+   https://{{ domain }}{% url "ietf.ietfauth.views.password_reset" %}
+
+If you have not requested the account creation you can ignore this email, your
+credentials have been left untouched.
+
+Best regards,
+
+    The datatracker login manager service
+    (for the IETF Secretariat)
+{% endautoescape %}
diff --git a/ietf/templates/registration/edit_profile.html b/ietf/templates/registration/edit_profile.html
index bebf8a924b..1e4ab169e1 100644
--- a/ietf/templates/registration/edit_profile.html
+++ b/ietf/templates/registration/edit_profile.html
@@ -3,14 +3,10 @@
 {% load origin %}
 {% load widget_tweaks django_bootstrap5 textfilters ietf_filters %}
 {% load person_filters %}
-{% block title %}Profile for {{ user }}{% endblock %}
+{% block title %}Your account{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Profile information for {{ user.person.name }}</h1>
-    <p class="my-3">
-        The information you provide below is used to generate your
-        <a href="{% url 'ietf.person.views.profile' email_or_name=user.person.email %}">public datatracker profile page</a>
-    </p>
+    <h1>Your account</h1>
     <form class="form-horizontal" method="post">
         {% csrf_token %}
         {% bootstrap_form_errors person_form %}
@@ -20,9 +16,6 @@ <h1>Profile information for {{ user.person.name }}</h1>
         <div class="row mb-3">
             <label class="col-sm-2 col-form-label fw-bold">
                 User name
-                <a href="#pi" aria-label="!">
-                    <i class="bi bi-exclamation-circle"></i>
-                </a>
             </label>
             <div class="col-sm-10">
                 <p class="form-control-plaintext">
@@ -34,23 +27,24 @@ <h1>Profile information for {{ user.person.name }}</h1>
         <div class="row mb-3">
             <label class="col-sm-2 col-form-label fw-bold">
                 Password
-                <a href="#pi" aria-label="!">
-                    <i class="bi bi-exclamation-circle"></i>
-                </a>
             </label>
             <div class="col-sm-10">
                 <a class="btn btn-primary" href="{% url 'ietf.ietfauth.views.change_password' %}">Change password</a>
             </div>
         </div>
-        {% if person.photo %}
+        {% if person.photo or person.role_set.exists %}
             <div class="row mb-3">
                 <label class="col-sm-2 col-form-label fw-bold">
                     Photo
-                    <a href="#pi" aria-label="!">
-                        <i class="bi bi-exclamation-circle"></i>
-                    </a>
                 </label>
-                <div class="col-sm-10">{% include "person/photo.html" with person=person %}</div>
+                <div class="col-sm-10">
+                    {% if person.photo %}
+                    {% include "person/photo.html" with person=person %}
+                    {% endif %}
+                    {% if person.role_set.exists %}
+                    <p>Email <a href="support@ietf.org">support@ietf.org</a>
+                    to update your photo.</p></div>
+                    {% endif %}
             </div>
         {% endif %}
         <div class="row mb-3">
@@ -89,16 +83,24 @@ <h1>Profile information for {{ user.person.name }}</h1>
                     <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc8713' %}">RFC 8713</a>
                     for eligibility requirements.
                     For the 2021 and 2022 NomComs, see also
-                    <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc8989' %}">RFC 8989</a>.
+                    <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc9389' %}">RFC 9389</a>.
                 </p>
             {% endif %}
         </div>
+        <hr>
+        <div class="row mb-3">
+            <label class="col-sm-2 col-form-label fw-bold">
+                Published information
+            </label>
+            <p class="col-sm-10">
+              All of the data below {% if person.photo %}and your photo {% endif %}
+              may be openly published in Datatracker, Meetecho and other IT systems.
+            </p>
+        </div>
+        {% bootstrap_form person_form layout="horizontal" exclude="ascii_short" %}
         <div class="row mb-3">
             <label class="col-sm-2 col-form-label fw-bold">
                 External resources
-                <a href="#pi" aria-label="!">
-                    <i class="bi bi-exclamation-circle"></i>
-                </a>
             </label>
             <div class="col-sm-10">
                 {% if person.personextresource_set.all %}
@@ -121,6 +123,14 @@ <h1>Profile information for {{ user.person.name }}</h1>
         </div>
         <div class="row mb-3">
             <label class="col-sm-2 col-form-label fw-bold">Email addresses</label>
+            <p class="col-sm-10">
+                You can optionally link more email addresses to your account, 
+                which will then ensure that all I-Ds you have published using 
+                different email addresses are all shown against your account.
+            </p>
+        </div>
+        <div class="row mb-3">
+            <div class="col-sm-2"></div>
             <div class="col-sm-10 emails">
                 <table class="table table-sm">
                     <thead>
@@ -152,11 +162,6 @@ <h1>Profile information for {{ user.person.name }}</h1>
                                        {% if email.active %}checked{% endif %}>
                             </td>
                             <td>
-                                {% if email.origin == person.user.username or email.origin == '' %}
-                                    <a href="#pi" aria-label="!">
-                                        <i class="bi bi-exclamation-circle"></i>
-                                    </a>
-                                {% endif %}
                                 {{ email|linkify }}
                             </td>
                             <td>{{ email.origin|default:'(unknown)'|urlize_ietf_docs }}</td>
@@ -172,56 +177,23 @@ <h1>Profile information for {{ user.person.name }}</h1>
                 {% endfor %}
                 <div class="new-emails"></div>
                 <div>
-                    <button type="button" class="btn btn-primary add-email mb-5">Add new email address</button>
+                    <button type="button" class="btn btn-primary add-email mt-3 mb-5">Add another email address</button>
                 </div>
                 {% for role in roles %}
                     {% bootstrap_field role.email_form.email  show_label=False %}
                 {% endfor %}
             </div>
         </div>
-        {% bootstrap_form person_form layout="horizontal" exclude="ascii_short" %}
-        {% bootstrap_button button_type="submit" content="Submit" extra_classes="offset-sm-2" %}
+        {% bootstrap_button button_type="submit" content="Apply changes" extra_classes="offset-sm-2" %}
     </form>
     <div class="form-text mt-5">
-        <p id="pi">
-            <b><i class="bi bi-exclamation-circle"></i> Personal information requiring consent</b>
-        </p>
-        <p>
-            Personal information in the datatracker which is derived from your contributions
-            to the IETF standards development process is covered by the EU General Data Protection
-            Regulation's
-            <a href="https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679#d1e1888-1-1">
-                Article 6(1)&nbsp;(f)
-            </a>
-            covering IETF's Legitimate Interest due to the IETF's mission of developing standards
-            for the internet.  See also the page on
-            <a href="{% url 'personal-information' %}">
-                handling
-                of personal information
-            </a>.
-        </p>
-        <p>
-            Personal information which is <i>not</i> derived from your contributions is covered by the EU
-            <a href="https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679#d1e1888-1-1">
-                GDPR Article 6(1)&nbsp;(a)
-            </a>
-            regarding consent.  All such information is visible on this page and shown with the
-            <i class="bi bi-exclamation-circle"></i> symbol next to it, or listed on your
-            <a href="{% url 'ietf.community.views.view_list' user.username %}">notification subscription page</a>.
-            Most of this
-            information can be edited or removed on these pages.  There are some exceptions, such
-            as photos, which currently require an email to
-            <a href="mailto:{{ settings.SECRETARIAT_SUPPORT_EMAIL }}">the Secretariat</a>
-            if you wish to update or remove the information.
-        </p>
         <p>
             All the information the datatracker has that is coupled to this account and visible
             on this page or otherwise related to your work on ietf documents, is also available
             to you as a
             <a href="{% url 'ietf.api.views.PersonalInformationExportView' %}">JSON blob</a>
             when
-            you are logged in.  It contains both the Legitimate Interest information and the information
-            that requires Consent.
+            you are logged in.
         </p>
     </div>
 {% endblock %}
@@ -261,10 +233,10 @@ <h1>Profile information for {{ user.person.name }}</h1>
                     .closest("form")
                     .find(".new-emails");
 
-                $('<input class="form-control mb-3" name="new_email" placeholder="You will get a confirmation challenge. To add an address that cannot confirm, contact the secretariat.">')
+                $('<input class="form-control mb-1" name="new_email" placeholder="You will get a confirmation challenge. To add an address that cannot be confirmed this way, contact the secretariat.">')
                     .appendTo(container)
                     .trigger("focus");
-                $('<div class="float-end text-muted small">Remember to submit the form for the new email challenge to be sent.</div>')
+                $('<div class="float-end text-body-secondary small mb-3">Remember to submit the form for the new email challenge to be sent.</div>')
                     .appendTo(container);
             })
         });
diff --git a/ietf/templates/registration/login.html b/ietf/templates/registration/login.html
index a3ec86a355..01949e0f30 100644
--- a/ietf/templates/registration/login.html
+++ b/ietf/templates/registration/login.html
@@ -1,12 +1,13 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% extends "base.html" %}
+{% load static %}
 {% load origin %}
 {% load django_bootstrap5 %}
 {% block title %}Sign in{% endblock %}
 {% block content %}
     {% origin %}
     <h1>Sign in</h1>
-    <form method="post">
+    <form method="post" id="dt-login-form">
         {% csrf_token %}
         {% bootstrap_form form %}
         <div class="mt-4 mb-3">
@@ -16,4 +17,7 @@ <h1>Sign in</h1>
         </div>
         Don't have an account? <a href="{% url 'ietf.ietfauth.views.create_account' %}">Create an account</a>.
     </form>
+{% endblock %}
+{% block js %}
+    <script src="{% static 'ietf/js/login.js' %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/release/about.html b/ietf/templates/release/about.html
index 5366580122..85a74bb6d9 100644
--- a/ietf/templates/release/about.html
+++ b/ietf/templates/release/about.html
@@ -23,6 +23,15 @@ <h1>About the IETF Datatracker</h1>
         moments.  For the nitty-gritty week-to-week code changes, please check the release
         notes or the commit log.
     </p>
+    <h2>Version 12.0.0: RFCs and Subseries as Document types</h2>
+    <h2>Version 11.0.0: Django 4</h2>
+    <h2>Version 10.0.0: Migration to PostgreSQL as the backend database engine</h2>
+    <h2>Version 9.0.0: Timezone Aware Data</h2>
+    <p>All timestamps in the database are now stored as UTC. Values reported through the API for several 
+        models changed, particularly Meeting based models such as TimeSlot where times had previously been
+        stored in the timezone of the meeting location. The 9.0.0 release leaves _presentation_ of the times
+        in Pacific (daylight/standard).
+    </p>
     <h2>Version 8.0.0: Facelift using Bootstrap 5</h2>
     <h2>Version 7.0.0: Django 2</h2>
     <h2>Version 6.0.0: Facelift using Bootstrap 3</h2>
@@ -98,7 +107,7 @@ <h2>Version 1.0: Initial Perl/MySQL database and web-pages</h2>
         The first version of the idtracker was commissioned by the IESG under <i>Harald
         Alvestrand</i> in 2001, and the IESG started using it at the beginning of 2002.  It was
         written by <i>Michael Lee</i> in Perl, with direct SQL statements.  It provided a
-        major improvement in visibility of the progress of drafts by the IESG.
+        major improvement in visibility of the progress of Internet-Drafts by the IESG.
         The first
         <a href="https://www.ietf.org/proceedings/55/slides/plenary-6/plenary-6.ppt">
         public presentation
@@ -106,4 +115,4 @@ <h2>Version 1.0: Initial Perl/MySQL database and web-pages</h2>
         of it and its capabilities was made 2002-11-20
         in Atlanta by Thomas Narten.
     </p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/review/completed_review.txt b/ietf/templates/review/completed_review.txt
index bdbe321ca1..7d10d8bf13 100644
--- a/ietf/templates/review/completed_review.txt
+++ b/ietf/templates/review/completed_review.txt
@@ -1,7 +1,9 @@
 {% load ietf_filters %}{% autoescape off %}{% filter maybewordwrap:80 %}{% if assignment.state_id == "part-completed" %}
 Review is partially done. Another assignment may be needed to complete it.
 
-{% endif %}Reviewer: {{ assignment.reviewer.person }}
+{% endif %}Document: {{ assignment.review_request.doc.name }}
+Title: {{ assignment.review_request.doc.title }}
+Reviewer: {{ assignment.reviewer.person }}
 Review result: {{ assignment.result.name }}
 
 {{ content }}
diff --git a/ietf/templates/review/reviewer_assignment_rejected.txt b/ietf/templates/review/reviewer_assignment_rejected.txt
index 001de69b31..e050f582f6 100644
--- a/ietf/templates/review/reviewer_assignment_rejected.txt
+++ b/ietf/templates/review/reviewer_assignment_rejected.txt
@@ -3,4 +3,9 @@
 Explanation:
 
 {{ message_to_secretary }}
-{% endif %}{% endautoescape %}
+
+{% endif %}
+{% if wants_to_be_next %}
+User requested to be next in queue.
+{% endif %}
+{% endautoescape %}
diff --git a/ietf/templates/review/unavailable_table.html b/ietf/templates/review/unavailable_table.html
index ea34bf2cbe..573f1c3ff4 100644
--- a/ietf/templates/review/unavailable_table.html
+++ b/ietf/templates/review/unavailable_table.html
@@ -1,25 +1,54 @@
-<table class="mt-2 mb-0 table table-sm table-borderless">
+{% load origin %}
+{% origin %}
+<table class="m-0 p-0 table table-sm table-borderless">
+    <thead class="d-nones">
+        <tr>
+            <th scope="row" class="p-0 col-3"></th>
+            <th scope="row" class="p-0 col"></th>
+        </tr>
+    </thead>
     <tbody>
+    {% if person %}
+        {% if person.settings.min_interval %}
+            <tr>
+                <th class="bg-transparent p-0 pe-1" scope="row">Can review:</th>
+                <td class="bg-transparent p-0">{{ person.settings.get_min_interval_display }}</td>
+            </tr>
+        {% endif %}
+        {% if person.settings.skip_next %}
+            <tr>
+                <th class="bg-transparent p-0 pe-1" scope="row">Skip next:</th>
+                <td class="bg-transparent p-0">{{ person.settings.skip_next|yesno }}</td>
+            </tr>
+        {% endif %}
+        {% if person.settings.filter_re %}
+            <tr>
+                <th class="bg-transparent p-0 pe-1" scope="row">Filter:</th>
+                <td class="bg-transparent p-0"><code title="{{ person.settings.filter_re }}">{{ person.settings.filter_re }}</code></td>
+            </tr>
+        {% endif %}
+    {% endif %}
     {% for p in unavailable_periods %}
         <tr class="unavailable-period-{{ p.state }}">
-            <th scope="row">Period:</th>
-            <td>{{ p.state }}</td>
+            <th class="bg-transparent p-0 pe-1" scope="row">Period:</th>
+            <td class="bg-transparent p-0">{{ p.state }}</td>
         </tr>
         <tr class="unavailable-period-{{ p.state }}">
-            <th scope="row">Dates:</th>
-            <td>
-                {% if p.start_date or p.end_date %}{{ p.start_date|default:"&infin;" }} -{% endif %}
-                {{ p.end_date|default:"&infin;" }}
+            <th class="bg-transparent p-0 pe-1" scope="row">Dates:</th>
+            <td class="bg-transparent p-0">
+                {% if p.start_date or p.end_date %}{{ p.start_date|default:"&infin;" }}-{% endif %}{{ p.end_date|default:"&infin;" }}
             </td>
         </tr>
         <tr class="unavailable-period-{{ p.state }}">
-            <th scope="row">Availability:</th>
-            <td>{{ p.get_availability_display }}</td>
+            <th class="bg-transparent p-0 pe-1" scope="row">Available:</th>
+            <td class="bg-transparent p-0">{{ p.get_availability_display }}</td>
         </tr>
+        {% if p.reason %}
         <tr class="unavailable-period-{{ p.state }}">
-            <th scope="row">Reason:</th>
-            <td>{{ p.reason }}</td>
+            <th class="bg-transparent p-0 pe-1" scope="row">Reason:</th>
+            <td class="bg-transparent p-0">{{ p.reason }}</td>
         </tr>
+        {% endif %}
     {% endfor %}
     </tbody>
 </table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats.html b/ietf/templates/stats/document_stats.html
deleted file mode 100644
index 8a44581725..0000000000
--- a/ietf/templates/stats/document_stats.html
+++ /dev/null
@@ -1,85 +0,0 @@
-{% extends "base.html" %}
-{% load origin %}
-{% load ietf_filters static %}
-{% block title %}{{ stats_title }}{% endblock %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
-{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>Draft/RFC statistics</h1>
-    <div class="row my-3">
-        <label class="fw-bold col-sm-2 col-form-label">Documents:</label>
-        <div class="btn-group col-sm-10">
-            {% for slug, label, url in possible_document_stats_types %}
-                <a class="btn btn-outline-primary
-                          {% if slug == stats_type %}
-                              active
-                          {% endif %}"
-                   href="{{ url }}">{{ label }}</a>
-            {% endfor %}
-        </div>
-    </div>
-    <div class="row my-3">
-        <label class="fw-bold col-sm-2 col-form-label">Authors:</label>
-        <div class="btn-group col-sm-10">
-            {% for slug, label, url in possible_author_stats_types %}
-                <a class="btn btn-outline-primary
-                          {% if slug == stats_type %}
-                              active
-                          {% endif %}"
-                   href="{{ url }}">{{ label }}</a>
-            {% endfor %}
-        </div>
-    </div>
-    <div class="row my-3">
-        <label class="fw-bold col-sm-2 col-form-label">Yearly:</label>
-        <div class="btn-group col-sm-10">
-            {% for slug, label, url in possible_yearly_stats_types %}
-                <a class="btn btn-outline-primary
-                          {% if slug == stats_type %}
-                              active
-                          {% endif %}"
-                   href="{{ url }}">{{ label }}</a>
-            {% endfor %}
-        </div>
-    </div>
-    <h2>Options</h2>
-    <div class="row my-3">
-        <label class="fw-bold col-sm-2 col-form-label">Document type:</label>
-        <div class="btn-group col-sm-10">
-            {% for slug, label, url in possible_document_types %}
-                <a class="btn btn-outline-primary
-                          {% if slug == document_type %}
-                              active
-                          {% endif %}"
-                   href="{{ url }}">{{ label }}</a>
-            {% endfor %}
-        </div>
-    </div>
-    <div class="row my-3">
-        <label class="fw-bold col-sm-2 col-form-label">Time:</label>
-        <div class="btn-group col-sm-10">
-            {% for slug, label, url in possible_time_choices %}
-                <a class="btn btn-outline-primary
-                          {% if slug == time_choice %}
-                              active
-                          {% endif %}"
-                   href="{{ url }}">{{ label }}</a>
-            {% endfor %}
-        </div>
-    </div>
-    <div class="alert alert-info my-3">
-        <b>Please Note:</b> The author information in the datatracker about RFCs
-        with numbers lower than about 1300 and drafts from before 2001 is
-        unreliable and in many cases absent.  For this reason, statistics on these
-        pages does not show correct author stats for corpus selections that involve such
-        documents.
-    </div>
-    {% include content_template %}
-{% endblock %}
-{% block js %}
-    <script src="{% static 'ietf/js/highcharts.js' %}"></script>
-    <script src="{% static 'ietf/js/stats.js' %}"></script>
-    <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_author_affiliation.html b/ietf/templates/stats/document_stats_author_affiliation.html
deleted file mode 100644
index aecdb0ba39..0000000000
--- a/ietf/templates/stats/document_stats_author_affiliation.html
+++ /dev/null
@@ -1,113 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            type: "category",
-            title: {
-                text: 'Affiliation'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of authors'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.points[0].key + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="affiliation">Affiliation</th>
-            <th scope="col" data-sort="percent">Percentage of authors</th>
-            <th scope="col" data-sort="count">Authors</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for affiliation, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ affiliation|default:"(unknown)" }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
-<p>
-    The statistics are based entirely on the author affiliation
-    provided with each draft. Since this may vary across documents, an
-    author may be counted with more than one affiliation, making the
-    total sum more than 100%.
-</p>
-<h2>Affiliation Aliases</h2>
-<p>
-    In generating the above statistics, some heuristics have been
-    applied to determine the affiliations of each author.
-</p>
-{% if request.GET.showaliases %}
-    <p>
-        <a href="{{ hide_aliases_url }}" class="btn btn-primary">Hide generated aliases</a>
-    </p>
-    {% if request.user.is_staff %}
-        <p>
-            Note: since you're an admin, you can
-            <a href="{% url "admin:stats_affiliationalias_add" %}">add an extra known alias</a>
-            or see the
-            <a href="{% url "admin:stats_affiliationalias_changelist" %}">existing known aliases</a>
-            and
-            <a href="{% url "admin:stats_affiliationignoredending_changelist" %}">generally ignored endings</a>.
-        </p>
-    {% endif %}
-    {% if alias_data %}
-        <table class="table table-sm table-striped tablesorter">
-            <thead>
-                <tr>
-                    <th scope="col" data-sort="affiliation">Affiliation</th>
-                    <th scope="col" data-sort="alias">Alias</th>
-                </tr>
-            </thead>
-            {% if alias_data %}
-                <tbody>
-                    {% for name, alias in alias_data %}
-                        <tr>
-                            <td>{{ name|default:"(unknown)" }}</td>
-                            <td>{{ alias }}</td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            {% endif %}
-        </table>
-    {% endif %}
-{% else %}
-    <p>
-        <a href="{{ show_aliases_url }}" class="btn btn-primary">Show generated aliases</a>
-    </p>
-{% endif %}
diff --git a/ietf/templates/stats/document_stats_author_citations.html b/ietf/templates/stats/document_stats_author_citations.html
deleted file mode 100644
index ae89335fae..0000000000
--- a/ietf/templates/stats/document_stats_author_citations.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{% load origin %}{% origin %}
-<div id="chart"></div>
-
-<script>
-    var chartConf = {
-        chart: {
-            type: 'area'
-        },
-        plotOptions: {
-            area: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            title: {
-                text: 'Number of citations of {{ doc_label }}s by author'
-            },
-            max: 500
-        },
-        yAxis: {
-            title: {
-                text: 'Percentage of authors'
-            },
-            labels: {
-                formatter: function () {
-                    return this.value + '%';
-                }
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.x + ' ' + (this.x == 1 ? "citation" : 'citations') + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-
-<h2>Data</h2>
-
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="num">Citations</th>
-            <th scope="col" data-sort="percent">Percentage of authors</th>
-            <th scope="col" data-sort="authors">Authors</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for citations, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ citations }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=10 %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
-
-<p>Note that the citation counts do not exclude self-references.</p>
diff --git a/ietf/templates/stats/document_stats_author_continent.html b/ietf/templates/stats/document_stats_author_continent.html
deleted file mode 100644
index 805d61dab2..0000000000
--- a/ietf/templates/stats/document_stats_author_continent.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            type: "category",
-            title: {
-                text: 'Continent'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of authors'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.points[0].key + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="continent">Continent</th>
-            <th scope="col" data-sort="percent">Percentage of authors</th>
-            <th scope="col" data-sort="count">Authors</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for continent, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ continent|default:"(unknown)" }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
-<p>
-    The statistics are based entirely on the author addresses provided
-    with each draft. Since this varies across documents, a traveling
-    author may be counted in more than country, making the total sum
-    more than 100%.
-</p>
diff --git a/ietf/templates/stats/document_stats_author_country.html b/ietf/templates/stats/document_stats_author_country.html
deleted file mode 100644
index 724ed74bd5..0000000000
--- a/ietf/templates/stats/document_stats_author_country.html
+++ /dev/null
@@ -1,136 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            type: "category",
-            title: {
-                text: 'Country'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of authors'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.points[0].key + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="country">Country</th>
-            <th scope="col" class="text-end" data-sort="percent">Percentage of authors</th>
-            <th scope="col" class="text-end" data-sort="authors">Authors</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for country, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ country|default:"(unknown)" }}</td>
-                    <td class="text-end">{{ percentage|floatformat:2 }}%</td>
-                    <td class="text-end">{% include "stats/includes/number_with_details_cell.html" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
-<p>
-    The statistics are based entirely on the author addresses provided
-    with each draft. Since this varies across documents, a traveling
-    author may be counted in more than country, making the total sum
-    more than 100%.
-</p>
-<p>
-    In case no country information is found for an author in the time
-    period, the author is counted as (unknown).
-</p>
-<p>
-    EU (European Union) is not a country, but has been added for reference, as the sum of
-    all current EU member countries:
-    {% for c in eu_countries %}
-        {{ c.name }}{% if not forloop.last %},{% endif %}
-    {% endfor %}
-    .
-</p>
-<h2>Country Aliases</h2>
-<p>
-    In generating the above statistics, some heuristics have been
-    applied to figure out which country each author is from.
-</p>
-{% if request.GET.showaliases %}
-    <p>
-        <a href="{{ hide_aliases_url }}" class="btn btn-primary">Hide generated aliases</a>
-    </p>
-    {% if request.user.is_staff %}
-        <p class="alert alert-info my-3">
-            Note: since you're an admin, some extra links are visible. You
-            can either correct a document author entry directly in case the
-            information is obviously missing or add an alias if an unknown
-            <a href="{% url "admin:name_countryname_changelist" %}">country name</a>
-            is being used.
-        </p>
-    {% endif %}
-    {% if alias_data %}
-        <table class="table table-sm table-striped tablesorter">
-            <thead>
-                <th scope="col" data-sort="country">Country</th>
-                <th scope="col" data-sort="alias">Alias</th>
-            </thead>
-            {% if alias_data %}
-                <tbody>
-                {% for name, alias, country in alias_data %}
-                    <tr>
-                        <td>
-                            {% if country and request.user.is_staff %}
-                                <a href="{% url "admin:name_countryname_change" country.pk %}">{{ name|default:"(unknown)" }}</a>
-                            {% else %}
-                                {{ name|default:"(unknown)" }}
-                            {% endif %}
-                        </td>
-                        <td>
-                            {{ alias }}
-                            {% if request.user.is_staff and name != "EU" %}
-                                <a class="float-end btn btn-primary btn-sm"
-                                   href="{% url "admin:doc_documentauthor_changelist" %}?country={{ alias|urlencode }}">
-                                    Matching authors
-                                </a>
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endfor %}
-                </tbody>
-            {% endif %}
-        </table>
-    {% endif %}
-{% else %}
-    <p>
-        <a href="{{ show_aliases_url }}" class="btn btn-primary">Show generated aliases</a>
-    </p>
-{% endif %}
diff --git a/ietf/templates/stats/document_stats_author_documents.html b/ietf/templates/stats/document_stats_author_documents.html
deleted file mode 100644
index 28e33e6737..0000000000
--- a/ietf/templates/stats/document_stats_author_documents.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            tickInterval: 1,
-            title: {
-                text: 'Author of number of {{ doc_label }}s'
-            },
-            max: 20
-        },
-        yAxis: {
-            title: {
-                text: 'Percentage of authors'
-            },
-            labels: {
-                formatter: function () {
-                    return this.value + '%';
-                }
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.x + ' ' + (this.x == 1 ? "{{ doc_label }}" : '{{ doc_label }}s') + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="num">Documents</th>
-            <th scope="col" data-sort="percent">Percentage of authors</th>
-            <th scope="col" data-sort="count">Authors</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for document_count, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ document_count }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=10 %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
diff --git a/ietf/templates/stats/document_stats_author_hindex.html b/ietf/templates/stats/document_stats_author_hindex.html
deleted file mode 100644
index ab3215d355..0000000000
--- a/ietf/templates/stats/document_stats_author_hindex.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            tickInterval: 1,
-            title: {
-                text: 'h-index of {{ doc_label }}s by author'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Percentage of authors'
-            },
-            labels: {
-                formatter: function () {
-                    return this.value + '%';
-                }
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + ' h-index ' + this.x + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="num">h-index</th>
-            <th scope="col" data-sort="percent">Percentage of authors</th>
-            <th scope="col" data-sort="Authors">Authors</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for h_index, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ h_index }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=25 %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
-<p>
-    Hirsch index or h-index is a
-    <a href="https://www.wikipedia.org/wiki/H-index">
-        measure of the
-        productivity and impact of the publications of an author
-    </a>.
-    An
-    author with an h-index of 5 has had 5 publications each cited at
-    least 5 times - to increase the index to 6, the 5 publications plus
-    1 more would have to have been cited at least 6 times, each. Thus a
-    high h-index requires many highly-cited publications.
-</p>
-<p>
-    Note that the h-index calculations do not exclude self-references.
-</p>
diff --git a/ietf/templates/stats/document_stats_authors.html b/ietf/templates/stats/document_stats_authors.html
deleted file mode 100644
index 5c1bbbdf4c..0000000000
--- a/ietf/templates/stats/document_stats_authors.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            tickInterval: 1,
-            title: {
-                text: 'Number of authors'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Percentage of {{ doc_label }}s'
-            },
-            labels: {
-                formatter: function () {
-                    return this.value + '%';
-                }
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.x + ' ' + (this.x == 1 ? "author" : 'authors') + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h3>Data</h3>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="num">Authors</th>
-            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for author_count, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ author_count }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
diff --git a/ietf/templates/stats/document_stats_format.html b/ietf/templates/stats/document_stats_format.html
deleted file mode 100644
index 32c25fe378..0000000000
--- a/ietf/templates/stats/document_stats_format.html
+++ /dev/null
@@ -1,63 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            type: "category",
-            title: {
-                text: 'Format'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of {{ doc_label }}s'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.points[0].key + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="format">Format</th>
-            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="label">{{ doc_label|capfirst }}s</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for pages, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ pages }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_formlang.html b/ietf/templates/stats/document_stats_formlang.html
deleted file mode 100644
index 217d79e3ef..0000000000
--- a/ietf/templates/stats/document_stats_formlang.html
+++ /dev/null
@@ -1,63 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            type: "category",
-            title: {
-                text: 'Formal language'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of {{ doc_label }}s'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.points[0].key + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="formal">Formal language</th>
-            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for formal_language, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ formal_language }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_pages.html b/ietf/templates/stats/document_stats_pages.html
deleted file mode 100644
index 73231b0e90..0000000000
--- a/ietf/templates/stats/document_stats_pages.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'line'
-        },
-        plotOptions: {
-            line: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            title: {
-                text: 'Number of pages'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of {{ doc_label }}s'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.x + ' ' + (this.x == 1 ? "page" : 'pages') + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="num">Pages</th>
-            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for pages, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ pages }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
diff --git a/ietf/templates/stats/document_stats_words.html b/ietf/templates/stats/document_stats_words.html
deleted file mode 100644
index 4e8c15e937..0000000000
--- a/ietf/templates/stats/document_stats_words.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'line'
-        },
-        plotOptions: {
-            line: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            title: {
-                text: 'Number of words'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of {{ doc_label }}s'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.x + ' - ' + (this.x + {{ bin_size }} - 1) + ' ' + (this.x == 1 ? "word" : 'words') + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped tablesorter stats-data">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="num">Words</th>
-            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
-        </tr>
-    </thead>
-    {% if table_data %}
-        <tbody>
-            {% for pages, percentage, count, names in table_data %}
-                <tr>
-                    <td>{{ pages }}</td>
-                    <td>{{ percentage|floatformat:2 }}%</td>
-                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    {% endif %}
-</table>
diff --git a/ietf/templates/stats/document_stats_yearly.html b/ietf/templates/stats/document_stats_yearly.html
deleted file mode 100644
index b819255ced..0000000000
--- a/ietf/templates/stats/document_stats_yearly.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'line',
-        },
-        plotOptions: {
-            line: {
-                marker: {
-                    enabled: false
-                },
-                animation: false
-            }
-        },
-        legend: {
-            align: "right",
-            verticalAlign: "middle",
-            layout: "vertical",
-            enabled: true
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            tickInterval: 1,
-            title: {
-                text: 'Year'
-            }
-        },
-        yAxis: {
-            min: 0,
-            title: {
-                text: 'Authors active in year'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.x + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + this.series.name + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
\ No newline at end of file
diff --git a/ietf/templates/stats/includes/number_with_details_cell.html b/ietf/templates/stats/includes/number_with_details_cell.html
deleted file mode 100644
index a5e88113ca..0000000000
--- a/ietf/templates/stats/includes/number_with_details_cell.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% load person_filters %}
-{% if content_limit and count <= content_limit %}
-    {% for n in names %}
-        {% with n|person_by_name as person %}
-            {% if person %}
-                {% person_link person %}
-            {% else %}
-                {{ n }}
-            {% endif %}
-            <br>
-        {% endwith %}
-    {% endfor %}
-{% else %}
-    {{ count }}
-{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/stats/index.html b/ietf/templates/stats/index.html
index dd50312486..2000168525 100644
--- a/ietf/templates/stats/index.html
+++ b/ietf/templates/stats/index.html
@@ -11,14 +11,11 @@ <h1>
     </p>
     <ul>
         <li>
-            <a href="{% url "ietf.stats.views.document_stats" %}">Drafts/RFCs (authors, countries, formats, ...)</a>
-        </li>
-        <li>
-            <a href="{% url "ietf.stats.views.meeting_stats" %}">Meeting attendance</a>
-        </li>
-        <li>
-            <a rel="nofollow" href="{% url "ietf.stats.views.review_stats" %}">Reviews of drafts in review teams</a>
+            <a rel="nofollow" href="{% url "ietf.stats.views.review_stats" %}">Reviews of Internet-Drafts in review teams</a>
             (requires login)
         </li>
     </ul>
+    <p>
+        Statistics on meetings and authorship are not currently available.
+    </p>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/stats/meeting_stats.html b/ietf/templates/stats/meeting_stats.html
deleted file mode 100644
index 5206159927..0000000000
--- a/ietf/templates/stats/meeting_stats.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "base.html" %}
-{% load origin %}
-{% load ietf_filters static django_bootstrap5 %}
-{% block title %}{{ stats_title }}{% endblock %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static 'ietf/css/list.css' %}">
-{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>Meeting Statistics</h1>
-    {% if meeting %}
-        <p>
-            <a href="{% url "ietf.stats.views.meeting_stats" %}">&laquo; Back to overview</a>
-        </p>
-    {% endif %}
-    <div class="row my-3">
-        <label class="fw-bold col-sm-2 col-form-label">Attendees:</label>
-        <div class="btn-group col-sm-10">
-            {% for slug, label, url in possible_stats_types %}
-                <a class="btn btn-outline-primary
-                          {% if slug == stats_type %}
-                              active
-                          {% endif %}"
-                   href="{{ url }}">{{ label }}</a>
-            {% endfor %}
-        </div>
-    </div>
-    <div class="document-stats">{% include content_template %}</div>
-{% endblock %}
-{% block js %}
-    <script src="{% static 'ietf/js/highcharts.js' %}"></script>
-    <script src="{% static 'ietf/js/stats.js' %}"></script>
-    <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/stats/meeting_stats_continent.html b/ietf/templates/stats/meeting_stats_continent.html
deleted file mode 100644
index 42ca03a409..0000000000
--- a/ietf/templates/stats/meeting_stats_continent.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            type: "category",
-            title: {
-                text: 'Continent'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of attendees'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.points[0].key + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm table-striped stats-data tablesorter">
-    <thead>
-        <tr>
-            <th scope="col" data-sort="continent">Continent</th>
-            <th scope="col" data-sort="percent">Percentage of attendees</th>
-            <th scope="col" data-sort="count">Attendees</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for continent, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ continent|default:"(unknown)" }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
diff --git a/ietf/templates/stats/meeting_stats_country.html b/ietf/templates/stats/meeting_stats_country.html
deleted file mode 100644
index cebbad3c9f..0000000000
--- a/ietf/templates/stats/meeting_stats_country.html
+++ /dev/null
@@ -1,97 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart"></div>
-<script>
-    var chartConf = {
-        chart: {
-            type: 'column'
-        },
-        plotOptions: {
-            column: {
-                animation: false
-            }
-        },
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            type: "category",
-            title: {
-                text: 'Country'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Number of attendees'
-            }
-        },
-        tooltip: {
-            formatter: function () {
-                var s = '<b>' + this.points[0].key + '</b>';
-
-                $.each(this.points, function () {
-                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
-                });
-
-                return s;
-            },
-            shared: true
-        },
-        series: {{ chart_data }}
-    };
-</script>
-<div id="pie-chart"></div>
-<script>
-    var pieChartConf = {
-        chart: {
-            type: 'pie'
-        },
-        plotOptions: {
-            pie: {
-                animation: false,
-                dataLabels: {
-                    enabled: true,
-                    format: "{point.name}: {point.percentage:.1f}%"
-                },
-                enableMouseTracking: false
-            }
-        },
-        title: {
-            text: "Countries at IETF {{ meeting.number }}"
-        },
-        tooltip: {
-        },
-        series: [ {
-            name: "Countries",
-            colorByPoint: true,
-            data: {{ piechart_data }}
-        }]
-    };
-</script>
-<h2>Data</h2>
-<table class="table table-sm stats-data tablesorter">
-    <thead>
-        <tr>
-            <th scope="col">Country</th>
-            <th scope="col">Percentage of attendees</th>
-            <th scope="col">Attendees</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for country, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ country|default:"(unknown)" }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
-<p>
-    EU (European Union) is not a country, but has been added for reference, as the sum of
-    all current EU member countries:
-    {% for c in eu_countries %}
-        {{ c.name }}{% if not forloop.last %},{% endif %}
-    {% endfor %}
-    .
-</p>
\ No newline at end of file
diff --git a/ietf/templates/stats/meeting_stats_overview.html b/ietf/templates/stats/meeting_stats_overview.html
deleted file mode 100644
index 1136e458b8..0000000000
--- a/ietf/templates/stats/meeting_stats_overview.html
+++ /dev/null
@@ -1,160 +0,0 @@
-{% load origin %}
-{% origin %}
-<div id="chart" class="chart-{{ stats_type }}"></div>
-<script>
-    var chartConf = {
-
-        {% if stats_type == "overview" %}
-
-            chart: {
-                type: 'column',
-            },
-            colors: [ 'blue', 'red', 'cyan', 'orange', 'black',
-                'green', 'yellow' ],
-            plotOptions: {
-                series: {
-                    stacking: 'normal',
-                    point: {
-                        events: {
-                            click: function () {
-                                location.href = this.options.url;
-                            }
-                        }
-                    },
-                },
-                column: {
-                    marker: {
-                        enabled: false
-                    },
-                    animation: false
-                }
-            },
-            tooltip: {
-                formatter: function () {
-                    var s = '<b>' + this.point.name + '</b>';
-                    s += '<br>' + this.point.date;
-                    s += '<br>' + this.series.name + '<br> Attendees: ' + this.y;
-                    return s;
-                },
-                shared: false
-            },
-            legend: {
-                title: {
-                    text: "Continent of the venue",
-                },
-                borderWidth: 1,
-                align: "center",
-                verticalAlign: "bottom",
-                layout: "horizontal",
-                enabled: true
-            },
-
-
-        {% else %}
-
-            chart: {
-                type: 'line',
-            },
-            plotOptions: {
-                line: {
-                    marker: {
-                        enabled: false
-                    },
-                    animation: false
-                }
-            },
-            tooltip: {
-                formatter: function () {
-                    var s = '<b>' + "IETF " + this.x + '</b>';
-
-                    $.each(this.points, function () {
-                        s += '<br>' + this.series.name + ': ' + this.y;
-                    });
-
-                    return s;
-                },
-                shared: true
-            },
-            legend: {
-                align: "right",
-                verticalAlign: "middle",
-                layout: "vertical",
-                enabled: true
-            },
-
-
-        {% endif %}
-
-        title: {
-            text: '{{ stats_title|escapejs }}'
-        },
-        xAxis: {
-            tickInterval: 1,
-            title: {
-                text: 'Meeting'
-            }
-        },
-        yAxis: {
-            min: 0,
-            title: {
-                text: 'Attendees at meeting'
-            }
-        },
-        exporting: {
-            buttons: {
-                contextButton: {
-                    menuItems: [
-                        'printChart',
-                        'separator',
-                        'downloadPNG',
-                        'downloadJPEG',
-                        'downloadSVG',
-                        'separator',
-                        'downloadCSV'
-                    ]
-                }
-            }
-        },
-        series: {{ chart_data }}
-    };
-</script>
-{% if table_data %}
-    <h2>Data</h2>
-    <table class="table table-sm table-striped stats-data tablesorter">
-        <thead>
-            <tr>
-                <th scope="col" data-sort="num">Meeting</th>
-                <th scope="col" data-sort="date">Date</th>
-                <th scope="col" data-sort="city">City</th>
-                <th scope="col" data-sort="country">Country</th>
-                <th scope="col" data-sort="continent">Continent</th>
-                <th scope="col" data-sort="count">Attendees</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for meeting, url, count, country in table_data %}
-                <tr>
-                    {% if meeting.get_number > 71 %}
-                        <td>
-                            <a href="{{ url }}">{{ meeting.number }}</a>
-                        </td>
-                        <td>{{ meeting.date }}</td>
-                        <td>
-                            <a href="{{ url }}">{{ meeting.city }}</a>
-                        </td>
-                        <td>{{ country.name }}</td>
-                        <td>{{ country.continent }}</td>
-                        <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                    {% else %}
-                        <td>{{ meeting.number }}</td>
-                        <td>{{ meeting.date }}</td>
-                        <td>{{ meeting.city }}</td>
-                        <td>{{ country.name }}</td>
-                        <td>{{ country.continent }}</td>
-                        <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-                    {% endif %}
-                </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-{% endif %}
diff --git a/ietf/templates/stats/review_stats.html b/ietf/templates/stats/review_stats.html
index 0dbbcd835e..2741f16518 100644
--- a/ietf/templates/stats/review_stats.html
+++ b/ietf/templates/stats/review_stats.html
@@ -5,6 +5,7 @@
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
     <link rel="stylesheet" href="{% static 'ietf/css/datepicker.css' %}">
+    <link rel="stylesheet" href="{% static "ietf/css/highcharts.css" %}">
 {% endblock %}
 {% block content %}
     {% origin %}
@@ -297,7 +298,7 @@ <h2>
             </script>
         {% endif %}
         {% if stats_type != "time" %}
-            <p class="text-muted text-end">
+            <p class="text-body-secondary text-end">
                 Note:
                 {% if level == "team" %}
                     teams
diff --git a/ietf/templates/status/latest.html b/ietf/templates/status/latest.html
new file mode 100644
index 0000000000..3ad54c9dc3
--- /dev/null
+++ b/ietf/templates/status/latest.html
@@ -0,0 +1,18 @@
+{% load origin %}
+{% load ietf_filters static %}
+{% origin %}
+<meta name="color-scheme" content="light dark">
+<style type="text/css">
+    {# this template doesn't inherit from base.html so it has its own styles #}
+    body {background:transparent;font-family:sans-serif}
+    h1{font-size:18px;display:inline}
+    p{font-size:14px;display:inline}
+    .unimportant{opacity:0.6}
+</style>
+<!-- This page is intended to be iframed, and is only for non-JavaScript browsers. -->
+{% if title %}
+    <h1>{{ title }}</h1>
+    <p>{{ body }} <a href="{{ url }}" target="_top" aria-label="read more about {{title}}">read more</a><br /><span class="unimportant">{{ date }}</span></p>
+{% else %}
+    <p class="unimportant">No site status message.</p>
+{% endif %}
diff --git a/ietf/templates/status/status.html b/ietf/templates/status/status.html
new file mode 100644
index 0000000000..18f64c49a8
--- /dev/null
+++ b/ietf/templates/status/status.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% load origin %}
+{% load ietf_filters static %}
+{% block content %}
+    {% origin %}
+    <h1 data-status-id="{{ status.id }}">
+        {% block title %} {{ status.title }} {% endblock %}
+        {% if status.active == False %}
+            <span class="badge bg-secondary">inactive</span>
+        {% endif %}
+    </h1>
+    <div>
+        {{ status_page_html }}
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/add_preapproval.html b/ietf/templates/submit/add_preapproval.html
index 5f649da576..ba27ac9c64 100644
--- a/ietf/templates/submit/add_preapproval.html
+++ b/ietf/templates/submit/add_preapproval.html
@@ -9,14 +9,14 @@
     {% origin %}
     <h2 class="mt-3">Add pre-approval</h2>
     <p>
-        You can register a pre-approved draft name. Then the chair
-        approval step of group <code>-00</code> submissions is suspended for that draft name
+        You can register a pre-approved Internet-Draft name. Then the chair
+        approval step of group <code>-00</code> submissions is suspended for that Internet-Draft name
         so a future submission is posted to the data tracker immediately.
     </p>
     <p>
-        When the revision <code>-00</code> draft is submitted, the pre-approval will not
+        When the revision <code>-00</code> Internet-Draft is submitted, the pre-approval will not
         be shown anymore as it has fulfilled its purpose (only revision <code>-00</code> submissions are
-        subject to approval). If the draft never shows up, you can instead
+        subject to approval). If the Internet-Draft never shows up, you can instead
         later cancel the pre-approval to get rid of it.
     </p>
     <h2 class="mt-3">Instructions</h2>
@@ -32,7 +32,7 @@ <h2 class="mt-3">Instructions</h2>
         <p>
             As chair
             {% if groups|length > 1 %}of {{ groups|length|apnumber }} groups{% endif %}
-            you can pre-approve draft names on the form:
+            you can pre-approve Internet-Draft names on the form:
         </p>
         <p class="buttonlist">
             {% for g in groups %}
diff --git a/ietf/templates/submit/add_submit_email.html b/ietf/templates/submit/add_submit_email.html
deleted file mode 100644
index 9ca07ec7fe..0000000000
--- a/ietf/templates/submit/add_submit_email.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load django_bootstrap5 %}
-{% block title %}
-    {% if submission == None %}
-        Add new submission request email
-    {% else %}
-        Add submission request email to {{ submission.name }}
-    {% endif %}
-{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>Add email</h1>
-    <p class="my-3">
-        {% if submission == None %}
-            A new submission request will be created for the given name and revision. The
-            name must take the form <code>draft-xxx-nn</code> where <code>xxx</code> is lowercase letters, digits or dashes
-            and <code>nn</code> is the revision number, <code>00</code> for the initial revision. For example,
-            <code>draft-my-spec-00</code>.
-        {% else %}
-            The email will be added to the submission history for {{ submission.name }}.
-        {% endif %}
-    </p>
-    <form class="add-email my-3" method="post">
-        {% csrf_token %}
-        {% bootstrap_form form %}
-        <button type="submit" class="btn btn-primary">Add Email</button>
-        <a class="btn btn-secondary float-end"
-           href="{% url "ietf.submit.views.manualpost" %}">Back</a>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/announce_to_authors.txt b/ietf/templates/submit/announce_to_authors.txt
index 7622cb9691..e3359bb60f 100644
--- a/ietf/templates/submit/announce_to_authors.txt
+++ b/ietf/templates/submit/announce_to_authors.txt
@@ -1,24 +1,23 @@
-{% autoescape off %}
-A new version of I-D, {{ submission.name }}-{{ submission.rev }}.txt
-has been successfully submitted by {{ submission.submitter_parsed.name }} and posted to the
-IETF repository.
+{% autoescape off %}{% filter wordwrap:78 %}A new version of Internet-Draft {{ submission.name }}-{{ submission.rev }}.txt has been successfully submitted by {{ submission.submitter_parsed.name }} and posted to the
+IETF repository.{% endfilter %}
 
-Name:		{{ submission.name }}
-Revision:	{{ submission.rev }}
-Title:		{{ submission.title }}
-Document date:	{{ submission.document_date|date:"Y-m-d" }}
-Group:		{{ group }}
-Pages:		{{ submission.pages }}
-URL:            {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt
-Status:         {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %}{% if submission.xml_version == "3" %}
-Html:           {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %}
-Htmlized:       {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name %}
-{% if submission.rev != "00" %}Diff:           {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %}
+Name:     {{ submission.name }}
+Revision: {{ submission.rev }}
+Title:    {{ submission.title }}
+Date:     {{ submission.document_date|date:"Y-m-d" }}
+Group:    {{ group }}
+Pages:    {{ submission.pages }}
+URL:      {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.txt
+Status:   {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %}{% if submission.xml_version == "3" %}
+HTML:     {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% endif %}
+HTMLized: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name %}
+{% if submission.rev != "00" %}Diff:     {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}{% endif %}
 
 Abstract:
-{{ submission.abstract }}
-                                                                                  
-{{ submission.note|default:"" }}
+
+{{ submission.abstract.rstrip }}
+
+{{ submission.note.rstrip|default:"" }}
 
 The IETF Secretariat
 {% endautoescape %}
diff --git a/ietf/templates/submit/announce_to_lists.txt b/ietf/templates/submit/announce_to_lists.txt
index b291da7021..cf1c8b325b 100644
--- a/ietf/templates/submit/announce_to_lists.txt
+++ b/ietf/templates/submit/announce_to_lists.txt
@@ -1,28 +1,27 @@
-{% autoescape off %}
-A New Internet-Draft is available from the on-line Internet-Drafts directories.
-{% if submission.group %}This draft is a work item of the {{ submission.group.name }}{% if submission.group.type.name %} {{ submission.group.type.name }}{% endif %} of the {% if submission.group.type_id == "rg" %}IRTF{% else %}IETF{% endif %}.{% endif %}
+{% autoescape off %}{% filter wordwrap:78 %}Internet-Draft {{ submission.name }}-{{ submission.rev }}.txt is now available.{% if submission.group %} It is a work item of the {{ submission.group.name }} ({{ submission.group.acronym|upper }}){% if submission.group.type.name %} {{ submission.group.type.name }}{% endif %} of the {% if submission.group.type_id == "rg" %}IRTF{% else %}IETF{% endif %}.{% endif %}{% endfilter %}
 
-        Title           : {{ submission.title }}
-        Author{{ submission.authors|pluralize:" ,s" }}         : {% for author in submission.authors %}{{ author.name }}{% if not forloop.last %}
-                          {% endif %}{% endfor %}
-  Filename        : {{ submission.name }}-{{ submission.rev }}.txt
-  Pages           : {{ submission.pages }}
-  Date            : {{ submission.submission_date|date:"Y-m-d" }}
+   Title:   {{ submission.title }}
+   Author{{ submission.authors|pluralize:",s" }}: {% if submission.authors|length == 1 %} {% endif %}{% for author in submission.authors %}{% firstof author.name author.affiliation "Unknown" %}{% if not forloop.last %}
+            {% endif %}{% endfor %}
+   Name:    {{ submission.name }}-{{ submission.rev }}.txt
+   Pages:   {{ submission.pages }}
+   Dates:   {{ submission.submission_date|date:"Y-m-d" }}
 
 Abstract:
-{{ submission.abstract }}
 
-The IETF datatracker status page for this draft is:
+{{ submission.abstract.rstrip }}
+
+The IETF datatracker status page for this Internet-Draft is:
 {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name=submission.name %}
 {% if submission.xml_version == "3" %}
 There is also an HTML version available at:
 {{ settings.IETF_ID_ARCHIVE_URL }}{{ submission.name }}-{{ submission.rev }}.html{% else %}
-There is also an htmlized version available at:
+There is also an HTMLized version available at:
 {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_html' name=submission.name rev=submission.rev %}{% endif %}
 {% if submission.rev != "00" %}
 A diff from the previous version is available at:
 {{settings.RFCDIFF_BASE_URL}}?url2={{ submission.name }}-{{ submission.rev }}
 {% endif %}
-
-Internet-Drafts are also available by rsync at rsync.ietf.org::internet-drafts
+Internet-Drafts are also available by rsync at:
+rsync.ietf.org::internet-drafts
 {% endautoescape %}
diff --git a/ietf/templates/submit/api_submission_info.html b/ietf/templates/submit/api_submission_info.html
index da2b21d523..c49b8baa4b 100644
--- a/ietf/templates/submit/api_submission_info.html
+++ b/ietf/templates/submit/api_submission_info.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
 {% load origin ietf_filters %}
-{% block title %}Draft submission API instructions{% endblock %}
+{% block title %}I-D submission API instructions{% endblock %}
 {% block content %}
     {% origin %}
-    <h1 class="mb-3">Draft submission API instructions</h1>
+    <h1 class="mb-3">Internet-Draft submission API instructions</h1>
     <p>
-        A simplified draft submission interface, intended for automation,
+        A simplified Internet-Draft submission interface, intended for automation,
         is available at <code>{% url 'ietf.submit.views.api_submission' %}</code>.
     </p>
     <p>
@@ -21,7 +21,6 @@ <h1 class="mb-3">Draft submission API instructions</h1>
     </p>
     <ul>
         <li>Only XML-only uploads are supported, not text or combined.</li>
-        <li>Document replacement information cannot be supplied.</li>
         <li>
             The server expects <code>multipart/form-data</code>, supported by <code>curl</code> but <b>not</b> by <code>wget</code>.
         </li>
@@ -37,11 +36,11 @@ <h1 class="mb-3">Draft submission API instructions</h1>
             <code>xml</code>, which is the submitted file (required)
         </li>
         <li>
-            <code>replaces</code>, a comma-separated list of draft names replaced by this submission (optional)
+            <code>replaces</code>, a comma-separated list of Internet-Draft names replaced by this submission (optional)
         </li>
     </ul>
     <p>
-        When a draft is submitted, basic checks are performed immediately and an HTTP response
+        When an Internet-Draft is submitted, basic checks are performed immediately and an HTTP response
         is sent including an appropriate http result code and JSON data describing the outcome.
     </p>
     <p>
@@ -62,7 +61,7 @@ <h1 class="mb-3">Draft submission API instructions</h1>
   "error": "Description of the error"
 }</pre>
     <p>
-        If the basic checks passed and a successful response is sent, the draft is queued for further
+        If the basic checks passed and a successful response is sent, the Internet-Draft is queued for further
         processing. Its status can be monitored by issuing GET requests to the <code>status_url</code>
         indicated in the JSON response. This URL will respond with JSON data in the format
     </p>
@@ -72,17 +71,17 @@ <h1 class="mb-3">Draft submission API instructions</h1>
   "state": "validating"
 }</pre>
     <p>
-        The state <code>validating</code> indicates that the draft is being or waiting to be processed.
-        Any other state indicates that the draft completed validation. If the validation failed or if the
-        draft was canceled after validation, the state will be <code>cancel</code>.
+        The state <code>validating</code> indicates that the Internet-Draft is being or waiting to be processed.
+        Any other state indicates that the Internet-Draft completed validation. If the validation failed or if the
+        Internet-Draft was canceled after validation, the state will be <code>cancel</code>.
     </p>
     <p>
-        Human-readable details of the draft's status and history can be found at
+        Human-readable details of the Internet-Draft's status and history can be found at
         {% absurl 'ietf.submit.views.submission_status' submission_id='123' %}
         (replacing <code>123</code> with the <code>id</code> for the submission).)
     </p>
     <p>
-        Here is an example of submitting a draft and polling its status through the API:
+        Here is an example of submitting an Internet-Draft and polling its status through the API:
     </p>
     <pre class="border p-3">
 $ curl -s -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" -F "replaces=draft-user-replaced-draft"  {% absurl 'ietf.submit.views.api_submission' %} | jq
diff --git a/ietf/templates/submit/api_submit_info.html b/ietf/templates/submit/api_submit_info.html
index 114b979622..75fc1abfc2 100644
--- a/ietf/templates/submit/api_submit_info.html
+++ b/ietf/templates/submit/api_submit_info.html
@@ -1,56 +1,13 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015-2022, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2024, All Rights Reserved #}
 {% load origin ietf_filters %}
-{% block title %}Draft submission API instructions{% endblock %}
+{% block title %}Obsolete I-D submission API notice{% endblock %}
 {% block content %}
     {% origin %}
-    <h1 class="mb-3">Draft submission API instructions</h1>
+    <h1 class="mb-3">Obsolete Internet-Draft submission API notice</h1>
     <p>
-        Note: API endpoint described here is known to have a slow response time or to fail
-        due to timeout for some draft submissions, particularly those with large file sizes.
-        It is recommended to use the <a href="{% url 'ietf.submit.views.api_submission' %}">new API endpoint</a>
-        instead for increased reliability.
+        The API endpoint previously available here is obsolete and is no longer supported.
+        Please use the <a href="{% url 'ietf.submit.views.api_submission' %}">new API endpoint</a>
+        instead.
     </p>
-    <p>
-        A simplified draft submission interface, intended for automation,
-        is available at <code>{% absurl 'ietf.submit.views.api_submit' %}</code>.
-    </p>
-    <p>
-        The interface accepts only XML uploads that can be processed on the server, and
-        requires the user to have a datatracker account.  A successful submit still requires
-        the same email confirmation round-trip as submissions done through the regular
-        <a href="{% url 'ietf.submit.views.upload_submission' %}">submission tool</a>.
-    </p>
-    <p>
-        This interface does not provide all the options which the regular submission tool does.
-        Some limitations:
-    </p>
-    <ul>
-        <li>Only XML-only uploads are supported, not text or combined.</li>
-        <li>Document replacement information cannot be supplied.</li>
-        <li>
-            The server expects <code>multipart/form-data</code>, supported by <code>curl</code> but <b>not</b> by <code>wget</code>.
-        </li>
-    </ul>
-    <p>
-        It takes two parameters:
-    </p>
-    <ul>
-        <li>
-            <code>user</code> which is the user login
-        </li>
-        <li>
-            <code>xml</code>, which is the submitted file
-        </li>
-    </ul>
-    <p>
-        It returns an appropriate http result code, and a brief explanatory text message.
-    </p>
-    <p>
-        Here is an example:
-    </p>
-    <pre class="border p-3">
-$ curl -S -F "user=user.name@example.com" -F "xml=@~/draft-user-example.xml" {% absurl 'ietf.submit.views.api_submit' %}
-Upload of draft-user-example OK, confirmation requests sent to:
-User Name &lt;user.name@example.com&gt;</pre>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/submit/approval_request.txt b/ietf/templates/submit/approval_request.txt
index f32ea5c3bb..7b9609a129 100644
--- a/ietf/templates/submit/approval_request.txt
+++ b/ietf/templates/submit/approval_request.txt
@@ -5,7 +5,7 @@ Hi,
 {% if not submission.group.is_active %}
 Note: This submission belongs to an inactive working group.
 {% endif %}
-To approve the draft, go to this URL (note: you need to login to be able to approve):
+To approve the Internet-Draft, go to this URL (note: you need to login to be able to approve):
   https://{{ domain }}{% url "ietf.submit.views.submission_status" submission_id=submission.pk access_token=submission.access_token %}
 
   File name       : {{ submission.name }}
@@ -24,7 +24,7 @@ To approve the draft, go to this URL (note: you need to login to be able to appr
 
 
   Authors:
-{% for author in submission.authors %}    {{ author.name }}{% if author.email %} <{{ author.email }}>{% endif%}
+{% for author in submission.authors %}    {% if author.name or author.affiliation %}{% firstof author.name author.affiliation %} {% endif %}{% if author.email %}<{{ author.email }}>{% endif %}
 {% endfor %}
 {% endautoescape %}
 
@@ -32,4 +32,4 @@ To approve the draft, go to this URL (note: you need to login to be able to appr
 Best regards,
 
 	The IETF Secretariat
-	through the draft submission service
+	through the Internet-Draft submission service
diff --git a/ietf/templates/submit/approvals.html b/ietf/templates/submit/approvals.html
index 9ddfa7f0a2..1030f19a6e 100644
--- a/ietf/templates/submit/approvals.html
+++ b/ietf/templates/submit/approvals.html
@@ -4,7 +4,7 @@
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-{% block title %}Draft submission approvals{% endblock %}
+{% block title %}I-D submission approvals{% endblock %}
 {% load ietf_filters %}
 {% block submit_content %}
     {% origin %}
@@ -18,7 +18,7 @@ <h2 class="mt-5" id="approvals">Submissions you can approve</h2>
             <table class="approvals table table-sm table-striped tablesorter">
                 <thead>
                     <tr>
-                        <th scope="col" data-sort="draft">Draft</th>
+                        <th scope="col" data-sort="draft">Internet-Draft</th>
                         <th scope="col" data-sort="date">Submitted</th>
                     </tr>
                 </thead>
@@ -36,7 +36,7 @@ <h2 class="mt-5" id="approvals">Submissions you can approve</h2>
                 </tbody>
             </table>
         {% endif %}
-        <h2 class="mt-5" id="preapprovals">Pre-approved drafts not yet submitted</h2>
+        <h2 class="mt-5" id="preapprovals">Pre-approved Internet-Drafts not yet submitted</h2>
         {% if user|has_role:"Secretariat,WG Chair,RG Chair" %}
             <p>
                 <a class="btn btn-primary"
@@ -51,7 +51,7 @@ <h2 class="mt-5" id="preapprovals">Pre-approved drafts not yet submitted</h2>
             <table class="preapprovals table table-sm table-striped tablesorter">
                 <thead>
                     <tr>
-                        <th scope="col" data-sort="draft">Draft name</th>
+                        <th scope="col" data-sort="draft">Internet-Draft name</th>
                         <th scope="col" data-sort="date">Pre-approved</th>
                         <th scope="col" data-sort="by">By</th>
                         <th scope="col"></th>
@@ -74,16 +74,16 @@ <h2 class="mt-5" id="preapprovals">Pre-approved drafts not yet submitted</h2>
                 </tbody>
             </table>
         {% endif %}
-        <h2 class="mt-5" id="recently-approved">Approved drafts within the past {{ days }} days</h2>
+        <h2 class="mt-5" id="recently-approved">Approved Internet-Drafts within the past {{ days }} days</h2>
         {% if not recently_approved %}
             <p class="alert alert-info my-3">
-                No drafts approved.
+                No Internet-Drafts approved.
             </p>
         {% else %}
             <table class="recently-approved table table-sm table-striped tablesorter">
                 <thead>
                     <tr>
-                        <th scope="col" data-sort="draft">Draft</th>
+                        <th scope="col" data-sort="draft">Internet-Draft</th>
                         <th scope="col" data-sort="date">Submitted</th>
                     </tr>
                 </thead>
@@ -103,7 +103,7 @@ <h2 class="mt-5" id="recently-approved">Approved drafts within the past {{ days
         <h2>Submission of approvals</h2>
         <p>
             This is where chairs and the secretariat can approve and pre-approve document
-            submissions which require approval, such as WG <code>-00</code> drafts.
+            submissions which require approval, such as WG <code>-00</code> Internet-Drafts.
         </p>
         <p>
             You need to
diff --git a/ietf/templates/submit/confirm_submission.html b/ietf/templates/submit/confirm_submission.html
index fdd1ba0ab0..e86fc618f8 100644
--- a/ietf/templates/submit/confirm_submission.html
+++ b/ietf/templates/submit/confirm_submission.html
@@ -9,7 +9,7 @@ <h2>Confirm submission of {{ submission.name }}</h2>
         {% if submission.state_id == "posted" %}
             <p class="alert alert-warning my-3">
                 The submission has already been posted. See the
-                <a href="{% url "ietf.doc.views_doc.document_main" name=submission.name %}">draft here</a>.
+                <a href="{% url "ietf.doc.views_doc.document_main" name=submission.name %}">Internet-Draft here</a>.
             </p>
         {% else %}
             <div class="alert alert-info my-3">
@@ -54,7 +54,7 @@ <h2>Confirm submission of {{ submission.name }}</h2>
             <form id="confirm-submission" method="post">
                 {% csrf_token %}
                 <button class="btn btn-primary" type="submit" name="action" value="confirm">
-                    Confirm submission &amp; post draft
+                    Confirm submission &amp; post I-D
                 </button>
                 <button class="btn btn-danger"  type="submit" name="action" value="cancel">Cancel submission</button>
             </form>
diff --git a/ietf/templates/submit/confirm_submission.txt b/ietf/templates/submit/confirm_submission.txt
index 87e0f50f6b..6819687614 100644
--- a/ietf/templates/submit/confirm_submission.txt
+++ b/ietf/templates/submit/confirm_submission.txt
@@ -1,10 +1,10 @@
 {% autoescape off %}
 Hi,
 
-The IETF datatracker draft submission service has received your draft
+The IETF datatracker Internet-Draft submission service has received your Internet-Draft
 {{ submission.name }}-{{ submission.rev }}, and requires a
 confirmation step in order to be able to complete the posting of
-the draft.{% if chair_notice %}
+the Internet-Draft.{% if chair_notice %}
 
 The chairs have been copied since this is a group document whose author list has changed.
 {%endif%}
@@ -16,6 +16,6 @@ Please follow this link to the page where you can confirm the posting:
 Best regards,
 
 	The IETF Secretariat
-	through the draft submission service
+	through the Internet-Draft submission service
 
 {% endautoescape %}
diff --git a/ietf/templates/submit/email.html b/ietf/templates/submit/email.html
deleted file mode 100644
index 44f2729058..0000000000
--- a/ietf/templates/submit/email.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load static %}
-{% load django_bootstrap5 %}
-{% block title %}Email related to{{ submission.name }}{% endblock %}
-{% block pagehead %}
-    <link rel="stylesheet" href="{% static 'ietf/css/datepicker.css' %}">
-{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>
-        Email related to
-        <br>
-        <small class="text-muted">{{ submission.name }}</small>
-    </h1>
-    <form method="post" class="show-required my-3">
-        {% csrf_token %}
-        {% bootstrap_form form %}
-        <button type="submit" class="btn btn-primary">Send email</button>
-    </form>
-{% endblock %}
-{% block js %}
-    <script src="{% static 'ietf/js/datepicker.js' %}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/full_url.txt b/ietf/templates/submit/full_url.txt
index a7df4d9f26..633df27037 100644
--- a/ietf/templates/submit/full_url.txt
+++ b/ietf/templates/submit/full_url.txt
@@ -2,7 +2,7 @@
 Hi,
 
 The datatracker has received a request to send out the link to the URL where you
-can confirm the submission of your draft {{ submission.name }}-{{ submission.rev }}.
+can confirm the submission of your Internet-Draft {{ submission.name }}-{{ submission.rev }}.
 
 Please follow this link to get full access to the submission page:
   {{ url|safe }}
@@ -11,6 +11,6 @@ Please follow this link to get full access to the submission page:
 Best regards,
 
 	The IETF Secretariat
-	through the draft submission service
+	through the Internet-Draft submission service
 
 {% endautoescape %}
diff --git a/ietf/templates/submit/manual_post.html b/ietf/templates/submit/manual_post.html
index 5c986800be..0da83e750f 100644
--- a/ietf/templates/submit/manual_post.html
+++ b/ietf/templates/submit/manual_post.html
@@ -1,10 +1,10 @@
 {% extends "submit/submit_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2026, All Rights Reserved #}
 {% load origin static %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-{% block title %}Draft submissions awaiting manual posting{% endblock %}
+{% block title %}I-D submissions awaiting manual posting{% endblock %}
 {% load ietf_filters %}
 {% block submit_content %}
     {% origin %}
@@ -18,7 +18,7 @@ <h2 class="mt-3" id="man_post">Submissions needing manual posting</h2>
                class="submissions table table-sm table-striped tablesorter">
             <thead>
                 <tr>
-                    <th scope="col" data-sort="draft">Draft</th>
+                    <th scope="col" data-sort="draft">Internet-Draft</th>
                     <th scope="col" data-sort="date">Submitted</th>
                     <th scope="col" data-sort="passes">Passes Checks</th>
                     <th scope="col" data-sort="metadata">Metadata</th>
@@ -27,17 +27,9 @@ <h2 class="mt-3" id="man_post">Submissions needing manual posting</h2>
             <tbody>
                 {% for s in manual %}
                     <tr>
-                        {% if user.is_authenticated %}
-                            <td>
-                                <a href="{% url "ietf.submit.views.submission_status" submission_id=s.pk access_token=s.access_token %}">
-                                    {{ s.name }}-{{ s.rev }}
-                                </a>
-                            </td>
-                        {% else %}
-                            <td>
-                                <a href="{% url "ietf.submit.views.submission_status" submission_id=s.pk %}">{{ s.name }}-{{ s.rev }}</a>
-                            </td>
-                        {% endif %}
+                        <td>
+                            <a href="{% url "ietf.submit.views.submission_status" submission_id=s.pk %}">{{ s.name }}-{{ s.rev }}</a>
+                        </td>
                         <td>{{ s.submission_date }}</td>
                         <td>
                             {% if s.passes_checks %}
@@ -58,76 +50,6 @@ <h2 class="mt-3" id="man_post">Submissions needing manual posting</h2>
             </tbody>
         </table>
     {% endif %}
-    <h2 class="mt-3" id="id_upload">Submissions awaiting draft upload</h2>
-    {% if not waiting_for_draft %}
-        <p class="alert alert-info my-3" id="no-waiting-for-draft">
-            There are no submissions awaiting draft upload.
-        </p>
-    {% else %}
-        <table id="waiting-for-draft"
-               class="waiting-for-draft table table-sm table-striped tablesorter">
-            <thead>
-                <tr>
-                    <th scope="col" data-sort="name">Name</th>
-                    <th scope="col" data-sort="rev">Rev</th>
-                    <th scope="col" data-sort="date">Submitted</th>
-                    <th scope="col"></th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for s in waiting_for_draft %}
-                    <tr>
-                        {% if user.is_authenticated %}
-                            <td>
-                                <a id="aw{{ s.pk }}"
-                                   href="{% url "ietf.submit.views.submission_status" submission_id=s.pk access_token=s.access_token %}">
-                                    {{ s.name }}
-                                </a>
-                            </td>
-                        {% else %}
-                            <td>
-                                <a id="aw{{ s.pk }}"
-                                   href="{% url "ietf.submit.views.submission_status" submission_id=s.pk %}">{{ s.name }}</a>
-                            </td>
-                        {% endif %}
-                        <td>{{ s.rev }}</td>
-                        <td>{{ s.submission_date }}</td>
-                        <td>
-                            {% if user|has_role:"Secretariat" %}
-                                <form id="cancel-submission"
-                                      action="/submit/awaitingdraft/cancel"
-                                      method="post">
-                                    {% csrf_token %}
-                                    <input type="hidden" name="submission_id" value="{{ s.pk }}">
-                                    <input type="hidden" name="access_token" value="{{ s.access_token }}">
-                                    <button class="btn btn-danger btn-sm float-end ms-1"
-                                            type="submit"
-                                            data-bs-toggle="tooltip"
-                                            title="Cancels the submission permanently.">
-                                        Cancel submission
-                                    </button>
-                                </form>
-                            {% endif %}
-                            {% if user|has_role:"Secretariat" %}
-                                <a id="add-submission-email{{ s.pk }}"
-                                   class="btn btn-primary btn-sm float-end ms-1"
-                                   href="{% url "ietf.submit.views.add_manualpost_email" submission_id=s.pk access_token=s.access_token %}">
-                                    Add email
-                                </a>
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    {% endif %}
-    {% if user|has_role:"Secretariat" %}
-        <a id="new-submission-email"
-           class="btn btn-primary"
-           href="{% url "ietf.submit.views.add_manualpost_email" %}">
-            New submission from email
-        </a>
-    {% endif %}
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
diff --git a/ietf/templates/submit/manual_post_request.txt b/ietf/templates/submit/manual_post_request.txt
index 78fd563dcc..7fe19e9a23 100644
--- a/ietf/templates/submit/manual_post_request.txt
+++ b/ietf/templates/submit/manual_post_request.txt
@@ -2,12 +2,14 @@
 Hi,
 
 Manual posting has been requested for the following Internet-Draft.
+The IETF Secretariat will handle this request; no further action is
+required at this time.
 
 {% if errors %}The problems found during automated submission were: {% for err in errors.values %}
   - {{ err }}{% endfor %}
 
 If the authors claim that this is incorrect, then please look at the actual
-draft and verify that it does not have the problems indicated.
+Internet-Draft and verify that it does not have the problems indicated.
 {% endif %}
 Full idnits results are available at the end of this message.
 
@@ -31,7 +33,7 @@ I-D Submission Tool URL:
 
 
   Authors:
-{% for author in submission.authors %}    {{ author.name }}{% if author.email %} <{{ author.email }}>{% endif%}
+{% for author in submission.authors %}    {% if author.name or author.affiliation %}{% firstof author.name author.affiliation %} {% endif %}{% if author.email %}<{{ author.email }}>{% endif %}
 {% endfor %}
 
   Comment to the secretariat:
diff --git a/ietf/templates/submit/problem-reports-footer.html b/ietf/templates/submit/problem-reports-footer.html
index f6f94ebe34..7635107bef 100644
--- a/ietf/templates/submit/problem-reports-footer.html
+++ b/ietf/templates/submit/problem-reports-footer.html
@@ -6,7 +6,7 @@
     of the Bug Report links at the bottom of the page.
     <hr>
     If you run into problems submitting an Internet-Draft and need to request manual posting of an Internet-Draft, please send the
-    draft and the reason for manual posting to
+    Internet-Draft and the reason for manual posting to
     <a href="mailto:{{ settings.SECRETARIAT_SUPPORT_EMAIL }}">{{ settings.SECRETARIAT_SUPPORT_EMAIL }}</a>.
     Be advised that manual processing always takes additional time.
 </div>
\ No newline at end of file
diff --git a/ietf/templates/submit/search_submission.html b/ietf/templates/submit/search_submission.html
index 3f827abbea..807d6d7d86 100644
--- a/ietf/templates/submit/search_submission.html
+++ b/ietf/templates/submit/search_submission.html
@@ -12,14 +12,8 @@
     <form method="post">
         {% csrf_token %}
         <div class="mb-3">
-            <label class="form-label" for="name">I-D name</label>
-            <input type="text" class="form-control" id="name" name="name" placeholder="draft-..." required>
+            {% bootstrap_form form %}
         </div>
-        {% if error %}
-            <p class="alert alert-danger my-3">
-                {{ error }}
-            </p>
-        {% endif %}
         <button class="btn btn-primary" type="submit">See status</button>
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/submission_email.html b/ietf/templates/submit/submission_email.html
deleted file mode 100644
index 801ace3b9b..0000000000
--- a/ietf/templates/submit/submission_email.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "submit/submit_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin static textfilters ietf_filters %}
-{% block title %}Submission email{% endblock %}
-{% load ietf_filters %}
-{% block submit_content %}
-    {% origin %}
-    <h2 id="approvals">Email for {{ submission.name }}</h2>
-    <dl id="email-details" class="emails row my-3">
-        <dt class="col-sm-2">
-            Uploaded
-        </dt>
-        <dd class="col-sm-10">
-            {{ message.time }}
-        </dd>
-        <dt class="col-sm-2">
-            Date
-        </dt>
-        <dd class="col-sm-10">
-            {{ message.message.time }}
-        </dd>
-        <dt class="col-sm-2">
-            From
-        </dt>
-        <dd class="col-sm-10">
-            {{ message.message.frm|linkify }}
-        </dd>
-        <dt class="col-sm-2">
-            Subject
-        </dt>
-        <dd class="col-sm-10">
-            {{ message.message.subject }}
-        </dd>
-        <dt class="col-sm-2">
-            Message
-        </dt>
-        <dd class="col-sm-10">
-            <pre>{{ message.message.body|urlize_ietf_docs|linkify|linebreaksbr }}</pre>
-        </dd>
-        <dt class="col-sm-2">
-            Attachment
-        </dt>
-        <dd class="col-sm-10">
-            {% for a in attachments %}
-                <a id="attach{{ submission.pk }}"
-                   href="{% url "ietf.submit.views.show_submission_email_attachment" submission_id=submission.pk message_id=message.pk filename=a.filename %}">
-                    {{ a.filename }}
-                </a>
-                <br>
-            {% endfor %}
-        </dd>
-    </dl>
-    {% if user|has_role:"Secretariat" %}
-        <a id="reply{{ submission.pk }}"
-           class="btn btn-primary"
-           href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=message.pk %}"
-           title="Reply">
-            <i class="bi bi-envelope" aria-hidden="true"></i> Reply
-        </a>
-    {% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html
index 255bc02bf9..cdc5dd4007 100644
--- a/ietf/templates/submit/submission_status.html
+++ b/ietf/templates/submit/submission_status.html
@@ -39,9 +39,11 @@ <h2 class="mt-5">Submission status: {{ submission.state.name }}</h2>
         <h2 class="mt-5">Submission checks</h2>
         <p class="alert {% if passes_checks %}alert-success{% else %}alert-warning{% endif %} my-3">
             {% if passes_checks %}
-                Your draft has been verified to pass the submission checks.
+                Your Internet-Draft has been verified to pass the submission checks.
+            {% elif applied_any_checks %}
+                Your Internet-Draft failed at least one submission check.
             {% else %}
-                Your draft has <b>NOT</b> been verified to pass the submission checks.
+                No submission checks were applied to your Internet-Draft.
             {% endif %}
         </p>
         {% if submission.authors|length > 5 %}
@@ -70,41 +72,39 @@ <h2 class="mt-5">Submission checks</h2>
             {% endif %}
         {% endfor %}
         {% for check in submission.latest_checks %}
-            {% if check.passed != None %}
-                <button class="btn btn-{% if check.passed %}{% if check.warnings %}warning{% elif check.errors %}danger{% else %}success{% endif %}{% else %}danger{% endif %}"
-                        type="button"
-                        data-bs-toggle="modal"
-                        data-bs-target="#check-{{ check.pk }}">
-                    View {{ check.checker }}
-                </button>
-                <div class="modal fade"
-                     id="check-{{ check.pk }}"
-                     tabindex="-1"
-                     role="dialog"
-                     aria-labelledby="check-{{ check.pk }}"
-                     aria-hidden="true">
-                    <div class="modal-dialog modal-dialog-scrollable modal-xl">
-                        <div class="modal-content">
-                            <div class="modal-header">
-                                <p class="h5 modal-title" id="{{ check.checker|slugify }}-label">
-                                    {{ check.checker|title }} for {{ submission.name }}-{{ submission.rev }}
-                                </p>
-                                <button type="button"
-                                        class="btn-close"
-                                        data-bs-dismiss="modal"
-                                        aria-label="Close"></button>
-                            </div>
-                            <div class="modal-body" id="{{ check.checker|slugify }}-message">
-                            <pre>{{ check.message|urlize_ietf_docs|linkify }}</pre>
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                            </div>
+            <button class="btn btn-{% if check.passed %}{% if check.warnings %}warning{% elif check.errors %}danger{% else %}success{% endif %}{% else %}danger{% endif %}"
+                    type="button"
+                    data-bs-toggle="modal"
+                    data-bs-target="#check-{{ check.pk }}">
+                View {{ check.checker }}
+            </button>
+            <div class="modal fade"
+                 id="check-{{ check.pk }}"
+                 tabindex="-1"
+                 role="dialog"
+                 aria-labelledby="check-{{ check.pk }}"
+                 aria-hidden="true">
+                <div class="modal-dialog modal-dialog-scrollable modal-xl">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <p class="h5 modal-title" id="{{ check.checker|slugify }}-label">
+                                {{ check.checker|title }} for {{ submission.name }}-{{ submission.rev }}
+                            </p>
+                            <button type="button"
+                                    class="btn-close"
+                                    data-bs-dismiss="modal"
+                                    aria-label="Close"></button>
+                        </div>
+                        <div class="modal-body" id="{{ check.checker|slugify }}-message">
+                        <pre>{{ check.message|urlize_ietf_docs|linkify }}</pre>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
                         </div>
                     </div>
                 </div>
-            {% endif %}
-        {% endfor %}
+            </div>
+    {% endfor %}
     {% endif %}
     <div class="modal fade"
          id="twopages"
@@ -130,22 +130,35 @@ <h2 class="mt-5">Submission checks</h2>
     </div>
     {% if submission.state_id == "waiting-for-draft" %}
         <p class="alert alert-warning my-3">
-            This submission is awaiting the first draft upload.
+            This submission is awaiting the first Internet-Draft upload.
         </p>
     {% elif submission.state_id == 'validating' %}
-        <p class="alert alert-warning my-3">
-            This submission is still being processed and validated. This normally takes a few minutes after
-            submission.
+        <div class="alert alert-danger my-3">
+            Notice: The Internet-Draft submission process has changed as of Datatracker version 10.3.0.
+            Your Internet-Draft is currently being processed and validated asynchronously. Results will be
+            displayed at this URL when they are available. If JavaScript is enabled in your
+            browser, this page will refreshed automatically. If JavaScript is not enabled, 
+            please reload this page in a few minutes to see the results.
+        </div>
+        <div id="submission-validating-alert"
+             class="alert alert-warning my-3"
+             data-submission-status-url="{% url 'ietf.submit.views.api_submission_status' submission_id=submission.pk %}">
+            This submission is being processed and validated. This usually takes a few seconds but may
+            take a few minutes for complex drafts or during periods of heavy load.
             {% with earliest_event=submission.submissionevent_set.last %}
-                {% if earliest_event %}
-                    It has been {{ earliest_event.time|timesince }} since submission.
-                {% endif %}
+            {% if earliest_event %}
+            Your draft was uploaded at {{ earliest_event.time }}.
+            {% endif %}
             {% endwith %}
             Please contact the secretariat for assistance if it has been more than an hour.
-        </p>
+        </div>
     {% else %}
         <h2 class="mt-5">Meta-data from the submission</h2>
-        {% if errors %}
+        {% if submission.state.slug == "cancel" %}
+            <div class="alert alert-warning my-3">
+                <b>Note:</b> The meta-data shown for a cancelled draft may be incorrect or incomplete.
+            </div>
+        {% elif errors %}
             <div class="alert alert-danger my-3">
                 <p>
                     <b>Meta-Data errors found!</b>
@@ -272,7 +285,7 @@ <h2 class="mt-5">Meta-data from the submission</h2>
                 <tr>
                     <th scope="row">Author {{ forloop.counter }}</th>
                     <td>
-                        {{ author.name }}
+                        {% if author.name %}{{ author.name }}{% endif %}
                         {% if author.email %}&lt;{{ author.email|linkify }}&gt;{% endif %}
                         <br>
                         {% if author.affiliation %}
@@ -284,7 +297,7 @@ <h2 class="mt-5">Meta-data from the submission</h2>
                         {% if author.country %}
                             {{ author.country }}
                             {% if author.cleaned_country and author.country != author.cleaned_country %}
-                                <span class="text-muted">(understood to be {{ author.cleaned_country }})</span>
+                                <span class="text-body-secondary">(understood to be {{ author.cleaned_country }})</span>
                             {% endif %}
                         {% else %}
                             <i>unknown country</i>
@@ -364,7 +377,7 @@ <h2 class="mt-5">Meta-data from the submission</h2>
                             <div>
                                 {{ res.name.name }}: {{ res.value }}
                                 {% if res.display_name %}(as &quot;{{ res.display_name }}&quot;){% endif %}
-                            {% if external_resources.show_changes and added %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
+                            {% if external_resources.show_changes and added %}<span class="badge rounded-pill text-bg-success">New</span>{% endif %}
                             </div>
                         {% endwith %}
                     {% empty %}
@@ -383,7 +396,7 @@ <h2 class="mt-5">Meta-data from the submission</h2>
                                 <div>
                                     {{ res.name.name }}: {{ res.value }}
                                     {% if res.display_name %}(as &quot;{{ res.display_name }}&quot;){% endif %}
-                                {% if removed %}<span class="badge rounded-pill bg-warning">Removed</span>{% endif %}
+                                {% if removed %}<span class="badge rounded-pill text-bg-warning">Removed</span>{% endif %}
                                 </div>
                             {% endwith %}
                         {% empty %}
@@ -427,7 +440,7 @@ <h2 class="mt-5">
                 {% if requires_group_approval %}
                     Notifies group chairs to get approval.
                 {% elif requires_prev_authors_approval %}
-                    Notifies authors of previous revision of draft to get approval.
+                    Notifies authors of previous revision of Internet-Draft to get approval.
                 {% else %}
                     Notifies submitter and authors for confirmation.
                 {% endif %}
@@ -507,16 +520,8 @@ <h2 class="mt-5">
             </button>
         </form>
     {% endif %}
-    {% if user|has_role:"Secretariat" %}
-        <a id="send{{ submission.pk }}"
-           class="btn btn-primary mt-3"
-           href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk %}"
-           title="Email submitter">
-            <i class="bi bi-envelope" aria-hidden="true"></i> Send Email
-        </a>
-    {% endif %}
     {% if show_send_full_url %}
-        <div class="alert alert-danger my-3">
+        <div class="alert alert-info my-3">
             <p>
                 You are not allowed to modify or cancel this submission. You can
                 only modify or cancel this submission from the same URL you were
@@ -535,7 +540,7 @@ <h2 class="mt-5">
             <form class="mt-3" method="post">
                 {% csrf_token %}
                 <input type="hidden" name="action" value="sendfullurl">
-                <button class="btn btn-danger" type="submit">
+                <button class="btn btn-primary" type="submit">
                     Request full access URL
                 </button>
             </form>
@@ -571,39 +576,10 @@ <h2 class="mt-5">
                             {% endif %}
 
                         </td>
-                        {%  if e.desc|startswith:"Received message" or e.desc|startswith:"Sent message" %}
-                            {%  with m=e.submissionemailevent.message %}
-                                {% if user.is_authenticated %}
-                                    <td>
-                                        {% if  e.desc|startswith:"Received message" and user|has_role:"Secretariat" %}
-                                            <a id="reply{{ submission.pk }}"
-                                               class="btn btn-primary btn-sm"
-                                               href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=e.submissionemailevent.pk %}"
-                                               title="Reply">
-                                                <i class="bi bi-envelope" aria-hidden="true"></i> Reply
-                                            </a>
-                                        {% endif %}
-                                        Email:
-                                        <a id="aw{{ submission.pk }}-{{ m.pk }}"
-                                           href="{% url "ietf.submit.views.show_submission_email_message" submission_id=submission.pk message_id=e.submissionemailevent.pk access_token=submission.access_token %}">
-                                            {{ e.desc }}
-                                        </a>
-                                    </td>
-                                {% else %}
-                                    <td>
-                                        Email:
-                                        <a id="aw{{ submission.pk }}-{{ m.pk }}"
-                                           href="{% url "ietf.submit.views.show_submission_email_message" submission_id=submission.pk message_id=e.submissionemailevent.pk %}">
-                                            {{ e.desc }}
-                                        </a>
-                                    </td>
-                                {% endif %}
-                            {% endwith %}
-                        {%  else %}
-                            <td>
-                                {{ e.desc|urlize_ietf_docs|linkify }}
-                            </td>
-                        {%  endif %}
+
+                        <td>
+                            {{ e.desc|urlize_ietf_docs|linkify }}
+                        </td>
                     </tr>
                 {% endfor %}
             </tbody>
diff --git a/ietf/templates/submit/submit_base.html b/ietf/templates/submit/submit_base.html
index 0613cf5d6a..a2c7be1a3b 100644
--- a/ietf/templates/submit/submit_base.html
+++ b/ietf/templates/submit/submit_base.html
@@ -4,7 +4,7 @@
 {% block pagehead %}{{ block.super }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Internet-Draft submission</h1>
+    <h1>Submit an Internet-Draft</h1>
     <ul class="nav nav-tabs my-3">
         <li class="nav-item">
             <a class="nav-link {% if selected == "index" %}active{% endif %}"
diff --git a/ietf/templates/submit/submitter_form.html b/ietf/templates/submit/submitter_form.html
index 1cf77260ee..65b9ba5094 100644
--- a/ietf/templates/submit/submitter_form.html
+++ b/ietf/templates/submit/submitter_form.html
@@ -11,12 +11,14 @@ <h3 class="mt-5">Submitter</h3>
 </p>
 {% load ietf_filters %}
 {% for author in submission.authors %}
-    <button type="button"
-           class="author btn btn-primary mb-3"
-           data-name="{{ author.name }}"
-           data-email="{% if author.email %}{{ author.email }}{% endif %}">
-        {{ author.name }}
-    </button>
+    {% if author.name %}
+        <button type="button"
+                class="author btn btn-primary mb-3"
+                data-name="{{ author.name }}"
+                data-email="{% if author.email %}{{ author.email }}{% endif %}">
+            {{ author.name }}
+        </button>
+    {% endif %}
 {% endfor %}
 {% bootstrap_form_errors submitter_form %}
 {% bootstrap_field submitter_form.name %}
diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html
index 1a1486f0e1..08265f5297 100644
--- a/ietf/templates/submit/tool_instructions.html
+++ b/ietf/templates/submit/tool_instructions.html
@@ -1,5 +1,5 @@
 {% extends "submit/submit_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% block title %}I-D Submission tool instructions{% endblock %}
 {% block submit_content %}
@@ -12,7 +12,7 @@ <h2 class="mt-3">I-D submission tool instructions</h2>
         </a>
     </p>
     <p>
-        This page will explain the purpose and content of each screen in the I-D Submission Tool, and the actions that result by clicking the form buttons on each screen.
+        This page explains the purpose and content of each screen in the Internet-Draft (I-D) Submission Tool, including the actions that result by clicking the form buttons on each screen.
     </p>
     <p>
         Internet-Drafts are working documents of the Internet Engineering
@@ -29,16 +29,12 @@ <h2 class="mt-3">I-D submission tool instructions</h2>
         <a href="https://www.ietf.org/ietf/1id-abstracts.txt">https://www.ietf.org/ietf/1id-abstracts.txt</a>.
     </p>
     <p>
-        An API for automated draft submission is available as an alternative to this webpage at
-        <a href="{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.submit.views.api_submit' %}">{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.submit.views.api_submit' %}</a>.
-    </p>
-    <p>
-        The specification for this tool can be found in
-        <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc4228' %}">RFC 4228</a>.
+        An API for automated Internet-Draft submission is available as an alternative to this webpage at
+        <a href="https://datatracker.ietf.org/api/submission">https://datatracker.ietf.org/api/submission</a>.
     </p>
     <h3 class="mt-4">Upload screen</h3>
     <p>
-        The Upload screen is the first screen that a user will see when he or she starts the I-D submission process. A user can submit three different formats of an I-D, XML, plain-text, and PDF, at the same time. Failure to submit at least one of a plain-text or xml version will cause an error, and an error screen will be displayed. A single v3 .xml source is preferred. A single v2 .xml source will be accepted. If neither of those are available, a plain-text document may be provided.
+        The Upload screen is the first screen in the I-D submission process. You can submit an I-D in one or more format: XML, PDF, and plain text. You can submit an XML file, and the other formats will be created automatically. A single v3 .xml source file is preferred; however, a single v2 .xml source file is also accepted. If a .xml file is not available, a single plain text document is also accepted.
     </p>
     <p>
         By submitting your I-D, you are granting some rights to the IETF Trust.  Before you submit your I-D,
@@ -60,39 +56,32 @@ <h3 class="mt-4">Upload screen</h3>
             </tr>
         </tbody>
         <tbody>
-            <tr>
-                <th scope="row">.txt format</th>
-                <td>Button to select a plain-text file of an I-D from a user's local file system.</td>
-            </tr>
             <tr>
                 <th scope="row">.xml format</th>
                 <td>Button to select an XML file of an I-D from a user's local file system.</td>
             </tr>
             <tr>
-                <th scope="row">.pdf format</th>
-                <td>Button to select a PDF file of an I-D from a user's local file system.</td>
+                <th scope="row">.txt format</th>
+                <td>Button to select a plain text file of an I-D from a user's local file system.</td>
             </tr>
             <tr>
                 <th scope="row">Upload</th>
                 <td>
-                    Button to upload the document(s). The tool will begin parsing the plain-text document (or creating it from the xml if only xml is provided) and validate the document. The parsed meta-data will be displayed for user confirmation along with the validation results.
+                    Button to upload the document(s). The tool parses the .xml file or the .txt file, and the metadata is displayed for your confirmation along with the validation results.
                 </td>
             </tr>
         </tbody>
     </table>
     <h3 class="mt-4">Validation screen</h3>
     <p>
-        After a user uploads the document(s),  the tool will parse the plain-text version, validate the I-D, and display the validation results with option(s) for next steps. The validation includes: checking for all IPR-related notices and I-D boilerplate described in
-        <a href="https://www.ietf.org/ietf/1id-guidelines.html">Guidelines to Authors of Internet-Drafts</a>;
-        the required sections described in
-        <a href="https://www.ietf.org/ID-Checklist.html">the I-D Check List</a>;
-        the version number; and the creation date.
+        After you upload the file(s) and the tool parses the the metadata, the validation results are displayed, and you are offered option(s) for next steps. Validation checks cover IPR-related notices, boilerplate, required sections, version number, and creation date as described in the
+        <a href="https://authors.ietf.org/en/content-guidelines-overview">Internet-Draft Author Resources</a>.
     </p>
     <p>
-        If the submission does not have any validation errors, then the user will be allowed to proceed with the automated posting process. This process will begin with submitter authentication, which will be done by e-mail.
+        If the submission does not have any validation errors, then you can proceed with the posting process. Submitter authentication is performed by email or via login to your IETF datatracker account.
     </p>
     <p>
-        A user must carefully examine the meta-data that are displayed on this screen, and make sure that these data were extracted correctly.  If the data were not extracted correctly, then the user can correct the errors via the Adjust page. In such a case, the user will pass the draft to the Secretariat for manual posting.
+        A user must carefully examine the metadata that is displayed to ensure that it was correctly extracted. If the data were not extracted correctly, then the user can correct the errors on the Adjust page. In such a case, the IETF Secretariat will be responsible for manually posting the Internet-Draft.
     </p>
     <table class="table table-sm table-striped">
         <tbody>
@@ -102,22 +91,22 @@ <h3 class="mt-4">Validation screen</h3>
         </tbody>
         <tbody>
             <tr>
-                <th scope="row">Adjust meta-data</th>
+                <th scope="row">Adjust metadata</th>
                 <td>
-                    Button to proceed to a screen with editable form fields for correcting the meta-data. A user can use this button to request manual posting by the Secretariat.
+                    Button to proceed to a screen with editable form fields for correcting the metadata. Use this button to request manual posting by the IETF Secretariat.
                 </td>
             </tr>
             <tr>
                 <th scope="row">Cancel</th>
                 <td>
-                    Button to cancel the current submission. A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current submission will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
+                    Button to cancel the current submission. You will be prompted for a confirmation before the submission is canceled. Once confirmed, uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors.
                 </td>
             </tr>
         </tbody>
         <tbody>
             <tr class="table-info">
                 <th scope="colgroup" colspan="2">
-                    When no meta-data error is detected:
+                    When no metadata error is detected:
                 </th>
             </tr>
         </tbody>
@@ -136,13 +125,13 @@ <h3 class="mt-4">Validation screen</h3>
                 </th>
                 <td>
                     <p>
-                        Button to start the automated posting process with submitter authentication. Once clicked, an email message will be sent to the parties who can verify the submission. For a new draft (<code>-00</code>), that will be the authors listed in the document. For -01 and subsequent drafts, the confirmation message is sent to the authors of the <b>previous</b> version. One of the recipients of the confirmation message will need to open the email message via his or her email application, and click the link provided in the message body.
+                        Button to start the posting process. If the submitter has authenticated with a IETF datatracker account, everything will happen automatically. Otherwise, an email message will be sent to the parties who can verify the submission. For a new Internet-Draft (<code>-00</code>), the email goes to the authors listed in the document. For -01 and subsequent Internet-Drafts, the confirmation message is sent to the authors of the <b>previous</b> version. One of the confirmation message recipients will need to open the email message and click the link provided.
                     </p>
                     <p>
-                        Once a link in the email body is clicked, the document gets pushed to the IETF Web and FTP sites, a notification is sent to the authors of the document, and an I-D Action announcement will be sent out within the next 15 minutes.
+                        Once a link in the email body is clicked, the document gets posted in the I-D repository, a notification is sent to the authors of the document, and an I-D Action announcement will be sent out within the next 15 minutes.
                     </p>
                     <p>
-                        If the document requires an additional approval from a chair of a working group, i.e., for submission of a 00 version of a working group document, then a message will be sent to the chairs of the working group for the approval. Once approved, the document will be immediately announced and available via the IETF Web and FTP sites.
+                        If the document requires an additional approval from a chair of a working group, i.e., for submission of a -00 version of a working group document, then a message will be sent to the chairs of the working group for the approval. Once approved, the document will be immediately announced and in the I-D repository.
                     </p>
                 </td>
             </tr>
@@ -152,7 +141,7 @@ <h3 class="mt-4">
         Adjust screen
     </h3>
     <p>
-        This is the screen where a user can adjust any meta-data that could have been incorrectly parsed from the submitted document. The document with adjusted meta-data will be submitted to the Secretariat for manual posting.
+        This is the screen where a user can adjust any metadata that could have been incorrectly parsed from the submitted document. The document with adjusted metadata will be submitted to the IETF Secretariat for manual posting.
     </p>
     <table class="table table-sm table-striped">
         <tbody>
@@ -176,7 +165,7 @@ <h3 class="mt-4">
                     Submit for manual posting
                 </th>
                 <td>
-                    Button to send a manual posting request to the Secretariat including any corrected meta-data and comments for the Secretariat. Once clicked, a notification message will be sent to the Secretariat, and a receipt page will be displayed.
+                    Button to send a manual posting request to the Secretariat including any corrected metadata and comments for the Secretariat. Once clicked, a notification message will be sent to the Secretariat, and a receipt page will be displayed.
                 </td>
             </tr>
             <tr>
@@ -184,8 +173,7 @@ <h3 class="mt-4">
                     Cancel
                 </th>
                 <td>
-                    Button to cancel the current submission. A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current suissio
-                    n will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
+                    Button to cancel the current submission. You will be prompted for a confirmation before the submission is canceled. Once confirmed, uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors.
                 </td>
             </tr>
         </tbody>
@@ -194,7 +182,7 @@ <h3 class="mt-4">
         Status screen
     </h3>
     <p>
-        The Status screen is the screen where a user can view the current status of a document that has just been submitted by the user, or a document that was submitted previously via the tool. If a link 'Status' is clicked from the tool's first page, then a form field will be provided for a user to look up a document by name.
+        The Status screen is the screen where you can view the current status of a document that has just been submitted, or a document that was submitted previously via the tool. If a link 'Status' is clicked from the tool's first page, then a form field will be provided for a user to look up a document by name.
     </p>
     <table class="table table-sm table-striped">
         <tbody>
@@ -210,10 +198,10 @@ <h3 class="mt-4">
                     Cancel
                 </th>
                 <td>
-                    Button to cancel the current submission. This button will be displayed only when the document is in the process of being submitted.  A user will be prompted for a confirmation before the submission is canceled. Once confirmed, the current submission will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors with the IP address of the user who just canceled the submission.
+                    Button to cancel the current submission. This button will be displayed only when the document is in the process of being submitted.  You will be prompted for a confirmation before the submission is canceled. Once confirmed, the current submission will be canceled, the uploaded document(s) will be deleted permanently from the server, and a notification message will be sent to all authors.
                 </td>
             </tr>
         </tbody>
     </table>
     {% include "submit/problem-reports-footer.html" %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/upload_submission.html b/ietf/templates/submit/upload_submission.html
index 5858da6f9c..b8b1aca29c 100644
--- a/ietf/templates/submit/upload_submission.html
+++ b/ietf/templates/submit/upload_submission.html
@@ -47,7 +47,8 @@
                        aria-controls="other-formats">
                     <input class="form-check-input"
                            id="checkbox"
-                           type="checkbox">
+                           type="checkbox"
+                           {% if form.errors.txt %}checked {% endif %}>
                     Submit other formats
                 </label>
             </div>
@@ -60,14 +61,8 @@
                     However, if you cannot for some reason submit XML, you must
                     submit a plaintext rendering of your I-D.
                 </p>
-                {% bootstrap_label '<i class="bi bi-file-pdf"></i> PDF rendering of the I-D' label_class="form-label fw-bold" %}
-                {% bootstrap_field form.pdf show_label=False %}
-                <p class="form-text">
-                    Optional to submit, will be auto-generated based
-                    on the submitted XML.
-                </p>
             </div>
-            {% bootstrap_form_errors form %}
+            {% bootstrap_form_errors form type="non_fields" %}
             {% bootstrap_button button_type="submit" name="upload" content="Upload" %}
         </form>
         {% include "submit/problem-reports-footer.html" %}
@@ -78,6 +73,11 @@
         $(document).ready(function() {
             if ($("#checkbox").is(':checked'))
             $("#other-formats").collapse('show')
+
+            $("form").one('submit', function() {
+                $("button").attr('disabled', 'disabled');
+                return true;
+            })
         });
     </script>
 {% endblock %}
diff --git a/ietf/templates/sync/bcp-index.txt b/ietf/templates/sync/bcp-index.txt
new file mode 100644
index 0000000000..dd19920eba
--- /dev/null
+++ b/ietf/templates/sync/bcp-index.txt
@@ -0,0 +1,52 @@
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                             BCP INDEX
+                           -------------
+
+(CREATED ON: {{created_on}}.)
+
+This file contains citations for all BCPs in numeric order.  The BCPs
+form a sub-series of the RFC document series, specifically those RFCs
+with the status BEST CURRENT PRACTICE.
+
+BCP citations appear in this format:
+
+   [BCP#]     Best Current Practice #,
+              <BCP URL>.
+              At the time of writing, this BCP comprises the following:
+
+              Author 1, Author 2, "Title of the RFC", BCP #, RFC №,
+              DOI DOI string, Issue date,
+              <RFC URL>.
+
+For example:
+
+   [BCP3]     Best Current Practice 3,
+              <https://www.rfc-editor.org/info/bcp3>.
+              At the time of writing, this BCP comprises the following:
+
+              F. Kastenholz, "Variance for The PPP Compression Control Protocol
+              and The PPP Encryption Control Protocol", BCP 3, RFC 1915,
+              DOI 10.17487/RFC1915, February 1996,
+              <https://www.rfc-editor.org/info/rfc1915>.
+
+Key to fields:
+
+# is the BCP number.
+
+№ is the RFC number.
+
+BCPs and other RFCs may be obtained from https://www.rfc-editor.org.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                                BCP INDEX
+                                ---------
+   
+
+
+{% for bcp in bcps %}{{bcp|safe}}
+
+{% endfor %}
diff --git a/ietf/templates/sync/discrepancies.html b/ietf/templates/sync/discrepancies.html
index 2616ca9173..7561e39a20 100644
--- a/ietf/templates/sync/discrepancies.html
+++ b/ietf/templates/sync/discrepancies.html
@@ -14,7 +14,7 @@ <h2>{{ title }}</h2>
             <table class="table table-sm table-striped tablesorter">
                 <thead>
                     <tr>
-                        <th scope="col" data-sort="draft">Draft name</th>
+                        <th scope="col" data-sort="draft">Internet-Draft name</th>
                         <th scope="col" data-sort="iesg">IESG state</th>
                         <th scope="col" data-sort="rfc">RFC Editor state</th>
                         <th scope="col" data-sort="iana">IANA Action state</th>
@@ -34,7 +34,7 @@ <h2>{{ title }}</h2>
                 </tbody>
             </table>
         {% else %}
-            <p class="text-muted">
+            <p class="text-body-secondary">
                 (None)
             </p>
         {% endif %}
diff --git a/ietf/templates/sync/fyi-index.txt b/ietf/templates/sync/fyi-index.txt
new file mode 100644
index 0000000000..cf9d57d570
--- /dev/null
+++ b/ietf/templates/sync/fyi-index.txt
@@ -0,0 +1,52 @@
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                             FYI INDEX
+                           -------------
+
+(CREATED ON: {{created_on}}.)
+
+This file contains citations for all FYIs in numeric order.  The FYIs
+(For Your Information) documents form a sub-series of the RFC series,
+specifically those documents that may be of particular interest
+to Internet users.  The corresponding RFCs have status INFORMATIONAL.
+
+FYI citations appear in this format:
+
+   [FYI#]     For Your Information #,
+              <FYI URL>.
+              At the time of writing, this FYI comprises the following:
+
+              Author 1, Author 2, "Title of the RFC", FYI #, RFC №,
+              DOI DOI string, Issue date,
+              <RFC URL>.
+
+For example:
+
+   [FYI8]     For Your Information 8,
+              <https://www.rfc-editor.org/info/fyi8>.
+              At the time of writing, this FYI comprises the following:
+
+              B. Fraser, "Site Security Handbook", FYI 8, RFC 2196,
+              DOI 10.17487/RFC2196, September 1997,
+              <https://www.rfc-editor.org/info/rfc2196>.
+
+Key to fields:
+
+# is the FYI number.
+
+№ is the RFC number.
+
+FYIs and other RFCs may be obtained from https://www.rfc-editor.org.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                                FYI INDEX
+                                ---------
+   
+
+
+{% for fyi in fyis %}{{fyi|safe}}
+
+{% endfor %}
diff --git a/ietf/templates/sync/rfc-index.txt b/ietf/templates/sync/rfc-index.txt
new file mode 100644
index 0000000000..0f01ddfa90
--- /dev/null
+++ b/ietf/templates/sync/rfc-index.txt
@@ -0,0 +1,69 @@
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                             RFC INDEX
+                           -------------
+
+(CREATED ON: {{created_on}}.)
+
+This file contains citations for all RFCs in numeric order.
+
+RFC citations appear in this format:
+
+  ####  Title of RFC.  Author 1, Author 2, Author 3.  Issue date.
+        (Format: ASCII) (Obsoletes xxx) (Obsoleted by xxx) (Updates xxx)
+        (Updated by xxx) (Also FYI ####) (Status: ssssss) (DOI: ddd)
+
+or
+
+  ####  Not Issued.
+
+For example:
+
+  1129 Internet Time Synchronization: The Network Time Protocol. D.L.
+       Mills. October 1989. (Format: TXT, PS, PDF, HTML) (Also RFC1119)
+       (Status: INFORMATIONAL) (DOI: 10.17487/RFC1129)
+
+Key to citations:
+
+#### is the RFC number.
+
+Following the RFC number are the title, the author(s), and the
+publication date of the RFC.  Each of these is terminated by a period.
+
+Following the number are the title (terminated with a period), the
+author, or list of authors (terminated with a period), and the date
+(terminated with a period).
+
+The format follows in parentheses. One or more of the following formats
+are listed:  text (TXT), PostScript (PS), Portable Document Format
+(PDF), HTML, XML.
+
+Obsoletes xxxx refers to other RFCs that this one replaces;
+Obsoleted by xxxx refers to RFCs that have replaced this one.
+Updates xxxx refers to other RFCs that this one merely updates (but
+does not replace); Updated by xxxx refers to RFCs that have updated
+(but not replaced) this one.  Generally, only immediately succeeding
+and/or preceding RFCs are indicated, not the entire history of each
+related earlier or later RFC in a related series.
+
+The (Also FYI ##) or (Also STD ##) or (Also BCP ##) phrase gives the
+equivalent FYI, STD, or BCP number if the RFC is also in those
+document sub-series.  The Status field gives the document's
+current status (see RFC 2026).  The (DOI ddd) field gives the
+Digital Object Identifier.
+
+RFCs may be obtained in a number of ways, using HTTP, FTP, or email.
+See the RFC Editor Web page http://www.rfc-editor.org
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                                RFC INDEX
+                                ---------
+
+
+
+{% for rfc in rfcs %}{{rfc|safe}}
+
+{% endfor %}
diff --git a/ietf/templates/sync/std-index.txt b/ietf/templates/sync/std-index.txt
new file mode 100644
index 0000000000..a4a5fba946
--- /dev/null
+++ b/ietf/templates/sync/std-index.txt
@@ -0,0 +1,51 @@
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                             STD INDEX
+                           -------------
+
+(CREATED ON: {{created_on}}.)
+
+This file contains citations for all STDs in numeric order.  Each
+STD represents a single Internet Standard technical specification,
+composed of one or more RFCs with Internet Standard status.
+
+STD citations appear in this format:
+
+   [STD#]     Internet Standard #,
+              <STD URL>.
+              At the time of writing, this STD comprises the following:
+
+              Author 1, Author 2, "Title of the RFC", STD #, RFC №,
+              DOI DOI string, Issue date,
+              <RFC URL>.
+
+For example:
+
+   [STD6]     Internet Standard 6,
+              <https://www.rfc-editor.org/info/std6>.
+              At the time of writing, this STD comprises the following:
+
+              J. Postel, "User Datagram Protocol", STD 6, RFC 768,
+              DOI 10.17487/RFC0768, August 1980,
+              <https://www.rfc-editor.org/info/rfc768>.
+
+Key to fields:
+
+# is the STD number.
+
+№ is the RFC number.
+
+STDs and other RFCs may be obtained from https://www.rfc-editor.org.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                                STD INDEX
+                                ---------
+   
+
+
+{% for std in stds %}{{std|safe}}
+
+{% endfor %}
diff --git a/ietf/templates/utils/personal_information_notice.txt b/ietf/templates/utils/personal_information_notice.txt
deleted file mode 100644
index 379d8e4ef3..0000000000
--- a/ietf/templates/utils/personal_information_notice.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load ietf_filters %}{% filter wordwrap:78 %}
-Dear {{ person.plain_name }},
-
-We write to address certain personal information stored in your IETF
-datatracker profile.  Going forward, we will maintain and use your personal
-information only with your consent.
-
-If you do nothing in response to this email, the information in your profile
-that requires consent ({{ fields|safe }}) will be deleted {{ days }} days from
-the date of this email, that is, on {{ date }}.  If you later wish to create a
-new login, you can do so at
-{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.ietfauth.views.create_account' %}.
-
-If you would like us to continue to maintain and process the information that
-requires your consent, please go to 
-{{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.ietfauth.views.profile' %}, 
-and review and edit the information as desired and confirm your consent to our
-continued maintenance and use of your information by checking the 'Consent'
-checkbox found at the bottom of the page, and then submit the form.
-
-For information on how personal information is handled in the datatracker, please see
-{{ settings.IDTRACKER_BASE_URL }}{% url 'personal-information' %}.
-
-In case you prefer to not follow any email links, due to phishing
-considerations, please just go to the datatracker and use the menu
-entries to log in or create an account.  The links above are provided
-for your convenience, but it works just as well to go the datracker
-manually and do what's needed.
-
-Please note that you cannot give consent simply by replying to this email;
-you must log in to your account and do so there.
-
-
-Thank You,
-The IETF Secretariat
-{% endfilter %}
diff --git a/ietf/urls.py b/ietf/urls.py
index e5ba86d8eb..e822b2042e 100644
--- a/ietf/urls.py
+++ b/ietf/urls.py
@@ -1,28 +1,25 @@
 # Copyright The IETF Trust 2007-2022, All Rights Reserved
 
 from django.conf import settings
-from django.conf.urls import include
 from django.conf.urls.static import static as static_url
 from django.contrib import admin
 from django.contrib.sitemaps import views as sitemap_views
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.http import HttpResponse
+from django.urls import include, path
 from django.views import static as static_view
 from django.views.generic import TemplateView
 from django.views.defaults import server_error
-from django.urls import path
 
 import debug                            # pyflakes:ignore
 
 from ietf.doc import views_search
 from ietf.group.urls import group_urls, grouptype_urls, stream_urls
-from ietf.help import views as help_views
 from ietf.ipr.sitemaps import IPRMap
 from ietf.liaisons.sitemaps import LiaisonMap
 from ietf.utils.urls import url
 
 
-admin.autodiscover()
-
 # sometimes, this code gets called more than once, which is an
 # that seems impossible to work around.
 try:
@@ -37,6 +34,7 @@
 
 urlpatterns = [
     url(r'^$', views_search.frontpage),
+    url(r'^health/', lambda _: HttpResponse()),
     url(r'^accounts/', include('ietf.ietfauth.urls')),
     url(r'^admin/', admin.site.urls),
     url(r'^admin/docs/', include('django.contrib.admindocs.urls')),
@@ -63,11 +61,12 @@
     url(r'^sitemap-(?P<section>.+).xml$', sitemap_views.sitemap, {'sitemaps': sitemaps}),
     url(r'^sitemap.xml$', sitemap_views.index, { 'sitemaps': sitemaps}),
     url(r'^stats/', include('ietf.stats.urls')),
+    url(r'^status/', include('ietf.status.urls')),
     url(r'^stream/', include(stream_urls)),
     url(r'^submit/', include('ietf.submit.urls')),
     url(r'^sync/', include('ietf.sync.urls')),
     url(r'^templates/', include('ietf.dbtemplate.urls')),
-    url(r'^(?P<group_type>(wg|rg|ag|rag|team|dir|review|area|program|iabasg|adhoc|ise|adm|rfcedtyp))/', include(grouptype_urls)),
+    url(r'^(?P<group_type>(wg|rg|ag|rag|team|dir|review|area|program|iabasg|iabworkshop|adhoc|ise|adm|rfcedtyp|edwg|edappr))/', include(grouptype_urls)),
 
     # Redirects
     url(r'^(?P<path>public)/', include('ietf.redirects.urls')),
@@ -86,7 +85,6 @@
     urlpatterns += staticfiles_urlpatterns()
     urlpatterns += [
             url(r'^_test500/$', server_error), #utils_views.exception),
-            url(r'^environment/$', help_views.environment),
             ## maybe preserve some static legacy URLs ?
             url(r'^(?P<path>(?:images|css|js)/.*)$', static_view.serve, {'document_root': settings.STATIC_ROOT+'ietf/'}),
         ]
diff --git a/ietf/utils/.gitignore b/ietf/utils/.gitignore
deleted file mode 100644
index ba8bdb3afc..0000000000
--- a/ietf/utils/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.pyc
-/*.swp
diff --git a/ietf/utils/__init__.py b/ietf/utils/__init__.py
index 7f1df97602..fbe55eb043 100644
--- a/ietf/utils/__init__.py
+++ b/ietf/utils/__init__.py
@@ -1 +1,29 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2007-2024, All Rights Reserved
+import subprocess
+
+
+class _ToolVersionManager:
+    _known = [
+        "pyang",
+        "xml2rfc",
+        "xym",
+        "yanglint",
+    ]
+    _versions: dict[str, str] = dict()
+
+    def __getitem__(self, item):
+        if item not in self._known:
+            return "Unknown"
+        elif item not in self._versions:
+            try:
+                self._versions[item] = subprocess.run(
+                    [item, "--version"],
+                    capture_output=True,
+                    check=True,
+                ).stdout.decode().strip()
+            except subprocess.CalledProcessError:
+                return "Unknown"
+        return self._versions[item]
+
+
+tool_version = _ToolVersionManager()
diff --git a/ietf/utils/accesstoken.py b/ietf/utils/accesstoken.py
index b2a93f77d4..243d3f24dd 100644
--- a/ietf/utils/accesstoken.py
+++ b/ietf/utils/accesstoken.py
@@ -5,7 +5,7 @@
 import time, random, hashlib
 
 from django.conf import settings
-from django.utils.encoding import force_bytes, force_text
+from django.utils.encoding import force_bytes, force_str
 
 
 def generate_random_key(max_length=32):
@@ -18,4 +18,4 @@ def generate_access_token(key, max_length=32):
     # we hash it with the private key to make sure only we can
     # generate and use the final token - so storing the key in the
     # database is safe
-    return force_text(hashlib.sha256(force_bytes(settings.SECRET_KEY) + force_bytes(key)).hexdigest()[:max_length])
+    return force_str(hashlib.sha256(force_bytes(settings.SECRET_KEY) + force_bytes(key)).hexdigest()[:max_length])
diff --git a/ietf/utils/admin.py b/ietf/utils/admin.py
index 3e562c2bc1..cb8841cdc6 100644
--- a/ietf/utils/admin.py
+++ b/ietf/utils/admin.py
@@ -1,65 +1,30 @@
-# Copyright The IETF Trust 2011-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
+# Copyright The IETF Trust 2011-2026, All Rights Reserved
 
 
 from django.contrib import admin
-from django.utils.encoding import force_text
+from .models import DumpInfo, DirtyBits
 
-from ietf.utils.models import VersionInfo
 
-def name(obj):
-    if hasattr(obj, 'abbrev'):
-        return obj.abbrev()
-    elif hasattr(obj, 'name'):
-        if callable(obj.name):
-            name = obj.name()
-        else:
-            name = force_text(obj.name)
-        if name:
-            return name
-    return str(obj)
-    
-def admin_link(field, label=None, ordering="", display=name, suffix=""):
-    if not label:
-        label = field.capitalize().replace("_", " ").strip()
-    if ordering == "":
-        ordering = field
-    def _link(self):
-        obj = self
-        for attr in field.split("__"):
-            obj = getattr(obj, attr)
-            if callable(obj):
-                obj = obj()
-        if hasattr(obj, "all"):
-            objects = obj.all()
-        elif callable(obj):
-            objects = obj()
-            if not hasattr(objects, "__iter__"):
-                objects = [ objects ]
-        elif hasattr(obj, "__iter__"):
-            objects = obj
-        else:
-            objects = [ obj ]
-        chunks = []
-        for obj in objects:
-            app = obj._meta.app_label
-            model = obj.__class__.__name__.lower()
-            id = obj.pk
-            chunks += [ '<a href="/admin/%(app)s/%(model)s/%(id)s/%(suffix)s">%(display)s</a>' %
-                {'app':app, "model": model, "id":id, "display": display(obj), "suffix":suffix, } ]
-        return ", ".join(chunks)
-    _link.allow_tags = True
-    _link.short_description = label
-    _link.admin_order_field = ordering
-    return _link
+class SaferStackedInline(admin.StackedInline):
+    """StackedInline without delete by default"""
 
-from .models import DumpInfo
+    can_delete = False  # no delete button
+    show_change_link = True  # show a link to the resource (where it can be deleted)
+
+
+class SaferTabularInline(admin.TabularInline):
+    """TabularInline without delete by default"""
+
+    can_delete = False  # no delete button
+    show_change_link = True  # show a link to the resource (where it can be deleted)
+
+
+@admin.register(DumpInfo)
 class DumpInfoAdmin(admin.ModelAdmin):
-    list_display = ['date', 'host', 'tz']
-    list_filter = ['date']
-admin.site.register(DumpInfo, DumpInfoAdmin)
+    list_display = ["date", "host", "tz"]
+    list_filter = ["date"]
 
-class VersionInfoAdmin(admin.ModelAdmin):
-    list_display = ['command', 'switch', 'version', 'time', ]
-admin.site.register(VersionInfo, VersionInfoAdmin)
 
+@admin.register(DirtyBits)
+class DirtyBitsAdmin(admin.ModelAdmin):
+    list_display = ["slug", "dirty_time", "processed_time"]
diff --git a/ietf/utils/aiosmtpd.py b/ietf/utils/aiosmtpd.py
new file mode 100644
index 0000000000..3e4cd65dd9
--- /dev/null
+++ b/ietf/utils/aiosmtpd.py
@@ -0,0 +1,73 @@
+# Copyright The IETF Trust 2014-2025, All Rights Reserved
+"""aiosmtpd-related utilities
+
+These are for testing / dev use. If you're using this for production code, think very
+hard about the choices you're making...
+"""
+from aiosmtpd import handlers
+from aiosmtpd.controller import Controller
+from aiosmtpd.smtp import SMTP
+from email.utils import parseaddr
+from typing import Optional, TextIO
+
+
+class SMTPTestHandler:
+
+    def __init__(self, inbox: list):
+        self.inbox = inbox
+
+    async def handle_DATA(self, server, session, envelope):
+        """Handle the DATA command and 'deliver' the message"""
+
+        self.inbox.append(envelope.content)
+        # Per RFC2033: https://datatracker.ietf.org/doc/html/rfc2033.html#section-4.2
+        #     ...after the final ".", the server returns one reply
+        #     for each previously successful RCPT command in the mail transaction,
+        #     in the order that the RCPT commands were issued.  Even if there were
+        #     multiple successful RCPT commands giving the same forward-path, there
+        #     must be one reply for each successful RCPT command.
+        return "\n".join("250 OK" for _ in envelope.rcpt_tos)
+
+    async def handle_RCPT(self, server, session, envelope, address, rcpt_options):
+        """Handle an RCPT command and add the address to the envelope if it is acceptable"""
+        _, address = parseaddr(address)
+        if address == "":
+            return "501 Syntax: RCPT TO: <address>"
+        if "poison" in address:
+            return "550 Error: Not touching that"
+        # At this point the address is acceptable
+        envelope.rcpt_tos.append(address)
+        return "250 OK"
+
+
+class SMTPTestServerDriver:
+
+    def __init__(self, address: str, port: int, inbox: Optional[list] = None):
+        # Allow longer lines than the 1001 that RFC 5321 requires. As of 2025-04-16 the
+        # datatracker emits some non-compliant messages.
+        # See https://aiosmtpd.aio-libs.org/en/latest/smtp.html
+        SMTP.line_length_limit = 4000  # tests start failing between 3000 and 4000
+        self.controller = Controller(
+            hostname=address,
+            port=port,
+            handler=SMTPTestHandler(inbox=[] if inbox is None else inbox),
+        )
+
+    def start(self):
+        self.controller.start()
+
+    def stop(self):
+        self.controller.stop()
+
+
+class DevDebuggingHandler(handlers.Debugging):
+    """Debugging handler for use in dev ONLY"""
+    def __init__(self, stream: Optional[TextIO] = None):
+        # Allow longer lines than the 1001 that RFC 5321 requires. As of 2025-04-16 the
+        # datatracker emits some non-compliant messages.
+        # See https://aiosmtpd.aio-libs.org/en/latest/smtp.html
+        # Doing this in a handler class is a huge hack. Tests all pass with this set
+        # to 4000, but make the limit longer for dev just in case.
+        SMTP.line_length_limit = 10000
+        super().__init__(stream)
+        
diff --git a/ietf/utils/aliases.py b/ietf/utils/aliases.py
deleted file mode 100644
index 9f9aebc0b9..0000000000
--- a/ietf/utils/aliases.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-# Copyright The IETF Trust 2013-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# -*- Python -*-
-#
-# $Id: aliasutil.py $
-#
-# Author: Markus Stenberg <mstenber@cisco.com>
-#
-
-
-"""
-
-Mailing list alias dumping utilities
-
-"""
-
-
-from django.conf import settings
-from ietf.utils.log import log
-
-import debug                            # pyflakes:ignore
-
-def rewrite_email_address(email):
-    """ Prettify the email address (and if it's empty, skip it by
-    returning None). """
-    if not email:
-        return
-    email = email.strip()
-    if not email:
-        return
-    if email[0]=='<' and email[-1] == '>':
-        email = email[1:-1]
-    # If it doesn't look like email, skip
-    if '@' not in email and '?' not in email:
-        return
-    return email
-
-def rewrite_address_list(l):
-    """ This utility function makes sure there is exactly one instance
-    of an address within the result list, and preserves order
-    (although it may not be relevant to start with) """
-    h = {}
-    for address in l:
-        #address = address.strip()
-        if address in h: continue
-        h[address] = True
-        yield address
-
-def dump_sublist(afile, vfile, alias, adomains, vdomain, emails):
-    if not emails:
-        return emails
-    # Nones in the list should be skipped
-    emails = [_f for _f in emails if _f]
-
-    # Make sure emails are sane and eliminate the Nones again for
-    # non-sane ones
-    emails = [rewrite_email_address(e) for e in emails]
-    emails = [_f for _f in emails if _f]
-
-    # And we'll eliminate the duplicates too but preserve order
-    emails = list(rewrite_address_list(emails))
-    if not emails:
-        return emails
-    try:
-        filtername  = 'xfilter-%s' % (alias, )  # in aliases, --> | expandname
-        expandname  = 'expand-%s' % (alias, )   # in virtual, --> email list
-
-        for domain in adomains:
-            aliasaddr   = '%s@%s' % (alias, domain) # in virtual, --> filtername
-            vfile.write('%-64s  %s\n' % (aliasaddr, filtername))
-        afile.write('%-64s  "|%s filter %s %s"\n' % (filtername+':', settings.POSTCONFIRM_PATH, expandname, vdomain))
-        vfile.write('%-64s  %s\n' % ("%s@%s"%(expandname, vdomain), ', '.join(emails)))
-
-    except UnicodeEncodeError:
-        # If there's unicode in email address, something is badly
-        # wrong and we just silently punt
-        # XXX - is there better approach?
-        log('Error encoding email address for an %s alias: %s' % (alias, repr(emails)))
-        return []
-    return emails
-
diff --git a/ietf/utils/cache.py b/ietf/utils/cache.py
new file mode 100644
index 0000000000..0baa56da2d
--- /dev/null
+++ b/ietf/utils/cache.py
@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from django.core.cache.backends.base import DEFAULT_TIMEOUT
+from django.core.cache.backends.memcached import PyMemcacheCache
+from pymemcache.exceptions import MemcacheServerError
+
+from .log import log
+
+
+class LenientMemcacheCache(PyMemcacheCache):
+    """PyMemcacheCache backend that tolerates failed inserts due to object size"""
+    def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None):
+        try:
+            super().set(key, value, timeout, version)
+        except MemcacheServerError as err:
+            if "object too large for cache" in str(err):
+                log(f"Memcache failed to cache large object for {key}")
+            else:
+                raise
diff --git a/ietf/utils/coverage.py b/ietf/utils/coverage.py
new file mode 100644
index 0000000000..bd205ce586
--- /dev/null
+++ b/ietf/utils/coverage.py
@@ -0,0 +1,90 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+from coverage import Coverage, CoverageData, FileReporter
+from coverage.control import override_config as override_coverage_config
+from coverage.results import Numbers
+from coverage.report_core import get_analysis_to_report
+from coverage.results import Analysis
+from django.conf import settings
+
+
+class CoverageManager:
+    checker: Coverage | None = None
+    started = False
+
+    def start(self):
+        if settings.SERVER_MODE != "production" and not self.started:
+            self.checker = Coverage(
+                source=[settings.BASE_DIR],
+                cover_pylib=False,
+                omit=settings.TEST_CODE_COVERAGE_EXCLUDE_FILES,
+            )
+            for exclude_regex in getattr(
+                settings,
+                "TEST_CODE_COVERAGE_EXCLUDE_LINES",
+                [],
+            ):
+                self.checker.exclude(exclude_regex)
+            self.checker.start()
+            self.started = True
+
+    def stop(self):
+        if self.checker is not None:
+            self.checker.stop()
+
+    def save(self):
+        if self.checker is not None:
+            self.checker.save()
+
+    def report(self, include: list[str] | None = None):
+        if self.checker is None:
+            return None
+        reporter = CustomDictReporter()
+        with override_coverage_config(
+            self.checker,
+            report_include=include,
+        ):
+            return reporter.report(self.checker)
+
+
+class CustomDictReporter:  # pragma: no cover
+    total = Numbers()
+
+    def report(self, coverage):
+        coverage_data = coverage.get_data()
+        coverage_data.set_query_contexts(None)
+        measured_files = {}
+        for file_reporter, analysis in get_analysis_to_report(coverage, None):
+            measured_files[file_reporter.relative_filename()] = self.report_one_file(
+                coverage_data,
+                analysis,
+                file_reporter,
+            )
+        tot_numer, tot_denom = self.total.ratio_covered
+        return {
+            "coverage": 1 if tot_denom == 0 else tot_numer / tot_denom,
+            "covered": measured_files,
+            "format": 5,
+        }
+
+    def report_one_file(
+        self,
+        coverage_data: CoverageData,
+        analysis: Analysis,
+        file_reporter: FileReporter,
+    ):
+        """Extract the relevant report data for a single file."""
+        nums = analysis.numbers
+        self.total += nums
+        n_statements = nums.n_statements
+        numer, denom = nums.ratio_covered
+        fraction_covered = 1 if denom == 0 else numer / denom
+        missing_line_nums = sorted(analysis.missing)
+        # Extract missing lines from source files
+        source_lines = file_reporter.source().splitlines()
+        missing_lines = [source_lines[num - 1] for num in missing_line_nums]
+        return (
+            n_statements,
+            fraction_covered,
+            missing_line_nums,
+            missing_lines,
+        )
diff --git a/ietf/utils/crawlurls.txt b/ietf/utils/crawlurls.txt
deleted file mode 100644
index 30a1d038b9..0000000000
--- a/ietf/utils/crawlurls.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# List of starting points for the test crawler (see
-# bin/run-real-data-tests). Add URLs that have no link from inside the
-# project.
-
-/
-/doc/all/
-/doc/iesg/last-call/
-/doc/in-last-call/
-/iesg/decisions/
-/iesg/agenda/documents.txt
-/iesg/agenda/agenda.json
-/wg/1wg-summary.txt
-/wg/1wg-summary-by-acronym.txt
-/wg/1wg-charters.txt
-/wg/1wg-charters-by-acronym.txt
-/sitemap.xml
-/sitemap-ipr.xml
-/sitemap-liaison.xml
\ No newline at end of file
diff --git a/ietf/utils/db.py b/ietf/utils/db.py
index d451f6cfd8..49c89da13a 100644
--- a/ietf/utils/db.py
+++ b/ietf/utils/db.py
@@ -1,28 +1,67 @@
-# Copyright The IETF Trust 2021, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-# Taken from/inspired by
-# https://stackoverflow.com/questions/55147169/django-admin-jsonfield-default-empty-dict-wont-save-in-admin
-# 
-# JSONField should recognize {}, (), and [] as valid, non-empty JSON
-# values.  However, the base Field class excludes them
+# Copyright The IETF Trust 2021-2025, All Rights Reserved
+
 import jsonfield
+from django.db import models
+
+from ietf.utils.fields import (
+    IETFJSONField as FormIETFJSONField,
+    EmptyAwareJSONField as FormEmptyAwareJSONField,
+)
+
+
+class EmptyAwareJSONField(models.JSONField):
+    """JSONField that allows empty JSON values when model specifies empty=False
+
+    Taken from/inspired by
+    https://stackoverflow.com/questions/55147169/django-admin-jsonfield-default-empty-dict-wont-save-in-admin
+
+    JSONField should recognize {}, (), and [] as valid, non-empty JSON values.
 
-from ietf.utils.fields import IETFJSONField as FormIETFJSONField
+    If customizing the formfield, the field must accept the `empty_values` argument.
+    """
+
+    def __init__(
+        self,
+        *args,
+        empty_values=FormEmptyAwareJSONField.empty_values,
+        accepted_empty_values=None,
+        **kwargs,
+    ):
+        if accepted_empty_values is None:
+            accepted_empty_values = []
+        self.empty_values = [x for x in empty_values if x not in accepted_empty_values]
+        super().__init__(*args, **kwargs)
+
+    def formfield(self, **kwargs):
+        defaults = {
+            "form_class": FormEmptyAwareJSONField,
+            "empty_values": self.empty_values,
+        }
+        defaults.update(kwargs)
+        return super().formfield(**defaults)
 
 
-class IETFJSONField(jsonfield.JSONField):
+class IETFJSONField(jsonfield.JSONField):  # pragma: no cover
+    # Deprecated - use EmptyAwareJSONField instead (different base class requires a
+    # new field name)
+    # Remove this class when migrations are squashed and it is no longer referenced
     form_class = FormIETFJSONField
 
-    def __init__(self, *args, empty_values=FormIETFJSONField.empty_values, accepted_empty_values=None, **kwargs):
+    def __init__(
+        self,
+        *args,
+        empty_values=FormIETFJSONField.empty_values,
+        accepted_empty_values=None,
+        **kwargs,
+    ):
         if accepted_empty_values is None:
             accepted_empty_values = []
-        self.empty_values = [x
-                             for x in empty_values
-                             if x not in accepted_empty_values]
+        self.empty_values = [x for x in empty_values if x not in accepted_empty_values]
         super().__init__(*args, **kwargs)
 
     def formfield(self, **kwargs):
-        if 'form_class' not in kwargs or issubclass(kwargs['form_class'], FormIETFJSONField):
-            kwargs.setdefault('empty_values', self.empty_values)
+        if "form_class" not in kwargs or issubclass(
+            kwargs["form_class"], FormIETFJSONField
+        ):
+            kwargs.setdefault("empty_values", self.empty_values)
         return super().formfield(**{**kwargs})
diff --git a/ietf/utils/decorators.py b/ietf/utils/decorators.py
index 694e989f83..b50e0e7f96 100644
--- a/ietf/utils/decorators.py
+++ b/ietf/utils/decorators.py
@@ -4,109 +4,133 @@
 
 import datetime
 
-from decorator import decorator, decorate
+from functools import wraps
 
 from django.conf import settings
 from django.contrib.auth import login
 from django.http import HttpResponse
 from django.shortcuts import render
+from django.utils import timezone
 from django.utils.encoding import force_bytes
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.test_runner import set_coverage_checking
 from ietf.person.models import Person, PersonalApiKey, PersonApiKeyEvent
 from ietf.utils import log
 
-@decorator
-def skip_coverage(f, *args, **kwargs):
-    if settings.TEST_CODE_COVERAGE_CHECKER:
-        set_coverage_checking(False)
-        result = f(*args, **kwargs)
-        set_coverage_checking(True)
-        return result
-    else:
-        return  f(*args, **kwargs)
-
-@decorator
-def person_required(f, request, *args, **kwargs):
-    if not request.user.is_authenticated:
-        raise ValueError("The @person_required decorator should be called after @login_required.")
-    try:
-        request.user.person
-    except Person.DoesNotExist:
-        return render(request, 'registration/missing_person.html')
-    return  f(request, *args, **kwargs)
-
-@decorator
-def require_api_key(f, request, *args, **kwargs):
-    
-    def err(code, text):
-        return HttpResponse(text, status=code, content_type='text/plain')
-    # Check method and get hash
-    if request.method == 'POST':
-        hash = request.POST.get('apikey')
-    elif request.method == 'GET':
-        hash = request.GET.get('apikey')
-    else:
-        return err(405, "Method not allowed")
-    if not hash:
-        return err(400, "Missing apikey parameter")
-    # Check hash
-    key = PersonalApiKey.validate_key(force_bytes(hash))
-    if not key:
-        return err(403, "Invalid apikey")
-    # Check endpoint
-    urlpath = request.META.get('PATH_INFO')
-    if not (urlpath and urlpath == key.endpoint):
-        return err(400, "Apikey endpoint mismatch") 
-    # Check time since regular login
-    person = key.person
-    last_login = person.user.last_login
-    if not person.user.is_staff:
-        time_limit = (datetime.datetime.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS))
-        if last_login == None or last_login < time_limit:
-            return err(400, "Too long since last regular login")
-    # Log in
-    login(request, person.user)
-    # restore the user.last_login field, so it reflects only gui logins
-    person.user.last_login = last_login
-    person.user.save()
-    # Update stats
-    key.count += 1
-    key.latest = datetime.datetime.now()
-    key.save()
-    PersonApiKeyEvent.objects.create(person=person, type='apikey_login', key=key, desc="Logged in with key ID %s, endpoint %s" % (key.id, key.endpoint))
-    # Execute decorated function
-    try:
-        ret = f(request, *args, **kwargs)
-    except AttributeError as e:
-        log.log("Bad API call: args: %s, kwargs: %s, exception: %s" % (args, kwargs, e))
-        return err(400, "Bad or missing parameters")
-    return ret
-
-
-def _memoize(func, self, *args, **kwargs):
-    ''''Memoize wrapper for instance methouds.  Use @lru_cache for functions.'''
-    if kwargs:  # frozenset is used to ensure hashability
-        key = args, frozenset(list(kwargs.items()))
-    else:
-        key = args
-    # instance method, set up cache if needed
-    if not hasattr(self, '_cache'):
-        self._cache = {}
-    if not func in self._cache:
-        self._cache[func] = {}            
-    #
-    cache = self._cache[func]
-    if key not in cache:
-        cache[key] = func(self, *args, **kwargs)
-    return cache[key]
+
+def person_required(f):
+    @wraps(f)
+    def _wrapper(request, *args, **kwargs):
+        if not request.user.is_authenticated:
+            raise ValueError("The @person_required decorator should be called after @login_required.")
+        try:
+            request.user.person
+        except Person.DoesNotExist:
+            return render(request, 'registration/missing_person.html')
+        return  f(request, *args, **kwargs)
+    return _wrapper
+
+
+def require_api_key(f):
+    @wraps(f)
+    def _wrapper(request, *args, **kwargs):
+        def err(code, text):
+            return HttpResponse(text, status=code, content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}")
+        # Check method and get hash
+        if request.method == 'POST':
+            hash = request.POST.get('apikey')
+        elif request.method == 'GET':
+            hash = request.GET.get('apikey')
+        else:
+            return err(405, "Method not allowed")
+        if not hash:
+            return err(400, "Missing apikey parameter")
+        # Check hash
+        key = PersonalApiKey.validate_key(force_bytes(hash))
+        if not key:
+            return err(403, "Invalid apikey")
+        # Check endpoint
+        urlpath = request.META.get('PATH_INFO')
+        if not (urlpath and urlpath == key.endpoint):
+            return err(400, "Apikey endpoint mismatch") 
+        # Check time since regular login
+        person = key.person
+        last_login = person.user.last_login
+        if not person.user.is_staff:
+            time_limit = (timezone.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS))
+            if last_login == None or last_login < time_limit:
+                return err(400, "Too long since last regular login")
+        # Log in
+        login(request, person.user)
+        # restore the user.last_login field, so it reflects only gui logins
+        person.user.last_login = last_login
+        person.user.save()
+        # Update stats
+        key.count += 1
+        key.latest = timezone.now()
+        key.save()
+        PersonApiKeyEvent.objects.create(person=person, type='apikey_login', key=key, desc="Logged in with key ID %s, endpoint %s" % (key.id, key.endpoint))
+        # Execute decorated function
+        try:
+            ret = f(request, *args, **kwargs)
+        except AttributeError as e:
+            log.log("Bad API call: args: %s, kwargs: %s, exception: %s" % (args, kwargs, e))
+            return err(400, "Bad or missing parameters")
+        return ret
+    return _wrapper
+
+
 def memoize(func):
+    @wraps(func)
+    def _memoize(self, *args, **kwargs):
+        '''Memoize wrapper for instance methods.  Use @lru_cache for functions.'''
+        if kwargs:  # frozenset is used to ensure hashability
+            key = args, frozenset(list(kwargs.items()))
+        else:
+            key = args
+        # instance method, set up cache if needed
+        if not hasattr(self, '_cache'):
+            self._cache = {}
+        if not func in self._cache:
+            self._cache[func] = {}            
+        #
+        cache = self._cache[func]
+        if key not in cache:
+            cache[key] = func(self, *args, **kwargs)
+        return cache[key]
+
     if not hasattr(func, '__class__'):
-        raise NotImplementedError("Use @lru_cache instead of memoize() for funcitons.")
+        raise NotImplementedError("Use @lru_cache instead of memoize() for functions.")
     # For methods, we want the cache on the object, not on the class, in order
     # to not having to think about cache bloat and content becoming stale, so
     # we cannot set up the cache here.
-    return decorate(func, _memoize)
+    return _memoize
+
+
+def ignore_view_kwargs(*args):
+    """Ignore the specified kwargs if they are present
+
+    Usage: 
+      @ignore_view_kwargs("ignore_arg1", "ignore_arg2")
+      def my_view(request, good_arg):
+        ...
+
+      This will allow my_view() to be used in url() paths that have zero, one, or both of
+      ignore_arg1 and ignore_arg2 captured. These will be ignored, while good_arg will still
+      be captured as usual.
+    """
+    kwargs_to_ignore = args
+
+    def decorate(view):
+        @wraps(view)
+        def wrapped(*args, **kwargs):
+            for kwarg in kwargs_to_ignore:
+                kwargs.pop(kwarg, None)
+            return view(*args, **kwargs)
+
+        return wrapped
+
+    return decorate
+
 
diff --git a/ietf/utils/draft.py b/ietf/utils/draft.py
index 12a6147010..53d3d40811 100755
--- a/ietf/utils/draft.py
+++ b/ietf/utils/draft.py
@@ -13,7 +13,7 @@
 
 DESCRIPTION
         Extract information about authors' names and email addresses,
-        intended status and number of pages from Internet Drafts.
+        intended status and number of pages from Internet-Drafts.
         The information is emitted in the form of a line containing
         xml-style attributes, prefixed with the name of the draft.
 
@@ -50,6 +50,9 @@
 
 from typing import Dict, List       # pyflakes:ignore
 
+from .timezone import date_today
+
+
 version = "0.35"
 program = os.path.basename(sys.argv[0])
 progdir = os.path.dirname(sys.argv[0])
@@ -62,7 +65,6 @@
 opt_debug = False
 opt_timestamp = False
 opt_trace = False
-opt_authorinfo = False
 opt_attributes = False
 # Don't forget to add the option variable to the globals list in _main below
 
@@ -128,6 +130,24 @@ def acronym_match(s, l):
     #_debug(" s:%s; l:%s => %s; %s" % (s, l, acronym, s==acronym)) 
     return s == acronym
 
+def get_status_from_draft_text(text):
+
+    # Take prefix to shortcut work over very large drafts
+    # 5000 is conservatively much more than a full page of characters and we
+    # only want the first 10 lines.
+    text = text.strip()[:5000] # Take prefix to shortcut work over very large drafts 
+    text = re.sub(".\x08", "", text)    # Get rid of inkribbon backspace-emphasis
+    text = text.replace("\r\n", "\n")   # Convert DOS to unix
+    text = text.replace("\r", "\n")     # Convert MAC to unix
+    lines = text.split("\n")[:10]
+    status = None
+    for line in lines:
+        status_match = re.search(r"^\s*Intended [Ss]tatus:\s*(.*?)   ", line)
+        if status_match:
+            status = status_match.group(1)
+            break
+    return status
+
 class Draft:
     """Base class for drafts
 
@@ -186,7 +206,7 @@ def get_title(self):
 
     def get_wordcount(self):
         raise NotImplementedError
-
+    
 # ----------------------------------------------------------------------
 
 class PlaintextDraft(Draft):
@@ -200,7 +220,7 @@ def __init__(self, text, source, name_from_source=False):
         """
         super().__init__()
         assert isinstance(text, str)
-        self.source = source
+        self.source = str(source)
         self.rawtext = text
         self.name_from_source = name_from_source
 
@@ -467,7 +487,7 @@ def get_creation_date(self):
                         month = int(mon)
                     else:
                         continue
-                    today = datetime.date.today()
+                    today = date_today()
                     if day==0:
                         # if the date was given with only month and year, use
                         # today's date if month and year is today's month and
@@ -529,13 +549,13 @@ def _check_abstract_indent(self, abstract, indent):
                 indent_lines.append(indent)
         percents = {}
         total = float(len(indent_lines))
-        formated = False
+        formatted = False
         for indent in set(indent_lines):
             count = indent_lines.count(indent)/total
             percents[indent] = count
             if count > 0.9:
-                formated = True
-        if not formated:
+                formatted = True
+        if not formatted:
             return abstract
         new_abstract = []
         for line in abstract.split('\n'):
@@ -589,8 +609,8 @@ def extract_authors(self):
             "honor" : r"(?:[A-Z]\.|Dr\.?|Dr\.-Ing\.|Prof(?:\.?|essor)|Sir|Lady|Dame|Sri)",
             "prefix": r"([Dd]e|Hadi|van|van de|van der|Ver|von|[Ee]l)",
             "suffix": r"(jr.?|Jr.?|II|2nd|III|3rd|IV|4th)",
-            "first" : r"([A-Z][-A-Za-z'`~]*)(( ?\([A-Z][-A-Za-z'`~]*\))?(\.?[- ]{1,2}[A-Za-z'`~]+)*)",
-            "last"  : r"([-A-Za-z'`~]{2,})",
+            "first" : r"([A-Z][-A-Za-z'`~,]*)(( ?\([A-Z][-A-Za-z'`~,]*\))?(\.?[- ]{1,2}[A-Za-z'`~]+)*)",
+            "last"  : r"([-A-Za-z'`~,]+)",  # single-letter last names exist
             "months": r"(January|February|March|April|May|June|July|August|September|October|November|December)",
             "mabbr" : r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\.?",
             }
@@ -626,6 +646,8 @@ def extract_authors(self):
 
         address_section = r"^ *([0-9]+\.)? *(Author|Editor)('s|s'|s|\(s\)) (Address|Addresses|Information)"
 
+        # "Internet Draft" (without the dash) is correct here, because the usage is to
+        # suppress incorrect author name extraction
         ignore = [
             "Standards Track", "Current Practice", "Internet Draft", "Working Group",
             "Expiration Date", 
@@ -655,7 +677,12 @@ def dotexp(s):
 
             # permit insertion of middle names between first and last, and
             # add possible honorific and suffix information
-            authpat = r"(?:^| and )(?:%(hon)s ?)?(['`]*%(first)s\S*( +[^ ]+)* +%(last)s)( *\(.*|,( [A-Z][-A-Za-z0-9]*)?| %(suffix)s| [A-Z][a-z]+)?" % {"hon":hon, "first":first, "last":last, "suffix":suffix,}
+            if last:
+                authpat = r"(?:^| and )((?:%(hon)s ?)?['`]*%(first)s\S*( +[^ ]+)* +%(last)s(?: %(suffix)s)?)( *\(.*|,( [A-Z][-A-Za-z0-9]*)?| [A-Z][a-z]+)?" % {"hon":hon, "first":first, "last":last, "suffix":suffix,}
+            else:
+                # handle single-word names
+                authpat = r"(?:^| and )((?:%(hon)s ?)?['`]*%(first)s\S*( +[^ ]+)*(?: %(suffix)s)?)( *\(.*|,( [A-Z][-A-Za-z0-9]*)?| [A-Z][a-z]+)?" % {"hon":hon, "first":first, "suffix":suffix,}
+
             return authpat
 
         authors = []
@@ -809,7 +836,7 @@ def dotexp(s):
                 author = author[:-len(suffix)].strip()
             else:
                 suffix = None
-            if "," in author:
+            if ", " in author:
                 last, first = author.split(",",1)
                 author = "%s %s" % (first.strip(), last.strip())
             if not " " in author:
@@ -817,8 +844,9 @@ def dotexp(s):
                     first, last = author.rsplit(".", 1)
                     first += "."
                 else:
-                    author = "[A-Z].+ " + author
-                    first, last = author.rsplit(" ", 1)
+                    # handle single-word names
+                    first = author
+                    last = ""
             else:
                 if "." in author:
                     first, last = author.rsplit(".", 1)
@@ -896,10 +924,14 @@ def dotexp(s):
                                                 #else:
                                                 #    fullname = author_match
                                                 fullname = re.sub(" +", " ", fullname)
-                                                if left == firstname:
-                                                    given_names, surname = fullname.rsplit(None, 1)
+                                                if re.search(r"\s", fullname):
+                                                    if left == firstname:
+                                                        given_names, surname = fullname.rsplit(None, 1)
+                                                    else:
+                                                        surname, given_names = fullname.split(None, 1)
                                                 else:
-                                                    surname, given_names = fullname.split(None, 1)
+                                                    # handle single-word names
+                                                    given_names, surname = (fullname, "")
                                                 if " " in given_names:
                                                     first, middle = given_names.split(None, 1)
                                                 else:
@@ -923,7 +955,7 @@ def dotexp(s):
                                                         companies[i] = None
                                                         break
                                                 else:
-                                                    _warn("Author tuple doesn't match text in draft: %s, %s" % (authors[i], fullname))
+                                                    _warn("Author tuple doesn't match text in Internet-Draft: %s, %s" % (authors[i], fullname))
                                                     authors[i] = None
                                             break
                             except AssertionError:
@@ -1253,7 +1285,7 @@ def getmeta(fn):
     fields["eventsource"] = "draft"
 
     if " " in fn or not fn.endswith(".txt"):
-        _warn("Skipping unexpected draft name: '%s'" % (fn))
+        _warn("Skipping unexpected Internet-Draft name: '%s'" % (fn))
         return {}
 
     if os.path.exists(fn):
@@ -1299,8 +1331,6 @@ def getmeta(fn):
 
 # ----------------------------------------------------------------------
 def _output(docname, fields, outfile=sys.stdout):
-    global company_domain
-
     if opt_attributes:
         def outputkey(key, fields):
             field = fields[key]
@@ -1340,9 +1370,8 @@ def _printmeta(fn, outfile=sys.stdout):
 # Main
 # ----------------------------------------------------------------------
 
-company_domain = {}                     # type: Dict[str, str]
 def _main(outfile=sys.stdout):
-    global opt_debug, opt_timestamp, opt_trace, opt_authorinfo, files, company_domain, opt_attributes
+    global opt_debug, opt_timestamp, opt_trace, files, opt_attributes
     # set default values, if any
     # ----------------------------------------------------------------------
     # Option processing
@@ -1390,13 +1419,11 @@ def _main(outfile=sys.stdout):
         elif opt in ["-T", "--trace"]: # Emit trace information while working
             opt_trace = True
 
-    company_domain = {}
- 
     if not files:
         files = [ "-" ]
 
     for file in files:
-        _debug( "Reading drafts from '%s'" % file)
+        _debug( "Reading Internet-Drafts from '%s'" % file)
         if file == "-":
             file = sys.stdin
         elif file.endswith(".gz"):
diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py
index 806137e128..6e8765612f 100644
--- a/ietf/utils/fields.py
+++ b/ietf/utils/fields.py
@@ -1,12 +1,11 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
 import datetime
 import json
 import re
-
-import jsonfield
+from email.utils import parseaddr
 
 import debug                            # pyflakes:ignore
 
@@ -14,10 +13,11 @@
 
 from django import forms
 from django.db import models # pyflakes:ignore
-from django.core.validators import validate_email
+from django.core.validators import ProhibitNullCharactersValidator, validate_email
 from django.core.exceptions import ValidationError
 from django.utils.dateparse import parse_duration
 
+
 class MultiEmailField(forms.Field):
     def to_python(self, value):
         "Normalize data to a list of strings."
@@ -40,6 +40,25 @@ def validate(self, value):
         for email in value:
             validate_email(email)
 
+
+def validate_name_addr_email(value):
+    "Validate name-addr style email address"
+    name, addr = parseaddr(value)
+    if not addr:
+        raise ValidationError("Invalid email format.")
+    try:
+        validate_email(addr)  # validate the actual address part
+    except ValidationError:
+        raise ValidationError("Invalid email address.")
+
+
+class NameAddrEmailField(forms.CharField):
+    def validate(self, value):
+        "Check if value consists only of valid emails."
+        super().validate(value)
+        validate_name_addr_email(value)
+
+
 def yyyymmdd_to_strftime_format(fmt):
     translation_table = sorted([
         ("yyyy", "%Y"),
@@ -200,7 +219,7 @@ class SearchableField(forms.MultipleChoiceField):
 #    model = None  # must be filled in by subclass
     model = None  # type:Optional[Type[models.Model]]
 #    max_entries = None  # may be overridden in __init__
-    max_entries = None # type: Optional[int] 
+    max_entries = None # type: Optional[int]
     min_search_length = None # type: Optional[int]
     default_hint_text = 'Type a value to search'
     
@@ -320,9 +339,29 @@ def clean(self, pks):
 
         return objs.first() if self.max_entries == 1 else objs
 
+    def has_changed(self, initial, data):
+        # When max_entries == 1, we behave like a ChoiceField so initial will likely be a single
+        # value. Make it a list so MultipleChoiceField's has_changed() can work with it.
+        if initial is not None and self.max_entries == 1 and not isinstance(initial, (list, tuple)):
+            initial = [initial]
+        return super().has_changed(initial, data)
+
+
+class IETFJSONField(forms.JSONField):  # pragma: no cover
+    # Deprecated - use EmptyAwareJSONField instead
+    def __init__(self, *args, empty_values=forms.JSONField.empty_values,
+                 accepted_empty_values=None, **kwargs):
+        if accepted_empty_values is None:
+            accepted_empty_values = []
+        self.empty_values = [x
+                             for x in empty_values
+                             if x not in accepted_empty_values]
+
+        super().__init__(*args, **kwargs)
+
 
-class IETFJSONField(jsonfield.fields.forms.JSONField):
-    def __init__(self, *args, empty_values=jsonfield.fields.forms.JSONField.empty_values,
+class EmptyAwareJSONField(forms.JSONField):
+    def __init__(self, *args, empty_values=forms.JSONField.empty_values,
                  accepted_empty_values=None, **kwargs):
         if accepted_empty_values is None:
             accepted_empty_values = []
@@ -346,3 +385,20 @@ def update_dimension_fields(self, *args, **kwargs):
             super().update_dimension_fields(*args, **kwargs)
         except FileNotFoundError:
             pass  # don't do anything if the file has gone missing
+
+
+class ModelMultipleChoiceField(forms.ModelMultipleChoiceField):
+    """ModelMultipleChoiceField that rejects null characters cleanly"""
+    validate_no_nulls = ProhibitNullCharactersValidator()
+
+    def clean(self, value):
+        try:
+            for item in value:
+                self.validate_no_nulls(item)
+        except TypeError:
+            # A TypeError probably means value is not iterable, which most commonly comes up
+            # with None as a value. If it's something more exotic, we don't know how to test
+            # for null characters anyway. Either way, trust the superclass clean() method to 
+            # handle it.
+            pass
+        return super().clean(value)
diff --git a/ietf/utils/html.py b/ietf/utils/html.py
index 9d0cd7c84f..3f3efe2f37 100644
--- a/ietf/utils/html.py
+++ b/ietf/utils/html.py
@@ -5,11 +5,7 @@
 
 
 import bleach
-import copy
 import html2text
-import lxml.etree
-import lxml.html
-import lxml.html.clean
 
 import debug                            # pyflakes:ignore
 
@@ -17,62 +13,66 @@
 from django.utils.functional import keep_lazy
 
 from ietf.utils.mime import get_mime_type
-from ietf.utils.text import bleach_cleaner, tags as acceptable_tags
 
-acceptable_protocols = ['http', 'https', 'mailto', 'xmpp', ]
 
-def unescape(text):
-    """
-    Returns the given text with ampersands, quotes and angle brackets decoded
-    for use in URLs.
+# Allow the protocols/tags/attributes we specifically want, plus anything that bleach declares
+# to be safe. As of 2025-01-27, the explicit lists for protocols and tags are a strict superset
+# of bleach's defaults.
+acceptable_protocols = bleach.sanitizer.ALLOWED_PROTOCOLS.union(
+    {"http", "https", "mailto", "ftp", "xmpp"}
+)
+acceptable_tags = bleach.sanitizer.ALLOWED_TAGS.union(
+    {
+        # fmt: off
+        "a", "abbr", "acronym", "address", "b", "big",
+        "blockquote", "body", "br", "caption", "center", "cite", "code", "col",
+        "colgroup", "dd", "del", "dfn", "dir", "div", "dl", "dt", "em", "font",
+        "h1", "h2", "h3", "h4", "h5", "h6", "head", "hr", "html", "i", "ins", "kbd",
+        "li", "ol", "p", "pre", "q", "s", "samp", "small", "span", "strike", "style",
+        "strong", "sub", "sup", "table", "title", "tbody", "td", "tfoot", "th", "thead",
+        "tr", "tt", "u", "ul", "var"
+        # fmt: on
+    }
+)
+acceptable_attributes = bleach.sanitizer.ALLOWED_ATTRIBUTES | {
+    "*": ["id"],
+    "ol": ["start"],
+}
+
+
+# Instantiate sanitizer classes
+_bleach_cleaner = bleach.sanitizer.Cleaner(
+    tags=acceptable_tags,
+    attributes=acceptable_attributes,
+    protocols=acceptable_protocols,
+    strip=True,
+)
+
+
+_liberal_bleach_cleaner = bleach.sanitizer.Cleaner(
+    tags=acceptable_tags.union({"img", "figure", "figcaption"}),
+    attributes=acceptable_attributes | {"img": ["src", "alt"]},
+    protocols=acceptable_protocols,
+    strip=True,
+)
+
+
+def clean_html(text: str):
+    """Clean the HTML in a string"""
+    return _bleach_cleaner.clean(text)
+
+
+def liberal_clean_html(text: str):
+    """More permissively clean the HTML in a string"""
+    return _liberal_bleach_cleaner.clean(text)
 
-    This function undoes what django.utils.html.escape() does
-    """
-    return text.replace('&amp;', '&').replace('&#39;', "'").replace('&quot;', '"').replace('&gt;', '>').replace('&lt;', '<' )
 
 @keep_lazy(str)
 def remove_tags(html, tags):
     """Returns the given HTML sanitized, and with the given tags removed."""
-    allowed = set(acceptable_tags) - set([ t.lower() for t in tags ])
+    allowed = acceptable_tags - set(t.lower() for t in tags)
     return bleach.clean(html, tags=allowed, strip=True)
 
-# ----------------------------------------------------------------------
-# Html fragment cleaning
-
-def sanitize_fragment(html):
-    return bleach_cleaner.clean(html)
-
-# ----------------------------------------------------------------------
-# Page cleaning
-
-
-class Cleaner(lxml.html.clean.Cleaner):
-    charset = 'utf-8'
-    def __init__(self, charset='utf-8', **kw):
-        self.charset = charset
-        super(Cleaner, self).__init__(**kw)
-        
-    # Copied from lxml 4.2.0 and modified to insert charset meta:
-    def clean_html(self, html):
-        result_type = type(html)
-        if isinstance(html, (str, bytes)):
-            doc = lxml.html.fromstring(html)
-        else:
-            doc = copy.deepcopy(html)
-        self(doc)
-        head = doc.find('head')
-        if head != None:
-            meta = lxml.etree.Element('meta', charset=self.charset)
-            meta.tail = '\n'
-            head.insert(0, meta)
-        return lxml.html._transform_result(result_type, doc)
-
-# We will be saving as utf-8 later, so set that in the meta tag.
-lxml_cleaner = Cleaner(allow_tags=acceptable_tags, remove_unknown_tags=None, style=False, page_structure=False, charset='utf-8')
-
-def sanitize_document(html):
-    return lxml_cleaner.clean_html(html)
-
 
 # ----------------------------------------------------------------------
 # Text field cleaning
@@ -86,4 +86,15 @@ def clean_text_field(text):
     else:
         raise forms.ValidationError("Unexpected text field mime type: %s" % mime_type)
     return text
-    
+
+
+def unescape(text):
+    """
+    Returns the given text with ampersands, quotes and angle brackets decoded
+    for use in URLs.
+
+    This function undoes what django.utils.html.escape() does
+    """
+    return text.replace('&amp;', '&').replace('&#39;', "'").replace('&quot;', '"').replace('&gt;', '>').replace('&lt;', '<' )
+
+
diff --git a/ietf/utils/http.py b/ietf/utils/http.py
new file mode 100644
index 0000000000..cda51680ab
--- /dev/null
+++ b/ietf/utils/http.py
@@ -0,0 +1,34 @@
+# Copyright The IETF Trust 2023-2024, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from django.urls import resolve as urlresolve, Resolver404
+
+def is_ajax(request):
+    """Checks whether a request was an AJAX call
+
+    See https://docs.djangoproject.com/en/3.1/releases/3.1/#id2 - this implements the
+    exact reproduction of the deprecated method suggested there.
+    """
+    return request.headers.get("x-requested-with") == "XMLHttpRequest"
+
+def validate_return_to_path(path, get_default_path, allowed_path_handlers):
+    if path is None:
+        path = get_default_path()
+
+    # we need to ensure the path isn't used for attacks (eg phishing).
+    # `path` can be used in HttpResponseRedirect() which could redirect to Datatracker or offsite.
+    # Eg http://datatracker.ietf.org/...?ballot_edit_return_point=https://example.com/phish
+    # offsite links could be phishing attempts so let's reject them all, and require valid Datatracker
+    # routes
+    try:
+        # urlresolve will throw if the url doesn't match a route known to Django
+        match = urlresolve(path)                
+        # further restrict by whether it's in the list of valid routes to prevent
+        # (eg) redirecting to logout
+        if match.url_name not in allowed_path_handlers:
+            raise ValueError("Invalid return to path not among valid matches")
+        pass
+    except Resolver404:
+        raise ValueError("Invalid return to path doesn't match a route")
+
+    return path
diff --git a/ietf/utils/jsonlogger.py b/ietf/utils/jsonlogger.py
new file mode 100644
index 0000000000..589132977d
--- /dev/null
+++ b/ietf/utils/jsonlogger.py
@@ -0,0 +1,34 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+from pythonjsonlogger.json import JsonFormatter
+import time
+
+
+class DatatrackerJsonFormatter(JsonFormatter):
+    converter = time.gmtime  # use UTC
+    default_msec_format = "%s.%03d"  # '.' instead of ','
+
+
+class GunicornRequestJsonFormatter(DatatrackerJsonFormatter):
+    """Only works with Gunicorn's logging"""
+    def add_fields(self, log_record, record, message_dict):
+        super().add_fields(log_record, record, message_dict)
+        log_record.setdefault("method", record.args["m"])
+        log_record.setdefault("proto", record.args["H"])
+        log_record.setdefault("remote_ip", record.args["h"])
+        path = record.args["U"]  # URL path
+        if record.args["q"]:  # URL query string
+            path = "?".join([path, record.args["q"]])
+        log_record.setdefault("path", path)
+        log_record.setdefault("status", record.args["s"])
+        log_record.setdefault("referer", record.args["f"])
+        log_record.setdefault("user_agent", record.args["a"])
+        log_record.setdefault("len_bytes", record.args["B"])
+        log_record.setdefault("duration_s", record.args["L"])  # decimal seconds
+        log_record.setdefault("host", record.args["{host}i"])
+        log_record.setdefault("x_request_start", record.args["{x-request-start}i"])
+        log_record.setdefault("x_forwarded_for", record.args["{x-forwarded-for}i"])
+        log_record.setdefault("x_forwarded_proto", record.args["{x-forwarded-proto}i"])
+        log_record.setdefault("cf_connecting_ip", record.args["{cf-connecting-ip}i"])
+        log_record.setdefault("cf_ray", record.args["{cf-ray}i"])
+        log_record.setdefault("asn", record.args["{x-ip-src-asnum}i"])
+        log_record.setdefault("is_authenticated", record.args["{x-datatracker-is-authenticated}o"])
diff --git a/ietf/utils/jstest.py b/ietf/utils/jstest.py
index 722b405810..cf242fc4eb 100644
--- a/ietf/utils/jstest.py
+++ b/ietf/utils/jstest.py
@@ -1,7 +1,10 @@
 # Copyright The IETF Trust 2014-2021, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+import os
+
 from django.conf import settings
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 from django.urls import reverse as urlreverse
 from unittest import skipIf
 
@@ -9,19 +12,24 @@
 skip_message  = ""
 try:
     from selenium import webdriver
-    from selenium.webdriver.chrome.service import Service
-    from selenium.webdriver.chrome.options import Options
+    from selenium.webdriver.firefox.service import Service
+    from selenium.webdriver.firefox.options import Options
+    from selenium.webdriver.support.ui import WebDriverWait
+    from selenium.webdriver.support import expected_conditions
     from selenium.webdriver.common.by import By
-    from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 except ImportError as e:
     skip_selenium = True
     skip_message = "Skipping selenium tests: %s" % e
 
 
 from ietf.utils.pipe import pipe
-from ietf.utils.test_runner import IetfLiveServerTestCase
+from ietf.utils.test_runner import (
+    set_template_coverage,
+    set_url_coverage,
+    load_and_run_fixtures,
+)
 
-executable_name = 'chromedriver'
+executable_name = 'geckodriver'
 code, out, err = pipe('{} --version'.format(executable_name))
 if code != 0:
     skip_selenium = True
@@ -30,20 +38,11 @@
     print("     "+skip_message)
 
 def start_web_driver():
-    service = Service(executable_path="chromedriver",
-                      log_path=settings.TEST_GHOSTDRIVER_LOG_PATH)
-    service.start()
+    service = Service(executable_path=f"/usr/bin/{executable_name}", log_output=f"{executable_name}.log", service_args=['--log-no-truncate'])
     options = Options()
-    options.add_argument("headless")
-    options.add_argument("disable-extensions")
-    options.add_argument("disable-gpu") # headless needs this
-    options.add_argument("no-sandbox") # docker needs this
-    dc = DesiredCapabilities.CHROME
-    dc["goog:loggingPrefs"] = {"browser": "ALL"}
-    # For selenium 3:
-    return webdriver.Chrome("chromedriver", options=options, desired_capabilities=dc)
-    # For selenium 4:
-    # return webdriver.Chrome(service=service, options=options, desired_capabilities=dc)
+    options.add_argument("--headless")
+    os.environ["MOZ_REMOTE_SETTINGS_DEVTOOLS"] = "1"
+    return webdriver.Firefox(service=service, options=options)
 
 
 def selenium_enabled():
@@ -56,17 +55,44 @@ def ifSeleniumEnabled(func):
     return skipIf(skip_selenium, skip_message)(func)
 
 
-class IetfSeleniumTestCase(IetfLiveServerTestCase):
+class IetfSeleniumTestCase(StaticLiveServerTestCase):  # pragma: no cover
     login_view = 'ietf.ietfauth.views.login'
 
+    @classmethod
+    def setUpClass(cls):
+        set_template_coverage(False)
+        set_url_coverage(False)
+        super().setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super().tearDownClass()
+        set_template_coverage(True)
+        set_url_coverage(True)
+
     def setUp(self):
-        super(IetfSeleniumTestCase, self).setUp()
+        super().setUp()
+        # LiveServerTestCase uses TransactionTestCase which seems to
+        # somehow interfere with the fixture loading process in
+        # IetfTestRunner when running multiple tests (the first test
+        # is fine, in the next ones the fixtures have been wiped) -
+        # this is no doubt solvable somehow, but until then we simply
+        # recreate them here
+        from ietf.person.models import Person
+        if not Person.objects.exists():
+            load_and_run_fixtures(verbosity=0)
+        self.replaced_settings = dict()
+        if hasattr(settings, 'IDTRACKER_BASE_URL'):
+            self.replaced_settings['IDTRACKER_BASE_URL'] = settings.IDTRACKER_BASE_URL
+            settings.IDTRACKER_BASE_URL = self.live_server_url
         self.driver = start_web_driver()
         self.driver.set_window_size(1024,768)
     
     def tearDown(self):
-        super(IetfSeleniumTestCase, self).tearDown()
         self.driver.close()
+        for k, v in self.replaced_settings.items():
+            setattr(settings, k, v)
+        super().tearDown()
 
     def absreverse(self,*args,**kwargs):
         return '%s%s'%(self.live_server_url, urlreverse(*args, **kwargs))
@@ -81,7 +107,7 @@ def login(self, username='plain'):
         self.driver.get(url)
         self.driver.find_element(By.NAME, 'username').send_keys(username)
         self.driver.find_element(By.NAME, 'password').send_keys(password)
-        self.driver.find_element(By.XPATH, '//button[@type="submit"]').click()
+        self.driver.find_element(By.XPATH, '//*[@id="content"]//button[@type="submit"]').click()
 
     def scroll_to_element(self, element):
         """Scroll an element into view"""
@@ -96,6 +122,48 @@ def scroll_to_element(self, element):
         # actions = ActionChains(self.driver)
         # actions.move_to_element(element).perform()
 
+    def scroll_and_click(self, element_locator, timeout_seconds=5):
+        """
+        Selenium has restrictions around clicking elements outside the viewport, so
+        this wrapper encapsulates the boilerplate of forcing scrolling and clicking.
+
+        :param element_locator: A two item tuple of a Selenium locator eg `(By.CSS_SELECTOR, '#something')`
+        """
+
+        # so that we can restore the state of the webpage after clicking
+        original_html_scroll_behaviour_to_restore = self.driver.execute_script('return document.documentElement.style.scrollBehavior')
+        original_html_overflow_to_restore = self.driver.execute_script('return document.documentElement.style.overflow')
+
+        original_body_scroll_behaviour_to_restore = self.driver.execute_script('return document.body.style.scrollBehavior')
+        original_body_overflow_to_restore = self.driver.execute_script('return document.body.style.overflow')
+
+        self.driver.execute_script('document.documentElement.style.scrollBehavior = "auto"')
+        self.driver.execute_script('document.documentElement.style.overflow = "auto"')
+
+        self.driver.execute_script('document.body.style.scrollBehavior = "auto"')
+        self.driver.execute_script('document.body.style.overflow = "auto"')
+
+        element = self.driver.find_element(element_locator[0], element_locator[1])
+        self.scroll_to_element(element)
+
+        # Note that Selenium itself seems to have multiple definitions of 'clickable'.
+        # You might expect that the following wait for the 'element_to_be_clickable'
+        # would confirm that the following .click() would succeed but it doesn't.
+        # That's why the preceeding code attempts to force scrolling to bring the
+        # element into the viewport to allow clicking.
+        WebDriverWait(self.driver, timeout_seconds).until(expected_conditions.element_to_be_clickable(element_locator))
+
+        element.click()
+
+        if original_html_scroll_behaviour_to_restore:
+            self.driver.execute_script(f'document.documentElement.style.scrollBehavior = "{original_html_scroll_behaviour_to_restore}"')
+        if original_html_overflow_to_restore:
+            self.driver.execute_script(f'document.documentElement.style.overflow = "{original_html_overflow_to_restore}"')
+
+        if original_body_scroll_behaviour_to_restore:
+            self.driver.execute_script(f'document.body.style.scrollBehavior = "{original_body_scroll_behaviour_to_restore}"')
+        if original_body_overflow_to_restore:
+            self.driver.execute_script(f'document.body.style.overflow = "{original_body_overflow_to_restore}"')
 
 class presence_of_element_child_by_css_selector:
     """Wait for presence of a child of a WebElement matching a CSS selector
@@ -108,4 +176,4 @@ def __init__(self, element, child_selector):
 
     def __call__(self, driver):
         child = self.element.find_element(By.CSS_SELECTOR, self.child_selector)
-        return child if child is not None else False
\ No newline at end of file
+        return child if child is not None else False
diff --git a/ietf/utils/log.py b/ietf/utils/log.py
index d5a54e5516..2a068ade9a 100644
--- a/ietf/utils/log.py
+++ b/ietf/utils/log.py
@@ -9,37 +9,10 @@
 import os.path
 import traceback
 
-from typing import Callable         # pyflakes:ignore
-
-try:
-    import syslog
-    logfunc = syslog.syslog             # type: Callable
-except ImportError:                     # import syslog will fail on Windows boxes
-    logging.basicConfig(filename='tracker.log',level=logging.INFO)
-    logfunc = logging.info
-    pass
-
 from django.conf import settings
 
 import debug                            # pyflakes:ignore
 
-formatter = logging.Formatter('{levelname}: {name}:{lineno}: {message}', style='{')
-for name, level in settings.UTILS_LOGGER_LEVELS.items():
-    logger = logging.getLogger(name)
-    if not logger.hasHandlers():
-        debug.say(' Adding handlers to logger %s' % logger.name)
-        
-        handlers = [
-                logging.StreamHandler(),
-                logging.handlers.SysLogHandler(address='/dev/log',
-                    facility=logging.handlers.SysLogHandler.LOG_USER),
-            ]
-        for h in handlers:
-            h.setFormatter(formatter)
-            h.setLevel(level)
-            logger.addHandler(h)
-    debug.say(" Setting %s logging level to %s" % (logger.name, level))
-    logger.setLevel(level)
 
 def getclass(frame):
     cls = None
@@ -56,20 +29,9 @@ def getcaller():
     return (pmodule, pclass, pfunction, pfile, pline)
 
 def log(msg, e=None):
-    "Uses syslog by preference.  Logs the given calling point and message."
-    global logfunc
-    def _flushfunc():
-        pass
-    _logfunc = logfunc
-    if settings.SERVER_MODE == 'test':
-        if getattr(settings, 'show_logging', False) is True:
-            _logfunc = debug.say
-            _flushfunc = sys.stdout.flush   # pyflakes:ignore (intentional redefinition)
-        else:
+    "Logs the given calling point and message to the logging framework's datatracker handler at severity INFO"
+    if settings.SERVER_MODE == 'test' and not getattr(settings, 'show_logging',False):
             return
-    elif settings.DEBUG == True:
-        _logfunc = debug.say
-        _flushfunc = sys.stdout.flush   # pyflakes:ignore (intentional redefinition)
     if not isinstance(msg, str):
         msg = msg.encode('unicode_escape')
     try:
@@ -82,11 +44,8 @@ def _flushfunc():
             where = " in " + func + "()"
     except IndexError:
         file, line, where = "/<UNKNOWN>", 0, ""
-    _flushfunc()
-    _logfunc("ietf%s(%d)%s: %s" % (file, line, where, msg))
-
-logger = logging.getLogger('django')
 
+    logging.getLogger("datatracker").info(msg=msg, extra = {"file":file, "line":line, "where":where})
 
 
 def exc_parts():
@@ -124,6 +83,7 @@ def assertion(statement, state=True, note=None):
     This acts like an assertion.  It uses the django logger in order to send
     the failed assertion and a backtrace as for an internal server error.
     """
+    logger = logging.getLogger("django") # Note this is a change - before this would have gone to "django"
     frame = inspect.currentframe().f_back
     value = eval(statement, frame.f_globals, frame.f_locals)
     if bool(value) != bool(state):
@@ -148,6 +108,7 @@ def assertion(statement, state=True, note=None):
 
 def unreachable(date="(unknown)"):
     "Raises an assertion or sends traceback to admins if executed."
+    logger = logging.getLogger("django")
     frame = inspect.currentframe().f_back
     if settings.DEBUG is True or settings.SERVER_MODE == 'test':
         raise AssertionError("Arrived at code in %s() which was marked unreachable on %s." % (frame.f_code.co_name, date))
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index 04c0ed916f..5417161451 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -3,7 +3,6 @@
 
 
 import copy
-import datetime
 #import logging
 import re
 import smtplib
@@ -20,14 +19,17 @@
 from email.header import Header, decode_header
 from email import message_from_bytes, message_from_string
 from email import charset as Charset
+from typing import Optional
 
 from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.core.validators import validate_email
+from django.http import HttpRequest
 from django.template.loader import render_to_string
 from django.template import Context,RequestContext
-from django.utils.encoding import force_text, force_str, force_bytes
+from django.utils import timezone
+from django.utils.encoding import force_str, force_bytes
 
 import debug                            # pyflakes:ignore
 
@@ -64,6 +66,18 @@ def add_headers(msg):
         msg['From'] = settings.DEFAULT_FROM_EMAIL
     return msg
 
+
+def decode_header_value(value: str) -> str:
+    """Decode a header value
+    
+    Easier-to-use wrapper around email.message.decode_header()
+    """
+    return "".join(
+        part.decode(charset if charset else "utf-8") if isinstance(part, bytes) else part
+        for part, charset in decode_header(value)
+    )
+
+
 class SMTPSomeRefusedRecipients(smtplib.SMTPException):
 
     def __init__(self, message, original_msg, refusals):
@@ -92,7 +106,17 @@ def send_smtp(msg, bcc=None):
     '''
     mark = time.time()
     add_headers(msg)
-    (fname, frm) = parseaddr(msg.get('From'))
+    # N.B. We have a disconnect with most of this code assuming a From header value will only
+    # have one address.
+    # The frm computed here is only used as the envelope from. 
+    # Previous code simply ran `parseaddr(msg.get('From'))`, getting lucky if the string returned
+    # from the get had more than one address in it. Python 3.9.20 changes the behavior of parseaddr
+    # and that erroneous use of the function no longer gets lucky.
+    # For the short term, to match behavior to date as closely as possible, if we get a message
+    # that has multiple addresses in the From header, we will use the first for the envelope from
+    from_tuples = getaddresses(msg.get_all('From', [settings.DEFAULT_FROM_EMAIL]))
+    assertion('len(from_tuples)==1', note=f"send_smtp received multiple From addresses: {from_tuples}")
+    _ , frm = from_tuples[0]
     addrlist = msg.get_all('To') + msg.get_all('Cc', [])
     if bcc:
         addrlist += [bcc]
@@ -137,7 +161,7 @@ def send_smtp(msg, bcc=None):
                 server.quit()
             except smtplib.SMTPServerDisconnected:
                 pass
-        subj = force_text(msg.get('Subject', '[no subject]'))
+        subj = force_str(msg.get('Subject', '[no subject]'))
         tau = time.time() - mark
         log("sent email (%.3fs) from '%s' to %s id %s subject '%s'" % (tau, frm, to, msg.get('Message-ID', ''), subj))
     
@@ -166,7 +190,7 @@ def copy_email(msg, to, toUser=False, originalBcc=None):
     # Overwrite the From: header, so that the copy from a development or
     # test server doesn't look like spam.
     new['From'] = settings.DEFAULT_FROM_EMAIL
-    new['Subject'] = '[Django %s] %s' % (settings.SERVER_MODE, force_text(msg.get('Subject', '[no subject]')))
+    new['Subject'] = '[Django %s] %s' % (settings.SERVER_MODE, force_str(msg.get('Subject', '[no subject]')))
     new['To'] = to
     send_smtp(new)
 
@@ -241,8 +265,7 @@ def parseaddr(addr):
 
     """
 
-    addr = ''.join( [ ( s.decode(m) if m else s.decode()) if isinstance(s, bytes) else s for (s,m) in decode_header(addr) ] )
-    name, addr = simple_parseaddr(addr)
+    name, addr = simple_parseaddr(decode_header_value(addr))
     return name, addr
 
 def excludeaddrs(addrlist, exlist):
@@ -320,23 +343,50 @@ def condition_message(to, frm, subject, msg, cc, extra):
         msg['Message-ID'] = make_msgid()
 
 
-def show_that_mail_was_sent(request,leadline,msg,bcc):
-        if request and request.user:
-            from ietf.ietfauth.utils import has_role
-            if has_role(request.user,['Area Director','Secretariat','IANA','RFC Editor','ISE','IAD','IRTF Chair','WG Chair','RG Chair','WG Secretary','RG Secretary']):
-                info =  "%s at %s %s\n" % (leadline,datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),settings.TIME_ZONE)
-                info += "Subject: %s\n" % force_text(msg.get('Subject','[no subject]'))
-                info += "To: %s\n" % msg.get('To','[no to]')
-                if msg.get('Cc'):
-                    info += "Cc: %s\n" % msg.get('Cc')
-                if bcc:
-                    info += "Bcc: %s\n" % bcc
-                messages.info(request,info,extra_tags='preformatted',fail_silently=True)
+def show_that_mail_was_sent(request: HttpRequest, leadline: str, msg: Message, bcc: Optional[str]):
+    if request and request.user:
+        from ietf.ietfauth.utils import has_role
+
+        if has_role(
+            request.user,
+            [
+                "Area Director",
+                "Secretariat",
+                "IANA",
+                "RFC Editor",
+                "ISE",
+                "IAD",
+                "IRTF Chair",
+                "WG Chair",
+                "RG Chair",
+                "WG Secretary",
+                "RG Secretary",
+            ],
+        ):
+            subject = decode_header_value(msg.get("Subject", "[no subject]"))
+            _to = decode_header_value(msg.get("To", "[no to]"))
+            info_lines = [
+                f"{leadline} at {timezone.now():%Y-%m-%d %H:%M:%S %Z}",
+                f"Subject: {subject}",
+                f"To: {_to}",
+            ]
+            cc = msg.get("Cc", None)
+            if cc:
+                info_lines.append(f"Cc: {decode_header_value(cc)}")
+            if bcc:
+                info_lines.append(f"Bcc: {decode_header_value(bcc)}")
+            messages.info(
+                request,
+                "\n".join(info_lines),
+                extra_tags="preformatted",
+                fail_silently=True,
+            )
+
 
 def save_as_message(request, msg, bcc):
     by = ((request and request.user and not request.user.is_anonymous and request.user.person)
             or ietf.person.models.Person.objects.get(name="(System)"))
-    headers, body = force_text(str(msg)).split('\n\n', 1)
+    headers, body = force_str(str(msg)).split('\n\n', 1)
     kwargs = {'by': by, 'body': body, 'content_type': msg.get_content_type(), 'bcc': bcc or '' }
     for (arg, field) in [
             ('cc',              'Cc'),
@@ -378,7 +428,7 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=F
         try:
             send_smtp(msg, bcc)
             if save:
-                message.sent = datetime.datetime.now()
+                message.sent = timezone.now()
                 message.save()
             if settings.SERVER_MODE != 'development':
                 show_that_mail_was_sent(request,'Email was sent',msg,bcc)
@@ -446,6 +496,8 @@ def parse_preformatted(preformatted, extra=None, override=None):
         values = msg.get_all(key, [])
         if values:
             values = getaddresses(values)
+            if key=='From':
+                assertion('len(values)<2', note=f'parse_preformatted is constructing a From with multiple values: {values}')
             del msg[key]
             msg[key] = ',\n    '.join(formataddr(v) for v in values)
     for key in ['Subject', ]:
@@ -505,7 +557,7 @@ def send_mail_message(request, message, extra=None):
 
 #     msg = send_mail_text(request, message.to, message.frm, message.subject,
 #                           message.body, cc=message.cc, bcc=message.bcc, extra=e, save=False)
-    message.sent = datetime.datetime.now()
+    message.sent = timezone.now()
     message.save()
     return msg
 
@@ -533,7 +585,7 @@ def log_smtp_exception(e):
 def build_warning_message(request, e):
     (extype, value, tb) = exception_components(e)
     if request:
-        warning =  "An error occured while sending email:\n"
+        warning =  "An error occurred while sending email:\n"
         if getattr(e,'original_msg',None):
             warning += "Subject: %s\n" % e.original_msg.get('Subject','[no subject]')
             warning += "To: %s\n" % e.original_msg.get('To','[no to]')
diff --git a/ietf/utils/management/commands/check_draft_event_revision_integrity.py b/ietf/utils/management/commands/check_draft_event_revision_integrity.py
index a4c38bd1c0..c2d4272782 100644
--- a/ietf/utils/management/commands/check_draft_event_revision_integrity.py
+++ b/ietf/utils/management/commands/check_draft_event_revision_integrity.py
@@ -13,6 +13,7 @@
 django.setup()
 
 from django.core.management.base import BaseCommand #, CommandError
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
@@ -29,7 +30,7 @@ class Command(BaseCommand):
     """
 
     def add_arguments(self, parser):
-        default_start = datetime.datetime.now() - datetime.timedelta(days=60)
+        default_start = timezone.now() - datetime.timedelta(days=60)
         parser.add_argument(
             '-d', '--from', type=str, default=default_start.strftime('%Y-%m-%d'),
             help='Limit the list to messages saved after the given date (default %(default)s).',
@@ -53,7 +54,7 @@ def to_dict(instance):
             doc =  getattr(obj, docattr)
             time = getattr(obj, timeattr)
             if not obj.rev:
-                if not doc.is_rfc():
+                if doc.type_id != "rfc":
                     self.stdout.write("Bad revision number: %-52s: '%s'" % (doc.name, obj.rev))
                 continue
             rev = int(obj.rev.lstrip('0') or '0')
diff --git a/ietf/utils/management/commands/coverage_changes.py b/ietf/utils/management/commands/coverage_changes.py
index 7a445bd0c4..4137dbc592 100644
--- a/ietf/utils/management/commands/coverage_changes.py
+++ b/ietf/utils/management/commands/coverage_changes.py
@@ -34,7 +34,7 @@ class Command(BaseCommand):
             "        $ manage.py {name} --absolute --sections=url | grep False\n"
             "\n".format(**locals())
         )
-    args = "[[master_json] latest_json]"
+    args = "[[main_json] latest_json]"
 
     def create_parser(self, prog_name, subcommand):
         import argparse
@@ -73,18 +73,19 @@ def read_coverage(self, filename, version=None):
             data = json.load(file)
         except ValueError as e:
             raise CommandError("Failure to read json data from %s: %s" % (filename, e))
+        file.close()
         version = version or data["version"]
         if not version in data:
             raise CommandError("There is no data for version %s available in %s" % (version, filename))
         return data[version], version
 
-    def coverage_diff(self, master, latest, sections, release=None, **options):
-        master_coverage, mversion = self.read_coverage(master, release)
+    def coverage_diff(self, main, latest, sections, release=None, **options):
+        main_coverage, mversion = self.read_coverage(main, release)
         latest_coverage, lversion = self.read_coverage(latest)
         self.stdout.write("\nShowing coverage differeces between %s and %s:\n" % (mversion, lversion))
         for section in sections:
-            mcoverage = master_coverage[section]["covered"]
-            mformat   = master_coverage[section].get("format", 1)
+            mcoverage = main_coverage[section]["covered"]
+            mformat   = main_coverage[section].get("format", 1)
             lcoverage = latest_coverage[section]["covered"]
             lformat   = latest_coverage[section].get("format", 1)
             #
@@ -235,7 +236,7 @@ def handle(self, *args, **options):
             # verbosity = int(options.get('verbosity'))
             if not filenames:
                 filenames = [
-                    getattr(settings, 'TEST_COVERAGE_MASTER_FILE'),
+                    getattr(settings, 'TEST_COVERAGE_MAIN_FILE'),
                     getattr(settings, 'TEST_COVERAGE_LATEST_FILE'),
                 ]
             if len(filenames) != 2:
diff --git a/ietf/utils/management/commands/dumprelated.py b/ietf/utils/management/commands/dumprelated.py
deleted file mode 100644
index 66fbb33bf1..0000000000
--- a/ietf/utils/management/commands/dumprelated.py
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import io
-import warnings
-from collections import OrderedDict
-
-from django.apps import apps
-from django.contrib.admin.utils import NestedObjects
-from django.core import serializers
-from django.core.management.base import BaseCommand, CommandError
-from django.core.management.utils import parse_apps_and_model_labels
-from django.db import DEFAULT_DB_ALIAS, router
-
-import debug                            # pyflakes:ignore
-debug.debug = True
-
-class ProxyModelWarning(Warning):
-    pass
-
-
-class Command(BaseCommand):
-    help = (
-        "Output a database object and its related objects as a fixture of the given format "
-    )
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            'args', metavar='app_label.ModelName', nargs=1,
-            help='Specifies the app_label.ModelName for which to dump objects given by --pks',
-        )
-        parser.add_argument(
-            '--format', default='json', dest='format',
-            help='Specifies the output serialization format for fixtures.',
-        )
-        parser.add_argument(
-            '--indent', default=None, dest='indent', type=int,
-            help='Specifies the indent level to use when pretty-printing output.',
-        )
-        parser.add_argument(
-            '--database', action='store', dest='database',
-            default=DEFAULT_DB_ALIAS,
-            help='Nominates a specific database to dump fixtures from. '
-                 'Defaults to the "default" database.',
-        )
-        parser.add_argument(
-            '-e', '--exclude', dest='exclude', action='append', default=[],
-            help='An app_label or app_label.ModelName to exclude '
-                 '(use multiple --exclude to exclude multiple apps/models).',
-        )
-        parser.add_argument(
-            '--natural-foreign', action='store_true', dest='use_natural_foreign_keys', default=False,
-            help='Use natural foreign keys if they are available.',
-        )
-        parser.add_argument(
-            '--natural-primary', action='store_true', dest='use_natural_primary_keys', default=False,
-            help='Use natural primary keys if they are available.',
-        )
-        parser.add_argument(
-            '-o', '--output', default=None, dest='output',
-            help='Specifies file to which the output is written.'
-        )
-        parser.add_argument(
-            '--pks', dest='primary_keys', required=True,
-            help="Only dump objects with given primary keys. Accepts a comma-separated "
-                 "list of keys. This option only works when you specify one model.",
-        )
-
-    def handle(self, *app_labels, **options):
-        format = options['format']
-        indent = options['indent']
-        using = options['database']
-        excludes = options['exclude']
-        output = options['output']
-        show_traceback = options['traceback']
-        use_natural_foreign_keys = options['use_natural_foreign_keys']
-        use_natural_primary_keys = options['use_natural_primary_keys']
-        pks = options['primary_keys']
-
-        if pks:
-            primary_keys = [pk.strip() for pk in pks.split(',')]
-        else:
-            primary_keys = []
-
-        excluded_models, excluded_apps = parse_apps_and_model_labels(excludes)
-
-        if len(app_labels) == 0:
-            if primary_keys:
-                raise CommandError("You can only use --pks option with one model")
-            app_list = OrderedDict(
-                (app_config, None) for app_config in apps.get_app_configs()
-                if app_config.models_module is not None and app_config not in excluded_apps
-            )
-        else:
-            if len(app_labels) > 1 and primary_keys:
-                raise CommandError("You can only use --pks option with one model")
-            app_list = OrderedDict()
-            for label in app_labels:
-                try:
-                    app_label, model_label = label.split('.')
-                    try:
-                        app_config = apps.get_app_config(app_label)
-                    except LookupError as e:
-                        raise CommandError(str(e))
-                    if app_config.models_module is None or app_config in excluded_apps:
-                        continue
-                    try:
-                        model = app_config.get_model(model_label)
-                    except LookupError:
-                        raise CommandError("Unknown model: %s.%s" % (app_label, model_label))
-
-                    app_list_value = app_list.setdefault(app_config, [])
-
-                    # We may have previously seen a "all-models" request for
-                    # this app (no model qualifier was given). In this case
-                    # there is no need adding specific models to the list.
-                    if app_list_value is not None:
-                        if model not in app_list_value:
-                            app_list_value.append(model)
-                except ValueError:
-                    if primary_keys:
-                        raise CommandError("You can only use --pks option with one model")
-                    # This is just an app - no model qualifier
-                    app_label = label
-                    try:
-                        app_config = apps.get_app_config(app_label)
-                    except LookupError as e:
-                        raise CommandError(str(e))
-                    if app_config.models_module is None or app_config in excluded_apps:
-                        continue
-                    app_list[app_config] = None
-
-        # Check that the serialization format exists; this is a shortcut to
-        # avoid collating all the objects and _then_ failing.
-        if format not in serializers.get_public_serializer_formats():
-            try:
-                serializers.get_serializer(format)
-            except serializers.SerializerDoesNotExist:
-                pass
-
-            raise CommandError("Unknown serialization format: %s" % format)
-
-        def flatten(l):
-            if isinstance(l, list):
-                for el in l:
-                    if isinstance(el, list):
-                        for sub in flatten(el):
-                            yield sub
-                    else:
-                        yield el
-            else:
-                yield l
-
-        def get_objects(count_only=False):
-            """
-            Collate the objects to be serialized. If count_only is True, just
-            count the number of objects to be serialized.
-            """
-            models = serializers.sort_dependencies(list(app_list.items()))
-            for model in models:
-                if model in excluded_models:
-                    continue
-                if model._meta.proxy and model._meta.proxy_for_model not in models:
-                    warnings.warn(
-                        "%s is a proxy model and won't be serialized." % model._meta.label,
-                        category=ProxyModelWarning,
-                    )
-                if not model._meta.proxy and router.allow_migrate_model(using, model):
-                    objects = model._default_manager
-
-                    queryset = objects.using(using).order_by(model._meta.pk.name)
-                    if primary_keys:
-                        queryset = queryset.filter(pk__in=primary_keys)
-                    if count_only:
-                        yield queryset.order_by().count()
-                    else:
-                        for obj in queryset.iterator():
-                            collector = NestedObjects(using=using)
-                            collector.collect([obj,])
-                            object_list = list(flatten(collector.nested()))
-                            object_list.reverse()
-                            for o in object_list:
-                                yield o
-
-        try:
-            self.stdout.ending = None
-            progress_output = None
-            object_count = 0
-            # If dumpdata is outputting to stdout, there is no way to display progress
-            if (output and self.stdout.isatty() and options['verbosity'] > 0):
-                progress_output = self.stdout
-                object_count = sum(get_objects(count_only=True))
-            stream = io.open(output, 'w') if output else None
-            try:
-                serializers.serialize(
-                    format, get_objects(), indent=indent,
-                    use_natural_foreign_keys=use_natural_foreign_keys,
-                    use_natural_primary_keys=use_natural_primary_keys,
-                    stream=stream or self.stdout, progress_output=progress_output,
-                    object_count=object_count,
-                )
-            finally:
-                if stream:
-                    stream.close()
-        except Exception as e:
-            if show_traceback:
-                raise
-            raise CommandError("Unable to serialize database: %s" % e)
diff --git a/ietf/utils/management/commands/fix_ambiguous_timestamps.py b/ietf/utils/management/commands/fix_ambiguous_timestamps.py
index fc872f4586..84a82bb309 100644
--- a/ietf/utils/management/commands/fix_ambiguous_timestamps.py
+++ b/ietf/utils/management/commands/fix_ambiguous_timestamps.py
@@ -10,6 +10,7 @@
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db import models
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
@@ -53,7 +54,7 @@ def fixup(self, model, field, start, stop):
     def handle(self, *app_labels, **options):
         self.verbosity = options['verbosity']
         self.quiet = self.verbosity < 1
-        stop = datetime.datetime.now()
+        stop = timezone.now()
         start = stop - datetime.timedelta(days=14)
 
         for name, appconf in apps.app_configs.items():
diff --git a/ietf/utils/management/commands/import_htpasswd.py b/ietf/utils/management/commands/import_htpasswd.py
deleted file mode 100644
index ed19eea6fd..0000000000
--- a/ietf/utils/management/commands/import_htpasswd.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright The IETF Trust 2014-2020, All Rights Reserved
-import io
-import sys
-
-from textwrap import dedent
-
-from django.contrib.auth.models import User
-from django.core.management.base import BaseCommand
-
-def import_htpasswd_file(filename, verbosity=1, overwrite=False):
-    with io.open(filename) as file:
-        for line in file:
-            if not ':' in line:
-                raise ValueError('Found a line without colon separator in the htpassword file %s:'
-                                 '   "%s"' % (file.name, line))
-            username, password = line.strip().split(':', 1)
-            try:
-                user = User.objects.get(username=username)
-                if overwrite == True or not user.password:
-                    if   password.startswith('{SHA}'):
-                        user.password = "sha1$$%s" % password[len('{SHA}'):]
-                    elif password.startswith('$apr1$'):
-                        user.password = "md5$%s" % password[len('$apr1$'):]
-                    else:       # Assume crypt
-                        user.password = "crypt$$%s" % password
-                    user.save()
-                    if verbosity > 0:
-                        sys.stderr.write('.')
-                    if verbosity > 1:
-                        sys.stderr.write(' %s\n' % username)
-            except User.DoesNotExist:
-                if verbosity > 1:
-                    sys.stderr.write('\nNo such user: %s\n' % username)
-
-class Command(BaseCommand):
-    """
-    Import passwords from one or more htpasswd files to Django's auth_user table.
-
-    This command only imports passwords; it does not import usernames, as that
-    would leave usernames without associated Person records in the database,
-    something which is undesirable.
-
-    By default the command won't overwrite existing password entries, but
-    given the --force switch, it will overwrite existing entries too.  Without
-    the --force switch, the command is safe to run repeatedly.
-    """
-
-    help = dedent(__doc__).strip()
-            
-    def add_arguments(self, parser):
-        parser.add_argument('--force',
-            action='store_true', dest='overwrite', default=False,
-            help='Overwrite existing passwords in the auth_user table.')
-
-
-    args = '[path [path [...]]]'
-
-    def handle(self, *filenames, **options):
-        overwrite = options.get('overwrite', False)
-        verbosity = int(options.get('verbosity'))
-        for fn in filenames:
-            import_htpasswd_file(fn, verbosity=verbosity, overwrite=overwrite)
-                    
diff --git a/ietf/utils/management/commands/loadrelated.py b/ietf/utils/management/commands/loadrelated.py
deleted file mode 100644
index e3d84990c9..0000000000
--- a/ietf/utils/management/commands/loadrelated.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import gzip
-import os
-#import sys
-import tqdm
-import zipfile
-
-try:
-    import bz2
-    has_bz2 = True
-except ImportError:
-    has_bz2 = False
-
-from django.core.exceptions import ObjectDoesNotExist
-from django.core import serializers
-from django.db import DEFAULT_DB_ALIAS, DatabaseError, IntegrityError, connections
-from django.db.models.signals import post_save
-from django.utils.encoding import force_text
-import django.core.management.commands.loaddata as loaddata
-
-import debug                            # pyflakes:ignore
-
-from ietf.community.models import notify_events
-
-class Command(loaddata.Command):
-    help = ("""
-
-        Load a fixture of related objects to the database.  The fixture is expected
-        to contain a set of related objects, created with the 'dumprelated' management
-        command.  It differs from the 'loaddata' command in that it silently ignores
-        attempts to load duplicate entries, and continues loading subsequent entries.
-
-        """)
-
-    def add_arguments(self, parser):
-        parser.add_argument('args', metavar='fixture', nargs='+', help='Fixture files.')
-        parser.add_argument(
-            '--database', action='store', dest='database', default=DEFAULT_DB_ALIAS,
-            help='Nominates a specific database to load fixtures into. Defaults to the "default" database.',
-        )
-        parser.add_argument(
-            '--ignorenonexistent', '-i', action='store_true', dest='ignore', default=False,
-            help='Ignores entries in the serialized data for fields that do not '
-                 'currently exist on the model.',
-        )
-
-    def handle(self, *args, **options):
-        self.ignore = options['ignore']
-        self.using = options['database']
-        self.verbosity = options['verbosity']
-        #
-        self.compression_formats = {
-            None: (open, 'rb'),
-            'gz': (gzip.GzipFile, 'rb'),
-            'zip': (SingleZipReader, 'r'),
-        }
-        if has_bz2:
-            self.compression_formats['bz2'] = (bz2.BZ2File, 'r')
-        #
-        self.serialization_formats = serializers.get_public_serializer_formats()
-        #
-        post_save.disconnect(notify_events)
-        #
-        connection = connections[self.using]
-        self.fixture_count = 0
-        self.loaded_object_count = 0
-        self.fixture_object_count = 0
-        #
-        for arg in args:
-            fixture_file = arg
-            self.stdout.write("Loading objects from %s" % fixture_file)
-            _, ser_fmt, cmp_fmt = self.parse_name(os.path.basename(fixture_file))
-            open_method, mode = self.compression_formats[cmp_fmt]
-            fixture = open_method(fixture_file, mode)
-            objects_in_fixture = 0
-            self.stdout.write("Getting object count...\b\b\b", ending='')
-            self.stdout.flush()
-            for o in serializers.deserialize(ser_fmt, fixture, using=self.using, ignorenonexistent=self.ignore,):
-                objects_in_fixture += 1
-            self.stdout.write(" %d" % objects_in_fixture)
-            #
-            fixture = open_method(fixture_file, mode)
-            self.fixture_count += 1
-            objects = serializers.deserialize(ser_fmt, fixture, using=self.using, ignorenonexistent=self.ignore,)
-            with connection.constraint_checks_disabled():
-                for obj in tqdm.tqdm(objects, total=objects_in_fixture):
-                    try:
-                        obj.save(using=self.using)
-                        self.loaded_object_count += 1
-                    except (DatabaseError, IntegrityError, ObjectDoesNotExist, AttributeError) as e:
-                        error_msg = force_text(e)
-                        if "Duplicate entry" in error_msg:
-                            pass
-                        else:
-                            self.stderr.write("Could not load %(app_label)s.%(object_name)s(pk=%(pk)s): %(error_msg)s" % {
-                                'app_label': obj.object._meta.app_label,
-                                'object_name': obj.object._meta.object_name,
-                                'pk': obj.object.pk,
-                                'error_msg': error_msg,
-                            }, )
-            self.fixture_object_count += objects_in_fixture
-
-        if self.verbosity >= 1:
-            if self.fixture_object_count == self.loaded_object_count:
-                self.stdout.write(
-                    "Installed %d object(s) from %d fixture(s)"
-                    % (self.loaded_object_count, self.fixture_count)
-                )
-            else:
-                self.stdout.write(
-                    "Installed %d object(s) (of %d) from %d fixture(s)"
-                    % (self.loaded_object_count, self.fixture_object_count, self.fixture_count)
-                )
-
-        
-class SingleZipReader(zipfile.ZipFile):
-
-    def __init__(self, *args, **kwargs):
-        zipfile.ZipFile.__init__(self, *args, **kwargs)
-        if len(self.namelist()) != 1:
-            raise ValueError("Zip-compressed fixtures must contain one file.")
-
-    def read(self):
-        return zipfile.ZipFile.read(self, self.namelist()[0])
-
-
diff --git a/ietf/utils/management/commands/mergedata.py b/ietf/utils/management/commands/mergedata.py
index 3a169c51e3..e73014c789 100644
--- a/ietf/utils/management/commands/mergedata.py
+++ b/ietf/utils/management/commands/mergedata.py
@@ -15,7 +15,7 @@
 from django.core.management.commands.loaddata import Command as LoadCommand, humanize
 from django.db import DatabaseError, IntegrityError, router, transaction
 from django.db.models import ManyToManyField
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from ietf.utils.models import ForeignKey
 
@@ -188,7 +188,7 @@ def get_unique_field(obj):
                                             #debug.say("Found matching object with new pk: %s" % (obj.object.pk, ))
                             new_pk = obj.object.pk
                             if new_pk != old_pk:
-                                # Update other objects refering to this
+                                # Update other objects referring to this
                                 # object to use the new pk
                                 #debug.show('old_pk, new_pk')
                                 mname = model._meta.app_label + '.' + model.__name__
@@ -234,7 +234,7 @@ def get_unique_field(obj):
                                 'object_name': obj.object._meta.object_name,
                                 'pk': obj.object.pk,
                                 'data': obj_to_dict(obj.object),
-                                'error_msg': force_text(e)
+                                'error_msg': force_str(e)
                             },)
                             raise
                 if objects and show_progress:
@@ -262,4 +262,4 @@ def find_fixtures(self, fixture_label):
             fixture_files = [ (fixture_label, os.path.dirname(fixture_label) or os.getcwd(), os.path.basename(fixture_label)) ]
         else:
             fixture_files = super(Command, self).find_fixtures(fixture_label)
-        return fixture_files
\ No newline at end of file
+        return fixture_files
diff --git a/ietf/utils/management/commands/patch_libraries.py b/ietf/utils/management/commands/patch_libraries.py
new file mode 100644
index 0000000000..d9ae11097b
--- /dev/null
+++ b/ietf/utils/management/commands/patch_libraries.py
@@ -0,0 +1,31 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+import django
+
+from django.conf import settings
+from django.core.management.base import BaseCommand, CommandError
+from pathlib import Path
+
+from ietf.utils import patch
+
+
+class Command(BaseCommand):
+    """Apply IETF patches to libraries"""
+    requires_system_checks = tuple()
+
+    def handle(self, *args, **options):
+        library_path = Path(django.__file__).parent.parent
+        top_dir = Path(settings.BASE_DIR).parent 
+
+        # All patches in settings.CHECKS_LIBRARY_PATCHES_TO_APPLY must have a
+        # relative file path starting from the site-packages dir, e.g.
+        # 'django/db/models/fields/__init__.py'
+        for patch_file in settings.CHECKS_LIBRARY_PATCHES_TO_APPLY:
+            patch_set = patch.fromfile(top_dir / Path(patch_file))
+            if not patch_set:
+                raise CommandError(f"Could not parse patch file '{patch_file}'")
+            if not patch_set.apply(root=bytes(library_path)):
+                raise CommandError(f"Could not apply the patch from '{patch_file}'")
+            if patch_set.already_patched:
+                self.stdout.write(f"Patch from '{patch_file}' was already applied")
+            else:
+                self.stdout.write(f"Applied the patch from '{patch_file}'")
diff --git a/ietf/utils/management/commands/periodic_tasks.py b/ietf/utils/management/commands/periodic_tasks.py
new file mode 100644
index 0000000000..2d34f8361c
--- /dev/null
+++ b/ietf/utils/management/commands/periodic_tasks.py
@@ -0,0 +1,310 @@
+# Copyright The IETF Trust 2024, All Rights Reserved
+import json
+from django_celery_beat.models import CrontabSchedule, PeriodicTask
+
+from django.core.management.base import BaseCommand
+
+CRONTAB_DEFS = {
+    # same as "@weekly" in a crontab
+    "weekly": {
+        "minute": "0",
+        "hour": "0",
+        "day_of_month": "*",
+        "month_of_year": "*",
+        "day_of_week": "0",
+        "timezone": "America/Los_Angeles",
+    },
+    "daily": {
+        "minute": "5",
+        "hour": "0",
+        "day_of_month": "*",
+        "month_of_year": "*",
+        "day_of_week": "*",
+        "timezone": "America/Los_Angeles",
+    },
+    "hourly": {
+        "minute": "5",
+        "hour": "*",
+        "day_of_month": "*",
+        "month_of_year": "*",
+        "day_of_week": "*",
+    },
+    "every_15m": {
+        "minute": "*/15",
+        "hour": "*",
+        "day_of_month": "*",
+        "month_of_year": "*",
+        "day_of_week": "*",
+    },
+    "every_15m_except_midnight": {
+        "minute": "*/15",
+        "hour": "1-23",
+        "day_of_month": "*",
+        "month_of_year": "*",
+        "day_of_week": "*",
+        "timezone": "America/Los_Angeles",
+    },
+}
+
+
+class Command(BaseCommand):
+    """Manage periodic tasks"""
+    crontabs = None
+
+    def add_arguments(self, parser):
+        parser.add_argument("--create-default", action="store_true")
+        parser.add_argument("--enable", type=int, action="append")
+        parser.add_argument("--disable", type=int, action="append")
+
+    def handle(self, *args, **options):
+        self.crontabs = self.get_or_create_crontabs()
+        if options["create_default"]:
+            self.create_default_tasks()
+        if options["enable"]:
+            self.enable_tasks(options["enable"])
+        if options["disable"]:
+            self.disable_tasks(options["disable"])
+        self.show_tasks()
+
+    def get_or_create_crontabs(self):
+        crontabs = {}
+        for label, definition in CRONTAB_DEFS.items():
+            crontabs[label], _ = CrontabSchedule.objects.get_or_create(**definition)
+        return crontabs
+
+    def create_default_tasks(self):
+        PeriodicTask.objects.get_or_create(
+            name="Send scheduled mail",
+            task="ietf.message.tasks.send_scheduled_mail_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["every_15m"],
+                description="Send mail scheduled to go out at certain times"
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Partial sync with RFC Editor index",
+            task="ietf.sync.tasks.rfc_editor_index_update_task",
+            kwargs=json.dumps(dict(full_index=False)),
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["every_15m_except_midnight"],  # don't collide with full sync
+                description=(
+                    "Reparse the last _year_ of RFC index entries until "
+                    "https://github.com/ietf-tools/datatracker/issues/3734 is addressed. "
+                    "This takes about 20s on production as of 2022-08-11."
+                )
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Full sync with RFC Editor index",
+            task="ietf.sync.tasks.rfc_editor_index_update_task",
+            kwargs=json.dumps(dict(full_index=True)),
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description=(
+                    "Run an extended version of the rfc editor update to catch changes with backdated timestamps"
+                ),
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Fetch meeting attendance",
+            task="ietf.stats.tasks.fetch_meeting_attendance_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description="Fetch meeting attendance data from ietf.org/registration/attendees",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Send review reminders",
+            task="ietf.review.tasks.send_review_reminders_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description="Send reminders originating from the review app",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Expire I-Ds",
+            task="ietf.doc.tasks.expire_ids_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description="Create expiration notices for expired I-Ds",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Expire Last Calls",
+            task="ietf.doc.tasks.expire_last_calls_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description="Move docs whose last call has expired to their next states",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Sync with IANA changes",
+            task="ietf.sync.tasks.iana_changes_update_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["hourly"],
+                description="Fetch change list from IANA and apply to documents",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Sync with IANA protocols page",
+            task="ietf.sync.tasks.iana_protocols_update_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["hourly"],
+                description="Fetch protocols page from IANA and update document event logs",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Update I-D index files",
+            task="ietf.idindex.tasks.idindex_update_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["hourly"],
+                description="Update I-D index files",
+            ),
+        )
+        
+        PeriodicTask.objects.get_or_create(
+            name="Send expiration notifications",
+            task="ietf.doc.tasks.notify_expirations_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["weekly"],
+                description="Send notifications about I-Ds that will expire in the next 14 days",
+            )
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Generate idnits2 rfcs-obsoleted blob",
+            task="ietf.doc.tasks.generate_idnits2_rfcs_obsoleted_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["hourly"],
+                description="Generate the rfcs-obsoleted file used by idnits",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Generate idnits2 rfc-status blob",
+            task="ietf.doc.tasks.generate_idnits2_rfc_status_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["hourly"],
+                description="Generate the rfc_status blob used by idnits",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Send NomCom reminders",
+            task="ietf.nomcom.tasks.send_nomcom_reminders_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description="Send acceptance and questionnaire reminders to nominees",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Generate WG charter files",
+            task="ietf.group.tasks.generate_wg_charters_files_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["hourly"],
+                description="Update 1wg-charters.txt and 1wg-charters-by-acronym.txt",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Generate WG summary files",
+            task="ietf.group.tasks.generate_wg_summary_files_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["hourly"],
+                description="Update 1wg-summary.txt and 1wg-summary-by-acronym.txt",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Generate I-D bibxml files",
+            task="ietf.doc.tasks.generate_draft_bibxml_files_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["hourly"],
+                description="Generate draft bibxml files for the last week's drafts",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Send personal API key usage emails",
+            task="ietf.person.tasks.send_apikey_usage_emails_task",
+            kwargs=json.dumps(dict(days=7)),
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["weekly"],
+                description="Send personal API key usage summary emails for the past week",
+            ),
+        )
+        
+        PeriodicTask.objects.get_or_create(
+            name="Purge old personal API key events",
+            task="ietf.person.tasks.purge_personal_api_key_events_task",
+            kwargs=json.dumps(dict(keep_days=14)),
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description="Purge PersonApiKeyEvent instances older than 14 days",
+            ),
+        )
+
+        PeriodicTask.objects.get_or_create(
+            name="Run Yang model checks",
+            task="ietf.submit.tasks.run_yang_model_checks_task",
+            defaults=dict(
+                enabled=False,
+                crontab=self.crontabs["daily"],
+                description="Re-run Yang model checks on all active drafts",
+            ),
+        )
+
+    def show_tasks(self):
+        for label, crontab in self.crontabs.items():
+            tasks = PeriodicTask.objects.filter(crontab=crontab).order_by(
+                "task", "name"
+            )
+            self.stdout.write(f"\n{label} ({crontab.human_readable})\n")
+            if tasks:
+                for task in tasks:
+                    desc = f"  {task.id:-3d}: {task.task} - {task.name}"
+                    if task.enabled:
+                        self.stdout.write(desc)
+                    else:
+                        self.stdout.write(self.style.NOTICE(f"{desc} - disabled"))
+            else:
+                self.stdout.write("  Nothing scheduled")
+
+    def enable_tasks(self, pks):
+        PeriodicTask.objects.filter(
+            crontab__in=self.crontabs.values(), pk__in=pks
+        ).update(enabled=True)
+
+    def disable_tasks(self, pks):
+        PeriodicTask.objects.filter(
+            crontab__in=self.crontabs.values(), pk__in=pks
+        ).update(enabled=False)
diff --git a/ietf/utils/management/commands/populate_yang_model_dirs.py b/ietf/utils/management/commands/populate_yang_model_dirs.py
deleted file mode 100644
index 1a6e1422cb..0000000000
--- a/ietf/utils/management/commands/populate_yang_model_dirs.py
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright The IETF Trust 2016-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import io
-import os
-import sys
-import time
-
-from pathlib import Path
-from textwrap import dedent
-from xym import xym
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-import debug                            # pyflakes:ignore
-
-class Command(BaseCommand):
-    """
-    Populate the yang module repositories from drafts and RFCs.
-
-    Extracts yang models from RFCs (found in settings.RFC_PATH and places
-    them in settings.SUBMIT_YANG_RFC_MODEL_DIR, and from active drafts, placed in
-    settings.SUBMIT_YANG_DRAFT_MODEL_DIR.
-
-    """
-
-    help = dedent(__doc__).strip()
-            
-    def add_arguments(self, parser):
-        parser.add_argument('--clean',
-            action='store_true', dest='clean', default=False,
-            help='Remove the current directory content before writing new models.')
-
-
-    def handle(self, *filenames, **options):
-        """
-
-         * All yang modules from published RFCs should be extracted and be
-           available in an rfc-yang repository.
-
-         * All valid yang modules from active, not replaced, internet drafts
-           should be extracted and be available in a draft-valid-yang repository.
-
-         * All, valid and invalid, yang modules from active, not replaced,
-           internet drafts should be available in a draft-all-yang repository.
-           (Actually, given precedence ordering, it would be enough to place
-           non-validating modules in a draft-invalid-yang repository instead).
-
-         * In all cases, example modules should be excluded.
-
-         * Precedence is established by the search order of the repository as
-           provided to pyang.
-
-         * As drafts expire, models should be removed in order to catch cases
-           where a module being worked on depends on one which has slipped out
-           of the work queue.
-
-        """
-
-        verbosity = int(options.get('verbosity'))
-
-        def extract_from(file, dir, strict=True):
-            saved_stdout = sys.stdout
-            saved_stderr = sys.stderr
-            xymerr = io.StringIO()
-            xymout = io.StringIO()            
-            sys.stderr = xymerr
-            sys.stdout = xymout
-            model_list = []
-            try:
-                model_list = xym.xym(str(file), str(file.parent), str(dir), strict=strict, debug_level=verbosity-2)
-                for name in model_list:
-                    modfile = moddir / name
-                    mtime = file.stat().st_mtime
-                    os.utime(str(modfile), (mtime, mtime))
-                    if '"' in name:
-                        name = name.replace('"', '')
-                        modfile.rename(str(moddir/name))
-                model_list = [ n.replace('"','') for n in model_list ]
-            except Exception as e:
-                self.stderr.write("** Error when extracting from %s: %s" % (file, str(e)))
-            finally:
-                sys.stdout = saved_stdout
-                sys.stderr = saved_stderr
-            #
-            if verbosity > 1:
-                outmsg = xymout.getvalue()
-                if outmsg.strip():
-                    self.stdout.write(outmsg)
-            if verbosity>2:            
-                errmsg = xymerr.getvalue()
-                if errmsg.strip():
-                    self.stderr.write(errmsg)
-            return model_list
-
-        # Extract from new RFCs
-
-        rfcdir = Path(settings.RFC_PATH)
-
-        moddir = Path(settings.SUBMIT_YANG_RFC_MODEL_DIR)
-        if not moddir.exists():
-            moddir.mkdir(parents=True)
-
-        latest = 0
-        for item in moddir.iterdir():
-            if item.stat().st_mtime > latest:
-                latest = item.stat().st_mtime
-
-        if verbosity > 0:
-            self.stdout.write("Extracting to %s ..." % moddir)
-        for item in rfcdir.iterdir():
-            if item.is_file() and item.name.startswith('rfc') and item.name.endswith('.txt') and  item.name[3:-4].isdigit():
-                if item.stat().st_mtime > latest:
-                    model_list = extract_from(item, moddir)
-                    for name in model_list:
-                        if name.startswith('ietf') or name.startswith('iana'):
-                            if verbosity > 1:
-                                self.stdout.write("  Extracted from %s: %s" % (item, name))
-                            elif verbosity > 0:
-                                self.stdout.write('.', ending='')
-                                self.stdout.flush()
-                        else:
-                            modfile = moddir / name
-                            modfile.unlink()
-                            if verbosity > 1:
-                                self.stdout.write("  Skipped module from %s: %s" % (item, name))
-        if verbosity > 0:
-            self.stdout.write("")
-
-        # Extract valid modules from drafts
-
-        six_months_ago = time.time() - 6*31*24*60*60
-        def active(item):
-            return item.stat().st_mtime > six_months_ago
-
-        draftdir = Path(settings.INTERNET_DRAFT_PATH)
-
-        moddir = Path(settings.SUBMIT_YANG_DRAFT_MODEL_DIR)
-        if not moddir.exists():
-            moddir.mkdir(parents=True)
-        if verbosity > 0:
-            self.stdout.write("Emptying %s ..." % moddir)
-        for item in moddir.iterdir():
-            item.unlink()
-
-        if verbosity > 0:
-            self.stdout.write("Extracting to %s ..." % moddir)
-        for item in draftdir.iterdir():
-            try:
-                if item.is_file() and item.name.startswith('draft') and item.name.endswith('.txt') and active(item):
-                    model_list = extract_from(item, moddir, strict=False)
-                    for name in model_list:
-                        if not name.startswith('example'):
-                            if verbosity > 1:
-                                self.stdout.write("  Extracted module from %s: %s" % (item, name))
-                            elif verbosity > 0:
-                                self.stdout.write('.', ending='')
-                                self.stdout.flush()
-                        else:
-                            modfile = moddir / name
-                            modfile.unlink()
-                            if verbosity > 1:
-                                self.stdout.write("  Skipped module from %s: %s" % (item, name))
-            except UnicodeDecodeError as e:
-                self.stderr.write('\nError: %s' % (e, ))
-                self.stderr.write(item.name)
-                self.stderr.write('')
-        if verbosity > 0:
-            self.stdout.write('')
-
diff --git a/ietf/utils/management/commands/run_yang_model_checks.py b/ietf/utils/management/commands/run_yang_model_checks.py
deleted file mode 100644
index 13fb61c46b..0000000000
--- a/ietf/utils/management/commands/run_yang_model_checks.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright The IETF Trust 2017-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import json
-
-from textwrap import dedent
-
-from django.core.management.base import BaseCommand
-
-import debug                            # pyflakes:ignore
-
-from ietf.doc.models import Document, State, DocAlias
-from ietf.submit.models import Submission
-from ietf.submit.checkers import DraftYangChecker
-
-
-class Command(BaseCommand):
-    """
-    Run yang model checks on active drafts.
-
-    Repeats the yang checks in ietf/submit/checkers.py for active drafts, in
-    order to catch changes in status due to new modules becoming available in
-    the module directories.
-
-    """
-
-    help = dedent(__doc__).strip()
-            
-    def add_arguments(self, parser):
-        parser.add_argument('draftnames', nargs="*", help="drafts to check, or none to check all active yang drafts")
-        parser.add_argument('--clean',
-            action='store_true', dest='clean', default=False,
-            help='Remove the current directory content before writing new models.')
-
-
-    def check_yang(self, checker, draft, force=False):
-        if self.verbosity > 1:
-            self.stdout.write("Checking %s-%s" % (draft.name, draft.rev))
-        elif self.verbosity > 0:
-            self.stderr.write('.', ending='')
-        submission = Submission.objects.filter(name=draft.name, rev=draft.rev).order_by('-id').first()
-        if submission or force:
-            check = submission.checks.filter(checker=checker.name).order_by('-id').first()
-            if check or force:
-                result = checker.check_file_txt(draft.get_file_name())
-                passed, message, errors, warnings, items = result
-                if self.verbosity > 2:
-                    self.stdout.write("  Errors: %s\n"
-                                      "  Warnings: %s\n"
-                                      "  Message:\n%s\n" % (errors, warnings, message))
-                items = json.loads(json.dumps(items))
-                new_res = (passed, errors, warnings, message)
-                old_res = (check.passed, check.errors, check.warnings, check.message) if check else ()
-                if new_res != old_res:
-                    if self.verbosity > 1:
-                        self.stdout.write("  Saving new yang checker results for %s-%s" % (draft.name, draft.rev))
-                    qs = submission.checks.filter(checker=checker.name).order_by('time')
-                    submission.checks.filter(checker=checker.name).exclude(pk=qs.first().pk).delete()
-                    submission.checks.create(submission=submission, checker=checker.name, passed=passed,
-                                                message=message, errors=errors, warnings=warnings, items=items,
-                                                symbol=checker.symbol)
-        else:
-            self.stderr.write("Error: did not find any submission object for %s-%s" % (draft.name, draft.rev))
-
-    def handle(self, *filenames, **options):
-        """
-        """
-
-        self.verbosity = int(options.get('verbosity'))
-        drafts = options.get('draftnames')
-
-        active_state = State.objects.get(type="draft", slug="active")
-
-        checker = DraftYangChecker()
-        if drafts:
-            for name in drafts:
-                parts = name.rsplit('-',1)
-                if len(parts)==2 and len(parts[1])==2 and parts[1].isdigit():
-                    name = parts[0]
-                draft = DocAlias.objects.get(name=name).document
-                self.check_yang(checker, draft, force=True)
-        else:
-            for draft in Document.objects.filter(states=active_state, type_id='draft'):
-                self.check_yang(checker, draft)
diff --git a/ietf/utils/management/commands/send_gdpr_consent_request.py b/ietf/utils/management/commands/send_gdpr_consent_request.py
deleted file mode 100644
index 2bb08eed1b..0000000000
--- a/ietf/utils/management/commands/send_gdpr_consent_request.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import datetime
-import time
-
-from django.conf import settings
-from django.core.management.base import BaseCommand, CommandError
-
-import debug                            # pyflakes:ignore
-
-from ietf.person.models import Person, PersonEvent
-from ietf.utils.mail import send_mail
-
-class Command(BaseCommand):
-    help = ("""
-        Send GDPR consent request emails to persons who have not indicated consent
-        to having their personal information stored.  Each send is logged as a
-        PersonEvent.
-
-        By default email sending happens at a rate of 1 message per second; the
-        rate can be adjusted with the -r option.  At the start of a run, an estimate
-        is given of how many persons to send to, and  how long the run will take.
-
-        By default, emails are not sent out if there is less than 6 days since the
-        previous consent request email.  The interval can be adjusted with the -m
-        option.  One effect of this is that it is possible to break of a run and
-        re-start it with for instance a different rate, without having duplicate
-        messages go out to persons that were handled in the interrupted run.
-        """)
-
-    def add_arguments(self, parser):
-        parser.add_argument('-n', '--dry-run', action='store_true', default=False,
-            help="Don't send email, just list recipients")
-        parser.add_argument('-d', '--date', help="Date of deletion (mentioned in message)")
-        parser.add_argument('-m', '--minimum-interval', type=int, default=6,
-            help="Minimum interval between re-sending email messages, default: %(default)s days")
-        parser.add_argument('-r', '--rate', type=float, default=1.0,
-            help='Rate of sending mail, default: %(default)s/s')
-        parser.add_argument('-R', '--reminder', action='store_true', default=False,
-            help='Preface the subject with "Reminder:"')
-        parser.add_argument('user', nargs='*')
-         
-
-    def handle(self, *args, **options):
-        # Don't send copies of the whole bulk mailing to the debug mailbox
-        if settings.SERVER_MODE == 'production':
-            settings.EMAIL_COPY_TO = "Email Debug Copy <outbound@ietf.org>"
-        #
-        event_type = 'gdpr_notice_email'
-        # Arguments
-        # --date
-        if 'date' in options and options['date'] != None:
-            try:
-                date = datetime.datetime.strptime(options['date'], "%Y-%m-%d").date()
-            except ValueError as e:
-                raise CommandError('%s' % e)
-        else:
-            date = datetime.date.today() + datetime.timedelta(days=30)
-        days = (date - datetime.date.today()).days
-        if days <= 1:
-            raise CommandError('date must be more than 1 day in the future')
-        # --rate
-        delay = 1.0/options['rate']
-        # --minimum_interval
-        minimum_interval = options['minimum_interval']
-        latest_previous = datetime.datetime.now() - datetime.timedelta(days=minimum_interval)
-        # user
-        self.stdout.write('Querying the database for matching person records ...')
-        if 'user' in options and options['user']:
-            persons = Person.objects.filter(user__username__in=options['user'])
-        else:
-            exclude = PersonEvent.objects.filter(time__gt=latest_previous, type=event_type)
-            persons = Person.objects.exclude(consent=True).exclude(personevent__in=exclude)
-        # Report the size of the run
-        runtime = persons.count() * delay
-        self.stdout.write('Sending to %d users; estimated time a bit more than %d:%02d hours' % (persons.count(), runtime//3600, runtime%3600//60))
-        subject='Personal Information in the IETF Datatracker'
-        if options['reminder']:
-            subject = "Reminder: " + subject
-        for person in persons:
-            fields = ', '.join(person.needs_consent())
-            if fields and person.email_set.exists():
-                if options['dry_run']:
-                    print(("%-32s %-32s %-32s %-32s %s" % (person.email(), person.name_from_draft or '', person.name, person.ascii, fields)).encode('utf8'))
-                else:
-                    to = [ e.address for e in person.email_set.filter(active=True) ] # pyflakes:ignore
-                    if not to:
-                        to = [ e.address for e in person.email_set.all() ] # pyflakes:ignore
-                    self.stdout.write("Sendimg email to %s" % to)
-                    send_mail(None, to, "<gdprnoreply@ietf.org>",
-                        subject=subject,
-                        template='utils/personal_information_notice.txt',
-                        context={
-                            'date': date, 'days': days, 'fields': fields,
-                            'person': person, 'settings': settings,
-                            },
-                        )
-                    PersonEvent.objects.create(person=person, type='gdpr_notice_email', 
-                                               desc="Sent GDPR notice email to %s with confirmation deadline %s" % (to, date))
-                    time.sleep(delay)
-                
diff --git a/ietf/utils/management/commands/showloggers.py b/ietf/utils/management/commands/showloggers.py
index 3de9db0c06..b79da9ce26 100644
--- a/ietf/utils/management/commands/showloggers.py
+++ b/ietf/utils/management/commands/showloggers.py
@@ -11,18 +11,7 @@
 import debug                            # pyflakes:ignore
 
 class Command(BaseCommand):
-    """
-    Display a list or tree representation of python loggers.
-
-    Add a UTILS_LOGGER_LEVELS setting in settings_local.py to configure
-    non-default logging levels for any registered logger, for instance:
-
-    UTILS_LOGGER_LEVELS = {
-        'oicd_provider': 'DEBUG',
-        'urllib3.connection': 'DEBUG',
-    }
-
-    """
+    """Display a list or tree representation of python loggers"""
 
     help = dedent(__doc__).strip()
 
diff --git a/ietf/utils/management/commands/tests.py b/ietf/utils/management/commands/tests.py
index 6619cb819e..d684b31f7b 100644
--- a/ietf/utils/management/commands/tests.py
+++ b/ietf/utils/management/commands/tests.py
@@ -15,7 +15,7 @@
 class CoverageChangeTestCase(TestCase):
 
     def test_coverage_change(self):
-        master_txt ="""{
+        main_txt ="""{
               "5.12.0": {
                 "code": {
                   "coverage": 0.5921474057048117, 
@@ -81,16 +81,16 @@ def test_coverage_change(self):
               "version":"latest"
             }
             """
-        mfh, master = tempfile.mkstemp(suffix='.json')
-        with io.open(master, "w") as file:
-            file.write(master_txt)
+        mfh, main = tempfile.mkstemp(suffix='.json')
+        with io.open(main, "w") as file:
+            file.write(main_txt)
         lfh, latest = tempfile.mkstemp(suffix='.json')
         with io.open(latest, "w") as file:
             file.write(latest_txt)
         output = io.StringIO()
-        call_command('coverage_changes', master, latest, stdout=output)
+        call_command('coverage_changes', main, latest, stdout=output)
         text = output.getvalue()
-        os.unlink(master)
+        os.unlink(main)
         os.unlink(latest)
 
         for l in [
diff --git a/ietf/utils/management/commands/update_community_list_index.py b/ietf/utils/management/commands/update_community_list_index.py
index 609577763e..7f4951fd6e 100644
--- a/ietf/utils/management/commands/update_community_list_index.py
+++ b/ietf/utils/management/commands/update_community_list_index.py
@@ -32,7 +32,7 @@ def handle(self, *args, **options):
                 person  = rule.person
                 if not person and not group:
                     try:
-                        person = rule.community_list.user.person
+                        person = rule.community_list.person
                     except:
                         pass
                 name = ((group and group.acronym) or (person and person.email_address())) or '?'
diff --git a/ietf/utils/management/commands/update_external_command_info.py b/ietf/utils/management/commands/update_external_command_info.py
deleted file mode 100644
index 9cc1d1ba49..0000000000
--- a/ietf/utils/management/commands/update_external_command_info.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright The IETF Trust 2017-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import sys
-
-from textwrap import dedent
-
-from django.core.management.base import BaseCommand
-
-import debug                            # pyflakes:ignore
-
-from ietf.utils.models import VersionInfo
-from ietf.utils.pipe import pipe
-
-class Command(BaseCommand):
-    """
-    Update the version information for external commands used by the datatracker.
-
-    Iterates through the entries in the VersionInfo table, runs the relevant
-    command, and updates the version string with the result.
-
-    """
-
-    help = dedent(__doc__).strip()
-            
-    def handle(self, *filenames, **options):
-        for c in VersionInfo.objects.filter(used=True):
-            cmd = "%s %s" % (c.command, c.switch)
-            code, out, err = pipe(cmd)
-            out = out.decode('utf-8')
-            err = err.decode('utf-8')
-            if code != 0:
-                sys.stderr.write("Command '%s' retuned %s: \n%s\n%s\n" % (cmd, code, out, err))
-            else:
-                c.version = (out.strip()+'\n'+err.strip()).strip()
-                if options.get('verbosity', 1) > 1:
-                    sys.stdout.write(
-                        "Command: %s\n"
-                        "  Version: %s\n" % (cmd, c.version))
-                c.save()
diff --git a/ietf/utils/management/tests.py b/ietf/utils/management/tests.py
index e94c39354f..38be464c7f 100644
--- a/ietf/utils/management/tests.py
+++ b/ietf/utils/management/tests.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 from django.core.management import call_command, CommandError
 from django.test import override_settings
@@ -12,7 +12,7 @@
 from ietf.utils.test_utils import TestCase
 
 
-@mock.patch.object(EmailOnFailureCommand, 'handle')
+@mock.patch.object(EmailOnFailureCommand, 'handle', return_value=None)
 class EmailOnFailureCommandTests(TestCase):
     def test_calls_handle(self, handle_method):
         call_command(EmailOnFailureCommand())
diff --git a/ietf/utils/markdown.py b/ietf/utils/markdown.py
index 3b7c60cae0..0b522685b2 100644
--- a/ietf/utils/markdown.py
+++ b/ietf/utils/markdown.py
@@ -6,22 +6,64 @@
 the datatracker.
 """
 import markdown as python_markdown
+from markdown.extensions import Extension
+from markdown.postprocessors import Postprocessor
 
 from django.utils.safestring import mark_safe
 
 from ietf.doc.templatetags.ietf_filters import urlize_ietf_docs
-from ietf.utils.text import bleach_cleaner, bleach_linker
+from .html import clean_html, liberal_clean_html
+from .text import linkify
+
+
+
+class LinkifyExtension(Extension):
+    """
+    Simple Markdown extension inspired by https://github.com/daGrevis/mdx_linkify,
+    but using our own linker directly. Doing the linkification on the converted
+    Markdown output introduces artifacts.
+    """
+
+    def extendMarkdown(self, md):
+        md.postprocessors.register(LinkifyPostprocessor(md), "linkify", 50)
+        # disable automatic links via angle brackets for email addresses
+        md.inlinePatterns.deregister("automail")
+        # "autolink" for URLs does not seem to cause issues, so leave it on
+
+
+class LinkifyPostprocessor(Postprocessor):
+    def run(self, text):
+        return urlize_ietf_docs(linkify(text))
 
 
 def markdown(text):
     return mark_safe(
-        bleach_linker.linkify(
-            urlize_ietf_docs(
-                bleach_cleaner.clean(
-                    python_markdown.markdown(
-                        text, extensions=["extra", "nl2br", "sane_lists", "toc"]
-                    )
-                )
+        clean_html(
+            python_markdown.markdown(
+                text,
+                extensions=[
+                    "extra",
+                    "nl2br",
+                    "sane_lists",
+                    "toc",
+                    LinkifyExtension(),
+                ],
+            )
+        )
+    )
+
+def liberal_markdown(text):
+    return mark_safe(
+        liberal_clean_html(
+            python_markdown.markdown(
+                text,
+                extensions=[
+                    "extra",
+                    "nl2br",
+                    "sane_lists",
+                    "toc",
+                    LinkifyExtension(),
+                ],
             )
         )
     )
diff --git a/ietf/utils/meetecho.py b/ietf/utils/meetecho.py
index 26ae93f03d..943f3789ef 100644
--- a/ietf/utils/meetecho.py
+++ b/ietf/utils/meetecho.py
@@ -1,9 +1,10 @@
-# Copyright The IETF Trust 2021, All Rights Reserved
+# Copyright The IETF Trust 2021-2024, All Rights Reserved
 #
 """Meetecho interim meeting scheduling API
 
 Implements the v1 API described in email from alex@meetecho.com
-on 2021-12-09.
+on 2021-12-09, plus additional slide management API discussed via
+IM in 2024 Feb.
 
 API methods return Python objects equivalent to the JSON structures
 specified in the API documentation. Times and durations are represented
@@ -13,29 +14,36 @@
 
 import debug  # pyflakes: ignore
 
-from datetime import datetime, timedelta
+import datetime
 from json import JSONDecodeError
-from pytz import utc
-from typing import Dict, Sequence, Union
+from pprint import pformat
+from typing import Sequence, TypedDict, TYPE_CHECKING, Union
 from urllib.parse import urljoin
 
+# Guard against hypothetical cyclical import problems
+if TYPE_CHECKING:
+    from ietf.doc.models import Document
+    from ietf.meeting.models import Session
+
 
 class MeetechoAPI:
-    timezone = utc
+    timezone = datetime.UTC
 
-    def __init__(self, api_base: str, client_id: str, client_secret: str, request_timeout=3.01):
+    def __init__(
+        self, api_base: str, client_id: str, client_secret: str, request_timeout=3.01
+    ):
         self.client_id = client_id
         self.client_secret = client_secret
         self.request_timeout = request_timeout  # python-requests doc recommend slightly > a multiple of 3 seconds
         self._session = requests.Session()
         # if needed, add a trailing slash so urljoin won't eat the trailing path component
-        self.api_base = api_base if api_base.endswith('/') else f'{api_base}/'
+        self.api_base = api_base if api_base.endswith("/") else f"{api_base}/"
 
     def _request(self, method, url, api_token=None, json=None):
         """Execute an API request"""
-        headers = {'Accept': 'application/json'}
+        headers = {"Accept": "application/json"}
         if api_token is not None:
-            headers['Authorization'] = f'bearer {api_token}'
+            headers["Authorization"] = f"bearer {api_token}"
 
         try:
             response = self._session.request(
@@ -47,28 +55,31 @@ def _request(self, method, url, api_token=None, json=None):
             )
         except requests.RequestException as err:
             raise MeetechoAPIError(str(err)) from err
-        if response.status_code != 200:
-            raise MeetechoAPIError(f'API request failed (HTTP status code = {response.status_code})')
+        if response.status_code not in (200, 202):
+            # Could be more selective about status codes, but not seeing an immediate need
+            raise MeetechoAPIError(
+                f"API request failed (HTTP status code = {response.status_code})"
+            )
 
         # try parsing the result as JSON in case the server failed to set the Content-Type header
         try:
             return response.json()
         except JSONDecodeError as err:
-            if response.headers['Content-Type'].startswith('application/json'):
+            if response.headers.get("Content-Type", "").startswith("application/json"):
                 # complain if server told us to expect JSON and it was invalid
-                raise MeetechoAPIError('Error decoding response as JSON') from err
+                raise MeetechoAPIError("Error decoding response as JSON") from err
         return None
 
-    def _deserialize_time(self, s: str) -> datetime:
-        return self.timezone.localize(datetime.strptime(s, '%Y-%m-%d %H:%M:%S'))
+    def _deserialize_time(self, s: str) -> datetime.datetime:
+        return datetime.datetime.strptime(s, "%Y-%m-%d %H:%M:%S").replace(tzinfo=self.timezone)
 
-    def _serialize_time(self, dt: datetime) -> str:
-        return dt.astimezone(self.timezone).strftime('%Y-%m-%d %H:%M:%S')
+    def _serialize_time(self, dt: datetime.datetime) -> str:
+        return dt.astimezone(self.timezone).strftime("%Y-%m-%d %H:%M:%S")
 
-    def _deserialize_duration(self, minutes: int) -> timedelta:
-        return timedelta(minutes=minutes)
+    def _deserialize_duration(self, minutes: int) -> datetime.timedelta:
+        return datetime.timedelta(minutes=minutes)
 
-    def _serialize_duration(self, td: timedelta) -> int:
+    def _serialize_duration(self, td: datetime.timedelta) -> int:
         return int(td.total_seconds() // 60)
 
     def _deserialize_meetings_response(self, response):
@@ -76,30 +87,42 @@ def _deserialize_meetings_response(self, response):
 
         Deserializes data in the structure where needed (currently, that's time-related structures)
         """
-        for session_data in response['rooms'].values():
-            session_data['room']['start_time'] = self._deserialize_time(session_data['room']['start_time'])
-            session_data['room']['duration'] = self._deserialize_duration(session_data['room']['duration'])
+        for session_data in response["rooms"].values():
+            session_data["room"]["start_time"] = self._deserialize_time(
+                session_data["room"]["start_time"]
+            )
+            session_data["room"]["duration"] = self._deserialize_duration(
+                session_data["room"]["duration"]
+            )
         return response
 
     def retrieve_wg_tokens(self, acronyms: Union[str, Sequence[str]]):
         """Retrieve API tokens for one or more WGs
 
-        :param acronyms: list of WG acronyms for which tokens are requested 
+        :param acronyms: list of WG acronyms for which tokens are requested
         :return: {'tokens': {acronym0: token0, acronym1: token1, ...}}
         """
         return self._request(
-            'POST', 'auth/ietfservice/tokens',
+            "POST",
+            "auth/ietfservice/tokens",
             json={
-                'client': self.client_id,
-                'secret': self.client_secret,
-                'wgs': [acronyms] if isinstance(acronyms, str) else acronyms,
-            }
+                "client": self.client_id,
+                "secret": self.client_secret,
+                "wgs": [acronyms] if isinstance(acronyms, str) else acronyms,
+            },
         )
 
-    def schedule_meeting(self, wg_token: str, description: str, start_time: datetime, duration: timedelta,
-                         extrainfo=''):
+    def schedule_meeting(
+        self,
+        wg_token: str,
+        room_id: int,
+        description: str,
+        start_time: datetime.datetime,
+        duration: datetime.timedelta,
+        extrainfo="",
+    ):
         """Schedule a meeting session
-        
+
         Return structure is:
           {
             "rooms": {
@@ -115,8 +138,9 @@ def schedule_meeting(self, wg_token: str, description: str, start_time: datetime
               }
             }
           }
-              
-        :param wg_token: token retrieved via retrieve_wg_tokens() 
+
+        :param wg_token: token retrieved via retrieve_wg_tokens()
+        :param room_id: int id to identify the room (will be echoed as room.id) 
         :param description: str describing the meeting
         :param start_time: starting time as a datetime
         :param duration: duration as a timedelta
@@ -125,13 +149,15 @@ def schedule_meeting(self, wg_token: str, description: str, start_time: datetime
         """
         return self._deserialize_meetings_response(
             self._request(
-                'POST', 'meeting/interim/createRoom',
+                "POST",
+                "meeting/interim/createRoom",
                 api_token=wg_token,
                 json={
-                    'description': description,
-                    'start_time': self._serialize_time(start_time),
-                    'duration': self._serialize_duration(duration),
-                    'extrainfo': extrainfo,
+                    "room_id": room_id,
+                    "description": description,
+                    "start_time": self._serialize_time(start_time),
+                    "duration": self._serialize_duration(duration),
+                    "extrainfo": extrainfo,
                 },
             )
         )
@@ -154,7 +180,7 @@ def fetch_meetings(self, wg_token: str):
               }
             }
           }
-          
+
         As of 2022-01-31, the return structure also includes a 'group' key whose
         value is the group acronym. This is not shown in the documentation.
 
@@ -162,7 +188,7 @@ def fetch_meetings(self, wg_token: str):
         :return: meeting data dict
         """
         return self._deserialize_meetings_response(
-            self._request('GET', 'meeting/interim/fetchRooms', api_token=wg_token)
+            self._request("GET", "meeting/interim/fetchRooms", api_token=wg_token)
         )
 
     def delete_meeting(self, deletion_token: str):
@@ -171,7 +197,166 @@ def delete_meeting(self, deletion_token: str):
         :param deletion_token: deletion_key from fetch_meetings() or schedule_meeting() return data
         :return: {}
         """
-        return self._request('POST', 'meeting/interim/deleteRoom', api_token=deletion_token)
+        return self._request(
+            "POST", "meeting/interim/deleteRoom", api_token=deletion_token
+        )
+
+    class SlideDeckDict(TypedDict):
+        id: int
+        title: str
+        url: str
+        rev: str
+        order: int
+
+    def add_slide_deck(
+        self, 
+        wg_token: str,
+        session: str,  # unique identifier
+        deck: SlideDeckDict,
+    ):
+        """Add a slide deck for the specified session
+        
+        API spec:
+       ⠀POST /materials
+        + Authentication -> same as interim scheduler
+        + content application/json
+        + body
+            {
+                "session": String, // Unique session identifier
+                "title": String,
+                "id": Number,
+                "url": String,
+                "rev": String,
+                "order": Number
+            }
+         
+        + Results 
+            202 Accepted 
+            {4xx}
+        """
+        self._request(
+            "POST",
+            "materials",
+            api_token=wg_token,
+            json={
+                "session": session,
+                "title": deck["title"],
+                "id": deck["id"],
+                "url": deck["url"],
+                "rev": deck["rev"],
+                "order": deck["order"],
+            },
+        )
+
+    def delete_slide_deck(
+        self,
+        wg_token: str,
+        session: str, # unique identifier
+        id: int, 
+    ):
+        """Delete a slide deck from the specified session
+
+        API spec:
+        DELETE /materials
+        + Authentication -> same as interim scheduler
+        + content application/json
+        + body
+            {
+                "session": String,
+                "id": Number
+            }
+         
+        + Results 
+            202 Accepted
+            {4xx}
+        """
+        self._request(
+            "DELETE",
+            "materials",
+            api_token=wg_token,
+            json={
+                "session": session,
+                "id": id,
+            },
+        )
+
+    def update_slide_decks(
+        self,
+        wg_token: str,
+        session: str,  # unique id
+        decks: list[SlideDeckDict],
+    ):
+        """Update/reorder decks for specified session
+
+        PUT /materials
+        + Authentication -> same as interim scheduler
+        + content application/json
+        + body
+            {
+                "session": String,
+                "decks": [
+                    {
+                        "id": Number,
+                        "title": String,
+                        "url": String,
+                        "rev": String,
+                        "order": Number
+                    },
+                    {
+                        "id": Number,
+                        "title": String,
+                        "url": String,
+                        "rev": String,
+                        "order": Number
+                    },
+                    ...
+                ]
+            }
+         
+        + Results 
+            202 Accepted
+        """
+        self._request(
+            "PUT",
+            "materials",
+            api_token=wg_token,
+            json={
+                "session": session,
+                "decks": decks,
+            }
+        )
+
+
+class DebugMeetechoAPI(MeetechoAPI):
+    """Meetecho API stand-in that writes to stdout instead of making requests"""
+    def _request(self, method, url, api_token=None, json=None):
+        json_lines = pformat(json, width=60).split("\n")
+        debug.say(
+            "\n" +
+            "\n".join(
+                [
+                    f">> MeetechoAPI: request(method={method},",
+                    f">> MeetechoAPI:         url={url},",
+                    f">> MeetechoAPI:         api_token={api_token},",
+                    ">> MeetechoAPI:         json=" + json_lines[0],
+                    (
+                        ">> MeetechoAPI:              " +
+                        "\n>> MeetechoAPI:              ".join(l for l in json_lines[1:])
+                    ),
+                    ">> MeetechoAPI: )"
+                ]
+            )
+        )
+
+    def retrieve_wg_tokens(self, acronyms: Union[str, Sequence[str]]):
+        super().retrieve_wg_tokens(acronyms)  # so that we capture the outgoing request
+        acronyms = [acronyms] if isinstance(acronyms, str) else acronyms
+        return {
+            "tokens": {
+                acro: f"{acro}-token"
+                for acro in acronyms
+            }
+        }    
 
 
 class MeetechoAPIError(Exception):
@@ -180,7 +365,18 @@ class MeetechoAPIError(Exception):
 
 class Conference:
     """Scheduled session/room representation"""
-    def __init__(self, manager, id, public_id, description, start_time, duration, url, deletion_token):
+
+    def __init__(
+        self,
+        manager,
+        id,
+        public_id,
+        description,
+        start_time,
+        duration,
+        url,
+        deletion_token,
+    ):
         self._manager = manager
         self.id = id  # Meetecho system ID
         self.public_id = public_id  # public session UUID
@@ -195,22 +391,23 @@ def from_api_dict(cls, manager, api_dict):
         # Returns a list of Conferences
         return [
             cls(
-                **val['room'],
+                **val["room"],
                 public_id=public_id,
-                url=val['url'],
-                deletion_token=val['deletion_token'],
+                url=val["url"],
+                deletion_token=val["deletion_token"],
                 manager=manager,
-            ) for public_id, val in api_dict.items()
+            )
+            for public_id, val in api_dict.items()
         ]
 
     def __str__(self):
-        return f'Meetecho conference {self.description}'
+        return f"Meetecho conference {self.description}"
 
     def __repr__(self):
         props = [
             f'description="{self.description}"',
-            f'start_time={repr(self.start_time)}',
-            f'duration={repr(self.duration)}',
+            f"start_time={repr(self.start_time)}",
+            f"duration={repr(self.duration)}",
         ]
         return f'Conference({", ".join(props)})'
 
@@ -218,8 +415,13 @@ def __eq__(self, other):
         return isinstance(other, type(self)) and all(
             getattr(self, attr) == getattr(other, attr)
             for attr in [
-                'id', 'public_id', 'description', 'start_time',
-                'duration', 'url', 'deletion_token'
+                "id",
+                "public_id",
+                "description",
+                "start_time",
+                "duration",
+                "url",
+                "deletion_token",
             ]
         )
 
@@ -227,37 +429,182 @@ def delete(self):
         self._manager.delete_conference(self)
 
 
-class ConferenceManager:
-    def __init__(self, api_config: dict):
-        self.api = MeetechoAPI(**api_config)
-        self.wg_tokens: Dict[str, str] = {}
-        
+class Manager:
+    def __init__(self, api_config):
+        api_kwargs = dict(
+            api_base=api_config["api_base"],
+            client_id=api_config["client_id"],
+            client_secret=api_config["client_secret"],
+        )
+        if "request_timeout" in api_config:
+            api_kwargs["request_timeout"] = api_config["request_timeout"]
+        if api_config.get("debug", False):
+            self.api = DebugMeetechoAPI(**api_kwargs)
+        else:
+            self.api = MeetechoAPI(**api_kwargs)
+        self.wg_tokens = {}
+
     def wg_token(self, group):
-        group_acronym = group.acronym if hasattr(group, 'acronym') else group
+        group_acronym = group.acronym if hasattr(group, "acronym") else group
         if group_acronym not in self.wg_tokens:
-            self.wg_tokens[group_acronym] = self.api.retrieve_wg_tokens(
-                group_acronym
-            )['tokens'][group_acronym]
+            self.wg_tokens[group_acronym] = self.api.retrieve_wg_tokens(group_acronym)[
+                "tokens"
+            ][group_acronym]
         return self.wg_tokens[group_acronym]
 
+
+class ConferenceManager(Manager):
     def fetch(self, group):
         response = self.api.fetch_meetings(self.wg_token(group))
-        return Conference.from_api_dict(self, response['rooms'])
+        return Conference.from_api_dict(self, response["rooms"])
 
-    def create(self, group, description, start_time, duration, extrainfo=''):
+    def create(self, group, session_id, description, start_time, duration, extrainfo=""):
         response = self.api.schedule_meeting(
             wg_token=self.wg_token(group),
+            room_id=int(session_id),
             description=description,
             start_time=start_time,
             duration=duration,
             extrainfo=extrainfo,
         )
-        return Conference.from_api_dict(self, response['rooms'])
-    
+        return Conference.from_api_dict(self, response["rooms"])
+
     def delete_by_url(self, group, url):
         for conf in self.fetch(group):
             if conf.url == url:
                 self.api.delete_meeting(conf.deletion_token)
 
     def delete_conference(self, conf: Conference):
-        self.api.delete_meeting(conf.deletion_token)
\ No newline at end of file
+        self.api.delete_meeting(conf.deletion_token)
+
+
+class SlidesManager(Manager):
+    """Interface between Datatracker models and Meetecho API
+    
+    Note: the URL sent for a slide deck comes from DocumentInfo.get_href() and includes the revision
+    of the slides being sent. Be sure that 1) the URL matches what api_get_session_materials() returns
+    for the slides; and 2) the URL is valid if it is fetched immediately - possibly even before the call
+    to SlidesManager.add() or send_update() returns.
+    """
+
+    def __init__(self, api_config):
+        super().__init__(api_config)
+        slides_notify_time = api_config.get("slides_notify_time", 15)
+        if slides_notify_time is None:
+            self.slides_notify_time = None
+        else:
+            self.slides_notify_time = datetime.timedelta(minutes=slides_notify_time)
+
+    def _should_send_update(self, session):
+        if self.slides_notify_time is None:
+            return False
+        timeslot = session.official_timeslotassignment().timeslot
+        if timeslot is None:
+            return False
+        if self.slides_notify_time < datetime.timedelta(0):
+            return True  # < 0 means "always" for a scheduled session
+        else:
+            now = datetime.datetime.now(tz=datetime.UTC)
+            return (timeslot.time - self.slides_notify_time) < now < (timeslot.end_time() + self.slides_notify_time)
+
+    def add(self, session: "Session", slides: "Document", order: int):
+        """Add a slide deck to the session
+        
+        Returns True if the update was sent, False if it was not sent because the
+        current time is outside the update window for the session.
+        """
+        if not self._should_send_update(session):
+            return False
+
+        # Would like to confirm that session.presentations includes the slides Document, but we can't
+        # (same problem regarding unsaved Documents discussed in the docstring)
+        self.api.add_slide_deck(
+            wg_token=self.wg_token(session.group),
+            session=str(session.pk),
+            deck={
+                "id": slides.pk,
+                "title": slides.title,
+                "url": slides.get_href(),
+                "rev": slides.rev,
+                "order": order,
+            }
+        )
+        return True
+
+    def delete(self, session: "Session", slides: "Document"):
+        """Delete a slide deck from the session
+        
+        Returns True if the update was sent, False if it was not sent because the
+        current time is outside the update window for the session.
+        """
+        if not self._should_send_update(session):
+            return False
+
+        if session.presentations.filter(document=slides).exists():
+            # "order" problems are very likely to result if we delete slides that are actually still
+            # linked to the session
+            raise MeetechoAPIError(
+                f"Slides {slides.pk} are still linked to session {session.pk}."
+            )
+        # remove, leaving a hole
+        self.api.delete_slide_deck(
+            wg_token=self.wg_token(session.group),
+            session=str(session.pk),
+            id=slides.pk,
+        )
+        if session.presentations.filter(document__type_id="slides").exists():
+            self._send_update(session)  # adjust order to fill in the hole
+        return True
+    
+    def revise(self, session: "Session", slides: "Document"):
+        """Replace existing deck with its current state
+        
+        Returns True if the update was sent, False if it was not sent because the
+        current time is outside the update window for the session.
+        """
+        if not self._should_send_update(session):
+            return False
+
+        sp = session.presentations.filter(document=slides).first()
+        if sp is None:
+            raise MeetechoAPIError(f"Slides {slides.pk} not in session {session.pk}")
+        order = sp.order
+        # remove, leaving a hole in the order on Meetecho's side
+        self.api.delete_slide_deck(
+            wg_token=self.wg_token(session.group),
+            session=str(session.pk),
+            id=slides.pk,
+        )
+        self.add(session, slides, order)  # fill in the hole
+        return True
+        
+    def _send_update(self, session: "Session"):
+        """Notify of the current state of the session's slides (no time window check)
+        
+        This is a private helper - use send_update() (no leading underscore) instead.
+        """
+        self.api.update_slide_decks(
+            wg_token=self.wg_token(session.group),
+            session=str(session.pk),
+            decks=[
+                {
+                    "id": deck.document.pk,
+                    "title": deck.document.title,
+                    "url": deck.document.get_href(),
+                    "rev": deck.document.rev,
+                    "order": deck.order,
+                }
+                for deck in session.presentations.filter(document__type="slides")
+            ]
+        )
+
+    def send_update(self, session: "Session"):
+        """Notify of the current state of the session's slides
+        
+        Returns True if the update was sent, False if it was not sent because the
+        current time is outside the update window for the session.
+        """
+        if not self._should_send_update(session):
+            return False
+        self._send_update(session)
+        return True
diff --git a/ietf/utils/migrations/0001_initial.py b/ietf/utils/migrations/0001_initial.py
index 87cb752873..877e75f971 100644
--- a/ietf/utils/migrations/0001_initial.py
+++ b/ietf/utils/migrations/0001_initial.py
@@ -1,10 +1,6 @@
-# Copyright The IETF Trust 2018-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-02-20 10:52
-
-
-from typing import List, Tuple      # pyflakes:ignore
+# Generated by Django 2.2.28 on 2023-03-20 19:22
 
+from typing import List, Tuple
 from django.db import migrations, models
 
 
@@ -12,8 +8,8 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]                                   # type: List[Tuple[str]]
+    dependencies: List[Tuple[str, str]] = [
+    ]
 
     operations = [
         migrations.CreateModel(
diff --git a/ietf/utils/migrations/0002_delete_versioninfo.py b/ietf/utils/migrations/0002_delete_versioninfo.py
new file mode 100644
index 0000000000..2835bb017b
--- /dev/null
+++ b/ietf/utils/migrations/0002_delete_versioninfo.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.2.11 on 2024-05-03 21:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("utils", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="VersionInfo",
+        ),
+    ]
diff --git a/ietf/utils/migrations/0003_dirtybits.py b/ietf/utils/migrations/0003_dirtybits.py
new file mode 100644
index 0000000000..11f6ed09f6
--- /dev/null
+++ b/ietf/utils/migrations/0003_dirtybits.py
@@ -0,0 +1,37 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("utils", "0002_delete_versioninfo"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="DirtyBits",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "slug",
+                    models.CharField(
+                        choices=[("rfcindex", "RFC Index")], max_length=40, unique=True
+                    ),
+                ),
+                ("dirty_time", models.DateTimeField(blank=True, null=True)),
+                ("processed_time", models.DateTimeField(blank=True, null=True)),
+            ],
+            options={
+                "verbose_name_plural": "dirty bits",
+            },
+        ),
+    ]
diff --git a/ietf/utils/migrations/0004_alter_dirtybits_slug.py b/ietf/utils/migrations/0004_alter_dirtybits_slug.py
new file mode 100644
index 0000000000..e17ea6cadd
--- /dev/null
+++ b/ietf/utils/migrations/0004_alter_dirtybits_slug.py
@@ -0,0 +1,21 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("utils", "0003_dirtybits"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="dirtybits",
+            name="slug",
+            field=models.CharField(
+                choices=[("rfcindex", "RFC Index"), ("errata", "Errata Tags")],
+                max_length=40,
+                unique=True,
+            ),
+        ),
+    ]
diff --git a/ietf/utils/mime.py b/ietf/utils/mime.py
index ab21cfe5c6..1f9b75b4df 100644
--- a/ietf/utils/mime.py
+++ b/ietf/utils/mime.py
@@ -5,6 +5,7 @@
 import magic
 import re
 
+
 def get_mime_type(content):
     # try to fixup encoding
     if hasattr(magic, "open"):
@@ -13,15 +14,17 @@ def get_mime_type(content):
         filetype = m.buffer(content)
     else:
         m = magic.Magic()
-        m.cookie = magic.magic_open(magic.MAGIC_NONE | magic.MAGIC_MIME | magic.MAGIC_MIME_ENCODING)
+        m.cookie = magic.magic_open(
+            magic.MAGIC_NONE | magic.MAGIC_MIME | magic.MAGIC_MIME_ENCODING
+        )
         magic.magic_load(m.cookie, None)
         filetype = m.from_buffer(content)
     # Work around silliness in libmagic on OpenSUSE 15.1
-    filetype = filetype.replace('text/x-Algol68;', 'text/plain;')
-    if ';' in filetype and 'charset=' in filetype:
-        mimetype, charset = re.split('; *charset=', filetype)
+    filetype = filetype.replace("text/x-Algol68;", "text/plain;")
+    filetype = filetype.replace("application/vnd.hp-HPGL;", "text/plain;")
+    if ";" in filetype and "charset=" in filetype:
+        mimetype, charset = re.split("; *charset=", filetype)
     else:
-        mimetype = re.split(';', filetype)[0]
-        charset = 'utf-8'
+        mimetype = re.split(";", filetype)[0]
+        charset = "utf-8"
     return mimetype, charset
-
diff --git a/ietf/utils/models.py b/ietf/utils/models.py
index 0915537fd8..64f7f253f2 100644
--- a/ietf/utils/models.py
+++ b/ietf/utils/models.py
@@ -1,22 +1,35 @@
-# Copyright The IETF Trust 2015-2020, All Rights Reserved
+# Copyright The IETF Trust 2015-2026, All Rights Reserved
 
 import itertools
 
 from django.db import models
 
+
+class DirtyBits(models.Model):
+    """A weak semaphore mechanism for coordination with celery beat tasks
+
+    Web workers will set the "dirty_time" value for a given dirtybit slug.
+    Celery workers will do work if "processed_time" < "dirty_time" and update
+    "processed_time".
+    """
+
+    class Slugs(models.TextChoices):
+        RFCINDEX = "rfcindex", "RFC Index"
+        ERRATA = "errata", "Errata Tags"
+
+    # next line can become `...choices=Slugs)` when we get to Django 5.x
+    slug = models.CharField(max_length=40, blank=False, choices=Slugs.choices, unique=True)
+    dirty_time = models.DateTimeField(null=True, blank=True)
+    processed_time = models.DateTimeField(null=True, blank=True)
+
+    class Meta:
+        verbose_name_plural = "dirty bits"
+
+    
 class DumpInfo(models.Model):
     date = models.DateTimeField()
     host = models.CharField(max_length=128)
     tz   = models.CharField(max_length=32, default='UTC')
-    
-class VersionInfo(models.Model):
-    time    = models.DateTimeField(auto_now=True)
-    command = models.CharField(max_length=32)
-    switch  = models.CharField(max_length=16)
-    version = models.CharField(max_length=64)
-    used    = models.BooleanField(default=True)
-    class Meta:
-        verbose_name_plural = 'VersionInfo'
 
 class ForeignKey(models.ForeignKey):
     "A local ForeignKey proxy which provides the on_delete value required under Django 2.0."
diff --git a/ietf/utils/patch.py b/ietf/utils/patch.py
index d14a340054..fd3e4a165d 100644
--- a/ietf/utils/patch.py
+++ b/ietf/utils/patch.py
@@ -87,8 +87,7 @@ def createLock(self):
 debugmode = False
 
 def setdebug():
-  global debugmode, streamhandler
-
+  global debugmode
   debugmode = True
   loglevel = logging.DEBUG
   logformat = "%(levelname)8s %(message)s"
@@ -185,7 +184,7 @@ def fromstring(s):
 
 def fromurl(url):
   """ Parse patch from an URL, return False
-      if an error occured. Note that this also
+      if an error occurred. Note that this also
       can throw urlopen() exceptions.
   """
   ps = PatchSet( urllib_request.urlopen(url) )
@@ -749,7 +748,7 @@ def _normalize_filenames(self):
   def diffstat(self):
     """ calculate diffstat and return as a string
         Notes:
-          - original diffstat ouputs target filename
+          - original diffstat outputs target filename
           - single + or - shouldn't escape histogram
     """
     names = []
@@ -1181,7 +1180,7 @@ def main():
     patch.apply(options.strip, root=options.directory.encode()) or sys.exit(-1)
 
   # todo: document and test line ends handling logic - patch.py detects proper line-endings
-  #       for inserted hunks and issues a warning if patched file has incosistent line ends
+  #       for inserted hunks and issues a warning if patched file has inconsistent line ends
 
 
 if __name__ == "__main__":
diff --git a/ietf/utils/pipe.py b/ietf/utils/pipe.py
index 907e4af5fc..b3ac1cebf3 100644
--- a/ietf/utils/pipe.py
+++ b/ietf/utils/pipe.py
@@ -12,23 +12,23 @@ def pipe(cmd, str=None):
     if str and len(str) > 4096:                 # XXX: Hardcoded Linux 2.4, 2.6 pipe buffer size
         bufsize = len(str)
 
-    pipe = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE, bufsize=bufsize, shell=True)
-    if not str is None:
-        pipe.stdin.write(str)
-        pipe.stdin.close()
+    with Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE, bufsize=bufsize, shell=True) as pipe:
+        if not str is None:
+            pipe.stdin.write(str)
+            pipe.stdin.close()
 
-    out = b""
-    err = b""
-    while True:
-        str = pipe.stdout.read()
-        if str:
-            out += str
-        code = pipe.poll()
-        if code != None:
-            err = pipe.stderr.read()
-            break
-        if len(out) >= MAX:
-            err = "Output exceeds %s bytes and has been truncated" % MAX
-            break
+        out = b""
+        err = b""
+        while True:
+            str = pipe.stdout.read()
+            if str:
+                out += str
+            code = pipe.poll()
+            if code != None:
+                err = pipe.stderr.read()
+                break
+            if len(out) >= MAX:
+                err = "Output exceeds %s bytes and has been truncated" % MAX
+                break
 
     return (code, out, err)
diff --git a/ietf/utils/resources.py b/ietf/utils/resources.py
index 6d61c5e2ed..63206eb33a 100644
--- a/ietf/utils/resources.py
+++ b/ietf/utils/resources.py
@@ -1,6 +1,4 @@
-# Copyright The IETF Trust 2014-2019, All Rights Reserved
-# -*- coding: utf-8 -*-
-# Autogenerated by the mkresources management command 2014-11-13 05:39
+# Copyright The IETF Trust 2014-2026, All Rights Reserved
 
 
 from ietf.api import ModelResource
@@ -12,7 +10,7 @@
 from django.contrib.contenttypes.models import ContentType
 
 from ietf import api
-from ietf.utils.models import DumpInfo, VersionInfo
+from ietf.utils.models import DirtyBits, DumpInfo
 
 
 class UserResource(ModelResource):
@@ -45,19 +43,7 @@ class Meta:
 api.utils.register(DumpInfoResource())
 
 
-class VersionInfoResource(ModelResource):
+class DirtyBitsResource(ModelResource):
     class Meta:
-        queryset = VersionInfo.objects.all()
-        serializer = api.Serializer()
-        cache = SimpleCache()
-        #resource_name = 'versioninfo'
-        ordering = ['id', ]
-        filtering = { 
-            "id": ALL,
-            "time": ALL,
-            "command": ALL,
-            "switch": ALL,
-            "version": ALL,
-            "used": ALL,
-        }
-api.utils.register(VersionInfoResource())
+        queryset = DirtyBits.objects.none()
+api.utils.register(DirtyBitsResource())
diff --git a/ietf/utils/searchindex.py b/ietf/utils/searchindex.py
new file mode 100644
index 0000000000..87951abb60
--- /dev/null
+++ b/ietf/utils/searchindex.py
@@ -0,0 +1,372 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+"""Search indexing utilities"""
+
+import re
+from itertools import batched
+from math import floor
+from typing import Iterable
+
+import httpx  # just for exceptions
+import typesense
+import typesense.exceptions
+from django.conf import settings
+from typesense.types.document import DocumentSchema
+
+from ietf.doc.models import Document, StoredObject
+from ietf.doc.storage_utils import retrieve_str
+from ietf.utils.log import log
+
+# Error classes that might succeed just by retrying a failed attempt.
+# Must be a tuple for use with isinstance()
+RETRYABLE_ERROR_CLASSES = (
+    httpx.ConnectError,
+    httpx.ConnectTimeout,
+    typesense.exceptions.Timeout,
+    typesense.exceptions.ServerError,
+    typesense.exceptions.ServiceUnavailable,
+)
+
+
+DEFAULT_SETTINGS = {
+    "TYPESENSE_API_URL": "",
+    "TYPESENSE_API_KEY": "",
+    "TYPESENSE_COLLECTION_NAME": "docs",
+    "TASK_RETRY_DELAY": 10,
+    "TASK_MAX_RETRIES": 12,
+}
+
+
+def get_settings():
+    return DEFAULT_SETTINGS | getattr(settings, "SEARCHINDEX_CONFIG", {})
+
+
+def enabled():
+    _settings = get_settings()
+    return _settings["TYPESENSE_API_URL"] != ""
+
+
+def get_typesense_client() -> typesense.Client:
+    _settings = get_settings()
+    client = typesense.Client(
+        {
+            "api_key": _settings["TYPESENSE_API_KEY"],
+            "nodes": [_settings["TYPESENSE_API_URL"]],
+        }
+    )
+    return client
+
+
+def get_collection_name() -> str:
+    _settings = get_settings()
+    collection_name = _settings["TYPESENSE_COLLECTION_NAME"]
+    assert isinstance(collection_name, str)
+    return collection_name
+
+
+def _sanitize_text(content):
+    """Sanitize content or abstract text for search"""
+    # REs (with approximate names)
+    RE_DOT_OR_BANG_SPACE = r"\. |! "  # -> " " (space)
+    RE_COMMENT_OR_TOC_CRUD = r"<--|-->|--+|\+|\.\.+"  # -> ""
+    RE_BRACKETED_REF = r"\[[a-zA-Z0-9 -]+\]"  # -> ""
+    RE_DOTTED_NUMBERS = r"[0-9]+\.[0-9]+(\.[0-9]+)?"  # -> ""
+    RE_MULTIPLE_WHITESPACE = r"\s+"  # -> " " (space)
+    # Replacement values (for clarity of intent)
+    SPACE = " "
+    EMPTY = ""
+    # Sanitizing begins here, order is significant!
+    content = re.sub(RE_DOT_OR_BANG_SPACE, SPACE, content.strip())
+    content = re.sub(RE_COMMENT_OR_TOC_CRUD, EMPTY, content)
+    content = re.sub(RE_BRACKETED_REF, EMPTY, content)
+    content = re.sub(RE_DOTTED_NUMBERS, EMPTY, content)
+    content = re.sub(RE_MULTIPLE_WHITESPACE, SPACE, content)
+    return content.strip()
+
+
+def typesense_doc_from_rfc(rfc: Document) -> DocumentSchema:
+    assert rfc.type_id == "rfc"
+    assert rfc.rfc_number is not None
+    assert rfc.pages is not None
+
+    keywords: list[str] = rfc.keywords  # help type checking
+
+    subseries = rfc.part_of()
+    if len(subseries) > 1:
+        log(
+            f"RFC {rfc.rfc_number} is in multiple subseries. "
+            f"Indexing as {subseries[0].name}"
+        )
+    subseries = subseries[0] if len(subseries) > 0 else None
+    obsoleted_by = rfc.related_that("obs")
+    updated_by = rfc.related_that("updates")
+
+    stored_txt = (
+        StoredObject.objects.exclude_deleted()
+        .filter(store="rfc", doc_name=rfc.name, name__startswith="txt/")
+        .first()
+    )
+    content = ""
+    if stored_txt is not None:
+        # Should be available in the blobdb, but be cautious...
+        try:
+            content = retrieve_str(kind=stored_txt.store, name=stored_txt.name)
+        except Exception as err:
+            log(f"Unable to retrieve {stored_txt} from storage: {err}")
+
+    ts_document = {
+        "id": f"doc-{rfc.pk}",
+        "rfcNumber": rfc.rfc_number,
+        "rfc": str(rfc.rfc_number),
+        "filename": rfc.name,
+        "title": rfc.title,
+        "abstract": _sanitize_text(rfc.abstract),
+        "pages": rfc.pages,
+        "keywords": keywords,
+        "type": "rfc",
+        "state": [state.name for state in rfc.states.all()],
+        "status": {"slug": rfc.std_level.slug, "name": rfc.std_level.name},
+        "date": floor(rfc.time.timestamp()),
+        "publicationDate": floor(rfc.pub_datetime().timestamp()),
+        "stream": {"slug": rfc.stream.slug, "name": rfc.stream.name},
+        "authors": [
+            {"name": rfc_author.titlepage_name, "affiliation": rfc_author.affiliation}
+            for rfc_author in rfc.rfcauthor_set.all()
+        ],
+        "flags": {
+            "hiddenDefault": False,
+            "obsoleted": len(obsoleted_by) > 0,
+            "updated": len(updated_by) > 0,
+        },
+        "obsoletedBy": [str(doc.rfc_number) for doc in obsoleted_by],
+        "updatedBy": [str(doc.rfc_number) for doc in updated_by],
+        "ranking": rfc.rfc_number,
+    }
+    if subseries is not None:
+        ts_document["subseries"] = {
+            "acronym": subseries.type.slug,
+            "number": int(subseries.name[len(subseries.type.slug) :]),
+            "total": len(subseries.contains()),
+        }
+    if rfc.group is not None:
+        ts_document["group"] = {
+            "acronym": rfc.group.acronym,
+            "name": rfc.group.name,
+            "full": f"{rfc.group.acronym} - {rfc.group.name}",
+        }
+    if (
+        rfc.group.parent is not None
+        and rfc.stream_id not in ["ise", "irtf", "iab"]  # exclude editorial?
+    ):
+        ts_document["area"] = {
+            "acronym": rfc.group.parent.acronym,
+            "name": rfc.group.parent.name,
+            "full": f"{rfc.group.parent.acronym} - {rfc.group.parent.name}",
+        }
+    if rfc.ad is not None:
+        ts_document["adName"] = rfc.ad.name
+    if content != "":
+        ts_document["content"] = _sanitize_text(content)
+    return ts_document
+
+
+def update_or_create_rfc_entry(rfc: Document):
+    """Update/create index entries for one RFC"""
+    ts_document = typesense_doc_from_rfc(rfc)
+    client = get_typesense_client()
+    client.collections[get_collection_name()].documents.upsert(ts_document)
+
+
+def update_or_create_rfc_entries(
+    rfcs: Iterable[Document], batchsize: int | None = None
+):
+    """Update/create index entries for RFCs in bulk
+
+    If batchsize is set, computes index data in batches of batchsize and adds to the
+    index. Will make a total of (len(rfcs) // batchsize) + 1 API calls.
+
+    N.b. that typesense has a server-side batch size that defaults to 40, which should
+    "almost never be changed from the default." This does not change that. Further,
+    the python client library's import_ method has a batch_size parameter that does
+    client-side batching. We don't use that, either.
+    """
+    success_count = 0
+    fail_count = 0
+    client = get_typesense_client()
+    batches = [rfcs] if batchsize is None else batched(rfcs, batchsize)
+    for batch in batches:
+        tdoc_batch = [typesense_doc_from_rfc(rfc) for rfc in batch]
+        results = client.collections[get_collection_name()].documents.import_(
+            tdoc_batch, {"action": "upsert"}
+        )
+        for tdoc, result in zip(tdoc_batch, results):
+            if result["success"]:
+                success_count += 1
+            else:
+                fail_count += 1
+                log(f"Failed to index RFC {tdoc['rfcNumber']}: {result['error']}")
+    log(f"Added {success_count} RFCs to the index, failed to add {fail_count}")
+
+
+DOCS_SCHEMA = {
+    "enable_nested_fields": True,
+    "default_sorting_field": "ranking",
+    "fields": [
+        # RFC number in integer form, for sorting asc/desc in search results
+        # Omit field for drafts
+        {
+            "name": "rfcNumber",
+            "type": "int32",
+            "facet": False,
+            "optional": True,
+            "sort": True,
+        },
+        # RFC number in string form, for direct matching with ranking
+        # Omit field for drafts
+        {"name": "rfc", "type": "string", "facet": False, "optional": True},
+        # For drafts that correspond to an RFC, insert the RFC number
+        # Omit field for rfcs or if not relevant
+        {"name": "ref", "type": "string", "facet": False, "optional": True},
+        # Filename of the document (without the extension, e.g. "rfc1234"
+        # or "draft-ietf-abc-def-02")
+        {"name": "filename", "type": "string", "facet": False, "infix": True},
+        # Title of the draft / rfc
+        {"name": "title", "type": "string", "facet": False},
+        # Abstract of the draft / rfc
+        {"name": "abstract", "type": "string", "facet": False},
+        # Number of pages
+        {"name": "pages", "type": "int32", "facet": False},
+        # A list of search keywords if relevant, set to empty array otherwise
+        {"name": "keywords", "type": "string[]", "facet": True},
+        # Type of the document
+        # Accepted values: "draft" or "rfc"
+        {"name": "type", "type": "string", "facet": True},
+        # State(s) of the document (e.g. "Published", "Adopted by a WG", etc.)
+        # Use the full name, not the slug
+        {"name": "state", "type": "string[]", "facet": True, "optional": True},
+        # Status (Standard Level Name)
+        # Object with properties "slug" and "name"
+        # e.g.: { slug: "std", "name": "Internet Standard" }
+        {"name": "status", "type": "object", "facet": True, "optional": True},
+        # The subseries it is part of. (e.g. "BCP")
+        # Omit otherwise.
+        {
+            "name": "subseries.acronym",
+            "type": "string",
+            "facet": True,
+            "optional": True,
+        },
+        # The subseries number it is part of. (e.g. 123)
+        # Omit otherwise.
+        {
+            "name": "subseries.number",
+            "type": "int32",
+            "facet": True,
+            "sort": True,
+            "optional": True,
+        },
+        # The total of RFCs in the subseries
+        # Omit if not part of a subseries
+        {
+            "name": "subseries.total",
+            "type": "int32",
+            "facet": False,
+            "sort": False,
+            "optional": True,
+        },
+        # Date of the document, in unix epoch seconds (can be negative for < 1970)
+        {"name": "date", "type": "int64", "facet": False},
+        # Expiration date of the document, in unix epoch seconds (can be negative
+        # for < 1970). Omit field for RFCs
+        {"name": "expires", "type": "int64", "facet": False, "optional": True},
+        # Publication date of the RFC, in unix epoch seconds (can be negative
+        # for < 1970). Omit field for drafts
+        {
+            "name": "publicationDate",
+            "type": "int64",
+            "facet": True,
+            "optional": True,
+        },
+        # Working Group
+        # Object with properties "acronym", "name" and "full"
+        # e.g.:
+        # {
+        #     "acronym": "ntp",
+        #     "name": "Network Time Protocols",
+        #     "full": "ntp - Network Time Protocols",
+        # }
+        {"name": "group", "type": "object", "facet": True, "optional": True},
+        # Area
+        # Object with properties "acronym", "name" and "full"
+        # e.g.:
+        # {
+        #     "acronym": "mpls",
+        #     "name": "Multiprotocol Label Switching",
+        #     "full": "mpls - Multiprotocol Label Switching",
+        # }
+        {"name": "area", "type": "object", "facet": True, "optional": True},
+        # Stream
+        # Object with properties "slug" and "name"
+        # e.g.: { slug: "ietf", "name": "IETF" }
+        {"name": "stream", "type": "object", "facet": True, "optional": True},
+        # List of authors
+        # Array of objects with properties "name" and "affiliation"
+        # e.g.:
+        # [
+        #     {"name": "John Doe", "affiliation": "ACME Inc."},
+        #     {"name": "Ada Lovelace", "affiliation": "Babbage Corps."},
+        # ]
+        {"name": "authors", "type": "object[]", "facet": True, "optional": True},
+        # Area Director Name (e.g. "Leonardo DaVinci")
+        {"name": "adName", "type": "string", "facet": True, "optional": True},
+        # Whether the document should be hidden by default in search results or not.
+        {"name": "flags.hiddenDefault", "type": "bool", "facet": True},
+        # Whether the document is obsoleted by another document or not.
+        {"name": "flags.obsoleted", "type": "bool", "facet": True},
+        # Whether the document is updated by another document or not.
+        {"name": "flags.updated", "type": "bool", "facet": True},
+        # List of documents that obsolete this document.
+        # Array of strings. Use RFC number for RFCs. (e.g. ["123", "456"])
+        # Omit if none. Must be provided if "flags.obsoleted" is set to True.
+        {
+            "name": "obsoletedBy",
+            "type": "string[]",
+            "facet": False,
+            "optional": True,
+        },
+        # List of documents that update this document.
+        # Array of strings. Use RFC number for RFCs. (e.g. ["123", "456"])
+        # Omit if none. Must be provided if "flags.updated" is set to True.
+        {"name": "updatedBy", "type": "string[]", "facet": False, "optional": True},
+        # Sanitized content of the document.
+        # Make sure to remove newlines, double whitespaces, symbols and tags.
+        {
+            "name": "content",
+            "type": "string",
+            "facet": False,
+            "optional": True,
+            "store": False,
+        },
+        # Ranking value to use when no explicit sorting is used during search
+        # Set to the RFC number for RFCs and the revision number for drafts
+        # This ensures newer RFCs get listed first in the default search results
+        # (without a query)
+        {"name": "ranking", "type": "int32", "facet": False},
+    ],
+}
+
+
+def create_collection():
+    collection_name = get_collection_name()
+    log(f"Creating '{collection_name}' collection")
+    client = get_typesense_client()
+    client.collections.create({"name": get_collection_name()} | DOCS_SCHEMA)
+
+
+def delete_collection():
+    collection_name = get_collection_name()
+    log(f"Deleting '{collection_name}' collection")
+    client = get_typesense_client()
+    try:
+        client.collections[collection_name].delete()
+    except typesense.exceptions.ObjectNotFound:
+        pass
diff --git a/ietf/utils/serialize.py b/ietf/utils/serialize.py
index 64254300a8..77f97942cb 100644
--- a/ietf/utils/serialize.py
+++ b/ietf/utils/serialize.py
@@ -1,3 +1,5 @@
+import datetime
+
 from django.db import models
 
 def object_as_shallow_dict(obj):
@@ -14,7 +16,7 @@ def object_as_shallow_dict(obj):
         if isinstance(f, models.ManyToManyField):
             v = list(v.values_list("pk", flat=True))
         elif isinstance(f, models.DateTimeField):
-            v = v.strftime('%Y-%m-%d %H:%M:%S')
+            v = v.astimezone(datetime.UTC).isoformat()
         elif isinstance(f, models.DateField):
             v = v.strftime('%Y-%m-%d')
 
diff --git a/ietf/utils/storage.py b/ietf/utils/storage.py
index 0aa02cab86..bad5af5178 100644
--- a/ietf/utils/storage.py
+++ b/ietf/utils/storage.py
@@ -1,8 +1,95 @@
+# Copyright The IETF Trust 2020-2025, All Rights Reserved
+"""Django Storage classes"""
+import datetime
+from hashlib import sha384
+from pathlib import Path
+from typing import Optional
+
+from django.conf import settings
+from django.core.files.base import File
 from django.core.files.storage import FileSystemStorage
+from ietf.doc.storage_utils import store_file
+from .log import log
+
 
 class NoLocationMigrationFileSystemStorage(FileSystemStorage):
 
-    def deconstruct(obj):               # pylint: disable=no-self-argument
-        path, args, kwargs = FileSystemStorage.deconstruct(obj)
-        kwargs["location"] = None
-        return (path, args, kwargs)
+    def deconstruct(self):
+        path, args, kwargs = super().deconstruct()
+        kwargs["location"] = None  # don't record location in migrations
+        return path, args, kwargs
+
+
+class BlobShadowFileSystemStorage(NoLocationMigrationFileSystemStorage):
+    """FileSystemStorage that shadows writes to the blob store as well
+
+    Strips directories from the filename when naming the blob.
+    """
+
+    def __init__(
+        self,
+        *,  # disallow positional arguments
+        kind: str,
+        location=None,
+        base_url=None,
+        file_permissions_mode=None,
+        directory_permissions_mode=None,
+    ):
+        self.kind = kind
+        super().__init__(
+            location, base_url, file_permissions_mode, directory_permissions_mode
+        )
+
+    def save(self, name, content, max_length=None):
+        # Write content to the filesystem - this deals with chunks, etc...
+        saved_name = super().save(name, content, max_length)
+
+        if settings.ENABLE_BLOBSTORAGE:
+            try:
+                # Retrieve the content and write to the blob store
+                blob_name = Path(saved_name).name  # strips path
+                with self.open(saved_name, "rb") as f:
+                    store_file(self.kind, blob_name, f, allow_overwrite=True)
+            except Exception as err:
+                log(f"Blobstore Error: Failed to shadow {saved_name} at {self.kind}:{blob_name}: {repr(err)}")
+                if settings.SERVER_MODE == "development":
+                    raise
+        return saved_name  # includes the path!
+
+    def deconstruct(self):
+        path, args, kwargs = super().deconstruct()
+        kwargs["kind"] = ""  # don't record "kind" in migrations
+        return path, args, kwargs
+
+
+class MetadataFile(File):
+    """File that includes metadata"""
+
+    def __init__(self, file, name=None, mtime: Optional[datetime.datetime]=None, content_type=""):
+        super().__init__(file=file, name=name)
+        self.mtime = mtime
+        self.content_type = content_type
+        self._custom_metadata = None
+
+    @property
+    def custom_metadata(self):
+        if self._custom_metadata is None:
+            self._custom_metadata = self._compute_custom_metadata()
+        return self._custom_metadata
+
+    def _compute_custom_metadata(self):
+        try:
+            self.file.seek(0)
+        except AttributeError:  # TODO-BLOBSTORE
+            raise NotImplementedError("cannot handle unseekable content")
+        content_bytes = self.file.read()
+        if not isinstance(
+            content_bytes, bytes
+        ):  # TODO-BLOBSTORE: This is sketch-development only -remove before committing
+            raise Exception(f"Expected bytes - got {type(content_bytes)}")
+        self.file.seek(0)
+        return {
+            "len": f"{len(content_bytes)}",
+            "sha384": f"{sha384(content_bytes).hexdigest()}",
+            "mtime": None if self.mtime is None else self.mtime.isoformat(),
+        }
diff --git a/ietf/utils/templatetags/htmlfilters.py b/ietf/utils/templatetags/htmlfilters.py
index a0f9232c57..1e399e2d72 100644
--- a/ietf/utils/templatetags/htmlfilters.py
+++ b/ietf/utils/templatetags/htmlfilters.py
@@ -7,6 +7,7 @@
 from django.template.defaultfilters import stringfilter
 
 from ietf.utils.html import remove_tags
+from ietf.utils.markdown import markdown as utils_markdown
 
 register = Library()
 
@@ -16,3 +17,9 @@
 def removetags(value, tags):
     """Removes a comma-separated list of [X]HTML tags from the output."""
     return remove_tags(value, re.split(r"\s*,\s*", tags))
+
+@register.filter(name="markdown", is_safe=True)
+def markdown(string):
+    # One issue is that the string is enclosed in <p></p>... Let's remove the leading/trailing ones...
+    return utils_markdown(string)[3:-4]
+
diff --git a/ietf/utils/templatetags/tests.py b/ietf/utils/templatetags/tests.py
index a93bf2d94d..859319be3d 100644
--- a/ietf/utils/templatetags/tests.py
+++ b/ietf/utils/templatetags/tests.py
@@ -3,6 +3,7 @@
 from django.template import Context, Origin, Template
 from django.test import override_settings
 
+from ietf.utils.templatetags.textfilters import linkify
 from ietf.utils.test_utils import TestCase
 import debug  # pyflakes: ignore
 
@@ -39,3 +40,68 @@ def test_origin_outside_base_dir(self):
                 output = template.render(Context())
                 self.assertNotIn(component, output,
                                  'Full path components should not be revealed in html')
+
+
+class TextfiltersTests(TestCase):
+    def test_linkify(self):
+        # Cases with autoescape = True (the default)
+        self.assertEqual(
+            linkify("plain string"),
+            "plain string",
+        )
+        self.assertEqual(
+            linkify("https://www.ietf.org"),
+            '<a href="https://www.ietf.org">https://www.ietf.org</a>',
+        )
+        self.assertEqual(
+            linkify('<a href="https://www.ietf.org">IETF</a>'),
+            (
+                '&lt;a href=&quot;<a href="https://www.ietf.org">https://www.ietf.org</a>&quot;&gt;IETF&lt;/a&gt;'
+            ),
+        )
+        self.assertEqual(
+            linkify("somebody@example.com"),
+            '<a href="mailto:somebody@example.com">somebody@example.com</a>',
+        )
+        self.assertEqual(
+            linkify("Some Body <somebody@example.com>"),
+            (
+                'Some Body &lt;<a href="mailto:somebody@example.com">'
+                'somebody@example.com</a>&gt;'
+            ),
+        )
+        self.assertEqual(
+            linkify("<script>alert('h4x0r3d');</script>"),
+            "&lt;script&gt;alert(&#x27;h4x0r3d&#x27;);&lt;/script&gt;",
+        )
+
+        # Cases with autoescape = False (these are dangerous and assume the caller
+        # has sanitized already)
+        self.assertEqual(
+            linkify("plain string", autoescape=False),
+            "plain string",
+        )
+        self.assertEqual(
+            linkify("https://www.ietf.org", autoescape=False),
+            '<a href="https://www.ietf.org">https://www.ietf.org</a>',
+        )
+        self.assertEqual(
+            linkify('<a href="https://www.ietf.org">IETF</a>', autoescape=False),
+            '<a href="https://www.ietf.org">IETF</a>',
+        )
+        self.assertEqual(
+            linkify("somebody@example.com", autoescape=False),
+            '<a href="mailto:somebody@example.com">somebody@example.com</a>',
+        )
+        # bleach.Linkifier translates the < -> &lt; and > -> &gt; on this one
+        self.assertEqual(
+            linkify("Some Body <somebody@example.com>", autoescape=False),
+            (
+                'Some Body &lt;<a href="mailto:somebody@example.com">'
+                'somebody@example.com</a>&gt;'
+            ),
+        )
+        self.assertEqual(
+            linkify("<script>alert('friendly script');</script>", autoescape=False),
+            "<script>alert('friendly script');</script>",
+        )
diff --git a/ietf/utils/templatetags/textfilters.py b/ietf/utils/templatetags/textfilters.py
index 70b94cf673..e3bfbe0c56 100644
--- a/ietf/utils/templatetags/textfilters.py
+++ b/ietf/utils/templatetags/textfilters.py
@@ -7,11 +7,12 @@
 from django import template
 from django.conf import settings
 from django.template.defaultfilters import stringfilter
+from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.text import xslugify as _xslugify, texescape, bleach_linker
+from ietf.utils.text import linkify as _linkify, xslugify as _xslugify, texescape
 
 register = template.Library()
 
@@ -71,10 +72,13 @@ def texescape_filter(value):
     "A TeX escape filter"
     return texescape(value)
     
-@register.filter
+@register.filter(needs_autoescape=True)
 @stringfilter
-def linkify(value):
-    text = mark_safe(bleach_linker.linkify(value))
+def linkify(value, autoescape=True):
+    if autoescape:
+        # Escape unless the input was already a SafeString
+        value = conditional_escape(value)
+    text = mark_safe(_linkify(value))  # _linkify is a safe operation
     return text
 
 @register.filter
diff --git a/ietf/utils/test_data.py b/ietf/utils/test_data.py
index 7a7a77af49..c5d3472751 100644
--- a/ietf/utils/test_data.py
+++ b/ietf/utils/test_data.py
@@ -6,20 +6,23 @@
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.utils.encoding import smart_text
+from django.utils import timezone
+from django.utils.encoding import smart_str
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import Document, DocAlias, State, DocumentAuthor, DocEvent, RelatedDocument, NewRevisionDocEvent
+from ietf.doc.models import Document, State, DocumentAuthor, DocEvent, RelatedDocument, NewRevisionDocEvent
+from ietf.doc.factories import IndividualDraftFactory, ConflictReviewFactory, StatusChangeFactory, WgDraftFactory, WgRfcFactory
 from ietf.group.models import Group, GroupHistory, Role, RoleHistory
 from ietf.iesg.models import TelechatDate
 from ietf.ipr.models import HolderIprDisclosure, IprDocRel, IprDisclosureStateName, IprLicenseTypeName
 from ietf.meeting.models import Meeting, ResourceAssociation
-from ietf.name.models import StreamName, DocRelationshipName, RoomResourceName, ConstraintName
+from ietf.name.models import DocRelationshipName, RoomResourceName, ConstraintName
 from ietf.person.models import Person, Email
 from ietf.group.utils import setup_default_community_list_for_group
 from ietf.review.models import (ReviewRequest, ReviewerSettings, ReviewResultName, ReviewTypeName, ReviewTeamSettings )
 from ietf.person.name import unidecode_name
+from ietf.utils.timezone import date_today
 
 
 def create_person(group, role_name, name=None, username=None, email_address=None, password=None, is_staff=False, is_superuser=False):
@@ -36,7 +39,7 @@ def create_person(group, role_name, name=None, username=None, email_address=None
     user = User.objects.create(username=username,is_staff=is_staff,is_superuser=is_superuser)
     user.set_password(password)
     user.save()
-    person = Person.objects.create(name=name, ascii=unidecode_name(smart_text(name)), user=user)
+    person = Person.objects.create(name=name, ascii=unidecode_name(smart_str(name)), user=user)
     email = Email.objects.create(address=email_address, person=person, origin=user.username)
     Role.objects.create(group=group, name_id=role_name, person=person, email=email)
     return person
@@ -51,7 +54,7 @@ def make_immutable_base_data():
     all tests in a run."""
 
     # telechat dates
-    t = datetime.date.today() + datetime.timedelta(days=1)
+    t = date_today() + datetime.timedelta(days=1)
     old = TelechatDate.objects.create(date=t - datetime.timedelta(days=14)).date        # pyflakes:ignore
     date1 = TelechatDate.objects.create(date=t).date                                    # pyflakes:ignore
     date2 = TelechatDate.objects.create(date=t + datetime.timedelta(days=14)).date      # pyflakes:ignore
@@ -70,6 +73,10 @@ def make_immutable_base_data():
     irtf = create_group(name="IRTF", acronym="irtf", type_id="irtf")
     create_person(irtf, "chair")
 
+    rsab = create_group(name="RSAB", acronym="rsab", type_id="edappr")
+    p = create_person(rsab, "chair")
+    p.role_set.create(group=rsab, name_id="member", email=p.email())
+
     secretariat = create_group(name="IETF Secretariat", acronym="secretariat", type_id="ietf")
     create_person(secretariat, "secr", name="Sec Retary", username="secretary", is_staff=True, is_superuser=True)
 
@@ -77,7 +84,7 @@ def make_immutable_base_data():
     create_person(iab, "chair")
     create_person(iab, "member")
 
-    ise = create_group(name="Independent Submission Editor", acronym="ise", type_id="rfcedtyp")
+    ise = create_group(name="Independent Submission Editor", acronym="ise", type_id="ise")
     create_person(ise, "chair")
 
     rsoc = create_group(name="RFC Series Oversight Committee", acronym="rsoc", type_id="rfcedtyp")
@@ -170,7 +177,6 @@ def make_test_data():
     charter.set_state(State.objects.get(used=True, slug="approved", type="charter"))
     group.charter = charter
     group.save()
-    DocAlias.objects.create(name=charter.name).docs.add(charter)
     setup_default_community_list_for_group(group)
 
     # ames WG
@@ -192,7 +198,6 @@ def make_test_data():
         rev="00",
         )
     charter.set_state(State.objects.get(used=True, slug="infrev", type="charter"))
-    DocAlias.objects.create(name=charter.name).docs.add(charter)
     group.charter = charter
     group.save()
     setup_default_community_list_for_group(group)
@@ -237,7 +242,6 @@ def make_test_data():
     #    rev="00",
     #    )
     #charter.set_state(State.objects.get(used=True, slug="infrev", type="charter"))
-    #DocAlias.objects.create(name=charter.name).docs.add(charter)
     #group.charter = charter
     #group.save()
 
@@ -271,23 +275,21 @@ def make_test_data():
     # old draft
     old_draft = Document.objects.create(
         name="draft-foo-mars-test",
-        time=datetime.datetime.now() - datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
+        time=timezone.now() - datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
         type_id="draft",
         title="Optimizing Martian Network Topologies",
         stream_id="ietf",
         abstract="Techniques for achieving near-optimal Martian networks.",
         rev="00",
         pages=2,
-        expires=datetime.datetime.now(),
+        expires=timezone.now(),
         )
     old_draft.set_state(State.objects.get(used=True, type="draft", slug="expired"))
-    old_alias = DocAlias.objects.create(name=old_draft.name)
-    old_alias.docs.add(old_draft)
 
     # draft
     draft = Document.objects.create(
         name="draft-ietf-mars-test",
-        time=datetime.datetime.now(),
+        time=timezone.now(),
         type_id="draft",
         title="Optimizing Martian Network Topologies",
         stream_id="ietf",
@@ -298,19 +300,15 @@ def make_test_data():
         intended_std_level_id="ps",
         shepherd=email,
         ad=ad,
-        expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
+        expires=timezone.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
         notify="aliens@example.mars",
-        note="",
         )
 
     draft.set_state(State.objects.get(used=True, type="draft", slug="active"))
     draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub-req"))
     draft.set_state(State.objects.get(used=True, type="draft-stream-%s" % draft.stream_id, slug="wg-doc"))
 
-    doc_alias = DocAlias.objects.create(name=draft.name)
-    doc_alias.docs.add(draft)
-
-    RelatedDocument.objects.create(source=draft, target=old_alias, relationship=DocRelationshipName.objects.get(slug='replaces'))
+    RelatedDocument.objects.create(source=draft, target=old_draft, relationship=DocRelationshipName.objects.get(slug='replaces'))
     old_draft.set_state(State.objects.get(type='draft', slug='repl'))
 
     DocumentAuthor.objects.create(
@@ -345,7 +343,7 @@ def make_test_data():
         title="Statement regarding rights",
         holder_legal_name="Native Martians United",
         state=IprDisclosureStateName.objects.get(slug='posted'),
-        patent_info='Number: US12345\nTitle: A method of transfering bits\nInventor: A. Nonymous\nDate: 2000-01-01',
+        patent_info='Number: US12345\nTitle: A method of transferring bits\nInventor: A. Nonymous\nDate: 2000-01-01',
         holder_contact_name='George',
         holder_contact_email='george@acme.com',
         holder_contact_info='14 Main Street\nEarth',
@@ -356,7 +354,7 @@ def make_test_data():
 
     IprDocRel.objects.create(
         disclosure=ipr,
-        document=doc_alias,
+        document=draft,
         revisions='00',
         )
     
@@ -364,7 +362,7 @@ def make_test_data():
     ietf72 = Meeting.objects.create(
         number="72",
         type_id="ietf",
-        date=datetime.date.today() + datetime.timedelta(days=180),
+        date=date_today() + datetime.timedelta(days=180),
         city="New York",
         country="US",
         time_zone="US/Eastern",
@@ -385,37 +383,27 @@ def make_test_data():
         )
 
     # an independent submission before review
-    doc = Document.objects.create(name='draft-imaginary-independent-submission',type_id='draft',rev='00',
-        title="Some Independent Notes on Imagination")
-    doc.set_state(State.objects.get(used=True, type="draft", slug="active"))    
-    DocAlias.objects.create(name=doc.name).docs.add(doc)
+    IndividualDraftFactory(title="Some Independent Notes on Imagination")
 
     # an irtf submission mid review
-    doc = Document.objects.create(name='draft-imaginary-irtf-submission', type_id='draft',rev='00',
-        stream=StreamName.objects.get(slug='irtf'), title="The Importance of Research Imagination")
-    docalias = DocAlias.objects.create(name=doc.name)
-    docalias.docs.add(doc)
-    doc.set_state(State.objects.get(type="draft", slug="active"))
-    crdoc = Document.objects.create(name='conflict-review-imaginary-irtf-submission', type_id='conflrev',
-        rev='00', notify="fsm@ietf.org", title="Conflict Review of IRTF Imagination Document")
-    DocAlias.objects.create(name=crdoc.name).docs.add(crdoc)
-    crdoc.set_state(State.objects.get(name='Needs Shepherd', type__slug='conflrev'))
-    crdoc.relateddocument_set.create(target=docalias,relationship_id='conflrev')
+    doc = IndividualDraftFactory(name="draft-imaginary-irtf-submission", stream_id="irtf", title="The Importance of Research Imagination")
+    ConflictReviewFactory(name="conflict-review-imaginary-irtf-submission", review_of=doc, notify="fsm@ietf.org", title="Conflict Review of IRTF Imagination Document")
     
     # A status change mid review
     iesg = Group.objects.get(acronym='iesg')
-    doc = Document.objects.create(name='status-change-imaginary-mid-review',type_id='statchg', rev='00',
-        notify="fsm@ietf.org", group=iesg, title="Status Change Review without Imagination")
-    doc.set_state(State.objects.get(slug='needshep',type__slug='statchg'))
-    docalias = DocAlias.objects.create(name='status-change-imaginary-mid-review')
-    docalias.docs.add(doc)
+    doc = StatusChangeFactory(
+        name='status-change-imaginary-mid-review',
+        notify="fsm@ietf.org", 
+        group=iesg, 
+        title="Status Change Review without Imagination",
+        states= [State.objects.get(type_id="statchg",slug="needshep")]
+    )
 
     # Some things for a status change to affect
     def rfc_for_status_change_test_factory(name,rfc_num,std_level_id):
-        target_rfc = Document.objects.create(name=name, type_id='draft', std_level_id=std_level_id, notify="%s@ietf.org"%name)
-        target_rfc.set_state(State.objects.get(slug='rfc',type__slug='draft'))
-        DocAlias.objects.create(name=name).docs.add(target_rfc)
-        DocAlias.objects.create(name='rfc%d'%rfc_num).docs.add(target_rfc)
+        target_rfc = WgRfcFactory(rfc_number=rfc_num, std_level_id=std_level_id)
+        source_draft = WgDraftFactory(name=name, states=[("draft","rfc")], notify=f"{name}@ietf.org")
+        source_draft.relateddocument_set.create(relationship_id="became_rfc", target=target_rfc)
         return target_rfc
     rfc_for_status_change_test_factory('draft-ietf-random-thing',9999,'ps')
     rfc_for_status_change_test_factory('draft-ietf-random-otherthing',9998,'inf')
@@ -458,7 +446,7 @@ def make_review_data(doc):
         doc=doc,
         team=team1,
         type_id="early",
-        deadline=datetime.datetime.now() + datetime.timedelta(days=20),
+        deadline=timezone.now() + datetime.timedelta(days=20),
         state_id="accepted",
         requested_by=reviewer,
         reviewer=email,
diff --git a/ietf/utils/test_draft_with_references_v3.xml b/ietf/utils/test_draft_with_references_v3.xml
index a04880d1db..ad9b2b280a 100644
--- a/ietf/utils/test_draft_with_references_v3.xml
+++ b/ietf/utils/test_draft_with_references_v3.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <?xml-stylesheet type='text/xsl' href='rfc2629.xslt' ?>
-<rfc category="exp" submissionType="independent" ipr="trust200902" docName="draft-test-references-00" version="3">
+<rfc xmlns:xi="http://www.w3.org/2001/XInclude" category="exp" submissionType="independent" ipr="trust200902" docName="draft-test-references-00" version="3">
     <front>
         <title>Test Draft with References</title>
         <author fullname="Alfred Person" initials="A." surname="Person" role="editor">
@@ -37,9 +37,25 @@
                 <seriesInfo name="RFC" value="1"/>
                 <seriesInfo name="DOI" value="10.17487/RFC0001"/>
             </reference>
+            <reference anchor="MNEMONIC" target="https://www.rfc-editor.org/info/rfc2">
+                <front>
+                    <title>Cloud Software</title>
+                    <author initials="D." surname="Crocker" fullname="D. Crocker">
+                        <organization/>
+                    </author>
+                    <date year="1969" month="April"/>
+                </front>
+                <seriesInfo name="RFC" value="2"/>
+                <seriesInfo name="DOI" value="10.17487/RFC0002"/>
+            </reference>
         </references>
         <references>
             <name>Informative References</name>
+            <xi:include href='https://xml.resource.org/public/rfc/bibxml3/reference.I-D.ietf-teas-pcecc-use-cases-00.xml'/>
+            <xi:include href='https://xml.resource.org/public/rfc/bibxml3/reference.I-D.ietf-teas-pcecc-use-cases.xml'/>
+            <xi:include href="https://bib.ietf.org/public/rfc/bibxml3/reference.I-D.draft-ietf-sipcore-multiple-reasons-00.xml" />
+            <xi:include href="https://bib.ietf.org/public/rfc/bibxml3/reference.I-D.draft-ietf-sipcore-multiple-reasons.xml" />
+            <xi:include href="https://xml2rfc.ietf.org/public/rfc/bibxml9/reference.BCP.0014.xml" />
             <reference anchor='RFC0255' target='https://www.rfc-editor.org/info/rfc255'>
                 <front>
                     <title>Status of network hosts</title>
@@ -51,6 +67,34 @@
                 <seriesInfo name='RFC' value='255'/>
                 <seriesInfo name='DOI' value='10.17487/RFC0255'/>
             </reference>
+            <reference anchor="CONSISTENCY">
+              <front>
+                <title>Key Consistency and Discovery</title>
+                <author fullname="Alex Davidson" initials="A." surname="Davidson">
+                  <organization>Brave Software</organization>
+                </author>
+                <author fullname="Matthew Finkel" initials="M." surname="Finkel">
+                  <organization>The Tor Project</organization>
+                </author>
+                <author fullname="Martin Thomson" initials="M." surname="Thomson">
+                  <organization>Mozilla</organization>
+                </author>
+                <author fullname="Christopher A. Wood" initials="C. A." surname="Wood">
+                  <organization>Cloudflare</organization>
+                </author>
+                <date day="17" month="August" year="2022"/>
+                <abstract>
+                  <t>   This document describes the key consistency and correctness
+       requirements of protocols such as Privacy Pass, Oblivious DoH, and
+       Oblivious HTTP for user privacy.  It discusses several mechanisms and
+       proposals for enabling user privacy in varying threat models.  In
+       concludes with discussion of open problems in this area.
+
+                  </t>
+                </abstract>
+              </front>
+              <seriesInfo name="Internet-Draft" value="draft-wood-key-consistency-03"/>
+            </reference>
             <referencegroup anchor="bcp6">
                 <reference anchor='RFC1930' target='https://www.rfc-editor.org/info/rfc1930'>
                     <front>
@@ -191,4 +235,4 @@
             </reference>
         </references>
     </back>
-</rfc>
\ No newline at end of file
+</rfc>
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index f7790df553..a23416e87f 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2020, All Rights Reserved
+# Copyright The IETF Trust 2009-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 #
 # Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -40,27 +40,24 @@
 import sys
 import time
 import json
-import pytz
 import importlib
 import socket
-import datetime
 import gzip
 import unittest
 import pathlib
 import subprocess
 import tempfile
 import copy
+from contextlib import contextmanager
+
+import boto3
+import botocore.config
 import factory.random
 import urllib3
 import warnings
-from urllib.parse import urlencode
 
-from fnmatch import fnmatch
-from pathlib import Path
-
-from coverage.report import Reporter
-from coverage.results import Numbers
-from coverage.misc import NotPython
+from typing import Callable, Optional
+from urllib.parse import urlencode
 
 import django
 from django.conf import settings
@@ -73,10 +70,11 @@
 from django.template.loaders.filesystem import Loader as BaseLoader
 from django.test.runner import DiscoverRunner
 from django.core.management import call_command
-from django.urls import URLResolver # type: ignore
+from django.urls import URLResolver, resolve, Resolver404  # type: ignore
 from django.template.backends.django import DjangoTemplates
 from django.template.backends.django import Template  # type: ignore[attr-defined]
-# from django.utils.safestring import mark_safe
+from django.utils import timezone
+from django.views.generic import RedirectView, TemplateView
 
 import debug                            # pyflakes:ignore
 debug.debug = True
@@ -84,19 +82,45 @@
 import ietf
 import ietf.utils.mail
 from ietf.utils.management.commands import pyflakes
-from ietf.utils.test_smtpserver import SMTPTestServerDriver
+from ietf.utils.aiosmtpd import SMTPTestServerDriver
 from ietf.utils.test_utils import TestCase
 
+from mypy_boto3_s3.service_resource import Bucket
+
+
+class UrlCoverageWarning(UserWarning):
+    """Warning category for URL coverage-related warnings"""
+    # URLs for which we don't expect patterns to match
+    IGNORE_URLS = (
+        "/_doesnotexist/",
+        "/sitemap.xml.",
+    )
 
-loaded_templates = set()
-visited_urls = set()
-test_database_name = None
-old_destroy = None
-old_create = None
 
-template_coverage_collection = None
-code_coverage_collection = None
-url_coverage_collection = None
+class UninterestingPatternWarning(UrlCoverageWarning):
+    """Warning category for unexpected URL match patterns
+    
+    These are common, caused by tests that hit a URL that is not selected for
+    coverage checking. The warning is in place to help with a putative future 
+    review of whether we're selecting the right patterns to check for coverage. 
+    """
+    pass
+
+
+# Configure warnings for reasonable output quantity
+warnings.simplefilter("once", UrlCoverageWarning)
+warnings.simplefilter("ignore", UninterestingPatternWarning)
+
+
+loaded_templates: set[str] = set()
+visited_urls: set[str] = set()
+test_database_name: Optional[str] = None
+old_destroy: Optional[Callable] = None
+old_create: Optional[Callable] = None
+
+template_coverage_collection = False
+url_coverage_collection = False
+validation_settings = {"validate_html": None, "validate_html_harder": None, "show_logging": False}
 
 
 def start_vnu_server(port=8888):
@@ -176,14 +200,22 @@ def vnu_fmt_message(file, msg, content):
 
 def vnu_filter_message(msg, filter_db_issues, filter_test_issues):
     "True if the vnu message is a known false positive"
-    if filter_db_issues and re.search(
-        r"""^Forbidden\ code\ point\ U\+|
-             Illegal\ character\ in\ query:\ '\['|
-            'href'\ on\ element\ 'a':\ Percentage\ \("%"\)\ is\ not\ followed|
-            ^Saw\ U\+\d+\ in\ stream|
-            ^Document\ uses\ the\ Unicode\ Private\ Use\ Area""",
+    if re.search(
+        r"""^Document\ uses\ the\ Unicode\ Private\ Use\ Area|
+            ^Trailing\ slash\ on\ void\ elements\ has\ no\ effect|
+            ^Element\ 'h.'\ not\ allowed\ as\ child\ of\ element\ 'pre'""",
         msg["message"],
         flags=re.VERBOSE,
+    ) or (
+        filter_db_issues
+        and re.search(
+            r"""^Forbidden\ code\ point\ U\+|
+                 Illegal\ character\ in\ query:\ '\['|
+                 'href'\ on\ element\ 'a':\ Percentage\ \("%"\)\ is\ not|
+                ^Saw\ U\+\d+\ in\ stream""",
+            msg["message"],
+            flags=re.VERBOSE,
+        )
     ):
         return True
 
@@ -220,13 +252,12 @@ def load_and_run_fixtures(verbosity):
             fn()
 
 def safe_create_test_db(self, verbosity, *args, **kwargs):
-    global test_database_name, old_create
+    if old_create is None:
+        raise RuntimeError("old_create has not been set, cannot proceed")
     keepdb = kwargs.get('keepdb', False)
     if not keepdb:
         print("     Creating test database...")
-        if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.mysql':
-            settings.DATABASES["default"]["OPTIONS"] = settings.DATABASE_TEST_OPTIONS
-            print("     Using OPTIONS: %s" % settings.DATABASES["default"]["OPTIONS"])
+    global test_database_name
     test_database_name = old_create(self, 0, *args, **kwargs)
 
     if settings.GLOBAL_TEST_FIXTURES:
@@ -236,8 +267,9 @@ def safe_create_test_db(self, verbosity, *args, **kwargs):
     return test_database_name
 
 def safe_destroy_test_db(*args, **kwargs):
+    if old_destroy is None:
+        raise RuntimeError("old_destroy has not been set, cannot proceed")
     sys.stdout.write('\n')
-    global test_database_name, old_destroy
     keepdb = kwargs.get('keepdb', False)
     if not keepdb:
         if settings.DATABASES["default"]["NAME"] != test_database_name:
@@ -256,7 +288,14 @@ def pyflakes_test(self):
         path = os.path.join(settings.BASE_DIR)
         warnings = []
         warnings = pyflakes.checkPaths([path], verbosity=0)
-        self.assertEqual([], [str(w) for w in warnings])
+
+        # Filter out warnings about unused global variables
+        filtered_warnings = [
+            w for w in warnings
+            if not re.search(r"`global \w+` is unused: name is never assigned in scope", str(w))
+        ]
+
+        self.assertEqual([], [str(w) for w in filtered_warnings])
 
 class MyPyTest(TestCase):
 
@@ -279,7 +318,7 @@ class ValidatingTemplates(DjangoTemplates):
     def __init__(self, params):
         super().__init__(params)
 
-        if not settings.validate_html:
+        if not validation_settings["validate_html"]:
             return
         self.validation_cache = set()
         self.cwd = str(pathlib.Path.cwd())
@@ -295,7 +334,7 @@ def __init__(self, template, backend):
     def render(self, context=None, request=None):
         content = super().render(context, request)
 
-        if not settings.validate_html:
+        if not validation_settings["validate_html"]:
             return content
 
         if not self.origin.name.endswith("html"):
@@ -307,7 +346,7 @@ def render(self, context=None, request=None):
             return content
 
         fingerprint = hash(content) + sys.maxsize + 1  # make hash positive
-        if not settings.validate_html_harder and fingerprint in self.backend.validation_cache:
+        if not validation_settings["validate_html_harder"] and fingerprint in self.backend.validation_cache:
             # already validated this HTML fragment, skip it
             # as an optimization, make page a bit smaller by not returning HTML for the menus
             # FIXME: figure out why this still includes base/menu.html
@@ -323,29 +362,34 @@ def render(self, context=None, request=None):
         # don't validate each template by itself, causes too much overhead
         # instead, save a batch of them and then validate them all in one go
         # this delays error detection a bit, but is MUCH faster
-        settings.validate_html.batches[kind].append(
+        validation_settings["validate_html"].batches[kind].append(
             (self.origin.name, content, fingerprint)
         )
-        # FWIW, a batch size of 30 seems to result in less than 10% runtime overhead
-        if len(settings.validate_html.batches[kind]) >= 30:
-            settings.validate_html.validate(kind)
-
         return content
 
 
+class TemplateValidationTests(unittest.TestCase):
+    def __init__(self, test_runner, validate_html, **kwargs):
+        self.runner = test_runner
+        self.validate_html = validate_html
+        super().__init__(**kwargs)
+
+    def run_template_validation(self):
+        if self.validate_html:
+            self.validate_html.validate(self)
+
+
 class TemplateCoverageLoader(BaseLoader):
     is_usable = True
 
     def get_template(self, template_name, skip=None):
-        global template_coverage_collection, loaded_templates
-        if template_coverage_collection == True:
+        if template_coverage_collection:
             loaded_templates.add(str(template_name))
         raise TemplateDoesNotExist(template_name)
 
 def record_urls_middleware(get_response):
     def record_urls(request):
-        global url_coverage_collection, visited_urls
-        if url_coverage_collection == True:
+        if url_coverage_collection:
             visited_urls.add(request.path)
         return get_response(request)
     return record_urls
@@ -391,8 +435,9 @@ def do_append(res, p0, p1, item):
             res.append((str(item.pattern), item))
     return res
 
+
 _all_templates = None
-def get_template_paths(apps=None):
+def get_template_paths(apps=None) -> list[str]:
     global _all_templates
     if not _all_templates:
         # TODO: Add app templates to the full list, if we are using
@@ -401,28 +446,33 @@ def get_template_paths(apps=None):
         templatepaths = settings.TEMPLATES[0]['DIRS']
         for templatepath in templatepaths:
             for dirpath, dirs, files in os.walk(templatepath):
-                if ".svn" in dirs:
-                    dirs.remove(".svn")
-                relative_path = dirpath[len(templatepath)+1:]
-                for file in files:
-                    ignore = False
-                    for pattern in settings.TEST_TEMPLATE_IGNORE:
-                        if fnmatch(file, pattern):
-                            ignore = True
-                            break
-                    if ignore:
-                        continue
-                    if relative_path != "":
-                        file = os.path.join(relative_path, file)
-                    templates.add(file)
-        if apps:
-            templates = [ t for t in templates if t.split(os.path.sep)[0] in apps ]
-        _all_templates = templates
+                # glob against path from PROJECT_DIR
+                project_path = pathlib.Path(
+                    dirpath.removeprefix(settings.PROJECT_DIR).lstrip("/") 
+                )
+                # label entries with name relative to templatepath
+                relative_path = pathlib.Path(
+                    dirpath.removeprefix(templatepath).lstrip("/")
+                )
+                if (
+                    apps 
+                    and len(relative_path.parts) > 0
+                    and relative_path.parts[0] not in apps
+                ):
+                    continue  # skip uninteresting apps
+                for filename in files:
+                    file_path = project_path / filename
+                    if not any(
+                        file_path.match(pat) for pat in settings.TEST_TEMPLATE_IGNORE
+                    ):
+                        templates.add(relative_path / filename)
+        _all_templates = [str(t) for t in templates]
     return _all_templates
 
+
 def save_test_results(failures, test_labels):
     # Record the test result in a file, in order to be able to check the
-    # results and avoid re-running tests if we've alread run them with OK
+    # results and avoid re-running tests if we've already run them with OK
     # result after the latest code changes:
     tfile = io.open(".testresult", "a", encoding='utf-8')
     timestr = time.strftime("%Y-%m-%d %H:%M:%S")
@@ -435,50 +485,29 @@ def save_test_results(failures, test_labels):
             tfile.write("%s OK\n" % (timestr, ))
     tfile.close()
 
-def set_coverage_checking(flag=True):
+
+def set_template_coverage(flag):
     global template_coverage_collection
-    global code_coverage_collection
+    orig = template_coverage_collection
+    template_coverage_collection = flag
+    return orig
+
+
+def set_url_coverage(flag):
     global url_coverage_collection
-    if settings.SERVER_MODE == 'test':
-        if flag:
-            settings.TEST_CODE_COVERAGE_CHECKER.collector.resume()
-            template_coverage_collection = True
-            code_coverage_collection = True
-            url_coverage_collection = True
-        else:
-            settings.TEST_CODE_COVERAGE_CHECKER.collector.pause()
-            template_coverage_collection = False
-            code_coverage_collection = False
-            url_coverage_collection = False
-
-class CoverageReporter(Reporter):
-    def report(self):
-        self.find_file_reporters(None)
-
-        total = Numbers()
-        result = {"coverage": 0.0, "covered": {}, "format": 5, }
-        for fr in self.file_reporters:
-            try:
-                analysis = self.coverage._analyze(fr)
-                nums = analysis.numbers
-                missing_nums = sorted(analysis.missing)
-                with io.open(analysis.filename, encoding='utf-8') as file:
-                    lines = file.read().splitlines()
-                missing_lines = [ lines[l-1] for l in missing_nums ]
-                result["covered"][fr.relative_filename()] = (nums.n_statements, nums.pc_covered/100.0, missing_nums, missing_lines)
-                total += nums
-            except KeyboardInterrupt:                   # pragma: not covered
-                raise
-            except Exception:
-                report_it = not self.config.ignore_errors
-                if report_it:
-                    typ, msg = sys.exc_info()[:2]
-                    if typ is NotPython and not fr.should_be_python():
-                        report_it = False
-                if report_it:
-                    raise
-        result["coverage"] = total.pc_covered/100.0
-        return result
+    orig = url_coverage_collection
+    url_coverage_collection = flag
+    return orig
+
+
+@contextmanager
+def disable_coverage():
+    """Context manager/decorator that disables template/url coverage"""
+    orig_template = set_template_coverage(False)
+    orig_url = set_url_coverage(False)
+    yield
+    set_template_coverage(orig_template)
+    set_url_coverage(orig_url)
 
 
 class CoverageTest(unittest.TestCase):
@@ -501,8 +530,8 @@ def report_test_result(self, test):
             # Assert coverage failure only if we're running the full test suite -- if we're
             # only running some tests, then of course the coverage is going to be low.
             if self.runner.run_full_test_suite:
-                # Permit 0.02% variation in results -- otherwise small code changes become a pain
-                fudge_factor = 0.0002
+                # Permit a small variation in results -- otherwise small code changes become a pain
+                fudge_factor = 0.0004
                 self.assertLessEqual(len(test_missing), len(master_missing),
                     msg = "New %s without test coverage since %s: %s" % (test, latest_coverage_version, list(set(test_missing) - set(master_missing))))
                 if not self.runner.ignore_lower_coverage:
@@ -511,7 +540,6 @@ def report_test_result(self, test):
                             ( test, test_coverage*100, latest_coverage_version, master_coverage*100, ))
 
     def template_coverage_test(self):
-        global loaded_templates
         if self.runner.check_coverage:
             apps = [ app.split('.')[-1] for app in self.runner.test_apps ]
             all = get_template_paths(apps)
@@ -540,48 +568,68 @@ def ignore_pattern(regex, pattern):
                 return (regex in ("^_test500/$", "^accounts/testemail/$")
                         or regex.startswith("^admin/")
                         or re.search('^api/v1/[^/]+/[^/]+/', regex)
-                        or getattr(pattern.callback, "__name__", "") == "RedirectView"
-                        or getattr(pattern.callback, "__name__", "") == "TemplateView"
+                        or (
+                            hasattr(pattern.callback, "view_class")
+                            and issubclass(pattern.callback.view_class, (RedirectView, TemplateView))
+                        )
                         or pattern.callback == django.views.static.serve)
 
-            patterns = [(regex, re.compile(regex, re.U), obj) for regex, obj in url_patterns
-                        if not ignore_pattern(regex, obj)]
+            patterns ={
+                regex: obj
+                for regex, obj in url_patterns
+                if not ignore_pattern(regex, obj)
+            }
 
             covered = set()
             for url in visited_urls:
-                for regex, compiled, obj in patterns:
-                    if regex not in covered and compiled.match(url[1:]): # strip leading /
-                        covered.add(regex)
-                        break
+                try:
+                    resolved = resolve(url)  # let Django resolve the URL for us
+                except Resolver404:
+                    if url not in UrlCoverageWarning.IGNORE_URLS:
+                        warnings.warn(
+                            f"Unable to resolve visited URL {url}", UrlCoverageWarning
+                        )
+                    continue
+                if resolved.route not in patterns:
+                    warnings.warn(
+                        f"WARNING: url resolved to an unexpected pattern (url='{url}', "
+                        f"resolved to r'{resolved.route}'",
+                        UninterestingPatternWarning,
+                    )
+                    continue
+                covered.add(resolved.route)
 
             self.runner.coverage_data["url"] = {
-                "coverage": 1.0*len(covered)/len(patterns),
-                "covered": dict( (k, (o.lookup_str, k in covered)) for k,p,o in patterns ),
+                "coverage": 1.0 * len(covered) / len(patterns),
+                "covered": dict(
+                    (k, (o.lookup_str, k in covered)) for k, o in patterns.items()
+                ),
                 "format": 4,
-                }
+            }
 
             self.report_test_result("url")
         else:
             self.skipTest("Coverage switched off with --skip-coverage")
 
     def code_coverage_test(self):
-        if self.runner.check_coverage:
-            include = [ os.path.join(path, '*') for path in self.runner.test_paths ]
-            checker = self.runner.code_coverage_checker
-            checker.stop()
+        if (
+            self.runner.check_coverage
+            and settings.TEST_CODE_COVERAGE_CHECKER is not None
+        ):
+            coverage_manager = settings.TEST_CODE_COVERAGE_CHECKER
+            coverage_manager.stop()
             # Save to the .coverage file
-            checker.save()
-            # Apply the configured and requested omit and include data 
-            checker.config.from_args(ignore_errors=None, omit=settings.TEST_CODE_COVERAGE_EXCLUDE_FILES,
-                include=include, file=None)
-            for pattern in settings.TEST_CODE_COVERAGE_EXCLUDE_LINES:
-                checker.exclude(pattern)
+            coverage_manager.save()
+            # Apply the configured and requested omit and include data
             # Maybe output an HTML report
             if self.runner.run_full_test_suite and self.runner.html_report:
-                checker.html_report(directory=settings.TEST_CODE_COVERAGE_REPORT_DIR)
-            # In any case, build a dictionary with per-file data for this run
-            reporter = CoverageReporter(checker, checker.config)
-            self.runner.coverage_data["code"] = reporter.report()
+                coverage_manager.checker.html_report(
+                    directory=settings.TEST_CODE_COVERAGE_REPORT_DIR
+                )
+            # Generate the output report data
+            self.runner.coverage_data["code"] = coverage_manager.report(
+                include=[str(pathlib.Path(p) / "*") for p in self.runner.test_paths]
+            )
             self.report_test_result("code")
         else:
             self.skipTest("Coverage switched off with --skip-coverage")
@@ -707,21 +755,42 @@ def add_arguments(cls, parser):
         parser.add_argument('--validate-html-harder',
             action='store_true', dest="validate_html_harder", default=False,
             help='Validate all generated HTML with additional validators (slow)')
-
-    def __init__(self, ignore_lower_coverage=False, skip_coverage=False, save_version_coverage=None, html_report=None, permit_mixed_migrations=None, show_logging=None, validate_html=None, validate_html_harder=None, **kwargs):
-        #
+        parser.add_argument('--rerun-until-failure',
+            action='store_true', dest='rerun', default=False,
+            help='Run the indicated tests in a loop until a failure occurs. ' )
+        parser.add_argument('--no-manage-blobstore', action='store_false', dest='manage_blobstore',
+                            help='Disable creating/deleting test buckets in the blob store.'
+                                 'When this argument is used, a set of buckets with "test-" prefixed to their '
+                                 'names must already exist.')
+
+    def __init__(
+        self,
+        ignore_lower_coverage=False,
+        skip_coverage=False,
+        save_version_coverage=None,
+        html_report=None,
+        permit_mixed_migrations=None,
+        show_logging=None,
+        validate_html=None,
+        validate_html_harder=None,
+        rerun=None,
+        manage_blobstore=True,
+        **kwargs
+    ):    #
         self.ignore_lower_coverage = ignore_lower_coverage
         self.check_coverage = not skip_coverage
         self.save_version_coverage = save_version_coverage
         self.html_report = html_report
         self.permit_mixed_migrations = permit_mixed_migrations
         self.show_logging = show_logging
-        settings.validate_html = self if validate_html else None
-        settings.validate_html_harder = self if validate_html and validate_html_harder else None
-        settings.show_logging = show_logging
+        self.rerun = rerun
+        self.test_labels = None
+        validation_settings["validate_html"] = self if validate_html else None
+        validation_settings["validate_html_harder"] = self if validate_html and validate_html_harder else None
+        validation_settings["show_logging"] = show_logging
         #
         self.root_dir = os.path.dirname(settings.BASE_DIR)
-        self.coverage_file = os.path.join(self.root_dir, settings.TEST_COVERAGE_MASTER_FILE)
+        self.coverage_file = os.path.join(self.root_dir, settings.TEST_COVERAGE_MAIN_FILE)
         super(IetfTestRunner, self).__init__(**kwargs)
         if self.parallel > 1:
             if self.html_report == True:
@@ -729,11 +798,15 @@ def __init__(self, ignore_lower_coverage=False, skip_coverage=False, save_versio
                                  "as the collection of test coverage data isn't currently threadsafe.")
                 sys.exit(1)
             self.check_coverage = False
+        from ietf.doc.tests import TemplateTagTest  # import here to prevent circular imports
+        # Ensure that the coverage tests come last. Specifically list TemplateTagTest before CoverageTest. If this list
+        # contains parent classes to later subclasses, the parent classes will determine the ordering, so use the most
+        # specific classes necessary to get the right ordering:
+        self.reorder_by = (PyFlakesTestCase, MyPyTest,) + self.reorder_by + (StaticLiveServerTestCase, TemplateTagTest, CoverageTest,)
+        #self.buckets = set()
+        self.blobstoremanager = TestBlobstoreManager() if manage_blobstore else None
 
     def setup_test_environment(self, **kwargs):
-        global template_coverage_collection
-        global url_coverage_collection
-
         ietf.utils.mail.test_mode = True
         ietf.utils.mail.SMTP_ADDR['ip4'] = '127.0.0.1'
         ietf.utils.mail.SMTP_ADDR['port'] = 2025
@@ -744,7 +817,7 @@ def setup_test_environment(self, **kwargs):
         print("     Datatracker %s test suite, %s:" % (ietf.__version__, time.strftime("%d %B %Y %H:%M:%S %Z")))
         print("     Python %s." % sys.version.replace('\n', ' '))
         print("     Django %s, settings '%s'" % (django.get_version(), settings.SETTINGS_MODULE))
-        
+
         settings.TEMPLATES[0]['BACKEND'] = 'ietf.utils.test_runner.ValidatingTemplates'
         if self.check_coverage:
             if self.coverage_file.endswith('.gz'):
@@ -754,39 +827,28 @@ def setup_test_environment(self, **kwargs):
                 with io.open(self.coverage_file, encoding='utf-8') as file:
                     self.coverage_master = json.load(file)
             self.coverage_data = {
-                "time": datetime.datetime.now(pytz.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
+                "time": timezone.now().strftime("%Y-%m-%dT%H:%M:%SZ"),
                 "template": {
-                    "coverage": 0.0, 
+                    "coverage": 0.0,
                     "covered": {},
                     "format": 1,        # default format, coverage data in 'covered' are just fractions
                 },
                 "url": {
-                    "coverage": 0.0, 
+                    "coverage": 0.0,
                     "covered": {},
                     "format": 4,
                 },
                 "code": {
-                    "coverage": 0.0, 
+                    "coverage": 0.0,
                     "covered": {},
                     "format": 1,
                 },
-                "migration": {
-                    "present": {},
-                    "format": 3,
-                }
             }
 
             settings.TEMPLATES[0]['OPTIONS']['loaders'] = ('ietf.utils.test_runner.TemplateCoverageLoader',) + settings.TEMPLATES[0]['OPTIONS']['loaders']
 
             settings.MIDDLEWARE = ('ietf.utils.test_runner.record_urls_middleware',) + tuple(settings.MIDDLEWARE)
 
-            self.code_coverage_checker = settings.TEST_CODE_COVERAGE_CHECKER
-            if not self.code_coverage_checker._started:
-                sys.stderr.write(" **  Warning: In %s: Expected the coverage checker to have\n"
-                                 "       been started already, but it wasn't. Doing so now.  Coverage numbers\n"
-                                 "       will be off, though.\n" % __name__)
-                self.code_coverage_checker.start()
-
         if settings.SITE_ID != 1:
             print("     Changing SITE_ID to '1' during testing.")
             settings.SITE_ID = 1
@@ -813,8 +875,8 @@ def setup_test_environment(self, **kwargs):
         for offset in range(10):
             try:
                 # remember the value so ietf.utils.mail.send_smtp() will use the same
-                ietf.utils.mail.SMTP_ADDR['port'] = base + offset 
-                self.smtpd_driver = SMTPTestServerDriver((ietf.utils.mail.SMTP_ADDR['ip4'],ietf.utils.mail.SMTP_ADDR['port']),None) 
+                ietf.utils.mail.SMTP_ADDR['port'] = base + offset
+                self.smtpd_driver = SMTPTestServerDriver(ietf.utils.mail.SMTP_ADDR['ip4'],ietf.utils.mail.SMTP_ADDR['port'], None)
                 self.smtpd_driver.start()
                 print(("     Running an SMTP test server on %(ip4)s:%(port)s to catch outgoing email." % ietf.utils.mail.SMTP_ADDR))
                 break
@@ -833,7 +895,7 @@ def setup_test_environment(self, **kwargs):
             s[1] = tuple(s[1])      # random.setstate() won't accept a list in lieu of a tuple
         factory.random.set_random_state(s)
 
-        if not settings.validate_html:
+        if not validation_settings["validate_html"]:
             print("     Not validating any generated HTML; "
                   "please do so at least once before committing changes")
         else:
@@ -864,6 +926,14 @@ def setup_test_environment(self, **kwargs):
                     "attribute-empty-style": "off",
                     # For fragments, don't check that elements are in the proper ancestor element
                     "element-required-ancestor": "off",
+                    # This is allowed by the HTML spec
+                    "form-dup-name": "off",
+                    # Don't trip over unused disable blocks
+                    "no-unused-disable": "off",
+                    # Ignore focusable elements in aria-hidden elements
+                    "hidden-focusable": "off",
+                    # Ignore missing unique identifier for page "landmarks"
+                    "unique-landmark": "off",
                 },
             }
 
@@ -874,15 +944,17 @@ def setup_test_environment(self, **kwargs):
             config["doc"]["rules"]["require-sri"] = "off"
             # Turn "element-required-ancestor" back on
             del config["doc"]["rules"]["element-required-ancestor"]
-            # permit discontinuous heading numbering in cards, modals and dialogs:
             config["doc"]["rules"]["heading-level"] = [
                 "error",
                 {
+                    # permit discontinuous heading numbering in cards, modals and dialogs:
                     "sectioningRoots": [
                         ".card-body",
                         ".modal-content",
                         '[role="dialog"]',
-                    ]
+                    ],
+                    # permit multiple H1 elements in a single document
+                    "allowMultipleH1": True,
                 },
             ]
 
@@ -894,15 +966,18 @@ def setup_test_environment(self, **kwargs):
                 )
                 self.config_file[kind].write(json.dumps(config[kind]).encode())
                 self.config_file[kind].flush()
-                Path(self.config_file[kind].name).chmod(0o644)
+                pathlib.Path(self.config_file[kind].name).chmod(0o644)
 
-            if not settings.validate_html_harder:
+            if not validation_settings["validate_html_harder"]:
                 print("")
                 self.vnu = None
             else:
                 print(" (extra pedantically)")
                 self.vnu = start_vnu_server()
 
+        if self.blobstoremanager is not None:
+            self.blobstoremanager.createTestBlobstores()
+        
         super(IetfTestRunner, self).setup_test_environment(**kwargs)
 
     def teardown_test_environment(self, **kwargs):
@@ -925,98 +1000,92 @@ def teardown_test_environment(self, **kwargs):
                     with open(self.coverage_file, "w") as file:
                         json.dump(self.coverage_master, file, indent=2, sort_keys=True)
 
-        if settings.validate_html:
+        if validation_settings["validate_html"]:
             for kind in self.batches:
-                try:
-                    self.validate(kind)
-                except Exception:
-                    pass
+                if len(self.batches[kind]):
+                    print(f"     WARNING: not all templates of kind '{kind}' were validated")
                 self.config_file[kind].close()
             if self.vnu:
                 self.vnu.terminate()
 
-        super(IetfTestRunner, self).teardown_test_environment(**kwargs)
+        if self.blobstoremanager is not None:
+            self.blobstoremanager.destroyTestBlobstores()
 
-    def validate(self, kind):
-        if not self.batches[kind]:
-            return
+        super(IetfTestRunner, self).teardown_test_environment(**kwargs)
 
-        testcase = TestCase()
+    def validate(self, testcase):
         cwd = pathlib.Path.cwd()
-        tmpdir = tempfile.TemporaryDirectory(prefix="html-validate-")
-        Path(tmpdir.name).chmod(0o777)
-        for (name, content, fingerprint) in self.batches[kind]:
-            path = pathlib.Path(tmpdir.name).joinpath(
-                hex(fingerprint)[2:],
-                pathlib.Path(name).relative_to(cwd)
-            )
-            pathlib.Path(path.parent).mkdir(parents=True, exist_ok=True)
-            with path.open(mode="w") as file:
-                file.write(content)
-        self.batches[kind] = []
-
-        validation_results = None
-        with tempfile.NamedTemporaryFile() as stdout:
-            subprocess.run(
-                [
-                    "yarn",
-                    "html-validate",
-                    "--formatter=json",
-                    "--config=" + self.config_file[kind].name,
-                    tmpdir.name,
-                ],
-                stdout=stdout,
-                stderr=stdout,
-            )
-
-            stdout.seek(0)
-            try:
-                validation_results = json.load(stdout)
-            except json.decoder.JSONDecodeError:
-                stdout.seek(0)
-                testcase.fail(stdout.read())
-
-        errors = ""
-        for result in validation_results:
-            source_lines = result["source"].splitlines(keepends=True)
-            for msg in result["messages"]:
-                line = msg["line"]
-                errors += (
-                    f'\n{result["filePath"]}:\n'
-                    + "".join(source_lines[line - 5 : line])
-                    + " " * (msg["column"] - 1)
-                    + "^" * msg["size"] + "\n"
-                    + " " * (msg["column"] - 1)
-                    + f'{msg["ruleId"]}: {msg["message"]} '
-                    + f'on line {line}:{msg["column"]}\n'
-                    + "".join(source_lines[line : line + 5])
-                    + "\n"
-                )
-
+        errors = []
+        with tempfile.TemporaryDirectory(prefix="html-validate-") as tmpdir_name:
+            tmppath = pathlib.Path(tmpdir_name)
+            tmppath.chmod(0o777)
+            for kind in self.batches:
+                if not self.batches[kind]:
+                    return
+                for (name, content, fingerprint) in self.batches[kind]:
+                    path = tmppath.joinpath(
+                        hex(fingerprint)[2:],
+                        pathlib.Path(name).relative_to(cwd)
+                    )
+                    pathlib.Path(path.parent).mkdir(parents=True, exist_ok=True)
+                    with path.open(mode="w") as file:
+                        file.write(content)
+                self.batches[kind] = []
+
+                validation_results = None
+                with tempfile.NamedTemporaryFile() as stdout:
+                    subprocess.run(
+                        [
+                            "yarn",
+                            "html-validate",
+                            "--formatter=json",
+                            "--config=" + self.config_file[kind].name,
+                            tmpdir_name,
+                        ],
+                        stdout=stdout,
+                        stderr=stdout,
+                    )
+
+                    stdout.seek(0)
+                    try:
+                        validation_results = json.load(stdout)
+                    except json.decoder.JSONDecodeError:
+                        stdout.seek(0)
+                        testcase.fail(stdout.read())
+
+                for result in validation_results:
+                    source_lines = result["source"].splitlines(keepends=True)
+                    for msg in result["messages"]:
+                        line = msg["line"]
+                        errors.append(
+                            f'\n{result["filePath"]}:\n'
+                            + "".join(source_lines[line - 5 : line])
+                            + " " * (msg["column"] - 1)
+                            + "^" * msg["size"] + "\n"
+                            + " " * (msg["column"] - 1)
+                            + f'{msg["ruleId"]}: {msg["message"]} '
+                            + f'on line {line}:{msg["column"]}\n'
+                            + "".join(source_lines[line : line + 5])
+                            + "\n"
+                        )
+
+                if validation_settings["validate_html_harder"] and kind != "frag":
+                    files = [
+                        os.path.join(d, f)
+                        for d, dirs, files in os.walk(tmppath)
+                        for f in files
+                    ]
+                    for file in files:
+                        with open(file, "rb") as f:
+                            content = f.read()
+                            result = vnu_validate(content)
+                            assert result
+                            for msg in json.loads(result)["messages"]:
+                                if vnu_filter_message(msg, False, True):
+                                    continue
+                                errors.append(vnu_fmt_message(file, msg, content.decode("utf-8")))
         if errors:
-            testcase.fail(errors)
-
-        if settings.validate_html_harder:
-            if kind == "frag":
-                return
-            files = [
-                os.path.join(d, f)
-                for d, dirs, files in os.walk(tmpdir.name)
-                for f in files
-            ]
-            for file in files:
-                with open(file, "rb") as f:
-                    content = f.read()
-                    result = vnu_validate(content)
-                    assert result
-                    for msg in json.loads(result)["messages"]:
-                        if vnu_filter_message(msg, False, True):
-                            continue
-                        errors = vnu_fmt_message(file, msg, content.decode("utf-8"))
-                        if errors:
-                            testcase.fail(errors)
-
-        tmpdir.cleanup()
+            testcase.fail('\n'.join(errors))
 
     def get_test_paths(self, test_labels):
         """Find the apps and paths matching the test labels, so we later can limit
@@ -1051,20 +1120,63 @@ def get_test_paths(self, test_labels):
         test_paths = [ os.path.join(*app.split('.')) for app in test_apps ]
         return test_apps, test_paths
 
-    def run_tests(self, test_labels, extra_tests=None, **kwargs):
-        global old_destroy, old_create, test_database_name, template_coverage_collection, code_coverage_collection, url_coverage_collection
-        from django.db import connection
-        from ietf.doc.tests import TemplateTagTest
+    # Django 5 will drop the extra_tests mechanism for the test runner. Work around
+    # by adding a special label to the test suite, then injecting our extra tests
+    # in load_tests_for_label()
+    def build_suite(self, test_labels=None, extra_tests=None, **kwargs):
+        if test_labels is None:
+            # Base class sets test_labels to ["."] if it was None. The label we're
+            # adding will interfere with that, so replicate that behavior here. 
+            test_labels = ["."]
+        test_labels = ("_ietf_extra_tests",) + tuple(test_labels)
+        return super().build_suite(test_labels, extra_tests, **kwargs)
+
+    def load_tests_for_label(self, label, discover_kwargs):
+        if label == "_ietf_extra_tests":
+            return self._extra_tests() or None
+        return super().load_tests_for_label(label, discover_kwargs)
+
+    def _extra_tests(self):
+        """Get extra tests that should be added to the test suite"""
+        tests = []
+        if validation_settings["validate_html"]:
+            tests += [
+                TemplateValidationTests(
+                    test_runner=self,
+                    validate_html=self,
+                    methodName='run_template_validation',
+                ),
+            ]
+        if self.check_coverage:
+            global template_coverage_collection, url_coverage_collection
+            template_coverage_collection = True
+            url_coverage_collection = True
+            tests += [
+                PyFlakesTestCase(test_runner=self, methodName='pyflakes_test'),
+                MyPyTest(test_runner=self, methodName='mypy_test'),
+                #CoverageTest(test_runner=self, methodName='interleaved_migrations_test'),
+                CoverageTest(test_runner=self, methodName='url_coverage_test'),
+                CoverageTest(test_runner=self, methodName='template_coverage_test'),
+                CoverageTest(test_runner=self, methodName='code_coverage_test'),
+            ]
+        return tests
 
-        if extra_tests is None:
-            extra_tests=[]
+    def run_suite(self, suite, **kwargs):
+        failures = super(IetfTestRunner, self).run_suite(suite, **kwargs)
+        while self.rerun and not failures.errors and not failures.failures:
+            suite = self.build_suite(self.test_labels)
+            failures = super(IetfTestRunner, self).run_suite(suite, **kwargs)
+        return failures
 
+    def run_tests(self, test_labels, extra_tests=None, **kwargs):
         # Tests that involve switching back and forth between the real
         # database and the test database are way too dangerous to run
         # against the production database
         if socket.gethostname().split('.')[0] in ['core3', 'ietfa', 'ietfb', 'ietfc', ]:
             raise EnvironmentError("Refusing to run tests on production server")
 
+        from django.db import connection
+        global old_destroy, old_create
         old_create = connection.creation.__class__.create_test_db
         connection.creation.__class__.create_test_db = safe_create_test_db
         old_destroy = connection.creation.__class__.destroy_test_db
@@ -1077,26 +1189,7 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs):
 
         self.test_apps, self.test_paths = self.get_test_paths(test_labels)
 
-        if self.check_coverage:
-            template_coverage_collection = True
-            code_coverage_collection = True
-            url_coverage_collection = True
-            extra_tests += [
-                PyFlakesTestCase(test_runner=self, methodName='pyflakes_test'),
-                MyPyTest(test_runner=self, methodName='mypy_test'),
-                CoverageTest(test_runner=self, methodName='interleaved_migrations_test'),
-                CoverageTest(test_runner=self, methodName='url_coverage_test'),
-                CoverageTest(test_runner=self, methodName='template_coverage_test'),
-                CoverageTest(test_runner=self, methodName='code_coverage_test'),
-            ]
-
-            # ensure that the coverage tests come last.  Specifically list
-            # TemplateTagTest before CoverageTest.  If this list contains
-            # parent classes to later subclasses, the parent classes will
-            # determine the ordering, so use the most specific classes
-            # necessary to get the right ordering:
-            self.reorder_by = (PyFlakesTestCase, MyPyTest, ) + self.reorder_by + (StaticLiveServerTestCase, TemplateTagTest, CoverageTest, )
-
+        self.test_labels = test_labels  # these are used in our run_suite() and not available to it otherwise
         failures = super(IetfTestRunner, self).run_tests(test_labels, extra_tests=extra_tests, **kwargs)
 
         if self.check_coverage:
@@ -1120,10 +1213,10 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs):
 
                 if self.run_full_test_suite:
                     print(("      %8s coverage: %6.2f%%  (%s: %6.2f%%)" %
-                        (test.capitalize(), test_coverage*100, latest_coverage_version, master_coverage*100, )))
+                           (test.capitalize(), test_coverage*100, latest_coverage_version, master_coverage*100, )))
                 else:
                     print(("      %8s coverage: %6.2f%%" %
-                        (test.capitalize(), test_coverage*100, )))
+                           (test.capitalize(), test_coverage*100, )))
 
             print(("""
                 Per-file code and template coverage and per-url-pattern url coverage data
@@ -1140,34 +1233,43 @@ def run_tests(self, test_labels, extra_tests=None, **kwargs):
 
         return failures
 
-class IetfLiveServerTestCase(StaticLiveServerTestCase):
-    @classmethod
-    def setUpClass(cls):
-        set_coverage_checking(False)
-        super(IetfLiveServerTestCase, cls).setUpClass()
-
-    def setUp(self):
-        super(IetfLiveServerTestCase, self).setUp()
-        # LiveServerTestCase uses TransactionTestCase which seems to
-        # somehow interfere with the fixture loading process in
-        # IetfTestRunner when running multiple tests (the first test
-        # is fine, in the next ones the fixtures have been wiped) -
-        # this is no doubt solvable somehow, but until then we simply
-        # recreate them here
-        from ietf.person.models import Person
-        if not Person.objects.exists():
-            load_and_run_fixtures(verbosity=0)
-        self.replaced_settings = dict()
-        if hasattr(settings, 'IDTRACKER_BASE_URL'):
-            self.replaced_settings['IDTRACKER_BASE_URL'] = settings.IDTRACKER_BASE_URL
-            settings.IDTRACKER_BASE_URL = self.live_server_url
 
-    @classmethod
-    def tearDownClass(cls):
-        super(IetfLiveServerTestCase, cls).tearDownClass()
-        set_coverage_checking(True)
-
-    def tearDown(self):
-        for k, v in self.replaced_settings.items():
-            setattr(settings, k, v)
-        super().tearDown()
+class TestBlobstoreManager():
+    # N.B. buckets and blobstore are intentional Class-level attributes
+    buckets: set[Bucket] = set()
+
+    blobstore = boto3.resource("s3",
+        endpoint_url="http://blobstore:9000",
+        aws_access_key_id="minio_root",
+        aws_secret_access_key="minio_pass",
+        aws_session_token=None,
+        config = botocore.config.Config(
+            request_checksum_calculation="when_required",
+            response_checksum_validation="when_required",
+            signature_version="s3v4",
+        ),
+        #config=botocore.config.Config(signature_version=botocore.UNSIGNED),
+        verify=False
+    )
+
+    def createTestBlobstores(self):
+        for storagename in settings.ARTIFACT_STORAGE_NAMES:
+            bucketname = f"test-{storagename}"
+            try:
+                bucket = self.blobstore.create_bucket(Bucket=bucketname)
+                self.buckets.add(bucket)
+            except self.blobstore.meta.client.exceptions.BucketAlreadyOwnedByYou:
+                bucket = self.blobstore.Bucket(bucketname)
+                self.buckets.add(bucket)
+
+    def destroyTestBlobstores(self):
+        self.emptyTestBlobstores(destroy=True)
+
+    def emptyTestBlobstores(self, destroy=False):
+        # debug.show('f"Asked to empty test blobstores with destroy={destroy}"')
+        for bucket in self.buckets:
+            bucket.objects.delete()
+            if destroy:
+                bucket.delete()
+        if destroy:
+            self.buckets = set()
diff --git a/ietf/utils/test_smtpserver.py b/ietf/utils/test_smtpserver.py
deleted file mode 100644
index 66675aa0b1..0000000000
--- a/ietf/utils/test_smtpserver.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright The IETF Trust 2014-2020, All Rights Reserved
-# -*- coding: utf-8 -*-
-
-
-import smtpd
-import threading
-import asyncore
-
-import debug                            # pyflakes:ignore
-
-class AsyncCoreLoopThread(object):
-
-    def wrap_loop(self, exit_condition, timeout=1.0, use_poll=False, map=None):
-        if map is None:
-            map = asyncore.socket_map
-            while map and not exit_condition:
-                asyncore.loop(timeout=1.0, use_poll=False, map=map, count=1)
-
-    def start(self):
-        """Start the listening service"""
-        self.exit_condition = []
-        kwargs={'exit_condition':self.exit_condition,'timeout':1.0} 
-        self.thread = threading.Thread(target=self.wrap_loop, kwargs=kwargs)
-        self.thread.daemon = True
-        self.thread.daemon = True
-        self.thread.start()     
-
-    def stop(self):
-        """Stop the listening service"""
-        self.exit_condition.append(True)
-        self.thread.join()
-
-
-class SMTPTestChannel(smtpd.SMTPChannel):
-
-#    mail_options = ['BODY=8BITMIME', 'SMTPUTF8']
-
-    def smtp_RCPT(self, arg):
-        if not self.mailfrom:
-            self.push(str('503 Error: need MAIL command'))
-            return
-        arg = self._strip_command_keyword('TO:', arg)
-        address, __ = self._getaddr(arg)
-        if not address:
-            self.push(str('501 Syntax: RCPT TO: <address>'))
-            return
-        if "poison" in address:
-            self.push(str('550 Error: Not touching that'))
-            return
-        self.rcpt_options = []
-        self.rcpttos.append(address)
-        self.push(str('250 Ok'))
-
-class SMTPTestServer(smtpd.SMTPServer):
-
-    def __init__(self,localaddr,remoteaddr,inbox):
-        if inbox is not None:
-            self.inbox=inbox
-        else:
-            self.inbox = []
-        smtpd.SMTPServer.__init__(self,localaddr,remoteaddr)
-
-    def handle_accept(self):
-        pair = self.accept()
-        if pair is not None:
-            conn, addr = pair
-            #channel = SMTPTestChannel(self, conn, addr)
-            SMTPTestChannel(self, conn, addr)
-
-    def process_message(self, peer, mailfrom, rcpttos, data, mail_options=None, rcpt_options=None):
-        self.inbox.append(data)
-
-
-class SMTPTestServerDriver(object):
-    def __init__(self, localaddr, remoteaddr, inbox=None):
-        self.localaddr=localaddr
-        self.remoteaddr=remoteaddr
-        if inbox is not None:
-            self.inbox = inbox
-        else:
-            self.inbox = []
-        self.thread_driver = None
-
-    def start(self):
-        self.smtpserver = SMTPTestServer(self.localaddr,self.remoteaddr,self.inbox)
-        self.thread_driver = AsyncCoreLoopThread()
-        self.thread_driver.start()
-
-    def stop(self):
-        if self.thread_driver:
-            self.thread_driver.stop()
-
diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py
index 1647eeac0f..5faf83d93f 100644
--- a/ietf/utils/test_utils.py
+++ b/ietf/utils/test_utils.py
@@ -34,10 +34,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-import os
+import tempfile
 import re
 import email
 import html5lib
+import rest_framework.test
 import requests_mock
 import shutil
 import sys
@@ -118,7 +119,7 @@ def assert_ical_response_is_valid(test_inst, response, expected_event_summaries=
                                   expected_event_uids=None, expected_event_count=None):
     """Validate an HTTP response containing iCal data
 
-    Based on RFC2445, but not exhaustive by any means. Assumes a single iCalendar object. Checks that
+    Based on RFC5545, but not exhaustive by any means. Assumes a single iCalendar object. Checks that
     expected_event_summaries/_uids are found, but other events are allowed to be present. Specify the
     expected_event_count if you want to reject additional events. If any of these are None,
     the check for that property is skipped.
@@ -132,19 +133,48 @@ def assert_ical_response_is_valid(test_inst, response, expected_event_summaries=
     test_inst.assertContains(response, 'VERSION', count=1)
 
     # Validate event objects
+    event_count = 0
+    uids_found = set()
+    summaries_found = set()
+    got_begin = False
+    cur_event_props = set()
+    for line_num, line in enumerate(response.content.decode().split("\n")):
+        line = line.rstrip()
+        if line == 'BEGIN:VEVENT':
+            test_inst.assertFalse(got_begin, f"Nested BEGIN:VEVENT found on line {line_num + 1}")
+            got_begin = True
+        elif line == 'END:VEVENT':
+            test_inst.assertTrue(got_begin, f"Unexpected END:VEVENT on line {line_num + 1}")
+            test_inst.assertIn("uid", cur_event_props, f"Found END:VEVENT without UID on line {line_num + 1}")
+            got_begin = False
+            cur_event_props.clear()
+            event_count += 1
+        elif got_begin:
+            # properties in an event
+            if line.startswith("UID:"):
+                # mandatory, not more than once
+                test_inst.assertNotIn("uid", cur_event_props, f"Two UID properties in single event on line {line_num + 1}")
+                cur_event_props.add("uid")
+                uids_found.add(line.split(":", 1)[1])
+            elif line.startswith("SUMMARY:"):
+                # optional, not more than once
+                test_inst.assertNotIn("summary", cur_event_props, f"Two SUMMARY properties in single event on line {line_num + 1}")
+                cur_event_props.add("summary")
+                summaries_found.add(line.split(":", 1)[1])
+
     if expected_event_summaries is not None:
-        for summary in expected_event_summaries:
-            test_inst.assertContains(response, 'SUMMARY:' + summary)
+        test_inst.assertCountEqual(summaries_found, set(expected_event_summaries))
 
     if expected_event_uids is not None:
-        for uid in expected_event_uids:
-            test_inst.assertContains(response, 'UID:' + uid)
+        test_inst.assertCountEqual(uids_found, set(expected_event_uids))
 
     if expected_event_count is not None:
-        test_inst.assertContains(response, 'BEGIN:VEVENT', count=expected_event_count)
-        test_inst.assertContains(response, 'END:VEVENT', count=expected_event_count)
-        test_inst.assertContains(response, 'UID', count=expected_event_count)
+        test_inst.assertEqual(event_count, expected_event_count)
 
+    # make sure no doubled colons after timestamp properties
+    test_inst.assertNotContains(response, 'DTSTART::')
+    test_inst.assertNotContains(response, 'DTEND::')
+    test_inst.assertNotContains(response, 'DTSTAMP::')
 
 
 class ReverseLazyTest(django.test.TestCase):
@@ -181,6 +211,8 @@ class TestCase(django.test.TestCase):
         'INTERNET_ALL_DRAFTS_ARCHIVE_DIR',
         'INTERNET_DRAFT_ARCHIVE_DIR',
         'INTERNET_DRAFT_PATH',
+        'BIBXML_BASE_PATH',
+        'FTP_DIR',
     ]
 
     parser = html5lib.HTMLParser(strict=True)
@@ -208,13 +240,8 @@ def normalize(x):
 
     def tempdir(self, label):
         slug = slugify(self.__class__.__name__.replace('.','-'))
-        dirname = "tmp-{label}-{slug}-dir".format(**locals())
-        if 'VIRTUAL_ENV' in os.environ:
-            dirname = os.path.join(os.environ['VIRTUAL_ENV'], dirname)
-        path = os.path.abspath(dirname)
-        if not os.path.exists(path):
-            os.mkdir(path)
-        return path
+        suffix = "-{label}-{slug}-dir".format(**locals())
+        return tempfile.mkdtemp(suffix=suffix)
 
     def assertNoFormPostErrors(self, response, error_css_selector=".is-invalid"):
         """Try to fish out form errors, if none found at least check the
@@ -254,7 +281,7 @@ def assertMailboxContains(self, mailbox, subject=None, text=None, count=None):
             assert isinstance(text, str)
             mlist = [ m for m in mlist if text in get_payload_text(m) ]
         if count and len(mlist) != count:
-            sys.stderr.write("Wrong count in assertMailboxContains().  The complete mailbox contains %s emails:\n\n" % len(mailbox))
+            sys.stderr.write("Wrong count in assertMailboxContains().  The complete mailbox contains %s messages, only %s of them contain the searched-for text:\n\n" % (len(mailbox), len(mlist)))
             for m in mailbox:
                 sys.stderr.write(m.as_string())
                 sys.stderr.write('\n\n')
@@ -275,7 +302,7 @@ def setUp(self):
 
         # Replace settings paths with temporary directories.
         self._ietf_temp_dirs = {}  # trashed during tearDown, DO NOT put paths you care about in this
-        for setting in self.settings_temp_path_overrides:
+        for setting in set(self.settings_temp_path_overrides):
             self._ietf_temp_dirs[setting] = self.tempdir(slugify(setting))
         self._ietf_saved_context = django.test.utils.override_settings(**self._ietf_temp_dirs)
         self._ietf_saved_context.enable()
@@ -285,4 +312,12 @@ def tearDown(self):
         for dir in self._ietf_temp_dirs.values():
             shutil.rmtree(dir)
         self.requests_mock.stop()
-        super().tearDown()
\ No newline at end of file
+        super().tearDown()
+
+
+class APITestCase(TestCase):
+    """Test case that uses rest_framework's APIClient
+    
+    This is equivalent to rest_framework.test.APITestCase, but picks up our 
+    """
+    client_class = rest_framework.test.APIClient
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index 41679a48ba..99c33f34b3 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -1,51 +1,73 @@
-# Copyright The IETF Trust 2014-2020, All Rights Reserved
+# Copyright The IETF Trust 2014-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
+import datetime
 import io
 import json
+import lxml.etree
 import os.path
+import pytz
 import shutil
 import types
 
+from unittest.mock import call, patch
 from pyquery import PyQuery
 from typing import Dict, List       # pyflakes:ignore
 
+from email.message import Message
 from email.mime.image import MIMEImage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from fnmatch import fnmatch
 from importlib import import_module
 from textwrap import dedent
 from tempfile import mkdtemp
+from xml2rfc import log as xml2rfc_log
+from xml2rfc.util.date import extract_date as xml2rfc_extract_date
 
 from django.apps import apps
 from django.contrib.auth.models import User
 from django.conf import settings
+from django.forms import Form
 from django.template import Context
 from django.template import Template    # pyflakes:ignore
 from django.template.defaulttags import URLNode
 from django.template.loader import get_template, render_to_string
 from django.templatetags.static import StaticNode
+from django.test import RequestFactory
 from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 
+from ietf.admin.sites import AdminSite
 from ietf.person.name import name_parts, unidecode_name
 from ietf.submit.tests import submission_file
 from ietf.utils.draft import PlaintextDraft, getmeta
+from ietf.utils.fields import SearchableField
 from ietf.utils.log import unreachable, assertion
-from ietf.utils.mail import send_mail_preformatted, send_mail_text, send_mail_mime, outbox, get_payload_text
-from ietf.utils.test_runner import get_template_paths, set_coverage_checking
+from ietf.utils.mail import (
+    send_mail_preformatted,
+    send_mail_text,
+    send_mail_mime,
+    outbox,
+    get_payload_text,
+    decode_header_value,
+    show_that_mail_was_sent,
+)
+from ietf.utils.test_runner import (
+    get_template_paths,
+    set_template_coverage,
+    set_url_coverage,
+)
 from ietf.utils.test_utils import TestCase, unicontent
-from ietf.utils.text import parse_unicode
-from ietf.utils.xmldraft import XMLDraft
+from ietf.utils.timezone import timezone_not_near_midnight
+from ietf.utils.xmldraft import XMLDraft, InvalidMetadataError, capture_xml2rfc_output
 
 class SendingMail(TestCase):
 
     def test_send_mail_preformatted(self):
         msg = """To: to1@example.com, to2@example.com
-From: from1@ietf.org, from2@ietf.org
+From: from1@ietf.org
 Cc: cc1@example.com, cc2@example.com
 Bcc: bcc1@example.com, bcc2@example.com
 Subject: subject
@@ -55,7 +77,7 @@ def test_send_mail_preformatted(self):
         send_mail_preformatted(None, msg, {}, {})
         recv = outbox[-1]
         self.assertSameEmail(recv['To'], '<to1@example.com>, <to2@example.com>')
-        self.assertSameEmail(recv['From'], 'from1@ietf.org, from2@ietf.org')
+        self.assertSameEmail(recv['From'], 'from1@ietf.org')
         self.assertSameEmail(recv['Cc'], 'cc1@example.com, cc2@example.com')
         self.assertSameEmail(recv['Bcc'], None)
         self.assertEqual(recv['Subject'], 'subject')
@@ -63,14 +85,14 @@ def test_send_mail_preformatted(self):
 
         override = {
             'To': 'oto1@example.net, oto2@example.net',
-            'From': 'ofrom1@ietf.org, ofrom2@ietf.org',
+            'From': 'ofrom1@ietf.org',
             'Cc': 'occ1@example.net, occ2@example.net',
             'Subject': 'osubject',
         }
         send_mail_preformatted(request=None, preformatted=msg, extra={}, override=override)
         recv = outbox[-1]
         self.assertSameEmail(recv['To'], '<oto1@example.net>, <oto2@example.net>')
-        self.assertSameEmail(recv['From'], 'ofrom1@ietf.org, ofrom2@ietf.org')
+        self.assertSameEmail(recv['From'], 'ofrom1@ietf.org')
         self.assertSameEmail(recv['Cc'], 'occ1@example.net, occ2@example.net')
         self.assertSameEmail(recv['Bcc'], None)
         self.assertEqual(recv['Subject'], 'osubject')
@@ -78,14 +100,14 @@ def test_send_mail_preformatted(self):
 
         override = {
             'To': ['<oto1@example.net>', 'oto2@example.net'],
-            'From': ['<ofrom1@ietf.org>', 'ofrom2@ietf.org'],
+            'From': ['<ofrom1@ietf.org>'],
             'Cc': ['<occ1@example.net>', 'occ2@example.net'],
             'Subject': 'osubject',
         }
         send_mail_preformatted(request=None, preformatted=msg, extra={}, override=override)
         recv = outbox[-1]
         self.assertSameEmail(recv['To'], '<oto1@example.net>, <oto2@example.net>')
-        self.assertSameEmail(recv['From'], '<ofrom1@ietf.org>, ofrom2@ietf.org')
+        self.assertSameEmail(recv['From'], '<ofrom1@ietf.org>')
         self.assertSameEmail(recv['Cc'], '<occ1@example.net>, occ2@example.net')
         self.assertSameEmail(recv['Bcc'], None)
         self.assertEqual(recv['Subject'], 'osubject')
@@ -101,6 +123,135 @@ def test_send_mail_preformatted(self):
         recv = outbox[-1]
         self.assertEqual(recv['Fuzz'], 'bucket, monger')
 
+
+class MailUtilsTests(TestCase):
+    def test_decode_header_value(self):
+        self.assertEqual(
+            decode_header_value("cake"),
+            "cake",
+            "decodes simple string value",
+        )
+        self.assertEqual(
+            decode_header_value("=?utf-8?b?8J+Ogg==?="),
+            "\U0001f382",
+            "decodes single utf-8-encoded part",
+        )
+        self.assertEqual(
+            decode_header_value("=?utf-8?b?8J+Ogg==?= = =?macintosh?b?jYxrjg==?="),
+            "\U0001f382 = çåké",
+            "decodes a value with non-utf-8 encodings",
+        )
+
+    # Patch in a side_effect so we can distinguish values that came from decode_header_value.
+    @patch("ietf.utils.mail.decode_header_value", side_effect=lambda s: f"decoded-{s}")
+    @patch("ietf.utils.mail.messages")
+    def test_show_that_mail_was_sent(self, mock_messages, mock_decode_header_value):
+        request = RequestFactory().get("/some/path")
+        request.user = object()  # just needs to exist
+        msg = Message()
+        msg["To"] = "to-value"
+        msg["Subject"] = "subject-value"
+        msg["Cc"] = "cc-value"
+        with patch("ietf.ietfauth.utils.has_role", return_value=True):
+            show_that_mail_was_sent(request, "mail was sent", msg, "bcc-value")
+        self.assertCountEqual(
+            mock_decode_header_value.call_args_list,
+            [call("to-value"), call("subject-value"), call("cc-value"), call("bcc-value")],
+        )
+        self.assertEqual(mock_messages.info.call_args[0][0], request)
+        self.assertIn("mail was sent", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-subject-value", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-to-value", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-cc-value", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-bcc-value", mock_messages.info.call_args[0][1])
+        mock_messages.reset_mock()
+        mock_decode_header_value.reset_mock()
+
+        # no bcc
+        with patch("ietf.ietfauth.utils.has_role", return_value=True):
+            show_that_mail_was_sent(request, "mail was sent", msg, None)
+        self.assertCountEqual(
+            mock_decode_header_value.call_args_list,
+            [call("to-value"), call("subject-value"), call("cc-value")],
+        )
+        self.assertEqual(mock_messages.info.call_args[0][0], request)
+        self.assertIn("mail was sent", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-subject-value", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-to-value", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-cc-value", mock_messages.info.call_args[0][1])
+        # Note: here and below - when using assertNotIn(), leaving off the "decoded-" prefix
+        # proves that neither the original value nor the decoded value appear.
+        self.assertNotIn("bcc-value", mock_messages.info.call_args[0][1])
+        mock_messages.reset_mock()
+        mock_decode_header_value.reset_mock()
+
+        # no cc
+        del msg["Cc"]
+        with patch("ietf.ietfauth.utils.has_role", return_value=True):
+            show_that_mail_was_sent(request, "mail was sent", msg, None)
+        self.assertCountEqual(
+            mock_decode_header_value.call_args_list,
+            [call("to-value"), call("subject-value")],
+        )
+        self.assertEqual(mock_messages.info.call_args[0][0], request)
+        self.assertIn("mail was sent", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-subject-value", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-to-value", mock_messages.info.call_args[0][1])
+        self.assertNotIn("cc-value", mock_messages.info.call_args[0][1])
+        self.assertNotIn("bcc-value", mock_messages.info.call_args[0][1])
+        mock_messages.reset_mock()
+        mock_decode_header_value.reset_mock()
+
+        # no to
+        del msg["To"]
+        with patch("ietf.ietfauth.utils.has_role", return_value=True):
+            show_that_mail_was_sent(request, "mail was sent", msg, None)
+        self.assertCountEqual(
+            mock_decode_header_value.call_args_list,
+            [call("[no to]"), call("subject-value")],
+        )
+        self.assertEqual(mock_messages.info.call_args[0][0], request)
+        self.assertIn("mail was sent", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-subject-value", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-[no to]", mock_messages.info.call_args[0][1])
+        self.assertNotIn("to-value", mock_messages.info.call_args[0][1])
+        self.assertNotIn("cc-value", mock_messages.info.call_args[0][1])
+        self.assertNotIn("bcc-value", mock_messages.info.call_args[0][1])
+        mock_messages.reset_mock()
+        mock_decode_header_value.reset_mock()
+
+        # no subject
+        del msg["Subject"]
+        with patch("ietf.ietfauth.utils.has_role", return_value=True):
+            show_that_mail_was_sent(request, "mail was sent", msg, None)
+        self.assertCountEqual(
+            mock_decode_header_value.call_args_list,
+            [call("[no to]"), call("[no subject]")],
+        )
+        self.assertEqual(mock_messages.info.call_args[0][0], request)
+        self.assertIn("mail was sent", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-[no subject]", mock_messages.info.call_args[0][1])
+        self.assertNotIn("subject-value", mock_messages.info.call_args[0][1])
+        self.assertIn("decoded-[no to]", mock_messages.info.call_args[0][1])
+        self.assertNotIn("to-value", mock_messages.info.call_args[0][1])
+        self.assertNotIn("cc-value", mock_messages.info.call_args[0][1])
+        self.assertNotIn("bcc-value", mock_messages.info.call_args[0][1])
+        mock_messages.reset_mock()
+        mock_decode_header_value.reset_mock()
+        
+        # user does not have role
+        with patch("ietf.ietfauth.utils.has_role", return_value=False):
+            show_that_mail_was_sent(request, "mail was sent", msg, None)
+        self.assertFalse(mock_messages.called)
+        
+        # no user
+        request.user = None
+        with patch("ietf.ietfauth.utils.has_role", return_value=True) as mock_has_role:
+            show_that_mail_was_sent(request, "mail was sent", msg, None)
+        self.assertFalse(mock_messages.called)
+        self.assertFalse(mock_has_role.called)
+
+
 class TestSMTPServer(TestCase):
 
     def test_address_rejected(self):
@@ -158,20 +309,21 @@ def qualified(name):
                 callbacks.add(qualified(entry.name))
             if hasattr(entry, 'lookup_str') and entry.lookup_str:
                 callbacks.add(qualified(entry.lookup_str))
-            # There are some entries we don't handle here, mostly clases
+            # There are some entries we don't handle here, mostly classes
             # (such as Feed subclasses)
 
     return list(callbacks)
 
-class TemplateChecksTestCase(TestCase):
+class TemplateChecksTestCase(TestCase):  # pragma: no cover
 
     paths = []                          # type: List[str]
     templates = {}                      # type: Dict[str, Template]
 
     def setUp(self):
         super().setUp()
-        set_coverage_checking(False)
-        self.paths = list(get_template_paths())
+        set_template_coverage(False)
+        set_url_coverage(False)
+        self.paths = get_template_paths()  # already filtered ignores
         self.paths.sort()
         for path in self.paths:
             try:
@@ -180,17 +332,14 @@ def setUp(self):
                 pass
 
     def tearDown(self):
-        set_coverage_checking(True)
+        set_template_coverage(True)
+        set_url_coverage(True)
         super().tearDown()
 
     def test_parse_templates(self):
         errors = []
         for path in self.paths:
-            for pattern in settings.TEST_TEMPLATE_IGNORE:
-                if fnmatch(path, pattern):
-                    continue
-            if not path in self.templates:
-
+            if path not in self.templates:
                 try:
                     get_template(path)
                 except Exception as e:
@@ -203,7 +352,7 @@ def apply_template_test(self, func, node_type, msg, *args, **kwargs):
         errors = []
         for path, template in self.templates.items():
             origin = str(template.origin).replace(settings.BASE_DIR, '')
-            for node in template:
+            for node in template.nodelist:
                 for child in node.get_nodes_by_type(node_type):
                     errors += func(child, origin, *args, **kwargs)
         if errors:
@@ -318,7 +467,7 @@ def test_all_model_admins_exist(self):
         User.objects.create_superuser('admin', 'admin@example.org', 'admin+password')
         self.client.login(username='admin', password='admin+password')
         rtop = self.client.get("/admin/")
-        self.assertContains(rtop, 'Django administration')
+        self.assertContains(rtop, AdminSite.site_header())
         for name in self.apps:
             app_name = self.apps[name]
             self.assertContains(rtop, name)
@@ -368,10 +517,17 @@ def test_get_refs_v3(self):
             draft.get_refs(),
             {
                 'rfc1': XMLDraft.REF_TYPE_NORMATIVE,
+                'rfc2': XMLDraft.REF_TYPE_NORMATIVE,
+                'draft-wood-key-consistency-03': XMLDraft.REF_TYPE_INFORMATIVE,
                 'rfc255': XMLDraft.REF_TYPE_INFORMATIVE,
                 'bcp6': XMLDraft.REF_TYPE_INFORMATIVE,
+                'bcp14': XMLDraft.REF_TYPE_INFORMATIVE,
                 'rfc1207': XMLDraft.REF_TYPE_UNKNOWN,
                 'rfc4086': XMLDraft.REF_TYPE_NORMATIVE,
+                'draft-ietf-teas-pcecc-use-cases-00': XMLDraft.REF_TYPE_INFORMATIVE,
+                'draft-ietf-teas-pcecc-use-cases': XMLDraft.REF_TYPE_INFORMATIVE,
+                'draft-ietf-sipcore-multiple-reasons-00': XMLDraft.REF_TYPE_INFORMATIVE,
+                'draft-ietf-sipcore-multiple-reasons': XMLDraft.REF_TYPE_INFORMATIVE,
             }
         )
 
@@ -387,6 +543,262 @@ def test_get_refs_v2(self):
             }
         )
 
+    def test_parse_creation_date(self):
+        # override date_today to avoid skew when test runs around midnight
+        today = datetime.date.today()
+        with capture_xml2rfc_output(), patch("ietf.utils.xmldraft.date_today", return_value=today):
+            # Note: using a dict as a stand-in for XML elements, which rely on the get() method
+            self.assertEqual(
+                XMLDraft.parse_creation_date({"year": "2022", "month": "11", "day": "24"}),
+                datetime.date(2022, 11, 24),
+                "Fully specified date should be parsed",
+            )
+            self.assertEqual(
+                XMLDraft.parse_creation_date(None), None, "return None if input is None"
+            )
+            # Cases where the date is empty - missing fields or fields filled in with blank strings.
+            self.assertEqual(XMLDraft.parse_creation_date({}), today)
+            self.assertEqual(XMLDraft.parse_creation_date({"day": ""}), today)
+            self.assertEqual(XMLDraft.parse_creation_date({}), today)
+            self.assertEqual(XMLDraft.parse_creation_date({"year": ""}), today)
+            self.assertEqual(XMLDraft.parse_creation_date({"month": ""}), today)
+            self.assertEqual(XMLDraft.parse_creation_date({"day": ""}), today)
+            self.assertEqual(XMLDraft.parse_creation_date({"year": "", "month": ""}), today)
+            self.assertEqual(XMLDraft.parse_creation_date({"year": "", "day": ""}), today)
+            self.assertEqual(XMLDraft.parse_creation_date({"month": "", "day": ""}), today)
+            self.assertEqual(
+                XMLDraft.parse_creation_date({"year": "", "month": "", "day": ""}), today
+            )
+            self.assertEqual(
+                XMLDraft.parse_creation_date(
+                    {"year": str(today.year), "month": str(today.month), "day": ""}
+                ),
+                today,
+            )
+            # When year/month do not match, day should be 15th of the month
+            self.assertEqual(
+                XMLDraft.parse_creation_date(
+                    {"year": str(today.year - 1), "month": str(today.month), "day": ""}
+                ),
+                datetime.date(today.year - 1, today.month, 15),
+            )
+            self.assertEqual(
+                XMLDraft.parse_creation_date(
+                    {
+                        "year": str(today.year),
+                        "month": "1" if today.month != 1 else "2",
+                        "day": "",
+                    }
+                ),
+                datetime.date(today.year, 1 if today.month != 1 else 2, 15),
+            )
+            # Some exeception-inducing conditions
+            with self.assertRaises(
+                InvalidMetadataError,
+                msg="raise an InvalidMetadataError if a year-only date is not current",
+            ):
+                XMLDraft.parse_creation_date(
+                    {
+                        "year": str(today.year - 1),
+                        "month": "",
+                        "day": "",
+                    }
+                )
+            with self.assertRaises(
+                InvalidMetadataError,
+                msg="raise an InvalidMetadataError for a non-numeric year"
+            ):
+                XMLDraft.parse_creation_date(
+                    {
+                        "year": "two thousand twenty-five",
+                        "month": "2",
+                        "day": "28",
+                    }
+                )
+            with self.assertRaises(
+                InvalidMetadataError,
+                msg="raise an InvalidMetadataError for an invalid month"
+            ):
+                XMLDraft.parse_creation_date(
+                    {
+                        "year": "2024",
+                        "month": "13",
+                        "day": "28",
+                    }
+                )
+            with self.assertRaises(
+                InvalidMetadataError,
+                msg="raise an InvalidMetadataError for a misspelled month"
+            ):
+                XMLDraft.parse_creation_date(
+                    {
+                        "year": "2024",
+                        "month": "Oktobur",
+                        "day": "28",
+                    }
+                )
+            with self.assertRaises(
+                InvalidMetadataError,
+                msg="raise an InvalidMetadataError for an invalid day"
+            ):
+                XMLDraft.parse_creation_date(
+                    {
+                        "year": "2024",
+                        "month": "feb",
+                        "day": "31",
+                    }
+                )
+            with self.assertRaises(
+                InvalidMetadataError,
+                msg="raise an InvalidMetadataError for a non-numeric day"
+            ):
+                XMLDraft.parse_creation_date(
+                    {
+                        "year": "2024",
+                        "month": "feb",
+                        "day": "twenty-four",
+                    }
+                )
+
+
+    def test_parse_docname(self):
+        with self.assertRaises(ValueError) as cm:
+            XMLDraft.parse_docname(lxml.etree.Element("xml"))  # no docName
+        self.assertIn("Missing docName attribute", str(cm.exception))
+
+        # There to be more invalid docNames, but we use XMLDraft in places where we don't
+        # actually care about the validation, so for now just test what has long been the
+        # implementation. 
+        with self.assertRaises(ValueError) as cm:
+            XMLDraft.parse_docname(lxml.etree.Element("xml", docName=""))  # not a valid docName
+        self.assertIn("Unable to parse docName", str(cm.exception))
+
+        self.assertEqual(
+            XMLDraft.parse_docname(lxml.etree.Element("xml", docName="draft-foo-bar-baz-01")),
+            ("draft-foo-bar-baz", "01"),
+        )
+
+        self.assertEqual(
+            XMLDraft.parse_docname(lxml.etree.Element("xml", docName="draft-foo-bar-baz")),
+            ("draft-foo-bar-baz", None),
+        )
+
+        self.assertEqual(
+            XMLDraft.parse_docname(lxml.etree.Element("xml", docName="draft-foo-bar-baz-")),
+            ("draft-foo-bar-baz-", None),
+        )
+
+        # This is awful, but is how we've been running for some time. The missing rev will trigger
+        # validation errors for submissions, so we're at least somewhat guarded against this
+        # property.
+        self.assertEqual(
+            XMLDraft.parse_docname(lxml.etree.Element("xml", docName="-01")),
+            ("-01", None),
+        )
+
+    def test_render_author_name(self):
+        self.assertEqual(
+            XMLDraft.render_author_name(lxml.etree.Element("author", fullname="Joanna Q. Public")),
+            "Joanna Q. Public",
+        )
+        self.assertEqual(
+            XMLDraft.render_author_name(lxml.etree.Element(
+                "author",
+                fullname="Joanna Q. Public",
+                asciiFullname="Not the Same at All",
+            )),
+            "Joanna Q. Public",
+        )
+        self.assertEqual(
+            XMLDraft.render_author_name(lxml.etree.Element(
+                "author",
+                fullname=chr(340)+"ich",
+                asciiFullname="Rich UTF-8",
+            )),
+            chr(340)+"ich (Rich UTF-8)",
+        )
+        self.assertEqual(
+            XMLDraft.render_author_name(lxml.etree.Element(
+                "author",
+                fullname="Joanna Q. Public",
+                initials="J. Q.",
+                surname="Public-Private",
+            )),
+            "Joanna Q. Public",
+        )
+        self.assertEqual(
+            XMLDraft.render_author_name(lxml.etree.Element(
+                "author",
+                initials="J. Q.",
+                surname="Public",
+            )),
+            "J. Q. Public",
+        )
+        self.assertEqual(
+            XMLDraft.render_author_name(lxml.etree.Element(
+                "author",
+                surname="Public",
+            )),
+            "Public",
+        )
+        self.assertEqual(
+            XMLDraft.render_author_name(lxml.etree.Element(
+                "author",
+                initials="J. Q.",
+            )),
+            "J. Q.",
+        )
+
+    @patch("ietf.utils.xmldraft.XMLDraft.__init__", return_value=None)
+    def test_get_title(self, mock_init):
+        xmldraft = XMLDraft("fake")
+        self.assertTrue(mock_init.called)
+        # Stub XML that does not have a front/title element
+        xmldraft.xmlroot = lxml.etree.XML(
+            "<rfc><front></front></rfc>"  # no title
+        )
+        self.assertEqual(xmldraft.get_title(), "")
+
+        # Stub XML that has a front/title element
+        xmldraft.xmlroot = lxml.etree.XML(
+            "<rfc><front><title>This Is the Title</title></front></rfc>"
+        )
+        self.assertEqual(xmldraft.get_title(), "This Is the Title")
+
+        
+    def test_capture_xml2rfc_output(self):
+        """capture_xml2rfc_output reroutes and captures xml2rfc logs"""
+        orig_write_out = xml2rfc_log.write_out
+        orig_write_err = xml2rfc_log.write_err
+        with capture_xml2rfc_output() as outer_log_streams:  # ensure no output
+            # such meta! very Inception!
+            with capture_xml2rfc_output() as inner_log_streams:
+                # arbitrary xml2rfc method that triggers a log, nothing special otherwise
+                xml2rfc_extract_date({"year": "fish"}, datetime.date(2025,3,1))
+            self.assertNotEqual(inner_log_streams, outer_log_streams)
+            self.assertEqual(xml2rfc_log.write_out, outer_log_streams["stdout"], "out stream should be restored")
+            self.assertEqual(xml2rfc_log.write_err, outer_log_streams["stderr"], "err stream should be restored")
+        self.assertEqual(xml2rfc_log.write_out, orig_write_out, "original out stream should be restored")
+        self.assertEqual(xml2rfc_log.write_err, orig_write_err, "original err stream should be restored")
+
+        # don't happen to get any output on stdout and not paranoid enough to force some, just test stderr
+        self.assertGreater(len(inner_log_streams["stderr"].getvalue()), 0, "want output on inner streams")
+        self.assertEqual(len(outer_log_streams["stdout"].getvalue()), 0, "no output on outer streams")
+        self.assertEqual(len(outer_log_streams["stderr"].getvalue()), 0, "no output on outer streams")
+
+    def test_capture_xml2rfc_output_exception_handling(self):
+        """capture_xml2rfc_output restores streams after an exception"""
+        orig_write_out = xml2rfc_log.write_out
+        orig_write_err = xml2rfc_log.write_err
+        with capture_xml2rfc_output() as outer_log_streams:  # ensure no output
+            with self.assertRaises(RuntimeError), capture_xml2rfc_output() as inner_log_streams:
+                raise RuntimeError("nooo")
+            self.assertNotEqual(inner_log_streams, outer_log_streams)
+            self.assertEqual(xml2rfc_log.write_out, outer_log_streams["stdout"], "out stream should be restored")
+            self.assertEqual(xml2rfc_log.write_err, outer_log_streams["stderr"], "err stream should be restored")
+        self.assertEqual(xml2rfc_log.write_out, orig_write_out, "original out stream should be restored")
+        self.assertEqual(xml2rfc_log.write_err, orig_write_err, "original err stream should be restored")
+
 
 class NameTests(TestCase):
 
@@ -451,24 +863,6 @@ def test_assertion(self):
         assertion('False')
         settings.SERVER_MODE = 'test'
 
-class TestRFC2047Strings(TestCase):
-    def test_parse_unicode(self):
-        names = (
-            ('=?utf-8?b?4Yuz4YuK4Ym1IOGJoOGJgOGIiA==?=', 'ዳዊት በቀለ'),
-            ('=?utf-8?b?5Li9IOmDnA==?=', '丽 郜'),
-            ('=?utf-8?b?4KSV4KSu4KWN4KSs4KWL4KScIOCkoeCkvuCksA==?=', 'कम्बोज डार'),
-            ('=?utf-8?b?zpfPgc6szrrOu861zrnOsSDOm865z4zOvc+Ezrc=?=', 'Ηράκλεια Λιόντη'),
-            ('=?utf-8?b?15nXqdeo15DXnCDXqNeV15bXoNek15zXkw==?=', 'ישראל רוזנפלד'),
-            ('=?utf-8?b?5Li95Y2OIOeahw==?=', '丽华 皇'),
-            ('=?utf-8?b?77ul77qu766V77qzIO+tlu+7ru+vvu+6ju+7pw==?=', 'ﻥﺮﮕﺳ ﭖﻮﯾﺎﻧ'),
-            ('=?utf-8?b?77uh77uu77qz77uu76++IO+6su+7tO+7p++6jSDvurDvu6Pvuo7vu6jvr74=?=', 'ﻡﻮﺳﻮﯾ ﺲﻴﻧﺍ ﺰﻣﺎﻨﯾ'),
-            ('=?utf-8?b?ScOxaWdvIFNhbsOnIEliw6HDsWV6IGRlIGxhIFBlw7Fh?=', 'Iñigo Sanç Ibáñez de la Peña'),
-            ('Mart van Oostendorp', 'Mart van Oostendorp'),
-            ('', ''),
-            )
-        for encoded_str, unicode in names: 
-            self.assertEqual(unicode, parse_unicode(encoded_str))
-
 class TestAndroidSiteManifest(TestCase):
     def test_manifest(self):
         r = self.client.get(urlreverse('site.webmanifest'))
@@ -476,3 +870,71 @@ def test_manifest(self):
         manifest = json.loads(unicontent(r))
         self.assertTrue('name' in manifest)
         self.assertTrue('theme_color' in manifest)
+
+
+class TimezoneTests(TestCase):
+    """Tests of the timezone utilities"""
+    @patch(
+        'ietf.utils.timezone.timezone.now',
+        return_value=pytz.timezone('America/Chicago').localize(datetime.datetime(2022, 7, 1, 23, 15, 0)),  # 23:15:00
+    )
+    def test_timezone_not_near_midnight(self, mock):
+        # give it several choices that should be rejected and one that should be accepted
+        with patch(
+                'ietf.utils.timezone.available_timezones',
+                return_value=set([
+                    'America/Chicago',  # time is 23:15, should be rejected
+                    'America/Lima',  # time is 23:15, should be rejected
+                    'America/New_York',  # time is 00:15, should be rejected
+                    'Europe/Riga',  # time is 07:15, acceptable
+                ]),
+        ):
+            # check a few times (will pass by chance < 0.1% of the time)
+            self.assertEqual(timezone_not_near_midnight(), 'Europe/Riga')
+            self.assertEqual(timezone_not_near_midnight(), 'Europe/Riga')
+            self.assertEqual(timezone_not_near_midnight(), 'Europe/Riga')
+            self.assertEqual(timezone_not_near_midnight(), 'Europe/Riga')
+            self.assertEqual(timezone_not_near_midnight(), 'Europe/Riga')
+
+        # now give it no valid choice
+        with patch(
+                'ietf.utils.timezone.available_timezones',
+                return_value=set([
+                    'America/Chicago',  # time is 23:15, should be rejected
+                    'America/Lima',  # time is 23:15, should be rejected
+                    'America/New_York',  # time is 00:15, should be rejected
+                ]),
+        ):
+            with self.assertRaises(RuntimeError):
+                timezone_not_near_midnight()
+
+
+class SearchableFieldTests(TestCase):
+    def test_has_changed_single_value(self):
+        """Should work with initial as a single value or list when max_entries == 1"""
+        class TestSearchableField(SearchableField):
+            model = "fake model"  # needs to be not-None to allow field init
+
+        class TestForm(Form):
+            test_field = TestSearchableField(max_entries=1)
+
+        # single value in initial (e.g., when used as a single-valued field in a formset)
+        changed_form = TestForm(initial={'test_field': 1}, data={'test_field': [2]})
+        self.assertTrue(changed_form.has_changed())
+        unchanged_form = TestForm(initial={'test_field': 1}, data={'test_field': [1]})
+        self.assertFalse(unchanged_form.has_changed())
+
+        # list value in initial (usual situation for a MultipleChoiceField subclass like SearchableField)
+        changed_form = TestForm(initial={'test_field': [1]}, data={'test_field': [2]})
+        self.assertTrue(changed_form.has_changed())
+        unchanged_form = TestForm(initial={'test_field': [1]}, data={'test_field': [1]})
+        self.assertFalse(unchanged_form.has_changed())
+
+
+class HealthTests(TestCase):
+    def test_health(self):
+        self.assertEqual(
+            self.client.get("/health/").status_code,
+            200,
+        )
+            
diff --git a/ietf/utils/tests_coverage.py b/ietf/utils/tests_coverage.py
new file mode 100644
index 0000000000..68795994a7
--- /dev/null
+++ b/ietf/utils/tests_coverage.py
@@ -0,0 +1,56 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+"""Tests of the coverage.py module"""
+
+from unittest import mock
+
+from django.test import override_settings
+
+from .coverage import CoverageManager
+from .test_utils import TestCase
+
+
+class CoverageManagerTests(TestCase):
+    @override_settings(
+        BASE_DIR="/path/to/project/ietf",
+        TEST_CODE_COVERAGE_EXCLUDE_FILES=["a.py"],
+        TEST_CODE_COVERAGE_EXCLUDE_LINES=["some-regex"],
+    )
+    @mock.patch("ietf.utils.coverage.Coverage")
+    def test_coverage_manager(self, mock_coverage):
+        """CoverageManager managed coverage correctly in non-production mode
+
+        Presumes we're not running tests in production mode.
+        """
+        cm = CoverageManager()
+        self.assertFalse(cm.started)
+
+        cm.start()
+        self.assertTrue(cm.started)
+        self.assertEqual(cm.checker, mock_coverage.return_value)
+        self.assertTrue(mock_coverage.called)
+        coverage_kwargs = mock_coverage.call_args.kwargs
+        self.assertEqual(coverage_kwargs["source"], ["/path/to/project/ietf"])
+        self.assertEqual(coverage_kwargs["omit"], ["a.py"])
+        self.assertTrue(isinstance(cm.checker.exclude, mock.Mock))
+        assert isinstance(cm.checker.exclude, mock.Mock)  # for type checker
+        self.assertEqual(cm.checker.exclude.call_count, 1)
+        cm.checker.exclude.assert_called_with("some-regex")
+
+    @mock.patch("ietf.utils.coverage.Coverage")
+    def test_coverage_manager_is_defanged_in_production(self, mock_coverage):
+        """CoverageManager is a no-op in production mode"""
+        # Be careful faking settings.SERVER_MODE, but there's really no other way to
+        # test this.
+        with override_settings(SERVER_MODE="production"):
+            cm = CoverageManager()
+            cm.start()
+
+        # Check that nothing actually happened
+        self.assertFalse(mock_coverage.called)
+        self.assertIsNone(cm.checker)
+        self.assertFalse(cm.started)
+
+        # Check that other methods are guarded appropriately
+        cm.stop()
+        cm.save()
+        self.assertIsNone(cm.report())
diff --git a/ietf/utils/tests_markdown.py b/ietf/utils/tests_markdown.py
new file mode 100644
index 0000000000..c8c07b50c7
--- /dev/null
+++ b/ietf/utils/tests_markdown.py
@@ -0,0 +1,60 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+"""Markdown API utilities tests"""
+
+from textwrap import dedent
+
+from ietf.utils.tests import TestCase
+from ietf.utils.markdown import markdown
+
+
+class MarkdownTests(TestCase):
+    SAMPLE_MARKDOWN = dedent(
+        """
+        # IETF Markdown Test File
+
+        This file contains a bunch of constructs to test our markdown converter in
+        `ietf/utils/markdown.py`.
+
+        ## Links
+
+        * https://example.com
+        * <https://example.com>
+        * [Example](https://example.com)
+        * user@example.com
+        * <user@example.com>
+        * [User](mailto:user@example.com)
+        * RFC2119
+        * BCP 3
+        * STD  1
+        * FYI2
+        * draft-ietf-opsec-indicators-of-compromise
+        * draft-ietf-opsec-indicators-of-compromise-01
+        """
+    )
+
+    SAMPLE_MARKDOWN_OUTPUT = dedent(
+        """
+        <h1 id="ietf-markdown-test-file">IETF Markdown Test File</h1>
+        <p>This file contains a bunch of constructs to test our markdown converter in<br>
+        <code>ietf/utils/<a href="http://markdown.py">markdown.py</a></code>.</p>
+        <h2 id="links">Links</h2>
+        <ul>
+        <li><a href="https://example.com">https://example.com</a></li>
+        <li><a href="https://example.com">https://example.com</a></li>
+        <li><a href="https://example.com">Example</a></li>
+        <li><a href="mailto:user@example.com">user@example.com</a></li>
+        <li>&lt;<a href="mailto:user@example.com">user@example.com</a>&gt;</li>
+        <li><a href="mailto:user@example.com">User</a></li>
+        <li>RFC2119</li>
+        <li>BCP 3</li>
+        <li>STD  1</li>
+        <li>FYI2</li>
+        <li>draft-ietf-opsec-indicators-of-compromise</li>
+        <li>draft-ietf-opsec-indicators-of-compromise-01</li>
+        </ul>
+        """
+    ).strip()
+
+    def test_markdown(self):
+        result = markdown(self.SAMPLE_MARKDOWN)
+        self.assertEqual(result, self.SAMPLE_MARKDOWN_OUTPUT)
diff --git a/ietf/utils/tests_meetecho.py b/ietf/utils/tests_meetecho.py
index d40e013f82..c076a3df74 100644
--- a/ietf/utils/tests_meetecho.py
+++ b/ietf/utils/tests_meetecho.py
@@ -4,15 +4,18 @@
 import requests
 import requests_mock
 
-from pytz import timezone, utc
-from unittest.mock import patch
+from unittest.mock import call, patch
 from urllib.parse import urljoin
+from zoneinfo import ZoneInfo
 
 from django.conf import settings
 from django.test import override_settings
+from django.utils import timezone
 
+from ietf.doc.factories import DocumentFactory
+from ietf.meeting.factories import SessionFactory, SessionPresentationFactory
 from ietf.utils.tests import TestCase
-from .meetecho import Conference, ConferenceManager, MeetechoAPI, MeetechoAPIError
+from .meetecho import Conference, ConferenceManager, MeetechoAPI, MeetechoAPIError, SlidesManager
 
 API_BASE = 'https://meetecho-api.example.com'
 CLIENT_ID = 'datatracker'
@@ -21,6 +24,7 @@
     'api_base': API_BASE,
     'client_id': CLIENT_ID,
     'client_secret': CLIENT_SECRET,
+    'slides_notify_time': -1,  # always send notification
 }
 
 
@@ -30,6 +34,7 @@ class APITests(TestCase):
     schedule_meeting_url = urljoin(API_BASE, 'meeting/interim/createRoom')
     fetch_meetings_url = urljoin(API_BASE, 'meeting/interim/fetchRooms')
     delete_meetings_url = urljoin(API_BASE, 'meeting/interim/deleteRoom')
+    slide_deck_url = urljoin(API_BASE, "materials")
 
     def setUp(self):
         super().setUp()
@@ -77,7 +82,7 @@ def test_schedule_meeting(self):
                 'rooms': {
                     '3d55bce0-535e-4ba8-bb8e-734911cf3c32': {
                         'room': {
-                            'id': 18,
+                            'id': 18,  # should match room_id in api.schedule_meeting() below
                             'start_time': '2021-09-14 10:00:00',
                             'duration': 130,
                             'description': 'interim-2021-wgname-01',
@@ -92,7 +97,8 @@ def test_schedule_meeting(self):
         api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET)
         api_response = api.schedule_meeting(
             wg_token='my-token',
-            start_time=utc.localize(datetime.datetime(2021, 9, 14, 10, 0, 0)),
+            room_id=18,
+            start_time=datetime.datetime(2021, 9, 14, 10, 0, 0, tzinfo=datetime.UTC),
             duration=datetime.timedelta(minutes=130),
             description='interim-2021-wgname-01',
             extrainfo='message for staff',
@@ -111,6 +117,7 @@ def test_schedule_meeting(self):
         self.assertEqual(
             request.json(),
             {
+                'room_id': 18,
                 'duration': 130,
                 'start_time': '2021-09-14 10:00:00',
                 'extrainfo': 'message for staff',
@@ -120,11 +127,11 @@ def test_schedule_meeting(self):
         )
         # same time in different time zones
         for start_time in [
-            utc.localize(datetime.datetime(2021, 9, 14, 10, 0, 0)),
-            timezone('america/halifax').localize(datetime.datetime(2021, 9, 14, 7, 0, 0)),
-            timezone('europe/kiev').localize(datetime.datetime(2021, 9, 14, 13, 0, 0)),
-            timezone('pacific/easter').localize(datetime.datetime(2021, 9, 14, 5, 0, 0)),
-            timezone('africa/porto-novo').localize(datetime.datetime(2021, 9, 14, 11, 0, 0)),
+            datetime.datetime(2021, 9, 14, 10, 0, 0, tzinfo=datetime.UTC),
+            datetime.datetime(2021, 9, 14, 7, 0, 0, tzinfo=ZoneInfo('America/Halifax')),
+            datetime.datetime(2021, 9, 14, 13, 0, 0, tzinfo=ZoneInfo('Europe/Kiev')),
+            datetime.datetime(2021, 9, 14, 5, 0, 0, tzinfo=ZoneInfo('Pacific/Easter')),
+            datetime.datetime(2021, 9, 14, 11, 0, 0, tzinfo=ZoneInfo('Africa/Porto-Novo')),
         ]:
             self.assertEqual(
                 api_response,
@@ -142,7 +149,7 @@ def test_schedule_meeting(self):
                         },
                     }
                 },
-                f'Incorrect time conversion for {start_time.tzinfo.zone}',
+                f'Incorrect time conversion for {start_time.tzinfo}',
             )
 
     def test_fetch_meetings(self):
@@ -191,7 +198,7 @@ def test_fetch_meetings(self):
                     '3d55bce0-535e-4ba8-bb8e-734911cf3c32': {
                         'room': {
                             'id': 18,
-                            'start_time': utc.localize(datetime.datetime(2021, 9, 14, 10, 0, 0)),
+                            'start_time': datetime.datetime(2021, 9, 14, 10, 0, 0, tzinfo=datetime.UTC),
                             'duration': datetime.timedelta(minutes=130),
                             'description': 'interim-2021-wgname-01',
                         },
@@ -201,7 +208,7 @@ def test_fetch_meetings(self):
                     'e68e96d4-d38f-475b-9073-ecab46ca96a5': {
                         'room': {
                             'id': 23,
-                            'start_time': utc.localize(datetime.datetime(2021, 9, 15, 14, 30, 0)),
+                            'start_time': datetime.datetime(2021, 9, 15, 14, 30, 0, tzinfo=datetime.UTC),
                             'duration': datetime.timedelta(minutes=30),
                             'description': 'interim-2021-wgname-02',
                         },
@@ -227,6 +234,136 @@ def test_delete_meeting(self):
         self.assertIsNone(request.body, 'Delete meeting request has no body')
         self.assertCountEqual(api_response, data_to_fetch)
 
+    def test_add_slide_deck(self):
+        self.requests_mock.post(self.slide_deck_url, status_code=202)
+        
+        api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET)
+        api_response = api.add_slide_deck(
+            wg_token="my-token",
+            session="1234",
+            deck={
+                "title": "A Slide Deck",
+                "id": 17,
+                "url": "https://example.com/decks/17",
+                "rev": "00",
+                "order": 0,
+            }
+        )
+        self.assertIsNone(api_response)  # no return value from this call
+
+        self.assertTrue(self.requests_mock.called)
+        request = self.requests_mock.last_request
+        self.assertIn("Authorization", request.headers)
+        self.assertEqual(
+            request.headers["Content-Type"],
+            "application/json",
+            "Incorrect request content-type",
+        )
+        self.assertEqual(request.headers["Authorization"], "bearer my-token",
+                         "Incorrect request authorization header")
+        self.assertEqual(
+            request.json(),
+            {
+                "session": "1234",
+                "title": "A Slide Deck",
+                "id": 17,
+                "url": "https://example.com/decks/17",
+                "rev": "00",
+                "order": 0,
+            },
+            "Incorrect request content"
+        )
+
+    def test_delete_slide_deck(self):
+        self.requests_mock.delete(self.slide_deck_url, status_code=202)
+
+        api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET)
+        api_response = api.delete_slide_deck(
+            wg_token="my-token",
+            session="1234",
+            id=17,
+        )
+        self.assertIsNone(api_response)  # no return value from this call
+
+        self.assertTrue(self.requests_mock.called)
+        request = self.requests_mock.last_request
+        self.assertIn("Authorization", request.headers)
+        self.assertEqual(
+            request.headers["Content-Type"],
+            "application/json",
+            "Incorrect request content-type",
+        )
+        self.assertEqual(request.headers["Authorization"], "bearer my-token",
+                         "Incorrect request authorization header")
+        self.assertEqual(
+            request.json(),
+            {
+                "session": "1234",
+                "id": 17,
+            },
+            "Incorrect request content"
+        )
+
+    def test_update_slide_decks(self):
+        self.requests_mock.put(self.slide_deck_url, status_code=202)
+
+        api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET)
+        api_response = api.update_slide_decks(
+            wg_token="my-token",
+            session="1234",
+            decks=[
+                {
+                    "title": "A Slide Deck",
+                    "id": 17,
+                    "url": "https://example.com/decks/17",
+                    "rev": "00",
+                    "order": 0,
+                },
+                {
+                    "title": "Another Slide Deck",
+                    "id": 23,
+                    "url": "https://example.com/decks/23",
+                    "rev": "03",
+                    "order": 1,
+                }
+            ]
+        )
+        self.assertIsNone(api_response)  # no return value from this call
+
+        self.assertTrue(self.requests_mock.called)
+        request = self.requests_mock.last_request
+        self.assertIn("Authorization", request.headers)
+        self.assertEqual(
+            request.headers["Content-Type"],
+            "application/json",
+            "Incorrect request content-type",
+        )
+        self.assertEqual(request.headers["Authorization"], "bearer my-token",
+                         "Incorrect request authorization header")
+        self.assertEqual(
+            request.json(),
+            {
+                "session": "1234",
+                "decks": [
+                    {
+                        "title": "A Slide Deck",
+                        "id": 17,
+                        "url": "https://example.com/decks/17",
+                        "rev": "00",
+                        "order": 0,
+                    },
+                    {
+                        "title": "Another Slide Deck",
+                        "id": 23,
+                        "url": "https://example.com/decks/23",
+                        "rev": "03",
+                        "order": 1,
+                    },
+                ],
+            },
+            "Incorrect request content"
+        )
+
     def test_request_helper_failed_requests(self):
         self.requests_mock.register_uri(requests_mock.ANY, urljoin(API_BASE, 'unauthorized/url/endpoint'), status_code=401)
         self.requests_mock.register_uri(requests_mock.ANY, urljoin(API_BASE, 'forbidden/url/endpoint'), status_code=403)
@@ -249,7 +386,7 @@ def test_request_helper_exception(self):
 
     def test_time_serialization(self):
         """Time de/serialization should be consistent"""
-        time = datetime.datetime.now(utc).replace(microsecond=0)  # cut off to 0 microseconds
+        time = timezone.now().astimezone(datetime.UTC).replace(microsecond=0)  # cut off to 0 microseconds
         api = MeetechoAPI(API_BASE, CLIENT_ID, CLIENT_SECRET)
         self.assertEqual(api._deserialize_time(api._serialize_time(time)), time)
 
@@ -263,7 +400,7 @@ def test_conference_from_api_dict(self):
                 'session-1-uuid': {
                     'room': {
                         'id': 1,
-                        'start_time': utc.localize(datetime.datetime(2022,2,4,1,2,3)),
+                        'start_time': datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC),
                         'duration': datetime.timedelta(minutes=45),
                         'description': 'some-description',
                     },
@@ -273,7 +410,7 @@ def test_conference_from_api_dict(self):
                 'session-2-uuid': {
                     'room': {
                         'id': 2,
-                        'start_time': utc.localize(datetime.datetime(2022,2,5,4,5,6)),
+                        'start_time': datetime.datetime(2022,2,5,4,5,6, tzinfo=datetime.UTC),
                         'duration': datetime.timedelta(minutes=90),
                         'description': 'another-description',
                     },
@@ -290,7 +427,7 @@ def test_conference_from_api_dict(self):
                     id=1,
                     public_id='session-1-uuid',
                     description='some-description',
-                    start_time=utc.localize(datetime.datetime(2022, 2, 4, 1, 2, 3)),
+                    start_time=datetime.datetime(2022, 2, 4, 1, 2, 3, tzinfo=datetime.UTC),
                     duration=datetime.timedelta(minutes=45),
                     url='https://example.com/some/url',
                     deletion_token='delete-me',
@@ -300,7 +437,7 @@ def test_conference_from_api_dict(self):
                     id=2,
                     public_id='session-2-uuid',
                     description='another-description',
-                    start_time=utc.localize(datetime.datetime(2022, 2, 5, 4, 5, 6)),
+                    start_time=datetime.datetime(2022, 2, 5, 4, 5, 6, tzinfo=datetime.UTC),
                     duration=datetime.timedelta(minutes=90),
                     url='https://example.com/another/url',
                     deletion_token='delete-me-too',
@@ -316,7 +453,7 @@ def test_fetch(self, mock_fetch, _):
                 'session-1-uuid': {
                     'room': {
                         'id': 1,
-                        'start_time': utc.localize(datetime.datetime(2022,2,4,1,2,3)),
+                        'start_time': datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC),
                         'duration': datetime.timedelta(minutes=45),
                         'description': 'some-description',
                     },
@@ -335,7 +472,7 @@ def test_fetch(self, mock_fetch, _):
                 id=1,
                 public_id='session-1-uuid',
                 description='some-description',
-                start_time=utc.localize(datetime.datetime(2022,2,4,1,2,3)),
+                start_time=datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC),
                 duration=datetime.timedelta(minutes=45),
                 url='https://example.com/some/url',
                 deletion_token='delete-me',
@@ -350,8 +487,8 @@ def test_create(self, mock_schedule, _):
             'rooms': {
                 'session-1-uuid': {
                     'room': {
-                        'id': 1,
-                        'start_time': utc.localize(datetime.datetime(2022,2,4,1,2,3)),
+                        'id': 1,  # value should match session_id param to cm.create() below 
+                        'start_time': datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC),
                         'duration': datetime.timedelta(minutes=45),
                         'description': 'some-description',
                     },
@@ -361,7 +498,7 @@ def test_create(self, mock_schedule, _):
             },
         }
         cm = ConferenceManager(settings.MEETECHO_API_CONFIG)
-        result = cm.create('group', 'desc', 'starttime', 'dur', 'extra')
+        result = cm.create('group', '1', 'desc', 'starttime', 'dur', 'extra')
         self.assertEqual(
             result,
             [Conference(
@@ -369,7 +506,7 @@ def test_create(self, mock_schedule, _):
                 id=1,
                 public_id='session-1-uuid',
                 description='some-description',
-                start_time=utc.localize(datetime.datetime(2022,2,4,1,2,3)),
+                start_time=datetime.datetime(2022,2,4,1,2,3, tzinfo=datetime.UTC),
                 duration=datetime.timedelta(minutes=45),
                 url='https://example.com/some/url',
                 deletion_token='delete-me',
@@ -380,6 +517,7 @@ def test_create(self, mock_schedule, _):
             kwargs,
             {
                 'wg_token': 'atoken',
+                'room_id': 1,
                 'description': 'desc',
                 'start_time': 'starttime',
                 'duration': 'dur',
@@ -393,10 +531,176 @@ def test_delete_conference(self, mock_delete):
         args, kwargs = mock_delete.call_args
         self.assertEqual(args, ('delete-this',))
 
-
     @patch('ietf.utils.meetecho.MeetechoAPI.delete_meeting')
     def test_delete_by_url(self, mock_delete):
         cm = ConferenceManager(settings.MEETECHO_API_CONFIG)
         cm.delete_conference(Conference(None, None, None, None, None, None, 'the-url', 'delete-this'))
         args, kwargs = mock_delete.call_args
         self.assertEqual(args, ('delete-this',))
+
+
+@patch.object(SlidesManager, 'wg_token', return_value='atoken')
+@override_settings(MEETECHO_API_CONFIG=API_CONFIG)
+class SlidesManagerTests(TestCase):
+    @patch("ietf.utils.meetecho.MeetechoAPI.add_slide_deck")
+    def test_add(self, mock_add, mock_wg_token):
+        sm = SlidesManager(settings.MEETECHO_API_CONFIG)
+        session = SessionFactory()
+        slides_doc = DocumentFactory(type_id="slides")
+        retval = sm.add(session, slides_doc, 13)
+        self.assertIs(retval, True)
+        self.assertTrue(mock_wg_token.called)
+        self.assertTrue(mock_add.called)
+        self.assertEqual(
+            mock_add.call_args,
+            call(
+                wg_token="atoken",
+                session=str(session.pk),
+                deck={
+                    "id": slides_doc.pk,
+                    "title": slides_doc.title,
+                    "url": slides_doc.get_href(session.meeting),
+                    "rev": slides_doc.rev,
+                    "order": 13,
+                },
+            ),
+        )
+
+        # Test return value when no update is sent. Really ought to do a more
+        # careful test of the _should_send_update() method.
+        sm = SlidesManager(
+            settings.MEETECHO_API_CONFIG | {"slides_notify_time": None}
+        )
+        retval = sm.add(session, slides_doc, 14)
+        self.assertIs(retval, False)
+
+    @patch("ietf.utils.meetecho.MeetechoAPI.update_slide_decks")
+    @patch("ietf.utils.meetecho.MeetechoAPI.delete_slide_deck")
+    def test_delete(self, mock_delete, mock_update, mock_wg_token):
+        sm = SlidesManager(settings.MEETECHO_API_CONFIG)
+        # Test scenario: we had a session with two slide decks and we already deleted the SessionPresentation
+        # for one and are now updating Meetecho
+        slides = SessionPresentationFactory(document__type_id="slides", order=1)  # still attached to the session
+        session = slides.session
+        slides_doc = slides.document
+        removed_slides_doc = DocumentFactory(type_id="slides")
+        
+        with self.assertRaises(MeetechoAPIError):
+            sm.delete(session, slides_doc)  # can't remove slides still attached to the session
+        self.assertFalse(any([mock_wg_token.called, mock_delete.called, mock_update.called]))
+
+        retval = sm.delete(session, removed_slides_doc)
+        self.assertIs(retval, True)
+        self.assertTrue(mock_wg_token.called)
+        self.assertTrue(mock_delete.called)
+        self.assertEqual(
+            mock_delete.call_args,
+            call(wg_token="atoken", session=str(session.pk), id=removed_slides_doc.pk),
+        )
+        self.assertTrue(mock_update.called)
+        self.assertEqual(
+            mock_update.call_args,
+            call(
+                wg_token="atoken",
+                session=str(session.pk),
+                decks=[
+                    {
+                        "id": slides_doc.pk,
+                        "title": slides_doc.title,
+                        "url": slides_doc.get_href(session.meeting),
+                        "rev": slides_doc.rev,
+                        "order": 1,
+                    },
+                ]
+            )
+        )
+        mock_delete.reset_mock()
+        mock_update.reset_mock()
+        
+        # Delete the other session and check that we don't make the update call
+        slides.delete()
+        retval = sm.delete(session, slides_doc)
+        self.assertIs(retval, True)
+        self.assertTrue(mock_delete.called)
+        self.assertFalse(mock_update.called)
+        
+        # Test return value when no update is sent. Really ought to do a more
+        # careful test of the _should_send_update() method.
+        sm = SlidesManager(
+            settings.MEETECHO_API_CONFIG | {"slides_notify_time": None}
+        )
+        retval = sm.delete(session, slides_doc)
+        self.assertIs(retval, False)
+
+    @patch("ietf.utils.meetecho.MeetechoAPI.delete_slide_deck")
+    @patch("ietf.utils.meetecho.MeetechoAPI.add_slide_deck")
+    def test_revise(self, mock_add, mock_delete, mock_wg_token):
+        sm = SlidesManager(settings.MEETECHO_API_CONFIG)
+        slides = SessionPresentationFactory(document__type_id="slides", order=23)
+        slides_doc = slides.document
+        retval = sm.revise(slides.session, slides_doc)
+        self.assertIs(retval, True)
+        self.assertTrue(mock_wg_token.called)
+        self.assertTrue(mock_delete.called)
+        self.assertEqual(
+            mock_delete.call_args,
+            call(wg_token="atoken", session=str(slides.session.pk), id=slides_doc.pk),
+        )
+        self.assertTrue(mock_add.called)
+        self.assertEqual(
+            mock_add.call_args,
+            call(
+                wg_token="atoken",
+                session=str(slides.session.pk),
+                deck={
+                    "id": slides_doc.pk,
+                    "title": slides_doc.title,
+                    "url": slides_doc.get_href(slides.session.meeting),
+                    "rev": slides_doc.rev,
+                    "order": 23,
+                },
+            ),
+        )
+
+        # Test return value when no update is sent. Really ought to do a more
+        # careful test of the _should_send_update() method.
+        sm = SlidesManager(
+            settings.MEETECHO_API_CONFIG | {"slides_notify_time": None}
+        )
+        retval = sm.revise(slides.session, slides_doc)
+        self.assertIs(retval, False)
+
+
+    @patch("ietf.utils.meetecho.MeetechoAPI.update_slide_decks")
+    def test_send_update(self, mock_send_update, mock_wg_token):
+        sm = SlidesManager(settings.MEETECHO_API_CONFIG)
+        slides = SessionPresentationFactory(document__type_id="slides")
+        SessionPresentationFactory(session=slides.session, document__type_id="agenda")
+        retval = sm.send_update(slides.session)
+        self.assertIs(retval, True)
+        self.assertTrue(mock_wg_token.called)
+        self.assertTrue(mock_send_update.called)
+        self.assertEqual(
+            mock_send_update.call_args,
+            call(
+                wg_token="atoken",
+                session=str(slides.session_id),
+                decks=[
+                    {
+                        "id": slides.document_id,
+                        "title": slides.document.title,
+                        "url": slides.document.get_href(slides.session.meeting),
+                        "rev": slides.document.rev,
+                        "order": 0,
+                    }
+                ]
+            )
+        )
+
+        # Test return value when no update is sent. Really ought to do a more
+        # careful test of the _should_send_update() method.
+        sm = SlidesManager(
+            settings.MEETECHO_API_CONFIG | {"slides_notify_time": None}
+        )
+        retval = sm.send_update(slides.session)
+        self.assertIs(retval, False)
diff --git a/ietf/utils/tests_searchindex.py b/ietf/utils/tests_searchindex.py
new file mode 100644
index 0000000000..e9fbf52020
--- /dev/null
+++ b/ietf/utils/tests_searchindex.py
@@ -0,0 +1,213 @@
+# Copyright The IETF Trust 2026, All Rights Reserved
+from unittest import mock
+
+import typesense.exceptions
+from django.conf import settings
+from django.test.utils import override_settings
+
+from . import searchindex
+from .test_utils import TestCase
+from ..blobdb.models import Blob
+from ..doc.factories import (
+    WgDraftFactory,
+    WgRfcFactory,
+    PublishedRfcDocEventFactory,
+    BcpFactory,
+    StdFactory,
+)
+from ..doc.models import Document
+from ..doc.storage_utils import store_str
+from ..person.factories import PersonFactory
+
+
+class SearchindexTests(TestCase):
+    def test_enabled(self):
+        with override_settings():
+            try:
+                del settings.SEARCHINDEX_CONFIG
+            except AttributeError:
+                pass
+            self.assertFalse(searchindex.enabled())
+        with override_settings(
+            SEARCHINDEX_CONFIG={"TYPESENSE_API_KEY": "this-is-not-a-key"}
+        ):
+            self.assertFalse(searchindex.enabled())
+        with override_settings(
+            SEARCHINDEX_CONFIG={"TYPESENSE_API_URL": "http://example.com"}
+        ):
+            self.assertTrue(searchindex.enabled())
+
+    def test_sanitize_text(self):
+        dirty_text = """
+        
+        This is text.  It + is <---- full    of \tprobl.....ems! Fix it. 
+        """
+        sanitized = "This is text It is full of problems Fix it."
+        self.assertEqual(searchindex._sanitize_text(dirty_text), sanitized)
+
+    @override_settings(
+        SEARCHINDEX_CONFIG={
+            "TYPESENSE_API_URL": "http://ts.example.com",
+            "TYPESENSE_API_KEY": "test-api-key",
+            "TYPESENSE_COLLECTION_NAME": "frogs",
+        }
+    )
+    def test_typesense_doc_from_rfc(self):
+        not_rfc = WgDraftFactory()
+        assert isinstance(not_rfc, Document)
+        with self.assertRaises(AssertionError):
+            searchindex.typesense_doc_from_rfc(not_rfc)
+
+        invalid_rfc = WgRfcFactory(name="rfc1000000", rfc_number=None)
+        assert isinstance(invalid_rfc, Document)
+        with self.assertRaises(AssertionError):
+            searchindex.typesense_doc_from_rfc(invalid_rfc)
+
+        rfc = PublishedRfcDocEventFactory().doc
+        assert isinstance(rfc, Document)
+        result = searchindex.typesense_doc_from_rfc(rfc)
+        # Check a few values, not exhaustive
+        self.assertEqual(result["id"], f"doc-{rfc.pk}")
+        self.assertEqual(result["rfcNumber"], rfc.rfc_number)
+        self.assertEqual(result["abstract"], searchindex._sanitize_text(rfc.abstract))
+        self.assertEqual(result["pages"], rfc.pages)
+        self.assertNotIn("adName", result)
+        self.assertNotIn("content", result)  # no blob
+        self.assertNotIn("subseries", result)
+
+        # repeat, this time with contents, an AD, and subseries docs
+        store_str(
+            kind="rfc",
+            name=f"txt/{rfc.name}.txt",
+            content="The contents of this RFC",
+            doc_name=rfc.name,
+            doc_rev=rfc.rev,  # expected to be None
+        )
+        rfc.ad = PersonFactory(name="Alfred D. Rector")
+        # Put it in two Subseries docs to be sure this does not break things
+        # (the typesense schema does not support this for real at the moment)
+        BcpFactory(contains=[rfc], name="bcp1234")
+        StdFactory(contains=[rfc], name="std1234")
+        result = searchindex.typesense_doc_from_rfc(rfc)
+        # Check a few values, not exhaustive
+        self.assertEqual(
+            result["content"],
+            searchindex._sanitize_text("The contents of this RFC"),
+        )
+        self.assertEqual(result["adName"], "Alfred D. Rector")
+        self.assertIn("subseries", result)
+        ss_dict = result["subseries"]
+        # We should get one of the two subseries docs, but neither is more correct
+        # than the other...
+        self.assertTrue(
+            any(
+                ss_dict == {"acronym": ss_type, "number": 1234, "total": 1}
+                for ss_type in ["bcp", "std"]
+            )
+        )
+
+        # Finally, delete the contents blob and make sure things don't blow up
+        Blob.objects.get(bucket="rfc", name=f"txt/{rfc.name}.txt").delete()
+        result = searchindex.typesense_doc_from_rfc(rfc)
+        self.assertNotIn("content", result)
+
+    @override_settings(
+        SEARCHINDEX_CONFIG={
+            "TYPESENSE_API_URL": "http://ts.example.com",
+            "TYPESENSE_API_KEY": "test-api-key",
+            "TYPESENSE_COLLECTION_NAME": "frogs",
+        }
+    )
+    @mock.patch("ietf.utils.searchindex.typesense_doc_from_rfc")
+    @mock.patch("ietf.utils.searchindex.typesense.Client")
+    def test_update_or_create_rfc_entry(
+        self, mock_ts_client_constructor, mock_tdoc_from_rfc
+    ):
+        fake_tdoc = object()
+        mock_tdoc_from_rfc.return_value = fake_tdoc
+        rfc = WgRfcFactory()
+        assert isinstance(rfc, Document)
+        searchindex.update_or_create_rfc_entry(rfc)
+        self.assertTrue(mock_ts_client_constructor.called)
+        # walk the tree down to the method we expected to be called...
+        mock_upsert = mock_ts_client_constructor.return_value.collections[
+            "frogs"  # matches value in override_settings above
+        ].documents.upsert
+        self.assertTrue(mock_upsert.called)
+        self.assertEqual(mock_upsert.call_args, mock.call(fake_tdoc))
+
+    @override_settings(
+        SEARCHINDEX_CONFIG={
+            "TYPESENSE_API_URL": "http://ts.example.com",
+            "TYPESENSE_API_KEY": "test-api-key",
+            "TYPESENSE_COLLECTION_NAME": "frogs",
+        }
+    )
+    @mock.patch("ietf.utils.searchindex.typesense_doc_from_rfc")
+    @mock.patch("ietf.utils.searchindex.typesense.Client")
+    def test_update_or_create_rfc_entries(
+        self, mock_ts_client_constructor, mock_tdoc_from_rfc
+    ):
+        fake_tdoc = object()
+        mock_tdoc_from_rfc.return_value = fake_tdoc
+        rfc = WgRfcFactory()
+        assert isinstance(rfc, Document)
+        searchindex.update_or_create_rfc_entries([rfc] * 50)  # list of docs...
+        self.assertEqual(mock_ts_client_constructor.call_count, 1)
+        # walk the tree down to the method we expected to be called...
+        mock_import_ = mock_ts_client_constructor.return_value.collections[
+            "frogs"  # matches value in override_settings above
+        ].documents.import_
+        self.assertEqual(mock_import_.call_count, 1)
+        self.assertEqual(
+            mock_import_.call_args, mock.call([fake_tdoc] * 50, {"action": "upsert"})
+        )
+
+        mock_import_.reset_mock()
+        searchindex.update_or_create_rfc_entries([rfc] * 50, batchsize=20)
+        self.assertEqual(mock_ts_client_constructor.call_count, 2)  # one more
+        # walk the tree down to the method we expected to be called...
+        mock_import_ = mock_ts_client_constructor.return_value.collections[
+            "frogs"  # matches value in override_settings above
+        ].documents.import_
+        self.assertEqual(mock_import_.call_count, 3)
+        self.assertEqual(
+            mock_import_.call_args_list,
+            [
+                mock.call([fake_tdoc] * 20, {"action": "upsert"}),
+                mock.call([fake_tdoc] * 20, {"action": "upsert"}),
+                mock.call([fake_tdoc] * 10, {"action": "upsert"}),
+            ],
+        )
+
+    @override_settings(
+        SEARCHINDEX_CONFIG={
+            "TYPESENSE_API_URL": "http://ts.example.com",
+            "TYPESENSE_API_KEY": "test-api-key",
+            "TYPESENSE_COLLECTION_NAME": "frogs",
+        }
+    )
+    @mock.patch("ietf.utils.searchindex.typesense.Client")
+    def test_create_collection(self, mock_ts_client_constructor):
+        searchindex.create_collection()
+        self.assertEqual(mock_ts_client_constructor.call_count, 1)
+        mock_collections = mock_ts_client_constructor.return_value.collections
+        self.assertTrue(mock_collections.create.called)
+        self.assertEqual(mock_collections.create.call_args[0][0]["name"], "frogs")
+
+    @override_settings(
+        SEARCHINDEX_CONFIG={
+            "TYPESENSE_API_URL": "http://ts.example.com",
+            "TYPESENSE_API_KEY": "test-api-key",
+            "TYPESENSE_COLLECTION_NAME": "frogs",
+        }
+    )
+    @mock.patch("ietf.utils.searchindex.typesense.Client")
+    def test_delete_collection(self, mock_ts_client_constructor):
+        searchindex.delete_collection()
+        self.assertEqual(mock_ts_client_constructor.call_count, 1)
+        mock_collections = mock_ts_client_constructor.return_value.collections
+        self.assertTrue(mock_collections["frogs"].delete.called)
+
+        mock_collections["frogs"].side_effect = typesense.exceptions.ObjectNotFound
+        searchindex.delete_collection()  # should ignore the exception
diff --git a/ietf/utils/tests_text.py b/ietf/utils/tests_text.py
new file mode 100644
index 0000000000..51aa2eff13
--- /dev/null
+++ b/ietf/utils/tests_text.py
@@ -0,0 +1,71 @@
+# Copyright The IETF Trust 2021-2026, All Rights Reserved
+from ietf.utils.test_utils import TestCase
+from ietf.utils.text import parse_unicode, decode_document_content
+
+
+class TestDecoders(TestCase):
+    def test_parse_unicode(self):
+        names = (
+            ("=?utf-8?b?4Yuz4YuK4Ym1IOGJoOGJgOGIiA==?=", "ዳዊት በቀለ"),
+            ("=?utf-8?b?5Li9IOmDnA==?=", "丽 郜"),
+            ("=?utf-8?b?4KSV4KSu4KWN4KSs4KWL4KScIOCkoeCkvuCksA==?=", "कम्बोज डार"),
+            ("=?utf-8?b?zpfPgc6szrrOu861zrnOsSDOm865z4zOvc+Ezrc=?=", "Ηράκλεια Λιόντη"),
+            ("=?utf-8?b?15nXqdeo15DXnCDXqNeV15bXoNek15zXkw==?=", "ישראל רוזנפלד"),
+            ("=?utf-8?b?5Li95Y2OIOeahw==?=", "丽华 皇"),
+            ("=?utf-8?b?77ul77qu766V77qzIO+tlu+7ru+vvu+6ju+7pw==?=", "ﻥﺮﮕﺳ ﭖﻮﯾﺎﻧ"),
+            (
+                "=?utf-8?b?77uh77uu77qz77uu76++IO+6su+7tO+7p++6jSDvurDvu6Pvuo7vu6jvr74=?=",
+                "ﻡﻮﺳﻮﯾ ﺲﻴﻧﺍ ﺰﻣﺎﻨﯾ",
+            ),
+            (
+                "=?utf-8?b?ScOxaWdvIFNhbsOnIEliw6HDsWV6IGRlIGxhIFBlw7Fh?=",
+                "Iñigo Sanç Ibáñez de la Peña",
+            ),
+            ("Mart van Oostendorp", "Mart van Oostendorp"),
+            ("", ""),
+        )
+        for encoded_str, unicode in names:
+            self.assertEqual(unicode, parse_unicode(encoded_str))
+
+    def test_decode_document_content(self):
+        utf8_bytes = "𒀭𒊩𒌆𒄈𒋢".encode("utf-8")  # ends with 4-byte character
+        latin1_bytes = "àéîøü".encode("latin-1")
+        other_bytes = "àéîøü".encode("macintosh")  # different from its latin-1 encoding
+        assert other_bytes.decode("macintosh") != other_bytes.decode("latin-1"),\
+            "test broken: other_bytes must decode differently as latin-1"
+
+        # simplest case
+        self.assertEqual(
+            decode_document_content(utf8_bytes),
+            utf8_bytes.decode(),
+        )
+        # losing 1-4 bytes from the end leave the last character incomplete; the
+        # decoder should decode all but that last character
+        self.assertEqual(
+            decode_document_content(utf8_bytes[:-1]),
+            utf8_bytes.decode()[:-1],
+        )
+        self.assertEqual(
+            decode_document_content(utf8_bytes[:-2]),
+            utf8_bytes.decode()[:-1],
+        )
+        self.assertEqual(
+            decode_document_content(utf8_bytes[:-3]),
+            utf8_bytes.decode()[:-1],
+        )
+        self.assertEqual(
+            decode_document_content(utf8_bytes[:-4]),
+            utf8_bytes.decode()[:-1],
+        )
+
+        # latin-1 is also simple
+        self.assertEqual(
+            decode_document_content(latin1_bytes),
+            latin1_bytes.decode("latin-1"),
+        )
+
+        # other character sets are just treated as latin1 (bug? feature? you decide)
+        self.assertEqual(
+            decode_document_content(other_bytes),
+            other_bytes.decode("latin-1"),
+        )
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index 1f194a9831..2763056e1a 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -1,17 +1,15 @@
 # Copyright The IETF Trust 2016-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-
-import bleach  # type: ignore
-import copy
+import bleach
 import email
 import re
 import textwrap
 import tlds
 import unicodedata
 
-from django.core.validators import URLValidator
 from django.core.exceptions import ValidationError
+from django.core.validators import URLValidator
 from django.utils.functional import keep_lazy
 from django.utils.safestring import mark_safe
 
@@ -19,56 +17,58 @@
 
 from .texescape import init as texescape_init, tex_escape_map
 
-tlds_sorted = sorted(tlds.tld_set, key=len, reverse=True)
-protocols = copy.copy(bleach.sanitizer.ALLOWED_PROTOCOLS)
-protocols.append("ftp")  # we still have some ftp links
-protocols.append("xmpp")  # we still have some xmpp links
-
-tags = set(copy.copy(bleach.sanitizer.ALLOWED_TAGS)).union(
-    {
-        # fmt: off
-        'a', 'abbr', 'acronym', 'address', 'b', 'big',
-        'blockquote', 'body', 'br', 'caption', 'center', 'cite', 'code', 'col',
-        'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'font',
-        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'i', 'ins', 'kbd',
-        'li', 'ol', 'p', 'pre', 'q', 's', 'samp', 'small', 'span', 'strike', 'style',
-        'strong', 'sub', 'sup', 'table', 'title', 'tbody', 'td', 'tfoot', 'th', 'thead',
-        'tr', 'tt', 'u', 'ul', 'var'
-        # fmt: on
-    }
-)
+# Sort in reverse so substrings are considered later - e.g., so ".co" comes after ".com".
+tlds_sorted = sorted(tlds.tld_set, reverse=True)
 
-attributes = copy.copy(bleach.sanitizer.ALLOWED_ATTRIBUTES)
-attributes["*"] = ["id"]
-attributes["ol"] = ["start"]
+# Protocols we're interested in auto-linking. See also ietf.utils.html.acceptable_protocols,
+# which is protocols we allow people to include explicitly  in sanitized html. 
+linkable_protocols = ["http", "https", "mailto", "ftp", "xmpp"]
 
-bleach_cleaner = bleach.sanitizer.Cleaner(
-    tags=tags, attributes=attributes, protocols=protocols, strip=True
-)
 
-validate_url = URLValidator()
+_validate_url = URLValidator() 
 
 
 def check_url_validity(attrs, new=False):
+    """Callback for bleach linkify
+    
+    :param attrs: dict of attributes of the <a> tag
+    :param new: boolean - True if the link is new; False if <a> was found in text
+    :return: new dict of attributes for the link, or None to block link creation 
+
+    Attributes are namespaced, so normally look like `(None, "SomeAttribute")`.
+    This includes as the keys in the `attrs` argument, so `attrs[(None, "href")]`
+    would be the value of the href attribute.  
+    """
     if (None, "href") not in attrs:
-        return None
+        # rfc2html creates a tags without href
+        return attrs
     url = attrs[(None, "href")]
     try:
         if url.startswith("http"):
-            validate_url(url)
+            _validate_url(url)
     except ValidationError:
         return None
     return attrs
 
 
-bleach_linker = bleach.Linker(
+_bleach_linker = bleach.Linker(
     callbacks=[check_url_validity],
-    url_re=bleach.linkifier.build_url_re(tlds=tlds_sorted, protocols=protocols),
+    url_re=bleach.linkifier.build_url_re(tlds=tlds_sorted, protocols=linkable_protocols),
     email_re=bleach.linkifier.build_email_re(tlds=tlds_sorted),  # type: ignore
     parse_email=True,
 )
 
 
+def linkify(text):
+    """Convert URL-ish substrings into HTML links
+    
+    This does no sanitization whatsoever. Caller must sanitize the input or output as
+    contextually appropriate. Do not call `mark_safe()` on the output if the input is
+    user-provided unless it has been sanitized or escaped.
+    """
+    return _bleach_linker.linkify(text)
+
+
 @keep_lazy(str)
 def xslugify(value):
     """
@@ -111,7 +111,7 @@ def fill(text, width):
     return "\n\n".join(wrapped)
 
 def wordwrap(text, width=80):
-    """Wraps long lines without loosing the formatting and indentation
+    """Wraps long lines without losing the formatting and indentation
        of short lines"""
     if not isinstance(text, str):
         return text
@@ -263,3 +263,21 @@ def parse_unicode(text):
     else:
         text = decoded_string
     return text
+
+
+def decode_document_content(content: bytes) -> str:
+    """Decode document contents as utf-8 or latin1
+    
+    Method was developed in DocumentInfo.text() where it gave acceptable results
+    for existing documents / RFCs.
+    """
+    try:
+        return content.decode("utf-8")
+    except UnicodeDecodeError:
+        pass
+    for back in range(1, 4):
+        try:
+            return content[:-back].decode("utf-8")
+        except UnicodeDecodeError:
+            pass
+    return content.decode("latin-1")  # everything is legal in latin-1
diff --git a/ietf/utils/timezone.py b/ietf/utils/timezone.py
index 723512efeb..e08dfa02f2 100644
--- a/ietf/utils/timezone.py
+++ b/ietf/utils/timezone.py
@@ -1,39 +1,106 @@
-import pytz
-import email.utils
 import datetime
+import random
+
+from typing import Union
+from zoneinfo import available_timezones, ZoneInfo
 
 from django.conf import settings
+from django.utils import timezone
+
+
+# Timezone constants - tempting to make these settings, but changing them will
+# require code changes.
+#
+# Default time zone for deadlines / expiration dates.
+DEADLINE_TZINFO = ZoneInfo('PST8PDT')
+
+# Time zone for dates from the RPC. This value is baked into the timestamps on DocEvents
+# of type="published_rfc" - see Document.pub_date() and ietf.sync.refceditor.update_docs_from_rfc_index()
+# for more information about how that works.
+RPC_TZINFO = ZoneInfo('PST8PDT')
+
+
+def _tzinfo(tz: Union[str, datetime.tzinfo, None]):
+    """Helper to convert a tz param into a tzinfo
+
+    Accepts a tzinfo or string containing a timezone name. Defaults to UTC if tz is None.
+    """
+    if tz is None:
+        return datetime.UTC
+    elif isinstance(tz, datetime.tzinfo):
+        return tz
+    else:
+        return ZoneInfo(tz)
+
+
+def make_aware(dt, tz):
+    """Assign timezone to a naive datetime
+
+    Helper to deal with both pytz and zoneinfo type time zones. Can go away when pytz is removed.
+    """
+    tzinfo = _tzinfo(tz)
+    if hasattr(tzinfo, 'localize'):
+        return tzinfo.localize(dt)  # pytz-style
+    else:
+        return dt.replace(tzinfo=tzinfo)  # zoneinfo- / datetime.timezone-style
+
+
+def datetime_from_date(date, tz=None):
+    """Get datetime at midnight on a given date"""
+    # accept either pytz or zoneinfo tzinfos until we get rid of pytz
+    return make_aware(datetime.datetime(date.year, date.month, date.day), _tzinfo(tz))
+
 
-def local_timezone_to_utc(d):
-    """Takes a naive datetime in the local timezone and returns a
-    naive datetime with the corresponding UTC time."""
-    local_timezone = pytz.timezone(settings.TIME_ZONE)
+def datetime_today(tz=None):
+    """Get a timezone-aware datetime representing midnight today
 
-    d = local_timezone.localize(d).astimezone(pytz.utc)
+    By default, uses settings.TIME_ZONE
+    For use with datetime fields representing a date.
+    """
+    if tz is None:
+        tz = settings.TIME_ZONE
+    return timezone.now().astimezone(_tzinfo(tz)).replace(hour=0, minute=0, second=0, microsecond=0)
 
-    return d.replace(tzinfo=None)
 
-def utc_to_local_timezone(d):
-    """Takes a naive datetime UTC and returns a naive datetime in the
-    local time zone."""
-    local_timezone = pytz.timezone(settings.TIME_ZONE)
+def date_today(tz=None):
+    """Get the date corresponding to the current moment
 
-    d = local_timezone.normalize(d.replace(tzinfo=pytz.utc).astimezone(local_timezone))
+    By default, uses settings.TIME_ZONE
+    Note that Dates are not themselves timezone aware.
+    """
+    if tz is None:
+        tz = settings.TIME_ZONE
+    return timezone.now().astimezone(_tzinfo(tz)).date()
 
-    return d.replace(tzinfo=None)
 
-def email_time_to_local_timezone(date_string):
-    """Takes a time string from an email and returns a naive datetime
-    in the local time zone."""
+def time_now(tz=None):
+    """Get the "wall clock" time corresponding to the current moment
 
-    t = email.utils.parsedate_tz(date_string)
-    d = datetime.datetime(*t[:6])
+    The value returned by this data is a Time with no tzinfo attached. (Time
+    objects have only limited timezone support, even if tzinfo is filled in,
+    and may not behave correctly when daylight savings time shifts are relevant.)
+    """
+    return timezone.now().astimezone(_tzinfo(tz)).time()
 
-    if t[7] != None:
-        d += datetime.timedelta(seconds=t[9])
 
-    return utc_to_local_timezone(d)
+def timezone_not_near_midnight():
+    """Get the name of a random timezone where it's not close to midnight
 
-def date2datetime(date, tz=pytz.utc):
-    return datetime.datetime(*(date.timetuple()[:6]), tzinfo=tz)
-    
+    Avoids midnight +/- 1 hour. Raises RuntimeError if it is unable to find
+    a time zone satisfying this constraint.
+    """
+    timezone_options = list(
+        available_timezones().difference(['Factory', 'localtime'])  # these two are not known to pytz
+    )
+    tzname = random.choice(timezone_options)
+    right_now = timezone.now().astimezone(ZoneInfo(tzname))
+    # Avoid the remote possibility of an infinite loop (might come up
+    # if there is a problem with the time zone library)
+    tries_left = 50
+    while right_now.hour < 1 or right_now.hour >= 23:
+        tzname = random.choice(timezone_options)
+        right_now = right_now.astimezone(ZoneInfo(tzname))
+        tries_left -= 1
+        if tries_left <= 0:
+            raise RuntimeError('Unable to find a time zone not near midnight')
+    return tzname
diff --git a/ietf/utils/unicodenormalize.py b/ietf/utils/unicodenormalize.py
new file mode 100644
index 0000000000..8644dbdb79
--- /dev/null
+++ b/ietf/utils/unicodenormalize.py
@@ -0,0 +1,9 @@
+# Copyright The IETF Trust 2025, All Rights Reserved
+import unicodedata
+
+def normalize_for_sorting(text):
+    """Normalize text for proper accent-aware sorting."""
+    # Normalize the text to NFD (decomposed form)
+    decomposed = unicodedata.normalize('NFD', text)
+    # Filter out combining diacritical marks
+    return ''.join(char for char in decomposed if not unicodedata.combining(char))
diff --git a/ietf/utils/urls.py b/ietf/utils/urls.py
index 7f46d9c431..6abda9b973 100644
--- a/ietf/utils/urls.py
+++ b/ietf/utils/urls.py
@@ -6,12 +6,14 @@
 
 from inspect import isclass
 
-from django.conf.urls import url as django_url
-from django.views.generic import View
+from django.urls import re_path
 from django.utils.encoding import force_str
+from django.views.generic import View
 
 def url(regex, view, kwargs=None, name=None):
-    if callable(view) and hasattr(view, '__name__'):
+    if hasattr(view, "view_class"):
+        view_name = "%s.%s" % (view.__module__, view.view_class.__name__)
+    elif callable(view) and hasattr(view, '__name__'):
         view_name = "%s.%s" % (view.__module__, view.__name__)
     else:
         view_name = regex
@@ -42,5 +44,5 @@ def url(regex, view, kwargs=None, name=None):
         #debug.show('branch')
         #debug.show('name')
         pass
-    return django_url(regex, view, kwargs=kwargs, name=name)
+    return re_path(regex, view, kwargs=kwargs, name=name)
     
diff --git a/ietf/utils/validators.py b/ietf/utils/validators.py
index 7b599b7436..a99de72724 100644
--- a/ietf/utils/validators.py
+++ b/ietf/utils/validators.py
@@ -4,6 +4,8 @@
 
 import os
 import re
+from email.utils import parseaddr
+
 from pyquery import PyQuery
 from urllib.parse import urlparse, urlsplit, urlunsplit
 
@@ -11,10 +13,17 @@
 from django.apps import apps
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.core.validators import RegexValidator, URLValidator, EmailValidator, _lazy_re_compile, BaseValidator
+from django.core.validators import (
+    RegexValidator,
+    URLValidator,
+    BaseValidator,
+    validate_email,
+    ProhibitNullCharactersValidator,
+)
 from django.template.defaultfilters import filesizeformat
 from django.utils.deconstruct import deconstructible
 from django.utils.ipv6 import is_valid_ipv6_address
+from django.utils.regex_helper import _lazy_re_compile  # type: ignore
 from django.utils.translation import gettext_lazy as _
 
 import debug                            # pyflakes:ignore
@@ -24,8 +33,9 @@
 # Note that this is an instantiation of the regex validator, _not_ the
 # regex-string validator defined right below
 validate_no_control_chars = RegexValidator(
-                                    regex="^[^\x00-\x1f]*$",
-                                    message="Please enter a string without control characters." )
+    regex="^[^\x01-\x1f]*$",
+    message="Please enter a string without control characters.",
+)
 
 
 @deconstructible
@@ -59,6 +69,7 @@ def __ne__(self, other):
 
 validate_regular_expression_string = RegexStringValidator()
 
+
 def validate_file_size(file, missing_ok=False):
     try:
         size = file.size
@@ -68,12 +79,18 @@ def validate_file_size(file, missing_ok=False):
         else:
             raise
 
-    if size > settings.SECR_MAX_UPLOAD_SIZE:
-        raise ValidationError('Please keep filesize under %s. Requested upload size was %s' % (filesizeformat(settings.SECR_MAX_UPLOAD_SIZE), filesizeformat(file.size)))
+    if size > settings.DATATRACKER_MAX_UPLOAD_SIZE:
+        raise ValidationError(
+            "Please keep filesize under {}. Requested upload size was {}".format(
+                filesizeformat(settings.DATATRACKER_MAX_UPLOAD_SIZE),
+                filesizeformat(file.size)
+            )
+        )
+
 
 def validate_mime_type(file, valid, missing_ok=False):
     try:
-        file.open()
+        file.open() # Callers expect this to remain open. Consider refactoring.
     except FileNotFoundError:
         if missing_ok:
             return None, None
@@ -128,8 +145,17 @@ def validate_no_html_frame(file):
 # instantiations of sub-validiators used by the external_resource validator
 
 validate_url = URLValidator()
-validate_http_url = URLValidator(schemes=['http','https'])
-validate_email = EmailValidator()
+validate_http_url = URLValidator(schemes=["http", "https"])
+validate_no_nulls = ProhibitNullCharactersValidator()
+
+
+def validate_mailbox_address(s):
+    """Validate an RFC 5322 'mailbox' (e.g., "Some Person" <some@example.com>)"""
+    # parseaddr() returns ("", "") on err; validate_email() will reject that for us
+    name, addr = parseaddr(s)
+    validate_no_nulls(name)  # could be stricter...
+    validate_email(addr)
+
 
 def validate_ipv6_address(value):
     if not is_valid_ipv6_address(value):
diff --git a/ietf/utils/xmldraft.py b/ietf/utils/xmldraft.py
index 15bf745cc5..325b8499a9 100644
--- a/ietf/utils/xmldraft.py
+++ b/ietf/utils/xmldraft.py
@@ -1,16 +1,35 @@
-# Copyright The IETF Trust 2022, All Rights Reserved
+# Copyright The IETF Trust 2022-2025, All Rights Reserved
 # -*- coding: utf-8 -*-
+import datetime
 import io
 import re
 import xml2rfc
 
 import debug  # pyflakes: ignore
 
-from contextlib import ExitStack
+from contextlib import contextmanager
+from lxml.etree import XMLSyntaxError
+from xml2rfc.util.date import augment_date, extract_date
+from ietf.utils.timezone import date_today
 
 from .draft import Draft
 
 
+@contextmanager
+def capture_xml2rfc_output():
+    orig_write_out = xml2rfc.log.write_out
+    orig_write_err = xml2rfc.log.write_err
+    parser_out = io.StringIO()
+    parser_err = io.StringIO()
+    xml2rfc.log.write_out = parser_out
+    xml2rfc.log.write_err = parser_err
+    try:
+        yield {"stdout": parser_out, "stderr": parser_err}
+    finally:
+        xml2rfc.log.write_out = orig_write_out
+        xml2rfc.log.write_err = orig_write_err
+
+
 class XMLDraft(Draft):
     """Draft from XML source
 
@@ -25,7 +44,7 @@ def __init__(self, xml_file):
         # cast xml_file to str so, e.g., this will work with a Path
         self.xmltree, self.xml_version = self.parse_xml(str(xml_file))
         self.xmlroot = self.xmltree.getroot()
-        self.filename, self.revision = self._parse_docname()
+        self.filename, self.revision = self.parse_docname(self.xmlroot)
 
     @staticmethod
     def parse_xml(filename):
@@ -34,25 +53,18 @@ def parse_xml(filename):
         Converts to xml2rfc v3 schema, then returns the root of the v3 tree and the original
         xml version.
         """
-        orig_write_out = xml2rfc.log.write_out
-        orig_write_err = xml2rfc.log.write_err
-        parser_out = io.StringIO()
-        parser_err = io.StringIO()
-
-        with ExitStack() as stack:
-            @stack.callback
-            def cleanup():  # called when context exited, even if there's an exception
-                xml2rfc.log.write_out = orig_write_out
-                xml2rfc.log.write_err = orig_write_err
-
-            xml2rfc.log.write_out = parser_out
-            xml2rfc.log.write_err = parser_err
 
+        with capture_xml2rfc_output() as parser_logs:
             parser = xml2rfc.XmlRfcParser(filename, quiet=True)
             try:
                 tree = parser.parse()
+            except XMLSyntaxError:
+                raise InvalidXMLError()
             except Exception as e:
-                raise XMLParseError(parser_out.getvalue(), parser_err.getvalue()) from e
+                raise XMLParseError(
+                    parser_logs["stdout"].getvalue(),
+                    parser_logs["stderr"].getvalue(),
+                ) from e
 
             xml_version = tree.getroot().get('version', '2')
             if xml_version == '2':
@@ -60,17 +72,59 @@ def cleanup():  # called when context exited, even if there's an exception
                 tree.tree = v2v3.convert2to3()
         return tree, xml_version
 
-    def _document_name(self, anchor):
-        """Guess document name from reference anchor
+    def _document_name(self, ref):
+        """Get document name from reference."""
+        series = ["rfc", "bcp", "fyi", "std"]
+        # handle xinclude first
+        # FIXME: this assumes the xinclude is a bibxml href; if it isn't, there can
+        # still be false negatives. it would be better to expand the xinclude and parse
+        # its seriesInfo.
+        if ref.tag.endswith("}include"):
+            name = re.search(
+                rf"reference\.({'|'.join(series).upper()})\.(\d{{4}})\.xml",
+                ref.attrib["href"],
+            )
+            if name:
+                return f"{name.group(1)}{int(name.group(2))}".lower()
+            name = re.search(
+                r"reference\.I-D\.(?:draft-)?(.*)\.xml", ref.attrib["href"]
+            )
+            if name:
+                return f"draft-{name.group(1)}"
+            # can't extract the name, give up
+            return ""
 
-        Looks for series numbers and removes leading 0s from the number.
-        """
-        anchor = anchor.lower()  # always give back lowercase
-        label = anchor.rstrip('0123456789')  # remove trailing digits
-        if label in ['rfc', 'bcp', 'fyi', 'std']:
-            number = int(anchor[len(label):])
-            return f'{label}{number}'
-        return anchor
+        # check the anchor next
+        anchor = ref.get("anchor").lower()  # always give back lowercase
+        label = anchor.rstrip("0123456789")  # remove trailing digits
+        maybe_number = anchor[len(label) :]
+        if label in series and maybe_number.isdigit():
+            number = int(maybe_number)
+            return f"{label}{number}"
+
+        target = ref.get("target")
+        if isinstance(target, str):
+            target = target.lower()
+            if target.startswith("https://datatracker.ietf.org/doc/"):
+                # len("https://datatracker.ietf.org/doc/")==33
+                m = re.match(r"^(draft-[a-z0-9-]*[a-z0-9])([/-]\d{2})?/?$",target[33:])
+                if m:
+                    name = m.group(1)
+                    return name
+
+
+        # if we couldn't find a match so far, try the seriesInfo
+        series_query = " or ".join(f"@name='{x.upper()}'" for x in series)
+        for info in ref.xpath(
+            f"./seriesInfo[{series_query} or @name='Internet-Draft']"
+        ):
+            if not info.attrib["value"]:
+                continue
+            if info.attrib["name"] == "Internet-Draft":
+                return info.attrib["value"]
+            else:
+                return f'{info.attrib["name"].lower()}{info.attrib["value"]}'
+        return ""
 
     def _reference_section_type(self, section_name):
         """Determine reference type from name of references section"""
@@ -88,8 +142,11 @@ def _reference_section_name(self, section_elt):
             section_name = section_elt.get('title')  # fall back to title if we have it
         return section_name
 
-    def _parse_docname(self):
-        docname = self.xmlroot.attrib.get('docName')
+    @staticmethod
+    def parse_docname(xmlroot):
+        docname = xmlroot.attrib.get('docName')
+        if docname is None:
+            raise ValueError("Missing docName attribute in the XML root element")
         revmatch = re.match(
             r'^(?P<filename>.+?)(?:-(?P<rev>[0-9][0-9]))?$',
             docname,
@@ -101,7 +158,62 @@ def _parse_docname(self):
         return revmatch.group('filename'), revmatch.group('rev')
 
     def get_title(self):
-        return self.xmlroot.findtext('front/title').strip()
+        title_text = self.xmlroot.findtext('front/title')
+        return "" if title_text is None else title_text.strip()
+
+    @staticmethod
+    def parse_creation_date(date_elt):
+        if date_elt is None:
+            return None
+
+        today = date_today()
+
+        # Outright reject non-numeric year / day (xml2rfc's extract_date does not do this)
+        # (n.b., "year" can be non-numeric in a <reference> section per RFC 7991)
+        year = date_elt.get("year")
+        day = date_elt.get("day")
+        non_numeric_year = year and not year.isdigit()
+        non_numeric_day = day and not day.isdigit()
+        if non_numeric_day or non_numeric_year:
+            raise InvalidMetadataError(
+                "Unable to parse the <date> element in the <front> section: "
+                "year and day must be numeric values if specified."
+            )
+
+        try:
+            # ths mimics handling of date elements in the xml2rfc text/html writers
+            year, month, day = extract_date(date_elt, today)
+            year, month, day = augment_date(year, month, day, today)
+        except Exception as err:
+            # Give a generic error if anything goes wrong so far...
+            raise InvalidMetadataError(
+                "Unable to parse the <date> element in the <front> section."
+            ) from err
+
+        if not day:
+            # Must choose a day for a datetime.date. Per RFC 7991 sect 2.17, we use
+            # today's date if it is consistent with the rest of the date. Otherwise,
+            # arbitrariy (and consistent with the text parser) assume the 15th.
+            if year == today.year and month == today.month:
+                day = today.day
+            else:
+                day = 15
+
+        try:
+            creation_date = datetime.date(year, month, day)
+        except Exception:
+            # If everything went well, we should have had a valid datetime, but we didn't.
+            # The parsing _worked_ but not in a way that we can go forward with.
+            raise InvalidMetadataError(
+                "The <date> element in the <front> section specified an incomplete date "
+                "that was not consistent with today's date. If you specify only a year, "
+                "it must be the four-digit current year. To use today's date, omit the "
+                "date tag or use <date/>."
+            )
+        return creation_date
+
+    def get_creation_date(self):
+        return self.parse_creation_date(self.xmlroot.find("front/date"))
 
     # todo fix the implementation of XMLDraft.get_abstract()
     #
@@ -118,6 +230,35 @@ def get_title(self):
     #     abstract = self.xmlroot.findtext('front/abstract')
     #     return abstract.strip() if abstract else ''
 
+    @staticmethod
+    def render_author_name(author_elt):
+        """Get a displayable name for an author, if possible
+        
+        Based on TextWriter.render_author_name() from xml2rfc. If fullname is present, uses that.
+        If not, uses either initials + surname or just surname. Finally, returns None because this
+        author is evidently an organization, not a person.
+        
+        Does not involve ascii* attributes because rfc7991 requires fullname if any of those are
+        present.
+        """
+        # Use fullname attribute, if present
+        fullname = author_elt.attrib.get("fullname", "").strip()
+        if fullname:
+            # If any 8bit chars in the fullname, try to append the author's
+            # name in ascii.
+            if any([x >= 0x80 for x in fullname.encode('utf8')]):
+                asciifullname = author_elt.attrib.get("asciiFullname", "").strip()
+                if asciifullname:
+                    fullname = fullname + ' (' + asciifullname + ')'
+            return fullname
+        surname = author_elt.attrib.get("surname", "").strip()
+        initials = author_elt.attrib.get("initials", "").strip()
+        if surname or initials:
+            # This allows the possibility that only initials are used, which is a bit nonsensical
+            # but seems to be technically allowed by RFC 7991.
+            return f"{initials} {surname}".strip()
+        return None
+        
     def get_author_list(self):
         """Get detailed author list
 
@@ -136,7 +277,7 @@ def get_author_list(self):
 
         for author in self.xmlroot.findall('front/author'):
             info = {
-                'name': author.attrib.get('fullname'),
+                'name': self.render_author_name(author),
                 'email': author.findtext('address/email'),
                 'affiliation': author.findtext('organization'),
             }
@@ -154,10 +295,20 @@ def get_refs(self):
         """Extract references from the draft"""
         refs = {}
         # accept nested <references> sections
-        for section in self.xmlroot.findall('back//references'):
-            ref_type = self._reference_section_type(self._reference_section_name(section))
-            for ref in (section.findall('./reference') + section.findall('./referencegroup')):
-                refs[self._document_name(ref.get('anchor'))] = ref_type
+        for section in self.xmlroot.findall("back//references"):
+            ref_type = self._reference_section_type(
+                self._reference_section_name(section)
+            )
+            for ref in (
+                section.findall("./reference")
+                + section.findall("./referencegroup")
+                + section.findall(
+                    "./xi:include", {"xi": "http://www.w3.org/2001/XInclude"}
+                )
+            ):
+                name = self._document_name(ref)
+                if name:
+                    refs[name] = ref_type
         return refs
 
 
@@ -170,3 +321,12 @@ def __init__(self, out: str, err: str, *args):
 
     def parser_msgs(self):
         return self._out.splitlines() + self._err.splitlines()
+
+
+class InvalidXMLError(Exception):
+    """File is not valid XML"""
+    pass
+
+
+class InvalidMetadataError(Exception):
+    """XML is well-formed but has invalid metadata"""
diff --git a/ietf/wsgi.py b/ietf/wsgi.py
index c43334874b..bd17da5ba0 100644
--- a/ietf/wsgi.py
+++ b/ietf/wsgi.py
@@ -1,23 +1,17 @@
-# Copyright The IETF Trust 2013-2021, All Rights Reserved
+# Copyright The IETF Trust 2013-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-
 import os
 import sys
-import syslog
 
 path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-syslog.openlog(str("datatracker"), syslog.LOG_PID, syslog.LOG_USER)
-
 if not path in sys.path:
     sys.path.insert(0, path)
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
 
-syslog.syslog("Starting datatracker wsgi instance")
-
 from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
 
+application = get_wsgi_application()
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 0000000000..da44ff2fb2
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "ES6",
+    
+  },
+  "exclude": [
+    "node_modules",
+    ".yarn",
+    ".vite"
+  ],
+  "include": [
+    "client/**/*",
+    "playwright/**/*"
+  ],
+  "vueCompilerOptions": {
+    "target": 3,
+    "plugins": [
+      "@vue/language-plugin-pug"
+    ]
+  }
+}
diff --git a/k8s/README.md b/k8s/README.md
new file mode 100644
index 0000000000..3966101ab8
--- /dev/null
+++ b/k8s/README.md
@@ -0,0 +1,5 @@
+# Kustomize deployment
+
+## Run locally
+
+The `secrets.yaml` file is provided as a reference only and must be referenced manually in the `kustomization.yaml` file.
\ No newline at end of file
diff --git a/k8s/auth.yaml b/k8s/auth.yaml
new file mode 100644
index 0000000000..2bdb064447
--- /dev/null
+++ b/k8s/auth.yaml
@@ -0,0 +1,148 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: auth
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: auth
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: auth
+    spec:
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        # -----------------------------------------------------
+        # Auth Container
+        # -----------------------------------------------------
+        - name: auth
+          image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG"
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: dt-vol
+              mountPath: /a
+            - name: dt-tmp
+              mountPath: /tmp
+            - name: dt-home
+              mountPath: /home/datatracker
+            - name: dt-xml2rfc-cache
+              mountPath: /var/cache/xml2rfc
+            - name: dt-cfg
+              mountPath: /workspace/ietf/settings_local.py
+              subPath: settings_local.py
+          env:
+            - name: "CONTAINER_ROLE"
+              value: "datatracker"
+            # ensures the pod gets recreated on every deploy:
+            - name: "DEPLOY_UID"
+              value: "$DEPLOY_UID"
+          envFrom:
+            - secretRef:
+                name: dt-secrets-env
+          startupProbe:
+            httpGet:
+              port: 8000
+              path: /health/
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            failureThreshold: 30
+            timeoutSeconds: 3
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+            runAsUser: 1000
+            runAsGroup: 1000
+        # -----------------------------------------------------
+        # Nginx Container
+        # -----------------------------------------------------
+        - name: nginx
+          image: "ghcr.io/nginxinc/nginx-unprivileged:1.27"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8080
+              name: http
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              port: 8080
+              path: /health/nginx
+          securityContext:
+            readOnlyRootFilesystem: true
+          volumeMounts:
+            - name: nginx-tmp
+              mountPath: /tmp
+            - name: dt-cfg
+              mountPath: /etc/nginx/conf.d/00logging.conf
+              subPath: nginx-logging.conf
+            - name: dt-cfg
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: nginx-auth.conf
+        # -----------------------------------------------------
+        # ScoutAPM Container
+        # -----------------------------------------------------
+        - name: scoutapm
+          image: "scoutapp/scoutapm:version-1.4.0"
+          imagePullPolicy: IfNotPresent
+          # Replace command with one that will shut down on a TERM signal
+          # The ./core-agent start command line is from the scoutapm docker image
+          command:
+            - "sh"
+            - "-c"
+            - >-
+              trap './core-agent shutdown --tcp 0.0.0.0:6590' TERM;
+              ./core-agent start --daemonize false --log-level debug --tcp 0.0.0.0:6590 &
+              wait $!
+          livenessProbe:
+            exec:
+              command:
+                - "sh"
+                - "-c"
+                - "./core-agent probe --tcp 0.0.0.0:6590 | grep -q 'Agent found'"
+          securityContext:
+            readOnlyRootFilesystem: true
+            runAsUser: 65534 # "nobody" user by default
+            runAsGroup: 65534  # "nogroup" group by default
+      volumes:
+        # To be overriden with the actual shared volume
+        - name: dt-vol
+        - name: dt-tmp
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-xml2rfc-cache
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-home
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-cfg
+          configMap:
+            name: files-cfgmap
+        - name: nginx-tmp
+          emptyDir:
+            sizeLimit: "500Mi"
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 60
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: auth
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: auth
diff --git a/k8s/beat.yaml b/k8s/beat.yaml
new file mode 100644
index 0000000000..b4291c7e31
--- /dev/null
+++ b/k8s/beat.yaml
@@ -0,0 +1,62 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: beat
+  labels:
+    deleteBeforeUpgrade: yes
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: beat
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: beat
+    spec:
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        # -----------------------------------------------------
+        # Beat Container
+        # -----------------------------------------------------
+        - name: beat
+          image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG"
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: dt-vol
+              mountPath: /a
+            - name: dt-tmp
+              mountPath: /tmp
+            - name: dt-cfg
+              mountPath: /workspace/ietf/settings_local.py
+              subPath: settings_local.py
+          env:
+            - name: "CONTAINER_ROLE"
+              value: "beat"
+          envFrom:
+            - secretRef:
+                name: dt-secrets-env
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+            runAsUser: 1000
+            runAsGroup: 1000
+      volumes:
+        # To be overridden with the actual shared volume
+        - name: dt-vol
+        - name: dt-tmp
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-cfg
+          configMap:
+            name: files-cfgmap
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 10
diff --git a/k8s/celery.yaml b/k8s/celery.yaml
new file mode 100644
index 0000000000..2f4c0fd439
--- /dev/null
+++ b/k8s/celery.yaml
@@ -0,0 +1,97 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: celery
+  labels:
+    deleteBeforeUpgrade: yes
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: celery
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: celery
+    spec:
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        # -----------------------------------------------------
+        # Celery Container
+        # -----------------------------------------------------
+        - name: celery
+          image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG"
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: dt-vol
+              mountPath: /a
+            - name: dt-tmp
+              mountPath: /tmp
+            - name: dt-home
+              mountPath: /home/datatracker
+            - name: dt-xml2rfc-cache
+              mountPath: /var/cache/xml2rfc
+            - name: dt-cfg
+              mountPath: /workspace/ietf/settings_local.py
+              subPath: settings_local.py
+          env:
+            - name: "CONTAINER_ROLE"
+              value: "celery"
+          envFrom:
+            - secretRef:
+                name: dt-secrets-env
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+            runAsUser: 1000
+            runAsGroup: 1000
+        # -----------------------------------------------------
+        # ScoutAPM Container
+        # -----------------------------------------------------
+        - name: scoutapm
+          image: "scoutapp/scoutapm:version-1.4.0"
+          imagePullPolicy: IfNotPresent
+          # Replace command with one that will shut down on a TERM signal
+          # The ./core-agent start command line is from the scoutapm docker image
+          command:
+            - "sh"
+            - "-c"
+            - >-
+              trap './core-agent shutdown --tcp 0.0.0.0:6590' TERM;
+              ./core-agent start --daemonize false --log-level debug --tcp 0.0.0.0:6590 &
+              wait $!
+          livenessProbe:
+            exec:
+              command:
+                - "sh"
+                - "-c"
+                - "./core-agent probe --tcp 0.0.0.0:6590 | grep -q 'Agent found'"
+          securityContext:
+            readOnlyRootFilesystem: true
+            runAsUser: 65534 # "nobody" user by default
+            runAsGroup: 65534  # "nogroup" group by default
+      volumes:
+        # To be overridden with the actual shared volume
+        - name: dt-vol
+        - name: dt-tmp
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-xml2rfc-cache
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-home
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-cfg
+          configMap:
+            name: files-cfgmap
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 600
diff --git a/k8s/datatracker.yaml b/k8s/datatracker.yaml
new file mode 100644
index 0000000000..50a2c69687
--- /dev/null
+++ b/k8s/datatracker.yaml
@@ -0,0 +1,179 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: datatracker
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: datatracker
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: datatracker
+    spec:
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        # -----------------------------------------------------
+        # Datatracker Container
+        # -----------------------------------------------------
+        - name: datatracker
+          image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG"
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: dt-vol
+              mountPath: /a
+            - name: dt-tmp
+              mountPath: /tmp
+            - name: dt-home
+              mountPath: /home/datatracker
+            - name: dt-xml2rfc-cache
+              mountPath: /var/cache/xml2rfc
+            - name: dt-cfg
+              mountPath: /workspace/ietf/settings_local.py
+              subPath: settings_local.py
+          env:
+            - name: "CONTAINER_ROLE"
+              value: "datatracker"
+            # ensures the pod gets recreated on every deploy:
+            - name: "DEPLOY_UID"
+              value: "$DEPLOY_UID"
+          envFrom:
+            - secretRef:
+                name: dt-secrets-env
+          startupProbe:
+            httpGet:
+              port: 8000
+              path: /health/
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            failureThreshold: 30
+            timeoutSeconds: 3
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+            runAsUser: 1000
+            runAsGroup: 1000
+        # -----------------------------------------------------
+        # Nginx Container
+        # -----------------------------------------------------
+        - name: nginx
+          image: "ghcr.io/nginxinc/nginx-unprivileged:1.27"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8080
+              name: http
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              port: 8080
+              path: /health/nginx
+          securityContext:
+            readOnlyRootFilesystem: true
+          volumeMounts:
+            - name: nginx-tmp
+              mountPath: /tmp
+            - name: dt-cfg
+              mountPath: /etc/nginx/conf.d/00logging.conf
+              subPath: nginx-logging.conf
+            - name: dt-cfg
+              # Replaces the original default.conf
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: nginx-datatracker.conf
+        # -----------------------------------------------------
+        # ScoutAPM Container
+        # -----------------------------------------------------
+        - name: scoutapm
+          image: "scoutapp/scoutapm:version-1.4.0"
+          imagePullPolicy: IfNotPresent
+          # Replace command with one that will shut down on a TERM signal
+          # The ./core-agent start command line is from the scoutapm docker image
+          command:
+            - "sh"
+            - "-c"
+            - >-
+              trap './core-agent shutdown --tcp 0.0.0.0:6590' TERM;
+              ./core-agent start --daemonize false --log-level debug --tcp 0.0.0.0:6590 &
+              wait $!
+          livenessProbe:
+            exec:
+              command:
+                - "sh"
+                - "-c"
+                - "./core-agent probe --tcp 0.0.0.0:6590 | grep -q 'Agent found'"
+          securityContext:
+            readOnlyRootFilesystem: true
+            runAsUser: 65534 # "nobody" user by default
+            runAsGroup: 65534  # "nogroup" group by default
+      initContainers:
+        - name: migration
+          image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG"
+          imagePullPolicy: Always
+          env:
+            - name: "CONTAINER_ROLE"
+              value: "migrations"
+          envFrom:
+            - secretRef:
+                name: dt-secrets-env
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+            runAsUser: 1000
+            runAsGroup: 1000
+          volumeMounts:
+            - name: dt-vol
+              mountPath: /a
+            - name: dt-tmp
+              mountPath: /tmp
+            - name: dt-home
+              mountPath: /home/datatracker
+            - name: dt-xml2rfc-cache
+              mountPath: /var/cache/xml2rfc
+            - name: dt-cfg
+              mountPath: /workspace/ietf/settings_local.py
+              subPath: settings_local.py
+      volumes:
+        # To be overriden with the actual shared volume
+        - name: dt-vol
+        - name: dt-tmp
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-xml2rfc-cache
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-home
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-cfg
+          configMap:
+            name: files-cfgmap
+        - name: nginx-tmp
+          emptyDir:
+            sizeLimit: "500Mi"
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 60
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: datatracker
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: datatracker
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
new file mode 100644
index 0000000000..769cb03517
--- /dev/null
+++ b/k8s/kustomization.yaml
@@ -0,0 +1,17 @@
+namespace: datatracker
+namePrefix: dt-
+configMapGenerator:
+  - name: files-cfgmap
+    files:
+      - nginx-logging.conf
+      - nginx-auth.conf
+      - nginx-datatracker.conf
+      - settings_local.py
+resources:
+  - auth.yaml
+  - beat.yaml
+  - celery.yaml
+  - datatracker.yaml
+  - memcached.yaml
+  - rabbitmq.yaml
+  - replicator.yaml
diff --git a/k8s/memcached.yaml b/k8s/memcached.yaml
new file mode 100644
index 0000000000..5a4c9f0aed
--- /dev/null
+++ b/k8s/memcached.yaml
@@ -0,0 +1,80 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: memcached
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: memcached
+  template:
+    metadata:
+      labels:
+        app: memcached
+    spec:
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        # -----------------------------------------------------
+        # Memcached
+        # -----------------------------------------------------
+        - image: "memcached:1.6-alpine"
+          imagePullPolicy: IfNotPresent
+          args: ["-m", "1024"]
+          name: memcached
+          ports:
+            - name: memcached
+              containerPort: 11211
+              protocol: TCP
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+            # memcached image sets up uid/gid 11211
+            runAsUser: 11211
+            runAsGroup: 11211
+        # -----------------------------------------------------
+        # Memcached Exporter for Prometheus
+        # -----------------------------------------------------
+        - image: "quay.io/prometheus/memcached-exporter:v0.14.3"
+          imagePullPolicy: IfNotPresent
+          name: memcached-exporter
+          ports:
+            - name: metrics
+              containerPort: 9150
+              protocol: TCP
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+            runAsUser: 65534  # nobody
+            runAsGroup: 65534  # nobody
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: memcached
+  annotations:
+    k8s.grafana.com/scrape: "true"  # this is not a bool
+    k8s.grafana.com/metrics.portName: "metrics"
+spec:
+  type: ClusterIP
+  ports:
+    - port: 11211
+      targetPort: memcached
+      protocol: TCP
+      name: memcached
+    - port: 9150
+      targetPort: metrics
+      protocol: TCP
+      name: metrics
+  selector:
+    app: memcached
diff --git a/k8s/nginx-auth.conf b/k8s/nginx-auth.conf
new file mode 100644
index 0000000000..95aa838064
--- /dev/null
+++ b/k8s/nginx-auth.conf
@@ -0,0 +1,42 @@
+server {
+    listen 8080 default_server;
+    server_name _;
+
+    # Replace default "main" formatter with the ietfjson formatter from nginx-logging.conf
+    access_log  /var/log/nginx/access.log  ietfjson;
+
+    # Note that regex location matches take priority over non-regex "prefix" matches. Use regexes so that
+    # our deny all rule does not squelch the other locations. 
+    location ~ ^/health/nginx$ {
+        access_log off;
+        return 200;
+    }
+
+    location ~ ^/robots.txt$ {
+        add_header Content-Type text/plain;
+        return 200 "User-agent: *\nDisallow: /\n";
+    }
+
+    location ~ ^/accounts/create.* {
+        return 302 https://datatracker.ietf.org/accounts/create;
+    }
+
+    # n.b. (?!...) is a negative lookahead group
+    location ~ ^(/(?!(api/openid/|accounts/login/|accounts/logout/|accounts/reset/|person/.*/photo|group/groupmenu.json)).*) {
+        return 302 https://datatracker.ietf.org$${keepempty}request_uri;
+    }
+
+    location / {
+        add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' data: https://datatracker.ietf.org/ https://www.ietf.org/ http://ietf.org/ https://analytics.ietf.org https://static.ietf.org; frame-ancestors 'self' ietf.org *.ietf.org meetecho.com *.meetecho.com gather.town *.gather.town";
+        proxy_set_header Host $${keepempty}host;
+        proxy_set_header Connection close;
+        proxy_set_header X-Request-Start "t=$${keepempty}msec";
+        proxy_set_header X-Forwarded-For $${keepempty}proxy_add_x_forwarded_for;
+        proxy_hide_header X-Datatracker-Is-Authenticated; # hide this from the outside world
+        proxy_pass http://localhost:8000;
+        # Set timeouts longer than Cloudflare proxy limits
+        proxy_connect_timeout 60;  # nginx default (Cf = 15)
+        proxy_read_timeout 120;  # nginx default = 60 (Cf = 100) 
+        proxy_send_timeout 60;  # nginx default = 60 (Cf = 30)
+    }
+}
diff --git a/k8s/nginx-datatracker.conf b/k8s/nginx-datatracker.conf
new file mode 100644
index 0000000000..882d7563c2
--- /dev/null
+++ b/k8s/nginx-datatracker.conf
@@ -0,0 +1,32 @@
+server {
+    listen 8080 default_server;
+    server_name _;
+
+    # Replace default "main" formatter with the ietfjson formatter from nginx-logging.conf
+    access_log  /var/log/nginx/access.log  ietfjson;
+
+    location /health/nginx {
+        access_log off;
+        return 200;
+    }
+
+    location /robots.txt {
+        add_header Content-Type text/plain;
+        return 200 "User-agent: *\nDisallow: /doc/pdf/\n";
+    }
+
+    location / {
+        add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' data: https://datatracker.ietf.org/ https://www.ietf.org/ http://ietf.org/ https://analytics.ietf.org https://static.ietf.org; frame-ancestors 'self' ietf.org *.ietf.org meetecho.com *.meetecho.com";
+        proxy_set_header Host $${keepempty}host;
+        proxy_set_header Connection close;
+        proxy_set_header X-Request-Start "t=$${keepempty}msec";
+        proxy_set_header X-Forwarded-For $${keepempty}proxy_add_x_forwarded_for;
+        proxy_hide_header X-Datatracker-Is-Authenticated; # hide this from the outside world
+        proxy_pass http://localhost:8000;
+        # Set timeouts longer than Cloudflare proxy limits
+        proxy_connect_timeout 60;  # nginx default (Cf = 15)
+        proxy_read_timeout 120;  # nginx default = 60 (Cf = 100) 
+        proxy_send_timeout 60;  # nginx default = 60 (Cf = 30)
+        client_max_body_size 0;  # disable size check
+    }
+}
diff --git a/k8s/nginx-logging.conf b/k8s/nginx-logging.conf
new file mode 100644
index 0000000000..673d7a29ab
--- /dev/null
+++ b/k8s/nginx-logging.conf
@@ -0,0 +1,22 @@
+# Define JSON log format - must be loaded before config that references it.
+# Note that each line is fully enclosed in single quotes. Commas in arrays are
+# intentionally inside the single quotes.
+log_format  ietfjson  escape=json
+  '{'
+    '"time":"$${keepempty}time_iso8601",'
+    '"remote_ip":"$${keepempty}remote_addr",'
+    '"request":"$${keepempty}request",'
+    '"host":"$${keepempty}host",'
+    '"path":"$${keepempty}request_uri",'
+    '"method":"$${keepempty}request_method",'
+    '"status":"$${keepempty}status",'
+    '"len_bytes":"$${keepempty}body_bytes_sent",'
+    '"duration_s":"$${keepempty}request_time",'
+    '"referer":"$${keepempty}http_referer",'
+    '"user_agent":"$${keepempty}http_user_agent",'
+    '"x_forwarded_for":"$${keepempty}http_x_forwarded_for",'
+    '"x_forwarded_proto":"$${keepempty}http_x_forwarded_proto",'
+    '"cf_connecting_ip":"$${keepempty}http_cf_connecting_ip",'
+    '"cf_ray":"$${keepempty}http_cf_ray",'
+    '"asn":"$${keepempty}http_x_ip_src_asnum"'
+  '}';
diff --git a/k8s/rabbitmq.yaml b/k8s/rabbitmq.yaml
new file mode 100644
index 0000000000..346b54c93e
--- /dev/null
+++ b/k8s/rabbitmq.yaml
@@ -0,0 +1,178 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: rabbitmq
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: rabbitmq
+  template:
+    metadata:
+      labels:
+        app: rabbitmq
+    spec:
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        # -----------------------------------------------------
+        # RabbitMQ Container
+        # -----------------------------------------------------
+        - image: "ghcr.io/ietf-tools/datatracker-mq:3.13-alpine"
+          imagePullPolicy: Always
+          name: rabbitmq
+          ports:
+            - name: amqp
+              containerPort: 5672
+              protocol: TCP
+          volumeMounts:
+            - name: rabbitmq-data
+              mountPath: /var/lib/rabbitmq
+              subPath: "rabbitmq"
+            - name: rabbitmq-tmp
+              mountPath: /tmp
+            - name: rabbitmq-config
+              mountPath: "/etc/rabbitmq"
+          env:
+            - name: CELERY_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: dt-secrets-env
+                  key: CELERY_PASSWORD
+          livenessProbe:
+            exec:
+              command: ["rabbitmq-diagnostics", "-q", "ping", "-t", "30"]
+            periodSeconds: 30
+            timeoutSeconds: 35  # slightly longer than ping "-t" option
+          startupProbe:
+            initialDelaySeconds: 15
+            periodSeconds: 5
+            timeoutSeconds: 35  # slightly longer than ping "-t" option
+            successThreshold: 1
+            failureThreshold: 60
+            exec:
+              command: ["rabbitmq-diagnostics", "-q", "ping", "-t", "30"]
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+            # rabbitmq image sets up uid/gid 100/101
+            runAsUser: 100
+            runAsGroup: 101
+      initContainers:
+        # -----------------------------------------------------
+        # Init RabbitMQ data
+        # -----------------------------------------------------
+        - name: init-rabbitmq
+          image: busybox:stable
+          command:
+            - "sh"
+            - "-c"
+            - "mkdir -p -m700 /mnt/rabbitmq && chown 100:101 /mnt/rabbitmq"
+          securityContext:
+            runAsNonRoot: false
+            runAsUser: 0
+            readOnlyRootFilesystem: true
+          volumeMounts:
+            - name: "rabbitmq-data"
+              mountPath: "/mnt"
+      volumes:
+        - name: rabbitmq-tmp
+          emptyDir:
+            sizeLimit: "50Mi"
+        - name: rabbitmq-config
+          configMap:
+            name: "rabbitmq-configmap"
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+  volumeClaimTemplates:
+  - metadata:
+      name: rabbitmq-data
+    spec:
+      accessModes:
+      - ReadWriteOnce
+      resources:
+        requests:
+          storage: 8Gi
+      # storageClassName: ""
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: rabbitmq-configmap
+data:
+  definitions.json: |-
+    {
+      "permissions": [
+        {
+          "configure": ".*",
+          "read": ".*",
+          "user": "datatracker",
+          "vhost": "dt",
+          "write": ".*"
+        }
+      ],
+      "users": [
+        {
+          "hashing_algorithm": "rabbit_password_hashing_sha256",
+          "limits": {},
+          "name": "datatracker",
+          "password_hash": "HJxcItcpXtBN+R/CH7dUelfKBOvdUs3AWo82SBw2yLMSguzb",
+          "tags": []
+        }
+      ],
+      "vhosts": [
+        {
+          "limits": [],
+          "metadata": {
+            "description": "",
+            "tags": []
+          },
+          "name": "dt"
+        }
+      ]
+    }
+  rabbitmq.conf: |-
+    # prevent guest from logging in over tcp
+    loopback_users.guest = true
+    
+    # load saved definitions
+    load_definitions = /etc/rabbitmq/definitions.json
+    
+    # Ensure that enough disk is available to flush to disk. To do this, need to limit the
+    # memory available to the container to something reasonable. See
+    # https://www.rabbitmq.com/production-checklist.html#monitoring-and-resource-usage
+    # for recommendations.
+    
+    # 1-1.5 times the memory available to the container is adequate for disk limit
+    disk_free_limit.absolute = 6000MB
+    
+    # This should be ~40% of the memory available to the container. Use an
+    # absolute number because relative will be proprtional to the full machine
+    # memory.
+    vm_memory_high_watermark.absolute = 1600MB
+    
+    # Logging
+    log.file = false
+    log.console = true
+    log.console.level = info
+    log.console.formatter = json
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: rabbitmq
+spec:
+  type: ClusterIP
+  clusterIP: None  # headless service
+  ports:
+    - port: 5672
+      targetPort: amqp
+      protocol: TCP
+      name: amqp
+  selector:
+    app: rabbitmq
diff --git a/k8s/replicator.yaml b/k8s/replicator.yaml
new file mode 100644
index 0000000000..a28d9e8a16
--- /dev/null
+++ b/k8s/replicator.yaml
@@ -0,0 +1,72 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: replicator
+  labels:
+    deleteBeforeUpgrade: yes
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: replicator
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: replicator
+    spec:
+      securityContext:
+        runAsNonRoot: true
+      containers:
+        # -----------------------------------------------------
+        # Celery Container
+        # -----------------------------------------------------
+        - name: celery
+          image: "ghcr.io/ietf-tools/datatracker:$APP_IMAGE_TAG"
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: dt-vol
+              mountPath: /a
+            - name: dt-tmp
+              mountPath: /tmp
+            - name: dt-home
+              mountPath: /home/datatracker
+            - name: dt-xml2rfc-cache
+              mountPath: /var/cache/xml2rfc
+            - name: dt-cfg
+              mountPath: /workspace/ietf/settings_local.py
+              subPath: settings_local.py
+          env:
+            - name: "CONTAINER_ROLE"
+              value: "replicator"
+          envFrom:
+            - secretRef:
+                name: dt-secrets-env
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+            runAsUser: 1000
+            runAsGroup: 1000
+      volumes:
+        # To be overridden with the actual shared volume
+        - name: dt-vol
+        - name: dt-tmp
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-xml2rfc-cache
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-home
+          emptyDir:
+            sizeLimit: "2Gi"
+        - name: dt-cfg
+          configMap:
+            name: files-cfgmap
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 600
diff --git a/k8s/secrets.yaml b/k8s/secrets.yaml
new file mode 100644
index 0000000000..ba90af9c2a
--- /dev/null
+++ b/k8s/secrets.yaml
@@ -0,0 +1,83 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secrets-env
+type: Opaque
+stringData:
+  DATATRACKER_SERVER_MODE: "development"  # development for staging, production for production
+  DATATRACKER_ADMINS: |-
+    Robert Sparks <rjsparks@nostrum.com>
+    Ryan Cross <rcross@amsl.com>
+    Kesara Rathnayake <kesara@staff.ietf.org>
+    Jennifer Richards <jennifer@staff.ietf.org>
+    Nicolas Giard <nick@staff.ietf.org>
+  DATATRACKER_ALLOWED_HOSTS: ".ietf.org"  # newline-separated list also allowed
+  # DATATRACKER_DATATRACKER_DEBUG: "false"
+  
+  # DB access details - needs to be filled in
+  # DATATRACKER_DB_HOST: "db"
+  # DATATRACKER_DB_PORT: "5432"
+  # DATATRACKER_DB_NAME: "datatracker"
+  # DATATRACKER_DB_USER: "django"  # secret
+  # DATATRACKER_DB_PASS: "RkTkDPFnKpko"  # secret
+  # DATATRACKER_DB_CONN_MAX_AGE: "0"  # connection per request if not set, no limit if set to "None"
+  # DATATRACKER_DB_CONN_HEALTH_CHECKS: "false"
+  
+  DATATRACKER_DJANGO_SECRET_KEY: "PDwXboUq!=hPjnrtG2=ge#N$Dwy+wn@uivrugwpic8mxyPfHk"  # secret
+
+  # Set this to point testing / staging at the production statics server until we
+  # sort that out
+  # DATATRACKER_STATIC_URL: "https://static.ietf.org/dt/12.10.0/"
+  
+  # DATATRACKER_EMAIL_DEBUG: "true"
+  
+  # Outgoing email details
+  # DATATRACKER_EMAIL_HOST: "localhost"  # defaults to localhost
+  # DATATRACKER_EMAIL_PORT: "2025"  # defaults to 2025
+
+  # The value here is the default from settings.py (i.e., not actually secret)
+  DATATRACKER_NOMCOM_APP_SECRET_B64: "m9pzMezVoFNJfsvU9XSZxGnXnwup6P5ZgCQeEnROOoQ="  # secret
+
+  DATATRACKER_IANA_SYNC_PASSWORD: "this-is-the-iana-sync-password"  # secret
+  DATATRACKER_RFC_EDITOR_SYNC_PASSWORD: "this-is-the-rfc-editor-sync-password"  # secret
+  DATATRACKER_YOUTUBE_API_KEY: "this-is-the-youtube-api-key"  # secret
+  DATATRACKER_GITHUB_BACKUP_API_KEY: "this-is-the-github-backup-api-key"  # secret
+
+  # API key configuration
+  DATATRACKER_API_KEY_TYPE: "ES265"
+  # secret - value here is the default from settings.py (i.e., not actually secret)
+  DATATRACKER_API_PUBLIC_KEY_PEM_B64: |-
+    Ci0tLS0tQkVHSU4gUFVCTElDIEtFWS0tLS0tCk1Ga3dFd1lIS29aSXpqMENBUVlJS
+    29aSXpqMERBUWNEUWdBRXFWb2pzYW9mREpTY3VNSk4rdHNodW15Tk01TUUKZ2Fyel
+    ZQcWtWb3ZtRjZ5RTdJSi9kdjRGY1YrUUtDdEovck9TOGUzNlk4WkFFVll1dWtoZXM
+    weVoxdz09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=
+  # secret - value here is the default from settings.py (i.e., not actually secret)
+  DATATRACKER_API_PRIVATE_KEY_PEM_B64: |- 
+    Ci0tLS0tQkVHSU4gUFJJVkFURSBLRVktLS0tLQpNSUdIQWdFQU1CTUdCeXFHU000O
+    UFnRUdDQ3FHU000OUF3RUhCRzB3YXdJQkFRUWdvSTZMSmtvcEtxOFhySGk5ClFxR1
+    F2RTRBODNURllqcUx6KzhnVUxZZWNzcWhSQU5DQUFTcFdpT3hxaDhNbEp5NHdrMzY
+    yeUc2Ykkwemt3U0IKcXZOVStxUldpK1lYcklUc2duOTIvZ1Z4WDVBb0swbitzNUx4
+    N2ZwanhrQVJWaTY2U0Y2elRKblgKLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo=
+
+  #DATATRACKER_REGISTRATION_API_KEY: "some-key"  # secret"
+
+  # DATATRACKER_MEETECHO_API_BASE: "https://meetings.conf.meetecho.com/api/v1/"
+  DATATRACKER_MEETECHO_CLIENT_ID: "this-is-the-meetecho-client-id"  # secret
+  DATATRACKER_MEETECHO_CLIENT_SECRET: "this-is-the-meetecho-client-secret"  # secret
+
+  # DATATRACKER_MATOMO_SITE_ID: "7"  # must be present to enable Matomo
+  # DATATRACKER_MATOMO_DOMAIN_PATH: "analytics.ietf.org"
+
+  CELERY_PASSWORD: "this-is-a-secret"  # secret
+
+  # Only one of these may be set
+  # DATATRACKER_APP_API_TOKENS_JSON_B64: "e30K"  # secret
+  # DATATRACKER_APP_API_TOKENS_JSON: "{}"  # secret 
+
+  # use this to override default - one entry per line
+  # DATATRACKER_CSRF_TRUSTED_ORIGINS: |-
+  #   https://datatracker.staging.ietf.org
+
+  # Scout configuration
+  DATATRACKER_SCOUT_KEY: "this-is-the-scout-key"
+  DATATRACKER_SCOUT_NAME: "StagingDatatracker"
\ No newline at end of file
diff --git a/k8s/settings_local.py b/k8s/settings_local.py
new file mode 100644
index 0000000000..251f11234f
--- /dev/null
+++ b/k8s/settings_local.py
@@ -0,0 +1,518 @@
+# Copyright The IETF Trust 2007-2026, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from base64 import b64decode
+from email.utils import parseaddr
+import json
+
+from ietf import __release_hash__
+from ietf.settings import *  # pyflakes:ignore
+from ietf.settings import (
+    STORAGES,
+    ARTIFACT_STORAGE_NAMES,
+    BLOBSTORAGE_CONNECT_TIMEOUT,
+    BLOBSTORAGE_READ_TIMEOUT,
+    BLOBSTORAGE_MAX_ATTEMPTS,
+)
+import botocore.config
+
+
+def _multiline_to_list(s):
+    """Helper to split at newlines and convert to list"""
+    return [item.strip() for item in s.split("\n")]
+
+
+# Default to "development". Production _must_ set DATATRACKER_SERVER_MODE="production" in the env!
+SERVER_MODE = os.environ.get("DATATRACKER_SERVER_MODE", "development")
+
+# Secrets
+_SECRET_KEY = os.environ.get("DATATRACKER_DJANGO_SECRET_KEY", None)
+if _SECRET_KEY is not None:
+    SECRET_KEY = _SECRET_KEY
+else:
+    raise RuntimeError("DATATRACKER_DJANGO_SECRET_KEY must be set")
+
+_NOMCOM_APP_SECRET_B64 = os.environ.get("DATATRACKER_NOMCOM_APP_SECRET_B64", None)
+if _NOMCOM_APP_SECRET_B64 is not None:
+    NOMCOM_APP_SECRET = b64decode(_NOMCOM_APP_SECRET_B64)
+else:
+    raise RuntimeError("DATATRACKER_NOMCOM_APP_SECRET_B64 must be set")
+
+_IANA_SYNC_PASSWORD = os.environ.get("DATATRACKER_IANA_SYNC_PASSWORD", None)
+if _IANA_SYNC_PASSWORD is not None:
+    IANA_SYNC_PASSWORD = _IANA_SYNC_PASSWORD
+else:
+    raise RuntimeError("DATATRACKER_IANA_SYNC_PASSWORD must be set")
+
+_RFC_EDITOR_SYNC_PASSWORD = os.environ.get("DATATRACKER_RFC_EDITOR_SYNC_PASSWORD", None)
+if _RFC_EDITOR_SYNC_PASSWORD is not None:
+    RFC_EDITOR_SYNC_PASSWORD = os.environ.get("DATATRACKER_RFC_EDITOR_SYNC_PASSWORD")
+else:
+    raise RuntimeError("DATATRACKER_RFC_EDITOR_SYNC_PASSWORD must be set")
+
+_YOUTUBE_API_KEY = os.environ.get("DATATRACKER_YOUTUBE_API_KEY", None)
+if _YOUTUBE_API_KEY is not None:
+    YOUTUBE_API_KEY = _YOUTUBE_API_KEY
+else:
+    raise RuntimeError("DATATRACKER_YOUTUBE_API_KEY must be set")
+
+_GITHUB_BACKUP_API_KEY = os.environ.get("DATATRACKER_GITHUB_BACKUP_API_KEY", None)
+if _GITHUB_BACKUP_API_KEY is not None:
+    GITHUB_BACKUP_API_KEY = _GITHUB_BACKUP_API_KEY
+else:
+    raise RuntimeError("DATATRACKER_GITHUB_BACKUP_API_KEY must be set")
+
+_API_KEY_TYPE = os.environ.get("DATATRACKER_API_KEY_TYPE", None)
+if _API_KEY_TYPE is not None:
+    API_KEY_TYPE = _API_KEY_TYPE
+else:
+    raise RuntimeError("DATATRACKER_API_KEY_TYPE must be set")
+
+_API_PUBLIC_KEY_PEM_B64 = os.environ.get("DATATRACKER_API_PUBLIC_KEY_PEM_B64", None)
+if _API_PUBLIC_KEY_PEM_B64 is not None:
+    API_PUBLIC_KEY_PEM = b64decode(_API_PUBLIC_KEY_PEM_B64)
+else:
+    raise RuntimeError("DATATRACKER_API_PUBLIC_KEY_PEM_B64 must be set")
+
+_API_PRIVATE_KEY_PEM_B64 = os.environ.get("DATATRACKER_API_PRIVATE_KEY_PEM_B64", None)
+if _API_PRIVATE_KEY_PEM_B64 is not None:
+    API_PRIVATE_KEY_PEM = b64decode(_API_PRIVATE_KEY_PEM_B64)
+else:
+    raise RuntimeError("DATATRACKER_API_PRIVATE_KEY_PEM_B64 must be set")
+
+_RED_PRECOMPUTER_TRIGGER_RETRY_DELAY = os.environ.get(
+    "DATATRACKER_RED_PRECOMPUTER_TRIGGER_RETRY_DELAY", None
+)
+if _RED_PRECOMPUTER_TRIGGER_RETRY_DELAY is not None:
+    RED_PRECOMPUTER_TRIGGER_RETRY_DELAY = _RED_PRECOMPUTER_TRIGGER_RETRY_DELAY
+_RED_PRECOMPUTER_TRIGGER_MAX_RETRIES = os.environ.get(
+    "DATATRACKER_RED_PRECOMPUTER_TRIGGER_MAX_RETRIES", None
+)
+if _RED_PRECOMPUTER_TRIGGER_MAX_RETRIES is not None:
+    RED_PRECOMPUTER_TRIGGER_MAX_RETRIES = _RED_PRECOMPUTER_TRIGGER_MAX_RETRIES
+_TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL = os.environ.get(
+    "DATATRACKER_TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL", None
+)
+if _TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL is not None:
+    TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL = _TRIGGER_RED_PRECOMPUTE_MULTIPLE_URL
+
+# Set DEBUG if DATATRACKER_DEBUG env var is the word "true"
+DEBUG = os.environ.get("DATATRACKER_DEBUG", "false").lower() == "true"
+
+# DATATRACKER_ALLOWED_HOSTS env var is a newline-separated list of allowed hosts
+_allowed_hosts_str = os.environ.get("DATATRACKER_ALLOWED_HOSTS", None)
+if _allowed_hosts_str is not None:
+    ALLOWED_HOSTS = _multiline_to_list(_allowed_hosts_str)
+
+DATABASES = {
+    "default": {
+        "HOST": os.environ.get("DATATRACKER_DB_HOST", "db"),
+        "PORT": os.environ.get("DATATRACKER_DB_PORT", "5432"),
+        "NAME": os.environ.get("DATATRACKER_DB_NAME", "datatracker"),
+        "ENGINE": "django.db.backends.postgresql",
+        "USER": os.environ.get("DATATRACKER_DB_USER", "django"),
+        "PASSWORD": os.environ.get("DATATRACKER_DB_PASS", ""),
+        "OPTIONS": json.loads(os.environ.get("DATATRACKER_DB_OPTS_JSON", "{}")),
+    },
+    "blobdb": {
+        "HOST": os.environ.get("BLOBDB_DB_HOST", "blobdb"),
+        "PORT": os.environ.get("BLOBDB_DB_PORT", "5432"),
+        "NAME": os.environ.get("BLOBDB_DB_NAME", "blob"),
+        "ENGINE": "django.db.backends.postgresql",
+        "USER": os.environ.get("BLOBDB_DB_USER", "django"),
+        "PASSWORD": os.environ.get("BLOBDB_DB_PASS", ""),
+        "OPTIONS": json.loads(os.environ.get("BLOBDB_DB_OPTS_JSON", "{}")),
+    },
+}
+
+DATABASE_ROUTERS = ["ietf.blobdb.routers.BlobdbStorageRouter"]
+BLOBDB_DATABASE = "blobdb"
+
+# Configure persistent connections. A setting of 0 is Django's default.
+_conn_max_age = os.environ.get("DATATRACKER_DB_CONN_MAX_AGE", "0")
+for dbname in ["default", "blobdb"]:
+    # A string "none" means unlimited age.
+    DATABASES[dbname]["CONN_MAX_AGE"] = (
+        None if _conn_max_age.lower() == "none" else int(_conn_max_age)
+    )
+# Enable connection health checks if DATATRACKER_DB_CONN_HEALTH_CHECK is the string "true"
+_conn_health_checks = bool(
+    os.environ.get("DATATRACKER_DB_CONN_HEALTH_CHECKS", "false").lower() == "true"
+)
+for dbname in ["default", "blobdb"]:
+    DATABASES[dbname]["CONN_HEALTH_CHECKS"] = _conn_health_checks
+
+# DATATRACKER_ADMINS is a newline-delimited list of addresses parseable by email.utils.parseaddr
+_admins_str = os.environ.get("DATATRACKER_ADMINS", None)
+if _admins_str is not None:
+    ADMINS = [parseaddr(admin) for admin in _multiline_to_list(_admins_str)]
+else:
+    raise RuntimeError("DATATRACKER_ADMINS must be set")
+
+USING_DEBUG_EMAIL_SERVER = (
+    os.environ.get("DATATRACKER_EMAIL_DEBUG", "false").lower() == "true"
+)
+EMAIL_HOST = os.environ.get("DATATRACKER_EMAIL_HOST", "localhost")
+EMAIL_PORT = int(os.environ.get("DATATRACKER_EMAIL_PORT", "2025"))
+
+_celery_password = os.environ.get("CELERY_PASSWORD", None)
+if _celery_password is None:
+    raise RuntimeError("CELERY_PASSWORD must be set")
+CELERY_BROKER_URL = "amqp://datatracker:{password}@{host}/{queue}".format(
+    host=os.environ.get("RABBITMQ_HOSTNAME", "dt-rabbitmq"),
+    password=_celery_password,
+    queue=os.environ.get("RABBITMQ_QUEUE", "dt"),
+)
+
+# mailarchive API key
+_mailing_list_archive_api_key = os.environ.get(
+    "DATATRACKER_MAILING_LIST_ARCHIVE_API_KEY", None
+)
+if _mailing_list_archive_api_key is None:
+    raise RuntimeError("DATATRACKER_MAILING_LIST_ARCHIVE_API_KEY must be set")
+MAILING_LIST_ARCHIVE_API_KEY = _mailing_list_archive_api_key
+
+IANA_SYNC_USERNAME = "ietfsync"
+IANA_SYNC_CHANGES_URL = "https://datatracker.iana.org:4443/data-tracker/changes"
+IANA_SYNC_PROTOCOLS_URL = "http://www.iana.org/protocols/"
+
+RFC_EDITOR_NOTIFICATION_URL = "http://www.rfc-editor.org/parser/parser.php"
+
+_registration_api_key = os.environ.get("DATATRACKER_REGISTRATION_API_KEY", None)
+if _registration_api_key is None:
+    raise RuntimeError("DATATRACKER_REGISTRATION_API_KEY must be set")
+STATS_REGISTRATION_ATTENDEES_JSON_URL = f"https://registration.ietf.org/{{number}}/attendees/?apikey={_registration_api_key}"
+
+# Registration Participants API config - key must be set, but the URL can be left
+# to the default in settings.py
+_registration_participants_api_key = os.environ.get(
+    "DATATRACKER_REGISTRATION_PARTICIPANTS_API_KEY", None
+)
+if _registration_participants_api_key is None:
+    raise RuntimeError("DATATRACKER_REGISTRATION_PARTICIPANTS_API_KEY must be set")
+REGISTRATION_PARTICIPANTS_API_KEY = _registration_participants_api_key
+
+_registration_participants_api_url = os.environ.get(
+    "DATATRACKER_REGISTRATION_PARTICIPANTS_API_URL", None
+)
+if _registration_participants_api_url is not None:
+    REGISTRATION_PARTICIPANTS_API_URL = _registration_participants_api_url
+
+# FIRST_CUTOFF_DAYS = 12
+# SECOND_CUTOFF_DAYS = 12
+# SUBMISSION_CUTOFF_DAYS = 26
+# SUBMISSION_CORRECTION_DAYS = 57
+MEETING_MATERIALS_SUBMISSION_CUTOFF_DAYS = 26
+MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS = 54
+
+# disable htpasswd by setting to a do-nothing command
+HTPASSWD_COMMAND = "/bin/true"
+
+_MEETECHO_CLIENT_ID = os.environ.get("DATATRACKER_MEETECHO_CLIENT_ID", None)
+_MEETECHO_CLIENT_SECRET = os.environ.get("DATATRACKER_MEETECHO_CLIENT_SECRET", None)
+if _MEETECHO_CLIENT_ID is not None and _MEETECHO_CLIENT_SECRET is not None:
+    MEETECHO_API_CONFIG = {
+        "api_base": os.environ.get(
+            "DATATRACKER_MEETECHO_API_BASE",
+            "https://meetings.conf.meetecho.com/api/v1/",
+        ),
+        "client_id": _MEETECHO_CLIENT_ID,
+        "client_secret": _MEETECHO_CLIENT_SECRET,
+        "request_timeout": 3.01,  # python-requests doc recommend slightly > a multiple of 3 seconds
+    }
+else:
+    raise RuntimeError(
+        "DATATRACKER_MEETECHO_CLIENT_ID and DATATRACKER_MEETECHO_CLIENT_SECRET must be set"
+    )
+
+# For APP_API_TOKENS, accept either base64-encoded JSON or raw JSON, but not both.
+# To decode / pretty-print the encoded form, run:
+#    base64 -d | jq .
+# paste the encoded secret into stdin. Copy/paste that into an editor you trust not
+# to leave a copy lying around. When done editing, copy/paste the final JSON through
+#    jq -c | base64
+# and copy/paste the output into the secret store.
+if "DATATRACKER_APP_API_TOKENS_JSON_B64" in os.environ:
+    if "DATATRACKER_APP_API_TOKENS_JSON" in os.environ:
+        raise RuntimeError(
+            "Only one of DATATRACKER_APP_API_TOKENS_JSON and DATATRACKER_APP_API_TOKENS_JSON_B64 may be set"
+        )
+    _APP_API_TOKENS_JSON = b64decode(
+        os.environ.get("DATATRACKER_APP_API_TOKENS_JSON_B64")
+    )
+else:
+    _APP_API_TOKENS_JSON = os.environ.get("DATATRACKER_APP_API_TOKENS_JSON", None)
+
+if _APP_API_TOKENS_JSON is not None:
+    APP_API_TOKENS = json.loads(_APP_API_TOKENS_JSON)
+else:
+    APP_API_TOKENS = {}
+
+EMAIL_COPY_TO = ""
+
+# Until we teach the datatracker to look beyond cloudflare for this check
+IDSUBMIT_MAX_DAILY_SAME_SUBMITTER = 5000
+
+# Leave DATATRACKER_MATOMO_SITE_ID unset to disable Matomo reporting
+if "DATATRACKER_MATOMO_SITE_ID" in os.environ:
+    MATOMO_DOMAIN_PATH = os.environ.get(
+        "DATATRACKER_MATOMO_DOMAIN_PATH", "analytics.ietf.org"
+    )
+    MATOMO_SITE_ID = os.environ.get("DATATRACKER_MATOMO_SITE_ID")
+    MATOMO_DISABLE_COOKIES = True
+
+# Leave DATATRACKER_SCOUT_KEY unset to disable Scout APM agent
+_SCOUT_KEY = os.environ.get("DATATRACKER_SCOUT_KEY", None)
+if _SCOUT_KEY is not None:
+    if SERVER_MODE == "production":
+        PROD_PRE_APPS = [
+            "scout_apm.django",
+        ]
+    else:
+        DEV_PRE_APPS = [
+            "scout_apm.django",
+        ]
+    SCOUT_MONITOR = True
+    SCOUT_KEY = _SCOUT_KEY
+    SCOUT_NAME = os.environ.get("DATATRACKER_SCOUT_NAME", "Datatracker")
+    SCOUT_ERRORS_ENABLED = True
+    SCOUT_SHUTDOWN_MESSAGE_ENABLED = False
+    SCOUT_CORE_AGENT_SOCKET_PATH = "tcp://{host}:{port}".format(
+        host=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_HOST", "localhost"),
+        port=os.environ.get("DATATRACKER_SCOUT_CORE_AGENT_PORT", "6590"),
+    )
+    SCOUT_CORE_AGENT_DOWNLOAD = False
+    SCOUT_CORE_AGENT_LAUNCH = False
+    SCOUT_REVISION_SHA = __release_hash__[:7]
+
+STATIC_URL = os.environ.get("DATATRACKER_STATIC_URL", None)
+if STATIC_URL is None:
+    from ietf import __version__
+
+    STATIC_URL = f"https://static.ietf.org/dt/{__version__}/"
+
+# Set these to the same as "production" in settings.py, whether production mode or not
+MEDIA_ROOT = "/a/www/www6s/lib/dt/media/"
+MEDIA_URL = "https://www.ietf.org/lib/dt/media/"
+PHOTOS_DIRNAME = "photo"
+PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME
+
+# Normally only set for debug, but needed until we have a real FS
+DJANGO_VITE["default"]["manifest_path"] = os.path.join(
+    BASE_DIR, "static/dist-neue/manifest.json"
+)
+
+# Binaries that are different in the docker image
+DE_GFM_BINARY = "/usr/local/bin/de-gfm"
+IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
+
+# Duplicating production cache from settings.py and using it whether we're in production mode or not
+MEMCACHED_HOST = os.environ.get("DT_MEMCACHED_SERVICE_HOST", "127.0.0.1")
+MEMCACHED_PORT = os.environ.get("DT_MEMCACHED_SERVICE_PORT", "11211")
+from ietf import __version__
+
+CACHES = {
+    "default": {
+        "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+        "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+        "VERSION": __version__,
+        "KEY_PREFIX": "ietf:dt",
+        # Key function is default except with sha384-encoded key
+        "KEY_FUNCTION": lambda key, key_prefix, version: (
+            f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+        ),
+    },
+    "agenda": {
+        "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+        "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+        # No release-specific VERSION setting.
+        "KEY_PREFIX": "ietf:dt:agenda",
+        # Key function is default except with sha384-encoded key
+        "KEY_FUNCTION": lambda key, key_prefix, version: (
+            f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+        ),
+    },
+    "proceedings": {
+        "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+        "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+        # No release-specific VERSION setting.
+        "KEY_PREFIX": "ietf:dt:proceedings",
+        # Key function is default except with sha384-encoded key
+        "KEY_FUNCTION": lambda key, key_prefix, version: (
+            f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+        ),
+    },
+    "sessions": {
+        "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+        "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+        # No release-specific VERSION setting.
+        "KEY_PREFIX": "ietf:dt",
+    },
+    "htmlized": {
+        "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
+        "LOCATION": "/a/cache/datatracker/htmlized",
+        "OPTIONS": {
+            "MAX_ENTRIES": 100000,  # 100,000
+        },
+    },
+    "pdfized": {
+        "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
+        "LOCATION": "/a/cache/datatracker/pdfized",
+        "OPTIONS": {
+            "MAX_ENTRIES": 100000,  # 100,000
+        },
+    },
+    "slowpages": {
+        "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
+        "LOCATION": "/a/cache/datatracker/slowpages",
+        "OPTIONS": {
+            "MAX_ENTRIES": 5000,
+        },
+    },
+    "celery-results": {
+        "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
+        "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+        "KEY_PREFIX": "ietf:celery",
+    },
+}
+
+_csrf_trusted_origins_str = os.environ.get("DATATRACKER_CSRF_TRUSTED_ORIGINS")
+if _csrf_trusted_origins_str is not None:
+    CSRF_TRUSTED_ORIGINS = _multiline_to_list(_csrf_trusted_origins_str)
+
+# Console logs as JSON instead of plain when running in k8s
+LOGGING["handlers"]["console"]["formatter"] = "json"
+
+# Configure storages for the replica blob store
+_blob_store_endpoint_url = os.environ.get("DATATRACKER_BLOB_STORE_ENDPOINT_URL")
+_blob_store_access_key = os.environ.get("DATATRACKER_BLOB_STORE_ACCESS_KEY")
+_blob_store_secret_key = os.environ.get("DATATRACKER_BLOB_STORE_SECRET_KEY")
+if None in (_blob_store_endpoint_url, _blob_store_access_key, _blob_store_secret_key):
+    raise RuntimeError(
+        "All of DATATRACKER_BLOB_STORE_ENDPOINT_URL, DATATRACKER_BLOB_STORE_ACCESS_KEY, "
+        "and DATATRACKER_BLOB_STORE_SECRET_KEY must be set"
+    )
+_blob_store_bucket_prefix = os.environ.get("DATATRACKER_BLOB_STORE_BUCKET_PREFIX", "")
+_blob_store_bucket_suffix = os.environ.get("DATATRACKER_BLOB_STORE_BUCKET_SUFFIX", "")
+_blob_store_enable_profiling = (
+    os.environ.get("DATATRACKER_BLOB_STORE_ENABLE_PROFILING", "false").lower() == "true"
+)
+_blob_store_max_attempts = int(
+    os.environ.get("DATATRACKER_BLOB_STORE_MAX_ATTEMPTS", BLOBSTORAGE_MAX_ATTEMPTS)
+)
+_blob_store_connect_timeout = float(
+    os.environ.get(
+        "DATATRACKER_BLOB_STORE_CONNECT_TIMEOUT", BLOBSTORAGE_CONNECT_TIMEOUT
+    )
+)
+_blob_store_read_timeout = float(
+    os.environ.get("DATATRACKER_BLOB_STORE_READ_TIMEOUT", BLOBSTORAGE_READ_TIMEOUT)
+)
+
+for storagename in ARTIFACT_STORAGE_NAMES:
+    if storagename in ["staging"]:
+        continue
+    replica_storagename = f"r2-{storagename}"
+    adjusted_bucket_name = (
+        _blob_store_bucket_prefix + storagename + _blob_store_bucket_suffix
+    ).strip()
+    STORAGES[replica_storagename] = {
+        "BACKEND": "ietf.doc.storage.MetadataS3Storage",
+        "OPTIONS": dict(
+            endpoint_url=_blob_store_endpoint_url,
+            access_key=_blob_store_access_key,
+            secret_key=_blob_store_secret_key,
+            security_token=None,
+            client_config=botocore.config.Config(
+                request_checksum_calculation="when_required",
+                response_checksum_validation="when_required",
+                signature_version="s3v4",
+                connect_timeout=_blob_store_connect_timeout,
+                read_timeout=_blob_store_read_timeout,
+                retries={"total_max_attempts": _blob_store_max_attempts},
+            ),
+            verify=False,
+            bucket_name=adjusted_bucket_name,
+            ietf_log_blob_timing=_blob_store_enable_profiling,
+        ),
+    }
+
+# Configure storage for the red bucket - assume it uses the same credentials as
+# other blobs
+_red_bucket_name = os.environ.get("DATATRACKER_BLOB_STORE_RED_BUCKET_NAME", "").strip()
+if _red_bucket_name == "":
+    raise RuntimeError("DATATRACKER_BLOB_STORE_RED_BUCKET_NAME must be set")
+
+STORAGES["red_bucket"] = {
+    "BACKEND": "storages.backends.s3.S3Storage",
+    "OPTIONS": dict(
+        endpoint_url=_blob_store_endpoint_url,
+        access_key=_blob_store_access_key,
+        secret_key=_blob_store_secret_key,
+        security_token=None,
+        client_config=botocore.config.Config(
+            request_checksum_calculation="when_required",
+            response_checksum_validation="when_required",
+            signature_version="s3v4",
+            connect_timeout=_blob_store_connect_timeout,
+            read_timeout=_blob_store_read_timeout,
+            retries={"total_max_attempts": _blob_store_max_attempts},
+        ),
+        verify=False,
+        bucket_name=_red_bucket_name,
+    ),
+}
+RFCINDEX_DELETE_THEN_WRITE = False  # S3Storage allows file_overwrite by default
+RFCINDEX_OUTPUT_PATH = os.environ.get("DATATRACKER_RFCINDEX_OUTPUT_PATH", "other/")
+RFCINDEX_INPUT_PATH = os.environ.get("DATATRACKER_RFCINDEX_INPUT_PATH", "")
+
+# Configure the blobdb app for artifact storage
+_blobdb_replication_enabled = (
+    os.environ.get("DATATRACKER_BLOBDB_REPLICATION_ENABLED", "true").lower() == "true"
+)
+_blobdb_replication_verbose_logging = (
+    os.environ.get("DATATRACKER_BLOBDB_REPLICATION_VERBOSE_LOGGING", "false").lower()
+    == "true"
+)
+
+BLOBDB_REPLICATION = {
+    "ENABLED": _blobdb_replication_enabled,
+    "DEST_STORAGE_PATTERN": "r2-{bucket}",
+    "INCLUDE_BUCKETS": ARTIFACT_STORAGE_NAMES,
+    "EXCLUDE_BUCKETS": ["staging"],
+    "VERBOSE_LOGGING": _blobdb_replication_verbose_logging,
+}
+
+# Optionally disable password strength enforcement at login (on by default)
+PASSWORD_POLICY_ENFORCE_AT_LOGIN = (
+    os.environ.get("DATATRACKER_ENFORCE_PW_POLICY", "true").lower() != "false"
+)
+
+# Typesense search indexing
+SEARCHINDEX_CONFIG = {
+    "TYPESENSE_API_URL": os.environ.get("DATATRACKER_TYPESENSE_API_URL", ""),
+    "TYPESENSE_API_KEY": os.environ.get("DATATRACKER_TYPESENSE_API_KEY", ""),
+    "TASK_RETRY_DELAY": os.environ.get("DATATRACKER_SEARCHINDEX_TASK_RETRY_DELAY", 10),
+    "TASK_MAX_RETRIES": os.environ.get(
+        "DATATRACKER_SEARCHINDEX_TASK_MAX_RETRIES", "12"
+    ),
+}
+
+# Errata system api configuration
+ERRATA_METADATA_NOTIFICATION_API_KEY = os.environ.get(
+    "DATATRACKER_ERRATA_METADATA_NOTIFICATION_API_KEY", None
+)
+if ERRATA_METADATA_NOTIFICATION_API_KEY is not None:
+    ERRATA_METADATA_NOTIFICATION_URL = os.environ.get(
+        "DATATRACKER_ERRATA_METADATA_NOTIFICATION_URL", None
+    )
+    if ERRATA_METADATA_NOTIFICATION_URL is None:
+        raise RuntimeError(
+            "DATATRACKER_ERRATA_METADATA_NOTIFICATION_URL must be set if "
+            "DATATRACKER_ERRATA_METADATA_NOTIFICATION_API_KEY is provided"
+        )
+
+# name (with path) of errata.json in the red bucket
+ERRATA_JSON_BLOB_NAME = os.environ.get(
+    "DATATRACKER_ERRATA_JSON_BLOB_NAME", "other/errata.json"
+)
diff --git a/media/.gitignore b/media/.gitignore
deleted file mode 100644
index dfa8ca37ce..0000000000
--- a/media/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/floor
diff --git a/media/photo/nopictureavailable.jpg b/media/photo/nopictureavailable.jpg
deleted file mode 100644
index 0895f9f57c..0000000000
Binary files a/media/photo/nopictureavailable.jpg and /dev/null differ
diff --git a/media/photo/profile-default.jpg b/media/photo/profile-default.jpg
deleted file mode 100644
index d6b03e1004..0000000000
Binary files a/media/photo/profile-default.jpg and /dev/null differ
diff --git a/mypy.ini b/mypy.ini
index 825bf03169..4acaf98c95 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,20 +1,12 @@
 [mypy]
 
-#mypy_path = ./stubs/
-
 ignore_missing_imports = True
 
+# allow PEP 695 type aliases (flag needed until mypy >= 1.13) 
+enable_incomplete_feature = NewGenericSyntax
+
 plugins =
     mypy_django_plugin.main
 
 [mypy.plugins.django-stubs]
 django_settings_module = ietf.settings
-
-[mypy-ietf.group.migrations.0004_add_group_feature_fields]
-ignore_errors = True
-
-[mypy-ietf.group.migrations.0002_groupfeatures_historicalgroupfeatures]
-ignore_errors = True
-
-[mypy-ietf.doc.migrations.0001_initial]
-ignore_errors = True
diff --git a/package.json b/package.json
index 094c8e4b9e..57642d7860 100644
--- a/package.json
+++ b/package.json
@@ -4,93 +4,93 @@
     "build": "vite build",
     "preview": "vite build --mode test && vite preview --mode test",
     "legacy:dev": "parcel",
-    "legacy:build": "parcel build",
-    "cypress": "cypress run --config-file cypress/configs/modern.config.js",
-    "cypress:open": "cypress open --config-file cypress/configs/modern.config.js",
-    "cypress:legacy": "cypress run --config-file cypress/configs/legacy.config.js",
-    "cypress:legacy:open": "cypress open --config-file cypress/configs/legacy.config.js",
-    "percy:run": "percy exec -- cypress run --config-file cypress/configs/modern.config.js",
-    "percy:legacy:run": "percy exec -- cypress run --config-file cypress/configs/legacy.config.js"
+    "legacy:build": "parcel build"
   },
   "dependencies": {
-    "@fullcalendar/bootstrap5": "5.11.3",
-    "@fullcalendar/core": "5.11.3",
-    "@fullcalendar/daygrid": "5.11.3",
-    "@fullcalendar/interaction": "5.11.3",
-    "@fullcalendar/list": "5.11.3",
-    "@fullcalendar/luxon2": "5.11.3",
-    "@fullcalendar/timegrid": "5.11.3",
-    "@fullcalendar/vue3": "5.11.2",
-    "@popperjs/core": "2.11.6",
-    "bootstrap": "5.2.2",
-    "bootstrap-icons": "1.9.1",
-    "browser-fs-access": "0.31.0",
-    "caniuse-lite": "1.0.30001414",
-    "d3": "7.6.1",
+    "@fullcalendar/bootstrap5": "6.1.11",
+    "@fullcalendar/core": "6.1.11",
+    "@fullcalendar/daygrid": "6.1.11",
+    "@fullcalendar/icalendar": "6.1.11",
+    "@fullcalendar/interaction": "6.1.11",
+    "@fullcalendar/list": "6.1.11",
+    "@fullcalendar/luxon3": "6.1.11",
+    "@fullcalendar/timegrid": "6.1.11",
+    "@fullcalendar/vue3": "6.1.11",
+    "@popperjs/core": "2.11.8",
+    "@twuni/emojify": "1.0.2",
+    "bootstrap": "5.3.3",
+    "bootstrap-icons": "1.11.3",
+    "browser-fs-access": "0.35.0",
+    "caniuse-lite": "1.0.30001603",
+    "d3": "7.9.0",
     "file-saver": "2.0.5",
-    "highcharts": "10.2.1",
-    "jquery": "3.6.1",
-    "jquery-ui-dist": "1.13.2",
-    "js-cookie": "3.0.1",
+    "highcharts": "11.4.0",
+    "ical.js": "1.5.0",
+    "jquery": "3.7.1",
+    "js-cookie": "3.0.5",
     "list.js": "2.3.1",
     "lodash": "4.17.21",
     "lodash-es": "4.17.21",
-    "luxon": "3.0.4",
-    "moment": "2.29.4",
-    "moment-timezone": "0.5.37",
+    "luxon": "3.4.4",
+    "moment": "2.30.1",
+    "moment-timezone": "0.5.45",
     "ms": "2.1.3",
     "murmurhash-js": "1.0.0",
-    "naive-ui": "2.33.3",
-    "pinia": "2.0.22",
+    "naive-ui": "2.38.1",
+    "pinia": "2.1.7",
     "pinia-plugin-persist": "1.0.0",
     "select2": "4.1.0-rc.0",
     "select2-bootstrap-5-theme": "1.3.0",
     "send": "0.18.0",
-    "slugify": "1.6.5",
-    "sortablejs": "1.15.0",
-    "vue": "3.2.40",
-    "vue-router": "4.1.5",
+    "shepherd.js": "11.2.0",
+    "slugify": "1.6.6",
+    "sortablejs": "1.15.2",
+    "vanillajs-datepicker": "1.3.4",
+    "vue": "3.4.21",
+    "vue-router": "4.3.0",
     "zxcvbn": "4.4.2"
   },
   "devDependencies": {
-    "@faker-js/faker": "7.5.0",
-    "@parcel/transformer-sass": "2.7.0",
-    "@percy/cli": "1.10.4",
-    "@percy/cypress": "3.1.2",
-    "@vitejs/plugin-vue": "2.3.4",
-    "@vue/test-utils": "2.1.0",
+    "@parcel/optimizer-data-url": "2.12.0",
+    "@parcel/transformer-inline-string": "2.12.0",
+    "@parcel/transformer-sass": "2.12.0",
+    "@rollup/pluginutils": "5.1.0",
+    "@vitejs/plugin-vue": "4.6.2",
+    "@vue/language-plugin-pug": "2.0.7",
     "browserlist": "latest",
-    "c8": "7.12.0",
-    "cypress": "10.9.0",
-    "cypress-real-events": "1.7.1",
-    "eslint": "8.24.0",
-    "eslint-config-standard": "17.0.0",
-    "eslint-plugin-cypress": "2.12.1",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-n": "15.3.0",
+    "c8": "9.1.0",
+    "eslint": "8.57.0",
+    "eslint-config-standard": "17.1.0",
+    "eslint-plugin-cypress": "2.15.1",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-n": "16.6.2",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "6.0.1",
-    "eslint-plugin-vue": "9.5.1",
-    "html-validate": "7.5.0",
-    "jquery-migrate": "3.4.0",
-    "parcel": "2.7.0",
+    "eslint-plugin-promise": "6.1.1",
+    "eslint-plugin-vue": "9.24.0",
+    "html-validate": "8.18.1",
+    "jquery-migrate": "3.4.1",
+    "parcel": "2.12.0",
     "pug": "3.0.2",
-    "sass": "1.55.0",
+    "sass": "1.72.0",
     "seedrandom": "3.0.5",
-    "vite": "2.9.15"
+    "vite": "4.5.3"
   },
   "targets": {
     "ietf": {
       "distDir": "ietf/static/dist/ietf",
       "source": [
         "ietf/static/css/datepicker.scss",
+        "ietf/static/css/document_html_inline.scss",
+        "ietf/static/css/document_html_referenced.scss",
+        "ietf/static/css/document_html_txt.scss",
+        "ietf/static/css/highcharts.scss",
         "ietf/static/css/ietf.scss",
-        "ietf/static/css/jquery-ui.scss",
         "ietf/static/css/liaisons.css",
         "ietf/static/css/list.scss",
         "ietf/static/css/select2.scss",
-        "ietf/static/images/arrow-ani.webp",
         "ietf/static/images/iab-logo-card.png",
+        "ietf/static/images/iab-logo.svg",
+        "ietf/static/images/iab-logo-white.svg",
         "ietf/static/images/iesg-draft-state-diagram.png",
         "ietf/static/images/ietf-logo-card.png",
         "ietf/static/images/ietf-logo-nor-16-dev.png",
@@ -106,18 +106,24 @@
         "ietf/static/images/ietf-logo-nor-mask.svg",
         "ietf/static/images/ietf-logo-nor-white.svg",
         "ietf/static/images/ietf-logo-nor.svg",
+        "ietf/static/images/ietf-logo-white.svg",
         "ietf/static/images/ietf-logo.svg",
         "ietf/static/images/irtf-logo-card.png",
+        "ietf/static/images/irtf-logo-white.svg",
+        "ietf/static/images/irtf-logo.svg",
+        "ietf/static/js/add_session_recordings.js",
+        "ietf/static/js/attendees-chart.js",
         "ietf/static/js/agenda_filter.js",
         "ietf/static/js/agenda_materials.js",
-        "ietf/static/js/agenda_personalize.js",
-        "ietf/static/js/agenda_timezone.js",
+        "ietf/static/js/announcement.js",
         "ietf/static/js/complete-review.js",
         "ietf/static/js/create_timeslot.js",
         "ietf/static/js/create_timeslot.js",
+        "ietf/static/js/custom_striped.js",
         "ietf/static/js/d3.js",
         "ietf/static/js/datepicker.js",
         "ietf/static/js/doc-search.js",
+        "ietf/static/js/document_html.js",
         "ietf/static/js/document_relations.js",
         "ietf/static/js/document_timeline.js",
         "ietf/static/js/draft-submit.js",
@@ -130,29 +136,35 @@
         "ietf/static/js/highcharts.js",
         "ietf/static/js/highstock.js",
         "ietf/static/js/ietf.js",
+        "ietf/static/js/investigate.js",
         "ietf/static/js/ipr-edit.js",
         "ietf/static/js/ipr-search.js",
-        "ietf/static/js/jquery-ui.js",
         "ietf/static/js/js-cookie.js",
         "ietf/static/js/liaisons.js",
         "ietf/static/js/list.js",
+        "ietf/static/js/login.js",
         "ietf/static/js/manage-community-list.js",
         "ietf/static/js/manage-review-requests.js",
         "ietf/static/js/meeting-interim-request.js",
         "ietf/static/js/moment.js",
+        "ietf/static/js/navbar-doc-search.js",
         "ietf/static/js/password_strength.js",
-        "ietf/static/js/room_params.js",
         "ietf/static/js/select2.js",
+        "ietf/static/js/session_details.js",
         "ietf/static/js/session_details_form.js",
+        "ietf/static/js/session_form.js",
+        "ietf/static/js/session_request.js",
         "ietf/static/js/sortable.js",
         "ietf/static/js/stats.js",
         "ietf/static/js/status-change-edit-relations.js",
+        "ietf/static/js/theme.js",
         "ietf/static/js/timeslot_edit.js",
         "ietf/static/js/timezone.js",
         "ietf/static/js/upcoming.js",
         "ietf/static/js/upload-material.js",
+        "ietf/static/js/upload-session-agenda.js",
         "ietf/static/js/upload_bofreq.js",
-        "ietf/static/js/week-view.js",
+        "ietf/static/js/upload_statement.js",
         "ietf/static/js/zxcvbn.js"
       ]
     },
@@ -202,11 +214,12 @@
         "ietf/secr/static/images/tooltag-arrowright.webp",
         "ietf/secr/static/images/tooltag-arrowright_over.webp",
         "ietf/secr/static/js/dynamic_inlines.js",
-        "ietf/secr/static/js/session_form.js",
-        "ietf/secr/static/js/sessions.js",
         "ietf/secr/static/js/utils.js"
       ]
     }
   },
+  "resolutions": {
+    "lightningcss": "1.17.1"
+  },
   "packageManager": "yarn@3.2.2"
 }
diff --git a/patch/add-django-cprofile-filter.patch b/patch/add-django-cprofile-filter.patch
index 128d5a9f09..bf684a0b33 100644
--- a/patch/add-django-cprofile-filter.patch
+++ b/patch/add-django-cprofile-filter.patch
@@ -1,15 +1,9 @@
---- django_cprofile_middleware/middleware.py.old	2018-04-04 06:32:29.282187502 -0700
-+++ django_cprofile_middleware/middleware.py	2018-04-06 10:11:18.936855634 -0700
-@@ -1,4 +1,5 @@
- import pstats
-+import re
- 
- try:
-     import cProfile as profile
-@@ -14,6 +15,15 @@
- from django.utils.deprecation import MiddlewareMixin
- 
- 
+--- django_cprofile_middleware/middleware.py.old	2024-06-27 21:03:56.975128007 +0000
++++ django_cprofile_middleware/middleware.py	2024-06-27 23:45:59.421683008 +0000
+@@ -19,6 +19,16 @@
+     from django_cprofile_middleware.utils import MiddlewareMixin
+
+
 +class Stats(pstats.Stats):
 +    def filter_stats(self, regex):
 +        oldstats = self.stats
@@ -18,17 +12,64 @@
 +        for func, (cc, nc, tt, ct, callers) in oldstats.iteritems():
 +            if filter.search(pstats.func_std_string(func)):
 +                newstats[func] = (cc, nc, tt, ct, callers)
++
 +
  class ProfilerMiddleware(MiddlewareMixin):
      """
      Simple profile middleware to profile django views. To run it, add ?prof to
-@@ -62,8 +72,13 @@
+@@ -38,9 +48,11 @@
+     ?download => Download profile file suitable for visualization. For example
+         in snakeviz or RunSnakeRun
+
+-    This is adapted from an example found here:
+-    http://www.slideshare.net/zeeg/django-con-high-performance-django-presentation.
++    Patched with https://github.com/omarish/django-cprofile-middleware/pull/23
++    for operation with Django 4.2.5+
+     """
++    PROFILER_REQUEST_ATTR_NAME = '_django_cprofile_middleware_profiler'
++
+     def can(self, request):
+         requires_staff = getattr(
+             settings, "DJANGO_CPROFILE_MIDDLEWARE_REQUIRE_STAFF", True)
+@@ -52,10 +64,11 @@
+
+     def process_view(self, request, callback, callback_args, callback_kwargs):
+         if self.can(request):
+-            self.profiler = profile.Profile()
++            profiler = profile.Profile()
++            setattr(request, self.PROFILER_REQUEST_ATTR_NAME, profiler)
+             args = (request,) + callback_args
+             try:
+-                return self.profiler.runcall(
++                return profiler.runcall(
+                     callback, *args, **callback_kwargs)
+             except Exception:
+                 # we want the process_exception middleware to fire
+@@ -63,12 +76,13 @@
+                 return
+
+     def process_response(self, request, response):
+-        if self.can(request):
+-            self.profiler.create_stats()
++        if hasattr(request, self.PROFILER_REQUEST_ATTR_NAME):
++            profiler = getattr(request, self.PROFILER_REQUEST_ATTR_NAME)
++            profiler.create_stats()
+             if 'download' in request.GET:
+                 import marshal
+
+-                output = marshal.dumps(self.profiler.stats)
++                output = marshal.dumps(profiler.stats)
+                 response = HttpResponse(
+                     output, content_type='application/octet-stream')
+                 response['Content-Disposition'] = 'attachment;' \
+@@ -76,9 +90,14 @@
                  response['Content-Length'] = len(output)
              else:
                  io = StringIO()
 -                stats = pstats.Stats(self.profiler, stream=io)
++                stats = Stats(profiler, stream=io)
+
 -                stats.strip_dirs().sort_stats(request.GET.get('sort', 'time'))
-+                stats = Stats(self.profiler, stream=io)
 +                if request.GET.get('stripdirs', False):
 +                    stats = stats.strip_dirs()
 +                filter = request.GET.get('filter', None)
@@ -36,5 +77,5 @@
 +                    stats.filter_stats(filter)
 +                stats.sort_stats(request.GET.get('psort') or 'time')
                  stats.print_stats(int(request.GET.get('count', 100)))
+
                  response = HttpResponse('<pre>%s</pre>' % io.getvalue())
-         return response
diff --git a/patch/add-django-http-cookie-value-none.patch b/patch/add-django-http-cookie-value-none.patch
deleted file mode 100644
index ab75235f2e..0000000000
--- a/patch/add-django-http-cookie-value-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- django/http/response.py.orig	2020-07-08 14:34:42.776562458 +0200
-+++ django/http/response.py	2020-07-08 14:35:56.454687322 +0200
-@@ -197,8 +197,8 @@
-         if httponly:
-             self.cookies[key]['httponly'] = True
-         if samesite:
--            if samesite.lower() not in ('lax', 'strict'):
--                raise ValueError('samesite must be "lax" or "strict".')
-+            if samesite.lower() not in ('lax', 'strict', 'none'):
-+                raise ValueError('samesite must be "lax", "strict", or "none", not "%s".' % samesite)
-             self.cookies[key]['samesite'] = samesite
- 
-     def setdefault(self, key, value):
diff --git a/patch/change-oidc-provider-field-sizes-228.patch b/patch/change-oidc-provider-field-sizes-228.patch
index 11dce45bb3..0a96fbc414 100644
--- a/patch/change-oidc-provider-field-sizes-228.patch
+++ b/patch/change-oidc-provider-field-sizes-228.patch
@@ -143,16 +143,7 @@ diff -ur oidc_provider.orig/migrations/0015_change_client_code.py oidc_provider/
 diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc_provider/migrations/0016_userconsent_and_verbosenames.py
 --- oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py	2018-04-13 21:43:28.000000000 +0200
 +++ oidc_provider/migrations/0016_userconsent_and_verbosenames.py	2020-06-07 13:34:26.826716519 +0200
-@@ -20,7 +20,7 @@
-             model_name='userconsent',
-             name='date_given',
-             field=models.DateTimeField(
--                default=datetime.datetime(2016, 6, 10, 17, 53, 48, 889808, tzinfo=utc), verbose_name='Date Given'),
-+                default=datetime.datetime(2016, 6, 10, 17, 53, 48, 889808), verbose_name='Date Given'),
-             preserve_default=False,
-         ),
-         migrations.AlterField(
-@@ -32,12 +32,12 @@
+@@ -31,12 +31,12 @@
          migrations.AlterField(
              model_name='client',
              name='client_id',
@@ -167,7 +158,7 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc
          ),
          migrations.AlterField(
              model_name='client',
-@@ -84,17 +84,17 @@
+@@ -83,17 +83,17 @@
          migrations.AlterField(
              model_name='code',
              name='code',
@@ -188,7 +179,7 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc
          ),
          migrations.AlterField(
              model_name='code',
-@@ -109,7 +109,7 @@
+@@ -108,7 +108,7 @@
          migrations.AlterField(
              model_name='code',
              name='nonce',
@@ -197,7 +188,7 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc
          ),
          migrations.AlterField(
              model_name='code',
-@@ -135,7 +135,7 @@
+@@ -134,7 +134,7 @@
          migrations.AlterField(
              model_name='token',
              name='access_token',
@@ -206,7 +197,7 @@ diff -ur oidc_provider.orig/migrations/0016_userconsent_and_verbosenames.py oidc
          ),
          migrations.AlterField(
              model_name='token',
-@@ -151,7 +151,7 @@
+@@ -150,7 +150,7 @@
          migrations.AlterField(
              model_name='token',
              name='refresh_token',
@@ -290,7 +281,7 @@ diff -ur oidc_provider.orig/migrations/0021_refresh_token_not_unique.py oidc_pro
 diff -ur oidc_provider.orig/models.py oidc_provider/models.py
 --- oidc_provider.orig/models.py	2018-09-14 21:34:52.000000000 +0200
 +++ oidc_provider/models.py	2020-06-07 13:34:26.830716635 +0200
-@@ -67,8 +67,8 @@
+@@ -66,8 +66,8 @@
          verbose_name=_(u'Client Type'),
          help_text=_(u'<b>Confidential</b> clients are capable of maintaining the confidentiality'
                      u' of their credentials. <b>Public</b> clients are incapable.'))
@@ -301,7 +292,7 @@ diff -ur oidc_provider.orig/models.py oidc_provider/models.py
      response_types = models.ManyToManyField(ResponseType)
      jwt_alg = models.CharField(
          max_length=10,
-@@ -78,15 +78,15 @@
+@@ -77,15 +77,15 @@
          help_text=_(u'Algorithm used to encode ID Tokens.'))
      date_created = models.DateField(auto_now_add=True, verbose_name=_(u'Date Created'))
      website_url = models.CharField(
@@ -320,7 +311,7 @@ diff -ur oidc_provider.orig/models.py oidc_provider/models.py
      logo = models.FileField(
          blank=True, default='', upload_to='oidc_provider/clients', verbose_name=_(u'Logo Image'))
      reuse_consent = models.BooleanField(
-@@ -186,12 +186,12 @@
+@@ -185,12 +185,12 @@
  
      user = models.ForeignKey(
          settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE)
@@ -337,7 +328,7 @@ diff -ur oidc_provider.orig/models.py oidc_provider/models.py
  
      class Meta:
          verbose_name = _(u'Authorization Code')
-@@ -205,8 +205,8 @@
+@@ -204,8 +204,8 @@
  
      user = models.ForeignKey(
          settings.AUTH_USER_MODEL, null=True, verbose_name=_(u'User'), on_delete=models.CASCADE)
diff --git a/patch/django-cookie-delete-with-all-settings.patch b/patch/django-cookie-delete-with-all-settings.patch
index 830f031d7f..4ceaf8fceb 100644
--- a/patch/django-cookie-delete-with-all-settings.patch
+++ b/patch/django-cookie-delete-with-all-settings.patch
@@ -1,6 +1,6 @@
 --- django/contrib/messages/storage/cookie.py.orig	2020-08-13 11:10:36.719177122 +0200
 +++ django/contrib/messages/storage/cookie.py	2020-08-13 11:45:23.503463150 +0200
-@@ -92,6 +92,8 @@
+@@ -109,6 +109,8 @@
              response.delete_cookie(
                  self.cookie_name,
                  domain=settings.SESSION_COOKIE_DOMAIN,
@@ -9,38 +9,49 @@
                  samesite=settings.SESSION_COOKIE_SAMESITE,
              )
  
---- django/http/response.py.orig	2020-08-13 11:16:04.060627793 +0200
-+++ django/http/response.py	2020-08-13 11:54:03.482476973 +0200
-@@ -210,12 +210,18 @@
+--- django/http/response.py.orig	2025-12-02 22:12:05.197283001 +0000
++++ django/http/response.py	2025-12-02 22:26:01.396576013 +0000
+@@ -286,20 +286,28 @@
          value = signing.get_cookie_signer(salt=key + salt).sign(value)
          return self.set_cookie(key, value, **kwargs)
- 
--    def delete_cookie(self, key, path='/', domain=None, samesite=None):
-+    def delete_cookie(self, key, path='/', domain=None, secure=False, httponly=False, samesite=None):
-         # Most browsers ignore the Set-Cookie header if the cookie name starts
-         # with __Host- or __Secure- and the cookie doesn't use the secure flag.
--        secure = key.startswith(('__Secure-', '__Host-'))
+
+-    def delete_cookie(self, key, path="/", domain=None, samesite=None):
++    def delete_cookie(self, key, path="/", domain=None, secure=False, httponly=False, samesite=None):
+         # Browsers can ignore the Set-Cookie header if the cookie doesn't use
+         # the secure flag and:
+         # - the cookie name starts with "__Host-" or "__Secure-", or
+         # - the samesite is "none".
+-        secure = key.startswith(("__Secure-", "__Host-")) or (
+-            samesite and samesite.lower() == "none"
+-        )
 +        if key in self.cookies:
-+            domain     = self.cookies[key].get('domain', domain)
-+            secure     = self.cookies[key].get('secure', secure)
-+            httponly   = self.cookies[key].get('httponly', httponly)
-+            samesite   = self.cookies[key].get('samesite', samesite)
++            domain     = self.cookies[key].get("domain", domain)
++            secure     = self.cookies[key].get("secure", secure)
++            httponly   = self.cookies[key].get("httponly", httponly)
++            samesite   = self.cookies[key].get("samesite", samesite)
 +        else:
-+            secure = secure or key.startswith(('__Secure-', '__Host-'))
++            secure = secure or (
++                key.startswith(("__Secure-", "__Host-")) or
++                (samesite and samesite.lower() == "none")
++            )
          self.set_cookie(
--            key, max_age=0, path=path, domain=domain, secure=secure,
-+            key, max_age=0, path=path, domain=domain, secure=secure, httponly=httponly,
-             expires='Thu, 01 Jan 1970 00:00:00 GMT', samesite=samesite,
+             key,
+             max_age=0,
+             path=path,
+             domain=domain,
+             secure=secure,
++            httponly=httponly,
+             expires="Thu, 01 Jan 1970 00:00:00 GMT",
+             samesite=samesite,
          )
- 
 --- django/contrib/sessions/middleware.py.orig	2020-08-13 12:12:12.401898114 +0200
 +++ django/contrib/sessions/middleware.py	2020-08-13 12:14:52.690520659 +0200
-@@ -39,6 +39,8 @@
-                     settings.SESSION_COOKIE_NAME,
-                     path=settings.SESSION_COOKIE_PATH,
-                     domain=settings.SESSION_COOKIE_DOMAIN,
-+                    secure=settings.SESSION_COOKIE_SECURE or None,
-+                    httponly=settings.SESSION_COOKIE_HTTPONLY or None,
-                     samesite=settings.SESSION_COOKIE_SAMESITE,
-                 )
-             else:
+@@ -38,6 +38,8 @@
+                 settings.SESSION_COOKIE_NAME,
+                 path=settings.SESSION_COOKIE_PATH,
+                 domain=settings.SESSION_COOKIE_DOMAIN,
++                secure=settings.SESSION_COOKIE_SECURE or None,
++                httponly=settings.SESSION_COOKIE_HTTPONLY or None,
+                 samesite=settings.SESSION_COOKIE_SAMESITE,
+             )
+             patch_vary_headers(response, ("Cookie",))
diff --git a/patch/fix-django-password-strength-kwargs.patch b/patch/fix-django-password-strength-kwargs.patch
deleted file mode 100644
index 9f24ce932a..0000000000
--- a/patch/fix-django-password-strength-kwargs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- django_password_strength/widgets.py.orig	2020-06-24 16:07:28.479533134 +0200
-+++ django_password_strength/widgets.py	2020-06-24 16:08:09.540714290 +0200
-@@ -8,7 +8,7 @@
-     Form widget to show the user how strong his/her password is.
-     """
- 
--    def render(self, name, value, attrs=None):
-+    def render(self, name, value, **kwargs):
-         strength_markup = """
-         <div style="margin-top: 10px;">
-             <div class="progress" style="margin-bottom: 10px;">
-@@ -30,7 +30,7 @@
-         except KeyError:
-             self.attrs['class'] = 'password_strength'
- 
--        return mark_safe( super(PasswordInput, self).render(name, value, attrs) + strength_markup )
-+        return mark_safe( super(PasswordInput, self).render(name, value, **kwargs) + strength_markup )
- 
-     class Media:
-         js = (
-@@ -48,7 +48,7 @@
-         super(PasswordConfirmationInput, self).__init__(attrs, render_value)
-         self.confirm_with=confirm_with
- 
--    def render(self, name, value, attrs=None):
-+    def render(self, name, value, **kwargs):
-         if self.confirm_with:
-             self.attrs['data-confirm-with'] = 'id_%s' % self.confirm_with
- 
-@@ -68,4 +68,4 @@
-         except KeyError:
-             self.attrs['class'] = 'password_confirmation'
- 
--        return mark_safe( super(PasswordInput, self).render(name, value, attrs) + confirmation_markup )
-+        return mark_safe( super(PasswordInput, self).render(name, value, **kwargs) + confirmation_markup )
-
diff --git a/patch/fix-oidc-access-token-post.patch b/patch/fix-oidc-access-token-post.patch
index 4234fdf61d..00271633e7 100644
--- a/patch/fix-oidc-access-token-post.patch
+++ b/patch/fix-oidc-access-token-post.patch
@@ -11,12 +11,10 @@ diff -ur oidc_provider.orig/lib/utils/common.py oidc_provider/lib/utils/common.p
  
 --- oidc_provider.orig/lib/utils/oauth2.py	2020-05-22 15:09:21.009044320 +0200
 +++ oidc_provider/lib/utils/oauth2.py	2020-06-05 17:05:23.271285858 +0200
-@@ -21,10 +21,14 @@
-     """
+@@ -22,9 +22,13 @@
      auth_header = request.META.get('HTTP_AUTHORIZATION', '')
  
--    if re.compile('^[Bb]earer\s{1}.+$').match(auth_header):
-+    if re.compile(r'^[Bb]earer\s{1}.+$').match(auth_header):
+     if re.compile(r'^[Bb]earer\s{1}.+$').match(auth_header):
          access_token = auth_header.split()[1]
 -    else:
 +    elif request.method == 'GET':
@@ -27,13 +25,4 @@ diff -ur oidc_provider.orig/lib/utils/common.py oidc_provider/lib/utils/common.p
 +        access_token = ''
  
      return access_token
- 
-@@ -39,7 +43,7 @@
-     """
-     auth_header = request.META.get('HTTP_AUTHORIZATION', '')
- 
--    if re.compile('^Basic\s{1}.+$').match(auth_header):
-+    if re.compile(r'^Basic\s{1}.+$').match(auth_header):
-         b64_user_pass = auth_header.split()[1]
-         try:
-             user_pass = b64decode(b64_user_pass).decode('utf-8').split(':')
+
diff --git a/patch/tastypie-django22-fielderror-response.patch b/patch/tastypie-django22-fielderror-response.patch
index bb4decd756..3b4418fc66 100644
--- a/patch/tastypie-django22-fielderror-response.patch
+++ b/patch/tastypie-django22-fielderror-response.patch
@@ -1,26 +1,26 @@
---- tastypie/resources.py.orig	2020-08-24 13:14:25.463166100 +0200
-+++ tastypie/resources.py	2020-08-24 13:15:55.133759224 +0200
-@@ -15,7 +15,7 @@
+--- tastypie/resources.py.orig	2025-07-29 19:00:01.526948002 +0000
++++ tastypie/resources.py	2025-07-29 19:07:15.324127008 +0000
+@@ -12,7 +12,7 @@
      ObjectDoesNotExist, MultipleObjectsReturned, ValidationError, FieldDoesNotExist
  )
  from django.core.signals import got_request_exception
 -from django.core.exceptions import ImproperlyConfigured
 +from django.core.exceptions import ImproperlyConfigured, FieldError
  from django.db.models.fields.related import ForeignKey
- try:
-     from django.contrib.gis.db.models.fields import GeometryField
-@@ -2207,6 +2207,8 @@
+ from django.urls.conf import re_path
+ from tastypie.utils.timezone import make_naive_utc
+@@ -2216,6 +2216,8 @@
              return self.authorized_read_list(objects, bundle)
          except ValueError:
              raise BadRequest("Invalid resource lookup data provided (mismatched type).")
 +        except FieldError as e:
 +            raise BadRequest("Invalid resource lookup: %s." % e)
- 
+
      def obj_get(self, bundle, **kwargs):
          """
 --- tastypie/paginator.py.orig	2020-08-25 15:24:46.391588425 +0200
 +++ tastypie/paginator.py	2020-08-25 15:24:53.591797122 +0200
-@@ -128,6 +128,8 @@
+@@ -124,6 +124,8 @@
          except (AttributeError, TypeError):
              # If it's not a QuerySet (or it's ilk), fallback to ``len``.
              return len(self.objects)
diff --git a/playwright/.gitignore b/playwright/.gitignore
index 75e854d8dc..f38d036a79 100644
--- a/playwright/.gitignore
+++ b/playwright/.gitignore
@@ -2,3 +2,4 @@ node_modules/
 /test-results/
 /playwright-report/
 /playwright/.cache/
+auth.json
\ No newline at end of file
diff --git a/playwright/.npmrc b/playwright/.npmrc
new file mode 100644
index 0000000000..631d34757b
--- /dev/null
+++ b/playwright/.npmrc
@@ -0,0 +1 @@
+save-prefix = ""
diff --git a/playwright/helpers/common.js b/playwright/helpers/common.js
index 5ba39ba022..c4dd7e2640 100644
--- a/playwright/helpers/common.js
+++ b/playwright/helpers/common.js
@@ -13,5 +13,29 @@ module.exports = {
 
       return rect.top < bottom && rect.top > 0 - rect.height
     })
+  },
+  /**
+   * Override page DateTime with a new value
+   *
+   * @param {Object} page Page object
+   * @param {Object} dateTimeOverride New DateTime object
+   */
+  overridePageDateTime: async (page, dateTimeOverride) => {
+    await page.addInitScript(`{
+      // Extend Date constructor to default to fixed time
+      Date = class extends Date {
+        constructor(...args) {
+          if (args.length === 0) {
+            super(${dateTimeOverride.toMillis()});
+          } else {
+            super(...args);
+          }
+        }
+      }
+      // Override Date.now() to start from fixed time
+      const __DateNowOffset = ${dateTimeOverride.toMillis()} - Date.now();
+      const __DateNow = Date.now;
+      Date.now = () => __DateNow() + __DateNowOffset;
+    }`)
   }
 }
diff --git a/playwright/helpers/meeting.js b/playwright/helpers/meeting.js
index bb5c19da8c..634ca2e8c6 100644
--- a/playwright/helpers/meeting.js
+++ b/playwright/helpers/meeting.js
@@ -22,7 +22,7 @@ const sessionsWithWebex = [3, 4]
 // Use constant randomness seed
 seedrandom(TEST_SEED.toString(), { global: true })
 faker.seed(TEST_SEED)
-const { sample, sampleSize } = _.runInContext()
+const { random, sample, sampleSize } = _.runInContext()
 
 /**
  * Generate area response from label + children
@@ -60,7 +60,7 @@ function createGroup ({ label, mayBeBof = false, toggledBy = [] }) {
   }
 
   // 10% chance of BoF, if enabled
-  const isBof = mayBeBof && faker.mersenne.rand(100, 0) < 10
+  const isBof = mayBeBof && random(0, 100) < 10
   if (isBof) {
     toggledBy.push('bof')
   }
@@ -121,6 +121,7 @@ let lastSessionId = 25000
 let lastRecordingId = 150000
 function createEvent ({
   name = '',
+  slotName = '',
   startDateTime,
   duration = '1h',
   area,
@@ -138,7 +139,7 @@ function createEvent ({
 }, floors) {
   const floor = sample(floors)
   const room = hasLocation ? sample(floor.rooms) : { name: 'Somewhere' }
-  const eventName = name ?? faker.lorem.sentence(faker.mersenne.rand(5, 2))
+  const eventName = name ?? faker.lorem.sentence(random(2, 5))
   return {
     id: ++lastEventId,
     sessionId: ++lastSessionId,
@@ -152,6 +153,7 @@ function createEvent ({
     acronym: group.keyword,
     duration: typeof duration === 'string' ? ms(duration) / 1000 : duration,
     name: eventName,
+    slotName: slotName,
     startDateTime: startDateTime.toISO({ includeOffset: false, suppressMilliseconds: true }),
     status,
     type,
@@ -162,7 +164,7 @@ function createEvent ({
       'hackathon-sessc'
     ],
     groupAcronym: group.keyword,
-    groupName: faker.lorem.sentence(faker.mersenne.rand(5, 2)),
+    groupName: faker.lorem.sentence(random(2, 5)),
     groupParent: {
       acronym: area.keyword
     },
@@ -213,11 +215,11 @@ module.exports = {
         break
       }
       case 'future': {
-        startDate = DateTime.fromISO(faker.date.future(1).toISOString(), { zone: 'Asia/Tokyo' }).startOf('week').minus({ days: 2 })
+        startDate = DateTime.fromISO(faker.date.future({ years: 1 }).toISOString(), { zone: 'Asia/Tokyo' }).startOf('week').minus({ days: 2 })
         break
       }
       default: {
-        startDate = DateTime.fromISO(faker.date.past(5, DateTime.utc().minus({ months: 3 }), { zone: 'Asia/Tokyo' }).toISOString()).startOf('week').minus({ days: 2 })
+        startDate = DateTime.fromISO(faker.date.past({ years: 5, refDate: DateTime.utc().minus({ months: 3 }) }).toISOString(), { zone: 'Asia/Tokyo' }).startOf('week').minus({ days: 2 })
         break
       }
     }
@@ -234,13 +236,13 @@ module.exports = {
         short: `L${floorIdx}`,
         width: floor.width,
         height: floor.height,
-        rooms: _.times(faker.mersenne.rand(10, 5), (ridx) => {
+        rooms: _.times(random(5, 10), (ridx) => {
           const roomName = `${faker.science.chemicalElement().name} ${floorIdx}-${ridx + 1}`
           // Keep 10% margin on each side
           const roomXUnit = Math.round(floor.width / 10)
           const roomYUnit = Math.round(floor.height / 10)
-          const roomX = faker.mersenne.rand(roomXUnit * 8, roomXUnit)
-          const roomY = faker.mersenne.rand(roomYUnit * 8, roomYUnit)
+          const roomX = random(roomXUnit, roomXUnit * 8)
+          const roomY = random(roomYUnit, roomYUnit * 8)
           return {
             id: floorIdx * 100 + ridx,
             name: roomName,
@@ -267,7 +269,7 @@ module.exports = {
       for (const area of firstAreasNames) {
         firstAreas.push(createArea({
           label: area,
-          children: _.times(faker.mersenne.rand(25, 2), (idx) => {
+          children: _.times(random(2, 25), (idx) => {
             return createGroup({ mayBeBof: true })
           })
         }))
@@ -280,7 +282,7 @@ module.exports = {
       for (const area of ['UVW', 'XYZ0']) {
         secondAreas.push(createArea({
           label: area,
-          children: _.times(faker.mersenne.rand(25, 2), (idx) => {
+          children: _.times(random(2, 25), (idx) => {
             return createGroup({ mayBeBof: true })
           })
         }))
@@ -393,7 +395,7 @@ module.exports = {
         name: 'Hackathon Kickoff',
         startDateTime: day1.set({ hour: 10, minute: 30 }),
         duration: '30m',
-        ...findAreaGroup('hackathon-kickoff', categories[2]),
+        ...findAreaGroup('hackathon', categories[2]),
         showAgenda: true,
         hasAgenda: true,
         hasRecordings: true,
@@ -514,7 +516,7 @@ module.exports = {
         _.times(8, () => { // 8 lanes per session time
           const { area, ...group } = daySessions.pop()
           schedule.push(createEvent({
-            name: 'Session I',
+            slotName: 'Session I',
             startDateTime: curDay.set({ hour: 10 }),
             duration: '2h',
             type: 'regular',
@@ -543,7 +545,7 @@ module.exports = {
         _.times(8, () => { // 8 lanes per session time
           const { area, ...group } = daySessions.pop()
           schedule.push(createEvent({
-            name: 'Session II',
+            slotName: 'Session II',
             startDateTime: curDay.set({ hour: 13, minute: 30 }),
             duration: '1h',
             type: 'regular',
@@ -574,7 +576,7 @@ module.exports = {
           _.times(8, () => { // 8 lanes per session time
             const { area, ...group } = daySessions.pop()
             schedule.push(createEvent({
-              name: 'Session III',
+              slotName: 'Session III',
               startDateTime: curDay.set({ hour: 15 }),
               duration: '2h',
               type: 'regular',
@@ -607,6 +609,9 @@ module.exports = {
             startDateTime: curDay.set({ hour: 17, minute: 30 }),
             duration: '2h',
             type: 'plenary',
+            showAgenda: true,
+            hasAgenda: true,
+            hasRecordings: true,
             ...findAreaGroup('ietf-plenary', categories[2])
           }, floors))
         }
@@ -618,17 +623,17 @@ module.exports = {
     return {
       meeting: {
         number: '123',
-        city: faker.address.cityName(),
+        city: faker.location.city(),
         startDate: startDate.toISODate(),
         endDate: endDate.toISODate(),
-        updated: faker.date.between(startDate.toISO(), endDate.toISO()).toISOString(),
+        updated: faker.date.between({ from: startDate.toISO(), to: endDate.toISO() }).toISOString(),
         timezone: 'Asia/Tokyo',
         infoNote: faker.lorem.paragraph(4),
         warningNote: ''
       },
       categories,
       isCurrentMeeting: dateMode !== 'past',
-      useHedgeDoc: true,
+      usesNotes: true,
       schedule,
       floors
     }
diff --git a/playwright/package-lock.json b/playwright/package-lock.json
index 688c76b402..abe2518ef2 100644
--- a/playwright/package-lock.json
+++ b/playwright/package-lock.json
@@ -5,38 +5,79 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "playwright",
-      "version": "1.0.0",
-      "license": "ISC",
       "dependencies": {
-        "@faker-js/faker": "^7.5.0",
-        "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21",
-        "luxon": "^3.0.3",
-        "ms": "^2.1.3",
-        "seedrandom": "^3.0.5",
-        "slugify": "^1.6.5"
+        "@faker-js/faker": "8.4.1",
+        "lodash": "4.17.21",
+        "lodash-es": "4.17.21",
+        "luxon": "3.4.4",
+        "ms": "2.1.3",
+        "seedrandom": "3.0.5",
+        "slugify": "1.6.6"
       },
       "devDependencies": {
-        "@playwright/test": "^1.25.2",
-        "eslint": "^8.23.1",
-        "eslint-config-standard": "^17.0.0",
-        "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-n": "^15.2.5",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^6.0.1"
+        "@playwright/test": "1.42.1",
+        "eslint": "8.57.0",
+        "eslint-config-standard": "17.1.0",
+        "eslint-plugin-import": "2.29.1",
+        "eslint-plugin-n": "16.6.2",
+        "eslint-plugin-node": "11.1.0",
+        "eslint-plugin-promise": "6.1.1",
+        "npm-check-updates": "16.14.18"
+      }
+    },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
+      "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -50,39 +91,44 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@faker-js/faker": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.5.0.tgz",
-      "integrity": "sha512-8wNUCCUHvfvI0gQpDUho/3gPzABffnCn5um65F8dzQ86zz6dlt4+nmAA7PQUc8L+eH+9RgR/qzy5N/8kN0Ozdw==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz",
+      "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fakerjs"
+        }
+      ],
       "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=6.0.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
+        "npm": ">=6.14.13"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
-      "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
       },
       "engines": {
         "node": ">=10.10.0"
       }
     },
-    "node_modules/@humanwhocodes/gitignore-to-minimatch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -97,11 +143,78 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+      "dev": true
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -137,358 +250,495 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@playwright/test": {
-      "version": "1.25.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.25.2.tgz",
-      "integrity": "sha512-6qPznIR4Fw02OMbqXUPMG6bFFg1hDVNEdihKy0t9K0dmRbus1DyP5Q5XFQhGwEHQkLG5hrSfBuu9CW/foqhQHQ==",
+    "node_modules/@npmcli/fs": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
+      "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*",
-        "playwright-core": "1.25.2"
-      },
-      "bin": {
-        "playwright": "cli.js"
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">=14"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "18.7.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.16.tgz",
-      "integrity": "sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+    "node_modules/@npmcli/git": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz",
+      "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==",
       "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "@npmcli/promise-spawn": "^6.0.0",
+        "lru-cache": "^7.4.4",
+        "npm-pick-manifest": "^8.0.0",
+        "proc-log": "^3.0.0",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+    "node_modules/@npmcli/git/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/@npmcli/git/node_modules/which": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "isexe": "^2.0.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "node_modules/@npmcli/installed-package-contents": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz",
+      "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==",
       "dev": true,
+      "dependencies": {
+        "npm-bundled": "^3.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "bin": {
+        "installed-package-contents": "lib/index.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@npmcli/node-gyp": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
+      "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@npmcli/promise-spawn": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz",
+      "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "which": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+    "node_modules/@npmcli/promise-spawn/node_modules/which": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
+        "isexe": "^2.0.0"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "node-which": "bin/which.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "node_modules/@npmcli/run-script": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz",
+      "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==",
       "dev": true,
+      "dependencies": {
+        "@npmcli/node-gyp": "^3.0.0",
+        "@npmcli/promise-spawn": "^6.0.0",
+        "node-gyp": "^9.0.0",
+        "read-package-json-fast": "^3.0.0",
+        "which": "^3.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+    "node_modules/@npmcli/run-script/node_modules/which": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+      "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
+        "isexe": "^2.0.0"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "node-which": "bin/which.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/@playwright/test": {
+      "version": "1.42.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.1.tgz",
+      "integrity": "sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ==",
       "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "playwright": "1.42.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+    "node_modules/@pnpm/network.ca-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz",
+      "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "graceful-fs": "4.2.10"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12.22.0"
       }
     },
-    "node_modules/builtins": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+    "node_modules/@pnpm/npm-conf": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-1.0.5.tgz",
+      "integrity": "sha512-hD8ml183638O3R6/Txrh0L8VzGOrFXgRtRDG4qQC4tONdZ5Z1M+tlUUDUvrjYdmK6G+JTBTeaCLMna11cXzi8A==",
       "dev": true,
       "dependencies": {
-        "semver": "^7.0.0"
+        "@pnpm/network.ca-file": "^1.0.1",
+        "config-chain": "^1.1.11"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+    "node_modules/@sigstore/bundle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz",
+      "integrity": "sha512-yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "@sigstore/protobuf-specs": "^0.2.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+    "node_modules/@sigstore/protobuf-specs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz",
+      "integrity": "sha512-8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@sigstore/tuf": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz",
+      "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@sigstore/protobuf-specs": "^0.2.0",
+        "tuf-js": "^1.1.7"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz",
+      "integrity": "sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/@szmarczak/http-timer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "defer-to-connect": "^2.0.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=14.16"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+    "node_modules/@tufjs/canonical-json": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz",
+      "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+    "node_modules/@tufjs/models": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz",
+      "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==",
       "dev": true,
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "@tufjs/canonical-json": "1.0.0",
+        "minimatch": "^9.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@tufjs/models/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@tufjs/models/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=16 || 14 >=14.17"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
       "dev": true
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
-    "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+    "node_modules/@types/semver-utils": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz",
+      "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==",
+      "dev": true
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "debug": "4"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/agentkeepalive": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
+      "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "depd": "^2.0.0",
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/dir-glob": {
+    "node_modules/ansi-align": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
       "dev": true,
       "dependencies": {
-        "path-type": "^4.0.0"
+        "string-width": "^4.1.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+    "node_modules/aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "dev": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-      "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.2",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
+        "is-array-buffer": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
+      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "is-string": "^1.0.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -497,24 +747,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
+      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
       "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -523,547 +775,553 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint": {
-      "version": "8.23.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
-      "integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.3.2",
-        "@humanwhocodes/config-array": "^0.10.4",
-        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "globby": "^11.1.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-standard": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peerDependencies": {
-        "eslint": "^8.0.1",
-        "eslint-plugin-import": "^2.25.2",
-        "eslint-plugin-n": "^15.0.0",
-        "eslint-plugin-promise": "^6.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/boxen": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.0.0.tgz",
+      "integrity": "sha512-j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7"
+        "ansi-align": "^3.0.1",
+        "camelcase": "^7.0.0",
+        "chalk": "^5.0.1",
+        "cli-boxes": "^3.0.0",
+        "string-width": "^5.1.2",
+        "type-fest": "^2.13.0",
+        "widest-line": "^4.0.1",
+        "wrap-ansi": "^8.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=14.16"
       },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/boxen/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/eslint-plugin-es": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+    "node_modules/boxen/node_modules/chalk": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
+      "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
       "dev": true,
-      "dependencies": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
       "engines": {
-        "node": ">=8.10.0"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+    "node_modules/boxen/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/boxen/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+    "node_modules/boxen/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
       "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+    "node_modules/boxen/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=12.20"
       },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
+        "fill-range": "^7.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
-    "node_modules/eslint-plugin-n": {
-      "version": "15.2.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.2.5.tgz",
-      "integrity": "sha512-8+BYsqiyZfpu6NXmdLOXVUfk8IocpCjpd8nMRRH0A9ulrcemhb2VI9RSJMEy5udx++A/YcVPD11zT8hpFq368g==",
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
       "dev": true,
-      "dependencies": {
-        "builtins": "^5.0.1",
-        "eslint-plugin-es": "^4.1.0",
-        "eslint-utils": "^3.0.0",
-        "ignore": "^5.1.1",
-        "is-core-module": "^2.10.0",
-        "minimatch": "^3.1.2",
-        "resolve": "^1.22.1",
-        "semver": "^7.3.7"
-      },
       "engines": {
-        "node": ">=12.22.0"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+    "node_modules/builtins": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
       "dev": true,
       "dependencies": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=5.16.0"
+        "semver": "^7.0.0"
       }
     },
-    "node_modules/eslint-plugin-node/node_modules/eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
+    "node_modules/cacache": {
+      "version": "17.1.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz",
+      "integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==",
       "dev": true,
       "dependencies": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
+        "@npmcli/fs": "^3.1.0",
+        "fs-minipass": "^3.0.0",
+        "glob": "^10.2.2",
+        "lru-cache": "^7.7.1",
+        "minipass": "^5.0.0",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "p-map": "^4.0.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^3.0.0"
       },
       "engines": {
-        "node": ">=8.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/eslint-plugin-node/node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+    "node_modules/cacache/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/cacache/node_modules/glob": {
+      "version": "10.3.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
+      "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.0.3",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/cjs/src/bin.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/eslint-plugin-node/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
-    "node_modules/eslint-plugin-node/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+    "node_modules/cacache/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/eslint-plugin-promise": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.1.tgz",
-      "integrity": "sha512-uM4Tgo5u3UWQiroOyDEsYcVMOo7re3zmno0IZmB5auxoaQNIceAbXEkSt8RNrKtaYehARHG06pYK6K1JhtP0Zw==",
+    "node_modules/cacheable-lookup": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "node": ">=14.16"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+    "node_modules/cacheable-request": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.2.tgz",
+      "integrity": "sha512-KxjQZM3UIo7/J6W4sLpwFvu1GB3Whv8NtZ8ZrUL284eiQjiXeeqWTdhixNrp/NLZ/JNuFBo6BD4ZaO8ZJ5BN8Q==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
+        "@types/http-cache-semantics": "^4.0.1",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.0",
+        "keyv": "^4.5.0",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^7.2.0",
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=14.16"
       }
     },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+    "node_modules/call-bind": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+    "node_modules/camelcase": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.0.tgz",
+      "integrity": "sha512-JToIvOmz6nhGsUhAYScbo2d6Py5wojjNfoxoc2mEVLUdJ70gJK2gnd+ABY1Tc3sVMyK7QDPtN0T/XdlCQWITyQ==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
       "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=10"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+    "node_modules/ci-info": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.6.1.tgz",
+      "integrity": "sha512-up5ggbaDqOqJ4UqLKZ2naVkyqSJQgJi5lwD6b6mM748ysrghDBX0bx/qJTUHzw7zu6Mq4gycviSF5hJnwceD8w==",
       "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=8"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true,
       "engines": {
-        "node": ">=4.0"
+        "node": ">=6"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+    "node_modules/cli-boxes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
+      "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+    "node_modules/cli-table3": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
+      "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
       "dev": true,
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "string-width": "^4.2.0"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": "10.* || >= 12.*"
+      },
+      "optionalDependencies": {
+        "@colors/colors": "1.5.0"
       }
     },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+    "node_modules/config-chain": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
       "dev": true,
       "dependencies": {
-        "reusify": "^1.0.4"
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
       }
     },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+    "node_modules/config-chain/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/configstore": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz",
+      "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==",
       "dev": true,
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "dot-prop": "^6.0.1",
+        "graceful-fs": "^4.2.6",
+        "unique-string": "^3.0.0",
+        "write-file-atomic": "^3.0.3",
+        "xdg-basedir": "^5.0.1"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/yeoman/configstore?sponsor=1"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 8"
       }
     },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/crypto-random-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz",
+      "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "type-fest": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=12"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -1071,153 +1329,157 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+    "node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "mimic-response": "^3.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
       "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "path-type": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+    "node_modules/dot-prop": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
+      "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
       "dev": true,
       "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
+        "is-obj": "^2.0.0"
       },
       "engines": {
         "node": ">=10"
@@ -1226,59 +1488,129 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "function-bind": "^1.1.1"
-      },
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">=6"
       }
     },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
+    "node_modules/es-abstract": {
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
+      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
       "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.2",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.5",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.2",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.12",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
       "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "hasown": "^2.0.0"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -1286,487 +1618,684 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+    "node_modules/escape-goat": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
+      "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==",
       "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
       "engines": {
-        "node": ">= 4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+    "node_modules/eslint": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
       "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+    "node_modules/eslint-compat-utils": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz",
+      "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==",
       "dev": true,
       "engines": {
-        "node": ">=0.8.19"
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+    "node_modules/eslint-config-standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
       "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^8.0.1",
+        "eslint-plugin-import": "^2.25.2",
+        "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
+        "eslint-plugin-promise": "^6.0.0"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+    "node_modules/eslint-module-utils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "debug": "^3.2.7"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
-    "node_modules/is-callable": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.5.tgz",
-      "integrity": "sha512-ZIWRujF6MvYGkEuHMYtFRkL2wAtFw89EHfKlXrkPkjQZZRWeh9L1q3SV13NIfHnqxugjLvAOkEHx9mb1zcMnEw==",
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+    "node_modules/eslint-plugin-es-x": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.5.0.tgz",
+      "integrity": "sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "@eslint-community/eslint-utils": "^4.1.2",
+        "@eslint-community/regexpp": "^4.6.0",
+        "eslint-compat-utils": "^0.1.2"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/ota-meshi"
+      },
+      "peerDependencies": {
+        "eslint": ">=8"
       }
     },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+    "node_modules/eslint-plugin-import": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.8.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "esutils": "^2.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-n": {
+      "version": "16.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz",
+      "integrity": "sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==",
       "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "builtins": "^5.0.1",
+        "eslint-plugin-es-x": "^7.5.0",
+        "get-tsconfig": "^4.7.0",
+        "globals": "^13.24.0",
+        "ignore": "^5.2.4",
+        "is-builtin-module": "^3.2.1",
+        "is-core-module": "^2.12.1",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.2",
+        "semver": "^7.5.3"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+    "node_modules/eslint-plugin-node": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
+      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
       "dev": true,
+      "dependencies": {
+        "eslint-plugin-es": "^3.0.0",
+        "eslint-utils": "^2.0.0",
+        "ignore": "^5.1.1",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
+      },
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">=8.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.16.0"
       }
     },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+    "node_modules/eslint-plugin-node/node_modules/eslint-plugin-es": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
+      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8.10.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
       }
     },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+    "node_modules/eslint-plugin-node/node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "eslint-visitor-keys": "^1.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/mysticatea"
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+    "node_modules/eslint-plugin-node/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-plugin-node/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-promise": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
+      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+    "node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/js-sdsl": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "dependencies": {
-        "argparse": "^2.0.1"
+        "estraverse": "^5.1.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.0"
+        "estraverse": "^5.2.0"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "engines": {
+        "node": ">=4.0"
       }
     },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    "node_modules/exponential-backoff": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
+      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
+      "dev": true
     },
-    "node_modules/lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/luxon": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.0.3.tgz",
-      "integrity": "sha512-+EfHWnF+UT7GgTnq5zXg3ldnTKL2zdv7QJgsU5bjjpbH17E3qi/puMhQyJVYuCq+FRkogvB5WB6iVvUr+E4a7w==",
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">= 6"
       }
     },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fast-memoize": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz",
+      "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=8"
       }
     },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
     },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
-    "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz",
+      "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==",
       "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+    "node_modules/form-data-encoder": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.3.tgz",
+      "integrity": "sha512-KqU0nnPMgIJcCOFTNJFEA8epcseEaoox4XZffTgy8jlI6pL/5EFyR54NRG7CnCJN0biY7q52DO3MH6/sJ/TKlQ==",
       "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 14.17"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+    "node_modules/fp-and-or": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz",
+      "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz",
+      "integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
+        "minipass": "^5.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1775,40 +2304,54 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
-      "dependencies": {
-        "wrappy": "1"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+    "node_modules/gauge": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
       "dev": true,
       "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.3",
+        "console-control-strings": "^1.1.0",
+        "has-unicode": "^2.0.1",
+        "signal-exit": "^3.0.7",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.5"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+    "node_modules/get-intrinsic": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dev": true,
       "dependencies": {
-        "yocto-queue": "^0.1.0"
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -1816,14 +2359,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
       "engines": {
         "node": ">=10"
       },
@@ -1831,1769 +2371,6574 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
       "dependencies": {
-        "callsites": "^3.0.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/get-tsconfig": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+    "node_modules/global-dirs": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+      "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
       "dev": true,
+      "dependencies": {
+        "ini": "2.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+    "node_modules/global-dirs/node_modules/ini": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
       "dev": true,
       "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "node": ">=10"
       }
     },
-    "node_modules/playwright-core": {
-      "version": "1.25.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.25.2.tgz",
-      "integrity": "sha512-0yTbUE9lIddkEpLHL3u8PoCL+pWiZtj5A/j3U7YoNjcmKKDGBnCrgHJMzwd2J5vy6l28q4ki3JIuz7McLHhl1A==",
+    "node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
-      "bin": {
-        "playwright": "cli.js"
+      "dependencies": {
+        "type-fest": "^0.20.2"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
       "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+    "node_modules/got": {
+      "version": "12.5.3",
+      "resolved": "https://registry.npmjs.org/got/-/got-12.5.3.tgz",
+      "integrity": "sha512-8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "@sindresorhus/is": "^5.2.0",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.1",
+        "decompress-response": "^6.0.0",
+        "form-data-encoder": "^2.1.2",
+        "get-stream": "^6.0.1",
+        "http2-wrapper": "^2.1.10",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^3.0.0",
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=14.16"
       },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
       }
     },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
+        "get-intrinsic": "^1.2.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
       "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
       "dependencies": {
-        "glob": "^7.1.3"
+        "has-symbols": "^1.0.2"
       },
-      "bin": {
-        "rimraf": "bin.js"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "dev": true
+    },
+    "node_modules/has-yarn": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz",
+      "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/seedrandom": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
-    },
-    "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "function-bind": "^1.1.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+    "node_modules/hosted-git-info": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz",
+      "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==",
       "dev": true,
       "dependencies": {
-        "shebang-regex": "^3.0.0"
+        "lru-cache": "^7.5.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz",
+      "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "node_modules/http2-wrapper": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz",
+      "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==",
       "dev": true,
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.2.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10.19.0"
       }
     },
-    "node_modules/slugify": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz",
-      "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==",
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "ms": "^2.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+    "node_modules/ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/ignore-walk": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz",
+      "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "minimatch": "^9.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/ignore-walk/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/ignore-walk/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true,
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ini": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
+      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+    "node_modules/internal-slot": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
+      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
       "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.2",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+    "node_modules/ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
       "dev": true
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+    "node_modules/is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dev": true,
       "dependencies": {
-        "is-number": "^7.0.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
       },
-      "engines": {
-        "node": ">=8.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
       "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "^1.2.1"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
       "dev": true,
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+    "node_modules/is-ci": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
       "dev": true,
       "dependencies": {
-        "punycode": "^2.1.0"
+        "ci-info": "^3.2.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
       }
     },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
       "dependencies": {
-        "isexe": "^2.0.0"
+        "hasown": "^2.0.0"
       },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-installed-globally": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
+      "dev": true,
+      "dependencies": {
+        "global-dirs": "^3.0.0",
+        "is-path-inside": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "dev": true
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-npm": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz",
+      "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-yarn-global": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz",
+      "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jju": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+      "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
+      "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/json-parse-helpfulerror": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+      "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==",
+      "dev": true,
+      "dependencies": {
+        "jju": "^1.1.0"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/jsonlines": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz",
+      "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==",
+      "dev": true
+    },
+    "node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/keyv": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
+      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/latest-version": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz",
+      "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==",
+      "dev": true,
+      "dependencies": {
+        "package-json": "^8.1.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lowercase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/luxon": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
+      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
+      "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
+      "dev": true,
+      "dependencies": {
+        "agentkeepalive": "^4.2.1",
+        "cacache": "^17.0.0",
+        "http-cache-semantics": "^4.1.1",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^7.7.1",
+        "minipass": "^5.0.0",
+        "minipass-fetch": "^3.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^7.0.0",
+        "ssri": "^10.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-collect/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz",
+      "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^5.0.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.1.2"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.13"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-flush/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-json-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.3.1",
+        "minipass": "^3.0.0"
+      }
+    },
+    "node_modules/minipass-json-stream/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-pipeline/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-gyp": {
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz",
+      "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==",
+      "dev": true,
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "exponential-backoff": "^3.1.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^11.0.3",
+        "nopt": "^6.0.0",
+        "npmlog": "^6.0.0",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": "^12.13 || ^14.13 || >=16"
+      }
+    },
+    "node_modules/nopt": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
+      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "^1.0.0"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
+      "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^6.0.0",
+        "is-core-module": "^2.8.1",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
+      "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^7.5.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-7.2.0.tgz",
+      "integrity": "sha512-uhXOdZry0L6M2UIo9BTt7FdpBDiAGN/7oItedQwPKh8jh31ZlvC8U9Xl/EJ3aijDHaywXTW3QbZ6LuCocur1YA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-bundled": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz",
+      "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==",
+      "dev": true,
+      "dependencies": {
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-check-updates": {
+      "version": "16.14.18",
+      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.18.tgz",
+      "integrity": "sha512-9iaRe9ohx9ykdbLjPRIYcq1A0RkrPYUx9HmQK1JIXhfxtJCNE/+497H9Z4PGH6GWRALbz5KF+1iZoySK2uSEpQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/semver-utils": "^1.1.1",
+        "chalk": "^5.3.0",
+        "cli-table3": "^0.6.3",
+        "commander": "^10.0.1",
+        "fast-memoize": "^2.5.2",
+        "find-up": "5.0.0",
+        "fp-and-or": "^0.1.4",
+        "get-stdin": "^8.0.0",
+        "globby": "^11.0.4",
+        "hosted-git-info": "^5.1.0",
+        "ini": "^4.1.1",
+        "js-yaml": "^4.1.0",
+        "json-parse-helpfulerror": "^1.0.3",
+        "jsonlines": "^0.1.1",
+        "lodash": "^4.17.21",
+        "make-fetch-happen": "^11.1.1",
+        "minimatch": "^9.0.3",
+        "p-map": "^4.0.0",
+        "pacote": "15.2.0",
+        "parse-github-url": "^1.0.2",
+        "progress": "^2.0.3",
+        "prompts-ncu": "^3.0.0",
+        "rc-config-loader": "^4.1.3",
+        "remote-git-tags": "^3.0.0",
+        "rimraf": "^5.0.5",
+        "semver": "^7.5.4",
+        "semver-utils": "^1.1.4",
+        "source-map-support": "^0.5.21",
+        "spawn-please": "^2.0.2",
+        "strip-ansi": "^7.1.0",
+        "strip-json-comments": "^5.0.1",
+        "untildify": "^4.0.0",
+        "update-notifier": "^6.0.2"
+      },
+      "bin": {
+        "ncu": "build/src/bin/cli.js",
+        "npm-check-updates": "build/src/bin/cli.js"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/npm-check-updates/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/npm-check-updates/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/npm-check-updates/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/npm-check-updates/node_modules/glob": {
+      "version": "10.3.10",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.5",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm-check-updates/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm-check-updates/node_modules/rimraf": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
+      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/npm-check-updates/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/npm-check-updates/node_modules/strip-json-comments": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
+      "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-install-checks": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.1.tgz",
+      "integrity": "sha512-dH3GmQL4vsPtld59cOn8uY0iOqRmqKvV+DLGwNXV/Q7MDgD2QfOADWd/mFXcIE5LVhYYGjA3baz6W9JneqnuCw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.1.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
+      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-package-arg": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
+      "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^6.0.0",
+        "proc-log": "^3.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^5.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-package-arg/node_modules/hosted-git-info": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
+      "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^7.5.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-package-arg/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/npm-packlist": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz",
+      "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==",
+      "dev": true,
+      "dependencies": {
+        "ignore-walk": "^6.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-pick-manifest": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz",
+      "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==",
+      "dev": true,
+      "dependencies": {
+        "npm-install-checks": "^6.0.0",
+        "npm-normalize-package-bin": "^3.0.0",
+        "npm-package-arg": "^10.0.0",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-registry-fetch": {
+      "version": "14.0.5",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz",
+      "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==",
+      "dev": true,
+      "dependencies": {
+        "make-fetch-happen": "^11.0.0",
+        "minipass": "^5.0.0",
+        "minipass-fetch": "^3.0.0",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.1.2",
+        "npm-package-arg": "^10.0.0",
+        "proc-log": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+      "dev": true,
+      "dependencies": {
+        "are-we-there-yet": "^3.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^4.0.3",
+        "set-blocking": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
+      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
+      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "dev": true,
+      "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/package-json": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.0.tgz",
+      "integrity": "sha512-hySwcV8RAWeAfPsXb9/HGSPn8lwDnv6fabH+obUZKX169QknRkRhPxd1yMubpKDskLFATkl3jHpNtVtDPFA0Wg==",
+      "dev": true,
+      "dependencies": {
+        "got": "^12.1.0",
+        "registry-auth-token": "^5.0.1",
+        "registry-url": "^6.0.0",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pacote": {
+      "version": "15.2.0",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz",
+      "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/git": "^4.0.0",
+        "@npmcli/installed-package-contents": "^2.0.1",
+        "@npmcli/promise-spawn": "^6.0.1",
+        "@npmcli/run-script": "^6.0.0",
+        "cacache": "^17.0.0",
+        "fs-minipass": "^3.0.0",
+        "minipass": "^5.0.0",
+        "npm-package-arg": "^10.0.0",
+        "npm-packlist": "^7.0.0",
+        "npm-pick-manifest": "^8.0.0",
+        "npm-registry-fetch": "^14.0.0",
+        "proc-log": "^3.0.0",
+        "promise-retry": "^2.0.1",
+        "read-package-json": "^6.0.0",
+        "read-package-json-fast": "^3.0.0",
+        "sigstore": "^1.3.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "pacote": "lib/bin.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-github-url": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz",
+      "integrity": "sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==",
+      "dev": true,
+      "bin": {
+        "parse-github-url": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-scurry": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^9.1.1 || ^10.0.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz",
+      "integrity": "sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==",
+      "dev": true,
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/path-scurry/node_modules/minipass": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz",
+      "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/playwright": {
+      "version": "1.42.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.1.tgz",
+      "integrity": "sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==",
+      "dev": true,
+      "dependencies": {
+        "playwright-core": "1.42.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.42.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.1.tgz",
+      "integrity": "sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==",
+      "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/proc-log": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
+      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "dev": true,
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "dev": true
+    },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/prompts-ncu": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz",
+      "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^4.0.1",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pupa": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz",
+      "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==",
+      "dev": true,
+      "dependencies": {
+        "escape-goat": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/rc-config-loader": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz",
+      "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "js-yaml": "^4.1.0",
+        "json5": "^2.2.2",
+        "require-from-string": "^2.0.2"
+      }
+    },
+    "node_modules/rc-config-loader/node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/rc/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-package-json": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz",
+      "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.2.2",
+        "json-parse-even-better-errors": "^3.0.0",
+        "normalize-package-data": "^5.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/read-package-json-fast": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
+      "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
+      "dev": true,
+      "dependencies": {
+        "json-parse-even-better-errors": "^3.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/read-package-json/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/read-package-json/node_modules/glob": {
+      "version": "10.3.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
+      "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.0.3",
+        "minimatch": "^9.0.1",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+        "path-scurry": "^1.10.1"
+      },
+      "bin": {
+        "glob": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/read-package-json/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "set-function-name": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/registry-auth-token": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.1.tgz",
+      "integrity": "sha512-UfxVOj8seK1yaIOiieV4FIP01vfBDLsY0H9sQzi9EbbUdJiuuBjJgLa1DpImXMNPnVkBD4eVxTEXcrZA6kfpJA==",
+      "dev": true,
+      "dependencies": {
+        "@pnpm/npm-conf": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/registry-url": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz",
+      "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==",
+      "dev": true,
+      "dependencies": {
+        "rc": "1.2.8"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/remote-git-tags": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz",
+      "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
+    "node_modules/responselike": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-array-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/seedrandom": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
+      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
+    },
+    "node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz",
+      "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/semver-utils": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz",
+      "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==",
+      "dev": true
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/sigstore": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.8.0.tgz",
+      "integrity": "sha512-ogU8qtQ3VFBawRJ8wjsBEX/vIFeHuGs1fm4jZtjWQwjo8pfAt7T/rh+udlAN4+QUe0IzA8qRSc/YZ7dHP6kh+w==",
+      "dev": true,
+      "dependencies": {
+        "@sigstore/bundle": "^1.0.0",
+        "@sigstore/protobuf-specs": "^0.2.0",
+        "@sigstore/tuf": "^1.0.3",
+        "make-fetch-happen": "^11.0.1"
+      },
+      "bin": {
+        "sigstore": "bin/sigstore.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slugify": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz",
+      "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
+      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "dev": true,
+      "dependencies": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/spawn-please": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz",
+      "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
+      "dev": true
+    },
+    "node_modules/ssri": {
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
+      "integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^5.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.1.15",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
+      "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tuf-js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz",
+      "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==",
+      "dev": true,
+      "dependencies": {
+        "@tufjs/models": "1.0.4",
+        "debug": "^4.3.4",
+        "make-fetch-happen": "^11.1.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unique-filename": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
+      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "dev": true,
+      "dependencies": {
+        "unique-slug": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
+      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/unique-string": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
+      "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==",
+      "dev": true,
+      "dependencies": {
+        "crypto-random-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/update-notifier": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz",
+      "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==",
+      "dev": true,
+      "dependencies": {
+        "boxen": "^7.0.0",
+        "chalk": "^5.0.1",
+        "configstore": "^6.0.0",
+        "has-yarn": "^3.0.0",
+        "import-lazy": "^4.0.0",
+        "is-ci": "^3.0.1",
+        "is-installed-globally": "^0.4.0",
+        "is-npm": "^6.0.0",
+        "is-yarn-global": "^0.4.0",
+        "latest-version": "^7.0.0",
+        "pupa": "^3.1.0",
+        "semver": "^7.3.7",
+        "semver-diff": "^4.0.0",
+        "xdg-basedir": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
+      }
+    },
+    "node_modules/update-notifier/node_modules/chalk": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
+      "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
+      "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+      "dev": true,
+      "dependencies": {
+        "builtins": "^5.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.4",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
+    "node_modules/widest-line": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz",
+      "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/widest-line/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/widest-line/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/widest-line/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/widest-line/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/xdg-basedir": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
+      "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
+  "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
+    "@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
+      "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
+      "dev": true
+    },
+    "@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "@eslint/js": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "dev": true
+    },
+    "@faker-js/faker": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.4.1.tgz",
+      "integrity": "sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg=="
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+      "dev": true
+    },
+    "@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+          "dev": true,
+          "requires": {
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        }
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@npmcli/fs": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
+      "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.3.5"
+      }
+    },
+    "@npmcli/git": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz",
+      "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==",
+      "dev": true,
+      "requires": {
+        "@npmcli/promise-spawn": "^6.0.0",
+        "lru-cache": "^7.4.4",
+        "npm-pick-manifest": "^8.0.0",
+        "proc-log": "^3.0.0",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^3.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        },
+        "which": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+          "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@npmcli/installed-package-contents": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz",
+      "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==",
+      "dev": true,
+      "requires": {
+        "npm-bundled": "^3.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      }
+    },
+    "@npmcli/node-gyp": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz",
+      "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==",
+      "dev": true
+    },
+    "@npmcli/promise-spawn": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz",
+      "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==",
+      "dev": true,
+      "requires": {
+        "which": "^3.0.0"
+      },
+      "dependencies": {
+        "which": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+          "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@npmcli/run-script": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz",
+      "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==",
+      "dev": true,
+      "requires": {
+        "@npmcli/node-gyp": "^3.0.0",
+        "@npmcli/promise-spawn": "^6.0.0",
+        "node-gyp": "^9.0.0",
+        "read-package-json-fast": "^3.0.0",
+        "which": "^3.0.0"
+      },
+      "dependencies": {
+        "which": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz",
+          "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true
+    },
+    "@playwright/test": {
+      "version": "1.42.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.1.tgz",
+      "integrity": "sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ==",
+      "dev": true,
+      "requires": {
+        "playwright": "1.42.1"
+      }
+    },
+    "@pnpm/network.ca-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz",
+      "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.2.10"
+      }
+    },
+    "@pnpm/npm-conf": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-1.0.5.tgz",
+      "integrity": "sha512-hD8ml183638O3R6/Txrh0L8VzGOrFXgRtRDG4qQC4tONdZ5Z1M+tlUUDUvrjYdmK6G+JTBTeaCLMna11cXzi8A==",
+      "dev": true,
+      "requires": {
+        "@pnpm/network.ca-file": "^1.0.1",
+        "config-chain": "^1.1.11"
+      }
+    },
+    "@sigstore/bundle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz",
+      "integrity": "sha512-yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ==",
+      "dev": true,
+      "requires": {
+        "@sigstore/protobuf-specs": "^0.2.0"
+      }
+    },
+    "@sigstore/protobuf-specs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz",
+      "integrity": "sha512-8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg==",
+      "dev": true
+    },
+    "@sigstore/tuf": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz",
+      "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==",
+      "dev": true,
+      "requires": {
+        "@sigstore/protobuf-specs": "^0.2.0",
+        "tuf-js": "^1.1.7"
+      }
+    },
+    "@sindresorhus/is": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz",
+      "integrity": "sha512-CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw==",
+      "dev": true
+    },
+    "@szmarczak/http-timer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^2.0.1"
+      }
+    },
+    "@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true
+    },
+    "@tufjs/canonical-json": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz",
+      "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==",
+      "dev": true
+    },
+    "@tufjs/models": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz",
+      "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==",
+      "dev": true,
+      "requires": {
+        "@tufjs/canonical-json": "1.0.0",
+        "minimatch": "^9.0.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "9.0.3",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+          "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
+      }
+    },
+    "@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "dev": true
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "@types/semver-utils": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz",
+      "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==",
+      "dev": true
+    },
+    "@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4"
+      }
+    },
+    "agentkeepalive": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
+      "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "depd": "^2.0.0",
+        "humanize-ms": "^1.2.1"
+      }
+    },
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-align": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.1.0"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+      "dev": true,
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      }
+    },
+    "array-includes": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
+      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "is-string": "^1.0.7"
+      }
+    },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
+    "array.prototype.findlastindex": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
+      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
+    "array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      }
+    },
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "boxen": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.0.0.tgz",
+      "integrity": "sha512-j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg==",
+      "dev": true,
+      "requires": {
+        "ansi-align": "^3.0.1",
+        "camelcase": "^7.0.0",
+        "chalk": "^5.0.1",
+        "cli-boxes": "^3.0.0",
+        "string-width": "^5.1.2",
+        "type-fest": "^2.13.0",
+        "widest-line": "^4.0.1",
+        "wrap-ansi": "^8.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
+          "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+          "dev": true,
+          "requires": {
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        },
+        "type-fest": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+          "dev": true
+        }
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "dev": true
+    },
+    "builtins": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.0.0"
+      }
+    },
+    "cacache": {
+      "version": "17.1.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz",
+      "integrity": "sha512-jAdjGxmPxZh0IipMdR7fK/4sDSrHMLUV0+GvVUsjwyGNKHsh79kW/otg+GkbXwl6Uzvy9wsvHOX4nUoWldeZMg==",
+      "dev": true,
+      "requires": {
+        "@npmcli/fs": "^3.1.0",
+        "fs-minipass": "^3.0.0",
+        "glob": "^10.2.2",
+        "lru-cache": "^7.7.1",
+        "minipass": "^5.0.0",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "p-map": "^4.0.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^3.0.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "10.3.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
+          "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+          "dev": true,
+          "requires": {
+            "foreground-child": "^3.1.0",
+            "jackspeak": "^2.0.3",
+            "minimatch": "^9.0.1",
+            "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+            "path-scurry": "^1.10.1"
+          }
+        },
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "9.0.3",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+          "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
+      }
+    },
+    "cacheable-lookup": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
+      "dev": true
+    },
+    "cacheable-request": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.2.tgz",
+      "integrity": "sha512-KxjQZM3UIo7/J6W4sLpwFvu1GB3Whv8NtZ8ZrUL284eiQjiXeeqWTdhixNrp/NLZ/JNuFBo6BD4ZaO8ZJ5BN8Q==",
+      "dev": true,
+      "requires": {
+        "@types/http-cache-semantics": "^4.0.1",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.0",
+        "keyv": "^4.5.0",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^7.2.0",
+        "responselike": "^3.0.0"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.0.tgz",
+      "integrity": "sha512-JToIvOmz6nhGsUhAYScbo2d6Py5wojjNfoxoc2mEVLUdJ70gJK2gnd+ABY1Tc3sVMyK7QDPtN0T/XdlCQWITyQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true
+    },
+    "ci-info": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.6.1.tgz",
+      "integrity": "sha512-up5ggbaDqOqJ4UqLKZ2naVkyqSJQgJi5lwD6b6mM748ysrghDBX0bx/qJTUHzw7zu6Mq4gycviSF5hJnwceD8w==",
+      "dev": true
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "cli-boxes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
+      "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==",
+      "dev": true
+    },
+    "cli-table3": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
+      "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
+      "dev": true,
+      "requires": {
+        "@colors/colors": "1.5.0",
+        "string-width": "^4.2.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true
+    },
+    "commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "config-chain": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+          "dev": true
+        }
+      }
+    },
+    "configstore": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz",
+      "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==",
+      "dev": true,
+      "requires": {
+        "dot-prop": "^6.0.1",
+        "graceful-fs": "^4.2.6",
+        "unique-string": "^3.0.0",
+        "write-file-atomic": "^3.0.3",
+        "xdg-basedir": "^5.0.1"
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "dev": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "crypto-random-string": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz",
+      "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^1.0.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+          "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+          "dev": true
+        }
+      }
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^3.1.0"
+      },
+      "dependencies": {
+        "mimic-response": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+          "dev": true
+        }
+      }
+    },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true
+    },
+    "define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "requires": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true
+    },
+    "depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true
+    },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "dot-prop": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
+      "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
+      "dev": true,
+      "requires": {
+        "is-obj": "^2.0.0"
+      }
+    },
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true
+    },
+    "err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
+    "es-abstract": {
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
+      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.2",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.5",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.2",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.12",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.13"
+      }
+    },
+    "es-set-tostringtag": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dev": true,
+      "requires": {
+        "hasown": "^2.0.0"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "escape-goat": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
+      "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true
     },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+    "eslint": {
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      }
+    },
+    "eslint-compat-utils": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz",
+      "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-config-standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-es-x": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.5.0.tgz",
+      "integrity": "sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==",
+      "dev": true,
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.1.2",
+        "@eslint-community/regexpp": "^4.6.0",
+        "eslint-compat-utils": "^0.1.2"
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.8.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "semver": {
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-n": {
+      "version": "16.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz",
+      "integrity": "sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "builtins": "^5.0.1",
+        "eslint-plugin-es-x": "^7.5.0",
+        "get-tsconfig": "^4.7.0",
+        "globals": "^13.24.0",
+        "ignore": "^5.2.4",
+        "is-builtin-module": "^3.2.1",
+        "is-core-module": "^2.12.1",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.2",
+        "semver": "^7.5.3"
+      }
+    },
+    "eslint-plugin-node": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
+      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+      "dev": true,
+      "requires": {
+        "eslint-plugin-es": "^3.0.0",
+        "eslint-utils": "^2.0.0",
+        "ignore": "^5.1.1",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "eslint-plugin-es": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
+          "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
+          "dev": true,
+          "requires": {
+            "eslint-utils": "^2.0.0",
+            "regexpp": "^3.0.0"
+          }
+        },
+        "eslint-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
-    }
-  },
-  "dependencies": {
-    "@eslint/eslintrc": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-      "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+    },
+    "eslint-plugin-promise": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
+      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       }
     },
-    "@faker-js/faker": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.5.0.tgz",
-      "integrity": "sha512-8wNUCCUHvfvI0gQpDUho/3gPzABffnCn5um65F8dzQ86zz6dlt4+nmAA7PQUc8L+eH+9RgR/qzy5N/8kN0Ozdw=="
+    "eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true
     },
-    "@humanwhocodes/config-array": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
-      "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+    "espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      }
+    },
+    "esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "estraverse": "^5.1.0"
       }
     },
-    "@humanwhocodes/gitignore-to-minimatch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true
     },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+    "exponential-backoff": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
+      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
       "dev": true
     },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        }
       }
     },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "fast-memoize": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz",
+      "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
+        "reusify": "^1.0.4"
       }
     },
-    "@playwright/test": {
-      "version": "1.25.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.25.2.tgz",
-      "integrity": "sha512-6qPznIR4Fw02OMbqXUPMG6bFFg1hDVNEdihKy0t9K0dmRbus1DyP5Q5XFQhGwEHQkLG5hrSfBuu9CW/foqhQHQ==",
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "requires": {
-        "@types/node": "*",
-        "playwright-core": "1.25.2"
+        "to-regex-range": "^5.0.1"
       }
     },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
+    "find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      }
     },
-    "@types/node": {
-      "version": "18.7.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.16.tgz",
-      "integrity": "sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg==",
-      "dev": true
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
     },
-    "acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
-      "requires": {}
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
     },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "foreground-child": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
+      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz",
+          "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==",
+          "dev": true
+        }
       }
     },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "form-data-encoder": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.3.tgz",
+      "integrity": "sha512-KqU0nnPMgIJcCOFTNJFEA8epcseEaoox4XZffTgy8jlI6pL/5EFyR54NRG7CnCJN0biY7q52DO3MH6/sJ/TKlQ==",
+      "dev": true
+    },
+    "fp-and-or": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz",
+      "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==",
       "dev": true
     },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "fs-minipass": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.2.tgz",
+      "integrity": "sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g==",
       "dev": true,
       "requires": {
-        "color-convert": "^2.0.1"
+        "minipass": "^5.0.0"
       }
     },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
-    "array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      }
+      "optional": true
     },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true
     },
-    "array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+    "function.prototype.name": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       }
     },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true
     },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "gauge": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
       "dev": true,
       "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.3",
+        "console-control-strings": "^1.1.0",
+        "has-unicode": "^2.0.1",
+        "signal-exit": "^3.0.7",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.5"
       }
     },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+    "get-intrinsic": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       }
     },
-    "builtins": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
-      "dev": true,
-      "requires": {
-        "semver": "^7.0.0"
-      }
+    "get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true
     },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+    "get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
       }
     },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "get-tsconfig": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "resolve-pkg-maps": "^1.0.0"
       }
     },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "requires": {
-        "color-name": "~1.1.4"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
       "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "is-glob": "^4.0.3"
       }
     },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "global-dirs": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+      "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
       "dev": true,
       "requires": {
-        "ms": "2.1.2"
+        "ini": "2.0.0"
       },
       "dependencies": {
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "ini": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+          "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
           "dev": true
         }
       }
     },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+    "globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
       "dev": true,
       "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "type-fest": "^0.20.2"
       }
     },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
       "dev": true,
       "requires": {
-        "path-type": "^4.0.0"
+        "define-properties": "^1.1.3"
       }
     },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2"
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
       }
     },
-    "es-abstract": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-      "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.2",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
+        "get-intrinsic": "^1.1.3"
       }
     },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+    "got": {
+      "version": "12.5.3",
+      "resolved": "https://registry.npmjs.org/got/-/got-12.5.3.tgz",
+      "integrity": "sha512-8wKnb9MGU8IPGRIo+/ukTy9XLJBwDiCpIf5TVzQ9Cpol50eMTpBq2GAuDsuDIz7hTYmZgMgC1e9ydr6kSDWs3w==",
       "dev": true,
       "requires": {
-        "has": "^1.0.3"
-      }
+        "@sindresorhus/is": "^5.2.0",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.1",
+        "decompress-response": "^6.0.0",
+        "form-data-encoder": "^2.1.2",
+        "get-stream": "^6.0.1",
+        "http2-wrapper": "^2.1.10",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^3.0.0",
+        "responselike": "^3.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
     },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "has-property-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
       "dev": true,
       "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "get-intrinsic": "^1.2.2"
       }
     },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
       "dev": true
     },
-    "eslint": {
-      "version": "8.23.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
-      "integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.3.2",
-        "@humanwhocodes/config-array": "^0.10.4",
-        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "globby": "^11.1.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
+        "has-symbols": "^1.0.2"
       }
     },
-    "eslint-config-standard": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "dev": true
+    },
+    "has-yarn": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz",
+      "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==",
+      "dev": true
+    },
+    "hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
       "dev": true,
-      "requires": {}
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
     },
-    "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+    "hosted-git-info": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz",
+      "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "lru-cache": "^7.5.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
+        "lru-cache": {
+          "version": "7.14.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz",
+          "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==",
+          "dev": true
         }
       }
     },
-    "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+    "http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
+    "http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
       }
     },
-    "eslint-plugin-es": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
-      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+    "http2-wrapper": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz",
+      "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==",
       "dev": true,
       "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "dependencies": {
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        }
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.2.0"
       }
     },
-    "eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+    "https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        }
+        "agent-base": "6",
+        "debug": "4"
       }
     },
-    "eslint-plugin-n": {
-      "version": "15.2.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.2.5.tgz",
-      "integrity": "sha512-8+BYsqiyZfpu6NXmdLOXVUfk8IocpCjpd8nMRRH0A9ulrcemhb2VI9RSJMEy5udx++A/YcVPD11zT8hpFq368g==",
+    "humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
       "dev": true,
       "requires": {
-        "builtins": "^5.0.1",
-        "eslint-plugin-es": "^4.1.0",
-        "eslint-utils": "^3.0.0",
-        "ignore": "^5.1.1",
-        "is-core-module": "^2.10.0",
-        "minimatch": "^3.1.2",
-        "resolve": "^1.22.1",
-        "semver": "^7.3.7"
+        "ms": "^2.0.0"
       }
     },
-    "eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+    "iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      }
+    },
+    "ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true
+    },
+    "ignore-walk": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz",
+      "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==",
+      "dev": true,
+      "requires": {
+        "minimatch": "^9.0.0"
       },
       "dependencies": {
-        "eslint-plugin-es": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-          "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "eslint-utils": "^2.0.0",
-            "regexpp": "^3.0.0"
+            "balanced-match": "^1.0.0"
           }
         },
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+        "minimatch": {
+          "version": "9.0.3",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+          "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
           "dev": true,
           "requires": {
-            "eslint-visitor-keys": "^1.1.0"
+            "brace-expansion": "^2.0.1"
           }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
         }
       }
     },
-    "eslint-plugin-promise": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.1.tgz",
-      "integrity": "sha512-uM4Tgo5u3UWQiroOyDEsYcVMOo7re3zmno0IZmB5auxoaQNIceAbXEkSt8RNrKtaYehARHG06pYK6K1JhtP0Zw==",
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
-      "requires": {}
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
     },
-    "eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+    "import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "ini": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
+      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+      "dev": true
+    },
+    "internal-slot": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
+      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
       "dev": true,
       "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-          "dev": true
-        }
+        "get-intrinsic": "^1.2.2",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
       }
     },
-    "eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+    "ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
       "dev": true
     },
-    "espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+    "is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dev": true,
       "requires": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
       }
     },
-    "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
       "requires": {
-        "estraverse": "^5.1.0"
+        "has-bigints": "^1.0.1"
       }
     },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
       "requires": {
-        "estraverse": "^5.2.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+    "is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        }
+        "builtin-modules": "^3.3.0"
       }
     },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true
-    },
-    "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+    },
+    "is-ci": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
       "dev": true,
       "requires": {
-        "reusify": "^1.0.4"
+        "ci-info": "^3.2.0"
       }
     },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+    "is-core-module": {
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "dev": true,
       "requires": {
-        "flat-cache": "^3.0.4"
+        "hasown": "^2.0.0"
       }
     },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
       "requires": {
-        "to-regex-range": "^5.0.1"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "is-extglob": "^2.1.1"
       }
     },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+    "is-installed-globally": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
       "dev": true,
       "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+        "global-dirs": "^3.0.0",
+        "is-path-inside": "^3.0.2"
       }
     },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+    "is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
       "dev": true
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+    "is-npm": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz",
+      "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==",
       "dev": true
     },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+    "is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
       "dev": true
     },
-    "get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bind": "^1.0.2"
       }
     },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "requires": {
-        "is-glob": "^4.0.3"
+        "has-symbols": "^1.0.2"
       }
     },
-    "globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+    "is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.20.2"
+        "which-typed-array": "^1.1.11"
       }
     },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
       "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
+        "call-bind": "^1.0.2"
       }
     },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+    "is-yarn-global": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz",
+      "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==",
+      "dev": true
+    },
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "jackspeak": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
+      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "dev": true,
+      "requires": {
+        "@isaacs/cliui": "^8.0.2",
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "jju": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+      "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "json-parse-even-better-errors": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz",
+      "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==",
       "dev": true
     },
-    "has": {
+    "json-parse-helpfulerror": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+      "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1"
+        "jju": "^1.1.0"
       }
     },
-    "has-bigints": {
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "json5": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsonlines": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz",
+      "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==",
       "dev": true
     },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
       "dev": true
     },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+    "keyv": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
+      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
       "dev": true,
       "requires": {
-        "get-intrinsic": "^1.1.1"
+        "json-buffer": "3.0.1"
       }
     },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+    "kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
       "dev": true
     },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+    "latest-version": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz",
+      "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.2"
+        "package-json": "^8.1.0"
       }
     },
-    "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^5.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "lowercase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
       "dev": true
     },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
       "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
+        "yallist": "^4.0.0"
       }
     },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true
+    "luxon": {
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
+      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA=="
     },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+    "make-fetch-happen": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
+      "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "agentkeepalive": "^4.2.1",
+        "cacache": "^17.0.0",
+        "http-cache-semantics": "^4.1.1",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^7.7.1",
+        "minipass": "^5.0.0",
+        "minipass-fetch": "^3.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.3",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^7.0.0",
+        "ssri": "^10.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        }
       }
     },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       }
     },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
+    "mimic-response": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+      "dev": true
     },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "brace-expansion": "^1.1.7"
       }
     },
-    "is-callable": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.5.tgz",
-      "integrity": "sha512-ZIWRujF6MvYGkEuHMYtFRkL2wAtFw89EHfKlXrkPkjQZZRWeh9L1q3SV13NIfHnqxugjLvAOkEHx9mb1zcMnEw==",
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
-    "is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+    "minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "dev": true
+    },
+    "minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
       "dev": true,
       "requires": {
-        "has": "^1.0.3"
+        "minipass": "^3.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+    "minipass-fetch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz",
+      "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==",
       "dev": true,
       "requires": {
-        "has-tostringtag": "^1.0.0"
+        "encoding": "^0.1.13",
+        "minipass": "^5.0.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.1.2"
       }
     },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.1"
+        "minipass": "^3.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+    "minipass-json-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
       "dev": true,
       "requires": {
-        "has-tostringtag": "^1.0.0"
+        "jsonparse": "^1.3.1",
+        "minipass": "^3.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+    "minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "minipass": "^3.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+    "minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2"
+        "minipass": "^3.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+    "minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "dev": true,
       "requires": {
-        "has-tostringtag": "^1.0.0"
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
-    "is-symbol": {
+    "mkdirp": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true
+    },
+    "node-gyp": {
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz",
+      "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.2"
+        "env-paths": "^2.2.0",
+        "exponential-backoff": "^3.1.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^11.0.3",
+        "nopt": "^6.0.0",
+        "npmlog": "^6.0.0",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^2.0.2"
+      }
+    },
+    "nopt": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
+      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
+      "dev": true,
+      "requires": {
+        "abbrev": "^1.0.0"
       }
     },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+    "normalize-package-data": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz",
+      "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2"
+        "hosted-git-info": "^6.0.0",
+        "is-core-module": "^2.8.1",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
+          "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^7.5.1"
+          }
+        },
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        }
       }
     },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "js-sdsl": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-      "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
+    "normalize-url": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-7.2.0.tgz",
+      "integrity": "sha512-uhXOdZry0L6M2UIo9BTt7FdpBDiAGN/7oItedQwPKh8jh31ZlvC8U9Xl/EJ3aijDHaywXTW3QbZ6LuCocur1YA==",
       "dev": true
     },
-    "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+    "npm-bundled": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz",
+      "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==",
       "dev": true,
       "requires": {
-        "argparse": "^2.0.1"
+        "npm-normalize-package-bin": "^3.0.0"
       }
     },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+    "npm-check-updates": {
+      "version": "16.14.18",
+      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.18.tgz",
+      "integrity": "sha512-9iaRe9ohx9ykdbLjPRIYcq1A0RkrPYUx9HmQK1JIXhfxtJCNE/+497H9Z4PGH6GWRALbz5KF+1iZoySK2uSEpQ==",
+      "dev": true,
+      "requires": {
+        "@types/semver-utils": "^1.1.1",
+        "chalk": "^5.3.0",
+        "cli-table3": "^0.6.3",
+        "commander": "^10.0.1",
+        "fast-memoize": "^2.5.2",
+        "find-up": "5.0.0",
+        "fp-and-or": "^0.1.4",
+        "get-stdin": "^8.0.0",
+        "globby": "^11.0.4",
+        "hosted-git-info": "^5.1.0",
+        "ini": "^4.1.1",
+        "js-yaml": "^4.1.0",
+        "json-parse-helpfulerror": "^1.0.3",
+        "jsonlines": "^0.1.1",
+        "lodash": "^4.17.21",
+        "make-fetch-happen": "^11.1.1",
+        "minimatch": "^9.0.3",
+        "p-map": "^4.0.0",
+        "pacote": "15.2.0",
+        "parse-github-url": "^1.0.2",
+        "progress": "^2.0.3",
+        "prompts-ncu": "^3.0.0",
+        "rc-config-loader": "^4.1.3",
+        "remote-git-tags": "^3.0.0",
+        "rimraf": "^5.0.5",
+        "semver": "^7.5.4",
+        "semver-utils": "^1.1.4",
+        "source-map-support": "^0.5.21",
+        "spawn-please": "^2.0.2",
+        "strip-ansi": "^7.1.0",
+        "strip-json-comments": "^5.0.1",
+        "untildify": "^4.0.0",
+        "update-notifier": "^6.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        },
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "chalk": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+          "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+          "dev": true
+        },
+        "glob": {
+          "version": "10.3.10",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
+          "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+          "dev": true,
+          "requires": {
+            "foreground-child": "^3.1.0",
+            "jackspeak": "^2.3.5",
+            "minimatch": "^9.0.1",
+            "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+            "path-scurry": "^1.10.1"
+          }
+        },
+        "minimatch": {
+          "version": "9.0.3",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+          "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "5.0.5",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
+          "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
+          "dev": true,
+          "requires": {
+            "glob": "^10.3.7"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+          "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
+          "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
+          "dev": true
+        }
+      }
     },
-    "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+    "npm-install-checks": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.1.tgz",
+      "integrity": "sha512-dH3GmQL4vsPtld59cOn8uY0iOqRmqKvV+DLGwNXV/Q7MDgD2QfOADWd/mFXcIE5LVhYYGjA3baz6W9JneqnuCw==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "semver": "^7.1.1"
       }
     },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+    "npm-normalize-package-bin": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz",
+      "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==",
+      "dev": true
+    },
+    "npm-package-arg": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz",
+      "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==",
       "dev": true,
       "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+        "hosted-git-info": "^6.0.0",
+        "proc-log": "^3.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^5.0.0"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz",
+          "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^7.5.1"
+          }
+        },
+        "lru-cache": {
+          "version": "7.18.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+          "dev": true
+        }
       }
     },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+    "npm-packlist": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz",
+      "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==",
       "dev": true,
       "requires": {
-        "p-locate": "^5.0.0"
+        "ignore-walk": "^6.0.0"
       }
     },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "npm-pick-manifest": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz",
+      "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==",
       "dev": true,
       "requires": {
-        "yallist": "^4.0.0"
+        "npm-install-checks": "^6.0.0",
+        "npm-normalize-package-bin": "^3.0.0",
+        "npm-package-arg": "^10.0.0",
+        "semver": "^7.3.5"
       }
     },
-    "luxon": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.0.3.tgz",
-      "integrity": "sha512-+EfHWnF+UT7GgTnq5zXg3ldnTKL2zdv7QJgsU5bjjpbH17E3qi/puMhQyJVYuCq+FRkogvB5WB6iVvUr+E4a7w=="
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+    "npm-registry-fetch": {
+      "version": "14.0.5",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz",
+      "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
+        "make-fetch-happen": "^11.0.0",
+        "minipass": "^5.0.0",
+        "minipass-fetch": "^3.0.0",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.1.2",
+        "npm-package-arg": "^10.0.0",
+        "proc-log": "^3.0.0"
       }
     },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "npmlog": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "are-we-there-yet": "^3.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^4.0.3",
+        "set-blocking": "^2.0.0"
       }
     },
-    "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
     "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
       "dev": true
     },
     "object-keys": {
@@ -3614,15 +8959,38 @@
         "object-keys": "^1.1.1"
       }
     },
+    "object.fromentries": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      }
+    },
+    "object.groupby": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
+      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
+      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "once": {
@@ -3635,19 +9003,25 @@
       }
     },
     "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "requires": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
+        "type-check": "^0.4.0"
       }
     },
+    "p-cancelable": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
+      "dev": true
+    },
     "p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -3666,6 +9040,53 @@
         "p-limit": "^3.0.2"
       }
     },
+    "p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
+    "package-json": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.0.tgz",
+      "integrity": "sha512-hySwcV8RAWeAfPsXb9/HGSPn8lwDnv6fabH+obUZKX169QknRkRhPxd1yMubpKDskLFATkl3jHpNtVtDPFA0Wg==",
+      "dev": true,
+      "requires": {
+        "got": "^12.1.0",
+        "registry-auth-token": "^5.0.1",
+        "registry-url": "^6.0.0",
+        "semver": "^7.3.7"
+      }
+    },
+    "pacote": {
+      "version": "15.2.0",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz",
+      "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==",
+      "dev": true,
+      "requires": {
+        "@npmcli/git": "^4.0.0",
+        "@npmcli/installed-package-contents": "^2.0.1",
+        "@npmcli/promise-spawn": "^6.0.1",
+        "@npmcli/run-script": "^6.0.0",
+        "cacache": "^17.0.0",
+        "fs-minipass": "^3.0.0",
+        "minipass": "^5.0.0",
+        "npm-package-arg": "^10.0.0",
+        "npm-packlist": "^7.0.0",
+        "npm-pick-manifest": "^8.0.0",
+        "npm-registry-fetch": "^14.0.0",
+        "proc-log": "^3.0.0",
+        "promise-retry": "^2.0.1",
+        "read-package-json": "^6.0.0",
+        "read-package-json-fast": "^3.0.0",
+        "sigstore": "^1.3.0",
+        "ssri": "^10.0.0",
+        "tar": "^6.1.11"
+      }
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -3675,6 +9096,12 @@
         "callsites": "^3.0.0"
       }
     },
+    "parse-github-url": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz",
+      "integrity": "sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==",
+      "dev": true
+    },
     "path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -3699,6 +9126,30 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "path-scurry": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
+      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^9.1.1 || ^10.0.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz",
+          "integrity": "sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==",
+          "dev": true
+        },
+        "minipass": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz",
+          "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==",
+          "dev": true
+        }
+      }
+    },
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -3711,10 +9162,20 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
+    "playwright": {
+      "version": "1.42.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.1.tgz",
+      "integrity": "sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==",
+      "dev": true,
+      "requires": {
+        "fsevents": "2.3.2",
+        "playwright-core": "1.42.1"
+      }
+    },
     "playwright-core": {
-      "version": "1.25.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.25.2.tgz",
-      "integrity": "sha512-0yTbUE9lIddkEpLHL3u8PoCL+pWiZtj5A/j3U7YoNjcmKKDGBnCrgHJMzwd2J5vy6l28q4ki3JIuz7McLHhl1A==",
+      "version": "1.42.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.1.tgz",
+      "integrity": "sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==",
       "dev": true
     },
     "prelude-ls": {
@@ -3723,27 +9184,198 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
+    "proc-log": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
+      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "dev": true
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "dev": true
+    },
+    "promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "requires": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      }
+    },
+    "prompts-ncu": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz",
+      "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==",
+      "dev": true,
+      "requires": {
+        "kleur": "^4.0.1",
+        "sisteransi": "^1.0.5"
+      }
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true
+    },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true
     },
+    "pupa": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz",
+      "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==",
+      "dev": true,
+      "requires": {
+        "escape-goat": "^4.0.0"
+      }
+    },
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
+    "quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true
+    },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+          "dev": true
+        }
+      }
+    },
+    "rc-config-loader": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz",
+      "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.3.4",
+        "js-yaml": "^4.1.0",
+        "json5": "^2.2.2",
+        "require-from-string": "^2.0.2"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+          "dev": true
+        }
+      }
+    },
+    "read-package-json": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz",
+      "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==",
+      "dev": true,
+      "requires": {
+        "glob": "^10.2.2",
+        "json-parse-even-better-errors": "^3.0.0",
+        "normalize-package-data": "^5.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "10.3.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
+          "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
+          "dev": true,
+          "requires": {
+            "foreground-child": "^3.1.0",
+            "jackspeak": "^2.0.3",
+            "minimatch": "^9.0.1",
+            "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+            "path-scurry": "^1.10.1"
+          }
+        },
+        "minimatch": {
+          "version": "9.0.3",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+          "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
+      }
+    },
+    "read-package-json-fast": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
+      "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
+      "dev": true,
+      "requires": {
+        "json-parse-even-better-errors": "^3.0.0",
+        "npm-normalize-package-bin": "^3.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
     "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "set-function-name": "^2.0.0"
       }
     },
     "regexpp": {
@@ -3752,23 +9384,80 @@
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
+    "registry-auth-token": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.1.tgz",
+      "integrity": "sha512-UfxVOj8seK1yaIOiieV4FIP01vfBDLsY0H9sQzi9EbbUdJiuuBjJgLa1DpImXMNPnVkBD4eVxTEXcrZA6kfpJA==",
+      "dev": true,
+      "requires": {
+        "@pnpm/npm-conf": "^1.0.4"
+      }
+    },
+    "registry-url": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz",
+      "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==",
+      "dev": true,
+      "requires": {
+        "rc": "1.2.8"
+      }
+    },
+    "remote-git-tags": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz",
+      "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
     "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
+    "resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true
+    },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
+    "resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true
+    },
+    "responselike": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^3.0.0"
+      }
+    },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true
+    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -3790,23 +9479,103 @@
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "requires": {
-        "queue-microtask": "^1.2.2"
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-array-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
       }
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "optional": true
+    },
     "seedrandom": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
       "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
     },
     "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "requires": {
         "lru-cache": "^6.0.0"
       }
     },
+    "semver-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz",
+      "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.3.5"
+      }
+    },
+    "semver-utils": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz",
+      "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "dev": true,
+      "requires": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
+    "set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "requires": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -3833,6 +9602,30 @@
         "object-inspect": "^1.9.0"
       }
     },
+    "signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "sigstore": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.8.0.tgz",
+      "integrity": "sha512-ogU8qtQ3VFBawRJ8wjsBEX/vIFeHuGs1fm4jZtjWQwjo8pfAt7T/rh+udlAN4+QUe0IzA8qRSc/YZ7dHP6kh+w==",
+      "dev": true,
+      "requires": {
+        "@sigstore/bundle": "^1.0.0",
+        "@sigstore/protobuf-specs": "^0.2.0",
+        "@sigstore/tuf": "^1.0.3",
+        "make-fetch-happen": "^11.0.1"
+      }
+    },
+    "sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -3840,30 +9633,165 @@
       "dev": true
     },
     "slugify": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz",
-      "integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ=="
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz",
+      "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw=="
+    },
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true
+    },
+    "socks": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
+      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "dev": true,
+      "requires": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "spawn-please": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz",
+      "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.3"
+      }
+    },
+    "spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
+      "dev": true
+    },
+    "ssri": {
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz",
+      "integrity": "sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ==",
+      "dev": true,
+      "requires": {
+        "minipass": "^5.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "string-width-cjs": {
+      "version": "npm:string-width@4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "string.prototype.trim": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      }
     },
     "string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "strip-ansi": {
@@ -3875,6 +9803,15 @@
         "ansi-regex": "^5.0.1"
       }
     },
+    "strip-ansi-cjs": {
+      "version": "npm:strip-ansi@6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -3902,6 +9839,42 @@
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true
     },
+    "tar": {
+      "version": "6.1.15",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
+      "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
+      "dev": true,
+      "requires": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "fs-minipass": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+          "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+          "dev": true,
+          "requires": {
+            "minipass": "^3.0.0"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "3.3.6",
+              "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+              "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+              "dev": true,
+              "requires": {
+                "yallist": "^4.0.0"
+              }
+            }
+          }
+        }
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -3918,17 +9891,28 @@
       }
     },
     "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
     },
+    "tuf-js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz",
+      "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==",
+      "dev": true,
+      "requires": {
+        "@tufjs/models": "1.0.4",
+        "debug": "^4.3.4",
+        "make-fetch-happen": "^11.1.1"
+      }
+    },
     "type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -3944,6 +9928,62 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
+    "typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      }
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
     "unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -3956,6 +9996,69 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "unique-filename": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
+      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^4.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
+      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unique-string": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
+      "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==",
+      "dev": true,
+      "requires": {
+        "crypto-random-string": "^4.0.0"
+      }
+    },
+    "untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true
+    },
+    "update-notifier": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz",
+      "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==",
+      "dev": true,
+      "requires": {
+        "boxen": "^7.0.0",
+        "chalk": "^5.0.1",
+        "configstore": "^6.0.0",
+        "has-yarn": "^3.0.0",
+        "import-lazy": "^4.0.0",
+        "is-ci": "^3.0.1",
+        "is-installed-globally": "^0.4.0",
+        "is-npm": "^6.0.0",
+        "is-yarn-global": "^0.4.0",
+        "latest-version": "^7.0.0",
+        "pupa": "^3.1.0",
+        "semver": "^7.3.7",
+        "semver-diff": "^4.0.0",
+        "xdg-basedir": "^5.1.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
+          "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
+          "dev": true
+        }
+      }
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -3965,6 +10068,31 @@
         "punycode": "^2.1.0"
       }
     },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "validate-npm-package-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz",
+      "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==",
+      "dev": true,
+      "requires": {
+        "builtins": "^5.0.0"
+      }
+    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -3987,11 +10115,132 @@
         "is-symbol": "^1.0.3"
       }
     },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
+    "which-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.4",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
+    "widest-line": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz",
+      "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==",
+      "dev": true,
+      "requires": {
+        "string-width": "^5.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+          "dev": true,
+          "requires": {
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        }
+      }
+    },
+    "wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+          "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+          "dev": true,
+          "requires": {
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          }
+        }
+      }
+    },
+    "wrap-ansi-cjs": {
+      "version": "npm:wrap-ansi@7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
     },
     "wrappy": {
       "version": "1.0.2",
@@ -3999,6 +10248,24 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
+    "write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "xdg-basedir": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
+      "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
+      "dev": true
+    },
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
diff --git a/playwright/package.json b/playwright/package.json
index 0592c71666..5e3ba94782 100644
--- a/playwright/package.json
+++ b/playwright/package.json
@@ -1,32 +1,29 @@
 {
-  "name": "playwright",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
   "scripts": {
+    "install-deps": "playwright install --with-deps",
     "test": "playwright test",
+    "test:legacy": "playwright test -c playwright-legacy.config.js",
+    "test:legacy:visual": "playwright test -c playwright-legacy.config.js --headed --workers=1",
     "test:visual": "playwright test --headed --workers=1",
     "test:debug": "playwright test --debug"
   },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
   "devDependencies": {
-    "@playwright/test": "^1.25.2",
-    "eslint": "^8.23.1",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.5",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.1"
+    "@playwright/test": "1.42.1",
+    "eslint": "8.57.0",
+    "eslint-config-standard": "17.1.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-n": "16.6.2",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "6.1.1",
+    "npm-check-updates": "16.14.18"
   },
   "dependencies": {
-    "@faker-js/faker": "^7.5.0",
-    "lodash": "^4.17.21",
-    "lodash-es": "^4.17.21",
-    "luxon": "^3.0.3",
-    "ms": "^2.1.3",
-    "seedrandom": "^3.0.5",
-    "slugify": "^1.6.5"
+    "@faker-js/faker": "8.4.1",
+    "lodash": "4.17.21",
+    "lodash-es": "4.17.21",
+    "luxon": "3.4.4",
+    "ms": "2.1.3",
+    "seedrandom": "3.0.5",
+    "slugify": "1.6.6"
   }
 }
diff --git a/playwright/playwright-legacy.config.js b/playwright/playwright-legacy.config.js
new file mode 100644
index 0000000000..df51f9377b
--- /dev/null
+++ b/playwright/playwright-legacy.config.js
@@ -0,0 +1,107 @@
+// @ts-check
+const { devices } = require('@playwright/test')
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * @see https://playwright.dev/docs/test-configuration
+ * @type {import('@playwright/test').PlaywrightTestConfig}
+ */
+const config = {
+  testDir: './tests-legacy',
+  /* Maximum time one test can run for. */
+  timeout: 120 * 1000,
+  expect: {
+    /**
+     * Maximum time expect() should wait for the condition to be met.
+     * For example in `await expect(locator).toHaveText();`
+     */
+    timeout: 5000
+  },
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: process.env.CI ? 'github' : 'list',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
+    actionTimeout: 0,
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: 'http://localhost:8000',
+
+    locale: 'en-US',
+    timezoneId: 'America/Toronto',
+
+    screenshot: 'only-on-failure',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry'
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: {
+        ...devices['Desktop Chrome']
+      }
+    },
+
+    {
+      name: 'firefox',
+      use: {
+        ...devices['Desktop Firefox']
+      }
+    }
+
+    // {
+    //   name: 'webkit',
+    //   use: {
+    //     ...devices['Desktop Safari']
+    //   }
+    // }
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: {
+    //     ...devices['Pixel 5'],
+    //   },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: {
+    //     ...devices['iPhone 12'],
+    //   },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: {
+    //     channel: 'msedge',
+    //   },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: {
+    //     channel: 'chrome',
+    //   },
+    // },
+  ]
+
+  /* Folder for test artifacts such as screenshots, videos, traces, etc. */
+  // outputDir: 'test-results/'
+}
+
+module.exports = config
diff --git a/playwright/tests-legacy/docs/ad.spec.js b/playwright/tests-legacy/docs/ad.spec.js
new file mode 100644
index 0000000000..80b8b27cda
--- /dev/null
+++ b/playwright/tests-legacy/docs/ad.spec.js
@@ -0,0 +1,26 @@
+const { test, expect } = require('@playwright/test')
+const viewports = require('../../helpers/viewports')
+
+// ====================================================================
+// IESG Dashboard
+// ====================================================================
+
+test.describe('/doc/ad/', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.setViewportSize({
+      width: viewports.desktop[0],
+      height: viewports.desktop[1]
+    })
+
+    await page.goto('/doc/ad/')
+  })
+
+  test('Pre pubreq', async ({ page }) => {
+    const tablesLocator = page.locator('table')
+    const tablesCount = await tablesLocator.count()
+    expect(tablesCount).toBeGreaterThan(0)
+    const firstTable = tablesLocator.nth(0)
+    const theadTexts = await firstTable.locator('thead').allInnerTexts()
+    expect(theadTexts.join('')).toContain('Pre pubreq')
+  })
+})
diff --git a/playwright/tests-legacy/nomcom/expertise.spec.js b/playwright/tests-legacy/nomcom/expertise.spec.js
new file mode 100644
index 0000000000..ff04426edf
--- /dev/null
+++ b/playwright/tests-legacy/nomcom/expertise.spec.js
@@ -0,0 +1,52 @@
+const { test, expect } = require('@playwright/test')
+const viewports = require('../../helpers/viewports')
+
+// ====================================================================
+// NOMCOM - EXPERTISE
+// ====================================================================
+
+test.describe('expertise', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.setViewportSize({
+      width: viewports.desktop[0],
+      height: viewports.desktop[1]
+    })
+
+    await page.goto('/nomcom/2021/expertise/')
+  })
+
+  test('expertises with expandable panels should expand', async ({ page }) => {
+    const tabsLocator = page.locator('.nomcom-req-positions-tabs > li > button')
+    const tabsCount = await tabsLocator.count()
+
+    expect(tabsCount).toBeGreaterThan(0)
+
+    for (let idx = 0; idx < tabsCount; idx++) {
+      await tabsLocator.nth(idx).click()
+      await expect(tabsLocator.nth(idx)).toHaveClass(/active/)
+
+      const targetId = await tabsLocator.nth(idx).getAttribute('data-bs-target')
+
+      const paneLocator = page.locator(targetId)
+
+      await expect(paneLocator).toBeVisible()
+      await expect(paneLocator).toHaveClass(/tab-pane/)
+      await expect(paneLocator).toHaveClass(/active/)
+
+      // Check accordion
+      const accordionHeadsLocator = paneLocator.locator('.accordion-header > button')
+      const accordionHeadsCount = await accordionHeadsLocator.count()
+
+      if (accordionHeadsCount > 0) {
+        for (let aIdx = 0; aIdx < accordionHeadsCount; aIdx++) {
+          await accordionHeadsLocator.nth(aIdx).click()
+          const expandPaneId = await accordionHeadsLocator.nth(aIdx).getAttribute('data-bs-target')
+
+          const sectionLocator = page.locator(expandPaneId)
+
+          await expect(sectionLocator).toBeVisible()
+        }
+      }
+    }
+  })
+})
diff --git a/playwright/tests-legacy/nomcom/questionnaires.spec.js b/playwright/tests-legacy/nomcom/questionnaires.spec.js
new file mode 100644
index 0000000000..662000e4de
--- /dev/null
+++ b/playwright/tests-legacy/nomcom/questionnaires.spec.js
@@ -0,0 +1,37 @@
+const { test, expect } = require('@playwright/test')
+const viewports = require('../../helpers/viewports')
+
+// ====================================================================
+// NOMCOM - QUESTIONNAIRES
+// ====================================================================
+
+test.describe('expertise', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.setViewportSize({
+      width: viewports.desktop[0],
+      height: viewports.desktop[1]
+    })
+
+    await page.goto('/nomcom/2021/questionnaires/')
+  })
+
+  test('position tabs should display the appropriate panel on click', async ({ page }) => {
+    const tabsLocator = page.locator('.nomcom-questnr-positions-tabs > li > button')
+    const tabsCount = await tabsLocator.count()
+
+    expect(tabsCount).toBeGreaterThan(0)
+
+    for (let idx = 0; idx < tabsCount; idx++) {
+      await tabsLocator.nth(idx).click()
+      await expect(tabsLocator.nth(idx)).toHaveClass(/active/)
+
+      const targetId = await tabsLocator.nth(idx).getAttribute('data-bs-target')
+
+      const paneLocator = page.locator(targetId)
+
+      await expect(paneLocator).toBeVisible()
+      await expect(paneLocator).toHaveClass(/tab-pane/)
+      await expect(paneLocator).toHaveClass(/active/)
+    }
+  })
+})
diff --git a/playwright/tests-legacy/secr/announcement.spec.js b/playwright/tests-legacy/secr/announcement.spec.js
new file mode 100644
index 0000000000..4dbbc25a81
--- /dev/null
+++ b/playwright/tests-legacy/secr/announcement.spec.js
@@ -0,0 +1,77 @@
+const { test, expect } = require('@playwright/test')
+const viewports = require('../../helpers/viewports')
+const { setTimeout } = require('timers/promises')
+
+// ====================================================================
+// ANNOUNCEMENT | DESKTOP viewport
+// ====================================================================
+
+test.describe('desktop', () => {
+  
+  test.beforeAll(async ({ browser }) => {
+    const context = await browser.newContext();
+    const page = await context.newPage();
+
+    await page.goto('/accounts/login/');
+
+    await page.fill('input#id_username', 'glen');
+    await page.fill('input#id_password', 'password');
+
+    await page.click('button[type="submit"]');
+    await page.waitForURL('/accounts/profile/');
+
+    await context.storageState({ path: 'auth.json' });
+
+    await context.close();
+  });
+
+  test.beforeEach(async ({ browser }) => {
+    // Reuse the authentication state in each test
+    const context = await browser.newContext({ storageState: 'auth.json' });
+    const page = await context.newPage();
+    await page.setViewportSize({
+      width: viewports.desktop[0],
+      height: viewports.desktop[1]
+    })
+    await page.goto(`/secr/announcement/`); 
+    await page.locator('h1:text("Announcement")').waitFor({ state: 'visible' })
+    await setTimeout(500)
+    // Attach the page to the test context
+    test.info().page = page;
+  })
+
+  test('show to custom', async () => {
+    const page = test.info().page;
+
+    // to_custom should initially be hidden
+    const element = page.locator('#id_to_custom');
+    await expect(element).toBeHidden();
+    await page.selectOption('select#id_to', 'Other...');
+    await expect(element).toBeVisible();
+  })
+
+  test('back button', async () => {
+    const page = test.info().page;
+
+    const element = page.locator('#id_to_custom');
+    await page.selectOption('select#id_to', 'Other...');
+    await expect(element).toBeVisible();
+    await page.fill('input#id_to_custom', 'custom@example.com');
+    await page.selectOption('select#id_frm', 'IETF Chair <chair@ietf.org>');
+    await page.fill('input#id_reply_to', 'greg@example.com');
+    await page.fill('input#id_subject', 'About Stuff');
+    await page.fill('textarea#id_body', 'This is the stuff');
+
+    await page.click('text="Continue"');
+    const h2Locator = page.locator('h2:text("Confirm Announcement")');
+    await h2Locator.waitFor({ state: 'visible' });
+
+    // click back button and check to_custom
+    await page.click('text="Back"');
+    const subjectLocator = page.locator('input#id_subject');
+    await subjectLocator.waitFor({ state: 'visible' });
+    await expect(element).toBeVisible();
+    await expect(element).toHaveValue('custom@example.com');
+  })
+
+})
\ No newline at end of file
diff --git a/playwright/tests/meeting/agenda.spec.js b/playwright/tests/meeting/agenda.spec.js
index d71c6d3187..2248027a38 100644
--- a/playwright/tests/meeting/agenda.spec.js
+++ b/playwright/tests/meeting/agenda.spec.js
@@ -68,7 +68,7 @@ test.describe('past - desktop', () => {
     const updatedDateTime = DateTime.fromISO(meetingData.meeting.updated)
       .setZone(meetingData.meeting.timezone)
       .setLocale(BROWSER_LOCALE)
-      .toFormat('DD \'at\' tt ZZZZ')
+      .toFormat('DD \'at\' T ZZZZ')
     await expect(page.locator('.agenda h6').first(), 'should have meeting last updated datetime').toContainText(updatedDateTime)
 
     // NAV
@@ -81,9 +81,15 @@ test.describe('past - desktop', () => {
       await expect(navLocator.last()).toContainText('Plaintext')
     })
 
-    // SETTINGS BUTTON
+    // RIGHT-SIDE BUTTONS
 
-    await expect(page.locator('.agenda .meeting-nav + button')).toContainText('Settings')
+    await test.step('has the correct right side buttons', async () => {
+      const btnsLocator = page.locator('.agenda .agenda-topnav-right > button')
+      await expect(btnsLocator).toHaveCount(3)
+      await expect(btnsLocator.first()).toContainText('Help')
+      await expect(btnsLocator.nth(1)).toContainText('Share')
+      await expect(btnsLocator.last()).toContainText('Settings')
+    })
   })
 
   test('agenda schedule list header', async ({ page }) => {
@@ -130,8 +136,9 @@ test.describe('past - desktop', () => {
       const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
         .setZone(BROWSER_TIMEZONE)
         .setLocale(BROWSER_LOCALE)
-        .toFormat('DD \'at\' tt ZZZZ')
+        .toFormat('DD \'at\' T ZZZZ')
       await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
+      await expect(page.locator('.agenda .agenda-table-display-session-head .agenda-table-cell-name').first()).toContainText('Monday Session I')
       // Switch to UTC
       await tzUtcBtnLocator.click()
       await expect(tzUtcBtnLocator).toHaveClass(/n-button--primary-type/)
@@ -139,13 +146,15 @@ test.describe('past - desktop', () => {
       const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
         .setZone('utc')
         .setLocale(BROWSER_LOCALE)
-        .toFormat('DD \'at\' tt ZZZZ')
+        .toFormat('DD \'at\' T ZZZZ')
       await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
       await expect(page.locator('.agenda .agenda-timezone-ddn')).toContainText('UTC')
+      await expect(page.locator('.agenda .agenda-table-display-session-head .agenda-table-cell-name').first()).toContainText('Monday Session I')
       // Switch back to meeting timezone
       await tzMeetingBtnLocator.click()
       await expect(tzMeetingBtnLocator).toHaveClass(/n-button--primary-type/)
       await expect(page.locator('.agenda .agenda-timezone-ddn')).toContainText('Tokyo')
+      await expect(page.locator('.agenda .agenda-table-display-session-head .agenda-table-cell-name').first()).toContainText('Monday Session I')
     })
   })
 
@@ -207,7 +216,7 @@ test.describe('past - desktop', () => {
           const headerRow = page.locator(`#agenda-rowid-sesshd-${event.id}`)
           await expect(headerRow).toBeVisible()
           await expect(headerRow.locator('.agenda-table-cell-ts')).toContainText(eventTimeSlot)
-          await expect(headerRow.locator('.agenda-table-cell-name')).toContainText(`${DateTime.fromISO(event.startDateTime).toFormat('cccc')} ${event.name}`)
+          await expect(headerRow.locator('.agenda-table-cell-name')).toContainText(`${DateTime.fromISO(event.startDateTime).toFormat('cccc')} ${event.slotName}`)
         }
         // Timeslot
         await expect(row.locator('.agenda-table-cell-ts')).toContainText('—')
@@ -229,7 +238,7 @@ test.describe('past - desktop', () => {
       // Name column
       // -----------
       // Event icon
-      if (['break', 'plenary'].includes(event.type) || (event.type === 'other' && ['office hours', 'hackathon'].some(s => event.name.toLowerCase().indexOf(s) >= 0))) {
+      if (['break', 'plenary'].includes(event.type) || (event.type === 'other' && event.name.toLowerCase().indexOf('office hours') >= 0)) {
         await expect(row.locator('.agenda-table-cell-name > i.bi')).toBeVisible()
       }
       // Name link
@@ -262,11 +271,11 @@ test.describe('past - desktop', () => {
         }
         // Scheduled
         case 'sched': {
-          if (event.flags.showAgenda || ['regular', 'plenary'].includes(event.type)) {
+          if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) {
             const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons')
             if (event.flags.agenda) {
               // Show meeting materials button
-              await expect(eventButtons.locator('i.bi.bi-collection')).toBeVisible()
+              await expect(eventButtons.locator(`#btn-btn-${event.id}-mat`)).toBeVisible()
               // ZIP materials button
               await expect(eventButtons.locator(`#btn-lnk-${event.id}-tar`)).toHaveAttribute('href', `/meeting/${meetingData.meeting.number}/agenda/${event.acronym}-drafts.tgz`)
               await expect(eventButtons.locator(`#btn-lnk-${event.id}-tar > i.bi`)).toBeVisible()
@@ -277,10 +286,17 @@ test.describe('past - desktop', () => {
               // No meeting materials yet warning badge
               await expect(eventButtons.locator('.no-meeting-materials')).toBeVisible()
             }
-            // Notepad button
-            const hedgeDocLink = `https://notes.ietf.org/notes-ietf-${meetingData.meeting.number}-${event.type === 'plenary' ? 'plenary' : event.acronym}`
-            await expect(eventButtons.locator(`#btn-lnk-${event.id}-note`)).toHaveAttribute('href', hedgeDocLink)
-            await expect(eventButtons.locator(`#btn-lnk-${event.id}-note > i.bi`)).toBeVisible()
+            if (event.groupAcronym === 'hackathon') {
+              // Hackathon Wiki button
+              const hackathonWikiLink = `https://wiki.ietf.org/meeting/${meetingData.meeting.number}/hackathon`
+              await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki`)).toHaveAttribute('href', hackathonWikiLink)
+              await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki > i.bi`)).toBeVisible()
+            } else {
+              // Notepad button
+              const hedgeDocLink = `https://notes.ietf.org/notes-ietf-${meetingData.meeting.number}-${event.type === 'plenary' ? 'plenary' : event.acronym}`
+              await expect(eventButtons.locator(`#btn-lnk-${event.id}-note`)).toHaveAttribute('href', hedgeDocLink)
+              await expect(eventButtons.locator(`#btn-lnk-${event.id}-note > i.bi`)).toBeVisible()
+            }
             // Chat logs
             await expect(eventButtons.locator(`#btn-lnk-${event.id}-logs`)).toHaveAttribute('href', event.links.chatArchive)
             await expect(eventButtons.locator(`#btn-lnk-${event.id}-logs > i.bi`)).toBeVisible()
@@ -409,7 +425,7 @@ test.describe('past - desktop', () => {
       })
     })
     // Open dialog
-    await page.locator(`#agenda-rowid-${event.id} #btn-lnk-${event.id}-mat`).click()
+    await page.locator(`#agenda-rowid-${event.id} #btn-btn-${event.id}-mat`).click()
     await expect(page.locator('.agenda-eventdetails')).toBeVisible()
     // Header
     await expect(page.locator('.agenda-eventdetails .n-card-header__main > .detail-header > .bi')).toBeVisible()
@@ -491,7 +507,7 @@ test.describe('past - desktop', () => {
       })
     })
     // Open dialog
-    await page.locator(`#btn-lnk-${event.id}-mat`).click()
+    await page.locator(`#btn-btn-${event.id}-mat`).click()
     await expect(page.locator('.agenda-eventdetails')).toBeVisible()
     // Slides Tab
     await page.locator('.agenda-eventdetails .detail-nav > a').nth(1).click()
@@ -688,7 +704,7 @@ test.describe('past - desktop', () => {
     const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
       .setZone(BROWSER_TIMEZONE)
       .setLocale(BROWSER_LOCALE)
-      .toFormat('DD \'at\' tt ZZZZ')
+      .toFormat('DD \'at\' T ZZZZ')
     await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
     // Switch to UTC
     await tzButtonsLocator.last().click()
@@ -697,7 +713,7 @@ test.describe('past - desktop', () => {
     const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
       .setZone('utc')
       .setLocale(BROWSER_LOCALE)
-      .toFormat('DD \'at\' tt ZZZZ')
+      .toFormat('DD \'at\' T ZZZZ')
     await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
     // Switch back to meeting timezone
     await tzButtonsLocator.first().click()
@@ -773,7 +789,7 @@ test.describe('past - desktop', () => {
 
   test('agenda settings', async ({ page, browserName }) => {
     // Open dialog
-    await page.locator('.meeting-nav + button').click()
+    await page.locator('.agenda-topnav-right > button:last-child').click()
     await expect(page.locator('.agenda-settings')).toBeVisible()
     // Check header elements
     await expect(page.locator('.agenda-settings .n-drawer-header__main > span')).toContainText('Agenda Settings')
@@ -831,7 +847,7 @@ test.describe('past - desktop', () => {
     const localDateTime = DateTime.fromISO(meetingData.meeting.updated)
       .setZone(BROWSER_TIMEZONE)
       .setLocale(BROWSER_LOCALE)
-      .toFormat('DD \'at\' tt ZZZZ')
+      .toFormat('DD \'at\' T ZZZZ')
     await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
     // Switch to UTC
     await tzUtcBtnLocator.click()
@@ -840,7 +856,7 @@ test.describe('past - desktop', () => {
     const utcDateTime = DateTime.fromISO(meetingData.meeting.updated)
       .setZone('utc')
       .setLocale(BROWSER_LOCALE)
-      .toFormat('DD \'at\' tt ZZZZ')
+      .toFormat('DD \'at\' T ZZZZ')
     await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
     // Switch back to meeting timezone
     await tzMeetingBtnLocator.click()
@@ -898,12 +914,28 @@ test.describe('past - desktop', () => {
     await expect(page.locator('.agenda-settings')).not.toBeVisible()
   })
 
+  // -> SHARE DIALOG
+
+  test('agenda share dialog', async ({ page }) => {
+    // Open dialog
+    await page.locator('.agenda-topnav-right > button:nth-child(2)').click()
+    await expect(page.locator('.agenda-share')).toBeVisible()
+    // Check header elements
+    await expect(page.locator('.agenda-share .n-card-header__main > .agenda-share-header > .bi')).toBeVisible()
+    await expect(page.locator('.agenda-share .n-card-header__main > .agenda-share-header > .bi + span')).toContainText('Share this view')
+    // Check input URL
+    await expect(page.locator('.agenda-share .agenda-share-content input[type=text]')).toHaveValue(`http://localhost:3000/meeting/${meetingData.meeting.number}/agenda`)
+    // Clicking X should close the dialog
+    await page.locator('.agenda-share .n-card-header__extra > .agenda-share-header > button').click()
+    await expect(page.locator('.agenda-share')).not.toBeVisible()
+  })
+
   // -> ADD TO CALENDAR
 
   test('agenda add to calendar', async ({ page }) => {
     await expect(page.locator('#agenda-quickaccess-addtocal-btn')).toContainText('Add to your calendar')
     await page.locator('#agenda-quickaccess-addtocal-btn').click()
-    const ddnLocator = page.locator('.n-dropdown-menu > .n-dropdown-option')
+    const ddnLocator = page.locator('.n-dropdown-menu > div > a.agenda-quickaccess-callinks')
     await expect(ddnLocator).toHaveCount(2)
     await expect(ddnLocator.first()).toContainText('Subscribe')
     await expect(ddnLocator.last()).toContainText('Download')
@@ -1012,7 +1044,7 @@ test.describe('past - desktop', () => {
     // Change color legend from settings dialog
     // ----------------------------------------
     // Open dialog
-    await page.locator('.meeting-nav + button').click()
+    await page.locator('.agenda-topnav-right > button:last-child').click()
     await expect(page.locator('.agenda-settings')).toBeVisible()
     // Toggle color legend switch
     await colorLgdSwitchLocator.click()
@@ -1051,7 +1083,7 @@ test.describe('past - desktop', () => {
     // No colored dots should appear
     await expect(page.locator('.agenda .agenda-table-display-event .agenda-table-colorindicator')).toHaveCount(0)
     // Clear all colors from Settings menu
-    await page.locator('.meeting-nav + button').click()
+    await page.locator('.agenda-topnav-right > button:last-child').click()
     await expect(page.locator('.agenda-settings')).toBeVisible()
     await page.locator('.agenda-settings .agenda-settings-actions > button').first().click()
     await page.locator('.n-dropdown-option:has-text("Clear Color")').click()
@@ -1123,10 +1155,10 @@ test.describe('future - desktop', () => {
       // -----------------------
       if (event.status === 'sched') {
         const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons')
-        if (event.flags.showAgenda || ['regular', 'plenary'].includes(event.type)) {
+        if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) {
           if (event.flags.agenda) {
             // Show meeting materials button
-            await expect(eventButtons.locator('i.bi.bi-collection')).toBeVisible()
+            await expect(eventButtons.locator(`#btn-btn-${event.id}-mat`)).toBeVisible()
             // ZIP materials button
             await expect(eventButtons.locator(`#btn-lnk-${event.id}-tar`)).toHaveAttribute('href', `/meeting/${meetingData.meeting.number}/agenda/${event.acronym}-drafts.tgz`)
             await expect(eventButtons.locator(`#btn-lnk-${event.id}-tar > i.bi`)).toBeVisible()
@@ -1137,10 +1169,17 @@ test.describe('future - desktop', () => {
             // No meeting materials yet warning badge
             await expect(eventButtons.locator('.no-meeting-materials')).toBeVisible()
           }
-          // Notepad button
-          const hedgeDocLink = `https://notes.ietf.org/notes-ietf-${meetingData.meeting.number}-${event.type === 'plenary' ? 'plenary' : event.acronym}`
-          await expect(eventButtons.locator(`#btn-lnk-${event.id}-note`)).toHaveAttribute('href', hedgeDocLink)
-          await expect(eventButtons.locator(`#btn-lnk-${event.id}-note > i.bi`)).toBeVisible()
+          if (event.groupAcronym === 'hackathon') {
+            // Hackathon Wiki button
+            const hackathonWikiLink = `https://wiki.ietf.org/meeting/${meetingData.meeting.number}/hackathon`
+            await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki`)).toHaveAttribute('href', hackathonWikiLink)
+            await expect(eventButtons.locator(`#btn-lnk-${event.id}-wiki > i.bi`)).toBeVisible()
+          } else {
+            // Notepad button
+            const hedgeDocLink = `https://notes.ietf.org/notes-ietf-${meetingData.meeting.number}-${event.type === 'plenary' ? 'plenary' : event.acronym}`
+            await expect(eventButtons.locator(`#btn-lnk-${event.id}-note`)).toHaveAttribute('href', hedgeDocLink)
+            await expect(eventButtons.locator(`#btn-lnk-${event.id}-note > i.bi`)).toBeVisible()
+          }
           // Chat room
           await expect(eventButtons.locator(`#btn-lnk-${event.id}-room`)).toHaveAttribute('href', event.links.chat)
           await expect(eventButtons.locator(`#btn-lnk-${event.id}-room > i.bi`)).toBeVisible()
@@ -1174,13 +1213,18 @@ test.describe('future - desktop', () => {
             await expect(eventButtons.locator(`#btn-lnk-${event.id}-remotecallin`)).toHaveAttribute('href', remoteCallInUrl)
             await expect(eventButtons.locator(`#btn-lnk-${event.id}-remotecallin > i.bi`)).toBeVisible()
           }
-          // calendar
+          // Calendar
           if (event.links.calendar) {
             await expect(eventButtons.locator(`#btn-lnk-${event.id}-calendar`)).toHaveAttribute('href', event.links.calendar)
             await expect(eventButtons.locator(`#btn-lnk-${event.id}-calendar > i.bi`)).toBeVisible()
           }
         } else {
-          await expect(eventButtons).toHaveCount(0)
+          if (event.links.calendar) {
+            await expect(eventButtons.locator(`#btn-lnk-${event.id}-calendar`)).toHaveAttribute('href', event.links.calendar)
+            await expect(eventButtons.locator(`#btn-lnk-${event.id}-calendar > i.bi`)).toBeVisible()
+          } else {
+            await expect(eventButtons).toHaveCount(0)
+          }
         }
       }
     }
@@ -1239,22 +1283,7 @@ test.describe('live - desktop', () => {
     })
 
     // Override Date in page to fixed time
-    await page.addInitScript(`{
-      // Extend Date constructor to default to fixed time
-      Date = class extends Date {
-        constructor(...args) {
-          if (args.length === 0) {
-            super(${currentTime.toMillis()});
-          } else {
-            super(...args);
-          }
-        }
-      }
-      // Override Date.now() to start from fixed time
-      const __DateNowOffset = ${currentTime.toMillis()} - Date.now();
-      const __DateNow = Date.now;
-      Date.now = () => __DateNow() + __DateNowOffset;
-    }`)
+    await commonHelper.overridePageDateTime(page, currentTime)
 
     // Visit agenda page and await Meeting Data API call to complete
     await Promise.all([
@@ -1295,7 +1324,7 @@ test.describe('live - desktop', () => {
 
   test('live red line toggle', async ({ page }) => {
     // Open settings dialog
-    await page.locator('.meeting-nav + button').click()
+    await page.locator('.agenda-topnav-right > button:last-child').click()
     await expect(page.locator('.agenda-settings')).toBeVisible()
     // Toggle red line switch
     const redlineSwitchLocator = page.locator('#agenda-settings-tgl-redline div[role=switch]')
@@ -1309,6 +1338,89 @@ test.describe('live - desktop', () => {
   })
 })
 
+// ====================================================================
+// AGENDA (live meeting) | DESKTOP viewport | Plenary Extended Time Buttons
+// ====================================================================
+
+test.describe('live - desktop - plenary extended time buttons', () => {
+  let meetingData
+  let plenarySessionId
+
+  test.beforeAll(async () => {
+    // Generate meeting data
+    meetingData = meetingHelper.generateAgendaResponse({ dateMode: 'current' })
+    plenarySessionId = meetingData.schedule.find(s => s.type === 'plenary').id
+  })
+
+  test.beforeEach(async ({ page }) => {
+    // Intercept Meeting Data API
+    await page.route(`**/api/meeting/${meetingData.meeting.number}/agenda-data`, route => {
+      route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(meetingData)
+      })
+    })
+
+    await page.setViewportSize({
+      width: viewports.desktop[0],
+      height: viewports.desktop[1]
+    })
+  })
+
+  // -> BUTTONS PRESENT AFTER EVENT, SAME DAY
+
+  test('same day - after event', async ({ page }) => {
+    // Override Date in page to fixed time
+    const currentTime = DateTime.fromISO('2022-02-01T13:45:15', { zone: 'Asia/Tokyo' }).plus({ days: 1 }).set({ hour: 20, minute: 30 })
+    await commonHelper.overridePageDateTime(page, currentTime)
+
+    // Visit agenda page and await Meeting Data API call to complete
+    await Promise.all([
+      page.waitForResponse(`**/api/meeting/${meetingData.meeting.number}/agenda-data`),
+      page.goto(`/meeting/${meetingData.meeting.number}/agenda`)
+    ])
+
+    // Wait for page to be ready
+    await page.locator('.agenda h1').waitFor({ state: 'visible' })
+    await setTimeout(500)
+
+    // Check for plenary event
+    await expect(page.locator('.agenda .agenda-table-display-event.agenda-table-type-plenary')).toBeVisible()
+    await page.locator('.agenda .agenda-table-display-event.agenda-table-type-plenary').scrollIntoViewIfNeeded()
+
+    // Check for full video client + on-site tool
+    await expect(page.locator(`.agenda .agenda-table-display-event.agenda-table-type-plenary .agenda-table-cell-links-buttons a#btn-lnk-${plenarySessionId}-video`)).toBeVisible()
+    await expect(page.locator(`.agenda .agenda-table-display-event.agenda-table-type-plenary .agenda-table-cell-links-buttons a#btn-lnk-${plenarySessionId}-onsitetool`)).toBeVisible()
+  })
+
+  // -> BUTTONS NO LONGER PRESENT AFTER EVENT, NEXT DAY
+
+  test('next day - after event', async ({ page }) => {
+    // Override Date in page to fixed time
+    const currentTime = DateTime.fromISO('2022-02-01T13:45:15', { zone: 'Asia/Tokyo' }).plus({ days: 2 }).set({ hour: 2, minute: 30 })
+    await commonHelper.overridePageDateTime(page, currentTime)
+
+    // Visit agenda page and await Meeting Data API call to complete
+    await Promise.all([
+      page.waitForResponse(`**/api/meeting/${meetingData.meeting.number}/agenda-data`),
+      page.goto(`/meeting/${meetingData.meeting.number}/agenda`)
+    ])
+
+    // Wait for page to be ready
+    await page.locator('.agenda h1').waitFor({ state: 'visible' })
+    await setTimeout(500)
+
+    // Check for plenary event
+    await expect(page.locator('.agenda .agenda-table-display-event.agenda-table-type-plenary')).toBeVisible()
+    await page.locator('.agenda .agenda-table-display-event.agenda-table-type-plenary').scrollIntoViewIfNeeded()
+
+    // Check for full video client + on-site tool
+    await expect(page.locator(`.agenda .agenda-table-display-event.agenda-table-type-plenary .agenda-table-cell-links-buttons a#btn-lnk-${plenarySessionId}-video`)).not.toBeVisible()
+    await expect(page.locator(`.agenda .agenda-table-display-event.agenda-table-type-plenary .agenda-table-cell-links-buttons a#btn-lnk-${plenarySessionId}-onsitetool`)).not.toBeVisible()
+  })
+})
+
 // ====================================================================
 // AGENDA (past meeting) | SMALL DESKTOP/TABLET/MOBILE viewports
 // ====================================================================
@@ -1402,27 +1514,34 @@ test.describe('past - small screens', () => {
 
         // has a bottom mobile bar
         await expect(page.locator('.agenda-mobile-bar')).toBeVisible()
-        await expect(barBtnLocator).toHaveCount(4)
-        await expect(barBtnLocator.first()).toContainText('Filters')
-        await expect(barBtnLocator.nth(1)).toContainText('Cal')
-        await expect(barBtnLocator.nth(2)).toContainText('.ics')
-        await expect(barBtnLocator.last().locator('> *')).toHaveCount(1)
-        await expect(barBtnLocator.last().locator('> *')).toHaveClass(/bi/)
+        await expect(barBtnLocator).toHaveCount(5)
 
-        // can open the filters overlay
+        // can open the jump to day dropdown
         await barBtnLocator.first().click()
+        const jumpDayDdnLocator = page.locator('.n-dropdown-menu [data-testid=mobile-link]')
+        await expect(jumpDayDdnLocator).toHaveCount(7)
+        for (let idx = 0; idx < 7; idx++) {
+          const localDateTime = DateTime.fromISO(meetingData.meeting.startDate, { zone: meetingData.meeting.timezone })
+            .setLocale(BROWSER_LOCALE)
+            .plus({ days: idx })
+            .toFormat('ccc LLL d')
+          await expect(jumpDayDdnLocator.nth(idx)).toContainText(`Jump to ${localDateTime}`)
+        }
+
+        // can open the filters overlay
+        await barBtnLocator.nth(1).click()
         await expect(page.locator('.agenda-personalize')).toBeVisible()
         await page.locator('.agenda-personalize .agenda-personalize-actions > button').nth(1).click()
         await expect(page.locator('.agenda-personalize')).toBeHidden()
 
         // can open the calendar view
-        await barBtnLocator.nth(1).click()
+        await barBtnLocator.nth(2).click()
         await expect(page.locator('.agenda-calendar')).toBeVisible()
         await page.locator('.agenda-calendar .agenda-calendar-actions > button').nth(1).click()
         await expect(page.locator('.agenda-calendar')).toBeHidden()
 
         // can open the ics dropdown
-        await barBtnLocator.nth(2).click()
+        await barBtnLocator.nth(3).click()
         const calDdnLocator = page.locator('.n-dropdown-menu > .n-dropdown-option')
         await expect(calDdnLocator).toHaveCount(2)
         await expect(calDdnLocator.first()).toContainText('Subscribe')
diff --git a/playwright/tests/status/status.spec.js b/playwright/tests/status/status.spec.js
new file mode 100644
index 0000000000..c70617e2fd
--- /dev/null
+++ b/playwright/tests/status/status.spec.js
@@ -0,0 +1,66 @@
+const {
+  test,
+  expect
+} = require('@playwright/test')
+const { STATUS_STORAGE_KEY, generateStatusTestId } = require('../../../client/shared/status-common.js')
+
+test.describe('site status', () => {
+  const noStatus = {
+    hasMessage: false
+  }
+
+  const status1 = {
+    hasMessage: true,
+    id: 1,
+    slug: '2024-7-9fdfdf-sdfsdf',
+    title: 'My status title',
+    body: 'My status body',
+    url: '/status/2024-7-9fdfdf-sdfsdf',
+    date: '2024-07-09T07:05:13+00:00',
+    by: 'Exile is a cool Amiga game'
+  }
+
+  test.beforeEach(({ page, browserName }) => {
+    page.setDefaultTimeout(15 * 1000) // increase default timeout
+    test.skip(browserName === 'firefox', 'bypassing flaky tests on Firefox')
+  })
+
+  test('Renders server status as Notification', async ({ page }) => {
+    await page.route('/status/latest.json', route => {
+      route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(status1)
+      })
+    })
+    await page.goto('/')
+    await expect(page.getByTestId(generateStatusTestId(status1.id)), 'should have status').toHaveCount(1)
+  })
+
+  test("Doesn't render dismissed server statuses", async ({ page }) => {
+    await page.route('/status/latest.json', route => {
+      route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(status1)
+      })
+    })
+    await page.goto('/')
+    await page.evaluate(({ key, value }) => localStorage.setItem(key, value), { key: STATUS_STORAGE_KEY, value: JSON.stringify([status1.id]) })
+    await expect(page.getByTestId(generateStatusTestId(status1.id)), 'should have status').toHaveCount(0)
+  })
+
+  test('Handles no server status', async ({ page }) => {
+    await page.route('/status/latest.json', route => {
+      route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify(noStatus)
+      })
+    })
+
+    await page.goto('/')
+
+    await expect(page.getByTestId(generateStatusTestId(status1.id)), 'should have status').toHaveCount(0)
+  })
+})
diff --git a/pyzmail/__init__.py b/pyzmail/__init__.py
deleted file mode 100644
index f6c8854abc..0000000000
--- a/pyzmail/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# pyzmail/__init__.py
-# (c) Alain Spineux <alain.spineux@gmail.com>
-# http://www.magiksys.net/pyzmail
-# Released under LGPL
-
-from . import utils
-from .generate import compose_mail, send_mail, send_mail2
-from .parse import email_address_re, PyzMessage, PzMessage, decode_text
-from .parse import message_from_string, message_from_file
-from .parse import message_from_bytes, message_from_binary_file # python >= 3.2
-from .version import __version__
-
-# to help epydoc to display functions available from top of the package
-__all__= [ 'compose_mail', 'send_mail', 'send_mail2', 'email_address_re', \
-           'PyzMessage', 'PzMessage', 'decode_text', '__version__', 
-           'utils', 'generate', 'parse', 'version',
-           'message_from_string','message_from_file',
-           'message_from_binary_file', 'message_from_bytes', # python >= 3.2
-           ]
-
diff --git a/pyzmail/generate.py b/pyzmail/generate.py
deleted file mode 100644
index 2ad1f62246..0000000000
--- a/pyzmail/generate.py
+++ /dev/null
@@ -1,529 +0,0 @@
-#
-# pyzmail/generate.py
-# (c) Alain Spineux <alain.spineux@gmail.com>
-# http://www.magiksys.net/pyzmail
-# Released under LGPL
-
-"""
-Useful functions to compose and send emails.
-
-For short:
-
->>> payload, mail_from, rcpt_to, msg_id=compose_mail((u'Me', 'me@foo.com'),
-... [(u'Him', 'him@bar.com')], u'the subject', 'iso-8859-1', ('Hello world', 'us-ascii'),
-... attachments=[('attached', 'text', 'plain', 'text.txt', 'us-ascii')])
-... #doctest: +SKIP
->>> error=send_mail(payload, mail_from, rcpt_to, 'localhost', smtp_port=25)
-... #doctest: +SKIP
-"""
-
-import os, sys
-import time
-import base64
-import smtplib, socket
-import email
-import email.encoders
-import email.header
-import email.utils
-import email.mime
-import email.mime.base
-import email.mime.text
-import email.mime.image
-import email.mime.multipart
-
-from . import utils
-
-def format_addresses(addresses, header_name=None, charset=None):
-    """
-    Convert a list of addresses into a MIME-compliant header for a From, To, Cc,
-    or any other I{address} related field. 
-    This mixes the use of email.utils.formataddr() and email.header.Header().
-    
-    @type addresses: list
-    @param addresses: list of addresses, can be a mix of string a tuple  of the form 
-        C{[ 'address@domain', (u'Name', 'name@domain'), ...]}. 
-        If C{u'Name'} contains non us-ascii characters, it must be a 
-        unicode string or encoded using the I{charset} argument.
-    @type header_name: string or None
-    @keyword header_name: the name of the header. Its length is used to limit 
-        the length of the first line of the header according the RFC's 
-        requirements. (not very important, but it's better to match the 
-        requirements when possible)
-    @type charset: str
-    @keyword charset: the encoding charset for non unicode I{name} and a B{hint}
-        for encoding of unicode string. In other words,
-        if the I{name} of an address in a byte string containing non 
-        I{us-ascii} characters, then C{name.decode(charset)}
-        must generate the expected result. If a unicode string
-        is used instead, charset will be tried to encode the
-        string, if it fail, I{utf-8} will be used.
-        With B{Python 3.x} I{charset} is no more a hint and an exception will
-        be raised instead of using I{utf-8} has a fall back.
-    @rtype: str    
-    @return: the encoded list of formated addresses separated by commas, 
-    ready to use as I{Header} value.
-
-    >>> print format_addresses([('John', 'john@foo.com') ], 'From', 'us-ascii').encode()
-    John <john@foo.com>
-    >>> print format_addresses([(u'l\\xe9o', 'leo@foo.com') ], 'To', 'iso-8859-1').encode()
-    =?iso-8859-1?q?l=E9o?= <leo@foo.com>
-    >>> print format_addresses([(u'l\\xe9o', 'leo@foo.com') ], 'To', 'us-ascii').encode() 
-    ... # don't work in 3.X because charset is more than a hint 
-    ... #doctest: +SKIP
-    =?utf-8?q?l=C3=A9o?= <leo@foo.com>
-    >>> # because u'l\xe9o' cannot be encoded into us-ascii, utf8 is used instead
-    >>> print format_addresses([('No\\xe9', 'noe@f.com'), (u'M\\u0101ori', 'maori@b.com')  ], 'Cc', 'iso-8859-1').encode()
-    ... # don't work in 3.X because charset is more than a hint 
-    ... #doctest: +SKIP
-    =?iso-8859-1?q?No=E9?= <noe@f.com> , =?utf-8?b?TcSBb3Jp?= <maori@b.com>
-    >>> # 'No\xe9' is already encoded into iso-8859-1, but u'M\\u0101ori' cannot be encoded into iso-8859-1 
-    >>> # then utf8 is used here
-    >>> print format_addresses(['a@bar.com', ('John', 'john@foo.com') ], 'From', 'us-ascii').encode()
-    a@bar.com , John <john@foo.com>
-    """
-    header=email.header.Header(charset=charset, header_name=header_name)
-    for i, address in enumerate(addresses):
-        if i!=0:
-            # add separator between addresses
-            header.append(',', charset='us-ascii') 
-
-        try:
-            name, addr=address
-        except ValueError:
-            # address is not a tuple, their is no name, only email address
-            header.append(address, charset='us-ascii') 
-        else:
-            # check if address name is a unicode or byte string in "pure" us-ascii
-            if utils.is_usascii(name):
-                # name is a us-ascii byte string, i can use formataddr
-                formated_addr=email.utils.formataddr((name, addr))
-                # us-ascii must be used and not default 'charset'  
-                header.append(formated_addr, charset='us-ascii')
-            else:
-                # this is not as "pure" us-ascii string
-                # Header will use "RFC2047" to encode the address name
-                # if name is byte string, charset will be used to decode it first
-                header.append(name)
-                # here us-ascii must be used and not default 'charset'  
-                header.append('<%s>' % (addr,), charset='us-ascii') 
-                    
-    return header
-
-
-def build_mail(text, html=None, attachments=None, embeddeds=None):
-    """
-    Generate the core of the email message regarding the parameters.
-    The structure of the MIME email may vary, but the general one is as follow::
-
-        multipart/mixed (only if attachments are included)
-         |
-         +-- multipart/related (only if embedded contents are included) 
-         |    |
-         |    +-- multipart/alternative (only if text AND html are available)
-         |    |    |
-         |    |    +-- text/plain (text version of the message)
-         |    |    +-- text/html  (html version of the message)
-         |    |     
-         |    +-- image/gif  (where to include embedded contents)
-         |
-         +-- application/msword (where to add attachments)
-
-    @param text: the text version of the message, under the form of a tuple:
-        C{(encoded_content, encoding)} where I{encoded_content} is a byte string
-        encoded using I{encoding}.
-        I{text} can be None if the message has no text version. 
-    @type text: tuple or None
-    @keyword html: the HTML version of the message, under the form of a tuple:
-        C{(encoded_content, encoding)} where I{encoded_content} is a byte string
-        encoded using I{encoding}
-        I{html} can be None if the message has no HTML version. 
-    @type html: tuple or None
-    @keyword attachments: the list of attachments to include into the mail, in the
-        form [(data, maintype, subtype, filename, charset), ..] where :
-            - I{data} : is the raw data, or a I{charset} encoded string for 'text'
-            content. 
-            - I{maintype} : is a MIME main type like : 'text', 'image', 'application' ....
-            - I{subtype} : is a MIME sub type of the above I{maintype} for example :
-            'plain', 'png', 'msword' for respectively 'text/plain', 'image/png',
-            'application/msword'.
-            - I{filename} this is the filename of the attachment, it must be a
-            'us-ascii' string or a tuple of the form
-            C{(encoding, language, encoded_filename)} 
-            following the RFC2231 requirement, for example 
-            C{('iso-8859-1', 'fr', u'r\\xe9pertoir.png'.encode('iso-8859-1'))}
-            - I{charset} : if I{maintype} is 'text', then I{data} must be encoded
-            using this I{charset}. It can be None for non 'text' content.
-    @type attachments: list
-    @keyword embeddeds: is a list of documents embedded inside the HTML or text 
-        version of the message. It is similar to the I{attachments} list,  
-        but I{filename} is replaced by I{content_id} that is related to
-        the B{cid} reference into the HTML or text version of the message.
-    @type embeddeds: list
-    @rtype: inherit from email.Message 
-    @return: the message in a MIME object 
-
-    >>> mail=build_mail(('Hello world', 'us-ascii'), attachments=[('attached', 'text', 'plain', 'text.txt', 'us-ascii')])
-    >>> mail.set_boundary('===limit1==')
-    >>> print mail.as_string(unixfrom=False)    
-    Content-Type: multipart/mixed; boundary="===limit1=="
-    MIME-Version: 1.0
-    <BLANKLINE>
-    --===limit1==
-    Content-Type: text/plain; charset="us-ascii"
-    MIME-Version: 1.0
-    Content-Transfer-Encoding: 7bit
-    <BLANKLINE>
-    Hello world
-    --===limit1==
-    Content-Type: text/plain; charset="us-ascii"
-    MIME-Version: 1.0
-    Content-Transfer-Encoding: 7bit
-    Content-Disposition: attachment; filename="text.txt"
-    <BLANKLINE>
-    attached
-    --===limit1==--
-    """
-
-    if attachments is None:
-        attachments = []
-    if embeddeds is None:
-        embeddeds = []
-
-    main=text_part=html_part=None
-    if text:
-        content, charset=text
-        main=text_part=email.mime.text.MIMEText(content, 'plain', charset)
-    
-    if html:
-        content, charset=html
-        main=html_part=email.mime.text.MIMEText(content, 'html', charset)
-        
-    if not text_part and not html_part:
-        main=text_part=email.mime.text.MIMEText('', 'plain', 'us-ascii')
-    elif text_part and html_part:
-        # need to create a multipart/alternative to include text and html version
-        main=email.mime.multipart.MIMEMultipart('alternative', None, [text_part, html_part])
-    
-    if embeddeds:
-        related=email.mime.multipart.MIMEMultipart('related')
-        related.attach(main)
-        for part in embeddeds:
-            if not isinstance(part, email.mime.base.MIMEBase):
-                data, maintype, subtype, content_id, charset=part
-                if (maintype=='text'):
-                    part=email.mime.text.MIMEText(data, subtype, charset)
-                else:
-                    part=email.mime.base.MIMEBase(maintype, subtype)
-                    part.set_payload(data)
-                    email.encoders.encode_base64(part)
-                part.add_header('Content-ID', '<'+content_id+'>')
-                part.add_header('Content-Disposition', 'inline')
-            related.attach(part)
-        main=related
-            
-    if attachments:
-        mixed=email.mime.multipart.MIMEMultipart('mixed')
-        mixed.attach(main)
-        for part in attachments:
-            if not isinstance(part, email.mime.base.MIMEBase):
-                data, maintype, subtype, filename, charset=part
-                if (maintype=='text'):
-                    part=email.mime.text.MIMEText(data, subtype, charset)
-                else:
-                    part=email.mime.base.MIMEBase(maintype, subtype)
-                    part.set_payload(data)
-                    email.encoders.encode_base64(part)
-                part.add_header('Content-Disposition', 'attachment', filename=filename)
-            mixed.attach(part)
-        main=mixed
-        
-    return main
-
-def complete_mail(message, sender, recipients, subject, default_charset, cc=None, bcc=None, message_id_string=None, date=None, headers=None):
-    """
-    Fill in the From, To, Cc, Subject, Date and Message-Id I{headers} of 
-    one existing message regarding the parameters.
-
-    @type message:email.Message 
-    @param message: the message to fill in
-    @type sender: tuple
-    @param sender: a tuple of the form (u'Sender Name', 'sender.address@domain.com')
-    @type recipients: list
-    @param recipients: a list of addresses. Address can be tuple or string like
-    expected by L{format_addresses()}, for example: C{[ 'address@dmain.com', 
-    (u'Recipient Name', 'recipient.address@domain.com'), ... ]}
-    @type subject: str
-    @param subject: The subject of the message, can be a unicode string or a
-    string encoded using I{default_charset} encoding. Prefert unicode to
-    byte string here.
-    @type default_charset: str  
-    @param default_charset: The default charset for this email. Arguments
-    that are non unicode string are supposed to be encoded using this charset. 
-    This I{charset} will be used has an hint when encoding mail content. 
-    @type cc: list
-    @keyword cc: The I{carbone copy} addresses. Same format as the I{recipients}
-    argument.
-    @type bcc: list
-    @keyword bcc: The I{blind carbone copy} addresses. Same format as the I{recipients}
-    argument.
-    @type message_id_string: str or None
-    @keyword message_id_string: if None, don't append any I{Message-ID} to the 
-    mail, let the SMTP do the job, else use the string to generate a unique 
-    I{ID} using C{email.utils.make_msgid()}. The generated value is 
-    returned as last argument. For example use the name of your application.
-    @type date: int or None
-    @keyword date: utc time in second from the epoch or None. If None then
-    use curent time C{time.time()} instead.
-    @type headers: list of tuple
-    @keyword headers: a list of C{(field, value)} tuples to fill in the mail 
-    header fields. Values are encoded using I{default_charset}.
-    @rtype: tuple
-    @return: B{(payload, mail_from, rcpt_to, msg_id)}
-        - I{payload} (str) is the content of the email, generated from the message
-        - I{mail_from} (str) is the address of the sender to pass to the SMTP host
-        - I{rcpt_to} (list) is a list of the recipients addresses to pass to the SMTP host
-        of the form C{[ 'a@b.com', c@d.com', ]}. This combine all recipients, 
-        I{carbone copy} addresses and I{blind carbone copy} addresses.
-        - I{msg_id} (None or str) None if message_id_string==None else the generated value for 
-        the message-id. If not None, this I{Message-ID} is already written 
-        into the payload.
-        
-    >>> import email.mime.text
-    >>> msg=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii')
-    >>> # I could use build_mail() instead
-    >>> payload, mail_from, rcpt_to, msg_id=complete_mail(msg, ('Me', 'me@foo.com'),
-    ... [ ('Him', 'him@bar.com'), ], 'Non unicode subject', 'iso-8859-1',
-    ... cc=['her@bar.com',], date=1313558269, headers=[('User-Agent', u'pyzmail'), ])
-    >>> print payload
-    ... # 3.X encode  User-Agent: using 'iso-8859-1' even if it contains only us-asccii
-    ... # doctest: +ELLIPSIS  
-    Content-Type: text/plain; charset="us-ascii"
-    MIME-Version: 1.0
-    Content-Transfer-Encoding: 7bit
-    From: Me <me@foo.com>
-    To: Him <him@bar.com>
-    Cc: her@bar.com
-    Subject: =?iso-8859-1?q?Non_unicode_subject?=
-    Date: ...
-    User-Agent: ...pyzmail...
-    <BLANKLINE>
-    The text.
-    >>> print 'mail_from=%r rcpt_to=%r' % (mail_from, rcpt_to)
-    mail_from='me@foo.com' rcpt_to=['him@bar.com', 'her@bar.com']
-    """
-    def getaddr(address):
-        if isinstance(address, tuple):
-            return address[1]
-        else:
-            return address
-
-    if cc is None:
-        cc=[]
-    if bcc is None:
-        bcc=[]
-    if headers is None:
-        headers=[]
-
-    mail_from=getaddr(sender[1])
-    rcpt_to=list(map(getaddr, recipients))
-    rcpt_to.extend(list(map(getaddr, cc)))
-    rcpt_to.extend(list(map(getaddr, bcc)))
-
-    message['From'] = format_addresses([ sender, ], header_name='from', charset=default_charset)
-    if recipients:
-        message['To'] = format_addresses(recipients, header_name='to', charset=default_charset)
-    if cc:
-        message['Cc'] = format_addresses(cc, header_name='cc', charset=default_charset)
-    message['Subject'] = email.header.Header(subject, default_charset)
-    if date:
-        utc_from_epoch=date
-    else:
-        utc_from_epoch=time.time()
-    message['Date'] = email.utils.formatdate(utc_from_epoch, localtime=True)
-    
-    if message_id_string:
-        msg_id=message['Message-Id']=email.utils.make_msgid(message_id_string)
-    else:
-        msg_id=None
-        
-    for field, value in headers:
-        message[field]=email.header.Header(value, default_charset)
-
-    payload=message.as_string()
-    
-    return payload, mail_from, rcpt_to, msg_id
-
-def compose_mail(sender, recipients, subject, default_charset, text, html=None, attachments=None, embeddeds=None, cc=None, bcc=None, message_id_string=None, date=None, headers=None):
-    """
-    Compose an email regarding the arguments. Call L{build_mail()} and 
-    L{complete_mail()} at once.
-    
-    Read the B{parameters} descriptions of both functions L{build_mail()} and L{complete_mail()}. 
-    
-    Returned value is the same as for L{build_mail()} and L{complete_mail()}.
-    You can pass the returned values to L{send_mail()} or L{send_mail2()}.
-
-    @rtype: tuple
-    @return: B{(payload, mail_from, rcpt_to, msg_id)}
-
-    >>> payload, mail_from, rcpt_to, msg_id=compose_mail((u'Me', 'me@foo.com'), [(u'Him', 'him@bar.com')], u'the subject', 'iso-8859-1', ('Hello world', 'us-ascii'), attachments=[('attached', 'text', 'plain', 'text.txt', 'us-ascii')])
-    """
-    if attachments is None:
-        attachments=[]
-    if embeddeds is None:
-        embeddeds=[]
-    if cc is None:
-        cc=[]
-    if bcc is None:
-        bcc = []
-    if headers is None:
-        headers=[]
-
-    message=build_mail(text, html, attachments, embeddeds)
-    return complete_mail(message, sender, recipients, subject, default_charset, cc, bcc, message_id_string, date, headers)
-        
-
-def send_mail2(payload, mail_from, rcpt_to, smtp_host, smtp_port=25, smtp_mode='normal', smtp_login=None, smtp_password=None):
-    """
-    Send the message to a SMTP host. Look at the L{send_mail()} documentation.
-    L{send_mail()} call this function and catch all exceptions to convert them
-    into a user friendly error message. The returned value 
-    is always a dictionary. It can be empty if all recipients have been
-    accepted. 
-
-    @rtype: dict
-    @return: This function return the value returnd by C{smtplib.SMTP.sendmail()}
-    or raise the same exceptions.  
-    
-    This method will return normally if the mail is accepted for at least one 
-    recipient. Otherwise it will raise an exception. That is, if this 
-    method does not raise an exception, then someone should get your mail. 
-    If this method does not raise an exception, it returns a dictionary, 
-    with one entry for each recipient that was refused. Each entry contains a
-    tuple of the SMTP error code and the accompanying error message sent by the server.
-    
-    @raise smtplib.SMTPException: Look at the standard C{smtplib.SMTP.sendmail()} documentation.
-    
-    """
-    if smtp_mode=='ssl':
-        smtp=smtplib.SMTP_SSL(smtp_host, smtp_port)
-    else:
-        smtp=smtplib.SMTP(smtp_host, smtp_port)
-        if smtp_mode=='tls':
-            smtp.starttls()
-            
-    if smtp_login and smtp_password:
-        if sys.version_info<(3, 0):
-            # python 2.x  
-            # login and password must be encoded 
-            # because HMAC used in CRAM_MD5 require non unicode string
-            smtp.login(smtp_login.encode('utf-8'), smtp_password.encode('utf-8'))
-        else:
-            #python 3.x
-            smtp.login(smtp_login, smtp_password)
-    try:
-        ret=smtp.sendmail(mail_from, rcpt_to, payload)
-    finally:
-        try:
-            smtp.quit()
-        except Exception as e:
-            pass
-            
-    return ret
-
-def send_mail(payload, mail_from, rcpt_to, smtp_host, smtp_port=25, smtp_mode='normal', smtp_login=None, smtp_password=None):
-    """
-    Send the message to a SMTP host. Handle SSL, TLS and authentication.
-    I{payload}, I{mail_from} and I{rcpt_to} can come from values returned by
-    L{complete_mail()}. This function call L{send_mail2()} but catch all
-    exceptions and return friendly error message instead. 
-     
-    @type payload: str
-    @param payload: the mail content.
-    @type mail_from: str
-    @param mail_from: the sender address, for example: C{'me@domain.com'}.
-    @type rcpt_to: list
-    @param rcpt_to: The list of the recipient addresses in the form 
-    C{[ 'a@b.com', c@d.com', ]}. No names here, only email addresses.
-    @type smtp_host: str
-    @param smtp_host: the IP address or the name of the SMTP host.
-    @type smtp_port: int
-    @keyword smtp_port: the port to connect to on the SMTP host. Default is C{25}.
-    @type smtp_mode: str
-    @keyword smtp_mode: the way to connect to the SMTP host, can be:  
-                      C{'normal'}, C{'ssl'} or C{'tls'}. default is C{'normal'}
-    @type smtp_login: str or None
-    @keyword smtp_login: If authentication is required, this is the login. 
-                       Be carefull to I{UTF8} encode your login if it contains
-                       non I{us-ascii} characters.
-    @type smtp_password: str or None
-    @keyword smtp_password: If authentication is required, this is the password.
-                          Be carefull to I{UTF8} encode your password if it 
-                          contains non I{us-ascii} characters.
-
-    @rtype: dict or str
-    @return: This function return a dictionary of failed recipients 
-    or a string with an error message. 
-    
-    If all recipients have been accepted the dictionary is empty. If the
-    returned value is a string, none of the recipients will get the message.
-    
-    The dictionary is exactly of the same sort as 
-    smtplib.SMTP.sendmail() returns with one entry for each recipient that 
-    was refused. Each entry contains a tuple of the SMTP error code and 
-    the accompanying error message sent by the server. 
-    
-    Example:
-    
-    >>> send_mail('Subject: hello\\n\\nmessage', 'a@foo.com', [ 'b@bar.com', ], 'localhost') #doctest: +SKIP
-    {}
-    
-    Here is how to use the returned value::
-        if isinstance(ret, dict):
-          if ret:
-            print 'failed' recipients:
-            for recipient, (code, msg) in ret.iteritems():
-                print 'code=%d recipient=%s\terror=%s' % (code, recipient, msg)
-          else:
-            print 'success'
-        else:
-          print 'Error:', ret
-
-    To use your GMail account to send your mail::
-        smtp_host='smtp.gmail.com'
-        smtp_port=587
-        smtp_mode='tls'
-        smtp_login='your.gmail.addresse@gmail.com'
-        smtp_password='your.gmail.password'
-        
-    Use your GMail address for the sender ! 
-
-    """
-
-    error=dict()
-    try:
-        ret=send_mail2(payload, mail_from, rcpt_to, smtp_host, smtp_port, smtp_mode, smtp_login, smtp_password)
-    except (socket.error, ) as e:
-        error='server %s:%s not responding: %s' % (smtp_host, smtp_port, e)
-    except smtplib.SMTPAuthenticationError as e:
-        error='authentication error: %s' % (e, )
-    except smtplib.SMTPRecipientsRefused as e:
-        # code, error=e.recipients[recipient_addr]
-        error='all recipients refused: '+', '.join(list(e.recipients.keys()))
-    except smtplib.SMTPSenderRefused as e:
-        # e.sender, e.smtp_code, e.smtp_error
-        error='sender refused: %s' % (e.sender, )
-    except smtplib.SMTPDataError as e:
-        error='SMTP protocol mismatch: %s' % (e, )
-    except smtplib.SMTPHeloError as e:
-        error="server didn't reply properly to the HELO greeting: %s" % (e, )
-    except smtplib.SMTPException as e:
-        error='SMTP error: %s' % (e, )
-#    except Exception, e:
-#        raise # unknown error
-    else:
-        # failed addresses and error messages
-        error=ret
-        
-    return error
-
diff --git a/pyzmail/parse.py b/pyzmail/parse.py
deleted file mode 100644
index 9f86c37177..0000000000
--- a/pyzmail/parse.py
+++ /dev/null
@@ -1,817 +0,0 @@
-#
-# pyzmail/parse.py
-# (c) Alain Spineux <alain.spineux@gmail.com>
-# http://www.magiksys.net/pyzmail
-# Released under LGPL
-
-"""
-Useful functions to parse emails
-
-@var email_address_re: a regex that match well formed email address (from perlfaq9)
-@undocumented: atom_rfc2822
-@undocumented: atom_posfix_restricted
-@undocumented: atom
-@undocumented: dot_atom
-@undocumented: local
-@undocumented: domain_lit
-@undocumented: domain
-@undocumented: addr_spec
-"""
-
-import re
-import io
-import email
-import email.errors
-import email.header
-import email.message
-import mimetypes
-
-from .utils import *
-
-# email address REGEX matching the RFC 2822 spec from perlfaq9
-#    my $atom       = qr{[a-zA-Z0-9_!#\$\%&'*+/=?\^`{}~|\-]+};
-#    my $dot_atom   = qr{$atom(?:\.$atom)*};
-#    my $quoted     = qr{"(?:\\[^\r\n]|[^\\"])*"};
-#    my $local      = qr{(?:$dot_atom|$quoted)};
-#    my $domain_lit = qr{\[(?:\\\S|[\x21-\x5a\x5e-\x7e])*\]};
-#    my $domain     = qr{(?:$dot_atom|$domain_lit)};
-#    my $addr_spec  = qr{$local\@$domain};
-# 
-# Python's translation
-atom_rfc2822=r"[a-zA-Z0-9_!#\$\%&'*+/=?\^`{}~|\-]+"
-atom_posfix_restricted=r"[a-zA-Z0-9_#\$&'*+/=?\^`{}~|\-]+" # without '!' and '%'
-atom=atom_rfc2822
-dot_atom=atom  +  r"(?:\."  +  atom  +  ")*"
-quoted=r'"(?:\\[^\r\n]|[^\\"])*"'
-local="(?:"  +  dot_atom  +  "|"  +  quoted  +  ")"
-domain_lit=r"\[(?:\\\S|[\x21-\x5a\x5e-\x7e])*\]"
-domain="(?:"  +  dot_atom  +  "|"  +  domain_lit  +  ")"
-addr_spec=local  +  "@"  +  domain
-# and the result
-email_address_re=re.compile('^'+addr_spec+'$')
-
-class MailPart:
-    """
-    Data related to a mail part (aka message content, attachment or  
-    embedded content in an email)
-    
-    @type charset: str or None
-    @ivar charset: the encoding of the I{get_payload()} content if I{type} is 'text/*'
-    and charset has been specified in the message
-    @type content_id: str or None
-    @ivar content_id: the MIME Content-ID if specified in the message.
-    @type description: str or None
-    @ivar description: the MIME Content-Description if specified in the message.
-    @type disposition: str or None
-    @ivar disposition: C{None}, C{'inline'} or C{'attachment'} depending
-    the MIME Content-Disposition value
-    @type filename: unicode or None
-    @ivar filename: the name of the file, if specified in the message. 
-    @type part: inherit from email.mime.base.MIMEBase
-    @ivar part: the related part inside the message.
-    @type is_body: str or None
-    @ivar is_body: None if this part is not the mail content itself (an 
-        attachment or embedded content), C{'text/plain'} if this part is the 
-        text content or C{'text/html'} if this part is the HTML version. 
-    @type sanitized_filename: str or None
-    @ivar sanitized_filename: This field is filled by L{PyzMessage} to store 
-    a valid unique filename related or not with the original filename.
-    @type type: str
-    @ivar type: the MIME type, like 'text/plain', 'image/png', 'application/msword' ...
-    """
-            
-    def __init__(self, part, filename=None, type=None, charset=None, content_id=None, description=None, disposition=None, sanitized_filename=None, is_body=None):
-        """
-        Create an mail part and initialize all attributes
-        """
-        self.part=part          # original python part
-        self.filename=filename  # filename in unicode (if any) 
-        self.type=type          # the mime-type
-        self.charset=charset    # the charset (if any) 
-        self.description=description    # if any 
-        self.disposition=disposition    # 'inline', 'attachment' or None
-        self.sanitized_filename=sanitized_filename # cleanup your filename here (TODO)  
-        self.is_body=is_body        # usually in (None, 'text/plain' or 'text/html')
-        self.content_id=content_id  # if any
-        if self.content_id:
-            # strip '<>' to ease search and replace in "root" content (TODO) 
-            if self.content_id.startswith('<') and self.content_id.endswith('>'):
-                self.content_id=self.content_id[1:-1]
-
-    def get_payload(self):
-        """
-        decode and return part payload. if I{type} is 'text/*' and I{charset} 
-        not C{None}, be careful to take care of the text encoding. Use 
-        something like C{part.get_payload().decode(part.charset)}
-        """
-        
-        payload=None
-        if self.type.startswith('message/'): 
-            # I don't use msg.as_string() because I want to use mangle_from_=False
-            if sys.version_info<(3, 0):
-                # python 2.x  
-                from email.generator import Generator
-                fp = io.StringIO()
-                g = Generator(fp, mangle_from_=False)
-                g.flatten(self.part, unixfrom=False)
-                payload=fp.getvalue()
-            else:
-                # support only for python >= 3.2
-                from email.generator import BytesGenerator
-                import io
-                fp = io.BytesIO()
-                g = BytesGenerator(fp, mangle_from_=False)
-                g.flatten(self.part, unixfrom=False)
-                payload=fp.getvalue()
-                
-        else:
-            payload=self.part.get_payload(decode=True)
-        return payload
-                        
-    def __repr__(self):
-        st='MailPart<'
-        if self.is_body:
-            st+='*'
-        st+=self.type
-        if self.charset:
-            st+=' charset='+self.charset
-        if self.filename:
-            st+=' filename='+self.filename
-        if self.content_id:
-            st+=' content_id='+self.content_id
-        st+=' len=%d' % (len(self.get_payload()), )
-        st+='>'
-        return st
-
-
-
-_line_end_re=re.compile('\r\n|\n\r|\n|\r')
-
-def _friendly_header(header):
-    """
-    Convert header returned by C{email.message.Message.get()} into a 
-    user friendly string. 
-
-    Py3k C{email.message.Message.get()} return C{header.Header()} with charset 
-    set to C{charset.UNKNOWN8BIT} when the header contains invalid characters, 
-    else it return I{str} as  Python 2.X does   
-    
-    @type header: str or email.header.Header
-    @param header: the header to convert into a user friendly string
-    
-    @rtype: str
-    @returns: the converter header 
-    """
-    
-    save=header
-    if isinstance(header, email.header.Header):
-        header=str(header)
-        
-    return re.sub(_line_end_re, ' ', header)
-        
-def decode_mail_header(value, default_charset='us-ascii'):
-    """
-    Decode a header value into a unicode string. 
-    Works like a more smarter python 
-    C{u"".join(email.header.decode_header()} function
-    
-    @type value: str
-    @param value: the value of the header. 
-    @type default_charset: str
-    @keyword default_charset: if one charset used in the header (multiple charset 
-    can be mixed) is unknown, then use this charset instead.  
-    
-    >>> decode_mail_header('=?iso-8859-1?q?Courrier_=E8lectronique_en_Fran=E7ais?=')
-    u'Courrier \\xe8lectronique en Fran\\xe7ais'
-    """
-
-#    value=_friendly_header(value)
-    try:
-        headers=email.header.decode_header(value)
-    except email.errors.HeaderParseError:
-        # this can append in email.base64mime.decode(), for example for this value:
-        # '=?UTF-8?B?15HXmdeh15jXqNeVINeY15DXpteUINeTJ9eV16jXlSDXkdeg15XXldeUINem15PXpywg15TXptei16bXldei15nXnSDXqdecINek15zXmdeZ?==?UTF-8?B?157XldeR15nXnCwg157Xldek16Ig157Xl9eV15wg15HXodeV15bXnyDXk9ec15DXnCDXldeh15gg157Xl9eR16rXldeqINep15wg15HXmdeQ?==?UTF-8?B?15zXmNeZ?='
-        # then return a sanitized ascii string
-        # TODO: some improvements are possible here, but a failure here is
-        # unlikely
-        return value.encode('us-ascii', 'replace').decode('us-ascii')
-    else:
-        for i, (text, charset) in enumerate(headers):
-            # python 3.x
-            # email.header.decode_header('a') -> [('a', None)]
-            # email.header.decode_header('a =?ISO-8859-1?Q?foo?= b')
-            # --> [(b'a', None), (b'foo', 'iso-8859-1'), (b'b', None)]
-            # in Py3 text is sometime str and sometime byte :-(
-            # python 2.x
-            # email.header.decode_header('a') -> [('a', None)]
-            # email.header.decode_header('a =?ISO-8859-1?Q?foo?= b')
-            # --> [('a', None), ('foo', 'iso-8859-1'), ('b', None)]
-            if (charset is None and sys.version_info>=(3, 0)):
-                # Py3
-                if isinstance(text, str):
-                    # convert Py3 string into bytes string to be sure their is no 
-                    # non us-ascii chars and because next line expect byte string
-                    text=text.encode('us-ascii', 'replace')
-            try:
-                headers[i]=text.decode(charset or 'us-ascii', 'replace')
-            except LookupError:
-                # if the charset is unknown, force default 
-                headers[i]=text.decode(default_charset, 'replace')
-
-        return "".join(headers)
-    
-def get_mail_addresses(message, header_name):
-    """
-    retrieve all email addresses from one message header
-
-    @type message: email.message.Message
-    @param message: the email message
-    @type header_name: str
-    @param header_name: the name of the header, can be 'from', 'to', 'cc' or 
-    any other header containing one or more email addresses
-    @rtype: list
-    @returns: a list of the addresses in the form of tuples 
-    C{[(u'Name', 'addresse@domain.com'), ...]}
-
-    >>> import email
-    >>> import email.mime.text
-    >>> msg=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii')
-    >>> msg['From']=email.email.utils.formataddr(('Me', 'me@foo.com'))
-    >>> msg['To']=email.email.utils.formataddr(('A', 'a@foo.com'))+', '+email.email.utils.formataddr(('B', 'b@foo.com'))
-    >>> print msg.as_string(unixfrom=False)
-    Content-Type: text/plain; charset="us-ascii"
-    MIME-Version: 1.0
-    Content-Transfer-Encoding: 7bit
-    From: Me <me@foo.com>
-    To: A <a@foo.com>, B <b@foo.com>
-    <BLANKLINE>
-    The text.
-    >>> get_mail_addresses(msg, 'from')
-    [(u'Me', 'me@foo.com')]
-    >>> get_mail_addresses(msg, 'to')
-    [(u'A', 'a@foo.com'), (u'B', 'b@foo.com')]
-    """ 
-    addrs=email.utils.getaddresses([ _friendly_header(h) for h in message.get_all(header_name, [])])
-    for i, (addr_name, addr) in enumerate(addrs):
-        if not addr_name and addr:
-            # only one string! Is it the address or the  address name ?
-            # use the same for both and see later
-            addr_name=addr
-            
-        if is_usascii(addr):
-            # address must be ascii only and must match address regex
-            if not email_address_re.match(addr):
-                addr=''
-        else:
-            addr=''
-        addrs[i]=(decode_mail_header(addr_name), addr)
-    return addrs
-
-def get_filename(part):
-    """
-    Find the filename of a mail part. Many MUA send attachments with the 
-    filename in the I{name} parameter of the I{Content-type} header instead 
-    of in the I{filename} parameter of the I{Content-Disposition} header.
-    
-    @type part: inherit from email.mime.base.MIMEBase
-    @param part: the mail part 
-    @rtype: None or unicode
-    @returns: the filename or None if not found
-    
-    >>> import email.mime.image
-    >>> attach=email.mime.image.MIMEImage('data', 'png')
-    >>> attach.add_header('Content-Disposition', 'attachment', filename='image.png')
-    >>> get_filename(attach)
-    u'image.png'
-    >>> print attach.as_string(unixfrom=False)
-    Content-Type: image/png
-    MIME-Version: 1.0
-    Content-Transfer-Encoding: base64
-    Content-Disposition: attachment; filename="image.png"
-    <BLANKLINE>
-    ZGF0YQ==
-    >>> import email.mime.text
-    >>> attach=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii')
-    >>> attach.add_header('Content-Disposition', 'attachment', filename=('iso-8859-1', 'fr', u'Fran\\xe7ais.txt'.encode('iso-8859-1')))
-    >>> get_filename(attach)
-    u'Fran\\xe7ais.txt'
-    >>> print attach.as_string(unixfrom=False)
-    Content-Type: text/plain; charset="us-ascii"
-    MIME-Version: 1.0
-    Content-Transfer-Encoding: 7bit
-    Content-Disposition: attachment; filename*="iso-8859-1'fr'Fran%E7ais.txt"
-    <BLANKLINE>
-    The text.
-    """
-    filename=part.get_param('filename', None, 'content-disposition')
-    if not filename:
-        filename=part.get_param('name', None) # default is 'content-type'
-        
-    if filename:
-        if isinstance(filename, tuple):
-            # RFC 2231 must be used to encode parameters inside MIME header
-            filename=email.utils.collapse_rfc2231_value(filename).strip()
-        else:
-            # But a lot of MUA erroneously use RFC 2047 instead of RFC 2231
-            # in fact anybody missuse RFC2047 here !!!
-            filename=decode_mail_header(filename)
-        
-    return filename
-
-def _search_message_content(contents, part):
-    """
-    recursive search of message content (text or HTML) inside 
-    the structure of the email. Used by L{search_message_content()}
-    
-    @type contents: dict
-    @param contents: contents already found in parents or brothers I{parts}. 
-    The dictionary will be completed as and when. key is the MIME type of the part.  
-    @type part: inherit email.mime.base.MIMEBase
-    @param part: the part of the mail to look inside recursively.    
-    """
-    type=part.get_content_type()
-    if part.is_multipart(): # type.startswith('multipart/'):
-        # explore only True 'multipart/*' 
-        # because 'messages/rfc822' are 'multipart/*' too but
-        # must not be explored here 
-        if type=='multipart/related':
-            # the first part or the one pointed by start 
-            start=part.get_param('start', None)
-            related_type=part.get_param('type', None)
-            for i, subpart in enumerate(part.get_payload()):
-                if (not start and i==0) or (start and start==subpart.get('Content-Id')):
-                    _search_message_content(contents, subpart)
-                    return
-        elif type=='multipart/alternative':
-            # all parts are candidates and latest is the best
-            for subpart in part.get_payload():
-                _search_message_content(contents, subpart)
-        elif type in ('multipart/report',  'multipart/signed'):
-            # only the first part is candidate
-            try:
-                subpart=part.get_payload()[0]
-            except IndexError:
-                return
-            else:
-                _search_message_content(contents, subpart)
-                return
-
-        elif type=='multipart/encrypted':
-            # the second part is the good one, but we need to de-crypt it 
-            # using the first part. Do nothing
-            return
-            
-        else: 
-            # unknown types must be handled as 'multipart/mixed'
-            # This is the peace of code that could probably be improved, 
-            # I use a heuristic : if not already found, use first valid non 
-            # 'attachment' parts found
-            for subpart in part.get_payload():
-                tmp_contents=dict()
-                _search_message_content(tmp_contents, subpart)
-                for k, v in tmp_contents.items():
-                    if not subpart.get_param('attachment', None, 'content-disposition')=='':
-                        # if not an attachment, initiate value if not already found
-                        contents.setdefault(k, v)
-            return
-    else:
-        contents[part.get_content_type().lower()]=part
-        return
-    
-    return
-
-def search_message_content(mail):
-    """
-    search of message content (text or HTML) inside 
-    the structure of the mail. This function is used by L{get_mail_parts()}
-    to set the C{is_body} part of the L{MailPart}s
-    
-    @type mail: inherit from email.message.Message
-    @param mail: the message to search in.
-    @rtype: dict
-    @returns: a dictionary of the form C{{'text/plain': text_part, 'text/html': html_part}}
-    where text_part and html_part inherite from C{email.mime.text.MIMEText} 
-    and are respectively the I{text} and I{HTML} version of the message content. 
-    One part can be missing. The dictionay can aven be empty if none of the
-    parts math the requirements to be considered as the content.     
-    """
-    contents=dict()
-    _search_message_content(contents, mail)
-    return contents
-
-def get_mail_parts(msg):
-    """
-    return a list of all parts of the message as a list of L{MailPart}.
-    Retrieve parts attributes to fill in L{MailPart} object.
-    
-    @type msg: inherit email.message.Message
-    @param msg: the message
-    @rtype: list
-    @returns: list of mail parts
-
-    >>> import email.mime.multipart
-    >>> msg=email.mime.multipart.MIMEMultipart(boundary='===limit1==')
-    >>> import email.mime.text
-    >>> txt=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii')
-    >>> msg.attach(txt)
-    >>> import email.mime.image
-    >>> image=email.mime.image.MIMEImage('data', 'png')
-    >>> image.add_header('Content-Disposition', 'attachment', filename='image.png')
-    >>> msg.attach(image)
-    >>> print msg.as_string(unixfrom=False)    
-    Content-Type: multipart/mixed; boundary="===limit1=="
-    MIME-Version: 1.0
-    <BLANKLINE>
-    --===limit1==
-    Content-Type: text/plain; charset="us-ascii"
-    MIME-Version: 1.0
-    Content-Transfer-Encoding: 7bit
-    <BLANKLINE>
-    The text.
-    --===limit1==
-    Content-Type: image/png
-    MIME-Version: 1.0
-    Content-Transfer-Encoding: base64
-    Content-Disposition: attachment; filename="image.png"
-    <BLANKLINE>
-    ZGF0YQ==
-    --===limit1==--
-    >>> parts=get_mail_parts(msg)
-    >>> parts
-    [MailPart<*text/plain charset=us-ascii len=9>, MailPart<image/png filename=image.png len=4>]
-    >>> # the star "*" means this is the mail content, not an attachment 
-    >>> parts[0].get_payload().decode(parts[0].charset)
-    u'The text.'
-    >>> parts[1].filename, len(parts[1].get_payload())
-    (u'image.png', 4)
-
-    """
-    mailparts=[]
-
-    # retrieve messages of the email
-    contents=search_message_content(msg)
-    # reverse contents dict
-    parts=dict((v,k) for k, v in contents.items())
-
-    # organize the stack to handle deep first search
-    stack=[ msg, ]
-    while stack:
-        part=stack.pop(0)
-        type=part.get_content_type()
-        if type.startswith('message/'): 
-            # ('message/delivery-status', 'message/rfc822', 'message/disposition-notification'):
-            # I don't want to explore the tree deeper her and just save source using msg.as_string()
-            # but I don't use msg.as_string() because I want to use mangle_from_=False 
-            filename='message.eml'
-            mailparts.append(MailPart(part, filename=filename, type=type, charset=part.get_param('charset'), description=part.get('Content-Description')))
-        elif part.is_multipart():
-            # insert new parts at the beginning of the stack (deep first search)
-            stack[:0]=part.get_payload()
-        else:
-            charset=part.get_param('charset')
-            filename=get_filename(part)
-                
-            disposition=None
-            if part.get_param('inline', None, 'content-disposition')=='':
-                disposition='inline'
-            elif part.get_param('attachment', None, 'content-disposition')=='':
-                disposition='attachment'
-                
-            mailparts.append(MailPart(part, filename=filename, type=type, charset=charset, content_id=part.get('Content-Id'), description=part.get('Content-Description'), disposition=disposition, is_body=parts.get(part, False)))
-
-    return mailparts
-
-
-def decode_text(payload, charset, default_charset):
-    """
-    Try to decode text content by trying multiple charset until success.
-    First try I{charset}, else try I{default_charset} finally
-    try popular charsets in order : ascii, utf-8, utf-16, windows-1252, cp850
-    If all fail then use I{default_charset} and replace wrong characters
-    
-    @type payload: str
-    @param payload: the content to decode
-    @type charset: str or None
-    @param charset: the first charset to try if != C{None}
-    @type default_charset: str or None
-    @param default_charset: the second charset to try if != C{None}
-    
-    @rtype: tuple
-    @returns: a tuple of the form C{(payload, charset)}
-        - I{payload}: this is the decoded payload if charset is not None and
-        payload is a unicode string
-        - I{charset}: the charset that was used to decode I{payload} If charset is
-        C{None} then something goes wrong: if I{payload} is unicode then
-        invalid characters have been replaced and the used charset is I{default_charset}
-        else, if I{payload} is still byte string then nothing has been done. 
-             
-     
-    """
-    for chset in [ charset, default_charset, 'ascii', 'utf-8', 'utf-16', 'windows-1252', 'cp850' ]:
-        if chset:
-            try: 
-                return payload.decode(chset), chset
-            except UnicodeError:
-                pass
-
-    if default_charset:
-        return payload.decode(chset, 'replace'), None 
-
-    return payload, None
-
-class PyzMessage(email.message.Message):
-    """
-    Inherit from email.message.Message. Combine L{get_mail_parts()},
-    L{get_mail_addresses()} and L{decode_mail_header()} into a
-    B{convenient} object to access mail contents and attributes.
-    This class also B{sanitize} part filenames.
-    
-    @type mailparts: list of L{MailPart}
-    @ivar mailparts: list of L{MailPart} objects composing the email, I{text_part}
-    and I{html_part} are part of this list as are other attachements and embedded
-    contents.
-    @type text_part: L{MailPart} or None
-    @ivar text_part: the L{MailPart} object that contains the I{text}
-    version of the message, None if the mail has not I{text} content.
-    @type html_part: L{MailPart} or None
-    @ivar html_part: the L{MailPart} object that contains the I{HTML}
-    version of the message, None if the mail has not I{HTML} content.
-
-    @note: Sample:
-    
-    >>> raw='''Content-Type: text/plain; charset="us-ascii"
-    ... MIME-Version: 1.0
-    ... Content-Transfer-Encoding: 7bit
-    ... Subject: The subject
-    ... From: Me <me@foo.com>
-    ... To: A <a@foo.com>, B <b@foo.com>
-    ...  
-    ... The text.
-    ... '''
-    >>> msg=PyzMessage.factory(raw)
-    >>> print 'Subject: %r' % (msg.get_subject(), )
-    Subject: u'The subject'
-    >>> print 'From: %r' % (msg.get_address('from'), )
-    From: (u'Me', 'me@foo.com')
-    >>> print 'To: %r' % (msg.get_addresses('to'), )
-    To: [(u'A', 'a@foo.com'), (u'B', 'b@foo.com')]
-    >>> print 'Cc: %r' % (msg.get_addresses('cc'), )
-    Cc: []
-    >>> for mailpart in msg.mailparts:
-    ...   print '    %sfilename=%r sanitized_filename=%r type=%s charset=%s desc=%s size=%d' % ('*'if mailpart.is_body else ' ', mailpart.filename, mailpart.sanitized_filename, mailpart.type, mailpart.charset, mailpart.part.get('Content-Description'), 0 if mailpart.get_payload()==None else len(mailpart.get_payload()))
-    ...   if mailpart.is_body=='text/plain':
-    ...     payload, used_charset=decode_text(mailpart.get_payload(), mailpart.charset, None) 
-    ...     print '        >', payload.split('\\n')[0]
-    ...
-        *filename=None sanitized_filename='text.txt' type=text/plain charset=us-ascii desc=None size=10
-            > The text.
-    """
-
-    @staticmethod
-    def smart_parser(input):
-        """
-        Use the appropriate parser and return a email.message.Message object
-        (this is not a L{PyzMessage} object)
-        
-        @type input: string, file, bytes, binary_file or  email.message.Message
-        @param input: the source of the message
-        @rtype: email.message.Message
-        @returns: the message
-        """
-        if isinstance(input, email.message.Message):
-            return input
-        
-        if sys.version_info<(3, 0):
-            # python 2.x 
-            if isinstance(input, str):
-                return email.message_from_string(input)
-            elif hasattr(input, 'read') and hasattr(input, 'readline'):
-                return email.message_from_file(input)
-            else:
-                raise ValueError('input must be a string, a file or a Message')
-        else:
-            # python 3.x 
-            if isinstance(input, str):
-                return email.message_from_string(input)
-            elif isinstance(input, bytes):
-                # python >= 3.2 only
-                return email.message_from_bytes(input)
-            elif hasattr(input, 'read') and hasattr(input, 'readline'):
-                if hasattr(input, 'encoding'):
-                    # python >= 3.2 only
-                    return email.message_from_file(input)
-                else:
-                    return email.message_from_binary_file(input)
-            else:
-                raise ValueError('input must be a string a bytes, a file or a Message')
-    
-    @staticmethod
-    def factory(input):
-        """
-        Use the appropriate parser and return a L{PyzMessage} object
-        see L{smart_parser}
-        @type input: string, file, bytes, binary_file or  email.message.Message
-        @param input: the source of the message
-        @rtype: L{PyzMessage}
-        @returns: the L{PyzMessage} message
-        """
-        return PyzMessage(PyzMessage.smart_parser(input))
-        
-    
-    def __init__(self, message):
-        """
-        Initialize the object with data coming from I{message}. 
-        
-        @type message: inherit email.message.Message
-        @param message: The message
-        """
-        if not isinstance(message, email.message.Message):
-            raise ValueError("message must inherit from email.message.Message use PyzMessage.factory() instead")
-        self.__dict__.update(message.__dict__)  
-
-        self.mailparts=get_mail_parts(self)
-        self.text_part=None
-        self.html_part=None
-        
-        filenames=[]
-        for part in self.mailparts:
-            ext=mimetypes.guess_extension(part.type)
-            if not ext:
-                 # default to .bin
-                ext='.bin'
-            elif ext=='.ksh':
-                # guess_extension() is not very accurate, .txt is more
-                # appropriate than .ksh 
-                ext='.txt'
-            
-            sanitized_filename=sanitize_filename(part.filename, part.type.split('/', 1)[0], ext)
-            sanitized_filename=handle_filename_collision(sanitized_filename, filenames)
-            filenames.append(sanitized_filename.lower())
-            part.sanitized_filename=sanitized_filename
-            
-            if part.is_body=='text/plain': 
-                self.text_part=part
-                
-            if part.is_body=='text/html': 
-                self.html_part=part
-    
-    def get_addresses(self, name):
-        """
-        return the I{name} header value as an list of addresses tuple as 
-        returned by L{get_mail_addresses()}
-        
-        @type name: str
-        @param name: the name of the header to read value from: 'to', 'cc' are
-        valid I{name} here.
-        @rtype: tuple
-        @returns: a tuple of the form C{('Sender Name', 'sender.address@domain.com')}
-        or C{('', '')} if no header match that I{name}.
-        """ 
-        return get_mail_addresses(self, name)
-    
-    def get_address(self, name):
-        """
-        return the I{name} header value as an address tuple as returned by 
-        L{get_mail_addresses()} 
-
-        @type name: str
-        @param name: the name of the header to read value from: : C{'from'} can
-        be used to return the sender address. 
-        @rtype: list of tuple
-        @returns: a list of tuple of the form C{[('Recipient Name', 'recipient.address@domain.com'), ...]}
-        or an empty list if no header match that I{name}.
-        """ 
-        value=get_mail_addresses(self, name)
-        if value:
-            return value[0]
-        else:
-            return ('', '')
-    
-    def get_subject(self, default=''):
-        """
-        return the RFC2047 decoded subject.
-        
-        @type default: any
-        @param default: The value to return if the message has no I{Subject}
-        @rtype: unicode
-        @returns: the subject or C{default}
-        """
-        return self.get_decoded_header('subject', default)
-
-    def get_decoded_header(self, name, default=''):
-        """
-        return decoded header I{name} using RFC2047. Always use this function 
-        to access header, because any header can contain invalid characters 
-        and this function sanitize the string and avoid unicode exception later
-        in your program. 
-        EVEN for date, I already saw a "Center box bar horizontal" instead
-        of a minus character. 
-
-        @type name: str
-        @param name: the name of the header to read value from.
-        @type default: any
-        @param default: The value to return if the I{name} field don't exist
-        in this message.
-        @rtype: unicode
-        @returns: the value of the header having that I{name} or C{default} if no
-        header have that name.
-        """
-        value=self.get(name)
-        if value==None:
-            value=default
-        else:
-            value=decode_mail_header(value)
-        return value
-    
-class PzMessage(PyzMessage):
-    """
-    Old name and interface for PyzMessage. 
-    B{Deprecated}
-    """
-
-    def __init__(self, input):
-        """
-        Initialize the object with data coming from I{input}. 
-        
-        @type input: str or file or email.message.Message
-        @param input: used as the raw content for the email, can be a string,  
-        a file object or an email.message.Message object. 
-        """
-        PyzMessage.__init__(self, self.smart_parser(input))
-        
-
-def message_from_string(s, *args, **kws):
-    """
-    Parse a string into a L{PyzMessage} object model.
-    @type s: str
-    @param s: the input string 
-    @rtype: L{PyzMessage}
-    @return: the L{PyzMessage} object
-    """
-    return PyzMessage(email.message_from_string(s, *args, **kws))
-
-def message_from_file(fp, *args, **kws):
-    """
-    Read a file and parse its contents into a L{PyzMessage} object model.
-    @type fp: text_file
-    @param fp: the input file (must be open in text mode if Python >= 3.0)
-    @rtype: L{PyzMessage}
-    @return: the L{PyzMessage} object
-    """
-    return PyzMessage(email.message_from_file(fp, *args, **kws))
-
-def message_from_bytes(s, *args, **kws):
-    """
-    Parse a bytes string into a L{PyzMessage} object model.
-    B{(Python >= 3.2)}
-    @type s: bytes
-    @param s: the input bytes string 
-    @rtype: L{PyzMessage}
-    @return: the L{PyzMessage} object
-    """
-    return PyzMessage(email.message_from_bytes(s, *args, **kws))
-
-def message_from_binary_file(fp, *args, **kws):
-    """
-    Read a binary file and parse its contents into a L{PyzMessage} object model.
-    B{(Python >= 3.2)}
-    @type fp: binary_file
-    @param fp: the input file, must be open in binary mode 
-    @rtype: L{PyzMessage}
-    @return: the L{PyzMessage} object
-    """
-    return PyzMessage(email.message_from_binary_file(fp, *args, **kws))
-
-
-if __name__ == "__main__":
-    import sys
-
-    if len(sys.argv)<=1:
-        print('usage : %s filename' % sys.argv[0])
-        print('read an email from file and display a resume of its content')
-        sys.exit(1)
-        
-    msg=PyzMessage.factory(open(sys.argv[1], 'rb'))
-    
-    print('Subject: %r' % (msg.get_subject(), ))
-    print('From: %r' % (msg.get_address('from'), ))
-    print('To: %r' % (msg.get_addresses('to'), ))
-    print('Cc: %r' % (msg.get_addresses('cc'), ))
-    print('Date: %r' % (msg.get_decoded_header('date', ''), ))
-    print('Message-Id: %r' % (msg.get_decoded_header('message-id', ''), ))
-    
-    for mailpart in msg.mailparts:
-        # dont forget to be careful to sanitize 'filename' and be carefull
-        # for filename collision, to before to save :
-        print('   %sfilename=%r type=%s charset=%s desc=%s size=%d' % ('*'if mailpart.is_body else ' ', mailpart.filename, mailpart.type, mailpart.charset, mailpart.part.get('Content-Description'), 0 if mailpart.get_payload()==None else len(mailpart.get_payload())))
-
-        if mailpart.is_body=='text/plain':
-            # print first 3 lines
-            payload, used_charset=decode_text(mailpart.get_payload(), mailpart.charset, None) 
-            for line in payload.split('\n')[:3]:
-                # be careful console can be unable to display unicode characters
-                if line:
-                    print('       >', line)
-
-        
-
diff --git a/pyzmail/tests/__init__.py b/pyzmail/tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/pyzmail/tests/test_both.py b/pyzmail/tests/test_both.py
deleted file mode 100644
index 2607ed8d7f..0000000000
--- a/pyzmail/tests/test_both.py
+++ /dev/null
@@ -1,99 +0,0 @@
-import unittest
-import pyzmail
-from pyzmail.generate import *
-from pyzmail.parse import *
-
-class TestBoth(unittest.TestCase):
-
-    def setUp(self):
-        pass
-    
-    def test_compose_and_parse(self):
-        """test generate and parse"""
-        
-        sender=('Me', 'me@foo.com')
-        recipients=[('Him', 'him@bar.com'), 'just@me.com']
-        subject='Le sujet en Fran\xe7ais'
-        text_content='Bonjour aux Fran\xe7ais'
-        prefered_encoding='iso-8859-1'
-        text_encoding='iso-8859-1'
-        attachments=[('attached content', 'text', 'plain', 'textfile1.txt', 'us-ascii'),
-                     ('Fran\xe7ais', 'text', 'plain', 'textfile2.txt', 'iso-8859-1'),
-                     ('Fran\xe7ais', 'text', 'plain', 'textfile3.txt', 'iso-8859-1'),
-                     (b'image', 'image', 'jpg', 'imagefile.jpg', None),
-                     ]
-        embeddeds=[('embedded content', 'text', 'plain', 'embedded', 'us-ascii'),
-                   (b'picture', 'image', 'png', 'picture', None),
-                   ]
-        headers=[ ('X-extra', 'extra value'), ('X-extra2', "Seconde ent\xe8te"), ('X-extra3', 'last extra'),]
-        
-        message_id_string='pyzmail'
-        date=1313558269
-        
-        payload, mail_from, rcpt_to, msg_id=pyzmail.compose_mail(\
-            sender, \
-            recipients, \
-            subject, \
-            prefered_encoding, \
-            (text_content, text_encoding), \
-            html=None, \
-            attachments=attachments, \
-            embeddeds=embeddeds, \
-            headers=headers, \
-            message_id_string=message_id_string, \
-            date=date\
-            )
-        
-        msg=PyzMessage.factory(payload)
-        
-        self.assertEqual(sender, msg.get_address('from'))
-        self.assertEqual(recipients[0], msg.get_addresses('to')[0])
-        self.assertEqual(recipients[1], msg.get_addresses('to')[1][1])
-        self.assertEqual(subject, msg.get_subject())
-        self.assertEqual(subject, msg.get_decoded_header('subject'))
-        
-        # try to handle different timezone carefully
-        mail_date=list(email.utils.parsedate(msg.get_decoded_header('date')))
-        self.assertEqual(mail_date[:6], list(time.localtime(date))[:6])
-        
-        self.assertNotEqual(msg.get('message-id').find(message_id_string), -1)
-        for name, value in headers:
-            self.assertEqual(value, msg.get_decoded_header(name))
-        
-        for mailpart in msg.mailparts:
-            if mailpart.is_body:
-                self.assertEqual(mailpart.content_id, None)
-                self.assertEqual(mailpart.filename, None)
-                self.assertEqual(type(mailpart.sanitized_filename), str)
-                if mailpart.type=='text/plain':
-                    self.assertEqual(mailpart.get_payload(), text_content.encode(text_encoding))
-                else:
-                    self.fail('found unknown body part')
-            else:
-                if mailpart.filename:
-                    lst=attachments
-                    self.assertEqual(mailpart.filename, mailpart.sanitized_filename)
-                    self.assertEqual(mailpart.content_id, None)
-                elif mailpart.content_id:
-                    lst=embeddeds
-                    self.assertEqual(mailpart.filename, None)
-                else:
-                    self.fail('found unknown part')
-                    
-                found=False
-                for attach in lst:
-                    found=(mailpart.filename and attach[3]==mailpart.filename) \
-                        or (mailpart.content_id and attach[3]==mailpart.content_id)
-                    if found:
-                        break
-                        
-                if found:
-                    self.assertEqual(mailpart.type, attach[1]+'/'+attach[2])
-                    payload=mailpart.get_payload()
-                    if attach[1]=='text' and attach[4] and isinstance(attach[0], str):
-                        payload=payload.decode(attach[4])
-                    self.assertEqual(payload, attach[0])
-                else:
-                    self.fail('found unknown attachment')
-
-
diff --git a/pyzmail/tests/test_generate.py b/pyzmail/tests/test_generate.py
deleted file mode 100644
index 7afdebc593..0000000000
--- a/pyzmail/tests/test_generate.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import unittest, doctest
-import pyzmail
-from pyzmail.generate import *
-
-class TestGenerate(unittest.TestCase):
-
-    def setUp(self):
-        pass
-    
-    def test_format_addresses(self):
-        """test format_addresse"""
-        self.assertEqual('foo@example.com', str(format_addresses([ 'foo@example.com', ])))
-        self.assertEqual('Foo <foo@example.com>', str(format_addresses([ ('Foo', 'foo@example.com'), ])))
-        # notice the space around the comma
-        self.assertEqual('foo@example.com , bar@example.com', str(format_addresses([ 'foo@example.com', 'bar@example.com'])))
-        # notice the space around the comma
-        self.assertEqual('Foo <foo@example.com> , Bar <bar@example.com>', str(format_addresses([ ('Foo', 'foo@example.com'), ( 'Bar', 'bar@example.com')])))
-
-# Add doctest 
-def load_tests(loader, tests, ignore):
-    # this works with python 2.7 and 3.x
-    tests.addTests(doctest.DocTestSuite(pyzmail.generate))
-    return tests
-
-def additional_tests():
-    # Add doctest for python 2.6 and below
-    if sys.version_info<(2, 7):
-        return doctest.DocTestSuite(pyzmail.generate)
-    else:
-        return unittest.TestSuite()
diff --git a/pyzmail/tests/test_parse.py b/pyzmail/tests/test_parse.py
deleted file mode 100644
index f7a5adb9e2..0000000000
--- a/pyzmail/tests/test_parse.py
+++ /dev/null
@@ -1,290 +0,0 @@
-import unittest, doctest
-import pyzmail
-from pyzmail.parse import *
-
-
-class Msg:
-    """mimic a email.Message"""
-    def __init__(self, value):
-        self.value=value
-        
-    def get_all(self, header_name, default):
-        if self.value:
-            return [self.value, ]
-        else:
-            return []
-
-class TestParse(unittest.TestCase):
-
-    def setUp(self):
-        pass
-    
-    def test_decode_mail_header(self):
-        """test decode_mail_header()"""
-        self.assertEqual(decode_mail_header(''), '')
-        self.assertEqual(decode_mail_header('hello'), 'hello')
-        self.assertEqual(decode_mail_header('hello '), 'hello ')
-        self.assertEqual(decode_mail_header('=?iso-8859-1?q?Courrier_=E8lectronique_Fran=E7ais?='), 'Courrier \xe8lectronique Fran\xe7ais')
-        self.assertEqual(decode_mail_header('=?utf8?q?Courrier_=C3=A8lectronique_Fran=C3=A7ais?='), 'Courrier \xe8lectronique Fran\xe7ais')
-        self.assertEqual(decode_mail_header('=?utf-8?b?RnJhbsOnYWlz?='), 'Fran\xe7ais')
-        self.assertEqual(decode_mail_header('=?iso-8859-1?q?Courrier_=E8lectronique_?= =?utf8?q?Fran=C3=A7ais?='), 'Courrier \xe8lectronique Fran\xe7ais')
-        self.assertEqual(decode_mail_header('=?iso-8859-1?q?Courrier_=E8lectronique_?= =?utf-8?b?RnJhbsOnYWlz?='), 'Courrier \xe8lectronique Fran\xe7ais')
-        self.assertEqual(decode_mail_header('h_subject_q_iso_8858_1 : =?ISO-8859-1?Q?Fran=E7ais=E20accentu=E9?= !'), 'h_subject_q_iso_8858_1 :Fran\xe7ais\xe20accentu\xe9!')
-   
-    def test_get_mail_addresses(self):
-        """test get_mail_addresses()"""
-        self.assertEqual([ ('foo@example.com', 'foo@example.com') ], get_mail_addresses(Msg('foo@example.com'), 'to'))
-        self.assertEqual([ ('Foo', 'foo@example.com'), ], get_mail_addresses(Msg('Foo <foo@example.com>'), 'to'))
-        # notice the space around the comma
-        self.assertEqual([ ('foo@example.com', 'foo@example.com'), ('bar@example.com', 'bar@example.com')], get_mail_addresses(Msg('foo@example.com , bar@example.com'), 'to'))
-        self.assertEqual([ ('Foo', 'foo@example.com'), ( 'Bar', 'bar@example.com')], get_mail_addresses(Msg('Foo <foo@example.com> , Bar <bar@example.com>'), 'to'))
-        self.assertEqual([ ('Foo', 'foo@example.com'), ('bar@example.com', 'bar@example.com')], get_mail_addresses(Msg('Foo <foo@example.com> , bar@example.com'), 'to'))
-        self.assertEqual([ ('Mr Foo', 'foo@example.com'), ('bar@example.com', 'bar@example.com')], get_mail_addresses(Msg('Mr\nFoo <foo@example.com> , bar@example.com'), 'to'))
-        
-        self.assertEqual([ ('Beno\xeet', 'benoit@example.com')], get_mail_addresses(Msg('=?utf-8?q?Beno=C3=AEt?= <benoit@example.com>'), 'to'))
-        
-        # address already encoded into utf8 (bad)
-        address='Ant\xf3nio Foo <a.foo@example.com>'.encode('utf8')
-        if sys.version_info<(3, 0):
-            self.assertEqual([('Ant\ufffd\ufffdnio Foo', 'a.foo@example.com')], get_mail_addresses(Msg(address), 'to'))
-        else:
-            # Python 3.2 return header when surrogate characters are used in header
-            self.assertEqual([('Ant??nio Foo', 'a.foo@example.com'), ], get_mail_addresses(Msg(email.header.Header(address, charset=email.charset.UNKNOWN8BIT, header_name='to')), 'to'))
-        
-    def test_get_filename(self):
-        """test get_filename()"""
-        import email.mime.image
-
-        filename='Fran\xe7ais.png'
-        if sys.version_info<(3, 0):
-            encoded_filename=filename.encode('iso-8859-1')
-        else:
-            encoded_filename=filename
-               
-        payload=b'data'
-        attach=email.mime.image.MIMEImage(payload, 'png')
-        attach.add_header('Content-Disposition', 'attachment', filename='image.png')
-        self.assertEqual('image.png', get_filename(attach))
-
-        attach=email.mime.image.MIMEImage(payload, 'png')
-        attach.add_header('Content-Disposition', 'attachment', filename=('iso-8859-1', 'fr', encoded_filename))
-        self.assertEqual('Fran\xe7ais.png', get_filename(attach))
-        
-        attach=email.mime.image.MIMEImage(payload, 'png')
-        attach.set_param('name', 'image.png')
-        self.assertEqual('image.png', get_filename(attach))
-
-        attach=email.mime.image.MIMEImage(payload, 'png')
-        attach.set_param('name', ('iso-8859-1', 'fr', encoded_filename))
-        self.assertEqual('Fran\xe7ais.png', get_filename(attach))
-
-        attach=email.mime.image.MIMEImage(payload, 'png')
-        attach.add_header('Content-Disposition', 'attachment', filename='image.png')
-        attach.set_param('name', 'image_wrong.png')
-        self.assertEqual('image.png', get_filename(attach))
-
-    def test_get_mailparts(self):
-        """test get_mailparts()"""
-        import email.mime.multipart
-        import email.mime.text
-        import email.mime.image
-        msg=email.mime.multipart.MIMEMultipart(boundary='===limit1==')
-        txt=email.mime.text.MIMEText('The text.', 'plain', 'us-ascii')
-        msg.attach(txt)
-        image=email.mime.image.MIMEImage(b'data', 'png')
-        image.add_header('Content-Disposition', 'attachment', filename='image.png')
-        image.add_header('Content-Description', 'the description')
-        image.add_header('Content-ID', '<this.is.the.normaly.unique.contentid>')
-        msg.attach(image)
-        
-        raw=msg.as_string(unixfrom=False)
-        expected_raw="""Content-Type: multipart/mixed; boundary="===limit1=="
-MIME-Version: 1.0
-
---===limit1==
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-
-The text.
---===limit1==
-Content-Type: image/png
-MIME-Version: 1.0
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="image.png"
-Content-Description: the description
-Content-ID: <this.is.the.normaly.unique.contentid>
-
-ZGF0YQ==<HERE1>
---===limit1==--"""
-    
-        if sys.version_info<(3, 0):
-            expected_raw=expected_raw.replace('<HERE1>','')
-        else:
-            expected_raw=expected_raw.replace('<HERE1>','\n')
-
-        self.assertEqual(raw, expected_raw)
-        
-        parts=get_mail_parts(msg)
-        # [MailPart<*text/plain charset=us-ascii len=9>, MailPart<image/png filename=image.png len=4>]
-
-        self.assertEqual(len(parts), 2)
-
-        self.assertEqual(parts[0].type, 'text/plain')
-        self.assertEqual(parts[0].is_body, 'text/plain') # not a error, is_body must be type 
-        self.assertEqual(parts[0].charset, 'us-ascii')
-        self.assertEqual(parts[0].get_payload().decode(parts[0].charset), 'The text.')
-
-        self.assertEqual(parts[1].type, 'image/png')
-        self.assertEqual(parts[1].is_body, False)
-        self.assertEqual(parts[1].charset, None)
-        self.assertEqual(parts[1].filename, 'image.png')
-        self.assertEqual(parts[1].description, 'the description')
-        self.assertEqual(parts[1].content_id, 'this.is.the.normaly.unique.contentid')
-        self.assertEqual(parts[1].get_payload(), b'data')
-
-    
-    raw_1='''Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: simple test
-From: Me <me@foo.com>
-To: A <a@foo.com>, B <b@foo.com>
-Cc: C <c@foo.com>, d@foo.com
-User-Agent: pyzmail
-
-The text.
-'''
-
-    def check_message_1(self, msg):
-        self.assertEqual(msg.get_subject(), 'simple test')
-        self.assertEqual(msg.get_decoded_header('subject'), 'simple test')
-        self.assertEqual(msg.get_decoded_header('User-Agent'), 'pyzmail')
-        self.assertEqual(msg.get('User-Agent'), 'pyzmail')
-        self.assertEqual(msg.get_address('from'), ('Me', 'me@foo.com'))
-        self.assertEqual(msg.get_addresses('to'), [('A', 'a@foo.com'), ('B', 'b@foo.com')])
-        self.assertEqual(msg.get_addresses('cc'), [('C', 'c@foo.com'), ('d@foo.com', 'd@foo.com')])
-        self.assertEqual(len(msg.mailparts), 1)
-        self.assertEqual(msg.text_part, msg.mailparts[0])
-        self.assertEqual(msg.html_part, None)
-
-    # use 8bits encoding and 2 different charsets ! python 3.0 & 3.1 are not eable to parse this sample 
-    raw_2=b"""From: sender@domain.com
-To: recipient@domain.com
-Date: Tue, 7 Jun 2011 16:32:17 +0200
-Subject: contains 8bits attachments using different encoding
-Content-Type: multipart/mixed; boundary=mixed
-
---mixed
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-
-body
---mixed
-Content-Type: text/plain; charset="windows-1252"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="file1.txt"
-
-bo\xeete mail = mailbox
---mixed
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Content-Disposition: attachment; filename="file2.txt"
-
-bo\xc3\xaete mail = mailbox
---mixed--
-"""
-    
-    def check_message_2(self, msg):
-        self.assertEqual(msg.get_subject(), 'contains 8bits attachments using different encoding')
-    
-        body, file1, file2=msg.mailparts
-
-        self.assertEqual('file1.txt', file1.filename)
-        self.assertEqual('file2.txt', file2.filename)
-        self.assertEqual('windows-1252', file1.charset)
-        self.assertEqual('utf-8', file2.charset)
-        content=b'bo\xeete mail = mailbox'.decode("windows-1252")
-        content1=file1.get_payload().decode(file1.charset)
-        content2=file2.get_payload().decode(file2.charset)
-        self.assertEqual(content, content1)
-        self.assertEqual(content, content2)
-
-    # this one contain non us-ascii chars in the header 
-    # py 2x and py3k return different value here  
-    raw_3=b'Content-Type: text/plain; charset="us-ascii"\n' \
-          b'MIME-Version: 1.0\n' \
-          b'Content-Transfer-Encoding: 7bit\n' \
-          + 'Subject: Beno\xeet & Ant\xf3nio\n'.encode('utf8') +\
-          b'From: =?utf-8?q?Beno=C3=AEt?= <benoit@example.com>\n' \
-          + 'To: Ant\xf3nio Foo <a.foo@example.com>\n'.encode('utf8') \
-          + 'Cc: Beno\xeet <benoit@foo.com>, d@foo.com\n'.encode('utf8') +\
-          b'User-Agent: pyzmail\n' \
-          b'\n' \
-          b'The text.\n'
-
-    def check_message_3(self, msg):
-        subject='Beno\ufffd\ufffdt & Ant\ufffd\ufffdnio' #  if sys.version_info<(3, 0) else u'Beno??t & Ant??nio'
-        self.assertEqual(msg.get_subject(), subject)
-        self.assertEqual(msg.get_decoded_header('subject'), subject)
-        self.assertEqual(msg.get_decoded_header('User-Agent'), 'pyzmail')
-        self.assertEqual(msg.get('User-Agent'), 'pyzmail')
-        self.assertEqual(msg.get_address('from'), ('Beno\xeet', 'benoit@example.com'))
-
-        to=msg.get_addresses('to')
-        self.assertEqual(to[0][1], 'a.foo@example.com')
-        self.assertEqual(to[0][0], 'Ant\ufffd\ufffdnio Foo' if sys.version_info<(3, 0) else 'Ant??nio Foo')
-        
-        cc=msg.get_addresses('cc')
-        self.assertEqual(cc[0][1], 'benoit@foo.com')
-        self.assertEqual(cc[0][0], 'Beno\ufffd\ufffdt' if sys.version_info<(3, 0) else 'Beno??t')
-        self.assertEqual(cc[1], ('d@foo.com', 'd@foo.com'))
-        
-        self.assertEqual(len(msg.mailparts), 1)
-        self.assertEqual(msg.text_part, msg.mailparts[0])
-        self.assertEqual(msg.html_part, None)
-
-
-    def check_pyzmessage_factories(self, input, check):
-        """test PyzMessage from different sources"""
-        if isinstance(input, bytes) and sys.version_info>=(3, 2):
-            check(PyzMessage.factory(input))
-            check(message_from_bytes(input))
-
-            import io
-            check(PyzMessage.factory(io.BytesIO(input)))
-            check(message_from_binary_file(io.BytesIO(input)))
-
-        if isinstance(input, str):
-
-            check(PyzMessage.factory(input))
-            check(message_from_string(input))
-
-            import io
-            check(PyzMessage.factory(io.StringIO(input)))
-            check(message_from_file(io.StringIO(input)))
-        
-    def test_pyzmessage_factories(self):
-        """test PyzMessage class different sources"""
-        self.check_pyzmessage_factories(self.raw_1, self.check_message_1)
-        self.check_pyzmessage_factories(self.raw_2, self.check_message_2)
-        self.check_pyzmessage_factories(self.raw_3, self.check_message_3)
-
-
-# Add doctest 
-def load_tests(loader, tests, ignore):
-    # this works with python 2.7 and 3.x
-    if sys.version_info<(3, 0): 
-        tests.addTests(doctest.DocTestSuite(pyzmail.parse))
-    return tests
-
-def additional_tests():
-    # Add doctest for python 2.6 and below
-    if sys.version_info<(2, 7):
-        return doctest.DocTestSuite(pyzmail.parse)
-    else:
-        return unittest.TestSuite()
-
diff --git a/pyzmail/tests/test_send.py b/pyzmail/tests/test_send.py
deleted file mode 100644
index 554f8549a4..0000000000
--- a/pyzmail/tests/test_send.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import threading, smtpd, asyncore, socket, smtplib, time
-import unittest
-import pyzmail
-from pyzmail.generate import *
-
-
-smtpd_addr='127.0.0.1' 
-smtpd_port=32525
-smtp_bad_port=smtpd_port-1
-
-smtp_mode='normal'
-smtp_login=None
-smtp_password=None
-    
-
-class SMTPServer(smtpd.SMTPServer):
-    def __init__(self, localaddr, remoteaddr, received):
-        smtpd.SMTPServer.__init__(self, localaddr, remoteaddr)
-        self.set_reuse_addr()
-        # put the received mail into received list 
-        self.received=received
-        
-    def process_message(self, peer, mail_from, rcpt_to, data):
-        ret=None
-        if mail_from.startswith('data_error'):
-            ret='552 Requested mail action aborted: exceeded storage allocation'
-        self.received.append((ret, peer, mail_from, rcpt_to, data))
-        return ret
-
-class TestSend(unittest.TestCase):
-
-    def setUp(self):
-        self.received=[]
-        self.smtp_server=SMTPServer((smtpd_addr, smtpd_port), None, self.received)
-
-        def asyncloop():
-            # check every sec if all channel are close
-            asyncore.loop(1)
-
-                    
-        self.payload, self.mail_from, self.rcpt_to, self.msg_id=compose_mail(('Me', 'me@foo.com'), [('Him', 'him@bar.com')], 'the subject', 'iso-8859-1', ('Hello world', 'us-ascii'))
-
-        # start the server after having built the payload, to handle failure in 
-        # the code above
-        self.smtpd_thread=threading.Thread(target=asyncloop)
-        self.smtpd_thread.daemon=True
-        self.smtpd_thread.start()
-
-
-    def tearDown(self):
-        self.smtp_server.close()
-        self.smtpd_thread.join()
-        
-    def test_simple_send(self):
-        """simple send"""
-        ret=send_mail(self.payload, self.mail_from, self.rcpt_to, smtpd_addr, smtpd_port, smtp_mode=smtp_mode, smtp_login=smtp_login, smtp_password=smtp_password)
-        self.assertEqual(ret, dict())
-        (ret, peer, mail_from, rcpt_to, payload)=self.received[0]
-        self.assertEqual(self.payload, payload)
-        self.assertEqual(self.mail_from, mail_from)
-        self.assertEqual(self.rcpt_to, rcpt_to)
-        self.assertEqual('127.0.0.1', peer[0])
-
-    def test_send_to_a_wrong_port(self):
-        """send to a wrong port"""
-        self.smtp_server.close()
-        ret=send_mail(self.payload, self.mail_from, self.rcpt_to, smtpd_addr, smtpd_port, smtp_mode=smtp_mode, smtp_login=smtp_login, smtp_password=smtp_password)
-        self.assertEqual(type(ret), str)
-
-    def test_send_data_error(self):
-        """smtp server return error code"""
-        ret=send_mail(self.payload, 'data_error@foo.com', self.rcpt_to, smtpd_addr, smtp_bad_port, smtp_mode=smtp_mode, smtp_login=smtp_login, smtp_password=smtp_password)
-        self.assertEqual(type(ret), str)
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/pyzmail/tests/test_utils.py b/pyzmail/tests/test_utils.py
deleted file mode 100644
index e03d07d0d9..0000000000
--- a/pyzmail/tests/test_utils.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import unittest, doctest
-import pyzmail
-from pyzmail.utils import *
-
-class TestUtils(unittest.TestCase):
-
-    def setUp(self):
-        pass
-    
-    def test_nothing(self):
-        pass
-
-# Add doctest 
-def load_tests(loader, tests, ignore):
-    # this works with python 2.7 and 3.x
-    tests.addTests(doctest.DocTestSuite(pyzmail.utils))
-    return tests
-
-def additional_tests():
-    # Add doctest for python 2.6 and below
-    if sys.version_info<(2, 7):
-        return doctest.DocTestSuite(pyzmail.utils)
-    else:
-        return unittest.TestSuite()
diff --git a/pyzmail/utils.py b/pyzmail/utils.py
deleted file mode 100644
index 436e2a4c34..0000000000
--- a/pyzmail/utils.py
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-# pyzmail/utils.py
-# (c) Alain Spineux <alain.spineux@gmail.com>
-# http://www.magiksys.net/pyzmail
-# Released under LGPL
-
-"""
-Various functions used by other modules
-@var invalid_chars_in_filename: a mix of characters not permitted in most used filesystems
-@var invalid_windows_name: a list of unauthorized filenames under Windows
-"""
-
-import sys
-
-invalid_chars_in_filename=b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f' \
-                          b'\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f' \
-                          b'<>:"/\\|?*%\''
-
-invalid_windows_name=[b'CON', b'PRN', b'AUX', b'NUL', b'COM1', b'COM2', b'COM3', 
-                      b'COM4', b'COM5', b'COM6', b'COM7', b'COM8', b'COM9', 
-                      b'LPT1', b'LPT2', b'LPT3', b'LPT4', b'LPT5', b'LPT6', b'LPT7',
-                      b'LPT8', b'LPT9' ]
-
-def sanitize_filename(filename, alt_name, alt_ext):
-    """
-    Convert the given filename into a name that should work on all 
-    platform. Remove non us-ascii characters, and drop invalid filename.
-    Use the I{alternative} filename if needed.
-    
-    @type filename: unicode or None
-    @param filename: the originale filename or None. Can be unicode.
-    @type alt_name: str
-    @param alt_name: the alternative filename if filename is None or useless
-    @type alt_ext: str
-    @param alt_ext: the alternative filename extension (including the '.')
-
-    @rtype: str
-    @returns: a valid filename.
-     
-    >>> sanitize_filename('document.txt', 'file', '.txt')
-    'document.txt'
-    >>> sanitize_filename('number1.txt', 'file', '.txt')
-    'number1.txt'
-    >>> sanitize_filename(None, 'file', '.txt')
-    'file.txt'
-    >>> sanitize_filename(u'R\\xe9pertoir.txt', 'file', '.txt')
-    'Rpertoir.txt'
-    >>> # the '\\xe9' has been removed
-    >>> sanitize_filename(u'\\xe9\\xe6.html', 'file', '.txt')
-    'file.html'
-    >>> # all non us-ascii characters have been removed, the alternative name
-    >>> # has been used the replace empty string. The originale extention
-    >>> # is still valid  
-    >>> sanitize_filename(u'COM1.txt', 'file', '.txt')
-    'COM1A.txt'
-    >>> # if name match an invalid name or assimilated then a A is added
-    """
-    
-    if not filename:
-        return alt_name+alt_ext
-
-    if ((sys.version_info<(3, 0) and isinstance(filename, str)) or \
-        (sys.version_info>=(3, 0) and isinstance(filename, str))):
-        filename=filename.encode('ascii', 'ignore')
-    
-    filename=filename.translate(None, invalid_chars_in_filename)
-    filename=filename.strip()
-        
-    upper=filename.upper()
-    for name in invalid_windows_name:
-        if upper==name:
-            filename=filename+b'A'
-            break
-        if upper.startswith(name+b'.'):
-            filename=filename[:len(name)]+b'A'+filename[len(name):]
-            break
-
-    if sys.version_info>=(3, 0):
-        # back to string
-        filename=filename.decode('us-ascii')
-
-    if filename.rfind('.')==0:
-        filename=alt_name+filename
-
-    return filename
-
-def handle_filename_collision(filename, filenames):
-    """
-    Avoid filename collision, add a sequence number to the name when required.
-    'file.txt' will be renamed into 'file-01.txt' then 'file-02.txt' ... 
-    until their is no more collision. The file is not added to the list.
-     
-    Windows don't make the difference between lower and upper case. To avoid
-    "case" collision, the function compare C{filename.lower()} to the list.
-    If you provide a list in lower case only, then any collisions will be avoided.     
-    
-    @type filename: str
-    @param filename: the filename
-    @type filenames: list or set
-    @param filenames: a list of filenames. 
-
-    @rtype: str
-    @returns: the I{filename} or the appropriately I{indexed} I{filename} 
-     
-    >>> handle_filename_collision('file.txt', [ ])
-    'file.txt'
-    >>> handle_filename_collision('file.txt', [ 'file.txt' ])
-    'file-01.txt'
-    >>> handle_filename_collision('file.txt', [ 'file.txt', 'file-01.txt',])
-    'file-02.txt'
-    >>> handle_filename_collision('foo', [ 'foo',])
-    'foo-01'
-    >>> handle_filename_collision('foo', [ 'foo', 'foo-01',])
-    'foo-02'
-    >>> handle_filename_collision('FOO', [ 'foo', 'foo-01',])
-    'FOO-02'
-    """
-    if filename.lower() in filenames:
-        try:
-            basename, ext=filename.rsplit('.', 1)
-            ext='.'+ext
-        except ValueError:
-            basename, ext=filename, '' 
-
-        i=1
-        while True:
-            filename='%s-%02d%s' % (basename, i, ext)
-            if filename.lower() not in filenames:
-                break
-            i+=1
-        
-    return filename
-
-def is_usascii(value):
-    """"
-    test if string contains us-ascii characters only
-    
-    >>> is_usascii('foo')
-    True
-    >>> is_usascii(u'foo')
-    True
-    >>> is_usascii(u'Fran\xe7ais')
-    False
-    >>> is_usascii('bad\x81')
-    False
-    """
-    try:
-        # if value is byte string, it will be decoded first using us-ascii
-        # and will generate UnicodeEncodeError, this is fine too
-        value.encode('us-ascii')
-    except UnicodeError:
-        return False
-    
-    return True
- 
\ No newline at end of file
diff --git a/pyzmail/version.py b/pyzmail/version.py
deleted file mode 100644
index 03e1b0c6dc..0000000000
--- a/pyzmail/version.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__='1.0.3'
diff --git a/requirements.txt b/requirements.txt
index 155e5c6766..ca9a6740e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,68 +1,95 @@
 # -*- conf-mode -*-
-setuptools>=51.1.0    # Require this first, to prevent later errors
+setuptools>=80.9.0  # Require this first, to prevent later errors
 #
-argon2-cffi>=21.3.0    # For the Argon2 password hasher option
-beautifulsoup4>=4.11.1    # Only used in tests
-bibtexparser>=1.2.0    # Only used in tests
-bleach>=5.0.0
-celery>=5.2.6
-coverage>=4.5.4,<5.0    # Coverage 5.x moves from a json database to SQLite.  Moving to 5.x will require substantial rewrites in ietf.utils.test_runner and ietf.release.views
-decorator>=5.1.1
+aiosmtpd>=1.4.6
+argon2-cffi>=25.1.0  # For the Argon2 password hasher option
+beautifulsoup4>=4.13.4  # Only used in tests
+bibtexparser>=1.4.4  # Only used in tests
+bleach>=6.2.0  # project is deprecated but supported
+types-bleach>=6.2.0
+boto3>=1.39.15
+boto3-stubs[s3]>=1.39.15
+botocore>=1.39.15
+celery>=5.5.3
+coverage>=7.9.2
 defusedxml>=0.7.1    # for TastyPie when using xml; not a declared dependency
-Django>=2.2.28,<3.0
-django-analytical>=3.1.0
-django-bootstrap5>=21.3
-django-celery-beat>=2.3.0
+Django>4.2,<5
+django-admin-rangefilter>=0.13.3
+django-analytical>=3.2.0
+django-bootstrap5>=25.1
+django-celery-beat>=2.9.0
+django-celery-results>=2.6.0
 django-csp>=3.7
-django-cors-headers>=3.11.0
-django-debug-toolbar>=3.2.4
-django-form-utils>=1.0.3    # Only one use, in the liaisons app. Last release was in 2015.
-django-markup>=1.5    # Limited use - need to reconcile against direct use of markdown
-django-oidc-provider>=0.7
-django-password-strength>=1.2.1
-django-referrer-policy>=1.0
-django-simple-history>=3.0.0
-django-stubs==1.6.0    # The django-stubs version used determines the the mypy version indicated below
-django-tastypie==0.14.3    # Version must be locked in sync with version of Django
-django-vite>=2.0.2
-django-webtest>=1.9.10    # Only used in tests
+django-cors-headers>=4.7.0
+django-debug-toolbar>=6.0.0
+django-filter>=24.3
+django-markup>=1.10    # Limited use - need to reconcile against direct use of markdown
+django-oidc-provider==0.8.2    # 0.8.3 changes logout flow and claim return
+django-simple-history>=3.10.1
+django-storages>=1.14.6
+django-stubs>=4.2.7,<5    # The django-stubs version used determines the the mypy version indicated below
+django-tastypie>=0.15.1  # Version must be kept in sync with Django
+django-vite>=3.1.0
 django-widget-tweaks>=1.4.12
-djlint>=1.0.0    # To auto-indent templates via "djlint --profile django --reformat"
-docutils>=0.18.1    # Used only by dbtemplates for RestructuredText
-factory-boy>=3.2.1
-github3.py>=3.2.0
-gunicorn>=20.1.0
+djangorestframework>=3.16.0
+docutils>=0.22.0  # Used only by dbtemplates for RestructuredText
+types-docutils>=0.21.0  # should match docutils (0.22.0 not out yet)
+drf-spectacular>=0.27
+drf-standardized-errors[openapi] >= 0.15.0
+factory-boy>=3.3.3
+gunicorn>=23.0.0
 hashids>=1.3.1
-html2text>=2020.1.16    # Used only to clean comment field of secr/sreq
+html2text>=2025.4.15  # Used only to clean comment field of secr/sreq
 html5lib>=1.1    # Only used in tests
-jsonfield>=3.1.0    # for SubmissionCheck.  This is https://github.com/bradjasper/django-jsonfield/.
-jwcrypto>=1.2    # for signed notifications - this is aspirational, and is not really used.
-logging_tree>=1.9    # Used only by the showloggers management command
-lxml>=4.8.0,<5
-markdown>=3.3.6
-mock>=4.0.3    # Used only by tests, of course
-mypy>=0.782,<0.790    # Version requirements determined by django-stubs.
-mysqlclient>=2.1.0
-oic>=1.3    # Used only by tests
-Pillow>=9.1.0
-pyang>=2.5.3
-pyflakes>=2.4.0
-pyopenssl>=22.0.0    # Used by urllib3.contrib, which is used by PyQuery but not marked as a dependency
-pyquery>=1.4.3
-python-dateutil>=2.8.2
+httpx>=0.28.1  # Indirect req of typesense, but we import and refer to exceptions
+icalendar>=5.0.0 
+inflect>= 7.5.0
+jsonfield>=3.2.0  # deprecated - need to replace with Django's JSONField
+jsonschema[format]>=4.25.0
+jwcrypto>=1.5.6  # for signed notifications - this is aspirational, and is not really used.
+logging_tree>=1.10  # Used only by the showloggers management command
+lxml>=6.0.0
+markdown>=3.8.0
+types-markdown>=3.8.0
+mock>=5.2.0  # should replace with unittest.mock and remove dependency
+types-mock>=5.2.0
+mypy~=1.11.2  # Version requirements loosely determined by django-stubs.
+oic>=1.7.0  # Used only by tests
+opentelemetry-sdk>=1.38.0
+opentelemetry-instrumentation-django>=0.59b0
+opentelemetry-instrumentation-psycopg2>=0.59b0
+opentelemetry-instrumentation-pymemcache>=0.59b0
+opentelemetry-instrumentation-requests>=0.59b0
+opentelemetry-exporter-otlp-proto-http>=1.38.0
+pillow>=11.3.0
+psycopg2>=2.9.10
+pyang>=2.6.1
+pydyf>=0.11.0
+pyflakes>=3.4.0
+pyopenssl>=25.1.0  # Used by urllib3.contrib, which is used by PyQuery but not marked as a dependency
+pyquery>=2.0.1
+python-dateutil>=2.9.0
+types-python-dateutil>=2.9.0
+python-json-logger>=3.3.0
 python-magic==0.4.18    # Versions beyond the yanked .19 and .20 introduce form failures
-python-memcached>=1.59    # for django.core.cache.backends.memcached
-python-mimeparse>=1.6    # from TastyPie
-pytz==2022.2.1   # Pinned as changes need to be vetted for their effect on Meeting fields
-requests>=2.27.1
-requests-mock>=1.9.3
+pymemcache>=4.0.0  # for django.core.cache.backends.memcached.PyMemcacheCache
+python-mimeparse>=2.0.0  # from TastyPie
+pytz==2025.2  # Pinned as changes need to be vetted for their effect on Meeting fields
+types-pytz==2025.2.0.20251108  # match pytz version
+typesense>=2.0.0
+requests>=2.32.4
+types-requests>=2.32.4
+requests-mock>=1.12.1
 rfc2html>=2.0.3
-scout-apm>=2.24.2
-selenium>=3.141.0,<4.0
-tblib>=1.7.0    # So that the django test runner provides tracebacks
-tlds>=2022042700    # Used to teach bleach about which TLDs currently exist
-tqdm>=4.64.0
-Unidecode>=1.3.4
-weasyprint>=52.5,<53    # Datatracker tests past on 54, but xml2rfc tests do not.
-xml2rfc>=3.12.4
+scout-apm>=3.4.0
+selenium>=4.34.2
+tblib>=3.1.0  # So that the django test runner provides tracebacks
+tlds>=2022042700  # Used to teach bleach about which TLDs currently exist
+tqdm>=4.67.1
+unidecode>=1.4.0
+urllib3>=2.5.0
+weasyprint>=66.0
+xml2rfc>=3.30.0
 xym>=0.6,<1.0
+zxcvbn>=4.5.0
+types-zxcvbn~=4.5.0.20250223  # match zxcvbn version
diff --git a/test/data/profile-default.jpg b/test/data/profile-default.jpg
deleted file mode 100644
index d6b03e1004..0000000000
Binary files a/test/data/profile-default.jpg and /dev/null differ
diff --git a/test/data/youtube-discovery.json b/test/data/youtube-discovery.json
deleted file mode 100644
index 983e1650c2..0000000000
--- a/test/data/youtube-discovery.json
+++ /dev/null
@@ -1,10879 +0,0 @@
-{
- "kind": "discovery#restDescription",
- "etag": "\"YWOzh2SDasdU84ArJnpYek-OMdg/f81k8b4sv9uLeywfoj2KpL2xcPg\"",
- "discoveryVersion": "v1",
- "id": "youtube:v3",
- "name": "youtube",
- "canonicalName": "YouTube",
- "version": "v3",
- "revision": "20170130",
- "title": "YouTube Data API",
- "description": "Supports core YouTube features, such as uploading videos, creating and managing playlists, searching for content, and much more.",
- "ownerDomain": "google.com",
- "ownerName": "Google",
- "icons": {
-  "x16": "https://www.google.com/images/icons/product/youtube-16.png",
-  "x32": "https://www.google.com/images/icons/product/youtube-32.png"
- },
- "documentationLink": "https://developers.google.com/youtube/v3",
- "protocol": "rest",
- "baseUrl": "https://www.googleapis.com/youtube/v3/",
- "basePath": "/youtube/v3/",
- "rootUrl": "https://www.googleapis.com/",
- "servicePath": "youtube/v3/",
- "batchPath": "batch",
- "parameters": {
-  "alt": {
-   "type": "string",
-   "description": "Data format for the response.",
-   "default": "json",
-   "enum": [
-    "json"
-   ],
-   "enumDescriptions": [
-    "Responses with Content-Type of application/json"
-   ],
-   "location": "query"
-  },
-  "fields": {
-   "type": "string",
-   "description": "Selector specifying which fields to include in a partial response.",
-   "location": "query"
-  },
-  "key": {
-   "type": "string",
-   "description": "API key. Your API key identifies your project and provides you with API access, quota, and reports. Required unless you provide an OAuth 2.0 token.",
-   "location": "query"
-  },
-  "oauth_token": {
-   "type": "string",
-   "description": "OAuth 2.0 token for the current user.",
-   "location": "query"
-  },
-  "prettyPrint": {
-   "type": "boolean",
-   "description": "Returns response with indentations and line breaks.",
-   "default": "true",
-   "location": "query"
-  },
-  "quotaUser": {
-   "type": "string",
-   "description": "Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters. Overrides userIp if both are provided.",
-   "location": "query"
-  },
-  "userIp": {
-   "type": "string",
-   "description": "IP address of the site where the request originates. Use this if you want to enforce per-user limits.",
-   "location": "query"
-  }
- },
- "auth": {
-  "oauth2": {
-   "scopes": {
-    "https://www.googleapis.com/auth/youtube": {
-     "description": "Manage your YouTube account"
-    },
-    "https://www.googleapis.com/auth/youtube.force-ssl": {
-     "description": "Manage your YouTube account"
-    },
-    "https://www.googleapis.com/auth/youtube.readonly": {
-     "description": "View your YouTube account"
-    },
-    "https://www.googleapis.com/auth/youtube.upload": {
-     "description": "Manage your YouTube videos"
-    },
-    "https://www.googleapis.com/auth/youtubepartner": {
-     "description": "View and manage your assets and associated content on YouTube"
-    },
-    "https://www.googleapis.com/auth/youtubepartner-channel-audit": {
-     "description": "View private information of your YouTube channel relevant during the audit process with a YouTube partner"
-    }
-   }
-  }
- },
- "schemas": {
-  "AccessPolicy": {
-   "id": "AccessPolicy",
-   "type": "object",
-   "description": "Rights management policy for YouTube resources.",
-   "properties": {
-    "allowed": {
-     "type": "boolean",
-     "description": "The value of allowed indicates whether the access to the policy is allowed or denied by default."
-    },
-    "exception": {
-     "type": "array",
-     "description": "A list of region codes that identify countries where the default policy do not apply.",
-     "items": {
-      "type": "string"
-     }
-    }
-   }
-  },
-  "Activity": {
-   "id": "Activity",
-   "type": "object",
-   "description": "An activity resource contains information about an action that a particular channel, or user, has taken on YouTube.The actions reported in activity feeds include rating a video, sharing a video, marking a video as a favorite, commenting on a video, uploading a video, and so forth. Each activity resource identifies the type of action, the channel associated with the action, and the resource(s) associated with the action, such as the video that was rated or uploaded.",
-   "properties": {
-    "contentDetails": {
-     "$ref": "ActivityContentDetails",
-     "description": "The contentDetails object contains information about the content associated with the activity. For example, if the snippet.type value is videoRated, then the contentDetails object's content identifies the rated video."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the activity."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#activity\".",
-     "default": "youtube#activity"
-    },
-    "snippet": {
-     "$ref": "ActivitySnippet",
-     "description": "The snippet object contains basic details about the activity, including the activity's type and group ID."
-    }
-   }
-  },
-  "ActivityContentDetails": {
-   "id": "ActivityContentDetails",
-   "type": "object",
-   "description": "Details about the content of an activity: the video that was shared, the channel that was subscribed to, etc.",
-   "properties": {
-    "bulletin": {
-     "$ref": "ActivityContentDetailsBulletin",
-     "description": "The bulletin object contains details about a channel bulletin post. This object is only present if the snippet.type is bulletin."
-    },
-    "channelItem": {
-     "$ref": "ActivityContentDetailsChannelItem",
-     "description": "The channelItem object contains details about a resource which was added to a channel. This property is only present if the snippet.type is channelItem."
-    },
-    "comment": {
-     "$ref": "ActivityContentDetailsComment",
-     "description": "The comment object contains information about a resource that received a comment. This property is only present if the snippet.type is comment."
-    },
-    "favorite": {
-     "$ref": "ActivityContentDetailsFavorite",
-     "description": "The favorite object contains information about a video that was marked as a favorite video. This property is only present if the snippet.type is favorite."
-    },
-    "like": {
-     "$ref": "ActivityContentDetailsLike",
-     "description": "The like object contains information about a resource that received a positive (like) rating. This property is only present if the snippet.type is like."
-    },
-    "playlistItem": {
-     "$ref": "ActivityContentDetailsPlaylistItem",
-     "description": "The playlistItem object contains information about a new playlist item. This property is only present if the snippet.type is playlistItem."
-    },
-    "promotedItem": {
-     "$ref": "ActivityContentDetailsPromotedItem",
-     "description": "The promotedItem object contains details about a resource which is being promoted. This property is only present if the snippet.type is promotedItem."
-    },
-    "recommendation": {
-     "$ref": "ActivityContentDetailsRecommendation",
-     "description": "The recommendation object contains information about a recommended resource. This property is only present if the snippet.type is recommendation."
-    },
-    "social": {
-     "$ref": "ActivityContentDetailsSocial",
-     "description": "The social object contains details about a social network post. This property is only present if the snippet.type is social."
-    },
-    "subscription": {
-     "$ref": "ActivityContentDetailsSubscription",
-     "description": "The subscription object contains information about a channel that a user subscribed to. This property is only present if the snippet.type is subscription."
-    },
-    "upload": {
-     "$ref": "ActivityContentDetailsUpload",
-     "description": "The upload object contains information about the uploaded video. This property is only present if the snippet.type is upload."
-    }
-   }
-  },
-  "ActivityContentDetailsBulletin": {
-   "id": "ActivityContentDetailsBulletin",
-   "type": "object",
-   "description": "Details about a channel bulletin post.",
-   "properties": {
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object contains information that identifies the resource associated with a bulletin post."
-    }
-   }
-  },
-  "ActivityContentDetailsChannelItem": {
-   "id": "ActivityContentDetailsChannelItem",
-   "type": "object",
-   "description": "Details about a resource which was added to a channel.",
-   "properties": {
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object contains information that identifies the resource that was added to the channel."
-    }
-   }
-  },
-  "ActivityContentDetailsComment": {
-   "id": "ActivityContentDetailsComment",
-   "type": "object",
-   "description": "Information about a resource that received a comment.",
-   "properties": {
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object contains information that identifies the resource associated with the comment."
-    }
-   }
-  },
-  "ActivityContentDetailsFavorite": {
-   "id": "ActivityContentDetailsFavorite",
-   "type": "object",
-   "description": "Information about a video that was marked as a favorite video.",
-   "properties": {
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object contains information that identifies the resource that was marked as a favorite."
-    }
-   }
-  },
-  "ActivityContentDetailsLike": {
-   "id": "ActivityContentDetailsLike",
-   "type": "object",
-   "description": "Information about a resource that received a positive (like) rating.",
-   "properties": {
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object contains information that identifies the rated resource."
-    }
-   }
-  },
-  "ActivityContentDetailsPlaylistItem": {
-   "id": "ActivityContentDetailsPlaylistItem",
-   "type": "object",
-   "description": "Information about a new playlist item.",
-   "properties": {
-    "playlistId": {
-     "type": "string",
-     "description": "The value that YouTube uses to uniquely identify the playlist."
-    },
-    "playlistItemId": {
-     "type": "string",
-     "description": "ID of the item within the playlist."
-    },
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object contains information about the resource that was added to the playlist."
-    }
-   }
-  },
-  "ActivityContentDetailsPromotedItem": {
-   "id": "ActivityContentDetailsPromotedItem",
-   "type": "object",
-   "description": "Details about a resource which is being promoted.",
-   "properties": {
-    "adTag": {
-     "type": "string",
-     "description": "The URL the client should fetch to request a promoted item."
-    },
-    "clickTrackingUrl": {
-     "type": "string",
-     "description": "The URL the client should ping to indicate that the user clicked through on this promoted item."
-    },
-    "creativeViewUrl": {
-     "type": "string",
-     "description": "The URL the client should ping to indicate that the user was shown this promoted item."
-    },
-    "ctaType": {
-     "type": "string",
-     "description": "The type of call-to-action, a message to the user indicating action that can be taken.",
-     "enum": [
-      "unspecified",
-      "visitAdvertiserSite"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "customCtaButtonText": {
-     "type": "string",
-     "description": "The custom call-to-action button text. If specified, it will override the default button text for the cta_type."
-    },
-    "descriptionText": {
-     "type": "string",
-     "description": "The text description to accompany the promoted item."
-    },
-    "destinationUrl": {
-     "type": "string",
-     "description": "The URL the client should direct the user to, if the user chooses to visit the advertiser's website."
-    },
-    "forecastingUrl": {
-     "type": "array",
-     "description": "The list of forecasting URLs. The client should ping all of these URLs when a promoted item is not available, to indicate that a promoted item could have been shown.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "impressionUrl": {
-     "type": "array",
-     "description": "The list of impression URLs. The client should ping all of these URLs to indicate that the user was shown this promoted item.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "videoId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the promoted video."
-    }
-   }
-  },
-  "ActivityContentDetailsRecommendation": {
-   "id": "ActivityContentDetailsRecommendation",
-   "type": "object",
-   "description": "Information that identifies the recommended resource.",
-   "properties": {
-    "reason": {
-     "type": "string",
-     "description": "The reason that the resource is recommended to the user.",
-     "enum": [
-      "unspecified",
-      "videoFavorited",
-      "videoLiked",
-      "videoWatched"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object contains information that identifies the recommended resource."
-    },
-    "seedResourceId": {
-     "$ref": "ResourceId",
-     "description": "The seedResourceId object contains information about the resource that caused the recommendation."
-    }
-   }
-  },
-  "ActivityContentDetailsSocial": {
-   "id": "ActivityContentDetailsSocial",
-   "type": "object",
-   "description": "Details about a social network post.",
-   "properties": {
-    "author": {
-     "type": "string",
-     "description": "The author of the social network post."
-    },
-    "imageUrl": {
-     "type": "string",
-     "description": "An image of the post's author."
-    },
-    "referenceUrl": {
-     "type": "string",
-     "description": "The URL of the social network post."
-    },
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object encapsulates information that identifies the resource associated with a social network post."
-    },
-    "type": {
-     "type": "string",
-     "description": "The name of the social network.",
-     "enum": [
-      "facebook",
-      "googlePlus",
-      "twitter",
-      "unspecified"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "ActivityContentDetailsSubscription": {
-   "id": "ActivityContentDetailsSubscription",
-   "type": "object",
-   "description": "Information about a channel that a user subscribed to.",
-   "properties": {
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The resourceId object contains information that identifies the resource that the user subscribed to."
-    }
-   }
-  },
-  "ActivityContentDetailsUpload": {
-   "id": "ActivityContentDetailsUpload",
-   "type": "object",
-   "description": "Information about the uploaded video.",
-   "properties": {
-    "videoId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the uploaded video."
-    }
-   }
-  },
-  "ActivityListResponse": {
-   "id": "ActivityListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of activities, or events, that match the request criteria.",
-     "items": {
-      "$ref": "Activity"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#activityListResponse\".",
-     "default": "youtube#activityListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "ActivitySnippet": {
-   "id": "ActivitySnippet",
-   "type": "object",
-   "description": "Basic details about an activity, including title, description, thumbnails, activity type and group.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the channel associated with the activity."
-    },
-    "channelTitle": {
-     "type": "string",
-     "description": "Channel title for the channel responsible for this activity"
-    },
-    "description": {
-     "type": "string",
-     "description": "The description of the resource primarily associated with the activity.",
-     "annotations": {
-      "required": [
-       "youtube.activities.insert"
-      ]
-     }
-    },
-    "groupId": {
-     "type": "string",
-     "description": "The group ID associated with the activity. A group ID identifies user events that are associated with the same user and resource. For example, if a user rates a video and marks the same video as a favorite, the entries for those events would have the same group ID in the user's activity feed. In your user interface, you can avoid repetition by grouping events with the same groupId value."
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time that the video was uploaded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "A map of thumbnail images associated with the resource that is primarily associated with the activity. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail."
-    },
-    "title": {
-     "type": "string",
-     "description": "The title of the resource primarily associated with the activity."
-    },
-    "type": {
-     "type": "string",
-     "description": "The type of activity that the resource describes.",
-     "enum": [
-      "bulletin",
-      "channelItem",
-      "comment",
-      "favorite",
-      "like",
-      "playlistItem",
-      "promotedItem",
-      "recommendation",
-      "social",
-      "subscription",
-      "upload"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "Caption": {
-   "id": "Caption",
-   "type": "object",
-   "description": "A caption resource represents a YouTube caption track. A caption track is associated with exactly one YouTube video.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the caption track.",
-     "annotations": {
-      "required": [
-       "youtube.captions.update"
-      ]
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#caption\".",
-     "default": "youtube#caption"
-    },
-    "snippet": {
-     "$ref": "CaptionSnippet",
-     "description": "The snippet object contains basic details about the caption."
-    }
-   }
-  },
-  "CaptionListResponse": {
-   "id": "CaptionListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of captions that match the request criteria.",
-     "items": {
-      "$ref": "Caption"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#captionListResponse\".",
-     "default": "youtube#captionListResponse"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "CaptionSnippet": {
-   "id": "CaptionSnippet",
-   "type": "object",
-   "description": "Basic details about a caption track, such as its language and name.",
-   "properties": {
-    "audioTrackType": {
-     "type": "string",
-     "description": "The type of audio track associated with the caption track.",
-     "enum": [
-      "commentary",
-      "descriptive",
-      "primary",
-      "unknown"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "failureReason": {
-     "type": "string",
-     "description": "The reason that YouTube failed to process the caption track. This property is only present if the state property's value is failed.",
-     "enum": [
-      "processingFailed",
-      "unknownFormat",
-      "unsupportedFormat"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "isAutoSynced": {
-     "type": "boolean",
-     "description": "Indicates whether YouTube synchronized the caption track to the audio track in the video. The value will be true if a sync was explicitly requested when the caption track was uploaded. For example, when calling the captions.insert or captions.update methods, you can set the sync parameter to true to instruct YouTube to sync the uploaded track to the video. If the value is false, YouTube uses the time codes in the uploaded caption track to determine when to display captions."
-    },
-    "isCC": {
-     "type": "boolean",
-     "description": "Indicates whether the track contains closed captions for the deaf and hard of hearing. The default value is false."
-    },
-    "isDraft": {
-     "type": "boolean",
-     "description": "Indicates whether the caption track is a draft. If the value is true, then the track is not publicly visible. The default value is false."
-    },
-    "isEasyReader": {
-     "type": "boolean",
-     "description": "Indicates whether caption track is formatted for \"easy reader,\" meaning it is at a third-grade level for language learners. The default value is false."
-    },
-    "isLarge": {
-     "type": "boolean",
-     "description": "Indicates whether the caption track uses large text for the vision-impaired. The default value is false."
-    },
-    "language": {
-     "type": "string",
-     "description": "The language of the caption track. The property value is a BCP-47 language tag.",
-     "annotations": {
-      "required": [
-       "youtube.captions.insert"
-      ]
-     }
-    },
-    "lastUpdated": {
-     "type": "string",
-     "description": "The date and time when the caption track was last updated. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "name": {
-     "type": "string",
-     "description": "The name of the caption track. The name is intended to be visible to the user as an option during playback.",
-     "annotations": {
-      "required": [
-       "youtube.captions.insert"
-      ]
-     }
-    },
-    "status": {
-     "type": "string",
-     "description": "The caption track's status.",
-     "enum": [
-      "failed",
-      "serving",
-      "syncing"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "trackKind": {
-     "type": "string",
-     "description": "The caption track's type.",
-     "enum": [
-      "ASR",
-      "forced",
-      "standard"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "videoId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the video associated with the caption track.",
-     "annotations": {
-      "required": [
-       "youtube.captions.insert"
-      ]
-     }
-    }
-   }
-  },
-  "CdnSettings": {
-   "id": "CdnSettings",
-   "type": "object",
-   "description": "Brief description of the live stream cdn settings.",
-   "properties": {
-    "format": {
-     "type": "string",
-     "description": "The format of the video stream that you are sending to Youtube.",
-     "annotations": {
-      "required": [
-       "youtube.liveStreams.insert",
-       "youtube.liveStreams.update"
-      ]
-     }
-    },
-    "frameRate": {
-     "type": "string",
-     "description": "The frame rate of the inbound video data.",
-     "enum": [
-      "30fps",
-      "60fps"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "ingestionInfo": {
-     "$ref": "IngestionInfo",
-     "description": "The ingestionInfo object contains information that YouTube provides that you need to transmit your RTMP or HTTP stream to YouTube."
-    },
-    "ingestionType": {
-     "type": "string",
-     "description": "The method or protocol used to transmit the video stream.",
-     "enum": [
-      "dash",
-      "rtmp"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ],
-     "annotations": {
-      "required": [
-       "youtube.liveStreams.insert",
-       "youtube.liveStreams.update"
-      ]
-     }
-    },
-    "resolution": {
-     "type": "string",
-     "description": "The resolution of the inbound video data.",
-     "enum": [
-      "1080p",
-      "1440p",
-      "2160p",
-      "240p",
-      "360p",
-      "480p",
-      "720p"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "Channel": {
-   "id": "Channel",
-   "type": "object",
-   "description": "A channel resource contains information about a YouTube channel.",
-   "properties": {
-    "auditDetails": {
-     "$ref": "ChannelAuditDetails",
-     "description": "The auditionDetails object encapsulates channel data that is relevant for YouTube Partners during the audition process."
-    },
-    "brandingSettings": {
-     "$ref": "ChannelBrandingSettings",
-     "description": "The brandingSettings object encapsulates information about the branding of the channel."
-    },
-    "contentDetails": {
-     "$ref": "ChannelContentDetails",
-     "description": "The contentDetails object encapsulates information about the channel's content."
-    },
-    "contentOwnerDetails": {
-     "$ref": "ChannelContentOwnerDetails",
-     "description": "The contentOwnerDetails object encapsulates channel data that is relevant for YouTube Partners linked with the channel."
-    },
-    "conversionPings": {
-     "$ref": "ChannelConversionPings",
-     "description": "The conversionPings object encapsulates information about conversion pings that need to be respected by the channel."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the channel."
-    },
-    "invideoPromotion": {
-     "$ref": "InvideoPromotion",
-     "description": "The invideoPromotion object encapsulates information about promotion campaign associated with the channel."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channel\".",
-     "default": "youtube#channel"
-    },
-    "localizations": {
-     "type": "object",
-     "description": "Localizations for different languages",
-     "additionalProperties": {
-      "$ref": "ChannelLocalization",
-      "description": "The language tag, using string since map_key require simple types."
-     }
-    },
-    "snippet": {
-     "$ref": "ChannelSnippet",
-     "description": "The snippet object contains basic details about the channel, such as its title, description, and thumbnail images."
-    },
-    "statistics": {
-     "$ref": "ChannelStatistics",
-     "description": "The statistics object encapsulates statistics for the channel."
-    },
-    "status": {
-     "$ref": "ChannelStatus",
-     "description": "The status object encapsulates information about the privacy status of the channel."
-    },
-    "topicDetails": {
-     "$ref": "ChannelTopicDetails",
-     "description": "The topicDetails object encapsulates information about Freebase topics associated with the channel."
-    }
-   }
-  },
-  "ChannelAuditDetails": {
-   "id": "ChannelAuditDetails",
-   "type": "object",
-   "description": "The auditDetails object encapsulates channel data that is relevant for YouTube Partners during the audit process.",
-   "properties": {
-    "communityGuidelinesGoodStanding": {
-     "type": "boolean",
-     "description": "Whether or not the channel respects the community guidelines."
-    },
-    "contentIdClaimsGoodStanding": {
-     "type": "boolean",
-     "description": "Whether or not the channel has any unresolved claims."
-    },
-    "copyrightStrikesGoodStanding": {
-     "type": "boolean",
-     "description": "Whether or not the channel has any copyright strikes."
-    },
-    "overallGoodStanding": {
-     "type": "boolean",
-     "description": "Describes the general state of the channel. This field will always show if there are any issues whatsoever with the channel. Currently this field represents the result of the logical and operation over the community guidelines good standing, the copyright strikes good standing and the content ID claims good standing, but this may change in the future."
-    }
-   }
-  },
-  "ChannelBannerResource": {
-   "id": "ChannelBannerResource",
-   "type": "object",
-   "description": "A channel banner returned as the response to a channel_banner.insert call.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channelBannerResource\".",
-     "default": "youtube#channelBannerResource"
-    },
-    "url": {
-     "type": "string",
-     "description": "The URL of this banner image."
-    }
-   }
-  },
-  "ChannelBrandingSettings": {
-   "id": "ChannelBrandingSettings",
-   "type": "object",
-   "description": "Branding properties of a YouTube channel.",
-   "properties": {
-    "channel": {
-     "$ref": "ChannelSettings",
-     "description": "Branding properties for the channel view."
-    },
-    "hints": {
-     "type": "array",
-     "description": "Additional experimental branding properties.",
-     "items": {
-      "$ref": "PropertyValue"
-     }
-    },
-    "image": {
-     "$ref": "ImageSettings",
-     "description": "Branding properties for branding images."
-    },
-    "watch": {
-     "$ref": "WatchSettings",
-     "description": "Branding properties for the watch page."
-    }
-   }
-  },
-  "ChannelContentDetails": {
-   "id": "ChannelContentDetails",
-   "type": "object",
-   "description": "Details about the content of a channel.",
-   "properties": {
-    "relatedPlaylists": {
-     "type": "object",
-     "properties": {
-      "favorites": {
-       "type": "string",
-       "description": "The ID of the playlist that contains the channel\"s favorite videos. Use the  playlistItems.insert and  playlistItems.delete to add or remove items from that list."
-      },
-      "likes": {
-       "type": "string",
-       "description": "The ID of the playlist that contains the channel\"s liked videos. Use the   playlistItems.insert and  playlistItems.delete to add or remove items from that list."
-      },
-      "uploads": {
-       "type": "string",
-       "description": "The ID of the playlist that contains the channel\"s uploaded videos. Use the  videos.insert method to upload new videos and the videos.delete method to delete previously uploaded videos."
-      },
-      "watchHistory": {
-       "type": "string",
-       "description": "The ID of the playlist that contains the channel\"s watch history. Use the  playlistItems.insert and  playlistItems.delete to add or remove items from that list."
-      },
-      "watchLater": {
-       "type": "string",
-       "description": "The ID of the playlist that contains the channel\"s watch later playlist. Use the playlistItems.insert and  playlistItems.delete to add or remove items from that list."
-      }
-     }
-    }
-   }
-  },
-  "ChannelContentOwnerDetails": {
-   "id": "ChannelContentOwnerDetails",
-   "type": "object",
-   "description": "The contentOwnerDetails object encapsulates channel data that is relevant for YouTube Partners linked with the channel.",
-   "properties": {
-    "contentOwner": {
-     "type": "string",
-     "description": "The ID of the content owner linked to the channel."
-    },
-    "timeLinked": {
-     "type": "string",
-     "description": "The date and time of when the channel was linked to the content owner. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    }
-   }
-  },
-  "ChannelConversionPing": {
-   "id": "ChannelConversionPing",
-   "type": "object",
-   "description": "Pings that the app shall fire (authenticated by biscotti cookie). Each ping has a context, in which the app must fire the ping, and a url identifying the ping.",
-   "properties": {
-    "context": {
-     "type": "string",
-     "description": "Defines the context of the ping.",
-     "enum": [
-      "cview",
-      "subscribe",
-      "unsubscribe"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "conversionUrl": {
-     "type": "string",
-     "description": "The url (without the schema) that the player shall send the ping to. It's at caller's descretion to decide which schema to use (http vs https) Example of a returned url: //googleads.g.doubleclick.net/pagead/ viewthroughconversion/962985656/?data=path%3DtHe_path%3Btype%3D cview%3Butuid%3DGISQtTNGYqaYl4sKxoVvKA&labe=default The caller must append biscotti authentication (ms param in case of mobile, for example) to this ping."
-    }
-   }
-  },
-  "ChannelConversionPings": {
-   "id": "ChannelConversionPings",
-   "type": "object",
-   "description": "The conversionPings object encapsulates information about conversion pings that need to be respected by the channel.",
-   "properties": {
-    "pings": {
-     "type": "array",
-     "description": "Pings that the app shall fire (authenticated by biscotti cookie). Each ping has a context, in which the app must fire the ping, and a url identifying the ping.",
-     "items": {
-      "$ref": "ChannelConversionPing"
-     }
-    }
-   }
-  },
-  "ChannelListResponse": {
-   "id": "ChannelListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of channels that match the request criteria.",
-     "items": {
-      "$ref": "Channel"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channelListResponse\".",
-     "default": "youtube#channelListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "ChannelLocalization": {
-   "id": "ChannelLocalization",
-   "type": "object",
-   "description": "Channel localization setting",
-   "properties": {
-    "description": {
-     "type": "string",
-     "description": "The localized strings for channel's description."
-    },
-    "title": {
-     "type": "string",
-     "description": "The localized strings for channel's title."
-    }
-   }
-  },
-  "ChannelProfileDetails": {
-   "id": "ChannelProfileDetails",
-   "type": "object",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The YouTube channel ID."
-    },
-    "channelUrl": {
-     "type": "string",
-     "description": "The channel's URL."
-    },
-    "displayName": {
-     "type": "string",
-     "description": "The channel's display name."
-    },
-    "profileImageUrl": {
-     "type": "string",
-     "description": "The channels's avatar URL."
-    }
-   }
-  },
-  "ChannelSection": {
-   "id": "ChannelSection",
-   "type": "object",
-   "properties": {
-    "contentDetails": {
-     "$ref": "ChannelSectionContentDetails",
-     "description": "The contentDetails object contains details about the channel section content, such as a list of playlists or channels featured in the section."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the channel section."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channelSection\".",
-     "default": "youtube#channelSection"
-    },
-    "localizations": {
-     "type": "object",
-     "description": "Localizations for different languages",
-     "additionalProperties": {
-      "$ref": "ChannelSectionLocalization",
-      "description": "The language tag, using string since map_key require simple types."
-     }
-    },
-    "snippet": {
-     "$ref": "ChannelSectionSnippet",
-     "description": "The snippet object contains basic details about the channel section, such as its type, style and title."
-    },
-    "targeting": {
-     "$ref": "ChannelSectionTargeting",
-     "description": "The targeting object contains basic targeting settings about the channel section."
-    }
-   }
-  },
-  "ChannelSectionContentDetails": {
-   "id": "ChannelSectionContentDetails",
-   "type": "object",
-   "description": "Details about a channelsection, including playlists and channels.",
-   "properties": {
-    "channels": {
-     "type": "array",
-     "description": "The channel ids for type multiple_channels.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "playlists": {
-     "type": "array",
-     "description": "The playlist ids for type single_playlist and multiple_playlists. For singlePlaylist, only one playlistId is allowed.",
-     "items": {
-      "type": "string"
-     }
-    }
-   }
-  },
-  "ChannelSectionListResponse": {
-   "id": "ChannelSectionListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of ChannelSections that match the request criteria.",
-     "items": {
-      "$ref": "ChannelSection"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#channelSectionListResponse\".",
-     "default": "youtube#channelSectionListResponse"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "ChannelSectionLocalization": {
-   "id": "ChannelSectionLocalization",
-   "type": "object",
-   "description": "ChannelSection localization setting",
-   "properties": {
-    "title": {
-     "type": "string",
-     "description": "The localized strings for channel section's title."
-    }
-   }
-  },
-  "ChannelSectionSnippet": {
-   "id": "ChannelSectionSnippet",
-   "type": "object",
-   "description": "Basic details about a channel section, including title, style and position.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the channel that published the channel section."
-    },
-    "defaultLanguage": {
-     "type": "string",
-     "description": "The language of the channel section's default title and description."
-    },
-    "localized": {
-     "$ref": "ChannelSectionLocalization",
-     "description": "Localized title, read-only."
-    },
-    "position": {
-     "type": "integer",
-     "description": "The position of the channel section in the channel.",
-     "format": "uint32"
-    },
-    "style": {
-     "type": "string",
-     "description": "The style of the channel section.",
-     "enum": [
-      "channelsectionStyleUndefined",
-      "horizontalRow",
-      "verticalList"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "title": {
-     "type": "string",
-     "description": "The channel section's title for multiple_playlists and multiple_channels."
-    },
-    "type": {
-     "type": "string",
-     "description": "The type of the channel section.",
-     "enum": [
-      "allPlaylists",
-      "channelsectionTypeUndefined",
-      "completedEvents",
-      "likedPlaylists",
-      "likes",
-      "liveEvents",
-      "multipleChannels",
-      "multiplePlaylists",
-      "popularUploads",
-      "postedPlaylists",
-      "postedVideos",
-      "recentActivity",
-      "recentPosts",
-      "recentUploads",
-      "singlePlaylist",
-      "subscriptions",
-      "upcomingEvents"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "ChannelSectionTargeting": {
-   "id": "ChannelSectionTargeting",
-   "type": "object",
-   "description": "ChannelSection targeting setting.",
-   "properties": {
-    "countries": {
-     "type": "array",
-     "description": "The country the channel section is targeting.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "languages": {
-     "type": "array",
-     "description": "The language the channel section is targeting.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "regions": {
-     "type": "array",
-     "description": "The region the channel section is targeting.",
-     "items": {
-      "type": "string"
-     }
-    }
-   }
-  },
-  "ChannelSettings": {
-   "id": "ChannelSettings",
-   "type": "object",
-   "description": "Branding properties for the channel view.",
-   "properties": {
-    "country": {
-     "type": "string",
-     "description": "The country of the channel."
-    },
-    "defaultLanguage": {
-     "type": "string"
-    },
-    "defaultTab": {
-     "type": "string",
-     "description": "Which content tab users should see when viewing the channel."
-    },
-    "description": {
-     "type": "string",
-     "description": "Specifies the channel description."
-    },
-    "featuredChannelsTitle": {
-     "type": "string",
-     "description": "Title for the featured channels tab."
-    },
-    "featuredChannelsUrls": {
-     "type": "array",
-     "description": "The list of featured channels.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "keywords": {
-     "type": "string",
-     "description": "Lists keywords associated with the channel, comma-separated."
-    },
-    "moderateComments": {
-     "type": "boolean",
-     "description": "Whether user-submitted comments left on the channel page need to be approved by the channel owner to be publicly visible."
-    },
-    "profileColor": {
-     "type": "string",
-     "description": "A prominent color that can be rendered on this channel page."
-    },
-    "showBrowseView": {
-     "type": "boolean",
-     "description": "Whether the tab to browse the videos should be displayed."
-    },
-    "showRelatedChannels": {
-     "type": "boolean",
-     "description": "Whether related channels should be proposed."
-    },
-    "title": {
-     "type": "string",
-     "description": "Specifies the channel title."
-    },
-    "trackingAnalyticsAccountId": {
-     "type": "string",
-     "description": "The ID for a Google Analytics account to track and measure traffic to the channels."
-    },
-    "unsubscribedTrailer": {
-     "type": "string",
-     "description": "The trailer of the channel, for users that are not subscribers."
-    }
-   }
-  },
-  "ChannelSnippet": {
-   "id": "ChannelSnippet",
-   "type": "object",
-   "description": "Basic details about a channel, including title, description and thumbnails. Next available id: 15.",
-   "properties": {
-    "country": {
-     "type": "string",
-     "description": "The country of the channel."
-    },
-    "customUrl": {
-     "type": "string",
-     "description": "The custom url of the channel."
-    },
-    "defaultLanguage": {
-     "type": "string",
-     "description": "The language of the channel's default title and description."
-    },
-    "description": {
-     "type": "string",
-     "description": "The description of the channel."
-    },
-    "localized": {
-     "$ref": "ChannelLocalization",
-     "description": "Localized title and description, read-only."
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time that the channel was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "A map of thumbnail images associated with the channel. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail."
-    },
-    "title": {
-     "type": "string",
-     "description": "The channel's title."
-    }
-   }
-  },
-  "ChannelStatistics": {
-   "id": "ChannelStatistics",
-   "type": "object",
-   "description": "Statistics about a channel: number of subscribers, number of videos in the channel, etc.",
-   "properties": {
-    "commentCount": {
-     "type": "string",
-     "description": "The number of comments for the channel.",
-     "format": "uint64"
-    },
-    "hiddenSubscriberCount": {
-     "type": "boolean",
-     "description": "Whether or not the number of subscribers is shown for this user."
-    },
-    "subscriberCount": {
-     "type": "string",
-     "description": "The number of subscribers that the channel has.",
-     "format": "uint64"
-    },
-    "videoCount": {
-     "type": "string",
-     "description": "The number of videos uploaded to the channel.",
-     "format": "uint64"
-    },
-    "viewCount": {
-     "type": "string",
-     "description": "The number of times the channel has been viewed.",
-     "format": "uint64"
-    }
-   }
-  },
-  "ChannelStatus": {
-   "id": "ChannelStatus",
-   "type": "object",
-   "description": "JSON template for the status part of a channel.",
-   "properties": {
-    "isLinked": {
-     "type": "boolean",
-     "description": "If true, then the user is linked to either a YouTube username or G+ account. Otherwise, the user doesn't have a public YouTube identity."
-    },
-    "longUploadsStatus": {
-     "type": "string",
-     "description": "The long uploads status of this channel. See",
-     "enum": [
-      "allowed",
-      "disallowed",
-      "eligible",
-      "longUploadsUnspecified"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "privacyStatus": {
-     "type": "string",
-     "description": "Privacy status of the channel.",
-     "enum": [
-      "private",
-      "public",
-      "unlisted"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "ChannelTopicDetails": {
-   "id": "ChannelTopicDetails",
-   "type": "object",
-   "description": "Freebase topic information related to the channel.",
-   "properties": {
-    "topicCategories": {
-     "type": "array",
-     "description": "A list of Wikipedia URLs that describe the channel's content.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "topicIds": {
-     "type": "array",
-     "description": "A list of Freebase topic IDs associated with the channel. You can retrieve information about each topic using the Freebase Topic API.",
-     "items": {
-      "type": "string"
-     }
-    }
-   }
-  },
-  "Comment": {
-   "id": "Comment",
-   "type": "object",
-   "description": "A comment represents a single YouTube comment.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the comment."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#comment\".",
-     "default": "youtube#comment"
-    },
-    "snippet": {
-     "$ref": "CommentSnippet",
-     "description": "The snippet object contains basic details about the comment."
-    }
-   }
-  },
-  "CommentListResponse": {
-   "id": "CommentListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of comments that match the request criteria.",
-     "items": {
-      "$ref": "Comment"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#commentListResponse\".",
-     "default": "youtube#commentListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "CommentSnippet": {
-   "id": "CommentSnippet",
-   "type": "object",
-   "description": "Basic details about a comment, such as its author and text.",
-   "properties": {
-    "authorChannelId": {
-     "type": "any",
-     "description": "The id of the author's YouTube channel, if any."
-    },
-    "authorChannelUrl": {
-     "type": "string",
-     "description": "Link to the author's YouTube channel, if any."
-    },
-    "authorDisplayName": {
-     "type": "string",
-     "description": "The name of the user who posted the comment."
-    },
-    "authorProfileImageUrl": {
-     "type": "string",
-     "description": "The URL for the avatar of the user who posted the comment."
-    },
-    "canRate": {
-     "type": "boolean",
-     "description": "Whether the current viewer can rate this comment."
-    },
-    "channelId": {
-     "type": "string",
-     "description": "The id of the corresponding YouTube channel. In case of a channel comment this is the channel the comment refers to. In case of a video comment it's the video's channel."
-    },
-    "likeCount": {
-     "type": "integer",
-     "description": "The total number of likes this comment has received.",
-     "format": "uint32"
-    },
-    "moderationStatus": {
-     "type": "string",
-     "description": "The comment's moderation status. Will not be set if the comments were requested through the id filter.",
-     "enum": [
-      "heldForReview",
-      "likelySpam",
-      "published",
-      "rejected"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "parentId": {
-     "type": "string",
-     "description": "The unique id of the parent comment, only set for replies."
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time when the comment was orignally published. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "textDisplay": {
-     "type": "string",
-     "description": "The comment's text. The format is either plain text or HTML dependent on what has been requested. Even the plain text representation may differ from the text originally posted in that it may replace video links with video titles etc."
-    },
-    "textOriginal": {
-     "type": "string",
-     "description": "The comment's original raw text as initially posted or last updated. The original text will only be returned if it is accessible to the viewer, which is only guaranteed if the viewer is the comment's author."
-    },
-    "updatedAt": {
-     "type": "string",
-     "description": "The date and time when was last updated . The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "videoId": {
-     "type": "string",
-     "description": "The ID of the video the comment refers to, if any."
-    },
-    "viewerRating": {
-     "type": "string",
-     "description": "The rating the viewer has given to this comment. For the time being this will never return RATE_TYPE_DISLIKE and instead return RATE_TYPE_NONE. This may change in the future.",
-     "enum": [
-      "dislike",
-      "like",
-      "none",
-      "unspecified"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "CommentThread": {
-   "id": "CommentThread",
-   "type": "object",
-   "description": "A comment thread represents information that applies to a top level comment and all its replies. It can also include the top level comment itself and some of the replies.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the comment thread."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#commentThread\".",
-     "default": "youtube#commentThread"
-    },
-    "replies": {
-     "$ref": "CommentThreadReplies",
-     "description": "The replies object contains a limited number of replies (if any) to the top level comment found in the snippet."
-    },
-    "snippet": {
-     "$ref": "CommentThreadSnippet",
-     "description": "The snippet object contains basic details about the comment thread and also the top level comment."
-    }
-   }
-  },
-  "CommentThreadListResponse": {
-   "id": "CommentThreadListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of comment threads that match the request criteria.",
-     "items": {
-      "$ref": "CommentThread"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#commentThreadListResponse\".",
-     "default": "youtube#commentThreadListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "CommentThreadReplies": {
-   "id": "CommentThreadReplies",
-   "type": "object",
-   "description": "Comments written in (direct or indirect) reply to the top level comment.",
-   "properties": {
-    "comments": {
-     "type": "array",
-     "description": "A limited number of replies. Unless the number of replies returned equals total_reply_count in the snippet the returned replies are only a subset of the total number of replies.",
-     "items": {
-      "$ref": "Comment"
-     }
-    }
-   }
-  },
-  "CommentThreadSnippet": {
-   "id": "CommentThreadSnippet",
-   "type": "object",
-   "description": "Basic details about a comment thread.",
-   "properties": {
-    "canReply": {
-     "type": "boolean",
-     "description": "Whether the current viewer of the thread can reply to it. This is viewer specific - other viewers may see a different value for this field."
-    },
-    "channelId": {
-     "type": "string",
-     "description": "The YouTube channel the comments in the thread refer to or the channel with the video the comments refer to. If video_id isn't set the comments refer to the channel itself."
-    },
-    "isPublic": {
-     "type": "boolean",
-     "description": "Whether the thread (and therefore all its comments) is visible to all YouTube users."
-    },
-    "topLevelComment": {
-     "$ref": "Comment",
-     "description": "The top level comment of this thread."
-    },
-    "totalReplyCount": {
-     "type": "integer",
-     "description": "The total number of replies (not including the top level comment).",
-     "format": "uint32"
-    },
-    "videoId": {
-     "type": "string",
-     "description": "The ID of the video the comments refer to, if any. No video_id implies a channel discussion comment."
-    }
-   }
-  },
-  "ContentRating": {
-   "id": "ContentRating",
-   "type": "object",
-   "description": "Ratings schemes. The country-specific ratings are mostly for movies and shows. NEXT_ID: 69",
-   "properties": {
-    "acbRating": {
-     "type": "string",
-     "description": "The video's Australian Classification Board (ACB) or Australian Communications and Media Authority (ACMA) rating. ACMA ratings are used to classify children's television programming.",
-     "enum": [
-      "acbC",
-      "acbE",
-      "acbG",
-      "acbM",
-      "acbMa15plus",
-      "acbP",
-      "acbPg",
-      "acbR18plus",
-      "acbUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "agcomRating": {
-     "type": "string",
-     "description": "The video's rating from Italy's Autorità per le Garanzie nelle Comunicazioni (AGCOM).",
-     "enum": [
-      "agcomT",
-      "agcomUnrated",
-      "agcomVm14",
-      "agcomVm18"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "anatelRating": {
-     "type": "string",
-     "description": "The video's Anatel (Asociación Nacional de Televisión) rating for Chilean television.",
-     "enum": [
-      "anatelA",
-      "anatelF",
-      "anatelI",
-      "anatelI10",
-      "anatelI12",
-      "anatelI7",
-      "anatelR",
-      "anatelUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "bbfcRating": {
-     "type": "string",
-     "description": "The video's British Board of Film Classification (BBFC) rating.",
-     "enum": [
-      "bbfc12",
-      "bbfc12a",
-      "bbfc15",
-      "bbfc18",
-      "bbfcPg",
-      "bbfcR18",
-      "bbfcU",
-      "bbfcUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "bfvcRating": {
-     "type": "string",
-     "description": "The video's rating from Thailand's Board of Film and Video Censors.",
-     "enum": [
-      "bfvc13",
-      "bfvc15",
-      "bfvc18",
-      "bfvc20",
-      "bfvcB",
-      "bfvcE",
-      "bfvcG",
-      "bfvcUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "bmukkRating": {
-     "type": "string",
-     "description": "The video's rating from the Austrian Board of Media Classification (Bundesministerium für Unterricht, Kunst und Kultur).",
-     "enum": [
-      "bmukk10",
-      "bmukk12",
-      "bmukk14",
-      "bmukk16",
-      "bmukk6",
-      "bmukk8",
-      "bmukkAa",
-      "bmukkUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "catvRating": {
-     "type": "string",
-     "description": "Rating system for Canadian TV - Canadian TV Classification System The video's rating from the Canadian Radio-Television and Telecommunications Commission (CRTC) for Canadian English-language broadcasts. For more information, see the Canadian Broadcast Standards Council website.",
-     "enum": [
-      "catv14plus",
-      "catv18plus",
-      "catvC",
-      "catvC8",
-      "catvG",
-      "catvPg",
-      "catvUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "catvfrRating": {
-     "type": "string",
-     "description": "The video's rating from the Canadian Radio-Television and Telecommunications Commission (CRTC) for Canadian French-language broadcasts. For more information, see the Canadian Broadcast Standards Council website.",
-     "enum": [
-      "catvfr13plus",
-      "catvfr16plus",
-      "catvfr18plus",
-      "catvfr8plus",
-      "catvfrG",
-      "catvfrUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "cbfcRating": {
-     "type": "string",
-     "description": "The video's Central Board of Film Certification (CBFC - India) rating.",
-     "enum": [
-      "cbfcA",
-      "cbfcS",
-      "cbfcU",
-      "cbfcUA",
-      "cbfcUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "cccRating": {
-     "type": "string",
-     "description": "The video's Consejo de Calificación Cinematográfica (Chile) rating.",
-     "enum": [
-      "ccc14",
-      "ccc18",
-      "ccc18s",
-      "ccc18v",
-      "ccc6",
-      "cccTe",
-      "cccUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "cceRating": {
-     "type": "string",
-     "description": "The video's rating from Portugal's Comissão de Classificação de Espect´culos.",
-     "enum": [
-      "cceM12",
-      "cceM14",
-      "cceM16",
-      "cceM18",
-      "cceM4",
-      "cceM6",
-      "cceUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "chfilmRating": {
-     "type": "string",
-     "description": "The video's rating in Switzerland.",
-     "enum": [
-      "chfilm0",
-      "chfilm12",
-      "chfilm16",
-      "chfilm18",
-      "chfilm6",
-      "chfilmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "chvrsRating": {
-     "type": "string",
-     "description": "The video's Canadian Home Video Rating System (CHVRS) rating.",
-     "enum": [
-      "chvrs14a",
-      "chvrs18a",
-      "chvrsE",
-      "chvrsG",
-      "chvrsPg",
-      "chvrsR",
-      "chvrsUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "cicfRating": {
-     "type": "string",
-     "description": "The video's rating from the Commission de Contrôle des Films (Belgium).",
-     "enum": [
-      "cicfE",
-      "cicfKntEna",
-      "cicfKtEa",
-      "cicfUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "cnaRating": {
-     "type": "string",
-     "description": "The video's rating from Romania's CONSILIUL NATIONAL AL AUDIOVIZUALULUI (CNA).",
-     "enum": [
-      "cna12",
-      "cna15",
-      "cna18",
-      "cna18plus",
-      "cnaAp",
-      "cnaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "cncRating": {
-     "type": "string",
-     "description": "Rating system in France - Commission de classification cinematographique",
-     "enum": [
-      "cnc10",
-      "cnc12",
-      "cnc16",
-      "cnc18",
-      "cncE",
-      "cncT",
-      "cncUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "csaRating": {
-     "type": "string",
-     "description": "The video's rating from France's Conseil supérieur de l?audiovisuel, which rates broadcast content.",
-     "enum": [
-      "csa10",
-      "csa12",
-      "csa16",
-      "csa18",
-      "csaInterdiction",
-      "csaT",
-      "csaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "cscfRating": {
-     "type": "string",
-     "description": "The video's rating from Luxembourg's Commission de surveillance de la classification des films (CSCF).",
-     "enum": [
-      "cscf12",
-      "cscf16",
-      "cscf18",
-      "cscf6",
-      "cscf9",
-      "cscfA",
-      "cscfAl",
-      "cscfUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "czfilmRating": {
-     "type": "string",
-     "description": "The video's rating in the Czech Republic.",
-     "enum": [
-      "czfilm12",
-      "czfilm14",
-      "czfilm18",
-      "czfilmU",
-      "czfilmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "djctqRating": {
-     "type": "string",
-     "description": "The video's Departamento de Justiça, Classificação, Qualificação e Títulos (DJCQT - Brazil) rating.",
-     "enum": [
-      "djctq10",
-      "djctq12",
-      "djctq14",
-      "djctq16",
-      "djctq18",
-      "djctqL",
-      "djctqUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "djctqRatingReasons": {
-     "type": "array",
-     "description": "Reasons that explain why the video received its DJCQT (Brazil) rating.",
-     "items": {
-      "type": "string",
-      "enum": [
-       "djctqCriminalActs",
-       "djctqDrugs",
-       "djctqExplicitSex",
-       "djctqExtremeViolence",
-       "djctqIllegalDrugs",
-       "djctqImpactingContent",
-       "djctqInappropriateLanguage",
-       "djctqLegalDrugs",
-       "djctqNudity",
-       "djctqSex",
-       "djctqSexualContent",
-       "djctqViolence"
-      ],
-      "enumDescriptions": [
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       ""
-      ]
-     }
-    },
-    "ecbmctRating": {
-     "type": "string",
-     "description": "Rating system in Turkey - Evaluation and Classification Board of the Ministry of Culture and Tourism",
-     "enum": [
-      "ecbmct13a",
-      "ecbmct13plus",
-      "ecbmct15a",
-      "ecbmct15plus",
-      "ecbmct18plus",
-      "ecbmct7a",
-      "ecbmct7plus",
-      "ecbmctG",
-      "ecbmctUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "eefilmRating": {
-     "type": "string",
-     "description": "The video's rating in Estonia.",
-     "enum": [
-      "eefilmK12",
-      "eefilmK14",
-      "eefilmK16",
-      "eefilmK6",
-      "eefilmL",
-      "eefilmMs12",
-      "eefilmMs6",
-      "eefilmPere",
-      "eefilmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "egfilmRating": {
-     "type": "string",
-     "description": "The video's rating in Egypt.",
-     "enum": [
-      "egfilm18",
-      "egfilmBn",
-      "egfilmGn",
-      "egfilmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "eirinRating": {
-     "type": "string",
-     "description": "The video's Eirin (映倫) rating. Eirin is the Japanese rating system.",
-     "enum": [
-      "eirinG",
-      "eirinPg12",
-      "eirinR15plus",
-      "eirinR18plus",
-      "eirinUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "fcbmRating": {
-     "type": "string",
-     "description": "The video's rating from Malaysia's Film Censorship Board.",
-     "enum": [
-      "fcbm18",
-      "fcbm18pa",
-      "fcbm18pl",
-      "fcbm18sg",
-      "fcbm18sx",
-      "fcbmP13",
-      "fcbmPg13",
-      "fcbmU",
-      "fcbmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "fcoRating": {
-     "type": "string",
-     "description": "The video's rating from Hong Kong's Office for Film, Newspaper and Article Administration.",
-     "enum": [
-      "fcoI",
-      "fcoIi",
-      "fcoIia",
-      "fcoIib",
-      "fcoIii",
-      "fcoUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "fmocRating": {
-     "type": "string",
-     "description": "This property has been deprecated. Use the contentDetails.contentRating.cncRating instead.",
-     "enum": [
-      "fmoc10",
-      "fmoc12",
-      "fmoc16",
-      "fmoc18",
-      "fmocE",
-      "fmocU",
-      "fmocUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "fpbRating": {
-     "type": "string",
-     "description": "The video's rating from South Africa's Film and Publication Board.",
-     "enum": [
-      "fpb10",
-      "fpb1012Pg",
-      "fpb13",
-      "fpb16",
-      "fpb18",
-      "fpb79Pg",
-      "fpbA",
-      "fpbPg",
-      "fpbUnrated",
-      "fpbX18",
-      "fpbXx"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "fpbRatingReasons": {
-     "type": "array",
-     "description": "Reasons that explain why the video received its FPB (South Africa) rating.",
-     "items": {
-      "type": "string",
-      "enum": [
-       "fpbBlasphemy",
-       "fpbCriminalTechniques",
-       "fpbDrugs",
-       "fpbHorror",
-       "fpbImitativeActsTechniques",
-       "fpbLanguage",
-       "fpbNudity",
-       "fpbPrejudice",
-       "fpbSex",
-       "fpbSexualViolence",
-       "fpbViolence"
-      ],
-      "enumDescriptions": [
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       ""
-      ]
-     }
-    },
-    "fskRating": {
-     "type": "string",
-     "description": "The video's Freiwillige Selbstkontrolle der Filmwirtschaft (FSK - Germany) rating.",
-     "enum": [
-      "fsk0",
-      "fsk12",
-      "fsk16",
-      "fsk18",
-      "fsk6",
-      "fskUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "grfilmRating": {
-     "type": "string",
-     "description": "The video's rating in Greece.",
-     "enum": [
-      "grfilmE",
-      "grfilmK",
-      "grfilmK12",
-      "grfilmK13",
-      "grfilmK15",
-      "grfilmK17",
-      "grfilmK18",
-      "grfilmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "icaaRating": {
-     "type": "string",
-     "description": "The video's Instituto de la Cinematografía y de las Artes Audiovisuales (ICAA - Spain) rating.",
-     "enum": [
-      "icaa12",
-      "icaa13",
-      "icaa16",
-      "icaa18",
-      "icaa7",
-      "icaaApta",
-      "icaaUnrated",
-      "icaaX"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "ifcoRating": {
-     "type": "string",
-     "description": "The video's Irish Film Classification Office (IFCO - Ireland) rating. See the IFCO website for more information.",
-     "enum": [
-      "ifco12",
-      "ifco12a",
-      "ifco15",
-      "ifco15a",
-      "ifco16",
-      "ifco18",
-      "ifcoG",
-      "ifcoPg",
-      "ifcoUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "ilfilmRating": {
-     "type": "string",
-     "description": "The video's rating in Israel.",
-     "enum": [
-      "ilfilm12",
-      "ilfilm16",
-      "ilfilm18",
-      "ilfilmAa",
-      "ilfilmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "incaaRating": {
-     "type": "string",
-     "description": "The video's INCAA (Instituto Nacional de Cine y Artes Audiovisuales - Argentina) rating.",
-     "enum": [
-      "incaaAtp",
-      "incaaC",
-      "incaaSam13",
-      "incaaSam16",
-      "incaaSam18",
-      "incaaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "kfcbRating": {
-     "type": "string",
-     "description": "The video's rating from the Kenya Film Classification Board.",
-     "enum": [
-      "kfcb16plus",
-      "kfcbG",
-      "kfcbPg",
-      "kfcbR",
-      "kfcbUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "kijkwijzerRating": {
-     "type": "string",
-     "description": "voor de Classificatie van Audiovisuele Media (Netherlands).",
-     "enum": [
-      "kijkwijzer12",
-      "kijkwijzer16",
-      "kijkwijzer18",
-      "kijkwijzer6",
-      "kijkwijzer9",
-      "kijkwijzerAl",
-      "kijkwijzerUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "kmrbRating": {
-     "type": "string",
-     "description": "The video's Korea Media Rating Board (영상물등급위원회) rating. The KMRB rates videos in South Korea.",
-     "enum": [
-      "kmrb12plus",
-      "kmrb15plus",
-      "kmrbAll",
-      "kmrbR",
-      "kmrbTeenr",
-      "kmrbUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "lsfRating": {
-     "type": "string",
-     "description": "The video's rating from Indonesia's Lembaga Sensor Film.",
-     "enum": [
-      "lsf13",
-      "lsf17",
-      "lsf21",
-      "lsfA",
-      "lsfBo",
-      "lsfD",
-      "lsfR",
-      "lsfSu",
-      "lsfUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mccaaRating": {
-     "type": "string",
-     "description": "The video's rating from Malta's Film Age-Classification Board.",
-     "enum": [
-      "mccaa12",
-      "mccaa12a",
-      "mccaa14",
-      "mccaa15",
-      "mccaa16",
-      "mccaa18",
-      "mccaaPg",
-      "mccaaU",
-      "mccaaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mccypRating": {
-     "type": "string",
-     "description": "The video's rating from the Danish Film Institute's (Det Danske Filminstitut) Media Council for Children and Young People.",
-     "enum": [
-      "mccyp11",
-      "mccyp15",
-      "mccyp7",
-      "mccypA",
-      "mccypUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mcstRating": {
-     "type": "string",
-     "description": "The video's rating system for Vietnam - MCST",
-     "enum": [
-      "mcst0",
-      "mcst16plus",
-      "mcstC13",
-      "mcstC16",
-      "mcstC18",
-      "mcstGPg",
-      "mcstP",
-      "mcstUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mdaRating": {
-     "type": "string",
-     "description": "The video's rating from Singapore's Media Development Authority (MDA) and, specifically, it's Board of Film Censors (BFC).",
-     "enum": [
-      "mdaG",
-      "mdaM18",
-      "mdaNc16",
-      "mdaPg",
-      "mdaPg13",
-      "mdaR21",
-      "mdaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "medietilsynetRating": {
-     "type": "string",
-     "description": "The video's rating from Medietilsynet, the Norwegian Media Authority.",
-     "enum": [
-      "medietilsynet11",
-      "medietilsynet12",
-      "medietilsynet15",
-      "medietilsynet18",
-      "medietilsynet6",
-      "medietilsynet7",
-      "medietilsynet9",
-      "medietilsynetA",
-      "medietilsynetUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mekuRating": {
-     "type": "string",
-     "description": "The video's rating from Finland's Kansallinen Audiovisuaalinen Instituutti (National Audiovisual Institute).",
-     "enum": [
-      "meku12",
-      "meku16",
-      "meku18",
-      "meku7",
-      "mekuS",
-      "mekuUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mibacRating": {
-     "type": "string",
-     "description": "The video's rating from the Ministero dei Beni e delle Attività Culturali e del Turismo (Italy).",
-     "enum": [
-      "mibacT",
-      "mibacUnrated",
-      "mibacVap",
-      "mibacVm12",
-      "mibacVm14",
-      "mibacVm18"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mocRating": {
-     "type": "string",
-     "description": "The video's Ministerio de Cultura (Colombia) rating.",
-     "enum": [
-      "moc12",
-      "moc15",
-      "moc18",
-      "moc7",
-      "mocBanned",
-      "mocE",
-      "mocT",
-      "mocUnrated",
-      "mocX"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "moctwRating": {
-     "type": "string",
-     "description": "The video's rating from Taiwan's Ministry of Culture (文化部).",
-     "enum": [
-      "moctwG",
-      "moctwP",
-      "moctwPg",
-      "moctwR",
-      "moctwR12",
-      "moctwR15",
-      "moctwUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mpaaRating": {
-     "type": "string",
-     "description": "The video's Motion Picture Association of America (MPAA) rating.",
-     "enum": [
-      "mpaaG",
-      "mpaaNc17",
-      "mpaaPg",
-      "mpaaPg13",
-      "mpaaR",
-      "mpaaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "mtrcbRating": {
-     "type": "string",
-     "description": "The video's rating from the Movie and Television Review and Classification Board (Philippines).",
-     "enum": [
-      "mtrcbG",
-      "mtrcbPg",
-      "mtrcbR13",
-      "mtrcbR16",
-      "mtrcbR18",
-      "mtrcbUnrated",
-      "mtrcbX"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "nbcRating": {
-     "type": "string",
-     "description": "The video's rating from the Maldives National Bureau of Classification.",
-     "enum": [
-      "nbc12plus",
-      "nbc15plus",
-      "nbc18plus",
-      "nbc18plusr",
-      "nbcG",
-      "nbcPg",
-      "nbcPu",
-      "nbcUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "nbcplRating": {
-     "type": "string",
-     "description": "The video's rating in Poland.",
-     "enum": [
-      "nbcpl18plus",
-      "nbcplI",
-      "nbcplIi",
-      "nbcplIii",
-      "nbcplIv",
-      "nbcplUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "nfrcRating": {
-     "type": "string",
-     "description": "The video's rating from the Bulgarian National Film Center.",
-     "enum": [
-      "nfrcA",
-      "nfrcB",
-      "nfrcC",
-      "nfrcD",
-      "nfrcUnrated",
-      "nfrcX"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "nfvcbRating": {
-     "type": "string",
-     "description": "The video's rating from Nigeria's National Film and Video Censors Board.",
-     "enum": [
-      "nfvcb12",
-      "nfvcb12a",
-      "nfvcb15",
-      "nfvcb18",
-      "nfvcbG",
-      "nfvcbPg",
-      "nfvcbRe",
-      "nfvcbUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "nkclvRating": {
-     "type": "string",
-     "description": "The video's rating from the Nacionãlais Kino centrs (National Film Centre of Latvia).",
-     "enum": [
-      "nkclv12plus",
-      "nkclv18plus",
-      "nkclv7plus",
-      "nkclvU",
-      "nkclvUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "oflcRating": {
-     "type": "string",
-     "description": "The video's Office of Film and Literature Classification (OFLC - New Zealand) rating.",
-     "enum": [
-      "oflcG",
-      "oflcM",
-      "oflcPg",
-      "oflcR13",
-      "oflcR15",
-      "oflcR16",
-      "oflcR18",
-      "oflcRp13",
-      "oflcRp16",
-      "oflcUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "pefilmRating": {
-     "type": "string",
-     "description": "The video's rating in Peru.",
-     "enum": [
-      "pefilm14",
-      "pefilm18",
-      "pefilmPg",
-      "pefilmPt",
-      "pefilmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "rcnofRating": {
-     "type": "string",
-     "description": "The video's rating from the Hungarian Nemzeti Filmiroda, the Rating Committee of the National Office of Film.",
-     "enum": [
-      "rcnofI",
-      "rcnofIi",
-      "rcnofIii",
-      "rcnofIv",
-      "rcnofUnrated",
-      "rcnofV",
-      "rcnofVi"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "resorteviolenciaRating": {
-     "type": "string",
-     "description": "The video's rating in Venezuela.",
-     "enum": [
-      "resorteviolenciaA",
-      "resorteviolenciaB",
-      "resorteviolenciaC",
-      "resorteviolenciaD",
-      "resorteviolenciaE",
-      "resorteviolenciaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "rtcRating": {
-     "type": "string",
-     "description": "The video's General Directorate of Radio, Television and Cinematography (Mexico) rating.",
-     "enum": [
-      "rtcA",
-      "rtcAa",
-      "rtcB",
-      "rtcB15",
-      "rtcC",
-      "rtcD",
-      "rtcUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "rteRating": {
-     "type": "string",
-     "description": "The video's rating from Ireland's Raidió Teilifís Éireann.",
-     "enum": [
-      "rteCh",
-      "rteGa",
-      "rteMa",
-      "rtePs",
-      "rteUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "russiaRating": {
-     "type": "string",
-     "description": "The video's National Film Registry of the Russian Federation (MKRF - Russia) rating.",
-     "enum": [
-      "russia0",
-      "russia12",
-      "russia16",
-      "russia18",
-      "russia6",
-      "russiaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "skfilmRating": {
-     "type": "string",
-     "description": "The video's rating in Slovakia.",
-     "enum": [
-      "skfilmG",
-      "skfilmP2",
-      "skfilmP5",
-      "skfilmP8",
-      "skfilmUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "smaisRating": {
-     "type": "string",
-     "description": "The video's rating in Iceland.",
-     "enum": [
-      "smais12",
-      "smais14",
-      "smais16",
-      "smais18",
-      "smais7",
-      "smaisL",
-      "smaisUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "smsaRating": {
-     "type": "string",
-     "description": "The video's rating from Statens medieråd (Sweden's National Media Council).",
-     "enum": [
-      "smsa11",
-      "smsa15",
-      "smsa7",
-      "smsaA",
-      "smsaUnrated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "tvpgRating": {
-     "type": "string",
-     "description": "The video's TV Parental Guidelines (TVPG) rating.",
-     "enum": [
-      "pg14",
-      "tvpgG",
-      "tvpgMa",
-      "tvpgPg",
-      "tvpgUnrated",
-      "tvpgY",
-      "tvpgY7",
-      "tvpgY7Fv"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "ytRating": {
-     "type": "string",
-     "description": "A rating that YouTube uses to identify age-restricted content.",
-     "enum": [
-      "ytAgeRestricted"
-     ],
-     "enumDescriptions": [
-      ""
-     ]
-    }
-   }
-  },
-  "FanFundingEvent": {
-   "id": "FanFundingEvent",
-   "type": "object",
-   "description": "A fanFundingEvent resource represents a fan funding event on a YouTube channel. Fan funding events occur when a user gives one-time monetary support to the channel owner.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube assigns to uniquely identify the fan funding event."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#fanFundingEvent\".",
-     "default": "youtube#fanFundingEvent"
-    },
-    "snippet": {
-     "$ref": "FanFundingEventSnippet",
-     "description": "The snippet object contains basic details about the fan funding event."
-    }
-   }
-  },
-  "FanFundingEventListResponse": {
-   "id": "FanFundingEventListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of fan funding events that match the request criteria.",
-     "items": {
-      "$ref": "FanFundingEvent"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#fanFundingEventListResponse\".",
-     "default": "youtube#fanFundingEventListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "FanFundingEventSnippet": {
-   "id": "FanFundingEventSnippet",
-   "type": "object",
-   "properties": {
-    "amountMicros": {
-     "type": "string",
-     "description": "The amount of funding in micros of fund_currency. e.g., 1 is represented",
-     "format": "uint64"
-    },
-    "channelId": {
-     "type": "string",
-     "description": "Channel id where the funding event occurred."
-    },
-    "commentText": {
-     "type": "string",
-     "description": "The text contents of the comment left by the user."
-    },
-    "createdAt": {
-     "type": "string",
-     "description": "The date and time when the funding occurred. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "currency": {
-     "type": "string",
-     "description": "The currency in which the fund was made. ISO 4217."
-    },
-    "displayString": {
-     "type": "string",
-     "description": "A rendered string that displays the fund amount and currency (e.g., \"$1.00\"). The string is rendered for the given language."
-    },
-    "supporterDetails": {
-     "$ref": "ChannelProfileDetails",
-     "description": "Details about the supporter. Only filled if the event was made public by the user."
-    }
-   }
-  },
-  "GeoPoint": {
-   "id": "GeoPoint",
-   "type": "object",
-   "description": "Geographical coordinates of a point, in WGS84.",
-   "properties": {
-    "altitude": {
-     "type": "number",
-     "description": "Altitude above the reference ellipsoid, in meters.",
-     "format": "double"
-    },
-    "latitude": {
-     "type": "number",
-     "description": "Latitude in degrees.",
-     "format": "double"
-    },
-    "longitude": {
-     "type": "number",
-     "description": "Longitude in degrees.",
-     "format": "double"
-    }
-   }
-  },
-  "GuideCategory": {
-   "id": "GuideCategory",
-   "type": "object",
-   "description": "A guideCategory resource identifies a category that YouTube algorithmically assigns based on a channel's content or other indicators, such as the channel's popularity. The list is similar to video categories, with the difference being that a video's uploader can assign a video category but only YouTube can assign a channel category.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the guide category."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#guideCategory\".",
-     "default": "youtube#guideCategory"
-    },
-    "snippet": {
-     "$ref": "GuideCategorySnippet",
-     "description": "The snippet object contains basic details about the category, such as its title."
-    }
-   }
-  },
-  "GuideCategoryListResponse": {
-   "id": "GuideCategoryListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of categories that can be associated with YouTube channels. In this map, the category ID is the map key, and its value is the corresponding guideCategory resource.",
-     "items": {
-      "$ref": "GuideCategory"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#guideCategoryListResponse\".",
-     "default": "youtube#guideCategoryListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "GuideCategorySnippet": {
-   "id": "GuideCategorySnippet",
-   "type": "object",
-   "description": "Basic details about a guide category.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "default": "UCBR8-60-B28hp2BmDPdntcQ"
-    },
-    "title": {
-     "type": "string",
-     "description": "Description of the guide category."
-    }
-   }
-  },
-  "I18nLanguage": {
-   "id": "I18nLanguage",
-   "type": "object",
-   "description": "An i18nLanguage resource identifies a UI language currently supported by YouTube.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the i18n language."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#i18nLanguage\".",
-     "default": "youtube#i18nLanguage"
-    },
-    "snippet": {
-     "$ref": "I18nLanguageSnippet",
-     "description": "The snippet object contains basic details about the i18n language, such as language code and human-readable name."
-    }
-   }
-  },
-  "I18nLanguageListResponse": {
-   "id": "I18nLanguageListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of supported i18n languages. In this map, the i18n language ID is the map key, and its value is the corresponding i18nLanguage resource.",
-     "items": {
-      "$ref": "I18nLanguage"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#i18nLanguageListResponse\".",
-     "default": "youtube#i18nLanguageListResponse"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "I18nLanguageSnippet": {
-   "id": "I18nLanguageSnippet",
-   "type": "object",
-   "description": "Basic details about an i18n language, such as language code and human-readable name.",
-   "properties": {
-    "hl": {
-     "type": "string",
-     "description": "A short BCP-47 code that uniquely identifies a language."
-    },
-    "name": {
-     "type": "string",
-     "description": "The human-readable name of the language in the language itself."
-    }
-   }
-  },
-  "I18nRegion": {
-   "id": "I18nRegion",
-   "type": "object",
-   "description": "A i18nRegion resource identifies a region where YouTube is available.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the i18n region."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#i18nRegion\".",
-     "default": "youtube#i18nRegion"
-    },
-    "snippet": {
-     "$ref": "I18nRegionSnippet",
-     "description": "The snippet object contains basic details about the i18n region, such as region code and human-readable name."
-    }
-   }
-  },
-  "I18nRegionListResponse": {
-   "id": "I18nRegionListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of regions where YouTube is available. In this map, the i18n region ID is the map key, and its value is the corresponding i18nRegion resource.",
-     "items": {
-      "$ref": "I18nRegion"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#i18nRegionListResponse\".",
-     "default": "youtube#i18nRegionListResponse"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "I18nRegionSnippet": {
-   "id": "I18nRegionSnippet",
-   "type": "object",
-   "description": "Basic details about an i18n region, such as region code and human-readable name.",
-   "properties": {
-    "gl": {
-     "type": "string",
-     "description": "The region code as a 2-letter ISO country code."
-    },
-    "name": {
-     "type": "string",
-     "description": "The human-readable name of the region."
-    }
-   }
-  },
-  "ImageSettings": {
-   "id": "ImageSettings",
-   "type": "object",
-   "description": "Branding properties for images associated with the channel.",
-   "properties": {
-    "backgroundImageUrl": {
-     "$ref": "LocalizedProperty",
-     "description": "The URL for the background image shown on the video watch page. The image should be 1200px by 615px, with a maximum file size of 128k."
-    },
-    "bannerExternalUrl": {
-     "type": "string",
-     "description": "This is used only in update requests; if it's set, we use this URL to generate all of the above banner URLs."
-    },
-    "bannerImageUrl": {
-     "type": "string",
-     "description": "Banner image. Desktop size (1060x175)."
-    },
-    "bannerMobileExtraHdImageUrl": {
-     "type": "string",
-     "description": "Banner image. Mobile size high resolution (1440x395)."
-    },
-    "bannerMobileHdImageUrl": {
-     "type": "string",
-     "description": "Banner image. Mobile size high resolution (1280x360)."
-    },
-    "bannerMobileImageUrl": {
-     "type": "string",
-     "description": "Banner image. Mobile size (640x175)."
-    },
-    "bannerMobileLowImageUrl": {
-     "type": "string",
-     "description": "Banner image. Mobile size low resolution (320x88)."
-    },
-    "bannerMobileMediumHdImageUrl": {
-     "type": "string",
-     "description": "Banner image. Mobile size medium/high resolution (960x263)."
-    },
-    "bannerTabletExtraHdImageUrl": {
-     "type": "string",
-     "description": "Banner image. Tablet size extra high resolution (2560x424)."
-    },
-    "bannerTabletHdImageUrl": {
-     "type": "string",
-     "description": "Banner image. Tablet size high resolution (2276x377)."
-    },
-    "bannerTabletImageUrl": {
-     "type": "string",
-     "description": "Banner image. Tablet size (1707x283)."
-    },
-    "bannerTabletLowImageUrl": {
-     "type": "string",
-     "description": "Banner image. Tablet size low resolution (1138x188)."
-    },
-    "bannerTvHighImageUrl": {
-     "type": "string",
-     "description": "Banner image. TV size high resolution (1920x1080)."
-    },
-    "bannerTvImageUrl": {
-     "type": "string",
-     "description": "Banner image. TV size extra high resolution (2120x1192)."
-    },
-    "bannerTvLowImageUrl": {
-     "type": "string",
-     "description": "Banner image. TV size low resolution (854x480)."
-    },
-    "bannerTvMediumImageUrl": {
-     "type": "string",
-     "description": "Banner image. TV size medium resolution (1280x720)."
-    },
-    "largeBrandedBannerImageImapScript": {
-     "$ref": "LocalizedProperty",
-     "description": "The image map script for the large banner image."
-    },
-    "largeBrandedBannerImageUrl": {
-     "$ref": "LocalizedProperty",
-     "description": "The URL for the 854px by 70px image that appears below the video player in the expanded video view of the video watch page."
-    },
-    "smallBrandedBannerImageImapScript": {
-     "$ref": "LocalizedProperty",
-     "description": "The image map script for the small banner image."
-    },
-    "smallBrandedBannerImageUrl": {
-     "$ref": "LocalizedProperty",
-     "description": "The URL for the 640px by 70px banner image that appears below the video player in the default view of the video watch page."
-    },
-    "trackingImageUrl": {
-     "type": "string",
-     "description": "The URL for a 1px by 1px tracking pixel that can be used to collect statistics for views of the channel or video pages."
-    },
-    "watchIconImageUrl": {
-     "type": "string",
-     "description": "The URL for the image that appears above the top-left corner of the video player. This is a 25-pixel-high image with a flexible width that cannot exceed 170 pixels."
-    }
-   }
-  },
-  "IngestionInfo": {
-   "id": "IngestionInfo",
-   "type": "object",
-   "description": "Describes information necessary for ingesting an RTMP or an HTTP stream.",
-   "properties": {
-    "backupIngestionAddress": {
-     "type": "string",
-     "description": "The backup ingestion URL that you should use to stream video to YouTube. You have the option of simultaneously streaming the content that you are sending to the ingestionAddress to this URL."
-    },
-    "ingestionAddress": {
-     "type": "string",
-     "description": "The primary ingestion URL that you should use to stream video to YouTube. You must stream video to this URL.\n\nDepending on which application or tool you use to encode your video stream, you may need to enter the stream URL and stream name separately or you may need to concatenate them in the following format:\n\nSTREAM_URL/STREAM_NAME"
-    },
-    "streamName": {
-     "type": "string",
-     "description": "The HTTP or RTMP stream name that YouTube assigns to the video stream."
-    }
-   }
-  },
-  "InvideoBranding": {
-   "id": "InvideoBranding",
-   "type": "object",
-   "properties": {
-    "imageBytes": {
-     "type": "string",
-     "format": "byte"
-    },
-    "imageUrl": {
-     "type": "string"
-    },
-    "position": {
-     "$ref": "InvideoPosition"
-    },
-    "targetChannelId": {
-     "type": "string"
-    },
-    "timing": {
-     "$ref": "InvideoTiming"
-    }
-   }
-  },
-  "InvideoPosition": {
-   "id": "InvideoPosition",
-   "type": "object",
-   "description": "Describes the spatial position of a visual widget inside a video. It is a union of various position types, out of which only will be set one.",
-   "properties": {
-    "cornerPosition": {
-     "type": "string",
-     "description": "Describes in which corner of the video the visual widget will appear.",
-     "enum": [
-      "bottomLeft",
-      "bottomRight",
-      "topLeft",
-      "topRight"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "type": {
-     "type": "string",
-     "description": "Defines the position type.",
-     "enum": [
-      "corner"
-     ],
-     "enumDescriptions": [
-      ""
-     ]
-    }
-   }
-  },
-  "InvideoPromotion": {
-   "id": "InvideoPromotion",
-   "type": "object",
-   "description": "Describes an invideo promotion campaign consisting of multiple promoted items. A campaign belongs to a single channel_id.",
-   "properties": {
-    "defaultTiming": {
-     "$ref": "InvideoTiming",
-     "description": "The default temporal position within the video where the promoted item will be displayed. Can be overriden by more specific timing in the item."
-    },
-    "items": {
-     "type": "array",
-     "description": "List of promoted items in decreasing priority.",
-     "items": {
-      "$ref": "PromotedItem"
-     }
-    },
-    "position": {
-     "$ref": "InvideoPosition",
-     "description": "The spatial position within the video where the promoted item will be displayed."
-    },
-    "useSmartTiming": {
-     "type": "boolean",
-     "description": "Indicates whether the channel's promotional campaign uses \"smart timing.\" This feature attempts to show promotions at a point in the video when they are more likely to be clicked and less likely to disrupt the viewing experience. This feature also picks up a single promotion to show on each video."
-    }
-   }
-  },
-  "InvideoTiming": {
-   "id": "InvideoTiming",
-   "type": "object",
-   "description": "Describes a temporal position of a visual widget inside a video.",
-   "properties": {
-    "durationMs": {
-     "type": "string",
-     "description": "Defines the duration in milliseconds for which the promotion should be displayed. If missing, the client should use the default.",
-     "format": "uint64"
-    },
-    "offsetMs": {
-     "type": "string",
-     "description": "Defines the time at which the promotion will appear. Depending on the value of type the value of the offsetMs field will represent a time offset from the start or from the end of the video, expressed in milliseconds.",
-     "format": "uint64"
-    },
-    "type": {
-     "type": "string",
-     "description": "Describes a timing type. If the value is offsetFromStart, then the offsetMs field represents an offset from the start of the video. If the value is offsetFromEnd, then the offsetMs field represents an offset from the end of the video.",
-     "enum": [
-      "offsetFromEnd",
-      "offsetFromStart"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "LanguageTag": {
-   "id": "LanguageTag",
-   "type": "object",
-   "properties": {
-    "value": {
-     "type": "string"
-    }
-   }
-  },
-  "LiveBroadcast": {
-   "id": "LiveBroadcast",
-   "type": "object",
-   "description": "A liveBroadcast resource represents an event that will be streamed, via live video, on YouTube.",
-   "properties": {
-    "contentDetails": {
-     "$ref": "LiveBroadcastContentDetails",
-     "description": "The contentDetails object contains information about the event's video content, such as whether the content can be shown in an embedded video player or if it will be archived and therefore available for viewing after the event has concluded."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube assigns to uniquely identify the broadcast.",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveBroadcast\".",
-     "default": "youtube#liveBroadcast"
-    },
-    "snippet": {
-     "$ref": "LiveBroadcastSnippet",
-     "description": "The snippet object contains basic details about the event, including its title, description, start time, and end time."
-    },
-    "statistics": {
-     "$ref": "LiveBroadcastStatistics",
-     "description": "The statistics object contains info about the event's current stats. These include concurrent viewers and total chat count. Statistics can change (in either direction) during the lifetime of an event. Statistics are only returned while the event is live."
-    },
-    "status": {
-     "$ref": "LiveBroadcastStatus",
-     "description": "The status object contains information about the event's status."
-    },
-    "topicDetails": {
-     "$ref": "LiveBroadcastTopicDetails"
-    }
-   }
-  },
-  "LiveBroadcastContentDetails": {
-   "id": "LiveBroadcastContentDetails",
-   "type": "object",
-   "description": "Detailed settings of a broadcast.",
-   "properties": {
-    "boundStreamId": {
-     "type": "string",
-     "description": "This value uniquely identifies the live stream bound to the broadcast."
-    },
-    "boundStreamLastUpdateTimeMs": {
-     "type": "string",
-     "description": "The date and time that the live stream referenced by boundStreamId was last updated.",
-     "format": "date-time"
-    },
-    "closedCaptionsType": {
-     "type": "string",
-     "enum": [
-      "closedCaptionsDisabled",
-      "closedCaptionsEmbedded",
-      "closedCaptionsHttpPost"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "enableClosedCaptions": {
-     "type": "boolean",
-     "description": "This setting indicates whether HTTP POST closed captioning is enabled for this broadcast. The ingestion URL of the closed captions is returned through the liveStreams API. This is mutually exclusive with using the closed_captions_type property, and is equivalent to setting closed_captions_type to CLOSED_CAPTIONS_HTTP_POST."
-    },
-    "enableContentEncryption": {
-     "type": "boolean",
-     "description": "This setting indicates whether YouTube should enable content encryption for the broadcast.",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    },
-    "enableDvr": {
-     "type": "boolean",
-     "description": "This setting determines whether viewers can access DVR controls while watching the video. DVR controls enable the viewer to control the video playback experience by pausing, rewinding, or fast forwarding content. The default value for this property is true.\n\n\n\nImportant: You must set the value to true and also set the enableArchive property's value to true if you want to make playback available immediately after the broadcast ends.",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    },
-    "enableEmbed": {
-     "type": "boolean",
-     "description": "This setting indicates whether the broadcast video can be played in an embedded player. If you choose to archive the video (using the enableArchive property), this setting will also apply to the archived video.",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    },
-    "enableLowLatency": {
-     "type": "boolean",
-     "description": "Indicates whether this broadcast has low latency enabled."
-    },
-    "monitorStream": {
-     "$ref": "MonitorStreamInfo",
-     "description": "The monitorStream object contains information about the monitor stream, which the broadcaster can use to review the event content before the broadcast stream is shown publicly."
-    },
-    "projection": {
-     "type": "string",
-     "description": "The projection format of this broadcast. This defaults to rectangular.",
-     "enum": [
-      "360",
-      "rectangular"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "recordFromStart": {
-     "type": "boolean",
-     "description": "Automatically start recording after the event goes live. The default value for this property is true.\n\n\n\nImportant: You must also set the enableDvr property's value to true if you want the playback to be available immediately after the broadcast ends. If you set this property's value to true but do not also set the enableDvr property to true, there may be a delay of around one day before the archived video will be available for playback.",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    },
-    "startWithSlate": {
-     "type": "boolean",
-     "description": "This setting indicates whether the broadcast should automatically begin with an in-stream slate when you update the broadcast's status to live. After updating the status, you then need to send a liveCuepoints.insert request that sets the cuepoint's eventState to end to remove the in-stream slate and make your broadcast stream visible to viewers.",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    }
-   }
-  },
-  "LiveBroadcastListResponse": {
-   "id": "LiveBroadcastListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of broadcasts that match the request criteria.",
-     "items": {
-      "$ref": "LiveBroadcast"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveBroadcastListResponse\".",
-     "default": "youtube#liveBroadcastListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "LiveBroadcastSnippet": {
-   "id": "LiveBroadcastSnippet",
-   "type": "object",
-   "properties": {
-    "actualEndTime": {
-     "type": "string",
-     "description": "The date and time that the broadcast actually ended. This information is only available once the broadcast's state is complete. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "actualStartTime": {
-     "type": "string",
-     "description": "The date and time that the broadcast actually started. This information is only available once the broadcast's state is live. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the channel that is publishing the broadcast."
-    },
-    "description": {
-     "type": "string",
-     "description": "The broadcast's description. As with the title, you can set this field by modifying the broadcast resource or by setting the description field of the corresponding video resource."
-    },
-    "isDefaultBroadcast": {
-     "type": "boolean"
-    },
-    "liveChatId": {
-     "type": "string",
-     "description": "The id of the live chat for this broadcast."
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time that the broadcast was added to YouTube's live broadcast schedule. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "scheduledEndTime": {
-     "type": "string",
-     "description": "The date and time that the broadcast is scheduled to end. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "scheduledStartTime": {
-     "type": "string",
-     "description": "The date and time that the broadcast is scheduled to start. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.insert",
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "A map of thumbnail images associated with the broadcast. For each nested object in this object, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail."
-    },
-    "title": {
-     "type": "string",
-     "description": "The broadcast's title. Note that the broadcast represents exactly one YouTube video. You can set this field by modifying the broadcast resource or by setting the title field of the corresponding video resource.",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.insert",
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    }
-   }
-  },
-  "LiveBroadcastStatistics": {
-   "id": "LiveBroadcastStatistics",
-   "type": "object",
-   "description": "Statistics about the live broadcast. These represent a snapshot of the values at the time of the request. Statistics are only returned for live broadcasts.",
-   "properties": {
-    "concurrentViewers": {
-     "type": "string",
-     "description": "The number of viewers currently watching the broadcast. The property and its value will be present if the broadcast has current viewers and the broadcast owner has not hidden the viewcount for the video. Note that YouTube stops tracking the number of concurrent viewers for a broadcast when the broadcast ends. So, this property would not identify the number of viewers watching an archived video of a live broadcast that already ended.",
-     "format": "uint64"
-    },
-    "totalChatCount": {
-     "type": "string",
-     "description": "The total number of live chat messages currently on the broadcast. The property and its value will be present if the broadcast is public, has the live chat feature enabled, and has at least one message. Note that this field will not be filled after the broadcast ends. So this property would not identify the number of chat messages for an archived video of a completed live broadcast.",
-     "format": "uint64"
-    }
-   }
-  },
-  "LiveBroadcastStatus": {
-   "id": "LiveBroadcastStatus",
-   "type": "object",
-   "properties": {
-    "lifeCycleStatus": {
-     "type": "string",
-     "description": "The broadcast's status. The status can be updated using the API's liveBroadcasts.transition method.",
-     "enum": [
-      "abandoned",
-      "complete",
-      "completeStarting",
-      "created",
-      "live",
-      "liveStarting",
-      "ready",
-      "reclaimed",
-      "revoked",
-      "testStarting",
-      "testing"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "liveBroadcastPriority": {
-     "type": "string",
-     "description": "Priority of the live broadcast event (internal state).",
-     "enum": [
-      "high",
-      "low",
-      "normal"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "privacyStatus": {
-     "type": "string",
-     "description": "The broadcast's privacy status. Note that the broadcast represents exactly one YouTube video, so the privacy settings are identical to those supported for videos. In addition, you can set this field by modifying the broadcast resource or by setting the privacyStatus field of the corresponding video resource.",
-     "enum": [
-      "private",
-      "public",
-      "unlisted"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ],
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.insert",
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    },
-    "recordingStatus": {
-     "type": "string",
-     "description": "The broadcast's recording status.",
-     "enum": [
-      "notRecording",
-      "recorded",
-      "recording"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "LiveBroadcastTopic": {
-   "id": "LiveBroadcastTopic",
-   "type": "object",
-   "properties": {
-    "snippet": {
-     "$ref": "LiveBroadcastTopicSnippet",
-     "description": "Information about the topic matched."
-    },
-    "type": {
-     "type": "string",
-     "description": "The type of the topic.",
-     "enum": [
-      "videoGame"
-     ],
-     "enumDescriptions": [
-      ""
-     ]
-    },
-    "unmatched": {
-     "type": "boolean",
-     "description": "If this flag is set it means that we have not been able to match the topic title and type provided to a known entity."
-    }
-   }
-  },
-  "LiveBroadcastTopicDetails": {
-   "id": "LiveBroadcastTopicDetails",
-   "type": "object",
-   "properties": {
-    "topics": {
-     "type": "array",
-     "items": {
-      "$ref": "LiveBroadcastTopic"
-     }
-    }
-   }
-  },
-  "LiveBroadcastTopicSnippet": {
-   "id": "LiveBroadcastTopicSnippet",
-   "type": "object",
-   "properties": {
-    "name": {
-     "type": "string",
-     "description": "The name of the topic."
-    },
-    "releaseDate": {
-     "type": "string",
-     "description": "The date at which the topic was released. Filled for types: videoGame"
-    }
-   }
-  },
-  "LiveChatBan": {
-   "id": "LiveChatBan",
-   "type": "object",
-   "description": "A liveChatBan resource represents a ban for a YouTube live chat.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube assigns to uniquely identify the ban."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatBan\".",
-     "default": "youtube#liveChatBan"
-    },
-    "snippet": {
-     "$ref": "LiveChatBanSnippet",
-     "description": "The snippet object contains basic details about the ban."
-    }
-   }
-  },
-  "LiveChatBanSnippet": {
-   "id": "LiveChatBanSnippet",
-   "type": "object",
-   "properties": {
-    "banDurationSeconds": {
-     "type": "string",
-     "description": "The duration of a ban, only filled if the ban has type TEMPORARY.",
-     "format": "uint64"
-    },
-    "bannedUserDetails": {
-     "$ref": "ChannelProfileDetails"
-    },
-    "liveChatId": {
-     "type": "string",
-     "description": "The chat this ban is pertinent to."
-    },
-    "type": {
-     "type": "string",
-     "description": "The type of ban.",
-     "enum": [
-      "permanent",
-      "temporary"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "LiveChatFanFundingEventDetails": {
-   "id": "LiveChatFanFundingEventDetails",
-   "type": "object",
-   "properties": {
-    "amountDisplayString": {
-     "type": "string",
-     "description": "A rendered string that displays the fund amount and currency to the user."
-    },
-    "amountMicros": {
-     "type": "string",
-     "description": "The amount of the fund.",
-     "format": "uint64"
-    },
-    "currency": {
-     "type": "string",
-     "description": "The currency in which the fund was made."
-    },
-    "userComment": {
-     "type": "string",
-     "description": "The comment added by the user to this fan funding event."
-    }
-   }
-  },
-  "LiveChatMessage": {
-   "id": "LiveChatMessage",
-   "type": "object",
-   "description": "A liveChatMessage resource represents a chat message in a YouTube Live Chat.",
-   "properties": {
-    "authorDetails": {
-     "$ref": "LiveChatMessageAuthorDetails",
-     "description": "The authorDetails object contains basic details about the user that posted this message."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube assigns to uniquely identify the message."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatMessage\".",
-     "default": "youtube#liveChatMessage"
-    },
-    "snippet": {
-     "$ref": "LiveChatMessageSnippet",
-     "description": "The snippet object contains basic details about the message."
-    }
-   }
-  },
-  "LiveChatMessageAuthorDetails": {
-   "id": "LiveChatMessageAuthorDetails",
-   "type": "object",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The YouTube channel ID."
-    },
-    "channelUrl": {
-     "type": "string",
-     "description": "The channel's URL."
-    },
-    "displayName": {
-     "type": "string",
-     "description": "The channel's display name."
-    },
-    "isChatModerator": {
-     "type": "boolean",
-     "description": "Whether the author is a moderator of the live chat."
-    },
-    "isChatOwner": {
-     "type": "boolean",
-     "description": "Whether the author is the owner of the live chat."
-    },
-    "isChatSponsor": {
-     "type": "boolean",
-     "description": "Whether the author is a sponsor of the live chat."
-    },
-    "isVerified": {
-     "type": "boolean",
-     "description": "Whether the author's identity has been verified by YouTube."
-    },
-    "profileImageUrl": {
-     "type": "string",
-     "description": "The channels's avatar URL."
-    }
-   }
-  },
-  "LiveChatMessageDeletedDetails": {
-   "id": "LiveChatMessageDeletedDetails",
-   "type": "object",
-   "properties": {
-    "deletedMessageId": {
-     "type": "string"
-    }
-   }
-  },
-  "LiveChatMessageListResponse": {
-   "id": "LiveChatMessageListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of live chat messages.",
-     "items": {
-      "$ref": "LiveChatMessage"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatMessageListResponse\".",
-     "default": "youtube#liveChatMessageListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "offlineAt": {
-     "type": "string",
-     "description": "The date and time when the underlying stream went offline. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "pollingIntervalMillis": {
-     "type": "integer",
-     "description": "The amount of time the client should wait before polling again.",
-     "format": "uint32"
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "LiveChatMessageRetractedDetails": {
-   "id": "LiveChatMessageRetractedDetails",
-   "type": "object",
-   "properties": {
-    "retractedMessageId": {
-     "type": "string"
-    }
-   }
-  },
-  "LiveChatMessageSnippet": {
-   "id": "LiveChatMessageSnippet",
-   "type": "object",
-   "properties": {
-    "authorChannelId": {
-     "type": "string",
-     "description": "The ID of the user that authored this message, this field is not always filled. textMessageEvent - the user that wrote the message fanFundingEvent - the user that funded the broadcast newSponsorEvent - the user that just became a sponsor messageDeletedEvent - the moderator that took the action messageRetractedEvent - the author that retracted their message userBannedEvent - the moderator that took the action superChatEvent - the user that made the purchase"
-    },
-    "displayMessage": {
-     "type": "string",
-     "description": "Contains a string that can be displayed to the user. If this field is not present the message is silent, at the moment only messages of type TOMBSTONE and CHAT_ENDED_EVENT are silent."
-    },
-    "fanFundingEventDetails": {
-     "$ref": "LiveChatFanFundingEventDetails",
-     "description": "Details about the funding event, this is only set if the type is 'fanFundingEvent'."
-    },
-    "hasDisplayContent": {
-     "type": "boolean",
-     "description": "Whether the message has display content that should be displayed to users."
-    },
-    "liveChatId": {
-     "type": "string"
-    },
-    "messageDeletedDetails": {
-     "$ref": "LiveChatMessageDeletedDetails"
-    },
-    "messageRetractedDetails": {
-     "$ref": "LiveChatMessageRetractedDetails"
-    },
-    "pollClosedDetails": {
-     "$ref": "LiveChatPollClosedDetails"
-    },
-    "pollEditedDetails": {
-     "$ref": "LiveChatPollEditedDetails"
-    },
-    "pollOpenedDetails": {
-     "$ref": "LiveChatPollOpenedDetails"
-    },
-    "pollVotedDetails": {
-     "$ref": "LiveChatPollVotedDetails"
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time when the message was orignally published. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "superChatDetails": {
-     "$ref": "LiveChatSuperChatDetails",
-     "description": "Details about the Super Chat event, this is only set if the type is 'superChatEvent'."
-    },
-    "textMessageDetails": {
-     "$ref": "LiveChatTextMessageDetails",
-     "description": "Details about the text message, this is only set if the type is 'textMessageEvent'."
-    },
-    "type": {
-     "type": "string",
-     "description": "The type of message, this will always be present, it determines the contents of the message as well as which fields will be present.",
-     "enum": [
-      "chatEndedEvent",
-      "fanFundingEvent",
-      "messageDeletedEvent",
-      "messageRetractedEvent",
-      "newSponsorEvent",
-      "pollClosedEvent",
-      "pollEditedEvent",
-      "pollOpenedEvent",
-      "pollVotedEvent",
-      "sponsorOnlyModeEndedEvent",
-      "sponsorOnlyModeStartedEvent",
-      "superChatEvent",
-      "textMessageEvent",
-      "tombstone",
-      "userBannedEvent"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "userBannedDetails": {
-     "$ref": "LiveChatUserBannedMessageDetails"
-    }
-   }
-  },
-  "LiveChatModerator": {
-   "id": "LiveChatModerator",
-   "type": "object",
-   "description": "A liveChatModerator resource represents a moderator for a YouTube live chat. A chat moderator has the ability to ban/unban users from a chat, remove message, etc.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube assigns to uniquely identify the moderator."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatModerator\".",
-     "default": "youtube#liveChatModerator"
-    },
-    "snippet": {
-     "$ref": "LiveChatModeratorSnippet",
-     "description": "The snippet object contains basic details about the moderator."
-    }
-   }
-  },
-  "LiveChatModeratorListResponse": {
-   "id": "LiveChatModeratorListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of moderators that match the request criteria.",
-     "items": {
-      "$ref": "LiveChatModerator"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveChatModeratorListResponse\".",
-     "default": "youtube#liveChatModeratorListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "LiveChatModeratorSnippet": {
-   "id": "LiveChatModeratorSnippet",
-   "type": "object",
-   "properties": {
-    "liveChatId": {
-     "type": "string",
-     "description": "The ID of the live chat this moderator can act on."
-    },
-    "moderatorDetails": {
-     "$ref": "ChannelProfileDetails",
-     "description": "Details about the moderator."
-    }
-   }
-  },
-  "LiveChatPollClosedDetails": {
-   "id": "LiveChatPollClosedDetails",
-   "type": "object",
-   "properties": {
-    "pollId": {
-     "type": "string",
-     "description": "The id of the poll that was closed."
-    }
-   }
-  },
-  "LiveChatPollEditedDetails": {
-   "id": "LiveChatPollEditedDetails",
-   "type": "object",
-   "properties": {
-    "id": {
-     "type": "string"
-    },
-    "items": {
-     "type": "array",
-     "items": {
-      "$ref": "LiveChatPollItem"
-     }
-    },
-    "prompt": {
-     "type": "string"
-    }
-   }
-  },
-  "LiveChatPollItem": {
-   "id": "LiveChatPollItem",
-   "type": "object",
-   "properties": {
-    "description": {
-     "type": "string",
-     "description": "Plain text description of the item."
-    },
-    "itemId": {
-     "type": "string"
-    }
-   }
-  },
-  "LiveChatPollOpenedDetails": {
-   "id": "LiveChatPollOpenedDetails",
-   "type": "object",
-   "properties": {
-    "id": {
-     "type": "string"
-    },
-    "items": {
-     "type": "array",
-     "items": {
-      "$ref": "LiveChatPollItem"
-     }
-    },
-    "prompt": {
-     "type": "string"
-    }
-   }
-  },
-  "LiveChatPollVotedDetails": {
-   "id": "LiveChatPollVotedDetails",
-   "type": "object",
-   "properties": {
-    "itemId": {
-     "type": "string",
-     "description": "The poll item the user chose."
-    },
-    "pollId": {
-     "type": "string",
-     "description": "The poll the user voted on."
-    }
-   }
-  },
-  "LiveChatSuperChatDetails": {
-   "id": "LiveChatSuperChatDetails",
-   "type": "object",
-   "properties": {
-    "amountDisplayString": {
-     "type": "string",
-     "description": "A rendered string that displays the fund amount and currency to the user."
-    },
-    "amountMicros": {
-     "type": "string",
-     "description": "The amount purchased by the user, in micros (1,750,000 micros = 1.75).",
-     "format": "uint64"
-    },
-    "currency": {
-     "type": "string",
-     "description": "The currency in which the purchase was made."
-    },
-    "tier": {
-     "type": "integer",
-     "description": "The tier in which the amount belongs to. Lower amounts belong to lower tiers. Starts at 1.",
-     "format": "uint32"
-    },
-    "userComment": {
-     "type": "string",
-     "description": "The comment added by the user to this Super Chat event."
-    }
-   }
-  },
-  "LiveChatTextMessageDetails": {
-   "id": "LiveChatTextMessageDetails",
-   "type": "object",
-   "properties": {
-    "messageText": {
-     "type": "string",
-     "description": "The user's message."
-    }
-   }
-  },
-  "LiveChatUserBannedMessageDetails": {
-   "id": "LiveChatUserBannedMessageDetails",
-   "type": "object",
-   "properties": {
-    "banDurationSeconds": {
-     "type": "string",
-     "description": "The duration of the ban. This property is only present if the banType is temporary.",
-     "format": "uint64"
-    },
-    "banType": {
-     "type": "string",
-     "description": "The type of ban.",
-     "enum": [
-      "permanent",
-      "temporary"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "bannedUserDetails": {
-     "$ref": "ChannelProfileDetails",
-     "description": "The details of the user that was banned."
-    }
-   }
-  },
-  "LiveStream": {
-   "id": "LiveStream",
-   "type": "object",
-   "description": "A live stream describes a live ingestion point.",
-   "properties": {
-    "cdn": {
-     "$ref": "CdnSettings",
-     "description": "The cdn object defines the live stream's content delivery network (CDN) settings. These settings provide details about the manner in which you stream your content to YouTube."
-    },
-    "contentDetails": {
-     "$ref": "LiveStreamContentDetails",
-     "description": "The content_details object contains information about the stream, including the closed captions ingestion URL."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube assigns to uniquely identify the stream.",
-     "annotations": {
-      "required": [
-       "youtube.liveStreams.update"
-      ]
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveStream\".",
-     "default": "youtube#liveStream"
-    },
-    "snippet": {
-     "$ref": "LiveStreamSnippet",
-     "description": "The snippet object contains basic details about the stream, including its channel, title, and description."
-    },
-    "status": {
-     "$ref": "LiveStreamStatus",
-     "description": "The status object contains information about live stream's status."
-    }
-   }
-  },
-  "LiveStreamConfigurationIssue": {
-   "id": "LiveStreamConfigurationIssue",
-   "type": "object",
-   "properties": {
-    "description": {
-     "type": "string",
-     "description": "The long-form description of the issue and how to resolve it."
-    },
-    "reason": {
-     "type": "string",
-     "description": "The short-form reason for this issue."
-    },
-    "severity": {
-     "type": "string",
-     "description": "How severe this issue is to the stream.",
-     "enum": [
-      "error",
-      "info",
-      "warning"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "type": {
-     "type": "string",
-     "description": "The kind of error happening.",
-     "enum": [
-      "audioBitrateHigh",
-      "audioBitrateLow",
-      "audioBitrateMismatch",
-      "audioCodec",
-      "audioCodecMismatch",
-      "audioSampleRate",
-      "audioSampleRateMismatch",
-      "audioStereoMismatch",
-      "audioTooManyChannels",
-      "badContainer",
-      "bitrateHigh",
-      "bitrateLow",
-      "frameRateHigh",
-      "framerateMismatch",
-      "gopMismatch",
-      "gopSizeLong",
-      "gopSizeOver",
-      "gopSizeShort",
-      "interlacedVideo",
-      "multipleAudioStreams",
-      "multipleVideoStreams",
-      "noAudioStream",
-      "noVideoStream",
-      "openGop",
-      "resolutionMismatch",
-      "videoBitrateMismatch",
-      "videoCodec",
-      "videoCodecMismatch",
-      "videoIngestionStarved",
-      "videoInterlaceMismatch",
-      "videoProfileMismatch",
-      "videoResolutionSuboptimal",
-      "videoResolutionUnsupported"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "LiveStreamContentDetails": {
-   "id": "LiveStreamContentDetails",
-   "type": "object",
-   "description": "Detailed settings of a stream.",
-   "properties": {
-    "closedCaptionsIngestionUrl": {
-     "type": "string",
-     "description": "The ingestion URL where the closed captions of this stream are sent."
-    },
-    "isReusable": {
-     "type": "boolean",
-     "description": "Indicates whether the stream is reusable, which means that it can be bound to multiple broadcasts. It is common for broadcasters to reuse the same stream for many different broadcasts if those broadcasts occur at different times.\n\nIf you set this value to false, then the stream will not be reusable, which means that it can only be bound to one broadcast. Non-reusable streams differ from reusable streams in the following ways:  \n- A non-reusable stream can only be bound to one broadcast. \n- A non-reusable stream might be deleted by an automated process after the broadcast ends. \n- The  liveStreams.list method does not list non-reusable streams if you call the method and set the mine parameter to true. The only way to use that method to retrieve the resource for a non-reusable stream is to use the id parameter to identify the stream."
-    }
-   }
-  },
-  "LiveStreamHealthStatus": {
-   "id": "LiveStreamHealthStatus",
-   "type": "object",
-   "properties": {
-    "configurationIssues": {
-     "type": "array",
-     "description": "The configurations issues on this stream",
-     "items": {
-      "$ref": "LiveStreamConfigurationIssue"
-     }
-    },
-    "lastUpdateTimeSeconds": {
-     "type": "string",
-     "description": "The last time this status was updated (in seconds)",
-     "format": "uint64"
-    },
-    "status": {
-     "type": "string",
-     "description": "The status code of this stream",
-     "enum": [
-      "bad",
-      "good",
-      "noData",
-      "ok",
-      "revoked"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "LiveStreamListResponse": {
-   "id": "LiveStreamListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of live streams that match the request criteria.",
-     "items": {
-      "$ref": "LiveStream"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#liveStreamListResponse\".",
-     "default": "youtube#liveStreamListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "LiveStreamSnippet": {
-   "id": "LiveStreamSnippet",
-   "type": "object",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the channel that is transmitting the stream."
-    },
-    "description": {
-     "type": "string",
-     "description": "The stream's description. The value cannot be longer than 10000 characters."
-    },
-    "isDefaultStream": {
-     "type": "boolean"
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time that the stream was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "title": {
-     "type": "string",
-     "description": "The stream's title. The value must be between 1 and 128 characters long.",
-     "annotations": {
-      "required": [
-       "youtube.liveStreams.insert",
-       "youtube.liveStreams.update"
-      ]
-     }
-    }
-   }
-  },
-  "LiveStreamStatus": {
-   "id": "LiveStreamStatus",
-   "type": "object",
-   "description": "Brief description of the live stream status.",
-   "properties": {
-    "healthStatus": {
-     "$ref": "LiveStreamHealthStatus",
-     "description": "The health status of the stream."
-    },
-    "streamStatus": {
-     "type": "string",
-     "enum": [
-      "active",
-      "created",
-      "error",
-      "inactive",
-      "ready"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "LocalizedProperty": {
-   "id": "LocalizedProperty",
-   "type": "object",
-   "properties": {
-    "default": {
-     "type": "string"
-    },
-    "defaultLanguage": {
-     "$ref": "LanguageTag",
-     "description": "The language of the default property."
-    },
-    "localized": {
-     "type": "array",
-     "items": {
-      "$ref": "LocalizedString"
-     }
-    }
-   }
-  },
-  "LocalizedString": {
-   "id": "LocalizedString",
-   "type": "object",
-   "properties": {
-    "language": {
-     "type": "string"
-    },
-    "value": {
-     "type": "string"
-    }
-   }
-  },
-  "MonitorStreamInfo": {
-   "id": "MonitorStreamInfo",
-   "type": "object",
-   "description": "Settings and Info of the monitor stream",
-   "properties": {
-    "broadcastStreamDelayMs": {
-     "type": "integer",
-     "description": "If you have set the enableMonitorStream property to true, then this property determines the length of the live broadcast delay.",
-     "format": "uint32",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    },
-    "embedHtml": {
-     "type": "string",
-     "description": "HTML code that embeds a player that plays the monitor stream."
-    },
-    "enableMonitorStream": {
-     "type": "boolean",
-     "description": "This value determines whether the monitor stream is enabled for the broadcast. If the monitor stream is enabled, then YouTube will broadcast the event content on a special stream intended only for the broadcaster's consumption. The broadcaster can use the stream to review the event content and also to identify the optimal times to insert cuepoints.\n\nYou need to set this value to true if you intend to have a broadcast delay for your event.\n\nNote: This property cannot be updated once the broadcast is in the testing or live state.",
-     "annotations": {
-      "required": [
-       "youtube.liveBroadcasts.update"
-      ]
-     }
-    }
-   }
-  },
-  "PageInfo": {
-   "id": "PageInfo",
-   "type": "object",
-   "description": "Paging details for lists of resources, including total number of items available and number of resources returned in a single page.",
-   "properties": {
-    "resultsPerPage": {
-     "type": "integer",
-     "description": "The number of results included in the API response.",
-     "format": "int32"
-    },
-    "totalResults": {
-     "type": "integer",
-     "description": "The total number of results in the result set.",
-     "format": "int32"
-    }
-   }
-  },
-  "Playlist": {
-   "id": "Playlist",
-   "type": "object",
-   "description": "A playlist resource represents a YouTube playlist. A playlist is a collection of videos that can be viewed sequentially and shared with other users. A playlist can contain up to 200 videos, and YouTube does not limit the number of playlists that each user creates. By default, playlists are publicly visible to other users, but playlists can be public or private.\n\nYouTube also uses playlists to identify special collections of videos for a channel, such as:  \n- uploaded videos \n- favorite videos \n- positively rated (liked) videos \n- watch history \n- watch later  To be more specific, these lists are associated with a channel, which is a collection of a person, group, or company's videos, playlists, and other YouTube information. You can retrieve the playlist IDs for each of these lists from the  channel resource for a given channel.\n\nYou can then use the   playlistItems.list method to retrieve any of those lists. You can also add or remove items from those lists by calling the   playlistItems.insert and   playlistItems.delete methods.",
-   "properties": {
-    "contentDetails": {
-     "$ref": "PlaylistContentDetails",
-     "description": "The contentDetails object contains information like video count."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the playlist."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#playlist\".",
-     "default": "youtube#playlist"
-    },
-    "localizations": {
-     "type": "object",
-     "description": "Localizations for different languages",
-     "additionalProperties": {
-      "$ref": "PlaylistLocalization",
-      "description": "The language tag, using string since map_key require simple types."
-     }
-    },
-    "player": {
-     "$ref": "PlaylistPlayer",
-     "description": "The player object contains information that you would use to play the playlist in an embedded player."
-    },
-    "snippet": {
-     "$ref": "PlaylistSnippet",
-     "description": "The snippet object contains basic details about the playlist, such as its title and description."
-    },
-    "status": {
-     "$ref": "PlaylistStatus",
-     "description": "The status object contains status information for the playlist."
-    }
-   }
-  },
-  "PlaylistContentDetails": {
-   "id": "PlaylistContentDetails",
-   "type": "object",
-   "properties": {
-    "itemCount": {
-     "type": "integer",
-     "description": "The number of videos in the playlist.",
-     "format": "uint32"
-    }
-   }
-  },
-  "PlaylistItem": {
-   "id": "PlaylistItem",
-   "type": "object",
-   "description": "A playlistItem resource identifies another resource, such as a video, that is included in a playlist. In addition, the playlistItem  resource contains details about the included resource that pertain specifically to how that resource is used in that playlist.\n\nYouTube uses playlists to identify special collections of videos for a channel, such as:  \n- uploaded videos \n- favorite videos \n- positively rated (liked) videos \n- watch history \n- watch later  To be more specific, these lists are associated with a channel, which is a collection of a person, group, or company's videos, playlists, and other YouTube information.\n\nYou can retrieve the playlist IDs for each of these lists from the  channel resource  for a given channel. You can then use the   playlistItems.list method to retrieve any of those lists. You can also add or remove items from those lists by calling the   playlistItems.insert and   playlistItems.delete methods. For example, if a user gives a positive rating to a video, you would insert that video into the liked videos playlist for that user's channel.",
-   "properties": {
-    "contentDetails": {
-     "$ref": "PlaylistItemContentDetails",
-     "description": "The contentDetails object is included in the resource if the included item is a YouTube video. The object contains additional information about the video."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the playlist item."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#playlistItem\".",
-     "default": "youtube#playlistItem"
-    },
-    "snippet": {
-     "$ref": "PlaylistItemSnippet",
-     "description": "The snippet object contains basic details about the playlist item, such as its title and position in the playlist."
-    },
-    "status": {
-     "$ref": "PlaylistItemStatus",
-     "description": "The status object contains information about the playlist item's privacy status."
-    }
-   }
-  },
-  "PlaylistItemContentDetails": {
-   "id": "PlaylistItemContentDetails",
-   "type": "object",
-   "properties": {
-    "endAt": {
-     "type": "string",
-     "description": "The time, measured in seconds from the start of the video, when the video should stop playing. (The playlist owner can specify the times when the video should start and stop playing when the video is played in the context of the playlist.) By default, assume that the video.endTime is the end of the video."
-    },
-    "note": {
-     "type": "string",
-     "description": "A user-generated note for this item."
-    },
-    "startAt": {
-     "type": "string",
-     "description": "The time, measured in seconds from the start of the video, when the video should start playing. (The playlist owner can specify the times when the video should start and stop playing when the video is played in the context of the playlist.) The default value is 0."
-    },
-    "videoId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify a video. To retrieve the video resource, set the id query parameter to this value in your API request."
-    },
-    "videoPublishedAt": {
-     "type": "string",
-     "description": "The date and time that the video was published to YouTube. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    }
-   }
-  },
-  "PlaylistItemListResponse": {
-   "id": "PlaylistItemListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of playlist items that match the request criteria.",
-     "items": {
-      "$ref": "PlaylistItem"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#playlistItemListResponse\".",
-     "default": "youtube#playlistItemListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "PlaylistItemSnippet": {
-   "id": "PlaylistItemSnippet",
-   "type": "object",
-   "description": "Basic details about a playlist, including title, description and thumbnails.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the user that added the item to the playlist."
-    },
-    "channelTitle": {
-     "type": "string",
-     "description": "Channel title for the channel that the playlist item belongs to."
-    },
-    "description": {
-     "type": "string",
-     "description": "The item's description."
-    },
-    "playlistId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the playlist that the playlist item is in.",
-     "annotations": {
-      "required": [
-       "youtube.playlistItems.insert",
-       "youtube.playlistItems.update"
-      ]
-     }
-    },
-    "position": {
-     "type": "integer",
-     "description": "The order in which the item appears in the playlist. The value uses a zero-based index, so the first item has a position of 0, the second item has a position of 1, and so forth.",
-     "format": "uint32"
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time that the item was added to the playlist. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The id object contains information that can be used to uniquely identify the resource that is included in the playlist as the playlist item.",
-     "annotations": {
-      "required": [
-       "youtube.playlistItems.insert",
-       "youtube.playlistItems.update"
-      ]
-     }
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "A map of thumbnail images associated with the playlist item. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail."
-    },
-    "title": {
-     "type": "string",
-     "description": "The item's title."
-    }
-   }
-  },
-  "PlaylistItemStatus": {
-   "id": "PlaylistItemStatus",
-   "type": "object",
-   "description": "Information about the playlist item's privacy status.",
-   "properties": {
-    "privacyStatus": {
-     "type": "string",
-     "description": "This resource's privacy status.",
-     "enum": [
-      "private",
-      "public",
-      "unlisted"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "PlaylistListResponse": {
-   "id": "PlaylistListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of playlists that match the request criteria.",
-     "items": {
-      "$ref": "Playlist"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#playlistListResponse\".",
-     "default": "youtube#playlistListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "PlaylistLocalization": {
-   "id": "PlaylistLocalization",
-   "type": "object",
-   "description": "Playlist localization setting",
-   "properties": {
-    "description": {
-     "type": "string",
-     "description": "The localized strings for playlist's description."
-    },
-    "title": {
-     "type": "string",
-     "description": "The localized strings for playlist's title."
-    }
-   }
-  },
-  "PlaylistPlayer": {
-   "id": "PlaylistPlayer",
-   "type": "object",
-   "properties": {
-    "embedHtml": {
-     "type": "string",
-     "description": "An \u003ciframe\u003e tag that embeds a player that will play the playlist."
-    }
-   }
-  },
-  "PlaylistSnippet": {
-   "id": "PlaylistSnippet",
-   "type": "object",
-   "description": "Basic details about a playlist, including title, description and thumbnails.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the channel that published the playlist."
-    },
-    "channelTitle": {
-     "type": "string",
-     "description": "The channel title of the channel that the video belongs to."
-    },
-    "defaultLanguage": {
-     "type": "string",
-     "description": "The language of the playlist's default title and description."
-    },
-    "description": {
-     "type": "string",
-     "description": "The playlist's description."
-    },
-    "localized": {
-     "$ref": "PlaylistLocalization",
-     "description": "Localized title and description, read-only."
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time that the playlist was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "tags": {
-     "type": "array",
-     "description": "Keyword tags associated with the playlist.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "A map of thumbnail images associated with the playlist. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail."
-    },
-    "title": {
-     "type": "string",
-     "description": "The playlist's title.",
-     "annotations": {
-      "required": [
-       "youtube.playlists.insert",
-       "youtube.playlists.update"
-      ]
-     }
-    }
-   }
-  },
-  "PlaylistStatus": {
-   "id": "PlaylistStatus",
-   "type": "object",
-   "properties": {
-    "privacyStatus": {
-     "type": "string",
-     "description": "The playlist's privacy status.",
-     "enum": [
-      "private",
-      "public",
-      "unlisted"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "PromotedItem": {
-   "id": "PromotedItem",
-   "type": "object",
-   "description": "Describes a single promoted item.",
-   "properties": {
-    "customMessage": {
-     "type": "string",
-     "description": "A custom message to display for this promotion. This field is currently ignored unless the promoted item is a website."
-    },
-    "id": {
-     "$ref": "PromotedItemId",
-     "description": "Identifies the promoted item."
-    },
-    "promotedByContentOwner": {
-     "type": "boolean",
-     "description": "If true, the content owner's name will be used when displaying the promotion. This field can only be set when the update is made on behalf of the content owner."
-    },
-    "timing": {
-     "$ref": "InvideoTiming",
-     "description": "The temporal position within the video where the promoted item will be displayed. If present, it overrides the default timing."
-    }
-   }
-  },
-  "PromotedItemId": {
-   "id": "PromotedItemId",
-   "type": "object",
-   "description": "Describes a single promoted item id. It is a union of various possible types.",
-   "properties": {
-    "recentlyUploadedBy": {
-     "type": "string",
-     "description": "If type is recentUpload, this field identifies the channel from which to take the recent upload. If missing, the channel is assumed to be the same channel for which the invideoPromotion is set."
-    },
-    "type": {
-     "type": "string",
-     "description": "Describes the type of the promoted item.",
-     "enum": [
-      "recentUpload",
-      "video",
-      "website"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "videoId": {
-     "type": "string",
-     "description": "If the promoted item represents a video, this field represents the unique YouTube ID identifying it. This field will be present only if type has the value video."
-    },
-    "websiteUrl": {
-     "type": "string",
-     "description": "If the promoted item represents a website, this field represents the url pointing to the website. This field will be present only if type has the value website."
-    }
-   }
-  },
-  "PropertyValue": {
-   "id": "PropertyValue",
-   "type": "object",
-   "description": "A pair Property / Value.",
-   "properties": {
-    "property": {
-     "type": "string",
-     "description": "A property."
-    },
-    "value": {
-     "type": "string",
-     "description": "The property's value."
-    }
-   }
-  },
-  "ResourceId": {
-   "id": "ResourceId",
-   "type": "object",
-   "description": "A resource id is a generic reference that points to another YouTube resource.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the referred resource, if that resource is a channel. This property is only present if the resourceId.kind value is youtube#channel."
-    },
-    "kind": {
-     "type": "string",
-     "description": "The type of the API resource."
-    },
-    "playlistId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the referred resource, if that resource is a playlist. This property is only present if the resourceId.kind value is youtube#playlist."
-    },
-    "videoId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the referred resource, if that resource is a video. This property is only present if the resourceId.kind value is youtube#video."
-    }
-   }
-  },
-  "SearchListResponse": {
-   "id": "SearchListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of results that match the search criteria.",
-     "items": {
-      "$ref": "SearchResult"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#searchListResponse\".",
-     "default": "youtube#searchListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "regionCode": {
-     "type": "string"
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "SearchResult": {
-   "id": "SearchResult",
-   "type": "object",
-   "description": "A search result contains information about a YouTube video, channel, or playlist that matches the search parameters specified in an API request. While a search result points to a uniquely identifiable resource, like a video, it does not have its own persistent data.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "$ref": "ResourceId",
-     "description": "The id object contains information that can be used to uniquely identify the resource that matches the search request."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#searchResult\".",
-     "default": "youtube#searchResult"
-    },
-    "snippet": {
-     "$ref": "SearchResultSnippet",
-     "description": "The snippet object contains basic details about a search result, such as its title or description. For example, if the search result is a video, then the title will be the video's title and the description will be the video's description."
-    }
-   }
-  },
-  "SearchResultSnippet": {
-   "id": "SearchResultSnippet",
-   "type": "object",
-   "description": "Basic details about a search result, including title, description and thumbnails of the item referenced by the search result.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The value that YouTube uses to uniquely identify the channel that published the resource that the search result identifies."
-    },
-    "channelTitle": {
-     "type": "string",
-     "description": "The title of the channel that published the resource that the search result identifies."
-    },
-    "description": {
-     "type": "string",
-     "description": "A description of the search result."
-    },
-    "liveBroadcastContent": {
-     "type": "string",
-     "description": "It indicates if the resource (video or channel) has upcoming/active live broadcast content. Or it's \"none\" if there is not any upcoming/active live broadcasts.",
-     "enum": [
-      "live",
-      "none",
-      "upcoming"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The creation date and time of the resource that the search result identifies. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "A map of thumbnail images associated with the search result. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail."
-    },
-    "title": {
-     "type": "string",
-     "description": "The title of the search result."
-    }
-   }
-  },
-  "Sponsor": {
-   "id": "Sponsor",
-   "type": "object",
-   "description": "A sponsor resource represents a sponsor for a YouTube channel. A sponsor provides recurring monetary support to a creator and receives special benefits.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube assigns to uniquely identify the sponsor."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#sponsor\".",
-     "default": "youtube#sponsor"
-    },
-    "snippet": {
-     "$ref": "SponsorSnippet",
-     "description": "The snippet object contains basic details about the sponsor."
-    }
-   }
-  },
-  "SponsorListResponse": {
-   "id": "SponsorListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of sponsors that match the request criteria.",
-     "items": {
-      "$ref": "Sponsor"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#sponsorListResponse\".",
-     "default": "youtube#sponsorListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "SponsorSnippet": {
-   "id": "SponsorSnippet",
-   "type": "object",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The id of the channel being sponsored."
-    },
-    "sponsorDetails": {
-     "$ref": "ChannelProfileDetails",
-     "description": "Details about the sponsor."
-    },
-    "sponsorSince": {
-     "type": "string",
-     "description": "The date and time when the user became a sponsor. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    }
-   }
-  },
-  "Subscription": {
-   "id": "Subscription",
-   "type": "object",
-   "description": "A subscription resource contains information about a YouTube user subscription. A subscription notifies a user when new videos are added to a channel or when another user takes one of several actions on YouTube, such as uploading a video, rating a video, or commenting on a video.",
-   "properties": {
-    "contentDetails": {
-     "$ref": "SubscriptionContentDetails",
-     "description": "The contentDetails object contains basic statistics about the subscription."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the subscription."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#subscription\".",
-     "default": "youtube#subscription"
-    },
-    "snippet": {
-     "$ref": "SubscriptionSnippet",
-     "description": "The snippet object contains basic details about the subscription, including its title and the channel that the user subscribed to."
-    },
-    "subscriberSnippet": {
-     "$ref": "SubscriptionSubscriberSnippet",
-     "description": "The subscriberSnippet object contains basic details about the sbuscriber."
-    }
-   }
-  },
-  "SubscriptionContentDetails": {
-   "id": "SubscriptionContentDetails",
-   "type": "object",
-   "description": "Details about the content to witch a subscription refers.",
-   "properties": {
-    "activityType": {
-     "type": "string",
-     "description": "The type of activity this subscription is for (only uploads, everything).",
-     "enum": [
-      "all",
-      "uploads"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "newItemCount": {
-     "type": "integer",
-     "description": "The number of new items in the subscription since its content was last read.",
-     "format": "uint32"
-    },
-    "totalItemCount": {
-     "type": "integer",
-     "description": "The approximate number of items that the subscription points to.",
-     "format": "uint32"
-    }
-   }
-  },
-  "SubscriptionListResponse": {
-   "id": "SubscriptionListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of subscriptions that match the request criteria.",
-     "items": {
-      "$ref": "Subscription"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#subscriptionListResponse\".",
-     "default": "youtube#subscriptionListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "SubscriptionSnippet": {
-   "id": "SubscriptionSnippet",
-   "type": "object",
-   "description": "Basic details about a subscription, including title, description and thumbnails of the subscribed item.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the subscriber's channel."
-    },
-    "channelTitle": {
-     "type": "string",
-     "description": "Channel title for the channel that the subscription belongs to."
-    },
-    "description": {
-     "type": "string",
-     "description": "The subscription's details."
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time that the subscription was created. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "resourceId": {
-     "$ref": "ResourceId",
-     "description": "The id object contains information about the channel that the user subscribed to.",
-     "annotations": {
-      "required": [
-       "youtube.subscriptions.insert"
-      ]
-     }
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "A map of thumbnail images associated with the video. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail."
-    },
-    "title": {
-     "type": "string",
-     "description": "The subscription's title."
-    }
-   }
-  },
-  "SubscriptionSubscriberSnippet": {
-   "id": "SubscriptionSubscriberSnippet",
-   "type": "object",
-   "description": "Basic details about a subscription's subscriber including title, description, channel ID and thumbnails.",
-   "properties": {
-    "channelId": {
-     "type": "string",
-     "description": "The channel ID of the subscriber."
-    },
-    "description": {
-     "type": "string",
-     "description": "The description of the subscriber."
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "Thumbnails for this subscriber."
-    },
-    "title": {
-     "type": "string",
-     "description": "The title of the subscriber."
-    }
-   }
-  },
-  "SuperChatEvent": {
-   "id": "SuperChatEvent",
-   "type": "object",
-   "description": "A superChatEvent resource represents a Super Chat purchase on a YouTube channel.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube assigns to uniquely identify the Super Chat event."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#superChatEvent\".",
-     "default": "youtube#superChatEvent"
-    },
-    "snippet": {
-     "$ref": "SuperChatEventSnippet",
-     "description": "The snippet object contains basic details about the Super Chat event."
-    }
-   }
-  },
-  "SuperChatEventListResponse": {
-   "id": "SuperChatEventListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of Super Chat purchases that match the request criteria.",
-     "items": {
-      "$ref": "SuperChatEvent"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#superChatEventListResponse\".",
-     "default": "youtube#superChatEventListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "SuperChatEventSnippet": {
-   "id": "SuperChatEventSnippet",
-   "type": "object",
-   "properties": {
-    "amountMicros": {
-     "type": "string",
-     "description": "The purchase amount, in micros of the purchase currency. e.g., 1 is represented as 1000000.",
-     "format": "uint64"
-    },
-    "channelId": {
-     "type": "string",
-     "description": "Channel id where the event occurred."
-    },
-    "commentText": {
-     "type": "string",
-     "description": "The text contents of the comment left by the user."
-    },
-    "createdAt": {
-     "type": "string",
-     "description": "The date and time when the event occurred. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "currency": {
-     "type": "string",
-     "description": "The currency in which the purchase was made. ISO 4217."
-    },
-    "displayString": {
-     "type": "string",
-     "description": "A rendered string that displays the purchase amount and currency (e.g., \"$1.00\"). The string is rendered for the given language."
-    },
-    "messageType": {
-     "type": "integer",
-     "description": "The tier for the paid message, which is based on the amount of money spent to purchase the message.",
-     "format": "uint32"
-    },
-    "supporterDetails": {
-     "$ref": "ChannelProfileDetails",
-     "description": "Details about the supporter."
-    }
-   }
-  },
-  "Thumbnail": {
-   "id": "Thumbnail",
-   "type": "object",
-   "description": "A thumbnail is an image representing a YouTube resource.",
-   "properties": {
-    "height": {
-     "type": "integer",
-     "description": "(Optional) Height of the thumbnail image.",
-     "format": "uint32"
-    },
-    "url": {
-     "type": "string",
-     "description": "The thumbnail image's URL."
-    },
-    "width": {
-     "type": "integer",
-     "description": "(Optional) Width of the thumbnail image.",
-     "format": "uint32"
-    }
-   }
-  },
-  "ThumbnailDetails": {
-   "id": "ThumbnailDetails",
-   "type": "object",
-   "description": "Internal representation of thumbnails for a YouTube resource.",
-   "properties": {
-    "default": {
-     "$ref": "Thumbnail",
-     "description": "The default image for this resource."
-    },
-    "high": {
-     "$ref": "Thumbnail",
-     "description": "The high quality image for this resource."
-    },
-    "maxres": {
-     "$ref": "Thumbnail",
-     "description": "The maximum resolution quality image for this resource."
-    },
-    "medium": {
-     "$ref": "Thumbnail",
-     "description": "The medium quality image for this resource."
-    },
-    "standard": {
-     "$ref": "Thumbnail",
-     "description": "The standard quality image for this resource."
-    }
-   }
-  },
-  "ThumbnailSetResponse": {
-   "id": "ThumbnailSetResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of thumbnails.",
-     "items": {
-      "$ref": "ThumbnailDetails"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#thumbnailSetResponse\".",
-     "default": "youtube#thumbnailSetResponse"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "TokenPagination": {
-   "id": "TokenPagination",
-   "type": "object",
-   "description": "Stub token pagination template to suppress results."
-  },
-  "Video": {
-   "id": "Video",
-   "type": "object",
-   "description": "A video resource represents a YouTube video.",
-   "properties": {
-    "ageGating": {
-     "$ref": "VideoAgeGating",
-     "description": "Age restriction details related to a video. This data can only be retrieved by the video owner."
-    },
-    "contentDetails": {
-     "$ref": "VideoContentDetails",
-     "description": "The contentDetails object contains information about the video content, including the length of the video and its aspect ratio."
-    },
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "fileDetails": {
-     "$ref": "VideoFileDetails",
-     "description": "The fileDetails object encapsulates information about the video file that was uploaded to YouTube, including the file's resolution, duration, audio and video codecs, stream bitrates, and more. This data can only be retrieved by the video owner."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the video.",
-     "annotations": {
-      "required": [
-       "youtube.videos.update"
-      ]
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#video\".",
-     "default": "youtube#video"
-    },
-    "liveStreamingDetails": {
-     "$ref": "VideoLiveStreamingDetails",
-     "description": "The liveStreamingDetails object contains metadata about a live video broadcast. The object will only be present in a video resource if the video is an upcoming, live, or completed live broadcast."
-    },
-    "localizations": {
-     "type": "object",
-     "description": "List with all localizations.",
-     "additionalProperties": {
-      "$ref": "VideoLocalization",
-      "description": "The language tag, using string since map_key require simple types."
-     }
-    },
-    "monetizationDetails": {
-     "$ref": "VideoMonetizationDetails",
-     "description": "The monetizationDetails object encapsulates information about the monetization status of the video."
-    },
-    "player": {
-     "$ref": "VideoPlayer",
-     "description": "The player object contains information that you would use to play the video in an embedded player."
-    },
-    "processingDetails": {
-     "$ref": "VideoProcessingDetails",
-     "description": "The processingProgress object encapsulates information about YouTube's progress in processing the uploaded video file. The properties in the object identify the current processing status and an estimate of the time remaining until YouTube finishes processing the video. This part also indicates whether different types of data or content, such as file details or thumbnail images, are available for the video.\n\nThe processingProgress object is designed to be polled so that the video uploaded can track the progress that YouTube has made in processing the uploaded video file. This data can only be retrieved by the video owner."
-    },
-    "projectDetails": {
-     "$ref": "VideoProjectDetails",
-     "description": "The projectDetails object contains information about the project specific video metadata."
-    },
-    "recordingDetails": {
-     "$ref": "VideoRecordingDetails",
-     "description": "The recordingDetails object encapsulates information about the location, date and address where the video was recorded."
-    },
-    "snippet": {
-     "$ref": "VideoSnippet",
-     "description": "The snippet object contains basic details about the video, such as its title, description, and category."
-    },
-    "statistics": {
-     "$ref": "VideoStatistics",
-     "description": "The statistics object contains statistics about the video."
-    },
-    "status": {
-     "$ref": "VideoStatus",
-     "description": "The status object contains information about the video's uploading, processing, and privacy statuses."
-    },
-    "suggestions": {
-     "$ref": "VideoSuggestions",
-     "description": "The suggestions object encapsulates suggestions that identify opportunities to improve the video quality or the metadata for the uploaded video. This data can only be retrieved by the video owner."
-    },
-    "topicDetails": {
-     "$ref": "VideoTopicDetails",
-     "description": "The topicDetails object encapsulates information about Freebase topics associated with the video."
-    }
-   }
-  },
-  "VideoAbuseReport": {
-   "id": "VideoAbuseReport",
-   "type": "object",
-   "properties": {
-    "comments": {
-     "type": "string",
-     "description": "Additional comments regarding the abuse report."
-    },
-    "language": {
-     "type": "string",
-     "description": "The language that the content was viewed in."
-    },
-    "reasonId": {
-     "type": "string",
-     "description": "The high-level, or primary, reason that the content is abusive. The value is an abuse report reason ID."
-    },
-    "secondaryReasonId": {
-     "type": "string",
-     "description": "The specific, or secondary, reason that this content is abusive (if available). The value is an abuse report reason ID that is a valid secondary reason for the primary reason."
-    },
-    "videoId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the video."
-    }
-   }
-  },
-  "VideoAbuseReportReason": {
-   "id": "VideoAbuseReportReason",
-   "type": "object",
-   "description": "A videoAbuseReportReason resource identifies a reason that a video could be reported as abusive. Video abuse report reasons are used with video.ReportAbuse.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID of this abuse report reason."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoAbuseReportReason\".",
-     "default": "youtube#videoAbuseReportReason"
-    },
-    "snippet": {
-     "$ref": "VideoAbuseReportReasonSnippet",
-     "description": "The snippet object contains basic details about the abuse report reason."
-    }
-   }
-  },
-  "VideoAbuseReportReasonListResponse": {
-   "id": "VideoAbuseReportReasonListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of valid abuse reasons that are used with video.ReportAbuse.",
-     "items": {
-      "$ref": "VideoAbuseReportReason"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoAbuseReportReasonListResponse\".",
-     "default": "youtube#videoAbuseReportReasonListResponse"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "VideoAbuseReportReasonSnippet": {
-   "id": "VideoAbuseReportReasonSnippet",
-   "type": "object",
-   "description": "Basic details about a video category, such as its localized title.",
-   "properties": {
-    "label": {
-     "type": "string",
-     "description": "The localized label belonging to this abuse report reason."
-    },
-    "secondaryReasons": {
-     "type": "array",
-     "description": "The secondary reasons associated with this reason, if any are available. (There might be 0 or more.)",
-     "items": {
-      "$ref": "VideoAbuseReportSecondaryReason"
-     }
-    }
-   }
-  },
-  "VideoAbuseReportSecondaryReason": {
-   "id": "VideoAbuseReportSecondaryReason",
-   "type": "object",
-   "properties": {
-    "id": {
-     "type": "string",
-     "description": "The ID of this abuse report secondary reason."
-    },
-    "label": {
-     "type": "string",
-     "description": "The localized label for this abuse report secondary reason."
-    }
-   }
-  },
-  "VideoAgeGating": {
-   "id": "VideoAgeGating",
-   "type": "object",
-   "properties": {
-    "alcoholContent": {
-     "type": "boolean",
-     "description": "Indicates whether or not the video has alcoholic beverage content. Only users of legal purchasing age in a particular country, as identified by ICAP, can view the content."
-    },
-    "restricted": {
-     "type": "boolean",
-     "description": "Age-restricted trailers. For redband trailers and adult-rated video-games. Only users aged 18+ can view the content. The the field is true the content is restricted to viewers aged 18+. Otherwise The field won't be present."
-    },
-    "videoGameRating": {
-     "type": "string",
-     "description": "Video game rating, if any.",
-     "enum": [
-      "anyone",
-      "m15Plus",
-      "m16Plus",
-      "m17Plus"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "VideoCategory": {
-   "id": "VideoCategory",
-   "type": "object",
-   "description": "A videoCategory resource identifies a category that has been or could be associated with uploaded videos.",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "id": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the video category."
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoCategory\".",
-     "default": "youtube#videoCategory"
-    },
-    "snippet": {
-     "$ref": "VideoCategorySnippet",
-     "description": "The snippet object contains basic details about the video category, including its title."
-    }
-   }
-  },
-  "VideoCategoryListResponse": {
-   "id": "VideoCategoryListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of video categories that can be associated with YouTube videos. In this map, the video category ID is the map key, and its value is the corresponding videoCategory resource.",
-     "items": {
-      "$ref": "VideoCategory"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoCategoryListResponse\".",
-     "default": "youtube#videoCategoryListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "VideoCategorySnippet": {
-   "id": "VideoCategorySnippet",
-   "type": "object",
-   "description": "Basic details about a video category, such as its localized title.",
-   "properties": {
-    "assignable": {
-     "type": "boolean"
-    },
-    "channelId": {
-     "type": "string",
-     "description": "The YouTube channel that created the video category.",
-     "default": "UCBR8-60-B28hp2BmDPdntcQ"
-    },
-    "title": {
-     "type": "string",
-     "description": "The video category's title."
-    }
-   }
-  },
-  "VideoContentDetails": {
-   "id": "VideoContentDetails",
-   "type": "object",
-   "description": "Details about the content of a YouTube Video.",
-   "properties": {
-    "caption": {
-     "type": "string",
-     "description": "The value of captions indicates whether the video has captions or not.",
-     "enum": [
-      "false",
-      "true"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "contentRating": {
-     "$ref": "ContentRating",
-     "description": "Specifies the ratings that the video received under various rating schemes."
-    },
-    "countryRestriction": {
-     "$ref": "AccessPolicy",
-     "description": "The countryRestriction object contains information about the countries where a video is (or is not) viewable."
-    },
-    "definition": {
-     "type": "string",
-     "description": "The value of definition indicates whether the video is available in high definition or only in standard definition.",
-     "enum": [
-      "hd",
-      "sd"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "dimension": {
-     "type": "string",
-     "description": "The value of dimension indicates whether the video is available in 3D or in 2D."
-    },
-    "duration": {
-     "type": "string",
-     "description": "The length of the video. The tag value is an ISO 8601 duration in the format PT#M#S, in which the letters PT indicate that the value specifies a period of time, and the letters M and S refer to length in minutes and seconds, respectively. The # characters preceding the M and S letters are both integers that specify the number of minutes (or seconds) of the video. For example, a value of PT15M51S indicates that the video is 15 minutes and 51 seconds long."
-    },
-    "hasCustomThumbnail": {
-     "type": "boolean",
-     "description": "Indicates whether the video uploader has provided a custom thumbnail image for the video. This property is only visible to the video uploader."
-    },
-    "licensedContent": {
-     "type": "boolean",
-     "description": "The value of is_license_content indicates whether the video is licensed content."
-    },
-    "projection": {
-     "type": "string",
-     "description": "Specifies the projection format of the video.",
-     "enum": [
-      "360",
-      "rectangular"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "regionRestriction": {
-     "$ref": "VideoContentDetailsRegionRestriction",
-     "description": "The regionRestriction object contains information about the countries where a video is (or is not) viewable. The object will contain either the contentDetails.regionRestriction.allowed property or the contentDetails.regionRestriction.blocked property."
-    }
-   }
-  },
-  "VideoContentDetailsRegionRestriction": {
-   "id": "VideoContentDetailsRegionRestriction",
-   "type": "object",
-   "description": "DEPRECATED Region restriction of the video.",
-   "properties": {
-    "allowed": {
-     "type": "array",
-     "description": "A list of region codes that identify countries where the video is viewable. If this property is present and a country is not listed in its value, then the video is blocked from appearing in that country. If this property is present and contains an empty list, the video is blocked in all countries.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "blocked": {
-     "type": "array",
-     "description": "A list of region codes that identify countries where the video is blocked. If this property is present and a country is not listed in its value, then the video is viewable in that country. If this property is present and contains an empty list, the video is viewable in all countries.",
-     "items": {
-      "type": "string"
-     }
-    }
-   }
-  },
-  "VideoFileDetails": {
-   "id": "VideoFileDetails",
-   "type": "object",
-   "description": "Describes original video file properties, including technical details about audio and video streams, but also metadata information like content length, digitization time, or geotagging information.",
-   "properties": {
-    "audioStreams": {
-     "type": "array",
-     "description": "A list of audio streams contained in the uploaded video file. Each item in the list contains detailed metadata about an audio stream.",
-     "items": {
-      "$ref": "VideoFileDetailsAudioStream"
-     }
-    },
-    "bitrateBps": {
-     "type": "string",
-     "description": "The uploaded video file's combined (video and audio) bitrate in bits per second.",
-     "format": "uint64"
-    },
-    "container": {
-     "type": "string",
-     "description": "The uploaded video file's container format."
-    },
-    "creationTime": {
-     "type": "string",
-     "description": "The date and time when the uploaded video file was created. The value is specified in ISO 8601 format. Currently, the following ISO 8601 formats are supported:  \n- Date only: YYYY-MM-DD \n- Naive time: YYYY-MM-DDTHH:MM:SS \n- Time with timezone: YYYY-MM-DDTHH:MM:SS+HH:MM"
-    },
-    "durationMs": {
-     "type": "string",
-     "description": "The length of the uploaded video in milliseconds.",
-     "format": "uint64"
-    },
-    "fileName": {
-     "type": "string",
-     "description": "The uploaded file's name. This field is present whether a video file or another type of file was uploaded."
-    },
-    "fileSize": {
-     "type": "string",
-     "description": "The uploaded file's size in bytes. This field is present whether a video file or another type of file was uploaded.",
-     "format": "uint64"
-    },
-    "fileType": {
-     "type": "string",
-     "description": "The uploaded file's type as detected by YouTube's video processing engine. Currently, YouTube only processes video files, but this field is present whether a video file or another type of file was uploaded.",
-     "enum": [
-      "archive",
-      "audio",
-      "document",
-      "image",
-      "other",
-      "project",
-      "video"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "videoStreams": {
-     "type": "array",
-     "description": "A list of video streams contained in the uploaded video file. Each item in the list contains detailed metadata about a video stream.",
-     "items": {
-      "$ref": "VideoFileDetailsVideoStream"
-     }
-    }
-   }
-  },
-  "VideoFileDetailsAudioStream": {
-   "id": "VideoFileDetailsAudioStream",
-   "type": "object",
-   "description": "Information about an audio stream.",
-   "properties": {
-    "bitrateBps": {
-     "type": "string",
-     "description": "The audio stream's bitrate, in bits per second.",
-     "format": "uint64"
-    },
-    "channelCount": {
-     "type": "integer",
-     "description": "The number of audio channels that the stream contains.",
-     "format": "uint32"
-    },
-    "codec": {
-     "type": "string",
-     "description": "The audio codec that the stream uses."
-    },
-    "vendor": {
-     "type": "string",
-     "description": "A value that uniquely identifies a video vendor. Typically, the value is a four-letter vendor code."
-    }
-   }
-  },
-  "VideoFileDetailsVideoStream": {
-   "id": "VideoFileDetailsVideoStream",
-   "type": "object",
-   "description": "Information about a video stream.",
-   "properties": {
-    "aspectRatio": {
-     "type": "number",
-     "description": "The video content's display aspect ratio, which specifies the aspect ratio in which the video should be displayed.",
-     "format": "double"
-    },
-    "bitrateBps": {
-     "type": "string",
-     "description": "The video stream's bitrate, in bits per second.",
-     "format": "uint64"
-    },
-    "codec": {
-     "type": "string",
-     "description": "The video codec that the stream uses."
-    },
-    "frameRateFps": {
-     "type": "number",
-     "description": "The video stream's frame rate, in frames per second.",
-     "format": "double"
-    },
-    "heightPixels": {
-     "type": "integer",
-     "description": "The encoded video content's height in pixels.",
-     "format": "uint32"
-    },
-    "rotation": {
-     "type": "string",
-     "description": "The amount that YouTube needs to rotate the original source content to properly display the video.",
-     "enum": [
-      "clockwise",
-      "counterClockwise",
-      "none",
-      "other",
-      "upsideDown"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "vendor": {
-     "type": "string",
-     "description": "A value that uniquely identifies a video vendor. Typically, the value is a four-letter vendor code."
-    },
-    "widthPixels": {
-     "type": "integer",
-     "description": "The encoded video content's width in pixels. You can calculate the video's encoding aspect ratio as width_pixels / height_pixels.",
-     "format": "uint32"
-    }
-   }
-  },
-  "VideoGetRatingResponse": {
-   "id": "VideoGetRatingResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of ratings that match the request criteria.",
-     "items": {
-      "$ref": "VideoRating"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoGetRatingResponse\".",
-     "default": "youtube#videoGetRatingResponse"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "VideoListResponse": {
-   "id": "VideoListResponse",
-   "type": "object",
-   "properties": {
-    "etag": {
-     "type": "string",
-     "description": "Etag of this resource."
-    },
-    "eventId": {
-     "type": "string",
-     "description": "Serialized EventId of the request which produced this response."
-    },
-    "items": {
-     "type": "array",
-     "description": "A list of videos that match the request criteria.",
-     "items": {
-      "$ref": "Video"
-     }
-    },
-    "kind": {
-     "type": "string",
-     "description": "Identifies what kind of resource this is. Value: the fixed string \"youtube#videoListResponse\".",
-     "default": "youtube#videoListResponse"
-    },
-    "nextPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the next page in the result set."
-    },
-    "pageInfo": {
-     "$ref": "PageInfo"
-    },
-    "prevPageToken": {
-     "type": "string",
-     "description": "The token that can be used as the value of the pageToken parameter to retrieve the previous page in the result set."
-    },
-    "tokenPagination": {
-     "$ref": "TokenPagination"
-    },
-    "visitorId": {
-     "type": "string",
-     "description": "The visitorId identifies the visitor."
-    }
-   }
-  },
-  "VideoLiveStreamingDetails": {
-   "id": "VideoLiveStreamingDetails",
-   "type": "object",
-   "description": "Details about the live streaming metadata.",
-   "properties": {
-    "activeLiveChatId": {
-     "type": "string",
-     "description": "The ID of the currently active live chat attached to this video. This field is filled only if the video is a currently live broadcast that has live chat. Once the broadcast transitions to complete this field will be removed and the live chat closed down. For persistent broadcasts that live chat id will no longer be tied to this video but rather to the new video being displayed at the persistent page."
-    },
-    "actualEndTime": {
-     "type": "string",
-     "description": "The time that the broadcast actually ended. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format. This value will not be available until the broadcast is over.",
-     "format": "date-time"
-    },
-    "actualStartTime": {
-     "type": "string",
-     "description": "The time that the broadcast actually started. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format. This value will not be available until the broadcast begins.",
-     "format": "date-time"
-    },
-    "concurrentViewers": {
-     "type": "string",
-     "description": "The number of viewers currently watching the broadcast. The property and its value will be present if the broadcast has current viewers and the broadcast owner has not hidden the viewcount for the video. Note that YouTube stops tracking the number of concurrent viewers for a broadcast when the broadcast ends. So, this property would not identify the number of viewers watching an archived video of a live broadcast that already ended.",
-     "format": "uint64"
-    },
-    "scheduledEndTime": {
-     "type": "string",
-     "description": "The time that the broadcast is scheduled to end. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format. If the value is empty or the property is not present, then the broadcast is scheduled to continue indefinitely.",
-     "format": "date-time"
-    },
-    "scheduledStartTime": {
-     "type": "string",
-     "description": "The time that the broadcast is scheduled to begin. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    }
-   }
-  },
-  "VideoLocalization": {
-   "id": "VideoLocalization",
-   "type": "object",
-   "description": "Localized versions of certain video properties (e.g. title).",
-   "properties": {
-    "description": {
-     "type": "string",
-     "description": "Localized version of the video's description."
-    },
-    "title": {
-     "type": "string",
-     "description": "Localized version of the video's title."
-    }
-   }
-  },
-  "VideoMonetizationDetails": {
-   "id": "VideoMonetizationDetails",
-   "type": "object",
-   "description": "Details about monetization of a YouTube Video.",
-   "properties": {
-    "access": {
-     "$ref": "AccessPolicy",
-     "description": "The value of access indicates whether the video can be monetized or not."
-    }
-   }
-  },
-  "VideoPlayer": {
-   "id": "VideoPlayer",
-   "type": "object",
-   "description": "Player to be used for a video playback.",
-   "properties": {
-    "embedHeight": {
-     "type": "string",
-     "format": "int64"
-    },
-    "embedHtml": {
-     "type": "string",
-     "description": "An \u003ciframe\u003e tag that embeds a player that will play the video."
-    },
-    "embedWidth": {
-     "type": "string",
-     "description": "The embed width",
-     "format": "int64"
-    }
-   }
-  },
-  "VideoProcessingDetails": {
-   "id": "VideoProcessingDetails",
-   "type": "object",
-   "description": "Describes processing status and progress and availability of some other Video resource parts.",
-   "properties": {
-    "editorSuggestionsAvailability": {
-     "type": "string",
-     "description": "This value indicates whether video editing suggestions, which might improve video quality or the playback experience, are available for the video. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request."
-    },
-    "fileDetailsAvailability": {
-     "type": "string",
-     "description": "This value indicates whether file details are available for the uploaded video. You can retrieve a video's file details by requesting the fileDetails part in your videos.list() request."
-    },
-    "processingFailureReason": {
-     "type": "string",
-     "description": "The reason that YouTube failed to process the video. This property will only have a value if the processingStatus property's value is failed.",
-     "enum": [
-      "other",
-      "streamingFailed",
-      "transcodeFailed",
-      "uploadFailed"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "processingIssuesAvailability": {
-     "type": "string",
-     "description": "This value indicates whether the video processing engine has generated suggestions that might improve YouTube's ability to process the the video, warnings that explain video processing problems, or errors that cause video processing problems. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request."
-    },
-    "processingProgress": {
-     "$ref": "VideoProcessingDetailsProcessingProgress",
-     "description": "The processingProgress object contains information about the progress YouTube has made in processing the video. The values are really only relevant if the video's processing status is processing."
-    },
-    "processingStatus": {
-     "type": "string",
-     "description": "The video's processing status. This value indicates whether YouTube was able to process the video or if the video is still being processed.",
-     "enum": [
-      "failed",
-      "processing",
-      "succeeded",
-      "terminated"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "tagSuggestionsAvailability": {
-     "type": "string",
-     "description": "This value indicates whether keyword (tag) suggestions are available for the video. Tags can be added to a video's metadata to make it easier for other users to find the video. You can retrieve these suggestions by requesting the suggestions part in your videos.list() request."
-    },
-    "thumbnailsAvailability": {
-     "type": "string",
-     "description": "This value indicates whether thumbnail images have been generated for the video."
-    }
-   }
-  },
-  "VideoProcessingDetailsProcessingProgress": {
-   "id": "VideoProcessingDetailsProcessingProgress",
-   "type": "object",
-   "description": "Video processing progress and completion time estimate.",
-   "properties": {
-    "partsProcessed": {
-     "type": "string",
-     "description": "The number of parts of the video that YouTube has already processed. You can estimate the percentage of the video that YouTube has already processed by calculating:\n100 * parts_processed / parts_total\n\nNote that since the estimated number of parts could increase without a corresponding increase in the number of parts that have already been processed, it is possible that the calculated progress could periodically decrease while YouTube processes a video.",
-     "format": "uint64"
-    },
-    "partsTotal": {
-     "type": "string",
-     "description": "An estimate of the total number of parts that need to be processed for the video. The number may be updated with more precise estimates while YouTube processes the video.",
-     "format": "uint64"
-    },
-    "timeLeftMs": {
-     "type": "string",
-     "description": "An estimate of the amount of time, in millseconds, that YouTube needs to finish processing the video.",
-     "format": "uint64"
-    }
-   }
-  },
-  "VideoProjectDetails": {
-   "id": "VideoProjectDetails",
-   "type": "object",
-   "description": "Project specific details about the content of a YouTube Video.",
-   "properties": {
-    "tags": {
-     "type": "array",
-     "description": "A list of project tags associated with the video during the upload.",
-     "items": {
-      "type": "string"
-     }
-    }
-   }
-  },
-  "VideoRating": {
-   "id": "VideoRating",
-   "type": "object",
-   "properties": {
-    "rating": {
-     "type": "string",
-     "enum": [
-      "dislike",
-      "like",
-      "none",
-      "unspecified"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "videoId": {
-     "type": "string"
-    }
-   }
-  },
-  "VideoRecordingDetails": {
-   "id": "VideoRecordingDetails",
-   "type": "object",
-   "description": "Recording information associated with the video.",
-   "properties": {
-    "location": {
-     "$ref": "GeoPoint",
-     "description": "The geolocation information associated with the video."
-    },
-    "locationDescription": {
-     "type": "string",
-     "description": "The text description of the location where the video was recorded."
-    },
-    "recordingDate": {
-     "type": "string",
-     "description": "The date and time when the video was recorded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sssZ) format.",
-     "format": "date-time"
-    }
-   }
-  },
-  "VideoSnippet": {
-   "id": "VideoSnippet",
-   "type": "object",
-   "description": "Basic details about a video, including title, description, uploader, thumbnails and category.",
-   "properties": {
-    "categoryId": {
-     "type": "string",
-     "description": "The YouTube video category associated with the video."
-    },
-    "channelId": {
-     "type": "string",
-     "description": "The ID that YouTube uses to uniquely identify the channel that the video was uploaded to."
-    },
-    "channelTitle": {
-     "type": "string",
-     "description": "Channel title for the channel that the video belongs to."
-    },
-    "defaultAudioLanguage": {
-     "type": "string",
-     "description": "The default_audio_language property specifies the language spoken in the video's default audio track."
-    },
-    "defaultLanguage": {
-     "type": "string",
-     "description": "The language of the videos's default snippet."
-    },
-    "description": {
-     "type": "string",
-     "description": "The video's description."
-    },
-    "liveBroadcastContent": {
-     "type": "string",
-     "description": "Indicates if the video is an upcoming/active live broadcast. Or it's \"none\" if the video is not an upcoming/active live broadcast.",
-     "enum": [
-      "live",
-      "none",
-      "upcoming"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "localized": {
-     "$ref": "VideoLocalization",
-     "description": "Localized snippet selected with the hl parameter. If no such localization exists, this field is populated with the default snippet. (Read-only)"
-    },
-    "publishedAt": {
-     "type": "string",
-     "description": "The date and time that the video was uploaded. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "tags": {
-     "type": "array",
-     "description": "A list of keyword tags associated with the video. Tags may contain spaces.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "thumbnails": {
-     "$ref": "ThumbnailDetails",
-     "description": "A map of thumbnail images associated with the video. For each object in the map, the key is the name of the thumbnail image, and the value is an object that contains other information about the thumbnail."
-    },
-    "title": {
-     "type": "string",
-     "description": "The video's title."
-    }
-   }
-  },
-  "VideoStatistics": {
-   "id": "VideoStatistics",
-   "type": "object",
-   "description": "Statistics about the video, such as the number of times the video was viewed or liked.",
-   "properties": {
-    "commentCount": {
-     "type": "string",
-     "description": "The number of comments for the video.",
-     "format": "uint64"
-    },
-    "dislikeCount": {
-     "type": "string",
-     "description": "The number of users who have indicated that they disliked the video by giving it a negative rating.",
-     "format": "uint64"
-    },
-    "favoriteCount": {
-     "type": "string",
-     "description": "The number of users who currently have the video marked as a favorite video.",
-     "format": "uint64"
-    },
-    "likeCount": {
-     "type": "string",
-     "description": "The number of users who have indicated that they liked the video by giving it a positive rating.",
-     "format": "uint64"
-    },
-    "viewCount": {
-     "type": "string",
-     "description": "The number of times the video has been viewed.",
-     "format": "uint64"
-    }
-   }
-  },
-  "VideoStatus": {
-   "id": "VideoStatus",
-   "type": "object",
-   "description": "Basic details about a video category, such as its localized title.",
-   "properties": {
-    "embeddable": {
-     "type": "boolean",
-     "description": "This value indicates if the video can be embedded on another website."
-    },
-    "failureReason": {
-     "type": "string",
-     "description": "This value explains why a video failed to upload. This property is only present if the uploadStatus property indicates that the upload failed.",
-     "enum": [
-      "codec",
-      "conversion",
-      "emptyFile",
-      "invalidFile",
-      "tooSmall",
-      "uploadAborted"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "license": {
-     "type": "string",
-     "description": "The video's license.",
-     "enum": [
-      "creativeCommon",
-      "youtube"
-     ],
-     "enumDescriptions": [
-      "",
-      ""
-     ]
-    },
-    "privacyStatus": {
-     "type": "string",
-     "description": "The video's privacy status.",
-     "enum": [
-      "private",
-      "public",
-      "unlisted"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      ""
-     ]
-    },
-    "publicStatsViewable": {
-     "type": "boolean",
-     "description": "This value indicates if the extended video statistics on the watch page can be viewed by everyone. Note that the view count, likes, etc will still be visible if this is disabled."
-    },
-    "publishAt": {
-     "type": "string",
-     "description": "The date and time when the video is scheduled to publish. It can be set only if the privacy status of the video is private. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-     "format": "date-time"
-    },
-    "rejectionReason": {
-     "type": "string",
-     "description": "This value explains why YouTube rejected an uploaded video. This property is only present if the uploadStatus property indicates that the upload was rejected.",
-     "enum": [
-      "claim",
-      "copyright",
-      "duplicate",
-      "inappropriate",
-      "legal",
-      "length",
-      "termsOfUse",
-      "trademark",
-      "uploaderAccountClosed",
-      "uploaderAccountSuspended"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    },
-    "uploadStatus": {
-     "type": "string",
-     "description": "The status of the uploaded video.",
-     "enum": [
-      "deleted",
-      "failed",
-      "processed",
-      "rejected",
-      "uploaded"
-     ],
-     "enumDescriptions": [
-      "",
-      "",
-      "",
-      "",
-      ""
-     ]
-    }
-   }
-  },
-  "VideoSuggestions": {
-   "id": "VideoSuggestions",
-   "type": "object",
-   "description": "Specifies suggestions on how to improve video content, including encoding hints, tag suggestions, and editor suggestions.",
-   "properties": {
-    "editorSuggestions": {
-     "type": "array",
-     "description": "A list of video editing operations that might improve the video quality or playback experience of the uploaded video.",
-     "items": {
-      "type": "string",
-      "enum": [
-       "audioQuietAudioSwap",
-       "videoAutoLevels",
-       "videoCrop",
-       "videoStabilize"
-      ],
-      "enumDescriptions": [
-       "",
-       "",
-       "",
-       ""
-      ]
-     }
-    },
-    "processingErrors": {
-     "type": "array",
-     "description": "A list of errors that will prevent YouTube from successfully processing the uploaded video video. These errors indicate that, regardless of the video's current processing status, eventually, that status will almost certainly be failed.",
-     "items": {
-      "type": "string",
-      "enum": [
-       "archiveFile",
-       "audioFile",
-       "docFile",
-       "imageFile",
-       "notAVideoFile",
-       "projectFile",
-       "unsupportedSpatialAudioLayout"
-      ],
-      "enumDescriptions": [
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       ""
-      ]
-     }
-    },
-    "processingHints": {
-     "type": "array",
-     "description": "A list of suggestions that may improve YouTube's ability to process the video.",
-     "items": {
-      "type": "string",
-      "enum": [
-       "nonStreamableMov",
-       "sendBestQualityVideo",
-       "spatialAudio",
-       "sphericalVideo",
-       "vrVideo"
-      ],
-      "enumDescriptions": [
-       "",
-       "",
-       "",
-       "",
-       ""
-      ]
-     }
-    },
-    "processingWarnings": {
-     "type": "array",
-     "description": "A list of reasons why YouTube may have difficulty transcoding the uploaded video or that might result in an erroneous transcoding. These warnings are generated before YouTube actually processes the uploaded video file. In addition, they identify issues that are unlikely to cause the video processing to fail but that might cause problems such as sync issues, video artifacts, or a missing audio track.",
-     "items": {
-      "type": "string",
-      "enum": [
-       "hasEditlist",
-       "inconsistentResolution",
-       "problematicAudioCodec",
-       "problematicVideoCodec",
-       "unknownAudioCodec",
-       "unknownContainer",
-       "unknownVideoCodec",
-       "unsupportedSphericalProjectionType",
-       "unsupportedVrStereoMode"
-      ],
-      "enumDescriptions": [
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       "",
-       ""
-      ]
-     }
-    },
-    "tagSuggestions": {
-     "type": "array",
-     "description": "A list of keyword tags that could be added to the video's metadata to increase the likelihood that users will locate your video when searching or browsing on YouTube.",
-     "items": {
-      "$ref": "VideoSuggestionsTagSuggestion"
-     }
-    }
-   }
-  },
-  "VideoSuggestionsTagSuggestion": {
-   "id": "VideoSuggestionsTagSuggestion",
-   "type": "object",
-   "description": "A single tag suggestion with it's relevance information.",
-   "properties": {
-    "categoryRestricts": {
-     "type": "array",
-     "description": "A set of video categories for which the tag is relevant. You can use this information to display appropriate tag suggestions based on the video category that the video uploader associates with the video. By default, tag suggestions are relevant for all categories if there are no restricts defined for the keyword.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "tag": {
-     "type": "string",
-     "description": "The keyword tag suggested for the video."
-    }
-   }
-  },
-  "VideoTopicDetails": {
-   "id": "VideoTopicDetails",
-   "type": "object",
-   "description": "Freebase topic information related to the video.",
-   "properties": {
-    "relevantTopicIds": {
-     "type": "array",
-     "description": "Similar to topic_id, except that these topics are merely relevant to the video. These are topics that may be mentioned in, or appear in the video. You can retrieve information about each topic using Freebase Topic API.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "topicCategories": {
-     "type": "array",
-     "description": "A list of Wikipedia URLs that provide a high-level description of the video's content.",
-     "items": {
-      "type": "string"
-     }
-    },
-    "topicIds": {
-     "type": "array",
-     "description": "A list of Freebase topic IDs that are centrally associated with the video. These are topics that are centrally featured in the video, and it can be said that the video is mainly about each of these. You can retrieve information about each topic using the Freebase Topic API.",
-     "items": {
-      "type": "string"
-     }
-    }
-   }
-  },
-  "WatchSettings": {
-   "id": "WatchSettings",
-   "type": "object",
-   "description": "Branding properties for the watch. All deprecated.",
-   "properties": {
-    "backgroundColor": {
-     "type": "string",
-     "description": "The text color for the video watch page's branded area."
-    },
-    "featuredPlaylistId": {
-     "type": "string",
-     "description": "An ID that uniquely identifies a playlist that displays next to the video player."
-    },
-    "textColor": {
-     "type": "string",
-     "description": "The background color for the video watch page's branded area."
-    }
-   }
-  }
- },
- "resources": {
-  "activities": {
-   "methods": {
-    "insert": {
-     "id": "youtube.activities.insert",
-     "path": "activities",
-     "httpMethod": "POST",
-     "description": "Posts a bulletin for a specific channel. (The user submitting the request must be authorized to act on the channel's behalf.)\n\nNote: Even though an activity resource can contain information about actions like a user rating a video or marking a video as a favorite, you need to use other API methods to generate those activity resources. For example, you would use the API's videos.rate() method to rate a video and the playlistItems.insert() method to mark a video as a favorite.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Activity"
-     },
-     "response": {
-      "$ref": "Activity"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "list": {
-     "id": "youtube.activities.list",
-     "path": "activities",
-     "httpMethod": "GET",
-     "description": "Returns a list of channel activity events that match the request criteria. For example, you can retrieve events associated with a particular channel, events associated with the user's subscriptions and Google+ friends, or the YouTube home page feed, which is customized for each user.",
-     "parameters": {
-      "channelId": {
-       "type": "string",
-       "description": "The channelId parameter specifies a unique YouTube channel ID. The API will then return a list of that channel's activities.",
-       "location": "query"
-      },
-      "home": {
-       "type": "boolean",
-       "description": "Set this parameter's value to true to retrieve the activity feed that displays on the YouTube home page for the currently authenticated user.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "mine": {
-       "type": "boolean",
-       "description": "Set this parameter's value to true to retrieve a feed of the authenticated user's activities.",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more activity resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in an activity resource, the snippet property contains other properties that identify the type of activity, a display title for the activity, and so forth. If you set part=snippet, the API response will also contain all of those nested properties.",
-       "required": true,
-       "location": "query"
-      },
-      "publishedAfter": {
-       "type": "string",
-       "description": "The publishedAfter parameter specifies the earliest date and time that an activity could have occurred for that activity to be included in the API response. If the parameter value specifies a day, but not a time, then any activities that occurred that day will be included in the result set. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-       "format": "date-time",
-       "location": "query"
-      },
-      "publishedBefore": {
-       "type": "string",
-       "description": "The publishedBefore parameter specifies the date and time before which an activity must have occurred for that activity to be included in the API response. If the parameter value specifies a day, but not a time, then any activities that occurred that day will be excluded from the result set. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sZ) format.",
-       "format": "date-time",
-       "location": "query"
-      },
-      "regionCode": {
-       "type": "string",
-       "description": "The regionCode parameter instructs the API to return results for the specified country. The parameter value is an ISO 3166-1 alpha-2 country code. YouTube uses this value when the authorized user's previous activity on YouTube does not provide enough information to generate the activity feed.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "ActivityListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    }
-   }
-  },
-  "captions": {
-   "methods": {
-    "delete": {
-     "id": "youtube.captions.delete",
-     "path": "captions",
-     "httpMethod": "DELETE",
-     "description": "Deletes a specified caption track.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter identifies the caption track that is being deleted. The value is a caption track ID as identified by the id property in a caption resource.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOf": {
-       "type": "string",
-       "description": "ID of the Google+ Page for the channel that the request is be on behalf of",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "download": {
-     "id": "youtube.captions.download",
-     "path": "captions/{id}",
-     "httpMethod": "GET",
-     "description": "Downloads a caption track. The caption track is returned in its original format unless the request specifies a value for the tfmt parameter and in its original language unless the request specifies a value for the tlang parameter.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter identifies the caption track that is being retrieved. The value is a caption track ID as identified by the id property in a caption resource.",
-       "required": true,
-       "location": "path"
-      },
-      "onBehalfOf": {
-       "type": "string",
-       "description": "ID of the Google+ Page for the channel that the request is be on behalf of",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "tfmt": {
-       "type": "string",
-       "description": "The tfmt parameter specifies that the caption track should be returned in a specific format. If the parameter is not included in the request, the track is returned in its original format.",
-       "enum": [
-        "sbv",
-        "scc",
-        "srt",
-        "ttml",
-        "vtt"
-       ],
-       "enumDescriptions": [
-        "SubViewer subtitle.",
-        "Scenarist Closed Caption format.",
-        "SubRip subtitle.",
-        "Timed Text Markup Language caption.",
-        "Web Video Text Tracks caption."
-       ],
-       "location": "query"
-      },
-      "tlang": {
-       "type": "string",
-       "description": "The tlang parameter specifies that the API response should return a translation of the specified caption track. The parameter value is an ISO 639-1 two-letter language code that identifies the desired caption language. The translation is generated by using machine translation, such as Google Translate.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ],
-     "supportsMediaDownload": true
-    },
-    "insert": {
-     "id": "youtube.captions.insert",
-     "path": "captions",
-     "httpMethod": "POST",
-     "description": "Uploads a caption track.",
-     "parameters": {
-      "onBehalfOf": {
-       "type": "string",
-       "description": "ID of the Google+ Page for the channel that the request is be on behalf of",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the caption resource parts that the API response will include. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      },
-      "sync": {
-       "type": "boolean",
-       "description": "The sync parameter indicates whether YouTube should automatically synchronize the caption file with the audio track of the video. If you set the value to true, YouTube will disregard any time codes that are in the uploaded caption file and generate new time codes for the captions.\n\nYou should set the sync parameter to true if you are uploading a transcript, which has no time codes, or if you suspect the time codes in your file are incorrect and want YouTube to try to fix them.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Caption"
-     },
-     "response": {
-      "$ref": "Caption"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ],
-     "supportsMediaUpload": true,
-     "mediaUpload": {
-      "accept": [
-       "*/*",
-       "application/octet-stream",
-       "text/xml"
-      ],
-      "maxSize": "100MB",
-      "protocols": {
-       "simple": {
-        "multipart": true,
-        "path": "/upload/youtube/v3/captions"
-       },
-       "resumable": {
-        "multipart": true,
-        "path": "/resumable/upload/youtube/v3/captions"
-       }
-      }
-     }
-    },
-    "list": {
-     "id": "youtube.captions.list",
-     "path": "captions",
-     "httpMethod": "GET",
-     "description": "Returns a list of caption tracks that are associated with a specified video. Note that the API response does not contain the actual captions and that the captions.download method provides the ability to retrieve a caption track.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of IDs that identify the caption resources that should be retrieved. Each ID must identify a caption track associated with the specified video.",
-       "location": "query"
-      },
-      "onBehalfOf": {
-       "type": "string",
-       "description": "ID of the Google+ Page for the channel that the request is on behalf of.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more caption resource parts that the API response will include. The part names that you can include in the parameter value are id and snippet.",
-       "required": true,
-       "location": "query"
-      },
-      "videoId": {
-       "type": "string",
-       "description": "The videoId parameter specifies the YouTube video ID of the video for which the API should return caption tracks.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part",
-      "videoId"
-     ],
-     "response": {
-      "$ref": "CaptionListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "update": {
-     "id": "youtube.captions.update",
-     "path": "captions",
-     "httpMethod": "PUT",
-     "description": "Updates a caption track. When updating a caption track, you can change the track's draft status, upload a new caption file for the track, or both.",
-     "parameters": {
-      "onBehalfOf": {
-       "type": "string",
-       "description": "ID of the Google+ Page for the channel that the request is be on behalf of",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include. Set the property value to snippet if you are updating the track's draft status. Otherwise, set the property value to id.",
-       "required": true,
-       "location": "query"
-      },
-      "sync": {
-       "type": "boolean",
-       "description": "Note: The API server only processes the parameter value if the request contains an updated caption file.\n\nThe sync parameter indicates whether YouTube should automatically synchronize the caption file with the audio track of the video. If you set the value to true, YouTube will automatically synchronize the caption track with the audio track.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Caption"
-     },
-     "response": {
-      "$ref": "Caption"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ],
-     "supportsMediaUpload": true,
-     "mediaUpload": {
-      "accept": [
-       "*/*",
-       "application/octet-stream",
-       "text/xml"
-      ],
-      "maxSize": "100MB",
-      "protocols": {
-       "simple": {
-        "multipart": true,
-        "path": "/upload/youtube/v3/captions"
-       },
-       "resumable": {
-        "multipart": true,
-        "path": "/resumable/upload/youtube/v3/captions"
-       }
-      }
-     }
-    }
-   }
-  },
-  "channelBanners": {
-   "methods": {
-    "insert": {
-     "id": "youtube.channelBanners.insert",
-     "path": "channelBanners/insert",
-     "httpMethod": "POST",
-     "description": "Uploads a channel banner image to YouTube. This method represents the first two steps in a three-step process to update the banner image for a channel:\n\n- Call the channelBanners.insert method to upload the binary image data to YouTube. The image must have a 16:9 aspect ratio and be at least 2120x1192 pixels.\n- Extract the url property's value from the response that the API returns for step 1.\n- Call the channels.update method to update the channel's branding settings. Set the brandingSettings.image.bannerExternalUrl property's value to the URL obtained in step 2.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "request": {
-      "$ref": "ChannelBannerResource"
-     },
-     "response": {
-      "$ref": "ChannelBannerResource"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.upload"
-     ],
-     "supportsMediaUpload": true,
-     "mediaUpload": {
-      "accept": [
-       "application/octet-stream",
-       "image/jpeg",
-       "image/png"
-      ],
-      "maxSize": "6MB",
-      "protocols": {
-       "simple": {
-        "multipart": true,
-        "path": "/upload/youtube/v3/channelBanners/insert"
-       },
-       "resumable": {
-        "multipart": true,
-        "path": "/resumable/upload/youtube/v3/channelBanners/insert"
-       }
-      }
-     }
-    }
-   }
-  },
-  "channelSections": {
-   "methods": {
-    "delete": {
-     "id": "youtube.channelSections.delete",
-     "path": "channelSections",
-     "httpMethod": "DELETE",
-     "description": "Deletes a channelSection.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube channelSection ID for the resource that is being deleted. In a channelSection resource, the id property specifies the YouTube channelSection ID.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "insert": {
-     "id": "youtube.channelSections.insert",
-     "path": "channelSections",
-     "httpMethod": "POST",
-     "description": "Adds a channelSection for the authenticated user's channel.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part names that you can include in the parameter value are snippet and contentDetails.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "ChannelSection"
-     },
-     "response": {
-      "$ref": "ChannelSection"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "list": {
-     "id": "youtube.channelSections.list",
-     "path": "channelSections",
-     "httpMethod": "GET",
-     "description": "Returns channelSection resources that match the API request criteria.",
-     "parameters": {
-      "channelId": {
-       "type": "string",
-       "description": "The channelId parameter specifies a YouTube channel ID. The API will only return that channel's channelSections.",
-       "location": "query"
-      },
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter indicates that the snippet.localized property values in the returned channelSection resources should be in the specified language if localized values for that language are available. For example, if the API request specifies hl=de, the snippet.localized properties in the API response will contain German titles if German titles are available. Channel owners can provide localized channel section titles using either the channelSections.insert or channelSections.update method.",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of the YouTube channelSection ID(s) for the resource(s) that are being retrieved. In a channelSection resource, the id property specifies the YouTube channelSection ID.",
-       "location": "query"
-      },
-      "mine": {
-       "type": "boolean",
-       "description": "Set this parameter's value to true to retrieve a feed of the authenticated user's channelSections.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more channelSection resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, and contentDetails.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a channelSection resource, the snippet property contains other properties, such as a display title for the channelSection. If you set part=snippet, the API response will also contain all of those nested properties.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "ChannelSectionListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "update": {
-     "id": "youtube.channelSections.update",
-     "path": "channelSections",
-     "httpMethod": "PUT",
-     "description": "Update a channelSection.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part names that you can include in the parameter value are snippet and contentDetails.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "ChannelSection"
-     },
-     "response": {
-      "$ref": "ChannelSection"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "channels": {
-   "methods": {
-    "list": {
-     "id": "youtube.channels.list",
-     "path": "channels",
-     "httpMethod": "GET",
-     "description": "Returns a collection of zero or more channel resources that match the request criteria.",
-     "parameters": {
-      "categoryId": {
-       "type": "string",
-       "description": "The categoryId parameter specifies a YouTube guide category, thereby requesting YouTube channels associated with that category.",
-       "location": "query"
-      },
-      "forUsername": {
-       "type": "string",
-       "description": "The forUsername parameter specifies a YouTube username, thereby requesting the channel associated with that username.",
-       "location": "query"
-      },
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter should be used for filter out the properties that are not in the given language. Used for the brandingSettings part.",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of the YouTube channel ID(s) for the resource(s) that are being retrieved. In a channel resource, the id property specifies the channel's YouTube channel ID.",
-       "location": "query"
-      },
-      "managedByMe": {
-       "type": "boolean",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nSet this parameter's value to true to instruct the API to only return channels managed by the content owner that the onBehalfOfContentOwner parameter specifies. The user must be authenticated as a CMS account linked to the specified content owner and onBehalfOfContentOwner must be provided.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "mine": {
-       "type": "boolean",
-       "description": "Set this parameter's value to true to instruct the API to only return channels owned by the authenticated user.",
-       "location": "query"
-      },
-      "mySubscribers": {
-       "type": "boolean",
-       "description": "Use the subscriptions.list method and its mySubscribers parameter to retrieve a list of subscribers to the authenticated user's channel.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more channel resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a channel resource, the contentDetails property contains other properties, such as the uploads properties. As such, if you set part=contentDetails, the API response will also contain all of those nested properties.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "ChannelListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner",
-      "https://www.googleapis.com/auth/youtubepartner-channel-audit"
-     ]
-    },
-    "update": {
-     "id": "youtube.channels.update",
-     "path": "channels",
-     "httpMethod": "PUT",
-     "description": "Updates a channel's metadata. Note that this method currently only supports updates to the channel resource's brandingSettings and invideoPromotion objects and their child properties.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "The onBehalfOfContentOwner parameter indicates that the authenticated user is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with needs to be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe API currently only allows the parameter value to be set to either brandingSettings or invideoPromotion. (You cannot update both of those parts with a single request.)\n\nNote that this method overrides the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Channel"
-     },
-     "response": {
-      "$ref": "Channel"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "commentThreads": {
-   "methods": {
-    "insert": {
-     "id": "youtube.commentThreads.insert",
-     "path": "commentThreads",
-     "httpMethod": "POST",
-     "description": "Creates a new top-level comment. To add a reply to an existing comment, use the comments.insert method instead.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter identifies the properties that the API response will include. Set the parameter value to snippet. The snippet part has a quota cost of 2 units.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "CommentThread"
-     },
-     "response": {
-      "$ref": "CommentThread"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "list": {
-     "id": "youtube.commentThreads.list",
-     "path": "commentThreads",
-     "httpMethod": "GET",
-     "description": "Returns a list of comment threads that match the API request parameters.",
-     "parameters": {
-      "allThreadsRelatedToChannelId": {
-       "type": "string",
-       "description": "The allThreadsRelatedToChannelId parameter instructs the API to return all comment threads associated with the specified channel. The response can include comments about the channel or about the channel's videos.",
-       "location": "query"
-      },
-      "channelId": {
-       "type": "string",
-       "description": "The channelId parameter instructs the API to return comment threads containing comments about the specified channel. (The response will not include comments left on videos that the channel uploaded.)",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of comment thread IDs for the resources that should be retrieved.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.",
-       "default": "20",
-       "format": "uint32",
-       "minimum": "1",
-       "maximum": "100",
-       "location": "query"
-      },
-      "moderationStatus": {
-       "type": "string",
-       "description": "Set this parameter to limit the returned comment threads to a particular moderation state.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.",
-       "default": "MODERATION_STATUS_PUBLISHED",
-       "enum": [
-        "heldForReview",
-        "likelySpam",
-        "published"
-       ],
-       "enumDescriptions": [
-        "Retrieve comment threads that are awaiting review by a moderator. A comment thread can be included in the response if the top-level comment or at least one of the replies to that comment are awaiting review.",
-        "Retrieve comment threads classified as likely to be spam. A comment thread can be included in the response if the top-level comment or at least one of the replies to that comment is considered likely to be spam.",
-        "Retrieve threads of published comments. This is the default value. A comment thread can be included in the response if its top-level comment has been published."
-       ],
-       "location": "query"
-      },
-      "order": {
-       "type": "string",
-       "description": "The order parameter specifies the order in which the API response should list comment threads. Valid values are: \n- time - Comment threads are ordered by time. This is the default behavior.\n- relevance - Comment threads are ordered by relevance.Note: This parameter is not supported for use in conjunction with the id parameter.",
-       "default": "true",
-       "enum": [
-        "relevance",
-        "time"
-       ],
-       "enumDescriptions": [
-        "Order by relevance.",
-        "Order by time."
-       ],
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken property identifies the next page of the result that can be retrieved.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more commentThread resource properties that the API response will include.",
-       "required": true,
-       "location": "query"
-      },
-      "searchTerms": {
-       "type": "string",
-       "description": "The searchTerms parameter instructs the API to limit the API response to only contain comments that contain the specified search terms.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.",
-       "location": "query"
-      },
-      "textFormat": {
-       "type": "string",
-       "description": "Set this parameter's value to html or plainText to instruct the API to return the comments left by users in html formatted or in plain text.",
-       "default": "FORMAT_HTML",
-       "enum": [
-        "html",
-        "plainText"
-       ],
-       "enumDescriptions": [
-        "Returns the comments in HTML format. This is the default value.",
-        "Returns the comments in plain text format."
-       ],
-       "location": "query"
-      },
-      "videoId": {
-       "type": "string",
-       "description": "The videoId parameter instructs the API to return comment threads associated with the specified video ID.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "CommentThreadListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "update": {
-     "id": "youtube.commentThreads.update",
-     "path": "commentThreads",
-     "httpMethod": "PUT",
-     "description": "Modifies the top-level comment in a comment thread.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of commentThread resource properties that the API response will include. You must at least include the snippet part in the parameter value since that part contains all of the properties that the API request can update.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "CommentThread"
-     },
-     "response": {
-      "$ref": "CommentThread"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    }
-   }
-  },
-  "comments": {
-   "methods": {
-    "delete": {
-     "id": "youtube.comments.delete",
-     "path": "comments",
-     "httpMethod": "DELETE",
-     "description": "Deletes a comment.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the comment ID for the resource that is being deleted.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "insert": {
-     "id": "youtube.comments.insert",
-     "path": "comments",
-     "httpMethod": "POST",
-     "description": "Creates a reply to an existing comment. Note: To create a top-level comment, use the commentThreads.insert method.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter identifies the properties that the API response will include. Set the parameter value to snippet. The snippet part has a quota cost of 2 units.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Comment"
-     },
-     "response": {
-      "$ref": "Comment"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "list": {
-     "id": "youtube.comments.list",
-     "path": "comments",
-     "httpMethod": "GET",
-     "description": "Returns a list of comments that match the API request parameters.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of comment IDs for the resources that are being retrieved. In a comment resource, the id property specifies the comment's ID.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.",
-       "default": "20",
-       "format": "uint32",
-       "minimum": "1",
-       "maximum": "100",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken property identifies the next page of the result that can be retrieved.\n\nNote: This parameter is not supported for use in conjunction with the id parameter.",
-       "location": "query"
-      },
-      "parentId": {
-       "type": "string",
-       "description": "The parentId parameter specifies the ID of the comment for which replies should be retrieved.\n\nNote: YouTube currently supports replies only for top-level comments. However, replies to replies may be supported in the future.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more comment resource properties that the API response will include.",
-       "required": true,
-       "location": "query"
-      },
-      "textFormat": {
-       "type": "string",
-       "description": "This parameter indicates whether the API should return comments formatted as HTML or as plain text.",
-       "default": "FORMAT_HTML",
-       "enum": [
-        "html",
-        "plainText"
-       ],
-       "enumDescriptions": [
-        "Returns the comments in HTML format. This is the default value.",
-        "Returns the comments in plain text format."
-       ],
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "CommentListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "markAsSpam": {
-     "id": "youtube.comments.markAsSpam",
-     "path": "comments/markAsSpam",
-     "httpMethod": "POST",
-     "description": "Expresses the caller's opinion that one or more comments should be flagged as spam.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of IDs of comments that the caller believes should be classified as spam.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "setModerationStatus": {
-     "id": "youtube.comments.setModerationStatus",
-     "path": "comments/setModerationStatus",
-     "httpMethod": "POST",
-     "description": "Sets the moderation status of one or more comments. The API request must be authorized by the owner of the channel or video associated with the comments.",
-     "parameters": {
-      "banAuthor": {
-       "type": "boolean",
-       "description": "The banAuthor parameter lets you indicate that you want to automatically reject any additional comments written by the comment's author. Set the parameter value to true to ban the author.\n\nNote: This parameter is only valid if the moderationStatus parameter is also set to rejected.",
-       "default": "false",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of IDs that identify the comments for which you are updating the moderation status.",
-       "required": true,
-       "location": "query"
-      },
-      "moderationStatus": {
-       "type": "string",
-       "description": "Identifies the new moderation status of the specified comments.",
-       "required": true,
-       "enum": [
-        "heldForReview",
-        "published",
-        "rejected"
-       ],
-       "enumDescriptions": [
-        "Marks a comment as awaiting review by a moderator.",
-        "Clears a comment for public display.",
-        "Rejects a comment as being unfit for display. This action also effectively hides all replies to the rejected comment.\n\nNote: The API does not currently provide a way to list or otherwise discover rejected comments. However, you can change the moderation status of a rejected comment if you still know its ID. If you were to change the moderation status of a rejected comment, the comment replies would subsequently be discoverable again as well."
-       ],
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id",
-      "moderationStatus"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "update": {
-     "id": "youtube.comments.update",
-     "path": "comments",
-     "httpMethod": "PUT",
-     "description": "Modifies a comment.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter identifies the properties that the API response will include. You must at least include the snippet part in the parameter value since that part contains all of the properties that the API request can update.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Comment"
-     },
-     "response": {
-      "$ref": "Comment"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    }
-   }
-  },
-  "fanFundingEvents": {
-   "methods": {
-    "list": {
-     "id": "youtube.fanFundingEvents.list",
-     "path": "fanFundingEvents",
-     "httpMethod": "GET",
-     "description": "Lists fan funding events for a channel.",
-     "parameters": {
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports. The parameter value must be a language code included in the list returned by the i18nLanguages.list method.\n\nIf localized resource details are available in that language, the resource's snippet.localized object will contain the localized values. However, if localized details are not available, the snippet.localized object will contain resource details in the resource's default language.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the fanFundingEvent resource parts that the API response will include. Supported values are id and snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "FanFundingEventListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    }
-   }
-  },
-  "guideCategories": {
-   "methods": {
-    "list": {
-     "id": "youtube.guideCategories.list",
-     "path": "guideCategories",
-     "httpMethod": "GET",
-     "description": "Returns a list of categories that can be associated with YouTube channels.",
-     "parameters": {
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter specifies the language that will be used for text values in the API response.",
-       "default": "en-US",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of the YouTube channel category ID(s) for the resource(s) that are being retrieved. In a guideCategory resource, the id property specifies the YouTube channel category ID.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the guideCategory resource properties that the API response will include. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      },
-      "regionCode": {
-       "type": "string",
-       "description": "The regionCode parameter instructs the API to return the list of guide categories available in the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "GuideCategoryListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "i18nLanguages": {
-   "methods": {
-    "list": {
-     "id": "youtube.i18nLanguages.list",
-     "path": "i18nLanguages",
-     "httpMethod": "GET",
-     "description": "Returns a list of application languages that the YouTube website supports.",
-     "parameters": {
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter specifies the language that should be used for text values in the API response.",
-       "default": "en_US",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the i18nLanguage resource properties that the API response will include. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "I18nLanguageListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "i18nRegions": {
-   "methods": {
-    "list": {
-     "id": "youtube.i18nRegions.list",
-     "path": "i18nRegions",
-     "httpMethod": "GET",
-     "description": "Returns a list of content regions that the YouTube website supports.",
-     "parameters": {
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter specifies the language that should be used for text values in the API response.",
-       "default": "en_US",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the i18nRegion resource properties that the API response will include. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "I18nRegionListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "liveBroadcasts": {
-   "methods": {
-    "bind": {
-     "id": "youtube.liveBroadcasts.bind",
-     "path": "liveBroadcasts/bind",
-     "httpMethod": "POST",
-     "description": "Binds a YouTube broadcast to a stream or removes an existing binding between a broadcast and a stream. A broadcast can only be bound to one video stream, though a video stream may be bound to more than one broadcast.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the unique ID of the broadcast that is being bound to a video stream.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more liveBroadcast resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, and status.",
-       "required": true,
-       "location": "query"
-      },
-      "streamId": {
-       "type": "string",
-       "description": "The streamId parameter specifies the unique ID of the video stream that is being bound to a broadcast. If this parameter is omitted, the API will remove any existing binding between the broadcast and a video stream.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id",
-      "part"
-     ],
-     "response": {
-      "$ref": "LiveBroadcast"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "control": {
-     "id": "youtube.liveBroadcasts.control",
-     "path": "liveBroadcasts/control",
-     "httpMethod": "POST",
-     "description": "Controls the settings for a slate that can be displayed in the broadcast stream.",
-     "parameters": {
-      "displaySlate": {
-       "type": "boolean",
-       "description": "The displaySlate parameter specifies whether the slate is being enabled or disabled.",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube live broadcast ID that uniquely identifies the broadcast in which the slate is being updated.",
-       "required": true,
-       "location": "query"
-      },
-      "offsetTimeMs": {
-       "type": "string",
-       "description": "The offsetTimeMs parameter specifies a positive time offset when the specified slate change will occur. The value is measured in milliseconds from the beginning of the broadcast's monitor stream, which is the time that the testing phase for the broadcast began. Even though it is specified in milliseconds, the value is actually an approximation, and YouTube completes the requested action as closely as possible to that time.\n\nIf you do not specify a value for this parameter, then YouTube performs the action as soon as possible. See the Getting started guide for more details.\n\nImportant: You should only specify a value for this parameter if your broadcast stream is delayed.",
-       "format": "uint64",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more liveBroadcast resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, and status.",
-       "required": true,
-       "location": "query"
-      },
-      "walltime": {
-       "type": "string",
-       "description": "The walltime parameter specifies the wall clock time at which the specified slate change will occur. The value is specified in ISO 8601 (YYYY-MM-DDThh:mm:ss.sssZ) format.",
-       "format": "date-time",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id",
-      "part"
-     ],
-     "response": {
-      "$ref": "LiveBroadcast"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "delete": {
-     "id": "youtube.liveBroadcasts.delete",
-     "path": "liveBroadcasts",
-     "httpMethod": "DELETE",
-     "description": "Deletes a broadcast.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube live broadcast ID for the resource that is being deleted.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "insert": {
-     "id": "youtube.liveBroadcasts.insert",
-     "path": "liveBroadcasts",
-     "httpMethod": "POST",
-     "description": "Creates a broadcast.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part properties that you can include in the parameter value are id, snippet, contentDetails, and status.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "LiveBroadcast"
-     },
-     "response": {
-      "$ref": "LiveBroadcast"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "list": {
-     "id": "youtube.liveBroadcasts.list",
-     "path": "liveBroadcasts",
-     "httpMethod": "GET",
-     "description": "Returns a list of YouTube broadcasts that match the API request parameters.",
-     "parameters": {
-      "broadcastStatus": {
-       "type": "string",
-       "description": "The broadcastStatus parameter filters the API response to only include broadcasts with the specified status.",
-       "enum": [
-        "active",
-        "all",
-        "completed",
-        "upcoming"
-       ],
-       "enumDescriptions": [
-        "Return current live broadcasts.",
-        "Return all broadcasts.",
-        "Return broadcasts that have already ended.",
-        "Return broadcasts that have not yet started."
-       ],
-       "location": "query"
-      },
-      "broadcastType": {
-       "type": "string",
-       "description": "The broadcastType parameter filters the API response to only include broadcasts with the specified type. This is only compatible with the mine filter for now.",
-       "default": "BROADCAST_TYPE_FILTER_EVENT",
-       "enum": [
-        "all",
-        "event",
-        "persistent"
-       ],
-       "enumDescriptions": [
-        "Return all broadcasts.",
-        "Return only scheduled event broadcasts.",
-        "Return only persistent broadcasts."
-       ],
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of YouTube broadcast IDs that identify the broadcasts being retrieved. In a liveBroadcast resource, the id property specifies the broadcast's ID.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "mine": {
-       "type": "boolean",
-       "description": "The mine parameter can be used to instruct the API to only return broadcasts owned by the authenticated user. Set the parameter value to true to only retrieve your own broadcasts.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more liveBroadcast resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, and status.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "LiveBroadcastListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    },
-    "transition": {
-     "id": "youtube.liveBroadcasts.transition",
-     "path": "liveBroadcasts/transition",
-     "httpMethod": "POST",
-     "description": "Changes the status of a YouTube live broadcast and initiates any processes associated with the new status. For example, when you transition a broadcast's status to testing, YouTube starts to transmit video to that broadcast's monitor stream. Before calling this method, you should confirm that the value of the status.streamStatus property for the stream bound to your broadcast is active.",
-     "parameters": {
-      "broadcastStatus": {
-       "type": "string",
-       "description": "The broadcastStatus parameter identifies the state to which the broadcast is changing. Note that to transition a broadcast to either the testing or live state, the status.streamStatus must be active for the stream that the broadcast is bound to.",
-       "required": true,
-       "enum": [
-        "complete",
-        "live",
-        "testing"
-       ],
-       "enumDescriptions": [
-        "The broadcast is over. YouTube stops transmitting video.",
-        "The broadcast is visible to its audience. YouTube transmits video to the broadcast's monitor stream and its broadcast stream.",
-        "Start testing the broadcast. YouTube transmits video to the broadcast's monitor stream. Note that you can only transition a broadcast to the testing state if its contentDetails.monitorStream.enableMonitorStream property is set to true."
-       ],
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the unique ID of the broadcast that is transitioning to another status.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more liveBroadcast resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, contentDetails, and status.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "broadcastStatus",
-      "id",
-      "part"
-     ],
-     "response": {
-      "$ref": "LiveBroadcast"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "update": {
-     "id": "youtube.liveBroadcasts.update",
-     "path": "liveBroadcasts",
-     "httpMethod": "PUT",
-     "description": "Updates a broadcast. For example, you could modify the broadcast settings defined in the liveBroadcast resource's contentDetails object.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part properties that you can include in the parameter value are id, snippet, contentDetails, and status.\n\nNote that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a broadcast's privacy status is defined in the status part. As such, if your request is updating a private or unlisted broadcast, and the request's part parameter value includes the status part, the broadcast's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the broadcast will revert to the default privacy setting.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "LiveBroadcast"
-     },
-     "response": {
-      "$ref": "LiveBroadcast"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    }
-   }
-  },
-  "liveChatBans": {
-   "methods": {
-    "delete": {
-     "id": "youtube.liveChatBans.delete",
-     "path": "liveChat/bans",
-     "httpMethod": "DELETE",
-     "description": "Removes a chat ban.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter identifies the chat ban to remove. The value uniquely identifies both the ban and the chat.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "insert": {
-     "id": "youtube.liveChatBans.insert",
-     "path": "liveChat/bans",
-     "httpMethod": "POST",
-     "description": "Adds a new ban to the chat.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response returns. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "LiveChatBan"
-     },
-     "response": {
-      "$ref": "LiveChatBan"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    }
-   }
-  },
-  "liveChatMessages": {
-   "methods": {
-    "delete": {
-     "id": "youtube.liveChatMessages.delete",
-     "path": "liveChat/messages",
-     "httpMethod": "DELETE",
-     "description": "Deletes a chat message.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube chat message ID of the resource that is being deleted.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "insert": {
-     "id": "youtube.liveChatMessages.insert",
-     "path": "liveChat/messages",
-     "httpMethod": "POST",
-     "description": "Adds a message to a live chat.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes. It identifies the properties that the write operation will set as well as the properties that the API response will include. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "LiveChatMessage"
-     },
-     "response": {
-      "$ref": "LiveChatMessage"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "list": {
-     "id": "youtube.liveChatMessages.list",
-     "path": "liveChat/messages",
-     "httpMethod": "GET",
-     "description": "Lists live chat messages for a specific chat.",
-     "parameters": {
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports. The parameter value must be a language code included in the list returned by the i18nLanguages.list method.\n\nIf localized resource details are available in that language, the resource's snippet.localized object will contain the localized values. However, if localized details are not available, the snippet.localized object will contain resource details in the resource's default language.",
-       "location": "query"
-      },
-      "liveChatId": {
-       "type": "string",
-       "description": "The liveChatId parameter specifies the ID of the chat whose messages will be returned.",
-       "required": true,
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of messages that should be returned in the result set.",
-       "default": "500",
-       "format": "uint32",
-       "minimum": "200",
-       "maximum": "2000",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken property identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the liveChatComment resource parts that the API response will include. Supported values are id and snippet.",
-       "required": true,
-       "location": "query"
-      },
-      "profileImageSize": {
-       "type": "integer",
-       "description": "The profileImageSize parameter specifies the size of the user profile pictures that should be returned in the result set. Default: 88.",
-       "format": "uint32",
-       "minimum": "16",
-       "maximum": "720",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "liveChatId",
-      "part"
-     ],
-     "response": {
-      "$ref": "LiveChatMessageListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    }
-   }
-  },
-  "liveChatModerators": {
-   "methods": {
-    "delete": {
-     "id": "youtube.liveChatModerators.delete",
-     "path": "liveChat/moderators",
-     "httpMethod": "DELETE",
-     "description": "Removes a chat moderator.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter identifies the chat moderator to remove. The value uniquely identifies both the moderator and the chat.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "insert": {
-     "id": "youtube.liveChatModerators.insert",
-     "path": "liveChat/moderators",
-     "httpMethod": "POST",
-     "description": "Adds a new moderator for the chat.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response returns. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "LiveChatModerator"
-     },
-     "response": {
-      "$ref": "LiveChatModerator"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "list": {
-     "id": "youtube.liveChatModerators.list",
-     "path": "liveChat/moderators",
-     "httpMethod": "GET",
-     "description": "Lists moderators for a live chat.",
-     "parameters": {
-      "liveChatId": {
-       "type": "string",
-       "description": "The liveChatId parameter specifies the YouTube live chat for which the API should return moderators.",
-       "required": true,
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the liveChatModerator resource parts that the API response will include. Supported values are id and snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "liveChatId",
-      "part"
-     ],
-     "response": {
-      "$ref": "LiveChatModeratorListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    }
-   }
-  },
-  "liveStreams": {
-   "methods": {
-    "delete": {
-     "id": "youtube.liveStreams.delete",
-     "path": "liveStreams",
-     "httpMethod": "DELETE",
-     "description": "Deletes a video stream.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube live stream ID for the resource that is being deleted.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "insert": {
-     "id": "youtube.liveStreams.insert",
-     "path": "liveStreams",
-     "httpMethod": "POST",
-     "description": "Creates a video stream. The stream enables you to send your video to YouTube, which can then broadcast the video to your audience.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part properties that you can include in the parameter value are id, snippet, cdn, and status.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "LiveStream"
-     },
-     "response": {
-      "$ref": "LiveStream"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    },
-    "list": {
-     "id": "youtube.liveStreams.list",
-     "path": "liveStreams",
-     "httpMethod": "GET",
-     "description": "Returns a list of video streams that match the API request parameters.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of YouTube stream IDs that identify the streams being retrieved. In a liveStream resource, the id property specifies the stream's ID.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "mine": {
-       "type": "boolean",
-       "description": "The mine parameter can be used to instruct the API to only return streams owned by the authenticated user. Set the parameter value to true to only retrieve your own streams.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more liveStream resource properties that the API response will include. The part names that you can include in the parameter value are id, snippet, cdn, and status.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "LiveStreamListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    },
-    "update": {
-     "id": "youtube.liveStreams.update",
-     "path": "liveStreams",
-     "httpMethod": "PUT",
-     "description": "Updates a video stream. If the properties that you want to change cannot be updated, then you need to create a new stream with the proper settings.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nThe part properties that you can include in the parameter value are id, snippet, cdn, and status.\n\nNote that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. If the request body does not specify a value for a mutable property, the existing value for that property will be removed.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "LiveStream"
-     },
-     "response": {
-      "$ref": "LiveStream"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl"
-     ]
-    }
-   }
-  },
-  "playlistItems": {
-   "methods": {
-    "delete": {
-     "id": "youtube.playlistItems.delete",
-     "path": "playlistItems",
-     "httpMethod": "DELETE",
-     "description": "Deletes a playlist item.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube playlist item ID for the playlist item that is being deleted. In a playlistItem resource, the id property specifies the playlist item's ID.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "insert": {
-     "id": "youtube.playlistItems.insert",
-     "path": "playlistItems",
-     "httpMethod": "POST",
-     "description": "Adds a resource to a playlist.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "PlaylistItem"
-     },
-     "response": {
-      "$ref": "PlaylistItem"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "list": {
-     "id": "youtube.playlistItems.list",
-     "path": "playlistItems",
-     "httpMethod": "GET",
-     "description": "Returns a collection of playlist items that match the API request parameters. You can retrieve all of the playlist items in a specified playlist or retrieve one or more playlist items by their unique IDs.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of one or more unique playlist item IDs.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more playlistItem resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a playlistItem resource, the snippet property contains numerous fields, including the title, description, position, and resourceId properties. As such, if you set part=snippet, the API response will contain all of those properties.",
-       "required": true,
-       "location": "query"
-      },
-      "playlistId": {
-       "type": "string",
-       "description": "The playlistId parameter specifies the unique ID of the playlist for which you want to retrieve playlist items. Note that even though this is an optional parameter, every request to retrieve playlist items must specify a value for either the id parameter or the playlistId parameter.",
-       "location": "query"
-      },
-      "videoId": {
-       "type": "string",
-       "description": "The videoId parameter specifies that the request should return only the playlist items that contain the specified video.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "PlaylistItemListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ],
-     "supportsSubscription": true
-    },
-    "update": {
-     "id": "youtube.playlistItems.update",
-     "path": "playlistItems",
-     "httpMethod": "PUT",
-     "description": "Modifies a playlist item. For example, you could update the item's position in the playlist.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nNote that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a playlist item can specify a start time and end time, which identify the times portion of the video that should play when users watch the video in the playlist. If your request is updating a playlist item that sets these values, and the request's part parameter value includes the contentDetails part, the playlist item's start and end times will be updated to whatever value the request body specifies. If the request body does not specify values, the existing start and end times will be removed and replaced with the default settings.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "PlaylistItem"
-     },
-     "response": {
-      "$ref": "PlaylistItem"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "playlists": {
-   "methods": {
-    "delete": {
-     "id": "youtube.playlists.delete",
-     "path": "playlists",
-     "httpMethod": "DELETE",
-     "description": "Deletes a playlist.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube playlist ID for the playlist that is being deleted. In a playlist resource, the id property specifies the playlist's ID.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "insert": {
-     "id": "youtube.playlists.insert",
-     "path": "playlists",
-     "httpMethod": "POST",
-     "description": "Creates a playlist.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Playlist"
-     },
-     "response": {
-      "$ref": "Playlist"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "list": {
-     "id": "youtube.playlists.list",
-     "path": "playlists",
-     "httpMethod": "GET",
-     "description": "Returns a collection of playlists that match the API request parameters. For example, you can retrieve all playlists that the authenticated user owns, or you can retrieve one or more playlists by their unique IDs.",
-     "parameters": {
-      "channelId": {
-       "type": "string",
-       "description": "This value indicates that the API should only return the specified channel's playlists.",
-       "location": "query"
-      },
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter should be used for filter out the properties that are not in the given language. Used for the snippet part.",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of the YouTube playlist ID(s) for the resource(s) that are being retrieved. In a playlist resource, the id property specifies the playlist's YouTube playlist ID.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "mine": {
-       "type": "boolean",
-       "description": "Set this parameter's value to true to instruct the API to only return playlists owned by the authenticated user.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more playlist resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a playlist resource, the snippet property contains properties like author, title, description, tags, and timeCreated. As such, if you set part=snippet, the API response will contain all of those properties.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "PlaylistListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "update": {
-     "id": "youtube.playlists.update",
-     "path": "playlists",
-     "httpMethod": "PUT",
-     "description": "Modifies a playlist. For example, you could change a playlist's title, description, or privacy status.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nNote that this method will override the existing values for mutable properties that are contained in any parts that the request body specifies. For example, a playlist's description is contained in the snippet part, which must be included in the request body. If the request does not specify a value for the snippet.description property, the playlist's existing description will be deleted.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Playlist"
-     },
-     "response": {
-      "$ref": "Playlist"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "search": {
-   "methods": {
-    "list": {
-     "id": "youtube.search.list",
-     "path": "search",
-     "httpMethod": "GET",
-     "description": "Returns a collection of search results that match the query parameters specified in the API request. By default, a search result set identifies matching video, channel, and playlist resources, but you can also configure queries to only retrieve a specific type of resource.",
-     "parameters": {
-      "channelId": {
-       "type": "string",
-       "description": "The channelId parameter indicates that the API response should only contain resources created by the channel",
-       "location": "query"
-      },
-      "channelType": {
-       "type": "string",
-       "description": "The channelType parameter lets you restrict a search to a particular type of channel.",
-       "enum": [
-        "any",
-        "show"
-       ],
-       "enumDescriptions": [
-        "Return all channels.",
-        "Only retrieve shows."
-       ],
-       "location": "query"
-      },
-      "eventType": {
-       "type": "string",
-       "description": "The eventType parameter restricts a search to broadcast events. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "completed",
-        "live",
-        "upcoming"
-       ],
-       "enumDescriptions": [
-        "Only include completed broadcasts.",
-        "Only include active broadcasts.",
-        "Only include upcoming broadcasts."
-       ],
-       "location": "query"
-      },
-      "forContentOwner": {
-       "type": "boolean",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe forContentOwner parameter restricts the search to only retrieve resources owned by the content owner specified by the onBehalfOfContentOwner parameter. The user must be authenticated using a CMS account linked to the specified content owner and onBehalfOfContentOwner must be provided.",
-       "location": "query"
-      },
-      "forDeveloper": {
-       "type": "boolean",
-       "description": "The forDeveloper parameter restricts the search to only retrieve videos uploaded via the developer's application or website. The API server uses the request's authorization credentials to identify the developer. Therefore, a developer can restrict results to videos uploaded through the developer's own app or website but not to videos uploaded through other apps or sites.",
-       "location": "query"
-      },
-      "forMine": {
-       "type": "boolean",
-       "description": "The forMine parameter restricts the search to only retrieve videos owned by the authenticated user. If you set this parameter to true, then the type parameter's value must also be set to video.",
-       "location": "query"
-      },
-      "location": {
-       "type": "string",
-       "description": "The location parameter, in conjunction with the locationRadius parameter, defines a circular geographic area and also restricts a search to videos that specify, in their metadata, a geographic location that falls within that area. The parameter value is a string that specifies latitude/longitude coordinates e.g. (37.42307,-122.08427).\n\n\n- The location parameter value identifies the point at the center of the area.\n- The locationRadius parameter specifies the maximum distance that the location associated with a video can be from that point for the video to still be included in the search results.The API returns an error if your request specifies a value for the location parameter but does not also specify a value for the locationRadius parameter.",
-       "location": "query"
-      },
-      "locationRadius": {
-       "type": "string",
-       "description": "The locationRadius parameter, in conjunction with the location parameter, defines a circular geographic area.\n\nThe parameter value must be a floating point number followed by a measurement unit. Valid measurement units are m, km, ft, and mi. For example, valid parameter values include 1500m, 5km, 10000ft, and 0.75mi. The API does not support locationRadius parameter values larger than 1000 kilometers.\n\nNote: See the definition of the location parameter for more information.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "order": {
-       "type": "string",
-       "description": "The order parameter specifies the method that will be used to order resources in the API response.",
-       "default": "SEARCH_SORT_RELEVANCE",
-       "enum": [
-        "date",
-        "rating",
-        "relevance",
-        "title",
-        "videoCount",
-        "viewCount"
-       ],
-       "enumDescriptions": [
-        "Resources are sorted in reverse chronological order based on the date they were created.",
-        "Resources are sorted from highest to lowest rating.",
-        "Resources are sorted based on their relevance to the search query. This is the default value for this parameter.",
-        "Resources are sorted alphabetically by title.",
-        "Channels are sorted in descending order of their number of uploaded videos.",
-        "Resources are sorted from highest to lowest number of views."
-       ],
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more search resource properties that the API response will include. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      },
-      "publishedAfter": {
-       "type": "string",
-       "description": "The publishedAfter parameter indicates that the API response should only contain resources created after the specified time. The value is an RFC 3339 formatted date-time value (1970-01-01T00:00:00Z).",
-       "format": "date-time",
-       "location": "query"
-      },
-      "publishedBefore": {
-       "type": "string",
-       "description": "The publishedBefore parameter indicates that the API response should only contain resources created before the specified time. The value is an RFC 3339 formatted date-time value (1970-01-01T00:00:00Z).",
-       "format": "date-time",
-       "location": "query"
-      },
-      "q": {
-       "type": "string",
-       "description": "The q parameter specifies the query term to search for.\n\nYour request can also use the Boolean NOT (-) and OR (|) operators to exclude videos or to find videos that are associated with one of several search terms. For example, to search for videos matching either \"boating\" or \"sailing\", set the q parameter value to boating|sailing. Similarly, to search for videos matching either \"boating\" or \"sailing\" but not \"fishing\", set the q parameter value to boating|sailing -fishing. Note that the pipe character must be URL-escaped when it is sent in your API request. The URL-escaped value for the pipe character is %7C.",
-       "location": "query"
-      },
-      "regionCode": {
-       "type": "string",
-       "description": "The regionCode parameter instructs the API to return search results for the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.",
-       "location": "query"
-      },
-      "relatedToVideoId": {
-       "type": "string",
-       "description": "The relatedToVideoId parameter retrieves a list of videos that are related to the video that the parameter value identifies. The parameter value must be set to a YouTube video ID and, if you are using this parameter, the type parameter must be set to video.",
-       "location": "query"
-      },
-      "relevanceLanguage": {
-       "type": "string",
-       "description": "The relevanceLanguage parameter instructs the API to return search results that are most relevant to the specified language. The parameter value is typically an ISO 639-1 two-letter language code. However, you should use the values zh-Hans for simplified Chinese and zh-Hant for traditional Chinese. Please note that results in other languages will still be returned if they are highly relevant to the search query term.",
-       "location": "query"
-      },
-      "safeSearch": {
-       "type": "string",
-       "description": "The safeSearch parameter indicates whether the search results should include restricted content as well as standard content.",
-       "enum": [
-        "moderate",
-        "none",
-        "strict"
-       ],
-       "enumDescriptions": [
-        "YouTube will filter some content from search results and, at the least, will filter content that is restricted in your locale. Based on their content, search results could be removed from search results or demoted in search results. This is the default parameter value.",
-        "YouTube will not filter the search result set.",
-        "YouTube will try to exclude all restricted content from the search result set. Based on their content, search results could be removed from search results or demoted in search results."
-       ],
-       "location": "query"
-      },
-      "topicId": {
-       "type": "string",
-       "description": "The topicId parameter indicates that the API response should only contain resources associated with the specified topic. The value identifies a Freebase topic ID.",
-       "location": "query"
-      },
-      "type": {
-       "type": "string",
-       "description": "The type parameter restricts a search query to only retrieve a particular type of resource. The value is a comma-separated list of resource types.",
-       "default": "video,channel,playlist",
-       "location": "query"
-      },
-      "videoCaption": {
-       "type": "string",
-       "description": "The videoCaption parameter indicates whether the API should filter video search results based on whether they have captions. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "any",
-        "closedCaption",
-        "none"
-       ],
-       "enumDescriptions": [
-        "Do not filter results based on caption availability.",
-        "Only include videos that have captions.",
-        "Only include videos that do not have captions."
-       ],
-       "location": "query"
-      },
-      "videoCategoryId": {
-       "type": "string",
-       "description": "The videoCategoryId parameter filters video search results based on their category. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "location": "query"
-      },
-      "videoDefinition": {
-       "type": "string",
-       "description": "The videoDefinition parameter lets you restrict a search to only include either high definition (HD) or standard definition (SD) videos. HD videos are available for playback in at least 720p, though higher resolutions, like 1080p, might also be available. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "any",
-        "high",
-        "standard"
-       ],
-       "enumDescriptions": [
-        "Return all videos, regardless of their resolution.",
-        "Only retrieve HD videos.",
-        "Only retrieve videos in standard definition."
-       ],
-       "location": "query"
-      },
-      "videoDimension": {
-       "type": "string",
-       "description": "The videoDimension parameter lets you restrict a search to only retrieve 2D or 3D videos. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "2d",
-        "3d",
-        "any"
-       ],
-       "enumDescriptions": [
-        "Restrict search results to exclude 3D videos.",
-        "Restrict search results to only include 3D videos.",
-        "Include both 3D and non-3D videos in returned results. This is the default value."
-       ],
-       "location": "query"
-      },
-      "videoDuration": {
-       "type": "string",
-       "description": "The videoDuration parameter filters video search results based on their duration. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "any",
-        "long",
-        "medium",
-        "short"
-       ],
-       "enumDescriptions": [
-        "Do not filter video search results based on their duration. This is the default value.",
-        "Only include videos longer than 20 minutes.",
-        "Only include videos that are between four and 20 minutes long (inclusive).",
-        "Only include videos that are less than four minutes long."
-       ],
-       "location": "query"
-      },
-      "videoEmbeddable": {
-       "type": "string",
-       "description": "The videoEmbeddable parameter lets you to restrict a search to only videos that can be embedded into a webpage. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "any",
-        "true"
-       ],
-       "enumDescriptions": [
-        "Return all videos, embeddable or not.",
-        "Only retrieve embeddable videos."
-       ],
-       "location": "query"
-      },
-      "videoLicense": {
-       "type": "string",
-       "description": "The videoLicense parameter filters search results to only include videos with a particular license. YouTube lets video uploaders choose to attach either the Creative Commons license or the standard YouTube license to each of their videos. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "any",
-        "creativeCommon",
-        "youtube"
-       ],
-       "enumDescriptions": [
-        "Return all videos, regardless of which license they have, that match the query parameters.",
-        "Only return videos that have a Creative Commons license. Users can reuse videos with this license in other videos that they create. Learn more.",
-        "Only return videos that have the standard YouTube license."
-       ],
-       "location": "query"
-      },
-      "videoSyndicated": {
-       "type": "string",
-       "description": "The videoSyndicated parameter lets you to restrict a search to only videos that can be played outside youtube.com. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "any",
-        "true"
-       ],
-       "enumDescriptions": [
-        "Return all videos, syndicated or not.",
-        "Only retrieve syndicated videos."
-       ],
-       "location": "query"
-      },
-      "videoType": {
-       "type": "string",
-       "description": "The videoType parameter lets you restrict a search to a particular type of videos. If you specify a value for this parameter, you must also set the type parameter's value to video.",
-       "enum": [
-        "any",
-        "episode",
-        "movie"
-       ],
-       "enumDescriptions": [
-        "Return all videos.",
-        "Only retrieve episodes of shows.",
-        "Only retrieve movies."
-       ],
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "SearchListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "sponsors": {
-   "methods": {
-    "list": {
-     "id": "youtube.sponsors.list",
-     "path": "sponsors",
-     "httpMethod": "GET",
-     "description": "Lists sponsors for a channel.",
-     "parameters": {
-      "filter": {
-       "type": "string",
-       "description": "The filter parameter specifies which channel sponsors to return.",
-       "default": "POLL_NEWEST",
-       "enum": [
-        "all",
-        "newest"
-       ],
-       "enumDescriptions": [
-        "Return all sponsors, from newest to oldest.",
-        "Return the most recent sponsors, from newest to oldest."
-       ],
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the sponsor resource parts that the API response will include. Supported values are id and snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "SponsorListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    }
-   }
-  },
-  "subscriptions": {
-   "methods": {
-    "delete": {
-     "id": "youtube.subscriptions.delete",
-     "path": "subscriptions",
-     "httpMethod": "DELETE",
-     "description": "Deletes a subscription.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube subscription ID for the resource that is being deleted. In a subscription resource, the id property specifies the YouTube subscription ID.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "insert": {
-     "id": "youtube.subscriptions.insert",
-     "path": "subscriptions",
-     "httpMethod": "POST",
-     "description": "Adds a subscription for the authenticated user's channel.",
-     "parameters": {
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Subscription"
-     },
-     "response": {
-      "$ref": "Subscription"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "list": {
-     "id": "youtube.subscriptions.list",
-     "path": "subscriptions",
-     "httpMethod": "GET",
-     "description": "Returns subscription resources that match the API request criteria.",
-     "parameters": {
-      "channelId": {
-       "type": "string",
-       "description": "The channelId parameter specifies a YouTube channel ID. The API will only return that channel's subscriptions.",
-       "location": "query"
-      },
-      "forChannelId": {
-       "type": "string",
-       "description": "The forChannelId parameter specifies a comma-separated list of channel IDs. The API response will then only contain subscriptions matching those channels.",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of the YouTube subscription ID(s) for the resource(s) that are being retrieved. In a subscription resource, the id property specifies the YouTube subscription ID.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "mine": {
-       "type": "boolean",
-       "description": "Set this parameter's value to true to retrieve a feed of the authenticated user's subscriptions.",
-       "location": "query"
-      },
-      "myRecentSubscribers": {
-       "type": "boolean",
-       "description": "Set this parameter's value to true to retrieve a feed of the subscribers of the authenticated user in reverse chronological order (newest first).",
-       "location": "query"
-      },
-      "mySubscribers": {
-       "type": "boolean",
-       "description": "Set this parameter's value to true to retrieve a feed of the subscribers of the authenticated user in no particular order.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "order": {
-       "type": "string",
-       "description": "The order parameter specifies the method that will be used to sort resources in the API response.",
-       "default": "SUBSCRIPTION_ORDER_RELEVANCE",
-       "enum": [
-        "alphabetical",
-        "relevance",
-        "unread"
-       ],
-       "enumDescriptions": [
-        "Sort alphabetically.",
-        "Sort by relevance.",
-        "Sort by order of activity."
-       ],
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more subscription resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a subscription resource, the snippet property contains other properties, such as a display title for the subscription. If you set part=snippet, the API response will also contain all of those nested properties.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "SubscriptionListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "superChatEvents": {
-   "methods": {
-    "list": {
-     "id": "youtube.superChatEvents.list",
-     "path": "superChatEvents",
-     "httpMethod": "GET",
-     "description": "Lists Super Chat events for a channel.",
-     "parameters": {
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports. The parameter value must be a language code included in the list returned by the i18nLanguages.list method.\n\nIf localized resource details are available in that language, the resource's snippet.localized object will contain the localized values. However, if localized details are not available, the snippet.localized object will contain resource details in the resource's default language.",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "0",
-       "maximum": "50",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the superChatEvent resource parts that the API response will include. Supported values are id and snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "SuperChatEventListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    }
-   }
-  },
-  "thumbnails": {
-   "methods": {
-    "set": {
-     "id": "youtube.thumbnails.set",
-     "path": "thumbnails/set",
-     "httpMethod": "POST",
-     "description": "Uploads a custom video thumbnail to YouTube and sets it for a video.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "videoId": {
-       "type": "string",
-       "description": "The videoId parameter specifies a YouTube video ID for which the custom video thumbnail is being provided.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "videoId"
-     ],
-     "response": {
-      "$ref": "ThumbnailSetResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.upload",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ],
-     "supportsMediaUpload": true,
-     "mediaUpload": {
-      "accept": [
-       "application/octet-stream",
-       "image/jpeg",
-       "image/png"
-      ],
-      "maxSize": "2MB",
-      "protocols": {
-       "simple": {
-        "multipart": true,
-        "path": "/upload/youtube/v3/thumbnails/set"
-       },
-       "resumable": {
-        "multipart": true,
-        "path": "/resumable/upload/youtube/v3/thumbnails/set"
-       }
-      }
-     }
-    }
-   }
-  },
-  "videoAbuseReportReasons": {
-   "methods": {
-    "list": {
-     "id": "youtube.videoAbuseReportReasons.list",
-     "path": "videoAbuseReportReasons",
-     "httpMethod": "GET",
-     "description": "Returns a list of abuse reasons that can be used for reporting abusive videos.",
-     "parameters": {
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter specifies the language that should be used for text values in the API response.",
-       "default": "en_US",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the videoCategory resource parts that the API response will include. Supported values are id and snippet.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "VideoAbuseReportReasonListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly"
-     ]
-    }
-   }
-  },
-  "videoCategories": {
-   "methods": {
-    "list": {
-     "id": "youtube.videoCategories.list",
-     "path": "videoCategories",
-     "httpMethod": "GET",
-     "description": "Returns a list of categories that can be associated with YouTube videos.",
-     "parameters": {
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter specifies the language that should be used for text values in the API response.",
-       "default": "en_US",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of video category IDs for the resources that you are retrieving.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies the videoCategory resource properties that the API response will include. Set the parameter value to snippet.",
-       "required": true,
-       "location": "query"
-      },
-      "regionCode": {
-       "type": "string",
-       "description": "The regionCode parameter instructs the API to return the list of video categories available in the specified country. The parameter value is an ISO 3166-1 alpha-2 country code.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "VideoCategoryListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "videos": {
-   "methods": {
-    "delete": {
-     "id": "youtube.videos.delete",
-     "path": "videos",
-     "httpMethod": "DELETE",
-     "description": "Deletes a YouTube video.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube video ID for the resource that is being deleted. In a video resource, the id property specifies the video's ID.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "getRating": {
-     "id": "youtube.videos.getRating",
-     "path": "videos/getRating",
-     "httpMethod": "GET",
-     "description": "Retrieves the ratings that the authorized user gave to a list of specified videos.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of the YouTube video ID(s) for the resource(s) for which you are retrieving rating data. In a video resource, the id property specifies the video's ID.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id"
-     ],
-     "response": {
-      "$ref": "VideoGetRatingResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "insert": {
-     "id": "youtube.videos.insert",
-     "path": "videos",
-     "httpMethod": "POST",
-     "description": "Uploads a video to YouTube and optionally sets the video's metadata.",
-     "parameters": {
-      "autoLevels": {
-       "type": "boolean",
-       "description": "The autoLevels parameter indicates whether YouTube should automatically enhance the video's lighting and color.",
-       "location": "query"
-      },
-      "notifySubscribers": {
-       "type": "boolean",
-       "description": "The notifySubscribers parameter indicates whether YouTube should send a notification about the new video to users who subscribe to the video's channel. A parameter value of True indicates that subscribers will be notified of newly uploaded videos. However, a channel owner who is uploading many videos might prefer to set the value to False to avoid sending a notification about each new video to the channel's subscribers.",
-       "default": "true",
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "onBehalfOfContentOwnerChannel": {
-       "type": "string",
-       "description": "This parameter can only be used in a properly authorized request. Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID of the channel to which a video is being added. This parameter is required when a request specifies a value for the onBehalfOfContentOwner parameter, and it can only be used in conjunction with that parameter. In addition, the request must be authorized using a CMS account that is linked to the content owner that the onBehalfOfContentOwner parameter specifies. Finally, the channel that the onBehalfOfContentOwnerChannel parameter value specifies must be linked to the content owner that the onBehalfOfContentOwner parameter specifies.\n\nThis parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and perform actions on behalf of the channel specified in the parameter value, without having to provide authentication credentials for each separate channel.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nNote that not all parts contain properties that can be set when inserting or updating a video. For example, the statistics object encapsulates statistics that YouTube calculates for a video and does not contain values that you can set or modify. If the parameter value specifies a part that does not contain mutable values, that part will still be included in the API response.",
-       "required": true,
-       "location": "query"
-      },
-      "stabilize": {
-       "type": "boolean",
-       "description": "The stabilize parameter indicates whether YouTube should adjust the video to remove shaky camera motions.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Video"
-     },
-     "response": {
-      "$ref": "Video"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.upload",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ],
-     "supportsMediaUpload": true,
-     "mediaUpload": {
-      "accept": [
-       "application/octet-stream",
-       "video/*"
-      ],
-      "maxSize": "64GB",
-      "protocols": {
-       "simple": {
-        "multipart": true,
-        "path": "/upload/youtube/v3/videos"
-       },
-       "resumable": {
-        "multipart": true,
-        "path": "/resumable/upload/youtube/v3/videos"
-       }
-      }
-     }
-    },
-    "list": {
-     "id": "youtube.videos.list",
-     "path": "videos",
-     "httpMethod": "GET",
-     "description": "Returns a list of videos that match the API request parameters.",
-     "parameters": {
-      "chart": {
-       "type": "string",
-       "description": "The chart parameter identifies the chart that you want to retrieve.",
-       "enum": [
-        "mostPopular"
-       ],
-       "enumDescriptions": [
-        "Return the most popular videos for the specified content region and video category."
-       ],
-       "location": "query"
-      },
-      "hl": {
-       "type": "string",
-       "description": "The hl parameter instructs the API to retrieve localized resource metadata for a specific application language that the YouTube website supports. The parameter value must be a language code included in the list returned by the i18nLanguages.list method.\n\nIf localized resource details are available in that language, the resource's snippet.localized object will contain the localized values. However, if localized details are not available, the snippet.localized object will contain resource details in the resource's default language.",
-       "location": "query"
-      },
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies a comma-separated list of the YouTube video ID(s) for the resource(s) that are being retrieved. In a video resource, the id property specifies the video's ID.",
-       "location": "query"
-      },
-      "locale": {
-       "type": "string",
-       "description": "DEPRECATED",
-       "location": "query"
-      },
-      "maxHeight": {
-       "type": "integer",
-       "description": "The maxHeight parameter specifies a maximum height of the embedded player. If maxWidth is provided, maxHeight may not be reached in order to not violate the width request.",
-       "format": "uint32",
-       "minimum": "72",
-       "maximum": "8192",
-       "location": "query"
-      },
-      "maxResults": {
-       "type": "integer",
-       "description": "The maxResults parameter specifies the maximum number of items that should be returned in the result set.\n\nNote: This parameter is supported for use in conjunction with the myRating and chart parameters, but it is not supported for use in conjunction with the id parameter.",
-       "default": "5",
-       "format": "uint32",
-       "minimum": "1",
-       "maximum": "50",
-       "location": "query"
-      },
-      "maxWidth": {
-       "type": "integer",
-       "description": "The maxWidth parameter specifies a maximum width of the embedded player. If maxHeight is provided, maxWidth may not be reached in order to not violate the height request.",
-       "format": "uint32",
-       "minimum": "72",
-       "maximum": "8192",
-       "location": "query"
-      },
-      "myRating": {
-       "type": "string",
-       "description": "Set this parameter's value to like or dislike to instruct the API to only return videos liked or disliked by the authenticated user.",
-       "enum": [
-        "dislike",
-        "like"
-       ],
-       "enumDescriptions": [
-        "Returns only videos disliked by the authenticated user.",
-        "Returns only video liked by the authenticated user."
-       ],
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "pageToken": {
-       "type": "string",
-       "description": "The pageToken parameter identifies a specific page in the result set that should be returned. In an API response, the nextPageToken and prevPageToken properties identify other pages that could be retrieved.\n\nNote: This parameter is supported for use in conjunction with the myRating and chart parameters, but it is not supported for use in conjunction with the id parameter.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter specifies a comma-separated list of one or more video resource properties that the API response will include.\n\nIf the parameter identifies a property that contains child properties, the child properties will be included in the response. For example, in a video resource, the snippet property contains the channelId, title, description, tags, and categoryId properties. As such, if you set part=snippet, the API response will contain all of those properties.",
-       "required": true,
-       "location": "query"
-      },
-      "regionCode": {
-       "type": "string",
-       "description": "The regionCode parameter instructs the API to select a video chart available in the specified region. This parameter can only be used in conjunction with the chart parameter. The parameter value is an ISO 3166-1 alpha-2 country code.",
-       "location": "query"
-      },
-      "videoCategoryId": {
-       "type": "string",
-       "description": "The videoCategoryId parameter identifies the video category for which the chart should be retrieved. This parameter can only be used in conjunction with the chart parameter. By default, charts are not restricted to a particular category.",
-       "default": "0",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "response": {
-      "$ref": "VideoListResponse"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.readonly",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "rate": {
-     "id": "youtube.videos.rate",
-     "path": "videos/rate",
-     "httpMethod": "POST",
-     "description": "Add a like or dislike rating to a video or remove a rating from a video.",
-     "parameters": {
-      "id": {
-       "type": "string",
-       "description": "The id parameter specifies the YouTube video ID of the video that is being rated or having its rating removed.",
-       "required": true,
-       "location": "query"
-      },
-      "rating": {
-       "type": "string",
-       "description": "Specifies the rating to record.",
-       "required": true,
-       "enum": [
-        "dislike",
-        "like",
-        "none"
-       ],
-       "enumDescriptions": [
-        "Records that the authenticated user disliked the video.",
-        "Records that the authenticated user liked the video.",
-        "Removes any rating that the authenticated user had previously set for the video."
-       ],
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "id",
-      "rating"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "reportAbuse": {
-     "id": "youtube.videos.reportAbuse",
-     "path": "videos/reportAbuse",
-     "httpMethod": "POST",
-     "description": "Report abuse for a video.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "request": {
-      "$ref": "VideoAbuseReport"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    },
-    "update": {
-     "id": "youtube.videos.update",
-     "path": "videos",
-     "httpMethod": "PUT",
-     "description": "Updates a video's metadata.",
-     "parameters": {
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The actual CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      },
-      "part": {
-       "type": "string",
-       "description": "The part parameter serves two purposes in this operation. It identifies the properties that the write operation will set as well as the properties that the API response will include.\n\nNote that this method will override the existing values for all of the mutable properties that are contained in any parts that the parameter value specifies. For example, a video's privacy setting is contained in the status part. As such, if your request is updating a private video, and the request's part parameter value includes the status part, the video's privacy setting will be updated to whatever value the request body specifies. If the request body does not specify a value, the existing privacy setting will be removed and the video will revert to the default privacy setting.\n\nIn addition, not all parts contain properties that can be set when inserting or updating a video. For example, the statistics object encapsulates statistics that YouTube calculates for a video and does not contain values that you can set or modify. If the parameter value specifies a part that does not contain mutable values, that part will still be included in the API response.",
-       "required": true,
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "part"
-     ],
-     "request": {
-      "$ref": "Video"
-     },
-     "response": {
-      "$ref": "Video"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  },
-  "watermarks": {
-   "methods": {
-    "set": {
-     "id": "youtube.watermarks.set",
-     "path": "watermarks/set",
-     "httpMethod": "POST",
-     "description": "Uploads a watermark image to YouTube and sets it for a channel.",
-     "parameters": {
-      "channelId": {
-       "type": "string",
-       "description": "The channelId parameter specifies the YouTube channel ID for which the watermark is being provided.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "channelId"
-     ],
-     "request": {
-      "$ref": "InvideoBranding"
-     },
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtube.upload",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ],
-     "supportsMediaUpload": true,
-     "mediaUpload": {
-      "accept": [
-       "application/octet-stream",
-       "image/jpeg",
-       "image/png"
-      ],
-      "maxSize": "10MB",
-      "protocols": {
-       "simple": {
-        "multipart": true,
-        "path": "/upload/youtube/v3/watermarks/set"
-       },
-       "resumable": {
-        "multipart": true,
-        "path": "/resumable/upload/youtube/v3/watermarks/set"
-       }
-      }
-     }
-    },
-    "unset": {
-     "id": "youtube.watermarks.unset",
-     "path": "watermarks/unset",
-     "httpMethod": "POST",
-     "description": "Deletes a channel's watermark image.",
-     "parameters": {
-      "channelId": {
-       "type": "string",
-       "description": "The channelId parameter specifies the YouTube channel ID for which the watermark is being unset.",
-       "required": true,
-       "location": "query"
-      },
-      "onBehalfOfContentOwner": {
-       "type": "string",
-       "description": "Note: This parameter is intended exclusively for YouTube content partners.\n\nThe onBehalfOfContentOwner parameter indicates that the request's authorization credentials identify a YouTube CMS user who is acting on behalf of the content owner specified in the parameter value. This parameter is intended for YouTube content partners that own and manage many different YouTube channels. It allows content owners to authenticate once and get access to all their video and channel data, without having to provide authentication credentials for each individual channel. The CMS account that the user authenticates with must be linked to the specified YouTube content owner.",
-       "location": "query"
-      }
-     },
-     "parameterOrder": [
-      "channelId"
-     ],
-     "scopes": [
-      "https://www.googleapis.com/auth/youtube",
-      "https://www.googleapis.com/auth/youtube.force-ssl",
-      "https://www.googleapis.com/auth/youtubepartner"
-     ]
-    }
-   }
-  }
- }
-}
diff --git a/test/data/youtube-playlistid.json b/test/data/youtube-playlistid.json
deleted file mode 100644
index b69205f434..0000000000
--- a/test/data/youtube-playlistid.json
+++ /dev/null
@@ -1 +0,0 @@
-{"regionCode": "US", "kind": "youtube#searchListResponse", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/eoV8llUEbIu5LXnwqBaLOkOK0Hg\"", "pageInfo": {"resultsPerPage": 1, "totalResults": 1}, "items": [{"snippet": {"thumbnails": {"default": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/default.jpg", "width": 120, "height": 90}, "high": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/hqdefault.jpg", "width": 480, "height": 360}, "medium": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/mqdefault.jpg", "width": 320, "height": 180}}, "title": "IETF98", "channelId": "UC8dtK9njBLdFnBahHFp0eZQ", "publishedAt": "2017-03-30T12:41:04.000Z", "liveBroadcastContent": "none", "channelTitle": "IETF - Internet Engineering Task Force", "description": "Videos from the IETF 98 Meeting held in Chicago, Illinois, United States 26-31 March 2017."}, "kind": "youtube#searchResult", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/X3dbZGRvgpvedtOP0KLGhZLg5UI\"", "id": {"kind": "youtube#playlist", "playlistId": "PLC86T-test"}}]}
diff --git a/test/data/youtube-playlistitems.json b/test/data/youtube-playlistitems.json
deleted file mode 100644
index 4b42e3d21b..0000000000
--- a/test/data/youtube-playlistitems.json
+++ /dev/null
@@ -1 +0,0 @@
-{"items": [{"snippet": {"playlistId": "PLC86T-6ZTP5jo6kIuqdyeYYhsKv9sUwG1", "thumbnails": {"default": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/default.jpg", "width": 120, "height": 90}, "high": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/hqdefault.jpg", "width": 480, "height": 360}, "medium": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/mqdefault.jpg", "width": 320, "height": 180}, "maxres": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/maxresdefault.jpg", "width": 1280, "height": 720}, "standard": {"url": "https://i.ytimg.com/vi/lhYWB5FFkg4/sddefault.jpg", "width": 640, "height": 480}}, "title": "IETF98 Wrap Up", "resourceId": {"kind": "youtube#video", "videoId": "lhYWB5FFkg4"}, "channelId": "UC8dtK9njBLdFnBahHFp0eZQ", "publishedAt": "2017-04-06T13:32:39.000Z", "channelTitle": "IETF - Internet Engineering Task Force", "position": 0, "description": "Jari Arkko and Alissa Cooper recap some highlights the IETF 98 meeting held 26-31 March 2017 in Chicago, Illinois, United States"}, "kind": "youtube#playlistItem", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/eW_De3gQF2fRzN_rPBbX-kY7oBI\"", "id": "UExDODZULTZaVFA1am82a0l1cWR5ZVlZaHNLdjlzVXdHMS40OTQ5QjlEMDgzN0FBNUIw"}, {"snippet": {"playlistId": "PLC86T-6ZTP5jo6kIuqdyeYYhsKv9sUwG1", "thumbnails": {"default": {"url": "https://i.ytimg.com/vi/lPSTcBITbvs/default.jpg", "width": 120, "height": 90}, "high": {"url": "https://i.ytimg.com/vi/lPSTcBITbvs/hqdefault.jpg", "width": 480, "height": 360}, "medium": {"url": "https://i.ytimg.com/vi/lPSTcBITbvs/mqdefault.jpg", "width": 320, "height": 180}}, "title": "IETF 98 - QUIC Tutorial", "resourceId": {"kind": "youtube#video", "videoId": "lPSTcBITbvs"}, "channelId": "UC8dtK9njBLdFnBahHFp0eZQ", "publishedAt": "2017-03-30T12:41:35.000Z", "channelTitle": "IETF - Internet Engineering Task Force", "position": 1, "description": "A tutorial about the new QUIC protocol"}, "kind": "youtube#playlistItem", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/GhKVt6zTuEpFavgtf9GWlWuzX9s\"", "id": "UExDODZULTZaVFA1am82a0l1cWR5ZVlZaHNLdjlzVXdHMS41NkI0NEY2RDEwNTU3Q0M2"}], "kind": "youtube#playlistItemListResponse", "etag": "\"m2yskBQFythfE4irbTIeOgYYfBU/jlFue-jZVpFMOuLUXQZH4Y0Lh3Y\"", "pageInfo": {"resultsPerPage": 2, "totalResults": 110}}
diff --git a/test/lib/.gitignore b/test/lib/.gitignore
deleted file mode 100644
index 330b0c2b64..0000000000
--- a/test/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/django
diff --git a/test/lib/README b/test/lib/README
deleted file mode 100644
index 2dda507f05..0000000000
--- a/test/lib/README
+++ /dev/null
@@ -1,9 +0,0 @@
-This directory will be used to set up packages used for testing if they need any
-special handling which should not be applied to the system-wide setup.
-
-For instance, many of the tests to be run on the Django application should be run
-with a standard Django environment; but there are some Django test features which
-are broken in 0.9.6, and need patching in order to do the testing, like the ability
-to create a test database to run unit tests, according to this issue and patch:
-http://code.djangoproject.com/changeset/5106
-
diff --git a/test/media/floor/.gitignore b/test/media/floor/.gitignore
deleted file mode 100644
index 33662f5545..0000000000
--- a/test/media/floor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*
diff --git a/test/media/photo/.gitignore b/test/media/photo/.gitignore
deleted file mode 100644
index 33662f5545..0000000000
--- a/test/media/photo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*
diff --git a/test/settings_local_test.py b/test/settings_local_test.py
index 06d810e4af..7097f76459 100644
--- a/test/settings_local_test.py
+++ b/test/settings_local_test.py
@@ -5,6 +5,5 @@
 
 SERVER_MODE = 'test'
 
-IPR_DOCUMENT_PATH = '/home/ietf/adm/IPR/'
 
 SITE_ID = 1
diff --git a/vite.config.js b/vite.config.js
index c7e81bc169..bde2b9ed57 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,6 +2,7 @@ import { defineConfig } from 'vite'
 import { resolve } from 'path'
 import vue from '@vitejs/plugin-vue'
 import servePreviewAssets from './dev/vite-plugins/serve-preview-assets'
+import precompileLodashTemplates from './dev/vite-plugins/precompile-lodash-templates'
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command, mode }) => {
@@ -15,11 +16,17 @@ export default defineConfig(({ command, mode }) => {
           main: 'client/main.js',
           embedded: 'client/embedded.js'
         }
-      }
+      },
+      sourcemap: true
     },
     cacheDir: '.vite',
     plugins: [
-      vue()
+      vue(),
+      precompileLodashTemplates({
+        include: [
+          '**/shared/urls.js'
+        ]
+      })
     ],
     publicDir: 'ietf/static/public',
     server: {
diff --git a/yarn.lock b/yarn.lock
index 8644a3ea74..54768ac391 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,6 +5,13 @@ __metadata:
   version: 6
   cacheKey: 8
 
+"@aashutoshrathi/word-wrap@npm:^1.2.3":
+  version: 1.2.6
+  resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
+  checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd
+  languageName: node
+  linkType: hard
+
 "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.0, @babel/code-frame@npm:^7.16.0":
   version: 7.16.7
   resolution: "@babel/code-frame@npm:7.16.7"
@@ -32,7 +39,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.16.4, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
+"@babel/parser@npm:^7.23.9":
+  version: 7.23.9
+  resolution: "@babel/parser@npm:7.23.9"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: e7cd4960ac8671774e13803349da88d512f9292d7baa952173260d3e8f15620a28a3701f14f709d769209022f9e7b79965256b8be204fc550cfe783cdcabe7c7
+  languageName: node
+  linkType: hard
+
+"@babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
   version: 7.18.4
   resolution: "@babel/parser@npm:7.18.4"
   bin:
@@ -41,6 +57,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.21.0":
+  version: 7.23.2
+  resolution: "@babel/runtime@npm:7.23.2"
+  dependencies:
+    regenerator-runtime: ^0.14.0
+  checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:^7.6.1, @babel/types@npm:^7.8.3, @babel/types@npm:^7.9.6":
   version: 7.18.4
   resolution: "@babel/types@npm:7.18.4"
@@ -58,19 +83,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@colors/colors@npm:1.5.0":
-  version: 1.5.0
-  resolution: "@colors/colors@npm:1.5.0"
-  checksum: d64d5260bed1d5012ae3fc617d38d1afc0329fec05342f4e6b838f46998855ba56e0a73833f4a80fa8378c84810da254f76a8a19c39d038260dc06dc4e007425
-  languageName: node
-  linkType: hard
-
-"@css-render/plugin-bem@npm:^0.15.10":
-  version: 0.15.10
-  resolution: "@css-render/plugin-bem@npm:0.15.10"
+"@css-render/plugin-bem@npm:^0.15.12":
+  version: 0.15.12
+  resolution: "@css-render/plugin-bem@npm:0.15.12"
   peerDependencies:
-    css-render: ~0.15.10
-  checksum: cbab72a7b5e6cec84041f8ea01b4e5c6d83e44f2a5c8e6cbba3b2a41a8b5ed5faf22390336d70648b5e471d7aab6b13123c0cdaea1bd21c6678d18abd399a203
+    css-render: ~0.15.12
+  checksum: 9fa7ddd62b19beefa1280d731bc45f26f016e0f4f4535025247b4de831b3a37f72f7eaa7098c10fac784a5f1eb723078ee293068e77c04e6e40953f260e4fc14
   languageName: node
   linkType: hard
 
@@ -83,39 +101,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cypress/request@npm:^2.88.10":
-  version: 2.88.10
-  resolution: "@cypress/request@npm:2.88.10"
-  dependencies:
-    aws-sign2: ~0.7.0
-    aws4: ^1.8.0
-    caseless: ~0.12.0
-    combined-stream: ~1.0.6
-    extend: ~3.0.2
-    forever-agent: ~0.6.1
-    form-data: ~2.3.2
-    http-signature: ~1.3.6
-    is-typedarray: ~1.0.0
-    isstream: ~0.1.2
-    json-stringify-safe: ~5.0.1
-    mime-types: ~2.1.19
-    performance-now: ^2.1.0
-    qs: ~6.5.2
-    safe-buffer: ^5.1.2
-    tough-cookie: ~2.5.0
-    tunnel-agent: ^0.6.0
-    uuid: ^8.3.2
-  checksum: 69c3e3b332e9be4866a900f6bcca5d274d8cea6c99707fbcce061de8dbab11c9b1e39f4c017f6e83e6e682717781d4f6106fd6b7cf9546580fcfac353b6676cf
-  languageName: node
-  linkType: hard
-
-"@cypress/xvfb@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "@cypress/xvfb@npm:1.2.4"
-  dependencies:
-    debug: ^3.1.0
-    lodash.once: ^4.1.1
-  checksum: 7bdcdaeb1bb692ec9d9bf8ec52538aa0bead6764753f4a067a171a511807a43fab016f7285a56bef6a606c2467ff3f1365e1ad2d2d583b81beed849ee1573fd1
+"@css-render/vue3-ssr@npm:^0.15.12":
+  version: 0.15.12
+  resolution: "@css-render/vue3-ssr@npm:0.15.12"
+  peerDependencies:
+    vue: ^3.0.11
+  checksum: a5505ae1619827dd2f2d1e294f58c927e8e292c93aa6750ffcb8690cc57e797a01c23c828dd4c9a3bde3add500c2385bd85905bb7f3280c76be2010f1c15537d
   languageName: node
   linkType: hard
 
@@ -126,122 +117,318 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "@eslint/eslintrc@npm:1.3.2"
+"@esbuild/android-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-arm64@npm:0.18.20"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-arm@npm:0.18.20"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/android-x64@npm:0.18.20"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/darwin-arm64@npm:0.18.20"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/darwin-x64@npm:0.18.20"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/freebsd-arm64@npm:0.18.20"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/freebsd-x64@npm:0.18.20"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-arm64@npm:0.18.20"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-arm@npm:0.18.20"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ia32@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-ia32@npm:0.18.20"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-loong64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-loong64@npm:0.18.20"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-mips64el@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-mips64el@npm:0.18.20"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ppc64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-ppc64@npm:0.18.20"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-riscv64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-riscv64@npm:0.18.20"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-s390x@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-s390x@npm:0.18.20"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/linux-x64@npm:0.18.20"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/netbsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/netbsd-x64@npm:0.18.20"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/openbsd-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/openbsd-x64@npm:0.18.20"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/sunos-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/sunos-x64@npm:0.18.20"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-arm64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-arm64@npm:0.18.20"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-ia32@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-ia32@npm:0.18.20"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-x64@npm:0.18.20":
+  version: 0.18.20
+  resolution: "@esbuild/win32-x64@npm:0.18.20"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@eslint-community/eslint-utils@npm:^4.1.2, @eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
+  dependencies:
+    eslint-visitor-keys: ^3.3.0
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
+  languageName: node
+  linkType: hard
+
+"@eslint-community/regexpp@npm:^4.6.0":
+  version: 4.10.0
+  resolution: "@eslint-community/regexpp@npm:4.10.0"
+  checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b
+  languageName: node
+  linkType: hard
+
+"@eslint-community/regexpp@npm:^4.6.1":
+  version: 4.8.0
+  resolution: "@eslint-community/regexpp@npm:4.8.0"
+  checksum: 601e6d033d556e98e8c929905bef335f20d7389762812df4d0f709d9b4d2631610dda975fb272e23b5b68e24a163b3851b114c8080a0a19fb4c141a1eff6305b
+  languageName: node
+  linkType: hard
+
+"@eslint/eslintrc@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "@eslint/eslintrc@npm:2.1.4"
   dependencies:
     ajv: ^6.12.4
     debug: ^4.3.2
-    espree: ^9.4.0
-    globals: ^13.15.0
+    espree: ^9.6.0
+    globals: ^13.19.0
     ignore: ^5.2.0
     import-fresh: ^3.2.1
     js-yaml: ^4.1.0
     minimatch: ^3.1.2
     strip-json-comments: ^3.1.1
-  checksum: 2074dca47d7e1c5c6323ff353f690f4b25d3ab53fe7d27337e2592d37a894cf60ca0e85ca66b50ff2db0bc7e630cc1e9c7347d65bb185b61416565584c38999c
+  checksum: 10957c7592b20ca0089262d8c2a8accbad14b4f6507e35416c32ee6b4dbf9cad67dfb77096bbd405405e9ada2b107f3797fe94362e1c55e0b09d6e90dd149127
   languageName: node
   linkType: hard
 
-"@faker-js/faker@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@faker-js/faker@npm:7.5.0"
-  checksum: 6f2c48a8017d486eddfe2c3e0b743b810bcc948e5dbd1395c44a38471294584636f565cb081517ce90b634f50d8678d1d38d0f7b6b48b7d402e0a2602cf4f2d9
+"@eslint/js@npm:8.57.0":
+  version: 8.57.0
+  resolution: "@eslint/js@npm:8.57.0"
+  checksum: 315dc65b0e9893e2bff139bddace7ea601ad77ed47b4550e73da8c9c2d2766c7a575c3cddf17ef85b8fd6a36ff34f91729d0dcca56e73ca887c10df91a41b0bb
   languageName: node
   linkType: hard
 
-"@fullcalendar/bootstrap5@npm:5.11.3":
-  version: 5.11.3
-  resolution: "@fullcalendar/bootstrap5@npm:5.11.3"
+"@floating-ui/core@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "@floating-ui/core@npm:1.4.1"
   dependencies:
-    "@fullcalendar/common": ~5.11.3
-    tslib: ^2.1.0
-  checksum: a63a500d729c570ce70a85b1fbeb8f8cd5f3958240b89a9e557fc25520901e4397f20c60018e131dfb958985a3d8b2e5aab91b26a6a57be440c251984ba8e8da
+    "@floating-ui/utils": ^0.1.1
+  checksum: be4ab864fe17eeba5e205bd554c264b9a4895a57c573661bbf638357fa3108677fed7ba3269ec15b4da90e29274c9b626d5a15414e8d1fe691e210d02a03695c
   languageName: node
   linkType: hard
 
-"@fullcalendar/common@npm:~5.11.3":
-  version: 5.11.3
-  resolution: "@fullcalendar/common@npm:5.11.3"
+"@floating-ui/dom@npm:^1.5.1":
+  version: 1.5.2
+  resolution: "@floating-ui/dom@npm:1.5.2"
   dependencies:
-    tslib: ^2.1.0
-  checksum: be4b365dca5ed075cc03aedbc0d6dcaa11f6e2ea6833c783212c79c7b657686a2dfc5390f1ead32bf596445a025daaa1a1179f2d4d563b71b4e1986d801c2fd4
+    "@floating-ui/core": ^1.4.1
+    "@floating-ui/utils": ^0.1.1
+  checksum: 3c71eed50bb22cec8f1f31750ad3d42b3b7b4b29dc6e4351100ff05a62445a5404abb71c733320f8376a8c5e78852e1cfba1b81e22bfc4ca0728f50ca8998dc5
   languageName: node
   linkType: hard
 
-"@fullcalendar/core@npm:5.11.3, @fullcalendar/core@npm:~5.11.2":
-  version: 5.11.3
-  resolution: "@fullcalendar/core@npm:5.11.3"
-  dependencies:
-    "@fullcalendar/common": ~5.11.3
-    preact: ^10.0.5
-    tslib: ^2.1.0
-  checksum: 2774d0fa18c7a54676f706a1fdec7dd009b1d00add2dce68cd144b763d851d458461c67a9d534e5e553d7a133c49b0f1ea4868d286a5af57029092248421652a
+"@floating-ui/utils@npm:^0.1.1":
+  version: 0.1.2
+  resolution: "@floating-ui/utils@npm:0.1.2"
+  checksum: 3e29fd3c69be2d27bb95ebe54129a6a29ea2d8112b2cbb568168cf2f1e787e6ed6305d743598469476bec28122b7ea3ea4b54a1a2d59d30dc4b4307391472299
   languageName: node
   linkType: hard
 
-"@fullcalendar/daygrid@npm:5.11.3, @fullcalendar/daygrid@npm:~5.11.3":
-  version: 5.11.3
-  resolution: "@fullcalendar/daygrid@npm:5.11.3"
-  dependencies:
-    "@fullcalendar/common": ~5.11.3
-    tslib: ^2.1.0
-  checksum: 426b53c5bb21a9e7df82bf70b44221fb5c50e0d6216fbc91d586abffe48e61ed582aa4b5cb1ede78ba16063ded30f5ea1ec1cc5db51932b644825fcef87d2b15
+"@fullcalendar/bootstrap5@npm:6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/bootstrap5@npm:6.1.11"
+  peerDependencies:
+    "@fullcalendar/core": ~6.1.11
+  checksum: a0c3b9434668f0ba9b19765d13ff53bbc536ac530dc4303ed7a0812f1dafd7ed094073328cdfd58608ff00e13fe9e42f38d8314372642a14e17fb582bfb6eb24
   languageName: node
   linkType: hard
 
-"@fullcalendar/interaction@npm:5.11.3":
-  version: 5.11.3
-  resolution: "@fullcalendar/interaction@npm:5.11.3"
+"@fullcalendar/core@npm:6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/core@npm:6.1.11"
   dependencies:
-    "@fullcalendar/common": ~5.11.3
-    tslib: ^2.1.0
-  checksum: e8a1b49f2f89d2139decb1a85aebc3ae45d324151fe5a2bd4b3e9f75ed48a7a8548bf05a25bc01015a1242b90ffe23ccc24f2787f5cf9b6e5ce22f74d7c3d731
+    preact: ~10.12.1
+  checksum: 0078a6f96b06a637de08ba28a317bbcbf7768f53ce7891faa2a656ca2bed0e887e555d6f3203b77d6c271ccb128fa85d592411fcfd87746514a5cec68376ad87
   languageName: node
   linkType: hard
 
-"@fullcalendar/list@npm:5.11.3":
-  version: 5.11.3
-  resolution: "@fullcalendar/list@npm:5.11.3"
-  dependencies:
-    "@fullcalendar/common": ~5.11.3
-    tslib: ^2.1.0
-  checksum: 976da49b12fbfbf19a37411b48e2ea334ae9150dedea4df98154d8240c00e9da5fead392a5be8a7af5c88dccc56e13796872645bd05b534cff7010a6a0596f06
+"@fullcalendar/daygrid@npm:6.1.11, @fullcalendar/daygrid@npm:~6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/daygrid@npm:6.1.11"
+  peerDependencies:
+    "@fullcalendar/core": ~6.1.11
+  checksum: 6eb5606de58b7a8ec30d96618a6d15b2c0d7108c94593ff94e81a8d87ce8efb1f29f3849c6c3f2b8ae56198ffe6235e2ec0e4a1270993c022dc194016e595685
   languageName: node
   linkType: hard
 
-"@fullcalendar/luxon2@npm:5.11.3":
-  version: 5.11.3
-  resolution: "@fullcalendar/luxon2@npm:5.11.3"
-  dependencies:
-    "@fullcalendar/common": ~5.11.3
-    tslib: ^2.1.0
+"@fullcalendar/icalendar@npm:6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/icalendar@npm:6.1.11"
   peerDependencies:
-    luxon: ^2.0.0
-  checksum: 75330185901d30a02a91363ed58241d60ae088ae8beec7146f7fd33fa1d28e4fea62152e58fc772f40fc5de4d198f3106c240c79883d3108ec3d97060c7618b0
+    "@fullcalendar/core": ~6.1.11
+    ical.js: ^1.4.0
+  checksum: 4e6eff15a81dda9d275ba555a0b4648a1410c1504694915a1669eb3c1c2299e1bce2817b78dbf33378621972bb0bc90a1d1f53515dc071b5f5abf79d10d1854a
   languageName: node
   linkType: hard
 
-"@fullcalendar/timegrid@npm:5.11.3":
-  version: 5.11.3
-  resolution: "@fullcalendar/timegrid@npm:5.11.3"
-  dependencies:
-    "@fullcalendar/common": ~5.11.3
-    "@fullcalendar/daygrid": ~5.11.3
-    tslib: ^2.1.0
-  checksum: ce675eca7da78ec7aab5c16eb951a70802998a0215c2c42a003afd375680817cf05a7bab1b271333e88634da3ebd50fc238c368ce49241ec9716b0f57276d4f0
+"@fullcalendar/interaction@npm:6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/interaction@npm:6.1.11"
+  peerDependencies:
+    "@fullcalendar/core": ~6.1.11
+  checksum: c67d4cfa0b158b848fb482835c5f44c52650037a4b912e16e2ea1955bf476c847d0ec95aea79b37b78207b2da3a7c4d2b37bd5c8b15a89bdd5e3b7ae3b7af9ba
   languageName: node
   linkType: hard
 
-"@fullcalendar/vue3@npm:5.11.2":
-  version: 5.11.2
-  resolution: "@fullcalendar/vue3@npm:5.11.2"
+"@fullcalendar/list@npm:6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/list@npm:6.1.11"
+  peerDependencies:
+    "@fullcalendar/core": ~6.1.11
+  checksum: 84a8cd6e63407e8fb95b4b2810a49c8815d9491a298a4761b9399cc8384abebf6227cc5ec93b942783f6ea6c6bcb4e94844fd5a12d73700e535f4f15ee02b7d6
+  languageName: node
+  linkType: hard
+
+"@fullcalendar/luxon3@npm:6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/luxon3@npm:6.1.11"
+  peerDependencies:
+    "@fullcalendar/core": ~6.1.11
+    luxon: ^3.0.0
+  checksum: 8e7f45aab2e2235b2027ca99aeabb35a91f0b2fcb608d52357abb582b4640ed8a0d7a4569ffa25628fbe04d2ee13051ec66304c6abef7cd7a364fa173db09ab7
+  languageName: node
+  linkType: hard
+
+"@fullcalendar/timegrid@npm:6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/timegrid@npm:6.1.11"
   dependencies:
-    "@fullcalendar/core": ~5.11.2
-    tslib: ^2.1.0
+    "@fullcalendar/daygrid": ~6.1.11
+  peerDependencies:
+    "@fullcalendar/core": ~6.1.11
+  checksum: 4a11e6dd908e7d7f660149e6d61eff847efa14d0dcf532f8793de6b035d1a573ef7423fea0df791b6dc5f3d9792df77b72c7e6a1150289d04eca3ff9959a80ec
+  languageName: node
+  linkType: hard
+
+"@fullcalendar/vue3@npm:6.1.11":
+  version: 6.1.11
+  resolution: "@fullcalendar/vue3@npm:6.1.11"
   peerDependencies:
+    "@fullcalendar/core": ~6.1.11
     vue: ^3.0.11
-  checksum: 779f4d8d857acf1a60ce8251fbd9670b0deb6d943c71d0c1792c80799514ab154f85f4c68eb9b42027c22f896c9086baf96183dd30d69de1b940b18b93bd2b3f
+  checksum: 5891a596e92269151cb62feaaffdc87ac8ad55b277e8bbad435855ab872fabb2f88766b8bc0659745c5205e3550a2c8923c5fc990ade8401de2ed6a2a9c5701e
   languageName: node
   linkType: hard
 
@@ -252,30 +439,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@html-validate/stylish@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@html-validate/stylish@npm:3.0.0"
+"@html-validate/stylish@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "@html-validate/stylish@npm:4.1.0"
   dependencies:
     kleur: ^4.0.0
-  checksum: 818efd25ac4bd2fcc6728710edb064c0214d0c959a380b2026ae9d6a7d8e8bd153dad13a939aa042fa1fdf7e61cdde5eb13cc2031a7190a4e07e6c30ebb44a41
+  checksum: 4af90db4f9e8855e9b411e9bec9cd6644a5026c49383621a9257e814823fa2deac9eb65ab89b36bb327071a0669560994ec9831a6fbd883428200d0d36e2f9a9
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.10.5":
-  version: 0.10.7
-  resolution: "@humanwhocodes/config-array@npm:0.10.7"
+"@humanwhocodes/config-array@npm:^0.11.14":
+  version: 0.11.14
+  resolution: "@humanwhocodes/config-array@npm:0.11.14"
   dependencies:
-    "@humanwhocodes/object-schema": ^1.2.1
-    debug: ^4.1.1
-    minimatch: ^3.0.4
-  checksum: 009d64be8d5bd098ff04e10af79e34f5633245250581fca032fac12a8667b2df8e7d169e69c05bff4d83ea3dd3c7d2d0e05ea9b94d89a7d092e26530caf6f8a3
-  languageName: node
-  linkType: hard
-
-"@humanwhocodes/gitignore-to-minimatch@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@humanwhocodes/gitignore-to-minimatch@npm:1.0.2"
-  checksum: aba5c40c9e3770ed73a558b0bfb53323842abfc2ce58c91d7e8b1073995598e6374456d38767be24ab6176915f0a8d8b23eaae5c85e2b488c0dccca6d795e2ad
+    "@humanwhocodes/object-schema": ^2.0.2
+    debug: ^4.3.1
+    minimatch: ^3.0.5
+  checksum: 861ccce9eaea5de19546653bccf75bf09fe878bc39c3aab00aeee2d2a0e654516adad38dd1098aab5e3af0145bbcbf3f309bdf4d964f8dab9dcd5834ae4c02f2
   languageName: node
   linkType: hard
 
@@ -286,10 +466,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@humanwhocodes/object-schema@npm:1.2.1"
-  checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1
+"@humanwhocodes/object-schema@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@humanwhocodes/object-schema@npm:2.0.2"
+  checksum: 2fc11503361b5fb4f14714c700c02a3f4c7c93e9acd6b87a29f62c522d90470f364d6161b03d1cc618b979f2ae02aed1106fd29d302695d8927e2fc8165ba8ee
+  languageName: node
+  linkType: hard
+
+"@isaacs/cliui@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@isaacs/cliui@npm:8.0.2"
+  dependencies:
+    string-width: ^5.1.2
+    string-width-cjs: "npm:string-width@^4.2.0"
+    strip-ansi: ^7.0.1
+    strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
+    wrap-ansi: ^8.1.0
+    wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
+  checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb
   languageName: node
   linkType: hard
 
@@ -314,6 +508,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jridgewell/sourcemap-codec@npm:^1.4.15":
+  version: 1.4.15
+  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
+  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
+  languageName: node
+  linkType: hard
+
 "@jridgewell/trace-mapping@npm:^0.3.12":
   version: 0.3.14
   resolution: "@jridgewell/trace-mapping@npm:0.3.14"
@@ -354,6 +555,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lmdb/lmdb-darwin-arm64@npm:2.8.5":
+  version: 2.8.5
+  resolution: "@lmdb/lmdb-darwin-arm64@npm:2.8.5"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@lmdb/lmdb-darwin-x64@npm:2.5.2":
   version: 2.5.2
   resolution: "@lmdb/lmdb-darwin-x64@npm:2.5.2"
@@ -361,6 +569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lmdb/lmdb-darwin-x64@npm:2.8.5":
+  version: 2.8.5
+  resolution: "@lmdb/lmdb-darwin-x64@npm:2.8.5"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@lmdb/lmdb-linux-arm64@npm:2.5.2":
   version: 2.5.2
   resolution: "@lmdb/lmdb-linux-arm64@npm:2.5.2"
@@ -368,6 +583,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lmdb/lmdb-linux-arm64@npm:2.8.5":
+  version: 2.8.5
+  resolution: "@lmdb/lmdb-linux-arm64@npm:2.8.5"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@lmdb/lmdb-linux-arm@npm:2.5.2":
   version: 2.5.2
   resolution: "@lmdb/lmdb-linux-arm@npm:2.5.2"
@@ -375,6 +597,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lmdb/lmdb-linux-arm@npm:2.8.5":
+  version: 2.8.5
+  resolution: "@lmdb/lmdb-linux-arm@npm:2.8.5"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@lmdb/lmdb-linux-x64@npm:2.5.2":
   version: 2.5.2
   resolution: "@lmdb/lmdb-linux-x64@npm:2.5.2"
@@ -382,6 +611,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lmdb/lmdb-linux-x64@npm:2.8.5":
+  version: 2.8.5
+  resolution: "@lmdb/lmdb-linux-x64@npm:2.8.5"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@lmdb/lmdb-win32-x64@npm:2.5.2":
   version: 2.5.2
   resolution: "@lmdb/lmdb-win32-x64@npm:2.5.2"
@@ -389,6 +625,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lmdb/lmdb-win32-x64@npm:2.8.5":
+  version: 2.8.5
+  resolution: "@lmdb/lmdb-win32-x64@npm:2.8.5"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@mischnic/json-sourcemap@npm:^0.1.0":
   version: 0.1.0
   resolution: "@mischnic/json-sourcemap@npm:0.1.0"
@@ -407,6 +650,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.2":
+  version: 3.0.2
+  resolution: "@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.2"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:2.0.2":
   version: 2.0.2
   resolution: "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:2.0.2"
@@ -414,6 +664,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.2":
+  version: 3.0.2
+  resolution: "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.2"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:2.0.2":
   version: 2.0.2
   resolution: "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:2.0.2"
@@ -421,6 +678,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.2":
+  version: 3.0.2
+  resolution: "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.2"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@msgpackr-extract/msgpackr-extract-linux-arm@npm:2.0.2":
   version: 2.0.2
   resolution: "@msgpackr-extract/msgpackr-extract-linux-arm@npm:2.0.2"
@@ -428,6 +692,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.2":
+  version: 3.0.2
+  resolution: "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.2"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@msgpackr-extract/msgpackr-extract-linux-x64@npm:2.0.2":
   version: 2.0.2
   resolution: "@msgpackr-extract/msgpackr-extract-linux-x64@npm:2.0.2"
@@ -435,6 +706,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.2":
+  version: 3.0.2
+  resolution: "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.2"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@msgpackr-extract/msgpackr-extract-win32-x64@npm:2.0.2":
   version: 2.0.2
   resolution: "@msgpackr-extract/msgpackr-extract-win32-x64@npm:2.0.2"
@@ -442,6 +720,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.2":
+  version: 3.0.2
+  resolution: "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.2"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@nodelib/fs.scandir@npm:2.1.5":
   version: 2.1.5
   resolution: "@nodelib/fs.scandir@npm:2.1.5"
@@ -452,14 +737,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
+"@nodelib/fs.stat@npm:2.0.5":
   version: 2.0.5
   resolution: "@nodelib/fs.stat@npm:2.0.5"
   checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0
   languageName: node
   linkType: hard
 
-"@nodelib/fs.walk@npm:^1.2.3":
+"@nodelib/fs.walk@npm:^1.2.8":
   version: 1.2.8
   resolution: "@nodelib/fs.walk@npm:1.2.8"
   dependencies:
@@ -489,16 +774,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/bundler-default@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/bundler-default@npm:2.7.0"
+"@parcel/bundler-default@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/bundler-default@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/hash": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/graph": 3.2.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/rust": 2.12.0
+    "@parcel/utils": 2.12.0
     nullthrows: ^1.1.1
-  checksum: 0efb78be2e8873d951549f0e6e25fe441ff7a0220bc8414430c8ddd4a7cb3ae84b100a5cc761277af699bf736e3631eb0fa456bdec1141a7bddc5f0f52312522
+  checksum: f211a76f55dc34918715c5f1911660cfe0461a55a975929fd419a57423c97eeb4f6db9c14775fc078f6879916cef185f468a1e97077d13a76cf735dc1c885892
+  languageName: node
+  linkType: hard
+
+"@parcel/cache@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/cache@npm:2.12.0"
+  dependencies:
+    "@parcel/fs": 2.12.0
+    "@parcel/logger": 2.12.0
+    "@parcel/utils": 2.12.0
+    lmdb: 2.8.5
+  peerDependencies:
+    "@parcel/core": ^2.12.0
+  checksum: a45e7998098c4ad31e8a55ea242b50ec638fb3d4614293cf1910a6f227ccc8e324ab56a7486d66d88a6e6d9f2a68621450e42d95dde3d1e986f4918e8f8e0912
   languageName: node
   linkType: hard
 
@@ -516,17 +816,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/cache@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/cache@npm:2.7.0"
+"@parcel/codeframe@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/codeframe@npm:2.12.0"
   dependencies:
-    "@parcel/fs": 2.7.0
-    "@parcel/logger": 2.7.0
-    "@parcel/utils": 2.7.0
-    lmdb: 2.5.2
-  peerDependencies:
-    "@parcel/core": ^2.7.0
-  checksum: 7aa6a6883b1c62a8f1fa13d8841adbed3e2d969b72d67f51f833c6a14464ad5fc5a6368883759e817bcda44a4f0f617ece068a93d389bc68697c326e7651c8f6
+    chalk: ^4.1.0
+  checksum: 265c4d7ebee57323c0ff6f28f9cbb1a4b988409a6317eddc1d98d779f3221338739513106f2247d4cd3d6f6edd642f0719e7663d6a2fd98361fdb87bc72666f0
   languageName: node
   linkType: hard
 
@@ -539,61 +834,86 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/codeframe@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/codeframe@npm:2.7.0"
-  dependencies:
-    chalk: ^4.1.0
-  checksum: 169f305518f567019d893ef3865ccc29f38d93652441d1345ef93f5c5c0533c99f37493917514c2be051939643e62faea213a52c0d797e078120f40cfe90138d
-  languageName: node
-  linkType: hard
-
-"@parcel/compressor-raw@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/compressor-raw@npm:2.7.0"
-  dependencies:
-    "@parcel/plugin": 2.7.0
-  checksum: 6b9c009fe45ff461b4c7b6ec1ac723da6d09ea3d9af2b1b9a8bacefa97fd7c597fc2f71fc47328f97b26c7bd77cf6beedaa46797a26c5692bb8a63ea1cb5937b
-  languageName: node
-  linkType: hard
-
-"@parcel/config-default@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/config-default@npm:2.7.0"
-  dependencies:
-    "@parcel/bundler-default": 2.7.0
-    "@parcel/compressor-raw": 2.7.0
-    "@parcel/namer-default": 2.7.0
-    "@parcel/optimizer-css": 2.7.0
-    "@parcel/optimizer-htmlnano": 2.7.0
-    "@parcel/optimizer-image": 2.7.0
-    "@parcel/optimizer-svgo": 2.7.0
-    "@parcel/optimizer-terser": 2.7.0
-    "@parcel/packager-css": 2.7.0
-    "@parcel/packager-html": 2.7.0
-    "@parcel/packager-js": 2.7.0
-    "@parcel/packager-raw": 2.7.0
-    "@parcel/packager-svg": 2.7.0
-    "@parcel/reporter-dev-server": 2.7.0
-    "@parcel/resolver-default": 2.7.0
-    "@parcel/runtime-browser-hmr": 2.7.0
-    "@parcel/runtime-js": 2.7.0
-    "@parcel/runtime-react-refresh": 2.7.0
-    "@parcel/runtime-service-worker": 2.7.0
-    "@parcel/transformer-babel": 2.7.0
-    "@parcel/transformer-css": 2.7.0
-    "@parcel/transformer-html": 2.7.0
-    "@parcel/transformer-image": 2.7.0
-    "@parcel/transformer-js": 2.7.0
-    "@parcel/transformer-json": 2.7.0
-    "@parcel/transformer-postcss": 2.7.0
-    "@parcel/transformer-posthtml": 2.7.0
-    "@parcel/transformer-raw": 2.7.0
-    "@parcel/transformer-react-refresh-wrap": 2.7.0
-    "@parcel/transformer-svg": 2.7.0
+"@parcel/compressor-raw@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/compressor-raw@npm:2.12.0"
+  dependencies:
+    "@parcel/plugin": 2.12.0
+  checksum: 16c56704f33a91f7694a1a6b7ab157d731331123cbb32faf1ab09356327f7214fd2eb3c54babc120f7f41dded8742a6e58b524b5f410d3ef1bc47aaf47bc75c8
+  languageName: node
+  linkType: hard
+
+"@parcel/config-default@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/config-default@npm:2.12.0"
+  dependencies:
+    "@parcel/bundler-default": 2.12.0
+    "@parcel/compressor-raw": 2.12.0
+    "@parcel/namer-default": 2.12.0
+    "@parcel/optimizer-css": 2.12.0
+    "@parcel/optimizer-htmlnano": 2.12.0
+    "@parcel/optimizer-image": 2.12.0
+    "@parcel/optimizer-svgo": 2.12.0
+    "@parcel/optimizer-swc": 2.12.0
+    "@parcel/packager-css": 2.12.0
+    "@parcel/packager-html": 2.12.0
+    "@parcel/packager-js": 2.12.0
+    "@parcel/packager-raw": 2.12.0
+    "@parcel/packager-svg": 2.12.0
+    "@parcel/packager-wasm": 2.12.0
+    "@parcel/reporter-dev-server": 2.12.0
+    "@parcel/resolver-default": 2.12.0
+    "@parcel/runtime-browser-hmr": 2.12.0
+    "@parcel/runtime-js": 2.12.0
+    "@parcel/runtime-react-refresh": 2.12.0
+    "@parcel/runtime-service-worker": 2.12.0
+    "@parcel/transformer-babel": 2.12.0
+    "@parcel/transformer-css": 2.12.0
+    "@parcel/transformer-html": 2.12.0
+    "@parcel/transformer-image": 2.12.0
+    "@parcel/transformer-js": 2.12.0
+    "@parcel/transformer-json": 2.12.0
+    "@parcel/transformer-postcss": 2.12.0
+    "@parcel/transformer-posthtml": 2.12.0
+    "@parcel/transformer-raw": 2.12.0
+    "@parcel/transformer-react-refresh-wrap": 2.12.0
+    "@parcel/transformer-svg": 2.12.0
   peerDependencies:
-    "@parcel/core": ^2.7.0
-  checksum: 165d4ec08907d20759267160d7ab6c455aa05d855211dbd4d5f973de3c6b4bcccc41a039f819df76bf39d348cf0448efda06bc8916c4daf4d6c626e05d731a01
+    "@parcel/core": ^2.12.0
+  checksum: 72877c5dc432d6f6a8ffe8dba1342a6c0c2f615d9346f78f654adc61b62cecb4cc425726ee7a088d86894742397b4fb25cfeee7abd1ad6cbe2cfd5d77cd5a781
+  languageName: node
+  linkType: hard
+
+"@parcel/core@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/core@npm:2.12.0"
+  dependencies:
+    "@mischnic/json-sourcemap": ^0.1.0
+    "@parcel/cache": 2.12.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/events": 2.12.0
+    "@parcel/fs": 2.12.0
+    "@parcel/graph": 3.2.0
+    "@parcel/logger": 2.12.0
+    "@parcel/package-manager": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/profiler": 2.12.0
+    "@parcel/rust": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/types": 2.12.0
+    "@parcel/utils": 2.12.0
+    "@parcel/workers": 2.12.0
+    abortcontroller-polyfill: ^1.1.9
+    base-x: ^3.0.8
+    browserslist: ^4.6.6
+    clone: ^2.1.1
+    dotenv: ^7.0.0
+    dotenv-expand: ^5.1.0
+    json5: ^2.2.0
+    msgpackr: ^1.9.9
+    nullthrows: ^1.1.1
+    semver: ^7.5.2
+  checksum: 5bf674630833a157867a5d0b5448cb36ab82fcabdc8f0486efbf896f6321e7b224d6e2b724cebdca2f227690a55d085bd1c89cb1430e2ebcd3583876e33cacce
   languageName: node
   linkType: hard
 
@@ -629,125 +949,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/core@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/core@npm:2.7.0"
+"@parcel/diagnostic@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/diagnostic@npm:2.12.0"
   dependencies:
     "@mischnic/json-sourcemap": ^0.1.0
-    "@parcel/cache": 2.7.0
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/events": 2.7.0
-    "@parcel/fs": 2.7.0
-    "@parcel/graph": 2.7.0
-    "@parcel/hash": 2.7.0
-    "@parcel/logger": 2.7.0
-    "@parcel/package-manager": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/types": 2.7.0
-    "@parcel/utils": 2.7.0
-    "@parcel/workers": 2.7.0
-    abortcontroller-polyfill: ^1.1.9
-    base-x: ^3.0.8
-    browserslist: ^4.6.6
-    clone: ^2.1.1
-    dotenv: ^7.0.0
-    dotenv-expand: ^5.1.0
-    json5: ^2.2.0
-    msgpackr: ^1.5.4
     nullthrows: ^1.1.1
-    semver: ^5.7.1
-  checksum: 615903871f7e3d03f19342a6d1b231612f1ac780a0079d4a37c82d4819a75140d5cf287172b9d40fad1c7aad3c12198c27718f838b543db75d90702ac558b15e
-  languageName: node
-  linkType: hard
-
-"@parcel/css-darwin-arm64@npm:1.13.1":
-  version: 1.13.1
-  resolution: "@parcel/css-darwin-arm64@npm:1.13.1"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@parcel/css-darwin-x64@npm:1.13.1":
-  version: 1.13.1
-  resolution: "@parcel/css-darwin-x64@npm:1.13.1"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@parcel/css-linux-arm-gnueabihf@npm:1.13.1":
-  version: 1.13.1
-  resolution: "@parcel/css-linux-arm-gnueabihf@npm:1.13.1"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@parcel/css-linux-arm64-gnu@npm:1.13.1":
-  version: 1.13.1
-  resolution: "@parcel/css-linux-arm64-gnu@npm:1.13.1"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@parcel/css-linux-arm64-musl@npm:1.13.1":
-  version: 1.13.1
-  resolution: "@parcel/css-linux-arm64-musl@npm:1.13.1"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"@parcel/css-linux-x64-gnu@npm:1.13.1":
-  version: 1.13.1
-  resolution: "@parcel/css-linux-x64-gnu@npm:1.13.1"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"@parcel/css-linux-x64-musl@npm:1.13.1":
-  version: 1.13.1
-  resolution: "@parcel/css-linux-x64-musl@npm:1.13.1"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"@parcel/css-win32-x64-msvc@npm:1.13.1":
-  version: 1.13.1
-  resolution: "@parcel/css-win32-x64-msvc@npm:1.13.1"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@parcel/css@npm:^1.12.2":
-  version: 1.13.1
-  resolution: "@parcel/css@npm:1.13.1"
-  dependencies:
-    "@parcel/css-darwin-arm64": 1.13.1
-    "@parcel/css-darwin-x64": 1.13.1
-    "@parcel/css-linux-arm-gnueabihf": 1.13.1
-    "@parcel/css-linux-arm64-gnu": 1.13.1
-    "@parcel/css-linux-arm64-musl": 1.13.1
-    "@parcel/css-linux-x64-gnu": 1.13.1
-    "@parcel/css-linux-x64-musl": 1.13.1
-    "@parcel/css-win32-x64-msvc": 1.13.1
-    detect-libc: ^1.0.3
-  dependenciesMeta:
-    "@parcel/css-darwin-arm64":
-      optional: true
-    "@parcel/css-darwin-x64":
-      optional: true
-    "@parcel/css-linux-arm-gnueabihf":
-      optional: true
-    "@parcel/css-linux-arm64-gnu":
-      optional: true
-    "@parcel/css-linux-arm64-musl":
-      optional: true
-    "@parcel/css-linux-x64-gnu":
-      optional: true
-    "@parcel/css-linux-x64-musl":
-      optional: true
-    "@parcel/css-win32-x64-msvc":
-      optional: true
-  checksum: c2f4183b71dc58cc03e374c715e77e5ffe96a75930bd7689598eb6fefc4b6f4dd1d9cfd8f4139d338c44b65a161b1d0c3c94fe4e6e94f473872d2ef7b3d328fd
+  checksum: a4b918c1a00406de73755b5bb5c7d862c69e49e2cd1837889a85279f9e5be1f8f7b8f96e66f358e30e7dbc7a3919ebe5dafeeb9771db2b682ed9ecf60daba431
   languageName: node
   linkType: hard
 
@@ -761,13 +969,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/diagnostic@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/diagnostic@npm:2.7.0"
-  dependencies:
-    "@mischnic/json-sourcemap": ^0.1.0
-    nullthrows: ^1.1.1
-  checksum: a41cc65cb1815b90256f767eb118fcf3bf84b6bed4a31ef61627f2a1cc26e9aa9b9ad6fadb7cc7ce443b985b154b36ac3b10adcc0d0bbd42b0092129324a5fef
+"@parcel/events@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/events@npm:2.12.0"
+  checksum: 136a8a2921fbc84f9228fd133eec87fbd5cde2beaf974f1aef47fab1a99f11c2919a5d7507b4fc8da81b5c00a474a4808c05b178fca9f8c0c897044d3f5ff342
   languageName: node
   linkType: hard
 
@@ -778,13 +983,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/events@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/events@npm:2.7.0"
-  checksum: 9477cc8eefa2d5bed9cae39b9aed6379f3686735ea7ab7ffcc78148f2f83ed356663c9dd07ccf93edee5e59f877cb0072ae876c5a03e754cf6d2263638788875
-  languageName: node
-  linkType: hard
-
 "@parcel/fs-search@npm:2.6.2":
   version: 2.6.2
   resolution: "@parcel/fs-search@npm:2.6.2"
@@ -794,12 +992,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/fs-search@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/fs-search@npm:2.7.0"
+"@parcel/fs@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/fs@npm:2.12.0"
   dependencies:
-    detect-libc: ^1.0.3
-  checksum: ed49a19d86b21ff5f399d3d137ebd38885d523f34a8753c59a63565d438bb107578ff1f76bdcac2e7d93090553c262dbecdc39e3c2640a12a9eb19416ee18c32
+    "@parcel/rust": 2.12.0
+    "@parcel/types": 2.12.0
+    "@parcel/utils": 2.12.0
+    "@parcel/watcher": ^2.0.7
+    "@parcel/workers": 2.12.0
+  peerDependencies:
+    "@parcel/core": ^2.12.0
+  checksum: 43d454d55da6ed14f5c422ade547485fe3d31a58a0e10c502f96dd8bb933f4402979c0ae252776d6ae83b3d0a27873390f892337a8fe78ddbc3729e531254007
   languageName: node
   linkType: hard
 
@@ -818,21 +1022,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/fs@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/fs@npm:2.7.0"
-  dependencies:
-    "@parcel/fs-search": 2.7.0
-    "@parcel/types": 2.7.0
-    "@parcel/utils": 2.7.0
-    "@parcel/watcher": ^2.0.0
-    "@parcel/workers": 2.7.0
-  peerDependencies:
-    "@parcel/core": ^2.7.0
-  checksum: 176c21f4a94e0189615582b3d4aca3611012f5e790fcd97ba8d7fe8fdd79ce6e51e0239510698381568aa04a3ec76afbfe689cd7e14c0ee971d9ff8dd3339707
-  languageName: node
-  linkType: hard
-
 "@parcel/graph@npm:2.6.2":
   version: 2.6.2
   resolution: "@parcel/graph@npm:2.6.2"
@@ -843,13 +1032,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/graph@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/graph@npm:2.7.0"
+"@parcel/graph@npm:3.2.0":
+  version: 3.2.0
+  resolution: "@parcel/graph@npm:3.2.0"
   dependencies:
-    "@parcel/utils": 2.7.0
     nullthrows: ^1.1.1
-  checksum: 55db3972df4a1246410e1b1a9683b2336497c8d323e3b69c2161d9884bce45170d2f5791211c05ccba6bce181e2c9ffe9fd07401220ef2ed5b7ec031fc87f38a
+  checksum: b4d31624fc684aab053721b1bdcd3ba4ca465159a4253725a32393aac473eb6016fe7d1a2742f123b6b67437c8af89ee36291220dae51d807833f61ab60744f3
   languageName: node
   linkType: hard
 
@@ -863,13 +1051,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/hash@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/hash@npm:2.7.0"
+"@parcel/logger@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/logger@npm:2.12.0"
   dependencies:
-    detect-libc: ^1.0.3
-    xxhash-wasm: ^0.4.2
-  checksum: 42cad499e60c5c8ff989f644e51d629ddb175574b2c53aae1c89ee3a9827f6d69012c5652459b7f3460a7fe94a9e49a59432ee12250bcebb149ca46faa4b5b0f
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/events": 2.12.0
+  checksum: be3fe9d9eaec60d8f2546a5f521048629b9206cd37b9863c9311fcd021b4748c57479490f1e7188a36e6eabfb42cda7d4eaf60bc11664ef9b87d164487774a23
   languageName: node
   linkType: hard
 
@@ -883,13 +1071,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/logger@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/logger@npm:2.7.0"
+"@parcel/markdown-ansi@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/markdown-ansi@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/events": 2.7.0
-  checksum: 85e959a8edc408750260fd908bf3cc886e2d6178977ae93ca6a0907c2a53f14751d7f4ab9fd682dbbe4c3b158001a3f39ee98f98dcdc182ebec41c6128cab7f7
+    chalk: ^4.1.0
+  checksum: 850ee665d934ef059d914e15d2dce601618db5d28ac700da9ac1197455135b7cb8ebe560ecae4905f2225ce37c5b5dad86fbe6210afb10d46c513b64ea6faec7
   languageName: node
   linkType: hard
 
@@ -902,102 +1089,129 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/markdown-ansi@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/markdown-ansi@npm:2.7.0"
+"@parcel/namer-default@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/namer-default@npm:2.12.0"
   dependencies:
-    chalk: ^4.1.0
-  checksum: a9f19091c5a663e71a6ee7936a76c25759eb30af4271883c51468ef193ba0bebe54619d2b6b9d70fb3d9262e8e60a8bbe20f74404e41fbcf3dc0ce4a82d63896
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    nullthrows: ^1.1.1
+  checksum: dc92ec094595658aad21ec668290ee158f71a400783188292ebf00240b81c2041afda1749a1a6081a465943d03cf26a92cf549cbead95f2873450d063361677f
   languageName: node
   linkType: hard
 
-"@parcel/namer-default@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/namer-default@npm:2.7.0"
+"@parcel/node-resolver-core@npm:3.3.0":
+  version: 3.3.0
+  resolution: "@parcel/node-resolver-core@npm:3.3.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/plugin": 2.7.0
+    "@mischnic/json-sourcemap": ^0.1.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/fs": 2.12.0
+    "@parcel/rust": 2.12.0
+    "@parcel/utils": 2.12.0
     nullthrows: ^1.1.1
-  checksum: 0012b78fc95646c8f201476534eefaa354039a0fcd03cf04f2e33cf8e0c457010cfd78cc9071718f72b7e4d848e077b89f72e58baae3ea5cacc97045b83e8a24
+    semver: ^7.5.2
+  checksum: acc3721678d88b20f0bd6c90520e495a4032039332eb1155b69dc093ddb2ab7890240eb553f243f1383bd4e441c64a9870f5b5f84a2bb783b94574f859a813fd
   languageName: node
   linkType: hard
 
-"@parcel/node-resolver-core@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/node-resolver-core@npm:2.7.0"
+"@parcel/optimizer-css@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/optimizer-css@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/utils": 2.12.0
+    browserslist: ^4.6.6
+    lightningcss: ^1.22.1
     nullthrows: ^1.1.1
-    semver: ^5.7.1
-  checksum: bc0a94ce3c2423ded844dcf13e61208a3adbffaa13d8e84646023bf48b837ecb0f9b4c39eb667d2bf1080a1b7ee1094164afd3710a943a8828e39da35e28449f
+  checksum: abcdf58c2999b53931274528ad5763a05202c65a5251b978f4989230430b5ecc620dbd6527de1a1970db80f993a6052eacea9c8b7d9d738335cce7f01a016751
   languageName: node
   linkType: hard
 
-"@parcel/optimizer-css@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/optimizer-css@npm:2.7.0"
+"@parcel/optimizer-data-url@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/optimizer-data-url@npm:2.12.0"
   dependencies:
-    "@parcel/css": ^1.12.2
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/utils": 2.7.0
-    browserslist: ^4.6.6
-    nullthrows: ^1.1.1
-  checksum: 3799e128cb1cafc57c4de384a9b7339c5be7d4a0205887424a7265d31205439bce25195b1c06036e91acb32cb354edd9ccf9116f5a46a04db72e16b4e185e664
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
+    isbinaryfile: ^4.0.2
+    mime: ^2.4.4
+  checksum: 03972939615d2c8fddc6df223bd8f17d26b24712ed165ec60a95feda4759f3fe1b5ee25f295a02933022bbf8ef480211490c34c412e7e8e53fee7c4b970291a0
   languageName: node
   linkType: hard
 
-"@parcel/optimizer-htmlnano@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/optimizer-htmlnano@npm:2.7.0"
+"@parcel/optimizer-htmlnano@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/optimizer-htmlnano@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
+    "@parcel/plugin": 2.12.0
     htmlnano: ^2.0.0
     nullthrows: ^1.1.1
     posthtml: ^0.16.5
     svgo: ^2.4.0
-  checksum: a5fa890bc36c7f4c8ebb5f8ff4ba88b15a0a9a489fd99badabfe0dfec8e4381cc04c6ee59b856bd17bdc1933529a851d0567c26d7e7df2fc19d6d623c5670e2a
+  checksum: 64e571f56f959c4cf1fd724e3b50e741b57f90acf035ca5a6908cf7186c42993bfb372db9ac39f9a9dd9bd57be4bba12a527da451893547f6da27db55d63ff13
   languageName: node
   linkType: hard
 
-"@parcel/optimizer-image@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/optimizer-image@npm:2.7.0"
+"@parcel/optimizer-image@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/optimizer-image@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
-    "@parcel/workers": 2.7.0
-    detect-libc: ^1.0.3
-  checksum: ca12701e1c7080c4bff15971b6be7ff6c9633ed6ef69d925eedd06021cbedf02c326862fa5899072d35ce01a34018de265ccb811ff4f31556a9b931dcbff835b
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/rust": 2.12.0
+    "@parcel/utils": 2.12.0
+    "@parcel/workers": 2.12.0
+  peerDependencies:
+    "@parcel/core": ^2.12.0
+  checksum: 7d28379bf1619d6ea0c70fbfef8b6b05941ac2cc0c1de46f2639ec5c40b53a984985538dfeefd35ba20cde31778502631ace1294c9bc0bcce36607ac53c5a3a8
   languageName: node
   linkType: hard
 
-"@parcel/optimizer-svgo@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/optimizer-svgo@npm:2.7.0"
+"@parcel/optimizer-svgo@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/optimizer-svgo@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
     svgo: ^2.4.0
-  checksum: 305024d23c9bb049cce91cd902d8f9053b93cac9e5f7eb8f7b5d6a9b5d419d67e2321b3194689c09b20c3999087a11975e6cd95a669c5a5c61952be9a2a866c0
+  checksum: d3a4d2de9f77b4b084e88b611f1f431d4651f8b819122c92f9d9c1479b5936962a85bf1297e15e07823c3521dffec6083f4b1f4d962392f481dfb7b2a148e7f7
   languageName: node
   linkType: hard
 
-"@parcel/optimizer-terser@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/optimizer-terser@npm:2.7.0"
+"@parcel/optimizer-swc@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/optimizer-swc@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/utils": 2.12.0
+    "@swc/core": ^1.3.36
     nullthrows: ^1.1.1
-    terser: ^5.2.0
-  checksum: 20eddbcaa947c380909ba95337d3db436b748c0baf5525e3a59756fa05219a612f30070d9618aef7570037a3a926e5bacc5ac9c221603bfab19753b864aca202
+  checksum: 0b7fdf3df1e1fff3ed821d7e73f8cd7df4e8e96abd5b12f4e695d762d37736b24eb5bbf365f217ccb04e7a2b5807afec9af9d8c8ab7a97130d74cdc1347c3951
+  languageName: node
+  linkType: hard
+
+"@parcel/package-manager@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/package-manager@npm:2.12.0"
+  dependencies:
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/fs": 2.12.0
+    "@parcel/logger": 2.12.0
+    "@parcel/node-resolver-core": 3.3.0
+    "@parcel/types": 2.12.0
+    "@parcel/utils": 2.12.0
+    "@parcel/workers": 2.12.0
+    "@swc/core": ^1.3.36
+    semver: ^7.5.2
+  peerDependencies:
+    "@parcel/core": ^2.12.0
+  checksum: a517e9efe1330a34ead2758b2c44ac4e635450dccad87051dcc98b6090ba76f472de4de91f1de8151027397286b11e000faf4c80d34a2bc06a4c7f7bd23e97f5
   languageName: node
   linkType: hard
 
@@ -1018,81 +1232,85 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/package-manager@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/package-manager@npm:2.7.0"
-  dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/fs": 2.7.0
-    "@parcel/logger": 2.7.0
-    "@parcel/types": 2.7.0
-    "@parcel/utils": 2.7.0
-    "@parcel/workers": 2.7.0
-    semver: ^5.7.1
-  peerDependencies:
-    "@parcel/core": ^2.7.0
-  checksum: f4817d1aae84e3f4a7758a3e51a1f2a35996649450ef32b6f8de680b77ff98b138d917652f4802a49cb8ab562a737f661bb28ceadd18132f05170805b5bb145d
-  languageName: node
-  linkType: hard
-
-"@parcel/packager-css@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/packager-css@npm:2.7.0"
+"@parcel/packager-css@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/packager-css@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/utils": 2.12.0
+    lightningcss: ^1.22.1
     nullthrows: ^1.1.1
-  checksum: 0a7fbedb8860626c8cd70ed8c8977b65b80856e2180a71ec988809f8b15721dec328bcdc56200b1224f292ce122efdafff5ef6ef5402d3b0e251dbe74ca6790a
+  checksum: 684aaa1d8551e65c0af0d44905f1c08f1c0247d05b1af224abaf5007e197e12facb2b511bf2eee66c432613f31e04753d94dd23773c08fe77eb0f2b8ee41799f
   languageName: node
   linkType: hard
 
-"@parcel/packager-html@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/packager-html@npm:2.7.0"
+"@parcel/packager-html@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/packager-html@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/types": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/types": 2.12.0
+    "@parcel/utils": 2.12.0
     nullthrows: ^1.1.1
     posthtml: ^0.16.5
-  checksum: 9ca4f91112bfce9cf99ec34241f15775f964a74ea293b9e526d4bd64c60fa837e1385bec8c8a3a9315f66fe980e3e05c16b32793a2c98c9837482a3f79319269
+  checksum: ee558ad616a21b94781a922c7ac8ee6da831cc8f7c4e4642a43027ce6df32ea93f4addabf573b9a955f4aa5cc5462bf8a42fc33809fab68249044e4ab2900a14
   languageName: node
   linkType: hard
 
-"@parcel/packager-js@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/packager-js@npm:2.7.0"
+"@parcel/packager-js@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/packager-js@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/hash": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/rust": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/types": 2.12.0
+    "@parcel/utils": 2.12.0
     globals: ^13.2.0
     nullthrows: ^1.1.1
-  checksum: 8a65b8f82c40f3e429d11ce5df73454c90233ada8dd00a8913e945b8cbc85a021ddb0c75c2f8bd2bdc2424105874a86f0cb748eb5c8f157dd085b13c67f72f63
+  checksum: 2189b7ff152ddb80739f65f5dffbcce12dbaeb9c8ef5b702e0c253c9b57e390f055b46e8874017b43313b67cfb4e89675a49854a844fcbed6bd1f7885e193cd5
   languageName: node
   linkType: hard
 
-"@parcel/packager-raw@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/packager-raw@npm:2.7.0"
+"@parcel/packager-raw@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/packager-raw@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-  checksum: d895ed703e3f71b57bb1d2f6e2f9c574fb259790622afd7818e6ac174b69c8dead78d8cc15abf19df566b9642d7ea5cd7db22dd62256cfc3e86bb2b838e6c2d8
+    "@parcel/plugin": 2.12.0
+  checksum: 39ce2fc7aede5b81be4bcd1939c49d9166250bedf8c408687c9a125154cc4fcfcd7181e38faa3137817144f75f070c5eaa40472f68ec0aaa9bd2a070674a1093
   languageName: node
   linkType: hard
 
-"@parcel/packager-svg@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/packager-svg@npm:2.7.0"
+"@parcel/packager-svg@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/packager-svg@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/types": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/types": 2.12.0
+    "@parcel/utils": 2.12.0
     posthtml: ^0.16.4
-  checksum: 9b2c4e4cee93ecc18f852bf623eb9097e53b4d0d9dea562674942b7b1121f82c1c8b418a5ccc4a18010df7e62c4934bb039903ea21c0493732f6adedaca9ba0c
+  checksum: 436ac9ea3988ed79e637f6c8990f5f3de75816edc912d26388deeee94ef49b782ced25f427e15b4e721c9e25da6e90ca19f1efd85c3a8aedb1850cb293250b9f
+  languageName: node
+  linkType: hard
+
+"@parcel/packager-wasm@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/packager-wasm@npm:2.12.0"
+  dependencies:
+    "@parcel/plugin": 2.12.0
+  checksum: a10e1cd9885a48ad1153b2ca83ef3c852f4a2ed48c67df4f1677da8660878faa1ee3d9da16f0b820f33d17f9181d845d6038f0ea3470c937f973fbe2dd3b86b6
+  languageName: node
+  linkType: hard
+
+"@parcel/plugin@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/plugin@npm:2.12.0"
+  dependencies:
+    "@parcel/types": 2.12.0
+  checksum: 0b52f1dd0675ea4f597a3f882f47434b7c5dabc997a875d07f1cf178e37adc927ed86e084502030a04ac6c9b548152741dfdeb8b6d730f7d8af2bfe3465a77d3
   languageName: node
   linkType: hard
 
@@ -1105,89 +1323,111 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/plugin@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/plugin@npm:2.7.0"
+"@parcel/profiler@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/profiler@npm:2.12.0"
   dependencies:
-    "@parcel/types": 2.7.0
-  checksum: 930befafa01c179b27d34d6a63e5f67fe4998724654163fc07a618a432e8d20397cc3f424093ee967ddad8c4adf4e3f0e596e72f2ca5764b3fe212211c09d321
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/events": 2.12.0
+    chrome-trace-event: ^1.0.2
+  checksum: b683b74e10ca469d34588e6a15fe5abbeae66f844c75eaf8aaa588912c41f3668bcff087f6c4ff931a861731443f3addf5a16cfad644827e1daa89e020cf0fb3
   languageName: node
   linkType: hard
 
-"@parcel/reporter-cli@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/reporter-cli@npm:2.7.0"
+"@parcel/reporter-cli@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/reporter-cli@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/types": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/types": 2.12.0
+    "@parcel/utils": 2.12.0
     chalk: ^4.1.0
     term-size: ^2.2.1
-  checksum: eff35a2ee3f2b453688fd16603c41a97b24d250a7b50fd9e7dcb2f35be743b338031c82746bf1e8cd299b7f3c4acb3345d13c02da3865bea7bd4f2aafcb9f6af
+  checksum: 8cc524fa155fa0b9cf0f084cdc184f8cacdaf439d4ac7a74cf431ab9a2a6d0f6c238563efa30e3d49da01e78b61c31a81879c510bb05d44c226e7fcde553994d
+  languageName: node
+  linkType: hard
+
+"@parcel/reporter-dev-server@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/reporter-dev-server@npm:2.12.0"
+  dependencies:
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
+  checksum: 43957b4656442f4609f29a74cd07b1c358dba263faa622c18841dbd4065e251a959b1e2675de45cf0e42f17a52f27594d4ae83f86e30b59e53f143ce6fe13c52
   languageName: node
   linkType: hard
 
-"@parcel/reporter-dev-server@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/reporter-dev-server@npm:2.7.0"
+"@parcel/reporter-tracer@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/reporter-tracer@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
-  checksum: e315689d8d4ba094e67b0206d15c259c9faccf8554e191e14c53a4f176d9b52457ee24e9e53581fbc1685932f76ce57286613fdd9cafb81139b6e38fb57838e1
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
+    chrome-trace-event: ^1.0.3
+    nullthrows: ^1.1.1
+  checksum: 24cddacd19f2f5dfde30133fbc1d484666a59cc384013a81e7eb1ba8517ad362e0f92d81e7b42f909657eb4df0d7519a3ed51e0de36a9f3f7c9a3b703054a20f
   languageName: node
   linkType: hard
 
-"@parcel/resolver-default@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/resolver-default@npm:2.7.0"
+"@parcel/resolver-default@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/resolver-default@npm:2.12.0"
   dependencies:
-    "@parcel/node-resolver-core": 2.7.0
-    "@parcel/plugin": 2.7.0
-  checksum: 5bc64bea956c3579c99eb13bef0c868be1b0b5d9d045184adfc3cdc02f503775d12fdb2116f093d62cc9d7e7fc506351973d2808b71b091a5ed5c038064906fe
+    "@parcel/node-resolver-core": 3.3.0
+    "@parcel/plugin": 2.12.0
+  checksum: f3652eea094151f8a820c0214251209c625ac80ecc086b1869893a14620ad9b6bc86d65496a7687929484ade6db61e375647811d23a114509b4a16e7caf40408
   languageName: node
   linkType: hard
 
-"@parcel/runtime-browser-hmr@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/runtime-browser-hmr@npm:2.7.0"
+"@parcel/runtime-browser-hmr@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/runtime-browser-hmr@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
-  checksum: ad736bab6972d42e0027bd5aeee4beef087b1c32a99ab1700f7c6ccc125fe566ff08d065fffa6a6565e5f2e0bd6bc256a9869f6ec98322b09c02b2f97f29bb77
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
+  checksum: bbba57ecee5668fe2316fc8961f559d2c9296f05fb0feee002dfc1010aa1f2bc4a4ae2ab7778f132ed793e3ebcae05c558552ff86871b37ed25bfab572499191
   languageName: node
   linkType: hard
 
-"@parcel/runtime-js@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/runtime-js@npm:2.7.0"
+"@parcel/runtime-js@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/runtime-js@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
     nullthrows: ^1.1.1
-  checksum: 3a22c78ce1848c37b677ca1c38d2e4eca632059d9607be65ac1cf49e985c969b393c34103ad79f0a4f372fe3d49088ddff471cbebcb100de7ab1b14bb6047ff3
+  checksum: 6afa3e7eb27c11b4fdb2236d3f2e3f07c284927217b5811ebb0d73cd24dfdc8718a6bbb6f43be0d86bb9473f0493bc207d35ce25beaa1ba384b3141ced7ff3bc
   languageName: node
   linkType: hard
 
-"@parcel/runtime-react-refresh@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/runtime-react-refresh@npm:2.7.0"
+"@parcel/runtime-react-refresh@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/runtime-react-refresh@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
     react-error-overlay: 6.0.9
     react-refresh: ^0.9.0
-  checksum: ea4c240185f00266d2820393b9c3faa95e7854b92ea9b18191eca5329e5ac53e287a32a967c9001890af4a78741eba3dc0173323af2bdbe65ec72f0bfa70a055
+  checksum: 41aee9a87484575b67dcce07d676a4e26bf0bb79ddea5328ef4a8d729a74da29f0c625b0a7a479c5086e5c79e4616e89034138aad3c97a6db2cf059f1a19d1c9
   languageName: node
   linkType: hard
 
-"@parcel/runtime-service-worker@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/runtime-service-worker@npm:2.7.0"
+"@parcel/runtime-service-worker@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/runtime-service-worker@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
     nullthrows: ^1.1.1
-  checksum: 13eb0ba276e104c5b412d139fbf8b15a3f7ef836fec386d9f7982d0f3eac1e0942be87c62e1d4926efcdb15919547c32df4e6a54b228a5f67da6241e058a5c32
+  checksum: c71246428e1ba69649fe4ecc1ed272f34fb52ff14f364c159e6f979332bb1280483b4eb7633bfe3ab3b3d7c381b524f669e356d9705ba4764bc149977e965c53
+  languageName: node
+  linkType: hard
+
+"@parcel/rust@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/rust@npm:2.12.0"
+  checksum: 51c5b67b9ee83e12d544774dad705d500dda52948f65cdb6c7bfa4275a9692561aa141c68be9c8fd29a8cd795a1fe4f3537bc2f1f91a80163d0bb5a0bd223ad0
   languageName: node
   linkType: hard
 
@@ -1200,173 +1440,207 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/transformer-babel@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-babel@npm:2.7.0"
+"@parcel/source-map@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "@parcel/source-map@npm:2.1.1"
+  dependencies:
+    detect-libc: ^1.0.3
+  checksum: 1fa27a7047ec08faf7fe1dd0e2ae95a27b84697ecfaed029d0b7d06e46d84ed8f98a9dc9d308fe623655f3c985052dcf7622de479bfa6103c44884fb7f6c810a
+  languageName: node
+  linkType: hard
+
+"@parcel/transformer-babel@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-babel@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/utils": 2.12.0
     browserslist: ^4.6.6
     json5: ^2.2.0
     nullthrows: ^1.1.1
-    semver: ^5.7.0
-  checksum: aa269b12913667175919322faaea9e192fd2259765cc482b3902a050ecbfc48c212b4d999cda976c7095bfbe78f94d38333f5a66719eb5989fbe4b32963a9a07
+    semver: ^7.5.2
+  checksum: b8c457c0be7662d8262671469fa7e7cc69dcf72e67a7abeadfd41a71c193f10eae857e1ea6d5db9842cd3f471f9b299c5d716c99dbc0929d537c7d050a995e6e
   languageName: node
   linkType: hard
 
-"@parcel/transformer-css@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-css@npm:2.7.0"
+"@parcel/transformer-css@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-css@npm:2.12.0"
   dependencies:
-    "@parcel/css": ^1.12.2
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/utils": 2.12.0
     browserslist: ^4.6.6
+    lightningcss: ^1.22.1
     nullthrows: ^1.1.1
-  checksum: 47cf7cd9a40b8e957075442fb56c3d52882572f3b65ccc2f67ae3190706d51f93cf783fb1275e01a9562538d94f570f7f1922f9f943faa83f87b8a1f36663943
+  checksum: 3a6f16321d4759b17e13db8953c43cf9ed00aad8ef4354bea04647be60c0b6d36c8a28765a78c79038cbcbb2b32e9cc955f8bc6bddf0e59aa30cae6b89f8a8e9
   languageName: node
   linkType: hard
 
-"@parcel/transformer-html@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-html@npm:2.7.0"
+"@parcel/transformer-html@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-html@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/hash": 2.7.0
-    "@parcel/plugin": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/rust": 2.12.0
     nullthrows: ^1.1.1
     posthtml: ^0.16.5
     posthtml-parser: ^0.10.1
     posthtml-render: ^3.0.0
-    semver: ^5.7.1
-  checksum: 4028ffa5ece1b30cd801b97d371eba142eed52267d527c06a02c5ec9b83960353dd0e6143d408c3351fc5acb3bfbceb1755bed07827e619119a4be77863471d9
+    semver: ^7.5.2
+    srcset: 4
+  checksum: 7fcfac62ca73f239b1a4a4b049c1ef5eb6831a625e873a784c51c9f28957f7c8c7d5f8e86b8e98b9f8a0f7c8f27c3782f5a620931e96c400a0e6e9c203a200bb
   languageName: node
   linkType: hard
 
-"@parcel/transformer-image@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-image@npm:2.7.0"
+"@parcel/transformer-image@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-image@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
-    "@parcel/workers": 2.7.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
+    "@parcel/workers": 2.12.0
     nullthrows: ^1.1.1
   peerDependencies:
-    "@parcel/core": ^2.7.0
-  checksum: 1decacc1a4b037de9c7838fce34057338262c03e16a199d00e9641be0ad80885ff77119bd571765268e5f0d2f1f2d1863b759aaaaba6de2f64fe5b2c44b69b4c
+    "@parcel/core": ^2.12.0
+  checksum: 0a1581eaccd9c26fbc83da6b576c2b3dc07080d694744b6224ed35a8d77d30a2c3231061f67700281e6963f8a0d23d67f67c73553ea5b94ebfbbbc9c34f60ba3
+  languageName: node
+  linkType: hard
+
+"@parcel/transformer-inline-string@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-inline-string@npm:2.12.0"
+  dependencies:
+    "@parcel/plugin": 2.12.0
+  checksum: 5f63c086956b64cf67ca006efe99048e2b2ce7d23df7703d2709da1971f391f62620dc9186ae604d00918345718656af438f3d681a312fbdcc05fd0477499c83
   languageName: node
   linkType: hard
 
-"@parcel/transformer-js@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-js@npm:2.7.0"
+"@parcel/transformer-js@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-js@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/utils": 2.7.0
-    "@parcel/workers": 2.7.0
-    "@swc/helpers": ^0.4.2
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/rust": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/utils": 2.12.0
+    "@parcel/workers": 2.12.0
+    "@swc/helpers": ^0.5.0
     browserslist: ^4.6.6
-    detect-libc: ^1.0.3
     nullthrows: ^1.1.1
     regenerator-runtime: ^0.13.7
-    semver: ^5.7.1
+    semver: ^7.5.2
   peerDependencies:
-    "@parcel/core": ^2.7.0
-  checksum: 76669ef593672cf3936aafd68676ba9f23562556dafd3594f5714bbb8fdebae83e0b2ad51cef47bedf0304cce1a55a7c344679f20747306a7a111caae535704a
+    "@parcel/core": ^2.12.0
+  checksum: b9fe4c887b08d5032a2dc87e529dbcf19b75e1274d6fcbe5e7e8d92bae0186c063e93b93747e49eb67763c29232f1b2411f237c64d5af782d2f6ff663f98a9fd
   languageName: node
   linkType: hard
 
-"@parcel/transformer-json@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-json@npm:2.7.0"
+"@parcel/transformer-json@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-json@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
+    "@parcel/plugin": 2.12.0
     json5: ^2.2.0
-  checksum: d9d82148ee69b623129596408f97269199aabbce0ced71bbb501addf9fb76761eb3da49b3e1286a3d08806caf01156b97fdac766212e38e62823db34b1433bfa
+  checksum: a711cb65a8bfa4bcffcced0a8ecc91c4e4ddc65d77d2328a7ca8800170f2fa4e6316df06ad55816c65852f45092bcb4e42f8125d179d3223abe4d0650306c134
   languageName: node
   linkType: hard
 
-"@parcel/transformer-postcss@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-postcss@npm:2.7.0"
+"@parcel/transformer-postcss@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-postcss@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/hash": 2.7.0
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/rust": 2.12.0
+    "@parcel/utils": 2.12.0
     clone: ^2.1.1
     nullthrows: ^1.1.1
     postcss-value-parser: ^4.2.0
-    semver: ^5.7.1
-  checksum: 15bd9ac0510d1ec822891f64aadbb7a9e22e7a86619863863fe0de056f1e9da8f910590ed0664575950bf483b58196640634278beecdc492c65ea675a832f3e5
+    semver: ^7.5.2
+  checksum: b210044a7f13078ed5acf1d02c0169f1daab3e5134de5cfb4aa4900c70a0e19b7cef08e1f03793a1e9af6e625b0ae0b0598803cfa8338e13ba6e8cc792fbba0b
   languageName: node
   linkType: hard
 
-"@parcel/transformer-posthtml@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-posthtml@npm:2.7.0"
+"@parcel/transformer-posthtml@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-posthtml@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
     nullthrows: ^1.1.1
     posthtml: ^0.16.5
     posthtml-parser: ^0.10.1
     posthtml-render: ^3.0.0
-    semver: ^5.7.1
-  checksum: 04642838ce10f3a54b42c95115afc59f852095b8370482c6b3728db46e047443a7663b6f28d76ad1eeb18b81828d5dda0b8e650ebbfb1cc65e09d725b901f8f4
+    semver: ^7.5.2
+  checksum: b62582ae7e0af9e3fbca8baf589261548c994c8fbfa45ca57901faa1a1cf23122035784a92688fdad9f8b626d26d877f3f465bb5799d56eef264314ecfe74b1d
   languageName: node
   linkType: hard
 
-"@parcel/transformer-raw@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-raw@npm:2.7.0"
+"@parcel/transformer-raw@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-raw@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-  checksum: 942a5ddbed9453fe905310f22430ef643e544d4a262f317a2ca4452080aad18484ea7dd1953e1a6c7ef049b42366c46820297d981cec9ac76b980df424248b4c
+    "@parcel/plugin": 2.12.0
+  checksum: de6681e2e723d9877f3e2fd3c4983ac4de8ecae26f5d0c51ce6d231bd29d644f86db9558426cd69adfdbb89edd824c08ef92ada09aaceaa66dd1f44d1c027d60
   languageName: node
   linkType: hard
 
-"@parcel/transformer-react-refresh-wrap@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-react-refresh-wrap@npm:2.7.0"
+"@parcel/transformer-react-refresh-wrap@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-react-refresh-wrap@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/utils": 2.12.0
     react-refresh: ^0.9.0
-  checksum: d193b9552b8e9abff7313845d02f2068112f16a15ba7eb0e7fba568937b765030ab874c84d601d8941dc6a14af9090327be8093825a95f0c4b35eabf7d36f1a3
+  checksum: 9aba8c1ab0e7a3dc4da735f093b38e6bcda04385b5ba3373d2b2d09f8099c5dd40493d4b77ca697f499d8d204b6288fd1a5dc1b6c717041d612dcdc501908937
   languageName: node
   linkType: hard
 
-"@parcel/transformer-sass@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-sass@npm:2.7.0"
+"@parcel/transformer-sass@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-sass@npm:2.12.0"
   dependencies:
-    "@parcel/plugin": 2.7.0
-    "@parcel/source-map": ^2.0.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/source-map": ^2.1.1
     sass: ^1.38.0
-  checksum: 8d53b8fcdb93040fd40da24b09cd9439d71bb8e5e067c3bcca36ea6576be94fbdfedc1f8d0d0c5f2ccdf4d799741d1bdf3394cfea843a669b976c4e8cc191254
+  checksum: ce6b4d329b60dd4766a47b064cb10d18406ce569488b7f7c6fe561e9180786b813194935d9679bbe4b9afa43877a034d57a4b61e1166a2801af3889196a1e3d8
   languageName: node
   linkType: hard
 
-"@parcel/transformer-svg@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/transformer-svg@npm:2.7.0"
+"@parcel/transformer-svg@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/transformer-svg@npm:2.12.0"
   dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/hash": 2.7.0
-    "@parcel/plugin": 2.7.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/plugin": 2.12.0
+    "@parcel/rust": 2.12.0
     nullthrows: ^1.1.1
     posthtml: ^0.16.5
     posthtml-parser: ^0.10.1
     posthtml-render: ^3.0.0
-    semver: ^5.7.1
-  checksum: 19026a39f9757908f89d1a57ba9de027cbb80c562e055d5dd88a8ea7691c42d6d8598412b3a8b80e52001b305303b16dd6b8ae2a7708e95861a7654a682c8a2e
+    semver: ^7.5.2
+  checksum: 92b7c6589477e93f8ded857924dee82c498a83641c03b1ce3f836219ca3e8e543b9281128f8647529e561eb5212a1f173d2cb1a1eed5d7cc9487b782db82158c
+  languageName: node
+  linkType: hard
+
+"@parcel/types@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/types@npm:2.12.0"
+  dependencies:
+    "@parcel/cache": 2.12.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/fs": 2.12.0
+    "@parcel/package-manager": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    "@parcel/workers": 2.12.0
+    utility-types: ^3.10.0
+  checksum: 250f95580cd441ee9c5178d65088da9eb105d4b300b753fb6c4b54383e8fa6272eb6273ff45cd223c7eb02fefdee17a18997116f1da26b9a24455c51a8aaf6b2
   languageName: node
   linkType: hard
 
@@ -1385,18 +1659,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/types@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/types@npm:2.7.0"
+"@parcel/utils@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/utils@npm:2.12.0"
   dependencies:
-    "@parcel/cache": 2.7.0
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/fs": 2.7.0
-    "@parcel/package-manager": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    "@parcel/workers": 2.7.0
-    utility-types: ^3.10.0
-  checksum: cf28c56d3e74faabefb2359259906a3f574a70ebda20633a3059b6c4c897f7a97df4e89920d89650855829b2ec3677b23a44efcef6fcc7be65c78eef7b21b96c
+    "@parcel/codeframe": 2.12.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/logger": 2.12.0
+    "@parcel/markdown-ansi": 2.12.0
+    "@parcel/rust": 2.12.0
+    "@parcel/source-map": ^2.1.1
+    chalk: ^4.1.0
+    nullthrows: ^1.1.1
+  checksum: ba80a60fed98c572a4e1dc81f87e0d63fc570221f6759e980b04eff88d3c92a83411a787a08da2720a7e541e52cc6890b1122f59ad7f4fc444f9dbfa8beba818
   languageName: node
   linkType: hard
 
@@ -1415,21 +1690,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/utils@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/utils@npm:2.7.0"
-  dependencies:
-    "@parcel/codeframe": 2.7.0
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/hash": 2.7.0
-    "@parcel/logger": 2.7.0
-    "@parcel/markdown-ansi": 2.7.0
-    "@parcel/source-map": ^2.0.0
-    chalk: ^4.1.0
-  checksum: 2645b3379deea727af4d908687b18707d721c71eafbe597275fd02da7e04ccb4ae50a191ef8afacc1cf119dcc77d33fe627cbfe56c0d210d84a1fe8b32ab9bac
-  languageName: node
-  linkType: hard
-
 "@parcel/watcher@npm:^2.0.0":
   version: 2.0.5
   resolution: "@parcel/watcher@npm:2.0.5"
@@ -1441,6 +1701,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@parcel/watcher@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@parcel/watcher@npm:2.0.7"
+  dependencies:
+    node-addon-api: ^3.2.1
+    node-gyp: latest
+    node-gyp-build: ^4.3.0
+  checksum: 9cf92fbf4486ad6af441286ce85bcd53a03445abb069c61485d3e0aafabe3da3008be06e38f386c3c0e117f743ed1fe04a88936be1daaf9c455e1e7e5b15f562
+  languageName: node
+  linkType: hard
+
+"@parcel/workers@npm:2.12.0":
+  version: 2.12.0
+  resolution: "@parcel/workers@npm:2.12.0"
+  dependencies:
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/logger": 2.12.0
+    "@parcel/profiler": 2.12.0
+    "@parcel/types": 2.12.0
+    "@parcel/utils": 2.12.0
+    nullthrows: ^1.1.1
+  peerDependencies:
+    "@parcel/core": ^2.12.0
+  checksum: e19c3c0a6651a9cef760aca3210356cff36c29d1472b544bec298bc4ffa9aa7429749cf6ce0b1009d034d8a086412833e3af48b3a88f95bb1700e09a8e62ca2f
+  languageName: node
+  linkType: hard
+
 "@parcel/workers@npm:2.6.2":
   version: 2.6.2
   resolution: "@parcel/workers@npm:2.6.2"
@@ -1457,228 +1744,175 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/workers@npm:2.7.0":
-  version: 2.7.0
-  resolution: "@parcel/workers@npm:2.7.0"
-  dependencies:
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/logger": 2.7.0
-    "@parcel/types": 2.7.0
-    "@parcel/utils": 2.7.0
-    chrome-trace-event: ^1.0.2
-    nullthrows: ^1.1.1
-  peerDependencies:
-    "@parcel/core": ^2.7.0
-  checksum: e3621c40300be14db72d2a201db9de08fdea121cf76c721a466960b5586052c4416b26931ea8e2df2fb7df2d942180c73759ceca4bd484499f8ac04caa104897
-  languageName: node
-  linkType: hard
-
-"@percy/cli-app@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/cli-app@npm:1.10.4"
-  dependencies:
-    "@percy/cli-command": 1.10.4
-    "@percy/cli-exec": 1.10.4
-  checksum: 81db381f2e8fea89be0fa8ad19cca1b4a643ec40d7a51a6b0b75c453a35df511ea225c2094ed00df2f398a1b6b65b9563cc9558bfcb6c3897f507ce4039c0108
-  languageName: node
-  linkType: hard
-
-"@percy/cli-build@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/cli-build@npm:1.10.4"
-  dependencies:
-    "@percy/cli-command": 1.10.4
-  checksum: c6aa64bbb3f5195f390b5f984cb212b4647db9975aa48f8356760a51956a8852e9c6b9a3903f4e7fc8a0ce596c702acac33bf238cae84387c5c0947bf600f655
-  languageName: node
-  linkType: hard
-
-"@percy/cli-command@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/cli-command@npm:1.10.4"
-  dependencies:
-    "@percy/config": 1.10.4
-    "@percy/core": 1.10.4
-    "@percy/logger": 1.10.4
-  bin:
-    percy-cli-readme: bin/readme.js
-  checksum: d96a572e2408b76ab7ba3b2d17cb8a8ea0de01213adf3e1024bf52bec9ef187a5e4797ef55086a333d35c7a82af5852494aa006ef39a783aac1dfe8c2a44e143
-  languageName: node
-  linkType: hard
-
-"@percy/cli-config@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/cli-config@npm:1.10.4"
-  dependencies:
-    "@percy/cli-command": 1.10.4
-  checksum: 901df758d4567c50c28a953dc84e8ced1a4e97b601d702cbd88f96e02aed3f85abe2bdfce1da6cca84dbf19de5285a1f2017e124b662072153da241bc8250baa
+"@pkgjs/parseargs@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@pkgjs/parseargs@npm:0.11.0"
+  checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f
   languageName: node
   linkType: hard
 
-"@percy/cli-exec@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/cli-exec@npm:1.10.4"
-  dependencies:
-    "@percy/cli-command": 1.10.4
-    cross-spawn: ^7.0.3
-    which: ^2.0.2
-  checksum: d1c77ce6c944f88155891b936874e8ab5d65b542f85e2d8ad333950824934027abf97aa10075429cce606809d4effc2359dca29f1ac390e803f1bca698fb7b47
+"@popperjs/core@npm:*":
+  version: 2.11.5
+  resolution: "@popperjs/core@npm:2.11.5"
+  checksum: fd7f9dca3fb716d7426332b6ee283f88d2724c0ab342fb678865a640bad403dfb9eeebd8204a406986162f7e2b33394f104320008b74d0e9066d7322f70ea35d
   languageName: node
   linkType: hard
 
-"@percy/cli-snapshot@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/cli-snapshot@npm:1.10.4"
-  dependencies:
-    "@percy/cli-command": 1.10.4
-    yaml: ^2.0.0
-  checksum: 51542704a056894b19b36d40663ca813661d952175657ffdb5508ed430cfaf45d1740d8e4237b704982391c188debc6eb16ccb4eb1ed63ca3aaea2b5847f61ab
+"@popperjs/core@npm:2.11.8":
+  version: 2.11.8
+  resolution: "@popperjs/core@npm:2.11.8"
+  checksum: e5c69fdebf52a4012f6a1f14817ca8e9599cb1be73dd1387e1785e2ed5e5f0862ff817f420a87c7fc532add1f88a12e25aeb010ffcbdc98eace3d55ce2139cf0
   languageName: node
   linkType: hard
 
-"@percy/cli-upload@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/cli-upload@npm:1.10.4"
+"@rollup/pluginutils@npm:5.1.0":
+  version: 5.1.0
+  resolution: "@rollup/pluginutils@npm:5.1.0"
   dependencies:
-    "@percy/cli-command": 1.10.4
-    fast-glob: ^3.2.11
-    image-size: ^1.0.0
-  checksum: 518e3e2414faa63863e7cca0edf730073a78c7faf024cd34c8821a60540d203575778ce75c4194086cfa291b130b11814b8008eeb320bbdceadbc8f09375e03e
+    "@types/estree": ^1.0.0
+    estree-walker: ^2.0.2
+    picomatch: ^2.3.1
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 3cc5a6d91452a6eabbfd1ae79b4dd1f1e809d2eecda6e175deb784e75b0911f47e9ecce73f8dd315d6a8b3f362582c91d3c0f66908b6ced69345b3cbe28f8ce8
   languageName: node
   linkType: hard
 
-"@percy/cli@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/cli@npm:1.10.4"
+"@sidvind/better-ajv-errors@npm:2.1.3":
+  version: 2.1.3
+  resolution: "@sidvind/better-ajv-errors@npm:2.1.3"
   dependencies:
-    "@percy/cli-app": 1.10.4
-    "@percy/cli-build": 1.10.4
-    "@percy/cli-command": 1.10.4
-    "@percy/cli-config": 1.10.4
-    "@percy/cli-exec": 1.10.4
-    "@percy/cli-snapshot": 1.10.4
-    "@percy/cli-upload": 1.10.4
-    "@percy/client": 1.10.4
-    "@percy/logger": 1.10.4
-  bin:
-    percy: bin/run.cjs
-  checksum: 3164e88bbc6966e046e60e625f6d692f478826b691fe43836934bdb321f607cdbdec0a3b535ca6b5bd1fb7ad8a58e07d5017603d083a1c9eabffe98314881b7e
+    "@babel/code-frame": ^7.16.0
+    chalk: ^4.1.0
+  peerDependencies:
+    ajv: 4.11.8 - 8
+  checksum: 949cb805a130a61c00895231aa33c1c9e51b72ae21bd59fe088fc9671b0e921b99183d816d34a02fe5d07647477c570a92d7d327c5e99670605e92b0d2ef163b
   languageName: node
   linkType: hard
 
-"@percy/client@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/client@npm:1.10.4"
-  dependencies:
-    "@percy/env": 1.10.4
-    "@percy/logger": 1.10.4
-  checksum: 8970cb0fee03c118bc728e931b6645b48b2e20792652ab2f34a7602c0d031a0f9558599a0e44fa8d67103de7cd745408adc1c23c45813d9239eb9892eec61459
+"@swc/core-darwin-arm64@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-darwin-arm64@npm:1.3.62"
+  conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@percy/config@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/config@npm:1.10.4"
-  dependencies:
-    "@percy/logger": 1.10.4
-    ajv: ^8.6.2
-    cosmiconfig: ^7.0.0
-    yaml: ^2.0.0
-  checksum: 545e2fd4ab2694a7142ea3d4117fa8009dabb71bf90c20bca102ccab397ec7553cb6e6465a1792f2abd3312ce9ac6487a1417d280d177a4995a42be784246f94
+"@swc/core-darwin-x64@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-darwin-x64@npm:1.3.62"
+  conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@percy/core@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/core@npm:1.10.4"
-  dependencies:
-    "@percy/client": 1.10.4
-    "@percy/config": 1.10.4
-    "@percy/dom": 1.10.4
-    "@percy/logger": 1.10.4
-    content-disposition: ^0.5.4
-    cross-spawn: ^7.0.3
-    extract-zip: ^2.0.1
-    fast-glob: ^3.2.11
-    micromatch: ^4.0.4
-    mime-types: ^2.1.34
-    path-to-regexp: ^6.2.0
-    rimraf: ^3.0.2
-    ws: ^8.0.0
-  checksum: 39f6de1cf57c086dca7bad37c09f88775e14b942a49c96966b0b277b63fe36bad25bb641c7d76b551e99ac58ea682a0c43894d6603d00a0a9dceb2359d5c56be
+"@swc/core-linux-arm-gnueabihf@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.62"
+  conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@percy/cypress@npm:3.1.2":
-  version: 3.1.2
-  resolution: "@percy/cypress@npm:3.1.2"
-  dependencies:
-    "@percy/sdk-utils": ^1.3.1
-  peerDependencies:
-    cypress: ">=3"
-  checksum: 576b14c0766d273bbd9a1671a0080b9f9223f9151fe95c6d9799febd2c08dc43a5e0e37427ef2daabddfe223d06741e40737c498b55c4396f93e048f8648a0bf
+"@swc/core-linux-arm64-gnu@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.62"
+  conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@percy/dom@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/dom@npm:1.10.4"
-  checksum: 2c1b4da7fab2c3cb150805c5cc35436e283a23dff42f63480d340d25f02662dfb05a733bbe69e585b426670f2c2f3ebd8b24708096651885aa5be4ad53731557
+"@swc/core-linux-arm64-musl@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.62"
+  conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@percy/env@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/env@npm:1.10.4"
-  checksum: c2a9f6b384b38d0fb4ce4c3ebdd2d7b7350fdaf6ed09b9466f9cf19865707a12663af932559524ae8f7c4b7f28ea6dadae38599451b8cf53737ec30712e942ee
+"@swc/core-linux-x64-gnu@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.62"
+  conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@percy/logger@npm:1.10.4":
-  version: 1.10.4
-  resolution: "@percy/logger@npm:1.10.4"
-  checksum: 4c6ade39028842ce935dcb023aba27b7fa69864ae3dd718d39d64b9fc773b6a1d0c6465dbea369b5566e1edfcd9b835777d25b3cd929aa1bd3696a677dd94672
+"@swc/core-linux-x64-musl@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.62"
+  conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@percy/sdk-utils@npm:^1.3.1":
-  version: 1.10.0
-  resolution: "@percy/sdk-utils@npm:1.10.0"
-  checksum: 98807581115dc03c84dacb074344dd81711311409d4f4454c04592f0f8c362d0b931eb74f3b1550241ae1fdd6a46f88fbc46dcc11b40544775b75586427a58be
+"@swc/core-win32-arm64-msvc@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.62"
+  conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@popperjs/core@npm:*":
-  version: 2.11.5
-  resolution: "@popperjs/core@npm:2.11.5"
-  checksum: fd7f9dca3fb716d7426332b6ee283f88d2724c0ab342fb678865a640bad403dfb9eeebd8204a406986162f7e2b33394f104320008b74d0e9066d7322f70ea35d
+"@swc/core-win32-ia32-msvc@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.62"
+  conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@popperjs/core@npm:2.11.6":
-  version: 2.11.6
-  resolution: "@popperjs/core@npm:2.11.6"
-  checksum: 47fb328cec1924559d759b48235c78574f2d71a8a6c4c03edb6de5d7074078371633b91e39bbf3f901b32aa8af9b9d8f82834856d2f5737a23475036b16817f0
+"@swc/core-win32-x64-msvc@npm:1.3.62":
+  version: 1.3.62
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.62"
+  conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@sidvind/better-ajv-errors@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@sidvind/better-ajv-errors@npm:2.0.0"
+"@swc/core@npm:^1.3.36":
+  version: 1.3.62
+  resolution: "@swc/core@npm:1.3.62"
   dependencies:
-    "@babel/code-frame": ^7.16.0
-    chalk: ^4.1.0
+    "@swc/core-darwin-arm64": 1.3.62
+    "@swc/core-darwin-x64": 1.3.62
+    "@swc/core-linux-arm-gnueabihf": 1.3.62
+    "@swc/core-linux-arm64-gnu": 1.3.62
+    "@swc/core-linux-arm64-musl": 1.3.62
+    "@swc/core-linux-x64-gnu": 1.3.62
+    "@swc/core-linux-x64-musl": 1.3.62
+    "@swc/core-win32-arm64-msvc": 1.3.62
+    "@swc/core-win32-ia32-msvc": 1.3.62
+    "@swc/core-win32-x64-msvc": 1.3.62
   peerDependencies:
-    ajv: 4.11.8 - 8
-  checksum: 12b0d87855737d1f36e869f9a55c706fa9eb232dfebaca5209c21d8d5caf7fa25671238064d68e619492c68591a73b6f49fcc1dff182fd77d2370e277033bd60
+    "@swc/helpers": ^0.5.0
+  dependenciesMeta:
+    "@swc/core-darwin-arm64":
+      optional: true
+    "@swc/core-darwin-x64":
+      optional: true
+    "@swc/core-linux-arm-gnueabihf":
+      optional: true
+    "@swc/core-linux-arm64-gnu":
+      optional: true
+    "@swc/core-linux-arm64-musl":
+      optional: true
+    "@swc/core-linux-x64-gnu":
+      optional: true
+    "@swc/core-linux-x64-musl":
+      optional: true
+    "@swc/core-win32-arm64-msvc":
+      optional: true
+    "@swc/core-win32-ia32-msvc":
+      optional: true
+    "@swc/core-win32-x64-msvc":
+      optional: true
+  peerDependenciesMeta:
+    "@swc/helpers":
+      optional: true
+  checksum: a7a0d9ffdb8a2b0050e0ff89fdb86fe189d9bcb7f91cb6847f1bfe3e2b520a87ea2e83692dfd80b6d541fb5addb2194769484516b8ca6d3c62ad80f1c79a9368
   languageName: node
   linkType: hard
 
-"@swc/helpers@npm:^0.4.2":
-  version: 0.4.3
-  resolution: "@swc/helpers@npm:0.4.3"
+"@swc/helpers@npm:^0.5.0":
+  version: 0.5.1
+  resolution: "@swc/helpers@npm:0.5.1"
   dependencies:
     tslib: ^2.4.0
-  checksum: 5c2f173e950dd3929d84ae48b3586a274d5a874e7cf2013b3d8081e4f8c723fa3a4d4e63b263e84bb7f06431f87b640e91a12655410463c81a3dc2bbc15eceda
+  checksum: 71e0e27234590435e4c62b97ef5e796f88e786841a38c7116a5e27a3eafa7b9ead7cdec5249b32165902076de78446945311c973e59bddf77c1e24f33a8f272a
   languageName: node
   linkType: hard
 
@@ -1696,6 +1930,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@twuni/emojify@npm:1.0.2":
+  version: 1.0.2
+  resolution: "@twuni/emojify@npm:1.0.2"
+  checksum: 0044c83b0589767dae1c1bb933cd56f2e5031a438f0fc993413e4cc229080e29c275cdd836be33ee02ddd59a5d1d6223a718685650f11ecfffc69c881c072152
+  languageName: node
+  linkType: hard
+
+"@types/estree@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@types/estree@npm:1.0.0"
+  checksum: 910d97fb7092c6738d30a7430ae4786a38542023c6302b95d46f49420b797f21619cdde11fa92b338366268795884111c2eb10356e4bd2c8ad5b92941e9e6443
+  languageName: node
+  linkType: hard
+
 "@types/istanbul-lib-coverage@npm:^2.0.1":
   version: 2.0.4
   resolution: "@types/istanbul-lib-coverage@npm:2.0.4"
@@ -1703,16 +1951,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^27.0.1":
-  version: 27.4.1
-  resolution: "@types/jest@npm:27.4.1"
-  dependencies:
-    jest-matcher-utils: ^27.0.0
-    pretty-format: ^27.0.0
-  checksum: 5184f3eef4832d01ee8f59bed15eec45ccc8e29c724a5e6ce37bf74396b37bdf04f557000f45ba4fc38ae6075cf9cfcce3d7a75abc981023c61ceb27230a93e4
-  languageName: node
-  linkType: hard
-
 "@types/json5@npm:^0.0.29":
   version: 0.0.29
   resolution: "@types/json5@npm:0.0.29"
@@ -1720,26 +1958,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash-es@npm:^4.17.6":
-  version: 4.17.6
-  resolution: "@types/lodash-es@npm:4.17.6"
+"@types/katex@npm:^0.16.2":
+  version: 0.16.5
+  resolution: "@types/katex@npm:0.16.5"
+  checksum: a1ce22cd87acd9b32891931f2bc4355c3540cc0a423e161a2e5b040d3e50812cb85ce1fd09f23d42324b19f9da30ded6b1807114f215624f670d79bb46c47cc8
+  languageName: node
+  linkType: hard
+
+"@types/lodash-es@npm:^4.17.9":
+  version: 4.17.10
+  resolution: "@types/lodash-es@npm:4.17.10"
   dependencies:
     "@types/lodash": "*"
-  checksum: 9bd239dd525086e278821949ce12fbdd4f100a060fed9323fc7ad5661113e1641f28a7ebab617230ed3474680d8f4de705c1928b48252bb684be6ec9eed715db
+  checksum: 129e9dde830815a72f9bd17c3a7b7ffb10a9cf76d65c7bb4f14df13b38411ed3ebe9ebbc2f9059c4e61198e784d499e48d0a281e27a4defbbba748dd8a4cfd9d
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:*, @types/lodash@npm:^4.14.181":
+"@types/lodash@npm:*":
   version: 4.14.182
   resolution: "@types/lodash@npm:4.14.182"
   checksum: 7dd137aa9dbabd632408bd37009d984655164fa1ecc3f2b6eb94afe35bf0a5852cbab6183148d883e9c73a958b7fec9a9bcf7c8e45d41195add6a18c34958209
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:^14.14.31":
-  version: 14.18.18
-  resolution: "@types/node@npm:14.18.18"
-  checksum: a165225cd2603f6e62af8407449e4a4407305e03b41c1adf6b186fdf546e1a03c8214217659b5b36c556947c0c06234993ac880d4db6378136a7a810d47e0742
+"@types/lodash@npm:^4.14.198":
+  version: 4.14.200
+  resolution: "@types/lodash@npm:4.14.200"
+  checksum: 6471f8bb5da692a6ecf03a8da4935bfbc341e67ee9bcb4f5730bfacff0c367232548f0a01e8ac5ea18c6fe78fb085d502494e33ccb47a7ee87cbdee03b47d00d
   languageName: node
   linkType: hard
 
@@ -1757,171 +2002,180 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/sinonjs__fake-timers@npm:8.1.1":
-  version: 8.1.1
-  resolution: "@types/sinonjs__fake-timers@npm:8.1.1"
-  checksum: ca09d54d47091d87020824a73f026300fa06b17cd9f2f9b9387f28b549364b141ef194ee28db762f6588de71d8febcd17f753163cb7ea116b8387c18e80ebd5c
+"@ungap/structured-clone@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@ungap/structured-clone@npm:1.2.0"
+  checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524
   languageName: node
   linkType: hard
 
-"@types/sizzle@npm:^2.3.2":
-  version: 2.3.3
-  resolution: "@types/sizzle@npm:2.3.3"
-  checksum: 586a9fb1f6ff3e325e0f2cc1596a460615f0bc8a28f6e276ac9b509401039dd242fa8b34496d3a30c52f5b495873922d09a9e76c50c2ab2bcc70ba3fb9c4e160
+"@vitejs/plugin-vue@npm:4.6.2":
+  version: 4.6.2
+  resolution: "@vitejs/plugin-vue@npm:4.6.2"
+  peerDependencies:
+    vite: ^4.0.0 || ^5.0.0
+    vue: ^3.2.25
+  checksum: 01bc4ed64319444f7dcad89f2c8da209f2a2fae1b7b9308c5f8593b5a307287d23178e7b252e1e6f89b20b69ae6629479e06adb7b49c70f5c409401d657e909b
   languageName: node
   linkType: hard
 
-"@types/yauzl@npm:^2.9.1":
-  version: 2.10.0
-  resolution: "@types/yauzl@npm:2.10.0"
+"@volar/language-core@npm:2.1.4":
+  version: 2.1.4
+  resolution: "@volar/language-core@npm:2.1.4"
   dependencies:
-    "@types/node": "*"
-  checksum: 55d27ae5d346ea260e40121675c24e112ef0247649073848e5d4e03182713ae4ec8142b98f61a1c6cbe7d3b72fa99bbadb65d8b01873e5e605cdc30f1ff70ef2
+    "@volar/source-map": 2.1.4
+  checksum: 7430f651431ed00eb7489d48c0596f4653fe70da3c779acfaa5807051db4491c9e4e154e9f0de3c9d863a3b4b1194a517a75395ca9134ea2b1b8af5ff637b204
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-vue@npm:2.3.4":
-  version: 2.3.4
-  resolution: "@vitejs/plugin-vue@npm:2.3.4"
-  peerDependencies:
-    vite: ^2.5.10
-    vue: ^3.2.25
-  checksum: 1203eda14a4d7bd3a892e71137dd3997908e0f9f07dced41c8b7d5851c42121fcff2f18df392f9c792a02de409e7634021f56aa71076ee68dd5fa8fdd4f7c478
+"@volar/language-service@npm:~2.1.0":
+  version: 2.1.4
+  resolution: "@volar/language-service@npm:2.1.4"
+  dependencies:
+    "@volar/language-core": 2.1.4
+    vscode-languageserver-protocol: ^3.17.5
+    vscode-languageserver-textdocument: ^1.0.11
+    vscode-uri: ^3.0.8
+  checksum: 06cdcfacf0fab22cee652cab1ae1729628d7ebf68f5f9e791e19e3715b2a4775c0bd2ec2e7a9b0815d93f244d7a745f3ea41aa5084923b10e9258a5f54c1107b
   languageName: node
   linkType: hard
 
-"@vue/compiler-core@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/compiler-core@npm:3.2.40"
+"@volar/source-map@npm:2.1.4, @volar/source-map@npm:~2.1.3":
+  version: 2.1.4
+  resolution: "@volar/source-map@npm:2.1.4"
   dependencies:
-    "@babel/parser": ^7.16.4
-    "@vue/shared": 3.2.40
+    muggle-string: ^0.4.0
+  checksum: e2f65bcfd667a02ee5cfe49e612b12e75c05fdaecf3b3590fdd7a0255dce7e51d09e8d4c390c2098ca7321cea219c16a8ea3f6c0f36ca9c0edff3975990b458b
+  languageName: node
+  linkType: hard
+
+"@vscode/l10n@npm:^0.0.18":
+  version: 0.0.18
+  resolution: "@vscode/l10n@npm:0.0.18"
+  checksum: c33876cebdef0385359619200ecb5d7c46d7f9abffb80f9fab1f83abb5d6bfdb44cc6d792d1b1b9c736c729121274733bbdcd5d2d2eea0d157bdf662d521edef
+  languageName: node
+  linkType: hard
+
+"@vue/compiler-core@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/compiler-core@npm:3.4.21"
+  dependencies:
+    "@babel/parser": ^7.23.9
+    "@vue/shared": 3.4.21
+    entities: ^4.5.0
     estree-walker: ^2.0.2
-    source-map: ^0.6.1
-  checksum: 2683bf13ef93701af1ca4850e887c8d4d67e5583b9c426fc2b08b5512df090bc464955f031cca9f52c11cc6ad49f1ab682011fdf3ba0b6c63b5ae8bea4e68c69
+    source-map-js: ^1.0.2
+  checksum: 0d6b7732bc5ca5b4561526bbe646f9acd09cd70561b6c822d15856347f21a009ebf30f2f85b1b7500f24f7c0333a2af8ee645c389abe52485c1f4724c982b306
   languageName: node
   linkType: hard
 
-"@vue/compiler-dom@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/compiler-dom@npm:3.2.40"
+"@vue/compiler-dom@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/compiler-dom@npm:3.4.21"
   dependencies:
-    "@vue/compiler-core": 3.2.40
-    "@vue/shared": 3.2.40
-  checksum: d928a16ebdda9d91a579546d108c9399f8c9a5c9c976196cfefa32f10c0ecb3111233c3291ba05898def85fcfccdc71e3446b977a7cdbc0d47d5d47b0dac75a3
+    "@vue/compiler-core": 3.4.21
+    "@vue/shared": 3.4.21
+  checksum: f53e4f4e0afc954cede91a8cbeb3a4e053531a43a0f5999d1b18da443ca3f1f6fc9344a8741c72c5719a61bb34e18004ac88e16747bcf145ebc8a31188263690
   languageName: node
   linkType: hard
 
-"@vue/compiler-sfc@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/compiler-sfc@npm:3.2.40"
+"@vue/compiler-sfc@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/compiler-sfc@npm:3.4.21"
   dependencies:
-    "@babel/parser": ^7.16.4
-    "@vue/compiler-core": 3.2.40
-    "@vue/compiler-dom": 3.2.40
-    "@vue/compiler-ssr": 3.2.40
-    "@vue/reactivity-transform": 3.2.40
-    "@vue/shared": 3.2.40
+    "@babel/parser": ^7.23.9
+    "@vue/compiler-core": 3.4.21
+    "@vue/compiler-dom": 3.4.21
+    "@vue/compiler-ssr": 3.4.21
+    "@vue/shared": 3.4.21
     estree-walker: ^2.0.2
-    magic-string: ^0.25.7
-    postcss: ^8.1.10
-    source-map: ^0.6.1
-  checksum: 96cbfd078ad9c5718afced84a1a46dfed87f61bb30ff50ebb929331470d11e672d6a090ad5766ff1e60a5287b7596be31f925af44b6b1bdf69b6f14e938ae7e2
+    magic-string: ^0.30.7
+    postcss: ^8.4.35
+    source-map-js: ^1.0.2
+  checksum: 226dc404be96a2811777825918d971feb42650e262159183548d64a463c4153fab97cdc2647224c609c89dbc0d930c6d9dbe6528ef52a1396b4b22163c20569a
   languageName: node
   linkType: hard
 
-"@vue/compiler-ssr@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/compiler-ssr@npm:3.2.40"
+"@vue/compiler-ssr@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/compiler-ssr@npm:3.4.21"
   dependencies:
-    "@vue/compiler-dom": 3.2.40
-    "@vue/shared": 3.2.40
-  checksum: 026461fcee54cf9968b1e12c32dada6dcde0a322919aa5a2c2e6e13cff7b6b2bdbc06860796895a8deef03ed1f8000e4320878576c498a1f218a62aa3e1c0bf6
+    "@vue/compiler-dom": 3.4.21
+    "@vue/shared": 3.4.21
+  checksum: c510bee68b1a5b7f8ae3fe771c10ce9c397f876a234ced9df89e4a8353f3874870857e929cbb37e6d785d355b43f2264dc3a7fd5cb6867dc5b39ddca607ea3ed
   languageName: node
   linkType: hard
 
-"@vue/devtools-api@npm:^6.1.4":
-  version: 6.1.4
-  resolution: "@vue/devtools-api@npm:6.1.4"
-  checksum: 027bb138b03ec7147dd15e5d0ef28d5b72c822530396cc8a86bc6fdb049dc6850314b9e897e497064e3ed47fad229a18141f56b8b8ca3d41092a576dc5b6538d
+"@vue/devtools-api@npm:^6.5.0":
+  version: 6.5.0
+  resolution: "@vue/devtools-api@npm:6.5.0"
+  checksum: ec819ef3a426e91d09e9cfefd2827e9ed8ec9d62bb3b3e0674f3da8c7e92a4b879c3b777dc7329172ca6fe2670b62dd5580d23160339208f0f5ae038f2e504ad
   languageName: node
   linkType: hard
 
-"@vue/devtools-api@npm:^6.2.1":
-  version: 6.2.1
-  resolution: "@vue/devtools-api@npm:6.2.1"
-  checksum: 34765af0be9b0cc7e3def73b2792b1514e3c348852c5a7503fe07d013f0e907af6c27c0a32c0637dd748caf37c075af8e53ca3220433e0bd34b6f3405f358272
+"@vue/devtools-api@npm:^6.5.1":
+  version: 6.6.1
+  resolution: "@vue/devtools-api@npm:6.6.1"
+  checksum: cf12b5ebcc7729725087072289410107b55bb82e0b86b8442e4e85516977110a8a3f4e1dec763be8b567a59173703b4e9c0ac1b0489bb2bb81363af7ea258a27
   languageName: node
   linkType: hard
 
-"@vue/reactivity-transform@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/reactivity-transform@npm:3.2.40"
+"@vue/language-plugin-pug@npm:2.0.7":
+  version: 2.0.7
+  resolution: "@vue/language-plugin-pug@npm:2.0.7"
   dependencies:
-    "@babel/parser": ^7.16.4
-    "@vue/compiler-core": 3.2.40
-    "@vue/shared": 3.2.40
-    estree-walker: ^2.0.2
-    magic-string: ^0.25.7
-  checksum: b86fc29b52f2460801a3c820370104b734b33cc3a66dbe0ad389a00a62b7a1069121b1ef5dfa50ca3530cbfa98c158743eee0e25af54ca45806f9497757db8c0
+    "@volar/source-map": ~2.1.3
+    volar-service-pug: 0.0.34
+  checksum: 11cc96eb5f240144e91b27fe06fcd48de4ef1e4c7fe666d1173b346ed64b7edfa922bd4eb2e512a91a0c6b907975afcaf69cfee4c91af11168590142b3aba4c3
   languageName: node
   linkType: hard
 
-"@vue/reactivity@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/reactivity@npm:3.2.40"
+"@vue/reactivity@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/reactivity@npm:3.4.21"
   dependencies:
-    "@vue/shared": 3.2.40
-  checksum: 927d22b424b63a14234810a3b8e4e9127b7238a7cb2fbd749180279048a109348a29fc724fd9d636a6e09b5f4c902f71c789f081d3ab9b4473faedc6a03d7865
+    "@vue/shared": 3.4.21
+  checksum: 79c7ebe3ec9295cdcb4d762e3a4c0e3eb67d7f12c9deb37baf372c4f48cd5914cdeeba14add433c3149b9c4dd890dc9891ee76e9d13c8ebcd521b5a754a8cc0d
   languageName: node
   linkType: hard
 
-"@vue/runtime-core@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/runtime-core@npm:3.2.40"
+"@vue/runtime-core@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/runtime-core@npm:3.4.21"
   dependencies:
-    "@vue/reactivity": 3.2.40
-    "@vue/shared": 3.2.40
-  checksum: 47c4918c1294a3dc9b50effac8fb0af4ae34476a9bf443774f66cd18230e44b6b6d1cb49657ea5670f04691fc116a1040356492393dd43523b43fd90be81078a
+    "@vue/reactivity": 3.4.21
+    "@vue/shared": 3.4.21
+  checksum: 4eb9b5d91fe58bc5b3f38293099d704ba7699a16d4ce68de03fbe5fc703e521ebfe3cefc156ef866d2ce0cbd1c2af1795674b39ab2b764bfedc069aa05233231
   languageName: node
   linkType: hard
 
-"@vue/runtime-dom@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/runtime-dom@npm:3.2.40"
+"@vue/runtime-dom@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/runtime-dom@npm:3.4.21"
   dependencies:
-    "@vue/runtime-core": 3.2.40
-    "@vue/shared": 3.2.40
-    csstype: ^2.6.8
-  checksum: 4615d00cc4e2e19dc3e6e2baf5fa0cbab7d33fbbd7550b42264b6ef2e2ef5b750ef0d0c98591c10fea60d69fc33444ba4824954bce38abfa3473785a58d74c80
+    "@vue/runtime-core": 3.4.21
+    "@vue/shared": 3.4.21
+    csstype: ^3.1.3
+  checksum: ebfdaa081fb7f18214a4e3324a7b58cc1bfe9b585cfc9dc5cf2ee480f233f992c32a6a3a3b595040babf26570ca18e748049d9284c42beceac8665e8f4ce5383
   languageName: node
   linkType: hard
 
-"@vue/server-renderer@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/server-renderer@npm:3.2.40"
+"@vue/server-renderer@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/server-renderer@npm:3.4.21"
   dependencies:
-    "@vue/compiler-ssr": 3.2.40
-    "@vue/shared": 3.2.40
+    "@vue/compiler-ssr": 3.4.21
+    "@vue/shared": 3.4.21
   peerDependencies:
-    vue: 3.2.40
-  checksum: f9d53aefcace97b9e6d20de2d9bc106112bd0ff0ef849a104996fc1256e994b64e33e91853ba7bc716d4f75a2ade81b57f3fb1482eba07324eb7cedbd0dab96d
-  languageName: node
-  linkType: hard
-
-"@vue/shared@npm:3.2.40":
-  version: 3.2.40
-  resolution: "@vue/shared@npm:3.2.40"
-  checksum: d91a1e12ffb106a444dcb42c0a54d39f6688f98151dc3b77e8da1e7d3cfd09e1761268d11e7f920f233b43162e727d06f3af4408ef59c53ac2dce9c1d2881511
+    vue: 3.4.21
+  checksum: faa3dc48767fc4308ffa031d07a6dbb362f26b0b8893f82747e6d879f046c373978402d1c15ed08267ebc0f090809cd3d554e6a4f582affcefb5239be5d4860c
   languageName: node
   linkType: hard
 
-"@vue/test-utils@npm:2.1.0":
-  version: 2.1.0
-  resolution: "@vue/test-utils@npm:2.1.0"
-  peerDependencies:
-    vue: ^3.0.1
-  checksum: 4612568209cefca8d8839f364b62126d34d57d4de4f4ef8b8f83588f3c12a0144872ac54aa4bb24a5a597447d5d732b9fd63e71d57a6dec3bcb784352db70706
+"@vue/shared@npm:3.4.21":
+  version: 3.4.21
+  resolution: "@vue/shared@npm:3.4.21"
+  checksum: 5f30a408911f339c647baa88c45c3a2f6d58dbdaf2bd404753690f24b612717bdfe9050401d8ffb02613a9a06dd0b43c8307420cd69fda6e92e6d65bf9bc0c6f
   languageName: node
   linkType: hard
 
@@ -1948,13 +2202,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^8.0.0":
-  version: 8.2.0
-  resolution: "acorn-walk@npm:8.2.0"
-  checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1
-  languageName: node
-  linkType: hard
-
 "acorn@npm:^7.1.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
@@ -1964,7 +2211,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.5.0, acorn@npm:^8.7.1":
+"acorn@npm:^8.7.1":
   version: 8.7.1
   resolution: "acorn@npm:8.7.1"
   bin:
@@ -1973,12 +2220,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.8.0":
-  version: 8.8.0
-  resolution: "acorn@npm:8.8.0"
+"acorn@npm:^8.9.0":
+  version: 8.10.0
+  resolution: "acorn@npm:8.10.0"
   bin:
     acorn: bin/acorn
-  checksum: 7270ca82b242eafe5687a11fea6e088c960af712683756abf0791b68855ea9cace3057bd5e998ffcef50c944810c1e0ca1da526d02b32110e13c722aa959afdc
+  checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d
   languageName: node
   linkType: hard
 
@@ -2012,7 +2259,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^6.10.0, ajv@npm:^6.12.4":
+"ajv@npm:^6.12.4":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
   dependencies:
@@ -2024,7 +2271,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.6.2":
+"ajv@npm:^8.0.0":
   version: 8.11.0
   resolution: "ajv@npm:8.11.0"
   dependencies:
@@ -2036,22 +2283,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-colors@npm:^4.1.1":
-  version: 4.1.3
-  resolution: "ansi-colors@npm:4.1.3"
-  checksum: a9c2ec842038a1fabc7db9ece7d3177e2fe1c5dc6f0c51ecfbf5f39911427b89c00b5dc6b8bd95f82a26e9b16aaae2e83d45f060e98070ce4d1333038edceb0e
-  languageName: node
-  linkType: hard
-
-"ansi-escapes@npm:^4.3.0":
-  version: 4.3.2
-  resolution: "ansi-escapes@npm:4.3.2"
-  dependencies:
-    type-fest: ^0.21.3
-  checksum: 93111c42189c0a6bed9cdb4d7f2829548e943827ee8479c74d6e0b22ee127b2a21d3f8b5ca57723b8ef78ce011fbfc2784350eb2bde3ccfccf2f575fa8489815
-  languageName: node
-  linkType: hard
-
 "ansi-regex@npm:^5.0.1":
   version: 5.0.1
   resolution: "ansi-regex@npm:5.0.1"
@@ -2059,6 +2290,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-regex@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "ansi-regex@npm:6.0.1"
+  checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169
+  languageName: node
+  linkType: hard
+
 "ansi-styles@npm:^3.2.1":
   version: 3.2.1
   resolution: "ansi-styles@npm:3.2.1"
@@ -2077,10 +2315,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "ansi-styles@npm:5.2.0"
-  checksum: d7f4e97ce0623aea6bc0d90dcd28881ee04cba06c570b97fd3391bd7a268eedfd9d5e2dd4fdcbdd82b8105df5faf6f24aaedc08eaf3da898e702db5948f63469
+"ansi-styles@npm:^6.1.0":
+  version: 6.2.1
+  resolution: "ansi-styles@npm:6.2.1"
+  checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9
   languageName: node
   linkType: hard
 
@@ -2101,13 +2339,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arch@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "arch@npm:2.2.0"
-  checksum: e21b7635029fe8e9cdd5a026f9a6c659103e63fff423834323cdf836a1bb240a72d0c39ca8c470f84643385cf581bd8eda2cad8bf493e27e54bd9783abe9101f
-  languageName: node
-  linkType: hard
-
 "are-we-there-yet@npm:^3.0.0":
   version: 3.0.0
   resolution: "are-we-there-yet@npm:3.0.0"
@@ -2125,114 +2356,106 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.4":
-  version: 3.1.4
-  resolution: "array-includes@npm:3.1.4"
+"array-buffer-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "array-buffer-byte-length@npm:1.0.0"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.1
-    get-intrinsic: ^1.1.1
-    is-string: ^1.0.7
-  checksum: 69967c38c52698f84b50a7aed5554aadc89c6ac6399b6d92ad061a5952f8423b4bba054c51d40963f791dfa294d7247cdd7988b6b1f2c5861477031c6386e1c0
+    is-array-buffer: ^3.0.1
+  checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3
   languageName: node
   linkType: hard
 
-"array-union@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "array-union@npm:2.1.0"
-  checksum: 5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d
+"array-includes@npm:^3.1.7":
+  version: 3.1.7
+  resolution: "array-includes@npm:3.1.7"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    is-string: ^1.0.7
+  checksum: 06f9e4598fac12a919f7c59a3f04f010ea07f0b7f0585465ed12ef528a60e45f374e79d1bddbb34cdd4338357d00023ddbd0ac18b0be36964f5e726e8965d7fc
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.2.5":
-  version: 1.3.0
-  resolution: "array.prototype.flat@npm:1.3.0"
+"array.prototype.findlastindex@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "array.prototype.findlastindex@npm:1.2.3"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
     es-shim-unscopables: ^1.0.0
-  checksum: 2a652b3e8dc0bebb6117e42a5ab5738af0203a14c27341d7bb2431467bdb4b348e2c5dc555dfcda8af0a5e4075c400b85311ded73861c87290a71a17c3e0a257
-  languageName: node
-  linkType: hard
-
-"asap@npm:~2.0.3":
-  version: 2.0.6
-  resolution: "asap@npm:2.0.6"
-  checksum: b296c92c4b969e973260e47523207cd5769abd27c245a68c26dc7a0fe8053c55bb04360237cb51cab1df52be939da77150ace99ad331fb7fb13b3423ed73ff3d
+    get-intrinsic: ^1.2.1
+  checksum: 31f35d7b370c84db56484618132041a9af401b338f51899c2e78ef7690fbba5909ee7ca3c59a7192085b328cc0c68c6fd1f6d1553db01a689a589ae510f3966e
   languageName: node
   linkType: hard
 
-"asn1@npm:~0.2.3":
-  version: 0.2.6
-  resolution: "asn1@npm:0.2.6"
+"array.prototype.flat@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "array.prototype.flat@npm:1.3.2"
   dependencies:
-    safer-buffer: ~2.1.0
-  checksum: 39f2ae343b03c15ad4f238ba561e626602a3de8d94ae536c46a4a93e69578826305366dc09fbb9b56aec39b4982a463682f259c38e59f6fa380cd72cd61e493d
-  languageName: node
-  linkType: hard
-
-"assert-never@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "assert-never@npm:1.2.1"
-  checksum: ea4f1756d90f55254c4dc7a20d6c5d5bc169160562aefe3d8756b598c10e695daf568f21b6d6b12245d7f3782d3ff83ef6a01ab75d487adfc6909470a813bf8c
-  languageName: node
-  linkType: hard
-
-"assert-plus@npm:1.0.0, assert-plus@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "assert-plus@npm:1.0.0"
-  checksum: 19b4340cb8f0e6a981c07225eacac0e9d52c2644c080198765d63398f0075f83bbc0c8e95474d54224e297555ad0d631c1dcd058adb1ddc2437b41a6b424ac64
-  languageName: node
-  linkType: hard
-
-"astral-regex@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "astral-regex@npm:2.0.0"
-  checksum: 876231688c66400473ba505731df37ea436e574dd524520294cc3bbc54ea40334865e01fa0d074d74d036ee874ee7e62f486ea38bc421ee8e6a871c06f011766
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    es-shim-unscopables: ^1.0.0
+  checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b
   languageName: node
   linkType: hard
 
-"async-validator@npm:^4.0.7":
-  version: 4.1.1
-  resolution: "async-validator@npm:4.1.1"
-  checksum: 88590ab8ad1db6e3f6e01136d5313d4e91e269e74b7d4017aa16c64dac5be2697dbd1ff3de18f0e000d12073626475de9f77ba41808af38b0ea23eb0e6e8a361
+"array.prototype.flatmap@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "array.prototype.flatmap@npm:1.3.2"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    es-shim-unscopables: ^1.0.0
+  checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3
   languageName: node
   linkType: hard
 
-"async@npm:^3.2.0":
-  version: 3.2.3
-  resolution: "async@npm:3.2.3"
-  checksum: c4bee57ab2249af3dc83ca3ef9acfa8e822c0d5e5aa41bae3eaf7f673648343cd64ecd7d26091ffd357f3f044428b17b5f00098494b6cf8b6b3e9681f0636ca1
+"arraybuffer.prototype.slice@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
+  dependencies:
+    array-buffer-byte-length: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    is-array-buffer: ^3.0.2
+    is-shared-array-buffer: ^1.0.2
+  checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3
   languageName: node
   linkType: hard
 
-"asynckit@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "asynckit@npm:0.4.0"
-  checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be
+"asap@npm:~2.0.3":
+  version: 2.0.6
+  resolution: "asap@npm:2.0.6"
+  checksum: b296c92c4b969e973260e47523207cd5769abd27c245a68c26dc7a0fe8053c55bb04360237cb51cab1df52be939da77150ace99ad331fb7fb13b3423ed73ff3d
   languageName: node
   linkType: hard
 
-"at-least-node@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "at-least-node@npm:1.0.0"
-  checksum: 463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e
+"assert-never@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "assert-never@npm:1.2.1"
+  checksum: ea4f1756d90f55254c4dc7a20d6c5d5bc169160562aefe3d8756b598c10e695daf568f21b6d6b12245d7f3782d3ff83ef6a01ab75d487adfc6909470a813bf8c
   languageName: node
   linkType: hard
 
-"aws-sign2@npm:~0.7.0":
-  version: 0.7.0
-  resolution: "aws-sign2@npm:0.7.0"
-  checksum: b148b0bb0778098ad8cf7e5fc619768bcb51236707ca1d3e5b49e41b171166d8be9fdc2ea2ae43d7decf02989d0aaa3a9c4caa6f320af95d684de9b548a71525
+"async-validator@npm:^4.2.5":
+  version: 4.2.5
+  resolution: "async-validator@npm:4.2.5"
+  checksum: 3e3d891a2e21497c8a646afeb7b1e6ed5f98de5f58ce3600732080f327cb581e65d8d8ff184273f1461dc84105d49f5cf31422a67ce50e787967c306838b6f40
   languageName: node
   linkType: hard
 
-"aws4@npm:^1.8.0":
-  version: 1.11.0
-  resolution: "aws4@npm:1.11.0"
-  checksum: 5a00d045fd0385926d20ebebcfba5ec79d4482fe706f63c27b324d489a04c68edb0db99ed991e19eda09cb8c97dc2452059a34d97545cebf591d7a2b5a10999f
+"available-typed-arrays@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "available-typed-arrays@npm:1.0.5"
+  checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a
   languageName: node
   linkType: hard
 
@@ -2261,22 +2484,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base64-js@npm:^1.3.1":
-  version: 1.5.1
-  resolution: "base64-js@npm:1.5.1"
-  checksum: 669632eb3745404c2f822a18fc3a0122d2f9a7a13f7fb8b5823ee19d1d2ff9ee5b52c53367176ea4ad093c332fd5ab4bd0ebae5a8e27917a4105a4cfc86b1005
-  languageName: node
-  linkType: hard
-
-"bcrypt-pbkdf@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "bcrypt-pbkdf@npm:1.0.2"
-  dependencies:
-    tweetnacl: ^0.14.3
-  checksum: 4edfc9fe7d07019609ccf797a2af28351736e9d012c8402a07120c4453a3b789a15f2ee1530dc49eee8f7eb9379331a8dd4b3766042b9e502f74a68e7f662291
-  languageName: node
-  linkType: hard
-
 "binary-extensions@npm:^2.0.0":
   version: 2.2.0
   resolution: "binary-extensions@npm:2.2.0"
@@ -2284,20 +2491,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"blob-util@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "blob-util@npm:2.0.2"
-  checksum: d543e6b92e4ca715ca33c78e89a07a2290d43e5b2bc897d7ec588c5c7bbf59df93e45225ac0c9258aa6ce4320358990f99c9288f1c48280f8ec5d7a2e088d19b
-  languageName: node
-  linkType: hard
-
-"bluebird@npm:^3.7.2":
-  version: 3.7.2
-  resolution: "bluebird@npm:3.7.2"
-  checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef
-  languageName: node
-  linkType: hard
-
 "boolbase@npm:^1.0.0":
   version: 1.0.0
   resolution: "boolbase@npm:1.0.0"
@@ -2305,19 +2498,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bootstrap-icons@npm:1.9.1":
-  version: 1.9.1
-  resolution: "bootstrap-icons@npm:1.9.1"
-  checksum: b388264719b5d2526809df509b83aa7e696d467f3b976d79faefb6fc7f07cee5427a894331af90b00b1ceb8d28a99fc398f1ca0553afaa53eb77a7749bb73ea5
+"bootstrap-icons@npm:1.11.3":
+  version: 1.11.3
+  resolution: "bootstrap-icons@npm:1.11.3"
+  checksum: d5cdb90fe37af9051f369cbced8aa25bde9c29895f6ab47cbadcfdca71ae5b49093fceb4261c910a84d4352a5a4f998fdae4f1c245897bc6a1042321f4380c07
   languageName: node
   linkType: hard
 
-"bootstrap@npm:5.2.2":
-  version: 5.2.2
-  resolution: "bootstrap@npm:5.2.2"
+"bootstrap@npm:5.3.3":
+  version: 5.3.3
+  resolution: "bootstrap@npm:5.3.3"
   peerDependencies:
-    "@popperjs/core": ^2.11.6
-  checksum: 14e6df28feb975dc10702cac0a6c2a21132a6e4e5562e31cdae1db3970e287ed29001020066b61d96b2cea2a45ecf44c08c8c26bc84a31cdeabec0a9be6b9389
+    "@popperjs/core": ^2.11.8
+  checksum: 537b68db30150075614310e9ebdf1be9b4affdf89ca226d59f4352e82a368b203af13ed0ce5ccfa4e06f141ecd233f7432ca3817e9c1a39863a05fbe13c73c4b
   languageName: node
   linkType: hard
 
@@ -2349,7 +2542,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"braces@npm:^3.0.2, braces@npm:~3.0.2":
+"braces@npm:~3.0.2":
   version: 3.0.2
   resolution: "braces@npm:3.0.2"
   dependencies:
@@ -2358,10 +2551,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browser-fs-access@npm:0.31.0":
-  version: 0.31.0
-  resolution: "browser-fs-access@npm:0.31.0"
-  checksum: d1b6682415c2ee4c05dc44cd95daaa1a4f3f59d1ec723bde0d384bf44b71c804a665ca24a3805d0a76d7f2626541d4a777df4f45ae4a7439a8b76e20897d301d
+"browser-fs-access@npm:0.35.0":
+  version: 0.35.0
+  resolution: "browser-fs-access@npm:0.35.0"
+  checksum: 5f3bf1ec17ffc2c991af7d92e2100f0b3d6cdd638a4dbf59e72c86a6de534816d7ad40cd25b63bf8f15d2ae47f1cd46ad27f13104029e62f8f101722dabf3a37
   languageName: node
   linkType: hard
 
@@ -2387,31 +2580,14 @@ browserlist@latest:
     picocolors: ^1.0.0
   bin:
     browserslist: cli.js
-  checksum: 1e4b719ac2ca0fe235218a606e8b8ef16b8809e0973b924158c39fbc435a0b0fe43437ea52dd6ef5ad2efcb83fcb07431244e472270177814217f7c563651f7d
-  languageName: node
-  linkType: hard
-
-"buffer-crc32@npm:~0.2.3":
-  version: 0.2.13
-  resolution: "buffer-crc32@npm:0.2.13"
-  checksum: 06252347ae6daca3453b94e4b2f1d3754a3b146a111d81c68924c22d91889a40623264e95e67955b1cb4a68cbedf317abeabb5140a9766ed248973096db5ce1c
-  languageName: node
-  linkType: hard
-
-"buffer-from@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "buffer-from@npm:1.1.2"
-  checksum: 0448524a562b37d4d7ed9efd91685a5b77a50672c556ea254ac9a6d30e3403a517d8981f10e565db24e8339413b43c97ca2951f10e399c6125a0d8911f5679bb
+  checksum: 1e4b719ac2ca0fe235218a606e8b8ef16b8809e0973b924158c39fbc435a0b0fe43437ea52dd6ef5ad2efcb83fcb07431244e472270177814217f7c563651f7d
   languageName: node
   linkType: hard
 
-"buffer@npm:^5.6.0":
-  version: 5.7.1
-  resolution: "buffer@npm:5.7.1"
-  dependencies:
-    base64-js: ^1.3.1
-    ieee754: ^1.1.13
-  checksum: e2cf8429e1c4c7b8cbd30834ac09bd61da46ce35f5c22a78e6c2f04497d6d25541b16881e30a019c6fd3154150650ccee27a308eff3e26229d788bbdeb08ab84
+"builtin-modules@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "builtin-modules@npm:3.3.0"
+  checksum: db021755d7ed8be048f25668fe2117620861ef6703ea2c65ed2779c9e3636d5c3b82325bd912244293959ff3ae303afa3471f6a15bf5060c103e4cc3a839749d
   languageName: node
   linkType: hard
 
@@ -2433,25 +2609,24 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"c8@npm:7.12.0":
-  version: 7.12.0
-  resolution: "c8@npm:7.12.0"
+"c8@npm:9.1.0":
+  version: 9.1.0
+  resolution: "c8@npm:9.1.0"
   dependencies:
     "@bcoe/v8-coverage": ^0.2.3
     "@istanbuljs/schema": ^0.1.3
     find-up: ^5.0.0
-    foreground-child: ^2.0.0
+    foreground-child: ^3.1.1
     istanbul-lib-coverage: ^3.2.0
-    istanbul-lib-report: ^3.0.0
-    istanbul-reports: ^3.1.4
-    rimraf: ^3.0.2
+    istanbul-lib-report: ^3.0.1
+    istanbul-reports: ^3.1.6
     test-exclude: ^6.0.0
     v8-to-istanbul: ^9.0.0
-    yargs: ^16.2.0
-    yargs-parser: ^20.2.9
+    yargs: ^17.7.2
+    yargs-parser: ^21.1.1
   bin:
     c8: bin/c8.js
-  checksum: 3b7fa9ad7cff2cb0bb579467e6b544498fbd46e9353a809ad3b8cf749df4beadd074cde277356b0552f3c8055b1b3ec3ebaf2209e9ad4bdefed92dbf64d283ab
+  checksum: c5249bf9c390784a33b05f5e930f5301793c15105c874a0130839dbf3309ce8832376f77be5e325a40cc2955f455f1d7aea754858befd07eee535dd42b287bbe
   languageName: node
   linkType: hard
 
@@ -2481,13 +2656,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"cachedir@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "cachedir@npm:2.3.0"
-  checksum: ec90cb0f2e6336e266aa748dbadf3da9e0b20e843e43f1591acab7a3f1451337dc2f26cb9dd833ae8cfefeffeeb43ef5b5ff62782a685f4e3c2305dd98482fcb
-  languageName: node
-  linkType: hard
-
 "call-bind@npm:^1.0.0, call-bind@npm:^1.0.2":
   version: 1.0.2
   resolution: "call-bind@npm:1.0.2"
@@ -2498,6 +2666,17 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"call-bind@npm:^1.0.4, call-bind@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "call-bind@npm:1.0.5"
+  dependencies:
+    function-bind: ^1.1.2
+    get-intrinsic: ^1.2.1
+    set-function-length: ^1.1.1
+  checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5
+  languageName: node
+  linkType: hard
+
 "callsites@npm:^3.0.0":
   version: 3.1.0
   resolution: "callsites@npm:3.1.0"
@@ -2505,24 +2684,17 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:1.0.30001414":
-  version: 1.0.30001414
-  resolution: "caniuse-lite@npm:1.0.30001414"
-  checksum: 97210cfd15ded093b20c33d35bef9711a88402c3345411dad420c991a41a3e38ad17fd66721e8334c86e9b2e4aa2c1851d3631f1441afb73b92d93b2b8ca890d
+"caniuse-lite@npm:1.0.30001603":
+  version: 1.0.30001603
+  resolution: "caniuse-lite@npm:1.0.30001603"
+  checksum: e66e0d24b899c2ed3fdcc2dd44df29c4fc06d74fa8f43abe81fc7cff4a72b092d438e0fb5b7daeb252ee267519f32c6c7d229a15e7a4f4263afef6ea3832b661
   languageName: node
   linkType: hard
 
 "caniuse-lite@npm:^1.0.30001332":
-  version: 1.0.30001340
-  resolution: "caniuse-lite@npm:1.0.30001340"
-  checksum: 5b419c93cb5a67568ffe8c84520d149146e5b84056ce41ee509c89d2bd036e4ce6d87485e25dfee2bb8a818d46e0734e93cacbef6b9b911c20166b943b36b78c
-  languageName: node
-  linkType: hard
-
-"caseless@npm:~0.12.0":
-  version: 0.12.0
-  resolution: "caseless@npm:0.12.0"
-  checksum: b43bd4c440aa1e8ee6baefee8063b4850fd0d7b378f6aabc796c9ec8cb26d27fb30b46885350777d9bd079c5256c0e1329ad0dc7c2817e0bb466810ebb353751
+  version: 1.0.30001430
+  resolution: "caniuse-lite@npm:1.0.30001430"
+  checksum: 15200fe2658871807341a451b01e3d6ae2bf5e0e30b60af86e1e8d9e1655a5f5011bb23fdc3d6b696019d63d3e60ad6864b15c40c80c538c4500ac5098b9701b
   languageName: node
   linkType: hard
 
@@ -2556,13 +2728,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"check-more-types@npm:^2.24.0":
-  version: 2.24.0
-  resolution: "check-more-types@npm:2.24.0"
-  checksum: b09080ec3404d20a4b0ead828994b2e5913236ef44ed3033a27062af0004cf7d2091fbde4b396bf13b7ce02fb018bc9960b48305e6ab2304cd82d73ed7a51ef4
-  languageName: node
-  linkType: hard
-
 "chokidar@npm:>=3.0.0 <4.0.0":
   version: 3.5.3
   resolution: "chokidar@npm:3.5.3"
@@ -2589,20 +2754,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"chrome-trace-event@npm:^1.0.2":
+"chrome-trace-event@npm:^1.0.2, chrome-trace-event@npm:^1.0.3":
   version: 1.0.3
   resolution: "chrome-trace-event@npm:1.0.3"
   checksum: cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97
   languageName: node
   linkType: hard
 
-"ci-info@npm:^3.2.0":
-  version: 3.3.1
-  resolution: "ci-info@npm:3.3.1"
-  checksum: 244546317cca96955860d2cb8d0bf47dd66d9078bbe83a215fa87464ab24b352c6fc6f56027d1c82f002e3f833be253f1320d35ed7199bd81134f7788c657f3a
-  languageName: node
-  linkType: hard
-
 "clean-stack@npm:^2.0.0":
   version: 2.2.0
   resolution: "clean-stack@npm:2.2.0"
@@ -2610,46 +2768,14 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"cli-cursor@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "cli-cursor@npm:3.1.0"
-  dependencies:
-    restore-cursor: ^3.1.0
-  checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29
-  languageName: node
-  linkType: hard
-
-"cli-table3@npm:~0.6.1":
-  version: 0.6.2
-  resolution: "cli-table3@npm:0.6.2"
+"cliui@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "cliui@npm:8.0.1"
   dependencies:
-    "@colors/colors": 1.5.0
     string-width: ^4.2.0
-  dependenciesMeta:
-    "@colors/colors":
-      optional: true
-  checksum: 2f82391698b8a2a2a5e45d2adcfea5d93e557207f90455a8d4c1aac688e9b18a204d9eb4ba1d322fa123b17d64ea3dc5e11de8b005529f3c3e7dbeb27cb4d9be
-  languageName: node
-  linkType: hard
-
-"cli-truncate@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cli-truncate@npm:2.1.0"
-  dependencies:
-    slice-ansi: ^3.0.0
-    string-width: ^4.2.0
-  checksum: bf1e4e6195392dc718bf9cd71f317b6300dc4a9191d052f31046b8773230ece4fa09458813bf0e3455a5e68c0690d2ea2c197d14a8b85a7b5e01c97f4b5feb5d
-  languageName: node
-  linkType: hard
-
-"cliui@npm:^7.0.2":
-  version: 7.0.4
-  resolution: "cliui@npm:7.0.4"
-  dependencies:
-    string-width: ^4.2.0
-    strip-ansi: ^6.0.0
+    strip-ansi: ^6.0.1
     wrap-ansi: ^7.0.0
-  checksum: ce2e8f578a4813806788ac399b9e866297740eecd4ad1823c27fd344d78b22c5f8597d548adbcc46f0573e43e21e751f39446c5a5e804a12aace402b7a315d7f
+  checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56
   languageName: node
   linkType: hard
 
@@ -2701,22 +2827,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.16":
-  version: 2.0.16
-  resolution: "colorette@npm:2.0.16"
-  checksum: cd55596a3a2d1071c1a28eee7fd8a5387593ff1bd10a3e8d0a6221499311fe34a9f2b9272d77c391e0e003dcdc8934fb2f8d106e7ef1f7516f8060c901d41a27
-  languageName: node
-  linkType: hard
-
-"combined-stream@npm:^1.0.6, combined-stream@npm:~1.0.6":
-  version: 1.0.8
-  resolution: "combined-stream@npm:1.0.8"
-  dependencies:
-    delayed-stream: ~1.0.0
-  checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c
-  languageName: node
-  linkType: hard
-
 "commander@npm:7, commander@npm:^7.0.0, commander@npm:^7.2.0":
   version: 7.2.0
   resolution: "commander@npm:7.2.0"
@@ -2724,27 +2834,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"commander@npm:^2.20.0":
-  version: 2.20.3
-  resolution: "commander@npm:2.20.3"
-  checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e
-  languageName: node
-  linkType: hard
-
-"commander@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "commander@npm:5.1.0"
-  checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447
-  languageName: node
-  linkType: hard
-
-"common-tags@npm:^1.8.0":
-  version: 1.8.2
-  resolution: "common-tags@npm:1.8.2"
-  checksum: 767a6255a84bbc47df49a60ab583053bb29a7d9687066a18500a516188a062c4e4cd52de341f22de0b07062e699b1b8fe3cfa1cb55b241cb9301aeb4f45b4dff
-  languageName: node
-  linkType: hard
-
 "concat-map@npm:0.0.1":
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"
@@ -2769,15 +2858,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"content-disposition@npm:^0.5.4":
-  version: 0.5.4
-  resolution: "content-disposition@npm:0.5.4"
-  dependencies:
-    safe-buffer: 5.2.1
-  checksum: afb9d545e296a5171d7574fcad634b2fdf698875f4006a9dd04a3e1333880c5c0c98d47b560d01216fb6505a54a2ba6a843ee3a02ec86d7e911e8315255f56c3
-  languageName: node
-  linkType: hard
-
 "convert-source-map@npm:^1.6.0":
   version: 1.8.0
   resolution: "convert-source-map@npm:1.8.0"
@@ -2787,14 +2867,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"core-util-is@npm:1.0.2":
-  version: 1.0.2
-  resolution: "core-util-is@npm:1.0.2"
-  checksum: 7a4c925b497a2c91421e25bf76d6d8190f0b2359a9200dbeed136e63b2931d6294d3b1893eda378883ed363cd950f44a12a401384c609839ea616befb7927dab
-  languageName: node
-  linkType: hard
-
-"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1":
+"cosmiconfig@npm:^7.0.1":
   version: 7.0.1
   resolution: "cosmiconfig@npm:7.0.1"
   dependencies:
@@ -2807,7 +2880,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2":
   version: 7.0.3
   resolution: "cross-spawn@npm:7.0.3"
   dependencies:
@@ -2829,6 +2902,16 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"css-render@npm:^0.15.12":
+  version: 0.15.12
+  resolution: "css-render@npm:0.15.12"
+  dependencies:
+    "@emotion/hash": ~0.8.0
+    csstype: ~3.0.5
+  checksum: 80265c5055e3a77b7ee357c16e3090f84f19a2f4e0917425c430f987e0af62c2491121832c7e0c7b0037eaff4291dc0385b1e6ef068c6088a704973e971defd0
+  languageName: node
+  linkType: hard
+
 "css-select@npm:^4.1.3":
   version: 4.3.0
   resolution: "css-select@npm:4.3.0"
@@ -2877,10 +2960,10 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"csstype@npm:^2.6.8":
-  version: 2.6.20
-  resolution: "csstype@npm:2.6.20"
-  checksum: cb5d5ded49c3390909e93b20b285d4a63d0ba5b10294bdfbc4cf911f80e91d6cf367ea671f99f09570762535c14ea7074a2c7fa73f02008203f01328dea8968b
+"csstype@npm:^3.1.3":
+  version: 3.1.3
+  resolution: "csstype@npm:3.1.3"
+  checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7
   languageName: node
   linkType: hard
 
@@ -2891,67 +2974,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"cypress-real-events@npm:1.7.1":
-  version: 1.7.1
-  resolution: "cypress-real-events@npm:1.7.1"
-  peerDependencies:
-    cypress: ^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x
-  checksum: b31c2facfa03e01e298926cd0925260b12474770fc1a3ce8998da21818db7e6d9fc2f9eb60d1771aa4ce3c29aca63d04da21e1a63e3bb117b1506a72ab0c3eb1
-  languageName: node
-  linkType: hard
-
-"cypress@npm:10.9.0":
-  version: 10.9.0
-  resolution: "cypress@npm:10.9.0"
-  dependencies:
-    "@cypress/request": ^2.88.10
-    "@cypress/xvfb": ^1.2.4
-    "@types/node": ^14.14.31
-    "@types/sinonjs__fake-timers": 8.1.1
-    "@types/sizzle": ^2.3.2
-    arch: ^2.2.0
-    blob-util: ^2.0.2
-    bluebird: ^3.7.2
-    buffer: ^5.6.0
-    cachedir: ^2.3.0
-    chalk: ^4.1.0
-    check-more-types: ^2.24.0
-    cli-cursor: ^3.1.0
-    cli-table3: ~0.6.1
-    commander: ^5.1.0
-    common-tags: ^1.8.0
-    dayjs: ^1.10.4
-    debug: ^4.3.2
-    enquirer: ^2.3.6
-    eventemitter2: 6.4.7
-    execa: 4.1.0
-    executable: ^4.1.1
-    extract-zip: 2.0.1
-    figures: ^3.2.0
-    fs-extra: ^9.1.0
-    getos: ^3.2.1
-    is-ci: ^3.0.0
-    is-installed-globally: ~0.4.0
-    lazy-ass: ^1.6.0
-    listr2: ^3.8.3
-    lodash: ^4.17.21
-    log-symbols: ^4.0.0
-    minimist: ^1.2.6
-    ospath: ^1.2.2
-    pretty-bytes: ^5.6.0
-    proxy-from-env: 1.0.0
-    request-progress: ^3.0.0
-    semver: ^7.3.2
-    supports-color: ^8.1.1
-    tmp: ~0.2.1
-    untildify: ^4.0.0
-    yauzl: ^2.10.0
-  bin:
-    cypress: bin/cypress
-  checksum: 79e3dccbb82d0b0c92bb8888682766a9738374f473cf2e9a04825a6b3dbe4420c57948cabaf757af0929192a8e61b7f08b32d7f6ee0c3cddf2736cf4f408edc1
-  languageName: node
-  linkType: hard
-
 "d3-array@npm:2 - 3, d3-array@npm:2.10.0 - 3, d3-array@npm:2.5.0 - 3, d3-array@npm:3":
   version: 3.1.6
   resolution: "d3-array@npm:3.1.6"
@@ -3241,9 +3263,9 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"d3@npm:7.6.1":
-  version: 7.6.1
-  resolution: "d3@npm:7.6.1"
+"d3@npm:7.9.0":
+  version: 7.9.0
+  resolution: "d3@npm:7.9.0"
   dependencies:
     d3-array: 3
     d3-axis: 3
@@ -3275,43 +3297,29 @@ browserlist@latest:
     d3-timer: 3
     d3-transition: 3
     d3-zoom: 3
-  checksum: af883cfeaf0a861afb2424edcb5419a5c56c84ddbc1ac9c7771c569f1926ace8db3cf0f4996038eb1db9700f7335e30c23b885199e0320a002893492ae83b415
-  languageName: node
-  linkType: hard
-
-"dashdash@npm:^1.12.0":
-  version: 1.14.1
-  resolution: "dashdash@npm:1.14.1"
-  dependencies:
-    assert-plus: ^1.0.0
-  checksum: 3634c249570f7f34e3d34f866c93f866c5b417f0dd616275decae08147dcdf8fccfaa5947380ccfb0473998ea3a8057c0b4cd90c875740ee685d0624b2983598
+  checksum: 1c0e9135f1fb78aa32b187fafc8b56ae6346102bd0e4e5e5a5339611a51e6038adbaa293fae373994228100eddd87320e930b1be922baeadc07c9fd43d26d99b
   languageName: node
   linkType: hard
 
-"date-fns-tz@npm:^1.3.3":
-  version: 1.3.3
-  resolution: "date-fns-tz@npm:1.3.3"
+"date-fns-tz@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "date-fns-tz@npm:2.0.0"
   peerDependencies:
     date-fns: ">=2.0.0"
-  checksum: 52111dffb44f9f419df00b325ed510b8d4723190cb47e2efaaf9704c2dc510f39d5f9c32263bff9599c5218f31a9c7775731bd8a9365d3ce6042059897110101
-  languageName: node
-  linkType: hard
-
-"date-fns@npm:^2.28.0":
-  version: 2.28.0
-  resolution: "date-fns@npm:2.28.0"
-  checksum: a0516b2e4f99b8bffc6cc5193349f185f195398385bdcaf07f17c2c4a24473c99d933eb0018be4142a86a6d46cb0b06be6440ad874f15e795acbedd6fd727a1f
+  checksum: a6553603a9d26dd9669326c99a58a2335ac550bc060c74b86a5ad9e1de73c9d4e3e5236f0f552f990e616e4e8dcc2b6a637913a04d2e04396e6a9f8ae83c73da
   languageName: node
   linkType: hard
 
-"dayjs@npm:^1.10.4":
-  version: 1.11.2
-  resolution: "dayjs@npm:1.11.2"
-  checksum: 78f8bd04a9e5f5554aa06eacda65a7d59e162d39f621a46fd34fb3b51367c3662426d86b4e2f4ac535f81e0c4d5af3e8a83b37e672412eb556267d726c61f8f3
+"date-fns@npm:^2.30.0":
+  version: 2.30.0
+  resolution: "date-fns@npm:2.30.0"
+  dependencies:
+    "@babel/runtime": ^7.21.0
+  checksum: f7be01523282e9bb06c0cd2693d34f245247a29098527d4420628966a2d9aad154bd0e90a6b1cf66d37adcb769cd108cf8a7bd49d76db0fb119af5cdd13644f4
   languageName: node
   linkType: hard
 
-"debug@npm:2.6.9, debug@npm:^2.6.9":
+"debug@npm:2.6.9":
   version: 2.6.9
   resolution: "debug@npm:2.6.9"
   dependencies:
@@ -3320,7 +3328,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -3332,7 +3340,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"debug@npm:^3.1.0, debug@npm:^3.2.7":
+"debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
   dependencies:
@@ -3348,14 +3356,25 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"deepmerge@npm:^4.2.0":
-  version: 4.2.2
-  resolution: "deepmerge@npm:4.2.2"
-  checksum: a8c43a1ed8d6d1ed2b5bf569fa4c8eb9f0924034baf75d5d406e47e157a451075c4db353efea7b6bcc56ec48116a8ce72fccf867b6e078e7c561904b5897530b
+"deepmerge@npm:4.3.1, deepmerge@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "deepmerge@npm:4.3.1"
+  checksum: 2024c6a980a1b7128084170c4cf56b0fd58a63f2da1660dcfe977415f27b17dbe5888668b59d0b063753f3220719d5e400b7f113609489c90160bb9a5518d052
+  languageName: node
+  linkType: hard
+
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "define-data-property@npm:1.1.1"
+  dependencies:
+    get-intrinsic: ^1.2.1
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.0
+  checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3":
+"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4":
   version: 1.1.4
   resolution: "define-properties@npm:1.1.4"
   dependencies:
@@ -3365,6 +3384,16 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"define-properties@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "define-properties@npm:1.2.0"
+  dependencies:
+    has-property-descriptors: ^1.0.0
+    object-keys: ^1.1.1
+  checksum: e60aee6a19b102df4e2b1f301816804e81ab48bb91f00d0d935f269bf4b3f79c88b39e4f89eaa132890d23267335fd1140dfcd8d5ccd61031a0a2c41a54e33a6
+  languageName: node
+  linkType: hard
+
 "delaunator@npm:5":
   version: 5.0.0
   resolution: "delaunator@npm:5.0.0"
@@ -3374,13 +3403,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"delayed-stream@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "delayed-stream@npm:1.0.0"
-  checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020
-  languageName: node
-  linkType: hard
-
 "delegates@npm:^1.0.0":
   version: 1.0.0
   resolution: "delegates@npm:1.0.0"
@@ -3418,19 +3440,10 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "diff-sequences@npm:27.5.1"
-  checksum: a00db5554c9da7da225db2d2638d85f8e41124eccbd56cbaefb3b276dcbb1c1c2ad851c32defe2055a54a4806f030656cbf6638105fd6ce97bb87b90b32a33ca
-  languageName: node
-  linkType: hard
-
-"dir-glob@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "dir-glob@npm:3.0.1"
-  dependencies:
-    path-type: ^4.0.0
-  checksum: fa05e18324510d7283f55862f3161c6759a3f2f8dbce491a2fc14c8324c498286c54282c1f0e933cb930da8419b30679389499b919122952a4f8592362ef4615
+"detect-libc@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "detect-libc@npm:2.0.2"
+  checksum: 2b2cd3649b83d576f4be7cc37eb3b1815c79969c8b1a03a40a4d55d83bc74d010753485753448eacb98784abf22f7dbd3911fd3b60e29fda28fed2d1a997944d
   languageName: node
   linkType: hard
 
@@ -3511,13 +3524,10 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"ecc-jsbn@npm:~0.1.1":
-  version: 0.1.2
-  resolution: "ecc-jsbn@npm:0.1.2"
-  dependencies:
-    jsbn: ~0.1.0
-    safer-buffer: ^2.1.0
-  checksum: 22fef4b6203e5f31d425f5b711eb389e4c6c2723402e389af394f8411b76a488fa414d309d866e2b577ce3e8462d344205545c88a8143cc21752a5172818888a
+"eastasianwidth@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "eastasianwidth@npm:0.2.0"
+  checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed
   languageName: node
   linkType: hard
 
@@ -3542,6 +3552,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"emoji-regex@npm:^9.2.2":
+  version: 9.2.2
+  resolution: "emoji-regex@npm:9.2.2"
+  checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601
+  languageName: node
+  linkType: hard
+
 "encodeurl@npm:~1.0.2":
   version: 1.0.2
   resolution: "encodeurl@npm:1.0.2"
@@ -3558,24 +3575,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"end-of-stream@npm:^1.1.0":
-  version: 1.4.4
-  resolution: "end-of-stream@npm:1.4.4"
-  dependencies:
-    once: ^1.4.0
-  checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b
-  languageName: node
-  linkType: hard
-
-"enquirer@npm:^2.3.6":
-  version: 2.3.6
-  resolution: "enquirer@npm:2.3.6"
-  dependencies:
-    ansi-colors: ^4.1.1
-  checksum: 1c0911e14a6f8d26721c91e01db06092a5f7675159f0261d69c403396a385afd13dd76825e7678f66daffa930cfaa8d45f506fb35f818a2788463d022af1b884
-  languageName: node
-  linkType: hard
-
 "entities@npm:^2.0.0":
   version: 2.2.0
   resolution: "entities@npm:2.2.0"
@@ -3590,6 +3589,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"entities@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -3600,275 +3606,171 @@ browserlist@latest:
 "err-code@npm:^2.0.2":
   version: 2.0.3
   resolution: "err-code@npm:2.0.3"
-  checksum: 8b7b1be20d2de12d2255c0bc2ca638b7af5171142693299416e6a9339bd7d88fc8d7707d913d78e0993176005405a236b066b45666b27b797252c771156ace54
-  languageName: node
-  linkType: hard
-
-"error-ex@npm:^1.3.1":
-  version: 1.3.2
-  resolution: "error-ex@npm:1.3.2"
-  dependencies:
-    is-arrayish: ^0.2.1
-  checksum: c1c2b8b65f9c91b0f9d75f0debaa7ec5b35c266c2cac5de412c1a6de86d4cbae04ae44e510378cb14d032d0645a36925d0186f8bb7367bcc629db256b743a001
-  languageName: node
-  linkType: hard
-
-"es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2":
-  version: 1.19.5
-  resolution: "es-abstract@npm:1.19.5"
-  dependencies:
-    call-bind: ^1.0.2
-    es-to-primitive: ^1.2.1
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.1.1
-    get-symbol-description: ^1.0.0
-    has: ^1.0.3
-    has-symbols: ^1.0.3
-    internal-slot: ^1.0.3
-    is-callable: ^1.2.4
-    is-negative-zero: ^2.0.2
-    is-regex: ^1.1.4
-    is-shared-array-buffer: ^1.0.2
-    is-string: ^1.0.7
-    is-weakref: ^1.0.2
-    object-inspect: ^1.12.0
-    object-keys: ^1.1.1
-    object.assign: ^4.1.2
-    string.prototype.trimend: ^1.0.4
-    string.prototype.trimstart: ^1.0.4
-    unbox-primitive: ^1.0.1
-  checksum: 55199b0f179a12b3b0ec9c9f2e3a27a7561686e4f88d46f9ef32c836448a336e367c14d8f792612fc83a64113896e478259e4dffbbcffb3efdd06650f6360324
-  languageName: node
-  linkType: hard
-
-"es-shim-unscopables@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-shim-unscopables@npm:1.0.0"
-  dependencies:
-    has: ^1.0.3
-  checksum: 83e95cadbb6ee44d3644dfad60dcad7929edbc42c85e66c3e99aefd68a3a5c5665f2686885cddb47dfeabfd77bd5ea5a7060f2092a955a729bbd8834f0d86fa1
-  languageName: node
-  linkType: hard
-
-"es-to-primitive@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "es-to-primitive@npm:1.2.1"
-  dependencies:
-    is-callable: ^1.1.4
-    is-date-object: ^1.0.1
-    is-symbol: ^1.0.2
-  checksum: 4ead6671a2c1402619bdd77f3503991232ca15e17e46222b0a41a5d81aebc8740a77822f5b3c965008e631153e9ef0580540007744521e72de8e33599fca2eed
-  languageName: node
-  linkType: hard
-
-"esbuild-android-64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-android-64@npm:0.14.38"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-android-arm64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-android-arm64@npm:0.14.38"
-  conditions: os=android & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-darwin-64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-darwin-64@npm:0.14.38"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-darwin-arm64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-darwin-arm64@npm:0.14.38"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-freebsd-64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-freebsd-64@npm:0.14.38"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-freebsd-arm64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-freebsd-arm64@npm:0.14.38"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-32@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-linux-32@npm:0.14.38"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-linux-64@npm:0.14.38"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-linux-arm64@npm:0.14.38"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-arm@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-linux-arm@npm:0.14.38"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-mips64le@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-linux-mips64le@npm:0.14.38"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-ppc64le@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-linux-ppc64le@npm:0.14.38"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-riscv64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-linux-riscv64@npm:0.14.38"
-  conditions: os=linux & cpu=riscv64
-  languageName: node
-  linkType: hard
-
-"esbuild-linux-s390x@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-linux-s390x@npm:0.14.38"
-  conditions: os=linux & cpu=s390x
-  languageName: node
-  linkType: hard
-
-"esbuild-netbsd-64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-netbsd-64@npm:0.14.38"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"esbuild-openbsd-64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-openbsd-64@npm:0.14.38"
-  conditions: os=openbsd & cpu=x64
+  checksum: 8b7b1be20d2de12d2255c0bc2ca638b7af5171142693299416e6a9339bd7d88fc8d7707d913d78e0993176005405a236b066b45666b27b797252c771156ace54
   languageName: node
   linkType: hard
 
-"esbuild-sunos-64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-sunos-64@npm:0.14.38"
-  conditions: os=sunos & cpu=x64
+"error-ex@npm:^1.3.1":
+  version: 1.3.2
+  resolution: "error-ex@npm:1.3.2"
+  dependencies:
+    is-arrayish: ^0.2.1
+  checksum: c1c2b8b65f9c91b0f9d75f0debaa7ec5b35c266c2cac5de412c1a6de86d4cbae04ae44e510378cb14d032d0645a36925d0186f8bb7367bcc629db256b743a001
   languageName: node
   linkType: hard
 
-"esbuild-windows-32@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-windows-32@npm:0.14.38"
-  conditions: os=win32 & cpu=ia32
+"es-abstract@npm:^1.22.1":
+  version: 1.22.3
+  resolution: "es-abstract@npm:1.22.3"
+  dependencies:
+    array-buffer-byte-length: ^1.0.0
+    arraybuffer.prototype.slice: ^1.0.2
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.5
+    es-set-tostringtag: ^2.0.1
+    es-to-primitive: ^1.2.1
+    function.prototype.name: ^1.1.6
+    get-intrinsic: ^1.2.2
+    get-symbol-description: ^1.0.0
+    globalthis: ^1.0.3
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.0
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+    hasown: ^2.0.0
+    internal-slot: ^1.0.5
+    is-array-buffer: ^3.0.2
+    is-callable: ^1.2.7
+    is-negative-zero: ^2.0.2
+    is-regex: ^1.1.4
+    is-shared-array-buffer: ^1.0.2
+    is-string: ^1.0.7
+    is-typed-array: ^1.1.12
+    is-weakref: ^1.0.2
+    object-inspect: ^1.13.1
+    object-keys: ^1.1.1
+    object.assign: ^4.1.4
+    regexp.prototype.flags: ^1.5.1
+    safe-array-concat: ^1.0.1
+    safe-regex-test: ^1.0.0
+    string.prototype.trim: ^1.2.8
+    string.prototype.trimend: ^1.0.7
+    string.prototype.trimstart: ^1.0.7
+    typed-array-buffer: ^1.0.0
+    typed-array-byte-length: ^1.0.0
+    typed-array-byte-offset: ^1.0.0
+    typed-array-length: ^1.0.4
+    unbox-primitive: ^1.0.2
+    which-typed-array: ^1.1.13
+  checksum: b1bdc962856836f6e72be10b58dc128282bdf33771c7a38ae90419d920fc3b36cc5d2b70a222ad8016e3fc322c367bf4e9e89fc2bc79b7e933c05b218e83d79a
+  languageName: node
+  linkType: hard
+
+"es-set-tostringtag@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "es-set-tostringtag@npm:2.0.1"
+  dependencies:
+    get-intrinsic: ^1.1.3
+    has: ^1.0.3
+    has-tostringtag: ^1.0.0
+  checksum: ec416a12948cefb4b2a5932e62093a7cf36ddc3efd58d6c58ca7ae7064475ace556434b869b0bbeb0c365f1032a8ccd577211101234b69837ad83ad204fff884
   languageName: node
   linkType: hard
 
-"esbuild-windows-64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-windows-64@npm:0.14.38"
-  conditions: os=win32 & cpu=x64
+"es-shim-unscopables@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-shim-unscopables@npm:1.0.0"
+  dependencies:
+    has: ^1.0.3
+  checksum: 83e95cadbb6ee44d3644dfad60dcad7929edbc42c85e66c3e99aefd68a3a5c5665f2686885cddb47dfeabfd77bd5ea5a7060f2092a955a729bbd8834f0d86fa1
   languageName: node
   linkType: hard
 
-"esbuild-windows-arm64@npm:0.14.38":
-  version: 0.14.38
-  resolution: "esbuild-windows-arm64@npm:0.14.38"
-  conditions: os=win32 & cpu=arm64
+"es-to-primitive@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "es-to-primitive@npm:1.2.1"
+  dependencies:
+    is-callable: ^1.1.4
+    is-date-object: ^1.0.1
+    is-symbol: ^1.0.2
+  checksum: 4ead6671a2c1402619bdd77f3503991232ca15e17e46222b0a41a5d81aebc8740a77822f5b3c965008e631153e9ef0580540007744521e72de8e33599fca2eed
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.14.27":
-  version: 0.14.38
-  resolution: "esbuild@npm:0.14.38"
-  dependencies:
-    esbuild-android-64: 0.14.38
-    esbuild-android-arm64: 0.14.38
-    esbuild-darwin-64: 0.14.38
-    esbuild-darwin-arm64: 0.14.38
-    esbuild-freebsd-64: 0.14.38
-    esbuild-freebsd-arm64: 0.14.38
-    esbuild-linux-32: 0.14.38
-    esbuild-linux-64: 0.14.38
-    esbuild-linux-arm: 0.14.38
-    esbuild-linux-arm64: 0.14.38
-    esbuild-linux-mips64le: 0.14.38
-    esbuild-linux-ppc64le: 0.14.38
-    esbuild-linux-riscv64: 0.14.38
-    esbuild-linux-s390x: 0.14.38
-    esbuild-netbsd-64: 0.14.38
-    esbuild-openbsd-64: 0.14.38
-    esbuild-sunos-64: 0.14.38
-    esbuild-windows-32: 0.14.38
-    esbuild-windows-64: 0.14.38
-    esbuild-windows-arm64: 0.14.38
+"esbuild@npm:^0.18.10":
+  version: 0.18.20
+  resolution: "esbuild@npm:0.18.20"
+  dependencies:
+    "@esbuild/android-arm": 0.18.20
+    "@esbuild/android-arm64": 0.18.20
+    "@esbuild/android-x64": 0.18.20
+    "@esbuild/darwin-arm64": 0.18.20
+    "@esbuild/darwin-x64": 0.18.20
+    "@esbuild/freebsd-arm64": 0.18.20
+    "@esbuild/freebsd-x64": 0.18.20
+    "@esbuild/linux-arm": 0.18.20
+    "@esbuild/linux-arm64": 0.18.20
+    "@esbuild/linux-ia32": 0.18.20
+    "@esbuild/linux-loong64": 0.18.20
+    "@esbuild/linux-mips64el": 0.18.20
+    "@esbuild/linux-ppc64": 0.18.20
+    "@esbuild/linux-riscv64": 0.18.20
+    "@esbuild/linux-s390x": 0.18.20
+    "@esbuild/linux-x64": 0.18.20
+    "@esbuild/netbsd-x64": 0.18.20
+    "@esbuild/openbsd-x64": 0.18.20
+    "@esbuild/sunos-x64": 0.18.20
+    "@esbuild/win32-arm64": 0.18.20
+    "@esbuild/win32-ia32": 0.18.20
+    "@esbuild/win32-x64": 0.18.20
   dependenciesMeta:
-    esbuild-android-64:
+    "@esbuild/android-arm":
       optional: true
-    esbuild-android-arm64:
+    "@esbuild/android-arm64":
       optional: true
-    esbuild-darwin-64:
+    "@esbuild/android-x64":
       optional: true
-    esbuild-darwin-arm64:
+    "@esbuild/darwin-arm64":
       optional: true
-    esbuild-freebsd-64:
+    "@esbuild/darwin-x64":
       optional: true
-    esbuild-freebsd-arm64:
+    "@esbuild/freebsd-arm64":
       optional: true
-    esbuild-linux-32:
+    "@esbuild/freebsd-x64":
       optional: true
-    esbuild-linux-64:
+    "@esbuild/linux-arm":
       optional: true
-    esbuild-linux-arm:
+    "@esbuild/linux-arm64":
       optional: true
-    esbuild-linux-arm64:
+    "@esbuild/linux-ia32":
       optional: true
-    esbuild-linux-mips64le:
+    "@esbuild/linux-loong64":
       optional: true
-    esbuild-linux-ppc64le:
+    "@esbuild/linux-mips64el":
       optional: true
-    esbuild-linux-riscv64:
+    "@esbuild/linux-ppc64":
       optional: true
-    esbuild-linux-s390x:
+    "@esbuild/linux-riscv64":
       optional: true
-    esbuild-netbsd-64:
+    "@esbuild/linux-s390x":
       optional: true
-    esbuild-openbsd-64:
+    "@esbuild/linux-x64":
       optional: true
-    esbuild-sunos-64:
+    "@esbuild/netbsd-x64":
       optional: true
-    esbuild-windows-32:
+    "@esbuild/openbsd-x64":
       optional: true
-    esbuild-windows-64:
+    "@esbuild/sunos-x64":
       optional: true
-    esbuild-windows-arm64:
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: d7523a36bd28016c010829c527386dbc0c6b9f514920abf5ac8003f346665161aa61026fd6822c5091fc1c1af52fe26c9281a81740fc06f2994cdbb7c2880297
+  checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b
   languageName: node
   linkType: hard
 
@@ -3900,46 +3802,71 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"eslint-config-standard@npm:17.0.0":
-  version: 17.0.0
-  resolution: "eslint-config-standard@npm:17.0.0"
+"eslint-compat-utils@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "eslint-compat-utils@npm:0.1.2"
+  peerDependencies:
+    eslint: ">=6.0.0"
+  checksum: 2315d9db81efb7f58808053bf32a1d5970b38e01cd8244f4f1b5aa05d883255c5c93fc184e9c29a0e7e2dcf16ff16330977302474d3fa870e41c5bed9c66f76b
+  languageName: node
+  linkType: hard
+
+"eslint-config-standard@npm:17.1.0":
+  version: 17.1.0
+  resolution: "eslint-config-standard@npm:17.1.0"
   peerDependencies:
     eslint: ^8.0.1
     eslint-plugin-import: ^2.25.2
-    eslint-plugin-n: ^15.0.0
+    eslint-plugin-n: "^15.0.0 || ^16.0.0 "
     eslint-plugin-promise: ^6.0.0
-  checksum: dc0ed51e186fd963ff2c0819d33ef580afce11b11036cbcf5e74427e26e514c2b1be96b8ffe74fd2fd00263554a0d49cc873fcf76f17c3dfdba614b45d7fd7da
+  checksum: 8ed14ffe424b8a7e67b85e44f75c46dc4c6954f7c474c871c56fb0daf40b6b2a7af2db55102b12a440158b2be898e1fb8333b05e3dbeaeaef066fdbc863eaa88
   languageName: node
   linkType: hard
 
-"eslint-import-resolver-node@npm:^0.3.6":
-  version: 0.3.6
-  resolution: "eslint-import-resolver-node@npm:0.3.6"
+"eslint-import-resolver-node@npm:^0.3.9":
+  version: 0.3.9
+  resolution: "eslint-import-resolver-node@npm:0.3.9"
   dependencies:
     debug: ^3.2.7
-    resolve: ^1.20.0
-  checksum: 6266733af1e112970e855a5bcc2d2058fb5ae16ad2a6d400705a86b29552b36131ffc5581b744c23d550de844206fb55e9193691619ee4dbf225c4bde526b1c8
+    is-core-module: ^2.13.0
+    resolve: ^1.22.4
+  checksum: 439b91271236b452d478d0522a44482e8c8540bf9df9bd744062ebb89ab45727a3acd03366a6ba2bdbcde8f9f718bab7fe8db64688aca75acf37e04eafd25e22
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.7.3":
-  version: 2.7.3
-  resolution: "eslint-module-utils@npm:2.7.3"
+"eslint-module-utils@npm:^2.8.0":
+  version: 2.8.0
+  resolution: "eslint-module-utils@npm:2.8.0"
   dependencies:
     debug: ^3.2.7
-    find-up: ^2.1.0
-  checksum: 77048263f309167a1e6a1e1b896bfb5ddd1d3859b2e2abbd9c32c432aee13d610d46e6820b1ca81b37fba437cf423a404bc6649be64ace9148a3062d1886a678
+  peerDependenciesMeta:
+    eslint:
+      optional: true
+  checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2
   languageName: node
   linkType: hard
 
-"eslint-plugin-cypress@npm:2.12.1":
-  version: 2.12.1
-  resolution: "eslint-plugin-cypress@npm:2.12.1"
+"eslint-plugin-cypress@npm:2.15.1":
+  version: 2.15.1
+  resolution: "eslint-plugin-cypress@npm:2.15.1"
   dependencies:
-    globals: ^11.12.0
+    globals: ^13.20.0
   peerDependencies:
     eslint: ">= 3.2.1"
-  checksum: 1f1c36e149304e9a6f58e2292a761abad58274da33b3a48b24ad55ad20cbce3ac7467321f2b6fcb052f9563c89f67004de4766eba2e2bdbcb010a6a0666989cf
+  checksum: 3e66fa9a943fff52eaf3758250a63c2a0f8ffd60c50572beaf3688b33a55fbf0060d18ef32bc26abb57aef070517db827c22fd3d607582861d464970f95e550e
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-es-x@npm:^7.5.0":
+  version: 7.5.0
+  resolution: "eslint-plugin-es-x@npm:7.5.0"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.1.2
+    "@eslint-community/regexpp": ^4.6.0
+    eslint-compat-utils: ^0.1.2
+  peerDependencies:
+    eslint: ">=8"
+  checksum: e770e57df78c3c38582de9bc4b9632ec5101a6dae8ac84f6ac219e8d8eb137f943db9730e037cfbc82f5d3ab6358e1b494fa6c628f425ebfc7e3094d5aa9d223
   languageName: node
   linkType: hard
 
@@ -3967,26 +3894,30 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:2.26.0":
-  version: 2.26.0
-  resolution: "eslint-plugin-import@npm:2.26.0"
+"eslint-plugin-import@npm:2.29.1":
+  version: 2.29.1
+  resolution: "eslint-plugin-import@npm:2.29.1"
   dependencies:
-    array-includes: ^3.1.4
-    array.prototype.flat: ^1.2.5
-    debug: ^2.6.9
+    array-includes: ^3.1.7
+    array.prototype.findlastindex: ^1.2.3
+    array.prototype.flat: ^1.3.2
+    array.prototype.flatmap: ^1.3.2
+    debug: ^3.2.7
     doctrine: ^2.1.0
-    eslint-import-resolver-node: ^0.3.6
-    eslint-module-utils: ^2.7.3
-    has: ^1.0.3
-    is-core-module: ^2.8.1
+    eslint-import-resolver-node: ^0.3.9
+    eslint-module-utils: ^2.8.0
+    hasown: ^2.0.0
+    is-core-module: ^2.13.1
     is-glob: ^4.0.3
     minimatch: ^3.1.2
-    object.values: ^1.1.5
-    resolve: ^1.22.0
-    tsconfig-paths: ^3.14.1
+    object.fromentries: ^2.0.7
+    object.groupby: ^1.0.1
+    object.values: ^1.1.7
+    semver: ^6.3.1
+    tsconfig-paths: ^3.15.0
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 0bf77ad80339554481eafa2b1967449e1f816b94c7a6f9614ce33fb4083c4e6c050f10d241dd50b4975d47922880a34de1e42ea9d8e6fd663ebb768baa67e655
+  checksum: e65159aef808136d26d029b71c8c6e4cb5c628e65e5de77f1eb4c13a379315ae55c9c3afa847f43f4ff9df7e54515c77ffc6489c6a6f81f7dd7359267577468c
   languageName: node
   linkType: hard
 
@@ -4008,21 +3939,24 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"eslint-plugin-n@npm:15.3.0":
-  version: 15.3.0
-  resolution: "eslint-plugin-n@npm:15.3.0"
+"eslint-plugin-n@npm:16.6.2":
+  version: 16.6.2
+  resolution: "eslint-plugin-n@npm:16.6.2"
   dependencies:
+    "@eslint-community/eslint-utils": ^4.4.0
     builtins: ^5.0.1
-    eslint-plugin-es: ^4.1.0
-    eslint-utils: ^3.0.0
-    ignore: ^5.1.1
-    is-core-module: ^2.10.0
+    eslint-plugin-es-x: ^7.5.0
+    get-tsconfig: ^4.7.0
+    globals: ^13.24.0
+    ignore: ^5.2.4
+    is-builtin-module: ^3.2.1
+    is-core-module: ^2.12.1
     minimatch: ^3.1.2
-    resolve: ^1.22.1
-    semver: ^7.3.7
+    resolve: ^1.22.2
+    semver: ^7.5.3
   peerDependencies:
     eslint: ">=7.0.0"
-  checksum: a5a4c778804a0d343ca904c917b8e583b4df28aaad593ea6d41893befac45d4f92ab38d895aac018ac757583697d38e99397d4deda783ec8ff650bb2041d23c8
+  checksum: 3b468da0038cf25af582608983491b33ac2d481b6a94a0ff2e715d3b85e1ff8cb93df4cd67b689d520bea1bfb8f2b717f01606bf6b2ea19fe8f9c0999ea7057d
   languageName: node
   linkType: hard
 
@@ -4042,29 +3976,30 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"eslint-plugin-promise@npm:6.0.1":
-  version: 6.0.1
-  resolution: "eslint-plugin-promise@npm:6.0.1"
+"eslint-plugin-promise@npm:6.1.1":
+  version: 6.1.1
+  resolution: "eslint-plugin-promise@npm:6.1.1"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: c1bb3c2e591787e97133dcaf764f908420a3a1959a3132e199db8f14d70dfa79fc9caf991ca60a4b60ae5f1f9823bc96c2e52304828a4278ef2f3964fe121de9
+  checksum: 46b9a4f79dae5539987922afc27cc17cbccdecf4f0ba19c0ccbf911b0e31853e9f39d9959eefb9637461b52772afa1a482f1f87ff16c1ba38bdb6fcf21897e9a
   languageName: node
   linkType: hard
 
-"eslint-plugin-vue@npm:9.5.1":
-  version: 9.5.1
-  resolution: "eslint-plugin-vue@npm:9.5.1"
+"eslint-plugin-vue@npm:9.24.0":
+  version: 9.24.0
+  resolution: "eslint-plugin-vue@npm:9.24.0"
   dependencies:
-    eslint-utils: ^3.0.0
+    "@eslint-community/eslint-utils": ^4.4.0
+    globals: ^13.24.0
     natural-compare: ^1.4.0
-    nth-check: ^2.0.1
-    postcss-selector-parser: ^6.0.9
-    semver: ^7.3.5
-    vue-eslint-parser: ^9.0.1
+    nth-check: ^2.1.1
+    postcss-selector-parser: ^6.0.15
+    semver: ^7.6.0
+    vue-eslint-parser: ^9.4.2
     xml-name-validator: ^4.0.0
   peerDependencies:
     eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
-  checksum: 36433328710c241bf363291859b6caf1c74dd18d75b1b1fe5bac9706e4d612e3dea79eef5acccf06b2df9d9b3faf9343c1b3e1d9edbf6465fd9752f3c0a87ee4
+  checksum: 2309b919d8fced6210c11e09107f443990063c0392843909cf50fad682e820c48bf5cc28b82a1239c03fd7ceeb4239e1baa653370c4c76689ec5fb8a970cd303
   languageName: node
   linkType: hard
 
@@ -4078,6 +4013,16 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"eslint-scope@npm:^7.2.2":
+  version: 7.2.2
+  resolution: "eslint-scope@npm:7.2.2"
+  dependencies:
+    esrecurse: ^4.3.0
+    estraverse: ^5.2.0
+  checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e
+  languageName: node
+  linkType: hard
+
 "eslint-utils@npm:^2.0.0":
   version: 2.1.0
   resolution: "eslint-utils@npm:2.1.0"
@@ -4119,56 +4064,69 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"eslint@npm:8.24.0":
-  version: 8.24.0
-  resolution: "eslint@npm:8.24.0"
+"eslint-visitor-keys@npm:^3.4.1":
+  version: 3.4.1
+  resolution: "eslint-visitor-keys@npm:3.4.1"
+  checksum: f05121d868202736b97de7d750847a328fcfa8593b031c95ea89425333db59676ac087fa905eba438d0a3c5769632f828187e0c1a0d271832a2153c1d3661c2c
+  languageName: node
+  linkType: hard
+
+"eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
+  languageName: node
+  linkType: hard
+
+"eslint@npm:8.57.0":
+  version: 8.57.0
+  resolution: "eslint@npm:8.57.0"
   dependencies:
-    "@eslint/eslintrc": ^1.3.2
-    "@humanwhocodes/config-array": ^0.10.5
-    "@humanwhocodes/gitignore-to-minimatch": ^1.0.2
+    "@eslint-community/eslint-utils": ^4.2.0
+    "@eslint-community/regexpp": ^4.6.1
+    "@eslint/eslintrc": ^2.1.4
+    "@eslint/js": 8.57.0
+    "@humanwhocodes/config-array": ^0.11.14
     "@humanwhocodes/module-importer": ^1.0.1
-    ajv: ^6.10.0
+    "@nodelib/fs.walk": ^1.2.8
+    "@ungap/structured-clone": ^1.2.0
+    ajv: ^6.12.4
     chalk: ^4.0.0
     cross-spawn: ^7.0.2
     debug: ^4.3.2
     doctrine: ^3.0.0
     escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.1.1
-    eslint-utils: ^3.0.0
-    eslint-visitor-keys: ^3.3.0
-    espree: ^9.4.0
-    esquery: ^1.4.0
+    eslint-scope: ^7.2.2
+    eslint-visitor-keys: ^3.4.3
+    espree: ^9.6.1
+    esquery: ^1.4.2
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
     file-entry-cache: ^6.0.1
     find-up: ^5.0.0
-    glob-parent: ^6.0.1
-    globals: ^13.15.0
-    globby: ^11.1.0
-    grapheme-splitter: ^1.0.4
+    glob-parent: ^6.0.2
+    globals: ^13.19.0
+    graphemer: ^1.4.0
     ignore: ^5.2.0
-    import-fresh: ^3.0.0
     imurmurhash: ^0.1.4
     is-glob: ^4.0.0
-    js-sdsl: ^4.1.4
+    is-path-inside: ^3.0.3
     js-yaml: ^4.1.0
     json-stable-stringify-without-jsonify: ^1.0.1
     levn: ^0.4.1
     lodash.merge: ^4.6.2
     minimatch: ^3.1.2
     natural-compare: ^1.4.0
-    optionator: ^0.9.1
-    regexpp: ^3.2.0
+    optionator: ^0.9.3
     strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: ca293ce7116599b742d7ab4d43db469beec22f40dd272092d809498be3cff3a7c567769f9763bdf6799aac13dd53447b93a99629b7b54092783046eb57eaced6
+  checksum: 3a48d7ff85ab420a8447e9810d8087aea5b1df9ef68c9151732b478de698389ee656fd895635b5f2871c89ee5a2652b3f343d11e9db6f8486880374ebc74a2d9
   languageName: node
   linkType: hard
 
-"espree@npm:^9.0.0, espree@npm:^9.3.1":
+"espree@npm:^9.3.1":
   version: 9.3.2
   resolution: "espree@npm:9.3.2"
   dependencies:
@@ -4179,14 +4137,14 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"espree@npm:^9.4.0":
-  version: 9.4.0
-  resolution: "espree@npm:9.4.0"
+"espree@npm:^9.6.0, espree@npm:^9.6.1":
+  version: 9.6.1
+  resolution: "espree@npm:9.6.1"
   dependencies:
-    acorn: ^8.8.0
+    acorn: ^8.9.0
     acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^3.3.0
-  checksum: 2e3020dde67892d2ba3632413b44d0dc31d92c29ce72267d7ec24216a562f0a6494d3696e2fa39a3ec8c0e0088d773947ab2925fbb716801a11eb8dd313ac89c
+    eslint-visitor-keys: ^3.4.1
+  checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9
   languageName: node
   linkType: hard
 
@@ -4199,6 +4157,15 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"esquery@npm:^1.4.2":
+  version: 1.5.0
+  resolution: "esquery@npm:1.5.0"
+  dependencies:
+    estraverse: ^5.1.0
+  checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900
+  languageName: node
+  linkType: hard
+
 "esrecurse@npm:^4.3.0":
   version: 4.3.0
   resolution: "esrecurse@npm:4.3.0"
@@ -4236,13 +4203,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"eventemitter2@npm:6.4.7":
-  version: 6.4.7
-  resolution: "eventemitter2@npm:6.4.7"
-  checksum: 1b36a77e139d6965ebf3a36c01fa00c089ae6b80faa1911e52888f40b3a7057b36a2cc45dcd1ad87cda3798fe7b97a0aabcbb8175a8b96092a23bb7d0f039e66
-  languageName: node
-  linkType: hard
-
 "evtd@npm:^0.2.2":
   version: 0.2.3
   resolution: "evtd@npm:0.2.3"
@@ -4257,63 +4217,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"execa@npm:4.1.0":
-  version: 4.1.0
-  resolution: "execa@npm:4.1.0"
-  dependencies:
-    cross-spawn: ^7.0.0
-    get-stream: ^5.0.0
-    human-signals: ^1.1.1
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^4.0.0
-    onetime: ^5.1.0
-    signal-exit: ^3.0.2
-    strip-final-newline: ^2.0.0
-  checksum: e30d298934d9c52f90f3847704fd8224e849a081ab2b517bbc02f5f7732c24e56a21f14cb96a08256deffeb2d12b2b7cb7e2b014a12fb36f8d3357e06417ed55
-  languageName: node
-  linkType: hard
-
-"executable@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "executable@npm:4.1.1"
-  dependencies:
-    pify: ^2.2.0
-  checksum: f01927ce59bccec804e171bf859a26e362c1f50aa9ebc69f7cafdcce3859d29d4b6267fd47237c18b0a1830614bd3f0ee14b7380d9bad18a4e7af9b5f0b6984f
-  languageName: node
-  linkType: hard
-
-"extend@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "extend@npm:3.0.2"
-  checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
-  languageName: node
-  linkType: hard
-
-"extract-zip@npm:2.0.1, extract-zip@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "extract-zip@npm:2.0.1"
-  dependencies:
-    "@types/yauzl": ^2.9.1
-    debug: ^4.1.1
-    get-stream: ^5.1.0
-    yauzl: ^2.10.0
-  dependenciesMeta:
-    "@types/yauzl":
-      optional: true
-  bin:
-    extract-zip: cli.js
-  checksum: 8cbda9debdd6d6980819cc69734d874ddd71051c9fe5bde1ef307ebcedfe949ba57b004894b585f758b7c9eeeea0e3d87f2dda89b7d25320459c2c9643ebb635
-  languageName: node
-  linkType: hard
-
-"extsprintf@npm:1.3.0, extsprintf@npm:^1.2.0":
-  version: 1.3.0
-  resolution: "extsprintf@npm:1.3.0"
-  checksum: cee7a4a1e34cffeeec18559109de92c27517e5641991ec6bab849aa64e3081022903dd53084f2080d0d2530803aa5ee84f1e9de642c365452f9e67be8f958ce2
-  languageName: node
-  linkType: hard
-
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
@@ -4321,19 +4224,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9":
-  version: 3.2.11
-  resolution: "fast-glob@npm:3.2.11"
-  dependencies:
-    "@nodelib/fs.stat": ^2.0.2
-    "@nodelib/fs.walk": ^1.2.3
-    glob-parent: ^5.1.2
-    merge2: ^1.3.0
-    micromatch: ^4.0.4
-  checksum: f473105324a7780a20c06de842e15ddbb41d3cb7e71d1e4fe6e8373204f22245d54f5ab9e2061e6a1c613047345954d29b022e0e76f5c28b1df9858179a0e6d7
-  languageName: node
-  linkType: hard
-
 "fast-json-stable-stringify@npm:^2.0.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
@@ -4357,24 +4247,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"fd-slicer@npm:~1.1.0":
-  version: 1.1.0
-  resolution: "fd-slicer@npm:1.1.0"
-  dependencies:
-    pend: ~1.2.0
-  checksum: c8585fd5713f4476eb8261150900d2cb7f6ff2d87f8feb306ccc8a1122efd152f1783bdb2b8dc891395744583436bfd8081d8e63ece0ec8687eeefea394d4ff2
-  languageName: node
-  linkType: hard
-
-"figures@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "figures@npm:3.2.0"
-  dependencies:
-    escape-string-regexp: ^1.0.5
-  checksum: 85a6ad29e9aca80b49b817e7c89ecc4716ff14e3779d9835af554db91bac41c0f289c418923519392a1e582b4d10482ad282021330cd045bb7b80c84152f2a2b
-  languageName: node
-  linkType: hard
-
 "file-entry-cache@npm:^6.0.1":
   version: 6.0.1
   resolution: "file-entry-cache@npm:6.0.1"
@@ -4400,15 +4272,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"find-up@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "find-up@npm:2.1.0"
-  dependencies:
-    locate-path: ^2.0.0
-  checksum: 43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd
-  languageName: node
-  linkType: hard
-
 "find-up@npm:^5.0.0":
   version: 5.0.0
   resolution: "find-up@npm:5.0.0"
@@ -4436,31 +4299,22 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"foreground-child@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "foreground-child@npm:2.0.0"
+"for-each@npm:^0.3.3":
+  version: 0.3.3
+  resolution: "for-each@npm:0.3.3"
   dependencies:
-    cross-spawn: ^7.0.0
-    signal-exit: ^3.0.2
-  checksum: f77ec9aff621abd6b754cb59e690743e7639328301fbea6ff09df27d2befaf7dd5b77cec51c32323d73a81a7d91caaf9413990d305cbe3d873eec4fe58960956
-  languageName: node
-  linkType: hard
-
-"forever-agent@npm:~0.6.1":
-  version: 0.6.1
-  resolution: "forever-agent@npm:0.6.1"
-  checksum: 766ae6e220f5fe23676bb4c6a99387cec5b7b62ceb99e10923376e27bfea72f3c3aeec2ba5f45f3f7ba65d6616965aa7c20b15002b6860833bb6e394dea546a8
+    is-callable: ^1.1.3
+  checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28
   languageName: node
   linkType: hard
 
-"form-data@npm:~2.3.2":
-  version: 2.3.3
-  resolution: "form-data@npm:2.3.3"
+"foreground-child@npm:^3.1.0, foreground-child@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "foreground-child@npm:3.1.1"
   dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.6
-    mime-types: ^2.1.12
-  checksum: 10c1780fa13dbe1ff3100114c2ce1f9307f8be10b14bf16e103815356ff567b6be39d70fc4a40f8990b9660012dc24b0f5e1dde1b6426166eb23a445ba068ca3
+    cross-spawn: ^7.0.0
+    signal-exit: ^4.0.1
+  checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5
   languageName: node
   linkType: hard
 
@@ -4471,18 +4325,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "fs-extra@npm:9.1.0"
-  dependencies:
-    at-least-node: ^1.0.0
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: ba71ba32e0faa74ab931b7a0031d1523c66a73e225de7426e275e238e312d07313d2da2d33e34a52aa406c8763ade5712eb3ec9ba4d9edce652bcacdc29e6b20
-  languageName: node
-  linkType: hard
-
 "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
@@ -4525,6 +4367,32 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"function-bind@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "function-bind@npm:1.1.2"
+  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
+  languageName: node
+  linkType: hard
+
+"function.prototype.name@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "function.prototype.name@npm:1.1.6"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    functions-have-names: ^1.2.3
+  checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479
+  languageName: node
+  linkType: hard
+
+"functions-have-names@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "functions-have-names@npm:1.2.3"
+  checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5
+  languageName: node
+  linkType: hard
+
 "gauge@npm:^4.0.3":
   version: 4.0.4
   resolution: "gauge@npm:4.0.4"
@@ -4548,7 +4416,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1":
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1":
   version: 1.1.1
   resolution: "get-intrinsic@npm:1.1.1"
   dependencies:
@@ -4559,19 +4427,45 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"get-port@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "get-port@npm:4.2.0"
-  checksum: 6c9a452b2d6e81fe36781a69ed201883d37c02f141ba5770eaef3eca768ca38777c2eba4bec303f6b8c3f45f29036f95d5606b255f613320a6b4b680e1975c07
+"get-intrinsic@npm:^1.1.3":
+  version: 1.2.0
+  resolution: "get-intrinsic@npm:1.2.0"
+  dependencies:
+    function-bind: ^1.1.1
+    has: ^1.0.3
+    has-symbols: ^1.0.3
+  checksum: 78fc0487b783f5c58cf2dccafc3ae656ee8d2d8062a8831ce4a95e7057af4587a1d4882246c033aca0a7b4965276f4802b45cc300338d1b77a73d3e3e3f4877d
   languageName: node
   linkType: hard
 
-"get-stream@npm:^5.0.0, get-stream@npm:^5.1.0":
-  version: 5.2.0
-  resolution: "get-stream@npm:5.2.0"
+"get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "get-intrinsic@npm:1.2.1"
+  dependencies:
+    function-bind: ^1.1.1
+    has: ^1.0.3
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
+  languageName: node
+  linkType: hard
+
+"get-intrinsic@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "get-intrinsic@npm:1.2.2"
   dependencies:
-    pump: ^3.0.0
-  checksum: 8bc1a23174a06b2b4ce600df38d6c98d2ef6d84e020c1ddad632ad75bac4e092eeb40e4c09e0761c35fc2dbc5e7fff5dab5e763a383582c4a167dd69a905bd12
+    function-bind: ^1.1.2
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+    hasown: ^2.0.0
+  checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417
+  languageName: node
+  linkType: hard
+
+"get-port@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "get-port@npm:4.2.0"
+  checksum: 6c9a452b2d6e81fe36781a69ed201883d37c02f141ba5770eaef3eca768ca38777c2eba4bec303f6b8c3f45f29036f95d5606b255f613320a6b4b680e1975c07
   languageName: node
   linkType: hard
 
@@ -4585,25 +4479,25 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"getos@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "getos@npm:3.2.1"
+"get-tsconfig@npm:^4.7.0":
+  version: 4.7.2
+  resolution: "get-tsconfig@npm:4.7.2"
   dependencies:
-    async: ^3.2.0
-  checksum: 42fd78a66d47cebd3e09de5566cc0044e034b08f4a000a310dbd89a77b02c65d8f4002554bfa495ea5bdc4fa9d515f5ac785a7cc474ba45383cc697f865eeaf1
+    resolve-pkg-maps: ^1.0.0
+  checksum: 172358903250eff0103943f816e8a4e51d29b8e5449058bdf7266714a908a48239f6884308bd3a6ff28b09f692b9533dbebfd183ab63e4e14f073cda91f1bca9
   languageName: node
   linkType: hard
 
-"getpass@npm:^0.1.1":
-  version: 0.1.7
-  resolution: "getpass@npm:0.1.7"
+"glob-parent@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "glob-parent@npm:6.0.2"
   dependencies:
-    assert-plus: ^1.0.0
-  checksum: ab18d55661db264e3eac6012c2d3daeafaab7a501c035ae0ccb193c3c23e9849c6e29b6ac762b9c2adae460266f925d55a3a2a3a3c8b94be2f222df94d70c046
+    is-glob: ^4.0.3
+  checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
   languageName: node
   linkType: hard
 
-"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
+"glob-parent@npm:~5.1.2":
   version: 5.1.2
   resolution: "glob-parent@npm:5.1.2"
   dependencies:
@@ -4612,12 +4506,18 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"glob-parent@npm:^6.0.1":
-  version: 6.0.2
-  resolution: "glob-parent@npm:6.0.2"
+"glob@npm:^10.0.0":
+  version: 10.2.4
+  resolution: "glob@npm:10.2.4"
   dependencies:
-    is-glob: ^4.0.3
-  checksum: c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8
+    foreground-child: ^3.1.0
+    jackspeak: ^2.0.3
+    minimatch: ^9.0.0
+    minipass: ^5.0.0 || ^6.0.0
+    path-scurry: ^1.7.0
+  bin:
+    glob: dist/cjs/src/bin.js
+  checksum: 29845faaa1a8bd2d1f2f26e0c4e5040898c7b4ccfb42e0a558319f6229d124dbc7ccf0ff214402505c5b62c1a39d9d2a1de9c582a74ad415591b96fa53cef466
   languageName: node
   linkType: hard
 
@@ -4635,7 +4535,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.0, glob@npm:^8.0.1":
+"glob@npm:^8.0.1":
   version: 8.0.3
   resolution: "glob@npm:8.0.3"
   dependencies:
@@ -4648,23 +4548,16 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"global-dirs@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "global-dirs@npm:3.0.0"
+"globals@npm:^13.19.0":
+  version: 13.19.0
+  resolution: "globals@npm:13.19.0"
   dependencies:
-    ini: 2.0.0
-  checksum: 953c17cf14bf6ee0e2100ae82a0d779934eed8a3ec5c94a7a4f37c5b3b592c31ea015fb9a15cf32484de13c79f4a814f3015152f3e1d65976cfbe47c1bfe4a88
-  languageName: node
-  linkType: hard
-
-"globals@npm:^11.12.0":
-  version: 11.12.0
-  resolution: "globals@npm:11.12.0"
-  checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e
+    type-fest: ^0.20.2
+  checksum: a000dbd00bcf28f0941d8a29c3522b1c3b8e4bfe4e60e262c477a550c3cbbe8dbe2925a6905f037acd40f9a93c039242e1f7079c76b0fd184bc41dcc3b5c8e2e
   languageName: node
   linkType: hard
 
-"globals@npm:^13.15.0, globals@npm:^13.2.0":
+"globals@npm:^13.2.0":
   version: 13.15.0
   resolution: "globals@npm:13.15.0"
   dependencies:
@@ -4673,31 +4566,53 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"globby@npm:^11.1.0":
-  version: 11.1.0
-  resolution: "globby@npm:11.1.0"
+"globals@npm:^13.20.0":
+  version: 13.21.0
+  resolution: "globals@npm:13.21.0"
   dependencies:
-    array-union: ^2.1.0
-    dir-glob: ^3.0.1
-    fast-glob: ^3.2.9
-    ignore: ^5.2.0
-    merge2: ^1.4.1
-    slash: ^3.0.0
-  checksum: b4be8885e0cfa018fc783792942d53926c35c50b3aefd3fdcfb9d22c627639dc26bd2327a40a0b74b074100ce95bb7187bfeae2f236856aa3de183af7a02aea6
+    type-fest: ^0.20.2
+  checksum: 86c92ca8a04efd864c10852cd9abb1ebe6d447dcc72936783e66eaba1087d7dba5c9c3421a48d6ca722c319378754dbcc3f3f732dbe47592d7de908edf58a773
+  languageName: node
+  linkType: hard
+
+"globals@npm:^13.24.0":
+  version: 13.24.0
+  resolution: "globals@npm:13.24.0"
+  dependencies:
+    type-fest: ^0.20.2
+  checksum: 56066ef058f6867c04ff203b8a44c15b038346a62efbc3060052a1016be9f56f4cf0b2cd45b74b22b81e521a889fc7786c73691b0549c2f3a6e825b3d394f43c
+  languageName: node
+  linkType: hard
+
+"globalthis@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "globalthis@npm:1.0.3"
+  dependencies:
+    define-properties: ^1.1.3
+  checksum: fbd7d760dc464c886d0196166d92e5ffb4c84d0730846d6621a39fbbc068aeeb9c8d1421ad330e94b7bca4bb4ea092f5f21f3d36077812af5d098b4dc006c998
+  languageName: node
+  linkType: hard
+
+"gopd@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "gopd@npm:1.0.1"
+  dependencies:
+    get-intrinsic: ^1.1.3
+  checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6
   languageName: node
   linkType: hard
 
-"graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.6":
+"graceful-fs@npm:^4.2.6":
   version: 4.2.10
   resolution: "graceful-fs@npm:4.2.10"
   checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
   languageName: node
   linkType: hard
 
-"grapheme-splitter@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "grapheme-splitter@npm:1.0.4"
-  checksum: 0c22ec54dee1b05cd480f78cf14f732cb5b108edc073572c4ec205df4cd63f30f8db8025afc5debc8835a8ddeacf648a1c7992fe3dcd6ad38f9a476d84906620
+"graphemer@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "graphemer@npm:1.4.0"
+  checksum: bab8f0be9b568857c7bec9fda95a89f87b783546d02951c40c33f84d05bb7da3fd10f863a9beb901463669b6583173a8c8cc6d6b306ea2b9b9d5d3d943c3a673
   languageName: node
   linkType: hard
 
@@ -4731,6 +4646,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"has-proto@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "has-proto@npm:1.0.1"
+  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
+  languageName: node
+  linkType: hard
+
 "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
@@ -4763,17 +4685,26 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"highcharts@npm:10.2.1":
-  version: 10.2.1
-  resolution: "highcharts@npm:10.2.1"
-  checksum: 86c63d6e88b9cd4809775970017bca45f671eb7e6102769f6508188dcd4a4fcb75b8bcdc7289f8ea5cc22fca61eaa8a73536f7caf32fc1d05c1bf771276f34ea
+"hasown@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "hasown@npm:2.0.0"
+  dependencies:
+    function-bind: ^1.1.2
+  checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176
+  languageName: node
+  linkType: hard
+
+"highcharts@npm:11.4.0":
+  version: 11.4.0
+  resolution: "highcharts@npm:11.4.0"
+  checksum: 873e6619148d346223f7a98e3d23c1d58975ef4143d67d57ef88898c967495519b76b47c1f546c48535362bf4542cbe4f9f3423cc4339db152454f86e7887ddf
   languageName: node
   linkType: hard
 
-"highlight.js@npm:^11.5.0":
-  version: 11.5.1
-  resolution: "highlight.js@npm:11.5.1"
-  checksum: bff556101d7691c6275ad19318e368fc971cd0621ef3d86222f5373df7d8191a2fc1ffd47f118138cbcf85e5fe91cfeefaecd6184f49a3ec18090955efc9edef
+"highlight.js@npm:^11.8.0":
+  version: 11.9.0
+  resolution: "highlight.js@npm:11.9.0"
+  checksum: 4043d31c5de9d27d13387d9a9e5e1939557254b7b85f0fab85d9cae0e420e131a3456ebf6148552020a1d8a216d671d583f2433d6c4de6179b8a66487a8325cb
   languageName: node
   linkType: hard
 
@@ -4784,27 +4715,26 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"html-validate@npm:7.5.0":
-  version: 7.5.0
-  resolution: "html-validate@npm:7.5.0"
+"html-validate@npm:8.18.1":
+  version: 8.18.1
+  resolution: "html-validate@npm:8.18.1"
   dependencies:
     "@babel/code-frame": ^7.10.0
-    "@html-validate/stylish": ^3.0.0
-    "@sidvind/better-ajv-errors": ^2.0.0
-    acorn-walk: ^8.0.0
+    "@html-validate/stylish": ^4.1.0
+    "@sidvind/better-ajv-errors": 2.1.3
     ajv: ^8.0.0
-    deepmerge: ^4.2.0
-    espree: ^9.0.0
-    glob: ^8.0.0
-    ignore: ^5.0.0
+    deepmerge: 4.3.1
+    glob: ^10.0.0
+    ignore: 5.3.1
     kleur: ^4.1.0
     minimist: ^1.2.0
     prompts: ^2.0.0
     semver: ^7.0.0
   peerDependencies:
-    jest: ^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3
-    jest-diff: ^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3
-    jest-snapshot: ^25.1 || ^26 || ^27.1 || ^28.1.3 || ^29.0.3
+    jest: ^27.1 || ^28.1.3 || ^29.0.3
+    jest-diff: ^27.1 || ^28.1.3 || ^29.0.3
+    jest-snapshot: ^27.1 || ^28.1.3 || ^29.0.3
+    vitest: ^0.34 || ^1
   peerDependenciesMeta:
     jest:
       optional: true
@@ -4812,9 +4742,11 @@ browserlist@latest:
       optional: true
     jest-snapshot:
       optional: true
+    vitest:
+      optional: true
   bin:
     html-validate: bin/html-validate.js
-  checksum: 04d73c5173e31358917d44d6bba3a256fdebc97f00aaca5d69966485b2a2743fa3de6a9042b54cbb402b4e6c7b4a626d622e9a83906702b89b684f2990e95a4d
+  checksum: 53479bf75bcb6ad748a6543583de6a26bfb55d85c0ae793bd6619c0079795f482c01b4168a7dea2584219f31b8a05c3ea2a0d5ebfd639099caf623263d3ac536
   languageName: node
   linkType: hard
 
@@ -4868,9 +4800,9 @@ browserlist@latest:
   linkType: hard
 
 "http-cache-semantics@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "http-cache-semantics@npm:4.1.0"
-  checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42
+  version: 4.1.1
+  resolution: "http-cache-semantics@npm:4.1.1"
+  checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
   languageName: node
   linkType: hard
 
@@ -4898,31 +4830,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"http-signature@npm:~1.3.6":
-  version: 1.3.6
-  resolution: "http-signature@npm:1.3.6"
-  dependencies:
-    assert-plus: ^1.0.0
-    jsprim: ^2.0.2
-    sshpk: ^1.14.1
-  checksum: 10be2af4764e71fee0281392937050201ee576ac755c543f570d6d87134ce5e858663fe999a7adb3e4e368e1e356d0d7fec6b9542295b875726ff615188e7a0c
-  languageName: node
-  linkType: hard
-
 "https-proxy-agent@npm:^5.0.0":
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
   dependencies:
     agent-base: 6
-    debug: 4
-  checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765
-  languageName: node
-  linkType: hard
-
-"human-signals@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "human-signals@npm:1.1.1"
-  checksum: d587647c9e8ec24e02821b6be7de5a0fc37f591f6c4e319b3054b43fd4c35a70a94c46fc74d8c1a43c47fde157d23acd7421f375e1c1365b09a16835b8300205
+    debug: 4
+  checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765
   languageName: node
   linkType: hard
 
@@ -4935,6 +4849,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"ical.js@npm:1.5.0":
+  version: 1.5.0
+  resolution: "ical.js@npm:1.5.0"
+  checksum: 51df7a01f462dc8a02b3c3c28acb288756071044c4a8b56ff5179995bb219e569e72cfedac6f4ab03dc643be34f5d88c09a7d79c4be6ba8a7623b7336eecb110
+  languageName: node
+  linkType: hard
+
 "iconv-lite@npm:0.6, iconv-lite@npm:^0.6.2":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
@@ -4944,28 +4865,24 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"ieee754@npm:^1.1.13":
-  version: 1.2.1
-  resolution: "ieee754@npm:1.2.1"
-  checksum: 5144c0c9815e54ada181d80a0b810221a253562422e7c6c3a60b1901154184f49326ec239d618c416c1c5945a2e197107aee8d986a3dd836b53dffefd99b5e7e
+"ignore@npm:5.3.1":
+  version: 5.3.1
+  resolution: "ignore@npm:5.3.1"
+  checksum: 71d7bb4c1dbe020f915fd881108cbe85a0db3d636a0ea3ba911393c53946711d13a9b1143c7e70db06d571a5822c0a324a6bcde5c9904e7ca5047f01f1bf8cd3
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.0.0, ignore@npm:^5.1.1, ignore@npm:^5.2.0":
+"ignore@npm:^5.1.1, ignore@npm:^5.2.0":
   version: 5.2.0
   resolution: "ignore@npm:5.2.0"
   checksum: 6b1f926792d614f64c6c83da3a1f9c83f6196c2839aa41e1e32dd7b8d174cef2e329d75caabb62cb61ce9dc432f75e67d07d122a037312db7caa73166a1bdb77
   languageName: node
   linkType: hard
 
-"image-size@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "image-size@npm:1.0.2"
-  dependencies:
-    queue: 6.0.2
-  bin:
-    image-size: bin/image-size.js
-  checksum: 01745fdb47f87cecf538e69c63f9adc5bfab30a345345c2de91105f3afbd1bfcfba1256af02bf3323077b33b0004469a837e077bf0cbb9c907e9c1e9e7547585
+"ignore@npm:^5.2.4":
+  version: 5.2.4
+  resolution: "ignore@npm:5.2.4"
+  checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
   languageName: node
   linkType: hard
 
@@ -4976,7 +4893,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1":
+"import-fresh@npm:^3.2.1":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
   dependencies:
@@ -5017,28 +4934,21 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3, inherits@npm:~2.0.3":
+"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
   languageName: node
   linkType: hard
 
-"ini@npm:2.0.0":
-  version: 2.0.0
-  resolution: "ini@npm:2.0.0"
-  checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e
-  languageName: node
-  linkType: hard
-
-"internal-slot@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "internal-slot@npm:1.0.3"
+"internal-slot@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "internal-slot@npm:1.0.5"
   dependencies:
-    get-intrinsic: ^1.1.0
+    get-intrinsic: ^1.2.0
     has: ^1.0.3
     side-channel: ^1.0.4
-  checksum: 1944f92e981e47aebc98a88ff0db579fd90543d937806104d0b96557b10c1f170c51fb777b97740a8b6ddeec585fca8c39ae99fd08a8e058dfc8ab70937238bf
+  checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a
   languageName: node
   linkType: hard
 
@@ -5056,6 +4966,28 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"is-array-buffer@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "is-array-buffer@npm:3.0.1"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.1.3
+    is-typed-array: ^1.1.10
+  checksum: f26ab87448e698285daf707e52a533920449f7abf63714140ffab9d5571aa5a71ac2fa2677e8b793ad0d5d3e40078d4d2c8a0ab39c957e3cfc6513bb6c9dfdc9
+  languageName: node
+  linkType: hard
+
+"is-array-buffer@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "is-array-buffer@npm:3.0.2"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.0
+    is-typed-array: ^1.1.10
+  checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14
+  languageName: node
+  linkType: hard
+
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
@@ -5091,30 +5023,53 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"is-callable@npm:^1.1.4, is-callable@npm:^1.2.4":
+"is-builtin-module@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "is-builtin-module@npm:3.2.1"
+  dependencies:
+    builtin-modules: ^3.3.0
+  checksum: e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88
+  languageName: node
+  linkType: hard
+
+"is-callable@npm:^1.1.3, is-callable@npm:^1.2.7":
+  version: 1.2.7
+  resolution: "is-callable@npm:1.2.7"
+  checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac
+  languageName: node
+  linkType: hard
+
+"is-callable@npm:^1.1.4":
   version: 1.2.4
   resolution: "is-callable@npm:1.2.4"
   checksum: 1a28d57dc435797dae04b173b65d6d1e77d4f16276e9eff973f994eadcfdc30a017e6a597f092752a083c1103cceb56c91e3dadc6692fedb9898dfaba701575f
   languageName: node
   linkType: hard
 
-"is-ci@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "is-ci@npm:3.0.1"
+"is-core-module@npm:^2.12.0, is-core-module@npm:^2.12.1":
+  version: 2.12.1
+  resolution: "is-core-module@npm:2.12.1"
   dependencies:
-    ci-info: ^3.2.0
-  bin:
-    is-ci: bin.js
-  checksum: 192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e
+    has: ^1.0.3
+  checksum: f04ea30533b5e62764e7b2e049d3157dc0abd95ef44275b32489ea2081176ac9746ffb1cdb107445cf1ff0e0dfcad522726ca27c27ece64dadf3795428b8e468
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.10.0, is-core-module@npm:^2.9.0":
-  version: 2.10.0
-  resolution: "is-core-module@npm:2.10.0"
+"is-core-module@npm:^2.13.0":
+  version: 2.13.0
+  resolution: "is-core-module@npm:2.13.0"
   dependencies:
     has: ^1.0.3
-  checksum: 0f3f77811f430af3256fa7bbc806f9639534b140f8ee69476f632c3e1eb4e28a38be0b9d1b8ecf596179c841b53576129279df95e7051d694dac4ceb6f967593
+  checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355
+  languageName: node
+  linkType: hard
+
+"is-core-module@npm:^2.13.1":
+  version: 2.13.1
+  resolution: "is-core-module@npm:2.13.1"
+  dependencies:
+    hasown: ^2.0.0
+  checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c
   languageName: node
   linkType: hard
 
@@ -5169,16 +5124,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"is-installed-globally@npm:~0.4.0":
-  version: 0.4.0
-  resolution: "is-installed-globally@npm:0.4.0"
-  dependencies:
-    global-dirs: ^3.0.0
-    is-path-inside: ^3.0.2
-  checksum: 3359840d5982d22e9b350034237b2cda2a12bac1b48a721912e1ab8e0631dd07d45a2797a120b7b87552759a65ba03e819f1bd63f2d7ab8657ec0b44ee0bf399
-  languageName: node
-  linkType: hard
-
 "is-json@npm:^2.0.1":
   version: 2.0.1
   resolution: "is-json@npm:2.0.1"
@@ -5216,7 +5161,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"is-path-inside@npm:^3.0.2":
+"is-path-inside@npm:^3.0.3":
   version: 3.0.3
   resolution: "is-path-inside@npm:3.0.3"
   checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9
@@ -5249,13 +5194,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"is-stream@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "is-stream@npm:2.0.1"
-  checksum: b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66
-  languageName: node
-  linkType: hard
-
 "is-string@npm:^1.0.5, is-string@npm:^1.0.7":
   version: 1.0.7
   resolution: "is-string@npm:1.0.7"
@@ -5274,17 +5212,25 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"is-typedarray@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "is-typedarray@npm:1.0.0"
-  checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7
+"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.9":
+  version: 1.1.10
+  resolution: "is-typed-array@npm:1.1.10"
+  dependencies:
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    gopd: ^1.0.1
+    has-tostringtag: ^1.0.0
+  checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017
   languageName: node
   linkType: hard
 
-"is-unicode-supported@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "is-unicode-supported@npm:0.1.0"
-  checksum: a2aab86ee7712f5c2f999180daaba5f361bdad1efadc9610ff5b8ab5495b86e4f627839d085c6530363c6d6d4ecbde340fb8e54bdb83da4ba8e0865ed5513c52
+"is-typed-array@npm:^1.1.12":
+  version: 1.1.12
+  resolution: "is-typed-array@npm:1.1.12"
+  dependencies:
+    which-typed-array: ^1.1.11
+  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
   languageName: node
   linkType: hard
 
@@ -5297,6 +5243,20 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"isarray@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "isarray@npm:2.0.5"
+  checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a
+  languageName: node
+  linkType: hard
+
+"isbinaryfile@npm:^4.0.2":
+  version: 4.0.10
+  resolution: "isbinaryfile@npm:4.0.10"
+  checksum: a6b28db7e23ac7a77d3707567cac81356ea18bd602a4f21f424f862a31d0e7ab4f250759c98a559ece35ffe4d99f0d339f1ab884ffa9795172f632ab8f88e686
+  languageName: node
+  linkType: hard
+
 "isexe@npm:^2.0.0":
   version: 2.0.0
   resolution: "isexe@npm:2.0.0"
@@ -5304,13 +5264,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"isstream@npm:~0.1.2":
-  version: 0.1.2
-  resolution: "isstream@npm:0.1.2"
-  checksum: 1eb2fe63a729f7bdd8a559ab552c69055f4f48eb5c2f03724430587c6f450783c8f1cd936c1c952d0a927925180fcc892ebd5b174236cf1065d4bd5bdb37e963
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
@@ -5329,90 +5282,60 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"istanbul-reports@npm:^3.1.4":
-  version: 3.1.4
-  resolution: "istanbul-reports@npm:3.1.4"
+"istanbul-lib-report@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "istanbul-lib-report@npm:3.0.1"
   dependencies:
-    html-escaper: ^2.0.0
-    istanbul-lib-report: ^3.0.0
-  checksum: 2132983355710c522f6b26808015cab9a0ee8b9f5ae0db0d3edeff40b886dd83cb670fb123cb7b32dbe59473d7c00cdde2ba6136bc0acdb20a865fccea64dfe1
+    istanbul-lib-coverage: ^3.0.0
+    make-dir: ^4.0.0
+    supports-color: ^7.1.0
+  checksum: fd17a1b879e7faf9bb1dc8f80b2a16e9f5b7b8498fe6ed580a618c34df0bfe53d2abd35bf8a0a00e628fb7405462576427c7df20bbe4148d19c14b431c974b21
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-diff@npm:27.5.1"
+"istanbul-reports@npm:^3.1.6":
+  version: 3.1.6
+  resolution: "istanbul-reports@npm:3.1.6"
   dependencies:
-    chalk: ^4.0.0
-    diff-sequences: ^27.5.1
-    jest-get-type: ^27.5.1
-    pretty-format: ^27.5.1
-  checksum: 8be27c1e1ee57b2bb2bef9c0b233c19621b4c43d53a3c26e2c00a4e805eb4ea11fe1694a06a9fb0e80ffdcfdc0d2b1cb0b85920b3f5c892327ecd1e7bd96b865
-  languageName: node
-  linkType: hard
-
-"jest-get-type@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "jest-get-type@npm:27.5.1"
-  checksum: 63064ab70195c21007d897c1157bf88ff94a790824a10f8c890392e7d17eda9c3900513cb291ca1c8d5722cad79169764e9a1279f7c8a9c4cd6e9109ff04bbc0
+    html-escaper: ^2.0.0
+    istanbul-lib-report: ^3.0.0
+  checksum: 44c4c0582f287f02341e9720997f9e82c071627e1e862895745d5f52ec72c9b9f38e1d12370015d2a71dcead794f34c7732aaef3fab80a24bc617a21c3d911d6
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^27.0.0":
-  version: 27.5.1
-  resolution: "jest-matcher-utils@npm:27.5.1"
+"jackspeak@npm:^2.0.3":
+  version: 2.2.0
+  resolution: "jackspeak@npm:2.2.0"
   dependencies:
-    chalk: ^4.0.0
-    jest-diff: ^27.5.1
-    jest-get-type: ^27.5.1
-    pretty-format: ^27.5.1
-  checksum: bb2135fc48889ff3fe73888f6cc7168ddab9de28b51b3148f820c89fdfd2effdcad005f18be67d0b9be80eda208ad47290f62f03d0a33f848db2dd0273c8217a
+    "@isaacs/cliui": ^8.0.2
+    "@pkgjs/parseargs": ^0.11.0
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: d8cd5be4f0e89cef04add5b0b068162a086bdb1ca68113ed729e99489b7865ca3edcc6430d6fd20c430e15382929ef5f3c7ec36e6aa7c17be23cac116f92dcff
   languageName: node
   linkType: hard
 
-"jquery-migrate@npm:3.4.0":
-  version: 3.4.0
-  resolution: "jquery-migrate@npm:3.4.0"
+"jquery-migrate@npm:3.4.1":
+  version: 3.4.1
+  resolution: "jquery-migrate@npm:3.4.1"
   peerDependencies:
     jquery: ">=3 <4"
-  checksum: 7431685c560d5ff6bc083f613dc4ea72905832b84cb9df4b28c4de71f41dc69c86ac135601a5fe41329773dde0739b4002456ba2249f646d2969afb98092fe4a
-  languageName: node
-  linkType: hard
-
-"jquery-ui-dist@npm:1.13.2":
-  version: 1.13.2
-  resolution: "jquery-ui-dist@npm:1.13.2"
-  dependencies:
-    jquery: ">=1.8.0 <4.0.0"
-  checksum: 4f3a3a2ff8ff659aaa48cfce11dc06bbd396676c175dd8429a0aaa327fc055855ab2159624d9493cb236b28a9c669b26d1de8215415ddcf068191add4740729d
-  languageName: node
-  linkType: hard
-
-"jquery@npm:3.6.1":
-  version: 3.6.1
-  resolution: "jquery@npm:3.6.1"
-  checksum: 6177d866a74f1137cad800f142c7cdbd5ab19cd4282546f8bdb4890c9f933b1d542ab96f2aa15d007e43c98de7315b0513e849ec5359d3ac5640f720892fe547
-  languageName: node
-  linkType: hard
-
-"jquery@npm:>=1.8.0 <4.0.0":
-  version: 3.6.0
-  resolution: "jquery@npm:3.6.0"
-  checksum: 8fd5fef4aa48fd374ec716dd1c1df1af407814a228e15c1260ca140de3a697c2a77c30c54ff1d238b6a3ab4ddc445ddeef9adce6c6d28e4869d85eb9d3951c0e
+  checksum: d2cb17d055672d4030788e0e1625aa27e33344fc2e5cb69d4f209ae3baedc6cf16142ad55d09c24fa0fe3aa64a7e1e803b6622bd7022e011293f2d294ce1e864
   languageName: node
   linkType: hard
 
-"js-cookie@npm:3.0.1":
-  version: 3.0.1
-  resolution: "js-cookie@npm:3.0.1"
-  checksum: bb48de67e2a6bd1ae3dfd6b2d5a167c33dd0c5a37e909206161eb0358c98f17cb55acd55827a58e9eea3630d89444e7479f7938ef4420dda443218b8c434a4c3
+"jquery@npm:3.7.1":
+  version: 3.7.1
+  resolution: "jquery@npm:3.7.1"
+  checksum: 4370b8139d6ae82867eb6f7f21d1edccf1d1bdf41c0840920ea80d366c2cd5dbe1ceebb110ee9772aa839b04400faa1572c5c560b507c688ed7b61cea26c0e27
   languageName: node
   linkType: hard
 
-"js-sdsl@npm:^4.1.4":
-  version: 4.1.5
-  resolution: "js-sdsl@npm:4.1.5"
-  checksum: 695f657ddc5be462b97cac4e8e60f37de28d628ee0e23016baecff0bb584a18dddb5caeac537a775030f180b5afd62133ac4481e7024c8d03a62d73e4da0713e
+"js-cookie@npm:3.0.5":
+  version: 3.0.5
+  resolution: "js-cookie@npm:3.0.5"
+  checksum: 2dbd2809c6180fbcf060c6957cb82dbb47edae0ead6bd71cbeedf448aa6b6923115003b995f7d3e3077bfe2cb76295ea6b584eb7196cca8ba0a09f389f64967a
   languageName: node
   linkType: hard
 
@@ -5441,13 +5364,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"jsbn@npm:~0.1.0":
-  version: 0.1.1
-  resolution: "jsbn@npm:0.1.1"
-  checksum: e5ff29c1b8d965017ef3f9c219dacd6e40ad355c664e277d31246c90545a02e6047018c16c60a00f36d561b3647215c41894f5d869ada6908a2e0ce4200c88f2
-  languageName: node
-  linkType: hard
-
 "json-parse-even-better-errors@npm:^2.3.0":
   version: 2.3.1
   resolution: "json-parse-even-better-errors@npm:2.3.1"
@@ -5469,13 +5385,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"json-schema@npm:0.4.0":
-  version: 0.4.0
-  resolution: "json-schema@npm:0.4.0"
-  checksum: 66389434c3469e698da0df2e7ac5a3281bcff75e797a5c127db7c5b56270e01ae13d9afa3c03344f76e32e81678337a8c912bdbb75101c62e487dc3778461d72
-  languageName: node
-  linkType: hard
-
 "json-stable-stringify-without-jsonify@npm:^1.0.1":
   version: 1.0.1
   resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
@@ -5483,21 +5392,14 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"json-stringify-safe@npm:~5.0.1":
-  version: 5.0.1
-  resolution: "json-stringify-safe@npm:5.0.1"
-  checksum: 48ec0adad5280b8a96bb93f4563aa1667fd7a36334f79149abd42446d0989f2ddc58274b479f4819f1f00617957e6344c886c55d05a4e15ebb4ab931e4a6a8ee
-  languageName: node
-  linkType: hard
-
-"json5@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json5@npm:1.0.1"
+"json5@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "json5@npm:1.0.2"
   dependencies:
     minimist: ^1.2.0
   bin:
     json5: lib/cli.js
-  checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3
+  checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7
   languageName: node
   linkType: hard
 
@@ -5510,31 +5412,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"jsonfile@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "jsonfile@npm:6.1.0"
-  dependencies:
-    graceful-fs: ^4.1.6
-    universalify: ^2.0.0
-  dependenciesMeta:
-    graceful-fs:
-      optional: true
-  checksum: 7af3b8e1ac8fe7f1eccc6263c6ca14e1966fcbc74b618d3c78a0a2075579487547b94f72b7a1114e844a1e15bb00d440e5d1720bfc4612d790a6f285d5ea8354
-  languageName: node
-  linkType: hard
-
-"jsprim@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "jsprim@npm:2.0.2"
-  dependencies:
-    assert-plus: 1.0.0
-    extsprintf: 1.3.0
-    json-schema: 0.4.0
-    verror: 1.10.0
-  checksum: d175f6b1991e160cb0aa39bc857da780e035611986b5492f32395411879fdaf4e513d98677f08f7352dac93a16b66b8361c674b86a3fa406e2e7af6b26321838
-  languageName: node
-  linkType: hard
-
 "jstransformer@npm:1.0.0":
   version: 1.0.0
   resolution: "jstransformer@npm:1.0.0"
@@ -5559,13 +5436,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"lazy-ass@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "lazy-ass@npm:1.6.0"
-  checksum: 5a3ebb17915b03452320804466345382a6c25ac782ec4874fecdb2385793896cd459be2f187dc7def8899180c32ee0ab9a1aa7fe52193ac3ff3fe29bb0591729
-  languageName: node
-  linkType: hard
-
 "levn@npm:^0.4.1":
   version: 0.4.1
   resolution: "levn@npm:0.4.1"
@@ -5576,6 +5446,96 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"lightningcss-darwin-arm64@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss-darwin-arm64@npm:1.17.1"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"lightningcss-darwin-x64@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss-darwin-x64@npm:1.17.1"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"lightningcss-linux-arm-gnueabihf@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss-linux-arm-gnueabihf@npm:1.17.1"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"lightningcss-linux-arm64-gnu@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss-linux-arm64-gnu@npm:1.17.1"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"lightningcss-linux-arm64-musl@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss-linux-arm64-musl@npm:1.17.1"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"lightningcss-linux-x64-gnu@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss-linux-x64-gnu@npm:1.17.1"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"lightningcss-linux-x64-musl@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss-linux-x64-musl@npm:1.17.1"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"lightningcss-win32-x64-msvc@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss-win32-x64-msvc@npm:1.17.1"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"lightningcss@npm:1.17.1":
+  version: 1.17.1
+  resolution: "lightningcss@npm:1.17.1"
+  dependencies:
+    detect-libc: ^1.0.3
+    lightningcss-darwin-arm64: 1.17.1
+    lightningcss-darwin-x64: 1.17.1
+    lightningcss-linux-arm-gnueabihf: 1.17.1
+    lightningcss-linux-arm64-gnu: 1.17.1
+    lightningcss-linux-arm64-musl: 1.17.1
+    lightningcss-linux-x64-gnu: 1.17.1
+    lightningcss-linux-x64-musl: 1.17.1
+    lightningcss-win32-x64-msvc: 1.17.1
+  dependenciesMeta:
+    lightningcss-darwin-arm64:
+      optional: true
+    lightningcss-darwin-x64:
+      optional: true
+    lightningcss-linux-arm-gnueabihf:
+      optional: true
+    lightningcss-linux-arm64-gnu:
+      optional: true
+    lightningcss-linux-arm64-musl:
+      optional: true
+    lightningcss-linux-x64-gnu:
+      optional: true
+    lightningcss-linux-x64-musl:
+      optional: true
+    lightningcss-win32-x64-msvc:
+      optional: true
+  checksum: 0bf9d5c9321db457dd25c47281b7a8af36377ede05a45daa894f1f9070fe70b9db1325646aa2a574f0212e5f961f0f57b0419847141a4f49321bca72169aef16
+  languageName: node
+  linkType: hard
+
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
@@ -5592,27 +5552,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"listr2@npm:^3.8.3":
-  version: 3.14.0
-  resolution: "listr2@npm:3.14.0"
-  dependencies:
-    cli-truncate: ^2.1.0
-    colorette: ^2.0.16
-    log-update: ^4.0.0
-    p-map: ^4.0.0
-    rfdc: ^1.3.0
-    rxjs: ^7.5.1
-    through: ^2.3.8
-    wrap-ansi: ^7.0.0
-  peerDependencies:
-    enquirer: ">= 2.3.0 < 3"
-  peerDependenciesMeta:
-    enquirer:
-      optional: true
-  checksum: fdb8b2d6bdf5df9371ebd5082bee46c6d0ca3d1e5f2b11fbb5a127839855d5f3da9d4968fce94f0a5ec67cac2459766abbb1faeef621065ebb1829b11ef9476d
-  languageName: node
-  linkType: hard
-
 "lmdb@npm:2.5.2":
   version: 2.5.2
   resolution: "lmdb@npm:2.5.2"
@@ -5646,13 +5585,38 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"locate-path@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "locate-path@npm:2.0.0"
+"lmdb@npm:2.8.5":
+  version: 2.8.5
+  resolution: "lmdb@npm:2.8.5"
   dependencies:
-    p-locate: ^2.0.0
-    path-exists: ^3.0.0
-  checksum: 02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755
+    "@lmdb/lmdb-darwin-arm64": 2.8.5
+    "@lmdb/lmdb-darwin-x64": 2.8.5
+    "@lmdb/lmdb-linux-arm": 2.8.5
+    "@lmdb/lmdb-linux-arm64": 2.8.5
+    "@lmdb/lmdb-linux-x64": 2.8.5
+    "@lmdb/lmdb-win32-x64": 2.8.5
+    msgpackr: ^1.9.5
+    node-addon-api: ^6.1.0
+    node-gyp: latest
+    node-gyp-build-optional-packages: 5.1.1
+    ordered-binary: ^1.4.1
+    weak-lru-cache: ^1.2.2
+  dependenciesMeta:
+    "@lmdb/lmdb-darwin-arm64":
+      optional: true
+    "@lmdb/lmdb-darwin-x64":
+      optional: true
+    "@lmdb/lmdb-linux-arm":
+      optional: true
+    "@lmdb/lmdb-linux-arm64":
+      optional: true
+    "@lmdb/lmdb-linux-x64":
+      optional: true
+    "@lmdb/lmdb-win32-x64":
+      optional: true
+  bin:
+    download-lmdb-prebuilds: bin/download-prebuilds.js
+  checksum: b1ec76650d3b19d4c966cd7a4ee2324270c7d20f46b569d23bc287c7c7e7da667d3d330aa78be1aa2717af63b3531cd1d53a5ee4faf1c293c038513e4f3aa832
   languageName: node
   linkType: hard
 
@@ -5679,20 +5643,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"lodash.once@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "lodash.once@npm:4.1.1"
-  checksum: d768fa9f9b4e1dc6453be99b753906f58990e0c45e7b2ca5a3b40a33111e5d17f6edf2f768786e2716af90a8e78f8f91431ab8435f761fef00f9b0c256f6d245
-  languageName: node
-  linkType: hard
-
-"lodash.sortby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.sortby@npm:4.7.0"
-  checksum: db170c9396d29d11fe9a9f25668c4993e0c1331bcb941ddbd48fb76f492e732add7f2a47cfdf8e9d740fa59ac41bbfaf931d268bc72aab3ab49e9f89354d718c
-  languageName: node
-  linkType: hard
-
 "lodash@npm:4.17.21, lodash@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
@@ -5700,28 +5650,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"log-symbols@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "log-symbols@npm:4.1.0"
-  dependencies:
-    chalk: ^4.1.0
-    is-unicode-supported: ^0.1.0
-  checksum: fce1497b3135a0198803f9f07464165e9eb83ed02ceb2273930a6f8a508951178d8cf4f0378e9d28300a2ed2bc49050995d2bd5f53ab716bb15ac84d58c6ef74
-  languageName: node
-  linkType: hard
-
-"log-update@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "log-update@npm:4.0.0"
-  dependencies:
-    ansi-escapes: ^4.3.0
-    cli-cursor: ^3.1.0
-    slice-ansi: ^4.0.0
-    wrap-ansi: ^6.2.0
-  checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2
-  languageName: node
-  linkType: hard
-
 "lru-cache@npm:^6.0.0":
   version: 6.0.0
   resolution: "lru-cache@npm:6.0.0"
@@ -5738,19 +5666,26 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"luxon@npm:3.0.4":
-  version: 3.0.4
-  resolution: "luxon@npm:3.0.4"
-  checksum: d0908c3951da2a10ccf23040210ead23b0da5366a9d0954e7d5db3560189a7bd703d8af1e00084f197effc9cd7158d1bddf32886d98a70d59ce9bc3fe88bbce0
+"lru-cache@npm:^9.1.1":
+  version: 9.1.1
+  resolution: "lru-cache@npm:9.1.1"
+  checksum: 4d703bb9b66216bbee55ead82a9682820a2b6acbdfca491b235390b1ef1056000a032d56dfb373fdf9ad4492f1fa9d04cc9a05a77f25bd7ce6901d21ad9b68b7
+  languageName: node
+  linkType: hard
+
+"luxon@npm:3.4.4":
+  version: 3.4.4
+  resolution: "luxon@npm:3.4.4"
+  checksum: 36c1f99c4796ee4bfddf7dc94fa87815add43ebc44c8934c924946260a58512f0fd2743a629302885df7f35ccbd2d13f178c15df046d0e3b6eb71db178f1c60c
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.25.7":
-  version: 0.25.9
-  resolution: "magic-string@npm:0.25.9"
+"magic-string@npm:^0.30.7":
+  version: 0.30.7
+  resolution: "magic-string@npm:0.30.7"
   dependencies:
-    sourcemap-codec: ^1.4.8
-  checksum: 9a0e55a15c7303fc360f9572a71cffba1f61451bc92c5602b1206c9d17f492403bf96f946dfce7483e66822d6b74607262e24392e87b0ac27b786e69a40e9b1a
+    "@jridgewell/sourcemap-codec": ^1.4.15
+  checksum: bdf102e36a44d1728ec61b69d655caba3f66ca58898e292f6debe57dc30896bd37908bfe3464a7464a435831a9e44aa905cebd681e21c2f44bbe4dddf225619f
   languageName: node
   linkType: hard
 
@@ -5763,6 +5698,15 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"make-dir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "make-dir@npm:4.0.0"
+  dependencies:
+    semver: ^7.5.3
+  checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a
+  languageName: node
+  linkType: hard
+
 "make-fetch-happen@npm:^10.0.3":
   version: 10.1.5
   resolution: "make-fetch-happen@npm:10.1.5"
@@ -5794,46 +5738,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"merge-stream@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "merge-stream@npm:2.0.0"
-  checksum: 6fa4dcc8d86629705cea944a4b88ef4cb0e07656ebf223fa287443256414283dd25d91c1cd84c77987f2aec5927af1a9db6085757cb43d90eb170ebf4b47f4f4
-  languageName: node
-  linkType: hard
-
-"merge2@npm:^1.3.0, merge2@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "merge2@npm:1.4.1"
-  checksum: 7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2
-  languageName: node
-  linkType: hard
-
-"micromatch@npm:^4.0.4":
-  version: 4.0.5
-  resolution: "micromatch@npm:4.0.5"
-  dependencies:
-    braces: ^3.0.2
-    picomatch: ^2.3.1
-  checksum: 02a17b671c06e8fefeeb6ef996119c1e597c942e632a21ef589154f23898c9c6a9858526246abb14f8bca6e77734aa9dcf65476fca47cedfb80d9577d52843fc
-  languageName: node
-  linkType: hard
-
-"mime-db@npm:1.52.0":
-  version: 1.52.0
-  resolution: "mime-db@npm:1.52.0"
-  checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f
-  languageName: node
-  linkType: hard
-
-"mime-types@npm:^2.1.12, mime-types@npm:^2.1.34, mime-types@npm:~2.1.19":
-  version: 2.1.35
-  resolution: "mime-types@npm:2.1.35"
-  dependencies:
-    mime-db: 1.52.0
-  checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836
-  languageName: node
-  linkType: hard
-
 "mime@npm:1.6.0":
   version: 1.6.0
   resolution: "mime@npm:1.6.0"
@@ -5843,14 +5747,16 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"mimic-fn@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "mimic-fn@npm:2.1.0"
-  checksum: d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
+"mime@npm:^2.4.4":
+  version: 2.6.0
+  resolution: "mime@npm:2.6.0"
+  bin:
+    mime: cli.js
+  checksum: 1497ba7b9f6960694268a557eae24b743fd2923da46ec392b042469f4b901721ba0adcf8b0d3c2677839d0e243b209d76e5edcbd09cfdeffa2dfb6bb4df4b862
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
+"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
   dependencies:
@@ -5864,7 +5770,16 @@ browserlist@latest:
   resolution: "minimatch@npm:5.1.0"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: 15ce53d31a06361e8b7a629501b5c75491bc2b59712d53e802b1987121d91b433d73fcc5be92974fde66b2b51d8fb28d75a9ae900d249feb792bb1ba2a4f0a90
+  checksum: 15ce53d31a06361e8b7a629501b5c75491bc2b59712d53e802b1987121d91b433d73fcc5be92974fde66b2b51d8fb28d75a9ae900d249feb792bb1ba2a4f0a90
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "minimatch@npm:9.0.0"
+  dependencies:
+    brace-expansion: ^2.0.1
+  checksum: 7bd57899edd1d1b0560f50b5b2d1ea4ad2a366c5a2c8e0a943372cf2f200b64c256bae45a87a80915adbce27fa36526264296ace0da57b600481fe5ea3e372e5
   languageName: node
   linkType: hard
 
@@ -5935,6 +5850,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"minipass@npm:^5.0.0 || ^6.0.0":
+  version: 6.0.1
+  resolution: "minipass@npm:6.0.1"
+  checksum: 1df70bb5653251ad7bb0c979e07c18bbc64af1a92472a1d598f4311646da0c192d6ad92850cdfb9f0cd3ada8a9da369dd361c9f2e38a9f64b6a368ae2ac27fac
+  languageName: node
+  linkType: hard
+
 "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
   version: 2.1.2
   resolution: "minizlib@npm:2.1.2"
@@ -5954,26 +5876,26 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"moment-timezone@npm:0.5.37":
-  version: 0.5.37
-  resolution: "moment-timezone@npm:0.5.37"
+"moment-timezone@npm:0.5.45":
+  version: 0.5.45
+  resolution: "moment-timezone@npm:0.5.45"
   dependencies:
-    moment: ">= 2.9.0"
-  checksum: b3fc24848a396ee3801331a4b5511591df0e22241e59f55200a475603f23a8429f01887294c7a0c005dae25b8e4bef20472fbc875ff20080f26fded066559f1a
+    moment: ^2.29.4
+  checksum: a22e9f983fbe1a01757ce30685bce92e3f6efa692eb682afd47b82da3ff960b3c8c2c3883ec6715c124bc985a342b57cba1f6ba25a1c8b4c7ad766db3cd5e1d0
   languageName: node
   linkType: hard
 
-"moment@npm:2.29.4":
-  version: 2.29.4
-  resolution: "moment@npm:2.29.4"
-  checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e
+"moment@npm:2.30.1":
+  version: 2.30.1
+  resolution: "moment@npm:2.30.1"
+  checksum: 859236bab1e88c3e5802afcf797fc801acdbd0ee509d34ea3df6eea21eb6bcc2abd4ae4e4e64aa7c986aa6cba563c6e62806218e6412a765010712e5fa121ba6
   languageName: node
   linkType: hard
 
-"moment@npm:>= 2.9.0":
-  version: 2.29.3
-  resolution: "moment@npm:2.29.3"
-  checksum: 2e780e36d9a1823c08a1b6313cbb08bd01ecbb2a9062095820a34f42c878991ccba53abaa6abb103fd5c01e763724f295162a8c50b7e95b4f1c992ef0772d3f0
+"moment@npm:^2.29.4":
+  version: 2.29.4
+  resolution: "moment@npm:2.29.4"
+  checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e
   languageName: node
   linkType: hard
 
@@ -6027,6 +5949,37 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"msgpackr-extract@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "msgpackr-extract@npm:3.0.2"
+  dependencies:
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64": 3.0.2
+    "@msgpackr-extract/msgpackr-extract-darwin-x64": 3.0.2
+    "@msgpackr-extract/msgpackr-extract-linux-arm": 3.0.2
+    "@msgpackr-extract/msgpackr-extract-linux-arm64": 3.0.2
+    "@msgpackr-extract/msgpackr-extract-linux-x64": 3.0.2
+    "@msgpackr-extract/msgpackr-extract-win32-x64": 3.0.2
+    node-gyp: latest
+    node-gyp-build-optional-packages: 5.0.7
+  dependenciesMeta:
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64":
+      optional: true
+    "@msgpackr-extract/msgpackr-extract-darwin-x64":
+      optional: true
+    "@msgpackr-extract/msgpackr-extract-linux-arm":
+      optional: true
+    "@msgpackr-extract/msgpackr-extract-linux-arm64":
+      optional: true
+    "@msgpackr-extract/msgpackr-extract-linux-x64":
+      optional: true
+    "@msgpackr-extract/msgpackr-extract-win32-x64":
+      optional: true
+  bin:
+    download-msgpackr-prebuilds: bin/download-prebuilds.js
+  checksum: 5adb809b965bac41c310e60373d54c955fe78e4d134ab036d0f9ee5b322cec0a739878d395e17c1ac82d840705896b2dafae6a8cc04ad34c14d2de4b06b58330
+  languageName: node
+  linkType: hard
+
 "msgpackr@npm:^1.5.4":
   version: 1.6.0
   resolution: "msgpackr@npm:1.6.0"
@@ -6039,6 +5992,37 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"msgpackr@npm:^1.9.5":
+  version: 1.9.9
+  resolution: "msgpackr@npm:1.9.9"
+  dependencies:
+    msgpackr-extract: ^3.0.2
+  dependenciesMeta:
+    msgpackr-extract:
+      optional: true
+  checksum: b63182d99f479d79f0d082fd2688ce7cf699b1aee71e20f28591c30b48743bb57868fdd72656759a892891072d186d864702c756434520709e8fe7e0d350a119
+  languageName: node
+  linkType: hard
+
+"msgpackr@npm:^1.9.9":
+  version: 1.10.1
+  resolution: "msgpackr@npm:1.10.1"
+  dependencies:
+    msgpackr-extract: ^3.0.2
+  dependenciesMeta:
+    msgpackr-extract:
+      optional: true
+  checksum: e422d18b01051598b23701eebeb4b9e2c686b9c7826b20f564724837ba2b5cd4af74c91a549eaeaf8186645cc95e8196274a4a19442aa3286ac611b98069c194
+  languageName: node
+  linkType: hard
+
+"muggle-string@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "muggle-string@npm:0.4.1"
+  checksum: 85fe1766d18d43cf22b6da7d047203a65b2e2b1ccfac505b699c2a459644f95ebb3c854a96db5be559eea0e213f6ee32b986b8c2f73c48e6c89e1fd829616532
+  languageName: node
+  linkType: hard
+
 "murmurhash-js@npm:1.0.0":
   version: 1.0.0
   resolution: "murmurhash-js@npm:1.0.0"
@@ -6046,48 +6030,41 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"naive-ui@npm:2.33.3":
-  version: 2.33.3
-  resolution: "naive-ui@npm:2.33.3"
+"naive-ui@npm:2.38.1":
+  version: 2.38.1
+  resolution: "naive-ui@npm:2.38.1"
   dependencies:
-    "@css-render/plugin-bem": ^0.15.10
-    "@css-render/vue3-ssr": ^0.15.10
-    "@types/lodash": ^4.14.181
-    "@types/lodash-es": ^4.17.6
-    async-validator: ^4.0.7
-    css-render: ^0.15.10
-    date-fns: ^2.28.0
-    date-fns-tz: ^1.3.3
+    "@css-render/plugin-bem": ^0.15.12
+    "@css-render/vue3-ssr": ^0.15.12
+    "@types/katex": ^0.16.2
+    "@types/lodash": ^4.14.198
+    "@types/lodash-es": ^4.17.9
+    async-validator: ^4.2.5
+    css-render: ^0.15.12
+    csstype: ^3.1.3
+    date-fns: ^2.30.0
+    date-fns-tz: ^2.0.0
     evtd: ^0.2.4
-    highlight.js: ^11.5.0
+    highlight.js: ^11.8.0
     lodash: ^4.17.21
     lodash-es: ^4.17.21
-    seemly: ^0.3.6
+    seemly: ^0.3.8
     treemate: ^0.3.11
     vdirs: ^0.1.8
     vooks: ^0.2.12
-    vueuc: ^0.4.47
+    vueuc: ^0.4.58
   peerDependencies:
     vue: ^3.0.0
-  checksum: 772373981bef531a09fd57712dc74c9413c1061c1e754bf0ca6b287ad73673093f9c84b7fc835e5bfc287a816e31dd86595eda791aead763b63577430b934678
-  languageName: node
-  linkType: hard
-
-"nanoid@npm:^3.3.1":
-  version: 3.3.3
-  resolution: "nanoid@npm:3.3.3"
-  bin:
-    nanoid: bin/nanoid.cjs
-  checksum: ada019402a07464a694553c61d2dca8a4353645a7d92f2830f0d487fedff403678a0bee5323a46522752b2eab95a0bc3da98b6cccaa7c0c55cd9975130e6d6f0
+  checksum: 88a8f981dec2ebcdfe0f06d9123d46069e22f881e3286441d6396ea80ee56079d7f93e731321d2320156196e442df77a9ae45f8599b98b144af458d12b29d88c
   languageName: node
   linkType: hard
 
-"nanoid@npm:^3.3.4":
-  version: 3.3.4
-  resolution: "nanoid@npm:3.3.4"
+"nanoid@npm:^3.3.7":
+  version: 3.3.7
+  resolution: "nanoid@npm:3.3.7"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: 2fddd6dee994b7676f008d3ffa4ab16035a754f4bb586c61df5a22cf8c8c94017aadd360368f47d653829e0569a92b129979152ff97af23a558331e47e37cd9c
+  checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2
   languageName: node
   linkType: hard
 
@@ -6123,6 +6100,15 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"node-addon-api@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "node-addon-api@npm:6.1.0"
+  dependencies:
+    node-gyp: latest
+  checksum: 3a539510e677cfa3a833aca5397300e36141aca064cdc487554f2017110709a03a95da937e98c2a14ec3c626af7b2d1b6dabe629a481f9883143d0d5bff07bf2
+  languageName: node
+  linkType: hard
+
 "node-gyp-build-optional-packages@npm:5.0.2":
   version: 5.0.2
   resolution: "node-gyp-build-optional-packages@npm:5.0.2"
@@ -6145,6 +6131,30 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"node-gyp-build-optional-packages@npm:5.0.7":
+  version: 5.0.7
+  resolution: "node-gyp-build-optional-packages@npm:5.0.7"
+  bin:
+    node-gyp-build-optional-packages: bin.js
+    node-gyp-build-optional-packages-optional: optional.js
+    node-gyp-build-optional-packages-test: build-test.js
+  checksum: bcb4537af15bcb3811914ea0db8f69284ca10db1cc7543a167a4c41ae4b9b5044b133f789fdadad0b7adc6931f6ae7def3c75b0bc7b05836881aae52400163e6
+  languageName: node
+  linkType: hard
+
+"node-gyp-build-optional-packages@npm:5.1.1":
+  version: 5.1.1
+  resolution: "node-gyp-build-optional-packages@npm:5.1.1"
+  dependencies:
+    detect-libc: ^2.0.1
+  bin:
+    node-gyp-build-optional-packages: bin.js
+    node-gyp-build-optional-packages-optional: optional.js
+    node-gyp-build-optional-packages-test: build-test.js
+  checksum: f3cb197862516e6879377adaa58142ae9013ab69c86cf2645f8b008db339354145d8ebd9140a13ec7ece5ce28a372ca7e14660379d3a3dd7b908a6f2743606e9
+  languageName: node
+  linkType: hard
+
 "node-gyp-build@npm:^4.3.0":
   version: 4.4.0
   resolution: "node-gyp-build@npm:4.4.0"
@@ -6201,15 +6211,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"npm-run-path@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "npm-run-path@npm:4.0.1"
-  dependencies:
-    path-key: ^3.0.0
-  checksum: 5374c0cea4b0bbfdfae62da7bbdf1e1558d338335f4cacf2515c282ff358ff27b2ecb91ffa5330a8b14390ac66a1e146e10700440c1ab868208430f56b5f4d23
-  languageName: node
-  linkType: hard
-
 "npmlog@npm:^6.0.0":
   version: 6.0.2
   resolution: "npmlog@npm:6.0.2"
@@ -6222,7 +6223,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"nth-check@npm:^2.0.1":
+"nth-check@npm:^2.0.1, nth-check@npm:^2.1.1":
   version: 2.1.1
   resolution: "nth-check@npm:2.1.1"
   dependencies:
@@ -6245,7 +6246,14 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.0, object-inspect@npm:^1.9.0":
+"object-inspect@npm:^1.13.1":
+  version: 1.13.1
+  resolution: "object-inspect@npm:1.13.1"
+  checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f
+  languageName: node
+  linkType: hard
+
+"object-inspect@npm:^1.9.0":
   version: 1.12.0
   resolution: "object-inspect@npm:1.12.0"
   checksum: 2b36d4001a9c921c6b342e2965734519c9c58c355822243c3207fbf0aac271f8d44d30d2d570d450b2cc6f0f00b72bcdba515c37827d2560e5f22b1899a31cf4
@@ -6259,26 +6267,49 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "object.assign@npm:4.1.2"
+"object.assign@npm:^4.1.4":
+  version: 4.1.4
+  resolution: "object.assign@npm:4.1.4"
   dependencies:
-    call-bind: ^1.0.0
-    define-properties: ^1.1.3
-    has-symbols: ^1.0.1
+    call-bind: ^1.0.2
+    define-properties: ^1.1.4
+    has-symbols: ^1.0.3
     object-keys: ^1.1.1
-  checksum: d621d832ed7b16ac74027adb87196804a500d80d9aca536fccb7ba48d33a7e9306a75f94c1d29cbfa324bc091bfc530bc24789568efdaee6a47fcfa298993814
+  checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "object.values@npm:1.1.5"
+"object.fromentries@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "object.fromentries@npm:2.0.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.1
-  checksum: 0f17e99741ebfbd0fa55ce942f6184743d3070c61bd39221afc929c8422c4907618c8da694c6915bc04a83ab3224260c779ba37fc07bb668bdc5f33b66a902a4
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 7341ce246e248b39a431b87a9ddd331ff52a454deb79afebc95609f94b1f8238966cf21f52188f2a353f0fdf83294f32f1ebf1f7826aae915ebad21fd0678065
+  languageName: node
+  linkType: hard
+
+"object.groupby@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "object.groupby@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+  checksum: d7959d6eaaba358b1608066fc67ac97f23ce6f573dc8fc661f68c52be165266fcb02937076aedb0e42722fdda0bdc0bbf74778196ac04868178888e9fd3b78b5
+  languageName: node
+  linkType: hard
+
+"object.values@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "object.values@npm:1.1.7"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777
   languageName: node
   linkType: hard
 
@@ -6291,7 +6322,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
+"once@npm:^1.3.0":
   version: 1.4.0
   resolution: "once@npm:1.4.0"
   dependencies:
@@ -6300,26 +6331,17 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"onetime@npm:^5.1.0":
-  version: 5.1.2
-  resolution: "onetime@npm:5.1.2"
-  dependencies:
-    mimic-fn: ^2.1.0
-  checksum: 2478859ef817fc5d4e9c2f9e5728512ddd1dbc9fb7829ad263765bb6d3b91ce699d6e2332eef6b7dff183c2f490bd3349f1666427eaba4469fba0ac38dfd0d34
-  languageName: node
-  linkType: hard
-
-"optionator@npm:^0.9.1":
-  version: 0.9.1
-  resolution: "optionator@npm:0.9.1"
+"optionator@npm:^0.9.3":
+  version: 0.9.3
+  resolution: "optionator@npm:0.9.3"
   dependencies:
+    "@aashutoshrathi/word-wrap": ^1.2.3
     deep-is: ^0.1.3
     fast-levenshtein: ^2.0.6
     levn: ^0.4.1
     prelude-ls: ^1.2.1
     type-check: ^0.4.0
-    word-wrap: ^1.2.3
-  checksum: dbc6fa065604b24ea57d734261914e697bd73b69eff7f18e967e8912aa2a40a19a9f599a507fa805be6c13c24c4eae8c71306c239d517d42d4c041c942f508a0
+  checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a
   languageName: node
   linkType: hard
 
@@ -6330,19 +6352,10 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"ospath@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "ospath@npm:1.2.2"
-  checksum: 505f48a4f4f1c557d6c656ec985707726e3714721680139be037613e903aa8c8fa4ddd8d1342006f9b2dc0065e6e20f8b7bea2ee05354f31257044790367b347
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^1.1.0":
-  version: 1.3.0
-  resolution: "p-limit@npm:1.3.0"
-  dependencies:
-    p-try: ^1.0.0
-  checksum: 281c1c0b8c82e1ac9f81acd72a2e35d402bf572e09721ce5520164e9de07d8274451378a3470707179ad13240535558f4b277f02405ad752e08c7d5b0d54fbfd
+"ordered-binary@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "ordered-binary@npm:1.4.1"
+  checksum: 274940b4ef983562e11371c84415c265432a4e1337ab85f8e7669eeab6afee8f655c6c12ecee1cd121aaf399c32f5c781b0d50e460bd42da004eba16dcc66574
   languageName: node
   linkType: hard
 
@@ -6355,15 +6368,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"p-locate@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "p-locate@npm:2.0.0"
-  dependencies:
-    p-limit: ^1.1.0
-  checksum: e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081
-  languageName: node
-  linkType: hard
-
 "p-locate@npm:^5.0.0":
   version: 5.0.0
   resolution: "p-locate@npm:5.0.0"
@@ -6382,34 +6386,27 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"p-try@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "p-try@npm:1.0.0"
-  checksum: 3b5303f77eb7722144154288bfd96f799f8ff3e2b2b39330efe38db5dd359e4fb27012464cd85cb0a76e9b7edd1b443568cb3192c22e7cffc34989df0bafd605
-  languageName: node
-  linkType: hard
-
-"parcel@npm:2.7.0":
-  version: 2.7.0
-  resolution: "parcel@npm:2.7.0"
+"parcel@npm:2.12.0":
+  version: 2.12.0
+  resolution: "parcel@npm:2.12.0"
   dependencies:
-    "@parcel/config-default": 2.7.0
-    "@parcel/core": 2.7.0
-    "@parcel/diagnostic": 2.7.0
-    "@parcel/events": 2.7.0
-    "@parcel/fs": 2.7.0
-    "@parcel/logger": 2.7.0
-    "@parcel/package-manager": 2.7.0
-    "@parcel/reporter-cli": 2.7.0
-    "@parcel/reporter-dev-server": 2.7.0
-    "@parcel/utils": 2.7.0
+    "@parcel/config-default": 2.12.0
+    "@parcel/core": 2.12.0
+    "@parcel/diagnostic": 2.12.0
+    "@parcel/events": 2.12.0
+    "@parcel/fs": 2.12.0
+    "@parcel/logger": 2.12.0
+    "@parcel/package-manager": 2.12.0
+    "@parcel/reporter-cli": 2.12.0
+    "@parcel/reporter-dev-server": 2.12.0
+    "@parcel/reporter-tracer": 2.12.0
+    "@parcel/utils": 2.12.0
     chalk: ^4.1.0
     commander: ^7.0.0
     get-port: ^4.2.0
-    v8-compile-cache: ^2.0.0
   bin:
     parcel: lib/bin.js
-  checksum: 0584bc59daccf9c1e3afe0235d134f440fc2e08135c66d7ac4ee7b4edec12739ec94c829590cf18774f33f760ac601a78b5df26b81977842d1052e3c9b71e94b
+  checksum: d8e6cb690a26999e4b9be0f433d5b72060fdfbb22a9aae26b4705f7eaf3983906ba719e41a5ed102ca617135823931a6559d08a11fb48cdfea7ac333e9aebaef
   languageName: node
   linkType: hard
 
@@ -6434,13 +6431,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"path-exists@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "path-exists@npm:3.0.0"
-  checksum: 96e92643aa34b4b28d0de1cd2eba52a1c5313a90c6542d03f62750d82480e20bfa62bc865d5cfc6165f5fcd5aeb0851043c40a39be5989646f223300021bae0a
-  languageName: node
-  linkType: hard
-
 "path-exists@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-exists@npm:4.0.0"
@@ -6455,7 +6445,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"path-key@npm:^3.0.0, path-key@npm:^3.1.0":
+"path-key@npm:^3.1.0":
   version: 3.1.1
   resolution: "path-key@npm:3.1.1"
   checksum: 55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020
@@ -6469,10 +6459,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:^6.2.0":
-  version: 6.2.1
-  resolution: "path-to-regexp@npm:6.2.1"
-  checksum: f0227af8284ea13300f4293ba111e3635142f976d4197f14d5ad1f124aebd9118783dd2e5f1fe16f7273743cc3dbeddfb7493f237bb27c10fdae07020cc9b698
+"path-scurry@npm:^1.7.0":
+  version: 1.9.1
+  resolution: "path-scurry@npm:1.9.1"
+  dependencies:
+    lru-cache: ^9.1.1
+    minipass: ^5.0.0 || ^6.0.0
+  checksum: 28caa788f17cc48e1a16b552bc08ba4ec57345bd18df7b9d58589bd83271e5bf932929467353f53ff66eb3bf056eb28d8f9b379525ee37e3f603169257542694
   languageName: node
   linkType: hard
 
@@ -6483,20 +6476,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"pend@npm:~1.2.0":
-  version: 1.2.0
-  resolution: "pend@npm:1.2.0"
-  checksum: 6c72f5243303d9c60bd98e6446ba7d30ae29e3d56fdb6fae8767e8ba6386f33ee284c97efe3230a0d0217e2b1723b8ab490b1bbf34fcbb2180dbc8a9de47850d
-  languageName: node
-  linkType: hard
-
-"performance-now@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "performance-now@npm:2.1.0"
-  checksum: 534e641aa8f7cba160f0afec0599b6cecefbb516a2e837b512be0adbe6c1da5550e89c78059c7fabc5c9ffdf6627edabe23eb7c518c4500067a898fa65c2b550
-  languageName: node
-  linkType: hard
-
 "picocolors@npm:^1.0.0":
   version: 1.0.0
   resolution: "picocolors@npm:1.0.0"
@@ -6511,13 +6490,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"pify@npm:^2.2.0":
-  version: 2.3.0
-  resolution: "pify@npm:2.3.0"
-  checksum: 9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba
-  languageName: node
-  linkType: hard
-
 "pinia-plugin-persist@npm:1.0.0":
   version: 1.0.0
   resolution: "pinia-plugin-persist@npm:1.0.0"
@@ -6534,32 +6506,32 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"pinia@npm:2.0.22":
-  version: 2.0.22
-  resolution: "pinia@npm:2.0.22"
+"pinia@npm:2.1.7":
+  version: 2.1.7
+  resolution: "pinia@npm:2.1.7"
   dependencies:
-    "@vue/devtools-api": ^6.2.1
-    vue-demi: "*"
+    "@vue/devtools-api": ^6.5.0
+    vue-demi: ">=0.14.5"
   peerDependencies:
     "@vue/composition-api": ^1.4.0
     typescript: ">=4.4.4"
-    vue: ^2.6.14 || ^3.2.0
+    vue: ^2.6.14 || ^3.3.0
   peerDependenciesMeta:
     "@vue/composition-api":
       optional: true
     typescript:
       optional: true
-  checksum: 394906326758ac41acfdf4a29263c952c2cb7f35ebf87771a025ab492bdde7cf7fd87a49f82ec3a98bf8323ed2cb231f1ad272f7ea522694a9fab5a5cde3e727
+  checksum: 1b7882aab2828ad209d3e76e06918c8811d04699c9308d372094cde6df485d7e7785f25a3bb5c6a3724aeaee3fb0082fae03c41a6657acd3486c7965a0a09d34
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.9":
-  version: 6.0.10
-  resolution: "postcss-selector-parser@npm:6.0.10"
+"postcss-selector-parser@npm:^6.0.15":
+  version: 6.0.15
+  resolution: "postcss-selector-parser@npm:6.0.15"
   dependencies:
     cssesc: ^3.0.0
     util-deprecate: ^1.0.2
-  checksum: 46afaa60e3d1998bd7adf6caa374baf857cc58d3ff944e29459c9a9e4680a7fe41597bd5b755fc81d7c388357e9bf67c0251d047c640a09f148e13606b8a8608
+  checksum: 57decb94152111004f15e27b9c61131eb50ee10a3288e7fcf424cebbb4aba82c2817517ae718f8b5d704ee9e02a638d4a2acff8f47685c295a33ecee4fd31055
   languageName: node
   linkType: hard
 
@@ -6570,25 +6542,25 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.1.10":
-  version: 8.4.12
-  resolution: "postcss@npm:8.4.12"
+"postcss@npm:^8.4.27":
+  version: 8.4.33
+  resolution: "postcss@npm:8.4.33"
   dependencies:
-    nanoid: ^3.3.1
+    nanoid: ^3.3.7
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: 248e3d0f9bbb8efaafcfda7f91627a29bdc9a19f456896886330beb28c5abea0e14c7901b35191928602e2eccbed496b1e94097d27a0b2a980854cd00c7a835f
+  checksum: 6f98b2af4b76632a3de20c4f47bf0e984a1ce1a531cf11adcb0b1d63a6cbda0aae4165e578b66c32ca4879038e3eaad386a6be725a8fb4429c78e3c1ab858fe9
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.13":
-  version: 8.4.14
-  resolution: "postcss@npm:8.4.14"
+"postcss@npm:^8.4.35":
+  version: 8.4.35
+  resolution: "postcss@npm:8.4.35"
   dependencies:
-    nanoid: ^3.3.4
+    nanoid: ^3.3.7
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: fe58766ff32e4becf65a7d57678995cfd239df6deed2fe0557f038b47c94e4132e7e5f68b5aa820c13adfec32e523b693efaeb65798efb995ce49ccd83953816
+  checksum: cf3c3124d3912a507603f6d9a49b3783f741075e9aa73eb592a6dd9194f9edab9d20a8875d16d137d4f779fe7b6fbd1f5727e39bfd1c3003724980ee4995e1da
   languageName: node
   linkType: hard
 
@@ -6629,10 +6601,10 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"preact@npm:^10.0.5":
-  version: 10.7.2
-  resolution: "preact@npm:10.7.2"
-  checksum: 2f0655e0430f1c6927b40cb4abffb2c0ee4fe63e3201d44e37d0992c0ab534346f206cf23c0405572b70908e3eba2f7f60ab8e4531f409ebcbc35af06920cd60
+"preact@npm:~10.12.1":
+  version: 10.12.1
+  resolution: "preact@npm:10.12.1"
+  checksum: 0de99f477563ab7f94a0f964952ad216375973c0dcd9eb49881f8eb5effc5ed6948da062548c87d5bb0d82f1a1e516b649020e760eab3a0503dfdd8e64d34a26
   languageName: node
   linkType: hard
 
@@ -6643,24 +6615,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"pretty-bytes@npm:^5.6.0":
-  version: 5.6.0
-  resolution: "pretty-bytes@npm:5.6.0"
-  checksum: 9c082500d1e93434b5b291bd651662936b8bd6204ec9fa17d563116a192d6d86b98f6d328526b4e8d783c07d5499e2614a807520249692da9ec81564b2f439cd
-  languageName: node
-  linkType: hard
-
-"pretty-format@npm:^27.0.0, pretty-format@npm:^27.5.1":
-  version: 27.5.1
-  resolution: "pretty-format@npm:27.5.1"
-  dependencies:
-    ansi-regex: ^5.0.1
-    ansi-styles: ^5.0.0
-    react-is: ^17.0.1
-  checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088
-  languageName: node
-  linkType: hard
-
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
@@ -6697,20 +6651,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"proxy-from-env@npm:1.0.0":
-  version: 1.0.0
-  resolution: "proxy-from-env@npm:1.0.0"
-  checksum: 292e28d1de0c315958d71d8315eb546dd3cd8c8cbc2dab7c54eeb9f5c17f421771964ad0b5e1f77011bab2305bdae42e1757ce33bdb1ccc3e87732322a8efcf1
-  languageName: node
-  linkType: hard
-
-"psl@npm:^1.1.28":
-  version: 1.8.0
-  resolution: "psl@npm:1.8.0"
-  checksum: 6150048ed2da3f919478bee8a82f3828303bc0fc730fb015a48f83c9977682c7b28c60ab01425a72d82a2891a1681627aa530a991d50c086b48a3be27744bde7
-  languageName: node
-  linkType: hard
-
 "pug-attrs@npm:^3.0.0":
   version: 3.0.0
   resolution: "pug-attrs@npm:3.0.0"
@@ -6838,30 +6778,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"pump@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "pump@npm:3.0.0"
-  dependencies:
-    end-of-stream: ^1.1.0
-    once: ^1.3.1
-  checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9
-  languageName: node
-  linkType: hard
-
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
+"punycode@npm:^2.1.0":
   version: 2.1.1
   resolution: "punycode@npm:2.1.1"
   checksum: 823bf443c6dd14f669984dea25757b37993f67e8d94698996064035edd43bed8a5a17a9f12e439c2b35df1078c6bec05a6c86e336209eb1061e8025c481168e8
   languageName: node
   linkType: hard
 
-"qs@npm:~6.5.2":
-  version: 6.5.3
-  resolution: "qs@npm:6.5.3"
-  checksum: 6f20bf08cabd90c458e50855559539a28d00b2f2e7dddcb66082b16a43188418cb3cb77cbd09268bcef6022935650f0534357b8af9eeb29bf0f27ccb17655692
-  languageName: node
-  linkType: hard
-
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -6869,15 +6792,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"queue@npm:6.0.2":
-  version: 6.0.2
-  resolution: "queue@npm:6.0.2"
-  dependencies:
-    inherits: ~2.0.3
-  checksum: ebc23639248e4fe40a789f713c20548e513e053b3dc4924b6cb0ad741e3f264dcff948225c8737834dd4f9ec286dbc06a1a7c13858ea382d9379f4303bcc0916
-  languageName: node
-  linkType: hard
-
 "range-parser@npm:~1.2.1":
   version: 1.2.1
   resolution: "range-parser@npm:1.2.1"
@@ -6892,13 +6806,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"react-is@npm:^17.0.1":
-  version: 17.0.2
-  resolution: "react-is@npm:17.0.2"
-  checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8
-  languageName: node
-  linkType: hard
-
 "react-refresh@npm:^0.9.0":
   version: 0.9.0
   resolution: "react-refresh@npm:0.9.0"
@@ -6933,19 +6840,28 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"regexpp@npm:^3.0.0, regexpp@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "regexpp@npm:3.2.0"
-  checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8
+"regenerator-runtime@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "regenerator-runtime@npm:0.14.0"
+  checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3
   languageName: node
   linkType: hard
 
-"request-progress@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "request-progress@npm:3.0.0"
+"regexp.prototype.flags@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "regexp.prototype.flags@npm:1.5.1"
   dependencies:
-    throttleit: ^1.0.0
-  checksum: 6ea1761dcc8a8b7b5894afd478c0286aa31bd69438d7050294bd4fd0d0b3e09b5cde417d38deef9c49809039c337d8744e4bb49d8632b0c3e4ffa5e8a687e0fd
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    set-function-name: ^2.0.0
+  checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47
+  languageName: node
+  linkType: hard
+
+"regexpp@npm:^3.0.0":
+  version: 3.2.0
+  resolution: "regexpp@npm:3.2.0"
+  checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8
   languageName: node
   linkType: hard
 
@@ -6970,7 +6886,14 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.10.1, resolve@npm:^1.15.1, resolve@npm:^1.20.0, resolve@npm:^1.22.0":
+"resolve-pkg-maps@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "resolve-pkg-maps@npm:1.0.0"
+  checksum: 1012afc566b3fdb190a6309cc37ef3b2dcc35dff5fa6683a9d00cd25c3247edfbc4691b91078c97adc82a29b77a2660c30d791d65dab4fc78bfc473f60289977
+  languageName: node
+  linkType: hard
+
+"resolve@npm:^1.10.1, resolve@npm:^1.15.1":
   version: 1.22.0
   resolution: "resolve@npm:1.22.0"
   dependencies:
@@ -6983,20 +6906,33 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.22.1":
-  version: 1.22.1
-  resolution: "resolve@npm:1.22.1"
+"resolve@npm:^1.22.2":
+  version: 1.22.3
+  resolution: "resolve@npm:1.22.3"
+  dependencies:
+    is-core-module: ^2.12.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: fb834b81348428cb545ff1b828a72ea28feb5a97c026a1cf40aa1008352c72811ff4d4e71f2035273dc536dcfcae20c13604ba6283c612d70fa0b6e44519c374
+  languageName: node
+  linkType: hard
+
+"resolve@npm:^1.22.4":
+  version: 1.22.8
+  resolution: "resolve@npm:1.22.8"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 07af5fc1e81aa1d866cbc9e9460fbb67318a10fa3c4deadc35c3ad8a898ee9a71a86a65e4755ac3195e0ea0cfbe201eb323ebe655ce90526fd61917313a34e4e
+  checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.15.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.15.1#~builtin<compat/resolve>":
   version: 1.22.0
   resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=07638b"
   dependencies:
@@ -7009,26 +6945,29 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
-  version: 1.22.1
-  resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
+"resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>":
+  version: 1.22.3
+  resolution: "resolve@patch:resolve@npm%3A1.22.3#~builtin<compat/resolve>::version=1.22.3&hash=07638b"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.12.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b
+  checksum: ad59734723b596d0891321c951592ed9015a77ce84907f89c9d9307dd0c06e11a67906a3e628c4cae143d3e44898603478af0ddeb2bba3f229a9373efe342665
   languageName: node
   linkType: hard
 
-"restore-cursor@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "restore-cursor@npm:3.1.0"
+"resolve@patch:resolve@^1.22.4#~builtin<compat/resolve>":
+  version: 1.22.8
+  resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=07638b"
   dependencies:
-    onetime: ^5.1.0
-    signal-exit: ^3.0.2
-  checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630
+    is-core-module: ^2.13.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
   languageName: node
   linkType: hard
 
@@ -7046,14 +6985,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"rfdc@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "rfdc@npm:1.3.0"
-  checksum: fb2ba8512e43519983b4c61bd3fa77c0f410eff6bae68b08614437bc3f35f91362215f7b4a73cbda6f67330b5746ce07db5dd9850ad3edc91271ad6deea0df32
-  languageName: node
-  linkType: hard
-
-"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2":
+"rimraf@npm:^3.0.2":
   version: 3.0.2
   resolution: "rimraf@npm:3.0.2"
   dependencies:
@@ -7071,9 +7003,9 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"rollup@npm:>=2.59.0 <2.78.0":
-  version: 2.77.3
-  resolution: "rollup@npm:2.77.3"
+"rollup@npm:^3.27.1":
+  version: 3.29.4
+  resolution: "rollup@npm:3.29.4"
   dependencies:
     fsevents: ~2.3.2
   dependenciesMeta:
@@ -7081,7 +7013,7 @@ browserlist@latest:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: b179c68249584565ddb5664a241e8e48c293b2207718d885b08ee25797d98857a383f06b544bb89819407da5a71557f4713309a278f61c4778bb32b1d3321a1c
+  checksum: 8bb20a39c8d91130825159c3823eccf4dc2295c9a0a5c4ed851a5bf2167dbf24d9a29f23461a54c955e5506395e6cc188eafc8ab0e20399d7489fb33793b184e
   languageName: node
   linkType: hard
 
@@ -7089,68 +7021,70 @@ browserlist@latest:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
-    "@faker-js/faker": 7.5.0
-    "@fullcalendar/bootstrap5": 5.11.3
-    "@fullcalendar/core": 5.11.3
-    "@fullcalendar/daygrid": 5.11.3
-    "@fullcalendar/interaction": 5.11.3
-    "@fullcalendar/list": 5.11.3
-    "@fullcalendar/luxon2": 5.11.3
-    "@fullcalendar/timegrid": 5.11.3
-    "@fullcalendar/vue3": 5.11.2
-    "@parcel/transformer-sass": 2.7.0
-    "@percy/cli": 1.10.4
-    "@percy/cypress": 3.1.2
-    "@popperjs/core": 2.11.6
-    "@vitejs/plugin-vue": 2.3.4
-    "@vue/test-utils": 2.1.0
-    bootstrap: 5.2.2
-    bootstrap-icons: 1.9.1
-    browser-fs-access: 0.31.0
+    "@fullcalendar/bootstrap5": 6.1.11
+    "@fullcalendar/core": 6.1.11
+    "@fullcalendar/daygrid": 6.1.11
+    "@fullcalendar/icalendar": 6.1.11
+    "@fullcalendar/interaction": 6.1.11
+    "@fullcalendar/list": 6.1.11
+    "@fullcalendar/luxon3": 6.1.11
+    "@fullcalendar/timegrid": 6.1.11
+    "@fullcalendar/vue3": 6.1.11
+    "@parcel/optimizer-data-url": 2.12.0
+    "@parcel/transformer-inline-string": 2.12.0
+    "@parcel/transformer-sass": 2.12.0
+    "@popperjs/core": 2.11.8
+    "@rollup/pluginutils": 5.1.0
+    "@twuni/emojify": 1.0.2
+    "@vitejs/plugin-vue": 4.6.2
+    "@vue/language-plugin-pug": 2.0.7
+    bootstrap: 5.3.3
+    bootstrap-icons: 1.11.3
+    browser-fs-access: 0.35.0
     browserlist: latest
-    c8: 7.12.0
-    caniuse-lite: 1.0.30001414
-    cypress: 10.9.0
-    cypress-real-events: 1.7.1
-    d3: 7.6.1
-    eslint: 8.24.0
-    eslint-config-standard: 17.0.0
-    eslint-plugin-cypress: 2.12.1
-    eslint-plugin-import: 2.26.0
-    eslint-plugin-n: 15.3.0
+    c8: 9.1.0
+    caniuse-lite: 1.0.30001603
+    d3: 7.9.0
+    eslint: 8.57.0
+    eslint-config-standard: 17.1.0
+    eslint-plugin-cypress: 2.15.1
+    eslint-plugin-import: 2.29.1
+    eslint-plugin-n: 16.6.2
     eslint-plugin-node: 11.1.0
-    eslint-plugin-promise: 6.0.1
-    eslint-plugin-vue: 9.5.1
+    eslint-plugin-promise: 6.1.1
+    eslint-plugin-vue: 9.24.0
     file-saver: 2.0.5
-    highcharts: 10.2.1
-    html-validate: 7.5.0
-    jquery: 3.6.1
-    jquery-migrate: 3.4.0
-    jquery-ui-dist: 1.13.2
-    js-cookie: 3.0.1
+    highcharts: 11.4.0
+    html-validate: 8.18.1
+    ical.js: 1.5.0
+    jquery: 3.7.1
+    jquery-migrate: 3.4.1
+    js-cookie: 3.0.5
     list.js: 2.3.1
     lodash: 4.17.21
     lodash-es: 4.17.21
-    luxon: 3.0.4
-    moment: 2.29.4
-    moment-timezone: 0.5.37
+    luxon: 3.4.4
+    moment: 2.30.1
+    moment-timezone: 0.5.45
     ms: 2.1.3
     murmurhash-js: 1.0.0
-    naive-ui: 2.33.3
-    parcel: 2.7.0
-    pinia: 2.0.22
+    naive-ui: 2.38.1
+    parcel: 2.12.0
+    pinia: 2.1.7
     pinia-plugin-persist: 1.0.0
     pug: 3.0.2
-    sass: 1.55.0
+    sass: 1.72.0
     seedrandom: 3.0.5
     select2: 4.1.0-rc.0
     select2-bootstrap-5-theme: 1.3.0
     send: 0.18.0
-    slugify: 1.6.5
-    sortablejs: 1.15.0
-    vite: 2.9.15
-    vue: 3.2.40
-    vue-router: 4.1.5
+    shepherd.js: 11.2.0
+    slugify: 1.6.6
+    sortablejs: 1.15.2
+    vanillajs-datepicker: 1.3.4
+    vite: 4.5.3
+    vue: 3.4.21
+    vue-router: 4.3.0
     zxcvbn: 4.4.2
   languageName: unknown
   linkType: soft
@@ -7171,16 +7105,19 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^7.5.1":
-  version: 7.5.5
-  resolution: "rxjs@npm:7.5.5"
+"safe-array-concat@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "safe-array-concat@npm:1.0.1"
   dependencies:
-    tslib: ^2.1.0
-  checksum: e034f60805210cce756dd2f49664a8108780b117cf5d0e2281506e9e6387f7b4f1532d974a8c8b09314fa7a16dd2f6cff3462072a5789672b5dcb45c4173f3c6
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    isarray: ^2.0.5
+  checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581
   languageName: node
   linkType: hard
 
-"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0":
+"safe-buffer@npm:^5.0.1, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
   checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
@@ -7194,23 +7131,34 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0":
+"safe-regex-test@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "safe-regex-test@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.1.3
+    is-regex: ^1.1.4
+  checksum: bc566d8beb8b43c01b94e67de3f070fd2781685e835959bbbaaec91cc53381145ca91f69bd837ce6ec244817afa0a5e974fc4e40a2957f0aca68ac3add1ddd34
+  languageName: node
+  linkType: hard
+
+"safer-buffer@npm:>= 2.1.2 < 3.0.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
   checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
   languageName: node
   linkType: hard
 
-"sass@npm:1.55.0":
-  version: 1.55.0
-  resolution: "sass@npm:1.55.0"
+"sass@npm:1.72.0":
+  version: 1.72.0
+  resolution: "sass@npm:1.72.0"
   dependencies:
     chokidar: ">=3.0.0 <4.0.0"
     immutable: ^4.0.0
     source-map-js: ">=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 7d769ed08efce4e6134e0f3dc11c4f07e32c413ac8eb43c5855f2686890fdcbd80da34165c91fb4ba407f478ca108e171574b5a60cb9814a5ed09d80f6014f96
+  checksum: f420079c7d51660b7256ee52463c1499ede36f7fd5c8ef50c687451777ad641509001454dea45244073cedd7c00e7a3bc1c362e55206ac6686171b994edb41e4
   languageName: node
   linkType: hard
 
@@ -7234,15 +7182,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"seemly@npm:^0.3.1":
-  version: 0.3.3
-  resolution: "seemly@npm:0.3.3"
-  dependencies:
-    "@types/jest": ^27.0.1
-  checksum: b6445553f8e7b19310a5ea0240c80981aa669a6826e1ddbd62449cb1119236913607f6874759247bb6de8e22f3db966b5a498b5e8ac7682e42035951125fbea4
-  languageName: node
-  linkType: hard
-
 "seemly@npm:^0.3.6":
   version: 0.3.6
   resolution: "seemly@npm:0.3.6"
@@ -7250,6 +7189,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"seemly@npm:^0.3.8":
+  version: 0.3.8
+  resolution: "seemly@npm:0.3.8"
+  checksum: 98171fd4d9e3a03f49f695885499883c85cc00b8d88bc4a12576d5069b46ebe269d2dfc58a7e6cec8887bf2b2511d074376eb837c14b476918f9a8706ed5977a
+  languageName: node
+  linkType: hard
+
 "select2-bootstrap-5-theme@npm:1.3.0":
   version: 1.3.0
   resolution: "select2-bootstrap-5-theme@npm:1.3.0"
@@ -7266,7 +7212,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"semver@npm:^5.7.0, semver@npm:^5.7.1":
+"semver@npm:^5.7.1":
   version: 5.7.1
   resolution: "semver@npm:5.7.1"
   bin:
@@ -7284,7 +7230,16 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7":
+"semver@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "semver@npm:6.3.1"
+  bin:
+    semver: bin/semver.js
+  checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
+  languageName: node
+  linkType: hard
+
+"semver@npm:^7.0.0, semver@npm:^7.3.5, semver@npm:^7.3.6":
   version: 7.3.7
   resolution: "semver@npm:7.3.7"
   dependencies:
@@ -7295,6 +7250,39 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.5.2":
+  version: 7.5.4
+  resolution: "semver@npm:7.5.4"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
+  languageName: node
+  linkType: hard
+
+"semver@npm:^7.5.3":
+  version: 7.5.3
+  resolution: "semver@npm:7.5.3"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 9d58db16525e9f749ad0a696a1f27deabaa51f66e91d2fa2b0db3de3e9644e8677de3b7d7a03f4c15bc81521e0c3916d7369e0572dbde250d9bedf5194e2a8a7
+  languageName: node
+  linkType: hard
+
+"semver@npm:^7.6.0":
+  version: 7.6.0
+  resolution: "semver@npm:7.6.0"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 7427f05b70786c696640edc29fdd4bc33b2acf3bbe1740b955029044f80575fc664e1a512e4113c3af21e767154a94b4aa214bf6cd6e42a1f6dba5914e0b208c
+  languageName: node
+  linkType: hard
+
 "send@npm:0.18.0":
   version: 0.18.0
   resolution: "send@npm:0.18.0"
@@ -7323,6 +7311,29 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"set-function-length@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "set-function-length@npm:1.1.1"
+  dependencies:
+    define-data-property: ^1.1.1
+    get-intrinsic: ^1.2.1
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.0
+  checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06
+  languageName: node
+  linkType: hard
+
+"set-function-name@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "set-function-name@npm:2.0.1"
+  dependencies:
+    define-data-property: ^1.0.1
+    functions-have-names: ^1.2.3
+    has-property-descriptors: ^1.0.0
+  checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126
+  languageName: node
+  linkType: hard
+
 "setprototypeof@npm:1.2.0":
   version: 1.2.0
   resolution: "setprototypeof@npm:1.2.0"
@@ -7346,6 +7357,16 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"shepherd.js@npm:11.2.0":
+  version: 11.2.0
+  resolution: "shepherd.js@npm:11.2.0"
+  dependencies:
+    "@floating-ui/dom": ^1.5.1
+    deepmerge: ^4.3.1
+  checksum: 0e71e63e51b25aaec83c835ecbe33227e6e583a204b347357ce70092e0024b6eb546f3d0cfd9ee4ac704f2baa81a37ab1a3c449312f495c73f2eadc1310f6f42
+  languageName: node
+  linkType: hard
+
 "side-channel@npm:^1.0.4":
   version: 1.0.4
   resolution: "side-channel@npm:1.0.4"
@@ -7357,13 +7378,20 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.7":
+"signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
   checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318
   languageName: node
   linkType: hard
 
+"signal-exit@npm:^4.0.1":
+  version: 4.0.2
+  resolution: "signal-exit@npm:4.0.2"
+  checksum: 41f5928431cc6e91087bf0343db786a6313dd7c6fd7e551dbc141c95bb5fb26663444fd9df8ea47c5d7fc202f60aa7468c3162a9365cbb0615fc5e1b1328fe31
+  languageName: node
+  linkType: hard
+
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
@@ -7371,39 +7399,10 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"slash@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "slash@npm:3.0.0"
-  checksum: 94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c
-  languageName: node
-  linkType: hard
-
-"slice-ansi@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "slice-ansi@npm:3.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 5ec6d022d12e016347e9e3e98a7eb2a592213a43a65f1b61b74d2c78288da0aded781f665807a9f3876b9daa9ad94f64f77d7633a0458876c3a4fdc4eb223f24
-  languageName: node
-  linkType: hard
-
-"slice-ansi@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "slice-ansi@npm:4.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756
-  languageName: node
-  linkType: hard
-
-"slugify@npm:1.6.5":
-  version: 1.6.5
-  resolution: "slugify@npm:1.6.5"
-  checksum: a955a1b600201030f4c1daa9bb74a17d4402a0693fc40978bbd17e44e64fd72dad3bac4037422aa8aed55b5170edd57f3f4cd8f59ba331f5cf0f10f1a7795609
+"slugify@npm:1.6.6":
+  version: 1.6.6
+  resolution: "slugify@npm:1.6.6"
+  checksum: 04773c2d3b7aea8d2a61fa47cc7e5d29ce04e1a96cbaec409da57139df906acb3a449fac30b167d203212c806e73690abd4ff94fbad0a9a7b7ea109a2a638ae9
   languageName: node
   linkType: hard
 
@@ -7435,10 +7434,10 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"sortablejs@npm:1.15.0":
-  version: 1.15.0
-  resolution: "sortablejs@npm:1.15.0"
-  checksum: bb82223a663484640d317cad510ac987f26b7a443631040407224de1be069afcc6c39048b6d8527f10f269e33595e8128d7de2fac23517c8260470f77f932d55
+"sortablejs@npm:1.15.2":
+  version: 1.15.2
+  resolution: "sortablejs@npm:1.15.2"
+  checksum: 36b20b144ff5fd2d078aed0eba3349aaef5691e4830ba9a28d69ca023d4583ca15e5eacb3c09c1d9924675388400d1219def1121e514badfb0f41463cc844da7
   languageName: node
   linkType: hard
 
@@ -7449,57 +7448,17 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"source-map-support@npm:~0.5.20":
-  version: 0.5.21
-  resolution: "source-map-support@npm:0.5.21"
-  dependencies:
-    buffer-from: ^1.0.0
-    source-map: ^0.6.0
-  checksum: 43e98d700d79af1d36f859bdb7318e601dfc918c7ba2e98456118ebc4c4872b327773e5a1df09b0524e9e5063bb18f0934538eace60cca2710d1fa687645d137
-  languageName: node
-  linkType: hard
-
-"source-map@npm:^0.6.0, source-map@npm:^0.6.1":
+"source-map@npm:^0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
   checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2
   languageName: node
   linkType: hard
 
-"source-map@npm:~0.8.0-beta.0":
-  version: 0.8.0-beta.0
-  resolution: "source-map@npm:0.8.0-beta.0"
-  dependencies:
-    whatwg-url: ^7.0.0
-  checksum: e94169be6461ab0ac0913313ad1719a14c60d402bd22b0ad96f4a6cffd79130d91ab5df0a5336a326b04d2df131c1409f563c9dc0d21a6ca6239a44b6c8dbd92
-  languageName: node
-  linkType: hard
-
-"sourcemap-codec@npm:^1.4.8":
-  version: 1.4.8
-  resolution: "sourcemap-codec@npm:1.4.8"
-  checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316
-  languageName: node
-  linkType: hard
-
-"sshpk@npm:^1.14.1":
-  version: 1.17.0
-  resolution: "sshpk@npm:1.17.0"
-  dependencies:
-    asn1: ~0.2.3
-    assert-plus: ^1.0.0
-    bcrypt-pbkdf: ^1.0.0
-    dashdash: ^1.12.0
-    ecc-jsbn: ~0.1.1
-    getpass: ^0.1.1
-    jsbn: ~0.1.0
-    safer-buffer: ^2.0.2
-    tweetnacl: ~0.14.0
-  bin:
-    sshpk-conv: bin/sshpk-conv
-    sshpk-sign: bin/sshpk-sign
-    sshpk-verify: bin/sshpk-verify
-  checksum: ba109f65c8e6c35133b8e6ed5576abeff8aa8d614824b7275ec3ca308f081fef483607c28d97780c1e235818b0f93ed8c8b56d0a5968d5a23fd6af57718c7597
+"srcset@npm:4":
+  version: 4.0.0
+  resolution: "srcset@npm:4.0.0"
+  checksum: aceb898c9281101ef43bfbf96bf04dfae828e1bf942a45df6fad74ae9f8f0a425f4bca1480e0d22879beb40dd2bc6947e0e1e5f4d307a714666196164bc5769d
   languageName: node
   linkType: hard
 
@@ -7533,7 +7492,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
@@ -7544,23 +7503,47 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "string.prototype.trimend@npm:1.0.4"
+"string-width@npm:^5.0.1, string-width@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "string-width@npm:5.1.2"
+  dependencies:
+    eastasianwidth: ^0.2.0
+    emoji-regex: ^9.2.2
+    strip-ansi: ^7.0.1
+  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
+  languageName: node
+  linkType: hard
+
+"string.prototype.trim@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "string.prototype.trim@npm:1.2.8"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-  checksum: 17e5aa45c3983f582693161f972c1c1fa4bbbdf22e70e582b00c91b6575f01680dc34e83005b98e31abe4d5d29e0b21fcc24690239c106c7b2315aade6a898ac
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "string.prototype.trimstart@npm:1.0.4"
+"string.prototype.trimend@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "string.prototype.trimend@npm:1.0.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-  checksum: 3fb06818d3cccac5fa3f5f9873d984794ca0e9f6616fae6fcc745885d9efed4e17fe15f832515d9af5e16c279857fdbffdfc489ca4ed577811b017721b30302f
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c
+  languageName: node
+  linkType: hard
+
+"string.prototype.trimstart@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "string.prototype.trimstart@npm:1.0.7"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613
   languageName: node
   linkType: hard
 
@@ -7573,7 +7556,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
   version: 6.0.1
   resolution: "strip-ansi@npm:6.0.1"
   dependencies:
@@ -7582,6 +7565,15 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"strip-ansi@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "strip-ansi@npm:7.0.1"
+  dependencies:
+    ansi-regex: ^6.0.1
+  checksum: 257f78fa433520e7f9897722731d78599cb3fce29ff26a20a5e12ba4957463b50a01136f37c43707f4951817a75e90820174853d6ccc240997adc5df8f966039
+  languageName: node
+  linkType: hard
+
 "strip-bom@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-bom@npm:3.0.0"
@@ -7589,14 +7581,7 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"strip-final-newline@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "strip-final-newline@npm:2.0.0"
-  checksum: 69412b5e25731e1938184b5d489c32e340605bb611d6140344abc3421b7f3c6f9984b21dff296dfcf056681b82caa3bb4cc996a965ce37bcfad663e92eae9c64
-  languageName: node
-  linkType: hard
-
-"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1":
+"strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
   checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
@@ -7621,15 +7606,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^8.1.1":
-  version: 8.1.1
-  resolution: "supports-color@npm:8.1.1"
-  dependencies:
-    has-flag: ^4.0.0
-  checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406
-  languageName: node
-  linkType: hard
-
 "supports-preserve-symlinks-flag@npm:^1.0.0":
   version: 1.0.0
   resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
@@ -7675,20 +7651,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"terser@npm:^5.2.0":
-  version: 5.13.1
-  resolution: "terser@npm:5.13.1"
-  dependencies:
-    acorn: ^8.5.0
-    commander: ^2.20.0
-    source-map: ~0.8.0-beta.0
-    source-map-support: ~0.5.20
-  bin:
-    terser: bin/terser
-  checksum: 0b1f5043cf5c3973005fe2ae4ff3be82511c336a6430599dacd4e2acf77c974d4474b0f1eec4823977c1f33823147e736ff712ca8e098bee3db25946480fa29d
-  languageName: node
-  linkType: hard
-
 "test-exclude@npm:^6.0.0":
   version: 6.0.0
   resolution: "test-exclude@npm:6.0.0"
@@ -7707,20 +7669,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"throttleit@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "throttleit@npm:1.0.0"
-  checksum: 1b2db4d2454202d589e8236c07a69d2fab838876d370030ebea237c34c0a7d1d9cf11c29f994531ebb00efd31e9728291042b7754f2798a8352ec4463455b659
-  languageName: node
-  linkType: hard
-
-"through@npm:^2.3.8":
-  version: 2.3.8
-  resolution: "through@npm:2.3.8"
-  checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
-  languageName: node
-  linkType: hard
-
 "timsort@npm:^0.3.0":
   version: 0.3.0
   resolution: "timsort@npm:0.3.0"
@@ -7728,15 +7676,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"tmp@npm:~0.2.1":
-  version: 0.2.1
-  resolution: "tmp@npm:0.2.1"
-  dependencies:
-    rimraf: ^3.0.0
-  checksum: 8b1214654182575124498c87ca986ac53dc76ff36e8f0e0b67139a8d221eaecfdec108c0e6ec54d76f49f1f72ab9325500b246f562b926f85bcdfca8bf35df9e
-  languageName: node
-  linkType: hard
-
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
@@ -7767,25 +7706,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tough-cookie@npm:2.5.0"
-  dependencies:
-    psl: ^1.1.28
-    punycode: ^2.1.1
-  checksum: 16a8cd090224dd176eee23837cbe7573ca0fa297d7e468ab5e1c02d49a4e9a97bb05fef11320605eac516f91d54c57838a25864e8680e27b069a5231d8264977
-  languageName: node
-  linkType: hard
-
-"tr46@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "tr46@npm:1.0.1"
-  dependencies:
-    punycode: ^2.1.0
-  checksum: 96d4ed46bc161db75dbf9247a236ea0bfcaf5758baae6749e92afab0bc5a09cb59af21788ede7e55080f2bf02dce3e4a8f2a484cc45164e29f4b5e68f7cbcc1a
-  languageName: node
-  linkType: hard
-
 "treemate@npm:^0.3.11":
   version: 0.3.11
   resolution: "treemate@npm:0.3.11"
@@ -7793,41 +7713,25 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.1":
-  version: 3.14.1
-  resolution: "tsconfig-paths@npm:3.14.1"
+"tsconfig-paths@npm:^3.15.0":
+  version: 3.15.0
+  resolution: "tsconfig-paths@npm:3.15.0"
   dependencies:
     "@types/json5": ^0.0.29
-    json5: ^1.0.1
+    json5: ^1.0.2
     minimist: ^1.2.6
     strip-bom: ^3.0.0
-  checksum: 8afa01c673ebb4782ba53d3a12df97fa837ce524f8ad38ee4e2b2fd57f5ac79abc21c574e9e9eb014d93efe7fe8214001b96233b5c6ea75bd1ea82afe17a4c6d
+  checksum: 59f35407a390d9482b320451f52a411a256a130ff0e7543d18c6f20afab29ac19fbe55c360a93d6476213cc335a4d76ce90f67df54c4e9037f7d240920832201
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.1.0, tslib@npm:^2.4.0":
+"tslib@npm:^2.4.0":
   version: 2.4.0
   resolution: "tslib@npm:2.4.0"
   checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113
   languageName: node
   linkType: hard
 
-"tunnel-agent@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "tunnel-agent@npm:0.6.0"
-  dependencies:
-    safe-buffer: ^5.0.1
-  checksum: 05f6510358f8afc62a057b8b692f05d70c1782b70db86d6a1e0d5e28a32389e52fa6e7707b6c5ecccacc031462e4bc35af85ecfe4bbc341767917b7cf6965711
-  languageName: node
-  linkType: hard
-
-"tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0":
-  version: 0.14.5
-  resolution: "tweetnacl@npm:0.14.5"
-  checksum: 6061daba1724f59473d99a7bb82e13f211cdf6e31315510ae9656fefd4779851cb927adad90f3b488c8ed77c106adc0421ea8055f6f976ff21b27c5c4e918487
-  languageName: node
-  linkType: hard
-
 "type-check@npm:^0.4.0, type-check@npm:~0.4.0":
   version: 0.4.0
   resolution: "type-check@npm:0.4.0"
@@ -7844,14 +7748,54 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^0.21.3":
-  version: 0.21.3
-  resolution: "type-fest@npm:0.21.3"
-  checksum: e6b32a3b3877f04339bae01c193b273c62ba7bfc9e325b8703c4ee1b32dc8fe4ef5dfa54bf78265e069f7667d058e360ae0f37be5af9f153b22382cd55a9afe0
+"typed-array-buffer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-buffer@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    is-typed-array: ^1.1.10
+  checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-length@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-offset@npm:1.0.0"
+  dependencies:
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b
+  languageName: node
+  linkType: hard
+
+"typed-array-length@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "typed-array-length@npm:1.0.4"
+  dependencies:
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    is-typed-array: ^1.1.9
+  checksum: 2228febc93c7feff142b8c96a58d4a0d7623ecde6c7a24b2b98eb3170e99f7c7eff8c114f9b283085cd59dcd2bd43aadf20e25bba4b034a53c5bb292f71f8956
   languageName: node
   linkType: hard
 
-"unbox-primitive@npm:^1.0.1":
+"unbox-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "unbox-primitive@npm:1.0.2"
   dependencies:
@@ -7881,20 +7825,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"universalify@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "universalify@npm:2.0.0"
-  checksum: 2406a4edf4a8830aa6813278bab1f953a8e40f2f63a37873ffa9a3bc8f9745d06cc8e88f3572cb899b7e509013f7f6fcc3e37e8a6d914167a5381d8440518c44
-  languageName: node
-  linkType: hard
-
-"untildify@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "untildify@npm:4.0.0"
-  checksum: 39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9
-  languageName: node
-  linkType: hard
-
 "uri-js@npm:^4.2.2":
   version: 4.4.1
   resolution: "uri-js@npm:4.4.1"
@@ -7918,22 +7848,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"uuid@npm:^8.3.2":
-  version: 8.3.2
-  resolution: "uuid@npm:8.3.2"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df
-  languageName: node
-  linkType: hard
-
-"v8-compile-cache@npm:^2.0.0":
-  version: 2.3.0
-  resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e
-  languageName: node
-  linkType: hard
-
 "v8-to-istanbul@npm:^9.0.0":
   version: 9.0.1
   resolution: "v8-to-istanbul@npm:9.0.1"
@@ -7945,6 +7859,13 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"vanillajs-datepicker@npm:1.3.4":
+  version: 1.3.4
+  resolution: "vanillajs-datepicker@npm:1.3.4"
+  checksum: 830958f8af5c586ee81ba2b75a76771db425d4eddb68ec08d1b49ac898674376ef3517a0d40eefaf4926a815c23179c54e1637d7327df090f22cdb98056074cf
+  languageName: node
+  linkType: hard
+
 "vdirs@npm:^0.1.4, vdirs@npm:^0.1.8":
   version: 0.1.8
   resolution: "vdirs@npm:0.1.8"
@@ -7956,43 +7877,43 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"verror@npm:1.10.0":
-  version: 1.10.0
-  resolution: "verror@npm:1.10.0"
-  dependencies:
-    assert-plus: ^1.0.0
-    core-util-is: 1.0.2
-    extsprintf: ^1.2.0
-  checksum: c431df0bedf2088b227a4e051e0ff4ca54df2c114096b0c01e1cbaadb021c30a04d7dd5b41ab277bcd51246ca135bf931d4c4c796ecae7a4fef6d744ecef36ea
-  languageName: node
-  linkType: hard
-
-"vite@npm:2.9.15":
-  version: 2.9.15
-  resolution: "vite@npm:2.9.15"
+"vite@npm:4.5.3":
+  version: 4.5.3
+  resolution: "vite@npm:4.5.3"
   dependencies:
-    esbuild: ^0.14.27
+    esbuild: ^0.18.10
     fsevents: ~2.3.2
-    postcss: ^8.4.13
-    resolve: ^1.22.0
-    rollup: ">=2.59.0 <2.78.0"
+    postcss: ^8.4.27
+    rollup: ^3.27.1
   peerDependencies:
+    "@types/node": ">= 14"
     less: "*"
+    lightningcss: ^1.21.0
     sass: "*"
     stylus: "*"
+    sugarss: "*"
+    terser: ^5.4.0
   dependenciesMeta:
     fsevents:
       optional: true
   peerDependenciesMeta:
+    "@types/node":
+      optional: true
     less:
       optional: true
+    lightningcss:
+      optional: true
     sass:
       optional: true
     stylus:
       optional: true
+    sugarss:
+      optional: true
+    terser:
+      optional: true
   bin:
     vite: bin/vite.js
-  checksum: 5edf8afc132a598f82a1339aa503514a0e86f6264babe94531b9000d801f157c9a32ae022542404678acca43ee260ade04c4763c4b7b8d381a6b50511b4a1447
+  checksum: fd3f512ce48ca2a1fe60ad0376283b832de9272725fdbc65064ae9248f792de87b0f27a89573115e23e26784800daca329f8a9234d298ba6f60e808a9c63883c
   languageName: node
   linkType: hard
 
@@ -8003,6 +7924,36 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"volar-service-html@npm:0.0.34":
+  version: 0.0.34
+  resolution: "volar-service-html@npm:0.0.34"
+  dependencies:
+    vscode-html-languageservice: ^5.1.0
+    vscode-languageserver-textdocument: ^1.0.11
+    vscode-uri: ^3.0.8
+  peerDependencies:
+    "@volar/language-service": ~2.1.0
+  peerDependenciesMeta:
+    "@volar/language-service":
+      optional: true
+  checksum: 83b50cd805680c77b5632e9534b23cddb85bf7e0cd425624d474981d173ddf07a66fcce6348f675c9d5c2551df9ae1e58206c2ed1c32052f8a70940fb7f5fe50
+  languageName: node
+  linkType: hard
+
+"volar-service-pug@npm:0.0.34":
+  version: 0.0.34
+  resolution: "volar-service-pug@npm:0.0.34"
+  dependencies:
+    "@volar/language-service": ~2.1.0
+    pug-lexer: ^5.0.1
+    pug-parser: ^6.0.0
+    volar-service-html: 0.0.34
+    vscode-html-languageservice: ^5.1.0
+    vscode-languageserver-textdocument: ^1.0.11
+  checksum: 4691aa1c8ea9039e1b5ce4218445309575c2cb4bc08ad5341a8af6f0db1a60711f26cc905e124c3485cc780eb58b895332fbb6a2ccf427a9d0e08012f2c5ad4a
+  languageName: node
+  linkType: hard
+
 "vooks@npm:^0.2.12, vooks@npm:^0.2.4":
   version: 0.2.12
   resolution: "vooks@npm:0.2.12"
@@ -8014,9 +7965,59 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"vue-demi@npm:*":
-  version: 0.13.1
-  resolution: "vue-demi@npm:0.13.1"
+"vscode-html-languageservice@npm:^5.1.0":
+  version: 5.1.2
+  resolution: "vscode-html-languageservice@npm:5.1.2"
+  dependencies:
+    "@vscode/l10n": ^0.0.18
+    vscode-languageserver-textdocument: ^1.0.11
+    vscode-languageserver-types: ^3.17.5
+    vscode-uri: ^3.0.8
+  checksum: 3a2a5ee5ad4ea429e85f4fb8f45da5b47d50541784d703fc9ccd009f68426034a48be6c04f8c420dc7236de07df93ccc28873da3395db5f5626fe169f18f1ac6
+  languageName: node
+  linkType: hard
+
+"vscode-jsonrpc@npm:8.2.0":
+  version: 8.2.0
+  resolution: "vscode-jsonrpc@npm:8.2.0"
+  checksum: f302a01e59272adc1ae6494581fa31c15499f9278df76366e3b97b2236c7c53ebfc71efbace9041cfd2caa7f91675b9e56f2407871a1b3c7f760a2e2ee61484a
+  languageName: node
+  linkType: hard
+
+"vscode-languageserver-protocol@npm:^3.17.5":
+  version: 3.17.5
+  resolution: "vscode-languageserver-protocol@npm:3.17.5"
+  dependencies:
+    vscode-jsonrpc: 8.2.0
+    vscode-languageserver-types: 3.17.5
+  checksum: dfb42d276df5dfea728267885b99872ecff62f6c20448b8539fae71bb196b420f5351c5aca7c1047bf8fb1f89fa94a961dce2bc5bf7e726198f4be0bb86a1e71
+  languageName: node
+  linkType: hard
+
+"vscode-languageserver-textdocument@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "vscode-languageserver-textdocument@npm:1.0.11"
+  checksum: ea7cdc9d4ffaae5952071fa11d17d714215a76444e6936c9359f94b9ba3222a52a55edb5bd5928bd3e9712b900a9f175bb3565ec1c8923234fe3bd327584bafb
+  languageName: node
+  linkType: hard
+
+"vscode-languageserver-types@npm:3.17.5, vscode-languageserver-types@npm:^3.17.5":
+  version: 3.17.5
+  resolution: "vscode-languageserver-types@npm:3.17.5"
+  checksum: 79b420e7576398d396579ca3a461c9ed70e78db4403cd28bbdf4d3ed2b66a2b4114031172e51fad49f0baa60a2180132d7cb2ea35aa3157d7af3c325528210ac
+  languageName: node
+  linkType: hard
+
+"vscode-uri@npm:^3.0.8":
+  version: 3.0.8
+  resolution: "vscode-uri@npm:3.0.8"
+  checksum: 514249126850c0a41a7d8c3c2836cab35983b9dc1938b903cfa253b9e33974c1416d62a00111385adcfa2b98df456437ab704f709a2ecca76a90134ef5eb4832
+  languageName: node
+  linkType: hard
+
+"vue-demi@npm:>=0.14.5":
+  version: 0.14.5
+  resolution: "vue-demi@npm:0.14.5"
   peerDependencies:
     "@vue/composition-api": ^1.0.0-rc.1
     vue: ^3.0.0-0 || ^2.6.0
@@ -8026,7 +8027,7 @@ browserlist@latest:
   bin:
     vue-demi-fix: bin/vue-demi-fix.js
     vue-demi-switch: bin/vue-demi-switch.js
-  checksum: d26b0602587f4dbd81f975f8f2de39910239805f0f2d72cafed0c7349c512f5363daf57e2761ba6a7ac66331a4cfa3dc857d6f7f62c57adbae85752d270118c8
+  checksum: ff44b9372b8224590514252a2f73363cced6062205f9628a6b130dccb80e2023d55cd9d1da94aeb68d5539b7ea9eedcecf88ab281a3a9ff48b8db4c5366b9643
   languageName: node
   linkType: hard
 
@@ -8046,9 +8047,9 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"vue-eslint-parser@npm:^9.0.1":
-  version: 9.0.3
-  resolution: "vue-eslint-parser@npm:9.0.3"
+"vue-eslint-parser@npm:^9.4.2":
+  version: 9.4.2
+  resolution: "vue-eslint-parser@npm:9.4.2"
   dependencies:
     debug: ^4.3.4
     eslint-scope: ^7.1.1
@@ -8059,48 +8060,53 @@ browserlist@latest:
     semver: ^7.3.6
   peerDependencies:
     eslint: ">=6.0.0"
-  checksum: 61248eb504b8d0cbc95ed3f7ec6b11b72782cd76e4049798626f9c09031d620691a967231985c79d8ece8b04864797e465b7f47bcf91828e18344ae3691d9066
+  checksum: 67f14c8ea19b578077a878864a5ec438ab4c597381923c9814fac39b3772da8654ac2a543467b5880607f694131f8ff34b87bd24c10bbc5f99fa2fcac49ff2e6
   languageName: node
   linkType: hard
 
-"vue-router@npm:4.1.5":
-  version: 4.1.5
-  resolution: "vue-router@npm:4.1.5"
+"vue-router@npm:4.3.0":
+  version: 4.3.0
+  resolution: "vue-router@npm:4.3.0"
   dependencies:
-    "@vue/devtools-api": ^6.1.4
+    "@vue/devtools-api": ^6.5.1
   peerDependencies:
     vue: ^3.2.0
-  checksum: cafa2f4e14188bca0d4d45e05a901b6ff7bb3933010a6b2c9372bed7fa872bb2e18f1f033b23f540d3a75e1ecd6840b79a5ba5a714de01942d02e1e6cce88dec
+  checksum: 0059261d39c8a6f61d3cdf4b74cfcd6a109062e0562f2db5a387cdf4d1b186dfdd2dddcacbf83ce2842d7c3ec9a63d8a6d427c4cec1db61372f4a06048496354
   languageName: node
   linkType: hard
 
-"vue@npm:3.2.40":
-  version: 3.2.40
-  resolution: "vue@npm:3.2.40"
+"vue@npm:3.4.21":
+  version: 3.4.21
+  resolution: "vue@npm:3.4.21"
   dependencies:
-    "@vue/compiler-dom": 3.2.40
-    "@vue/compiler-sfc": 3.2.40
-    "@vue/runtime-dom": 3.2.40
-    "@vue/server-renderer": 3.2.40
-    "@vue/shared": 3.2.40
-  checksum: fb5ca87c16e58f24c0088add152ca1ef70ac6d198ec3a60e7904201c31aadefb2c28e361934c42a704742835cdd9c02ab5765f0c29e8335eb13261d7b764b0ee
+    "@vue/compiler-dom": 3.4.21
+    "@vue/compiler-sfc": 3.4.21
+    "@vue/runtime-dom": 3.4.21
+    "@vue/server-renderer": 3.4.21
+    "@vue/shared": 3.4.21
+  peerDependencies:
+    typescript: "*"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 3c477982a0a9aadfa512eb625b67f35809f123e98a268ace52e3ee738b23a9b8d9461cfc1f2b314fb098047ab3aab50f8beea657a2d3ebe5aae0e02aa4f903d2
   languageName: node
   linkType: hard
 
-"vueuc@npm:^0.4.47":
-  version: 0.4.47
-  resolution: "vueuc@npm:0.4.47"
+"vueuc@npm:^0.4.58":
+  version: 0.4.58
+  resolution: "vueuc@npm:0.4.58"
   dependencies:
     "@css-render/vue3-ssr": ^0.15.10
     "@juggle/resize-observer": ^3.3.1
     css-render: ^0.15.10
-    evtd: ^0.2.2
-    seemly: ^0.3.1
+    evtd: ^0.2.4
+    seemly: ^0.3.6
     vdirs: ^0.1.4
     vooks: ^0.2.4
   peerDependencies:
     vue: ^3.0.11
-  checksum: b82b77a882d29f8f6e432cabaf1ce3cefda1a87f5b956655e4f38a96351fa4ec17472608eb8ba30b5aa5edf894cfbad15447ddf4b46d46d9caf2c02b679a5cab
+  checksum: fb0b9a69be553ccbdc314eec22433d99022ef065d6e6add4b1177ebada6de6d05b4ece36af4ee37a750687215ec966880c17d6b6dd2d0ea38a7958f584da74b9
   languageName: node
   linkType: hard
 
@@ -8111,24 +8117,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "webidl-conversions@npm:4.0.2"
-  checksum: c93d8dfe908a0140a4ae9c0ebc87a33805b416a33ee638a605b551523eec94a9632165e54632f6d57a39c5f948c4bab10e0e066525e9a4b87a79f0d04fbca374
-  languageName: node
-  linkType: hard
-
-"whatwg-url@npm:^7.0.0":
-  version: 7.1.0
-  resolution: "whatwg-url@npm:7.1.0"
-  dependencies:
-    lodash.sortby: ^4.7.0
-    tr46: ^1.0.1
-    webidl-conversions: ^4.0.2
-  checksum: fecb07c87290b47d2ec2fb6d6ca26daad3c9e211e0e531dd7566e7ff95b5b3525a57d4f32640ad4adf057717e0c215731db842ad761e61d947e81010e05cf5fd
-  languageName: node
-  linkType: hard
-
 "which-boxed-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "which-boxed-primitive@npm:1.0.2"
@@ -8142,6 +8130,19 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
+"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13":
+  version: 1.1.13
+  resolution: "which-typed-array@npm:1.1.13"
+  dependencies:
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.4
+    for-each: ^0.3.3
+    gopd: ^1.0.1
+    has-tostringtag: ^1.0.0
+  checksum: 3828a0d5d72c800e369d447e54c7620742a4cc0c9baf1b5e8c17e9b6ff90d8d861a3a6dd4800f1953dbf80e5e5cec954a289e5b4a223e3bee4aeb1f8c5f33309
+  languageName: node
+  linkType: hard
+
 "which@npm:^2.0.1, which@npm:^2.0.2":
   version: 2.0.2
   resolution: "which@npm:2.0.2"
@@ -8174,32 +8175,25 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"word-wrap@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "word-wrap@npm:1.2.3"
-  checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "wrap-ansi@npm:6.2.0"
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "wrap-ansi@npm:7.0.0"
   dependencies:
     ansi-styles: ^4.0.0
     string-width: ^4.1.0
     strip-ansi: ^6.0.0
-  checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a
+  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "wrap-ansi@npm:7.0.0"
+"wrap-ansi@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "wrap-ansi@npm:8.1.0"
   dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
+    ansi-styles: ^6.1.0
+    string-width: ^5.0.1
+    strip-ansi: ^7.0.1
+  checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238
   languageName: node
   linkType: hard
 
@@ -8210,21 +8204,6 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.0.0":
-  version: 8.8.1
-  resolution: "ws@npm:8.8.1"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 2152cf862cae0693f3775bc688a6afb2e989d19d626d215e70f5fcd8eb55b1c3b0d3a6a4052905ec320e2d7734e20aeedbf9744496d62f15a26ad79cf4cf7dae
-  languageName: node
-  linkType: hard
-
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"
@@ -8260,42 +8239,25 @@ browserlist@latest:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "yaml@npm:2.1.1"
-  checksum: f48bb209918aa57cfaf78ef6448d1a1f8187f45c746f933268b7023dc59e5456004611879126c9bb5ea55b0a2b1c2b392dfde436931ece0c703a3d754562bb96
-  languageName: node
-  linkType: hard
-
-"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.9":
-  version: 20.2.9
-  resolution: "yargs-parser@npm:20.2.9"
-  checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
+"yargs-parser@npm:^21.1.1":
+  version: 21.1.1
+  resolution: "yargs-parser@npm:21.1.1"
+  checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c
   languageName: node
   linkType: hard
 
-"yargs@npm:^16.2.0":
-  version: 16.2.0
-  resolution: "yargs@npm:16.2.0"
+"yargs@npm:^17.7.2":
+  version: 17.7.2
+  resolution: "yargs@npm:17.7.2"
   dependencies:
-    cliui: ^7.0.2
+    cliui: ^8.0.1
     escalade: ^3.1.1
     get-caller-file: ^2.0.5
     require-directory: ^2.1.1
-    string-width: ^4.2.0
+    string-width: ^4.2.3
     y18n: ^5.0.5
-    yargs-parser: ^20.2.2
-  checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59
-  languageName: node
-  linkType: hard
-
-"yauzl@npm:^2.10.0":
-  version: 2.10.0
-  resolution: "yauzl@npm:2.10.0"
-  dependencies:
-    buffer-crc32: ~0.2.3
-    fd-slicer: ~1.1.0
-  checksum: 7f21fe0bbad6e2cb130044a5d1d0d5a0e5bf3d8d4f8c4e6ee12163ce798fee3de7388d22a7a0907f563ac5f9d40f8699a223d3d5c1718da90b0156da6904022b
+    yargs-parser: ^21.1.1
+  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
   languageName: node
   linkType: hard